From 6ab4cb66ef2c21ce2e1101c85982e3b385d21d3b Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Tue, 20 Dec 2022 16:46:43 +0100
Subject: [PATCH] Update to version 1.1.8

---
 .gitignore                                    |  2 +
 ...87f858eb49e6b13ab610e63289df0485ddac.patch | 58 -------------------
 resolv_wrapper.spec                           | 12 ++--
 sources                                       |  4 +-
 4 files changed, 11 insertions(+), 65 deletions(-)
 delete mode 100644 c75587f858eb49e6b13ab610e63289df0485ddac.patch

diff --git a/.gitignore b/.gitignore
index 1e3c2ca..29c8871 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
 /resolv_wrapper-1.1.6.tar.gz.asc
 /resolv_wrapper-1.1.7.tar.gz
 /resolv_wrapper-1.1.7.tar.gz.asc
+/resolv_wrapper-1.1.8.tar.gz
+/resolv_wrapper-1.1.8.tar.gz.asc
diff --git a/c75587f858eb49e6b13ab610e63289df0485ddac.patch b/c75587f858eb49e6b13ab610e63289df0485ddac.patch
deleted file mode 100644
index ef146f2..0000000
--- a/c75587f858eb49e6b13ab610e63289df0485ddac.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From c75587f858eb49e6b13ab610e63289df0485ddac Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@samba.org>
-Date: Wed, 3 Nov 2021 15:12:22 +0100
-Subject: [PATCH] cmake: Fix detection of a fully seperate libresolv
-
-With glibc 2.24 all res_* symbols moved from libresolv to libc. This means
-that socket_wrapper is not able to do the traffic to the DNS server. This
-leaves us only with DNS faking.
-
-Signed-off-by: Andreas Schneider <asn@samba.org>
-Reviewed-by: Ralph Boehme <slow@samba.org>
----
- ConfigureChecks.cmake | 21 ++++++++++++++++++---
- 1 file changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index 8444232..6eb00da 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -57,12 +57,23 @@ check_function_exists(getexecname HAVE_GETEXECNAME)
- 
- find_library(RESOLV_LIRBRARY resolv)
- if (RESOLV_LIRBRARY)
--    set(HAVE_LIBRESOLV TRUE)
-+    check_function_exists(res_nquery HAVE_LIBC_RES_INIT)
-+    check_function_exists(__res_query HAVE_LIBC__RES_INIT)
-+
-+    if (NOT HAVE_LIBC_RES_INIT AND NOT HAVE_LIBC__RES_INIT)
-+        set(CMAKE_REQUIRED_LIBRARIES ${RESOLV_LIRBRARY})
-+        check_function_exists(res_query HAVE_RES_QUERY)
-+        check_function_exists(__res_query HAVE___RES_QUERY)
-+        unset(CMAKE_REQUIRED_LIBRARIES)
-+
-+        if (HAVE_RES_QUERY OR HAVE___RES_QUERY)
-+            set(HAVE_LIBRESOLV 1)
-+
-+        endif()
-+    endif()
- 
-     # If we have a libresolv, we need to check functions linking the library
-     list(APPEND _REQUIRED_LIBRARIES ${RESOLV_LIRBRARY})
--else()
--    message(STATUS "libresolv not found on ${CMAKE_SYSTEM_NAME}: Only dns faking will be available")
- endif()
- 
- set(CMAKE_REQUIRED_LIBRARIES ${RESOLV_LIRBRARY})
-@@ -205,4 +216,8 @@ int main(void) {
- # ENDIAN
- test_big_endian(WORDS_BIGENDIAN)
- 
-+if (NOT HAVE_LIBRESOLV)
-+    message(STATUS "Limited features: Only dns faking will be available")
-+endif()
-+
- set(RWRAP_REQUIRED_LIBRARIES ${_REQUIRED_LIBRARIES} CACHE INTERNAL "resolv_wrapper required system libraries")
--- 
-GitLab
-
diff --git a/resolv_wrapper.spec b/resolv_wrapper.spec
index 9a4299a..6779ff9 100644
--- a/resolv_wrapper.spec
+++ b/resolv_wrapper.spec
@@ -1,6 +1,6 @@
 Name:           resolv_wrapper
-Version:        1.1.7
-Release:        5%{?dist}
+Version:        1.1.8
+Release:        1%{?dist}
 
 Summary:        A wrapper for dns name resolving or dns faking
 License:        BSD
@@ -10,8 +10,6 @@ Source0:        https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz
 Source1:        https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz.asc
 Source2:        resolv_wrapper.keyring
 
-Patch0:         https://gitlab.com/cwrap/resolv_wrapper/-/commit/c75587f858eb49e6b13ab610e63289df0485ddac.patch
-
 BuildRequires:  gcc
 BuildRequires:  gnupg2
 BuildRequires:  cmake
@@ -37,7 +35,7 @@ This package doesn't have a devel package because this project is for
 development/testing.
 
 %prep
-gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -p1
 
 %build
@@ -67,6 +65,10 @@ LD_PRELOAD=%{__cmake_builddir}/src/libpam_wrapper.so bash -c '>/dev/null'
 %{_mandir}/man1/resolv_wrapper.1*
 
 %changelog
+* Tue Dec 20 2022 Andreas Schneider <asn@redhat.com> - 1.1.7-6
+ - Update to version 1.1.8
+   o https://gitlab.com/cwrap/resolv_wrapper/-/blob/resolv_wrapper-1.1.8/CHANGELOG
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 8495f0d..040e3e2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (resolv_wrapper-1.1.7.tar.gz) = 531a7734f40d8a7cb3da4618eebbb4530657ad2cdcf3c1cd48f3ae1dcf55fc003205e44745fc3f70704060ae0c6a2516919c61fd10223ff56d90a47a3c59b3c0
-SHA512 (resolv_wrapper-1.1.7.tar.gz.asc) = a2b6487885e8ef165a1687d529c60aaaa39be68c326a345f41489ea325d735c06549c77f9fd79c2b772b3a351f8e378c62a3a9b3f6efa11f73200c998d043a32
+SHA512 (resolv_wrapper-1.1.8.tar.gz) = 64cb722b3530b5669de1eba379ca4a577b505ac4be624d63a3988b16df2e3082489f48db099cba256dded9483ae913144b9a5c0c6e01af20da0709bd79c461c4
+SHA512 (resolv_wrapper-1.1.8.tar.gz.asc) = a9be5a471472bd342d809ac8055f300fda785f7d863b9becf51922cfb7f2e33023b9568e591434e6970924500198f6c3e440f8e4fb806f820ad2e9217b40e8c5