3 files changed, 20 insertions, 7 deletions

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 46b1f7c7b8..3315aa579b 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch
@@ -9,7 +9,7 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
 
 --- a/webmin/webmin-lib.pl
 +++ b/webmin/webmin-lib.pl
-@@ -1170,38 +1170,6 @@ my %miniserv;
+@@ -1234,52 +1234,6 @@ my %miniserv;
  &get_miniserv_config(\%miniserv);
  &load_theme_library(); # So that UI functions work
  
@@ -27,6 +27,20 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
 -       else {
 -               &read_file($realos_cache_file, \%realos);
 -               }
+-       my $new_real = $realos{'real_os_version'};
+-       my $old_real = $gconfig{'real_os_version'};
+-       $new_real =~ s/\.\d+$//;
+-       $old_real =~ s/\.\d+$//;
+-       if ($realos{'real_os_type'} eq $gconfig{'real_os_type'} &&
+-           $new_real eq $old_real &&
+-           $realos{'real_os_version'} ne $gconfig{'real_os_version'}) {
+-               # Only the minor OS version has changed, just silently update it
+-               &lock_file("$config_directory/config");
+-               $gconfig{'real_os_version'} = $realos{'real_os_version'};
+-               $gconfig{'os_version'} = $realos{'os_version'};
+-               &write_file("$config_directory/config", \%gconfig);
+-               &unlock_file("$config_directory/config");
+-               }
 -       if (($realos{'os_version'} ne $gconfig{'os_version'} ||
 -            $realos{'real_os_version'} ne $gconfig{'real_os_version'} ||
 -            $realos{'os_type'} ne $gconfig{'os_type'}) &&
diff --git a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
index 65e1d77629..cd9a522bb6 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
@@ -5,15 +5,14 @@ Upstream-Status: Inappropriate [config]
 Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
 --- a/net/module.info
 +++ b/net/module.info
-@@ -1,7 +1,7 @@
- version=2.300
- longdesc=Configure boot time and active interfaces, DNS, routing and /etc/hosts.
+@@ -1,6 +1,6 @@
  name=Networking
+ category=net
 -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
- readonly=1
  desc=Network Configuration
- category=net
+ longdesc=Configure boot time and active interfaces, DNS, routing and /etc/hosts.
+ readonly=1
 --- /dev/null
 +++ b/net/generic-linux-lib.pl
 @@ -0,0 +1,2 @@
diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_2.300.bb b/meta-webserver/recipes-webadmin/webmin/webmin_2.303.bb
index 1e46384465..f65898bf93 100644
--- a/meta-webserver/recipes-webadmin/webmin/webmin_2.300.bb
+++ b/meta-webserver/recipes-webadmin/webmin/webmin_2.303.bb
@@ -19,7 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
            file://mysql-config-fix.patch \
            file://webmin.service \
             "
-SRC_URI[sha256sum] = "1405dfd1f452c502169e07f00fb856fe31af122e484df03e1ac549a7eeec3001"
+SRC_URI[sha256sum] = "1317935427aa893159b2dae52a2860adbd9ba5482522115abd2422a4bb27c983"
 UPSTREAM_CHECK_URI = "http://www.webmin.com/download.html"
 UPSTREAM_CHECK_REGEX = "webmin-(?P<pver>\d+(\.\d+)+).tar.gz"