diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2010-12-09 10:29:57 +0300 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2010-12-09 10:53:58 +0300 |
| commit | 8fb4294d45ccb5f9b1e28a45da239e93fd6f4f15 (patch) | |
| tree | 5de23f5ee2efb0063d1fbe5b27a5bda85be9b37c /cmake | |
| parent | 0ad1e3d8788abb4df937826a9bf4711f4ee69074 (diff) | |
| download | accel-ppp-8fb4294d45ccb5f9b1e28a45da239e93fd6f4f15.tar.gz accel-ppp-8fb4294d45ccb5f9b1e28a45da239e93fd6f4f15.zip | |
1.3.1 release
Diffstat (limited to 'cmake')
| -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 |
5 files changed, 7 insertions, 26 deletions
diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake index 32845b47..b627b43b 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 2ff7b43c..00000000 --- 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 5aa8502b..8fe2be28 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 c85dc84c..4d1b1846 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 765a4dab..00000000 --- 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 |