pptp-linux: rename patches to remove the version number
PATCH 1/2 pptp-linux: rename patches to remove the version number
Signed-off-by Thomas Petazzoni <[email protected]>
--- .../pptp-linux/pptp-linux-001-susv3-legacy.patch | 24 +++++++++++ .../pptp-linux/pptp-linux-002-drop-stropts.patch | 26 ++++++++++++ package/pptp-linux/pptp-linux-003-ip-path.patch | 44 ++++++++++++++++++++ .../pptp-linux-1.7.0-001-susv3-legacy.patch | 24 ----------- .../pptp-linux/pptp-linux-1.7.2-drop-stropts.patch | 26 ------------ package/pptp-linux/pptp-linux-1.7.2-ip-path.patch | 44 -------------------- 6 files changed, 94 insertions(+), 94 deletions(-) create mode 100644 package/pptp-linux/pptp-linux-001-susv3-legacy.patch create mode 100644 package/pptp-linux/pptp-linux-002-drop-stropts.patch create mode 100644 package/pptp-linux/pptp-linux-003-ip-path.patch delete mode 100644 package/pptp-linux/pptp-linux-1.7.0-001-susv3-legacy.patch delete mode 100644 package/pptp-linux/pptp-linux-1.7.2-drop-stropts.patch delete mode 100644 package/pptp-linux/pptp-linux-1.7.2-ip-path.patch
package/pptp-linux/pptp-linux-001-susv3-legacy.patch new file +24 -0
@@ -0,0 +1,24 @@ +diff -rdup pptp-linux-1.7.0/pptp_callmgr.c pptp-linux-1.7.0.orig/pptp_callmgr.c +--- pptp-linux-1.7.0/pptp_callmgr.c 2005-07-28 03:15:11.000000000 +0200 ++++ pptp-linux-1.7.0.orig/pptp_callmgr.c 2007-08-24 09:20:39.000000000 +0200 +@@ -314,7 +314,7 @@ int open_inetsock(struct in_addr inetadd + return s; + } + if (localbind.s_addr != INADDR_NONE) { +- bzero(&src, sizeof(src)); ++ memset(&src, 0, sizeof(src)); + src.sin_family = AF_INET; + src.sin_addr = localbind; + if (bind(s, (struct sockaddr *) &src, sizeof(src)) != 0) { +diff -rdup pptp-linux-1.7.0/pptp_gre.c pptp-linux-1.7.0.orig/pptp_gre.c +--- pptp-linux-1.7.0/pptp_gre.c 2005-07-28 03:15:11.000000000 +0200 ++++ pptp-linux-1.7.0.orig/pptp_gre.c 2007-08-24 09:20:56.000000000 +0200 +@@ -81,7 +81,7 @@ int pptp_gre_bind(struct in_addr inetadd + int s = socket(AF_INET, SOCK_RAW, PPTP_PROTO); + if (s < 0) { warn("socket: %s", strerror(errno)); return -1; } + if (localbind.s_addr != INADDR_NONE) { +- bzero(&loc_addr, sizeof(loc_addr)); ++ memset(&loc_addr, 0, sizeof(loc_addr)); + loc_addr.sin_family = AF_INET; + loc_addr.sin_addr = localbind; + if (bind(s, (struct sockaddr *) &loc_addr, sizeof(loc_addr)) != 0) {
package/pptp-linux/pptp-linux-002-drop-stropts.patch new file +26 -0
@@ -0,0 +1,26 @@ +From ae214f5103dfaa92ecb0b1953d4c9dd059e620ca Mon Sep 17 00:00:00 2001 +From: Gustavo Zacarias <[email protected]> +Date: Thu, 21 Oct 2010 10:59:02 -0300 +Subject: [PATCH] Drop stropts.h, it's deprecated and unneeded + + +Signed-off-by: Gustavo Zacarias <[email protected]> +--- + pptp_compat.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/pptp_compat.c b/pptp_compat.c +index 1760a3b..e98cbf0 100644 +--- a/pptp_compat.c ++++ b/pptp_compat.c +@@ -7,7 +7,6 @@ + #include <fcntl.h> + #include <sys/types.h> + #include <unistd.h> +-#include <stropts.h> + #include <stdlib.h> + #include <strings.h> + #include "pptp_compat.h" +-- +1.7.2.2 +
package/pptp-linux/pptp-linux-003-ip-path.patch new file +44 -0
44 lines not on this page · raw message
package/pptp-linux/pptp-linux-1.7.0-001-susv3-legacy.patch deleted +0 -24
@@ -1,24 +0,0 @@ -diff -rdup pptp-linux-1.7.0/pptp_callmgr.c pptp-linux-1.7.0.orig/pptp_callmgr.c ---- pptp-linux-1.7.0/pptp_callmgr.c 2005-07-28 03:15:11.000000000 +0200 -+++ pptp-linux-1.7.0.orig/pptp_callmgr.c 2007-08-24 09:20:39.000000000 +0200 -@@ -314,7 +314,7 @@ int open_inetsock(struct in_addr inetadd - return s; - } - if (localbind.s_addr != INADDR_NONE) { -- bzero(&src, sizeof(src)); -+ memset(&src, 0, sizeof(src)); - src.sin_family = AF_INET; - src.sin_addr = localbind; - if (bind(s, (struct sockaddr *) &src, sizeof(src)) != 0) { -diff -rdup pptp-linux-1.7.0/pptp_gre.c pptp-linux-1.7.0.orig/pptp_gre.c ---- pptp-linux-1.7.0/pptp_gre.c 2005-07-28 03:15:11.000000000 +0200 -+++ pptp-linux-1.7.0.orig/pptp_gre.c 2007-08-24 09:20:56.000000000 +0200 -@@ -81,7 +81,7 @@ int pptp_gre_bind(struct in_addr inetadd - int s = socket(AF_INET, SOCK_RAW, PPTP_PROTO); - if (s < 0) { warn("socket: %s", strerror(errno)); return -1; } - if (localbind.s_addr != INADDR_NONE) { -- bzero(&loc_addr, sizeof(loc_addr)); -+ memset(&loc_addr, 0, sizeof(loc_addr)); - loc_addr.sin_family = AF_INET; - loc_addr.sin_addr = localbind; - if (bind(s, (struct sockaddr *) &loc_addr, sizeof(loc_addr)) != 0) {
package/pptp-linux/pptp-linux-1.7.2-drop-stropts.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From ae214f5103dfaa92ecb0b1953d4c9dd059e620ca Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias <[email protected]> -Date: Thu, 21 Oct 2010 10:59:02 -0300 -Subject: [PATCH] Drop stropts.h, it's deprecated and unneeded - - -Signed-off-by: Gustavo Zacarias <[email protected]> ---- - pptp_compat.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -diff --git a/pptp_compat.c b/pptp_compat.c -index 1760a3b..e98cbf0 100644 ---- a/pptp_compat.c -+++ b/pptp_compat.c -@@ -7,7 +7,6 @@ - #include <fcntl.h> - #include <sys/types.h> - #include <unistd.h> --#include <stropts.h> - #include <stdlib.h> - #include <strings.h> - #include "pptp_compat.h" --- -1.7.2.2 -
package/pptp-linux/pptp-linux-1.7.2-ip-path.patch deleted +0 -44
44 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 2/2 pptp-linux: fix parallel build
Add a patch to fix a parallel build issue caused by a header file being generated too late.
Fixes:
http://autobuild.buildroot.org/results/2324974d4818b2657a7df4beee33fc4713d6116f/build-end.log
Signed-off-by Thomas Petazzoni <[email protected]>
--- .../pptp-linux-004-fix-parallel-build.patch | 23 ++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 package/pptp-linux/pptp-linux-004-fix-parallel-build.patch
package/pptp-linux/pptp-linux-004-fix-parallel-build.patch new file +23 -0
@@ -0,0 +1,23 @@ +Fix parallel build issue + +The config.h header file must be created before being used to build +source files that include it, especially version.c. In order for this +to happen even in highly-parallel builds, we add a dependency of all +object files on config.h, in order to ensure it gets generated before +make attempts to build the object files. + +Signed-off-by: Thomas Petazzoni <[email protected]> + +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -37,6 +37,8 @@ + + all: config.h $(PPTP_BIN) pptpsetup.8 + ++$(PPTP_OBJS): config.h ++ + $(PPTP_BIN): $(PPTP_OBJS) $(PPTP_DEPS) + $(CC) -o $(PPTP_BIN) $(PPTP_OBJS) $(LDFLAGS) $(LIBS) +
Signature · 1 line
1.7.9.5
PATCH 1/2 pptp-linux: rename patches to remove the version number
In reply to Thomas PetazzoniQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Petazzoni <[email protected]> writes:
Thomas> Signed-off-by: Thomas Petazzoni <[email protected]>
Commmitted both, thanks.
Signature · 1 line
Bye, Peter Korsgaard