Accepting request 723244 from devel:kubic

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

_service

@@ -4,22 +4,14 @@
 <param name="url">https://github.com/containers/libpod.git</param>
 <param name="scm">git</param>
 <param name="filename">podman</param>
-<param name="versionformat">1.4.4</param>
+<param name="versionformat">1.5.0</param>
-<param name="revision">v1.4.4</param>
+<param name="revision">v1.5.0</param>
 </service>
 
 <service name="set_version" mode="disabled">
 <param name="basename">podman</param>
 </service>
 
-<service name="tar_scm" mode="disabled">
-<param name="url">https://github.com/containers/conmon.git</param>
-<param name="scm">git</param>
-<param name="filename">conmon</param>
-<param name="versionformat">0.3.0</param>
-<param name="revision">v0.3.0</param>
-</service>
-
 <service name="recompress" mode="disabled">
 <param name="file">*.tar</param>
 <param name="compression">xz</param>

conmon-0.3.0.tar.xz

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

libpod.conf

@@ -4,9 +4,10 @@
 # Default transport method for pulling and pushing for images
 image_default_transport = "docker://"
 
-# Paths to look for the Conmon container manager binary
+# Paths to look for the conmon container manager binary.
+# If the paths are empty or no valid path was found, then the `$PATH`
+# environment variable will be used as the fallback.
 conmon_path = [
-	    "/usr/lib/podman/bin/conmon",
 ]
 
 # Environment variables to pass into conmon
@@ -112,10 +113,10 @@ runtime = "runc"
 runtime_supports_json = ["runc"]
 
 # Paths to look for a valid OCI runtime (runc, runv, etc)
+# If the paths are empty or no valid path was found, then the `$PATH`
+# environment variable will be used as the fallback.
 [runtimes]
 runc = [
-  "/usr/bin/runc",
-  "/usr/sbin/runc"
 ]
 
 # The [runtimes] table MUST be the last thing in this file.

podman-1.4.4.tar.xz

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

podman-1.5.0.tar.xz

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

podman.changes

