Accepting request 898747 from home:jengelh:forensics

- Update to snapshot 20210513 (b0598ded)

OBS-URL: https://build.opensuse.org/request/show/898747
OBS-URL: https://build.opensuse.org/package/show/security:forensics/libesedb?expand=0&rev=19

_service

@@ -0,0 +1,14 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/libyal/libesedb</param>
+		<param name="revision">b0598ded761798a9d3b083b9deb6a55214535e15</param>
+		<!-- see configure.ac -->
+		<param name="versionformat">20210513</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>

libesedb-20210513.tar.xz

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

libesedb-experimental-20200418.tar.gz

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

libesedb.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May 14 22:05:46 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to snapshot 20210513 (b0598ded)
+  * No changelog was provided
+- Add system-libs.patch
+
 -------------------------------------------------------------------
 Mon Dec 28 18:24:59 UTC 2020 - Greg Freemyer <Greg.Freemyer@gmail.com>
 

libesedb.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libesedb
 #
-# 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
@@ -19,48 +19,45 @@
 %bcond_without python2
 
 %define lname	libesedb1
-%define timestamp 20200418
 Name:           libesedb
-Version:        0~%{timestamp}
+Version:        20210513
 Release:        0
 Summary:        Library and tools to access the ESE Database File (EDB) format
-License:        LGPL-3.0-or-later AND GFDL-1.1-or-later AND GFDL-1.3-or-later
+License:        GFDL-1.1-or-later AND LGPL-3.0-or-later AND GFDL-1.3-or-later
 Group:          Productivity/File utilities
-URL:            https://github.com/libyal/libesedb/wiki
+URL:            https://github.com/libyal/libesedb
-Source:         https://github.com/libyal/libesedb/releases/download/%timestamp/%{name}-experimental-%{timestamp}.tar.gz
+Source:         %{name}-%{version}.tar.xz
 Source2:        Exchange.pdf
 Source3:        Extensible_Storage_Engine_ESE_Database_File_EDB_format.pdf
 Source4:        Forensic_analysis_of_the_Windows_Search_database.pdf
 Source5:        Windows_Search.pdf
 Source6:        libesedb-libfdata.pdf
-BuildRequires:  pkg-config
+Patch1:         system-libs.patch
+BuildRequires:  c_compiler
+BuildRequires:  gettext-tools >= 0.18.1
+BuildRequires:  libtool
+BuildRequires:  pkgconfig(libbfio) >= 20201229
+BuildRequires:  pkgconfig(libcdata) >= 20200509
+BuildRequires:  pkgconfig(libcerror) >= 20201121
+BuildRequires:  pkgconfig(libcfile) >= 20201229
+BuildRequires:  pkgconfig(libclocale) >= 20200913
+BuildRequires:  pkgconfig(libcnotify) >= 20200913
+BuildRequires:  pkgconfig(libcpath) >= 20200623
+BuildRequires:  pkgconfig(libcsplit) >= 20200703
+BuildRequires:  pkgconfig(libcthreads) >= 20200508
+BuildRequires:  pkgconfig(libfcache) >= 20200708
+BuildRequires:  pkgconfig(libfdata) >= 20201129
+BuildRequires:  pkgconfig(libfdatetime) >= 20180910
+BuildRequires:  pkgconfig(libfguid) >= 20180724
+BuildRequires:  pkgconfig(libfmapi) >= 20180714
+BuildRequires:  pkgconfig(libfvalue) >= 20210510
+BuildRequires:  pkgconfig(libfwnt) >= 20210421
+BuildRequires:  pkgconfig(libmapidb) >= 20170304
+BuildRequires:  pkgconfig(libuna) >= 20201204
 %if %{with python2}
-BuildRequires:  python-devel
+BuildRequires:  pkgconfig(python2)
 %endif
