rpms/ddrescue/FC-6 dd_rhelp-tail.patch, NONE, 1.1 dd_rescue.spec, 1.4, 1.5
Andreas Thienemann (ixs)
fedora-extras-commits at redhat.com
Wed Mar 7 10:51:29 UTC 2007
Author: ixs
Update of /cvs/extras/rpms/ddrescue/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32494
Modified Files:
dd_rescue.spec
Added Files:
dd_rhelp-tail.patch
Log Message:
dd_rhelp-tail.patch:
--- NEW FILE dd_rhelp-tail.patch ---
--- /usr/bin/dd_rhelp 2006-11-09 20:41:26.000000000 -0500
+++ dd_rhelp 2006-12-30 23:30:03.000000000 -0500
@@ -518,7 +518,7 @@
[ "$DEBUG" == "on" ] && echo "BAD !" >&2
fi
- path="$(dirname $(type -ap "$0" | "${TAIL}" -1))/dd_rescue"
+ path="$(dirname $(type -ap "$0" | "${TAIL}" -n -1))/dd_rescue"
if [ -x "$path" ] ;then
version=$("$path" -V 2>&1 | grep "dd_rescue Version" | cut -f 3 -d " " |
@@ -664,7 +664,7 @@
# new chunk doesn't overlap with current chunk
# Iterate, put current chunk in $goodchunk.
goodchunk="$(echo -en "$goodchunk\n$i")"
- parsechunk="$(echo "$parsechunk" | "${TAIL}" +2)"
+ parsechunk="$(echo "$parsechunk" | "${TAIL}" -n +2)"
continue
fi
@@ -700,7 +700,7 @@
if [ "$as_int" == "0" ] && [ "$ae_int" == "0" ]
then
# we forget about current chunk, and iterate.
- parsechunk=$(echo "$parsechunk" | "${TAIL}" +2)
+ parsechunk=$(echo "$parsechunk" | "${TAIL}" -n +2)
continue
fi
@@ -709,7 +709,7 @@
then
# grow new chunk to englobe current chunk.
arg_stop=$i_stop
- parsechunk=$(echo "$parsechunk" | "${TAIL}" +2)
+ parsechunk=$(echo "$parsechunk" | "${TAIL}" -n +2)
break; # we can break because chunk are sorted.
fi
@@ -719,7 +719,7 @@
then
# grow new chunk to englobe current chunk.
arg_start=$i_start
- parsechunk=$(echo "$parsechunk" | "${TAIL}" +2)
+ parsechunk=$(echo "$parsechunk" | "${TAIL}" -n +2)
continue; # new chunk might overlap more chunks
fi
@@ -748,7 +748,7 @@
# finding last's chunk end.
if test "$chunk" ;then
- last_chunk=$(echo "$chunk" | "${TAIL}" -1 )
+ last_chunk=$(echo "$chunk" | "${TAIL}" -n -1 )
max_stop=$(echo "$last_chunk" | "${CUT}" -f 2 -d "-")
else
max_stop=0
@@ -797,7 +797,7 @@
function swallow_last_summary()
{
# last summary of log (4 lines output by printreport())
- last_logcontent=$("${CAT}" "$logfile" | "$tr" -d "\\r" | "$GREP" "$string" -A 3 | "${TAIL}" -4)
+ last_logcontent=$("${CAT}" "$logfile" | "$tr" -d "\\r" | "$GREP" "$string" -A 3 | "${TAIL}" -n -4)
process_log "$last_logcontent"
get_eof
@@ -811,7 +811,7 @@
function get_last_chunk()
{
if test "$chunk"; then
- last_chunk="$(echo "$chunk" | "${TAIL}" -1 )"
+ last_chunk="$(echo "$chunk" | "${TAIL}" -n -1 )"
echo "$last_chunk" | "${CUT}" -f 2 -d "-"
else
echo 0
@@ -978,7 +978,7 @@
while test "$parsing"
do
firstline="$(echo "$parsing" | "${HEAD}" -1)"
- parsing="$(echo "$parsing" | "${TAIL}" +2)"
+ parsing="$(echo "$parsing" | "${TAIL}" -n +2)"
xferd="$(echo "$firstline" | "${CUT}" -f 2 -d ":" | "${CUT}" -f 2 -d "=")"
errxfer="$(echo "$firstline" | "${CUT}" -f 4 -d ":" | "${CUT}" -f 2 -d "=")"
@@ -1070,7 +1070,7 @@
while test "$parsing" ;do
firstline="$(echo "$parsing" | "${HEAD}" -1)"
- parsing="$(echo "$parsing" | "${TAIL}" +2)"
+ parsing="$(echo "$parsing" | "${TAIL}" -n +2)"
ipos="$(echo $firstline | "${CUT}" -f 1 -d ":" | "${CUT}" -f 2 -d "=")"
xferd="$(echo $firstline | "${CUT}" -f 2 -d ":" | "${CUT}" -f 2 -d "=")"
@@ -1107,19 +1107,19 @@
# loading into memory Summary info found in log file...
#
# line number of last save_log entry...
- lnb_save=$("${CAT}" -n "$logfile" | "$tr" -d "\\r" | grep "chunk:" -A 2 | "${TAIL}" -3)
+ lnb_save=$("${CAT}" -n "$logfile" | "$tr" -d "\\r" | grep "chunk:" -A 2 | "${TAIL}" -n -3)
if test "$lnb_save" ;then
lnb_save=$(echo $lnb_save | "${HEAD}" -1 | cut -f 1 -d " ")
- end_log="$(cat "$logfile" | "$tr" -d "\\r" | "${TAIL}" "+$lnb_save")"
+ end_log="$(cat "$logfile" | "$tr" -d "\\r" | "${TAIL}" -n "+$lnb_save")"
- last_lines=$(echo "$end_log" | grep "chunk:" -A 2 | "${TAIL}" -3)
+ last_lines=$(echo "$end_log" | grep "chunk:" -A 2 | "${TAIL}" -n -3)
- log=$(echo "$last_lines" | "$GREP" "chunk" | "${TAIL}" -1 )
- log1=$(echo "$last_lines" | "$GREP" "logcontent" | "${TAIL}" -1 )
- log2=$(echo "$last_lines" | "$GREP" "eof" | "${TAIL}" -1 )
+ log=$(echo "$last_lines" | "$GREP" "chunk" | "${TAIL}" -n -1 )
+ log1=$(echo "$last_lines" | "$GREP" "logcontent" | "${TAIL}" -n -1 )
+ log2=$(echo "$last_lines" | "$GREP" "eof" | "${TAIL}" -n -1 )
if test "$log" && test "$log1" && test "$log2" ;then
chunk="$(echo "$log" | "${CUT}" -f 2- -d ":" | "${TR}" ":" "\n")"
Index: dd_rescue.spec
===================================================================
RCS file: /cvs/extras/rpms/ddrescue/FC-6/dd_rescue.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dd_rescue.spec 10 Nov 2006 01:31:28 -0000 1.4
+++ dd_rescue.spec 7 Mar 2007 10:50:56 -0000 1.5
@@ -2,15 +2,14 @@
Name: dd_rescue
Version: 1.12
-Release: 4%{?dist}
-
+Release: 5%{?dist}
Summary: Fault tolerant "dd" utility for rescuing data from bad media
-
Group: Applications/System
License: GPL
URL: http://www.garloff.de/kurt/linux/ddrescue/
Source0: http://www.garloff.de/kurt/linux/ddrescue/dd_rescue-%{version}.tar.gz
-Source1: http://www.kalysto.org/pkg/dd_rhelp-%{rhelp_version}.tar.gz
+Source1: http://www.kalysto.org/pkg/dd_rhelp-%{rhelp_version}.tar.gz
+Patch0: dd_rhelp-tail.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: ddrescue
@@ -26,6 +25,7 @@
%prep
%setup -q -n %{name}
%setup -q -n %{name} -a 1 -D -T
+%patch0 -p 1 -b .tail
%build
make RPM_OPT_FLAGS="%{optflags}" %{?_smp_mflags}
@@ -56,6 +56,11 @@
%changelog
+
+* Wed Mar 07 2007 Andreas Thienemann <andreas at bawue.net> - 1.12-5
+- Fixed tail warning about deprecated argument. Thanks to Jason Farrell
+ for the patch.
+
* Fri Nov 10 2006 Andreas Thienemann <andreas at bawue.net> - 1.12-4
- Added dist-tag
More information about the fedora-extras-commits
mailing list