rpms/foremost/F-12 foremost-fix-permission-timestamp.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.7, 1.8 foremost-broken-jpeg.patch, 1.1, 1.2 foremost.spec, 1.12, 1.13 sources, 1.7, 1.8

[Filipe Rosset]

Author: filiperosset

Update of /cvs/pkgs/rpms/foremost/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18454/F-12

Modified Files:
	.cvsignore foremost-broken-jpeg.patch foremost.spec sources 
Added Files:
	foremost-fix-permission-timestamp.patch import.log 
Log Message:
- Update to 1.5.7 upstream
- Fix permissions reported in RH BZ#572960



foremost-fix-permission-timestamp.patch:
 Makefile |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE foremost-fix-permission-timestamp.patch ---
--- SOURCES/foremost-1.5.7/Makefile	2010-04-05 11:53:36.858410948 -0300
+++ SOURCES/foremost-1.5.7/Makefile	2010-04-05 11:54:09.910407558 -0300
@@ -118,9 +118,9 @@
 #---------------------------------------------------------------------
 
 install: goals
-	install -m 755 $(NAME) $(BIN)
-	install -m 444 $(MAN_PAGES) $(MAN)
-	install -m 444 foremost.conf $(CONF)
+	install -p -m 755 $(NAME) $(BIN)
+	install -p -m 644 $(MAN_PAGES) $(MAN)
+	install -p -m 644 foremost.conf $(CONF)
 macinstall: BIN = /usr/local/bin/
 macinstall: MAN = /usr/share/man/man1/
 macinstall: CONF = /usr/local/etc/


--- NEW FILE import.log ---
foremost-1_5_7-1_fc13:F-12:foremost-1.5.7-1.fc13.src.rpm:1270495663


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/foremost/F-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	8 Feb 2008 21:51:44 -0000	1.7
+++ .cvsignore	5 Apr 2010 19:29:42 -0000	1.8
@@ -1 +1 @@
-foremost-1.5.3.tar.gz
+foremost-1.5.7.tar.gz

foremost-broken-jpeg.patch:
 extract.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: foremost-broken-jpeg.patch
===================================================================
RCS file: /cvs/pkgs/rpms/foremost/F-12/foremost-broken-jpeg.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- foremost-broken-jpeg.patch	24 Mar 2008 17:30:06 -0000	1.1
+++ foremost-broken-jpeg.patch	5 Apr 2010 19:29:42 -0000	1.2
@@ -1,13 +1,15 @@
---- foremost-1.5.3.old/extract.c	2007-12-05 00:53:52.000000000 +0100
-+++ foremost-1.5.3/extract.c	2008-03-23 15:26:57.000000000 +0100
-@@ -1765,6 +1765,11 @@ unsigned char *extract_jpeg(f_state *s, 
+--- extract.c	2010-04-05 11:25:49.510402918 -0300
++++ extract.c	2010-04-05 11:26:56.657533584 -0300
+@@ -1868,7 +1868,12 @@
+ 		if (((foundat + headersize) - buf) > buflen){ return NULL; }	
  
  		foundat += headersize;
- 
+-		
++
 +		if (foundat >= (buf + buflen))
-+			{
++		{
 +			return buf + needle->header_len;
-+			}
++		}
 +
  		if (foundat[2] != (unsigned char)'\xff')
  			{


Index: foremost.spec
===================================================================
RCS file: /cvs/pkgs/rpms/foremost/F-12/foremost.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- foremost.spec	24 Jul 2009 23:02:55 -0000	1.12
+++ foremost.spec	5 Apr 2010 19:29:42 -0000	1.13
@@ -1,16 +1,15 @@
-Name:           foremost
-Version:        1.5.3
-Release:        4%{?dist}
-Summary:        Recover files by "carving" them from a raw disk
-
-Group:          Applications/File
-License:        Public Domain
-URL:            http://foremost.sf.net
-Source0:        http://foremost.sourceforge.net/pkg/%{name}-%{version}.tar.gz
-Patch0:         foremost-broken-jpeg.patch
-# Upstream appears to not be using the sourceforge file release mechanism
-# Source0: http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name:		foremost
+Version:	1.5.7
+Release:	1%{?dist}
+Summary:	Recover files by "carving" them from a raw disk
+
+Group:		Applications/File
+License:	Public Domain
+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
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Foremost recovers files files based on their headers, footers, and internal
@@ -23,7 +22,8 @@ reliable and faster recovery.
 
 %prep
 %setup -q
-%patch0 -p1 -b .jheader
+%patch0 -p0
+%patch1 -p2
 
 sed -i 's!/usr/local/etc/foremost.conf!%{_sysconfdir}/foremost.conf!' config.c
 sed -i 's/^RAW_FLAGS =.*/RAW_FLAGS = %{optflags}/' Makefile
@@ -51,6 +51,10 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/foremost.conf
 
 %changelog
+* Mon Apr 05 2010 Filipe Rosset <rosset.filipe at gmail.com> - 1.5.7-1
+- Update to 1.5.7 upstream
+- Fix permissions reported in RH BZ#572960
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/foremost/F-12/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	8 Feb 2008 21:51:44 -0000	1.7
+++ sources	5 Apr 2010 19:29:42 -0000	1.8
@@ -1 +1 @@
-fd69f1a4aa4ac46096ecd3ff8ce670bf  foremost-1.5.3.tar.gz
+860119c49665c2a3fb2b0b1d3dbad02a  foremost-1.5.7.tar.gz