commit 07cd2e49e2965dc4deed1706fe5617550191ef7d
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Thu Feb 2 09:01:17 2023 +0100
rel 20; rediff patches
cvs-cvspass.patch | 10 +++++-----
cvs-no_libnsl.patch | 11 ++++++-----
cvs.spec | 2 +-
3 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/cvs.spec b/cvs.spec
index d3df2ea..f62c166 100644
--- 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
diff --git a/cvs-cvspass.patch b/cvs-cvspass.patch
index 9954e6c..f4e0460 100644
--- 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 1b5c3f3..01ac92b 100644
--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cvs.git/commitdiff/07cd2e49e2965dc4deed1706fe5617550191ef7d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
