add makedepend fix

f41
Caolán McNamara 14 years ago
parent d144eb22b8
commit da5698c91b

@ -0,0 +1,25 @@
From 0bf9733c6e8d40a5d327e754b44c7e540cdada7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Sun, 31 Oct 2010 19:07:44 +0000
Subject: [PATCH] strcpy cannot be used with overlapping src and dest
---
soltools/mkdepend/parse.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/soltools/mkdepend/parse.c b/soltools/mkdepend/parse.c
index 6d6e079..ec7e7d4 100644
--- a/soltools/mkdepend/parse.c
+++ b/soltools/mkdepend/parse.c
@@ -347,7 +347,7 @@ int deftype (line, filep, file_red, file, parse_it, symbols)
/*
* copy the definition back to the beginning of the line.
*/
- strcpy (line, p);
+ memmove (line, p, strlen(p));
break;
case ELSE:
case ENDIF:
--
1.7.3.1

@ -101,6 +101,7 @@ Patch14: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
Patch15: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch Patch15: openoffice.org-3.3.0.ooo113273.desktop.resolvelinks.patch
Patch16: libreoffice-buildfix.patch Patch16: libreoffice-buildfix.patch
Patch17: libreoffice-xdg632229.gnomeshell.patch Patch17: libreoffice-xdg632229.gnomeshell.patch
Patch18: 0001-strcpy-cannot-be-used-with-overlapping-src-and-dest.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir} %define instdir %{_libdir}
@ -714,6 +715,7 @@ cp -p %{SOURCE20} external/unowinreg/unowinreg.dll
%patch15 -p0 -b .ooo113273.desktop.resolvelinks.patch %patch15 -p0 -b .ooo113273.desktop.resolvelinks.patch
%patch16 -p1 -b .libreoffice-buildfix.patch %patch16 -p1 -b .libreoffice-buildfix.patch
%patch17 -p0 -b .xdg632229.gnomeshell.patch %patch17 -p0 -b .xdg632229.gnomeshell.patch
%patch18 -p1 -b .strcpy-cannot-be-used-with-overlapping-src-and-dest
%build %build
echo build start time is `date`, diskspace: `df -h . | tail -n 1` echo build start time is `date`, diskspace: `df -h . | tail -n 1`

Loading…
Cancel
Save