cvs/trunk/cvs-1.11.23-cvspass.patch

   1 From e4a25dba948af9211ffea6b27293fe15c4b3ba07 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
   3 Date: Wed, 4 Dec 2013 08:37:24 +0100
   4 Subject: [PATCH] Create ~/.cvspass at login if it does not exists
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 <https://bugzilla.redhat.com/show_bug.cgi?id=47457>
  10
  11 Signed-off-by: Petr Písař <ppisar@redhat.com>
  12 ---
  13  src/login.c   | 9 +++++++++
  14  src/logmsg.c  | 2 +-
  15  src/sanity.sh | 7 ++++++-
  16  3 files changed, 16 insertions(+), 2 deletions(-)
  17
  18 diff --git a/src/login.c b/src/login.c
  19 index 50b292b..75dc53a 100644
  20 --- a/src/login.c
  21 +++ b/src/login.c
  22 @@ -315,6 +315,15 @@ internal error: can only call password_entry_operation with pserver method");
  23      fp = CVS_FOPEN (passfile, "r");
  24      if (fp == NULL)
  25      {
  26 +       fp = CVS_FOPEN (passfile, "w");
  27 +       if (fp != NULL)
  28 +       {
  29 +           fclose (fp);
  30 +           fp = CVS_FOPEN (passfile, "r");
  31 +       }
  32 +    }
  33 +    if (fp == NULL)
  34 +    {
  35         error (0, errno, "warning: failed to open %s for reading", passfile);
  36         goto process;
  37      }
  38 diff --git a/src/logmsg.c b/src/logmsg.c
  39 index 741231b..0d4d6a2 100644
  40 --- a/src/logmsg.c
  41 +++ b/src/logmsg.c
  42 @@ -269,7 +269,7 @@ do_editor (dir, messagep, repository, changes)
  43      }
  44
  45      (void) fprintf (fp,
  46 -  "%s----------------------------------------------------------------------\n",
  47 +  "\n%s----------------------------------------------------------------------\n",
  48                     CVSEDITPREFIX);
  49      (void) fprintf (fp,
  50    "%sEnter Log.  Lines beginning with `%.*s' are removed automatically\n%s\n",
  51 diff --git a/src/sanity.sh b/src/sanity.sh
  52 index dbcae19..f119840 100755
  53 --- a/src/sanity.sh
  54 +++ b/src/sanity.sh
  55 @@ -4195,7 +4195,6 @@ ${PROG} commit: Rebuilding administrative file database"
  56  "$PROG logout: WARNING: Ignoring method options found in CVSROOT: \`proxy=localhost;proxyport=8080'\.
  57  $PROG logout: Use CVS version 1\.12\.7 or later to handle method options\.
  58  Logging out of :pserver:$username@localhost:2401/dev/null
  59 -$PROG logout: warning: failed to open $HOME/\.cvspass for reading: No such file or directory
  60  $PROG logout: Entry not found\."
  61           fi
  62
  63 @@ -15552,6 +15551,7 @@ description:
  64  revision 1\.1
  65  date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;
  66  branches:  1\.1\.2;
  67 +x
  68  xCVS: ----------------------------------------------------------------------
  69  xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
  70  xCVS:
  71 @@ -15563,6 +15563,7 @@ xCVS: ----------------------------------------------------------------------
  72  ----------------------------
  73  revision 1\.1\.2\.1
  74  date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
  75 +x
  76  xCVS: ----------------------------------------------------------------------
  77  xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
  78  xCVS:
  79 @@ -15590,6 +15591,7 @@ description:
  80  revision 1\.1
  81  date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;
  82  branches:  1\.1\.2;
  83 +x
  84  xCVS: ----------------------------------------------------------------------
  85  xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
  86  xCVS:
  87 @@ -15601,6 +15603,7 @@ xCVS: ----------------------------------------------------------------------
  88  ----------------------------
  89  revision 1\.1\.2\.1
  90  date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
  91 +x
  92  xCVS: ----------------------------------------------------------------------
  93  xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
  94  xCVS:
  95 @@ -15622,6 +15625,7 @@ description:
  96  revision 1\.1
  97  date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;
  98  branches:  1\.1\.2;
  99 +x
 100  xCVS: ----------------------------------------------------------------------
 101  xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 102  xCVS:
 103 @@ -15633,6 +15637,7 @@ xCVS: ----------------------------------------------------------------------
 104  ----------------------------
 105  revision 1\.1\.2\.1
 106  date: [0-9/]* [0-9:]*;  author: ${username};  state: Exp;  lines: ${PLUS}1 -0
 107 +x
 108  xCVS: ----------------------------------------------------------------------
 109  xCVS: Enter Log.  Lines beginning with .CVS:. are removed automatically
 110  xCVS:
 111 --
 112 1.8.3.1
 113