8
0

6 Commits

9 changed files with 64 additions and 37 deletions

View File

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

View File

@@ -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.4.1" />
<property name="compiler.source" value="1.8" />
<property name="compiler.target" value="${compiler.source}" />

View File

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

View File

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

View File

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

BIN
commons-daemon-1.4.0-src.tar.gz (Stored with Git LFS)

Binary file not shown.

View File

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

View File

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

View File

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