SLFO-pool/apache-commons-daemon
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main apache-commons-daemon revision 67a56aa50fe88f2816cf7eb86bf11d2d

Browse Source
This commit is contained in:
Adrian Schröter 2024-05-31 14:27:54 +02:00
parent 9c109b3a51
commit 8d70fda7ca
4 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apache-commons-daemon-JAVA_OS.patch
View File

@ -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

13
apache-commons-daemon-gcc14-compat.patch Normal file
View File

@ -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;

12
apache-commons-daemon.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon May 6 11:08:35 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
- 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 <dimstar@opensuse.org>
- Use %patch -P N instead of deprecated %patchN.
-------------------------------------------------------------------
Tue Feb 6 08:04:16 UTC 2024 - Fridrich Strba <fstrba@suse.com>

4
apache-commons-daemon.spec
View File

@ -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/