1 |
armin76 07/12/23 17:14:33 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: webmin-1.390.ebuild |
5 |
Log: |
6 |
Version bump wrt #199131 and fix bug #172048 |
7 |
(Portage version: 2.1.4_rc11) |
8 |
|
9 |
Revision Changes Path |
10 |
1.158 app-admin/webmin/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webmin/ChangeLog?rev=1.158&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webmin/ChangeLog?rev=1.158&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webmin/ChangeLog?r1=1.157&r2=1.158 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v |
19 |
retrieving revision 1.157 |
20 |
retrieving revision 1.158 |
21 |
diff -u -r1.157 -r1.158 |
22 |
--- ChangeLog 30 Oct 2007 10:36:06 -0000 1.157 |
23 |
+++ ChangeLog 23 Dec 2007 17:14:32 -0000 1.158 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for app-admin/webmin |
26 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.157 2007/10/30 10:36:06 uberlord Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/ChangeLog,v 1.158 2007/12/23 17:14:32 armin76 Exp $ |
29 |
+ |
30 |
+*webmin-1.390 (23 Dec 2007) |
31 |
+ |
32 |
+ 23 Dec 2007; Raúl Porcel <armin76@g.o> |
33 |
+ +files/1.390-iptables-gentoo.patch, +webmin-1.390.ebuild: |
34 |
+ Version bump wrt #199131 and fix bug #172048 |
35 |
|
36 |
*webmin-1.370-r1 (30 Oct 2007) |
37 |
|
38 |
|
39 |
|
40 |
|
41 |
1.1 app-admin/webmin/webmin-1.390.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webmin/webmin-1.390.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/webmin/webmin-1.390.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: webmin-1.390.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2007 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/webmin/webmin-1.390.ebuild,v 1.1 2007/12/23 17:14:32 armin76 Exp $ |
51 |
|
52 |
inherit eutils pam |
53 |
|
54 |
VM_V="3.23" |
55 |
|
56 |
DESCRIPTION="Webmin, a web-based system administration interface" |
57 |
HOMEPAGE="http://www.webmin.com/" |
58 |
SRC_URI="webmin-minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz ) |
59 |
!webmin-minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz |
60 |
http://www.webmin.com/download/virtualmin/virtual-server-${VM_V}.gpl.wbm.gz )" |
61 |
|
62 |
LICENSE="BSD" |
63 |
SLOT="0" |
64 |
# ~mips removed because of broken deps. Bug #86085 |
65 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" |
66 |
IUSE="apache2 pam postgres ssl webmin-minimal" |
67 |
|
68 |
DEPEND="dev-lang/perl" |
69 |
RDEPEND="${DEPEND} |
70 |
ssl? ( dev-perl/Net-SSLeay ) |
71 |
postgres? ( dev-perl/DBD-Pg ) |
72 |
pam? ( dev-perl/Authen-PAM ) |
73 |
dev-perl/XML-Generator |
74 |
virtual/logger" |
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 |
mv ${WORKDIR}/virtual-server-${VM_V}.gpl.wbm ${T}/vs.tar |
92 |
tar -xf ${T}/vs.tar |
93 |
|
94 |
# Don't create ${HOME}/cgi-bin on new accounts |
95 |
epatch "${FILESDIR}"/virtual-server-3.23-nocgibin.patch |
96 |
|
97 |
# Verify Postgres usernames |
98 |
epatch "${FILESDIR}"/virtual-server-3.23-pgsql.patch |
99 |
|
100 |
# Fix iptables, bug #172048 |
101 |
epatch "${FILESDIR}"/1.390-iptables-gentoo.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 |