-BuildRequires:  pkgconfig(libbfio) >= 20130721
+BuildRequires:  pkgconfig(python3)
-BuildRequires:  pkgconfig(libcdata) >= 20140105
-BuildRequires:  pkgconfig(libcerror) >= 20140105
-BuildRequires:  pkgconfig(libcerror) >= 20181117
-BuildRequires:  pkgconfig(libcfile) >= 20130609
-BuildRequires:  pkgconfig(libclocale) >= 20130609
-BuildRequires:  pkgconfig(libcnotify) >= 20120425
-BuildRequires:  pkgconfig(libcpath) >= 20130609
-BuildRequires:  pkgconfig(libcsplit) >= 20130609
-BuildRequires:  pkgconfig(libcstring) >= 20120425
-BuildRequires:  pkgconfig(libcstring) >= 20150101
-BuildRequires:  pkgconfig(libcsystem) >= 20120425
-BuildRequires:  pkgconfig(libcthreads) >= 20130723
-BuildRequires:  pkgconfig(libfcache) >= 20120405
-BuildRequires:  pkgconfig(libfdata) > 20150104
-BuildRequires:  pkgconfig(libfdatetime) >= 20140105
-BuildRequires:  pkgconfig(libfguid) >= 20140105
-BuildRequires:  pkgconfig(libfmapi)
-BuildRequires:  pkgconfig(libfvalue)
-BuildRequires:  pkgconfig(libfwnt)
-BuildRequires:  pkgconfig(libmapidb)
-BuildRequires:  pkgconfig(libuna) >= 20190102
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Library and tools to access the Extensible Storage Engine (ESE) Database File (EDB) format. ESEDB is used in may different applications like Windows Search, Windows Mail, Exchange, Active Directory, etc.
@@ -77,14 +74,13 @@ Library to access the Extensible Storage Engine (ESE) Database File (EDB) format
 Summary:        Tools to access the EDB format
 License:        LGPL-3.0-or-later
 Group:          Productivity/File utilities
-Requires:       %{lname} = %{version}
 
 %description tools
 Tools to access the Extensible Storage Engine (ESE) Database File (EDB) format. ESEDB is used in may different applications like Windows Search, Windows Mail, Exchange, Active Directory, etc.
 
 %package devel
 Summary:        Development files for libesedb, a EDB file format library
-License:        LGPL-3.0-or-later AND GFDL-1.1-or-later AND GFDL-1.3-or-later
+License:        GFDL-1.1-or-later AND LGPL-3.0-or-later AND GFDL-1.3-or-later
 Group:          Development/Libraries/C and C++
 Requires:       %{lname} = %{version}
 
@@ -99,9 +95,6 @@ applications that want to make use of libesedb.
 Summary:        Python bindings for libesedb, a EDB file format parser
 License:        LGPL-3.0-or-later
 Group:          Development/Libraries/Python
-Requires:       %{lname} = %{version}
-Requires:       python
-BuildRequires:  pkgconfig(python2)
 Obsoletes:      pyesedb <= 20191220
 Obsoletes:      python-%{name} <= 20191220
 
@@ -117,8 +110,6 @@ Directory, etc.
 Summary:        Python bindings for libesedb, a EDB file format parser
 License:        LGPL-3.0-or-later
 Group:          Development/Libraries/Python
-Requires:       %{lname} = %{version}
-BuildRequires:  pkgconfig(python3)
 
 %description -n python3-%{name}
 libesedb is a library to access EDB files.  ESEDB is used in many different
@@ -129,7 +120,7 @@ different applications like Windows Search, Windows Mail, Exchange, Active
 Directory, etc.
 
 %prep
-%setup -n libesedb-%{timestamp}
+%autosetup -p1
 cp "%{SOURCE2}" .
 cp "%{SOURCE3}" .
 cp "%{SOURCE4}" .
@@ -137,6 +128,7 @@ cp "%{SOURCE5}" .
 cp "%{SOURCE6}" .
 
 %build
+if [ ! -e configure ]; then ./autogen.sh; fi
 %configure \
     --disable-static \
     --enable-wide-character-type \
