[arch-commits] Commit in nss/repos (3 files)

[Jan de Groot]

    Date: Tuesday, August 4, 2009 @ 06:14:05
  Author: jgc
Revision: 49166

Merged revisions 49160 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/nss/trunk

........
  r49160 | jgc | 2009-08-04 10:52:05 +0200 (Tue, 04 Aug 2009) | 2 lines
  
  upgpkg: nss 3.12.3.1-1
      Update to 3.12.3.1, add more strict nss version dependency, disable rpath
........

Added:
  nss/repos/extra-i686/nss-no-rpath.patch
    (from rev 49160, nss/trunk/nss-no-rpath.patch)
Modified:
  nss/repos/extra-i686/	(properties)
  nss/repos/extra-i686/PKGBUILD

--------------------+
 PKGBUILD           |   27 ++++++++++++++-------------
 nss-no-rpath.patch |   14 ++++++++++++++
 2 files changed, 28 insertions(+), 13 deletions(-)


Property changes on: nss/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /nss/trunk:1-37432
   + /nss/trunk:1-49165

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-08-04 10:08:11 UTC (rev 49165)
+++ extra-i686/PKGBUILD	2009-08-04 10:14:05 UTC (rev 49166)
@@ -1,29 +1,30 @@
 # $Id$
-# Maintainer: Alexander Baldeck <alexander at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=nss
-pkgver=3.12.3
-_nssver=3.12.3.0
+pkgver=3.12.3.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.7.4
-depends=("nspr>=${_nsprver}" 'sqlite3>=3.6.13' 'zlib')
+_nsprver=4.8.0
+depends=("nspr>=4.8" 'sqlite3>=3.6.16' 'zlib')
 replaces=('nss-nspr')
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_3_12_3_RTM/src/${pkgname}-${pkgver}.tar.bz2
-	nss-nolocalsql.patch
-	nss.pc.in
-	nss-config.in)
-md5sums=('ecb7079ba4ebcf29b7716775384f1f18'
+source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_3_12_3_1_RTM/src/${pkgname}-${pkgver}.tar.gz
+        nss-nolocalsql.patch
+        nss-no-rpath.patch
+        nss.pc.in
+        nss-config.in)
+md5sums=('750839c9c018a0984fd94f7a9cc3dd7f'
          '1837781eed35bfb6f826cfb3efcd6409'
+         'e5c97db0c884d5f4cfda21e562dc9bba'
          'c547b030c57fe1ed8b77c73bf52b3ded'
          '46bee81908f1e5b26d6a7a2e14c64d9f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np0 -i "${srcdir}/nss-nolocalsql.patch" || return 1
+  patch -Np0 -i "${srcdir}/nss-no-rpath.patch" || return 1
   unset CFLAGS
   unset CXXFLAGS
   export BUILD_OPT=1
@@ -50,8 +51,8 @@
   				-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" > \
+				-e "s,%NSPR_VERSION%,${pkgver},g" \
+				-e "s,%NSS_VERSION%,${pkgver},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

Copied: nss/repos/extra-i686/nss-no-rpath.patch (from rev 49160, nss/trunk/nss-no-rpath.patch)
===================================================================
--- extra-i686/nss-no-rpath.patch	                        (rev 0)
+++ extra-i686/nss-no-rpath.patch	2009-08-04 10:14:05 UTC (rev 49166)
@@ -0,0 +1,14 @@
+--- ./mozilla/security/nss/cmd/platlibs.mk.withrpath	2007-02-19 07:17:06.000000000 +0100
++++ ./mozilla/security/nss/cmd/platlibs.mk	2007-02-19 07:18:07.000000000 +0100
+@@ -52,9 +52,9 @@
+ 
+ ifeq ($(OS_ARCH), Linux)
+ ifeq ($(USE_64), 1)
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
+ else
+-EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
++#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
+ endif
+ endif
+