clarify license on mt19937db.c

This commit is contained in:
Tom Callaway 2013-05-09 11:33:30 -04:00
parent 4f47614117
commit 48b49cd9f0
2 changed files with 57 additions and 1 deletions

View File

@ -0,0 +1,49 @@
Description: mt19937db.c license should include the GPL
This file is distributed from upstream Berkeley DB under the Artistic
License (no version specified), althouth it was later released by the
original author under both GPL2+ and BSD.
.
References:
http://web.archive.org/web/20010806225716/http://www.math.keio.ac.jp/matumoto/mt19937int.c
http://web.archive.org/web/20130127064020/http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/CODES/mt19937ar.c
https://bugzilla.redhat.com/show_bug.cgi?format=multiple&id=886838
https://lists.nongnu.org/archive/html/gnu-linux-libre/2010-05/msg00000.html
.
Author: Ruben Rodriguez <ruben@trisquel.info>
--- db-5.3.21/src/crypto/mersenne/mt19937db.c.licensefix
+++ db-5.3.21/src/crypto/mersenne/mt19937db.c
@@ -16,16 +16,27 @@
/* Coded by Takuji Nishimura, considering the suggestions by */
/* Topher Cooper and Marc Rieffel in July-Aug. 1997. */
-/* This library is free software under the Artistic license: */
-/* see the file COPYING distributed together with this code. */
-/* For the verification of the code, its output sequence file */
-/* mt19937int.out is attached (2001/4/2) */
-
/* Copyright (C) 1997, 1999 Makoto Matsumoto and Takuji Nishimura. */
/* Any feedback is very welcome. For any question, comments, */
/* see http://www.math.keio.ac.jp/matumoto/emt.html or email */
/* matumoto@math.keio.ac.jp */
+/* This library is free software; you can redistribute it and/or */
+/* modify it under the terms of the GNU Library General Public */
+/* License as published by the Free Software Foundation; either */
+/* version 2 of the License, or (at your option) any later */
+/* version. */
+/* This library is distributed in the hope that it will be useful, */
+/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
+/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */
+/* See the GNU Library General Public License for more details. */
+/* You should have received a copy of the GNU Library General */
+/* Public License along with this library; if not, write to the */
+/* Free Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA */
+/* 02111-1307 USA */
+
+/* This library is free software under the Artistic license: */
+
/* REFERENCE */
/* M. Matsumoto and T. Nishimura, */
/* "Mersenne Twister: A 623-Dimensionally Equidistributed Uniform */

View File

@ -4,7 +4,7 @@
Summary: The Berkeley DB database library for C Summary: The Berkeley DB database library for C
Name: libdb Name: libdb
Version: 5.3.21 Version: 5.3.21
Release: 9%{?dist} Release: 10%{?dist}
Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz
Patch0: libdb-multiarch.patch Patch0: libdb-multiarch.patch
@ -17,6 +17,9 @@ Patch13: http://www.oracle.com/technology/products/berkeley-db/db/update/1.85/pa
Patch20: db-1.85-errno.patch Patch20: db-1.85-errno.patch
Patch22: db-4.6.21-1.85-compat.patch Patch22: db-4.6.21-1.85-compat.patch
Patch24: db-4.5.20-jni-include-dir.patch Patch24: db-4.5.20-jni-include-dir.patch
# License clarification patch
# http://devel.trisquel.info/gitweb/?p=package-helpers.git;a=blob;f=helpers/DATA/db4.8/007-mt19937db.c_license.patch;h=1036db4d337ce4c60984380b89afcaa63b2ef88f;hb=df48d40d3544088338759e8bea2e7f832a564d48
Patch25: 007-mt19937db.c_license.patch
URL: http://www.oracle.com/database/berkeley-db/ URL: http://www.oracle.com/database/berkeley-db/
License: BSD and LGPLv2 License: BSD and LGPLv2
Group: System Environment/Libraries Group: System Environment/Libraries
@ -200,6 +203,7 @@ popd
%patch22 -p1 -b .185compat %patch22 -p1 -b .185compat
%patch24 -p1 -b .4.5.20.jni %patch24 -p1 -b .4.5.20.jni
%patch25 -p1 -b .licensefix
cd dist cd dist
./s_config ./s_config
@ -397,6 +401,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/libdb_java.so %{_libdir}/libdb_java.so
%changelog %changelog
* Thu May 9 2013 Tom Callaway <spot@fedoraproject.org> - 5.3.21-10
- add license clarification fix
* Wed Apr 03 2013 Jan Stanek <jstanek@redhat.com> 5.3.21-9 * Wed Apr 03 2013 Jan Stanek <jstanek@redhat.com> 5.3.21-9
- Added sqlite compability CFLAGS (#788496) - Added sqlite compability CFLAGS (#788496)