Accepting request 1286055 from Java:packages

gcc15 fix

OBS-URL: https://build.opensuse.org/request/show/1286055
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-daemon?expand=0&rev=28

apache-commons-daemon-JAVA_OS.patch

@@ -1,13 +0,0 @@
-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
--  INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$supported_os"
-+  INCLUDES="$INCLUDES -I$JAVA_HOME/include -I$JAVA_HOME/include/$JAVA_OS"
- fi
- 
- dnl -------------------------------------------------------------------------

apache-commons-daemon-build.xml

@@ -5,7 +5,7 @@
 
     <property name="project.groupId" value="commons-daemon" />
     <property name="project.artifactId" value="commons-daemon" />
-    <property name="project.version" value="1.3.4" />
+    <property name="project.version" value="1.4.1" />
 
     <property name="compiler.source" value="1.8" />
     <property name="compiler.target" value="${compiler.source}" />

apache-commons-daemon-gcc14-compat.patch

@@ -1,13 +1,11 @@
-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
+--- a/src/native/unix/native/jsvc-unix.c
++++ b/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;
+-    act.sa_sigaction = controller;
++    act.sa_sigaction = (void *) controller;
      sigemptyset(&act.sa_mask);
      act.sa_flags = SA_RESTART | SA_NOCLDSTOP | SA_SIGINFO;
  

apache-commons-daemon-gcc15-compat.patch

@@ -0,0 +1,17 @@
+--- commons-daemon-1.4.1-src/src/native/unix/native/jsvc.h	2025-06-16 12:23:28.480247383 +0200
++++ commons-daemon-1.4.1-src/src/native/unix/native/jsvc.h	2025-06-16 12:23:34.839446001 +0200
+@@ -25,14 +25,7 @@
+ #include <sys/stat.h>
+ 
+ /* Definitions for booleans */
+-#ifdef OS_DARWIN
+ #include <stdbool.h>
+-#else
+-typedef enum {
+-    false,
+-    true
+-} bool;
+-#endif
+ 
+ #include "version.h"
+ #include "debug.h"

apache-commons-daemon.changes

@@ -1,3 +1,51 @@
+-------------------------------------------------------------------
+Mon Jun 16 10:26:21 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * apache-commons-daemon-gcc15-compat.patch
+    + Fix build with GCC 15
+
+-------------------------------------------------------------------
+Mon Mar 31 12:38:07 UTC 2025 - Gus Kenion <gus.kenion@suse.com>
+
+- Upgrade to 1.4.1
+  * Bug Fixes:
+    + several issues around Java OS and header files location
+      detection.
+    + Correct several log messages where an incorrect placeholder
+      led to truncation of the inserted values.
+  * New Features
+    + Add protection to avoid high CPU usage for applications
+      running in JVM mode that do not wait for the stop method to
+      be called before the start method returns. Fixes DAEMON-460.
+    + The minimum Java version has been increased to Java 8
+- Remove apache-commons-daemon-JAVA_OS.patch - patched in 1.4.1
+
+-------------------------------------------------------------------
+Mon Aug 12 11:42:00 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
+
+- Upgrade to 1.4.0
+  * Fixes:
+    + [StepSecurity] ci: Harden GitHub Actions #95.
+    + Procrun. Enable Control Flow Guard for Windows binaries.
+      Fixes DAEMON-429.
+    + Procrun. Better label for command used to start service shown
+      in Prunmgr.exe. Fixes DAEMON-461.
+    + jsvc. Fix warnings when running support/buildconf.sh
+    + jsvc. Fix compilation issue with newer compilers. Fixes
+    + Procrun. Refactor UAC support so that elevation is only
+      requested for actions that require administrator privileges.
+  * New Features:
+    + Procrun. Add support for hybrid CRT builds.
+    + jsvc. Add support for LoongArch64 support #92.
+  * Update dependencies:
+    + Bump commons-parent from 57 to 69 #155.
+    + The minimum support Java version has been upgraded from Java
+      7 to Java 8.
+    + Bump commons-parent from 69 to 70.
+- Revise apache-commons-daemon-gcc14-compat.patch for compatibility
+  with version 1.4.0
+
 -------------------------------------------------------------------
 Mon May  6 11:08:35 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
 

apache-commons-daemon.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-daemon
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %define short_name commons-daemon
 %define _lto_cflags %{nil}
 Name:           apache-%{short_name}
-Version:        1.3.4
+Version:        1.4.1
 Release:        0
 Summary:        Commons Daemon - Controlling of Java Daemons
 License:        Apache-2.0
