Merge branch 'mirbsd'
authormirabilos <m@mirbsd.org>
Sun, 19 Nov 2017 12:44:10 +0000 (13:44 +0100)
committermirabilos <m@mirbsd.org>
Sun, 19 Nov 2017 12:44:10 +0000 (13:44 +0100)
1  2 
configure.in
lib/getdelim.c
src/buffer.c
src/client.c
src/import.c
src/log.c
src/mkmodules.c
src/root.c
src/server.c
src/version.c

diff --cc configure.in
@@@ -17,12 -19,10 +17,12 @@@ but WITHOUT ANY WARRANTY; without even 
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.])
  
- AC_INIT([Concurrent Versions System (CVS)],[1.12.13-MirDebian-24],
-       [bug-cvs@nongnu.org],[cvs])
 -AC_INIT([Concurrent Versions System (CVS)],[1.12.13-MirOS-0AB8.4],
++AC_INIT([Concurrent Versions System (CVS)],[1.12.13-MirDebian-25],
+       [miros-discuss@mirbsd.org],[cvs])
  AC_CONFIG_SRCDIR(src/cvs.h)
 +AC_CONFIG_AUX_DIR(build-aux)
  AM_INIT_AUTOMAKE([gnu 1.9.2 dist-bzip2 no-define])
 +AM_GNU_GETTEXT_VERSION([0.14.4])
  AC_PREREQ(2.59)
  
  AC_PREFIX_PROGRAM(cvs)
diff --cc lib/getdelim.c
Simple merge
diff --cc src/buffer.c
Simple merge
diff --cc src/client.c
Simple merge
diff --cc src/import.c
@@@ -25,7 -25,9 +25,7 @@@
  #include "lstat.h"
  #include "save-cwd.h"
  
- static char *get_comment (const char *user);
 -__RCSID("$MirOS: src/gnu/usr.bin/cvs/src/import.c,v 1.12 2017/11/18 23:04:55 tg Exp $");
 -
+ static const char *get_comment (const char *user);
  static int add_rev (char *message, RCSNode *rcs, char *vfile,
                          char *vers);
  static int add_tags (RCSNode *rcs, char *vfile, char *vtag, int targc,
diff --cc src/log.c
Simple merge
diff --cc src/mkmodules.c
Simple merge
diff --cc src/root.c
Simple merge
diff --cc src/server.c
Simple merge
diff --cc src/version.c
@@@ -16,6 -16,9 +16,7 @@@
  
  #include "cvs.h"
  
 -__RCSID("$MirOS: src/gnu/usr.bin/cvs/src/version.c,v 1.4 2017/11/18 23:04:57 tg Exp $");
 -
+ static const
  #ifdef CLIENT_SUPPORT
  #ifdef SERVER_SUPPORT
  char *config_string = " (client/server)\n";