[packages/ebtables] Yikes, upstream found a bug in my patch; rel 4

mmazur mmazur at pld-linux.org
Tue Apr 15 11:57:28 CEST 2014


commit 85a463198d3e14f1f0f26676d47a23c19ad4228e
Author: Mariusz Mazur <mmazur at pld-linux.org>
Date:   Tue Apr 15 11:55:39 2014 +0200

    Yikes, upstream found a bug in my patch; rel 4

 ebtables.spec                   | 2 +-
 ipv6_netmask_printing_fix.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/ebtables.spec b/ebtables.spec
index d010f75..c9191fa 100644
--- a/ebtables.spec
+++ b/ebtables.spec
@@ -4,7 +4,7 @@ Summary:	Ethernet Bridge Tables
 Summary(pl.UTF-8):	Ethernet Bridge Tables - filtrowanie i translacja adresów dla Ethernetu
 Name:		ebtables
 Version:	%{ver}.%{vermin}
-Release:	3
+Release:	4
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://downloads.sourceforge.net/ebtables/%{name}-v%{ver}-%{vermin}.tar.gz
diff --git a/ipv6_netmask_printing_fix.patch b/ipv6_netmask_printing_fix.patch
index c96f6ea..c626267 100644
--- a/ipv6_netmask_printing_fix.patch
+++ b/ipv6_netmask_printing_fix.patch
@@ -15,7 +15,7 @@ index 0465e77..52a8448 100644
  			printf("! ");
  		printf("%s", ebt_ip6_to_numeric(&ipinfo->daddr));
 -		printf("/%s ", ebt_ip6_to_numeric(&ipinfo->dmsk));
-+		printf("%s ", ebt_ip6_mask_to_string(&ipinfo->smsk));
++		printf("%s ", ebt_ip6_mask_to_string(&ipinfo->dmsk));
  	}
  	if (ipinfo->bitmask & EBT_IP6_TCLASS) {
  		printf("--ip6-tclass ");
@@ -46,7 +46,7 @@ index d20b68e..2f73589 100644
 +	 * /0000:0000:0000:0000:0000:0000:0000:0000 */
 +	static char buf[51+1];
 +	if (msk->s6_addr32[0] == 0xFFFFFFFFL && msk->s6_addr32[1] == 0xFFFFFFFFL &&
-+			msk->s6_addr32[2] == 0xFFFFFFFFL && msk->s6_addr32[3] == 0xFFFFFFFFL)
++	    msk->s6_addr32[2] == 0xFFFFFFFFL && msk->s6_addr32[3] == 0xFFFFFFFFL)
 +		*buf = '\0';
 +	else
 +		sprintf(buf, "/%s", ebt_ip6_to_numeric(msk));
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ebtables.git/commitdiff/85a463198d3e14f1f0f26676d47a23c19ad4228e



More information about the pld-cvs-commit mailing list