Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b569bb3d2a975c3e8a74789ba9b39c4a5637a3cc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b569bb3d2a975c3e8a74789ba9b39c4a5637a3cc)
  • Date: Wed, 25 Mar 2009 14:57:26 -0500

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

net/rp-pppoe/HISTORY | 6 +++++-
net/rp-pppoe/PRE_BUILD | 3 ---
net/rp-pppoe/headers.patch | 30 ------------------------------
3 files changed, 5 insertions(+), 34 deletions(-)

New commits:
commit b569bb3d2a975c3e8a74789ba9b39c4a5637a3cc
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

rp-pppoe: fixed compilation with the newer headers

diff --git a/net/rp-pppoe/HISTORY b/net/rp-pppoe/HISTORY
index ac8d6e3..6bf40c2 100644
--- a/net/rp-pppoe/HISTORY
+++ b/net/rp-pppoe/HISTORY
@@ -1,5 +1,9 @@
+2009-03-25 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: fixed compilation with new headers (>=2.6.29)
+ * headers.patch: removed
+
2008-11-16 Vlad Glagolev <stealth AT sourcemage.org>
- * PRE_BUILD: fixed compilation with new headers
+ * PRE_BUILD: fixed compilation with new headers (>=2.6.25)
* headers.patch: added

2008-06-30 Vlad Glagolev <stealth AT sourcemage.org>
diff --git a/net/rp-pppoe/PRE_BUILD b/net/rp-pppoe/PRE_BUILD
index 796df5b..d491231 100755
--- a/net/rp-pppoe/PRE_BUILD
+++ b/net/rp-pppoe/PRE_BUILD
@@ -1,9 +1,6 @@
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
diff --git a/net/rp-pppoe/headers.patch b/net/rp-pppoe/headers.patch
deleted file mode 100644
index 70b40d2..0000000
--- a/net/rp-pppoe/headers.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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




Archive powered by MHonArc 2.6.24.

Top of Page