[ebtables] add RARP type, remove exec bit from systemd service file

[Tom Callaway]

commit 139410df78d681a082e62feae9241f7b92e628ee
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Wed Feb 19 14:37:52 2014 -0500

    add RARP type, remove exec bit from systemd service file

 0001-add-RARP-and-update-iana-url.patch |   44 +++++++++++++++++++++++++++++++
 ebtables.spec                           |   10 ++++++-
 2 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/0001-add-RARP-and-update-iana-url.patch b/0001-add-RARP-and-update-iana-url.patch
new file mode 100644
index 0000000..1528413
--- /dev/null
+++ b/0001-add-RARP-and-update-iana-url.patch
@@ -0,0 +1,44 @@
+From 908d41de58d46262e719fff778950a6f893a02f8 Mon Sep 17 00:00:00 2001
+From: Bart De Schuymer <bdschuym at pandora.be>
+Date: Tue, 3 Jul 2012 18:47:32 +0000
+Subject: [PATCH 01/16] add RARP and update iana url
+
+---
+ userspace/ebtables2/ethertypes | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+index 5e700f663987..813177b74588 100644
+--- a/ethertypes
++++ b/ethertypes
+@@ -5,6 +5,7 @@
+ #
+ # This list could be found on:
+ #         http://www.iana.org/assignments/ethernet-numbers
++#         http://www.iana.org/assignments/ieee-802-numbers
+ #
+ # <name>    <hexnumber> <alias1>...<alias35> #Comment
+ #
+@@ -21,15 +22,16 @@ LAT		6004			# DEC LAT
+ DIAG		6005			# DEC Diagnostics
+ CUST		6006			# DEC Customer use
+ SCA		6007			# DEC Systems Comms Arch
+-TEB		6558             	# Trans Ether Bridging   [RFC1701]
+-RAW_FR  	6559                   	# Raw Frame Relay        [RFC1701]
++TEB		6558			# Trans Ether Bridging   [RFC1701]
++RAW_FR  	6559			# Raw Frame Relay        [RFC1701]
++RARP		8035			# Reverse ARP            [RFC903]
+ AARP		80F3			# Appletalk AARP
+-ATALK		809B                  	# Appletalk
++ATALK		809B			# Appletalk
+ 802_1Q		8100	8021q 1q 802.1q	dot1q # 802.1Q Virtual LAN tagged frame
+ IPX		8137			# Novell IPX
+ NetBEUI		8191			# NetBEUI
+ IPv6		86DD	ip6 		# IP version 6
+-PPP		880B                    # PPP
++PPP		880B			# PPP
+ ATMMPOA		884C			# MultiProtocol over ATM
+ PPP_DISC	8863			# PPPoE discovery messages
+ PPP_SES		8864			# PPPoE session messages
+-- 
+1.8.5.3
+
diff --git a/ebtables.spec b/ebtables.spec
index 565b07e..a79e658 100644
--- a/ebtables.spec
+++ b/ebtables.spec
@@ -2,7 +2,7 @@
 
 Name:			ebtables
 Version:		2.0.10
-Release:		11%{?dist}
+Release:		12%{?dist}
 Summary:		Ethernet Bridge frame table administration tool
 License:		GPLv2+
 Group:			System Environment/Base
@@ -15,6 +15,8 @@ Patch0:			ebtables-2.0.10-norootinst.patch
 Patch3:			ebtables-2.0.9-lsb.patch
 Patch4:			ebtables-2.0.10-linkfix.patch
 Patch5:			ebtables-2.0.0-audit.patch
+# Upstream commit 5e126db0f
+Patch6:			0001-add-RARP-and-update-iana-url.patch
 BuildRequires:		systemd-units
 Requires(post):		systemd
 Requires(preun):	systemd
@@ -38,6 +40,7 @@ like iptables. There are no known incompatibility issues.
 # extension modules need to link to libebtc.so for ebt_errormsg
 %patch4 -p1 -b .linkfix
 %patch5 -p1 -b .AUDIT
+%patch6 -p1 -b .RARP
 
 # Convert to UTF-8
 f=THANKS; iconv -f iso-8859-1 -t utf-8 $f -o $f.utf8 ; mv $f.utf8 $f
@@ -50,6 +53,7 @@ make %{?_smp_mflags} CFLAGS="$MY_CFLAGS" LIBDIR="/%{_lib}/ebtables" BINDIR="/sbi
 mkdir -p %{buildroot}%{_initrddir}
 mkdir -p %{buildroot}%{_unitdir}
 install -p %{SOURCE3} %{buildroot}%{_unitdir}/
+chmod -x %{buildroot}%{_unitdir}/*.service
 mkdir -p %{buildroot}%{_libexecdir}
 install -m0755 %{SOURCE2} %{buildroot}%{_libexecdir}/ebtables
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
@@ -95,6 +99,10 @@ mv %{buildroot}/%{_lib}/ebtables/libebtc.so %{buildroot}/%{_lib}/
 %ghost %{_sysconfdir}/sysconfig/ebtables.broute
 
 %changelog
+* Wed Feb 19 2014 Tom Callaway <spot at fedoraproject.org> - 2.0.10-12
+- remove executable bit from systemd service file
+- add RARP type to ethertypes (bz 1060537)
+
 * Wed Aug 21 2013 Tom Callaway <spot at fedoraproject.org> - 2.0.10-11
 - convert to systemd