Thu Sep 16 12:02:13 2021 UTC ()
syslog-ng: simplify patch for upstreaming, and add pull request URL


(wiz)
diff -r1.40 -r1.41 pkgsrc/sysutils/syslog-ng/Makefile
diff -r1.19 -r1.20 pkgsrc/sysutils/syslog-ng/Makefile.common
diff -r1.18 -r1.19 pkgsrc/sysutils/syslog-ng/distinfo
diff -r1.3 -r1.4 pkgsrc/sysutils/syslog-ng/patches/patch-ac
cvs diff -r1.40 -r1.41 pkgsrc/sysutils/syslog-ng/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/syslog-ng/Makefile 2021/09/16 09:22:46 1.40
+++ pkgsrc/sysutils/syslog-ng/Makefile 2021/09/16 12:02:12 1.41
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.40 2021/09/16 09:22:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.41 2021/09/16 12:02:12 wiz Exp $
2 2
3.include "../../sysutils/syslog-ng/Makefile.common" 3.include "../../sysutils/syslog-ng/Makefile.common"
4 4
5CONFIGURE_ARGS+= --enable-stomp 5CONFIGURE_ARGS+= --enable-stomp
6CONFIGURE_ARGS+= --enable-tcp-wrapper 6CONFIGURE_ARGS+= --enable-tcp-wrapper
7CONFIGURE_ARGS+= --with-jsonc=system 7CONFIGURE_ARGS+= --with-jsonc=system
8 8
9CONFIGURE_ARGS.SunOS+= --enable-dynamic-linking 9CONFIGURE_ARGS.SunOS+= --enable-dynamic-linking
10CONFIGURE_ARGS.SunOS+= --enable-sun-streams 10CONFIGURE_ARGS.SunOS+= --enable-sun-streams
11CPPFLAGS.SunOS+= -D_XOPEN_SOURCE=600 -D__EXTENSIONS__ 11CPPFLAGS.SunOS+= -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
12 12
13.include "options.mk" 13.include "options.mk"
14 14
@@ -24,28 +24,27 @@ CONF_FILES+= ${EGDIR}/syslog-ng.conf ${ @@ -24,28 +24,27 @@ CONF_FILES+= ${EGDIR}/syslog-ng.conf ${
24 24
25RCD_SCRIPTS= syslogng 25RCD_SCRIPTS= syslogng
26 26
27INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR} 27INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR}
28INSTALL_TARGET= install 28INSTALL_TARGET= install
29INSTALLATION_DIRS= bin ${DOCDIR} ${EGDIR} 29INSTALLATION_DIRS= bin ${DOCDIR} ${EGDIR}
30 30
31PLIST_VARS+= systemd 31PLIST_VARS+= systemd
32 32
33.if exists(/bin/systemd) 33.if exists(/bin/systemd)
34PLIST.systemd= yes 34PLIST.systemd= yes
35.endif 35.endif
36 36
37PKGCONFIG_OVERRIDE= libtest/syslog-ng-test.pc.in \ 37PKGCONFIG_OVERRIDE+= libtest/syslog-ng-test.pc.in
38 syslog-ng-add-contextual-data.pc.in \ 38PKGCONFIG_OVERRIDE+= syslog-ng-native-connector.pc.in
39 syslog-ng-native-connector.pc.in \ 39PKGCONFIG_OVERRIDE+= syslog-ng.pc.in
40 syslog-ng.pc.in 
41 40
42post-install: 41post-install:
43 ${INSTALL_DATA} ${WRKSRC}/contrib/syslog-ng.conf.doc ${DESTDIR}${DOCDIR} 42 ${INSTALL_DATA} ${WRKSRC}/contrib/syslog-ng.conf.doc ${DESTDIR}${DOCDIR}
44.for f in syslog-ng.conf.HP-UX syslog-ng.conf.RedHat syslog-ng.conf.SunOS 43.for f in syslog-ng.conf.HP-UX syslog-ng.conf.RedHat syslog-ng.conf.SunOS
45 ${INSTALL_DATA} ${WRKSRC}/contrib/${f} ${DESTDIR}${EGDIR} 44 ${INSTALL_DATA} ${WRKSRC}/contrib/${f} ${DESTDIR}${EGDIR}
46.endfor 45.endfor
47 ${INSTALL_SCRIPT} ${WRKSRC}/contrib/syslog2ng ${DESTDIR}${PREFIX}/bin 46 ${INSTALL_SCRIPT} ${WRKSRC}/contrib/syslog2ng ${DESTDIR}${PREFIX}/bin
48 47
49.include "../../security/tcp_wrappers/buildlink3.mk" 48.include "../../security/tcp_wrappers/buildlink3.mk"
50.include "../../textproc/json-c/buildlink3.mk" 49.include "../../textproc/json-c/buildlink3.mk"
51.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"
cvs diff -r1.19 -r1.20 pkgsrc/sysutils/syslog-ng/Makefile.common (expand / switch to unified diff)

