Accepting request 1172174 from Java:packages
OBS-URL: https://build.opensuse.org/request/show/1172174 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-daemon?expand=0&rev=25
This commit is contained in:
commit
ba2a6a0746
@ -1,6 +1,8 @@
|
|||||||
--- commons-daemon-1.2.2-src.orig/src/native/unix/configure.in
|
Index: commons-daemon-1.3.4-src/src/native/unix/configure.in
|
||||||
+++ commons-daemon-1.2.2-src/src/native/unix/configure.in
|
===================================================================
|
||||||
@@ -98,7 +98,7 @@ then
|
--- 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])
|
AC_MSG_RESULT([jni_md.h found in $JAVA_HOME/$JAVA_INC])
|
||||||
INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC"
|
INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/$JAVA_INC"
|
||||||
else
|
else
|
||||||
|
13
apache-commons-daemon-gcc14-compat.patch
Normal file
13
apache-commons-daemon-gcc14-compat.patch
Normal 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;
|
||||||
|
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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>
|
Tue Feb 20 11:03:50 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||||
|
|
||||||
|
@ -31,6 +31,7 @@ Source1: https://archive.apache.org/dist/commons/daemon/source/%{short_na
|
|||||||
Source2: apache-commons-daemon.keyring
|
Source2: apache-commons-daemon.keyring
|
||||||
Source10: apache-commons-daemon-build.xml
|
Source10: apache-commons-daemon-build.xml
|
||||||
Patch0: apache-commons-daemon-JAVA_OS.patch
|
Patch0: apache-commons-daemon-JAVA_OS.patch
|
||||||
|
Patch1: apache-commons-daemon-gcc14-compat.patch
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
@ -77,6 +78,7 @@ The Javadoc Documentation for Commons Daemon.
|
|||||||
%setup -q -n %{short_name}-%{version}-src
|
%setup -q -n %{short_name}-%{version}-src
|
||||||
cp %{SOURCE10} build.xml
|
cp %{SOURCE10} build.xml
|
||||||
%patch -P 0 -p1
|
%patch -P 0 -p1
|
||||||
|
%patch -P 1 -p1
|
||||||
|
|
||||||
# remove java binaries from sources
|
# remove java binaries from sources
|
||||||
rm -rf src/samples/build/
|
rm -rf src/samples/build/
|
||||||
|
Loading…
Reference in New Issue
Block a user