From 61e025b6ae4cdd8d10efb5450834f0b01308b9b4 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 21 Feb 2022 15:12:20 +0100 Subject: [PATCH] Rebase to version 1.3.3 related: rhbz#2013578 --- .gitignore | 2 ++ socket_wrapper.spec | 33 +++++++++++++++++++++++++++++++-- sources | 4 ++-- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ad5a798..e960ed4 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,5 @@ /socket_wrapper-1.2.4.tar.gz.asc /socket_wrapper-1.2.5.tar.gz /socket_wrapper-1.2.5.tar.gz.asc +/socket_wrapper-1.3.3.tar.gz +/socket_wrapper-1.3.3.tar.gz.asc diff --git a/socket_wrapper.spec b/socket_wrapper.spec index ff2d69c..c070e92 100644 --- a/socket_wrapper.spec +++ b/socket_wrapper.spec @@ -1,6 +1,6 @@ Name: socket_wrapper -Version: 1.2.5 -Release: 4%{?dist} +Version: 1.3.3 +Release: 1%{?dist} License: BSD Summary: A library passing all socket communications through Unix sockets @@ -32,6 +32,21 @@ SOCKET_WRAPPER_DIR=/path/to/swrap_dir This package doesn't have a devel package because this project is for development/testing. +%package -n libsocket_wrapper_noop +Summary: A library providing dummies for socket_wrapper + +%description -n libsocket_wrapper_noop +Applications with the need to call socket_wrapper_enabled() should link against +-lsocket_wrapper_noop in order to resolve the symbol at link time. + +%package -n libsocket_wrapper_noop-devel +Summary: Development headers for libsocket_wrapper_noop +Requires: libsocket_wrapper_noop = %{version} + +%description -n libsocket_wrapper_noop-devel +Development headers for applications with the need to call +socket_wrapper_enabled(). + %prep gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %autosetup -p1 @@ -47,6 +62,8 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %ldconfig_scriptlets +%ldconfig_scriptlets -n libsocket_wrapper_noop + %check %ctest @@ -63,7 +80,19 @@ LD_PRELOAD=%{__cmake_builddir}/src/libsocket_wrapper.so bash -c '>/dev/null' %{_libdir}/pkgconfig/socket_wrapper.pc %{_mandir}/man1/socket_wrapper.1* +%files -n libsocket_wrapper_noop +%{_libdir}/libsocket_wrapper_noop.so.* + +%files -n libsocket_wrapper_noop-devel +%{_includedir}/socket_wrapper.h +%{_libdir}/libsocket_wrapper_noop.so +%{_libdir}/cmake/socket_wrapper/socket_wrapper_noop-config*.cmake +%{_libdir}/pkgconfig/socket_wrapper_noop.pc + %changelog +* Mon Feb 21 2022 Andreas Schneider - 1.3.3-1 +- related: rhbz#2013578 - Rebase to version 1.3.3 + * Tue Aug 10 2021 Mohan Boddu - 1.2.5-4 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 diff --git a/sources b/sources index cee2966..96ce5ef 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (socket_wrapper-1.2.5.tar.gz) = c7db5128fda608bfff427e206cba1195dd3c1a03a19779df6f05f63d0d822f9419e75c5b7f6235fc0978b7a2b415d15f73d390c1aa3e840f9cd67a2fe4bb853e -SHA512 (socket_wrapper-1.2.5.tar.gz.asc) = 9b7cb940a8b89d4d15e5540d5a40612f96f1439a84bf735f440b4602dfd5adadc02adf71fbbad883b5b6ef2a796056b905c9fad5f7020580697b93ba130ec6f9 +SHA512 (socket_wrapper-1.3.3.tar.gz) = 0befd8f207d0594a67d862e6db570ab66574388eeb99d85ee366b71729add995615661504f80d0e76074e63d0b1425be9f494d2e17075d80e3fbf72df06f5f1e +SHA512 (socket_wrapper-1.3.3.tar.gz.asc) = a79ae699cedf7ef680d0ae025e640f4b2ab93f5e8387d0565d79fcbf3b043efa57c431c169377a9286cc4e81ecdaa5e1da8f228ab594e08fa1992c6bc28be349