diff options
| -rw-r--r-- | app-admin/usermin/ChangeLog | 12 | ||||
| -rw-r--r-- | app-admin/usermin/Manifest | 22 | ||||
| -rw-r--r-- | app-admin/usermin/files/usermin-1.540-r1.init | 38 | ||||
| -rw-r--r-- | app-admin/usermin/metadata.xml | 10 | ||||
| -rw-r--r-- | app-admin/usermin/usermin-1.540-r1.ebuild | 93 | ||||
| -rw-r--r-- | app-admin/usermin/usermin-1.540.ebuild | 8 |
6 files changed, 156 insertions, 27 deletions
diff --git a/app-admin/usermin/ChangeLog b/app-admin/usermin/ChangeLog index 95f90ace4bcd..ada339467c11 100644 --- a/app-admin/usermin/ChangeLog +++ b/app-admin/usermin/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for app-admin/usermin # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.155 2013/03/13 21:24:00 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/ChangeLog,v 1.156 2013/04/03 02:24:22 tomwij Exp $ + +*usermin-1.540-r1 (03 Apr 2013) + + 03 Apr 2013; Tom Wijsman <TomWij@gentoo.org> +files/usermin-1.540-r1.init, + +usermin-1.540-r1.ebuild, metadata.xml, usermin-1.540.ebuild: + Introduced dependencies and USE conditional dependencies that are mentioned + through out the usermin code. Make usermin run under the usermin user instead + of root to avoid future security issues. EAPI 5, moved code from src_unpack to + src_prepare. Cleanup of the src_install function. Bump, updated init script to + run under the usermin user. *usermin-1.540 (13 Mar 2013) diff --git a/app-admin/usermin/Manifest b/app-admin/usermin/Manifest index f61c9f269e21..054660dc00c1 100644 --- a/app-admin/usermin/Manifest +++ b/app-admin/usermin/Manifest @@ -1,26 +1,14 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX init.d.usermin 825 SHA256 b1103d5c733a0c49a19c407a718617454342b19c34f238f11dc20be3356d38bf SHA512 1d9e850f01b52e636ced00a8987aa505d3e21ca57df294884cb2023d5837cb7936f746d11dc65d4c6a9bc9ec8f2d5b20a5fc20efa11176a61f21bcbe5117eaa8 WHIRLPOOL 663d6279ee1905164ec562436e9f1d64d3a89b749c5eac1e721de43621a4aae07ba17f453731526b1ca57d6b52dc80d695b2ca66f42037de493e189b2ad45153 AUX usermin-1.080-safestop.patch 620 SHA256 cd4ed0f18303bfd518791993f413a9b338a5e621a9ee17367f5590d1a970ea98 SHA512 9fb21a78088dfee2f80b809f7e83851e844046fcbd324cfe2990798a4bfcf6c88c5c2a56fb0da03bf85e2b8ec2520cb9b52212eb0d399e3fd522e9c4333ce0eb WHIRLPOOL 40e3df600f6f407a5927f62bc442e7e676ddd754631729469ca204faec2ce0dd17877356dd6052702cca342f6ccc2105fbcb00c3f798088651c9650284dbbdbb AUX usermin-1.150-setup-nocheck.patch 998 SHA256 e7d550caed8dc773102ca1330fb51de7f82c3763c1a70a1df8cebad7da0afb27 SHA512 2006d6f53b95b9ef543f5dfbf96eeeb0016f1915fe4df5d28f71112fcfccfe489cf001bd9401f33a4d59ab39f26ed2a6f124236108385cf9cc86958f8c3640e5 WHIRLPOOL f20e59c35b66f7ea4dc4d72d53c7dd388175e223c0b430fb0ac0a42d33a8525610d02f1b29834848d0ced0a864e030061aa489697e6fb463f115d03b9e9ff743 +AUX usermin-1.540-r1.init 843 SHA256 260b44b59a19b0206da603718684c3d82de4320dd4e2534d1af0d6da55079879 SHA512 3aac81c500d1d5d98e4a5a17250224fdd87c222b70ee8dec077521e8a8095ea311d8fcbcbe60fb56199680d7bb76c18ec97192589a5384dba6590616f69d90d7 WHIRLPOOL aacb447f5ffa8f255722aecdaae633b25193d4b2ef68c6417ce26ebb39b33b53f2876717419fa4b10a23eb85365c1a983219958afe38ab79155f65b5c122c10f AUX usermin.pam-include.1 210 SHA256 facea91616049551f44655a7f8a270c61dd571e860284abc972fd3430a9b8d50 SHA512 75441a60244060603229f4d6e41501a1250e07845a6763c5d7702740cf657a0d755dfee524b0f5a71f4c5d48a5edb786ef9166648d928c866e158c9e960c958c WHIRLPOOL 92eab67307edb92e72f6ca4aa01ee9800c772f627b30f6ca9e30d59964c116c6de4869018cfccfae5d0073c162b8253e11ed699d8f3940c5da6846d6abf97c0d DIST usermin-1.430.tar.gz 6059219 SHA256 2886f30bf843632f386d97b28d77f393af1157bb13b69694553a4d5e509d67a9 SHA512 1b9c9e59072663f0e057a831622893fb1b214d6a51fa8b0eeb292acd9fc82b0903d2dbe0a2f50ff1daffb4d00be1709d3b31f71a5e20c6b26dc2882135edd008 WHIRLPOOL 7efd2b751f7ae14dfa2a2e64035eaff12cc30f2665f92a049d4c6efd86a1fee228361fc3340a949990950045b9d30c1ed856c538f6f0c13dbe6108c42d6bcf09 DIST usermin-1.530.tar.gz 9117223 SHA256 d9196276c2dfe0615964d0e1df89d7a5991abc33c4d1eaa6180733797c466d33 SHA512 6cf5bc062ed09ceb2993a00e47d4bfadba4af4a2263b7cb0d9f37c61e987bdda925435d26ca9258f2c552126116bba0330bc1d63b307783ed6238abe60223f13 WHIRLPOOL 0433c308c481fc8b6ff36305ebca279f361b12d26df24b3ef35057319743de1855b69aac698e7df50377534e9cd34c672bdeb829073a976e5a96f629db27fc38 DIST usermin-1.540.tar.gz 9135732 SHA256 e3025ebfb455a36599b7bb88afb99fa24b0e263fdea5684448eac6d1a2242028 SHA512 7940de94da5d96060e1feae9f7f47f5d746f4e146792fc8bb595fca2e569eac84925d1018c12ba8d8e9564b3dc005363a7523889b089c058214adb086b888db2 WHIRLPOOL 5a7682a6961da2ba74fb628795a5a6cb44022a35fd8a6280be1278a47b32e74068e6f8732afd689dea1eeefde1170928d38bc4b3116477a5ed260ff6d7f725e8 EBUILD usermin-1.430.ebuild 2245 SHA256 d9292d85a8a987e022c368376455af5855cb66c64f23717b8529e6e7a87accc2 SHA512 e91f2b91f2a3825b4566ecf2df9ffac301a3556bddc7f80dd5f318056bb95e7722a888328f990b58a7c3e4e07ebc8111671fa46e1c57ecdf6ab81b9dce650162 WHIRLPOOL edd7e906f26062513a71024988492c3b11e4fb3c9b21f15a7eb2c666ea6eab69802e71c7ab1fbf5ea47faff15cb10fab4f6fd024f1d8a1d1c8d0d8c7e48ac981 EBUILD usermin-1.530.ebuild 2249 SHA256 f0e3464ead3bc3e1277bf04d92303dc8446da89e6fa3de460b1755571034f3e9 SHA512 83d60a7f1c0203bf3b5c82183124742f9089d16de8f26221500a718412bd6524068a6ad166344bb6f75be69bbd24bf9b2d6894d71be20177d7050ffe4697c644 WHIRLPOOL 44e887bb5388d03868e64767d117c5dd67c79996dd5c57aaec7ceae183f73950d1b48c1bcc1fa2fb368c4f43da0abfeed47f159a9afb85bacf97413adeeee353 -EBUILD usermin-1.540.ebuild 2258 SHA256 c49e08220306eea1038690adebda98f9260c3b774e08684bff9d698f8ebf92a1 SHA512 1e34a0a759e6509596d430a60813dbdf93fe49e035e08d3b9f712c503bc4b2abaf688923ea5749c054373dc60e47d6a16750c9fcb6c7603dacae444cb4e88d77 WHIRLPOOL eb9db2033a8778a16da84d19a4ecbe5667885d9b54c80c9848ac17f4842deab105fc37db182591747a3ac1d64c1b231196afbbfad8c50d71dc6a76ae01a95958 -MISC ChangeLog 19996 SHA256 0fe256a0aee2e8d97998f6241978481e5961eb2c2b003ce2583c19d4311e7090 SHA512 7c386eac25f56af6a314b1a3fcefc48876eefdf3e37ecaa1fdb7f12d54466987feda560513537a4c8a74990494d347b6c44b91e47618dae7e514f0663d7c628c WHIRLPOOL 276401df8fb9d3d0c115a40157111309418fed729c5ac42cab850cb3c592e75e448b0faceb3be71d1cb49d836513df2128b8eff6f1839b10653ad6a56e94baaf -MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iQEcBAEBCAAGBQJRQO5jAAoJEJWyH81tNOV99+gIAKK4Vanmx9VFyE4kOPvRi4Oz -TWn1j6rmlRfUQCADguLcVm/K9TYghxFauE16K+Qe2z7Yvx7ZsClChxT3ucOZ6C5T -r+A6Cg1S6VXScJR0/xmLFGOym4b52bHPHBP/eJm8LxTrJHU6fiAUe8JZrGHM+XLk -gD4zuOKjVItAM0bPsADKjwZ+vbHazbxmOf6aXOTNwZhWbnbl5XLAJSA94vKsGRtY -2WDPY4gqjiNnUO0VheUjxA9S0XIOJeBKlOuLPVX6jobNONR9OoWCdfzplIsyJYC6 -6/F29zH+X9d2NRU3z1D3LoiYI/xDGJDTW3QUfVzDM9WA2nsKOFnG3XyfG7oAqdA= -=GPya ------END PGP SIGNATURE----- +EBUILD usermin-1.540-r1.ebuild 2522 SHA256 3768d49706bb56b41953cdf154ce1887dd5ae99f6053a1b691d04e14fe9a9e1d SHA512 376cff09d7dbd08261e7676f21894e4851f5462bb7db4d1a3e4f090e1393fa7740818c5a581923376d181502f087b763467030b4a44d761381d936dd1b9558d7 WHIRLPOOL a6dc37fd478516d1778b1cb581b2ea1178563aa4702feaa4da5a919302bd55a8a49cf2c7d4cf3ca4f06929dac97df527580f070191f286190d4e130b07874d0f +EBUILD usermin-1.540.ebuild 2233 SHA256 85cfaeca5afd4885c686da4a86635f60538938697db0f408e6b51e7774b028af SHA512 06a37dd46e0cac33b06f6d26a4935a34469f8207d9234c0fd016c02b6488d6c30fd58bc8ffceb576045c91418b476fb0c3c5fb412a410e14eb5f0f14e32cbb89 WHIRLPOOL 9547b040394a52cc3e2abbdf836f2b43eed113738f11c77abde620b5bde377f0264747bba9639c040ed7e530815d29767f3f3f51abcea7c4759afa1f3b6511a8 +MISC ChangeLog 20521 SHA256 47a2be1f43d1550dce9456259eb577c6c0b3ece2105077b704dcf9cd16e1e71a SHA512 35ad6cf8202b6c8735fde8cef883b75194f7b8ca3f51a59d9ca6c4d6cb88e28651f272d14af2bb0726d31e017eae6134cb459fc5b826d66880a097ae7b9d4fbb WHIRLPOOL b8dc5fb0933abea280f0c1240f8870e639ea85fd7280e727fccbbf0e7654766b8080dd6faa8302c1b3bc7a96353379135f1bb6ea44018496db166e6ab24400bb +MISC metadata.xml 324 SHA256 e31117cfe632357ed8d45afe5e7607423681086146f7a773073ff615cca65e32 SHA512 9d31940f3fde16190b6979581eac4b47cec6609ffff654e0012d490f63af728e5cb99fb6fd5428e54739ee58188a2c44bdad64262b3b57ef69a7766d92cf7d06 WHIRLPOOL 606ec1d10e7b4e0d2c2e3625968b2554e36fc0d648cc0b82ef65c32ac2c349503d9a5940b42aa19696efb27127ebe5893734504e7c8aad05a606b0eddf907660 diff --git a/app-admin/usermin/files/usermin-1.540-r1.init b/app-admin/usermin/files/usermin-1.540-r1.init new file mode 100644 index 000000000000..f4f5dec78318 --- /dev/null +++ b/app-admin/usermin/files/usermin-1.540-r1.init @@ -0,0 +1,38 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/files/usermin-1.540-r1.init,v 1.1 2013/04/03 02:24:22 tomwij Exp $ + +depend() { + use net logger +} + + +checkconfig() { + if [ -f /etc/usermin/config ]; then + return 0; + else + eerror "Error starting usermin. Have you run '/usr/libexec/usermin/setup.sh'?" + return 1; + fi +} + +start() { # copied from /etc/usermin/start + checkconfig || return 1 + ebegin "Starting Usermin" + + LANG= + export LANG + + unset PERLIO + export PERLIO + start-stop-daemon --start --quiet --user usermin \ + --exec /usr/libexec/usermin/miniserv.pl -- /etc/usermin/miniserv.conf + eend $? +} + +stop() { + ebegin "Stopping Usermin" + start-stop-daemon --stop --pidfile /var/run/usermin.pid --quiet + eend $? +} diff --git a/app-admin/usermin/metadata.xml b/app-admin/usermin/metadata.xml index d9cd2cad66c2..2a335f77851e 100644 --- a/app-admin/usermin/metadata.xml +++ b/app-admin/usermin/metadata.xml @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer> -<email>maintainer-needed@gentoo.org</email> -</maintainer> + <maintainer> + <email>TomWij@gentoo.org</email> + <name>Tom Wijsman</name> + </maintainer> + <longdescription> + A web-based user administration interface. + </longdescription> </pkgmetadata> diff --git a/app-admin/usermin/usermin-1.540-r1.ebuild b/app-admin/usermin/usermin-1.540-r1.ebuild new file mode 100644 index 000000000000..05389ab49f95 --- /dev/null +++ b/app-admin/usermin/usermin-1.540-r1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.540-r1.ebuild,v 1.1 2013/04/03 02:24:22 tomwij Exp $ + +EAPI="5" + +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 GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="ipv6 ldap pam ssl syslog zlib" + +DEPEND="dev-lang/perl" + +RDEPEND="${DEPEND} + || ( virtual/perl-Digest-MD5 dev-perl/MD5 ) + dev-perl/Digest-SHA1 + dev-perl/Net-HTTP + sys-process/lsof + virtual/perl-Time-HiRes + virtual/perl-Time-Local + ipv6? ( dev-perl/Socket6 ) + ldap? ( dev-perl/perl-ldap ) + pam? ( dev-perl/Authen-PAM ) + ssl? ( dev-perl/Net-SSLeay ) + syslog? ( virtual/perl-Sys-Syslog ) + zlib? ( virtual/perl-Compress-Raw-Zlib )" + +pkg_setup() { + enewuser ${PN} -1 /bin/bash +} + +src_prepare() { + # Point to the correct mysql location + sed -i -e "s:/usr/local/mysql:/usr:g" mysql/config + + # Change /usr/local/bin/perl references + find . -type f | xargs sed -i -e 's:^#!.*/usr/local/bin/perl:#!/usr/bin/perl:' + + # Fixup the config files to use their real locations + sed -i -e "s:^pidfile=.*$:pidfile=/var/run/${PN}.pid:" etc/${PN}/miniserv.conf + find etc/${PN} -type f | xargs sed -i -e "s:${D}:/:g" + + epatch "${FILESDIR}"/${PN}-1.080-safestop.patch + epatch "${FILESDIR}"/${PN}-1.150-setup-nocheck.patch +} + +src_install() { + dodir /usr/libexec/${PN} + cp -pR * "${D}"/usr/libexec/${PN} + + newinitd "${FILESDIR}"/${PF}.init ${PN} + newpamd "${FILESDIR}"/${PN}.pam-include.1 ${PN} + + dodir /etc/${PN} + dodir /var/log/${PN} + + # Fix ownership + chown -R ${PN} "${ED}" + + config_dir=${D}/etc/${PN} + var_dir=${D}/var/log/${PN} + perl=/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/${PN}/setup.sh > "${T}"/${PN}-setup.out 2>&1 || die "Failed to create initial ${PN} configuration." + + # Cleanup from the config script + rm -rf "${D}"/var/log/${PN} + keepdir /var/log/${PN} +} + +pkg_postinst() { + elog "To make ${PN} start at boot time, run: 'rc-update add ${PN} default'." + elog "Point your web browser to https://localhost:20000 to use ${PN}." +} diff --git a/app-admin/usermin/usermin-1.540.ebuild b/app-admin/usermin/usermin-1.540.ebuild index 74a2ff636869..6da81a215922 100644 --- a/app-admin/usermin/usermin-1.540.ebuild +++ b/app-admin/usermin/usermin-1.540.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.540.ebuild,v 1.1 2013/03/13 21:24:00 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/usermin/usermin-1.540.ebuild,v 1.2 2013/04/03 02:24:22 tomwij Exp $ EAPI="5" @@ -24,11 +24,7 @@ RDEPEND="${DEPEND} # pam? ( dev-perl/Authen-PAM ) -src_unpack() { - unpack ${A} - - cd "${S}" - +src_prepare() { # Point to the correct mysql location sed -i -e "s:/usr/local/mysql:/usr:g" mysql/config |