Bug#397572: linux-igd: diff for NMU version 0.cvs20060201-1.1

[Steinar H. Gunderson]

tags 397572 + patch
thanks

Hi,

Attached is the diff for my linux-igd 0.cvs20060201-1.1 NMU.

diff -Nru /tmp/sfu0kxvGSu/linux-igd-0.cvs20060201/debian/changelog 
/tmp/RJiYVxBCfQ/linux-igd-0.cvs20060201/debian/changelog
--- /tmp/sfu0kxvGSu/linux-igd-0.cvs20060201/debian/changelog    2006-11-15 
14:27:00.000000000 +0100
+++ /tmp/RJiYVxBCfQ/linux-igd-0.cvs20060201/debian/changelog    2006-11-15 
14:27:00.000000000 +0100
@@ -1,3 +1,12 @@
+linux-igd (0.cvs20060201-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename parse_port and service_to_port to my_parse_port and
+    my_service_to_port respectively, as they crash with functions already
+    defined in /usr/include/iptables.h; fixes FTBFS. (Closes: #397572)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]>  Wed, 15 Nov 2006 14:04:32 +0100
+
 linux-igd (0.cvs20060201-1) unstable; urgency=low
 
   * Initial release (Closes: #328986)
diff -Nru /tmp/sfu0kxvGSu/linux-igd-0.cvs20060201/iptc.c 
/tmp/RJiYVxBCfQ/linux-igd-0.cvs20060201/iptc.c
--- /tmp/sfu0kxvGSu/linux-igd-0.cvs20060201/iptc.c      2006-02-02 
00:53:39.000000000 +0100
+++ /tmp/RJiYVxBCfQ/linux-igd-0.cvs20060201/iptc.c      2006-11-15 
14:27:00.000000000 +0100
@@ -22,9 +22,9 @@
 struct ipt_entry_match *get_udp_match(const char *sports, const char *dports, 
unsigned int *nfcache);
 struct ipt_entry_target *get_dnat_target(const char *input, unsigned int 
*nfcache);
 
-static u_int16_t parse_port(const char *port);
+static u_int16_t my_parse_port(const char *port);
 static void parse_ports(const char *portstring, u_int16_t *ports);
-static int service_to_port(const char *name);
+static int my_service_to_port(const char *name);
 
 static void parse_range(const char *input, struct ip_nat_range *range);
 static struct ipt_natinfo *append_range(struct ipt_natinfo *info, const struct 
ip_nat_range *range);
@@ -335,11 +335,11 @@
 /* Copied and modified from libipt_tcp.c and libipt_udp.c */
 
 static u_int16_t
-parse_port(const char *port)
+my_parse_port(const char *port)
 {
        unsigned int portnum;
 
-       if ((portnum = service_to_port(port)) != -1) {
+       if ((portnum = my_service_to_port(port)) != -1) {
                return (u_int16_t)portnum;
        }
        else {
@@ -355,19 +355,19 @@
 
        buffer = strdup(portstring);
        if ((cp = strchr(buffer, ':')) == NULL)
-               ports[0] = ports[1] = parse_port(buffer);
+               ports[0] = ports[1] = my_parse_port(buffer);
        else {
                *cp = '\0';
                cp++;
 
-               ports[0] = buffer[0] ? parse_port(buffer) : 0;
-               ports[1] = cp[0] ? parse_port(cp) : 0xFFFF;
+               ports[0] = buffer[0] ? my_parse_port(buffer) : 0;
+               ports[1] = cp[0] ? my_parse_port(cp) : 0xFFFF;
        }
        free(buffer);
 }
 
 static int
-service_to_port(const char *name)
+my_service_to_port(const char *name)
 {
        struct servent *service;