[med-svn] [Git][med-team/civetweb][master] 4 commits: build C++ API as well

Andreas Tille gitlab at salsa.debian.org
Sat Dec 5 15:09:43 GMT 2020 


Andreas Tille pushed to branch master at Debian Med / civetweb


Commits:
5eb7b550 by Andreas Tille at 2020-12-05T15:46:24+01:00
build C++ API as well

- - - - -
64d461e7 by Andreas Tille at 2020-12-05T15:46:50+01:00
routine-update: Standards-Version: 4.5.1

- - - - -
1ce13e29 by Andreas Tille at 2020-12-05T15:46:59+01:00
Set upstream metadata fields: Security-Contact.

Changes-By: lintian-brush

- - - - -
d1198b72 by Andreas Tille at 2020-12-05T15:48:05+01:00
routine-update: Ready to upload to unstable

- - - - -


8 changed files:

- debian/changelog
- debian/control
- debian/libcivetweb-dev.install
- debian/libcivetweb1.install
- debian/libcivetweb1.symbols
- debian/patches/soversion
- debian/rules
- debian/upstream/metadata


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+civetweb (1.13+dfsg-4) unstable; urgency=medium
+
+  [ Timo Röhling ]
+  * build C++ API as well
+    Closes: #974775
+
+  [ Andreas Tille ]
+  * Standards-Version: 4.5.1 (routine-update)
+
+ -- Andreas Tille <tille at debian.org>  Sat, 05 Dec 2020 15:47:00 +0100
+
 civetweb (1.13+dfsg-3) unstable; urgency=medium
 
   * Fix SOVERSION of the shared library to create "libcivetweb.so.1"


=====================================
debian/control
=====================================
@@ -7,7 +7,7 @@ Priority: optional
 Build-Depends: debhelper-compat (= 13),
                cmake,
                node-jquery
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/med-team/civetweb
 Vcs-Git: https://salsa.debian.org/med-team/civetweb.git
 Homepage: https://github.com/civetweb/civetweb/


