Attempt to get debian packages working again for 3.0.0

diff --git a/debian/patches/dialupadmin-help.diff b/debian/patches/dialupadmin-help.diff
deleted file mode 100644 (file)
index a6a3965..0000000
--- a/debian/patches/dialupadmin-help.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-## 02-dialupadmin-help.dpatch by Mark Hymers <mark@hymers.org.uk>
-## DP: Fix README location
-
---- old/dialup_admin/htdocs/help/help.php      (revision 1519)
-+++ new/dialup_admin/htdocs/help/help.php      (working copy)
-@@ -48,13 +48,13 @@
- <?php
- $in_file = '';
- if ($help_file == 'readme')
--      $in_file = '../../README';
-+      $in_file = '/usr/share/doc/freeradius-dialupadmin/README.gz';
- else if ($help_file == 'howto')
--      $in_file = '../../doc/HOWTO';
-+      $in_file = '/usr/share/doc/freeradius-dialupadmin/HOWTO.gz';
- else if ($help_file == 'faq')
--      $in_file = '../../doc/FAQ';
-+      $in_file = '/usr/share/doc/freeradius-dialupadmin/FAQ.gz';
- if ($in_file != '')
--      readfile("$in_file");
-+      readgzfile("$in_file");
- ?>
- </pre>
- <br>

diff --git a/debian/patches/gitignore.diff b/debian/patches/gitignore.diff
deleted file mode 100644 (file)
index ba9b52e..0000000
--- a/debian/patches/gitignore.diff
+++ /dev/null
@@ -1,17 +0,0 @@
---- freeradius-2.0.4+dfsg.orig/.gitignore
-+++ freeradius-2.0.4+dfsg/.gitignore
-@@ -0,0 +1,14 @@
-+*.la
-+*.o
-+*.lo
-+.libs
-+.deps
-+build-arch-stamp
-+build-indep-stamp
-+config.h
-+config.log
-+config.status
-+config.cache
-+config.guess.dist
-+config.sub.dist
-+Make.inc

diff --git a/debian/patches/rlm_sql.libs.diff b/debian/patches/rlm_sql.libs.diff
deleted file mode 100644 (file)
index 27fe4f7..0000000
--- a/debian/patches/rlm_sql.libs.diff
+++ /dev/null
@@ -1,58 +0,0 @@
---- freeradius-2.0.4+dfsg.orig/src/modules/rlm_sql_log/Makefile
-+++ freeradius-2.0.4+dfsg/src/modules/rlm_sql_log/Makefile
-@@ -6,5 +6,6 @@
- 
- TARGET      = rlm_sql_log
- SRCS        = rlm_sql_log.c
-+RLM_LIBS    += $(top_builddir)/src/modules/rlm_sql/.libs/rlm_sql.la
- 
- include ../rules.mak
---- freeradius-2.0.4+dfsg.orig/src/modules/rlm_sqlcounter/Makefile.in
-+++ freeradius-2.0.4+dfsg/src/modules/rlm_sqlcounter/Makefile.in
-@@ -6,7 +6,7 @@
- SRCS        = rlm_sqlcounter.c
- HEADERS     =
- RLM_CFLAGS  = @sqlcounter_cflags@
--RLM_LIBS    = @sqlcounter_ldflags@
-+RLM_LIBS    = @sqlcounter_ldflags@ $(top_builddir)/src/modules/rlm_sql/.libs/rlm_sql.la
- RLM_INSTALL =
- 
- include ../rules.mak
---- freeradius-2.0.4+dfsg.orig/src/modules/rlm_sqlippool/Makefile.in
-+++ freeradius-2.0.4+dfsg/src/modules/rlm_sqlippool/Makefile.in
-@@ -8,7 +8,7 @@
- SRCS        = rlm_sqlippool.c
- HEADERS     = $(top_builddir)/src/modules/rlm_sql/rlm_sql.h
- RLM_CFLAGS  = -I$(top_builddir)/src/modules/rlm_sql
--RLM_LIBS    =
-+RLM_LIBS    += $(top_builddir)/src/modules/rlm_sql/.libs/rlm_sql.la
- RLM_INSTALL =
- 
- include ../rules.mak
---- freeradius-2.0.4+dfsg.orig/src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in
-+++ freeradius-2.0.4+dfsg/src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in
-@@ -4,5 +4,6 @@
- SRCS          = sql_postgresql.c
- RLM_SQL_CFLAGS        = @postgresql_cflags@ $(INCLTDL)
- RLM_SQL_LIBS  = @postgresql_ldflags@
-+RLM_LIBS       += $(top_builddir)/src/modules/rlm_sql/.libs/rlm_sql.la
- 
- include ../rules.mak
---- freeradius-2.0.4+dfsg.orig/src/modules/rlm_sql/drivers/rlm_sql_iodbc/Makefile.in
-+++ freeradius-2.0.4+dfsg/src/modules/rlm_sql/drivers/rlm_sql_iodbc/Makefile.in
-@@ -4,5 +4,6 @@
- SRCS           = sql_iodbc.c
- RLM_SQL_CFLAGS = @sql_iodbc_cflags@ $(INCLTDL)
- RLM_SQL_LIBS   = @sql_iodbc_ldflags@
-+RLM_LIBS      += $(top_builddir)/src/modules/rlm_sql/.libs/rlm_sql.la
- 
- include ../rules.mak
---- freeradius-2.0.4+dfsg.orig/src/modules/rlm_sql/drivers/rlm_sql_mysql/Makefile.in
-+++ freeradius-2.0.4+dfsg/src/modules/rlm_sql/drivers/rlm_sql_mysql/Makefile.in
-@@ -4,5 +4,6 @@
- SRCS           = sql_mysql.c
- RLM_SQL_CFLAGS = @sql_mysql_cflags@ $(INCLTDL)
- RLM_SQL_LIBS   = @sql_mysql_ldflags@
-+RLM_LIBS       += $(top_builddir)/src/modules/rlm_sql/.libs/rlm_sql.la
- 
- include ../rules.mak

diff --git a/debian/patches/series b/debian/patches/series
index 7945765..4e53ee1 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,2 @@
 radiusd-to-freeradius.diff
 sql_modules.diff
-#dialupadmin-help.diff
-#gitignore.diff
-rlm_sql.libs.diff

diff --git a/debian/rules b/debian/rules
index 8847d2b..730747a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -80,6 +80,7 @@ endif
                --with-logdir=/var/log/$(package) \
                --enable-ltdl-install=no --enable-strict-dependencies \
                --with-experimental-modules=no \
+               --enable-boilermake \
                --with-large-files --with-udpfromto --with-edir \
                --config-cache \
                --without-rlm_eap_tnc \
@@ -87,9 +88,7 @@ endif
                --with-rlm_sql_postgresql_include_dir=`pg_config --includedir` \
                --without-rlm_eap_ikev2 \
                --without-rlm_sql_oracle \
-               --without-rlm_sql_unixodbc \
-               --with-system-libtool \
-               --with-system-libltdl
+               --without-rlm_sql_unixodbc
 
 #Architecture 
 build: patch build-arch build-indep