Gentoo Archives: gentoo-commits

From: "Raul Porcel (armin76)" <armin76@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-admin/webmin: ChangeLog webmin-1.360.ebuild webmin-1.340.ebuild
Date: Thu, 20 Sep 2007 17:35:30
Message-Id: E1IYPoM-0001qT-Iq@stork.gentoo.org
1 armin76 07/09/20 17:27:34
2
3 Modified: ChangeLog
4 Added: webmin-1.360.ebuild
5 Removed: webmin-1.340.ebuild
6 Log:
7 Version bump, bug #188223
8 (Portage version: 2.1.3.9)
9
10 Revision Changes Path
11 1.154 app-admin/webmin/ChangeLog
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webmin/ChangeLog?rev=1.154&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webmin/ChangeLog?rev=1.154&content-type=text/plain
15 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webmin/ChangeLog?r1=1.153&r2=1.154
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v
20 retrieving revision 1.153
21 retrieving revision 1.154
22 diff -u -r1.153 -r1.154
23 --- ChangeLog 24 Jun 2007 23:04:04 -0000 1.153
24 +++ ChangeLog 20 Sep 2007 17:27:34 -0000 1.154
25 @@ -1,6 +1,12 @@
26 # ChangeLog for app-admin/webmin
27 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.153 2007/06/24 23:04:04 peper Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.154 2007/09/20 17:27:34 armin76 Exp $
30 +
31 +*webmin-1.360 (20 Sep 2007)
32 +
33 + 20 Sep 2007; Raúl Porcel <armin76@g.o> -webmin-1.340.ebuild,
34 + +webmin-1.360.ebuild:
35 + Version bump, bug #188223
36
37 24 Jun 2007; Piotr Jaroszyński <peper@g.o> metadata.xml,
38 webmin-1.340.ebuild, webmin-1.350.ebuild:
39
40
41
42 1.1 app-admin/webmin/webmin-1.360.ebuild
43
44 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webmin/webmin-1.360.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webmin/webmin-1.360.ebuild?rev=1.1&content-type=text/plain
46
47 Index: webmin-1.360.ebuild
48 ===================================================================
49 # Copyright 1999-2007 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.360.ebuild,v 1.1 2007/09/20 17:27:34 armin76 Exp $
52
53 inherit eutils pam
54
55 VM_V="3.23"
56
57 DESCRIPTION="Webmin, a web-based system administration interface"
58 HOMEPAGE="http://www.webmin.com/"
59 SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz )
60 !webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz
61 http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.gpl.wbm.gz )"
62
63 LICENSE="BSD"
64 SLOT="0"
65 # ~mips removed because of broken deps. Bug #86085
66 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
67 IUSE="apache2 pam postgres ssl webmin-minimal"
68
69 DEPEND="dev-lang/perl"
70 RDEPEND="${DEPEND}
71 ssl? ( dev-perl/Net-SSLeay )
72 postgres? ( dev-perl/DBD-Pg )
73 pam? ( dev-perl/Authen-PAM )
74 dev-perl/XML-Generator"
75
76 src_unpack() {
77 unpack ${A}
78
79 cd "${S}"
80
81 # in webmin-minimal apache2 are not present
82 if ! use webmin-minimal ; then
83 # Bug #50810, #51943
84 if use apache2; then
85 epatch "${FILESDIR}"/${PN}-1.140-apache2.patch
86 fi
87
88 # Correct ldapness
89 epatch "${FILESDIR}"/${PN}-1.270-ldap-useradmin.patch
90
91 # Postfix should modify the last entry of the maps file
92 epatch "${FILESDIR}"/${PN}-1.300-postfix.patch
93
94 mv ${WORKDIR}/virtual-server-${VM_V}.gpl.wbm ${T}/vs.tar
95 tar -xf ${T}/vs.tar
96
97 # Don't create ${HOME}/cgi-bin on new accounts
98 epatch "${FILESDIR}"/virtual-server-3.23-nocgibin.patch
99
100 # Verify Postgres usernames
101 epatch "${FILESDIR}"/virtual-server-3.23-pgsql.patch
102 fi
103
104 epatch "${FILESDIR}"/${PN}-1.170-setup-nocheck.patch
105 }
106
107 src_install() {
108 # Bug #97212
109 addpredict /var/lib/rpm
110
111 rm -f mount/freebsd-mounts*
112 rm -f mount/openbsd-mounts*
113 rm -f mount/macos-mounts*
114
115 (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
116 dodir /usr/libexec/webmin
117 dodir /var
118
119 cp -rp * ${D}/usr/libexec/webmin
120
121 # in webmin-minimal openslp is not present
122 if [ ! -f "${D}/usr/libexec/webmin/openslp/config-gentoo-linux" ] ; then
123 cp ${D}/usr/libexec/webmin/openslp/config \
124 ${D}/usr/libexec/webmin/openslp/config-gentoo-linux
125 fi
126
127 newinitd "${FILESDIR}"/init.d.webmin webmin
128
129 newpamd "${FILESDIR}"/webmin-pam webmin
130 echo gentoo > ${D}/usr/libexec/webmin/install-type
131
132 # Fix ownership
133 chown -R root:0 ${D}
134
135 dodir /etc/webmin
136 dodir /var/log/webmin
137
138 config_dir=${D}/etc/webmin
139 var_dir=${D}/var/log/webmin
140 perl=/usr/bin/perl
141 autoos=1
142 port=10000
143 login=root
144 crypt="XXX"
145 host=`hostname`
146 use ssl && ssl=1 || ssl=0
147 atboot=0
148 nostart=1
149 nochown=1
150 autothird=1
151 nouninstall=1
152 noperlpath=1
153 tempdir="${T}"
154 export config_dir var_dir perl autoos port login crypt host ssl atboot nostart nochown autothird nouninstall noperlpath tempdir
155 ${D}/usr/libexec/webmin/setup.sh > ${T}/webmin-setup.out 2>&1 || die "Failed to create initial webmin configuration."
156
157 # Fixup the config files to use their real locations
158 sed -i -e "s:^pidfile=.*$:pidfile=/var/run/webmin.pid:" ${D}/etc/webmin/miniserv.conf
159 find ${D}/etc/webmin -type f | xargs sed -i -e "s:${D}:/:g"
160
161 # Cleanup from the config script
162 rm -rf ${D}/var/log/webmin
163 keepdir /var/log/webmin/
164
165 # Get rid of this crap...
166 rm -rf ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1
167 rm -f ${D}/usr/libexec/webmin/acl/Authen-SolarisRBAC-0.1.tar.gz
168 }
169
170 pkg_postinst() {
171 local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
172 crypt=${crypt//\\/\\\\}
173 crypt=${crypt//\//\\\/}
174 sed -i -e "s/root:XXX/root:${crypt}/" "${ROOT}/etc/webmin/miniserv.users"
175
176 einfo "To make webmin start at boot time, run: 'rc-update add webmin default'."
177 use ssl && einfo "Point your web browser to https://localhost:10000 to use webmin."
178 use ssl || einfo "Point your web browser to http://localhost:10000 to use webmin."
179 }
180
181
182
183 --
184 gentoo-commits@g.o mailing list