From c5f3dec5575158d4e0df3526220601b1f975e38cb8412dbb30b21464348978fd Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 2 Nov 2022 15:00:31 +0000
Subject: [PATCH] Accepting request 1032908 from
 home:msmeissn:branches:security

- updated to 1.7.0 (from a different supplier)
  - openssl 3 support
- dropped fipscheck-dont_generate_manpages.patch (not needed)
- dropped fipscheck-fips.h_not_needed.patch (not needed)

OBS-URL: https://build.opensuse.org/request/show/1032908
OBS-URL: https://build.opensuse.org/package/show/security/fipscheck?expand=0&rev=25
---
 fipscheck-1.5.0.tar.bz2                |  3 ---
 fipscheck-1.7.0.tar.bz2                |  3 +++
 fipscheck-dont_generate_manpages.patch | 13 -------------
 fipscheck-fips.h_not_needed.patch      | 12 ------------
 fipscheck.changes                      |  8 ++++++++
 fipscheck.spec                         | 12 ++++--------
 6 files changed, 15 insertions(+), 36 deletions(-)
 delete mode 100644 fipscheck-1.5.0.tar.bz2
 create mode 100644 fipscheck-1.7.0.tar.bz2
 delete mode 100644 fipscheck-dont_generate_manpages.patch
 delete mode 100644 fipscheck-fips.h_not_needed.patch

diff --git a/fipscheck-1.5.0.tar.bz2 b/fipscheck-1.5.0.tar.bz2
deleted file mode 100644
index d516c1b..0000000
--- a/fipscheck-1.5.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ba38100ced187f44b12dd52c8c74db8f366a2a8b9da819bd3e7c6ea17f469d5
-size 275637
diff --git a/fipscheck-1.7.0.tar.bz2 b/fipscheck-1.7.0.tar.bz2
new file mode 100644
index 0000000..0a00c5d
--- /dev/null
+++ b/fipscheck-1.7.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:024953c8bee1458aa9c48dc0648420c503ed71c37ce6b366ce296fad2f217889
+size 299256
diff --git a/fipscheck-dont_generate_manpages.patch b/fipscheck-dont_generate_manpages.patch
deleted file mode 100644
index 03f2164..0000000
--- a/fipscheck-dont_generate_manpages.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: fipscheck-1.5.0/man/Makefile.in
-===================================================================
---- fipscheck-1.5.0.orig/man/Makefile.in	2017-02-23 15:49:16.000000000 +0100
-+++ fipscheck-1.5.0/man/Makefile.in	2019-09-16 12:46:20.335487000 +0200
-@@ -567,7 +567,7 @@ uninstall-man: uninstall-man3 uninstall-
- 
- 
- $(dist_man_MANS): $(manpages_XMLSOURCES)
--	for i in $^ ; do xmlto man $$i ; done
-+	#for i in $^ ; do xmlto man $$i ; done
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/fipscheck-fips.h_not_needed.patch b/fipscheck-fips.h_not_needed.patch
deleted file mode 100644
index 38128ed..0000000
--- a/fipscheck-fips.h_not_needed.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: fipscheck-1.5.0/src/filehmac.c
-===================================================================
---- fipscheck-1.5.0.orig/src/filehmac.c	2019-09-16 12:47:15.843827233 +0200
-+++ fipscheck-1.5.0/src/filehmac.c	2019-09-16 12:47:20.847857908 +0200
-@@ -41,7 +41,6 @@
- #include <sys/wait.h>
- 
- #if defined(WITH_OPENSSL)
--#include <openssl/fips.h>
- #include <openssl/evp.h>
- #include <openssl/hmac.h>
- #elif defined(WITH_NSS)
diff --git a/fipscheck.changes b/fipscheck.changes
index c57ec01..dc9ebb1 100644
--- a/fipscheck.changes
+++ b/fipscheck.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Nov  2 14:30:29 UTC 2022 - Marcus Meissner <meissner@suse.com>
+
+- updated to 1.7.0 (from a different supplier)
+  - openssl 3 support
+- dropped fipscheck-dont_generate_manpages.patch (not needed)
+- dropped fipscheck-fips.h_not_needed.patch (not needed)
+
 -------------------------------------------------------------------
 Fri Nov 20 09:50:32 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
 
diff --git a/fipscheck.spec b/fipscheck.spec
index 4f2d7d4..26791bc 100644
--- a/fipscheck.spec
+++ b/fipscheck.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fipscheck
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,16 +20,14 @@
 %global soversion 1.2.1
 %global somajor 1
 Name:           fipscheck
-Version:        1.5.0
+Version:        1.7.0
 Release:        0
 Summary:        A library for integrity verification of FIPS validated modules
 License:        BSD-2-Clause
 Group:          Development/Libraries/C and C++
-URL:            https://releases.pagure.org/%{name}/
-Source0:        https://releases.pagure.org/fipscheck/%{name}-%{version}.tar.bz2
+URL:            https://github.com/LairdCP/fipscheck
+Source0:        fipscheck-%version.tar.bz2
 Source1:        baselibs.conf
-Patch1:         fipscheck-dont_generate_manpages.patch
-Patch2:         fipscheck-fips.h_not_needed.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -59,8 +57,6 @@ This package contains development files for %{name}.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
 
 %build
 %configure --disable-static