diff --git a/_service b/_service
index 96bb86d..876fdff 100644
--- a/_service
+++ b/_service
@@ -2,7 +2,7 @@
https://github.com/containers/podman.git
git
- v3.2.3
+ v3.3.1
@PARENT_TAG@
enable
v(.*)
diff --git a/_servicedata b/_servicedata
index e12b3e4..8d1e8bf 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/containers/podman.git
- 1e6fd46e91b21342f9454cf8105a92b90e398c52
\ No newline at end of file
+ 4c5283fabff2de5145838f1847a5a7b2b1fbc0a5
\ No newline at end of file
diff --git a/podman-3.2.3.tar.xz b/podman-3.2.3.tar.xz
deleted file mode 100644
index 08abb7b..0000000
--- a/podman-3.2.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c87bbe593b7763bad6da5bf7826525976b113262a9ff9d9878f51ac3f17f62e5
-size 6343504
diff --git a/podman-3.3.1.tar.xz b/podman-3.3.1.tar.xz
new file mode 100644
index 0000000..a04ccfa
--- /dev/null
+++ b/podman-3.3.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:74dfd79d93a9ab5ec08baca60809cb258bdf80c6dbbeb4772de7bde8f6ad6228
+size 6490324
diff --git a/podman.changes b/podman.changes
index 34a428c..1798280 100644
--- a/podman.changes
+++ b/podman.changes
@@ -1,3 +1,65 @@
+-------------------------------------------------------------------
+Thu Sep 2 22:37:06 UTC 2021 - Michael Ströder
+
+- require runc >= 1.0.1
+
+-------------------------------------------------------------------
+Tue Aug 31 05:57:57 UTC 2021 - michael@stroeder.com
+
+- Update to version 3.3.1:
+ * Bugfixes
+ - Fixed a bug where unit files created by podman generate systemd could
+ not cleanup shut down containers when stopped by systemctl stop (#11304).
+ - Fixed a bug where podman machine commands would not properly locate
+ the gvproxy binary in some circumstances.
+ - Fixed a bug where containers created as part of a pod using the
+ --pod-id-file option would not join the pod's network namespace (#11303).
+ - Fixed a bug where Podman, when using the systemd cgroups driver,
+ could sometimes leak dbus sessions.
+ - Fixed a bug where the until filter to podman logs and podman events
+ was improperly handled, requiring input to be negated (#11158).
+ - Fixed a bug where rootless containers using CNI networking run on
+ systems using systemd-resolved for DNS would fail to start if resolved
+ symlinked /etc/resolv.conf to an absolute path (#11358).
+ * API
+ - A large number of potential file descriptor leaks from improperly closing
+ client connections have been fixed.
+
+-------------------------------------------------------------------
+Mon Aug 23 10:36:00 UTC 2021 - Alexandre Vicenzi
+
+- Revert crun change due to crun having exclusive arch targets
+ that would drop podman support in PPC and IBM Z
+
+-------------------------------------------------------------------
+Fri Aug 20 20:58:22 UTC 2021 - michael@stroeder.com
+
+- Update to version 3.3.0:
+ * Fix network aliases with network id
+ * machine: compute sha256 as we read the image file
+ * machine: check for file exists instead of listing directory
+ * pkg/bindings/images.nTar(): slashify hdr.Name values
+ * Volumes: Only remove from DB if plugin removal succeeds
+ * For compatibility, ignore Content-Type
+ * [v3.3] Bump c/image 5.15.2, buildah v1.22.3
+ * Implement SD-NOTIFY proxy in conmon
+ * Fix rootless cni dns without systemd stub resolver
+ * fix rootlessport flake
+ * Skip stats test in CGv1 container environments
+ * Fix AVC denials in tests of volume mounts
+ * Restore buildah-bud test requiring new images
+ * Revert ".cirrus.yml: use fresh images for all VMs"
+ * Fix device tests using ls test files
+ * Enhance priv. dev. check
+ * Workaround host availability of /dev/kvm
+ * Skip cgroup-parent test due to frequent flakes
+ * Cirrus: Fix not uploading logformatter html
+
+-------------------------------------------------------------------
+Fri Aug 13 11:26:44 UTC 2021 - Alexandre Vicenzi
+
+- Switch to crun (bsc#1188914)
+
-------------------------------------------------------------------
Sat Jul 17 16:37:58 UTC 2021 - michael@stroeder.com
diff --git a/podman.spec b/podman.spec
index 189132b..d754709 100644
--- a/podman.spec
+++ b/podman.spec
@@ -22,7 +22,7 @@
%define with_libostree 1
%endif
Name: podman
-Version: 3.2.3
+Version: 3.3.1
Release: 0
Summary: Daemon-less container engine for managing containers, pods and images
License: Apache-2.0
@@ -59,7 +59,7 @@ Requires: conmon >= 2.0.24
Requires: fuse-overlayfs
Requires: iptables
Requires: libcontainers-common >= 20210626
-Requires: runc >= 1.0.0~rc4
+Requires: runc >= 1.0.1
Requires: slirp4netns >= 0.4.0
Requires: timezone
Recommends: %{name}-cni-config = %{version}
@@ -130,7 +130,7 @@ make %{?_smp_mflags} docs
make DESTDIR=%{buildroot} PREFIX=/usr install install.completions install.docker install.docker-docs
# packaged in libcontainers-common
-rm %{buildroot}/usr/share/man/man5/containers-mounts.conf.* %{buildroot}/usr/share/man/man5/oci-hooks.*
+rm %{buildroot}/usr/share/man/man5/oci-hooks.*
# Add podman modprobe.d drop-in config
mkdir -p %{buildroot}%{_prefix}/lib/modules-load.d
@@ -165,10 +165,12 @@ install -D -m 0644 %{SOURCE4} %{buildroot}%{_docdir}/%{name}/README.SUSE
%{_unitdir}/podman.service
%{_unitdir}/podman.socket
%{_unitdir}/podman-auto-update.service
+%{_unitdir}/podman-restart.service
%{_unitdir}/podman-auto-update.timer
%{_userunitdir}/podman.service
%{_userunitdir}/podman.socket
%{_userunitdir}/podman-auto-update.service
+%{_userunitdir}/podman-restart.service
%{_userunitdir}/podman-auto-update.timer
%ghost /run/podman
%ghost %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-libpodconf
@@ -184,7 +186,6 @@ install -D -m 0644 %{SOURCE4} %{buildroot}%{_docdir}/%{name}/README.SUSE
%{_datadir}/fish/vendor_completions.d/podman-remote.fish
%files cni-config
-%config %{_sysconfdir}/cni/net.d/87-podman-bridge.conflist
%license LICENSE
%files docker
@@ -196,23 +197,23 @@ install -D -m 0644 %{SOURCE4} %{buildroot}%{_docdir}/%{name}/README.SUSE
%tmpfiles_create %{_tmpfilesdir}/podman-docker.conf
%pre
-%service_add_pre podman.service podman.socket podman-auto-update.service podman-auto-update.timer
+%service_add_pre podman.service podman.socket podman-auto-update.service podman-restart.service podman-auto-update.timer
# move away any old rpmsave config file to avoid having it re-activated again in
# %%posttrans
test -f /etc/containers/libpod.conf.rpmsave && mv -v /etc/containers/libpod.conf.rpmsave /etc/containers/libpod.conf.rpmsave.old ||:
%post
-%service_add_post podman.service podman.socket podman-auto-update.service podman-auto-update.timer
+%service_add_post podman.service podman.socket podman-auto-update.service podman-restart.service podman-auto-update.timer
%tmpfiles_create %{_tmpfilesdir}/podman.conf
-%systemd_user_post podman.service podman.socket podman-auto-update.service podman-auto-update.timer
+%systemd_user_post podman.service podman.socket podman-auto-update.service podman-restart.service podman-auto-update.timer
%preun
-%service_del_preun podman.service podman.socket podman-auto-update.service podman-auto-update.timer
-%systemd_user_preun podman.service podman.socket podman-auto-update.service podman-auto-update.timer
+%service_del_preun podman.service podman.socket podman-auto-update.service podman-restart.service podman-auto-update.timer
+%systemd_user_preun podman.service podman.socket podman-auto-update.service podman-restart.service podman-auto-update.timer
%postun
-%service_del_postun podman.service podman.socket podman-auto-update.service podman-auto-update.timer
-%systemd_user_postun podman.service podman.socket podman-auto-update.service podman-auto-update.timer
+%service_del_postun podman.service podman.socket podman-auto-update.service podman-restart.service podman-auto-update.timer
+%systemd_user_postun podman.service podman.socket podman-auto-update.service podman-restart.service podman-auto-update.timer
%posttrans
# if libpod.conf.rpmsave was created, set an update