[foremost] Fix packaging issues/guidelines
Filipe Rosset
filiperosset at fedoraproject.org
Tue Feb 25 03:28:24 UTC 2014
commit 926223cb7f7ac9b53490cb40814d9aef4fc73e2c
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date: Tue Feb 25 00:29:04 2014 -0300
Fix packaging issues/guidelines
- Fix rhbz #1037067
foremost-format-security.patch | 11 +++++++++++
foremost.spec | 11 ++++++++---
2 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/foremost-format-security.patch b/foremost-format-security.patch
new file mode 100644
index 0000000..7494d8e
--- /dev/null
+++ b/foremost-format-security.patch
@@ -0,0 +1,11 @@
+--- extract.c-orig 2014-02-25 00:13:17.048963985 -0300
++++ extract.c 2014-02-25 00:20:35.842038647 -0300
+@@ -2150,7 +2150,7 @@
+ ret_time->tm_sec);
+ chop(ascii_time);
+
+- sprintf(comment, ascii_time);
++ sprintf("%s", comment, ascii_time);
+ strcat(needle->comment, comment);
+ exe_char = htos(&foundat[22], FOREMOST_LITTLE_ENDIAN);
+ if (exe_char & 0x2000)
diff --git a/foremost.spec b/foremost.spec
index 8f1a417..7455124 100644
--- a/foremost.spec
+++ b/foremost.spec
@@ -1,6 +1,6 @@
Name: foremost
Version: 1.5.7
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: Recover files by "carving" them from a raw disk
Group: Applications/File
@@ -9,6 +9,7 @@ URL: http://foremost.sf.net
Source0: http://foremost.sourceforge.net/pkg/%{name}-%{version}.tar.gz
Patch0: foremost-broken-jpeg.patch
Patch1: foremost-fix-permission-timestamp.patch
+Patch2: foremost-format-security.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -24,12 +25,13 @@ reliable and faster recovery.
%setup -q
%patch0 -p0
%patch1 -p2
+%patch2 -p0
sed -i 's!/usr/local/etc/foremost.conf!%{_sysconfdir}/foremost.conf!' config.c
sed -i 's/^RAW_FLAGS =.*/RAW_FLAGS = %{optflags}/' Makefile
%build
-make %{?_smp_mflags} CONF=%{_sysconfdir}
+make %{?_smp_mflags} CONF=%{_sysconfdir} V=1
%install
rm -rf $RPM_BUILD_ROOT
@@ -44,13 +46,16 @@ make install BIN=$RPM_BUILD_ROOT%{_bindir} MAN=$RPM_BUILD_ROOT%{_mandir}/man8 \
rm -rf $RPM_BUILD_ROOT
%files
-%defattr(-,root,root,-)
%doc README CHANGES
%{_bindir}/*
%{_mandir}/man8/*
%config(noreplace) %{_sysconfdir}/foremost.conf
%changelog
+* Tue Feb 25 2014 Filipe Rosset <rosset.filipe at gmail.com> - 1.5.7-8
+- Fix packaging issues/guidelines
+- Fix rhbz #1037067
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.7-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list