strongswan4: uClibc-0.9.31 fix

SVN-Revision: 23848

diff --git a/net/strongswan4/patches/202-clone.patch b/net/strongswan4/patches/202-clone.patch
index fdcd0e483dfdcd03324a952dd9b6d11f83b6ffb7..88dc5d9afb3ed6353a9ba1d89bb4c9c9321abce3 100644 (file)
--- a/net/strongswan4/patches/202-clone.patch
+++ b/net/strongswan4/patches/202-clone.patch
@@ -1,6 +1,8 @@
---- a/src/libstrongswan/utils/identification.c
-+++ b/src/libstrongswan/utils/identification.c
-@@ -798,7 +798,7 @@ int identification_printf_hook(char *dst
+Index: strongswan-4.3.7/src/libstrongswan/utils/identification.c
+===================================================================
+--- strongswan-4.3.7.orig/src/libstrongswan/utils/identification.c     2010-11-04 01:34:00.492000001 +0100
++++ strongswan-4.3.7/src/libstrongswan/utils/identification.c  2010-11-04 01:34:06.791999987 +0100
+@@ -810,7 +810,7 @@
        return print_in_hook(dst, len, "%*s", spec->width, buf);
  }
  
@@ -9,7 +11,7 @@
        private_identification_t *this)
  {
        private_identification_t *clone = malloc_thing(private_identification_t);
-@@ -830,7 +830,7 @@ static private_identification_t *identif
+@@ -842,7 +842,7 @@
                        .get_encoding = _get_encoding,
                        .get_type = _get_type,
                        .create_part_enumerator = _create_part_enumerator,

diff --git a/net/strongswan4/patches/300-compile-fixes.patch b/net/strongswan4/patches/300-compile-fixes.patch
new file mode 100644 (file)
index 0000000..5a33ab2
--- /dev/null
+++ b/net/strongswan4/patches/300-compile-fixes.patch
@@ -0,0 +1,13 @@
+Index: strongswan-4.3.7/src/pluto/adns.c
+===================================================================
+--- strongswan-4.3.7.orig/src/pluto/adns.c     2010-11-04 01:34:39.497000001 +0100
++++ strongswan-4.3.7/src/pluto/adns.c  2010-11-04 01:35:10.609000001 +0100
+@@ -179,7 +179,7 @@
+       res_query(dname, class, type, answer, anslen)
+ # define res_nclose(statp) res_close()
+ 
+-static struct __res_state *statp = &_res;
++#define statp ((struct __res_state *)(&_res))
+ 
+ #else /* !OLD_RESOLVER */
+