On Thu, November 28, 2013 13:27, Kirill Bychkov wrote: > Hi! > All this story started from the problem with dead MASTER_SITES. After some > searching I've found that file is hosted on SF [0], but with another name - > logcheck with the same size and checksum. > I've decided to change it's name from logsentry to logcheck, but after another > search on marc.info I've found out that it was renamed many years ago in > reverse [1]. > Finally, to avoid dance with quirks and @sampled files, I've ended with the > following patch, with > - REVISION bump > - correct license > - changed DISTFILE and MASTER_SITES > - documentation cleanup > - switch from MESSAGE to README > > In two words it's just a cleanup and change of distfile name. > > OK to commit? > > [0] http://sourceforge.net/projects/sentrytools/ > [1] http://marc.info/?l=openbsd-ports&m=104275276828714&w=2 > > Missed patch, sorry.
Index: Makefile =================================================================== RCS file: /cvs/ports/security/logsentry/Makefile,v retrieving revision 1.9 diff -u -p -r1.9 Makefile --- Makefile 11 Mar 2013 11:41:25 -0000 1.9 +++ Makefile 28 Nov 2013 11:23:29 -0000 @@ -2,23 +2,21 @@ COMMENT= logfile auditing tool -DISTNAME= logsentry-1.1.1 -REVISION = 4 +DISTNAME= logcheck-1.1.1 +PKGNAME= logsentry-1.1.1 +REVISION = 5 CATEGORIES= security MAINTAINER= Srebrenko Sehic <ha...@insecure.dk> -# GPL +# GPLv2 PERMIT_PACKAGE_CDROM= Yes WANTLIB= c -MASTER_SITES= http://www.insecure.dk/distfiles/ \ - ftp://sensimilia.eu.org/pub/software/sys/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sentrytools/} NO_TEST= Yes -WRKDIST= ${WRKDIR}/${DISTNAME:S/logsentry/logcheck/} - DOC_DIR= ${PREFIX}/share/doc/logsentry DOC_FILES= CREDITS INSTALL README README.how.to.interpret README.keywords CFG_DIR= ${PREFIX}/share/examples/logsentry @@ -26,6 +24,11 @@ CFG_FILES= logcheck.sh logcheck.hacking logcheck.violations logcheck.violations.ignore SUBST_VARS+= DOC_DIR + +do-configure: + @perl -pi -e 's,logcheck,logsentry,g' ${WRKSRC}/INSTALL + @perl -pi -e 's,Logcheck,Logsentry,g' ${WRKSRC}/INSTALL + @perl -pi -e 's,/usr/local/etc,${SYSCONFDIR},g' ${WRKSRC}/INSTALL do-build: ${CC} ${CFLAGS} -o ${WRKSRC}/src/logtail ${WRKSRC}/src/logtail.c Index: distinfo =================================================================== RCS file: /cvs/ports/security/logsentry/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 5 Apr 2007 17:26:07 -0000 1.3 +++ distinfo 28 Nov 2013 11:23:29 -0000 @@ -1,5 +1,2 @@ -MD5 (logsentry-1.1.1.tar.gz) = 6XwvCW4hniAxDBuA6eG8KQ== -RMD160 (logsentry-1.1.1.tar.gz) = GGX1mLS/Mq9GbUrsXggDJJphxEI= -SHA1 (logsentry-1.1.1.tar.gz) = GPifDaz+n/MQdsAG1Y4bz+2qfyI= -SHA256 (logsentry-1.1.1.tar.gz) = 3+TLKTBcYZ3AoKylsRsr05e6zPMHa0jwNFf2bymatC4= -SIZE (logsentry-1.1.1.tar.gz) = 30267 +SHA256 (logcheck-1.1.1.tar.gz) = 3+TLKTBcYZ3AoKylsRsr05e6zPMHa0jwNFf2bymatC4= +SIZE (logcheck-1.1.1.tar.gz) = 30267 Index: pkg/MESSAGE =================================================================== RCS file: pkg/MESSAGE diff -N pkg/MESSAGE --- pkg/MESSAGE 2 Dec 2004 21:18:37 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -The logsentry configuration files have been installed at -${SYSCONFDIR}/logsentry. -Please view these files and change the configuration to meet your needs. - -Currently logsentry will check the following files: - -/var/log/messages -/var/log/maillog -/var/log/authlog -/var/log/secure -/var/log/daemon -/var/log/xferlog - -Edit ${SYSCONFDIR}/logsentry/logsentry.sh -if you want to add more files. - -Be sure to configure your crontab as indicated by -${PREFIX}/share/doc/logsentry/INSTALL -so that logsentry is run regularly. Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/security/logsentry/pkg/PLIST,v retrieving revision 1.9 diff -u -p -r1.9 PLIST --- pkg/PLIST 11 May 2012 03:35:03 -0000 1.9 +++ pkg/PLIST 28 Nov 2013 11:23:29 -0000 @@ -2,13 +2,14 @@ @conflict logcheck-1.1.1 @conflict logtail-* @extraunexec rm -rf /var/tmp/logsentry/* -bin/logtail +@bin bin/logtail share/doc/logsentry/ share/doc/logsentry/CREDITS share/doc/logsentry/INSTALL share/doc/logsentry/README share/doc/logsentry/README.how.to.interpret share/doc/logsentry/README.keywords +share/doc/pkg-readmes/${FULLPKGNAME} share/examples/logsentry/ @mode 600 @sample ${SYSCONFDIR}/logsentry/ Index: pkg/README =================================================================== RCS file: pkg/README diff -N pkg/README --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg/README 28 Nov 2013 11:23:29 -0000 @@ -0,0 +1,20 @@ +$OpenBSD: README,v 1.2 2012/12/09 22:05:25 rpe Exp $ + ++----------------------------------------------------------------------- +| Running ${FULLPKGNAME} on OpenBSD ++----------------------------------------------------------------------- + +You need to configure your crontab as indicated by +${DOC_DIR}/INSTALL so that logsentry is run +regularly. + +By default logcheck will parse the following files: + +/var/log/messages +/var/log/maillog +/var/log/authlog +/var/log/secure +/var/log/daemon +/var/log/xferlog + +Edit ${SYSCONFDIR}/logsentry/logsentry.sh if you want to add more files.