Control: tags -1 + patch I have prepared a patch that enables the C++ library build. I can also submit it as merge request on Salsa if you prefer.
Cheers Timo
From 2792150b208b61c2f17f40b32b375aa1a8208aac Mon Sep 17 00:00:00 2001 From: Timo Röhling <[email protected]> Date: Sun, 22 Nov 2020 14:21:59 +0100 Subject: [PATCH] Enable C++ library build Closes: #974775 --- debian/libcivetweb-dev.install | 2 +- debian/libcivetweb1.install | 2 +- debian/libcivetweb1.symbols | 76 ++++++++++++++++++++++++++++++++++ debian/patches/soversion | 9 ++++ debian/rules | 4 +- 5 files changed, 89 insertions(+), 4 deletions(-) diff --git a/debian/libcivetweb-dev.install b/debian/libcivetweb-dev.install index 133389a..637e326 100644 --- a/debian/libcivetweb-dev.install +++ b/debian/libcivetweb-dev.install @@ -1,3 +1,3 @@ -usr/lib/*/libcivetweb.so +usr/lib/*/libcivetweb*.so usr/include usr/lib/*/cmake diff --git a/debian/libcivetweb1.install b/debian/libcivetweb1.install index a95ed4c..56905b5 100644 --- a/debian/libcivetweb1.install +++ b/debian/libcivetweb1.install @@ -1 +1 @@ -usr/lib/*/libcivetweb.so.* +usr/lib/*/libcivetweb*.so.* diff --git a/debian/libcivetweb1.symbols b/debian/libcivetweb1.symbols index 032717f..9796637 100644 --- a/debian/libcivetweb1.symbols +++ b/debian/libcivetweb1.symbols @@ -1,3 +1,79 @@ +libcivetweb-cpp.so.1 libcivetweb1 #MINVER# + _ZN11CivetServer10addHandlerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEP12CivetHandler@Base 1.13+dfsg-4~ + _ZN11CivetServer11authHandlerEP13mg_connectionPv@Base 1.13+dfsg-4~ + _ZN11CivetServer11getPostDataB5cxx11EP13mg_connection@Base 1.13+dfsg-4~ + _ZN11CivetServer12closeHandlerEPK13mg_connection@Base 1.13+dfsg-4~ + _ZN11CivetServer13removeHandlerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.13+dfsg-4~ + _ZN11CivetServer14addAuthHandlerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEP16CivetAuthHandler@Base 1.13+dfsg-4~ + _ZN11CivetServer14requestHandlerEP13mg_connectionPv@Base 1.13+dfsg-4~ + _ZN11CivetServer17getListeningPortsEv@Base 1.13+dfsg-4~ + _ZN11CivetServer17removeAuthHandlerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.13+dfsg-4~ + _ZN11CivetServer19addWebSocketHandlerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEP21CivetWebSocketHandler@Base 1.13+dfsg-4~ + (arch-bits=64)_ZN11CivetServer20webSocketDataHandlerEP13mg_connectioniPcmPv@Base 1.13+dfsg-4~ + (arch-bits=32)_ZN11CivetServer20webSocketDataHandlerEP13mg_connectioniPcjPv@Base 1.13+dfsg-4~ + _ZN11CivetServer21getListeningPortsFullEv@Base 1.13+dfsg-4~ + _ZN11CivetServer21webSocketCloseHandlerEPK13mg_connectionPv@Base 1.13+dfsg-4~ + _ZN11CivetServer21webSocketReadyHandlerEP13mg_connectionPv@Base 1.13+dfsg-4~ + _ZN11CivetServer22removeWebSocketHandlerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.13+dfsg-4~ + _ZN11CivetServer26webSocketConnectionHandlerEPK13mg_connectionPv@Base 1.13+dfsg-4~ + _ZN11CivetServer5closeEv@Base 1.13+dfsg-4~ + (arch-bits=64)_ZN11CivetServer8getParamEP13mg_connectionPKcRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm@Base 1.13+dfsg-4~ + (arch-bits=32)_ZN11CivetServer8getParamEP13mg_connectionPKcRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj@Base 1.13+dfsg-4~ + (arch-bits=64)_ZN11CivetServer8getParamEPKcmS1_RNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm@Base 1.13+dfsg-4~ + (arch-bits=32)_ZN11CivetServer8getParamEPKcjS1_RNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj@Base 1.13+dfsg-4~ + _ZN11CivetServer9getCookieEP13mg_connectionRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERS7_@Base 1.13+dfsg-4~ + _ZN11CivetServer9getHeaderEP13mg_connectionRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE@Base 1.13+dfsg-4~ + _ZN11CivetServer9urlDecodeEPKcRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb@Base 1.13+dfsg-4~ + (arch-bits=64)_ZN11CivetServer9urlDecodeEPKcmRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb@Base 1.13+dfsg-4~ + (arch-bits=32)_ZN11CivetServer9urlDecodeEPKcjRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb@Base 1.13+dfsg-4~ + _ZN11CivetServer9urlEncodeEPKcRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb@Base 1.13+dfsg-4~ + (arch-bits=64)_ZN11CivetServer9urlEncodeEPKcmRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb@Base 1.13+dfsg-4~ + (arch-bits=32)_ZN11CivetServer9urlEncodeEPKcjRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb@Base 1.13+dfsg-4~ + _ZN11CivetServerC1EPPKcPK14CivetCallbacksPKv@Base 1.13+dfsg-4~ + _ZN11CivetServerC1ERKSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS6_EEPK14CivetCallbacksPKv@Base 1.13+dfsg-4~ + _ZN11CivetServerC2EPPKcPK14CivetCallbacksPKv@Base 1.13+dfsg-4~ + _ZN11CivetServerC2ERKSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS6_EEPK14CivetCallbacksPKv@Base 1.13+dfsg-4~ + _ZN11CivetServerD0Ev@Base 1.13+dfsg-4~ + _ZN11CivetServerD1Ev@Base 1.13+dfsg-4~ + _ZN11CivetServerD2Ev@Base 1.13+dfsg-4~ + _ZN12CivetHandler10handleHeadEP11CivetServerP13mg_connection@Base 1.13+dfsg-4~ + _ZN12CivetHandler10handlePostEP11CivetServerP13mg_connection@Base 1.13+dfsg-4~ + _ZN12CivetHandler11handlePatchEP11CivetServerP13mg_connection@Base 1.13+dfsg-4~ + _ZN12CivetHandler12handleDeleteEP11CivetServerP13mg_connection@Base 1.13+dfsg-4~ + _ZN12CivetHandler13handleOptionsEP11CivetServerP13mg_connection@Base 1.13+dfsg-4~ + _ZN12CivetHandler9handleGetEP11CivetServerP13mg_connection@Base 1.13+dfsg-4~ + _ZN12CivetHandler9handlePutEP11CivetServerP13mg_connection@Base 1.13+dfsg-4~ + _ZN12CivetHandlerD0Ev@Base 1.13+dfsg-4~ + _ZN12CivetHandlerD1Ev@Base 1.13+dfsg-4~ + _ZN12CivetHandlerD2Ev@Base 1.13+dfsg-4~ + _ZN14CivetCallbacksC1Ev@Base 1.13+dfsg-4~ + _ZN14CivetCallbacksC2Ev@Base 1.13+dfsg-4~ + _ZN14CivetExceptionD0Ev@Base 1.13+dfsg-4~ + _ZN14CivetExceptionD1Ev@Base 1.13+dfsg-4~ + _ZN14CivetExceptionD2Ev@Base 1.13+dfsg-4~ + (arch-bits=64)_ZN21CivetWebSocketHandler10handleDataEP11CivetServerP13mg_connectioniPcm@Base 1.13+dfsg-4~ + (arch-bits=32)_ZN21CivetWebSocketHandler10handleDataEP11CivetServerP13mg_connectioniPcj@Base 1.13+dfsg-4~ + _ZN21CivetWebSocketHandler11handleCloseEP11CivetServerPK13mg_connection@Base 1.13+dfsg-4~ + _ZN21CivetWebSocketHandler16handleConnectionEP11CivetServerPK13mg_connection@Base 1.13+dfsg-4~ + _ZN21CivetWebSocketHandler16handleReadyStateEP11CivetServerP13mg_connection@Base 1.13+dfsg-4~ + _ZN21CivetWebSocketHandlerD0Ev@Base 1.13+dfsg-4~ + _ZN21CivetWebSocketHandlerD1Ev@Base 1.13+dfsg-4~ + _ZN21CivetWebSocketHandlerD2Ev@Base 1.13+dfsg-4~ + (optional=templinst)_ZNSt12_Vector_baseIcSaIcEED1Ev@Base 1.13+dfsg-4~ + (optional=templinst)_ZNSt12_Vector_baseIcSaIcEED2Ev@Base 1.13+dfsg-4~ + (optional=templinst)_ZNSt6vectorIcSaIcEE17_M_realloc_insertIJcEEEvN9__gnu_cxx17__normal_iteratorIPcS1_EEDpOT_@Base 1.13+dfsg-4~ + _ZTI11CivetServer@Base 1.13+dfsg-4~ + _ZTI12CivetHandler@Base 1.13+dfsg-4~ + _ZTI14CivetException@Base 1.13+dfsg-4~ + _ZTI21CivetWebSocketHandler@Base 1.13+dfsg-4~ + _ZTS11CivetServer@Base 1.13+dfsg-4~ + _ZTS12CivetHandler@Base 1.13+dfsg-4~ + _ZTS14CivetException@Base 1.13+dfsg-4~ + _ZTS21CivetWebSocketHandler@Base 1.13+dfsg-4~ + _ZTV11CivetServer@Base 1.13+dfsg-4~ + _ZTV12CivetHandler@Base 1.13+dfsg-4~ + _ZTV14CivetException@Base 1.13+dfsg-4~ + _ZTV21CivetWebSocketHandler@Base 1.13+dfsg-4~ libcivetweb.so.1 libcivetweb1 #MINVER# mg_check_digest_access_authentication@Base 1 mg_check_feature@Base 1 diff --git a/debian/patches/soversion b/debian/patches/soversion index 02c5994..51af221 100644 --- a/debian/patches/soversion +++ b/debian/patches/soversion @@ -27,3 +27,12 @@ Index: civetweb-1.13/src/CMakeLists.txt ) if (BUILD_SHARED_LIBS) target_compile_definitions(civetweb-c-library PRIVATE CIVETWEB_DLL_EXPORTS INTERFACE CIVETWEB_DLL_IMPORTS) +@@ -298,7 +298,7 @@ if (CIVETWEB_ENABLE_CXX) + EXPORT_NAME "civetweb-cpp" + OUTPUT_NAME "civetweb-cpp" + VERSION ${CIVETWEB_VERSION} +- SOVERSION ${CIVETWEB_VERSION} ++ SOVERSION ${CIVETWEB_SOVERSION} + ) + if (BUILD_SHARED_LIBS) + target_compile_definitions(civetweb-cpp PRIVATE CIVETWEB_CXX_DLL_EXPORTS INTERFACE CIVETWEB_CXX_DLL_IMPORTS) diff --git a/debian/rules b/debian/rules index 639b10f..bbe777e 100755 --- a/debian/rules +++ b/debian/rules @@ -3,8 +3,7 @@ # DH_VERBOSE := 1 export LC_ALL=C.UTF-8 -# for hardening you might like to uncomment this: -export DEB_BUILD_MAINT_OPTIONS=hardening=+all +export DEB_BUILD_MAINT_OPTIONS=hardening=+all reproducible=+all future=+lfs # "CIVETWEB_SOVERSION" must match the suffix of the Debian package # (i.e. "libcivetweb1" => "1") @@ -12,6 +11,7 @@ CMAKE_EXTRA_FLAGS += \ -DCMAKE_BUILD_TYPE=None \ -DCIVETWEB_BUILD_TESTING=OFF \ -DCIVETWEB_SOVERSION=1 \ + -DCIVETWEB_ENABLE_CXX=ON \ -DBUILD_SHARED_LIBS=ON %: -- 2.29.2
signature.asc
Description: OpenPGP digital signature
