diff -uNr a/v/manifest b/v/manifest --- a/v/manifest bf7afc66778d7ca3fed3f76c922621047a149ea92172c8739e046ff924adf6bd4e104ce7858a6f20b298a04de44fded6619746966439f27617af280b7524659a +++ b/v/manifest a4f1eef064c37820d05786dd9d2cc1c9430139839e14b4d3ecbb51d6444dc09339d59d6f77c079d481700cdaac0a79b90bb136a48585ba628d3c637e5a338fdf @@ -3,3 +3,4 @@ 549967 v_keccak_vtools diana_coman Changed V to use vtools with Keccak hashes (ksum, vpatch). Version number changed to 99992. 600670 v_fixes_vpatch_sync spyked Limit recursion depth of wget to 1 for init command (sync_all_vpatches). Also, record changes in manifest rather than v.pl itself. Version number changed to 99991. 623999 v_strict_headers jfw Prevent false patch header matches by requiring a preceding "diff" line, as seen in phf's vpatch and bvt's vfilter. Also expand manifest to cover all patches and remove file extension from the titles as indicated by the manifest spec. Version 99990. +624002 v_keksum_busybox jfw Switch from vtools to keksum and patch, omitting GNU extensions for busybox compat. diff -uNr a/v/v.pl b/v/v.pl --- a/v/v.pl 5083784b62d8aa9d0e59cdb64b5ff66ffb09c40018253963af3dbb1cba64e468db8987ae9ca7cf77e5469bc5da5f9b8ef425a531f66a009b3e27eb7b50030c58 +++ b/v/v.pl 0a45631168aed2674864be7809701d10a86e2ce11a7c2712b7f291a36da8c6d0094bc3d158d7035875c591867a7e3a7603d5d51037497f3c644cedcfcc7edec0 @@ -26,8 +26,8 @@ my ($pdir, $sdir, $wdir) = ""; my (@pfiles, @sfiles, @wfiles) = (); -my @dep_bins = ("cat", "echo", "gpg", "ls", "mkdir", "vpatch", "pwd", - "rm", "ksum", "sort", "wget", "which", "mktemp"); +my @dep_bins = ("cat", "echo", "gpg", "ls", "mkdir", "patch", "pwd", + "rm", "keksum", "sort", "wget", "which", "mktemp"); sub check_required_bins { my (@bins) = @_; @@ -435,11 +435,11 @@ `mkdir -p $press[0]`; foreach my $vp (@pp) { if($v) { - my @out = `cd $press[0] && vpatch < $pdir/$vp 2>&1`; + my @out = `cd $press[0] && patch -p1 -E < $pdir/$vp 2>&1`; print "$vp\n"; foreach my $o (@out) { print " $o"; } } else { - `cd $press[0] && vpatch < $pdir/$vp`; + `cd $press[0] && patch -p1 -E < $pdir/$vp`; } %vp_map = (); verify_pressed($press[0], add_pressed($vp)); @@ -466,8 +466,8 @@ my $file_hash = $vp_map{$vp}{$src_file_name}{b}; if($file_hash ne "false") { my $fp = $press_dir . "/" . get_filepath($src_file_name); - my $hashed = `ksum $fp`; - $hashed =~ /^(.*) .*$/; + my $hashed = `keksum -s256 -l512 $fp`; + $hashed =~ /^([^ ]*) /; my $pressed_hash = $1; if($file_hash ne $pressed_hash) { print " File: $fp\n" . diff -uNr a/v/v_quick_start.txt b/v/v_quick_start.txt --- a/v/v_quick_start.txt ba8a23123f78f346861f89a50a5f3a6f8080ff97a94d00b3b229703b075e7f76ac700c4c5e9a6e0a460df71da3a92d32c31a5524dc55aeb90b00a78dbc77b92f +++ b/v/v_quick_start.txt a7268583a7754f923b9cfa9747c0d5a4a3a688669eaa6b92f7ecbc0b6a4c52427a97ffd9bb13708c6fc789722e515dded17a1656732bd90d3193d5783ba96617 @@ -18,6 +18,7 @@ 0x013: graphviz [Nice to have, not required] 0x014: gpg [GnuPG] 0x015: wget + 0x016: keksum 0x02]: How do I setup V?