--- pkgsrc/sysutils/syslog-ng/Makefile.common 2021/09/16 09:22:46 1.19
+++ pkgsrc/sysutils/syslog-ng/Makefile.common 2021/09/16 12:02:12 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.19 2021/09/16 09:22:46 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.20 2021/09/16 12:02:12 wiz Exp $
2# used by sysutils/syslog-ng/Makefile 2# used by sysutils/syslog-ng/Makefile
3# used by sysutils/syslog-ng/Makefile.module 3# used by sysutils/syslog-ng/Makefile.module
4 4
5DISTNAME= syslog-ng-3.34.1 5DISTNAME= syslog-ng-3.34.1
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= ${MASTER_SITE_GITHUB:=syslog-ng/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=syslog-ng/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.syslog-ng.com/ 10HOMEPAGE= http://www.syslog-ng.com/
11COMMENT= Highly portable log management solution 11COMMENT= Highly portable log management solution
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14GITHUB_RELEASE= ${DISTNAME} 14GITHUB_RELEASE= ${DISTNAME}
@@ -38,27 +38,27 @@ CONFIGURE_ARGS+= --disable-sun-streams @@ -38,27 +38,27 @@ CONFIGURE_ARGS+= --disable-sun-streams
38CONFIGURE_ARGS+= --disable-systemd 38CONFIGURE_ARGS+= --disable-systemd
39CONFIGURE_ARGS+= --disable-tcp-wrapper 39CONFIGURE_ARGS+= --disable-tcp-wrapper
40CONFIGURE_ARGS+= --localstatedir=${VARBASE}/db/syslog-ng 40CONFIGURE_ARGS+= --localstatedir=${VARBASE}/db/syslog-ng
41CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 41CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
42CONFIGURE_ARGS+= --with-ivykis=system 42CONFIGURE_ARGS+= --with-ivykis=system
43CONFIGURE_ARGS+= --with-pidfile-dir=${VARBASE}/run 43CONFIGURE_ARGS+= --with-pidfile-dir=${VARBASE}/run
44 44
45CONFIGURE_ARGS.SunOS+= --enable-dynamic-linking 45CONFIGURE_ARGS.SunOS+= --enable-dynamic-linking
46CONFIGURE_ARGS.SunOS+= ac_cv_func_inotify_init=no 46CONFIGURE_ARGS.SunOS+= ac_cv_func_inotify_init=no
47 47
48SUBST_CLASSES+= unamepath 48SUBST_CLASSES+= unamepath
49SUBST_STAGE.unamepath= post-configure 49SUBST_STAGE.unamepath= post-configure
50SUBST_FILES.unamepath= contrib/syslog2ng 50SUBST_FILES.unamepath= contrib/syslog2ng
51SUBST_VARS.unamepath= UNAME 51SUBST_SED.unamepath= -e s,/bin/uname,${UNAME},
52 52
53PYTHON_VERSIONS_INCOMPATIBLE= 27 53PYTHON_VERSIONS_INCOMPATIBLE= 27
54 54
55REPLACE_AWK+= contrib/syslog2ng 55REPLACE_AWK+= contrib/syslog2ng
56REPLACE_PYTHON+= lib/merge-grammar.py 56REPLACE_PYTHON+= lib/merge-grammar.py
57 57
58BUILD_DEFS+= VARBASE 58BUILD_DEFS+= VARBASE
59 59
60# Kill bundled depedencies, speeds up configure time 60# Kill bundled depedencies, speeds up configure time
61post-extract: 61post-extract:
62 ${RM} -rf ${WRKSRC}/lib/ivykis 62 ${RM} -rf ${WRKSRC}/lib/ivykis
63 ${RM} -rf ${WRKSRC}/modules/afamqp/rabbitmq-c 63 ${RM} -rf ${WRKSRC}/modules/afamqp/rabbitmq-c
64 ${RM} -rf ${WRKSRC}/modules/afmongodb/mongo-c-driver 64 ${RM} -rf ${WRKSRC}/modules/afmongodb/mongo-c-driver
cvs diff -r1.18 -r1.19 pkgsrc/sysutils/syslog-ng/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/syslog-ng/distinfo 2021/09/16 09:32:03 1.18
+++ pkgsrc/sysutils/syslog-ng/distinfo 2021/09/16 12:02:12 1.19
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.18 2021/09/16 09:32:03 wiz Exp $ 1$NetBSD: distinfo,v 1.19 2021/09/16 12:02:12 wiz Exp $
2 2
3SHA1 (syslog-ng-3.34.1.tar.gz) = b0c02f7ca30d6b29722630c7c62961f1941c886f 3SHA1 (syslog-ng-3.34.1.tar.gz) = b0c02f7ca30d6b29722630c7c62961f1941c886f
4RMD160 (syslog-ng-3.34.1.tar.gz) = 2e8759268de8a57d631eab7d6ea3577ad5feb401 4RMD160 (syslog-ng-3.34.1.tar.gz) = 2e8759268de8a57d631eab7d6ea3577ad5feb401
5SHA512 (syslog-ng-3.34.1.tar.gz) = f4df871f780b2e55e847d3ac108d0647659cac2493180d29436f04a4b75d38b90aba8adcd38f6337dce8f69d6aba9ff33fd3d8dc0f86021a29f60a21747e9a10 5SHA512 (syslog-ng-3.34.1.tar.gz) = f4df871f780b2e55e847d3ac108d0647659cac2493180d29436f04a4b75d38b90aba8adcd38f6337dce8f69d6aba9ff33fd3d8dc0f86021a29f60a21747e9a10
6Size (syslog-ng-3.34.1.tar.gz) = 5903489 bytes 6Size (syslog-ng-3.34.1.tar.gz) = 5903489 bytes
7SHA1 (patch-ac) = 7d48f689b6ff69c68697baf729fba8be9aec5ce8 7SHA1 (patch-ac) = 1f70075860999e854629faa7f293ef51243b398d
8SHA1 (patch-configure) = d4ae0c21ac4287b765bc4411db9873be8bdb0853 8SHA1 (patch-configure) = d4ae0c21ac4287b765bc4411db9873be8bdb0853
9SHA1 (patch-lib_signal-handler.c) = 440a9d0df0da613817c943b8244e98e50c92bbb2 9SHA1 (patch-lib_signal-handler.c) = 440a9d0df0da613817c943b8244e98e50c92bbb2
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/syslog-ng/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/sysutils/syslog-ng/patches/Attic/patch-ac 2015/10/29 16:34:13 1.3
+++ pkgsrc/sysutils/syslog-ng/patches/Attic/patch-ac 2021/09/16 12:02:12 1.4
@@ -1,32 +1,31 @@ @@ -1,32 +1,31 @@
1$NetBSD: patch-ac,v 1.3 2015/10/29 16:34:13 fhajny Exp $ 1$NetBSD: patch-ac,v 1.4 2021/09/16 12:02:12 wiz Exp $
2 2
3# add NetBSD support and fix some paths 3# add NetBSD support and fix some paths
 4https://github.com/syslog-ng/syslog-ng/pull/3786
4 5
5--- contrib/syslog2ng.orig 2014-12-15 14:48:45.000000000 +0000 6--- contrib/syslog2ng.orig 2021-09-10 11:01:49.000000000 +0000
6+++ contrib/syslog2ng 7+++ contrib/syslog2ng
7@@ -5,18 +5,24 @@ 8@@ -5,7 +5,7 @@
8 # Translator from syslog.conf to syslog-ng.conf 9 # Translator from syslog.conf to syslog-ng.conf
9 # by Jonathan W. Marks <j-marks@uiuc.edu> 10 # by Jonathan W. Marks <j-marks@uiuc.edu>
10 # 11 #
11-# Rev 2 12-# Rev 2
12+# Rev 2.1 13+# Rev 2.1
13  14
14 BEGIN { 15 BEGIN {
15 # Handle the various platforms- determine proper log device 16 # Handle the various platforms- determine proper log device
16- "/bin/uname -s" | getline sysname; 17@@ -13,10 +13,16 @@ BEGIN {
17- close("/bin/uname -s"); 18 close("/bin/uname -s");
18+ "@UNAME@ -s" | getline sysname; 
19+ close("@UNAME@ -s"); 
20 if (sysname == "SunOS") { 19 if (sysname == "SunOS") {
21 LOGDEVTYPE="sun-streams"; 20 LOGDEVTYPE="sun-streams";
22+ LOGDEVPATH="/dev/log"; 21+ LOGDEVPATH="/dev/log";
23 } else if (sysname == "AIX") { 22 } else if (sysname == "AIX") {
24 LOGDEVTYPE="unix-dgram"; 23 LOGDEVTYPE="unix-dgram";
25+ LOGDEVPATH="/dev/log"; 24+ LOGDEVPATH="/dev/log";
26 } else if (sysname == "Linux") { 25 } else if (sysname == "Linux") {
27 LOGDEVTYPE="unix-stream"; 26 LOGDEVTYPE="unix-stream";
28+ LOGDEVPATH="/dev/log"; 27+ LOGDEVPATH="/dev/log";
29+ } else if (sysname == "NetBSD") { 28+ } else if (sysname == "NetBSD") {
30+ LOGDEVTYPE="unix-dgram"; 29+ LOGDEVTYPE="unix-dgram";
31+ LOGDEVPATH="/var/run/log"; 30+ LOGDEVPATH="/var/run/log";
32 } else { 31 } else {