[arch-commits] Commit in nss/trunk (PKGBUILD enable-libpkix.patch)

[Jan Steffens]

    Date: Tuesday, April 24, 2018 @ 14:36:59
  Author: heftig
Revision: 322913

3.36.1-1: FS#58332: Replace patch

Modified:
  nss/trunk/PKGBUILD
Deleted:
  nss/trunk/enable-libpkix.patch

----------------------+
 PKGBUILD             |    9 +++------
 enable-libpkix.patch |   12 ------------
 2 files changed, 3 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-24 14:31:05 UTC (rev 322912)
+++ PKGBUILD	2018-04-24 14:36:59 UTC (rev 322913)
@@ -14,11 +14,10 @@
 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"
-        certdata2pem.py bundle.sh enable-libpkix.patch)
+        certdata2pem.py bundle.sh)
 sha256sums=('6025441d528ff6a7f1a4b673b6ee7d3540731ada3f78d5acd5c3b3736b222bff'
             '512b12a2f13129be62c008b4df0153f527dd7d71c2c5183de99dfa2a1c49dd8a'
-            '3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd'
-            '0b68c5ffbfeec090e950e5703e6b0519eafcb7eaf4fe2f64c355d0ddf17eed30')
+            '3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
 
 prepare() {
   mkdir certs path
@@ -27,8 +26,6 @@
 
   cd nss-$pkgver
 
-  patch -Np1 -i ../enable-libpkix.patch
-
   ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
   ln -sr nss/lib/ckfw/builtins/nssckbi.h ../certs/
 }
@@ -42,7 +39,7 @@
 
   cd nss-$pkgver/nss
   PATH="$srcdir/path:$PATH" bash -x ./build.sh -v \
-    --opt --system-sqlite --system-nspr --disable-tests
+    --opt --system-sqlite --system-nspr --enable-libpkix --disable-tests
 }
 
 package_nss() {

Deleted: enable-libpkix.patch
===================================================================
--- enable-libpkix.patch	2018-04-24 14:31:05 UTC (rev 322912)
+++ enable-libpkix.patch	2018-04-24 14:36:59 UTC (rev 322913)
@@ -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=()
-