[pkgsrc/trunk]: pkgsrc/sysutils/webmin Update to 1.600. Closes PR/45066.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/sysutils/webmin Update to 1.600. Closes PR/45066.
From: shattered <shattered%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 13:09:52 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/0bd43744b532
branches:  trunk
changeset: 610668:0bd43744b532
user:      shattered <shattered%pkgsrc.org@localhost>
date:      Fri Nov 02 19:02:50 2012 +0000

description:
Update to 1.600.  Closes PR/45066.

Too many changes to list here.

diffstat:

 sysutils/webmin/DEINSTALL                |    2 +-
 sysutils/webmin/INSTALL                  |    2 +-
 sysutils/webmin/MESSAGE                  |    2 +-
 sysutils/webmin/Makefile                 |   38 +-
 sysutils/webmin/PLIST                    |  865 ++++++++++++++++++++++++++----
 sysutils/webmin/distinfo                 |   36 +-
 sysutils/webmin/files/setup-pre.sh       |    2 +-
 sysutils/webmin/files/wbm-deinstall.tmpl |    2 +-
 sysutils/webmin/files/wbm-install.tmpl   |    2 +-
 sysutils/webmin/files/webmin.sh          |    2 +-
 sysutils/webmin/patches/patch-aa         |    2 +
 sysutils/webmin/patches/patch-ac         |   26 +-
 sysutils/webmin/patches/patch-ad         |   10 +-
 sysutils/webmin/patches/patch-ae         |   10 +-
 sysutils/webmin/patches/patch-ag         |   10 +-
 sysutils/webmin/patches/patch-ah         |   10 +-
 sysutils/webmin/patches/patch-ai         |   16 +-
 sysutils/webmin/patches/patch-an         |   12 +-
 sysutils/webmin/patches/patch-ap         |   14 +-
 sysutils/webmin/patches/patch-av         |   14 +-
 sysutils/webmin/patches/patch-aw         |   14 +-
 sysutils/webmin/patches/patch-ax         |   37 +-
 sysutils/webmin/patches/patch-ay         |   29 +-
 sysutils/webmin/patches/patch-az         |   17 +-
 sysutils/webmin/version.mk               |    4 +-
 sysutils/webmin/wbm.mk                   |    4 +-
 26 files changed, 917 insertions(+), 265 deletions(-)

diffs (truncated from 2588 to 300 lines):

diff -r d0d94d22cab0 -r 0bd43744b532 sysutils/webmin/DEINSTALL
--- a/sysutils/webmin/DEINSTALL Fri Nov 02 16:07:33 2012 +0000
+++ b/sysutils/webmin/DEINSTALL Fri Nov 02 19:02:50 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEINSTALL,v 1.5 2007/10/08 08:47:03 obache Exp $
+# $NetBSD: DEINSTALL,v 1.6 2012/11/02 19:02:50 shattered Exp $
 
 case ${STAGE} in
 DEINSTALL)
diff -r d0d94d22cab0 -r 0bd43744b532 sysutils/webmin/INSTALL
--- a/sysutils/webmin/INSTALL   Fri Nov 02 16:07:33 2012 +0000
+++ b/sysutils/webmin/INSTALL   Fri Nov 02 19:02:50 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.1 2007/10/08 08:47:05 obache Exp $
+# $NetBSD: INSTALL,v 1.2 2012/11/02 19:02:50 shattered Exp $
 
 case ${STAGE} in
 POST-INSTALL)
diff -r d0d94d22cab0 -r 0bd43744b532 sysutils/webmin/MESSAGE
--- a/sysutils/webmin/MESSAGE   Fri Nov 02 16:07:33 2012 +0000
+++ b/sysutils/webmin/MESSAGE   Fri Nov 02 19:02:50 2012 +0000
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2006/05/16 18:30:20 jlam Exp $
+$NetBSD: MESSAGE,v 1.5 2012/11/02 19:02:50 shattered Exp $
 
 By default, the Webmin server listens on port 10000, e.g. it may be
 accessed at:
