[Debian-iot-packaging] [ulfius] 02/02: Import Debian changes 2.1.2-1

Thorsten Alteholz alteholz at moszumanska.debian.org
Mon Sep 4 20:23:23 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 60cfe235d77c939109d9c549dce123bfbd4060fd
Merge: 52f12a7 45301cc
Author: Thorsten Alteholz <debian at alteholz.de>
Date:   Sun Sep 3 19:06:24 2017 +0200

    Import Debian changes 2.1.2-1
    
    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

 INSTALL.md                                         |  15 +
 README.md                                          |   3 +-
 debian/changelog                                   |   9 +
 debian/control                                     |   9 +-
 debian/patches/hardening.patch                     |  12 +-
 .../{hardening.patch => hardening.patch.old}       |   0
 example_programs/README.md                         |   2 +-
 src/Makefile                                       |  14 +-
 src/u_map.c                                        |   1 +
 src/u_private.h                                    | 169 ++++++++
 src/u_request.c                                    |  43 +-
 src/u_response.c                                   | 255 ++++++------
 src/u_send_request.c                               |   7 +-
 src/u_websocket.c                                  |   1 +
 src/ulfius.c                                       | 443 +++++++++++----------
 src/ulfius.h                                       | 234 +----------
 16 files changed, 608 insertions(+), 609 deletions(-)

diff --cc debian/changelog
index 9de3709,0000000..2575f84
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,0 +1,14 @@@
++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 02b9187,0000000..c2b2057
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,46 -1,0 +1,47 @@@
 +Source: ulfius
 +Section: devel
 +Priority: optional
- Maintainer: Thorsten Alteholz <debian at alteholz.de>
++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.0.0
++Standards-Version: 4.1.0
 +Homepage: https://github.com/babelouest/ulfius
- #Vcs-Git: https://anonscm.debian.org/collab-maint/oauth2-server.git
- #Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/oauth2-server.git
++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
 +Architecture: any
 +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.1 (= ${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/patches/hardening.patch
index 0a1e365,0000000..9e02d0f
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.0/src/Makefile
++Index: ulfius-2.1.2/src/Makefile
 +===================================================================
- --- ulfius-2.1.0.orig/src/Makefile	2017-06-07 02:08:13.000000000 +0200
- +++ ulfius-2.1.0/src/Makefile	2017-07-18 16:19:24.602963856 +0200
++--- 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
 +@@ -23,8 +23,8 @@
 + LIBYDER_LOCATION=../lib/yder/src
 + PREFIX=/usr/local
 + CC=gcc
- -CFLAGS=-c -fPIC -Wall -D_REENTRANT -I$(PREFIX)/include -I$(LIBORCANIA_LOCATION) -I$(LIBYDER_LOCATION) $(ADDITIONALFLAGS) $(JANSSONFLAG) $(CURLFLAG) $(WEBSOCKETFLAG)
++-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 -fPIC -Wall -D_REENTRANT -I$(PREFIX)/include -I$(LIBORCANIA_LOCATION) -I$(LIBYDER_LOCATION) $(ADDITIONALFLAGS) $(JANSSONFLAG) $(CURLFLAG) $(WEBSOCKETFLAG) $(CPPFLAGS)
+++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
 + 
 +@@ -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 ulfius.c
++ ulfius.o: ulfius.h u_private.h ulfius.c
diff --cc debian/patches/hardening.patch.old
index 0a1e365,0000000..0a1e365
mode 100644,000000..100644
--- a/debian/patches/hardening.patch.old
+++ b/debian/patches/hardening.patch.old

-- 
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