rel 20; rediff patches

diff --git a/cvs-cvspass.patch b/cvs-cvspass.patch
index 9954e6ccb10d2e9f603ab463ae68aca07f314892..f4e04608f5a52a4a3176075cac27d94b87f4ac91 100644 (file)
--- a/cvs-cvspass.patch
+++ b/cvs-cvspass.patch
@@ -1,7 +1,7 @@
-diff -burN cvs-1.11.21.orig/src/login.c cvs-1.11.21/src/login.c
---- cvs-1.11.21.orig/src/login.c       2006-01-13 23:13:53.072883256 +0100
-+++ cvs-1.11.21/src/login.c    2006-01-13 23:15:29.033295056 +0100
-@@ -313,9 +313,25 @@
+diff -urNp -x '*.orig' cvs-1.12.13.org/src/login.c cvs-1.12.13/src/login.c
+--- cvs-1.12.13.org/src/login.c        2005-05-13 23:47:28.000000000 +0200
++++ cvs-1.12.13/src/login.c    2023-02-02 09:01:00.365363622 +0100
+@@ -309,9 +309,25 @@ internal error: can only call password_e
      fp = CVS_FOPEN (passfile, "r");
      if (fp == NULL)
      {
@@ -26,4 +26,4 @@ diff -burN cvs-1.11.21.orig/src/login.c cvs-1.11.21/src/login.c
 +    }
  
      /* Check each line to see if we have this entry already. */
-     line = 0;
+     line = 0L;

diff --git a/cvs-no_libnsl.patch b/cvs-no_libnsl.patch
index 1b5c3f3a73b99dd3f7d5b0d98d44db6b853f2c67..01ac92b298dd2120a1374b6434d8ba23724a5019 100644 (file)
--- a/cvs-no_libnsl.patch
+++ b/cvs-no_libnsl.patch
@@ -1,7 +1,8 @@
---- cvs-1.11.4/configure.in.orig       Fri Jan 17 19:46:05 2003
-+++ cvs-1.11.4/configure.in    Fri Jan 17 19:55:47 2003
-@@ -272,13 +272,12 @@
- AC_FUNC_MMAP
+diff -urNp -x '*.orig' cvs-1.12.13.org/configure.in cvs-1.12.13/configure.in
+--- cvs-1.12.13.org/configure.in       2005-10-03 15:34:45.000000000 +0200
++++ cvs-1.12.13/configure.in   2023-02-02 09:00:39.745239468 +0100
+@@ -514,13 +514,12 @@ dnl for debugging code
+ CVS_FUNC_PRINTF_PTR
  
  # Try to find connect and gethostbyname.
 -AC_CHECK_LIB(nsl, main)
@@ -13,5 +14,5 @@
 -AC_SEARCH_LIBS(gethostbyname, netinet)
 +AC_SEARCH_LIBS(gethostbyname, netinet nsl)
  
+ AC_SUBST(cvs_client_objects)
  
- dnl

diff --git a/cvs.spec b/cvs.spec
index d3df2ea7283a5dc2199e140b3a4b7fb26954f48b..f62c1664856fbd32239f5d7c1f4ebf6fa22f0dc0 100644 (file)
--- a/cvs.spec
+++ b/cvs.spec
@@ -14,7 +14,7 @@ Summary(uk.UTF-8):    Система керування версіями
 Summary(zh_CN.UTF-8):  并发的版本管理系统CVS
 Name:          cvs
 Version:       1.12.13
-Release:       19
+Release:       20
 License:       GPL
 Group:         Development/Version Control
 Source0:       http://ftp.gnu.org/non-gnu/cvs/source/feature/%{version}/%{name}-%{version}.tar.bz2