Accepting request 898727 from home:jengelh:forensics

- Update to snapshot 20210503 (59e73642)

OBS-URL: https://build.opensuse.org/request/show/898727
OBS-URL: https://build.opensuse.org/package/show/security:forensics/libodraw?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/libodraw</param>
+		<param name="revision">59e73642336c13de034b2444d2eba09aa2c5b76b</param>
+		<!-- see configure.ac -->
+		<param name="versionformat">20210503</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>

libodraw-20210503.tar.xz

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

libodraw-alpha-20201003.tar.gz

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

libodraw.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May 14 00:38:39 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to snapshot 20210503 (59e73642)
+  * No changelog was provided
+- Add system-libs.patch
+
 -------------------------------------------------------------------
 Wed Dec 30 02:44:02 UTC 2020 - Greg Freemyer <Greg.Freemyer@gmail.com>
 

libodraw.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libodraw
 #
-# 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,32 +18,32 @@
 
 Name:           libodraw
 %define lname	libodraw1
-%define timestamp 20201003
+Version:        20210503
-Version:        0~%timestamp
 Release:        0
 Summary:        Library and tools to access to optical disc (split) RAW image 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/libodraw/wiki 
+URL:            https://github.com/libyal/libodraw
-Source:         https://github.com/libyal/libodraw/releases/download/%timestamp/%name-alpha-%timestamp.tar.gz
+Source:         %name-%version.tar.xz
 Source2:        CUE_sheet_format.pdf
-#BuildRequires:  pkg-config
+Patch1:         system-libs.patch
-BuildRequires:  pkgconfig(libbfio) >= 20120426
+BuildRequires:  bison
-BuildRequires:  pkgconfig(libcdata) >= 20120425
+BuildRequires:  c_compiler
-BuildRequires:  pkgconfig(libcfile) >= 20120526
+BuildRequires:  flex
-BuildRequires:  pkgconfig(libclocale) >= 20140105
+BuildRequires:  gettext-tools >= 0.18.1
-BuildRequires:  pkgconfig(libcnotify) >= 20120425
+BuildRequires:  libtool
-BuildRequires:  pkgconfig(libcpath) >= 20120701
+BuildRequires:  pkg-config
-BuildRequires:  pkgconfig(libcsplit) >= 20120701
+BuildRequires:  pkgconfig(libbfio) >= 20201229
-BuildRequires:  pkgconfig(libcthreads)
+BuildRequires:  pkgconfig(libcdata) >= 20200509
-BuildRequires:  pkgconfig(libuna) >= 20120425
+BuildRequires:  pkgconfig(libcerror) >= 20201121
-#use internal package, factory version causes build failure
+BuildRequires:  pkgconfig(libcfile) >= 20201229
-# verified 1/11/2015
+BuildRequires:  pkgconfig(libclocale) >= 20200913
-#BuildRequires:  pkgconfig(libcsystem) >= 20120425
+BuildRequires:  pkgconfig(libcnotify) >= 20200913
-#BuildRequires:  pkgconfig(libcerror) >= 20120425
+BuildRequires:  pkgconfig(libcpath) >= 20200623
-#BuildRequires:  pkgconfig(libcstring) >= 20120425
+BuildRequires:  pkgconfig(libcsplit) >= 20200703
-#BuildRequires:  pkgconfig(libhmac)
+BuildRequires:  pkgconfig(libcthreads) >= 20200508
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  pkgconfig(libhmac) >= 20200104
+BuildRequires:  pkgconfig(libuna) >= 20201204
 
 %description
 libodraw is a library to access optical disc (split) RAW images such
@@ -60,7 +60,7 @@ as BIN/ISO/CUE.
 
 %package devel
 Summary:        Development files for libodraw, a disc image file 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:       %lname = %version
 
@@ -82,29 +82,26 @@ This subpackage contains the utility programs from libodraw, which
 can read optical disc (split) RAW image files such as BIN/ISO/CUE.
 
 %prep
-%setup -qn libodraw-%timestamp
+%autosetup -p1
 cp "%{S:2}" .
 
 %build
+if [ ! -e configure ]; then ./autogen.sh; fi
 %configure --disable-static --enable-wide-character-type
-make %{?_smp_mflags}
+%make_build
 
 %install
-make install DESTDIR="%buildroot"
+%make_install
 rm -f "%buildroot/%_libdir"/*.la
 
 %post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig
 
 %files -n %lname
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog
 %license COPYING*
 %_libdir/libodraw.so.1*
 
 %files devel
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog
 %license COPYING*
 %doc CUE_*.pdf
 %_includedir/libodraw*
@@ -113,8 +110,6 @@ rm -f "%buildroot/%_libdir"/*.la
 %_mandir/man3/libodraw.3*
 
 %files tools
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog
 %license COPYING*
 %_bindir/odrawverify
 %_bindir/odrawinfo

system-libs.patch

@@ -0,0 +1,74 @@
+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  |   21 ---------------------
+ configure.ac |   11 -----------
+ 2 files changed, 32 deletions(-)
+
+Index: libodraw/Makefile.am
+===================================================================
+--- libodraw.orig/Makefile.am
++++ libodraw/Makefile.am
+@@ -3,18 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = \
+ 	include \
+ 	common \
+-	libcerror \
+-	libcthreads \
+-	libcdata \
+-	libclocale \
+-	libcnotify \
+-	libcsplit \
+-	libuna \
+-	libcfile \
+-	libcpath \
+-	libbfio \
+ 	libodraw \
+-	libhmac \
+ 	odrawtools \
+ 	po \
+ 	manuals \
+@@ -66,16 +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)/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)/libodraw && $(MAKE) $(AM_MAKEFLAGS))
+ 	(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
+ 
+Index: libodraw/configure.ac
+===================================================================
+--- libodraw.orig/configure.ac
++++ libodraw/configure.ac
+@@ -145,18 +145,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([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([libodraw/Makefile])
+-AC_CONFIG_FILES([libhmac/Makefile])
+ AC_CONFIG_FILES([odrawtools/Makefile])
+ AC_CONFIG_FILES([po/Makefile.in])
+ AC_CONFIG_FILES([po/Makevars])