Re: syslog-ng 3.7

2016-04-03 Thread Steven Mestdagh
Predrag Punosevac [2016-03-27, 00:21:26]:
> Dear Mr. Mestdagh,
> 
> What is the reason syslog-ng is not updated to 3.7.1? Is branch 3.7
> still considered unstable for use on OpenBSD or there are some other
> problems in updating the existing 3.6.4 port.
> 

please try the following diff.


Index: syslog-ng/Makefile
===
RCS file: /cvs/ports/sysutils/syslog-ng/Makefile,v
retrieving revision 1.54
diff -u -p -u -r1.54 Makefile
--- syslog-ng/Makefile  18 Mar 2016 21:38:25 -  1.54
+++ syslog-ng/Makefile  3 Apr 2016 18:55:01 -
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.54 2016/03/18 21:38:25 naddy Exp $
+# $OpenBSD: Makefile,v 1.53 2015/07/21 20:29:34 steven Exp $
 
 COMMENT=   syslogd replacement
 
-V =3.6.4
-REL =  3.6
+V =3.7.2
+REL =  3.7
 DISTNAME = syslog-ng-$V
 CATEGORIES =   sysutils
 
@@ -14,11 +14,12 @@ HOMEPAGE =  http://www.balabit.com/networ
 # GPL v2
 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
+#MASTER_SITES =
http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$V/source/
+MASTER_SITES = 
http://github.com/balabit/syslog-ng/releases/download/${DISTNAME}/
+#DISTFILES =   syslog-ng_$V.tar.gz
 
-SHARED_LIBS =  syslog-ng   2.0 \
-   syslog-ng-${REL}2.0
+SHARED_LIBS =  syslog-ng   3.0 \
+   syslog-ng-${REL}3.0
 
 MODULES =  devel/gettext
 
@@ -37,6 +38,7 @@ CONFIGURE_ARGS += --disable-tcp-wrapper 
--enable-json \
--with-libmongo-client=no \
--with-librabbitmq-client=no \
+   --disable-python \
--disable-mongodb \
--disable-amqp \
--disable-stomp \
Index: syslog-ng/distinfo
===
RCS file: /cvs/ports/sysutils/syslog-ng/distinfo,v
retrieving revision 1.23
diff -u -p -u -r1.23 distinfo
--- syslog-ng/distinfo  21 Jul 2015 20:29:34 -  1.23
+++ syslog-ng/distinfo  3 Apr 2016 18:55:01 -
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.6.4.tar.gz) = e+Ed8xrH1xbx+VLiK1ro4gSe3WM6QbIjd2qFPZEG9Oc=
-SIZE (syslog-ng_3.6.4.tar.gz) = 3276432
+SHA256 (syslog-ng-3.7.2.tar.gz) = sbPMwM5/DYvxWyPlny9PXe1w7tQQ39JxBSGbyIVjiKU=
+SIZE (syslog-ng-3.7.2.tar.gz) = 3558377
Index: syslog-ng/patches/patch-Makefile_in
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-Makefile_in,v
retrieving revision 1.8
diff -u -p -u -r1.8 patch-Makefile_in
--- syslog-ng/patches/patch-Makefile_in 21 Jul 2015 20:29:34 -  1.8
+++ syslog-ng/patches/patch-Makefile_in 3 Apr 2016 18:55:01 -
@@ -1,10 +1,10 @@
 $OpenBSD: patch-Makefile_in,v 1.8 2015/07/21 20:29:34 steven Exp $
 temporary hack until libtool is fixed.
 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)
+--- 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)
+ 
  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: syslog-ng/patches/patch-configure
===
RCS file: /cvs/ports/sysutils/syslog-ng/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-configure
--- syslog-ng/patches/patch-configure   21 Jul 2015 20:29:34 -  1.3
+++ syslog-ng/patches/patch-configure   3 Apr 2016 18:55:01 -
@@ -1,12 +1,12 @@
-$OpenBSD: patch-configure,v 1.3 2015/07/21 20:29:34 steven Exp $
-do not pick up libuuid
 configure.orig Fri Jun 19 13:24:21 2015
-+++ configure  Thu Jul 16 22:22:03 2015
-@@ -16400,6 +16400,7 @@ fi
+$OpenBSD$
+--- configure.orig Sun Apr  3 20:18:45 2016
 configure  Sun Apr  3 20:19:27 2016
+@@ -16790,7 +16790,7 @@ fi
   else
  pkg_failed=untried
  fi
+-
 +pkg_failed=yes
  
  
- 
+ if test $pkg_failed = yes; then
Index: syslog-ng/patches/patch-lib_compat_getutent_h
===
RCS file: syslog-ng/patches/patch-lib_compat_getutent_h

syslog-ng 3.7

2016-03-26 Thread Predrag Punosevac
Dear Mr. Mestdagh,

What is the reason syslog-ng is not updated to 3.7.1? Is branch 3.7
still considered unstable for use on OpenBSD or there are some other
problems in updating the existing 3.6.4 port.

Thank you.
Predrag Punosevac