mirror of
https://git.FreeBSD.org/ports.git
synced 2025-02-03 11:12:13 +00:00
- Update to 3.6.5
PR: ports/62926 Submitted by: Balazs Nagy <js@iksz.hu> (maintainer)
This commit is contained in:
Pav Lucistnik
parent
17a0f98920
commit
78c32929c3
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=102470
@ -5,30 +5,30 @@
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
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
|
||||
CATEGORIES= sysutils
|
||||
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
|
||||
MASTER_SITE_SUBDIR= l/logrotate
|
||||
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
|
||||
|
||||
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
|
||||
|
||||
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
|
||||
MAKE_ENV= "BASEDIR=${PREFIX}"
|
||||
PATCH_WRKSRC= ${WRKDIR}
|
||||
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
|
||||
|
||||
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
|
||||
@${SED} -e 's|__PREFIX__|${PREFIX}|' \
|
||||
|
||||
@ -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
|
||||
|
||||
39
sysutils/logrotate/files/patch-Makefile
Normal file
39
sysutils/logrotate/files/patch-Makefile
Normal file
@ -0,0 +1,39 @@
|
||||
--- logrotate-3.6.5/Makefile.orig Sat Aug 3 11:47:41 2002
|
||||
+++ logrotate-3.6.5/Makefile Sat Feb 28 23:09:20 2004
|
||||
@@ -8,6 +8,11 @@
|
||||
MAN = logrotate.8
|
||||
LOADLIBES = -lpopt
|
||||
|
||||
+ifeq ($(OS_NAME),FreeBSD)
|
||||
+ LOADLIBES += -L${LOCALBASE}/lib
|
||||
+ CFLAGS += -I${LOCALBASE}/include
|
||||
+endif
|
||||
+
|
||||
# HP-UX using GCC
|
||||
ifeq ($(OS_NAME),HP-UX)
|
||||
ifeq ($(RPM_OPT_FLAGS),)
|
||||
@@ -78,9 +83,9 @@
|
||||
(cd test; ./test)
|
||||
|
||||
install:
|
||||
- [ -d $(PREFIX)/$(BINDIR) ] || mkdir -p $(PREFIX)/$(BINDIR)
|
||||
- [ -d $(PREFIX)/$(MANDIR) ] || mkdir -p $(PREFIX)/$(MANDIR)
|
||||
- [ -d $(PREFIX)/$(MANDIR)/man8 ] || mkdir -p $(PREFIX)/$(MANDIR)/man8
|
||||
+ [ -d $(BINDIR) ] || mkdir -p $(BINDIR)
|
||||
+ [ -d $(MANDIR) ] || mkdir -p $(MANDIR)
|
||||
+ [ -d $(MANDIR)/man8 ] || mkdir -p $(MANDIR)/man8
|
||||
|
||||
if [ "$(OS_NAME)" = HP-UX ]; then \
|
||||
$(INSTALL) $(PROG) $(PREFIX)/$(BINDIR) 0755 bin bin; \
|
||||
@@ -90,6 +95,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:
|
||||
@ -1,12 +1,16 @@
|
||||
--- 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 config.c config.c
|
||||
--- logrotate-3.6.5/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/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>
|
||||
|
||||
@ -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
|
||||
@ -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"
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user