From 8d70fda7ca5568e1bb8f267649e8854d86c6c0ed154eaeb9eb2e295b3a83e8cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 31 May 2024 14:27:54 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main apache-commons-daemon revision 67a56aa50fe88f2816cf7eb86bf11d2d --- apache-commons-daemon-JAVA_OS.patch | 8 +++++--- apache-commons-daemon-gcc14-compat.patch | 13 +++++++++++++ apache-commons-daemon.changes | 12 ++++++++++++ apache-commons-daemon.spec | 4 +++- 4 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 apache-commons-daemon-gcc14-compat.patch diff --git a/apache-commons-daemon-JAVA_OS.patch b/apache-commons-daemon-JAVA_OS.patch index bcdcdc4..90dd8d3 100644 --- a/apache-commons-daemon-JAVA_OS.patch +++ b/apache-commons-daemon-JAVA_OS.patch @@ -1,6 +1,8 @@ ---- commons-daemon-1.2.2-src.orig/src/native/unix/configure.in -+++ commons-daemon-1.2.2-src/src/native/unix/configure.in -@@ -98,7 +98,7 @@ then +Index: commons-daemon-1.3.4-src/src/native/unix/configure.in +=================================================================== +--- commons-daemon-1.3.4-src.orig/src/native/unix/configure.in ++++ commons-daemon-1.3.4-src/src/native/unix/configure.in +@@ -97,7 +97,7 @@ then AC_MSG_RESULT([jni_md.h found in $JAVA_HOME/$JAVA_INC]) INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC" else diff --git a/apache-commons-daemon-gcc14-compat.patch b/apache-commons-daemon-gcc14-compat.patch new file mode 100644 index 0000000..fa43124 --- /dev/null +++ b/apache-commons-daemon-gcc14-compat.patch @@ -0,0 +1,13 @@ +Index: commons-daemon-1.3.4-src/src/native/unix/native/jsvc-unix.c +=================================================================== +--- commons-daemon-1.3.4-src.orig/src/native/unix/native/jsvc-unix.c ++++ commons-daemon-1.3.4-src/src/native/unix/native/jsvc-unix.c +@@ -1308,7 +1308,7 @@ static int run_controller(arg_data *args + * These will be replaced in the child process. + */ + memset(&act, '\0', sizeof(act)); +- act.sa_handler = controller; ++ act.sa_handler = (void *) controller; + sigemptyset(&act.sa_mask); + act.sa_flags = SA_RESTART | SA_NOCLDSTOP | SA_SIGINFO; + diff --git a/apache-commons-daemon.changes b/apache-commons-daemon.changes index e58d8c7..323de24 100644 --- a/apache-commons-daemon.changes +++ b/apache-commons-daemon.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon May 6 11:08:35 UTC 2024 - Gus Kenion + +- Add apache-commons-daemon-gcc14-compat.patch for GCC 14 + compatibility. +- Correct offset in apache-commons-daemon-JAVA_OS.patch. + +------------------------------------------------------------------- +Tue Feb 20 11:03:50 UTC 2024 - Dominique Leuenberger + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Tue Feb 6 08:04:16 UTC 2024 - Fridrich Strba diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec index 103e666..f7000b7 100644 --- a/apache-commons-daemon.spec +++ b/apache-commons-daemon.spec @@ -31,6 +31,7 @@ Source1: https://archive.apache.org/dist/commons/daemon/source/%{short_na Source2: apache-commons-daemon.keyring Source10: apache-commons-daemon-build.xml Patch0: apache-commons-daemon-JAVA_OS.patch +Patch1: apache-commons-daemon-gcc14-compat.patch BuildRequires: ant BuildRequires: autoconf BuildRequires: fdupes @@ -76,7 +77,8 @@ The Javadoc Documentation for Commons Daemon. %prep %setup -q -n %{short_name}-%{version}-src cp %{SOURCE10} build.xml -%patch0 -p1 +%patch -P 0 -p1 +%patch -P 1 -p1 # remove java binaries from sources rm -rf src/samples/build/