mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
nss: bump version
don't skip shlibsign
This commit is contained in:
@@ -12,7 +12,7 @@ LICENSE="GNU GPL v2
|
||||
REVISION="1"
|
||||
NSS_VERSION=`echo $portVersion | sed 's/\./_/g'`
|
||||
SOURCE_URI="https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${NSS_VERSION}_RTM/src/nss-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="8c390a676ea37266fcd3d0cd2fb070e2f69f4d78fa4ed88e07ac0c9eb5aab8d3"
|
||||
CHECKSUM_SHA256="a98f002d20bfe719f50f81824a64c9e6f067f4da3c6a1f0455e97e6d79240512"
|
||||
SOURCE_DIR="nss-$portVersion/nss"
|
||||
PATCHES="nss-$portVersion.patchset"
|
||||
|
||||
@@ -169,7 +169,7 @@ INSTALL()
|
||||
|
||||
# strip debug info
|
||||
strip $binDir/*
|
||||
strip $libDir/*
|
||||
strip $libDir/*.a $libDir/*.so
|
||||
|
||||
# set up the develop directory correctly
|
||||
prepareInstalledDevelLibs libnss3 libfreebl3 libnssckbi libnssdbm3 \
|
||||
@@ -1,4 +1,4 @@
|
||||
From d269d2817ae450e2863a4447007536f81777ed6a Mon Sep 17 00:00:00 2001
|
||||
From 53c50667ba7d36d1320f68f7823d486387a15e73 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
|
||||
Date: Mon, 25 Nov 2024 20:12:37 +0100
|
||||
Subject: Haiku support
|
||||
@@ -18,10 +18,10 @@ index 76f6ff5..1178a24 100644
|
||||
}
|
||||
}
|
||||
diff --git a/cmd/selfserv/selfserv.c b/cmd/selfserv/selfserv.c
|
||||
index ee1c4da..2093e1c 100644
|
||||
index 25ac58e..e7b3b24 100644
|
||||
--- a/cmd/selfserv/selfserv.c
|
||||
+++ b/cmd/selfserv/selfserv.c
|
||||
@@ -2877,7 +2877,7 @@ main(int argc, char **argv)
|
||||
@@ -2981,7 +2981,7 @@ main(int argc, char **argv)
|
||||
FILE *tmpfile = fopen(pidFile, "w+");
|
||||
|
||||
if (tmpfile) {
|
||||
@@ -30,26 +30,12 @@ index ee1c4da..2093e1c 100644
|
||||
fclose(tmpfile);
|
||||
}
|
||||
}
|
||||
diff --git a/cmd/shlibsign/Makefile b/cmd/shlibsign/Makefile
|
||||
index 638f723..e86ec08 100644
|
||||
--- a/cmd/shlibsign/Makefile
|
||||
+++ b/cmd/shlibsign/Makefile
|
||||
@@ -72,7 +72,9 @@ SRCDIR = $(call core_abspath,.)
|
||||
endif
|
||||
|
||||
|
||||
+ifndef SKIP_SHLIBSIGN
|
||||
libs: install
|
||||
+endif
|
||||
ifdef CHECKLOC
|
||||
$(MAKE) $(CHECKLOC)
|
||||
endif
|
||||
diff --git a/coreconf/Haiku.mk b/coreconf/Haiku.mk
|
||||
new file mode 100644
|
||||
index 0000000..bc9347d
|
||||
index 0000000..61ba8e2
|
||||
--- /dev/null
|
||||
+++ b/coreconf/Haiku.mk
|
||||
@@ -0,0 +1,57 @@
|
||||
@@ -0,0 +1,56 @@
|
||||
+#
|
||||
+# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
+# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
@@ -94,7 +80,6 @@ index 0000000..bc9347d
|
||||
+OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -Wall -Wno-switch -pipe -DHAIKU
|
||||
+OS_LIBS = -lbe
|
||||
+
|
||||
+SKIP_SHLIBSIGN=1
|
||||
+USE_SYSTEM_ZLIB = 1
|
||||
+ZLIB_LIBS = -lz
|
||||
+NSS_USE_SYSTEM_SQLITE=1
|
||||
@@ -108,7 +93,7 @@ index 0000000..bc9347d
|
||||
+PROCESS_MAP_FILE = grep -v ';-' $< | \
|
||||
+ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
|
||||
diff --git a/coreconf/config.mk b/coreconf/config.mk
|
||||
index 4d57462..f67bc33 100644
|
||||
index 04d3e3c..6d0e1e4 100644
|
||||
--- a/coreconf/config.mk
|
||||
+++ b/coreconf/config.mk
|
||||
@@ -31,7 +31,7 @@ endif
|
||||
@@ -147,7 +132,7 @@ index f3d6809..b49f1d2 100644
|
||||
#ifndef BYTE_ORDER
|
||||
#define BYTE_ORDER __BYTE_ORDER
|
||||
diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile
|
||||
index e744314..535ac9a 100644
|
||||
index 70d17c6..2bb513a 100644
|
||||
--- a/lib/freebl/Makefile
|
||||
+++ b/lib/freebl/Makefile
|
||||
@@ -358,7 +358,7 @@ endif
|
||||
@@ -160,10 +145,10 @@ index e744314..535ac9a 100644
|
||||
endif
|
||||
|
||||
diff --git a/lib/freebl/stubs.c b/lib/freebl/stubs.c
|
||||
index a79cf69..21eec91 100644
|
||||
index 2347e0b..ed9f084 100644
|
||||
--- a/lib/freebl/stubs.c
|
||||
+++ b/lib/freebl/stubs.c
|
||||
@@ -813,6 +813,10 @@ freebl_InitNSSUtil(void *lib)
|
||||
@@ -828,6 +828,10 @@ freebl_InitNSSUtil(void *lib)
|
||||
return SECSuccess;
|
||||
}
|
||||
|
||||
@@ -239,5 +224,5 @@ index f99b4d0..36f86f1 100644
|
||||
#include <sys/types.h>
|
||||
#include "prtypes.h"
|
||||
--
|
||||
2.45.2
|
||||
2.51.0
|
||||
|
||||
Reference in New Issue
Block a user