[bug#66990] [PATCH 0/3] fix build of network-manager-fortisslvpn and openfortivpn

[bug#66990] [PATCH 0/3] fix build of network-manager-fortisslvpn and openfortivpn

[Benjamin]

Hello,

The new version of ppp 2.5.0 happend to break the build of
packages network-manager-fortisslvpn and openfortivpn.

This is releated to some non compatible changes on ppp side.
Some related issue and pr can be found here [0] and [1].

I did not managed to make openfortivpn and network-manager-fortisslvpn
to work with ppp 2.4.9 (I don't even know if it is possible for the
moment).

To fix this issue I added package ppp@2.4.9 using previous build instructions
available at commit a112b43b2a8425915c764a2bc9e6cf0ea58cb512.

Best

[0] https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/-/commit/084ef529c5fb816927ca54866f66b340265aa9f6
[1] https://github.com/adrienverge/openfortivpn/pull/1148

Benjamin (3):
  gnu: Add ppp-2.4.9.
  gnu: openfortivpn: fix build.
  gnu: network-manager-fortisslvpn: fix build.

 gnu/packages/gnome.scm |  2 +-
 gnu/packages/samba.scm | 32 ++++++++++++++++++++++++++++++++
 gnu/packages/vpn.scm   |  2 +-
 3 files changed, 34 insertions(+), 2 deletions(-)


base-commit: 3f83dc5587573f173b1f61864c9b510f05de84b1
-- 
2.41.0

[bug#66990] [PATCH 1/3] gnu: Add ppp-2.4.9.

[Benjamin]

* gnu/packages/samba.scm (ppp-2.4.9): New variable.

Change-Id: I496016429ec4a8289b2a4ab51caa9245b914b4a5
---
 gnu/packages/samba.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 89a79cee2d..f52b86e1ed 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -507,6 +507,38 @@ (define-public ppp
                    license:gpl2+
                    license:public-domain))))
 
+(define-public ppp-2.4.9
+  (package
+    (inherit ppp)
+    (name "ppp")
+    (version "2.4.9")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/ppp-project/ppp")
+                    (commit (string-append "ppp-" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1bhhksdclsnkw54a517ndrw55q5zljjbh9pcqz1z4a2z2flxpsgk"))))
+         (arguments
+    (list #:tests? #f                    ;; No "check" target
+          #:make-flags #~(list (string-append "CC=" #$(cc-for-target)))
+          #:phases
+          #~(modify-phases %standard-phases
+              (add-before 'configure 'patch-Makefile
+                (lambda* (#:key inputs #:allow-other-keys)
+                  (let ((openssl (assoc-ref inputs "openssl"))
+                        (libpcap (assoc-ref inputs "libpcap")))
+                    (substitute* "pppd/Makefile.linux"
+                      (("/usr/include/openssl")
+                       (string-append openssl "/include"))
+                      (("-DPPP_FILTER")
+                       (string-append "-DPPP_FILTER -I" libpcap "/include")))
+                    (substitute* "pppd/pppcrypt.h"
+                      (("des\\.h") "openssl/des.h")))
+                  #t)))))))
+
 (define-public wsdd
   (package
     (name "wsdd")
-- 
2.41.0

[bug#66990] [PATCH 2/3] gnu: openfortivpn: fix build.

[Benjamin]

* gnu/packages/vpn.scm (openfortivpn): Update to 1.17.3.
[inputs]: Remove ppp; add ppp-2.4.9.

Change-Id: Ia88254afb1d7aaa9d3d6bf6c9e752d84165560b3
---
 gnu/packages/vpn.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 972f9b0329..f8045a45cb 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -825,7 +825,7 @@ (define-public openfortivpn
     (native-inputs
      (list autoconf automake pkg-config))
     (inputs
-     (list openssl ppp))
+     (list openssl ppp-2.4.9))
     (home-page "https://github.com/adrienverge/openfortivpn")
     (synopsis "Client for PPP+SSL VPN tunnel services")
     (description "Openfortivpn is a client for PPP+SSL VPN tunnel services.  It
-- 
2.41.0

[bug#66990] [PATCH 3/3] gnu: network-manager-fortisslvpn: fix build.

[Benjamin]

* gnu/packages/gnome.scm (network-manager-fortisslvpn): Update to 1.4.0.
[inputs]: Remove ppp; add ppp-2.4.9.

Change-Id: I5ef055e3fc5fc855aca8d2fa95ff995a229db89d
---
 gnu/packages/gnome.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ac3035e07d..206a728431 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8635,7 +8635,7 @@ (define-public network-manager-fortisslvpn
                   libsecret
                   network-manager
                   openfortivpn
-                  ppp))
+                  ppp-2.4.9))
     (home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
     (synopsis "Fortinet SSLVPN plug-in for NetworkManager")
     (description
-- 
2.41.0

[bug#66990] [PATCH 3/3] gnu: network-manager-fortisslvpn: fix build.

[Liliana Marie Prikler]

Am Dienstag, dem 07.11.2023 um 17:36 +0100 schrieb Benjamin:
> * gnu/packages/gnome.scm (network-manager-fortisslvpn): Update to
> 1.4.0.
> [inputs]: Remove ppp; add ppp-2.4.9.
> 
> Change-Id: I5ef055e3fc5fc855aca8d2fa95ff995a229db89d
Should be "Replace ppp with ppp-2.4.9".

That being said, I'm not sure whether the bump to 2.5.0 would be worth
it if we reintroduce the old version.  CC'd Tobias for better
judgement.

Cheers

bug#66990: [PATCH 0/3] fix build of network-manager-fortisslvpn and openfortivpn

[Ludovic Courtès]

Hi Benjamin & Liliana,

Benjamin <benjamin@uvy.fr> skribis:

> [0] https://gitlab.gnome.org/GNOME/NetworkManager-fortisslvpn/-/commit/084ef529c5fb816927ca54866f66b340265aa9f6
> [1] https://github.com/adrienverge/openfortivpn/pull/1148
>
> Benjamin (3):
>   gnu: Add ppp-2.4.9.
>   gnu: openfortivpn: fix build.
>   gnu: network-manager-fortisslvpn: fix build.

I went ahead and applied these changes, moving the links above as
comments in the code.  Hopefully we’ll be able to switch to ppp 2.5.0
real soon as fixed have now been merged upstream.

Thanks,
Ludo’.