From e7e9d4b989790e71702e06b26a45f3a380a715dd Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Fri, 19 Dec 2014 03:06:34 -0800 Subject: logrotate: upgrade to 3.8.8 * Upgrade to 3.8.8. * Update disable-check-different-filesystems.patch since we still need it. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../disable-check-different-filesystems.patch | 14 +++--- meta/recipes-extended/logrotate/logrotate_3.8.7.bb | 56 ---------------------- meta/recipes-extended/logrotate/logrotate_3.8.8.bb | 56 ++++++++++++++++++++++ 3 files changed, 63 insertions(+), 63 deletions(-) delete mode 100644 meta/recipes-extended/logrotate/logrotate_3.8.7.bb create mode 100644 meta/recipes-extended/logrotate/logrotate_3.8.8.bb diff --git a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch b/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch index 43068bdbd7..43ebcffbae 100644 --- a/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch +++ b/meta/recipes-extended/logrotate/logrotate/disable-check-different-filesystems.patch @@ -7,19 +7,20 @@ Upstream-Status: Submitted Signed-off-by: Robert Yang --- - config.c | 8 -------- - 1 files changed, 0 insertions(+), 8 deletions(-) + config.c | 9 --------- + 1 file changed, 9 deletions(-) diff --git a/config.c b/config.c -index a85d1df..24575b3 100644 +index e0eadb7..c23092f 100644 --- a/config.c +++ b/config.c -@@ -1453,14 +1453,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) +@@ -1515,15 +1515,6 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig) dirName, strerror(errno)); goto error; } - -- if (sb.st_dev != sb2.st_dev) { +- if (sb.st_dev != sb2.st_dev +- && !(newlog->flags & (LOG_FLAG_COPYTRUNCATE | LOG_FLAG_COPY))) { - message(MESS_ERROR, - "%s:%d olddir %s and log file %s " - "are on different devices\n", configFile, @@ -30,5 +31,4 @@ index a85d1df..24575b3 100644 } -- -1.7.4.1 - +1.7.9.5 diff --git a/meta/recipes-extended/logrotate/logrotate_3.8.7.bb b/meta/recipes-extended/logrotate/logrotate_3.8.7.bb deleted file mode 100644 index faa8e0264f..0000000000 --- a/meta/recipes-extended/logrotate/logrotate_3.8.7.bb +++ /dev/null @@ -1,56 +0,0 @@ -SUMMARY = "Rotates, compresses, removes and mails system log files" -SECTION = "console/utils" -HOMEPAGE = "https://fedorahosted.org/logrotate/" -LICENSE = "GPLv2" - -DEPENDS="coreutils popt" - -LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" - -SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz \ - file://act-as-mv-when-rotate.patch \ - file://disable-check-different-filesystems.patch \ - file://update-the-manual.patch \ - " - -SRC_URI[md5sum] = "99e08503ef24c3e2e3ff74cc5f3be213" -SRC_URI[sha256sum] = "f6ba691f40e30e640efa2752c1f9499a3f9738257660994de70a45fe00d12b64" - -PACKAGECONFIG ?= "\ - ${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ - ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ -" - -# If RPM_OPT_FLAGS is unset, it adds -g itself rather than obeying our -# optimization variables, so use it rather than EXTRA_CFLAGS. -EXTRA_OEMAKE = "\ - LFS= \ - OS_NAME='${OS_NAME}' \ - \ - 'CC=${CC}' \ - 'RPM_OPT_FLAGS=${CFLAGS}' \ - 'EXTRA_LDFLAGS=${LDFLAGS}' \ - \ - ${@base_contains('PACKAGECONFIG', 'acl', 'WITH_ACL=yes', '', d)} \ - ${@base_contains('PACKAGECONFIG', 'selinux', 'WITH_SELINUX=yes', '', d)} \ -" - -# OS_NAME in the makefile defaults to `uname -s`. The behavior for -# freebsd/netbsd is questionable, so leave it as Linux, which only sets -# INSTALL=install and BASEDIR=/usr. -OS_NAME = "Linux" - -do_compile_prepend() { - # Make sure the recompile is OK - rm -f ${B}/.depend -} - -do_install(){ - oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir} BINDIR=${bindir} - mkdir -p ${D}${sysconfdir}/logrotate.d - mkdir -p ${D}${sysconfdir}/cron.daily - mkdir -p ${D}${localstatedir}/lib - install -p -m 644 examples/logrotate-default ${D}${sysconfdir}/logrotate.conf - install -p -m 755 examples/logrotate.cron ${D}${sysconfdir}/cron.daily/logrotate - touch ${D}${localstatedir}/lib/logrotate.status -} diff --git a/meta/recipes-extended/logrotate/logrotate_3.8.8.bb b/meta/recipes-extended/logrotate/logrotate_3.8.8.bb new file mode 100644 index 0000000000..133f6d7038 --- /dev/null +++ b/meta/recipes-extended/logrotate/logrotate_3.8.8.bb @@ -0,0 +1,56 @@ +SUMMARY = "Rotates, compresses, removes and mails system log files" +SECTION = "console/utils" +HOMEPAGE = "https://fedorahosted.org/logrotate/" +LICENSE = "GPLv2" + +DEPENDS="coreutils popt" + +LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" + +SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz \ + file://act-as-mv-when-rotate.patch \ + file://update-the-manual.patch \ + file://disable-check-different-filesystems.patch \ + " + +SRC_URI[md5sum] = "49846e873dddea15964cd0355b9943ca" +SRC_URI[sha256sum] = "46a1510ef4a1f4359edd5f361112cfd1523942e85ff28e6cbb0c81bad1829d0f" + +PACKAGECONFIG ?= "\ + ${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ +" + +# If RPM_OPT_FLAGS is unset, it adds -g itself rather than obeying our +# optimization variables, so use it rather than EXTRA_CFLAGS. +EXTRA_OEMAKE = "\ + LFS= \ + OS_NAME='${OS_NAME}' \ + \ + 'CC=${CC}' \ + 'RPM_OPT_FLAGS=${CFLAGS}' \ + 'EXTRA_LDFLAGS=${LDFLAGS}' \ + \ + ${@base_contains('PACKAGECONFIG', 'acl', 'WITH_ACL=yes', '', d)} \ + ${@base_contains('PACKAGECONFIG', 'selinux', 'WITH_SELINUX=yes', '', d)} \ +" + +# OS_NAME in the makefile defaults to `uname -s`. The behavior for +# freebsd/netbsd is questionable, so leave it as Linux, which only sets +# INSTALL=install and BASEDIR=/usr. +OS_NAME = "Linux" + +do_compile_prepend() { + # Make sure the recompile is OK + rm -f ${B}/.depend +} + +do_install(){ + oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir} BINDIR=${bindir} + mkdir -p ${D}${sysconfdir}/logrotate.d + mkdir -p ${D}${sysconfdir}/cron.daily + mkdir -p ${D}${localstatedir}/lib + install -p -m 644 examples/logrotate-default ${D}${sysconfdir}/logrotate.conf + install -p -m 755 examples/logrotate.cron ${D}${sysconfdir}/cron.daily/logrotate + touch ${D}${localstatedir}/lib/logrotate.status +} -- cgit 1.2.3-korg