diff options
Diffstat (limited to 'package/logrotate')
| -rw-r--r-- | package/logrotate/Makefile | 11 | ||||
| -rw-r--r-- | package/logrotate/patches/patch-Makefile | 36 |
2 files changed, 3 insertions, 44 deletions
diff --git a/package/logrotate/Makefile b/package/logrotate/Makefile index 4701a9c0c..166edcbdb 100644 --- a/package/logrotate/Makefile +++ b/package/logrotate/Makefile @@ -4,24 +4,19 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= logrotate -PKG_VERSION:= 3.8.9 +PKG_VERSION:= 3.21.0 PKG_RELEASE:= 1 -PKG_HASH:= 700ed7ce9072a1cca324779a74797dfaefdae37ac50a817134b947c4ded1dfa7 +PKG_HASH:= 8fa12015e3b8415c121fc9c0ca53aa872f7b0702f543afda7e32b6c4900f6516 PKG_DESCR:= logfile rotation utility PKG_SECTION:= sys/misc PKG_DEPENDS:= libpopt PKG_BUILDDEP:= popt -PKG_SITES:= https://fedorahosted.org/releases/l/o/logrotate/ - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +PKG_SITES:= https://github.com/logrotate/logrotate/releases/download/$(PKG_VERSION)/ 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+= -DVERSION=\"$(PKG_VERSION)\" - logrotate-install: ${INSTALL_DIR} ${IDIR_LOGROTATE}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/sbin/logrotate ${IDIR_LOGROTATE}/usr/sbin diff --git a/package/logrotate/patches/patch-Makefile b/package/logrotate/patches/patch-Makefile deleted file mode 100644 index 9b8fec9c3..000000000 --- a/package/logrotate/patches/patch-Makefile +++ /dev/null @@ -1,36 +0,0 @@ ---- 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 ?= -+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 --LOADLIBES = -lpopt -+LIBS = -lpopt - SVNURL= svn+ssh://svn.fedorahosted.org/svn/logrotate - SVNPUBURL = http://svn.fedorahosted.org/svn/logrotate - SVNTAG = r$(subst .,-,$(VERSION)) -@@ -64,7 +65,7 @@ endif - # Red Hat Linux - ifeq ($(OS_NAME),Linux) - INSTALL = install -- BASEDIR = /usr -+ BASEDIR = $(DESTDIR)/usr - endif - - # FreeBSD -@@ -124,6 +125,7 @@ show_warning: - @echo "" - - $(PROG): $(OBJS) -+ $(CC) $(LDFLAGS) -o $(PROG) $^ $(LIBS) - - clean: - rm -f $(OBJS) $(PROG) core* .depend |