Attachment 866200 Details for Bug 1063885 – dist-git patch for libnl3 scratch-build, based on 53601fc4dd142bf39ffa529cb839fad94174e59b

[patch] dist-git patch for libnl3 scratch-build, based on 53601fc4dd142bf39ffa529cb839fad94174e59b

0001-scratch-build-revert-parts-of-42c41336000e1ff781a91c.patch (text/plain), 2.84 KB, created by Thomas Haller on 2014-02-21 19:05:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Haller

Created: 2014-02-21 19:05:09 UTC

Size: 2.84 KB

patch

obsolete

>From cb38d6ce2ef4ba62ccdb88ec7ac56f0e73fc63ae Mon Sep 17 00:00:00 2001
>From: Thomas Haller <thaller@redhat.com>
>Date: Fri, 21 Feb 2014 16:54:11 +0100
>Subject: [PATCH 1/1] scratch-build: revert parts of
> 42c41336000e1ff781a91c6ec397fd787aae3124 for testing (rh #1063885)
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1063885#c22
>---
> 0001-revert-setting-IFA_FLAGS.patch | 26 ++++++++++++++++++++++++++
> libnl3.spec                         |  7 ++++++-
> 2 files changed, 32 insertions(+), 1 deletion(-)
> create mode 100644 0001-revert-setting-IFA_FLAGS.patch
>
>diff --git a/0001-revert-setting-IFA_FLAGS.patch b/0001-revert-setting-IFA_FLAGS.patch
>new file mode 100644
>index 0000000..934d24a
>--- /dev/null
>+++ b/0001-revert-setting-IFA_FLAGS.patch
>@@ -0,0 +1,26 @@
>+diff --git c/lib/route/addr.c i/lib/route/addr.c
>+index 97905f0..e1511e4 100644
>+--- c/lib/route/addr.c
>++++ i/lib/route/addr.c
>+@@ -598,7 +598,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);
>++	/*NLA_PUT_U32(msg, IFA_FLAGS, tmpl->a_flags);*/
>+ 
>+ 	*result = msg;
>+ 	return 0;
>+@@ -1056,8 +1056,10 @@ 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)
>+-	__ADD(IFA_F_NOPREFIXROUTE, noprefixroute)
>++	/* also disable these flags, because NM uses them to detect
>++	 * the capabilities to set IFA_FLAGS -- which we disable for now. */
>++	/*__ADD(IFA_F_MANAGETEMPADDR, mngtmpaddr)*/
>++	/*__ADD(IFA_F_NOPREFIXROUTE, noprefixroute)*/
>+ };
>+ 
>+ char *rtnl_addr_flags2str(int flags, char *buf, size_t size)
>diff --git a/libnl3.spec b/libnl3.spec
>index 325554b..4b8f213 100644
>--- a/libnl3.spec
>+++ b/libnl3.spec
>@@ -3,10 +3,11 @@ Group: Development/Libraries
> License: LGPLv2
> Name: libnl3
> Version: 3.2.24
>-Release: 1%{?dist}
>+Release: 2.test01%{?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
>+Patch1: 0001-revert-setting-IFA_FLAGS.patch
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
> BuildRequires: flex bison
> BuildRequires: python
>@@ -45,6 +46,7 @@ This package contains libnl3 API documentation
> 
> %prep
> %setup -q -n libnl-%{version}
>+%patch1 -p1 -b .0001-revert-setting-IFA_FLAGS.orig
> 
> tar -xzf %SOURCE1
> 
>@@ -97,6 +99,9 @@ find $RPM_BUILD_ROOT -name \*.la -delete
> %doc libnl-doc-%{version}/api/*
> 
> %changelog
>+* Fri Feb 21 2014 Thomas Haller <thaller@redhat.com> - 3.2.24-2.test01
>+- Revert parts of 42c41336000e1ff781a91c6ec397fd787aae3124 for testing (rh #1063885)
>+
> * Thu Jan 23 2014 Thomas Haller <thaller@redhat.com> - 3.2.24-1
> - Update to 3.2.24 (rhbz#963111)
> 
>-- 
>1.8.5.3
>

Actions: View | Diff

Attachments on bug 1063885: 863819 | 863893 | 864249 | 865026 | 866200