automatic version update by autodist [release 1.979-1mamba;Sun Aug 08 2021]

This commit is contained in:
Automatic Build System 2024-01-05 19:12:57 +01:00
parent 1c3bf42fa6
commit 4772515ad6
6 changed files with 73 additions and 107 deletions

View File

@ -1,7 +1,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 @@
--- webmin-1.979/setup.sh.orig 2021-08-08 14:23:37.063512514 +0200
+++ webmin-1.979/setup.sh 2021-08-08 14:25:02.508128368 +0200
@@ -39,17 +39,6 @@
echo "systems and common Unix services to be easily administered."
echo ""
@ -19,20 +18,7 @@ diff -Nru webmin-1.710.orig/setup.sh webmin-1.710/setup.sh
# Use the supplied destination directory, if any
if [ "$1" != "" ]; then
wadir=$1
@@ -363,12 +352,6 @@
echo ""
exit 12
fi
- $perl -e 'use Socket; socket(FOO, PF_INET, SOCK_STREAM, getprotobyname("tcp")); setsockopt(FOO, SOL_SOCKET, SO_REUSEADDR, pack("l", 1)); bind(FOO, pack_sockaddr_in($ARGV[0], INADDR_ANY)) || exit(1); exit(0);' $port
- if [ $? != "0" ]; then
- echo "ERROR: TCP port $port is already in use by another program"
- echo ""
- exit 13
- fi
printf "Login name (default admin): "
if [ "$login" = "" ]; then
read login
@@ -747,45 +730,6 @@
@@ -786,45 +775,6 @@
echo ""
fi

View File

@ -1,51 +0,0 @@
#! /bin/bash
#
# webmin Start/Stop the webmin service
# Copyright (c) 2007 by Silvan Calarco <silvan.calarco@mambasoft.it>
#
# chkconfig: 2345 90 60
# description: a web-based interface for system administration for Unix
#
# Source function library.
. /etc/init.d/functions
WEBMIN_CONFIG=/etc/webmin
RETVAL=0
prog="webmin"
start() {
echo -n $"Starting $prog: "
$WEBMIN_CONFIG/start
evaluate_retval
echo
}
stop() {
echo -n $"Stopping $prog: "
$WEBMIN_CONFIG/stop
evaluate_retval
echo
}
restart() {
stop
start
}
case "$1" in
start)
start
;;
stop)
stop
;;
restart)
restart
;;
*)
echo $"Usage: $0 {start|stop|restart}"
exit 1
esac
exit $?

8
webmin.logrotate Normal file
View File

