subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1784375 - /subversion/trunk/tools/hook-scripts/reject-known-sha1-collisions.sh
Date Sat, 25 Feb 2017 12:34:36 GMT
Author: stsp
Date: Sat Feb 25 12:34:36 2017
New Revision: 1784375

URL: http://svn.apache.org/viewvc?rev=1784375&view=rev
Log:
* tools/hook-scripts/reject-known-sha1-collisions.sh: Fix support for paths
   with spaces again. Make script easier to use on systems where GNU coreutils
   are not installed in /usr/bin.

Modified:
    subversion/trunk/tools/hook-scripts/reject-known-sha1-collisions.sh

Modified: subversion/trunk/tools/hook-scripts/reject-known-sha1-collisions.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/hook-scripts/reject-known-sha1-collisions.sh?rev=1784375&r1=1784374&r2=1784375&view=diff
==============================================================================
--- subversion/trunk/tools/hook-scripts/reject-known-sha1-collisions.sh (original)
+++ subversion/trunk/tools/hook-scripts/reject-known-sha1-collisions.sh Sat Feb 25 12:34:36
2017
@@ -29,6 +29,9 @@
 REPOS="$1"
 TXN="$2"
 SVNLOOK=/usr/bin/svnlook
+# GNU coreutils versions of these tools are required:
+SHA1SUM=/usr/bin/sha1sum
+HEAD=/usr/bin/head
 
 $SVNLOOK changed -t "$TXN" "$REPOS"
 if [ $? -ne 0 ]; then
@@ -36,9 +39,8 @@ if [ $? -ne 0 ]; then
   exit 2
 fi
 
-FILES=`$SVNLOOK changed -t "$TXN" "$REPOS" | /usr/bin/grep -Ev '^D ' | /usr/bin/awk '{print
$2}'`
-for FILE in $FILES; do
-  PREFIX=`$SVNLOOK cat -t "$TXN" "$REPOS" "$FILE" | head -c320 | /usr/bin/sha1sum | cut -c-40`
+$SVNLOOK changed -t "$TXN" "$REPOS" | /usr/bin/grep -Ev '^D ' | /usr/bin/sed -e 's/.   //'
| while read FILE; do
+  PREFIX=`$SVNLOOK cat -t "$TXN" "$REPOS" "$FILE" | $HEAD -c320 | $SHA1SUM | cut -c-40`
   if [ "$PREFIX" == 'f92d74e3874587aaf443d1db961d4e26dde13e9c' ]; then
         echo "known SHA-1 collision rejected" >&2
         exit 3



Mime
View raw message