From c7be1f3529bf169754251ce09a8d2dba54bfb4e0 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Feb 06 2020 21:15:46 +0000 Subject: Update to new upstream release 1.10.0 (#1795299) --- diff --git a/.gitignore b/.gitignore index b761f7b..2095b9d 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ poco-1.3.6p2-all.tar.bz2 /poco-1.9.2.tar.gz /poco-1.9.3.tar.gz /poco-1.9.4.tar.gz +/poco-1.10.0.tar.gz diff --git a/dont-install-cppunit.patch b/dont-install-cppunit.patch new file mode 100644 index 0000000..743c876 --- /dev/null +++ b/dont-install-cppunit.patch @@ -0,0 +1,23 @@ +From d9512077faff99b56855e9529f7887aeac01d556 Mon Sep 17 00:00:00 2001 +From: Scott Talbert +Date: Thu, 6 Feb 2020 15:46:50 -0500 +Subject: [PATCH] Don't install CppUnit + +--- + CppUnit/CMakeLists.txt | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/CppUnit/CMakeLists.txt b/CppUnit/CMakeLists.txt +index e5d7f6523..2ef15c715 100644 +--- a/CppUnit/CMakeLists.txt ++++ b/CppUnit/CMakeLists.txt +@@ -33,6 +33,3 @@ elseif(MINGW) + PUBLIC + _DLL) + endif() +- +-POCO_INSTALL(CppUnit) +- +-- +2.24.1 + diff --git a/ignored-tests.patch b/ignored-tests.patch deleted file mode 100644 index 72cf79d..0000000 --- a/ignored-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/travis/runtests.sh b/travis/runtests.sh -index c7f214d..08c5e08 100755 ---- a/travis/runtests.sh -+++ b/travis/runtests.sh -@@ -8,6 +8,7 @@ export CPPUNIT_IGNORE="\ - N7CppUnit10TestCallerI22HTTPSClientSessionTestEE.testProxy \ - N7CppUnit10TestCallerI22HTTPSStreamFactoryTestEE.testProxy \ - N7CppUnit10TestCallerI19MulticastSocketTestEE.testMulticast \ -+ N7CppUnit10TestCallerI12ActivityTestEE.testActivity \ - N7CppUnit10TestCallerI13NTPClientTestEE.testTimeSync" - export EXCLUDE_TESTS="Data/MySQL Data/ODBC MongoDB PDF" - export PATH=$PATH:. diff --git a/missing-encodings-dir.patch b/missing-encodings-dir.patch deleted file mode 100644 index ddf7eb8..0000000 --- a/missing-encodings-dir.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Jochen Sprickerhof -Date: Wed, 22 Aug 2018 21:42:09 +0200 -Subject: Don't try to install non existing Encodings/testsuite/data - ---- - Encodings/testsuite/CMakeLists.txt | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/Encodings/testsuite/CMakeLists.txt b/Encodings/testsuite/CMakeLists.txt -index 7508e55..9a93239 100644 ---- a/Encodings/testsuite/CMakeLists.txt -+++ b/Encodings/testsuite/CMakeLists.txt -@@ -19,12 +19,9 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE - add_executable( ${TESTUNIT} ${TEST_SRCS} ) - if(ANDROID) - add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} -- COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/data;" -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/${TESTUNIT} -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) -+ COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/${TESTUNIT} -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) - else() - add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) -- # The test is run in the build directory. So the test data is copied there too -- add_custom_command(TARGET ${TESTUNIT} POST_BUILD -- COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data ) - endif() - #set_target_properties( ${TESTUNIT} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) - target_link_libraries( ${TESTUNIT} PocoEncodings PocoFoundation CppUnit ) diff --git a/poco-1.10.0-fix-unbundled-build1.patch b/poco-1.10.0-fix-unbundled-build1.patch new file mode 100644 index 0000000..9263923 --- /dev/null +++ b/poco-1.10.0-fix-unbundled-build1.patch @@ -0,0 +1,44 @@ +From 58e63be1620021a22601a26bed1e2861f5054970 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= +Date: Tue, 4 Feb 2020 11:05:21 +0100 +Subject: [PATCH] #2894: Poco 1.10.0 doesn't build with cmake & POCO_UNBUNDLED + +--- + cmake/PocoMacros.cmake | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/cmake/PocoMacros.cmake b/cmake/PocoMacros.cmake +index 4490b7b644..14ebbb6c7e 100644 +--- a/cmake/PocoMacros.cmake ++++ b/cmake/PocoMacros.cmake +@@ -233,20 +233,27 @@ configure_file("cmake/Poco${target_name}Config.cmake" + @ONLY + ) + +-set(ConfigPackageLocation "lib/cmake/${PROJECT_NAME}") ++# Set config script install location in a location that find_package() will ++# look for, which is different on MS Windows than for UNIX ++# Note: also set in root CMakeLists.txt ++if (WIN32) ++ set(PocoConfigPackageLocation "cmake") ++else() ++ set(PocoConfigPackageLocation "lib/cmake/${PROJECT_NAME}") ++endif() + + install( + EXPORT "${target_name}Targets" + FILE "${PROJECT_NAME}${target_name}Targets.cmake" + NAMESPACE "${PROJECT_NAME}::" +- DESTINATION "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}" ++ DESTINATION "${PocoConfigPackageLocation}" + ) + + install( + FILES + "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Config.cmake" + "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}ConfigVersion.cmake" +- DESTINATION "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}" ++ DESTINATION "${PocoConfigPackageLocation}" + COMPONENT Devel + ) + diff --git a/poco-1.10.0-fix-unbundled-build2.patch b/poco-1.10.0-fix-unbundled-build2.patch new file mode 100644 index 0000000..c2609bc --- /dev/null +++ b/poco-1.10.0-fix-unbundled-build2.patch @@ -0,0 +1,29 @@ +From 6ef3f95baf4d78f471b34334858febd95beb9c8d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= +Date: Wed, 5 Feb 2020 06:41:10 +0100 +Subject: [PATCH] fix POCO_UNBUNDLES + +--- + CMakeLists.txt | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bf22d25768..96c475828e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -437,6 +437,15 @@ write_basic_package_version_file( + COMPATIBILITY AnyNewerVersion + ) + ++# Set config script install location in a location that find_package() will ++# look for, which is different on MS Windows than for UNIX ++# Note: also set in POCO_GENERATE_PACKAGE macro in cmake/PocoMacros.cmake ++if (WIN32) ++ set(PocoConfigPackageLocation "cmake") ++else() ++ set(PocoConfigPackageLocation "lib/cmake/${PROJECT_NAME}") ++endif() ++ + configure_file(cmake/${PROJECT_NAME}Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" @ONLY) + install( + FILES diff --git a/poco.spec b/poco.spec index 282e934..464426e 100644 --- a/poco.spec +++ b/poco.spec @@ -1,5 +1,3 @@ -%global poco_src_version 1.9.4 -%global gittag0 poco-1.9.4-release %global cmake_build cmake-build %global cmake_debug cmake-debug @@ -24,20 +22,22 @@ %endif Name: poco -Version: %{poco_src_version} -Release: 2%{?dist} +Version: 1.10.0 +Release: 1%{?dist} Summary: C++ class libraries for network-centric applications License: Boost URL: https://pocoproject.org -Source0: https://github.com/pocoproject/%{name}/archive/%{gittag0}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/pocoproject/%{name}/archive/%{name}-%{version}-release.tar.gz#/%{name}-%{version}.tar.gz # Disable the tests that will fail under Koji (mostly network) Patch0: disable-tests.patch -# Add ignored-tests patches -Patch1: ignored-tests.patch -Patch2: missing-encodings-dir.patch +Patch1: poco-1.10.0-fix-unbundled-build1.patch +Patch2: poco-1.10.0-fix-unbundled-build2.patch +Patch3: set-sqlite-thread-mode.patch +Patch4: use-lib-suffix.patch +Patch5: dont-install-cppunit.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -63,7 +63,7 @@ POCO C++ Libraries are built strictly on standard ANSI/ISO C++, including the standard library. %prep -%autosetup -p1 -n %{name}-%{gittag0} +%autosetup -p1 -n %{name}-%{name}-%{version}-release /bin/sed -i.orig -e 's|$(INSTALLDIR)/lib\b|$(INSTALLDIR)/%{_lib}|g' Makefile /bin/sed -i.orig -e 's|ODBCLIBDIR = /usr/lib\b|ODBCLIBDIR = %{_libdir}|g' Data/ODBC/Makefile Data/ODBC/testsuite/Makefile @@ -153,12 +153,12 @@ rm -f XML/src/xmltok_ns.c %endif mkdir %{cmake_build} pushd %{cmake_build} -%cmake -DPOCO_UNBUNDLED=ON %{?poco_tests} %{?poco_mongodb} -DENABLE_REDIS=OFF -DODBC_INCLUDE_DIRECTORIES=%{_includedir}/libiodbc .. +%cmake -DPOCO_UNBUNDLED=ON %{?poco_tests} %{?poco_mongodb} -DENABLE_REDIS=OFF -DODBC_INCLUDE_DIR=%{_includedir}/libiodbc .. %make_build popd mkdir %{cmake_debug} pushd %{cmake_debug} -%cmake -DPOCO_UNBUNDLED=ON %{?poco_tests} %{?poco_mongodb} -DENABLE_REDIS=OFF -DODBC_INCLUDE_DIRECTORIES=%{_includedir}/libiodbc -DCMAKE_BUILD_TYPE=Debug .. +%cmake -DPOCO_UNBUNDLED=ON %{?poco_tests} %{?poco_mongodb} -DENABLE_REDIS=OFF -DODBC_INCLUDE_DIR=%{_includedir}/libiodbc -DCMAKE_BUILD_TYPE=Debug .. %make_build popd @@ -176,7 +176,7 @@ popd %if %{with tests} export POCO_BASE="$(pwd)" pushd %{cmake_build} -ctest -V %{?_smp_mflags} -E "MongoDB|Redis" +ctest -V %{?_smp_mflags} -E "MongoDB|Redis|DataMySQL|DataODBC" popd %endif @@ -335,6 +335,16 @@ class libraries for network-centric applications.) %{_libdir}/libPocoEncodings.so.* # ----------------------------------------------------------------------------- +%package jwt +Summary: The JWT POCO component + +%description jwt +This package contains the JWT component of POCO. (POCO is a set of C++ +class libraries for network-centric applications.) +%files jwt +%{_libdir}/libPocoJWT.so.* + +# ----------------------------------------------------------------------------- %package debug Summary: Debug builds of the POCO libraries @@ -358,6 +368,7 @@ application testing purposes. %{_libdir}/libPocoMongoDBd.so.* %endif %{_libdir}/libPocoEncodingsd.so.* +%{_libdir}/libPocoJWTd.so.* # ----------------------------------------------------------------------------- %package devel @@ -381,6 +392,7 @@ Requires: poco-mongodb%{?_isa} = %{version}-%{release} %endif Requires: poco-pagecompiler%{?_isa} = %{version}-%{release} Requires: poco-encodings%{?_isa} = %{version}-%{release} +Requires: poco-jwt%{?_isa} = %{version}-%{release} Requires: zlib-devel Requires: expat-devel @@ -428,6 +440,8 @@ POCO applications. %endif %{_libdir}/libPocoEncodings.so %{_libdir}/libPocoEncodingsd.so +%{_libdir}/libPocoJWT.so +%{_libdir}/libPocoJWTd.so %{_libdir}/cmake/Poco # ----------------------------------------------------------------------------- @@ -448,6 +462,9 @@ HTML format. %doc README NEWS LICENSE CONTRIBUTORS CHANGELOG doc/* %changelog +* Thu Feb 06 2020 Scott Talbert - 1.10.0-1 +- Update to new upstream release 1.10.0 (#1795299) + * Thu Jan 30 2020 Fedora Release Engineering - 1.9.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/set-sqlite-thread-mode.patch b/set-sqlite-thread-mode.patch new file mode 100644 index 0000000..3d95edf --- /dev/null +++ b/set-sqlite-thread-mode.patch @@ -0,0 +1,28 @@ +From a84744326fc00f7136545e81856d2ca445bbf1f7 Mon Sep 17 00:00:00 2001 +From: Scott Talbert +Date: Thu, 6 Feb 2020 15:14:56 -0500 +Subject: [PATCH 1/2] Set SQLite thread safe mode when building unbundled + +--- + Data/SQLite/CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Data/SQLite/CMakeLists.txt b/Data/SQLite/CMakeLists.txt +index fcce2e0d6..ee7d2a177 100644 +--- a/Data/SQLite/CMakeLists.txt ++++ b/Data/SQLite/CMakeLists.txt +@@ -44,7 +44,10 @@ target_include_directories(DataSQLite + + if(POCO_UNBUNDLED) + target_link_libraries(DataSQLite PUBLIC SQLite::SQLite3) +- target_compile_definitions(DataSQLite PUBLIC POCO_UNBUNDLED) ++ target_compile_definitions(DataSQLite PUBLIC ++ POCO_UNBUNDLED ++ SQLITE_THREADSAFE=1 ++ ) + else() + if(WINCE) + target_compile_definitions(DataSQLite PRIVATE SQLITE_MSVC_LOCALTIME_API) +-- +2.24.1 + diff --git a/sources b/sources index c10fd59..41df237 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (poco-1.9.4.tar.gz) = 0b9c54a6b71633a39ef7cace50d6887691ab190f8decb33212869502bbd96ceb0509abde45efa5c1230cab259fa808bffda0e4695e1bfd73d02e9fc2c9ae091f +SHA512 (poco-1.10.0.tar.gz) = 9c4bd7cd04f58872d8d171af37708713e437408a9f837d5b56967694dded2a482a8c63d29fb0c5f5b9d544568584937f50d0c936b91cc0550e50fefeaa4d9493 diff --git a/use-lib-suffix.patch b/use-lib-suffix.patch new file mode 100644 index 0000000..ed30596 --- /dev/null +++ b/use-lib-suffix.patch @@ -0,0 +1,39 @@ +From 48cb7ba8a35dd658227824dd407ad0c31a318d0d Mon Sep 17 00:00:00 2001 +From: Scott Talbert +Date: Thu, 6 Feb 2020 15:17:57 -0500 +Subject: [PATCH 2/2] Use ${LIB_SUFFIX} when setting PocoConfigPackageLocation + +--- + CMakeLists.txt | 2 +- + cmake/PocoMacros.cmake | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 96c475828..d7ce6e512 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -443,7 +443,7 @@ write_basic_package_version_file( + if (WIN32) + set(PocoConfigPackageLocation "cmake") + else() +- set(PocoConfigPackageLocation "lib/cmake/${PROJECT_NAME}") ++ set(PocoConfigPackageLocation "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}") + endif() + + configure_file(cmake/${PROJECT_NAME}Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" @ONLY) +diff --git a/cmake/PocoMacros.cmake b/cmake/PocoMacros.cmake +index 14ebbb6c7..b99422dba 100644 +--- a/cmake/PocoMacros.cmake ++++ b/cmake/PocoMacros.cmake +@@ -239,7 +239,7 @@ configure_file("cmake/Poco${target_name}Config.cmake" + if (WIN32) + set(PocoConfigPackageLocation "cmake") + else() +- set(PocoConfigPackageLocation "lib/cmake/${PROJECT_NAME}") ++ set(PocoConfigPackageLocation "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}") + endif() + + install( +-- +2.24.1 +