deleted file mode 100644

@@ -1,54 +0,0 @@

-Submitted By:            Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org>

-Date:                    2013-03-10

-Initial Package Version: 1.5

-Upstream Status:         Unknown

-Origin:                  LFS

-Description:             This patch contains fixes a problem with 

-the omission of a needed include file in the kernel's linux/if_bridge.h.

-It also fixes some autoconf warnings.

-

-

-diff -Naur bridge-utils-1.5.orig/Makefile.in bridge-utils-1.5/Makefile.in

-+++ bridge-utils-1.5/Makefile.in	2013-03-10 13:44:41.000000000 -0500

-@@ -9,6 +9,7 @@

- bindir=@bindir@

- sbindir=@sbindir@

- mandir=@mandir@

-+datarootdir=@datarootdir@

- distdir = $(PACKAGE)-$(VERSION)

- 

- SUBDIRS=libbridge brctl doc

-diff -Naur bridge-utils-1.5.orig/brctl/Makefile.in bridge-utils-1.5/brctl/Makefile.in

-+++ bridge-utils-1.5/brctl/Makefile.in	2013-03-10 13:44:15.000000000 -0500

-@@ -12,6 +12,7 @@

- bindir=@bindir@

- sbindir=@sbindir@

- mandir=@mandir@

-+datarootdir=@datarootdir@

- 

- INSTALL=@INSTALL@

- 

-diff -Naur bridge-utils-1.5.orig/doc/Makefile.in bridge-utils-1.5/doc/Makefile.in

-+++ bridge-utils-1.5/doc/Makefile.in	2013-03-10 13:43:39.000000000 -0500

-@@ -9,6 +9,7 @@

- bindir=@bindir@

- sbindir=@sbindir@

- mandir=@mandir@

-+datarootdir=@datarootdir@

- 

- SUBDIRS=libbridge brctl

- 

-diff -Naur bridge-utils-1.5.orig/libbridge/libbridge.h bridge-utils-1.5/libbridge/libbridge.h

-+++ bridge-utils-1.5/libbridge/libbridge.h	2013-03-10 13:46:23.000000000 -0500

-@@ -21,6 +21,7 @@

- 

- #include <sys/socket.h>

- #include <linux/if.h>

-+#include <netinet/ip6.h>

- #include <linux/if_bridge.h>

- 

- /* defined in net/if.h but that conflicts with linux/if.h... */

new file mode 100644

@@ -0,0 +1,40 @@

+Submitted By:            Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org>

+Date:                    2013-03-10

+Initial Package Version: 1.5

+Upstream Status:         Unknown

+Origin:                  LFS

+Description:             This patch fixes some autoconf warnings.

+

+

+diff -Naur bridge-utils-1.5.orig/Makefile.in bridge-utils-1.5/Makefile.in

+--- bridge-utils-1.5.orig/Makefile.in	2011-03-28 19:52:54.000000000 -0500

+@@ -9,6 +9,7 @@

+ bindir=@bindir@

+ sbindir=@sbindir@

+ mandir=@mandir@

++datarootdir=@datarootdir@

+ distdir = $(PACKAGE)-$(VERSION)

+ 

+ SUBDIRS=libbridge brctl doc

+diff -Naur bridge-utils-1.5.orig/brctl/Makefile.in bridge-utils-1.5/brctl/Makefile.in

+--- bridge-utils-1.5.orig/brctl/Makefile.in	2011-03-28 19:52:54.000000000 -0500

+@@ -12,6 +12,7 @@

+ bindir=@bindir@

+ sbindir=@sbindir@

+ mandir=@mandir@

++datarootdir=@datarootdir@

+ 

+ INSTALL=@INSTALL@

+ 

+diff -Naur bridge-utils-1.5.orig/doc/Makefile.in bridge-utils-1.5/doc/Makefile.in

+--- bridge-utils-1.5.orig/doc/Makefile.in	2011-03-28 19:52:54.000000000 -0500

+@@ -9,6 +9,7 @@

+ bindir=@bindir@

+ sbindir=@sbindir@

+ mandir=@mandir@

++datarootdir=@datarootdir@

+ 

+ SUBDIRS=libbridge brctl

@@ -1,7 +1,7 @@

 Summary:	Utilities for configuring and managing bridge devices

 Name:		bridge-utils

 Version:	1.5

-Release:	2%{?dist}

+Release:	3%{?dist}

 License:	GPLv2+

 URL:		http://www.linuxfoundation.org/collaborate/workgroups/networking/bridge

 Group:		System Environment/Base

@@ -9,7 +9,7 @@ Vendor:		VMware, Inc.

 Distribution: 	Photon

 Source0:	http://sourceforge.net/projects/bridge/files/bridge/%{name}-%{version}.tar.gz

 %define sha1 bridge-utils=19d2a58cd3a70f971aa931b40256174a847e60d6

-Patch0:		http://www.linuxfromscratch.org/patches/blfs/systemd/bridge-utils-1.5-linux_3.8_fix-1.patch

