diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2003-10-16 20:15:20 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2003-10-16 20:15:20 +0000 |
| commit | 7e9c9e9a3b516119ad2093e3331a0b425825c5f0 (patch) | |
| tree | af6e561289881b314f8c2aeef50aaf3327f7e08f /net/l2tpd | |
| parent | Update to 1.0.3. (diff) | |
Unbroke - new gcc now doesn't accept unterminated milti-line strings.
Notes
Notes:
svn path=/head/; revision=91451
Diffstat (limited to 'net/l2tpd')
| -rw-r--r-- | net/l2tpd/Makefile | 4 | ||||
| -rw-r--r-- | net/l2tpd/files/patch-call.c | 17 | ||||
| -rw-r--r-- | net/l2tpd/files/patch-network.c | 13 |
3 files changed, 26 insertions, 8 deletions
diff --git a/net/l2tpd/Makefile b/net/l2tpd/Makefile index 98e10c1dc5fd..429f460c4e85 100644 --- a/net/l2tpd/Makefile +++ b/net/l2tpd/Makefile @@ -21,10 +21,6 @@ MAN8= l2tpd.8 .include <bsd.port.pre.mk> -.if ${OSVERSION} >= 501000 -BROKEN= "Does not compile" -.endif - do-configure: ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/doc/l2tpd.8 \ ${WRKSRC}/doc/l2tpd.conf.sample ${WRKSRC}/doc/l2tp-secrets.5 \ diff --git a/net/l2tpd/files/patch-call.c b/net/l2tpd/files/patch-call.c index 45dbdf362963..822b8b0e7f1a 100644 --- a/net/l2tpd/files/patch-call.c +++ b/net/l2tpd/files/patch-call.c @@ -1,9 +1,9 @@ $FreeBSD$ ---- call.c 2002/10/22 09:41:27 1.1 -+++ call.c 2002/10/22 09:43:13 -@@ -13,9 +13,6 @@ +--- call.c.orig Sat Aug 10 03:47:25 2002 ++++ call.c Thu Oct 16 23:13:51 2003 +@@ -14,9 +14,6 @@ #include <stdio.h> #include <fcntl.h> @@ -13,3 +13,14 @@ $FreeBSD$ #include <sys/wait.h> #include <stdlib.h> #include <string.h> +@@ -193,8 +190,8 @@ + } + } + /* I should never get here */ +- log (LOG_WARN, "%s: You should not see this message. If you do, please +- enter a bug report at http://sourceforge.net/projects/l2tpd", __FUNCTION__); ++ log (LOG_WARN, "%s: You should not see this message. If you do, please " ++ "enter a bug report at http://sourceforge.net/projects/l2tpd", __FUNCTION__); + return -EINVAL; + } + diff --git a/net/l2tpd/files/patch-network.c b/net/l2tpd/files/patch-network.c index 5f52352c1fb7..3daa451a56a0 100644 --- a/net/l2tpd/files/patch-network.c +++ b/net/l2tpd/files/patch-network.c @@ -2,7 +2,7 @@ $FreeBSD$ --- network.c.orig Wed Apr 10 23:09:33 2002 -+++ network.c Wed Apr 16 16:07:19 2003 ++++ network.c Thu Oct 16 23:14:23 2003 @@ -14,9 +14,6 @@ #include <stdio.h> #include <errno.h> @@ -30,3 +30,14 @@ $FreeBSD$ server.sin_port = htons (gconfig.port); if ((server_socket = socket (PF_INET, SOCK_DGRAM, 0)) < 0) { +@@ -364,8 +360,8 @@ + extract (buf->start, &tunnel, &call); + if (debug_network) + { +- log (LOG_DEBUG, "%s: recv packet from %s, size = %d, +-tunnel = %d, call = %d\n", __FUNCTION__, inet_ntoa (from.sin_addr), recvsize, tunnel, call); ++ log (LOG_DEBUG, "%s: recv packet from %s, size = %d, " ++"tunnel = %d, call = %d\n", __FUNCTION__, inet_ntoa (from.sin_addr), recvsize, tunnel, call); + } + if (packet_dump) + { |