up to 1.8.0

- ip patch replaced with new make flag

diff --git a/pptp-ip.patch b/pptp-ip.patch
deleted file mode 100644 (file)
index c2a4b5f..0000000
--- a/pptp-ip.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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 2dfee3ab43f302d514e6a5210ee5d90a5d2901ce..bd648bd910933158eb00ffbdeee94f70e0dc2c77 100644 (file)
--- a/pptp.spec
+++ b/pptp.spec
@@ -1,14 +1,13 @@
 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:       3
+Version:       1.8.0
+Release:       1
 License:       GPL
 Group:         Networking/Admin
 Source0:       http://downloads.sourceforge.net/pptpclient/%{name}-%{version}.tar.gz
-# Source0-md5: 4c3d19286a37459a632c7128c92a9857
+# Source0-md5: 4efce9f263e2c3f38d79d9df222476de
 Source1:       %{name}.tmpfiles
-Patch0:                %{name}-ip.patch
 URL:           http://pptpclient.sourceforge.net/
 Requires:      ppp >= 2.4.2
 Provides:      pptp-linux
@@ -29,14 +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}" \
-       LDFLAGS="%{rpmldflags}"
+       LDFLAGS="%{rpmldflags}" \
+       IP="/sbin/ip"
 
 %install
 rm -rf $RPM_BUILD_ROOT