Re: UPDATE: sysutils/syslog-ng 3.3.7
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
@@ -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
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) = 261393
Re: UPDATE: sysutils/syslog-ng 3.3.7
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
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
@@ -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
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: patch-Makefile_in,v 1.3
