Menu
▾
▴
pptpclient-commits — CVS commits
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
(18) |
Apr
(2) |
May
(3) |
Jun
|
Jul
(2) |
Aug
(11) |
Sep
|
Oct
(6) |
Nov
(7) |
Dec
(16) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(28) |
Feb
(15) |
Mar
(4) |
Apr
(24) |
May
(18) |
Jun
(29) |
Jul
(2) |
Aug
(2) |
Sep
(1) |
Oct
(4) |
Nov
(2) |
Dec
(2) |
| 2004 |
Jan
(5) |
Feb
(3) |
Mar
(3) |
Apr
|
May
(4) |
Jun
(37) |
Jul
(5) |
Aug
(8) |
Sep
(2) |
Oct
(5) |
Nov
(4) |
Dec
(4) |
| 2005 |
Jan
|
Feb
(6) |
Mar
(3) |
Apr
(4) |
May
(14) |
Jun
|
Jul
(8) |
Aug
(8) |
Sep
|
Oct
(1) |
Nov
(2) |
Dec
|
| 2006 |
Jan
(4) |
Feb
(13) |
Mar
(2) |
Apr
(18) |
May
|
Jun
|
Jul
(2) |
Aug
(12) |
Sep
(3) |
Oct
|
Nov
|
Dec
(5) |
| 2007 |
Jan
|
Feb
|
Mar
(2) |
Apr
(1) |
May
|
Jun
|
Jul
(3) |
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2008 |
Jan
(4) |
Feb
(2) |
Mar
(1) |
Apr
|
May
(6) |
Jun
|
Jul
(3) |
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
(1) |
Sep
(2) |
Oct
|
Nov
(1) |
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Paul H. <pg...@us...> - 2008-01-08 12:59:15
|
Update of /cvsroot/pptpclient/specs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23098 Modified Files: pptp.spec Added Files: pptp-1.7.1-declaration.patch Log Message: - Old distributions like RHL7/8 don't have a sed that supports the "-i" option, so use perl to do in-place edits instead - Apply patch to declare local variables at the start of functions, needed to build on old distributions like RHL7/8 --- NEW FILE: pptp-1.7.1-declaration.patch --- --- pptp-1.7.1/pptp_ctrl.c 2006-02-13 03:07:42.000000000 +0000 +++ pptp-1.7.1/pptp_ctrl.c 2008-01-08 12:28:12.000000000 +0000 @@ -457,6 +457,7 @@ void pptp_fd_set(PPTP_CONN * conn, fd_set * read_set, fd_set * write_set, int * max_fd) { + int sig_fd; assert(conn && conn->call); /* Add fd to write_set if there are outstanding writes. */ if (conn->write_size > 0) @@ -465,7 +466,7 @@ FD_SET(conn->inet_sock, read_set); if (*max_fd < conn->inet_sock) *max_fd = conn->inet_sock; /* Add signal pipe file descriptor to set */ - int sig_fd = sigpipe_fd(); + sig_fd = sigpipe_fd(); FD_SET(sig_fd, read_set); if (*max_fd < sig_fd) *max_fd = sig_fd; } Index: pptp.spec =================================================================== RCS file: /cvsroot/pptpclient/specs/pptp.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- pptp.spec 8 Jan 2008 12:13:10 -0000 1.10 +++ pptp.spec 8 Jan 2008 12:59:19 -0000 1.11 @@ -5,7 +5,7 @@ # Use "rpmbuild --define 'suse_version 1'" to build for SuSE system -%define rpmrel 4 +%define rpmrel 5 %{!?__id_u: %define __id_u /bin/id -u} Summary: Point-to-Point Tunneling Protocol (PPTP) Client @@ -15,6 +15,7 @@ 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 License: GPLv2+ %if %{?suse_version:0}%{!?suse_version:1} Group: Applications/Internet @@ -34,8 +35,9 @@ %prep %setup -q +%patch0 -p1 -b .orig /usr/bin/find . -depth -type d -name CVS -exec %{__rm} -rf {} \; -%{__sed} -i -e 's/install -o root -m 555 pptp/install -m 755 pptp/' Makefile +%{__perl} -pi -e 's/install -o root -m 555 pptp/install -m 755 pptp/;' Makefile %build %{__make} %{?_smp_mflags} CFLAGS="-Wall %{optflags}" @@ -54,10 +56,16 @@ %doc ChangeLog Documentation/DESIGN.PPTP PROTOCOL-SECURITY %{_sbindir}/pptp %{_mandir}/man8/pptp.8* -%dir %attr(750,root,root) %{_localstatedir}/run/pptp +%dir %attr(750,root,root) %{_localstatedir}/run/pptp/ %config(noreplace) /etc/ppp/options.pptp %changelog +* 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 +- Apply patch to declare local variables at the start of functions, needed + to build on old distributions like RHL7/8 + * Mon Nov 12 2007 Paul Howarth <pa...@ci...> 1.7.1-4 - Change download URL from df.sf.net to downloads.sf.net - Clarify license as GPL version 2 or later |
|
From: Paul H. <pg...@us...> - 2008-01-08 12:13:07
|
Update of /cvsroot/pptpclient/specs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5805 Modified Files: pptp.spec Log Message: - Change download URL from df.sf.net to downloads.sf.net - Clarify license as GPL version 2 or later - Add optional dist tag - Add blank lines between spec changelog entries - Use versioned obsoletes Index: pptp.spec =================================================================== RCS file: /cvsroot/pptpclient/specs/pptp.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- pptp.spec 13 Feb 2006 11:27:04 -0000 1.9 +++ pptp.spec 8 Jan 2008 12:13:10 -0000 1.10 @@ -5,23 +5,23 @@ # Use "rpmbuild --define 'suse_version 1'" to build for SuSE system -%define rpmrel 3 +%define rpmrel 4 %{!?__id_u: %define __id_u /bin/id -u} Summary: Point-to-Point Tunneling Protocol (PPTP) Client Name: pptp Version: 1.7.1 Distribution: PPTP Client Project -Release: %{?beta:0.%{beta}.}%{rpmrel}%{?suse_version:suse} +Release: %{?beta:0.%{beta}.}%{rpmrel}%{?suse_version:suse}%{?dist} URL: http://pptpclient.sourceforge.net/ -Source: http://dl.sf.net/pptpclient/pptp-%{version}.tar.gz -License: GPL +Source: http://downloads.sf.net/pptpclient/pptp-%{version}.tar.gz +License: GPLv2+ %if %{?suse_version:0}%{!?suse_version:1} Group: Applications/Internet %else Group: Productivity/Networking/Security %endif -Obsoletes: pptp-scripts pptp-linux +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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -49,7 +49,7 @@ %{__rm} -rf %{buildroot} %files -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %doc AUTHORS COPYING DEVELOPERS INSTALL NEWS README TODO USING %doc ChangeLog Documentation/DESIGN.PPTP PROTOCOL-SECURITY %{_sbindir}/pptp @@ -58,14 +58,24 @@ %config(noreplace) /etc/ppp/options.pptp %changelog +* Mon Nov 12 2007 Paul Howarth <pa...@ci...> 1.7.1-4 +- Change download URL from df.sf.net to downloads.sf.net +- Clarify license as GPL version 2 or later +- Add optional dist tag +- Add blank lines between spec changelog entries +- Use versioned obsoletes + * Mon Feb 13 2006 Paul Howarth <pa...@ci...> 1.7.1-3 - remove buildroot unconditionally in %%clean and %%install - don't use macros in build-time command paths, hardcode them instead - add PROTOCOL-SECURITY as %%doc + * Mon Feb 13 2006 James Cameron <jam...@hp...> 1.7.1-2 - update to 1.7.1 + * Wed Aug 10 2005 Paul Howarth <pa...@ci...> 1.7.0-2 -- own directory %{_localstatedir}/run/pptp +- own directory %%{_localstatedir}/run/pptp + * Thu Jul 28 2005 Paul Howarth <pa...@ci...> 1.7.0-1 - define %%{__id_u} if it's not already done (e.g. on Mandriva) - explictly provide version/release for Provides: @@ -80,8 +90,10 @@ - no longer need other mode fixes - use system-default optflags - edit Makefile to prevent attempted chown in %%install + * Wed Jul 27 2005 James Cameron <jam...@hp...> 1.7.0-0 - new upstream version 1.7.0. + * Fri Feb 18 2005 Paul Howarth <pa...@ci...> 1.6.0-1 - changed deprecated Copyright: tag to License: - more macros for portability @@ -92,27 +104,34 @@ - add "Provides: pptp-linux" and "Obsoletes: pptp-linux" to handle name change nicely - remove redundant %%attr tags from file list + * Fri Feb 18 2005 James Cameron <jam...@hp...> 1.6.0-0 - move options.pptp to main Makefile - rename package to pptp as planned - remove pptp-command (has been deprecated since 1.2.0; no active maintainer and has caused much mailing list traffic; replacement is pptpconfig) - new upstream version 1.6.0. + * Tue Jun 22 2004 James Cameron <jam...@hp...> - remove /etc/pptp.d as unused - remove RFC and development documentation - new upstream version 1.5.0. + * Mon Nov 10 2003 James Cameron <jam...@hp...> - new upstream version 1.4.0. + * Wed Jun 11 2003 James Cameron <jam...@hp...> - new upstream version 1.3.1. + * Tue Jun 10 2003 James Cameron <jam...@hp...> - new upstream version 1.3.0. + * Wed Jan 15 2003 James Cameron <jam...@hp...> - rewrite INSTALL. - add man page to install target. - fix response to dropped packets. - fix man page, address must be before options. + * Mon Dec 30 2002 James Cameron <jam...@hp...> - adopt man page contributed by Thomas Quinot. - close stderr to prevent holding open ssh sessions. @@ -121,6 +140,7 @@ important improvement of the CPU efficiency. - handle out-of-order packets arriving on the GRE socket by buffering. - bind GRE socket early to prevent ICMP Unreachable response by client. + * Fri Mar 22 2002 James Cameron <jam...@co...> - new release engineer. - avoid requiring ppp-mppe. |
|
From: Paul H. <pg...@us...> - 2008-01-08 10:31:01
|
Update of /cvsroot/pptpclient/specs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32748 Modified Files: php4-pcntl-gtk.spec Log Message: - Rebuild against PHP 4.4.8 - Clarify license as GNU Lesser Public License, version 2.1 or later Index: php4-pcntl-gtk.spec =================================================================== RCS file: /cvsroot/pptpclient/specs/php4-pcntl-gtk.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- php4-pcntl-gtk.spec 18 Apr 2006 11:01:21 -0000 1.1 +++ php4-pcntl-gtk.spec 8 Jan 2008 10:31:04 -0000 1.2 @@ -4,9 +4,9 @@ Summary: GTK+ bindings for applications built using php%{private_suffix} Name: php%{private_suffix}-gtk Version: 1.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Source: php-gtk-%{version}.tar.gz -License: LGPL +License: LGPLv2+ Group: Development/Languages URL: http://gtk.php.net/ Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -44,11 +44,15 @@ %{__rm} -rf %{buildroot} %files -%defattr(-,root,root,0755) -%{private_php_dir}/lib +%defattr(-,root,root,-) +%{private_php_dir}/lib/ %doc AUTHORS ChangeLog COPYING.LIB NEWS README TODO %changelog +* 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 + * Thu Apr 13 2006 Paul Howarth <pa...@ci...> 1.0.2-2 - Rename package to php4-pcntl-gtk to match renamed underlying php package - Remove buildroot unconditionally in %%clean and %%install |
|
From: Paul H. <pg...@us...> - 2008-01-08 10:28:58
|
Update of /cvsroot/pptpclient/specs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31562 Modified Files: php4-pcntl.spec Log Message: - update to 4.4.8 - tweak license tag to silence rpmlint - replace /bin/php4-pcntl a relative symlink rather than an absolute one - documentation converted to UTF-8 - manpages marked as %doc and compressed - indentation changed to use tabs Index: php4-pcntl.spec =================================================================== RCS file: /cvsroot/pptpclient/specs/php4-pcntl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- php4-pcntl.spec 18 Apr 2006 10:57:59 -0000 1.1 +++ php4-pcntl.spec 8 Jan 2008 10:28:42 -0000 1.2 @@ -1,15 +1,15 @@ %define private_suffix 4-pcntl %{!?__id_u: %define __id_u %([ -x /bin/id ]&&echo /bin/id||([ -x /usr/bin/id ]&&echo /usr/bin/id||echo /bin/true)) -u} -# Note: we don't use the system pcre library because some distributions (e.g. Red Hat 8) -# don't include a sufficiently recent version. +# Note: we don't use the system pcre library because some distributions (e.g. Red Hat 8) +# don't include a sufficiently recent version. Summary: The PHP HTML-embedded scripting language, version 4, with process controls Name: php%{private_suffix} -Version: 4.4.1 -Release: 2%{?dist} -Source: http://www.php.net/distributions/php-%{version}.tar.gz -License: The PHP License +Version: 4.4.8 +Release: 1%{?dist} +Source0: http://www.php.net/distributions/php-%{version}.tar.gz +License: PHP Group: Development/Languages URL: http://www.php.net/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,72 +43,78 @@ # Fix permissions in debuginfo package /usr/bin/find . -name '*.[ch]' | /usr/bin/xargs %{__chmod} 644 +# Fix character enoding of documentation +for f in EXTENSIONS NEWS; do + /usr/bin/iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8 + %{__mv} ${f}.utf8 ${f} +done + %build export CFLAGS="%{optflags}" ./configure --prefix=%{private_php_dir} \ - --libdir=%{private_php_dir}/lib \ - --disable-cgi \ - --disable-rpath \ - --disable-ipv6 \ - --disable-all \ - --enable-pcntl \ - --enable-posix \ - --disable-xml \ - --disable-safe-mode \ - --disable-sigchild \ - --disable-bcmath \ - --disable-calendar \ - --disable-ctype \ - --disable-dba \ - --disable-dbase \ - --disable-dbx \ - --disable-debug \ - --disable-dio \ - --disable-exit \ - --disable-filepro \ - --disable-ftp \ - --disable-gd-native-ttf \ - --disable-mbstring \ - --disable-mbregex \ - --disable-mime-magic \ - --disable-overload \ - --disable-session \ - --disable-shmop \ - --disable-ucd-snmp-hack \ - --disable-sockets \ - --disable-sysvmsg \ - --disable-sysvsem \ - --disable-sysvshm \ - --disable-wddx \ - --disable-xml \ - --disable-xslt \ - --disable-yp \ - --without-bz2 \ - --without-db3 \ - --without-curl \ - --without-gd \ - --without-ttf \ - --without-gdbm \ - --without-gettext \ - --without-ncurses \ - --without-gmp \ - --without-iconv \ - --without-jpeg \ - --without-mm \ - --without-openssl \ - --without-png \ - --without-pspell \ - --without-xml \ - --without-zlib \ - --without-imap \ - --without-kerberos \ - --without-ldap \ - --without-mysql \ - --without-pgsql \ - --without-snmp \ - --without-unixODBC \ - --without-mnogosearch \ - --with-pcre-regex + --libdir=%{private_php_dir}/lib \ + --disable-cgi \ + --disable-rpath \ + --disable-ipv6 \ + --disable-all \ + --enable-pcntl \ + --enable-posix \ + --disable-xml \ + --disable-safe-mode \ + --disable-sigchild \ + --disable-bcmath \ + --disable-calendar \ + --disable-ctype \ + --disable-dba \ + --disable-dbase \ + --disable-dbx \ + --disable-debug \ + --disable-dio \ + --disable-exit \ + --disable-filepro \ + --disable-ftp \ + --disable-gd-native-ttf \ + --disable-mbstring \ + --disable-mbregex \ + --disable-mime-magic \ + --disable-overload \ + --disable-session \ + --disable-shmop \ + --disable-ucd-snmp-hack \ + --disable-sockets \ + --disable-sysvmsg \ + --disable-sysvsem \ + --disable-sysvshm \ + --disable-wddx \ + --disable-xml \ + --disable-xslt \ + --disable-yp \ + --without-bz2 \ + --without-db3 \ + --without-curl \ + --without-gd \ + --without-ttf \ + --without-gdbm \ + --without-gettext \ + --without-ncurses \ + --without-gmp \ + --without-iconv \ + --without-jpeg \ + --without-mm \ + --without-openssl \ + --without-png \ + --without-pspell \ + --without-xml \ + --without-zlib \ + --without-imap \ + --without-kerberos \ + --without-ldap \ + --without-mysql \ + --without-pgsql \ + --without-snmp \ + --without-unixODBC \ + --without-mnogosearch \ + --with-pcre-regex %{__make} %{?_smp_mflags} %install @@ -116,13 +122,16 @@ %{__mkdir} -p %{buildroot}{%{private_php_dir},%{_mandir}/man1,/bin} %{__make} INSTALL_ROOT=%{buildroot} install %{__mv} %{buildroot}%{private_php_dir}/man/man1/php.1 %{buildroot}%{_mandir}/man1/php%{private_suffix}.1 -%{__ln_s} %{private_php_dir}/bin/php %{buildroot}/bin/php%{private_suffix} +%{__ln_s} ..%{private_php_dir}/bin/php %{buildroot}/bin/php%{private_suffix} + +# Compress manpages in non-standard location +%{__gzip} %{buildroot}%{private_php_dir}/man/man*/php* %clean %{__rm} -rf %{buildroot} %files -%defattr(-,root,root,0755) +%defattr(-,root,root,-) /bin/php%{private_suffix} %dir %{private_php_dir}/ %dir %{private_php_dir}/bin/ @@ -132,14 +141,23 @@ %doc Zend/ZEND_* TSRM_LICENSE regex_COPYRIGHT %files devel -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %{private_php_dir}/bin/php-config %{private_php_dir}/bin/phpize %{private_php_dir}/lib/ %{private_php_dir}/include/ -%{private_php_dir}/man/ +%dir %{private_php_dir}/man/ +%dir %{private_php_dir}/man/man1/ +%doc %{private_php_dir}/man/man1/php*.1* %changelog +* Fri Jan 4 2008 Paul Howarth <pa...@ci...> 4.4.8-1 +- update to 4.4.8 +- tweak license tag to silence rpmlint +- replace /bin/php4-pcntl a relative symlink rather than an absolute one +- documentation converted to UTF-8 +- manpages marked as %%doc and compressed + * Wed Apr 12 2006 Paul Howarth <pa...@ci...> 4.4.1-2 - rename package to php4-pcntl to avoid install-time removal of the main php package in distributions whose main php package provides php-pcntl, such as @@ -177,7 +195,7 @@ - update to 4.3.10 * Thu Sep 30 2004 Paul Howarth <pa...@ci...> 4.3.9-2 -- add symlink /bin/php-pcntl -> %{private_php_dir}/bin/php for +- add symlink /bin/php-pcntl -> %%{private_php_dir}/bin/php for architecure-independent way of finding php-pcntl * Sun Sep 26 2004 Paul Howarth <pa...@ci...> 4.3.9-1 |
|
From: James C. <qu...@us...> - 2007-11-21 03:36:54
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10790 Modified Files: ChangeLog pptp_ctrl.c Log Message: c89 fix Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.113 retrieving revision 1.114 diff -u -d -r1.113 -r1.114 --- ChangeLog 28 Aug 2007 00:17:13 -0000 1.113 +++ ChangeLog 21 Nov 2007 03:36:47 -0000 1.114 @@ -1,3 +1,8 @@ +Wed Nov 21 14:29:46 2007 Leo Savernik <l.s...@ao...> + + * pptp_ctrl.c (pptp_fd_set): fix compile with an ANSI + C89-compliant compiler. + Tue Aug 28 10:17:36 2007 James Cameron <qu...@us...> * README, pptp.c: assign copyright to Free Software Foundation, Index: pptp_ctrl.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_ctrl.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- pptp_ctrl.c 2 Aug 2006 06:22:34 -0000 1.32 +++ pptp_ctrl.c 21 Nov 2007 03:36:47 -0000 1.33 @@ -457,6 +457,7 @@ void pptp_fd_set(PPTP_CONN * conn, fd_set * read_set, fd_set * write_set, int * max_fd) { + int sig_fd; assert(conn && conn->call); /* Add fd to write_set if there are outstanding writes. */ if (conn->write_size > 0) @@ -465,7 +466,7 @@ FD_SET(conn->inet_sock, read_set); if (*max_fd < conn->inet_sock) *max_fd = conn->inet_sock; /* Add signal pipe file descriptor to set */ - int sig_fd = sigpipe_fd(); + sig_fd = sigpipe_fd(); FD_SET(sig_fd, read_set); if (*max_fd < sig_fd) *max_fd = sig_fd; } |
|
From: James C. <qu...@us...> - 2007-08-28 00:17:32
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1310 Modified Files: ChangeLog NEWS README pptp.c Log Message: clarify license and copyright Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.112 retrieving revision 1.113 diff -u -d -r1.112 -r1.113 --- ChangeLog 4 Apr 2007 06:43:15 -0000 1.112 +++ ChangeLog 28 Aug 2007 00:17:13 -0000 1.113 @@ -1,3 +1,10 @@ +Tue Aug 28 10:17:36 2007 James Cameron <qu...@us...> + + * README, pptp.c: assign copyright to Free Software Foundation, + and make license explicit. + + Signed-off-by: "C. Scott Ananian" <cs...@cs...> + Wed Apr 4 16:30:24 2007 James Cameron <qu...@us...> * pptp.8, pptp.c: add --test-type and --test-rate options. Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- NEWS 4 Apr 2007 06:43:15 -0000 1.56 +++ NEWS 28 Aug 2007 00:17:13 -0000 1.57 @@ -1,3 +1,4 @@ +- 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] Index: README =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- README 22 Jun 2004 09:52:26 -0000 1.4 +++ README 28 Aug 2007 00:17:13 -0000 1.5 @@ -3,8 +3,21 @@ pptp is an implementation of the PPTP protocol for Linux and other Unix systems. -The code is released under the terms of the GPL; see the file COPYING -for details. +Copyright (C) 2000 Free Software Foundation + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. You can find notes on installing in the file INSTALL, usage notes in the file USING, design notes in the Documentation directory, and the Index: pptp.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- pptp.c 4 Apr 2007 06:43:15 -0000 1.46 +++ pptp.c 28 Aug 2007 00:17:13 -0000 1.47 @@ -1,9 +1,24 @@ -/* pptp.c ... client shell to launch call managers, data handlers, and - * the pppd from the command line. - * C. Scott Ananian <can...@al...> - * - * $Id$ - */ +/* + an implementation of the PPTP protocol + Copyright (C) 2000 Free Software Foundation + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + + pptp.c ... client shell to launch call managers, data handlers, and + the pppd from the command line. +*/ #include <sys/types.h> #include <sys/socket.h> @@ -75,6 +90,13 @@ { fprintf(stderr, "%s\n" + +"Copyright (C) 2000 Free Software Foundation\n\n" + +"This program comes with ABSOLUTELY NO WARRANTY; for details see source.\n" +"This is free software, and you are welcome to redistribute it under certain\n" +"conditions; see source for details.\n\n" + "Usage:\n" " %s <hostname> [<pptp options>] [[--] <pppd options>]\n" "\n" @@ -536,4 +558,3 @@ new_argv[i] = NULL; execvp(new_argv[0], new_argv); } - |
|
From: James C. <qu...@us...> - 2007-07-24 07:05:46
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4041 Modified Files: AUTHORS Log Message: #1662620 author fix Index: AUTHORS =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/AUTHORS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- AUTHORS 19 Jul 2006 06:02:28 -0000 1.3 +++ AUTHORS 24 Jul 2007 07:05:47 -0000 1.4 @@ -17,3 +17,4 @@ John McNair John King Stephen DiVerdi + Henrique Martins |
|
From: James C. <qu...@us...> - 2007-07-24 06:58:04
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv994 Modified Files: ChangeLog NEWS Log Message: #1662620 author fix Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/ChangeLog,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ChangeLog 24 Jul 2007 01:25:22 -0000 1.19 +++ ChangeLog 24 Jul 2007 06:57:57 -0000 1.20 @@ -20,7 +20,7 @@ * pptpconfig.desktop: use explicit path in case user has /usr/sbin in path before /usr/bin, from: Jonathan Kamens. -Tue Mar 6 12:21:30 2007 mvsfnet <mv...@us...> +Tue Mar 6 12:21:30 2007 Henrique Martins <mv...@us...> * pptpconfig.php: tracker item #1662620 CLI patches. Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/NEWS,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- NEWS 24 Jul 2007 01:25:22 -0000 1.14 +++ NEWS 24 Jul 2007 06:57:57 -0000 1.15 @@ -1,6 +1,6 @@ - fix byte counter overflow at 10,000,000 [#1758592 Jackson] - use explicit path in desktop [Cameron] - - CLI patches [#1662620 anonymous] + - CLI patches [#1662620 Martins] - add command line start, stop and status options [DiVerdi] - call setsid() to prevent process group kill hitting parent [Cameron] |
|
From: James C. <qu...@us...> - 2007-07-24 01:25:30
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4958 Modified Files: ChangeLog NEWS pptpconfig.php Log Message: #1758592 fix byte counter overflow Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/ChangeLog,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ChangeLog 24 Mar 2007 07:32:14 -0000 1.18 +++ ChangeLog 24 Jul 2007 01:25:22 -0000 1.19 @@ -1,3 +1,20 @@ +Tue Jul 24 11:17:11 2007 Robert Jackson <rj...@so...> + + * pptpconfig.php: tracker item #1758592 counter overflow patch. + + Once the number of bytes in reaches 10,000,000 both the counters + for bytes in and bytes out suddenly greatly reduce in value. This + is because the regular expression parsing /proc/net/dev goes wrong + because the white space changes. This causes the incorrect column + to be read. + + In particular, the space between the colon and the first number + disappears e.g. "ppp0: 5958751" to "ppp0:11100991" (see full + example). + + My patch inserts an additional space after the colon so the + existing regular expression will work correctly. + Sat Mar 24 18:29:21 2007 James Cameron <qu...@us...> * pptpconfig.desktop: use explicit path in case user has /usr/sbin @@ -5,7 +22,7 @@ Tue Mar 6 12:21:30 2007 mvsfnet <mv...@us...> - * pptpconfig.php: tracker item 1662620 CLI patches. + * pptpconfig.php: tracker item #1662620 CLI patches. pptpconfig.php fails from the command line because the pipe to pppd is set to nonblocking, the reader function is reached much Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/NEWS,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- NEWS 24 Mar 2007 07:32:14 -0000 1.13 +++ NEWS 24 Jul 2007 01:25:22 -0000 1.14 @@ -1,5 +1,6 @@ + - fix byte counter overflow at 10,000,000 [#1758592 Jackson] - use explicit path in desktop [Cameron] - - CLI patches [ 1662620 anonymous ] + - CLI patches [#1662620 anonymous] - add command line start, stop and status options [DiVerdi] - call setsid() to prevent process group kill hitting parent [Cameron] Index: pptpconfig.php =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/pptpconfig.php,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- pptpconfig.php 6 Mar 2007 01:36:22 -0000 1.13 +++ pptpconfig.php 24 Jul 2007 01:25:22 -0000 1.14 @@ -1273,6 +1273,7 @@ fclose($fp); # pull apart the line into fields, and display + $line = str_replace(':', ': ', $line); $regs = split(':| *',$line); $tree = $context['tree']; |
|
From: James C. <qu...@us...> - 2007-04-04 06:43:29
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29248 Modified Files: ChangeLog Makefile NEWS pptp.8 pptp.c pptp_gre.c Added Files: test.c test.h Log Message: add reordering test code --- NEW FILE: test.c --- /* Packet reordering test implementation, intended to cause packets to be reordered for testing pptpd and other servers. Avoids the use of pqueue.c so that it can be tested independently. */ #include <unistd.h> #include <stdlib.h> #include <string.h> #include "util.h" #include "test.h" /* whether we are asked to test ordering, obtained from command line */ extern int test_type; /* rate at which to do test ordering changes */ extern int test_rate; /* trigger cycle */ static int test_ordering_cycle = 0; /* phase of reordering */ static int test_ordering_phase = 0; /* swap a packet every now and then */ static ssize_t write_reordered_swap(int fd, const void *buf, size_t count) { static void *pocket_buf = NULL; static int pocket_count = 0; int stat; switch (test_ordering_phase) { case 0: /* between triggers, send as normal */ test_ordering_cycle++; if (test_ordering_cycle == test_rate) test_ordering_phase++; return write(fd, buf, count); case 1: /* triggered, swap a packet */ test_ordering_cycle++; if (test_ordering_cycle == (test_rate+1)) { /* pocket the packet */ pocket_count = count; pocket_buf = malloc(count); memcpy(pocket_buf, buf, count); log("test order swap, packet buffered"); /* lie about the result */ return count; } else { /* after this, reset to normal */ test_ordering_cycle = 0; test_ordering_phase = 0; /* send the new packet first */ stat = write(fd, buf, count); if (stat != count) return stat; /* then send the old packet next */ stat = write(fd, pocket_buf, pocket_count); free(pocket_buf); log("test order swap, packets sent"); return count; } default: return write(fd, buf, count); } } /* hold ten packets and send the eleventh, then the ten in order */ static ssize_t write_reordered_retransmit(int fd, const void *buf, size_t count) { int test_length = 10; static void *pocket_buf[10]; static int pocket_count[10]; int stat, n; switch (test_ordering_phase) { case 0: /* between triggers, send as normal */ test_ordering_cycle++; if (test_ordering_cycle == test_rate) test_ordering_phase++; return write(fd, buf, count); case 1: /* triggered, buffer the packets */ test_ordering_cycle++; if (test_ordering_cycle == (test_rate+test_length)) { test_ordering_phase = 2; } /* pocket the packet */ n = test_ordering_cycle - test_rate - 1; pocket_count[n] = count; pocket_buf[n] = malloc(count); memcpy(pocket_buf[n], buf, count); log("test order retransmit, packet buffered"); /* lie about the result */ return count; case 2: /* after this, reset to normal */ test_ordering_cycle = 0; test_ordering_phase = 0; /* send the new packet first */ stat = write(fd, buf, count); if (stat != count) return stat; /* send the buffered packets in normal order */ for (n=0; n<test_length; n++) { stat = write(fd, pocket_buf[n], pocket_count[n]); /* ignores failures */ free(pocket_buf[n]); } log("test order retransmit, packets sent"); return count; default: return write(fd, buf, count); } } /* hold ten packets and send them in reverse order */ static ssize_t write_reordered_reverse(int fd, const void *buf, size_t count) { int test_length = 10; static void *pocket_buf[10]; static int pocket_count[10]; int stat, n; switch (test_ordering_phase) { case 0: /* between triggers, send as normal */ test_ordering_cycle++; if (test_ordering_cycle == test_rate) test_ordering_phase++; return write(fd, buf, count); case 1: /* triggered, buffer the packets */ test_ordering_cycle++; if (test_ordering_cycle == (test_rate+test_length)) { test_ordering_phase = 2; } /* pocket the packet */ n = test_ordering_cycle - test_rate - 1; pocket_count[n] = count; pocket_buf[n] = malloc(count); memcpy(pocket_buf[n], buf, count); log("test order reverse, packet buffered"); /* lie about the result */ return count; case 2: /* after this, reset to normal */ test_ordering_cycle = 0; test_ordering_phase = 0; /* send the new packet first */ stat = write(fd, buf, count); if (stat != count) return stat; /* send the buffered packets in reverse order */ for (n=test_length-1; n>0; n--) { stat = write(fd, pocket_buf[n], pocket_count[n]); /* ignores failures */ free(pocket_buf[n]); } log("test order reverse, packets sent"); return count; default: return write(fd, buf, count); } } /* dispatcher for write reordering tests */ static ssize_t write_reordered(int fd, const void *buf, size_t count) { switch (test_type) { case 1: /* swap a packet every now and then */ return write_reordered_swap(fd, buf, count); case 2: /* hold ten packets and send the eleventh, then the ten in order */ return write_reordered_retransmit(fd, buf, count); case 3: /* hold ten packets and send them in reverse order */ return write_reordered_reverse(fd, buf, count); default: return write(fd, buf, count); } } struct test_redirections *test_redirections() { static struct test_redirections *my = NULL; if (my == NULL) my = malloc(sizeof(struct test_redirections)); my->write = write; if (test_type) my->write = write_reordered; return my; } --- NEW FILE: test.h --- struct test_redirections { ssize_t (*write)(int fd, const void *buf, size_t count); }; struct test_redirections *test_redirections(); Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.111 retrieving revision 1.112 diff -u -d -r1.111 -r1.112 --- ChangeLog 15 Dec 2006 05:05:51 -0000 1.111 +++ ChangeLog 4 Apr 2007 06:43:15 -0000 1.112 @@ -1,3 +1,13 @@ +Wed Apr 4 16:30:24 2007 James Cameron <qu...@us...> + + * pptp.8, pptp.c: add --test-type and --test-rate options. + + * pptp_gre.c: use alternate write(2) function for sending GRE + packets. + + * test.c: implement reordering tests to assist with pptpd testing. + These tests reorder the stream to simulate real-world examples. + Fri Dec 15 02:02:08 2006 Michael Adda <mi...@ha...> * pptp_gre.c: when we fail to write due to a transient error Index: Makefile =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/Makefile,v retrieving revision 1.44 retrieving revision 1.45 diff -u -d -r1.44 -r1.45 --- Makefile 17 Aug 2006 04:39:28 -0000 1.44 +++ Makefile 4 Apr 2007 06:43:15 -0000 1.45 @@ -24,10 +24,10 @@ PPTP_OBJS = pptp.o pptp_gre.o ppp_fcs.o \ pptp_ctrl.o dirutil.o vector.o \ - inststr.o util.o version.o \ + inststr.o util.o version.o test.o \ pptp_quirks.o orckit_quirks.o pqueue.o pptp_callmgr.o routing.o -PPTP_DEPS = pptp_callmgr.h pptp_gre.h ppp_fcs.h util.h \ +PPTP_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 all: config.h $(PPTP_BIN) pptpsetup.8 Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- NEWS 15 Dec 2006 05:05:51 -0000 1.55 +++ NEWS 4 Apr 2007 06:43:15 -0000 1.56 @@ -1,3 +1,4 @@ +- 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] - add route to PPTP server [Cameron] Index: pptp.8 =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp.8,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- pptp.8 19 Apr 2006 22:58:56 -0000 1.11 +++ pptp.8 4 Apr 2007 06:43:15 -0000 1.12 @@ -85,6 +85,15 @@ .B \-\-loglevel <level> Sets the debugging level (0=low, 1=default, 2=high) +.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. + +.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. + + .SH "QUIRKS" .TP Index: pptp.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -d -r1.45 -r1.46 --- pptp.c 2 Aug 2006 06:22:34 -0000 1.45 +++ pptp.c 4 Apr 2007 06:43:15 -0000 1.46 @@ -60,6 +60,8 @@ int syncppp = 0; int log_level = 1; int disable_buffer = 0; +int test_type = 0; +int test_rate = 100; struct in_addr get_ip_address(char *name); int open_callmgr(struct in_addr inetaddr, char *phonenr, int argc,char **argv,char **envp, int pty_fd, int gre_fd); @@ -93,7 +95,9 @@ " --max-echo-wait Time to wait before giving up on lack of reply\n" " --logstring <name> Use <name> instead of 'anon' in syslog messages\n" " --localbind <addr> Bind to specified IP address instead of wildcard\n" - " --loglevel <level> Sets the debugging level (0=low, 1=default, 2=high)\n", + " --loglevel <level> Sets the debugging level (0=low, 1=default, 2=high)\n" + " --test-type <type> Damage the packet stream by reordering\n" + " --test-rate <n> Do the test every n packets\n", version, progname, progname); log("%s called with wrong arguments, program not started.", progname); @@ -178,6 +182,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}, {0, 0, 0, 0} }; int option_index = 0; @@ -252,6 +258,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); } break; case '?': /* unrecognised option */ Index: pptp_gre.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_gre.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- pptp_gre.c 15 Dec 2006 05:05:51 -0000 1.42 +++ pptp_gre.c 4 Apr 2007 06:43:15 -0000 1.43 @@ -12,6 +12,7 @@ #include <sys/stat.h> #include <sys/time.h> #include <unistd.h> +#include <stdlib.h> #include <string.h> #include <errno.h> #include <fcntl.h> @@ -20,6 +21,7 @@ #include "pptp_gre.h" #include "util.h" #include "pqueue.h" +#include "test.h" #define PACKET_MAX 8196 /* test for a 32 bit counter overflow */ @@ -42,6 +44,9 @@ int encaps_gre (int fd, void *pack, unsigned int len); int dequeue_gre(callback_t callback, int cl); +/* test redirection function pointers */ +struct test_redirections *my; + #if 1 #include <stdio.h> void print_packet(int fd, void *pack, unsigned int len) @@ -94,6 +99,8 @@ if (connect(s, (struct sockaddr *) &src_addr, sizeof(src_addr)) < 0) { warn("connect: %s", strerror(errno)); close(s); return -1; } + my = test_redirections(); + return s; } @@ -477,7 +484,8 @@ /* ack is in odd place because S == 0 */ u.header.seq = hton32(seq_recv); ack_sent = seq_recv; - rc = write(fd, &u.header, sizeof(u.header) - sizeof(u.header.seq)); + rc = (*my->write)(fd, &u.header, + sizeof(u.header) - sizeof(u.header.seq)); if (rc < 0) { if (errno == ENOBUFS) rc = 0; /* Simply ignore it */ @@ -511,7 +519,7 @@ seq_sent = seq; seq++; /* write this baby out to the net */ /* print_packet(2, u.buffer, header_len + len); */ - rc = write(fd, u.buffer, header_len + len); + rc = (*my->write)(fd, u.buffer, header_len + len); if (rc < 0) { if (errno == ENOBUFS) rc = 0; /* Simply ignore it */ |
|
From: James C. <qu...@us...> - 2007-03-24 07:32:24
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12294 Modified Files: ChangeLog NEWS pptpconfig.desktop Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/ChangeLog,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- ChangeLog 6 Mar 2007 01:36:22 -0000 1.17 +++ ChangeLog 24 Mar 2007 07:32:14 -0000 1.18 @@ -1,3 +1,8 @@ +Sat Mar 24 18:29:21 2007 James Cameron <qu...@us...> + + * pptpconfig.desktop: use explicit path in case user has /usr/sbin + in path before /usr/bin, from: Jonathan Kamens. + Tue Mar 6 12:21:30 2007 mvsfnet <mv...@us...> * pptpconfig.php: tracker item 1662620 CLI patches. Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/NEWS,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- NEWS 6 Mar 2007 01:36:22 -0000 1.12 +++ NEWS 24 Mar 2007 07:32:14 -0000 1.13 @@ -1,3 +1,4 @@ + - use explicit path in desktop [Cameron] - CLI patches [ 1662620 anonymous ] - add command line start, stop and status options [DiVerdi] - call setsid() to prevent process group kill hitting parent [Cameron] Index: pptpconfig.desktop =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/pptpconfig.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pptpconfig.desktop 16 Jun 2004 09:57:41 -0000 1.1 +++ pptpconfig.desktop 24 Mar 2007 07:32:14 -0000 1.2 @@ -4,7 +4,7 @@ Comment=Configure and start PPTP tunnels (VPN) Categories=Application;SystemSetup Encoding=UTF-8 -Exec=pptpconfig +Exec=/usr/bin/pptpconfig Icon= StartupNotify=true Terminal=false |
|
From: James C. <qu...@us...> - 2007-03-06 01:36:34
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19184 Modified Files: ChangeLog NEWS pptpconfig.php Log Message: sf.net #1662620 Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/ChangeLog,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- ChangeLog 21 Aug 2006 06:08:43 -0000 1.16 +++ ChangeLog 6 Mar 2007 01:36:22 -0000 1.17 @@ -1,3 +1,20 @@ +Tue Mar 6 12:21:30 2007 mvsfnet <mv...@us...> + + * pptpconfig.php: tracker item 1662620 CLI patches. + + pptpconfig.php fails from the command line because the pipe to + pppd is set to nonblocking, the reader function is reached much + faster than under the GUI, fgets returns an empty line as pppd + hasn't output anything yet, and the else GUI case loops on while + line is not blank, when it should be looping until feof. There's a + === typo in that while too. + + While at it added a couple of $use_gui checks, as gui + functions/settings are being called/done even when the code is + running from the gui, and attempted to include a patch similar to + one in the list to make pptpconfig.php runable from the command + line, i.e. no env DISPLAY variable. + Mon Aug 21 15:32:58 2006 James Cameron <qu...@us...> * pptpconfig-20060821: released. Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/NEWS,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- NEWS 19 Jul 2006 06:13:06 -0000 1.11 +++ NEWS 6 Mar 2007 01:36:22 -0000 1.12 @@ -1,3 +1,4 @@ + - CLI patches [ 1662620 anonymous ] - add command line start, stop and status options [DiVerdi] - call setsid() to prevent process group kill hitting parent [Cameron] Index: pptpconfig.php =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/pptpconfig.php,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- pptpconfig.php 21 Aug 2006 06:19:12 -0000 1.12 +++ pptpconfig.php 6 Mar 2007 01:36:22 -0000 1.13 @@ -27,9 +27,6 @@ # $Id$ "; -# load the php-gtk functions -dl("php_gtk.so"); - # paths and files # root path, change to ./ for non-root testing @@ -96,25 +93,6 @@ # process group kill from going beyond us posix_setsid(); -# define text highlight colours -$colours['no'] = &new GdkColor(0, 0, 0); -$colours['me'] = &new GdkColor(32768, 0, 32768); -$colours['tx'] = &new GdkColor(0, 32768, 32768); -$colours['rx'] = &new GdkColor(32768, 32768, 0); -$colours['uh'] = &new GdkColor(32768, 0, 0); -$colours['ok'] = &new GdkColor(0, 32768, 0); - -$colours['red'] = &new GdkColor(65535, 32768, 32768); -$colours['green'] = &new GdkColor(32768, 65535, 32768); -$colours['blue'] = &new GdkColor(32768, 32768, 65535); -$colours['red-selected'] = &new GdkColor(0x9c9c, 0, 0); -$colours['green-selected'] = &new GdkColor(0, 0x7070, 0); -$colours['blue-selected'] = &new GdkColor(0, 0, 0x9c9c); - -# point at the glade file containing the widget tree -$xml = $me.'.xml'; -if (!@is_readable($xml)) $xml = PATH_LIB.$me.'.xml'; - $use_gui = TRUE; $quiet = FALSE; @@ -165,6 +143,27 @@ exit(0); } +# load the php-gtk functions +dl("php_gtk.so"); + +# define text highlight colours +$colours['no'] = &new GdkColor(0, 0, 0); +$colours['me'] = &new GdkColor(32768, 0, 32768); +$colours['tx'] = &new GdkColor(0, 32768, 32768); +$colours['rx'] = &new GdkColor(32768, 32768, 0); +$colours['uh'] = &new GdkColor(32768, 0, 0); +$colours['ok'] = &new GdkColor(0, 32768, 0); + +$colours['red'] = &new GdkColor(65535, 32768, 32768); +$colours['green'] = &new GdkColor(32768, 65535, 32768); +$colours['blue'] = &new GdkColor(32768, 32768, 65535); +$colours['red-selected'] = &new GdkColor(0x9c9c, 0, 0); +$colours['green-selected'] = &new GdkColor(0, 0x7070, 0); +$colours['blue-selected'] = &new GdkColor(0, 0, 0x9c9c); + +# point at the glade file containing the widget tree +$xml = $me.'.xml'; +if (!@is_readable($xml)) $xml = PATH_LIB.$me.'.xml'; function usage() { echo "usage: $argv[0] [-q] [tunnel {start|stop|status}]\n"; exit(1); @@ -816,7 +815,9 @@ $pipe = popen($command.' 2>&1', 'r'); stream_set_blocking($pipe, true); while (!feof($pipe)) { - while(Gtk::events_pending()) Gtk::main_iteration(); + if ($use_gui) { + while(Gtk::events_pending()) Gtk::main_iteration(); + } $text .= fgets($pipe, 2048); } $status = pclose($pipe); @@ -1368,10 +1369,10 @@ function reader($ignore, $ignore, $context) { global $me, $gtk_inputs, $use_gui, $quiet; - $line = fgets($context['pipe'], 1024); if ($use_gui) { # in the gui, the reader is a callback that processes on line at a time - if (!($line == false)) { + if (!feof($context['pipe'])) { + $line = fgets($context['pipe'], 1024); scribe($context, $line); if (ereg("Using interface (ppp[0-9]*)", $line, $regs)) { @@ -1394,7 +1395,8 @@ } } else { # in the CLI, reader should read all input right away - while (!($line === false)) { + while (!feof($context['pipe'])) { + $line = fgets($context['pipe'], 1024); scribe($context, $line); if (ereg("Using interface (ppp[0-9]*)", $line, $regs)) { @@ -1406,8 +1408,6 @@ if (ereg('^remote IP address ([0-9.]*)', $line, $regs)) { $context['remoteip'] = $regs[1]; } - - $line = fgets($context['pipe'], 1024); } } @@ -1454,13 +1454,15 @@ $state = 'initialising'; if ($state == 'stopping') { - $statusbar->push($window->get_data('id'), 'Stopped'); - $window->set_data('state', 'stopped'); - setup_list_set_state($context['name'], 'stopped'); + if ($use_gui) { + $statusbar->push($window->get_data('id'), 'Stopped'); + $window->set_data('state', 'stopped'); + setup_list_set_state($context['name'], 'stopped'); + $stop->set_sensitive(0); + $ping->set_sensitive(0); + $start->set_sensitive(1); + } scribe($context, "$me: stopped\n"); - $stop->set_sensitive(0); - $ping->set_sensitive(0); - $start->set_sensitive(1); } else { if ($use_gui ) $interface = $window->get_data('interface'); @@ -1746,8 +1748,10 @@ # if it was stopped, change to initialising, clear the old log if ($state == 'stopped') { $state = 'initialising'; - $text = $gx[$name]->get_widget('text'); - $text->delete_text(0, -1); + if ($use_gui) { + $text = $gx[$name]->get_widget('text'); + $text->delete_text(0, -1); + } } # if it is now initialising, start the pppd process @@ -1801,9 +1805,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...> - 2006-12-18 22:26:41
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig/debian In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv904/debian Modified Files: changelog rules Log Message: Index: changelog =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/debian/changelog,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- changelog 10 Apr 2006 01:12:20 -0000 1.5 +++ changelog 18 Dec 2006 22:26:32 -0000 1.6 @@ -1,3 +1,9 @@ +pptpconfig (20060821-0) unstable; urgency=low + + * update version + + -- James Cameron <qu...@us...> Mon, 21 Aug 2006 16:10:08 +1000 + pptpconfig (20060410-0) unstable; urgency=low * update version Index: rules =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/debian/rules,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- rules 2 Jan 2006 20:13:43 -0000 1.2 +++ rules 18 Dec 2006 22:26:32 -0000 1.3 @@ -6,7 +6,7 @@ #export DH_VERBOSE=1 # This is the debhelper compatibility version to use. -export DH_COMPAT=3 +export DH_COMPAT=4 build: build-stamp build-stamp: |
|
From: James C. <qu...@us...> - 2006-12-18 22:26:41
|
Update of /cvsroot/pptpclient/pptp-extras/pptp-php-gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv904 Modified Files: NEWS Log Message: Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptp-php-gtk/NEWS,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- NEWS 5 Jun 2004 12:23:52 -0000 1.11 +++ NEWS 18 Dec 2006 22:26:32 -0000 1.12 @@ -1,3 +1,41 @@ +2006-08-21 add command line start + + - add version of pptp to debug log [Cameron] + - add command line start, stop and status options [DiVerdi] + - call setsid() to prevent process group kill hitting parent [Cameron] + +2006-04-10 fix resolv.conf undo + + - do not undo routes added to tunnel interface [Cameron] + - do not cease processing undo list if error occurs [Cameron] + +2006-02-22 added resolvconf support + + - fix modinfo probe to use either ppp_mppe or ppp_mppe_mppc [Cameron] + - add support for resolvconf [King] + +2006-02-14 mostly trivial fixes + + - replace route to server instead of adding it [McNair] + - allow start and stop after connection goes away [Ross] + - probe ppp-compress-18 instead of ppp_mppe + +2004-07-22 released + +2004-06-19 released + +2004-05-19 package rename and php upgrade release + + - fix PHP-GTK pipe difficulties (no obvious output change) + - fix screen lockup on ping command + - replace rather than delete and add route in all-to-tunnel mode + - re-layout routing tab in GUI + - change list heading to "PPTP Client Tunnel List" + - change main window name to "pptpconfig" + - add refuse-eap option in encryption tab + - rework tooltips for clarity and technical accuracy + - rename to pptpconfig to comply with PHP license conditions + 2004-06-05 fedora core 2 compatibility release - add a route to the tunnel server to try to avoid loops |
|
From: James C. <qu...@us...> - 2006-12-18 22:26:16
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv531 Modified Files: RELEASING Log Message: Index: RELEASING =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/RELEASING,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- RELEASING 21 Aug 2006 06:08:43 -0000 1.10 +++ RELEASING 18 Dec 2006 22:26:05 -0000 1.11 @@ -41,7 +41,6 @@ make deb # release debian package -cd /home/james/pptp-client/pptp-extras/pptpconfig/ cp pptpconfig_${VERSION}-0_all.deb ~/public_html/external/mine/pptp/pptpconfig/ # make package lists |
|
From: James C. <qu...@us...> - 2006-12-15 05:05:52
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19115 Modified Files: .cvsignore AUTHORS ChangeLog NEWS pptp_gre.c Log Message: ignore transient send errors [Adda] Index: .cvsignore =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- .cvsignore 30 Dec 2002 04:29:42 -0000 1.1 +++ .cvsignore 15 Dec 2006 05:05:51 -0000 1.2 @@ -1,2 +1,3 @@ config.h pptp +pptpsetup.8 Index: AUTHORS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/AUTHORS,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- AUTHORS 4 Apr 2006 23:54:32 -0000 1.15 +++ AUTHORS 15 Dec 2006 05:05:51 -0000 1.16 @@ -22,6 +22,7 @@ Paul Howarth <pa...@ci...> Peter Surda <shu...@ro...> Nelson Ferraz <nf...@gm...> +Michael Adda <mi...@ha...> 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.110 retrieving revision 1.111 diff -u -d -r1.110 -r1.111 --- ChangeLog 15 Dec 2006 04:40:49 -0000 1.110 +++ ChangeLog 15 Dec 2006 05:05:51 -0000 1.111 @@ -1,3 +1,8 @@ +Fri Dec 15 02:02:08 2006 Michael Adda <mi...@ha...> + + * pptp_gre.c: when we fail to write due to a transient error + simply ignore it (treat it as a drop). + Thu Oct 12 13:52:46 2006 James Cameron <qu...@us...> * pptp_gre.c (pptp_gre_copy): select(2) may return error, and the Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- NEWS 15 Dec 2006 04:40:49 -0000 1.54 +++ NEWS 15 Dec 2006 05:05:51 -0000 1.55 @@ -1,3 +1,4 @@ +- ignore transient send errors [Adda] - fix flaw in return status check of select in GRE pipe [Cameron] - add route to PPTP server [Cameron] - remove non-free reference documentation [Cameron] Index: pptp_gre.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_gre.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- pptp_gre.c 15 Dec 2006 04:40:49 -0000 1.41 +++ pptp_gre.c 15 Dec 2006 05:05:51 -0000 1.42 @@ -479,6 +479,8 @@ ack_sent = seq_recv; rc = write(fd, &u.header, sizeof(u.header) - sizeof(u.header.seq)); if (rc < 0) { + if (errno == ENOBUFS) + rc = 0; /* Simply ignore it */ stats.tx_failed++; } else if (rc < sizeof(u.header) - sizeof(u.header.seq)) { stats.tx_short++; @@ -511,6 +513,8 @@ /* print_packet(2, u.buffer, header_len + len); */ rc = write(fd, u.buffer, header_len + len); if (rc < 0) { + if (errno == ENOBUFS) + rc = 0; /* Simply ignore it */ stats.tx_failed++; } else if (rc < header_len + len) { stats.tx_short++; |
|
From: James C. <qu...@us...> - 2006-12-15 04:40:59
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10245 Modified Files: ChangeLog NEWS pptp_gre.c Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/ChangeLog,v retrieving revision 1.109 retrieving revision 1.110 diff -u -d -r1.109 -r1.110 --- ChangeLog 17 Aug 2006 04:39:28 -0000 1.109 +++ ChangeLog 15 Dec 2006 04:40:49 -0000 1.110 @@ -1,3 +1,9 @@ +Thu Oct 12 13:52:46 2006 James Cameron <qu...@us...> + + * pptp_gre.c (pptp_gre_copy): select(2) may return error, and the + code was checking the read file descriptors without checking if + they are valid. + Thu Aug 17 14:36:18 2006 James Cameron <qu...@us...> * Makefile: add pptpsetup man page using pod2man. Index: NEWS =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/NEWS,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- NEWS 17 Aug 2006 04:39:28 -0000 1.53 +++ NEWS 15 Dec 2006 04:40:49 -0000 1.54 @@ -1,3 +1,4 @@ +- fix flaw in return status check of select in GRE pipe [Cameron] - add route to PPTP server [Cameron] - remove non-free reference documentation [Cameron] - fix quoting and pppd options [Lundqvist] Index: pptp_gre.c =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/pptp_gre.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- pptp_gre.c 2 Aug 2006 06:22:34 -0000 1.40 +++ pptp_gre.c 15 Dec 2006 04:40:49 -0000 1.41 @@ -155,7 +155,7 @@ tv.tv_usec %= 1000000; } retval = select(max_fd + 1, &rfds, NULL, NULL, tvp); - if (FD_ISSET(pty_fd, &rfds)) { + if (retval > 0 && FD_ISSET(pty_fd, &rfds)) { if (decaps_hdlc(pty_fd, encaps_gre, gre_fd) < 0) break; } else if (retval == 0 && ack_sent != seq_recv) { @@ -163,7 +163,7 @@ /* send ack with no payload */ encaps_gre(gre_fd, NULL, 0); } - if (FD_ISSET(gre_fd, &rfds)) { + if (retval > 0 && FD_ISSET(gre_fd, &rfds)) { if (decaps_gre (gre_fd, encaps_hdlc, pty_fd) < 0) break; } |
|
From: James C. <qu...@us...> - 2006-09-18 01:50:15
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv922 Modified Files: TODO Log Message: Index: TODO =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/TODO,v retrieving revision 1.28 retrieving revision 1.29 diff -u -d -r1.28 -r1.29 --- TODO 11 Sep 2006 23:00:00 -0000 1.28 +++ TODO 18 Sep 2006 01:50:05 -0000 1.29 @@ -1,3 +1,10 @@ +18th September 2006 + +https://sourceforge.net/tracker/?func=detail&atid=407155&aid=1560433&group_id=33063 + +Feature request, add code to attempt multiple IPs in a round-robin DNS +rotation. + 12th September 2006 https://sourceforge.net/tracker/?func=detail&atid=407152&aid=1556506&group_id=33063 |
|
From: James C. <qu...@us...> - 2006-09-14 22:47:42
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14119 Modified Files: TODO Log Message: Index: TODO =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/TODO,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- TODO 6 Apr 2006 06:16:23 -0000 1.6 +++ TODO 14 Sep 2006 22:47:37 -0000 1.7 @@ -1,3 +1,6 @@ +origin: Sergio Lopez, 15th September 2006. +bug report: command line mode still requires DISPLAY +-- origin: Michael D. Adams, 20th March 2006, and Samuel Audet, 12th October 2005. bug report: if the server has multiple IP addresses, one IP may be used for the tunnel connection and another IP for the routing changes. |
|
From: James C. <qu...@us...> - 2006-09-11 23:00:09
|
Update of /cvsroot/pptpclient/pptp-linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17308 Modified Files: TODO Log Message: #1556506 Index: TODO =================================================================== RCS file: /cvsroot/pptpclient/pptp-linux/TODO,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- TODO 13 Feb 2006 04:13:16 -0000 1.27 +++ TODO 11 Sep 2006 23:00:00 -0000 1.28 @@ -1,3 +1,9 @@ +12th September 2006 + +https://sourceforge.net/tracker/?func=detail&atid=407152&aid=1556506&group_id=33063 + +Add call-id as quirk or command-line option. + 13th February 2006 pty write may block, which prevents read, according to patch #502930 on |
|
From: Paul H. <pg...@us...> - 2006-08-21 13:45:34
|
Update of /cvsroot/pptpclient/specs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19961 Modified Files: pptpconfig.spec Log Message: update to 20060821 expand tabs escape macros in changelog Index: pptpconfig.spec =================================================================== RCS file: /cvsroot/pptpclient/specs/pptpconfig.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- pptpconfig.spec 18 Apr 2006 11:03:17 -0000 1.12 +++ pptpconfig.spec 21 Aug 2006 13:45:25 -0000 1.13 @@ -15,32 +15,32 @@ %define desktop_vendor PPTP %{!?__id_u: %define __id_u %([ -x /bin/id ]&&echo /bin/id||([ -x /usr/bin/id ]&&echo /usr/bin/id||echo /bin/true)) -u} -Summary: Point-to-Point Tunneling Protocol (PPTP) Client Configuration GUI -Name: pptpconfig -Version: 20060410 -Release: %{?beta:0.%{beta}.}1%{?dist} -Distribution: PPTP Client Project -URL: http://quozl.netrek.org/pptp/pptpconfig/ -Source0: http://quozl.netrek.org/pptp/pptpconfig/pptpconfig-%{version}.tar.gz -Source1: pptpconfig.png -Source2: pptpconfig.pam -Patch1: pptpconfig-desktop.patch -Patch2: pptpconfig-desktop-suse.patch -License: GPL +Summary: Point-to-Point Tunneling Protocol (PPTP) Client Configuration GUI +Name: pptpconfig +Version: 20060821 +Release: %{?beta:0.%{beta}.}1%{?dist} +Distribution: PPTP Client Project +URL: http://quozl.netrek.org/pptp/pptpconfig/ +Source0: http://quozl.netrek.org/pptp/pptpconfig/pptpconfig-%{version}.tar.gz +Source1: pptpconfig.png +Source2: pptpconfig.pam +Patch1: pptpconfig-desktop.patch +Patch2: pptpconfig-desktop-suse.patch +License: GPL %if %{?_with_suse:0}%{!?_with_suse:1} -Group: Applications/Internet -Requires: usermode >= 1.36 +Group: Applications/Internet +Requires: usermode >= 1.36 %else -Group: Productivity/Networking/PPP -Requires: xsu +Group: Productivity/Networking/PPP +Requires: xsu %endif -Requires: ppp >= 2.4.2, pptp >= 1.2.0, php%{private_suffix}-gtk, php%{private_suffix} >= 4.3.9-2 -Requires: iproute%{?_with_mandriva:2} -BuildRequires: desktop-file-utils, symlinks -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Obsoletes: pptp-php-gtk -Provides: pptp-php-gtk -BuildArch: noarch +Requires: ppp >= 2.4.2, pptp >= 1.2.0, php%{private_suffix}-gtk, php%{private_suffix} >= 4.3.9-2 +Requires: iproute%{?_with_mandriva:2} +BuildRequires: desktop-file-utils, symlinks +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Obsoletes: pptp-php-gtk +Provides: pptp-php-gtk +BuildArch: noarch %description Graphical user interface for PPTP Client. Supports configuration of tunnels, @@ -65,18 +65,18 @@ # Some directory names hardcoded here because they are hardcoded in the PHP script %{__rm} -rf %{buildroot} %{__make} bindir=%{_bindir} \ - sbindir=%{_sbindir} \ - sysconfdir=/etc \ - datadir=%{_datadir} \ - DESTDIR=%{buildroot} \ - INSTALL="%{__install} -p" \ - install%{!?_with_suse: install-pam} + sbindir=%{_sbindir} \ + sysconfdir=/etc \ + datadir=%{_datadir} \ + DESTDIR=%{buildroot} \ + INSTALL="%{__install} -p" \ + install%{!?_with_suse: install-pam} %{__install} -D -m 0444 -p pptpconfig.png %{buildroot}/%{_datadir}/pixmaps/pptpconfig.png /usr/bin/desktop-file-install \ - --vendor %{desktop_vendor} \ - --delete-original \ + --vendor %{desktop_vendor} \ + --delete-original \ --dir %{buildroot}%{_datadir}/applications \ - %{buildroot}%{_datadir}/applications/pptpconfig.desktop + %{buildroot}%{_datadir}/applications/pptpconfig.desktop # Fix absolute symlink %{__rm} -f %{buildroot}%{_sbindir}/pptpconfig cd %{buildroot}%{_sbindir} @@ -90,7 +90,7 @@ %post # Attempt to migrate tunnels from old pptp-php-gtk package if [ ! -f /etc/pptpconfig/tunnels -a -f /etc/pptp-php-gtk/tunnels ]; then - %{__cp} -p /etc/pptp-php-gtk/tunnels /etc/pptpconfig/tunnels + %{__cp} -p /etc/pptp-php-gtk/tunnels /etc/pptpconfig/tunnels fi /usr/bin/update-desktop-database %{_datadir}/applications &>/dev/null || : @@ -113,6 +113,9 @@ %doc AUTHORS COPYING DEVELOPERS NEWS README TODO ChangeLog %changelog +* Mon Aug 21 2006 Paul Howarth <pa...@ci...> 20060821-1 +- update to 20060821 + * Thu Apr 13 2006 Paul Howarth <pa...@ci...> 20060410-1 - update to 20060410 - use php4-pcntl instead of php-pcntl (virtual provides issue) @@ -165,10 +168,10 @@ - update to new version 20040722 (a week early?) * Thu Jul 15 2004 Paul Howarth <pa...@ci...> 20040619-2 -- hardcode paths for /etc instead of using %{_sysconfdir}, just like +- hardcode paths for /etc instead of using %%{_sysconfdir}, just like Red Hat do, as this actually helps portability - make /etc/pam.d/pptpconfig & /etc/security/console.apps/pptpconfig - %config files, so that users keep their changes on upgrade + %%config files, so that users keep their changes on upgrade - use desktop-file-install for the desktop entry - remove BuildRequires: perl, no longer needed |
|
From: James C. <qu...@us...> - 2006-08-21 06:19:15
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17497 Modified Files: pptpconfig.php Log Message: typo Index: pptpconfig.php =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/pptpconfig.php,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- pptpconfig.php 21 Aug 2006 06:07:11 -0000 1.11 +++ pptpconfig.php 21 Aug 2006 06:19:12 -0000 1.12 @@ -121,7 +121,7 @@ # check for the optional quiet flag $argidx = 1; if ($argv[$argidx]=='-q') { - quiet = TRUE; + $quiet = TRUE; $argidx++; } |
|
From: James C. <qu...@us...> - 2006-08-21 06:08:46
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13885 Modified Files: ChangeLog RELEASING Log Message: pre-release 20060821 Index: ChangeLog =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/ChangeLog,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- ChangeLog 19 Jul 2006 06:13:06 -0000 1.15 +++ ChangeLog 21 Aug 2006 06:08:43 -0000 1.16 @@ -1,3 +1,12 @@ +Mon Aug 21 15:32:58 2006 James Cameron <qu...@us...> + + * pptpconfig-20060821: released. + +Mon Aug 14 10:10:23 2006 James Cameron <qu...@us...> + + * pptpconfig.php: add version of pptp, now that pptp understands + --version flag. + Wed Jul 19 15:19:35 2006 Stephen DiVerdi <sdi...@cs...> * pptpconfig.php: add start, stop and status options. Index: RELEASING =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/RELEASING,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- RELEASING 21 Aug 2006 05:58:38 -0000 1.9 +++ RELEASING 21 Aug 2006 06:08:43 -0000 1.10 @@ -15,7 +15,7 @@ # commit version changes to cvs cvs diff > tmp.diff emacsclient tmp.diff -cvs commit -m 'pre-release $VERSION' +cvs commit -m "pre-release $VERSION" # note that version in welcome message depends on CVS ident tag # make package |
|
From: James C. <qu...@us...> - 2006-08-21 06:07:14
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13315 Modified Files: pptpconfig.php Log Message: pre-release $VERSION Index: pptpconfig.php =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/pptpconfig.php,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- pptpconfig.php 19 Jul 2006 06:13:06 -0000 1.10 +++ pptpconfig.php 21 Aug 2006 06:07:11 -0000 1.11 @@ -1781,6 +1781,7 @@ scribe($context, "$me: debug information dump begins\n"); scribe($context, "WARNING: security sensitive information follows\n"); scribe($context, id() . "\n"); + scribe($context, "# pptp --version\n" . `pptp --version 2>&1`); scribe($context, "# pppd --version\n" . `pppd --version 2>&1`); scribe($context, "# uname -a\n" . `uname -a`); scribe($context, "# modinfo ppp_mppe || modinfo ppp_mppe_mppc\n" . `modinfo ppp_mppe || modinfo ppp_mppe_mppc`); |
|
From: James C. <qu...@us...> - 2006-08-21 06:01:34
|
Update of /cvsroot/pptpclient/pptp-extras/pptpconfig In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11354 Modified Files: Makefile Log Message: pre-release $VERSION Index: Makefile =================================================================== RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/Makefile,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- Makefile 10 Apr 2006 01:02:24 -0000 1.8 +++ Makefile 21 Aug 2006 06:01:31 -0000 1.9 @@ -1,4 +1,4 @@ -VERSION=20060410 +VERSION=20060821 PACKAGE=pptpconfig sbindir=/usr/sbin bindir=/usr/bin |
1 message has been excluded from this view by a project administrator.
