[packages/java-commons-daemon] Up to 1.5.1

[arekm]

commit 709af2edb1e3284d97b09e6237304a89b3820b13
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Mar 10 18:32:56 2026 +0100

    Up to 1.5.1

 build.xml                | 65 ++++++++++++++++++++++++++++++++++++++++++++++++
 java-commons-daemon.spec | 22 ++++++++--------
 stdbool.patch            | 19 ++++++++++++++
 3 files changed, 94 insertions(+), 12 deletions(-)
---
diff --git a/java-commons-daemon.spec b/java-commons-daemon.spec
index 31a1563..01a6de6 100644
--- a/java-commons-daemon.spec
+++ b/java-commons-daemon.spec
@@ -5,26 +5,26 @@
 Summary:	Commons Daemon - controlling of Java daemons
 Summary(pl.UTF-8):	Commons Daemon - kontrolowanie demonów w Javie
 Name:		java-commons-daemon
-Version:	1.1.0
-Release:	2
+Version:	1.5.1
+Release:	1
 License:	Apache v2.0
 Group:		Libraries/Java
 # -Source0:       http://www.apache.org/dist/commons/daemon/source/commons-daemon-%{version}-src.tar.gz
 Source0:	https://archive.apache.org/dist/commons/daemon/source/commons-daemon-%{version}-src.tar.gz
-# Source0-md5:	e5a08e844412147a61a7ef9a19f39978
-Patch0:		build.patch
-URL:		http://commons.apache.org/daemon/
+# Source0-md5:	43b2264d372280389f8997e7ee3d4c01
+# Ant build file for building without Maven
+Source1:	build.xml
+Patch0:		stdbool.patch
+URL:		https://commons.apache.org/proper/commons-daemon/
 BuildRequires:	ant >= 1.4.1
+BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
 BuildRequires:	docbook-dtd412-xml
-BuildRequires:	java-junit >= 3.7
 BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	xmlto >= 0:0.0.18-1
-Requires:	java-commons-collections >= 2.0
-Requires:	java-commons-logging >= 1.0
 Requires:	jpackage-utils
 Obsoletes:	jakarta-commons-daemon
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -71,12 +71,10 @@ Dokumentacja do Commons Daemon.
 %prep
 %setup -q -n %{srcname}-%{version}-src
 %patch -P0 -p1
+cp -a %{SOURCE1} .
 
 %build
 # Java part
-required_jars="junit"
-CLASSPATH=$(build-classpath $required_jars)
-export CLASSPATH
 %ant jar %{?with_javadoc:javadoc}
 
 # native part
@@ -114,7 +112,7 @@ ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
 
 %files
 %defattr(644,root,root,755)
-%doc PROPOSAL.html RELEASE-NOTES.txt README
+%doc PROPOSAL.html RELEASE-NOTES.txt README.md
 %{_javadir}/*.jar
 
 %files -n jsvc
diff --git a/build.xml b/build.xml
new file mode 100644
index 0000000..53423ef
--- /dev/null
+++ b/build.xml
@@ -0,0 +1,65 @@
+<project name="Daemon" default="jar" basedir=".">
+
+  <property name="component.name"    value="daemon"/>
+  <property name="component.version" value="1.5.1"/>
+
+  <property name="build.home"   value="target"/>
+  <property name="dist.home"    value="dist"/>
+  <property name="source.home"  value="src/main/java"/>
+
+  <property name="compile.source" value="1.8"/>
+  <property name="compile.target" value="1.8"/>
+
+  <path id="compile.classpath">
+    <pathelement location="${build.home}/classes"/>
+  </path>
+
+  <target name="compile">
+    <mkdir dir="${build.home}/classes"/>
+    <javac srcdir="${source.home}"
+           destdir="${build.home}/classes"
+           debug="true"
+           source="${compile.source}"
+           target="${compile.target}"
+           deprecation="true"
+           includeantruntime="false">
+      <classpath refid="compile.classpath"/>
+    </javac>
+  </target>
+
+  <target name="jar" depends="compile">
+    <mkdir dir="${dist.home}"/>
+    <mkdir dir="${build.home}/classes/META-INF"/>
+    <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
+    <copy file="NOTICE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
+    <jar jarfile="${dist.home}/commons-${component.name}-${component.version}.jar">
+      <manifest>
+        <attribute name="Specification-Title" value="Commons Daemon"/>
+        <attribute name="Specification-Version" value="${component.version}"/>
+        <attribute name="Specification-Vendor" value="Apache Software Foundation"/>
+        <attribute name="Implementation-Title" value="Commons Daemon"/>
+        <attribute name="Implementation-Version" value="${component.version}"/>
+        <attribute name="Implementation-Vendor" value="Apache Software Foundation"/>
+      </manifest>
+      <fileset dir="${build.home}/classes">
+        <include name="org/apache/commons/daemon/**"/>
+        <include name="META-INF/LICENSE.txt"/>
+        <include name="META-INF/NOTICE.txt"/>
+      </fileset>
+    </jar>
+  </target>
+
+  <target name="javadoc" depends="compile">
+    <mkdir dir="${dist.home}/docs/api"/>
+    <javadoc sourcepath="${source.home}"
+             destdir="${dist.home}/docs/api"
+             packagenames="org.apache.commons.*"
+             author="true"
+             version="true"
+             doctitle="<h1>Java Daemons</h1>"
+             windowtitle="Java Daemons (Version ${component.version})">
+      <classpath refid="compile.classpath"/>
+    </javadoc>
+  </target>
+
+</project>
diff --git a/stdbool.patch b/stdbool.patch
new file mode 100644
index 0000000..bfb9f3a
--- /dev/null
+++ b/stdbool.patch
@@ -0,0 +1,19 @@
+# Use standard stdbool.h unconditionally instead of custom bool enum.
+# C23 makes bool/true/false keywords, so the custom enum no longer compiles.
+--- a/src/native/unix/native/jsvc.h.orig	2025-12-11 13:00:00.000000000 +0100
++++ b/src/native/unix/native/jsvc.h	2026-03-10 18:30:21.729984242 +0100
+@@ -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"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/java-commons-daemon.git/commitdiff/709af2edb1e3284d97b09e6237304a89b3820b13