[Python-apps-commits] r5861 - in packages/pyrit/trunk/debian/patches (1 file)

[chrisk-guest at users.alioth.debian.org]

    Date: Tuesday, July 20, 2010 @ 18:05:11
  Author: chrisk-guest
Revision: 5861

Refresh patch with newer licensing information from upstream

Modified:
  packages/pyrit/trunk/debian/patches/0001-Add-licensing-updates-from-upstream.patch

Modified: packages/pyrit/trunk/debian/patches/0001-Add-licensing-updates-from-upstream.patch
===================================================================
--- packages/pyrit/trunk/debian/patches/0001-Add-licensing-updates-from-upstream.patch	2010-07-20 18:00:01 UTC (rev 5860)
+++ packages/pyrit/trunk/debian/patches/0001-Add-licensing-updates-from-upstream.patch	2010-07-20 18:05:11 UTC (rev 5861)
@@ -5,6 +5,9 @@
 Upstream has added a linking exception for OpenSSL in SVN. Upstream has
 authorized me to add this exception to the current version 0.3.0.
 
+Upstream has also re-confirmed GPLv3 + OpenSSL linking exception with the
+original authors of the SSE2 SHA1 implementation.
+
 Origin: upstream, http://code.google.com/p/pyrit/source/detail?r=257
 Applied-Upstream: 0.3.1
 Last-Update: 2010-05-19
@@ -12,10 +15,10 @@
  cpyrit/_cpyrit_cpu.c |   11 +++++++++++
  1 files changed, 11 insertions(+), 0 deletions(-)
 
-diff --git a/cpyrit/_cpyrit_cpu.c b/cpyrit/_cpyrit_cpu.c
-index b082b74..63a0008 100644
---- a/cpyrit/_cpyrit_cpu.c
-+++ b/cpyrit/_cpyrit_cpu.c
+Index: pyrit-0.3.0/cpyrit/_cpyrit_cpu.c
+===================================================================
+--- pyrit-0.3.0.orig/cpyrit/_cpyrit_cpu.c	2010-07-20 20:01:36.890037459 +0200
++++ pyrit-0.3.0/cpyrit/_cpyrit_cpu.c	2010-07-20 20:01:38.766037895 +0200
 @@ -16,6 +16,17 @@
  #
  #    You should have received a copy of the GNU General Public License
@@ -34,4 +37,38 @@
  */
  
  #include <Python.h>
--- 
+Index: pyrit-0.3.0/cpyrit/_cpyrit_cpu_sse2.S
+===================================================================
+--- pyrit-0.3.0.orig/cpyrit/_cpyrit_cpu_sse2.S	2010-07-20 20:01:51.426037219 +0200
++++ pyrit-0.3.0/cpyrit/_cpyrit_cpu_sse2.S	2010-07-20 20:02:04.418052139 +0200
+@@ -2,8 +2,10 @@
+ #
+ #    Copyright 2009-2010, Lukas Lueg, lukas.lueg at gmail.com
+ #    
+-#    SHA-1 SSE2 Copyright 2008, 2009, Alvaro Salmador, naplam33 at msn.com
+-#    ported from SHA-1 MMX by Simon Marechal, simon at banquise.net
++#    SHA-1 SSE2 Copyright 2008, 2009, Alvaro Salmador, naplam33 at msn.com,
++#    included here with permission, under the licensing terms specified below.
++#    ported from SHA-1 MMX by Simon Marechal, simon at banquise.net,
++#    included here with permission, under the licensing terms specified below.
+ #
+ #    This file is part of Pyrit.
+ #
+@@ -19,6 +21,17 @@
+ #
+ #    You should have received a copy of the GNU General Public License
+ #    along with Pyrit.  If not, see <http://www.gnu.org/licenses/>.
++#
++#    Additional permission under GNU GPL version 3 section 7
++#
++#    If you modify this Program, or any covered work, by linking or
++#    combining it with the OpenSSL project's "OpenSSL" library (or a
++#    modified version of that library), containing parts covered by
++#    the terms of OpenSSL/SSLeay license, the licensors of this
++#    Program grant you additional permission to convey the resulting
++#    work. Corresponding Source for a non-source form of such a
++#    combination shall include the source code for the parts of the
++#    OpenSSL library used as well as that of the covered work.
+ */
+ 
+ #include "_cpyrit_cpu.h"