3.96beta1.r0

3 files changed, 54 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c8306b80e3b1..f56f3d576b9d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,22 @@
 pkgbase = nss-hg
-	pkgdesc = Network Security Services (latest Mercurial version)
-	pkgver = 3.92.r2.g7dc3bdfca66c
+	pkgdesc = Network Security Services
+	pkgver = 3.96beta1.r0.g0bef0903c5cb
 	pkgrel = 1
 	url = https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
 	arch = x86_64
-	license = GPL
-	license = MPL
+	license = MPL-2.0
 	makedepends = gyp
 	makedepends = mercurial
 	makedepends = perl
 	makedepends = python
 	depends = nspr>=4.35
-	depends = p11-kit>=0.25.0
+	depends = p11-kit>=0.25.3
+	depends = sh
 	depends = sqlite
 	depends = zlib
-	depends = sh
-	provides = nss=3.92
+	provides = nss=3.96beta1
 	conflicts = nss
-	source = hg+https://hg.mozilla.org/projects/nss
-	b2sums = SKIP
+	source = nss::hg+https://hg.mozilla.org/projects/nss
+	sha256sums = SKIP
 
 pkgname = nss-hg
diff --git a/.gitignore b/.gitignore
index f5bc59986874..018a3de08144 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
-pkg/
-src/
-nss*
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index d1ff7c1c321a..7aa0ceb38e91 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,33 @@
+# Maintainer:
 # Contributor: Marcell Meszaros < marcell.meszaros AT runbox.eu >
 # Contributor: Franziskus Kiefer <franziskuskiefer@gmail.com>
 
-_pkgname=nss
+_pkgname="nss"
 pkgname="$_pkgname-hg"
-pkgver=3.92.r2.g7dc3bdfca66c
+pkgver=3.96beta1.r0.g0bef0903c5cb
 pkgrel=1
-pkgdesc="Network Security Services (latest Mercurial version)"
-arch=(x86_64)
+pkgdesc="Network Security Services"
 url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
