Date: Mon, 31 Oct 2005 10:10:09 +0600 (NOVT) From: Serge Maslov <serge@maslov.biz> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/88260: Update port: net/poptop Update version 1.2.1 to 1.2.3 Message-ID: <20051031041009.1AD7F579BE4@mail.mbit.ru> Resent-Message-ID: <200510310420.j9V4KDNM047027@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 88260
>Category: ports
>Synopsis: Update port: net/poptop Update version 1.2.1 to 1.2.3
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 31 04:20:13 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Serge Maslov
>Release:
>Organization:
and Information Sciences, Novosibirsk, Russia
>Environment:
--- poptop.port begins here ---
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# poptop
# poptop/files
# poptop/files/pptpd.sh.in
# poptop/files/patch-pptpd.c
# poptop/files/patch-pptpd.8
# poptop/files/patch-pptpd.conf.5
# poptop/files/patch-pptpctrl.c
# poptop/files/patch-compat.c
# poptop/files/patch-defaults.h
# poptop/files/patch-Makefile.in
# poptop/Makefile
# poptop/distinfo
# poptop/pkg-descr
# poptop/pkg-plist
#
echo c - poptop
mkdir -p poptop > /dev/null 2>&1
echo c - poptop/files
mkdir -p poptop/files > /dev/null 2>&1
echo x - poptop/files/pptpd.sh.in
sed 's/^X//' >poptop/files/pptpd.sh.in << 'END-of-poptop/files/pptpd.sh.in'
X#!/bin/sh
X#
X# $FreeBSD$
X#
X# PROVIDE: pptpd
X# REQUIRE: DAEMON
X# KEYWORD: FreeBSD
X#
X# Add the following line to /etc/rc.conf to enable pptpd:
X#
X# pptpd_enable="YES"
X#
X
Xpptpd_enable=${pptpd_enable-"NO"}
Xpptpd_flags=${pptpd_flags-""}
X
X. %%RC_SUBR%%
X
Xname=pptpd
Xrcvar=`set_rcvar`
X
Xcommand=%%PREFIX%%/sbin/${name}
Xpidfile=/var/run/${name}.pid
Xsig_stop=-KILL
X
Xload_rc_config ${name}
Xrun_rc_command "$1"
END-of-poptop/files/pptpd.sh.in
echo x - poptop/files/patch-pptpd.c
sed 's/^X//' >poptop/files/patch-pptpd.c << 'END-of-poptop/files/patch-pptpd.c'
X--- pptpd.c.orig Fri Oct 21 12:10:41 2005
X+++ pptpd.c Fri Oct 21 12:12:30 2005
X@@ -109,13 +109,13 @@
X printf(" (default is /etc/ppp/options).\n");
X #endif
X printf(" [-p] [--pidfile file] Specifies the file to write the process ID to\n");
X- printf(" (default is /var/run/pptpd.pid).\n");
X+ printf(" (default is %s).\n",PIDFILE_DEFAULT);
X #if !defined(BSDUSER_PPP)
X printf(" [-s] [--speed baud] Specifies the baud speed for the PPP daemon\n");
X- printf(" (default is 115200).\n");
X+ printf(" (default is %s).\n",PPP_SPEED_DEFAULT);
X #endif
X printf(" [-t] [--stimeout seconds] Specifies the timeout for the first packet. This is a DOS protection\n");
X- printf(" (default is 10).\n");
X+ printf(" (default is %s).\n",STIMEOUT_DEFAULT);
X printf(" [-v] [--version] Displays the pptpd version number.\n");
X printf(" [-w] [--logwtmp] Update wtmp as users login.\n");
X
END-of-poptop/files/patch-pptpd.c
echo x - poptop/files/patch-pptpd.8
sed 's/^X//' >poptop/files/patch-pptpd.8 << 'END-of-poptop/files/patch-pptpd.8'
X--- pptpd.8.orig Mon May 24 16:39:03 2004
X+++ pptpd.8 Fri Oct 28 17:55:37 2005
X@@ -29,7 +29,7 @@
X specifies the configuration file for
X .B pptpd
X (default
X-.IR /etc/pptpd.conf )
X+.IR %%PREFIX%%/etc/pptpd.conf )
X
X .TP
X .BR -d | --debug
X@@ -99,7 +99,7 @@
X displays the current version of the pptp daemon.
X
X .SH FILES
X-/etc/pptpd.conf
X+%%PREFIX%%/etc/pptpd.conf
X .br
X /var/run/pptpd.pid
X .SH AUTHORS
END-of-poptop/files/patch-pptpd.8
echo x - poptop/files/patch-pptpd.conf.5
sed 's/^X//' >poptop/files/patch-pptpd.conf.5 << 'END-of-poptop/files/patch-pptpd.conf.5'
X--- pptpd.conf.5.orig Mon May 24 09:31:24 2004
X+++ pptpd.conf.5 Thu Oct 20 22:33:48 2005
X@@ -5,7 +5,7 @@
X .SH DESCRIPTION
X .BR pptpd (8)
X reads options from this file, usually
X-.IR /etc/pptpd.conf .
X+.IR %%PREFIX%%/etc/pptpd.conf .
X Most options can be overridden by the command line. The local and
X remote IP addresses for clients must come from the configuration file
X or from
END-of-poptop/files/patch-pptpd.conf.5
echo x - poptop/files/patch-pptpctrl.c
sed 's/^X//' >poptop/files/patch-pptpctrl.c << 'END-of-poptop/files/patch-pptpctrl.c'
X--- pptpctrl.c.orig Fri Oct 21 16:23:58 2005
X+++ pptpctrl.c Fri Oct 21 16:24:28 2005
X@@ -770,7 +770,7 @@
X
X if (pptp_logwtmp) {
X pppd_argv[an++] = "plugin";
X- pppd_argv[an++] = "/usr/lib/pptpd/pptpd-logwtmp.so";
X+ pppd_argv[an++] = "%%PREFIX%%/lib/pptpd/pptpd-logwtmp.so";
X pppd_argv[an++] = "pptpd-original-ip";
X pppd_argv[an++] = inet_ntoa(inetaddrs[1]);
X }
END-of-poptop/files/patch-pptpctrl.c
echo x - poptop/files/patch-compat.c
sed 's/^X//' >poptop/files/patch-compat.c << 'END-of-poptop/files/patch-compat.c'
X--- compat.c.orig Wed Jan 5 17:01:51 2005
X+++ compat.c Mon Oct 31 09:55:12 2005
X@@ -110,6 +110,7 @@
X #define __USE_BSD 1
X #include <stdarg.h>
X #include <stdio.h>
X+#include <unistd.h>
X
X void my_setproctitle(int argc, char **argv, const char *format, ...) {
X char proctitle[64];
X@@ -126,7 +127,6 @@
X }
X
X /* signal to pipe delivery implementation */
X-#include <unistd.h>
X #include <fcntl.h>
X #include <signal.h>
X
END-of-poptop/files/patch-compat.c
echo x - poptop/files/patch-defaults.h
sed 's/^X//' >poptop/files/patch-defaults.h << 'END-of-poptop/files/patch-defaults.h'
X--- defaults.h.orig Thu Mar 7 19:09:42 2002
X+++ defaults.h Sun Sep 8 10:19:58 2002
X@@ -40,10 +40,14 @@
X #endif
X
X #define PPP_SPEED_DEFAULT "115200"
X+#ifdef __FreeBSD__
X+#define PPTPD_CONFIG_FILE_DEFAULT ETCDIR "/pptpd.conf"
X+#else
X #if EMBED
X #define PPTPD_CONFIG_FILE_DEFAULT "/etc/config/pptpd.conf"
X #else
X #define PPTPD_CONFIG_FILE_DEFAULT "/etc/pptpd.conf"
X+#endif
X #endif
X #define PIDFILE_DEFAULT "/var/run/pptpd.pid"
X
END-of-poptop/files/patch-defaults.h
echo x - poptop/files/patch-Makefile.in
sed 's/^X//' >poptop/files/patch-Makefile.in << 'END-of-poptop/files/patch-Makefile.in'
X--- Makefile.in.orig Wed Aug 3 14:47:42 2005
X+++ Makefile.in Fri Oct 21 12:40:13 2005
X@@ -14,7 +14,7 @@
X
X @SET_MAKE@
X
X-SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES)
X+SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES)
X
X srcdir = @srcdir@
X top_srcdir = @top_srcdir@
X@@ -37,7 +37,7 @@
X PRE_UNINSTALL = :
X POST_UNINSTALL = :
X EXTRA_PROGRAMS =
X-sbin_PROGRAMS = pptpd$(EXEEXT) pptpctrl$(EXEEXT) bcrelay$(EXEEXT)
X+sbin_PROGRAMS = pptpd$(EXEEXT) pptpctrl$(EXEEXT)
X subdir = .
X DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
X $(srcdir)/Makefile.in $(srcdir)/config.h.in \
X@@ -77,8 +74,8 @@
X $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
X CCLD = $(CC)
X LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
X-SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES)
X-DIST_SOURCES = $(bcrelay_SOURCES) $(pptpctrl_SOURCES) $(pptpd_SOURCES)
X+SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES)
X+DIST_SOURCES = $(pptpctrl_SOURCES) $(pptpd_SOURCES)
X man5dir = $(mandir)/man5
X man8dir = $(mandir)/man8
X NROFF = nroff
X@@ -178,6 +175,7 @@
X # We have our own, simpler dependencies stuff in 'reconf'
X AUTOMAKE_OPTIONS = no-dependencies foreign
X INCLUDES = -I.
X+CFLAGS= @CFLAGS@ -fno-builtin -DSBINDIR='"$(sbindir)"' -DETCDIR='"$(sysconfdir)"'
X #CFLAGS = -O2 -fno-builtin -Wall -ansi -DSBINDIR='"$(sbindir)"'
X #CFLAGS = -O2 -fno-builtin -Wall -ansi -pedantic -Wmissing-prototypes -Werror -DSBINDIR='"$(sbindir)"'
X man_MANS = pptpctrl.8 pptpd.8 pptpd.conf.5
END-of-poptop/files/patch-Makefile.in
echo x - poptop/Makefile
sed 's/^X//' >poptop/Makefile << 'END-of-poptop/Makefile'
X# New ports collection makefile for: poptop
X# Date created: 04 October 1999
X# Whom: Nick Sayer <nsayer@freebsd.org>
X#
X# $FreeBSD$
X#
X
XPORTNAME= poptop
XPORTVERSION= 1.2.3
XCATEGORIES= net
XMASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
XMASTER_SITE_SUBDIR= ${PORTNAME}
XDISTNAME= pptpd-${PORTVERSION:S/.b/-b/}
X
XMAINTAINER= Serge@Maslov.biz
XCOMMENT= Windows 9x compatible PPTP (VPN) server
X
XUSE_GMAKE= yes
XUSE_REINPLACE= yes
XGNU_CONFIGURE= yes
XMAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
X AUTOHEADER="${TRUE}"
X
XUSE_RC_SUBR= pptpd.sh
X
XMAN5= pptpd.conf.5
XMAN8= pptpd.8 pptpctrl.8
X
X.if !defined(WITH_KERNPPP)
XCONFIGURE_ARGS+= --with-bsdppp
X.endif
X
X.include <bsd.port.pre.mk>
X
X.if ${OSVERSION} >= 500000
XUSE_GETOPT_LONG= yes
X.endif
X
Xpost-patch:
X @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/pptpctrl.c
X @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/pptpd.8
X @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/pptpd.conf.5
X
Xpost-install:
X ${INSTALL_DATA} ${WRKSRC}/samples/pptpd.conf \
X ${PREFIX}/etc/pptpd.conf.sample
X
X.include <bsd.port.post.mk>
END-of-poptop/Makefile
echo x - poptop/distinfo
sed 's/^X//' >poptop/distinfo << 'END-of-poptop/distinfo'
XMD5 (pptpd-1.2.3.tar.gz) = a521e40ca304b0c125cc25f9b9d03324
XSIZE (pptpd-1.2.3.tar.gz) = 185721
END-of-poptop/distinfo
echo x - poptop/pkg-descr
sed 's/^X//' >poptop/pkg-descr << 'END-of-poptop/pkg-descr'
XPoPToP is a PPTP daemon. It is compatible with the Microsoft Windows
XVPN adapter.
X
XWWW: http://www.poptop.org/
END-of-poptop/pkg-descr
echo x - poptop/pkg-plist
sed 's/^X//' >poptop/pkg-plist << 'END-of-poptop/pkg-plist'
X@unexec %D/etc/rc.d/pptpd.sh stop > /dev/null 2>&1 || true
Xsbin/pptpd
Xsbin/pptpctrl
Xlib/pptpd/pptpd-logwtmp.so
Xetc/pptpd.conf.sample
X@unexec rmdir %D/lib/pptpd 2> /dev/null || true
END-of-poptop/pkg-plist
exit
--- poptop.port ends here ---
>Description:
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20051031041009.1AD7F579BE4>