logrotate: bump to version 3.11.0
PATCH 1/2 logrotate: bump to version 3.11.0
Also removed both patches as they have been added to this release. Aslo removed reference to github patch in makefile as it has been added to this release as well.
--- package/logrotate/0001-make-autoreconfable.patch | 20 ------- ...-autoconf-checks-for-strndup-and-asprintf.patch | 61 ---------------------- package/logrotate/logrotate.hash | 3 +- package/logrotate/logrotate.mk | 3 +- 4 files changed, 2 insertions(+), 85 deletions(-) delete mode 100644 package/logrotate/0001-make-autoreconfable.patch delete mode 100644 package/logrotate/0002-Use-autoconf-checks-for-strndup-and-asprintf.patch
package/logrotate/0001-make-autoreconfable.patch deleted +0 -20
@@ -1,20 +0,0 @@ -Make the package autoreconfigurable - -Adjust a minor detail in configure.ac in order to make the package -compatible with the autoconf/automake versions we are using in -Buildroot. - -Signed-off-by: Beno?t Th?baudeau <[email protected]> - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -1,6 +1,6 @@ - AC_INIT([logrotate],[3.8.9]) - --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - AC_DEFINE(_GNU_SOURCE) - - AM_EXTRA_RECURSIVE_TARGETS([test])
package/logrotate/0002-Use-autoconf-checks-for-strndup-and-asprintf.patch deleted +0 -61
61 lines not on this page · raw message
package/logrotate/logrotate.hash +1 -2
@@ -1,3 +1,2 @@ # Locally calculated -sha256 db63b5932190cba941357c029b595a7fddf43539943aa1e0ca53a96136e4c5d9 logrotate-3.10.0.tar.gz -sha256 e0d360908ac506e02f08fa1ad70e17d6985045d8640f383fef8f322886d6e1e1 6a36c105587b07ad14fc937f3ee6e2eb402621a2.patch +sha256 62aa0229cfd34c7b6ea6a6736d569983bf4a3dd1f3c9e9c2efe2ffe2a0a55cf2 logrotate-3.11.0.tar.gz
package/logrotate/logrotate.mk +1 -2
@@ -4,7 +4,7 @@ # ################################################################################ -LOGROTATE_VERSION = 3.10.0 +LOGROTATE_VERSION = 3.11.0 LOGROTATE_SITE = $(call github,logrotate,logrotate,$(LOGROTATE_VERSION)) LOGROTATE_LICENSE = GPLv2+ LOGROTATE_LICENSE_FILES = COPYING
@@ -13,7 +13,6 @@ LOGROTATE_DEPENDENCIES = popt host-pkgconf LOGROTATE_AUTORECONF = YES LOGROTATE_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs popt`" LOGROTATE_CONF_OPTS = --without-selinux -LOGROTATE_PATCH = https://github.com/logrotate/logrotate/commit/6a36c105587b07ad14fc937f3ee6e2eb402621a2.patch ifeq ($(BR2_PACKAGE_ACL),y) LOGROTATE_DEPENDENCIES += acl
Signature · 1 line
2.9.3
PATCH 2/2 logrotate: enable selinux support.
Selinux is currently disabled staticly in logrotate. This patch fixes this by checking for libselinux and adding it as a dependecy if it has been selected. The configure script is set to check for libselinux by default, so I only set --without-selinux implicitly if libselinux hasn't been selected, otherwise it's left alone.
--- package/logrotate/logrotate.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
package/logrotate/logrotate.mk +6 -1
@@ -12,7 +12,12 @@ LOGROTATE_DEPENDENCIES = popt host-pkgconf # tarball does not have a generated configure script LOGROTATE_AUTORECONF = YES LOGROTATE_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs popt`" -LOGROTATE_CONF_OPTS = --without-selinux + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +LOGROTATE_DEPENDENCIES += libselinux +else +LOGROTATE_CONF_OPTS += --without-selinux +endif ifeq ($(BR2_PACKAGE_ACL),y) LOGROTATE_DEPENDENCIES += acl
Signature · 1 line
2.9.3
PATCH 2/2 logrotate: enable selinux support.
Hello,
Quoted 5 lines · Adam Duskett
Selinux is currently disabled staticly in logrotate. This patch fixes this by checking for libselinux and adding it as a dependecy if it has been selected. The configure script is set to check for libselinux by default, so I only set --without-selinux implicitly if libselinux hasn't been selected, otherwise it's left alone.
No, we really want --with-selinux. If you don't pass --with-selinux, then the default beaviour of this configure is to "check", which means that if it finds SELinux support, it enables it, otherwise it moves on with SELinux disabled.
But in Buildroot, if we enable SELinux support, we really want it. We don't want package to silently ignore it if there's some kind of error. Which is why for all optional dependencies, we always explicitly enable/disable it.
I've fixed that up and applied.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
Thomas Petazzoni
AppliedPATCH 1/2 logrotate: bump to version 3.11.0
In reply to Adam DuskettHello,
Quoted 5 lines · Adam Duskett
Also removed both patches as they have been added to this release. Aslo removed reference to github patch in makefile as it has been added to this release as well.
Signed-off-by Adam Duskett <[email protected]>
Quoted 8 lines
--- package/logrotate/0001-make-autoreconfable.patch | 20 ------- ...-autoconf-checks-for-strndup-and-asprintf.patch | 61 ---------------------- package/logrotate/logrotate.hash | 3 +- package/logrotate/logrotate.mk | 3 +- 4 files changed, 2 insertions(+), 85 deletions(-) delete mode 100644 package/logrotate/0001-make-autoreconfable.patch delete mode 100644 package/logrotate/0002-Use-autoconf-checks-for-strndup-and-asprintf.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com