diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile index fafe9c70bd8b..7b20314c0220 100644 --- a/sysutils/usermin/Makefile +++ b/sysutils/usermin/Makefile @@ -1,58 +1,58 @@ PORTNAME= usermin -PORTVERSION= 1.861 +PORTVERSION= 2.301 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 WWW= http://www.usermin.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 NO_ARCH= yes NO_BUILD= yes USES= cpe perl5 CPE_VENDOR= webmin USE_RC_SUBR= usermin -SUB_LIST= PERL=${PERL} SUB_FILES= pkg-message +SUB_LIST= PERL=${PERL} 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 061c44e2dffc..3ac1a88e02b8 100644 --- a/sysutils/usermin/distinfo +++ b/sysutils/usermin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676582026 -SHA256 (usermin-1.861.tar.gz) = c4c86420c7aa959f061e8806325cd90a7a9e3eb5a5a04e37612a2fff6d42e023 -SIZE (usermin-1.861.tar.gz) = 18222341 +TIMESTAMP = 1749976024 +SHA256 (usermin-2.301.tar.gz) = 524ac4864afd50c7b71deb047f19dcaed97765da2fc067b8825a50dbd5e6f556 +SIZE (usermin-2.301.tar.gz) = 16253163 diff --git a/sysutils/usermin/files/patch-setup.sh b/sysutils/usermin/files/patch-setup.sh index cc3b97dc3535..af550b380f73 100644 --- a/sysutils/usermin/files/patch-setup.sh +++ b/sysutils/usermin/files/patch-setup.sh @@ -1,101 +1,54 @@ ---- setup.sh.orig 2022-07-26 22:01:51 UTC +--- setup.sh.orig +++ setup.sh -@@ -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 -- - echo "***********************************************************************" - echo "* Welcome to the Usermin setup script, version $ver *" - echo "***********************************************************************" -@@ -93,19 +85,7 @@ echo "Usermin uses separate directories for configurat +@@ -6,6 +6,13 @@ + # Find install directory + LANG= + export LANG ++nostart="yes" ++nostop="yes" ++nochown="yes" ++nouninstall="yes" ++noperlpath="yes" ++atboot=0 ++ + cd `dirname $0` + if [ -x /bin/pwd ]; then + wadir=`/bin/pwd` +@@ -93,12 +100,12 @@ 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 ++printf "Config file directory [%%PREFIX%%/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 -@@ -203,12 +183,12 @@ else ++ config_dir=%%PREFIX%%/etc/usermin + fi + abspath=`echo $config_dir | grep "^/"` + if [ "$abspath" = "" ]; then +@@ -202,19 +209,19 @@ + 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/usermin" ]; then ++ if [ "$?" = "0" -a "$config_dir" != "%%PREFIX%%/etc/usermin" ]; then + echo "ERROR: Config directory $config_dir is not empty" + echo "" + exit 2 fi # Ask for log directory - printf "Log file directory [/var/usermin]: " -+ printf "Log file directory [/var/log/usermin]: " ++ printf "Log file directory [/var/db/usermin]: " if [ "$var_dir" = "" ]; then read var_dir fi if [ "$var_dir" = "" ]; then - var_dir=/var/usermin -+ var_dir=/var/log/usermin ++ var_dir=/var/db/usermin fi abspath=`echo $var_dir | grep "^/"` if [ "$abspath" = "" ]; then -@@ -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 -@@ -495,6 +477,7 @@ EOF - - 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 - -@@ -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 <