git: d1370093a146 - main - sysutils/usermin: update to version 1.853

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jimmy Olgeni <olgeni_at_FreeBSD.org>
Date: Fri, 19 Aug 2022 17:11:52 UTC
The branch main has been updated by olgeni:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d1370093a146621204c8756d4d2b74c6bd5ae36f

commit d1370093a146621204c8756d4d2b74c6bd5ae36f
Author:     Jimmy Olgeni <olgeni@FreeBSD.org>
AuthorDate: 2022-08-18 17:19:47 +0000
Commit:     Jimmy Olgeni <olgeni@FreeBSD.org>
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 <<EOF
-@@ -644,6 +627,7 @@
- 	rm -f $config_dir/install-dir
+@@ -764,6 +747,7 @@ if [ -r "$srcdir/setup-post.sh" ]; then
+ 	. "$srcdir/setup-post.sh"
  fi
  
 +nostart="yes"
  if [ "$nostart" = "" ]; then
  	if [ "$inetd" != "1" ]; then
- 		echo "Attempting to start Usermin mini web server.."
+ 		action="start"
diff --git a/sysutils/usermin/pkg-plist b/sysutils/usermin/pkg-plist
index 3665abb10470..d86f0601c99f 100644
--- a/sysutils/usermin/pkg-plist
+++ b/sysutils/usermin/pkg-plist
@@ -271,6 +271,7 @@ lib/usermin/authentic-theme/extensions/file-manager/http_download.cgi
 lib/usermin/authentic-theme/extensions/file-manager/list-images.cgi
 lib/usermin/authentic-theme/extensions/file-manager/list.cgi
 lib/usermin/authentic-theme/extensions/file-manager/paste.cgi
+lib/usermin/authentic-theme/extensions/file-manager/purge_trash.cgi
 lib/usermin/authentic-theme/extensions/file-manager/rename.cgi
 lib/usermin/authentic-theme/extensions/file-manager/search.cgi
 lib/usermin/authentic-theme/extensions/file-manager/tree.cgi
@@ -1262,11 +1263,6 @@ lib/usermin/authentic-theme/images/right.gif
 lib/usermin/authentic-theme/images/screenshot.png
 lib/usermin/authentic-theme/images/search.gif
 lib/usermin/authentic-theme/images/smallicon.gif
-lib/usermin/authentic-theme/images/sort_asc.png
-lib/usermin/authentic-theme/images/sort_asc_disabled.png
-lib/usermin/authentic-theme/images/sort_both.png
-lib/usermin/authentic-theme/images/sort_desc.png
-lib/usermin/authentic-theme/images/sort_desc_disabled.png
 lib/usermin/authentic-theme/images/sortasc.gif
 lib/usermin/authentic-theme/images/sortascgrey.gif
 lib/usermin/authentic-theme/images/sortdesc.gif
@@ -1375,6 +1371,7 @@ lib/usermin/authentic-theme/modules/filemin/config.info.de
 lib/usermin/authentic-theme/navigation-lib.pl
 lib/usermin/authentic-theme/pam_login.cgi
 lib/usermin/authentic-theme/password_form.cgi
+lib/usermin/authentic-theme/postinstall-usermin.pl
 lib/usermin/authentic-theme/postinstall.pl
 lib/usermin/authentic-theme/service-worker.js
 lib/usermin/authentic-theme/session_login.cgi
@@ -1385,6 +1382,7 @@ lib/usermin/authentic-theme/settings-editor_favorites_write.cgi
 lib/usermin/authentic-theme/settings-editor_read.cgi
 lib/usermin/authentic-theme/settings-editor_write.cgi
 lib/usermin/authentic-theme/settings-favorites_save.cgi
+lib/usermin/authentic-theme/settings-lib.pl
 lib/usermin/authentic-theme/settings-logos.cgi
 lib/usermin/authentic-theme/settings-logos_save.cgi
 lib/usermin/authentic-theme/stats.cgi
@@ -1742,6 +1740,7 @@ lib/usermin/authentic-theme/unauthenticated/js/photoswipe.min.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/quill.min.js
 lib/usermin/authentic-theme/unauthenticated/js/quill.min.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/service-worker.js
+lib/usermin/authentic-theme/uninstall-usermin.pl
 lib/usermin/authentic-theme/uninstall.pl
 lib/usermin/authentic-theme/xhr-lib.pl
 lib/usermin/authentic-theme/xhr.cgi
@@ -3251,10 +3250,12 @@ lib/usermin/cron/lang/be.auto
 lib/usermin/cron/lang/bg
 lib/usermin/cron/lang/bg.auto
 lib/usermin/cron/lang/ca
+lib/usermin/cron/lang/ca.auto
 lib/usermin/cron/lang/cs
 lib/usermin/cron/lang/cs.auto
 lib/usermin/cron/lang/da.auto
 lib/usermin/cron/lang/de
+lib/usermin/cron/lang/de.auto
 lib/usermin/cron/lang/el.auto
 lib/usermin/cron/lang/en
 lib/usermin/cron/lang/es
