diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-31 10:59:28 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-31 10:59:28 -0300 |
commit | 36f1b1bb12934e4fd9012c0ee5d4e3c885a2d433 (patch) | |
tree | 397141926cac78871a3e9d53cd8fb824bc1b9cd3 /extra/nss | |
parent | 0858e3f6c7deaae69a94818c0d317a767aa3d481 (diff) | |
parent | 5827948456201df72a1bd73e87977c569129fb27 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/percona-server/PKGBUILD
community/xmlrpc-c/PKGBUILD
core/util-linux/PKGBUILD
extra/colord/PKGBUILD
extra/epiphany/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/evolution/PKGBUILD
extra/gcr/PKGBUILD
extra/gdm/PKGBUILD
extra/gnome-color-manager/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-dictionary/PKGBUILD
extra/gnome-font-viewer/PKGBUILD
extra/gnome-screenshot/PKGBUILD
extra/gnome-search-tool/PKGBUILD
extra/gnome-system-log/PKGBUILD
extra/gobject-introspection/PKGBUILD
extra/grilo/PKGBUILD
extra/gtkmm3/PKGBUILD
extra/gvfs/PKGBUILD
extra/json-glib/PKGBUILD
extra/libgnome-keyring/PKGBUILD
extra/nautilus-open-terminal/PKGBUILD
extra/pidgin/PKGBUILD
extra/pygobject/PKGBUILD
extra/rest/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/seahorse/PKGBUILD
extra/totem/PKGBUILD
extra/xorg-xinit/PKGBUILD
extra/yelp/PKGBUILD
Diffstat (limited to 'extra/nss')
-rw-r--r-- | extra/nss/PKGBUILD | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index a0e17721b..36e2cd9de 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,25 +1,23 @@ -# $Id: PKGBUILD 165445 2012-08-19 16:04:33Z jgc $ +# $Id: PKGBUILD 169789 2012-10-29 10:49:49Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss -pkgver=3.13.6 +pkgver=3.14 pkgrel=1 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64 'mips64el') url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') -_nsprver=4.9.2 +_nsprver=4.9.3 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh') makedepends=('perl') options=('!strip') source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz - nss-no-rpath.patch nss.pc.in nss-config.in ssl-renegotiate-transitional.patch add_spi+cacert_ca_certs.patch) -sha1sums=('1f86a7c787e8fe3ebd1dd1cce127e57fb347dac3' - 'c8fcdb153af9d39689243119adb475905a657284' +sha1sums=('ace3642fb2ca67854ea7075d053ca01a6d81e616' 'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd' 'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c' '8a964a744ba098711b80c0d279a2993524e8eb92' @@ -33,8 +31,6 @@ build() { # Adds transitional SSL renegotiate support - patch from Debian patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch" - # Removes rpath - patch -Np2 -i "${srcdir}/nss-no-rpath.patch" # Respect LDFLAGS sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \ |