git: 04881e888be4 - main - devel/apache-commons-daemon: Update to 1.6.0

The branch main has been updated by michaelo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=04881e888be43d7a55c9aa2861b7872e1fed1f9b

commit 04881e888be43d7a55c9aa2861b7872e1fed1f9b
Author:     Michael Osipov <michaelo@FreeBSD.org>
AuthorDate: 2026-05-29 19:16:25 +0000
Commit:     Michael Osipov <michaelo@FreeBSD.org>
CommitDate: 2026-06-05 16:25:13 +0000

    devel/apache-commons-daemon: Update to 1.6.0
    
    Approved by:    ale (maintainer)
    Changelog:      https://commons.apache.org/proper/commons-daemon/changes.html#a1.6.0
    Differential Revision:  https://reviews.freebsd.org/D57344
---
 devel/apache-commons-daemon/Makefile               |  9 +++---
 devel/apache-commons-daemon/distinfo               | 10 +++---
 .../files/patch-native_jsvc-unix.c                 | 36 ----------------------
 3 files changed, 9 insertions(+), 46 deletions(-)

diff --git a/devel/apache-commons-daemon/Makefile b/devel/apache-commons-daemon/Makefile
index fc312d9bf328..6663f13d58e6 100644
--- a/devel/apache-commons-daemon/Makefile
+++ b/devel/apache-commons-daemon/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	commons-daemon
-DISTVERSION=	1.5.1
-PORTREVISION=	3
+DISTVERSION=	1.6.0
 CATEGORIES=	devel java
-MASTER_SITES=	https://archive.apache.org/dist/commons/daemon/source/:src \
-		https://archive.apache.org/dist/commons/daemon/binaries/:bin
+MASTER_SITES=	APACHE_COMMONS_SOURCE:src \
+		APACHE_COMMONS_BINARIES:bin
 PKGNAMEPREFIX=	apache-
 DISTFILES=	${PORTNAME}-${DISTVERSION}-native-src${EXTRACT_SUFX}:src \
 		${PORTNAME}-${DISTVERSION}-bin${EXTRACT_SUFX}:bin
@@ -14,7 +13,7 @@ WWW=		https://commons.apache.org/proper/commons-daemon/
 
 LICENSE=	APACHE20
 
-USES=		java
+USES=		autoreconf java
 JAVA_OS=	native
 
 GNU_CONFIGURE=	yes
diff --git a/devel/apache-commons-daemon/distinfo b/devel/apache-commons-daemon/distinfo
index 9205d1a23d61..c8c68b44b06b 100644
--- a/devel/apache-commons-daemon/distinfo
+++ b/devel/apache-commons-daemon/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1766504195
-SHA256 (commons-daemon-1.5.1-native-src.tar.gz) = 0bd16d26bb5ac180c7312d8ad7153a2f06f3ecec8eda78ed22cdfeaa88eaa7c3
-SIZE (commons-daemon-1.5.1-native-src.tar.gz) = 218507
-SHA256 (commons-daemon-1.5.1-bin.tar.gz) = a70fb62f8e7094a2ad374a8a92285f6cec8ffa6f7e9041c6749d96b28bdcc656
-SIZE (commons-daemon-1.5.1-bin.tar.gz) = 474865
+TIMESTAMP = 1780056285
+SHA256 (commons-daemon-1.6.0-native-src.tar.gz) = f5d264c5fa941b07f99d7fd5311a1d780734da8d665815e5889b78655357cb42
+SIZE (commons-daemon-1.6.0-native-src.tar.gz) = 159264
+SHA256 (commons-daemon-1.6.0-bin.tar.gz) = 9a0192b6bc9e732791d8f743123331bcf33a859f54e4cf3c01a71951da028729
+SIZE (commons-daemon-1.6.0-bin.tar.gz) = 283360
diff --git a/devel/apache-commons-daemon/files/patch-native_jsvc-unix.c b/devel/apache-commons-daemon/files/patch-native_jsvc-unix.c
index 15f5dfe86db5..a8b9aa4c451f 100644
--- a/devel/apache-commons-daemon/files/patch-native_jsvc-unix.c
+++ b/devel/apache-commons-daemon/files/patch-native_jsvc-unix.c
@@ -1,32 +1,5 @@
 --- native/jsvc-unix.c.orig	2025-12-11 12:00:00 UTC
 +++ native/jsvc-unix.c
-@@ -608,11 +608,12 @@ retry:
-                 return 122;
-             }
-         }
--        lseek(fd, SEEK_SET, 0);
--        pidf = fdopen(fd, "r+");
--        fprintf(pidf, "%d\n", (int)getpid());
--        fflush(pidf);
--        fclose(pidf);
-+        char buf[32];
-+        int len = snprintf(buf, sizeof(buf), "%d\n", (int)getpid());
-+        lseek(fd, 0, SEEK_SET);
-+        ftruncate(fd, 0);
-+        write(fd, buf, len);
-+        fsync(fd);
-         if (lockf(fd, F_ULOCK, 0)) {
-             log_error("check_pid: Failed to unlock PID file [%s] with file descriptor [%d] after reading due to [%d]",
-                     args->pidf, fd, errno);
-@@ -673,7 +674,7 @@ static int get_pidf(arg_data *args, bool quiet)
-     int i;
-     char buff[80];
- 
--    fd = open(args->pidf, O_RDONLY, 0);
-+    fd = open(args->pidf, O_RDWR, 0);
-     if (!quiet)
-         log_debug("get_pidf: %d in %s", fd, args->pidf);
-     if (fd < 0) {
 @@ -755,18 +756,13 @@ static int wait_child(arg_data *args, int pid)
   */
  static int wait_child(arg_data *args, int pid)
@@ -48,15 +21,6 @@
      while (count > 0) {
          sleep(1);
          /* check if the controler is still running */
-@@ -778,7 +774,7 @@ static int wait_child(arg_data *args, int pid)
-         }
- 
-         /* check if the pid file process exists */
--        fd = open(args->pidf, O_RDONLY);
-+        fd = open(args->pidf, O_RDWR);
-         if (fd < 0 && havejvm) {
-             /* something has gone wrong the JVM has stopped */
-             return 1;
 @@ -812,7 +808,6 @@ static int wait_child(arg_data *args, int pid)
                  }
              }