Accepting request 898750 from home:jengelh:forensics

- Update to snapshot (a791283c)

OBS-URL: https://build.opensuse.org/request/show/898750
OBS-URL: https://build.opensuse.org/package/show/security:forensics/libewf?expand=0&rev=18

_service

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

libewf-20140811.tar.gz

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

libewf-20140811.tar.gz.asc

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAl/CY6MACgkQ2WJeXXrQ
-F37pLwf/RS0IvF0xg0kBFkcEjbWHfA7FWBMQwfX3j3IP5unedoGmWC5bNCBdFRWv
-5IWj9eiIBJIy+GhdeInzie5r6YWcScHqWLOUathvPZGlczzm2LLg7uEwN0R7o5vd
-fb7TyIOGoZwp3CQg6ZZu3ZM2NplTfyJ087sqTWqItQHTRevnpNeL+fPiL6E3MdtW
-qOGpsbBuaOUYxfXE0DFRo85gqvck82ZuJk2gbvgK4s/essW0inAARR5SwT+nK+Rt
-GoWJA0qiKLBtGI2UIUvHTa6OzHUYftkbW+2asYyMChiAYDKzT36YGo5gLA3Ayi/A
-qzUWLZRl69kV5/djWZXHbnZYA8/dIg==
-=M7Bi
------END PGP SIGNATURE-----

libewf-legacy-20140811.tar.xz

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

libewf.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May 14 00:55:40 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to snapshot (a791283c)
+  * No changelog was provided.
+- Add system-libs.patch
+
 -------------------------------------------------------------------
 Sat Dec 12 23:39:53 UTC 2020 - Greg Freemyer <Greg.Freemyer@gmail.com>
 

libewf.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libewf
 #
-# 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
@@ -16,69 +16,56 @@
 #
 
 
-%define modname	libewf
+%define lname libewf2
-%define timestamp 20140811
-%define sosuffix 2
 %bcond_with python2
 
 Name:           libewf
-Version:        0~%{timestamp}
+Version:        20140811
 Release:        0
 Summary:        Library for the Expert Witness Compression Format (EWF)
-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/libewf-legacy
-Source:         https://github.com/libyal/libewf-legacy/releases/download/%{timestamp}/%{name}-%{timestamp}.tar.gz
+Source:         %name-legacy-%version.tar.xz
-Source1:        https://github.com/libyal/libewf-legacy/releases/download/%{timestamp}/%{name}-%{timestamp}.tar.gz.asc
 Source2:        http://downloads.sf.net/libewf/mount_ewf-20090113.py
 Source3:        Expert_Witness_Compression_Format_EWF.pdf
 Source4:        Expert_Witness_Compression_Format_2_EWF2.pdf
 Patch1:         remove_date_time_macros.patch
-BuildRequires:  autoconf
+Patch2:         system-libs.patch
-BuildRequires:  automake
 BuildRequires:  bison
+BuildRequires:  c_compiler
 BuildRequires:  flex
-BuildRequires:  fuse-devel
+BuildRequires:  gettext-tools >= 0.18.1
-# Needed for language translation support
-BuildRequires:  gettext
-BuildRequires:  git
-BuildRequires:  libopenssl-devel
 BuildRequires:  libtool
-BuildRequires:  pkgconfig
+BuildRequires:  pkg-config
-%if %{with python2}
-BuildRequires:  python-devel
-%endif
-BuildRequires:  python3-devel
-BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(bzip2) >= 1.0
 BuildRequires:  pkgconfig(fuse) >= 2.6
-BuildRequires:  pkgconfig(libcaes) >= 20120425
+BuildRequires:  pkgconfig(libbfio) >= 20201229
-BuildRequires:  pkgconfig(libcdatetime)
+BuildRequires:  pkgconfig(libcaes) >= 20201012
-BuildRequires:  pkgconfig(libcfile) >= 20120526
+BuildRequires:  pkgconfig(libcdata) >= 20200509
-BuildRequires:  pkgconfig(libclocale) >= 20120425
+BuildRequires:  pkgconfig(libcdatetime) >= 20200510
-BuildRequires:  pkgconfig(libcnotify) >= 20120425
+BuildRequires:  pkgconfig(libcerror) >= 20201121
-BuildRequires:  pkgconfig(libcsplit) >= 20120701
+BuildRequires:  pkgconfig(libcfile) >= 20201229
-BuildRequires:  pkgconfig(libcthreads) >= 20130723
+BuildRequires:  pkgconfig(libclocale) >= 20200913
-BuildRequires:  pkgconfig(libfvalue) >= 20120428
+BuildRequires:  pkgconfig(libcnotify) >= 20200913
-BuildRequires:  pkgconfig(libhmac) >= 20120425
+BuildRequires:  pkgconfig(libcpath) >= 20200623
-BuildRequires:  pkgconfig(libsmdev) >= 20120630
+BuildRequires:  pkgconfig(libcsplit) >= 20200703
-BuildRequires:  pkgconfig(libuna) >= 20120425
+BuildRequires:  pkgconfig(libcthreads) >= 20200508
+BuildRequires:  pkgconfig(libfcache) >= 20200708
+BuildRequires:  pkgconfig(libfdata) >= 20201129
+BuildRequires:  pkgconfig(libfvalue) >= 20210510
+BuildRequires:  pkgconfig(libhmac) >= 20200104
+BuildRequires:  pkgconfig(libodraw) >= 20201003
+BuildRequires:  pkgconfig(libsmdev) >= 20210418
+BuildRequires:  pkgconfig(libsmraw) >= 20210418
+BuildRequires:  pkgconfig(libuna) >= 20201204
 BuildRequires:  pkgconfig(openssl) >= 1.0.0
 BuildRequires:  pkgconfig(uuid) >= 2.20
 BuildRequires:  pkgconfig(zlib) >= 1.2.5
