diff mbox series

[meta-networking,PATCHv2] civetweb: upgrade 1.12 -> 1.16

Message ID 20231113123441.104938-1-alperyasinak1@gmail.com
State New
Headers show
Series [meta-networking,PATCHv2] civetweb: upgrade 1.12 -> 1.16 | expand

Commit Message

Alper Ak Nov. 13, 2023, 12:34 p.m. UTC
License-Update:

- Copyright years changed
- Added additional components Copyright
- The website keplerproject.org seems to no longer exist. So, the source URL used was changed

=========================

- Added "-DCIVETWEB_SSL_OPENSSL_API_3_0=ON" because of following error:

civetweb.c:1561:2: error: #error "Please define OPENSSL_API_#_# or USE_MBEDTLS"

You may also want to check out the available CMake options here:

https://github.com/civetweb/civetweb/blob/d7ba35bbb649209c66e582d5a0244ba988a15159/CMakeLists.txt
=========================

Changelog:

https://github.com/civetweb/civetweb/blob/d7ba35bbb649209c66e582d5a0244ba988a15159/RELEASE_NOTES.md

Signed-off-by: alperak <alperyasinak1@gmail.com>
---
 Added explanation about why the license was updated.
 
 .../civetweb/{civetweb_git.bb => civetweb_1.16.bb}         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename meta-networking/recipes-connectivity/civetweb/{civetweb_git.bb => civetweb_1.16.bb} (91%)

Comments

Khem Raj Nov. 13, 2023, 6:49 p.m. UTC | #1
Please rebase all of your v2 patches on top of master and resend please.

On Mon, Nov 13, 2023 at 4:35 AM Alper Ak <alperyasinak1@gmail.com> wrote:
>
> License-Update:
>
> - Copyright years changed
> - Added additional components Copyright
> - The website keplerproject.org seems to no longer exist. So, the source URL used was changed
>
> =========================
>
> - Added "-DCIVETWEB_SSL_OPENSSL_API_3_0=ON" because of following error:
>
> civetweb.c:1561:2: error: #error "Please define OPENSSL_API_#_# or USE_MBEDTLS"
>
> You may also want to check out the available CMake options here:
>
> https://github.com/civetweb/civetweb/blob/d7ba35bbb649209c66e582d5a0244ba988a15159/CMakeLists.txt
> =========================
>
> Changelog:
>
> https://github.com/civetweb/civetweb/blob/d7ba35bbb649209c66e582d5a0244ba988a15159/RELEASE_NOTES.md
>
> Signed-off-by: alperak <alperyasinak1@gmail.com>
> ---
>  Added explanation about why the license was updated.
>
>  .../civetweb/{civetweb_git.bb => civetweb_1.16.bb}         | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>  rename meta-networking/recipes-connectivity/civetweb/{civetweb_git.bb => civetweb_1.16.bb} (91%)
>
> diff --git a/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb b/meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb
> similarity index 91%
> rename from meta-networking/recipes-connectivity/civetweb/civetweb_git.bb
> rename to meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb
> index e9c205618..0a654a10f 100644
> --- a/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb
> +++ b/meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb
> @@ -2,10 +2,10 @@ SUMMARY = "Civetweb embedded web server"
>  HOMEPAGE = "https://github.com/civetweb/civetweb"
>
>  LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=50bd1d7f135b50d7e218996ba28d0d88"
> +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ce6ce6eb1b2fd59ee6bab219470442a3"
> +
> +SRCREV = "d7ba35bbb649209c66e582d5a0244ba988a15159"
>
> -SRCREV = "4b440a339979852d5a51fb11a822952712231c23"
> -PV = "1.12+git${SRCPV}"
>  SRC_URI = "git://github.com/civetweb/civetweb.git;branch=master;protocol=https \
>             file://0001-Unittest-Link-librt-and-libm-using-l-option.patch \
>             "
> @@ -23,6 +23,7 @@ EXTRA_OECMAKE = " \
>      -DCIVETWEB_ENABLE_LUA=OFF \
>      -DCIVETWEB_ENABLE_ASAN=OFF \
>      -DCIVETWEB_BUILD_TESTING=OFF \
> +    -DCIVETWEB_SSL_OPENSSL_API_3_0=ON \
>  "
>
>  # Building with ninja fails on missing third_party/lib/libcheck.a (which
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#106641): https://lists.openembedded.org/g/openembedded-devel/message/106641
> Mute This Topic: https://lists.openembedded.org/mt/102560182/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb b/meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb
similarity index 91%
rename from meta-networking/recipes-connectivity/civetweb/civetweb_git.bb
rename to meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb
index e9c205618..0a654a10f 100644
--- a/meta-networking/recipes-connectivity/civetweb/civetweb_git.bb
+++ b/meta-networking/recipes-connectivity/civetweb/civetweb_1.16.bb
@@ -2,10 +2,10 @@  SUMMARY = "Civetweb embedded web server"
 HOMEPAGE = "https://github.com/civetweb/civetweb"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=50bd1d7f135b50d7e218996ba28d0d88"
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=ce6ce6eb1b2fd59ee6bab219470442a3"
+
+SRCREV = "d7ba35bbb649209c66e582d5a0244ba988a15159"
 
-SRCREV = "4b440a339979852d5a51fb11a822952712231c23"
-PV = "1.12+git${SRCPV}"
 SRC_URI = "git://github.com/civetweb/civetweb.git;branch=master;protocol=https \
            file://0001-Unittest-Link-librt-and-libm-using-l-option.patch \
            "
@@ -23,6 +23,7 @@  EXTRA_OECMAKE = " \
     -DCIVETWEB_ENABLE_LUA=OFF \
     -DCIVETWEB_ENABLE_ASAN=OFF \
     -DCIVETWEB_BUILD_TESTING=OFF \
+    -DCIVETWEB_SSL_OPENSSL_API_3_0=ON \
 "
 
 # Building with ninja fails on missing third_party/lib/libcheck.a (which