From 94e1a8d1fb0748a30b2d78463609727156eee05c4710c6d2a48ebdf46874268b Mon Sep 17 00:00:00 2001 From: Greg Freemyer Date: Mon, 7 Jun 2021 21:41:29 +0000 Subject: [PATCH 1/2] Accepting request 898058 from home:jengelh:forensics - Update to snapshot 20210411 (9ece23ab) OBS-URL: https://build.opensuse.org/request/show/898058 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libcsplit?expand=0&rev=9 --- _service | 14 +++++++++++ libcsplit-20210411.tar.xz | 3 +++ libcsplit-beta-20200703.tar.gz | 3 --- libcsplit.changes | 7 ++++++ libcsplit.spec | 45 +++++++++++++++++----------------- system-libs.patch | 43 ++++++++++++++++++++++++++++++++ 6 files changed, 89 insertions(+), 26 deletions(-) create mode 100644 _service create mode 100644 libcsplit-20210411.tar.xz delete mode 100644 libcsplit-beta-20200703.tar.gz create mode 100644 system-libs.patch diff --git a/_service b/_service new file mode 100644 index 0000000..9d40d6f --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/libyal/libcsplit + 9ece23ab25febd2d0510b87e07ba7816b833aca7 + + 20210411 + + + *.tar + xz + + + diff --git a/libcsplit-20210411.tar.xz b/libcsplit-20210411.tar.xz new file mode 100644 index 0000000..6ea83ba --- /dev/null +++ b/libcsplit-20210411.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb3540b182b234cc4642e4a51c63212562dbf85dfdd7b77b8d6923f49b392f4a +size 57680 diff --git a/libcsplit-beta-20200703.tar.gz b/libcsplit-beta-20200703.tar.gz deleted file mode 100644 index bac6545..0000000 --- a/libcsplit-beta-20200703.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db9b473bdf954d81cff3725d70e067fd8a30dd77ae6ee55cf96bdd81e3ce67bf -size 512309 diff --git a/libcsplit.changes b/libcsplit.changes index 55b19a0..4947237 100644 --- a/libcsplit.changes +++ b/libcsplit.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed May 12 17:26:33 UTC 2021 - Jan Engelhardt + +- Update to snapshot 20210411 (9ece23ab) + * No changelog was provided +- Add system-libs.patch + ------------------------------------------------------------------- Tue Dec 29 22:35:01 UTC 2020 - Greg Freemyer diff --git a/libcsplit.spec b/libcsplit.spec index 83bf17c..867a873 100644 --- a/libcsplit.spec +++ b/libcsplit.spec @@ -1,7 +1,7 @@ # # spec file for package libcsplit # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -12,35 +12,37 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: libcsplit %define lname libcsplit1 -%define timestamp 20200703 -Version: 0~%timestamp +Version: 20210411 Release: 0 -Summary: Library for cross-platform C split string functions -License: LGPL-3.0+ +Summary: Library for C split string functions +License: LGPL-3.0-or-later Group: Development/Libraries/C and C++ -Url: https://github.com/libyal/libcsplit/wiki -Source: https://github.com/libyal/libcsplit/releases/download/%timestamp/%{name}-beta-%timestamp.tar.gz -#BuildRequires: pkg-config -BuildRequires: pkgconfig(libcerror) >= 20130904 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +URL: https://github.com/libyal/libcsplit +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) >= 20201121 %description -A library for cross-platform C split string functions. +A library for C split string functions. This package is part of the libyal library collection and is used by other libraries in the collection %package -n %lname -Summary: Library for cross-platform C split string functions +Summary: Library for C split string functions Group: System/Libraries %description -n %lname -Library for cross-platform C split string functions. +Library for C split string functions. Part of the libyal family of libraries. @@ -53,25 +55,26 @@ Also see: libcnotify; notification functions libcfile; file functions libcpath; path functions - libcthreads; threads functions + libcthreads; threads functions %package devel -Summary: Development files for libcsplit, a cross-platform C split string library +Summary: Development files for libcsplit, a C split string library Group: Development/Libraries/C and C++ Requires: %lname = %{version} %description devel -A library for cross-platform C split string functions. +A library for C split string functions. This subpackage contains libraries and header files for developing applications that want to make use of libcsplit. %prep -%setup -qn libcsplit-%timestamp +%autosetup -p1 %build +if [ ! -e configure ]; then ./autogen.sh; fi %configure --disable-static --enable-wide-character-type -make %{?_smp_mflags} +%make_build %install %make_install @@ -81,14 +84,10 @@ rm -f "%{buildroot}/%{_libdir}"/*.la %postun -n %lname -p /sbin/ldconfig %files -n %lname -%defattr(-,root,root) -%doc AUTHORS ChangeLog %license COPYING* %{_libdir}/libcsplit.so.1* %files devel -%defattr(-,root,root) -%doc AUTHORS ChangeLog %license COPYING* %{_includedir}/libcsplit* %{_libdir}/libcsplit.so diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..2e91b92 --- /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: libcsplit-20210411/Makefile.am +=================================================================== +--- libcsplit-20210411.orig/Makefile.am ++++ libcsplit-20210411/Makefile.am +@@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ + include \ + common \ +- libcerror \ + libcsplit \ + po \ + manuals \ +@@ -53,7 +52,6 @@ lib: library + + library: + cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS) +- cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS) + cd $(srcdir)/libcsplit && $(MAKE) $(AM_MAKEFLAGS) + cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS) + +Index: libcsplit-20210411/configure.ac +=================================================================== +--- libcsplit-20210411.orig/configure.ac ++++ libcsplit-20210411/configure.ac +@@ -94,7 +94,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([libcsplit/Makefile]) + AC_CONFIG_FILES([po/Makefile.in]) + AC_CONFIG_FILES([po/Makevars]) From bdf0a0cfe19bc36b6b91d7e223a04444774239563467f7b1a0b097383517678f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 9 Jan 2022 10:27:11 +0000 Subject: [PATCH 2/2] - Update to release 20220109 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libcsplit?expand=0&rev=10 --- _service | 14 -------------- libcsplit-20210411.tar.xz | 3 --- libcsplit-beta-20220109.tar.gz | 3 +++ libcsplit-beta-20220109.tar.gz.asc | 11 +++++++++++ libcsplit.changes | 6 ++++++ libcsplit.keyring | 29 +++++++++++++++++++++++++++++ libcsplit.spec | 10 ++++++---- 7 files changed, 55 insertions(+), 21 deletions(-) delete mode 100644 _service delete mode 100644 libcsplit-20210411.tar.xz create mode 100644 libcsplit-beta-20220109.tar.gz create mode 100644 libcsplit-beta-20220109.tar.gz.asc create mode 100644 libcsplit.keyring diff --git a/_service b/_service deleted file mode 100644 index 9d40d6f..0000000 --- a/_service +++ /dev/null @@ -1,14 +0,0 @@ - - - git - https://github.com/libyal/libcsplit - 9ece23ab25febd2d0510b87e07ba7816b833aca7 - - 20210411 - - - *.tar - xz - - - diff --git a/libcsplit-20210411.tar.xz b/libcsplit-20210411.tar.xz deleted file mode 100644 index 6ea83ba..0000000 --- a/libcsplit-20210411.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb3540b182b234cc4642e4a51c63212562dbf85dfdd7b77b8d6923f49b392f4a -size 57680 diff --git a/libcsplit-beta-20220109.tar.gz b/libcsplit-beta-20220109.tar.gz new file mode 100644 index 0000000..af077ab --- /dev/null +++ b/libcsplit-beta-20220109.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:987d025c2e23b4c833ec9298faa9eeab0c8a06365eb89dc95218687c35e63d6f +size 513064 diff --git a/libcsplit-beta-20220109.tar.gz.asc b/libcsplit-beta-20220109.tar.gz.asc new file mode 100644 index 0000000..2341117 --- /dev/null +++ b/libcsplit-beta-20220109.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmHaausACgkQ2WJeXXrQ +F377dgf/eb7PSIgG0WbYDXS9r6L1E98ZfRDNIhqR0eWlsN93MNUKTXt38cFArpgy +/wBmSlH6GJ5Jbj2Vh5P0Qt2r3tXtzZxdzw0FyVMeqoFbZy2eTDlqauZMAoMoKJNJ +IXySHKQGg/9gGcPqE5zHQOEVKd2FvADiAgDptA24p7qWLOZPihC3RaIhZWsgaL3D +shMi7B3MVBxdKQ21ecLgvJtRwun5HsT6K+acm/RF55xSJNAaalSehmeepFm5F/pw +UMxVBxujVtnn5IJ4N+FLC2Jx1tpmFO4LzVqmz0E0Ih9nlNK47ztXy1z5k76uX77T +/vuzp9VrPKDJUnjWnYsBnBe3IN5zMg== +=mr06 +-----END PGP SIGNATURE----- diff --git a/libcsplit.changes b/libcsplit.changes index 4947237..829a110 100644 --- a/libcsplit.changes +++ b/libcsplit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jan 9 10:26:55 UTC 2022 - Jan Engelhardt + +- Update to release 20220109 + * No changes, version bump only. + ------------------------------------------------------------------- Wed May 12 17:26:33 UTC 2021 - Jan Engelhardt diff --git a/libcsplit.keyring b/libcsplit.keyring new file mode 100644 index 0000000..da327a1 --- /dev/null +++ b/libcsplit.keyring @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFSf2CoBCADJOuDavJeI0IhBPnIYol/ZfE2bXvmRJMGPasU1H6CJagTkc/Iq +SuUpiix7HcYgyGY7qHO7B1Wpnh5plc03dFW2ysTnOk8NzSqWF/gbWIYbRg8GUATg +fGy7NoIio/hbBlWkM0rPQq7AIK79m0m2U4ZAuQPamAC4y8H9j/SyTFI1gQNeExZ+ +L8DE3QjSx4GAVgb4cfdQQPwGmoOIgKSudZN6oPiOj+MM3yh1vv49C45ChSWNWGjB +683zFbjuS0A483MFPI8iQGC8JecmQGvpzcOoSLkyTjT7vleFYGkfj8N0FB5Bq2L5 +TT2w9lQKEjvWTe//G4tXgnGXy8PwqRZmj2CfABEBAAG0JUpvYWNoaW0gTWV0eiA8 +am9hY2hpbS5tZXR6QGdtYWlsLmNvbT6JATkEEwECACMFAlSf2CoCGwMHCwkIBwMC +AQYVCAIJCgsEFgIDAQIeAQIXgAAKCRDZYl5detAXfkBgCAC4W/adqlNYSkK5VDoU +FDMMRDffVVe0WdPlW7PDJXR0R0IParwHD+FJY3jtNA2upqKTCXm7JbQRN/n4Qrfb +PJHr0EoBF7iG6kT4RKocImciuMJaj4fTolGNdc0iRKl5tMIb64RiE47XhN7v6/oP +UaqrbnF5EW9EZ2AqOSTEcLeTgKLErMlv2dLjFXg8jXGNxTkmi6BELyaczgWBgD9I +3tfMvXLswI5q9RtpJUc8oAfV81ibfFm6UeItQxM6SM0WLKILlXIQqqiQ4oCbAm4R +PJI4RwoJYAhcJOmUXrAUC5obhjkf9Qo0RJzVMFLuQXDiRV5W5dBL/hs9M0FVWDxv +siZNuQENBFSf2CoBCADODF+4Q3nXhmvTpVZTh17gYzCQqOHKctyTwoWg0VidmWWD +lmtDBX8hWh1fjm0KQezzYagddgjlPncgq/oyrhvq2fEG3nch5qpb8k94v6KlhC9+ +SoJAwFoMLfCG8lQXASHKFvt3LJKJhS3laOLzzc4QNhWG7KRrwiOcp47bjoL8x+9L +U1EkGZR1OMGWYaJmokEcPTNchLEgL7MMRtdaPmh9R2f8N7eqb/mKNZCxyt89a3yw +uapLtYe5dRPEnpL00PXd9uMlwMbyuMcP60CouMFGqqKeBITWTd8vPsz+CpictNZw +Toa25CCGgoGm2pP5catMdjH3SDZef5Mkqq5uZT/pABEBAAGJAR8EGAECAAkFAlSf +2CoCGwwACgkQ2WJeXXrQF34oPQf6AyuzFs60DKrldW8tKPZxSmrQoOEK5h+w1WUQ +RTvJyE5CECzocC68s46jGkluMa4wHzBDGYH2CoWAqXpnEC4UivBtlZses92vdqtM +5kqWrSkamTwsggtVyqHvHUW+OSiJLluGA1amn1sVaQUAIP9PEk/q7Qj9VzctKGA5 +3UVw6NA/sYad+IIg95qu798GF4nrtyY9nhQg9YM/6C2CF6FpJJUlNMPXm9zx20dL +cuAm/5zwU7xoNbV8c829EiqrRCdJMY8/LPriF7fDxUQa3AAptFZoWWkt4T5QbjB4 +VpPayIneEZRdCFktpSPgVYLm8HboNXeladSTdOtJS0HaoPzMTg== +=fRjn +-----END PGP PUBLIC KEY BLOCK----- diff --git a/libcsplit.spec b/libcsplit.spec index 867a873..073b610 100644 --- a/libcsplit.spec +++ b/libcsplit.spec @@ -1,7 +1,7 @@ # # spec file for package libcsplit # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,13 +18,15 @@ Name: libcsplit %define lname libcsplit1 -Version: 20210411 +Version: 20220109 Release: 0 Summary: Library for C split string functions License: LGPL-3.0-or-later Group: Development/Libraries/C and C++ URL: https://github.com/libyal/libcsplit -Source: %name-%version.tar.xz +Source: https://github.com/libyal/libcsplit/releases/download/%version/libcsplit-beta-%version.tar.gz +Source2: https://github.com/libyal/libcsplit/releases/download/%version/libcsplit-beta-%version.tar.gz.asc +Source9: %name.keyring Patch1: system-libs.patch BuildRequires: c_compiler BuildRequires: gettext-tools >= 0.18.1 @@ -72,7 +74,7 @@ applications that want to make use of libcsplit. %autosetup -p1 %build -if [ ! -e configure ]; then ./autogen.sh; fi +autoreconf -fi %configure --disable-static --enable-wide-character-type %make_build