[med-svn] [Git][med-team/civetweb][master] 8 commits: Unfuzz patches.
Étienne Mollier (@emollier)
gitlab at salsa.debian.org
Fri Jul 19 22:27:55 BST 2024
Étienne Mollier pushed to branch master at Debian Med / civetweb
Commits:
c874cf45 by Étienne Mollier at 2024-07-19T23:02:34+02:00
Unfuzz patches.
- - - - -
91af6c14 by Étienne Mollier at 2024-07-19T23:02:53+02:00
d/control: add myself to uploaders.
- - - - -
f1fe81ff by Étienne Mollier at 2024-07-19T23:03:16+02:00
d/control: declare compliance to standards version 4.7.0.
- - - - -
c94fc564 by Étienne Mollier at 2024-07-19T23:11:29+02:00
d/libcivetweb1.symbols.amd64: mark compiler symbols optional.
Closes: #1015368, #1074884
- - - - -
a62dedef by Étienne Mollier at 2024-07-19T23:12:40+02:00
d/rules: forcefully rule LTO builds.
- - - - -
cd2dbc86 by Étienne Mollier at 2024-07-19T23:18:20+02:00
d/clean: new: cleanup test/ajax/jquery.js.
Closes: #1043758
- - - - -
a373b26f by Étienne Mollier at 2024-07-19T23:22:31+02:00
d/libcivetweb1.symbols.amd64: specify B-D-P: libcivetweb-dev.
- - - - -
c27a4af0 by Étienne Mollier at 2024-07-19T23:26:37+02:00
ready to upload to unstable.
- - - - -
7 changed files:
- debian/changelog
- + debian/clean
- debian/control
- debian/libcivetweb1.symbols.amd64
- debian/patches/soversion
- debian/patches/webdav-uploads
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+civetweb (1.16+dfsg-2) unstable; urgency=medium
+
+ * Unfuzz patches.
+ * d/control: add myself to uploaders.
+ * d/control: declare compliance to standards version 4.7.0.
+ * d/libcivetweb1.symbols.amd64: mark compiler symbols optional.
+ (Closes: #1015368, #1074884)
+ * d/rules: forcefully rule LTO builds.
+ * d/clean: new: cleanup test/ajax/jquery.js. (Closes: #1043758)
+ * d/libcivetweb1.symbols.amd64: specify B-D-P: libcivetweb-dev.
+
+ -- Étienne Mollier <emollier at debian.org> Fri, 19 Jul 2024 23:23:09 +0200
+
civetweb (1.16+dfsg-1) unstable; urgency=medium
* Team upload.
=====================================
debian/clean
=====================================
@@ -0,0 +1 @@
+test/ajax/jquery.js
=====================================
debian/control
=====================================
@@ -1,13 +1,14 @@
Source: civetweb
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Andreas Tille <tille at debian.org>,
- Sebastien Jodogne <s.jodogne at gmail.com>
+ Sebastien Jodogne <s.jodogne at gmail.com>,
+ Étienne Mollier <emollier at debian.org>
Section: web
Priority: optional
Build-Depends: debhelper-compat (= 13),
cmake,
libjs-jquery
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
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/libcivetweb1.symbols.amd64
=====================================
@@ -1,4 +1,5 @@
libcivetweb-cpp.so.1 libcivetweb1 #MINVER#
+* Build-Depends-Package: libcivetweb-dev
_ZN11CivetServer10addHandlerERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEP12CivetHandler at Base 1.15
_ZN11CivetServer11authHandlerEP13mg_connectionPv at Base 1.15
_ZN11CivetServer11getPostDataB5cxx11EP13mg_connection at Base 1.15
@@ -46,25 +47,25 @@ libcivetweb-cpp.so.1 libcivetweb1 #MINVER#
_ZN12CivetHandler9handleGetEP11CivetServerP13mg_connectionPi at Base 1.15
_ZN12CivetHandler9handlePutEP11CivetServerP13mg_connection at Base 1.15
_ZN12CivetHandler9handlePutEP11CivetServerP13mg_connectionPi at Base 1.15
- _ZN12CivetHandlerD0Ev at Base 1.15
- _ZN12CivetHandlerD1Ev at Base 1.15
- _ZN12CivetHandlerD2Ev at Base 1.15
+ (optional)_ZN12CivetHandlerD0Ev at Base 1.15
+ (optional)_ZN12CivetHandlerD1Ev at Base 1.15
+ (optional)_ZN12CivetHandlerD2Ev at Base 1.15
_ZN14CivetCallbacksC1Ev at Base 1.15
_ZN14CivetCallbacksC2Ev at Base 1.15
- _ZN14CivetExceptionD0Ev at Base 1.15
- _ZN14CivetExceptionD1Ev at Base 1.15
- _ZN14CivetExceptionD2Ev at Base 1.15
+ (optional)_ZN14CivetExceptionD0Ev at Base 1.15
+ (optional)_ZN14CivetExceptionD1Ev at Base 1.15
+ (optional)_ZN14CivetExceptionD2Ev at Base 1.15
_ZN21CivetWebSocketHandler10handleDataEP11CivetServerP13mg_connectioniPcm at Base 1.15
_ZN21CivetWebSocketHandler11handleCloseEP11CivetServerPK13mg_connection at Base 1.15
_ZN21CivetWebSocketHandler16handleConnectionEP11CivetServerPK13mg_connection at Base 1.15
_ZN21CivetWebSocketHandler16handleReadyStateEP11CivetServerP13mg_connection at Base 1.15
- _ZN21CivetWebSocketHandlerD0Ev at Base 1.15
- _ZN21CivetWebSocketHandlerD1Ev at Base 1.15
- _ZN21CivetWebSocketHandlerD2Ev at Base 1.15
+ (optional)_ZN21CivetWebSocketHandlerD0Ev at Base 1.15
+ (optional)_ZN21CivetWebSocketHandlerD1Ev at Base 1.15
+ (optional)_ZN21CivetWebSocketHandlerD2Ev at Base 1.15
(optional)_ZNSt12_Vector_baseIcSaIcEED1Ev at Base 1.16
(optional)_ZNSt12_Vector_baseIcSaIcEED2Ev at Base 1.16
- _ZNSt6vectorIcSaIcEE17_M_default_appendEm at Base 1.15
- _ZNSt6vectorIcSaIcEE17_M_realloc_insertIJcEEEvN9__gnu_cxx17__normal_iteratorIPcS1_EEDpOT_ at Base 1.16
+ (optional)_ZNSt6vectorIcSaIcEE17_M_default_appendEm at Base 1.15
+ (optional)_ZNSt6vectorIcSaIcEE17_M_realloc_insertIJcEEEvN9__gnu_cxx17__normal_iteratorIPcS1_EEDpOT_ at Base 1.16
(optional)_ZNSt6vectorIcSaIcEED1Ev at Base 1.16
(optional)_ZNSt6vectorIcSaIcEED2Ev at Base 1.16
_ZTI11CivetServer at Base 1.15
@@ -77,7 +78,7 @@ libcivetweb-cpp.so.1 libcivetweb1 #MINVER#
_ZTS21CivetWebSocketHandler at Base 1.15
_ZTV11CivetServer at Base 1.15
_ZTV12CivetHandler at Base 1.15
- _ZTV14CivetException at Base 1.15
+ (optional)_ZTV14CivetException at Base 1.15
_ZTV21CivetWebSocketHandler at Base 1.15
libcivetweb.so.1 libcivetweb1 #MINVER#
mg_base64_decode at Base 1.16
=====================================
debian/patches/soversion
=====================================
@@ -2,9 +2,9 @@ Description: Configuration option to set the SOVERSION of the shared library
Author: Sebastien Jodogne <s.jodogne at orthanc-labs.com>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -37,6 +37,7 @@ include(DetermineTargetArchitecture)
+--- civetweb.orig/CMakeLists.txt
++++ civetweb/CMakeLists.txt
+@@ -38,6 +38,7 @@
include(CMakeDependentOption)
set(CIVETWEB_VERSION "1.15.0" CACHE STRING "The version of the civetweb library")
@@ -12,9 +12,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" CIVETWEB_VERSION_MATCH "${CIVETWEB_VERSION}")
if ("${CIVETWEB_VERSION_MATCH}" STREQUAL "")
message(FATAL_ERROR "Must specify a semantic version: major.minor.patch")
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -8,7 +8,7 @@ set_target_properties(civetweb-c-library
+--- civetweb.orig/src/CMakeLists.txt
++++ civetweb/src/CMakeLists.txt
+@@ -8,7 +8,7 @@
OUTPUT_NAME "civetweb"
EXPORT_NAME "civetweb"
VERSION ${CIVETWEB_VERSION}
@@ -23,7 +23,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
)
if (BUILD_SHARED_LIBS)
target_compile_definitions(civetweb-c-library PRIVATE CIVETWEB_DLL_EXPORTS INTERFACE CIVETWEB_DLL_IMPORTS)
-@@ -302,7 +302,7 @@ if (CIVETWEB_ENABLE_CXX)
+@@ -302,7 +302,7 @@
EXPORT_NAME "civetweb-cpp"
OUTPUT_NAME "civetweb-cpp"
VERSION ${CIVETWEB_VERSION}
=====================================
debian/patches/webdav-uploads
=====================================
@@ -2,9 +2,9 @@ Description: Introduce function for performance of keep-alive and to allow WebDA
Origin: https://hg.orthanc-server.com/orthanc/file/default/OrthancFramework/Resources/Patches/civetweb-1.13.patch
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/include/civetweb.h
-+++ b/include/civetweb.h
-@@ -1705,6 +1705,9 @@ CIVETWEB_API int mg_start_domain2(struct
+--- civetweb.orig/include/civetweb.h
++++ civetweb/include/civetweb.h
+@@ -1826,6 +1826,9 @@
struct mg_error_data *error);
@@ -14,9 +14,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
#ifdef __cplusplus
}
#endif /* __cplusplus */
---- a/src/civetweb.c
-+++ b/src/civetweb.c
-@@ -10540,6 +10540,11 @@ static const struct mg_http_method_info
+--- civetweb.orig/src/civetweb.c
++++ civetweb/src/civetweb.c
+@@ -10859,6 +10859,11 @@
/* + MicroSoft extensions
* https://msdn.microsoft.com/en-us/library/aa142917.aspx */
@@ -28,7 +28,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
/* REPORT method (RFC 3253) */
{"REPORT", 1, 1, 1, 1, 1},
/* REPORT method only allowed for CGI/Lua/LSP and callbacks. */
-@@ -21472,4 +21477,12 @@ mg_exit_library(void)
+@@ -22516,4 +22521,12 @@
}
=====================================
debian/rules
=====================================
@@ -3,7 +3,11 @@
# DH_VERBOSE := 1
export LC_ALL=C.UTF-8
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all reproducible=+all future=+lfs
+export DEB_BUILD_MAINT_OPTIONS = \
+ hardening=+all \
+ reproducible=+all \
+ future=+lfs \
+ optimize=+lto
# "CIVETWEB_SOVERSION" must match the suffix of the Debian package
# (i.e. "libcivetweb1" => "1")
View it on GitLab: https://salsa.debian.org/med-team/civetweb/-/compare/e2f4c0c426c5cc7afc9bb38d24b121b326396b85...c27a4af01a26fe5fa12821d0efbc6f5b324c96da
--
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/med-team/civetweb/-/compare/e2f4c0c426c5cc7afc9bb38d24b121b326396b85...c27a4af01a26fe5fa12821d0efbc6f5b324c96da
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/20240719/ce8235c0/attachment-0001.htm>
More information about the debian-med-commit
mailing list