fix include paths and inhibit sql debug (#101226)

Package-Manager: portage-2.0.51.22-r2

5 files changed, 105 insertions, 5 deletions

diff --git a/www-apps/freeradius-dialupadmin/ChangeLog b/www-apps/freeradius-dialupadmin/ChangeLog
index 618979e20ad9..9cab18418803 100644
--- a/www-apps/freeradius-dialupadmin/ChangeLog
+++ b/www-apps/freeradius-dialupadmin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/freeradius-dialupadmin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/freeradius-dialupadmin/ChangeLog,v 1.2 2005/06/23 22:13:02 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/freeradius-dialupadmin/ChangeLog,v 1.3 2005/08/06 11:28:03 mrness Exp $
+
+*freeradius-dialupadmin-1.70-r1 (06 Aug 2005)
+
+  06 Aug 2005; Alin Nastac <mrness@gentoo.org>
+  +files/freeradius-dialupadmin-1.70-sqldebug.patch,
+  +freeradius-dialupadmin-1.70-r1.ebuild:
+  Fix include paths to configuration files and disable sql debug, thanks to
+  Robert Withrow <witr@rwwa.com> (#101226).
 
 *freeradius-dialupadmin-1.70 (23 Jun 2005)
 
diff --git a/www-apps/freeradius-dialupadmin/Manifest b/www-apps/freeradius-dialupadmin/Manifest
index 2fa99a98a639..9c97799bd01f 100644
--- a/www-apps/freeradius-dialupadmin/Manifest
+++ b/www-apps/freeradius-dialupadmin/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA1
 
 MD5 b6bb13d37529fe94213aafa1d22881b0 freeradius-dialupadmin-1.70.ebuild 1665
-MD5 faaa035a800e33a9854e40b0d19804af ChangeLog 678
+MD5 4f8a6a76fbb8578d3a99f52a37c5d0a0 freeradius-dialupadmin-1.70-r1.ebuild 1920
+MD5 d5569713aa259e0566011854d32d7616 ChangeLog 988
 MD5 c4dcaab5383cc9eb6c10a80049cb3f65 metadata.xml 525
+MD5 5a26f9881af51aed070957e5fc4ed808 files/digest-freeradius-dialupadmin-1.70-r1 69
 MD5 5a26f9881af51aed070957e5fc4ed808 files/digest-freeradius-dialupadmin-1.70 69
 MD5 efcbf471e41edf8ce54ab910ad44945d files/setrootpath 184
+MD5 80e8e3fb8529fed61541dcfeaec0123a files/freeradius-dialupadmin-1.70-sqldebug.patch 370
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD4DBQFCuzP5jiC39V7gKu0RAg61AJ4urbNAo/BT3S3C1HN5uWZ0fhvmNQCXcfNW
-0wEarQWjEACk47sKxILoaQ==
-=b38e
+iD8DBQFC9J8HNSP4Vda7IdsRAtRxAJ9x22GTe8SU1mzDLIxYTmzLb5Ma/wCgignA
+vrm5hDd7Rf3Jo90bHjoQnO0=
+=byON
 -----END PGP SIGNATURE-----
diff --git a/www-apps/freeradius-dialupadmin/files/digest-freeradius-dialupadmin-1.70-r1 b/www-apps/freeradius-dialupadmin/files/digest-freeradius-dialupadmin-1.70-r1
new file mode 100644
index 000000000000..54745a2d6470
--- /dev/null
+++ b/www-apps/freeradius-dialupadmin/files/digest-freeradius-dialupadmin-1.70-r1
@@ -0,0 +1 @@
+MD5 f5dfce4efbb03bbc47ceae08270a875e freeradius-1.0.2.tar.gz 2208884
diff --git a/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.70-sqldebug.patch b/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.70-sqldebug.patch
new file mode 100644
index 000000000000..1fab1838917b
--- /dev/null
+++ b/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.70-sqldebug.patch
@@ -0,0 +1,11 @@
+--- dialup_admin/conf/admin.conf~	2005-07-24 17:32:01.000000000 -0400
++++ dialup_admin/conf/admin.conf	2005-07-24 17:32:24.000000000 -0400
+@@ -247,7 +247,7 @@
+ #
+ # Uncomment to enable sql debug
+ #
+-sql_debug: true
++#sql_debug: true
+ #
+ # If set to yes then the HTTP credentials (http authentication)
+ # will be used to connect to the sql server instead of sql_username
diff --git a/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70-r1.ebuild b/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70-r1.ebuild
new file mode 100644
index 000000000000..e22585cebbbe
--- /dev/null
+++ b/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/freeradius-dialupadmin/freeradius-dialupadmin-1.70-r1.ebuild,v 1.1 2005/08/06 11:28:03 mrness Exp $
+
+inherit eutils webapp
+MY_FREERADIUS_P="freeradius-1.0.2"
+
+DESCRIPTION="Web administration interface of freeradius server"
+SRC_URI="ftp://ftp.freeradius.org/pub/radius/${MY_FREERADIUS_P}.tar.gz"
+HOMEPAGE="http://www.freeradius.org/dialupadmin.html"
+
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE=""
+LICENSE="GPL-2"
+
+DEPEND="virtual/php
+	dev-perl/DateManip
+	sys-apps/findutils
+	>=net-dialup/${MY_FREERADIUS_P}"
+
+S="${WORKDIR}/${MY_FREERADIUS_P}/dialup_admin"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-sqldebug.patch
+
+	sed -i -e 's:/usr/local:/usr:' \
+		-e 's:/usr/etc/raddb:${general_raddb_dir}:' \
+		-e 's:/usr/radiusd::' \
+			conf/admin.conf
+	sed -i -e 's:/usr/local:/usr:' bin/*
+
+	#rename files .php3 -> .php
+	(find . -iname '*.php3' | (
+		local PHPFILE
+		while read PHPFILE; do
+			mv ${PHPFILE} ${PHPFILE/.php3/.php}
+		done
+	)) && \
+	(find . -type f | xargs sed -i -e 's:[.]php3:.php:g') || \
+		die "failed to replace php3 with php"
+
+	#fix dangling ../ to deal with the way webapp-config installs files
+	find . -name '*.php' | xargs sed -i \
+		-e 's:../conf/:../../conf/:' \
+		-e 's:../html/:../../html/:' \
+		-e 's:../lib/:../../lib/:'
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto ${MY_HTDOCSDIR}
+	doins -r htdocs/*
+	insinto ${MY_HOSTROOTDIR}
+	doins -r conf html lib
+	exeinto ${MY_HOSTROOTDIR}/bin
+	doexe bin/[a-z]*
+
+	insinto ${MY_SQLSCRIPTSDIR}
+	doins sql/*
+
+	dodoc Changelog bin/Changelog* README doc/*
+
+	webapp_hook_script ${FILESDIR}/setrootpath
+
+	cd ${D}${MY_HOSTROOTDIR}
+	local CONFFILE
+	for CONFFILE in conf/* ; do
+		webapp_configfile ${MY_HOSTROOTDIR}/${CONFFILE}
+		webapp_serverowned ${MY_HOSTROOTDIR}/${CONFFILE}
+	done
+
+	webapp_src_install
+}