commit: 44040310ba621120a3d6eee12441f990e7ccaa1b Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> AuthorDate: Mon Sep 21 08:31:08 2020 +0000 Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org> CommitDate: Mon Sep 21 08:31:34 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44040310
net-dialup/accel-ppp: drop old version 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 - net-dialup/accel-ppp/accel-ppp-1.12.0-r1.ebuild | 108 -------- .../files/accel-ppp-1.12.0-kernel-5.2.patch | 282 --------------------- 3 files changed, 391 deletions(-) diff --git a/net-dialup/accel-ppp/Manifest b/net-dialup/accel-ppp/Manifest index e3e8b2a8bf6..03fa3a5ef15 100644 --- a/net-dialup/accel-ppp/Manifest +++ b/net-dialup/accel-ppp/Manifest @@ -1,2 +1 @@ -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-r1.ebuild b/net-dialup/accel-ppp/accel-ppp-1.12.0-r1.ebuild deleted file mode 100644 index 7c3f0f8b2be..00000000000 --- a/net-dialup/accel-ppp/accel-ppp-1.12.0-r1.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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://download.sourceforge.net/accel-ppp/${P}.tar.bz2 -> ${P}.tar" - -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" - "${FILESDIR}/${P}-kernel-5.2.patch" -) - -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-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 TRUE FALSE)" - -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 - - keepdir /var/log/accel-ppp -} diff --git a/net-dialup/accel-ppp/files/accel-ppp-1.12.0-kernel-5.2.patch b/net-dialup/accel-ppp/files/accel-ppp-1.12.0-kernel-5.2.patch deleted file mode 100644 index 8300908a2d2..00000000000 --- a/net-dialup/accel-ppp/files/accel-ppp-1.12.0-kernel-5.2.patch +++ /dev/null @@ -1,282 +0,0 @@ -From 4d837cc3bd92493732f2c598560e9e83c82f9b9e Mon Sep 17 00:00:00 2001 -From: Dmitry Kozlov <x...@mail.ru> -Date: Tue, 24 Dec 2019 14:50:04 +0300 -Subject: [PATCH] ipoe,vlan_mon: add support for kernels 5.2+ - ---- - drivers/ipoe/ipoe.c | 58 +++++++++++++++++++++++++++++-------- - drivers/vlan_mon/vlan_mon.c | 37 +++++++++++++++++------ - 2 files changed, 74 insertions(+), 21 deletions(-) - -diff --git a/drivers/ipoe/ipoe.c b/drivers/ipoe/ipoe.c -index f3acb3f5..6ac6d77a 100644 ---- a/drivers/ipoe/ipoe.c -+++ b/drivers/ipoe/ipoe.c -@@ -174,6 +174,10 @@ static struct genl_multicast_group ipoe_nl_mcg; - #define NETIF_F_HW_VLAN_FILTER NETIF_F_HW_VLAN_CTAG_FILTER - #endif - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) -+#define nla_nest_start_noflag(skb, attr) nla_nest_start(skb, attr) -+#endif -+ - static inline int hash_addr(__be32 addr) - { - #ifdef __LITTLE_ENDIAN -@@ -255,8 +259,13 @@ static int check_nat_required(struct sk_buff *skb, struct net_device *link) - if (IS_ERR(rt)) - return 0; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) - if (rt->rt_gateway || (rt->dst.dev != link && rt->dst.dev != skb->dev)) - r = 1; -+#else -+ if (rt->rt_gw4 || (rt->dst.dev != link && rt->dst.dev != skb->dev)) -+ r = 1; -+#endif - - ip_rt_put(rt); - -@@ -616,7 +625,7 @@ static void ipoe_process_queue(struct work_struct *w) - } - - if (report_skb) { -- ns = nla_nest_start(report_skb, id++); -+ ns = nla_nest_start_noflag(report_skb, id++); - if (!ns) - goto nl_err; - -@@ -1729,7 +1738,7 @@ static int ipoe_nl_cmd_del_net(struct sk_buff *skb, struct genl_info *info) - return 0; - } - --static struct nla_policy ipoe_nl_policy[IPOE_ATTR_MAX + 1] = { -+static const struct nla_policy ipoe_nl_policy[IPOE_ATTR_MAX + 1] = { - [IPOE_ATTR_NONE] = { .type = NLA_UNSPEC, }, - [IPOE_ATTR_ADDR] = { .type = NLA_U32, }, - [IPOE_ATTR_PEER_ADDR] = { .type = NLA_U32, }, -@@ -1741,71 +1750,93 @@ static struct nla_policy ipoe_nl_policy[IPOE_ATTR_MAX + 1] = { - [IPOE_ATTR_LINK_IFINDEX]= { .type = NLA_U32, }, - }; - --static struct genl_ops ipoe_nl_ops[] = { -+static const struct genl_ops ipoe_nl_ops[] = { - { - .cmd = IPOE_CMD_NOOP, - .doit = ipoe_nl_cmd_noop, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) - .policy = ipoe_nl_policy, -+#endif - /* can be retrieved by unprivileged users */ - }, - { - .cmd = IPOE_CMD_CREATE, - .doit = ipoe_nl_cmd_create, -- .policy = ipoe_nl_policy, - .flags = GENL_ADMIN_PERM, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) -+ .policy = ipoe_nl_policy, -+#endif - }, - { - .cmd = IPOE_CMD_DELETE, - .doit = ipoe_nl_cmd_delete, -- .policy = ipoe_nl_policy, - .flags = GENL_ADMIN_PERM, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) -+ .policy = ipoe_nl_policy, -+#endif - }, - { - .cmd = IPOE_CMD_MODIFY, - .doit = ipoe_nl_cmd_modify, -- .policy = ipoe_nl_policy, - .flags = GENL_ADMIN_PERM, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) -+ .policy = ipoe_nl_policy, -+#endif - }, - { - .cmd = IPOE_CMD_GET, - .dumpit = ipoe_nl_cmd_dump_sessions, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) - .policy = ipoe_nl_policy, -+#endif - }, - { - .cmd = IPOE_CMD_ADD_IF, - .doit = ipoe_nl_cmd_add_interface, -- .policy = ipoe_nl_policy, - .flags = GENL_ADMIN_PERM, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) -+ .policy = ipoe_nl_policy, -+#endif - }, - { - .cmd = IPOE_CMD_DEL_IF, - .doit = ipoe_nl_cmd_del_interface, -- .policy = ipoe_nl_policy, - .flags = GENL_ADMIN_PERM, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) -+ .policy = ipoe_nl_policy, -+#endif - }, - { - .cmd = IPOE_CMD_ADD_EXCLUDE, - .doit = ipoe_nl_cmd_add_exclude, -- .policy = ipoe_nl_policy, - .flags = GENL_ADMIN_PERM, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) -+ .policy = ipoe_nl_policy, -+#endif - }, - { - .cmd = IPOE_CMD_DEL_EXCLUDE, - .doit = ipoe_nl_cmd_del_exclude, -- .policy = ipoe_nl_policy, - .flags = GENL_ADMIN_PERM, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) -+ .policy = ipoe_nl_policy, -+#endif - }, - { - .cmd = IPOE_CMD_ADD_NET, - .doit = ipoe_nl_cmd_add_net, -- .policy = ipoe_nl_policy, - .flags = GENL_ADMIN_PERM, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) -+ .policy = ipoe_nl_policy, -+#endif - }, - { - .cmd = IPOE_CMD_DEL_NET, - .doit = ipoe_nl_cmd_del_net, -- .policy = ipoe_nl_policy, - .flags = GENL_ADMIN_PERM, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) -+ .policy = ipoe_nl_policy, -+#endif - }, - }; - -@@ -1834,6 +1865,9 @@ static struct genl_family ipoe_nl_family = { - .mcgrps = ipoe_nl_mcgs, - .n_mcgrps = ARRAY_SIZE(ipoe_nl_mcgs), - #endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0) -+ .policy = ipoe_nl_policy, -+#endif - }; - - static const struct net_device_ops ipoe_netdev_ops = { -diff --git a/drivers/vlan_mon/vlan_mon.c b/drivers/vlan_mon/vlan_mon.c -index b6476d4c..271f2ff1 100644 ---- a/drivers/vlan_mon/vlan_mon.c -+++ b/drivers/vlan_mon/vlan_mon.c -@@ -43,6 +43,10 @@ - #define vlan_tx_tag_present(skb) skb_vlan_tag_present(skb) - #endif - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) -+#define nla_nest_start_noflag(skb, attr) nla_nest_start(skb, attr) -+#endif -+ - struct vlan_dev { - unsigned int magic; - int ifindex; -@@ -198,13 +202,13 @@ static void vlan_do_notify(struct work_struct *w) - #if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0) && RHEL_MAJOR < 7 - header = genlmsg_put(report_skb, 0, vlan_mon_nl_mcg.id, &vlan_mon_nl_family, 0, VLAN_MON_NOTIFY); - #else -- header = genlmsg_put(report_skb, 0, vlan_mon_nl_family.mcgrp_offset, &vlan_mon_nl_family, 0, VLAN_MON_NOTIFY); -+ header = genlmsg_put(report_skb, 0, 0, &vlan_mon_nl_family, 0, VLAN_MON_NOTIFY); - #endif - } - - //pr_info("notify %i vlan %i\n", id, n->vid); - -- ns = nla_nest_start(report_skb, id++); -+ ns = nla_nest_start_noflag(report_skb, id++); - if (!ns) - goto nl_err; - -@@ -616,7 +620,7 @@ static int vlan_mon_nl_cmd_check_busy(struct sk_buff *skb, struct genl_info *inf - return ret; - } - --static struct nla_policy vlan_mon_nl_policy[VLAN_MON_ATTR_MAX + 1] = { -+static const struct nla_policy vlan_mon_nl_policy[VLAN_MON_ATTR_MAX + 1] = { - [VLAN_MON_ATTR_NONE] = { .type = NLA_UNSPEC, }, - [VLAN_MON_ATTR_VLAN_MASK] = { .type = NLA_BINARY, .len = 4096/8 }, - [VLAN_MON_ATTR_PROTO] = { .type = NLA_U16, }, -@@ -624,42 +628,54 @@ static struct nla_policy vlan_mon_nl_policy[VLAN_MON_ATTR_MAX + 1] = { - [VLAN_MON_ATTR_VID] = { .type = NLA_U16, }, - }; - --static struct genl_ops vlan_mon_nl_ops[] = { -+static const struct genl_ops vlan_mon_nl_ops[] = { - { - .cmd = VLAN_MON_CMD_NOOP, - .doit = vlan_mon_nl_cmd_noop, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) - .policy = vlan_mon_nl_policy, -+#endif - /* can be retrieved by unprivileged users */ - }, - { - .cmd = VLAN_MON_CMD_ADD, - .doit = vlan_mon_nl_cmd_add_vlan_mon, -- .policy = vlan_mon_nl_policy, - .flags = GENL_ADMIN_PERM, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) -+ .policy = vlan_mon_nl_policy, -+#endif - }, - { - .cmd = VLAN_MON_CMD_ADD_VID, - .doit = vlan_mon_nl_cmd_add_vlan_mon_vid, -- .policy = vlan_mon_nl_policy, - .flags = GENL_ADMIN_PERM, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) -+ .policy = vlan_mon_nl_policy, -+#endif - }, - { - .cmd = VLAN_MON_CMD_DEL, - .doit = vlan_mon_nl_cmd_del_vlan_mon, -- .policy = vlan_mon_nl_policy, - .flags = GENL_ADMIN_PERM, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) -+ .policy = vlan_mon_nl_policy, -+#endif - }, - { - .cmd = VLAN_MON_CMD_CHECK_BUSY, - .doit = vlan_mon_nl_cmd_check_busy, -- .policy = vlan_mon_nl_policy, - .flags = GENL_ADMIN_PERM, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) -+ .policy = vlan_mon_nl_policy, -+#endif - }, - { - .cmd = VLAN_MON_CMD_DEL_VID, - .doit = vlan_mon_nl_cmd_del_vlan_mon_vid, -- .policy = vlan_mon_nl_policy, - .flags = GENL_ADMIN_PERM, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,2,0) -+ .policy = vlan_mon_nl_policy, -+#endif - }, - }; - -@@ -688,6 +704,9 @@ static struct genl_family vlan_mon_nl_family = { - .mcgrps = vlan_mon_nl_mcgs, - .n_mcgrps = ARRAY_SIZE(vlan_mon_nl_mcgs), - #endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,2,0) -+ .policy = vlan_mon_nl_policy, -+#endif - }; - - static struct packet_type vlan_pt __read_mostly = {
