update sysutils/syslog-ng 3.32 -> 3.34

2021-10-04 Thread Peter Czanik (pczanik)
Hi,

Attached you will find a diff updating the syslog-ng port from 3.32 to 3.34. 
Along the way I also enabled SCL (syslog-ng configuration library) support, as 
many drivers in syslog-ng are actually configuration snippets, like the 
Elasticsearch or Telegram destinations are a wrapper around the http() 
destination, etc.

Thanks goes to Todd Miller, who helped me with some OpenBSD ports magic when I 
could not resolve something based on the documentation...

Let me know, if you need any help from syslog-ng upstream!

Peter

Peter Czanik (CzP) 
Balabit (a OneIdentity company) / syslog-ng upstream
https://syslog-ng.com/community/
https://twitter.com/PCzanik

diff -ur syslog-ng.old/Makefile syslog-ng/Makefile
--- syslog-ng.old/Makefile	Wed Jun  9 20:54:01 2021
+++ syslog-ng/Makefile	Mon Oct  4 11:39:55 2021
@@ -2,10 +2,9 @@
 
 COMMENT=	log management solution
 
-V =		3.32.1
-REL =		3.32.1
+V =		3.34.1
+REL =		3.34.1
 DISTNAME =	syslog-ng-$V
-REVISION =	0
 CATEGORIES =	sysutils
 
 MAINTAINER =	Steven Mestdagh 
@@ -22,13 +21,13 @@
 MASTER_SITES =	https://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/
 
 SHARED_LIBS =	evtlog			3.0 \
-		evtlog-3.32		3.0 \
+		evtlog-3.34		3.0 \
 		syslog-ng		6.0 \
-		syslog-ng-3.32		6.0 \
+		syslog-ng-3.34		6.0 \
 		loggen_helper		1.0 \
-		loggen_helper-3.32	1.0 \
+		loggen_helper-3.34	1.0 \
 		loggen_plugin		1.0 \
-		loggen_plugin-3.32	1.0 \
+		loggen_plugin-3.34	1.0 \
 		secret-storage		1.0
 
 # needs a newer compiler due to libmaxminddb header
diff -ur syslog-ng.old/distinfo syslog-ng/distinfo
--- syslog-ng.old/distinfo	Mon May 24 17:50:22 2021
+++ syslog-ng/distinfo	Fri Oct  1 08:51:39 2021
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng-3.32.1.tar.gz) = GeO3ZVLYLHHAQjBSaSVALJ8F+l5uoZuRKwYYUJKbcS0=
-SIZE (syslog-ng-3.32.1.tar.gz) = 5782744
+SHA256 (syslog-ng-3.34.1.tar.gz) = zs457BxoyI1JNwXgpSi4PQONo4TonUg4OTzMdfYqLUw=
+SIZE (syslog-ng-3.34.1.tar.gz) = 5903489
diff -ur syslog-ng.old/files/syslog-ng.conf syslog-ng/files/syslog-ng.conf
--- syslog-ng.old/files/syslog-ng.conf	Mon May 24 17:50:22 2021
+++ syslog-ng/files/syslog-ng.conf	Mon Oct  4 11:39:55 2021
@@ -1,8 +1,9 @@
 # syslog-ng configuration file for OpenBSD.
 # This should provide behavior similar to OpenBSD's syslog.conf(5).
 
-@version: 3.32
+@version: 3.34
 @requires openbsd
+@include "scl.conf"
 
 options { 
 	use_dns(no);
diff -ur syslog-ng.old/pkg/PLIST syslog-ng/pkg/PLIST
--- syslog-ng.old/pkg/PLIST	Mon May 24 17:50:22 2021
+++ syslog-ng/pkg/PLIST	Mon Oct  4 11:39:55 2021
@@ -205,6 +205,9 @@
 include/syslog-ng/signal-slot-connector/
 include/syslog-ng/signal-slot-connector/signal-slot-connector.h
 include/syslog-ng/stats/
+include/syslog-ng/stats/aggregator/
+include/syslog-ng/stats/aggregator/stats-aggregator-registry.h
+include/syslog-ng/stats/aggregator/stats-aggregator.h
 include/syslog-ng/stats/stats-cluster-logpipe.h
 include/syslog-ng/stats/stats-cluster-single.h
 include/syslog-ng/stats/stats-cluster.h
@@ -278,22 +281,22 @@
 include/syslog-ng/value-pairs/value-pairs.h
 include/syslog-ng/versioning.h
 include/syslog-ng/window-size-counter.h
-@lib lib/libevtlog-3.32.so.${LIBevtlog-3.32_VERSION}
+@lib lib/libevtlog-3.34.so.${LIBevtlog-3.34_VERSION}
 @static-lib lib/libevtlog.a
 lib/libevtlog.la
 @lib lib/libevtlog.so.${LIBevtlog_VERSION}
-@lib lib/libloggen_helper-3.32.so.${LIBloggen_helper-3.32_VERSION}
+@lib lib/libloggen_helper-3.34.so.${LIBloggen_helper-3.34_VERSION}
 @static-lib lib/libloggen_helper.a
 lib/libloggen_helper.la
 @lib lib/libloggen_helper.so.${LIBloggen_helper_VERSION}
-@lib lib/libloggen_plugin-3.32.so.${LIBloggen_plugin-3.32_VERSION}
+@lib lib/libloggen_plugin-3.34.so.${LIBloggen_plugin-3.34_VERSION}
 @static-lib lib/libloggen_plugin.a
 lib/libloggen_plugin.la
 @lib lib/libloggen_plugin.so.${LIBloggen_plugin_VERSION}
 @static-lib lib/libsecret-storage.a
 lib/libsecret-storage.la
 @lib lib/libsecret-storage.so.${LIBsecret-storage_VERSION}
-@lib lib/libsyslog-ng-3.32.so.${LIBsyslog-ng-3.32_VERSION}
+@lib lib/libsyslog-ng-3.34.so.${LIBsyslog-ng-3.34_VERSION}
 @static-lib lib/libsyslog-ng-native-connector.a
 @static-lib lib/libsyslog-ng.a
 lib/libsyslog-ng.la
@@ -327,6 +330,7 @@
 @so lib/syslog-ng/libmap-value-pairs.so
 @so lib/syslog-ng/libopenbsd.so
 @so lib/syslog-ng/libpseudofile.so
+@so lib/syslog-ng/libregexp-parser.so
 @so lib/syslog-ng/libsecure-logging.so
 @so lib/syslog-ng/libstardate.so
 @so lib/syslog-ng/libsyslogformat.so
@@ -361,6 +365,7 @@
 @sample ${SYSCONFDIR}/
 share/examples/syslog-ng/patterndb.d/
 share/examples/syslog-ng/scl.conf
+@sample ${SYSCONFDIR}/scl.conf
 share/examples/syslog-ng/syslog-ng.conf
 share/examples/syslog-ng/syslog-ng.conf.openbsd
 @sample ${SYSCONFDIR}/syslog-ng.conf
@@ -382,6 +387,8 @@
 share/syslog-ng/include/scl/collectd/plugin.conf
 share/syslog-ng/include/scl/default-network-drivers/
 share/syslog-ng/include/scl/default-network-drivers/plugin.conf
+share/syslog-ng/include/scl/discord/
+share/syslog-ng/include/scl/discord/discord.conf
 

Re: UPDATE: sysutils/syslog-ng 3.32.1

2021-05-17 Thread Todd C . Miller
On Mon, 17 May 2021 13:36:42 -0600, "Todd C. Miller" wrote:

> Newer versions of syslog-ng have an "openbsd" module that supports
> sendsyslog() and /dev/klog.  This makes it possible to use syslog-ng
> as a replacement for the stock OpenBSD syslog daemon.
>
> I've also upstreamed some OpenBSD compilation fixes that landed in
> version 3.32.1.  As a result, we can drop all of our patches except
> for a few minor tweaks to Makefile.in.  I had a problem with our
> libtool linking in the old libsyslog-ng version at build time if
> an old package was installed.  Removing a hack from Makefile.in
> that wasn't using libtool for linking syslog-ng fixed that.

Updated diff that syncs the installed syslog-ng.conf with our current
syslog.conf.

 - todd

Index: sysutils/syslog-ng/Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.70
diff -u -p -u -r1.70 Makefile
--- sysutils/syslog-ng/Makefile 14 May 2021 20:49:05 -  1.70
+++ sysutils/syslog-ng/Makefile 16 May 2021 12:22:26 -
@@ -2,11 +2,10 @@
 
 COMMENT=   log management solution
 
-V =3.12.1
-REL =  3.12
+V =3.32.1
+REL =  3.32.1
 DISTNAME = syslog-ng-$V
 CATEGORIES =   sysutils
-REVISION = 9
 
 MAINTAINER =   Steven Mestdagh 
 
@@ -21,15 +20,21 @@ WANTLIB += ssl z
 
 MASTER_SITES = 
http://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/
 
-SHARED_LIBS =  evtlog  2.0 \
-   evtlog-${REL}   2.0 \
-   syslog-ng   5.0 \
-   syslog-ng-${REL}5.0
+SHARED_LIBS =  evtlog  3.0 \
+   evtlog-3.32 3.0 \
+   syslog-ng   6.0 \
+   syslog-ng-3.32  6.0 \
+   loggen_helper   1.0 \
+   loggen_helper-3.32  1.0 \
+   loggen_plugin   1.0 \
+   loggen_plugin-3.32  1.0 \
+   secret-storage  1.0
 
 # needs a newer compiler due to libmaxminddb header
 COMPILER = base-clang ports-gcc
 COMPILER_LANGS = c
 
+BUILD_DEPENDS= devel/bison>=3.4.2
 LIB_DEPENDS =  devel/glib2 \
devel/json-c \
devel/libivykis \
@@ -58,12 +63,9 @@ CONFIGURE_ARGS +=--disable-tcp-wrapper 
--enable-sql \
--enable-manpages
 
-CONFIGURE_ENV +=   OPENSSL_CFLAGS="-I/usr/include/openssl" \
-   OPENSSL_LIBS="-lssl -lcrypto" \
-   LDFLAGS="-L${LOCALBASE}/lib"
-# json-c only installs libjson-c.pc; syslog-ng checks for libjson.pc
-CONFIGURE_ENV +=   JSON_C_CFLAGS="`pkg-config json-c --cflags`" \
-   JSON_C_LIBS="`pkg-config json-c --libs`"
+CONFIGURE_ENV +=   LDFLAGS="-L${LOCALBASE}/lib"
+
+YACC = bison -y
 
 USE_GMAKE =Yes
 
Index: sysutils/syslog-ng/distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.26
diff -u -p -u -r1.26 distinfo
--- sysutils/syslog-ng/distinfo 10 Nov 2017 21:58:26 -  1.26
+++ sysutils/syslog-ng/distinfo 10 May 2021 14:39:50 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng-3.12.1.tar.gz) = EtKsuOKS0WBo3rrn+aaZ55HKSXVA0ogzppSpoczXj0M=
-SIZE (syslog-ng-3.12.1.tar.gz) = 8905646
+SHA256 (syslog-ng-3.32.1.tar.gz) = GeO3ZVLYLHHAQjBSaSVALJ8F+l5uoZuRKwYYUJKbcS0=
+SIZE (syslog-ng-3.32.1.tar.gz) = 5782744
Index: sysutils/syslog-ng/files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.11
diff -u -p -u -r1.11 syslog-ng.conf
--- sysutils/syslog-ng/files/syslog-ng.conf 10 Nov 2017 21:58:26 -  
1.11
+++ sysutils/syslog-ng/files/syslog-ng.conf 17 May 2021 20:10:11 -
@@ -1,15 +1,18 @@
 # syslog-ng configuration file for OpenBSD.
 # This should provide behavior similar to OpenBSD's syslog.conf(5).
 
-@version: 3.12
+@version: 3.32
+@requires openbsd
 
 options { 
use_dns(no);
+   dns_cache(no);
create_dirs(no);
keep_hostname(yes);
 };
 
 source s_local {
+   openbsd();
unix-dgram ("/dev/log");
internal();
 };
