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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 51A7A15ACFB for ; Sun, 23 Apr 2023 15:52:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C41DE0C41; Sun, 23 Apr 2023 15:52:46 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 5950EE0C41 for ; Sun, 23 Apr 2023 15:52:46 +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 7CDA234135D for ; Sun, 23 Apr 2023 15:52:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C63077DE for ; Sun, 23 Apr 2023 15:52:42 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1682265152.13a82e2cd8fea769d8d7215fbd0db5c5a33e0dcb.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/networkmanager-l2tp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-1.patch net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-2.patch X-VCS-Directories: net-vpn/networkmanager-l2tp/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 13a82e2cd8fea769d8d7215fbd0db5c5a33e0dcb X-VCS-Branch: master Date: Sun, 23 Apr 2023 15:52:42 +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: d1509133-9d07-4ba3-b164-a93634e95d21 X-Archives-Hash: 9c493955d814ca02d004b06cab9280f7 commit: 13a82e2cd8fea769d8d7215fbd0db5c5a33e0dcb Author: Sam James gentoo org> AuthorDate: Sun Apr 23 15:40:29 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Apr 23 15:52:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13a82e2c net-vpn/networkmanager-l2tp: fix patch rename metadata Closes: https://bugs.gentoo.org/904875 Signed-off-by: Sam James gentoo.org> .../networkmanager-l2tp-1.20.8-ppp-2.5.0-1.patch | 9 +++++++++ .../networkmanager-l2tp-1.20.8-ppp-2.5.0-2.patch | 20 ++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-1.patch b/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-1.patch index 4ff829048c20..215ee2e10465 100644 --- a/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-1.patch +++ b/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-1.patch @@ -11,6 +11,13 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eivind Næss +--- + configure.ac | 46 +++++++++++++++++++++++++++++++++++++-- + src/nm-l2tp-pppd-plugin.c | 20 +++++++++-------- + 2 files changed, 55 insertions(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index baf8d44..b925eb0 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,10 @@ dnl @@ -90,6 +97,8 @@ Signed-off-by: Eivind Næss ], [have_eap_tls=yes] , [have_eap_tls=no]) if test "x${have_eap_tls}" = "xno"; then +diff --git a/src/nm-l2tp-pppd-plugin.c b/src/nm-l2tp-pppd-plugin.c +index 71a7878..dd752a1 100644 --- a/src/nm-l2tp-pppd-plugin.c +++ b/src/nm-l2tp-pppd-plugin.c @@ -9,11 +9,6 @@ diff --git a/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-2.patch b/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-2.patch index 1625c57a4bc8..e0a83350af44 100644 --- a/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-2.patch +++ b/net-vpn/networkmanager-l2tp/files/networkmanager-l2tp-1.20.8-ppp-2.5.0-2.patch @@ -11,6 +11,18 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eivind Næss +--- + Makefile.am | 5 +- + src/nm-l2tp-pppd-compat.h | 93 +++++++++++++++++++ + src/nm-l2tp-pppd-plugin.c | 7 +- + ...{nm-ppp-status.h => nm-l2tp-pppd-status.h} | 0 + src/nm-l2tp-service.c | 2 +- + 5 files changed, 100 insertions(+), 7 deletions(-) + create mode 100644 src/nm-l2tp-pppd-compat.h + rename src/{nm-ppp-status.h => nm-l2tp-pppd-status.h} (100%) + +diff --git a/Makefile.am b/Makefile.am +index 8201ca7..1feb9be 100644 --- a/Makefile.am +++ b/Makefile.am @@ -99,7 +99,7 @@ src_nm_l2tp_service_SOURCES = \ @@ -32,6 +44,9 @@ Signed-off-by: Eivind Næss src_nm_l2tp_pppd_plugin_la_CPPFLAGS = $(src_cppflags) src_nm_l2tp_pppd_plugin_la_LDFLAGS = \ -module -avoid-version +diff --git a/src/nm-l2tp-pppd-compat.h b/src/nm-l2tp-pppd-compat.h +new file mode 100644 +index 0000000..80e2891 --- /dev/null +++ b/src/nm-l2tp-pppd-compat.h @@ -0,0 +1,93 @@ @@ -128,6 +143,8 @@ Signed-off-by: Eivind Næss + +#endif // #if WITH_PPP_VERSION < PPP_VERSION(2,5,0) +#endif // #ifdef __NM_L2TP_PPPD_COMPAT_H__ +diff --git a/src/nm-l2tp-pppd-plugin.c b/src/nm-l2tp-pppd-plugin.c +index dd752a1..f1d588e 100644 --- a/src/nm-l2tp-pppd-plugin.c +++ b/src/nm-l2tp-pppd-plugin.c @@ -9,8 +9,6 @@ @@ -153,9 +170,12 @@ Signed-off-by: Eivind Næss #include "nm-utils/nm-shared-utils.h" #include "nm-utils/nm-vpn-plugin-macros.h" +diff --git a/src/nm-ppp-status.h b/src/nm-l2tp-pppd-status.h similarity index 100% rename from src/nm-ppp-status.h rename to src/nm-l2tp-pppd-status.h +diff --git a/src/nm-l2tp-service.c b/src/nm-l2tp-service.c +index 55f9542..629923c 100644 --- a/src/nm-l2tp-service.c +++ b/src/nm-l2tp-service.c @@ -36,7 +36,7 @@