Compare commits

...

No commits in common. "c10s" and "c8" have entirely different histories.
c10s ... c8

9 changed files with 41 additions and 205 deletions

32
.gitignore vendored
View File

@ -1,30 +1,2 @@
/socket_wrapper-1.0.1.tar.gz SOURCES/socket_wrapper-1.2.3.tar.gz
/socket_wrapper-1.0.2.tar.gz SOURCES/socket_wrapper.keyring
/socket_wrapper-1.1.0.tar.gz
/socket_wrapper-1.1.1.tar.gz
/socket_wrapper-1.1.2.tar.gz
/socket_wrapper-1.1.3.tar.gz
/socket_wrapper-1.1.4.tar.gz
/socket_wrapper-1.1.5.tar.gz
/socket_wrapper-1.1.6.tar.gz
/socket_wrapper-1.1.7.tar.gz
/socket_wrapper-1.1.8.tar.gz
/socket_wrapper-1.1.9.tar.gz
/socket_wrapper-1.2.0.tar.gz
/socket_wrapper-1.2.0.tar.gz.asc
/socket_wrapper-1.2.1.tar.gz
/socket_wrapper-1.2.1.tar.gz.asc
/socket_wrapper-1.2.3.tar.gz
/socket_wrapper-1.2.3.tar.gz.asc
/socket_wrapper-1.2.4.tar.gz
/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.0.tar.gz
/socket_wrapper-1.3.0.tar.gz.asc
/socket_wrapper-1.3.3.tar.gz
/socket_wrapper-1.3.3.tar.gz.asc
/socket_wrapper-1.3.4.tar.gz
/socket_wrapper-1.3.4.tar.gz.asc
/socket_wrapper-1.4.0.tar.gz
/socket_wrapper-1.4.0.tar.gz.asc

2
.socket_wrapper.metadata Normal file
View File

@ -0,0 +1,2 @@
95ea413c573d43521b5e4dca18b39615a1376583 SOURCES/socket_wrapper-1.2.3.tar.gz
3f2ab0bca02893402ba0ad172a6bd44456a65f86 SOURCES/socket_wrapper.keyring

View File

