[oe-commits] org.oe.dev iptables: backport fix for "getsockopt failed strangely" (Closes: #3260)

[jeremy_laine commit]

iptables: backport fix for "getsockopt failed strangely" (Closes: #3260)

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: 7b1dd96801f47207bea137bdc1cda343863a75ce
ViewMTN: http://monotone.openembedded.org/revision/info/7b1dd96801f47207bea137bdc1cda343863a75ce
Files:
1
packages/iptables/files/getsockopt-failed.patch
packages/iptables/iptables_1.3.8.bb
Diffs:

#
# mt diff -r1c6d2b9e1a4ef2366c4ee5fcfa3157391fe2ad47 -r7b1dd96801f47207bea137bdc1cda343863a75ce
#
# 
# 
# add_file "packages/iptables/files/getsockopt-failed.patch"
#  content [38ab94e3fbbab5bb7dee894315a8d1cbc39ba972]
# 
# patch "packages/iptables/iptables_1.3.8.bb"
#  from [c113e9d38b20dc53603f06d7376e50c77dcbf070]
#    to [83d804879e6ab91717d2adb82237eb57d5a4f291]
# 
============================================================
--- packages/iptables/files/getsockopt-failed.patch	38ab94e3fbbab5bb7dee894315a8d1cbc39ba972
+++ packages/iptables/files/getsockopt-failed.patch	38ab94e3fbbab5bb7dee894315a8d1cbc39ba972
@@ -0,0 +1,28 @@
+This patch fixes an issue where iptables throws the following error:
+"getsockopt failed strangely". This patch is taken from the netfilter
+svn (and it's included in iptable 1.4.0rc1):
+
+http://svn.netfilter.org/cgi-bin/viewcvs.cgi?rev=6890&view=rev
+
+--- iptables/iptables.c	2007/04/30 00:01:39	6815
++++ iptables/iptables.c	2007/06/26 15:29:45	6890
+@@ -1158,7 +1158,7 @@
+ 	max_rev = getsockopt(sockfd, IPPROTO_IP, opt, &rev, &s);
+ 	if (max_rev < 0) {
+ 		/* Definitely don't support this? */
+-		if (errno == EPROTONOSUPPORT) {
++		if (errno == ENOENT || errno == EPROTONOSUPPORT) {
+ 			close(sockfd);
+ 			return 0;
+ 		} else if (errno == ENOPROTOOPT) {
+--- iptables/ip6tables.c	2007/06/25 14:55:18	6889
++++ iptables/ip6tables.c	2007/06/26 15:29:45	6890
+@@ -1130,7 +1130,7 @@
+ 	max_rev = getsockopt(sockfd, IPPROTO_IPV6, opt, &rev, &s);
+ 	if (max_rev < 0) {
+ 		/* Definitely don't support this? */
+-		if (errno == EPROTONOSUPPORT) {
++		if (errno == ENOENT || errno == EPROTONOSUPPORT) {
+ 			close(sockfd);
+ 			return 0;
+ 		} else if (errno == ENOPROTOOPT) {
============================================================
--- packages/iptables/iptables_1.3.8.bb	c113e9d38b20dc53603f06d7376e50c77dcbf070
+++ packages/iptables/iptables_1.3.8.bb	83d804879e6ab91717d2adb82237eb57d5a4f291
@@ -1,10 +1,11 @@ RRECOMMENDS = "kernel-module-ip-tables k
 DESCRIPTION = "iptables network filtering tools"
 HOMEPAGE = "http://www.netfilter.org/"
 SECTION = "console/utils"
 LICENSE = "GPL"
 RRECOMMENDS = "kernel-module-ip-tables kernel-module-iptable-filter"
-PR = "r0"
+PR = "r1"
 SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \
+          file://getsockopt-failed.patch;patch=1 \
           "
 
 S = "${WORKDIR}/iptables-${PV}"