Accepting request 1038457 from security:forensics

delete system-libs.patch

OBS-URL: https://build.opensuse.org/request/show/1038457
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libfdata?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger 2022-11-28 10:06:12 +00:00 committed by Git OBS Bridge
commit 35a474eef2
3 changed files with 8 additions and 60 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)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 1 08:16:06 UTC 2022 - Jan Engelhardt <jengelh@inai.de> Thu Sep 1 08:16:06 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

View File

@ -27,18 +27,16 @@ URL: https://github.com/libyal/libfdata
Source: https://github.com/libyal/libfdata/releases/download/%version/libfdata-alpha-%version.tar.gz Source: https://github.com/libyal/libfdata/releases/download/%version/libfdata-alpha-%version.tar.gz
Source2: https://github.com/libyal/libfdata/releases/download/%version/libfdata-alpha-%version.tar.gz.asc Source2: https://github.com/libyal/libfdata/releases/download/%version/libfdata-alpha-%version.tar.gz.asc
Source3: %name.keyring Source3: %name.keyring
Patch1: system-libs.patch
# The source code assumes 64bit integers for one of the function returns. Fix that. # The source code assumes 64bit integers for one of the function returns. Fix that.
Patch2: libfdata-20211023-1TB-fix.patch Patch2: libfdata-20211023-1TB-fix.patch
BuildRequires: c_compiler BuildRequires: c_compiler
BuildRequires: gettext-tools >= 0.18.1
BuildRequires: libtool
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: pkgconfig(libcdata) >= 20200509 BuildRequires: pkgconfig(libcdata) >= 20200509
BuildRequires: pkgconfig(libcerror) >= 20220101 BuildRequires: pkgconfig(libcerror) >= 20220101
BuildRequires: pkgconfig(libcnotify) >= 20220108 BuildRequires: pkgconfig(libcnotify) >= 20220108
BuildRequires: pkgconfig(libcthreads) >= 20220102 BuildRequires: pkgconfig(libcthreads) >= 20220102
BuildRequires: pkgconfig(libfcache) >= 20220110 BuildRequires: pkgconfig(libfcache) >= 20220110
# Various notes: https://en.opensuse.org/libyal
%description %description
Library to provide generic file data functions for the libyal family of libraries. Library to provide generic file data functions for the libyal family of libraries.
@ -65,10 +63,9 @@ applications that want to make use of libfdata.
%autosetup -p1 %autosetup -p1
%build %build
autoreconf -fi
# see libcdata for version-sc
echo "V_%version { global: *; };" >v.sym echo "V_%version { global: *; };" >v.sym
%configure --disable-static LDFLAGS="-Wl,--version-script=$PWD/v.sym" %configure --disable-static LDFLAGS="-Wl,--version-script=$PWD/v.sym"
grep ' local' config.log && exit 1
%make_build %make_build
%install %install

View File

@ -1,55 +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 | 10 ----------
configure.ac | 5 -----
2 files changed, 15 deletions(-)
Index: libfdata/Makefile.am
===================================================================
--- libfdata.orig/Makefile.am
+++ libfdata/Makefile.am
@@ -3,11 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \
include \
common \
- libcerror \
- libcthreads \
- libcdata \
- libcnotify \
- libfcache \
libfdata \
po \
manuals \
@@ -57,11 +52,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)/libcnotify && $(MAKE) $(AM_MAKEFLAGS))
- (cd $(srcdir)/libfcache && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/libfdata && $(MAKE) $(AM_MAKEFLAGS))
(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
Index: libfdata/configure.ac
===================================================================
--- libfdata.orig/configure.ac
+++ libfdata/configure.ac
@@ -109,11 +109,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([libcnotify/Makefile])
-AC_CONFIG_FILES([libfcache/Makefile])
AC_CONFIG_FILES([libfdata/Makefile])
AC_CONFIG_FILES([po/Makefile.in])
AC_CONFIG_FILES([po/Makevars])