Accepting request 682743 from devel:kubic

- podman-cni-config: remove artificial conflicts with kubelet (forwarded request 682742 from RBrownSUSE)

OBS-URL: https://build.opensuse.org/request/show/682743
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/podman?expand=0&rev=39

_service

@@ -4,8 +4,8 @@
 <param name="url">https://github.com/containers/libpod.git</param>
 <param name="scm">git</param>
 <param name="filename">podman</param>
-<param name="versionformat">1.0.1</param>
+<param name="versionformat">1.1.2</param>
-<param name="revision">v1.0.1</param>
+<param name="revision">v1.1.2</param>
 </service>
 
 <service name="set_version" mode="disabled">
@@ -16,8 +16,8 @@
 <param name="url">https://github.com/kubernetes-sigs/cri-o.git</param>
 <param name="scm">git</param>
 <param name="filename">conmon</param>
-<param name="versionformat">1.13.0</param>
+<param name="versionformat">1.13.1</param>
-<param name="revision">825baaafb651a3b01fbc01c0bc9be945196a3ee5</param>
+<param name="revision">v1.13.1</param>
 </service>
 
 <service name="recompress" mode="disabled">

conmon-1.13.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5c784c33f54b736626cad7c4b2d4c28191968326dc33a6c445e79835175e3fe2
-size 7078796

conmon-1.13.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:164f81c6e2cde62094c1583ace2f9c4acfd1634391442faa70a86bfde43c5c7c
+size 3779600

containers-libpod-pull-2225.diff

