1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
diff -Nru rp-pppoe-3.8.orig/gui/Makefile.in rp-pppoe-3.8/gui/Makefile.in
--- rp-pppoe-3.8.orig/gui/Makefile.in 2006-09-23 18:05:31.000000000 +0300
+++ rp-pppoe-3.8/gui/Makefile.in 2006-09-23 18:16:02.623018000 +0300
@@ -46,7 +46,7 @@
-mkdir -p $(RPM_INSTALL_ROOT)$(sbindir)
-mkdir -p $(RPM_INSTALL_ROOT)$(bindir)
-mkdir -p $(RPM_INSTALL_ROOT)/etc/ppp/rp-pppoe-gui
- $(install) -m 4755 -s pppoe-wrapper $(RPM_INSTALL_ROOT)$(sbindir)
+ $(install) -m 4755 pppoe-wrapper $(RPM_INSTALL_ROOT)$(sbindir)
$(install) -m 755 tkpppoe $(RPM_INSTALL_ROOT)$(bindir)
-mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man1
$(install) -m 644 pppoe-wrapper.1 $(RPM_INSTALL_ROOT)$(mandir)/man1
diff -Nru rp-pppoe-3.8.orig/src/configure.in rp-pppoe-3.8/src/configure.in
--- rp-pppoe-3.8.orig/src/configure.in 2006-04-02 17:29:42.000000000 +0300
+++ rp-pppoe-3.8/src/configure.in 2007-01-05 00:12:48.000000000 +0200
@@ -145,15 +145,15 @@
AC_MSG_CHECKING(for Linux 2.4.X kernel-mode PPPoE support)
AC_CACHE_VAL(ac_cv_linux_kernel_pppoe,[
if test "`uname -s`" = "Linux" ; then
-if test $cross_compiling = "no"; then
+dnl if test $cross_compiling = "no"; then
dnl Do a bunch of modprobes. Can't hurt; might help.
-modprobe ppp_generic > /dev/null 2>&1
-modprobe ppp_async > /dev/null 2>&1
-modprobe n_hdlc > /dev/null 2>&1
-modprobe ppp_synctty > /dev/null 2>&1
-modprobe pppoe > /dev/null 2>&1
-fi
+dnl modprobe ppp_generic > /dev/null 2>&1
+dnl modprobe ppp_async > /dev/null 2>&1
+dnl modprobe n_hdlc > /dev/null 2>&1
+dnl modprobe ppp_synctty > /dev/null 2>&1
+dnl modprobe pppoe > /dev/null 2>&1
+dnl fi
AC_TRY_RUN([#include <sys/socket.h>
#include <net/ethernet.h>
#include <linux/if.h>
@@ -180,7 +180,7 @@
dnl GCC warning level
if test "$GCC" = yes; then
- CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -ansi"
+ CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -D_GNU_SOURCE"
fi
dnl If we couldn't find pppd, die
diff -Nru rp-pppoe-3.8.orig/src/plugin.c rp-pppoe-3.8/src/plugin.c
--- rp-pppoe-3.8.orig/src/plugin.c 2006-04-02 17:29:42.000000000 +0300
+++ rp-pppoe-3.8/src/plugin.c 2007-01-05 00:08:41.000000000 +0200
@@ -27,7 +27,6 @@
static char const RCSID[] =
"$Id: rp-pppoe-3.8-configure.patch,v 1.1 2007/01/04 22:23:56 mrness Exp $";
-#define _GNU_SOURCE 1
#include "pppoe.h"
#include "pppd/pppd.h"
diff -Nru rp-pppoe-3.8.orig/src/relay.c rp-pppoe-3.8/src/relay.c
--- rp-pppoe-3.8.orig/src/relay.c 2006-04-02 17:29:42.000000000 +0300
+++ rp-pppoe-3.8/src/relay.c 2007-01-05 00:08:46.000000000 +0200
@@ -17,8 +17,6 @@
static char const RCSID[] =
"$Id: rp-pppoe-3.8-configure.patch,v 1.1 2007/01/04 22:23:56 mrness Exp $";
-#define _GNU_SOURCE 1 /* For SA_RESTART */
-
#include "relay.h"
#include <signal.h>
|
GitWeb
