Accepting request 1038465 from security:forensics

delete system-libs.patch

OBS-URL: https://build.opensuse.org/request/show/1038465
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libfsext?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2022-11-28 10:06:19 +00:00 committed by Git OBS Bridge
commit e3ce2444d4
3 changed files with 12 additions and 100 deletions

View File

@ -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)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 30 14:59:26 UTC 2022 - Jan Engelhardt <jengelh@inai.de> Tue Aug 30 14:59:26 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

View File

@ -27,11 +27,8 @@ URL: https://github.com/libyal/libfsext
Source: https://github.com/libyal/libfsext/releases/download/%version/libfsext-experimental-%version.tar.gz Source: https://github.com/libyal/libfsext/releases/download/%version/libfsext-experimental-%version.tar.gz
Source2: https://github.com/libyal/libfsext/releases/download/%version/libfsext-experimental-%version.tar.gz.asc Source2: https://github.com/libyal/libfsext/releases/download/%version/libfsext-experimental-%version.tar.gz.asc
Source3: %name.keyring Source3: %name.keyring
Patch1: system-libs.patch
BuildRequires: %{python_module devel} BuildRequires: %{python_module devel}
BuildRequires: c_compiler BuildRequires: c_compiler
BuildRequires: gettext-tools >= 0.18.1
BuildRequires: libtool
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: python-rpm-macros BuildRequires: python-rpm-macros
BuildRequires: pkgconfig(libbfio) >= 20220120 BuildRequires: pkgconfig(libbfio) >= 20220120
@ -44,12 +41,13 @@ BuildRequires: pkgconfig(libcpath) >= 20220108
BuildRequires: pkgconfig(libcsplit) >= 20220109 BuildRequires: pkgconfig(libcsplit) >= 20220109
BuildRequires: pkgconfig(libcthreads) >= 20220102 BuildRequires: pkgconfig(libcthreads) >= 20220102
BuildRequires: pkgconfig(libfcache) >= 20220110 BuildRequires: pkgconfig(libfcache) >= 20220110
BuildRequires: pkgconfig(libfdata) >= 20211023 BuildRequires: pkgconfig(libfdata) >= 20220111
BuildRequires: pkgconfig(libfdatetime) >= 20220112 BuildRequires: pkgconfig(libfdatetime) >= 20220112
BuildRequires: pkgconfig(libfguid) >= 20220113 BuildRequires: pkgconfig(libfguid) >= 20220113
BuildRequires: pkgconfig(libhmac) >= 20200104 BuildRequires: pkgconfig(libhmac) >= 20220425
BuildRequires: pkgconfig(libuna) >= 20220102 BuildRequires: pkgconfig(libuna) >= 20220611
%python_subpackages %python_subpackages
# Various notes: https://en.opensuse.org/libyal
%description %description
libfsext is a library to access the Extended File System (ext). libfsext is a library to access the Extended File System (ext).
@ -119,22 +117,19 @@ applications that want to make use of libfsext.
%autosetup -p1 %autosetup -p1
%build %build
autoreconf -fi
# OOT builds are presently broken, so we have to install
# within each python iteration now, not in %%install.
%{python_expand # %{python_expand #
# see libcdata for version-sc
echo "V_%version { global: *; };" >v.sym echo "V_%version { global: *; };" >v.sym
%configure --disable-static --enable-wide-character-type \ %configure --disable-static --enable-wide-character-type \
--enable-python PYTHON_VERSION="%{$python_bin_suffix}" \ --enable-python PYTHON_VERSION="%{$python_bin_suffix}" \
LDFLAGS="-Wl,--version-script=$PWD/v.sym" LDFLAGS="-Wl,--version-script=$PWD/v.sym"
grep ' '' ''local' config.log && exit 1
%make_build %make_build
%make_install DESTDIR="%_builddir/rt" %make_install DESTDIR="%_builddir/rt"
%make_build clean %make_build clean
} }
%install %install
mv %_builddir/rt/* %buildroot/ mv "%_builddir/rt"/* %buildroot/
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
%post -n %{lname} -p /sbin/ldconfig %post -n %{lname} -p /sbin/ldconfig

View File

@ -1,89 +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 | 29 -----------------------------
configure.ac | 15 ---------------
2 files changed, 44 deletions(-)
Index: libfsext/Makefile.am
===================================================================
--- libfsext.orig/Makefile.am
+++ libfsext/Makefile.am
@@ -3,22 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \
include \
common \
- libcerror \
- libcthreads \
- libcdata \
- libclocale \
- libcnotify \
- libcsplit \
- libuna \
- libcfile \
- libcpath \
- libbfio \
- libfcache \
- libfdata \
- libfdatetime \
- libfguid \
libfsext \
- libhmac \
fsexttools \
pyfsext \
pyfsext-python2 \
@@ -79,20 +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)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS))
- (cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libfsext && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
Index: libfsext/configure.ac
===================================================================
--- libfsext.orig/configure.ac
+++ libfsext/configure.ac
@@ -173,25 +173,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([libfsext/Makefile])
AC_CONFIG_FILES([pyfsext/Makefile])
AC_CONFIG_FILES([pyfsext-python2/Makefile])
AC_CONFIG_FILES([pyfsext-python3/Makefile])
-AC_CONFIG_FILES([libhmac/Makefile])
AC_CONFIG_FILES([fsexttools/Makefile])
AC_CONFIG_FILES([po/Makefile.in])
AC_CONFIG_FILES([po/Makevars])