From d8292c9cd451ef140521510e39e55f3c85e59a100e278bd24e2729ce4182c0f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 22 Feb 2018 17:19:49 +0000
Subject: [PATCH] Accepting request 579102 from home:mgerstner:ethertypes

OBS-URL: https://build.opensuse.org/request/show/579102
OBS-URL: https://build.opensuse.org/package/show/Base:System/netcfg?expand=0&rev=53
---
 ethertypes     | 39 +++++++++++++++++++++++++++++++++++++++
 netcfg.changes |  9 +++++++++
 netcfg.spec    |  8 +++++---
 3 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 ethertypes

diff --git a/ethertypes b/ethertypes
new file mode 100644
index 0000000..dfd08a3
--- /dev/null
+++ b/ethertypes
@@ -0,0 +1,39 @@
+#
+# Ethernet frame types
+#		This file describes some of the various Ethernet
+#		protocol types that are used on Ethernet networks.
+#
+# 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
+#
+IPv4	 	0800  	ip ip4 		# Internet IP (IPv4)
+X25		0805
+ARP		0806	ether-arp	#
+FR_ARP		0808    		# Frame Relay ARP        [RFC1701]
+BPQ		08FF			# G8BPQ AX.25 Ethernet Packet
+DEC		6000			# DEC Assigned proto
+DNA_DL		6001			# DEC DNA Dump/Load
+DNA_RC		6002			# DEC DNA Remote Console
+DNA_RT		6003			# DEC DNA Routing
+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]
+RARP		8035			# Reverse ARP            [RFC903]
+AARP		80F3			# Appletalk AARP
+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
+ATMMPOA		884C			# MultiProtocol over ATM
+PPP_DISC	8863			# PPPoE discovery messages
+PPP_SES		8864			# PPPoE session messages
+ATMFATE		8884			# Frame-based ATM Transport over Ethernet
+LOOP		9000	loopback 	# loop proto
diff --git a/netcfg.changes b/netcfg.changes
index bfc717a..fad3d84 100644
--- a/netcfg.changes
+++ b/netcfg.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Feb 22 16:15:08 UTC 2018 - matthias.gerstner@suse.com
+
+- Include /etc/ethertypes to resolve a conflict between
+  security:netfilter/ebtables and security:netfilter/iptables-nft. This
+  ethertypes version comes from iptables, because it contains an additional
+  entry over the ebtables one. Increased minor version to allow a suitable
+  Requires statement in ebtables/iptables. FATE#320520
+
 -------------------------------------------------------------------
 Tue Mar  7 09:57:12 UTC 2017 - tchvatal@suse.com
 
diff --git a/netcfg.spec b/netcfg.spec
index 148726d..70e3278 100644
--- a/netcfg.spec
+++ b/netcfg.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package netcfg
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           netcfg
-Version:        11.5
+Version:        11.6
 Release:        0
 Summary:        Network Configuration Files in /etc
 License:        BSD-3-Clause
@@ -39,6 +39,7 @@ Source13:       aliases
 Source14:       ethers
 Source15:       netgroup
 Source16:       COPYING
+Source17:       ethertypes
 Source100:      services-compare.pl
 Source101:      services-compare.sh
 Source102:      services-create.pl
@@ -63,7 +64,7 @@ cp %{SOURCE16} .
 
 %install
 mkdir -p %{buildroot}/etc
-for i in hostname aliases defaultdomain exports ftpusers host.conf hosts hosts.allow hosts.deny hosts.equiv hosts.lpd netgroup networks protocols services.bz2 ethers; do
+for i in hostname aliases defaultdomain exports ftpusers host.conf hosts hosts.allow hosts.deny hosts.equiv hosts.lpd netgroup networks protocols services.bz2 ethers ethertypes; do
   install $RPM_SOURCE_DIR/$i %{buildroot}/etc
 done
 bunzip2 %{buildroot}%{_sysconfdir}/services.bz2
@@ -118,6 +119,7 @@ exit 0
 %config(noreplace) %{_sysconfdir}/networks
 %config(noreplace) %{_sysconfdir}/protocols
 %config(noreplace) %{_sysconfdir}/services
+%config(noreplace) %{_sysconfdir}/ethertypes
 %doc COPYING
 
 %changelog