gentoo auto-resync : 23:04:2023 - 18:08:08

9 files changed, 75 insertions, 8 deletions

diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 73257684417d..f9843df22ff8 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/networkmanager-fortisslvpn/Manifest b/net-vpn/networkmanager-fortisslvpn/Manifest
index a05277003e9a..f05705167ba6 100644
--- a/net-vpn/networkmanager-fortisslvpn/Manifest
+++ b/net-vpn/networkmanager-fortisslvpn/Manifest
@@ -1,9 +1,9 @@
-AUX networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch 8202 BLAKE2B 7d1468e7aa6afaba82e0c7b961fe8e60e9bbf831749f6b14125fc5efd7c88c6cd468080a1dd0fbd304717cfa6e17fac9ebb4a50ca98b6d5f65c87161d356214d SHA512 78a49ea9330fefdd85558820e8424ddb24cbf6d2f8052d46db31b06af140a7886ec998cdf4a76c1c7e0dfd9b79b2c5934a0696536b2ec91b3893cb425fb8f45a
-AUX networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-2.patch 865 BLAKE2B 1fc9035e3fba62b1db8af99bcef8dbe5ad722e2c816290e168dce37e7f826b7fb44a2ea70df04a492583640654f8de5af7fce33fe4b6174e427832ac215e25f7 SHA512 b497e0c83fba95a153c80a9655422d76cd5985e413b509166047edf482f5129385f30dbb167c07fc1658c11bee601f46fe44b7d9083b531f9e7ac124cd80af10
-AUX networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-3.patch 5362 BLAKE2B 486c6ab5ba11135a410e05abd55b8b6699fcbce24c7eafea596e9f01a8a353e7fb833062c8971be230fb01eb8c67ed9b9d4ba5195371f16356ed4a3fd8e5a1a0 SHA512 fbbabce7973e8129f51a2ee0ed152f458c0fd73eea361ef205e9cc6fd3164527f43f7ed2fcbc9d0a32d1c3fba5c06cc2a415276d34e68a220189854393ea93eb
+AUX networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch 9282 BLAKE2B 883cb353fd209f378cbd44992b4443a72ae07019b5093ea68acf011d0ace7cff553c82ed310a27b62574804073c57be7c0f65b1a6016be68e3152167b64850b9 SHA512 befea685a857f5570663f46f827fee65debf89a080c38ef9ee5649ad78cf08c744ae7853c8d63c671f272f2c57425836583dfcbd9666b8db016585bb4e8c7fcf
+AUX networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-2.patch 1014 BLAKE2B d5da9682c0acfe58fecf6cde9f3709a05b3b00e2d9cefac41ff6c541668df62c1b19fd524e376616f935266e25089ccebee7b3598e0c6ae2b5492cb358b46b8e SHA512 3c6ff0a103f6cc9906cb63a4256df14db87f50d14cb0ce5ad4ef1cf5d31c0ed7d49e6e2229ded394177f47ebf399022c66aee62cb839386c2b3ce5df65a8c28f
+AUX networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-3.patch 5756 BLAKE2B 65e73bdf3399ba4c9a6846e21d94c14916d548e261d8e0d68a36dd23fd598addc1205442b8cbe297fe523f62f7ed0bdf1cec820209603d5f4c6d3da3ab909c4f SHA512 026c736d77d9f2290107bcd9620a9699f3756860f576469f176833c93255de6e2a2e3334beb5ac158eea5aebcc1e83240c43587b8e1e16cb8cf8e1bb1668bfad
 DIST NetworkManager-fortisslvpn-1.3.90.tar.xz 375416 BLAKE2B d2e07a2f79685cb600b6c0abca52a54911ff41534c152e9c5befe25d436757ba517d84cc474ff5c200ae62ca019296871fc29dc8342788295b3e59be55fa8198 SHA512 98b3e524cbb33c8dcdb325b10d227f88534948d98ca8009f770e48b87d42637762ba5343f081ac583b77c3387cb47f2660be0f60430ede237f812a2af8d9a7aa
 DIST NetworkManager-fortisslvpn-1.4.0.tar.xz 381964 BLAKE2B 11cbcd0077a6636feaf04fc191bb78b269f1fcb13ae5ebc3f2d1fe239570e9955406b5f2ff76f6ea0f297e3425e6dac816a0a79f2c2a0723bae51e9fe42fa34d SHA512 94e96f204262825f3d525c96b5f135b31d9a3bb382bd2baf3fafdceb08768321331d4bd4f6af8879a8818e3bad854cdf057c9915e0ac9aee09d17e83b9d12d54
 EBUILD networkmanager-fortisslvpn-1.3.90.ebuild 1071 BLAKE2B b4ba9a550c464b4b9f2e9e6468415b26645a002c2106346a48f2f6122a32bf44707956abfe0c8415ee3573325dfbb2b4a746a3d6c93b321da16ac9ac4a800e20 SHA512 ae8f948778c018a5ecda4e973935c3cba416a3596df01d9ebe59261e095115ccb78a7497c89b541a12ed9cc454a315e837da3cdd350a7d6af08f69e72942b916