=====================================
debian/libcivetweb-dev.install
=====================================
@@ -1,3 +1,3 @@
-usr/lib/*/libcivetweb.so
+usr/lib/*/libcivetweb*.so
 usr/include
 usr/lib/*/cmake


=====================================
debian/libcivetweb1.install
=====================================
@@ -1 +1 @@
-usr/lib/*/libcivetweb.so.*
+usr/lib/*/libcivetweb*.so.*


=====================================
debian/libcivetweb1.symbols
=====================================
@@ -1,3 +1,79 @@
+libcivetweb-cpp.so.1 libcivetweb1 #MINVER#
+ _ZN11CivetServer10addHandlerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEP12CivetHandler at Base 1.13+dfsg-4~
+ _ZN11CivetServer11authHandlerEP13mg_connectionPv at Base 1.13+dfsg-4~
+ _ZN11CivetServer11getPostDataB5cxx11EP13mg_connection at Base 1.13+dfsg-4~
+ _ZN11CivetServer12closeHandlerEPK13mg_connection at Base 1.13+dfsg-4~
+ _ZN11CivetServer13removeHandlerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE at Base 1.13+dfsg-4~
+ _ZN11CivetServer14addAuthHandlerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEP16CivetAuthHandler at Base 1.13+dfsg-4~
+ _ZN11CivetServer14requestHandlerEP13mg_connectionPv at Base 1.13+dfsg-4~
+ _ZN11CivetServer17getListeningPortsEv at Base 1.13+dfsg-4~
+ _ZN11CivetServer17removeAuthHandlerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE at Base 1.13+dfsg-4~
+ _ZN11CivetServer19addWebSocketHandlerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEP21CivetWebSocketHandler at Base 1.13+dfsg-4~
+ (arch-bits=64)_ZN11CivetServer20webSocketDataHandlerEP13mg_connectioniPcmPv at Base 1.13+dfsg-4~
+ (arch-bits=32)_ZN11CivetServer20webSocketDataHandlerEP13mg_connectioniPcjPv at Base 1.13+dfsg-4~
+ _ZN11CivetServer21getListeningPortsFullEv at Base 1.13+dfsg-4~
+ _ZN11CivetServer21webSocketCloseHandlerEPK13mg_connectionPv at Base 1.13+dfsg-4~
+ _ZN11CivetServer21webSocketReadyHandlerEP13mg_connectionPv at Base 1.13+dfsg-4~
+ _ZN11CivetServer22removeWebSocketHandlerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE at Base 1.13+dfsg-4~
+ _ZN11CivetServer26webSocketConnectionHandlerEPK13mg_connectionPv at Base 1.13+dfsg-4~
+ _ZN11CivetServer5closeEv at Base 1.13+dfsg-4~
+ (arch-bits=64)_ZN11CivetServer8getParamEP13mg_connectionPKcRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm at Base 1.13+dfsg-4~
+ (arch-bits=32)_ZN11CivetServer8getParamEP13mg_connectionPKcRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj at Base 1.13+dfsg-4~
+ (arch-bits=64)_ZN11CivetServer8getParamEPKcmS1_RNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEm at Base 1.13+dfsg-4~
+ (arch-bits=32)_ZN11CivetServer8getParamEPKcjS1_RNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEj at Base 1.13+dfsg-4~
+ _ZN11CivetServer9getCookieEP13mg_connectionRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERS7_ at Base 1.13+dfsg-4~
+ _ZN11CivetServer9getHeaderEP13mg_connectionRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE at Base 1.13+dfsg-4~
+ _ZN11CivetServer9urlDecodeEPKcRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb at Base 1.13+dfsg-4~
+ (arch-bits=64)_ZN11CivetServer9urlDecodeEPKcmRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb at Base 1.13+dfsg-4~
+ (arch-bits=32)_ZN11CivetServer9urlDecodeEPKcjRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb at Base 1.13+dfsg-4~
+ _ZN11CivetServer9urlEncodeEPKcRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb at Base 1.13+dfsg-4~
+ (arch-bits=64)_ZN11CivetServer9urlEncodeEPKcmRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb at Base 1.13+dfsg-4~
+ (arch-bits=32)_ZN11CivetServer9urlEncodeEPKcjRNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEb at Base 1.13+dfsg-4~
+ _ZN11CivetServerC1EPPKcPK14CivetCallbacksPKv at Base 1.13+dfsg-4~
+ _ZN11CivetServerC1ERKSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS6_EEPK14CivetCallbacksPKv at Base 1.13+dfsg-4~
+ _ZN11CivetServerC2EPPKcPK14CivetCallbacksPKv at Base 1.13+dfsg-4~
+ _ZN11CivetServerC2ERKSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS6_EEPK14CivetCallbacksPKv at Base 1.13+dfsg-4~
+ _ZN11CivetServerD0Ev at Base 1.13+dfsg-4~
+ _ZN11CivetServerD1Ev at Base 1.13+dfsg-4~
+ _ZN11CivetServerD2Ev at Base 1.13+dfsg-4~
+ _ZN12CivetHandler10handleHeadEP11CivetServerP13mg_connection at Base 1.13+dfsg-4~
+ _ZN12CivetHandler10handlePostEP11CivetServerP13mg_connection at Base 1.13+dfsg-4~
+ _ZN12CivetHandler11handlePatchEP11CivetServerP13mg_connection at Base 1.13+dfsg-4~
+ _ZN12CivetHandler12handleDeleteEP11CivetServerP13mg_connection at Base 1.13+dfsg-4~
+ _ZN12CivetHandler13handleOptionsEP11CivetServerP13mg_connection at Base 1.13+dfsg-4~
+ _ZN12CivetHandler9handleGetEP11CivetServerP13mg_connection at Base 1.13+dfsg-4~
+ _ZN12CivetHandler9handlePutEP11CivetServerP13mg_connection at Base 1.13+dfsg-4~
+ _ZN12CivetHandlerD0Ev at Base 1.13+dfsg-4~
+ _ZN12CivetHandlerD1Ev at Base 1.13+dfsg-4~
+ _ZN12CivetHandlerD2Ev at Base 1.13+dfsg-4~
+ _ZN14CivetCallbacksC1Ev at Base 1.13+dfsg-4~
+ _ZN14CivetCallbacksC2Ev at Base 1.13+dfsg-4~
+ _ZN14CivetExceptionD0Ev at Base 1.13+dfsg-4~
+ _ZN14CivetExceptionD1Ev at Base 1.13+dfsg-4~
+ _ZN14CivetExceptionD2Ev at Base 1.13+dfsg-4~
+ (arch-bits=64)_ZN21CivetWebSocketHandler10handleDataEP11CivetServerP13mg_connectioniPcm at Base 1.13+dfsg-4~
+ (arch-bits=32)_ZN21CivetWebSocketHandler10handleDataEP11CivetServerP13mg_connectioniPcj at Base 1.13+dfsg-4~
+ _ZN21CivetWebSocketHandler11handleCloseEP11CivetServerPK13mg_connection at Base 1.13+dfsg-4~
+ _ZN21CivetWebSocketHandler16handleConnectionEP11CivetServerPK13mg_connection at Base 1.13+dfsg-4~
+ _ZN21CivetWebSocketHandler16handleReadyStateEP11CivetServerP13mg_connection at Base 1.13+dfsg-4~
+ _ZN21CivetWebSocketHandlerD0Ev at Base 1.13+dfsg-4~
+ _ZN21CivetWebSocketHandlerD1Ev at Base 1.13+dfsg-4~
+ _ZN21CivetWebSocketHandlerD2Ev at Base 1.13+dfsg-4~
+ (optional=templinst)_ZNSt12_Vector_baseIcSaIcEED1Ev at Base 1.13+dfsg-4~
+ (optional=templinst)_ZNSt12_Vector_baseIcSaIcEED2Ev at Base 1.13+dfsg-4~
+ (optional=templinst)_ZNSt6vectorIcSaIcEE17_M_realloc_insertIJcEEEvN9__gnu_cxx17__normal_iteratorIPcS1_EEDpOT_ at Base 1.13+dfsg-4~
+ _ZTI11CivetServer at Base 1.13+dfsg-4~
+ _ZTI12CivetHandler at Base 1.13+dfsg-4~
+ _ZTI14CivetException at Base 1.13+dfsg-4~
+ _ZTI21CivetWebSocketHandler at Base 1.13+dfsg-4~
+ _ZTS11CivetServer at Base 1.13+dfsg-4~
+ _ZTS12CivetHandler at Base 1.13+dfsg-4~
+ _ZTS14CivetException at Base 1.13+dfsg-4~
+ _ZTS21CivetWebSocketHandler at Base 1.13+dfsg-4~
+ _ZTV11CivetServer at Base 1.13+dfsg-4~
+ _ZTV12CivetHandler at Base 1.13+dfsg-4~
+ _ZTV14CivetException at Base 1.13+dfsg-4~
+ _ZTV21CivetWebSocketHandler at Base 1.13+dfsg-4~
 libcivetweb.so.1 libcivetweb1 #MINVER#
  mg_check_digest_access_authentication at Base 1
  mg_check_feature at Base 1


=====================================
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)


=====================================
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
 
 %:


=====================================
debian/upstream/metadata
=====================================
@@ -3,3 +3,4 @@ Bug-Database: https://github.com/civetweb/civetweb/issues
 Bug-Submit: https://github.com/civetweb/civetweb/issues/new
 Repository: https://github.com/civetweb/civetweb.git
 Repository-Browse: https://github.com/civetweb/civetweb
+Security-Contact: https://github.com/civetweb/civetweb/tree/HEAD/SECURITY.md



View it on GitLab: https://salsa.debian.org/med-team/civetweb/-/compare/6948a31223c501ee3989ec859a3e9a7129ca6c55...d1198b72855989c1b611d42e8b4747cda0ed794b

-- 
View it on GitLab: https://salsa.debian.org/med-team/civetweb/-/compare/6948a31223c501ee3989ec859a3e9a7129ca6c55...d1198b72855989c1b611d42e8b4747cda0ed794b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201205/b6c1f04d/attachment-0001.html>

More information about the debian-med-commit mailing list