From nobody Fri Aug 19 17:11:52 2022 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 4M8SwT2M41z4Zc9H; Fri, 19 Aug 2022 17:11:53 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M8SwT1PyTz3LXR; Fri, 19 Aug 2022 17:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660929113; 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=+zMCcgRM97l2pbwPDrc9HM8MDY0WMPn9BWvefQ8OBHM=; b=iVXKTzHyCEIc8i2xYfdzkA2smxds5aVYoVWVPgFxoCMOGgXarzmvnNVASiDuw186mKyE/O Ww4fldtToT5alIqG8UNV2hDEVgQEFYhTo4zgnTYbE9U1YIsfXa7gUV1dpdFBMM4iUKQTGY Q5eRKJLffaK/+BNK6rvBIw0l7pPPTt0bT7j2efkJ1JIMGY/zflN3Jz3qHGk9QxTMgxy7SW Sf4exZdGgWR2X8Qqe9wDJHPHyShAp8mShFI4YQKJcUPqwoz9NqHLN7X9MwFMAYaxRTz6Au Iex0H4ySyrVLcZ0v2TIk1HHn4np6BwZosjZXdMVjqW5iHEaW3JEMhW8JanKucg== 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 4M8SwS74JSz112Y; Fri, 19 Aug 2022 17:11:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27JHBqwv030029; Fri, 19 Aug 2022 17:11:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27JHBq3U030028; Fri, 19 Aug 2022 17:11:52 GMT (envelope-from git) Date: Fri, 19 Aug 2022 17:11:52 GMT Message-Id: <202208191711.27JHBq3U030028@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: d1370093a146 - main - sysutils/usermin: update to version 1.853 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: d1370093a146621204c8756d4d2b74c6bd5ae36f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660929113; 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=+zMCcgRM97l2pbwPDrc9HM8MDY0WMPn9BWvefQ8OBHM=; b=tIlHtbYlviC5RvdfudkrHi5Lw6e5b6oNs25/acX33K7JrcBwdry7052nqpYoCjmyoHcuwv 8W+QBigtD4D/Y8HJbtc9Vsa7iyWoUyKWmCdc7rUW3G5oiUxXbT/+q+T/KV2ici6I54vLCY WZKC+3kA5m2b8vpJQ1bdhIwLzOczxmd+LK/cNYxAh/lEU2HV1BgM670A9YtOLHOMFbcZ7t +ovuHY6omHX0OQlPPwSOteDIEt0vBFix2EN234VP+S9RJfjVbWKtB/vNEPPQPNruao7a00 rjRGYHxzr6AUu38hDRbQ+nDVqh5fBVBSOCoVUSRJhad+hTnjK0tUzJxjgmOn2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660929113; a=rsa-sha256; cv=none; b=aUbVeh8hSd/iyjnpPTqf2pUxAslo7j+5uGH6ZuT2sz2NvtuDQ99wAvaUMVrdFNbmuPJsNx +THM8jvl1H2hnzNQllUZ+iOrprddGGUeK/obryyRD9IUfGwUPj9whrJjsazD+Q0JZthmVf f6L0dMsvW0IpDSdSY/HZylhpqHobrVJx9qpXAj8CXqpIqFpg6R6Zpu7MITNm8TvnKUUrT5 TJiXfFaVyVRIs2B8Uc4ZnXSKH7tklycpKGDVhkEw3yAfsCjzKhjwJeOr2vCqMiVtSAWg3l XcvsqOdKkrZruRyChNBK0bZ+g6P99iaBBkpQrJrleJNB7dlVd7zx8V37HzCiSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by olgeni: URL: https://cgit.FreeBSD.org/ports/commit/?id=d1370093a146621204c8756d4d2b74c6bd5ae36f commit d1370093a146621204c8756d4d2b74c6bd5ae36f Author: Jimmy Olgeni AuthorDate: 2022-08-18 17:19:47 +0000 Commit: Jimmy Olgeni CommitDate: 2022-08-19 17:11:29 +0000 sysutils/usermin: update to version 1.853 --- sysutils/usermin/Makefile | 2 +- sysutils/usermin/distinfo | 6 ++--- sysutils/usermin/files/patch-setup.sh | 47 ++++++++++++++++++----------------- sysutils/usermin/pkg-plist | 26 +++++++++++++------ 4 files changed, 47 insertions(+), 34 deletions(-) diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile index feefbaca46da..96607b129e5d 100644 --- a/sysutils/usermin/Makefile +++ b/sysutils/usermin/Makefile @@ -1,5 +1,5 @@ PORTNAME= usermin -PORTVERSION= 1.840 +PORTVERSION= 1.853 CATEGORIES= sysutils MASTER_SITES= http://www.webmin.com/uupdates/:up \ SF/webadmin/${PORTNAME}/${PORTVERSION}:sf 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,6 +1,6 @@ ---- 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"` @@ -8,18 +8,19 @@ -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 "" @@ -40,7 +41,7 @@ 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 @@ -55,7 +56,7 @@ 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 "" @@ -66,23 +67,23 @@ 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 @@ -90,11 +91,11 @@ if [ "$nouninstall" = "" ]; then echo "Creating uninstall script $config_dir/uninstall.sh .." cat >$config_dir/uninstall.sh <