# 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.69 2005/08/21 09:34:03 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.70 2005/09/03 23:22:35 eradicator Exp $
+
+*usermin-1.150 (03 Sep 2005)
+
+ 03 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+ +files/usermin-1.150-setup-nocheck.patch, -usermin-1.100-r1.ebuild,
+ +usermin-1.150.ebuild:
+ Version bump.
21 Aug 2005; Rene Nussbaumer <killerfox@gentoo.org>
usermin-1.130-r1.ebuild:
-MD5 b15e5ceebe7b313013164cfb19955aa6 ChangeLog 9431
-MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
-MD5 265e9776e08e5937b984ad1c1e79a746 usermin-1.100-r1.ebuild 2524
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
MD5 caaf0682be8a96c5cc4ec28fad42eaf1 usermin-1.130.ebuild 2317
+MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
+MD5 115441b2c027fe0c5c1c7f0a8096d295 usermin-1.150.ebuild 2303
MD5 393bff68e3e1a8aaad9697aeba49d1d8 usermin-1.130-r1.ebuild 2299
-MD5 b3ae782d361d5f450212191c25bf4623 files/digest-usermin-1.100-r1 66
-MD5 790e601fcd965a2804ac85e89d9dee35 files/digest-usermin-1.130 66
+MD5 718bb049b38f0144341c5306e6d8b4a5 ChangeLog 9631
+MD5 790e601fcd965a2804ac85e89d9dee35 files/digest-usermin-1.130-r1 66
MD5 2e7c19bb66f99c168fc2e86b4bb4862c files/init.d.usermin 825
MD5 bd4b2cc177b4fb7b0f96edc60008a6b5 files/usermin-1.080-safestop.patch 620
MD5 e93705fc1a8b2d9410a920a777890624 files/usermin-1.100-setup-nocheck.patch 951
MD5 2e7603feaff187884dd9b1e66601f02b files/usermin.pam 382
-MD5 790e601fcd965a2804ac85e89d9dee35 files/digest-usermin-1.130-r1 66
MD5 609774f17b0470a793fb7791278e270d files/usermin.pam-include 210
+MD5 a590f1ac1efd4c07d7016e9e15c70b4e files/digest-usermin-1.150 66
+MD5 790e601fcd965a2804ac85e89d9dee35 files/digest-usermin-1.130 66
+MD5 ba4e105ca9f8d294ba4e3d7774bf0760 files/usermin-1.150-setup-nocheck.patch 998
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGjBJArHZZzCEUG0RAjinAJ9+cqV9j+dQXXAL/Epd4n3g64j63wCfToi+
+6QyydhcdLk1Zp3MP88GRaTY=
+=FCNT
+-----END PGP SIGNATURE-----
+++ /dev/null
-MD5 0c419acc17ff5c3d623d5e319af06f23 usermin-1.100.tar.gz 2224193
--- /dev/null
+MD5 de7c947de7305a8a352cc48480d65279 usermin-1.150.tar.gz 2565132
--- /dev/null
+diff -Naurp usermin-1.150.orig/setup.sh usermin-1.150/setup.sh
+--- usermin-1.150.orig/setup.sh 2005-09-03 16:19:50.000000000 -0700
++++ usermin-1.150/setup.sh 2005-09-03 16:21:01.000000000 -0700
+@@ -342,12 +342,12 @@ else
+ 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
+
+ # Ask the user if SSL should be used
+ if [ "$ssl" = "" ]; then
# 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.100-r1.ebuild,v 1.5 2005/03/03 15:00:36 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.150.ebuild,v 1.1 2005/09/03 23:22:35 eradicator Exp $
IUSE="ssl"
-inherit eutils
+inherit eutils pam
DESCRIPTION="a web-based user administration interface"
HOMEPAGE="http://www.webmin.com/index6.html"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-RDEPEND="dev-lang/perl
- sys-process/lsof
- >=sys-apps/sed-4
- dev-perl/Authen-PAM
- ssl? ( dev-perl/Net-SSLeay )"
+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 "s:/usr/local/mysql:/usr:g" mysql/config
-
- # Bug #46273... missing config for gentoo
- cp quota/generic-linux-lib.pl quota/gentoo-linux-lib.p
+ 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
+ epatch ${FILESDIR}/${PN}-1.150-setup-nocheck.patch
}
src_install() {
# Change /usr/local/bin/perl references
- find . -type f | xargs sed -i 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
+ find . -type f | xargs sed -i -e 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:'
dodir /usr/libexec/usermin
- cp -a * ${D}/usr/libexec/usermin
+ cp -pR * ${D}/usr/libexec/usermin
- exeinto /etc/init.d
- newexe ${FILESDIR}/init.d.usermin usermin
+ newinitd ${FILESDIR}/init.d.usermin usermin
- insinto /etc/pam.d
- newins ${FILESDIR}/${PN}.pam ${PN}
+ newpamd ${FILESDIR}/${PN}.pam-include ${PN}
# Fix ownership
- chown -R root:root ${D}
+ chown -R root:0 ${D}
dodir /etc/usermin
dodir /var/log/usermin
nouninstall=1
noperlpath=1
tempdir="${T}"
- export config_dir var_dir perl autoos port login crypt host ssl nochown autothird nouninstall nostart noperlpath tempdir
+ 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 's:^pidfile=.*$:pidfile=${ROOT}/var/run/usermin.pid:' ${D}/etc/usermin/miniserv.conf
- find ${D}/etc/usermin -type f -exec sed -i "s:${D}:${ROOT}:g" {} \;
+ 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
}
pkg_postinst() {
- local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
- dosed "s/root:XXX/root:${crypt}/" /etc/usermin/miniserv.users
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."
}