Page MenuHomeFreeBSD
Files F148098846

D12687.diff
No OneTemporary
Actions

D12687.diff
View Options

Index: head/sysutils/logrotate/Makefile
===================================================================
--- head/sysutils/logrotate/Makefile
+++ head/sysutils/logrotate/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= logrotate
-PORTVERSION= 3.9.2
+PORTVERSION= 3.13.0
CATEGORIES= sysutils
MAINTAINER= js@iksz.hu
Index: head/sysutils/logrotate/distinfo
===================================================================
--- head/sysutils/logrotate/distinfo
+++ head/sysutils/logrotate/distinfo
@@ -1,2 +1,3 @@
-SHA256 (logrotate-logrotate-3.9.2_GH0.tar.gz) = 2de00c65e23fa9d7909cae6594e550b9abe9a7eb1553669ddeaca92d30f97009
-SIZE (logrotate-logrotate-3.9.2_GH0.tar.gz) = 80711
+TIMESTAMP = 1508013010
+SHA256 (logrotate-logrotate-3.13.0_GH0.tar.gz) = fb1ff8502e7ae4aedaa3d0da8d3740a6a0f44b72e34666af724e9094b166c942
+SIZE (logrotate-logrotate-3.13.0_GH0.tar.gz) = 82436
Index: head/sysutils/logrotate/files/patch-Makefile
===================================================================
--- head/sysutils/logrotate/files/patch-Makefile
+++ head/sysutils/logrotate/files/patch-Makefile
@@ -1,29 +0,0 @@
---- Makefile.orig 2015-02-13 06:11:21 UTC
-+++ Makefile
-@@ -81,6 +81,13 @@ ifeq ($(OS_NAME),NetBSD)
- LOADLIBES += -L$(BASEDIR)/lib -Wl,-R,$(BASEDIR)/lib
- endif
-
-+# FreeBSD
-+ifeq ($(OS_NAME),FreeBSD)
-+ LOADLIBES += -L${LOCALBASE}/lib
-+ CFLAGS += -I${LOCALBASE}/include
-+ PREFIX=
-+endif
-+
- ifneq ($(POPT_DIR),)
- CFLAGS += -I$(POPT_DIR)
- LOADLIBES += -L$(POPT_DIR)
-@@ -155,9 +162,9 @@ install:
- $(INSTALL) $(MAN) $(PREFIX)$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"` 0644 bin bin; \
- $(INSTALL) $(MAN5) $(PREFIX)$(MANDIR)/man`echo $(MAN5) | sed "s/.*\.//"` 0644 bin bin; \
- else if [ "$(OS_NAME)" = FreeBSD ]; then \
-- $(BSD_INSTALL_PROGRAM) $(PROG) $(BINDIR); \
-- $(BSD_INSTALL_MAN) $(MAN) $(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN); \
-- $(BSD_INSTALL_MAN) $(MAN5) $(MANDIR)/man`echo $(MAN5) | sed "s/.*\.//"`/$(MAN5); \
-+ $(BSD_INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(BINDIR); \
-+ $(BSD_INSTALL_MAN) $(MAN) $(DESTDIR)$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN); \
-+ $(BSD_INSTALL_MAN) $(MAN5) $(DESTDIR)$(MANDIR)/man`echo $(MAN5) | sed "s/.*\.//"`/$(MAN5); \
- else \
- $(INSTALL) -m 755 $(PROG) $(PREFIX)$(BINDIR); \
- $(INSTALL) -m 644 $(MAN) $(PREFIX)$(MANDIR)/man`echo $(MAN) | sed "s/.*\.//"`/$(MAN); \
Index: head/sysutils/logrotate/files/patch-config.h
===================================================================
--- head/sysutils/logrotate/files/patch-config.h
+++ head/sysutils/logrotate/files/patch-config.h
@@ -1,16 +0,0 @@
---- config.h.orig 2015-02-13 06:11:21 UTC
-+++ config.h
-@@ -23,6 +23,13 @@
- #define STATEFILE "/var/log/logrotate.status"
- #endif
-
-+#ifdef __FreeBSD__
-+ #define DEFAULT_MAIL_COMMAND "/usr/bin/mailx"
-+ #define COMPRESS_COMMAND "/usr/bin/gzip"
-+ #define UNCOMPRESS_COMMAND "/usr/bin/gunzip"
-+ #define STATEFILE "/var/run/logrotate.status"
-+#endif
-+
- /*
- * Default settings for Linux - leave these last.
- */
Index: head/sysutils/logrotate/files/patch-config.c
===================================================================
--- head/sysutils/logrotate/files/patch-config.c
+++ head/sysutils/logrotate/files/patch-config.c
@@ -1,11 +1,10 @@
---- config.c.orig 2015-02-13 06:11:21 UTC
-+++ config.c
-@@ -1,8 +1,4 @@
+--- config.c.orig 2017-10-12 15:19:41.000000000 +0000
++++ config.c 2017-10-14 21:59:41.716559000 +0000
+@@ -1,6 +1,6 @@
#include "queue.h"
--/* Alloca is defined in stdlib.h in NetBSD */
+ /* Alloca is defined in stdlib.h in NetBSD */
-#ifndef __NetBSD__
--#include <alloca.h>
--#endif
++#if !defined(__FreeBSD__) && !defined(__NetBSD__)
+ #include <alloca.h>
+ #endif
#include <limits.h>
- #include <ctype.h>
- #include <dirent.h>
Index: head/sysutils/logrotate/files/patch-logrotate.8
===================================================================
--- head/sysutils/logrotate/files/patch-logrotate.8
+++ head/sysutils/logrotate/files/patch-logrotate.8
@@ -1,24 +0,0 @@
---- logrotate.8.orig 2015-02-13 06:11:21 UTC
-+++ logrotate.8
-@@ -59,7 +59,7 @@ and mail it to the recipient. The defaul
- \fB\-s\fR, \fB\-\-state <statefile>\fR
- Tells \fBlogrotate\fR to use an alternate state file. This is useful
- if logrotate is being run as a different user for various sets of
--log files. The default state file is \fI/var/lib/logrotate.status\fR.
-+log files. The default state file is \fI/var/run/logrotate.status\fR.
-
- .TP
- \fB\-\-usage\fR
-@@ -550,10 +550,10 @@ Log files are rotated if the current yea
- .SH FILES
- .PD 0
- .TP 27
--\fI/var/lib/logrotate.status\fR
-+\fI/var/run/logrotate.status\fR
- Default state file.
- .TP 27
--\fI/etc/logrotate.conf\fR
-+\fI/usr/local/etc/logrotate.conf\fR
- Configuration options.
-
- .SH SEE ALSO
Index: head/sysutils/logrotate/files/patch-logrotate.c
===================================================================
--- head/sysutils/logrotate/files/patch-logrotate.c
+++ head/sysutils/logrotate/files/patch-logrotate.c
@@ -1,11 +1,10 @@
---- logrotate.c.orig 2015-02-13 06:11:21 UTC
-+++ logrotate.c
-@@ -1,8 +1,4 @@
+--- logrotate.c.orig 2017-10-12 15:19:41.000000000 +0000
++++ logrotate.c 2017-10-14 22:00:57.613844000 +0000
+@@ -1,6 +1,6 @@
#include "queue.h"
--/* alloca() is defined in stdlib.h in NetBSD */
+ /* alloca() is defined in stdlib.h in NetBSD */
-#ifndef __NetBSD__
--#include <alloca.h>
--#endif
++#if !defined(__FreeBSD__) && !defined(__NetBSD__)
+ #include <alloca.h>
+ #endif
#include <limits.h>
- #include <ctype.h>
- #include <dirent.h>

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 16, 6:24 PM (6 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29781252
Default Alt Text
D12687.diff (5 KB)

Event Timeline