From: subnut <subnut@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] mongoose: update to 7.6
Date: Mon, 28 Mar 2022 20:23:59 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36395@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]
There is a new pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages mongoose
https://github.com/void-linux/void-packages/pull/36395
mongoose: update to 7.6
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36395.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mongoose-36395.patch --]
[-- Type: text/x-diff, Size: 3494 bytes --]
From e2bc33fb824bcc404856c1d9665ae2f1bc211276 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Mon, 28 Mar 2022 19:49:52 +0530
Subject: [PATCH] mongoose: update to 7.6
---
srcpkgs/mongoose/patches/add-makefile.patch | 50 ---------------------
srcpkgs/mongoose/template | 29 ++++++++----
2 files changed, 20 insertions(+), 59 deletions(-)
delete mode 100644 srcpkgs/mongoose/patches/add-makefile.patch
diff --git a/srcpkgs/mongoose/patches/add-makefile.patch b/srcpkgs/mongoose/patches/add-makefile.patch
deleted file mode 100644
index fd0b21095472..000000000000
--- a/srcpkgs/mongoose/patches/add-makefile.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- /dev/null
-+++ b/Makefile
-@@ -0,0 +1,47 @@
-+PROG = mongoose
-+LIB = lib$(PROG).so.0
-+
-+ifndef PREFIX
-+ PREFIX=/usr/local
-+endif
-+
-+ifndef DOCDIR
-+ DOCDIR=$(PREFIX)/share/$(PROG)/doc
-+endif
-+
-+CPPFLAGS+=-DMONGOOSE_ENABLE_THREADS -DMG_ENABLE_SSL
-+CFLAGS+=-fPIC -c -Wall
-+LDFLAGS+=-shared -lssl -pthread -lcrypto
-+
-+SRCS=mongoose.c
-+OBJS=mongoose.o
-+INCLUDE=.
-+
-+all: $(LIB)
-+
-+$(LIB): $(OBJS)
-+ $(CC) $(OBJS) $(LDFLAGS) -o $(LIB)
-+
-+$(OBJS): $(SRCS)
-+ $(CC) $(CPPFLAGS) $(CFLAGS) -I$(INCLUDE) $(SRCS) -o $(OBJS)
-+
-+install:
-+ install -d $(DESTDIR)$(PREFIX)/include
-+ install -m644 mongoose.h $(DESTDIR)$(PREFIX)/include
-+ install -d $(DESTDIR)$(PREFIX)/lib
-+ ln -sf $(LIB) $(LIB).0; cp -a $(LIB).0 $(DESTDIR)$(PREFIX)/lib
-+ ln -sf $(LIB) libmongoose.so; cp -a libmongoose.so $(DESTDIR)$(PREFIX)/lib
-+ install -m755 $(LIB) $(DESTDIR)$(PREFIX)/lib
-+ install -dm755 $(DESTDIR)$(DOCDIR)
-+ cp -a examples $(DESTDIR)$(DOCDIR)
-+ cp -a docs/* $(DESTDIR)$(DOCDIR)/
-+
-+
-+test:
-+ $(MAKE) -C test/
-+clean:
-+ rm -f $(OBJS) $(LIB)
-+ $(MAKE) -C test/ clean
-+
-+.PHONY: clean test all
-+
diff --git a/srcpkgs/mongoose/template b/srcpkgs/mongoose/template
index eddadc647333..8e7f2219e437 100644
--- a/srcpkgs/mongoose/template
+++ b/srcpkgs/mongoose/template
@@ -1,22 +1,31 @@
# Template file for 'mongoose'
pkgname=mongoose
-version=6.18
-revision=4
+version=7.6
+revision=1
build_style=gnu-makefile
-make_use_env=compliant
-makedepends="openssl-devel"
-short_desc="Easy to use Web server"
-maintainer="Orphaned <orphan@voidlinux.org>"
+makedepends="$(vopt_if openssl openssl-devel mbedtls-devel)"
+short_desc="Embedded Networking Library with TCP,UDP,HTTP,MQTT,WebSocket and SSL/TLS"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
license="GPL-2.0-only"
-homepage="https://cesanta.com/"
+homepage="https://mongoose.ws/"
distfiles="https://github.com/cesanta/mongoose/archive/${version}.tar.gz"
-checksum=f5c10346abc9c72f7cac7885d853ca064fb09aad57580433941a8fd7a3543769
+checksum=1ef09d971b6de1a6317c109980d6fb5a9c19b39efef2506d6b76869644b3dafa
+
+make_use_env=yes
+make_build_target=linux-libs
+make_check_target=test
+make_check=no # CBA for now
+
+build_options=openssl
+desc_option_openssl="Use OpenSSL instead of MbedTLS for SSL"
+export SSL="$(vopt_if openssl OPENSSL MBEDTLS)"
mongoose-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/include
+ vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
}
@@ -24,6 +33,8 @@ mongoose-devel_package() {
mongoose-doc_package() {
short_desc+=" - documentation"
pkg_install() {
- vmove usr/share
+ vmkdir usr/share/mongoose
+ vcopy docs usr/share/mongoose
+ vcopy examples usr/share/mongoose
}
}
next reply other threads:[~2022-03-28 18:23 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-28 18:23 subnut [this message]
2022-03-28 18:30 ` subnut
2022-03-28 18:31 ` subnut
2022-03-28 18:49 ` [PR REVIEW] " ahesford
2022-03-28 18:49 ` ahesford
2022-03-28 18:49 ` ahesford
2022-03-28 18:49 ` ahesford
2022-03-28 19:42 ` [PR PATCH] [Updated] " subnut
2022-03-28 19:44 ` [PR REVIEW] " subnut
2022-03-28 19:45 ` subnut
2022-03-28 20:17 ` Johnnynator
2022-03-29 2:16 ` subnut
2022-03-29 2:16 ` subnut
2022-03-29 3:39 ` [PR PATCH] [Updated] " subnut
2022-03-29 4:59 ` subnut
2022-03-29 5:21 ` subnut
2022-03-29 5:22 ` subnut
2022-03-29 5:32 ` subnut
2022-03-29 5:35 ` subnut
2022-03-29 6:05 ` subnut
2022-03-29 6:11 ` subnut
2022-03-29 6:15 ` [PR REVIEW] " subnut
2022-03-29 6:29 ` [PR PATCH] [Updated] " subnut
2022-03-29 6:36 ` subnut
2022-03-29 6:37 ` subnut
2022-03-29 6:38 ` subnut
2022-03-29 8:58 ` [PR REVIEW] " ahesford
2022-03-29 8:58 ` ahesford
2022-03-29 11:36 ` subnut
2022-03-29 12:07 ` ahesford
2022-03-29 12:21 ` [PR PATCH] [Updated] " subnut
2022-03-29 12:22 ` subnut
2022-03-29 12:37 ` subnut
2022-03-29 12:38 ` [PR REVIEW] " subnut
2022-03-29 12:47 ` [PR PATCH] [Updated] " subnut
2022-03-29 18:29 ` [PR REVIEW] " 0x5c
2022-03-29 18:57 ` subnut
2022-03-29 19:07 ` ahesford
2022-03-29 19:29 ` ahesford
2022-03-30 3:51 ` [PR PATCH] [Updated] " subnut
2022-03-30 4:03 ` [PR REVIEW] " subnut
2022-03-30 4:07 ` subnut
2022-03-30 15:10 ` [PR PATCH] [Updated] " subnut
2022-03-30 15:14 ` [PR REVIEW] " ahesford
2022-03-30 15:15 ` [PR PATCH] [Updated] " subnut
2022-03-30 15:19 ` subnut
2022-03-30 15:19 ` subnut
2022-03-30 15:50 ` subnut
2022-03-30 15:55 ` subnut
2022-03-30 15:55 ` subnut
2022-03-30 15:57 ` subnut
2022-03-30 16:11 ` subnut
2022-03-31 10:31 ` [PR REVIEW] " ahesford
2022-03-31 10:31 ` ahesford
2022-03-31 11:52 ` [PR PATCH] [Updated] " subnut
2022-03-31 11:54 ` subnut
2022-03-31 12:14 ` [PR PATCH] [Closed]: " ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36395@inbox.vuxu.org \
--to=subnut@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).