From f4e50548b0d41f5b4e6faae3ddc7283dd1a5dd6c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 31 Mar 2011 20:21:13 +0200
Subject: I am to tupid for git, today.

Revert "Revert "fix conflict, autoseect libgcj""

This reverts commit c2bd3a43342e37a05a97e12581dd2bd52993877a.
---
 .../ipsec-tools/patches/patch-src_racoon_privsep_c | 25 +++++++++++-----------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'package/ipsec-tools/patches/patch-src_racoon_privsep_c')

diff --git a/package/ipsec-tools/patches/patch-src_racoon_privsep_c b/package/ipsec-tools/patches/patch-src_racoon_privsep_c
index c69abd264..e8f678186 100644
--- a/package/ipsec-tools/patches/patch-src_racoon_privsep_c
+++ b/package/ipsec-tools/patches/patch-src_racoon_privsep_c
@@ -1,7 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- ipsec-tools-0.7.2.orig/src/racoon/privsep.c	2008-12-08 07:06:24.000000000 +0100
-+++ ipsec-tools-0.7.2/src/racoon/privsep.c	2009-05-29 15:55:47.787585131 +0200
-@@ -323,7 +323,7 @@ privsep_init(void)
+--- ipsec-tools-0.8.0.orig/src/racoon/privsep.c	2011-03-06 09:28:10.000000000 +0100
++++ ipsec-tools-0.8.0/src/racoon/privsep.c	2011-03-31 13:24:07.981813178 +0200
+@@ -359,7 +359,7 @@ privsep_init(void)
  			    strerror(errno));
  			goto out;
  		}
@@ -10,7 +9,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  		reply->hdr.ac_cmd = combuf->hdr.ac_cmd;
  		reply->hdr.ac_len = sizeof(*reply);
  
-@@ -421,7 +421,7 @@ privsep_init(void)
+@@ -457,7 +457,7 @@ privsep_init(void)
  				    strerror(errno));
  				goto out;
  			}
@@ -19,7 +18,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
  	
  			/*
-@@ -716,7 +716,7 @@ privsep_eay_get_pkcs1privkey(path) 
+@@ -903,7 +903,7 @@ privsep_eay_get_pkcs1privkey(path) 
  		    "Cannot allocate memory: %s\n", strerror(errno));
  		return NULL;
  	}
@@ -28,7 +27,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	msg->hdr.ac_cmd = PRIVSEP_EAY_GET_PKCS1PRIVKEY;
  	msg->hdr.ac_len = len;
  	msg->bufs.buflen[0] = len - sizeof(*msg);
-@@ -797,7 +797,7 @@ privsep_script_exec(script, name, envp)
+@@ -953,7 +953,7 @@ privsep_script_exec(script, name, envp)
  		return -1;
  	}
  
@@ -37,7 +36,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	msg->hdr.ac_cmd = PRIVSEP_SCRIPT_EXEC;
  	msg->hdr.ac_len = sizeof(*msg);
  
-@@ -906,7 +906,7 @@ privsep_getpsk(str, keylen)
+@@ -1062,7 +1062,7 @@ privsep_getpsk(str, keylen)
  		    "Cannot allocate memory: %s\n", strerror(errno));
  		return NULL;
  	}
@@ -46,7 +45,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	msg->hdr.ac_cmd = PRIVSEP_GETPSK;
  	msg->hdr.ac_len = len;
  
-@@ -960,7 +960,7 @@ privsep_xauth_login_system(usr, pwd)
+@@ -1334,7 +1334,7 @@ privsep_xauth_login_system(usr, pwd)
  		    "Cannot allocate memory: %s\n", strerror(errno));
  		return -1;
  	}
@@ -55,7 +54,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	msg->hdr.ac_cmd = PRIVSEP_XAUTH_LOGIN_SYSTEM;
  	msg->hdr.ac_len = len;
  
-@@ -1014,7 +1014,7 @@ privsep_accounting_system(port, raddr, u
+@@ -1389,7 +1389,7 @@ privsep_accounting_system(port, raddr, u
  		    "Cannot allocate memory: %s\n", strerror(errno));
  		return -1;
  	}
@@ -64,7 +63,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	msg->hdr.ac_cmd = PRIVSEP_ACCOUNTING_SYSTEM;
  	msg->hdr.ac_len = len;
  	msg->bufs.buflen[0] = sizeof(port);
-@@ -1187,7 +1187,7 @@ privsep_accounting_pam(port, inout)
+@@ -1643,7 +1643,7 @@ privsep_accounting_pam(port, inout)
  		    "Cannot allocate memory: %s\n", strerror(errno));
  		return -1;
  	}
@@ -73,7 +72,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	msg->hdr.ac_cmd = PRIVSEP_ACCOUNTING_PAM;
  	msg->hdr.ac_len = len;
  	msg->bufs.buflen[0] = sizeof(port);
-@@ -1248,7 +1248,7 @@ privsep_xauth_login_pam(port, raddr, usr
+@@ -1705,7 +1705,7 @@ privsep_xauth_login_pam(port, raddr, usr
  		    "Cannot allocate memory: %s\n", strerror(errno));
  		return -1;
  	}
@@ -82,7 +81,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  	msg->hdr.ac_cmd = PRIVSEP_XAUTH_LOGIN_PAM;
  	msg->hdr.ac_len = len;
  	msg->bufs.buflen[0] = sizeof(port);
-@@ -1312,7 +1312,7 @@ privsep_cleanup_pam(port)
+@@ -1770,7 +1770,7 @@ privsep_cleanup_pam(port)
  		    "Cannot allocate memory: %s\n", strerror(errno));
  		return;
  	}
-- 
cgit v1.2.3