@@ -3271,6 +3272,7 @@ lib/usermin/cron/lang/hr
 lib/usermin/cron/lang/hr.auto
 lib/usermin/cron/lang/hu
 lib/usermin/cron/lang/hu.UTF-8
+lib/usermin/cron/lang/hu.auto
 lib/usermin/cron/lang/it
 lib/usermin/cron/lang/it.auto
 lib/usermin/cron/lang/ja
@@ -3285,6 +3287,7 @@ lib/usermin/cron/lang/mt.auto
 lib/usermin/cron/lang/nl
 lib/usermin/cron/lang/nl.auto
 lib/usermin/cron/lang/no
+lib/usermin/cron/lang/no.auto
 lib/usermin/cron/lang/pl
 lib/usermin/cron/lang/pl.auto
 lib/usermin/cron/lang/pt
@@ -4721,10 +4724,12 @@ lib/usermin/filter/lang/ar.auto
 lib/usermin/filter/lang/be.auto
 lib/usermin/filter/lang/bg.auto
 lib/usermin/filter/lang/ca
+lib/usermin/filter/lang/ca.auto
 lib/usermin/filter/lang/cs
 lib/usermin/filter/lang/cs.auto
 lib/usermin/filter/lang/da.auto
 lib/usermin/filter/lang/de
+lib/usermin/filter/lang/de.auto
 lib/usermin/filter/lang/el
 lib/usermin/filter/lang/el.auto
 lib/usermin/filter/lang/en
@@ -4748,6 +4753,7 @@ lib/usermin/filter/lang/mt.auto
 lib/usermin/filter/lang/nl
 lib/usermin/filter/lang/nl.auto
 lib/usermin/filter/lang/no
+lib/usermin/filter/lang/no.auto
 lib/usermin/filter/lang/pl
 lib/usermin/filter/lang/pl.auto
 lib/usermin/filter/lang/pt.auto
@@ -7736,7 +7742,8 @@ lib/usermin/mysql/config-aix
 lib/usermin/mysql/config-cobalt-linux
 lib/usermin/mysql/config-coherent-linux
 lib/usermin/mysql/config-debian-linux
-lib/usermin/mysql/config-debian-linux-2.2-ALL
+lib/usermin/mysql/config-debian-linux-10.0-ALL
+lib/usermin/mysql/config-debian-linux-2.2-9.0
 lib/usermin/mysql/config-freebsd
 lib/usermin/mysql/config-gentoo-linux
 lib/usermin/mysql/config-mandrake-linux
@@ -11674,6 +11681,7 @@ lib/usermin/procmail/lang/cs
 lib/usermin/procmail/lang/cs.auto
 lib/usermin/procmail/lang/da.auto
 lib/usermin/procmail/lang/de
+lib/usermin/procmail/lang/de.auto
 lib/usermin/procmail/lang/el.auto
 lib/usermin/procmail/lang/en
 lib/usermin/procmail/lang/es
@@ -11686,6 +11694,7 @@ lib/usermin/procmail/lang/fr.auto
 lib/usermin/procmail/lang/he.auto
 lib/usermin/procmail/lang/hr.auto
 lib/usermin/procmail/lang/hu
+lib/usermin/procmail/lang/hu.auto
 lib/usermin/procmail/lang/it
 lib/usermin/procmail/lang/it.auto
 lib/usermin/procmail/lang/ja.auto
@@ -11696,7 +11705,9 @@ lib/usermin/procmail/lang/lv.auto
 lib/usermin/procmail/lang/ms.auto
 lib/usermin/procmail/lang/mt.auto
 lib/usermin/procmail/lang/nl
+lib/usermin/procmail/lang/nl.auto
 lib/usermin/procmail/lang/no
+lib/usermin/procmail/lang/no.auto
 lib/usermin/procmail/lang/pl
 lib/usermin/procmail/lang/pl.auto
 lib/usermin/procmail/lang/pt.auto
@@ -13765,6 +13776,7 @@ lib/usermin/ulang/vi.auto
 lib/usermin/ulang/zh.auto
 lib/usermin/ulang/zh_TW.auto
 lib/usermin/update-from-repo.sh
+lib/usermin/updateboot.pl
 lib/usermin/updown/CHANGELOG
 lib/usermin/updown/cancel.cgi
 lib/usermin/updown/config
@@ -13917,11 +13929,11 @@ lib/usermin/updown/updown-lib.pl
 lib/usermin/updown/upload.cgi
 lib/usermin/uptracker.cgi
 lib/usermin/user_chooser.cgi
-lib/usermin/usermin-daemon
 lib/usermin/usermin-debian-pam
 lib/usermin/usermin-init
 lib/usermin/usermin-pam
 lib/usermin/usermin-pam-osx
+lib/usermin/usermin-systemd
 lib/usermin/usermount/CHANGELOG
 lib/usermin/usermount/config
 lib/usermin/usermount/config.info