summaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-httpd
diff options
context:
space:
mode:
Diffstat (limited to 'meta-webserver/recipes-httpd')
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch9
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch10
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch9
-rw-r--r--meta-webserver/recipes-httpd/apache2/apache2_2.4.62.bb (renamed from meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb)16
-rw-r--r--meta-webserver/recipes-httpd/cherokee/cherokee/0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch47
-rw-r--r--meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch31
-rw-r--r--meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch28
-rw-r--r--meta-webserver/recipes-httpd/cherokee/cherokee/cherokee-install-configured.py-once.patch40
-rw-r--r--meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init32
-rw-r--r--meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.service10
-rw-r--r--meta-webserver/recipes-httpd/cherokee/cherokee_git.bb79
-rw-r--r--meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb1
-rw-r--r--meta-webserver/recipes-httpd/nginx/nginx.inc24
-rw-r--r--meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb10
-rw-r--r--meta-webserver/recipes-httpd/nginx/nginx_1.26.2.bb (renamed from meta-webserver/recipes-httpd/nginx/nginx_1.26.0.bb)2
-rw-r--r--meta-webserver/recipes-httpd/nginx/nginx_1.27.1.bb10
16 files changed, 55 insertions, 303 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch b/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch
index bbe8b325b..64edeb593 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch
@@ -1,4 +1,4 @@
1From 5074ab3425e5f1e01fd9cfa2d9b7300ea1b3f38f Mon Sep 17 00:00:00 2001 1From d1f0389e699e64f3e329c0ce509f79d969a76114 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com> 2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Tue, 17 Jul 2012 11:27:39 +0100 3Date: Tue, 17 Jul 2012 11:27:39 +0100
4Subject: [PATCH] apache2: bump up the core size limit if CoreDumpDirectory is 4Subject: [PATCH] apache2: bump up the core size limit if CoreDumpDirectory is
@@ -16,10 +16,10 @@ Note: upstreaming was discussed but there are competing desires;
16 1 file changed, 19 insertions(+) 16 1 file changed, 19 insertions(+)
17 17
18diff --git a/server/core.c b/server/core.c 18diff --git a/server/core.c b/server/core.c
19index 090e397..3020090 100644 19index 843b973..3b50100 100644
20--- a/server/core.c 20--- a/server/core.c
21+++ b/server/core.c 21+++ b/server/core.c
22@@ -5107,6 +5107,25 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte 22@@ -5143,6 +5143,25 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
23 } 23 }
24 apr_pool_cleanup_register(pconf, NULL, ap_mpm_end_gen_helper, 24 apr_pool_cleanup_register(pconf, NULL, ap_mpm_end_gen_helper,
25 apr_pool_cleanup_null); 25 apr_pool_cleanup_null);
@@ -45,6 +45,3 @@ index 090e397..3020090 100644
45 return OK; 45 return OK;
46 } 46 }
47 47
48--
492.25.1
50
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch b/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch
index 1abbe0c41..f8fbc4f3c 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch
@@ -1,4 +1,4 @@
1From e47cc405eadcbe37a579c375e824e20a5c53bfad Mon Sep 17 00:00:00 2001 1From b31cf12566e806e9e9c3aa01029f6bae3ada0729 Mon Sep 17 00:00:00 2001
2From: Paul Eggleton <paul.eggleton@linux.intel.com> 2From: Paul Eggleton <paul.eggleton@linux.intel.com>
3Date: Tue, 17 Jul 2012 11:27:39 +0100 3Date: Tue, 17 Jul 2012 11:27:39 +0100
4Subject: [PATCH] Log the SELinux context at startup. 4Subject: [PATCH] Log the SELinux context at startup.
@@ -14,7 +14,7 @@ Note: unlikely to be any interest in this upstream
14 2 files changed, 31 insertions(+) 14 2 files changed, 31 insertions(+)
15 15
16diff --git a/configure.in b/configure.in 16diff --git a/configure.in b/configure.in
17index 352711a..f58620f 100644 17index 6319903..bffd8a1 100644
18--- a/configure.in 18--- a/configure.in
19+++ b/configure.in 19+++ b/configure.in
20@@ -514,6 +514,11 @@ gettid 20@@ -514,6 +514,11 @@ gettid
@@ -30,7 +30,7 @@ index 352711a..f58620f 100644
30 # On Linux before glibc 2.30, gettid() is only usable via syscall() 30 # On Linux before glibc 2.30, gettid() is only usable via syscall()
31 AC_CACHE_CHECK([for gettid() via syscall], ap_cv_gettid, 31 AC_CACHE_CHECK([for gettid() via syscall], ap_cv_gettid,
32diff --git a/server/core.c b/server/core.c 32diff --git a/server/core.c b/server/core.c
33index 30b317e..81f145f 100644 33index 3b50100..e0c7c7f 100644
34--- a/server/core.c 34--- a/server/core.c
35+++ b/server/core.c 35+++ b/server/core.c
36@@ -65,6 +65,10 @@ 36@@ -65,6 +65,10 @@
@@ -44,7 +44,7 @@ index 30b317e..81f145f 100644
44 /* LimitRequestBody handling */ 44 /* LimitRequestBody handling */
45 #define AP_LIMIT_REQ_BODY_UNSET ((apr_off_t) -1) 45 #define AP_LIMIT_REQ_BODY_UNSET ((apr_off_t) -1)
46 #define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 1<<30) /* 1GB */ 46 #define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 1<<30) /* 1GB */
47@@ -5139,6 +5143,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte 47@@ -5162,6 +5166,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
48 } 48 }
49 #endif 49 #endif
50 50
@@ -73,5 +73,3 @@ index 30b317e..81f145f 100644
73 return OK; 73 return OK;
74 } 74 }
75 75
76--
772.40.0
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch b/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch
index dc5b5c88f..4bc2ad6d3 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch
+++ b/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch
@@ -1,4 +1,4 @@
1From 443d15b91d4e4979d92405610303797663f31102 Mon Sep 17 00:00:00 2001 1From 980eadecc128bbbe1233e5d89268be24d14e1873 Mon Sep 17 00:00:00 2001
2From: echo <fei.geng@windriver.com> 2From: echo <fei.geng@windriver.com>
3Date: Tue, 28 Apr 2009 03:11:06 +0000 3Date: Tue, 28 Apr 2009 03:11:06 +0000
4Subject: [PATCH] Fix perl install directory to /usr/bin 4Subject: [PATCH] Fix perl install directory to /usr/bin
@@ -16,10 +16,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
16 1 file changed, 1 insertion(+), 4 deletions(-) 16 1 file changed, 1 insertion(+), 4 deletions(-)
17 17
18diff --git a/configure.in b/configure.in 18diff --git a/configure.in b/configure.in
19index 4df3ff3..4eeb609 100644 19index 4ce0fee..0362f52 100644
20--- a/configure.in 20--- a/configure.in
21+++ b/configure.in 21+++ b/configure.in
22@@ -903,10 +903,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", 22@@ -936,10 +936,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
23 AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types", 23 AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types",
24 [Location of the MIME types config file, relative to the Apache root directory]) 24 [Location of the MIME types config file, relative to the Apache root directory])
25 25
@@ -31,6 +31,3 @@ index 4df3ff3..4eeb609 100644
31 AC_SUBST(perlbin) 31 AC_SUBST(perlbin)
32 32
33 dnl If we are running on BSD/OS, we need to use the BSD .include syntax. 33 dnl If we are running on BSD/OS, we need to use the BSD .include syntax.
34--
352.25.1
36
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.62.bb
index 1632c6ccb..7d6ea27e7 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.62.bb
@@ -27,7 +27,7 @@ SRC_URI:append:class-target = " \
27 " 27 "
28 28
29LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" 29LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
30SRC_URI[sha256sum] = "ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e321323" 30SRC_URI[sha256sum] = "674188e7bf44ced82da8db522da946849e22080d73d16c93f7f4df89e25729ec"
31 31
32S = "${WORKDIR}/httpd-${PV}" 32S = "${WORKDIR}/httpd-${PV}"
33 33
@@ -37,12 +37,20 @@ DEPENDS = "openssl expat pcre apr apr-util apache2-native "
37 37
38CVE_PRODUCT = "apache:http_server" 38CVE_PRODUCT = "apache:http_server"
39 39
40CVE_STATUS[CVE-1999-0289] = "not-applicable-platform: The current version (2.4.6) is not affected. It only applies for Windows"
41CVE_STATUS[CVE-2007-0450] = "not-applicable-platform: The current version (2.4.6) is not affected. It only applies for Windows."
42CVE_STATUS[CVE-2007-6421] = "cpe-incorrect: The current version (2.4.59) is not affected by the CVE which affects versions from 2.2 (incl.) to 2.2.8 (excl.)"
43CVE_STATUS[CVE-2007-6422] = "cpe-incorrect: The current version (2.4.59) is not affected by the CVE which affects versions from 2.2 (incl.) to 2.2.8 (excl.)"
44CVE_STATUS[CVE-2007-6423] = "cpe-incorrect: The current version (2.4.59) is not affected by the CVE which affects versions from 2.2.x to 2.2.7-dev"
45CVE_STATUS[CVE-2008-2168] = "cpe-incorrect: The current version (2.4.59) is not affected by the CVE which affects versions up to 2.2.6 (excl.)"
46CVE_STATUS[CVE-2010-0425] = "not-applicable-platform: The current version (2.4.6) is not affected. It only applies for Windows."
47
40SSTATE_SCAN_FILES += "apxs config_vars.mk config.nice" 48SSTATE_SCAN_FILES += "apxs config_vars.mk config.nice"
41 49
42PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" 50PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}"
43PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux" 51PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux"
44PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap --disable-authnz-ldap,openldap" 52PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap --disable-authnz-ldap,openldap"
45PACKAGECONFIG[zlib] = "--enable-deflate,,zlib,zlib" 53PACKAGECONFIG[zlib] = "--enable-deflate --with-zlib=${STAGING_LIBDIR}/../,,zlib,zlib"
46 54
47CFLAGS:append = " -DPATH_MAX=4096" 55CFLAGS:append = " -DPATH_MAX=4096"
48 56
@@ -182,6 +190,10 @@ INITSCRIPT_PARAMS = "defaults 91 20"
182SYSTEMD_SERVICE:${PN} = "apache2.service" 190SYSTEMD_SERVICE:${PN} = "apache2.service"
183SYSTEMD_AUTO_ENABLE:${PN} = "enable" 191SYSTEMD_AUTO_ENABLE:${PN} = "enable"
184 192
193ALTERNATIVE:${PN} = "httpd"
194ALTERNATIVE_LINK_NAME[httpd] = "${sbindir}/httpd"
195ALTERNATIVE_PRIORITY[httpd] = "60"
196
185ALTERNATIVE:${PN}-doc = "htpasswd.1" 197ALTERNATIVE:${PN}-doc = "htpasswd.1"
186ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" 198ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1"
187 199
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch
deleted file mode 100644
index 0f4384275..000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From c73415021f3f3b2b30062ab74b25fe49c51c2242 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 10 Nov 2019 15:59:44 -0800
4Subject: [PATCH] common-internal.h: Define LLONG_MAX if undefined
5
6time_t can also be long long type, therefore check for that as fallback
7Fixes build on 32bit hosts where time_t is fixed for Y2K38
8
9Upstream-Status: Pending
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 cherokee/common-internal.h | 12 ++++++++++++
13 1 file changed, 12 insertions(+)
14
15diff --git a/cherokee/common-internal.h b/cherokee/common-internal.h
16index 5c28da97..5646ec0f 100644
17--- a/cherokee/common-internal.h
18+++ b/cherokee/common-internal.h
19@@ -222,6 +222,16 @@ char *strcasestr(char *s, char *find);
20 # endif
21 #endif
22
23+/* Long Long limit
24+ */
25+#ifndef LLONG_MAX
26+# if (__SIZEOF_LONG_LONG__ == 8)
27+# define LLONG_MAX 0x7fffffffffffffffLL
28+# else
29+# error "Can't define LLONG_MAX"
30+# endif
31+#endif
32+
33 /* time_t limit
34 */
35 #ifndef TIME_MAX
36@@ -229,6 +239,8 @@ char *strcasestr(char *s, char *find);
37 # define TIME_MAX ((time_t)INT_MAX)
38 # elif (SIZEOF_TIME_T == SIZEOF_LONG)
39 # define TIME_MAX ((time_t)LONG_MAX)
40+# elif (SIZEOF_TIME_T == __SIZEOF_LONG_LONG__)
41+# define TIME_MAX ((time_t)LLONG_MAX)
42 # else
43 # error "Can't define TIME_MAX"
44 # endif
45--
462.24.0
47
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
deleted file mode 100644
index b16060f2a..000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 4591b5b40d66c19edc73b951ad091dac639454c9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 25 Jul 2017 16:00:34 -0700
4Subject: [PATCH] configure.ac: Add foreign to AM_INIT_AUTOMAKE
5
6Fixes errors like
7| Makefile.am: error: required file './README' not found
8| Makefile.am: error: required file './ChangeLog' not found
9
10Upstream-Status: Pending
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 configure.ac | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/configure.ac b/configure.ac
17index d6298f27..98cab791 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -32,7 +32,7 @@ dnl Init autoconf and automake
21 AC_INIT([cherokee], [cherokee_version], [http://bugs.cherokee-project.com/], [cherokee])
22 AC_CONFIG_SRCDIR([cherokee/server.c])
23 AC_CONFIG_MACRO_DIR([m4])
24-AM_INIT_AUTOMAKE([no-define])
25+AM_INIT_AUTOMAKE([no-define foreign])
26
27 dnl Define version
28 AC_DEFINE(PACKAGE_MAJOR_VERSION, "cherokee_major_version", [Version string])
29--
302.13.3
31
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
deleted file mode 100644
index 1d6a2182b..000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From e9ae3231ec188df801fe51aa95d6afec2e52db58 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 25 Jul 2017 16:14:19 -0700
4Subject: [PATCH] make: Do not build po files
5
6Target fails to build
7
8Upstream-Status: Inappropriate [Cross-compile specific]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 Makefile.am | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/Makefile.am b/Makefile.am
15index f01278c3..eb864c36 100644
16--- a/Makefile.am
17+++ b/Makefile.am
18@@ -1,6 +1,6 @@
19 ## Cherokee: Makefile.am -*- makefile -*-
20
21-SUBDIRS = po m4 www icons themes qa doc . admin contrib cherokee cget packages dbslayer
22+SUBDIRS = m4 www icons themes qa doc . admin contrib cherokee cget packages dbslayer
23 SUFFIXES = .sample.pre .sample .h.pre .h .xml.pre .xml
24 ACLOCAL_AMFLAGS = -I m4
25
26--
272.13.3
28
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee-install-configured.py-once.patch b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee-install-configured.py-once.patch
deleted file mode 100644
index 3336f7df7..000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee-install-configured.py-once.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 98a0f19df0a31d5649ad89d395fd1b8de5591827 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 3 Apr 2014 21:33:25 +0800
4Subject: [PATCH] admin/Makefile.am: only install configured.py once
5
6Both the two rules install-adminpyDATA and install-generatedDATA will
7install the configured.py to the same location, they can run parallel,
8and they use "install -m", which would might build failures:
9
10/usr/bin/install: setting permissions for `/path/to/configured.py': No such file or directory
11
12This is because the first install is setting the permission while the
13second install is removing the file an re-install.
14
15Only install the configured.py once will fix the problem, I think that
16there is no side effect since it installed the same file to the same
17location twice in the past.
18
19Upstream-Status: Pending
20
21Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
22---
23 admin/Makefile.am | 1 -
24 1 file changed, 1 deletion(-)
25
26diff --git a/admin/Makefile.am b/admin/Makefile.am
27index ce5937b..6f96934 100644
28--- a/admin/Makefile.am
29+++ b/admin/Makefile.am
30@@ -73,7 +73,6 @@ SystemStatsWidgets.py \
31 Wizard.py \
32 XMLServerDigest.py \
33 config_version.py \
34-configured.py \
35 consts.py \
36 util.py \
37 popen.py \
38--
391.8.2.1
40
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init
deleted file mode 100644
index 93603b84d..000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.init
+++ /dev/null
@@ -1,32 +0,0 @@
1#!/bin/sh
2DAEMON=/usr/sbin/cherokee
3CONFIG=/etc/cherokee/cherokee.conf
4PIDFILE=/var/run/cherokee.pid
5NAME="cherokee"
6DESC="Cherokee http server"
7
8test -r /etc/default/cherokee && . /etc/default/cherokee
9test -x "$DAEMON" || exit 0
10test ! -r "$CONFIG" && exit 0
11
12case "$1" in
13 start)
14 echo "Starting $DESC: "
15 start-stop-daemon --oknodo -S -x $DAEMON -- -d -C $CONFIG
16 ;;
17
18 stop)
19 echo "Stopping $DESC:"
20 start-stop-daemon -K -p $PIDFILE
21 ;;
22
23 restart)
24 $0 stop >/dev/null 2>&1
25 $0 start
26 ;;
27
28 *)
29 echo "Usage: $0 {start|stop|restart}"
30 exit 0
31 ;;
32esac
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.service b/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.service
deleted file mode 100644
index a2d703185..000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee/cherokee.service
+++ /dev/null
@@ -1,10 +0,0 @@
1[Unit]
2Description=Cherokee web server
3After=syslog.target
4
5[Service]
6Type=forking
7ExecStart=/usr/sbin/cherokee -d -C /etc/cherokee/cherokee.conf
8
9[Install]
10WantedBy=multi-user.target
diff --git a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb b/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
deleted file mode 100644
index 53d6a85ae..000000000
--- a/meta-webserver/recipes-httpd/cherokee/cherokee_git.bb
+++ /dev/null
@@ -1,79 +0,0 @@
1SUMMARY = "Cherokee Web Server fast and secure"
2SUMMARY:cget = "Small downloader based in the Cherokee client library"
3HOMEPAGE = "http://www.cherokee-project.com/"
4SECTION = "network"
5LICENSE = "GPL-2.0-only"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
7
8DEPENDS = "unzip-native libpcre openssl mysql5 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
9
10SRCREV = "9a75e65b876bcc376cb6b379dca1f7ce4a055c59"
11PV = "1.2.104+git"
12SRC_URI = "git://github.com/cherokee/webserver;branch=master;protocol=https \
13 file://cherokee.init \
14 file://cherokee.service \
15 file://cherokee-install-configured.py-once.patch \
16 file://0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch \
17 file://0001-make-Do-not-build-po-files.patch \
18 file://0001-common-internal.h-Define-LLONG_MAX-if-undefined.patch \
19"
20
21S = "${WORKDIR}/git"
22
23inherit autotools-brokensep pkgconfig binconfig update-rc.d systemd ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "pythonnative", "", d)}
24
25PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
26PACKAGECONFIG[ffmpeg] = "--with-ffmpeg,--without-ffmpeg,libav"
27PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap"
28PACKAGECONFIG[geoip] = "--with-geoip,--without-geoip,geoip"
29PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
30
31EXTRA_OECONF = "--disable-static \
32 --disable-nls \
33 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \
34 --with-wwwroot=${localstatedir}/www/cherokee \
35"
36
37do_install:append () {
38 install -m 0755 -d ${D}${sysconfdir}/init.d
39 install -m 755 ${UNPACKDIR}/cherokee.init ${D}${sysconfdir}/init.d/cherokee
40
41 # clean up .la files for plugins
42 rm -f ${D}${libdir}/cherokee/*.la
43
44 install -d ${D}${systemd_unitdir}/system
45 install -m 0644 ${UNPACKDIR}/cherokee.service ${D}${systemd_unitdir}/system
46 rmdir "${D}${localstatedir}/run"
47 rmdir --ignore-fail-on-non-empty "${D}${localstatedir}"
48}
49
50# Put -dev near the front so we can move the .la files into it with a wildcard
51PACKAGES =+ "libcherokee-server libcherokee-client libcherokee-base cget"
52
53FILES:cget = "${bindir}/cget"
54FILES:libcherokee-server = "${libdir}/libcherokee-server${SOLIBS}"
55FILES:libcherokee-client = "${libdir}/libcherokee-client${SOLIBS}"
56FILES:libcherokee-base = "${libdir}/libcherokee-base${SOLIBS}"
57
58# Pack the htdocs
59FILES:${PN} += "${localstatedir}/www/cherokee"
60
61CONFFILES:${PN} = " \
62 ${sysconfdir}/cherokee/cherokee.conf \
63 ${sysconfdir}/init.d/cherokee \
64"
65
66INITSCRIPT_NAME = "cherokee"
67INITSCRIPT_PARAMS = "defaults 91 91"
68
69RPROVIDES:${PN} += "${PN}-systemd"
70RREPLACES:${PN} += "${PN}-systemd"
71RCONFLICTS:${PN} += "${PN}-systemd"
72SYSTEMD_SERVICE:${PN} = "cherokee.service"
73
74python() {
75 if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
76 raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
77}
78
79CVE_PRODUCT += "cherokee_web_server"
diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb
index 5bf6373a8..f10262366 100644
--- a/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb
+++ b/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb
@@ -90,3 +90,4 @@ CONFFILES:${PN} = "${sysconfdir}/monkey/monkey.conf \
90 ${sysconfdir}/monkey/plugins/auth/monkey.users \ 90 ${sysconfdir}/monkey/plugins/auth/monkey.users \
91 " 91 "
92 92
93CVE_STATUS[CVE-2013-2183] = "cpe-incorrect: Current version (1.6.9) is not affected. Issue was addressed in version 1.3.0"
diff --git a/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-webserver/recipes-httpd/nginx/nginx.inc
index 2714c3d22..bcc384bd8 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx.inc
+++ b/meta-webserver/recipes-httpd/nginx/nginx.inc
@@ -38,7 +38,7 @@ NGINX_USER ?= "www"
38EXTRA_OECONF = "" 38EXTRA_OECONF = ""
39DISABLE_STATIC = "" 39DISABLE_STATIC = ""
40 40
41PACKAGECONFIG ??= "ssl ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" 41PACKAGECONFIG ??= "ssl fastcgi scgi uwsgi ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
42 42
43PACKAGECONFIG[gunzip] = "--with-http_gunzip_module,," 43PACKAGECONFIG[gunzip] = "--with-http_gunzip_module,,"
44PACKAGECONFIG[http2] = "--with-http_v2_module,," 44PACKAGECONFIG[http2] = "--with-http_v2_module,,"
@@ -48,7 +48,9 @@ PACKAGECONFIG[ipv6] = "--with-ipv6,,"
48PACKAGECONFIG[webdav] = "--with-http_dav_module,," 48PACKAGECONFIG[webdav] = "--with-http_dav_module,,"
49PACKAGECONFIG[stream] = "--with-stream,," 49PACKAGECONFIG[stream] = "--with-stream,,"
50PACKAGECONFIG[http-sub-module] = "--with-http_sub_module,," 50PACKAGECONFIG[http-sub-module] = "--with-http_sub_module,,"
51 51PACKAGECONFIG[fastcgi] = ",--without-http_fastcgi_module,"
52PACKAGECONFIG[scgi] = ",--without-http_scgi_module,"
53PACKAGECONFIG[uwsgi] = ",--without-http_uwsgi_module,"
52PACKAGECONFIG[xslt] = "--with-http_xslt_module,,libxslt" 54PACKAGECONFIG[xslt] = "--with-http_xslt_module,,libxslt"
53 55
54do_configure () { 56do_configure () {
@@ -81,9 +83,9 @@ do_configure () {
81 --error-log-path=${localstatedir}/log/nginx/error.log \ 83 --error-log-path=${localstatedir}/log/nginx/error.log \
82 --http-client-body-temp-path=/run/nginx/client_body_temp \ 84 --http-client-body-temp-path=/run/nginx/client_body_temp \
83 --http-proxy-temp-path=/run/nginx/proxy_temp \ 85 --http-proxy-temp-path=/run/nginx/proxy_temp \
84 --http-fastcgi-temp-path=/run/nginx/fastcgi_temp \ 86 ${@bb.utils.contains('PACKAGECONFIG', 'fastcgi', '--http-fastcgi-temp-path=/run/nginx/fastcgi_temp', '', d)} \
85 --http-uwsgi-temp-path=/run/nginx/uwsgi_temp \ 87 ${@bb.utils.contains('PACKAGECONFIG', 'scgi', '--http-scgi-temp-path=/run/nginx/scgi_temp', '', d)} \
86 --http-scgi-temp-path=/run/nginx/scgi_temp \ 88 ${@bb.utils.contains('PACKAGECONFIG', 'uwsgi', '--http-uwsgi-temp-path=/run/nginx/uwsgi_temp', '', d)} \
87 --pid-path=/run/nginx/nginx.pid \ 89 --pid-path=/run/nginx/nginx.pid \
88 --prefix=${prefix} \ 90 --prefix=${prefix} \
89 --with-threads \ 91 --with-threads \
@@ -132,6 +134,18 @@ do_install () {
132 # cleanup configuration folder 134 # cleanup configuration folder
133 rm ${D}${sysconfdir}/nginx/*.default 135 rm ${D}${sysconfdir}/nginx/*.default
134 136
137 # remove config files based on packageconfig
138 if ! [ "${@bb.utils.filter('PACKAGECONFIG', 'fastcgi', d)}" ]; then
139 rm -f ${D}${sysconfdir}/nginx/fastcgi.conf
140 rm -f ${D}${sysconfdir}/nginx/fastcgi_params
141 fi
142 if ! [ "${@bb.utils.filter('PACKAGECONFIG', 'scgi', d)}" ]; then
143 rm -f ${D}${sysconfdir}/nginx/scgi_params
144 fi
145 if ! [ "${@bb.utils.filter('PACKAGECONFIG', 'uwsgi', d)}" ]; then
146 rm -f ${D}${sysconfdir}/nginx/uwsgi_params
147 fi
148
135 # add additional configuration folders 149 # add additional configuration folders
136 install -d ${D}${sysconfdir}/nginx/modules-available 150 install -d ${D}${sysconfdir}/nginx/modules-available
137 install -d ${D}${sysconfdir}/nginx/modules-enabled 151 install -d ${D}${sysconfdir}/nginx/modules-enabled
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb
deleted file mode 100644
index d0371dd3c..000000000
--- a/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
1require nginx.inc
2
3# 1.24.x branch is the current stable branch, the recommended default
4# 1.25.x is the current mainline branches containing all new features
5DEFAULT_PREFERENCE = "-1"
6
7LIC_FILES_CHKSUM = "file://LICENSE;md5=79ad2eb837299421c4435dedc8897b3d"
8
9SRC_URI[sha256sum] = "64c5b975ca287939e828303fa857d22f142b251f17808dfe41733512d9cded86"
10
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.26.0.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.26.2.bb
index 0ce940d42..a279a3cf9 100644
--- a/meta-webserver/recipes-httpd/nginx/nginx_1.26.0.bb
+++ b/meta-webserver/recipes-httpd/nginx/nginx_1.26.2.bb
@@ -2,5 +2,5 @@ require nginx.inc
2 2
3LIC_FILES_CHKSUM = "file://LICENSE;md5=a6547d7e5628787ee2a9c5a3480eb628" 3LIC_FILES_CHKSUM = "file://LICENSE;md5=a6547d7e5628787ee2a9c5a3480eb628"
4 4
5SRC_URI[sha256sum] = "d2e6c8439d6c6db5015d8eaab2470ab52aef85a7bf363182879977e084370497" 5SRC_URI[sha256sum] = "627fe086209bba80a2853a0add9d958d7ebbdffa1a8467a5784c9a6b4f03d738"
6 6
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.27.1.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.27.1.bb
new file mode 100644
index 000000000..5927ecab0
--- /dev/null
+++ b/meta-webserver/recipes-httpd/nginx/nginx_1.27.1.bb
@@ -0,0 +1,10 @@
1require nginx.inc
2
3# 1.26.x branch is the current stable branch, the recommended default
4# 1.27.x is the current mainline branches containing all new features
5DEFAULT_PREFERENCE = "-1"
6
7LIC_FILES_CHKSUM = "file://LICENSE;md5=a6547d7e5628787ee2a9c5a3480eb628"
8
9SRC_URI[sha256sum] = "bd7ba68a6ce1ea3768b771c7e2ab4955a59fb1b1ae8d554fedb6c2304104bdfc"
10
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 08:40:48 +0000