cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 1.7.2; from maintainer Stefan Sperling

Browse Source
This commit is contained in:
naddy 2008-11-11 16:23:26 +00:00
parent bae4db545a
commit 9a174c1dfb
7 changed files with 31 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/pptp/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.18 2007/10/23 22:13:38 naddy Exp $
# $OpenBSD: Makefile,v 1.19 2008/11/11 16:23:26 naddy Exp $
# $NetBSD: Makefile,v 1.1.1.1 2000/04/10 01:14:01 jtk Exp $
COMMENT= PPTP client package for Microsoft VPN servers
DISTNAME= pptp-1.7.1
PKGNAME= ${DISTNAME}p0
DISTNAME= pptp-1.7.2
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pptpclient/}
@ -24,7 +23,7 @@ NO_REGRESS= Yes
MAKE_ENV+= PPPD=/usr/sbin/ppp
CFLAGS+= -DUSER_PPP
DIRS= Documentation Reference
DIRS= Documentation
post-patch:
@cd ${WRKSRC}; sed -e s,PREFIX,${PREFIX}, < \

10
net/pptp/distinfo
View File

@ -1,5 +1,5 @@
MD5 (pptp-1.7.1.tar.gz) = tHc1ul1tN9/bzLha/ARO3g==
RMD160 (pptp-1.7.1.tar.gz) = 9RAmLowGBY11TW1z0bKJ/NvFTcc=
SHA1 (pptp-1.7.1.tar.gz) = zC5PQMXjMWvt5B7AoJKjICVoKFE=
SHA256 (pptp-1.7.1.tar.gz) = jj+p8XwigY6uaEGfZpZoZUIyBtc263TSEqNQH2JCMnY=
SIZE (pptp-1.7.1.tar.gz) = 229024
MD5 (pptp-1.7.2.tar.gz) = TD0ZKGo3RZpjLHEoySqYVw==
RMD160 (pptp-1.7.2.tar.gz) = //R+8sNUawbGnCfbAb7r7X5s2ks=
SHA1 (pptp-1.7.2.tar.gz) = EAfrHU0hYp+rOQkD6LOU1hV7SYM=
SHA256 (pptp-1.7.2.tar.gz) = 6YrgBl0qOfoxMWVP8oy3Bw6Zb2aO1tDn2aRFuNN2lLw=
SIZE (pptp-1.7.2.tar.gz) = 81113

10
net/pptp/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.5 2005/10/01 07:40:33 alek Exp $
--- Makefile.orig Thu Feb 17 20:42:23 2005
+++ Makefile Thu Sep 29 09:54:57 2005
$OpenBSD: patch-Makefile,v 1.6 2008/11/11 16:23:26 naddy Exp $
--- Makefile.orig Wed May 14 08:33:55 2008
+++ Makefile Sat Sep 20 17:44:51 2008
@@ -4,19 +4,19 @@ RELEASE=
#################################################################
@ -22,5 +22,5 @@ $OpenBSD: patch-Makefile,v 1.5 2005/10/01 07:40:33 alek Exp $
-CFLAGS = -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE)
+CFLAGS? = -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE)
LIBS = -lutil
LDFLAGS =
# Solaris 10
# LIBS = -lnsl -lsocket -lresolv

11
net/pptp/patches/patch-pptp_compat_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-pptp_compat_c,v 1.1 2008/11/11 16:23:26 naddy Exp $
--- pptp_compat.c.orig Sat Sep 20 17:47:33 2008
+++ pptp_compat.c Sat Sep 20 17:47:36 2008
@@ -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"

20
net/pptp/patches/patch-pptp_ctrl_c
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-pptp_ctrl_c,v 1.2 2007/10/23 22:13:38 naddy Exp $
--- pptp_ctrl.c.orig Mon Feb 13 04:07:42 2006
+++ pptp_ctrl.c Tue Sep 18 07:24:12 2007
@@ -457,6 +457,7 @@ void pptp_conn_destroy(PPTP_CONN * conn)
void pptp_fd_set(PPTP_CONN * conn, fd_set * read_set, fd_set * write_set,
int * max_fd)
{
+ int sig_fd;
assert(conn && conn->call);
/* Add fd to write_set if there are outstanding writes. */
if (conn->write_size > 0)
@@ -465,7 +466,7 @@ void pptp_fd_set(PPTP_CONN * conn, fd_set * read_set,
FD_SET(conn->inet_sock, read_set);
if (*max_fd < conn->inet_sock) *max_fd = conn->inet_sock;
/* Add signal pipe file descriptor to set */
- int sig_fd = sigpipe_fd();
+ sig_fd = sigpipe_fd();
FD_SET(sig_fd, read_set);
if (*max_fd < sig_fd) *max_fd = sig_fd;
}

10
net/pptp/patches/patch-pptp_gre_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-pptp_gre_c,v 1.1 2007/10/23 22:13:38 naddy Exp $
--- pptp_gre.c.orig Mon Feb 13 04:07:42 2006
+++ pptp_gre.c Tue Oct 23 10:49:46 2007
$OpenBSD: patch-pptp_gre_c,v 1.2 2008/11/11 16:23:26 naddy Exp $
--- pptp_gre.c.orig Wed May 14 08:33:55 2008
+++ pptp_gre.c Sat Sep 20 17:44:51 2008
@@ -11,6 +11,8 @@
#include <sys/socket.h>
#include <sys/stat.h>
@ -8,9 +8,9 @@ $OpenBSD: patch-pptp_gre_c,v 1.1 2007/10/23 22:13:38 naddy Exp $
+#include <sys/sysctl.h>
+#include <netinet/ip_gre.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
@@ -73,12 +75,36 @@ uint64_t time_now_usecs()
@@ -78,12 +80,36 @@ uint64_t time_now_usecs()
return (tv.tv_sec * 1000000) + tv.tv_usec;
}

16
net/pptp/pkg/PLIST
View File

@ -1,21 +1,9 @@
@comment $OpenBSD: PLIST,v 1.6 2007/10/23 22:13:38 naddy Exp $
@comment $OpenBSD: PLIST,v 1.7 2008/11/11 16:23:26 naddy Exp $
@man man/man8/pptp.8
sbin/pptp
@bin sbin/pptp
share/doc/pptp/
share/doc/pptp/Documentation/
share/doc/pptp/Documentation/DESIGN.CALLMGR
share/doc/pptp/Documentation/DESIGN.PPTP
share/doc/pptp/Documentation/PORTING
share/doc/pptp/Reference/
share/doc/pptp/Reference/README
share/doc/pptp/Reference/README.Reference
share/doc/pptp/Reference/ms-chap.txt
share/doc/pptp/Reference/pptp-draft.txt
share/doc/pptp/Reference/rfc1661.txt
share/doc/pptp/Reference/rfc1662.txt
share/doc/pptp/Reference/rfc1701.txt
share/doc/pptp/Reference/rfc1702.txt
share/doc/pptp/Reference/rfc1990.txt
share/doc/pptp/Reference/rfc791.txt
share/doc/pptp/Reference/rfc793.txt
share/doc/pptp/USING