Control: tags 777975 + pending Dear maintainer,
I've prepared an NMU for libssh (versioned as 0.6.3-4.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - https://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Wir sind Helden: The Geek (Small Inherit)
diff -Nru libssh-0.6.3/debian/changelog libssh-0.6.3/debian/changelog
--- libssh-0.6.3/debian/changelog 2015-01-27 00:28:06.000000000 +0100
+++ libssh-0.6.3/debian/changelog 2015-07-18 20:38:50.000000000 +0200
@@ -1,3 +1,12 @@
+libssh (0.6.3-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix "ftbfs with GCC-5": add patch from Matthias Klose/Ubuntu:
+ add __extension__ to __FUNCTION__.
+ (Closes: #777975)
+
+ -- gregor herrmann <gre...@debian.org> Sat, 18 Jul 2015 20:38:30 +0200
+
libssh (0.6.3-4) unstable; urgency=medium
* Add debian/patches/0001_CVE-2014-8132.patch: Fixup error path in
diff -Nru libssh-0.6.3/debian/patches/gcc-5.diff libssh-0.6.3/debian/patches/gcc-5.diff
--- libssh-0.6.3/debian/patches/gcc-5.diff 1970-01-01 01:00:00.000000000 +0100
+++ libssh-0.6.3/debian/patches/gcc-5.diff 2015-07-18 20:35:00.000000000 +0200
@@ -0,0 +1,61 @@
+Index: b/include/libssh/pki_priv.h
+===================================================================
+--- a/include/libssh/pki_priv.h
++++ b/include/libssh/pki_priv.h
+@@ -29,7 +29,7 @@
+ #define ECDSA_HEADER_END "-----END EC PRIVATE KEY-----"
+
+ #define ssh_pki_log(...) \
+- _ssh_pki_log(__FUNCTION__, __VA_ARGS__)
++ _ssh_pki_log(__extension__ __FUNCTION__, __VA_ARGS__)
+ void _ssh_pki_log(const char *function,
+ const char *format, ...) PRINTF_ATTRIBUTE(2, 3);
+
+Index: b/include/libssh/priv.h
+===================================================================
+--- a/include/libssh/priv.h
++++ b/include/libssh/priv.h
+@@ -179,7 +179,7 @@ void ssh_log_function(int verbosity,
+ const char *function,
+ const char *buffer);
+ #define SSH_LOG(priority, ...) \
+- _ssh_log(priority, __FUNCTION__, __VA_ARGS__)
++ _ssh_log(priority, __extension__ __FUNCTION__, __VA_ARGS__)
+
+ /* LEGACY */
+ void ssh_log_common(struct ssh_common_struct *common,
+@@ -197,18 +197,18 @@ struct error_struct {
+ };
+
+ #define ssh_set_error(error, code, ...) \
+- _ssh_set_error(error, code, __FUNCTION__, __VA_ARGS__)
++ _ssh_set_error(error, code, __extension__ __FUNCTION__, __VA_ARGS__)
+ void _ssh_set_error(void *error,
+ int code,
+ const char *function,
+ const char *descr, ...) PRINTF_ATTRIBUTE(4, 5);
+
+ #define ssh_set_error_oom(error) \
+- _ssh_set_error_oom(error, __FUNCTION__)
++ _ssh_set_error_oom(error, __extension__ __FUNCTION__)
+ void _ssh_set_error_oom(void *error, const char *function);
+
+ #define ssh_set_error_invalid(error) \
+- _ssh_set_error_invalid(error, __FUNCTION__)
++ _ssh_set_error_invalid(error, __extension__ __FUNCTION__)
+ void _ssh_set_error_invalid(void *error, const char *function);
+
+
+Index: b/src/auth.c
+===================================================================
+--- a/src/auth.c
++++ b/src/auth.c
+@@ -1907,7 +1907,7 @@ int ssh_userauth_kbdint(ssh_session sess
+ * This should not happen
+ */
+ rc = SSH_AUTH_ERROR;
+- ssh_set_error(session,SSH_FATAL,"Invalid state in %s", __FUNCTION__);
++ ssh_set_error(session,SSH_FATAL,"Invalid state in %s", __extension__ __FUNCTION__);
+ }
+ return rc;
+ }
diff -Nru libssh-0.6.3/debian/patches/series libssh-0.6.3/debian/patches/series
--- libssh-0.6.3/debian/patches/series 2015-01-27 00:28:06.000000000 +0100
+++ libssh-0.6.3/debian/patches/series 2015-07-18 20:35:24.000000000 +0200
@@ -3,3 +3,4 @@
1003-custom-lib-names.patch
2002-fix-html-doc-generation.patch
2003-disable-expand_tilde_unix-test.patch
+gcc-5.diff
signature.asc
Description: Digital Signature
