[packages/cvs-nserver] - rediff patches, rebuild with openssl 3.0.0, rel 35
baggins
baggins at pld-linux.org
Sat Oct 9 23:43:42 CEST 2021
commit f9eb76f8c5e4be3dcbbc10c99961c440fcfcb6c3
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Oct 9 23:43:17 2021 +0200
- rediff patches, rebuild with openssl 3.0.0, rel 35
cvs-nserver-am_ac.patch | 54 ++++++++++----------
cvs-nserver-home_etc.patch | 120 +++++++++++++++++++++++----------------------
cvs-nserver.spec | 2 +-
3 files changed, 89 insertions(+), 87 deletions(-)
---
diff --git a/cvs-nserver.spec b/cvs-nserver.spec
index d0b529f..a270001 100644
--- a/cvs-nserver.spec
+++ b/cvs-nserver.spec
@@ -9,7 +9,7 @@ Summary(pl.UTF-8): Concurrent Versions System - nserver
Summary(tr.UTF-8): Sürüm denetim sistemi - nserver
Name: cvs-nserver
Version: 1.11.1.52
-Release: 34
+Release: 35
License: GPL
Group: Development/Version Control
Source0: http://dl.sourceforge.net/cvs-nserver/%{name}-%{version}.tar.gz
diff --git a/cvs-nserver-am_ac.patch b/cvs-nserver-am_ac.patch
index 253edae..cd4a650 100644
--- a/cvs-nserver-am_ac.patch
+++ b/cvs-nserver-am_ac.patch
@@ -1,7 +1,16 @@
-diff -urN cvs-nserver-1.11.1.52.orig/configure.in cvs-nserver-1.11.1.52/configure.in
---- cvs-nserver-1.11.1.52.orig/configure.in Sun May 19 11:06:44 2002
-+++ cvs-nserver-1.11.1.52/configure.in Sun May 19 11:10:49 2002
-@@ -10,7 +10,6 @@
+diff -urNp -x '*.orig' cvs-nserver-1.11.1.52.org/acl/Makefile.am cvs-nserver-1.11.1.52/acl/Makefile.am
+--- cvs-nserver-1.11.1.52.org/acl/Makefile.am 2002-01-19 18:33:05.000000000 +0100
++++ cvs-nserver-1.11.1.52/acl/Makefile.am 2021-10-09 23:42:06.967727032 +0200
+@@ -1,5 +1,3 @@
+-AUTOMAKE_OPTIONS = ../lib/ansi2knr
+-
+ INCLUDES = -I$(top_srcdir)/lib
+
+ TESTS = check_stringbuf check_user_acl \
+diff -urNp -x '*.orig' cvs-nserver-1.11.1.52.org/configure.in cvs-nserver-1.11.1.52/configure.in
+--- cvs-nserver-1.11.1.52.org/configure.in 2002-02-10 00:26:03.000000000 +0100
++++ cvs-nserver-1.11.1.52/configure.in 2021-10-09 23:42:06.967727032 +0200
+@@ -10,7 +10,6 @@ AM_CONFIG_HEADER(config.h src/options.h)
# initialize test framework
AC_CONFIG_TESTDIR(tests)
AC_CONFIG_FILES([tests/Makefile \
@@ -9,7 +18,7 @@ diff -urN cvs-nserver-1.11.1.52.orig/configure.in cvs-nserver-1.11.1.52/configur
tests/package.m4 \
tests/cvs:tests/wrapsh.in],
[chmod +x tests/cvs])
-@@ -22,10 +21,7 @@
+@@ -22,10 +21,7 @@ AC_PATH_PROG(EXPR, expr)
# their path, the installer can configure with a path that has GNU m4
# first and get that path embedded in the installed autoconf and
# autoheader scripts.
@@ -21,7 +30,7 @@ diff -urN cvs-nserver-1.11.1.52.orig/configure.in cvs-nserver-1.11.1.52/configur
# This is needed because Automake does not seem to realize there is
# a AC-SUBST inside AC-PROG-GNU-M4. Grmph!
AC_SUBST(M4)
-@@ -95,8 +95,6 @@
+@@ -99,8 +95,6 @@ CFLAGS="$CFLAGS -D_SYSV3"
LIBS="-lcrypt $LIBS"
fi
@@ -30,7 +39,7 @@ diff -urN cvs-nserver-1.11.1.52.orig/configure.in cvs-nserver-1.11.1.52/configur
AM_MAINTAINER_MODE
AC_HEADER_DIRENT
-@@ -172,7 +172,7 @@
+@@ -201,7 +195,7 @@ AC_SYS_LONG_FILE_NAMES
AC_FUNC_FNMATCH
if test "$ac_cv_func_fnmatch_works" = no; then
@@ -39,16 +48,16 @@ diff -urN cvs-nserver-1.11.1.52.orig/configure.in cvs-nserver-1.11.1.52/configur
fi
# Try to find connect and gethostbyname.
-@@ -277,7 +277,7 @@
+@@ -315,7 +309,7 @@ if test "$encryption" = "true"; then
AC_DEFINE(ENCRYPTION)
fi
-AC_CHECK_FUNC(gethostname, :, LIBOBJS="$LIBOBJS hostname.o")
+AC_CHECK_FUNC(gethostname, :, [AC_LIBOBJ([hostname])])
- # Check for options requesting client and server feature. If none are
- # given and we have connect(), we want the full client & server arrangement.
-@@ -361,7 +361,7 @@
+ #
+ # use --with-openssl to turn on support for OpenSSL
+@@ -428,7 +422,7 @@ AC_CACHE_CHECK(for cygwin32, ccvs_cv_sys
[AC_TRY_COMPILE([], [return __CYGWIN32__;],
ccvs_cv_sys_cygwin32=yes, ccvs_cv_sys_cygwin32=no)])
if test $ccvs_cv_sys_cygwin32 = yes; then
@@ -57,7 +66,7 @@ diff -urN cvs-nserver-1.11.1.52.orig/configure.in cvs-nserver-1.11.1.52/configur
LIBS="$LIBS -ladvapi32"
dnl On Windows you can only change file times if you can write to
-@@ -453,7 +453,6 @@
+@@ -457,7 +451,6 @@ AC_CONFIG_FILES([Makefile \
lib/Makefile \
man/Makefile \
os2/Makefile \
@@ -65,9 +74,9 @@ diff -urN cvs-nserver-1.11.1.52.orig/configure.in cvs-nserver-1.11.1.52/configur
src/Makefile \
src/tests/Makefile \
tools/Makefile \
-diff -urN cvs-nserver-1.11.1.4.org/doc/Makefile.am cvs-nserver-1.11.1.4/doc/Makefile.am
---- cvs-nserver-1.11.1.4.org/doc/Makefile.am Sun May 19 11:06:44 2002
-+++ cvs-nserver-1.11.1.4/doc/Makefile.am Sun May 19 11:13:13 2002
+diff -urNp -x '*.orig' cvs-nserver-1.11.1.52.org/doc/Makefile.am cvs-nserver-1.11.1.52/doc/Makefile.am
+--- cvs-nserver-1.11.1.52.org/doc/Makefile.am 2001-10-13 19:47:03.000000000 +0200
++++ cvs-nserver-1.11.1.52/doc/Makefile.am 2021-10-09 23:42:06.967727032 +0200
@@ -14,7 +14,7 @@
#DISTFILES = \
@@ -77,18 +86,9 @@ diff -urN cvs-nserver-1.11.1.4.org/doc/Makefile.am cvs-nserver-1.11.1.4/doc/Make
# AUTOMAKE_OPTIONS = no-texinfo.tex
-diff -ur cvs-nserver-1.11.1.52.orig/acl/Makefile.am cvs-nserver-1.11.1.52/acl/Makefile.am
---- cvs-nserver-1.11.1.52.orig/acl/Makefile.am 2002-01-19 17:33:05.000000000 +0000
-+++ cvs-nserver-1.11.1.52/acl/Makefile.am 2013-05-21 10:51:44.498634651 +0000
-@@ -1,5 +1,3 @@
--AUTOMAKE_OPTIONS = ../lib/ansi2knr
--
- INCLUDES = -I$(top_srcdir)/lib
-
- TESTS = check_stringbuf check_user_acl \
-diff -ur cvs-nserver-1.11.1.52.orig/src/Makefile.am cvs-nserver-1.11.1.52/src/Makefile.am
---- cvs-nserver-1.11.1.52.orig/src/Makefile.am 2013-05-21 10:19:41.000000000 +0000
-+++ cvs-nserver-1.11.1.52/src/Makefile.am 2013-05-21 10:52:36.445634549 +0000
+diff -urNp -x '*.orig' cvs-nserver-1.11.1.52.org/src/Makefile.am cvs-nserver-1.11.1.52/src/Makefile.am
+--- cvs-nserver-1.11.1.52.org/src/Makefile.am 2021-10-09 23:42:06.901060450 +0200
++++ cvs-nserver-1.11.1.52/src/Makefile.am 2021-10-09 23:42:06.967727032 +0200
@@ -12,8 +12,6 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
diff --git a/cvs-nserver-home_etc.patch b/cvs-nserver-home_etc.patch
index 7a61ac3..1ab2779 100644
--- a/cvs-nserver-home_etc.patch
+++ b/cvs-nserver-home_etc.patch
@@ -1,14 +1,67 @@
---- cvs-1.11.1p1.org/src/login.c Thu Sep 6 18:18:29 2001
-+++ cvs-1.11.1p1/src/login.c Wed Dec 11 15:19:42 2002
-@@ -7,6 +7,7 @@
- * Allow user to log in for an authenticating server.
+diff -urNp -x '*.orig' cvs-nserver-1.11.1.52.org/src/cvsrc.c cvs-nserver-1.11.1.52/src/cvsrc.c
+--- cvs-nserver-1.11.1.52.org/src/cvsrc.c 2001-05-26 14:43:51.000000000 +0200
++++ cvs-nserver-1.11.1.52/src/cvsrc.c 2021-10-09 23:42:07.291059953 +0200
+@@ -9,13 +9,14 @@
*/
+
+#include <sys/stat.h>
#include "cvs.h"
#include "getline.h"
-@@ -30,7 +31,7 @@
+ /* this file is to be found in the user's home directory */
+
+ #ifndef CVSRC_FILENAME
+-#define CVSRC_FILENAME ".cvsrc"
++#define CVSRC_FILENAME "cvsrc"
+ #endif
+ char cvsrc[] = CVSRC_FILENAME;
+
+@@ -36,6 +37,9 @@ read_cvsrc (argc, argv, cmdname)
+ char *homeinit;
+ FILE *cvsrcfile;
+
++ char *path;
++ struct stat st;
++
+ char *line;
+ int line_length;
+ size_t line_chars_allocated;
+@@ -80,10 +84,22 @@ read_cvsrc (argc, argv, cmdname)
+ if (!homedir)
+ return;
+
++ if ( (path=getenv("CONFIG_DIR")) && path[0] ) {
++ path=(char*) malloc(strlen(homedir)+strlen(getenv("CONFIG_DIR"))+2);
++ sprintf(path, "%s/%s", homedir, getenv("CONFIG_DIR"));
++ } else path=(char *) NULL;
++ if ( path && stat(path,&st)!=-1 && S_ISDIR(st.st_mode) ) {
++ homeinit = (char *) xmalloc (strlen (path) + strlen (cvsrc) + 3);
++ sprintf (homeinit, "%s/%s", path, cvsrc);
++ }
++ else {
+ homeinit = (char *) xmalloc (strlen (homedir) + strlen (cvsrc) + 10);
+ strcpy (homeinit, homedir);
+ strcat (homeinit, "/");
+ strcat (homeinit, cvsrc);
++ } /* else */
++ if (path)
++ free(path);
+
+ /* if it can't be read, there's no point to continuing */
+
+diff -urNp -x '*.orig' cvs-nserver-1.11.1.52.org/src/login.c cvs-nserver-1.11.1.52/src/login.c
+--- cvs-nserver-1.11.1.52.org/src/login.c 2021-10-09 23:42:07.224393371 +0200
++++ cvs-nserver-1.11.1.52/src/login.c 2021-10-09 23:42:07.291059953 +0200
+@@ -10,6 +10,7 @@
+
+ #include "config.h"
+
++#include <sys/stat.h>
+ #include "cvs.h"
+ #include "login.h"
+ #include "getline.h"
+@@ -36,7 +37,7 @@ extern char *GETPASS ();
#endif
#ifndef CVS_PASSWORD_FILE
@@ -17,7 +70,7 @@
#endif
/* If non-NULL, get_cvs_password() will just return this. */
-@@ -44,6 +45,8 @@
+@@ -50,6 +51,8 @@ construct_cvspass_filename ()
{
char *homedir;
char *passfile;
@@ -26,7 +79,7 @@
/* Environment should override file. */
if ((passfile = getenv ("CVS_PASSFILE")) != NULL)
-@@ -65,8 +68,17 @@
+@@ -71,8 +74,17 @@ construct_cvspass_filename ()
return (char *) NULL;
}
@@ -45,7 +98,7 @@
strcpy (passfile, homedir);
#ifndef NO_SLASH_AFTER_HOME
/* NO_SLASH_AFTER_HOME is defined for VMS, where foo:[bar]/.cvspass is not
-@@ -75,7 +87,11 @@
+@@ -81,7 +93,11 @@ construct_cvspass_filename ()
kind of thing.... */
strcat (passfile, "/");
#endif
@@ -57,54 +110,3 @@
/* Safety first and last, Scouts. */
if (isfile (passfile))
---- cvs-1.11.1p1.org/src/cvsrc.c Sun Dec 22 14:18:41 2002
-+++ cvs-1.11.1p1/src/cvsrc.c Sun Dec 22 14:30:43 2002
-@@ -9,13 +9,14 @@
- */
-
-
-+#include <sys/stat.h>
- #include "cvs.h"
- #include "getline.h"
-
- /* this file is to be found in the user's home directory */
-
- #ifndef CVSRC_FILENAME
--#define CVSRC_FILENAME ".cvsrc"
-+#define CVSRC_FILENAME "cvsrc"
- #endif
- char cvsrc[] = CVSRC_FILENAME;
-
-@@ -36,6 +37,9 @@
- char *homeinit;
- FILE *cvsrcfile;
-
-+ char *path;
-+ struct stat st;
-+
- char *line;
- int line_length;
- size_t line_chars_allocated;
-@@ -73,10 +77,22 @@
- if (!homedir)
- return;
-
-+ if ( (path=getenv("CONFIG_DIR")) && path[0] ) {
-+ path=(char*) malloc(strlen(homedir)+strlen(getenv("CONFIG_DIR"))+2);
-+ sprintf(path, "%s/%s", homedir, getenv("CONFIG_DIR"));
-+ } else path=(char *) NULL;
-+ if ( path && stat(path,&st)!=-1 && S_ISDIR(st.st_mode) ) {
-+ homeinit = (char *) xmalloc (strlen (path) + strlen (cvsrc) + 3);
-+ sprintf (homeinit, "%s/%s", path, cvsrc);
-+ }
-+ else {
- homeinit = (char *) xmalloc (strlen (homedir) + strlen (cvsrc) + 10);
- strcpy (homeinit, homedir);
- strcat (homeinit, "/");
- strcat (homeinit, cvsrc);
-+ } /* else */
-+ if (path)
-+ free(path);
-
- /* if it can't be read, there's no point to continuing */
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cvs-nserver.git/commitdiff/f9eb76f8c5e4be3dcbbc10c99961c440fcfcb6c3
More information about the pld-cvs-commit
mailing list