Attachment 832583 Details for Bug 1037966 – Fix as patch against package sources

[patch] Fix as patch against package sources

0001-Fix-editor-log-file1-test.patch (text/plain), 8.83 KB, created by Petr Pisar on 2013-12-04 11:31:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Petr Pisar

Created: 2013-12-04 11:31:35 UTC

Size: 8.83 KB

patch

obsolete

>From fe81d7e21568e76c177ff39dc723195e292ea2bf Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
>Date: Wed, 4 Dec 2013 08:42:00 +0100
>Subject: [PATCH] Fix editor-log-file1 test
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: Petr PÃsaÅ <ppisar@redhat.com>
>---
> cvs-1.11.22-cvspass.patch |  66 ---------------------------
> cvs-1.11.23-cvspass.patch | 113 ++++++++++++++++++++++++++++++++++++++++++++++
> cvs.spec                  |   7 ++-
> 3 files changed, 118 insertions(+), 68 deletions(-)
> delete mode 100644 cvs-1.11.22-cvspass.patch
> create mode 100644 cvs-1.11.23-cvspass.patch
>
>diff --git a/cvs-1.11.22-cvspass.patch b/cvs-1.11.22-cvspass.patch
>deleted file mode 100644
>index f6ff3ea..0000000
>--- a/cvs-1.11.22-cvspass.patch
>+++ /dev/null
>@@ -1,66 +0,0 @@
>-diff -up cvs-1.11.23/src/login.c.cvspass cvs-1.11.23/src/login.c
>---- cvs-1.11.23/src/login.c.cvspass	2008-05-07 11:57:34.000000000 -0400
>-+++ cvs-1.11.23/src/login.c	2008-07-15 15:34:34.000000000 -0400
>-@@ -315,6 +315,15 @@ internal error: can only call password_e
>-     fp = CVS_FOPEN (passfile, "r");
>-     if (fp == NULL)
>-     {
>-+       fp = CVS_FOPEN (passfile, "w");
>-+       if (fp != NULL)
>-+       {
>-+           fclose (fp);
>-+           fp = CVS_FOPEN (passfile, "r");
>-+       }
>-+    }
>-+    if (fp == NULL)
>-+    {
>- 	error (0, errno, "warning: failed to open %s for reading", passfile);
>- 	goto process;
>-     }
>-diff -up cvs-1.11.23/src/logmsg.c.cvspass cvs-1.11.23/src/logmsg.c
>---- cvs-1.11.23/src/logmsg.c.cvspass	2008-05-07 11:57:34.000000000 -0400
>-+++ cvs-1.11.23/src/logmsg.c	2008-07-15 15:34:34.000000000 -0400
>-@@ -269,7 +269,7 @@ do_editor (dir, messagep, repository, ch
>-     }
>- 
>-     (void) fprintf (fp,
>--  "%s----------------------------------------------------------------------\n",
>-+  "\n%s----------------------------------------------------------------------\n",
>- 		    CVSEDITPREFIX);
>-     (void) fprintf (fp,
>-   "%sEnter Log.  Lines beginning with `%.*s' are removed automatically\n%s\n",
>-diff -up cvs-1.11.23/src/sanity.sh.cvspass cvs-1.11.23/src/sanity.sh
>---- cvs-1.11.23/src/sanity.sh.cvspass	2008-05-06 21:16:00.000000000 -0400
>-+++ cvs-1.11.23/src/sanity.sh	2008-07-15 15:37:43.000000000 -0400
>-@@ -15590,6 +15590,7 @@ description:
>- revision 1\.1
>- date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;
>- branches:  1\.1\.2;
>-+x
>- xCVS: ----------------------------------------------------------------------
>- xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
>- xCVS:
>-@@ -15601,6 +15602,7 @@ xCVS: ----------------------------------
>- ----------------------------
>- revision 1\.1\.2\.1
>- date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
>-+x
>- xCVS: ----------------------------------------------------------------------
>- xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
>- xCVS:
>-@@ -15622,6 +15624,7 @@ description:
>- revision 1\.1
>- date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;
>- branches:  1\.1\.2;
>-+x
>- xCVS: ----------------------------------------------------------------------
>- xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
>- xCVS:
>-@@ -15633,6 +15636,7 @@ xCVS: ----------------------------------
>- ----------------------------
>- revision 1\.1\.2\.1
>- date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
>-+x
>- xCVS: ----------------------------------------------------------------------
>- xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
>- xCVS:
>diff --git a/cvs-1.11.23-cvspass.patch b/cvs-1.11.23-cvspass.patch
>new file mode 100644
>index 0000000..7d4fd61
>--- /dev/null
>+++ b/cvs-1.11.23-cvspass.patch
>@@ -0,0 +1,113 @@
>+From e4a25dba948af9211ffea6b27293fe15c4b3ba07 Mon Sep 17 00:00:00 2001
>+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
>+Date: Wed, 4 Dec 2013 08:37:24 +0100
>+Subject: [PATCH] Create ~/.cvspass at login if it does not exists
>+MIME-Version: 1.0
>+Content-Type: text/plain; charset=UTF-8
>+Content-Transfer-Encoding: 8bit
>+
>+<https://bugzilla.redhat.com/show_bug.cgi?id=47457>
>+
>+Signed-off-by: Petr PÃsaÅ <ppisar@redhat.com>
>+---
>+ src/login.c   | 9 +++++++++
>+ src/logmsg.c  | 2 +-
>+ src/sanity.sh | 7 ++++++-
>+ 3 files changed, 16 insertions(+), 2 deletions(-)
>+
>+diff --git a/src/login.c b/src/login.c
>+index 50b292b..75dc53a 100644
>+--- a/src/login.c
>++++ b/src/login.c
>+@@ -315,6 +315,15 @@ internal error: can only call password_entry_operation with pserver method");
>+     fp = CVS_FOPEN (passfile, "r");
>+     if (fp == NULL)
>+     {
>++       fp = CVS_FOPEN (passfile, "w");
>++       if (fp != NULL)
>++       {
>++           fclose (fp);
>++           fp = CVS_FOPEN (passfile, "r");
>++       }
>++    }
>++    if (fp == NULL)
>++    {
>+ 	error (0, errno, "warning: failed to open %s for reading", passfile);
>+ 	goto process;
>+     }
>+diff --git a/src/logmsg.c b/src/logmsg.c
>+index 741231b..0d4d6a2 100644
>+--- a/src/logmsg.c
>++++ b/src/logmsg.c
>+@@ -269,7 +269,7 @@ do_editor (dir, messagep, repository, changes)
>+     }
>+ 
>+     (void) fprintf (fp,
>+-  "%s----------------------------------------------------------------------\n",
>++  "\n%s----------------------------------------------------------------------\n",
>+ 		    CVSEDITPREFIX);
>+     (void) fprintf (fp,
>+   "%sEnter Log.  Lines beginning with `%.*s' are removed automatically\n%s\n",
>+diff --git a/src/sanity.sh b/src/sanity.sh
>+index dbcae19..f119840 100755
>+--- a/src/sanity.sh
>++++ b/src/sanity.sh
>+@@ -4195,7 +4195,6 @@ ${PROG} commit: Rebuilding administrative file database"
>+ "$PROG logout: WARNING: Ignoring method options found in CVSROOT: \`proxy=localhost;proxyport=8080'\.
>+ $PROG logout: Use CVS version 1\.12\.7 or later to handle method options\.
>+ Logging out of :pserver:$username@localhost:2401/dev/null
>+-$PROG logout: warning: failed to open $HOME/\.cvspass for reading: No such file or directory
>+ $PROG logout: Entry not found\."
>+ 	  fi
>+ 
>+@@ -15552,6 +15551,7 @@ description:
>+ revision 1\.1
>+ date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;
>+ branches:  1\.1\.2;
>++x
>+ xCVS: ----------------------------------------------------------------------
>+ xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
>+ xCVS:
>+@@ -15563,6 +15563,7 @@ xCVS: ----------------------------------------------------------------------
>+ ----------------------------
>+ revision 1\.1\.2\.1
>+ date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
>++x
>+ xCVS: ----------------------------------------------------------------------
>+ xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
>+ xCVS:
>+@@ -15590,6 +15591,7 @@ description:
>+ revision 1\.1
>+ date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;
>+ branches:  1\.1\.2;
>++x
>+ xCVS: ----------------------------------------------------------------------
>+ xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
>+ xCVS:
>+@@ -15601,6 +15603,7 @@ xCVS: ----------------------------------------------------------------------
>+ ----------------------------
>+ revision 1\.1\.2\.1
>+ date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
>++x
>+ xCVS: ----------------------------------------------------------------------
>+ xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
>+ xCVS:
>+@@ -15622,6 +15625,7 @@ description:
>+ revision 1\.1
>+ date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;
>+ branches:  1\.1\.2;
>++x
>+ xCVS: ----------------------------------------------------------------------
>+ xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
>+ xCVS:
>+@@ -15633,6 +15637,7 @@ xCVS: ----------------------------------------------------------------------
>+ ----------------------------
>+ revision 1\.1\.2\.1
>+ date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
>++x
>+ xCVS: ----------------------------------------------------------------------
>+ xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
>+ xCVS:
>+-- 
>+1.8.3.1
>+
>diff --git a/cvs.spec b/cvs.spec
>index 772ed78..7cf2f2d 100644
>--- a/cvs.spec
>+++ b/cvs.spec
>@@ -5,7 +5,7 @@
> 
> Name: cvs
> Version: 1.11.23
>-Release: 35%{?dist}
>+Release: 36%{?dist}
> Summary: Concurrent Versions System
> Group: Development/Tools
> URL: http://cvs.nongnu.org/
>@@ -42,7 +42,7 @@ BuildRequires: texinfo
> BuildRequires: systemd
> 
> # Fix up initial cvs login, bug #47457
>-Patch0: cvs-1.11.22-cvspass.patch
>+Patch0: cvs-1.11.23-cvspass.patch
> # Build against system zlib
> Patch1: cvs-1.11.19-extzlib.patch
> # Aadd 't' as a loginfo format specifier (print tag or branch name)
>@@ -290,6 +290,9 @@ exit 0
> 
> 
> %changelog
>+* Wed Dec 04 2013 Petr Pisar <ppisar@redhat.com> - 1.11.23-36
>+- Fix editor-log-file1 test (bug #1037966)
>+
> * Tue Dec 03 2013 Petr Pisar <ppisar@redhat.com> - 1.11.23-35
> - Fix compilation with -Wformat-security (bug #1037029)
> 
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1037966: 832441 | 832583