aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ0WI <J0WI@users.noreply.github.com>2019-03-22 21:40:12 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2019-05-07 16:33:03 +0000
commita0f019e519b0bc95c3dd9b5e609e5826c20bc377 (patch)
tree14ffd1c196ef3f4728126415675f5b13e9bb36ec
parent353a725e8dc14693467430f3a85f53eb01bcdcaf (diff)
downloadaports-a0f019e519b0bc95c3dd9b5e609e5826c20bc377.tar.bz2
aports-a0f019e519b0bc95c3dd9b5e609e5826c20bc377.tar.xz
main/nss: update url and remove unused patch
-rw-r--r--main/nss/APKBUILD10
-rw-r--r--main/nss/gcc6-fixes.patch35
2 files changed, 7 insertions, 38 deletions
diff --git a/main/nss/APKBUILD b/main/nss/APKBUILD
index 3342afac57..f79c4db940 100644
--- a/main/nss/APKBUILD
+++ b/main/nss/APKBUILD
@@ -3,12 +3,12 @@
pkgname=nss
pkgver=3.43
_ver=${pkgver//./_}
-pkgrel=0
+pkgrel=1
pkgdesc="Mozilla Network Security Services"
-url="http://www.mozilla.org/projects/security/pki/nss/"
+url="https://developer.mozilla.org/docs/Mozilla/Projects/NSS"
arch="all"
license="MPL GPL"
-options="!check"
+options="!check" # failing tests
depends=
depends_dev="nspr-dev"
makedepends="nspr-dev sqlite-dev zlib-dev perl bsd-compat-headers linux-headers"
@@ -56,6 +56,10 @@ build() {
make -j 1 -C nss
}
+check() {
+ HOST=localhost DOMSUF=localdomain sh "$builddir/nss/tests/all.sh"
+}
+
package() {
replaces="nss-dev libnss"
diff --git a/main/nss/gcc6-fixes.patch b/main/nss/gcc6-fixes.patch
deleted file mode 100644
index 447cc00ac2..0000000000
--- a/main/nss/gcc6-fixes.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- ./nss/cmd/bltest/blapitest.c.orig
-+++ ./nss/cmd/bltest/blapitest.c
-@@ -1636,8 +1636,7 @@
- cipherInfo->cipher.symmkeyCipher = seed_Encrypt;
- else
- cipherInfo->cipher.symmkeyCipher = seed_Decrypt;
--
-- return SECSuccess;
-+ return SECSuccess;
- }
-
- SECStatus
---- ./nss/lib/dbm/src/h_page.c.orig
-+++ ./nss/lib/dbm/src/h_page.c
-@@ -116,7 +116,7 @@
-
- if (origin == SEEK_CUR) {
- if (offset < 1)
-- return (lseek(fd, offset, SEEK_CUR));
-+ return (lseek(fd, offset, SEEK_CUR));
-
- cur_pos = lseek(fd, 0, SEEK_CUR);
-
---- ./nss/cmd/vfychain/vfychain.c.orig
-+++ ./nss/cmd/vfychain/vfychain.c
-@@ -439,7 +439,8 @@
- case 0 : /* positional parameter */ goto breakout;
- case 'a' : isAscii = PR_TRUE; break;
- case 'b' : secStatus = DER_AsciiToTime(&time, optstate->value);
-- if (secStatus != SECSuccess) Usage(progName); break;
-+ if (secStatus != SECSuccess) Usage(progName);
-+ break;
- case 'd' : certDir = PL_strdup(optstate->value); break;
- case 'e' : ocsp_fetchingFailureIsAFailure = PR_FALSE; break;
- case 'f' : certFetching = PR_TRUE; break;