Bug 272789 - sysutils/syslog-ng: Wrong dependency after latest update
Summary: sysutils/syslog-ng: Wrong dependency after latest update
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Some People
Assignee: Cy Schubert
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2023-07-29 07:47 UTC by Christian Ullrich
Modified: 2023-07-29 11:24 UTC (History)
0 users

See Also:
bugzilla: maintainer-feedback? (cy)


Attachments
Patch. (651 bytes, text/plain)
2023-07-29 07:47 UTC, Christian Ullrich
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Christian Ullrich 2023-07-29 07:47:08 UTC
Created attachment 243681 [details]
Patch.

Hello,

here is your regularly scheduled post-update bug that minimal testing would have revealed.

Patch attached.
Comment 1 Cy Schubert freebsd_committer freebsd_triage 2023-07-29 10:52:49 UTC
I'm not sure what you're talking about. The update already contains this patch.

Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: Wed Jul 26 20:38:45 2023 -0700
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: Fri Jul 28 21:36:44 2023 -0700

    sysutils/syslog-ng: Update to 4.3.0
    
    Patch was created and tested by our upstream representative
    Peter Czanik.
    
    Submitted by:   Peter Czanik (CzP) <peter.czanik@oneidentity.com>
                    Balabit (a OneIdentity company) / syslog-ng upstream

diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index de27c690ffc1..784830696b42 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=      syslog-ng
-DISTVERSION=       4.2.0
+DISTVERSION= 4.3.0
 CATEGORIES=    sysutils
 # official master site:
 MASTER_SITES=  https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
@@ -16,11 +16,12 @@ LICENSE_FILE=       ${WRKSRC}/COPYING
 
 BROKEN_sparc64=                fails to link: Internal error: Segmentation fault (program ld)
 
-LIB_DEPENDS=       libpcre.so:devel/pcre \
-           libuuid.so:misc/e2fsprogs-libuuid
+LIB_DEPENDS= libpcre2-8.so:devel/pcre \
+         libuuid.so:misc/e2fsprogs-libuuid \
+         libivykis.so:devel/ivykis

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
See here.

 
 USES=          autoreconf:build compiler:c11 cpe gettext-runtime gmake gnome \
-           libtool pathfix pkgconfig python:build shebangfix ssl
+         libtool pathfix pkgconfig python:3.5+,build shebangfix ssl
 
 CPE_VENDOR=    oneidentity
 
@@ -30,7 +31,7 @@ CONFLICTS?=   syslog-ng syslog-ng[0-9] \


Additional comments to come later...
Comment 2 Christian Ullrich 2023-07-29 10:56:42 UTC
Look closely. The origin should be devel/pcre2, not devel/pcre.
Comment 3 Cy Schubert freebsd_committer freebsd_triage 2023-07-29 11:08:18 UTC
Additionally, even applying your patch only changed some whitespace.

slippy$ git am /tmp/syslog-ng.diff 
Patch format detection failed.
slippy$ git apply /tmp/syslog-ng.diff 
slippy$ git diff
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 784830696b42..dab4dc1d41d1 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
 
 BROKEN_sparc64=                fails to link: Internal error: Segmentation fault (program ld)
 
-LIB_DEPENDS=       libpcre2-8.so:devel/pcre \
+LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \
                libuuid.so:misc/e2fsprogs-libuuid \
                libivykis.so:devel/ivykis
 
slippy$ 

What is your patch supposed to accomplish?

BTW: the patch which you say was, "minimally tested," was actually tested, and returned to our upstream because of a build error in their ivykis support, which your patch is supposed to address and was addressed by the second submission by our upstream. Or put it another way, our upstream submitted a new syslog-ng update that WAS your patch above. Your patch would have fixed the first version of our upstream's patch submitted to me but our upstream had already fixed it before this update even hit our ports tree.
Comment 4 Cy Schubert freebsd_committer freebsd_triage 2023-07-29 11:08:59 UTC
(In reply to Christian Ullrich from comment #2)

Yes, pcre2 should have been used instead of pcre.
Comment 5 commit-hook freebsd_committer freebsd_triage 2023-07-29 11:15:13 UTC
A commit in branch main references this bug:

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

commit d491ae3853001bf91450016501b1ab627bb8b083
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2023-07-29 11:10:08 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2023-07-29 11:14:21 +0000

    sysutils/syslog-ng: Correct dependency

    Syslog-ng now depends on devel/pcre2 instead of devel/pcre. This
    was missed when upstream's patch updating the port was submitted.

    PR:             272789
    Fixes:          c0c1145055f0

 sysutils/syslog-ng/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Comment 6 Cy Schubert freebsd_committer freebsd_triage 2023-07-29 11:21:35 UTC
Thanks for pointing this out. I had identified this problem early on but the issue was dropped/forgotten while the ivkys build problem was being addressed by our upstream's second patch, a multi-day turnaround between patches because a) we live on different continents and b) I had little keyboard access this week which contributed to the long turn around times.
Comment 7 Christian Ullrich 2023-07-29 11:24:22 UTC
No problem, that's what we are here for.

My initial comment was a bit flippant; sorry about that. This is my fourth bug in ~2.5 years about a syslog-ng update that breaks the build in my particular configuration.