[meta-webserver][PATCH 3/4] webmin: upgrade 2.641 -> 2.653

Upstream changes:
 * 2.650: new Systemd Services, GRUB 2, and Kea DHCP modules; WebSocket
   proxy support in Servers Index; Alpine Linux support; Let's Encrypt
   IP-based certificate support; editable SSH public keys in Users and
   Groups.
 * 2.651: Certbot certificate request/renewal fixes; fix live activation
   of Linux bond interfaces.
 * 2.652: global per-user ACL to block URL downloads from non-public IPs;
   fix hex HTML entity recognition; fix session checks with HMAC session
   keys; fix Usermin switching to use one-time login URLs.
 * 2.653: fix missing xmlrpc-lib.pl; fix partially installed Debian
   package listing; Authentic theme improvements.

Recipe changes:
 * Drop init-exclude.patch: both hunks (init/index.cgi commented-out
   runlevel loop and init/init-lib.pl exclude= support) are now
   incorporated in upstream webmin 2.653.
 * Refresh net-generic.patch: upstream added alpine-linux to the
   os_support line in net/module.info; refresh the patch context.
 * Refresh net-lib.pl.patch: context shifted by 4 lines with fuzz 1;
   refreshed against 2.653 (same fallback to debian-linux-lib.pl).
 * Remove webmin-openrc-init from do_install: webmin 2.653 ships a new
   webmin-openrc-init script that references /sbin/openrc-run, which is
   not available on systemd-based distros; remove the file to avoid an
   unresolvable RDEPENDS QA failure.

Signed-off-by: Khem Raj <[email protected]>
---
 .../webmin/files/net-generic.patch            | 24 +++++++++++++------
 .../webmin/files/net-lib.pl.patch             |  8 ++++---
 .../{webmin_2.641.bb => webmin_2.653.bb}      |  4 ++--
 3 files changed, 24 insertions(+), 12 deletions(-)
 rename meta-webserver/recipes-webadmin/webmin/{webmin_2.641.bb => webmin_2.653.bb} (98%)

diff --git a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
index cd9a522bb6..30f1d3dcc4 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
@@ -1,20 +1,30 @@
 Add support for configuring network interfaces on a generic linux system
 
+Refreshed for webmin 2.653 (upstream added alpine-linux to os_support).
+
 Upstream-Status: Inappropriate [config]
 
 Signed-off-by: Paul Eggleton <[email protected]>
+---
+ net/generic-linux-lib.pl | 2 ++
+ net/module.info          | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/net/generic-linux-lib.pl b/net/generic-linux-lib.pl
+new file mode 100644
+--- /dev/null
++++ b/net/generic-linux-lib.pl
+@@ -0,0 +1,2 @@
++do 'linux-lib.pl';
++
+diff --git a/net/module.info b/net/module.info
 --- a/net/module.info
 +++ b/net/module.info
 @@ -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
+-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 alpine-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 alpine-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux
  desc=Network Configuration
  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 @@
-+do 'linux-lib.pl';
-+
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 949525dfd7..cacd8c94f2 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch
@@ -3,15 +3,17 @@ Upstream-Status: Inappropriate [config]
 XXX: need to work out a better fix.
 
 Signed-off-by: Dexuan Cui <[email protected]>
+---
+ net/net-lib.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 --- a/net/net-lib.pl
 +++ b/net/net-lib.pl
-@@ -38,7 +38,7 @@ elsif ($gconfig{'os_type'} eq 'debian-li
- 	$net_mode = "netplan";
+@@ -42,7 +42,7 @@ elsif ($auto_net_mode eq "dhcpcd") {
+ 	$net_mode = "dhcpcd";
  	}
  else {
 -	do "$gconfig{'os_type'}-lib.pl";
 +	do "debian-linux-lib.pl";
  	$net_mode = $gconfig{'os_type'};
  	}
- 
diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_2.641.bb b/meta-webserver/recipes-webadmin/webmin/webmin_2.653.bb
similarity index 98%
rename from meta-webserver/recipes-webadmin/webmin/webmin_2.641.bb
rename to meta-webserver/recipes-webadmin/webmin/webmin_2.653.bb
index b513ec14e6..a46c3aad16 100644
--- a/meta-webserver/recipes-webadmin/webmin/webmin_2.641.bb
+++ b/meta-webserver/recipes-webadmin/webmin/webmin_2.653.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=0a6446108c96d0819d21e40b48109507"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
            file://setup.sh \
-           file://init-exclude.patch \
            file://net-generic.patch \
            file://remove-startup-option.patch \
            file://disable-version-check.patch \
@@ -19,7 +18,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
            file://mysql-config-fix.patch \
            file://webmin.service \
             "
-SRC_URI[sha256sum] = "220015eaff2b666b9bbdf2ce2bc676de72d33e5cc5f35b800b0fa14934bdb95a"
+SRC_URI[sha256sum] = "9acc680d3d45cee876f36fc8810ce68bb6e44a0365e245a4298a180e0d016696"
 UPSTREAM_CHECK_URI = "http://www.webmin.com/download.html"
 UPSTREAM_CHECK_REGEX = "webmin-(?P<pver>\d+(\.\d+)+).tar.gz"
 
@@ -91,6 +90,7 @@ do_install() {
         | tar --no-same-owner -xpf - -C ${D}${libexecdir}/webmin
 
     rm -f ${D}${libexecdir}/webmin/webmin-init
+    rm -f ${D}${libexecdir}/webmin/webmin-openrc-init
     rm -f ${D}${libexecdir}/webmin/ajaxterm/ajaxterm/configure.initd.gentoo
     rm -rf ${D}${libexecdir}/webmin/patches