[Python-apps-commits] r5863 - in packages/pyrit/trunk/debian (3 files)

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

    Date: Tuesday, July 20, 2010 @ 18:47:21
  Author: chrisk-guest
Revision: 5863

Add patch including new licensing information from upstream

Added:
  packages/pyrit/trunk/debian/patches/0010-Add-SHA1-licensing-update-from-upstream.patch
Modified:
  packages/pyrit/trunk/debian/changelog
  packages/pyrit/trunk/debian/patches/series

Modified: packages/pyrit/trunk/debian/changelog
===================================================================
--- packages/pyrit/trunk/debian/changelog	2010-07-20 18:40:18 UTC (rev 5862)
+++ packages/pyrit/trunk/debian/changelog	2010-07-20 18:47:21 UTC (rev 5863)
@@ -11,5 +11,6 @@
     - 0007-add-option-to-limit-cores
     - 0008-disable-optimizations-on-i386.patch
     - 0009-exception-handling-fix.patch
+    - 0010-Add-SHA1-licensing-update-from-upstream
 
  -- Christian Kastner <debian at kvr.at>  Thu, 20 May 2010 14:43:26 +0200

Added: packages/pyrit/trunk/debian/patches/0010-Add-SHA1-licensing-update-from-upstream.patch
===================================================================
--- packages/pyrit/trunk/debian/patches/0010-Add-SHA1-licensing-update-from-upstream.patch	                        (rev 0)
+++ packages/pyrit/trunk/debian/patches/0010-Add-SHA1-licensing-update-from-upstream.patch	2010-07-20 18:47:21 UTC (rev 5863)
@@ -0,0 +1,46 @@
+From: Christian Kastner <debian at kvr.at>
+Date: Tue, 20 Jul 2010 20:43:28 +0200
+Subject: [PATCH] Add SSE2-SHA1 licensing update from upstream
+
+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=269
+Applied-Upstream: 0.3.1
+Last-Update: 2010-07-20
+
+Index: pyrit-0.3.0/cpyrit/_cpyrit_cpu_sse2.S
+===================================================================
+--- pyrit-0.3.0.orig/cpyrit/_cpyrit_cpu_sse2.S	2010-07-20 20:42:16.402033612 +0200
++++ pyrit-0.3.0/cpyrit/_cpyrit_cpu_sse2.S	2010-07-20 20:42:28.186041128 +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"

Modified: packages/pyrit/trunk/debian/patches/series
===================================================================
--- packages/pyrit/trunk/debian/patches/series	2010-07-20 18:40:18 UTC (rev 5862)
+++ packages/pyrit/trunk/debian/patches/series	2010-07-20 18:47:21 UTC (rev 5863)
@@ -7,3 +7,4 @@
 0007-add-option-to-limit-cores.patch
 0008-disable-optimizations-on-i386.patch
 0009-exception-handling-fix.patch
+0010-Add-SHA1-licensing-update-from-upstream.patch