Package: freeradius
Version: 2.1.12+dfsg-1.2
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for freeradius (versioned as 2.1.12+dfsg-1.3) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru freeradius-2.1.12+dfsg/debian/changelog freeradius-2.1.12+dfsg/debian/changelog
--- freeradius-2.1.12+dfsg/debian/changelog 2012-12-16 16:08:12.000000000 -0500
+++ freeradius-2.1.12+dfsg/debian/changelog 2014-03-12 21:08:56.000000000 -0400
@@ -1,3 +1,18 @@
+freeradius (2.1.12+dfsg-1.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove freeradius-dialupadmin, Closes: #711486. I understand there's a
+ patch in the bug that could get this working.
+ However, it's been removed upstream for 3.x, my hope is to package
+ 3.0.2 soon, and a PHP script that copies all the get/post data
+ into globals so as to administer an authentication server is more
+ scary than I choose to contemplate.
+ * Add IODBC include directories, Thanks Maximiliano Curia
+ , Closes: #740060
+
+
+ -- Sam Hartman <hartm...@debian.org> Wed, 12 Mar 2014 20:36:19 -0400
+
freeradius (2.1.12+dfsg-1.2) unstable; urgency=high
* Non-maintainer upload.
diff -Nru freeradius-2.1.12+dfsg/debian/control freeradius-2.1.12+dfsg/debian/control
--- freeradius-2.1.12+dfsg/debian/control 2012-06-29 16:46:05.000000000 -0400
+++ freeradius-2.1.12+dfsg/debian/control 2014-03-12 20:36:09.000000000 -0400
@@ -122,14 +122,6 @@
The FreeRADIUS server can use iODBC to access databases to authenticate users
and do accounting, and this module is necessary for that.
-Package: freeradius-dialupadmin
-Architecture: all
-Depends: php5 | libapache2-mod-php5 | php5-cgi, apache2-mpm-prefork | httpd, ${perl:Depends}, ${misc:Depends}
-Suggests: php5-mysql | php5-pgsql, php5-ldap, libdate-manip-perl
-Description: set of PHP scripts for administering a FreeRADIUS server
- These scripts provide a web-based interface for administering a FreeRADIUS
- server which stores authentication information in either SQL or LDAP.
-
Package: freeradius-dbg
Architecture: any
Section: debug
diff -Nru freeradius-2.1.12+dfsg/debian/patches/freeradius_add_iodbc_include_dirs.diff freeradius-2.1.12+dfsg/debian/patches/freeradius_add_iodbc_include_dirs.diff
--- freeradius-2.1.12+dfsg/debian/patches/freeradius_add_iodbc_include_dirs.diff 1969-12-31 19:00:00.000000000 -0500
+++ freeradius-2.1.12+dfsg/debian/patches/freeradius_add_iodbc_include_dirs.diff 2014-03-12 20:44:50.000000000 -0400
@@ -0,0 +1,28 @@
+Patch to add include directories from Maximiliano Curia
+
+Index: freeradius-2.1.12+dfsg/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.in
+===================================================================
+--- freeradius-2.1.12+dfsg.orig/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.in 2013-06-07 14:47:15.972218704 +0200
++++ freeradius-2.1.12+dfsg/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure.in 2013-06-07 14:47:15.940220007 +0200
+@@ -64,7 +64,7 @@
+ fi
+
+ dnl Check for isql.h
+- smart_try_dir="$iodbc_include_dir /usr/local/iodbc/include"
++ smart_try_dir="$iodbc_include_dir /usr/include/iodbc /usr/local/iodbc/include"
+ FR_SMART_CHECK_INCLUDE(isql.h)
+ if test "x$ac_cv_header_isql_h" != xyes; then
+ fail="$fail isql.h"
+Index: freeradius-2.1.12+dfsg/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure
+===================================================================
+--- freeradius-2.1.12+dfsg.orig/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure 2013-06-07 14:47:05.984625299 +0200
++++ freeradius-2.1.12+dfsg/src/modules/rlm_sql/drivers/rlm_sql_iodbc/configure 2013-06-07 14:47:53.154705108 +0200
+@@ -2862,7 +2862,7 @@
+ fail="$fail libiodbc"
+ fi
+
+- smart_try_dir="$iodbc_include_dir /usr/local/iodbc/include"
++ smart_try_dir="$iodbc_include_dir /usr/include/iodbc /usr/local/iodbc/include"
+
+
+ ac_safe=`echo "isql.h" | sed 'y%./+-%__pm%'`
diff -Nru freeradius-2.1.12+dfsg/debian/patches/series freeradius-2.1.12+dfsg/debian/patches/series
--- freeradius-2.1.12+dfsg/debian/patches/series 2012-12-16 15:52:41.000000000 -0500
+++ freeradius-2.1.12+dfsg/debian/patches/series 2014-03-12 20:43:36.000000000 -0400
@@ -9,3 +9,4 @@
radmin.getenv.conffile.diff
CVE-2012-3547.diff
CVE-2011-4966.diff
+freeradius_add_iodbc_include_dirs.diff
diff -Nru freeradius-2.1.12+dfsg/debian/rules freeradius-2.1.12+dfsg/debian/rules
--- freeradius-2.1.12+dfsg/debian/rules 2012-06-29 09:50:11.000000000 -0400
+++ freeradius-2.1.12+dfsg/debian/rules 2014-03-12 20:36:13.000000000 -0400
@@ -128,20 +128,9 @@
dh_testroot
dh_installdirs -i
- $(MAKE) -C dialup_admin DIALUP_PREFIX=/usr/share/freeradius-dialupadmin \
- DIALUP_DOCDIR=/usr/share/doc/freeradius-dialupadmin \
- DIALUP_CONFDIR=/etc/freeradius-dialupadmin \
- R=$(freeradius_dir) install
- mv $(freeradius_dir)/usr/share/freeradius-dialupadmin/bin/dialup_admin.cron \
- $(freeradius_dir)/usr/share/freeradius-dialupadmin/bin/freeradius-dialupadmin.cron
- mv $(freeradius_dir)/usr/share/doc/freeradius-dialupadmin/Changelog \
- $(freeradius_dir)/usr/share/doc/freeradius-dialupadmin/changelog
-
- install -m0644 debian/apache2.conf $(freeradius_dir)/etc/freeradius-dialupadmin/
dh_install -i --sourcedir=$(freeradius_dir)
- dh_installdocs -p freeradius-dialupadmin dialup_admin/README
install-arch: build-arch-stamp
dh_testdir
