diff options
author | Timo Teräs <timo.teras@iki.fi> | 2014-03-07 10:47:35 +0200 |
---|---|---|
committer | Timo Teräs <timo.teras@iki.fi> | 2014-03-07 10:47:35 +0200 |
commit | 4b3e3f7ab3af18ea69b20f4f3b99e09d32b2989d (patch) | |
tree | 2d4d59fbd5e700405b01a00b50c9f506c24e53c9 /main/ipsec-tools/03-fix-sport-selection.patch | |
parent | cf69eaf36ac0a0befeca9bd6747dfe8ba2cc0aa9 (diff) | |
download | aports-4b3e3f7ab3af18ea69b20f4f3b99e09d32b2989d.tar.bz2 aports-4b3e3f7ab3af18ea69b20f4f3b99e09d32b2989d.tar.xz |
main/ipsec-tools: upgrade to 0.8.2
remove patches cherry-picked early from upstream
Diffstat (limited to 'main/ipsec-tools/03-fix-sport-selection.patch')
-rw-r--r-- | main/ipsec-tools/03-fix-sport-selection.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/main/ipsec-tools/03-fix-sport-selection.patch b/main/ipsec-tools/03-fix-sport-selection.patch deleted file mode 100644 index 56cd999b39..0000000000 --- a/main/ipsec-tools/03-fix-sport-selection.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/src/racoon/grabmyaddr.c 14 Mar 2011 17:18:12 -0000 1.28 -+++ b/src/racoon/grabmyaddr.c 5 Feb 2013 11:32:59 -0000 -@@ -274,13 +274,24 @@ - struct sockaddr *addr; - { - struct myaddr *my; -+ int port = 0, wport; - - LIST_FOREACH(my, &opened, chain) { -- if (cmpsaddr((struct sockaddr *) &my->addr, addr) <= CMPSADDR_WILDPORT_MATCH) -+ switch (cmpsaddr((struct sockaddr *) &my->addr, addr)) { -+ case CMPSADDR_MATCH: - return extract_port((struct sockaddr *) &my->addr); -+ case CMPSADDR_WILDPORT_MATCH: -+ wport = extract_port((struct sockaddr *) &my->addr); -+ if (port == 0 || wport < port) -+ port = wport; -+ break; -+ } - } -+ -+ if (port == 0) -+ port = PORT_ISAKMP; - -- return PORT_ISAKMP; -+ return port; - } - - void |