summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorDmitry Kozlov <xeb@mail.ru>2015-12-04 16:07:24 +0300
committerDmitry Kozlov <xeb@mail.ru>2015-12-04 16:23:39 +0300
commit303ce910ee3f7ce1aa60a30420bd543d03b8e5d5 (patch)
tree63df4df987664a3db902713c6b213353d6a62c5b /cmake
parent5d8e7d0fbce773249b8c158509fe55f3c7fae422 (diff)
downloadaccel-ppp-303ce910ee3f7ce1aa60a30420bd543d03b8e5d5.tar.gz
accel-ppp-303ce910ee3f7ce1aa60a30420bd543d03b8e5d5.zip
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
Diffstat (limited to 'cmake')
-rw-r--r--cmake/cpack.cmake7
-rw-r--r--cmake/debian/debian.cmake12
2 files changed, 12 insertions, 7 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)