[packages/freetds] - fixed firmat string error - fixed install
baggins
baggins at pld-linux.org
Sun Dec 28 19:08:21 CET 2014
commit 33c6f7cd8da8f26d829d1c7d83a883fbe8fe61f5
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Dec 28 18:08:04 2014 +0000
- fixed firmat string error
- fixed install
format-security.patch | 11 +++++++++++
freetds.spec | 10 +++++++---
2 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/freetds.spec b/freetds.spec
index 768f7ca..efd1f35 100644
--- a/freetds.spec
+++ b/freetds.spec
@@ -21,6 +21,7 @@ License: LGPL v2+
Group: Libraries
Source0: ftp://ftp.freetds.org/pub/freetds/stable/%{name}-%{version}.tar.gz
# Source0-md5: b14db5823980a32f0643d1a84d3ec3ad
+Patch0: format-security.patch
URL: http://www.freetds.org/
BuildRequires: autoconf >= 2.53
BuildRequires: automake
@@ -93,6 +94,7 @@ Sterownik ODBC FreeTDS dla unixODBC.
%prep
%setup -q
+%patch0 -p1
%build
%{__libtoolize}
@@ -116,13 +118,15 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT \
ETC=$RPM_BUILD_ROOT%{_sysconfdir}
-mv -f src/pool/BUGS BUGS.pool
-mv -f src/pool/README README.pool
-mv -f src/pool/TODO TODO.pool
+cp -a src/pool/BUGS BUGS.pool
+cp -a src/pool/README README.pool
+cp -a src/pool/TODO TODO.pool
# ODBC driver, dlopen()ed
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libtdsodbc.{la,a}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/format-security.patch b/format-security.patch
new file mode 100644
index 0000000..7223c6e
--- /dev/null
+++ b/format-security.patch
@@ -0,0 +1,11 @@
+--- freetds-0.91/src/apps/bsqldb.c~ 2011-03-13 21:32:46.000000000 +0000
++++ freetds-0.91/src/apps/bsqldb.c 2014-12-28 18:04:14.625622727 +0000
+@@ -545,7 +545,7 @@
+ perror("could not write to output file");
+ exit(EXIT_FAILURE);
+ }
+- fprintf(stdout, metadata[c].format_string); /* col/row separator */
++ fputs(metadata[c].format_string, stdout); /* col/row separator */
+ continue;
+ }
+ switch (data[c].status) { /* handle nulls */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/freetds.git/commitdiff/33c6f7cd8da8f26d829d1c7d83a883fbe8fe61f5
More information about the pld-cvs-commit
mailing list