From f4d2fc43cd0bf3e9b4455d88afb9f04983396013 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 27 Jan 2017 03:10:11 -0500 Subject: [PATCH] Back out netns usage for now for https://pagure.io/releng/issue/6602 --- 0001-Back-out-network-namespace-usage.patch | 25 +++++++++++++++++++++ rpm-ostree.spec | 7 +++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0001-Back-out-network-namespace-usage.patch diff --git a/0001-Back-out-network-namespace-usage.patch b/0001-Back-out-network-namespace-usage.patch new file mode 100644 index 0000000..be332fa --- /dev/null +++ b/0001-Back-out-network-namespace-usage.patch @@ -0,0 +1,25 @@ +From fa250c4e127eab158f5f67485cb28961cbb6b294 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Fri, 27 Jan 2017 03:07:37 -0500 +Subject: [PATCH] Back out network namespace usage + +To work around https://pagure.io/releng/issue/6602 +--- + src/libpriv/rpmostree-bwrap.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/libpriv/rpmostree-bwrap.c b/src/libpriv/rpmostree-bwrap.c +index 40cb3dc..10dfe42 100644 +--- a/src/libpriv/rpmostree-bwrap.c ++++ b/src/libpriv/rpmostree-bwrap.c +@@ -208,7 +208,6 @@ rpmostree_bwrap_new (int rootfs_fd, + * but it may need some mapping work. + */ + "--unshare-pid", +- "--unshare-net", + "--unshare-uts", + "--unshare-ipc", + "--unshare-cgroup-try", +-- +2.9.3 + diff --git a/rpm-ostree.spec b/rpm-ostree.spec index 1acc9b8..b699892 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -1,7 +1,7 @@ Summary: Client side upgrade program and server side compose tool Name: rpm-ostree Version: 2017.1 -Release: 2%{?dist} +Release: 3%{?dist} #VCS: https://github.com/cgwalters/rpm-ostree # This tarball is generated via "make -f Makefile.dist-packaging dist-snapshot" Source0: rpm-ostree-%{version}.tar.xz @@ -28,6 +28,8 @@ BuildRequires: libattr-devel # We currently interact directly with librepo BuildRequires: pkgconfig(librepo) +Patch0: 0001-Back-out-network-namespace-usage.patch + # libhif bundling # We're using RPATH to pick up our bundled version %global __requires_exclude ^libhif[.]so[.].*$ @@ -122,6 +124,9 @@ python autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Fri Jan 27 2017 Colin Walters - 2017.1-3 +- Back out netns usage for now for https://pagure.io/releng/issue/6602 + * Sun Jan 22 2017 Colin Walters - 2017.1-2 - New upstream version