diff options
| -rw-r--r-- | abs/extra-testing/nspr/PKGBUILD | 30 | ||||
| -rw-r--r-- | abs/extra-testing/nss/PKGBUILD | 83 | ||||
| -rw-r--r-- | abs/extra-testing/nss/nss-config.in | 145 | ||||
| -rw-r--r-- | abs/extra-testing/nss/nss-nolocalsql.patch | 53 | ||||
| -rw-r--r-- | abs/extra-testing/nss/nss.pc.in | 11 | 
5 files changed, 307 insertions, 15 deletions
| diff --git a/abs/extra-testing/nspr/PKGBUILD b/abs/extra-testing/nspr/PKGBUILD index e968390..57d9d3c 100644 --- a/abs/extra-testing/nspr/PKGBUILD +++ b/abs/extra-testing/nspr/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 2577 2008-06-08 12:29:04Z jgc $ +# $Id: PKGBUILD 18817 2008-11-09 12:29:50Z jgc $  # Maintainer: Alexander Baldeck <alexander@archlinux.org>  # Contributor: Jan de Groot <jgc@archlinux.org>  pkgname=nspr -pkgver=4.7.1 +pkgver=4.7.3  pkgrel=1  pkgdesc="Netscape Portable Runtime"  arch=(i686 x86_64) @@ -13,11 +13,11 @@ makedepends=('zip')  options=(!emptydirs)  source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz  	nspr.pc.in) -md5sums=('7c6e75a0867ce2b9ec62e399a908b5ac' +md5sums=('3496d6656f3e02dddc7e29f1b122b744'           'bce1611f3117b53fc904cab549c09967')  build() { -  cd ${startdir}/src/${pkgname}-${pkgver} +  cd "${srcdir}/${pkgname}-${pkgver}"    [ "$CARCH" = "x86_64" ] && confflags="--enable-64bit"    unset CFLAGS    unset CXXFLAGS @@ -28,26 +28,26 @@ build() {  	--enable-optimize \  	--disable-debug ${confflags} || return 1    make || return 1 -  make DESTDIR=${startdir}/pkg install || return 1 +  make DESTDIR="${pkgdir}" install || return 1    NSPR_LIBS=`./config/nspr-config --libs`    NSPR_CFLAGS=`./config/nspr-config --cflags`    NSPR_VERSION=`./config/nspr-config --version` -  install -m755 -d ${startdir}/pkg/usr/lib/pkgconfig || return 1 -  sed ${startdir}/src/nspr.pc.in -e "s,%libdir%,/usr/lib," \ +  install -m755 -d "${pkgdir}/usr/lib/pkgconfig" || return 1 +  sed "${srcdir}/nspr.pc.in" -e "s,%libdir%,/usr/lib," \    	-e "s,%prefix%,/usr," \  	-e "s,%exec_prefix%,/usr/bin," \  	-e "s,%includedir%,/usr/include/nspr," \  	-e "s,%NSPR_VERSION%,${NSPR_VERSION}," \  	-e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \ -	-e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > ${startdir}/pkg/usr/lib/pkgconfig/nspr.pc || return 1 -  chmod 644 ${startdir}/pkg/usr/lib/pkgconfig/nspr.pc || return 1 -  ln -sf nspr.pc ${startdir}/pkg/usr/lib/pkgconfig/mozilla-nspr.pc || return 1 +	-e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${pkgdir}/usr/lib/pkgconfig/nspr.pc" || return 1 +  chmod 644 "${pkgdir}/usr/lib/pkgconfig/nspr.pc" || return 1 +  ln -sf nspr.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nspr.pc" || return 1 -  chmod 644 ${startdir}/pkg/usr/lib/*.a || return 1 +  chmod 644 ${pkgdir}/usr/lib/*.a || return 1 -  rm -rf ${startdir}/pkg/usr/bin/compile-et.pl \ -	${startdir}/pkg/usr/bin/prerr.properties \ -	${startdir}/pkg/usr/share/aclocal/nspr.m4 \ -	${startdir}/pkg/usr/include/nspr/md +  rm -rf "${pkgdir}/usr/bin/compile-et.pl" \ +	"${pkgdir}/usr/bin/prerr.properties" \ +	"${pkgdir}/usr/share/aclocal/nspr.m4" \ +	"${pkgdir}/usr/include/nspr/md"  } diff --git a/abs/extra-testing/nss/PKGBUILD b/abs/extra-testing/nss/PKGBUILD new file mode 100644 index 0000000..c3e5869 --- /dev/null +++ b/abs/extra-testing/nss/PKGBUILD @@ -0,0 +1,83 @@ +# $Id: PKGBUILD 22037 2008-12-21 11:44:41Z jgc $ +# Maintainer: Alexander Baldeck <alexander@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> +pkgname=nss +pkgver=3.12.2 +_nssver=3.12.2.0 +pkgrel=1 +pkgdesc="Mozilla Network Security Services" +arch=(i686 x86_64) +url="http://www.mozilla.org/projects/security/pki/nss/" +license=('MPL' 'GPL') +_nsprver=4.7.3 +depends=("nspr>=${_nsprver}" 'sqlite3>=3.6.7') +replaces=('nss-nspr') +source=(ftp://ftp.archlinux.org/other/nss/${pkgname}-${pkgver}.tar.gz +	nss-nolocalsql.patch +	nss.pc.in +	nss-config.in) +md5sums=('30ee9cf4a2b415435b16b71bae367060' +         '1837781eed35bfb6f826cfb3efcd6409' +         'c547b030c57fe1ed8b77c73bf52b3ded' +         '46bee81908f1e5b26d6a7a2e14c64d9f') + +build() { +  cd "${srcdir}" +  patch -Np0 -i "${srcdir}/nss-nolocalsql.patch" || return 1 +  unset CFLAGS +  unset CXXFLAGS +  export BUILD_OPT=1 +  export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 +  export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 +  export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'` +  export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'` + +  [ "$CARCH" = "x86_64" ] && export USE_64=1 + +  make -j 1 -C mozilla/security/coreconf || return 1 +  make -j 1 -C mozilla/security/dbm || return 1 +  make -j 1 -C mozilla/security/nss || return 1 + +  install -m755 -d "${pkgdir}/usr/lib/pkgconfig" +  install -m755 -d "${pkgdir}/usr/bin" +  install -m755 -d "${pkgdir}/usr/include/nss" + +  NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` +  NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` +  NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'` + +  sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib,g" \ +  				-e "s,%prefix%,/usr,g" \ +				-e "s,%exec_prefix%,/usr/bin,g" \ +				-e "s,%includedir%,/usr/include/nss,g" \ +				-e "s,%NSPR_VERSION%,${_nsprver},g" \ +				-e "s,%NSS_VERSION%,${_nssver},g" > \ +			"${pkgdir}/usr/lib/pkgconfig/nss.pc" || return 1 +  ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc" || return 1 +  chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc || return 1 + +  sed "${srcdir}/nss-config.in" -e "s,@libdir@,/usr/lib,g" \ +  				    -e "s,@prefix@,/usr/bin,g" \ +				    -e "s,@exec_prefix@,/usr/bin,g" \ +				    -e "s,@includedir@,/usr/include/nss,g" \ +				    -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \ +				    -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \ +				    -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \ +			    > "${pkgdir}/usr/bin/nss-config" || return 1 +  chmod 755 "${pkgdir}/usr/bin/nss-config" || return 1 + +  for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \ +              libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so +  do +    install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/" || return 1 +  done +  for file in libcrmf.a libnssb.a libnssckfw.a; do +    install -m644 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/" || return 1 +  done + +  for file in certutil cmsutil crlutil modutil pk12util signtool signver ssltap; do +    install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/" || return 1 +  done + +  install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/" || return 1 +} diff --git a/abs/extra-testing/nss/nss-config.in b/abs/extra-testing/nss/nss-config.in new file mode 100644 index 0000000..f8f893e --- /dev/null +++ b/abs/extra-testing/nss/nss-config.in @@ -0,0 +1,145 @@ +#!/bin/sh + +prefix=@prefix@ + +major_version=@MOD_MAJOR_VERSION@ +minor_version=@MOD_MINOR_VERSION@ +patch_version=@MOD_PATCH_VERSION@ + +usage() +{ +	cat <<EOF +Usage: nss-config [OPTIONS] [LIBRARIES] +Options: +	[--prefix[=DIR]] +	[--exec-prefix[=DIR]] +	[--includedir[=DIR]] +	[--libdir[=DIR]] +	[--version] +	[--libs] +	[--cflags] +Dynamic Libraries: +	nss +	nssutil +	ssl +	smime +EOF +	exit $1 +} + +if test $# -eq 0; then +	usage 1 1>&2 +fi + +lib_ssl=yes +lib_smime=yes +lib_nss=yes +lib_nssutil=yes + +while test $# -gt 0; do +  case "$1" in +  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; +  *) optarg= ;; +  esac + +  case $1 in +    --prefix=*) +      prefix=$optarg +      ;; +    --prefix) +      echo_prefix=yes +      ;; +    --exec-prefix=*) +      exec_prefix=$optarg +      ;; +    --exec-prefix) +      echo_exec_prefix=yes +      ;; +    --includedir=*) +      includedir=$optarg +      ;; +    --includedir) +      echo_includedir=yes +      ;; +    --libdir=*) +      libdir=$optarg +      ;; +    --libdir) +      echo_libdir=yes +      ;; +    --version) +      echo ${major_version}.${minor_version}.${patch_version} +      ;; +    --cflags) +      echo_cflags=yes +      ;; +    --libs) +      echo_libs=yes +      ;; +    ssl) +      lib_ssl=yes +      ;; +    smime) +      lib_smime=yes +      ;; +    nss) +      lib_nss=yes +      ;; +    nssutil) +      lib_nssutil=yes +      ;; +    *) +      usage 1 1>&2 +      ;; +  esac +  shift +done + +# Set variables that may be dependent upon other variables +if test -z "$exec_prefix"; then +    exec_prefix=`pkg-config --variable=exec_prefix nss` +fi +if test -z "$includedir"; then +    includedir=`pkg-config --variable=includedir nss` +fi +if test -z "$libdir"; then +    libdir=`pkg-config --variable=libdir nss` +fi + +if test "$echo_prefix" = "yes"; then +    echo $prefix +fi + +if test "$echo_exec_prefix" = "yes"; then +    echo $exec_prefix +fi + +if test "$echo_includedir" = "yes"; then +    echo $includedir +fi + +if test "$echo_libdir" = "yes"; then +    echo $libdir +fi + +if test "$echo_cflags" = "yes"; then +    echo -I$includedir +fi + +if test "$echo_libs" = "yes"; then +      libdirs="-Wl,-rpath-link,$libdir -L$libdir" +      if test -n "$lib_ssl"; then +	libdirs="$libdirs -lssl${major_version}" +      fi +      if test -n "$lib_smime"; then +	libdirs="$libdirs -lsmime${major_version}" +      fi +      if test -n "$lib_nss"; then +	libdirs="$libdirs -lnss${major_version}" +      fi +      if test -n "$lib_nssutil"; then +	libdirs="$libdirs -lnssutil${major_version}" +      fi +      echo $libdirs +fi       + diff --git a/abs/extra-testing/nss/nss-nolocalsql.patch b/abs/extra-testing/nss/nss-nolocalsql.patch new file mode 100644 index 0000000..b72cc66 --- /dev/null +++ b/abs/extra-testing/nss/nss-nolocalsql.patch @@ -0,0 +1,53 @@ +diff -up mozilla/security/nss/lib/Makefile.nolocalsql mozilla/security/nss/lib/Makefile +--- mozilla/security/nss/lib/Makefile.nolocalsql	2007-11-06 15:12:37.000000000 +0100 ++++ mozilla/security/nss/lib/Makefile	2007-11-06 15:13:35.000000000 +0100 +@@ -62,11 +62,11 @@ ifeq ($(OS_TARGET), WINCE) + DIRS := $(filter-out fortcrypt,$(DIRS)) + endif +  +-ifndef MOZILLA_CLIENT +-ifndef NSS_USE_SYSTEM_SQLITE +-DIRS := sqlite $(DIRS) +-endif +-endif ++#ifndef MOZILLA_CLIENT ++#ifndef NSS_USE_SYSTEM_SQLITE ++#DIRS := sqlite $(DIRS) ++#endif ++#endif +  + ####################################################################### + # (5) Execute "global" rules. (OPTIONAL)                              # +diff -up mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/legacydb/manifest.mn +--- mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql	2007-11-06 15:10:59.000000000 +0100 ++++ mozilla/security/nss/lib/softoken/legacydb/manifest.mn	2007-11-06 15:11:07.000000000 +0100 +@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def +  + DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" +  +-ifdef MOZILLA_CLIENT +-INCLUDES += -I$(DIST)/include/sqlite3 +-endif ++#ifdef MOZILLA_CLIENT ++#INCLUDES += -I$(DIST)/include/sqlite3 ++#endif +  + CSRCS = \ + 	dbmshim.c \ +diff -up mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql mozilla/security/nss/lib/softoken/manifest.mn +--- mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql	2007-11-06 15:08:14.000000000 +0100 ++++ mozilla/security/nss/lib/softoken/manifest.mn	2007-11-06 15:10:21.000000000 +0100 +@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def +  + DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\" +  +-ifdef MOZILLA_CLIENT +-INCLUDES += -I$(DIST)/include/sqlite3 +-endif ++#ifdef MOZILLA_CLIENT ++#INCLUDES += -I$(DIST)/include/sqlite3 ++#endif +  + EXPORTS = \ + 	pkcs11.h \ +diff -up mozilla/security/nss/lib/softoken/config.mk.nolocalsql mozilla/security/nss/lib/softoken/config.mk diff --git a/abs/extra-testing/nss/nss.pc.in b/abs/extra-testing/nss/nss.pc.in new file mode 100644 index 0000000..d47b9e1 --- /dev/null +++ b/abs/extra-testing/nss/nss.pc.in @@ -0,0 +1,11 @@ +prefix=%prefix% +exec_prefix=%exec_prefix% +libdir=%libdir% +includedir=%includedir% + +Name: NSS +Description: Network Security Services +Version: %NSS_VERSION% +Requires: nspr >= %NSPR_VERSION% +Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3 +Cflags: -I${includedir} | 
