Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

Chronological Thread  
    < 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 (d0c1a2c7d11960450f4dbd2a8e6a516027ce5c6a)
  • Date: Tue, 12 Aug 2014 05:37:42 -0500
GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

net/accel-ppp/BUILD | 4 +++-
net/accel-ppp/CONFIGURE | 25 ++++++++++++++++++++-----
net/accel-ppp/DETAILS | 4 ++--
net/accel-ppp/HISTORY | 8 ++++++++
net/accel-ppp/PRE_BUILD | 1 +
net/accel-ppp/extra.patch | 13 ++++++-------
net/accel-ppp/ipoe.patch | 22 ++++++++++++++++++++++
7 files changed, 62 insertions(+), 15 deletions(-)

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

accel-ppp: => 1.8.0

diff --git a/net/accel-ppp/BUILD b/net/accel-ppp/BUILD
index 66407d6..95f0b44 100755
--- a/net/accel-ppp/BUILD
+++ b/net/accel-ppp/BUILD
@@ -1,3 +1,5 @@
-OPTS="$ACCEL_PPP_OPTS $OPTS" &&
+OPTS="-DLIB_SUFFIX=$INSTALL_ROOT \
+ $ACCEL_PPP_OPTS \
+ $OPTS" &&

cmake_build
diff --git a/net/accel-ppp/CONFIGURE b/net/accel-ppp/CONFIGURE
index 560278f..fa2a971 100755
--- a/net/accel-ppp/CONFIGURE
+++ b/net/accel-ppp/CONFIGURE
@@ -4,12 +4,27 @@ config_query_option ACCEL_PPP_OPTS "Build version with
debug information?" n \
"-DCMAKE_BUILD_TYPE=Debug" \
"-DCMAKE_BUILD_TYPE=Release" &&

+# backport old driver config options
+if list_find "$ACCEL_PPP_OPTS" "-DBUILD_DRIVER=TRUE"; then
+ list_remove "ACCEL_PPP_OPTS" "-DBUILD_DRIVER=TRUE" &&
+ list_add "ACCEL_PPP_OPTS" "-DBUILD_PPTP_DRIVER=TRUE"
+fi &&
+
+if list_find "$ACCEL_PPP_OPTS" "-DBUILD_DRIVER=FALSE"; then
+ list_remove "ACCEL_PPP_OPTS" "-DBUILD_DRIVER=FALSE" &&
+ list_add "ACCEL_PPP_OPTS" "-DBUILD_PPTP_DRIVER=FALSE"
+fi &&
+
if is_version_less $(get_kernel_version) 2.6.37; then
- message "${MESSAGE_COLOR}Kernel version lower than 2.6.37 detected,"
+ message "${MESSAGE_COLOR}Kernel version lower than 2.6.37 detected," &&
message "forcing build of non-native pptp module...${DEFAULT_COLOR}" &&
- list_add ACCEL_PPP_OPTS "-DBUILD_DRIVER=TRUE"
+ list_add ACCEL_PPP_OPTS "-DBUILD_PPTP_DRIVER=TRUE"
else
config_query_option ACCEL_PPP_OPTS "Build pptp kernel module (replaced by
native in new kernels)?" n \
- "-DBUILD_DRIVER=TRUE" \
- "-DBUILD_DRIVER=FALSE"
-fi
+ "-DBUILD_PPTP_DRIVER=TRUE" \
+ "-DBUILD_PPTP_DRIVER=FALSE"
+fi &&
+
+config_query_option ACCEL_PPP_OPTS "Build ipoe (IP over Ethernet) kernel
module?" n \
+ "-DBUILD_IPOE_DRIVER=TRUE" \
+ "-DBUILD_IPOE_DRIVER=FALSE"
diff --git a/net/accel-ppp/DETAILS b/net/accel-ppp/DETAILS
index 4348c3b..6fc11eb 100755
--- a/net/accel-ppp/DETAILS
+++ b/net/accel-ppp/DETAILS
@@ -1,8 +1,8 @@
SPELL=accel-ppp
- VERSION=1.7.3
+ VERSION=1.8.0
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:d15e1adc8cecab92a6259901d960e6e23bb7be0be257609b2e2bdeb69e3a0ea925d33c161afff1557fb0955928501c64eb0d5db4d4f744364979eef650b6fe56
+
SOURCE_HASH=sha512:d78c0ed4a3c51ae5f07c580b813694376fc42484a907d65164bb14409392365e2d8a876b16b15e55a7a7178cf9e573d42e578e6739f1fe9d62887e7316c816c0
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://accel-ppp.sourceforge.net/
ENTERED=20130521
diff --git a/net/accel-ppp/HISTORY b/net/accel-ppp/HISTORY
index 7ac0727..60963f1 100644
--- a/net/accel-ppp/HISTORY
+++ b/net/accel-ppp/HISTORY
@@ -1,3 +1,11 @@
+2014-08-12 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.0
+ * CONFIGURE: added ipoe configuration; backported old driver config
opt
+ * BUILD: use proper lib suffix
+ * PRE_BUILD: apply patch
+ * extra.patch: updated for new version
+ * ipoe.patch: added, to fix build of ipoe kernel module
+
2013-05-21 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS, {PRE_,}BUILD, INSTALL, CONFIGURE,
init.d/accel-ppp, extra.patch: spell created
diff --git a/net/accel-ppp/PRE_BUILD b/net/accel-ppp/PRE_BUILD
index 66fece5..76095fd 100755
--- a/net/accel-ppp/PRE_BUILD
+++ b/net/accel-ppp/PRE_BUILD
@@ -3,4 +3,5 @@ cd "$SOURCE_DIRECTORY" &&

