update to 1.4.0

This commit is contained in:
openeuler-ci-bot 2022-11-05 10:00:23 +00:00 committed by lyn1001
commit 11a9d5f7e9
6 changed files with 92 additions and 5 deletions

Binary file not shown.

BIN
socket_wrapper-1.4.0.tar.gz Normal file

Binary file not shown.

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAmPHvdgACgkQfuD8TcwB
Tj2q8g/7BlqS00E/JDGHSDiHFNjhtjey53nrrJ9Fbog6fPiI0SkjwrPotbE37rct
K5fGI+9HvyLGiG6XXERuUYhdoxt32Zlmdk0XSJbT1OZV2k3vjGR080w+mV/mcRMu
kC9ix+9vKiHkO6QfOEUwkv3C3IDyp/FHju61hossORcuiL3Kk+AVoGaoxfBgC29D
8/+g2Q0yNOLnF3+GUMODmYAs7s4CqcXys4AulXW6XwHwH8hIi3bDmUpNtUTGkjxY
8ZoWOgpHsvBiEQ0LpPJckRXbXPhf6TnX9orwGjrPDmBoRAcPt9prc5mLMThvltuX
BHa3tkyyOg7sUzK15S+HLQ1fDERMHcV6J97UzM/GW0DCuh2XxpXaayACkp3/8dLU
Tvz+M/YB82yikvK0ksW9KzCtxkk8f3UoCnhHCzwIjSeAnED1KUrQkqmctuK5t8MN
CnNLvpTLXLvRa3SbsFc/KnKa759TuLT3Zcz2//iNLZSDIQPQ1pWybY2x7KYqobpN
7dKXlwwrjvC4WUgMl8XOvMgngXYUiTPB7KQMqpyeqi3mBjWYAMsj7GMwkPYHPRDD
4tR8DZ9cbEPumcol2IxAEJUZaWHeBYbwMwq+EknUHe7d1V5gMbohZIKJbgzRZVpm
ieoxl0FyyUhNIiHqm59TAGSKlKds75sX0kg3NqVo6So6vFcQCPo=
=EBbQ
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,33 @@
From 97fe09e583f6e2ef94623c872e0c56bcd8817303 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 17 Feb 2023 17:51:27 +0100
Subject: [PATCH] cmake: Fix cmocka >= 1.1.6 find_package() in CONFIG mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Pavel Filipensk√Ĺ <pfilipensky@samba.org>
---
tests/CMakeLists.txt | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6c3aae9..3748461 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,6 +7,11 @@ include_directories(
${CMOCKA_INCLUDE_DIR}
)
+# Required for cmocka >= 1.1.6
+if (TARGET cmocka::cmocka)
+ set(CMOCKA_LIBRARY cmocka::cmocka)
+endif()
+
set(TORTURE_LIBRARY torture)
# RFC862 echo server
--
2.39.2

BIN
socket_wrapper.keyring Normal file

Binary file not shown.

View File

@ -1,12 +1,17 @@
Name: socket_wrapper Name: socket_wrapper
Version: 1.1.9 Version: 1.4.0
Release: 4 Release: 1
Summary: A library passing all socket communications through unix sockets. Summary: A library passing all socket communications through unix sockets.
License: BSD License: BSD-3-Clause
URL: http://cwrap.org/ URL: http://cwrap.org/
Source0: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz Source0: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz
Source1: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz.asc
Source2: socket_wrapper.keyring
Patch0: socket_wrapper-fix-cmocka-1.1.6+-support.patch
BuildRequires: cmake gcc libcmocka-devel >= 1.1.0 BuildRequires: cmake gcc libcmocka-devel >= 1.1.0
BuildRequires: gnupg2
Recommends: cmake pkgconfig Recommends: cmake pkgconfig
@ -27,7 +32,21 @@ Buildarch: noarch
%description help %description help
Man pages and other related documents. Man pages and other related documents.
%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}-%{release}
%description -n libsocket_wrapper_noop-devel
Development headers for applications with the need to call socket_wrapper_enabled().
%prep %prep
gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
%autosetup -n %{name}-%{version} -p1 %autosetup -n %{name}-%{version} -p1
%build %build
@ -44,22 +63,41 @@ cd build
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%ldconfig_scriptlets
%ldconfig_scriptlets -n libsocket_wrapper_noop
%check %check
cd build cd build
ctest -V ctest -V
LD_PRELOAD=src/libsocket_wrapper.so bash -c '>/dev/null' LD_PRELOAD=src/libsocket_wrapper.so bash -c '>/dev/null'
%files %files
%doc AUTHORS COPYING %doc AUTHORS
%license LICENSE
%{_libdir}/libsocket_wrapper.so* %{_libdir}/libsocket_wrapper.so*
%dir %{_libdir}/cmake/socket_wrapper %dir %{_libdir}/cmake/socket_wrapper
%{_libdir}/cmake/socket_wrapper/socket_wrapper-config*.cmake %{_libdir}/cmake/socket_wrapper/socket_wrapper-config*.cmake
%{_libdir}/pkgconfig/socket_wrapper.pc %{_libdir}/pkgconfig/socket_wrapper.pc
%files help %files help
%doc ChangeLog README %doc CHANGELOG README.md
%{_mandir}/man1/socket_wrapper.1* %{_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 %changelog
* Thu Jun 15 2023 liyanan <thistleslyn@163.com> - 1.4.0-1
- Update to 1.4.0
* Fri Nov 04 2022 yaoxin <yaoxin30@h-partners.com> - 1.3.4-1
- Update to 1.3.4 for fix build error
* Wed Nov 27 2019 zhouyihang <zhouyihang1@huawei.com> - 1.1.9-4 * Wed Nov 27 2019 zhouyihang <zhouyihang1@huawei.com> - 1.1.9-4
- Package init - Package init