007-mt19937db.c_license.patch

Signed-off-by: Eduardo Lima (Etrunko) <eduardo.lima@intel.com>

diff --git a/packaging/007-mt19937db.c_license.patch b/packaging/007-mt19937db.c_license.patch
deleted file mode 100644 (file)
index eab05d7..0000000
--- a/packaging/007-mt19937db.c_license.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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  */

diff --git a/packaging/libdb.spec b/packaging/libdb.spec
index 1283548..d2ae71d 100644 (file)
--- a/packaging/libdb.spec
+++ b/packaging/libdb.spec
@@ -8,9 +8,6 @@ Release: 11
 Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz
 # other patches
 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/
 License: BSD-3-Clause and LGPL-2.0+
 Group: System/Libraries
@@ -182,7 +179,6 @@ for building programs which use the Berkeley DB in Java.
 %setup -q -n db-%{version}
 
 %patch24 -p1 -b .4.5.20.jni
-%patch25 -p1 -b .licensefix
 
 cd dist
 ./s_config

diff --git a/src/crypto/mersenne/mt19937db.c b/src/crypto/mersenne/mt19937db.c
index 2d53c31..a467e87 100644 (file)
--- a/src/crypto/mersenne/mt19937db.c
+++ b/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  */