From 4cd7843a01a90f065f820b31aae45cb13c244858 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 17 Apr 2024 07:42:26 +0200
Subject: Adding debian version 2:3.99-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/patches/38_hurd.patch           | 59 ++++++++++++++++++++++++++++++++++
 debian/patches/80_security_tools.patch | 26 +++++++++++++++
 debian/patches/series                  |  2 ++
 3 files changed, 87 insertions(+)
 create mode 100644 debian/patches/38_hurd.patch
 create mode 100644 debian/patches/80_security_tools.patch
 create mode 100644 debian/patches/series

(limited to 'debian/patches')

diff --git a/debian/patches/38_hurd.patch b/debian/patches/38_hurd.patch
new file mode 100644
index 0000000..7fa6d84
--- /dev/null
+++ b/debian/patches/38_hurd.patch
@@ -0,0 +1,59 @@
+## 38_hurd.patch by  <glandium@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FTBFS on Hurd because of MAXPATHLEN
+
+Index: nss/nss/cmd/shlibsign/shlibsign.c
+===================================================================
+--- nss.orig/nss/cmd/shlibsign/shlibsign.c
++++ nss/nss/cmd/shlibsign/shlibsign.c
+@@ -1260,7 +1260,6 @@ main(int argc, char **argv)
+ #ifdef USES_LINKS
+     int ret;
+     struct stat stat_buf;
+-    char link_buf[MAXPATHLEN + 1];
+     char *link_file = NULL;
+ #endif
+ 
+@@ -1511,10 +1510,22 @@ main(int argc, char **argv)
+     }
+     if (S_ISLNK(stat_buf.st_mode)) {
+         char *dirpath, *dirend;
+-        ret = readlink(input_file, link_buf, sizeof(link_buf) - 1);
+-        if (ret < 0) {
+-            perror(input_file);
+-            goto cleanup;
++        char *link_buf = NULL;
++        size_t size = 64;
++        while (1) {
++            link_buf = realloc(link_buf, size);
++            if (!link_buf) {
++                perror(input_file);
++                goto cleanup;
++            }
++            ret = readlink(input_file, link_buf, size - 1);
++            if (ret < 0) {
++                perror(input_file);
++                goto cleanup;
++            }
++            if (ret < size - 1)
++                break;
++            size *= 2;
+         }
+         link_buf[ret] = 0;
+         link_file = mkoutput(input_file);
+Index: nss/nss/lib/freebl/unix_rand.c
+===================================================================
+--- nss.orig/nss/lib/freebl/unix_rand.c
++++ nss/nss/lib/freebl/unix_rand.c
+@@ -756,6 +756,10 @@ RNG_FileForRNG(const char *fileName)
+ #define _POSIX_PTHREAD_SEMANTICS
+ #include <dirent.h>
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 1024
++#endif
++
+ PRBool
+ ReadFileOK(char *dir, char *file)
+ {
diff --git a/debian/patches/80_security_tools.patch b/debian/patches/80_security_tools.patch
new file mode 100644
index 0000000..50f994f
--- /dev/null
+++ b/debian/patches/80_security_tools.patch
@@ -0,0 +1,26 @@
+## 80_security_tools.patch by Mike Hommey <glandium@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Enable building of some NSS tools.
+## DP: Disable rpath.
+
+Index: nss/nss/cmd/platlibs.mk
+===================================================================
+--- nss.orig/nss/cmd/platlibs.mk
++++ nss/nss/cmd/platlibs.mk
+@@ -8,6 +8,7 @@ ifeq ($(BUILD_SUN_PKG), 1)
+ # set RPATH-type linker instructions here so they can be used in the shared
+ # version and in the mixed (static nss libs/shared NSPR libs) version.
+ 
++ifdef ENABLE_RPATH
+ ifeq ($(OS_ARCH), SunOS) 
+ ifeq ($(USE_64), 1)
+ EXTRA_SHARED_LIBS += -R '$$ORIGIN/../lib:/usr/lib/mps/secv1/64:/usr/lib/mps/64'
+@@ -31,6 +32,7 @@ DBMLIB = $(NULL)
+ else
+ DBMLIB = $(DIST)/lib/$(LIB_PREFIX)dbm.$(LIB_SUFFIX) 
+ endif
++endif
+ 
+ ifeq ($(NSS_BUILD_UTIL_ONLY),1)
+ SECTOOL_LIB = $(NULL)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..17f55c0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+38_hurd.patch
+80_security_tools.patch
-- 
cgit v1.2.3