From f86620a1fcfdee321997f16ba9362069b1b4e991da9321b7bd161d97a484df84 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 27 Nov 2022 11:25:21 +0000 Subject: [PATCH] - Delete system-libs.patch OBS-URL: https://build.opensuse.org/package/show/security:forensics/libhmac?expand=0&rev=15 --- libhmac.changes | 6 +++++ libhmac.spec | 7 ++---- system-libs.patch | 60 ----------------------------------------------- 3 files changed, 8 insertions(+), 65 deletions(-) delete mode 100644 system-libs.patch diff --git a/libhmac.changes b/libhmac.changes index dfeafa7..5e1bd62 100644 --- a/libhmac.changes +++ b/libhmac.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 26 16:43:24 UTC 2022 - Jan Engelhardt + +- Delete system-libs.patch (not needed - system libs are + autodetected) + ------------------------------------------------------------------- Mon Aug 29 09:30:38 UTC 2022 - Jan Engelhardt diff --git a/libhmac.spec b/libhmac.spec index 7098049..9942e54 100644 --- a/libhmac.spec +++ b/libhmac.spec @@ -26,10 +26,7 @@ Group: Development/Libraries/C and C++ URL: https://github.com/libyal/libhmac Source: https://github.com/libyal/libhmac/releases/download/%version/libhmac-alpha-%version.tar.gz Source2: https://github.com/libyal/libhmac/releases/download/%version/libhmac-alpha-%version.tar.gz.asc -Patch1: system-libs.patch BuildRequires: c_compiler -BuildRequires: gettext-tools >= 0.18.1 -BuildRequires: libtool BuildRequires: pkg-config BuildRequires: pkgconfig(libcerror) >= 20220101 BuildRequires: pkgconfig(libcfile) >= 20220106 @@ -40,6 +37,7 @@ BuildRequires: pkgconfig(libcsplit) >= 20220109 BuildRequires: pkgconfig(libcthreads) >= 20220102 BuildRequires: pkgconfig(libuna) >= 20220102 BuildRequires: pkgconfig(openssl) >= 1.0 +# Various notes: https://en.opensuse.org/libyal %description A library and tools to support various Hash-based Message Authentication Codes (HMAC). @@ -73,11 +71,10 @@ Use hmacsum to calculate a Hash-based Message Authentication Code (HMAC) of the %autosetup -p1 %build -autoreconf -fi -# see libcdata for version-sc echo "V_%version { global: *; };" >v.sym %configure --disable-static --enable-wide-character-type \ LDFLAGS="-Wl,--version-script=$PWD/v.sym" +grep ' local' config.log && exit 1 %make_build %install diff --git a/system-libs.patch b/system-libs.patch deleted file mode 100644 index e60d854..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,60 +0,0 @@ -From: Jan Engelhardt -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 | 8 -------- - 2 files changed, 18 deletions(-) - -Index: libhmac/Makefile.am -=================================================================== ---- libhmac.orig/Makefile.am -+++ libhmac/Makefile.am -@@ -3,15 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libcthreads \ - libhmac \ -- libclocale \ -- libcnotify \ -- libcsplit \ -- libuna \ -- libcfile \ -- libcpath \ - hmactools \ - po \ - manuals \ -@@ -63,8 +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)/libhmac && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) - -Index: libhmac/configure.ac -=================================================================== ---- libhmac.orig/configure.ac -+++ libhmac/configure.ac -@@ -133,15 +133,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([libhmac/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([hmactools/Makefile]) - AC_CONFIG_FILES([po/Makefile.in]) - AC_CONFIG_FILES([po/Makevars])