[Debian-iot-packaging] [orcania] 02/02: Import Debian changes 1.1-3
Thorsten Alteholz
alteholz at moszumanska.debian.org
Mon Aug 28 20:01:54 UTC 2017
This is an automated email from the git hooks/post-receive script.
alteholz pushed a commit to branch master
in repository orcania.
commit 5f3abe4221183d7c00a046c782694609fd7ef782
Author: Thorsten Alteholz <debian at alteholz.de>
Date: Tue Aug 1 20:17:33 2017 +0200
Import Debian changes 1.1-3
orcania (1.1-3) unstable; urgency=medium
* fix strnstr issue on non-linux (Closes: #869747)
(thanks to Pino Toscano for the patch)
orcania (1.1-2) unstable; urgency=medium
* update dependencies
orcania (1.1-1) unstable; urgency=medium
* Initial release
---
debian/changelog | 18 +++++
debian/compat | 1 +
debian/control | 34 ++++++++
debian/copyright | 103 ++++++++++++++++++++++++
debian/liborcania-dev.install | 2 +
debian/liborcania1.1.install | 1 +
debian/patches/hardening.patch | 37 +++++++++
debian/patches/series | 2 +
debian/patches/strnstr-issue-on-non-linux.patch | 20 +++++
debian/rules | 16 ++++
debian/source/format | 1 +
debian/watch | 6 ++
12 files changed, 241 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..6fdb738
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,18 @@
+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 --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..f599e28
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..8911224
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,34 @@
+Source: orcania
+Section: devel
+Priority: optional
+Maintainer: Thorsten Alteholz <debian at alteholz.de>
+Build-Depends: debhelper (>= 10)
+ , libjansson-dev
+Standards-Version: 4.0.0
+Homepage: https://github.com/babelouest/orcania
+#Vcs-Git: https://anonscm.debian.org/collab-maint/oauth2-server.git
+#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/oauth2-server.git
+
+Package: liborcania1.1
+Architecture: any
+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
+ 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
+ between other projects
+ .
+ Basically these are used for other programs in the anghard project.
+ .
+ This package contains the development files.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..63fb059
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,103 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: yder
+Source: https://github.com/babelouest/orcania
+
+Files: *
+Copyright: 2017 Nicolas Mora
+License: LGPL-2.1
+
+Files: src/base64.c
+Copyright: 2017, Nicolas Mora <mail at babelouest.org>
+ 2005-2011, Jouni Malinen <j at w1.fi>
+License: BSD-3
+Comment: license text obtained from wpa also done by Jouni Malinen
+
+Files: src/memory.c
+Copyright: 2017 Nicolas Mora <mail at babelouest.org>
+ 2009-2014 Petri Lehtinen <petri at digip.org>
+ 2011-2012 Basile Starynkevitch <basile at starynkevitch.net>
+License: LGPL-2.1
+Comment: derived from jansson memory.c which was under Expat
+
+Files: test/*.c
+Copyright: 2017 nobody
+License: public-domain
+
+Files: Makefile
+Copyright: 2017 Nicolas Mora
+License: Expat
+
+Files: debian/*
+Copyright: 2017 Thorsten Alteholz <debian at alteholz.de>
+License: LGPL-2.1
+
+License: LGPL-2.1
+ Permission to use and copy is granted subject to the terms of the "GNU
+ Lesser General Public License" (LGPL) as published by the Free Software
+ Foundation; version 2.1 of the License
+ .
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+License-Comment:
+ On Debian GNU systems, the complete text of the GNU Lesser General
+ Public License (LGPL) version 2.1 is available at
+ '/usr/share/common-licenses/LGPL-2.1'.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this program. If not, see
+ <http://www.gnu.org/licenses/>.
+
+License: public-domain
+ Public domain, no copyright. Use at your own risk.
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation files
+ (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+License: BSD-3
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ 3. Neither the name(s) of the above-listed copyright holder(s) nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/debian/liborcania-dev.install b/debian/liborcania-dev.install
new file mode 100644
index 0000000..0a76f2a
--- /dev/null
+++ b/debian/liborcania-dev.install
@@ -0,0 +1,2 @@
+src/orcania.h usr/include
+src/lib*.so usr/lib
diff --git a/debian/liborcania1.1.install b/debian/liborcania1.1.install
new file mode 100644
index 0000000..6ac0115
--- /dev/null
+++ b/debian/liborcania1.1.install
@@ -0,0 +1 @@
+src/lib*.so.* usr/lib
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..cc41825
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,37 @@
+Description: add hardening flags to library
+Author: Thorsten Alteholz <debian at alteholz.de>
+Index: orcania-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 @@
+ #
+ 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 @@
+ 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)
+
+ 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).*
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fc1bbaf
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+hardening.patch
+strnstr-issue-on-non-linux.patch
diff --git a/debian/patches/strnstr-issue-on-non-linux.patch b/debian/patches/strnstr-issue-on-non-linux.patch
new file mode 100644
index 0000000..604e5d9
--- /dev/null
+++ b/debian/patches/strnstr-issue-on-non-linux.patch
@@ -0,0 +1,20 @@
+Description: liborcania-dev's definition of strnstr is conditional on
+ __linux__, so builds for the Hurd and kFreeBSD wind up
+ with compile-time warnings and undefined references, making
+ hoel FTBFS there
+Author: Pino Toscano <pino at debian.org>
+Index: orcania-1.1/src/orcania.c
+===================================================================
+--- orcania-1.1.orig/src/orcania.c 2017-08-02 13:54:20.955555988 +0200
++++ orcania-1.1/src/orcania.c 2017-08-02 13:54:20.947555507 +0200
+@@ -245,8 +245,8 @@
+ }
+ }
+
+-#ifdef __linux__
+-char *strnstr(const char *haystack, const char *needle, size_t len) {
++#if defined(__linux__) || defined(__GLIBC__)
++static char *strnstr(const char *haystack, const char *needle, size_t len) {
+ int i;
+ size_t needle_len;
+
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..8422f60
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+#export DH_VERBOSE = 1
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+# see ENVIRONMENT in dpkg-buildflags(1)
+# package maintainers to append CFLAGS
+#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
+# package maintainers to append LDFLAGS
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
+%:
+ dh $@
+
+override_dh_auto_install:
+ echo "dh_auto_install"
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..3ec975b
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,6 @@
+version=4
+
+# https://github.com/babelouest/orcania
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%orcania-$1.tar.gz%" \
+ https://github.com/babelouest/orcania/tags \
+ (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/orcania.git
More information about the Debian-iot-packaging
mailing list