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...> - 2010-06-15 23:38:14
|
Update of /cvsroot/pptpclient/pptp-linux In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv360 Modified Files: pptp.c Log Message: fix indent Index: pptp.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- pptp.c 15 Jun 2010 04:59:31 -0000 1.52 +++ pptp.c 15 Jun 2010 23:38:04 -0000 1.53 @@ -459,7 +459,7 @@ if (connect(fd, (struct sockaddr *) &where, sizeof(where)) < 0) { /* couldn't connect. We'll have to launch this guy. */ - unlink (where.sun_path); /* RACE CONDITION? */ + unlink (where.sun_path); /* FIXME: potential race condition */ /* fork and launch call manager process */ switch (pid = fork()) { |
From: James C. <qu...@us...> - 2010-06-15 05:04:41
|
Update of /cvsroot/pptpclient/pptp-linux In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv6218 Modified Files: ChangeLog NEWS pptp_callmgr.c pptp_ctrl.c pptp_ctrl.h Log Message: move free of conn struct out of main loop Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.124 retrieving revision 1.125 diff -u -d -r1.124 -r1.125 --- ChangeLog 4 Jun 2010 01:04:12 -0000 1.124 +++ ChangeLog 15 Jun 2010 05:04:32 -0000 1.125 @@ -1,3 +1,19 @@ +Tue Jun 15 15:02:28 2010 James Cameron <qu...@us...> + + * pptp.c (open_callmgr): fix usage of status returned by waitpid; + it must be wrapped by WEXITSTATUS to shift bits as required. + +Tue Jun 15 15:00:40 2010 James Cameron <qu...@la...> + + * pptp_ctrl.c (pptp_conn_is_dead): immediately destroying the + connection and freeing the structure has led to segmentation + faults on more recent heap implementations, since we use the + structure after it has been freed. + + Defer the free of the structure until after all uses of it have + ceased, by adding a connection state for dead and terminating the + main loop once it is detected. + Fri Jun 4 10:54:04 2010 Jan Just Keijser <jan...@gm...> * pptp_ctrl.c: check for failure return by pptp_send_ctrl_packet Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- NEWS 4 Jun 2010 01:04:12 -0000 1.66 +++ NEWS 15 Jun 2010 05:04:32 -0000 1.67 @@ -1,3 +1,4 @@ +- move free of conn struct out of main loop [Cameron] - avoid using conn struct after it is freed [Keijser] - correct response to call disconnect notify [Shen] - avoid superfluous MPPE capability checks in pptpsetup [Howarth] Index: pptp_callmgr.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_callmgr.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- pptp_callmgr.c 24 Jul 2008 05:37:47 -0000 1.22 +++ pptp_callmgr.c 15 Jun 2010 05:04:32 -0000 1.23 @@ -170,6 +170,7 @@ do { int rc; fd_set read_set = call_set, write_set; + if (pptp_conn_is_dead(conn)) break; FD_ZERO (&write_set); if (pptp_conn_established(conn)) { FD_SET (unix_sock, &read_set); @@ -297,6 +298,7 @@ } /* with extreme prejudice */ pptp_conn_destroy(conn); + pptp_conn_free(conn); vector_destroy(call_list); } cleanup: Index: pptp_ctrl.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_ctrl.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- pptp_ctrl.c 4 Jun 2010 01:04:12 -0000 1.36 +++ pptp_ctrl.c 15 Jun 2010 05:04:32 -0000 1.37 @@ -62,8 +62,11 @@ struct PPTP_CONN { int inet_sock; /* Connection States */ - enum { - CONN_IDLE, CONN_WAIT_CTL_REPLY, CONN_WAIT_STOP_REPLY, CONN_ESTABLISHED + enum { + CONN_IDLE, + CONN_WAIT_CTL_REPLY, CONN_WAIT_STOP_REPLY, + CONN_ESTABLISHED, + CONN_DEAD } conn_state; /* on startup: CONN_IDLE */ /* Keep-alive states */ enum { @@ -454,6 +457,16 @@ close(conn->inet_sock); /* deallocate */ vector_destroy(conn->call); + conn->conn_state = CONN_DEAD; +} + +int pptp_conn_is_dead(PPTP_CONN * conn) +{ + return conn->conn_state == CONN_DEAD; +} + +void pptp_conn_free(PPTP_CONN * conn) +{ free(conn); } @@ -1046,11 +1059,13 @@ int i; /* "Keep Alives and Timers, 1": check connection state */ if (global.conn->conn_state != CONN_ESTABLISHED) { - if (global.conn->conn_state == CONN_WAIT_STOP_REPLY) + if (global.conn->conn_state == CONN_WAIT_STOP_REPLY) { /* hard close. */ pptp_conn_destroy(global.conn); - else /* soft close */ - pptp_conn_close(global.conn, PPTP_STOP_NONE); + return; + } + /* soft close */ + pptp_conn_close(global.conn, PPTP_STOP_NONE); } /* "Keep Alives and Timers, 2": check echo status */ if (global.conn->ka_state == KA_OUTSTANDING) { Index: pptp_ctrl.h =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_ctrl.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- pptp_ctrl.h 19 Feb 2008 05:05:03 -0000 1.6 +++ pptp_ctrl.h 15 Jun 2010 05:04:32 -0000 1.7 @@ -33,6 +33,8 @@ void pptp_call_close(PPTP_CONN * conn, PPTP_CALL * call); /* hard close. */ void pptp_call_destroy(PPTP_CONN *conn, PPTP_CALL *call); +int pptp_conn_is_dead(PPTP_CONN * conn); +void pptp_conn_free(PPTP_CONN * conn); /* soft close. Will callback on completion. */ void pptp_conn_close(PPTP_CONN * conn, u_int8_t close_reason); /* hard close */ |
From: James C. <qu...@us...> - 2010-06-15 04:59:41
|
Update of /cvsroot/pptpclient/pptp-linux In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv4009 Modified Files: pptp.c Log Message: fix waitpid usage Index: pptp.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -d -r1.51 -r1.52 --- pptp.c 24 Jul 2008 05:53:05 -0000 1.51 +++ pptp.c 15 Jun 2010 04:59:31 -0000 1.52 @@ -459,7 +459,7 @@ if (connect(fd, (struct sockaddr *) &where, sizeof(where)) < 0) { /* couldn't connect. We'll have to launch this guy. */ - unlink (where.sun_path); + unlink (where.sun_path); /* RACE CONDITION? */ /* fork and launch call manager process */ switch (pid = fork()) { @@ -475,7 +475,7 @@ } default: /* parent */ waitpid(pid, &status, 0); - if (status!= 0) + if (WEXITSTATUS(status) != 0) fatal("Call manager exited with error %d", status); break; } |
From: James C. <qu...@us...> - 2010-06-04 01:04:21
|
Update of /cvsroot/pptpclient/pptp-linux In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv26419 Modified Files: AUTHORS ChangeLog Makefile NEWS pptp_ctrl.c Log Message: avoid using conn struct after it is freed [Keijser] Signed-off-by: Jan Just Keijser <jan...@gm...> Reviewed-by: James Cameron <qu...@la...> Index: AUTHORS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/AUTHORS,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- AUTHORS 10 Nov 2009 04:44:30 -0000 1.19 +++ AUTHORS 4 Jun 2010 01:04:12 -0000 1.20 @@ -25,6 +25,7 @@ Michael Adda <mi...@ha...> Ilya Voronin <ivo...@gm...> Charles Shen <cs...@ci...> +Jan Just Keijser <jan...@gm...> Package renamed from pptp-linux to pptp after version 1.5.0. Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.123 retrieving revision 1.124 diff -u -d -r1.123 -r1.124 --- ChangeLog 10 Nov 2009 04:44:31 -0000 1.123 +++ ChangeLog 4 Jun 2010 01:04:12 -0000 1.124 @@ -1,3 +1,8 @@ +Fri Jun 4 10:54:04 2010 Jan Just Keijser <jan...@gm...> + + * pptp_ctrl.c: check for failure return by pptp_send_ctrl_packet + and avoid using freed struct conn. + Tue Nov 10 15:39:33 2009 Charles Shen <cs...@ci...> * pptp_ctrl.c (ctrlp_disp): add call ID of outgoing call so that Index: Makefile =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- Makefile 24 Jul 2008 05:37:47 -0000 1.49 +++ Makefile 4 Jun 2010 01:04:12 -0000 1.50 @@ -16,7 +16,7 @@ CC = gcc RM = rm -f -OPTIMIZE= -O0 +OPTIMIZE= -O -Wuninitialized DEBUG = -g INCLUDE = CFLAGS = -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE) Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.65 retrieving revision 1.66 diff -u -d -r1.65 -r1.66 --- NEWS 10 Nov 2009 04:44:31 -0000 1.65 +++ NEWS 4 Jun 2010 01:04:12 -0000 1.66 @@ -1,3 +1,4 @@ +- avoid using conn struct after it is freed [Keijser] - correct response to call disconnect notify [Shen] - avoid superfluous MPPE capability checks in pptpsetup [Howarth] - retain permissions on chap-secrets, closes RH BZ #492090 [Howarth] Index: pptp_ctrl.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_ctrl.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- pptp_ctrl.c 10 Nov 2009 04:44:31 -0000 1.35 +++ pptp_ctrl.c 4 Jun 2010 01:04:12 -0000 1.36 @@ -397,9 +397,10 @@ /* don't check state against WAIT_DISCONNECT... allow multiple disconnect * requests to be made. */ - pptp_send_ctrl_packet(conn, &rqst, sizeof(rqst)); - pptp_reset_timer(); - call->state.pns = PNS_WAIT_DISCONNECT; + if (pptp_send_ctrl_packet(conn, &rqst, sizeof(rqst))) { + pptp_reset_timer(); + call->state.pns = PNS_WAIT_DISCONNECT; + } /* call structure will be freed when we have confirmation of disconnect. */ } @@ -432,9 +433,10 @@ pptp_call_close(conn, vector_get_Nth(conn->call, i)); /* now close connection */ log("Closing PPTP connection"); - pptp_send_ctrl_packet(conn, &rqst, sizeof(rqst)); - pptp_reset_timer(); /* wait 60 seconds for reply */ - conn->conn_state = CONN_WAIT_STOP_REPLY; + if (pptp_send_ctrl_packet(conn, &rqst, sizeof(rqst))) { + pptp_reset_timer(); /* wait 60 seconds for reply */ + conn->conn_state = CONN_WAIT_STOP_REPLY; + } return; } @@ -724,8 +726,8 @@ reply.version = packet->version; /* protocol version not supported */ reply.result_code = hton8(5); - pptp_send_ctrl_packet(conn, &reply, sizeof(reply)); - pptp_reset_timer(); /* give sender a chance for a retry */ + if (pptp_send_ctrl_packet(conn, &reply, sizeof(reply))) + pptp_reset_timer(); /* give sender a chance for a retry */ } else { /* same or greater version */ if (pptp_send_ctrl_packet(conn, &reply, sizeof(reply))) { conn->conn_state = CONN_ESTABLISHED; @@ -832,8 +834,8 @@ hton8(1), hton8(PPTP_GENERAL_ERROR_NONE), 0 }; logecho( PPTP_ECHO_RQST); - pptp_send_ctrl_packet(conn, &reply, sizeof(reply)); - pptp_reset_timer(); + if (pptp_send_ctrl_packet(conn, &reply, sizeof(reply))) + pptp_reset_timer(); break; } /* ----------- OUTGOING CALL MESSAGES ------------ */ @@ -920,9 +922,10 @@ vector_search(conn->call, ntoh16(packet->call_id), &call); if (call->callback != NULL) call->callback(conn, call, CALL_CLOSE_RQST); - pptp_send_ctrl_packet(conn, &reply, sizeof(reply)); - pptp_call_destroy(conn, call); - log("Call closed (RQST) (call id %d)", (int) call->call_id); + if (pptp_send_ctrl_packet(conn, &reply, sizeof(reply))) { + pptp_call_destroy(conn, call); + log("Call closed (RQST) (call id %d)", (int) call->call_id); + } } break; } @@ -1057,8 +1060,9 @@ } else { /* ka_state == NONE */ /* send keep-alive */ struct pptp_echo_rqst rqst = { PPTP_HEADER_CTRL(PPTP_ECHO_RQST), hton32(global.conn->ka_id) }; - pptp_send_ctrl_packet(global.conn, &rqst, sizeof(rqst)); - global.conn->ka_state = KA_OUTSTANDING; + if (pptp_send_ctrl_packet(global.conn, &rqst, sizeof(rqst))) { + global.conn->ka_state = KA_OUTSTANDING; + } } /* check incoming/outgoing call states for !IDLE && !ESTABLISHED */ for (i = 0; i < vector_size(global.conn->call); i++) { |
From: James C. <qu...@us...> - 2009-11-10 04:45:21
|
Update of /cvsroot/pptpclient/pptp-linux In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22162 Modified Files: AUTHORS ChangeLog NEWS pptp_ctrl.c Log Message: fix response to call disconnect notify Index: AUTHORS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/AUTHORS,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- AUTHORS 25 Jun 2009 01:40:35 -0000 1.18 +++ AUTHORS 10 Nov 2009 04:44:30 -0000 1.19 @@ -24,6 +24,7 @@ Nelson Ferraz <nf...@gm...> Michael Adda <mi...@ha...> Ilya Voronin <ivo...@gm...> +Charles Shen <cs...@ci...> Package renamed from pptp-linux to pptp after version 1.5.0. Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.122 retrieving revision 1.123 diff -u -d -r1.122 -r1.123 --- ChangeLog 25 Jun 2009 01:40:35 -0000 1.122 +++ ChangeLog 10 Nov 2009 04:44:31 -0000 1.123 @@ -1,3 +1,9 @@ +Tue Nov 10 15:39:33 2009 Charles Shen <cs...@ci...> + + * pptp_ctrl.c (ctrlp_disp): add call ID of outgoing call so that + Call-Disconnect-Notify from peer causes correct disconnection + sequence. + Thu Jun 25 11:39:24 2009 James Cameron <qu...@us...> * AUTHORS: maintainer mail address change, jam...@hp... is Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- NEWS 1 Jun 2009 13:48:37 -0000 1.64 +++ NEWS 10 Nov 2009 04:44:31 -0000 1.65 @@ -1,3 +1,4 @@ +- correct response to call disconnect notify [Shen] - avoid superfluous MPPE capability checks in pptpsetup [Howarth] - retain permissions on chap-secrets, closes RH BZ #492090 [Howarth] - compilation fixes for older distributions of Linux [Howarth] Index: pptp_ctrl.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_ctrl.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- pptp_ctrl.c 24 Jul 2008 05:37:47 -0000 1.34 +++ pptp_ctrl.c 10 Nov 2009 04:44:31 -0000 1.35 @@ -899,6 +899,7 @@ call->callback(conn, call, CALL_OPEN_DONE); log("Outgoing call established (call ID %u, peer's " "call ID %u).\n", call->call_id, call->peer_call_id); + vector_insert(conn->call, call->peer_call_id, call); } break; } |
From: James C. <qu...@us...> - 2009-09-13 06:00:38
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32479 Modified Files: ChangeLog pptpconfig.php Log Message: quote password when writing secrets file Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/ChangeLog,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- ChangeLog 30 Mar 2008 22:23:49 -0000 1.21 +++ ChangeLog 13 Sep 2009 05:59:49 -0000 1.22 @@ -1,3 +1,9 @@ +Mon Mar 31 11:08:46 2008 James Cameron <qu...@us...> + + * pptpconfig.php (tunnel_to_secret): quote password when placing + it in secrets file. This change was delayed reaching CVS by over + a year. Sorry. + Mon Mar 31 09:18:46 2008 Alex Amiryan <al...@am...> * pptpconfig.php: fix problem using CLI interface that caused Index: pptpconfig.php =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/pptpconfig.php,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- pptpconfig.php 30 Mar 2008 22:23:49 -0000 1.15 +++ pptpconfig.php 13 Sep 2009 05:59:49 -0000 1.16 @@ -440,10 +440,10 @@ $tail = '# --- '.$me.' added for tunnel '.$tunnel['name']; if ($tunnel['domain'] == '') { $body = $tunnel['username']." ". - munge($tunnel['name'])." ".$tunnel['password']." *"; + munge($tunnel['name'])." \"".$tunnel['password']."\" *"; } else { $body = $tunnel['domain']."\\\\".$tunnel['username']." ". - munge($tunnel['name'])." ".$tunnel['password']." *"; + munge($tunnel['name'])." \"".$tunnel['password']."\" *"; } return "\n".$head."\n".$body."\n".$tail."\n"; |
From: James C. <qu...@us...> - 2009-09-13 05:48:01
|
Update of /cvsroot/pptpclient/scripts In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31543 Modified Files: mkdist-ppp mkdist-pptp-linux pptp-linux-releasing.txt release-process.txt Log Message: deprecate out of tree release process scripts Index: mkdist-ppp =================================================================== RCS file: /cvsroot/pptpclient/scripts/mkdist-ppp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- mkdist-ppp 10 Jun 2003 08:29:09 -0000 1.1 +++ mkdist-ppp 13 Sep 2009 05:47:00 -0000 1.2 @@ -1,45 +1 @@ -#!/bin/sh - -# expectations: -# no tags -# no CVS -# ppp checked out in ~/ppp - -# usage: mkdist-ppp - -PPP_VER=$1 -[ "$PPP_VER" != "" ] || PPP_VER=2.4.2_cvs_`date +"%Y%m%d"` - -PACKAGE=ppp-${PPP_VER} -DISTDIR=${PACKAGE} - -# fail if the distribution directory is already there, otherwise we would -# clobber any additional parts of it during our cleanup. -if [ -d $DISTDIR ]; then - echo "$0: new distribution directory already there, please remove?"; - exit 2; -fi - -mkdir $DISTDIR - -# -# Get PPP -# -(cd ~/ppp&&tar --create --exclude CVS --file - .)|(cd ${DISTDIR}&&tar xf -) - -# -# Remove the CVS stuff -# -find ${DISTDIR} -name CVS -exec rm -rfi {} \; - -# -# Get the spec file -# -cp specs/ppp.spec ${DISTDIR} - -# package up the tree -tar czf $PACKAGE.tar.gz $DISTDIR -md5sum $PACKAGE.tar.gz - -# clean the tree -rm -r ${DISTDIR} +Replaced by the file RELEASING in the pptp-linux repository. Index: mkdist-pptp-linux =================================================================== RCS file: /cvsroot/pptpclient/scripts/mkdist-pptp-linux,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- mkdist-pptp-linux 6 Mar 2002 22:17:19 -0000 1.6 +++ mkdist-pptp-linux 13 Sep 2009 05:47:00 -0000 1.7 @@ -1,61 +1 @@ -#!/bin/sh - -# mkdist for pptp-linux package -# generates the .tar.gz source kit from the CVS repository modules -# "pptp-linux pptp-extras specs" -# tag in CVS expected to have version dots changed to underscores -# version 1.1.0 release 1 candidate 1 should be tagged pptp-linux-1_1_0-rc1 -# version 1.1.0 release 1 candidate 2 should be tagged pptp-linux-1_1_0-rc2 -# version 1.1.0 release 1 final should be tagged pptp-linux-1_1_0-1 - -if [ $# != 2 ]; then - echo "usage: $0 <version> <release>"; - echo "example: $0 1.1.0 1"; - exit 1; -fi - -PACKAGE=pptp-linux-$1 -RELEASE=$2 -DISTDIR=$PACKAGE-$RELEASE -TAG=`echo $PACKAGE-$RELEASE | sed 's/\./_/g'` - -# fail if the distribution directory is already there, otherwise we would -# clobber any additional parts of it during our cleanup. -if [ -d $DISTDIR ]; then - echo "$0: new distribution directory already there, please remove?"; - exit 2; -fi - -# make the distribution directory -mkdir $DISTDIR -cd $DISTDIR - -# tag expected is pptp-linux-1_1_0-1 -echo "$0: checking out using tag $TAG" -CVSROOT=:pserver:ano...@cv...:/cvsroot/pptpclient -cvs -q -d $CVSROOT export -r $TAG pptp-linux pptp-extras specs - -# enable execute of debian/rules -chmod +x pptp-linux/debian/rules - -# rename the pptp-linux directory to match the version and tar it up -echo "$0: encapsulating pptp-linux into $PACKAGE.tar.gz" -mv pptp-linux $PACKAGE -tar czf $PACKAGE.tar.gz $PACKAGE -rm -r $PACKAGE - -# adopt the extras and specs -echo "$0: adopting extras" -mv pptp-extras/* . -rm -r pptp-extras -mv specs/pptp-linux.spec . -rm -r specs - -# package up the tree -echo "$0: encapsulating both into $PACKAGE-$RELEASE.tar.gz" -cd .. -tar czf $PACKAGE-$RELEASE.tar.gz $DISTDIR -md5sum $PACKAGE-$RELEASE.tar.gz - -# clean the tree -rm -r $DISTDIR +Replaced by the file RELEASING in the pptp-linux repository. Index: pptp-linux-releasing.txt =================================================================== RCS file: /cvsroot/pptpclient/scripts/pptp-linux-releasing.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pptp-linux-releasing.txt 22 Mar 2002 03:46:29 -0000 1.1 +++ pptp-linux-releasing.txt 13 Sep 2009 05:47:00 -0000 1.2 @@ -1,69 +1 @@ -#!/bin/homosapiens - -# script that the release engineer uses to make a release -# tested on 1.1.0-rc1 through 1.1.0-rc5 during March 2002 - -# check revisions -specs/pptp-linux.spec release ... and commit -pptp-linux/debian/changelog latest entry ... and commit - -# make local repository up to date in case of other changes -cvs update ... - -# tag -# pptp-linux -VERSION=1_1_0 -RELEASE=1 -TAG=pptp-linux-$VERSION-$RELEASE -cd pptp-linux && cvs tag -F $TAG && cd .. && \ -cd specs && cvs tag -F $TAG pptp-linux.spec && cd .. && \ -cd pptp-extras && cvs tag -F $TAG && cd .. - -# mkdist -cd scripts -./mkdist-pptp-linux 1.1.0 $RELEASE - -# send to my build machines -scp pptp-linux-1.1.0-$RELEASE.tar.gz quozl:/tmp/ -scp pptp-linux-1.1.0-$RELEASE.tar.gz jander:/tmp/ - -# deb pptp-linux -# on intel and alpha - -cd /tmp -tar xfz pptp-linux-1.1.0-$RELEASE.tar.gz -cd pptp-linux-1.1.0-$RELEASE -tar xfz pptp-linux-1.1.0.tar.gz -cd pptp-linux-1.1.0 -fakeroot dpkg-buildpackage -us -uc - - -# rpm pptp-linux -# on intel and alpha -cd /tmp -tar xvfz pptp-linux-1.1.0-$RELEASE.tar.gz -cd pptp-linux-1.1.0-$RELEASE/ -cp pptp-linux-1.1.0.tar.gz pptp-command options.pptp pptp_fe.pl xpptp_fe.pl /usr/src/rpm/SOURCES/ -rpm -ba pptp-linux.spec - -# publish -# on intel -RELEASE=1 -su - james -cd public_html/external/mine/pptp/ -cp /tmp/pptp-linux-1.1.0-$RELEASE.tar.gz ./ -cp /tmp/pptp-linux-1.1.0-$RELEASE/pptp-linux_1.1.0-$RELEASE* ./ -cp /usr/src/rpm/SRPMS/pptp-linux-1.1.0-$RELEASE.src.rpm ./ -cp /usr/src/rpm/RPMS/i386/pptp-linux-1.1.0-$RELEASE.i386.rpm ./ - -# on alpha -RELEASE=1 -su - james -cd public_html/external/mine/pptp/ -cp /tmp/pptp-linux-1.1.0-$RELEASE/pptp-linux_1.1.0-${RELEASE}_alpha.changes ./ -cp /tmp/pptp-linux-1.1.0-$RELEASE/pptp-linux_1.1.0-${RELEASE}_alpha.deb ./ -cp /usr/src/rpm/RPMS/alpha/pptp-linux-1.1.0-$RELEASE.alpha.rpm ./ - -md5sum *rc* > md5sums -gpg --detach-sign --armor pptp-linux-1.1.0-$RELEASE.tar.gz -mv pptp-linux-1.1.0-$RELEASE.tar.gz.asc pptp-linux-1.1.0-$RELEASE.tar.gz.signature +Replaced by the file RELEASING in the pptp-linux repository. Index: release-process.txt =================================================================== RCS file: /cvsroot/pptpclient/scripts/release-process.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- release-process.txt 10 Nov 2003 05:55:37 -0000 1.3 +++ release-process.txt 13 Sep 2009 05:47:00 -0000 1.4 @@ -1,246 +1 @@ -# release process for pptp-linux and pptp-extras package (ppp below) - -# make local repository up to date in case of other changes -cd pptp-linux && cvs update -d && cd .. && \ -cd specs && cvs update -d && cd .. && \ -cd pptp-extras && cvs update -d && cd .. - -# set shell variables for version -VERSION=1.4.0 -RELEASE=-rc1 - -TAG_VERSION=`echo ${VERSION}|tr . _` -export VERSION RELEASE TAG_VERSION -echo "VERSION=${VERSION} RELEASE=${RELEASE} TAG_VERSION=${TAG_VERSION}" - -# check and fix versions -egrep "Version|Release" specs/pptp-linux.spec -emacsclient specs/pptp-linux.spec -#head -1 pptp-linux/debian/changelog -#emacsclient pptp-linux/debian/changelog -egrep "VERSION=|RELEASE=" pptp-linux/Makefile -emacsclient pptp-linux/Makefile -egrep "VERSION=|RELEASE=" pptp-extras/Makefile -emacsclient pptp-extras/Makefile - -# If not a release candidate, update ChangeLog and NEWS with a release date -pushd pptp-linux && cvs commit -m "release $VERSION$RELEASE" NEWS ChangeLog && popd && \ - -# commit changes as required -pushd specs && cvs commit -m "release $VERSION$RELEASE" pptp-linux.spec && popd && \ -pushd pptp-linux && cvs commit -m "release $VERSION$RELEASE" Makefile && popd && \ -pushd pptp-extras && cvs commit -m "release $VERSION$RELEASE" Makefile && popd - -# tag -TAG=pptp-linux-${TAG_VERSION}${RELEASE} -echo "TAG=${TAG}" -cd pptp-linux && cvs tag -F ${TAG} && cd .. && \ -cd specs && cvs tag -F ${TAG} pptp-linux.spec && cd .. && \ -cd pptp-extras && cvs tag -F ${TAG} && cd .. - -# mkdist -cd pptp-linux && make dist && cd .. && \ -mv pptp-linux/pptp-linux-${VERSION}${RELEASE}.tar.gz ./ - -cd pptp-extras && make dist && cd .. && \ -mv pptp-extras/pptp-extras-${VERSION}${RELEASE}.tar.gz ./ - -# send to my build machines -#scp \ -#pptp-linux-${VERSION}${RELEASE}.tar.gz \ -#pptp-extras-${VERSION}${RELEASE}.tar.gz \ -#specs/pptp-linux.spec \ -#quozl:/tmp/ -# -#scp \ -#pptp-linux-${VERSION}${RELEASE}.tar.gz \ -#pptp-extras-${VERSION}${RELEASE}.tar.gz \ -#jander:/tmp/ - -# deb pptp-linux -# on intel and alpha -#cd pptp-linux -# apt-get install debhelper fakeroot -#fakeroot dpkg-buildpackage -#fakeroot dpkg-buildpackage -us -uc -#cd .. - -# rpm pptp-linux -# on intel and alpha -# (set variables) -su -cd /home/james/pptp-client -cp pptp-linux-${VERSION}${RELEASE}.tar.gz /usr/src/rpm/SOURCES/pptp-linux-${VERSION}.tar.gz -cd /tmp -tar xfz /home/james/pptp-client/pptp-extras-${VERSION}${RELEASE}.tar.gz -cd pptp-extras-${VERSION}/ -cp pptp-command options.pptp pptp_fe.pl xpptp_fe.pl /usr/src/rpm/SOURCES/ -cd .. -rm -rf pptp-extras-${VERSION}/ -cd /home/james/pptp-client/specs -rpm -ba pptp-linux.spec -# rpmbuild -ba pptp-linux.spec - -# cross build onto alpha from intel -#cd /usr/src/rpm/SRPMS -#scp *.src.rpm alpha:/tmp/ -#cd /tmp -#rpm --rebuild pptp-linux-${VERSION}${RELEASE}.src.rpm -#cd /usr/src/rpm/RPMS/alpha - -# publish -# on intel -#su - james -# (or ^d) -# (set variables) -cd ~/public_html/external/mine/pptp/ -cp /home/james/pptp-client/pptp-linux-${VERSION}${RELEASE}.tar.gz ./ -# only if final release -cp /home/james/pptp-client/pptp-extras-${VERSION}${RELEASE}.tar.gz ./ -#cp /tmp/pptp-linux-${VERSION}${RELEASE}/pptp-linux_${VERSION}${RELEASE}* ./ -cp /usr/src/rpm/SRPMS/pptp-linux-${VERSION}${RELEASE}.src.rpm ./ -cp /usr/src/rpm/RPMS/i386/pptp-linux-${VERSION}${RELEASE}.i386.rpm ./ -# debian packages -#cp ~/pptp-client/pptp-linux_${VERSION}${RELEASE}_i386.deb ./ -#cp ~/pptp-client/pptp-linux_${VERSION}${RELEASE}_i386.changes ./ -#cp ~/pptp-client/pptp-linux_${VERSION}${RELEASE}.dsc ./ -# on alpha -#su - james -#cd public_html/external/mine/pptp/ -#cp /tmp/pptp-linux-${VERSION}${RELEASE}/pptp-linux_${VERSION}${RELEASE}_alpha.changes ./ -#cp /tmp/pptp-linux-${VERSION}${RELEASE}/pptp-linux_${VERSION}${RELEASE}_alpha.deb ./ -#cp /usr/src/rpm/RPMS/alpha/pptp-linux-${VERSION}${RELEASE}.alpha.rpm ./ - - -md5sum *rc* > md5sums -gpg --detach-sign --armor pptp-linux-${VERSION}${RELEASE}.tar.gz -mv pptp-linux-${VERSION}${RELEASE}.tar.gz.asc pptp-linux-${VERSION}${RELEASE}.tar.gz.signature - -# edit public_html/external/mine/pptp/index.phtml -emacsclient ~/public_html/external/mine/pptp/index.phtml -emacsclient ~/public_html/external/mine/pptp/results.phtml -# add candidate line -# test http://www.lan/~james/external/mine/pptp/ - -# upload -upw -# test http://quozl.netrek.org/pptp/ -# test http://quozl.linux.org.au/pptp/ - -# compose release candidate announcement -# To: ppt...@li... (candidates) -# To: ppt...@li... (final) -# From: James Cameron <jam...@hp...> -# Subject: pptp-linux-${VERSION}${RELEASE} released -# ... -# include NEWS -# point at release candidate pages -# http://quozl.netrek.org/pptp/ -# http://quozl.linux.org.au/pptp/ - -G'day, - -PPTP Client 1.4.0 release candidate 1 is available. - -Changes are: -- defer OCRQ until after SCCRP [Cameron] -- include uninstall target [Pieter] -- only issue a warning if sync mode is different to pppd [Klazes] -- reformat and tidy code [Klazes] -- reduce transmitted ack-only packets from 40% to 0.8% [Klazes] - -Can be downloaded from: - http://quozl.netrek.org/pptp/ - http://quozl.linux.org.au/pptp/ - -c70ea35c35b12131e1cc846ec9143e11 pptp-linux-1.4.0-rc1.i386.rpm -d2800b3bc14208355d4c9dbccacdc521 pptp-linux-1.4.0-rc1.src.rpm -d2242d2370838df3d46b81d2ca24ebd6 pptp-linux-1.4.0-rc1.tar.gz - -# to add to process -# add sourceforge publishing step -# NEW USER REQUEST ... ensure .src.rpm is published to sourceforge - -# sf.net/projects/pptpd -# login -# admin -# file releases -# add release (ppp-mppe) -# add release (pptpclient) -# new release name: ${version} - - -# todo, version matrix, linux distribution down left side, pptp & ppp top, -# then a link to instructions - - - - - -# april 2003, ppp packaging - -# pull latest -cd ~/ppp -cvs update -d - -# test build locally -make clean -make -make clean - -# prepare for packaging -VERSION=2.4.2_cvs_`date +"%Y%m%d"` -RELEASE=1 -echo $VERSION - -cd ~/pptp-client - -# adjust ppp.spec version according to above -emacsclient specs/ppp.spec - -# build tarball -scripts/mkdist-ppp ${VERSION} - -# send to build machine -BUILD=lenny -scp ppp-${VERSION}.tar.gz root@${BUILD}:/tmp - -# on build machine, prepare for rpm -cd /tmp -tar xvfz ppp-${VERSION}.tar.gz ppp-${VERSION}/ppp.spec -cd ppp-${VERSION}/ -# debian -cp ../ppp-${VERSION}.tar.gz /usr/src/rpm/SOURCES/ -# or, rh 8.0 -cp ../ppp-${VERSION}.tar.gz /usr/src/redhat/SOURCES/ -chown root:root ppp.spec - -# debian sarge -rpm -ba ppp.spec -# or, rh 8.0 -rpmbuild -ba ppp.spec -# or, debian 3.0, remove builddep -rpmbuild -ba ppp.spec - -# distribute rpm and src.rpm files - -scp \ -/usr/src/rpm/SRPMS/ppp-${VERSION}-${RELEASE}.src.rpm \ -/usr/src/rpm/RPMS/i386/ppp-${VERSION}-${RELEASE}.i386.rpm \ -root@quozl:/hdc/tmp/ - - -# cross build onto alpha from intel -scp *.src.rpm alpha:/tmp/ -cd /tmp -rpm --rebuild ppp-${VERSION}-${RELEASE}.src.rpm -cd /usr/src/rpm/RPMS/alpha - -# publish -scp \ -/home/james/pptp-client/ppp-${VERSION}.tar.gz \ -/usr/src/rpm/SRPMS/ppp-${VERSION}-${RELEASE}.src.rpm \ -/usr/src/rpm/RPMS/i386/ppp-${VERSION}-${RELEASE}.i386.rpm \ -james@spice:public_html/external/mine/pptp/ - - +Replaced by the file RELEASING in the pptp-linux repository. |
From: Paul H. <pg...@us...> - 2009-08-04 11:30:58
|
Update of /cvsroot/pptpclient/specs In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21925 Modified Files: pptp-1.7.2-compat.patch pptp-1.7.2-ip-path.patch pptp.spec Added Files: pptp-1.7.2-makedeps.patch pptp-1.7.2-pptpsetup-encrypt.patch pptp-1.7.2-pptpsetup-mppe-pppd.patch pptp-1.7.2-pptpsetup.patch Removed Files: pptp-1.7.2-declaration.patch Log Message: Update packaging of pptp to reflect post-release fixes --- NEW FILE: pptp-1.7.2-makedeps.patch --- Index: Makefile =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v retrieving revision 1.47 retrieving revision 1.49 diff -u -r1.47 -r1.49 --- Makefile 14 May 2008 06:32:52 -0000 1.47 +++ Makefile 24 Jul 2008 05:37:47 -0000 1.49 @@ -96,3 +102,71 @@ release: cp pptp_$(VERSION)-0_i386.deb $(WEB) cd $(WEB);make + +# The following include file dependencies were generated using +# "makedepend -w0 *.c", then manually removing out of tree entries. +# DO NOT DELETE + +dirutil.o: dirutil.h +orckit_quirks.o: pptp_msg.h +orckit_quirks.o: pptp_compat.h +orckit_quirks.o: pptp_options.h +orckit_quirks.o: pptp_ctrl.h +orckit_quirks.o: util.h +ppp_fcs.o: ppp_fcs.h +ppp_fcs.o: pptp_compat.h +pptp.o: config.h +pptp.o: pptp_callmgr.h +pptp.o: pptp_gre.h +pptp.o: pptp_compat.h +pptp.o: version.h +pptp.o: inststr.h +pptp.o: util.h +pptp.o: pptp_quirks.h +pptp.o: pptp_msg.h +pptp.o: pptp_ctrl.h +pptp.o: pqueue.h +pptp.o: pptp_options.h +pptp_callmgr.o: pptp_callmgr.h +pptp_callmgr.o: pptp_ctrl.h +pptp_callmgr.o: pptp_compat.h +pptp_callmgr.o: pptp_msg.h +pptp_callmgr.o: dirutil.h +pptp_callmgr.o: vector.h +pptp_callmgr.o: util.h +pptp_callmgr.o: routing.h +pptp_compat.o: pptp_compat.h +pptp_compat.o: util.h +pptp_ctrl.o: pptp_msg.h +pptp_ctrl.o: pptp_compat.h +pptp_ctrl.o: pptp_ctrl.h +pptp_ctrl.o: pptp_options.h +pptp_ctrl.o: vector.h +pptp_ctrl.o: util.h +pptp_ctrl.o: pptp_quirks.h +pptp_gre.o: ppp_fcs.h +pptp_gre.o: pptp_compat.h +pptp_gre.o: pptp_msg.h +pptp_gre.o: pptp_gre.h +pptp_gre.o: util.h +pptp_gre.o: pqueue.h +pptp_gre.o: test.h +pptp_quirks.o: orckit_quirks.h +pptp_quirks.o: pptp_options.h +pptp_quirks.o: pptp_ctrl.h +pptp_quirks.o: pptp_compat.h +pptp_quirks.o: pptp_msg.h +pptp_quirks.o: pptp_quirks.h +pqueue.o: util.h +pqueue.o: pqueue.h +routing.o: routing.h +test.o: util.h +test.o: test.h +util.o: util.h +vector.o: pptp_ctrl.h +vector.o: pptp_compat.h +vector.o: vector.h +vector_test.o: vector.h +vector_test.o: pptp_ctrl.h +vector_test.o: pptp_compat.h +version.o: config.h --- NEW FILE: pptp-1.7.2-pptpsetup-encrypt.patch --- --- pptpsetup 2009-06-01 14:30:36.000000000 +0100 +++ pptpsetup 2009-06-01 14:36:39.000000000 +0100 @@ -43,12 +43,13 @@ sub create { my $TUNNEL = shift; - # system checking - &Check_MPPE_in_kernel - or die "$0: couldn't find MPPE support in kernel.\n"; - - &Check_MPPE_in_pppd - or die "$0: couldn't find MPPE support in pppd.\n"; + # if encryption is requested, check for support in kernel and pppd + if ( $ENCRYPT ) { + &Check_MPPE_in_kernel + or die "$0: couldn't find MPPE support in kernel.\n"; + &Check_MPPE_in_pppd + or die "$0: couldn't find MPPE support in pppd.\n"; + } # input validation ($TUNNEL) = $TUNNEL =~ m{^(\w+)$} --- NEW FILE: pptp-1.7.2-pptpsetup-mppe-pppd.patch --- --- pptp-1.7.2/pptpsetup 2009-06-01 16:17:54.000000000 +0100 +++ pptp-1.7.2/pptpsetup 2009-06-01 16:20:14.000000000 +0100 @@ -47,8 +47,6 @@ if ( $ENCRYPT ) { &Check_MPPE_in_kernel or die "$0: couldn't find MPPE support in kernel.\n"; - &Check_MPPE_in_pppd - or die "$0: couldn't find MPPE support in pppd.\n"; } # input validation @@ -192,17 +190,6 @@ } } -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 --- NEW FILE: pptp-1.7.2-pptpsetup.patch --- Index: pptpsetup =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptpsetup,v retrieving revision 1.4 diff -u -r1.4 pptpsetup --- pptpsetup 2 Aug 2006 07:02:47 -0000 1.4 +++ pptpsetup 25 Mar 2009 13:41:37 -0000 @@ -154,6 +154,7 @@ # delete entry from chap-secrets my $chap_file = '/etc/ppp/chap-secrets'; + my $mode = (stat($chap_file))[2] & 07777; open( FILE, $chap_file ) or die "$0: can't read '$chap_file': $!\n"; @@ -171,6 +172,7 @@ # write new chap-secrets open( FILE, ">$chap_file" ) or die "$0: can't write '$chap_file': $!\n"; + chmod $mode, $chap_file; print FILE $new_chap; close FILE; Index: pptp-1.7.2-compat.patch =================================================================== RCS file: /cvsroot/pptpclient/specs/pptp-1.7.2-compat.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pptp-1.7.2-compat.patch 14 May 2008 22:05:56 -0000 1.1 +++ pptp-1.7.2-compat.patch 4 Aug 2009 11:30:45 -0000 1.2 @@ -1,10 +1,71 @@ ---- pptp-1.7.2/pptp_compat.c 2008-05-14 07:33:55.000000000 +0100 -+++ pptp-1.7.2/pptp_compat.c 2008-05-14 12:34:46.000000000 +0100 -@@ -7,7 +7,6 @@ +Index: pptp_compat.c +=================================================================== +RCS file: /cvsroot/pptpclient/pptp-linux/pptp_compat.c,v +retrieving revision 1.1 +retrieving revision 1.3 +diff -u -r1.1 -r1.3 +--- pptp_compat.c 19 Feb 2008 21:43:28 -0000 1.1 ++++ pptp_compat.c 25 Jul 2008 00:13:56 -0000 1.3 +@@ -7,14 +7,15 @@ #include <fcntl.h> #include <sys/types.h> #include <unistd.h> -#include <stropts.h> #include <stdlib.h> ++#if defined (__SVR4) && defined (__sun) /* Solaris */ ++#include <stropts.h> ++#endif #include <strings.h> #include "pptp_compat.h" + #include <stdio.h> + #include "util.h" + +- + #if defined (__SVR4) && defined (__sun) /* Solaris */ + /* + * daemon implementation from uClibc +Index: pptp.c +=================================================================== +RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v +retrieving revision 1.49 +retrieving revision 1.51 +diff -u -r1.49 -r1.51 +--- pptp.c 14 May 2008 06:32:52 -0000 1.49 ++++ pptp.c 24 Jul 2008 05:53:05 -0000 1.51 +@@ -61,9 +61,8 @@ + #include "version.h" + #if defined(__linux__) + #include <sys/prctl.h> +-#else +-#include "inststr.h" + #endif ++#include "inststr.h" + #include "util.h" + #include "pptp_quirks.h" + #include "pqueue.h" +@@ -129,7 +128,7 @@ + } + + #if defined (__SVR4) && defined (__sun) +-struct in_addr localbind = { INADDR_ANY }; ++struct in_addr localbind = { .s_addr = INADDR_ANY }; + #else + struct in_addr localbind = { INADDR_NONE }; + #endif +@@ -183,6 +182,7 @@ + struct in_addr inetaddr; + volatile int callmgr_sock = -1; + char ttydev[PATH_MAX]; ++ char *tty_name; + int pty_fd, tty_fd, gre_fd, rc; + volatile pid_t parent_pid, child_pid; + u_int16_t call_id, peer_call_id; +@@ -391,7 +391,7 @@ + file2fd("/dev/null", "wb", STDERR_FILENO); + } + +- char *tty_name = ttyname(tty_fd); ++ tty_name = ttyname(tty_fd); + snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s", + tty_name ? tty_name : "(null)"); + #ifdef PR_SET_NAME Index: pptp-1.7.2-ip-path.patch =================================================================== RCS file: /cvsroot/pptpclient/specs/pptp-1.7.2-ip-path.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pptp-1.7.2-ip-path.patch 19 May 2008 15:57:19 -0000 1.1 +++ pptp-1.7.2-ip-path.patch 4 Aug 2009 11:30:45 -0000 1.2 @@ -1,29 +1,186 @@ ---- pptp-1.7.2/routing.c 2008-05-19 11:05:18.000000000 +0100 -+++ pptp-1.7.2/routing.c 2008-05-19 11:06:56.000000000 +0100 -@@ -56,7 +56,7 @@ +Index: routing.c +=================================================================== +RCS file: /cvsroot/pptpclient/pptp-linux/routing.c,v +retrieving revision 1.1 +diff -u -r1.1 routing.c +--- routing.c 2 Aug 2006 07:07:37 -0000 1.1 ++++ routing.c 25 Mar 2009 13:58:28 -0000 +@@ -23,9 +23,26 @@ + #include <stdio.h> + #include <string.h> + #include "routing.h" ++#include "config.h" + ++#if defined (__SVR4) && defined (__sun) /* Solaris */ ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <net/if.h> ++#include <arpa/inet.h> ++#include <errno.h> ++#include "util.h" ++/* PF_ROUTE socket*/ ++int rts; ++/* Destination and gateway addresses */ ++struct sockaddr_in rdst, rgw; ++/* Request sequence */ ++int rseq; ++int dorouting; ++#else /* Solaris */ + /* route to the server */ + char *route; ++#endif /* Solaris */ + + /* + +@@ -54,26 +71,113 @@ + */ + void routing_init(char *ip) { ++#if defined (__SVR4) && defined (__sun) /* Solaris */ ++ rdst.sin_family = AF_INET; ++ if ( ! inet_pton(AF_INET, ip, &rdst.sin_addr) ) { ++ log("Cannot convert address: %s", strerror(errno)); ++ return; ++ } ++ ++ if ( (rts = socket(PF_ROUTE, SOCK_RAW, AF_INET )) < 0 ) { ++ log("Cannot open routing socket: %s", strerror(errno)); ++ return; ++ } ++ ++ struct rt_msg rtm = { ++ .hdr.rtm_msglen = sizeof(struct rt_msg), ++ .hdr.rtm_version = RTM_VERSION, ++ .hdr.rtm_type = RTM_GET, ++ .hdr.rtm_addrs = RTA_DST, ++ .hdr.rtm_pid = getpid(), ++ .hdr.rtm_seq = ++rseq, ++ .addrs[RTAX_DST] = rdst ++ }; ++ ++ if ( write(rts, &rtm, rtm.hdr.rtm_msglen) != rtm.hdr.rtm_msglen ) { ++ log("Error writing to routing socket: %s", strerror(errno)); ++ close(rts); ++ return; ++ } ++ ++ while ( read(rts, &rtm, sizeof(struct rt_msg)) > 0 ) ++ if ( rtm.hdr.rtm_pid == getpid() && rtm.hdr.rtm_seq == rseq) { ++ /* Check if host route already present */ ++ if ( ( rtm.hdr.rtm_flags & RTF_HOST ) != RTF_HOST ) { ++ rgw = rtm.addrs[RTAX_GATEWAY]; ++ dorouting = 1; ++ } ++ break; ++ } ++#else /* Solaris */ char buf[256]; - FILE *p; - snprintf(buf, 255, "/bin/ip route get %s", ip); -+ snprintf(buf, 255, "/sbin/ip route get %s", ip); - p = popen(buf, "r"); +- FILE *p = popen(buf, "r"); ++ FILE *p; ++ ++ snprintf(buf, 255, "%s route get %s", IP_BINARY, ip); ++ p = popen(buf, "r"); fgets(buf, 255, p); /* TODO: check for failure of fgets */ -@@ -68,7 +68,7 @@ + route = strdup(buf); + pclose(p); + /* TODO: check for failure of command */ ++#endif /* Solaris */ + } + void routing_start() { ++#if defined (__SVR4) && defined (__sun) /* Solaris */ ++ if ( ! dorouting ) ++ return; ++ ++ struct rt_msg rtm = { ++ .hdr.rtm_msglen = sizeof(struct rt_msg), ++ .hdr.rtm_version = RTM_VERSION, ++ .hdr.rtm_type = RTM_ADD, ++ .hdr.rtm_flags = RTF_HOST | RTF_GATEWAY | RTF_STATIC, ++ .hdr.rtm_addrs = RTA_DST | RTA_GATEWAY, ++ .hdr.rtm_pid = getpid(), ++ .hdr.rtm_seq = ++rseq, ++ .addrs[RTAX_DST] = rdst, ++ .addrs[RTAX_GATEWAY] = rgw ++ }; ++ ++ if ( write(rts, &rtm, rtm.hdr.rtm_msglen) != rtm.hdr.rtm_msglen ) { ++ log("Error adding route: %s", strerror(errno)); ++ } ++#else /* Solaris */ char buf[256]; - FILE *p; - snprintf(buf, 255, "/bin/ip route replace %s", route); -+ snprintf(buf, 255, "/sbin/ip route replace %s", route); - p = popen(buf, "r"); +- FILE *p = popen(buf, "r"); ++ FILE *p; ++ ++ snprintf(buf, 255, "%s route replace %s", IP_BINARY, route); ++ p = popen(buf, "r"); pclose(p); ++#endif /* Solaris */ } -@@ -76,7 +76,7 @@ + void routing_end() { ++#if defined (__SVR4) && defined (__sun) /* Solaris */ ++ if ( ! dorouting) ++ return; ++ ++ struct rt_msg rtm = { ++ .hdr.rtm_msglen = sizeof(struct rt_msg), ++ .hdr.rtm_version = RTM_VERSION, ++ .hdr.rtm_type = RTM_DELETE, ++ .hdr.rtm_flags = RTF_HOST | RTF_GATEWAY | RTF_STATIC, ++ .hdr.rtm_addrs = RTA_DST | RTA_GATEWAY, ++ .hdr.rtm_pid = getpid(), ++ .hdr.rtm_seq = ++rseq, ++ .addrs[RTAX_DST] = rdst, ++ .addrs[RTAX_GATEWAY] = rgw ++ }; ++ ++ if ( write(rts, &rtm, rtm.hdr.rtm_msglen) != rtm.hdr.rtm_msglen ) { ++ log("Error deleting route: %s", strerror(errno)); ++ } ++#else /* Solaris */ char buf[256]; - FILE *p; - snprintf(buf, 255, "/bin/ip route delete %s", route); -+ snprintf(buf, 255, "/sbin/ip route delete %s", route); - p = popen(buf, "r"); +- FILE *p = popen(buf, "r"); ++ FILE *p; ++ ++ snprintf(buf, 255, "%s route delete %s", IP_BINARY, route); ++ p = popen(buf, "r"); pclose(p); ++#endif /* Solaris */ } +Index: Makefile +=================================================================== +RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v +retrieving revision 1.47 +retrieving revision 1.49 +diff -u -r1.47 -r1.49 +--- Makefile 14 May 2008 06:32:52 -0000 1.47 ++++ Makefile 24 Jul 2008 05:37:47 -0000 1.49 +@@ -1,10 +1,13 @@ +-# $Id$ ++# $Id$ + VERSION=1.7.2 + RELEASE= + + ################################################################# +-# CHANGE THIS LINE to point to the location of your pppd binary. ++# CHANGE THIS LINE to point to the location of binaries + PPPD = /usr/sbin/pppd ++# Solaris ++# PPPD = /usr/bin/pppd ++IP = /bin/ip + ################################################################# + + BINDIR=$(DESTDIR)/usr/sbin +@@ -47,6 +52,7 @@ + echo "/* text added by Makefile target config.h */" > config.h + echo "#define PPTP_LINUX_VERSION \"$(VERSION)$(RELEASE)\"" >> config.h + echo "#define PPPD_BINARY \"$(PPPD)\"" >> config.h ++ echo "#define IP_BINARY \"$(IP)\"" >> config.h + + vector_test: vector_test.o vector.o + $(CC) -o vector_test vector_test.o vector.o Index: pptp.spec =================================================================== RCS file: /cvsroot/pptpclient/specs/pptp.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- pptp.spec 19 May 2008 15:57:19 -0000 1.13 +++ pptp.spec 4 Aug 2009 11:30:45 -0000 1.14 @@ -1,51 +1,71 @@ # Change the 0 on the following line to 1 for beta release versions %if 0 -%define beta rc1 +%global beta rc1 %endif # Use "rpmbuild --define 'suse_version 1'" to build for SuSE system -%define rpmrel 3 -%{!?__id_u: %define __id_u /bin/id -u} +%global rpmrel 4 +%{!?__id_u: %global __id_u /bin/id -u} -Summary: Point-to-Point Tunneling Protocol (PPTP) Client Name: pptp Version: 1.7.2 -Distribution: PPTP Client Project Release: %{?beta:0.%{beta}.}%{rpmrel}%{?suse_version:suse}%{?dist} -URL: http://pptpclient.sourceforge.net/ -Source: http://downloads.sf.net/pptpclient/pptp-%{version}.tar.gz -Patch0: pptp-1.7.2-compat.patch -Patch1: pptp-1.7.2-declaration.patch -Patch2: pptp-1.7.2-ip-path.patch -License: GPLv2+ +Summary: Point-to-Point Tunneling Protocol (PPTP) Client %if %{?suse_version:0}%{!?suse_version:1} Group: Applications/Internet %else Group: Productivity/Networking/Security %endif +Distribution: PPTP Client Project +License: GPLv2+ +URL: http://pptpclient.sourceforge.net/ +Source0: http://downloads.sf.net/pptpclient/pptp-%{version}.tar.gz +Patch0: pptp-1.7.2-compat.patch +Patch1: pptp-1.7.2-ip-path.patch +Patch2: pptp-1.7.2-pptpsetup.patch +Patch3: pptp-1.7.2-makedeps.patch +Patch4: pptp-1.7.2-pptpsetup-encrypt.patch +Patch5: pptp-1.7.2-pptpsetup-mppe-pppd.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Obsoletes: pptp-scripts <= 1.6.0 pptp-linux <= 1.6.0 Provides: pptp-linux = %{version}-%{release}, pptp-scripts = %{version}-%{release} Requires: ppp >= 2.4.2, /sbin/ip -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Client for the proprietary Microsoft Point-to-Point Tunneling -Protocol, PPTP. Allows connection to a PPTP based VPN as used +Protocol, PPTP. Allows connection to a PPTP based VPN as used by employers and some cable and ADSL service providers. Requires MPPE support in kernel.%{?suse_version: Use the ppp-mppe package.} %prep %setup -q -%patch0 -p1 -b .compat -%patch1 -p1 -b .declaration -%patch2 -p1 -b .ip-path -/usr/bin/find . -depth -type d -name CVS -exec %{__rm} -rf {} \; + +# Remove reference to stropts.h, not shipped in F9 onwards (applied upstream) +%patch0 -p0 -b .compat + +# Make location of "ip" binary build-time configurable (applied upstream) +%patch1 -p0 -b .ip-path + +# Retain permissions on /etc/ppp/chap-secrets (#492090, applied upstream) +%patch2 -p0 -b .bz492090 + +# Fix Makefile dependencies to support parallel make (applied upstream) +%patch3 -p0 -b .makedeps + +# Don't check for MPPE capability in kernel or pppd unless we're creating a +# tunnel that requires encryption (applied upstream) +%patch4 -p0 -b .encrypt + +# Don't check for MPPE capability in pppd at all because we require +# pppd >= 2.4.2, which includes MPPE support (#502967) +%patch5 -p1 -b .mppe-pppd + +# Pacify rpmlint %{__perl} -pi -e 's/install -o root -m 555 pptp/install -m 755 pptp/;' Makefile %build -# Parallel make disabled because .o files don't have dependency on config.h -%{__make} CFLAGS="-Wall %{optflags}" +%{__make} %{?_smp_mflags} CFLAGS="-Wall %{optflags}" IP=/sbin/ip %install %{__rm} -rf %{buildroot} @@ -57,16 +77,32 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING DEVELOPERS INSTALL NEWS README TODO USING +%doc AUTHORS COPYING DEVELOPERS NEWS README TODO USING %doc ChangeLog Documentation/DESIGN.PPTP PROTOCOL-SECURITY %{_sbindir}/pptp %{_sbindir}/pptpsetup %{_mandir}/man8/pptp.8* -%{_mandir}/man8/pptpsetup.8.* +%{_mandir}/man8/pptpsetup.8* %dir %attr(750,root,root) %{_localstatedir}/run/pptp/ +# /etc/ppp is hardcoded instead of using %{_sysconfdir}/ppp because the +# Fedora ppp package hardcodes the directory name %config(noreplace) /etc/ppp/options.pptp %changelog +* Mon Aug 3 2009 Paul Howarth <pa...@ci...> 1.7.2-4 +- Don't check for MPPE capability in kernel and pppd unless we're creating a + tunnel that requires encryption +- Don't check for MPPE capability in pppd at all because we require + pppd >= 2.4.2, which includes MPPE support (RHBZ#502967) +- Retain permissions on /etc/ppp/chap-secrets when using pptpsetup (RHBZ#492090) +- Use upstream versions of patches +- Re-enable parallel build; Makefile dependencies now fixed +- Use perl rather than sed to edit Makefile, for spec compatibility with + ancient distro releases +- Don't package INSTALL file, not of value to end users +- Don't remove CVS directories - should be none present in the first place +- Define RPM macros in global scope + * Mon May 19 2008 Paul Howarth <pa...@ci...> 1.7.2-3 - Add dependency on /sbin/ip - Disable parallel make - object files are missing dependency on config.h --- pptp-1.7.2-declaration.patch DELETED --- |
From: James C. <qu...@us...> - 2009-06-25 02:54:20
|
Update of /cvsroot/pptpclient/pptp-linux In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18170 Modified Files: AUTHORS ChangeLog Log Message: leaving hp Index: AUTHORS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/AUTHORS,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- AUTHORS 19 Feb 2008 05:05:03 -0000 1.17 +++ AUTHORS 25 Jun 2009 01:40:35 -0000 1.18 @@ -7,7 +7,7 @@ Christoph Lameter <chr...@la...> Gordon Chaffee <chaffee@HOME.COM> mulix <mu...@ac...> -James Cameron <jam...@hp...> +James Cameron <qu...@la...> Rein Klazes <rk...@xs...> Thomas Quinot <th...@cu...> Rhialto <rh...@az...> Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.121 retrieving revision 1.122 diff -u -d -r1.121 -r1.122 --- ChangeLog 1 Jun 2009 13:48:37 -0000 1.121 +++ ChangeLog 25 Jun 2009 01:40:35 -0000 1.122 @@ -1,3 +1,8 @@ +Thu Jun 25 11:39:24 2009 James Cameron <qu...@us...> + + * AUTHORS: maintainer mail address change, jam...@hp... is + no longer valid. + Mon Jun 1 14:43:00 2009 Paul Howarth <pa...@ci...> * pptpsetup: only check for MPPE support in kernel and pppd if |
From: Paul H. <pg...@us...> - 2009-06-01 14:16:52
|
Update of /cvsroot/pptpclient/pptp-linux In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4962 Modified Files: ChangeLog NEWS pptpsetup Log Message: Don't check for MPPE support in kernel and pppd unless we're setting up a tunnel that uses encryption Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.120 retrieving revision 1.121 diff -u -d -r1.120 -r1.121 --- ChangeLog 25 Mar 2009 13:42:44 -0000 1.120 +++ ChangeLog 1 Jun 2009 13:48:37 -0000 1.121 @@ -1,3 +1,8 @@ +Mon Jun 1 14:43:00 2009 Paul Howarth <pa...@ci...> + + * pptpsetup: only check for MPPE support in kernel and pppd if + an encrypted tunnel is being created. + Wed Mar 25 13:38:00 2009 Paul Howarth <pa...@ci...> * pptpsetup: retain permissions on chap-secrets file when Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- NEWS 26 Mar 2009 01:16:26 -0000 1.63 +++ NEWS 1 Jun 2009 13:48:37 -0000 1.64 @@ -1,3 +1,4 @@ +- avoid superfluous MPPE capability checks in pptpsetup [Howarth] - retain permissions on chap-secrets, closes RH BZ #492090 [Howarth] - compilation fixes for older distributions of Linux [Howarth] - port routing change feature for Solaris [Voronin] Index: pptpsetup =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptpsetup,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- pptpsetup 25 Mar 2009 13:42:45 -0000 1.5 +++ pptpsetup 1 Jun 2009 13:48:37 -0000 1.6 @@ -43,12 +43,13 @@ sub create { my $TUNNEL = shift; - # system checking - &Check_MPPE_in_kernel - or die "$0: couldn't find MPPE support in kernel.\n"; - - &Check_MPPE_in_pppd - or die "$0: couldn't find MPPE support in pppd.\n"; + # if encryption is requested, check for support in kernel and pppd + if ( $ENCRYPT ) { + &Check_MPPE_in_kernel + or die "$0: couldn't find MPPE support in kernel.\n"; + &Check_MPPE_in_pppd + or die "$0: couldn't find MPPE support in pppd.\n"; + } # input validation ($TUNNEL) = $TUNNEL =~ m{^(\w+)$} |
From: James C. <qu...@us...> - 2009-03-26 01:17:16
|
Update of /cvsroot/pptpclient/pptp-linux In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15447 Modified Files: NEWS Log Message: update news, retain permissions on chap-secrets file when deleting tunnels using pptpsetup (http://bugzilla.redhat.com/492090) Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- NEWS 24 Jul 2008 05:53:05 -0000 1.62 +++ NEWS 26 Mar 2009 01:16:26 -0000 1.63 @@ -1,3 +1,4 @@ +- retain permissions on chap-secrets, closes RH BZ #492090 [Howarth] - compilation fixes for older distributions of Linux [Howarth] - port routing change feature for Solaris [Voronin] - add IP_BINARY [Cameron] |
From: Paul H. <pg...@us...> - 2009-03-25 13:43:09
|
Update of /cvsroot/pptpclient/pptp-linux In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5244 Modified Files: ChangeLog pptpsetup Log Message: retain permissions on chap-secrets file when deleting tunnels using pptpsetup (http://bugzilla.redhat.com/492090) Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.119 retrieving revision 1.120 diff -u -d -r1.119 -r1.120 --- ChangeLog 24 Jul 2008 05:53:05 -0000 1.119 +++ ChangeLog 25 Mar 2009 13:42:44 -0000 1.120 @@ -1,3 +1,8 @@ +Wed Mar 25 13:38:00 2009 Paul Howarth <pa...@ci...> + + * pptpsetup: retain permissions on chap-secrets file when + deleting tunnels (http://bugzilla.redhat.com/492090). + Thu Jul 24 15:51:30 2008 Paul Howarth <pa...@ci...> * routing.c, pptp_compat.c: compilation fixes for old Index: pptpsetup =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptpsetup,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- pptpsetup 2 Aug 2006 07:02:47 -0000 1.4 +++ pptpsetup 25 Mar 2009 13:42:45 -0000 1.5 @@ -154,6 +154,7 @@ # delete entry from chap-secrets my $chap_file = '/etc/ppp/chap-secrets'; + my $mode = (stat($chap_file))[2] & 07777; open( FILE, $chap_file ) or die "$0: can't read '$chap_file': $!\n"; @@ -171,6 +172,7 @@ # write new chap-secrets open( FILE, ">$chap_file" ) or die "$0: can't write '$chap_file': $!\n"; + chmod $mode, $chap_file; print FILE $new_chap; close FILE; |
From: Paul H. <pg...@us...> - 2008-08-08 23:16:34
|
Update of /cvsroot/pptpclient/specs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9822 Modified Files: php4-pcntl-gtk.spec php4-pcntl.spec Log Message: Update php to 4.4.9, rebuild php-gtk against it Index: php4-pcntl-gtk.spec =================================================================== RCS file: /cvsroot/pptpclient/specs/php4-pcntl-gtk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- php4-pcntl-gtk.spec 8 Jan 2008 10:31:04 -0000 1.2 +++ php4-pcntl-gtk.spec 8 Aug 2008 23:16:35 -0000 1.3 @@ -4,7 +4,7 @@ Summary: GTK+ bindings for applications built using php%{private_suffix} Name: php%{private_suffix}-gtk Version: 1.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Source: php-gtk-%{version}.tar.gz License: LGPLv2+ Group: Development/Languages @@ -29,6 +29,7 @@ %build export CFLAGS="%{optflags}" +export php_cv_cc_rpath=no PATH=$PATH:%{private_php_dir}/bin ./buildconf PATH=$PATH:%{private_php_dir}/bin ./configure \ --libdir=%{private_php_dir}/lib \ @@ -49,6 +50,10 @@ %doc AUTHORS ChangeLog COPYING.LIB NEWS README TODO %changelog +* Fri Aug 8 2008 Paul Howarth <pa...@ci...> 1.0.2-4 +- Rebuild against PHP 4.4.9 +- Disable rpaths to avoid bogus ones on 64-bit architectures + * Fri Jan 4 2008 Paul Howarth <pa...@ci...> 1.0.2-3 - Rebuild against PHP 4.4.8 - Clarify license as GNU Lesser Public License, version 2.1 or later Index: php4-pcntl.spec =================================================================== RCS file: /cvsroot/pptpclient/specs/php4-pcntl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- php4-pcntl.spec 8 Jan 2008 10:28:42 -0000 1.2 +++ php4-pcntl.spec 8 Aug 2008 23:16:35 -0000 1.3 @@ -6,7 +6,7 @@ Summary: The PHP HTML-embedded scripting language, version 4, with process controls Name: php%{private_suffix} -Version: 4.4.8 +Version: 4.4.9 Release: 1%{?dist} Source0: http://www.php.net/distributions/php-%{version}.tar.gz License: PHP @@ -151,6 +151,9 @@ %doc %{private_php_dir}/man/man1/php*.1* %changelog +* Fri Aug 8 2008 Paul Howarth <pa...@ci...> 4.4.9-1 +- update to 4.4.9 + * Fri Jan 4 2008 Paul Howarth <pa...@ci...> 4.4.8-1 - update to 4.4.8 - tweak license tag to silence rpmlint |
From: James C. <qu...@us...> - 2008-07-25 00:13:47
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23312 Modified Files: pptp_compat.c Log Message: restore stropts Index: pptp_compat.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_compat.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- pptp_compat.c 24 Jul 2008 05:53:05 -0000 1.2 +++ pptp_compat.c 25 Jul 2008 00:13:56 -0000 1.3 @@ -8,12 +8,14 @@ #include <sys/types.h> #include <unistd.h> #include <stdlib.h> +#if defined (__SVR4) && defined (__sun) /* Solaris */ +#include <stropts.h> +#endif #include <strings.h> #include "pptp_compat.h" #include <stdio.h> #include "util.h" - #if defined (__SVR4) && defined (__sun) /* Solaris */ /* * daemon implementation from uClibc |
From: James C. <qu...@us...> - 2008-07-24 05:53:05
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14972 Modified Files: ChangeLog NEWS pptp.c pptp_compat.c routing.c Log Message: compilation fixes for older distributions Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.118 retrieving revision 1.119 diff -u -d -r1.118 -r1.119 --- ChangeLog 24 Jul 2008 05:37:47 -0000 1.118 +++ ChangeLog 24 Jul 2008 05:53:05 -0000 1.119 @@ -1,3 +1,8 @@ +Thu Jul 24 15:51:30 2008 Paul Howarth <pa...@ci...> + + * routing.c, pptp_compat.c: compilation fixes for old + distributions. + Thu Jul 24 15:28:32 2008 Ilya Voronin <ivo...@gm...> * routing.c, Makefile: fixe use of /bin/ip and all compiler Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.61 retrieving revision 1.62 diff -u -d -r1.61 -r1.62 --- NEWS 24 Jul 2008 05:37:47 -0000 1.61 +++ NEWS 24 Jul 2008 05:53:05 -0000 1.62 @@ -1,3 +1,4 @@ +- compilation fixes for older distributions of Linux [Howarth] - port routing change feature for Solaris [Voronin] - add IP_BINARY [Cameron] - add include file build dependencies [Cameron] Index: pptp.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -d -r1.50 -r1.51 --- pptp.c 24 Jul 2008 05:37:47 -0000 1.50 +++ pptp.c 24 Jul 2008 05:53:05 -0000 1.51 @@ -61,9 +61,8 @@ #include "version.h" #if defined(__linux__) #include <sys/prctl.h> -#else -#include "inststr.h" #endif +#include "inststr.h" #include "util.h" #include "pptp_quirks.h" #include "pqueue.h" @@ -183,6 +182,7 @@ struct in_addr inetaddr; volatile int callmgr_sock = -1; char ttydev[PATH_MAX]; + char *tty_name; int pty_fd, tty_fd, gre_fd, rc; volatile pid_t parent_pid, child_pid; u_int16_t call_id, peer_call_id; @@ -391,7 +391,7 @@ file2fd("/dev/null", "wb", STDERR_FILENO); } - char *tty_name = ttyname(tty_fd); + tty_name = ttyname(tty_fd); snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s", tty_name ? tty_name : "(null)"); #ifdef PR_SET_NAME Index: pptp_compat.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_compat.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pptp_compat.c 19 Feb 2008 21:43:28 -0000 1.1 +++ pptp_compat.c 24 Jul 2008 05:53:05 -0000 1.2 @@ -7,7 +7,6 @@ #include <fcntl.h> #include <sys/types.h> #include <unistd.h> -#include <stropts.h> #include <stdlib.h> #include <strings.h> #include "pptp_compat.h" Index: routing.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/routing.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- routing.c 24 Jul 2008 05:37:47 -0000 1.3 +++ routing.c 24 Jul 2008 05:53:05 -0000 1.4 @@ -110,8 +110,10 @@ } #else /* Solaris */ char buf[256]; + FILE *p; + snprintf(buf, 255, "%s route get %s", IP_BINARY, ip); - FILE *p = popen(buf, "r"); + p = popen(buf, "r"); fgets(buf, 255, p); /* TODO: check for failure of fgets */ route = strdup(buf); @@ -142,8 +144,10 @@ } #else /* Solaris */ char buf[256]; + FILE *p; + snprintf(buf, 255, "%s route replace %s", IP_BINARY, route); - FILE *p = popen(buf, "r"); + p = popen(buf, "r"); pclose(p); #endif /* Solaris */ } @@ -170,8 +174,10 @@ } #else /* Solaris */ char buf[256]; + FILE *p; + snprintf(buf, 255, "%s route delete %s", IP_BINARY, route); - FILE *p = popen(buf, "r"); + p = popen(buf, "r"); pclose(p); #endif /* Solaris */ } |
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8555 Modified Files: ChangeLog Makefile NEWS pptp.c pptp_callmgr.c pptp_ctrl.c pptp_gre.c routing.c routing.h Log Message: solaris routing port Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.117 retrieving revision 1.118 diff -u -d -r1.117 -r1.118 --- ChangeLog 21 May 2008 23:47:17 -0000 1.117 +++ ChangeLog 24 Jul 2008 05:37:47 -0000 1.118 @@ -1,3 +1,8 @@ +Thu Jul 24 15:28:32 2008 Ilya Voronin <ivo...@gm...> + + * routing.c, Makefile: fixe use of /bin/ip and all compiler + warnings on Solaris. + Thu May 22 09:44:19 2008 James Cameron <qu...@us...> * routing.c: add config.h and use IP_BINARY. Index: Makefile =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- Makefile 21 May 2008 23:47:17 -0000 1.48 +++ Makefile 24 Jul 2008 05:37:47 -0000 1.49 @@ -5,6 +5,8 @@ ################################################################# # CHANGE THIS LINE to point to the location of binaries PPPD = /usr/sbin/pppd +# Solaris +# PPPD = /usr/bin/pppd IP = /bin/ip ################################################################# @@ -18,6 +20,8 @@ DEBUG = -g INCLUDE = CFLAGS = -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE) +# Solaris +# CFLAGS += -D_XPG4_2 -D__EXTENSIONS__ LIBS = -lutil # Solaris 10 # LIBS = -lnsl -lsocket -lresolv Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- NEWS 21 May 2008 23:47:17 -0000 1.60 +++ NEWS 24 Jul 2008 05:37:47 -0000 1.61 @@ -1,3 +1,4 @@ +- port routing change feature for Solaris [Voronin] - add IP_BINARY [Cameron] - add include file build dependencies [Cameron] Index: pptp.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- pptp.c 14 May 2008 06:32:52 -0000 1.49 +++ pptp.c 24 Jul 2008 05:37:47 -0000 1.50 @@ -129,7 +129,7 @@ } #if defined (__SVR4) && defined (__sun) -struct in_addr localbind = { INADDR_ANY }; +struct in_addr localbind = { .s_addr = INADDR_ANY }; #else struct in_addr localbind = { INADDR_NONE }; #endif Index: pptp_callmgr.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_callmgr.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- pptp_callmgr.c 2 Aug 2006 06:22:34 -0000 1.21 +++ pptp_callmgr.c 24 Jul 2008 05:37:47 -0000 1.22 @@ -15,6 +15,9 @@ #include <unistd.h> #include <stdlib.h> #include <string.h> +#if defined (__SVR4) && defined (__sun) +#include <strings.h> +#endif #include <assert.h> #include <setjmp.h> #include <stdio.h> Index: pptp_ctrl.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_ctrl.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- pptp_ctrl.c 21 Nov 2007 03:36:47 -0000 1.33 +++ pptp_ctrl.c 24 Jul 2008 05:37:47 -0000 1.34 @@ -5,6 +5,10 @@ */ #include <errno.h> +#if defined (__SVR4) && defined (__sun) /* Solaris */ +#define _XPG4_2 +#define __EXTENSIONS__ +#endif /* Solaris */ #include <sys/time.h> #include <sys/types.h> #include <sys/socket.h> Index: pptp_gre.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_gre.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- pptp_gre.c 4 Apr 2007 06:43:15 -0000 1.43 +++ pptp_gre.c 24 Jul 2008 05:37:47 -0000 1.44 @@ -14,6 +14,9 @@ #include <unistd.h> #include <stdlib.h> #include <string.h> +#if defined (__SVR4) && defined (__sun) +#include <strings.h> +#endif #include <errno.h> #include <fcntl.h> #include "ppp_fcs.h" Index: routing.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/routing.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- routing.c 21 May 2008 23:47:17 -0000 1.2 +++ routing.c 24 Jul 2008 05:37:47 -0000 1.3 @@ -25,8 +25,24 @@ #include "routing.h" #include "config.h" +#if defined (__SVR4) && defined (__sun) /* Solaris */ +#include <sys/types.h> +#include <sys/socket.h> +#include <net/if.h> +#include <arpa/inet.h> +#include <errno.h> +#include "util.h" +/* PF_ROUTE socket*/ +int rts; +/* Destination and gateway addresses */ +struct sockaddr_in rdst, rgw; +/* Request sequence */ +int rseq; +int dorouting; +#else /* Solaris */ /* route to the server */ char *route; +#endif /* Solaris */ /* @@ -55,6 +71,44 @@ */ void routing_init(char *ip) { +#if defined (__SVR4) && defined (__sun) /* Solaris */ + rdst.sin_family = AF_INET; + if ( ! inet_pton(AF_INET, ip, &rdst.sin_addr) ) { + log("Cannot convert address: %s", strerror(errno)); + return; + } + + if ( (rts = socket(PF_ROUTE, SOCK_RAW, AF_INET )) < 0 ) { + log("Cannot open routing socket: %s", strerror(errno)); + return; + } + + struct rt_msg rtm = { + .hdr.rtm_msglen = sizeof(struct rt_msg), + .hdr.rtm_version = RTM_VERSION, + .hdr.rtm_type = RTM_GET, + .hdr.rtm_addrs = RTA_DST, + .hdr.rtm_pid = getpid(), + .hdr.rtm_seq = ++rseq, + .addrs[RTAX_DST] = rdst + }; + + if ( write(rts, &rtm, rtm.hdr.rtm_msglen) != rtm.hdr.rtm_msglen ) { + log("Error writing to routing socket: %s", strerror(errno)); + close(rts); + return; + } + + while ( read(rts, &rtm, sizeof(struct rt_msg)) > 0 ) + if ( rtm.hdr.rtm_pid == getpid() && rtm.hdr.rtm_seq == rseq) { + /* Check if host route already present */ + if ( ( rtm.hdr.rtm_flags & RTF_HOST ) != RTF_HOST ) { + rgw = rtm.addrs[RTAX_GATEWAY]; + dorouting = 1; + } + break; + } +#else /* Solaris */ char buf[256]; snprintf(buf, 255, "%s route get %s", IP_BINARY, ip); FILE *p = popen(buf, "r"); @@ -63,18 +117,61 @@ route = strdup(buf); pclose(p); /* TODO: check for failure of command */ +#endif /* Solaris */ } void routing_start() { +#if defined (__SVR4) && defined (__sun) /* Solaris */ + if ( ! dorouting ) + return; + + struct rt_msg rtm = { + .hdr.rtm_msglen = sizeof(struct rt_msg), + .hdr.rtm_version = RTM_VERSION, + .hdr.rtm_type = RTM_ADD, + .hdr.rtm_flags = RTF_HOST | RTF_GATEWAY | RTF_STATIC, + .hdr.rtm_addrs = RTA_DST | RTA_GATEWAY, + .hdr.rtm_pid = getpid(), + .hdr.rtm_seq = ++rseq, + .addrs[RTAX_DST] = rdst, + .addrs[RTAX_GATEWAY] = rgw + }; + + if ( write(rts, &rtm, rtm.hdr.rtm_msglen) != rtm.hdr.rtm_msglen ) { + log("Error adding route: %s", strerror(errno)); + } +#else /* Solaris */ char buf[256]; snprintf(buf, 255, "%s route replace %s", IP_BINARY, route); FILE *p = popen(buf, "r"); pclose(p); +#endif /* Solaris */ } void routing_end() { +#if defined (__SVR4) && defined (__sun) /* Solaris */ + if ( ! dorouting) + return; + + struct rt_msg rtm = { + .hdr.rtm_msglen = sizeof(struct rt_msg), + .hdr.rtm_version = RTM_VERSION, + .hdr.rtm_type = RTM_DELETE, + .hdr.rtm_flags = RTF_HOST | RTF_GATEWAY | RTF_STATIC, + .hdr.rtm_addrs = RTA_DST | RTA_GATEWAY, + .hdr.rtm_pid = getpid(), + .hdr.rtm_seq = ++rseq, + .addrs[RTAX_DST] = rdst, + .addrs[RTAX_GATEWAY] = rgw + }; + + if ( write(rts, &rtm, rtm.hdr.rtm_msglen) != rtm.hdr.rtm_msglen ) { + log("Error deleting route: %s", strerror(errno)); + } +#else /* Solaris */ char buf[256]; snprintf(buf, 255, "%s route delete %s", IP_BINARY, route); FILE *p = popen(buf, "r"); pclose(p); +#endif /* Solaris */ } Index: routing.h =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/routing.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- routing.h 2 Aug 2006 07:07:37 -0000 1.1 +++ routing.h 24 Jul 2008 05:37:47 -0000 1.2 @@ -1,3 +1,11 @@ +#if defined (__SVR4) && defined (__sun) /* Solaris */ +#include <netinet/in.h> +#include <net/route.h> +struct rt_msg { + struct rt_msghdr hdr; + struct sockaddr_in addrs[RTAX_MAX]; +}; +#endif /* Solaris */ void routing_init(char *ip); void routing_start(); void routing_end(); |
From: James C. <qu...@us...> - 2008-05-21 23:47:11
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17229 Modified Files: ChangeLog Makefile NEWS routing.c Log Message: packaging fixes Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.116 retrieving revision 1.117 diff -u -d -r1.116 -r1.117 --- ChangeLog 14 May 2008 06:32:52 -0000 1.116 +++ ChangeLog 21 May 2008 23:47:17 -0000 1.117 @@ -1,3 +1,10 @@ +Thu May 22 09:44:19 2008 James Cameron <qu...@us...> + + * routing.c: add config.h and use IP_BINARY. + + * Makefile (IP): add pointer to IP binary, store it in config.h, + and add dependencies to support parallel make and development. + Wed May 14 15:59:17 2008 James Cameron <qu...@us...> * pptp-1.7.2 released. Index: Makefile =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- Makefile 14 May 2008 06:32:52 -0000 1.47 +++ Makefile 21 May 2008 23:47:17 -0000 1.48 @@ -3,8 +3,9 @@ RELEASE= ################################################################# -# CHANGE THIS LINE to point to the location of your pppd binary. +# CHANGE THIS LINE to point to the location of binaries PPPD = /usr/sbin/pppd +IP = /bin/ip ################################################################# BINDIR=$(DESTDIR)/usr/sbin @@ -47,6 +48,7 @@ echo "/* text added by Makefile target config.h */" > config.h echo "#define PPTP_LINUX_VERSION \"$(VERSION)$(RELEASE)\"" >> config.h echo "#define PPPD_BINARY \"$(PPPD)\"" >> config.h + echo "#define IP_BINARY \"$(IP)\"" >> config.h vector_test: vector_test.o vector.o $(CC) -o vector_test vector_test.o vector.o @@ -96,3 +98,71 @@ release: cp pptp_$(VERSION)-0_i386.deb $(WEB) cd $(WEB);make + +# The following include file dependencies were generated using +# "makedepend -w0 *.c", then manually removing out of tree entries. +# DO NOT DELETE + +dirutil.o: dirutil.h +orckit_quirks.o: pptp_msg.h +orckit_quirks.o: pptp_compat.h +orckit_quirks.o: pptp_options.h +orckit_quirks.o: pptp_ctrl.h +orckit_quirks.o: util.h +ppp_fcs.o: ppp_fcs.h +ppp_fcs.o: pptp_compat.h +pptp.o: config.h +pptp.o: pptp_callmgr.h +pptp.o: pptp_gre.h +pptp.o: pptp_compat.h +pptp.o: version.h +pptp.o: inststr.h +pptp.o: util.h +pptp.o: pptp_quirks.h +pptp.o: pptp_msg.h +pptp.o: pptp_ctrl.h +pptp.o: pqueue.h +pptp.o: pptp_options.h +pptp_callmgr.o: pptp_callmgr.h +pptp_callmgr.o: pptp_ctrl.h +pptp_callmgr.o: pptp_compat.h +pptp_callmgr.o: pptp_msg.h +pptp_callmgr.o: dirutil.h +pptp_callmgr.o: vector.h +pptp_callmgr.o: util.h +pptp_callmgr.o: routing.h +pptp_compat.o: pptp_compat.h +pptp_compat.o: util.h +pptp_ctrl.o: pptp_msg.h +pptp_ctrl.o: pptp_compat.h +pptp_ctrl.o: pptp_ctrl.h +pptp_ctrl.o: pptp_options.h +pptp_ctrl.o: vector.h +pptp_ctrl.o: util.h +pptp_ctrl.o: pptp_quirks.h +pptp_gre.o: ppp_fcs.h +pptp_gre.o: pptp_compat.h +pptp_gre.o: pptp_msg.h +pptp_gre.o: pptp_gre.h +pptp_gre.o: util.h +pptp_gre.o: pqueue.h +pptp_gre.o: test.h +pptp_quirks.o: orckit_quirks.h +pptp_quirks.o: pptp_options.h +pptp_quirks.o: pptp_ctrl.h +pptp_quirks.o: pptp_compat.h +pptp_quirks.o: pptp_msg.h +pptp_quirks.o: pptp_quirks.h +pqueue.o: util.h +pqueue.o: pqueue.h +routing.o: routing.h +test.o: util.h +test.o: test.h +util.o: util.h +vector.o: pptp_ctrl.h +vector.o: pptp_compat.h +vector.o: vector.h +vector_test.o: vector.h +vector_test.o: pptp_ctrl.h +vector_test.o: pptp_compat.h +version.o: config.h Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.59 retrieving revision 1.60 diff -u -d -r1.59 -r1.60 --- NEWS 14 May 2008 06:32:52 -0000 1.59 +++ NEWS 21 May 2008 23:47:17 -0000 1.60 @@ -1,3 +1,6 @@ +- add IP_BINARY [Cameron] +- add include file build dependencies [Cameron] + Release 1.7.2: (14th May 2008) - port for Solaris 10/11 [Voronin] Index: routing.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/routing.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- routing.c 2 Aug 2006 07:07:37 -0000 1.1 +++ routing.c 21 May 2008 23:47:17 -0000 1.2 @@ -23,6 +23,7 @@ #include <stdio.h> #include <string.h> #include "routing.h" +#include "config.h" /* route to the server */ char *route; @@ -55,7 +56,7 @@ void routing_init(char *ip) { char buf[256]; - snprintf(buf, 255, "/bin/ip route get %s", ip); + snprintf(buf, 255, "%s route get %s", IP_BINARY, ip); FILE *p = popen(buf, "r"); fgets(buf, 255, p); /* TODO: check for failure of fgets */ @@ -66,14 +67,14 @@ void routing_start() { char buf[256]; - snprintf(buf, 255, "/bin/ip route replace %s", route); + snprintf(buf, 255, "%s route replace %s", IP_BINARY, route); FILE *p = popen(buf, "r"); pclose(p); } void routing_end() { char buf[256]; - snprintf(buf, 255, "/bin/ip route delete %s", route); + snprintf(buf, 255, "%s route delete %s", IP_BINARY, route); FILE *p = popen(buf, "r"); pclose(p); } |
From: James C. <qu...@us...> - 2008-05-21 23:44:11
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16062 Modified Files: RELEASING Log Message: post-release notes Index: RELEASING =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/RELEASING,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- RELEASING 14 May 2008 06:32:52 -0000 1.12 +++ RELEASING 21 May 2008 23:44:07 -0000 1.13 @@ -111,25 +111,31 @@ # http://quozl.linux.org.au/pptp/ # sign mail -mutt -s "pptp-1.7.1 released" ppt...@li... <<EOF +mutt -s "pptp-1.7.2 released" ppt...@li... <<EOF G'day, -PPTP Client 1.7.1 is released. -This is a minor release with very little changed. +PPTP Client 1.7.2 is released. -Changes since 1.7.0 are: -- use prctl(2) to set process name [Cameron] -- add --version option [Cameron] -- remove superfluous sigset [Cameron/Gono] -- default options file to not require MPPE (#166394) [Howarth] -- add PROTOCOL-SECURITY discussion [Cameron/Mueller] +Changes since 1.7.1 are: +- port for Solaris 10/11 [Voronin] +- make copyright and license clearer [Cameron/Ananian] +- add packet reordering test code for pptpd testing [Cameron] +- ignore transient send errors [Adda] +- fix flaw in return status check of select in GRE pipe (possibly + fixes Debian Bug #427586) [Cameron] +- add route to PPTP server [Cameron] +- remove non-free reference documentation [Cameron] +- fix quoting and pppd options [Lundqvist] +- pptpsetup script with man page (Debian Bug #167216) [Ferraz] Can be downloaded from: + http://quozl.linux.org.au/pptp/ http://sourceforge.net/project/showfiles.php?group_id=33063 -d70f0d807112f6347977d662cf3fe032 pptp-1.7.1-2.i386.rpm -db9054d8a7654cf79b240d7a28f0168f pptp-1.7.1-2.src.rpm -b47735ba5d6d37dfdbccb85afc044ede pptp-1.7.1.tar.gz +4c3d19286a37459a632c7128c92a9857 pptp-1.7.2.tar.gz + +The .tar.gz file is much smaller because the reference documentation +was removed. EOF # to add to process |
From: Paul H. <pg...@us...> - 2008-05-19 15:57:49
|
Update of /cvsroot/pptpclient/specs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1322 Modified Files: pptp.spec Added Files: pptp-1.7.2-ip-path.patch Log Message: - Use /sbin/ip, not /bin/ip for routing - Add dependency on /sbin/ip - Disable parallel make - object files are missing dependency on config.h --- NEW FILE: pptp-1.7.2-ip-path.patch --- --- pptp-1.7.2/routing.c 2008-05-19 11:05:18.000000000 +0100 +++ pptp-1.7.2/routing.c 2008-05-19 11:06:56.000000000 +0100 @@ -56,7 +56,7 @@ void routing_init(char *ip) { char buf[256]; FILE *p; - snprintf(buf, 255, "/bin/ip route get %s", ip); + snprintf(buf, 255, "/sbin/ip route get %s", ip); p = popen(buf, "r"); fgets(buf, 255, p); /* TODO: check for failure of fgets */ @@ -68,7 +68,7 @@ void routing_start() { char buf[256]; FILE *p; - snprintf(buf, 255, "/bin/ip route replace %s", route); + snprintf(buf, 255, "/sbin/ip route replace %s", route); p = popen(buf, "r"); pclose(p); } @@ -76,7 +76,7 @@ void routing_end() { char buf[256]; FILE *p; - snprintf(buf, 255, "/bin/ip route delete %s", route); + snprintf(buf, 255, "/sbin/ip route delete %s", route); p = popen(buf, "r"); pclose(p); } Index: pptp.spec =================================================================== RCS file: /cvsroot/pptpclient/specs/pptp.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- pptp.spec 14 May 2008 22:05:56 -0000 1.12 +++ pptp.spec 19 May 2008 15:57:19 -0000 1.13 @@ -5,7 +5,7 @@ # Use "rpmbuild --define 'suse_version 1'" to build for SuSE system -%define rpmrel 1 +%define rpmrel 3 %{!?__id_u: %define __id_u /bin/id -u} Summary: Point-to-Point Tunneling Protocol (PPTP) Client @@ -17,6 +17,7 @@ Source: http://downloads.sf.net/pptpclient/pptp-%{version}.tar.gz Patch0: pptp-1.7.2-compat.patch Patch1: pptp-1.7.2-declaration.patch +Patch2: pptp-1.7.2-ip-path.patch License: GPLv2+ %if %{?suse_version:0}%{!?suse_version:1} Group: Applications/Internet @@ -25,7 +26,7 @@ %endif Obsoletes: pptp-scripts <= 1.6.0 pptp-linux <= 1.6.0 Provides: pptp-linux = %{version}-%{release}, pptp-scripts = %{version}-%{release} -Requires: ppp >= 2.4.2 +Requires: ppp >= 2.4.2, /sbin/ip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -38,11 +39,13 @@ %setup -q %patch0 -p1 -b .compat %patch1 -p1 -b .declaration +%patch2 -p1 -b .ip-path /usr/bin/find . -depth -type d -name CVS -exec %{__rm} -rf {} \; %{__perl} -pi -e 's/install -o root -m 555 pptp/install -m 755 pptp/;' Makefile %build -%{__make} %{?_smp_mflags} CFLAGS="-Wall %{optflags}" +# Parallel make disabled because .o files don't have dependency on config.h +%{__make} CFLAGS="-Wall %{optflags}" %install %{__rm} -rf %{buildroot} @@ -64,6 +67,13 @@ %config(noreplace) /etc/ppp/options.pptp %changelog +* Mon May 19 2008 Paul Howarth <pa...@ci...> 1.7.2-3 +- Add dependency on /sbin/ip +- Disable parallel make - object files are missing dependency on config.h + +* Mon May 19 2008 Paul Howarth <pa...@ci...> 1.7.2-2 +- Use /sbin/ip, not /bin/ip for routing + * Wed May 14 2008 Paul Howarth <pa...@ci...> 1.7.2-1 - Update to 1.7.2 - Include new script and manpage: pptpsetup |
From: Paul H. <pg...@us...> - 2008-05-14 22:05:53
|
Update of /cvsroot/pptpclient/specs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5181 Modified Files: pptp.spec Added Files: pptp-1.7.2-compat.patch pptp-1.7.2-declaration.patch Removed Files: pptp-1.7.1-declaration.patch Log Message: - Update to 1.7.2 - Include new script and manpage: pptpsetup - Update declaration patch (original problem fixed, similar issues introduced in different files) - Add patch to remove reference to stropts.h, not shipped in F9 onwards and only needed for Solaris --- NEW FILE: pptp-1.7.2-compat.patch --- --- pptp-1.7.2/pptp_compat.c 2008-05-14 07:33:55.000000000 +0100 +++ pptp-1.7.2/pptp_compat.c 2008-05-14 12:34:46.000000000 +0100 @@ -7,7 +7,6 @@ #include <fcntl.h> #include <sys/types.h> #include <unistd.h> -#include <stropts.h> #include <stdlib.h> #include <strings.h> #include "pptp_compat.h" --- NEW FILE: pptp-1.7.2-declaration.patch --- --- pptp-1.7.2/pptp.c 2008-05-14 07:33:55.000000000 +0100 +++ pptp-1.7.2/pptp.c 2008-05-14 16:30:01.000000000 +0100 @@ -61,9 +61,8 @@ #include "version.h" #if defined(__linux__) #include <sys/prctl.h> -#else -#include "inststr.h" #endif +#include "inststr.h" #include "util.h" #include "pptp_quirks.h" #include "pqueue.h" @@ -183,6 +182,7 @@ struct in_addr inetaddr; volatile int callmgr_sock = -1; char ttydev[PATH_MAX]; + char *tty_name; int pty_fd, tty_fd, gre_fd, rc; volatile pid_t parent_pid, child_pid; u_int16_t call_id, peer_call_id; @@ -391,7 +391,7 @@ file2fd("/dev/null", "wb", STDERR_FILENO); } - char *tty_name = ttyname(tty_fd); + tty_name = ttyname(tty_fd); snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s", tty_name ? tty_name : "(null)"); #ifdef PR_SET_NAME --- pptp-1.7.2/routing.c 2008-05-14 07:33:55.000000000 +0100 +++ pptp-1.7.2/routing.c 2008-05-14 16:36:26.000000000 +0100 @@ -55,8 +55,9 @@ void routing_init(char *ip) { char buf[256]; + FILE *p; snprintf(buf, 255, "/bin/ip route get %s", ip); - FILE *p = popen(buf, "r"); + p = popen(buf, "r"); fgets(buf, 255, p); /* TODO: check for failure of fgets */ route = strdup(buf); @@ -66,14 +67,16 @@ void routing_start() { char buf[256]; + FILE *p; snprintf(buf, 255, "/bin/ip route replace %s", route); - FILE *p = popen(buf, "r"); + p = popen(buf, "r"); pclose(p); } void routing_end() { char buf[256]; + FILE *p; snprintf(buf, 255, "/bin/ip route delete %s", route); - FILE *p = popen(buf, "r"); + p = popen(buf, "r"); pclose(p); } Index: pptp.spec =================================================================== RCS file: /cvsroot/pptpclient/specs/pptp.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- pptp.spec 8 Jan 2008 12:59:19 -0000 1.11 +++ pptp.spec 14 May 2008 22:05:56 -0000 1.12 @@ -5,17 +5,18 @@ # Use "rpmbuild --define 'suse_version 1'" to build for SuSE system -%define rpmrel 5 +%define rpmrel 1 %{!?__id_u: %define __id_u /bin/id -u} Summary: Point-to-Point Tunneling Protocol (PPTP) Client Name: pptp -Version: 1.7.1 +Version: 1.7.2 Distribution: PPTP Client Project Release: %{?beta:0.%{beta}.}%{rpmrel}%{?suse_version:suse}%{?dist} URL: http://pptpclient.sourceforge.net/ Source: http://downloads.sf.net/pptpclient/pptp-%{version}.tar.gz -Patch0: pptp-1.7.1-declaration.patch +Patch0: pptp-1.7.2-compat.patch +Patch1: pptp-1.7.2-declaration.patch License: GPLv2+ %if %{?suse_version:0}%{!?suse_version:1} Group: Applications/Internet @@ -35,7 +36,8 @@ %prep %setup -q -%patch0 -p1 -b .orig +%patch0 -p1 -b .compat +%patch1 -p1 -b .declaration /usr/bin/find . -depth -type d -name CVS -exec %{__rm} -rf {} \; %{__perl} -pi -e 's/install -o root -m 555 pptp/install -m 755 pptp/;' Makefile @@ -55,11 +57,21 @@ %doc AUTHORS COPYING DEVELOPERS INSTALL NEWS README TODO USING %doc ChangeLog Documentation/DESIGN.PPTP PROTOCOL-SECURITY %{_sbindir}/pptp +%{_sbindir}/pptpsetup %{_mandir}/man8/pptp.8* +%{_mandir}/man8/pptpsetup.8.* %dir %attr(750,root,root) %{_localstatedir}/run/pptp/ %config(noreplace) /etc/ppp/options.pptp %changelog +* Wed May 14 2008 Paul Howarth <pa...@ci...> 1.7.2-1 +- Update to 1.7.2 +- Include new script and manpage: pptpsetup +- Update declaration patch (original problem fixed, similar issues introduced + in different files) +- Add patch to remove reference to stropts.h, not shipped in F9 onwards and + only needed for Solaris + * Tue Jan 8 2008 Paul Howarth <pa...@ci...> 1.7.1-5 - Old distributions like RHL7/8 don't have a sed that supports the "-i" option, so use perl to do inline edits instead --- pptp-1.7.1-declaration.patch DELETED --- |
From: James C. <qu...@us...> - 2008-05-14 06:32:58
|
Update of /cvsroot/pptpclient/pptp-linux/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7384/debian Modified Files: changelog Log Message: release 1.7.2 Index: changelog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/debian/changelog,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- changelog 2 Aug 2006 07:02:47 -0000 1.19 +++ changelog 14 May 2008 06:32:52 -0000 1.20 @@ -1,3 +1,9 @@ +pptp (1.7.2-rc5) unstable; urgency=low + + * test + + -- James Cameron <qu...@us...> Wed, 14 May 2008 15:56:40 +1000 + pptp (1.7.2-rc4) unstable; urgency=low * test |
From: James C. <qu...@us...> - 2008-05-14 06:32:58
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7384 Modified Files: ChangeLog Makefile NEWS RELEASING pptp.8 pptp.c Log Message: release 1.7.2 Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.115 retrieving revision 1.116 diff -u -d -r1.115 -r1.116 --- ChangeLog 19 Feb 2008 05:05:03 -0000 1.115 +++ ChangeLog 14 May 2008 06:32:52 -0000 1.116 @@ -1,3 +1,7 @@ +Wed May 14 15:59:17 2008 James Cameron <qu...@us...> + + * pptp-1.7.2 released. + Fri Jan 11 13:20:18 2008 Ilya Voronin <ivo...@gm...> * ppp_fcs.h, pptp.c, pptp_ctrl.h, pptp_gre.h, pptp_msg.h: port to Index: Makefile =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- Makefile 19 Feb 2008 05:05:03 -0000 1.46 +++ Makefile 14 May 2008 06:32:52 -0000 1.47 @@ -1,10 +1,10 @@ # $Id$ -VERSION=1.7.1 +VERSION=1.7.2 RELEASE= ################################################################# # CHANGE THIS LINE to point to the location of your pppd binary. -PPPD = /usr/bin/pppd +PPPD = /usr/sbin/pppd ################################################################# BINDIR=$(DESTDIR)/usr/sbin @@ -17,9 +17,9 @@ DEBUG = -g INCLUDE = CFLAGS = -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE) -# LIBS = -lutil +LIBS = -lutil # Solaris 10 -LIBS = -lnsl -lsocket -lresolv +# LIBS = -lnsl -lsocket -lresolv # Solaris Nevada build 14 or above # LIBS = -lnsl -lsocket LDFLAGS = @@ -28,7 +28,7 @@ PPTP_OBJS = pptp.o pptp_gre.o ppp_fcs.o \ pptp_ctrl.o dirutil.o vector.o \ - inststr.o util.o version.o test.o \ + inststr.o util.o version.o test.o \ pptp_quirks.o orckit_quirks.o pqueue.o pptp_callmgr.o routing.o \ pptp_compat.o Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.58 retrieving revision 1.59 diff -u -d -r1.58 -r1.59 --- NEWS 19 Feb 2008 05:05:03 -0000 1.58 +++ NEWS 14 May 2008 06:32:52 -0000 1.59 @@ -1,12 +1,15 @@ +Release 1.7.2: (14th May 2008) + - port for Solaris 10/11 [Voronin] - make copyright and license clearer [Cameron/Ananian] - add packet reordering test code for pptpd testing [Cameron] - ignore transient send errors [Adda] -- fix flaw in return status check of select in GRE pipe [Cameron] +- fix flaw in return status check of select in GRE pipe (possibly + fixes Debian Bug #427586) [Cameron] - add route to PPTP server [Cameron] - remove non-free reference documentation [Cameron] - fix quoting and pppd options [Lundqvist] -- pptpsetup script with man page (Debian Bug #167216?) [Ferraz] +- pptpsetup script with man page (Debian Bug #167216) [Ferraz] Release 1.7.1: (13th February 2006) Index: RELEASING =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/RELEASING,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- RELEASING 2 Aug 2006 07:02:47 -0000 1.11 +++ RELEASING 14 May 2008 06:32:52 -0000 1.12 @@ -9,7 +9,7 @@ # set shell variables for version # (use -rc1 for release candidate 1, or blank for final release) VERSION=1.7.2 -RELEASE=-rc1 +RELEASE= TAG_VERSION=`echo ${VERSION}|tr . _` export VERSION RELEASE TAG_VERSION Index: pptp.8 =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp.8,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- pptp.8 4 Apr 2007 06:43:15 -0000 1.12 +++ pptp.8 14 May 2008 06:32:52 -0000 1.13 @@ -87,11 +87,22 @@ .TP .B \-\-test-type <n> -Enable packet reordering tests that damage the integrity of the packet stream to the server. Use this only when testing servers. Zero is the default, and means that packets are sent in the correct order. A value of one (1) causes a single swap between two packets, such that the sequence numbers might be 1 2 3 4 6 5 7 8 9. A value of two (2) causes ten packets to be buffered, then sent out of order but ascending, such that the sequence numbers might be 1 2 3 4 16 6 7 8 9 10 11 12 13 14 15 17 18 19 20. A value of three (3) causes ten packets to be buffered, then sent in the reverse order, like this; 1 2 3 4 16 15 14 13 12 11 10 9 8 7 6 5 17 18 19 20. +Enable packet reordering tests that damage the integrity of the packet +stream to the server. Use this only when testing servers. Zero is +the default, and means that packets are sent in the correct order. A +value of one (1) causes a single swap between two packets, such that +the sequence numbers might be 1 2 3 4 6 5 7 8 9. A value of two (2) +causes ten packets to be buffered, then sent out of order but +ascending, such that the sequence numbers might be 1 2 3 4 16 6 7 8 9 +10 11 12 13 14 15 17 18 19 20. A value of three (3) causes ten +packets to be buffered, then sent in the reverse order, like this; 1 2 +3 4 16 15 14 13 12 11 10 9 8 7 6 5 17 18 19 20. .TP .B \-\-test-rate <n> -Sets the number of packets to pass before causing a reordering test. Default is 100. Has no effect if test-type is zero. The result of test types 2 and 3 are undefined if this value is less than ten. +Sets the number of packets to pass before causing a reordering test. +Default is 100. Has no effect if test-type is zero. The result of +test types 2 and 3 are undefined if this value is less than ten. .SH "QUIRKS" Index: pptp.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v retrieving revision 1.48 retrieving revision 1.49 diff -u -d -r1.48 -r1.49 --- pptp.c 19 Feb 2008 05:05:03 -0000 1.48 +++ pptp.c 14 May 2008 06:32:52 -0000 1.49 @@ -210,8 +210,8 @@ {"idle-wait", 1, 0, 0}, {"max-echo-wait", 1, 0, 0}, {"version", 0, 0, 0}, - {"test-type", 1, 0, 0}, - {"test-rate", 1, 0, 0}, + {"test-type", 1, 0, 0}, + {"test-rate", 1, 0, 0}, {0, 0, 0, 0} }; int option_index = 0; @@ -286,10 +286,10 @@ } else if (option_index == 12) { /* --version */ fprintf(stdout, "%s\n", version); exit(0); - } else if (option_index == 13) { /* --test-type */ - test_type = atoi(optarg); - } else if (option_index == 14) { /* --test-rate */ - test_rate = atoi(optarg); + } else if (option_index == 13) { /* --test-type */ + test_type = atoi(optarg); + } else if (option_index == 14) { /* --test-rate */ + test_rate = atoi(optarg); } break; case '?': /* unrecognised option */ |
From: James C. <qu...@us...> - 2008-03-30 22:23:53
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11034 Modified Files: AUTHORS ChangeLog NEWS pptpconfig.php Log Message: CLI fix, invalid route command Index: AUTHORS =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/AUTHORS,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- AUTHORS 24 Jul 2007 07:05:47 -0000 1.4 +++ AUTHORS 30 Mar 2008 22:23:49 -0000 1.5 @@ -18,3 +18,4 @@ John King Stephen DiVerdi Henrique Martins + Alex Amiryan Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/ChangeLog,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- ChangeLog 24 Jul 2007 06:57:57 -0000 1.20 +++ ChangeLog 30 Mar 2008 22:23:49 -0000 1.21 @@ -1,3 +1,8 @@ +Mon Mar 31 09:18:46 2008 Alex Amiryan <al...@am...> + + * pptpconfig.php: fix problem using CLI interface that caused + invalid route command to be attempted. + Tue Jul 24 11:17:11 2007 Robert Jackson <rj...@so...> * pptpconfig.php: tracker item #1758592 counter overflow patch. Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/NEWS,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- NEWS 24 Jul 2007 06:57:57 -0000 1.15 +++ NEWS 30 Mar 2008 22:23:49 -0000 1.16 @@ -1,3 +1,4 @@ + - fix invalid route command on CLI interface [Amiryan] - fix byte counter overflow at 10,000,000 [#1758592 Jackson] - use explicit path in desktop [Cameron] - CLI patches [#1662620 Martins] Index: pptpconfig.php =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/pptpconfig.php,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- pptpconfig.php 24 Jul 2007 01:25:22 -0000 1.14 +++ pptpconfig.php 30 Mar 2008 22:23:49 -0000 1.15 @@ -1806,9 +1806,9 @@ $command .= 'exit $pppd_exit_code;'; $context['pipe'] = popen($command.' 2>&1', 'r'); + socket_set_blocking($context['pipe'], FALSE); if ($use_gui) { - socket_set_blocking($context['pipe'], FALSE); $window->set_data('state', 'starting'); setup_list_set_state($name, 'starting'); |
From: James C. <qu...@us...> - 2008-02-19 21:43:24
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24569 Added Files: pptp_compat.c pptp_compat.h Log Message: solaris port --- NEW FILE: pptp_compat.c --- /* pptp_compat.c ... Compatibility functions * */ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #include <sys/types.h> #include <unistd.h> #include <stropts.h> #include <stdlib.h> #include <strings.h> #include "pptp_compat.h" #include <stdio.h> #include "util.h" #if defined (__SVR4) && defined (__sun) /* Solaris */ /* * daemon implementation from uClibc */ int daemon(int nochdir, int noclose) { int fd; switch (fork()) { case -1: return (-1); case 0: break; default: _exit(0); } if (setsid() == -1) return (-1); if (!nochdir) chdir("/"); if (!noclose && (fd = open("/dev/null", O_RDWR, 0)) != -1) { dup2(fd, STDIN_FILENO); dup2(fd, STDOUT_FILENO); dup2(fd, STDERR_FILENO); if (fd > 2) close (fd); } return (0); } /* * openpty implementation based on pts(7D) example */ int openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize * winp) { int fdm,fds; char * slavename; /* open master */ if ( (fdm = open("/dev/ptmx", O_RDWR)) == -1 ) return -1; /* grant access to the slave pseudo-terminal device */ if ( grantpt(fdm) == -1 ) return -1; /* unlock a pseudo-terminal master/slave pair */ if ( unlockpt(fdm) == -1 ) return -1; /* get name of the slave pseudo-terminal device */ if ( (slavename = ptsname(fdm)) == NULL ) return -1; if ( (fds = open(slavename, O_RDWR)) == -1 ) { free(slavename); return -1; } ioctl(fds, I_PUSH, "ptem"); /* push ptem */ ioctl(fds, I_PUSH, "ldterm"); /* push ldterm*/ if ( name != NULL ) strcpy(name,slavename); *amaster = fdm; *aslave = fds; free(slavename); return 0; } #endif /* Solaris */ --- NEW FILE: pptp_compat.h --- /* pptp_compat.h ... Compatibility functions * */ #if defined (__SVR4) && defined (__sun) /* Solaris */ #include <sys/termios.h> #define u_int8_t uint8_t #define u_int16_t uint16_t #define u_int32_t uint32_t #ifndef INADDR_NONE #define INADDR_NONE 0xffffffffU #endif int daemon(int nochdir, int noclose); int openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize * winp); #endif /* Solaris */ |
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23093 Modified Files: AUTHORS ChangeLog Makefile NEWS ppp_fcs.h pptp.c pptp_ctrl.h pptp_gre.h pptp_msg.h Log Message: solaris port Index: AUTHORS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/AUTHORS,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- AUTHORS 15 Dec 2006 05:05:51 -0000 1.16 +++ AUTHORS 19 Feb 2008 05:05:03 -0000 1.17 @@ -23,6 +23,7 @@ Peter Surda <shu...@ro...> Nelson Ferraz <nf...@gm...> Michael Adda <mi...@ha...> +Ilya Voronin <ivo...@gm...> Package renamed from pptp-linux to pptp after version 1.5.0. Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.114 retrieving revision 1.115 diff -u -d -r1.114 -r1.115 --- ChangeLog 21 Nov 2007 03:36:47 -0000 1.114 +++ ChangeLog 19 Feb 2008 05:05:03 -0000 1.115 @@ -1,3 +1,8 @@ +Fri Jan 11 13:20:18 2008 Ilya Voronin <ivo...@gm...> + + * ppp_fcs.h, pptp.c, pptp_ctrl.h, pptp_gre.h, pptp_msg.h: port to + Solaris 10/11. + Wed Nov 21 14:29:46 2007 Leo Savernik <l.s...@ao...> * pptp_ctrl.c (pptp_fd_set): fix compile with an ANSI Index: Makefile =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- Makefile 4 Apr 2007 06:43:15 -0000 1.45 +++ Makefile 19 Feb 2008 05:05:03 -0000 1.46 @@ -4,7 +4,7 @@ ################################################################# # CHANGE THIS LINE to point to the location of your pppd binary. -PPPD = /usr/sbin/pppd +PPPD = /usr/bin/pppd ################################################################# BINDIR=$(DESTDIR)/usr/sbin @@ -17,7 +17,11 @@ DEBUG = -g INCLUDE = CFLAGS = -Wall $(OPTIMIZE) $(DEBUG) $(INCLUDE) -LIBS = -lutil +# LIBS = -lutil +# Solaris 10 +LIBS = -lnsl -lsocket -lresolv +# Solaris Nevada build 14 or above +# LIBS = -lnsl -lsocket LDFLAGS = PPTP_BIN = pptp @@ -25,7 +29,8 @@ PPTP_OBJS = pptp.o pptp_gre.o ppp_fcs.o \ pptp_ctrl.o dirutil.o vector.o \ inststr.o util.o version.o test.o \ - pptp_quirks.o orckit_quirks.o pqueue.o pptp_callmgr.o routing.o + pptp_quirks.o orckit_quirks.o pqueue.o pptp_callmgr.o routing.o \ + pptp_compat.o PPTP_DEPS = pptp_callmgr.h pptp_gre.h ppp_fcs.h util.h test.h \ pptp_quirks.h orckit_quirks.h config.h pqueue.h routing.h Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- NEWS 28 Aug 2007 00:17:13 -0000 1.57 +++ NEWS 19 Feb 2008 05:05:03 -0000 1.58 @@ -1,3 +1,4 @@ +- port for Solaris 10/11 [Voronin] - make copyright and license clearer [Cameron/Ananian] - add packet reordering test code for pptpd testing [Cameron] - ignore transient send errors [Adda] Index: ppp_fcs.h =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ppp_fcs.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- ppp_fcs.h 23 Dec 2000 08:19:51 -0000 1.1.1.1 +++ ppp_fcs.h 19 Feb 2008 05:05:03 -0000 1.2 @@ -4,6 +4,8 @@ * $Id$ */ +#include "pptp_compat.h" + #define PPPINITFCS16 0xffff /* Initial FCS value */ #define PPPGOODFCS16 0xf0b8 /* Good final FCS value */ Index: pptp.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- pptp.c 28 Aug 2007 00:17:13 -0000 1.47 +++ pptp.c 19 Feb 2008 05:05:03 -0000 1.48 @@ -28,6 +28,7 @@ #include <util.h> #elif defined(__APPLE__) #include <util.h> +#elif defined (__SVR4) && defined (__sun) #else #include <pty.h> #endif @@ -67,6 +68,7 @@ #include "pptp_quirks.h" #include "pqueue.h" #include "pptp_options.h" +#include "pptp_compat.h" #ifndef PPPD_BINARY #define PPPD_BINARY "pppd" @@ -126,7 +128,11 @@ exit(1); } +#if defined (__SVR4) && defined (__sun) +struct in_addr localbind = { INADDR_ANY }; +#else struct in_addr localbind = { INADDR_NONE }; +#endif static int signaled = 0; /*** do nothing signal handler ************************************************/ @@ -385,8 +391,9 @@ file2fd("/dev/null", "wb", STDERR_FILENO); } - snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s", - ttyname(tty_fd)); + char *tty_name = ttyname(tty_fd); + snprintf(buf, sizeof(buf), "pptp: GRE-to-PPP gateway on %s", + tty_name ? tty_name : "(null)"); #ifdef PR_SET_NAME rc = prctl(PR_SET_NAME, "pptpgw", 0, 0, 0); if (rc != 0) perror("prctl"); Index: pptp_ctrl.h =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_ctrl.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- pptp_ctrl.h 9 Nov 2004 01:42:32 -0000 1.5 +++ pptp_ctrl.h 19 Feb 2008 05:05:03 -0000 1.6 @@ -7,6 +7,7 @@ #ifndef INC_PPTP_CTRL_H #define INC_PPTP_CTRL_H #include <sys/types.h> +#include "pptp_compat.h" typedef struct PPTP_CONN PPTP_CONN; typedef struct PPTP_CALL PPTP_CALL; Index: pptp_gre.h =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_gre.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- pptp_gre.h 9 Jun 2004 00:13:32 -0000 1.5 +++ pptp_gre.h 19 Feb 2008 05:05:03 -0000 1.6 @@ -5,6 +5,8 @@ * $Id$ */ +#include "pptp_compat.h" + int pptp_gre_bind(struct in_addr inetaddr); void pptp_gre_copy(u_int16_t call_id, u_int16_t peer_call_id, int pty_fd, int gre_fd); Index: pptp_msg.h =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_msg.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- pptp_msg.h 15 Feb 2003 10:37:21 -0000 1.3 +++ pptp_msg.h 19 Feb 2008 05:05:03 -0000 1.4 @@ -9,6 +9,7 @@ /* Grab definitions of int16, int32, etc. */ #include <sys/types.h> +#include "pptp_compat.h" /* define "portable" htons, etc. */ #define hton8(x) (x) #define ntoh8(x) (x) |