@@ -144,32 +136,25 @@ cp "%{SOURCE6}" .
     --enable-python2 \
 %endif
     --enable-python3
-make %{?_smp_mflags}
+%make_build
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %post   -n %{lname} -p /sbin/ldconfig
-
 %postun -n %{lname} -p /sbin/ldconfig
 
 %files -n %{lname}
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog
 %license COPYING*
 %{_libdir}/libesedb.so.*
 
 %files tools
-%defattr(-,root,root)
-%doc AUTHORS README ChangeLog
 %license COPYING*
 %{_bindir}/esedb*
 %{_mandir}/man1/esedb*.1*
 
 %files devel
-%defattr(-,root,root)
-%doc AUTHORS README ChangeLog
 %license COPYING*
 %doc Exchange.pdf
 %doc Extensible_Storage_Engine_*
@@ -184,15 +169,11 @@ find %{buildroot} -type f -name "*.la" -delete -print
 
 %if %{with python2}
 %files -n python2-%{name}
-%defattr(-,root,root)
-%doc AUTHORS README ChangeLog
 %license COPYING*
 %{python2_sitearch}/pyesedb.so
 %endif
 
 %files -n python3-%{name}
-%defattr(-,root,root)
-%doc AUTHORS README ChangeLog
 %license COPYING*
 %{python3_sitearch}/pyesedb.so
 

system-libs.patch

@@ -0,0 +1,97 @@
+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  |   34 ----------------------------------
+ configure.ac |   18 ------------------
+ 2 files changed, 52 deletions(-)
+
+Index: libesedb/Makefile.am
+===================================================================
+--- libesedb.orig/Makefile.am
++++ libesedb/Makefile.am
+@@ -3,25 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = \
+ 	include \
+ 	common \
+-	libcerror \
+-	libcthreads \
+-	libcdata \
+-	libclocale \
+-	libcnotify \
+-	libcsplit \
+-	libuna \
+-	libcfile \
+-	libcpath \
+-	libbfio \
+-	libfcache \
+-	libfdata \
+-	libfdatetime \
+-	libfguid \
+-	libfvalue \
+-	libfwnt \
+ 	libesedb \
+-	libfmapi \
+-	libmapidb \
+ 	esedbtools \
+ 	pyesedb \
+ 	pyesedb-python2 \
+@@ -83,22 +65,6 @@ lib: library
+ 
+ library:
+ 	(cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libcthreads && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libcdata && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libclocale && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libcnotify && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libcsplit && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libuna && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libcfile && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libcpath && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libbfio && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libfcache && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libfdata && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libfwnt && $(MAKE) $(AM_MAKEFLAGS))
+ 	(cd $(srcdir)/libesedb && $(MAKE) $(AM_MAKEFLAGS))
+ 	(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
+ 
+Index: libesedb/configure.ac
+===================================================================
+--- libesedb.orig/configure.ac
++++ libesedb/configure.ac
+@@ -182,28 +182,10 @@ 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([libcdata/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([libbfio/Makefile])
+-AC_CONFIG_FILES([libfcache/Makefile])
+-AC_CONFIG_FILES([libfdata/Makefile])
+-AC_CONFIG_FILES([libfdatetime/Makefile])
+-AC_CONFIG_FILES([libfguid/Makefile])
+-AC_CONFIG_FILES([libfvalue/Makefile])
+-AC_CONFIG_FILES([libfwnt/Makefile])
+ AC_CONFIG_FILES([libesedb/Makefile])
+ AC_CONFIG_FILES([pyesedb/Makefile])
+ AC_CONFIG_FILES([pyesedb-python2/Makefile])
+ AC_CONFIG_FILES([pyesedb-python3/Makefile])
+-AC_CONFIG_FILES([libfmapi/Makefile])
+-AC_CONFIG_FILES([libmapidb/Makefile])
+ AC_CONFIG_FILES([esedbtools/Makefile])
+ AC_CONFIG_FILES([po/Makefile.in])
+ AC_CONFIG_FILES([po/Makevars])