diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | accel-pppd/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | accel-pppd/radius/dm_coa.c | 2 | ||||
| -rw-r--r-- | accel-pppd/radius/packet.c | 2 | ||||
| -rw-r--r-- | accel-pppd/radius/radius.c | 2 | ||||
| -rw-r--r-- | accel-pppd/radius/req.c | 2 | ||||
| -rw-r--r-- | accel-pppd/radius/stat_accm.c | 2 | ||||
| -rw-r--r-- | cmake/cpack.cmake | 12 | ||||
| -rw-r--r-- | cmake/debian/debian.cmake | 3 | ||||
| -rwxr-xr-x | cmake/debian/postinst | 4 |
10 files changed, 20 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f61780a..40f2f1a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.6) cmake_policy(SET CMP0005 NEW) cmake_policy(SET CMP0003 OLD) -PROJECT (accel-pppd C) +PROJECT (accel-ppp C) include(cmake/cpack.cmake) diff --git a/accel-pppd/CMakeLists.txt b/accel-pppd/CMakeLists.txt index 7b53d92..c9d05f9 100644 --- a/accel-pppd/CMakeLists.txt +++ b/accel-pppd/CMakeLists.txt @@ -14,7 +14,7 @@ ENDIF (NOT HAVE_SSL) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -fvisibility=hidden -fno-strict-aliasing -D_GNU_SOURCE -DPTHREAD_SPINLOCK -fPIC") -IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) +IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT DEFINED IGNORE_GIT) EXECUTE_PROCESS( COMMAND git log COMMAND head -n1 @@ -23,9 +23,9 @@ IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) OUTPUT_VARIABLE ACCEL_PPP_VERSION ) STRING(STRIP ${ACCEL_PPP_VERSION} ACCEL_PPP_VERSION) -ELSE (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) - SET (ACCEL_PPP_VERSION 1.3.5) -ENDIF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) +ELSE (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT DEFINED IGNORE_GIT) + SET (ACCEL_PPP_VERSION 1.3.6) +ENDIF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT DEFINED IGNORE_GIT) ADD_DEFINITIONS(-DACCEL_PPP_VERSION="${ACCEL_PPP_VERSION}") diff --git a/accel-pppd/radius/dm_coa.c b/accel-pppd/radius/dm_coa.c index 005ecfd..481f2f5 100644 --- a/accel-pppd/radius/dm_coa.c +++ b/accel-pppd/radius/dm_coa.c @@ -294,4 +294,4 @@ static void init(void) triton_context_wakeup(&serv.ctx); } -DEFINE_INIT(101, init); +DEFINE_INIT(52, init); diff --git a/accel-pppd/radius/packet.c b/accel-pppd/radius/packet.c index db45c6a..892cc49 100644 --- a/accel-pppd/radius/packet.c +++ b/accel-pppd/radius/packet.c @@ -655,4 +655,4 @@ static void init(void) buf_pool = mempool_create(REQ_LENGTH_MAX); } -DEFINE_INIT(101, init); +DEFINE_INIT(50, init); diff --git a/accel-pppd/radius/radius.c b/accel-pppd/radius/radius.c index 2bf9bd4..d3f1248 100644 --- a/accel-pppd/radius/radius.c +++ b/accel-pppd/radius/radius.c @@ -579,4 +579,4 @@ static void radius_init(void) stat_interim_query_5m = stat_accm_create(5 * 60); } -DEFINE_INIT(100, radius_init); +DEFINE_INIT(51, radius_init); diff --git a/accel-pppd/radius/req.c b/accel-pppd/radius/req.c index 7464ac9..7b86503 100644 --- a/accel-pppd/radius/req.c +++ b/accel-pppd/radius/req.c @@ -277,4 +277,4 @@ static void req_init(void) } } -DEFINE_INIT(101, req_init); +DEFINE_INIT(50, req_init); diff --git a/accel-pppd/radius/stat_accm.c b/accel-pppd/radius/stat_accm.c index 53c23cb..3de86fc 100644 --- a/accel-pppd/radius/stat_accm.c +++ b/accel-pppd/radius/stat_accm.c @@ -95,4 +95,4 @@ static void init(void) item_pool = mempool_create(sizeof(struct item_t)); } -DEFINE_INIT(101, init); +DEFINE_INIT(50, init); diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake index 10b8e32..2406053 100644 --- a/cmake/cpack.cmake +++ b/cmake/cpack.cmake @@ -2,7 +2,7 @@ INCLUDE(InstallRequiredSystemLibraries) SET(CPACK_PACKAGE_VERSION_MAJOR "1") SET(CPACK_PACKAGE_VERSION_MINOR "3") -SET(CPACK_PACKAGE_VERSION_PATCH "5") +SET(CPACK_PACKAGE_VERSION_PATCH "6") SET(CPACK_PACKAGE_NAME "accel-ppp") SET(CPACK_PACKAGE_CONTACT "Dmitry Kozlov <xeb@mail.ru>") @@ -12,14 +12,14 @@ SET(CPACK_PACKAGE_VENDOR "Dmitry Kozlov") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING") -IF(CPACK_TYPE STREQUAL Debian) +IF(CPACK_TYPE STREQUAL Debian5) SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.7), libssl0.9.8 (>= 0.9.8), libpcre3 (>= 7.6)") INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake) -ENDIF(CPACK_TYPE STREQUAL Debian) +ENDIF(CPACK_TYPE STREQUAL Debian5) -IF(CPACK_TYPE STREQUAL Ubuntu) - SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.12.1), libssl0.9.8 (>= 0.9.8), libpcre3 (>= 8.02), libnl2 (>= 1.99)") +IF(CPACK_TYPE STREQUAL Debian6) + SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.11.2), libssl0.9.8 (>= 0.9.8), libpcre3 (>= 8.02), libnl2 (>= 1.99)") INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake) -ENDIF(CPACK_TYPE STREQUAL Ubuntu) +ENDIF(CPACK_TYPE STREQUAL Debian6) INCLUDE(CPack) diff --git a/cmake/debian/debian.cmake b/cmake/debian/debian.cmake index b7bd029..0fcc2d5 100644 --- a/cmake/debian/debian.cmake +++ b/cmake/debian/debian.cmake @@ -10,7 +10,7 @@ if (BUILD_DRIVER_ONLY) SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "accel-pptp kernel module") SET(CPACK_DEBIAN_PACKAGE_DEPENDS "") SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian-kmod/postinst") - INSTALL(DIRECTORY lib/modules/${DEBIAN_KDIR}/extra) + #INSTALL(DIRECTORY lib/modules/${DEBIAN_KDIR}/extra) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/driver/driver/pptp.ko DESTINATION lib/modules/${DEBIAN_KDIR}/extra) #SET(CPACK_DEBIAN_PACKAGE_DEPENDS "linux-image (= ${LINUX_IMAGE})") else (BUILD_DRIVER_ONLY) @@ -21,4 +21,5 @@ else (BUILD_DRIVER_ONLY) 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 (BUILD_DRIVER_ONLY) diff --git a/cmake/debian/postinst b/cmake/debian/postinst index a039b4f..5d516cd 100755 --- a/cmake/debian/postinst +++ b/cmake/debian/postinst @@ -2,7 +2,7 @@ chmod +x /etc/init.d/accel-ppp -mkdir /var/log/accel-ppp &> /dev/null -mkdir /var/run/accel-ppp &> /dev/null +mkdir /var/log/accel-ppp > /dev/null 2>&1 +mkdir /var/run/accel-ppp > /dev/null 2>&1 exit 0 |