50f2b3362c
This resolves bz#862761 Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From c0e59ebcf91e43bdf3e1dbd69a59980655e3ac38 Mon Sep 17 00:00:00 2001
|
|
From: NeilBrown <neilb@suse.de>
|
|
Date: Wed, 3 Oct 2012 13:34:15 +1000
|
|
Subject: [PATCH 1/2] Replace sha1.h with slightly older version.
|
|
|
|
sha1.h claims GPL3+, while sha1.c claims GPL2+. This is
|
|
inconsistent and technically prevents the whole from being
|
|
distributed under GPL2.
|
|
So replace sha1.h with a version from the GCC sources from before
|
|
Tue Apr 20 08:36:39 2010
|
|
when the copyright notice was updated.
|
|
|
|
Reported-by: Jes Sorensen <Jes.Sorensen@redhat.com>
|
|
Signed-off-by: NeilBrown <neilb@suse.de>
|
|
---
|
|
sha1.h | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/sha1.h b/sha1.h
|
|
index a601d96..d9b07f8 100644
|
|
--- a/sha1.h
|
|
+++ b/sha1.h
|
|
@@ -1,11 +1,11 @@
|
|
/* Declarations of functions and data types used for SHA1 sum
|
|
library functions.
|
|
- Copyright (C) 2000, 2001, 2003, 2005, 2006, 2008, 2010
|
|
+ Copyright (C) 2000, 2001, 2003, 2005, 2006, 2008
|
|
Free Software Foundation, Inc.
|
|
|
|
This program is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by the
|
|
- Free Software Foundation; either version 3, or (at your option) any
|
|
+ Free Software Foundation; either version 2, or (at your option) any
|
|
later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
--
|
|
1.7.11.4
|
|
|