Accepting request 898768 from security:forensics

OBS-URL: https://build.opensuse.org/request/show/898768
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libregf?expand=0&rev=21

_service

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

libregf-20210504.tar.xz

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

libregf-alpha-20201007.tar.gz

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

libregf.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May 13 11:34:17 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to snapshot 20210504 (ee938acd)
+  * No changelog was provided
+- Add system-libs.patch
+
 -------------------------------------------------------------------
 Thu Dec 31 02:06:44 UTC 2020 - Greg Freemyer <Greg.Freemyer@gmail.com>
 

libregf.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libregf
 #
-# 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
@@ -17,43 +17,43 @@
 
 
 %bcond_without python2
-Name:           libregf
 %define lname	libregf1
-%define timestamp	20201007
+Name:           libregf
-Version:        0~%timestamp
+Version:        20210504
 Release:        0
 Summary:        Library to access Windows REGF-type Registry files
-License:        LGPL-3.0-or-later AND GFDL-1.3-or-later
+License:        GFDL-1.3-or-later AND LGPL-3.0-or-later
 Group:          Productivity/File utilities
-URL:            https://github.com/libyal/libregf/wiki
+URL:            https://github.com/libyal/libregf
-Source:         https://github.com/libyal/libregf/releases/download/%timestamp/%name-alpha-%timestamp.tar.gz
+Source:         %name-%version.tar.xz
 Source2:        Windows_NT_Registry_File_REGF_format.pdf
-#BuildRequires:  pkg-config
+Patch1:         system-libs.patch
 %if %{with python2}
 BuildRequires:  python-devel
 %endif
+BuildRequires:  c_compiler
+BuildRequires:  gettext-tools >= 0.18.1
+BuildRequires:  libtool
+BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(fuse) >= 2.6
-BuildRequires:  pkgconfig(libbfio) >= 20131003
+BuildRequires:  pkgconfig(libbfio) >= 20201229
-BuildRequires:  pkgconfig(libcdata) >= 20130904
+BuildRequires:  pkgconfig(libcdata) >= 20200509
-BuildRequires:  pkgconfig(libcerror) >= 20140105
+BuildRequires:  pkgconfig(libcerror) >= 20201121
-BuildRequires:  pkgconfig(libcfile) >= 20130809
+BuildRequires:  pkgconfig(libcfile) >= 20201229
-BuildRequires:  pkgconfig(libclocale) >= 20130609
+BuildRequires:  pkgconfig(libclocale) >= 20200913
-BuildRequires:  pkgconfig(libcnotify) >= 20130609
+BuildRequires:  pkgconfig(libcnotify) >= 20200913
-BuildRequires:  pkgconfig(libcsplit) >= 20130609
+BuildRequires:  pkgconfig(libcpath) >= 20200623
-BuildRequires:  pkgconfig(libcstring) >= 20120425
+BuildRequires:  pkgconfig(libcsplit) >= 20200703
-BuildRequires:  pkgconfig(libcsystem) >= 20120425
+BuildRequires:  pkgconfig(libcthreads) >= 20200508
-BuildRequires:  pkgconfig(libfdatetime) >= 20130317
+BuildRequires:  pkgconfig(libfcache) >= 20200708
-BuildRequires:  pkgconfig(libfguid) >= 20140105
+BuildRequires:  pkgconfig(libfdata) >= 20201129
-BuildRequires:  pkgconfig(libuna) >= 20130728
+BuildRequires:  pkgconfig(libfdatetime) >= 20180910
-# Using these packages (libf*) are released but are not stable per upstream
+BuildRequires:  pkgconfig(libfguid) >= 20180724
-# Verified 9/19/2014; 1/1/2017 I'm going to try and use them
+BuildRequires:  pkgconfig(libfwnt) >= 20210421
-BuildRequires:  pkgconfig(libfcache) >= 20170111
+BuildRequires:  pkgconfig(libfwsi) >= 20210419
-BuildRequires:  pkgconfig(libfdata) >= 20170112
+BuildRequires:  pkgconfig(libuna) >= 20201204
-BuildRequires:  pkgconfig(libfwnt) >= 20170115
+BuildRequires:  pkgconfig(python2)
-BuildRequires:  pkgconfig(libfwsi) >= 20170117
+BuildRequires:  pkgconfig(python3)
-
-#BuildRequires:  pkgconfig(libcpath) >= 20130809
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 libregf is a library to access Windows Registry files of the REGF
@@ -79,7 +79,7 @@ Typically used for computer forensics.
 
 %package devel
 Summary:        Development files for libregf, a Windows REGF-type Registry file parser
