summaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
Diffstat (limited to 'meta-webserver')
-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)14
-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
-rw-r--r--meta-webserver/recipes-webadmin/netdata/netdata/0001-cmake-Add-check-for-64bit-builtin-atomics.patch51
-rw-r--r--meta-webserver/recipes-webadmin/netdata/netdata/netdata-volatiles.conf5
-rw-r--r--meta-webserver/recipes-webadmin/netdata/netdata_1.47.1.bb (renamed from meta-webserver/recipes-webadmin/netdata/netdata_1.44.3.bb)30
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch76
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch7
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch7
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/net-generic.patch22
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch12
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch25
-rw-r--r--meta-webserver/recipes-webadmin/webmin/webmin_2.202.bb (renamed from meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb)8
19 files changed, 182 insertions, 150 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..364b4c674 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,6 +37,14 @@ 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)}"
@@ -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/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
diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/0001-cmake-Add-check-for-64bit-builtin-atomics.patch b/meta-webserver/recipes-webadmin/netdata/netdata/0001-cmake-Add-check-for-64bit-builtin-atomics.patch
new file mode 100644
index 000000000..d8ad69cec
--- /dev/null
+++ b/meta-webserver/recipes-webadmin/netdata/netdata/0001-cmake-Add-check-for-64bit-builtin-atomics.patch
@@ -0,0 +1,51 @@
1From 1e8fbb6da4e5ee44fe24c078aae1930d759f0ba3 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 17 Sep 2024 05:29:13 +0000
4Subject: [PATCH] cmake: Add check for 64bit builtin atomics
5
6Compilers for some architectures e.g. RISCV32 do not have 64bit atomics
7therefore, its important to deduce that and use it to pass right flags to
8compiler to use them, e.g. h2o module
9
10Fixes
11nection.c.o): in function `h2o_create_connection':
12| /usr/src/debug/netdata/1.47.1/src/web/server/h2o/libh2o/include/h2o.h:1917:(.text.create_conn+0x5e): undefined reference to `__sync_add_and_fetch_8'
13| collect2: error: ld returned 1 exit status
14
15Upstream-Status: Submitted [https://github.com/netdata/netdata/pull/18565]
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 CMakeLists.txt | 13 +++++++++++++
19 1 file changed, 13 insertions(+)
20
21Index: netdata-v1.47.1/CMakeLists.txt
22===================================================================
23--- netdata-v1.47.1.orig/CMakeLists.txt
24+++ netdata-v1.47.1/CMakeLists.txt
25@@ -448,6 +448,15 @@ int main() {
26 }
27 " HAVE_BUILTIN_ATOMICS)
28
29+check_cxx_source_compiles("
30+#include <stdint.h>
31+int main(void) {
32+ uint64_t a;
33+ __sync_add_and_fetch(&a, 1);
34+ return 0;
35+}
36+" ARCH_SUPPORTS_64BIT_ATOMICS)
37+
38 check_c_source_compiles("
39 void my_printf(char const *s, ...) __attribute__((format(gnu_printf, 1, 2)));
40 int main() { return 0; }
41@@ -523,6 +532,10 @@ if(OS_FREEBSD OR OS_MACOS)
42 set(HAVE_BUILTIN_ATOMICS True)
43 endif()
44
45+if (ENABLE_H2O AND NOT ARCH_SUPPORTS_64BIT_ATOMICS)
46+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DH2O_NO_64BIT_ATOMICS")
47+endif (NOT ARCH_SUPPORTS_64BIT_ATOMICS)
48+
49 # openssl/crypto
50 set(ENABLE_OPENSSL True)
51 pkg_check_modules(TLS IMPORTED_TARGET openssl)
diff --git a/meta-webserver/recipes-webadmin/netdata/netdata/netdata-volatiles.conf b/meta-webserver/recipes-webadmin/netdata/netdata/netdata-volatiles.conf
new file mode 100644
index 000000000..f34254207
--- /dev/null
+++ b/meta-webserver/recipes-webadmin/netdata/netdata/netdata-volatiles.conf
@@ -0,0 +1,5 @@
1d /run/netdata 0755 netdata netdata -
2d /var/cache/netdata 0755 netdata netdata -
3d /var/lib/netdata/cloud.d 0755 netdata netdata -
4d /var/lib/netdata/registry 0755 netdata netdata -
5d /var/log/netdata 0755 netdata netdata -
diff --git a/meta-webserver/recipes-webadmin/netdata/netdata_1.44.3.bb b/meta-webserver/recipes-webadmin/netdata/netdata_1.47.1.bb
index b06a5df31..5b38d401c 100644
--- a/meta-webserver/recipes-webadmin/netdata/netdata_1.44.3.bb
+++ b/meta-webserver/recipes-webadmin/netdata/netdata_1.47.1.bb
@@ -5,15 +5,16 @@ HOMEPAGE = "https://github.com/netdata/netdata/"
5LICENSE = "GPL-3.0-only" 5LICENSE = "GPL-3.0-only"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" 6LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24"
7 7
8DEPENDS += "json-c libuv libyaml util-linux zlib " 8DEPENDS += "json-c libuv libyaml util-linux zlib lz4"
9 9
10SRC_URI = "\ 10SRC_URI = "\
11 https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \ 11 https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \
12 file://0001-cmake-Add-check-for-64bit-builtin-atomics.patch \
12 file://netdata.conf \ 13 file://netdata.conf \
13 file://netdata.service \ 14 file://netdata.service \
15 file://netdata-volatiles.conf \
14" 16"
15 17SRC_URI[sha256sum] = "fb970a4b571ffd542b7d24220ef806a4c1b56c535e0f549a9978860a9f1dcc9c"
16SRC_URI[sha256sum] = "50df30a9aaf60d550eb8e607230d982827e04194f7df3eba0e83ff7919270ad2"
17 18
18UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/tags" 19UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/tags"
19UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P<pver>\d+(?:\.\d+)*)" 20UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P<pver>\d+(?:\.\d+)*)"
@@ -23,7 +24,9 @@ S = "${WORKDIR}/${BPN}-v${PV}"
23# Stop sending anonymous statistics to Google Analytics 24# Stop sending anonymous statistics to Google Analytics
24NETDATA_ANONYMOUS ??= "enabled" 25NETDATA_ANONYMOUS ??= "enabled"
25 26
26inherit pkgconfig autotools-brokensep useradd systemd 27inherit pkgconfig cmake useradd systemd
28
29TARGET_CC_ARCH:append:libc-musl = " -D_LARGEFILE64_SOURCE"
27 30
28LIBS:toolchain-clang:x86 = "-latomic" 31LIBS:toolchain-clang:x86 = "-latomic"
29LIBS:riscv64 = "-latomic" 32LIBS:riscv64 = "-latomic"
@@ -40,23 +43,32 @@ SYSTEMD_AUTO_ENABLE:${PN} = "enable"
40USERADD_PACKAGES = "${PN}" 43USERADD_PACKAGES = "${PN}"
41USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" 44USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata"
42 45
43PACKAGECONFIG ??= "openssl" 46PACKAGECONFIG ??= "openssl freeipmi ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
44PACKAGECONFIG[cloud] = "--enable-cloud, --disable-cloud," 47PACKAGECONFIG[brotli] = ",,brotli"
45PACKAGECONFIG[lz4] = "--enable-lz4, --disable-lz4, lz4" 48PACKAGECONFIG[cloud] = "-DENABLE_CLOUD=ON,-DENABLE_CLOUD=OFF,"
46PACKAGECONFIG[openssl] = "--enable-openssl, --disable-openssl, openssl" 49PACKAGECONFIG[openssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl"
50PACKAGECONFIG[freeipmi] = "-DENABLE_PLUGIN_FREEIPMI=ON,-DENABLE_PLUGIN_FREEIPMI=OFF,freeipmi"
51PACKAGECONFIG[nfacct] = "-DENABLE_PLUGIN_NFACCT=ON,-DENABLE_PLUGIN_NFACCT=OFF,libmnl"
52# needs meta-virtualization
53PACKAGECONFIG[xenstat] = "-DENABLE_PLUGIN_XENSTAT=ON,-DENABLE_PLUGIN_XENSTAT=OFF,xen-tools"
54PACKAGECONFIG[cups] = "-DENABLE_PLUGIN_CUPS=ON,-DENABLE_PLUGIN_CUPS=OFF,cups"
55PACKAGECONFIG[systemd] = "-DENABLE_PLUGIN_SYSTEMD_JOURNAL=ON,-DENABLE_PLUGIN_SYSTEMD_JOURNAL=OFF,systemd"
47 56
48# ebpf doesn't compile (or detect) the cross compilation well 57# ebpf doesn't compile (or detect) the cross compilation well
49EXTRA_OECONF += "--disable-ebpf" 58EXTRA_OECMAKE += "-DENABLE_PLUGIN_EBPF=OFF -DENABLE_PLUGIN_GO=OFF \
59 -DENABLE_ACLK=OFF -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=OFF -DCMAKE_INSTALL_PREFIX='${base_prefix}'"
50 60
51do_install:append() { 61do_install:append() {
52 #set S UID for plugins 62 #set S UID for plugins
53 chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin 63 chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin
64 rm -rf ${D}/${localstatedir}/
54 65
55 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 66 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
56 # Install systemd unit files 67 # Install systemd unit files
57 install -d ${D}${systemd_unitdir}/system 68 install -d ${D}${systemd_unitdir}/system
58 install -m 0644 ${UNPACKDIR}/netdata.service ${D}${systemd_unitdir}/system 69 install -m 0644 ${UNPACKDIR}/netdata.service ${D}${systemd_unitdir}/system
59 sed -i -e 's,@@datadir,${datadir_native},g' ${D}${systemd_unitdir}/system/netdata.service 70 sed -i -e 's,@@datadir,${datadir_native},g' ${D}${systemd_unitdir}/system/netdata.service
71 install -Dm 0644 ${UNPACKDIR}/netdata-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/netdata.conf
60 fi 72 fi
61 73
62 # Install default netdata.conf 74 # Install default netdata.conf
diff --git a/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch
index 1ca26ca0d..46b1f7c7b 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch
@@ -7,58 +7,44 @@ Upstream-Status: Inappropriate
7 7
8Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 8Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
9 9
10Index: webmin-1.850/webmin/webmin-lib.pl 10--- a/webmin/webmin-lib.pl
11=================================================================== 11+++ b/webmin/webmin-lib.pl
12--- webmin-1.850.orig/webmin/webmin-lib.pl 12@@ -1170,38 +1170,6 @@ my %miniserv;
13+++ webmin-1.850/webmin/webmin-lib.pl 13 &get_miniserv_config(\%miniserv);
14@@ -1112,28 +1112,28 @@ my %miniserv;
15 &load_theme_library(); # So that UI functions work 14 &load_theme_library(); # So that UI functions work
16 15
17 # Need OS upgrade 16-# Need OS upgrade, but only once per day or if the system was rebooted
18-my %realos = &detect_operating_system(undef, 1); 17-my $now = time();
19-if (($realos{'os_version'} ne $gconfig{'os_version'} || 18-my $uptime = &get_system_uptime();
20- $realos{'os_type'} ne $gconfig{'os_type'}) && 19-if (&foreign_available("webmin")) {
21- $realos{'os_version'} && $realos{'os_type'} && 20- my %realos;
22- &foreign_available("webmin")) { 21- my @st = stat($realos_cache_file);
23- my ($realminor) = split(/\./, $realos{'os_version'}); 22- if (!@st || $now - $st[9] > 24*60*60 ||
24- my ($minor) = split(/\./, $gconfig{'os_version'}); 23- $uptime && $now - $st[9] > $uptime) {
25- if ($realos{'os_type'} eq $gconfig{'os_type'} && 24- %realos = &detect_operating_system(undef, 1);
26- $realminor == $minor) { 25- &write_file($realos_cache_file, \%realos);
27- # Only the minor version number changed - no need to apply
28- &apply_new_os_version(\%realos);
29- } 26- }
30- else { 27- else {
31- # Large enough change to tell the user 28- &read_file($realos_cache_file, \%realos);
32- push(@notifs, 29- }
33- &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). 30- if (($realos{'os_version'} ne $gconfig{'os_version'} ||
34- &text('os_incorrect', $realos{'real_os_type'}, 31- $realos{'real_os_version'} ne $gconfig{'real_os_version'} ||
35- $realos{'real_os_version'})."<p>\n". 32- $realos{'os_type'} ne $gconfig{'os_type'}) &&
33- $realos{'os_version'} && $realos{'os_type'} &&
34- &foreign_available("webmin")) {
35- # Tell the user that OS version was updated
36- push(@notifs,
37- &ui_form_start("@{[&get_webprefix()]}/webmin/fix_os.cgi").
38- &text('os_incorrect',
39- $realos{'real_os_type'},
40- $realos{'real_os_version'}).
41- &show_os_release_notes($realos{'real_os_version'}).
42- "<p>\n".
36- &ui_form_end([ [ undef, $text{'os_fix'} ] ]) 43- &ui_form_end([ [ undef, $text{'os_fix'} ] ])
37- ); 44- );
38- } 45- }
39- } 46- }
40+#my %realos = &detect_operating_system(undef, 1); 47-
41+#if (($realos{'os_version'} ne $gconfig{'os_version'} ||
42+# $realos{'os_type'} ne $gconfig{'os_type'}) &&
43+# $realos{'os_version'} && $realos{'os_type'} &&
44+# &foreign_available("webmin")) {
45+# my ($realminor) = split(/\./, $realos{'os_version'});
46+# my ($minor) = split(/\./, $gconfig{'os_version'});
47+# if ($realos{'os_type'} eq $gconfig{'os_type'} &&
48+# $realminor == $minor) {
49+# # Only the minor version number changed - no need to apply
50+# &apply_new_os_version(\%realos);
51+# }
52+# else {
53+# # Large enough change to tell the user
54+# push(@notifs,
55+# &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi").
56+# &text('os_incorrect', $realos{'real_os_type'},
57+# $realos{'real_os_version'})."<p>\n".
58+# &ui_form_end([ [ undef, $text{'os_fix'} ] ])
59+# );
60+# }
61+# }
62
63 # Password close to expiry 48 # Password close to expiry
64 my $warn_days = $config{'warn_days'}; 49 my $warn_days = $config{'warn_days'};
50 if (&foreign_check("acl")) {
diff --git a/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch b/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch
index 787bd8c69..7d6a2275f 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch
@@ -8,9 +8,9 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
8 8
9Upstream-Status: Pending 9Upstream-Status: Pending
10 10
11--- webmin-1.570.orig/mount/index.cgi 11--- a/mount/index.cgi
12+++ webmin-1.570/mount/index.cgi 12+++ b/mount/index.cgi
13@@ -33,10 +33,12 @@ elsif ($config{'sort_mode'} == 1) { 13@@ -34,9 +34,11 @@ elsif ($config{'sort_mode'} == 1) {
14 } 14 }
15 15
16 # Build visible filesystems list 16 # Build visible filesystems list
@@ -18,7 +18,6 @@ Upstream-Status: Pending
18 foreach $m (@all) { 18 foreach $m (@all) {
19 @minfo = @$m; 19 @minfo = @$m;
20 $p = &simplify_mount_path($minfo[0], $minfo[2]); 20 $p = &simplify_mount_path($minfo[0], $minfo[2]);
21 next if ($ignore{$minfo[2]});
22+ next if (grep {$_ eq $minfo[2]} @excludefs); 21+ next if (grep {$_ eq $minfo[2]} @excludefs);
23 @mmodes = &mount_modes($minfo[2], $minfo[0], $minfo[1]); 22 @mmodes = &mount_modes($minfo[2], $minfo[0], $minfo[1]);
24 $canedit = $can_edit{$minfo[2]} && !$mmodes[4] && 23 $canedit = $can_edit{$minfo[2]} && !$mmodes[4] &&
diff --git a/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch b/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch
index c6c1f0df7..d62353592 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch
@@ -10,8 +10,6 @@ Signed-off-by: Diego Rondini <diego.ml@zoho.com>
10 mysql/config | 18 +++++++++--------- 10 mysql/config | 18 +++++++++---------
11 1 file changed, 9 insertions(+), 9 deletions(-) 11 1 file changed, 9 insertions(+), 9 deletions(-)
12 12
13diff --git a/mysql/config b/mysql/config
14index e5b6fb3..77bfe69 100644
15--- a/mysql/config 13--- a/mysql/config
16+++ b/mysql/config 14+++ b/mysql/config
17@@ -1,13 +1,13 @@ 15@@ -1,13 +1,13 @@
@@ -33,7 +31,7 @@ index e5b6fb3..77bfe69 100644
33-mysqladmin=/usr/local/mysql/bin/mysqladmin 31-mysqladmin=/usr/local/mysql/bin/mysqladmin
34+mysql_libs=/usr/lib 32+mysql_libs=/usr/lib
35+mysqladmin=/usr/bin/mysqladmin 33+mysqladmin=/usr/bin/mysqladmin
36 style=0 34 style=1
37 add_mode=1 35 add_mode=1
38 nodbi=0 36 nodbi=0
39@@ -15,7 +15,7 @@ access=*: * 37@@ -15,7 +15,7 @@ access=*: *
@@ -45,6 +43,3 @@ index e5b6fb3..77bfe69 100644
45 max_dbs=50 43 max_dbs=50
46 my_cnf=/etc/my.cnf 44 my_cnf=/etc/my.cnf
47 max_text=1000 45 max_text=1000
48--
492.5.0
50
diff --git a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
index 6ae3dced7..f1965a788 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
@@ -3,23 +3,19 @@ Add support for configuring network interfaces on a generic linux system
3Upstream-Status: Inappropriate [config] 3Upstream-Status: Inappropriate [config]
4 4
5Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 5Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
6Index: webmin-1.850/net/module.info 6--- a/net/module.info
7=================================================================== 7+++ b/net/module.info
8--- webmin-1.850.orig/net/module.info 8@@ -1,7 +1,7 @@
9+++ webmin-1.850/net/module.info 9 version=2.202
10@@ -14,7 +14,7 @@ desc_ko_KR.UTF-8=네트워크 구성 10 longdesc=Configure boot time and active interfaces, DNS, routing and /etc/hosts.
11 name=Networking 11 name=Networking
12 desc_tr=A Yaplandrmas
13 desc_de=Netzwerkkonfiguration
14-os_support=solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux 12-os_support=solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux
15+os_support=generic-linux solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux 13+os_support=generic-linux solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux
16 desc_sk=Konfigurcia siete 14 readonly=1
17 desc_zh_CN= 15 desc=Network Configuration
18 risk=low medium high 16 category=net
19Index: webmin-1.850/net/generic-linux-lib.pl
20===================================================================
21--- /dev/null 17--- /dev/null
22+++ webmin-1.850/net/generic-linux-lib.pl 18+++ b/net/generic-linux-lib.pl
23@@ -0,0 +1,2 @@ 19@@ -0,0 +1,2 @@
24+do 'linux-lib.pl'; 20+do 'linux-lib.pl';
25+ 21+
diff --git a/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch b/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch
index bdba5e73f..949525dfd 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch
@@ -4,16 +4,14 @@ XXX: need to work out a better fix.
4 4
5Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> 5Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
6 6
7diff -Nru webmin-1.570.orig//net/net-lib.pl webmin-1.570/net/net-lib.pl 7--- a/net/net-lib.pl
8--- webmin-1.570.orig//net/net-lib.pl 2011-10-03 09:01:48.000000000 +0800 8+++ b/net/net-lib.pl
9+++ webmin-1.570/net/net-lib.pl 2011-10-28 13:52:56.138873664 +0800 9@@ -38,7 +38,7 @@ elsif ($gconfig{'os_type'} eq 'debian-li
10@@ -21,7 +21,8 @@ 10 $net_mode = "netplan";
11 do "$gconfig{'os_type'}-9.1-ALL-lib.pl";
12 } 11 }
13 else { 12 else {
14- do "$gconfig{'os_type'}-lib.pl"; 13- do "$gconfig{'os_type'}-lib.pl";
15+ #do "$gconfig{'os_type'}-lib.pl";
16+ do "debian-linux-lib.pl"; 14+ do "debian-linux-lib.pl";
15 $net_mode = $gconfig{'os_type'};
17 } 16 }
18 17
19 # list_hosts()
diff --git a/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch b/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch
deleted file mode 100644
index 75e5bd1ea..000000000
--- a/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From 6f04699d5d417122b67e8118fd1955c769f17e76 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 2 Sep 2014 00:11:05 -0700
4Subject: [PATCH] ajaxterm/ajaxterm/qweb.py: fix hardcode of python2.3
5
6Upstream-Status: Pending
7
8Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
9---
10 ajaxterm/ajaxterm/qweb.py | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13diff --git a/ajaxterm/ajaxterm/qweb.py b/ajaxterm/ajaxterm/qweb.py
14index 20c5092..c658a6b 100644
15--- a/ajaxterm/ajaxterm/qweb.py
16+++ b/ajaxterm/ajaxterm/qweb.py
17@@ -1,4 +1,4 @@
18-#!/usr/bin/python2.3
19+#!/usr/bin/env python
20 #
21 # vim:set et ts=4 fdc=0 fdn=2 fdl=0:
22 #
23--
241.7.9.5
25
diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb b/meta-webserver/recipes-webadmin/webmin/webmin_2.202.bb
index bbc59443c..18082149b 100644
--- a/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb
+++ b/meta-webserver/recipes-webadmin/webmin/webmin_2.202.bb
@@ -1,7 +1,7 @@
1SUMMARY = "Web-based administration interface" 1SUMMARY = "Web-based administration interface"
2HOMEPAGE = "http://www.webmin.com" 2HOMEPAGE = "http://www.webmin.com"
3LICENSE = "BSD-3-Clause" 3LICENSE = "BSD-3-Clause"
4LIC_FILES_CHKSUM = "file://LICENCE;md5=0373ac9f611e542ddebe1ec6394afc3c" 4LIC_FILES_CHKSUM = "file://LICENCE;md5=0a6446108c96d0819d21e40b48109507"
5 5
6SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ 6SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
7 file://setup.sh \ 7 file://setup.sh \
@@ -16,14 +16,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
16 file://proftpd-config-fix.patch \ 16 file://proftpd-config-fix.patch \
17 file://net-lib.pl.patch \ 17 file://net-lib.pl.patch \
18 file://media-tomb.patch \ 18 file://media-tomb.patch \
19 file://remove-python2.3.patch \
20 file://mysql-config-fix.patch \ 19 file://mysql-config-fix.patch \
21 file://webmin.service \ 20 file://webmin.service \
22 " 21 "
23 22SRC_URI[sha256sum] = "4f1c467aeda0ded546e69f332c768665b6a0537d6a69e609221f9465121f775e"
24SRC_URI[md5sum] = "cd6ee98f73f9418562197675b952d81b"
25SRC_URI[sha256sum] = "c66caa9e4cb50d5447bc8aceb7989d2284dde060278f404b13e171c7ce1690e1"
26
27UPSTREAM_CHECK_URI = "http://www.webmin.com/download.html" 23UPSTREAM_CHECK_URI = "http://www.webmin.com/download.html"
28UPSTREAM_CHECK_REGEX = "webmin-(?P<pver>\d+(\.\d+)+).tar.gz" 24UPSTREAM_CHECK_REGEX = "webmin-(?P<pver>\d+(\.\d+)+).tar.gz"
29 25
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-09-29 09:12:03 +0000