From 904bc0f9eefffff153282277ea21729f46c1489d Mon Sep 17 00:00:00 2001
From: Dmitry Kozlov <xeb@mail.ru>
Date: Tue, 9 Dec 2014 10:05:46 +0300
Subject: [PATCH] 1.9.0 release * radius: major improvments * radius: use
 NAS-Port-Id in Access-Accept for interface renaming * radius: introduced
 "weight" and "backup" per-server options * radius: introduced
 "attr-tunnel-type" option * radius: introduced "max-fail" option * ipoe:
 introduced "ip-unnumbered" option * ipoe: improved vlan monitor * ipoe:
 introduced "attr-dhcp-lease-time" option * ipoe: send option 82 from DHCP
 request to radius * ipoe: fixed passing packets in 'redirect on reject' mode
 * ipoe: implemented handling relayed DHCP clients * ipoe: implemented "L4
 redirect on reject" for DHCP sessions * ipoe: implemneted ability to send L4
 redirect table/L4 redirect ipset via radius attributes * pppoe: introduced
 "called-sid" option * pppoe: improved AC-Cookie mechanism * ippool:
 introduced "shuffle" option * core: improved "single-session=replace"
 handling * shaper: apply rate multiplier to integer values * shaper:
 implemented fq_codel leaf qdisc * shaper: fixed passing quantum parameter to
 kernel * shaper: introduced "moderate-quantum" option * shaper: introduced
 "fwmark" option * ipv6: add support for prefixes greater than 64 * ppp: make
 LCP magic number negotiation not mandatory * ppp: implement address/control
 and protocol field compression * ppp: implemented delayed unit close via unit
 cache * pppd_compat: pass IPV6_PREFIX and IPV6_DELEGATED_PREFIX to
 ip-up/ip-down scripts * cli: introduced verbose option

---
 CMakeLists.txt            | 19 +++++++------------
 accel-pppd/accel-ppp.conf |  5 +++--
 cmake/cpack.cmake         |  2 +-
 drivers/ipoe/ipoe.c       |  2 +-
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c41f0e0..9ea7f4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT IGNORE_GIT)
 	)
 	STRING(STRIP ${ACCEL_PPP_VERSION} ACCEL_PPP_VERSION)
 ELSE (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT IGNORE_GIT)
-	SET (ACCEL_PPP_VERSION 1.8.0)
+	SET (ACCEL_PPP_VERSION 1.9.0)
 ENDIF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT IGNORE_GIT)
 
 ADD_DEFINITIONS(-DACCEL_PPP_VERSION="${ACCEL_PPP_VERSION}")
@@ -64,17 +64,12 @@ if (NOT BUILD_DRIVER_ONLY)
 	add_subdirectory(accel-cmd)
 endif (NOT BUILD_DRIVER_ONLY)
 
-if (BUILD_PPTP_DRIVER OR BUILD_DRIVER_ONLY)
-	if (BUILD_PPTP_DRIVER)
-		add_subdirectory(drivers/pptp)
-	endif (BUILD_PPTP_DRIVER)
-endif (BUILD_PPTP_DRIVER OR BUILD_DRIVER_ONLY)
+if (BUILD_PPTP_DRIVER)
+	add_subdirectory(drivers/pptp)
+endif (BUILD_PPTP_DRIVER)
 
-if (BUILD_IPOE_DRIVER OR BUILD_DRIVER_ONLY)
-	if (BUILD_IPOE_DRIVER)
-		add_subdirectory(drivers/ipoe)
-	endif (BUILD_IPOE_DRIVER)
-endif (BUILD_IPOE_DRIVER OR BUILD_DRIVER_ONLY)
+if (BUILD_IPOE_DRIVER)
+	add_subdirectory(drivers/ipoe)
+endif (BUILD_IPOE_DRIVER)
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
-
diff --git a/accel-pppd/accel-ppp.conf b/accel-pppd/accel-ppp.conf
index dee42f7..7186bff 100644
--- a/accel-pppd/accel-ppp.conf
+++ b/accel-pppd/accel-ppp.conf
@@ -15,12 +15,13 @@ auth_chap_md5
 auth_pap
 
 radius
+#chap-secrets
+
 ippool
-sigchld
+
 pppd_compat
 
 #shaper
-#chap-secrets
 #net-snmp
 #logwtmp
 #connlimit
diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake
index b36bf59..a7606e8 100644
--- a/cmake/cpack.cmake
+++ b/cmake/cpack.cmake
@@ -1,7 +1,7 @@
 INCLUDE(InstallRequiredSystemLibraries)
 
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
-SET(CPACK_PACKAGE_VERSION_MINOR "8")
+SET(CPACK_PACKAGE_VERSION_MINOR "9")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
 
 SET(CPACK_PACKAGE_NAME "accel-ppp")
diff --git a/drivers/ipoe/ipoe.c b/drivers/ipoe/ipoe.c
index 57da2c2..51d53b1 100644
--- a/drivers/ipoe/ipoe.c
+++ b/drivers/ipoe/ipoe.c
@@ -2121,7 +2121,7 @@ static int __init ipoe_init(void)
 {
 	int err, i;
 
-	printk("IPoE session driver v1.8.0.3\n");
+	printk("IPoE session driver v1.9.0\n");
 
 	/*err = register_pernet_device(&ipoe_net_ops);
 	if (err < 0)
-- 
GitLab