Sync debian packaging changes from v3.1.x

diff --git a/debian/freeradius.init b/debian/freeradius.init
index 91ec2f1..a281e62 100755 (executable)
--- a/debian/freeradius.init
+++ b/debian/freeradius.init
@@ -112,4 +112,4 @@ case "$1" in
         ;;
 esac
 
-exit 0
+exit $ret

diff --git a/debian/rules b/debian/rules
index 3935cc8..261d5d6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,7 @@ logdir          = /var/log/$(package)
 pkgdocdir       = /usr/share/doc/$(package)
 raddbdir        = /etc/$(package)
 
-modulelist=krb5 ldap sql_mysql sql_iodbc sql_postgresql dhcp redis yubikey
+modulelist=krb5 ldap sql_mysql sql_iodbc sql_postgresql dhcp redis rest yubikey
 pkgs=$(shell dh_listpackages)
 
 # This has to be exported to make some magic below work.
@@ -97,6 +97,7 @@ 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
@@ -109,7 +110,7 @@ endif
 #Architecture
 build: patch build-arch build-indep
 
-build-arch: build-arch-stamp
+build-arch: build-arch-stamp patch
 build-arch-stamp: config.status
        $(MAKE)
        touch $@

diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644 (file)
index 0000000..d25b342
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.0.6 (GNU/Linux)
+Comment: For info see http://www.gnupg.org
+
+mQCNAzx7wFMAAAEEALq2yahNGENq7Z8xqIaaxlMYPEqdnWme+QQRobX+0mHJ+xjv
+uU9icVaQJrgrcgmH9Sx5avAZViypk/bBSwxUxbUZfF9LRsEPJB2Rpg2eLuxShYiE
+x0CMCAIQvDFCmygm4+dqgkj1/BCImki8nvQIoW56uTTkskZuq6kul4vkAkl9AAUR
+tCRBbGFuIFQuIERlS29rIDxhbGFuZEBmcmVlcmFkaXVzLm9yZz6JAJUDBRA8e8BT
+qS6Xi+QCSX0BAXvOA/wPxVKQXtyfQSFi8WrPa0QUaRzm8j9Kna9u9Xn2wzF18neH
+ogxzDIdJZtB2zDRKaRbNeYrcz0LnC5sxZqMco0NkI7P2ifE42aWXauSuYaYA9uG6
+kP+CFjprorK0Cc6NUL47nWxB5x5zkix85MUjkMbOFyrZrUKKcHAeWfjzMf0Vkg==
+=VwDM
+-----END PGP PUBLIC KEY BLOCK-----

diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..5bb4676
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,9 @@
+version=3
+
+opts=pasv,\
+pgpsigurlmangle=s/$/.sig/,\
+repacksuffix=+dfsg,\
+dversionmangle=s/\+git$//,\
+uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/\
+  ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-(.+)\.tar\.gz
+