rpms/firebird/F-13 firebird-gsec.patch, NONE, 1.1 firebird.spec, 1.10, 1.11 sources, 1.3, 1.4

[Philippe Makowski]

Author: makowski

Update of /cvs/pkgs/rpms/firebird/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25829

Modified Files:
	firebird.spec sources 
Added Files:
	firebird-gsec.patch 
Log Message:
* Wed Mar 17 2010 Philippe Makowski <makowski at fedoraproject.org>  2.1.3.18185.0-6
- build with last upstream
- Fix rh #563461 with backport mainstream patch CORE-2928


firebird-gsec.patch:
 security.epp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE firebird-gsec.patch ---
Index: src/utilities/gsec/security.epp
===================================================================
RCS file: /cvsroot/firebird/firebird2/src/utilities/gsec/security.epp,v
retrieving revision 1.16
diff -u -r1.16 security.epp
--- src/utilities/gsec/security.epp	25 Mar 2006 07:08:00 -0000	1.16
+++ src/utilities/gsec/security.epp	17 Mar 2010 10:11:57 -0000
@@ -288,7 +288,7 @@
 				*(io_user_data->sys_user_name) = '\0';
 				strcpy(io_user_data->user_name, U.USER_NAME);
 				strcpy(io_user_data->group_name, U.GROUP_NAME);
-				strcpy(io_user_data->password, U.PASSWD);
+				io_user_data->password[0] = 0;
 				strcpy(io_user_data->first_name, U.FIRST_NAME);
 				strcpy(io_user_data->middle_name, U.MIDDLE_NAME);
 				strcpy(io_user_data->last_name, U.LAST_NAME);
@@ -307,7 +307,7 @@
 				*(io_user_data->sys_user_name) = '\0';
 				strcpy(io_user_data->user_name, U.USER_NAME);
 				strcpy(io_user_data->group_name, U.GROUP_NAME);
-				strcpy(io_user_data->password, U.PASSWD);
+				io_user_data->password[0] = 0;
 				strcpy(io_user_data->first_name, U.FIRST_NAME);
 				strcpy(io_user_data->middle_name, U.MIDDLE_NAME);
 				strcpy(io_user_data->last_name, U.LAST_NAME);


Index: firebird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/F-13/firebird.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- firebird.spec	5 Sep 2009 13:32:08 -0000	1.10
+++ firebird.spec	24 Mar 2010 13:22:18 -0000	1.11
@@ -6,15 +6,14 @@
 Summary:	SQL relational database management system
 Name:		firebird
 Version:	2.1.3.18185.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 
 Group:		Applications/Databases
 License:	Interbase
 URL:		http://www.firebirdsql.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
-#Source0:	http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2
-Source0:	http://firebirdsql.org/downloads/prerelease/source/%{pkgname}.RC2.tar.bz2
+Source0:	http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2
 Source1:	firebird-logrotate
 Source2:	README.Fedora
 
@@ -24,6 +23,7 @@ Patch2:		firebird-fix-initscript.patch
 Patch3:		firebird_lock-file-location.patch
 Patch4:		firebird-gcc-icu.patch
 Patch5:		firebird-s390x.patch
+Patch6:		firebird-gsec.patch
 
 
 BuildRequires:	autoconf
@@ -131,11 +131,12 @@ Multi-process, local client libraries fo
 iconv	-f	ISO-8859-1	-t	utf-8	-c	./doc/README.intl					-o	./doc/README.intl
 # backport patch
 %patch2
-%patch1 -p1
+# %patch1 -p1
 %patch0
 %patch3
 %patch4
 %patch5 -p1
+%patch6
 
 %build
 
@@ -180,7 +181,7 @@ cd ..
 %ifarch	ppc64
 autoreconf -vfi
 %endif
-%configure --prefix=%{fbroot} --with-system-icu --with-system-editline --enable-superserver
+%configure --prefix=%{fbroot} --with-system-icu --enable-superserver --with-system-editline 
 		
 %ifarch	sparc64 
 sed	"s at COMMON_FLAGS=-m32 at COMMON_FLAGS=-m64@"	-i	./gen/make.platform	
@@ -535,6 +536,10 @@ fi
 
 
 %changelog
+* Wed Mar 17 2010 Philippe Makowski <makowski at fedoraproject.org>  2.1.3.18185.0-6
+- build with last upstream
+- Fix rh #563461 with backport mainstream patch CORE-2928
+
 * Sat Sep 05 2009 Karsten Hopp <karsten at redhat.com> 2.1.3.18185.0-5
 - fix build on s390x for F-12 mass rebuild (Dan Horák)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/firebird/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	30 Jul 2009 13:24:01 -0000	1.3
+++ sources	24 Mar 2010 13:22:18 -0000	1.4
@@ -1 +1 @@
-a419db70057767b7d6b955436e6e7089  Firebird-2.1.3.18185-0.RC2.tar.bz2
+ec42bd5c85dc2f65baef185228bcc5ca  Firebird-2.1.3.18185-0.tar.bz2