Date: Tue, 5 Oct 2010 02:48:38 GMT From: "Philip M. Gollucci" <pgollucci@p6m7g8.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: miwi@FreeBSD.org Subject: ports/151219: [PATCH] sysutils/rsyslog: unbreak, update to 3.22.2, request maintainer as rsyslog maintainer Message-ID: <201010050248.o952mci4075550@frieza.p6m7g8.net> Resent-Message-ID: <201010050250.o952o1x3045753@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 151219 >Category: ports >Synopsis: [PATCH] sysutils/rsyslog: unbreak, update to 3.22.2, request maintainer as rsyslog maintainer >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: Tue Oct 05 02:50:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Philip M. Gollucci >Release: FreeBSD 9.0-CURRENT amd64 >Organization: RideCharge Inc / TaxiMagic >Environment: System: FreeBSD frieza.p6m7g8.net 9.0-CURRENT FreeBSD 9.0-CURRENT #1: Tue Aug 24 18:32:38 UTC 2010 >Description: I forgot to cc miwi@ when requesting these before, I though Cristiano Rolim Pereira <cristianorolim@hotmail.com> had them who has previously okayed this switch Added file(s): - files/patch-tools__omusrmsg.c Port maintainer (miwi@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- rsyslog-3.22.2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/rsyslog3/Makefile,v retrieving revision 1.50 diff -u -u -r1.50 Makefile --- Makefile 2 Jun 2010 19:14:16 -0000 1.50 +++ Makefile 5 Oct 2010 02:46:37 -0000 @@ -6,7 +6,6 @@ # PORTNAME= rsyslog -PORTREVISION= 2 COMMENT= Enhanced syslog daemon @@ -25,8 +24,6 @@ CONFIGURE_ARGS+=--enable-rtinst --enable-debug .endif -PORTSCOUT= skipv:3.21.10,3.21.9,3.21.8,3.21.7,3.21.6,3.21.5,3.21.4,3.21.3,3.21.2,3.21.1,3.21.0 - post-patch: @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\ @@ -43,10 +40,5 @@ @${CAT} ${PKGMESSAGE} .include "${.CURDIR}/bsd.rsyslog.mk" -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 900007 -BROKEN= does not build -.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Index: bsd.rsyslog.mk =================================================================== RCS file: /home/ncvs/ports/sysutils/rsyslog3/bsd.rsyslog.mk,v retrieving revision 1.12 diff -u -u -r1.12 bsd.rsyslog.mk --- bsd.rsyslog.mk 7 Jul 2009 18:29:03 -0000 1.12 +++ bsd.rsyslog.mk 5 Oct 2010 02:44:49 -0000 @@ -1,11 +1,10 @@ PORTNAME?= rsyslog -PORTVERSION?= 3.22.1 +PORTVERSION?= 3.22.2 CATEGORIES?= sysutils -MASTER_SITES?= http://download.rsyslog.com/rsyslog/ -MAINTAINER?= miwi@FreeBSD.org +MASTER_SITES?= http://www.rsyslog.com/files/download/rsyslog/ +MAINTAINER?= pgollucci@FreeBSD.org NO_LATEST_LINK= yes -CONFLICTS= rsyslog-2.[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes @@ -22,8 +21,6 @@ DESCR?= ${.CURDIR}/../rsyslog3/pkg-descr MD5_FILE?= ${.CURDIR}/../rsyslog3/distinfo -PORTSCOUT= skipv:3.21.10,3.21.9,3.21.8,3.21.7,3.21.6,3.21.5,3.21.4,3.21.3,3.21.2,3.21.1,3.21.0 - do-install: @${INSTALL} -d ${PREFIX}/lib/rsyslog/ .for _T in ${MTYPES} Index: distinfo =================================================================== RCS file: /home/ncvs/ports/sysutils/rsyslog3/distinfo,v retrieving revision 1.37 diff -u -u -r1.37 distinfo --- distinfo 7 Jul 2009 18:29:03 -0000 1.37 +++ distinfo 5 Oct 2010 02:29:58 -0000 @@ -1,3 +1,3 @@ -MD5 (rsyslog-3.22.1.tar.gz) = 64bed3d5535c17d631f7432a5badf959 -SHA256 (rsyslog-3.22.1.tar.gz) = 5d3bb28dc87b3abb7053ccae8316f032ddd0486681683b116a25f66fc0942abb -SIZE (rsyslog-3.22.1.tar.gz) = 1358598 +MD5 (rsyslog-3.22.2.tar.gz) = b6a3b591764b20679dfb142219c4a8b8 +SHA256 (rsyslog-3.22.2.tar.gz) = d7afc6cb0fead582a20a7aa1f1fed9ee0f6ed41c4fa930d4d16095edb8183db3 +SIZE (rsyslog-3.22.2.tar.gz) = 1315816 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/sysutils/rsyslog3/pkg-plist,v retrieving revision 1.11 diff -u -u -r1.11 pkg-plist --- pkg-plist 25 Apr 2009 00:41:50 -0000 1.11 +++ pkg-plist 5 Oct 2010 02:40:42 -0000 @@ -65,7 +65,6 @@ %%PORTDOCS%%%%DOCSDIR%%/ommysql.html %%PORTDOCS%%%%DOCSDIR%%/omrelp.html %%PORTDOCS%%%%DOCSDIR%%/omsnmp.html -%%PORTDOCS%%%%DOCSDIR%%/professional_support.html %%PORTDOCS%%%%DOCSDIR%%/property_replacer.html %%PORTDOCS%%%%DOCSDIR%%/queues.html %%PORTDOCS%%%%DOCSDIR%%/rainerscript.html Index: files/patch-tools__omusrmsg.c =================================================================== RCS file: files/patch-tools__omusrmsg.c diff -N files/patch-tools__omusrmsg.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-tools__omusrmsg.c 5 Oct 2010 02:39:07 -0000 @@ -0,0 +1,105 @@ +--- ./tools/omusrmsg.c.orig 2010-10-05 02:35:15.216392638 +0000 ++++ ./tools/omusrmsg.c 2010-10-05 02:38:59.119754578 +0000 +@@ -50,7 +50,7 @@ + #include <assert.h> + #include <signal.h> + #include <sys/param.h> +-#include <utmp.h> ++#include <utmpx.h> + #include <unistd.h> + #include <sys/uio.h> + #include <sys/stat.h> +@@ -117,41 +117,6 @@ + ENDdbgPrintInstInfo + + +-/** +- * BSD setutent/getutent() replacement routines +- * The following routines emulate setutent() and getutent() under +- * BSD because they are not available there. We only emulate what we actually +- * need! rgerhards 2005-03-18 +- */ +-#ifdef OS_BSD +-static FILE *BSD_uf = NULL; +-void setutent(void) +-{ +- assert(BSD_uf == NULL); +- if ((BSD_uf = fopen(_PATH_UTMP, "r")) == NULL) { +- errmsg.LogError(NO_ERRCODE, "%s", _PATH_UTMP); +- return; +- } +-} +- +-struct utmp* getutent(void) +-{ +- static struct utmp st_utmp; +- +- if(fread((char *)&st_utmp, sizeof(st_utmp), 1, BSD_uf) != 1) +- return NULL; +- +- return(&st_utmp); +-} +- +-void endutent(void) +-{ +- fclose(BSD_uf); +- BSD_uf = NULL; +-} +-#endif /* #ifdef OS_BSD */ +- +- + /* WALLMSG -- Write a message to the world at large + * + * Write the specified message to either the entire +@@ -173,27 +138,25 @@ + int errnoSave; + int ttyf; + int wrRet; +- struct utmp ut; +- struct utmp *uptr; ++ struct utmpx ut; ++ struct utmpx *uptr; + struct stat statb; + DEFiRet; + + assert(pMsg != NULL); + + /* open the user login file */ +- setutent(); ++ setutxent(); + + /* scan the user login file */ +- while((uptr = getutent())) { ++ while((uptr = getutxent())) { + memcpy(&ut, uptr, sizeof(ut)); + /* is this slot used? */ +- if(ut.ut_name[0] == '\0') ++ if(ut.ut_user[0] == '\0') + continue; +-#ifndef OS_BSD + if(ut.ut_type != USER_PROCESS) + continue; +-#endif +- if(!(strncmp (ut.ut_name,"LOGIN", 6))) /* paranoia */ ++ if(!(strncmp (ut.ut_user,"LOGIN", 6))) /* paranoia */ + continue; + + /* should we send the message to this user? */ +@@ -203,7 +166,7 @@ + i = MAXUNAMES; + break; + } +- if(strncmp(pData->uname[i], ut.ut_name, UNAMESZ) == 0) ++ if(strncmp(pData->uname[i], ut.ut_user, UNAMESZ) == 0) + break; + } + if(i == MAXUNAMES) /* user not found? */ +@@ -239,7 +202,7 @@ + } + + /* close the user login file */ +- endutent(); ++ endutxent(); + RETiRet; + } + --- rsyslog-3.22.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010050248.o952mci4075550>