-license=(
-  GPL
-  MPL
+license=('MPL-2.0')
+arch=(x86_64)
+
+_pacver_nspr=$(
+  LANG=C LC_ALL=C pacman -Qi nspr \
+    | grep -Po '^Version\s*: \K.+' \
+    | sed -E 's/-[0-9.]+$//'
 )
-_nspr_pacman_ver="$(pacman -Qi nspr | grep -Po '^Version\s*: \K.+' | sed 's/-[0-9.]\+//')"
-_p11_kit_pacman_ver="$(pacman -Qi p11-kit | grep -Po '^Version\s*: \K.+' | sed 's/-[0-9.]\+//')"
+_pacver_p11kit=$(
+  LANG=C LC_ALL=C pacman -Qi p11-kit \
+    | grep -Po '^Version\s*: \K.+' \
+    | sed -E 's/-[0-9.]+$//'
+)
+
 depends=(
-  "nspr>=${_nspr_pacman_ver}"
-  "p11-kit>=${_p11_kit_pacman_ver}"
+  "nspr>=${_pacver_nspr%%.r*}"
+  "p11-kit>=${_pacver_p11kit%%.r*}"
+  sh
   sqlite
   zlib
-  sh
 )
 makedepends=(
   gyp
@@ -27,13 +35,16 @@ makedepends=(
   perl
   python
 )
-provides=("$_pkgname=${pkgver%.r*}")
+
+provides=("$_pkgname=${pkgver%%.r*}")
 conflicts=("$_pkgname")
-source=("hg+https://hg.mozilla.org/projects/$_pkgname")
-b2sums=('SKIP')
+
+_pkgsrc="$_pkgname"
+source=("$_pkgsrc"::"hg+https://hg.mozilla.org/projects/nss")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd "$_pkgname"
+  cd "$_pkgsrc"
   hg log -r . --template '{latesttag}.r{latesttagdistance}.g{node|short}\n' \
     | sed 's/^[a-zA-Z_]*//;s/_RTM//;s/_\([a-zA-Z][a-zA-Z0-9]\+\)/\1/;s/_/./g' \
     | tr '[:upper:]' '[:lower:]'
@@ -49,22 +60,22 @@ build() {
     --target x64
   )
 
-  cd "$_pkgname"
+  cd "$_pkgsrc"
   ./build.sh "${buildsh_options[@]}"
 }
 
 package() {
   local nsprver="$(pkg-config --modversion nspr)"
-  local libdir=/usr/lib includedir=/usr/include/"$_pkgname"
+  local libdir=/usr/lib includedir="/usr/include/$_pkgname"
 
-  sed "$_pkgname"/pkg/pkg-config/nss.pc.in \
+  sed "$_pkgsrc"/pkg/pkg-config/nss.pc.in \
     -e "s,%prefix%,/usr,g" \
     -e "s,%exec_prefix%,\${prefix},g" \
     -e "s,%libdir%,$libdir,g" \
     -e "s,%includedir%,$includedir,g" \
     -e "s,%NSPR_VERSION%,$nsprver,g" \
-    -e "s,%NSS_VERSION%,${pkgver%.r*},g" |
-    install -Dm644 /dev/stdin "$pkgdir$libdir/pkgconfig/nss.pc"
+    -e "s,%NSS_VERSION%,${pkgver%.r*},g" \
+    | install -Dm644 /dev/stdin "$pkgdir$libdir/pkgconfig/nss.pc"
 
   ln -s nss.pc "$pkgdir$libdir/pkgconfig/mozilla-nss.pc"
 
@@ -72,25 +83,26 @@ package() {
 
   local vmajor vminor vpatch
   { read vmajor; read vminor; read vpatch; } \
-    < <(awk '/#define.*NSS_V(MAJOR|MINOR|PATCH)/ {print $3}' "$_pkgname"/lib/nss/nss.h)
+    < <(awk '/#define.*NSS_V(MAJOR|MINOR|PATCH)/ {print $3}' "$_pkgsrc"/lib/nss/nss.h)
 
-  sed "$_pkgname"/pkg/pkg-config/nss-config.in \
+  sed "$_pkgsrc"/pkg/pkg-config/nss-config.in \
     -e "s,@prefix@,/usr,g" \
     -e "s,@exec_prefix@,/usr,g" \
     -e "s,@libdir@,$libdir,g" \
     -e "s,@includedir@,$includedir,g" \
     -e "s,@MOD_MAJOR_VERSION@,$vmajor,g" \
     -e "s,@MOD_MINOR_VERSION@,$vminor,g" \
-    -e "s,@MOD_PATCH_VERSION@,$vpatch,g" |
-    install -D /dev/stdin "$pkgdir/usr/bin/nss-config"
+    -e "s,@MOD_PATCH_VERSION@,$vpatch,g" \
+    | install -D /dev/stdin "$pkgdir/usr/bin/nss-config"
 
-  install -Dt "$pkgdir/usr/bin" \
-    dist/Release/bin/{*util,shlibsign,signtool,signver,ssltap}
+  install -D dist/Release/bin/{*util,shlibsign,signtool,signver,ssltap} \
+    -t "$pkgdir/usr/bin"
 
-  install -Dt "$pkgdir$includedir" -m644 dist/public/nss/*.h
+  install -Dm644 dist/public/nss/*.h \
+    -t "$pkgdir$includedir"
 
-  install -Dt "$pkgdir/usr/share/man/man1" -m644 \
-    nss/doc/nroff/{*util,signtool,signver,ssltap}.1
+  install -Dm644 nss/doc/nroff/{*util,signtool,signver,ssltap}.1 \
+    -t "$pkgdir/usr/share/man/man1"
 
   # Replace built-in trust with p11-kit connection
   ln -s pkcs11/p11-kit-trust.so "$pkgdir$libdir/p11-kit-trust.so"