Compare commits

..

No commits in common. "rawhide" and "f20" have entirely different histories.

9 changed files with 36 additions and 2928 deletions

5
.gitignore vendored
View file

@ -1,4 +1 @@
/websocketpp-0.7.0.tar.gz
/websocketpp-0.8.1.tar.gz
/websocketpp-0.8.2.tar.gz
/websocketpp-b9aeec6eaf3d5610503439b4fae3581d9aff08e8.tar.gz
/0.4.0.tar.gz

View file

@ -1 +1 @@
SHA512 (websocketpp-b9aeec6eaf3d5610503439b4fae3581d9aff08e8.tar.gz) = 5449a10086c1b80d0d2865bac90539f64613156050816e97a2da1a2bc1f6710ac72305747e839a13e49b2ce1b25610480c110743aef60d7d148f2c39339289c4
21ed2beaaf2fe3f76783e4b3bbaa8206 0.4.0.tar.gz

View file

@ -0,0 +1,12 @@
diff -up websocketpp-0.4.0/CMakeLists.txt.noarch websocketpp-0.4.0/CMakeLists.txt
--- websocketpp-0.4.0/CMakeLists.txt.noarch 2014-11-04 06:35:10.000000000 -0600
+++ websocketpp-0.4.0/CMakeLists.txt 2014-11-13 14:23:02.306865323 -0600
@@ -17,7 +17,7 @@ set(INSTALL_INCLUDE_DIR include CACHE PA
if (WIN32 AND NOT CYGWIN)
set (DEF_INSTALL_CMAKE_DIR cmake)
else ()
- set (DEF_INSTALL_CMAKE_DIR lib/cmake/websocketpp)
+ set (DEF_INSTALL_CMAKE_DIR share/cmake/websocketpp)
endif ()
set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")

View file

@ -1,46 +0,0 @@
--- a/test/transport/CMakeLists.txt
+++ b/test/transport/CMakeLists.txt
@@ -1,24 +1,24 @@
if (OPENSSL_FOUND)
-# Test transport integration
-file (GLOB SOURCE integration.cpp)
-
-init_target (test_transport)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-link_openssl()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test transport asio timers
-file (GLOB SOURCE asio/timers.cpp)
-
-init_target (test_transport_asio_timers)
-build_test (${TARGET_NAME} ${SOURCE})
-link_boost ()
-link_openssl()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+## Test transport integration
+#file (GLOB SOURCE integration.cpp)
+#
+#init_target (test_transport)
+#build_test (${TARGET_NAME} ${SOURCE})
+#link_boost ()
+#link_openssl()
+#final_target ()
+#set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+#
+## Test transport asio timers
+#file (GLOB SOURCE asio/timers.cpp)
+#
+#init_target (test_transport_asio_timers)
+#build_test (${TARGET_NAME} ${SOURCE})
+#link_boost ()
+#link_openssl()
+#final_target ()
+#set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
# Test transport asio security
file (GLOB SOURCE asio/security.cpp)

View file

@ -1,15 +0,0 @@
--- a/CMakeLists.txt 2018-10-31 13:58:03.000000000 +0100
+++ b/CMakeLists.txt 2018-10-31 14:21:06.251424022 +0100
@@ -266,9 +266,11 @@
INSTALL_DESTINATION "${INSTALL_CMAKE_DIR}"
NO_CHECK_REQUIRED_COMPONENTS_MACRO
)
+# disable check for same 32/64bit-ness in websocketpp-configVersion.cmake by setting CMAKE_SIZEOF_VOID_P
+set (CMAKE_SIZEOF_VOID_P "")
write_basic_package_version_file("${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake"
VERSION ${WEBSOCKETPP_VERSION}
- COMPATIBILITY ExactVersion)
+ COMPATIBILITY AnyNewerVersion)
# Install the websocketpp-config.cmake and websocketpp-configVersion.cmake
install (FILES

File diff suppressed because it is too large Load diff

View file

@ -1,11 +0,0 @@
--- a/CMakeLists.txt 2022-05-24 17:42:50.000000000 +0200
+++ b/CMakeLists.txt 2026-01-27 20:15:14.456352600 +0100
@@ -45,7 +45,7 @@ set(INSTALL_INCLUDE_DIR include CACHE PA
if (WIN32 AND NOT CYGWIN)
set (DEF_INSTALL_CMAKE_DIR cmake)
else ()
- set (DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/websocketpp)
+ set (DEF_INSTALL_CMAKE_DIR share/cmake/websocketpp)
endif ()
set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")

View file

@ -4,6 +4,6 @@ includedir=${prefix}/include
Name: websocketpp
Description: WebSocket API
Version: 0.8.2
URL: https://www.zaphoyd.com/websocketpp/
Version: 0.4.0
URL: http://www.zaphoyd.com/websocketpp/
Cflags: -I${includedir}/

View file

@ -1,53 +1,25 @@
%global basever 0.8.2
%global commit b9aeec6eaf3d5610503439b4fae3581d9aff08e8
%global shortcommit %{sub %{commit} 1 7}
%global snapdate 20220525
Name: websocketpp
Summary: C++ WebSocket Protocol Library
Version: %{basever}%{?snapdate:^git%{snapdate}.%{shortcommit}}
Release: 3%{?dist}
Version: 0.4.0
Release: 2%{?dist}
# Automatically converted from old format: BSD - review is highly recommended.
License: LicenseRef-Callaway-BSD
Url: https://www.zaphoyd.com/websocketpp
%if %{defined snapdate}
Source0: https://github.com/zaphoyd/websocketpp/archive/%{commit}/%{name}-%{commit}.tar.gz
%else
Source0: https://github.com/zaphoyd/websocketpp/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
%endif
License: BSD
Url: http://www.zaphoyd.com/websocketpp
Source0: https://github.com/zaphoyd/websocketpp/archive/%{version}.tar.gz
Source1: websocketpp.pc
BuildArch: noarch
# put cmake files in share/cmake instead of lib/cmake
Patch1: websocketpp-0.8.3-cmake_noarch.patch
# Switch from ExactVersion to AnyNewerVersion to improve compatibility
# https://cmake.org/cmake/help/v3.0/module/CMakePackageConfigHelpers.html
# Fixes build failure of tomahawk, which uses "find_package(websocketpp 0.2.99 REQUIRED)"
# PR submitted upstream: https://github.com/zaphoyd/websocketpp/pull/740
# Disable check for same 32/64bit-ness in websocketpp-configVersion.cmake by setting CMAKE_SIZEOF_VOID_P
# PR submitted upstream: https://github.com/zaphoyd/websocketpp/pull/770
Patch2: websocketpp-0.8.1-cmake-configversion-compatibility-anynewerversion.patch
# Disable the following tests, which fail occasionally: test_transport, test_transport_asio_timers
Patch3: websocketpp-0.7.0-disable-test_transport-test_transport_asio_timers.patch
# Compatibility fixes for Boost 1.87
# https://github.com/zaphoyd/websocketpp/pull/1164
# Patch from PR at commit ee8cf42, 2025-04-09
Patch4: websocketpp-0.8.2-compatibility_fixes_for_boost_1.87.patch
Patch1: websocketpp-0.4.0-cmake_noarch.patch
BuildRequires: boost-devel
BuildRequires: cmake
BuildRequires: gcc-c++
# needed for tests mostly
BuildRequires: pkgconfig(openssl)
BuildRequires: zlib-devel
BuildRequires: pkgconfig
%description
WebSocket++ is an open source (BSD license) header only C++ library
that implements RFC6455 The WebSocket Protocol. It allows integrating
that impliments RFC6455 The WebSocket Protocol. It allows integrating
WebSocket client and server functionality into C++ programs. It uses
interchangeable network transport modules including one based on C++
iostreams and one based on Boost Asio.
@ -57,229 +29,38 @@ Summary: C++ WebSocket Protocol Library
Requires: boost-devel
%description devel
WebSocket++ is an open source (BSD license) header only C++ library
that implements RFC6455 The WebSocket Protocol. It allows integrating
that impliments RFC6455 The WebSocket Protocol. It allows integrating
WebSocket client and server functionality into C++ programs. It uses
interchangeable network transport modules including one based on C++
iostreams and one based on Boost Asio.
%prep
%if %{defined snapdate}
%autosetup -p1 -n %{name}-%{commit}
%else
%autosetup -p1
%endif
%setup -q -n %{name}-%{version}
%patch1 -p1 -b .cmake_noarch
%build
%cmake -DBUILD_TESTS:BOOL=ON
%cmake_build
mkdir %{_target_platform}
pushd %{_target_platform}
%cmake ..
make %{?_smp_mflags}
popd
%install
%cmake_install
mkdir -p %{buildroot}%{_datadir}/pkgconfig
install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pkgconfig/websocketpp.pc
## unpackaged files
rm -rfv %{buildroot}%{_includedir}/test_connection/
%check
%ctest
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%files devel
%doc changelog.md readme.md roadmap.md
%license COPYING
%doc COPYING changelog.md readme.md roadmap.md
%{_includedir}/websocketpp/
%dir %{_datadir}/cmake/
%{_datadir}/cmake/websocketpp/
%{_datadir}/pkgconfig/websocketpp.pc
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2^git20220525.b9aeec6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jun 13 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 0.8.2^git20220525.b9aeec6-2
- Rebuilt for openssl 4.0
* Tue Jan 27 2026 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.2^git20220525.b9aeec6-1
- Update to post-release git snapshot on 0.8.2
- Add patch:
websocketpp-0.8.2-compatibility_fixes_for_boost_1.87.patch, which
fixes FTBFS with Boost 1.90
- Update cmake_noarch patch
- Drop patches:
websocketpp-0.8.2-fix-cmake-find-boost.patch
websocketpp-0.8.2-cpp20-fixes.patch
websocketpp-0.8.2-cmake40.patch
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Jul 18 2025 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.2-18
- Add patch: websocketpp-0.8.2-cmake40.patch
- Fix CMake 4.0 FTBFS #2381633
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Sep 04 2024 Miroslav Suchý <msuchy@redhat.com> - 0.8.2-16
- convert license to SPDX
* Wed Jul 24 2024 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.2-15
- Add dependency on openssl-devel-engine
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Aug 27 2023 Christian Birk <mail@birkc.de> - 0.8.2-12
- add patch to fix c++20 compile errors
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Jul 26 2022 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.2-9
- Add patch: websocketpp-0.8.2-fix-cmake-find-boost.patch
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Aug 03 2020 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.2-4
- Use %%cmake_build and %%cmake_install macros to fix FTBFS
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Apr 20 2020 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.2-1
- New upstream version
- Drop patches (fixed upstream):
websocketpp-0.8.1-boost_1.70.patch
websocketpp-0.8.1-fix_CMakeLists.txt_version_number.patch
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Jul 08 2019 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.1-6
- Prepare for Boost 1.70:
Add websocketpp-0.8.1-boost_1.70.patch
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Nov 07 2018 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.1-4
- Add websocketpp-0.8.1-fix_CMakeLists.txt_version_number.patch
* Wed Nov 07 2018 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.1-3
- Add websocketpp.pc to files
* Wed Oct 31 2018 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.1-2
- Update websocketpp-0.8.1-cmake-configversion-compatibility-anynewerversion.patch
Disable check for same 32/64bit-ness in websocketpp-configVersion.cmake
* Thu Jul 26 2018 Wolfgang Stöggl <c72578@yahoo.de> - 0.8.1-1
- New upstream version
- Added websocketpp-0.8.1-cmake-configversion-compatibility-anynewerversion.patch
- The following patches are not needed any more and have been removed:
websocketpp-0.7.0-openssl11.patch
websocketpp-0.7.0-zlib-permessage-deflate.patch
websocketpp-0.7.0-minor-adjustments-to-recent-extension-negotiation.patch
- Switch to pkgconfig(openssl) again
- Update version and URL in websocketpp.pc
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 16 2018 Wolfgang Stöggl <c72578@yahoo.de> - 0.7.0-13
- Add BuildRequires: gcc-c++
* Sun Feb 11 2018 Wolfgang Stöggl <c72578@yahoo.de> - 0.7.0-12
- Rebuilt for Boost 1.66
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Wed Jul 19 2017 Jonathan Wakely <jwakely@redhat.com> - 0.7.0-9
- Rebuilt for s390x binutils bug
* Tue Jul 04 2017 Jonathan Wakely <jwakely@redhat.com> - 0.7.0-8
- Rebuilt for Boost 1.64
* Tue Jun 13 2017 Wolfgang Stöggl <c72578@yahoo.de> - 0.7.0-7
- Add patches to fix zlib test failure (test_permessage_deflate)
- Disable tests test_transport, test_transport_asio_timers
* Fri May 26 2017 Rex Dieter <rdieter@fedoraproject.org> - 0.7.0-6
- explicitly use openssl-devel (instead of generic 'pkgconfig(openssl)'
* Mon May 22 2017 Rex Dieter <rdieter@fedoraproject.org> - 0.7.0-5
- adjust openssl patch
- BR: openssl-devel zlib-devel (for tests mostly)
* Wed May 17 2017 Rex Dieter <rdieter@fedoraproject.org> - 0.7.0-4
- tls.hpp, SSL_R_SHORT_READ undefined in openssl-1.1 (#1449163)
- enable tests
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Fri Jan 27 2017 Jonathan Wakely <jwakely@redhat.com> - 0.7.0-2
- Rebuilt for Boost 1.63
* Thu Sep 15 2016 Rex Dieter <rdieter@fedoraproject.org> - 0.7.0-1
- websocketpp-0.7.0 (#1375610)
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Sat Jan 16 2016 Jonathan Wakely <jwakely@redhat.com> - 0.4.0-8
- Rebuilt for Boost 1.60
* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 0.4.0-7
- Rebuilt for Boost 1.59
* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.0-6
- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 0.4.0-5
- rebuild for Boost 1.58
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 0.4.0-3
- Rebuild for boost 1.57.0
* Thu Nov 13 2014 Rex Dieter <rdieter@fedoraproject.org> 0.4.0-2
- use (upstreamable) cmake_noarch.patch instead of manually moving files around