diff -r d0d94d22cab0 -r 0bd43744b532 sysutils/webmin/Makefile
--- a/sysutils/webmin/Makefile  Fri Nov 02 16:07:33 2012 +0000
+++ b/sysutils/webmin/Makefile  Fri Nov 02 19:02:50 2012 +0000
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.32 2012/10/23 19:51:34 asau Exp $
+# $NetBSD: Makefile,v 1.33 2012/11/02 19:02:50 shattered Exp $
 
 .include "version.mk"
 
 DISTNAME=      webmin-${WBM_VERSION}
-PKGREVISION=   5
+#KGREVISION=   5
 CATEGORIES=    sysutils www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=webadmin/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.webmin.com/
 COMMENT=       Perl web server and CGI for Unix system administration
+LICENSE=        modified-bsd
 
 DEPENDS+=      p5-Net-SSLeay-[0-9]*:../../security/p5-Net-SSLeay
 
@@ -81,18 +82,18 @@
                *)      rm -rf $${m} ;;                                 \
                esac;                                                   \
        done &&                                                         \
-       for t in `${ECHO} */theme.info | ${SED} -e 's/\/theme.info//g'`; do\
+       for t in `${ECHO} */theme.info | sed -e 's/\/theme.info//g'`; do\
                rm -rf $${t};                                           \
        done &&                                                         \
        touch ${WRKSRC}/minimal-install
 
 do-configure:
-       ${SED}  -e "s,@WEBMIN_EGDIR@,${DESTDIR}/${WEBMIN_EGDIR},g"      \
-               -e "s,@WEBMIN_VARDIR@,${DESTDIR}/${WEBMIN_VARDIR},g"    \
+       sed     -e "s,@WEBMIN_EGDIR@,${DESTDIR}${WEBMIN_EGDIR},g"       \
+               -e "s,@WEBMIN_VARDIR@,${DESTDIR}${WEBMIN_VARDIR},g"     \
                -e "s,@PERL5@,"${PERL5:Q}",g"                           \
                ${FILESDIR}/setup-pre.sh > ${WRKSRC}/setup-pre.sh
        cd ${WRKSRC}; for file in acl/config acl/config-*; do           \
-               ${SED} -e "s,^ssleay=.*,ssleay=${SSLBASE}/bin/openssl," \
+               sed -e "s,^ssleay=.*,ssleay=${SSLBASE}/bin/openssl,"    \
                        "$$file" > "$$file.new";                        \
                ${MV} -f "$$file.new" "$$file";                         \
        done
@@ -103,22 +104,31 @@
 #
 do-install:
        ${SH} ${WRKSRC}/setup.sh ${DESTDIR}${WEBMIN_DIR}
-       ${SED}  -e "/^env_WEBMIN_CONFIG=/s,${WEBMIN_EGDIR},${WEBMIN_ETCDIR}," \
-               -e "/^logout=/s,${WEBMIN_EGDIR},${WEBMIN_ETCDIR},"      \
-               -e "/^userfile=/s,${WEBMIN_EGDIR},${WEBMIN_ETCDIR},"    \
-               -e "/^keyfile=/s,${WEBMIN_EGDIR},${WEBMIN_ETCDIR},"     \
+       sed     -e "/^env_WEBMIN_CONFIG=/s,${DESTDIR}${WEBMIN_EGDIR},${WEBMIN_ETCDIR}," \
+               -e "/^logout=/s,${DESTDIR}${WEBMIN_EGDIR},${WEBMIN_ETCDIR},"    \
+               -e "/^userfile=/s,${DESTDIR}${WEBMIN_EGDIR},${WEBMIN_ETCDIR},"  \
+               -e "/^keyfile=/s,${DESTDIR}${WEBMIN_EGDIR},${WEBMIN_ETCDIR},"   \
+               -e "s,${DESTDIR},,g"    \
                ${DESTDIR}${WEBMIN_EGDIR}/miniserv.conf > ${WRKDIR}/miniserv.conf
-       for file in reload start stop; do                               \
-               ${SED}  -e "s,${WEBMIN_EGDIR}/miniserv.conf,${WEBMIN_ETCDIR}/miniserv.conf," \
+       sed     -e "s,${DESTDIR},,g"    \
+               ${DESTDIR}${WEBMIN_DIR}/setup-pre.sh > ${WRKDIR}/setup-pre.sh
+       for file in install-dir reload restart start stop var-path; do  \
+               sed     -e "s,${DESTDIR}${WEBMIN_EGDIR}/miniserv.conf,${WEBMIN_ETCDIR}/miniserv.conf," \
+                       -e "s,${DESTDIR},,g"    \
                        ${DESTDIR}${WEBMIN_EGDIR}/$$file > ${WRKDIR}/$$file; \
        done
-       cd ${DESTDIR}${WEBMIN_EGDIR} && ${RM} -f miniserv.conf reload start stop
+       cd ${DESTDIR}${WEBMIN_EGDIR} && ${RM} -f miniserv.conf install-dir reload restart start stop var-path
        for file in miniserv.conf; do                                   \
                ${INSTALL_DATA} ${WRKDIR}/$$file                        \
                                    ${DESTDIR}${WEBMIN_EGDIR}/$$file;   \
                ${RM} -f ${WRKDIR}/$$file;                              \
        done
-       for file in reload start stop; do                               \
+       for file in setup-pre.sh; do                                    \
+               ${INSTALL_SCRIPT} ${WRKDIR}/$$file                      \
+                                   ${DESTDIR}${WEBMIN_DIR}/$$file;     \
+               ${RM} -f ${WRKDIR}/$$file;                              \
+       done
+       for file in install-dir reload restart start stop var-path; do  \
                ${INSTALL_SCRIPT} ${WRKDIR}/$$file                      \
                                    ${DESTDIR}${WEBMIN_EGDIR}/$$file;   \
                ${RM} -f ${WRKDIR}/$$file;                              \
diff -r d0d94d22cab0 -r 0bd43744b532 sysutils/webmin/PLIST
--- a/sysutils/webmin/PLIST     Fri Nov 02 16:07:33 2012 +0000
+++ b/sysutils/webmin/PLIST     Fri Nov 02 19:02:50 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2012/06/08 16:05:11 joerg Exp $
+@comment $NetBSD: PLIST,v 1.16 2012/11/02 19:02:50 shattered Exp $
 share/examples/rc.d/webmin
 share/examples/webmin/acl/config
 share/examples/webmin/config
@@ -23,9 +23,7 @@
 share/examples/webmin/webminlog/config
 share/webmin/LICENCE
 share/webmin/LICENCE.ja
-share/webmin/PATENTS
 share/webmin/README
-share/webmin/WebminCore.pm
 share/webmin/Webmin/All.pm
 share/webmin/Webmin/Button.pm
 share/webmin/Webmin/Checkbox.pm
@@ -68,46 +66,64 @@
 share/webmin/Webmin/TitleList.pm
 share/webmin/Webmin/Upload.pm
 share/webmin/Webmin/User.pm
+share/webmin/WebminCore.pm
 share/webmin/acl/CHANGELOG
 share/webmin/acl/acl-lib.pl
 share/webmin/acl/acl_security.pl
 share/webmin/acl/backup_config.pl
 share/webmin/acl/cert_form.cgi
 share/webmin/acl/cert_issue.cgi
-share/webmin/acl/cert_issue_ie.cgi
 share/webmin/acl/cert_output.cgi
+share/webmin/acl/cgi_args.pl
 share/webmin/acl/config
+share/webmin/acl/config-${LOWER_OPSYS}
 share/webmin/acl/config-*-linux
 share/webmin/acl/config-dragonfly
 share/webmin/acl/config-freebsd
 share/webmin/acl/config-macos
