![](https://seccdn.libravatar.org/avatar/af22e20b6884acbc89be6d7736c43e92.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package ddrescue checked in at Tue Nov 7 09:34:28 CET 2006. -------- --- ddrescue/ddrescue.changes 2006-07-29 13:42:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/ddrescue/ddrescue.changes 2006-11-07 02:03:16.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Nov 7 00:59:36 CET 2006 - garloff@suse.de + +- dd_rhelp: head/tail require -n option (thanks to Bryant Ling) +- dd_rhelp: Use -y0 if ddrescue is 1.12 or newer. +- dd_rhelp: Require bc. + +------------------------------------------------------------------- New: ---- dd_rhelp_src.diff ddresc-112.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ddrescue.spec ++++++ --- /var/tmp/diff_new_pack.6Ao7F2/_old 2006-11-07 09:34:07.000000000 +0100 +++ /var/tmp/diff_new_pack.6Ao7F2/_new 2006-11-07 09:34:07.000000000 +0100 @@ -14,15 +14,18 @@ %define ddrescuever 1.12 %define ddrhelpver 0.0.6 Version: 1.12_0.0.6 -Release: 1 -License: GPL +Release: 16 +License: GNU General Public License (GPL) - all versions Group: System/Base Provides: dd_rescue Autoreqprov: on +Requires: bc Summary: Data Copying in the Presence of I/O Errors Source: http://www.garloff.de/kurt/linux/ddrescue/dd_rescue-%{ddrescuever}.tar.gz Source1: dd_rhelp-%{ddrhelpver}.tar.gz #Patch: dd_rescue-%{version}.diff +Patch2: dd_rhelp_src.diff +Patch3: ddresc-112.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -40,6 +43,8 @@ %setup -n dd_rescue -b1 #%patch -p1 cd ../dd_rhelp-%{ddrhelpver} +%patch2 -p1 +%patch3 -p1 autoreconf ./configure for name in FAQ NEWS README THANKS TODO; do @@ -69,6 +74,10 @@ rm -rf $RPM_BUILD_DIR/dd_rescue %changelog -n ddrescue +* Tue Nov 07 2006 - garloff@suse.de +- dd_rhelp: head/tail require -n option (thanks to Bryant Ling) +- dd_rhelp: Use -y0 if ddrescue is 1.12 or newer. +- dd_rhelp: Require bc. * Sat Jul 29 2006 - garloff@suse.de - Update to dd_rescue-1.12: * Option -b: Log bad blocks to ASCII file ++++++ dd_rhelp_src.diff ++++++ Index: dd_rhelp-0.0.6/src/dd_rhelp-sh =================================================================== --- dd_rhelp-0.0.6.orig/src/dd_rhelp-sh +++ dd_rhelp-0.0.6/src/dd_rhelp-sh @@ -225,9 +225,9 @@ function get_valid_dd_rescue else [ "$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 " " | cut -f 1 -d ",") @@ -356,9 +356,9 @@ function add_chunk() while test "$parsechunk" do # get first chunk already marked. - i="$(echo "$parsechunk" | "${HEAD}" -1 )" + i="$(echo "$parsechunk" | "${HEAD}" -n 1 )" # pull the two bounds i_start="$(echo "$i" | "${CUT}" -f 1 -d "-")" i_stop="$(echo "$i" | "${CUT}" -f 2 -d "-")" @@ -371,9 +371,9 @@ function add_chunk() then # 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 # new chunk ends before current chunk start ? @@ -407,18 +407,18 @@ function add_chunk() # new chunk contains entirely current chunk 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 # new chunk overlap on its end with beginning of current chunk if [ "$as_int" == "0" ] && [ "$ae_int" == "1" ] 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 @@ -426,9 +426,9 @@ function add_chunk() if [ "$as_int" == "1" ] && [ "$ae_int" == "0" ] 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 done @@ -455,9 +455,9 @@ function get_next_pos() # 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 fi @@ -504,9 +504,9 @@ function get_next_pos() # changes $logcontent, $chunk, $eof 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 @@ -518,9 +518,9 @@ function swallow_last_summary() 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 fi @@ -684,10 +684,10 @@ function show_info() total_xferd="0"; while test "$parsing" do - firstline="$(echo "$parsing" | "${HEAD}" -1)" - parsing="$(echo "$parsing" | "${TAIL}" +2)" + firstline="$(echo "$parsing" | "${HEAD}" -n 1)" + 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 "=")" succxfer="$(echo "$firstline" | "${CUT}" -f 5 -d ":" | "${CUT}" -f 2 -d "=")" @@ -776,10 +776,10 @@ function process_log() parsing="$data" # chunk="" while test "$parsing" ;do - firstline="$(echo "$parsing" | "${HEAD}" -1)" - parsing="$(echo "$parsing" | "${TAIL}" +2)" + firstline="$(echo "$parsing" | "${HEAD}" -n 1)" + 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 "=")" rev="$(echo $firstline | "${CUT}" -f 3 -d ":")" @@ -814,21 +814,21 @@ function load_log() # # 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 " ") + lnb_save=$(echo $lnb_save | "${HEAD}" -n 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")" ++++++ ddresc-112.diff ++++++ Index: dd_rhelp-0.0.6/src/dd_rhelp-sh =================================================================== --- dd_rhelp-0.0.6.orig/src/dd_rhelp-sh +++ dd_rhelp-0.0.6/src/dd_rhelp-sh @@ -219,9 +219,14 @@ function get_valid_dd_rescue if is_num "$version" && [ "$(bc_calc 2 "$version < 1.03")" == "0" ] then [ "$DEBUG" == "on" ] && echo "OK !" >&2 - echo "$path" + if [ "$(bc_calc 2 "$version < 1.12")" == "0" ] + then + echo "$path -y0" + else + echo "$path" + fi return 0 else [ "$DEBUG" == "on" ] && echo "BAD !" >&2 fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org