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

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.4.0" />
+    <property name="project.version" value="1.3.4" />
 
     <property name="compiler.source" value="1.8" />
     <property name="compiler.target" value="${compiler.source}" />

apache-commons-daemon-gcc14-compat.patch

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

apache-commons-daemon.changes

@@ -1,28 +1,3 @@
--------------------------------------------------------------------
-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

@@ -20,7 +20,7 @@
 %define short_name commons-daemon
 %define _lto_cflags %{nil}
 Name:           apache-%{short_name}
-Version:        1.4.0
+Version:        1.3.4
 Release:        0
 Summary:        Commons Daemon - Controlling of Java Daemons
 License:        Apache-2.0

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

@@ -0,0 +1,17 @@
+-----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.0-src.tar.gz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmZHd5sACgkQEMAcWi9g
-Wee7sxAAqoiqUy96Oq8KEFlyiG7sGIb+LrkcOTelbOvRNR1ZjfbMcTCNWvKrKXa+
-2K2P4yxHJIPuQY84Vo9Y38qef07BDfPmi6jrR8hpDNpmgKJqIDlr0KVr819l63gz
-Yzd8CXgkGQG6Z1LFGiRl/7LiJw2lPA0OVWVBw1B25hvFaGm069pV+S5zcWGsBUJo
-4RV/oLcYvBqU5uIT6YBLmontaKxqgGyBaBlp6Flu21jyQSaTvLPyTzrpRGZ3s+EM
-m1pAu36iXGx9/KSTFEsTOBsW/vCL+ABONJWIbskrYeMJ0ukB8uP1OX7h/o7TUsLU
-DAxR7oShzF1ZCTAusa4GhEatb9mHaXX/D3sAPBrlBHT12BhAq+UaXry11QTT/Ds8
-fF+DSoWZeuyCAkd/meakbNGKvnIyjd7NJq0L0VxYih6pz7ZKFjV3o1LcGlBJ4f8B
-VfE99MAxNHQFE0624G8DpvQ0h4sX/3HPjZOnl/KeEiYqX3L2/jEeu7ICzSsbuB7B
-qGSsIOPxXWV8JIKg6kIfymc9OUQVu/UMf1+GQkix91dG8vyURyrHalykHm4rsqnk
-vsh1pJ3Y8ZbEgKqaGFdcfhoYr4GsGGEEZ48ehjpe0ChxjU9wAZTt+jxD5GJM9cDP
-HeCvx+W+4M+C5Ww9Wp4GYW+iZn3obP7hf2lAQ+yPbw78amJDSpA=
-=0V6W
------END PGP SIGNATURE-----