Menu
▾
▴
pptpclient-commits — CVS commits
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
(18) |
Apr
(2) |
May
(3) |
Jun
|
Jul
(2) |
Aug
(11) |
Sep
|
Oct
(6) |
Nov
(7) |
Dec
(16) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(28) |
Feb
(15) |
Mar
(4) |
Apr
(24) |
May
(18) |
Jun
(29) |
Jul
(2) |
Aug
(2) |
Sep
(1) |
Oct
(4) |
Nov
(2) |
Dec
(2) |
| 2004 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
|
May
(4) |
Jun
(37) |
Jul
(5) |
Aug
(8) |
Sep
(2) |
Oct
(5) |
Nov
(4) |
Dec
(4) |
| 2005 |
Jan
|
Feb
(6) |
Mar
(3) |
Apr
(4) |
May
(14) |
Jun
|
Jul
(8) |
Aug
(8) |
Sep
|
Oct
(1) |
Nov
(2) |
Dec
|
| 2006 |
Jan
(4) |
Feb
(13) |
Mar
(2) |
Apr
(18) |
May
|
Jun
|
Jul
(2) |
Aug
(12) |
Sep
(3) |
Oct
|
Nov
|
Dec
(5) |
| 2007 |
Jan
|
Feb
|
Mar
(2) |
Apr
(1) |
May
|
Jun
|
Jul
(3) |
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2008 |
Jan
(4) |
Feb
(2) |
Mar
(1) |
Apr
|
May
(6) |
Jun
|
Jul
(3) |
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(1) |
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: James C. <qu...@us...> - 2006-08-21 05:58:42
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10166 Modified Files: RELEASING Log Message: pre-release $VERSION Index: RELEASING =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/RELEASING,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- RELEASING 10 Apr 2006 22:14:06 -0000 1.8 +++ RELEASING 21 Aug 2006 05:58:38 -0000 1.9 @@ -3,20 +3,18 @@ # choose version number echo "VERSION=`date +"%Y%m%d"`" VERSION=`date +"%Y%m%d"` -VERSION=20060410 +VERSION=20060821 echo $VERSION # check and fix versions emacsclient Makefile emacsclient NEWS -emacsclient README emacsclient TODO emacsclient pptpconfig.spec - # commit version changes to cvs -cvs diff > tmp -emacsclient tmp +cvs diff > tmp.diff +emacsclient tmp.diff cvs commit -m 'pre-release $VERSION' # note that version in welcome message depends on CVS ident tag |
|
From: James C. <qu...@us...> - 2006-08-21 05:37:44
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2593 Modified Files: README Log Message: Index: README =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/README,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- README 10 Apr 2006 01:02:25 -0000 1.5 +++ README 21 Aug 2006 05:37:38 -0000 1.6 @@ -1,4 +1,4 @@ -This is pptpconfig release 20060410. +This is pptpconfig. http://quozl.netrek.org/pptp/pptpconfig/ @@ -28,7 +28,7 @@ Resources - * pptpconfig-20060410.tar.gz sources, + * pptpconfig-YYYYMMDD.tar.gz sources, Building from Source @@ -40,7 +40,7 @@ * test php-gtk's test/gtk.php will run, - * download pptpconfig-20060410.tar.gz, untar somewhere, + * download pptpconfig-YYYYMMDD.tar.gz, untar somewhere, * backup /etc/ppp and anything you normally would, in case I have made a mistake that wipes our your work or configuration, |
|
From: James C. <qu...@us...> - 2006-08-17 04:39:32
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24057 Modified Files: ChangeLog Makefile NEWS Log Message: add pptpsetup man page Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.108 retrieving revision 1.109 diff -u -d -r1.108 -r1.109 --- ChangeLog 2 Aug 2006 07:02:47 -0000 1.108 +++ ChangeLog 17 Aug 2006 04:39:28 -0000 1.109 @@ -1,3 +1,7 @@ +Thu Aug 17 14:36:18 2006 James Cameron <qu...@us...> + + * Makefile: add pptpsetup man page using pod2man. + Wed Aug 2 16:21:08 2006 James Cameron <qu...@us...> * routing.c, routing.h, pptp_callmgr.c (callmgr_main): add route Index: Makefile =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- Makefile 2 Aug 2006 07:02:47 -0000 1.43 +++ Makefile 17 Aug 2006 04:39:28 -0000 1.44 @@ -30,11 +30,14 @@ PPTP_DEPS = pptp_callmgr.h pptp_gre.h ppp_fcs.h util.h \ pptp_quirks.h orckit_quirks.h config.h pqueue.h routing.h -all: config.h $(PPTP_BIN) +all: config.h $(PPTP_BIN) pptpsetup.8 $(PPTP_BIN): $(PPTP_OBJS) $(PPTP_DEPS) $(CC) -o $(PPTP_BIN) $(PPTP_OBJS) $(LDFLAGS) $(LIBS) +pptpsetup.8: pptpsetup + pod2man $? > $@ + config.h: echo "/* text added by Makefile target config.h */" > config.h echo "#define PPTP_LINUX_VERSION \"$(VERSION)$(RELEASE)\"" >> config.h @@ -59,6 +62,7 @@ install -o root -m 555 pptpsetup $(BINDIR) mkdir -p $(MANDIR) install -m 644 pptp.8 $(MANDIR) + install -m 644 pptpsetup.8 $(MANDIR) mkdir -p $(PPPDIR) install -m 644 options.pptp $(PPPDIR) Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- NEWS 2 Aug 2006 07:02:47 -0000 1.52 +++ NEWS 17 Aug 2006 04:39:28 -0000 1.53 @@ -1,7 +1,7 @@ - add route to PPTP server [Cameron] - remove non-free reference documentation [Cameron] - fix quoting and pppd options [Lundqvist] -- pptpsetup script (Debian Bug #167216?) [Ferraz] +- pptpsetup script with man page (Debian Bug #167216?) [Ferraz] Release 1.7.1: (13th February 2006) |
|
From: James C. <qu...@us...> - 2006-08-02 07:07:39
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27234 Added Files: routing.c routing.h Log Message: route to server --- NEW FILE: routing.c --- /* routing.c, manipulating routing table for PPTP Client Copyright (C) 2006 James Cameron <qu...@us...> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <sys/types.h> #include <unistd.h> #include <stdio.h> #include <string.h> #include "routing.h" /* route to the server */ char *route; /* Design discussion. The primary task of this module is to add a host route to the PPTP server so that the kernel continues to deliver PPTP control and data connection packets to the server despite the new PPP interface that is created. The flag --no-host-route is to disable this (not yet implemented). A secondary task may be to implement all-to-tunnel routing if the appropriate flag is specified on the command line. The flag --route-all is to implement this (not yet implemented). Caveat. It is not possible from the "ip route" command to determine if a host route already exists, so it isn't practical to put the routing table back exactly as it was. We have a choice of either leaving our route lying around, or destroying a route that the user had pre-arranged. Both are unfortunate. The flag --remove-host-route is to remove the route regardless (not yet implemented). */ void routing_init(char *ip) { char buf[256]; snprintf(buf, 255, "/bin/ip route get %s", ip); FILE *p = popen(buf, "r"); fgets(buf, 255, p); /* TODO: check for failure of fgets */ route = strdup(buf); pclose(p); /* TODO: check for failure of command */ } void routing_start() { char buf[256]; snprintf(buf, 255, "/bin/ip route replace %s", route); FILE *p = popen(buf, "r"); pclose(p); } void routing_end() { char buf[256]; snprintf(buf, 255, "/bin/ip route delete %s", route); FILE *p = popen(buf, "r"); pclose(p); } --- NEW FILE: routing.h --- void routing_init(char *ip); void routing_start(); void routing_end(); |
|
From: James C. <qu...@us...> - 2006-08-02 07:02:50
|
Update of /cvsroot/pptpclient/pptp-linux/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25496/debian Modified Files: changelog control Log Message: Index: changelog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/debian/changelog,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- changelog 13 Feb 2006 03:06:25 -0000 1.18 +++ changelog 2 Aug 2006 07:02:47 -0000 1.19 @@ -1,3 +1,9 @@ +pptp (1.7.2-rc4) unstable; urgency=low + + * test + + -- James Cameron <qu...@us...> Wed, 2 Aug 2006 16:27:58 +1000 + pptp (1.7.1-0) unstable; urgency=low * test cut Index: control =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/debian/control,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- control 9 Nov 2004 01:42:33 -0000 1.5 +++ control 2 Aug 2006 07:02:47 -0000 1.6 @@ -7,7 +7,7 @@ Package: pptp Architecture: any -Depends: ${shlibs:Depends}, ppp +Depends: ${shlibs:Depends}, ppp, binutils, iproute Replaces: pptp-linux Conflicts: pptp-linux Description: Point-to-Point Tunneling Protocol (PPTP) Client |
|
From: James C. <qu...@us...> - 2006-08-02 07:02:49
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25496 Modified Files: ChangeLog Makefile NEWS RELEASING pptpsetup Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.107 retrieving revision 1.108 diff -u -d -r1.107 -r1.108 --- ChangeLog 2 Aug 2006 06:22:34 -0000 1.107 +++ ChangeLog 2 Aug 2006 07:02:47 -0000 1.108 @@ -1,7 +1,9 @@ Wed Aug 2 16:21:08 2006 James Cameron <qu...@us...> * routing.c, routing.h, pptp_callmgr.c (callmgr_main): add route - to pptp server. Experimental feature. + to PPTP server. Experimental feature. Note that this has a + side-effect of leaving a route to the server in place after the + tunnel has terminated. Wed Aug 2 16:19:06 2006 James Cameron <qu...@us...> Index: Makefile =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- Makefile 2 Aug 2006 06:22:34 -0000 1.42 +++ Makefile 2 Aug 2006 07:02:47 -0000 1.43 @@ -56,6 +56,7 @@ install: mkdir -p $(BINDIR) install -o root -m 555 pptp $(BINDIR) + install -o root -m 555 pptpsetup $(BINDIR) mkdir -p $(MANDIR) install -m 644 pptp.8 $(MANDIR) mkdir -p $(PPPDIR) Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- NEWS 2 Aug 2006 06:22:34 -0000 1.51 +++ NEWS 2 Aug 2006 07:02:47 -0000 1.52 @@ -1,3 +1,4 @@ +- add route to PPTP server [Cameron] - remove non-free reference documentation [Cameron] - fix quoting and pppd options [Lundqvist] - pptpsetup script (Debian Bug #167216?) [Ferraz] Index: RELEASING =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/RELEASING,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- RELEASING 13 Feb 2006 04:13:16 -0000 1.10 +++ RELEASING 2 Aug 2006 07:02:47 -0000 1.11 @@ -8,8 +8,8 @@ # set shell variables for version # (use -rc1 for release candidate 1, or blank for final release) -VERSION=1.7.1 -RELEASE= +VERSION=1.7.2 +RELEASE=-rc1 TAG_VERSION=`echo ${VERSION}|tr . _` export VERSION RELEASE TAG_VERSION Index: pptpsetup =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptpsetup,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- pptpsetup 2 Aug 2006 06:22:34 -0000 1.3 +++ pptpsetup 2 Aug 2006 07:02:47 -0000 1.4 @@ -190,7 +190,7 @@ } sub Check_MPPE_in_pppd { - my $command = q/strings \`which pppd\`|grep -i mppe|wc --lines/; + my $command = q/strings `which pppd`|grep -i mppe|wc --lines/; my $answer = `$command`; if ($answer > 0) { # ok! |
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11142 Modified Files: ChangeLog Makefile NEWS pptp.c pptp_callmgr.c pptp_ctrl.c pptp_gre.c pptpsetup Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.106 retrieving revision 1.107 diff -u -d -r1.106 -r1.107 --- ChangeLog 19 Apr 2006 22:58:56 -0000 1.106 +++ ChangeLog 2 Aug 2006 06:22:34 -0000 1.107 @@ -1,3 +1,17 @@ +Wed Aug 2 16:21:08 2006 James Cameron <qu...@us...> + + * routing.c, routing.h, pptp_callmgr.c (callmgr_main): add route + to pptp server. Experimental feature. + +Wed Aug 2 16:19:06 2006 James Cameron <qu...@us...> + + * pptp.c: fix a few compilation warnings. + +Wed Aug 2 16:02:23 2006 James Cameron <qu...@us...> + + * pptpsetup: merge updates from Nelson Ferraz as of 24th April. + * Makefile (dist): include pptpsetup in kit. + Thu Apr 20 08:52:45 2006 James Cameron <qu...@us...> * Makefile (dist): remove Reference documentation as the license Index: Makefile =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- Makefile 19 Apr 2006 22:58:56 -0000 1.41 +++ Makefile 2 Aug 2006 06:22:34 -0000 1.42 @@ -69,7 +69,7 @@ $(RM) -r pptp-$(VERSION) mkdir pptp-$(VERSION) cp --recursive ChangeLog Makefile *.c *.h options.pptp pptp.8 \ - Documentation AUTHORS COPYING INSTALL NEWS \ + pptpsetup Documentation AUTHORS COPYING INSTALL NEWS \ README DEVELOPERS TODO USING PROTOCOL-SECURITY \ pptp-$(VERSION)/ $(RM) -r pptp-$(VERSION)/CVS pptp-$(VERSION)/*/CVS Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- NEWS 19 Apr 2006 22:58:56 -0000 1.50 +++ NEWS 2 Aug 2006 06:22:34 -0000 1.51 @@ -1,6 +1,6 @@ - remove non-free reference documentation [Cameron] - fix quoting and pppd options [Lundqvist] -- pptpsetup script [Ferraz] +- pptpsetup script (Debian Bug #167216?) [Ferraz] Release 1.7.1: (13th February 2006) Index: pptp.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- pptp.c 13 Feb 2006 03:06:25 -0000 1.44 +++ pptp.c 2 Aug 2006 06:22:34 -0000 1.45 @@ -44,7 +44,7 @@ #include "pptp_gre.h" #include "version.h" #if defined(__linux__) -#include <linux/prctl.h> +#include <sys/prctl.h> #else #include "inststr.h" #endif @@ -358,8 +358,9 @@ #ifdef PR_SET_NAME rc = prctl(PR_SET_NAME, "pptpgw", 0, 0, 0); if (rc != 0) perror("prctl"); -#endif +#else inststr(argc, argv, envp, buf); +#endif if (sigsetjmp(env, 1)!= 0) goto shutdown; signal(SIGINT, sighandler); @@ -455,7 +456,13 @@ char *my_argv[3] = { argv[0], inet_ntoa(inetaddr), phonenr }; char buf[128]; snprintf(buf, sizeof(buf), "pptp: call manager for %s", my_argv[1]); +#ifdef PR_SET_NAME + int rc; + rc = prctl(PR_SET_NAME, "pptpcm", 0, 0, 0); + if (rc != 0) perror("prctl"); +#else inststr(argc, argv, envp, buf); +#endif exit(callmgr_main(3, my_argv, envp)); } Index: pptp_callmgr.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_callmgr.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- pptp_callmgr.c 31 Mar 2005 07:42:39 -0000 1.20 +++ pptp_callmgr.c 2 Aug 2006 06:22:34 -0000 1.21 @@ -25,6 +25,7 @@ #include "dirutil.h" #include "vector.h" #include "util.h" +#include "routing.h" extern struct in_addr localbind; /* from pptp.c */ @@ -119,6 +120,8 @@ phonenr = argc == 3 ? argv[2] : NULL; if (inet_aton(argv[1], &inetaddr) == 0) fatal("Invalid IP address: %s", argv[1]); + routing_init(inet_ntoa(inetaddr)); + routing_start(); /* Step 1: Open sockets. */ if ((inet_sock = open_inetsock(inetaddr)) < 0) fatal("Could not open control connection to %s", argv[1]); @@ -189,7 +192,7 @@ if (FD_ISSET(unix_sock, &read_set)) { /* New call! */ struct sockaddr_un from; - int len = sizeof(from); + socklen_t len = sizeof(from); PPTP_CALL * call; struct local_callinfo *lci; int s; Index: pptp_ctrl.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_ctrl.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- pptp_ctrl.c 31 Mar 2005 07:42:39 -0000 1.31 +++ pptp_ctrl.c 2 Aug 2006 06:22:34 -0000 1.32 @@ -360,7 +360,7 @@ } /* fill in the phone number if it was specified */ if (phonenr) { - strncpy(packet.phone_num, phonenr, sizeof(packet.phone_num)); + strncpy((char *)packet.phone_num, phonenr, sizeof(packet.phone_num)); packet.phone_len = strlen(phonenr); if( packet.phone_len > sizeof(packet.phone_num)) packet.phone_len = sizeof(packet.phone_num); Index: pptp_gre.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_gre.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- pptp_gre.c 11 Jul 2005 03:23:48 -0000 1.39 +++ pptp_gre.c 2 Aug 2006 06:22:34 -0000 1.40 @@ -197,7 +197,7 @@ warn("short read (%d): %s", end, strerror(saved_errno)); switch (saved_errno) { case EMSGSIZE: { - int optval, optlen = sizeof(optval); + socklen_t optval, optlen = sizeof(optval); warn("transmitted GRE packet triggered an ICMP destination unreachable, fragmentation needed, or exceeds the MTU of the network interface"); #define IP_MTU 14 if(getsockopt(fd, IPPROTO_IP, IP_MTU, &optval, &optlen) < 0) Index: pptpsetup =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptpsetup,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- pptpsetup 19 Apr 2006 22:59:13 -0000 1.2 +++ pptpsetup 2 Aug 2006 06:22:34 -0000 1.3 @@ -3,48 +3,87 @@ use strict; use Getopt::Long; -my ( $SERVER, $TUNNEL, $DOMAIN, $USERNAME, $PASSWORD, $ENCRYPT, $NOSTART ); +use vars qw($VERSION); +$VERSION = '0.03'; + +# Command-line parameters: + +# actions +my ( $_create, $_delete, $_help ); + +# values +my ( $SERVER, $DOMAIN, $USERNAME, $PASSWORD, $ENCRYPT, $START ); my $result = GetOptions( + "create|c=s" => \$_create, # --create foo -> &create("foo") + "delete=s" => \$_delete, # --delete foo -> &delete("foo") + "help|h" => \$_help, # --help -> &help() "server|s=s" => \$SERVER, - "tunnel|t=s" => \$TUNNEL, "domain|d=s" => \$DOMAIN, "username|u=s" => \$USERNAME, "password|p=s" => \$PASSWORD, "encrypt|e" => \$ENCRYPT, - "nostart" => \$NOSTART, - "help|h" => \&help + "start" => \$START, ); -# input validation -($SERVER) = $SERVER =~ m{^(.+)$} or die "Invalid server ('$SERVER').\n"; -($TUNNEL) = $TUNNEL =~ m{^(\w+)$} or die "Invalid tunnel ('$TUNNEL').\n"; -($DOMAIN) = $DOMAIN =~ m{^(.*)$}; -($USERNAME) = $USERNAME =~ m{^(.+)$} or die "Invalid username ('$USERNAME').\n"; -($PASSWORD) = $PASSWORD =~ m{^(.+)$} or warn "Warning: null password!\n"; -($ENCRYPT) = $ENCRYPT =~ m{^(.*)$}; -($NOSTART) = $NOSTART =~ m{^(.*)$}; +if ($_create) { + &create($_create); +} elsif ($_delete) { + &delete($_delete); +} elsif ($_help) { + &help(); +} else { + die "$0: too few arguments.\nTry '$0 --help' for more information.\n"; +} -# put '\' between domain and username IF specified a domain -$DOMAIN = "$DOMAIN\\" if $DOMAIN; +exit; -# CONFIGURE +#### -# create or add lines to the /etc/ppp/chap-secrets file, which holds usernames and passwords -my $chap_secrets_file = '/etc/ppp/chap-secrets'; -open( FILE, ">>$chap_secrets_file" ) - or die "Can't write '$chap_secrets_file\n': $!"; +sub create { + my $TUNNEL = shift; -print FILE "# added by pptpsetup\n$DOMAIN$USERNAME $TUNNEL \"$PASSWORD\" *\n"; + # system checking + &Check_MPPE_in_kernel + or die "$0: couldn't find MPPE support in kernel.\n"; -close FILE; + &Check_MPPE_in_pppd + or die "$0: couldn't find MPPE support in pppd.\n"; -# create a /etc/ppp/peers/$TUNNEL file -my $tunnel_file = "/etc/ppp/peers/$TUNNEL"; -open( FILE, ">$tunnel_file" ) - or die "Can't write '$tunnel_file': $!\n"; + # input validation + ($TUNNEL) = $TUNNEL =~ m{^(\w+)$} + or die "$0: invalid tunnel name.\nTry '$0 --help' for more information.\n"; + ($SERVER) = $SERVER =~ m{^(.+)$} + or die "$0: invalid server.\nTry '$0 --help' for more information.\n"; + ($USERNAME) = $USERNAME =~ m{^(.+)$} + or die "$0: invalid username.\nTry '$0 --help' for more information.\n"; -print FILE <<"TUNNEL"; + # ask password + if ( !$PASSWORD ) { + print "Password: "; + $PASSWORD = <STDIN>; + chomp $PASSWORD; + } + + # put '\' between domain and username IF specified a domain + $DOMAIN = "$DOMAIN\\" if $DOMAIN; + + # create or add lines to the /etc/ppp/chap-secrets file, + # which holds usernames and passwords + my $chap_secrets_file = '/etc/ppp/chap-secrets'; + open( FILE, ">>$chap_secrets_file" ) + or die "$0: can't write to '$chap_secrets_file': $!\n"; + + print FILE "\n# added by pptpsetup for $TUNNEL\n$DOMAIN$USERNAME $TUNNEL \"$PASSWORD\" *\n"; + + close FILE; + + # create a /etc/ppp/peers/$TUNNEL file + my $tunnel_file = "/etc/ppp/peers/$TUNNEL"; + open( FILE, ">$tunnel_file" ) + or die "$0: can't write to '$tunnel_file': $!\n"; + + print FILE <<"TUNNEL"; # written by pptpsetup pty "pptp $SERVER --nolaunchpppd" lock @@ -56,40 +95,111 @@ ipparam $TUNNEL TUNNEL -print FILE "require-mppe-128\n" if $ENCRYPT; + print FILE "require-mppe-128\n" if $ENCRYPT; -close FILE; + close FILE; -# start tunneling with pon -system("pppd call $TUNNEL updetach") unless $NOSTART; + # start tunneling + if ($START) { + system("pppd call $TUNNEL updetach"); + } +} -### +#### sub help { print <<'EOF'; -pptpsetup version 1.0, Copyright (C) 2006 Nelson Ferraz -pptpsetup comes with ABSOLUTELY NO WARRANTY; for details see source. -This is free software, and you are welcome to redistribute it -under certain conditions; see source for details. +pptpsetup --create <TUNNEL> --server <SERVER> [--domain <DOMAIN>] + --username <USERNAME> [--password <PASSWORD>] + [--encrypt] [--start] -pptpsetup --server <SERVER> --tunnel <TUNNEL> [--domain <DOMAIN>] - --username <USERNAME> --password <PASSWORD> - [--encrypt] [--nostart] +pptpsetup --delete <TUNNEL> -Flags: +Options: -* the IP address or host name of the server, * the name you wish to use to refer to the tunnel (you choose it), +* the IP address or host name of the server, * the authentication domain name (optional), * the username you are to use, * the password you are to use, * whether encryption is required, -* whether to not start the connection after configuration. +* whether to start the connection after configuration. + +pptpsetup - Point-to-Point Tunneling Protocol setup + +Copyright (C) 2006 Nelson Ferraz + +pptpsetup comes with ABSOLUTELY NO WARRANTY; for details see source. +This is free software, and you are welcome to redistribute it +under certain conditions; see source for details. + EOF exit; } +#### + +sub delete { + my $tunnel = shift; + + # input validation + ($tunnel) = $tunnel =~ m{^(\w+)$} + or die "$0: invalid tunnel name.\nTry '$0 --help' for more information.\n"; + + # delete tunnel file + my $tunnel_file = "/etc/ppp/peers/$tunnel"; + unlink $tunnel_file + or die "$0: can't delete '$tunnel_file': $!\n"; + + # delete entry from chap-secrets + my $chap_file = '/etc/ppp/chap-secrets'; + + open( FILE, $chap_file ) + or die "$0: can't read '$chap_file': $!\n"; + my @chap = <FILE>; + close FILE; + + my $new_chap = ''; + foreach (@chap) { + $new_chap .= $_ unless /\b$tunnel\b/; + } + + # backup + rename( $chap_file, "$chap_file.bkp" ); + + # write new chap-secrets + open( FILE, ">$chap_file" ) + or die "$0: can't write '$chap_file': $!\n"; + print FILE $new_chap; + close FILE; + + exit; +} + +### AUXILIAR SUBS ### + +sub Check_MPPE_in_kernel { + my $command = q/modprobe ppp-compress-18/; + if (system( $command ) == 0) { + # no error! + return 1; + } else { + return 0; + } +} + +sub Check_MPPE_in_pppd { + my $command = q/strings \`which pppd\`|grep -i mppe|wc --lines/; + my $answer = `$command`; + if ($answer > 0) { + # ok! + return 1; + } else { + return 0; + } +} + __END__ =head1 NAME @@ -98,9 +208,11 @@ =head1 SYNOPSIS - ppptsetup --server <SERVER> --tunnel <TUNNEL> [--domain <DOMAIN>] - --username <USERNAME> --password <PASSWORD> - [--encrypt] [--dont-start]> + pptpsetup --create <TUNNEL> --server <SERVER> [--domain <DOMAIN>] + --username <USERNAME> [--password <PASSWORD>] + [--encrypt] [--start] + + pptpsetup --delete <TUNNEL> =head1 DESCRIPTION @@ -113,33 +225,39 @@ =over 16 -=item server +=item --create TUNNEL -the IP address or host name of the server +create a tunnel named TUNNEL -=item tunnel +=item --delete TUNNEL -the name you wish to use to refer to the tunnel (you choose it) +delete the file /etc/ppp/peers/TUNNEL and any lines from +/etc/ppp/chap-secrets that contains "TUNNEL" as a single word -=item domain +=item --server SERVER + +the IP address or host name of the server + +=item --domain DOMAIN the authentication domain name (optional) -=item username +=item --username USERNAME the username you are to use -=item password +=item --password PASSWORD -the password you are to use +the password you are to use. If you don't specify a password, +pptpsetup will ask for one. -=item encrypt +=item --encrypt whether encryption is required -=item nostart +=item --start -whether the connection shouldn't be started after config +whether the connection should be started after configuration. =back @@ -148,6 +266,20 @@ Nelson Ferraz <nferraz at gmail.com>, based on James Cameron's PPTP Client Debian HOWTO. +=head1 SEE ALSO + +=over 16 + +=item PPTP Client Debian HOWTO + +http://pptpclient.sourceforge.net/howto-debian.phtml + +=item PPTP Client Diagnosis HOWTO + +http://pptpclient.sourceforge.net/howto-diagnosis.phtml + +=back + =head1 COPYRIGHT pptpsetup - Point-to-Point Tunneling Protocol setup |
|
From: James C. <qu...@us...> - 2006-07-19 06:13:09
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25983 Modified Files: ChangeLog NEWS pptpconfig.php Log Message: add command line options Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/ChangeLog,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- ChangeLog 19 Apr 2006 23:17:42 -0000 1.14 +++ ChangeLog 19 Jul 2006 06:13:06 -0000 1.15 @@ -1,3 +1,18 @@ +Wed Jul 19 15:19:35 2006 Stephen DiVerdi <sdi...@cs...> + + * pptpconfig.php: add start, stop and status options. + + pptpconfig [-q] [tunnel {start|stop|status}] + + If no command line arguments are given, the normal GUI behavior is + executed. '-q' optionally specified quiet behavior, in which case + no output is written and the exit code indicates success or + failure. The name of a previously configured tunnel is specified, + followed by the command to execute. 'start' and 'stop' are the + same as clicking the start or stop buttons in the GUI, and + 'status' returns a string and error code to indicate if the tunnel + is currently active or not. + Thu Apr 20 09:12:53 2006 James Cameron <qu...@us...> * pptpconfig.php: call setsid() to prevent pppd process group kill Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/NEWS,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- NEWS 19 Apr 2006 23:17:42 -0000 1.10 +++ NEWS 19 Jul 2006 06:13:06 -0000 1.11 @@ -1,3 +1,4 @@ + - add command line start, stop and status options [DiVerdi] - call setsid() to prevent process group kill hitting parent [Cameron] 2006-04-10 fix resolv.conf undo Index: pptpconfig.php =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/pptpconfig.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- pptpconfig.php 19 Apr 2006 23:17:42 -0000 1.9 +++ pptpconfig.php 19 Jul 2006 06:13:06 -0000 1.10 @@ -4,7 +4,7 @@ # $Id$ # # pptpconfig.php, PPTP configuration and management GUI -# Copyright (C) 2002-2004 James Cameron (qu...@us...) +# Copyright (C) 2002-2006 James Cameron (qu...@us...) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -115,6 +115,61 @@ $xml = $me.'.xml'; if (!@is_readable($xml)) $xml = PATH_LIB.$me.'.xml'; +$use_gui = TRUE; +$quiet = FALSE; + +# check for the optional quiet flag +$argidx = 1; +if ($argv[$argidx]=='-q') { + quiet = TRUE; + $argidx++; +} + +# basic CLI - if there's nothing on the command line, proceed with the +# GUI. otherwise, parse the args and execute the command +if ($argv[$argidx]!='') { + $use_gui = FALSE; + + # get the tunnel name and command + $name = $argv[$argidx++]; + if ($argv[$argidx]=='') + usage(); + $command = $argv[$argidx++]; + + tunnels_load(); + + # make sure the named tunnel has been configured + $found = FALSE; + foreach ($tunnels as $tunnel) { + if ($name==$tunnel['name']) + $found = TRUE; + } + if (!$found) { + echo "couldn't find tunnel $name!\n"; + exit(1); + } + + if ($command=='start') { + start($name); + } else if ($command=='stop') { + stop($name); + } else if ($command=='status') { + $status = pid_state($name); + echo "tunnel $name is $status\n"; + if ($status=='stopped') + exit(1); + } else { + usage(); + } + + exit(0); +} + +function usage() { + echo "usage: $argv[0] [-q] [tunnel {start|stop|status}]\n"; + exit(1); +} + # open the main window on_main_setup_activate(0); @@ -1285,7 +1340,7 @@ # colour and display messages in text widget function scribe($context, $line) { - global $colours, $me; + global $colours, $me, $use_gui, $quiet; $colour = $colours['no']; if (ereg('^sent', $line)) $colour = $colours['tx']; @@ -1302,38 +1357,60 @@ if (ereg('^anon warn', $line)) $colour = $colours['uh']; if (ereg('^anon fatal', $line)) $colour = $colours['uh']; if (ereg('^'.$me, $line)) $colour = $colours['me']; - - $context['text']->insert(NULL, $colour, NULL, $line); + + if ($use_gui) + $context['text']->insert(NULL, $colour, NULL, $line); + else if (!$quiet) + echo $line; } # input handler for pppd pipe, displays what pppd says, with our comments function reader($ignore, $ignore, $context) { - global $me, $gtk_inputs; + global $me, $gtk_inputs, $use_gui, $quiet; $line = fgets($context['pipe'], 1024); - if (!($line === false)) { + if ($use_gui) { + # in the gui, the reader is a callback that processes on line at a time + if (!($line == false)) { + scribe($context, $line); + + if (ereg("Using interface (ppp[0-9]*)", $line, $regs)) { + $timeout = gtk::timeout_add(500, 'stats', $context); + $window = $context['window']; + $window->set_data('timeout', $timeout); + $window->set_data('interface', $regs[1]); + # todo, if end of $line is not newline, add one here + scribe($context, "$me: monitoring interface ".$regs[1]."\n"); + } + + if (ereg('^remote IP address ([0-9.]*)', $line, $regs)) { + $window = $context['window']; + $window->set_data('remoteip', $regs[1]); + } - scribe($context, $line); + return TRUE; + } else { + gtk::input_remove($gtk_inputs[$context['pipe']]); + } + } else { + # in the CLI, reader should read all input right away + while (!($line === false)) { + scribe($context, $line); - if (ereg("Using interface (ppp[0-9]*)", $line, $regs)) { - $timeout = gtk::timeout_add(500, 'stats', $context); - $window = $context['window']; - $window->set_data('timeout', $timeout); - $window->set_data('interface', $regs[1]); - # todo, if end of $line is not newline, add one here - scribe($context, "$me: monitoring interface ".$regs[1]."\n"); - } + if (ereg("Using interface (ppp[0-9]*)", $line, $regs)) { + $context['interface'] = $regs[1]; + # todo, if end of $line is not newline, add one here + scribe($context, "$me: monitoring interface ".$regs[1]."\n"); + } - if (ereg('^remote IP address ([0-9.]*)', $line, $regs)) { - $window = $context['window']; - $window->set_data('remoteip', $regs[1]); - } + if (ereg('^remote IP address ([0-9.]*)', $line, $regs)) { + $context['remoteip'] = $regs[1]; + } - return TRUE; + $line = fgets($context['pipe'], 1024); + } } - gtk::input_remove($gtk_inputs[$context['pipe']]); - $status = pclose($context['pipe']); # decode status, per "man wait" @@ -1359,16 +1436,23 @@ $diagnosis = ($status == 0) ? "started" : "failed"; scribe($context, "$me: pppd process $reason $status ($diagnosis)\n"); - $window = $context['window']; - $window->set_data('exit', $status); - $window->set_data('reason', $reason); - $statusbar = $window->get_data('statusbar'); - $statusbar->pop($window->get_data('id')); - $stop = $window->get_data('stop'); - $ping = $window->get_data('ping'); - $start = $window->get_data('start'); + if ($use_gui) { + $window = $context['window']; + $window->set_data('exit', $status); + $window->set_data('reason', $reason); + $statusbar = $window->get_data('statusbar'); + $statusbar->pop($window->get_data('id')); + $stop = $window->get_data('stop'); + $ping = $window->get_data('ping'); + $start = $window->get_data('start'); + } + if ($status == 0) { - $state = $window->get_data('state'); + if ($use_gui) + $state = $window->get_data('state'); + else + $state = 'initialising'; + if ($state == 'stopping') { $statusbar->push($window->get_data('id'), 'Stopped'); $window->set_data('state', 'stopped'); @@ -1378,16 +1462,22 @@ $ping->set_sensitive(0); $start->set_sensitive(1); } else { - $interface = $window->get_data('interface'); + if ($use_gui ) + $interface = $window->get_data('interface'); + else + $interface = $context['interface']; + routing_start($context, $interface); resolv_start($context, $interface); undo_save($context['name']); - $statusbar->push($window->get_data('id'), 'Connected'); - $window->set_data('state', 'running'); - setup_list_set_state($context['name'], 'running'); scribe($context, "$me: connected\n"); - $ping->set_sensitive(1); - iconify_start($context, $window); + if ($use_gui) { + $statusbar->push($window->get_data('id'), 'Connected'); + $window->set_data('state', 'running'); + setup_list_set_state($context['name'], 'running'); + $ping->set_sensitive(1); + iconify_start($context, $window); + } } } else { if ($reason == 'exit status') { @@ -1396,12 +1486,18 @@ $text = strsignal($status); } scribe($context, "$me: $text\n"); - $window->set_data('state', 'stopped'); - setup_list_set_state($context['name'], 'stopped'); - $statusbar->push($window->get_data('id'), 'Stopped, '.$text); - $stop->set_sensitive(0); - $ping->set_sensitive(0); - $start->set_sensitive(1); + if ($use_gui) { + $window->set_data('state', 'stopped'); + setup_list_set_state($context['name'], 'stopped'); + $statusbar->push($window->get_data('id'), 'Stopped, '.$text); + $stop->set_sensitive(0); + $ping->set_sensitive(0); + $start->set_sensitive(1); + } else { + if (!$quiet) + echo "start failed: $text\n"; + exit(1); + } } if (tunnel_name_to_debug($context['name'])) { @@ -1535,58 +1631,69 @@ kill() system call returned an error for PID '$pid'"); return 0; } -} + return 1; +} # user requests stop tunnel function stop($name) { - global $gx; + global $gx, $use_gui; - kill_name($name); + $killed = kill_name($name); + if (!$use_gui && !$killed) { + if (!$quiet) + echo "stop failed\n"; + exit(1); + } - # create per-tunnel window if not yet existing - if (!isset($gx[$name])) { - $window = tunnel_window_create($name); - $window->set_data('state', 'running'); - setup_list_set_state($name, 'running'); - } else { - # otherwise, just show the widget (may have been hidden by user) - $window = $gx[$name]->get_widget('pptpconfig-tunnel'); - $window->show(); + if ($use_gui) { + # create per-tunnel window if not yet existing + if (!isset($gx[$name])) { + $window = tunnel_window_create($name); + $window->set_data('state', 'running'); + setup_list_set_state($name, 'running'); + } else { + # otherwise, just show the widget (may have been hidden by user) + $window = $gx[$name]->get_widget('pptpconfig-tunnel'); + $window->show(); + } } # restore default route and DNS configuration - $context['text'] = $gx[$name]->get_widget('text'); + if ($use_gui) + $context['text'] = $gx[$name]->get_widget('text'); undo_load($name); undo_execute($context); undo_remove($name); - $timeout = $window->get_data('timeout'); - if (is_int($timeout)) gtk::timeout_remove($window->get_data('timeout')); - $start = $gx[$name]->get_widget('start'); - $ping = $gx[$name]->get_widget('ping'); - $stop = $gx[$name]->get_widget('stop'); - $state = $window->get_data('state'); - $statusbar = $window->get_data('statusbar'); - $statusbar->pop($window->get_data('id')); - if ($state == 'starting') { - $window->set_data('state', 'stopping'); - setup_list_set_state($name, 'stopping'); - $statusbar->push($window->get_data('id'), 'Stopping'); - $stop->set_sensitive(1); - $ping->set_sensitive(1); - $start->set_sensitive(0); - } - if ($state == 'running') { - $window->set_data('state', 'stopped'); - setup_list_set_state($name, 'stopped'); - $statusbar->push($window->get_data('id'), 'Stopped'); - $stop->set_sensitive(0); - $ping->set_sensitive(0); - $start->set_sensitive(1); + if ($use_gui) { + $timeout = $window->get_data('timeout'); + if (is_int($timeout)) gtk::timeout_remove($window->get_data('timeout')); + $start = $gx[$name]->get_widget('start'); + $ping = $gx[$name]->get_widget('ping'); + $stop = $gx[$name]->get_widget('stop'); + $state = $window->get_data('state'); + $statusbar = $window->get_data('statusbar'); + $statusbar->pop($window->get_data('id')); + if ($state == 'starting') { + $window->set_data('state', 'stopping'); + setup_list_set_state($name, 'stopping'); + $statusbar->push($window->get_data('id'), 'Stopping'); + $stop->set_sensitive(1); + $ping->set_sensitive(1); + $start->set_sensitive(0); + } + if ($state == 'running') { + $window->set_data('state', 'stopped'); + setup_list_set_state($name, 'stopped'); + $statusbar->push($window->get_data('id'), 'Stopped'); + $stop->set_sensitive(0); + $ping->set_sensitive(0); + $start->set_sensitive(1); + } + setup_unselect_all(); } - setup_unselect_all(); } # erase security critical portions when dumping tunnel configuration @@ -1607,8 +1714,9 @@ return $tunnel['debug']; } +#sjd modified to respect the use_gui flag for CLI version function start($name) { - global $selected, $tunnels, $gx, $me, $gtk_inputs; + global $selected, $tunnels, $gx, $me, $gtk_inputs, $use_gui; # check for an existing tunnel $pidfile = pid_name($name); @@ -1618,17 +1726,22 @@ return 0; } - # create per-tunnel window if not yet existing - if (!isset($gx[$name])) { - $window = tunnel_window_create($name); - } else { - # otherwise, just show the widget (may have been hidden by user) - $window = $gx[$name]->get_widget('pptpconfig-tunnel'); - $window->show(); + if ($use_gui) { + # create per-tunnel window if not yet existing + if (!isset($gx[$name])) { + $window = tunnel_window_create($name); + } else { + # otherwise, just show the widget (may have been hidden by user) + $window = $gx[$name]->get_widget('pptpconfig-tunnel'); + $window->show(); + } } # check the tunnel state - $state = $window->get_data('state'); + if ($use_gui) + $state = $window->get_data('state'); + else + $state = 'initialising'; # if it was stopped, change to initialising, clear the old log if ($state == 'stopped') { @@ -1641,8 +1754,13 @@ if ($state == 'initialising') { # build a context array - $text = $gx[$name]->get_widget('text'); - $context = array('name' => $name, 'tree' => $gx[$name], 'window' => $window, 'text' => $text); + $context = array('name' => $name); + if ($use_gui) { + $text = $gx[$name]->get_widget('text'); + $context['tree'] = $gx[$name]; + $context['window'] = $window; + $context['text'] = $text; + } # obtain the route to the server before pppd starts, so that # it can be used to add a host route after pppd has connected @@ -1684,28 +1802,32 @@ $context['pipe'] = popen($command.' 2>&1', 'r'); socket_set_blocking($context['pipe'], FALSE); - $window->set_data('state', 'starting'); - setup_list_set_state($name, 'starting'); + if ($use_gui) { + $window->set_data('state', 'starting'); + setup_list_set_state($name, 'starting'); - $statusbar = $window->get_data('statusbar'); - $statusbar->pop($window->get_data('id')); - $statusbar->push($window->get_data('id'), 'Starting'); + $statusbar = $window->get_data('statusbar'); + $statusbar->pop($window->get_data('id')); + $statusbar->push($window->get_data('id'), 'Starting'); - $gtk_inputs[$context['pipe']] = gtk::input_add($context['pipe'], GDK_INPUT_READ, 'reader', $context); - $window->set_data('pipe', $context['pipe']); + $gtk_inputs[$context['pipe']] = gtk::input_add($context['pipe'], GDK_INPUT_READ, 'reader', $context); + $window->set_data('pipe', $context['pipe']); - # allow the stop button, disallow the start button - $stop = $window->get_data('stop'); - $stop->set_sensitive(1); + # allow the stop button, disallow the start button + $stop = $window->get_data('stop'); + $stop->set_sensitive(1); - $ping = $window->get_data('ping'); - $ping->set_sensitive(0); + $ping = $window->get_data('ping'); + $ping->set_sensitive(0); - $start = $window->get_data('start'); - $start->set_sensitive(0); + $start = $window->get_data('start'); + $start->set_sensitive(0); - notebook_reset(); - setup_unselect_all(); + notebook_reset(); + setup_unselect_all(); + } else { + reader(0, 0, $context); + } } else { message('start already', "Cannot Start. Tunnel is already running."); @@ -2074,17 +2196,24 @@ # window pptpconfig-message function message($title, $text) { - $gx = open_window('pptpconfig-message'); - # todo: when window opens, text is blank, when we change text below - # the window enlarges, try (a) setting text before title, (b) - # creating entire widget window inline rather than use glade - # definition. - $window = $gx->get_widget('pptpconfig-message'); - $window->set_title('pptpconfig '.$title); - $label = $gx->get_widget('message_label'); - $label->set_text($text); - $ok = $gx->get_widget('message_ok'); - $ok->hide(); + global $use_gui, $quiet; + if ($use_gui) { + $gx = open_window('pptpconfig-message'); + # todo: when window opens, text is blank, when we change text below + # the window enlarges, try (a) setting text before title, (b) + # creating entire widget window inline rather than use glade + # definition. + $window = $gx->get_widget('pptpconfig-message'); + $window->set_title('pptpconfig '.$title); + $label = $gx->get_widget('message_label'); + $label->set_text($text); + $ok = $gx->get_widget('message_ok'); + $ok->hide(); + } else if (!$quiet) { + echo "$title\n"; + echo " $text\n"; + echo "\n"; + } } function on_message_ok_clicked($widget) { |
|
From: James C. <qu...@us...> - 2006-07-19 06:02:35
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21947 Modified Files: AUTHORS Log Message: add command line options Index: AUTHORS =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/AUTHORS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- AUTHORS 22 Feb 2006 05:25:06 -0000 1.2 +++ AUTHORS 19 Jul 2006 06:02:28 -0000 1.3 @@ -16,3 +16,4 @@ Elias Ross John McNair John King + Stephen DiVerdi |
|
From: James C. <qu...@us...> - 2006-04-19 23:17:48
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19269 Modified Files: pptpconfig.php NEWS ChangeLog Log Message: cover for buggy pppd Index: pptpconfig.php =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/pptpconfig.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- pptpconfig.php 6 Apr 2006 06:22:26 -0000 1.8 +++ pptpconfig.php 19 Apr 2006 23:17:42 -0000 1.9 @@ -92,6 +92,10 @@ pcntl_signal(SIGINT, 'null'); } +# create a new session process group to prevent pppd +# process group kill from going beyond us +posix_setsid(); + # define text highlight colours $colours['no'] = &new GdkColor(0, 0, 0); $colours['me'] = &new GdkColor(32768, 0, 32768); Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/NEWS,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- NEWS 10 Apr 2006 01:02:25 -0000 1.9 +++ NEWS 19 Apr 2006 23:17:42 -0000 1.10 @@ -1,3 +1,5 @@ + - call setsid() to prevent process group kill hitting parent [Cameron] + 2006-04-10 fix resolv.conf undo - do not undo routes added to tunnel interface [Cameron] Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/ChangeLog,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- ChangeLog 10 Apr 2006 01:20:26 -0000 1.13 +++ ChangeLog 19 Apr 2006 23:17:42 -0000 1.14 @@ -1,3 +1,8 @@ +Thu Apr 20 09:12:53 2006 James Cameron <qu...@us...> + + * pptpconfig.php: call setsid() to prevent pppd process group kill + from infecting our parent process. Reported by: Ken Sarkies. + Mon Apr 10 11:17:56 2006 James Cameron <qu...@us...> * pptpconfig-20060410: released. |
|
From: James C. <qu...@us...> - 2006-04-19 23:14:58
|
Update of /cvsroot/pptpclient/pptp-linux/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17405/debian Modified Files: rules Log Message: Index: rules =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/debian/rules,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- rules 9 Nov 2004 01:42:33 -0000 1.6 +++ rules 19 Apr 2006 23:14:53 -0000 1.7 @@ -13,7 +13,6 @@ dh_testdir $(MAKE) - ln -f Reference/README Reference/README.Reference touch build-stamp @@ -23,7 +22,6 @@ rm -f build-stamp -$(MAKE) distclean - rm -f Reference/README.Reference dh_clean |
|
From: James C. <qu...@us...> - 2006-04-19 22:59:15
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6196 Modified Files: pptpsetup Log Message: minor tweaks Index: pptpsetup =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptpsetup,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pptpsetup 4 Apr 2006 23:54:32 -0000 1.1 +++ pptpsetup 19 Apr 2006 22:59:13 -0000 1.2 @@ -3,7 +3,7 @@ use strict; use Getopt::Long; -my ( $SERVER, $TUNNEL, $DOMAIN, $USERNAME, $PASSWORD, $ENCRYPT, $DONT_START ); +my ( $SERVER, $TUNNEL, $DOMAIN, $USERNAME, $PASSWORD, $ENCRYPT, $NOSTART ); my $result = GetOptions( "server|s=s" => \$SERVER, @@ -12,7 +12,7 @@ "username|u=s" => \$USERNAME, "password|p=s" => \$PASSWORD, "encrypt|e" => \$ENCRYPT, - "dont-start" => \$DONT_START, + "nostart" => \$NOSTART, "help|h" => \&help ); @@ -23,28 +23,19 @@ ($USERNAME) = $USERNAME =~ m{^(.+)$} or die "Invalid username ('$USERNAME').\n"; ($PASSWORD) = $PASSWORD =~ m{^(.+)$} or warn "Warning: null password!\n"; ($ENCRYPT) = $ENCRYPT =~ m{^(.*)$}; -($DONT_START) = $DONT_START =~ m{^(.*)$}; +($NOSTART) = $NOSTART =~ m{^(.*)$}; - # put '\' between domain and username IF specified a domain +# put '\' between domain and username IF specified a domain $DOMAIN = "$DOMAIN\\" if $DOMAIN; # CONFIGURE -# create the /etc/ppp/options.pptp file, which sets options common to all tunnelings -my $options_file = "/etc/ppp/options.$TUNNEL"; -open( FILE, ">$options_file" ) - or die "Can't write '$options_file': $!\n"; - -print FILE "lock noauth nobsdcomp nodeflate\n"; - -close FILE; - # create or add lines to the /etc/ppp/chap-secrets file, which holds usernames and passwords my $chap_secrets_file = '/etc/ppp/chap-secrets'; open( FILE, ">>$chap_secrets_file" ) or die "Can't write '$chap_secrets_file\n': $!"; -print FILE "$DOMAIN$USERNAME PPTP $PASSWORD *\n"; +print FILE "# added by pptpsetup\n$DOMAIN$USERNAME $TUNNEL \"$PASSWORD\" *\n"; close FILE; @@ -54,28 +45,36 @@ or die "Can't write '$tunnel_file': $!\n"; print FILE <<"TUNNEL"; -pty "pptp $SERVER --nolaunchpppd - +# written by pptpsetup +pty "pptp $SERVER --nolaunchpppd" +lock +noauth +nobsdcomp +nodeflate name $DOMAIN$USERNAME - -remotename PPTP -require-mppe-128 -file /etc/ppp/options.$TUNNEL +remotename $TUNNEL ipparam $TUNNEL TUNNEL +print FILE "require-mppe-128\n" if $ENCRYPT; + close FILE; # start tunneling with pon -system("pon $TUNNEL") unless $DONT_START; +system("pppd call $TUNNEL updetach") unless $NOSTART; ### sub help { print <<'EOF'; -ppptsetup --server <SERVER> --tunnel <TUNNEL> [--domain <DOMAIN>] +pptpsetup version 1.0, Copyright (C) 2006 Nelson Ferraz +pptpsetup comes with ABSOLUTELY NO WARRANTY; for details see source. +This is free software, and you are welcome to redistribute it +under certain conditions; see source for details. + +pptpsetup --server <SERVER> --tunnel <TUNNEL> [--domain <DOMAIN>] --username <USERNAME> --password <PASSWORD> - [--encrypt] [--dont-start] + [--encrypt] [--nostart] Flags: @@ -85,7 +84,7 @@ * the username you are to use, * the password you are to use, * whether encryption is required, -* whether the connection shouldn't be started after config. +* whether to not start the connection after configuration. EOF exit; @@ -108,7 +107,7 @@ PPTP Client is a Linux, FreeBSD, NetBSD and OpenBSD client for the proprietary Microsoft Point-to-Point Tunneling Protocol, PPTP. -This script configures PPTP Client. +This script configures PPTP Client on Linux. =head1 OPTIONS @@ -138,7 +137,7 @@ whether encryption is required -=item dont-start +=item nostart whether the connection shouldn't be started after config |
|
From: James C. <qu...@us...> - 2006-04-19 22:58:59
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5825 Modified Files: ChangeLog Makefile NEWS pptp.8 Log Message: fix documentation Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.105 retrieving revision 1.106 diff -u -d -r1.105 -r1.106 --- ChangeLog 4 Apr 2006 23:54:32 -0000 1.105 +++ ChangeLog 19 Apr 2006 22:58:56 -0000 1.106 @@ -1,3 +1,12 @@ +Thu Apr 20 08:52:45 2006 James Cameron <qu...@us...> + + * Makefile (dist): remove Reference documentation as the license + is non-free. The documentation is available from other sources. + +Thu Apr 20 08:49:01 2006 James Cameron <qu...@us...> + + * pptp.8: merge Debian contribution in 1.7.0-2 by Ola Lundqvist. + Mon Apr 3 15:28:37 2006 James Cameron <qu...@us...> * pptpsetup: add script contributed by Nelson Ferraz. Index: Makefile =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- Makefile 13 Feb 2006 03:06:25 -0000 1.40 +++ Makefile 19 Apr 2006 22:58:56 -0000 1.41 @@ -25,10 +25,10 @@ PPTP_OBJS = pptp.o pptp_gre.o ppp_fcs.o \ pptp_ctrl.o dirutil.o vector.o \ inststr.o util.o version.o \ - pptp_quirks.o orckit_quirks.o pqueue.o pptp_callmgr.o + pptp_quirks.o orckit_quirks.o pqueue.o pptp_callmgr.o routing.o PPTP_DEPS = pptp_callmgr.h pptp_gre.h ppp_fcs.h util.h \ - pptp_quirks.h orckit_quirks.h config.h pqueue.h + pptp_quirks.h orckit_quirks.h config.h pqueue.h routing.h all: config.h $(PPTP_BIN) @@ -69,7 +69,7 @@ $(RM) -r pptp-$(VERSION) mkdir pptp-$(VERSION) cp --recursive ChangeLog Makefile *.c *.h options.pptp pptp.8 \ - Documentation Reference AUTHORS COPYING INSTALL NEWS \ + Documentation AUTHORS COPYING INSTALL NEWS \ README DEVELOPERS TODO USING PROTOCOL-SECURITY \ pptp-$(VERSION)/ $(RM) -r pptp-$(VERSION)/CVS pptp-$(VERSION)/*/CVS Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- NEWS 4 Apr 2006 23:54:32 -0000 1.49 +++ NEWS 19 Apr 2006 22:58:56 -0000 1.50 @@ -1,3 +1,5 @@ +- remove non-free reference documentation [Cameron] +- fix quoting and pppd options [Lundqvist] - pptpsetup script [Ferraz] Release 1.7.1: (13th February 2006) Index: pptp.8 =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp.8,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- pptp.8 9 Nov 2004 01:42:32 -0000 1.10 +++ pptp.8 19 Apr 2006 22:58:56 -0000 1.11 @@ -25,21 +25,21 @@ \fBpppd\fR. .SH OPTIONS .LP -The first non-option argument on the \fBpptp\fR command line must be the host +The first non\-option argument on the \fBpptp\fR command line must be the host name or IP address of the PPTP server. .LP -All long options (starting with "--") +All long options (starting with "\-\-") are interpreted as pptp options, and a fatal error occurs if an unrecognised option is used. .LP -All command-line arguments which do not start -with "-" are interpreted as ppp options, and passed as is to \fBpppd\fR unless -\fB--nolaunchpppd\fR is given. +All command\-line arguments which do not start +with "\-" are interpreted as ppp options, and passed as is to \fBpppd\fR unless +\fB\-\-nolaunchpppd\fR is given. .TP -.B \--phone <number> +.B \-\-phone <number> Pass <number> to remote host as phone number .TP -.B \--nolaunchpppd +.B \-\-nolaunchpppd Do not launch .B pppd but use stdin as the network connection. Use this flag when including @@ -50,39 +50,39 @@ .B pty option. See EXAMPLES. .TP -.B \--quirks <quirk> +.B \-\-quirks <quirk> Work around a buggy PPTP implementation, adopts special case handling for particular PPTP servers and ADSL modems. Currently recognised values are BEZEQ_ISRAEL only .TP -.B \--debug +.B \-\-debug Run in foreground (for debugging with gdb) .TP -.B \--sync +.B \-\-sync Enable Synchronous HDLC (pppd must use it too) .TP -.B \--timeout <secs> +.B \-\-timeout <secs> Time to wait for reordered packets (0.01 to 10 secs) .TP -.B \--nobuffer +.B \-\-nobuffer Completely disables buffering and reordering of packets. -Any --timeout specified will be ignored. +Any \-\-timeout specified will be ignored. .TP -.B \--idle-wait <secs> +.B \-\-idle-wait <secs> Time to wait before sending a control connection echo request. The RFC2637 default is 60 seconds. .TP -.B \--max-echo-wait <secs> +.B \-\-max-echo-wait <secs> Time to wait for an echo reply before closing the control connection. The RFC2637 default is 60 seconds. .TP -.B \--logstring <name> +.B \-\-logstring <name> Use <name> instead of 'anon' in syslog messages .TP -.B \--localbind <addr> +.B \-\-localbind <addr> Bind to specified IP address instead of wildcard .TP -.B \--loglevel <level> +.B \-\-loglevel <level> Sets the debugging level (0=low, 1=default, 2=high) .SH "QUIRKS" @@ -97,12 +97,9 @@ .B Connection to a Microsoft Windows VPN Server .BR -pppd noauth nobsdcomp nodeflate mppe-40 mppe-128 -mppe-stateless name domain\\\\\\\\username remotename PPTP -require-chapms-v2 -pty "pptp 10.0.0.5 --nolaunchpppd" +pppd noauth nobsdcomp nodeflate require\-mppe\-128 name domain\\\\\\\\username remotename PPTP pty "pptp 10.0.0.5 \-\-nolaunchpppd" .PP -Note that the \fBchap-secrets\fR file used by \fBpppd\fR must include an entry for domain\\\\username +Note that the \fBchap\-secrets\fR file used by \fBpppd\fR must include an entry for domain\\\\username .SH "STATISTICS" The pptp process collects statistics when sending and receiving @@ -182,4 +179,5 @@ <jam...@hp...> from text contributed by Thomas Quinot <th...@de...>, for the Debian GNU/Linux system. The description of the available statistics was written by Chris Wilson -<ch...@ne...>. +<ch...@ne...>. Updates for the Debian distribution by +Ola Lundqvist <op...@de...>. |
|
From: James C. <qu...@us...> - 2006-04-19 22:53:53
|
Update of /cvsroot/pptpclient/pptp-linux/Reference In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2032 Removed Files: README ms-chap.txt pptp-draft.txt rfc1661.txt rfc1662.txt rfc1701.txt rfc1702.txt rfc1990.txt rfc791.txt rfc793.txt Log Message: remove non-free documentation --- README DELETED --- --- ms-chap.txt DELETED --- --- pptp-draft.txt DELETED --- --- rfc1661.txt DELETED --- --- rfc1662.txt DELETED --- --- rfc1701.txt DELETED --- --- rfc1702.txt DELETED --- --- rfc1990.txt DELETED --- --- rfc791.txt DELETED --- --- rfc793.txt DELETED --- |
|
From: Paul H. <pg...@us...> - 2006-04-18 11:03:32
|
Update of /cvsroot/pptpclient/specs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11776 Modified Files: pptpconfig.spec Log Message: Update to 20060410 Use php4-pcntl instead of php-pcntl (virtual provides issue) Define %__id_u macro in a more portable way Use relative symlinks instead of absolute ones Put xml/xpm files under %{_datadir} instead of /usr/lib Get rid of ver, rel, rpmrel, suse_version, and mandriva_version macros Add build options: --with mandriva (for Mandrake/Mandriva) --with suse (for SuSE) --with newpam (for pam > 0.90 or so) Add %{?dist} tag for distribution identification Add "provides: pptp-php-gtk" to go with the obsoletes Try to preserve file timestamps Index: pptpconfig.spec =================================================================== RCS file: /cvsroot/pptpclient/specs/pptpconfig.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- pptpconfig.spec 14 Mar 2006 12:44:44 -0000 1.11 +++ pptpconfig.spec 18 Apr 2006 11:03:17 -0000 1.12 @@ -1,68 +1,65 @@ +# +# build options: +# --with mandriva (for Mandrake/Mandriva) +# --with suse (for SuSE) +# --with newpam (for pam > 0.90 or so) +# + # Uncomment the following line for beta release versions # (i.e. change hash symbol to percent symbol and specify beta version) #define beta rc1 -%define ver 20060222 -%define rel 1 - -%define rpmrel %{?beta:0.%{beta}.}%{rel} -%define private_suffix -pcntl +%define private_suffix 4-pcntl %define private_php_dir %{_libdir}/php%{private_suffix} +%define datadirrel %(echo %{_datadir} | %{__sed} -e 's,^/,,') %define desktop_vendor PPTP - -# SuSE or Mandriva versions of the package can be built by defining suse_version or mandriva_version -# on the rpmbuild command line, e.g. rpmbuild --define "suse_version 910" -ba pptpconfig.spec -%if %{?mandriva_version:1}%{!?mandriva_version:0} -%define is_mandriva 1 -%else -%define is_mandriva 0 -%endif -%{!?__id_u:%define __id_u /bin/id -u} +%{!?__id_u: %define __id_u %([ -x /bin/id ]&&echo /bin/id||([ -x /usr/bin/id ]&&echo /usr/bin/id||echo /bin/true)) -u} Summary: Point-to-Point Tunneling Protocol (PPTP) Client Configuration GUI Name: pptpconfig -Version: %{ver} -%if %{is_mandriva} -Release: %{rpmrel}mdk -Requires: iproute2 -%else -Release: %{rpmrel}%{?suse_version:suse} -Requires: iproute -%endif +Version: 20060410 +Release: %{?beta:0.%{beta}.}1%{?dist} +Distribution: PPTP Client Project +URL: http://quozl.netrek.org/pptp/pptpconfig/ Source0: http://quozl.netrek.org/pptp/pptpconfig/pptpconfig-%{version}.tar.gz Source1: pptpconfig.png +Source2: pptpconfig.pam Patch1: pptpconfig-desktop.patch Patch2: pptpconfig-desktop-suse.patch License: GPL -%if %{!?suse_version:1}%{?suse_version:0} +%if %{?_with_suse:0}%{!?_with_suse:1} Group: Applications/Internet Requires: usermode >= 1.36 %else Group: Productivity/Networking/PPP Requires: xsu %endif -Distribution: PPTP Client Project -URL: http://quozl.netrek.org/pptp/pptpconfig/ -Requires: ppp >= 2.4.2, pptp >= 1.2.0, php-gtk%{private_suffix}, php%{private_suffix} >= 4.3.9-2 -BuildRequires: desktop-file-utils +Requires: ppp >= 2.4.2, pptp >= 1.2.0, php%{private_suffix}-gtk, php%{private_suffix} >= 4.3.9-2 +Requires: iproute%{?_with_mandriva:2} +BuildRequires: desktop-file-utils, symlinks Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: pptp-php-gtk +Provides: pptp-php-gtk BuildArch: noarch %description -Graphical user interface for PPTP Client. -Supports configuration of tunnels, starting, stopping, catching debug -output from pppd, DNS and routing changes. +Graphical user interface for PPTP Client. Supports configuration of tunnels, +starting, stopping, catching debug output from pppd, DNS and routing changes. %prep %setup -q %patch1 -p0 -%if %{?suse_version:1}%{!?suse_version:0} +%if %{?_with_suse:1}%{!?_with_suse:0} %patch2 -p0 %endif -%{__sed} -i -e 's@/usr/lib/php-pcntl/bin/php@/bin/php%{private_suffix}@' pptpconfig.php +%{__sed} -i -e 's@/usr/lib/php-pcntl/bin/php@/bin/php%{private_suffix}@' \ + -e 's@usr/lib/@%{datadirrel}/@' pptpconfig.php Makefile %{__sed} -i -e 's#@sbindir@#%{_sbindir}#' -e 's#@datadir@#%{_datadir}#' pptpconfig.desktop -%{__cp} %{SOURCE1} . +%{__cp} -p %{SOURCE1} . +%if %{?_with_newpam:1}%{!?_with_newpam:0} +%{__rm} -f pptpconfig.pam +%{__cp} -p %{SOURCE2} . +%endif %install # Some directory names hardcoded here because they are hardcoded in the PHP script @@ -72,13 +69,20 @@ sysconfdir=/etc \ datadir=%{_datadir} \ DESTDIR=%{buildroot} \ - install%{!?suse_version: install-pam} -%{__install} -D -m 0444 pptpconfig.png %{buildroot}/%{_datadir}/pixmaps/pptpconfig.png + INSTALL="%{__install} -p" \ + install%{!?_with_suse: install-pam} +%{__install} -D -m 0444 -p pptpconfig.png %{buildroot}/%{_datadir}/pixmaps/pptpconfig.png /usr/bin/desktop-file-install \ --vendor %{desktop_vendor} \ --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/pptpconfig.desktop +# Fix absolute symlink +%{__rm} -f %{buildroot}%{_sbindir}/pptpconfig +cd %{buildroot}%{_sbindir} +%{__ln_s} %{buildroot}%{_bindir}/pptpconfig.php pptpconfig +/usr/bin/symlinks -cs . +cd - %clean %{__rm} -rf %{buildroot} @@ -95,22 +99,35 @@ %files %defattr(-,root,root) -%dir /etc/pptpconfig -%dir /usr/lib/pptpconfig +%dir /etc/pptpconfig/ %{_bindir}/pptpconfig.php %{_sbindir}/pptpconfig -%if %{!?suse_version:1}%{?suse_version:0} +%if %{!?_with_suse:1}%{?_with_suse:0} %{_bindir}/pptpconfig %config(noreplace) /etc/pam.d/pptpconfig %config(noreplace) /etc/security/console.apps/pptpconfig %endif %{_datadir}/applications/%{desktop_vendor}-pptpconfig.desktop %{_datadir}/pixmaps/pptpconfig.png -/usr/lib/pptpconfig/pptpconfig.xml -/usr/lib/pptpconfig/*.xpm +%{_datadir}/pptpconfig/ %doc AUTHORS COPYING DEVELOPERS NEWS README TODO ChangeLog %changelog +* Thu Apr 13 2006 Paul Howarth <pa...@ci...> 20060410-1 +- update to 20060410 +- use php4-pcntl instead of php-pcntl (virtual provides issue) +- define %%__id_u macro in a more portable way +- use relative symlinks instead of absolute ones +- put xml/xpm files under %%{_datadir} instead of /usr/lib +- get rid of ver, rel, rpmrel, suse_version, and mandriva_version macros +- add build options: + --with mandriva (for Mandrake/Mandriva) + --with suse (for SuSE) + --with newpam (for pam > 0.90 or so) +- add %%{?dist} tag for distribution identification +- add "provides: pptp-php-gtk" to go with the obsoletes +- try to preserve file timestamps + * Tue Mar 14 2006 Paul Howarth <pa...@ci...> 20060222-1 - update to 20060222 |
|
From: Paul H. <pg...@us...> - 2006-04-18 11:01:28
|
Update of /cvsroot/pptpclient/specs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10326 Added Files: php4-pcntl-gtk.spec Removed Files: php-gtk-pcntl.spec Log Message: Rename package to php4-pcntl-gtk to match renamed underlying php package Remove buildroot unconditionally in %clean and %install Honour %{optflags} Define %__id_u macro in a more portable way Add %{?dist} tag for distribution-specific build identification Specify libdir for configure (pacify rpmlint a bit) Remove explicit library dependencies that rpm will pick up automatically --- NEW FILE: php4-pcntl-gtk.spec --- %define private_suffix 4-pcntl %{!?__id_u: %define __id_u %([ -x /bin/id ]&&echo /bin/id||([ -x /usr/bin/id ]&&echo /usr/bin/id||echo /bin/true)) -u} Summary: GTK+ bindings for applications built using php%{private_suffix} Name: php%{private_suffix}-gtk Version: 1.0.2 Release: 2%{?dist} Source: php-gtk-%{version}.tar.gz License: LGPL Group: Development/Languages URL: http://gtk.php.net/ Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) BuildRequires: php%{private_suffix}-devel >= 4.3.0, automake, autoconf BuildRequires: gtk+-devel >= 1.2.6, libglade-devel, glib-devel, libxml-devel, zlib-devel Requires: php%{private_suffix} >= 4.0.5, gtk+ >= 1.2.6 %define private_php_dir %{_libdir}/php%{private_suffix} %description PHP-GTK is an extension for PHP programming language that implements language bindings for the GTK+ toolkit. It provides an object-oriented interface to GTK+ classes and functions and greatly simplifies writing client side cross-platform GUI applications. This version is built against the minimal PHP version with process control (php%{private_suffix}) and requires that package to be installed too. %prep %setup -q -n php_gtk-%{version} %build export CFLAGS="%{optflags}" PATH=$PATH:%{private_php_dir}/bin ./buildconf PATH=$PATH:%{private_php_dir}/bin ./configure \ --libdir=%{private_php_dir}/lib \ --with-php-config=%{private_php_dir}/bin/php-config %{__make} %install %{__rm} -rf %{buildroot} %{__mkdir} -p %{buildroot}%{private_php_dir} %{__make} INSTALL_ROOT=%{buildroot} install %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,0755) %{private_php_dir}/lib %doc AUTHORS ChangeLog COPYING.LIB NEWS README TODO %changelog * Thu Apr 13 2006 Paul Howarth <pa...@ci...> 1.0.2-2 - Rename package to php4-pcntl-gtk to match renamed underlying php package - Remove buildroot unconditionally in %%clean and %%install - Honour %%{optflags} - Define %%__id_u macro in a more portable way - Add %%{?dist} tag for distribution-specific build identification - Specify libdir for configure (pacify rpmlint a bit) - Remove explicit library dependencies that rpm will pick up automatically * Mon Jul 18 2005 Paul Howarth <pa...@ci...> 1.0.2-1 - Update to 1.0.2 - Ensure all directories are owned properly - Tarball directory stupidly named php_gtk instead of php-gtk * Mon Apr 11 2005 Paul Howarth <pa...@ci...> 1.0.1-3 - Add build requirement of autoconf * Thu Sep 30 2004 Paul Howarth <pa...@ci...> 1.0.1-2 - Do not do parallel make on SMP boxen; Makefile does not support parallel builds properly * Wed Aug 11 2004 Paul Howarth <pa...@ci...> 1.0.1-1 - Update to 1.0.1 - Build now works with automake 1.8.3 and does not require buildconf/aclocal/buildconf routine, but does require PHP >= 4.3.0 * Tue Jul 20 2004 Paul Howarth <pa...@ci...> 1.0.0-1 - Rebuild against php-pcntl 4.3.8 * Sat Jun 19 2004 James Cameron <jam...@hp...> - rpm build on debian * Wed Jun 16 2004 Paul Howarth <pa...@ci...> 1.0.0-0.1 - Don't disable anything in configure, makes the package more generally useful. * Tue Jun 15 2004 Paul Howarth <pa...@ci...> 1.0.0-0 - Initial RPM build. --- php-gtk-pcntl.spec DELETED --- |
|
From: Paul H. <pg...@us...> - 2006-04-18 10:58:07
|
Update of /cvsroot/pptpclient/specs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7531 Added Files: php4-pcntl.spec Removed Files: php-pcntl.spec Log Message: Rename package to php4-pcntl to avoid install-time removal of the main php package in distributions whose main php package provides php-pcntl, such as Fedora Core 5 Define %__id_u macro in a more portable way Add %{?dist} tag for distribution-specific build identification Bogus dependency filter no longer seems to be needed Honour %{optflags} Specify libdir for configure (pacify rpmlint a bit) --- NEW FILE: php4-pcntl.spec --- %define private_suffix 4-pcntl %{!?__id_u: %define __id_u %([ -x /bin/id ]&&echo /bin/id||([ -x /usr/bin/id ]&&echo /usr/bin/id||echo /bin/true)) -u} # Note: we don't use the system pcre library because some distributions (e.g. Red Hat 8) # don't include a sufficiently recent version. Summary: The PHP HTML-embedded scripting language, version 4, with process controls Name: php%{private_suffix} Version: 4.4.1 Release: 2%{?dist} Source: http://www.php.net/distributions/php-%{version}.tar.gz License: The PHP License Group: Development/Languages URL: http://www.php.net/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: grep, flex %define private_php_dir %{_libdir}/%{name} %description PHP (Hypertext Preprocessor) is an HTML-embedded scripting language. This minimal version is built with support for process controls and so is not suitable for use in conjunction with a web server for security reasons. This version is intended for use in building local applications, possibly in conjunction with the php-gtk toolkit. %package devel Summary: Files needed to build applications using %{name} Group: Development/Languages Requires: php%{private_suffix} = %{version}-%{release} %description devel Files needed to build applications using %{name}. %prep %setup -q -n php-%{version} # Prevent %%doc confusion over LICENSE files %{__cp} Zend/LICENSE Zend/ZEND_LICENSE %{__cp} TSRM/LICENSE TSRM_LICENSE %{__cp} regex/COPYRIGHT regex_COPYRIGHT # Fix permissions in debuginfo package /usr/bin/find . -name '*.[ch]' | /usr/bin/xargs %{__chmod} 644 %build export CFLAGS="%{optflags}" ./configure --prefix=%{private_php_dir} \ --libdir=%{private_php_dir}/lib \ --disable-cgi \ --disable-rpath \ --disable-ipv6 \ --disable-all \ --enable-pcntl \ --enable-posix \ --disable-xml \ --disable-safe-mode \ --disable-sigchild \ --disable-bcmath \ --disable-calendar \ --disable-ctype \ --disable-dba \ --disable-dbase \ --disable-dbx \ --disable-debug \ --disable-dio \ --disable-exit \ --disable-filepro \ --disable-ftp \ --disable-gd-native-ttf \ --disable-mbstring \ --disable-mbregex \ --disable-mime-magic \ --disable-overload \ --disable-session \ --disable-shmop \ --disable-ucd-snmp-hack \ --disable-sockets \ --disable-sysvmsg \ --disable-sysvsem \ --disable-sysvshm \ --disable-wddx \ --disable-xml \ --disable-xslt \ --disable-yp \ --without-bz2 \ --without-db3 \ --without-curl \ --without-gd \ --without-ttf \ --without-gdbm \ --without-gettext \ --without-ncurses \ --without-gmp \ --without-iconv \ --without-jpeg \ --without-mm \ --without-openssl \ --without-png \ --without-pspell \ --without-xml \ --without-zlib \ --without-imap \ --without-kerberos \ --without-ldap \ --without-mysql \ --without-pgsql \ --without-snmp \ --without-unixODBC \ --without-mnogosearch \ --with-pcre-regex %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__mkdir} -p %{buildroot}{%{private_php_dir},%{_mandir}/man1,/bin} %{__make} INSTALL_ROOT=%{buildroot} install %{__mv} %{buildroot}%{private_php_dir}/man/man1/php.1 %{buildroot}%{_mandir}/man1/php%{private_suffix}.1 %{__ln_s} %{private_php_dir}/bin/php %{buildroot}/bin/php%{private_suffix} %clean %{__rm} -rf %{buildroot} %files %defattr(-,root,root,0755) /bin/php%{private_suffix} %dir %{private_php_dir}/ %dir %{private_php_dir}/bin/ %{private_php_dir}/bin/php %{_mandir}/man1/php%{private_suffix}.1* %doc CODING_STANDARDS CREDITS EXTENSIONS INSTALL LICENSE NEWS README* %doc Zend/ZEND_* TSRM_LICENSE regex_COPYRIGHT %files devel %defattr(-,root,root,0755) %{private_php_dir}/bin/php-config %{private_php_dir}/bin/phpize %{private_php_dir}/lib/ %{private_php_dir}/include/ %{private_php_dir}/man/ %changelog * Wed Apr 12 2006 Paul Howarth <pa...@ci...> 4.4.1-2 - rename package to php4-pcntl to avoid install-time removal of the main php package in distributions whose main php package provides php-pcntl, such as Fedora Core 5 - define %%__id_u macro in a more portable way - add %%{?dist} tag for distribution-specific build identification - bogus dependency filter no longer seems to be needed - honour %%{optflags} - specify libdir for configure (pacify rpmlint a bit) * Sat Nov 5 2005 Paul Howarth <pa...@ci...> 4.4.1-1 - update to 4.4.1 - remove buildroot unconditionally in %%clean and %%install * Mon Jul 18 2005 Paul Howarth <pa...@ci...> 4.4.0-1 - update to 4.4.0 - make sure all directories are owned properly - autotools patch no longer needed - phpextdist no longer included - include manpages for phpize and php-config * Mon Apr 11 2005 Paul Howarth <pa...@ci...> 4.3.11-1 - update to 4.3.11 - revise automake patch, now partly incorporated upstream * Tue Mar 22 2005 Paul Howarth <pa...@ci...> 4.3.10-3 - add flex as build requirement * Tue Mar 22 2005 Paul Howarth <pa...@ci...> 4.3.10-2 - add kludge to enable build with rpm-build < 4.2, removing bogus dependencies from -devel subpackage - remove dependency on smtpdaemon * Wed Dec 22 2004 Paul Howarth <pa...@ci...> 4.3.10-1 - update to 4.3.10 * Thu Sep 30 2004 Paul Howarth <pa...@ci...> 4.3.9-2 - add symlink /bin/php-pcntl -> %{private_php_dir}/bin/php for architecure-independent way of finding php-pcntl * Sun Sep 26 2004 Paul Howarth <pa...@ci...> 4.3.9-1 - update to 4.3.9 * Tue Jul 20 2004 Paul Howarth <pa...@ci...> 4.3.8-1 - update to 4.3.8 * Sat Jun 19 2004 James Cameron <jam...@hp...> - rpm build on debian * Tue Jun 15 2004 Paul Howarth <pa...@ci...> - initial RPM build --- php-pcntl.spec DELETED --- |
|
From: James C. <qu...@us...> - 2006-04-10 22:14:13
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30016 Modified Files: RELEASING Log Message: Index: RELEASING =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/RELEASING,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- RELEASING 10 Apr 2006 01:20:26 -0000 1.7 +++ RELEASING 10 Apr 2006 22:14:06 -0000 1.8 @@ -6,11 +6,12 @@ VERSION=20060410 echo $VERSION -# check and fix version in Makefile +# check and fix versions emacsclient Makefile emacsclient NEWS emacsclient README emacsclient TODO +emacsclient pptpconfig.spec # commit version changes to cvs @@ -68,7 +69,7 @@ # prepare patch if required -# edit spec file as required, specifically version numbers and release +# edit spec file as required, should already be done above cd /home/james/pptp-client/specs emacsclient ~/pptp-client/specs/pptpconfig.spec |
|
From: James C. <qu...@us...> - 2006-04-10 01:20:32
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21606 Modified Files: ChangeLog RELEASING Log Message: release 20060410 Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/ChangeLog,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- ChangeLog 6 Apr 2006 06:23:15 -0000 1.12 +++ ChangeLog 10 Apr 2006 01:20:26 -0000 1.13 @@ -1,3 +1,7 @@ +Mon Apr 10 11:17:56 2006 James Cameron <qu...@us...> + + * pptpconfig-20060410: released. + Thu Apr 6 16:19:15 2006 James Cameron <qu...@us...> * pptpconfig.php (routing_start): do not queue interface routes Index: RELEASING =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/RELEASING,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- RELEASING 10 Apr 2006 01:12:20 -0000 1.6 +++ RELEASING 10 Apr 2006 01:20:26 -0000 1.7 @@ -123,13 +123,20 @@ put pptpconfig-${VERSION}.tar.gz EOF +https://sourceforge.net/account/login.php +PPTP Client +Admin +File Releases +Add Release for pptpconfig +New release name: pptpconfig-${VERSION}, Create This Release + -- Announce To: ppt...@li... From: James Cameron <jam...@hp...> -Subject: pptpconfig 20040605 released +Subject: pptpconfig 20060410 released Announcing a release of the PPTP Client GUI. |
|
From: James C. <qu...@us...> - 2006-04-10 01:12:26
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14497 Modified Files: RELEASING Log Message: release 20060410 Index: RELEASING =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/RELEASING,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- RELEASING 10 Apr 2006 01:02:25 -0000 1.5 +++ RELEASING 10 Apr 2006 01:12:20 -0000 1.6 @@ -75,6 +75,11 @@ # build cd /home/james/pptp-client/specs rpmbuild -ba --sign pptpconfig.spec +# fails on debian ... +# sh: line 1: /bin/id: No such file or directory +# sh: line 1: /bin/id: No such file or directory +# error: failed build dependencies: +# desktop-file-utils is needed by pptpconfig-20060410-0 # test cd /usr/src/rpm/RPMS/noarch/ |
|
From: James C. <qu...@us...> - 2006-04-10 01:12:26
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14497/debian Modified Files: changelog Log Message: release 20060410 Index: changelog =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/debian/changelog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- changelog 22 Feb 2006 05:25:07 -0000 1.4 +++ changelog 10 Apr 2006 01:12:20 -0000 1.5 @@ -1,3 +1,9 @@ +pptpconfig (20060410-0) unstable; urgency=low + + * update version + + -- James Cameron <qu...@us...> Mon, 10 Apr 2006 11:03:19 +1000 + pptpconfig (20060222-0) unstable; urgency=low * update version |
|
From: James C. <qu...@us...> - 2006-04-10 01:02:34
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5700 Modified Files: Makefile NEWS README RELEASING Log Message: pre-release $VERSION Index: Makefile =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile 22 Feb 2006 05:25:06 -0000 1.7 +++ Makefile 10 Apr 2006 01:02:24 -0000 1.8 @@ -1,4 +1,4 @@ -VERSION=20060222 +VERSION=20060410 PACKAGE=pptpconfig sbindir=/usr/sbin bindir=/usr/bin Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/NEWS,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- NEWS 6 Apr 2006 06:23:15 -0000 1.8 +++ NEWS 10 Apr 2006 01:02:25 -0000 1.9 @@ -1,3 +1,5 @@ +2006-04-10 fix resolv.conf undo + - do not undo routes added to tunnel interface [Cameron] - do not cease processing undo list if error occurs [Cameron] Index: README =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- README 22 Feb 2006 05:25:06 -0000 1.4 +++ README 10 Apr 2006 01:02:25 -0000 1.5 @@ -1,4 +1,4 @@ -This is pptpconfig release 20060222. +This is pptpconfig release 20060410. http://quozl.netrek.org/pptp/pptpconfig/ @@ -28,7 +28,7 @@ Resources - * pptpconfig-20060222.tar.gz sources, + * pptpconfig-20060410.tar.gz sources, Building from Source @@ -40,7 +40,7 @@ * test php-gtk's test/gtk.php will run, - * download pptpconfig-20060222.tar.gz, untar somewhere, + * download pptpconfig-20060410.tar.gz, untar somewhere, * backup /etc/ppp and anything you normally would, in case I have made a mistake that wipes our your work or configuration, Index: RELEASING =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/RELEASING,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- RELEASING 22 Feb 2006 05:51:00 -0000 1.4 +++ RELEASING 10 Apr 2006 01:02:25 -0000 1.5 @@ -3,7 +3,7 @@ # choose version number echo "VERSION=`date +"%Y%m%d"`" VERSION=`date +"%Y%m%d"` -VERSION=20060222 +VERSION=20060410 echo $VERSION # check and fix version in Makefile |
|
From: Wolfgang M. <wol...@gm...> - 2006-04-07 20:50:25
|
Hi, i use ubuntu breezy and pptp-linux version 1.5.0. My problem is a big log file in a few days ~>2Gig and if do ps -xa is see a lot lines: ... 15518 ? S 0:48 pptp: GRE-to-PPP gateway on /dev/ptmx 15520 ? S 0:00 pptp: GRE-to-PPP gateway on /dev/ptmx 15560 ? S 0:47 pptp: GRE-to-PPP gateway on /dev/ptmx 15571 ? S 0:47 pptp: GRE-to-PPP gateway on /dev/ptmx ... 21660 ? S 0:00 pptp: GRE-to-PPP gateway on /dev/ptmx 21698 ? S 0:12 pptp: GRE-to-PPP gateway on /dev/ptmx 21740 ? S 0:00 pptp: GRE-to-PPP gateway on /dev/ptmx ... Thx a lot. Wolfgang Morawetz. |
|
From: James C. <qu...@us...> - 2006-04-06 06:23:31
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2332 Modified Files: ChangeLog NEWS Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/ChangeLog,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ChangeLog 6 Apr 2006 06:22:26 -0000 1.11 +++ ChangeLog 6 Apr 2006 06:23:15 -0000 1.12 @@ -8,7 +8,7 @@ * pptpconfig.php (undo_execute): even if one undo command fails, attempt the remaining commands and wipe the array. Reported by: - Ken Sarkies + Ken Sarkies. Wed Feb 22 16:44:24 2006 James Cameron <qu...@us...> Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/NEWS,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- NEWS 22 Feb 2006 05:25:06 -0000 1.7 +++ NEWS 6 Apr 2006 06:23:15 -0000 1.8 @@ -1,3 +1,6 @@ + - do not undo routes added to tunnel interface [Cameron] + - do not cease processing undo list if error occurs [Cameron] + 2006-02-22 added resolvconf support - fix modinfo probe to use either ppp_mppe or ppp_mppe_mppc [Cameron] |
|
From: James C. <qu...@us...> - 2006-04-06 06:22:35
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1732 Modified Files: ChangeLog pptpconfig.php Log Message: do not undo route via tunnel Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/ChangeLog,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ChangeLog 6 Apr 2006 06:16:23 -0000 1.10 +++ ChangeLog 6 Apr 2006 06:22:26 -0000 1.11 @@ -1,3 +1,9 @@ +Thu Apr 6 16:19:15 2006 James Cameron <qu...@us...> + + * pptpconfig.php (routing_start): do not queue interface routes + for deletion, kernel will remove them when interface is brought + down. Reported by: Ken Sarkies. + Thu Apr 6 16:13:17 2006 James Cameron <qu...@us...> * pptpconfig.php (undo_execute): even if one undo command fails, Index: pptpconfig.php =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/pptpconfig.php,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- pptpconfig.php 6 Apr 2006 06:16:23 -0000 1.7 +++ pptpconfig.php 6 Apr 2006 06:22:26 -0000 1.8 @@ -878,7 +878,6 @@ $command = 'ip route add '.$network.' dev '.$interface; $array = command($context, $command); if ($array['status'] != 0) $ok = 0; - $undo[] = ereg_replace('route add', 'route del', $command); } if ($ok) scribe($context, $me.": routes added to remote networks\n"); |
1 message has been excluded from this view by a project administrator.
