[Ipcop-svn] SF.net SVN: ipcop:[7408] ipcop/trunk

[owes]

Revision: 7408
          http://sourceforge.net/p/ipcop/svn/7408
Author:   owes
Date:     2014-04-04 15:18:49 +0000 (Fri, 04 Apr 2014)
Log Message:
-----------
Update pptp to 1.8.0. PPTP currently untested! 

Modified Paths:
--------------
    ipcop/trunk/lfs/pptp
    ipcop/trunk/updates/2.1.4/ROOTFILES.i486-2.1.4
    ipcop/trunk/updates/2.1.4/information.xml

Removed Paths:
-------------
    ipcop/trunk/src/patches/pptp-1.7.2_ip-path.patch

Modified: ipcop/trunk/lfs/pptp
===================================================================
--- ipcop/trunk/lfs/pptp        2014-04-04 15:13:43 UTC (rev 7407)
+++ ipcop/trunk/lfs/pptp        2014-04-04 15:18:49 UTC (rev 7408)
@@ -33,7 +33,7 @@
 include Config
 
 PKG_NAME   = pptp
-VER        = 1.7.2
+VER        = 1.8.0
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
@@ -51,7 +51,7 @@
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 4c3d19286a37459a632c7128c92a9857
+$(DL_FILE)_MD5 = 4efce9f263e2c3f38d79d9df222476de
 
 install : $(TARGET)
 
@@ -81,8 +81,6 @@
 $(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-       # fix ip command hardcoded path
-       cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)_ip-path.patch
 
        # force Makefile to use our 'C,LD}FLAGS
        cd $(DIR_APP) && make OPTIMIZE= DEBUG= CFLAGS="$(CFLAGS)" 
LDFLAGS="$(LDFLAGS)"

Deleted: ipcop/trunk/src/patches/pptp-1.7.2_ip-path.patch
===================================================================
--- ipcop/trunk/src/patches/pptp-1.7.2_ip-path.patch    2014-04-04 15:13:43 UTC 
(rev 7407)
+++ ipcop/trunk/src/patches/pptp-1.7.2_ip-path.patch    2014-04-04 15:18:49 UTC 
(rev 7408)
@@ -1,29 +0,0 @@
-diff -Nru 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       2009-09-16 23:28:11.000000000 +0200
-@@ -55,7 +55,7 @@
- 
- 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_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);
- }

Modified: ipcop/trunk/updates/2.1.4/ROOTFILES.i486-2.1.4
===================================================================
--- ipcop/trunk/updates/2.1.4/ROOTFILES.i486-2.1.4      2014-04-04 15:13:43 UTC 
(rev 7407)
+++ ipcop/trunk/updates/2.1.4/ROOTFILES.i486-2.1.4      2014-04-04 15:18:49 UTC 
(rev 7408)
@@ -31,6 +31,9 @@
 /usr/lib/pppd/2.4.6/rp-pppoe.so
 /usr/lib/pppd/2.4.6/winbind.so
 ##
+## pptp-1.8.0
+/usr/sbin/pptp
+##
 ## rrdtool-1.4.8
 /usr/bin/rrdtool
 /usr/lib/perl5/site_perl/5.14.2/i486-linux/RRDs.pm

Modified: ipcop/trunk/updates/2.1.4/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.4/information.xml   2014-04-04 15:13:43 UTC (rev 
7407)
+++ ipcop/trunk/updates/2.1.4/information.xml   2014-04-04 15:18:49 UTC (rev 
7408)
@@ -5,7 +5,7 @@
         <size>0</size>
         <isoimages>yes</isoimages>
         <description>Upgrade e1000e network driver to 3.0.4.1, igb network 
driver to 5.2.5, linux kernel to 3.4.86,
-            ppp to 2.4.6, rrdtool to 1.4.8.
+            ppp to 2.4.6, pptp to 1.8.0, rrdtool to 1.4.8.
             &lt;br /&gt;
             &lt;b&gt;Mandatory reboot after upgrade.&lt;/b&gt;
         </description>

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn