summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'cmake')
-rw-r--r--cmake/cpack.cmake50
-rw-r--r--cmake/debian/debian.cmake16
2 files changed, 15 insertions, 51 deletions
diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake
index 3dfc2750..b0c4823d 100644
--- a/cmake/cpack.cmake
+++ b/cmake/cpack.cmake
@@ -1,6 +1,6 @@
INCLUDE(InstallRequiredSystemLibraries)
-string(REPLACE "." ";" VERSION_LIST ${ACCEL_PPP_VERSION})
+string(REPLACE "." ";" VERSION_LIST "${ACCEL_PPP_VERSION}")
# Verify if VERSION_LIST has 3 elements
# If not assign dummy variables
@@ -17,76 +17,56 @@ SET(CPACK_PACKAGE_CONTACT "Dmitry Kozlov <xeb@mail.ru>")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "PPtP/L2TP/PPPoE/SSTP server for Linux")
SET(CPACK_PACKAGE_VENDOR "Dmitry Kozlov")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
-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 Debian5)
-
-IF(CPACK_TYPE STREQUAL Debian6)
- SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.11.2), libssl0.9.8 (>= 0.9.8), libpcre3 (>= 8.02)")
- INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
-ENDIF(CPACK_TYPE STREQUAL Debian6)
-
-IF(CPACK_TYPE STREQUAL Debian7)
- SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.13), libssl1.0.0 (>= 1.0.0), libpcre3 (>= 8.30)")
- 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)
-
IF(CPACK_TYPE STREQUAL Debian9)
- SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.24), libssl1.0.2 (>= 1.0.2l), libpcre3 (>= 8.39)")
+ SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.24), libssl1.0.2 (>= 1.0.2l), libpcre2-8-0 (>= 10.22)")
INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
ENDIF(CPACK_TYPE STREQUAL Debian9)
IF(CPACK_TYPE STREQUAL Debian10)
- SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.28), libssl1.1 (>= 1.1.1c), libpcre3 (>= 8.39)")
+ SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.28), libssl1.1 (>= 1.1.1c), libpcre2-8-0 (>= 10.32)")
INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
ENDIF(CPACK_TYPE STREQUAL Debian10)
IF(CPACK_TYPE STREQUAL Debian11)
- SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.31), libssl1.1 (>= 1.1.1k), libpcre3 (>= 8.39)")
+ SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.31), libssl1.1 (>= 1.1.1k), libpcre2-8-0 (>= 10.36)")
INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
ENDIF(CPACK_TYPE STREQUAL Debian11)
IF(CPACK_TYPE STREQUAL Debian12)
- SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.34), libssl3 (>= 3.0.5), libpcre3 (>= 8.39)")
+ SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.34), libssl3 (>= 3.0.5), libpcre2-8-0 (>= 10.42)")
INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
ENDIF(CPACK_TYPE STREQUAL Debian12)
IF(CPACK_TYPE STREQUAL Debian13)
- SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.37), libssl3 (>= 3.0.9), libpcre3 (>= 8.39)")
+ SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.37), libssl3 (>= 3.0.9), libpcre2-8-0 (>= 10.42)")
INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
ENDIF(CPACK_TYPE STREQUAL Debian13)
IF(CPACK_TYPE STREQUAL Ubuntu16)
- SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.23), libssl1.0.0 (>= 1.0.0), libpcre3 (>= 8.39)")
+ SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.23), libssl1.0.0 (>= 1.0.0), libpcre2-8-0 (>= 10.21)")
INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
ENDIF(CPACK_TYPE STREQUAL Ubuntu16)
IF(CPACK_TYPE STREQUAL Ubuntu18)
- SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.24), libssl1.0.0 (>= 1.0.2n), libpcre3 (>= 8.39)")
+ SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.24), libssl1.0.0 (>= 1.0.2n), libpcre2-8-0 (>= 10.31)")
INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
ENDIF(CPACK_TYPE STREQUAL Ubuntu18)
IF(CPACK_TYPE STREQUAL Ubuntu20)
- SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.31), libssl1.1 (>= 1.1.1d), libpcre3 (>= 8.39)")
+ SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.31), libssl1.1 (>= 1.1.1d), libpcre2-8-0 (>= 10.34)")
INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
ENDIF(CPACK_TYPE STREQUAL Ubuntu20)
IF(CPACK_TYPE STREQUAL Ubuntu22)
- SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.35), libssl3 (>= 3.0.2), libpcre3 (>= 8.39)")
+ SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.35), libssl3 (>= 3.0.2), libpcre2-8-0 (>= 10.39)")
INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
ENDIF(CPACK_TYPE STREQUAL Ubuntu22)
IF(CPACK_TYPE STREQUAL Ubuntu24)
- SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.35), libssl3 (>= 3.0.2), libpcre3 (>= 8.39)")
+ SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.35), libssl3 (>= 3.0.2), libpcre2-8-0 (>= 10.42)")
INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/debian/debian.cmake)
ENDIF(CPACK_TYPE STREQUAL Ubuntu24)
@@ -94,7 +74,7 @@ IF(CPACK_TYPE STREQUAL Centos7)
SET(CPACK_RPM_PACKAGE_LICENSE "GPL")
SET(CPACK_RPM_PACKAGE_URL "http://accel-ppp.org")
SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/sbin")
- SET(CPACK_RPM_PACKAGE_REQUIRES "glibc >= 2.17, openssl-libs >= 1.0.2k, pcre >= 8.32")
+ SET(CPACK_RPM_PACKAGE_REQUIRES "glibc >= 2.17, openssl-libs >= 1.0.2k, pcre2 >= 10.23")
INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/centos/centos.cmake)
ENDIF()
@@ -102,7 +82,7 @@ IF(CPACK_TYPE STREQUAL Centos8)
SET(CPACK_RPM_PACKAGE_LICENSE "GPL")
SET(CPACK_RPM_PACKAGE_URL "http://accel-ppp.org")
SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/sbin")
- SET(CPACK_RPM_PACKAGE_REQUIRES "glibc >= 2.28, openssl-libs >= 1.1.1, pcre >= 8.42")
+ SET(CPACK_RPM_PACKAGE_REQUIRES "glibc >= 2.28, openssl-libs >= 1.1.1, pcre2 >= 10.32")
INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/centos/centos.cmake)
ENDIF()
@@ -110,7 +90,7 @@ IF(CPACK_TYPE STREQUAL Centos9)
SET(CPACK_RPM_PACKAGE_LICENSE "GPL")
SET(CPACK_RPM_PACKAGE_URL "http://accel-ppp.org")
SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/sbin")
- SET(CPACK_RPM_PACKAGE_REQUIRES "glibc >= 2.34, openssl-libs >= 3.0.1, pcre >= 8.44")
+ SET(CPACK_RPM_PACKAGE_REQUIRES "glibc >= 2.34, openssl-libs >= 3.0.1, pcre2 >= 10.40")
INCLUDE(${CMAKE_HOME_DIRECTORY}/cmake/centos/centos.cmake)
ENDIF()
diff --git a/cmake/debian/debian.cmake b/cmake/debian/debian.cmake
index 8db274a6..89ab9993 100644
--- a/cmake/debian/debian.cmake
+++ b/cmake/debian/debian.cmake
@@ -9,22 +9,6 @@ if (NOT DEFINED MODULES_KDIR)
)
endif()
-if (BUILD_PPTP_DRIVER)
- if (BUILD_DRIVER_ONLY)
- SET(CPACK_PACKAGE_VERSION_MAJOR "0")
- SET(CPACK_PACKAGE_VERSION_MINOR "8")
- SET(CPACK_PACKAGE_VERSION_PATCH "5")
- SET(CPACK_PACKAGING_INSTALL_PREFIX "/")
- SET(CPACK_PACKAGE_NAME "accel-pptp-kmod")
- 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")
- endif ()
- #INSTALL(DIRECTORY lib/modules/${DEBIAN_KDIR}/extra)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/driver/driver/pptp.ko DESTINATION /lib/modules/${MODULES_KDIR}/extra)
- #SET(CPACK_DEBIAN_PACKAGE_DEPENDS "linux-image (= ${LINUX_IMAGE})")
-endif (BUILD_PPTP_DRIVER)
-
if (BUILD_IPOE_DRIVER)
if (BUILD_DRIVER_ONLY)
SET(CPACK_PACKAGING_INSTALL_PREFIX "/")
generated by cgit v1.2.3 (git 2.39.1) at 2026-09-21 09:31:40 +0000