[tar/f20] patch lint: remove unnecessary upstream git hashes
Pavel Raiskup
praiskup at fedoraproject.org
Thu Dec 12 16:11:27 UTC 2013
commit 7bd4c68d04b4298b2b20b14bac3e0edb7cbeece4
Author: Pavel Raiskup <praiskup at redhat.com>
Date: Thu Dec 12 13:59:23 2013 +0100
patch lint: remove unnecessary upstream git hashes
Version: 1.26-30
tar-1.26-silence-gcc.patch | 45 ++++++++++++++++++-------------------------
tar.spec | 5 +++-
2 files changed, 23 insertions(+), 27 deletions(-)
---
diff --git a/tar-1.26-silence-gcc.patch b/tar-1.26-silence-gcc.patch
index 108f376..078d42e 100644
--- a/tar-1.26-silence-gcc.patch
+++ b/tar-1.26-silence-gcc.patch
@@ -1,21 +1,20 @@
diff --git a/lib/rmt.h b/lib/rmt.h
-index 2ce9dc5..4580e49 100644
+index 2ce9dc5..ff10e7c 100644
--- a/lib/rmt.h
+++ b/lib/rmt.h
-@@ -17,8 +17,9 @@
+@@ -17,8 +17,8 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-extern char *rmt_command;
-extern char *rmt_dev_name__;
-+/* upstream fix 0b3d84a0ee */
+extern char const *rmt_command;
+extern char const *rmt_dev_name__;
int rmt_open__ (const char *, int, int, const char *);
int rmt_close__ (int);
diff --git a/lib/rtapelib.c b/lib/rtapelib.c
-index 3aee428..1cef0fc 100644
+index 3aee428..7213031 100644
--- a/lib/rtapelib.c
+++ b/lib/rtapelib.c
@@ -90,10 +90,10 @@ static int from_remote[MAXUNIT][2] = {{-1, -1}, {-1, -1}, {-1, -1}, {-1, -1}};
@@ -23,15 +22,15 @@ index 3aee428..1cef0fc 100644
static int to_remote[MAXUNIT][2] = {{-1, -1}, {-1, -1}, {-1, -1}, {-1, -1}};
-char *rmt_command = DEFAULT_RMT_COMMAND;
-+char const *rmt_command = DEFAULT_RMT_COMMAND; /* upstream fix 0b3d84a0ee */
++char const *rmt_command = DEFAULT_RMT_COMMAND;
/* Temporary variable used by macros in rmt.h. */
-char *rmt_dev_name__;
-+char const *rmt_dev_name__; /* upstream fix 0b3d84a0ee */
++char const *rmt_dev_name__;
/* If true, always consider file names to be local, even if they contain
colons */
-@@ -490,15 +490,17 @@ rmt_open__ (const char *file_name, int open_mode, int bias,
+@@ -490,15 +490,16 @@ rmt_open__ (const char *file_name, int open_mode, int bias,
{
/* Child. */
@@ -44,7 +43,6 @@ index 3aee428..1cef0fc 100644
- dup (from_remote[remote_pipe_number][PWRITE]);
- close (from_remote[remote_pipe_number][PREAD]);
- close (from_remote[remote_pipe_number][PWRITE]);
-+ /* upstream fix 0b3d84a0ee */
+ if (dup2 (to_remote[remote_pipe_number][PREAD], STDIN_FILENO) < 0
+ || (to_remote[remote_pipe_number][PREAD] != STDIN_FILENO
+ && close (to_remote[remote_pipe_number][PREAD]) != 0)
@@ -59,17 +57,16 @@ index 3aee428..1cef0fc 100644
sys_reset_uid_gid ();
diff --git a/lib/system.h b/lib/system.h
-index 2deb585..599d4ba 100644
+index 23cd2ef..0bd1f9c 100644
--- a/lib/system.h
+++ b/lib/system.h
-@@ -471,8 +471,13 @@ char *getenv ();
+@@ -478,8 +478,12 @@ char *getenv ();
# define SET_BINARY_MODE(arc)
# define ERRNO_IS_EACCES 0
# define TTY_NAME "/dev/tty"
-# define sys_reset_uid_gid() \
- do { setuid (getuid ()); setgid (getgid ()); } while (0)
+
-+/* upstream fix 0b3d84a0ee */
+# define sys_reset_uid_gid() \
+ do { \
+ if (! (setuid (getuid ()) == 0 && setgid (getgid ()) == 0)) \
@@ -79,43 +76,41 @@ index 2deb585..599d4ba 100644
#if XENIX
diff --git a/lib/wordsplit.c b/lib/wordsplit.c
-index bd5d59d..5f555ea 100644
+index bd5d59d..896cf7f 100644
--- a/lib/wordsplit.c
+++ b/lib/wordsplit.c
@@ -796,6 +796,8 @@ expvar (struct wordsplit *wsp, const char *str, size_t len,
value = "";
}
/* FIXME: handle defstr */
-+ (void) defstr; /* upstream commit 17f99bc6f1 */
++ (void) defstr;
+
if (value)
{
if (flg & _WSNF_QUOTE)
diff --git a/src/compare.c b/src/compare.c
-index 273269a..796d7aa 100644
+index 273269a..0ff0826 100644
--- a/src/compare.c
+++ b/src/compare.c
-@@ -362,7 +362,7 @@ static void
+@@ -362,7 +362,6 @@ static void
diff_dumpdir (void)
{
const char *dumpdir_buffer;
- dev_t dev = 0;
-+ /* upstream fix 5bb04335079 */
struct stat stat_data;
if (deref_stat (current_stat_info.file_name, &stat_data) != 0)
-@@ -372,8 +372,7 @@ diff_dumpdir (void)
+@@ -372,8 +371,6 @@ diff_dumpdir (void)
else
stat_error (current_stat_info.file_name);
}
- else
- dev = stat_data.st_dev;
-+ /* upstream fix 5bb04335079 */
dumpdir_buffer = directory_contents (scan_directory (¤t_stat_info));
diff --git a/src/system.c b/src/system.c
-index a27a7de..2049240 100644
+index a27a7de..b841963 100644
--- a/src/system.c
+++ b/src/system.c
@@ -25,7 +25,7 @@
@@ -123,7 +118,7 @@ index a27a7de..2049240 100644
#include <wordsplit.h>
-static void
-+static void __attribute__ ((__noreturn__)) /* upstream (similar) fix in 17f99bc6f1405 */
++static void __attribute__ ((__noreturn__))
xexec (const char *cmd)
{
struct wordsplit ws;
@@ -145,16 +140,15 @@ index a27a7de..2049240 100644
char uintbuf[UINTMAX_STRSIZE_BOUND];
int p[2];
static RETSIGTYPE (*saved_handler) (int sig);
-@@ -881,7 +879,7 @@ sys_exec_checkpoint_script (const char *script_name,
+@@ -881,7 +879,6 @@ sys_exec_checkpoint_script (const char *script_name,
int checkpoint_number)
{
pid_t pid;
- char *argv[4];
-+ /* upstream commit 17f99bc6f */
char uintbuf[UINTMAX_STRSIZE_BOUND];
pid = xfork ();
-@@ -912,10 +910,7 @@ sys_exec_checkpoint_script (const char *script_name,
+@@ -912,10 +909,6 @@ sys_exec_checkpoint_script (const char *script_name,
setenv ("TAR_FORMAT",
archive_format_string (current_format == DEFAULT_FORMAT ?
archive_format : current_format), 1);
@@ -162,12 +156,11 @@ index a27a7de..2049240 100644
- argv[1] = "-c";
- argv[2] = (char *) script_name;
- argv[3] = NULL;
-+ /* upstream commit 17f99bc6f */
priv_set_restore_linkdir ();
xexec (script_name);
diff --git a/src/update.c b/src/update.c
-index 4739e0d..3b28734 100644
+index 4739e0d..6e9beca 100644
--- a/src/update.c
+++ b/src/update.c
@@ -145,7 +145,7 @@ update_archive (void)
@@ -175,7 +168,7 @@ index 4739e0d..3b28734 100644
{
char *p, *dirp;
- DIR *stream;
-+ DIR *stream = NULL; /* upstream commit 5bb043350790 */
++ DIR *stream = NULL;
int fd = openat (chdir_fd, name->name,
open_read_flags | O_DIRECTORY);
if (fd < 0)
diff --git a/tar.spec b/tar.spec
index ca063f2..9eb1d6f 100644
--- a/tar.spec
+++ b/tar.spec
@@ -5,7 +5,7 @@ Summary: A GNU file archiving program
Name: tar
Epoch: 2
Version: 1.26
-Release: 29%{?dist}
+Release: 30%{?dist}
License: GPLv3+
Group: Applications/Archiving
URL: http://www.gnu.org/software/tar/
@@ -241,6 +241,9 @@ fi
%{_infodir}/tar.info*
%changelog
+* Thu Dec 12 2013 Pavel Raiskup <praiskup at redhat.com> - 1.26-30
+- don't add git-hashes to patches
+
* Tue Oct 29 2013 Pavel Raiskup <praiskup at redhat.com> - 1.26-29
- sparse file detection based on fstat() fix (#1024095)
More information about the scm-commits
mailing list