[Debian-iot-packaging] [ulfius] 02/02: Import Debian changes 2.2.4-1
Thorsten Alteholz
alteholz at moszumanska.debian.org
Sun Jan 28 18:20:15 UTC 2018
This is an automated email from the git hooks/post-receive script.
alteholz pushed a commit to branch master
in repository ulfius.
commit c9a26e39db5b1e0392b08269f9056af7b1cfd43b
Merge: 7745056 3d88f28
Author: Thorsten Alteholz <debian at alteholz.de>
Date: Fri Jan 26 14:54:14 2018 +0100
Import Debian changes 2.2.4-1
ulfius (2.2.4-1) unstable; urgency=medium
* New upstream release
* debian/control: bump standard to 4.1.3 (no changes)
* debian/control: use dh11
API.md | 2 +-
README.md | 3 +-
debian/changelog | 8 ++
debian/compat | 2 +-
debian/control | 4 +-
debian/libulfius2.2.symbols | 97 ++++++++++++++++++++++
debian/patches/hardening.patch | 16 ++--
debian/patches/hardening.patch.old | 26 ------
debian/patches/series | 1 -
debian/patches/use-lib.patch | 6 +-
.../oauth2_bearer/glewlwyd_resource.c | 63 ++++++++------
.../oauth2_bearer/glewlwyd_resource.h | 2 +-
.../static_file/static_file_callback.c | 82 +++++++++++-------
.../static_file/static_file_callback.h | 18 ++--
example_programs/websocket_example/Makefile | 4 +-
.../websocket_example/websocket_example.c | 29 +++----
src/Makefile | 2 +-
src/u_request.c | 24 ++++--
src/u_response.c | 8 +-
src/u_websocket.c | 6 +-
src/ulfius.c | 74 ++++++++++-------
src/ulfius.h | 12 +--
22 files changed, 324 insertions(+), 165 deletions(-)
diff --cc debian/changelog
index 3fe4e0d,0000000..856fa9e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,0 +1,30 @@@
++ulfius (2.2.4-1) unstable; urgency=medium
++
++ * New upstream release
++ * debian/control: bump standard to 4.1.3 (no changes)
++ * debian/control: use dh11
++
++ -- Thorsten Alteholz <debian at alteholz.de> Fri, 26 Jan 2018 14:54:14 +0100
++
+ulfius (2.2-1) unstable; urgency=medium
+
+ * New upstream release
+ * debian/control: bump standard, no changes
+ * debian/control: handle SONAME bump
+
+ -- Thorsten Alteholz <debian at alteholz.de> Tue, 21 Nov 2017 18:56:19 +0100
+
+ulfius (2.1.2-1) unstable; urgency=medium
+
+ * New upstream release
+ * debian/control: bump standard to 4.1.0 (no changes)
+ * debian/control: add VCS URLs
+ * debian/control: set team as maintainer
+
+ -- Thorsten Alteholz <debian at alteholz.de> Sun, 03 Sep 2017 19:06:24 +0200
+
+ulfius (2.1.0-1) unstable; urgency=medium
+
+ * Initial release
+
+ -- Thorsten Alteholz <debian at alteholz.de> Tue, 25 Jul 2017 19:32:33 +0200
diff --cc debian/compat
index f599e28,0000000..b4de394
mode 100644,000000..100644
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,0 +1,1 @@@
- 10
++11
diff --cc debian/control
index 67dfaf6,0000000..c8360c0
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,48 -1,0 +1,48 @@@
+Source: ulfius
+Section: devel
+Priority: optional
+Maintainer: Debian IoT Maintainers <debian-iot-maintainers at lists.alioth.debian.org>
+Uploaders: Thorsten Alteholz <debian at alteholz.de>
- Build-Depends: debhelper (>= 10)
++Build-Depends: debhelper (>= 11)
+ , libmicrohttpd-dev
+ , libcurl4-gnutls-dev
+ , libjansson-dev
+ , liborcania-dev
+ , libyder-dev
- Standards-Version: 4.1.1
++Standards-Version: 4.1.3
+Homepage: https://github.com/babelouest/ulfius
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-iot/ulfius.git
+Vcs-Git: https://anonscm.debian.org/git/debian-iot/ulfius.git
+
+Package: libulfius2.2
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Web Framework for REST Applications in C
+ Based on GNU Libmicrohttpd for the backend web server, Jansson for the
+ json manipulation library, and Libcurl for the http/smtp client API.
+ .
+ Used to facilitate creation of web applications in C programs with a
+ small memory footprint, as in embedded systems applications.
+ .
+ One can create webservices in HTTP or HTTPS mode, stream data, or
+ implement server websockets.
+
+Package: libulfius-dev
+Architecture: any
+Section: libdevel
+Depends: libulfius2.2 (= ${binary:Version})
+ , ${misc:Depends}
+ , liborcania-dev
+ , libyder-dev
+Description: Web Framework for REST Applications in - development
+ Based on GNU Libmicrohttpd for the backend web server, Jansson for the
+ json manipulation library, and Libcurl for the http/smtp client API.
+ .
+ Used to facilitate creation of web applications in C programs with a
+ small memory footprint, as in embedded systems applications.
+ .
+ One can create webservices in HTTP or HTTPS mode, stream data, or
+ implement server websockets.
+ .
+ This package contains the development files.
diff --cc debian/libulfius2.2.symbols
index 0000000,0000000..81dee73
new file mode 100644
--- /dev/null
+++ b/debian/libulfius2.2.symbols
@@@ -1,0 -1,0 +1,97 @@@
++# SymbolsHelper-Confirmed: 2.2.4 amd64
++libulfius.so.2.2 libulfius2.2 #MINVER#
++ u_free at Base 2.2.4
++ u_map_clean at Base 2.2.4
++ u_map_clean_enum at Base 2.2.4
++ u_map_clean_full at Base 2.2.4
++ u_map_copy at Base 2.2.4
++ u_map_copy_into at Base 2.2.4
++ u_map_count at Base 2.2.4
++ u_map_empty at Base 2.2.4
++ u_map_enum_keys at Base 2.2.4
++ u_map_enum_values at Base 2.2.4
++ u_map_get at Base 2.2.4
++ u_map_get_case at Base 2.2.4
++ u_map_get_case_length at Base 2.2.4
++ u_map_get_length at Base 2.2.4
++ u_map_has_key at Base 2.2.4
++ u_map_has_key_case at Base 2.2.4
++ u_map_has_value at Base 2.2.4
++ u_map_has_value_binary at Base 2.2.4
++ u_map_has_value_case at Base 2.2.4
++ u_map_init at Base 2.2.4
++ u_map_put at Base 2.2.4
++ u_map_put_binary at Base 2.2.4
++ u_map_remove_at at Base 2.2.4
++ u_map_remove_from_key at Base 2.2.4
++ u_map_remove_from_key_case at Base 2.2.4
++ u_map_remove_from_value at Base 2.2.4
++ u_map_remove_from_value_binary at Base 2.2.4
++ u_map_remove_from_value_case at Base 2.2.4
++ ulfius_add_cookie_to_response at Base 2.2.4
++ ulfius_add_endpoint at Base 2.2.4
++ ulfius_add_endpoint_by_val at Base 2.2.4
++ ulfius_add_endpoint_list at Base 2.2.4
++ ulfius_add_header_to_response at Base 2.2.4
++ ulfius_check_list_match at Base 2.2.4
++ ulfius_clean_cookie at Base 2.2.4
++ ulfius_clean_endpoint at Base 2.2.4
++ ulfius_clean_endpoint_list at Base 2.2.4
++ ulfius_clean_instance at Base 2.2.4
++ ulfius_clean_request at Base 2.2.4
++ ulfius_clean_request_full at Base 2.2.4
++ ulfius_clean_response at Base 2.2.4
++ ulfius_clean_response_full at Base 2.2.4
++ ulfius_clear_websocket at Base 2.2.4
++ ulfius_clear_websocket_manager at Base 2.2.4
++ ulfius_clear_websocket_message at Base 2.2.4
++ ulfius_clear_websocket_message_list at Base 2.2.4
++ ulfius_close_websocket at Base 2.2.4
++ ulfius_copy_cookie at Base 2.2.4
++ ulfius_copy_endpoint at Base 2.2.4
++ ulfius_copy_response at Base 2.2.4
++ ulfius_duplicate_endpoint_list at Base 2.2.4
++ ulfius_duplicate_request at Base 2.2.4
++ ulfius_duplicate_response at Base 2.2.4
++ ulfius_empty_endpoint at Base 2.2.4
++ ulfius_endpoint_match at Base 2.2.4
++ ulfius_equals_endpoints at Base 2.2.4
++ ulfius_generate_handshake_answer at Base 2.2.4
++ ulfius_get_json_body_request at Base 2.2.4
++ ulfius_get_json_body_response at Base 2.2.4
++ ulfius_init_instance at Base 2.2.4
++ ulfius_init_request at Base 2.2.4
++ ulfius_init_response at Base 2.2.4
++ ulfius_init_websocket_message_list at Base 2.2.4
++ ulfius_instance_add_websocket_active at Base 2.2.4
++ ulfius_instance_remove_websocket_active at Base 2.2.4
++ ulfius_parse_url at Base 2.2.4
++ ulfius_push_websocket_message at Base 2.2.4
++ ulfius_read_incoming_message at Base 2.2.4
++ ulfius_remove_endpoint at Base 2.2.4
++ ulfius_remove_endpoint_by_val at Base 2.2.4
++ ulfius_send_http_request at Base 2.2.4
++ ulfius_send_http_streaming_request at Base 2.2.4
++ ulfius_send_smtp_email at Base 2.2.4
++ ulfius_set_binary_body_response at Base 2.2.4
++ ulfius_set_default_endpoint at Base 2.2.4
++ ulfius_set_empty_body_response at Base 2.2.4
++ ulfius_set_json_body_request at Base 2.2.4
++ ulfius_set_json_body_response at Base 2.2.4
++ ulfius_set_response_cookie at Base 2.2.4
++ ulfius_set_response_header at Base 2.2.4
++ ulfius_set_stream_response at Base 2.2.4
++ ulfius_set_string_body_response at Base 2.2.4
++ ulfius_set_upload_file_callback_function at Base 2.2.4
++ ulfius_set_websocket_response at Base 2.2.4
++ ulfius_start_framework at Base 2.2.4
++ ulfius_start_secure_framework at Base 2.2.4
++ ulfius_start_websocket_cb at Base 2.2.4
++ ulfius_stop_framework at Base 2.2.4
++ ulfius_thread_websocket at Base 2.2.4
++ ulfius_thread_websocket_manager_run at Base 2.2.4
++ ulfius_websocket_pop_first_message at Base 2.2.4
++ ulfius_websocket_recv_all at Base 2.2.4
++ ulfius_websocket_send_all at Base 2.2.4
++ ulfius_websocket_send_message at Base 2.2.4
++ ulfius_websocket_send_message_nolock at Base 2.2.4
diff --cc debian/patches/hardening.patch
index c99d87d,0000000..b0f81f0
mode 100644,000000..100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@@ -1,26 -1,0 +1,30 @@@
+Description: add hardening flags
+Author: Thorsten Alteholz <debian at alteholz.de>
- Index: ulfius-2.2/src/Makefile
++Index: ulfius-2.2.4/src/Makefile
+===================================================================
- --- ulfius-2.2.orig/src/Makefile 2017-11-21 13:56:58.965611341 +0100
- +++ ulfius-2.2/src/Makefile 2017-11-21 13:56:58.961611163 +0100
- @@ -23,8 +23,8 @@
++--- ulfius-2.2.4.orig/src/Makefile 2018-01-26 15:04:25.839868943 +0100
+++++ ulfius-2.2.4/src/Makefile 2018-01-26 15:05:01.291868995 +0100
++@@ -23,10 +23,11 @@
+ LIBYDER_LOCATION=../lib/yder/src
+ PREFIX=/usr/local
+ CC=gcc
+-CFLAGS=-c -pedantic -std=gnu99 -fPIC -Wall -D_REENTRANT -I$(PREFIX)/include -I$(LIBORCANIA_LOCATION) -I$(LIBYDER_LOCATION) $(ADDITIONALFLAGS) $(JANSSONFLAG) $(CURLFLAG) $(WEBSOCKETFLAG)
+-LIBS=-L$(PREFIX)/lib -L$(LIBORCANIA_LOCATION) -L$(LIBYDER_LOCATION) -lc -lmicrohttpd -lyder -lorcania -lpthread
++CFLAGS+=-c -pedantic -std=gnu99 -fPIC -Wall -D_REENTRANT -I$(PREFIX)/include -I$(LIBORCANIA_LOCATION) -I$(LIBYDER_LOCATION) $(ADDITIONALFLAGS) $(JANSSONFLAG) $(CURLFLAG) $(WEBSOCKETFLAG) $(CPPFLAGS)
++LIBS=-L$(PREFIX)/lib -L$(LIBORCANIA_LOCATION) -L$(LIBYDER_LOCATION) -lc -lmicrohttpd -lyder -lorcania -lpthread $(LDFLAGS)
+ OUTPUT=libulfius.so
- VERSION=2.2
++-VERSION=2.2.4
+++#VERSION=2.2.4
+++VERSION=2.2
+
- @@ -43,7 +43,7 @@
++ ifndef JANSSONFLAG
++ LJANSSON=-ljansson
++@@ -43,7 +44,7 @@
+ all: release
+
+ libulfius.so: ulfius.o u_map.o u_request.o u_response.o u_send_request.o u_websocket.o
+- $(CC) -shared -Wl,-soname,$(OUTPUT) -o $(OUTPUT).$(VERSION) ulfius.o u_map.o u_request.o u_response.o u_send_request.o u_websocket.o $(LIBS) $(LJANSSON) $(LCURL) $(LWEBSOCKET)
++ $(CC) -shared -Wl,-soname,$(OUTPUT).$(VERSION) -o $(OUTPUT).$(VERSION) ulfius.o u_map.o u_request.o u_response.o u_send_request.o u_websocket.o $(LIBS) $(LJANSSON) $(LCURL) $(LWEBSOCKET)
+ ln -sf $(OUTPUT).$(VERSION) $(OUTPUT)
+
+ libulfius.a: ulfius.o u_map.o u_request.o u_response.o u_send_request.o u_websocket.o
diff --cc debian/patches/series
index 56c0d40,0000000..40ccbbe
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,2 @@@
- #hardening.patch
+use-lib.patch
+hardening.patch
diff --cc debian/patches/use-lib.patch
index 4817821,0000000..9f37674
mode 100644,000000..100644
--- a/debian/patches/use-lib.patch
+++ b/debian/patches/use-lib.patch
@@@ -1,17 -1,0 +1,17 @@@
+Description: use packaged libraries instead of git submodules
+Author: Thorsten Alteholz <debian at alteholz.de>
- Index: ulfius-2.1.0/Makefile
++Index: ulfius-2.2.4/Makefile
+===================================================================
- --- ulfius-2.1.0.orig/Makefile 2017-06-07 02:08:13.000000000 +0200
- +++ ulfius-2.1.0/Makefile 2017-07-18 16:06:00.382831536 +0200
++--- ulfius-2.2.4.orig/Makefile 2018-01-26 15:03:34.279868866 +0100
+++++ ulfius-2.2.4/Makefile 2018-01-26 15:03:34.275868866 +0100
+@@ -37,8 +37,8 @@
+ cd $(LIBULFIUS_LOCATION) && $(MAKE) debug $(ADD_JANSSONFLAG) $(ADD_CURLFLAG) $(ADD_WEBSOCKETFLAG)
+
+ clean:
+- cd $(LIBORCANIA_LOCATION) && $(MAKE) clean
+- cd $(LIBYDER_LOCATION) && $(MAKE) clean
++ #cd $(LIBORCANIA_LOCATION) && $(MAKE) clean
++ #cd $(LIBYDER_LOCATION) && $(MAKE) clean
+ cd $(LIBULFIUS_LOCATION) && $(MAKE) clean
+ cd $(EXAMPLES_LOCATION) && $(MAKE) clean
+ cd $(TESTS_LOCATION) && $(MAKE) clean
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/ulfius.git
More information about the Debian-iot-packaging
mailing list