diff --git a/_service b/_service
index 7230468..a0b8aed 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
https://github.com/containers/netavark.git
@PARENT_TAG@
git
- v1.5.0
+ v1.6.0
*
v(\d+\.\d+\.\d+)
\1
diff --git a/_servicedata b/_servicedata
index fd86415..b411f7c 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/containers/netavark.git
- dbdeb9a7969e5398a8431a192a278986e4e1ae36
\ No newline at end of file
+ 2f01092dc3259a0d0239be59af1b2553437a5379
\ No newline at end of file
diff --git a/cargo_config b/cargo_config
index 60d928d..6fb4ff4 100644
--- a/cargo_config
+++ b/cargo_config
@@ -1,9 +1,5 @@
[source.crates-io]
replace-with = "vendored-sources"
-[source."https://github.com/containers/netavark-dhcp-proxy"]
-git = "https://github.com/containers/netavark-dhcp-proxy"
-replace-with = "vendored-sources"
-
[source.vendored-sources]
directory = "vendor"
\ No newline at end of file
diff --git a/netavark-1.5.0.tar.gz b/netavark-1.5.0.tar.gz
deleted file mode 100644
index 2452358..0000000
--- a/netavark-1.5.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a5c4119d8a60aabf79b678c4be985fa852041ee3b9648badc3909d66362f248
-size 82192
diff --git a/netavark-1.6.0.tar.gz b/netavark-1.6.0.tar.gz
new file mode 100644
index 0000000..c2b1b4c
--- /dev/null
+++ b/netavark-1.6.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c3d26295afe6c65f14cc625c4eec0df16273b9701a7d93cebf12bc7c8d993f50
+size 135702
diff --git a/netavark.changes b/netavark.changes
index ab80bd0..1fe3f5e 100644
--- a/netavark.changes
+++ b/netavark.changes
@@ -1,3 +1,88 @@
+-------------------------------------------------------------------
+Wed Apr 12 06:12:35 UTC 2023 - danish.prakash@suse.com
+
+- Update to version 1.6.0:
+ * v1.6.0 release
+ * Update release notes for v1.6.0
+ * dhcp-proxy: fix typo for --activity-timeout
+ * chore(deps): update dependency containers/automation_images to v20230405
+ * dhcp-proxy: use better error when connection fails
+ * add documentation for netavark plugins
+ * add stderr example plugin to test stderr passthrough
+ * add netavark plugin driver
+ * add example error plugin
+ * add host-device example plugin
+ * plugin: add simple plugin interface
+ * netlink: add dump_addresses
+ * netlink: add set_link_ns
+ * dhcp-proxy: correctly exit > 0 on errors
+ * fix(deps): update rust crate tonic to 0.9
+ * fix(deps): update rust crate mozim to 0.2.2
+ * fix(deps): update rust crate serde to 1.0.159
+ * fix(deps): update rust crate netlink-sys to 0.8.5
+ * dhcp-proxy: create socket directory only when used
+ * dhcp-proxy: do not remove socket when running under systemd
+ * Makefile: netavark-dhcp-proxy.service use correct path
+ * fix(deps): update rust crate http to 0.2.9
+ * chore(deps): update rust crate once_cell to 1.17.1
+ * fix(deps): update rust-futures monorepo to 0.3.28
+ * fix(deps): update rust crate serde_json to 1.0.95
+ * chore(deps): update dependency containers/automation_images to v20230330
+ * Disable Dependabot in favor of Renovate
+ * chore(deps): update rust crate chrono to 0.4.24
+ * build(deps): bump ipnet from 2.7.1 to 2.7.2
+ * build(deps): bump serde from 1.0.158 to 1.0.159
+ * build(deps): bump serde_json from 1.0.94 to 1.0.95
+ * update,main: dont write empty space when no network_dns_servers is given
+ * fix(deps): update rust crate tokio to 1.27
+ * Quit Leasing when Client disconnects
+ * build(deps): bump mozim from 0.2.1 to 0.2.2
+ * iptables: fix incorrect debug statement
+ * build(deps): bump serde from 1.0.156 to 1.0.158
+ * iptables: port fw handle wildcard address correctly
+ * chore(deps): update dependency containers/automation_images to v20230320
+ * build(deps): bump zbus from 3.11.0 to 3.11.1
+ * build(deps): bump anyhow from 1.0.69 to 1.0.70
+ * [CI:BUILD] Packit: trigger builds on commit to main branch
+ * Cirrus: Invalidate v2 bin cache
+ * Include Systemd Files in RPM Package
+ * Cirrus: Fix success failing on artifact extraction
+ * fix lint issue with new rust version 1.68
+ * Cirrus: Update to newer CI VM images
+ * build(deps): bump serde from 1.0.152 to 1.0.156
+ * combine dhcp-proxy and netavark into one binary
+ * update: should allow empty network_dns_servers
+ * build(deps): bump libc from 0.2.139 to 0.2.140
+ * fix aarch64 ncat flake
+ * update to mozim 0.2.1
+ * build(deps): bump zbus from 3.10.0 to 3.11.0
+ * packit: Update build release tag correctly
+ * test: move proto option into run_nc_test()
+ * test: add netns pid param to port checks
+ * test: import podman code to check for ports
+ * cirrus.yaml: add new binaries in art_prep_script
+ * fix netavark-dhcp-proxy binary in system unit
+ * import netavark-proxy-dhcp tests
+ * add build_proxy_client target
+ * add netavark-dhcp-proxy to rpm
+ * Fix dhcp-proxy build
+ * Merge nv-dhcp-proxy into nv
+ * fix default route metric test name
+ * build(deps): bump tokio from 1.25.0 to 1.26.0
+ * Support none parameter on NETAVARK_FW
+ * build(deps): bump anyhow from 1.0.68 to 1.0.69
+ * Fix typos
+ * update netlink-packet-{route,core} to 0.15 and 0.5
+ * build(deps): bump serde_json from 1.0.92 to 1.0.93
+ * build(deps): bump zbus from 3.8.0 to 3.10.0
+ * [CI:BUILD] Packit: initial enablement
+ * Allow custom cargo binary path
+ * build(deps): bump serde_json from 1.0.91 to 1.0.92
+ * Cirrus: Reduce requested CPUs for compile-tasks
+ * bump to version 1.0.6-dev
+ * build(deps): bump netlink-sys from 0.8.3 to 0.8.4
+ * Add renovate.json5
+
-------------------------------------------------------------------
Thu Mar 16 14:07:12 UTC 2023 - Dan Čermák
diff --git a/netavark.spec b/netavark.spec
index e061a82..d2f243c 100644
--- a/netavark.spec
+++ b/netavark.spec
@@ -1,7 +1,7 @@
#
# spec file for package netavark
#
-# Copyright (c) SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: netavark
-Version: 1.5.0
+Version: 1.6.0
Release: 0
Summary: Container network stack
License: Apache-2.0
@@ -25,10 +25,11 @@ URL: https://github.com/containers/%{name}
Source0: %{name}-%{version}.tar.gz
Source1: vendor.tar.gz
Source2: cargo_config
-BuildRequires: rust+cargo >= 1.66
BuildRequires: cargo-packaging
BuildRequires: go-md2man
BuildRequires: protobuf-devel
+BuildRequires: rust+cargo >= 1.66
+BuildRequires: systemd-rpm-macros
# aardvark-dns and %%{name} are usually released in sync
Recommends: aardvark-dns >= %{version}-1
# Provides: container-network-stack = 2
@@ -58,7 +59,6 @@ Its features include:
mkdir .cargo
cp %{SOURCE2} .cargo/config
-
%build
cargo build --release
mkdir -p bin
@@ -67,15 +67,27 @@ cp target/release/%{name} bin/
cd docs
go-md2man -in %{name}.1.md -out %{name}.1
-
%install
%make_install DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBEXECDIR=%{_libexecdir}
-
%files
%license LICENSE
%dir %{_libexecdir}/podman
%{_libexecdir}/podman/%{name}
%{_mandir}/man1/%{name}.1%{?ext_man}
+%{_unitdir}/%{name}-dhcp-proxy.service
+%{_unitdir}/%{name}-dhcp-proxy.socket
+
+%pre
+%service_add_pre %{name}-dhcp-proxy.service %{name}-dhcp-proxy.socket
+
+%post
+%service_add_post %{name}-dhcp-proxy.service %{name}-dhcp-proxy.socket
+
+%preun
+%service_del_preun %{name}-dhcp-proxy.service %{name}-dhcp-proxy.socket
+
+%postun
+%service_del_postun %{name}-dhcp-proxy.service %{name}-dhcp-proxy.socket
%changelog
diff --git a/vendor.tar.gz b/vendor.tar.gz
index 0b74f0a..07f8ab8 100644
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:710d383e4cc8a965319a7f5a5a5851160cee69800b7f859190bc16895df288a2
-size 32059466
+oid sha256:127fddd3fd2fa4c38c65ae3aee5a28edf19e5cf34703877dfd3ae24e29f3052e
+size 46746152