[Debian-iot-packaging] [libjwt] 02/02: Import Debian changes 1.9.0-1
Thorsten Alteholz
alteholz at moszumanska.debian.org
Sat Jan 27 18:57:41 UTC 2018
This is an automated email from the git hooks/post-receive script.
alteholz pushed a commit to branch master
in repository libjwt.
commit 511860173e855f617356ae35cb29764e6a8e9c4b
Merge: 9238f79 750e80c
Author: Thorsten Alteholz <debian at alteholz.de>
Date: Sat Jan 27 19:31:04 2018 +0100
Import Debian changes 1.9.0-1
libjwt (1.9.0-1) unstable; urgency=medium
* New upstream release
* debian/control: use dh11
* debian/control: bump standard to 4.1.3 (no changes)
CMakeLists.txt | 67 +++++
MPL-2.0 | 373 +++++++++++++++++++++++++++
README.md | 4 +-
cmake/FindCheck.cmake | 56 +++++
cmake/FindJansson.cmake | 27 ++
configure.ac | 2 +-
debian/changelog | 8 +
debian/compat | 2 +-
debian/control | 13 +-
debian/patches/use-b64.patch | 46 ++--
doxygen.cfg | 2 +-
images/LibJWT.svg | 588 +++++++++++++++++++++++++++++++++++++++++++
include/jwt.h | 148 ++++++++---
libjwt/CMakeLists.txt | 92 +++++++
libjwt/Makefile.am | 2 +-
libjwt/jwt-gnutls.c | 16 +-
libjwt/jwt-openssl.c | 22 +-
libjwt/jwt-private.h | 16 +-
libjwt/jwt.c | 123 +++++----
m4/ax_code_coverage.m4 | 5 +-
tests/CMakeLists.txt | 20 ++
tests/jwt_grant.c | 59 +++++
22 files changed, 1536 insertions(+), 155 deletions(-)
diff --cc debian/changelog
index bd7bedf,0000000..b3d366f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,0 +1,21 @@@
++libjwt (1.9.0-1) unstable; urgency=medium
++
++ * New upstream release
++ * debian/control: use dh11
++ * debian/control: bump standard to 4.1.3 (no changes)
++
++ -- Thorsten Alteholz <debian at alteholz.de> Sat, 27 Jan 2018 19:31:04 +0100
++
+libjwt (1.8.0+dfsg-2) unstable; urgency=medium
+
+ * 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 20:32:33 +0200
+
+libjwt (1.8.0+dfsg-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 1a67d2e,0000000..1b2bf61
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,40 -1,0 +1,41 @@@
+Source: libjwt
+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)
+ , pkg-config
+ , libjansson-dev
+ , libssl-dev
+ , libb64-dev
+ , check
+# , gnutls-dev
- Standards-Version: 4.1.0
++Standards-Version: 4.1.3
+Homepage: https://github.com/benmcollins/libjwt
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-iot/libjwt.git
+Vcs-Git: https://anonscm.debian.org/git/debian-iot/libjwt.git
+
+Package: libjwt0
++Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: C library to handle JWT (JSON Web Token)
- libjwt is a library which allows you to encode and decode
++ libjwt is a library which allows you to encode and decode
+ JSON Web Tokens (JWT).
+ .
- JSON Web Tokens are an open, industry standard RFC 7519 method for
++ JSON Web Tokens are an open, industry standard RFC 7519 method for
+ representing claims securely between two parties.
+
+Package: libjwt-dev
+Architecture: any
+Section: libdevel
+Depends: libjwt0 (= ${binary:Version})
+ , ${misc:Depends}
+Description: C library to handle JWT (JSON Web Token) - development
- libjwt is a library which allows you to encode and decode
++ libjwt is a library which allows you to encode and decode
+ JSON Web Tokens (JWT).
+ .
- JSON Web Tokens are an open, industry standard RFC 7519 method for
++ JSON Web Tokens are an open, industry standard RFC 7519 method for
+ representing claims securely between two parties.
+ .
+ This package contains the development files.
diff --cc debian/patches/use-b64.patch
index 737a692,0000000..8cd941e
mode 100644,000000..100644
--- a/debian/patches/use-b64.patch
+++ b/debian/patches/use-b64.patch
@@@ -1,133 -1,0 +1,133 @@@
+Description: use the packaged libb64 in order to avoid license problems
+ with the base64.* files from Apple
+Author: Thorsten Alteholz <debian at alteholz.de>
- Index: libjwt-1.8.0/libjwt/Makefile.am
++Index: libjwt-1.9.0/libjwt/Makefile.am
+===================================================================
- --- libjwt-1.8.0.orig/libjwt/Makefile.am 2017-07-28 11:56:18.169637742 +0200
- +++ libjwt-1.8.0/libjwt/Makefile.am 2017-07-28 12:21:36.332466436 +0200
++--- libjwt-1.9.0.orig/libjwt/Makefile.am 2018-01-27 19:31:47.456020463 +0100
+++++ libjwt-1.9.0/libjwt/Makefile.am 2018-01-27 19:31:47.428020463 +0100
+@@ -1,6 +1,6 @@
+ lib_LTLIBRARIES = libjwt.la
+
+-libjwt_la_SOURCES = jwt.c base64.c
++libjwt_la_SOURCES = jwt.c
+
+ if HAVE_OPENSSL
+ libjwt_la_SOURCES += jwt-openssl.c
+@@ -11,8 +11,8 @@
+ # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
- libjwt_la_LDFLAGS = -version-info 3:1:3 $(OPENSSL_LDFLAGS) $(GNUTLS_LDFLAGS) $(JANSSON_LDFLAGS)
++ libjwt_la_LDFLAGS = -version-info 4:0:4 $(OPENSSL_LDFLAGS) $(GNUTLS_LDFLAGS) $(JANSSON_LDFLAGS)
+ libjwt_la_CPPFLAGS = -I$(top_srcdir)/include $(OPENSSL_INCLUDES) $(GNUTLS_INCLUDES) $(CODE_COVERAGE_CPPFLAGS) -Wall
+-libjwt_la_CFLAGS = $(JANSSON_CFLAGS) $(OPENSSL_CFLAGS) $(GNUTLS_CFLAGS) $(CODE_COVERAGE_CFLAGS)
+-libjwt_la_LIBADD = $(JANSSON_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(CODE_COVERAGE_LDFLAGS)
++libjwt_la_CFLAGS = $(B64_CFLAGS) $(JANSSON_CFLAGS) $(OPENSSL_CFLAGS) $(GNUTLS_CFLAGS) $(CODE_COVERAGE_CFLAGS)
++libjwt_la_LIBADD = $(B64_LIBS) $(JANSSON_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(CODE_COVERAGE_LDFLAGS)
+
+ pkgconfiglibdir = $(libdir)/pkgconfig
+ pkgconfiglib_DATA = libjwt.pc
- Index: libjwt-1.8.0/libjwt/jwt-gnutls.c
++Index: libjwt-1.9.0/libjwt/jwt-gnutls.c
+===================================================================
- --- libjwt-1.8.0.orig/libjwt/jwt-gnutls.c 2017-07-28 11:56:18.169637742 +0200
- +++ libjwt-1.8.0/libjwt/jwt-gnutls.c 2017-07-28 11:56:18.165637502 +0200
- @@ -27,7 +27,8 @@
++--- libjwt-1.9.0.orig/libjwt/jwt-gnutls.c 2018-01-27 19:31:47.456020463 +0100
+++++ libjwt-1.9.0/libjwt/jwt-gnutls.c 2018-01-27 19:31:47.428020463 +0100
++@@ -17,7 +17,8 @@
+ #include <jwt.h>
+
+ #include "jwt-private.h"
+-#include "base64.h"
++#include <b64/cencode.h>
++#include <b64/cdecode.h>
+ #include "config.h"
+
+ /* Workaround to use GnuTLS 3.5 EC signature encode/decode functions that
- Index: libjwt-1.8.0/libjwt/jwt.c
++Index: libjwt-1.9.0/libjwt/jwt.c
+===================================================================
- --- libjwt-1.8.0.orig/libjwt/jwt.c 2017-07-28 11:56:18.169637742 +0200
- +++ libjwt-1.8.0/libjwt/jwt.c 2017-07-28 14:13:18.673993727 +0200
- @@ -27,10 +27,47 @@
++--- libjwt-1.9.0.orig/libjwt/jwt.c 2018-01-27 19:31:47.456020463 +0100
+++++ libjwt-1.9.0/libjwt/jwt.c 2018-01-27 19:31:47.428020463 +0100
++@@ -11,10 +11,47 @@
+
+ #include <jwt.h>
+
++#include <b64/cencode.h>
++#include <b64/cdecode.h>
+ #include "jwt-private.h"
+-#include "base64.h"
+ #include "config.h"
+
++int jwt_Base64encode(char *coded_dst, const char *plain_src, int len_plain_src)
++{
++ base64_encodestate _state;
++ int _count, _i, _len;
++ char *_rp = coded_dst, *_wp = coded_dst;
++
++ base64_init_encodestate(&_state);
++ _count = base64_encode_block(plain_src, len_plain_src, coded_dst, &_state);
++ _count += base64_encode_blockend(coded_dst + _count, &_state);
++
++ /*
++ * the b64 library might insert \n after some chars,
++ * these must be removed again
++ * (at least in order to pass the tests)
++ */
++ _len=_count;
++ for (_i=0; _i<_len; _i++ ) {
++ if (*_rp != '\n') *_wp++=*_rp;
++ else _count--;
++ _rp++;
++ }
++ coded_dst[_count] = 0;
++
++ return _count;
++}
++
++int jwt_Base64decode(char *plain_dst, const char *coded_src)
++{
++ base64_decodestate _state;
++ int _count = 0;
++
++ base64_init_decodestate(&_state);
++ _count = base64_decode_block(coded_src, strlen(coded_src), plain_dst, &_state);
++
++ return _count;
++}
+
- static const char *jwt_alg_str(jwt_alg_t alg)
++ const char *jwt_alg_str(jwt_alg_t alg)
+ {
- Index: libjwt-1.8.0/libjwt/jwt-private.h
++Index: libjwt-1.9.0/libjwt/jwt-private.h
+===================================================================
- --- libjwt-1.8.0.orig/libjwt/jwt-private.h 2017-07-28 11:56:18.169637742 +0200
- +++ libjwt-1.8.0/libjwt/jwt-private.h 2017-07-28 11:56:18.165637502 +0200
- @@ -28,6 +28,9 @@
++--- libjwt-1.9.0.orig/libjwt/jwt-private.h 2018-01-27 19:31:47.456020463 +0100
+++++ libjwt-1.9.0/libjwt/jwt-private.h 2018-01-27 19:31:47.432020463 +0100
++@@ -18,6 +18,9 @@
+ };
+
+ /* Helper routines. */
++int jwt_Base64encode(char *coded_dst, const char *plain_src, int len_plain_src);
++int jwt_Base64decode(char *plain_dst, const char *coded_src);
++
+ void jwt_base64uri_encode(char *str);
+ void *jwt_b64_decode(const char *src, int *ret_len);
+
- Index: libjwt-1.8.0/configure.ac
++Index: libjwt-1.9.0/configure.ac
+===================================================================
- --- libjwt-1.8.0.orig/configure.ac 2017-05-31 04:38:10.000000000 +0200
- +++ libjwt-1.8.0/configure.ac 2017-07-28 12:14:27.422800063 +0200
++--- libjwt-1.9.0.orig/configure.ac 2018-01-27 19:31:47.456020463 +0100
+++++ libjwt-1.9.0/configure.ac 2018-01-27 19:31:47.432020463 +0100
+@@ -23,6 +23,11 @@
+ PKG_CHECK_MODULES([JANSSON], [jansson >= 2.0])
+ PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], [true], [true])
+
++AC_SUBST([B64_CFLAGS], [])
++AC_SUBST([B64_LIBS], [-lb64])
++# does not work
++#PKG_CHECK_MODULES([B64], [b64 >= 0.0])
++
+ AX_VALGRIND_CHECK
+
+ AX_CODE_COVERAGE
- Index: libjwt-1.8.0/libjwt/libjwt.pc.in
++Index: libjwt-1.9.0/libjwt/libjwt.pc.in
+===================================================================
- --- libjwt-1.8.0.orig/libjwt/libjwt.pc.in 2017-05-31 04:38:10.000000000 +0200
- +++ libjwt-1.8.0/libjwt/libjwt.pc.in 2017-07-28 12:09:36.201372656 +0200
++--- libjwt-1.9.0.orig/libjwt/libjwt.pc.in 2018-01-27 19:31:47.456020463 +0100
+++++ libjwt-1.9.0/libjwt/libjwt.pc.in 2018-01-27 19:31:47.432020463 +0100
+@@ -9,4 +9,4 @@
+
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -ljwt
+-Libs.private: @JANSSON_LIBS@ @OPENSSL_LIBS@
++Libs.private: @JANSSON_LIBS@ @OPENSSL_LIBS@ @B64_LIBS@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/libjwt.git
More information about the Debian-iot-packaging
mailing list