Skip to contentSkip to conversation

logrotate: Bump version to 3.8.9

PATCH New Benoît Thébaudeau 2 participants 4 messages Mar 30, 2015

lore
Share & tools
lore

Benoît Thébaudeau

author
#0 lore raw

PATCH 1/1 logrotate: Bump version to 3.8.9

Signed-off-by Beno?t Th?baudeau <[email protected]>
---
 package/logrotate/0001-make-autoreconfable.patch | 20 ++++++++++++++++++++
 package/logrotate/logrotate.mk                   | 23 +++++++++++++----------
 2 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 package/logrotate/0001-make-autoreconfable.patch
package/logrotate/0001-make-autoreconfable.patch new file +20 -0
new file mode 100644
index 0000000..89759d0
@@ -0,0 +1,20 @@
+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/logrotate.mk +13 -10
index c1bca48..ceae85c 100644
@@ -4,23 +4,26 @@
 #
 ################################################################################
 
-LOGROTATE_VERSION = 3.8.7
+LOGROTATE_VERSION = 3.8.9
 LOGROTATE_SITE = https://www.fedorahosted.org/releases/l/o/logrotate
 LOGROTATE_LICENSE = GPLv2+
 LOGROTATE_LICENSE_FILES = COPYING
-
 LOGROTATE_DEPENDENCIES = popt host-pkgconf
+LOGROTATE_AUTORECONF = YES
+LOGROTATE_CONF_ENV = LIBS="$(shell $(PKG_CONFIG_HOST_BINARY) --libs popt)"
+LOGROTATE_CONF_OPTS = --with-selinux=no
 
-define LOGROTATE_BUILD_CMDS
-	$(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-		LOADLIBES="$(shell $(PKG_CONFIG_HOST_BINARY) --libs popt)" \
-		-C $(@D)
-endef
+ifeq ($(BR2_PACKAGE_ACL),y)
+	LOGROTATE_DEPENDENCIES += acl
+	LOGROTATE_CONF_OPTS += --with-acl=yes
+else
+	LOGROTATE_CONF_OPTS += --with-acl=no
+endif
 
-define LOGROTATE_INSTALL_TARGET_CMDS
-	$(MAKE) PREFIX=$(TARGET_DIR) -C $(@D) install
+define LOGROTATE_INSTALL_TARGET_CONF
 	$(INSTALL) -m 0644 package/logrotate/logrotate.conf $(TARGET_DIR)/etc/logrotate.conf
 	$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/logrotate.d
 endef
+LOGROTATE_POST_INSTALL_TARGET_HOOKS += LOGROTATE_INSTALL_TARGET_CONF
 
-$(eval $(generic-package))
+$(eval $(autotools-package))
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/1 logrotate: Bump version to 3.8.9

Dear Beno?t Th?baudeau,

Quoted 2 lines · Beno?t Th?baudeau

LOGROTATE_DEPENDENCIES = popt host-pkgconf
+LOGROTATE_AUTORECONF = YES

Why do we want to autoreconf ?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#2 lore raw

PATCH 1/1 logrotate: Bump version to 3.8.9

Dear Thomas Petazzoni,

Quoted 8 lines · Thomas Petazzoni

Dear Beno?t Th?baudeau,

Quoted 2 lines · Beno?t Th?baudeau

LOGROTATE_DEPENDENCIES = popt host-pkgconf
+LOGROTATE_AUTORECONF = YES

Why do we want to autoreconf ?

Because there is no configure script coming with the package, only configure.ac. Another solution would be to run autogen.sh, which should avoid the need for 0001-make-autoreconfable.patch (required for the NEWS and the like files missing error, or these files could be touched as an alternative post-patch or pre-configure hook).

Best regards,
Beno?t

#3 lore raw

PATCH 1/1 logrotate: Bump version to 3.8.9

In reply to Benoît Thébaudeau

Dear Beno?t Th?baudeau,

Quoted 6 lines · Beno?t Th?baudeau
Signed-off-by Beno?t Th?baudeau <[email protected]>
---
 package/logrotate/0001-make-autoreconfable.patch | 20 ++++++++++++++++++++
 package/logrotate/logrotate.mk                   | 23 +++++++++++++----------
 2 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 package/logrotate/0001-make-autoreconfable.patch

I've applied, after doing a number of changes:

[Thomas:
- add comment explaining why AUTORECONF = YES is needed
- expand commit log
- use --without/--with instead of --with=yes/--with=no
- fix indentation in the ACL condition]

Especially, next time, please include more details in the commit log: a bump that converts from generic-package to autotools-package definitely deserves a comment in the commit log, as well as the usage of <pkg>_AUTORECONF = YES when it's non-obvious.

Feel free to send a follow-up patch to add a hash file for the logrotate package.

Thanks a lot,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com