ipsec-tools: replace sysv3 legacy functions with modern equivalents
authorJulien Boibessot <julien.boibessot@armadeus.com>
Tue, 13 Jul 2010 15:35:31 +0000 (17:35 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Sun, 18 Jul 2010 22:17:09 +0000 (00:17 +0200)
Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/ipsec-tools/ipsec-tools-susv3-legacy.patch [new file with mode: 0644]

diff --git a/package/ipsec-tools/ipsec-tools-susv3-legacy.patch b/package/ipsec-tools/ipsec-tools-susv3-legacy.patch
new file mode 100644 (file)
index 0000000..ea98505
--- /dev/null
@@ -0,0 +1,35 @@
+Replaces sysv3 legacy functions with modern equivalents.
+
+Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com>
+Index: ipsec-tools-0.7.3/src/racoon/pfkey.c
+===================================================================
+--- ipsec-tools-0.7.3.orig/src/racoon/pfkey.c  2010-07-12 14:46:52.000000000 +0200
++++ ipsec-tools-0.7.3/src/racoon/pfkey.c       2010-07-12 15:01:39.000000000 +0200
+@@ -3008,12 +3008,12 @@
+                               struct sockaddr *paddr;
+                               paddr = (struct sockaddr *)(xisr + 1);
+-                              bcopy(paddr, &(*p_isr)->saidx.src,
++                              memmove(&(*p_isr)->saidx.src, paddr,
+                                       sysdep_sa_len(paddr));
+                               paddr = (struct sockaddr *)((caddr_t)paddr
+                                                       + sysdep_sa_len(paddr));
+-                              bcopy(paddr, &(*p_isr)->saidx.dst,
++                              memmove(&(*p_isr)->saidx.dst, paddr,
+                                       sysdep_sa_len(paddr));
+                       }
+Index: ipsec-tools-0.7.3/src/racoon/racoonctl.c
+===================================================================
+--- ipsec-tools-0.7.3.orig/src/racoon/racoonctl.c      2010-07-12 14:49:51.000000000 +0200
++++ ipsec-tools-0.7.3/src/racoon/racoonctl.c   2010-07-12 15:00:52.000000000 +0200
+@@ -785,7 +785,7 @@
+               errx(1, "cannot read source address");
+       /* We get "ip[port]" strip the port */
+-      if ((idx = index(srcaddr, '[')) == NULL) 
++      if ((idx = strchr(srcaddr, '[')) == NULL)
+               errx(1, "unexpected source address format");
+       *idx = '\0';