- grrr, info patch is back (updated)

- updated to 1.11.8 (fixes problem in the CVS getpass library that could
  cause passwords to echo on some systems)
- updated ipv6 patch

Changed files:
    cvs-info.patch -> 1.5
    cvs-ipv6.patch -> 1.3
    cvs.spec -> 1.111

diff --git a/cvs-info.patch b/cvs-info.patch
index cbda45b53c0359dd9dcc4f334499073861ab705e..963e2efcc304da8ff80aa14f999c5fc0b980a7b4 100644 (file)
--- a/cvs-info.patch
+++ b/cvs-info.patch
@@ -1,26 +1,26 @@
-diff -Nur cvs-1.11.1p1.orig/doc/cvs.texinfo cvs-1.11.1p1/doc/cvs.texinfo
---- cvs-1.11.1p1.orig/doc/cvs.texinfo  Tue Apr 24 20:14:52 2001
-+++ cvs-1.11.1p1/doc/cvs.texinfo       Sat Aug  4 18:40:13 2001
-@@ -49,9 +49,10 @@
+--- cvs-1.11.7/doc/cvs.texinfo.orig    2003-09-12 19:16:38.000000000 +0200
++++ cvs-1.11.7/doc/cvs.texinfo 2003-10-10 22:14:54.800820344 +0200
+@@ -94,13 +94,9 @@
+ @end macro
+ @end ifhtml
  
- @ifinfo
- @format
--START-INFO-DIR-ENTRY
--* CVS: (cvs).          Concurrent Versions System
--END-INFO-DIR-ENTRY
+-@dircategory GNU Packages
 +@dircategory Version Control:
-+@direntry
-+* cvs: (cvs).                         Concurrent Versions System
-+@end direntry
- @end format
- @end ifinfo
+ @direntry
+-* CVS: (cvs).                   Concurrent Versions System
+-@end direntry
+-@dircategory Individual utilities
+-@direntry
+-* cvs: (cvs)CVS commands.       Concurrent Versions System
++* CVS: (cvs).                         Concurrent Versions System
+ @end direntry
  
-diff -Nur cvs-1.11.1p1.orig/doc/cvsclient.texi cvs-1.11.1p1/doc/cvsclient.texi
---- cvs-1.11.1p1.orig/doc/cvsclient.texi       Tue Apr 24 20:14:52 2001
-+++ cvs-1.11.1p1/doc/cvsclient.texi    Sat Aug  4 18:46:45 2001
+ @comment The titlepage section does not appear in the Info file.
+--- cvs-1.11.7/doc/cvsclient.texi.orig 2001-09-05 23:26:49.000000000 +0200
++++ cvs-1.11.7/doc/cvsclient.texi      2003-10-10 22:14:43.796493256 +0200
 @@ -3,9 +3,9 @@
  @setfilename cvsclient.info
- @include CVSvn.texi
+ @include version-client.texi
  
 -@dircategory Programming
 +@dircategory Version Control:

diff --git a/cvs-ipv6.patch b/cvs-ipv6.patch
index 3ce3cf641fd192b36a2b6ace90de18b193924126..2761ce139789e079cae83530e7090892c81960a7 100644 (file)
--- a/cvs-ipv6.patch
+++ b/cvs-ipv6.patch
@@ -1,7 +1,7 @@
-diff -urN cvs-1.11.7.org/src/client.c cvs-1.11.7/src/client.c
---- cvs-1.11.7.org/src/client.c        2003-09-30 10:55:57.000000000 +0200
-+++ cvs-1.11.7/src/client.c    2003-09-30 10:58:51.000000000 +0200
-@@ -80,7 +80,7 @@
+diff -urN cvs-1.11.2.org/src/client.c cvs-1.11.2/src/client.c
+--- cvs-1.11.2.org/src/client.c        Mon May 13 22:32:42 2002
++++ cvs-1.11.2/src/client.c    Mon May 13 23:18:44 2002
+@@ -82,7 +82,7 @@
  /* This is needed for GSSAPI encryption.  */
  static gss_ctx_id_t gcontext;
  
@@ -10,7 +10,7 @@ diff -urN cvs-1.11.7.org/src/client.c cvs-1.11.7/src/client.c
  
  # endif /* HAVE_GSSAPI */
  
