From c155bd03fd4d4fd7f73202ef70833e17d3adf43b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 26 Jul 2017 11:58:10 -0700 Subject: cherokee: Upgrade to 1.2.104+git Use git fetcher to use tip of tree, the tree does not get frequent fixes. Its not disruptive to use git fetcher Signed-off-by: Khem Raj Signed-off-by: Martin Jansa --- ...figure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch | 30 +++++++++ .../cherokee/0001-make-Do-not-build-po-files.patch | 27 ++++++++ .../recipes-httpd/cherokee/cherokee_1.2.98.bb | 69 --------------------- .../recipes-httpd/cherokee/cherokee_git.bb | 71 ++++++++++++++++++++++ 4 files changed, 128 insertions(+), 69 deletions(-) create mode 100644 meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch create mode 100644 meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch delete mode 100644 meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb create mode 100644 meta-webserver/recipes-httpd/cherokee/cherokee_git.bb (limited to 'meta-webserver') diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch new file mode 100644 index 0000000000..f3be7c6e52 --- /dev/null +++ b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch @@ -0,0 +1,30 @@ +From 4591b5b40d66c19edc73b951ad091dac639454c9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 25 Jul 2017 16:00:34 -0700 +Subject: [PATCH] configure.ac: Add foreign to AM_INIT_AUTOMAKE + +Fixes errors like +| Makefile.am: error: required file './README' not found +| Makefile.am: error: required file './ChangeLog' not found + +Signed-off-by: Khem Raj +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index d6298f27..98cab791 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -32,7 +32,7 @@ dnl Init autoconf and automake + AC_INIT([cherokee], [cherokee_version], [http://bugs.cherokee-project.com/], [cherokee]) + AC_CONFIG_SRCDIR([cherokee/server.c]) + AC_CONFIG_MACRO_DIR([m4]) +-AM_INIT_AUTOMAKE([no-define]) ++AM_INIT_AUTOMAKE([no-define foreign]) + + dnl Define version + AC_DEFINE(PACKAGE_MAJOR_VERSION, "cherokee_major_version", [Version string]) +-- +2.13.3 + diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch new file mode 100644 index 0000000000..d4c0b6e8c6 --- /dev/null +++ b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch @@ -0,0 +1,27 @@ +From e9ae3231ec188df801fe51aa95d6afec2e52db58 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 25 Jul 2017 16:14:19 -0700 +Subject: [PATCH] make: Do not build po files + +Target fails to build + +Signed-off-by: Khem Raj +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index f01278c3..eb864c36 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + ## Cherokee: Makefile.am -*- makefile -*- + +-SUBDIRS = po m4 www icons themes qa doc . admin contrib cherokee cget packages dbslayer ++SUBDIRS = m4 www icons themes qa doc . admin contrib cherokee cget packages dbslayer + SUFFIXES = .sample.pre .sample .h.pre .h .xml.pre .xml + ACLOCAL_AMFLAGS = -I m4 + +-- +2.13.3 + diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb deleted file mode 100644 index ba39f97e9d..0000000000 --- a/meta-webserver/recipes-httpd/cherokee/cherokee_1.2.98.bb +++ /dev/null @@ -1,69 +0,0 @@ -SUMMARY = "Cherokee Web Server fast and secure" -SUMMARY_cget = "Small downloader based in the Cherokee client library" -HOMEPAGE = "http://www.cherokee-project.com/" -SECTION = "network" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -PR = "r9" - -DEPENDS = "libpcre openssl mysql5 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" - -SRC_URI = "http://mirror.aarnet.edu.au/pub/${BPN}/1.2/${PV}/${BP}.tar.gz \ - file://cherokee.init \ - file://cherokee.service \ - file://cherokee-install-configured.py-once.patch \ -" -SRC_URI[md5sum] = "21b01e7d45c0e82ecc0c4257a9c27feb" -SRC_URI[sha256sum] = "042b5687b1a3db3ca818167548ce5d32c35e227c6640732dcb622a6f4a078b7d" - -inherit autotools pkgconfig binconfig update-rc.d systemd - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" -PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav" -PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" -PACKAGECONFIG[geoip] = "--with-geoip,--without-geoip,geoip" -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," - -EXTRA_OECONF = "--disable-static \ - --disable-nls \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ - --with-wwwroot=${localstatedir}/www/cherokee \ -" - -do_install_append () { - install -m 0755 -d ${D}${sysconfdir}/init.d - install -m 755 ${WORKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee - - # clean up .la files for plugins - rm -f ${D}${libdir}/cherokee/*.la - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/cherokee.service ${D}${systemd_unitdir}/system - rmdir "${D}${localstatedir}/run" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" -} - -# Put -dev near the front so we can move the .la files into it with a wildcard -PACKAGES =+ "libcherokee-server libcherokee-client libcherokee-base cget" - -FILES_cget = "${bindir}/cget" -FILES_libcherokee-server = "${libdir}/libcherokee-server${SOLIBS}" -FILES_libcherokee-client = "${libdir}/libcherokee-client${SOLIBS}" -FILES_libcherokee-base = "${libdir}/libcherokee-base${SOLIBS}" - -# Pack the htdocs -FILES_${PN} += "${localstatedir}/www/cherokee" - -CONFFILES_${PN} = " \ - ${sysconfdir}/cherokee/cherokee.conf \ - ${sysconfdir}/init.d/cherokee \ -" - -INITSCRIPT_NAME = "cherokee" -INITSCRIPT_PARAMS = "defaults 91 91" - -RPROVIDES_${PN} += "${PN}-systemd" -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "cherokee.service" diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb new file mode 100644 index 0000000000..3f7eae4c16 --- /dev/null +++ b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb @@ -0,0 +1,71 @@ +SUMMARY = "Cherokee Web Server fast and secure" +SUMMARY_cget = "Small downloader based in the Cherokee client library" +HOMEPAGE = "http://www.cherokee-project.com/" +SECTION = "network" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +DEPENDS = "unzip-native libpcre openssl mysql5 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" + +SRCREV = "75f041e2255e6dd0692db2f14611c2647dbe8425" +PV = "1.2.104+git${SRCPV}" +SRC_URI = "git://github.com/cherokee/webserver \ + file://cherokee.init \ + file://cherokee.service \ + file://cherokee-install-configured.py-once.patch \ + file://0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch \ + file://0001-make-Do-not-build-po-files.patch \ +" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep pkgconfig binconfig update-rc.d systemd pythonnative + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav" +PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap" +PACKAGECONFIG[geoip] = "--with-geoip,--without-geoip,geoip" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +EXTRA_OECONF = "--disable-static \ + --disable-nls \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ + --with-wwwroot=${localstatedir}/www/cherokee \ +" + +do_install_append () { + install -m 0755 -d ${D}${sysconfdir}/init.d + install -m 755 ${WORKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee + + # clean up .la files for plugins + rm -f ${D}${libdir}/cherokee/*.la + + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/cherokee.service ${D}${systemd_unitdir}/system + rmdir "${D}${localstatedir}/run" + rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" +} + +# Put -dev near the front so we can move the .la files into it with a wildcard +PACKAGES =+ "libcherokee-server libcherokee-client libcherokee-base cget" + +FILES_cget = "${bindir}/cget" +FILES_libcherokee-server = "${libdir}/libcherokee-server${SOLIBS}" +FILES_libcherokee-client = "${libdir}/libcherokee-client${SOLIBS}" +FILES_libcherokee-base = "${libdir}/libcherokee-base${SOLIBS}" + +# Pack the htdocs +FILES_${PN} += "${localstatedir}/www/cherokee" + +CONFFILES_${PN} = " \ + ${sysconfdir}/cherokee/cherokee.conf \ + ${sysconfdir}/init.d/cherokee \ +" + +INITSCRIPT_NAME = "cherokee" +INITSCRIPT_PARAMS = "defaults 91 91" + +RPROVIDES_${PN} += "${PN}-systemd" +RREPLACES_${PN} += "${PN}-systemd" +RCONFLICTS_${PN} += "${PN}-systemd" +SYSTEMD_SERVICE_${PN} = "cherokee.service" -- cgit 1.2.3-korg