[arch-commits] Commit in lib32-nss/repos/multilib-x86_64 (7 files)
Jan Steffens
heftig at archlinux.org
Sun Oct 1 09:44:43 UTC 2017
Date: Sunday, October 1, 2017 @ 09:44:42
Author: heftig
Revision: 261158
archrelease: copy trunk to multilib-x86_64
Added:
lib32-nss/repos/multilib-x86_64/PKGBUILD
(from rev 261157, lib32-nss/trunk/PKGBUILD)
lib32-nss/repos/multilib-x86_64/enable-libpkix.patch
(from rev 261157, lib32-nss/trunk/enable-libpkix.patch)
lib32-nss/repos/multilib-x86_64/no-plt.diff
(from rev 261157, lib32-nss/trunk/no-plt.diff)
lib32-nss/repos/multilib-x86_64/nss.pc.in
(from rev 261157, lib32-nss/trunk/nss.pc.in)
Deleted:
lib32-nss/repos/multilib-x86_64/PKGBUILD
lib32-nss/repos/multilib-x86_64/enable-libpkix.patch
lib32-nss/repos/multilib-x86_64/nss.pc.in
----------------------+
PKGBUILD | 119 +++++++++++++++++++++++++------------------------
enable-libpkix.patch | 24 ++++-----
no-plt.diff | 48 +++++++++++++++++++
nss.pc.in | 22 ++++-----
4 files changed, 132 insertions(+), 81 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-10-01 09:43:13 UTC (rev 261157)
+++ PKGBUILD 2017-10-01 09:44:42 UTC (rev 261158)
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: kfgz <kfgz at interia pl>
-# Contributor: Ionut Biru <ibiru at archlinux dot org>
-
-pkgname=lib32-nss
-pkgver=3.31
-pkgrel=3
-pkgdesc="Network Security Services (32-bit)"
-url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
-arch=(x86_64)
-license=(MPL GPL)
-_nsprver=4.15
-depends=("lib32-nspr>=${_nsprver}" lib32-sqlite lib32-zlib lib32-p11-kit nss)
-makedepends=(gcc-multilib perl gyp)
-options=(!strip !makeflags staticlibs)
-source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz"
- nss.pc.in enable-libpkix.patch)
-sha256sums=('e90561256a3271486162c1fbe8d614d118c333d36a4455be2af8688bd420a65d'
- 'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
- '0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30')
-
-prepare() {
- mkdir path
-
- ln -s /usr/bin/python2 path/python
-
- cd nss-$pkgver
-
- patch -Np1 -i ../enable-libpkix.patch
-}
-
-build() {
- export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
-
- cd nss-$pkgver/nss
- PATH="$srcdir/path:$PATH" ./build.sh --m32 --opt --system-sqlite --system-nspr --disable-tests
-}
-
-package() {
- cd nss-$pkgver
-
- sed ../nss.pc.in \
- -e "s,%libdir%,/usr/lib32,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" |
- install -Dm644 /dev/stdin "$pkgdir/usr/lib32/pkgconfig/nss.pc"
- ln -s nss.pc "$pkgdir/usr/lib32/pkgconfig/mozilla-nss.pc"
-
- cd dist/Release/lib
- install -Dt "$pkgdir/usr/lib32" *.so
- install -Dt "$pkgdir/usr/lib32" -m644 *.chk
-
- ln -sf libnssckbi-p11-kit.so "$pkgdir/usr/lib32/libnssckbi.so"
-}
Copied: lib32-nss/repos/multilib-x86_64/PKGBUILD (from rev 261157, lib32-nss/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-10-01 09:44:42 UTC (rev 261158)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: kfgz <kfgz at interia pl>
+# Contributor: Ionut Biru <ibiru at archlinux dot org>
+
+pkgname=lib32-nss
+pkgver=3.33
+pkgrel=1
+pkgdesc="Network Security Services (32-bit)"
+url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+arch=(x86_64)
+license=(MPL GPL)
+_nsprver=4.15
+depends=("lib32-nspr>=${_nsprver}" lib32-sqlite lib32-zlib lib32-p11-kit nss)
+makedepends=(gcc-multilib perl gyp)
+options=(!strip !makeflags staticlibs)
+source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz"
+ nss.pc.in enable-libpkix.patch no-plt.diff)
+sha256sums=('98f0dabd36408e83dd3a11727336cc3cdfee4cbdd9aede2b2831eb2389c284e4'
+ 'f2208c4f70373ff9b60f53d733f8071d4e390c384b776dfc04bf26c306882faf'
+ '0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30'
+ 'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa')
+
+prepare() {
+ mkdir path
+
+ ln -s /usr/bin/python2 path/python
+
+ cd nss-$pkgver
+
+ patch -Np1 -i ../enable-libpkix.patch
+ patch -Np2 -i ../no-plt.diff
+}
+
+build() {
+ export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
+
+ cd nss-$pkgver/nss
+ PATH="$srcdir/path:$PATH" bash -x ./build.sh -v \
+ --m32 --opt --system-sqlite --system-nspr --disable-tests
+}
+
+package() {
+ cd nss-$pkgver
+
+ sed ../nss.pc.in \
+ -e "s,%libdir%,/usr/lib32,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" |
+ install -Dm644 /dev/stdin "$pkgdir/usr/lib32/pkgconfig/nss.pc"
+ ln -s nss.pc "$pkgdir/usr/lib32/pkgconfig/mozilla-nss.pc"
+
+ cd dist/Release/lib
+ install -Dt "$pkgdir/usr/lib32" *.so
+ install -Dt "$pkgdir/usr/lib32" -m644 *.chk
+
+ ln -sf libnssckbi-p11-kit.so "$pkgdir/usr/lib32/libnssckbi.so"
+}
Deleted: enable-libpkix.patch
===================================================================
--- enable-libpkix.patch 2017-10-01 09:43:13 UTC (rev 261157)
+++ enable-libpkix.patch 2017-10-01 09:44:42 UTC (rev 261158)
@@ -1,12 +0,0 @@
-diff -u -r nss-3.31/nss/build.sh nss-3.31-libpkix/nss/build.sh
---- nss-3.31/nss/build.sh 2017-06-08 12:53:01.000000000 +0200
-+++ nss-3.31-libpkix/nss/build.sh 2017-06-09 19:11:21.746133040 +0200
-@@ -52,7 +52,7 @@
- no_local_nspr=0
- armhf=0
-
--gyp_params=(--depth="$cwd" --generator-output=".")
-+gyp_params=(--depth="$cwd" --generator-output="." -Ddisable_libpkix=0)
- nspr_params=()
- ninja_params=()
-
Copied: lib32-nss/repos/multilib-x86_64/enable-libpkix.patch (from rev 261157, lib32-nss/trunk/enable-libpkix.patch)
===================================================================
--- enable-libpkix.patch (rev 0)
+++ enable-libpkix.patch 2017-10-01 09:44:42 UTC (rev 261158)
@@ -0,0 +1,12 @@
+diff -u -r nss-3.31/nss/build.sh nss-3.31-libpkix/nss/build.sh
+--- nss-3.31/nss/build.sh 2017-06-08 12:53:01.000000000 +0200
++++ nss-3.31-libpkix/nss/build.sh 2017-06-09 19:11:21.746133040 +0200
+@@ -52,7 +52,7 @@
+ no_local_nspr=0
+ armhf=0
+
+-gyp_params=(--depth="$cwd" --generator-output=".")
++gyp_params=(--depth="$cwd" --generator-output="." -Ddisable_libpkix=0)
+ nspr_params=()
+ ninja_params=()
+
Copied: lib32-nss/repos/multilib-x86_64/no-plt.diff (from rev 261157, lib32-nss/trunk/no-plt.diff)
===================================================================
--- no-plt.diff (rev 0)
+++ no-plt.diff 2017-10-01 09:44:42 UTC (rev 261158)
@@ -0,0 +1,48 @@
+diff --git i/security/nss/lib/freebl/mpi/mpi_x86.s w/security/nss/lib/freebl/mpi/mpi_x86.s
+index 8f7e2130c3264754..b3ca1ce5b41b3771 100644
+--- i/security/nss/lib/freebl/mpi/mpi_x86.s
++++ w/security/nss/lib/freebl/mpi/mpi_x86.s
+@@ -22,22 +22,41 @@ is_sse: .long -1
+ #
+ .ifndef NO_PIC
+ .macro GET var,reg
+- movl \var at GOTOFF(%ebx),\reg
++ call thunk.ax
++ addl $_GLOBAL_OFFSET_TABLE_, %eax
++ movl \var at GOTOFF(%eax),\reg
+ .endm
+ .macro PUT reg,var
+- movl \reg,\var at GOTOFF(%ebx)
++ call thunk.dx
++ addl $_GLOBAL_OFFSET_TABLE_, %edx
++ movl \reg,\var at GOTOFF(%edx)
+ .endm
+ .else
+ .macro GET var,reg
+ movl \var,\reg
+ .endm
+ .macro PUT reg,var
+ movl \reg,\var
+ .endm
+ .endif
+
+ .text
+
++.ifndef NO_PIC
++.globl thunk.ax
++.hidden thunk.ax
++.type thunk.ax, @function
++thunk.ax:
++ movl (%esp),%eax
++ ret
++
++.globl thunk.dx
++.hidden thunk.dx
++.type thunk.dx, @function
++thunk.dx:
++ movl (%esp),%edx
++ ret
++.endif
+
+ # ebp - 36: caller's esi
+ # ebp - 32: caller's edi
Deleted: nss.pc.in
===================================================================
--- nss.pc.in 2017-10-01 09:43:13 UTC (rev 261157)
+++ nss.pc.in 2017-10-01 09:44:42 UTC (rev 261158)
@@ -1,11 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSS
-Description: Network Security Services
-Version: %NSS_VERSION%
-Requires: nspr >= %NSPR_VERSION%
-Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3
-Cflags: -I${includedir}
Copied: lib32-nss/repos/multilib-x86_64/nss.pc.in (from rev 261157, lib32-nss/trunk/nss.pc.in)
===================================================================
--- nss.pc.in (rev 0)
+++ nss.pc.in 2017-10-01 09:44:42 UTC (rev 261158)
@@ -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: -L${libdir} -lssl3 -lsmime3 -lnss3 -lnssutil3
+Cflags: -I${includedir}
More information about the arch-commits
mailing list