[pptpclient-commits] CVS: specs pptp-1.7.2-compat.patch, NONE, 1.1 pptp-1.7.2-declaration.patch, NONE, 1.1 pptp.spec, 1.11, 1.12 pptp-1.7.1-declaration.patch, 1.1, NONE

[Paul H. <pg...@us...>]

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 ---