-EBUILD networkmanager-fortisslvpn-1.4.0-r2.ebuild 1189 BLAKE2B 28b48ae8f25e86199c41bcd012de3d1d6ed77259be496cd1223fac05f05da57a4e8e1331a57d41dbd61d17d3a5c8891e87a92535f08607872021d8e093b54545 SHA512 d641c49a693c46f5b065590c0fd1c89e7d04cb2c72a7bf032e11a44a80a0ad02452c7324bb782653243ae9ffad6fc4bd709ccfad018243aa313bdd610b1c8bd6
+EBUILD networkmanager-fortisslvpn-1.4.0-r2.ebuild 1200 BLAKE2B b040a3f67db96a7a88ab452605d986e9746ad855530b5dabfe287cfd6a8aee933e8aa04b943e8cd623692a5e3901cfd71519d5c9dc00bec92fcc34ce87e4f5c4 SHA512 5f9de97443409911e685ce9b0eee44d2d1de0478face6b9d824e19f9bdfc215b5c5a390fd2439904ab5b8f037ab53f5d446b88ca11bdf3c3cd1449609ea46198
 EBUILD networkmanager-fortisslvpn-1.4.0.ebuild 1122 BLAKE2B 1af8b38f7e4c6244ad8419529558147a769f32dd4223f832a2f4b9cddec738e0078982d2c54ae80477d86fa18f719d7d6495bbe74c45f9a72e3cc4d9e1f07436 SHA512 23c6b224cf9b67a4189314e4a3bb31545c5f0df83af9e3ac9f2ef44c671a5005a0b7121abfc38bf23ccfdfffc23e7c0a24454dff64cf64a21ce3e2e2d660d0b8
 MISC metadata.xml 518 BLAKE2B ddeb630701cdb97695694b7f696481050bf67f59e9440c80b447e6ffe3a439011abdebeeff1ac47aa8c29ec95526772ac99b6be484e59ab2950414a7007171c1 SHA512 24738222e6aa68582b218274615ad1a4bcc235a98eba3ee95fa1beae259fe63ac34e4d4a1a08861e2835d34da9249bc2612f8c658ea12f152517e00e76d2663f
diff --git a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch
index 71da31e3e435..15d26822b71c 100644
--- a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch
+++ b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-1.patch
@@ -11,6 +11,19 @@ Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
+---
+ Makefile.am                                   |  5 +-
+ configure.ac                                  | 37 +++++++-
+ src/nm-fortisslvpn-pppd-compat.h              | 93 +++++++++++++++++++
+ src/nm-fortisslvpn-pppd-plugin.c              | 24 ++---
+ ...-status.h => nm-fortisslvpn-pppd-status.h} |  0
+ src/nm-fortisslvpn-service.c                  |  2 +-
+ 6 files changed, 145 insertions(+), 16 deletions(-)
+ create mode 100644 src/nm-fortisslvpn-pppd-compat.h
+ rename src/{nm-ppp-status.h => nm-fortisslvpn-pppd-status.h} (100%)
+
+diff --git a/Makefile.am b/Makefile.am
+index b2e5533..e1e5ec9 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -81,7 +81,7 @@ libexec_PROGRAMS += src/nm-fortisslvpn-service
@@ -32,6 +45,8 @@ Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
  nodist_src_nm_fortisslvpn_pppd_plugin_la_SOURCES = \
  	src/nm-fortisslvpn-pppd-service-dbus.h
  src_nm_fortisslvpn_pppd_plugin_la_CPPFLAGS = $(src_cppflags)
+diff --git a/configure.ac b/configure.ac
+index a998707..877493e 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -19,7 +19,10 @@ AC_PROG_CC
@@ -98,6 +113,9 @@ Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
  dnl
  dnl Checks for typedefs, structures, and compiler characteristics.
  dnl
+diff --git a/src/nm-fortisslvpn-pppd-compat.h b/src/nm-fortisslvpn-pppd-compat.h
+new file mode 100644
+index 0000000..9a02908
 --- /dev/null
 +++ b/src/nm-fortisslvpn-pppd-compat.h
 @@ -0,0 +1,93 @@
