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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 82FB0158042 for ; Sat, 19 Oct 2024 01:23:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B411E0871; Sat, 19 Oct 2024 01:23:27 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 70567E0871 for ; Sat, 19 Oct 2024 01:23:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A1B9F340BE0 for ; Sat, 19 Oct 2024 01:23:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B45FDAE7 for ; Sat, 19 Oct 2024 01:23:24 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1729300987.e3012081ca0c8cb575a1630767f693bd124a0874.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/rp-pppoe/, net-dialup/rp-pppoe/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dialup/rp-pppoe/Manifest net-dialup/rp-pppoe/files/rp-pppoe-3.15-no_max_interfaces.patch net-dialup/rp-pppoe/rp-pppoe-3.15-r2.ebuild X-VCS-Directories: net-dialup/rp-pppoe/files/ net-dialup/rp-pppoe/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: e3012081ca0c8cb575a1630767f693bd124a0874 X-VCS-Branch: master Date: Sat, 19 Oct 2024 01:23:24 +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: c960e1cc-ea8e-4f9c-b432-e2695a6d50fe X-Archives-Hash: 8f307e3cb910a575f420817b86238491 commit: e3012081ca0c8cb575a1630767f693bd124a0874 Author: Mike Gilbert gentoo org> AuthorDate: Fri Oct 18 20:54:53 2024 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Oct 19 01:23:07 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3012081 net-dialup/rp-pppoe: drop 3.15-r2 Signed-off-by: Mike Gilbert gentoo.org> net-dialup/rp-pppoe/Manifest | 2 - .../files/rp-pppoe-3.15-no_max_interfaces.patch | 91 --------------------- net-dialup/rp-pppoe/rp-pppoe-3.15-r2.ebuild | 94 ---------------------- 3 files changed, 187 deletions(-) diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest index 5b877da0c975..4f51e9b0b243 100644 --- a/net-dialup/rp-pppoe/Manifest +++ b/net-dialup/rp-pppoe/Manifest @@ -1,3 +1 @@ -DIST rp-pppoe-3.14-patches-01.tar.xz 4708 BLAKE2B d0c294490f5c4c8f3f81fccb8234d5eec2257350a41206bf05882aa7e2aa0e2cb0944a962d77e23451f604376168298d5ef99c70b134989c35261bae6046b882 SHA512 0ae0f91e8b9cfcd7d1a1af6cb55f7972e9bc029cd4b10469d5be696ae750d6aabb5f59426e9bf6f700d5a56decd3ddf85a097bb98ae1d06f0b167967b5b8b8ea -DIST rp-pppoe-3.15.tar.gz 224966 BLAKE2B 85eda606677b71e35ed3b9389db0d01ac1f16c7b40cc31b3adf31946b18454b77867a5e8822386e9fb08455399733242c4c074c2fee6f1c4d62fe23b44e82707 SHA512 a156c084e57361ab6a464c3205ffb85cf86d02f71f17f92c9567f1ab0ed300f10030832fd232084699dc842ac4891efc8c54c8165587bfc7b4c92724318a60d9 DIST rp-pppoe-4.0.tar.gz 139539 BLAKE2B ba9f11e547dafdacf6fc4d525488a4ac0279b06d545e0c116e568c92a45eb8ab558ca9112f1debecacde5401cb5974eacdf972b1b4cd813711589b8181e918de SHA512 faebe543988b1ffacd4d9bf55a3ec21f3a541f9232ba6c7b6fa0e8103d6c2b7b1c358e7f7bc8f99bebb24b2f7bdcc2f46ba1ef4c23e6dd34062f8f28114e7aea diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.15-no_max_interfaces.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.15-no_max_interfaces.patch deleted file mode 100644 index ecf70f09ddc6..000000000000 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.15-no_max_interfaces.patch +++ /dev/null @@ -1,91 +0,0 @@ -pppoe-server: MAX_INTERFACES 64 is a problem for ULS. - -We currently require 77 interfaces, this code just lifts the limit entirely and -will keep adding interfaces for as much RAM as you have to store an array as -required. - -Signed-off-by: Jaco Kroon - -diff -rau rp-pppoe-3.15/src.o/pppoe-server.c rp-pppoe-3.15/src/pppoe-server.c ---- rp-pppoe-3.15.o/src/pppoe-server.c 2021-05-07 15:18:00.000000000 +0200 -+++ rp-pppoe-3.15/src/pppoe-server.c 2021-12-07 21:53:46.755693003 +0200 -@@ -115,8 +115,9 @@ - ClientSession *BusySessions = NULL; - - /* Interfaces we're listening on */ --Interface interfaces[MAX_INTERFACES]; -+Interface *interfaces = NULL; - int NumInterfaces = 0; -+int MaxInterfaces = 0; - - /* The number of session slots */ - size_t NumSessionSlots; -@@ -1235,11 +1236,16 @@ - exit(1); - } - -- memset(interfaces, 0, sizeof(interfaces)); -- - /* Initialize syslog */ - openlog("pppoe-server", LOG_PID, LOG_DAEMON); - -+ MaxInterfaces = INIT_INTERFACES; -+ interfaces = malloc(sizeof(*interfaces) * INIT_INTERFACES); -+ if (!interfaces) { -+ fprintf(stderr, "Out of memory allocating initial interfaces.\n"); -+ exit(1); -+ } -+ - /* Default number of session slots */ - NumSessionSlots = DEFAULT_MAX_SESSIONS; - MaxSessionsPerMac = 0; /* No limit */ -@@ -1406,10 +1412,14 @@ - break; - - case 'I': -- if (NumInterfaces >= MAX_INTERFACES) { -- fprintf(stderr, "Too many -I options (max %d)\n", -- MAX_INTERFACES); -- exit(EXIT_FAILURE); -+ if (NumInterfaces >= MaxInterfaces) { -+ MaxInterfaces *= 2; -+ interfaces = realloc(interfaces, sizeof(*interfaces) * MaxInterfaces); -+ if (!interfaces) { -+ fprintf(stderr, "Memory allocation failure trying to increase MaxInterfaces to %d\n", -+ MaxInterfaces); -+ exit(EXIT_FAILURE); -+ } - } - found = 0; - for (i=0; i