Source: isdnutils
Version: 1:3.25+dfsg1-9.1
Tags: patch upstream
Control: block 798955 by -1
isdnutils hard codes various system header locations. As such it will
fail to build against a non-glibc libc or against a glibc that fixes
#798955. The attached patch removes the such assumptions and makes
isdnutils independent of the location of system headers. Please consider
applying it.
Helmut
--- isdnutils-3.25+dfsg1.orig/ipppd/lcp.c
+++ isdnutils-3.25+dfsg1/ipppd/lcp.c
@@ -51,10 +51,10 @@
#ifdef __linux__ /* Needs ppp ioctls */
#if defined __GLIBC__ && __GLIBC__ >= 2
-# include </usr/include/net/if.h>
-# include </usr/include/net/if_ppp.h>
+# include <net/if.h>
+# include <net/if_ppp.h>
#else
-# include </usr/include/net/if.h>
+# include <net/if.h>
# include <linux/if_ppp.h>
#endif
#endif
--- isdnutils-3.25+dfsg1.orig/ipppd/main.c
+++ isdnutils-3.25+dfsg1/ipppd/main.c
@@ -48,7 +48,7 @@
#include <sys/resource.h>
#include <sys/stat.h>
#include <sys/socket.h>
-#include </usr/include/net/if.h>
+#include <net/if.h>
#include "fsm.h"
#include "ipppd.h"
--- isdnutils-3.25+dfsg1.orig/ipppd/sys-linux.c
+++ isdnutils-3.25+dfsg1/ipppd/sys-linux.c
@@ -51,14 +51,14 @@
#include <unistd.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include </usr/include/net/if.h>
-#include </usr/include/net/if_arp.h>
-#include </usr/include/net/route.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/route.h>
#if defined __GLIBC__ && __GLIBC__ >= 2
-# include </usr/include/net/ppp_defs.h>
-# include </usr/include/net/if_ppp.h>
+# include <net/ppp_defs.h>
+# include <net/if_ppp.h>
# include "ippp-filter-compat.h"
-# include </usr/include/net/ethernet.h>
+# include <net/ethernet.h>
# include "route.h"
#else
# include <linux/ppp_defs.h>
--- isdnutils-3.25+dfsg1.orig/ipppstats/ipppstats.c
+++ isdnutils-3.25+dfsg1/ipppstats/ipppstats.c
@@ -54,8 +54,8 @@
#include <sys/ioctl.h>
#if defined __GLIBC__ && __GLIBC__ >= 2
-# include </usr/include/net/ppp_defs.h>
-# include </usr/include/net/if.h>
+# include <net/ppp_defs.h>
+# include <net/if.h>
#else
# include <linux/ppp_defs.h>
# include <linux/if.h>
@@ -65,7 +65,7 @@
#ifndef STREAMS
# if defined __GLIBC__ && __GLIBC__ >= 2
-# include </usr/include/net/if_ppp.h>
+# include <net/if_ppp.h>
# else
# include <linux/if_ppp.h> /* BSD, Linux, NeXT, etc. */
# endif
--- isdnutils-3.25+dfsg1.orig/scripts/lxdialog/Makefile
+++ isdnutils-3.25+dfsg1/scripts/lxdialog/Makefile
@@ -6,13 +6,13 @@
LDFLAGS = -s -L .
LDLIBS = -lncurses
-ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h))
- CFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"
+ifeq ($(shell echo '#include <ncurses/ncurses.h>' | ${CC} -E - >/dev/null 2>&1 && echo yes),yes)
+ CFLAGS += -DCURSES_LOC="<ncurses/ncurses.h>"
else
-ifeq (/usr/include/ncurses/curses.h, $(wildcard /usr/include/ncurses/curses.h))
- CFLAGS += -I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
+ifeq ($(shell echo '#include <ncurses/curses.h>' | ${CC} -E - >/dev/null 2>&1 && echo yes),yes)
+ CFLAGS += -DCURSES_LOC="<ncurses/curses.h>"
else
-ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h))
+ifeq ($(shell echo '#include <ncurses.h>' | ${CC} -E - >/dev/null 2>&1 && echo yes),yes)
CFLAGS += -DCURSES_LOC="<ncurses.h>"
else
CFLAGS += -DCURSES_LOC="<curses.h>"
