Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/freeradius-dialupadmin/files/, www-apps/freeradius-dialupadmin/, ...
Date: Sat, 05 May 2018 19:45:02
Message-Id: 1525549487.dc231c0ae3294ab79f864c5cbe9cf56306e3284d.bman@gentoo
1 commit: dc231c0ae3294ab79f864c5cbe9cf56306e3284d
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 5 19:34:32 2018 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Sat May 5 19:44:47 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc231c0a
7
8 www-apps/freeradius-dialupadmin: treeclean
9
10 Closes: https://bugs.gentoo.org/650298
11
12 profiles/package.mask | 5 -
13 www-apps/freeradius-dialupadmin/Manifest | 2 -
14 .../freeradius-dialupadmin-1.70.3-sqldebug.patch | 11 --
15 .../files/freeradius-dialupadmin-1.80-gentoo.patch | 32 -----
16 .../freeradius-dialupadmin-1.80-tmpfile.patch | 148 ---------------------
17 www-apps/freeradius-dialupadmin/files/setrootpath | 6 -
18 .../freeradius-dialupadmin-1.70.3.ebuild | 83 ------------
19 .../freeradius-dialupadmin-1.80.ebuild | 82 ------------
20 www-apps/freeradius-dialupadmin/metadata.xml | 12 --
21 9 files changed, 381 deletions(-)
22
23 diff --git a/profiles/package.mask b/profiles/package.mask
24 index ea85aa0d35b..15d520ecbcb 100644
25 --- a/profiles/package.mask
26 +++ b/profiles/package.mask
27 @@ -252,11 +252,6 @@ sci-chemistry/cyana
28 # Masked for removal in 30 days.
29 dev-db/m17n-contrib
30
31 -# Aaron Bauman <bman@g.o> (1 Apr 2018)
32 -# Unmaintained upstream. Relies on old PHP. EAPI=0.
33 -# Masked for removal in 30 days.
34 -www-apps/freeradius-dialupadmin
35 -
36 # Andreas K. Hüttel <dilfridge@g.o> (30 Mar 2018)
37 # Fails to build (bug 408463). EAPI=3 (bug 648452).
38 # Masked for removal in 30 days.
39
40 diff --git a/www-apps/freeradius-dialupadmin/Manifest b/www-apps/freeradius-dialupadmin/Manifest
41 deleted file mode 100644
42 index d4ee26297be..00000000000
43 --- a/www-apps/freeradius-dialupadmin/Manifest
44 +++ /dev/null
45 @@ -1,2 +0,0 @@
46 -DIST freeradius-1.1.6.tar.gz 3175652 BLAKE2B 371b40cd1dcdd4b5bb5a83b0834d5582ad8050b78c8915b5c34a213bf9d85e0b52e80d4479d2a5a494ce62b5eb07d8471f9a4418d0e85cd4917b7c8a084097bf SHA512 437a1705d559849bce3c11216b0b25392668ee96300d455a2ae92b6ca233f0308eca62c06d659f26900509855237f7d17c5eb566b13bbc4cda8999a18da4b8a1
47 -DIST freeradius-server-2.1.1.tar.gz 3648766 BLAKE2B 25b42bd923499a450ac0fed91276ba816842ab5843c5a9c1d57b5d77891ed1104826fee2eedd68ea60f306f2325cc8081a81e2583b134ebccd725b6053fd72c8 SHA512 68f9abda7f3219ab2be6393021866ac3fda5302aa2cae85877666f3db86a09f293286003815e596cb1dfd67479b6577f7568d412953b7a2d22a7cbdc00c71b88
48
49 diff --git a/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.70.3-sqldebug.patch b/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.70.3-sqldebug.patch
50 deleted file mode 100644
51 index 1fab1838917..00000000000
52 --- a/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.70.3-sqldebug.patch
53 +++ /dev/null
54 @@ -1,11 +0,0 @@
55 ---- dialup_admin/conf/admin.conf~ 2005-07-24 17:32:01.000000000 -0400
56 -+++ dialup_admin/conf/admin.conf 2005-07-24 17:32:24.000000000 -0400
57 -@@ -247,7 +247,7 @@
58 - #
59 - # Uncomment to enable sql debug
60 - #
61 --sql_debug: true
62 -+#sql_debug: true
63 - #
64 - # If set to yes then the HTTP credentials (http authentication)
65 - # will be used to connect to the sql server instead of sql_username
66
67 diff --git a/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-gentoo.patch b/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-gentoo.patch
68 deleted file mode 100644
69 index 7501ba11f1e..00000000000
70 --- a/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-gentoo.patch
71 +++ /dev/null
72 @@ -1,32 +0,0 @@
73 -diff -Nru freeradius-server-2.1.1.orig/dialup_admin/Makefile freeradius-server-2.1.1/dialup_admin/Makefile
74 ---- freeradius-server-2.1.1.orig/dialup_admin/Makefile 2008-10-12 10:13:16.000000000 +0000
75 -+++ freeradius-server-2.1.1/dialup_admin/Makefile 2008-10-12 10:16:16.000000000 +0000
76 -@@ -4,7 +4,6 @@
77 - # Version: $Id$
78 - #
79 -
80 --include ../Make.inc
81 -
82 - DIALUP_PREFIX := /usr/local/dialup_admin
83 - DIALUP_DOCDIR := $(DIALUP_PREFIX)/doc
84 -diff -Nru freeradius-server-2.1.1.orig/dialup_admin/conf/admin.conf freeradius-server-2.1.1/dialup_admin/conf/admin.conf
85 ---- freeradius-server-2.1.1.orig/dialup_admin/conf/admin.conf 2008-09-25 08:41:26.000000000 +0000
86 -+++ freeradius-server-2.1.1/dialup_admin/conf/admin.conf 2008-10-12 09:14:12.000000000 +0000
87 -@@ -204,7 +204,7 @@
88 - #
89 - # Uncomment to enable ldap debug
90 - #
91 --ldap_debug: true
92 -+#ldap_debug: true
93 - #
94 - # Allow for defining the ldap filter used when searching for a user
95 - # Variables supported:
96 -@@ -274,7 +274,7 @@
97 - #
98 - # Uncomment to enable sql debug
99 - #
100 --sql_debug: true
101 -+#sql_debug: true
102 - #
103 - # If set to yes then the HTTP credentials (http authentication)
104 - # will be used to connect to the sql server instead of sql_username
105
106 diff --git a/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-tmpfile.patch b/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-tmpfile.patch
107 deleted file mode 100644
108 index 1da5671761f..00000000000
109 --- a/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-tmpfile.patch
110 +++ /dev/null
111 @@ -1,148 +0,0 @@
112 -diff -Nru freeradius-server-2.1.1.orig/dialup_admin/bin/clean_radacct freeradius-server-2.1.1/dialup_admin/bin/clean_radacct
113 ---- freeradius-server-2.1.1.orig/dialup_admin/bin/clean_radacct 2008-09-25 08:41:26.000000000 +0000
114 -+++ freeradius-server-2.1.1/dialup_admin/bin/clean_radacct 2008-10-12 09:29:50.000000000 +0000
115 -@@ -5,6 +5,7 @@
116 - # Works with mysql and postgresql
117 - #
118 - use POSIX;
119 -+use File::Temp;
120 -
121 - $conf=shift||'/usr/local/dialup_admin/conf/admin.conf';
122 - $back_days = 35;
123 -@@ -42,11 +43,10 @@
124 -
125 - $query = "DELETE FROM $sql_accounting_table WHERE AcctStopTime IS NULL AND AcctStartTime < '$date';";
126 - print "$query\n";
127 --open TMP, ">/tmp/clean_radacct.query"
128 -- or die "Could not open tmp file\n";
129 --print TMP $query;
130 --close TMP;
131 --$command = "$sqlcmd -h$sql_server -u$sql_username $sql_password $sql_database </tmp/clean_radacct.query" if ($sql_type eq 'mysql');
132 --$command = "$sqlcmd -U $sql_username -f /tmp/clean_radacct.query $sql_database" if ($sql_type eq 'pg');
133 --$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' </tmp/clean_radacct.query" if ($sql_type eq 'sqlrelay');
134 -+my ($fh, $tmp_filename) = tempfile() or die "Could not open tmp file\n";
135 -+print $fh $query;
136 -+close $fh;
137 -+$command = "$sqlcmd -h$sql_server -u$sql_username $sql_password $sql_database < $tmp_filename" if ($sql_type eq 'mysql');
138 -+$command = "$sqlcmd -U $sql_username -f $tmp_filename $sql_database" if ($sql_type eq 'pg');
139 -+$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' < $tmp_filename" if ($sql_type eq 'sqlrelay');
140 - `$command`;
141 -diff -Nru freeradius-server-2.1.1.orig/dialup_admin/bin/log_badlogins freeradius-server-2.1.1/dialup_admin/bin/log_badlogins
142 ---- freeradius-server-2.1.1.orig/dialup_admin/bin/log_badlogins 2008-09-25 08:41:26.000000000 +0000
143 -+++ freeradius-server-2.1.1/dialup_admin/bin/log_badlogins 2008-10-12 10:09:58.000000000 +0000
144 -@@ -14,6 +14,7 @@
145 -
146 - use Date::Manip qw(ParseDate UnixDate);
147 - use Digest::MD5;
148 -+use File::Temp;
149 - $|=1;
150 -
151 - $file=shift||'none';
152 -@@ -29,7 +30,8 @@
153 - # CHANGE THESE TO MATCH YOUR SETUP
154 - #
155 - #$regexp = 'from client localhost port 135|from client blabla ';
156 --$tmpfile='/var/tmp/sql.input';
157 -+$tmpdir=tempdir( CLEANUP => 1 );
158 -+$tmpfile="$tmpdir/sql.input";
159 - #
160 - $verbose = 0;
161 - #
162 -diff -Nru freeradius-server-2.1.1.orig/dialup_admin/bin/monthly_tot_stats freeradius-server-2.1.1/dialup_admin/bin/monthly_tot_stats
163 ---- freeradius-server-2.1.1.orig/dialup_admin/bin/monthly_tot_stats 2008-09-25 08:41:26.000000000 +0000
164 -+++ freeradius-server-2.1.1/dialup_admin/bin/monthly_tot_stats 2008-10-12 09:29:50.000000000 +0000
165 -@@ -1,5 +1,6 @@
166 - #!/usr/bin/perl
167 - use POSIX;
168 -+use File::Temp;
169 -
170 - # Log in the mtotacct table aggregated accounting information for
171 - # each user spaning in one month period.
172 -@@ -51,14 +52,13 @@
173 - AcctDate <= '$date_end' GROUP BY UserName,NASIPAddress;";
174 - print "$query1\n";
175 - print "$query2\n";
176 --open TMP, ">/tmp/tot_stats.query"
177 -- or die "Could not open tmp file\n";
178 --print TMP "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
179 --print TMP $query1;
180 --print TMP $query2;
181 --close TMP;
182 --$command = "$sqlcmd -h $sql_server -u $sql_username $sql_password $sql_database </tmp/tot_stats.query" if ($sql_type eq 'mysql');
183 --$command = "$sqlcmd -U $sql_username -f /tmp/tot_stats.query $sql_database" if ($sql_type eq 'pg');
184 -+my ($fh, $tmp_filename) = tempfile() or die "Could not open tmp file\n";
185 -+print $fh "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
186 -+print $fh $query1;
187 -+print $fh $query2;
188 -+close $fh;
189 -+$command = "$sqlcmd -h $sql_server -u $sql_username $sql_password $sql_database < $tmp_filename" if ($sql_type eq 'mysql');
190 -+$command = "$sqlcmd -U $sql_username -f $tmp_filename $sql_database" if ($sql_type eq 'pg');
191 - $command = "$sqlcmd $sql_username/$pass" . "@" . "$sql_database <$tmpfile.$server" if ($sql_type eq 'oracle');
192 --$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' </tmp/tot_stats.query" if ($sql_type eq 'sqlrelay');
193 -+$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' < $tmp_filename" if ($sql_type eq 'sqlrelay');
194 - `$command`;
195 -diff -Nru freeradius-server-2.1.1.orig/dialup_admin/bin/tot_stats freeradius-server-2.1.1/dialup_admin/bin/tot_stats
196 ---- freeradius-server-2.1.1.orig/dialup_admin/bin/tot_stats 2008-09-25 08:41:26.000000000 +0000
197 -+++ freeradius-server-2.1.1/dialup_admin/bin/tot_stats 2008-10-12 09:29:50.000000000 +0000
198 -@@ -1,5 +1,6 @@
199 - #!/usr/bin/perl
200 - use POSIX;
201 -+use File::Temp;
202 -
203 - # Log in the totacct table aggregated daily accounting information for
204 - # each user.
205 -@@ -48,14 +49,13 @@
206 - AcctStopTime < '$date_end' GROUP BY UserName,NASIPAddress;";
207 - print "$query1\n";
208 - print "$query2\n";
209 --open TMP, ">/tmp/tot_stats.query"
210 -- or die "Could not open tmp file\n";
211 --print TMP "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
212 --print TMP $query1;
213 --print TMP $query2;
214 --close TMP;
215 --$command = "$sqlcmd -h $sql_server -u $sql_username $sql_password $sql_database </tmp/tot_stats.query" if ($sql_type eq 'mysql');
216 --$command = "$sqlcmd -U $sql_username -f /tmp/tot_stats.query $sql_database" if ($sql_type eq 'pg');
217 -+my ($fh, $tmp_filename) = tempfile() or die "Could not open tmp file\n";
218 -+print $fh "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
219 -+print $fh $query1;
220 -+print $fh $query2;
221 -+close $fh;
222 -+$command = "$sqlcmd -h $sql_server -u $sql_username $sql_password $sql_database < $tmp_filename" if ($sql_type eq 'mysql');
223 -+$command = "$sqlcmd -U $sql_username -f $tmp_filename $sql_database" if ($sql_type eq 'pg');
224 - $command = "$sqlcmd $sql_username/$pass" . "@" . "$sql_database <$tmpfile.$server" if ($sql_type eq 'oracle');
225 --$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' </tmp/tot_stats.query" if ($sql_type eq 'sqlrelay');
226 -+$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' < $tmp_filename" if ($sql_type eq 'sqlrelay');
227 - `$command`;
228 -diff -Nru freeradius-server-2.1.1.orig/dialup_admin/bin/truncate_radacct freeradius-server-2.1.1/dialup_admin/bin/truncate_radacct
229 ---- freeradius-server-2.1.1.orig/dialup_admin/bin/truncate_radacct 2008-09-25 08:41:26.000000000 +0000
230 -+++ freeradius-server-2.1.1/dialup_admin/bin/truncate_radacct 2008-10-12 09:29:50.000000000 +0000
231 -@@ -5,6 +5,7 @@
232 - # Works with mysql and postgresql
233 - #
234 - use POSIX;
235 -+use File::Temp;
236 -
237 - $conf=shift||'/usr/local/dialup_admin/conf/admin.conf';
238 - $back_days = 90;
239 -@@ -44,13 +45,12 @@
240 - $query .= "DELETE FROM $sql_accounting_table WHERE AcctStopTime < '$date' AND AcctStopTime IS NOT NULL ;";
241 - $query .= "UNLOCK TABLES;" if ($sql_type eq 'mysql');
242 - print "$query\n";
243 --open TMP, ">/tmp/truncate_radacct.query"
244 -- or die "Could not open tmp file\n";
245 --print TMP "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
246 --print TMP $query;
247 --close TMP;
248 --$command = "$sqlcmd -h$sql_server -u$sql_username $sql_password $sql_database </tmp/truncate_radacct.query" if ($sql_type eq 'mysql');
249 --$command = "$sqlcmd -U $sql_username -f /tmp/truncate_radacct.query $sql_database" if ($sql_type eq 'pg');
250 -+my ($fh, $tmp_filename) = tempfile() or die "Could not open tmp file\n";
251 -+print $fh "ALTER SESSION SET NLS_TIMESTAMP_TZ_FORMAT='YYYY-MM-DD HH24:MI:SS.FF TZH:TZM';\n" if ($sql_type eq 'oracle');
252 -+print $fh $query;
253 -+close $fh;
254 -+$command = "$sqlcmd -h$sql_server -u$sql_username $sql_password $sql_database < $tmp_filename" if ($sql_type eq 'mysql');
255 -+$command = "$sqlcmd -U $sql_username -f $tmp_filename $sql_database" if ($sql_type eq 'pg');
256 - $command = "$sqlcmd $sql_username/$pass" . "@" . "$sql_database <$tmpfile.$server" if ($sql_type eq 'oracle');
257 --$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' </tmp/truncate_radacct.query" if ($sql_type eq 'sqlrelay');
258 -+$command = "$sqlcmd '$sql_server' '$sql_port' '' '$sql_username' '$sql_password' < $tmp_filename" if ($sql_type eq 'sqlrelay');
259 - `$command`;
260
261 diff --git a/www-apps/freeradius-dialupadmin/files/setrootpath b/www-apps/freeradius-dialupadmin/files/setrootpath
262 deleted file mode 100644
263 index 124364c291a..00000000000
264 --- a/www-apps/freeradius-dialupadmin/files/setrootpath
265 +++ /dev/null
266 @@ -1,6 +0,0 @@
267 -#!/bin/sh
268 -
269 -if [ "$1" = "install" ]; then
270 - sed -i -e "s:/usr/\(local/\)\?dialup_admin:${VHOST_ROOT}:" "${VHOST_ROOT}"/{conf/._*admin.conf,conf/admin.conf,bin/*}
271 - chmod -R o-rwx "${VHOST_ROOT}"/conf
272 -fi
273
274 diff --git a/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70.3.ebuild b/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70.3.ebuild
275 deleted file mode 100644
276 index 9bf34f6453b..00000000000
277 --- a/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70.3.ebuild
278 +++ /dev/null
279 @@ -1,83 +0,0 @@
280 -# Copyright 1999-2018 Gentoo Foundation
281 -# Distributed under the terms of the GNU General Public License v2
282 -
283 -EAPI=0
284 -
285 -inherit eutils webapp
286 -MY_FREERADIUS_P="freeradius-1.1.6"
287 -
288 -DESCRIPTION="Web administration interface of freeradius server"
289 -SRC_URI="ftp://ftp.freeradius.org/pub/radius/${MY_FREERADIUS_P}.tar.gz"
290 -HOMEPAGE="http://www.freeradius.org/dialupadmin.html"
291 -
292 -KEYWORDS="~amd64 ~ppc ~x86"
293 -IUSE=""
294 -LICENSE="GPL-2"
295 -
296 -DEPEND="dev-lang/php
297 - dev-perl/Date-Manip
298 - sys-apps/findutils
299 - >=net-dialup/${MY_FREERADIUS_P}"
300 -
301 -S="${WORKDIR}/${MY_FREERADIUS_P}/dialup_admin"
302 -
303 -src_unpack() {
304 - unpack ${A}
305 -
306 - cd "${S}"
307 - epatch "${FILESDIR}/${P}-sqldebug.patch"
308 -
309 - sed -i -e 's:/usr/local:/usr:' \
310 - -e 's:/usr/etc/raddb:${general_raddb_dir}:' \
311 - -e 's:/usr/radiusd::' \
312 - conf/admin.conf
313 - sed -i -e 's:/usr/local:/usr:' bin/*
314 -
315 - #rename files .php3 -> .php
316 - (find . -iname '*.php3' | (
317 - local PHPFILE
318 - while read PHPFILE; do
319 - mv "${PHPFILE}" "${PHPFILE/.php3/.php}"
320 - done
321 - )) && \
322 - (find . -type f | xargs sed -i -e 's:[.]php3:.php:g') || \
323 - die "failed to replace php3 with php"
324 -
325 - # remove cvs data
326 - ecvs_clean
327 -
328 - # fix dangling ../ to deal with the way webapp-config installs files
329 - find . -name '*.php' | xargs sed -i \
330 - -e 's:../conf/:../../conf/:' \
331 - -e 's:../html/:../../html/:' \
332 - -e 's:../lib/:../../lib/:'
333 -}
334 -
335 -src_install() {
336 - webapp_src_preinst
337 -
338 - insinto "${MY_HTDOCSDIR}"
339 - doins -r htdocs/*
340 - insinto "${MY_HOSTROOTDIR}"
341 - doins -r conf html lib
342 - exeinto "${MY_HOSTROOTDIR}/bin"
343 - dodoc bin/*.cron bin/Changelog*
344 - rm bin/*.cron bin/Changelog*
345 - doexe bin/*
346 -
347 - insinto "${MY_SQLSCRIPTSDIR}"
348 - doins sql/*
349 -
350 - dodoc Changelog README doc/*
351 -
352 - webapp_hook_script "${FILESDIR}/setrootpath"
353 -
354 - cd "${D}/${MY_HOSTROOTDIR}"
355 - local CONFFILE
356 - for CONFFILE in conf/* ; do
357 - webapp_configfile "${MY_HOSTROOTDIR}/${CONFFILE}"
358 - webapp_serverowned "${MY_HOSTROOTDIR}/${CONFFILE}"
359 - done
360 -
361 - webapp_src_install
362 -}
363
364 diff --git a/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.80.ebuild b/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.80.ebuild
365 deleted file mode 100644
366 index c03e4900136..00000000000
367 --- a/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.80.ebuild
368 +++ /dev/null
369 @@ -1,82 +0,0 @@
370 -# Copyright 1999-2018 Gentoo Foundation
371 -# Distributed under the terms of the GNU General Public License v2
372 -
373 -EAPI=0
374 -
375 -inherit eutils webapp
376 -MY_FREERADIUS_PV="2.1.1"
377 -
378 -DESCRIPTION="Web administration interface of freeradius server"
379 -SRC_URI="ftp://ftp.freeradius.org/pub/radius/freeradius-server-${MY_FREERADIUS_PV}.tar.gz"
380 -HOMEPAGE="http://www.freeradius.org/dialupadmin.html"
381 -
382 -KEYWORDS="~amd64 ~ppc ~x86"
383 -IUSE=""
384 -LICENSE="GPL-2"
385 -
386 -DEPEND="sys-apps/findutils
387 - sys-apps/sed"
388 -RDEPEND="dev-lang/php
389 - dev-perl/Date-Manip
390 - >=net-dialup/freeradius-${MY_FREERADIUS_PV}"
391 -
392 -S="${WORKDIR}/freeradius-server-${MY_FREERADIUS_PV}/dialup_admin"
393 -
394 -src_unpack() {
395 - unpack ${A}
396 -
397 - cd "${S}"
398 - epatch "${FILESDIR}/${P}-gentoo.patch"
399 - epatch "${FILESDIR}/${P}-tmpfile.patch"
400 -
401 - sed -i -e 's:/usr/local:/usr:' \
402 - -e 's:/usr/etc/raddb:${general_raddb_dir}:' \
403 - -e 's:/usr/radiusd::' \
404 - conf/admin.conf
405 - sed -i -e 's:/usr/local:/usr:' bin/*
406 -
407 - #rename files .php3 -> .php
408 - (find . -iname '*.php3' | (
409 - local PHPFILE
410 - while read PHPFILE; do
411 - mv "${PHPFILE}" "${PHPFILE/.php3/.php}"
412 - done
413 - )) && \
414 - (find . -type f | xargs sed -i -e 's:[.]php3:.php:g') || \
415 - die "failed to replace php3 with php"
416 -
417 - # fix dangling ../ to deal with the way webapp-config installs files
418 - find . -name '*.php' | xargs sed -i \
419 - -e 's:../conf/:../../conf/:' \
420 - -e 's:../html/:../../html/:' \
421 - -e 's:../lib/:../../lib/:'
422 -}
423 -
424 -src_install() {
425 - webapp_src_preinst
426 -
427 - insinto "${MY_HTDOCSDIR}"
428 - doins -r htdocs/*
429 - insinto "${MY_HOSTROOTDIR}"
430 - doins -r conf html lib
431 - exeinto "${MY_HOSTROOTDIR}/bin"
432 - dodoc bin/*.cron bin/Changelog*
433 - rm bin/*.cron bin/Changelog*
434 - doexe bin/*
435 -
436 - insinto "${MY_SQLSCRIPTSDIR}"
437 - doins -r sql/*
438 -
439 - dodoc Changelog README doc/*
440 -
441 - webapp_hook_script "${FILESDIR}/setrootpath"
442 -
443 - cd "${D}/${MY_HOSTROOTDIR}"
444 - local CONFFILE
445 - for CONFFILE in conf/* ; do
446 - webapp_configfile "${MY_HOSTROOTDIR}/${CONFFILE}"
447 - webapp_serverowned "${MY_HOSTROOTDIR}/${CONFFILE}"
448 - done
449 -
450 - webapp_src_install
451 -}
452
453 diff --git a/www-apps/freeradius-dialupadmin/metadata.xml b/www-apps/freeradius-dialupadmin/metadata.xml
454 deleted file mode 100644
455 index f6fe7565b8f..00000000000
456 --- a/www-apps/freeradius-dialupadmin/metadata.xml
457 +++ /dev/null
458 @@ -1,12 +0,0 @@
459 -<?xml version="1.0" encoding="UTF-8"?>
460 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
461 -<pkgmetadata>
462 -<!-- maintainer-needed -->
463 -<longdescription>
464 -The FreeRADIUS server comes including a powerfull web interface written in PHP
465 -to administer radius users, called dialupadmin. Dialup Admin supports users
466 -either in SQL (MySQL or PostgreSQL are supported) or in LDAP. Apart from the
467 -web pages, it also includes a number of scripts to make the administrator's
468 -life a lot easier.
469 -</longdescription>
470 -</pkgmetadata>