@@ -27,7 +30,6 @@ destination d_daemon  { file("/var/log/da
 destination d_xferlog  { file("/var/log/xferlog" owner(root) group(wheel) 
perm(0640)); };
 destination d_lpderrs  { file("/var/log/lpd-errs" owner(root) group(wheel) 
perm(0640));};
 destination d_maillog  { file("/var/log/maillog" owner(root) group(wheel) 
perm(0600)); };
-destination d_uucplog  { file("/var/log/uucp" owner(uucp) group(dialer) 
perm(0660));   };
 destination d_doaslog  { file("/var/log/doas");};
 destination d_ttyall   { usertty("*"); };
 destination d_ttyroot  { usertty("root");  };
@@ -64,9 +66,6 @@ filter f_lprdebug {
 

UPDATE: sysutils/syslog-ng 3.32.1

2021-05-17 Thread Todd C . Miller
Newer versions of syslog-ng have an "openbsd" module that supports
sendsyslog() and /dev/klog.  This makes it possible to use syslog-ng
as a replacement for the stock OpenBSD syslog daemon.

I've also upstreamed some OpenBSD compilation fixes that landed in
version 3.32.1.  As a result, we can drop all of our patches except
for a few minor tweaks to Makefile.in.  I had a problem with our
libtool linking in the old libsyslog-ng version at build time if
an old package was installed.  Removing a hack from Makefile.in
that wasn't using libtool for linking syslog-ng fixed that.

I'm not normally a syslog-ng user so this has only been lightly
tested but I did verify that the sendsyslog() support is working.

 - todd

Index: sysutils/syslog-ng/Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.70
diff -u -p -u -r1.70 Makefile
--- sysutils/syslog-ng/Makefile 14 May 2021 20:49:05 -  1.70
+++ sysutils/syslog-ng/Makefile 16 May 2021 12:22:26 -
@@ -2,11 +2,10 @@
 
 COMMENT=   log management solution
 
-V =3.12.1
-REL =  3.12
+V =3.32.1
+REL =  3.32.1
 DISTNAME = syslog-ng-$V
 CATEGORIES =   sysutils
-REVISION = 9
 
 MAINTAINER =   Steven Mestdagh 
 
@@ -21,15 +20,21 @@ WANTLIB += ssl z
 
 MASTER_SITES = 
http://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/
 
-SHARED_LIBS =  evtlog  2.0 \
-   evtlog-${REL}   2.0 \
-   syslog-ng   5.0 \
-   syslog-ng-${REL}5.0
+SHARED_LIBS =  evtlog  3.0 \
+   evtlog-3.32 3.0 \
+   syslog-ng   6.0 \
+   syslog-ng-3.32  6.0 \
+   loggen_helper   1.0 \
+   loggen_helper-3.32  1.0 \
+   loggen_plugin   1.0 \
+   loggen_plugin-3.32  1.0 \
+   secret-storage  1.0
 
 # needs a newer compiler due to libmaxminddb header
 COMPILER = base-clang ports-gcc
 COMPILER_LANGS = c
 
+BUILD_DEPENDS= devel/bison>=3.4.2
 LIB_DEPENDS =  devel/glib2 \
devel/json-c \
devel/libivykis \
@@ -58,12 +63,9 @@ CONFIGURE_ARGS +=--disable-tcp-wrapper 
--enable-sql \
--enable-manpages
 
-CONFIGURE_ENV +=   OPENSSL_CFLAGS="-I/usr/include/openssl" \
-   OPENSSL_LIBS="-lssl -lcrypto" \
-   LDFLAGS="-L${LOCALBASE}/lib"
-# json-c only installs libjson-c.pc; syslog-ng checks for libjson.pc
-CONFIGURE_ENV +=   JSON_C_CFLAGS="`pkg-config json-c --cflags`" \
-   JSON_C_LIBS="`pkg-config json-c --libs`"
+CONFIGURE_ENV +=   LDFLAGS="-L${LOCALBASE}/lib"
+
+YACC = bison -y
 
 USE_GMAKE =Yes
 
Index: sysutils/syslog-ng/distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.26
diff -u -p -u -r1.26 distinfo
--- sysutils/syslog-ng/distinfo 10 Nov 2017 21:58:26 -  1.26
+++ sysutils/syslog-ng/distinfo 10 May 2021 14:39:50 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng-3.12.1.tar.gz) = EtKsuOKS0WBo3rrn+aaZ55HKSXVA0ogzppSpoczXj0M=
-SIZE (syslog-ng-3.12.1.tar.gz) = 8905646
+SHA256 (syslog-ng-3.32.1.tar.gz) = GeO3ZVLYLHHAQjBSaSVALJ8F+l5uoZuRKwYYUJKbcS0=
+SIZE (syslog-ng-3.32.1.tar.gz) = 5782744
Index: sysutils/syslog-ng/files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.11
diff -u -p -u -r1.11 syslog-ng.conf
--- sysutils/syslog-ng/files/syslog-ng.conf 10 Nov 2017 21:58:26 -  
1.11
+++ sysutils/syslog-ng/files/syslog-ng.conf 17 May 2021 19:23:23 -
@@ -1,15 +1,18 @@
 # syslog-ng configuration file for OpenBSD.
 # This should provide behavior similar to OpenBSD's syslog.conf(5).
 
-@version: 3.12
+@version: 3.32
+@requires openbsd
 
 options { 
use_dns(no);
+   dns_cache(no);
create_dirs(no);
keep_hostname(yes);
 };
 
 source s_local {
+   openbsd();
unix-dgram ("/dev/log");
internal();
 };
Index: sysutils/syslog-ng/patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v
retrieving revision 1.12
diff -u -p -u -r1.12 patch-Makefile_in
--- sysutils/syslog-ng/patches/patch-Makefile_in30 Apr 2021 17:14:50 
-  1.12
+++ sysutils/syslog-ng/patches/patch-Makefile_in10 May 2021 14:48:30 
-
@@ -1,38 +1,29 @@
-$OpenBSD: patch-Makefile_in,v 1.12 2021/04/30 17:14:50 millert Exp $
+$OpenBSD: patch-Makefile_in,v 1.11 2017/11/10 21:58:26 steven Exp $
 - temporary hack until libtool is fixed.
-- work around different getent API, adapted from

UPDATE: sysutils/syslog-ng

2017-11-02 Thread Steven Mestdagh
seems to be fine on amd64.  comments welcome.


Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.57
diff -u -p -u -r1.57 Makefile
--- Makefile13 Jun 2017 00:22:33 -  1.57
+++ Makefile2 Nov 2017 18:40:53 -
@@ -1,11 +1,10 @@
 # $OpenBSD: Makefile,v 1.57 2017/06/13 00:22:33 schwarze Exp $
 
-COMMENT=   syslogd replacement
+COMMENT=   log management solution
 
-V =3.9.1
-REL =  3.9
+V =3.12.1
+REL =  3.12
 DISTNAME = syslog-ng-$V
-REVISION = 0
 CATEGORIES =   sysutils
 
 MAINTAINER =   Steven Mestdagh 
@@ -17,8 +16,8 @@ PERMIT_PACKAGE_CDROM =Yes
 
 MASTER_SITES = 
http://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/
 
-SHARED_LIBS =  syslog-ng   4.0 \
-   syslog-ng-${REL}4.0
+SHARED_LIBS =  syslog-ng   5.0 \
+   syslog-ng-${REL}5.0
 
 MODULES =  devel/gettext
 
@@ -36,6 +35,7 @@ LIB_DEPENDS = devel/glib2 \
 
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS +=  --disable-tcp-wrapper \
+   --with-module-dir=${PREFIX}/lib/syslog-ng \
--with-pidfile-dir=/var/run \
--enable-json \
--with-mongoc=no \
@@ -54,7 +54,10 @@ CONFIGURE_ENV += OPENSSL_CFLAGS="-I/usr/
OPENSSL_LIBS="-lssl -lcrypto" 
 # json-c only installs libjson-c.pc; syslog-ng checks for libjson.pc
 CONFIGURE_ENV +=   JSON_C_CFLAGS="`pkg-config json-c --cflags`" \
-   JSON_C_LIBS="`pkg-config json-c --libs`"
+   JSON_C_LIBS="`pkg-config json-c --libs`" \
+   EVTLOG_LIBS="-L${LOCALBASE}/lib -levtlog" \
+   EVTLOG_CFLAGS="-I${LOCALBASE}/include/eventlog"
+
 USE_GMAKE =Yes
 
 SYSCONFDIR =   ${BASESYSCONFDIR}/syslog-ng
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.25
diff -u -p -u -r1.25 distinfo
--- distinfo8 Jun 2017 18:19:37 -   1.25
+++ distinfo2 Nov 2017 18:40:53 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng-3.9.1.tar.gz) = VniFalUK55Bhj6venRRH+TLOepCA1V3Kj8XfEgLHChc=
-SIZE (syslog-ng-3.9.1.tar.gz) = 8312677
+SHA256 (syslog-ng-3.12.1.tar.gz) = EtKsuOKS0WBo3rrn+aaZ55HKSXVA0ogzppSpoczXj0M=
+SIZE (syslog-ng-3.12.1.tar.gz) = 8905646
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.10
diff -u -p -u -r1.10 syslog-ng.conf
--- files/syslog-ng.conf8 Jun 2017 18:19:37 -   1.10
+++ files/syslog-ng.conf2 Nov 2017 18:40:53 -
@@ -1,8 +1,7 @@
 # syslog-ng configuration file for OpenBSD.
-# This should provide the same behavior as OpenBSD's syslog.conf(5).
-# 2010-07-18 ste...@openbsd.org
+# This should provide behavior similar to OpenBSD's syslog.conf(5).
 
-@version: 3.9
+@version: 3.12
 
 options { 
use_dns(no);
@@ -12,15 +11,9 @@ options { 
 
 source s_local {
unix-dgram ("/dev/log");
-   unix-dgram ("/var/empty/dev/log");
internal();
 };
-#source s_local_all {
-#  unix-dgram ("/dev/log");
-#  unix-dgram ("/var/empty/dev/log");
-#  unix-dgram ("/var/www/dev/log");
-#  internal();
-#};
+
 #source s_net {
 #  udp(port(514));
 #};
@@ -108,7 +101,6 @@ log { source(s_local); filter(f_daemonin
 log { source(s_local); filter(f_ftpinfo);  destination(d_xferlog); };
 log { source(s_local); filter(f_lprdebug); destination(d_lpderrs); };
 log { source(s_local); filter(f_mailinfo); destination(d_maillog); };
-#log { source(s_local); filter(f_uucpinfo);destination(d_uucplog); };
 
 # Uncomment this line to send "important" messages to the system
 # console: be aware that this could create lots of output.
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v
retrieving revision 1.10
diff -u -p -u -r1.10 patch-Makefile_in
--- patches/patch-Makefile_in   8 Jun 2017 18:19:37 -   1.10
+++ patches/patch-Makefile_in   2 Nov 2017 18:40:53 -
@@ -1,8 +1,52 @@
 $OpenBSD: patch-Makefile_in,v 1.10 2017/06/08 18:19:37 steven Exp $
-temporary hack until libtool is fixed.
 Makefile.in.orig   Wed Dec 21 16:00:32 2016
-+++ Makefile.inSun Feb  5 23:53:33 2017
-@@ -6203,7 +6203,7 @@ lib/str-repr/lib_libsyslog_ng_la-encode.lo:  \
+- temporary hack until libtool is fixed.
+- work around different getent API, adapted from
+https://github.com/balabit/syslog-ng/commit/8b33cbe143b00d6af72cb5145fecd67e6158a9dd
+- avoid rebuilding libeventlog, already in devel/eventlog
+
+Index: Makefile.in
+--- Makefile.in.orig
 Makefile.in

UPDATE: sysutils/syslog-ng

2017-05-28 Thread Steven Mestdagh
major update, and enabled geoip and curl modules.
note it requires the libdbi update that i posted a few days ago.

basic test ok on amd64. comments and more tests welcome.


Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.55
diff -u -p -u -r1.55 Makefile
--- Makefile1 May 2016 11:19:09 -   1.55
+++ Makefile28 May 2017 08:56:32 -
@@ -2,8 +2,8 @@
 
 COMMENT=   syslogd replacement
 
-V =3.7.2
-REL =  3.7
+V =3.9.1
+REL =  3.9
 DISTNAME = syslog-ng-$V
 CATEGORIES =   sysutils
 
@@ -16,39 +16,41 @@ PERMIT_PACKAGE_CDROM =  Yes
 
 MASTER_SITES = 
http://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/
 
-SHARED_LIBS =  syslog-ng   3.0 \
-   syslog-ng-${REL}3.0
+SHARED_LIBS =  syslog-ng   4.0 \
+   syslog-ng-${REL}4.0
 
 MODULES =  devel/gettext
 
 WANTLIB =  c m pcre crypto ssl evtlog dbi ivykis pthread \
-   glib-2.0 gmodule-2.0 gthread-2.0 json-c
+   glib-2.0 gmodule-2.0 gthread-2.0 json-c \
+   curl nghttp2 z GeoIP
 
 LIB_DEPENDS =  devel/glib2 \
devel/json-c \
devel/libivykis \
sysutils/eventlog \
-   databases/libdbi
+   databases/libdbi>=0.9.0 \
+   net/curl \
+   net/GeoIP
 
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS +=  --disable-tcp-wrapper \
--with-pidfile-dir=/var/run \
--enable-json \
-   --with-libmongo-client=no \
+   --with-mongoc=no \
--with-librabbitmq-client=no \
--disable-python \
--disable-mongodb \
--disable-amqp \
--disable-stomp \
-   --disable-geoip \
+   --enable-geoip \
--without-libnet \
--with-ivykis=system \
+   --with-libcurl=${LOCALBASE} \
--enable-sql \
--enable-manpages
 CONFIGURE_ENV +=   OPENSSL_CFLAGS="-I/usr/include/openssl" \
-   OPENSSL_LIBS="-lssl -lcrypto" \
-   LIBDBI_CFLAGS="-I/usr/include/openssl" \
-   LIBDBI_LIBS="-ldbi"
+   OPENSSL_LIBS="-lssl -lcrypto" 
 # json-c only installs libjson-c.pc; syslog-ng checks for libjson.pc
 CONFIGURE_ENV +=   JSON_C_CFLAGS="`pkg-config json-c --cflags`" \
JSON_C_LIBS="`pkg-config json-c --libs`"
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.24
diff -u -p -u -r1.24 distinfo
--- distinfo1 May 2016 11:19:09 -   1.24
+++ distinfo28 May 2017 08:56:32 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng-3.7.2.tar.gz) = sbPMwM5/DYvxWyPlny9PXe1w7tQQ39JxBSGbyIVjiKU=
-SIZE (syslog-ng-3.7.2.tar.gz) = 3558377
+SHA256 (syslog-ng-3.9.1.tar.gz) = VniFalUK55Bhj6venRRH+TLOepCA1V3Kj8XfEgLHChc=
+SIZE (syslog-ng-3.9.1.tar.gz) = 8312677
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.9
diff -u -p -u -r1.9 syslog-ng.conf
--- files/syslog-ng.conf1 May 2016 11:19:09 -   1.9
+++ files/syslog-ng.conf28 May 2017 08:56:32 -
@@ -2,7 +2,7 @@
 # This should provide the same behavior as OpenBSD's syslog.conf(5).
 # 2010-07-18 ste...@openbsd.org
 
-@version: 3.7
+@version: 3.9
 
 options { 
use_dns(no);
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v
retrieving revision 1.9
diff -u -p -u -r1.9 patch-Makefile_in
--- patches/patch-Makefile_in   1 May 2016 11:19:09 -   1.9
+++ patches/patch-Makefile_in   28 May 2017 08:56:32 -
@@ -1,13 +1,13 @@
 $OpenBSD: patch-Makefile_in,v 1.9 2016/05/01 11:19:09 steven Exp $
 temporary hack until libtool is fixed.
 Makefile.in.orig   Tue Oct 27 09:09:48 2015
-+++ Makefile.inSat Nov 21 01:24:57 2015
-@@ -5196,7 +5196,7 @@ lib/compat/lib_libsyslog_ng_la-strtok_r.lo:  \
-   lib/compat/$(DEPDIR)/$(am__dirstamp)
- 
+--- Makefile.in.orig   Wed Dec 21 16:00:32 2016
 Makefile.inSun Feb  5 23:53:33 2017
+@@ -6203,7 +6203,7 @@ lib/str-repr/lib_libsyslog_ng_la-encode.lo:  \
+   lib/str-repr/$(am__dirstamp) \
+   lib/str-repr/$(DEPDIR)/$(am__dirstamp)
  lib/libsyslog-ng.la: $(lib_libsyslog_ng_la_OBJECTS) 
$(lib_libsyslog_ng_la_DEPENDENCIES) $(EXTRA_lib_libsyslog_ng_la_DEPENDENCIES) 
lib/$(am__dirstamp)
 -  

Re: UPDATE: sysutils/syslog-ng

2015-07-19 Thread Steven Mestdagh
Stuart Henderson [2015-07-17, 00:09:46]:
 On 2015/07/16 22:49, Steven Mestdagh wrote:
  Update to 3.6.4.
  
  I was getting certificate errors on fetch, hence the modified FETCH_CMD.
  
  The certificate seems fine however in firefox/chromium. Looks like we do not
  yet have the NetLock CA in our cert.pem and it needs to be added?
 
 FETCH_CMD can't be set in a port Makefile, we either need to mirror the
 distfile or add the cert to cert.pem.

we'll go with the latter option, i will add the cert soon.
here's the updated diff.

Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.52
diff -u -p -u -r1.52 Makefile
--- Makefile18 Jul 2015 21:39:05 -  1.52
+++ Makefile19 Jul 2015 15:13:26 -
@@ -4,10 +4,10 @@ COMMENT=  syslogd replacement
 
 SHARED_ONLY =  Yes
 
-V =3.5.6
+V =3.6.4
+REL =  3.6
 DISTNAME = syslog-ng-$V
 CATEGORIES =   sysutils
-REVISION = 1
 
 MAINTAINER =   Steven Mestdagh ste...@openbsd.org
 
@@ -19,8 +19,8 @@ PERMIT_PACKAGE_CDROM =Yes
 MASTER_SITES = 
http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$V/source/
 DISTFILES =syslog-ng_$V.tar.gz
 
-SHARED_LIBS =  syslog-ng   1.0 \
-   syslog-ng-${V}  1.0
+SHARED_LIBS =  syslog-ng   2.0 \
+   syslog-ng-${REL}2.0
 
 MODULES =  devel/gettext
 
@@ -45,7 +45,8 @@ CONFIGURE_ARGS += --disable-tcp-wrapper 
--disable-geoip \
--without-libnet \
--with-ivykis=system \
-   --enable-sql
+   --enable-sql \
+   --enable-manpages
 CONFIGURE_ENV +=   OPENSSL_CFLAGS=-I/usr/include/openssl \
OPENSSL_LIBS=-lssl -lcrypto \
LIBDBI_CFLAGS=-I/usr/include/openssl \
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.22
diff -u -p -u -r1.22 distinfo
--- distinfo31 Dec 2014 11:33:56 -  1.22
+++ distinfo19 Jul 2015 15:13:26 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.5.6.tar.gz) = bKIBBEXngB9yBkpsYgvc+0lX/CIpnFfBr8a+S2eLIaY=
-SIZE (syslog-ng_3.5.6.tar.gz) = 3001992
+SHA256 (syslog-ng_3.6.4.tar.gz) = e+Ed8xrH1xbx+VLiK1ro4gSe3WM6QbIjd2qFPZEG9Oc=
+SIZE (syslog-ng_3.6.4.tar.gz) = 3276432
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.7
diff -u -p -u -r1.7 syslog-ng.conf
--- files/syslog-ng.conf18 Jul 2015 21:39:05 -  1.7
+++ files/syslog-ng.conf19 Jul 2015 15:13:26 -
@@ -2,7 +2,7 @@
 # This should provide the same behavior as OpenBSD's syslog.conf(5).
 # 2010-07-18 ste...@openbsd.org
 
-@version: 3.5
+@version: 3.6
 
 options { 
use_dns(no);
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v
retrieving revision 1.7
diff -u -p -u -r1.7 patch-Makefile_in
--- patches/patch-Makefile_in   31 Dec 2014 11:33:56 -  1.7
+++ patches/patch-Makefile_in   19 Jul 2015 15:13:26 -
@@ -1,10 +1,10 @@
 $OpenBSD: patch-Makefile_in,v 1.7 2014/12/31 11:33:56 steven Exp $
 temporary hack until libtool is fixed.
 Makefile.in.orig   Tue Oct 28 07:22:29 2014
-+++ Makefile.inTue Oct 28 07:23:34 2014
-@@ -3679,7 +3679,7 @@ lib/lib_libsyslog_ng_la-uuid.lo: lib/$(am__dirstamp) \
-   lib/$(DEPDIR)/$(am__dirstamp)
- 
+--- Makefile.in.orig   Mon Jun  8 15:44:57 2015
 Makefile.inSat Jun 20 10:10:42 2015
+@@ -4362,7 +4362,7 @@ lib/transport/lib_libsyslog_ng_la-transport-tls.lo:  \
+   lib/transport/$(am__dirstamp) \
+   lib/transport/$(DEPDIR)/$(am__dirstamp)
  lib/libsyslog-ng.la: $(lib_libsyslog_ng_la_OBJECTS) 
$(lib_libsyslog_ng_la_DEPENDENCIES) $(EXTRA_lib_libsyslog_ng_la_DEPENDENCIES) 
lib/$(am__dirstamp)
 -  $(AM_V_CCLD)$(lib_libsyslog_ng_la_LINK) -rpath $(libdir) 
$(lib_libsyslog_ng_la_OBJECTS) $(lib_libsyslog_ng_la_LIBADD) $(LIBS)
 +  $(AM_V_CCLD)$(lib_libsyslog_ng_la_LINK) -rpath $(libdir) -version-info 
0:0:0 $(lib_libsyslog_ng_la_OBJECTS) $(lib_libsyslog_ng_la_LIBADD) $(LIBS)
Index: patches/patch-configure
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-configure
--- patches/patch-configure 31 Dec 2014 11:33:56 -  1.2
+++ patches/patch-configure 19 Jul 2015 15:13:26 -
@@ -1,8 +1,8 @@
 $OpenBSD: patch-configure,v 1.2 2014/12/31 11:33:56 steven Exp $
 do not pick up libuuid
 configure.orig Tue Oct 28 07:38:54 2014
-+++ configure  

UPDATE: sysutils/syslog-ng

2015-07-16 Thread Steven Mestdagh
Update to 3.6.4.

I was getting certificate errors on fetch, hence the modified FETCH_CMD.
The certificate seems fine however in firefox/chromium. Looks like we do not
yet have the NetLock CA in our cert.pem and it needs to be added?

Light testing on amd64. Other tests/comments/ok welcome.

Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.50
diff -u -p -u -r1.50 Makefile
--- Makefile31 Dec 2014 11:33:56 -  1.50
+++ Makefile16 Jul 2015 20:35:35 -
@@ -4,7 +4,8 @@ COMMENT=syslogd replacement
 
 SHARED_ONLY =  Yes
 
-V =3.5.6
+V =3.6.4
+REL =  3.6
 DISTNAME = syslog-ng-$V
 CATEGORIES =   sysutils
 
@@ -17,9 +18,10 @@ PERMIT_PACKAGE_CDROM =   Yes
 
 MASTER_SITES = 
http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$V/source/
 DISTFILES =syslog-ng_$V.tar.gz
+FETCH_CMD ?=   /usr/bin/ftp -V ${_PROGRESS} -k ${FTP_KEEPALIVE} -C -S dont
 
-SHARED_LIBS =  syslog-ng   1.0 \
-   syslog-ng-${V}  1.0
+SHARED_LIBS =  syslog-ng   2.0 \
+   syslog-ng-${REL}2.0
 
 MODULES =  devel/gettext
 
@@ -44,7 +46,8 @@ CONFIGURE_ARGS += --disable-tcp-wrapper 
--disable-geoip \
--without-libnet \
--with-ivykis=system \
-   --enable-sql
+   --enable-sql \
+   --enable-manpages
 CONFIGURE_ENV +=   OPENSSL_CFLAGS=-I/usr/include/openssl \
OPENSSL_LIBS=-lssl -lcrypto \
LIBDBI_CFLAGS=-I/usr/include/openssl \
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.22
diff -u -p -u -r1.22 distinfo
--- distinfo31 Dec 2014 11:33:56 -  1.22
+++ distinfo16 Jul 2015 20:35:35 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.5.6.tar.gz) = bKIBBEXngB9yBkpsYgvc+0lX/CIpnFfBr8a+S2eLIaY=
-SIZE (syslog-ng_3.5.6.tar.gz) = 3001992
+SHA256 (syslog-ng_3.6.4.tar.gz) = e+Ed8xrH1xbx+VLiK1ro4gSe3WM6QbIjd2qFPZEG9Oc=
+SIZE (syslog-ng_3.6.4.tar.gz) = 3276432
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.5
diff -u -p -u -r1.5 syslog-ng.conf
--- files/syslog-ng.conf31 Dec 2014 11:33:56 -  1.5
+++ files/syslog-ng.conf16 Jul 2015 20:35:35 -
@@ -2,7 +2,7 @@
 # This should provide the same behavior as OpenBSD's syslog.conf(5).
 # 2010-07-18 ste...@openbsd.org
 
-@version: 3.5
+@version: 3.6
 
 options { 
use_dns(no);
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v
retrieving revision 1.7
diff -u -p -u -r1.7 patch-Makefile_in
--- patches/patch-Makefile_in   31 Dec 2014 11:33:56 -  1.7
+++ patches/patch-Makefile_in   16 Jul 2015 20:35:35 -
@@ -1,10 +1,10 @@
 $OpenBSD: patch-Makefile_in,v 1.7 2014/12/31 11:33:56 steven Exp $
 temporary hack until libtool is fixed.
 Makefile.in.orig   Tue Oct 28 07:22:29 2014
-+++ Makefile.inTue Oct 28 07:23:34 2014
-@@ -3679,7 +3679,7 @@ lib/lib_libsyslog_ng_la-uuid.lo: lib/$(am__dirstamp) \
-   lib/$(DEPDIR)/$(am__dirstamp)
- 
+--- Makefile.in.orig   Mon Jun  8 15:44:57 2015
 Makefile.inSat Jun 20 10:10:42 2015
+@@ -4362,7 +4362,7 @@ lib/transport/lib_libsyslog_ng_la-transport-tls.lo:  \
+   lib/transport/$(am__dirstamp) \
+   lib/transport/$(DEPDIR)/$(am__dirstamp)
  lib/libsyslog-ng.la: $(lib_libsyslog_ng_la_OBJECTS) 
$(lib_libsyslog_ng_la_DEPENDENCIES) $(EXTRA_lib_libsyslog_ng_la_DEPENDENCIES) 
lib/$(am__dirstamp)
 -  $(AM_V_CCLD)$(lib_libsyslog_ng_la_LINK) -rpath $(libdir) 
$(lib_libsyslog_ng_la_OBJECTS) $(lib_libsyslog_ng_la_LIBADD) $(LIBS)
 +  $(AM_V_CCLD)$(lib_libsyslog_ng_la_LINK) -rpath $(libdir) -version-info 
0:0:0 $(lib_libsyslog_ng_la_OBJECTS) $(lib_libsyslog_ng_la_LIBADD) $(LIBS)
Index: patches/patch-configure
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-configure
--- patches/patch-configure 31 Dec 2014 11:33:56 -  1.2
+++ patches/patch-configure 16 Jul 2015 20:35:35 -
@@ -1,8 +1,8 @@
 $OpenBSD: patch-configure,v 1.2 2014/12/31 11:33:56 steven Exp $
 do not pick up libuuid
 configure.orig Tue Oct 28 07:38:54 2014
-+++ configure  Tue Oct 28 07:40:00 2014
-@@ -15854,6 +15854,7 @@ fi
+--- configure.orig Fri Jun 19 13:24:21 2015
 configure  Thu Jul 16 22:22:03 2015
+@@ -16400,6 +16400,7 @@ fi
   else
  pkg_failed=untried
  fi
Index: 

Re: UPDATE: sysutils/syslog-ng

2015-07-16 Thread Rafael Sadowski
On Thu Jul 16, 2015 at 10:49:38PM +0200, Steven Mestdagh wrote:
 Update to 3.6.4.
   --with-ivykis=system \
 - --enable-sql
 + --enable-sql \
 + --enable-manpages

why? No manpages in PLIST



Re: UPDATE: sysutils/syslog-ng

2015-07-16 Thread Stuart Henderson
On 2015/07/16 22:49, Steven Mestdagh wrote:
 Update to 3.6.4.
 
 I was getting certificate errors on fetch, hence the modified FETCH_CMD.
 
 The certificate seems fine however in firefox/chromium. Looks like we do not
 yet have the NetLock CA in our cert.pem and it needs to be added?

FETCH_CMD can't be set in a port Makefile, we either need to mirror the
distfile or add the cert to cert.pem.



Re: UPDATE: sysutils/syslog-ng

2015-07-16 Thread Steven Mestdagh
Rafael Sadowski [2015-07-16, 22:59:54]:
 On Thu Jul 16, 2015 at 10:49:38PM +0200, Steven Mestdagh wrote:
  Update to 3.6.4.
  --with-ivykis=system \
  -   --enable-sql
  +   --enable-sql \
  +   --enable-manpages
 
 why? No manpages in PLIST

the manpages are there. without the option, they are not installed.



Re: UPDATE: sysutils/syslog-ng

2013-11-13 Thread Steven Mestdagh
  this moves syslog-ng to the 3.4 branch.
  i've tried it only on amd64 so far.
  
  please test/comment/ok.
 
 received no feedback yet. new diff integrating David Hill's patches below.

updated the diff to 3.4.5 - anybody else using this?

Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- Makefile19 Jun 2013 20:26:05 -  1.37
+++ Makefile13 Nov 2013 21:57:34 -
@@ -4,7 +4,7 @@
 
 SHARED_ONLY =  Yes
 
-V =3.3.11
+V =3.4.5
 DISTNAME = syslog-ng-$V
 CATEGORIES =   sysutils
 
@@ -23,12 +23,11 @@
 
 MODULES =  devel/gettext
  
-WANTLIB =  c m pcre wrap crypto ssl z evtlog dbi ffi ivykis pthread \
-   gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
-   json-glib-1.0
+WANTLIB =  c m pcre wrap crypto ssl evtlog dbi ivykis pthread \
+   glib-2.0 gmodule-2.0 gthread-2.0 json-c
  
 LIB_DEPENDS =  devel/glib2 \
-   devel/json-glib \
+   devel/json-c \
devel/libivykis \
sysutils/eventlog \
databases/libdbi
@@ -36,9 +35,11 @@
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS +=  --enable-tcp-wrapper \
--with-pidfile-dir=/var/run \
-   --with-json=json-glib \
+   --enable-json \
--with-libmongo-client=no \
--disable-mongodb \
+   --disable-amqp \
+   --without-libnet \
--with-ivykis=system \
--enable-sql
 CONFIGURE_ENV +=   OPENSSL_CFLAGS=-I/usr/include/openssl \
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo19 Jun 2013 20:26:05 -  1.19
+++ distinfo13 Nov 2013 21:57:34 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.3.11.tar.gz) = fJztSSDnHEwh587t7q6cQR9jI17mFVJCRRPZOf6HA7E=
-SIZE (syslog-ng_3.3.11.tar.gz) = 2623651
+SHA256 (syslog-ng_3.4.5.tar.gz) = uKadgTHvwjeNkUn/VOmfkeocR8aeD0YpOV2RDH/3G/s=
+SIZE (syslog-ng_3.4.5.tar.gz) = 3202771
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.3
diff -u -r1.3 syslog-ng.conf
--- files/syslog-ng.conf28 Nov 2012 07:04:36 -  1.3
+++ files/syslog-ng.conf13 Nov 2013 21:57:34 -
@@ -2,7 +2,7 @@
 # This should provide the same behavior as OpenBSD's syslog.conf(5).
 # 2010-07-18 ste...@openbsd.org
 
-@version: 3.3
+@version: 3.4
 
 options { 
use_dns(no);
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in   28 Nov 2012 07:04:36 -  1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.5 2012/11/28 07:04:36 steven Exp $
 Makefile.in.orig   Tue Oct 30 17:58:59 2012
-+++ Makefile.inFri Nov  9 07:44:55 2012
-@@ -334,7 +334,7 @@ timezonedir = @timezonedir@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = lib modules syslog-ng scripts tests doc contrib scl debian 
tgz2build build
-+SUBDIRS = lib modules syslog-ng scripts doc contrib scl debian tgz2build build
- ACLOCAL_AMFLAGS = -I m4 --install
- EXTRA_DIST = VERSION \
-   syslog-ng.spec syslog-ng.spec.in dist.conf dist.conf.in ChangeLog 
syslog-ng.pc.in
Index: patches/patch-lib_Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-lib_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-lib_Makefile_in
--- patches/patch-lib_Makefile_in   18 Jan 2013 19:09:08 -  1.2
+++ patches/patch-lib_Makefile_in   13 Nov 2013 21:57:34 -
@@ -1,14 +1,14 @@
-temporary hack until libtool is fixed.
-
 $OpenBSD: patch-lib_Makefile_in,v 1.2 2013/01/18 19:09:08 steven Exp $
 lib/Makefile.in.orig   Thu Jan 17 10:27:17 2013
-+++ lib/Makefile.inFri Jan 18 19:26:49 2013
-@@ -152,7 +152,7 @@ am_libsyslog_ng_la_OBJECTS = afinter.lo alarms.lo apph
-   rewrite-expr-grammar.lo $(am__objects_2)
+temporary hack until libtool is fixed.
+--- lib/Makefile.in.orig   Mon Nov  4 09:18:07 2013
 lib/Makefile.inWed Nov 13 22:51:23 2013
+@@ -229,7 +229,8 @@ am_libsyslog_ng_la_OBJECTS = libsyslog_ng_la-afinter.l
  libsyslog_ng_la_OBJECTS = $(am_libsyslog_ng_la_OBJECTS)
- libsyslog_ng_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
--  $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+  $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) 

Re: UPDATE: sysutils/syslog-ng

2013-10-10 Thread Landry Breuil
On Wed, Oct 09, 2013 at 11:47:34PM +0200, Steven Mestdagh wrote:
 Steven Mestdagh [2013-10-05, 10:07:35]:
  this moves syslog-ng to the 3.4 branch.
  i've tried it only on amd64 so far.
  
  please test/comment/ok.
 
 received no feedback yet. new diff integrating David Hill's patches below.

I dont use it so cant comment on itself, but portswise it looks good to
me. Only a small question: how come the .la files are not installed
anymore ? I dont see any change into libtool calls besides the version
fixing patch, and usually it installs them by default and we @comment
them or remove them in post-install.

Landry

 Index: Makefile
 ===
 RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
 retrieving revision 1.37
 diff -u -r1.37 Makefile
 --- Makefile  19 Jun 2013 20:26:05 -  1.37
 +++ Makefile  9 Oct 2013 21:43:38 -
 @@ -4,7 +4,7 @@
  
  SHARED_ONLY =Yes
  
 -V =  3.3.11
 +V =  3.4.3
  DISTNAME =   syslog-ng-$V
  CATEGORIES = sysutils
  
 @@ -23,12 +23,11 @@
  
  MODULES =devel/gettext
   
 -WANTLIB =c m pcre wrap crypto ssl z evtlog dbi ffi ivykis pthread \
 - gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
 - json-glib-1.0
 +WANTLIB =c m pcre wrap crypto ssl evtlog dbi ivykis pthread \
 + glib-2.0 gmodule-2.0 gthread-2.0 json-c
   
  LIB_DEPENDS =devel/glib2 \
 - devel/json-glib \
 + devel/json-c \
   devel/libivykis \
   sysutils/eventlog \
   databases/libdbi
 @@ -36,9 +35,11 @@
  CONFIGURE_STYLE =gnu
  CONFIGURE_ARGS +=--enable-tcp-wrapper \
   --with-pidfile-dir=/var/run \
 - --with-json=json-glib \
 + --enable-json \
   --with-libmongo-client=no \
   --disable-mongodb \
 + --disable-amqp \
 + --without-libnet \
   --with-ivykis=system \
   --enable-sql
  CONFIGURE_ENV += OPENSSL_CFLAGS=-I/usr/include/openssl \
 Index: distinfo
 ===
 RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
 retrieving revision 1.19
 diff -u -r1.19 distinfo
 --- distinfo  19 Jun 2013 20:26:05 -  1.19
 +++ distinfo  9 Oct 2013 21:43:38 -
 @@ -1,2 +1,2 @@
 -SHA256 (syslog-ng_3.3.11.tar.gz) = 
 fJztSSDnHEwh587t7q6cQR9jI17mFVJCRRPZOf6HA7E=
 -SIZE (syslog-ng_3.3.11.tar.gz) = 2623651
 +SHA256 (syslog-ng_3.4.3.tar.gz) = 
 igDDQgNhCebMHUQartEkOBNLyITKNJLDaQL/kSChB+4=
 +SIZE (syslog-ng_3.4.3.tar.gz) = 3074800
 Index: files/syslog-ng.conf
 ===
 RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
 retrieving revision 1.3
 diff -u -r1.3 syslog-ng.conf
 --- files/syslog-ng.conf  28 Nov 2012 07:04:36 -  1.3
 +++ files/syslog-ng.conf  9 Oct 2013 21:43:38 -
 @@ -2,7 +2,7 @@
  # This should provide the same behavior as OpenBSD's syslog.conf(5).
  # 2010-07-18 ste...@openbsd.org
  
 -@version: 3.3
 +@version: 3.4
  
  options { 
   use_dns(no);
 Index: patches/patch-Makefile_in
 ===
 RCS file: patches/patch-Makefile_in
 diff -N patches/patch-Makefile_in
 --- patches/patch-Makefile_in 28 Nov 2012 07:04:36 -  1.5
 +++ /dev/null 1 Jan 1970 00:00:00 -
 @@ -1,12 +0,0 @@
 -$OpenBSD: patch-Makefile_in,v 1.5 2012/11/28 07:04:36 steven Exp $
  Makefile.in.orig Tue Oct 30 17:58:59 2012
 -+++ Makefile.in  Fri Nov  9 07:44:55 2012
 -@@ -334,7 +334,7 @@ timezonedir = @timezonedir@
 - top_build_prefix = @top_build_prefix@
 - top_builddir = @top_builddir@
 - top_srcdir = @top_srcdir@
 --SUBDIRS = lib modules syslog-ng scripts tests doc contrib scl debian 
 tgz2build build
 -+SUBDIRS = lib modules syslog-ng scripts doc contrib scl debian tgz2build 
 build
 - ACLOCAL_AMFLAGS = -I m4 --install
 - EXTRA_DIST = VERSION \
 - syslog-ng.spec syslog-ng.spec.in dist.conf dist.conf.in ChangeLog 
 syslog-ng.pc.in
 Index: patches/patch-lib_Makefile_in
 ===
 RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-lib_Makefile_in,v
 retrieving revision 1.2
 diff -u -r1.2 patch-lib_Makefile_in
 --- patches/patch-lib_Makefile_in 18 Jan 2013 19:09:08 -  1.2
 +++ patches/patch-lib_Makefile_in 9 Oct 2013 21:43:38 -
 @@ -1,14 +1,14 @@
 -temporary hack until libtool is fixed.
 -
  $OpenBSD: patch-lib_Makefile_in,v 1.2 2013/01/18 19:09:08 steven Exp $
  lib/Makefile.in.orig Thu Jan 17 10:27:17 2013
 -+++ lib/Makefile.in  Fri Jan 18 19:26:49 2013
 -@@ -152,7 +152,7 @@ am_libsyslog_ng_la_OBJECTS = afinter.lo alarms.lo apph
 - rewrite-expr-grammar.lo $(am__objects_2)
 +temporary hack until libtool is fixed.
 +--- 

Re: UPDATE: sysutils/syslog-ng

2013-10-09 Thread Steven Mestdagh
Steven Mestdagh [2013-10-05, 10:07:35]:
 this moves syslog-ng to the 3.4 branch.
 i've tried it only on amd64 so far.
 
 please test/comment/ok.

received no feedback yet. new diff integrating David Hill's patches below.

Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- Makefile19 Jun 2013 20:26:05 -  1.37
+++ Makefile9 Oct 2013 21:43:38 -
@@ -4,7 +4,7 @@
 
 SHARED_ONLY =  Yes
 
-V =3.3.11
+V =3.4.3
 DISTNAME = syslog-ng-$V
 CATEGORIES =   sysutils
 
@@ -23,12 +23,11 @@
 
 MODULES =  devel/gettext
  
-WANTLIB =  c m pcre wrap crypto ssl z evtlog dbi ffi ivykis pthread \
-   gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
-   json-glib-1.0
+WANTLIB =  c m pcre wrap crypto ssl evtlog dbi ivykis pthread \
+   glib-2.0 gmodule-2.0 gthread-2.0 json-c
  
 LIB_DEPENDS =  devel/glib2 \
-   devel/json-glib \
+   devel/json-c \
devel/libivykis \
sysutils/eventlog \
databases/libdbi
@@ -36,9 +35,11 @@
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS +=  --enable-tcp-wrapper \
--with-pidfile-dir=/var/run \
-   --with-json=json-glib \
+   --enable-json \
--with-libmongo-client=no \
--disable-mongodb \
+   --disable-amqp \
+   --without-libnet \
--with-ivykis=system \
--enable-sql
 CONFIGURE_ENV +=   OPENSSL_CFLAGS=-I/usr/include/openssl \
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo19 Jun 2013 20:26:05 -  1.19
+++ distinfo9 Oct 2013 21:43:38 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.3.11.tar.gz) = fJztSSDnHEwh587t7q6cQR9jI17mFVJCRRPZOf6HA7E=
-SIZE (syslog-ng_3.3.11.tar.gz) = 2623651
+SHA256 (syslog-ng_3.4.3.tar.gz) = igDDQgNhCebMHUQartEkOBNLyITKNJLDaQL/kSChB+4=
+SIZE (syslog-ng_3.4.3.tar.gz) = 3074800
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.3
diff -u -r1.3 syslog-ng.conf
--- files/syslog-ng.conf28 Nov 2012 07:04:36 -  1.3
+++ files/syslog-ng.conf9 Oct 2013 21:43:38 -
@@ -2,7 +2,7 @@
 # This should provide the same behavior as OpenBSD's syslog.conf(5).
 # 2010-07-18 ste...@openbsd.org
 
-@version: 3.3
+@version: 3.4
 
 options { 
use_dns(no);
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in   28 Nov 2012 07:04:36 -  1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.5 2012/11/28 07:04:36 steven Exp $
 Makefile.in.orig   Tue Oct 30 17:58:59 2012
-+++ Makefile.inFri Nov  9 07:44:55 2012
-@@ -334,7 +334,7 @@ timezonedir = @timezonedir@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = lib modules syslog-ng scripts tests doc contrib scl debian 
tgz2build build
-+SUBDIRS = lib modules syslog-ng scripts doc contrib scl debian tgz2build build
- ACLOCAL_AMFLAGS = -I m4 --install
- EXTRA_DIST = VERSION \
-   syslog-ng.spec syslog-ng.spec.in dist.conf dist.conf.in ChangeLog 
syslog-ng.pc.in
Index: patches/patch-lib_Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-lib_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-lib_Makefile_in
--- patches/patch-lib_Makefile_in   18 Jan 2013 19:09:08 -  1.2
+++ patches/patch-lib_Makefile_in   9 Oct 2013 21:43:38 -
@@ -1,14 +1,14 @@
-temporary hack until libtool is fixed.
-
 $OpenBSD: patch-lib_Makefile_in,v 1.2 2013/01/18 19:09:08 steven Exp $
 lib/Makefile.in.orig   Thu Jan 17 10:27:17 2013
-+++ lib/Makefile.inFri Jan 18 19:26:49 2013
-@@ -152,7 +152,7 @@ am_libsyslog_ng_la_OBJECTS = afinter.lo alarms.lo apph
-   rewrite-expr-grammar.lo $(am__objects_2)
+temporary hack until libtool is fixed.
+--- lib/Makefile.in.orig   Tue Aug 13 11:29:11 2013
 lib/Makefile.inMon Sep 23 22:25:03 2013
+@@ -200,7 +200,8 @@ am_libsyslog_ng_la_OBJECTS = libsyslog_ng_la-afinter.l
  libsyslog_ng_la_OBJECTS = $(am_libsyslog_ng_la_OBJECTS)
- libsyslog_ng_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
--  $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+  $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) 
-version-info 

UPDATE: sysutils/syslog-ng

2013-10-05 Thread Steven Mestdagh
this moves syslog-ng to the 3.4 branch.
i've tried it only on amd64 so far.

please test/comment/ok.

Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- Makefile19 Jun 2013 20:26:05 -  1.37
+++ Makefile5 Oct 2013 07:36:38 -
@@ -4,7 +4,7 @@
 
 SHARED_ONLY =  Yes
 
-V =3.3.11
+V =3.4.3
 DISTNAME = syslog-ng-$V
 CATEGORIES =   sysutils
 
@@ -23,12 +23,11 @@
 
 MODULES =  devel/gettext
  
-WANTLIB =  c m pcre wrap crypto ssl z evtlog dbi ffi ivykis pthread \
-   gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
-   json-glib-1.0
+WANTLIB =  c m pcre wrap crypto ssl evtlog dbi ivykis pthread \
+   glib-2.0 gmodule-2.0 gthread-2.0 json-c
  
 LIB_DEPENDS =  devel/glib2 \
-   devel/json-glib \
+   devel/json-c \
devel/libivykis \
sysutils/eventlog \
databases/libdbi
@@ -36,9 +35,10 @@
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS +=  --enable-tcp-wrapper \
--with-pidfile-dir=/var/run \
-   --with-json=json-glib \
+   --enable-json \
--with-libmongo-client=no \
--disable-mongodb \
+   --disable-amqp \
--with-ivykis=system \
--enable-sql
 CONFIGURE_ENV +=   OPENSSL_CFLAGS=-I/usr/include/openssl \
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo19 Jun 2013 20:26:05 -  1.19
+++ distinfo5 Oct 2013 07:36:38 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.3.11.tar.gz) = fJztSSDnHEwh587t7q6cQR9jI17mFVJCRRPZOf6HA7E=
-SIZE (syslog-ng_3.3.11.tar.gz) = 2623651
+SHA256 (syslog-ng_3.4.3.tar.gz) = igDDQgNhCebMHUQartEkOBNLyITKNJLDaQL/kSChB+4=
+SIZE (syslog-ng_3.4.3.tar.gz) = 3074800
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.3
diff -u -r1.3 syslog-ng.conf
--- files/syslog-ng.conf28 Nov 2012 07:04:36 -  1.3
+++ files/syslog-ng.conf5 Oct 2013 07:36:38 -
@@ -2,7 +2,7 @@
 # This should provide the same behavior as OpenBSD's syslog.conf(5).
 # 2010-07-18 ste...@openbsd.org
 
-@version: 3.3
+@version: 3.4
 
 options { 
use_dns(no);
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in   28 Nov 2012 07:04:36 -  1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.5 2012/11/28 07:04:36 steven Exp $
 Makefile.in.orig   Tue Oct 30 17:58:59 2012
-+++ Makefile.inFri Nov  9 07:44:55 2012
-@@ -334,7 +334,7 @@ timezonedir = @timezonedir@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = lib modules syslog-ng scripts tests doc contrib scl debian 
tgz2build build
-+SUBDIRS = lib modules syslog-ng scripts doc contrib scl debian tgz2build build
- ACLOCAL_AMFLAGS = -I m4 --install
- EXTRA_DIST = VERSION \
-   syslog-ng.spec syslog-ng.spec.in dist.conf dist.conf.in ChangeLog 
syslog-ng.pc.in
Index: patches/patch-lib_Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-lib_Makefile_in,v
retrieving revision 1.2
diff -u -r1.2 patch-lib_Makefile_in
--- patches/patch-lib_Makefile_in   18 Jan 2013 19:09:08 -  1.2
+++ patches/patch-lib_Makefile_in   5 Oct 2013 07:36:38 -
@@ -1,14 +1,14 @@
-temporary hack until libtool is fixed.
-
 $OpenBSD: patch-lib_Makefile_in,v 1.2 2013/01/18 19:09:08 steven Exp $
 lib/Makefile.in.orig   Thu Jan 17 10:27:17 2013
-+++ lib/Makefile.inFri Jan 18 19:26:49 2013
-@@ -152,7 +152,7 @@ am_libsyslog_ng_la_OBJECTS = afinter.lo alarms.lo apph
-   rewrite-expr-grammar.lo $(am__objects_2)
+temporary hack until libtool is fixed.
+--- lib/Makefile.in.orig   Tue Aug 13 11:29:11 2013
 lib/Makefile.inMon Sep 23 22:25:03 2013
+@@ -200,7 +200,8 @@ am_libsyslog_ng_la_OBJECTS = libsyslog_ng_la-afinter.l
  libsyslog_ng_la_OBJECTS = $(am_libsyslog_ng_la_OBJECTS)
- libsyslog_ng_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
--  $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+  $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) 
-version-info 0:0:0 \
-   $(libsyslog_ng_la_LDFLAGS) $(LDFLAGS) -o $@
+ libsyslog_ng_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+   $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 

Re: UPDATE: sysutils/syslog-ng 3.3.7

2012-11-26 Thread Steven Mestdagh
Stuart Henderson [2012-11-21, 21:10:15]:
 On 2012/11/18 17:02, Steven Mestdagh wrote:
  here is a long overdue update for syslog-ng.
  i would appreciate if you can help to test it.
  
  comments/feedback welcome.
  (i know the new shared lib and symlink hack are not yet optimal portswise, 
  but
  i'd like to move forward with this update.)
 
 Not totally ideal, but I think that makes sense for now..
 
  --- patches/patch-doc_man_syslog-ng_conf_5  28 May 2012 16:31:31 -  
  1.1
   doc/man/syslog-ng.conf.5.orig  Sat May 26 11:23:41 2012
  -+++ doc/man/syslog-ng.conf.5   Sat May 26 11:23:45 2012
  -@@ -1,3 +1,4 @@
  +--- doc/man/syslog-ng.conf.5.orig  Sun Aug 19 18:27:24 2012
   doc/man/syslog-ng.conf.5   Sun Oct 14 18:12:26 2012
  +@@ -1,4 +1,5 @@
  + '\ t
   +'\ t
 
 This patch can be completely removed, upstream added the '\ t now.
 
  +lib/syslog-ng/
  +lib/syslog-ng/libaffile.la
  +lib/syslog-ng/libaffile.so
  +lib/syslog-ng/libafprog.la
  +lib/syslog-ng/libafprog.so
  +@comment lib/syslog-ng/libafsocket-notls.la
  +lib/syslog-ng/libafsocket-notls.so
  +lib/syslog-ng/libafsocket-tls.la
 
 One of these .la files in the modules directory is @commented but
 the others aren't, is this intentional?

mistake that slipped in when getting a previous version to work.
new diff below.

ok?

Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile19 Sep 2012 12:25:40 -  1.30
+++ Makefile26 Nov 2012 20:19:33 -
@@ -2,9 +2,10 @@
 
 COMMENT=   syslogd replacement
 
-V =3.1.4
+SHARED_ONLY =  Yes
+
+V =3.3.7
 DISTNAME = syslog-ng-$V
-REVISION = 9
 CATEGORIES =   sysutils
 
 MAINTAINER =   Steven Mestdagh ste...@openbsd.org
@@ -20,45 +21,53 @@
 MASTER_SITES = 
http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$V/source/
 DISTFILES =syslog-ng_$V.tar.gz
 
+SHARED_LIBS =  syslog-ng   0.0 \
+   syslog-ng-${V}  0.0
+
 MODULES =  devel/gettext
  
-WANTLIB =  c pcre wrap crypto ssl z glib-2.0 evtlog dbi gthread-2.0 pthread
+WANTLIB =  c m pcre wrap crypto ssl z evtlog dbi ffi ivykis pthread \
+   gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
+   json-glib-1.0
  
 LIB_DEPENDS =  devel/glib2 \
+   devel/json-glib \
+   devel/libivykis \
sysutils/eventlog \
databases/libdbi
 
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS +=  --enable-tcp-wrapper \
--with-pidfile-dir=/var/run \
+   --with-libmongo-client=no \
+   --disable-mongodb \
+   --with-ivykis=system \
--enable-sql
 CONFIGURE_ENV +=   OPENSSL_CFLAGS=-I/usr/include/openssl \
OPENSSL_LIBS=-lssl -lcrypto \
LIBDBI_CFLAGS=-I/usr/include/openssl \
LIBDBI_LIBS=-ldbi
+USE_GMAKE =Yes
+USE_LIBTOOL =  Yes
 USE_GROFF =Yes
 
 CFLAGS +=  -I${LOCALBASE}/include
+
+SUBST_VARS +=  V
  
 DOC =  ${PREFIX}/share/doc/syslog-ng/
 EXAMPLES = ${PREFIX}/share/examples/syslog-ng/
  
-#post-extract:
-#  tar -C ${WRKBUILD} -xzf ${WRKSRC}/doc/reference/syslog-ng.html.tar.gz
-
-post-configure:
-   cd ${WRKSRC}/src  mv Makefile Makefile.was  \
-   sed '/^syslog_ng_ctl_LDADD = /s/-lwrap //' Makefile.was  
Makefile
-
 pre-install:
cd ${WRKSRC}/doc/man  perl -pi -e 
's@/opt/syslog\\-ng/etc/syslog\\-ng/@${SYSCONFDIR:S/-/\\-/g}/@g' *.[158]
  
 post-install:
-#  ${INSTALL_DATA_DIR} ${DOC}
-#  ${INSTALL_DATA} ${WRKBUILD}/syslog-ng.html/index.html ${DOC}
${INSTALL_DATA_DIR} ${EXAMPLES}
${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf \
${EXAMPLES}/syslog-ng.conf.sample
+   rm -rf ${PREFIX}/share/{include,tools,xsd}
+# XXX hack for libtool dropping -rpath
+   ln -s syslog-ng/libsyslog-ng-crypto.so 
${PREFIX}/lib/libsyslog-ng-crypto.so
 
 .include bsd.port.mk
 CONFIGURE_ARGS+=   --sysconfdir=${SYSCONFDIR}/syslog-ng
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo1 May 2011 13:48:32 -   1.15
+++ distinfo26 Nov 2012 20:19:33 -
@@ -1,5 +1,2 @@
-MD5 (syslog-ng_3.1.4.tar.gz) = SOZkbRLTDGVfQ5G5cNYfVg==
-RMD160 (syslog-ng_3.1.4.tar.gz) = ZFIEBM98ij+D7+QdcOkbuft6g/4=
-SHA1 (syslog-ng_3.1.4.tar.gz) = vBqmP96VINfWfF8fU0CAUUPPmDk=
-SHA256 (syslog-ng_3.1.4.tar.gz) = n0jIRSO5F1TysdOsdg4njM4xx/5eAC1inwC3jq46jNo=
-SIZE (syslog-ng_3.1.4.tar.gz) = 724071
+SHA256 (syslog-ng_3.3.7.tar.gz) = EpyR50Z1GgqedDvW4VXFwfykwusoN1FxwgsxKCK1EXs=
+SIZE (syslog-ng_3.3.7.tar.gz) = 2613938
Index: files/syslog-ng.conf

Re: UPDATE: sysutils/syslog-ng 3.3.7

2012-11-21 Thread Stuart Henderson
On 2012/11/18 17:02, Steven Mestdagh wrote:
 here is a long overdue update for syslog-ng.
 i would appreciate if you can help to test it.
 
 comments/feedback welcome.
 (i know the new shared lib and symlink hack are not yet optimal portswise, but
 i'd like to move forward with this update.)

Not totally ideal, but I think that makes sense for now..

 --- patches/patch-doc_man_syslog-ng_conf_528 May 2012 16:31:31 -  
 1.1
  doc/man/syslog-ng.conf.5.origSat May 26 11:23:41 2012
 -+++ doc/man/syslog-ng.conf.5 Sat May 26 11:23:45 2012
 -@@ -1,3 +1,4 @@
 +--- doc/man/syslog-ng.conf.5.origSun Aug 19 18:27:24 2012
  doc/man/syslog-ng.conf.5 Sun Oct 14 18:12:26 2012
 +@@ -1,4 +1,5 @@
 + '\ t
  +'\ t

This patch can be completely removed, upstream added the '\ t now.

 +lib/syslog-ng/
 +lib/syslog-ng/libaffile.la
 +lib/syslog-ng/libaffile.so
 +lib/syslog-ng/libafprog.la
 +lib/syslog-ng/libafprog.so
 +@comment lib/syslog-ng/libafsocket-notls.la
 +lib/syslog-ng/libafsocket-notls.so
 +lib/syslog-ng/libafsocket-tls.la

One of these .la files in the modules directory is @commented but
the others aren't, is this intentional?



UPDATE: sysutils/syslog-ng 3.3.7

2012-11-18 Thread Steven Mestdagh
here is a long overdue update for syslog-ng.
i would appreciate if you can help to test it.

comments/feedback welcome.
(i know the new shared lib and symlink hack are not yet optimal portswise, but
i'd like to move forward with this update.)


Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile19 Sep 2012 12:25:40 -  1.30
+++ Makefile18 Nov 2012 15:42:18 -
@@ -2,9 +2,10 @@
 
 COMMENT=   syslogd replacement
 
-V =3.1.4
+SHARED_ONLY =  Yes
+
+V =3.3.7
 DISTNAME = syslog-ng-$V
-REVISION = 9
 CATEGORIES =   sysutils
 
 MAINTAINER =   Steven Mestdagh ste...@openbsd.org
@@ -20,45 +21,53 @@
 MASTER_SITES = 
http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$V/source/
 DISTFILES =syslog-ng_$V.tar.gz
 
+SHARED_LIBS =  syslog-ng   0.0 \
+   syslog-ng-${V}  0.0
+
 MODULES =  devel/gettext
  
-WANTLIB =  c pcre wrap crypto ssl z glib-2.0 evtlog dbi gthread-2.0 pthread
+WANTLIB =  c m pcre wrap crypto ssl z evtlog dbi ffi ivykis pthread \
+   gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
+   json-glib-1.0
  
 LIB_DEPENDS =  devel/glib2 \
+   devel/json-glib \
+   devel/libivykis \
sysutils/eventlog \
databases/libdbi
 
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS +=  --enable-tcp-wrapper \
--with-pidfile-dir=/var/run \
+   --with-libmongo-client=no \
+   --disable-mongodb \
+   --with-ivykis=system \
--enable-sql
 CONFIGURE_ENV +=   OPENSSL_CFLAGS=-I/usr/include/openssl \
OPENSSL_LIBS=-lssl -lcrypto \
LIBDBI_CFLAGS=-I/usr/include/openssl \
LIBDBI_LIBS=-ldbi
+USE_GMAKE =Yes
+USE_LIBTOOL =  Yes
 USE_GROFF =Yes
 
 CFLAGS +=  -I${LOCALBASE}/include
+
+SUBST_VARS +=  V
  
 DOC =  ${PREFIX}/share/doc/syslog-ng/
 EXAMPLES = ${PREFIX}/share/examples/syslog-ng/
  
-#post-extract:
-#  tar -C ${WRKBUILD} -xzf ${WRKSRC}/doc/reference/syslog-ng.html.tar.gz
-
-post-configure:
-   cd ${WRKSRC}/src  mv Makefile Makefile.was  \
-   sed '/^syslog_ng_ctl_LDADD = /s/-lwrap //' Makefile.was  
Makefile
-
 pre-install:
cd ${WRKSRC}/doc/man  perl -pi -e 
's@/opt/syslog\\-ng/etc/syslog\\-ng/@${SYSCONFDIR:S/-/\\-/g}/@g' *.[158]
  
 post-install:
-#  ${INSTALL_DATA_DIR} ${DOC}
-#  ${INSTALL_DATA} ${WRKBUILD}/syslog-ng.html/index.html ${DOC}
${INSTALL_DATA_DIR} ${EXAMPLES}
${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf \
${EXAMPLES}/syslog-ng.conf.sample
+   rm -rf ${PREFIX}/share/{include,tools,xsd}
+# XXX hack for libtool dropping -rpath
+   ln -s syslog-ng/libsyslog-ng-crypto.so 
${PREFIX}/lib/libsyslog-ng-crypto.so
 
 .include bsd.port.mk
 CONFIGURE_ARGS+=   --sysconfdir=${SYSCONFDIR}/syslog-ng
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo1 May 2011 13:48:32 -   1.15
+++ distinfo18 Nov 2012 15:42:18 -
@@ -1,5 +1,2 @@
-MD5 (syslog-ng_3.1.4.tar.gz) = SOZkbRLTDGVfQ5G5cNYfVg==
-RMD160 (syslog-ng_3.1.4.tar.gz) = ZFIEBM98ij+D7+QdcOkbuft6g/4=
-SHA1 (syslog-ng_3.1.4.tar.gz) = vBqmP96VINfWfF8fU0CAUUPPmDk=
-SHA256 (syslog-ng_3.1.4.tar.gz) = n0jIRSO5F1TysdOsdg4njM4xx/5eAC1inwC3jq46jNo=
-SIZE (syslog-ng_3.1.4.tar.gz) = 724071
+SHA256 (syslog-ng_3.3.7.tar.gz) = EpyR50Z1GgqedDvW4VXFwfykwusoN1FxwgsxKCK1EXs=
+SIZE (syslog-ng_3.3.7.tar.gz) = 2613938
Index: files/syslog-ng.conf
===
RCS file: /cvs/ports/sysutils/syslog-ng/files/syslog-ng.conf,v
retrieving revision 1.2
diff -u -r1.2 syslog-ng.conf
--- files/syslog-ng.conf29 May 2012 05:19:19 -  1.2
+++ files/syslog-ng.conf18 Nov 2012 15:42:18 -
@@ -2,7 +2,7 @@
 # This should provide the same behavior as OpenBSD's syslog.conf(5).
 # 2010-07-18 ste...@openbsd.org
 
-@version: 3.0
+@version: 3.3
 
 options { 
use_dns(no);
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in   24 Sep 2010 17:54:16 -  1.4
+++ patches/patch-Makefile_in   18 Nov 2012 15:42:18 -
@@ -1,12 +1,12 @@
-$OpenBSD: patch-Makefile_in,v 1.4 2010/09/24 17:54:16 steven Exp $
 Makefile.in.orig   Mon Aug  2 17:26:31 2010
-+++ Makefile.inWed Aug  4 19:55:04 2010
-@@ -218,7 +218,7 @@ timezonedir = @timezonedir@
+$OpenBSD: 

Re: UPDATE: sysutils/syslog-ng

2008-11-09 Thread Brian A. Seklecki (Mobile)
SM:

It seems fine.  Tested on 4.4/i386 and 4.3/i386.  Looking forward to it
in 4.5.

2008 Nov  9 03:18:07 -05:00 seawing [syslog-ng][1790] [syslog] [notice]
syslog-ng[1790]: syslog-ng starting up; version='2.1.1'

$ pkg_info -L syslog-ng-2.1.1
Information for inst:syslog-ng-2.1.1

Files:
/usr/local/man/man5/syslog-ng.conf.5
/usr/local/man/man8/syslog-ng.8
/usr/local/sbin/syslog-ng
/usr/local/share/doc/syslog-ng/index.html
/usr/local/share/examples/syslog-ng/syslog-ng.conf.sample

Binary Package:
http://people.collaborativefusion.com/~seklecki/syslog-ng-2.1.1.tgz for
4.4/i386 package.

~BAS

On Wed, 2008-11-05 at 21:40 +0100, Steven Mestdagh wrote:
 Steven Mestdagh [2008-10-08, 21:34:33]:
  this requires the new sysutils/eventlog port sent earlier.
  
  please test/comment/ok.
 
 so has no one tested this?
 
  
  Index: Makefile
  ===
  RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
  retrieving revision 1.8
  diff -u -r1.8 Makefile
  --- Makefile6 Oct 2008 16:09:13 -   1.8
  +++ Makefile8 Oct 2008 19:29:28 -
  @@ -2,50 +2,39 @@
   
   COMMENT=   syslogd replacement
   
  +DISTNAME=  syslog-ng-2.1.1
   CATEGORIES=sysutils
   
  -DISTNAME=  syslog-ng-1.6.8
  -LIBOL= libol-0.3.16
  +MAINTAINER=Steven Mestdagh [EMAIL PROTECTED]
   
  -MAINTAINER=Jakob Schlyter [EMAIL PROTECTED]
  +HOMEPAGE = http://www.balabit.com/network-security/syslog-ng/
   
  -MASTER_SITE_SYSLOGNG=\
  -   http://www.balabit.com/downloads/files/syslog-ng/sources/
  +# GPL v2
  +PERMIT_PACKAGE_CDROM = Yes
  +PERMIT_PACKAGE_FTP =   Yes
  +PERMIT_DISTFILES_CDROM =   Yes
  +PERMIT_DISTFILES_FTP = Yes
   
  -MASTER_SITES=  ${MASTER_SITE_SYSLOGNG:=1.6/src/}
  -MASTER_SITES0= ${MASTER_SITE_SYSLOGNG:=libol/0.3/}
  +MASTER_SITES = 
  http://www.balabit.com/downloads/files/syslog-ng/sources/2.1/src/
   
  -HOMEPAGE=  http://www.balabit.com/products/syslog_ng/
  +WANTLIB =  c iconv intl wrap
   
  -DISTFILES= ${DISTNAME}.tar.gz \
  -   ${LIBOL}.tar.gz:0
  +LIB_DEPENDS =  glib-2.0::devel/glib2 \
  +   evtlog::sysutils/eventlog
   
  -# GPL
  -PERMIT_PACKAGE_CDROM=  Yes
  -PERMIT_PACKAGE_FTP=Yes
  -PERMIT_DISTFILES_CDROM=Yes
  -PERMIT_DISTFILES_FTP=  Yes
  -WANTLIB=   c
  +CONFIGURE_STYLE =  gnu
  +CONFIGURE_ARGS +=  --enable-tcp-wrapper
   
  -CONFIGURE_STYLE=   gnu
  -CONFIGURE_ARGS+=   --with-libol=${WRKDIR}/${LIBOL} \
  -   --enable-tcp-wrapper
  +DOC =  ${PREFIX}/share/doc/syslog-ng/
  +EXAMPLES = ${PREFIX}/share/examples/syslog-ng/
   
  -DOC=   ${PREFIX}/share/doc/syslog-ng
  -EXAMPLES=  ${PREFIX}/share/examples/syslog-ng
  -
  -pre-configure:
  -   cp -f ${PORTSDIR}/infrastructure/db/config.guess \
  - ${PORTSDIR}/infrastructure/db/config.sub ${WRKDIR}/${LIBOL}
  -   cd ${WRKDIR}/${LIBOL}; ./configure ; ${MAKE}
  +post-extract:
  +   tar -C ${WRKBUILD} -xzf ${WRKSRC}/doc/reference/syslog-ng.html.tar.gz
   
   post-install:
  ${INSTALL_DATA_DIR} ${DOC}
  -   ${INSTALL_DATA} ${WRKSRC}/doc/sgml/*.{ps,sgml,txt} ${DOC}
  -   (cd ${DOC} ;\
  -   tar xzf ${WRKSRC}/doc/sgml/syslog-ng.html.tar.gz ;\
  -   ln -s book1.html syslog-ng.html/index.html )
  +   ${INSTALL_DATA} ${WRKBUILD}/syslog-ng.html/index.html ${DOC}
  ${INSTALL_DATA_DIR} ${EXAMPLES}
  -   ${INSTALL_DATA} ${WRKSRC}/doc/syslog-ng.conf.sample ${EXAMPLES}
  +   ${INSTALL_DATA} ${WRKSRC}/doc/examples/syslog-ng.conf.sample ${EXAMPLES}
   
   .include bsd.port.mk
  Index: distinfo
  ===
  RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
  retrieving revision 1.7
  diff -u -r1.7 distinfo
  --- distinfo5 Apr 2007 17:26:13 -   1.7
  +++ distinfo8 Oct 2008 19:29:28 -
  @@ -1,10 +1,5 @@
  -MD5 (libol-0.3.16.tar.gz) = Hym+P0vN21svPZZeePBABg==
  -MD5 (syslog-ng-1.6.8.tar.gz) = /7rX6ObcvjhYILj/uiO2Ig==
  -RMD160 (libol-0.3.16.tar.gz) = ts8Hi0sH/EyHm/SicZpto+lvT8Y=
  -RMD160 (syslog-ng-1.6.8.tar.gz) = EcZ5miRCaYao/ZdDxjQH4ums+mc=
  -SHA1 (libol-0.3.16.tar.gz) = bW4e+U2Lbdnd2OkkUMXky54wGIo=
  -SHA1 (syslog-ng-1.6.8.tar.gz) = cIEq8c7jIXlwlcryoK32CvyBpwA=
  -SHA256 (libol-0.3.16.tar.gz) = aL69o59D/V+hO0ARqRxAsmhP4mKvKkCeKC99mn0o7J4=
  -SHA256 (syslog-ng-1.6.8.tar.gz) = 
  PIQf2JWZ/7dwzfKERCaYDXXcPasS4PcH5Mu1GTf2El4=
  -SIZE (libol-0.3.16.tar.gz) = 345231
  -SIZE (syslog-ng-1.6.8.tar.gz) = 383589
  +MD5 (syslog-ng-2.1.1.tar.gz) = f/7jARSKZ41cGLGRDLe+HQ==
  +RMD160 (syslog-ng-2.1.1.tar.gz) = H/iIJPTV1D3CxjmK6Am8tKas8As=
  +SHA1 (syslog-ng-2.1.1.tar.gz) = EeX7CzsrnxzgJlGXVVCcMkz0orQ=
  +SHA256 (syslog-ng-2.1.1.tar.gz) = 
  is0YN/wS8OZfns/7jFU794OjUGKKzKPCkyvy9FCfpIU=
  +SIZE (syslog-ng-2.1.1.tar.gz) = 420883
  Index: patches/patch-Makefile_in
  ===
  RCS file: 

Re: UPDATE: sysutils/syslog-ng

2008-11-05 Thread Steven Mestdagh
Steven Mestdagh [2008-10-08, 21:34:33]:
 this requires the new sysutils/eventlog port sent earlier.
 
 please test/comment/ok.

so has no one tested this?

 
 Index: Makefile
 ===
 RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
 retrieving revision 1.8
 diff -u -r1.8 Makefile
 --- Makefile  6 Oct 2008 16:09:13 -   1.8
 +++ Makefile  8 Oct 2008 19:29:28 -
 @@ -2,50 +2,39 @@
  
  COMMENT= syslogd replacement
  
 +DISTNAME=syslog-ng-2.1.1
  CATEGORIES=  sysutils
  
 -DISTNAME=syslog-ng-1.6.8
 -LIBOL=   libol-0.3.16
 +MAINTAINER=  Steven Mestdagh [EMAIL PROTECTED]
  
 -MAINTAINER=  Jakob Schlyter [EMAIL PROTECTED]
 +HOMEPAGE =   http://www.balabit.com/network-security/syslog-ng/
  
 -MASTER_SITE_SYSLOGNG=\
 - http://www.balabit.com/downloads/files/syslog-ng/sources/
 +# GPL v2
 +PERMIT_PACKAGE_CDROM =   Yes
 +PERMIT_PACKAGE_FTP = Yes
 +PERMIT_DISTFILES_CDROM = Yes
 +PERMIT_DISTFILES_FTP =   Yes
  
 -MASTER_SITES=${MASTER_SITE_SYSLOGNG:=1.6/src/}
 -MASTER_SITES0=   ${MASTER_SITE_SYSLOGNG:=libol/0.3/}
 +MASTER_SITES =   
 http://www.balabit.com/downloads/files/syslog-ng/sources/2.1/src/
  
 -HOMEPAGE=http://www.balabit.com/products/syslog_ng/
 +WANTLIB =c iconv intl wrap
  
 -DISTFILES=   ${DISTNAME}.tar.gz \
 - ${LIBOL}.tar.gz:0
 +LIB_DEPENDS =glib-2.0::devel/glib2 \
 + evtlog::sysutils/eventlog
  
 -# GPL
 -PERMIT_PACKAGE_CDROM=Yes
 -PERMIT_PACKAGE_FTP=  Yes
 -PERMIT_DISTFILES_CDROM=  Yes
 -PERMIT_DISTFILES_FTP=Yes
 -WANTLIB= c
 +CONFIGURE_STYLE =gnu
 +CONFIGURE_ARGS +=--enable-tcp-wrapper
  
 -CONFIGURE_STYLE= gnu
 -CONFIGURE_ARGS+= --with-libol=${WRKDIR}/${LIBOL} \
 - --enable-tcp-wrapper
 +DOC =${PREFIX}/share/doc/syslog-ng/
 +EXAMPLES =   ${PREFIX}/share/examples/syslog-ng/
  
 -DOC= ${PREFIX}/share/doc/syslog-ng
 -EXAMPLES=${PREFIX}/share/examples/syslog-ng
 -
 -pre-configure:
 - cp -f ${PORTSDIR}/infrastructure/db/config.guess \
 -   ${PORTSDIR}/infrastructure/db/config.sub ${WRKDIR}/${LIBOL}
 - cd ${WRKDIR}/${LIBOL}; ./configure ; ${MAKE}
 +post-extract:
 + tar -C ${WRKBUILD} -xzf ${WRKSRC}/doc/reference/syslog-ng.html.tar.gz
  
  post-install:
   ${INSTALL_DATA_DIR} ${DOC}
 - ${INSTALL_DATA} ${WRKSRC}/doc/sgml/*.{ps,sgml,txt} ${DOC}
 - (cd ${DOC} ;\
 - tar xzf ${WRKSRC}/doc/sgml/syslog-ng.html.tar.gz ;\
 - ln -s book1.html syslog-ng.html/index.html )
 + ${INSTALL_DATA} ${WRKBUILD}/syslog-ng.html/index.html ${DOC}
   ${INSTALL_DATA_DIR} ${EXAMPLES}
 - ${INSTALL_DATA} ${WRKSRC}/doc/syslog-ng.conf.sample ${EXAMPLES}
 + ${INSTALL_DATA} ${WRKSRC}/doc/examples/syslog-ng.conf.sample ${EXAMPLES}
  
  .include bsd.port.mk
 Index: distinfo
 ===
 RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
 retrieving revision 1.7
 diff -u -r1.7 distinfo
 --- distinfo  5 Apr 2007 17:26:13 -   1.7
 +++ distinfo  8 Oct 2008 19:29:28 -
 @@ -1,10 +1,5 @@
 -MD5 (libol-0.3.16.tar.gz) = Hym+P0vN21svPZZeePBABg==
 -MD5 (syslog-ng-1.6.8.tar.gz) = /7rX6ObcvjhYILj/uiO2Ig==
 -RMD160 (libol-0.3.16.tar.gz) = ts8Hi0sH/EyHm/SicZpto+lvT8Y=
 -RMD160 (syslog-ng-1.6.8.tar.gz) = EcZ5miRCaYao/ZdDxjQH4ums+mc=
 -SHA1 (libol-0.3.16.tar.gz) = bW4e+U2Lbdnd2OkkUMXky54wGIo=
 -SHA1 (syslog-ng-1.6.8.tar.gz) = cIEq8c7jIXlwlcryoK32CvyBpwA=
 -SHA256 (libol-0.3.16.tar.gz) = aL69o59D/V+hO0ARqRxAsmhP4mKvKkCeKC99mn0o7J4=
 -SHA256 (syslog-ng-1.6.8.tar.gz) = 
 PIQf2JWZ/7dwzfKERCaYDXXcPasS4PcH5Mu1GTf2El4=
 -SIZE (libol-0.3.16.tar.gz) = 345231
 -SIZE (syslog-ng-1.6.8.tar.gz) = 383589
 +MD5 (syslog-ng-2.1.1.tar.gz) = f/7jARSKZ41cGLGRDLe+HQ==
 +RMD160 (syslog-ng-2.1.1.tar.gz) = H/iIJPTV1D3CxjmK6Am8tKas8As=
 +SHA1 (syslog-ng-2.1.1.tar.gz) = EeX7CzsrnxzgJlGXVVCcMkz0orQ=
 +SHA256 (syslog-ng-2.1.1.tar.gz) = 
 is0YN/wS8OZfns/7jFU794OjUGKKzKPCkyvy9FCfpIU=
 +SIZE (syslog-ng-2.1.1.tar.gz) = 420883
 Index: patches/patch-Makefile_in
 ===
 RCS file: patches/patch-Makefile_in
 diff -N patches/patch-Makefile_in
 --- /dev/null 1 Jan 1970 00:00:00 -
 +++ patches/patch-Makefile_in 8 Oct 2008 19:29:28 -
 @@ -0,0 +1,12 @@
 +$OpenBSD$
 +--- Makefile.in.orig Mon Oct  6 19:27:00 2008
  Makefile.in  Mon Oct  6 19:27:05 2008
 +@@ -132,7 +132,7 @@ sbindir = @sbindir@
 + sharedstatedir = @sharedstatedir@
 + sysconfdir = @sysconfdir@
 + target_alias = @target_alias@
 +-SUBDIRS = src tests doc contrib solbuild tgzbuild
 ++SUBDIRS = src doc contrib solbuild tgzbuild
 + 
 + EXTRA_DIST = debian/README.Debian debian/copyright 
 debian/syslog-ng.conf.example debian/syslog-ng.files 
 debian/syslog-ng.logrotate debian/syslog-ng.postrm \
 + debian/changelog debian/changelog.in debian/rules 
 

Re: [syslog-ng] UPDATE: sysutils/syslog-ng

2008-10-17 Thread Balazs Scheidler
Brian, Steven, Jakob,

I just wanted to tell you how much I appreciate your work on OpenBSD
ports of syslog-ng.

Just tell me if you need assistance on my part, information,
communication or anything.

Brian already was nice enough to convince me to publish my internal git
repository :)

On Thu, 2008-10-16 at 11:59 -0400, Brian A. Seklecki wrote:
 Damnit!
 
 I've been waiting for my 4.4 CDs since July/August and you beat me to
 the update by 8 days. :)
 
 I did mine as a new port, based on the old one, as some people may want
 to run the 1.6.x bitrot version.
 
 http://people.collaborativefusion.com/~seklecki/openbsd44_port_syslog-ng209_eventlog027.tar
 
 # syslog-ng -V
 syslog-ng 2.0.9
 
 # uname -a
 OpenBSD cauldron-obsd-44stable-i386 4.4 GENERIC.MP#844 i386
 
 Lets get this bad boy tested and updated before 4.5 is released!
 
 ~BAS
 
 
 # tar cvf openbsd44_port_syslogng209_etlog027.tar eventlog/ syslog-ng2/
 eventlog
 eventlog/Makefile
 eventlog/distinfo
 eventlog/pkg
 eventlog/pkg/DESCR
 eventlog/pkg/PLIST
 eventlog/pkg/PFRAG.shared
 syslog-ng2
 syslog-ng2/CVS
 syslog-ng2/CVS/Repository
 syslog-ng2/CVS/Entries
 syslog-ng2/CVS/Tag
 syslog-ng2/pkg
 syslog-ng2/pkg/CVS
 syslog-ng2/pkg/CVS/Repository
 syslog-ng2/pkg/CVS/Entries
 syslog-ng2/pkg/CVS/Tag
 syslog-ng2/pkg/DESCR
 syslog-ng2/pkg/PLIST
 syslog-ng2/pkg/PLIST.orig
 syslog-ng2/pkg/MESSAGE
 syslog-ng2/Makefile
 syslog-ng2/distinfo
 syslog-ng2/files
 syslog-ng2/files/syslog-ng.conf
 syslog-ng2/patches
 syslog-ng2/patches/patch-tests_loggen_loggen_c
 
 # tar tzvf /usr/ports/packages/i386/all/syslog-ng-2.0.9.tgz
 -r--r--r--  1 root wheel  721 Oct 16 11:46 +CONTENTS
 -r--r--r--  1 root wheel  568 Oct 16 11:46 +DESC
 -r--r--r--  1 root wheel  216 Oct 16 11:46 +DISPLAY
 -r--r--r--  1 root bin   5899 Oct 16 11:46 man/man5/syslog-ng.conf.5
 -r--r--r--  1 root bin  3268 Oct 16 11:46 man/man8/syslog-ng.8
 -r-xr-xr-x  1 root bin1277148 Oct 16 11:46 sbin/syslog-ng
 -r--r--r--  1 root  bin 8837 Oct 16 11:46 share/examples/syslog-ng.conf
 -r-xr-xr-x  1 root bin  10948 Oct 16 11:46 bin/loggen
 
 # make install
 ===  Verifying specs: glib-2.0 c glib-2.0
 ===  found glib-2.0.1600.2 c.48.0
 ===  Installing syslog-ng-2.0.9 from /usr/ports/packages/i386/all/
 syslog-ng-2.0.9: complete 
 --- syslog-ng-2.0.9 ---
 Add the following to rc.local(8):
 
  if [ -x /usr/local/sbin/syslog-ng -a  -f /etc/syslog-ng.conf ]; then
  /usr/local/sbin/syslog-ng
  echo syslog-ng2
  fi
 
 Thanks for shopping balabit.hu and company.
 
 
 
 On Wed, 2008-10-08 at 21:34 +0200, Steven Mestdagh wrote:
  this requires the new sysutils/eventlog port sent earlier.
  
  please test/comment/ok.
  
  Index: Makefile
  ===
  RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
  retrieving revision 1.8
  diff -u -r1.8 Makefile
  --- Makefile6 Oct 2008 16:09:13 -   1.8
  +++ Makefile8 Oct 2008 19:29:28 -
  @@ -2,50 +2,39 @@
   
   COMMENT=   syslogd replacement
   
  +DISTNAME=  syslog-ng-2.1.1
   CATEGORIES=sysutils
   
  -DISTNAME=  syslog-ng-1.6.8
  -LIBOL= libol-0.3.16
  +MAINTAINER=Steven Mestdagh [EMAIL PROTECTED]
   
  -MAINTAINER=Jakob Schlyter [EMAIL PROTECTED]
  +HOMEPAGE = http://www.balabit.com/network-security/syslog-ng/
   
  -MASTER_SITE_SYSLOGNG=\
  -   http://www.balabit.com/downloads/files/syslog-ng/sources/
  +# GPL v2
  +PERMIT_PACKAGE_CDROM = Yes
  +PERMIT_PACKAGE_FTP =   Yes
  +PERMIT_DISTFILES_CDROM =   Yes
  +PERMIT_DISTFILES_FTP = Yes
   
  -MASTER_SITES=  ${MASTER_SITE_SYSLOGNG:=1.6/src/}
  -MASTER_SITES0= ${MASTER_SITE_SYSLOGNG:=libol/0.3/}
  +MASTER_SITES = 
  http://www.balabit.com/downloads/files/syslog-ng/sources/2.1/src/
   
  -HOMEPAGE=  http://www.balabit.com/products/syslog_ng/
  +WANTLIB =  c iconv intl wrap
   
  -DISTFILES= ${DISTNAME}.tar.gz \
  -   ${LIBOL}.tar.gz:0
  +LIB_DEPENDS =  glib-2.0::devel/glib2 \
  +   evtlog::sysutils/eventlog
   
  -# GPL
  -PERMIT_PACKAGE_CDROM=  Yes
  -PERMIT_PACKAGE_FTP=Yes
  -PERMIT_DISTFILES_CDROM=Yes
  -PERMIT_DISTFILES_FTP=  Yes
  -WANTLIB=   c
  +CONFIGURE_STYLE =  gnu
  +CONFIGURE_ARGS +=  --enable-tcp-wrapper
   
  -CONFIGURE_STYLE=   gnu
  -CONFIGURE_ARGS+=   --with-libol=${WRKDIR}/${LIBOL} \
  -   --enable-tcp-wrapper
  +DOC =  ${PREFIX}/share/doc/syslog-ng/
  +EXAMPLES = ${PREFIX}/share/examples/syslog-ng/
   
  -DOC=   ${PREFIX}/share/doc/syslog-ng
  -EXAMPLES=  ${PREFIX}/share/examples/syslog-ng
  -
  -pre-configure:
  -   cp -f ${PORTSDIR}/infrastructure/db/config.guess \
  - ${PORTSDIR}/infrastructure/db/config.sub ${WRKDIR}/${LIBOL}
  -   cd ${WRKDIR}/${LIBOL}; ./configure ; ${MAKE}
  +post-extract:
  +   tar -C ${WRKBUILD} -xzf 

Re: UPDATE: sysutils/syslog-ng

2008-10-16 Thread Brian A. Seklecki
Damnit!

I've been waiting for my 4.4 CDs since July/August and you beat me to
the update by 8 days. :)

I did mine as a new port, based on the old one, as some people may want
to run the 1.6.x bitrot version.

http://people.collaborativefusion.com/~seklecki/openbsd44_port_syslog-ng209_eventlog027.tar

# syslog-ng -V
syslog-ng 2.0.9

# uname -a
OpenBSD cauldron-obsd-44stable-i386 4.4 GENERIC.MP#844 i386

Lets get this bad boy tested and updated before 4.5 is released!

~BAS


# tar cvf openbsd44_port_syslogng209_etlog027.tar eventlog/ syslog-ng2/
eventlog
eventlog/Makefile
eventlog/distinfo
eventlog/pkg
eventlog/pkg/DESCR
eventlog/pkg/PLIST
eventlog/pkg/PFRAG.shared
syslog-ng2
syslog-ng2/CVS
syslog-ng2/CVS/Repository
syslog-ng2/CVS/Entries
syslog-ng2/CVS/Tag
syslog-ng2/pkg
syslog-ng2/pkg/CVS
syslog-ng2/pkg/CVS/Repository
syslog-ng2/pkg/CVS/Entries
syslog-ng2/pkg/CVS/Tag
syslog-ng2/pkg/DESCR
syslog-ng2/pkg/PLIST
syslog-ng2/pkg/PLIST.orig
syslog-ng2/pkg/MESSAGE
syslog-ng2/Makefile
syslog-ng2/distinfo
syslog-ng2/files
syslog-ng2/files/syslog-ng.conf
syslog-ng2/patches
syslog-ng2/patches/patch-tests_loggen_loggen_c

# tar tzvf /usr/ports/packages/i386/all/syslog-ng-2.0.9.tgz
-r--r--r--  1 root wheel  721 Oct 16 11:46 +CONTENTS
-r--r--r--  1 root wheel  568 Oct 16 11:46 +DESC
-r--r--r--  1 root wheel  216 Oct 16 11:46 +DISPLAY
-r--r--r--  1 root bin   5899 Oct 16 11:46 man/man5/syslog-ng.conf.5
-r--r--r--  1 root bin  3268 Oct 16 11:46 man/man8/syslog-ng.8
-r-xr-xr-x  1 root bin1277148 Oct 16 11:46 sbin/syslog-ng
-r--r--r--  1 root  bin 8837 Oct 16 11:46 share/examples/syslog-ng.conf
-r-xr-xr-x  1 root bin  10948 Oct 16 11:46 bin/loggen

# make install
===  Verifying specs: glib-2.0 c glib-2.0
===  found glib-2.0.1600.2 c.48.0
===  Installing syslog-ng-2.0.9 from /usr/ports/packages/i386/all/
syslog-ng-2.0.9: complete 
--- syslog-ng-2.0.9 ---
Add the following to rc.local(8):

 if [ -x /usr/local/sbin/syslog-ng -a  -f /etc/syslog-ng.conf ]; then
 /usr/local/sbin/syslog-ng
 echo syslog-ng2
 fi

Thanks for shopping balabit.hu and company.



On Wed, 2008-10-08 at 21:34 +0200, Steven Mestdagh wrote:
 this requires the new sysutils/eventlog port sent earlier.
 
 please test/comment/ok.
 
 Index: Makefile
 ===
 RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
 retrieving revision 1.8
 diff -u -r1.8 Makefile
 --- Makefile  6 Oct 2008 16:09:13 -   1.8
 +++ Makefile  8 Oct 2008 19:29:28 -
 @@ -2,50 +2,39 @@
  
  COMMENT= syslogd replacement
  
 +DISTNAME=syslog-ng-2.1.1
  CATEGORIES=  sysutils
  
 -DISTNAME=syslog-ng-1.6.8
 -LIBOL=   libol-0.3.16
 +MAINTAINER=  Steven Mestdagh [EMAIL PROTECTED]
  
 -MAINTAINER=  Jakob Schlyter [EMAIL PROTECTED]
 +HOMEPAGE =   http://www.balabit.com/network-security/syslog-ng/
  
 -MASTER_SITE_SYSLOGNG=\
 - http://www.balabit.com/downloads/files/syslog-ng/sources/
 +# GPL v2
 +PERMIT_PACKAGE_CDROM =   Yes
 +PERMIT_PACKAGE_FTP = Yes
 +PERMIT_DISTFILES_CDROM = Yes
 +PERMIT_DISTFILES_FTP =   Yes
  
 -MASTER_SITES=${MASTER_SITE_SYSLOGNG:=1.6/src/}
 -MASTER_SITES0=   ${MASTER_SITE_SYSLOGNG:=libol/0.3/}
 +MASTER_SITES =   
 http://www.balabit.com/downloads/files/syslog-ng/sources/2.1/src/
  
 -HOMEPAGE=http://www.balabit.com/products/syslog_ng/
 +WANTLIB =c iconv intl wrap
  
 -DISTFILES=   ${DISTNAME}.tar.gz \
 - ${LIBOL}.tar.gz:0
 +LIB_DEPENDS =glib-2.0::devel/glib2 \
 + evtlog::sysutils/eventlog
  
 -# GPL
 -PERMIT_PACKAGE_CDROM=Yes
 -PERMIT_PACKAGE_FTP=  Yes
 -PERMIT_DISTFILES_CDROM=  Yes
 -PERMIT_DISTFILES_FTP=Yes
 -WANTLIB= c
 +CONFIGURE_STYLE =gnu
 +CONFIGURE_ARGS +=--enable-tcp-wrapper
  
 -CONFIGURE_STYLE= gnu
 -CONFIGURE_ARGS+= --with-libol=${WRKDIR}/${LIBOL} \
 - --enable-tcp-wrapper
 +DOC =${PREFIX}/share/doc/syslog-ng/
 +EXAMPLES =   ${PREFIX}/share/examples/syslog-ng/
  
 -DOC= ${PREFIX}/share/doc/syslog-ng
 -EXAMPLES=${PREFIX}/share/examples/syslog-ng
 -
 -pre-configure:
 - cp -f ${PORTSDIR}/infrastructure/db/config.guess \
 -   ${PORTSDIR}/infrastructure/db/config.sub ${WRKDIR}/${LIBOL}
 - cd ${WRKDIR}/${LIBOL}; ./configure ; ${MAKE}
 +post-extract:
 + tar -C ${WRKBUILD} -xzf ${WRKSRC}/doc/reference/syslog-ng.html.tar.gz
  
  post-install:
   ${INSTALL_DATA_DIR} ${DOC}
 - ${INSTALL_DATA} ${WRKSRC}/doc/sgml/*.{ps,sgml,txt} ${DOC}
 - (cd ${DOC} ;\
 - tar xzf ${WRKSRC}/doc/sgml/syslog-ng.html.tar.gz ;\
 - ln -s book1.html syslog-ng.html/index.html )
 + ${INSTALL_DATA} ${WRKBUILD}/syslog-ng.html/index.html ${DOC}
   ${INSTALL_DATA_DIR} ${EXAMPLES}
 - ${INSTALL_DATA} ${WRKSRC}/doc/syslog-ng.conf.sample ${EXAMPLES}
 + ${INSTALL_DATA} 

UPDATE: sysutils/syslog-ng

2008-10-08 Thread Steven Mestdagh
this requires the new sysutils/eventlog port sent earlier.

please test/comment/ok.

Index: Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile6 Oct 2008 16:09:13 -   1.8
+++ Makefile8 Oct 2008 19:29:28 -
@@ -2,50 +2,39 @@
 
 COMMENT=   syslogd replacement
 
+DISTNAME=  syslog-ng-2.1.1
 CATEGORIES=sysutils
 
-DISTNAME=  syslog-ng-1.6.8
-LIBOL= libol-0.3.16
+MAINTAINER=Steven Mestdagh [EMAIL PROTECTED]
 
-MAINTAINER=Jakob Schlyter [EMAIL PROTECTED]
+HOMEPAGE = http://www.balabit.com/network-security/syslog-ng/
 
-MASTER_SITE_SYSLOGNG=\
-   http://www.balabit.com/downloads/files/syslog-ng/sources/
+# GPL v2
+PERMIT_PACKAGE_CDROM = Yes
+PERMIT_PACKAGE_FTP =   Yes
+PERMIT_DISTFILES_CDROM =   Yes
+PERMIT_DISTFILES_FTP = Yes
 
-MASTER_SITES=  ${MASTER_SITE_SYSLOGNG:=1.6/src/}
-MASTER_SITES0= ${MASTER_SITE_SYSLOGNG:=libol/0.3/}
+MASTER_SITES = 
http://www.balabit.com/downloads/files/syslog-ng/sources/2.1/src/
 
-HOMEPAGE=  http://www.balabit.com/products/syslog_ng/
+WANTLIB =  c iconv intl wrap
 
-DISTFILES= ${DISTNAME}.tar.gz \
-   ${LIBOL}.tar.gz:0
+LIB_DEPENDS =  glib-2.0::devel/glib2 \
+   evtlog::sysutils/eventlog
 
-# GPL
-PERMIT_PACKAGE_CDROM=  Yes
-PERMIT_PACKAGE_FTP=Yes
-PERMIT_DISTFILES_CDROM=Yes
-PERMIT_DISTFILES_FTP=  Yes
-WANTLIB=   c
+CONFIGURE_STYLE =  gnu
+CONFIGURE_ARGS +=  --enable-tcp-wrapper
 
-CONFIGURE_STYLE=   gnu
-CONFIGURE_ARGS+=   --with-libol=${WRKDIR}/${LIBOL} \
-   --enable-tcp-wrapper
+DOC =  ${PREFIX}/share/doc/syslog-ng/
+EXAMPLES = ${PREFIX}/share/examples/syslog-ng/
 
-DOC=   ${PREFIX}/share/doc/syslog-ng
-EXAMPLES=  ${PREFIX}/share/examples/syslog-ng
-
-pre-configure:
-   cp -f ${PORTSDIR}/infrastructure/db/config.guess \
- ${PORTSDIR}/infrastructure/db/config.sub ${WRKDIR}/${LIBOL}
-   cd ${WRKDIR}/${LIBOL}; ./configure ; ${MAKE}
+post-extract:
+   tar -C ${WRKBUILD} -xzf ${WRKSRC}/doc/reference/syslog-ng.html.tar.gz
 
 post-install:
${INSTALL_DATA_DIR} ${DOC}
-   ${INSTALL_DATA} ${WRKSRC}/doc/sgml/*.{ps,sgml,txt} ${DOC}
-   (cd ${DOC} ;\
-   tar xzf ${WRKSRC}/doc/sgml/syslog-ng.html.tar.gz ;\
-   ln -s book1.html syslog-ng.html/index.html )
+   ${INSTALL_DATA} ${WRKBUILD}/syslog-ng.html/index.html ${DOC}
${INSTALL_DATA_DIR} ${EXAMPLES}
-   ${INSTALL_DATA} ${WRKSRC}/doc/syslog-ng.conf.sample ${EXAMPLES}
+   ${INSTALL_DATA} ${WRKSRC}/doc/examples/syslog-ng.conf.sample ${EXAMPLES}
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo5 Apr 2007 17:26:13 -   1.7
+++ distinfo8 Oct 2008 19:29:28 -
@@ -1,10 +1,5 @@
-MD5 (libol-0.3.16.tar.gz) = Hym+P0vN21svPZZeePBABg==
-MD5 (syslog-ng-1.6.8.tar.gz) = /7rX6ObcvjhYILj/uiO2Ig==
-RMD160 (libol-0.3.16.tar.gz) = ts8Hi0sH/EyHm/SicZpto+lvT8Y=
-RMD160 (syslog-ng-1.6.8.tar.gz) = EcZ5miRCaYao/ZdDxjQH4ums+mc=
-SHA1 (libol-0.3.16.tar.gz) = bW4e+U2Lbdnd2OkkUMXky54wGIo=
-SHA1 (syslog-ng-1.6.8.tar.gz) = cIEq8c7jIXlwlcryoK32CvyBpwA=
-SHA256 (libol-0.3.16.tar.gz) = aL69o59D/V+hO0ARqRxAsmhP4mKvKkCeKC99mn0o7J4=
-SHA256 (syslog-ng-1.6.8.tar.gz) = PIQf2JWZ/7dwzfKERCaYDXXcPasS4PcH5Mu1GTf2El4=
-SIZE (libol-0.3.16.tar.gz) = 345231
-SIZE (syslog-ng-1.6.8.tar.gz) = 383589
+MD5 (syslog-ng-2.1.1.tar.gz) = f/7jARSKZ41cGLGRDLe+HQ==
+RMD160 (syslog-ng-2.1.1.tar.gz) = H/iIJPTV1D3CxjmK6Am8tKas8As=
+SHA1 (syslog-ng-2.1.1.tar.gz) = EeX7CzsrnxzgJlGXVVCcMkz0orQ=
+SHA256 (syslog-ng-2.1.1.tar.gz) = is0YN/wS8OZfns/7jFU794OjUGKKzKPCkyvy9FCfpIU=
+SIZE (syslog-ng-2.1.1.tar.gz) = 420883
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_in   8 Oct 2008 19:29:28 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.in.orig   Mon Oct  6 19:27:00 2008
 Makefile.inMon Oct  6 19:27:05 2008
+@@ -132,7 +132,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = src tests doc contrib solbuild tgzbuild
++SUBDIRS = src doc contrib solbuild tgzbuild
+ 
+ EXTRA_DIST = debian/README.Debian debian/copyright 
debian/syslog-ng.conf.example debian/syslog-ng.files debian/syslog-ng.logrotate 
debian/syslog-ng.postrm \
+   debian/changelog debian/changelog.in debian/rules 
debian/syslog-ng.default debian/syslog-ng.init 
debian/syslog-ng.logrotate.example debian/syslog-ng.preinst \
Index: patches/patch-src_Makefile_in