@@ -1,123 +0,0 @@
-diff --git a/contrib/cirrus/integration_test.sh b/contrib/cirrus/integration_test.sh
-index 627864f47..58c8af289 100755
---- a/contrib/cirrus/integration_test.sh
-+++ b/contrib/cirrus/integration_test.sh
-@@ -17,9 +17,9 @@ set -x
- cd "$GOSRC"
- case "${OS_RELEASE_ID}-${OS_RELEASE_VER}" in
-     ubuntu-18)
--        make install PREFIX=/usr ETCDIR=/etc "BUILDTAGS=$BUILDTAGS"
--        make test-binaries "BUILDTAGS=$BUILDTAGS"
--        SKIP_USERNS=1 make localintegration "BUILDTAGS=$BUILDTAGS"
-+        make install PREFIX=/usr ETCDIR=/etc
-+        make test-binaries
-+        SKIP_USERNS=1 make localintegration
-         ;;
-     fedora-29) ;&  # Continue to the next item
-     fedora-28) ;&
-diff --git a/contrib/cirrus/lib.sh b/contrib/cirrus/lib.sh
-index 32b2c91a5..39e6c7699 100644
---- a/contrib/cirrus/lib.sh
-+++ b/contrib/cirrus/lib.sh
-@@ -199,7 +199,7 @@ install_runc_from_git(){
-     cd "$DEST"
-     ooe.sh git fetch origin --tags
-     ooe.sh git checkout -q "$RUNC_COMMIT"
--    ooe.sh make static BUILDTAGS="seccomp selinux"
-+    ooe.sh make static BUILDTAGS="seccomp apparmor selinux"
-     sudo install -m 755 runc /usr/bin/runc
-     cd $wd
- }
-diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
-index bcfe7e396..838f3c3f3 100755
---- a/contrib/cirrus/setup_environment.sh
-+++ b/contrib/cirrus/setup_environment.sh
-@@ -57,7 +57,6 @@ then
-         ubuntu-18)
-             # Always install runc on Ubuntu
-             install_runc_from_git
--            envstr='export BUILDTAGS="seccomp $($GOSRC/hack/btrfs_tag.sh) $($GOSRC/hack/btrfs_installed_tag.sh) $($GOSRC/hack/ostree_tag.sh) varlink exclude_graphdriver_devicemapper"'
-             ;;
-         fedora-29) ;&  # Continue to the next item
-         fedora-28)
-@@ -67,11 +66,9 @@ then
-             ;&  # Continue to the next item
-         centos-7) ;&
-         rhel-7)
--            envstr='unset BUILDTAGS'  # Use default from Makefile
-             ;;
-         *) bad_os_id_ver ;;
-     esac
--    X=$(echo "$envstr" | tee -a "$HOME/$ENVLIB") && eval "$X" && echo "$X"
- 
-     # Do the same for golang env. vars
-     go env | while read envline
-diff --git a/contrib/cirrus/system_test.sh b/contrib/cirrus/system_test.sh
-index 66974f8c6..cb179407a 100755
---- a/contrib/cirrus/system_test.sh
-+++ b/contrib/cirrus/system_test.sh
-@@ -15,12 +15,9 @@ set -x
- cd "$GOSRC"
- 
- case "${OS_RELEASE_ID}-${OS_RELEASE_VER}" in
--    ubuntu-18)
--        make install.tools "BUILDTAGS=$BUILDTAGS"
--        make "BUILDTAGS=$BUILDTAGS"
--        make test-binaries "BUILDTAGS=$BUILDTAGS"
--        ;;
-+    ubuntu-18) ;&  # Continue to the next item
-     fedora-28) ;&
-+    fedora-29) ;&
-     centos-7) ;&
-     rhel-7)
-         make install.tools
-diff --git a/contrib/cirrus/unit_test.sh b/contrib/cirrus/unit_test.sh
-index 15403b7a7..fd9e82509 100755
---- a/contrib/cirrus/unit_test.sh
-+++ b/contrib/cirrus/unit_test.sh
-@@ -16,12 +16,8 @@ clean_env
- set -x
- cd "$GOSRC"
- case "${OS_RELEASE_ID}-${OS_RELEASE_VER}" in
--    ubuntu-18)
--        make install.tools "BUILDTAGS=$BUILDTAGS"
--        make localunit "BUILDTAGS=$BUILDTAGS"
--        make "BUILDTAGS=$BUILDTAGS"
--        ;;
--    fedora-29) ;&  # Continue to the next item
-+    ubuntu-18) ;&  # Continue to the next item
-+    fedora-29) ;&
-     fedora-28) ;&
-     centos-7) ;&
-     rhel-7)
-diff --git a/pkg/apparmor/apparmor_linux.go b/pkg/apparmor/apparmor_linux.go
-index 0787b3fa5..2c5022c1f 100644
---- a/pkg/apparmor/apparmor_linux.go
-+++ b/pkg/apparmor/apparmor_linux.go
-@@ -214,8 +214,15 @@ func CheckProfileAndLoadDefault(name string) (string, error) {
- 		return name, nil
- 	}
- 
--	if name != "" && rootless.IsRootless() {
--		return "", errors.Wrapf(ErrApparmorRootless, "cannot load AppArmor profile %q", name)
-+	// AppArmor is not supported in rootless mode as it requires root
-+	// privileges.  Return an error in case a specific profile is specified.
-+	if rootless.IsRootless() {
-+		if name != "" {
-+			return "", errors.Wrapf(ErrApparmorRootless, "cannot load AppArmor profile %q", name)
-+		} else {
-+			logrus.Debug("skipping loading default AppArmor profile (rootless mode)")
-+			return "", nil
-+		}
- 	}
- 
- 	if name != "" && !runcaa.IsEnabled() {
-@@ -230,7 +237,7 @@ func CheckProfileAndLoadDefault(name string) (string, error) {
- 			return "", err
- 		}
- 		if !isLoaded {
--			return "", fmt.Errorf("AppArmor profile %q specified but not loaded")
-+			return "", fmt.Errorf("AppArmor profile %q specified but not loaded", name)
- 		}
- 		return name, nil
- 	}

podman-1.0.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:28ce1d810e2dce02402e6a809552d9769c079a0f748c18a62d23abd8f16ea639
-size 3450696

podman-1.1.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d30999542795bf94efbd408028e3d646b2cc7d544eea8faaaa9dd2516c6614a9
+size 4246876

podman.changes

@@ -1,3 +1,98 @@
+-------------------------------------------------------------------
+Fri Mar  8 09:47:25 UTC 2019 - Richard Brown <rbrown@suse.com>
+
+- podman-cni-config: remove artificial conflicts with kubelet 
+
+-------------------------------------------------------------------
+Thu Mar  7 15:22:22 UTC 2019 - Richard Brown <rbrown@suse.com>
+
+- Disable build with PIE on ppc64le to avoid boo#1098017
+
+-------------------------------------------------------------------
+Wed Mar  6 14:07:01 UTC 2019 - Richard Brown <rbrown@suse.com>
+
+- Update to v1.1.2
+  * Fixed a bug where the podman image list, podman image rm, and podman container list had broken global storage options
+  * Fixed a bug where the --label option to podman create and podman run was missing the -l alias
+  * Fixed a bug where running Podman with the --config flag would not set an appropriate default value for tmp_dir
+  * Fixed a bug where the podman logs command with the --timestamps flag produced unreadable output
+  * Fixed a bug where the podman cp command would automatically extract .tar files copied into the container
+  * The podman container stop command is now usable with the Podman remote client
+
+-------------------------------------------------------------------
+Mon Mar  4 11:27:03 UTC 2019 - Flavio Castelli <fcastelli@suse.com>
+
+- Update to v1.1.1
+  * Update release notes for v1.1.1
+  * Pull image for runlabel if not local
+  * Fix SystemExec completion race
+  * Fix link inconsistencies in man pages
+  * Verify that used OCI runtime supports checkpoint
+  * Should be defaulting to pull not pull-always
+  * podman-commands script: refactor
+  * Move Alias lines to descriptions of commands
+  * Fix usage messages for podman image list, rm
+  * Fix -s to --storage-driver in baseline test
+  * No podman container ps command exists
+  * Allow Exec API user to override streams
+  * fix up a number of misplace commands
+  * rootless, new[ug]idmap: on failure add output
+  * [ci skip] Critical note about merge bot
+  * podman port fix output
+  * Fix ignored --time argument to podman restart
+  * secrets: fix fips-mode with user namespaces
+  * Fix four errors tagged by Cobra macro debugging
+  * Clean up man pages to match commands
+  * Add debugging for errors to Cobra compatibility macros
+  * Command-line input validation: reject unused args
+  * Fix ignored --stop-timeout flag to 'podman create'
+  * fixup! Incorporate review feedback
+  * fixup! missed some more:
+  * fixup! Correction to 'checkpoint'
+  * Followup to #2456: update examples, add trust
+  * podman create: disable interspersed opts
+  * fix up a number of misplace commands
+  * Add a task to Cirrus gating to build w/o Varlink
+  * Skip checkpoint/restore tests on Fedora for now
+  * Fix build for non-Varlink-tagged Podman
+  * Remove restore as podman subcommand
+  * Better usage synopses for subcommands
+  * Bump gitvalidation epoch
+  * Bump to v1.2.0-dev
+  * Centralize setting default volume path
+  * Ensure volume path is set appropriately by default
+  * Move all storage configuration defaults into libpod
+  * rename pod when we have a name collision with a container
+  * podman remote-client readme
+- Update package to ship varlink required files
+
+-------------------------------------------------------------------
+Wed Feb 27 09:01:41 UTC 2019 - Richard Brown <rbrown@suse.com>
+
+- Update to v1.1.0
+  * Added --latest and --all flags to podman mount and podman umount
+  * Rootless Podman can now forward ports into containers (using the same -p and -P flags as root Podman)
+  * Rootless Podman will now pull some configuration options (for example, OCI runtime path) from the default root libpod.conf if they are not explicitly set in the user's own libpod.conf
+  * Added an alias -f for the --format flag of the podman info and podman version commands
+  * Added an alias -s for the --size flag of the podman inspect command
+  * Added the podman system info and podman system prune commands
+  * Added the podman cp command to copy files between containers and the host
+  * Added the --password-stdin flag to podman login
+  * Added the --all-tags flag to podman pull
+  * The --rm and --detach flags can now be used together with podman run
+  * The podman start and podman run commands for containers in pods will now start dependency containers if they are stopped
+  * Added the podman system renumber command to handle lock changes
+  * The --net=host and --dns flags for podman run and podman create no longer conflict
+  * Podman now handles mounting the shared /etc/resolv.conf from network namespaces created by ip netns add when they are passed in via podman run --net=ns:
+  * Various bugfixes - full changelog https://github.com/containers/libpod/releases/tag/v1.1.0
+- Removed obsolete patch containers-libpod-pull-2225.diff
+
+-------------------------------------------------------------------
+Tue Feb 26 17:17:32 UTC 2019 - Richard Brown <rbrown@suse.com>
+
+- Update to conmon from cri-o v1.13.1
+  * oci: read conmon process status
+
 -------------------------------------------------------------------
 Tue Feb 19 15:35:30 UTC 2019 - Richard Brown <rbrown@suse.com>
 

podman.spec

@@ -18,13 +18,13 @@
 
 %define project        github.com/containers/libpod
 %define conmon_project github.com/kubernetes-sigs/cri-o
-%define conmonver      1.13.0
+%define conmonver      1.13.1
 # Build with libostree-devel in Tumbleweed, Leap 15 and SLES 15
 %if 0%{?suse_version} >= 1500
 %define with_libostree 1
 %endif
 Name:           podman
-Version:        1.0.1
+Version:        1.1.2
 Release:        0
 Summary:        Daemon-less container engine for managing containers, pods and images
 License:        Apache-2.0
@@ -34,8 +34,6 @@ Source0:        %{name}-%{version}.tar.xz
 Source1:        conmon-%{conmonver}.tar.xz
 Source2:        libpod.conf
 Source3:        %{name}-rpmlintrc
-# https://github.com/containers/libpod/pull/2225
-Patch0:         containers-libpod-pull-2225.diff
 BuildRequires:  bash-completion
 BuildRequires:  cni
 BuildRequires:  device-mapper-devel
@@ -52,6 +50,10 @@ BuildRequires:  libcontainers-common
 BuildRequires:  libgpgme-devel
 BuildRequires:  libseccomp-devel
 BuildRequires:  golang(API) >= 1.11
+# Build fails with PIE enabled on ppc64le due to boo#1098017
+%ifarch ppc64le
+#!BuildIgnore: gcc-PIE
+%endif
 Requires:       cni
 Requires:       cni-plugins
 Requires:       iptables
@@ -82,16 +84,11 @@ skopeo, as they all share the same datastore backend.
 mkdir -pv $HOME/go/src/%{conmon_project}
 mv conmon-%{conmonver}/* $HOME/go/src/%{conmon_project}
 rm -r conmon-%{conmonver}
-%patch0 -p1
 
 %package cni-config
 Summary:        Basic CNI configuration for podman
 Group:          System/Management
 Requires:       %{name} = %{version}
-# Our Kubernetes configuration uses a different CNI setup, and if we included
-# this (basic) CNI setup in that configuration it can break networking for all
-# of the containers. So we only allow installing this on non-Kubic setups.
-Conflicts:      kubernetes-kubelet
 BuildArch:      noarch
 
 %description cni-config
@@ -150,6 +147,11 @@ install -D -m 0644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/containers/libpod.conf
 install -D -m 0644 %{SOURCE2} %{buildroot}/%{_datadir}/containers/libpod.conf
 install -D -m 0644 completions/bash/podman %{buildroot}/%{_datadir}/bash-completion/completions/podman
 
+# podman varlink
+install -D -m 0644 contrib/varlink/podman.conf %{buildroot}/%{_tmpfilesdir}/podman.conf
+install -D -m 0644 contrib/varlink/io.podman.service %{buildroot}%{_unitdir}/io.podman.service
+install -D -m 0644 contrib/varlink/io.podman.socket %{buildroot}%{_unitdir}/io.podman.socket
+
 # conmon
 cd $HOME/go/src/%{conmon_project}
 install -D -m 0755 bin/conmon  %{buildroot}/%{_libexecdir}/podman/bin/conmon
@@ -171,10 +173,28 @@ install -D -m 0755 bin/conmon  %{buildroot}/%{_libexecdir}/podman/bin/conmon
 %{_datadir}/containers/libpod.conf
 # Completion
 %{_datadir}/bash-completion/completions/podman
+# Varlink
+%{_tmpfilesdir}/podman.conf
+%{_unitdir}/io.podman.service
+%{_unitdir}/io.podman.socket
+%ghost /run/podman
 %license LICENSE
 
 %files cni-config
 %config %{_sysconfdir}/cni/net.d/87-podman-bridge.conflist
 %license LICENSE
 
+%pre -p /bin/bash
+%service_add_pre io.podman.service io.podman.socket
+
+%post -p /bin/bash
+%service_add_post io.podman.service io.podman.socket
+%tmpfiles_create %{_tmpfilesdir}/podman.conf
+
+%preun -p /bin/bash
+%service_del_preun io.podman.service io.podman.socket
+
+%postun -p /bin/bash
+%service_del_postun io.podman.service io.podman.socket
+
 %changelog