diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2012-10-30 12:48:39 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-10-30 20:28:30 +0000 |
commit | de483912bbac2e3ea0c8c8e907ec9bf6df90d2a3 (patch) | |
tree | 7e33fc01b8e4bafc880c3baf97e2054c688c7e47 | |
parent | 8ad622b8889566d57d249a8af0c1e4bbfb6e38a4 (diff) | |
download | alpine_aports-de483912bbac2e3ea0c8c8e907ec9bf6df90d2a3.tar.bz2 alpine_aports-de483912bbac2e3ea0c8c8e907ec9bf6df90d2a3.tar.xz alpine_aports-de483912bbac2e3ea0c8c8e907ec9bf6df90d2a3.zip |
main/nss: upgrade to 3.14
-rw-r--r-- | main/nss/APKBUILD | 6 | ||||
-rw-r--r-- | main/nss/nss-no-rpath.patch | 14 |
2 files changed, 2 insertions, 18 deletions
diff --git a/main/nss/APKBUILD b/main/nss/APKBUILD index 6e7c6b8de2..3c51fbbbfa 100644 --- a/main/nss/APKBUILD +++ b/main/nss/APKBUILD | |||
@@ -1,6 +1,6 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=nss | 2 | pkgname=nss |
3 | pkgver=3.13.6 | 3 | pkgver=3.14 |
4 | _ver=${pkgver//./_} | 4 | _ver=${pkgver//./_} |
5 | pkgrel=0 | 5 | pkgrel=0 |
6 | pkgdesc="Mozilla Network Security Services" | 6 | pkgdesc="Mozilla Network Security Services" |
@@ -11,7 +11,6 @@ depends= | |||
11 | makedepends="nspr-dev sqlite-dev zlib-dev perl" | 11 | makedepends="nspr-dev sqlite-dev zlib-dev perl" |
12 | subpackages="$pkgname-dev $pkgname-tools" | 12 | subpackages="$pkgname-dev $pkgname-tools" |
13 | source="ftp://ftp.mozilla.org/pub/security/$pkgname/releases/NSS_${_ver}_RTM/src/$pkgname-$pkgver.tar.gz | 13 | source="ftp://ftp.mozilla.org/pub/security/$pkgname/releases/NSS_${_ver}_RTM/src/$pkgname-$pkgver.tar.gz |
14 | nss-no-rpath.patch | ||
15 | nss.pc.in | 14 | nss.pc.in |
16 | nss-config.in | 15 | nss-config.in |
17 | add_spi+cacert_ca_certs.patch | 16 | add_spi+cacert_ca_certs.patch |
@@ -140,8 +139,7 @@ tools() { | |||
140 | mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ | 139 | mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ |
141 | } | 140 | } |
142 | 141 | ||
143 | md5sums="15ea0e3b63cd0d18b5b75619afc46c3e nss-3.13.6.tar.gz | 142 | md5sums="3918d5f9eb2996271cf62d52f084fd45 nss-3.14.tar.gz |
144 | e5c97db0c884d5f4cfda21e562dc9bba nss-no-rpath.patch | ||
145 | c547b030c57fe1ed8b77c73bf52b3ded nss.pc.in | 143 | c547b030c57fe1ed8b77c73bf52b3ded nss.pc.in |
146 | 46bee81908f1e5b26d6a7a2e14c64d9f nss-config.in | 144 | 46bee81908f1e5b26d6a7a2e14c64d9f nss-config.in |
147 | 7f39c19b1dfd62d7db7d8bf19f156fed add_spi+cacert_ca_certs.patch | 145 | 7f39c19b1dfd62d7db7d8bf19f156fed add_spi+cacert_ca_certs.patch |
diff --git a/main/nss/nss-no-rpath.patch b/main/nss/nss-no-rpath.patch deleted file mode 100644 index 35ea573154..0000000000 --- a/main/nss/nss-no-rpath.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | --- ./mozilla/security/nss/cmd/platlibs.mk.withrpath 2007-02-19 07:17:06.000000000 +0100 | ||
2 | +++ ./mozilla/security/nss/cmd/platlibs.mk 2007-02-19 07:18:07.000000000 +0100 | ||
3 | @@ -52,9 +52,9 @@ | ||
4 | |||
5 | ifeq ($(OS_ARCH), Linux) | ||
6 | ifeq ($(USE_64), 1) | ||
7 | -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' | ||
8 | +#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib' | ||
9 | else | ||
10 | -EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' | ||
11 | +#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib' | ||
12 | endif | ||
13 | endif | ||
14 | |||