diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile index feefbaca46da..96607b129e5d 100644 --- a/sysutils/usermin/Makefile +++ b/sysutils/usermin/Makefile @@ -1,57 +1,57 @@ PORTNAME= usermin -PORTVERSION= 1.840 +PORTVERSION= 1.853 CATEGORIES= sysutils MASTER_SITES= http://www.webmin.com/uupdates/:up \ SF/webadmin/${PORTNAME}/${PORTVERSION}:sf DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sf \ ${USERMIN_MODULES:S/gz$/gz:up/} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= olgeni@FreeBSD.org COMMENT= Web-based interface for performing some user tasks 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 NO_ARCH= yes NO_BUILD= yes USES= cpe perl5 CPE_VENDOR= webmin USE_RC_SUBR= usermin SUB_LIST= PERL=${PERL} SUB_FILES= pkg-message USERMIN_MODULES= post-extract: @if [ "${USERMIN_MODULES}" != "" ]; then \ for usermin_module in ${USERMIN_MODULES}; do \ ${ECHO} "===> Unpacking updated module: $${usermin_module}"; \ ${TAR} --unlink -xzf ${DISTDIR}/$${usermin_module} -C ${WRKSRC}; \ done; \ fi post-patch: @${REINPLACE_CMD} -e "s=%%PREFIX%%=${PREFIX}=" ${WRKSRC}/setup.sh .for file in filter/config commands/config htaccess/config @${REINPLACE_CMD} -i '' -e 's|=/etc/webmin|=${PREFIX}/etc/webmin|' ${WRKSRC}/${file} .endfor @${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 do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/usermin ${CP} -r ${WRKSRC}/* ${STAGEDIR}${PREFIX}/lib/usermin .include diff --git a/sysutils/usermin/distinfo b/sysutils/usermin/distinfo index 8dfce41fa009..c1a7390358ce 100644 --- a/sysutils/usermin/distinfo +++ b/sysutils/usermin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646584037 -SHA256 (usermin-1.840.tar.gz) = 21db7bdefded7013cc809aac50639b1118c03be0d82e8d34255b1e423030db10 -SIZE (usermin-1.840.tar.gz) = 17697136 +TIMESTAMP = 1659364882 +SHA256 (usermin-1.853.tar.gz) = dfe7b270982f96db6782522f72afde1c4810448c4217c91eae685097a0762fff +SIZE (usermin-1.853.tar.gz) = 17755175 diff --git a/sysutils/usermin/files/patch-setup.sh b/sysutils/usermin/files/patch-setup.sh index 9c81e19aabac..cc3b97dc3535 100644 --- a/sysutils/usermin/files/patch-setup.sh +++ b/sysutils/usermin/files/patch-setup.sh @@ -1,100 +1,101 @@ ---- setup.sh.orig 2015-02-15 03:16:25 UTC +--- setup.sh.orig 2022-07-26 22:01:51 UTC +++ setup.sh -@@ -15,16 +15,8 @@ +@@ -15,17 +15,9 @@ fi srcdir=$wadir ver=`cat "$wadir/version"` -# Find temp directory -if [ "$tempdir" = "" ]; then - tempdir=$tempdir -fi -- ++tempdir=/tmp/.usermin ++mkdir -p $tempdir + -if [ $? != "0" ]; then - echo "ERROR: Cannot find the Usermin install directory"; - echo ""; - exit 1; -fi -+tempdir=/tmp/.usermin -+mkdir -p $tempdir - +- echo "***********************************************************************" echo "* Welcome to the Usermin setup script, version $ver *" -@@ -84,19 +76,7 @@ + echo "***********************************************************************" +@@ -93,19 +85,7 @@ echo "Usermin uses separate directories for configurat echo "Unless you want to run multiple versions of Usermin at the same time" echo "you can just accept the defaults." echo "" -printf "Config file directory [/etc/usermin]: " -if [ "$config_dir" = "" ]; then - read config_dir -fi -if [ "$config_dir" = "" ]; then - config_dir=/etc/usermin -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/usermin if [ ! -d $config_dir ]; then mkdir $config_dir; if [ $? != 0 ]; then -@@ -194,12 +174,12 @@ +@@ -203,12 +183,12 @@ else fi # Ask for log directory - printf "Log file directory [/var/usermin]: " + printf "Log file directory [/var/log/usermin]: " if [ "$var_dir" = "" ]; then read var_dir fi if [ "$var_dir" = "" ]; then - var_dir=/var/usermin + var_dir=/var/log/usermin fi abspath=`echo $var_dir | grep "^/"` if [ "$abspath" = "" ]; then -@@ -227,7 +207,9 @@ +@@ -236,7 +216,9 @@ else echo "Usermin 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 -@@ -477,6 +459,7 @@ +@@ -495,6 +477,7 @@ EOF fi +noperlpath="yes" if [ "$noperlpath" = "" ]; then - echo "Inserting path to perl into scripts.." + echo "Inserting path to perl into scripts .." (find "$wadir" -name '*.cgi' -print ; find "$wadir" -name '*.pl' -print) | $perl "$wadir/perlpath.pl" $perl - -@@ -487,7 +470,6 @@ - echo "Creating start and stop scripts.." - rm -f $config_dir/stop $config_dir/start - echo "#!/bin/sh" >>$config_dir/start --echo "echo Starting Usermin server in $wadir" >>$config_dir/start - echo "trap '' 1" >>$config_dir/start - echo "LANG=" >>$config_dir/start - echo "export LANG" >>$config_dir/start -@@ -600,6 +582,7 @@ +@@ -506,7 +489,6 @@ fi + echo "Creating start and stop init scripts .." + # Start main + echo "#!/bin/sh" >$config_dir/.start-init +-echo "echo Starting Usermin 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 +@@ -701,6 +683,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 <