From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DA4A01382C5 for ; Tue, 22 Dec 2020 19:56:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28C932BC00D; Tue, 22 Dec 2020 19:56:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 022552BC00D for ; Tue, 22 Dec 2020 19:56:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A88B6340DB4 for ; Tue, 22 Dec 2020 19:56:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 191324E for ; Tue, 22 Dec 2020 19:56:22 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1608666972.292933c82b06f3a1a3a64716476ab1287846aafd.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/accel-ppp/, profiles/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild net-dialup/accel-ppp/accel-ppp-9999.ebuild profiles/package.mask X-VCS-Directories: profiles/ net-dialup/accel-ppp/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 292933c82b06f3a1a3a64716476ab1287846aafd X-VCS-Branch: master Date: Tue, 22 Dec 2020 19:56:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 396156f0-bb86-496b-8982-4869fbae2aa6 X-Archives-Hash: 81e3006cfa37008ada0fa5b5cd0d349c commit: 292933c82b06f3a1a3a64716476ab1287846aafd Author: Marek Szuba gentoo org> AuthorDate: Tue Dec 22 19:54:28 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Tue Dec 22 19:56:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=292933c8 net-dialup/accel-ppp: migrate to lua-single.eclass Locked to lua5.1 by upstream build scripts. Closes: https://bugs.gentoo.org/752792 Signed-off-by: Marek Szuba gentoo.org> ...uild => accel-ppp-1.12.0_p20200913-r100.ebuild} | 25 ++++++++++++++++------ net-dialup/accel-ppp/accel-ppp-9999.ebuild | 10 ++++++--- profiles/package.mask | 1 + 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/net-dialup/accel-ppp/accel-ppp-9999.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild similarity index 80% copy from net-dialup/accel-ppp/accel-ppp-9999.ebuild copy to net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild index 3f8aec7348a..7443db97680 100644 --- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild +++ b/net-dialup/accel-ppp/accel-ppp-1.12.0_p20200913-r100.ebuild @@ -3,19 +3,20 @@ EAPI=7 -EGIT_REPO_URI="https://github.com/accel-ppp/accel-ppp.git" -inherit cmake flag-o-matic git-r3 linux-info linux-mod +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="" +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 ) +RDEPEND="lua? ( ${LUA_DEPS} ) postgres? ( dev-db/postgresql:* ) snmp? ( net-analyzer/net-snmp ) dev-libs/libpcre @@ -28,7 +29,14 @@ DOCS=( README ) CONFIG_CHECK="~L2TP ~PPPOE ~PPTP" -REQUIRED_USE="valgrind? ( debug )" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + valgrind? ( debug )" + +PATCHES=( + "${FILESDIR}/${PN}-1.11.1-socklen.patch" +) + +S="${WORKDIR}" pkg_setup() { if use ipoe; then @@ -37,6 +45,7 @@ pkg_setup() { else linux-info_pkg_setup fi + use lua && lua-single_pkg_setup } src_prepare() { @@ -48,6 +57,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 3f8aec7348a..fd43b44ecd2 100644 --- a/net-dialup/accel-ppp/accel-ppp-9999.ebuild +++ b/net-dialup/accel-ppp/accel-ppp-9999.ebuild @@ -3,8 +3,10 @@ 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 +inherit cmake flag-o-matic git-r3 linux-info linux-mod lua-single DESCRIPTION="High performance PPTP, PPPoE and L2TP server" HOMEPAGE="https://sourceforge.net/projects/accel-ppp/" @@ -15,7 +17,7 @@ SLOT="0" KEYWORDS="" IUSE="debug doc ipoe lua postgres radius shaper snmp valgrind" -RDEPEND="lua? ( dev-lang/lua:0 ) +RDEPEND="lua? ( ${LUA_DEPS} ) postgres? ( dev-db/postgresql:* ) snmp? ( net-analyzer/net-snmp ) dev-libs/libpcre @@ -28,7 +30,8 @@ DOCS=( README ) CONFIG_CHECK="~L2TP ~PPPOE ~PPTP" -REQUIRED_USE="valgrind? ( debug )" +REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) + valgrind? ( debug )" pkg_setup() { if use ipoe; then @@ -37,6 +40,7 @@ pkg_setup() { else linux-info_pkg_setup fi + use lua && lua-single_pkg_setup } src_prepare() { diff --git a/profiles/package.mask b/profiles/package.mask index 9aa573146ec..af34e5ed319 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -550,6 +550,7 @@ kde-apps/kdebase-meta:5 >=net-analyzer/suricata-6.0.1-r100 >=net-analyzer/tracebox-0.4.4-r100 >=net-analyzer/wireshark-3.4.2-r100 +>=net-dialup/accel-ppp-1.12.0_p20200913-r100 >=net-dns/dnsmasq-2.82-r100 >=net-im/prosody-0.11.7-r100 >=net-im/swift-4.0.2-r100