-share/webmin/acl/config-netbsd
 share/webmin/acl/config-openbsd
 share/webmin/acl/config-solaris-10-*
 share/webmin/acl/config.info
+share/webmin/acl/config.info.ar
 share/webmin/acl/config.info.bg
 share/webmin/acl/config.info.ca
+share/webmin/acl/config.info.ca.UTF-8
 share/webmin/acl/config.info.cz
+share/webmin/acl/config.info.cz.UTF-8
 share/webmin/acl/config.info.da
+share/webmin/acl/config.info.da.UTF-8
 share/webmin/acl/config.info.de
-share/webmin/acl/config.info.hr
-share/webmin/acl/config.info.it
+share/webmin/acl/config.info.de.UTF-8
 share/webmin/acl/config.info.es
+share/webmin/acl/config.info.es.UTF-8
+share/webmin/acl/config.info.eu
+share/webmin/acl/config.info.eu.UTF-8
 share/webmin/acl/config.info.fa
 share/webmin/acl/config.info.fr
+share/webmin/acl/config.info.fr.UTF-8
+share/webmin/acl/config.info.hr
 share/webmin/acl/config.info.hu
+share/webmin/acl/config.info.hu.UTF-8
+share/webmin/acl/config.info.it
+share/webmin/acl/config.info.it.UTF-8
 share/webmin/acl/config.info.ja_JP.UTF-8
 share/webmin/acl/config.info.ja_JP.euc
 share/webmin/acl/config.info.ko_KR.UTF-8
 share/webmin/acl/config.info.ko_KR.euc
 share/webmin/acl/config.info.nl
+share/webmin/acl/config.info.nl.UTF-8
 share/webmin/acl/config.info.no
 share/webmin/acl/config.info.pl
+share/webmin/acl/config.info.pl.UTF-8
 share/webmin/acl/config.info.pt_BR
+share/webmin/acl/config.info.pt_BR.UTF-8
+share/webmin/acl/config.info.ru.UTF-8
 share/webmin/acl/config.info.ru_RU
 share/webmin/acl/config.info.ru_SU
 share/webmin/acl/config.info.sk
+share/webmin/acl/config.info.sk.UTF-8
 share/webmin/acl/config.info.sv
+share/webmin/acl/config.info.sv.UTF-8
 share/webmin/acl/config.info.tr
 share/webmin/acl/config.info.uk_UA
 share/webmin/acl/config.info.zh_CN
@@ -126,19 +142,33 @@
 share/webmin/acl/edit_group.cgi
 share/webmin/acl/edit_pass.cgi
 share/webmin/acl/edit_rbac.cgi
+share/webmin/acl/edit_sql.cgi
 share/webmin/acl/edit_sync.cgi
 share/webmin/acl/edit_unix.cgi
 share/webmin/acl/edit_user.cgi
 share/webmin/acl/feedback_files.pl
+share/webmin/acl/help/ips.ca.UTF-8.html
 share/webmin/acl/help/ips.ca.html
+share/webmin/acl/help/ips.da.UTF-8.html
 share/webmin/acl/help/ips.da.html
+share/webmin/acl/help/ips.de.UTF-8.html
 share/webmin/acl/help/ips.de.html
-share/webmin/acl/help/ips.it.html
 share/webmin/acl/help/ips.fa.html
+share/webmin/acl/help/ips.fr.UTF-8.html
 share/webmin/acl/help/ips.fr.html
 share/webmin/acl/help/ips.html
+share/webmin/acl/help/ips.it.UTF-8.html
+share/webmin/acl/help/ips.it.html
+share/webmin/acl/help/ips.ko_KR.UTF-8.html
 share/webmin/acl/help/ips.ko_KR.euc.html
