From 114f9f07b8ba236ba023faf2481678804ace806c Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Wed, 17 Aug 2005 21:07:00 +0000 Subject: Revbump. Don't install the AuthenSolaris crap. (Portage version: 2.0.51.22-r2) --- app-admin/webmin/ChangeLog | 8 +- app-admin/webmin/Manifest | 14 +-- app-admin/webmin/files/digest-webmin-1.210 | 3 - app-admin/webmin/files/digest-webmin-1.210-r1 | 3 + app-admin/webmin/webmin-1.210-r1.ebuild | 142 ++++++++++++++++++++++++++ app-admin/webmin/webmin-1.210.ebuild | 139 ------------------------- 6 files changed, 154 insertions(+), 155 deletions(-) delete mode 100644 app-admin/webmin/files/digest-webmin-1.210 create mode 100644 app-admin/webmin/files/digest-webmin-1.210-r1 create mode 100644 app-admin/webmin/webmin-1.210-r1.ebuild delete mode 100644 app-admin/webmin/webmin-1.210.ebuild (limited to 'app-admin/webmin') diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog index 864bee6d7ca4..125c924d1953 100644 --- a/app-admin/webmin/ChangeLog +++ b/app-admin/webmin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/webmin # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.95 2005/08/17 20:53:57 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.96 2005/08/17 21:07:00 eradicator Exp $ + +*webmin-1.210-r1 (17 Aug 2005) + + 17 Aug 2005; Jeremy Huddleston + -webmin-1.210.ebuild, +webmin-1.210-r1.ebuild: + Revbump. Don't install the AuthenSolaris crap. 17 Aug 2005; Jeremy Huddleston files/webmin-gentoo-init: diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest index 72be43345c7c..318ce12576e2 100644 --- a/app-admin/webmin/Manifest +++ b/app-admin/webmin/Manifest @@ -1,16 +1,13 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226 MD5 c6d3309b62a5ba19e3aa3893e0cca346 webmin-1.170-r3.ebuild 3681 MD5 ab60cf6bc8e8138e63db93810f327cd1 webmin-1.200-r1.ebuild 3797 MD5 12670d89aecc1330362cb34bc653bd9e webmin-1.200.ebuild 3829 -MD5 afe946362b8de35486310d31251e4907 webmin-1.210.ebuild 3919 MD5 f3d2865f0d5fdad881106e8abe9c9a1d ChangeLog 2452 +MD5 1ef1acf24e7ccd3e2d7cb10363002fbf webmin-1.210-r1.ebuild 3979 +MD5 171e9e052878636913441103aac011b0 files/digest-webmin-1.210-r1 209 MD5 6d9dfc76f788500ff3c85cbb42667487 files/digest-webmin-1.170-r3 209 MD5 eee259ae52a25169e6cd54a746f4865e files/digest-webmin-1.200 209 MD5 eee259ae52a25169e6cd54a746f4865e files/digest-webmin-1.200-r1 209 -MD5 171e9e052878636913441103aac011b0 files/digest-webmin-1.210 209 MD5 54dc8937e05bd76ad86a6c5f5ae6a333 files/init.d.webmin 859 MD5 bc8eb1c9de103599fc00b140b0ed1f9f files/uninstall.sh 260 MD5 082b9fc08240293b2b7b3609ba8e0cfd files/virtual-server-2.31-checkip.patch 607 @@ -24,10 +21,3 @@ MD5 0ebd73f1cd5948ec1c3532a2f59f2c53 files/webmin-1.170-postfix.patch 868 MD5 512204473654b6eb41308d3319ba6144 files/webmin-1.170-setup-nocheck.patch 943 MD5 6a55026b21c4da9284b31236deeceda7 files/webmin-gentoo-init 864 MD5 7d80c86adbd36eeb8f220b9efdd30819 files/webmin-pam 101 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDA6QBArHZZzCEUG0RAja9AJ0QDKBZRZfW8WMUfyDCdeOA2Q89NQCfXS6l -gnF4+MkYwdaAiZocVAyXBtg= -=1PHH ------END PGP SIGNATURE----- diff --git a/app-admin/webmin/files/digest-webmin-1.210 b/app-admin/webmin/files/digest-webmin-1.210 deleted file mode 100644 index 8814573c40ec..000000000000 --- a/app-admin/webmin/files/digest-webmin-1.210 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 7d16a59550ed4ac1edf5ec11ea3bd748 webmin-1.210-minimal.tar.gz 1140870 -MD5 afffc264915bf3084561627bc71d68fa webmin-1.210.tar.gz 8447509 -MD5 0a312dbc15a8c6c25764ef51f0094202 virtual-server-2.60.wbm.gz 275367 diff --git a/app-admin/webmin/files/digest-webmin-1.210-r1 b/app-admin/webmin/files/digest-webmin-1.210-r1 new file mode 100644 index 000000000000..8814573c40ec --- /dev/null +++ b/app-admin/webmin/files/digest-webmin-1.210-r1 @@ -0,0 +1,3 @@ +MD5 7d16a59550ed4ac1edf5ec11ea3bd748 webmin-1.210-minimal.tar.gz 1140870 +MD5 afffc264915bf3084561627bc71d68fa webmin-1.210.tar.gz 8447509 +MD5 0a312dbc15a8c6c25764ef51f0094202 virtual-server-2.60.wbm.gz 275367 diff --git a/app-admin/webmin/webmin-1.210-r1.ebuild b/app-admin/webmin/webmin-1.210-r1.ebuild new file mode 100644 index 000000000000..195dae5498d5 --- /dev/null +++ b/app-admin/webmin/webmin-1.210-r1.ebuild @@ -0,0 +1,142 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.210-r1.ebuild,v 1.1 2005/08/17 21:07:00 eradicator Exp $ + +IUSE="apache2 pam postgres ssl webmin-minimal" + +inherit eutils pam + +VM_V="2.60" + +DESCRIPTION="Webmin, a web-based system administration interface" +HOMEPAGE="http://www.webmin.com/" +SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz ) + !webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz + http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.wbm.gz )" + +LICENSE="BSD" +SLOT="0" + +# ~mips removed because of broken deps. Bug #86085 +KEYWORDS="~alpha amd64 hppa ppc ppc64 s390 sparc x86" + +DEPEND="dev-lang/perl" +RDEPEND="${DEPEND} + pam? ( virtual/pam ) + ssl? ( dev-perl/Net-SSLeay ) + postgres? ( dev-perl/DBD-Pg ) + dev-perl/XML-Generator" + +src_unpack() { + unpack ${A} + + cd ${S} + + # in webmin-minimal webalizer and apache2 are not present + if ! use webmin-minimal ; then + # Bug #47020 + epatch ${FILESDIR}/${PN}-1.130-webalizer.patch + + # Bug #50810, #51943 + if use apache2; then + epatch ${FILESDIR}/${PN}-1.140-apache2.patch + fi + + # Postfix should modify the last entry of the maps file + epatch ${FILESDIR}/${PN}-1.170-postfix.patch + + mv ${WORKDIR}/virtual-server-${VM_V}.wbm ${T}/vs.tar + tar -xf ${T}/vs.tar + + # Don't create ${HOME}/cgi-bin on new accounts + epatch ${FILESDIR}/virtual-server-2.60-nocgibin.patch + + # Check if a newly added IP is already active + epatch ${FILESDIR}/virtual-server-2.31-checkip.patch + + # Verify Postgres usernames + epatch ${FILESDIR}/virtual-server-2.31-pgsql.patch + + # Fix some all name virtual items + epatch ${FILESDIR}/virtual-server-2.31-namevirtual.patch + fi + + epatch ${FILESDIR}/${PN}-1.170-setup-nocheck.patch +} + +src_install() { + # Bug #97212 + addpredict /var/lib/rpm + + rm -f mount/freebsd-mounts* + rm -f mount/openbsd-mounts* + rm -f mount/macos-mounts* + + (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl - + dodir /usr/libexec/webmin + dodir /var + + cp -rp * ${D}/usr/libexec/webmin + + # in webmin-minimal openslp is not present + if [ ! -f "${D}/usr/libexec/webmin/openslp/config-gentoo-linux" ] ; then + cp ${D}/usr/libexec/webmin/openslp/config \ + ${D}/usr/libexec/webmin/openslp/config-gentoo-linux + fi + + newinitd ${FILESDIR}/init.d.webmin webmin + + newpamd ${FILESDIR}/webmin-pam webmin + echo gentoo > ${D}/usr/libexec/webmin/install-type + + # Fix ownership + chown -R root:0 ${D} + + dodir /etc/webmin + dodir /var/log/webmin + + config_dir=${D}/etc/webmin + var_dir=${D}/var/log/webmin + perl=${ROOT}/usr/bin/perl + autoos=1 + port=10000 + login=root + crypt="XXX" + host=`hostname` + use ssl && ssl=1 || ssl=0 + atboot=0 + nostart=1 + nochown=1 + autothird=1 + nouninstall=1 + noperlpath=1 + tempdir="${T}" + export config_dir var_dir perl autoos port login crypt host ssl atboot nostart nochown autothird nouninstall noperlpath tempdir + ${D}/usr/libexec/webmin/setup.sh > ${T}/webmin-setup.out 2>&1 || die "Failed to create initial webmin configuration." + + # Fixup the config files to use their real locations + sed -i -e 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' ${D}/etc/webmin/miniserv.conf + find ${D}/etc/webmin -type f | xargs sed -i -e "s:${D}:${ROOT}:g" + + # Cleanup from the config script + rm -rf ${D}/var/log/webmin + keepdir /var/log/webmin/ + + rm -rf ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1 + rm -f ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1.tar.gz +} + +pkg_postinst() { + local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :) + crypt=${crypt//\\/\\\\} + crypt=${crypt//\//\\\/} + sed -i -e "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users + + einfo "To make webmin start at boot time, run: 'rc-update add webmin default'." + use ssl && einfo "Point your web browser to https://localhost:10000 to use webmin." + use ssl || einfo "Point your web browser to http://localhost:10000 to use webmin." +} + +pkg_prerm() { + ${ROOT}/etc/init.d/webmin stop >& /dev/null +} diff --git a/app-admin/webmin/webmin-1.210.ebuild b/app-admin/webmin/webmin-1.210.ebuild deleted file mode 100644 index 32724f4938a0..000000000000 --- a/app-admin/webmin/webmin-1.210.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.210.ebuild,v 1.8 2005/08/14 10:14:24 hansmi Exp $ - -IUSE="apache2 pam postgres ssl webmin-minimal" - -inherit eutils pam - -VM_V="2.60" - -DESCRIPTION="Webmin, a web-based system administration interface" -HOMEPAGE="http://www.webmin.com/" -SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz ) - !webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz - http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.wbm.gz )" - -LICENSE="BSD" -SLOT="0" - -# ~mips removed because of broken deps. Bug #86085 -KEYWORDS="~alpha amd64 hppa ppc ppc64 s390 sparc x86" - -DEPEND="dev-lang/perl" -RDEPEND="${DEPEND} - pam? ( virtual/pam ) - ssl? ( dev-perl/Net-SSLeay ) - postgres? ( dev-perl/DBD-Pg ) - dev-perl/XML-Generator" - -src_unpack() { - unpack ${A} - - cd ${S} - - # in webmin-minimal webalizer and apache2 are not present - if ! use webmin-minimal ; then - # Bug #47020 - epatch ${FILESDIR}/${PN}-1.130-webalizer.patch - - # Bug #50810, #51943 - if use apache2; then - epatch ${FILESDIR}/${PN}-1.140-apache2.patch - fi - - # Postfix should modify the last entry of the maps file - epatch ${FILESDIR}/${PN}-1.170-postfix.patch - - mv ${WORKDIR}/virtual-server-${VM_V}.wbm ${T}/vs.tar - tar -xf ${T}/vs.tar - - # Don't create ${HOME}/cgi-bin on new accounts - epatch ${FILESDIR}/virtual-server-2.60-nocgibin.patch - - # Check if a newly added IP is already active - epatch ${FILESDIR}/virtual-server-2.31-checkip.patch - - # Verify Postgres usernames - epatch ${FILESDIR}/virtual-server-2.31-pgsql.patch - - # Fix some all name virtual items - epatch ${FILESDIR}/virtual-server-2.31-namevirtual.patch - fi - - epatch ${FILESDIR}/${PN}-1.170-setup-nocheck.patch -} - -src_install() { - # Bug #97212 - addpredict /var/lib/rpm - - rm -f mount/freebsd-mounts* - rm -f mount/openbsd-mounts* - rm -f mount/macos-mounts* - - (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl - - dodir /usr/libexec/webmin - dodir /var - - cp -rp * ${D}/usr/libexec/webmin - - # in webmin-minimal openslp is not present - if [ ! -f "${D}/usr/libexec/webmin/openslp/config-gentoo-linux" ] ; then - cp ${D}/usr/libexec/webmin/openslp/config \ - ${D}/usr/libexec/webmin/openslp/config-gentoo-linux - fi - - newinitd ${FILESDIR}/init.d.webmin webmin - - newpamd ${FILESDIR}/webmin-pam webmin - echo gentoo > ${D}/usr/libexec/webmin/install-type - - # Fix ownership - chown -R root:0 ${D} - - dodir /etc/webmin - dodir /var/log/webmin - - config_dir=${D}/etc/webmin - var_dir=${D}/var/log/webmin - perl=${ROOT}/usr/bin/perl - autoos=1 - port=10000 - login=root - crypt="XXX" - host=`hostname` - use ssl && ssl=1 || ssl=0 - atboot=0 - nostart=1 - nochown=1 - autothird=1 - nouninstall=1 - noperlpath=1 - tempdir="${T}" - export config_dir var_dir perl autoos port login crypt host ssl atboot nostart nochown autothird nouninstall noperlpath tempdir - ${D}/usr/libexec/webmin/setup.sh > ${T}/webmin-setup.out 2>&1 || die "Failed to create initial webmin configuration." - - # Fixup the config files to use their real locations - sed -i -e 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' ${D}/etc/webmin/miniserv.conf - find ${D}/etc/webmin -type f | xargs sed -i -e "s:${D}:${ROOT}:g" - - # Cleanup from the config script - rm -rf ${D}/var/log/webmin - keepdir /var/log/webmin/ -} - -pkg_postinst() { - local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :) - crypt=${crypt//\\/\\\\} - crypt=${crypt//\//\\\/} - sed -i -e "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users - - einfo "To make webmin start at boot time, run: 'rc-update add webmin default'." - use ssl && einfo "Point your web browser to https://localhost:10000 to use webmin." - use ssl || einfo "Point your web browser to http://localhost:10000 to use webmin." -} - -pkg_prerm() { - ${ROOT}/etc/init.d/webmin stop >& /dev/null -} -- cgit v1.2.3-65-gdbad