commit: 13a82e2cd8fea769d8d7215fbd0db5c5a33e0dcb Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Apr 23 15:40:29 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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 <[email protected]> +--- + 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 <[email protected]> ], [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 <[email protected]> +--- + 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 <[email protected]> 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 <[email protected]> + +#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 <[email protected]> #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 @@
