[Debian-iot-packaging] [orcania] 02/02: Import Debian changes 1.1.1-1

Sat Jan 27 18:56:00 UTC 2018

This is an automated email from the git hooks/post-receive script.

alteholz pushed a commit to branch master
in repository orcania.

commit bb91ad131404754849eef430de0627e8ff998e6a
Merge: b13b9b5 3e29e95
Author: Thorsten Alteholz <debian at alteholz.de>
Date:   Thu Jan 25 19:44:08 2018 +0100

    Import Debian changes 1.1.1-1
    
    orcania (1.1.1-1) unstable; urgency=medium
    
      * New upstream release
      * debian/control: bump standard to 4.1.3 (no changes)
      * debian/control: use dh11

 .gitignore                     |  1 +
 README.md                      | 46 ++++++++++++++++++++++++++----
 debian/changelog               |  8 ++++++
 debian/compat                  |  2 +-
 debian/control                 |  9 +++---
 debian/liborcania1.1.symbols   | 35 +++++++++++++++++++++++
 debian/patches/hardening.patch | 23 +++++++++------
 debian/patches/series          |  2 +-
 src/Makefile                   | 28 ++++++++++++++----
 src/orcania.c                  | 65 +++++++++++++++++++++++++++++++++++++-----
 src/orcania.h                  | 19 ++++++++++--
 test/str_test.c                | 17 +++++++++--
 12 files changed, 219 insertions(+), 36 deletions(-)

diff --cc debian/changelog
index 9154f3b,0000000..01af01a
mode 100644,000000..100644

