CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

webmin: Upgrade to 2.111 release

Browse Source 
Drop remove-python2.3.patch since corresponding script is gone

License-Update: Formatting changes

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2024-07-11 16:43:07 -07:00
parent 85132c1621
commit 294c0251f8
No known key found for this signature in database
GPG Key ID: BB053355919D3314
7 changed files with 51 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch
View File

@ -7,58 +7,44 @@ Upstream-Status: Inappropriate
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Index: webmin-1.850/webmin/webmin-lib.pl
===================================================================
--- webmin-1.850.orig/webmin/webmin-lib.pl
+++ webmin-1.850/webmin/webmin-lib.pl
@@ -1112,28 +1112,28 @@ my %miniserv;
--- a/webmin/webmin-lib.pl
+++ b/webmin/webmin-lib.pl
@@ -1170,38 +1170,6 @@ my %miniserv;
&get_miniserv_config(\%miniserv);
&load_theme_library(); # So that UI functions work
# Need OS upgrade
-my %realos = &detect_operating_system(undef, 1);
-if (($realos{'os_version'} ne $gconfig{'os_version'} ||
- $realos{'os_type'} ne $gconfig{'os_type'}) &&
- $realos{'os_version'} && $realos{'os_type'} &&
- &foreign_available("webmin")) {
- my ($realminor) = split(/\./, $realos{'os_version'});
- my ($minor) = split(/\./, $gconfig{'os_version'});
- if ($realos{'os_type'} eq $gconfig{'os_type'} &&
- $realminor == $minor) {
- # Only the minor version number changed - no need to apply
- &apply_new_os_version(\%realos);
-# Need OS upgrade, but only once per day or if the system was rebooted
-my $now = time();
-my $uptime = &get_system_uptime();
-if (&foreign_available("webmin")) {
- my %realos;
- my @st = stat($realos_cache_file);
- if (!@st || $now - $st[9] > 24*60*60 ||
- $uptime && $now - $st[9] > $uptime) {
- %realos = &detect_operating_system(undef, 1);
- &write_file($realos_cache_file, \%realos);
- }
- else {
- # Large enough change to tell the user
- push(@notifs,
- &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi").
- &text('os_incorrect', $realos{'real_os_type'},
- $realos{'real_os_version'})."<p>\n".
- &read_file($realos_cache_file, \%realos);
- }
- if (($realos{'os_version'} ne $gconfig{'os_version'} ||
- $realos{'real_os_version'} ne $gconfig{'real_os_version'} ||
- $realos{'os_type'} ne $gconfig{'os_type'}) &&
- $realos{'os_version'} && $realos{'os_type'} &&
- &foreign_available("webmin")) {
- # Tell the user that OS version was updated
- push(@notifs,
- &ui_form_start("@{[&get_webprefix()]}/webmin/fix_os.cgi").
- &text('os_incorrect',
- $realos{'real_os_type'},
- $realos{'real_os_version'}).
- &show_os_release_notes($realos{'real_os_version'}).
- "<p>\n".
- &ui_form_end([ [ undef, $text{'os_fix'} ] ])
- );
- }
- }
+#my %realos = &detect_operating_system(undef, 1);
+#if (($realos{'os_version'} ne $gconfig{'os_version'} ||
+# $realos{'os_type'} ne $gconfig{'os_type'}) &&
+# $realos{'os_version'} && $realos{'os_type'} &&
+# &foreign_available("webmin")) {
+# my ($realminor) = split(/\./, $realos{'os_version'});
+# my ($minor) = split(/\./, $gconfig{'os_version'});
+# if ($realos{'os_type'} eq $gconfig{'os_type'} &&
+# $realminor == $minor) {
+# # Only the minor version number changed - no need to apply
+# &apply_new_os_version(\%realos);
+# }
+# else {
+# # Large enough change to tell the user
+# push(@notifs,
+# &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi").
+# &text('os_incorrect', $realos{'real_os_type'},
+# $realos{'real_os_version'})."<p>\n".
+# &ui_form_end([ [ undef, $text{'os_fix'} ] ])
+# );
+# }
+# }
-
# Password close to expiry
my $warn_days = $config{'warn_days'};
if (&foreign_check("acl")) {

7
meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch
View File

@ -8,9 +8,9 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Upstream-Status: Pending
--- webmin-1.570.orig/mount/index.cgi
+++ webmin-1.570/mount/index.cgi
@@ -33,10 +33,12 @@ elsif ($config{'sort_mode'} == 1) {
--- a/mount/index.cgi
+++ b/mount/index.cgi
@@ -34,9 +34,11 @@ elsif ($config{'sort_mode'} == 1) {
}
# Build visible filesystems list
@ -18,7 +18,6 @@ Upstream-Status: Pending
foreach $m (@all) {
@minfo = @$m;
$p = &simplify_mount_path($minfo[0], $minfo[2]);
next if ($ignore{$minfo[2]});
+ next if (grep {$_ eq $minfo[2]} @excludefs);
@mmodes = &mount_modes($minfo[2], $minfo[0], $minfo[1]);
$canedit = $can_edit{$minfo[2]} && !$mmodes[4] &&

7
meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch
View File

@ -10,8 +10,6 @@ Signed-off-by: Diego Rondini <diego.ml@zoho.com>
mysql/config | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/mysql/config b/mysql/config
index e5b6fb3..77bfe69 100644
--- a/mysql/config
+++ b/mysql/config
@@ -1,13 +1,13 @@
@ -33,7 +31,7 @@ index e5b6fb3..77bfe69 100644
-mysqladmin=/usr/local/mysql/bin/mysqladmin
+mysql_libs=/usr/lib
+mysqladmin=/usr/bin/mysqladmin
style=0
style=1
add_mode=1
nodbi=0
@@ -15,7 +15,7 @@ access=*: *
@ -45,6 +43,3 @@ index e5b6fb3..77bfe69 100644
max_dbs=50
my_cnf=/etc/my.cnf
max_text=1000
--
2.5.0

22
meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
View File

@ -3,23 +3,19 @@ Add support for configuring network interfaces on a generic linux system
Upstream-Status: Inappropriate [config]
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Index: webmin-1.850/net/module.info
===================================================================
--- webmin-1.850.orig/net/module.info
+++ webmin-1.850/net/module.info
@@ -14,7 +14,7 @@ desc_ko_KR.UTF-8=네트워í<C592>¬ 구성
--- a/net/module.info
+++ b/net/module.info
@@ -1,7 +1,7 @@
version=2.111
longdesc=Configure boot time and active interfaces, DNS, routing and /etc/hosts.
name=Networking
desc_tr=Að Yapýlandýrmasý
desc_de=Netzwerkkonfiguration
-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
+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
desc_sk=Konfigurácia siete
desc_zh_CN=ÍøÂçÅäÖÃ
risk=low medium high
Index: webmin-1.850/net/generic-linux-lib.pl
===================================================================
readonly=1
desc=Network Configuration
category=net
--- /dev/null
+++ webmin-1.850/net/generic-linux-lib.pl
+++ b/net/generic-linux-lib.pl
@@ -0,0 +1,2 @@
+do 'linux-lib.pl';
+

12
meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch
View File

@ -4,16 +4,14 @@ XXX: need to work out a better fix.
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
diff -Nru webmin-1.570.orig//net/net-lib.pl webmin-1.570/net/net-lib.pl
--- webmin-1.570.orig//net/net-lib.pl 2011-10-03 09:01:48.000000000 +0800
+++ webmin-1.570/net/net-lib.pl 2011-10-28 13:52:56.138873664 +0800
@@ -21,7 +21,8 @@
do "$gconfig{'os_type'}-9.1-ALL-lib.pl";
--- a/net/net-lib.pl
+++ b/net/net-lib.pl
@@ -38,7 +38,7 @@ elsif ($gconfig{'os_type'} eq 'debian-li
$net_mode = "netplan";
}
else {
- do "$gconfig{'os_type'}-lib.pl";
+ #do "$gconfig{'os_type'}-lib.pl";
+ do "debian-linux-lib.pl";
$net_mode = $gconfig{'os_type'};
}
# list_hosts()

25
meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch
View File

@ -1,25 +0,0 @@
From 6f04699d5d417122b67e8118fd1955c769f17e76 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Tue, 2 Sep 2014 00:11:05 -0700
Subject: [PATCH] ajaxterm/ajaxterm/qweb.py: fix hardcode of python2.3
Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
ajaxterm/ajaxterm/qweb.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ajaxterm/ajaxterm/qweb.py b/ajaxterm/ajaxterm/qweb.py
index 20c5092..c658a6b 100644
--- a/ajaxterm/ajaxterm/qweb.py
+++ b/ajaxterm/ajaxterm/qweb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.3
+#!/usr/bin/env python
#
# vim:set et ts=4 fdc=0 fdn=2 fdl=0:
#
--
1.7.9.5

8
meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb → meta-webserver/recipes-webadmin/webmin/webmin_2.111.bb
View File

@ -1,7 +1,7 @@
SUMMARY = "Web-based administration interface"
HOMEPAGE = "http://www.webmin.com"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://LICENCE;md5=0373ac9f611e542ddebe1ec6394afc3c"
LIC_FILES_CHKSUM = "file://LICENCE;md5=0a6446108c96d0819d21e40b48109507"
SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
file://setup.sh \
@ -16,14 +16,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
file://proftpd-config-fix.patch \
file://net-lib.pl.patch \
file://media-tomb.patch \
file://remove-python2.3.patch \
file://mysql-config-fix.patch \
file://webmin.service \
"
SRC_URI[md5sum] = "cd6ee98f73f9418562197675b952d81b"
SRC_URI[sha256sum] = "c66caa9e4cb50d5447bc8aceb7989d2284dde060278f404b13e171c7ce1690e1"
SRC_URI[sha256sum] = "9000ce55275494802ec433e2de634289989f5d99ea2970716d7d9c97e38f2f5e"
UPSTREAM_CHECK_URI = "http://www.webmin.com/download.html"
UPSTREAM_CHECK_REGEX = "webmin-(?P<pver>\d+(\.\d+)+).tar.gz"