Embed hiredis as it is broken literally everywhere

1 files changed, 32 insertions, 1 deletions

diff --git a/debian/copyright b/debian/copyright
index e8f675680..2acbb868e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -69,6 +69,11 @@ Copyright: 2001-2015 Dr Martin Porter
            2002-2015 Richard Boulton
 License: BSD-2-Clause
 
+Files: contrib/hiredis/*
+Copyright: 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
+           2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
+License: BSD-3-Clause-Redis
+
 Files: src/libutil/diff.c
 Copyright: 2004 Michael B. Allen <mba2000 ioplex.com>
            2010-2014 Vsevolod Stakhov <vsevolod@highsecure.ru>
@@ -110,7 +115,7 @@ Comment:
  The exact meaning of "Public domain" mentioned in the file headers was taken from:
  http://www.corpit.ru/mjt/tinycdb.html
 
-Files: src/libcryptobox/curve25519/*
+Files: src/libcryptobox/curve25519/curve25519-donna*
 Copyright: 2008, Google Inc.
 License: BSD-3-Clause-Google
 
@@ -238,6 +243,32 @@ License: BSD-3-Clause-Google
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+License: BSD-3-Clause-Redis
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ .
+ 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.
+ .
+ Neither the name of Redis 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.
+
 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