update to 2.5.7

security fix (#1425332)

.gitignore

@@ -1,2 +1,6 @@
 Firebird-2.1.3.18185-0.RC2.tar.bz2
 /Firebird-2.5.0.26074-0.tar.bz2
+/Firebird-2.5.1.26351-0.tar.bz2
+/Firebird-2.5.3.26778-0.tar.bz2
+/Firebird-2.5.5.26952-0.tar.bz2
+/Firebird-2.5.7.27050-0.tar.bz2

firebird-CVE-2016-1569.patch

@@ -0,0 +1,11 @@
+--- a/firebird/branches/B2_5_Release/src/burp/burp.cpp
++++ b/firebird/branches/B2_5_Release/src/burp/burp.cpp
+@@ -460,7 +460,7 @@
+ 		}
+ 		else
+ 		{
+-			BURP_print(true, 137, sw.c_str());
++			BURP_error(137, true, sw.c_str());
+ 			// msg 137  unknown switch %s
+ 		}
+ 	}

firebird-btyacc-fpie.patch

@@ -0,0 +1,11 @@
+--- extern/btyacc/Makefile.ori	2013-03-19 09:38:04.000000000 +0100
++++ extern/btyacc/Makefile	2013-04-27 13:20:35.964379129 +0200
+@@ -12,7 +12,7 @@ HDRS	      = defs.h mstring.h
+ # across all of our supported compilers/platforms.
+ 
+ # Vanilla CFLAGS
+-CFLAGS=
++#CFLAGS=
+ 
+ # No LDFLAGS
+ #LDFLAGS=

firebird.spec

@@ -1,12 +1,12 @@
-%global pkgname Firebird-2.5.0.26074-0
+%global pkgname Firebird-2.5.7.27050-0
 %global fbroot %{_libdir}/%{name}
-%global major 2.5.0
+%global major 2.5.7
 
 
 Summary: SQL relational database management system
 Name:  firebird
-Version: 2.5.0.26074.0
-Release: 0%{?dist}
+Version: 2.5.7.27050.0
+Release: 1%{?dist}
 
 Group:  Applications/Databases
 License: Interbase
@@ -17,6 +17,8 @@ Source0: http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2
 Source1: firebird-logrotate
 Source2: README.Fedora
 
+# from upstream
+Patch0: firebird-btyacc-fpie.patch
 
 BuildRequires: autoconf
 BuildRequires: automake
@@ -30,6 +32,10 @@ BuildRequires: gcc-c++
 %if 0%{?fedora}>=14
 BuildRequires: libstdc++-static
 %endif
+%ifnarch %{ix86} x86_64
+BuildRequires: libatomic_ops-devel
+%endif
+
 
 Requires: %{name}-arch = %{version}-%{release}
 Requires: grep
@@ -139,6 +145,7 @@ Multi-process, local client libraries for Firebird SQL RDBMS
 
 %prep
 %setup -q -n %{pkgname}
+%patch0
 # convert intl character to UTF-8
 iconv -f ISO-8859-1 -t utf-8 -c ./doc/README.intl     -o ./doc/README.intl
 
@@ -156,9 +163,6 @@ export CFLAGS='-m32'
 export LDFLAGS='-m32'
 %endif
 
-%ifarch ppc64
-autoreconf -vfi
-%endif
 NOCONFIGURE=1 ./autogen.sh
 #%configure --prefix=%{fbroot} --with-system-icu --with-system-editline \
 %configure --prefix=%{fbroot} --with-system-icu --with-system-editline \
@@ -183,18 +187,10 @@ sed "s@chown@echo ""# chown@g" -i ./install/makeInstallImage.sh
 sed "s@chmod@echo ""# chmod@g" -i ./install/makeInstallImage.sh
 ./install/makeInstallImage.sh
 
