wok-next diff cvs/stuff/patches/cvs-1.11.23-cvspass.patch @ rev 20853
Up xgalaga++; fix build: vzctl, vzquota, w3m
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Sun Jun 24 19:03:37 2018 +0300 (2018-06-24) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/cvs/stuff/patches/cvs-1.11.23-cvspass.patch Sun Jun 24 19:03:37 2018 +0300 1.3 @@ -0,0 +1,113 @@ 1.4 +From e4a25dba948af9211ffea6b27293fe15c4b3ba07 Mon Sep 17 00:00:00 2001 1.5 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> 1.6 +Date: Wed, 4 Dec 2013 08:37:24 +0100 1.7 +Subject: [PATCH] Create ~/.cvspass at login if it does not exists 1.8 +MIME-Version: 1.0 1.9 +Content-Type: text/plain; charset=UTF-8 1.10 +Content-Transfer-Encoding: 8bit 1.11 + 1.12 +<https://bugzilla.redhat.com/show_bug.cgi?id=47457> 1.13 + 1.14 +Signed-off-by: Petr Písař <ppisar@redhat.com> 1.15 +--- 1.16 + src/login.c | 9 +++++++++ 1.17 + src/logmsg.c | 2 +- 1.18 + src/sanity.sh | 7 ++++++- 1.19 + 3 files changed, 16 insertions(+), 2 deletions(-) 1.20 + 1.21 +diff --git a/src/login.c b/src/login.c 1.22 +index 50b292b..75dc53a 100644 1.23 +--- a/src/login.c 1.24 ++++ b/src/login.c 1.25 +@@ -315,6 +315,15 @@ internal error: can only call password_entry_operation with pserver method"); 1.26 + fp = CVS_FOPEN (passfile, "r"); 1.27 + if (fp == NULL) 1.28 + { 1.29 ++ fp = CVS_FOPEN (passfile, "w"); 1.30 ++ if (fp != NULL) 1.31 ++ { 1.32 ++ fclose (fp); 1.33 ++ fp = CVS_FOPEN (passfile, "r"); 1.34 ++ } 1.35 ++ } 1.36 ++ if (fp == NULL) 1.37 ++ { 1.38 + error (0, errno, "warning: failed to open %s for reading", passfile); 1.39 + goto process; 1.40 + } 1.41 +diff --git a/src/logmsg.c b/src/logmsg.c 1.42 +index 741231b..0d4d6a2 100644 1.43 +--- a/src/logmsg.c 1.44 ++++ b/src/logmsg.c 1.45 +@@ -269,7 +269,7 @@ do_editor (dir, messagep, repository, changes) 1.46 + } 1.47 + 1.48 + (void) fprintf (fp, 1.49 +- "%s----------------------------------------------------------------------\n", 1.50 ++ "\n%s----------------------------------------------------------------------\n", 1.51 + CVSEDITPREFIX); 1.52 + (void) fprintf (fp, 1.53 + "%sEnter Log. Lines beginning with `%.*s' are removed automatically\n%s\n", 1.54 +diff --git a/src/sanity.sh b/src/sanity.sh 1.55 +index dbcae19..f119840 100755 1.56 +--- a/src/sanity.sh 1.57 ++++ b/src/sanity.sh 1.58 +@@ -4195,7 +4195,6 @@ ${PROG} commit: Rebuilding administrative file database" 1.59 + "$PROG logout: WARNING: Ignoring method options found in CVSROOT: \`proxy=localhost;proxyport=8080'\. 1.60 + $PROG logout: Use CVS version 1\.12\.7 or later to handle method options\. 1.61 + Logging out of :pserver:$username@localhost:2401/dev/null 1.62 +-$PROG logout: warning: failed to open $HOME/\.cvspass for reading: No such file or directory 1.63 + $PROG logout: Entry not found\." 1.64 + fi 1.65 + 1.66 +@@ -15552,6 +15551,7 @@ description: 1.67 + revision 1\.1 1.68 + date: [0-9/]* [0-9:]*; author: ${username}; state: Exp; 1.69 + branches: 1\.1\.2; 1.70 ++x 1.71 + xCVS: ---------------------------------------------------------------------- 1.72 + xCVS: Enter Log. Lines beginning with .CVS:. are removed automatically 1.73 + xCVS: 1.74 +@@ -15563,6 +15563,7 @@ xCVS: ---------------------------------------------------------------------- 1.75 + ---------------------------- 1.76 + revision 1\.1\.2\.1 1.77 + date: [0-9/]* [0-9:]*; author: ${username}; state: Exp; lines: ${PLUS}1 -0 1.78 ++x 1.79 + xCVS: ---------------------------------------------------------------------- 1.80 + xCVS: Enter Log. Lines beginning with .CVS:. are removed automatically 1.81 + xCVS: 1.82 +@@ -15590,6 +15591,7 @@ description: 1.83 + revision 1\.1 1.84 + date: [0-9/]* [0-9:]*; author: ${username}; state: Exp; 1.85 + branches: 1\.1\.2; 1.86 ++x 1.87 + xCVS: ---------------------------------------------------------------------- 1.88 + xCVS: Enter Log. Lines beginning with .CVS:. are removed automatically 1.89 + xCVS: 1.90 +@@ -15601,6 +15603,7 @@ xCVS: ---------------------------------------------------------------------- 1.91 + ---------------------------- 1.92 + revision 1\.1\.2\.1 1.93 + date: [0-9/]* [0-9:]*; author: ${username}; state: Exp; lines: ${PLUS}1 -0 1.94 ++x 1.95 + xCVS: ---------------------------------------------------------------------- 1.96 + xCVS: Enter Log. Lines beginning with .CVS:. are removed automatically 1.97 + xCVS: 1.98 +@@ -15622,6 +15625,7 @@ description: 1.99 + revision 1\.1 1.100 + date: [0-9/]* [0-9:]*; author: ${username}; state: Exp; 1.101 + branches: 1\.1\.2; 1.102 ++x 1.103 + xCVS: ---------------------------------------------------------------------- 1.104 + xCVS: Enter Log. Lines beginning with .CVS:. are removed automatically 1.105 + xCVS: 1.106 +@@ -15633,6 +15637,7 @@ xCVS: ---------------------------------------------------------------------- 1.107 + ---------------------------- 1.108 + revision 1\.1\.2\.1 1.109 + date: [0-9/]* [0-9:]*; author: ${username}; state: Exp; lines: ${PLUS}1 -0 1.110 ++x 1.111 + xCVS: ---------------------------------------------------------------------- 1.112 + xCVS: Enter Log. Lines beginning with .CVS:. are removed automatically 1.113 + xCVS: 1.114 +-- 1.115 +1.8.3.1 1.116 +