- fixed path to ip binary (patch by Adam Osuchowski)

- release 2

Changed files:
    pptp-ip.patch -> 1.1
    pptp.spec -> 1.14

diff --git a/pptp-ip.patch b/pptp-ip.patch
new file mode 100644 (file)
index 0000000..c2a4b5f
--- /dev/null
+++ b/pptp-ip.patch
@@ -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);
+ }

diff --git a/pptp.spec b/pptp.spec
index 90fdc35cc4631460c22d6fd2fd33aa5dd825ddfe..acd028c2b244f0d8baac35db7ed002f60ddf540c 100644 (file)
--- a/pptp.spec
+++ b/pptp.spec
@@ -2,11 +2,12 @@ Summary:      Point-to-Point Tunneling Protocol (PPTP) Client
 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
@@ -27,12 +28,14 @@ obsugi MPPE w jądrze.
 
 %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