-# here we patch a bug in the configure script
-%ifarch ppc64
-mv -f ./buildroot/usr/lib/*  ./buildroot/%{_libdir}
-%endif
-
 mv  ./buildroot/ buildroot-classic
 cd ..
 
 # superserver
-%ifarch ppc64
-autoreconf -vfi
-%endif
 %configure --prefix=%{fbroot} --with-system-icu --with-system-editline --enable-superserver \
  --with-fbbin=%{fbroot}/bin-superserver --with-fbinclude=%{_includedir}/%{name} \
  --with-fbsbin=%{_sbindir} --with-fbconf=%{_sysconfdir}/%{name} --with-fblib=%{_libdir} \
@@ -219,11 +215,6 @@ sed "s@chown@echo ""# chown@g" -i ./install/makeInstallImage.sh
 sed "s@chmod@echo ""# chmod@g" -i ./install/makeInstallImage.sh
 ./install/makeInstallImage.sh
 
-# here we patch a bug in the configure script
-%ifarch ppc64
-mv -f ./buildroot/usr/lib/*  ./buildroot/%{_libdir}
-%endif
-
 
 %install
 # we wanted to setup both Classic and Superserver, we need to do all here
@@ -251,10 +242,13 @@ mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_bindir}
 
 cd %{buildroot}
+rm -f %{_builddir}/%{pkgname}/gen/buildroot%{_sysconfdir}/%{name}/I*.txt
 cp -d %{_builddir}/%{pkgname}/gen/buildroot%{_sysconfdir}/%{name}/* %{buildroot}%{_sysconfdir}/%{name}
 cp -d %{_builddir}/%{pkgname}/gen/buildroot-classic%{fbroot}/bin-classic/* %{buildroot}%{fbroot}/bin-classic
 cp -d %{_builddir}/%{pkgname}/gen/buildroot-classic%{_sbindir}/fb_config %{buildroot}%{fbroot}/bin-classic/fb_config
 sed "s@-classic@-superserver@" %{_builddir}/%{pkgname}/gen/buildroot-classic%{_sbindir}/fb_config > %{buildroot}%{fbroot}/bin-superserver/fb_config
+sed "s@-classic@@" %{_builddir}/%{pkgname}/gen/buildroot-classic%{_sbindir}/fb_config > %{buildroot}%{_libdir}/fb_config
+sed -i '/plugins/d' %{buildroot}%{_libdir}/fb_config
 cp -d %{_builddir}/%{pkgname}/gen/buildroot-classic%{_sbindir}/fbguard %{buildroot}%{_sbindir}/fbguard
 cp -d %{_builddir}/%{pkgname}/gen/buildroot-classic%{_sbindir}/fb_inet_server %{buildroot}%{_sbindir}/fb_inet_server
 cp -d %{_builddir}/%{pkgname}/gen/buildroot-classic%{_sbindir}/fb_lock_print %{buildroot}%{_sbindir}/fb_lock_print
@@ -308,7 +302,6 @@ ln -s %{fbroot}/bin/gstat .%{_bindir}/gstat-fb
 ln -s %{fbroot}/bin/isql .%{_bindir}/isql-fb
 ln -s %{fbroot}/bin/nbackup .%{_bindir}/nbackup
 ln -s %{fbroot}/bin/qli .%{_bindir}/qli
-ln -s %{fbroot}/bin/fb_config .%{_bindir}/fb_config
  
 %clean
 rm -Rf %{buildroot}
@@ -348,7 +341,7 @@ fi
 
 %preun superclassic
 if [ $1 -eq 0 ]; then
- if /sbin/service firebird status >& /dev/null; then
+ if /sbin/service firebird-superclassic status >& /dev/null; then
  /sbin/service firebird-superclassic stop
  fi
  chkconfig --del firebird-superclassic
@@ -371,7 +364,7 @@ fi
 
 %preun superserver
 if [ $1 -eq 0 ]; then
- if /sbin/service firebird status >& /dev/null; then
+ if /sbin/service firebird-superserver status >& /dev/null; then
  /sbin/service firebird-superserver stop
  fi
  chkconfig --del firebird-superserver
@@ -402,8 +395,8 @@ fi
 
 %files 
 %defattr(0644,root,root,0755)
-%doc doc/license/IDPL.txt
-%doc doc/license/README.license.usage.txt
+%doc builds/install/misc/IDPLicense.txt
+%doc builds/install/misc/IPLicense.txt
 %doc doc/README.Fedora
 %defattr(0755,root,root,0755)
 %dir %{fbroot}
@@ -450,6 +443,8 @@ fi
 %{_includedir}/%{name}/*.h
 %{_libdir}/libfb*.so
 %{_libdir}/libgds.so
+%defattr(0755,root,root,0755)
+%{_libdir}/fb_config
 
 %files filesystem
 %defattr(0644,root,root,0755)
@@ -478,7 +473,7 @@ fi
 %doc doc/license/IDPL.txt
 %doc doc/license/README.license.usage.txt
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
-%{_sbindir}/fb_inet_server
+
 
 %files superclassic
 %defattr(0644,root,root,0755)
@@ -494,6 +489,7 @@ fi
 %defattr(0755,root,root,0755)
 %{fbroot}/bin-classic/*
 %{fbroot}/plugins-classic/*
+%{_sbindir}/fb_inet_server
 
 
 %files superserver
@@ -511,8 +507,57 @@ fi
 
 
 %changelog
+* Wed Aug 16 2017 Philippe Makowski <makowski@fedoraproject.org> - 2.5.7.27050.0-1
+- update to 2.5.7
+- security fix (#1425332)
+
+* Fri Feb 05 2016 Philippe Makowski <makowski@fedoraproject.org> - 2.5.5.26952.0-2
+- move fb_config (#1297506)
+- fix CVE-2016-1569 (#1297447 #1297450 #1297451) 
+
+* Thu Nov 19 2015 Philippe Makowski <makowski@fedoraproject.org> 2.5.5.26952.0-1
+- update to 2.5.5
+
+* Thu Apr 2 2015 Philippe Makowski <makowski@fedoraproject.org> 2.5.4.26856.0-1
+- update to 2.5.4 
+
+* Sun Dec 7 2014 Philippe Makowski <makowski@fedoraproject.org> 2.5.3.26778.0-2
+- security fix firebird CORE-4630
+
+* Sat Jul 26 2014 Philippe Makowski <makowski@fedoraproject.org>  - 2.5.3.26778.0-1
+- update from upstream 2.5.3
+
+* Sun Mar 10 2013 Philippe Makowski <makowski@fedoraproject.org>  2.5.2.26539.0-3
+- added patch from upstream to fix Firebird CORE-4058 CVE-2013-2492
+
+* Fri Dec 14 2012 Philippe Makowski <makowski@fedoraproject.org>  2.5.2.26539.0-2
+- added patch from upstream to fix Firebird CORE-4011 and RH #886578
+
+* Fri Nov 09 2012 Philippe Makowski <makowski@fedoraproject.org>  2.5.2.26539.0-1
+- new upstream (bug fix release)
+- added patch from upstream to fix Firebird CORE-3946
+
+* Fri Feb 03 2012 Philippe Makowski <makowski@fedoraproject.org> 2.5.1.26351.0-1
+- new upstream (bug fix release)
+
+* Thu Sep 29 2011 Philippe Makowski <makowski@fedoraproject.org>  2.5.1.26349.0-1
+- new upstream (bug fix release)
+- added patch from upstream to fix Firebird CORE-3610
+
+* Sun Dec 26 2010 Philippe Makowski <makowski[at]fedoraproject.org>  2.5.0.26074.0-3
+- fix ppc64
+
+* Wed Dec 22 2010 Philippe Makowski <makowski[at]fedoraproject.org>  2.5.0.26074.0-2
+- Fix wrong assign file for classic and classic common
+- sync the s390(x) utilities list with other arches
+- add libatomic_ops-devel as BR: on non-x86 arches
+
+* Tue Nov 23 2010 Philippe Makowski <makowski@fedoraproject.org>  2.5.0.26074.0-1
+- add ppc64 
+
 * Mon Nov 22 2010 Philippe Makowski <makowski@fedoraproject.org>  2.5.0.26074.0-0
 - build with last upstream
+- exclude ppc64 
 
 * Tue Jun 29 2010 Dan Horák <dan[at]danny.cz>  2.1.3.18185.0-9
 - update the s390(x) patch to match upstream
@@ -531,7 +576,7 @@ fi
 * Sat Sep 05 2009 Karsten Hopp <karsten@redhat.com> 2.1.3.18185.0-5
 - fix build on s390x for F-12 mass rebuild (Dan Horák)
 
-* Mon Aug 11 2009  Philippe Makowski <makowski at fedoraproject.org> 2.1.3.18185.0-4
+* Tue Aug 11 2009  Philippe Makowski <makowski at fedoraproject.org> 2.1.3.18185.0-4
 - build it against system edit lib
 - set correct setuid for Classic lock manager
 - set correct permission for /var/run/firebird
@@ -590,7 +635,7 @@ fi
 * Sat Mar 28 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.1.17910.0-5
 - Major packaging restructuring
  
-* Mon Mar 21 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.1.17190.0-4
+* Sat Mar 21 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.1.17190.0-4
 - Create a doc package
 - major cleaning to avoid rpmlint errors
 - revert to 2.1.1 (last stable build published)
@@ -600,7 +645,7 @@ fi
 - Add libicu-devel in BuildRequires
 - Use iconv for convert files to UTF-8
 
-* Fri Mar 05 2009  Jonathan MERCIER <bioinfornatics at gmail.com> 2.1.2.18116.0-2
+* Thu Mar 05 2009  Jonathan MERCIER <bioinfornatics at gmail.com> 2.1.2.18116.0-2
 - Update to 2.1.2
 - Use %%global instead of %%define
 - Change ${SOURCE1} to %%{SOURCE1}

sources

@@ -1 +1 @@
-780f162ee71f087fc277adf09f966529  Firebird-2.5.0.26074-0.tar.bz2
+SHA512 (Firebird-2.5.7.27050-0.tar.bz2) = 793d47a8c8395dfb6f8417253950034dcd61b6b8337e654510d2d133396e5d1fccf615fc614bbe3129a64a101e956cb8b54d7460b06e72b245518f1b5af99327