* [gentoo-commits] repo/gentoo:master commit in: app-admin/webmin/files/, app-admin/webmin/
@ 2015-12-09 12:48 Ian Delaney
0 siblings, 0 replies; 2+ messages in thread
From: Ian Delaney @ 2015-12-09 12:48 UTC (permalink / raw
To: gentoo-commits
commit: 8ec0e33e70a40f62dc1a3fc7a6620858963f6bb6
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 9 12:45:46 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Wed Dec 9 12:48:08 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ec0e33e
app-admin/webmin: bump to vn. 1.770, rm prior vn.
changes made to honour the changes in the new systemd.eclass,
patches for bumped ebuild and file gentoo-setup submitted by
the proxy maintainer via gentoo bug 567486
rm old vn. also requested by proxy maintainer via bug 567398
Gentoo bugs: #567486 #567398
Package-Manager: portage-2.2.24
app-admin/webmin/Manifest | 4 ++--
app-admin/webmin/files/gentoo-setup | 16 +++++++++++++++-
.../webmin/{webmin-1.760.ebuild => webmin-1.770.ebuild} | 7 +++++--
3 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 8832186..b6a0505 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,2 +1,2 @@
-DIST webmin-1.760-minimal.tar.gz 2601515 SHA256 1a9faf4d765f7356a2db39bee22f7030daa95be1f2f06d1de40a9dbbeecc4d9c SHA512 c6e1b5fae3921a368b9341d21285e0b3c2366331250849846d1ebb221958b809bce83d96f0506972cc9b2f474fd4059ecb935b80b6593d09a65947cdc47950d4 WHIRLPOOL d4c0c1215419b700fad742904fdd55918955bfe0447d8b7c2278303abbd54d20e4bd22af726ed6645639ef81dcaef2c4ccd8aa7f3f1bafccbee8f36022da3ff5
-DIST webmin-1.760.tar.gz 26885420 SHA256 6e7adefe2a8349487484a15b94914ab7e540404b43f97dc49b21a618c9b1776e SHA512 8d7ce0b88dd561e91ba36dc97d4f0ab6da616726cefd6b53d642641eb82a906bddd9f0a5b8b5e3875336ac9f6a70bda9595e74d062952d653e72dae226db6e8f WHIRLPOOL b1fc7e4719b384ee5f1b3c6e023bc9d5790b0e30320c726942bcd5b72c4afbaf380526dfee05eb515a5a3280fea35143f5ed2be50621c7e7977dc01f91700a7e
+DIST webmin-1.770-minimal.tar.gz 2612198 SHA256 e976091dcf0a68dfb02d5633d09da2ce9dc69d8ea2bde95c3cc57a0a25384488 SHA512 3661e37bbeb9f814862ff208d32ec4bfa15e8e826c15833e47c3a39cb0bb47d1f227c0c942f72aed4f3e9344556cc0ef8de42a5961c6795ef01986abafe9949b WHIRLPOOL 92a89623da8ba09d921ffec38c45c2c4bf04c8249178d9d13d34339ecc902d8d7184396ce29c04bfb6e9eba463c2942dc5d9d10d05af463b4dbf9337891bcc02
+DIST webmin-1.770.tar.gz 28441983 SHA256 eb84f1adbb099d0a2e633fbc4ea4838d1ddbcc84135d6a897803fbd0284719ba SHA512 460d9e06379df8d950874906589938077fd0fc70ed12948a685c1386c9995538d92387e252373398319469406b8ef0daab67dabe8c71b2f1961a5d5cb6848a7f WHIRLPOOL 4556f51001d010b66c6af265904b3f634f7bccf1afeb74be6de0824fefb2a5b2a5508d751bfa4abcfd0cb8b670659474ecf4e564505e446ed36a737e4f100dc0
diff --git a/app-admin/webmin/files/gentoo-setup b/app-admin/webmin/files/gentoo-setup
index 0c2dd2d..47d6127 100644
--- a/app-admin/webmin/files/gentoo-setup
+++ b/app-admin/webmin/files/gentoo-setup
@@ -94,13 +94,15 @@ if [ "$upgrading" = 1 ]; then
real_os_type=`grep "^real_os_type=" $config_dir/config | sed -e 's/real_os_type=//g'`
real_os_version=`grep "^real_os_version=" $config_dir/config | sed -e 's/real_os_version=//g'`
- # Get port, ssl, no_ssl2, no_ssl3, ssl_redirect, no_sslcompression and keyfile
+ # Get port, ssl, no_ssl2, no_ssl3, ssl_redirect, no_sslcompression, no_tls1, no_tls1_1 and keyfile
port=`grep "^port=" $config_dir/miniserv.conf | sed -e 's/port=//g'`
ssl=`grep "^ssl=" $config_dir/miniserv.conf | sed -e 's/ssl=//g'`
no_ssl2=`grep "^no_ssl2=" $config_dir/miniserv.conf | sed -e 's/no_ssl2=//g'`
no_ssl3=`grep "^no_ssl3=" $config_dir/miniserv.conf | sed -e 's/no_ssl3=//g'`
ssl_redirect=`grep "^ssl_redirect=" $config_dir/miniserv.conf | sed -e 's/ssl_redirect=//g'`
no_sslcompression=`grep "^no_sslcompression=" $config_dir/miniserv.conf | sed -e 's/no_sslcompression=//g'`
+ no_tls1=`grep "^no_tls1=" $config_dir/miniserv.conf | sed -e 's/no_tls1=//g'`
+ no_tls1_1=`grep "^no_tls1_1=" $config_dir/miniserv.conf | sed -e 's/no_tls1_1=//g'`
keyfile=`grep "^keyfile=" $config_dir/miniserv.conf | sed -e 's/keyfile=//g'`
# Update ACLs
@@ -145,6 +147,8 @@ else
echo "no_ssl3=$no_ssl3" >> $cfile
echo "ssl_redirect=$ssl_redirect" >> $cfile
echo "no_sslcompression=$no_sslcompression" >> $cfile
+ echo "no_tls1=$no_tls1" >> $cfile
+ echo "no_tls1_1=$no_tls1_1" >> $cfile
echo "keyfile=$keyfile" >> $cfile
echo "env_WEBMIN_CONFIG=$config_dir" >> $cfile
echo "env_WEBMIN_VAR=$var_dir" >> $cfile
@@ -320,6 +324,16 @@ if [ "$?" != "0" ]; then
echo no_ssl3=1 >> $config_dir/miniserv.conf
fi
+grep no_tls1= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+ echo no_tls1=1 >> $config_dir/miniserv.conf
+fi
+
+grep no_tls1_1= $config_dir/miniserv.conf >/dev/null
+if [ "$?" != "0" ]; then
+ echo no_tls1_1=1 >> $config_dir/miniserv.conf
+fi
+
# Make Perl crypt MD5 the default
grep md5pass= $config_dir/config >/dev/null
if [ "$?" != "0" ]; then
diff --git a/app-admin/webmin/webmin-1.760.ebuild b/app-admin/webmin/webmin-1.770.ebuild
similarity index 97%
rename from app-admin/webmin/webmin-1.760.ebuild
rename to app-admin/webmin/webmin-1.770.ebuild
index 54f23b1..eb7f7a9 100644
--- a/app-admin/webmin/webmin-1.760.ebuild
+++ b/app-admin/webmin/webmin-1.770.ebuild
@@ -129,7 +129,7 @@ src_install() {
-e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
-e "s:%config%:${EROOT}etc/webmin/config:" \
-e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
- "${ED}$(_systemd_get_unitdir)/webmin.service" \
+ "${ED}$(_systemd_get_systemunitdir)/webmin.service" \
|| die "Failed to patch the webmin systemd service file"
# Setup pam
@@ -286,12 +286,15 @@ pkg_config(){
export os_version='*'
export real_os_type='Gentoo Linux'
export real_os_version='Any version'
- # Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect' and 'no_sslcompression' for tightening security
+ # Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect', 'no_sslcompression',
+ # 'no_tls1' and 'no_tls1_1' for tightening security
export ssl=1
export no_ssl2=1
export no_ssl3=1
export ssl_redirect=1
export no_sslcompression=1
+ export no_tls1=1
+ export no_tls1_1=1
export keyfile="${EROOT}etc/ssl/webmin/server.pem"
export port=10000
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/webmin/files/, app-admin/webmin/
@ 2016-03-20 12:15 Sam Jorna
0 siblings, 0 replies; 2+ messages in thread
From: Sam Jorna @ 2016-03-20 12:15 UTC (permalink / raw
To: gentoo-commits
commit: 54e9b0751494b05273ac1ec0db428de232122b6e
Author: Sam Jorna <wraeth <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 12:14:46 2016 +0000
Commit: Sam Jorna <wraeth <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 12:14:51 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54e9b075
app-admin/webmin: clean old versions, #bug 577268
Removes old versions per maintainer request.
Gentoo-bug: 577268
Package-Manager: portage-2.2.28
Signed-off-by: Sam Jorna <wraeth <AT> gentoo.org>
app-admin/webmin/Manifest | 4 -
app-admin/webmin/files/gentoo-setup | 431 -----------------------------------
app-admin/webmin/webmin-1.770.ebuild | 307 -------------------------
app-admin/webmin/webmin-1.780.ebuild | 307 -------------------------
4 files changed, 1049 deletions(-)
diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest
index 37464c1..88cfda8 100644
--- a/app-admin/webmin/Manifest
+++ b/app-admin/webmin/Manifest
@@ -1,6 +1,2 @@
-DIST webmin-1.770-minimal.tar.gz 2612198 SHA256 e976091dcf0a68dfb02d5633d09da2ce9dc69d8ea2bde95c3cc57a0a25384488 SHA512 3661e37bbeb9f814862ff208d32ec4bfa15e8e826c15833e47c3a39cb0bb47d1f227c0c942f72aed4f3e9344556cc0ef8de42a5961c6795ef01986abafe9949b WHIRLPOOL 92a89623da8ba09d921ffec38c45c2c4bf04c8249178d9d13d34339ecc902d8d7184396ce29c04bfb6e9eba463c2942dc5d9d10d05af463b4dbf9337891bcc02
-DIST webmin-1.770.tar.gz 28441983 SHA256 eb84f1adbb099d0a2e633fbc4ea4838d1ddbcc84135d6a897803fbd0284719ba SHA512 460d9e06379df8d950874906589938077fd0fc70ed12948a685c1386c9995538d92387e252373398319469406b8ef0daab67dabe8c71b2f1961a5d5cb6848a7f WHIRLPOOL 4556f51001d010b66c6af265904b3f634f7bccf1afeb74be6de0824fefb2a5b2a5508d751bfa4abcfd0cb8b670659474ecf4e564505e446ed36a737e4f100dc0
-DIST webmin-1.780-minimal.tar.gz 2624841 SHA256 d4f51fcc448a881d568a32dce1712f4feb1d15bccb05005117179b8a6488e403 SHA512 a0fc61c202d94419f52572a95df23f4dd54c3b0552ce96df356b13b529988cb4be02e5f1165fbd5fbe30921697baac8b229d8d587860e3adabcbe2a4bfb11806 WHIRLPOOL f8b94e16b041cef115cfa7a49fbb34d432f9f96b28959e3f161df9de5805d4a38d7a019479e96ee886dd6f4c21e5884864a69b923ec3b0ac92422c530a95249c
-DIST webmin-1.780.tar.gz 28578888 SHA256 eb2613a4f4525cbbd04435580a843cb2a454bcf2712301105657cc114beda40e SHA512 1d5552fc09e0a42218881d2d028b8e73deadfca36022a6212e540e8dbbd2ff5fe23883fc4d3b4d63abee0a2aee570ce9710e4e1b75c2cc28f70724502d6680d7 WHIRLPOOL 7ef76b9e3f64d01978aa281d7e57db37078bab4ec101faa115f51ebf43bc0823d8a8bfa925dff5d1a39b0b9aabdada2218d543b14d3961b1346de05c46137d4b
DIST webmin-1.791-minimal.tar.gz 2635024 SHA256 d269fcccf0034edff44654fb40b83f63e3274f722a8f0d5b14f1fa9f74f49b00 SHA512 e8e7b43865399e918ef017d4d710b21cc7ce2f6566056faa82d756be29f038e07a20055978531f8785639c78339970fbfeabd4a4aa1fa4b331f3a344a78954d2 WHIRLPOOL e8380478edf6b994e03623a9a6b84f736a6c5efd1dbe0aac3905f85457d172a783af0231d4b3606d69c63129c4c4d3d80fa10608dd47374a01f45be7fd53b281
DIST webmin-1.791.tar.gz 28800013 SHA256 e62148a2263c016a66e7c825c5cb124614268c1da1e0f0bee75cd060c3acfa9c SHA512 4ba19f057ee70bc0a283753a6c190bbae15f0e2af1650ef1656c7b94e07a6750203ef3b7190f7abd544b25988446df6b174bf06191426893bd4224e54451e771 WHIRLPOOL 2d739e1c3ba06b04086b7d20eb646f950aa8776b4fc41bc975cb160733e70a5c7a4de6f331c294bf168e3f8fd5009c72d617eab662078f6d901087b3cfc2db36
diff --git a/app-admin/webmin/files/gentoo-setup b/app-admin/webmin/files/gentoo-setup
deleted file mode 100644
index 47d6127..0000000
--- a/app-admin/webmin/files/gentoo-setup
+++ /dev/null
@@ -1,431 +0,0 @@
-#!/bin/sh
-# gentoo-setup.sh
-#
-# Version 1.2
-#
-# A modified original Webmin setup.sh script to comply with Gentoo specifics
-#
-# Modification done by: PhobosK <phobosk@kbfx.net>
-#
-# This script runs after the webmin archive is installed, and in the pkg_config() phase.
-# It does setup the various config files of Webmin depending on if it is
-# a new install, an upgrade or a reset.
-
-LANG=
-export LANG
-
-if [ -z ${wadir} ]; then
- echo "You can't run this script outside of the 'emerge --config app-admin/webmin' command."
- exit 1
-fi
-
-# All things we do is from the Webmin install dir - $wadir
-cd $wadir
-
-
-# Are we hard resetting everything?
-# If yes, we do:
-# 1. Run the specific Webmin $wadir/run-uninstalls.pl
-# It runs all uninstall.pl files in every module's folder.
-# They delete all the set specific Webmin cron jobs.
-# If bumping you should go through these files using the command:
-# find . -name uninstall.pl -exec cat {} \; -print
-# 2. Delete the whole /etc/webmin content, keeping only the gentoo .keep_* files
-if [ "$reset" = "hard" ]; then
- echo "Running Webmin's specific uninstall procedures.. (Please ignore any possible errors)"
- (WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir LANG= "$wadir/run-uninstalls.pl")
- echo "..done"
- echo ""
-
- echo "Deleting the content of user's config folder: $config_dir .."
- find $config_dir ! -name '.keep_*' -delete 2>/dev/null
- echo "..done"
- echo ""
-fi
-
-
-# Are we soft resetting?
-# If yes we do:
-# - Delete the $config_dir/config file so we get new config values
-if [ "$reset" = "soft" ]; then
- echo "Deleting the user's $config_dir/config file.."
- if [ -f "$config_dir/config" ]; then
- rm -f "$config_dir/config"
- fi
- echo "..done"
- echo ""
-fi
-
-
-# Get all available modules of this version
-allmods=`echo */module.info | sed -e 's/\/module.info//g'`
-
-# Get current Webmin version
-ver=`cat "$wadir/version"`
-
-if [ -r "$config_dir/config" ]; then
- upgrading=1
-fi
-
-
-# Check if upgrading from an old version
-if [ "$upgrading" = 1 ]; then
- echo "Updating existant Webmin's config files.."
-
- # Get current var path
- if [ -r "$config_dir/var-path" ]; then
- _var_dir=`cat $config_dir/var-path`
- if [ -n ${_var_dir} ]; then
- var_dir=${_var_dir}
- fi
- fi
-
- # Get current perl path
- if [ -r "$config_dir/perl-path" ]; then
- _perl=`cat $config_dir/perl-path`
- if [ -n ${_perl} ]; then
- perl=${_perl}
- fi
- fi
-
- # Get old os name and version
- os_type=`grep "^os_type=" $config_dir/config | sed -e 's/os_type=//g'`
- os_version=`grep "^os_version=" $config_dir/config | sed -e 's/os_version=//g'`
- real_os_type=`grep "^real_os_type=" $config_dir/config | sed -e 's/real_os_type=//g'`
- real_os_version=`grep "^real_os_version=" $config_dir/config | sed -e 's/real_os_version=//g'`
-
- # Get port, ssl, no_ssl2, no_ssl3, ssl_redirect, no_sslcompression, no_tls1, no_tls1_1 and keyfile
- port=`grep "^port=" $config_dir/miniserv.conf | sed -e 's/port=//g'`
- ssl=`grep "^ssl=" $config_dir/miniserv.conf | sed -e 's/ssl=//g'`
- no_ssl2=`grep "^no_ssl2=" $config_dir/miniserv.conf | sed -e 's/no_ssl2=//g'`
- no_ssl3=`grep "^no_ssl3=" $config_dir/miniserv.conf | sed -e 's/no_ssl3=//g'`
- ssl_redirect=`grep "^ssl_redirect=" $config_dir/miniserv.conf | sed -e 's/ssl_redirect=//g'`
- no_sslcompression=`grep "^no_sslcompression=" $config_dir/miniserv.conf | sed -e 's/no_sslcompression=//g'`
- no_tls1=`grep "^no_tls1=" $config_dir/miniserv.conf | sed -e 's/no_tls1=//g'`
- no_tls1_1=`grep "^no_tls1_1=" $config_dir/miniserv.conf | sed -e 's/no_tls1_1=//g'`
- keyfile=`grep "^keyfile=" $config_dir/miniserv.conf | sed -e 's/keyfile=//g'`
-
- # Update ACLs
- $perl "$wadir/newmods.pl" $config_dir $allmods
-
- # Update miniserv.conf with new root directory, mime types file and server info
- grep -v "^root=" $config_dir/miniserv.conf | grep -v "^mimetypes=" | grep -v "^server=" >$tempdir/$$.miniserv.conf
- mv $tempdir/$$.miniserv.conf $config_dir/miniserv.conf
- echo "root=$wadir" >> $config_dir/miniserv.conf
- echo "mimetypes=$wadir/mime.types" >> $config_dir/miniserv.conf
- echo "server=MiniServ/$ver" >> $config_dir/miniserv.conf
- grep logout= $config_dir/miniserv.conf >/dev/null
- if [ $? != "0" ]; then
- echo "logout=$config_dir/logout-flag" >> $config_dir/miniserv.conf
- fi
-
- # Remove old cache of module infos
- rm -f $config_dir/module.infos.cache
- echo "..done"
- echo ""
-else
- # Create webserver's new config files
- echo "Creating Webmin's new config files.."
-
- echo $perl > $config_dir/perl-path
- echo $var_dir > $config_dir/var-path
-
- # Create a totally new conf file
- cfile=$config_dir/miniserv.conf
- echo "port=$port" > $cfile
- echo "root=$wadir" >> $cfile
- echo "mimetypes=$wadir/mime.types" >> $cfile
- echo "addtype_cgi=internal/cgi" >> $cfile
- echo "realm=Webmin Server" >> $cfile
- echo "logfile=$var_dir/miniserv.log" >> $cfile
- echo "errorlog=$var_dir/miniserv.error" >> $cfile
- echo "pidfile=$pidfile" >> $cfile
- echo "logtime=168" >> $cfile
- echo "ppath=$ppath" >> $cfile
- echo "ssl=$ssl" >> $cfile
- echo "no_ssl2=$no_ssl2" >> $cfile
- echo "no_ssl3=$no_ssl3" >> $cfile
- echo "ssl_redirect=$ssl_redirect" >> $cfile
- echo "no_sslcompression=$no_sslcompression" >> $cfile
- echo "no_tls1=$no_tls1" >> $cfile
- echo "no_tls1_1=$no_tls1_1" >> $cfile
- echo "keyfile=$keyfile" >> $cfile
- echo "env_WEBMIN_CONFIG=$config_dir" >> $cfile
- echo "env_WEBMIN_VAR=$var_dir" >> $cfile
- echo "atboot=$atboot" >> $cfile
- echo "logout=$config_dir/logout-flag" >> $cfile
- echo "listen=10000" >> $cfile
- echo "denyfile=\\.pl\$" >> $cfile
- echo "log=1" >> $cfile
- echo "blockhost_failures=5" >> $cfile
- echo "blockhost_time=60" >> $cfile
- echo "syslog=1" >> $cfile
- echo "session=1" >> $cfile
- echo "premodules=WebminCore" >> $cfile
- echo "server=MiniServ/$ver" >> $cfile
-
- # Append package-specific info to config file.
- # miniserv-conf can be created by upstream or by us in src_install phase (see there).
- if [ -f "$wadir/miniserv-conf" ]; then
- cat "$wadir/miniserv-conf" >>$cfile
- fi
-
- # Create the default user allowed to login - root only
- login="root"
-
- if [ -r /etc/shadow ]; then
- #crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :`
- crypt=x
- else
- crypt=`grep "^root:" /etc/passwd | cut -f 2 -d :`
- fi
-
- ufile=$config_dir/miniserv.users
- echo "$login:$crypt:0" > $ufile
- chmod 600 $ufile
-
-
- echo "userfile=$ufile" >> $cfile
- chmod 600 $cfile
- echo "..done"
- echo ""
-
- echo "Creating access control file.."
- afile=$config_dir/webmin.acl
- echo "$login: $allmods" > $afile
- chmod 600 $afile
- echo "..done"
- echo ""
-fi
-
-
-# Create start, stop, restart and reload Gentoo compliant Webmin scripts
-# We use sys-apps/openrc functions which is already pulled by sys-apps/baselayout
-# or systemctl if we run under systemd
-echo "Creating start and stop scripts.."
-rm -f $config_dir/{start,stop,restart,reload}
-
-# The start script in /etc/webmin (Gentoo compliant)
-cat <<END >>"$config_dir/start"
-#!/bin/sh
-
-if [ ! -f "${pidfile}" ]; then
- if [[ -d /run/systemd/system ]] ; then
- systemctl start webmin.service
- else
- rc-service --ifexists -- webmin start
- fi
-fi
-END
-
-# The stop script in /etc/webmin (Gentoo compliant)
-cat <<END >>"$config_dir/stop"
-#!/bin/sh
-
-if [[ -d /run/systemd/system ]] ; then
- systemctl stop webmin.service
-else
- rc-service --ifexists -- webmin --ifstarted stop
-fi
-END
-
-# The restart script in /etc/webmin (Gentoo compliant)
-cat <<END >>"$config_dir/restart"
-#!/bin/sh
-
-if [[ -d /run/systemd/system ]] ; then
- systemctl try-restart webmin.service
-else
- rc-service --ifexists -- webmin --ifstarted restart
-fi
-END
-
-# The reload script in /etc/webmin (Gentoo compliant)
-cat <<END >>"$config_dir/reload"
-#!/bin/sh
-
-if [[ -d /run/systemd/system ]] ; then
- systemctl reload-or-try-restart webmin.service
-else
- rc-service --ifexists -- webmin --ifstarted reload
-fi
-END
-
-chmod 755 $config_dir/{start,stop,restart,reload}
-echo "..done"
-echo ""
-
-
-if [ "$upgrading" = 1 ]; then
- echo "Updating other config files.."
-else
- echo "Copying other config files.."
-fi
-
-# This just copies and merges the Webmin's release config files, with user's in the /etc/webmin folder
-newmods=`$perl "$wadir/copyconfig.pl" "$os_type/$real_os_type" "$os_version/$real_os_version" "$wadir" $config_dir "" $allmods`
-if [ "$upgrading" != 1 ]; then
- # Store the OS and version
- echo "os_type=$os_type" >> $config_dir/config
- echo "os_version=$os_version" >> $config_dir/config
- echo "real_os_type=$real_os_type" >> $config_dir/config
- echo "real_os_version=$real_os_version" >> $config_dir/config
-
- # Turn on logging by default
- echo "log=1" >> $config_dir/config
-
- # Disallow unknown referers by default
- echo "referers_none=1" >>$config_dir/config
-else
- # one-off hack to set log variable in config from miniserv.conf
- grep log= $config_dir/config >/dev/null
- if [ "$?" = "1" ]; then
- grep log= $config_dir/miniserv.conf >> $config_dir/config
- grep logtime= $config_dir/miniserv.conf >> $config_dir/config
- grep logclear= $config_dir/miniserv.conf >> $config_dir/config
- fi
-
- # Disallow unknown referers if not set
- grep referers_none= $config_dir/config >/dev/null
- if [ "$?" != "0" ]; then
- echo "referers_none=1" >>$config_dir/config
- fi
-fi
-echo $ver > $config_dir/version
-echo "..done"
-echo ""
-
-# Set passwd_ fields in miniserv.conf from global config
-for field in passwd_file passwd_uindex passwd_pindex passwd_cindex passwd_mindex; do
- grep $field= $config_dir/miniserv.conf >/dev/null
- if [ "$?" != "0" ]; then
- grep $field= $config_dir/config >> $config_dir/miniserv.conf
- fi
-done
-grep passwd_mode= $config_dir/miniserv.conf >/dev/null
-if [ "$?" != "0" ]; then
- echo passwd_mode=0 >> $config_dir/miniserv.conf
-fi
-
-# Disable SSL compression to defeat BEAST attack
-grep no_sslcompression= $config_dir/miniserv.conf >/dev/null
-if [ "$?" != "0" ]; then
- echo no_sslcompression=1 >> $config_dir/miniserv.conf
-fi
-
-# Tighten SSL security
-grep no_ssl2= $config_dir/miniserv.conf >/dev/null
-if [ "$?" != "0" ]; then
- echo no_ssl2=1 >> $config_dir/miniserv.conf
-fi
-
-grep no_ssl3= $config_dir/miniserv.conf >/dev/null
-if [ "$?" != "0" ]; then
- echo no_ssl3=1 >> $config_dir/miniserv.conf
-fi
-
-grep no_tls1= $config_dir/miniserv.conf >/dev/null
-if [ "$?" != "0" ]; then
- echo no_tls1=1 >> $config_dir/miniserv.conf
-fi
-
-grep no_tls1_1= $config_dir/miniserv.conf >/dev/null
-if [ "$?" != "0" ]; then
- echo no_tls1_1=1 >> $config_dir/miniserv.conf
-fi
-
-# Make Perl crypt MD5 the default
-grep md5pass= $config_dir/config >/dev/null
-if [ "$?" != "0" ]; then
- echo md5pass=1 >> $config_dir/config
-fi
-
-# Set a special theme if none was set before
-if [ "$theme" = "" ]; then
- theme=`cat "$wadir/defaulttheme" 2>/dev/null`
-fi
-oldthemeline=`grep "^theme=" $config_dir/config`
-oldtheme=`echo $oldthemeline | sed -e 's/theme=//g'`
-if [ "$theme" != "" ] && [ "$oldthemeline" = "" ] && [ -d "$wadir/$theme" ]; then
- themelist=$theme
-fi
-
-# Set a special overlay if none was set before
-if [ "$overlay" = "" ]; then
- overlay=`cat "$wadir/defaultoverlay" 2>/dev/null`
-fi
-if [ "$overlay" != "" ] && [ "$theme" != "" ] && [ -d "$wadir/$overlay" ]; then
- themelist="$themelist $overlay"
-fi
-
-# Apply the theme and maybe overlay
-if [ "$themelist" != "" ]; then
- echo "theme=$themelist" >> $config_dir/config
- echo "preroot=$themelist" >> $config_dir/miniserv.conf
-fi
-
-# If the old blue-theme is still in use, change it (new in 1.730)
-oldtheme=`grep "^theme=" $config_dir/config | sed -e 's/theme=//g'`
-if [ "$oldtheme" = "blue-theme" ]; then
- sed -i -e 's/theme=blue-theme/theme=gray-theme/g' $config_dir/config
- sed -i -e 's/preroot=blue-theme/preroot=gray-theme/g' $config_dir/miniserv.conf
-fi
-
-# Set the product field in the global config
-grep product= $config_dir/config >/dev/null
-if [ "$?" != "0" ]; then
- echo product=webmin >> $config_dir/config
-fi
-
-# If password delays are not specifically disabled, enable them
-grep passdelay= $config_dir/miniserv.conf >/dev/null
-if [ "$?" != "0" ]; then
- echo passdelay=1 >> $config_dir/miniserv.conf
-fi
-
-
-echo "Changing ownership and permissions.."
-# Make all config dirs non-world-readable
-for m in $newmods; do
- chown -R root:root $config_dir/$m
- chmod -R og-rw $config_dir/$m
-done
-
-# Make miniserv config files non-world-readable
-for f in miniserv.conf miniserv.users; do
- chown -R root:root $config_dir/$f
- chmod -R og-rw $config_dir/$f
-done
-chmod +r $config_dir/version
-
-# Fix up bad permissions from some older installs
-for m in ldap-client ldap-server ldap-useradmin mailboxes mysql postgresql servers virtual-server; do
- if [ -d "$config_dir/$m" ]; then
- chown root:root $config_dir/$m
- chmod og-rw $config_dir/$m
- chmod og-rw $config_dir/$m/config 2>/dev/null
- fi
-done
-echo "..done"
-echo ""
-
-
-# This executes all postinstall.pl for every module
-# If you do bump, you should look at the specific changes they do with this command in root folder:
-# find . -name postinstall.pl -exec cat {} \; -print
-# Generally they are safe to run 'cause they change only user's config in /etc/webmin
-# or setup some cron jobs
-if [ "$nopostinstall" = "" ]; then
- echo "Running postinstall scripts.. (Please ignore any possible errors)"
- (cd "$wadir" ; WEBMIN_CONFIG=$config_dir WEBMIN_VAR=$var_dir "$wadir/run-postinstalls.pl")
- echo "..done"
- echo ""
-fi
-
-# Enable background collection
-if [ "$upgrading" != 1 -a -r $config_dir/system-status/enable-collection.pl ]; then
- echo "Enabling background status collection.. (Please ignore any possible errors)"
- $config_dir/system-status/enable-collection.pl 5
- echo "..done"
- echo ""
-fi
diff --git a/app-admin/webmin/webmin-1.770.ebuild b/app-admin/webmin/webmin-1.770.ebuild
deleted file mode 100644
index eb7f7a9..0000000
--- a/app-admin/webmin/webmin-1.770.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils pam ssl-cert systemd
-
-DESCRIPTION="A web-based Unix systems administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
- !minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
-# because openssl is forced by dev-perl/Net-SSLeay
-IUSE="minimal +ssl mysql postgres ldap"
-
-# All the required perl modules can be found easily using (in Webmin's root src dir):
-# find . -name cpan_modules.pl -exec grep "::" {} \;
-# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
-# to install them using the in-built cpan module, and this will mess up perl on the system
-# That's why some modules are forced without a use flag
-# NOTE: pam, ssl and dnssec-tools deps are forced for security and Gentoo compliance installation reasons
-DEPEND="virtual/perl-MIME-Base64
- virtual/perl-Socket
- virtual/perl-Sys-Syslog
- virtual/perl-Time-HiRes
- virtual/perl-Time-Local
- dev-perl/Authen-Libwrap
- dev-perl/IO-Tty
- dev-perl/MD5
- dev-perl/Net-SSLeay
- dev-perl/Authen-PAM
- dev-perl/Sys-Hostname-Long
- >=net-dns/dnssec-tools-1.13
- !minimal? (
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- ldap? ( dev-perl/perl-ldap )
- dev-perl/XML-Generator
- dev-perl/XML-Parser
- )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- local perl="$( which perl )"
-
- # Remove the unnecessary and incompatible files
- rm -rf acl/Authen-SolarisRBAC-0.1*
- if ! use minimal ; then
- rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
- rm -f mount/{free,net,open}bsd-mounts*
- rm -f mount/macos-mounts*
- fi
-
- # For security reasons remove the SSL certificate that comes with Webmin
- # We will create our own later
- rm -f miniserv.pem
-
- # Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
- # We will use our own later
- rm -f setup.{sh,pl}
-
- # Set the installation type/mode to Gentoo
- echo "gentoo" > install-type
-
- # Fix the permissions of the install files
- chmod -R og-w "${S}"
-
- # Since we should not modify any files after install
- # we set the perl path in all cgi and pl files here using Webmin's routines
- # The pl file is Prefix safe and works only on provided input, no other filesystem files
- ebegin "Fixing perl path in source files"
- (find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
- eend $?
-}
-
-src_install() {
- # Create config dir and keep
- diropts -m0755
- dodir /etc/webmin
- keepdir /etc/webmin
-
- # Create install dir
- # Third party modules installed through Webmin go here too, so keep
- dodir /usr/libexec/webmin
- keepdir /usr/libexec/webmin
-
- # Copy our own setup script to installation folder
- insinto /usr/libexec/webmin
- newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
- fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
-
- # This is here if we ever want in future ebuilds to add some specific
- # config values in the /etc/webmin/miniserv.conf
- # The format of this file should be the same as the one of miniserv.conf:
- # var=value
- #
- # Uncomment it if you use such file. Before that check if upstream
- # has this file in root dir too.
- #newins "${FILESDIR}/miniserv-conf" miniserv-conf
-
- # Create the log dir and keep
- diropts -m0700
- dodir /var/log/webmin
- keepdir /var/log/webmin
-
- # Create the init.d file and put the neccessary variables there
- newinitd "${FILESDIR}"/init.d.webmin webmin
- sed -i \
- -e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
- -e "s:%pid%:${EROOT}var/run/webmin.pid:" \
- -e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
- -e "s:%config%:${EROOT}etc/webmin/config:" \
- -e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
- "${ED}etc/init.d/webmin" \
- || die "Failed to patch the webmin init file"
-
- # Create the systemd service file and put the neccessary variables there
- systemd_newunit "${FILESDIR}"/webmin.service webmin.service
- sed -i \
- -e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
- -e "s:%pid%:${EROOT}var/run/webmin.pid:" \
- -e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
- -e "s:%config%:${EROOT}etc/webmin/config:" \
- -e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
- "${ED}$(_systemd_get_systemunitdir)/webmin.service" \
- || die "Failed to patch the webmin systemd service file"
-
- # Setup pam
- pamd_mimic system-auth webmin auth account session
-
- # Copy files to installation folder
- ebegin "Copying install files to destination"
- cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
- eend $?
-}
-
-pkg_preinst() {
- # First stop service if running so Webmin to not messup our config
- ebegin "Stopping any running Webmin instance prior merging"
- if systemd_is_booted ; then
- systemctl stop webmin.service 2>/dev/null
- else
- rc-service --ifexists -- webmin --ifstarted stop
- fi
- eend $?
-}
-
-pkg_postinst() {
- # Run pkg_config phase first - non interactively
- export INTERACTIVE="no"
- pkg_config
- # Every next time pkg_config should be interactive
- INTERACTIVE="yes"
-
- ewarn
- ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
- ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
- ewarn "To avoid problems, please before using any module, look at its configuration options first."
- ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
- ewarn
- if systemd_is_booted ; then
- elog "- To make Webmin start at boot time, run: 'systemctl enable webmin.service'"
- else
- elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
- fi
- elog "- The default URL to connect to Webmin is: https://localhost:10000"
- elog "- The default user that can login is: root"
- elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
-}
-
-pkg_prerm() {
- # First stop service if running - we do not want Webmin to mess up config
- ebegin "Stopping any running Webmin instance prior unmerging"
- if systemd_is_booted ; then
- systemctl stop webmin.service 2>/dev/null
- else
- rc-service --ifexists -- webmin --ifstarted stop
- fi
- eend $?
-}
-
-pkg_postrm() {
- # If removing webmin completely, remind the user for the Webmin's own cron jobs.
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
- ewarn
- ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
- ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
- ewarn "To fix this just disable them if you intend to use Webmin again,"
- ewarn "OR delete them if not."
- ewarn
- fi
-}
-
-pkg_config(){
- # First stop service if running
- ebegin "Stopping any running Webmin instance"
- if systemd_is_booted ; then
- systemctl stop webmin.service 2>/dev/null
- else
- rc-service --ifexists -- webmin --ifstarted stop
- fi
- eend $?
-
- # Next set the default reset variable to 'none'
- # reset/_reset can be:
- # 'none' - does not reset anything, just upgrades if a conf is present
- # OR installs new conf if a conf is missing
- # 'soft' - deletes only $config_dir/config file and thus resetting most
- # conf values to their defaults. Keeps the specific Webmin cron jobs
- # 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
- # and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
- local _reset="none"
-
- # If in interactive mode ask user what should we do
- if [[ "${INTERACTIVE}" = "yes" ]]; then
- einfo
- einfo "Please enter the number of the action you would like to perform?"
- einfo
- einfo "1. Update configuration"
- einfo " (keeps old config options and adds the new ones)"
- einfo "2. Soft reset configuration"
- einfo " (keeps some old config options, the other options are set to default)"
- ewarn " All Webmin users will be reset"
- einfo "3. Hard reset configuration"
- einfo " (all options including module options are set to default)"
- ewarn " You will lose all Webmin configuration options you have done till now"
- einfo "4. Exit this configuration utility (default)"
- while [ "$correct" != "true" ] ; do
- read answer
- if [[ "$answer" = "1" ]] ; then
- _reset="none"
- correct="true"
- elif [[ "$answer" = "2" ]] ; then
- _reset="soft"
- correct="true"
- elif [[ "$answer" = "3" ]] ; then
- _reset="hard"
- correct="true"
- elif [ "$answer" = "4" -o "$answer" = "" ] ; then
- die "User aborted configuration."
- else
- echo "Answer not recognized. Enter a number from 1 to 4"
- fi
- done
-
- if [[ "$_reset" = "hard" ]]; then
- while [ "$sure" != "true" ] ; do
- ewarn "You will lose all Webmin configuration options you have done till now."
- ewarn "Are you sure you want to do this? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- sure="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "User aborted configuration."
- else
- echo "Answer not recognized. Enter 'y' or 'n'"
- fi
- done
- fi
- fi
-
- export reset=$_reset
-
- # Create ssl certificate for Webmin if there is not one in the proper place
- if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
- SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
- install_cert "${EROOT}/etc/ssl/webmin/server"
- fi
-
- # Ensure all paths passed to the setup script use EROOT
- export wadir="${EROOT}usr/libexec/webmin"
- export config_dir="${EROOT}etc/webmin"
- export var_dir="${EROOT}var/log/webmin"
- export tempdir="${T}"
- export pidfile="${EROOT}var/run/webmin.pid"
- export perl="$( which perl )"
- export os_type='gentoo-linux'
- export os_version='*'
- export real_os_type='Gentoo Linux'
- export real_os_version='Any version'
- # Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect', 'no_sslcompression',
- # 'no_tls1' and 'no_tls1_1' for tightening security
- export ssl=1
- export no_ssl2=1
- export no_ssl3=1
- export ssl_redirect=1
- export no_sslcompression=1
- export no_tls1=1
- export no_tls1_1=1
- export keyfile="${EROOT}etc/ssl/webmin/server.pem"
- export port=10000
-
- export atboot=0
-
- einfo "Executing Webmin's configure script"
- $wadir/gentoo-setup.sh
-
- einfo "Configuration of Webmin done"
-}
diff --git a/app-admin/webmin/webmin-1.780.ebuild b/app-admin/webmin/webmin-1.780.ebuild
deleted file mode 100644
index eb7f7a9..0000000
--- a/app-admin/webmin/webmin-1.780.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils pam ssl-cert systemd
-
-DESCRIPTION="A web-based Unix systems administration interface"
-HOMEPAGE="http://www.webmin.com/"
-SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
- !minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~x86"
-
-# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually
-# because openssl is forced by dev-perl/Net-SSLeay
-IUSE="minimal +ssl mysql postgres ldap"
-
-# All the required perl modules can be found easily using (in Webmin's root src dir):
-# find . -name cpan_modules.pl -exec grep "::" {} \;
-# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user
-# to install them using the in-built cpan module, and this will mess up perl on the system
-# That's why some modules are forced without a use flag
-# NOTE: pam, ssl and dnssec-tools deps are forced for security and Gentoo compliance installation reasons
-DEPEND="virtual/perl-MIME-Base64
- virtual/perl-Socket
- virtual/perl-Sys-Syslog
- virtual/perl-Time-HiRes
- virtual/perl-Time-Local
- dev-perl/Authen-Libwrap
- dev-perl/IO-Tty
- dev-perl/MD5
- dev-perl/Net-SSLeay
- dev-perl/Authen-PAM
- dev-perl/Sys-Hostname-Long
- >=net-dns/dnssec-tools-1.13
- !minimal? (
- mysql? ( dev-perl/DBD-mysql )
- postgres? ( dev-perl/DBD-Pg )
- ldap? ( dev-perl/perl-ldap )
- dev-perl/XML-Generator
- dev-perl/XML-Parser
- )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- local perl="$( which perl )"
-
- # Remove the unnecessary and incompatible files
- rm -rf acl/Authen-SolarisRBAC-0.1*
- if ! use minimal ; then
- rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac}
- rm -f mount/{free,net,open}bsd-mounts*
- rm -f mount/macos-mounts*
- fi
-
- # For security reasons remove the SSL certificate that comes with Webmin
- # We will create our own later
- rm -f miniserv.pem
-
- # Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config
- # We will use our own later
- rm -f setup.{sh,pl}
-
- # Set the installation type/mode to Gentoo
- echo "gentoo" > install-type
-
- # Fix the permissions of the install files
- chmod -R og-w "${S}"
-
- # Since we should not modify any files after install
- # we set the perl path in all cgi and pl files here using Webmin's routines
- # The pl file is Prefix safe and works only on provided input, no other filesystem files
- ebegin "Fixing perl path in source files"
- (find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl -
- eend $?
-}
-
-src_install() {
- # Create config dir and keep
- diropts -m0755
- dodir /etc/webmin
- keepdir /etc/webmin
-
- # Create install dir
- # Third party modules installed through Webmin go here too, so keep
- dodir /usr/libexec/webmin
- keepdir /usr/libexec/webmin
-
- # Copy our own setup script to installation folder
- insinto /usr/libexec/webmin
- newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh
- fperms 0744 /usr/libexec/webmin/gentoo-setup.sh
-
- # This is here if we ever want in future ebuilds to add some specific
- # config values in the /etc/webmin/miniserv.conf
- # The format of this file should be the same as the one of miniserv.conf:
- # var=value
- #
- # Uncomment it if you use such file. Before that check if upstream
- # has this file in root dir too.
- #newins "${FILESDIR}/miniserv-conf" miniserv-conf
-
- # Create the log dir and keep
- diropts -m0700
- dodir /var/log/webmin
- keepdir /var/log/webmin
-
- # Create the init.d file and put the neccessary variables there
- newinitd "${FILESDIR}"/init.d.webmin webmin
- sed -i \
- -e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
- -e "s:%pid%:${EROOT}var/run/webmin.pid:" \
- -e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
- -e "s:%config%:${EROOT}etc/webmin/config:" \
- -e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
- "${ED}etc/init.d/webmin" \
- || die "Failed to patch the webmin init file"
-
- # Create the systemd service file and put the neccessary variables there
- systemd_newunit "${FILESDIR}"/webmin.service webmin.service
- sed -i \
- -e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \
- -e "s:%pid%:${EROOT}var/run/webmin.pid:" \
- -e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \
- -e "s:%config%:${EROOT}etc/webmin/config:" \
- -e "s:%perllib%:${EROOT}usr/libexec/webmin:" \
- "${ED}$(_systemd_get_systemunitdir)/webmin.service" \
- || die "Failed to patch the webmin systemd service file"
-
- # Setup pam
- pamd_mimic system-auth webmin auth account session
-
- # Copy files to installation folder
- ebegin "Copying install files to destination"
- cp -pPR "${S}"/* "${ED}usr/libexec/webmin"
- eend $?
-}
-
-pkg_preinst() {
- # First stop service if running so Webmin to not messup our config
- ebegin "Stopping any running Webmin instance prior merging"
- if systemd_is_booted ; then
- systemctl stop webmin.service 2>/dev/null
- else
- rc-service --ifexists -- webmin --ifstarted stop
- fi
- eend $?
-}
-
-pkg_postinst() {
- # Run pkg_config phase first - non interactively
- export INTERACTIVE="no"
- pkg_config
- # Every next time pkg_config should be interactive
- INTERACTIVE="yes"
-
- ewarn
- ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues."
- ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc."
- ewarn "To avoid problems, please before using any module, look at its configuration options first."
- ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)"
- ewarn
- if systemd_is_booted ; then
- elog "- To make Webmin start at boot time, run: 'systemctl enable webmin.service'"
- else
- elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'"
- fi
- elog "- The default URL to connect to Webmin is: https://localhost:10000"
- elog "- The default user that can login is: root"
- elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'"
-}
-
-pkg_prerm() {
- # First stop service if running - we do not want Webmin to mess up config
- ebegin "Stopping any running Webmin instance prior unmerging"
- if systemd_is_booted ; then
- systemctl stop webmin.service 2>/dev/null
- else
- rc-service --ifexists -- webmin --ifstarted stop
- fi
- eend $?
-}
-
-pkg_postrm() {
- # If removing webmin completely, remind the user for the Webmin's own cron jobs.
- if [[ ! ${REPLACED_BY_VERSION} ]]; then
- ewarn
- ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled"
- ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing."
- ewarn "To fix this just disable them if you intend to use Webmin again,"
- ewarn "OR delete them if not."
- ewarn
- fi
-}
-
-pkg_config(){
- # First stop service if running
- ebegin "Stopping any running Webmin instance"
- if systemd_is_booted ; then
- systemctl stop webmin.service 2>/dev/null
- else
- rc-service --ifexists -- webmin --ifstarted stop
- fi
- eend $?
-
- # Next set the default reset variable to 'none'
- # reset/_reset can be:
- # 'none' - does not reset anything, just upgrades if a conf is present
- # OR installs new conf if a conf is missing
- # 'soft' - deletes only $config_dir/config file and thus resetting most
- # conf values to their defaults. Keeps the specific Webmin cron jobs
- # 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file)
- # and thus resetting all Webmin. Deletes the specific Webmin cron jobs too.
- local _reset="none"
-
- # If in interactive mode ask user what should we do
- if [[ "${INTERACTIVE}" = "yes" ]]; then
- einfo
- einfo "Please enter the number of the action you would like to perform?"
- einfo
- einfo "1. Update configuration"
- einfo " (keeps old config options and adds the new ones)"
- einfo "2. Soft reset configuration"
- einfo " (keeps some old config options, the other options are set to default)"
- ewarn " All Webmin users will be reset"
- einfo "3. Hard reset configuration"
- einfo " (all options including module options are set to default)"
- ewarn " You will lose all Webmin configuration options you have done till now"
- einfo "4. Exit this configuration utility (default)"
- while [ "$correct" != "true" ] ; do
- read answer
- if [[ "$answer" = "1" ]] ; then
- _reset="none"
- correct="true"
- elif [[ "$answer" = "2" ]] ; then
- _reset="soft"
- correct="true"
- elif [[ "$answer" = "3" ]] ; then
- _reset="hard"
- correct="true"
- elif [ "$answer" = "4" -o "$answer" = "" ] ; then
- die "User aborted configuration."
- else
- echo "Answer not recognized. Enter a number from 1 to 4"
- fi
- done
-
- if [[ "$_reset" = "hard" ]]; then
- while [ "$sure" != "true" ] ; do
- ewarn "You will lose all Webmin configuration options you have done till now."
- ewarn "Are you sure you want to do this? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- sure="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "User aborted configuration."
- else
- echo "Answer not recognized. Enter 'y' or 'n'"
- fi
- done
- fi
- fi
-
- export reset=$_reset
-
- # Create ssl certificate for Webmin if there is not one in the proper place
- if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}"
- SSL_COMMONNAME="${SSL_COMMONNAME:-*}"
- install_cert "${EROOT}/etc/ssl/webmin/server"
- fi
-
- # Ensure all paths passed to the setup script use EROOT
- export wadir="${EROOT}usr/libexec/webmin"
- export config_dir="${EROOT}etc/webmin"
- export var_dir="${EROOT}var/log/webmin"
- export tempdir="${T}"
- export pidfile="${EROOT}var/run/webmin.pid"
- export perl="$( which perl )"
- export os_type='gentoo-linux'
- export os_version='*'
- export real_os_type='Gentoo Linux'
- export real_os_version='Any version'
- # Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect', 'no_sslcompression',
- # 'no_tls1' and 'no_tls1_1' for tightening security
- export ssl=1
- export no_ssl2=1
- export no_ssl3=1
- export ssl_redirect=1
- export no_sslcompression=1
- export no_tls1=1
- export no_tls1_1=1
- export keyfile="${EROOT}etc/ssl/webmin/server.pem"
- export port=10000
-
- export atboot=0
-
- einfo "Executing Webmin's configure script"
- $wadir/gentoo-setup.sh
-
- einfo "Configuration of Webmin done"
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-03-20 12:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-09 12:48 [gentoo-commits] repo/gentoo:master commit in: app-admin/webmin/files/, app-admin/webmin/ Ian Delaney
-- strict thread matches above, loose matches on Subject: below --
2016-03-20 12:15 Sam Jorna
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox