summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-04-02 16:42:26 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2015-04-02 16:42:26 +0200
commit05c2c84dec5680c85ff6d8f7f5788ba81467d85b (patch)
treef7f51172524a8d8bb8c22bc4f002795f1c80d4fd /package
parent7e250b4b876d06f1a31c23669ee0b0d3dee35ab4 (diff)
update to latest stable upstream version
Diffstat (limited to 'package')
-rw-r--r--package/logrotate/Makefile6
-rw-r--r--package/logrotate/patches/patch-Makefile19
-rw-r--r--package/logrotate/patches/patch-config_c8
-rw-r--r--package/logrotate/patches/patch-logrotate_c8
-rw-r--r--package/logrotate/patches/patch-logrotate_h11
5 files changed, 14 insertions, 38 deletions
diff --git a/package/logrotate/Makefile b/package/logrotate/Makefile
index 6b9b4b162..4701a9c0c 100644
--- a/package/logrotate/Makefile
+++ b/package/logrotate/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= logrotate
-PKG_VERSION:= 3.8.7
+PKG_VERSION:= 3.8.9
PKG_RELEASE:= 1
-PKG_HASH:= f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64
+PKG_HASH:= 700ed7ce9072a1cca324779a74797dfaefdae37ac50a817134b947c4ded1dfa7
PKG_DESCR:= logfile rotation utility
PKG_SECTION:= sys/misc
PKG_DEPENDS:= libpopt
@@ -20,7 +20,7 @@ include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LOGROTATE,logrotate,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
-TARGET_CFLAGS+= -D_GNU_SOURCE -DVERSION=\"$(PKG_VERSION)\"
+TARGET_CFLAGS+= -DVERSION=\"$(PKG_VERSION)\"
logrotate-install:
${INSTALL_DIR} ${IDIR_LOGROTATE}/usr/sbin
diff --git a/package/logrotate/patches/patch-Makefile b/package/logrotate/patches/patch-Makefile
index c2b81fbbc..9b8fec9c3 100644
--- a/package/logrotate/patches/patch-Makefile
+++ b/package/logrotate/patches/patch-Makefile
@@ -1,11 +1,14 @@
---- logrotate-3.8.7.orig/Makefile 2013-06-10 13:29:16.000000000 +0200
-+++ logrotate-3.8.7/Makefile 2014-03-23 15:16:09.000000000 +0100
-@@ -1,11 +1,11 @@
+--- logrotate-3.8.9.orig/Makefile 2015-02-13 07:11:21.000000000 +0100
++++ logrotate-3.8.9/Makefile 2015-04-02 16:40:24.000000000 +0200
+@@ -1,11 +1,12 @@
VERSION = $(shell awk '/Version:/ { print $$2 }' logrotate.spec)
-OS_NAME = $(shell uname -s)
+-LFS = $(shell echo `getconf LFS_CFLAGS 2>/dev/null`)
+-CFLAGS = -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" -DHAVE_STRPTIME=1 -DHAVE_QSORT $(RPM_OPT_FLAGS) $(LFS)
+OS_NAME = Linux
- LFS = $(shell echo `getconf LFS_CFLAGS 2>/dev/null`)
- CFLAGS = -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS)
++#LFS = $(shell echo `getconf LFS_CFLAGS 2>/dev/null`)
++CFLAGS ?=
++CFLAGS += -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" -DHAVE_STRPTIME=1 -DHAVE_QSORT $(RPM_OPT_FLAGS) $(LFS)
PROG = logrotate
MAN = logrotate.8
MAN5 = logrotate.conf.5
@@ -14,7 +17,7 @@
SVNURL= svn+ssh://svn.fedorahosted.org/svn/logrotate
SVNPUBURL = http://svn.fedorahosted.org/svn/logrotate
SVNTAG = r$(subst .,-,$(VERSION))
-@@ -64,7 +64,7 @@ endif
+@@ -64,7 +65,7 @@ endif
# Red Hat Linux
ifeq ($(OS_NAME),Linux)
INSTALL = install
@@ -23,8 +26,8 @@
endif
# FreeBSD
-@@ -117,6 +117,7 @@ RCSVERSION = $(subst .,-,$(VERSION))
- all: $(TARGET) pretest
+@@ -124,6 +125,7 @@ show_warning:
+ @echo ""
$(PROG): $(OBJS)
+ $(CC) $(LDFLAGS) -o $(PROG) $^ $(LIBS)
diff --git a/package/logrotate/patches/patch-config_c b/package/logrotate/patches/patch-config_c
deleted file mode 100644
index ea58cd4ce..000000000
--- a/package/logrotate/patches/patch-config_c
+++ /dev/null
@@ -1,8 +0,0 @@
---- logrotate-3.8.7.orig/config.c 2013-07-31 13:34:31.000000000 +0200
-+++ logrotate-3.8.7/config.c 2014-03-23 15:11:39.000000000 +0100
-@@ -1,4 +1,4 @@
--#include <sys/queue.h>
-+#include "queue.h"
- /* Alloca is defined in stdlib.h in NetBSD */
- #ifndef __NetBSD__
- #include <alloca.h>
diff --git a/package/logrotate/patches/patch-logrotate_c b/package/logrotate/patches/patch-logrotate_c
deleted file mode 100644
index d2ee8dd83..000000000
--- a/package/logrotate/patches/patch-logrotate_c
+++ /dev/null
@@ -1,8 +0,0 @@
---- logrotate-3.8.7.orig/logrotate.c 2013-10-10 10:43:36.000000000 +0200
-+++ logrotate-3.8.7/logrotate.c 2014-03-23 15:10:21.000000000 +0100
-@@ -1,4 +1,4 @@
--#include <sys/queue.h>
-+#include "queue.h"
- /* alloca() is defined in stdlib.h in NetBSD */
- #ifndef __NetBSD__
- #include <alloca.h>
diff --git a/package/logrotate/patches/patch-logrotate_h b/package/logrotate/patches/patch-logrotate_h
deleted file mode 100644
index 7bc3c06ef..000000000
--- a/package/logrotate/patches/patch-logrotate_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- logrotate-3.8.7.orig/logrotate.h 2013-06-10 13:29:16.000000000 +0200
-+++ logrotate-3.8.7/logrotate.h 2014-03-23 15:11:06.000000000 +0100
-@@ -2,7 +2,7 @@
- #define H_LOGROTATE
-
- #include <sys/types.h>
--#include <sys/queue.h>
-+#include "queue.h"
- #include <glob.h>
-
- #include "config.h"