Compare commits

...

No commits in common. 'i10cs' and 'c9' have entirely different histories.
i10cs ... c9

2
.gitignore vendored

@ -1,2 +1,2 @@
SOURCES/socket_wrapper-1.4.0.tar.gz SOURCES/socket_wrapper-1.2.5.tar.gz
SOURCES/socket_wrapper.keyring SOURCES/socket_wrapper.keyring

@ -1,2 +1,2 @@
1a1c153102a069191f6a30de5b4e83cb40ba7cf2 SOURCES/socket_wrapper-1.4.0.tar.gz 0f00e7ba439a12e79dc9310b86e16e4ceea6e555 SOURCES/socket_wrapper-1.2.5.tar.gz
3f2ab0bca02893402ba0ad172a6bd44456a65f86 SOURCES/socket_wrapper.keyring 3f2ab0bca02893402ba0ad172a6bd44456a65f86 SOURCES/socket_wrapper.keyring

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEjf9T4Y8qvI2PPJIjfuD8TcwBTj0FAl7wx74ACgkQfuD8TcwB
Tj03Jw/9HUhJWKtnj6ORasehBVIAhRZQjN7vVwJAmxUIDz0+p0UkDksUhrFBfNSU
TSbEAXnX1nHst3uHYvKeU1FMoz3TRw+y4lzVCgfonYpwPdPFO/2ikOzVBmouhtP3
+TrUdE6sitLYb7pOf1DL9vtjC3PaMLvIZ4rhJ3hhzOC9guOs06I2Rif8XUFne7Rx
EpdBg+5wqutTIOV37BNbLSjHHZFLtwx3RYBDyy90yStmPA8AEwjkf6ExdL3TYSvb
JtScSlc7fVj2QLTnTwzvTvgzhikVDtpRZSmwIQbwcSYYiZL7YHyA58rwN9oOsCpo
JZZVHjN8eJD3/HJB4pyMtH+GnRnFiXgWlNhUFbNLLCYanhJ7rC+6REew6cbGe90T
DUrRsiB67L/mK97rOqrzyOFqpTUqIpEvn+TQkUKYgfLVi+Xkq3si7TlosmccBUgR
0zssXSVkqU8CbaMCnqo7iVpxuIk1OgR3D/UuyQJYXQqmurEz4gAG1indVLqlhpB3
AkPyVr6tIdmWVr9JnPU835QCEm1hpxtl2b2VyxrHyVDETbOkwmrv4OC299sNU+Oj
IknvRiHaarFQyKVl097UGQwV82blGTnxRZDrhPTZXuEQ5PtL2UXyZ1aRhBdVjfcF
FGOLiPq/pdDPLMSTyMv7Jp4oa0yR/WJIDts0ZcsWP3RFHA9F+gQ=
=p2e3
-----END PGP SIGNATURE-----

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

@ -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

@ -1,15 +1,14 @@
Name: socket_wrapper Name: socket_wrapper
Version: 1.4.0 Version: 1.2.5
Release: 6%{?dist} Release: 4%{?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,23 +32,8 @@ 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
@ -63,8 +47,6 @@ socket_wrapper_enabled().
%ldconfig_scriptlets %ldconfig_scriptlets
%ldconfig_scriptlets -n libsocket_wrapper_noop
%check %check
%ctest %ctest
@ -81,58 +63,13 @@ 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 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.5-4
- Bump release for October 2024 mass rebuild: - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Resolves: RHEL-64018 Related: rhbz#1991688
* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.4.0-5
- Rebuilt for MSVSphere 10
* 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 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.5-3
- Update to version 1.3.3 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* 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 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save