@ -0,0 +1,8 @@
/var/log/webmin/miniserv.error /var/log/webmin/*.log {
missingok
notifempty
sharedscripts
postrotate
/usr/bin/systemctl -q try-reload-or-restart webmin.service 2>/dev/null || true
endscript
}

5
webmin.pam Normal file
View File

@ -0,0 +1,5 @@
#%PAM-1.0
auth include system-auth
account include system-auth
password include system-auth
session include system-auth

12
webmin.service Normal file
View File

@ -0,0 +1,12 @@
[Unit]
Description=Webmin
[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/etc/webmin/start
ExecStop=/etc/webmin/stop
ExecReload=/etc/webmin/reload
[Install]
WantedBy=multi-user.target

View File

@ -1,22 +1,25 @@
Name: webmin
Version: 1.830
Version: 1.979
Release: 1mamba
Summary: A web-based interface for system administration for Unix
Group: Applications/Web
Vendor: openmamba
Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: http://www.webmin.com/index.html
URL: https://www.webmin.com/index.html
Source: http://prdownloads.sourceforge.net/webadmin/webmin-%{version}.tar.gz
Source1: webmin-initscript
Source1: webmin.service
Source2: webmin-desktop
Patch0: %{name}-1.710-install_noroot.patch
Source3: webmin.pam
Source4: webmin.logrotate
Patch0: %{name}-1.979-install_noroot.patch
Patch1: %{name}-1.510-openmamba.patch
License: GPL
## AUTOBUILDREQ-BEGIN
# perl(ctime.pl): perl requirement not resolved
# perl(timelocal.pl): perl requirement not resolved
BuildRequires: libperl
BuildRequires: perl(ctime.pl)
BuildRequires: perl(timelocal.pl)
BuildRequires: perl-CGI
BuildRequires: perl-DBI
BuildRequires: perl-Encode-HanConvert
BuildRequires: perl-Mon
@ -51,8 +54,6 @@ Requires: perl(warnings)
Requires(post):expect
#Requires: shorewall
AutoReqProv: off
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
Webmin is a web-based interface for system administration for Unix. Using any modern web browser, you can setup user accounts, Apache, DNS, file sharing and much more. Webmin removes the need to manually edit Unix configuration files like /etc/passwd, and lets you manage a system from the console or remotely.
@ -60,15 +61,14 @@ Webmin is a web-based interface for system administration for Unix. Using any mo
%prep
%setup -q
%patch0 -p1
#%patch1 -p1
rm acl/Authen-SolarisRBAC-0.1/blib/arch/auto/Authen/SolarisRBAC/SolarisRBAC.so
#rm acl/Authen-SolarisRBAC-0.1/blib/arch/auto/Authen/SolarisRBAC/SolarisRBAC.so
mkdir tmp
%build
%install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
install -d %{buildroot}{%{_sysconfdir}/webmin,%{_prefix},/var/log/webmin,/opt/webmin}
install -d %{buildroot}{%{_sysconfdir}/webmin,%{_prefix},/var/log/webmin,%{_datadir}/webmin}
export tempdir=%{_builddir}/%{name}-%{version}/tmp
@ -81,20 +81,27 @@ password=tmppass \
ssl=1 \
atboot=0 \
nostart=1 \
./setup.sh %{buildroot}/opt/webmin
noportcheck=1 \
./setup.sh %{buildroot}%{_datadir}/webmin
rm -f %{buildroot}%{_sysconfdir}/webmin/uninstall.sh
# strip buildroot from configuration files
find %{buildroot}%{_sysconfdir}/webmin -type f -exec sed -i 's|%{buildroot}||g' {} \;
# install initscript
install -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/webmin
# install systemd service
install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/webmin.service
# install desktop link
install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/applications/webmin.desktop
## install desktop link
#install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/applications/webmin.desktop
mkdir -p %{buildroot}/var/log/webmin
# install pam configuration
install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/webmin
# install logrotate configuration
install -D -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/webmin
mkdir -p %{buildroot}/var/log/webmin/modules
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@ -102,7 +109,6 @@ mkdir -p %{buildroot}/var/log/webmin
%post
# new install
if [ $1 -eq 1 ]; then
RANDOM_PASSWD=`/usr/bin/mkpasswd -l 10 -s 0`
perl -e 'print "$ARGV[0]:",crypt($ARGV[1], "\$1\$XXXXXXXX"),":0\n"' "admin" "$RANDOM_PASSWD" \
> %{_sysconfdir}/webmin/miniserv.users
@ -110,36 +116,36 @@ if [ $1 -eq 1 ]; then
> %{_sysconfdir}/webmin/ADMIN_PASSWORD
chmod 600 %{_sysconfdir}/webmin/ADMIN_PASSWORD
echo "info: see webmin randomly generated password for admin in /etc/webmin/ADMIN_PASSWORD"
/sbin/chkconfig --add webmin
service webmin start
fi
if [ $1 -gt 1 ]; then
# upgrade
service webmin restart
fi
exit 0
%systemd_post webmin
:
%preun
#erase
if [ $1 -eq 0 ]; then
service webmin stop 2>/dev/null
/sbin/chkconfig --del webmin
fi
exit 0
%systemd_preun_ webmin
:
%postun
%systemd_postun_with_restart webmin
:
%files
%defattr(-,root,bin)
%{_initrddir}/webmin
%dir %{_sysconfdir}/webmin
%config(noreplace) %{_sysconfdir}/webmin/*
%{_datadir}/applications/webmin.desktop
%dir /opt/webmin
/opt/webmin/*
%dir /var/log/webmin
%doc LICENCE README
%{_sysconfdir}/pam.d/webmin
%{_sysconfdir}/logrotate.d/webmin
#%{_datadir}/applications/webmin.desktop
%{_unitdir}/webmin.service
%dir %{_datadir}/webmin
%{_datadir}/webmin/*
%attr(0750,root,bin) %dir /var/log/webmin
%attr(0750,root,root) %dir /var/log/webmin/modules
%doc LICENCE
%changelog
* Sun Aug 08 2021 Automatic Build System <autodist@mambasoft.it> 1.979-1mamba
- automatic version update by autodist
* Thu Oct 26 2017 Automatic Build System <autodist@mambasoft.it> 1.830-1mamba
- automatic update by autodist