4 files changed, 83 insertions, 13 deletions

diff --git a/sysutils/rsyslog3/Makefile b/sysutils/rsyslog3/Makefile
index 095012848ba5..a90661d6ca62 100644
--- a/sysutils/rsyslog3/Makefile
+++ b/sysutils/rsyslog3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rsyslog
-PORTVERSION=	1.18.2
+PORTVERSION=	1.19.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.rsyslog.com/rsyslog/ CENKES
 
@@ -20,19 +20,21 @@ USE_RC_SUBR=	${PORTNAME}d
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-mysql --disable-klogd
+CONFIGURE_ARGS=	--enable-mysql --disable-klogd --disable-static
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 SUB_FILES=	pkg-message
 
 MAN8=	rfc3195d.8 rklogd.8 rsyslogd.8
 MAN5=	rsyslog.conf.5
-PLIST_FILES=	sbin/rfc3195d sbin/rklogd sbin/rsyslogd
-PORTDOCS=	*
+PORT_VERBS=	rfc3195d rklogd ${PORTNAME}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|<wait.h>|<sys/wait.h>|' ${WRKSRC}/srUtils.c
-	@${REINPLACE_CMD} -e '/^rfc3195d_LDADD =/s|$$| -llogging|' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/^rfc3195d_LDADD =/s|$$| -llogging|;s|-ldl||'\
+		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\
+		${WRKSRC}/Makefile.in ${WRKSRC}/syslogd.c
 	@${GREP} -rl '/etc/rsyslog.conf' ${WRKSRC}|${XARGS} ${REINPLACE_CMD} -e\
 		's|/etc/rsyslog.conf|${PREFIX}/etc/rsyslog.conf|'
 	@${ECHO_CMD} '#include <sys/socket.h>' >> ${WRKSRC}/net.h
@@ -43,11 +45,7 @@ post-configure:
 	@${ECHO_CMD} '#define FEATURE_RFC3195 1' >> ${WRKSRC}/config.h
 	@${ECHO_CMD} '#define PATCHLEVEL "0"' >> ${WRKSRC}/config.h
 
-do-install:
-	@cd ${WRKSRC}&&${INSTALL_PROGRAM} rfc3195d rklogd rsyslogd\
-		${PREFIX}/sbin/
-	@cd ${WRKSRC}&&${INSTALL_MAN} ${MAN5} ${MAN5PREFIX}/man/man5/
-	@cd ${WRKSRC}&&${INSTALL_MAN} ${MAN8} ${MAN8PREFIX}/man/man8/
+post-install:
 .ifndef NOPORTDOCS
 	@${INSTALL} -d ${DOCSDIR}/
 	@${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}/
diff --git a/sysutils/rsyslog3/distinfo b/sysutils/rsyslog3/distinfo
index 27612890e36b..b9c4e0404110 100644
--- a/sysutils/rsyslog3/distinfo
+++ b/sysutils/rsyslog3/distinfo
@@ -1,3 +1,3 @@
-MD5 (rsyslog-1.18.2.tar.gz) = 63483448383d6f508b2a0d9e21557c3e
-SHA256 (rsyslog-1.18.2.tar.gz) = afb39e852bd0d95483fa83ea6f5cdaffb41f48218f4345a77e51d39a3255b069
-SIZE (rsyslog-1.18.2.tar.gz) = 413896
+MD5 (rsyslog-1.19.1.tar.gz) = c15096f651512ca7501ca88c47e2f7d5
+SHA256 (rsyslog-1.19.1.tar.gz) = d265f84b6091b5b1ff077f2bc37b280b277e452eb124760f6e53879cc64fa1e5
+SIZE (rsyslog-1.19.1.tar.gz) = 627507
diff --git a/sysutils/rsyslog3/files/patch-syslogd.c b/sysutils/rsyslog3/files/patch-syslogd.c
new file mode 100644
index 000000000000..f646cc94c27d
--- /dev/null
+++ b/sysutils/rsyslog3/files/patch-syslogd.c
@@ -0,0 +1,22 @@
+--- ./syslogd.c.orig	2007-08-25 20:07:21.000000000 +0400
++++ ./syslogd.c	2007-08-25 20:08:39.000000000 +0400
+@@ -86,7 +86,6 @@
+ #include "rsyslog.h"
+ 
+ #ifdef __FreeBSD__
+-#define	BSD
+ #endif
+ 
+ /* change the following setting to e.g. 32768 if you would like to
+@@ -1877,6 +1876,11 @@
+ 	return iRet;
+ }
+ 
++size_t strnlen (const char *string, size_t maxlen)
++{
++	const char *end = memchr (string, '\0', maxlen);
++	return end ? (size_t) (end - string) : maxlen;
++}
+ 
+ /* rgerhards, 2005-10-24: crunch_list is called only during option processing. So
+  * it is never called once rsyslogd is running (not even when HUPed). This code
diff --git a/sysutils/rsyslog3/pkg-plist b/sysutils/rsyslog3/pkg-plist
new file mode 100644
index 000000000000..e5ff4585d4cf
--- /dev/null
+++ b/sysutils/rsyslog3/pkg-plist
@@ -0,0 +1,50 @@
+lib/rsyslog/ommysql.la
+lib/rsyslog/ommysql.so
+sbin/rfc3195d
+sbin/rklogd
+sbin/rsyslogd
+%%PORTDOCS%%%%DOCSDIR%%/bugs.html
+%%PORTDOCS%%%%DOCSDIR%%/contributors.html
+%%PORTDOCS%%%%DOCSDIR%%/features.html
+%%PORTDOCS%%%%DOCSDIR%%/generic_design.html
+%%PORTDOCS%%%%DOCSDIR%%/history.html
+%%PORTDOCS%%%%DOCSDIR%%/how2help.html
+%%PORTDOCS%%%%DOCSDIR%%/install.html
+%%PORTDOCS%%%%DOCSDIR%%/ipv6.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/property_replacer.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_actionexeconlyifpreviousissuspended.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_actionresumeinterval.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_allowedsender.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_controlcharacterescapeprefix.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_debugprintcfsyslinehandlerlist.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_debugprintmodulelist.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_debugprinttemplatelist.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dircreatemode.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dirgroup.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dirowner.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dropmsgswithmaliciousdnsptrrecords.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_droptrailinglfonreception.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_dynafilecachesize.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_escapecontrolcharactersonreceive.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_failonchownfailure.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_filecreatemode.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_filegroup.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_fileowner.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_includeconfig.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_mainmsgqueuesize.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_modload.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_repeatedmsgreduction.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_resetconfigvariables.html
+%%PORTDOCS%%%%DOCSDIR%%/rsconf1_umask.html
+%%PORTDOCS%%%%DOCSDIR%%/rsyslog_conf.html
+%%PORTDOCS%%%%DOCSDIR%%/rsyslog_mysql.html
+%%PORTDOCS%%%%DOCSDIR%%/rsyslog_packages.html
+%%PORTDOCS%%%%DOCSDIR%%/rsyslog_php_syslog_ng.html
+%%PORTDOCS%%%%DOCSDIR%%/rsyslog_recording_pri.html
+%%PORTDOCS%%%%DOCSDIR%%/rsyslog_stunnel.html
+%%PORTDOCS%%%%DOCSDIR%%/status.html
+%%PORTDOCS%%%%DOCSDIR%%/syslog-protocol.html
+%%PORTDOCS%%%%DOCSDIR%%/version_naming.html
+@dirrm lib/rsyslog
+%%PORTDOCS%%@dirrm %%DOCSDIR%%