diff --git a/.gitignore b/.gitignore
index 9d33843..07a4c95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-SOURCES/cri-o-712f3b8.tar.gz
-SOURCES/libpod-b51d327.tar.gz
-SOURCES/plugins-dd8ff8a.tar.gz
+SOURCES/cri-o-1c0c3b0.tar.gz
+SOURCES/libpod-3e0ff12.tar.gz
diff --git a/.podman.metadata b/.podman.metadata
index 5f5aa4d..6d7acc2 100644
--- a/.podman.metadata
+++ b/.podman.metadata
@@ -1,3 +1,2 @@
-08b0acd9b77389e3234b8c1b7530edfc71da386a SOURCES/cri-o-712f3b8.tar.gz
-e1b5fa8dd237abc16ca1e8e809508fc291ce5550 SOURCES/libpod-b51d327.tar.gz
-ec2c199f2768e75874f53901a31c1e824138fdf2 SOURCES/plugins-dd8ff8a.tar.gz
+3c069d4873d8e1317e4a8206d82437b9f32f5faf SOURCES/cri-o-1c0c3b0.tar.gz
+a0d88f45afa4f3eeae62d769c888e16c03a282de SOURCES/libpod-3e0ff12.tar.gz
diff --git a/SOURCES/build.sh b/SOURCES/build.sh
deleted file mode 100755
index df60141..0000000
--- a/SOURCES/build.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-if [ "$(uname)" == "Darwin" ]; then
- export GOOS=linux
-fi
-
-ORG_PATH="github.com/containernetworking"
-export REPO_PATH="${ORG_PATH}/plugins"
-
-if [ ! -h gopath/src/${REPO_PATH} ]; then
- mkdir -p gopath/src/${ORG_PATH}
- ln -s ../../../.. gopath/src/${REPO_PATH} || exit 255
-fi
-
-export GO15VENDOREXPERIMENT=1
-export GOPATH=${PWD}/gopath
-
-mkdir -p "${PWD}/bin"
-
-echo "Building plugins"
-PLUGINS="plugins/meta/* plugins/main/* plugins/ipam/* plugins/sample"
-export GOBUILDFLAGS="${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')"
-for d in $PLUGINS; do
- if [ -d "$d" ]; then
- plugin="$(basename "$d")"
- echo " $plugin"
- # use go install so we don't duplicate work
- if [ -n "$FASTBUILD" ]
- then
- GOBIN=${PWD}/bin go install -pkgdir $GOPATH/pkg "$@" $REPO_PATH/$d
- else
- go build -ldflags "$GOBUILDFLAGS" -o "${PWD}/bin/$plugin" -pkgdir "$GOPATH/pkg" "$@" "$REPO_PATH/$d"
- fi
- fi
-done
diff --git a/SPECS/podman.spec b/SPECS/podman.spec
index 7f8ab84..eed7d9b 100644
--- a/SPECS/podman.spec
+++ b/SPECS/podman.spec
@@ -24,6 +24,7 @@
%global with_unit_test 0
%if 0%{?with_debug}
+%global _find_debuginfo_dwz_opts %{nil}
%global _dwz_low_mem_die_limit 0
%else
%global debug_package %{nil}
@@ -41,30 +42,22 @@
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path %{provider_prefix}
%global git_podman https://%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit b51d32703f80e40487a5f494d6209ffd7e596ada
+%global commit 3e0ff127c2210cc54681a776e12d8f1d3ae66630
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global import_path_conmon github.com/kubernetes-incubator/cri-o
%global git_conmon https://%{import_path_conmon}
-%global commit_conmon 712f3b8cf14cbbac298f3ccc020677ac2a65fa75
+%global commit_conmon 1c0c3b0778f805b82970cdbc93529306f8f75e61
%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
-# https://github.com/containernetworking/cni
-%global import_path_cni github.com/containernetworking/plugins
-%global git_cni https://%{import_path_cni}
-%global commit_cni dd8ff8a5cf537dcfc705e14a1465f82817869bf9
-%global shortcommit_cni %(c=%{commit_cni}; echo ${c:0:7})
-
Name: podman
-Version: 0.4.1
-Release: 4.git%{shortcommit}%{?dist}
+Version: 0.6.1
+Release: 3.git%{shortcommit}%{?dist}
Summary: Manage Pods, Containers and Container Images
License: ASL 2.0
URL: %{git_podman}
Source0: %{git_podman}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
Source1: %{git_conmon}/archive/%{commit_conmon}/cri-o-%{shortcommit_conmon}.tar.gz
-Source2: %{git_cni}/archive/%{commit_cni}/plugins-%{shortcommit_cni}.tar.gz
-Source3: build.sh
# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
#ExclusiveArch: %%{?go_arches:%%{go_arches}}%%{!?go_arches:%%{ix86} x86_64 aarch64 %%{arm}}
@@ -89,7 +82,7 @@ Requires: skopeo-containers >= 0.1.29-3
# can't use default conmon right now, so we ship our own
#Requires: conmon
Requires: buildah
-Requires: containernetworking-plugins >= 0.7.0-2
+Requires: containernetworking-plugins >= 0.7.0-101
Requires: iptables
Requires: atomic-registries >= 1.22.1-3
@@ -358,32 +351,14 @@ This package contains unit tests for project
providing packages with %{import_path} prefix.
%endif
-%package -n containernetworking-plugins
-Version: 0.7.0
-Summary: Libraries for writing CNI plugin
-License: ASL 2.0
-URL: %{git_cni}
-# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
-BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-BuildRequires: go-md2man
-
-%description -n containernetworking-plugins
-The CNI (Container Network Interface) project consists of a specification
-and libraries for writing plugins to configure network interfaces in Linux
-containers, along with a number of supported plugins. CNI concerns itself
-only with network connectivity of containers and removing allocated resources
-when the container is deleted.
-
%prep
%autosetup -Sgit -n %{repo}-%{commit}
-sed -i '/\/bin\/bash/d' completions/bash/%{name}
+sed -i '/\/bin\/env/d' completions/bash/%{name}
+mv pkg/hooks/README.md pkg/hooks/README-hooks.md
# untar cri-o
tar zxf %{SOURCE1}
-# untar containernetworking-plugins
-tar zxf %{SOURCE2}
-
%build
mkdir -p $(pwd)/_build
pushd $(pwd)/_build
@@ -391,10 +366,11 @@ mkdir -p src/%{provider}.%{provider_tld}/%{project}
ln -s ../../../../ src/%{import_path}
popd
ln -s vendor src
-export GOPATH=%{gopath}:$(pwd)/_build
+export GOPATH=%{gopath}:$(pwd)/_build:$(pwd)
export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) containers_image_ostree_stub"
-GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
+GOPATH=$GOPATH go generate ./cmd/%{name}/varlink/...
+GOPATH=$GOPATH BUILDTAGS="$BUILDTAGS" %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
#GOPATH=%{_prefix} make docs
make GOPATH=%{buildroot} docs
@@ -409,32 +385,7 @@ popd
ln -s vendor src
export GOPATH=$(pwd)/_output:$(pwd):%{gopath}
export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) containers_image_ostree_stub"
-BUILDTAGS=$BUILDTAGS make conmon
-popd
-
-pushd plugins-%{commit_cni}
-cp %{SOURCE3} .
-ln -s vendor src
-mkdir _build
-pushd _build
-mkdir -p src/%{provider}.%{provider_tld}/containernetworking
-ln -s $(dirs +1 -l) src/%{import_path_cni}
-popd
-
-export GOPATH=%{gopath}:$(pwd)/_build:$(pwd)
-GOPATH=$GOPATH %gobuild -o bin/bridge %{import_path_cni}/plugins/main/bridge
-GOPATH=$GOPATH %gobuild -o bin/host-device %{import_path_cni}/plugins/main/host-device
-GOPATH=$GOPATH %gobuild -o bin/ipvlan %{import_path_cni}/plugins/main/ipvlan
-GOPATH=$GOPATH %gobuild -o bin/loopback %{import_path_cni}/plugins/main/loopback
-GOPATH=$GOPATH %gobuild -o bin/macvlan %{import_path_cni}/plugins/main/macvlan
-GOPATH=$GOPATH %gobuild -o bin/ptp %{import_path_cni}/plugins/main/ptp
-GOPATH=$GOPATH %gobuild -o bin/vlan %{import_path_cni}/plugins/main/vlan
-GOPATH=$GOPATH %gobuild -o bin/flannel %{import_path_cni}/plugins/meta/flannel
-GOPATH=$GOPATH %gobuild -o bin/portmap %{import_path_cni}/plugins/meta/portmap
-GOPATH=$GOPATH %gobuild -o bin/tuning %{import_path_cni}/plugins/meta/tuning
-GOPATH=$GOPATH %gobuild -o bin/dhcp %{import_path_cni}/plugins/ipam/dhcp
-GOPATH=$GOPATH %gobuild -o bin/host-local %{import_path_cni}/plugins/ipam/host-local
-GOPATH=$GOPATH %gobuild -o bin/sample %{import_path_cni}/plugins/sample
+make BUILDTAGS="$BUILDTAGS" GOPATH=$GOPATH bin/conmon
popd
%install
@@ -448,10 +399,6 @@ install -p -m 644 %{repo}.conf %{buildroot}%{_datadir}/containers
install -dp %{buildroot}%{_libexecdir}/%{name}
install -p -m 755 cri-o-%{commit_conmon}/bin/conmon %{buildroot}%{_libexecdir}/%{name}
-# install containernetworking-plugins
-install -d -p %{buildroot}%{_libexecdir}/cni/
-install -p -m 0755 plugins-%{commit_cni}/bin/* %{buildroot}/%{_libexecdir}/cni
-
# source codes for building projects
%if 0%{?with_devel}
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
@@ -521,33 +468,46 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%files
%license LICENSE
-%doc README.md CONTRIBUTING.md hooks.md install.md code-of-conduct.md transfer.md
+%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md
%{_bindir}/%{name}
%{_mandir}/man1/*.1*
+%{_mandir}/man5/*.5*
%{_datadir}/bash-completion/completions/*
%{_libexecdir}/%{name}/conmon
%config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist
%{_datadir}/containers/%{repo}.conf
+%{_unitdir}/io.%{project}.%{name}.service
+%{_unitdir}/io.%{project}.%{name}.socket
+%{_prefix}/lib/tmpfiles.d/%{name}.conf
%if 0%{?with_devel}
%files -n libpod-devel -f devel.file-list
%license LICENSE
-%doc README.md CONTRIBUTING.md hooks.md install.md code-of-conduct.md transfer.md
+%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md
%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
%endif
%if 0%{?with_unit_test} && 0%{?with_devel}
%files unit-test-devel -f unit-test-devel.file-list
%license LICENSE
-%doc README.md CONTRIBUTING.md hooks.md install.md code-of-conduct.md transfer.md
+%doc README.md CONTRIBUTING.md pkg/hooks/README-hooks.md install.md code-of-conduct.md transfer.md
%endif
-%files -n containernetworking-plugins
-%license plugins-%{commit_cni}/LICENSE
-%doc plugins-%{commit_cni}/*.md
-%{_libexecdir}/cni/*
-
%changelog
+* Mon Jun 04 2018 Lokesh Mandvekar <lsm5@redhat.com> - 0.6.1-3.git3e0ff12
+- do not compress debuginfo with dwz to support delve debugger
+
+* Mon Jun 04 2018 Lokesh Mandvekar <lsm5@redhat.com> - 0.6.1-2.git3e0ff12
+- bash completion shouldn't have shebang
+
+* Mon Jun 04 2018 Lokesh Mandvekar <lsm5@redhat.com> - 0.6.1-1.git3e0ff12
+- Resolves: #1584429 - drop capabilities when running a container as non-root
+- bump to v0.6.1
+- built podman commit 3e0ff12
+- built conmon from cri-o commit 1c0c3b0
+- drop containernetworking-plugins subpackage, it's now split out into a standalone
+package
+
* Fri Apr 27 2018 Lokesh Mandvekar <lsm5@redhat.com> - 0.4.1-4.gitb51d327
- Resolves: #1572538 - build host-device and portmap plugins