sedit "s:/usr/local:$INSTALL_ROOT/usr:g" accel-pppd/accel-ppp.conf &&

+patch -p0 < "$SPELL_DIRECTORY/ipoe.patch" &&
patch -p0 < "$SPELL_DIRECTORY/extra.patch"
diff --git a/net/accel-ppp/extra.patch b/net/accel-ppp/extra.patch
index 842567b..f1988e2 100644
--- a/net/accel-ppp/extra.patch
+++ b/net/accel-ppp/extra.patch
@@ -1,15 +1,14 @@
---- accel-pppd/CMakeLists.txt.orig 2012-12-07 18:08:24.000000000 +0400
-+++ accel-pppd/CMakeLists.txt 2013-05-21 12:14:23.441874735 +0400
-@@ -100,12 +100,3 @@
+--- accel-pppd/CMakeLists.txt.orig 2014-08-12 12:07:10.582491202 +0400
++++ accel-pppd/CMakeLists.txt 2014-08-12 12:08:49.832174757 +0400
+@@ -107,11 +107,3 @@
)

INSTALL(FILES accel-ppp.conf.5 DESTINATION share/man/man5)
-
-IF (NOT DEFINED CPACK_TYPE)
-- INSTALL(FILES accel-ppp.conf DESTINATION /etc RENAME
accel-ppp.conf.dist)
+- INSTALL(FILES accel-ppp.conf DESTINATION ${CMAKE_FIND_ROOT_PATH}/etc
RENAME accel-ppp.conf.dist)
-
-- INSTALL(CODE "EXECUTE_PROCESS(COMMAND mkdir -p /var/log/accel-ppp)")
-- INSTALL(CODE "EXECUTE_PROCESS(COMMAND mkdir -p /var/run/accel-ppp)")
-- INSTALL(CODE "EXECUTE_PROCESS(COMMAND 'echo 0 >
/var/run/accel-ppp/seq')")
+- INSTALL(CODE "EXECUTE_PROCESS(COMMAND mkdir -p
${CMAKE_FIND_ROOT_PATH}/var/log/accel-ppp)")
+- INSTALL(CODE "EXECUTE_PROCESS(COMMAND mkdir -p
${CMAKE_FIND_ROOT_PATH}/var/lib/accel-ppp)")
-ENDIF (NOT DEFINED CPACK_TYPE)
-
diff --git a/net/accel-ppp/ipoe.patch b/net/accel-ppp/ipoe.patch
new file mode 100644
index 0000000..05b298d
--- /dev/null
+++ b/net/accel-ppp/ipoe.patch
@@ -0,0 +1,22 @@
+--- drivers/ipoe/ipoe.c.orig 2014-05-08 14:41:12.000000000 +0400
++++ drivers/ipoe/ipoe.c 2014-08-12 12:40:34.776058280 +0400
+@@ -395,7 +395,9 @@
+ if (!ses->peer_addr)
+ goto drop;
+
++#ifdef CONFIG_NET_CLS_ACT
+ skb->tc_verd = SET_TC_NCLS(0);
++#endif
+
+ noff = skb_network_offset(skb);
+
+--- drivers/ipoe/CMakeLists.txt.orig 2014-05-08 14:41:12.000000000 +0400
++++ drivers/ipoe/CMakeLists.txt 2014-08-12 13:36:56.475218335 +0400
+@@ -14,6 +14,4 @@
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/driver/ipoe.ko
+ )
+
+-
+-INSTALL(CODE "EXECUTE_PROCESS(COMMAND make -C ${KDIR}
M=${CMAKE_CURRENT_BINARY_DIR}/drivers/ipoe modules_install)")
+-
++INSTALL(CODE "EXECUTE_PROCESS(COMMAND make -C ${KDIR}
M=${CMAKE_CURRENT_BINARY_DIR}/driver modules_install)")


  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (d0c1a2c7d11960450f4dbd2a8e6a516027ce5c6a), Vlad Glagolev, 08/12/2014

Archive powered by MHonArc 2.6.24.

Top of Page