From 599c67a881f215bf127937805f34deb495f0b072 Mon Sep 17 00:00:00 2001
From: basebuilder_pel7ppc64bebuilder0 <basebuilder@powerel.org>
Date: Fri, 31 Aug 2018 15:08:18 +0200
Subject: [PATCH] fann package creation
Signed-off-by: basebuilder_pel7ppc64bebuilder0 <basebuilder@powerel.org>
---
SOURCES/fann-2.2.0-pkgconfig.patch | 11 ++
SOURCES/fann-memcorruption.patch | 91 ++++++++++++++++
SPECS/fann.spec | 162 +++++++++++++++++++++++++++++
3 files changed, 264 insertions(+)
create mode 100644 SOURCES/fann-2.2.0-pkgconfig.patch
create mode 100644 SOURCES/fann-memcorruption.patch
create mode 100644 SPECS/fann.spec
diff --git a/SOURCES/fann-2.2.0-pkgconfig.patch b/SOURCES/fann-2.2.0-pkgconfig.patch
new file mode 100644
index 00000000..0dda5d2e
--- /dev/null
+++ b/SOURCES/fann-2.2.0-pkgconfig.patch
@@ -0,0 +1,11 @@
+diff -up FANN-2.2.0-Source/CMakeLists.txt.pkgconfig FANN-2.2.0-Source/CMakeLists.txt
+--- FANN-2.2.0-Source/CMakeLists.txt.pkgconfig 2012-04-24 14:33:08.201999985 +0200
++++ FANN-2.2.0-Source/CMakeLists.txt 2012-04-24 14:33:52.907999769 +0200
+@@ -16,7 +16,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
+
+ configure_file( ${CMAKE_SOURCE_DIR}/cmake/fann.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/fann.pc @ONLY )
+
+-SET(PKGCONFIG_INSTALL_DIR /lib/pkgconfig)
++#SET(PKGCONFIG_INSTALL_DIR /lib/pkgconfig)
+
+ ########### install files ###############
diff --git a/SOURCES/fann-memcorruption.patch b/SOURCES/fann-memcorruption.patch
new file mode 100644
index 00000000..f4a8d2cf
--- /dev/null
+++ b/SOURCES/fann-memcorruption.patch
@@ -0,0 +1,91 @@
+--- FANN-2.2.0-Source/src/fann_error.c.old 2014-01-01 09:20:54.068451736 +0100
++++ FANN-2.2.0-Source/src/fann_error.c 2014-01-01 09:33:30.184789643 +0100
+@@ -119,36 +119,36 @@
+ case FANN_E_NO_ERROR:
+ break;
+ case FANN_E_CANT_OPEN_CONFIG_R:
+- vsprintf(errstr, "Unable to open configuration file \"%s\" for reading.\n", ap);
++ vsnprintf(errstr, FANN_ERRSTR_MAX, "Unable to open configuration file \"%s\" for reading.\n", ap);
+ break;
+ case FANN_E_CANT_OPEN_CONFIG_W:
+- vsprintf(errstr, "Unable to open configuration file \"%s\" for writing.\n", ap);
++ vsnprintf(errstr, FANN_ERRSTR_MAX, "Unable to open configuration file \"%s\" for writing.\n", ap);
+ break;
+ case FANN_E_WRONG_CONFIG_VERSION:
+- vsprintf(errstr,
++ vsnprintf(errstr, FANN_ERRSTR_MAX,
+ "Wrong version of configuration file, aborting read of configuration file \"%s\".\n",
+ ap);
+ break;
+ case FANN_E_CANT_READ_CONFIG:
+- vsprintf(errstr, "Error reading \"%s\" from configuration file \"%s\".\n", ap);
++ vsnprintf(errstr, FANN_ERRSTR_MAX, "Error reading \"%s\" from configuration file \"%s\".\n", ap);
+ break;
+ case FANN_E_CANT_READ_NEURON:
+- vsprintf(errstr, "Error reading neuron info from configuration file \"%s\".\n", ap);
++ vsnprintf(errstr, FANN_ERRSTR_MAX, "Error reading neuron info from configuration file \"%s\".\n", ap);
+ break;
+ case FANN_E_CANT_READ_CONNECTIONS:
+- vsprintf(errstr, "Error reading connections from configuration file \"%s\".\n", ap);
++ vsnprintf(errstr, FANN_ERRSTR_MAX, "Error reading connections from configuration file \"%s\".\n", ap);
+ break;
+ case FANN_E_WRONG_NUM_CONNECTIONS:
+- vsprintf(errstr, "ERROR connections_so_far=%d, total_connections=%d\n", ap);
++ vsnprintf(errstr, FANN_ERRSTR_MAX, "ERROR connections_so_far=%d, total_connections=%d\n", ap);
+ break;
+ case FANN_E_CANT_OPEN_TD_W:
+- vsprintf(errstr, "Unable to open train data file \"%s\" for writing.\n", ap);
++ vsnprintf(errstr, FANN_ERRSTR_MAX, "Unable to open train data file \"%s\" for writing.\n", ap);
+ break;
+ case FANN_E_CANT_OPEN_TD_R:
+- vsprintf(errstr, "Unable to open train data file \"%s\" for writing.\n", ap);
++ vsnprintf(errstr, FANN_ERRSTR_MAX, "Unable to open train data file \"%s\" for writing.\n", ap);
+ break;
+ case FANN_E_CANT_READ_TD:
+- vsprintf(errstr, "Error reading info from train data file \"%s\", line: %d.\n", ap);
++ vsnprintf(errstr, FANN_ERRSTR_MAX, "Error reading info from train data file \"%s\", line: %d.\n", ap);
+ break;
+ case FANN_E_CANT_ALLOCATE_MEM:
+ sprintf(errstr, "Unable to allocate memory.\n");
+@@ -166,25 +166,26 @@
+ sprintf(errstr, "Unable to use the selected training algorithm.\n");
+ break;
+ case FANN_E_TRAIN_DATA_SUBSET:
+- vsprintf(errstr, "Subset from %d of length %d not valid in training set of length %d.\n", ap);
++ vsnprintf(errstr, FANN_ERRSTR_MAX, "Subset from %d of length %d not valid in training set of length %d.\n", ap);
+ break;
+ case FANN_E_INDEX_OUT_OF_BOUND:
+- vsprintf(errstr, "Index %d is out of bound.\n", ap);
++ vsnprintf(errstr, FANN_ERRSTR_MAX, "Index %d is out of bound.\n", ap);
+ break;
+ case FANN_E_SCALE_NOT_PRESENT:
+ sprintf(errstr, "Scaling parameters not present.\n");
+ break;
+ case FANN_E_INPUT_NO_MATCH:
+- vsprintf(errstr, "The number of input neurons in the ann (%d) and data (%d) don't match\n", ap);
++ vsnprintf(errstr, FANN_ERRSTR_MAX, "The number of input neurons in the ann (%d) and data (%d) don't match\n", ap);
+ break;
+ case FANN_E_OUTPUT_NO_MATCH:
+- vsprintf(errstr, "The number of output neurons in the ann (%d) and data (%d) don't match\n", ap);
++ vsnprintf(errstr, FANN_ERRSTR_MAX, "The number of output neurons in the ann (%d) and data (%d) don't match\n", ap);
+ break;
+ }
+ va_end(ap);
+
+ if(errdat != NULL)
+ {
++ /* possible memory leak, previous errdat->errstr not freed */
+ errdat->errstr = errstr;
+ error_log = errdat->error_log;
+ }
+@@ -197,6 +198,10 @@
+ {
+ fprintf(error_log, "FANN Error %d: %s", errno_f, errstr);
+ }
++ if (errdat == NULL)
++ {
++ free(errstr);
++ }
+ }
+
+ /* INTERNAL FUNCTION
diff --git a/SPECS/fann.spec b/SPECS/fann.spec
new file mode 100644
index 00000000..7071b113
--- /dev/null
+++ b/SPECS/fann.spec
@@ -0,0 +1,162 @@
+Name: fann
+Summary: A fast artificial neural network library
+Version: 2.2.0
+Release: 15%{?dist}
+License: LGPLv2+
+URL: http://leenissen.dk/fann/wp/
+
+Source: http://downloads.sourceforge.net/fann/fann/2.2.0/FANN-%{version}-Source.tar.gz
+Patch0: fann-2.2.0-pkgconfig.patch
+Patch1: fann-memcorruption.patch
+
+BuildRequires: gcc
+BuildRequires: gcc-c++
+BuildRequires: cmake
+
+%description
+Fast Artificial Neural Network (FANN) Library is written in ANSI C.
+The library implements multilayer feedforward ANNs, up to 150 times faster
+than other libraries. FANN supports execution in fixed point, for fast
+execution on systems like the iPAQ.
+
+%package devel
+Group: Development/Libraries
+Summary: Development libraries for FANN
+Requires: %{name} = %{version}-%{release} pkgconfig
+
+%description devel
+This package is only needed if you intend to develop and/or compile programs
+based on the FANN library.
+
+%prep
+%setup -q -n FANN-%{version}-Source
+%patch0 -p1
+%patch1 -p1 -b .memcorruption
+
+LIBS=-lm
+export LIBS
+
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} -DPKGCONFIG_INSTALL_DIR=/%{_lib}/pkgconfig ..
+popd
+
+%build
+make %{?_smp_mflags} -C %{_target_platform}
+
+%install
+make DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform} install
+find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%license COPYING.txt
+%doc README.txt
+%{_libdir}/libdoublefann.so.2
+%{_libdir}/libdoublefann.so.2.2.0
+%{_libdir}/libfloatfann.so.2
+%{_libdir}/libfloatfann.so.2.2.0
+%{_libdir}/libfixedfann.so.2
+%{_libdir}/libfixedfann.so.2.2.0
+%{_libdir}/libfann.so.2
+%{_libdir}/libfann.so.2.2.0
+
+%files devel
+%{_libdir}/pkgconfig/fann.pc
+%{_libdir}/libdoublefann.so
+%{_libdir}/libfann.so
+%{_libdir}/libfixedfann.so
+%{_libdir}/libfloatfann.so
+%{_includedir}/*.h
+
+%changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Aug 25 2017 Peter Robinson <pbrobinson@fedoraproject.org> 2.2.0-13
+- Modernise spec
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Wed Jan 01 2014 Remi Collet <rcollet@redhat.com> - 2.2.0-5
+- fix memory corruption in fann_error, #1047627
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Apr 24 2012 Tomas Smetana <tsmetana@redhat.com> - 2.2.0-1
+- update to the version 2.2.0 (thanks to Jaroslav Reznik)
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.0-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Jun 11 2009 Tomas Smetana <tsmetana@redhat.com> 2.0.0-6
+- There is no html documentation, don't try to build it
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.0-5.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb 12 2008 Tomas Smetana <tsmetana@redhat.com> 2.0.0-4.1
+- rebuild (gcc-4.3)
+
+* Mon Aug 20 2007 Tomas Smetana <tsmetana@redhat.com> 2.0.0-4
+- License tag update
+
+* Wed Aug 01 2007 Tomas Smetana <tsmetana@redhat.com> 2.0.0-3
+- Ensure linking against libm
+
+* Mon Jul 09 2007 Tomas Smetana <tsmetana@redhat.com> 2.0.0-2
+- Disable static libraries, fix BuildRoot, move headers to subdirectory
+
+* Thu Jun 21 2007 Tomas Smetana <tsmetana@redhat.com> 2.0.0-1
+- Bump release
+
+* Thu Jun 21 2007 Tomas Smetana <tsmetana@redhat.com> 2.0.0-0
+- Updated spec file.
+
+* Fri Mar 30 2004 Evan Nemerson <evan@coeus-group.com>
+- Build and install HTML documentation.
+
+* Fri Jan 16 2004 Evan Nemerson <evan@coeus-group.com>
+- Added activation header.
+
+* Mon Jan 10 2004 Evan Nemerson <evan@coeus-group.com>
+- RPM created