-# build fails if libyal package from OBS is used
+%if %{with python2}
-# verified 1/25/2020
+BuildRequires:  pkgconfig(python2)
-BuildRequires:  pkgconfig(libbfio) >= 20201127
+%endif
-BuildRequires:  pkgconfig(libcdata) >= 20120425
+BuildRequires:  pkgconfig(python3)
-BuildRequires:  pkgconfig(libcerror) >= 20120425
-BuildRequires:  pkgconfig(libcpath) >= 20120701
-BuildRequires:  pkgconfig(libfcache) >= 20120405
-BuildRequires:  pkgconfig(libfdata)
-BuildRequires:  pkgconfig(libodraw) >= 20120630
-BuildRequires:  pkgconfig(libsmraw) >= 20120630
-# these packages not yet released by upstream
-#BuildRequires:  pkgconfig(libmfdata) >= 20120425
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 libewf is a library for support of the Expert Witness Compression
@@ -87,12 +74,12 @@ EnCase format (EWF-E01). libewf allows you to read and write media
 information within the EWF files. libewf allows to read files created
 by EnCase 1 to 6, linen and FTK Imager.
 
-%package -n %{modname}%{sosuffix}
+%package -n %{lname}
 Summary:        Library to support the Expert Witness Compression Format
 License:        LGPL-3.0-or-later
 Group:          System/Libraries
 
-%description -n %{modname}%{sosuffix}
+%description -n %{lname}
 libewf is a library for support of the Expert Witness Compression
 Format (EWF). It supports both the SMART format (EWF-S01) and the
 EnCase format (EWF-E01). libewf allows you to read and write media
@@ -105,10 +92,6 @@ License:        LGPL-3.0-or-later
 Group:          System/Filesystems
 Requires:       fuse
 Requires:       python3-fuse >= 0.2
-#Don't use obsoletes because new 0~yyyymmdd version is less than old 0.0.0+yyyymmdd version
-#zypper dup should "downgrade" ewftools to ewftools in factory regardless, so this should work
-#Obsoletes:      ewftools <= 0.0.0+20130128
-Provides:       ewftools = %{version}
 
 %description tools
 Several tools for reading and writing EWF files.
@@ -116,9 +99,9 @@ It contains tools to acquire, verify and export EWF files.
 
 %package devel
 Summary:        Development files for libewf, an Expert Witness Compression Format library
-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:       %{modname}%{sosuffix} = %{version}
+Requires:       %{lname} = %version
 
 %description devel
 libewf is a library for support of the Expert Witness Compression
@@ -130,43 +113,37 @@ by EnCase 1 to 6, linen and FTK Imager.
 This subpackage contains libraries and header files for developing
 applications that want to make use of %{name}.
 
-%if %{with python2}
 %package -n python2-%{name}
 Summary:        Python 2 bindings for libewf, an Expert Witness Compression format library
 License:        LGPL-3.0-or-later
 Group:          Development/Libraries/Python
-Requires:       %{modname}%{sosuffix} = %{version}
-BuildRequires:  pkgconfig(python2)
 Provides:       python-%{name} = %{version}
 Obsoletes:      python-%{name} < 20140608
 
 %description -n python2-%{name}
 Python 2 binding for libewf, which can create and read EnCase forensic
 images.
-%endif
 
 # We can eventually split python* packages into separate packages
 # python setup.py build should work according to
 # https://github.com/libyal/libewf/wiki/Building#using-setuppy
+
 %package -n python3-%{name}
 Summary:        Python 3 bindings for libewf, an Expert Witness Compression format library
 License:        LGPL-3.0-or-later
 Group:          Development/Libraries/Python
-BuildRequires:  pkgconfig
-BuildRequires:  pkgconfig(python3)
-Requires:       %{modname}%{sosuffix} = %{version}
 
 %description -n python3-%{name}
 Python 3 binding for libewf, which can create and read EnCase forensic
 images.
 
 %prep
