1 |
slords |
1.1 |
Fix up header file names for old libpcap versions |
2 |
|
|
|
3 |
|
|
--- ppp-2.4.3/pppd/demand.c 2004-11-04 10:02:26.000000000 +0000 |
4 |
|
|
+++ ppp-2.4.3/pppd/demand.c 2004-11-23 11:42:09.000000000 +0000 |
5 |
|
|
@@ -44,7 +44,7 @@ |
6 |
|
|
#include <sys/stat.h> |
7 |
|
|
#include <sys/socket.h> |
8 |
|
|
#ifdef PPP_FILTER |
9 |
|
|
-#include <pcap-bpf.h> |
10 |
|
|
+#include <net/bpf.h> |
11 |
|
|
#endif |
12 |
|
|
|
13 |
|
|
#include "pppd.h" |
14 |
|
|
--- ppp-2.4.3/pppd/sys-linux.c 2004-11-23 11:28:35.000000000 +0000 |
15 |
|
|
+++ ppp-2.4.3/pppd/sys-linux.c 2004-11-23 11:42:59.000000000 +0000 |
16 |
|
|
@@ -136,7 +136,7 @@ |
17 |
|
|
#endif /* IPX_CHANGE */ |
18 |
|
|
|
19 |
|
|
#ifdef PPP_FILTER |
20 |
|
|
-#include <pcap-bpf.h> |
21 |
|
|
+#include <net/bpf.h> |
22 |
|
|
#include <linux/filter.h> |
23 |
|
|
#endif /* PPP_FILTER */ |
24 |
|
|
|
25 |
|
|
--- ppp-2.4.3/pppd/Makefile.linux 2005-02-10 10:28:50.000000000 +0000 |
26 |
|
|
+++ ppp-2.4.3/pppd/Makefile.linux 2005-02-10 10:29:46.000000000 +0000 |
27 |
|
|
@@ -172,7 +172,7 @@ |
28 |
|
|
endif |
29 |
|
|
|
30 |
|
|
ifdef FILTER |
31 |
|
|
-ifneq ($(wildcard /usr/include/pcap-bpf.h),) |
32 |
|
|
+ifneq ($(wildcard /usr/include/net/bpf.h),) |
33 |
|
|
LIBS += -lpcap |
34 |
|
|
CFLAGS += -DPPP_FILTER |
35 |
|
|
endif |
36 |
|
|
--- ppp-2.4.3/pppd/Makefile.linux.lib64 2005-02-10 10:28:55.000000000 +0000 |
37 |
|
|
+++ ppp-2.4.3/pppd/Makefile.linux.lib64 2005-02-10 10:29:57.000000000 +0000 |
38 |
|
|
@@ -171,7 +171,7 @@ |
39 |
|
|
endif |
40 |
|
|
|
41 |
|
|
ifdef FILTER |
42 |
|
|
-ifneq ($(wildcard /usr/include/pcap-bpf.h),) |
43 |
|
|
+ifneq ($(wildcard /usr/include/net/bpf.h),) |
44 |
|
|
LIBS += -lpcap |
45 |
|
|
CFLAGS += -DPPP_FILTER |
46 |
|
|
endif |
47 |
|
|
--- ppp-2.4.3/pppd/Makefile.linux.make 2005-02-10 10:29:04.000000000 +0000 |
48 |
|
|
+++ ppp-2.4.3/pppd/Makefile.linux.make 2005-02-10 10:30:10.000000000 +0000 |
49 |
|
|
@@ -171,7 +171,7 @@ |
50 |
|
|
endif |
51 |
|
|
|
52 |
|
|
ifdef FILTER |
53 |
|
|
-ifneq ($(wildcard /usr/include/pcap-bpf.h),) |
54 |
|
|
+ifneq ($(wildcard /usr/include/net/bpf.h),) |
55 |
|
|
LIBS += -lpcap |
56 |
|
|
CFLAGS += -DPPP_FILTER |
57 |
|
|
endif |