[arch-commits] Commit in nss/trunk (PKGBUILD bundle.sh certdata2pem.py)

Jan Steffens heftig at archlinux.org
Fri Sep 20 15:36:00 UTC 2019


    Date: Friday, September 20, 2019 @ 15:36:00
  Author: heftig
Revision: 363158

simplify

Modified:
  nss/trunk/PKGBUILD
  nss/trunk/bundle.sh	(properties)
  nss/trunk/certdata2pem.py	(properties)

-----------------+
 PKGBUILD        |   15 ++++++++-------
 bundle.sh       |    1 +
 certdata2pem.py |    1 +
 3 files changed, 10 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-20 15:28:06 UTC (rev 363157)
+++ PKGBUILD	2019-09-20 15:36:00 UTC (rev 363158)
@@ -10,7 +10,7 @@
 license=(MPL GPL)
 _nsprver=4.20
 depends=("nspr>=${_nsprver}" sqlite zlib sh p11-kit)
-makedepends=(perl python python2 gyp)
+makedepends=(perl python gyp)
 source=("https://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/nss-${pkgver}.tar.gz"
         certdata2pem.py bundle.sh)
 sha256sums=('6b699649d285602ba258a4b0957cb841eafc94eff5735a9da8da0adbb9a10cef'
@@ -18,8 +18,7 @@
             '3bfadf722da6773bdabdd25bdf78158648043d1b7e57615574f189a88ca865dd')
 
 prepare() {
-  mkdir certs path
-  ln -s /usr/bin/python2 path/python
+  mkdir certs
 
   cd nss-$pkgver
   ln -sr nss/lib/ckfw/builtins/certdata.txt ../certs/
@@ -27,12 +26,14 @@
 }
 
 build() {
-  ( cd certs; python ../certdata2pem.py; )
-  sh bundle.sh
+  cd certs
+  ../certdata2pem.py
 
+  cd ..
+  ./bundle.sh
+
   cd nss-$pkgver/nss
-  PATH="$srcdir/path:$PATH" bash -x ./build.sh -v \
-    --opt --system-sqlite --system-nspr --enable-libpkix --disable-tests
+  ./build.sh -v --opt --system-sqlite --system-nspr --enable-libpkix --disable-tests
 }
 
 package_nss() {

Index: nss/trunk/bundle.sh
===================================================================
--- bundle.sh	2019-09-20 15:28:06 UTC (rev 363157)
+++ bundle.sh	2019-09-20 15:36:00 UTC (rev 363158)

Property changes on: nss/trunk/bundle.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: nss/trunk/certdata2pem.py
===================================================================
--- certdata2pem.py	2019-09-20 15:28:06 UTC (rev 363157)
+++ certdata2pem.py	2019-09-20 15:36:00 UTC (rev 363158)

Property changes on: nss/trunk/certdata2pem.py
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property



More information about the arch-commits mailing list