[csw-devel] SF.net SVN: gar:[13321] csw/mgar/pkg/cvs/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Feb 15 12:00:33 CET 2011
Revision: 13321
http://gar.svn.sourceforge.net/gar/?rev=13321&view=rev
Author: dmichelsen
Date: 2011-02-15 11:00:32 +0000 (Tue, 15 Feb 2011)
Log Message:
-----------
cvs: Add patch to reenable extssh for Eclipse again
Modified Paths:
--------------
csw/mgar/pkg/cvs/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/cvs/trunk/files/README.CSW
csw/mgar/pkg/cvs/trunk/files/cvs-1.12.13-extssh.diff
Modified: csw/mgar/pkg/cvs/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cvs/trunk/Makefile 2011-02-15 08:58:24 UTC (rev 13320)
+++ csw/mgar/pkg/cvs/trunk/Makefile 2011-02-15 11:00:32 UTC (rev 13321)
@@ -18,8 +18,16 @@
MASTER_SITES = http://ftp.gnu.org/non-gnu/cvs/source/feature/$(VERSION)/
UPSTREAM_MASTER_SITES = http://ftp.gnu.org/non-gnu/cvs/source/feature/
-DISTFILES = $(DISTNAME).tar.bz2
+DISTFILES += $(DISTNAME).tar.bz2
+DISTFILES += README.CSW
+# Allow extssh as connection method by patch taken from
+# http://lists.gnu.org/archive/html/bug-cvs/2008-01/msg00007.html
+PATCHFILES += cvs-1.12.13-extssh.diff
+
+# The above is a functionality patch
+VERSION_FLAG_PATCH = 1
+
PACKAGES += CSWcvs
CATALOGNAME_CSWcvs = cvs
SPKG_DESC_CSWcvs = $(DESCRIPTION)
Added: csw/mgar/pkg/cvs/trunk/files/README.CSW
===================================================================
--- csw/mgar/pkg/cvs/trunk/files/README.CSW (rev 0)
+++ csw/mgar/pkg/cvs/trunk/files/README.CSW 2011-02-15 11:00:32 UTC (rev 13321)
@@ -0,0 +1,11 @@
+README.CSW for cvs
+------------------
+
+The following functionality patches have been applied:
+
+* Eclipse, cvs, and extssh: cvs-1.12.13-extssh.diff
+
+ The patch was taken from
+ http://lists.gnu.org/archive/html/bug-cvs/2008-01/msg00007.html
+
+
Added: csw/mgar/pkg/cvs/trunk/files/cvs-1.12.13-extssh.diff
===================================================================
--- csw/mgar/pkg/cvs/trunk/files/cvs-1.12.13-extssh.diff (rev 0)
+++ csw/mgar/pkg/cvs/trunk/files/cvs-1.12.13-extssh.diff 2011-02-15 11:00:32 UTC (rev 13321)
@@ -0,0 +1,181 @@
+diff -r -c3 cvs-1.12.13/src/client.c cvs-1.12.13+extssh/src/client.c
+*** cvs-1.12.13/src/client.c Sun Oct 2 17:17:20 2005
+--- cvs-1.12.13+extssh/src/client.c Tue Jan 22 16:45:57 2008
+***************
+*** 3904,3910 ****
+ error (1, 0, "try :server: instead");
+ #else /* ! NO_EXT_METHOD */
+ start_rsh_server (root, to_server_p,
+! from_server_p);
+ #endif /* NO_EXT_METHOD */
+ break;
+
+--- 3904,3920 ----
+ error (1, 0, "try :server: instead");
+ #else /* ! NO_EXT_METHOD */
+ start_rsh_server (root, to_server_p,
+! from_server_p, RSH_DFLT);
+! #endif /* NO_EXT_METHOD */
+! break;
+!
+! case extssh_method:
+! #ifdef NO_EXT_METHOD
+! error (0, 0, ":extssh: method not supported by this port of CVS");
+! error (1, 0, "try :server: instead");
+! #else /* ! NO_EXT_METHOD */
+! start_rsh_server (root, to_server_p,
+! from_server_p, "ssh");
+ #endif /* NO_EXT_METHOD */
+ break;
+
+diff -r -c3 cvs-1.12.13/src/root.c cvs-1.12.13+extssh/src/root.c
+*** cvs-1.12.13/src/root.c Sun Sep 25 02:38:29 2005
+--- cvs-1.12.13+extssh/src/root.c Tue Jan 22 16:37:32 2008
+***************
+*** 19,29 ****
+ #include "getline.h"
+
+ /* Printable names for things in the current_parsed_root->method enum variable.
+! Watch out if the enum is changed in cvs.h! */
+
+ const char method_names[][16] = {
+ "undefined", "local", "server (rsh)", "pserver",
+! "kserver", "gserver", "ext", "fork"
+ };
+
+ #ifndef DEBUG
+--- 19,29 ----
+ #include "getline.h"
+
+ /* Printable names for things in the current_parsed_root->method enum variable.
+! Watch out if the enum is changed in root.h! */
+
+ const char method_names[][16] = {
+ "undefined", "local", "server (rsh)", "pserver",
+! "kserver", "gserver", "ext", "extssh", "fork"
+ };
+
+ #ifndef DEBUG
+***************
+*** 549,554 ****
+--- 549,556 ----
+ newroot->method = server_method;
+ else if (!strcasecmp (method, "ext"))
+ newroot->method = ext_method;
++ else if (!strcasecmp (method, "extssh"))
++ newroot->method = extssh_method;
+ else if (!strcasecmp (method, "fork"))
+ newroot->method = fork_method;
+ else
+***************
+*** 827,832 ****
+--- 829,835 ----
+ break;
+ case server_method:
+ case ext_method:
++ case extssh_method:
+ no_port = 1;
+ /* no_password already set */
+ check_hostname = 1;
+diff -r -c3 cvs-1.12.13/src/root.h cvs-1.12.13+extssh/src/root.h
+*** cvs-1.12.13/src/root.h Sun Sep 25 02:38:29 2005
+--- cvs-1.12.13+extssh/src/root.h Tue Jan 22 16:35:13 2008
+***************
+*** 22,27 ****
+--- 22,28 ----
+ kserver_method,
+ gserver_method,
+ ext_method,
++ extssh_method,
+ fork_method
+ } CVSmethod;
+ extern const char method_names[][16]; /* change this in root.c if you change
+diff -r -c3 cvs-1.12.13/src/rsh-client.c cvs-1.12.13+extssh/src/rsh-client.c
+*** cvs-1.12.13/src/rsh-client.c Sun Oct 2 17:17:21 2005
+--- cvs-1.12.13+extssh/src/rsh-client.c Tue Jan 22 16:47:43 2008
+***************
+*** 40,46 ****
+ up and running, and that's most important. */
+ void
+ start_rsh_server (cvsroot_t *root, struct buffer **to_server_p,
+! struct buffer **from_server_p)
+ {
+ int pipes[2];
+ int child_pid;
+--- 40,46 ----
+ up and running, and that's most important. */
+ void
+ start_rsh_server (cvsroot_t *root, struct buffer **to_server_p,
+! struct buffer **from_server_p, const char *rsh_default)
+ {
+ int pipes[2];
+ int child_pid;
+***************
+*** 78,84 ****
+ example in CVS_RSH or other such mechanisms to be devised,
+ if that is what they want (the manual already tells them
+ that). */
+! cvs_rsh = RSH_DFLT;
+ if (!cvs_server)
+ cvs_server = "cvs";
+
+--- 78,84 ----
+ example in CVS_RSH or other such mechanisms to be devised,
+ if that is what they want (the manual already tells them
+ that). */
+! cvs_rsh = rsh_default;
+ if (!cvs_server)
+ cvs_server = "cvs";
+
+***************
+*** 126,132 ****
+
+ void
+ start_rsh_server (cvsroot_t *root, struct buffer **to_server_p,
+! struct buffer **from_server_p)
+ {
+ /* If you're working through firewalls, you can set the
+ CVS_RSH environment variable to a script which uses rsh to
+--- 126,132 ----
+
+ void
+ start_rsh_server (cvsroot_t *root, struct buffer **to_server_p,
+! struct buffer **from_server_p, const char *rsh_default)
+ {
+ /* If you're working through firewalls, you can set the
+ CVS_RSH environment variable to a script which uses rsh to
+***************
+*** 140,146 ****
+ int child_pid;
+
+ if (!cvs_rsh)
+! cvs_rsh = RSH_DFLT;
+ if (!cvs_server)
+ cvs_server = "cvs";
+
+--- 140,146 ----
+ int child_pid;
+
+ if (!cvs_rsh)
+! cvs_rsh = rsh_default;
+ if (!cvs_server)
+ cvs_server = "cvs";
+
+diff -r -c3 cvs-1.12.13/src/rsh-client.h cvs-1.12.13+extssh/src/rsh-client.h
+*** cvs-1.12.13/src/rsh-client.h Wed Jul 23 22:42:26 2003
+--- cvs-1.12.13+extssh/src/rsh-client.h Tue Jan 22 16:43:22 2008
+***************
+*** 14,19 ****
+ #ifndef RSH_CLIENT_H__
+ #define RSH_CLIENT_H__
+
+! void start_rsh_server (cvsroot_t *, struct buffer **, struct buffer **);
+
+ #endif
+--- 14,19 ----
+ #ifndef RSH_CLIENT_H__
+ #define RSH_CLIENT_H__
+
+! void start_rsh_server (cvsroot_t *, struct buffer **, struct buffer **, const char *);
+
+ #endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list