Date: Thu, 12 Jul 2007 09:54:16 +0200 (CEST) From: Tom Mueko <tmueko@kommunity.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/114523: [patch] Message-ID: <20070712075416.BFD5A164A73@mailmaster.kommunity.net> Resent-Message-ID: <200707120800.l6C80Dvc002006@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 114523
>Category: ports
>Synopsis: [patch]
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 12 08:00:13 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Tom Mueko
>Release: FreeBSD 6.2-RELEASE
>Organization:
Kommunity GmbH & Co KG
>Environment:
System: FreeBSD zwerg.kommunity.net 6.2-RELEASE FreeBSD 6.2-RELEASE-p4 #1: Tue Jun 12 18:06:16 CEST 2007 tmueko@zwerg.kommunity.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
upgrade to logrotate-3.7.1 with dateext-patch
>How-To-Repeat:
>Fix:
--- logrotate.patch begins here ---
diff -ruN logrotate.bak/Makefile logrotate/Makefile
--- logrotate.bak/Makefile Thu Jul 12 09:16:48 2007
+++ logrotate/Makefile Thu Jul 12 09:36:56 2007
@@ -6,8 +6,8 @@
#
PORTNAME= logrotate
-PORTVERSION= 3.7
-PORTREVISION= 5
+PORTVERSION= 3.7.1
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
MASTER_SITE_SUBDIR= l/logrotate
@@ -15,7 +15,7 @@
PATCH_SITES= ${MASTER_SITES}
PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR}
-PATCHFILES= ${PORTNAME}_${PORTVERSION}-5.diff.gz
+PATCHFILES= ${PORTNAME}_${PORTVERSION}-3.diff.gz
MAINTAINER= js@iksz.hu
COMMENT= Daemon to rotate, compress, remove and mail system log files
diff -ruN logrotate.bak/Makefile.orig logrotate/Makefile.orig
--- logrotate.bak/Makefile.orig Thu Jan 1 01:00:00 1970
+++ logrotate/Makefile.orig Thu Jul 12 09:36:42 2007
@@ -0,0 +1,39 @@
+# New ports collection makefile for: logrotate
+# Date Created: 29 Dec 1999
+# Whom: Yuan-Chen Cheng <ycheng@sinica.edu.tw>
+#
+# $FreeBSD: ports/sysutils/logrotate/Makefile,v 1.22 2007/02/17 20:56:56 gabor Exp $
+#
+
+PORTNAME= logrotate
+PORTVERSION= 3.7
+PORTREVISION= 5
+CATEGORIES= sysutils
+MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
+MASTER_SITE_SUBDIR= l/logrotate
+DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
+
+PATCH_SITES= ${MASTER_SITES}
+PATCH_SITE_SUBDIR= ${MASTER_SITE_SUBDIR}
+PATCHFILES= ${PORTNAME}_${PORTVERSION}-5.diff.gz
+
+MAINTAINER= js@iksz.hu
+COMMENT= Daemon to rotate, compress, remove and mail system log files
+
+LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
+
+USE_GMAKE= yes
+MAKE_ENV= "BASEDIR=${PREFIX}"
+PATCH_WRKSRC= ${WRKDIR}
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+MAN8= logrotate.8
+MANCOMPRESSED= no
+
+post-install:
+ @${MKDIR} ${EXAMPLESDIR}
+ @${SED} -e 's|__PREFIX__|${PREFIX}|' \
+ < ${FILESDIR}/logrotate.conf.sample > ${PREFIX}/etc/logrotate.conf.sample
+ @${INSTALL_DATA} ${FILESDIR}/syslog.sample ${EXAMPLESDIR}
+
+.include <bsd.port.mk>
diff -ruN logrotate.bak/distinfo logrotate/distinfo
--- logrotate.bak/distinfo Thu Jul 12 09:16:48 2007
+++ logrotate/distinfo Thu Jul 12 09:36:56 2007
@@ -1,6 +1,6 @@
-MD5 (logrotate_3.7.orig.tar.gz) = bf0de3a495294300f32e71f136119c41
-SHA256 (logrotate_3.7.orig.tar.gz) = a0fba4f6214fb30cb1f61a51fffca9a7e2ec01aad8dbcf5d3ec157149b460e1b
-SIZE (logrotate_3.7.orig.tar.gz) = 35737
-MD5 (logrotate_3.7-5.diff.gz) = 291d015a7fddd86ee2da4cb7bbb12b19
-SHA256 (logrotate_3.7-5.diff.gz) = dce1378ddafe98478eb0fa2d6064fae7ddbd4eab9e8cac794b333d586759bbf5
-SIZE (logrotate_3.7-5.diff.gz) = 15081
+MD5 (logrotate_3.7.1.orig.tar.gz) = 552639142e163745f6bcd4f1f3816d8a
+SHA256 (logrotate_3.7.1.orig.tar.gz) = 7e79b03d65105541a5fdcc05087bee29ebc9e33149ac33d6563d0b20eddf79e0
+SIZE (logrotate_3.7.1.orig.tar.gz) = 36176
+MD5 (logrotate_3.7.1-3.diff.gz) = 7b0dd9835339bbf85f106d4adb25cf0c
+SHA256 (logrotate_3.7.1-3.diff.gz) = 68b6ebd0cb8f78a8a0a1dcaa8a1a4486288967e9acc7f4c02bb8ee9ecde9cb6c
+SIZE (logrotate_3.7.1-3.diff.gz) = 23547
diff -ruN logrotate.bak/distinfo.orig logrotate/distinfo.orig
--- logrotate.bak/distinfo.orig Thu Jan 1 01:00:00 1970
+++ logrotate/distinfo.orig Thu Jul 12 09:36:56 2007
@@ -0,0 +1,12 @@
+MD5 (logrotate_3.7.orig.tar.gz) = bf0de3a495294300f32e71f136119c41
+SHA256 (logrotate_3.7.orig.tar.gz) = a0fba4f6214fb30cb1f61a51fffca9a7e2ec01aad8dbcf5d3ec157149b460e1b
+SIZE (logrotate_3.7.orig.tar.gz) = 35737
+MD5 (logrotate_3.7-5.diff.gz) = 291d015a7fddd86ee2da4cb7bbb12b19
+SHA256 (logrotate_3.7-5.diff.gz) = dce1378ddafe98478eb0fa2d6064fae7ddbd4eab9e8cac794b333d586759bbf5
+SIZE (logrotate_3.7-5.diff.gz) = 15081
+MD5 (logrotate_3.7.orig.tar.gz) = bf0de3a495294300f32e71f136119c41
+SHA256 (logrotate_3.7.orig.tar.gz) = a0fba4f6214fb30cb1f61a51fffca9a7e2ec01aad8dbcf5d3ec157149b460e1b
+SIZE (logrotate_3.7.orig.tar.gz) = 35737
+MD5 (logrotate_3.7-5.diff.gz) = 291d015a7fddd86ee2da4cb7bbb12b19
+SHA256 (logrotate_3.7-5.diff.gz) = dce1378ddafe98478eb0fa2d6064fae7ddbd4eab9e8cac794b333d586759bbf5
+SIZE (logrotate_3.7-5.diff.gz) = 15081
diff -ruN logrotate.bak/distinfo.orig.orig logrotate/distinfo.orig.orig
--- logrotate.bak/distinfo.orig.orig Thu Jan 1 01:00:00 1970
+++ logrotate/distinfo.orig.orig Thu Jul 12 09:36:42 2007
@@ -0,0 +1,6 @@
+MD5 (logrotate_3.7.orig.tar.gz) = bf0de3a495294300f32e71f136119c41
+SHA256 (logrotate_3.7.orig.tar.gz) = a0fba4f6214fb30cb1f61a51fffca9a7e2ec01aad8dbcf5d3ec157149b460e1b
+SIZE (logrotate_3.7.orig.tar.gz) = 35737
+MD5 (logrotate_3.7-5.diff.gz) = 291d015a7fddd86ee2da4cb7bbb12b19
+SHA256 (logrotate_3.7-5.diff.gz) = dce1378ddafe98478eb0fa2d6064fae7ddbd4eab9e8cac794b333d586759bbf5
+SIZE (logrotate_3.7-5.diff.gz) = 15081
diff -ruN logrotate.bak/files/patch-Makefile logrotate/files/patch-Makefile
--- logrotate.bak/files/patch-Makefile Thu Jul 12 09:16:48 2007
+++ logrotate/files/patch-Makefile Thu Jul 12 09:42:19 2007
@@ -1,5 +1,5 @@
--- logrotate-3.7-orig/Makefile Wed Oct 20 19:07:27 2004
-+++ logrotate-3.7/Makefile Wed Oct 20 19:07:42 2004
++++ logrotate-3.7.1/Makefile Wed Oct 20 19:07:42 2004
@@ -1,5 +1,4 @@
VERSION = $(shell awk '/Version:/ { print $$2 }' logrotate.spec)
-CVSROOT = $(shell cat CVS/Root)
diff -ruN logrotate.bak/files/patch-aa logrotate/files/patch-aa
--- logrotate.bak/files/patch-aa Thu Jul 12 09:16:48 2007
+++ logrotate/files/patch-aa Thu Jul 12 09:46:01 2007
@@ -1,6 +1,6 @@
diff -ruN logrotate-3.7-orig/config.c logrotate-3.7/config.c
--- logrotate-3.7-orig/config.c Mon Sep 22 21:11:12 2003
-+++ logrotate-3.7/config.c Mon May 24 08:09:39 2004
++++ logrotate-3.7.1/config.c Mon May 24 08:09:39 2004
@@ -1,4 +1,3 @@
-#include <alloca.h>
#include <ctype.h>
@@ -8,18 +8,9 @@
#include <errno.h>
diff -ruN logrotate-3.7-orig/logrotate.c logrotate-3.7/logrotate.c
--- logrotate-3.7-orig/logrotate.c Thu Feb 5 19:42:13 2004
-+++ logrotate-3.7/logrotate.c Tue Jun 15 17:35:48 2004
++++ logrotate-3.7.1/logrotate.c Tue Jun 15 17:35:48 2004
@@ -1,4 +1,3 @@
-#include <alloca.h>
#include <ctype.h>
#include <dirent.h>
#include <errno.h>
-@@ -110,7 +109,7 @@
- close(fd);
-
- if (!fork()) {
-- execlp(filespec, logfn, NULL);
-+ execlp(filespec, filespec, logfn, NULL);
- exit(1);
- }
-
diff -ruN logrotate.bak/files/patch-config.h logrotate/files/patch-config.h
--- logrotate.bak/files/patch-config.h Thu Jul 12 09:16:48 2007
+++ logrotate/files/patch-config.h Thu Jul 12 09:46:24 2007
@@ -1,6 +1,6 @@
diff -ruN logrotate-3.7-orig/config.h logrotate-3.7/config.h
--- logrotate-3.7-orig/config.h Mon Sep 22 21:11:12 2003
-+++ logrotate-3.7/config.h Mon May 24 08:05:29 2004
++++ logrotate-3.7.1/config.h Mon May 24 08:05:29 2004
@@ -16,6 +16,13 @@
#define STATEFILE "/var/log/logrotate.status"
#endif
@@ -9,7 +9,7 @@
+ #define DEFAULT_MAIL_COMMAND "/usr/bin/mailx -s"
+ #define COMPRESS_COMMAND "/usr/bin/gzip"
+ #define UNCOMPRESS_COMMAND "/usr/bin/gunzip"
-+ #define STATEFILE "/var/lib/logrotate.status"
++ #define STATEFILE "/var/log/logrotate.status"
+#endif
+
/*
--- logrotate.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?20070712075416.BFD5A164A73>