summaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-04-05 20:40:13 -0700
committerKhem Raj <raj.khem@gmail.com>2023-04-05 20:41:10 -0700
commitcb125e2befbfb5ccc78b11128f78b67f9a740410 (patch)
tree36b9e1cf6d698016f7fc8a77aec76d84b1622b17 /meta-webserver
parent9e42462d5ada987063d70421702839ce107d3a4c (diff)
downloadmeta-openembedded-cb125e2befbfb5ccc78b11128f78b67f9a740410.tar.gz
meta-webserver: Fix missing upstream status on patches
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r--meta-webserver/recipes-httpd/cherokee/cherokee/0001-configure.ac-Add-foreign-to-AM_INIT_AUTOMAKE.patch1
-rw-r--r--meta-webserver/recipes-httpd/cherokee/cherokee/0001-make-Do-not-build-po-files.patch1
-rw-r--r--meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch1
-rw-r--r--meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch2
-rw-r--r--meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch2
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch16
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/media-tomb.patch4
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/net-generic.patch10
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch12
9 files changed, 30 insertions, 19 deletions
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
index f3be7c6e5..b16060f2a 100644
--- 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
@@ -7,6 +7,7 @@ Fixes errors like
7| Makefile.am: error: required file './README' not found 7| Makefile.am: error: required file './README' not found
8| Makefile.am: error: required file './ChangeLog' not found 8| Makefile.am: error: required file './ChangeLog' not found
9 9
10Upstream-Status: Pending
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 11Signed-off-by: Khem Raj <raj.khem@gmail.com>
11--- 12---
12 configure.ac | 2 +- 13 configure.ac | 2 +-
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
index d4c0b6e8c..1d6a2182b 100644
--- 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
@@ -5,6 +5,7 @@ Subject: [PATCH] make: Do not build po files
5 5
6Target fails to build 6Target fails to build
7 7
8Upstream-Status: Inappropriate [Cross-compile specific]
8Signed-off-by: Khem Raj <raj.khem@gmail.com> 9Signed-off-by: Khem Raj <raj.khem@gmail.com>
9--- 10---
10 Makefile.am | 2 +- 11 Makefile.am | 2 +-
diff --git a/meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch b/meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch
index 7a229513b..6669848a0 100644
--- a/meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch
+++ b/meta-webserver/recipes-httpd/monkey/files/0001-configure-Respect-LIBS-variable-from-env.patch
@@ -6,6 +6,7 @@ Subject: [PATCH] configure: Respect LIBS variable from env
6For musl we need to pass -lexecinfo from env 6For musl we need to pass -lexecinfo from env
7this change accomodates that 7this change accomodates that
8 8
9Upstream-Status: [OE-specific]
9Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
10--- 11---
11 configure | 2 +- 12 configure | 2 +-
diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch b/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch
index 8f70fe943..b633cb0cf 100644
--- a/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch
+++ b/meta-webserver/recipes-webadmin/cockpit/files/0001-remove-tests-dep-on-gobject-intro.patch
@@ -3,6 +3,8 @@ From: Adrian Freihofer <adrian.freihofer@siemens.com>
3Date: Wed, 4 Dec 2019 17:23:46 +0100 3Date: Wed, 4 Dec 2019 17:23:46 +0100
4Subject: [PATCH] remove tests dep on gobject-intro 4Subject: [PATCH] remove tests dep on gobject-intro
5 5
6Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
6--- 8---
7 src/ws/Makefile-ws.am | 54 --------------------------------------------------- 9 src/ws/Makefile-ws.am | 54 ---------------------------------------------------
8 1 file changed, 54 deletions(-) 10 1 file changed, 54 deletions(-)
diff --git a/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch b/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch
index 48702c3d1..1e5cf09d1 100644
--- a/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch
+++ b/meta-webserver/recipes-webadmin/cockpit/files/0002-fix-makefile-use-copy-rule-for-unmodified-files.patch
@@ -3,6 +3,8 @@ From: Michael Haener <michael.haener@siemens.com>
3Date: Wed, 25 Mar 2020 08:32:07 +0100 3Date: Wed, 25 Mar 2020 08:32:07 +0100
4Subject: [PATCH] fix(makefile): use copy rule for unmodified files 4Subject: [PATCH] fix(makefile): use copy rule for unmodified files
5 5
6Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
6--- 8---
7 pkg/Makefile.am | 27 +++++++++++++++++++++++++++ 9 pkg/Makefile.am | 27 +++++++++++++++++++++++++++
8 1 file changed, 27 insertions(+) 10 1 file changed, 27 insertions(+)
diff --git a/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch b/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch
index 4212917f6..027a9d4ad 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch
@@ -1,11 +1,11 @@
1# Hack in support for an "exclude" config option for the init module, so 1Hack in support for an "exclude" config option for the init module, so
2# we can hide certain system services that shouldn't really be configurable 2we can hide certain system services that shouldn't really be configurable
3# via the web interface 3via the web interface
4# 4
5# Upstream-status: Pending 5Upstream-status: Pending
6# 6
7# Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 7Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
8# Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 8Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
9--- 9---
10 init/index.cgi | 27 ++++++++++++++------------- 10 init/index.cgi | 27 ++++++++++++++-------------
11 init/init-lib.pl | 5 +++-- 11 init/init-lib.pl | 5 +++--
diff --git a/meta-webserver/recipes-webadmin/webmin/files/media-tomb.patch b/meta-webserver/recipes-webadmin/webmin/files/media-tomb.patch
index 46f310979..dfc962bfb 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/media-tomb.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/media-tomb.patch
@@ -1,3 +1,7 @@
1add mediatomb support
2
3Upstream-Status: Pending
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
1diff -Nru webmin-1.570.bak/mediatomb/index.cgi webmin-1.570/mediatomb/index.cgi 5diff -Nru webmin-1.570.bak/mediatomb/index.cgi webmin-1.570/mediatomb/index.cgi
2--- webmin-1.570.bak/mediatomb/index.cgi 1969-12-31 16:00:00.000000000 -0800 6--- webmin-1.570.bak/mediatomb/index.cgi 1969-12-31 16:00:00.000000000 -0800
3+++ webmin-1.570/mediatomb/index.cgi 2011-10-26 10:00:05.992522036 -0700 7+++ webmin-1.570/mediatomb/index.cgi 2011-10-26 10:00:05.992522036 -0700
diff --git a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
index 554939285..6ae3dced7 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
@@ -1,8 +1,8 @@
1# Add support for configuring network interfaces on a generic linux system 1Add support for configuring network interfaces on a generic linux system
2# 2
3# Upstream-status: Not appropriate [config] 3Upstream-Status: Inappropriate [config]
4# 4
5# Signed-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 6Index: webmin-1.850/net/module.info
7=================================================================== 7===================================================================
8--- webmin-1.850.orig/net/module.info 8--- webmin-1.850.orig/net/module.info
diff --git a/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch b/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch
index d957f4a3b..358e53ab8 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch
@@ -1,9 +1,9 @@
1# Remove "start on boot" option from webmin configuration, as 1Remove "start on boot" option from webmin configuration, as
2# end-users should not need to configure this from the web interface 2end-users should not need to configure this from the web interface
3# 3
4# Upstream-status: Inappropriate 4Upstream-Status: Inappropriate [OE-specific]
5# 5
6# Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 6Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
7--- webmin-1.570.orig/webmin/index.cgi 7--- webmin-1.570.orig/webmin/index.cgi
8+++ webmin-1.570/webmin/index.cgi 8+++ webmin-1.570/webmin/index.cgi
9@@ -79,20 +79,6 @@ print &ui_buttons_start(); 9@@ -79,20 +79,6 @@ print &ui_buttons_start();