From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gcc-patches-return-369059-listarch-gcc-patches=gcc.gnu.org@gcc.gnu.org>
Received: (qmail 10589 invoked by alias); 31 May 2014 07:47:37 -0000
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Received: (qmail 10577 invoked by uid 89); 31 May 2014 07:47:36 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.3.2
X-HELO: relay1.mentorg.com
Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 31 May 2014 07:47:35 +0000
Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93])	by relay1.mentorg.com with esmtp 	id 1Wqe0o-00034J-Gr from Tom_deVries@mentor.com ; Sat, 31 May 2014 00:47:30 -0700
Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675);	 Sat, 31 May 2014 00:47:30 -0700
Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.2.247.3; Sat, 31 May 2014 08:47:28 +0100
Message-ID: <5389890F.2050501@mentor.com>
Date: Sat, 31 May 2014 07:47:00 -0000
From: Tom de Vries <Tom_deVries@mentor.com>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0
MIME-Version: 1.0
To: Geoff Keating <geoffk@geoffk.org>
CC: GCC Patches <gcc-patches@gcc.gnu.org>
Subject: [PATCH] Keep patch file permissions in mklog
Content-Type: multipart/mixed;	boundary="------------080101080208080804030409"
X-SW-Source: 2014-05/txt/msg02674.txt.bz2


--------------080101080208080804030409
Content-Type: text/plain; charset="ISO-8859-1"; format=flowed
Content-Transfer-Encoding: 7bit
Content-length: 522

Geoff,

Currently, mklog resets the permissions on a patch file:
...
$ touch tmp.patch
$ ls -la tmp.patch
-rw-rw-r-- 1 vries vries 0 mei 31 09:17 tmp.patch
$ ./contrib/mklog tmp.patch
$ ls -la tmp.patch
-rw------- 1 vries vries 59 mei 31 09:17 tmp.patch
$
...

This patch fixes that:
...
$ rm tmp.patch
$ touch tmp.patch
$ ls -la tmp.patch
-rw-rw-r-- 1 vries vries 0 mei 31 09:41 tmp.patch
$ ./contrib/mklog tmp.patch
$ ls -la tmp.patch
-rw-rw-r-- 1 vries vries 59 mei 31 09:41 tmp.patch
...

OK for trunk?

Thanks,
- Tom

--------------080101080208080804030409
Content-Type: text/x-patch; name="0001-mklog-permissions-fix.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="0001-mklog-permissions-fix.patch"
Content-length: 538

2014-05-31  Tom de Vries  <tom@codesourcery.com>

	* mklog: Keep permissions on patch file.

diff --git a/contrib/mklog b/contrib/mklog
index fb489b0..d6f3556 100755
--- a/contrib/mklog
+++ b/contrib/mklog
@@ -264,7 +264,7 @@ foreach my $clname (keys %cl_entries) {
 }
 
 # Concatenate the ChangeLog template and the original .diff file.
-system ("cat $diff >>$temp && mv $temp $diff") == 0
+system ("cat $diff >>$temp && cat $temp >$diff && rm $temp") == 0
     or die "Could not add the ChangeLog entry to $diff";
 
 exit 0;
-- 
1.9.1


--------------080101080208080804030409--