Bug#989287: libcivetweb1: build with websockets support
On Wed, Jun 02, 2021 at 09:44:27AM +0100, Claude Heiland-Allen wrote: > I could not get debdiff to work for me (I couldn't figure out how to create > a new .dsc file, I'm very out of practice with Debian packaging), so I > attach a regular diff between two directories. I hope it's not too > inconvenient. Regular diff is perfectly fine (=basically the same). Thanks a lot, Andreas. > diff -ruw civetweb-1.13+dfsg.old/debian/changelog > civetweb-1.13+dfsg.new/debian/changelog > --- civetweb-1.13+dfsg.old/debian/changelog 2021-01-21 14:30:38.0 > + > +++ civetweb-1.13+dfsg.new/debian/changelog 2021-06-02 09:34:33.738622818 > +0100 > @@ -1,3 +1,10 @@ > +civetweb (1.13+dfsg-5.1) UNRELEASED; urgency=medium > + > + * Non-maintainer upload. > + * Enable websockets support. > + > + -- Claude Heiland-Allen Wed, 02 Jun 2021 09:34:18 > +0100 > + > civetweb (1.13+dfsg-5) unstable; urgency=medium > >* Team Upload. > diff -ruw civetweb-1.13+dfsg.old/debian/libcivetweb1.symbols > civetweb-1.13+dfsg.new/debian/libcivetweb1.symbols > --- civetweb-1.13+dfsg.old/debian/libcivetweb1.symbols2021-01-21 > 14:14:50.0 + > +++ civetweb-1.13+dfsg.new/debian/libcivetweb1.symbols2021-06-02 > 09:32:55.214672544 +0100 > @@ -144,4 +144,6 @@ > mg_url_decode@Base 1 > mg_url_encode@Base 1 > mg_version@Base 1 > + mg_websocket_client_write@Base 1.13+dfsg-5 > + mg_websocket_write@Base 1.13+dfsg-5 > mg_write@Base 1 > diff -ruw civetweb-1.13+dfsg.old/debian/rules > civetweb-1.13+dfsg.new/debian/rules > --- civetweb-1.13+dfsg.old/debian/rules 2021-01-21 14:29:18.0 > + > +++ civetweb-1.13+dfsg.new/debian/rules 2021-06-02 09:31:08.019109852 > +0100 > @@ -12,6 +12,7 @@ > -DCIVETWEB_BUILD_TESTING=OFF \ > -DCIVETWEB_SOVERSION=1 \ > -DCIVETWEB_ENABLE_CXX=ON \ > + -DCIVETWEB_ENABLE_WEBSOCKETS=ON \ > -DBUILD_SHARED_LIBS=ON > > %: -- http://fam-tille.de
Bug#989287: libcivetweb1: build with websockets support
Hi Andreas, On 02/06/2021 07:16, Andreas Tille wrote: Hi Claude, On Mon, May 31, 2021 at 09:51:33AM +0100, Claude Heiland-Allen wrote: I managed to rebuild the package locally with websockets support by adding -DCIVETWEB_ENABLE_WEBSOCKETS=ON to CMAKE_EXTRA_FLAGS in debian/rules, adding extra lines to debian/libcivetweb1.symbols like mg_websocket_client_write@Base 1.13+dfsg-5 mg_websocket_write@Base 1.13+dfsg-5 Thank you for the bug report. It seems to be easy to accomplish. However, due to the current freeze policy we can not upload to unstable and thus I prefer to leave this bug open until after the freeze. Sure that's perfectly fine for me. It would be great if you could meanwhile post a complete patch (by for instance using debdiff) to save us the work to do what you just have done. I could not get debdiff to work for me (I couldn't figure out how to create a new .dsc file, I'm very out of practice with Debian packaging), so I attach a regular diff between two directories. I hope it's not too inconvenient. Thanks, Claude diff -ruw civetweb-1.13+dfsg.old/debian/changelog civetweb-1.13+dfsg.new/debian/changelog --- civetweb-1.13+dfsg.old/debian/changelog 2021-01-21 14:30:38.0 + +++ civetweb-1.13+dfsg.new/debian/changelog 2021-06-02 09:34:33.738622818 +0100 @@ -1,3 +1,10 @@ +civetweb (1.13+dfsg-5.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Enable websockets support. + + -- Claude Heiland-Allen Wed, 02 Jun 2021 09:34:18 +0100 + civetweb (1.13+dfsg-5) unstable; urgency=medium * Team Upload. diff -ruw civetweb-1.13+dfsg.old/debian/libcivetweb1.symbols civetweb-1.13+dfsg.new/debian/libcivetweb1.symbols --- civetweb-1.13+dfsg.old/debian/libcivetweb1.symbols 2021-01-21 14:14:50.0 + +++ civetweb-1.13+dfsg.new/debian/libcivetweb1.symbols 2021-06-02 09:32:55.214672544 +0100 @@ -144,4 +144,6 @@ mg_url_decode@Base 1 mg_url_encode@Base 1 mg_version@Base 1 + mg_websocket_client_write@Base 1.13+dfsg-5 + mg_websocket_write@Base 1.13+dfsg-5 mg_write@Base 1 diff -ruw civetweb-1.13+dfsg.old/debian/rules civetweb-1.13+dfsg.new/debian/rules --- civetweb-1.13+dfsg.old/debian/rules 2021-01-21 14:29:18.0 + +++ civetweb-1.13+dfsg.new/debian/rules 2021-06-02 09:31:08.019109852 +0100 @@ -12,6 +12,7 @@ -DCIVETWEB_BUILD_TESTING=OFF \ -DCIVETWEB_SOVERSION=1 \ -DCIVETWEB_ENABLE_CXX=ON \ + -DCIVETWEB_ENABLE_WEBSOCKETS=ON \ -DBUILD_SHARED_LIBS=ON %:
Bug#989287: libcivetweb1: build with websockets support
Hi Claude, On Mon, May 31, 2021 at 09:51:33AM +0100, Claude Heiland-Allen wrote: > > I managed to rebuild the package locally with websockets support by adding > -DCIVETWEB_ENABLE_WEBSOCKETS=ON to CMAKE_EXTRA_FLAGS in debian/rules, adding > extra lines to debian/libcivetweb1.symbols like > mg_websocket_client_write@Base 1.13+dfsg-5 > mg_websocket_write@Base 1.13+dfsg-5 Thank you for the bug report. It seems to be easy to accomplish. However, due to the current freeze policy we can not upload to unstable and thus I prefer to leave this bug open until after the freeze. It would be great if you could meanwhile post a complete patch (by for instance using debdiff) to save us the work to do what you just have done. Kind regards Andreas. -- http://fam-tille.de
Bug#989287: libcivetweb1: build with websockets support
Package: libcivetweb1 Version: 1.13+dfsg-5 Severity: wishlist X-Debbugs-Cc: cla...@mathr.co.uk Dear Maintainer, * What led up to the situation? I wanted to write a websocket server using civetweb packaged in Debian. * What was the outcome of this action? Debian civetweb is not built with websockets support. I managed to rebuild the package locally with websockets support by adding -DCIVETWEB_ENABLE_WEBSOCKETS=ON to CMAKE_EXTRA_FLAGS in debian/rules, adding extra lines to debian/libcivetweb1.symbols like mg_websocket_client_write@Base 1.13+dfsg-5 mg_websocket_write@Base 1.13+dfsg-5 I'm not sure if other changes need to be made (e.g. library version bump for changed ABI?). Thanks for your consideration, -- System Information: Debian Release: 11.0 APT prefers testing APT policy: (990, 'testing'), (500, 'testing-debug'), (500, 'unstable'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 5.10.0-6-amd64 (SMP w/16 CPU threads) Kernel taint flags: TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE=en_GB:en Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages libcivetweb1 depends on: ii libc6 2.31-12 ii libgcc-s1 10.2.1-6 ii libstdc++6 10.2.1-6 libcivetweb1 recommends no packages. libcivetweb1 suggests no packages. -- no debconf information
