[Debian-iot-packaging] [ulfius] 02/02: Import Debian changes 2.2-1
Thorsten Alteholz
alteholz at moszumanska.debian.org
Thu Nov 23 21:35:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
alteholz pushed a commit to branch master
in repository ulfius.
commit 7745056159a4a2b9feca0c3c07d10ee2597dff8e
Merge: 60cfe23 11520ac
Author: Thorsten Alteholz <debian at alteholz.de>
Date: Tue Nov 21 18:56:19 2017 +0100
Import Debian changes 2.2-1
ulfius (2.2-1) unstable; urgency=medium
* New upstream release
* debian/control: bump standard, no changes
* debian/control: handle SONAME bump
.gitignore | 9 +-
API.md | 45 ++++++++-
INSTALL.md | 52 +++++++++-
README.md | 10 +-
debian/changelog | 8 ++
debian/control | 19 ++--
.../{libulfius2.1.install => libulfius2.2.install} | 0
debian/patches/hardening.patch | 10 +-
example_programs/sheep_counter/sheep_counter.c | 38 +++++++-
example_programs/sheep_counter/static/upload.html | 6 +-
example_programs/simple_example/Makefile | 5 +-
example_programs/simple_example/README.md | 8 ++
src/Makefile | 29 ++++--
src/u_map.c | 4 +-
src/u_request.c | 2 +-
src/u_response.c | 6 +-
src/ulfius.c | 108 ++++++++++++++++-----
src/ulfius.h | 48 ++++++++-
18 files changed, 333 insertions(+), 74 deletions(-)
diff --cc debian/changelog
index 2575f84,0000000..3fe4e0d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,0 +1,22 @@@
++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/control
index c2b2057,0000000..67dfaf6
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,47 -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)
+ , libmicrohttpd-dev
+ , libcurl4-gnutls-dev
+ , libjansson-dev
+ , liborcania-dev
+ , libyder-dev
- Standards-Version: 4.1.0
++Standards-Version: 4.1.1
+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.1
++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
++ 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
++ 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
++ One can create webservices in HTTP or HTTPS mode, stream data, or
+ implement server websockets.
+
+Package: libulfius-dev
+Architecture: any
+Section: libdevel
- Depends: libulfius2.1 (= ${binary:Version})
++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
++ 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
++ 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
++ 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.install
index 6ac0115,0000000..6ac0115
mode 100644,000000..100644
--- a/debian/libulfius2.2.install
+++ b/debian/libulfius2.2.install
diff --cc debian/patches/hardening.patch
index 9e02d0f,0000000..c99d87d
mode 100644,000000..100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@@ -1,26 -1,0 +1,26 @@@
+Description: add hardening flags
+Author: Thorsten Alteholz <debian at alteholz.de>
- Index: ulfius-2.1.2/src/Makefile
++Index: ulfius-2.2/src/Makefile
+===================================================================
- --- ulfius-2.1.2.orig/src/Makefile 2017-09-03 19:10:21.838195583 +0200
- +++ ulfius-2.1.2/src/Makefile 2017-09-03 19:12:31.828013313 +0200
++--- 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 @@
+ 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.1
++ VERSION=2.2
+
+@@ -43,7 +43,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)
+
- ulfius.o: ulfius.h u_private.h ulfius.c
++ libulfius.a: ulfius.o u_map.o u_request.o u_response.o u_send_request.o u_websocket.o
--
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