[arch-commits] Commit in lib32-nss/repos/multilib-x86_64 (4 files)
Antonio Rojas
arojas at archlinux.org
Wed Sep 5 20:18:47 UTC 2018
Date: Wednesday, September 5, 2018 @ 20:18:46
Author: arojas
Revision: 377007
archrelease: copy trunk to multilib-x86_64
Added:
lib32-nss/repos/multilib-x86_64/PKGBUILD
(from rev 377006, lib32-nss/trunk/PKGBUILD)
lib32-nss/repos/multilib-x86_64/no-plt.diff
(from rev 377006, lib32-nss/trunk/no-plt.diff)
Deleted:
lib32-nss/repos/multilib-x86_64/PKGBUILD
lib32-nss/repos/multilib-x86_64/no-plt.diff
-------------+
PKGBUILD | 118 +++++++++++++++++++++++++++++-----------------------------
no-plt.diff | 96 +++++++++++++++++++++++------------------------
2 files changed, 107 insertions(+), 107 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-09-05 20:18:25 UTC (rev 377006)
+++ PKGBUILD 2018-09-05 20:18:46 UTC (rev 377007)
@@ -1,59 +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.38
-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.19
-depends=("lib32-nspr>=${_nsprver}" lib32-sqlite lib32-zlib lib32-p11-kit nss)
-makedepends=(perl python2 gyp)
-options=(!strip !makeflags staticlibs)
-source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz"
- no-plt.diff)
-sha256sums=('2c643d3c08d6935f4d325f40743719b6990aa25a79ec2f8f712c99d086672f62'
- 'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa')
-
-prepare() {
- mkdir path
-
- ln -s /usr/bin/python2 path/python
-
- cd nss-$pkgver
- 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 --enable-libpkix --disable-tests
-}
-
-package() {
- cd nss-$pkgver
-
- sed nss/pkg/pkg-config/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
-
- # Replace built-in trust with p11-kit connection
- ln -sf libnssckbi-p11-kit.so "$pkgdir/usr/lib32/libnssckbi.so"
-}
Copied: lib32-nss/repos/multilib-x86_64/PKGBUILD (from rev 377006, lib32-nss/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-09-05 20:18:46 UTC (rev 377007)
@@ -0,0 +1,59 @@
+# $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.39
+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.20
+depends=("lib32-nspr>=${_nsprver}" lib32-sqlite lib32-zlib lib32-p11-kit nss)
+makedepends=(perl python2 gyp)
+options=(!strip !makeflags staticlibs)
+source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz"
+ no-plt.diff)
+sha256sums=('6be64dd76f212415cc8bc34343ac1e7389048db4db9a023a84873c411dc5864b'
+ 'ea8e1b871c0f1dd29cdea1b1a2e7f47bf4713e2ae7b947ec832dba7dfcc67daa')
+
+prepare() {
+ mkdir path
+
+ ln -s /usr/bin/python2 path/python
+
+ cd nss-$pkgver
+ 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 --enable-libpkix --disable-tests
+}
+
+package() {
+ cd nss-$pkgver
+
+ sed nss/pkg/pkg-config/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
+
+ # Replace built-in trust with p11-kit connection
+ ln -sf libnssckbi-p11-kit.so "$pkgdir/usr/lib32/libnssckbi.so"
+}
Deleted: no-plt.diff
===================================================================
--- no-plt.diff 2018-09-05 20:18:25 UTC (rev 377006)
+++ no-plt.diff 2018-09-05 20:18:46 UTC (rev 377007)
@@ -1,48 +0,0 @@
-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
Copied: lib32-nss/repos/multilib-x86_64/no-plt.diff (from rev 377006, lib32-nss/trunk/no-plt.diff)
===================================================================
--- no-plt.diff (rev 0)
+++ no-plt.diff 2018-09-05 20:18:46 UTC (rev 377007)
@@ -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
More information about the arch-commits
mailing list