From 45847538f2d3e84066f8207adbe471bce994517d Mon Sep 17 00:00:00 2001
From: Automatic Build System <autodist@mambasoft.it>
Date: Fri, 5 Jan 2024 19:12:56 +0100
Subject: [PATCH] automatic version update by autodist [release
 1.710-1mamba;Mon Nov 03 2014]

---
 ...root.patch => webmin-1.710-install_noroot.patch | 14 +++++++-------
 webmin.spec                                        |  7 +++++--
 2 files changed, 12 insertions(+), 9 deletions(-)
 rename webmin-1.640-install_noroot.patch => webmin-1.710-install_noroot.patch (88%)

diff --git a/webmin-1.640-install_noroot.patch b/webmin-1.710-install_noroot.patch
similarity index 88%
rename from webmin-1.640-install_noroot.patch
rename to webmin-1.710-install_noroot.patch
index 2c86e51..b09d516 100644
--- a/webmin-1.640-install_noroot.patch
+++ b/webmin-1.710-install_noroot.patch
@@ -1,12 +1,12 @@
-diff -Nru webmin-1.420.orig/setup.sh webmin-1.420/setup.sh
---- webmin-1.420.orig/setup.sh	2008-06-04 15:08:13.000000000 +0200
-+++ webmin-1.420/setup.sh	2008-06-04 15:11:17.000000000 +0200
-@@ -33,17 +33,6 @@
+diff -Nru webmin-1.710.orig/setup.sh webmin-1.710/setup.sh
+--- webmin-1.710.orig/setup.sh	2014-09-29 22:48:02.000000000 +0200
++++ webmin-1.710/setup.sh	2014-11-03 22:19:46.272952891 +0100
+@@ -35,17 +35,6 @@
  echo "systems and common Unix services to be easily administered."
  echo ""
  
 -# Only root can run this
--id | grep "uid=0(" >/dev/null
+-id | grep -i "uid=0(" >/dev/null
 -if [ $? != "0" ]; then
 -	uname -a | grep -i CYGWIN >/dev/null
 -	if [ $? != "0" ]; then
@@ -19,7 +19,7 @@ diff -Nru webmin-1.420.orig/setup.sh webmin-1.420/setup.sh
  # Use the supplied destination directory, if any
  if [ "$1" != "" ]; then
  	wadir=$1
-@@ -364,12 +353,6 @@
+@@ -363,12 +352,6 @@
  		echo ""
  		exit 12
  	fi
@@ -32,7 +32,7 @@ diff -Nru webmin-1.420.orig/setup.sh webmin-1.420/setup.sh
  	printf "Login name (default admin): "
  	if [ "$login" = "" ]; then
  		read login
-@@ -740,45 +740,6 @@
+@@ -747,45 +730,6 @@
  	echo ""
  fi
  
diff --git a/webmin.spec b/webmin.spec
index a97e094..3f4b8f1 100644
--- a/webmin.spec
+++ b/webmin.spec
@@ -1,5 +1,5 @@
 Name:          webmin
-Version:       1.690
+Version:       1.710
 Release:       1mamba
 Summary:       A web-based interface for system administration for Unix
 Group:         Applications/Web
@@ -10,7 +10,7 @@ URL:           http://www.webmin.com/index.html
 Source:        http://prdownloads.sourceforge.net/webadmin/webmin-%{version}.tar.gz
 Source1:       webmin-initscript
 Source2:       webmin-desktop
-Patch0:        %{name}-1.640-install_noroot.patch
+Patch0:        %{name}-1.710-install_noroot.patch
 Patch1:        %{name}-1.510-openmamba.patch
 License:       GPL
 BuildRequires: perl-Net-SSLeay >= 1.25
@@ -130,6 +130,9 @@ exit 0
 %doc LICENCE README
 
 %changelog
+* Mon Nov 03 2014 Automatic Build System <autodist@mambasoft.it> 1.710-1mamba
+- automatic version update by autodist
+
 * Thu May 22 2014 Automatic Build System <autodist@mambasoft.it> 1.690-1mamba
 - automatic version update by autodist