packages: pptp/pptp.spec, pptp/pptp-ip.patch (NEW) - fixed path to ip binar...

[megabajt]

Author: megabajt                     Date: Thu Mar 10 19:14:50 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed path to ip binary (patch by Adam Osuchowski)
- release 2

---- Files affected:
packages/pptp:
   pptp.spec (1.13 -> 1.14) , pptp-ip.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/pptp/pptp.spec
diff -u packages/pptp/pptp.spec:1.13 packages/pptp/pptp.spec:1.14
--- packages/pptp/pptp.spec:1.13	Sat May 22 19:45:37 2010
+++ packages/pptp/pptp.spec	Thu Mar 10 20:14:45 2011
@@ -3,11 +3,12 @@
 Summary(pl.UTF-8):	Klient protokołu PPTP (Point-to-Point Tunneling Protocol)
 Name:		pptp
 Version:	1.7.2
-Release:	1
+Release:	2
 License:	GPL
 Group:		Networking/Admin
 Source0:	http://dl.sourceforge.net/pptpclient/%{name}-%{version}.tar.gz
 # Source0-md5:	4c3d19286a37459a632c7128c92a9857
+Patch0:		%{name}-ip.patch
 URL:		http://pptpclient.sourceforge.net/
 Requires:	ppp >= 2.4.2
 Provides:	pptp-linux
@@ -28,12 +29,14 @@
 
 %prep
 %setup -q
+%patch0 -p1
 %{__sed} -i -e 's/install -o root -m 555 pptp/install -m 755 pptp/' Makefile
 
 %build
 %{__make} \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags}"
+	CFLAGS="%{rpmcflags}" \
+	LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,6 +64,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2011/03/10 19:14:45  megabajt
+- fixed path to ip binary (patch by Adam Osuchowski)
+- release 2
+
 Revision 1.13  2010/05/22 17:45:37  gotar
 - fixed Group
 

================================================================
Index: packages/pptp/pptp-ip.patch
diff -u /dev/null packages/pptp/pptp-ip.patch:1.1
--- /dev/null	Thu Mar 10 20:14:50 2011
+++ packages/pptp/pptp-ip.patch	Thu Mar 10 20:14:45 2011
@@ -0,0 +1,29 @@
+diff -ruNp pptp-1.7.2.orig/routing.c pptp-1.7.2/routing.c
+--- pptp-1.7.2.orig/routing.c	2008-05-14 08:33:55.000000000 +0200
++++ pptp-1.7.2/routing.c	2011-03-05 18:23:02.923155932 +0100
+@@ -55,7 +55,7 @@ regardless (not yet implemented).
+ 
+ void routing_init(char *ip) {
+   char buf[256];
+-  snprintf(buf, 255, "/bin/ip route get %s", ip);
++  snprintf(buf, 255, "/sbin/ip route get %s", ip);
+   FILE *p = popen(buf, "r");
+   fgets(buf, 255, p);
+   /* TODO: check for failure of fgets */
+@@ -66,14 +66,14 @@ void routing_init(char *ip) {
+ 
+ void routing_start() {
+   char buf[256];
+-  snprintf(buf, 255, "/bin/ip route replace %s", route);
++  snprintf(buf, 255, "/sbin/ip route replace %s", route);
+   FILE *p = popen(buf, "r");
+   pclose(p);
+ }
+ 
+ void routing_end() {
+   char buf[256];
+-  snprintf(buf, 255, "/bin/ip route delete %s", route);
++  snprintf(buf, 255, "/sbin/ip route delete %s", route);
+   FILE *p = popen(buf, "r");
+   pclose(p);
+ }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pptp/pptp.spec?r1=1.13&r2=1.14&f=u