1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-25 09:34:11 +00:00

Update to 0.69.

This commit is contained in:
Maxim Sobolev 2002-10-23 13:46:26 +00:00
parent b0506b02a8
commit eb535fb4a7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=68657
9 changed files with 105 additions and 60 deletions

View File

@ -6,28 +6,29 @@
#
PORTNAME= l2tpd
PORTVERSION= 0.64
PORTVERSION= 0.69
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MASTER_SITES= http://www.l2tpd.org/downloads/
MAINTAINER= sobomax@FreeBSD.org
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_REINPLACE= yes
MAN5= l2tp-secrets.5 l2tpd.conf.5
MAN8= l2tpd.8
do-configure:
${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/l2tpd.8 \
${WRKSRC}/doc/l2tpd.conf.sample
${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/doc/l2tpd.8 \
${WRKSRC}/doc/l2tpd.conf.sample ${WRKSRC}/doc/l2tp-secrets.5 \
${WRKSRC}/doc/l2tpd.conf.5
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/l2tpd ${PREFIX}/bin
${MKDIR} ${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
${INSTALL_MAN} ${WRKSRC}/l2tpd.8 ${PREFIX}/man/man8
${INSTALL_MAN} ${WRKSRC}/doc/l2tpd.8 ${PREFIX}/man/man8
${INSTALL_MAN} ${WRKSRC}/doc/l2tp-secrets.5 ${PREFIX}/man/man5
${INSTALL_MAN} ${WRKSRC}/doc/l2tpd.conf.5 ${PREFIX}/man/man5
${MKDIR} ${PREFIX}/etc/l2tpd
${INSTALL_DATA} ${WRKSRC}/doc/l2tpd.conf.sample ${PREFIX}/etc/l2tpd
${INSTALL_DATA} ${WRKSRC}/doc/l2tp-secrets.sample ${PREFIX}/etc/l2tpd

View File

@ -1 +1 @@
MD5 (l2tpd-0.64.tar.gz) = f2811ebafc727f2cd83e627c1ed037b2
MD5 (l2tpd-0.69.tar.gz) = c5dba6b80f583070fe9e6ed6e0c2162e

View File

@ -1,14 +1,14 @@
$FreeBSD$
--- Makefile.orig Fri Jan 11 17:54:44 2002
+++ Makefile Tue Oct 22 12:11:31 2002
@@ -26,11 +26,11 @@
--- Makefile.orig Sat Aug 10 03:42:22 2002
+++ Makefile Wed Oct 23 16:32:38 2002
@@ -27,11 +27,11 @@
# become runtime options) debugging flags
#
#DFLAGS= -g -O2 -DDEBUG_PPPD
-DFLAGS= -g -O2 -DDEBUG_PPPD -DDEBUG_CONTROL
+DFLAGS= -DDEBUG_PPPD -DDEBUG_CONTROL
-DFLAGS= -g -O2 -DDEBUG_PPPD -DDEBUG_CONTROL -DDEBUG_ENTROPY
+DFLAGS= -DDEBUG_PPPD -DDEBUG_CONTROL -DDEBUG_ENTROPY
#
# Uncomment the next line for Linux
#
@ -17,7 +17,7 @@ $FreeBSD$
#
# Uncomment the following to use the kernel interface under Linux
#
@@ -38,7 +38,7 @@
@@ -39,7 +39,7 @@
#
# Uncomment the next line for FreeBSD
#
@ -26,16 +26,16 @@ $FreeBSD$
#
# Uncomment the next line for Solaris. For solaris, at least,
# we don't want to specify -I/usr/include because it is in
@@ -48,7 +48,7 @@
#OSFLAGS= -DSOLARIS
#OSLIBS= -lnsl -lsocket
@@ -56,7 +56,7 @@
-CFLAGS= $(DFLAGS) -Wall -DSANITY $(OSFLAGS)
+CFLAGS+= $(DFLAGS) -Wall -DSANITY $(OSFLAGS)
FFLAGS= -DIP_ALLOCATION
-CFLAGS= $(DFLAGS) -Wall -DSANITY $(OSFLAGS) $(FFLAGS)
+CFLAGS+= $(DFLAGS) -Wall -DSANITY $(OSFLAGS) $(FFLAGS)
HDRS=l2tp.h avp.h misc.h control.h call.h scheduler.h file.h aaa.h md5.h
OBJS=l2tpd.o pty.o misc.o control.o avp.o call.o network.o avpsend.o scheduler.o file.o aaa.o md5.o
LIBS= $(OSLIB) # -lefence # efence for malloc checking
@@ -62,4 +62,4 @@
@@ -70,4 +70,4 @@
rm -f $(OBJS) $(BIN)
$(BIN): $(OBJS) $(HDRS)

View File

@ -0,0 +1,14 @@
$FreeBSD$
--- doc/l2tp-secrets.5 2002/10/23 13:39:50 1.1
+++ doc/l2tp-secrets.5 2002/10/23 13:40:46
@@ -27,7 +27,7 @@
.SH "FILES"
-\fB\fR/etc/l2tp/l2tpd.conf \fB\fR/etc/l2tp/l2tp\-secrets
+\fB\fR%%PREFIX%%/etc/l2tpd/l2tpd.conf \fB\fR%%PREFIX%%/etc/l2tpd/l2tp\-secrets
\fB\fR/var/run/l2tp\-control
.SH "BUGS"

View File

@ -0,0 +1,29 @@
$FreeBSD$
--- doc/l2tpd.8 2002/10/23 13:39:50 1.1
+++ doc/l2tpd.8 2002/10/23 13:41:05
@@ -16,12 +16,12 @@
.TP
.B -c <config file>
Tells l2tpd to use an alternate config file. Default is
-/etc/l2tpd/l2tpd.conf
+%%PREFIX%%/etc/l2tpd/l2tpd.conf
.TP
.B -s <secret file>
Tells l2tpd to use an alternate "secrets" file. Default is
-/etc/l2tpd/l2tp-secrets
+%%PREFIX%%/etc/l2tpd/l2tp-secrets
.TP
.B -p <pid file>
@@ -30,7 +30,7 @@
.SH "FILES"
-\fB\fR/etc/l2tp/l2tpd.conf \fB\fR/etc/l2tp/l2tp\-secrets
+\fB\fR%%PREFIX%%/etc/l2tpd/l2tpd.conf \fB\fR%%PREFIX%%/etc/l2tpd/l2tp\-secrets
\fB\fR/var/run/l2tp\-control
.SH "BUGS"

View File

@ -0,0 +1,23 @@
$FreeBSD$
--- doc/l2tpd.conf.5 2002/10/23 13:39:50 1.1
+++ doc/l2tpd.conf.5 2002/10/23 13:40:38
@@ -15,7 +15,7 @@
.TP
.B auth file
Specify where to find the authentication file used to authenticate
-l2tp tunnels. The default is /etc/l2tp/l2tp\-secrets.
+l2tp tunnels. The default is %%PREFIX%%/etc/l2tpd/l2tp\-secrets.
.TP
.B Port
@@ -141,7 +141,7 @@
.SH "FILES"
-\fB\fR/etc/l2tp/l2tpd.conf \fB\fR/etc/l2tp/l2tp\-secrets
+\fB\fR%%PREFIX%%/etc/l2tpd/l2tpd.conf \fB\fR%%PREFIX%%/etc/l2tpd/l2tp\-secrets
\fB\fR/var/run/l2tp\-control
.SH "BUGS"

View File

@ -1,13 +1,16 @@
$FreeBSD$
--- file.c 2002/10/22 09:41:27 1.1
+++ file.c 2002/10/22 09:43:30
@@ -17,7 +17,6 @@
--- file.c.orig Sat Aug 10 03:55:14 2002
+++ file.c Wed Oct 23 16:33:17 2002
@@ -18,10 +18,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <netdb.h>
-#include <netinet/in.h>
#include <time.h>
-#include <sys/types.h>
-#include <sys/socket.h>
#include "l2tp.h"
struct lns *lnslist;

View File

@ -1,16 +1,20 @@
$FreeBSD$
--- file.h.orig Fri Jan 11 17:54:44 2002
+++ file.h Tue Oct 22 12:41:18 2002
@@ -45,8 +45,8 @@
--- file.h.orig Wed Apr 10 23:09:33 2002
+++ file.h Wed Oct 23 16:34:37 2002
@@ -49,10 +49,10 @@
#define SENSE_ALLOW -1
#define SENSE_DENY 0
-#define DEFAULT_AUTH_FILE "/etc/l2tp/l2tp-secrets"
-#define CONFIG_FILE "/etc/l2tp/l2tpd.conf"
-#define ALT_DEFAULT_AUTH_FILE "/etc/l2tpd/l2tp-secrets"
-#define DEFAULT_CONFIG_FILE "/etc/l2tp/l2tpd.conf"
-#define ALT_DEFAULT_CONFIG_FILE "/etc/l2tpd/l2tpd.conf"
+#define DEFAULT_AUTH_FILE (PREFIX "/etc/l2tpd/l2tp-secrets")
+#define CONFIG_FILE (PREFIX "/etc/l2tpd/l2tpd.conf")
+#define ALT_DEFAULT_AUTH_FILE (PREFIX "/etc/l2tpd/l2tp-secrets")
+#define DEFAULT_CONFIG_FILE (PREFIX "/etc/l2tpd/l2tpd.conf")
+#define ALT_DEFAULT_CONFIG_FILE (PREFIX "/etc/l2tpd/l2tpd.conf")
#define DEFAULT_PID_FILE "/var/run/l2tpd.pid"
/* Definition of an LNS */
struct lns {

View File

@ -1,29 +0,0 @@
$FreeBSD$
--- l2tpd.8 2002/10/22 09:53:22 1.1
+++ l2tpd.8 2002/10/22 09:53:51
@@ -28,20 +28,20 @@
.RS 3
Selects a different configuration file from the default, set at compile
-time (typically /etc/l2tp/l2tpd.conf).
+time (typically %%PREFIX%%/etc/l2tp/l2tpd.conf).
See
.BR l2tpd.conf (5)
for more information.
.RE
.SH FILES
-.B /etc/l2tp/l2tpd.conf
+.B %%PREFIX%%/etc/l2tp/l2tpd.conf
.RS 3
Configuration file for l2tpd, specifies virtually all information for its
operation.
.RE
-.B /etc/l2tp/l2tp-secrets
+.B %%PREFIX%%/etc/l2tp/l2tp-secrets
.RS 3
Secrets used for challenge authentication and information hiding.
.RE