Changeset 35312


Ignore:
Timestamp:
2013-01-24T12:35:58+01:00 (5 years ago)
Author:
jow
Message:

ipsec-tools: fix compilation against Linux 3.7, refresh patches

Location:
packages/net/ipsec-tools
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • packages/net/ipsec-tools/Makefile

    r28960 r35312  
    1919PKG_BUILD_PARALLEL:=1 
    2020PKG_INSTALL:=1 
     21 
     22PKG_FIXUP:=autoreconf 
    2123 
    2224include $(INCLUDE_DIR)/package.mk 
  • packages/net/ipsec-tools/patches/001-ipsec-tools-def-psk.patch

    r28102 r35312  
    1 diff -brau ipsec-tools-0.7.3.o/src/racoon/oakley.c ipsec-tools-0.7.3/src/racoon/oakley.c 
    2 --- a/src/racoon/oakley.c       2009-08-13 11:18:45.000000000 +0200 
    3 +++ b/src/racoon/oakley.c       2011-06-06 09:36:11.000000000 +0200 
    4 @@ -2498,8 +2498,21 @@ 
     1--- a/src/racoon/oakley.c 
     2+++ b/src/racoon/oakley.c 
     3@@ -2419,8 +2419,21 @@ oakley_skeyid(iph1) 
    54                                plog(LLV_ERROR, LOCATION, iph1->remote, 
    65                                        "couldn't find the pskey for %s.\n", 
  • packages/net/ipsec-tools/patches/002-patch8-utmp.patch

    r28102 r35312  
    1 diff -urN build_dir/linux-ar71xx_generic/ipsec-tools-0.8.0/src/racoon/isakmp_cfg.c build_dir/linux-ar71xx_generic/ipsec-tools-0.8.0a/src/racoon/isakmp_cfg.c 
    2 --- a/src/racoon/isakmp_cfg.c   2010-09-21 16:14:17.000000000 +0300 
    3 +++ b/src/racoon/isakmp_cfg.c   2011-07-13 11:52:16.000000000 +0300 
     1--- a/src/racoon/isakmp_cfg.c 
     2+++ b/src/racoon/isakmp_cfg.c 
    43@@ -38,7 +38,7 @@ 
    54 #include <sys/socket.h> 
    65 #include <sys/queue.h> 
    7  
     6  
    87-#include <utmpx.h> 
    98+#include <utmp.h> 
     
    1110 #include <util.h> 
    1211 #endif 
    13 @@ -1661,7 +1661,8 @@ 
     12@@ -1661,7 +1661,8 @@ isakmp_cfg_accounting_system(port, raddr 
    1413        int inout; 
    1514 { 
     
    2120         
    2221        if (usr == NULL || usr[0]=='\0') { 
    23 @@ -1670,34 +1671,37 @@ 
     22@@ -1670,34 +1671,37 @@ isakmp_cfg_accounting_system(port, raddr 
    2423                return -1; 
    2524        } 
    26  
     25  
    2726-       memset(&ut, 0, sizeof ut); 
    2827-       gettimeofday((struct timeval *)&ut.ut_tv, NULL); 
    2928-       snprintf(ut.ut_id, sizeof ut.ut_id, TERMSPEC, port); 
    3029+       sprintf(term, TERMSPEC, port); 
    31  
     30  
    3231        switch (inout) { 
    3332        case ISAKMP_CFG_LOGIN: 
     
    3938+               strncpy(ut.ut_line, term, UT_LINESIZE); 
    4039+               ut.ut_line[UT_LINESIZE - 1] = '\0'; 
    41  
     40  
    4241                GETNAMEINFO_NULL(raddr, addr); 
    4342-               strncpy(ut.ut_host, addr, sizeof ut.ut_host); 
     
    4645+ 
    4746+               ut.ut_time = time(NULL); 
    48  
     47  
    4948                plog(LLV_INFO, LOCATION, NULL, 
    5049                        "Accounting : '%s' logging on '%s' from %s.\n", 
     
    5352-               pututxline(&ut); 
    5453+                       ut.ut_name, ut.ut_line, ut.ut_host); 
    55  
     54  
    5655+               login(&ut); 
    5756+                
     
    5958        case ISAKMP_CFG_LOGOUT:  
    6059-               ut.ut_type = DEAD_PROCESS; 
    61  
     60  
    6261                plog(LLV_INFO, LOCATION, NULL, 
    6362                        "Accounting : '%s' unlogging from '%s'.\n", 
     
    6665-               pututxline(&ut); 
    6766+                       usr, term); 
    68  
     67  
    6968+               logout(term); 
    7069+                
  • packages/net/ipsec-tools/patches/003-microsoft-fqdn-in-main.patch

    r28102 r35312  
    1 diff -urN build_dir/linux-ar71xx_generic/ipsec-tools-0.8.0/src/racoon/ipsec_doi.c build_dir/linux-ar71xx_generic/ipsec-tools-0.8.0a/src/racoon/ipsec_doi.c 
    2 --- a/src/racoon/ipsec_doi.c    2010-12-14 19:57:31.000000000 +0200 
    3 +++ b/src/racoon/ipsec_doi.c    2011-07-13 12:07:44.000000000 +0300 
    4 @@ -3582,8 +3582,8 @@ 
     1--- a/src/racoon/ipsec_doi.c 
     2+++ b/src/racoon/ipsec_doi.c 
     3@@ -3582,8 +3582,8 @@ ipsecdoi_checkid1(iph1) 
    54            iph1->approval->authmethod == OAKLEY_ATTR_AUTH_METHOD_PSKEY) { 
    65                 if (id_b->type != IPSECDOI_ID_IPV4_ADDR 
Note: See TracChangeset for help on using the changeset viewer.