Re: [PATCH] pptp: Update to 1.10.0

[Michael Tremer <michael.tremer@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 5474 bytes --]

Hello,

> On 4 Feb 2021, at 22:58, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
> 
> Hi Tom,
> 
> On 04/02/2021 19:10, Tom Rymes wrote:
>> Isn’t PPTP heavily deprecated, or is that just when used with certain encryption methods?
> It may be, I don't know for sure. However, while it is still in IPFire I think it is better to have the latest version from 2018 rather than the one from 2008.

Yes, in terms of bugs in the implementation it is.

PPTP is a universal tunnelling protocol (short for point-to-point tunneling protocol) and it can be used for VPNs. However it is very old and the specified cryptography is very outdated. In IPFire we only use it to connect to some DSL providers which use it on the Internet link. They do not use any encryption and use weak authentication to identify the subscriber.

-Michael

> 
> Regards,
> Adolf.
>> Tom
>>> On Feb 4, 2021, at 12:15 PM, Peter Müller <peter.mueller(a)ipfire.org> wrote:
>>> 
>>> Hello Adolf,
>>> 
>>> yikes - thank you for spotting this one.
>>> 
>>> Looks good to me.
>>> 
>>> Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
>>> 
>>> Thanks, and best regards,
>>> Peter Müller
>>> 
>>>> - Update pptp from 1.7.2 (Jun 2008) to 1.10.0 (Jan 2018)
>>>> - No change to rootfile
>>>> - Removal of pptp-1.7.2-compat.patch as all changes to pptp_compat.c are
>>>>    now included in the file in the new tarball.
>>>> 
>>>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>>> ---
>>>> lfs/pptp                            |  5 +-
>>>> src/patches/pptp-1.7.2-compat.patch | 71 -----------------------------
>>>> 2 files changed, 2 insertions(+), 74 deletions(-)
>>>> delete mode 100644 src/patches/pptp-1.7.2-compat.patch
>>>> 
>>>> diff --git a/lfs/pptp b/lfs/pptp
>>>> index 850573810..91165bab7 100644
>>>> --- a/lfs/pptp
>>>> +++ b/lfs/pptp
>>>> @@ -24,7 +24,7 @@
>>>> 
>>>> include Config
>>>> 
>>>> -VER        = 1.7.2
>>>> +VER        = 1.10.0
>>>> 
>>>> THISAPP    = pptp-$(VER)
>>>> DL_FILE    = $(THISAPP).tar.gz
>>>> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>>>> 
>>>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>>> 
>>>> -$(DL_FILE)_MD5 = 4c3d19286a37459a632c7128c92a9857
>>>> +$(DL_FILE)_MD5 = 8d25341352fdae5ad5b36b9f18254908
>>>> 
>>>> install : $(TARGET)
>>>> 
>>>> @@ -70,7 +70,6 @@ $(subst %,%_MD5,$(objects)) :
>>>> $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
>>>>    @$(PREBUILD)
>>>>    @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
>>>> -    cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/pptp-1.7.2-compat.patch
>>>>    cd $(DIR_APP) && make $(MAKETUNING)
>>>>    cd $(DIR_APP) && make install
>>>>    @rm -rf $(DIR_APP)
>>>> diff --git a/src/patches/pptp-1.7.2-compat.patch b/src/patches/pptp-1.7.2-compat.patch
>>>> deleted file mode 100644
>>>> index 0ea155166..000000000
>>>> --- a/src/patches/pptp-1.7.2-compat.patch
>>>> +++ /dev/null
>>>> @@ -1,71 +0,0 @@
>>>> -Index: pptp_compat.c
>>>> -===================================================================
>>>> -RCS file: /cvsroot/pptpclient/pptp-linux/pptp_compat.c,v
>>>> -retrieving revision 1.1
>>>> -retrieving revision 1.3
>>>> -diff -u -r1.1 -r1.3
>>>> ---- pptp_compat.c    19 Feb 2008 21:43:28 -0000    1.1
>>>> -+++ pptp_compat.c    25 Jul 2008 00:13:56 -0000    1.3
>>>> -@@ -7,14 +7,15 @@
>>>> - #include <fcntl.h>
>>>> - #include <sys/types.h>
>>>> - #include <unistd.h>
>>>> --#include <stropts.h>
>>>> - #include <stdlib.h>
>>>> -+#if defined (__SVR4) && defined (__sun) /* Solaris */
>>>> -+#include <stropts.h>
>>>> -+#endif
>>>> - #include <strings.h>
>>>> - #include "pptp_compat.h"
>>>> - #include <stdio.h>
>>>> - #include "util.h"
>>>> -
>>>> --
>>>> - #if defined (__SVR4) && defined (__sun) /* Solaris */
>>>> - /*
>>>> -  * daemon implementation from uClibc
>>>> -Index: pptp.c
>>>> -===================================================================
>>>> -RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v
>>>> -retrieving revision 1.49
>>>> -retrieving revision 1.51
>>>> -diff -u -r1.49 -r1.51
>>>> ---- pptp.c    14 May 2008 06:32:52 -0000    1.49
>>>> -+++ pptp.c    24 Jul 2008 05:53:05 -0000    1.51
>>>> -@@ -61,9 +61,8 @@
>>>> - #include "version.h"
>>>> - #if defined(__linux__)
>>>> - #include <sys/prctl.h>
>>>> --#else
>>>> --#include "inststr.h"
>>>> - #endif
>>>> -+#include "inststr.h"
>>>> - #include "util.h"
>>>> - #include "pptp_quirks.h"
>>>> - #include "pqueue.h"
>>>> -@@ -129,7 +128,7 @@
>>>> - }
>>>> -
>>>> - #if defined (__SVR4) && defined (__sun)
>>>> --struct in_addr localbind = { INADDR_ANY };
>>>> -+struct in_addr localbind = { .s_addr = INADDR_ANY };
>>>> - #else
>>>> - struct in_addr localbind = { INADDR_NONE };
>>>> - #endif
>>>> -@@ -183,6 +182,7 @@
>>>> -     struct in_addr inetaddr;
>>>> -     volatile int callmgr_sock = -1;
>>>> -     char ttydev[PATH_MAX];
>>>> -+    char *tty_name;
>>>> -     int pty_fd, tty_fd, gre_fd, rc;
>>>> -     volatile pid_t parent_pid, child_pid;
>>>> -     u_int16_t call_id, peer_call_id;
>>>> -@@ -391,7 +391,7 @@
>>>> -         file2fd("/dev/null", "wb", STDERR_FILENO);
>>>> -     }
>>>> -
>>>> --    char *tty_name = ttyname(tty_fd);
>>>> -+    tty_name = ttyname(tty_fd);
>>>> -     snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s",
>>>> -               tty_name ? tty_name : "(null)");
>>>> - #ifdef PR_SET_NAME
>>>>