-share/webmin/acl/help/ips.ko_KR.UTF-8.html
+share/webmin/acl/help/ips.nl.UTF-8.html
+share/webmin/acl/help/ips.nl.html
+share/webmin/acl/help/ips.no.html
+share/webmin/acl/help/ips.pl.UTF-8.html
+share/webmin/acl/help/ips.pl.html
+share/webmin/acl/help/ips.ru.UTF-8.html
+share/webmin/acl/help/ips.ru_SU
+share/webmin/acl/help/ips.sk.UTF-8.html
 share/webmin/acl/help/ips.sk.html
 share/webmin/acl/images/cert.gif
 share/webmin/acl/images/convert.gif
@@ -148,35 +178,55 @@
 share/webmin/acl/images/rbac.gif
 share/webmin/acl/images/sessions.gif
 share/webmin/acl/images/smallicon.gif
+share/webmin/acl/images/sql.gif
 share/webmin/acl/images/sync.gif
 share/webmin/acl/images/tick.gif
 share/webmin/acl/images/unix.gif
 share/webmin/acl/index.cgi
+share/webmin/acl/lang/ar
 share/webmin/acl/lang/bg
 share/webmin/acl/lang/ca
+share/webmin/acl/lang/ca.UTF-8
 share/webmin/acl/lang/cz
+share/webmin/acl/lang/cz.UTF-8
 share/webmin/acl/lang/da
+share/webmin/acl/lang/da.UTF-8
 share/webmin/acl/lang/de
+share/webmin/acl/lang/de.UTF-8
 share/webmin/acl/lang/en
+share/webmin/acl/lang/en.UTF-8
 share/webmin/acl/lang/es
+share/webmin/acl/lang/es.UTF-8
+share/webmin/acl/lang/eu
+share/webmin/acl/lang/eu.UTF-8
 share/webmin/acl/lang/fa
 share/webmin/acl/lang/fr
+share/webmin/acl/lang/fr.UTF-8
 share/webmin/acl/lang/hr
 share/webmin/acl/lang/hu
+share/webmin/acl/lang/hu.UTF-8
 share/webmin/acl/lang/it
+share/webmin/acl/lang/it.UTF-8
 share/webmin/acl/lang/ja_JP.UTF-8
 share/webmin/acl/lang/ja_JP.euc
 share/webmin/acl/lang/ko_KR.UTF-8
 share/webmin/acl/lang/ko_KR.euc
 share/webmin/acl/lang/nl
+share/webmin/acl/lang/nl.UTF-8
 share/webmin/acl/lang/no
 share/webmin/acl/lang/pl
+share/webmin/acl/lang/pl.UTF-8
 share/webmin/acl/lang/pt
+share/webmin/acl/lang/pt.UTF-8
 share/webmin/acl/lang/pt_BR
+share/webmin/acl/lang/pt_BR.UTF-8
+share/webmin/acl/lang/ru.UTF-8
 share/webmin/acl/lang/ru_RU
 share/webmin/acl/lang/ru_SU
 share/webmin/acl/lang/sk
+share/webmin/acl/lang/sk.UTF-8
 share/webmin/acl/lang/sv
+share/webmin/acl/lang/sv.UTF-8
 share/webmin/acl/lang/tr
 share/webmin/acl/lang/uk_UA
 share/webmin/acl/lang/zh_CN
@@ -185,22 +235,28 @@
 share/webmin/acl/lang/zh_TW.UTF-8
 share/webmin/acl/list_sessions.cgi
 share/webmin/acl/log_parser.pl
+share/webmin/acl/makedn.cgi
+share/webmin/acl/maketables.cgi
 share/webmin/acl/md5-lib.pl
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/exctags +LICENSE; Fixes 1/3 of pkg/47387. Non-tr...
Next by Date: [pkgsrc/trunk]: pkgsrc/net/vnc Add inet6 option (on by default)
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/exctags +LICENSE; Fixes 1/3 of pkg/47387. Non-tr...
Next by Thread: [pkgsrc/trunk]: pkgsrc/net/vnc Add inet6 option (on by default)
Indexes:
Home | Main Index | Thread Index | Old Index