+Patch0:		http://www.linuxfromscratch.org/patches/blfs/systemd/bridge-utils-1.5-linux_3.8_fix-2.patch

 %description

 The bridge-utils package contains a utility needed to create and manage bridge devices. This is useful in setting up networks for a hosted virtual machine (VM).

 %prep

@@ -28,6 +28,8 @@ make DESTDIR=%{buildroot} install

 %{_mandir}/man8/*

 %changelog

+*	Mon Sep 12 2016 Alexey Makhalov <amakhalov@vmware.com> 1.5-3

+-	Update patch to fix-2.

 *	Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 1.5-2

 -	GA - Bump release of all rpms

 *	Tue May 19 2015 Divya Thaluru <dthaluru@vmware.com> 1.5-1

@@ -159,7 +159,7 @@ CONFIG_MEMCG=y

 CONFIG_MEMCG_SWAP=y

 CONFIG_MEMCG_SWAP_ENABLED=y

 CONFIG_MEMCG_KMEM=y

-# CONFIG_CGROUP_HUGETLB is not set

+CONFIG_CGROUP_HUGETLB=y

 CONFIG_CGROUP_PERF=y

 CONFIG_CGROUP_SCHED=y

 CONFIG_FAIR_GROUP_SCHED=y

@@ -864,6 +864,7 @@ CONFIG_NF_CONNTRACK=m

 CONFIG_NF_LOG_COMMON=m

 CONFIG_NF_CONNTRACK_MARK=y

 CONFIG_NF_CONNTRACK_SECMARK=y

+# CONFIG_NF_CONNTRACK_ZONES is not set

 CONFIG_NF_CONNTRACK_PROCFS=y

 CONFIG_NF_CONNTRACK_EVENTS=y

 CONFIG_NF_CONNTRACK_TIMEOUT=y

@@ -907,7 +908,7 @@ CONFIG_NETFILTER_XTABLES=y

 #

 CONFIG_NETFILTER_XT_MARK=m

 CONFIG_NETFILTER_XT_CONNMARK=m

-# CONFIG_NETFILTER_XT_SET is not set

+CONFIG_NETFILTER_XT_SET=m

 #

 # Xtables targets

@@ -917,7 +918,7 @@ CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m

 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m

 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m

-# CONFIG_NETFILTER_XT_TARGET_CT is not set

+CONFIG_NETFILTER_XT_TARGET_CT=m

 CONFIG_NETFILTER_XT_TARGET_DSCP=m

 CONFIG_NETFILTER_XT_TARGET_HL=m

 CONFIG_NETFILTER_XT_TARGET_HMARK=m

@@ -943,7 +944,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m

 #

 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m

 CONFIG_NETFILTER_XT_MATCH_BPF=m

-# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set

+CONFIG_NETFILTER_XT_MATCH_CGROUP=m

 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m

 CONFIG_NETFILTER_XT_MATCH_COMMENT=m

 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m

@@ -962,7 +963,7 @@ CONFIG_NETFILTER_XT_MATCH_HELPER=m

 CONFIG_NETFILTER_XT_MATCH_HL=m

 # CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set

 CONFIG_NETFILTER_XT_MATCH_IPRANGE=m

-# CONFIG_NETFILTER_XT_MATCH_IPVS is not set

+CONFIG_NETFILTER_XT_MATCH_IPVS=m

 # CONFIG_NETFILTER_XT_MATCH_L2TP is not set

 CONFIG_NETFILTER_XT_MATCH_LENGTH=m

 CONFIG_NETFILTER_XT_MATCH_LIMIT=m

@@ -153,7 +153,7 @@ CONFIG_MEMCG=y

 CONFIG_MEMCG_SWAP=y

 CONFIG_MEMCG_SWAP_ENABLED=y

 CONFIG_MEMCG_KMEM=y

-# CONFIG_CGROUP_HUGETLB is not set

+CONFIG_CGROUP_HUGETLB=y

 CONFIG_CGROUP_PERF=y

 CONFIG_CGROUP_SCHED=y

 CONFIG_FAIR_GROUP_SCHED=y

@@ -786,7 +786,7 @@ CONFIG_NETFILTER_XTABLES=y

 #

 CONFIG_NETFILTER_XT_MARK=m

 CONFIG_NETFILTER_XT_CONNMARK=m

-# CONFIG_NETFILTER_XT_SET is not set

+CONFIG_NETFILTER_XT_SET=m

 #

 # Xtables targets

@@ -819,7 +819,7 @@ CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m

 #

 CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m

 CONFIG_NETFILTER_XT_MATCH_BPF=m

-# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set

+CONFIG_NETFILTER_XT_MATCH_CGROUP=m

 CONFIG_NETFILTER_XT_MATCH_CLUSTER=m

 CONFIG_NETFILTER_XT_MATCH_COMMENT=m

 CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m

@@ -865,31 +865,31 @@ CONFIG_NETFILTER_XT_MATCH_TIME=m

 CONFIG_NETFILTER_XT_MATCH_U32=m

 CONFIG_IP_SET=m

 CONFIG_IP_SET_MAX=256

-# CONFIG_IP_SET_BITMAP_IP is not set

-# CONFIG_IP_SET_BITMAP_IPMAC is not set

-# CONFIG_IP_SET_BITMAP_PORT is not set

-# CONFIG_IP_SET_HASH_IP is not set

-# CONFIG_IP_SET_HASH_IPMARK is not set

-# CONFIG_IP_SET_HASH_IPPORT is not set

-# CONFIG_IP_SET_HASH_IPPORTIP is not set

-# CONFIG_IP_SET_HASH_IPPORTNET is not set

-# CONFIG_IP_SET_HASH_MAC is not set

-# CONFIG_IP_SET_HASH_NETPORTNET is not set

-# CONFIG_IP_SET_HASH_NET is not set

-# CONFIG_IP_SET_HASH_NETNET is not set

-# CONFIG_IP_SET_HASH_NETPORT is not set

-# CONFIG_IP_SET_HASH_NETIFACE is not set

-# CONFIG_IP_SET_LIST_SET is not set

+CONFIG_IP_SET_BITMAP_IP=m

+CONFIG_IP_SET_BITMAP_IPMAC=m

+CONFIG_IP_SET_BITMAP_PORT=m

+CONFIG_IP_SET_HASH_IP=m

+CONFIG_IP_SET_HASH_IPMARK=m

+CONFIG_IP_SET_HASH_IPPORT=m

+CONFIG_IP_SET_HASH_IPPORTIP=m

+CONFIG_IP_SET_HASH_IPPORTNET=m

+CONFIG_IP_SET_HASH_MAC=m

+CONFIG_IP_SET_HASH_NETPORTNET=m

+CONFIG_IP_SET_HASH_NET=m

+CONFIG_IP_SET_HASH_NETNET=m

+CONFIG_IP_SET_HASH_NETPORT=m

+CONFIG_IP_SET_HASH_NETIFACE=m

+CONFIG_IP_SET_LIST_SET=m

 CONFIG_IP_VS=m

-# CONFIG_IP_VS_IPV6 is not set

+CONFIG_IP_VS_IPV6=y

 # CONFIG_IP_VS_DEBUG is not set

 CONFIG_IP_VS_TAB_BITS=12

 #

 # IPVS transport protocol load balancing support

 #

-# CONFIG_IP_VS_PROTO_TCP is not set

-# CONFIG_IP_VS_PROTO_UDP is not set

+CONFIG_IP_VS_PROTO_TCP=y

+CONFIG_IP_VS_PROTO_UDP=y

 # CONFIG_IP_VS_PROTO_AH_ESP is not set

 # CONFIG_IP_VS_PROTO_ESP is not set

 # CONFIG_IP_VS_PROTO_AH is not set

@@ -919,7 +919,9 @@ CONFIG_IP_VS_SH_TAB_BITS=8

 #

 # IPVS application helper

 #

+# CONFIG_IP_VS_FTP is not set

 CONFIG_IP_VS_NFCT=y

+# CONFIG_IP_VS_PE_SIP is not set

 #

 # IP: Netfilter Configuration

@@ -1108,7 +1110,7 @@ CONFIG_NET_MPLS_GSO=m

 CONFIG_RPS=y

 CONFIG_RFS_ACCEL=y

 CONFIG_XPS=y

-# CONFIG_CGROUP_NET_PRIO is not set

+CONFIG_CGROUP_NET_PRIO=y

 CONFIG_CGROUP_NET_CLASSID=y

 CONFIG_NET_RX_BUSY_POLL=y

 CONFIG_BQL=y

@@ -2,7 +2,7 @@

 Summary:       Kernel

 Name:          linux-esx

 Version:       4.4.31

-Release:       1%{?dist}

+Release:       2%{?dist}

 License:       GPLv2

 URL:           http://www.kernel.org/

 Group:         System Environment/Kernel

@@ -161,6 +161,10 @@ ln -sf %{name}-%{version}-%{release}.cfg /boot/photon.cfg

 /usr/src/%{name}-headers-%{version}-%{release}

 %changelog

+*   Tue Nov 15 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.31-2

+-   .config: add ip set support

+-   .config: add ipvs_{tcp,udp} support

+-   .config: add cgrup_{hugetlb,net_prio} support

 *   Thu Nov 10 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.31-1

 -   Update to linux-4.4.31

 *   Thu Nov 10 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.26-2

@@ -2,7 +2,7 @@

 Summary:        Kernel

 Name:           linux

 Version:    	4.4.31

-Release:    	1%{?dist}

+Release:    	2%{?dist}

 License:    	GPLv2

 URL:        	http://www.kernel.org/

 Group:        	System Environment/Kernel

@@ -197,6 +197,10 @@ ln -s /usr/lib/debug/lib/modules/%{version}/vmlinux-%{version}-%{release}.debug

 /lib/modules/%{version}/kernel/arch/x86/oprofile/

 %changelog

+*   Tue Nov 15 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.31-2

+-   .config: add cgrup_hugetlb support

+-   .config: add netfilter_xt_{set,target_ct} support

+-   .config: add netfilter_xt_match_{cgroup,ipvs} support

 *   Thu Nov 10 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.31-1

 -   Update to linux-4.4.31

 *   Fri Oct 21 2016 Alexey Makhalov <amakhalov@vmware.com> 4.4.26-1