--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,0 +1,33 @@@
++orcania (1.1.1-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>  Thu, 25 Jan 2018 19:44:08 +0100
++
 +orcania (1.1-4) unstable; urgency=medium
 +
 +  * debian/control: bump standard to 4.1.0 (no changes)
 +  * debian/control: add VCS URLs
 +
 + -- Thorsten Alteholz <debian at alteholz.de>  Sat, 02 Sep 2017 17:26:33 +0200
 +
 +orcania (1.1-3) unstable; urgency=medium
 +
 +  * fix strnstr issue on non-linux (Closes: #869747)
 +    (thanks to Pino Toscano for the patch)
 +
 + -- Thorsten Alteholz <debian at alteholz.de>  Tue, 01 Aug 2017 20:17:33 +0200
 +
 +orcania (1.1-2) unstable; urgency=medium
 +
 +  * update dependencies
 +
 + -- Thorsten Alteholz <debian at alteholz.de>  Thu, 20 Jul 2017 19:23:33 +0200
 +
 +orcania (1.1-1) unstable; urgency=medium
 +
 +  * Initial release
 +
 + -- Thorsten Alteholz <debian at alteholz.de>  Tue, 18 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 eb4e243,0000000..b08c402
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,34 -1,0 +1,35 @@@
 +Source: orcania
 +Section: devel
 +Priority: optional
 +Maintainer: Thorsten Alteholz <debian at alteholz.de>
- Build-Depends: debhelper (>= 10)
++Build-Depends: debhelper (>= 11)
 +	, libjansson-dev
- Standards-Version: 4.1.0
++Standards-Version: 4.1.3
 +Homepage: https://github.com/babelouest/orcania
 +Vcs-Browser: https://anonscm.debian.org/cgit/debian-iot/orcania.git
 +Vcs-Git: https://anonscm.debian.org/git/debian-iot/orcania.git
 +
 +Package: liborcania1.1
 +Architecture: any
++Section: libs
 +Pre-Depends: ${misc:Pre-Depends}
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Description: library for angharad programs
-  Different functions for different purposes but that can be shared 
++ Different functions for different purposes but that can be shared
 + between other projects
 + .
 + Basically these are used for other programs in the anghard project.
 +
 +Package: liborcania-dev
 +Architecture: any
 +Section: libdevel
 +Depends: liborcania1.1 (= ${binary:Version})
 +	, ${misc:Depends}
 +	, libjansson-dev
 +Description: library for angharad programs, development files
-  Different functions for different purposes but that can be shared 
++ Different functions for different purposes but that can be shared
 + between other projects
 + .
 + Basically these are used for other programs in the anghard project.
 + .
 + This package contains the development files.
diff --cc debian/liborcania1.1.symbols
index 0000000,0000000..fffd7c6
new file mode 100644
--- /dev/null
+++ b/debian/liborcania1.1.symbols
@@@ -1,0 -1,0 +1,35 @@@
++# SymbolsHelper-Confirmed: 1.1 amd64
++liborcania.so.1.1 liborcania1.1 #MINVER#
++ check_result_value at Base 1.1
++ free_string_array at Base 1.1
++ json_search at Base 1.1
++ msprintf at Base 1.1
++ o_base64_decode at Base 1.1
++ o_base64_encode at Base 1.1
++ o_free at Base 1.1
++ o_get_alloc_funcs at Base 1.1
++ o_malloc at Base 1.1
++ o_realloc at Base 1.1
++ o_set_alloc_funcs at Base 1.1
++ o_strcasecmp at Base 1.1
++ o_strcasestr at Base 1.1
++ o_strchr at Base 1.1
++ o_strcmp at Base 1.1
++ o_strcpy at Base 1.1
++ o_strdup at Base 1.1
++ o_strlen at Base 1.1
++ o_strncasecmp at Base 1.1
++ o_strncmp at Base 1.1
++ o_strncpy at Base 1.1
++ o_strndup at Base 1.1
++ o_strnstr at Base 1.1
++ o_strrchr at Base 1.1
++ o_strstr at Base 1.1
++ split_string at Base 1.1
++ str_replace at Base 1.1
++ string_array_has_trimmed_value at Base 1.1
++ string_array_has_value at Base 1.1
++ string_array_has_value_case at Base 1.1
++ string_array_has_value_n at Base 1.1
++ string_array_has_value_ncase at Base 1.1
++ trimwhitespace at Base 1.1
diff --cc debian/patches/hardening.patch
index cc41825,0000000..f3afe7d
mode 100644,000000..100644
--- a/debian/patches/hardening.patch
+++ b/debian/patches/hardening.patch
@@@ -1,37 -1,0 +1,44 @@@
 +Description: add hardening flags to library
 +Author: Thorsten Alteholz <debian at alteholz.de>
- Index: orcania-1.1/src/Makefile
++Index: orcania-1.1.1/src/Makefile
 +===================================================================
- --- orcania-1.1.orig/src/Makefile	2017-05-22 15:28:47.000000000 +0200
- +++ orcania-1.1/src/Makefile	2017-07-18 15:30:50.152426007 +0200
- @@ -20,7 +20,7 @@
++--- orcania-1.1.1.orig/src/Makefile	2018-01-26 13:55:58.791862868 +0100
+++++ orcania-1.1.1/src/Makefile	2018-01-26 13:59:03.359863141 +0100
++@@ -20,9 +20,10 @@
 + #
 + PREFIX=/usr/local
 + CC=gcc
 +-CFLAGS=-c -fPIC -Wall -D_REENTRANT $(ADDITIONALFLAGS) $(JANSSONFLAG)
 ++CFLAGS+=-c -fPIC -Wall -D_REENTRANT $(ADDITIONALFLAGS) $(JANSSONFLAG)
-  LIBS=-lc -ljansson
 + OUTPUT=liborcania.so
-  VERSION=1.1
- @@ -32,17 +32,17 @@
++-VERSION=1.1.1
+++#XXX VERSION=1.1.1
+++VERSION=1.1
++ 
++ ifndef JANSSONFLAG
++ LJANSSON=-ljansson
++@@ -33,20 +34,20 @@
 + all: release
 + 
 + liborcania.so: memory.o orcania.o base64.o
 +-	$(CC) -shared -Wl,-soname,$(OUTPUT) -o $(OUTPUT).$(VERSION) orcania.o memory.o base64.o $(LIBS)
 ++	$(CC) -shared -Wl,-soname,$(OUTPUT).$(VERSION) -o $(OUTPUT).$(VERSION) orcania.o memory.o base64.o $(LIBS) $(LDFLAGS)
 + 	ln -sf $(OUTPUT).$(VERSION) $(OUTPUT)
 + 
++ liborcania.a: memory.o orcania.o base64.o
++ 	ar rcs liborcania.a memory.o orcania.o base64.o
++ 
 + orcania.o: orcania.h orcania.c
 +-	$(CC) $(CFLAGS) orcania.c
 ++	$(CC) $(CFLAGS) $(CPPFLAGS) orcania.c
 + 
 + memory.o: orcania.h memory.c
 +-	$(CC) $(CFLAGS) memory.c
 ++	$(CC) $(CFLAGS) $(CPPFLAGS) memory.c
 + 
 + base64.o: orcania.h base64.c
 +-	$(CC) $(CFLAGS) base64.c
 ++	$(CC) $(CFLAGS) $(CPPFLAGS) base64.c
 + 
 + clean:
-  	rm -f *.o *.so $(OUTPUT) $(OUTPUT).*
++ 	rm -f *.o *.so *.a $(OUTPUT) $(OUTPUT).*
diff --cc debian/patches/series
index fc1bbaf,0000000..0f0d8ae
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
 +hardening.patch
- strnstr-issue-on-non-linux.patch
++#applied upstream:   strnstr-issue-on-non-linux.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/orcania.git

