Accepting request 898707 from security:forensics

OBS-URL: https://build.opensuse.org/request/show/898707
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libhmac?expand=0&rev=8

_service

@@ -0,0 +1,14 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/libyal/libhmac</param>
+		<param name="revision">f97b507af5f87daf9b77497376ec3c110d7ece9b</param>
+		<!-- see configure.ac -->
+		<param name="versionformat">20210419</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="file">*.tar</param>
+		<param name="compression">xz</param>
+	</service>
+	<service name="set_version" mode="disabled"/>
+</services>

libhmac-20210419.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ec3b42765e96018053ce2bb61db7750c6a16f162f50e17a37c3dec12ef84a305
+size 95944

libhmac-alpha-20200104.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a5407791905a961be641936fc46d097d02aed58ef1b274494e99359e082ea30b
-size 1146738

libhmac.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May 13 11:07:52 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to snapshot 20210419 (f97b507a)
+  * No changelog was provided
+- Add system-libs.patch
+
 -------------------------------------------------------------------
 Tue Dec 29 23:12:59 UTC 2020 - Greg Freemyer <Greg.Freemyer@gmail.com>
 

libhmac.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libhmac
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,28 +18,27 @@
 
 Name:           libhmac
 %define lname	libhmac1
-%define timestamp 20200104
+Version:        20210419
-Version:        0~%timestamp
 Release:        0
 Summary:        Library to support various HMACs
 License:        LGPL-3.0-or-later
 Group:          Development/Libraries/C and C++
-URL:            https://github.com/libyal/libhmac/wiki
+URL:            https://github.com/libyal/libhmac
-Source:         https://github.com/libyal/libhmac/releases/download/%timestamp/%{name}-alpha-%timestamp.tar.gz
+Source:         %name-%version.tar.xz
-#BuildRequires:  pkg-config
+Patch1:         system-libs.patch
-BuildRequires:  pkgconfig(libcfile)   >= 20130609
+BuildRequires:  c_compiler
-BuildRequires:  pkgconfig(libclocale) >= 20130609
+BuildRequires:  gettext-tools >= 0.18.1
-BuildRequires:  pkgconfig(libcnotify)  >= 20130609
+BuildRequires:  libtool
-BuildRequires:  pkgconfig(libcpath)    >= 20130609
+BuildRequires:  pkg-config
-BuildRequires:  pkgconfig(libcsplit)   >= 20130609
+BuildRequires:  pkgconfig(libcerror) >= 20201121
-BuildRequires:  pkgconfig(libcsystem) >= 20120425
+BuildRequires:  pkgconfig(libcfile) >= 20201229
-BuildRequires:  pkgconfig(libuna)     >= 20120425
+BuildRequires:  pkgconfig(libclocale) >= 20200913
-BuildRequires:  pkgconfig(openssl)     >= 1.0
+BuildRequires:  pkgconfig(libcnotify) >= 20200913
-# These packages from factory cause build failures, use the internal version instead
+BuildRequires:  pkgconfig(libcpath) >= 20200623
-#verified 1/8/2015
+BuildRequires:  pkgconfig(libcsplit) >= 20200703
-#BuildRequires:  pkgconfig(libcerror)  >= 20120425
+BuildRequires:  pkgconfig(libcthreads) >= 20200508
-#BuildRequires:  pkgconfig(libcstring) >= 20120425
+BuildRequires:  pkgconfig(libuna) >= 20201204
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  pkgconfig(openssl) >= 1.0
 
 %description
 A library and tools to support various Hash-based Message Authentication Codes (HMAC).
@@ -70,11 +69,12 @@ Group:          Productivity/File utilities
 Use hmacsum to calculate a Hash-based Message Authentication Code (HMAC) of the data in a file.
 
 %prep
-%setup -qn libhmac-%timestamp
+%autosetup -p1
 
 %build
+if [ ! -e configure ]; then ./autogen.sh; fi
 %configure --disable-static --enable-wide-character-type
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
@@ -84,20 +84,16 @@ rm -f "%{buildroot}/%{_libdir}"/*.la
 %postun -n %lname -p /sbin/ldconfig
 
 %files -n %lname
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog
 %license COPYING*
 %{_libdir}/libhmac.so.1*
 
 %files devel
-%defattr(-,root,root)
 %{_includedir}/libhmac*
 %{_libdir}/libhmac.so
 %{_libdir}/pkgconfig/libhmac.pc
 %{_mandir}/man3/libhmac.3*
 
 %files tools
-%defattr(-,root,root)
 %{_bindir}/hmacsum
 %{_mandir}/man1/hmacsum.1*
 

system-libs.patch

@@ -0,0 +1,60 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2021-05-12 17:36:02.536572543 +0200
+
+Some dirs are not present in snapshots directly generated from git
+(nor are they marked as a submodule). Patch it out, since we have
+them as system libs.
+---
+ Makefile.am  |   10 ----------
+ configure.ac |    8 --------
+ 2 files changed, 18 deletions(-)
+
+Index: libhmac/Makefile.am
+===================================================================
+--- libhmac.orig/Makefile.am
++++ libhmac/Makefile.am
+@@ -3,15 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = \
+ 	include \
+ 	common \
+-	libcerror \
+-	libcthreads \
+ 	libhmac \
+-	libclocale \
+-	libcnotify \
+-	libcsplit \
+-	libuna \
+-	libcfile \
+-	libcpath \
+ 	hmactools \
+ 	po \
+ 	manuals \
+@@ -63,8 +55,6 @@ lib: library
+ 
+ library:
+ 	(cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libcthreads && $(MAKE) $(AM_MAKEFLAGS))
+ 	(cd $(srcdir)/libhmac && $(MAKE) $(AM_MAKEFLAGS))
+ 	(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
+ 
+Index: libhmac/configure.ac
+===================================================================
+--- libhmac.orig/configure.ac
++++ libhmac/configure.ac
+@@ -133,15 +133,7 @@ dnl Generate Makefiles
+ AC_CONFIG_FILES([Makefile])
+ AC_CONFIG_FILES([include/Makefile])
+ AC_CONFIG_FILES([common/Makefile])
+-AC_CONFIG_FILES([libcerror/Makefile])
+-AC_CONFIG_FILES([libcthreads/Makefile])
+ AC_CONFIG_FILES([libhmac/Makefile])
+-AC_CONFIG_FILES([libclocale/Makefile])
+-AC_CONFIG_FILES([libcnotify/Makefile])
+-AC_CONFIG_FILES([libcsplit/Makefile])
+-AC_CONFIG_FILES([libuna/Makefile])
+-AC_CONFIG_FILES([libcfile/Makefile])
+-AC_CONFIG_FILES([libcpath/Makefile])
+ AC_CONFIG_FILES([hmactools/Makefile])
+ AC_CONFIG_FILES([po/Makefile.in])
+ AC_CONFIG_FILES([po/Makevars])