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

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

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