[arch-commits] Commit in nss/trunk (PKGBUILD)

Jan Steffens heftig at nymeria.archlinux.org
Sat Jul 13 18:20:54 UTC 2013


    Date: Saturday, July 13, 2013 @ 20:20:53
  Author: heftig
Revision: 190059

3.15.1

Modified:
  nss/trunk/PKGBUILD

----------+
 PKGBUILD |  114 +++++++++++++++++++++++++++----------------------------------
 1 file changed, 51 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-13 18:13:02 UTC (rev 190058)
+++ PKGBUILD	2013-07-13 18:20:53 UTC (rev 190059)
@@ -2,108 +2,96 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=nss
-pkgver=3.14.3
-pkgrel=3
+pkgver=3.15.1
+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.9.6
+_nsprver=4.10
 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
 makedepends=('perl')
-options=('!strip')
+options=('!strip' '!makeflags')
 source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
         nss.pc.in
         nss-config.in
         ssl-renegotiate-transitional.patch
         add_spi+cacert_ca_certs.patch)
-sha1sums=('94d8781d1fa29cfbd37453dda3e9488709b82c4c'
+sha1sums=('1aa7c0ff8af7fb2c8b6e4886ae2291f4bfe0d5c0'
           'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
           'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
           '8a964a744ba098711b80c0d279a2993524e8eb92'
           'be6ef0f124f188ebb76f4d83e13466bdcfb27dd3')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/mozilla"
+prepare() {
+  cd $pkgname-$pkgver
+
   # Add CAcert and spi-inc.org CA certificates.
   # See http://wiki.cacert.org/NSSLib for how to generate
-  patch -Np0 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
+  patch -Np1 -i ../add_spi+cacert_ca_certs.patch
 
   # Adds transitional SSL renegotiate support - patch from Debian
-  patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch"
+  patch -Np3 -i ../ssl-renegotiate-transitional.patch
 
   # Respect LDFLAGS
-  sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
-      -i security/coreconf/rules.mk
+  sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/' \
+      -i nss/coreconf/rules.mk
+}
 
 
-  # see https://bugzilla.mozilla.org/show_bug.cgi?id=683266 - this step can be dropped now
-  # CaCert Wiki page should be updated to reflect these changes how to add the certificates
-  # for now the first patch should still do it
-  
-  # Generate certdata.c from certdata.txt
-  #  cd security/nss/lib/ckfw/builtins
-  #  make generate
+build() {
+  cd $pkgname-$pkgver/nss
 
-  cd "${srcdir}/${pkgname}-${pkgver}"
   export BUILD_OPT=1
-  export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-  export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
   export NSS_USE_SYSTEM_SQLITE=1
   export NSS_ENABLE_ECC=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.//'`
+  export NSPR_INCLUDE_DIR="`nspr-config --includedir`"
+  export NSPR_LIB_DIR="`nspr-config --libdir`"
   export XCFLAGS="${CFLAGS}"
 
   [ "$CARCH" = "x86_64" ] && export USE_64=1
 
-  make -j 1 -C mozilla/security/coreconf
-  make -j 1 -C mozilla/security/dbm
-  make -j 1 -C mozilla/security/nss
+  make -C coreconf
+  make -C lib/dbm
+  make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m755 -d "${pkgdir}/usr/bin"
-  install -m755 -d "${pkgdir}/usr/include/nss"
+  cd $pkgname-$pkgver
+  install -d "$pkgdir"/usr/{bin,include/nss,lib/pkgconfig}
 
-  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}'`
+  NSS_VMAJOR=$(grep '#define.*NSS_VMAJOR' nss/lib/nss/nss.h | awk '{print $3}')
+  NSS_VMINOR=$(grep '#define.*NSS_VMINOR' nss/lib/nss/nss.h | awk '{print $3}')
+  NSS_VPATCH=$(grep '#define.*NSS_VPATCH' 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%,${pkgver},g" > \
-			"${pkgdir}/usr/lib/pkgconfig/nss.pc"
-  ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc"
-  chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc
+  sed ../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%,${pkgver},g" \
+    > "$pkgdir/usr/lib/pkgconfig/nss.pc"
+  ln -s nss.pc "$pkgdir/usr/lib/pkgconfig/mozilla-nss.pc"
 
-  sed "${srcdir}/nss-config.in" -e "s, at libdir@,/usr/lib,g" \
-  				    -e "s, at prefix@,/usr/bin,g" \
-				    -e "s, at exec_prefix@,/usr/bin,g" \
-				    -e "s, at includedir@,/usr/include/nss,g" \
-				    -e "s, at MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
-				    -e "s, at MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
-				    -e "s, at MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
-			    > "${pkgdir}/usr/bin/nss-config"
-  chmod 755 "${pkgdir}/usr/bin/nss-config"
+  sed ../nss-config.in \
+    -e "s, at libdir@,/usr/lib,g" \
+    -e "s, at prefix@,/usr/bin,g" \
+    -e "s, at exec_prefix@,/usr/bin,g" \
+    -e "s, at includedir@,/usr/include/nss,g" \
+    -e "s, at MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
+    -e "s, at MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
+    -e "s, at MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
+    > "$pkgdir/usr/bin/nss-config"
+  chmod 755 "$pkgdir/usr/bin/nss-config"
 
-  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/"
-  done
+  cd dist/*.OBJ/bin
+  install -t "$pkgdir/usr/bin" *util shlibsign signtool signver ssltap
 
-  install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib/"
-  install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib/"
+  cd ../lib
+  install -t "$pkgdir/usr/lib" *.so
+  install -t "$pkgdir/usr/lib" -m644 libcrmf.a *.chk
 
-  for file in certutil cmsutil crlutil modutil pk12util shlibsign signtool signver ssltap; do
-    install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/"
-  done
-
-  install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/"
+  cd ../../public/nss
+  install -t "$pkgdir/usr/include/nss" -m644 *.h
 }




More information about the arch-commits mailing list