Attachment 4380 Details for Bug 23463 – patch-update-altlinux

[patch] patch-update-altlinux

patch-update-altlinux (text/plain), 5.53 KB, created by Vitaly Kuzmichev on 2010-05-11 20:53:48 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Vitaly Kuzmichev

Created: 2010-05-11 20:53:48 MSD

Size: 5.53 KB

patch

obsolete

>Type: Enhancement
>Signed-off-by: Vitaly Kuzmichev <vtlkuzmichev@gmail.com>
>Description:
>    Updating 'patch' to 2.6.1 including ALTLinux patches.
>
>diff -up patch.spec.orig patch.spec
>--- patch.spec.orig	2010-05-07 20:07:41 +0400
>+++ patch.spec	2010-05-11 20:44:23 +0400
>@@ -1,6 +1,6 @@
> Name: patch
>-Version: 2.5.9
>-Release: alt3
>+Version: 2.6.1
>+Release: alt1
> 
> Summary: The GNU patch command, for modifying/upgrading files
> License: GPL
>@@ -8,14 +8,12 @@ Group: Text tools
> Url: http://www.gnu.org/software/patch/
> Packager: Dmitry V. Levin <ldv@altlinux.org>
> 
>-# ftp://alpha.gnu.org/gnu/diffutils/patch-%version.tar.gz
>-Source: patch-%version.tar
>+# Source: ftp://ftp.gnu.org/gnu/patch/patch-%{version}.tar.gz
>+Source: patch-%version.tar.gz
> 
>-Patch0: patch-2.5.9-cvs-20030702-p_strip_trailing_cr.patch
>-Patch1: patch-2.5.9-suse-remember-backup-files.patch
>-Patch2: patch-2.5.9-rh-stderr.patch
>-Patch3: patch-2.5.9-mdk-sigsegv.patch
>-Patch4: patch-2.5.9-mdk-backup.patch
>+Patch0: patch-%version-rh-stderr.patch
>+Patch1: patch-%version-mdk-sigsegv.patch
>+Patch2: patch-%version-mdk-backup.patch
> 
> %description
> The patch program applies diff files to originals.  The diff command
>@@ -26,15 +24,12 @@ original file (patching the file).
> 
> %prep
> %setup -q
>-%patch0 -p0
>+%patch0 -p1
> %patch1 -p1
> %patch2 -p1
>-%patch3 -p1
>-%patch4 -p1
> bzip2 -9k ChangeLog
> 
> %build
>-autoreconf -fisv
> %configure
> %make_build
> 
>@@ -47,6 +42,10 @@ autoreconf -fisv
> %doc AUTHORS ChangeLog.bz2 NEWS README
> 
> %changelog
>+* Fri May 7 2010 Vitaly Kuzmichev <vtlkuzmichev@gmail.com> 2.6.1-alt1
>+- Updated to 2.6.1
>+- Updated some patches, retired others
>+
> * Sat Apr 14 2007 Dmitry V. Levin <ldv@altlinux.org> 2.5.9-alt3
> - Uncompressed tarball.
> 
>diff -up patch-2.5.9-rh-stderr.patch patch-2.6.1-rh-stderr.patch
>--- patch-2.5.9-rh-stderr.patch	2007-04-14 19:17:41 +0400
>+++ patch-2.6.1-rh-stderr.patch	2010-05-07 21:10:28 +0400
>@@ -1,7 +1,7 @@
>---- patch-2.5.9/util.c.orig	2003-05-20 14:04:53 +0000
>-+++ patch-2.5.9/util.c	2005-10-25 22:54:21 +0000
>-@@ -567,6 +567,7 @@ ask (char const *format, ...)
>-   int r;
>+--- patch-2.6.1.orig/src/util.c	2010-05-07 21:07:26 +0400
>++++ patch-2.6.1/src/util.c	2010-05-07 21:08:21 +0400
>+@@ -743,6 +743,7 @@ ask (char const *format, ...)
>+   ssize_t r;
>    va_list args;
>  
> +  fflush (stderr);	/* Ensure pending errors are written before the question */
>diff -up patch-2.5.9-mdk-sigsegv.patch patch-2.6.1-mdk-sigsegv.patch
>--- patch-2.5.9-mdk-sigsegv.patch	2007-04-14 19:17:41 +0400
>+++ patch-2.6.1-mdk-sigsegv.patch	2010-05-07 21:16:17 +0400
>@@ -1,7 +1,7 @@
>-diff -upk.orig patch-2.5.9.orig/inp.c patch-2.5.9/inp.c
>---- patch-2.5.9.orig/inp.c	2003-05-20 13:58:02 +0000
>-+++ patch-2.5.9/inp.c	2005-10-25 23:02:41 +0000
>-@@ -79,6 +79,14 @@ re_input (void)
>+diff -urp patch-2.6.1.orig/src/inp.c patch-2.6.1/src/inp.c
>+--- patch-2.6.1.orig/src/inp.c	2010-05-07 21:11:34 +0400
>++++ patch-2.6.1/src/inp.c	2010-05-07 21:12:11 +0400
>+@@ -77,6 +77,14 @@ re_input (void)
>      }
>  }
>  
>@@ -16,19 +16,19 @@ diff -upk.orig patch-2.5.9.orig/inp.c pa
>  /* Construct the line index, somehow or other. */
>  
>  void
>-diff -upk.orig patch-2.5.9.orig/inp.h patch-2.5.9/inp.h
>---- patch-2.5.9.orig/inp.h	2003-05-20 14:05:22 +0000
>-+++ patch-2.5.9/inp.h	2005-10-25 23:02:21 +0000
>-@@ -26,4 +26,5 @@ XTERN LINENUM input_lines;		/* how long 
>+diff -urp patch-2.6.1.orig/src/inp.h patch-2.6.1/src/inp.h
>+--- patch-2.6.1.orig/src/inp.h	2010-05-07 21:11:34 +0400
>++++ patch-2.6.1/src/inp.h	2010-05-07 21:12:11 +0400
>+@@ -24,4 +24,5 @@ XTERN LINENUM input_lines;		/* how long 
>  char const *ifetch (LINENUM, bool, size_t *);
>  void get_input_file (char const *, char const *);
>  void re_input (void);
> +void reset_scan_input_vars (void);
>  void scan_input (char *);
>-diff -upk.orig patch-2.5.9.orig/patch.c patch-2.5.9/patch.c
>---- patch-2.5.9.orig/patch.c	2003-05-20 13:55:03 +0000
>-+++ patch-2.5.9/patch.c	2005-10-25 22:58:02 +0000
>-@@ -213,7 +213,10 @@ main (int argc, char **argv)
>+diff -urp patch-2.6.1.orig/src/patch.c patch-2.6.1/src/patch.c
>+--- patch-2.6.1.orig/src/patch.c	2010-05-07 21:11:34 +0400
>++++ patch-2.6.1/src/patch.c	2010-05-07 21:12:11 +0400
>+@@ -210,7 +210,10 @@ main (int argc, char **argv)
>  
>  	/* find out where all the lines are */
>  	if (!skip_rest_of_patch)
>diff -up patch-2.5.9-mdk-backup.patch patch-2.6.1-mdk-backup.patch
>--- patch-2.5.9-mdk-backup.patch	2007-04-14 19:17:41 +0400
>+++ patch-2.6.1-mdk-backup.patch	2010-05-07 21:18:12 +0400
>@@ -1,7 +1,7 @@
>-diff -upk.orig patch-2.5.9.orig/patch.man patch-2.5.9/patch.man
>---- patch-2.5.9.orig/patch.man	2002-05-25 10:36:44 +0000
>-+++ patch-2.5.9/patch.man	2005-10-25 23:08:09 +0000
>-@@ -259,7 +259,7 @@ Make backup files.
>+diff -urp patch-2.6.1.orig/patch.man patch-2.6.1/patch.man
>+--- patch-2.6.1.orig/patch.man	2010-05-07 21:16:42 +0400
>++++ patch-2.6.1/patch.man	2010-05-07 21:17:06 +0400
>+@@ -263,7 +263,7 @@ Make backup files.
>  That is, when patching a file,
>  rename or copy the original instead of removing it.
>  When backing up a file that does not exist,
>@@ -10,15 +10,3 @@ diff -upk.orig patch-2.5.9.orig/patch.ma
>  as a placeholder to represent the nonexistent file.
>  See the
>  .B \-V
>-diff -upk.orig patch-2.5.9.orig/util.c patch-2.5.9/util.c
>---- patch-2.5.9.orig/util.c	2003-05-20 14:04:53 +0000
>-+++ patch-2.5.9/util.c	2005-10-25 23:08:09 +0000
>-@@ -106,7 +106,7 @@ move_file (char const *from, int volatil
>- 
>- 	  try_makedirs_errno = ENOENT;
>- 	  unlink (bakname);
>--	  while ((fd = creat (bakname, 0)) < 0)
>-+	  while ((fd = creat (bakname, 0400)) < 0)
>- 	    {
>- 	      if (errno != try_makedirs_errno)
>- 		pfatal ("Can't create file %s", quotearg (bakname));

Actions: View | Diff

Attachments on bug 23463: 4380