diff -Nru nufw-2.4.3/debian/changelog nufw-2.4.3/debian/changelog --- nufw-2.4.3/debian/changelog 2016-04-05 12:48:12.000000000 +0000 +++ nufw-2.4.3/debian/changelog 2017-01-14 17:20:38.000000000 +0000 @@ -1,14 +1,14 @@ -nufw (2.4.3-3.3build2) xenial; urgency=medium +nufw (2.4.3-3.4) unstable; urgency=medium - * Rebuild against libmysqlclient20. + * Non-maintainer upload. + * Switch Build-Depends to default-libmysqlclient-dev. + (Closes: #845882, #790471) + * Fix FTBFS with clang, thanks to Nicolas Sévelin-Radiguet. + (Closes: #741863) + * Restrict Architecture to linux-any. (Closes: #745180) + * Fix description-synopsis-starts-with-article. - -- Robie Basak Tue, 05 Apr 2016 12:48:12 +0000 - -nufw (2.4.3-3.3build1) xenial; urgency=medium - - * No-change rebuild for gnutls transition. - - -- Matthias Klose Wed, 17 Feb 2016 22:41:31 +0000 + -- Andreas Beckmann Sat, 14 Jan 2017 18:20:38 +0100 nufw (2.4.3-3.3) unstable; urgency=medium diff -Nru nufw-2.4.3/debian/control nufw-2.4.3/debian/control --- nufw-2.4.3/debian/control 2015-09-01 18:13:22.000000000 +0000 +++ nufw-2.4.3/debian/control 2017-01-14 17:04:17.000000000 +0000 @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 9.0), po-debconf, automake, dh-autoreconf, libldap2-dev, libglib2.0-dev, - libmysqlclient-dev | libmysqlclient15-dev, + default-libmysqlclient-dev, libpq-dev, iptables-dev, libtool, @@ -22,10 +22,10 @@ Homepage: http://www.nufw.org/-English-.html Package: nufw -Architecture: any +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, libnussl1 (= ${binary:Version}), debconf (>= 1.3.22), ucf, ssl-cert, openssl Suggests: ulogd, ulogd-mysql -Description: The authenticating firewall [NFQUEUE daemon] +Description: authenticating firewall [NFQUEUE daemon] NuFW is an authenticating firewall based on netfilter's NFQUEUE target. It allows one to write filtering rules based on user identity, in addition to classical network criteria. Unless other solutions, NuFW uses a @@ -47,7 +47,7 @@ sends back the information to Nufw that applies decisions. Package: nuauth -Architecture: any +Architecture: linux-any Pre-Depends: passwd, adduser Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -58,7 +58,7 @@ ssl-cert, openssl Recommends: nuauth-utils -Description: The authenticating firewall [authentication daemon] +Description: authenticating firewall [authentication daemon] NuFW is an authenticating firewall based on netfilter's NFQUEUE target. It allows one to write filtering rules based on user identity, in addition to classical network criteria. Unless other solutions, NuFW uses a @@ -82,10 +82,10 @@ to the nufw daemon. Package: nuauth-extra -Architecture: any +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, nuauth Recommends: nuauth-utils -Description: The authenticating firewall [extra modules] +Description: authenticating firewall [extra modules] NuFW is an authenticating firewall based on netfilter's NFQUEUE target. It allows one to write filtering rules based on user identity, in addition to classical network criteria. Unless other solutions, NuFW uses a @@ -96,10 +96,10 @@ and auth_mysql modules. Package: nuauth-log-mysql -Architecture: any +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, nuauth Recommends: nuauth-utils -Description: The authenticating firewall [MySQL log module] +Description: authenticating firewall [MySQL log module] NuFW is an authenticating firewall based on netfilter's NFQUEUE target. It allows one to write filtering rules based on user identity, in addition to classical network criteria. Unless other solutions, NuFW uses a @@ -110,10 +110,10 @@ database. You can use this for an SSO solution, too. Package: nuauth-log-pgsql -Architecture: any +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, nuauth Recommends: nuauth-utils -Description: The authenticating firewall [PostgreSQL log module] +Description: authenticating firewall [PostgreSQL log module] NuFW is an authenticating firewall based on netfilter's NFQUEUE target. It allows one to write filtering rules based on user identity, in addition to classical network criteria. Unless other solutions, NuFW uses a @@ -124,9 +124,9 @@ database. You can use this for an SSO solution, too. Package: nutcpc -Architecture: any +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, libnuclient4 (= ${binary:Version}) -Description: The authenticating firewall [client] +Description: authenticating firewall [client] NuFW is an authenticating firewall based on netfilter's NFQUEUE target. It allows one to write filtering rules based on user identity, in addition to classical network criteria. Unless other solutions, NuFW uses a @@ -147,7 +147,7 @@ libnet-ldap-perl, nuauth XB-Python-Version: ${python:Versions} -Description: The authenticating firewall [tools for admin] +Description: authenticating firewall [tools for admin] NuFW is an authenticating firewall based on netfilter's NFQUEUE target. It allows one to write filtering rules based on user identity, in addition to classical network criteria. Unless other solutions, NuFW uses a @@ -159,11 +159,11 @@ the nuauth daemon. Package: libnuclient4 -Architecture: any +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, libsasl2-modules, libnussl1 (= ${binary:Version}) Replaces: libnuclient Conflicts: libnuclient -Description: The authenticating firewall [client library] +Description: authenticating firewall [client library] NuFW is an authenticating firewall based on netfilter's NFQUEUE target. It allows one to write filtering rules based on user identity, in addition to classical network criteria. Unless other solutions, NuFW uses a @@ -173,10 +173,10 @@ This library provides the library for nufw clients. Package: libnuclient-dev -Architecture: any +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, libsasl2-dev, libssl-dev, libnuclient4 (= ${binary:Version}) Section: libdevel -Description: The authenticating firewall [client development files] +Description: authenticating firewall [client development files] NuFW is an authenticating firewall based on netfilter's NFQUEUE target. It allows one to write filtering rules based on user identity, in addition to classical network criteria. Unless other solutions, NuFW uses a @@ -186,10 +186,10 @@ This library provides files needed to develop a NuFW client. Package: libpam-nufw -Architecture: any +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, libnuclient4 (= ${binary:Version}) Section: admin -Description: The authenticating firewall [PAM module] +Description: authenticating firewall [PAM module] NuFW is an authenticating firewall based on netfilter's NFQUEUE target. It allows one to write filtering rules based on user identity, in addition to classical network criteria. Unless other solutions, NuFW uses a @@ -201,9 +201,9 @@ for the duration of the session. Package: libnussl1 -Architecture: any +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: The authenticating firewall [SSL library] +Description: authenticating firewall [SSL library] NuFW is an authenticating firewall based on netfilter's NFQUEUE target. It allows one to write filtering rules based on user identity, in addition to classical network criteria. Unless other solutions, NuFW uses a @@ -213,10 +213,10 @@ This library provides an abstraction layer over SSL functions. Package: libnussl-dev -Architecture: any +Architecture: linux-any Depends: ${shlibs:Depends}, ${misc:Depends}, libsasl2-dev, libssl-dev, libnussl1 (= ${binary:Version}) Section: libdevel -Description: The authenticating firewall [SSL development files] +Description: authenticating firewall [SSL development files] NuFW is an authenticating firewall based on netfilter's NFQUEUE target. It allows one to write filtering rules based on user identity, in addition to classical network criteria. Unless other solutions, NuFW uses a diff -Nru nufw-2.4.3/debian/patches/12-fix-clang-ftbfs-Wreturn-type.patch nufw-2.4.3/debian/patches/12-fix-clang-ftbfs-Wreturn-type.patch --- nufw-2.4.3/debian/patches/12-fix-clang-ftbfs-Wreturn-type.patch 1970-01-01 00:00:00.000000000 +0000 +++ nufw-2.4.3/debian/patches/12-fix-clang-ftbfs-Wreturn-type.patch 2017-01-14 16:53:37.000000000 +0000 @@ -0,0 +1,14 @@ +Description: fix FTBFS with clang instead of gcc +Author: Nicolas Sévelin-Radiguet +Last-Update: 2014-03-16 +--- a/src/nuauth/sasl.c ++++ b/src/nuauth/sasl.c +@@ -365,7 +365,7 @@ + "Unable to negotiate proto"); + c_session->proto_version = PROTO_VERSION_NONE; + } +- return; ++ return 0; + } + /* sanity check on know protocol */ + switch (c_session->proto_version) { diff -Nru nufw-2.4.3/debian/patches/series nufw-2.4.3/debian/patches/series --- nufw-2.4.3/debian/patches/series 2015-07-25 13:06:15.000000000 +0000 +++ nufw-2.4.3/debian/patches/series 2017-01-14 16:54:13.000000000 +0000 @@ -1,4 +1,5 @@ 10-fix-format-strings.patch 11-fix-ftbfs-pthread_cancel.patch +12-fix-clang-ftbfs-Wreturn-type.patch 15_gnutls_renamedtypes.diff 16_gnutls34.diff