[Git][debian-proftpd-team/proftpd][master] Fix FTBFS w/ Mariadb > 10.3. (#918394)

[Hilmar Preuße]

Hilmar Preuße pushed to branch master at Debian ProFTPD Team / proftpd


Commits:
108dda04 by Hilmar Preusse at 2019-01-07T19:41:07Z
Fix FTBFS w/ Mariadb > 10.3. (#918394)

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -2,6 +2,7 @@ proftpd-dfsg (1.3.6-4) UNRELEASED; urgency=medium
 
   [ Hilmar Preuße ]
   * Mark -doc package as "Multi-Arch: foreign"
+  * Proftp now builds w/ Mariadb > 10.3 (Closes: #918394)
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 24 Nov 2018 23:15:30 +0100
 


=====================================
debian/rules
=====================================
@@ -47,7 +47,7 @@ DSOMODS3 = mod_wrap2_sql:mod_quotatab_file:mod_quotatab_radius:mod_facl:mod_ctrl
 DSOMODS4 = mod_geoip:mod_exec:mod_sftp:mod_sftp_pam:mod_sftp_sql:mod_shaper:mod_sql_passwd:mod_ifsession:mod_auth_otp:mod_tls_redis
 DSOMODS5 = mod_wrap2_redis:mod_redis:mod_memcache:mod_tls_memcache:mod_readme:mod_snmp
 CONF_ARGS := --prefix=/usr \
-	     --with-includes=$(shell pg_config --includedir):$(shell mysql_config --include|sed -e 's/-I//') \
+	     --with-includes=$(shell pg_config --includedir)$(shell mysql_config --include|sed -e 's/-I/:/g'|sed -e 's/ //') \
 	     --mandir=/usr/share/man --sysconfdir=/etc/$(NAME) --localstatedir=/run --libexecdir=/usr/lib/$(NAME) \
 	     --enable-sendfile --enable-facl --enable-dso --enable-autoshadow --enable-ctrls \
 	     --enable-ipv6 --enable-nls --enable-memcache --with-lastlog=/var/log/lastlog --enable-pcre $(DEVELOPT) \



View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/commit/108dda04a53369e8e17f0c0a6efd856e46193091

-- 
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/commit/108dda04a53369e8e17f0c0a6efd856e46193091
You're receiving this email because of your account on salsa.debian.org.