Date: Sun, 23 Jun 2013 23:49:04 GMT From: Cristiano Rolim Pereira <cristianorolim@outlook.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/179900: [patch] - update sysutils/rsyslog7 to version 7.4.1 Message-ID: <201306232349.r5NNn4cY079431@oldred.freebsd.org> Resent-Message-ID: <201306232350.r5NNo2Vq052801@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 179900 >Category: ports >Synopsis: [patch] - update sysutils/rsyslog7 to version 7.4.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Jun 23 23:50:01 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Cristiano Rolim Pereira >Release: 9.1 RELEASE >Organization: >Environment: FreeBSD bsd91.casa 9.1-RELEASE-p4 FreeBSD 9.1-RELEASE-p4 #0: Mon Jun 17 11:42:37 UTC 2013 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: The attached diff updates sysutils/rsyslog7 to version 7.4.1. * Removed the dependency on devel/libsysinfo: There is a workaround for getting system uptime, included it as patch. * I suggested this patch and the others related to "off64_t / off_t" for the creator of Rsyslog, as he always tries to make it more portable. Luckly, we won't need some patches anymore. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN rsyslog7.orig/Makefile rsyslog7/Makefile --- rsyslog7.orig/Makefile 2013-06-23 00:54:00.000000000 -0300 +++ rsyslog7/Makefile 2013-06-23 21:14:03.000000000 -0300 @@ -1,7 +1,7 @@ # $FreeBSD: sysutils/rsyslog7/Makefile 319072 2013-05-25 20:10:11Z brd $ PORTNAME= rsyslog -PORTVERSION= 7.2.7 +PORTVERSION= 7.4.1 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ @@ -11,12 +11,14 @@ LIB_DEPENDS= ee:${PORTSDIR}/devel/libee \ estr:${PORTSDIR}/devel/libestr \ json.0:${PORTSDIR}/devel/json-c \ - sysinfo:${PORTSDIR}/devel/libsysinfo \ uuid:${PORTSDIR}/misc/e2fsprogs-libuuid +BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt \ + rst2man:${PORTSDIR}/textproc/py-docutils + USE_LDCONFIG= yes -PORTSCOUT= limit:^7\.2 +PORTSCOUT= limit:^7\.4 PORTDOCS= * PORTEXAMPLES= * diff -ruN rsyslog7.orig/distinfo rsyslog7/distinfo --- rsyslog7.orig/distinfo 2013-06-23 00:54:00.000000000 -0300 +++ rsyslog7/distinfo 2013-06-23 01:17:38.000000000 -0300 @@ -1,2 +1,2 @@ -SHA256 (rsyslog-7.2.7.tar.gz) = 4833533a140c1aebed069082ad579ac25e488b647d4d508167dc6e4de75af96d -SIZE (rsyslog-7.2.7.tar.gz) = 2761741 +SHA256 (rsyslog-7.4.1.tar.gz) = f890b56fc5122fabf79994e11bdefb26285e3415ba80c20f23bd3ce489098c96 +SIZE (rsyslog-7.4.1.tar.gz) = 2902152 diff -ruN rsyslog7.orig/files/patch-plugins--impstats--impstats.c rsyslog7/files/patch-plugins--impstats--impstats.c --- rsyslog7.orig/files/patch-plugins--impstats--impstats.c 1969-12-31 21:00:00.000000000 -0300 +++ rsyslog7/files/patch-plugins--impstats--impstats.c 2013-06-23 20:42:25.000000000 -0300 @@ -0,0 +1,10 @@ +--- plugins/impstats/impstats.c.orig 2013-06-23 20:41:04.000000000 -0300 ++++ plugins/impstats/impstats.c 2013-06-23 20:41:24.000000000 -0300 +@@ -29,6 +29,7 @@ + #include <pthread.h> + #include <fcntl.h> + #include <sys/uio.h> ++#include <sys/stat.h> + #include "dirty.h" + #include "cfsysline.h" + #include "module-template.h" diff -ruN rsyslog7.orig/files/patch-runtime--cryprov.h rsyslog7/files/patch-runtime--cryprov.h --- rsyslog7.orig/files/patch-runtime--cryprov.h 1969-12-31 21:00:00.000000000 -0300 +++ rsyslog7/files/patch-runtime--cryprov.h 2013-06-23 20:15:03.000000000 -0300 @@ -0,0 +1,10 @@ +--- runtime/cryprov.h.orig 2013-06-23 20:09:26.000000000 -0300 ++++ runtime/cryprov.h 2013-06-23 20:14:52.000000000 -0300 +@@ -25,6 +25,7 @@ + #define INCLUDED_CRYPROV_H + + #include <gcrypt.h> ++typedef off_t off64_t; + + /* interface */ + BEGINinterface(cryprov) /* name must also be changed in ENDinterface macro! */ diff -ruN rsyslog7.orig/files/patch-runtime--msg.c rsyslog7/files/patch-runtime--msg.c --- rsyslog7.orig/files/patch-runtime--msg.c 1969-12-31 21:00:00.000000000 -0300 +++ rsyslog7/files/patch-runtime--msg.c 2013-06-23 20:39:30.000000000 -0300 @@ -0,0 +1,35 @@ +--- runtime/msg.c.orig 2013-06-23 20:19:15.000000000 -0300 ++++ runtime/msg.c 2013-06-23 20:38:38.000000000 -0300 +@@ -2988,29 +2988,16 @@ + *pbMustBeFreed = 0; + break; + case PROP_SYS_UPTIME: +-# ifndef HAVE_SYSINFO_UPTIME +- /* An alternative on some systems (eg Solaris) is to scan +- * /var/adm/utmpx for last boot time. +- */ +- pRes = (uchar*) "UPTIME NOT available on this system"; +- *pbMustBeFreed = 0; +-# else + { +- struct sysinfo s_info; +- +- if((pRes = (uchar*) MALLOC(sizeof(uchar) * 32)) == NULL) { +- RET_OUT_OF_MEMORY; +- } +- *pbMustBeFreed = 1; ++ struct timespec tp; + +- if(sysinfo(&s_info) < 0) { ++ if (clock_gettime(CLOCK_UPTIME, &tp) == -1) { + *pPropLen = sizeof("**SYSCALL FAILED**") - 1; + return(UCHAR_CONSTANT("**SYSCALL FAILED**")); + } + +- snprintf((char*) pRes, sizeof(uchar) * 32, "%ld", s_info.uptime); ++ snprintf((char*) pRes, sizeof(uchar) * 32, "%ld", tp.tv_sec); + } +-# endif + break; + default: + /* there is no point in continuing, we may even otherwise render the diff -ruN rsyslog7.orig/files/patch-runtime--stream.c rsyslog7/files/patch-runtime--stream.c --- rsyslog7.orig/files/patch-runtime--stream.c 1969-12-31 21:00:00.000000000 -0300 +++ rsyslog7/files/patch-runtime--stream.c 2013-06-23 20:17:46.000000000 -0300 @@ -0,0 +1,10 @@ +--- runtime/stream.c.orig 2013-06-23 20:16:13.000000000 -0300 ++++ runtime/stream.c 2013-06-23 20:16:54.000000000 -0300 +@@ -67,7 +67,6 @@ + # define O_LARGEFILE 0 + #endif + #ifndef HAVE_LSEEK64 +- typedef off_t off64_t; + # define lseek64(fd, offset, whence) lseek(fd, offset, whence) + #endif + diff -ruN rsyslog7.orig/pkg-plist rsyslog7/pkg-plist --- rsyslog7.orig/pkg-plist 2013-06-23 00:54:00.000000000 -0300 +++ rsyslog7/pkg-plist 2013-06-23 20:54:16.000000000 -0300 @@ -14,6 +14,8 @@ lib/rsyslog/imudp.so lib/rsyslog/imuxsock.la lib/rsyslog/imuxsock.so +lib/rsyslog/lmcry_gcry.la +lib/rsyslog/lmcry_gcry.so lib/rsyslog/lmnet.la lib/rsyslog/lmnet.so lib/rsyslog/lmnetstrms.la >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306232349.r5NNn4cY079431>