-License:        LGPL-3.0-or-later AND GFDL-1.3-or-later
+License:        GFDL-1.3-or-later AND LGPL-3.0-or-later
 Group:          Development/Libraries/C and C++
 Requires:       %lname = %{version}
 
@@ -94,10 +94,7 @@ applications that want to make use of %{name}.
 Summary:        Python2 bindings for libregf, a library to access Windows REGF Registry files
 License:        LGPL-3.0-or-later
 Group:          Development/Languages/Python
-Requires:       %lname = %version
-Requires:       python2
 Obsoletes:      python-%{name} <= 20190303
-BuildRequires:  pkgconfig(python2)
 
 %description -n python2-%{name}
 libregf is a library to access Windows Registry files of the REGF
@@ -109,9 +106,6 @@ This subpackage contains the Python2 bindings for libregf.
 Summary:        Python3 bindings for libregf, a library to access Windows REGF Registry files
 License:        LGPL-3.0-or-later
 Group:          Development/Languages/Python
-Requires:       %lname = %version
-Requires:       python3
-BuildRequires:  pkgconfig(python3)
 
 %description -n python3-%{name}
 libregf is a library to access Windows Registry files of the REGF
@@ -120,10 +114,11 @@ type (a non-text representation).
 This subpackage contains the Python3 bindings for libregf.
 
 %prep
-%setup -qn libregf-%timestamp
+%autosetup -p1
 cp "%{SOURCE2}" .
 
 %build
+if [ ! -e configure ]; then ./autogen.sh; fi
 %configure \
     --disable-static \
     --enable-wide-character-type \
@@ -131,7 +126,7 @@ cp "%{SOURCE2}" .
     --enable-python2 \
 %endif
     --enable-python3
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
@@ -141,18 +136,14 @@ find %{buildroot} -name '*.la' -delete
 %postun -n %lname -p /sbin/ldconfig
 
 %files -n %lname
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog
 %license COPYING*
 %{_libdir}/libregf.so.*
 
 %files tools
-%defattr(-,root,root)
 %{_bindir}/regf*
 %{_mandir}/man1/regf*.1*
 
 %files devel
-%defattr(-,root,root)
 %doc Windows_NT_Registry_File*.pdf
 %{_includedir}/libregf.h
 %{_includedir}/libregf/
@@ -162,15 +153,11 @@ find %{buildroot} -name '*.la' -delete
 
 %if %{with python2}
 %files -n python2-%{name}
-%defattr(-,root,root)
-%doc AUTHORS README
 %license COPYING*
 %{python2_sitearch}/pyregf.so
 %endif
 
 %files -n python3-%{name}
-%defattr(-,root,root)
-%doc AUTHORS README
 %license COPYING*
 %{python3_sitearch}/pyregf.so
 

system-libs.patch

@@ -0,0 +1,81 @@
+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  |   27 ---------------------------
+ configure.ac |   14 --------------
+ 2 files changed, 41 deletions(-)
+
+Index: libregf/Makefile.am
+===================================================================
+--- libregf.orig/Makefile.am
++++ libregf/Makefile.am
+@@ -3,20 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = \
+ 	include \
+ 	common \
+-	libcerror \
+-	libcthreads \
+-	libcdata \
+-	libclocale \
+-	libcnotify \
+-	libcsplit \
+-	libuna \
+-	libcfile \
+-	libcpath \
+-	libbfio \
+-	libfcache \
+-	libfdata \
+-	libfdatetime \
+-	libfwnt \
+ 	libregf \
+ 	regftools \
+ 	pyregf \
+@@ -78,19 +64,6 @@ lib: library
+ 
+ library:
+ 	(cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libcerror && $(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)/libfwnt && $(MAKE) $(AM_MAKEFLAGS))
+ 	(cd $(srcdir)/libregf && $(MAKE) $(AM_MAKEFLAGS))
+ 	(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
+ 
+Index: libregf/configure.ac
+===================================================================
+--- libregf.orig/configure.ac
++++ libregf/configure.ac
+@@ -173,20 +173,6 @@ 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([libfwnt/Makefile])
+ AC_CONFIG_FILES([libregf/Makefile])
+ AC_CONFIG_FILES([pyregf/Makefile])
+ AC_CONFIG_FILES([pyregf-python2/Makefile])