@@ -1,3 +1,145 @@
+-------------------------------------------------------------------
+Wed Aug 14 08:26:22 UTC 2019 - Sascha Grunert <sgrunert@suse.com>
+
+- Update podman to v1.5.0
+  * Features
+    - Podman containers can now join the user namespaces of other
+      containers with --userns=container:$ID, or a user namespace at
+      an arbitary path with --userns=ns:$PATH
+    - Rootless Podman can experimentally squash all UIDs and GIDs in
+      an image to a single UID and GID (which does not require use of
+      the newuidmap and newgidmap executables) by passing
+      --storage-opt ignore_chown_errors
+    - The podman generate kube command now produces YAML for any bind
+      mounts the container has created (#2303)
+    - The podman container restore command now features a new flag,
+      --ignore-static-ip, that can be used with --import to import a
+      single container with a static IP multiple times on the same
+      host
+    - Added the ability for podman events to output JSON by
+      specifying --format=json
+    - If the OCI runtime or conmon binary cannot be found at the
+      paths specified in libpod.conf, Podman will now also search for
+      them in the calling user's path
+    - Added the ability to use podman import with URLs (#3609)
+    - The podman ps command now supports filtering names using
+      regular expressions (#3394)
+    - Rootless Podman containers with --privileged set will now mount
+      in all host devices that the user can access
+    - The podman create and podman run commands now support the
+      --env-host flag to forward all environment variables from the
+      host into the container
+    - Rootless Podman now supports healthchecks (#3523)
+    - The format of the HostConfig portion of the output of podman
+      inspect on containers has been improved and synced with Docker
+    - Podman containers now support CGroup namespaces, and can create
+      them by passing --cgroupns=private to podman run or podman
+      create
+    - The podman create and podman run commands now support the
+      --ulimit=host flag, which uses any ulimits currently set on the
+      host for the container
+    - The podman rm and podman rmi commands now use different exit
+      codes to indicate 'no such container' and 'container is
+      running' errors
+    - Support for CGroups V2 through the crun OCI runtime has been
+      greatly improved, allowing resource limits to be set for
+      rootless containers when the CGroups V2 hierarchy is in use
+  * Bugfixes
+    - Fixed a bug where a race condition could cause podman restart
+      to fail to start containers with ports
+    - Fixed a bug where containers restored from a checkpoint would
+      not properly report the time they were started at
+    - Fixed a bug where podman search would return at most 25
+      results, even when the maximum number of results was set higher
+    - Fixed a bug where podman play kube would not honor capabilities
+      set in imported YAML (#3689)
+    - Fixed a bug where podman run --env, when passed a single key
+      (to use the value from the host), would set the environment
+      variable in the container even if it was not set on the host
+      (#3648)
+    - Fixed a bug where podman commit --changes would not properly
+      set environment variables
+    - Fixed a bug where Podman could segfault while working with
+      images with no history
+    - Fixed a bug where podman volume rm could remove arbitrary
+      volumes if given an ambiguous name (#3635)
+    - Fixed a bug where podman exec invocations leaked memory by not
+      cleaning up files in tmpfs
+    - Fixed a bug where the --dns and --net=container flags to podman
+      run and podman create were not mutually exclusive (#3553)
+    - Fixed a bug where rootless Podman would be unable to run
+      containers when less than 5 UIDs were available
+    - Fixed a bug where containers in pods could not be removed
+      without removing the entire pod (#3556)
+    - Fixed a bug where Podman would not properly clean up all CGroup
+      controllers for created cgroups when using the cgroupfs CGroup
+      driver
+    - Fixed a bug where Podman containers did not properly clean up
+      files in tmpfs, resulting in a memory leak as containers
+      stopped
+    - Fixed a bug where healthchecks from images would not use
+      default settings for interval, retries, timeout, and start
+      period when they were not provided by the image (#3525)
+    - Fixed a bug where healthchecks using the HEALTHCHECK CMD format
+      where not properly supported (#3507)
+    - Fixed a bug where volume mounts using relative source paths
+      would not be properly resolved (#3504)
+    - Fixed a bug where podman run did not use authorization
+      credentials when a custom path was specified (#3524)
+    - Fixed a bug where containers checkpointed with podman container
+      checkpoint did not properly set their finished time
+    - Fixed a bug where running podman inspect on any container not
+      created with podman run or podman create (for example, pod
+      infra containers) would result in a segfault (#3500)
+    - Fixed a bug where healthcheck flags for podman create and
+      podman run were incorrectly named (#3455)
+    - Fixed a bug where Podman commands would fail to find targets if
+      a partial ID was specified that was ambiguous between a
+      container and pod (#3487)
+    - Fixed a bug where restored containers would not have the
+      correct SELinux label
+    - Fixed a bug where Varlink endpoints were not working properly
+      if more was not correctly specified
+    - Fixed a bug where the Varlink PullImage endpoint would crash if
+      an error occurred (#3715)
+    - Fixed a bug where the --mount flag to podman create and podman
+      run did not allow boolean arguments for its ro and rw options
+      (#2980)
+    - Fixed a bug where pods did not properly share the UTS
+      namespace, resulting in incorrect behavior from some utilities
+      which rely on hostname (#3547)
+    - Fixed a bug where Podman would unconditionally append
+      ENTRYPOINT to CMD during podman commit (and when reporting CMD
+      in podman inspect) (#3708)
+    - Fixed a bug where podman events with the journald events
+      backend would incorrectly print 6 previous events when only new
+      events were requested (#3616)
+    - Fixed a bug where podman port would exit prematurely when a
+      port number was specified (#3747)
+    - Fixed a bug where passing . as an argument to the --dns-search
+      flag to podman create and podman run was not properly clearing
+      DNS search domains in the container
+  * Misc
+    - Updated vendored Buildah to v1.10.1
+    - Updated vendored containers/image to v3.0.2
+    - Updated vendored containers/storage to v1.13.1
+    - Podman now requires conmon v2.0.0 or higher
+    - The podman info command now displays the events logger being in
+      use
+    - The podman inspect command on containers now includes the ID of
+      the pod a container has joined and the PID of the container's
+      conmon process
+    - The -v short flag for podman --version has been re-added
+    - Error messages from podman pull should be significantly clearer
+    - The podman exec command is now available in the remote client
+    - The podman-v1.5.0.tar.gz file attached is podman packaged for
+      MacOS. It can be installed using Homebrew.
+- Use new conmon package as direct dependency
+- Remove internal conmon package
+- Update libpod.conf to support latest path discovery feature for
+  `runc` and `conmon` binaries.
+- Re-enable 32bit build
+
 -------------------------------------------------------------------
 Thu Jul 25 09:20:47 UTC 2019 - Richard Brown <rbrown@suse.com>
 

podman.spec

@@ -17,21 +17,18 @@
 
 
 %define project        github.com/containers/libpod
-%define conmon_project conmon
-%define conmonver      0.3.0
 # 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.4.4
+Version:        1.5.0
 Release:        0
 Summary:        Daemon-less container engine for managing containers, pods and images
 License:        Apache-2.0
 Group:          System/Management
 Url:            https://github.com/containers/libpod
 Source0:        %{name}-%{version}.tar.xz
-Source1:        %{conmon_project}-%{conmonver}.tar.xz
 Source2:        libpod.conf
 Source3:        %{name}-rpmlintrc
 BuildRequires:  bash-completion
@@ -55,11 +52,10 @@ BuildRequires:  golang(API) >= 1.12
 %ifarch ppc64le
 #!BuildIgnore: gcc-PIE
 %endif
-# i586 not supported, containers/conmon does not build
-ExcludeArch:    i586
 Requires:       apparmor-parser
 Requires:       cni
 Requires:       cni-plugins
+Requires:       conmon
 Requires:       iptables
 Requires:       libcontainers-common
 Requires:       libcontainers-image
@@ -84,12 +80,6 @@ skopeo, as they all share the same datastore backend.
 
 %prep
 %setup -q
-# unpack conmon into the unpacked podman source
-%setup -q -T -D -a 1
-rm -rf $HOME/%{conmon_project}
-mkdir -pv $HOME/%{conmon_project}
-mv %{conmon_project}-%{conmonver}/* $HOME/%{conmon_project}
-rm -r %{conmon_project}-%{conmonver}
 
 %package cni-config
 Summary:        Basic CNI configuration for podman
@@ -138,10 +128,6 @@ go build -tags "$BUILDTAGS remoteclient" \
 # Build manpages
 make %{?_smp_mflags} docs
 
-# Build conmon
-cd $HOME/%{conmon_project}
-make
-
 %check
 # Too many tests fail due to the restricted permissions in the build enviroment.
 # Updates must be tested manually.
@@ -166,19 +152,12 @@ install -D -m 0644 contrib/varlink/podman.conf %{buildroot}/%{_tmpfilesdir}/podm
 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/%{conmon_project}
-install -D -m 0755 bin/conmon  %{buildroot}/%{_libexecdir}/podman/bin/conmon
-
 %fdupes %{buildroot}/%{_prefix}
 
 %files
 # Binaries
 %{_bindir}/podman
 %{_bindir}/podman-remote
-%dir %{_libexecdir}/podman
-%dir %{_libexecdir}/podman/bin
-%{_libexecdir}/podman/bin/conmon
 # Manpages
 %{_mandir}/man1/podman*.1*
 %{_mandir}/man5/libpod*.5*