From d64805896eaf5dacc43136fc9bd10a0586edbe3b545fb614f00e3e559ab441aa Mon Sep 17 00:00:00 2001 From: Greg Freemyer Date: Sun, 6 Jun 2021 01:49:16 +0000 Subject: [PATCH] Accepting request 893371 from home:jengelh:forensics - Update to snapshot 20210415 (036bab2b) Some of the libraries may temporarily fail to build until all are submitted. Only a few SRs in the first round, in case of comments. OBS-URL: https://build.opensuse.org/request/show/893371 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libcthreads?expand=0&rev=9 --- _service | 14 ++++++++++ libcthreads-20210415.tar.xz | 3 +++ libcthreads-alpha-20200508.tar.gz | 3 --- libcthreads.changes | 7 +++++ libcthreads.spec | 41 +++++++++++++++-------------- system-libs.patch | 43 +++++++++++++++++++++++++++++++ 6 files changed, 88 insertions(+), 23 deletions(-) create mode 100644 _service create mode 100644 libcthreads-20210415.tar.xz delete mode 100644 libcthreads-alpha-20200508.tar.gz create mode 100644 system-libs.patch diff --git a/_service b/_service new file mode 100644 index 0000000..8122451 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/libyal/libcthreads + 036bab2b2931e518c549bbab994cea8aadb921a8 + + 20210415 + + + *.tar + xz + + + diff --git a/libcthreads-20210415.tar.xz b/libcthreads-20210415.tar.xz new file mode 100644 index 0000000..7011bc6 --- /dev/null +++ b/libcthreads-20210415.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d0581504c9e76a23552a66c196ede7c77cc7afd6864d68b0185571bb5924dbaf +size 75176 diff --git a/libcthreads-alpha-20200508.tar.gz b/libcthreads-alpha-20200508.tar.gz deleted file mode 100644 index c80b2ff..0000000 --- a/libcthreads-alpha-20200508.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efe8d904a1559439262bae76b8ba68de5d3746f2399a5c92b236dac3c1608d80 -size 548083 diff --git a/libcthreads.changes b/libcthreads.changes index bd6fd72..f26ce1c 100644 --- a/libcthreads.changes +++ b/libcthreads.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 12 15:27:52 UTC 2021 - Jan Engelhardt + +- Update to snapshot 20210415 (036bab2b) + * No changelog was provided +- Add system-libs.patch + ------------------------------------------------------------------- Fri Dec 18 02:48:07 UTC 2020 - Greg Freemyer diff --git a/libcthreads.spec b/libcthreads.spec index 375d004..86961fa 100644 --- a/libcthreads.spec +++ b/libcthreads.spec @@ -1,7 +1,7 @@ # # spec file for package libcthreads # -# 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 @@ -18,64 +18,65 @@ Name: libcthreads %define lname libcthreads1 -%define timestamp 20200508 -Version: 0~%timestamp +Version: 20210415 Release: 0 -Summary: Library for cross-platform C threads functions +Summary: Library for C threads functions License: LGPL-3.0-or-later Group: Development/Libraries/C and C++ -URL: https://github.com/libyal/libcthreads/wiki -Source: https://github.com/libyal/libcthreads/releases/download/%timestamp/%name-alpha-%timestamp.tar.gz +URL: https://github.com/libyal/libcthreads +Source: %name-%version.tar.xz +Patch1: system-libs.patch +BuildRequires: c_compiler +BuildRequires: gettext-tools >= 0.18.1 +BuildRequires: libtool BuildRequires: pkg-config -BuildRequires: pkgconfig(libcerror) >= 20130904 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(libcerror) >= 20201121 %description -A library for cross-platform C threads functions. +A library for C threads functions. libcthreads is part of the libyal library collection %package -n %lname -Summary: Library for cross-platform C thread functions +Summary: Library for C thread functions Group: System/Libraries %description -n %lname -A library for cross-platform C thread functions. +A library for C thread functions. libcthreads is part of the libyal library collection %package devel -Summary: Development files for libcthreads, a cross-platform C thread library +Summary: Development files for libcthreads, a C thread library Group: Development/Libraries/C and C++ Requires: %lname = %version %description devel -A library for cross-platform C thread functions. +A library for C thread functions. This subpackage contains libraries and header files for developing applications that want to make use of libcthreads. %prep -%setup -qn libcthreads-%timestamp +%autosetup -p1 %build -%configure --disable-static --enable-wide-character-type -make %{?_smp_mflags} +if [ ! -e configure ]; then ./autogen.sh; fi +%configure --disable-static +%make_build %install -make install DESTDIR="%buildroot" +%make_install rm -f "%buildroot/%_libdir"/*.la %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files -n %lname -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog +%license COPYING.LESSER %_libdir/libcthreads.so.1* %files devel -%defattr(-,root,root) %_includedir/libcthreads* %_libdir/libcthreads.so %_libdir/pkgconfig/libcthreads.pc diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..0a85dd3 --- /dev/null +++ b/system-libs.patch @@ -0,0 +1,43 @@ +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 | 2 -- + configure.ac | 1 - + 2 files changed, 3 deletions(-) + +Index: libcthreads/Makefile.am +=================================================================== +--- libcthreads.orig/Makefile.am ++++ libcthreads/Makefile.am +@@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ + include \ + common \ +- libcerror \ + libcthreads \ + po \ + manuals \ +@@ -53,7 +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)/po && $(MAKE) $(AM_MAKEFLAGS) + +Index: libcthreads/configure.ac +=================================================================== +--- libcthreads.orig/configure.ac ++++ libcthreads/configure.ac +@@ -91,7 +91,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([po/Makefile.in]) + AC_CONFIG_FILES([po/Makevars])