Resolve issue with ambiguous licenses
This resolves bz#862761 Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
This commit is contained in:
Jes Sorensen
parent
6e6b5143a1
commit
50f2b3362c
45
mdadm-3.2.5-Add-zlib-license-to-crc32.c.patch
Normal file
45
mdadm-3.2.5-Add-zlib-license-to-crc32.c.patch
Normal file
@ -0,0 +1,45 @@
|
||||
From 39fe768b8d9f3bd641f98029cb33f61f0c66841b Mon Sep 17 00:00:00 2001
|
||||
From: Jes Sorensen <Jes.Sorensen@redhat.com>
|
||||
Date: Wed, 3 Oct 2012 10:00:34 +0200
|
||||
Subject: [PATCH 2/2] Add zlib license to crc32.c
|
||||
|
||||
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
|
||||
Signed-off-by: NeilBrown <neilb@suse.de>
|
||||
---
|
||||
crc32.c | 20 ++++++++++++++++++++
|
||||
1 file changed, 20 insertions(+)
|
||||
|
||||
diff --git a/crc32.c b/crc32.c
|
||||
index 12d08e5..94fda06 100644
|
||||
--- a/crc32.c
|
||||
+++ b/crc32.c
|
||||
@@ -2,6 +2,26 @@
|
||||
* Copyright (C) 1995-2003 Mark Adler
|
||||
* For conditions of distribution and use, see copyright notice in zlib.h
|
||||
*
|
||||
+ * Note: zlib license from from zlib.h added explicitly as mdadm does
|
||||
+ * not include zlib.h. License from v1.2.2 of zlib:
|
||||
+ *
|
||||
+ * This software is provided 'as-is', without any express or implied
|
||||
+ * warranty. In no event will the authors be held liable for any damages
|
||||
+ * arising from the use of this software.
|
||||
+ *
|
||||
+ * Permission is granted to anyone to use this software for any purpose,
|
||||
+ * including commercial applications, and to alter it and redistribute it
|
||||
+ * freely, subject to the following restrictions:
|
||||
+ *
|
||||
+ * 1. The origin of this software must not be misrepresented; you must not
|
||||
+ * claim that you wrote the original software. If you use this software
|
||||
+ * in a product, an acknowledgment in the product documentation would be
|
||||
+ * appreciated but is not required.
|
||||
+ * 2. Altered source versions must be plainly marked as such, and must not be
|
||||
+ * misrepresented as being the original software.
|
||||
+ * 3. This notice may not be removed or altered from any source distribution.
|
||||
+ *
|
||||
+ *
|
||||
* Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
|
||||
* CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
|
||||
* tables for updating the shift register in one step with three exclusive-ors
|
||||
--
|
||||
1.7.11.4
|
||||
|
||||
39
mdadm-3.2.5-Replace-sha1.h-with-slightly-older-version.patch
Normal file
39
mdadm-3.2.5-Replace-sha1.h-with-slightly-older-version.patch
Normal file
@ -0,0 +1,39 @@
|
||||
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
|
||||
|
||||
10
mdadm.spec
10
mdadm.spec
@ -1,7 +1,7 @@
|
||||
Summary: The mdadm program controls Linux md devices (software RAID arrays)
|
||||
Name: mdadm
|
||||
Version: 3.2.5
|
||||
Release: 8%{?dist}
|
||||
Release: 9%{?dist}
|
||||
Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz
|
||||
Source1: mdmonitor.init
|
||||
Source2: raid-check
|
||||
@ -12,6 +12,8 @@ Source6: mdmonitor.service
|
||||
Source7: mdmonitor-takeover.service
|
||||
Source8: mdadm.conf
|
||||
Patch1: mdadm-3.2.5-imsm-fix-correct-checking-volume-s-degradation.patch
|
||||
Patch2: mdadm-3.2.5-Replace-sha1.h-with-slightly-older-version.patch
|
||||
Patch3: mdadm-3.2.5-Add-zlib-license-to-crc32.c.patch
|
||||
# Fedora customization patches
|
||||
Patch97: mdadm-3.2.3-udev.patch
|
||||
Patch98: mdadm-2.5.2-static.patch
|
||||
@ -51,6 +53,8 @@ is not used as the system init process.
|
||||
%setup -q
|
||||
|
||||
%patch1 -p1 -b .reshape
|
||||
%patch2 -p1 -b .shaver
|
||||
%patch3 -p1 -b .zlibver
|
||||
# Fedora customization patches
|
||||
%patch97 -p1 -b .udev
|
||||
%patch98 -p1 -b .static
|
||||
@ -122,6 +126,10 @@ rm -rf %{buildroot}
|
||||
%{_initrddir}/*
|
||||
|
||||
%changelog
|
||||
* Wed Oct 3 2012 Jes Sorensen <Jes.Sorensen@redhat.com> - 3.2.5-9
|
||||
- Resolve issue with ambiguous licenses
|
||||
- Resolves bz862761
|
||||
|
||||
* Mon Sep 10 2012 Jes Sorensen <Jes.Sorensen@redhat.com> - 3.2.5-8
|
||||
- Switch to using new systemd macros for F18+
|
||||
- Resolves bz850202
|
||||
|
||||
Loading…
Reference in New Issue
Block a user