Attachment 854334 Details for Bug 1057024 – patch for dist-git, applies on rhel-7 branch of libnl3

[patch] patch for dist-git, applies on rhel-7 branch of libnl3

0001-Backport-extended-IPv6-address-flags-including-IFA_F.patch (text/plain), 7.42 KB, created by Thomas Haller on 2014-01-23 12:07:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Haller

Created: 2014-01-23 12:07:17 UTC

Size: 7.42 KB

patch

obsolete

>From b5af68b4ad587a0552ccd9955366ddc1e7721505 Mon Sep 17 00:00:00 2001
>From: Thomas Haller <thaller@redhat.com>
>Date: Thu, 23 Jan 2014 12:59:35 +0100
>Subject: [PATCH 1/1] Backport extended IPv6 address flags (including
> IFA_F_MANAGETEMPADDR and IFA_F_NOPREFIXROUTE)
>
>Resolves: #1057024
>---
> libnl3.spec                 | 11 ++++++-
> rh1057024_ifa_flags_1.patch | 77 +++++++++++++++++++++++++++++++++++++++++++++
> rh1057024_ifa_flags_2.patch | 40 +++++++++++++++++++++++
> rh1057024_ifa_flags_3.patch | 40 +++++++++++++++++++++++
> 4 files changed, 167 insertions(+), 1 deletion(-)
> create mode 100644 rh1057024_ifa_flags_1.patch
> create mode 100644 rh1057024_ifa_flags_2.patch
> create mode 100644 rh1057024_ifa_flags_3.patch
>
>diff --git a/libnl3.spec b/libnl3.spec
>index 8e660ac..f675314 100644
>--- a/libnl3.spec
>+++ b/libnl3.spec
>@@ -3,13 +3,16 @@ Group: Development/Libraries
> License: LGPLv2
> Name: libnl3
> Version: 3.2.21
>-Release: 2%{?dist}
>+Release: 3%{?dist}
> URL: http://www.infradead.org/~tgr/libnl/
> Source: http://www.infradead.org/~tgr/libnl/files/libnl-%{version}.tar.gz
> Source1: http://www.infradead.org/~tgr/libnl/files/libnl-doc-%{version}.tar.gz
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
> BuildRequires: flex bison
> BuildRequires: python
>+Patch0: rh1057024_ifa_flags_1.patch
>+Patch1: rh1057024_ifa_flags_2.patch
>+Patch2: rh1057024_ifa_flags_3.patch
> 
> %description
> This package contains a convenience library to simplify
>@@ -45,6 +48,9 @@ This package contains libnl3 API documentation
> 
> %prep
> %setup -q -n libnl-%{version}
>+%patch0 -p1 -b .000-rh1057024_ifa_flags_1.orig
>+%patch1 -p1 -b .001-rh1057024_ifa_flags_2.orig
>+%patch2 -p1 -b .002-rh1057024_ifa_flags_3.orig
> 
> tar -xzf %SOURCE1
> 
>@@ -97,6 +103,9 @@ find $RPM_BUILD_ROOT -name \*.la -delete
> %doc libnl-doc-%{version}/api/*
> 
> %changelog
>+* Thu Jan 23 2014 Thomas Haller <thaller@redhat.com> - 3.2.21-3
>+- Backport extended IPv6 address flags (rh #1057024)
>+
> * Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 3.2.21-2
> - Mass rebuild 2013-12-27
> 
>diff --git a/rh1057024_ifa_flags_1.patch b/rh1057024_ifa_flags_1.patch
>new file mode 100644
>index 0000000..9ae7739
>--- /dev/null
>+++ b/rh1057024_ifa_flags_1.patch
>@@ -0,0 +1,77 @@
>+From b31f8203d943346f60a92bace16098debe53205b Mon Sep 17 00:00:00 2001
>+From: Jiri Pirko <jiri@resnulli.us>
>+Date: Sun, 8 Dec 2013 12:26:24 +0100
>+Subject: [PATCH 1/3] add support for IFA_FLAGS nl attribute
>+
>+(cherry picked from commit 42c41336000e1ff781a91c6ec397fd787aae3124)
>+
>+Signed-off-by: Jiri Pirko <jiri@resnulli.us>
>+Signed-off-by: Thomas Haller <thaller@redhat.com>
>+---
>+ include/linux/if_addr.h         | 4 ++++
>+ include/netlink-private/types.h | 2 +-
>+ lib/route/addr.c                | 4 +++-
>+ 3 files changed, 8 insertions(+), 2 deletions(-)
>+
>+diff --git a/include/linux/if_addr.h b/include/linux/if_addr.h
>+index c355522..63da1cd 100644
>+--- a/include/linux/if_addr.h
>++++ b/include/linux/if_addr.h
>+@@ -18,6 +18,9 @@ struct ifaddrmsg {
>+  * It makes no difference for normally configured broadcast interfaces,
>+  * but for point-to-point IFA_ADDRESS is DESTINATION address,
>+  * local address is supplied in IFA_LOCAL attribute.
>++ *
>++ * IFA_FLAGS is a u32 attribute that extends the u8 field ifa_flags.
>++ * If present, the value from struct ifaddrmsg will be ignored.
>+  */
>+ enum {
>+ 	IFA_UNSPEC,
>+@@ -28,6 +31,7 @@ enum {
>+ 	IFA_ANYCAST,
>+ 	IFA_CACHEINFO,
>+ 	IFA_MULTICAST,
>++	IFA_FLAGS,
>+ 	__IFA_MAX,
>+ };
>+ 
>+diff --git a/include/netlink-private/types.h b/include/netlink-private/types.h
>+index 60a3bce..72570c4 100644
>+--- a/include/netlink-private/types.h
>++++ b/include/netlink-private/types.h
>+@@ -233,8 +233,8 @@ struct rtnl_addr
>+ 
>+ 	uint8_t		a_family;
>+ 	uint8_t		a_prefixlen;
>+-	uint8_t		a_flags;
>+ 	uint8_t		a_scope;
>++	uint32_t	a_flags;
>+ 	uint32_t	a_ifindex;
>+ 
>+ 	struct nl_addr *a_peer;	
>+diff --git a/lib/route/addr.c b/lib/route/addr.c
>+index 95a9447..bcdc319 100644
>+--- a/lib/route/addr.c
>++++ b/lib/route/addr.c
>+@@ -215,8 +215,9 @@ static int addr_msg_parser(struct nl_cache_ops *ops, struct sockaddr_nl *who,
>+ 	ifa = nlmsg_data(nlh);
>+ 	addr->a_family = family = ifa->ifa_family;
>+ 	addr->a_prefixlen = ifa->ifa_prefixlen;
>+-	addr->a_flags = ifa->ifa_flags;
>+ 	addr->a_scope = ifa->ifa_scope;
>++	addr->a_flags = tb[IFA_FLAGS] ? nla_get_u32(tb[IFA_FLAGS]) :
>++					ifa->ifa_flags;
>+ 	addr->a_ifindex = ifa->ifa_index;
>+ 
>+ 	addr->ce_mask = (ADDR_ATTR_FAMILY | ADDR_ATTR_PREFIXLEN |
>+@@ -593,6 +594,7 @@ static int build_addr_msg(struct rtnl_addr *tmpl, int cmd, int flags,
>+ 		NLA_PUT(msg, IFA_CACHEINFO, sizeof(ca), &ca);
>+ 	}
>+ 
>++	NLA_PUT_U32(msg, IFA_FLAGS, tmpl->a_flags);
>+ 
>+ 	*result = msg;
>+ 	return 0;
>+-- 
>+1.8.3.1
>+
>diff --git a/rh1057024_ifa_flags_2.patch b/rh1057024_ifa_flags_2.patch
>new file mode 100644
>index 0000000..0a1b720
>--- /dev/null
>+++ b/rh1057024_ifa_flags_2.patch
>@@ -0,0 +1,40 @@
>+From 6ad0773a41a713421caf3d88078aad634bc915e0 Mon Sep 17 00:00:00 2001
>+From: Thomas Haller <thaller@redhat.com>
>+Date: Thu, 2 Jan 2014 10:51:38 +0100
>+Subject: [PATCH 2/3] addr: add address flag IFA_F_MANAGETEMPADDR
>+
>+(cherry picked from commit dcc0baac020e033c4325e4d89c92aaab03f01b01)
>+
>+Signed-off-by: Thomas Haller <thaller@redhat.com>
>+---
>+ include/linux/if_addr.h | 1 +
>+ lib/route/addr.c        | 1 +
>+ 2 files changed, 2 insertions(+)
>+
>+diff --git a/include/linux/if_addr.h b/include/linux/if_addr.h
>+index 63da1cd..94b32b4 100644
>+--- a/include/linux/if_addr.h
>++++ b/include/linux/if_addr.h
>+@@ -48,6 +48,7 @@ enum {
>+ #define IFA_F_DEPRECATED	0x20
>+ #define IFA_F_TENTATIVE		0x40
>+ #define IFA_F_PERMANENT		0x80
>++#define IFA_F_MANAGETEMPADDR	0x100
>+ 
>+ struct ifa_cacheinfo {
>+ 	__u32	ifa_prefered;
>+diff --git a/lib/route/addr.c b/lib/route/addr.c
>+index bcdc319..c3c59ce 100644
>+--- a/lib/route/addr.c
>++++ b/lib/route/addr.c
>+@@ -1023,6 +1023,7 @@ static const struct trans_tbl addr_flags[] = {
>+ 	__ADD(IFA_F_DEPRECATED, deprecated)
>+ 	__ADD(IFA_F_TENTATIVE, tentative)
>+ 	__ADD(IFA_F_PERMANENT, permanent)
>++	__ADD(IFA_F_MANAGETEMPADDR, mngtmpaddr)
>+ };
>+ 
>+ char *rtnl_addr_flags2str(int flags, char *buf, size_t size)
>+-- 
>+1.8.3.1
>+
>diff --git a/rh1057024_ifa_flags_3.patch b/rh1057024_ifa_flags_3.patch
>new file mode 100644
>index 0000000..4151c07
>--- /dev/null
>+++ b/rh1057024_ifa_flags_3.patch
>@@ -0,0 +1,40 @@
>+From 899914790776c71e0436fe39db1f5e28e6709a98 Mon Sep 17 00:00:00 2001
>+From: Thomas Haller <thaller@redhat.com>
>+Date: Wed, 8 Jan 2014 01:44:58 +0100
>+Subject: [PATCH 3/3] addr: add address flag IFA_F_NOPREFIXROUTE
>+
>+(cherry picked from commit b203c89d862a6ae3e82122fe1b6882b427d53551)
>+
>+Signed-off-by: Thomas Haller <thaller@redhat.com>
>+---
>+ include/linux/if_addr.h | 1 +
>+ lib/route/addr.c        | 1 +
>+ 2 files changed, 2 insertions(+)
>+
>+diff --git a/include/linux/if_addr.h b/include/linux/if_addr.h
>+index 94b32b4..7d4de85 100644
>+--- a/include/linux/if_addr.h
>++++ b/include/linux/if_addr.h
>+@@ -49,6 +49,7 @@ enum {
>+ #define IFA_F_TENTATIVE		0x40
>+ #define IFA_F_PERMANENT		0x80
>+ #define IFA_F_MANAGETEMPADDR	0x100
>++#define IFA_F_NOPREFIXROUTE	0x200
>+ 
>+ struct ifa_cacheinfo {
>+ 	__u32	ifa_prefered;
>+diff --git a/lib/route/addr.c b/lib/route/addr.c
>+index c3c59ce..e98d73a 100644
>+--- a/lib/route/addr.c
>++++ b/lib/route/addr.c
>+@@ -1024,6 +1024,7 @@ static const struct trans_tbl addr_flags[] = {
>+ 	__ADD(IFA_F_TENTATIVE, tentative)
>+ 	__ADD(IFA_F_PERMANENT, permanent)
>+ 	__ADD(IFA_F_MANAGETEMPADDR, mngtmpaddr)
>++	__ADD(IFA_F_NOPREFIXROUTE, noprefixroute)
>+ };
>+ 
>+ char *rtnl_addr_flags2str(int flags, char *buf, size_t size)
>+-- 
>+1.8.3.1
>+
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1057024: 854334