diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | accel-pptpd/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/cpack.cmake | 8 | ||||
| -rw-r--r-- | cmake/debian.cmake | 5 | ||||
| -rw-r--r-- | cmake/debian/debian.cmake | 8 | ||||
| -rwxr-xr-x | cmake/debian/postinst | 5 | ||||
| -rwxr-xr-x | cmake/debian/preinst | 7 | ||||
| -rwxr-xr-x | contrib/debian/accel-pptp-init | 2 |
8 files changed, 10 insertions, 29 deletions
@@ -39,7 +39,7 @@ Compilation and instalation ----------- Make sure you have configured kernel headers in /usr/src/linux, or specify other location via KDIR. -1. cd /path/to/accel-pptp-1.3.0 +1. cd /path/to/accel-pptp-1.3.1 2. mkdir build 3. cd build 4. cmake [-DBUILD_DRIVER=FALSE] [-DKDIR=/usr/src/linux] [-DCMAKE_INSTALL_PREFIX=/usr/local] [-DCMAKE_BUILD_TYPE=Release] [-DLOG_PGSQL=FALSE] [-DSHAPER=FALSE] [-DRADIUS=TRUE] .. diff --git a/accel-pptpd/CMakeLists.txt b/accel-pptpd/CMakeLists.txt index 94f48af..c7ff3c5 100644 --- a/accel-pptpd/CMakeLists.txt +++ b/accel-pptpd/CMakeLists.txt @@ -23,7 +23,7 @@ IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) ) STRING(STRIP ${ACCEL_PPTP_VERSION} ACCEL_PPTP_VERSION) ELSE (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) - SET (ACCEL_PPTP_VERSION ${CMAKE_HOME_DIRECTORY}/"1.3.0") + SET (ACCEL_PPTP_VERSION 1.3.1) ENDIF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) ADD_DEFINITIONS(-DACCEL_PPTP_VERSION="${ACCEL_PPTP_VERSION}") diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake index 32845b4..b627b43 100644 --- a/cmake/cpack.cmake +++ b/cmake/cpack.cmake @@ -1,16 +1,13 @@ INCLUDE(InstallRequiredSystemLibraries) SET(CPACK_PACKAGE_VERSION_MAJOR "1") -SET(CPACK_PACKAGE_VERSION_MINOR "1") -SET(CPACK_PACKAGE_VERSION_PATCH "2") +SET(CPACK_PACKAGE_VERSION_MINOR "3") +SET(CPACK_PACKAGE_VERSION_PATCH "1") SET(CPACK_PACKAGE_NAME "accel-pptp") -#SET(CPACK_PACKAGE_VERSION "1.1.2") SET(CPACK_PACKAGE_CONTACT "Dmitry Kozlov <xeb@mail.ru>") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "High-performance multi-protocol tunneling server for Linux") - - 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") @@ -23,4 +20,3 @@ IF(CMAKE_BUILD_TYPE STREQUAL Debian) ENDIF(CMAKE_BUILD_TYPE STREQUAL Debian) INCLUDE(CPack) - diff --git a/cmake/debian.cmake b/cmake/debian.cmake deleted file mode 100644 index 2ff7b43..0000000 --- a/cmake/debian.cmake +++ /dev/null @@ -1,5 +0,0 @@ -SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE $ARCH) -SET(CPACK_DEBIAN_PACKAGE_DEPENDS libc6 libssl) -SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/preinst") - - diff --git a/cmake/debian/debian.cmake b/cmake/debian/debian.cmake index 5aa8502..8fe2be2 100644 --- a/cmake/debian/debian.cmake +++ b/cmake/debian/debian.cmake @@ -7,11 +7,11 @@ if (BUILD_DRIVER_ONLY) SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian-kmod/postinst") 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) - SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.7), libssl0.9.8 (>= 0.9.8)") - SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/preinst;${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/postinst") +else (BUILD_DRIVER_ONLY) + SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.7), libssl0.9.8 (>= 0.9.8), libpcre3 (>= 7.6)") + SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/cmake/debian/postinst") + INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/accel-pptpd/accel-pptp.conf DESTINATION etc RENAME accel-pptp.conf.dist) INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-pptp-init DESTINATION etc/init.d RENAME accel-pptp) INSTALL(FILES ${CMAKE_HOME_DIRECTORY}/contrib/debian/accel-pptp-default DESTINATION etc/default RENAME accel-pptp) endif (BUILD_DRIVER_ONLY) - diff --git a/cmake/debian/postinst b/cmake/debian/postinst index c85dc84..4d1b184 100755 --- a/cmake/debian/postinst +++ b/cmake/debian/postinst @@ -3,9 +3,6 @@ chmod +x /etc/init.d/accel-pptp mkdir /var/log/accel-pptp &> /dev/null - -if [ -f /tmp/__accel-pptp.conf ]; then - mv /tmp/__accel-pptp.conf /etc/accel-pptp.conf -fi +mkdir /var/run/accel-pptp &> /dev/null exit 0 diff --git a/cmake/debian/preinst b/cmake/debian/preinst deleted file mode 100755 index 765a4da..0000000 --- a/cmake/debian/preinst +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -if [ -f /etc/accel-pptp.conf ]; then - mv /etc/accel-pptp.conf /tmp/__accel-pptp.conf -fi - -exit 0 diff --git a/contrib/debian/accel-pptp-init b/contrib/debian/accel-pptp-init index e0583dd..fd48332 100755 --- a/contrib/debian/accel-pptp-init +++ b/contrib/debian/accel-pptp-init @@ -14,7 +14,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin . /lib/lsb/init-functions -if test -f /etс/default/accel-pptp; then +if test -f /etc/default/accel-pptp; then . /etc/default/accel-pptp fi |