diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2013-11-06 18:27:03 +0000 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2013-11-06 18:27:03 +0000 |
| commit | 78b4ce011621b13b0ba64c4c6cad0a426d376068 (patch) | |
| tree | c62cbacf42defe68bf677aff3b9351783ec432b4 /net-dialup/pptpd/files | |
| parent | Fixed with newer gcc (bug #454072), build in source fixing bug #488450, switc... (diff) | |
| download | historical-78b4ce011621b13b0ba64c4c6cad0a426d376068.tar.gz historical-78b4ce011621b13b0ba64c4c6cad0a426d376068.tar.bz2 historical-78b4ce011621b13b0ba64c4c6cad0a426d376068.zip | |
Version bump, drop old
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42
Diffstat (limited to 'net-dialup/pptpd/files')
| -rw-r--r-- | net-dialup/pptpd/files/pptpd-1.4.0-gentoo.patch | 59 | ||||
| -rw-r--r-- | net-dialup/pptpd/files/pptpd-1.4.0-sandbox-fix.patch | 21 |
2 files changed, 80 insertions, 0 deletions
diff --git a/net-dialup/pptpd/files/pptpd-1.4.0-gentoo.patch b/net-dialup/pptpd/files/pptpd-1.4.0-gentoo.patch new file mode 100644 index 000000000000..9e7db7ea3454 --- /dev/null +++ b/net-dialup/pptpd/files/pptpd-1.4.0-gentoo.patch @@ -0,0 +1,59 @@ +diff -Naur pptpd-1.3.4.orig/Makefile.am pptpd-1.3.4/Makefile.am +--- pptpd-1.3.4.orig/Makefile.am 2007-04-16 04:53:53.000000000 +0400 ++++ pptpd-1.3.4/Makefile.am 2007-05-01 21:29:15.000000000 +0400 +@@ -11,7 +11,7 @@ + ## warning with -Wmissing-prototypes). + ## -Wmissing-prototypes removed (eg, Linux 2.2.6 headers + ## aren't up to it). +-CFLAGS = -O2 -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' ++CFLAGS += -fno-builtin -Wall -DSBINDIR='"$(sbindir)"' + #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"' + #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"' + +diff -Naur pptpd-1.3.4.orig/plugins/Makefile pptpd-1.3.4/plugins/Makefile +--- pptpd-1.3.4.orig/plugins/Makefile 2006-08-03 06:02:01.000000000 +0400 ++++ pptpd-1.3.4/plugins/Makefile 2007-05-01 21:29:15.000000000 +0400 +@@ -1,6 +1,5 @@ +-CC = gcc ++CC ?= gcc +-COPTS = -O2 -g +-CFLAGS = $(COPTS) -I.. -I../../include -fPIC ++CFLAGS += -I.. -I../../include -fPIC +-LDFLAGS = -shared ++LDFLAGS += -shared + LDADD = -lutil + INSTALL = install -o root +diff -Naur pptpd-1.3.4.orig/pptpgre.c pptpd-1.3.4/pptpgre.c +--- pptpd-1.3.4.orig/pptpgre.c 2007-04-16 04:21:02.000000000 +0400 ++++ pptpd-1.3.4/pptpgre.c 2007-05-01 21:29:50.000000000 +0400 +@@ -326,9 +326,11 @@ + "GRE: timeout waiting for %d packets", + head->seq - gre.seq_recv - 1); + } ++#ifdef LOG_DEBUG_GRE_ACCEPTING_PACKET + if (pptpctrl_debug) + syslog(LOG_DEBUG, "GRE: accepting #%d from queue", + head->seq); ++#endif + gre.seq_recv = head->seq; + status = callback(cl, head->packet, head->packlen); + pqueue_del(head); +diff -Naur pptpd-1.3.4.orig/pqueue.c pptpd-1.3.4/pqueue.c +--- pptpd-1.3.4.orig/pqueue.c 2005-08-03 12:53:22.000000000 +0400 ++++ pptpd-1.3.4/pqueue.c 2007-05-01 21:29:15.000000000 +0400 +@@ -7,13 +7,11 @@ + #include "pqueue.h" + + #ifdef DEBUG_PQUEUE +-#define DEBUG_ON 1 ++# define DEBUG_CMD(_a) { _a } + #else +-#define DEBUG_ON 0 ++# define DEBUG_CMD(_a) + #endif + +-#define DEBUG_CMD(_a) if (DEBUG_ON) { _a } +- + #define MIN_CAPACITY 128 /* min allocated buffer for a packet */ + + static int pqueue_alloc (int seq, unsigned char *packet, int packlen, pqueue_t **new); diff --git a/net-dialup/pptpd/files/pptpd-1.4.0-sandbox-fix.patch b/net-dialup/pptpd/files/pptpd-1.4.0-sandbox-fix.patch new file mode 100644 index 000000000000..de91753f33f5 --- /dev/null +++ b/net-dialup/pptpd/files/pptpd-1.4.0-sandbox-fix.patch @@ -0,0 +1,21 @@ +--- plugins/Makefile.orig 2013-05-15 14:36:33.994231829 +0400 ++++ plugins/Makefile 2013-05-15 14:37:06.686234429 +0400 +@@ -17,14 +17,14 @@ + %.so: %.c + $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ $(LDADD) + +-LIBDIR ?= $(DESTDIR)$(prefix)/lib/pptpd ++LIBDIR ?= $(prefix)/lib/pptpd + + install: $(PLUGINS) +- $(INSTALL) -d $(LIBDIR) +- $(INSTALL) $? $(LIBDIR) ++ $(INSTALL) -d $(DESTDIR)$(LIBDIR) ++ $(INSTALL) $? $(DESTDIR)$(LIBDIR) + + uninstall: +- rm -f $(LIBDIR)$(PLUGINS) ++ rm -f $(DESTDIR)$(LIBDIR)$(PLUGINS) + + clean: + rm -f *.o *.so *.a |