Build unixODBC rather than iODBC - Debian packaging of iODBC is very old

diff --git a/debian/control.in b/debian/control.in
index d7bfbc73d687d4a81a094416e8e52ddb2c9c998c..41ac60a8390a692b7ce046a27d3c3413d329c6a2 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -8,7 +8,6 @@ Build-Depends: @BUILDDEPS@ debhelper (>= 9),
  libcurl4-openssl-dev | libcurl4-gnutls-dev,
  libcap-dev,
  libgdbm-dev,
- libiodbc2-dev,
  libjson0 | libjson-c2 | libjson-c3 | libjson-c4 | libjson-c5,
  libjson0-dev | libjson-c-dev,
  libkrb5-dev | heimdal-dev,
@@ -31,7 +30,8 @@ Build-Depends: @BUILDDEPS@ debhelper (>= 9),
  libmemcached-dev,
  libhiredis-dev,
  python3-dev, @PYTWODEPS@
- samba-dev | samba4-dev
+ samba-dev | samba4-dev,
+ unixodbc-dev
 Section: net
 Priority: optional
 Maintainer: Network RADIUS SARL <info@networkradius.com>
@@ -159,11 +159,11 @@ Description: MySQL module for FreeRADIUS server
  The FreeRADIUS server can use MySQL to authenticate users and do accounting,
  and this module is necessary for that.
 
-Package: freeradius-iodbc
+Package: freeradius-unixodbc
 Architecture: any
 Depends: freeradius (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${dist:Depends}
-Description: iODBC module for FreeRADIUS server
- The FreeRADIUS server can use iODBC to access databases to authenticate users
+Description: unixODBC module for FreeRADIUS server
+ The FreeRADIUS server can use unixODBC to access databases to authenticate users
  and do accounting, and this module is necessary for that.
 
 Package: freeradius-redis

diff --git a/debian/freeradius-iodbc.install b/debian/freeradius-iodbc.install
deleted file mode 100644 (file)
index c4535d1..0000000
--- a/debian/freeradius-iodbc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/freeradius/rlm_sql_iodbc*.so

diff --git a/debian/freeradius-iodbc.lintian-overrides b/debian/freeradius-iodbc.lintian-overrides
deleted file mode 100644 (file)
index a157baa..0000000
--- a/debian/freeradius-iodbc.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-freeradius-iodbc: binary-or-shlib-defines-rpath
-
-# There's plenty in the description of this package to identify
-# what it does.
-freeradius-iodbc: extended-description-is-probably-too-short

diff --git a/debian/freeradius-unixodbc.install b/debian/freeradius-unixodbc.install
new file mode 100644 (file)
index 0000000..7742b6b
--- /dev/null
+++ b/debian/freeradius-unixodbc.install
@@ -0,0 +1 @@
+usr/lib/freeradius/rlm_sql_unixodbc*.so

diff --git a/debian/freeradius-unixodbc.lintian-overrides b/debian/freeradius-unixodbc.lintian-overrides
new file mode 100644 (file)
index 0000000..c7ce7d5
--- /dev/null
+++ b/debian/freeradius-unixodbc.lintian-overrides
@@ -0,0 +1,3 @@
+# There's plenty in the description of this package to identify
+# what it does.
+freeradius-unixodbc: extended-description-is-probably-too-short

diff --git a/debian/freeradius-iodbc.postinst b/debian/freeradius-unixodbc.postinst
similarity index 100%
rename from debian/freeradius-iodbc.postinst
rename to debian/freeradius-unixodbc.postinst

diff --git a/debian/rules b/debian/rules
index ce19f1a9727078f9d1623a13151cb036d2543d11..bab07d493e4360de562c9733308bfe381f78cf5d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ logdir          = /var/log/$(package)
 pkgdocdir       = /usr/share/doc/$(package)
 raddbdir        = /etc/$(package)
 
-modulelist=krb5 ldap sql_freetds sql_mysql sql_iodbc sql_postgresql dhcp python2 python3 redis rest unbound yubikey
+modulelist=krb5 ldap sql_freetds sql_mysql sql_postgresql sql_unixodbc dhcp python2 python3 redis rest unbound yubikey
 pkgs=$(shell dh_listpackages)
 
 # This has to be exported to make some magic below work.
@@ -119,10 +119,8 @@ endif
                --without-rlm_eap_tnc \
                --with-rlm_sql_postgresql_lib_dir=`pg_config --libdir` \
                --with-rlm_sql_postgresql_include_dir=`pg_config --includedir` \
-               --with-iodbc-include-dir='/usr/include/iodbc' \
                --without-rlm_eap_ikev2 \
                --without-rlm_sql_oracle \
-               --without-rlm_sql_unixodbc \
                --with-systemd \
                --enable-reproducible-builds