From 501d23a64c5c62c8c69b55ac6cf2b2ccf6012517 Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Thu, 21 Sep 2023 20:33:14 +0000
Subject: [PATCH] import CS tang-14-2.el9

---
 .gitignore      |  2 +-
 .tang.metadata  |  2 +-
 SPECS/tang.spec | 13 +++++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index e7a4893..ac3ac3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/tang-11.tar.xz
+SOURCES/tang-14.tar.xz
diff --git a/.tang.metadata b/.tang.metadata
index 18b30ea..5e7831b 100644
--- a/.tang.metadata
+++ b/.tang.metadata
@@ -1 +1 @@
-07fd3e9ad2eb5f53cd62477dd1698d067f6663ae SOURCES/tang-11.tar.xz
+81a09f024fcb0e8b53bb867b2679ebab14555791 SOURCES/tang-14.tar.xz
diff --git a/SPECS/tang.spec b/SPECS/tang.spec
index eb73a3e..99bbd22 100644
--- a/SPECS/tang.spec
+++ b/SPECS/tang.spec
@@ -1,5 +1,5 @@
 Name:           tang
-Version:        11
+Version:        14
 Release:        2%{?dist}
 Summary:        Network Presence Binding Daemon
 
@@ -29,6 +29,7 @@ BuildRequires:  coreutils
 BuildRequires:  grep
 BuildRequires:  socat
 BuildRequires:  sed
+BuildRequires:  iproute
 
 %{?systemd_requires}
 Requires:       coreutils
@@ -51,7 +52,7 @@ Tang is a small daemon for binding data to the presence of a third party.
 %install
 %meson_install
 install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/tang.conf
-echo "User=%{name}" >> $RPM_BUILD_ROOT/%{_unitdir}/%{name}d@.service
+grep "User=%{name}" $RPM_BUILD_ROOT/%{_unitdir}/%{name}d@.service || echo "User=%{name}" >> $RPM_BUILD_ROOT/%{_unitdir}/%{name}d@.service
 %{__mkdir_p} $RPM_BUILD_ROOT/%{_localstatedir}/db/%{name}
 
 %check
@@ -99,6 +100,14 @@ fi
 %{_sysusersdir}/tang.conf
 
 %changelog
+* Thu Jun 29 2023 Sergio Arroutbi <sarroutb@redhat.com> - 14-2
+- Fix service start up
+
+* Tue Jun 27 2023 Sergio Arroutbi <sarroutb@redhat.com> - 14-1
+- New upstream release - v14.
+  Resolves: rhbz#2182411
+  Resolves: CVE-2023-1672
+
 * Wed Aug 17 2022 Sergio Arroutbi <sarroutb@redhat.com> - 11-2
 - Adopt systemd-sysusers format
   Resolves: rhbz#2095474