diff options
-rw-r--r-- | CMakeLists.txt | 19 | ||||
-rw-r--r-- | accel-pppd/accel-ppp.conf | 5 | ||||
-rw-r--r-- | cmake/cpack.cmake | 2 | ||||
-rw-r--r-- | drivers/ipoe/ipoe.c | 2 |
4 files changed, 12 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c41f0e02..9ea7f4f0 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 dee42f76..7186bff7 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 b36bf599..a7606e8c 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 57da2c26..51d53b16 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) |