@@ -30,8 +30,8 @@ Source0:        https://archive.apache.org/dist/commons/daemon/source/%{short_na
 Source1:        https://archive.apache.org/dist/commons/daemon/source/%{short_name}-%{version}-src.tar.gz.asc
 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
+Patch0:         apache-commons-daemon-gcc14-compat.patch
+Patch1:         apache-commons-daemon-gcc15-compat.patch
 BuildRequires:  ant
 BuildRequires:  autoconf
 BuildRequires:  fdupes

commons-daemon-1.3.4-src.tar.gz.asc

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Comment: GPGTools - http://gpgtools.org
-
-iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmRU0scACgkQEMAcWi9g
-WecYxw/+IYJPDfFdlR+0QDoRsQcNQRxPSh9Zx6rlHrdV0vCPiC8J7X8XxYcBLCqc
-Jh7hCmwek/nWn7fHPP+CVJ6K8t/d7GGkHXEdmZ+eJTSoGSnEQQwYGgrJiPTQ4hLQ
-oQ2MUxHpKD0ZdHchCm8ogZ4BHuESmGghdVABxb2QhsLnSm/IYpAeSs5D/t+3+pVa
-pIrCQ3Ihnk3UZHoZlsjG8zdPxnmgA1xXp4Nqrt5+2WORxvrzyTcKA7h7s6DtgPnb
-7ddmo7NESuKHSymQPw6utQVNycmM/C8+MAVUy33AP829j4Q75tebkBsYlK38JiyQ
-SiYe0SCP35IRlAPE81moMPjpp7v5vkxU6TXzMc+27meEHn0+bJLqx3wUlCy4WOp7
-HA4/7sjszvf3+eNz0zq0txSY5AOk/ODXmTyuQiC4hgdPzzgHRft/JzcVhiey5MF8
-4mQL8DCN+Nqh1ooyTutiDF3q4m8aDJNiBEWbKJ4OMbyURLJOL43DaLvz8DLxXFOo
-cMW6BIOPWkOxdRCxqToeo+vyT+c7DGdaXsPVp49EIZJPWyk+88/xIK76dZHvlUSN
-Z+LVEDDy5kC6AIDAuA1VG5VE9pL9r9s9YUnGgAciAP3oF+QKHxeuqQl5ygQo5Igk
-iARErXrfm3qpA8CQfPiOkAbHvrJvnKTx6GY4Q5K6VcgbQLTpOgk=
-=wz0c
------END PGP SIGNATURE-----

commons-daemon-1.4.1-src.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8fb223456ea6df0c61f3c65afb4a8f2c66ddfde4100160427b8ce98b1215131
+size 292677

commons-daemon-1.4.1-src.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmd9PWAACgkQEMAcWi9g
+WefOHBAAoOyaOXMW4NgLZaE8ldfYG1kcaXlY06mw9yZ9ebiv/z1ozKCwwYCnR1M/
+tl4/lzPWLoZj7ij9qbr3BZAd2vXfLAkmV8dYN6nQCtwE6ZxbFPWN6ipzqaiAsgfX
+1dz9cv9M07icqGnM25gRMc6w9uXPOpkjTmOG7q3/Fsrik2b7sGOLvLSQ93oC6XTo
+Y7o5zzpXFfR268snR03vOXBf2MqYZ7PkfhC0FBVov3j1HSLAyM5n1FIPXZZqcMV2
+53eKgMIv/1tzMZsP20pWGCVg5BiNsAOF+jLY2shEk296VORiKnF9fClimQAGyXrD
+nzQPLTbJU0joLtO9bv/h7oy8tk9Lk12WCs08xM1D9MfMdsN8eqDBFE/ZWbJk8q0O
+KJibQonWide1zn4rPBryqbi8H2SGrRRlAxLBcTRQM8JqJyxLeGTaM7qnHdt0p2es
+taT64s8EQVQNuepbJxXvBuKuCloY+inkeN69JE2GtkZ6q5FAt9hY4IpRnhOXNP/a
+D6GN4HVStel0MYpHF/cFmDAIduCPfTyHmG1tWNHx2lzs+zo5Wn7qPCF2P67xgmh8
+/b+9YogU2MVF9u7GHomlm/uUKHAmOEJNUtTD0Ge1rfF01xsMc7BIDXhH5y5Y4WPp
+cscNMr/jEzll0GwMzb+MzzvOJsspTAdB81gqWG/KcO+Hug+Lc74=
+=ck8N
+-----END PGP SIGNATURE-----