From nobody Wed Dec 24 09:54:02 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4dbnJv3jQfz6D0Hq for ; Wed, 24 Dec 2025 09:54:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dbnJv2hJ1z3PWV for ; Wed, 24 Dec 2025 09:54:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766570047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z/zVXGwpEsdd0QVWWiKjMMjBcCbbaBTgAPOtiNti+/k=; b=E1TB7EtHk77XoMstVXZ73bQ+aYIWNFVzyqCI8WkyN6AQ8fYN21hNw237QyDhTeI2OkFqh4 ci2xfzAChBC52mZ2hpr8krMoEbWTsmI9WxbazrN9BD/n0k4nwEtydvhDMPyXjf4gPkKfEQ cDIqp5lLx9pvT+jgi1e/uJirS9BYUaY6Rv1g38C/KCVZ5zPmv8EQ4iPGJW0zvg7QMJx0hP pAs7CbMqem+0ellmm40Lvw9blZ/voXkDxLCz5sx7BTjwE5bfijPnDWbMPLmgrROul/qG+x wk/Qf9U5+/iZqapYTWzrXcm3r9ILLgx3zp6NpbRJMsrr3f5HokR6a+xGO8bywA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766570047; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z/zVXGwpEsdd0QVWWiKjMMjBcCbbaBTgAPOtiNti+/k=; b=W5ZDVhBBWGmobXL0R2p1rwKeaUv86noT4UQe8uhsEpZOrYO5V2yz6VqCR7PoFsOHNOsj+p fGaZCo3XB4E/OKiobdQX/XBYjO8xdYMe8Oy9Gu3o3/lm+CveY8ooY5hUF3ag19mN6YTTv8 kwnKwrCk1WIS4yq5ss0vVn8K/l3cZB+/Z27ch1ctEx/2YuDmXkDKFMcDZQ5jml5yczUy83 u0eluue+xm2n5F3z6OcLTri7qC6zYjJxqQ27CVsr9Niuuiq+Cm1iU3IPA1tD1X/wVWD3VC hDI/BdV3CkCT9aQpuvUq9WqN7ZARwLLXSbkoxaeWnE+Ey0V39U1CcW3JWIVhGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766570047; a=rsa-sha256; cv=none; b=Bcp1NU/eWnjGecvhf9aaWukn4P/ZCv/CV0vRkrI9CMkZVzq0Gw6SeHvCkGnlcwF5S+4sjG 0ZB9+3eqFpcy2AuKi0oVUYarVHcdhFoWhnhavetpXqni+w965kzM0aUbIxpVjdgLDvy+iL wver03pouHwIl7JZgn8hwDZvsgXYfA1FlMc3FyjSawPQo+0GW00KTHZekcB3Dxm4MY4/pc KTTtFB6Dywn2NF41U9An0M8Moox+ucd0BAXxzfAcoF8UFXP6zKHX43Xkhzmr4DWUOb3TBS zkSh/ATMkcEjap5ePhRhiF3LTv0Er4dAvfS+yrVapycVHz/hRbk9cp2FdilMUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dbnJp1sFwzdMP for ; Wed, 24 Dec 2025 09:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 47786 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 24 Dec 2025 09:54:02 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alex Dupre Subject: git: 96e139a7a40b - main - devel/apache-commons-daemon: fix bugs in PID handling List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96e139a7a40b2eadd78ac673c7741de5aec7af8d Auto-Submitted: auto-generated Date: Wed, 24 Dec 2025 09:54:02 +0000 Message-Id: <694bb83a.47786.2d4e7907@gitrepo.freebsd.org> The branch main has been updated by ale: URL: https://cgit.FreeBSD.org/ports/commit/?id=96e139a7a40b2eadd78ac673c7741de5aec7af8d commit 96e139a7a40b2eadd78ac673c7741de5aec7af8d Author: Alex Dupre AuthorDate: 2025-12-24 09:52:58 +0000 Commit: Alex Dupre CommitDate: 2025-12-24 09:53:57 +0000 devel/apache-commons-daemon: fix bugs in PID handling --- devel/apache-commons-daemon/Makefile | 1 + .../files/patch-native_jsvc-unix.c | 50 +++++++++++++++++++--- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/devel/apache-commons-daemon/Makefile b/devel/apache-commons-daemon/Makefile index 1ab02ad7f0c8..a2b026a2a2af 100644 --- a/devel/apache-commons-daemon/Makefile +++ b/devel/apache-commons-daemon/Makefile @@ -1,5 +1,6 @@ PORTNAME= commons-daemon DISTVERSION= 1.5.1 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= https://archive.apache.org/dist/commons/daemon/source/:src \ https://archive.apache.org/dist/commons/daemon/binaries/:bin 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 8b2486ff416f..15f5dfe86db5 100644 --- a/devel/apache-commons-daemon/files/patch-native_jsvc-unix.c +++ b/devel/apache-commons-daemon/files/patch-native_jsvc-unix.c @@ -1,6 +1,33 @@ ---- native/jsvc-unix.c.orig 2025-01-06 00:00:00 UTC +--- native/jsvc-unix.c.orig 2025-12-11 12:00:00 UTC +++ native/jsvc-unix.c -@@ -731,18 +731,13 @@ static int wait_child(arg_data *args, int pid) +@@ -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) { @@ -21,7 +48,16 @@ while (count > 0) { sleep(1); /* check if the controler is still running */ -@@ -781,7 +776,6 @@ static int wait_child(arg_data *args, int pid) +@@ -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) } } } @@ -29,7 +65,7 @@ count--; } /* It takes more than the wait time to start, -@@ -915,11 +909,11 @@ static int child(arg_data *args, home_data *data, uid_ +@@ -946,11 +941,11 @@ static int child(arg_data *args, home_data *data, uid_ create_tmp_file(args); while (!stopping) { #if defined(OSD_POSIX) @@ -43,7 +79,7 @@ #endif if (doreopen) { doreopen = false; -@@ -938,7 +932,7 @@ static int child(arg_data *args, home_data *data, uid_ +@@ -969,7 +964,7 @@ static int child(arg_data *args, home_data *data, uid_ return 6; if (doreload == true) @@ -52,7 +88,7 @@ else ret = 0; -@@ -1348,10 +1342,10 @@ static int run_controller(arg_data *args, home_data *d +@@ -1385,10 +1380,10 @@ static int run_controller(arg_data *args, home_data *d if (args->vers != true && args->chck != true && status != 122) remove_pid_file(args, pid); @@ -65,7 +101,7 @@ if (args->restarts == 0) { log_debug("Service failure, restarts disabled"); return 1; -@@ -1363,7 +1357,7 @@ static int run_controller(arg_data *args, home_data *d +@@ -1400,7 +1395,7 @@ static int run_controller(arg_data *args, home_data *d log_debug("Reloading service"); restarts++; /* prevent looping */