diff options
| -rw-r--r-- | accel-pppd/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/cpack.cmake | 2 | ||||
| -rwxr-xr-x | cmake/debian/postinst | 6 | ||||
| -rw-r--r-- | contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.3.3.ebuild (renamed from contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.1.1.ebuild) | 22 |
4 files changed, 20 insertions, 12 deletions
diff --git a/accel-pppd/CMakeLists.txt b/accel-pppd/CMakeLists.txt index f65e2e62..cc4e8c8b 100644 --- a/accel-pppd/CMakeLists.txt +++ b/accel-pppd/CMakeLists.txt @@ -24,7 +24,7 @@ IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) ) STRING(STRIP ${ACCEL_PPP_VERSION} ACCEL_PPP_VERSION) ELSE (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) - SET (ACCEL_PPP_VERSION 1.3.2) + SET (ACCEL_PPP_VERSION 1.3.3) ENDIF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git) ADD_DEFINITIONS(-DACCEL_PPP_VERSION="${ACCEL_PPP_VERSION}") diff --git a/cmake/cpack.cmake b/cmake/cpack.cmake index a59af722..a0bd929c 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 "2") +SET(CPACK_PACKAGE_VERSION_PATCH "3") SET(CPACK_PACKAGE_NAME "accel-ppp") SET(CPACK_PACKAGE_CONTACT "Dmitry Kozlov <xeb@mail.ru>") diff --git a/cmake/debian/postinst b/cmake/debian/postinst index 4d1b1846..a039b4f4 100755 --- a/cmake/debian/postinst +++ b/cmake/debian/postinst @@ -1,8 +1,8 @@ #!/bin/sh -chmod +x /etc/init.d/accel-pptp +chmod +x /etc/init.d/accel-ppp -mkdir /var/log/accel-pptp &> /dev/null -mkdir /var/run/accel-pptp &> /dev/null +mkdir /var/log/accel-ppp &> /dev/null +mkdir /var/run/accel-ppp &> /dev/null exit 0 diff --git a/contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.1.1.ebuild b/contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.3.3.ebuild index 8ee851f7..395dd6bd 100644 --- a/contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.1.1.ebuild +++ b/contrib/gentoo/net-dialup/accel-ppp/accel-ppp-1.3.3.ebuild @@ -5,20 +5,20 @@ EAPI=2 inherit eutils linux-mod cmake-utils -DESCRIPTION="PPtP/L2TP/PPPoE server for Linux" +DESCRIPTION="PPtP/L2TP/PPPoE Server for Linux" SRC_URI="http://sourceforge.net/projects/accel-ppp/files/accel-ppp/${P}.tar.bz2" HOMEPAGE="http://accel-ppp.sourceforge.net/" SLOT="0" LICENSE="GPL" KEYWORDS="~amd64 ~x86" -IUSE="postgres debug shaper pptp_driver" +IUSE="postgres debug shaper pptp_driver radius" DEPEND=">=sys-libs/glibc-2.8 dev-libs/openssl dev-libs/libaio - shaper? ( =dev-libs/libnl-2 ) - postgres? ( >=dev-db/postgresql-base-8.1 )" + shaper? ( =dev-libs/libnl-2* ) + postgres? ( dev-db/postgresql-base )" RDEPEND="$DEPEND pptp_driver? ( virtual/modutils )" @@ -32,6 +32,7 @@ MODULE_NAMES="pptp(extra:${S}/driver/)" src_prepare() { sed -i -e "/mkdir/d" "${S}/accel-pppd/CMakeLists.txt" + sed -i -e "/echo/d" "${S}/accel-pppd/CMakeLists.txt" sed -i -e "/INSTALL/d" "${S}/driver/CMakeLists.txt" } @@ -43,19 +44,26 @@ src_configure() { if use postgres; then mycmakeargs+=( "-DLOG_PGSQL=TRUE" ) fi - + if use shaper; then mycmakeargs+=( "-DSHAPER=TRUE" ) fi + if ! use radius; then + mycmakeargs+=( "-DRADIUS=FALSE" ) + fi + + mycmakeargs+=( "-DCMAKE_INSTALL_PREFIX=/usr" ) + cmake-utils_src_configure } src_compile() { cmake-utils_src_compile - + if use pptp_driver; then cd ${S}/driver + #convert_to_m Makefile linux-mod_src_compile || die "failed to build driver" fi } @@ -72,7 +80,7 @@ src_install() { newexe "${S}/contrib/gentoo/net-dialup/accel-ppp/files/accel-pppd-init" accel-pppd insinto /etc/conf.d - newins "${S}/contrib/gentoo/net-dialup/accel-ppp/files/pppd-confd" accel-pppd + newins "${S}/contrib/gentoo/net-dialup/accel-ppp/files/accel-pppd-confd" accel-pppd dodir /var/log/accel-ppp dodir /var/run/accel-ppp |