@ -1,33 +0,0 @@
socket_wrapper
==============
It is a library passing all socket communications through unix sockets.
Features
--------
socket_wrapper aims to help client/server software development teams willing to
gain full functional test coverage. It makes possible to run several instances
of the full software stack on the same machine and perform locally functional
testing of complex network configurations.
* Redirects all network communication to happen over unix sockets.
* Support for IPv4 and IPv6 socket and addressing emulation.
* Ablility to capture network traffic in pcap format.
Documentation
-------------
See [manual page](https://gitlab.com/cwrap/socket_wrapper/-/blob/master/doc/socket_wrapper.1.adoc) of socket_wrapper for details.
Installation
------------
Instructions to build and install can be found in [README.install](https://gitlab.com/cwrap/socket_wrapper/-/blob/master/README.install) file.
Development
-----------
Contributions to socket_wrapper in the form of patches can be made via official
GitLab mirror as [merge requests](https://gitlab.com/cwrap/socket_wrapper/-/merge_requests). It is backed by CI/CD pipelines.
License
-------
BSD 3-Clause License.
Please visit [cwrap web page](https://cwrap.org/socket_wrapper.html) to find out more about socket_wrapper.

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAlyTmWEACgkQfuD8TcwB
Tj3JFhAAk3CMrw+5uEeyvRyJEVsl8SW1BiKMQnSprw9XQggSLFOE4UX9pvnwLOGn
Y5G7TJ5d9Cr2W5JuuuhiyDtnjzXMfpCs+TXMvODQKtTllNGG9YK13tZM1xoNfxW+
9GDf/mDuvZiPbeLom9CtnCFPyh+zLoLypfky0lvrxiMMjvNHxNpt1w2fc1pBK15X
NbNGqDkQLFtw1fNq4C90retBfCB2vTwBaLDJeVluqVe5ZCZAz2n5iXBS1cegbZdw
c71mJKQu2b4VL0bgyu6WLeSQY6rAEefyNLaE/8f+OKtAxyByASOUk2TuG4cT+Ekr
iXB9L2NVbTgo+xN9r0nRDpkRYOM1SMFCjF7OHQ49CBZk7gtWTefeWSh1GxS8Jbx8
K3nWFXtUW4HBdzOOgqUif+/tWecjOmQ1z5Fy+3S24Afdjvnidf3CfZ6EUU1X4IT/
icUNx75DXxY1FR7JUX+upwUa1actcedfZ9O6eh76gEzePE97vaddbSmRJt7VTBBO
2RhlgLYxIF4ep/hwWQTfhzvGnpFDsmiXff7oxaL4ag37OUHyifecYlCBx8hoHXst
+I0akCTp5uSnUaQoXAwpbaBfhKspWefUGAODGYbCEdNvZg6eDloJBGhHL8MlCOJw
SQvo/xeGztPNIh1P1ObwiqQd3S02DB7IKHiZPUDNgcTB8cvzAOE=
=sG5q
-----END PGP SIGNATURE-----

View File

@ -1,15 +1,14 @@
Name: socket_wrapper Name: socket_wrapper
Version: 1.4.0 Version: 1.2.3
Release: 6%{?dist} Release: 1%{?dist}
License: BSD-3-Clause License: BSD
Summary: A library passing all socket communications through Unix sockets Summary: A library passing all socket communications through Unix sockets
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 Source1: https://ftp.samba.org/pub/cwrap/%{name}-%{version}.tar.gz.asc
Source2: socket_wrapper.keyring Source2: socket_wrapper.keyring
Patch0: socket_wrapper-fix-cmocka-1.1.6+-support.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc BuildRequires: gcc
@ -33,46 +32,39 @@ SOCKET_WRAPPER_DIR=/path/to/swrap_dir
This package doesn't have a devel package because this project is for This package doesn't have a devel package because this project is for
development/testing. 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}-%{release}
%description -n libsocket_wrapper_noop-devel
Development headers for applications with the need to call
socket_wrapper_enabled().
%prep %prep
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
%autosetup -p1 %autosetup -p1
%build %build
if test ! -e "obj"; then
mkdir obj
fi
pushd obj
%cmake \ %cmake \
-DUNIT_TESTING=ON -DUNIT_TESTING=ON \
%{_builddir}/%{name}-%{version}
%cmake_build make %{?_smp_mflags} VERBOSE=1
popd
%install %install
%cmake_install pushd obj
make DESTDIR=%{buildroot} install
popd
%ldconfig_scriptlets %ldconfig_scriptlets
%ldconfig_scriptlets -n libsocket_wrapper_noop
%check %check
%ctest pushd obj
ctest --output-on-failure
ls -l %{__cmake_builddir}/src/libsocket_wrapper.so LD_PRELOAD=src/libsocket_wrapper.so bash -c '>/dev/null'
LD_PRELOAD=%{__cmake_builddir}/src/libsocket_wrapper.so bash -c '>/dev/null'
popd
%files %files
%doc AUTHORS README.md CHANGELOG %doc AUTHORS README.md ChangeLog
%license LICENSE %license LICENSE
%{_libdir}/libsocket_wrapper.so* %{_libdir}/libsocket_wrapper.so*
%dir %{_libdir}/cmake/socket_wrapper %dir %{_libdir}/cmake/socket_wrapper
@ -81,79 +73,7 @@ LD_PRELOAD=%{__cmake_builddir}/src/libsocket_wrapper.so bash -c '>/dev/null'
%{_libdir}/pkgconfig/socket_wrapper.pc %{_libdir}/pkgconfig/socket_wrapper.pc
%{_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
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.4.0-6
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.4.0-5
- Bump release for June 2024 mass rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Feb 23 2023 Andreas Schneider <asn@redhat.com> - 1.4.0-2
- Fix building with cmocka >= 1.1.6
* Thu Jan 19 2023 Andreas Schneider <asn@redhat.com> - 1.4.0-1
- Update to version 1.4.0
* https://gitlab.com/cwrap/socket_wrapper/-/blob/socket_wrapper-1.4.0/CHANGELOG
* Thu Jul 21 2022 Andreas Schneider <asn@redhat.com> - 1.3.4-1
- Update to version 1.3.4
* https://gitlab.com/cwrap/socket_wrapper/-/blob/socket_wrapper-1.3.4/CHANGELOG
* Tue Feb 22 2022 Andreas Schneider <asn@redhat.com> - 1.3.3-5
- Require version and release for libsocket_wrapper_noop in devel package
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Apr 22 2021 Andreas Schneider <asn@redhat.com> - 1.3.3-2
- Fix require of libsocket_wrapper_noop-devel
* Wed Feb 03 2021 Andreas Schneider <asn@redhat.com> - 1.3.3-1
- Update to version 1.3.3
* https://gitlab.com/cwrap/socket_wrapper/-/blob/socket_wrapper-1.3.3/CHANGELOG
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Aug 05 2020 Andreas Schneider <asn@redhat.com> - 1.2.5-1
- Update to version 1.2.4
* https://gitlab.com/cwrap/socket_wrapper/-/blob/master/CHANGELOG
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 24 2020 Jeff Law <law@redhat.com> - 1.2.4-2
- Use __cmake_in_source_build
* Tue Mar 24 2020 Andreas Schneider <asn@redhat.com> - 1.2.4-1
- Update to version 1.2.4
* https://gitlab.com/cwrap/socket_wrapper/-/blob/master/CHANGELOG
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Mar 28 2019 Andreas Schneider <asn@redhat.com> - 1.2.3-1 * Thu Mar 28 2019 Andreas Schneider <asn@redhat.com> - 1.2.3-1
- Update to version 1.2.3 - Update to version 1.2.3

View File

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

View File

@ -1,33 +0,0 @@
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

Binary file not shown.

View File

@ -1,2 +0,0 @@
SHA512 (socket_wrapper-1.4.0.tar.gz) = 944e5ff2b6919e414f9045fe294b9b4813272fe7c00f5ac144c999b99572be6b3ed2eb975ec1d07bd853cffea6dffe339280e4961520d34667f808f76b47db57
SHA512 (socket_wrapper-1.4.0.tar.gz.asc) = cc2d6c23fc1b3f9a0f94a8ba5f1b78653932b9770f1b682339fcd1f673ff1b8ba5af9362012b621f42c01a8be0016536375577dce0b9ed8ff0a6dc32405accea