diff options
author | jlam <jlam> | 2006-05-19 17:14:53 +0000 |
---|---|---|
committer | jlam <jlam> | 2006-05-19 17:14:53 +0000 |
commit | 8d6aec6dd24d5d6a3d334e6127fc2ab19c283ec9 (patch) | |
tree | 2399dd7355e56c3842bef5581f8e129117091c4b /sysutils/webmin | |
parent | f27e21c0b169b5cb5fce6e8b5c9202b224f63f1d (diff) | |
download | pkgsrc-8d6aec6dd24d5d6a3d334e6127fc2ab19c283ec9.tar.gz |
* Pull in some changes discussed on the Webmin mailing list to allow
running an individual module's uninstall action
* Add an DEINSTALL_TEMPLATE file that is pulled in by all wbm-* modules
that will run the module's uninstall action at DEINSTALL time.
* Fix the "time" module to ignore "sched_mode" -- verified by Jamie
Cameron on the Webmin mailing list as a bug.
* Fix the "postfix" module to remove its temp files at DEINSTALL time
so that we cleanly pkg_delete.
Bump the PKGREVISION of sysutils/webmin as well as all sysutils/wbm-*
packages that have uninstall.pl scripts.
Diffstat (limited to 'sysutils/webmin')
-rw-r--r-- | sysutils/webmin/Makefile | 4 | ||||
-rw-r--r-- | sysutils/webmin/distinfo | 5 | ||||
-rw-r--r-- | sysutils/webmin/files/wbm-deinstall.tmpl | 16 | ||||
-rw-r--r-- | sysutils/webmin/patches/patch-ac | 20 | ||||
-rw-r--r-- | sysutils/webmin/wbm.mk | 8 |
5 files changed, 48 insertions, 5 deletions
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile index 31e54b01caa..bda1f6995b7 100644 --- a/sysutils/webmin/Makefile +++ b/sysutils/webmin/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2006/05/16 18:30:20 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2006/05/19 17:14:53 jlam Exp $ DISTNAME= webmin-1.270-minimal PKGNAME= ${DISTNAME:S/-minimal$//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=webadmin/} diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo index 3899b561faf..5789746f8a2 100644 --- a/sysutils/webmin/distinfo +++ b/sysutils/webmin/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.6 2006/05/16 04:01:28 jlam Exp $ +$NetBSD: distinfo,v 1.7 2006/05/19 17:14:53 jlam Exp $ SHA1 (webmin-1.270-minimal.tar.gz) = 31fa4cf18205a0dac74e38290a03950450abae26 RMD160 (webmin-1.270-minimal.tar.gz) = 94847d56eb9aebefc234178656dc53daa3af91c6 Size (webmin-1.270-minimal.tar.gz) = 1301974 bytes -SHA1 (patch-aa) = c643cb0f568629288584902b942c792652cc366e +SHA1 (patch-aa) = 7a0aa94e94963a8b5b171423aefb445d0849339f +SHA1 (patch-ac) = 12c133cb1beefd2614f4caa15cc2b29cd1721efa diff --git a/sysutils/webmin/files/wbm-deinstall.tmpl b/sysutils/webmin/files/wbm-deinstall.tmpl new file mode 100644 index 00000000000..7057de38e7b --- /dev/null +++ b/sysutils/webmin/files/wbm-deinstall.tmpl @@ -0,0 +1,16 @@ +# $NetBSD: wbm-deinstall.tmpl,v 1.1 2006/05/19 17:14:53 jlam Exp $ + +case "${STAGE}" in +DEINSTALL) + WBMNAME="@WBMNAME@" + WEBMIN_DIR="@WEBMIN_DIR@" + WEBMIN_CONFIG="${PKG_SYSCONFDIR}" + WEBMIN_VAR="@WEBMIN_VARDIR@" + ${TEST} ! -f "${WEBMIN_CONFIG}/var-path" || + WEBMIN_VAR=`${CAT} ${WEBMIN_CONFIG}/var-path` + export WEBMIN_CONFIG WEBMIN_VAR + if ${TEST} -x "${WEBMIN_DIR}/run-uninstalls.pl"; then + ( cd ${WEBMIN_DIR} && + ${WEBMIN_DIR}/run-uninstalls.pl ${WBMNAME} ) + fi +esac diff --git a/sysutils/webmin/patches/patch-ac b/sysutils/webmin/patches/patch-ac new file mode 100644 index 00000000000..98c6e1c9968 --- /dev/null +++ b/sysutils/webmin/patches/patch-ac @@ -0,0 +1,20 @@ +$NetBSD: patch-ac,v 1.1 2006/05/19 17:14:53 jlam Exp $ + +--- run-uninstalls.pl.orig Tue Apr 4 23:12:35 2006 ++++ run-uninstalls.pl +@@ -6,7 +6,14 @@ $no_acl_check++; + do './web-lib.pl'; + &init_config(); + +-foreach $m (&get_all_module_infos()) { ++if (@ARGV > 0) { ++ @mods = map { local %minfo = &get_module_info($_); \%minfo } @ARGV; ++ } ++else { ++ @mods = &get_all_module_infos(); ++ } ++ ++foreach $m (@mods) { + $mdir = &module_root_directory($m->{'dir'}); + if (&check_os_support($m) && + -r "$mdir/uninstall.pl") { diff --git a/sysutils/webmin/wbm.mk b/sysutils/webmin/wbm.mk index 9523738acbe..87414ef7e15 100644 --- a/sysutils/webmin/wbm.mk +++ b/sysutils/webmin/wbm.mk @@ -1,4 +1,4 @@ -# $NetBSD: wbm.mk,v 1.3 2006/05/16 16:38:06 jlam Exp $ +# $NetBSD: wbm.mk,v 1.4 2006/05/19 17:14:53 jlam Exp $ # # Makefile fragment for Webmin modules @@ -16,6 +16,7 @@ DEPENDS+= webmin>=1.270:../../sysutils/webmin EVAL_PREFIX+= PREFIX.webmin=webmin WEBMIN_DIR= ${PREFIX.webmin}/share/webmin WEBMIN_EGDIR= ${PREFIX.webmin}/share/examples/webmin +WEBMIN_VARDIR= ${VARBASE}/webmin WBM_DIR= ${PREFIX}/share/webmin WBM_EGDIR= ${PREFIX}/share/examples/webmin @@ -27,6 +28,11 @@ OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/${WBMNAME} \ CONF_FILES_PERMS+= ${WBM_EGDIR}/${WBMNAME}/config \ ${PKG_SYSCONFDIR}/${WBMNAME}/config \ ${ROOT_USER} ${ROOT_GROUP} 0600 +FILES_SUBST+= WBMNAME=${WBMNAME:Q} +FILES_SUBST+= WEBMIN_DIR=${WEBMIN_DIR:Q} +FILES_SUBST+= WEBMIN_VARDIR=${WEBMIN_VARDIR:Q} + +DEINSTALL_TEMPLATE+= ${PKGSRCDIR}/sysutils/webmin/files/wbm-deinstall.tmpl # WBMNAME is the name of the module directory WBMNAME?= ${DISTNAME} |