Index: head/sysutils/webmin/Makefile =================================================================== --- head/sysutils/webmin/Makefile (revision 567934) +++ head/sysutils/webmin/Makefile (revision 567935) @@ -1,68 +1,68 @@ # Created by: Andreas Klemm # $FreeBSD$ PORTNAME= webmin -PORTVERSION= 1.970 +PORTVERSION= 1.973 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 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 \) \) \ -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 Index: head/sysutils/webmin/distinfo =================================================================== --- head/sysutils/webmin/distinfo (revision 567934) +++ head/sysutils/webmin/distinfo (revision 567935) @@ -1,3 +1,3 @@ -TIMESTAMP = 1610880555 -SHA256 (webmin-1.970.tar.gz) = 6798027c7230be1adf6cf2fd27a74185718abcb0e1ff8b674a518b41e885651e -SIZE (webmin-1.970.tar.gz) = 47312887 +TIMESTAMP = 1615282799 +SHA256 (webmin-1.973.tar.gz) = 1913836c76ef4f38d7ffc997f26039b0fbb170126264077bacd3d76e4731c6b0 +SIZE (webmin-1.973.tar.gz) = 45258810 Index: head/sysutils/webmin/files/patch-setup.sh =================================================================== --- head/sysutils/webmin/files/patch-setup.sh (revision 567934) +++ head/sysutils/webmin/files/patch-setup.sh (revision 567935) @@ -1,117 +1,97 @@ ---- setup.sh.orig 2020-07-01 17:46:39 UTC +--- setup.sh.orig 2021-03-07 18:10:32 UTC +++ setup.sh -@@ -17,17 +17,9 @@ fi - srcdir=$wadir - ver=`cat "$wadir/version"` - --# Find temp directory --if [ "$tempdir" = "" ]; then -- tempdir=/tmp/.webmin --fi -+tempdir=/tmp/.webmin -+mkdir -p $tempdir - --if [ $? != "0" ]; then -- echo "ERROR: Cannot find the Webmin install directory"; -- echo ""; -- exit 1; --fi -- - echo "***********************************************************************" - echo "* Welcome to the Webmin setup script, version $ver *" - echo "***********************************************************************" -@@ -98,19 +90,7 @@ echo "Webmin uses separate directories for configurati +@@ -102,19 +102,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." echo "" -printf "Config file directory [/etc/webmin]: " -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 -@@ -210,12 +190,12 @@ else +@@ -209,12 +197,12 @@ else fi # Ask for log directory - printf "Log file directory [/var/webmin]: " + printf "Log file directory [/var/log/webmin]: " if [ "$var_dir" = "" ]; then read var_dir fi if [ "$var_dir" = "" ]; then - var_dir=/var/webmin + var_dir=/var/log/webmin fi abspath=`echo $var_dir | grep "^/"` if [ "$abspath" = "" ]; then -@@ -243,7 +223,9 @@ else +@@ -242,7 +230,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 -@@ -444,6 +426,7 @@ else +@@ -443,6 +433,7 @@ else fi fi + atboot=0 # Ask whether to run at boot time if [ "$atboot" = "" ]; then if echo "$os_type" | grep -q "\-linux$"; then -@@ -593,6 +576,7 @@ EOF +@@ -594,6 +585,7 @@ EOF fi fi +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 - -@@ -603,7 +587,6 @@ fi +@@ -604,7 +596,6 @@ fi echo "Creating start and stop scripts.." rm -f $config_dir/stop $config_dir/start $config_dir/restart $config_dir/reload echo "#!/bin/sh" >>$config_dir/start -echo "echo Starting Webmin server in $wadir" >>$config_dir/start echo "trap '' 1" >>$config_dir/start echo "LANG=" >>$config_dir/start echo "export LANG" >>$config_dir/start -@@ -754,6 +737,7 @@ if [ "$?" != "0" ]; then +@@ -763,6 +754,7 @@ if [ "$?" != "0" ]; then echo passdelay=1 >> $config_dir/miniserv.conf fi +nouninstall="yes" if [ "$nouninstall" = "" ]; then echo "Creating uninstall script $config_dir/uninstall.sh .." cat >$config_dir/uninstall.sh <