-%setup -q -n %{name}-%{timestamp}
+%autosetup -p1 -n libewf-legacy-%version
-%patch1 -p1
 cp "%{SOURCE3}" "%{SOURCE4}" .
 
 %build
 #export CFLAGS="%optflags -fno-strict-aliasing"
+if [ ! -e configure ]; then ./autogen.sh; fi
 %configure --disable-static --disable-rpath \
   --enable-wide-character-type \
   --enable-python3 \
@@ -174,29 +151,25 @@ cp "%{SOURCE3}" "%{SOURCE4}" .
   --enable-python2
 %endif
 
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
-
 install -Dpm0755 "%{SOURCE2}" "%{buildroot}/sbin/mount.ewf"
 ln -s mount.ewf "%{buildroot}/sbin/umount.ewf"
 
 %check
 make check
 
-%post   -n %{modname}%{sosuffix} -p /sbin/ldconfig
+%post   -n %{lname} -p /sbin/ldconfig
-%postun -n %{modname}%{sosuffix} -p /sbin/ldconfig
+%postun -n %{lname} -p /sbin/ldconfig
 
-%files -n %{modname}%{sosuffix}
+%files -n %{lname}
-%defattr(-,root,root)
+%license COPYING*
-%license COPYING
-%doc AUTHORS NEWS ChangeLog
 %{_libdir}/libewf.so.*
 
 %files tools
-%defattr(-,root,root)
 %{_bindir}/ewfacquire
 %{_bindir}/ewfacquirestream
 %{_bindir}/ewfexport
@@ -211,9 +184,7 @@ make check
 /sbin/*mount.ewf
 
 %files devel
-%defattr(-,root,root)
+%license COPYING*
-%license COPYING
-%doc AUTHORS ChangeLog NEWS README
 %doc *.pdf
 %{_includedir}/libewf.h
 %{_includedir}/libewf/
@@ -223,15 +194,12 @@ make check
 
 %if %{with python2}
 %files -n python2-%{name}
-%defattr(-,root,root)
+%license COPYING*
-%license COPYING
-%doc AUTHORS NEWS README
 %{python_sitearch}/pyewf.so
 %endif
 
 %files -n python3-%{name}
-%license COPYING
+%license COPYING*
-%doc AUTHORS NEWS README
 %{python3_sitearch}/*.so
 
 %changelog

system-libs.patch

@@ -0,0 +1,98 @@
+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  |   31 -------------------------------
+ configure.ac |   18 ------------------
+ 2 files changed, 49 deletions(-)
+
+Index: libewf-legacy/Makefile.am
+===================================================================
+--- libewf-legacy.orig/Makefile.am
++++ libewf-legacy/Makefile.am
+@@ -3,26 +3,8 @@ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = \
+ 	include \
+ 	common \
+-	libcerror \
+-	libcthreads \
+-	libcdata \
+-	libcdatetime \
+-	libclocale \
+-	libcnotify \
+-	libcsplit \
+-	libuna \
+-	libcfile \
+-	libcpath \
+-	libbfio \
+-	libfcache \
+-	libfdata \
+-	libfvalue \
+ 	libmfdata \
+-	libhmac \
+ 	libewf \
+-	libodraw \
+-	libsmdev \
+-	libsmraw \
+ 	ewftools \
+ 	ewf.net \
+ 	pyewf \
+@@ -85,20 +67,7 @@ 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)/libfvalue && $(MAKE) $(AM_MAKEFLAGS))
+ 	(cd $(srcdir)/libmfdata && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libhmac && $(MAKE) $(AM_MAKEFLAGS))
+ 	(cd $(srcdir)/libewf && $(MAKE) $(AM_MAKEFLAGS))
+ 	(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
+ 
+Index: libewf-legacy/configure.ac
+===================================================================
+--- libewf-legacy.orig/configure.ac
++++ libewf-legacy/configure.ac
+@@ -227,30 +227,12 @@ 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([libcdatetime/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([libfvalue/Makefile])
+ AC_CONFIG_FILES([libmfdata/Makefile])
+-AC_CONFIG_FILES([libhmac/Makefile])
+ AC_CONFIG_FILES([libewf/Makefile])
+ AC_CONFIG_FILES([pyewf/Makefile])
+ AC_CONFIG_FILES([pyewf-python2/Makefile])
+ AC_CONFIG_FILES([pyewf-python3/Makefile])
+ AC_CONFIG_FILES([ewf.net/Makefile])
+-AC_CONFIG_FILES([libodraw/Makefile])
+-AC_CONFIG_FILES([libsmdev/Makefile])
+-AC_CONFIG_FILES([libsmraw/Makefile])
+ AC_CONFIG_FILES([ewftools/Makefile])
+ AC_CONFIG_FILES([po/Makefile.in])
+ AC_CONFIG_FILES([po/Makevars])