diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index 5e03ecd6706d..30efa19bdcfb 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -1,67 +1,65 @@ PORTNAME= webmin -PORTVERSION= 1.997 +PORTVERSION= 2.000 PORTREVISION= 0 CATEGORIES= sysutils MASTER_SITES= http://download.webmin.com/updates/:up \ SF/webadmin/${PORTNAME}/${PORTVERSION}:sf DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sf \ ${WEBMIN_MODULES:S/gz$/gz:up/} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= olgeni@FreeBSD.org COMMENT= Web-based interface for system administration for Unix WWW= https://www.webmin.com/ LICENSE= BSD3CLAUSE RUN_DEPENDS= p5-Authen-PAM>=0:security/p5-Authen-PAM \ p5-IO-Tty>=0:devel/p5-IO-Tty \ p5-Net-SSLeay>=0:security/p5-Net-SSLeay USES= cpe perl5 python shebangfix USE_PYTHON= py3kplist USE_RC_SUBR= webmin SUB_LIST= PERL=${PERL} SUB_FILES= pkg-message SHEBANG_FILES= ${WRKSRC}/ajaxterm/ajaxterm/ajaxterm.py \ ${WRKSRC}/ajaxterm/ajaxterm/configure \ ${WRKSRC}/webmin/acme_tiny.py WEBMIN_MODULES= post-extract: @${RM} ${WRKSRC}/mount/freebsd-mounts-? \ ${WRKSRC}/webmin-gentoo-init @if [ "${WEBMIN_MODULES}" != "" ]; then \ for webmin_module in ${WEBMIN_MODULES}; do \ ${ECHO} "===> Unpacking updated module: $${webmin_module}"; \ ${TAR} --unlink -xzf ${DISTDIR}/$${webmin_module} -C ${WRKSRC}; \ done; \ fi @${RM} -r -f ${WRKSRC}/acl/Authen-SolarisRBAC-0.1 post-patch: @${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" ${WRKSRC}/setup.sh - @${FIND} ${WRKSRC} \( -type f -and \( -name config-freebsd\* -or -name config \) \) \ + @${FIND} ${WRKSRC} \( -type f -and \( -name config-freebsd\* -or -name config -or -name setup.sh \) \) \ -exec ${REINPLACE_CMD} -e "s@/usr/local@${PREFIX}@g" {} \; \ -exec ${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" {} \; @${FIND} ${WRKSRC} \( -name "*.cgi" -or -name "*.pl" -or -name "*.sh" \) -exec \ ${REINPLACE_CMD} -e "s@%%PERL%%@${PERL}@g; s@#!/usr/bin/perl@#!${PERL}@; s@#!/usr/local/bin/perl@#!${PERL}@" {} \; @${FIND} ${WRKSRC} \( -name "*.orig" -or -name "*.bak" -or -name "*.pyc" \) -delete - @${PRINTF} "g/^FreeBSD/m0\nwq\n" | ex ${WRKSRC}/os_list.txt - do-build: @${PYTHON_CMD} -mcompileall ${WRKSRC}/ajaxterm/ajaxterm/ @${PYTHON_CMD} -O -mcompileall ${WRKSRC}/ajaxterm/ajaxterm/ @${CC} ${CFLAGS} -o ${WRKSRC}/mount/freebsd-mounts-7 ${WRKSRC}/mount/freebsd-mounts-7.c @${STRIP_CMD} ${WRKSRC}/mount/freebsd-mounts-7 do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/webmin ${CP} -r ${WRKSRC}/* ${STAGEDIR}${PREFIX}/lib/webmin .include diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo index 1722bcaf9aba..42fd089515f1 100644 --- a/sysutils/webmin/distinfo +++ b/sysutils/webmin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659360089 -SHA256 (webmin-1.997.tar.gz) = a7591eef4daa3e65de529dd21cdbbb97e53e7daf5a6aa446c3d7298a1fc717fd -SIZE (webmin-1.997.tar.gz) = 44723213 +TIMESTAMP = 1664549814 +SHA256 (webmin-2.000.tar.gz) = b7394544543262ab9c614266cf85cc634fd083e2a32b4fb981bcbf0fc53f2aab +SIZE (webmin-2.000.tar.gz) = 44822732 diff --git a/sysutils/webmin/files/patch-setup.sh b/sysutils/webmin/files/patch-setup.sh index 17804bd1a726..4146f59d0404 100644 --- a/sysutils/webmin/files/patch-setup.sh +++ b/sysutils/webmin/files/patch-setup.sh @@ -1,97 +1,94 @@ ---- setup.sh.orig 2022-07-04 19:10:33 UTC +--- setup.sh.orig 2022-10-01 06:55:59 UTC +++ setup.sh -@@ -105,19 +105,7 @@ echo "Webmin uses separate directories for configurati - echo "Unless you want to run multiple versions of Webmin at the same time" - echo "you can just accept the defaults." +@@ -13,6 +13,13 @@ if [ "$bootscript" = "" ]; then + bootscript="webmin" + fi + ++nostart="yes" ++nostop="yes" ++nochown="yes" ++nouninstall="yes" ++noperlpath="yes" ++atboot=0 ++ + cd `dirname $0` + if [ -x /bin/pwd ]; then + wadir=`/bin/pwd` +@@ -112,7 +119,7 @@ echo "you can just accept the defaults." echo "" --printf "Config file directory [/etc/webmin]: " --if [ "$config_dir" = "" ]; then -- read config_dir --fi --if [ "$config_dir" = "" ]; then + envetcdir="$config_dir" + if [ "$envetcdir" = "" ]; then +- envetcdir=/etc/webmin ++ envetcdir=%%PREFIX%%/etc/webmin + envetcdirnotfound=1 + fi + printf "Config file directory [$envetcdir]: " +@@ -120,7 +127,7 @@ if [ "$config_dir" = "" ]; then + read config_dir + fi + if [ "$config_dir" = "" ]; then - config_dir=/etc/webmin --fi --abspath=`echo $config_dir | grep "^/"` --if [ "$abspath" = "" ]; then -- echo "Config directory must be an absolute path" -- echo "" -- exit 2 --fi -+config_dir=/usr/local/etc/webmin - if [ ! -d $config_dir ]; then - mkdir $config_dir; - if [ $? != 0 ]; then -@@ -212,12 +200,12 @@ else ++ config_dir=%%PREFIX%%/etc/webmin + fi + abspath=`echo $config_dir | grep "^/"` + if [ "$abspath" = "" ]; then +@@ -214,7 +221,7 @@ if [ "$upgrading" = 1 ]; then + if [ $? != "0" ]; then + echo "logout=$config_dir/logout-flag" >> $config_dir/miniserv.conf fi - +- ++ + # Check for third-party modules in old version + if [ "$wadir" != "$oldwadir" ]; then + echo "Checking for third-party modules .." +@@ -231,7 +238,7 @@ if [ "$upgrading" = 1 ]; then + else + # Config directory exists .. make sure it is not in use + ls $config_dir | grep -v rpmsave >/dev/null 2>&1 +- if [ "$?" = "0" -a "$config_dir" != "/etc/webmin" ]; then ++ if [ "$?" = "0" -a "$config_dir" != "%%PREFIX%%/etc/webmin" ]; then + echo "ERROR: Config directory $config_dir is not empty" + echo "" + exit 2 +@@ -240,7 +247,7 @@ else # Ask for log directory -- printf "Log file directory [/var/webmin]: " -+ printf "Log file directory [/var/log/webmin]: " - if [ "$var_dir" = "" ]; then + envvardir="$var_dir" + if [ "$envvardir" = "" ]; then +- envvardir=/var/webmin ++ envvardir=/var/db/webmin + envvardirnotfound=1 + fi + printf "Log file directory [$envvardir]: " +@@ -248,7 +255,7 @@ else read var_dir fi if [ "$var_dir" = "" ]; then - var_dir=/var/webmin -+ var_dir=/var/log/webmin ++ var_dir=/var/db/webmin fi abspath=`echo $var_dir | grep "^/"` if [ "$abspath" = "" ]; then -@@ -245,7 +233,9 @@ else - echo "Webmin is written entirely in Perl. Please enter the full path to the" - echo "Perl 5 interpreter on your system." - echo "" -- if [ -x /usr/bin/perl ]; then -+ if [ -x %%PERL%% ]; then -+ perldef=%%PERL%% -+ elif [ -x /usr/bin/perl ]; then - perldef=/usr/bin/perl - elif [ -x /usr/local/bin/perl ]; then - perldef=/usr/local/bin/perl -@@ -446,6 +436,7 @@ else - fi - fi - -+ atboot=0 - # Ask whether to run at boot time - if [ "$atboot" = "" ]; then - if echo "$os_type" | grep -q "\-linux$"; then -@@ -607,6 +598,7 @@ EOF +@@ -305,7 +312,7 @@ else fi - fi + echo "" -+noperlpath="yes" - if [ "$noperlpath" = "" ]; then - echo "Inserting path to perl into scripts.." - (find "$wadir" -name '*.cgi' -print ; find "$wadir" -name '*.pl' -print) | $perl "$wadir/perlpath.pl" $perl - -@@ -618,7 +610,6 @@ fi - echo "Creating start and stop init scripts.." - # Start main - echo "#!/bin/sh" >$config_dir/.start-init --echo "echo Starting Webmin server in $wadir" >>$config_dir/.start-init - echo "trap '' 1" >>$config_dir/.start-init - echo "LANG=" >>$config_dir/.start-init - echo "export LANG" >>$config_dir/.start-init -@@ -849,6 +840,7 @@ if [ "$?" != "0" ]; then - echo passdelay=1 >> $config_dir/miniserv.conf - fi +- # Test perl ++ # Test perl + echo "Testing Perl .." + if [ ! -x $perl ]; then + echo "ERROR: Failed to find perl at $perl" +@@ -780,7 +787,7 @@ if [ -x "$systemctlcmd" ]; then -+nouninstall="yes" - if [ "$nouninstall" = "" ]; then - echo "Creating uninstall script $config_dir/uninstall.sh .." - cat >$config_dir/uninstall.sh <