-@@ -131,7 +131,7 @@
+@@ -135,7 +135,7 @@
  static size_t try_read_from_server PROTO ((char *, size_t));
  
  static void auth_server PROTO ((cvsroot_t *, struct buffer *, struct buffer *,
@@ -19,7 +19,7 @@ diff -urN cvs-1.11.7.org/src/client.c cvs-1.11.7/src/client.c
  
  /* We need to keep track of the list of directories we've sent to the
     server.  This list, along with the current CVSROOT, will help us
-@@ -3487,30 +3487,6 @@
+@@ -3646,30 +3646,6 @@
  
  
  #if defined (AUTH_CLIENT_SUPPORT) || defined (HAVE_KERBEROS) || defined (HAVE_GSSAPI)
@@ -50,7 +50,7 @@ diff -urN cvs-1.11.7.org/src/client.c cvs-1.11.7/src/client.c
  
  
  
-@@ -3685,34 +3661,59 @@
+@@ -3871,34 +3841,59 @@
      int do_gssapi;
  {
      int sock;
@@ -130,7 +130,7 @@ diff -urN cvs-1.11.7.org/src/client.c cvs-1.11.7/src/client.c
  
      if (verify_only)
      {
-@@ -3746,13 +3747,13 @@
+@@ -3930,13 +3925,13 @@
  
  
  static void
@@ -146,7 +146,7 @@ diff -urN cvs-1.11.7.org/src/client.c cvs-1.11.7/src/client.c
  {
      char *username;                   /* the username we use to connect */
      char no_passwd = 0;                       /* gets set if no password found */
-@@ -3782,7 +3783,7 @@
+@@ -3965,7 +3960,7 @@
            error (1, 0, "gserver currently only enabled for socket connections");
        }
  
@@ -155,7 +155,7 @@ diff -urN cvs-1.11.7.org/src/client.c cvs-1.11.7/src/client.c
        {
            error (1, 0,
                    "authorization failed: server %s rejected access to %s",
-@@ -3798,7 +3799,7 @@
+@@ -3980,7 +3975,7 @@
        char *begin      = NULL;
        char *password   = NULL;
        char *end        = NULL;
@@ -164,7 +164,7 @@ diff -urN cvs-1.11.7.org/src/client.c cvs-1.11.7/src/client.c
        if (verify_only)
        {
            begin = "BEGIN VERIFICATION REQUEST";
-@@ -3979,37 +3980,76 @@
+@@ -4117,37 +4112,76 @@
      int s;
      const char *portenv;
      int port;
@@ -262,7 +262,7 @@ diff -urN cvs-1.11.7.org/src/client.c cvs-1.11.7/src/client.c
        int laddrlen;
        KTEXT_ST ticket;
        MSG_DAT msg_data;
-@@ -4084,10 +4124,10 @@
+@@ -4222,10 +4256,10 @@
   */
  #define BUFSIZE 1024
  static int
@@ -275,7 +275,7 @@ diff -urN cvs-1.11.7.org/src/client.c cvs-1.11.7/src/client.c
  {
      char *str;
      char buf[BUFSIZE];
-@@ -4100,9 +4140,9 @@
+@@ -4238,9 +4272,9 @@
      if (send (sock, str, strlen (str), 0) < 0)
        error (1, 0, "cannot send: %s", SOCK_STRERROR (SOCK_ERRNO));
  
@@ -287,10 +287,10 @@ diff -urN cvs-1.11.7.org/src/client.c cvs-1.11.7/src/client.c
      tok_in.length = strlen (buf);
      tok_in.value = buf;
      gss_import_name (&stat_min, &tok_in, GSS_C_NT_HOSTBASED_SERVICE,
-diff -urN cvs-1.11.7.org/src/cvs.h cvs-1.11.7/src/cvs.h
---- cvs-1.11.7.org/src/cvs.h   2003-09-30 10:55:57.000000000 +0200
-+++ cvs-1.11.7/src/cvs.h       2003-09-30 10:58:51.000000000 +0200
-@@ -366,6 +366,7 @@
+diff -urN cvs-1.11.2.org/src/cvs.h cvs-1.11.2/src/cvs.h
+--- cvs-1.11.2.org/src/cvs.h   Mon May 13 22:32:42 2002
++++ cvs-1.11.2/src/cvs.h       Mon May 13 22:32:57 2002
+@@ -365,6 +365,7 @@
  extern int really_quiet, quiet;
  extern int use_editor;
  extern int cvswrite;
@@ -298,9 +298,9 @@ diff -urN cvs-1.11.7.org/src/cvs.h cvs-1.11.7/src/cvs.h
  extern mode_t cvsumask;
  
  
-diff -urN cvs-1.11.7.org/src/main.c cvs-1.11.7/src/main.c
---- cvs-1.11.7.org/src/main.c  2003-09-30 10:55:57.000000000 +0200
-+++ cvs-1.11.7/src/main.c      2003-09-30 10:59:19.000000000 +0200
+diff -urN cvs-1.11.2.org/src/main.c cvs-1.11.2/src/main.c
+--- cvs-1.11.2.org/src/main.c  Mon May 13 22:32:42 2002
++++ cvs-1.11.2/src/main.c      Mon May 13 22:32:57 2002
 @@ -13,6 +13,7 @@
   */
  
@@ -326,16 +326,16 @@ diff -urN cvs-1.11.7.org/src/main.c cvs-1.11.7/src/main.c
      "    (specify --help-options for a list of options)\n",
      "  where command is add, admin, etc.\n",
      "    (specify --help-commands for a list of commands\n",
-@@ -406,7 +408,7 @@
+@@ -407,7 +409,7 @@
      int help = 0;             /* Has the user asked for help?  This
                                   lets us support the `cvs -H cmd'
                                   convention to give help for cmd. */
 -    static const char short_options[] = "+Qqrwtnvb:T:e:d:Hfz:s:xa";
-+    static const char short_options[] = "+Qqrwtnvb:T:e:d:Hfz:s:xa46";
++    static const char short_options[] = "+46Qqrwtnvb:T:e:d:Hfz:s:xa";
      static struct option long_options[] =
      {
          {"help", 0, NULL, 'H'},
-@@ -519,6 +521,12 @@
+@@ -520,6 +522,12 @@
                /* --allow-root */
                root_allow_add (optarg);
                break;
@@ -348,10 +348,10 @@ diff -urN cvs-1.11.7.org/src/main.c cvs-1.11.7/src/main.c
            case 'Q':
                really_quiet = 1;
                /* FALL THROUGH */
-diff -urN cvs-1.11.7.org/src/server.c cvs-1.11.7/src/server.c
---- cvs-1.11.7.org/src/server.c        2003-09-30 10:55:57.000000000 +0200
-+++ cvs-1.11.7/src/server.c    2003-09-30 10:58:51.000000000 +0200
-@@ -5753,8 +5753,8 @@
+diff -urN cvs-1.11.2.org/src/server.c cvs-1.11.2/src/server.c
+--- cvs-1.11.2.org/src/server.c        Mon May 13 22:32:42 2002
++++ cvs-1.11.2/src/server.c    Mon May 13 22:32:57 2002
+@@ -5895,8 +5895,8 @@
  {
      int status;
      char instance[INST_SZ];
@@ -362,7 +362,7 @@ diff -urN cvs-1.11.7.org/src/server.c cvs-1.11.7/src/server.c
      int len;
      KTEXT_ST ticket;
      AUTH_DAT auth;
-@@ -5831,7 +5831,8 @@
+@@ -5985,7 +5985,8 @@
  gserver_authenticate_connection ()
  {
      char hostname[MAXHOSTNAMELEN];
@@ -372,7 +372,7 @@ diff -urN cvs-1.11.7.org/src/server.c cvs-1.11.7/src/server.c
      gss_buffer_desc tok_in, tok_out;
      char buf[1024];
      OM_uint32 stat_min, ret;
-@@ -5841,11 +5842,16 @@
+@@ -5995,11 +5996,16 @@
      gss_OID mechid;
  
      gethostname (hostname, sizeof hostname);

diff --git a/cvs.spec b/cvs.spec
index fb33fe4acc0fee58abc4982270f8c1caef5e60cd..bd97f34311b9ff9538ca201f7d2292ca66a6e5b2 100644 (file)
--- a/cvs.spec
+++ b/cvs.spec
@@ -9,13 +9,13 @@ Summary(tr):  S
 Summary(uk):   óÉÓÔÅÍÁ ËÅÒÕ×ÁÎÎÑ ×ÅÒÓ¦ÑÍÉ
 Summary(zh_CN):        ²¢·¢µÄ°æ±¾¹ÜÀíϵͳCVS
 Name:          cvs
-Version:       1.11.7
+Version:       1.11.8
 Release:       1
 License:       GPL
 Group:         Development/Version Control
 # new feature release: http://ftp.cvshome.org/release/feature/cvs-1.12.1/cvs-1.12.1.tar.bz2
 Source0:       http://ftp.cvshome.org/release/stable/%{name}-%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 68269c120f8b45a2edb8019b656079d1
+# Source0-md5: e878928d534d7bd9e60e4d97807dd888
 Source1:       %{name}.inetd
 # based on:    http://www.t17.ds.pwr.wroc.pl/~misiek/ipv6/cvs-1.11.2-20020513-ipv6.patch.gz
 Patch0:                %{name}-ipv6.patch
@@ -25,6 +25,7 @@ Patch3:               %{name}-cvspass.patch
 Patch4:                %{name}-home_etc.patch
 Patch5:                %{name}-newnline.patch
 Patch6:                %{name}-no_libnsl.patch
+Patch7:                %{name}-info.patch
 URL:           http://www.cyclic.com/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -181,9 +182,9 @@ pserver.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %build
-rm -f missing
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}