| Message ID | 20210204125639.3971127-1-adolf.belka@ipfire.org |
|---|---|
| State | Accepted |
| Commit | 74e28f29f8cfe2ab8df905cee1b29cbfe00f81fb |
| Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4DWdpy4q1xz3wp0 for <patchwork@web04.haj.ipfire.org>; Thu, 4 Feb 2021 12:56:42 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4DWdpy2fDdz5Hd; Thu, 4 Feb 2021 12:56:42 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4DWdpy1jc6z2xlL; Thu, 4 Feb 2021 12:56:42 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4DWdpx33vdz2xJw for <development@lists.ipfire.org>; Thu, 4 Feb 2021 12:56:41 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4DWdpx0HFWz4jM; Thu, 4 Feb 2021 12:56:41 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1612443401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=hHc/zO9zXRpUxL8kJ8cgFpnWl3KS+Q0ygu1wyEVo1rM=; b=t8QR3LGIPSyS1diqvrJRhw6LiZ90Fwu8XbyqorxW9kwUp562os/BRUOE0LVkrz7eAy0Kwx 2IE3Zy5+SMFsKGCg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1612443401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=hHc/zO9zXRpUxL8kJ8cgFpnWl3KS+Q0ygu1wyEVo1rM=; b=ly9LA+J5nirUH3NGSH0KE5HkHwGjhiOV/60/ujW+mVbDnolVpTfU3YCmJix7jHv5BFRiiN ujksp0ktMR/pveCZWTopvacqZtoTaSHaWXy38GvDg0r1sVmzXaI3gaYucIjahtD9tzakAy SMZihWAY5GhRbKugp4qH1GTRrx/WAgZA8XiicoaRx2hL80B8z8sMlZxa7XgEbpvecqsB/D tnsWf+secY+VXBOnShJ4RmIkf2TeX0YK28Wj7+4LssTN4T7ReUuD+C9J/QK/aY75aBScr/ SjFW6gBCLPJcXklbIAPRCjOM60w6iZ7LEYjPAJdM8knNC/FitWbIITNPpohbgQ== From: Adolf Belka <adolf.belka@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH] pptp: Update to 1.10.0 Date: Thu, 4 Feb 2021 13:56:39 +0100 Message-Id: <20210204125639.3971127-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
| Series |
pptp: Update to 1.10.0
|
|
Commit Message
Adolf Belka
Feb. 4, 2021, 12:56 p.m. UTC
- 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@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
Comments
Hello Adolf, yikes - thank you for spotting this one. Looks good to me. Reviewed-by: Peter Müller <peter.mueller@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@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 >
Isn’t PPTP heavily deprecated, or is that just when used with certain encryption methods? Tom > On Feb 4, 2021, at 12:15 PM, Peter Müller <peter.mueller@ipfire.org> wrote: > > Hello Adolf, > > yikes - thank you for spotting this one. > > Looks good to me. > > Reviewed-by: Peter Müller <peter.mueller@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@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 >>
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. Regards, Adolf. > > Tom > >> On Feb 4, 2021, at 12:15 PM, Peter Müller <peter.mueller@ipfire.org> wrote: >> >> Hello Adolf, >> >> yikes - thank you for spotting this one. >> >> Looks good to me. >> >> Reviewed-by: Peter Müller <peter.mueller@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@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 >>>
Hello, > On 4 Feb 2021, at 22:58, Adolf Belka <adolf.belka@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@ipfire.org> wrote: >>> >>> Hello Adolf, >>> >>> yikes - thank you for spotting this one. >>> >>> Looks good to me. >>> >>> Reviewed-by: Peter Müller <peter.mueller@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@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 >>>>
> On Feb 5, 2021, at 6:15 AM, Michael Tremer <michael.tremer@ipfire.org> wrote: > > Hello, > >> On 4 Feb 2021, at 22:58, Adolf Belka <adolf.belka@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 Thanks, Michael. I have used PPP for DSL links before, but didn’t realize that some required PPTP. Tom
Hi, > On 5 Feb 2021, at 13:20, Tom Rymes <tom@rymes.net> wrote: > >> >> On Feb 5, 2021, at 6:15 AM, Michael Tremer <michael.tremer@ipfire.org> wrote: >> >> Hello, >> >>> On 4 Feb 2021, at 22:58, Adolf Belka <adolf.belka@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 > > Thanks, Michael. I have used PPP for DSL links before, but didn’t realize that some required PPTP. It is very rare these days. Which brings me to the question: Can anyone actually test this any more? -Michael > > Tom
Hi On 05/02/2021 17:07, Michael Tremer wrote: > Hi, > >> On 5 Feb 2021, at 13:20, Tom Rymes <tom@rymes.net> wrote: >> >>> On Feb 5, 2021, at 6:15 AM, Michael Tremer <michael.tremer@ipfire.org> wrote: >>> >>> Hello, >>> >>>> On 4 Feb 2021, at 22:58, Adolf Belka <adolf.belka@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 >> Thanks, Michael. I have used PPP for DSL links before, but didn’t realize that some required PPTP. > It is very rare these days. Which brings me to the question: Can anyone actually test this any more? I certainly can't. I haven't had DSL for more than 11 years now. I currently have a Cable connection and next week I will have a Glass Fibre connection. Adolf > -Michael > >> Tom
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