diff options
Diffstat (limited to 'sysutils/webmin')
| -rw-r--r-- | sysutils/webmin/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/webmin/PLIST | 206 | ||||
| -rw-r--r-- | sysutils/webmin/distinfo | 18 | ||||
| -rw-r--r-- | sysutils/webmin/patches/patch-aa | 25 | ||||
| -rw-r--r-- | sysutils/webmin/patches/patch-ac | 35 | ||||
| -rw-r--r-- | sysutils/webmin/patches/patch-ag | 12 | ||||
| -rw-r--r-- | sysutils/webmin/version.mk | 4 | ||||
| -rw-r--r-- | sysutils/webmin/wbm.mk | 3 |
8 files changed, 201 insertions, 110 deletions
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index 9720f386514..c8e04960d58 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.44 2016/11/20 01:11:40 rillig Exp $ +# $NetBSD: Makefile,v 1.44.2.1 2017/02/12 15:28:37 spz Exp $ .include "version.mk" DISTNAME= webmin-${WBM_VERSION} -PKGREVISION= 8 CATEGORIES= sysutils www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=webadmin/} @@ -139,4 +138,9 @@ do-install: cd ${DESTDIR}${WEBMIN_DIR} && \ ${CHMOD} 0400 setup.pl setup.sh setup-pre.sh + cd ${DESTDIR}${WEBMIN_DIR} && \ + ${CHMOD} -x *.pl */*.pl */*.gif */*/*.gif */*/*.html */*.ca lang/* \ + */lang/* */*.svg */*.png */*.eu + + .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/webmin/PLIST b/sysutils/webmin/PLIST index 83158989924..b7650c13b3e 100644 --- a/sysutils/webmin/PLIST +++ b/sysutils/webmin/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.18 2014/03/11 14:05:16 jperkin Exp $ +@comment $NetBSD: PLIST,v 1.18.24.1 2017/02/12 15:28:37 spz Exp $ share/examples/webmin/acl/config share/examples/webmin/config share/examples/webmin/cron/config @@ -23,49 +23,49 @@ share/examples/webmin/webminlog/config share/webmin/LICENCE share/webmin/LICENCE.ja share/webmin/README -share/webmin/Webmin/All.pm -share/webmin/Webmin/Button.pm -share/webmin/Webmin/Checkbox.pm -share/webmin/Webmin/Checkboxes.pm -share/webmin/Webmin/Columns.pm -share/webmin/Webmin/ConfirmPage.pm -share/webmin/Webmin/Date.pm -share/webmin/Webmin/DynamicBar.pm -share/webmin/Webmin/DynamicHTML.pm -share/webmin/Webmin/DynamicText.pm -share/webmin/Webmin/DynamicWait.pm -share/webmin/Webmin/ErrorPage.pm -share/webmin/Webmin/File.pm -share/webmin/Webmin/Form.pm -share/webmin/Webmin/Group.pm -share/webmin/Webmin/Icon.pm -share/webmin/Webmin/Input.pm -share/webmin/Webmin/InputTable.pm -share/webmin/Webmin/JavascriptButton.pm -share/webmin/Webmin/LinkTable.pm -share/webmin/Webmin/Menu.pm -share/webmin/Webmin/Multiline.pm -share/webmin/Webmin/OptTextarea.pm -share/webmin/Webmin/OptTextbox.pm -share/webmin/Webmin/Page.pm -share/webmin/Webmin/Password.pm -share/webmin/Webmin/PlainText.pm -share/webmin/Webmin/Properties.pm -share/webmin/Webmin/Radios.pm -share/webmin/Webmin/ResultPage.pm -share/webmin/Webmin/Section.pm -share/webmin/Webmin/Select.pm -share/webmin/Webmin/Submit.pm -share/webmin/Webmin/Table.pm -share/webmin/Webmin/TableAction.pm -share/webmin/Webmin/Tabs.pm -share/webmin/Webmin/Textarea.pm -share/webmin/Webmin/Textbox.pm -share/webmin/Webmin/Time.pm -share/webmin/Webmin/TitleList.pm -share/webmin/Webmin/Upload.pm -share/webmin/Webmin/User.pm share/webmin/WebminCore.pm +share/webmin/WebminUI/All.pm +share/webmin/WebminUI/Button.pm +share/webmin/WebminUI/Checkbox.pm +share/webmin/WebminUI/Checkboxes.pm +share/webmin/WebminUI/Columns.pm +share/webmin/WebminUI/ConfirmPage.pm +share/webmin/WebminUI/Date.pm +share/webmin/WebminUI/DynamicBar.pm +share/webmin/WebminUI/DynamicHTML.pm +share/webmin/WebminUI/DynamicText.pm +share/webmin/WebminUI/DynamicWait.pm +share/webmin/WebminUI/ErrorPage.pm +share/webmin/WebminUI/File.pm +share/webmin/WebminUI/Form.pm +share/webmin/WebminUI/Group.pm +share/webmin/WebminUI/Icon.pm +share/webmin/WebminUI/Input.pm +share/webmin/WebminUI/InputTable.pm +share/webmin/WebminUI/JavascriptButton.pm +share/webmin/WebminUI/LinkTable.pm +share/webmin/WebminUI/Menu.pm +share/webmin/WebminUI/Multiline.pm +share/webmin/WebminUI/OptTextarea.pm +share/webmin/WebminUI/OptTextbox.pm +share/webmin/WebminUI/Page.pm +share/webmin/WebminUI/Password.pm +share/webmin/WebminUI/PlainText.pm +share/webmin/WebminUI/Properties.pm +share/webmin/WebminUI/Radios.pm +share/webmin/WebminUI/ResultPage.pm +share/webmin/WebminUI/Section.pm +share/webmin/WebminUI/Select.pm +share/webmin/WebminUI/Submit.pm +share/webmin/WebminUI/Table.pm +share/webmin/WebminUI/TableAction.pm +share/webmin/WebminUI/Tabs.pm +share/webmin/WebminUI/Textarea.pm +share/webmin/WebminUI/Textbox.pm +share/webmin/WebminUI/Time.pm +share/webmin/WebminUI/TitleList.pm +share/webmin/WebminUI/Upload.pm +share/webmin/WebminUI/User.pm share/webmin/acl/CHANGELOG share/webmin/acl/acl-lib.pl share/webmin/acl/acl_security.pl @@ -109,9 +109,12 @@ 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.ms_MY +share/webmin/acl/config.info.ms_MY.UTF-8 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.no.UTF-8 share/webmin/acl/config.info.pl share/webmin/acl/config.info.pl.UTF-8 share/webmin/acl/config.info.pt_BR @@ -160,8 +163,11 @@ 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.ms_MY.UTF-8.html +share/webmin/acl/help/ips.ms_MY.html share/webmin/acl/help/ips.nl.UTF-8.html share/webmin/acl/help/ips.nl.html +share/webmin/acl/help/ips.no.UTF-8.html share/webmin/acl/help/ips.no.html share/webmin/acl/help/ips.pl.UTF-8.html share/webmin/acl/help/ips.pl.html @@ -180,6 +186,7 @@ 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/twofactor.gif share/webmin/acl/images/unix.gif share/webmin/acl/index.cgi share/webmin/acl/lang/ar @@ -210,9 +217,12 @@ 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/ms_MY +share/webmin/acl/lang/ms_MY.UTF-8 share/webmin/acl/lang/nl share/webmin/acl/lang/nl.UTF-8 share/webmin/acl/lang/no +share/webmin/acl/lang/no.UTF-8 share/webmin/acl/lang/pl share/webmin/acl/lang/pl.UTF-8 share/webmin/acl/lang/pt @@ -246,10 +256,14 @@ share/webmin/acl/save_group.cgi share/webmin/acl/save_pass.cgi share/webmin/acl/save_sql.cgi share/webmin/acl/save_sync.cgi +share/webmin/acl/save_twofactor.cgi share/webmin/acl/save_unix.cgi share/webmin/acl/save_user.cgi share/webmin/acl/schema.cgi share/webmin/acl/switch.cgi +share/webmin/acl/system_info.pl +share/webmin/acl/twofactor.pl +share/webmin/acl/twofactor_form.cgi share/webmin/acl/useradmin_update.pl share/webmin/acl/webmin.schema share/webmin/acl_security.pl @@ -350,9 +364,12 @@ share/webmin/cron/config.info.ja_JP.UTF-8 share/webmin/cron/config.info.ja_JP.euc share/webmin/cron/config.info.ms share/webmin/cron/config.info.ms.UTF-8 +share/webmin/cron/config.info.ms_MY +share/webmin/cron/config.info.ms_MY.UTF-8 share/webmin/cron/config.info.nl share/webmin/cron/config.info.nl.UTF-8 share/webmin/cron/config.info.no +share/webmin/cron/config.info.no.UTF-8 share/webmin/cron/config.info.pl share/webmin/cron/config.info.pl.UTF-8 share/webmin/cron/config.info.pt_BR @@ -393,6 +410,10 @@ share/webmin/cron/help/help.it.UTF-8.html share/webmin/cron/help/help.it.html share/webmin/cron/help/help.nl.UTF-8.html share/webmin/cron/help/help.nl.html +share/webmin/cron/help/help.no.UTF-8.html +share/webmin/cron/help/help.no.html +share/webmin/cron/help/help.pl.UTF-8.html +share/webmin/cron/help/help.pl.html share/webmin/cron/help/help.sv.UTF-8.html share/webmin/cron/help/help.sv.html share/webmin/cron/help/help.zh_TW.Big5.html @@ -413,14 +434,20 @@ share/webmin/cron/help/intro.it.UTF-8.html share/webmin/cron/help/intro.it.html share/webmin/cron/help/intro.nl.UTF-8.html share/webmin/cron/help/intro.nl.html +share/webmin/cron/help/intro.no.UTF-8.html +share/webmin/cron/help/intro.no.html +share/webmin/cron/help/intro.pl.UTF-8.html +share/webmin/cron/help/intro.pl.html share/webmin/cron/help/intro.sv.UTF-8.html share/webmin/cron/help/intro.sv.html share/webmin/cron/help/intro.zh_TW.Big5.html share/webmin/cron/help/intro.zh_TW.UTF-8.html +share/webmin/cron/images/bottom.gif share/webmin/cron/images/down.gif share/webmin/cron/images/gap.gif share/webmin/cron/images/icon.gif share/webmin/cron/images/smallicon.gif +share/webmin/cron/images/top.gif share/webmin/cron/images/up.gif share/webmin/cron/index.cgi share/webmin/cron/install_check.pl @@ -450,9 +477,12 @@ share/webmin/cron/lang/ko_KR.UTF-8 share/webmin/cron/lang/ko_KR.euc share/webmin/cron/lang/ms share/webmin/cron/lang/ms.UTF-8 +share/webmin/cron/lang/ms_MY +share/webmin/cron/lang/ms_MY.UTF-8 share/webmin/cron/lang/nl share/webmin/cron/lang/nl.UTF-8 share/webmin/cron/lang/no +share/webmin/cron/lang/no.UTF-8 share/webmin/cron/lang/pl share/webmin/cron/lang/pl.UTF-8 share/webmin/cron/lang/pt @@ -599,6 +629,7 @@ share/webmin/init/config.info.eu.UTF-8 share/webmin/init/config.info.fa share/webmin/init/config.info.fr share/webmin/init/config.info.fr.UTF-8 +share/webmin/init/config.info.hu share/webmin/init/config.info.ja_JP.UTF-8 share/webmin/init/config.info.ja_JP.euc share/webmin/init/config.info.ko_KR.UTF-8 @@ -606,6 +637,7 @@ share/webmin/init/config.info.ko_KR.euc share/webmin/init/config.info.nl share/webmin/init/config.info.nl.UTF-8 share/webmin/init/config.info.no +share/webmin/init/config.info.no.UTF-8 share/webmin/init/config.info.pl share/webmin/init/config.info.pl.UTF-8 share/webmin/init/config.info.ru.UTF-8 @@ -627,6 +659,7 @@ share/webmin/init/delete-boot.pl share/webmin/init/delete_action.cgi share/webmin/init/edit_action.cgi share/webmin/init/edit_hostconfig.cgi +share/webmin/init/edit_launchd.cgi share/webmin/init/edit_rc.cgi share/webmin/init/edit_systemd.cgi share/webmin/init/edit_upstart.cgi @@ -683,6 +716,8 @@ share/webmin/init/lang/eu.UTF-8 share/webmin/init/lang/fa share/webmin/init/lang/fr share/webmin/init/lang/fr.UTF-8 +share/webmin/init/lang/hu +share/webmin/init/lang/hu.UTF-8 share/webmin/init/lang/it share/webmin/init/lang/it.UTF-8 share/webmin/init/lang/ja_JP.UTF-8 @@ -692,6 +727,7 @@ share/webmin/init/lang/ko_KR.euc share/webmin/init/lang/nl share/webmin/init/lang/nl.UTF-8 share/webmin/init/lang/no +share/webmin/init/lang/no.UTF-8 share/webmin/init/lang/pl share/webmin/init/lang/pl.UTF-8 share/webmin/init/lang/pt @@ -711,6 +747,7 @@ share/webmin/init/lang/zh_TW.Big5 share/webmin/init/lang/zh_TW.UTF-8 share/webmin/init/log_parser.pl share/webmin/init/low.risk +share/webmin/init/mass_launchd.cgi share/webmin/init/mass_rcs.cgi share/webmin/init/mass_start_stop.cgi share/webmin/init/mass_systemd.cgi @@ -722,6 +759,7 @@ share/webmin/init/rbac-mapping share/webmin/init/reboot.cgi share/webmin/init/save_action.cgi share/webmin/init/save_hostconfig_action.cgi +share/webmin/init/save_launchd.cgi share/webmin/init/save_local.cgi share/webmin/init/save_rc.cgi share/webmin/init/save_services.cgi @@ -748,10 +786,13 @@ share/webmin/inittab/config.info.es share/webmin/inittab/config.info.es.UTF-8 share/webmin/inittab/config.info.fr share/webmin/inittab/config.info.fr.UTF-8 +share/webmin/inittab/config.info.hu share/webmin/inittab/config.info.ko_KR.UTF-8 share/webmin/inittab/config.info.ko_KR.euc share/webmin/inittab/config.info.ms share/webmin/inittab/config.info.ms.UTF-8 +share/webmin/inittab/config.info.ms_MY +share/webmin/inittab/config.info.ms_MY.UTF-8 share/webmin/inittab/config.info.nl share/webmin/inittab/config.info.nl.UTF-8 share/webmin/inittab/config.info.pl @@ -866,12 +907,16 @@ share/webmin/inittab/lang/es share/webmin/inittab/lang/es.UTF-8 share/webmin/inittab/lang/fr share/webmin/inittab/lang/fr.UTF-8 +share/webmin/inittab/lang/hu +share/webmin/inittab/lang/hu.UTF-8 share/webmin/inittab/lang/ja_JP.UTF-8 share/webmin/inittab/lang/ja_JP.euc share/webmin/inittab/lang/ko_KR.UTF-8 share/webmin/inittab/lang/ko_KR.euc share/webmin/inittab/lang/ms share/webmin/inittab/lang/ms.UTF-8 +share/webmin/inittab/lang/ms_MY +share/webmin/inittab/lang/ms_MY.UTF-8 share/webmin/inittab/lang/nl share/webmin/inittab/lang/nl.UTF-8 share/webmin/inittab/lang/pl @@ -908,6 +953,8 @@ share/webmin/lang/de.UTF-8 share/webmin/lang/el share/webmin/lang/en share/webmin/lang/en.UTF-8 +share/webmin/lang/en_GB +share/webmin/lang/en_GB.UTF-8 share/webmin/lang/es share/webmin/lang/es.UTF-8 share/webmin/lang/eu @@ -929,9 +976,13 @@ share/webmin/lang/ko_KR.euc share/webmin/lang/lt share/webmin/lang/ms share/webmin/lang/ms.UTF-8 +share/webmin/lang/ms_MY +share/webmin/lang/ms_MY.UTF-8 share/webmin/lang/nl share/webmin/lang/nl.UTF-8 share/webmin/lang/no +share/webmin/lang/no.UTF-8 +share/webmin/lang/nota-bahasa-malaysia.txt share/webmin/lang/pl share/webmin/lang/pl.UTF-8 share/webmin/lang/pt @@ -1014,9 +1065,12 @@ share/webmin/man/config.info.it share/webmin/man/config.info.it.UTF-8 share/webmin/man/config.info.ms share/webmin/man/config.info.ms.UTF-8 +share/webmin/man/config.info.ms_MY +share/webmin/man/config.info.ms_MY.UTF-8 share/webmin/man/config.info.nl share/webmin/man/config.info.nl.UTF-8 share/webmin/man/config.info.no +share/webmin/man/config.info.no.UTF-8 share/webmin/man/config.info.pl share/webmin/man/config.info.pl.UTF-8 share/webmin/man/config.info.ru.UTF-8 @@ -1047,6 +1101,7 @@ share/webmin/man/help/intro.it.UTF-8.html share/webmin/man/help/intro.it.html share/webmin/man/help/intro.nl.UTF-8.html share/webmin/man/help/intro.nl.html +share/webmin/man/help/intro.no.UTF-8.html share/webmin/man/help/intro.no.html share/webmin/man/help/intro.pl.UTF-8.html share/webmin/man/help/intro.pl.html @@ -1081,9 +1136,12 @@ share/webmin/man/lang/ko_KR.UTF-8 share/webmin/man/lang/ko_KR.euc share/webmin/man/lang/ms share/webmin/man/lang/ms.UTF-8 +share/webmin/man/lang/ms_MY +share/webmin/man/lang/ms_MY.UTF-8 share/webmin/man/lang/nl share/webmin/man/lang/nl.UTF-8 share/webmin/man/lang/no +share/webmin/man/lang/no.UTF-8 share/webmin/man/lang/pl share/webmin/man/lang/pl.UTF-8 share/webmin/man/lang/ru.UTF-8 @@ -1182,6 +1240,7 @@ share/webmin/proc/config.info.ja_JP.euc share/webmin/proc/config.info.nl share/webmin/proc/config.info.nl.UTF-8 share/webmin/proc/config.info.no +share/webmin/proc/config.info.no.UTF-8 share/webmin/proc/config.info.pl share/webmin/proc/config.info.pl.UTF-8 share/webmin/proc/config.info.pt_BR @@ -1203,6 +1262,8 @@ share/webmin/proc/edit_proc.cgi share/webmin/proc/freebsd-lib.pl share/webmin/proc/help/cmd.ca.UTF-8.html share/webmin/proc/help/cmd.ca.html +share/webmin/proc/help/cmd.de.UTF-8.html +share/webmin/proc/help/cmd.de.html share/webmin/proc/help/cmd.es.UTF-8.html share/webmin/proc/help/cmd.es.html share/webmin/proc/help/cmd.fr.UTF-8.html @@ -1260,6 +1321,8 @@ share/webmin/proc/help/edit_proc.zh_TW.Big5.html share/webmin/proc/help/edit_proc.zh_TW.UTF-8.html share/webmin/proc/help/input.ca.UTF-8.html share/webmin/proc/help/input.ca.html +share/webmin/proc/help/input.de.UTF-8.html +share/webmin/proc/help/input.de.html share/webmin/proc/help/input.es.UTF-8.html share/webmin/proc/help/input.es.html share/webmin/proc/help/input.fr.UTF-8.html @@ -1298,6 +1361,8 @@ share/webmin/proc/help/intro.zh_TW.Big5.html share/webmin/proc/help/intro.zh_TW.UTF-8.html share/webmin/proc/help/mode.ca.UTF-8.html share/webmin/proc/help/mode.ca.html +share/webmin/proc/help/mode.de.UTF-8.html +share/webmin/proc/help/mode.de.html share/webmin/proc/help/mode.es.UTF-8.html share/webmin/proc/help/mode.es.html share/webmin/proc/help/mode.fr.UTF-8.html @@ -1381,6 +1446,8 @@ share/webmin/proc/help/run.zh_TW.Big5.html share/webmin/proc/help/run.zh_TW.UTF-8.html share/webmin/proc/help/runas.ca.UTF-8.html share/webmin/proc/help/runas.ca.html +share/webmin/proc/help/runas.de.UTF-8.html +share/webmin/proc/help/runas.de.html share/webmin/proc/help/runas.html share/webmin/proc/help/runas.it.UTF-8.html share/webmin/proc/help/runas.it.html @@ -1648,6 +1715,7 @@ share/webmin/proc/lang/ko_KR.euc share/webmin/proc/lang/nl share/webmin/proc/lang/nl.UTF-8 share/webmin/proc/lang/no +share/webmin/proc/lang/no.UTF-8 share/webmin/proc/lang/pl share/webmin/proc/lang/pl.UTF-8 share/webmin/proc/lang/pt @@ -1667,10 +1735,8 @@ share/webmin/proc/lang/zh_TW.Big5 share/webmin/proc/lang/zh_TW.UTF-8 share/webmin/proc/linux-lib.pl share/webmin/proc/log_parser.pl -share/webmin/proc/low.skill share/webmin/proc/macos-lib.pl share/webmin/proc/medium.risk -share/webmin/proc/medium.skill share/webmin/proc/module.info share/webmin/proc/open_files.cgi share/webmin/proc/openbsd-lib.pl @@ -1696,6 +1762,8 @@ share/webmin/servers/auto.pl share/webmin/servers/backup_config.pl share/webmin/servers/cgi_args.pl share/webmin/servers/config +share/webmin/servers/config-debian-linux +share/webmin/servers/config-redhat-linux share/webmin/servers/config.info share/webmin/servers/config.info.ca share/webmin/servers/config.info.ca.UTF-8 @@ -1715,9 +1783,12 @@ share/webmin/servers/config.info.ko_KR.UTF-8 share/webmin/servers/config.info.ko_KR.euc share/webmin/servers/config.info.ms share/webmin/servers/config.info.ms.UTF-8 +share/webmin/servers/config.info.ms_MY +share/webmin/servers/config.info.ms_MY.UTF-8 share/webmin/servers/config.info.nl share/webmin/servers/config.info.nl.UTF-8 share/webmin/servers/config.info.no +share/webmin/servers/config.info.no.UTF-8 share/webmin/servers/config.info.pl share/webmin/servers/config.info.pl.UTF-8 share/webmin/servers/config.info.pt_BR @@ -1791,9 +1862,12 @@ share/webmin/servers/lang/ko_KR.UTF-8 share/webmin/servers/lang/ko_KR.euc share/webmin/servers/lang/ms share/webmin/servers/lang/ms.UTF-8 +share/webmin/servers/lang/ms_MY +share/webmin/servers/lang/ms_MY.UTF-8 share/webmin/servers/lang/nl share/webmin/servers/lang/nl.UTF-8 share/webmin/servers/lang/no +share/webmin/servers/lang/no.UTF-8 share/webmin/servers/lang/pl share/webmin/servers/lang/pl.UTF-8 share/webmin/servers/lang/pt @@ -1828,12 +1902,12 @@ share/webmin/switch_skill.cgi share/webmin/switch_user.cgi share/webmin/thirdparty.pl share/webmin/ui-lib.pl +share/webmin/unauthenticated/filter_match.js share/webmin/uptracker.cgi share/webmin/user_chooser.cgi share/webmin/version share/webmin/web-lib-funcs.pl share/webmin/web-lib.pl -share/webmin/webmin-caldera-init share/webmin/webmin-daemon share/webmin/webmin-debian-pam share/webmin/webmin-gentoo-init @@ -1841,6 +1915,7 @@ share/webmin/webmin-init share/webmin/webmin-pam share/webmin/webmin-search-lib.pl share/webmin/webmin/CHANGELOG +share/webmin/webmin/acme_tiny.py share/webmin/webmin/adminupgrade share/webmin/webmin/backup_config.pl share/webmin/webmin/bootup.cgi @@ -1865,8 +1940,8 @@ share/webmin/webmin/change_session.cgi share/webmin/webmin/change_ssl.cgi share/webmin/webmin/change_startpage.cgi share/webmin/webmin/change_status.cgi -share/webmin/webmin/change_syslet.cgi share/webmin/webmin/change_theme.cgi +share/webmin/webmin/change_twofactor.cgi share/webmin/webmin/change_ui.cgi share/webmin/webmin/change_web.cgi share/webmin/webmin/clear_blocked.cgi @@ -1886,6 +1961,7 @@ share/webmin/webmin/config.info.fa share/webmin/webmin/config.info.fr share/webmin/webmin/config.info.fr.UTF-8 share/webmin/webmin/config.info.hr +share/webmin/webmin/config.info.hu share/webmin/webmin/config.info.it share/webmin/webmin/config.info.it.UTF-8 share/webmin/webmin/config.info.ja_JP.UTF-8 @@ -1894,9 +1970,12 @@ share/webmin/webmin/config.info.ko_KR.UTF-8 share/webmin/webmin/config.info.ko_KR.euc share/webmin/webmin/config.info.ms share/webmin/webmin/config.info.ms.UTF-8 +share/webmin/webmin/config.info.ms_MY +share/webmin/webmin/config.info.ms_MY.UTF-8 share/webmin/webmin/config.info.nl share/webmin/webmin/config.info.nl.UTF-8 share/webmin/webmin/config.info.no +share/webmin/webmin/config.info.no.UTF-8 share/webmin/webmin/config.info.pl share/webmin/webmin/config.info.pl.UTF-8 share/webmin/webmin/config.info.pt_BR @@ -1913,6 +1992,7 @@ share/webmin/webmin/cpan_modules.pl share/webmin/webmin/defaultacl share/webmin/webmin/delete_cache.cgi share/webmin/webmin/delete_mod.cgi +share/webmin/webmin/delete_webmincron.cgi share/webmin/webmin/download_cert.cgi share/webmin/webmin/edit_access.cgi share/webmin/webmin/edit_advanced.cgi @@ -1938,15 +2018,25 @@ share/webmin/webmin/edit_session.cgi share/webmin/webmin/edit_ssl.cgi share/webmin/webmin/edit_startpage.cgi share/webmin/webmin/edit_status.cgi -share/webmin/webmin/edit_syslet.cgi share/webmin/webmin/edit_themes.cgi +share/webmin/webmin/edit_twofactor.cgi share/webmin/webmin/edit_ui.cgi share/webmin/webmin/edit_upgrade.cgi share/webmin/webmin/edit_web.cgi +share/webmin/webmin/edit_webmincron.cgi share/webmin/webmin/export_mod.cgi share/webmin/webmin/feedback_files.pl share/webmin/webmin/fix_os.cgi share/webmin/webmin/gnupg-lib.pl +share/webmin/webmin/help/twofactor.ca.UTF-8.html +share/webmin/webmin/help/twofactor.ca.html +share/webmin/webmin/help/twofactor.html +share/webmin/webmin/help/twofactor.ms_MY.UTF-8.html +share/webmin/webmin/help/twofactor.ms_MY.html +share/webmin/webmin/help/twofactor.no.UTF-8.html +share/webmin/webmin/help/twofactor.no.html +share/webmin/webmin/help/twofactor.pl.UTF-8.html +share/webmin/webmin/help/twofactor.pl.html share/webmin/webmin/images/access.gif share/webmin/webmin/images/advanced.gif share/webmin/webmin/images/anon.gif @@ -1972,11 +2062,12 @@ share/webmin/webmin/images/smallicon.gif share/webmin/webmin/images/ssl.gif share/webmin/webmin/images/startpage.gif share/webmin/webmin/images/status.gif -share/webmin/webmin/images/syslet.gif share/webmin/webmin/images/themes.gif +share/webmin/webmin/images/twofactor.gif share/webmin/webmin/images/ui.gif share/webmin/webmin/images/upgrade.gif share/webmin/webmin/images/web.gif +share/webmin/webmin/images/webmincron.gif share/webmin/webmin/index.cgi share/webmin/webmin/install_mod.cgi share/webmin/webmin/install_theme.cgi @@ -2008,9 +2099,12 @@ share/webmin/webmin/lang/ko_KR.UTF-8 share/webmin/webmin/lang/ko_KR.euc share/webmin/webmin/lang/ms share/webmin/webmin/lang/ms.UTF-8 +share/webmin/webmin/lang/ms_MY +share/webmin/webmin/lang/ms_MY.UTF-8 share/webmin/webmin/lang/nl share/webmin/webmin/lang/nl.UTF-8 share/webmin/webmin/lang/no +share/webmin/webmin/lang/no.UTF-8 share/webmin/webmin/lang/pl share/webmin/webmin/lang/pl.UTF-8 share/webmin/webmin/lang/pt @@ -2030,9 +2124,9 @@ share/webmin/webmin/lang/zh_CN share/webmin/webmin/lang/zh_CN.UTF-8 share/webmin/webmin/lang/zh_TW.Big5 share/webmin/webmin/lang/zh_TW.UTF-8 +share/webmin/webmin/letsencrypt-lib.pl +share/webmin/webmin/letsencrypt.cgi share/webmin/webmin/log_parser.pl -share/webmin/webmin/low.skill -share/webmin/webmin/medium.skill share/webmin/webmin/module.info share/webmin/webmin/newcsr.cgi share/webmin/webmin/newkey.cgi @@ -2045,19 +2139,21 @@ share/webmin/webmin/save_descs.cgi share/webmin/webmin/save_ipkey.cgi share/webmin/webmin/save_newmod.cgi share/webmin/webmin/save_sendmail.cgi +share/webmin/webmin/save_webmincron.cgi share/webmin/webmin/savekey.cgi share/webmin/webmin/setup_ca.cgi share/webmin/webmin/standard_chooser.cgi share/webmin/webmin/stop_ca.cgi share/webmin/webmin/subdir/foo.cgi -share/webmin/webmin/submit.cgi share/webmin/webmin/syslog_logs.pl +share/webmin/webmin/test_sendmail.cgi share/webmin/webmin/third_chooser.cgi share/webmin/webmin/uninstall.pl share/webmin/webmin/update.cgi share/webmin/webmin/update.pl share/webmin/webmin/update_sched.cgi share/webmin/webmin/upgrade.cgi +share/webmin/webmin/view_webmincron.cgi share/webmin/webmin/webmin-lib.pl share/webmin/webmin_search.cgi share/webmin/webminlog/CHANGELOG @@ -2077,9 +2173,12 @@ share/webmin/webminlog/config.info.hu share/webmin/webminlog/config.info.hu.UTF-8 share/webmin/webminlog/config.info.ko_KR.UTF-8 share/webmin/webminlog/config.info.ko_KR.euc +share/webmin/webminlog/config.info.ms_MY +share/webmin/webminlog/config.info.ms_MY.UTF-8 share/webmin/webminlog/config.info.nl share/webmin/webminlog/config.info.nl.UTF-8 share/webmin/webminlog/config.info.no +share/webmin/webminlog/config.info.no.UTF-8 share/webmin/webminlog/config.info.pl share/webmin/webminlog/config.info.pl.UTF-8 share/webmin/webminlog/config.info.ru.UTF-8 @@ -2116,9 +2215,12 @@ share/webmin/webminlog/lang/ko_KR.UTF-8 share/webmin/webminlog/lang/ko_KR.euc share/webmin/webminlog/lang/ms share/webmin/webminlog/lang/ms.UTF-8 +share/webmin/webminlog/lang/ms_MY +share/webmin/webminlog/lang/ms_MY.UTF-8 share/webmin/webminlog/lang/nl share/webmin/webminlog/lang/nl.UTF-8 share/webmin/webminlog/lang/no +share/webmin/webminlog/lang/no.UTF-8 share/webmin/webminlog/lang/pl share/webmin/webminlog/lang/pl.UTF-8 share/webmin/webminlog/lang/pt_BR diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo index bc66e9b1100..28c0014032a 100644 --- a/sysutils/webmin/distinfo +++ b/sysutils/webmin/distinfo @@ -1,22 +1,20 @@ -$NetBSD: distinfo,v 1.21 2016/11/20 01:10:47 rillig Exp $ +$NetBSD: distinfo,v 1.21.2.1 2017/02/12 15:28:37 spz Exp $ -SHA1 (webmin-1.600.tar.gz) = b915b7127a9579cac8993c4ef54462dfa404bf64 -RMD160 (webmin-1.600.tar.gz) = 33f0c67b47bc7db625fc66b85ee1872e77f32ad5 -SHA512 (webmin-1.600.tar.gz) = bd73ba2ed6df9ed7c6e336ea07571ca17f552f1d41ffda2f78ea00f43e31e4652a9afc8877addc5cd2bdcfebae1d787294601f17cfc43db78c3682a6200fe0d6 -Size (webmin-1.600.tar.gz) = 21397348 bytes -SHA1 (patch-aa) = e1196764fefed872e84a76dc32b428c504920468 +SHA1 (webmin-1.831.tar.gz) = 5f244a71c2aa49b50ba3a7ca5369e5f09601b41a +RMD160 (webmin-1.831.tar.gz) = ed879915241683e7baa230cd0c39d448f423eaac +SHA512 (webmin-1.831.tar.gz) = 2118decd7aa5509aff5823335cfd9e464e72a997e728bf95650fd39ae170a6eaff17f7657da2aca3ee7d47ac3a13a578e80594a10a4cf9c47fdfa71be07c015b +Size (webmin-1.831.tar.gz) = 28549588 bytes +SHA1 (patch-aa) = 74a647da70fcd5afc9fa878554bc1288ec5ba979 SHA1 (patch-ab) = fa07200462df76af23b9952739388053940c6743 -SHA1 (patch-ac) = 8803482bd0ab02e3d70683a520a76c3dc680df6b +SHA1 (patch-ac) = 327ecd47b4926eb3b9c6dc5f986d5f6232364030 SHA1 (patch-ad) = d28daa10c04705adcffa9d448250f748a8626859 SHA1 (patch-ae) = b2b70ab748f6bb94e9a567097c874dbd67a8bc1d SHA1 (patch-af) = 24f130a985ab7d3bdfc7db8d82114e8b107f1574 -SHA1 (patch-ag) = 1ae36686d02410634291abb33b67fddd17a3993f +SHA1 (patch-ag) = 1d42b71b041d26ce8dc9b015d77dc07732b364fc SHA1 (patch-ah) = 4a6f1d9ee4a8d1a74037ffd86abad6c168a0fbfa SHA1 (patch-ai) = b06b0fe269739cc1121da7588ace6903fcccf9ff SHA1 (patch-ak) = 201c124d8c407e0439b8531dfb4dacba37ce37bb -SHA1 (patch-al) = b1382143d42af3ce5057368dc442ba9c2e6de259 SHA1 (patch-am) = d61fed9c53870aad36651389a5d655f5b2d5c21f -SHA1 (patch-an) = 87dadbc3c935f793dae32d87e57969aaaa6f61fa SHA1 (patch-ao) = 007eba7b551fd3d154e470f82c1c15552481e9fa SHA1 (patch-ap) = 2cf02d0f1d1c725ecce0aba072d9f149bdf24e20 SHA1 (patch-aq) = 52751d7ec0ce1ebb89aee977a752486372b80e36 diff --git a/sysutils/webmin/patches/patch-aa b/sysutils/webmin/patches/patch-aa index 72b3b6accb4..3adeb7d2f98 100644 --- a/sysutils/webmin/patches/patch-aa +++ b/sysutils/webmin/patches/patch-aa @@ -1,11 +1,11 @@ -$NetBSD: patch-aa,v 1.8 2012/11/02 19:02:51 shattered Exp $ +$NetBSD: patch-aa,v 1.8.34.1 2017/02/12 15:28:37 spz Exp $ ---- setup.sh.orig 2009-03-18 07:30:26.000000000 +0200 -+++ setup.sh 2009-04-09 12:24:40.000000000 +0300 -@@ -35,6 +35,11 @@ +--- setup.sh.orig 2016-10-03 12:34:36.000000000 +0900 ++++ setup.sh 2016-11-12 07:08:43.000000000 +0900 +@@ -37,6 +37,11 @@ echo "" # Only root can run this - id | grep "uid=0(" >/dev/null + id | grep -i "uid=0(" >/dev/null +# +# For pkgsrc, we allow anyone to run this script, including unprivileged +# users. @@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.8 2012/11/02 19:02:51 shattered Exp $ if [ $? != "0" ]; then uname -a | grep -i CYGWIN >/dev/null if [ $? != "0" ]; then -@@ -122,6 +127,9 @@ +@@ -124,6 +129,9 @@ if [ -r "$config_dir/config" ]; then upgrading=1 fi @@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.8 2012/11/02 19:02:51 shattered Exp $ # Check if upgrading from an old version if [ "$upgrading" = 1 ]; then echo "" -@@ -199,6 +207,10 @@ +@@ -202,6 +210,10 @@ if [ "$upgrading" = 1 ]; then else # Config directory exists .. make sure it is not in use ls $config_dir | grep -v rpmsave >/dev/null 2>&1 @@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.8 2012/11/02 19:02:51 shattered Exp $ if [ "$?" = "0" -a "$config_dir" != "/etc/webmin" ]; then echo "ERROR: Config directory $config_dir is not empty" echo "" -@@ -528,6 +540,12 @@ +@@ -541,6 +553,12 @@ else kfile=$config_dir/miniserv.pem openssl version >/dev/null 2>&1 @@ -48,10 +48,11 @@ $NetBSD: patch-aa,v 1.8 2012/11/02 19:02:51 shattered Exp $ if [ "$?" = "0" ]; then # We can generate a new SSL key for this host host=`hostname` -@@ -742,44 +760,47 @@ +@@ -762,45 +780,47 @@ EOF + echo "..done" echo "" fi - +- -echo "Changing ownership and permissions .." -# Make all config dirs non-world-readable -for m in $newmods; do @@ -73,7 +74,7 @@ $NetBSD: patch-aa,v 1.8 2012/11/02 19:02:51 shattered Exp $ - chmod -R og-w "$wadir" - chmod -R a+rx "$wadir" -fi --if [ $var_dir != "/var" ]; then +-if [ $var_dir != "/var" -a "$upgrading" != 1 ]; then - # Make log directory non-world-readable or writable - chown -R root $var_dir - chgrp -R bin $var_dir @@ -114,7 +115,7 @@ $NetBSD: patch-aa,v 1.8 2012/11/02 19:02:51 shattered Exp $ +# chmod -R og-w "$wadir" +# chmod -R a+rx "$wadir" +#fi -+#if [ $var_dir != "/var" ]; then ++#if [ $var_dir != "/var" -a "$upgrading" != 1 ]; then +# # Make log directory non-world-readable or writable +# chown -R root $var_dir +# chgrp -R bin $var_dir diff --git a/sysutils/webmin/patches/patch-ac b/sysutils/webmin/patches/patch-ac index 1f7ef76e9b4..44cb08913cf 100644 --- a/sysutils/webmin/patches/patch-ac +++ b/sysutils/webmin/patches/patch-ac @@ -1,32 +1,15 @@ -$NetBSD: patch-ac,v 1.5 2012/11/02 19:02:51 shattered Exp $ +$NetBSD: patch-ac,v 1.5.34.1 2017/02/12 15:28:37 spz Exp $ ---- software/search.cgi.orig 2011-04-27 00:18:43.000000000 +0200 -+++ software/search.cgi 2011-06-15 23:15:13.000000000 +0200 -@@ -34,7 +34,7 @@ if (@match == 1 && $in{'goto'}) { - if (@match) { - @match = sort { lc($packages{$a,'name'}) cmp lc($packages{$b,'name'}) } - @match; -- print "<b>",&text('search_match', "<tt>$s</tt>"),"</b><p>\n"; -+ print "<b>",&text('search_match', "<tt>" . &html_escape($s) . "</tt>"),"</b><p>\n"; - print &ui_form_start("delete_packs.cgi", "post"); - print &ui_hidden("search", $in{'search'}); - @tds = ( "width=5" ); + +--- software/search.cgi.orig 2016-10-03 12:34:48.000000000 +0900 ++++ software/search.cgi 2016-11-12 07:47:09.000000000 +0900 @@ -49,7 +49,8 @@ if (@match) { local @cols; local $v = $packages{$i,'shortversion'} || $packages{$i,'version'}; -- push(@cols, "<a href=\"edit_pack.cgi?search=$s&package=". -+ push(@cols, "<a href=\"edit_pack.cgi?search=" . -+ &urlize($s) . "&package=". +- push(@cols, &ui_link("edit_pack.cgi?search=$s&package=". ++ push(@cols, &ui_link("edit_pack.cgi?search=" . ++ &urlize($s) . "&package=". &urlize($packages{$i,'name'})."&version=". - &urlize($packages{$i,'version'})."\">".&html_escape( - $packages{$i,'name'}.($v ? " $v" : ""))."</a>"); -@@ -70,7 +71,7 @@ if (@match) { - print &ui_form_end([ [ undef, $text{'search_delete'} ] ]); - } - else { -- print "<b>",&text('search_nomatch', "<tt>$s</tt>"),"</b><p>\n"; -+ print "<b>",&text('search_nomatch', "<tt>" . &html_escape($s) . "</tt>"),"</b><p>\n"; - } - - &ui_print_footer("", $text{'index_return'}); + &urlize($packages{$i,'version'}), &html_escape( + $packages{$i,'name'}.($v ? " $v" : "")) ) ); diff --git a/sysutils/webmin/patches/patch-ag b/sysutils/webmin/patches/patch-ag index c9895df08eb..9c1982b9af6 100644 --- a/sysutils/webmin/patches/patch-ag +++ b/sysutils/webmin/patches/patch-ag @@ -1,8 +1,10 @@ -$NetBSD: patch-ag,v 1.4 2012/11/02 19:02:51 shattered Exp $ +$NetBSD: patch-ag,v 1.4.34.1 2017/02/12 15:28:37 spz Exp $ ---- proc/module.info.orig 2012-01-22 00:47:19.000000000 +0000 -+++ proc/module.info -@@ -12,7 +12,7 @@ desc_ko_KR.UTF-8=실행중인 프로세 +Add dragonfly + +--- proc/module.info.orig 2016-10-03 12:39:36.000000000 +0900 ++++ proc/module.info 2016-11-12 07:51:12.000000000 +0900 +@@ -13,7 +13,7 @@ desc_ko_KR.UTF-8=실행중인 프로세 name=Process Manager desc_tr=alan Sreler desc_de=Laufende Prozesse @@ -10,4 +12,4 @@ $NetBSD: patch-ag,v 1.4 2012/11/02 19:02:51 shattered Exp $ +os_support=solaris *-linux hpux freebsd osf1 irix unixware openserver macos aix netbsd openbsd windows dragonfly desc_zh_CN=̹ risk=medium high - desc_pl.UTF-8=Działające procesy + longdesc_ca=Llista, mata i canvia la prioritat dels processos en execuci al sistema. diff --git a/sysutils/webmin/version.mk b/sysutils/webmin/version.mk index ad96df6159b..7b276dc0c56 100644 --- a/sysutils/webmin/version.mk +++ b/sysutils/webmin/version.mk @@ -1,3 +1,3 @@ -# $NetBSD: version.mk,v 1.6 2012/11/02 19:02:50 shattered Exp $ +# $NetBSD: version.mk,v 1.6.34.1 2017/02/12 15:28:37 spz Exp $ -WBM_VERSION= 1.600 +WBM_VERSION= 1.831 diff --git a/sysutils/webmin/wbm.mk b/sysutils/webmin/wbm.mk index c22f5aa04cb..476e70fa11b 100644 --- a/sysutils/webmin/wbm.mk +++ b/sysutils/webmin/wbm.mk @@ -1,4 +1,4 @@ -# $NetBSD: wbm.mk,v 1.12 2015/11/25 12:53:29 jperkin Exp $ +# $NetBSD: wbm.mk,v 1.12.10.1 2017/02/12 15:28:37 spz Exp $ # # Makefile fragment for Webmin modules # @@ -15,6 +15,7 @@ # # WBM_DEPEND_MODULES Depending webmin modules. # +LICENSE= modified-bsd .include "version.mk" |