From 9477f5ee07f42b4334133ed413a0b9dce5a77b1484e16258eef0094e2a9564bd Mon Sep 17 00:00:00 2001 From: Greg Freemyer Date: Wed, 9 Jun 2021 09:41:33 +0000 Subject: [PATCH] Accepting request 898681 from home:jengelh:forensics - Update to snapshot 20210513 (3def3dae) OBS-URL: https://build.opensuse.org/request/show/898681 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfsapfs?expand=0&rev=6 --- _service | 14 ++++ libfsapfs-20210513.tar.xz | 3 + libfsapfs-experimental-20201107.tar.gz | 3 - libfsapfs-experimental-20201107.tar.gz.asc | 11 --- libfsapfs.changes | 7 ++ libfsapfs.spec | 59 +++++++-------- system-libs.patch | 88 ++++++++++++++++++++++ 7 files changed, 139 insertions(+), 46 deletions(-) create mode 100644 _service create mode 100644 libfsapfs-20210513.tar.xz delete mode 100644 libfsapfs-experimental-20201107.tar.gz delete mode 100644 libfsapfs-experimental-20201107.tar.gz.asc create mode 100644 system-libs.patch diff --git a/_service b/_service new file mode 100644 index 0000000..158631d --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/libyal/libfsapfs + 3def3dae10ef8916f76649e90dc9acc0ca471a92 + + 20210513 + + + *.tar + xz + + + diff --git a/libfsapfs-20210513.tar.xz b/libfsapfs-20210513.tar.xz new file mode 100644 index 0000000..bbe2476 --- /dev/null +++ b/libfsapfs-20210513.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:564ea959150e7a9ab302e12570ed17772feb456df3b8d200c001d3dd63543a94 +size 325600 diff --git a/libfsapfs-experimental-20201107.tar.gz b/libfsapfs-experimental-20201107.tar.gz deleted file mode 100644 index 2a1777f..0000000 --- a/libfsapfs-experimental-20201107.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc0543b86779a3c0b46913d780a9fd7fdb7af86e1fea61c54f0d1d0209a18f15 -size 2080147 diff --git a/libfsapfs-experimental-20201107.tar.gz.asc b/libfsapfs-experimental-20201107.tar.gz.asc deleted file mode 100644 index 453c402..0000000 --- a/libfsapfs-experimental-20201107.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAl+muTgACgkQ2WJeXXrQ -F35l6wf/TDnqSe6aA/5nvz2FokVUEez6+RpCyi9tx+Rcn/vrwsvjpjy0zd3BKHqf -g/T1muULw9hjJdgQLCIt/o87qhEocDgjSVESTtUrhCI6gs0znAFQYF6uHiQj2Pzg -gmsgXP8Der0OrEnd+yWlu6HKf5oNsx9s9LazaLbZ3AndjIDdBzT9yMYfvS+kc80F -YcGIOtiHbyZMpvpLmlU3IOJxemrBs3eyjZnurHmEg79kPIZF/KpI1jMa1/zsQ9KM -GYlem9nsBBOAyorRY2aBSDmI87c6sUe/F5rPXVLHdsllNI7p6GkiWZClMesp6QdA -hXdN3kukRf28LMHEXG03lddIjD4EJw== -=7I5J ------END PGP SIGNATURE----- diff --git a/libfsapfs.changes b/libfsapfs.changes index c404a8f..370262f 100644 --- a/libfsapfs.changes +++ b/libfsapfs.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 14 22:36:13 UTC 2021 - Jan Engelhardt + +- Update to snapshot 20210513 (3def3dae) + * No changelog was provided +- Add system-libs.patch + ------------------------------------------------------------------- Sun Feb 28 18:09:58 UTC 2021 - Dirk Müller diff --git a/libfsapfs.spec b/libfsapfs.spec index a6e297a..2b0ce28 100644 --- a/libfsapfs.spec +++ b/libfsapfs.spec @@ -16,42 +16,38 @@ # -%define experimental_tag experimental- Name: libfsapfs -Version: 20201107 +Version: 20210513 Release: 0 Summary: Library and tools to access the Apple File System (APFS) License: LGPL-3.0-only Group: System/Filesystems URL: https://github.com/libyal/libfsapfs -Source0: https://github.com/libyal/%{name}/releases/download/%{version}/%{name}-%{?experimental_tag}%{version}.tar.gz -Source1: https://github.com/libyal/%{name}/releases/download/%{version}/%{name}-%{?experimental_tag}%{version}.tar.gz.asc -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: fuse-devel -BuildRequires: gettext-tools -BuildRequires: git +Source: %name-%version.tar.xz +Patch1: system-libs.patch +BuildRequires: c_compiler +BuildRequires: gettext-tools >= 0.18.1 BuildRequires: libtool BuildRequires: pkg-config -BuildRequires: python3-devel -BuildRequires: pkgconfig(libbfio) -BuildRequires: pkgconfig(libcaes) >= 20120425 -BuildRequires: pkgconfig(libcdata) -BuildRequires: pkgconfig(libcerror) >= 20120526 -BuildRequires: pkgconfig(libcfile) >= 20120526 -BuildRequires: pkgconfig(libclocale) >= 20120425 -BuildRequires: pkgconfig(libcnotify) >= 20120425 -BuildRequires: pkgconfig(libcpath) -BuildRequires: pkgconfig(libcsplit) >= 20120701 -BuildRequires: pkgconfig(libcthreads) >= 20130723 -BuildRequires: pkgconfig(libfcache) -BuildRequires: pkgconfig(libfdata) -BuildRequires: pkgconfig(libfdatetime) -BuildRequires: pkgconfig(libfdatetime) -BuildRequires: pkgconfig(libfguid) -BuildRequires: pkgconfig(libhmac) >= 20120425 -BuildRequires: pkgconfig(libuna) >= 20120425 +BuildRequires: pkgconfig(fuse) >= 2.6 +BuildRequires: pkgconfig(libbfio) >= 20201229 +BuildRequires: pkgconfig(libcaes) >= 20201012 +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(libfdatetime) >= 20180910 +BuildRequires: pkgconfig(libfguid) >= 20180724 +BuildRequires: pkgconfig(libhmac) >= 20200104 +BuildRequires: pkgconfig(libuna) >= 20201204 BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(zlib) >= 1.2.5 %description @@ -84,7 +80,6 @@ Requires: %{name} = %{version} %description devel Development files for %{name}. - %package -n libfsapfs1 Summary: Library for access the Apple File System (APFS) Group: System/Libraries @@ -102,9 +97,10 @@ Python bindings for %{name}, a library for access the Apple File System (APFS). %prep -%setup -q -n %{name}-%{version} +%autosetup -p1 %build +if [ ! -e configure ]; then ./autogen.sh; fi %define _lto_cflags -ffat-lto-objects export LDFLAGS="-Wl,-z,relro,-z,now" export CFLAGS="%{optflags}" @@ -114,7 +110,7 @@ export CFLAGS="%{optflags}" --enable-debug-output \ --enable-python3 -%make_build %{?_smp_mflags} +%make_build %install %make_install @@ -127,8 +123,7 @@ make check || /bin/true %postun -n libfsapfs1 -p /sbin/ldconfig %files -%license COPYING COPYING.LESSER -%doc ChangeLog README +%license COPYING* %{_bindir}/fsapfsinfo %{_bindir}/fsapfsmount %{_mandir}/man*/* diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..39f07b3 --- /dev/null +++ b/system-libs.patch @@ -0,0 +1,88 @@ +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 | 32 -------------------------------- + configure.ac | 16 ---------------- + 2 files changed, 48 deletions(-) + +Index: libfsapfs/Makefile.am +=================================================================== +--- libfsapfs.orig/Makefile.am ++++ libfsapfs/Makefile.am +@@ -3,22 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ + include \ + common \ +- libcerror \ +- libcthreads \ +- libcdata \ +- libclocale \ +- libcnotify \ +- libcsplit \ +- libuna \ +- libcfile \ +- libcpath \ +- libbfio \ +- libfcache \ +- libfdata \ +- libfdatetime \ +- libfguid \ +- libhmac \ +- libcaes \ + libfsapfs \ + pyfsapfs \ + pyfsapfs-python2 \ +@@ -80,22 +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)/libhmac && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libcaes && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/libfsapfs && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) + +Index: libfsapfs/configure.ac +=================================================================== +--- libfsapfs.orig/configure.ac ++++ libfsapfs/configure.ac +@@ -183,22 +183,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([libfdatetime/Makefile]) +-AC_CONFIG_FILES([libfguid/Makefile]) +-AC_CONFIG_FILES([libhmac/Makefile]) +-AC_CONFIG_FILES([libcaes/Makefile]) + AC_CONFIG_FILES([libfsapfs/Makefile]) + AC_CONFIG_FILES([pyfsapfs/Makefile]) + AC_CONFIG_FILES([pyfsapfs-python2/Makefile])