[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ff4d1bb63e89141ec387111767ed7bb8200eee64)

Vlad Glagolev scm at sourcemage.org
Sun Nov 16 04:03:36 EST 2008


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 net/rp-pppoe/HISTORY       |    4 ++++
 net/rp-pppoe/PRE_BUILD     |   10 ++++++----
 net/rp-pppoe/headers.patch |   30 ++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 4 deletions(-)

New commits:
commit ff4d1bb63e89141ec387111767ed7bb8200eee64
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    rp-pppoe: fixed compilation with linux-headers >= 2.6.25

diff --git a/net/rp-pppoe/HISTORY b/net/rp-pppoe/HISTORY
index fbe1202..ac8d6e3 100644
--- a/net/rp-pppoe/HISTORY
+++ b/net/rp-pppoe/HISTORY
@@ -1,3 +1,7 @@
+2008-11-16 Vlad Glagolev <stealth at sourcemage.org>
+	* PRE_BUILD: fixed compilation with new headers
+	* headers.patch: added
+
 2008-06-30 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 3.10
 
diff --git a/net/rp-pppoe/PRE_BUILD b/net/rp-pppoe/PRE_BUILD
index aef3565..796df5b 100755
--- a/net/rp-pppoe/PRE_BUILD
+++ b/net/rp-pppoe/PRE_BUILD
@@ -1,10 +1,12 @@
 default_pre_build  &&
+cd "$SOURCE_DIRECTORY" &&
+
+# fixed compilation with linux-headers >=2.6.25
+patch -p0 < "$SPELL_DIRECTORY/headers.patch" &&
 
 #
 # Bug #10175
 # changes first blank line, so scripts work in simpleinit polluted invocations
 #
-pushd  $SOURCE_DIRECTORY                                                     &&
-sed -i -r '/^#\*\**\s*$/{ n;s/^([^#]|\s*$)/unset -f echo/ }' scripts/pppoe*  &&
-sedit  's:docdir=.*:docdir=@prefix@/share/doc/rp-pppoe:'  src/Makefile.in    &&
-popd
+sed -i -r '/^#\*\**\s*$/{ n;s/^([^#]|\s*$)/unset -f echo/ }' scripts/pppoe* &&
+sed -i 's:docdir=.*:docdir=@prefix@/share/doc/rp-pppoe:' src/Makefile.in
diff --git a/net/rp-pppoe/headers.patch b/net/rp-pppoe/headers.patch
new file mode 100644
index 0000000..70b40d2
--- /dev/null
+++ b/net/rp-pppoe/headers.patch
@@ -0,0 +1,30 @@
+--- src/pppoe.h.orig
++++ src/pppoe.h
+@@ -19,6 +19,13 @@
+ 
+ extern int IsSetID;
+ 
++/* Ugly header files on some Linux boxes... */
++#if defined(HAVE_LINUX_IF_H)
++#include <linux/if.h>
++#elif defined(HAVE_NET_IF_H)
++#include <net/if.h>
++#endif
++
+ #if defined(HAVE_NETPACKET_PACKET_H) || defined(HAVE_LINUX_IF_PACKET_H)
+ #define _POSIX_SOURCE 1 /* For sigaction defines */
+ #endif
+@@ -51,13 +58,6 @@
+ #include <sys/socket.h>
+ #endif
+ 
+-/* Ugly header files on some Linux boxes... */
+-#if defined(HAVE_LINUX_IF_H)
+-#include <linux/if.h>
+-#elif defined(HAVE_NET_IF_H)
+-#include <net/if.h>
+-#endif
+-
+ #ifdef HAVE_NET_IF_TYPES_H
+ #include <net/if_types.h>
+ #endif



More information about the SM-Commit mailing list