@@ -194,6 +212,8 @@ Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
 +
 +#endif // #if WITH_PPP_VERSION < PPP_VERSION(2,5,0)
 +#endif // #ifdef __NM_FORTISSLVPN_PPPD_COMPAT_H__
+diff --git a/src/nm-fortisslvpn-pppd-plugin.c b/src/nm-fortisslvpn-pppd-plugin.c
+index f2ad262..c2efb9a 100644
 --- a/src/nm-fortisslvpn-pppd-plugin.c
 +++ b/src/nm-fortisslvpn-pppd-plugin.c
 @@ -23,12 +23,6 @@
@@ -266,9 +286,12 @@ Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
 +#endif	
  	return 0;
  }
+diff --git a/src/nm-ppp-status.h b/src/nm-fortisslvpn-pppd-status.h
 similarity index 100%
 rename from src/nm-ppp-status.h
 rename to src/nm-fortisslvpn-pppd-status.h
+diff --git a/src/nm-fortisslvpn-service.c b/src/nm-fortisslvpn-service.c
+index 6c340d0..a8483c2 100644
 --- a/src/nm-fortisslvpn-service.c
 +++ b/src/nm-fortisslvpn-service.c
 @@ -40,7 +40,7 @@
diff --git a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-2.patch b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-2.patch
index a0b14d390e9f..d322ba4bfe9f 100644
--- a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-2.patch
+++ b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-2.patch
@@ -10,6 +10,12 @@ Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Eivind Næss <eivnaes@yahoo.com>
+---
+ configure.ac | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 877493e..a5b4abb 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -47,11 +47,7 @@ AC_CHECK_HEADERS(pppd/pppd.h,,
diff --git a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-3.patch b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-3.patch
index 30092c021bd3..441b8e103398 100644
--- a/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-3.patch
+++ b/net-vpn/networkmanager-fortisslvpn/files/networkmanager-fortisslvpn-1.4.0-ppp-2.5.0-3.patch
@@ -12,6 +12,13 @@ inline function ppp_add_notify().
 
 Additional formatting changes to the nm-fortisslvpn-pppd-compat.h based
 on review from Lubomir.
+---
+ src/nm-fortisslvpn-pppd-compat.h | 112 ++++++++++++++++++++-----------
+ src/nm-fortisslvpn-pppd-plugin.c |   6 --
+ 2 files changed, 71 insertions(+), 47 deletions(-)
+
+diff --git a/src/nm-fortisslvpn-pppd-compat.h b/src/nm-fortisslvpn-pppd-compat.h
+index 9a02908..5d2d02a 100644
 --- a/src/nm-fortisslvpn-pppd-compat.h
 +++ b/src/nm-fortisslvpn-pppd-compat.h
 @@ -1,32 +1,15 @@
@@ -170,6 +177,8 @@ on review from Lubomir.
 -#endif // #ifdef __NM_FORTISSLVPN_PPPD_COMPAT_H__
 +#endif /* #if WITH_PPP_VERSION < PPP_VERSION(2,5,0) */
 +#endif /* #ifdef __NM_FORTISSLVPN_PPPD_COMPAT_H__ */
+diff --git a/src/nm-fortisslvpn-pppd-plugin.c b/src/nm-fortisslvpn-pppd-plugin.c
+index c2efb9a..0f1c687 100644
 --- a/src/nm-fortisslvpn-pppd-plugin.c
 +++ b/src/nm-fortisslvpn-pppd-plugin.c
 @@ -438,14 +438,8 @@ plugin_init (void)
diff --git a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.4.0-r2.ebuild b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.4.0-r2.ebuild
index b04017413c2d..0495b82d0473 100644
--- a/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.4.0-r2.ebuild
+++ b/net-vpn/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.4.0-r2.ebuild
@@ -42,10 +42,10 @@ PATCHES=(
 )
 
 src_prepare() {
-	default
-
 	# Fix deprecated location, #709450
 	sed -i 's|/appdata|/metainfo|g' Makefile.{in,am} || die
+
+	gnome2_src_prepare
 }
 
 src_configure() {
diff --git a/net-vpn/networkmanager-l2tp/Manifest b/net-vpn/networkmanager-l2tp/Manifest
index 018cc439857e..ac2b267520d8 100644
--- a/net-vpn/networkmanager-l2tp/Manifest
+++ b/net-vpn/networkmanager-l2tp/Manifest
@@ -1,6 +1,6 @@
 AUX networkmanager-l2tp-1.20.8-bashism-configure.patch 1232 BLAKE2B 49b51a8dccedd5c8e3bfb226f8f0c48cff3e5b4ed0a0e2725eb61ad9ae452e1545546c58d7ab601fdbb4359aaa2470aba45ce78c8584d47c62d99c5e2a5a5b92 SHA512 f92643f64a7299bda2c7923d1e25c449f5075976b333facd024fed44782ba87ab71351dc7cadf84e8dd31d5d68a5d01585f870e42ab213f5c281e7820c394730
-AUX networkmanager-l2tp-1.20.8-ppp-2.5.0-1.patch 4872 BLAKE2B 36fe5df3abd8413363fa859193d5d590f3d225ae809cfafe4a5bfa444c3cc9d0fce5750eae5469b086c831cffb08244778ca6b3bba8c4e5a7dfb8b419ec9ddf5 SHA512 871234b17ae3a44f7b10f833988118740c9fb23de5b2cfbe90ff3a7fda1ad8d71f5268ac8c873e7c48cff097f9afade91dc0a1cd6abe2b93eec2d5a531d84f5d
-AUX networkmanager-l2tp-1.20.8-ppp-2.5.0-2.patch 4591 BLAKE2B a568afc4e1c970ccbf253c3e1b140a2cf388c7ad49b057a5fcaa4cf43f160083aeb3faf54550cbcb0494d199702bd045b9445c579a68bd9de19b129e57225f35 SHA512 d67f608c2e40bcc39066ea28a685e04e1d53a97c8e1a47ae77c947a3df5712214f34b2994c4becef136923dab02c764345e3f9246a99f889f26ef590c74044b4
+AUX networkmanager-l2tp-1.20.8-ppp-2.5.0-1.patch 5219 BLAKE2B 076b69c7cf2bde7168f5de5ef01eb96c71763478dea57bd5d0aa610f3ebc1bb6a0ff3fafcd0679a39a0461b4a75df4e2d0b9305b220ed162cfe1b45223ef0a5e SHA512 58908a05ad75a80fbbacd81165b7c475cf94e018dc9ae4cc3340219433e9cc5b67715336eca0359e374a49fb47b05210a5adda9c94ea8faf1c0db7adfec56e7f
+AUX networkmanager-l2tp-1.20.8-ppp-2.5.0-2.patch 5472 BLAKE2B 9b4b3351262d258aaefd8cb3990bff432d089b3c72d98146b2efb4f6a4e18654f801660bf8f15f4a44c2637f5c52b82e08bbc3eed29b4906bdc7d63d5ad37e60 SHA512 7a1fd967e025eec21e2fc5f0c4f86d86111d018628a52c2e2899b9ab8ec8f50dc5f389ba7f235aea8cdf386c7f85af843f1caef1db79fbfc75af5a5899dab7dc
 DIST NetworkManager-l2tp-1.20.8.tar.xz 487316 BLAKE2B 97a0b13a56babee47c2fd57b4bb655b79b96206eb3a51dacef642812fdf9059483fb7176f2be6ba86fc286cb6d1efdbada2c3dc8564e89598670781786e76011 SHA512 6ed2ab401821878bf775a27d43e540acce0ea6504a1a4bac436164776ef9e0eacef7963f0362691ef4ad7304e30e2c3199ba4fb41e24918b83aab88b34f7bb6a
 EBUILD networkmanager-l2tp-1.20.8-r3.ebuild 1654 BLAKE2B a55b8c73ce7ce6d288115b3f5f204e6a9445ccc6e739634ffb55b0b60461ec2aefaf6d3a6b0af8fde961204ede1faa95b91a36ef80d633845c8dafd9ed0bf0b0 SHA512 e3344e1c3ee9d9849ca6c2ced1542897d337c8b90794628959deae650c754ede9cf58cf8d2d6cad7c081e6472b0a332836cdcf897d3ee2cc51cbff3d700fc551
 EBUILD networkmanager-l2tp-1.20.8.ebuild 1457 BLAKE2B 7e650be93b810d277587a85120fc4666417316187c85985a71554117ca8d61e908c7f6d016eb7d347287f35db4324f62b631a47c6cc5ef7b27ac5e0bfdb8e13c SHA512 684a0bd9aa7ecb66f848dc8ebf86e0bd7fab5bbbe7e84ef12929b415d9ea06b1b05ca748b3313302dae3d4bc352001626d32a53c856bcce6ee511a9e8e2cf68c
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 <eivnaes@yahoo.com>
+---
+ 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 <eivnaes@yahoo.com>
  ], [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 <eivnaes@yahoo.com>
+---
+ 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 <eivnaes@yahoo.com>
  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 <eivnaes@yahoo.com>
 +
 +#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 <eivnaes@yahoo.com>
  #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 @@