Package: dns2tcp
Version: 0.4.dfsg-5
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu karmic ubuntu-patch
In Ubuntu, we've applied the attached patch to achieve the following:
* debian/patches/strnlen-declaration.diff: new patch to remove
conflicting declarations of strnlen() (LP: #435104).
We thought you might be interested in doing the same.
Build fails with the following error:
In file included from queue.c:32:
../common/includes/dns.h:143: error: conflicting types for 'strnlen'
/usr/include/string.h:404: note: previous declaration of 'strnlen' was here
http://launchpadlibrarian.net/31697788/buildlog_ubuntu-karmic-i386.dns2tcp_0.4.dfsg-5_FAILEDTOBUILD.txt.gz
-- System Information:
Debian Release: 5.0
APT prefers jaunty-updates
APT policy: (500, 'jaunty-updates'), (500, 'jaunty-security'), (500,
'jaunty-proposed'), (500, 'jaunty-backports'), (500, 'jaunty')
Architecture: i386 (i686)
Kernel: Linux 2.6.28-15-generic (SMP w/2 CPU cores)
Locale: LANG=ru_RU.UTF-8, LC_CTYPE=ru_RU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dashIndex: 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);
