From d8c0683b917be33ef9d9440b20ef9ba92204f4ff Mon Sep 17 00:00:00 2001
From: Peter Czanik <peter@czanik.hu>
Date: Thu, 5 Aug 2021 08:25:56 +0200
Subject: [PATCH] - update to 1.9.7p2 - follow up path change in strip patch -
 added --enable-zlib=system configure parameter, so sudo uses system zlib,  
 autoconf is no more needed

Signed-off-by: Peter Czanik <peter@czanik.hu>
---
 sudo-1.6.7p5-strip.patch |  4 ++--
 sudo.spec                | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/sudo-1.6.7p5-strip.patch b/sudo-1.6.7p5-strip.patch
index f9e2faa..f690659 100644
--- a/sudo-1.6.7p5-strip.patch
+++ b/sudo-1.6.7p5-strip.patch
@@ -1,5 +1,5 @@
---- sudo-1.6.7p5/install-sh.strip	2005-07-21 14:28:25.000000000 +0200
-+++ sudo-1.6.7p5/install-sh	2005-07-21 14:29:18.000000000 +0200
+--- sudo-1.6.7p5/scripts/install-sh.strip	2005-07-21 14:28:25.000000000 +0200
++++ sudo-1.6.7p5/scripts/install-sh	2005-07-21 14:29:18.000000000 +0200
 @@ -138,7 +138,7 @@
  	fi
  	;;
diff --git a/sudo.spec b/sudo.spec
index e1e3e6e..ceb4c24 100644
--- a/sudo.spec
+++ b/sudo.spec
@@ -1,7 +1,7 @@
 Summary: Allows restricted root access for specified users
 Name: sudo
-Version: 1.9.5p2
-Release: 3%{?dist}
+Version: 1.9.7p2
+Release: 1%{?dist}
 License: ISC
 URL: https://www.sudo.ws
 Source0: %{url}/dist/%{name}-%{version}.tar.gz
@@ -17,7 +17,8 @@ BuildRequires: groff
 BuildRequires: openldap-devel
 BuildRequires: flex
 BuildRequires: bison
-BuildRequires: automake autoconf libtool
+# BuildRequires: automake autoconf libtool
+BuildRequires: libtool
 BuildRequires: audit-libs-devel libcap-devel
 BuildRequires: libselinux-devel
 BuildRequires: sendmail
@@ -74,7 +75,7 @@ BuildRequires:  python3-devel
 %build
 # Remove bundled copy of zlib
 rm -rf zlib/
-autoreconf -I m4 -fv --install
+#autoreconf -I m4 -fv --install
 
 %ifarch s390 s390x sparc64
 F_PIE=-fPIE
@@ -103,6 +104,7 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
         --with-selinux \
         --with-passprompt="[sudo] password for %p: " \
 	--enable-python \
+	--enable-zlib=system \
         --with-linux-audit \
         --with-sssd
 #       --without-kerb5 \
@@ -230,6 +232,12 @@ EOF
 %attr(0644,root,root) %{_libexecdir}/sudo/python_plugin.so
 
 %changelog
+* Fri Jul 30 2021 Peter Czanik <peter@czanik.hu> - 1.9.7p2-1
+- update to 1.9.7p2
+- follow up path change in strip patch
+- added --enable-zlib=system configure parameter, so sudo uses system zlib,
+  autoconf is no more needed
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5p2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild