Accepting request 1038474 from security:forensics

delete system-libs.patch

OBS-URL: https://build.opensuse.org/request/show/1038474
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libfvde?expand=0&rev=12

libfvde.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Nov 26 16:43:24 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
+
+- Delete system-libs.patch (not needed - system libs are
+  autodetected)
+
 -------------------------------------------------------------------
 Sun Sep 18 23:23:15 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
 

libfvde.spec

@@ -27,11 +27,8 @@ URL:            https://github.com/libyal/libfvde/
 Source:         https://github.com/libyal/libfvde/releases/download/%version/libfvde-experimental-%version.tar.gz
 Source2:        https://github.com/libyal/libfvde/releases/download/%version/libfvde-experimental-%version.tar.gz.asc
 Source9:        %name.keyring
-Patch1:         system-libs.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  c_compiler
-BuildRequires:  gettext-tools >= 0.21
-BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  python-rpm-macros
 BuildRequires:  pkgconfig(fuse)
@@ -56,6 +53,7 @@ BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(python3)
 BuildRequires:  pkgconfig(zlib)
 %python_subpackages
+# Various notes: https://en.opensuse.org/libyal
 
 %description
 libfvde is a library to access the File Vault Drive Encryption format.
@@ -97,13 +95,10 @@ applications that want to make use of libfvde.
 %autosetup -p1
 
 %build
-autoreconf -fi
-# OOT builds are presently broken, so we have to install
-# within each python iteration now, not in %%install.
 %{python_expand #
-# see libcdata for version-sc
 echo "V_%version { global: *; };" >v.sym
 %configure --disable-static --enable-wide-character-type --enable-python PYTHON_VERSION="%{$python_bin_suffix}" LDFLAGS="-Wl,--version-script=$PWD/v.sym"
+grep ' '' ''local' config.log && exit 1
 %make_build
 %make_install DESTDIR="%_builddir/rt"
 %make_build clean
@@ -113,9 +108,6 @@ echo "V_%version { global: *; };" >v.sym
 mv %_builddir/rt/* %buildroot/
 find %{buildroot} -type f -name "*.la" -delete -print
 
-%check
-# make check
-
 %post   -n %{lname} -p /sbin/ldconfig
 %postun -n %{lname} -p /sbin/ldconfig
 

system-libs.patch

@@ -1,91 +0,0 @@
-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 |   17 -----------------
- 2 files changed, 51 deletions(-)
-
-Index: libfvde/Makefile.am
-===================================================================
---- libfvde.orig/Makefile.am
-+++ libfvde/Makefile.am
-@@ -3,23 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = \
- 	include \
- 	common \
--	libcerror \
--	libcthreads \
--	libcdata \
--	libclocale \
--	libcnotify \
--	libcsplit \
--	libuna \
--	libcfile \
--	libcpath \
--	libbfio \
--	libfcache \
--	libfdata \
--	libfguid \
--	libfplist \
--	libfvalue \
--	libhmac \
--	libcaes \
- 	libfvde \
- 	fvdetools \
- 	pyfvde \
-@@ -81,23 +64,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)/libfguid && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libfplist && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libhmac && $(MAKE) $(AM_MAKEFLAGS))
--	(cd $(srcdir)/libcaes && $(MAKE) $(AM_MAKEFLAGS))
- 	(cd $(srcdir)/libfvde && $(MAKE) $(AM_MAKEFLAGS))
- 	(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
- 
-Index: libfvde/configure.ac
-===================================================================
---- libfvde.orig/configure.ac
-+++ libfvde/configure.ac
-@@ -186,23 +186,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([libfguid/Makefile])
--AC_CONFIG_FILES([libfplist/Makefile])
--AC_CONFIG_FILES([libfvalue/Makefile])
--AC_CONFIG_FILES([libhmac/Makefile])
--AC_CONFIG_FILES([libcaes/Makefile])
- AC_CONFIG_FILES([libfvde/Makefile])
- AC_CONFIG_FILES([pyfvde/Makefile])
- AC_CONFIG_FILES([pyfvde-python2/Makefile])