1.10.0 release

* ipoe: fixed mask calculation from ipaddr radius attribute
* ipoe: fixed authentication with chap-secrets
* ipoe: set Calling-Station-Id to client mac address for UP sessions
* ipoe: introduced idle-timeout and session-timeout options
* ipoe: for option password implemented special value csid
* ipoe: change l4-redirect-ipset/l4-redirect-table by CoA
* ipoe: don't block lua script if it raises error
* ipoe: implemented soft session termination
* ipoe: implemneted passing DHCP Option 82 to Radius as two separated attributes
* ipoe: changed behavior of agent-remote-id option
* ipoe: introduced option check-mac-change
* ipoe: disabled udp checksum validation
* ipoe: introduced 'calling-sid' option
* ipoe: send client IP address in Framed-IP-Address for UP sessions
* ipoe: implemented username=ifname for UP sessions
* ipoe: use single socket for arp processing
* ipoe: implemented dhcp option 58
* ipoe: for vlan name pattern implemented %P argument - VID of parent interface
* ipoe: implemented ability to use lua to make vlan name
* ipoe: show sessions: intoduced new field ipoe-type to display type of session (up or dhcp)
* ipoe: implemented interface renaming by NAS-Port-Id
* pppoe: use single discovery socket
* pppoe: check for tag length in print_packet function (fixes sigsegv)
* ppp: fixed send double ConfAck when LCP is started
* ppp: fix mtu/mru set if not negotiated on any end plus cleanup
* ppp: set mtu and mru after unit creation
* ppp: create ppp units after authentication
* ppp: set unit index from NAS_Port attribute if present
* cli: show sesisons: introduced rx-bytes,rx-pkts,tx-bytes,tx-pkts fields
* cli: show sesisons: introduced rx-bytes-raw,tx-bytes-raw fields
* session: implemented idle and timeout timers
* radius: override session's idle and timeout timers values by Idle-Timeout and Session-Timeout attributes
* shaper: fixed parsing ecn/noecn for fq_codel
* replace mktemp with mkstemp
* properly handle Cisco-AVPair
* consider only rx interface counter for idle timeout calculation
* net-snmp: export interface counters in the sessionTable

4 files changed, 17 insertions, 12 deletions

diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake
index a7606e8..5b180bf 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 "9")
+SET(CPACK_PACKAGE_VERSION_MINOR "10")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
 
 SET(CPACK_PACKAGE_NAME "accel-ppp")
@@ -27,4 +27,9 @@ IF(CPACK_TYPE STREQUAL Debian7)
 	INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
 ENDIF(CPACK_TYPE STREQUAL Debian7)
 
+IF(CPACK_TYPE STREQUAL Debian8)
+	SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.19), libssl1.0.0 (>= 1.0.1k), libpcre3 (>= 8.35)")
+	INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
+ENDIF(CPACK_TYPE STREQUAL Debian8)
+
 INCLUDE(CPack)
diff --git a/cmake/debian/debian.cmake b/cmake/debian/debian.cmake
index c02a4a4..858f053 100644
--- a/cmake/debian/debian.cmake
+++ b/cmake/debian/debian.cmake
@@ -27,13 +27,13 @@ if (BUILD_DRIVER_ONLY)
 else (BUILD_DRIVER_ONLY)
 	SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/conffiles")
 
-	if (CPACK_TYPE STREQUAL Debian7)
-		INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/accel-pppd/accel-ppp.conf DESTINATION /etc RENAME accel-ppp.conf.dist)
-		INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-ppp-init DESTINATION /etc/init.d RENAME accel-ppp)
-		INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-ppp-default DESTINATION /etc/default RENAME accel-ppp)
-	else (CPACK_TYPE STREQUAL Debian7)
+	if (CPACK_TYPE STREQUAL Debian6)
 		INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/accel-pppd/accel-ppp.conf DESTINATION ${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/DEB/${CPACK_PACKAGE_FILE_NAME}/etc RENAME accel-ppp.conf.dist)
 		INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-ppp-init DESTINATION ${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/DEB/${CPACK_PACKAGE_FILE_NAME}/etc/init.d RENAME accel-ppp)
 		INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-ppp-default DESTINATION ${CMAKE_BINARY_DIR}/_CPack_Packages/Linux/DEB/${CPACK_PACKAGE_FILE_NAME}/etc/default RENAME accel-ppp)
-	endif (CPACK_TYPE STREQUAL Debian7)
+	else (CPACK_TYPE STREQUAL Debian6)
+		INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/accel-pppd/accel-ppp.conf DESTINATION /etc RENAME accel-ppp.conf.dist)
+		INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-ppp-init DESTINATION /etc/init.d RENAME accel-ppp)
+		INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-ppp-default DESTINATION /etc/default RENAME accel-ppp)
+	endif (CPACK_TYPE STREQUAL Debian6)
 endif (BUILD_DRIVER_ONLY)
diff --git a/contrib/debian/accel-ppp-init b/contrib/debian/accel-ppp-init
index cc62525..a7e2bc0 100755
--- a/contrib/debian/accel-ppp-init
+++ b/contrib/debian/accel-ppp-init
@@ -2,8 +2,8 @@
 # /etc/init.d/accel-pppd: set up the accel-ppp server
 ### BEGIN INIT INFO
 # Provides:          accel-ppp
-# Required-Start:    $networking
-# Required-Stop:     $networking
+# Required-Start:    $remote_fs $syslog $network $time
+# Required-Stop:     $remote_fs $syslog $network
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 ### END INIT INFO
diff --git a/drivers/ipoe/CMakeLists.txt b/drivers/ipoe/CMakeLists.txt
index 14ac12e..6f4f043 100644
--- a/drivers/ipoe/CMakeLists.txt
+++ b/drivers/ipoe/CMakeLists.txt
@@ -14,6 +14,6 @@ ADD_CUSTOM_TARGET(ipoe_drv ALL
 	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)")
-
+IF (NOT DEFINED CPACK_TYPE)
+	INSTALL(CODE "EXECUTE_PROCESS(COMMAND make -C ${KDIR} M=${CMAKE_CURRENT_BINARY_DIR}/drivers/ipoe modules_install)")
+ENDIF()