From e4db0d146ed6df276c464804ccfd459a681a5801435eeaace37919ac6921e60e Mon Sep 17 00:00:00 2001 From: Greg Freemyer Date: Wed, 9 Jun 2021 10:31:42 +0000 Subject: [PATCH] Accepting request 898761 from home:jengelh:forensics - Update to 20210425 (61eeb381) OBS-URL: https://build.opensuse.org/request/show/898761 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libvhdi?expand=0&rev=19 --- _service | 14 +++++++ libvhdi-20210425.tar.xz | 3 ++ libvhdi-alpha-20201018.tar.gz | 3 -- libvhdi.changes | 7 ++++ libvhdi.spec | 70 +++++++++++++------------------ system-libs.patch | 79 +++++++++++++++++++++++++++++++++++ 6 files changed, 133 insertions(+), 43 deletions(-) create mode 100644 _service create mode 100644 libvhdi-20210425.tar.xz delete mode 100644 libvhdi-alpha-20201018.tar.gz create mode 100644 system-libs.patch diff --git a/_service b/_service new file mode 100644 index 0000000..520cc33 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/libyal/libvhdi + 61eeb3819be35d23ed3a7e3cc70871640542efee + + 20210425 + + + *.tar + xz + + + diff --git a/libvhdi-20210425.tar.xz b/libvhdi-20210425.tar.xz new file mode 100644 index 0000000..01ec438 --- /dev/null +++ b/libvhdi-20210425.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c64c822e9a135f3dd6984ef9e1ee29063cdd01321d70a72218071916cd6ec26a +size 166988 diff --git a/libvhdi-alpha-20201018.tar.gz b/libvhdi-alpha-20201018.tar.gz deleted file mode 100644 index 00463fc..0000000 --- a/libvhdi-alpha-20201018.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ecf870e00e544492625bbed1fea9502b8aa3dd7b89666659aef45804911f9559 -size 1535997 diff --git a/libvhdi.changes b/libvhdi.changes index 94eb467..4a4f198 100644 --- a/libvhdi.changes +++ b/libvhdi.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun May 16 10:23:33 UTC 2021 - Jan Engelhardt + +- Update to 20210425 (61eeb381) + * No changelog was provided +- Add system-libs.patch + ------------------------------------------------------------------- Fri Nov 13 02:37:45 UTC 2020 - Greg Freemyer diff --git a/libvhdi.spec b/libvhdi.spec index f654dd5..6cb6a66 100644 --- a/libvhdi.spec +++ b/libvhdi.spec @@ -1,7 +1,7 @@ # # spec file for package libvhdi # -# 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 @@ -17,34 +17,35 @@ %define lname libvhdi1 -%define timestamp 20201018 Name: libvhdi -Version: 0~%{timestamp} +Version: 20210425 Release: 0 Summary: Library and tools to access the VHD image format -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/libvhdi/wiki -Source: https://github.com/libyal/libvhdi/releases/download/%timestamp/%{name}-alpha-%{timestamp}.tar.gz +Source: %{name}-%{version}.tar.xz Source2: Virtual_Hard_Disk_VHD_image_format.pdf - +Patch1: system-libs.patch +BuildRequires: c_compiler +BuildRequires: gettext-tools >= 0.18.1 +BuildRequires: libtool BuildRequires: pkg-config -BuildRequires: pkgconfig(libbfio) >= 20130721 -BuildRequires: pkgconfig(libcdata) >= 20140105 -BuildRequires: pkgconfig(libcerror) >= 20170101 -BuildRequires: pkgconfig(libcfile) >= 20130609 -BuildRequires: pkgconfig(libclocale) >= 20130609 -BuildRequires: pkgconfig(libcnotify) >= 20120425 -BuildRequires: pkgconfig(libcpath) >= 20130609 -BuildRequires: pkgconfig(libcsplit) >= 20130609 -BuildRequires: pkgconfig(libcthreads) >= 20130723 -BuildRequires: pkgconfig(libfcache) >= 20120405 -BuildRequires: pkgconfig(libfdata) >= 20120405 -BuildRequires: pkgconfig(libfguid) >= 20130317 -BuildRequires: pkgconfig(libuna) >= 20120425 +BuildRequires: pkgconfig(libbfio) >= 20201229 +BuildRequires: pkgconfig(libcdata) >= 20200509 +BuildRequires: pkgconfig(libcerror) >= 20201121 +BuildRequires: pkgconfig(libcfile) >= 20201229 +BuildRequires: pkgconfig(libclocale) >= 20200913 +BuildRequires: pkgconfig(libcnotify) >= 20200913 +BuildRequires: pkgconfig(libcpath) >= 20200623 +BuildRequires: pkgconfig(libcsplit) >= 20200703 +BuildRequires: pkgconfig(libcthreads) >= 20200508 +BuildRequires: pkgconfig(libfcache) >= 20200708 +BuildRequires: pkgconfig(libfdata) >= 20201129 +BuildRequires: pkgconfig(libfguid) >= 20180724 +BuildRequires: pkgconfig(libuna) >= 20201204 BuildRequires: pkgconfig(python2) BuildRequires: pkgconfig(python3) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Library and tools to access the Virtual Hard Disk (VHD) image format. @@ -81,14 +82,13 @@ Note that an undo disk image (.vud) is also a differential image Summary: Tools to access the VHD image format License: LGPL-3.0-or-later Group: Productivity/File utilities -Requires: %{lname} = %{version} %description tools Tools to access the Virtual Hard Disk (VHD) image format. See libvhdi for additional details. %package devel Summary: Development files for libvhdi, a VHD image format 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} @@ -102,8 +102,6 @@ applications that want to make use of libvhdi. Summary: Python 3 bindings for libvhdi, a VHD image format parser License: LGPL-3.0-or-later Group: Development/Languages/Python -Requires: %{lname} = %{version} -Requires: python3 Provides: pyvhdi %description -n python3-%{name} @@ -112,38 +110,32 @@ libvhdi is a library to access Virtual Hard Disk (VHD) image format. See libvhdi This package contains Python 3 bindings for libvhdi. %prep -%setup -q -n libvhdi-%{timestamp} +%autosetup -p1 cp "%{SOURCE2}" . %build +if [ ! -e configure ]; then ./autogen.sh; fi %configure --disable-static --enable-wide-character-type --enable-python3 -make %{?_smp_mflags} +%make_build %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install find %{buildroot} -type f -name "*.la" -delete -print %post -n %{lname} -p /sbin/ldconfig - %postun -n %{lname} -p /sbin/ldconfig %files -n %{lname} -%defattr(-,root,root) -%doc AUTHORS ChangeLog -%license COPYING +%license COPYING* %{_libdir}/libvhdi.so.* %files tools -%defattr(-,root,root) -%doc AUTHORS ChangeLog -%license COPYING +%license COPYING* %{_bindir}/vhdi* %{_mandir}/man1/vhdi*.1* %files devel -%defattr(-,root,root) -%doc AUTHORS README ChangeLog -%license COPYING +%license COPYING* %doc Virtual_Hard_Disk_* %{_includedir}/libvhdi.h %{_includedir}/libvhdi/ @@ -152,9 +144,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_mandir}/man3/libvhdi.3* %files -n python3-%{name} -%defattr(-,root,root) -%doc AUTHORS README ChangeLog -%license COPYING +%license COPYING* %{python3_sitearch}/pyvhdi.so %changelog diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..bae2a0b --- /dev/null +++ b/system-libs.patch @@ -0,0 +1,79 @@ +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 | 26 -------------------------- + configure.ac | 13 ------------- + 2 files changed, 39 deletions(-) + +Index: libvhdi/Makefile.am +=================================================================== +--- libvhdi.orig/Makefile.am ++++ libvhdi/Makefile.am +@@ -3,19 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ + include \ + common \ +- libcerror \ +- libcthreads \ +- libcdata \ +- libclocale \ +- libcnotify \ +- libcsplit \ +- libuna \ +- libcfile \ +- libcpath \ +- libbfio \ +- libfcache \ +- libfdata \ +- libfguid \ + libvhdi \ + vhditools \ + pyvhdi \ +@@ -78,19 +65,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)/libvhdi && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) + +Index: libvhdi/configure.ac +=================================================================== +--- libvhdi.orig/configure.ac ++++ libvhdi/configure.ac +@@ -170,19 +170,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([libvhdi/Makefile]) + AC_CONFIG_FILES([pyvhdi/Makefile]) + AC_CONFIG_FILES([pyvhdi-python2/Makefile])