From nobody Sun Jun 15 11:26:44 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bKrSP0Tqlz5xxgD; Sun, 15 Jun 2025 11:26:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bKrSN6Ylrz3xt0; Sun, 15 Jun 2025 11:26:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749986804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x6UWen+TltOX9r7+T5BEDVbkzjr5i+/M/kCaIlwqUjs=; b=WMSlQOgjlaEcUEqZkr70SFZCoeikS3QXs7nzGhgCAxJDOBHfmgywcqB7K8TVndl+Frgk9x MivQl9Z54z+Jhw6mgFYNClbCdFde8Z+LVuFpIjAcG38bgq+K7BKbxYHOSYG52Zb2DGiOit KpuFBU7RrJmHyYqnS5WOtvMYIY9zk+wk6M+L7ehRk/94p6Gpfzq4iDR0N23tvkCWxFWvTc 1I14zsaqr+4u7YhZ1577KbSrccuPoDyCmxX5cRYgBw33QruziCL2/kRu3HbjLmuXMxrwiA XLP6E5aHj/AgqL/wSXHxXFtNxzlH8o+V1HvlXGsSwXgAmJzMPlYZmT9zqg/Wug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749986804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x6UWen+TltOX9r7+T5BEDVbkzjr5i+/M/kCaIlwqUjs=; b=fF6lDfZkOUpBCpLlwtvEislqudHrU+HJPeVodjpA8dkelHVk+tjUvRfH51uY64qptWEQv9 nZP9SvcCpd9OsY1ENMrh+WyhExmYlKLsaiu35YSom47PXgwbWwF3pY+gjuVgaQMfg0cvJ3 8pGWKEMnGOv7nrenjfrwSWGhNTMVx5II+4P6ko9Y5xe2Uj2YrJDgSbb1IMechszB1MF95Z DFAzVhd5gmnr87yF0QWa4RQodQRrvRYwr4LwU2+JE4z/SHOIzDuiXN3Qk/vai/cWV6j6x9 MWuJ4wDVfJ5OR0rIOWlUv8TLqIf9lqz53mvCVrdwjLxgJQwJ9rANTdZHLlJxsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749986804; a=rsa-sha256; cv=none; b=R3xiZyHjCldrDj2lb1Yq+mRqEeNBkldsaqtkcqB9iNDrCpFRhxaD/8i9hMoCRA/zn36JzI aTAa1lk8vpX4krAiFovoTGehU13+ab9mzGct24T3Q5c2sgoqLUXm1SWc1O1zTVFRdotBCk ZepAT+SuuxL35uTeEpD1HLnI1eldjEqXfTDS4weOcPkZBkpVlcZuN/5k+2hYxt32HZGXrm Pg1ZDI7sBIU8z306st/gQGpHSaKa0rlnD7SRIu5E27l81YyTGl1Er3JiiLdvn6RmG99Uab AcnD20OWkUDB92t5JwQMKkFHrpCy7xhkGY1kR7OHqYnFRgRXLfoAfJtb+9Uh4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bKrSN68rrz198K; Sun, 15 Jun 2025 11:26:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55FBQifm022491; Sun, 15 Jun 2025 11:26:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55FBQi4q022488; Sun, 15 Jun 2025 11:26:44 GMT (envelope-from git) Date: Sun, 15 Jun 2025 11:26:44 GMT Message-Id: <202506151126.55FBQi4q022488@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jimmy Olgeni Subject: git: 0991e2b97426 - main - sysutils/usermin: update to version 2.301 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olgeni X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0991e2b97426df959f24d5aea0258f3e888c8e9c Auto-Submitted: auto-generated The branch main has been updated by olgeni: URL: https://cgit.FreeBSD.org/ports/commit/?id=0991e2b97426df959f24d5aea0258f3e888c8e9c commit 0991e2b97426df959f24d5aea0258f3e888c8e9c Author: Jimmy Olgeni AuthorDate: 2025-06-15 10:55:19 +0000 Commit: Jimmy Olgeni CommitDate: 2025-06-15 11:25:11 +0000 sysutils/usermin: update to version 2.301 --- sysutils/usermin/Makefile | 4 +- sysutils/usermin/distinfo | 6 +- sysutils/usermin/files/patch-setup.sh | 119 +- sysutils/usermin/files/usermin.in | 5 +- sysutils/usermin/pkg-plist | 4807 ++++++++------------------------- 5 files changed, 1110 insertions(+), 3831 deletions(-) diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile index fafe9c70bd8b..7b20314c0220 100644 --- a/sysutils/usermin/Makefile +++ b/sysutils/usermin/Makefile @@ -1,5 +1,5 @@ PORTNAME= usermin -PORTVERSION= 1.861 +PORTVERSION= 2.301 CATEGORIES= sysutils MASTER_SITES= http://www.webmin.com/uupdates/:up \ SF/webadmin/${PORTNAME}/${PORTVERSION}:sf @@ -22,8 +22,8 @@ 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= 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 <