[toppler] Rebuilt to fix FTBFS, format-security patch, fixes rhbz #1107454, #1037362 and #926648
Filipe Rosset
filiperosset at fedoraproject.org
Wed Jun 11 05:18:56 UTC 2014
commit 266bd93a3c6fc97d5f524582e39fbd9d5e9bc17a
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date: Wed Jun 11 02:18:47 2014 -0300
Rebuilt to fix FTBFS, format-security patch, fixes rhbz #1107454, #1037362 and #926648
toppler-1.1.5-format-security.patch | 20 ++++++++++++++++++++
toppler.spec | 18 +++++++-----------
2 files changed, 27 insertions(+), 11 deletions(-)
---
diff --git a/toppler-1.1.5-format-security.patch b/toppler-1.1.5-format-security.patch
new file mode 100644
index 0000000..aa909fa
--- /dev/null
+++ b/toppler-1.1.5-format-security.patch
@@ -0,0 +1,20 @@
+--- decl.cc-orig 2014-06-11 01:58:55.855977308 -0300
++++ decl.cc 2014-06-11 02:04:02.191371288 -0300
+@@ -164,7 +164,7 @@
+ #ifndef WIN32
+ // look into actual directory
+ if (dcl_fileexists(name)) {
+- snprintf(f, len, name);
++ snprintf(f, len, "%s", name);
+ return true;
+ }
+
+@@ -183,7 +183,7 @@
+ #else
+
+ if (dcl_fileexists(name)) {
+- snprintf(f, len, name);
++ snprintf(f, len, "%s", name);
+ return true;
+ }
+
diff --git a/toppler.spec b/toppler.spec
index fa78a4b..a59ece3 100644
--- a/toppler.spec
+++ b/toppler.spec
@@ -1,17 +1,15 @@
Name: toppler
Version: 1.1.5
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Platform game
-
Group: Amusements/Games
License: GPLv2+
URL: http://toppler.sf.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
Patch1: toppler-1.1.5-move_hiscores_file.patch
Patch2: toppler-1.1.5-highscore.patch
Patch3: toppler-1.1.5-no-strncpy.patch
+Patch4: toppler-1.1.5-format-security.patch
BuildRequires: SDL-devel
BuildRequires: SDL_mixer-devel
@@ -31,6 +29,7 @@ target you need to avoid a lot of strange robots that guard the tower.
%patch1 -p0
%patch2 -p1
%patch3 -p1
+%patch4 -p0
for i in AUTHORS ChangeLog toppler.6; do {
iconv -f iso8859-1 -t utf-8 $i > $i.utf8 && \
@@ -46,7 +45,6 @@ make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
@@ -59,14 +57,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/toppler
%find_lang %{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files -f %{name}.lang
-%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README
-%attr(-,root,games) %{_bindir}/toppler
+%{_bindir}/toppler
%{_datadir}/toppler
%{_datadir}/applications/toppler.desktop
%{_datadir}/pixmaps/toppler.xpm
@@ -75,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Jun 11 2014 Filipe Rosset <rosset.filipe at gmail.com> - 1.1.5-7
+- Rebuilt to fix FTBFS, format-security patch, fixes rhbz #1107454, #1037362 and #926648
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.5-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list