diff options
| -rw-r--r-- | app-admin/usermin/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/usermin/files/digest-usermin-1.130-r1 | 1 | ||||
| -rw-r--r-- | app-admin/usermin/files/usermin-1.100-setup-nocheck.patch | 21 | ||||
| -rw-r--r-- | app-admin/usermin/usermin-1.130-r1.ebuild | 89 | ||||
| -rw-r--r-- | app-admin/webmin/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/webmin/files/digest-webmin-1.210-r1 | 3 | ||||
| -rw-r--r-- | app-admin/webmin/webmin-1.210-r1.ebuild | 142 |
7 files changed, 10 insertions, 258 deletions
diff --git a/app-admin/usermin/ChangeLog b/app-admin/usermin/ChangeLog index f746fb3b5934..2df9237410be 100644 --- a/app-admin/usermin/ChangeLog +++ b/app-admin/usermin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/usermin # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.75 2005/09/22 18:01:20 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.76 2005/09/24 19:13:05 eradicator Exp $ + + 24 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org> + -files/usermin-1.100-setup-nocheck.patch, -usermin-1.130-r1.ebuild: + Removing insecure versions. 22 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> usermin-1.160.ebuild: Stable on hppa, ppc. diff --git a/app-admin/usermin/files/digest-usermin-1.130-r1 b/app-admin/usermin/files/digest-usermin-1.130-r1 deleted file mode 100644 index 3cac66fa1070..000000000000 --- a/app-admin/usermin/files/digest-usermin-1.130-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 16166839af85b53272817f436c6cb310 usermin-1.130.tar.gz 2264410 diff --git a/app-admin/usermin/files/usermin-1.100-setup-nocheck.patch b/app-admin/usermin/files/usermin-1.100-setup-nocheck.patch deleted file mode 100644 index 732064f09c59..000000000000 --- a/app-admin/usermin/files/usermin-1.100-setup-nocheck.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- usermin-1.100/setup.sh.orig 2004-12-31 14:33:05.359008295 -0800 -+++ usermin-1.100/setup.sh 2004-12-31 14:33:35.975968539 -0800 -@@ -342,12 +342,12 @@ - echo "" - exit 12 - fi -- $perl -e 'use Socket; socket(FOO, PF_INET, SOCK_STREAM, getprotobyname("tcp")); setsockopt(FOO, SOL_SOCKET, SO_REUSEADDR, pack("l", 1)); bind(FOO, pack_sockaddr_in($ARGV[0], INADDR_ANY)) || exit(1); exit(0);' $port -- if [ $? != "0" ]; then -- echo "ERROR: TCP port $port is already in use by another program" -- echo "" -- exit 13 -- fi -+ #$perl -e 'use Socket; socket(FOO, PF_INET, SOCK_STREAM, getprotobyname("tcp")); setsockopt(FOO, SOL_SOCKET, SO_REUSEADDR, pack("l", 1)); bind(FOO, pack_sockaddr_in($ARGV[0], INADDR_ANY)) || exit(1); exit(0);' $port -+ #if [ $? != "0" ]; then -+ # echo "ERROR: TCP port $port is already in use by another program" -+ # echo "" -+ # exit 13 -+ #fi - if [ "$ssl" = "" ]; then - ssl=0 - $perl -e 'use Net::SSLeay' >/dev/null 2>/dev/null diff --git a/app-admin/usermin/usermin-1.130-r1.ebuild b/app-admin/usermin/usermin-1.130-r1.ebuild deleted file mode 100644 index 16eda8feffef..000000000000 --- a/app-admin/usermin/usermin-1.130-r1.ebuild +++ /dev/null @@ -1,89 +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/usermin/usermin-1.130-r1.ebuild,v 1.6 2005/09/09 14:09:17 agriffis Exp $ - -IUSE="ssl" - -inherit eutils pam - -DESCRIPTION="a web-based user administration interface" -HOMEPAGE="http://www.webmin.com/index6.html" -SRC_URI="mirror://sourceforge/webadmin/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86" - -DEPEND="dev-lang/perl" - -RDEPEND="${DEPEND} - sys-process/lsof - dev-perl/Authen-PAM - virtual/pam - ssl? ( dev-perl/Net-SSLeay )" - -src_unpack() { - unpack ${A} - - cd ${S} - - # Point to the correct mysql location - sed -i -e "s:/usr/local/mysql:/usr:g" mysql/config - - epatch ${FILESDIR}/${PN}-1.080-safestop.patch - epatch ${FILESDIR}/${PN}-1.100-setup-nocheck.patch -} - -src_install() { - # Change /usr/local/bin/perl references - find . -type f | xargs sed -i -e 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:' - - dodir /usr/libexec/usermin - cp -pR * ${D}/usr/libexec/usermin - - newinitd ${FILESDIR}/init.d.usermin usermin - - newpamd ${FILESDIR}/${PN}.pam-include ${PN} - - # Fix ownership - chown -R root:0 ${D} - - dodir /etc/usermin - dodir /var/log/usermin - - config_dir=${D}/etc/usermin - var_dir=${D}/var/log/usermin - perl=${ROOT}/usr/bin/perl - autoos=1 - port=20000 - 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/usermin/setup.sh > ${T}/usermin-setup.out 2>&1 || die "Failed to create initial usermin configuration." - - # Fixup the config files to use their real locations - sed -i -e 's:^pidfile=.*$:pidfile=${ROOT}/var/run/usermin.pid:' ${D}/etc/usermin/miniserv.conf - find ${D}/etc/usermin -type f | xargs sed -i -e "s:${D}:${ROOT}:g" - - # Cleanup from the config script - rm -rf ${D}/var/log/usermin - keepdir /var/log/usermin/ -} - -pkg_postinst() { - einfo "To make usermin start at boot time, run: 'rc-update add usermin default'." - einfo "Point your web browser to http://localhost:20000 to use usermin." -} - -pkg_prerm() { - ${ROOT}/etc/init.d/usermin stop >& /dev/null -} diff --git a/app-admin/webmin/ChangeLog b/app-admin/webmin/ChangeLog index 5ea993fe7e9a..a3791d28f168 100644 --- a/app-admin/webmin/ChangeLog +++ b/app-admin/webmin/ChangeLog @@ -1,6 +1,10 @@ # 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.102 2005/09/22 18:01:05 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.103 2005/09/24 19:14:43 eradicator Exp $ + + 24 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org> + -webmin-1.210-r1.ebuild: + Removing insecure versions. 22 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> webmin-1.230.ebuild: Stable on hppa, ppc. diff --git a/app-admin/webmin/files/digest-webmin-1.210-r1 b/app-admin/webmin/files/digest-webmin-1.210-r1 deleted file mode 100644 index 8814573c40ec..000000000000 --- a/app-admin/webmin/files/digest-webmin-1.210-r1 +++ /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/webmin-1.210-r1.ebuild b/app-admin/webmin/webmin-1.210-r1.ebuild deleted file mode 100644 index ffb10e9c49b1..000000000000 --- a/app-admin/webmin/webmin-1.210-r1.ebuild +++ /dev/null @@ -1,142 +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-r1.ebuild,v 1.2 2005/09/09 14:17:52 agriffis 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 -} |