[gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2015-12-07  9:27 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2015-12-07  9:27 UTC (permalink / raw
  To: gentoo-commits

commit:     2f6251cbebab6b635d579260ff3a07e6fda8a06b
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 09:27:23 2015 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 09:27:49 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f6251cb

net-dialup/accel-ppp: version bump

Package-Manager: portage-2.2.23

 net-dialup/accel-ppp/Manifest                |  1 +
 net-dialup/accel-ppp/accel-ppp-1.10.0.ebuild | 86 ++++++++++++++++++++++++++++
 net-dialup/accel-ppp/metadata.xml            |  1 +
 3 files changed, 88 insertions(+)

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 89bbc92..d1570a7 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1 +1,2 @@
+DIST accel-ppp-1.10.0.tar.bz2 1585702 SHA256 c990cc195e286d3c0f8063881489608e14f3f826d25ca4c0a4812c261fd9ef14 SHA512 140ff3cf9fb684624c1419946010701d902125ba02a1e931fd5a0083d706ffd32a88d491400e82661a17bd4aacfa07ad620acea0cf4f49816c1060ae184f1084 WHIRLPOOL 749b821e1fc3189f4e2a6979e3ee6e00890a3b72311502a42142f75d5f5afe7c913d2ac7b7bcff39de2b4e3c451c783d42a04be72fe37bec8803f8159845f4e2
 DIST accel-ppp-1.8.0.tar.bz2 1566401 SHA256 a90becf1d8a579b55a95d927a35f6f83ce9a3ee1f6a6d67128a29b2fa4fd71b7 SHA512 d78c0ed4a3c51ae5f07c580b813694376fc42484a907d65164bb14409392365e2d8a876b16b15e55a7a7178cf9e573d42e578e6739f1fe9d62887e7316c816c0 WHIRLPOOL cfeb6807e2b8734a263ad3450dce07859e12783015d6f315e09d6868c06dc8680da55df8e06a4b5ddb3c014f8423ca0b08b877f465a2649167955b7c4790f648

diff --git a/net-dialup/accel-ppp/accel-ppp-1.10.0.ebuild b/net-dialup/accel-ppp/accel-ppp-1.10.0.ebuild
new file mode 100644
index 0000000..99772b5
--- /dev/null
+++ b/net-dialup/accel-ppp/accel-ppp-1.10.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils linux-info linux-mod multilib
+
+DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
+HOMEPAGE="http://accel-ppp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc ipoe postgres radius shaper snmp valgrind"
+
+RDEPEND="postgres? ( dev-db/postgresql:* )
+	snmp? ( net-analyzer/net-snmp )
+	dev-libs/libpcre
+	dev-libs/openssl:0"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+PDEPEND="net-dialup/ppp-scripts"
+
+DOCS=( README )
+
+CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
+
+REQUIRED_USE="valgrind? ( debug )"
+
+pkg_setup() {
+	if use ipoe; then
+		linux-mod_pkg_setup
+		set_arch_to_kernel
+	else
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i  -e "/mkdir/d" \
+		-e "/echo/d" \
+		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
+
+	epatch_user
+}
+
+src_configure() {
+	local libdir="$(get_libdir)"
+	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
+	local mycmakeargs=(
+		-DLIB_PATH_SUFFIX="${libdir#lib}"
+		-DBUILD_PPTP_DRIVER=FALSE
+		-DCRYPTO=OPENSSL
+		$(cmake-utils_use debug MEMDEBUG)
+		$(cmake-utils_use ipoe BUILD_IPOE_DRIVER)
+		$(cmake-utils_use postgres LOG_PGSQL)
+		$(cmake-utils_use radius RADIUS)
+		$(cmake-utils_use shaper SHAPER)
+		$(cmake-utils_use snmp NETSNMP)
+		$(cmake-utils_use valgrind VALGRIND)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use doc && dodoc -r rfc
+
+	if use snmp; then
+		insinto /usr/share/snmp/mibs
+		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
+
+	dodir /var/log/accel-ppp
+}

diff --git a/net-dialup/accel-ppp/metadata.xml b/net-dialup/accel-ppp/metadata.xml
index 6890878..3b02d59 100644
--- a/net-dialup/accel-ppp/metadata.xml
+++ b/net-dialup/accel-ppp/metadata.xml
@@ -7,6 +7,7 @@
 		<name>Sergey Popov</name>
 	</maintainer>
 	<use>
+		<flag name="ipoe">Build IPoE kernel module</flag>
 		<flag name="shaper">Support for traffic shaping</flag>
 		<flag name="valgrind">Compile in valgrind hints</flag>
 	</use>


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2016-03-23 10:32 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2016-03-23 10:32 UTC (permalink / raw
  To: gentoo-commits

commit:     fb6b6a4db1dd93268277f890bbb28b6abf92cf3c
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 10:32:34 2016 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 10:32:34 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb6b6a4d

net-dialup/accel-ppp: remove old vulnerable versions

Gentoo-Bug: 574414

Package-Manager: portage-2.2.28

 net-dialup/accel-ppp/Manifest                  |  2 -
 net-dialup/accel-ppp/accel-ppp-1.10.0.ebuild   | 86 --------------------------
 net-dialup/accel-ppp/accel-ppp-1.8.0-r1.ebuild | 71 ---------------------
 3 files changed, 159 deletions(-)

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 57b222e..697888a 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1,3 +1 @@
-DIST accel-ppp-1.10.0.tar.bz2 1585702 SHA256 c990cc195e286d3c0f8063881489608e14f3f826d25ca4c0a4812c261fd9ef14 SHA512 140ff3cf9fb684624c1419946010701d902125ba02a1e931fd5a0083d706ffd32a88d491400e82661a17bd4aacfa07ad620acea0cf4f49816c1060ae184f1084 WHIRLPOOL 749b821e1fc3189f4e2a6979e3ee6e00890a3b72311502a42142f75d5f5afe7c913d2ac7b7bcff39de2b4e3c451c783d42a04be72fe37bec8803f8159845f4e2
 DIST accel-ppp-1.10.1.tar.bz2 1587117 SHA256 2333897563925d719b1b5e6fd05238fe769b967a9bac73d3b1daa1b8ff274b7d SHA512 43dc01992a8298970911d202736af0dcd3b46744d18ecce5d4987bab8d312cfb75d5a72a6f5c1b91ad7943c2c66371063402688cce57106db116b407205f142b WHIRLPOOL 0ce66a3a0daf6f4902baf7bf8ace545c1a2e8e9105bb62dc7dad96d3da131a215da17d6e722488fc9388acfb4a7f028bf9904e62c8c7a43fa7d2cb3aa9a7ca81
-DIST accel-ppp-1.8.0.tar.bz2 1566401 SHA256 a90becf1d8a579b55a95d927a35f6f83ce9a3ee1f6a6d67128a29b2fa4fd71b7 SHA512 d78c0ed4a3c51ae5f07c580b813694376fc42484a907d65164bb14409392365e2d8a876b16b15e55a7a7178cf9e573d42e578e6739f1fe9d62887e7316c816c0 WHIRLPOOL cfeb6807e2b8734a263ad3450dce07859e12783015d6f315e09d6868c06dc8680da55df8e06a4b5ddb3c014f8423ca0b08b877f465a2649167955b7c4790f648

diff --git a/net-dialup/accel-ppp/accel-ppp-1.10.0.ebuild b/net-dialup/accel-ppp/accel-ppp-1.10.0.ebuild
deleted file mode 100644
index 99772b5..0000000
--- a/net-dialup/accel-ppp/accel-ppp-1.10.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils linux-info linux-mod multilib
-
-DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="http://accel-ppp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc ipoe postgres radius shaper snmp valgrind"
-
-RDEPEND="postgres? ( dev-db/postgresql:* )
-	snmp? ( net-analyzer/net-snmp )
-	dev-libs/libpcre
-	dev-libs/openssl:0"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-PDEPEND="net-dialup/ppp-scripts"
-
-DOCS=( README )
-
-CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
-
-REQUIRED_USE="valgrind? ( debug )"
-
-pkg_setup() {
-	if use ipoe; then
-		linux-mod_pkg_setup
-		set_arch_to_kernel
-	else
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i  -e "/mkdir/d" \
-		-e "/echo/d" \
-		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
-
-	epatch_user
-}
-
-src_configure() {
-	local libdir="$(get_libdir)"
-	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
-	local mycmakeargs=(
-		-DLIB_PATH_SUFFIX="${libdir#lib}"
-		-DBUILD_PPTP_DRIVER=FALSE
-		-DCRYPTO=OPENSSL
-		$(cmake-utils_use debug MEMDEBUG)
-		$(cmake-utils_use ipoe BUILD_IPOE_DRIVER)
-		$(cmake-utils_use postgres LOG_PGSQL)
-		$(cmake-utils_use radius RADIUS)
-		$(cmake-utils_use shaper SHAPER)
-		$(cmake-utils_use snmp NETSNMP)
-		$(cmake-utils_use valgrind VALGRIND)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && dodoc -r rfc
-
-	if use snmp; then
-		insinto /usr/share/snmp/mibs
-		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
-
-	dodir /var/log/accel-ppp
-}

diff --git a/net-dialup/accel-ppp/accel-ppp-1.8.0-r1.ebuild b/net-dialup/accel-ppp/accel-ppp-1.8.0-r1.ebuild
deleted file mode 100644
index 0a6c68d..0000000
--- a/net-dialup/accel-ppp/accel-ppp-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils linux-info multilib
-
-DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="http://accel-ppp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc postgres radius shaper snmp valgrind"
-
-RDEPEND="postgres? ( dev-db/postgresql )
-	snmp? ( net-analyzer/net-snmp )
-	dev-libs/libpcre
-	dev-libs/openssl:0"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-PDEPEND="net-dialup/ppp-scripts"
-
-DOCS=( README )
-CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
-
-src_prepare() {
-	sed -i  -e "/mkdir/d" \
-		-e "/echo/d" \
-		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
-
-	epatch_user
-}
-
-src_configure() {
-	local libdir="$(get_libdir)"
-	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
-	# IPoE driver does not build properly :-(
-	local mycmakeargs=(
-		-DLIB_PATH_SUFFIX="${libdir#lib}"
-		-DBUILD_PPTP_DRIVER=FALSE
-		-DBUILD_IPOE_DRIVER=FALSE
-		-DCRYPTO=OPENSSL
-		$(cmake-utils_use debug MEMDEBUG)
-		$(cmake-utils_use postgres LOG_PGSQL)
-		$(cmake-utils_use radius RADIUS)
-		$(cmake-utils_use shaper SHAPER)
-		$(cmake-utils_use snmp NETSNMP)
-		$(cmake-utils_use valgrind VALGRIND)
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use doc && dodoc -r rfc
-
-	if use snmp; then
-		insinto /usr/share/snmp/mibs
-		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
-
-	dodir /var/log/accel-ppp
-}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2016-05-05 15:16 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2016-05-05 15:16 UTC (permalink / raw
  To: gentoo-commits

commit:     36f95f1a89199d80adc56e0588d9dfbdb52de00a
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 15:11:37 2016 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Thu May  5 15:16:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36f95f1a

net-dialup/accel-ppp: version bump to 1.10.2

Properly install ipoe kernel module,
add necessary LDFLAGS to properly handle lazy linking.
Drop old version.

Reported-by: Christian Roessner <info <AT> roessner-net.com>
Gentoo-Bug: 549918

Package-Manager: portage-2.2.28

 net-dialup/accel-ppp/Manifest                               |  1 +
 .../{accel-ppp-1.10.1.ebuild => accel-ppp-1.10.2.ebuild}    | 13 +++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 697888a..fe9feea 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1 +1,2 @@
 DIST accel-ppp-1.10.1.tar.bz2 1587117 SHA256 2333897563925d719b1b5e6fd05238fe769b967a9bac73d3b1daa1b8ff274b7d SHA512 43dc01992a8298970911d202736af0dcd3b46744d18ecce5d4987bab8d312cfb75d5a72a6f5c1b91ad7943c2c66371063402688cce57106db116b407205f142b WHIRLPOOL 0ce66a3a0daf6f4902baf7bf8ace545c1a2e8e9105bb62dc7dad96d3da131a215da17d6e722488fc9388acfb4a7f028bf9904e62c8c7a43fa7d2cb3aa9a7ca81
+DIST accel-ppp-1.10.2.tar.bz2 1587850 SHA256 ffd339ff1589c8b9e306028844e7156ee6d2b019b1219f1b8b62314c835e8a7d SHA512 6cc1d5f0786196fbbebc0f04830f780c1f2d2995bc7fb6384729b64820c74d0fb53f052bdaa71fa3b6165ab13cd7c137bfdc3ef717f6e866a329b893d7375ce1 WHIRLPOOL 050a5fe5eafba1e90f7b200a476e2edfbb878039a8e4ac5d06fdc195ad72720d7382267b7181e2a8ec47c2db8da4664b1315dff75ffcbc087c0e7e035577862c

diff --git a/net-dialup/accel-ppp/accel-ppp-1.10.1.ebuild b/net-dialup/accel-ppp/accel-ppp-1.10.2.ebuild
similarity index 83%
rename from net-dialup/accel-ppp/accel-ppp-1.10.1.ebuild
rename to net-dialup/accel-ppp/accel-ppp-1.10.2.ebuild
index 4ea714a..e711ab2 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.10.1.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.10.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 
-inherit cmake-utils linux-info linux-mod
+inherit cmake-utils flag-o-matic linux-info linux-mod
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
 HOMEPAGE="http://accel-ppp.sourceforge.net/"
@@ -42,8 +42,12 @@ src_prepare() {
 	sed -i  -e "/mkdir/d" \
 		-e "/echo/d" \
 		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
+	sed -i -e '/modules_install/d' drivers/ipoe/CMakeLists.txt || die 'sed on drivers/ipoe/CMakeLists.txt failed'
 
-	eapply_user
+	# Bug #549918
+	append-ldflags -Wl,-z,lazy
+
+	cmake-utils_src_prepare
 }
 
 src_configure() {
@@ -69,6 +73,11 @@ src_compile() {
 }
 
 src_install() {
+	if use ipoe; then
+		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver)"
+		linux-mod_src_install
+	fi
+
 	cmake-utils_src_install
 
 	use doc && dodoc -r rfc


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2016-05-05 15:16 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2016-05-05 15:16 UTC (permalink / raw
  To: gentoo-commits

commit:     939d514e835ffd0f82ab4727407368df872d7025
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 15:14:26 2016 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Thu May  5 15:16:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=939d514e

net-dialup/accel-ppp: add live ebuilds for 1.10 and master branches

Package-Manager: portage-2.2.28

 net-dialup/accel-ppp/Manifest                   |   1 -
 net-dialup/accel-ppp/accel-ppp-1.10.9999.ebuild |  96 +++++++++++++++++++++++
 net-dialup/accel-ppp/accel-ppp-9999.ebuild      | 100 ++++++++++++++++++++++++
 3 files changed, 196 insertions(+), 1 deletion(-)

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index fe9feea..087a6ea 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1,2 +1 @@
-DIST accel-ppp-1.10.1.tar.bz2 1587117 SHA256 2333897563925d719b1b5e6fd05238fe769b967a9bac73d3b1daa1b8ff274b7d SHA512 43dc01992a8298970911d202736af0dcd3b46744d18ecce5d4987bab8d312cfb75d5a72a6f5c1b91ad7943c2c66371063402688cce57106db116b407205f142b WHIRLPOOL 0ce66a3a0daf6f4902baf7bf8ace545c1a2e8e9105bb62dc7dad96d3da131a215da17d6e722488fc9388acfb4a7f028bf9904e62c8c7a43fa7d2cb3aa9a7ca81
 DIST accel-ppp-1.10.2.tar.bz2 1587850 SHA256 ffd339ff1589c8b9e306028844e7156ee6d2b019b1219f1b8b62314c835e8a7d SHA512 6cc1d5f0786196fbbebc0f04830f780c1f2d2995bc7fb6384729b64820c74d0fb53f052bdaa71fa3b6165ab13cd7c137bfdc3ef717f6e866a329b893d7375ce1 WHIRLPOOL 050a5fe5eafba1e90f7b200a476e2edfbb878039a8e4ac5d06fdc195ad72720d7382267b7181e2a8ec47c2db8da4664b1315dff75ffcbc087c0e7e035577862c

diff --git a/net-dialup/accel-ppp/accel-ppp-1.10.9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.10.9999.ebuild
new file mode 100644
index 0000000..1f8c989
--- /dev/null
+++ b/net-dialup/accel-ppp/accel-ppp-1.10.9999.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="git://git.code.sf.net/p/accel-ppp/code"
+EGIT_BRANCH="1.10"
+inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod
+
+DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
+HOMEPAGE="http://accel-ppp.sourceforge.net/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug doc ipoe postgres radius shaper snmp valgrind"
+
+RDEPEND="postgres? ( dev-db/postgresql:* )
+	snmp? ( net-analyzer/net-snmp )
+	dev-libs/libpcre
+	dev-libs/openssl:0"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+PDEPEND="net-dialup/ppp-scripts"
+
+DOCS=( README )
+
+CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
+
+REQUIRED_USE="valgrind? ( debug )"
+
+pkg_setup() {
+	if use ipoe; then
+		linux-mod_pkg_setup
+		set_arch_to_kernel
+	else
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i  -e "/mkdir/d" \
+		-e "/echo/d" \
+		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
+	sed -i -e '/modules_install/d' drivers/ipoe/CMakeLists.txt || die 'sed on drivers/ipoe/CMakeLists.txt failed'
+
+	# Bug #549918
+	append-ldflags -Wl,-z,lazy
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local libdir="$(get_libdir)"
+	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
+	local mycmakeargs=(
+		-DLIB_PATH_SUFFIX="${libdir#lib}"
+		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
+		-DBUILD_PPTP_DRIVER=no
+		-DCRYPTO=OPENSSL
+		-DLOG_PGSQL="$(usex postgres)"
+		-DMEMDEBUG="$(usex debug)"
+		-DNETSNMP="$(usex snmp)"
+		-DRADIUS="$(usex radius)"
+		-DSHAPER="$(usex shaper)"
+		-DVALGRIND="$(usex valgrind)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	if use ipoe; then
+		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver)"
+		linux-mod_src_install
+	fi
+
+	cmake-utils_src_install
+
+	use doc && dodoc -r rfc
+
+	if use snmp; then
+		insinto /usr/share/snmp/mibs
+		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
+
+	dodir /var/log/accel-ppp
+}

diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
new file mode 100644
index 0000000..c8b5751
--- /dev/null
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="git://git.code.sf.net/p/accel-ppp/code"
+inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod
+
+DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
+HOMEPAGE="http://accel-ppp.sourceforge.net/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug doc ipoe postgres radius shaper snmp valgrind"
+
+RDEPEND="postgres? ( dev-db/postgresql:* )
+	snmp? ( net-analyzer/net-snmp )
+	dev-libs/libpcre
+	dev-libs/openssl:0"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+PDEPEND="net-dialup/ppp-scripts"
+
+DOCS=( README )
+
+CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
+
+REQUIRED_USE="valgrind? ( debug )"
+
+pkg_setup() {
+	if use ipoe; then
+		linux-mod_pkg_setup
+		set_arch_to_kernel
+	else
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i  -e "/mkdir/d" \
+		-e "/echo/d" \
+		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
+
+	# Do not install kernel modules like that - breaks sandbox!
+	sed -i -e '/modules_install/d' \
+		drivers/ipoe/CMakeLists.txt \
+		drivers/vlan_mon/CMakeLists.txt || die
+
+	# Bug #549918
+	append-ldflags -Wl,-z,lazy
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local libdir="$(get_libdir)"
+	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
+	local mycmakeargs=(
+		-DLIB_PATH_SUFFIX="${libdir#lib}"
+		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
+		-DBUILD_PPTP_DRIVER=no
+		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
+		-DCRYPTO=OPENSSL
+		-DLOG_PGSQL="$(usex postgres)"
+		-DMEMDEBUG="$(usex debug)"
+		-DNETSNMP="$(usex snmp)"
+		-DRADIUS="$(usex radius)"
+		-DSHAPER="$(usex shaper)"
+		-DVALGRIND="$(usex valgrind)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	if use ipoe; then
+		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver) vlan_mon(accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver)"
+		linux-mod_src_install
+	fi
+
+	cmake-utils_src_install
+
+	use doc && dodoc -r rfc
+
+	if use snmp; then
+		insinto /usr/share/snmp/mibs
+		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
+
+	dodir /var/log/accel-ppp
+}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2016-07-18 12:19 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2016-07-18 12:19 UTC (permalink / raw
  To: gentoo-commits

commit:     8cfdb847f088746a053a1cff6b1e502bfaec353b
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 12:18:05 2016 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 12:18:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cfdb847

net-dialup/accel-ppp: version bump

Bump version to 1.10.3, remove old one

Package-Manager: portage-2.2.28

 net-dialup/accel-ppp/Manifest                                           | 2 +-
 .../accel-ppp/{accel-ppp-1.10.2.ebuild => accel-ppp-1.10.3.ebuild}      | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 087a6ea..d3760c8 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1 +1 @@
-DIST accel-ppp-1.10.2.tar.bz2 1587850 SHA256 ffd339ff1589c8b9e306028844e7156ee6d2b019b1219f1b8b62314c835e8a7d SHA512 6cc1d5f0786196fbbebc0f04830f780c1f2d2995bc7fb6384729b64820c74d0fb53f052bdaa71fa3b6165ab13cd7c137bfdc3ef717f6e866a329b893d7375ce1 WHIRLPOOL 050a5fe5eafba1e90f7b200a476e2edfbb878039a8e4ac5d06fdc195ad72720d7382267b7181e2a8ec47c2db8da4664b1315dff75ffcbc087c0e7e035577862c
+DIST accel-ppp-1.10.3.tar.bz2 1587351 SHA256 da8a2e44d1ac5a6a256cbe797c713515cc9d6835c3b3d53651fc942ed4280ccf SHA512 a67eee5cacfd734a9dc495ac3fb4d5b0c26ff1cb68701215930e6f7957267b478bd3844b8574ca21c95b7e0e1c4a5a4009656977a0e15799537bf1f799bfd933 WHIRLPOOL 8a332a19cf24b9e1379e8018e61c8b228964a48682be558c0a7faf35351feb95b1e2f442f2a75cd3908228daedea65a9ffb039c14fd4ca22e179bec12fa69be6

diff --git a/net-dialup/accel-ppp/accel-ppp-1.10.2.ebuild b/net-dialup/accel-ppp/accel-ppp-1.10.3.ebuild
similarity index 100%
rename from net-dialup/accel-ppp/accel-ppp-1.10.2.ebuild
rename to net-dialup/accel-ppp/accel-ppp-1.10.3.ebuild


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2016-07-18 12:19 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2016-07-18 12:19 UTC (permalink / raw
  To: gentoo-commits

commit:     40f1fb894d4226c267208563e66a2e74ee5e16cc
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 12:18:56 2016 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 12:18:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40f1fb89

net-dialup/accel-ppp: version bump to 1.11.0

Add live ebuild for 1.11 branch

Package-Manager: portage-2.2.28

 net-dialup/accel-ppp/Manifest                   |   1 +
 net-dialup/accel-ppp/accel-ppp-1.11.0.ebuild    |  99 +++++++++++++++++++++++
 net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild | 101 ++++++++++++++++++++++++
 3 files changed, 201 insertions(+)

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index d3760c8..f59a030 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1 +1,2 @@
 DIST accel-ppp-1.10.3.tar.bz2 1587351 SHA256 da8a2e44d1ac5a6a256cbe797c713515cc9d6835c3b3d53651fc942ed4280ccf SHA512 a67eee5cacfd734a9dc495ac3fb4d5b0c26ff1cb68701215930e6f7957267b478bd3844b8574ca21c95b7e0e1c4a5a4009656977a0e15799537bf1f799bfd933 WHIRLPOOL 8a332a19cf24b9e1379e8018e61c8b228964a48682be558c0a7faf35351feb95b1e2f442f2a75cd3908228daedea65a9ffb039c14fd4ca22e179bec12fa69be6
+DIST accel-ppp-1.11.0.tar.bz2 200721 SHA256 326e49ba5d3f6352759c239390d3f1a05ef454fd27c1c4e687b9d761f4b15b57 SHA512 21b0f6509d73aba392995070a0049731601cb5224311885ef4d7d580e4cc6c7d46521be96bd06bfbdb1b973142ec2ec6106e4f246cd12a11eb0f9cc55d8efa53 WHIRLPOOL a6d52fda6f586b981176b3642f13ff1a78a4ae35a92bf76663f5fd665b73f3d5ea23ed61f65478c49f1c7ae57a91591720e5f571f6db317334f60427961e6699

diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.0.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.0.ebuild
new file mode 100644
index 0000000..85a7a06
--- /dev/null
+++ b/net-dialup/accel-ppp/accel-ppp-1.11.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic linux-info linux-mod
+
+DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
+HOMEPAGE="http://accel-ppp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc ipoe postgres radius shaper snmp valgrind"
+
+RDEPEND="postgres? ( dev-db/postgresql:* )
+	snmp? ( net-analyzer/net-snmp )
+	dev-libs/libpcre
+	dev-libs/openssl:0"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+PDEPEND="net-dialup/ppp-scripts"
+
+DOCS=( README )
+
+CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
+
+REQUIRED_USE="valgrind? ( debug )"
+
+pkg_setup() {
+	if use ipoe; then
+		linux-mod_pkg_setup
+		set_arch_to_kernel
+	else
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i  -e "/mkdir/d" \
+		-e "/echo/d" \
+		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
+
+	# Do not install kernel modules like that - breaks sandbox!
+	sed -i -e '/modules_install/d' \
+		drivers/ipoe/CMakeLists.txt \
+		drivers/vlan_mon/CMakeLists.txt || die
+
+	# Bug #549918
+	append-ldflags -Wl,-z,lazy
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local libdir="$(get_libdir)"
+	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
+	local mycmakeargs=(
+		-DLIB_PATH_SUFFIX="${libdir#lib}"
+		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
+		-DBUILD_PPTP_DRIVER=no
+		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
+		-DCRYPTO=OPENSSL
+		-DLOG_PGSQL="$(usex postgres)"
+		-DMEMDEBUG="$(usex debug)"
+		-DNETSNMP="$(usex snmp)"
+		-DRADIUS="$(usex radius)"
+		-DSHAPER="$(usex shaper)"
+		-DVALGRIND="$(usex valgrind)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	if use ipoe; then
+		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver) vlan_mon(accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver)"
+		linux-mod_src_install
+	fi
+
+	cmake-utils_src_install
+
+	use doc && dodoc -r rfc
+
+	if use snmp; then
+		insinto /usr/share/snmp/mibs
+		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
+
+	dodir /var/log/accel-ppp
+}

diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
new file mode 100644
index 0000000..25e6e7d
--- /dev/null
+++ b/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGIT_REPO_URI="git://git.code.sf.net/p/accel-ppp/code"
+EGIT_BRANCH="1.11"
+inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod
+
+DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
+HOMEPAGE="http://accel-ppp.sourceforge.net/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug doc ipoe postgres radius shaper snmp valgrind"
+
+RDEPEND="postgres? ( dev-db/postgresql:* )
+	snmp? ( net-analyzer/net-snmp )
+	dev-libs/libpcre
+	dev-libs/openssl:0"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+PDEPEND="net-dialup/ppp-scripts"
+
+DOCS=( README )
+
+CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
+
+REQUIRED_USE="valgrind? ( debug )"
+
+pkg_setup() {
+	if use ipoe; then
+		linux-mod_pkg_setup
+		set_arch_to_kernel
+	else
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i  -e "/mkdir/d" \
+		-e "/echo/d" \
+		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
+
+	# Do not install kernel modules like that - breaks sandbox!
+	sed -i -e '/modules_install/d' \
+		drivers/ipoe/CMakeLists.txt \
+		drivers/vlan_mon/CMakeLists.txt || die
+
+	# Bug #549918
+	append-ldflags -Wl,-z,lazy
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local libdir="$(get_libdir)"
+	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
+	local mycmakeargs=(
+		-DLIB_PATH_SUFFIX="${libdir#lib}"
+		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
+		-DBUILD_PPTP_DRIVER=no
+		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
+		-DCRYPTO=OPENSSL
+		-DLOG_PGSQL="$(usex postgres)"
+		-DMEMDEBUG="$(usex debug)"
+		-DNETSNMP="$(usex snmp)"
+		-DRADIUS="$(usex radius)"
+		-DSHAPER="$(usex shaper)"
+		-DVALGRIND="$(usex valgrind)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	if use ipoe; then
+		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver) vlan_mon(accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver)"
+		linux-mod_src_install
+	fi
+
+	cmake-utils_src_install
+
+	use doc && dodoc -r rfc
+
+	if use snmp; then
+		insinto /usr/share/snmp/mibs
+		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
+
+	dodir /var/log/accel-ppp
+}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2016-07-18 16:51 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2016-07-18 16:51 UTC (permalink / raw
  To: gentoo-commits

commit:     90bad69e3c5add49edc647997113faa8286e0bc3
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 16:49:20 2016 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 16:49:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90bad69e

net-dialup/accel-ppp: fix wrong checksums for recently added 1.11.0 release

Reported-by: Toralf Förster <toralf.foerster <AT> gmx.de>
Gentoo-Bug: 589100

Package-Manager: portage-2.2.28

 net-dialup/accel-ppp/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index f59a030..e83b0af 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1,2 +1,2 @@
 DIST accel-ppp-1.10.3.tar.bz2 1587351 SHA256 da8a2e44d1ac5a6a256cbe797c713515cc9d6835c3b3d53651fc942ed4280ccf SHA512 a67eee5cacfd734a9dc495ac3fb4d5b0c26ff1cb68701215930e6f7957267b478bd3844b8574ca21c95b7e0e1c4a5a4009656977a0e15799537bf1f799bfd933 WHIRLPOOL 8a332a19cf24b9e1379e8018e61c8b228964a48682be558c0a7faf35351feb95b1e2f442f2a75cd3908228daedea65a9ffb039c14fd4ca22e179bec12fa69be6
-DIST accel-ppp-1.11.0.tar.bz2 200721 SHA256 326e49ba5d3f6352759c239390d3f1a05ef454fd27c1c4e687b9d761f4b15b57 SHA512 21b0f6509d73aba392995070a0049731601cb5224311885ef4d7d580e4cc6c7d46521be96bd06bfbdb1b973142ec2ec6106e4f246cd12a11eb0f9cc55d8efa53 WHIRLPOOL a6d52fda6f586b981176b3642f13ff1a78a4ae35a92bf76663f5fd665b73f3d5ea23ed61f65478c49f1c7ae57a91591720e5f571f6db317334f60427961e6699
+DIST accel-ppp-1.11.0.tar.bz2 1594327 SHA256 1b4f02fb0b264d7144c2b3f81c002983aae5b26bcf26af9cd2cd8492222efffe SHA512 907b484e73a4d70757a3991e6f33873aad5f10f6d5180307ee2f3eb0caacc576795d0e9c7666172a00842e6d31563503250f0e8165f6adb2bc88a1270814ea3c WHIRLPOOL 3975b076961c8ed7e3f207309e941785de26452f6ef5490f0668aca19e404e9f2b4ffa978b2af95897fdb339289d578c52f24493a8130ea38ccabe6846363587


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2017-05-17 12:56 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2017-05-17 12:56 UTC (permalink / raw
  To: gentoo-commits

commit:     8c5801e27dcc9e7354c1bab9b379658794c1b1f2
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 05:32:33 2017 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed May 17 12:56:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c5801e2

net-dialup/accel-ppp: drop old

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 net-dialup/accel-ppp/Manifest                   |  1 -
 net-dialup/accel-ppp/accel-ppp-1.10.3.ebuild    | 93 ------------------------
 net-dialup/accel-ppp/accel-ppp-1.10.9999.ebuild | 95 -------------------------
 3 files changed, 189 deletions(-)

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index e83b0afd419..386a2331579 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1,2 +1 @@
-DIST accel-ppp-1.10.3.tar.bz2 1587351 SHA256 da8a2e44d1ac5a6a256cbe797c713515cc9d6835c3b3d53651fc942ed4280ccf SHA512 a67eee5cacfd734a9dc495ac3fb4d5b0c26ff1cb68701215930e6f7957267b478bd3844b8574ca21c95b7e0e1c4a5a4009656977a0e15799537bf1f799bfd933 WHIRLPOOL 8a332a19cf24b9e1379e8018e61c8b228964a48682be558c0a7faf35351feb95b1e2f442f2a75cd3908228daedea65a9ffb039c14fd4ca22e179bec12fa69be6
 DIST accel-ppp-1.11.0.tar.bz2 1594327 SHA256 1b4f02fb0b264d7144c2b3f81c002983aae5b26bcf26af9cd2cd8492222efffe SHA512 907b484e73a4d70757a3991e6f33873aad5f10f6d5180307ee2f3eb0caacc576795d0e9c7666172a00842e6d31563503250f0e8165f6adb2bc88a1270814ea3c WHIRLPOOL 3975b076961c8ed7e3f207309e941785de26452f6ef5490f0668aca19e404e9f2b4ffa978b2af95897fdb339289d578c52f24493a8130ea38ccabe6846363587

diff --git a/net-dialup/accel-ppp/accel-ppp-1.10.3.ebuild b/net-dialup/accel-ppp/accel-ppp-1.10.3.ebuild
deleted file mode 100644
index 0ac77bd8064..00000000000
--- a/net-dialup/accel-ppp/accel-ppp-1.10.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic linux-info linux-mod
-
-DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="http://accel-ppp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc ipoe postgres radius shaper snmp valgrind"
-
-RDEPEND="postgres? ( dev-db/postgresql:* )
-	snmp? ( net-analyzer/net-snmp )
-	dev-libs/libpcre
-	dev-libs/openssl:0"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-PDEPEND="net-dialup/ppp-scripts"
-
-DOCS=( README )
-
-CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
-
-REQUIRED_USE="valgrind? ( debug )"
-
-pkg_setup() {
-	if use ipoe; then
-		linux-mod_pkg_setup
-		set_arch_to_kernel
-	else
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i  -e "/mkdir/d" \
-		-e "/echo/d" \
-		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
-	sed -i -e '/modules_install/d' drivers/ipoe/CMakeLists.txt || die 'sed on drivers/ipoe/CMakeLists.txt failed'
-
-	# Bug #549918
-	append-ldflags -Wl,-z,lazy
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local libdir="$(get_libdir)"
-	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
-	local mycmakeargs=(
-		-DLIB_PATH_SUFFIX="${libdir#lib}"
-		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
-		-DBUILD_PPTP_DRIVER=no
-		-DCRYPTO=OPENSSL
-		-DLOG_PGSQL="$(usex postgres)"
-		-DMEMDEBUG="$(usex debug)"
-		-DNETSNMP="$(usex snmp)"
-		-DRADIUS="$(usex radius)"
-		-DSHAPER="$(usex shaper)"
-		-DVALGRIND="$(usex valgrind)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	if use ipoe; then
-		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver)"
-		linux-mod_src_install
-	fi
-
-	cmake-utils_src_install
-
-	use doc && dodoc -r rfc
-
-	if use snmp; then
-		insinto /usr/share/snmp/mibs
-		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
-
-	dodir /var/log/accel-ppp
-}

diff --git a/net-dialup/accel-ppp/accel-ppp-1.10.9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.10.9999.ebuild
deleted file mode 100644
index 2eb921255c1..00000000000
--- a/net-dialup/accel-ppp/accel-ppp-1.10.9999.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="git://git.code.sf.net/p/accel-ppp/code"
-EGIT_BRANCH="1.10"
-inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod
-
-DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="http://accel-ppp.sourceforge.net/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug doc ipoe postgres radius shaper snmp valgrind"
-
-RDEPEND="postgres? ( dev-db/postgresql:* )
-	snmp? ( net-analyzer/net-snmp )
-	dev-libs/libpcre
-	dev-libs/openssl:0"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-PDEPEND="net-dialup/ppp-scripts"
-
-DOCS=( README )
-
-CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
-
-REQUIRED_USE="valgrind? ( debug )"
-
-pkg_setup() {
-	if use ipoe; then
-		linux-mod_pkg_setup
-		set_arch_to_kernel
-	else
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i  -e "/mkdir/d" \
-		-e "/echo/d" \
-		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
-	sed -i -e '/modules_install/d' drivers/ipoe/CMakeLists.txt || die 'sed on drivers/ipoe/CMakeLists.txt failed'
-
-	# Bug #549918
-	append-ldflags -Wl,-z,lazy
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local libdir="$(get_libdir)"
-	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
-	local mycmakeargs=(
-		-DLIB_PATH_SUFFIX="${libdir#lib}"
-		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
-		-DBUILD_PPTP_DRIVER=no
-		-DCRYPTO=OPENSSL
-		-DLOG_PGSQL="$(usex postgres)"
-		-DMEMDEBUG="$(usex debug)"
-		-DNETSNMP="$(usex snmp)"
-		-DRADIUS="$(usex radius)"
-		-DSHAPER="$(usex shaper)"
-		-DVALGRIND="$(usex valgrind)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	if use ipoe; then
-		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver)"
-		linux-mod_src_install
-	fi
-
-	cmake-utils_src_install
-
-	use doc && dodoc -r rfc
-
-	if use snmp; then
-		insinto /usr/share/snmp/mibs
-		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
-
-	dodir /var/log/accel-ppp
-}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2017-05-17 13:05 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2017-05-17 13:05 UTC (permalink / raw
  To: gentoo-commits

commit:     e0ad8a888828d93d7ed4a201a44156c1d36982ad
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed May 17 13:00:26 2017 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed May 17 13:00:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0ad8a88

net-dialup/accel-ppp: update live ebuilds

Add support for Lua scripts usage

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild | 7 ++++---
 net-dialup/accel-ppp/accel-ppp-9999.ebuild      | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
index 340199ae44f..f4c53dbb43e 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,9 +14,10 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug doc ipoe postgres radius shaper snmp valgrind"
+IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind"
 
-RDEPEND="postgres? ( dev-db/postgresql:* )
+RDEPEND="lua? ( dev-lang/lua:0 )
+	postgres? ( dev-db/postgresql:* )
 	snmp? ( net-analyzer/net-snmp )
 	dev-libs/libpcre
 	dev-libs/openssl:0"

diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index 6561a6a14d0..0630264eef3 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,9 +13,10 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug doc ipoe postgres radius shaper snmp valgrind"
+IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind"
 
-RDEPEND="postgres? ( dev-db/postgresql:* )
+RDEPEND="lua? ( dev-lang/lua:0 )
+	postgres? ( dev-db/postgresql:* )
 	snmp? ( net-analyzer/net-snmp )
 	dev-libs/libpcre
 	dev-libs/openssl:0"


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2017-09-06 21:00 Michał Górny
  0 siblings, 0 replies; 31+ messages in thread
From: Michał Górny @ 2017-09-06 21:00 UTC (permalink / raw
  To: gentoo-commits

commit:     ef77607a0cc414c86cdf720721cb8cba22819dd0
Author:     Francesco Turco <fturco <AT> fastmail <DOT> fm>
AuthorDate: Sun Sep  3 16:21:14 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep  6 20:58:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef77607a

net-dialup/accel-ppp: use HTTPS for links to dev.gentoo.org

 net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild
index 9bfa8e3834d..e69b411d936 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild
@@ -7,7 +7,7 @@ inherit cmake-utils flag-o-matic linux-info linux-mod
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
 HOMEPAGE="http://accel-ppp.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2018-03-21 12:52 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2018-03-21 12:52 UTC (permalink / raw
  To: gentoo-commits

commit:     ca9b3fd26b4f8c04ba1265f1b49af97562479c25
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 21 12:51:33 2018 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Mar 21 12:51:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca9b3fd2

net-dialup/accel-ppp: drop old version

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-dialup/accel-ppp/Manifest                |  1 -
 net-dialup/accel-ppp/accel-ppp-1.11.0.ebuild | 98 ----------------------------
 2 files changed, 99 deletions(-)

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 8f25dd71aaf..23f9de0f93a 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1,3 +1,2 @@
-DIST accel-ppp-1.11.0.tar.bz2 1594327 BLAKE2B f23d8e4f68837e6394136013ce3e65705990f7cf15822a2939c36d00eae49d33c8b88db56629d78a5092b994256fee9859dbb3547484b8800f7fad8d0866e45f SHA512 907b484e73a4d70757a3991e6f33873aad5f10f6d5180307ee2f3eb0caacc576795d0e9c7666172a00842e6d31563503250f0e8165f6adb2bc88a1270814ea3c
 DIST accel-ppp-1.11.1_p20170508.tar.bz2 1609904 BLAKE2B 5993e25e09e84fa62fde28e6c79b11514eb5e0c365a8cc1a36c4e3e56ac868725b14049e28184188330ac78cb6c128429f2cc89241d871c02e4154c6882a89e2 SHA512 79f928c9d07891957d12443eaf32e96e826d5bebf241dcfcb31a7777fbce2332078bf0c1dd1e1a55cf96154be1fec610f1afd088fc018f54ebd5d265c037c07a
 DIST accel-ppp-1.11.1_p20180320.tar.bz2 1634359 BLAKE2B 97ca709ef3740c2ac1d75f6fba3acbf9229c3cb48f3a55735eaa14b74c2b0af96d637cbb145bc9e98a5b245704806cdc3d8f9d8692809626e0f73d73702c4a0a SHA512 a8a2420332c02087e45bbaab25831ae5d2d370fd56b29db77c267083badc22b90ca4b0ec7335e13250ac8f150002b2a3c343cfba6c2378932778777dc936d914

diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.0.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.0.ebuild
deleted file mode 100644
index 03107ba307d..00000000000
--- a/net-dialup/accel-ppp/accel-ppp-1.11.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic linux-info linux-mod
-
-DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="http://accel-ppp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc ipoe postgres radius shaper snmp valgrind"
-
-RDEPEND="postgres? ( dev-db/postgresql:* )
-	snmp? ( net-analyzer/net-snmp )
-	dev-libs/libpcre
-	dev-libs/openssl:0"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-PDEPEND="net-dialup/ppp-scripts"
-
-DOCS=( README )
-
-CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
-
-REQUIRED_USE="valgrind? ( debug )"
-
-pkg_setup() {
-	if use ipoe; then
-		linux-mod_pkg_setup
-		set_arch_to_kernel
-	else
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i  -e "/mkdir/d" \
-		-e "/echo/d" \
-		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
-
-	# Do not install kernel modules like that - breaks sandbox!
-	sed -i -e '/modules_install/d' \
-		drivers/ipoe/CMakeLists.txt \
-		drivers/vlan_mon/CMakeLists.txt || die
-
-	# Bug #549918
-	append-ldflags -Wl,-z,lazy
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local libdir="$(get_libdir)"
-	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
-	local mycmakeargs=(
-		-DLIB_PATH_SUFFIX="${libdir#lib}"
-		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
-		-DBUILD_PPTP_DRIVER=no
-		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
-		-DCRYPTO=OPENSSL
-		-DLOG_PGSQL="$(usex postgres)"
-		-DMEMDEBUG="$(usex debug)"
-		-DNETSNMP="$(usex snmp)"
-		-DRADIUS="$(usex radius)"
-		-DSHAPER="$(usex shaper)"
-		-DVALGRIND="$(usex valgrind)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	if use ipoe; then
-		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver) vlan_mon(accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver)"
-		linux-mod_src_install
-	fi
-
-	cmake-utils_src_install
-
-	use doc && dodoc -r rfc
-
-	if use snmp; then
-		insinto /usr/share/snmp/mibs
-		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
-
-	dodir /var/log/accel-ppp
-}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2018-03-21 12:52 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2018-03-21 12:52 UTC (permalink / raw
  To: gentoo-commits

commit:     21385e862dd6ac6b6f9923b5e9562f85fb359e58
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 21 12:49:36 2018 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Mar 21 12:51:54 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21385e86

net-dialup/accel-ppp: version bump, sync live ebuilds

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-dialup/accel-ppp/Manifest                      |  1 +
 ...99.ebuild => accel-ppp-1.11.1_p20180320.ebuild} | 22 +++++++++++++---------
 net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild    |  8 ++++----
 net-dialup/accel-ppp/accel-ppp-9999.ebuild         |  8 ++++----
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 5a31e3bd01a..8f25dd71aaf 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1,2 +1,3 @@
 DIST accel-ppp-1.11.0.tar.bz2 1594327 BLAKE2B f23d8e4f68837e6394136013ce3e65705990f7cf15822a2939c36d00eae49d33c8b88db56629d78a5092b994256fee9859dbb3547484b8800f7fad8d0866e45f SHA512 907b484e73a4d70757a3991e6f33873aad5f10f6d5180307ee2f3eb0caacc576795d0e9c7666172a00842e6d31563503250f0e8165f6adb2bc88a1270814ea3c
 DIST accel-ppp-1.11.1_p20170508.tar.bz2 1609904 BLAKE2B 5993e25e09e84fa62fde28e6c79b11514eb5e0c365a8cc1a36c4e3e56ac868725b14049e28184188330ac78cb6c128429f2cc89241d871c02e4154c6882a89e2 SHA512 79f928c9d07891957d12443eaf32e96e826d5bebf241dcfcb31a7777fbce2332078bf0c1dd1e1a55cf96154be1fec610f1afd088fc018f54ebd5d265c037c07a
+DIST accel-ppp-1.11.1_p20180320.tar.bz2 1634359 BLAKE2B 97ca709ef3740c2ac1d75f6fba3acbf9229c3cb48f3a55735eaa14b74c2b0af96d637cbb145bc9e98a5b245704806cdc3d8f9d8692809626e0f73d73702c4a0a SHA512 a8a2420332c02087e45bbaab25831ae5d2d370fd56b29db77c267083badc22b90ca4b0ec7335e13250ac8f150002b2a3c343cfba6c2378932778777dc936d914

diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild
similarity index 84%
copy from net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
copy to net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild
index f4c53dbb43e..c8c6d3cd86f 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-EGIT_REPO_URI="git://git.code.sf.net/p/accel-ppp/code"
-EGIT_BRANCH="1.11"
-inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod
+inherit cmake-utils flag-o-matic linux-info linux-mod
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
 HOMEPAGE="http://accel-ppp.sourceforge.net/"
-SRC_URI=""
+SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind"
 
 RDEPEND="lua? ( dev-lang/lua:0 )
@@ -31,6 +29,12 @@ CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
 
 REQUIRED_USE="valgrind? ( debug )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.11.1-socklen.patch"
+)
+
+S="${WORKDIR}"
+
 pkg_setup() {
 	if use ipoe; then
 		linux-mod_pkg_setup
@@ -42,7 +46,6 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i  -e "/mkdir/d" \
-		-e "/echo/d" \
 		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
 
 	# Do not install kernel modules like that - breaks sandbox!
@@ -60,17 +63,18 @@ src_configure() {
 	local libdir="$(get_libdir)"
 	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
 	local mycmakeargs=(
-		-DLIB_PATH_SUFFIX="${libdir#lib}"
+		-DLIB_SUFFIX="${libdir#lib}"
 		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
 		-DBUILD_PPTP_DRIVER=no
 		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
 		-DCRYPTO=OPENSSL
 		-DLOG_PGSQL="$(usex postgres)"
+		-DLUA="$(usex lua)"
 		-DMEMDEBUG="$(usex debug)"
 		-DNETSNMP="$(usex snmp)"
 		-DRADIUS="$(usex radius)"
 		-DSHAPER="$(usex shaper)"
-		-DVALGRIND="$(usex valgrind)"
+		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
 	)
 	cmake-utils_src_configure
 }

diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
index f4c53dbb43e..fa1729fe089 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,7 +42,6 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i  -e "/mkdir/d" \
-		-e "/echo/d" \
 		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
 
 	# Do not install kernel modules like that - breaks sandbox!
@@ -60,17 +59,18 @@ src_configure() {
 	local libdir="$(get_libdir)"
 	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
 	local mycmakeargs=(
-		-DLIB_PATH_SUFFIX="${libdir#lib}"
+		-DLIB_SUFFIX="${libdir#lib}"
 		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
 		-DBUILD_PPTP_DRIVER=no
 		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
 		-DCRYPTO=OPENSSL
 		-DLOG_PGSQL="$(usex postgres)"
+		-DLUA="$(usex lua)"
 		-DMEMDEBUG="$(usex debug)"
 		-DNETSNMP="$(usex snmp)"
 		-DRADIUS="$(usex radius)"
 		-DSHAPER="$(usex shaper)"
-		-DVALGRIND="$(usex valgrind)"
+		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
 	)
 	cmake-utils_src_configure
 }

diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index 0630264eef3..cbb628950c2 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,7 +41,6 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i  -e "/mkdir/d" \
-		-e "/echo/d" \
 		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
 
 	# Do not install kernel modules like that - breaks sandbox!
@@ -59,17 +58,18 @@ src_configure() {
 	local libdir="$(get_libdir)"
 	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
 	local mycmakeargs=(
-		-DLIB_PATH_SUFFIX="${libdir#lib}"
+		-DLIB_SUFFIX="${libdir#lib}"
 		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
 		-DBUILD_PPTP_DRIVER=no
 		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
 		-DCRYPTO=OPENSSL
 		-DLOG_PGSQL="$(usex postgres)"
+		-DLUA="$(usex lua)"
 		-DMEMDEBUG="$(usex debug)"
 		-DNETSNMP="$(usex snmp)"
 		-DRADIUS="$(usex radius)"
 		-DSHAPER="$(usex shaper)"
-		-DVALGRIND="$(usex valgrind)"
+		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
 	)
 	cmake-utils_src_configure
 }


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2019-03-19  7:56 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2019-03-19  7:56 UTC (permalink / raw
  To: gentoo-commits

commit:     303f35849ae4c05d0b85cf31238fd0c2b86e5837
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 07:55:53 2019 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 07:55:53 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=303f3584

net-dialup/accel-ppp: fix HOMEPAGE

Reported-by: yuLya <gen2xmach1ne <AT> tutanota.com>
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>
Closes: https://bugs.gentoo.org/680696
Package-Manager: Portage-2.3.51, Repoman-2.3.10

 net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild | 4 ++--
 net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild | 4 ++--
 net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild        | 4 ++--
 net-dialup/accel-ppp/accel-ppp-9999.ebuild             | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild
index e69b411d936..07366eb315c 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20170508.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils flag-o-matic linux-info linux-mod
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="http://accel-ppp.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
 SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
 
 LICENSE="GPL-2"

diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild
index c8c6d3cd86f..d583a303be5 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit cmake-utils flag-o-matic linux-info linux-mod
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="http://accel-ppp.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
 SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
 
 LICENSE="GPL-2"

diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
index fa1729fe089..817a5e3058f 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.11.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ EGIT_BRANCH="1.11"
 inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="http://accel-ppp.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
 SRC_URI=""
 
 LICENSE="GPL-2"

diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index cbb628950c2..ff874dac881 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ EGIT_REPO_URI="git://git.code.sf.net/p/accel-ppp/code"
 inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="http://accel-ppp.sourceforge.net/"
+HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
 SRC_URI=""
 
 LICENSE="GPL-2"


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2019-10-09 13:16 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2019-10-09 13:16 UTC (permalink / raw
  To: gentoo-commits

commit:     cd7bdd8a269e0a22dad2a80991a1f4752867fc9b
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  9 13:13:35 2019 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Oct  9 13:15:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd7bdd8a

net-dialup/accel-ppp: version bump, update live ebuild

Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 net-dialup/accel-ppp/Manifest                       |  1 +
 ...ccel-ppp-9999.ebuild => accel-ppp-1.12.0.ebuild} | 21 ++++++++++++++-------
 net-dialup/accel-ppp/accel-ppp-9999.ebuild          |  8 ++++----
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 8cd346959bb..e8ecf5cc9a3 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1 +1,2 @@
 DIST accel-ppp-1.11.1_p20180320.tar.bz2 1634359 BLAKE2B 97ca709ef3740c2ac1d75f6fba3acbf9229c3cb48f3a55735eaa14b74c2b0af96d637cbb145bc9e98a5b245704806cdc3d8f9d8692809626e0f73d73702c4a0a SHA512 a8a2420332c02087e45bbaab25831ae5d2d370fd56b29db77c267083badc22b90ca4b0ec7335e13250ac8f150002b2a3c343cfba6c2378932778777dc936d914
+DIST accel-ppp-1.12.0.tar 6758400 BLAKE2B 776c0946decec2d88a0dfeb8e840573ae8d53d53d0fe921604667eaf4a5658e7d0cfa57f0b54eb61fcdf62b7a62a94ee405a01ad2a66ab76042d59cc3f79d42b SHA512 f1d3b31ca36395a429214b7599a43755317d89391c5631dfd02df79ed8dd51c39f75fc56ac625fbc6e7d5b0f9c85699c5da612eb4e8af9eae8ad2d9b13a187ba

diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
similarity index 84%
copy from net-dialup/accel-ppp/accel-ppp-9999.ebuild
copy to net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
index ff874dac881..f2e7d2b54cc 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="git://git.code.sf.net/p/accel-ppp/code"
-inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod
+inherit cmake-utils flag-o-matic linux-info linux-mod
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
 HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
-SRC_URI=""
+SRC_URI="https://download.sourceforge.net/accel-ppp/${P}.tar.bz2 -> ${P}.tar"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind"
 
 RDEPEND="lua? ( dev-lang/lua:0 )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( net-analyzer/net-snmp )
 	dev-libs/libpcre
-	dev-libs/openssl:0"
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
 PDEPEND="net-dialup/ppp-scripts"
@@ -30,6 +29,10 @@ CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
 
 REQUIRED_USE="valgrind? ( debug )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.11.1-socklen.patch"
+)
+
 pkg_setup() {
 	if use ipoe; then
 		linux-mod_pkg_setup
@@ -48,6 +51,10 @@ src_prepare() {
 		drivers/ipoe/CMakeLists.txt \
 		drivers/vlan_mon/CMakeLists.txt || die
 
+	# Fix version
+	sed -i -e "s/1.11/${PV}/" drivers/ipoe/ipoe.c || die
+	sed -i -e "s/1.11/${PV}/" drivers/vlan_mon/vlan_mon.c || die
+
 	# Bug #549918
 	append-ldflags -Wl,-z,lazy
 

diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index ff874dac881..a05fd2d9a09 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="git://git.code.sf.net/p/accel-ppp/code"
+EGIT_REPO_URI="https://git.code.sf.net/p/accel-ppp/code"
 inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
@@ -19,7 +19,7 @@ RDEPEND="lua? ( dev-lang/lua:0 )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( net-analyzer/net-snmp )
 	dev-libs/libpcre
-	dev-libs/openssl:0"
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
 PDEPEND="net-dialup/ppp-scripts"


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2020-01-09 12:25 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2020-01-09 12:25 UTC (permalink / raw
  To: gentoo-commits

commit:     65289919c4600500f63773cf5e70eb7feee40984
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  9 12:20:11 2020 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Thu Jan  9 12:25:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65289919

net-dialup/accel-ppp: drop old version

Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>

 .../accel-ppp/accel-ppp-1.11.1_p20180320.ebuild    | 105 ---------------------
 1 file changed, 105 deletions(-)

diff --git a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild b/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild
deleted file mode 100644
index 0d27e032077..00000000000
--- a/net-dialup/accel-ppp/accel-ppp-1.11.1_p20180320.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic linux-info linux-mod
-
-DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
-SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind"
-
-RDEPEND="lua? ( dev-lang/lua:0 )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( net-analyzer/net-snmp )
-	dev-libs/libpcre
-	dev-libs/openssl:0"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-PDEPEND="net-dialup/ppp-scripts"
-
-DOCS=( README )
-
-CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
-
-REQUIRED_USE="valgrind? ( debug )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.11.1-socklen.patch"
-)
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	if use ipoe; then
-		linux-mod_pkg_setup
-		set_arch_to_kernel
-	else
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i  -e "/mkdir/d" \
-		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
-
-	# Do not install kernel modules like that - breaks sandbox!
-	sed -i -e '/modules_install/d' \
-		drivers/ipoe/CMakeLists.txt \
-		drivers/vlan_mon/CMakeLists.txt || die
-
-	# Bug #549918
-	append-ldflags -Wl,-z,lazy
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local libdir="$(get_libdir)"
-	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
-	local mycmakeargs=(
-		-DLIB_SUFFIX="${libdir#lib}"
-		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
-		-DBUILD_PPTP_DRIVER=no
-		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
-		-DCRYPTO=OPENSSL
-		-DLOG_PGSQL="$(usex postgres)"
-		-DLUA="$(usex lua)"
-		-DMEMDEBUG="$(usex debug)"
-		-DNETSNMP="$(usex snmp)"
-		-DRADIUS="$(usex radius)"
-		-DSHAPER="$(usex shaper)"
-		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	if use ipoe; then
-		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver) vlan_mon(accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver)"
-		linux-mod_src_install
-	fi
-
-	cmake-utils_src_install
-
-	use doc && dodoc -r rfc
-
-	if use snmp; then
-		insinto /usr/share/snmp/mibs
-		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
-
-	dodir /var/log/accel-ppp
-}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2020-01-10 14:54 Michał Górny
  0 siblings, 0 replies; 31+ messages in thread
From: Michał Górny @ 2020-01-10 14:54 UTC (permalink / raw
  To: gentoo-commits

commit:     78702db30c13e2dcbcd9780ab65c4c7ff1eb8c51
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 10 12:07:17 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 10 14:54:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78702db3

net-dialup/accel-ppp: Fix patch name

Bug: https://bugs.gentoo.org/704306
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
index e60b57f2e25..7362e06b530 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
@@ -31,7 +31,7 @@ REQUIRED_USE="valgrind? ( debug )"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.11.1-socklen.patch"
-	"${FILESDIR}/${PV}-kernel-5.2.patch"
+	"${FILESDIR}/${P}-kernel-5.2.patch"
 )
 
 pkg_setup() {


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2020-05-09 10:20 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2020-05-09 10:20 UTC (permalink / raw
  To: gentoo-commits

commit:     b52cb617cd14990061ae455a27f32e6a0d5e7aba
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Sat May  9 10:18:02 2020 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Sat May  9 10:20:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b52cb617

net-dialup/accel-ppp: fix detection of Lua interpreter

Reported-by: Toralf Förster <toralf <AT> gentoo.org>
Closes: https://bugs.gentoo.org/720846
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>

 net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild | 2 +-
 net-dialup/accel-ppp/accel-ppp-9999.ebuild   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
index 7362e06b530..61e4c0092c8 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0.ebuild
@@ -72,7 +72,7 @@ src_configure() {
 		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
 		-DCRYPTO=OPENSSL
 		-DLOG_PGSQL="$(usex postgres)"
-		-DLUA="$(usex lua)"
+		-DLUA="$(usex lua TRUE FALSE)"
 		-DMEMDEBUG="$(usex debug)"
 		-DNETSNMP="$(usex snmp)"
 		-DRADIUS="$(usex radius)"

diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index a05fd2d9a09..68e1f642d6f 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -64,7 +64,7 @@ src_configure() {
 		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
 		-DCRYPTO=OPENSSL
 		-DLOG_PGSQL="$(usex postgres)"
-		-DLUA="$(usex lua)"
+		-DLUA="$(usex lua TRUE FALSE)"
 		-DMEMDEBUG="$(usex debug)"
 		-DNETSNMP="$(usex snmp)"
 		-DRADIUS="$(usex radius)"


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2020-09-14 10:56 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2020-09-14 10:56 UTC (permalink / raw
  To: gentoo-commits

commit:     fbfdc71856213715aa4f0eda0d6adbb2439f15d9
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 10:53:30 2020 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 10:53:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbfdc718

net-dialup/accel-ppp: keep log directory

Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>

 net-dialup/accel-ppp/accel-ppp-1.12.0-r1.ebuild | 2 +-
 net-dialup/accel-ppp/accel-ppp-9999.ebuild      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0-r1.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0-r1.ebuild
index 61e4c0092c8..7c3f0f8b2be 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.12.0-r1.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0-r1.ebuild
@@ -104,5 +104,5 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
 
-	dodir /var/log/accel-ppp
+	keepdir /var/log/accel-ppp
 }

diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index 68e1f642d6f..791d6bd067d 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -96,5 +96,5 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
 
-	dodir /var/log/accel-ppp
+	keepdir /var/log/accel-ppp
 }


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2020-09-14 11:02 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2020-09-14 11:02 UTC (permalink / raw
  To: gentoo-commits

commit:     bb16158910494c297a9baf2ee93ea36b15129777
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 11:01:27 2020 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 11:01:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb161589

net-dialup/accel-ppp-9999: move to new repository

Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>

 net-dialup/accel-ppp/accel-ppp-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index 791d6bd067d..08a014f0a2b 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-EGIT_REPO_URI="https://git.code.sf.net/p/accel-ppp/code"
+EGIT_REPO_URI="https://github.com/accel-ppp/accel-ppp.git"
 inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2020-09-14 12:23 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2020-09-14 12:23 UTC (permalink / raw
  To: gentoo-commits

commit:     956edd419e62945200693a1fa0425ce0b8295cf0
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 12:18:19 2020 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 12:23:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=956edd41

net-dialup/accel-ppp-9999: migrate from cmake-utils to cmake eclass

Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>

 net-dialup/accel-ppp/accel-ppp-9999.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index 08a014f0a2b..3f8aec7348a 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 EGIT_REPO_URI="https://github.com/accel-ppp/accel-ppp.git"
-inherit cmake-utils flag-o-matic git-r3 linux-info linux-mod
+inherit cmake flag-o-matic git-r3 linux-info linux-mod
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
 HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
@@ -51,7 +51,7 @@ src_prepare() {
 	# Bug #549918
 	append-ldflags -Wl,-z,lazy
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -71,11 +71,11 @@ src_configure() {
 		-DSHAPER="$(usex shaper)"
 		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
-	cmake-utils_src_compile
+	cmake_src_compile
 }
 
 src_install() {
@@ -84,7 +84,7 @@ src_install() {
 		linux-mod_src_install
 	fi
 
-	cmake-utils_src_install
+	cmake_src_install
 
 	use doc && dodoc -r rfc
 


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2020-09-14 12:23 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2020-09-14 12:23 UTC (permalink / raw
  To: gentoo-commits

commit:     71fed557815206d7b1380326fdfbcc56a4105bd7
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 12:19:46 2020 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 12:23:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71fed557

net-dialup/accel-ppp: version bump

Add snapshot with upstream changes,
fixing CVE-2020-15173

Gentoo-Bug: https://bugs.gentoo.org/741568
Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>

 net-dialup/accel-ppp/Manifest                      |   1 +
 .../accel-ppp/accel-ppp-1.12.0_p20200913.ebuild    | 109 +++++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 2272c95bf67..e3e8b2a8bf6 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1 +1,2 @@
 DIST accel-ppp-1.12.0.tar 6758400 BLAKE2B 776c0946decec2d88a0dfeb8e840573ae8d53d53d0fe921604667eaf4a5658e7d0cfa57f0b54eb61fcdf62b7a62a94ee405a01ad2a66ab76042d59cc3f79d42b SHA512 f1d3b31ca36395a429214b7599a43755317d89391c5631dfd02df79ed8dd51c39f75fc56ac625fbc6e7d5b0f9c85699c5da612eb4e8af9eae8ad2d9b13a187ba
+DIST accel-ppp-1.12.0_p20200913.tar.bz2 1661195 BLAKE2B 6ffdb140486e98c19c981999873f94e767682bec1a2bea1f2feb7bed6ce9d8b15a824605da0b60897501773f4ece9d71612385dd1eff61483fff5daadad9713d SHA512 ecf325774507a8ddb1c6fe3c90aa2e25c72d006e9d96eabf66c7f1b67cfa70fc1073cf120c195d0823ad2532fa3504f6ab482d1842eb8b3e3dbafdb8b16a2ac6

diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913.ebuild
new file mode 100644
index 00000000000..43549ba9cb3
--- /dev/null
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic linux-info linux-mod
+
+DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
+HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
+SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind"
+
+RDEPEND="lua? ( dev-lang/lua:0 )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( net-analyzer/net-snmp )
+	dev-libs/libpcre
+	dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+PDEPEND="net-dialup/ppp-scripts"
+
+DOCS=( README )
+
+CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
+
+REQUIRED_USE="valgrind? ( debug )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.11.1-socklen.patch"
+)
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	if use ipoe; then
+		linux-mod_pkg_setup
+		set_arch_to_kernel
+	else
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	sed -i  -e "/mkdir/d" \
+		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
+
+	# Do not install kernel modules like that - breaks sandbox!
+	sed -i -e '/modules_install/d' \
+		drivers/ipoe/CMakeLists.txt \
+		drivers/vlan_mon/CMakeLists.txt || die
+
+	# Fix version
+	sed -i -e "s/1.11/${PV}/" drivers/ipoe/ipoe.c || die
+	sed -i -e "s/1.11/${PV}/" drivers/vlan_mon/vlan_mon.c || die
+
+	# Bug #549918
+	append-ldflags -Wl,-z,lazy
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local libdir="$(get_libdir)"
+	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
+	local mycmakeargs=(
+		-DLIB_SUFFIX="${libdir#lib}"
+		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
+		-DBUILD_PPTP_DRIVER=no
+		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
+		-DCRYPTO=OPENSSL
+		-DLOG_PGSQL="$(usex postgres)"
+		-DLUA="$(usex lua TRUE FALSE)"
+		-DMEMDEBUG="$(usex debug)"
+		-DNETSNMP="$(usex snmp)"
+		-DRADIUS="$(usex radius)"
+		-DSHAPER="$(usex shaper)"
+		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	if use ipoe; then
+		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver) vlan_mon(accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver)"
+		linux-mod_src_install
+	fi
+
+	cmake_src_install
+
+	use doc && dodoc -r rfc
+
+	if use snmp; then
+		insinto /usr/share/snmp/mibs
+		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
+
+	keepdir /var/log/accel-ppp
+}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2021-03-25 23:52 Conrad Kostecki
  0 siblings, 0 replies; 31+ messages in thread
From: Conrad Kostecki @ 2021-03-25 23:52 UTC (permalink / raw
  To: gentoo-commits

commit:     a401e09f869f1f5f0fd4780243cabebbbc14d66e
Author:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 25 23:42:41 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Mar 25 23:52:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a401e09f

net-dialup/accel-ppp: drop old version

Dropping old version, which does not support slotted lua.

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../accel-ppp/accel-ppp-1.12.0_p20200913.ebuild    | 109 ---------------------
 1 file changed, 109 deletions(-)

diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913.ebuild
deleted file mode 100644
index 43549ba9cb3..00000000000
--- a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic linux-info linux-mod
-
-DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
-SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind"
-
-RDEPEND="lua? ( dev-lang/lua:0 )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( net-analyzer/net-snmp )
-	dev-libs/libpcre
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-PDEPEND="net-dialup/ppp-scripts"
-
-DOCS=( README )
-
-CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
-
-REQUIRED_USE="valgrind? ( debug )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.11.1-socklen.patch"
-)
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	if use ipoe; then
-		linux-mod_pkg_setup
-		set_arch_to_kernel
-	else
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i  -e "/mkdir/d" \
-		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
-
-	# Do not install kernel modules like that - breaks sandbox!
-	sed -i -e '/modules_install/d' \
-		drivers/ipoe/CMakeLists.txt \
-		drivers/vlan_mon/CMakeLists.txt || die
-
-	# Fix version
-	sed -i -e "s/1.11/${PV}/" drivers/ipoe/ipoe.c || die
-	sed -i -e "s/1.11/${PV}/" drivers/vlan_mon/vlan_mon.c || die
-
-	# Bug #549918
-	append-ldflags -Wl,-z,lazy
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local libdir="$(get_libdir)"
-	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
-	local mycmakeargs=(
-		-DLIB_SUFFIX="${libdir#lib}"
-		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
-		-DBUILD_PPTP_DRIVER=no
-		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
-		-DCRYPTO=OPENSSL
-		-DLOG_PGSQL="$(usex postgres)"
-		-DLUA="$(usex lua TRUE FALSE)"
-		-DMEMDEBUG="$(usex debug)"
-		-DNETSNMP="$(usex snmp)"
-		-DRADIUS="$(usex radius)"
-		-DSHAPER="$(usex shaper)"
-		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_install() {
-	if use ipoe; then
-		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver) vlan_mon(accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver)"
-		linux-mod_src_install
-	fi
-
-	cmake_src_install
-
-	use doc && dodoc -r rfc
-
-	if use snmp; then
-		insinto /usr/share/snmp/mibs
-		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
-
-	keepdir /var/log/accel-ppp
-}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2021-05-17  8:57 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2021-05-17  8:57 UTC (permalink / raw
  To: gentoo-commits

commit:     aabfd1c8c3ccd7085da46a10edb29d45811ba2c3
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon May 17 08:50:46 2021 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon May 17 08:57:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabfd1c8

net-dialup/accel-ppp: drop old vulnerable version

Closes: https://bugs.gentoo.org/768234
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>

 net-dialup/accel-ppp/Manifest                      |   1 -
 .../accel-ppp-1.12.0_p20200913-r100.ebuild         | 113 ---------------------
 2 files changed, 114 deletions(-)

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 070c8e705ac..bf502e82b4f 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1,2 +1 @@
-DIST accel-ppp-1.12.0_p20200913.tar.bz2 1661195 BLAKE2B 6ffdb140486e98c19c981999873f94e767682bec1a2bea1f2feb7bed6ce9d8b15a824605da0b60897501773f4ece9d71612385dd1eff61483fff5daadad9713d SHA512 ecf325774507a8ddb1c6fe3c90aa2e25c72d006e9d96eabf66c7f1b67cfa70fc1073cf120c195d0823ad2532fa3504f6ab482d1842eb8b3e3dbafdb8b16a2ac6
 DIST accel-ppp-1.12.0_p20210430.tar.bz2 1662172 BLAKE2B 7c9da06ca704d63afb16bc8d2bc64541e25d31a062a948c3014f340684a38c7ba55d15eba3458ced90b088788228f97553105fd5d0aebbb1e61fb1b1075ae521 SHA512 de690a44ebaad31c63ec604c306e3d5bc63bd02ea2c17a435c2166ddcc8a3c06b86d72d6ebd88d906093583345962569493231e1657f222d4e66d93bf1d0ca41

diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild
deleted file mode 100644
index 7443db97680..00000000000
--- a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 )
-
-inherit cmake flag-o-matic linux-info linux-mod lua-single
-
-DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
-SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind"
-
-RDEPEND="lua? ( ${LUA_DEPS} )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( net-analyzer/net-snmp )
-	dev-libs/libpcre
-	dev-libs/openssl:0="
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-PDEPEND="net-dialup/ppp-scripts"
-
-DOCS=( README )
-
-CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	valgrind? ( debug )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.11.1-socklen.patch"
-)
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	if use ipoe; then
-		linux-mod_pkg_setup
-		set_arch_to_kernel
-	else
-		linux-info_pkg_setup
-	fi
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	sed -i  -e "/mkdir/d" \
-		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
-
-	# Do not install kernel modules like that - breaks sandbox!
-	sed -i -e '/modules_install/d' \
-		drivers/ipoe/CMakeLists.txt \
-		drivers/vlan_mon/CMakeLists.txt || die
-
-	# Fix version
-	sed -i -e "s/1.11/${PV}/" drivers/ipoe/ipoe.c || die
-	sed -i -e "s/1.11/${PV}/" drivers/vlan_mon/vlan_mon.c || die
-
-	# Bug #549918
-	append-ldflags -Wl,-z,lazy
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local libdir="$(get_libdir)"
-	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
-	local mycmakeargs=(
-		-DLIB_SUFFIX="${libdir#lib}"
-		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
-		-DBUILD_PPTP_DRIVER=no
-		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
-		-DCRYPTO=OPENSSL
-		-DLOG_PGSQL="$(usex postgres)"
-		-DLUA="$(usex lua TRUE FALSE)"
-		-DMEMDEBUG="$(usex debug)"
-		-DNETSNMP="$(usex snmp)"
-		-DRADIUS="$(usex radius)"
-		-DSHAPER="$(usex shaper)"
-		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_install() {
-	if use ipoe; then
-		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver) vlan_mon(accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver)"
-		linux-mod_src_install
-	fi
-
-	cmake_src_install
-
-	use doc && dodoc -r rfc
-
-	if use snmp; then
-		insinto /usr/share/snmp/mibs
-		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
-
-	keepdir /var/log/accel-ppp
-}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2021-05-17  8:57 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2021-05-17  8:57 UTC (permalink / raw
  To: gentoo-commits

commit:     5f5601126811de0285e0a83c31bb2d203af1eb37
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon May 17 08:47:18 2021 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon May 17 08:57:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f560112

net-dialup/accel-ppp: version bump

- add new snapshot
- add support for dev-libs/libtomcrypt
- sync live ebuild

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>

 net-dialup/accel-ppp/Manifest                      |  1 +
 ...99.ebuild => accel-ppp-1.12.0_p20210430.ebuild} | 31 ++++++++++++++--------
 net-dialup/accel-ppp/accel-ppp-9999.ebuild         | 14 +++++-----
 net-dialup/accel-ppp/metadata.xml                  |  2 ++
 4 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 03fa3a5ef15..070c8e705ac 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1 +1,2 @@
 DIST accel-ppp-1.12.0_p20200913.tar.bz2 1661195 BLAKE2B 6ffdb140486e98c19c981999873f94e767682bec1a2bea1f2feb7bed6ce9d8b15a824605da0b60897501773f4ece9d71612385dd1eff61483fff5daadad9713d SHA512 ecf325774507a8ddb1c6fe3c90aa2e25c72d006e9d96eabf66c7f1b67cfa70fc1073cf120c195d0823ad2532fa3504f6ab482d1842eb8b3e3dbafdb8b16a2ac6
+DIST accel-ppp-1.12.0_p20210430.tar.bz2 1662172 BLAKE2B 7c9da06ca704d63afb16bc8d2bc64541e25d31a062a948c3014f340684a38c7ba55d15eba3458ced90b088788228f97553105fd5d0aebbb1e61fb1b1075ae521 SHA512 de690a44ebaad31c63ec604c306e3d5bc63bd02ea2c17a435c2166ddcc8a3c06b86d72d6ebd88d906093583345962569493231e1657f222d4e66d93bf1d0ca41

diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20210430.ebuild
similarity index 75%
copy from net-dialup/accel-ppp/accel-ppp-9999.ebuild
copy to net-dialup/accel-ppp/accel-ppp-1.12.0_p20210430.ebuild
index fd43b44ecd2..e36b6e06850 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20210430.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 LUA_COMPAT=( lua5-1 )
 
-EGIT_REPO_URI="https://github.com/accel-ppp/accel-ppp.git"
-inherit cmake flag-o-matic git-r3 linux-info linux-mod lua-single
+inherit cmake flag-o-matic linux-info linux-mod lua-single
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
 HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
-SRC_URI=""
+SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc ipoe libtomcrypt lua postgres radius shaper snmp valgrind"
 
-RDEPEND="lua? ( ${LUA_DEPS} )
+RDEPEND="!libtomcrypt? ( dev-libs/openssl:0= )
+	libtomcrypt? ( dev-libs/libtomcrypt:0= )
+	lua? ( ${LUA_DEPS} )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( net-analyzer/net-snmp )
-	dev-libs/libpcre
-	dev-libs/openssl:0="
+	dev-libs/libpcre"
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
 PDEPEND="net-dialup/ppp-scripts"
@@ -33,6 +33,12 @@ CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	valgrind? ( debug )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.11.1-socklen.patch"
+)
+
+S="${WORKDIR}"
+
 pkg_setup() {
 	if use ipoe; then
 		linux-mod_pkg_setup
@@ -52,6 +58,10 @@ src_prepare() {
 		drivers/ipoe/CMakeLists.txt \
 		drivers/vlan_mon/CMakeLists.txt || die
 
+	# Fix version
+	sed -i -e "s/1.11/${PV}/" drivers/ipoe/ipoe.c || die
+	sed -i -e "s/1.11/${PV}/" drivers/vlan_mon/vlan_mon.c || die
+
 	# Bug #549918
 	append-ldflags -Wl,-z,lazy
 
@@ -60,13 +70,12 @@ src_prepare() {
 
 src_configure() {
 	local libdir="$(get_libdir)"
-	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
 	local mycmakeargs=(
 		-DLIB_SUFFIX="${libdir#lib}"
 		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
 		-DBUILD_PPTP_DRIVER=no
 		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
-		-DCRYPTO=OPENSSL
+		-DCRYPTO="$(usex libtomcrypt TOMCRYPT OPENSSL)"
 		-DLOG_PGSQL="$(usex postgres)"
 		-DLUA="$(usex lua TRUE FALSE)"
 		-DMEMDEBUG="$(usex debug)"

diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index fd43b44ecd2..f517be83f27 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,13 +15,14 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind"
+IUSE="debug doc ipoe libtomcrypt lua postgres radius shaper snmp valgrind"
 
-RDEPEND="lua? ( ${LUA_DEPS} )
+RDEPEND="!libtomcrypt? ( dev-libs/openssl:0= )
+	libtomcrypt? ( dev-libs/libtomcrypt:0= )
+	lua? ( ${LUA_DEPS} )
 	postgres? ( dev-db/postgresql:* )
 	snmp? ( net-analyzer/net-snmp )
-	dev-libs/libpcre
-	dev-libs/openssl:0="
+	dev-libs/libpcre"
 DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )"
 PDEPEND="net-dialup/ppp-scripts"
@@ -60,13 +61,12 @@ src_prepare() {
 
 src_configure() {
 	local libdir="$(get_libdir)"
-	# There must be also dev-libs/tomcrypt (TOMCRYPT) as crypto alternative to OpenSSL
 	local mycmakeargs=(
 		-DLIB_SUFFIX="${libdir#lib}"
 		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
 		-DBUILD_PPTP_DRIVER=no
 		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
-		-DCRYPTO=OPENSSL
+		-DCRYPTO="$(usex libtomcrypt TOMCRYPT OPENSSL)"
 		-DLOG_PGSQL="$(usex postgres)"
 		-DLUA="$(usex lua TRUE FALSE)"
 		-DMEMDEBUG="$(usex debug)"

diff --git a/net-dialup/accel-ppp/metadata.xml b/net-dialup/accel-ppp/metadata.xml
index 138dfdc4181..20e35c390d9 100644
--- a/net-dialup/accel-ppp/metadata.xml
+++ b/net-dialup/accel-ppp/metadata.xml
@@ -7,10 +7,12 @@
 	</maintainer>
 	<use>
 		<flag name="ipoe">Build IPoE kernel module</flag>
+		<flag name="libtomcrypt">Support crypto algorithms through <pkg>dev-libs/libtomcrypt</pkg> instead of <pkg>dev-libs/openssl</pkg></flag>
 		<flag name="shaper">Support for traffic shaping</flag>
 		<flag name="valgrind">Compile in valgrind hints</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">xebd/accel-ppp</remote-id>
 		<remote-id type="sourceforge">accel-ppp</remote-id>
 	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2022-10-30 13:09 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2022-10-30 13:09 UTC (permalink / raw
  To: gentoo-commits

commit:     80eb7853b6469f332b15795a354dcdfa62de0a55
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 30 13:08:50 2022 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Sun Oct 30 13:08:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80eb7853

net-dialup/accel-ppp: version bump

Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>

 net-dialup/accel-ppp/Manifest                      |   1 +
 .../accel-ppp/accel-ppp-1.12.0_p20220830.ebuild    | 113 +++++++++++++++++++++
 2 files changed, 114 insertions(+)

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index bf502e82b4ff..6e5de43cd274 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1 +1,2 @@
 DIST accel-ppp-1.12.0_p20210430.tar.bz2 1662172 BLAKE2B 7c9da06ca704d63afb16bc8d2bc64541e25d31a062a948c3014f340684a38c7ba55d15eba3458ced90b088788228f97553105fd5d0aebbb1e61fb1b1075ae521 SHA512 de690a44ebaad31c63ec604c306e3d5bc63bd02ea2c17a435c2166ddcc8a3c06b86d72d6ebd88d906093583345962569493231e1657f222d4e66d93bf1d0ca41
+DIST accel-ppp-1.12.0_p20220830.tar.bz2 1667889 BLAKE2B a6432e29953214202dc67822f358c12ade36eda3e1aaa24e8a2f427ac00ae8192216c76620f3c2946bcf88c95f6167ae9c27ce4a1895c36232110cd73c575a36 SHA512 f6e0baf7dcbf66d3d9eadffeb33216d73d6aa9eef461487d51a3811f042229b38bfec5f192742eb51cc7cfedd0a64ad02a3431bfac91ae37a9aab8c910fdcfa4

diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20220830.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20220830.ebuild
new file mode 100644
index 000000000000..8ea237aff3e1
--- /dev/null
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20220830.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 )
+
+inherit cmake flag-o-matic linux-info linux-mod lua-single
+
+DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
+HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
+SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc ipoe libtomcrypt lua postgres radius shaper snmp valgrind"
+
+RDEPEND="!libtomcrypt? ( dev-libs/openssl:0= )
+	libtomcrypt? ( dev-libs/libtomcrypt:0= )
+	lua? ( ${LUA_DEPS} )
+	postgres? ( dev-db/postgresql:* )
+	snmp? ( net-analyzer/net-snmp )
+	dev-libs/libpcre"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )"
+PDEPEND="net-dialup/ppp-scripts"
+
+DOCS=( README )
+
+CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	valgrind? ( debug )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.11.1-socklen.patch"
+)
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	if use ipoe; then
+		linux-mod_pkg_setup
+		set_arch_to_kernel
+	else
+		linux-info_pkg_setup
+	fi
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	sed -i  -e "/mkdir/d" \
+		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
+
+	# Do not install kernel modules like that - breaks sandbox!
+	sed -i -e '/modules_install/d' \
+		drivers/ipoe/CMakeLists.txt \
+		drivers/vlan_mon/CMakeLists.txt || die
+
+	# Fix version
+	sed -i -e "s/1.11/${PV}/" drivers/ipoe/ipoe.c || die
+	sed -i -e "s/1.11/${PV}/" drivers/vlan_mon/vlan_mon.c || die
+
+	# Bug #549918
+	append-ldflags -Wl,-z,lazy
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DLIB_SUFFIX="${libdir#lib}"
+		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
+		-DBUILD_PPTP_DRIVER=no
+		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
+		-DCRYPTO="$(usex libtomcrypt TOMCRYPT OPENSSL)"
+		-DLOG_PGSQL="$(usex postgres)"
+		-DLUA="$(usex lua TRUE FALSE)"
+		-DMEMDEBUG="$(usex debug)"
+		-DNETSNMP="$(usex snmp)"
+		-DRADIUS="$(usex radius)"
+		-DSHAPER="$(usex shaper)"
+		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+}
+
+src_install() {
+	if use ipoe; then
+		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver) vlan_mon(accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver)"
+		linux-mod_src_install
+	fi
+
+	cmake_src_install
+
+	use doc && dodoc -r rfc
+
+	if use snmp; then
+		insinto /usr/share/snmp/mibs
+		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
+
+	keepdir /var/log/accel-ppp
+}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2022-10-31  7:39 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2022-10-31  7:39 UTC (permalink / raw
  To: gentoo-commits

commit:     add27da50d7df61d5ddbcc7318757d1672268431
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 07:38:18 2022 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 07:38:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=add27da5

net-dialup/accel-ppp: revision bump

Fix some directory paths, that were incorrectly put into /usr
Sync live ebuild, drop old revision

Reported-by: Agostino Sarubbo <ago <AT> gentoo.org>
Closes: https://bugs.gentoo.org/878835
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>

 ...-1.12.0_p20220830.ebuild => accel-ppp-1.12.0_p20220830-r1.ebuild} | 3 +++
 net-dialup/accel-ppp/accel-ppp-9999.ebuild                           | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20220830.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20220830-r1.ebuild
similarity index 95%
rename from net-dialup/accel-ppp/accel-ppp-1.12.0_p20220830.ebuild
rename to net-dialup/accel-ppp/accel-ppp-1.12.0_p20220830-r1.ebuild
index 8ea237aff3e1..201602326ae8 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20220830.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20220830-r1.ebuild
@@ -71,6 +71,8 @@ src_prepare() {
 src_configure() {
 	local libdir="$(get_libdir)"
 	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
 		-DLIB_SUFFIX="${libdir#lib}"
 		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
 		-DBUILD_PPTP_DRIVER=no
@@ -109,5 +111,6 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
 
+	keepdir /var/lib/accel-ppp
 	keepdir /var/log/accel-ppp
 }

diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index f517be83f27b..95ed326921b8 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -62,6 +62,8 @@ src_prepare() {
 src_configure() {
 	local libdir="$(get_libdir)"
 	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DCMAKE_INSTALL_LOCALSTATEDIR="${EPREFIX}/var"
 		-DLIB_SUFFIX="${libdir#lib}"
 		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
 		-DBUILD_PPTP_DRIVER=no
@@ -100,5 +102,6 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
 
+	keepdir /var/lib/accel-ppp
 	keepdir /var/log/accel-ppp
 }


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2022-12-25 23:22 Andreas Sturmlechner
  0 siblings, 0 replies; 31+ messages in thread
From: Andreas Sturmlechner @ 2022-12-25 23:22 UTC (permalink / raw
  To: gentoo-commits

commit:     256ca51f8527b9d2e24063c01bd6cf90ba33ad9f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 25 23:05:00 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 23:21:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=256ca51f

net-dialup/accel-ppp: update EAPI 7 -> 8 of live ebuild

Some bits were synced but not the EAPI-8 bump of commit
80eb7853b6469f332b15795a354dcdfa62de0a55

Bug: https://bugs.gentoo.org/878835
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-dialup/accel-ppp/accel-ppp-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index 95ed326921b8..587d14401f18 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-1 )
 


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2023-01-02 14:04 Andreas Sturmlechner
  0 siblings, 0 replies; 31+ messages in thread
From: Andreas Sturmlechner @ 2023-01-02 14:04 UTC (permalink / raw
  To: gentoo-commits

commit:     da452982d6f15f0be2ad71b51551e7f01bca14eb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 25 23:07:22 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 14:03:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da452982

net-dialup/accel-ppp: drop 1.12.0_p20210430

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-dialup/accel-ppp/Manifest                      |   1 -
 .../accel-ppp/accel-ppp-1.12.0_p20210430.ebuild    | 113 ---------------------
 2 files changed, 114 deletions(-)

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 6e5de43cd274..0a3a23ae9261 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1,2 +1 @@
-DIST accel-ppp-1.12.0_p20210430.tar.bz2 1662172 BLAKE2B 7c9da06ca704d63afb16bc8d2bc64541e25d31a062a948c3014f340684a38c7ba55d15eba3458ced90b088788228f97553105fd5d0aebbb1e61fb1b1075ae521 SHA512 de690a44ebaad31c63ec604c306e3d5bc63bd02ea2c17a435c2166ddcc8a3c06b86d72d6ebd88d906093583345962569493231e1657f222d4e66d93bf1d0ca41
 DIST accel-ppp-1.12.0_p20220830.tar.bz2 1667889 BLAKE2B a6432e29953214202dc67822f358c12ade36eda3e1aaa24e8a2f427ac00ae8192216c76620f3c2946bcf88c95f6167ae9c27ce4a1895c36232110cd73c575a36 SHA512 f6e0baf7dcbf66d3d9eadffeb33216d73d6aa9eef461487d51a3811f042229b38bfec5f192742eb51cc7cfedd0a64ad02a3431bfac91ae37a9aab8c910fdcfa4

diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20210430.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20210430.ebuild
deleted file mode 100644
index e36b6e068503..000000000000
--- a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20210430.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-1 )
-
-inherit cmake flag-o-matic linux-info linux-mod lua-single
-
-DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
-HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
-SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc ipoe libtomcrypt lua postgres radius shaper snmp valgrind"
-
-RDEPEND="!libtomcrypt? ( dev-libs/openssl:0= )
-	libtomcrypt? ( dev-libs/libtomcrypt:0= )
-	lua? ( ${LUA_DEPS} )
-	postgres? ( dev-db/postgresql:* )
-	snmp? ( net-analyzer/net-snmp )
-	dev-libs/libpcre"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-PDEPEND="net-dialup/ppp-scripts"
-
-DOCS=( README )
-
-CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	valgrind? ( debug )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.11.1-socklen.patch"
-)
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	if use ipoe; then
-		linux-mod_pkg_setup
-		set_arch_to_kernel
-	else
-		linux-info_pkg_setup
-	fi
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	sed -i  -e "/mkdir/d" \
-		-e "s: RENAME accel-ppp.conf.dist::" accel-pppd/CMakeLists.txt || die 'sed on accel-pppd/CMakeLists.txt failed'
-
-	# Do not install kernel modules like that - breaks sandbox!
-	sed -i -e '/modules_install/d' \
-		drivers/ipoe/CMakeLists.txt \
-		drivers/vlan_mon/CMakeLists.txt || die
-
-	# Fix version
-	sed -i -e "s/1.11/${PV}/" drivers/ipoe/ipoe.c || die
-	sed -i -e "s/1.11/${PV}/" drivers/vlan_mon/vlan_mon.c || die
-
-	# Bug #549918
-	append-ldflags -Wl,-z,lazy
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DLIB_SUFFIX="${libdir#lib}"
-		-DBUILD_IPOE_DRIVER="$(usex ipoe)"
-		-DBUILD_PPTP_DRIVER=no
-		-DBUILD_VLAN_MON_DRIVER="$(usex ipoe)"
-		-DCRYPTO="$(usex libtomcrypt TOMCRYPT OPENSSL)"
-		-DLOG_PGSQL="$(usex postgres)"
-		-DLUA="$(usex lua TRUE FALSE)"
-		-DMEMDEBUG="$(usex debug)"
-		-DNETSNMP="$(usex snmp)"
-		-DRADIUS="$(usex radius)"
-		-DSHAPER="$(usex shaper)"
-		$(use debug && echo "-DVALGRIND=$(usex valgrind)")
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_install() {
-	if use ipoe; then
-		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver) vlan_mon(accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver)"
-		linux-mod_src_install
-	fi
-
-	cmake_src_install
-
-	use doc && dodoc -r rfc
-
-	if use snmp; then
-		insinto /usr/share/snmp/mibs
-		doins accel-pppd/extra/net-snmp/ACCEL-PPP-MIB.txt
-	fi
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}d
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}d
-
-	keepdir /var/log/accel-ppp
-}


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2023-05-14 17:11 Sam James
  0 siblings, 0 replies; 31+ messages in thread
From: Sam James @ 2023-05-14 17:11 UTC (permalink / raw
  To: gentoo-commits

commit:     c51194948b56c8234c6058b7ff21e3001b756087
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 17:02:09 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 14 17:10:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5119494

net-dialup/accel-ppp: defer to new global USE=valgrind description

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dialup/accel-ppp/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-dialup/accel-ppp/metadata.xml b/net-dialup/accel-ppp/metadata.xml
index cceb0138e687..1218f07536cb 100644
--- a/net-dialup/accel-ppp/metadata.xml
+++ b/net-dialup/accel-ppp/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="ipoe">Build IPoE kernel module</flag>
 		<flag name="libtomcrypt">Support crypto algorithms through <pkg>dev-libs/libtomcrypt</pkg> instead of <pkg>dev-libs/openssl</pkg></flag>
 		<flag name="shaper">Support for traffic shaping</flag>
-		<flag name="valgrind">Compile in valgrind hints</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">xebd/accel-ppp</remote-id>


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2023-06-27 10:05 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2023-06-27 10:05 UTC (permalink / raw
  To: gentoo-commits

commit:     56de063b6822f969abf805834c7ca2ac8b00e203
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 10:02:50 2023 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 10:05:47 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56de063b

net-dialup/accel-ppp: version bump

Migrate to linux-mod-r1 eclass
Sync live ebuild

Closes: https://bugs.gentoo.org/show_bug.cgi?id=907828
Closes: https://bugs.gentoo.org/show_bug.cgi?id=908702
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>

 net-dialup/accel-ppp/Manifest                      |  1 +
 ...99.ebuild => accel-ppp-1.12.0_p20230609.ebuild} | 42 ++++++++++++----------
 net-dialup/accel-ppp/accel-ppp-9999.ebuild         | 27 +++++++-------
 3 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest
index 0a3a23ae9261..1156565a8c2f 100644
--- a/net-dialup/accel-ppp/Manifest
+++ b/net-dialup/accel-ppp/Manifest
@@ -1 +1,2 @@
 DIST accel-ppp-1.12.0_p20220830.tar.bz2 1667889 BLAKE2B a6432e29953214202dc67822f358c12ade36eda3e1aaa24e8a2f427ac00ae8192216c76620f3c2946bcf88c95f6167ae9c27ce4a1895c36232110cd73c575a36 SHA512 f6e0baf7dcbf66d3d9eadffeb33216d73d6aa9eef461487d51a3811f042229b38bfec5f192742eb51cc7cfedd0a64ad02a3431bfac91ae37a9aab8c910fdcfa4
+DIST accel-ppp-1.12.0_p20230609.tar.bz2 1679570 BLAKE2B 3af713135f755215dc6cd4484ca02f182a17c5240b0b6edf2627412391396ccc1de41dc0098b10e2359ea6d9737c6ff177dc753209a50bdc6989103332453d93 SHA512 c78b8accf74e0f047a9c07b1259f18c7cba3a4e5ecdc594bb4fde4bbbc7b33eeac28265da879bdb17f935628f58f0828eebac0e08ec8ca079ac95911e3851ac2

diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20230609.ebuild
similarity index 73%
copy from net-dialup/accel-ppp/accel-ppp-9999.ebuild
copy to net-dialup/accel-ppp/accel-ppp-1.12.0_p20230609.ebuild
index 587d14401f18..a1ae8dea417b 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20230609.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 LUA_COMPAT=( lua5-1 )
-
-EGIT_REPO_URI="https://github.com/accel-ppp/accel-ppp.git"
-inherit cmake flag-o-matic git-r3 linux-info linux-mod lua-single
+MODULES_OPTIONAL_IUSE="ipoe"
+inherit cmake flag-o-matic linux-mod-r1 lua-single
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
 HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
-SRC_URI=""
+SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="debug doc ipoe libtomcrypt lua postgres radius shaper snmp valgrind"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc libtomcrypt lua postgres radius shaper snmp valgrind"
 
 RDEPEND="!libtomcrypt? ( dev-libs/openssl:0= )
 	libtomcrypt? ( dev-libs/libtomcrypt:0= )
@@ -34,13 +33,15 @@ CONFIG_CHECK="~L2TP ~PPPOE ~PPTP"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	valgrind? ( debug )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.11.1-socklen.patch"
+)
+
+S="${WORKDIR}"
+
 pkg_setup() {
-	if use ipoe; then
-		linux-mod_pkg_setup
-		set_arch_to_kernel
-	else
-		linux-info_pkg_setup
-	fi
+	linux-mod-r1_pkg_setup
+	set_arch_to_kernel
 	use lua && lua-single_pkg_setup
 }
 
@@ -53,6 +54,10 @@ src_prepare() {
 		drivers/ipoe/CMakeLists.txt \
 		drivers/vlan_mon/CMakeLists.txt || die
 
+	# Fix version
+	sed -i -e "s/1.11/${PV}/" drivers/ipoe/ipoe.c || die
+	sed -i -e "s/1.11/${PV}/" drivers/vlan_mon/vlan_mon.c || die
+
 	# Bug #549918
 	append-ldflags -Wl,-z,lazy
 
@@ -81,15 +86,16 @@ src_configure() {
 }
 
 src_compile() {
+	local modlist=( ipoe=accel-ppp:${BUILD_DIR}/drivers/ipoe/driver vlan_mon=accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver )
+	MODULES_MAKEARGS+=(
+		KDIR="${KV_OUT_DIR}"
+	)
+	linux-mod-r1_src_compile
 	cmake_src_compile
 }
 
 src_install() {
-	if use ipoe; then
-		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver) vlan_mon(accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver)"
-		linux-mod_src_install
-	fi
-
+	linux-mod-r1_src_install
 	cmake_src_install
 
 	use doc && dodoc -r rfc

diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index 587d14401f18..82f2ef6bca74 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 LUA_COMPAT=( lua5-1 )
-
 EGIT_REPO_URI="https://github.com/accel-ppp/accel-ppp.git"
-inherit cmake flag-o-matic git-r3 linux-info linux-mod lua-single
+MODULES_OPTIONAL_IUSE="ipoe"
+inherit cmake flag-o-matic git-r3 linux-mod-r1 lua-single
 
 DESCRIPTION="High performance PPTP, PPPoE and L2TP server"
 HOMEPAGE="https://sourceforge.net/projects/accel-ppp/"
@@ -15,7 +15,7 @@ SRC_URI=""
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug doc ipoe libtomcrypt lua postgres radius shaper snmp valgrind"
+IUSE="debug doc libtomcrypt lua postgres radius shaper snmp valgrind"
 
 RDEPEND="!libtomcrypt? ( dev-libs/openssl:0= )
 	libtomcrypt? ( dev-libs/libtomcrypt:0= )
@@ -35,12 +35,8 @@ REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
 	valgrind? ( debug )"
 
 pkg_setup() {
-	if use ipoe; then
-		linux-mod_pkg_setup
-		set_arch_to_kernel
-	else
-		linux-info_pkg_setup
-	fi
+	linux-mod-r1_pkg_setup
+	set_arch_to_kernel
 	use lua && lua-single_pkg_setup
 }
 
@@ -81,15 +77,16 @@ src_configure() {
 }
 
 src_compile() {
+	local modlist=( ipoe=accel-ppp:"${BUILD_DIR}/drivers/ipoe/driver" vlan_mon=accel-ppp:"${BUILD_DIR}/drivers/vlan_mon/driver" )
+	MODULES_MAKEARGS+=(
+		KDIR="${KV_OUT_DIR}"
+	)
+	linux-mod-r1_src_compile
 	cmake_src_compile
 }
 
 src_install() {
-	if use ipoe; then
-		local MODULE_NAMES="ipoe(accel-ppp:${BUILD_DIR}/drivers/ipoe/driver) vlan_mon(accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver)"
-		linux-mod_src_install
-	fi
-
+	linux-mod-r1_src_install
 	cmake_src_install
 
 	use doc && dodoc -r rfc


^ permalink raw reply related	[flat|nested] 31+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/
@ 2023-07-31  9:51 Sergey Popov
  0 siblings, 0 replies; 31+ messages in thread
From: Sergey Popov @ 2023-07-31  9:51 UTC (permalink / raw
  To: gentoo-commits

commit:     b650ad79779753a28473addae471493dfb5c4029
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 31 09:48:33 2023 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Jul 31 09:51:49 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b650ad79

net-dialup/accel-ppp: fix build directory for IPoE and VLAN kernel modules

Closes: https://bugs.gentoo.org/909300
Reported-by: Toralf Förster <toralf <AT> gentoo.org>
Suggested-by: h31p <alex.kushnaryov <AT> gmail.com>
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>

 net-dialup/accel-ppp/accel-ppp-1.12.0_p20230609.ebuild | 2 +-
 net-dialup/accel-ppp/accel-ppp-9999.ebuild             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20230609.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20230609.ebuild
index a1ae8dea417b..2ab50ad2083c 100644
--- a/net-dialup/accel-ppp/accel-ppp-1.12.0_p20230609.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20230609.ebuild
@@ -86,7 +86,7 @@ src_configure() {
 }
 
 src_compile() {
-	local modlist=( ipoe=accel-ppp:${BUILD_DIR}/drivers/ipoe/driver vlan_mon=accel-ppp:${BUILD_DIR}/drivers/vlan_mon/driver )
+	local modlist=( ipoe=accel-ppp:drivers/ipoe vlan_mon=accel-ppp:drivers/vlan_mon )
 	MODULES_MAKEARGS+=(
 		KDIR="${KV_OUT_DIR}"
 	)

diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
index 82f2ef6bca74..e247a0e7a433 100644
--- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild
+++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild
@@ -77,7 +77,7 @@ src_configure() {
 }
 
 src_compile() {
-	local modlist=( ipoe=accel-ppp:"${BUILD_DIR}/drivers/ipoe/driver" vlan_mon=accel-ppp:"${BUILD_DIR}/drivers/vlan_mon/driver" )
+	local modlist=( ipoe=accel-ppp:drivers/ipoe vlan_mon=accel-ppp:drivers/vlan_mon )
 	MODULES_MAKEARGS+=(
 		KDIR="${KV_OUT_DIR}"
 	)


^ permalink raw reply related	[flat|nested] 31+ messages in thread

end of thread, other threads:[~2023-07-31  9:51 UTC | newest]

Thread overview: 31+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-23 10:32 [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/ Sergey Popov
  -- strict thread matches above, loose matches on Subject: below --
2023-07-31  9:51 Sergey Popov
2023-06-27 10:05 Sergey Popov
2023-05-14 17:11 Sam James
2023-01-02 14:04 Andreas Sturmlechner
2022-12-25 23:22 Andreas Sturmlechner
2022-10-31  7:39 Sergey Popov
2022-10-30 13:09 Sergey Popov
2021-05-17  8:57 Sergey Popov
2021-05-17  8:57 Sergey Popov
2021-03-25 23:52 Conrad Kostecki
2020-09-14 12:23 Sergey Popov
2020-09-14 12:23 Sergey Popov
2020-09-14 11:02 Sergey Popov
2020-09-14 10:56 Sergey Popov
2020-05-09 10:20 Sergey Popov
2020-01-10 14:54 Michał Górny
2020-01-09 12:25 Sergey Popov
2019-10-09 13:16 Sergey Popov
2019-03-19  7:56 Sergey Popov
2018-03-21 12:52 Sergey Popov
2018-03-21 12:52 Sergey Popov
2017-09-06 21:00 Michał Górny
2017-05-17 13:05 Sergey Popov
2017-05-17 12:56 Sergey Popov
2016-07-18 16:51 Sergey Popov
2016-07-18 12:19 Sergey Popov
2016-07-18 12:19 Sergey Popov
2016-05-05 15:16 Sergey Popov
2016-05-05 15:16 Sergey Popov
2015-12-07  9:27 Sergey Popov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox