[PATCH 1/2] logrotate: Bump to 3.11.0

[Romain Perier <romain.perier@collabora.com>]

This commit updates the recipe to the last upstream tag. Then, as the
tarball no longer contains the pre-generated Makefile, inherit from
autotools

Signed-off-by: Romain Perier <romain.perier@collabora.com>
---
 .../{logrotate_3.9.1.bb => logrotate_3.11.0.bb}    | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)
 rename meta/recipes-extended/logrotate/{logrotate_3.9.1.bb => logrotate_3.11.0.bb} (69%)

diff --git a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb b/meta/recipes-extended/logrotate/logrotate_3.11.0.bb
similarity index 69%
rename from meta/recipes-extended/logrotate/logrotate_3.9.1.bb
rename to meta/recipes-extended/logrotate/logrotate_3.11.0.bb
index 9c2dfe0..d72c7f0 100644
--- a/meta/recipes-extended/logrotate/logrotate_3.9.1.bb
+++ b/meta/recipes-extended/logrotate/logrotate_3.11.0.bb
@@ -3,23 +3,25 @@ SECTION = "console/utils"
 HOMEPAGE = "https://fedorahosted.org/logrotate/"
 LICENSE = "GPLv2"
 
-# TODO: logrotate 3.8.8 adds autotools/automake support, update recipe to use it.
 # TODO: Document coreutils dependency. Why not RDEPENDS? Why not busybox?
 
 DEPENDS="coreutils popt"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
 
-SRC_URI = "https://fedorahosted.org/releases/l/o/logrotate/logrotate-${PV}.tar.gz \
+# TODO: We need to decide if we github or downloads.yoctoproject.org
+SRC_URI = "https://github.com/logrotate/logrotate/releases/download/${PV}/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] = "15db4027b07b3e239297e4c87c6da2e9"
+SRC_URI[sha256sum] = "7dcb440ed2f1937459e1e06f841c6af1e564b77b2df8009147b56c8649197910"
 
-SRC_URI[md5sum] = "4492b145b6d542e4a2f41e77fa199ab0"
-SRC_URI[sha256sum] = "022769e3288c80981559a8421703c88e8438b447235e36dd3c8e97cd94c52545"
-
-PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'acl selinux', d)}"
+PACKAGECONFIG ?= "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
+"
 
 PACKAGECONFIG[acl] = ",,acl"
 PACKAGECONFIG[selinux] = ",,libselinux"
@@ -44,17 +46,14 @@ EXTRA_OEMAKE = "\
 # INSTALL=install and BASEDIR=/usr.
 OS_NAME = "Linux"
 
-do_compile_prepend() {
-    # Make sure the recompile is OK
-    rm -f ${B}/.depend
-}
+inherit autotools
 
 do_install(){
     oe_runmake install DESTDIR=${D} PREFIX=${D} MANDIR=${mandir}
     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
+    install -p -m 644 ${S}/examples/logrotate-default ${D}${sysconfdir}/logrotate.conf
+    install -p -m 755 ${S}/examples/logrotate.cron ${D}${sysconfdir}/cron.daily/logrotate
     touch ${D}${localstatedir}/lib/logrotate.status
 }
-- 
2.9.3