mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-10-22 06:53:16 +02:00
cherokee: Remove obsolete recipe
This recipe depends on meta-python2, master branch of which has not been updated sine February 2022, see https://git.openembedded.org/meta-python2/log/?h=master Also, https://cherokee-project.com/doc/basics_requirements.html states The main Python releases targeted by our developers are 2.4, 2.5 and 2.6. Anything other than that is not guaranteed to work at the moment. Also, master branch of cherokee has not been updated since January 2023, see https://github.com/cherokee/webserver/commits/master/ Thus, remove the obsolete recipe and the associated packagegroup reference. Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Niko Mauno
Khem Raj
parent
f53b924806
commit
5cff9e8672
|
|
@ -21,7 +21,6 @@ RDEPENDS:packagegroup-meta-webserver = "\
|
|||
RDEPENDS:packagegroup-meta-webserver-http = "\
|
||||
apache-websocket \
|
||||
apache2 \
|
||||
${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "cherokee", "", d)} \
|
||||
hiawatha \
|
||||
monkey \
|
||||
nginx \
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
From c73415021f3f3b2b30062ab74b25fe49c51c2242 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 10 Nov 2019 15:59:44 -0800
|
||||
Subject: [PATCH] common-internal.h: Define LLONG_MAX if undefined
|
||||
|
||||
time_t can also be long long type, therefore check for that as fallback
|
||||
Fixes build on 32bit hosts where time_t is fixed for Y2K38
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
cherokee/common-internal.h | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/cherokee/common-internal.h b/cherokee/common-internal.h
|
||||
index 5c28da97..5646ec0f 100644
|
||||
--- a/cherokee/common-internal.h
|
||||
+++ b/cherokee/common-internal.h
|
||||
@@ -222,6 +222,16 @@ char *strcasestr(char *s, char *find);
|
||||
# endif
|
||||
#endif
|
||||
|
||||
+/* Long Long limit
|
||||
+ */
|
||||
+#ifndef LLONG_MAX
|
||||
+# if (__SIZEOF_LONG_LONG__ == 8)
|
||||
+# define LLONG_MAX 0x7fffffffffffffffLL
|
||||
+# else
|
||||
+# error "Can't define LLONG_MAX"
|
||||
+# endif
|
||||
+#endif
|
||||
+
|
||||
/* time_t limit
|
||||
*/
|
||||
#ifndef TIME_MAX
|
||||
@@ -229,6 +239,8 @@ char *strcasestr(char *s, char *find);
|
||||
# define TIME_MAX ((time_t)INT_MAX)
|
||||
# elif (SIZEOF_TIME_T == SIZEOF_LONG)
|
||||
# define TIME_MAX ((time_t)LONG_MAX)
|
||||
+# elif (SIZEOF_TIME_T == __SIZEOF_LONG_LONG__)
|
||||
+# define TIME_MAX ((time_t)LLONG_MAX)
|
||||
# else
|
||||
# error "Can't define TIME_MAX"
|
||||
# endif
|
||||
--
|
||||
2.24.0
|
||||
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From 4591b5b40d66c19edc73b951ad091dac639454c9 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
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
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
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
|
||||
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
From e9ae3231ec188df801fe51aa95d6afec2e52db58 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Tue, 25 Jul 2017 16:14:19 -0700
|
||||
Subject: [PATCH] make: Do not build po files
|
||||
|
||||
Target fails to build
|
||||
|
||||
Upstream-Status: Inappropriate [Cross-compile specific]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
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
|
||||
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
From 98a0f19df0a31d5649ad89d395fd1b8de5591827 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Yang <liezhi.yang@windriver.com>
|
||||
Date: Thu, 3 Apr 2014 21:33:25 +0800
|
||||
Subject: [PATCH] admin/Makefile.am: only install configured.py once
|
||||
|
||||
Both the two rules install-adminpyDATA and install-generatedDATA will
|
||||
install the configured.py to the same location, they can run parallel,
|
||||
and they use "install -m", which would might build failures:
|
||||
|
||||
/usr/bin/install: setting permissions for `/path/to/configured.py': No such file or directory
|
||||
|
||||
This is because the first install is setting the permission while the
|
||||
second install is removing the file an re-install.
|
||||
|
||||
Only install the configured.py once will fix the problem, I think that
|
||||
there is no side effect since it installed the same file to the same
|
||||
location twice in the past.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
---
|
||||
admin/Makefile.am | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/admin/Makefile.am b/admin/Makefile.am
|
||||
index ce5937b..6f96934 100644
|
||||
--- a/admin/Makefile.am
|
||||
+++ b/admin/Makefile.am
|
||||
@@ -73,7 +73,6 @@ SystemStatsWidgets.py \
|
||||
Wizard.py \
|
||||
XMLServerDigest.py \
|
||||
config_version.py \
|
||||
-configured.py \
|
||||
consts.py \
|
||||
util.py \
|
||||
popen.py \
|
||||
--
|
||||
1.8.2.1
|
||||
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
#!/bin/sh
|
||||
DAEMON=/usr/sbin/cherokee
|
||||
CONFIG=/etc/cherokee/cherokee.conf
|
||||
PIDFILE=/var/run/cherokee.pid
|
||||
NAME="cherokee"
|
||||
DESC="Cherokee http server"
|
||||
|
||||
test -r /etc/default/cherokee && . /etc/default/cherokee
|
||||
test -x "$DAEMON" || exit 0
|
||||
test ! -r "$CONFIG" && exit 0
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
echo "Starting $DESC: "
|
||||
start-stop-daemon --oknodo -S -x $DAEMON -- -d -C $CONFIG
|
||||
;;
|
||||
|
||||
stop)
|
||||
echo "Stopping $DESC:"
|
||||
start-stop-daemon -K -p $PIDFILE
|
||||
;;
|
||||
|
||||
restart)
|
||||
$0 stop >/dev/null 2>&1
|
||||
$0 start
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart}"
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
[Unit]
|
||||
Description=Cherokee web server
|
||||
After=syslog.target
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
ExecStart=/usr/sbin/cherokee -d -C /etc/cherokee/cherokee.conf
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1,79 +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 = "GPL-2.0-only"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
|
||||
|
||||
DEPENDS = "unzip-native libpcre openssl mysql5 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
|
||||
|
||||
SRCREV = "9a75e65b876bcc376cb6b379dca1f7ce4a055c59"
|
||||
PV = "1.2.104+git"
|
||||
SRC_URI = "git://github.com/cherokee/webserver;branch=master;protocol=https \
|
||||
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 \
|
||||
file://0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit autotools-brokensep pkgconfig binconfig update-rc.d systemd ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)}
|
||||
|
||||
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 ${UNPACKDIR}/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 ${UNPACKDIR}/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"
|
||||
|
||||
python() {
|
||||
if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
|
||||
raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
|
||||
}
|
||||
|
||||
CVE_PRODUCT += "cherokee_web_server"
|
||||
Loading…
Reference in New Issue
Block a user