Attachment 39985 Details for Bug 62926 – logrotate-update-3.6.5.patch

[patch] logrotate-update-3.6.5.patch

logrotate-update-3.6.5.patch (text/plain), 7.01 KB, created by js on 2004-02-16 19:40:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: js

Created: 2004-02-16 19:40:17 UTC

Size: 7.01 KB

patch

obsolete

>diff -ruN logrotate-old/Makefile logrotate/Makefile
>--- logrotate-old/Makefile	Sat Feb 14 11:12:03 2004
>+++ logrotate/Makefile	Mon Feb 16 20:17:50 2004
>@@ -5,29 +5,28 @@
> # $FreeBSD: ports/sysutils/logrotate/Makefile,v 1.15 2004/02/13 15:43:43 krion Exp $
> #
> 
>-PORTNAME=	logrotate
>-PORTVERSION=	3.5.2
>-PORTREVISION=	1
>-CATEGORIES=	sysutils
>-MASTER_SITES=	${MASTER_SITE_REDHAT_LINUX}
>-MASTER_SITE_SUBDIR=	7.0/en/os/i386/SRPMS
>-EXTRACT_SUFX=	-1.src.rpm
>+PORTNAME=		logrotate
>+PORTVERSION=		3.6.5
>+PORTREVISION=		1
>+CATEGORIES=		sysutils
>+MASTER_SITES=		${MASTER_SITE_DEBIAN_POOL}
>+MASTER_SITE_SUBDIR=	l/logrotate
>+DISTNAME=		${PORTNAME}_${PORTVERSION}.orig
>+WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
>-MAINTAINER=	js@iksz.hu
>-COMMENT=	Daemon to rotate, compress, remove and mail system log files
>+PATCH_SITES=		${MASTER_SITES}
>+PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
>+PATCHFILES=		${PORTNAME}_${PORTVERSION}-2.diff.gz
>+PATCH_WRKSRC=		${WRKDIR}
> 
>-EXTRACT_DEPENDS=	${LOCALBASE}/bin/rpm2cpio:${PORTSDIR}/archivers/rpm
>-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
>+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
> MAN8=		logrotate.8
> MANCOMPRESSED=	no
>-
>-do-extract:
>-	@${RM} -rf ${WRKDIR}
>-	@${MKDIR} ${WRKDIR}
>-	@rpm2cpio ${_DISTDIR}${DISTFILES} | (cd ${WRKDIR}; cpio -i)
>-	@${TAR} -xzf ${WRKDIR}/${DISTNAME}.tar.gz -C ${WRKDIR}
> 
> post-install:
> 	@${MKDIR} ${PREFIX}/etc/logrotate.d
>diff -ruN logrotate-old/distinfo logrotate/distinfo
>--- logrotate-old/distinfo	Thu Jan 25 15:38:29 2001
>+++ logrotate/distinfo	Wed Feb  4 18:25:24 2004
>@@ -1 +1,2 @@
>-MD5 (logrotate-3.5.2-1.src.rpm) = 0f0a7e84a32145334fb0fdd425b81230
>+MD5 (logrotate_3.6.5-2.diff.gz) = 6cce85b7af50e3c2a226d6f0539abe08
>+MD5 (logrotate_3.6.5.orig.tar.gz) = 1c707f826f783ffc461a32b34cba5056
>diff -ruN logrotate-old/files/patch-aa logrotate/files/patch-aa
>--- logrotate-old/files/patch-aa	Thu Dec 30 13:35:51 1999
>+++ logrotate/files/patch-aa	Wed Feb  4 19:37:50 2004
>@@ -1,12 +1,44 @@
>---- config.c.orig	Tue Dec 28 15:24:25 1999
>-+++ config.c	Tue Dec 28 15:26:54 1999
>-@@ -1,9 +1,7 @@
>+diff -ruN logrotate-3.6.5-orig/Makefile logrotate-3.6.5/Makefile
>+--- logrotate-3.6.5-orig/Makefile	Sat Aug  3 11:47:41 2002
>++++ logrotate-3.6.5/Makefile	Wed Feb  4 19:37:40 2004
>+@@ -8,6 +8,12 @@
>+ MAN = logrotate.8
>+ LOADLIBES = -lpopt
>+ 
>++ifeq ($(OS_NAME),FreeBSD)
>++    BASEDIR=${LOCALBASE}
>++    LOADLIBES += -L${LOCALBASE}/lib
>++    CFLAGS += -I${LOCALBASE}/include
>++endif
>++
>+ # HP-UX using GCC
>+ ifeq ($(OS_NAME),HP-UX)
>+     ifeq ($(RPM_OPT_FLAGS),)
>+@@ -90,6 +96,11 @@
>+ 	if [ "$(OS_NAME)" = Linux ]; then \
>+ 	$(INSTALL) -m 755 $(PROG) $(PREFIX)/$(BINDIR); \
>+ 	$(INSTALL) -m 644 $(MAN) $(PREFIX)/$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN); \
>++	fi
>++
>++	if [ "$(OS_NAME)" = FreeBSD ]; then \
>++	$(BSD_INSTALL_PROGRAM) $(PROG) $(BINDIR); \
>++	$(BSD_INSTALL_MAN) $(MAN) $(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN); \
>+ 	fi
>+ 
>+ co:
>+diff -ruN logrotate-3.6.5-orig/config.c logrotate-3.6.5/config.c
>+--- logrotate-3.6.5-orig/config.c	Wed Mar 13 16:59:45 2002
>++++ logrotate-3.6.5/config.c	Wed Feb  4 19:27:37 2004
>+@@ -1,4 +1,3 @@
>+-#include <alloca.h>
>+ #include <ctype.h>
>+ #include <dirent.h>
>+ #include <errno.h>
>+diff -ruN logrotate-3.6.5-orig/logrotate.c logrotate-3.6.5/logrotate.c
>+--- logrotate-3.6.5-orig/logrotate.c	Wed Apr 24 01:29:19 2002
>++++ logrotate-3.6.5/logrotate.c	Wed Feb  4 19:27:37 2004
>+@@ -1,4 +1,3 @@
> -#include <alloca.h>
>  #include <ctype.h>
>  #include <dirent.h>
>  #include <errno.h>
>- #include <fcntl.h>
>--#include <getopt.h>
>- #include <glob.h>
>- #include <grp.h>
>- #include <pwd.h>
>diff -ruN logrotate-old/files/patch-ab logrotate/files/patch-ab
>--- logrotate-old/files/patch-ab	Fri Oct 13 22:28:33 2000
>+++ logrotate/files/patch-ab	Thu Jan  1 01:00:00 1970
>@@ -1,29 +0,0 @@
>---- Makefile.orig	Wed Dec 30 03:29:13 1998
>-+++ Makefile	Tue Dec 28 15:35:52 1999
>-@@ -2,11 +2,13 @@
>- CVSTAG = r$(subst .,-,$(VERSION))
>- CFLAGS = -Wall -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS)
>- PROG = logrotate
>--BINDIR = /usr/sbin
>--MANDIR = /usr/man
>-+BINDIR = sbin
>-+MANDIR = man
>- MAN = logrotate.8
>- LOADLIBES = -lpopt
>- 
>-+LOADLIBES += -L${LOCALBASE}/lib
>-+CFLAGS += -I${LOCALBASE}/include
>- #--------------------------------------------------------------------------
>- 
>- OBJS = logrotate.o log.o config.o basenames.o
>-@@ -40,8 +42,8 @@
>- 	[ -d $(PREFIX)/$(MANDIR) ] || mkdir -p $(PREFIX)/$(MANDIR)
>- 	[ -d $(PREFIX)/$(MANDIR)/man8 ] || mkdir -p $(PREFIX)/$(MANDIR)/man8
>- 
>--	install -s -m 755 $(PROG) $(PREFIX)/$(BINDIR)
>--	install -m 644 $(MAN) $(PREFIX)/$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN)
>-+	${BSD_INSTALL_PROGRAM} $(PROG) $(PREFIX)/$(BINDIR)
>-+	${BSD_INSTALL_MAN} $(MAN) $(PREFIX)/$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN)
>- 
>- co:
>- 	co RCS/*,v
>diff -ruN logrotate-old/files/patch-ad logrotate/files/patch-ad
>--- logrotate-old/files/patch-ad	Thu Dec 30 13:35:51 1999
>+++ logrotate/files/patch-ad	Thu Jan  1 01:00:00 1970
>@@ -1,11 +0,0 @@
>---- logrotate.h.orig	Tue Dec 28 15:55:44 1999
>-+++ logrotate.h	Tue Dec 28 15:55:56 1999
>-@@ -12,7 +12,7 @@
>- #define LOG_FLAG_MISSINGOK	(1 << 5)
>- #define LOG_FLAG_MAILFIRST	(1 << 6)
>- 
>--#define DEFAULT_MAIL_COMMAND "/bin/mail -s"
>-+#define DEFAULT_MAIL_COMMAND "/usr/bin/mail -s"
>- #define COMPRESS_COMMAND "gzip -9"
>- #define COMPRESS_EXT ".gz"
>- #define UNCOMPRESS_PIPE "gunzip"
>diff -ruN logrotate-old/files/patch-logrotate.c logrotate/files/patch-logrotate.c
>--- logrotate-old/files/patch-logrotate.c	Wed Jul 30 11:41:58 2003
>+++ logrotate/files/patch-logrotate.c	Thu Jan  1 01:00:00 1970
>@@ -1,43 +0,0 @@
>---- logrotate.c.orig	Fri Aug  4 20:27:38 2000
>-+++ logrotate.c	Fri Jul 18 15:20:13 2003
>-@@ -1,9 +1,7 @@
>--#include <alloca.h>
>- #include <ctype.h>
>- #include <dirent.h>
>- #include <errno.h>
>- #include <fcntl.h>
>--#include <getopt.h>
>- #include <popt.h>
>- #include <stdio.h>
>- #include <stdlib.h>
>-@@ -395,8 +393,7 @@
>- 	    if (log->pre && !(log->flags & LOG_FLAG_SHAREDSCRIPTS)) {
>- 		message(MESS_DEBUG, "running prerotate script\n");
>- 		if (runScript(log->files[logNum], log->pre)) {
>--		    fprintf(errorFile, "error running prerotate script -- 
>--				leaving old log in place\n");
>-+		    fprintf(errorFile, "error running prerotate script -- leaving old log in place\n"); 
>- 		    hasErrors = 1;
>- 		}
>- 	    }
>-@@ -471,6 +468,9 @@
>- 		}
>- 	    }
>- 
>-+	    message(MESS_DEBUG, "sleep 10 to wait daemon close log\n");
>-+	    sleep(10);
>-+
>- 	    if (!hasErrors && !log->rotateCount) {
>- 		message(MESS_DEBUG, "removing rotated log (rotateCount == 0)");
>- 		if (unlink(finalName)) {
>-@@ -634,8 +634,8 @@
>-     if (log->pre && (log->flags & LOG_FLAG_SHAREDSCRIPTS)) {
>- 	message(MESS_DEBUG, "running shared prerotate script\n");
>- 	if (runScript(log->pattern, log->pre)) {
>--	    fprintf(errorFile, "error running shared prerotate script for %s-- 
>--			leaving old logs in place\n", log->pattern);
>-+	    fprintf(errorFile, "error running shared prerotate script for %s-- "
>-+		"leaving old logs in place\n", log->pattern);
>- 	    hasErrors = 1;
>- 	}
>-     }

Actions: View | Diff

Attachments on bug 62926: 39985