-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
[0] https://bugs.launchpad.net/bugs/1190240
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAEBAgAGBQJRw1zoAAoJEGlMre9Rx7W2dfgP/3Gy9n4wJEGays3mYCzlyqYM
Y+sFwD2bKuTL3PXoFmDrF5KkC1nHXR+IFIC1SXvKvmJl5jDTPjmtqY9nkUb+khFp
MkiFX9WImOQQc5z7vOuNfWLPYGHD/lW12ItDaR/o2r8Lx0L7h5l7esotImJyA4cj
70F2WDDv9omza1tLk0CXqoKS0PvknHNexxa+JV4WeAVd+borL9Q0ZFU78EUe/Rnb
3PldmgUUb3c8uRZBfBHlRh1eIFd242NXzWehrcYyPBNlIwgH1jjVoac+9nGVKbJA
iWz6bmZ9SA+3IsbWkhKInig5xG2Xi4mQsDdwe5cZWcOUEZKN447VGT0tPlYgF4GL
KbhR6pYZsuXje9DDlbUXvfUydeEZ7+tI9NrexL8EIfBF25bnFMHCaahChjDiFzB/
J8fTbd9wauVJ0XD9aa8ip2nyTiz2OC/qg21etI5PSi9/SHJj1S0V7pL9SWRaAmRX
dUjKFcgICDp+2fMvhjUwdW5zHK5EYSEuID4JCzQtb304vORMSrtfUzIkLZ8kZ3CI
ZTsZI2iZnhrVo7lk/5+2ZkxrNFZXokeZADk+Xlo1WLQ0F7gResR5F7oUX+jJAA+a
bV97mou4YIYMsLipanmFZNxPdYIDmwVXlengQlAz235iWfLndMGMo/suKECOzTp7
kQI4EBntezn15a56mvZ4
=xduC
-----END PGP SIGNATURE-----
diff -Nru proftpd-dfsg-1.3.5~rc2/debian/changelog proftpd-dfsg-1.3.5~rc2/debian/changelog
--- proftpd-dfsg-1.3.5~rc2/debian/changelog 2013-03-07 13:32:55.000000000 +0100
+++ proftpd-dfsg-1.3.5~rc2/debian/changelog 2013-06-20 10:51:56.000000000 +0200
@@ -1,3 +1,11 @@
+proftpd-dfsg (1.3.5~rc2-1.1) UNRELEASED; urgency=low
+
+ * Non-maintainer upload.
+ * Add patch libmemcached-1.0.9 to fix FTBFS with libmemcached-dev (>= 1.0.9)
+ (Closes: #712916).
+
+ -- Michael Fladischer <fladischermich...@fladi.at> Thu, 20 Jun 2013 10:50:23 +0200
+
proftpd-dfsg (1.3.5~rc2-1) experimental; urgency=low
* New upstream pre-releaese.
diff -Nru proftpd-dfsg-1.3.5~rc2/debian/patches/libmemcached-1.0.9 proftpd-dfsg-1.3.5~rc2/debian/patches/libmemcached-1.0.9
--- proftpd-dfsg-1.3.5~rc2/debian/patches/libmemcached-1.0.9 1970-01-01 01:00:00.000000000 +0100
+++ proftpd-dfsg-1.3.5~rc2/debian/patches/libmemcached-1.0.9 2013-06-20 10:49:45.000000000 +0200
@@ -0,0 +1,119 @@
+Description: Adapt to libmemcached >= 1.0.9 new instance API
+ memcached_server_instance_st is no more and surprisingly there's no
+ deprecated typedef to help with that. Add a bunch of #ifdefs and adapt
+ to the new API.
+Author: Michael Fladischer <fladischermich...@fladi.at>
+Last-Update: 2013-06-20
+Forwarded: no
+Bug: #712916
+
+--- a/src/memcache.c
++++ b/src/memcache.c
+@@ -295,7 +295,11 @@
+
+ alive_server_list = NULL;
+ for (i = 0; i < server_count; i++) {
++ #if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000009
++ const memcached_instance_st* server;
++ #else
+ memcached_server_instance_st server;
++ #endif
+
+ server = memcached_server_instance_by_position(clone, i);
+
+@@ -418,7 +422,11 @@
+ case MEMCACHED_SOME_ERRORS:
+ case MEMCACHED_SERVER_MARKED_DEAD:
+ case MEMCACHED_CONNECTION_FAILURE: {
++ #if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000009
++ const memcached_instance_st* server;
++ #else
+ memcached_server_instance_st server;
++ #endif
+
+ server = memcached_server_get_last_disconnect(mcache->mc);
+ if (server != NULL) {
+@@ -925,7 +933,11 @@
+
+ case MEMCACHED_SERVER_MARKED_DEAD:
+ case MEMCACHED_CONNECTION_FAILURE: {
++ #if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000009
++ const memcached_instance_st* server;
++ #else
+ memcached_server_instance_st server;
++ #endif
+
+ server = memcached_server_get_last_disconnect(mcache->mc);
+ if (server != NULL) {
+@@ -988,7 +1000,11 @@
+
+ case MEMCACHED_SERVER_MARKED_DEAD:
+ case MEMCACHED_CONNECTION_FAILURE: {
++ #if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000009
++ const memcached_instance_st* server;
++ #else
+ memcached_server_instance_st server;
++ #endif
+
+ server = memcached_server_get_last_disconnect(mcache->mc);
+ if (server != NULL) {
+@@ -1057,7 +1073,11 @@
+
+ case MEMCACHED_SERVER_MARKED_DEAD:
+ case MEMCACHED_CONNECTION_FAILURE: {
++ #if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000009
++ const memcached_instance_st* server;
++ #else
+ memcached_server_instance_st server;
++ #endif
+
+ server = memcached_server_get_last_disconnect(mcache->mc);
+ if (server != NULL) {
+@@ -1137,7 +1157,11 @@
+
+ case MEMCACHED_SERVER_MARKED_DEAD:
+ case MEMCACHED_CONNECTION_FAILURE: {
++ #if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000009
++ const memcached_instance_st* server;
++ #else
+ memcached_server_instance_st server;
++ #endif
+
+ server = memcached_server_get_last_disconnect(mcache->mc);
+ if (server != NULL) {
+@@ -1221,7 +1245,11 @@
+
+ case MEMCACHED_SERVER_MARKED_DEAD:
+ case MEMCACHED_CONNECTION_FAILURE: {
++ #if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000009
++ const memcached_instance_st* server;
++ #else
+ memcached_server_instance_st server;
++ #endif
+
+ server = memcached_server_get_last_disconnect(mcache->mc);
+ if (server != NULL) {
+@@ -1283,7 +1311,11 @@
+
+ case MEMCACHED_SERVER_MARKED_DEAD:
+ case MEMCACHED_CONNECTION_FAILURE: {
++ #if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000009
++ const memcached_instance_st* server;
++ #else
+ memcached_server_instance_st server;
++ #endif
+
+ server = memcached_server_get_last_disconnect(mcache->mc);
+ if (server != NULL) {
+@@ -1348,7 +1380,11 @@
+
+ case MEMCACHED_SERVER_MARKED_DEAD:
+ case MEMCACHED_CONNECTION_FAILURE: {
++ #if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX >= 0x01000009
++ const memcached_instance_st* server;
++ #else
+ memcached_server_instance_st server;
++ #endif
+
+ server = memcached_server_get_last_disconnect(mcache->mc);
+ if (server != NULL) {
diff -Nru proftpd-dfsg-1.3.5~rc2/debian/patches/series proftpd-dfsg-1.3.5~rc2/debian/patches/series
--- proftpd-dfsg-1.3.5~rc2/debian/patches/series 2013-03-07 13:32:55.000000000 +0100
+++ proftpd-dfsg-1.3.5~rc2/debian/patches/series 2013-06-20 10:38:58.000000000 +0200
@@ -11,3 +11,4 @@
silent
use_hypen_in_manpage
contrib_hardening_flags
+libmemcached-1.0.9
