{"thread":{"id":"29946","subject":"[GUILT] [PATCH] Fix fatal \"guilt graph\" error in sha1sum invocation.","startedAt":"2012-03-14T13:34:38Z","lastAt":"2012-03-15T09:56:58Z","messageCount":6,"participants":["Per Cederqvist","Jeff Sipek","Andreas Schwab","John Szakmeister"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"186940","messageId":"87399bpaq9.fsf@opera.com","threadId":"29946","inReplyTo":null,"subject":"[GUILT] [PATCH] Fix fatal \"guilt graph\" error in sha1sum invocation.","fromName":"Per Cederqvist","fromEmail":"cederp@opera.com","sentAt":"2012-03-14T13:34:38Z","receivedAt":"2012-03-14T13:34:38Z","isPatch":true,"sender":{"key":"cederp@opera.com","avatar":"https://gravatar.com/avatar/008fe28caedea0ba34042cd5157705267934f4ba7a9b29fb248ae18ec5b3055e?d=mp&s=160"},"body":"Fix the compatibility function sha1 so that it reads from\nstdin (and not a file with a zero-length file name) when\nno argument is supplied.\n\nSigned-off-by: Per Cederqvist <cederp@opera.com>\n---\n os.Darwin |    7 ++++++-\n os.Linux  |    7 ++++++-\n os.SunOS  |    7 ++++++-\n 3 files changed, 18 insertions(+), 3 deletions(-)\n\nNote: I have tested both versions of the sha1 function, but only on\nLinux as I don't have access to a Mac.\n\n    /ceder\n\ndiff --git a/os.Darwin b/os.Darwin\nindex 470f5fb..acf6b68 100644\n--- a/os.Darwin\n+++ b/os.Darwin\n@@ -27,7 +27,12 @@ head_n()\n # usage: sha1 [file]\n sha1()\n {\n-\topenssl dgst -sha1 \"$1\" | sed \"s,SHA1.\\(.*\\).= \\(.*\\),\\2  \\1,\"\n+\tif [ $# = 1 ]\n+\tthen\n+\t\topenssl dgst -sha1 \"$1\" | sed \"s,SHA1.\\(.*\\).= \\(.*\\),\\2  \\1,\"\n+\telse\n+\t\topenssl dgst -sha1 | sed 's,$,  -,'\n+\tfi\n }\n \n # usage: cp_a <src> <dst>\ndiff --git a/os.Linux b/os.Linux\nindex 30b9cb0..aaebf88 100644\n--- a/os.Linux\n+++ b/os.Linux\n@@ -30,7 +30,12 @@ head_n()\n # usage: sha1 [file]\n sha1()\n {\n-\tsha1sum \"$1\"\n+\tif [ $# = 1 ]\n+\tthen\n+\t\tsha1sum \"$1\"\n+\telse\n+\t\tsha1sum\n+\tfi\n }\n \n # usage: cp_a <src> <dst>\ndiff --git a/os.SunOS b/os.SunOS\nindex 30b9cb0..aaebf88 100644\n--- a/os.SunOS\n+++ b/os.SunOS\n@@ -30,7 +30,12 @@ head_n()\n # usage: sha1 [file]\n sha1()\n {\n-\tsha1sum \"$1\"\n+\tif [ $# = 1 ]\n+\tthen\n+\t\tsha1sum \"$1\"\n+\telse\n+\t\tsha1sum\n+\tfi\n }\n \n # usage: cp_a <src> <dst>\n-- \n1.7.9\n"},{"id":"186946","messageId":"20120314142144.GB12588@poseidon.cudanet.local","threadId":"29946","inReplyTo":"87399bpaq9.fsf@opera.com","subject":"Re: [GUILT] [PATCH] Fix fatal \"guilt graph\" error in sha1sum invocation.","fromName":"Jeff Sipek","fromEmail":"jeffpc@josefsipek.net","sentAt":"2012-03-14T14:21:48Z","receivedAt":"2012-03-14T14:21:48Z","isPatch":true,"sender":{"key":"jeffpc@josefsipek.net","avatar":null},"body":"On Wed, Mar 14, 2012 at 02:34:38PM +0100, Per Cederqvist wrote:\n> Fix the compatibility function sha1 so that it reads from\n> stdin (and not a file with a zero-length file name) when\n> no argument is supplied.\n\nI just ran into this yesterday.  I stupidly changed the caller of sha1 to\npass in - for the filename.  That worked for me since I ended up using the\nsha1sum implementations; openssl is not happy about that.  So, your patch\nlooks good.\n\nNow, I should actually figure out how to get the git repo out there again.\n\nThanks,\n\nJeff.\n\n> Signed-off-by: Per Cederqvist <cederp@opera.com>\n> ---\n>  os.Darwin |    7 ++++++-\n>  os.Linux  |    7 ++++++-\n>  os.SunOS  |    7 ++++++-\n>  3 files changed, 18 insertions(+), 3 deletions(-)\n> \n> Note: I have tested both versions of the sha1 function, but only on\n> Linux as I don't have access to a Mac.\n> \n>     /ceder\n> \n> diff --git a/os.Darwin b/os.Darwin\n> index 470f5fb..acf6b68 100644\n> --- a/os.Darwin\n> +++ b/os.Darwin\n> @@ -27,7 +27,12 @@ head_n()\n>  # usage: sha1 [file]\n>  sha1()\n>  {\n> -\topenssl dgst -sha1 \"$1\" | sed \"s,SHA1.\\(.*\\).= \\(.*\\),\\2  \\1,\"\n> +\tif [ $# = 1 ]\n> +\tthen\n> +\t\topenssl dgst -sha1 \"$1\" | sed \"s,SHA1.\\(.*\\).= \\(.*\\),\\2  \\1,\"\n> +\telse\n> +\t\topenssl dgst -sha1 | sed 's,$,  -,'\n> +\tfi\n>  }\n>  \n>  # usage: cp_a <src> <dst>\n> diff --git a/os.Linux b/os.Linux\n> index 30b9cb0..aaebf88 100644\n> --- a/os.Linux\n> +++ b/os.Linux\n> @@ -30,7 +30,12 @@ head_n()\n>  # usage: sha1 [file]\n>  sha1()\n>  {\n> -\tsha1sum \"$1\"\n> +\tif [ $# = 1 ]\n> +\tthen\n> +\t\tsha1sum \"$1\"\n> +\telse\n> +\t\tsha1sum\n> +\tfi\n>  }\n>  \n>  # usage: cp_a <src> <dst>\n> diff --git a/os.SunOS b/os.SunOS\n> index 30b9cb0..aaebf88 100644\n> --- a/os.SunOS\n> +++ b/os.SunOS\n> @@ -30,7 +30,12 @@ head_n()\n>  # usage: sha1 [file]\n>  sha1()\n>  {\n> -\tsha1sum \"$1\"\n> +\tif [ $# = 1 ]\n> +\tthen\n> +\t\tsha1sum \"$1\"\n> +\telse\n> +\t\tsha1sum\n> +\tfi\n>  }\n>  \n>  # usage: cp_a <src> <dst>\n> -- \n> 1.7.9\n> \n\n-- \nOnly two things are infinite, the universe and human stupidity, and I'm not\nsure about the former.\n\t\t- Albert Einstein\n"},{"id":"186947","messageId":"m2k42nmf5g.fsf@igel.home","threadId":"29946","inReplyTo":"87399bpaq9.fsf@opera.com","subject":"Re: [GUILT] [PATCH] Fix fatal \"guilt graph\" error in sha1sum invocation.","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2012-03-14T14:27:23Z","receivedAt":"2012-03-14T14:27:23Z","isPatch":true,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Per Cederqvist <cederp@opera.com> writes:\n\n> -\topenssl dgst -sha1 \"$1\" | sed \"s,SHA1.\\(.*\\).= \\(.*\\),\\2  \\1,\"\n> +\tif [ $# = 1 ]\n> +\tthen\n> +\t\topenssl dgst -sha1 \"$1\" | sed \"s,SHA1.\\(.*\\).= \\(.*\\),\\2  \\1,\"\n> +\telse\n> +\t\topenssl dgst -sha1 | sed 's,$,  -,'\n\n$ openssl dgst -sha1 </dev/null\n(stdin)= da39a3ee5e6b4b0d3255bfef95601890afd80709\n\n>  # usage: sha1 [file]\n>  sha1()\n>  {\n> -\tsha1sum \"$1\"\n> +\tif [ $# = 1 ]\n> +\tthen\n> +\t\tsha1sum \"$1\"\n> +\telse\n> +\t\tsha1sum\n> +\tfi\n\n        sha1sum \"$@\"\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"187031","messageId":"4F61AB63.5040304@opera.com","threadId":"29946","inReplyTo":"m2k42nmf5g.fsf@igel.home","subject":"Re: [GUILT] [PATCH] Fix fatal \"guilt graph\" error in sha1sum invocation.","fromName":"Per Cederqvist","fromEmail":"cederp@opera.com","sentAt":"2012-03-15T08:42:11Z","receivedAt":"2012-03-15T08:42:11Z","isPatch":true,"sender":{"key":"cederp@opera.com","avatar":"https://gravatar.com/avatar/008fe28caedea0ba34042cd5157705267934f4ba7a9b29fb248ae18ec5b3055e?d=mp&s=160"},"body":"On 03/14/2012 03:27 PM, Andreas Schwab wrote:\n\n> Per Cederqvist<cederp@opera.com>  writes:\n>\n>> -\topenssl dgst -sha1 \"$1\" | sed \"s,SHA1.\\(.*\\).= \\(.*\\),\\2  \\1,\"\n>> +\tif [ $# = 1 ]\n>> +\tthen\n>> +\t\topenssl dgst -sha1 \"$1\" | sed \"s,SHA1.\\(.*\\).= \\(.*\\),\\2  \\1,\"\n>> +\telse\n>> +\t\topenssl dgst -sha1 | sed 's,$,  -,'\n>\n> $ openssl dgst -sha1</dev/null\n> (stdin)= da39a3ee5e6b4b0d3255bfef95601890afd80709\n\nWas that on a Darwin? If so, my fix obviously needs some\nwork on that platform. I tested openssl-0.9.8o on Ubuntu\n11.04, and here it looks like this:\n\n$ openssl dgst -sha1</dev/null\nda39a3ee5e6b4b0d3255bfef95601890afd80709\n$ openssl version\nOpenSSL 0.9.8o 01 Jun 2010\n\n     /ceder\n\n>>   # usage: sha1 [file]\n>>   sha1()\n>>   {\n>> -\tsha1sum \"$1\"\n>> +\tif [ $# = 1 ]\n>> +\tthen\n>> +\t\tsha1sum \"$1\"\n>> +\telse\n>> +\t\tsha1sum\n>> +\tfi\n>\n>          sha1sum \"$@\"\n>\n> Andreas.\n>\n"},{"id":"187036","messageId":"m2haxqjirr.fsf@igel.home","threadId":"29946","inReplyTo":"4F61AB63.5040304@opera.com","subject":"Re: [GUILT] [PATCH] Fix fatal \"guilt graph\" error in sha1sum invocation.","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2012-03-15T09:49:44Z","receivedAt":"2012-03-15T09:49:44Z","isPatch":true,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"Per Cederqvist <cederp@opera.com> writes:\n\n> On 03/14/2012 03:27 PM, Andreas Schwab wrote:\n>\n>> Per Cederqvist<cederp@opera.com>  writes:\n>>\n>>> -\topenssl dgst -sha1 \"$1\" | sed \"s,SHA1.\\(.*\\).= \\(.*\\),\\2  \\1,\"\n>>> +\tif [ $# = 1 ]\n>>> +\tthen\n>>> +\t\topenssl dgst -sha1 \"$1\" | sed \"s,SHA1.\\(.*\\).= \\(.*\\),\\2  \\1,\"\n>>> +\telse\n>>> +\t\topenssl dgst -sha1 | sed 's,$,  -,'\n>>\n>> $ openssl dgst -sha1</dev/null\n>> (stdin)= da39a3ee5e6b4b0d3255bfef95601890afd80709\n>\n> Was that on a Darwin?\n\nNo.\n\n$ openssl version\nOpenSSL 1.0.0e 6 Sep 2011\n\nAndreas.\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"187037","messageId":"CAEBDL5XHZ-ca+wX91GrYu5T_rZ76pyrtPuzjWtVRtXg-MWSygQ@mail.gmail.com","threadId":"29946","inReplyTo":"4F61AB63.5040304@opera.com","subject":"Re: [GUILT] [PATCH] Fix fatal \"guilt graph\" error in sha1sum invocation.","fromName":"John Szakmeister","fromEmail":"john@szakmeister.net","sentAt":"2012-03-15T09:56:58Z","receivedAt":"2012-03-15T09:56:58Z","isPatch":true,"sender":{"key":"john@szakmeister.net","avatar":"https://avatars.githubusercontent.com/u/448087?v=4"},"body":"On Thu, Mar 15, 2012 at 4:42 AM, Per Cederqvist <cederp@opera.com> wrote:\n> On 03/14/2012 03:27 PM, Andreas Schwab wrote:\n>\n>> Per Cederqvist<cederp@opera.com>  writes:\n>>\n>>> -       openssl dgst -sha1 \"$1\" | sed \"s,SHA1.\\(.*\\).= \\(.*\\),\\2  \\1,\"\n>>> +       if [ $# = 1 ]\n>>> +       then\n>>> +               openssl dgst -sha1 \"$1\" | sed \"s,SHA1.\\(.*\\).= \\(.*\\),\\2\n>>>  \\1,\"\n>>> +       else\n>>> +               openssl dgst -sha1 | sed 's,$,  -,'\n>>\n>>\n>> $ openssl dgst -sha1</dev/null\n>> (stdin)= da39a3ee5e6b4b0d3255bfef95601890afd80709\n>\n>\n> Was that on a Darwin?\n\nHere's the output from my Mac (running Snow Leopard):\n\n$ openssl dgst -sha1</dev/null\n(stdin)= da39a3ee5e6b4b0d3255bfef95601890afd80709\n$ openssl version\nOpenSSL 1.0.0d 8 Feb 2011\n\n-John\n"}]}