Package: dns2tcp Version: 0.4.dfsg-5 Hi,
I'm uploading a package with the attached diff. Simon
diff -u dns2tcp-0.4.dfsg/debian/changelog dns2tcp-0.4.dfsg/debian/changelog --- dns2tcp-0.4.dfsg/debian/changelog +++ dns2tcp-0.4.dfsg/debian/changelog @@ -1,3 +1,11 @@ +dns2tcp (0.4.dfsg-5.1) unstable; urgency=low + + * Non-maintainer upload. + * Remove clashing strnlen declarations. Thanks to Ilya Barygin for the + patch (Closes: #548044) + + -- Simon Richter <s...@debian.org> Fri, 27 Nov 2009 22:10:12 +0100 + dns2tcp (0.4.dfsg-5) unstable; urgency=low * Fix dnsbof.diff to add an extra check for total_len. diff -u dns2tcp-0.4.dfsg/debian/patches/series dns2tcp-0.4.dfsg/debian/patches/series --- dns2tcp-0.4.dfsg/debian/patches/series +++ dns2tcp-0.4.dfsg/debian/patches/series @@ -4,0 +5 @@ +strnlen.diff only in patch2: unchanged: --- dns2tcp-0.4.dfsg.orig/debian/patches/strnlen.diff +++ dns2tcp-0.4.dfsg/debian/patches/strnlen.diff @@ -0,0 +1,25 @@ +Index: dns2tcp-0.4.dfsg/common/includes/dns.h +=================================================================== +--- dns2tcp-0.4.dfsg.orig/common/includes/dns.h 2009-09-23 11:55:26.000000000 +0400 ++++ dns2tcp-0.4.dfsg/common/includes/dns.h 2009-09-23 12:04:32.000000000 +0400 +@@ -139,8 +139,5 @@ + void dns_simple_decode(char *input, char *output, int max_len); + void dns_encode(char *); + void *jump_end_query(void *, int, int); +-#ifndef _WIN32 +-int strnlen(char *, int len); +-#endif + + #endif +Index: dns2tcp-0.4.dfsg/server/includes/server.h +=================================================================== +--- dns2tcp-0.4.dfsg.orig/server/includes/server.h 2009-09-23 12:05:02.000000000 +0400 ++++ dns2tcp-0.4.dfsg/server/includes/server.h 2009-09-23 12:05:30.000000000 +0400 +@@ -48,7 +48,6 @@ + } t_conf; + + int do_server(t_conf *); +-int strnlen(char *, int); /* not present ?*/ + int delete_client(t_conf *conf, struct s_simple_list *client); + void delete_zombie(t_conf *conf); +
