Re: CVS over SSH on different port
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Gaurav Vaish [EMAIL PROTECTED] writes: Hi, I want to enable port forwarding for the CVS (over SSH). But at the same time, I have sshd running on the firewall server. As such, I can have port 22 (on firewall) for connecting to the CVS. How can I achieve my target? Your problem statement is not 100% clear to me. Let me restate what I think you want. Background: The host cvs.my.network.net is internal to my firewall. My cvs repository of interest that I use internally looks like :ext:cvs.my.network.net:/path/to/cvsroot The host firewall.network.net is the external firewall and allows me to establish port forwarding to internal hosts via an SSH connection. Problem:How do I configure things with my CVSROOT and SSH configuration to allow me to checkout and commit to foo.my.network.net from my.laptop.somewhere.com that must go thru an SSH tunnel on the firewall.network.net in order to get to the cvs.my.network.net host. Suggested workaround: Created a $HOME/.ssh/config entry something like this: Host cvsserver HostKeyAlias cvs.my.network.net Hostname cvs.my.network.net ProxyCommand ssh firewall.network.net nc %h 22 You could do something like the following: export CVS_RSH=ssh export CVSROOT=:ext:cvsserver/path/to/cvsroot cvs checkout module This assumes that you have the 'nc' program (http://www.atstake.com/research/tools/network_utilities/) If you are not able to use nc, then something like the following might work for you... In your $HOME/.ssh/config file put something like this: Host cvsserver2 HostKeyAlias cvs.my.network.net Hostname localhost Port 8822 Then, in one window do a command like this: ssh -L 8822:cvs.my.network.net:22 firewall.network.net and in another window export CVS_RSH=ssh export CVSROOT=:ext:cvsserver2/path/to/cvsroot cvs checkout module There are probably other ways to address the above solutions, but this may be a reasonable place to start. If I did not understand your question, then you may wish to read something like this: http://quark.humbug.org.au/publications/ssh/ssh-port-forward.html to help you understand better what you can do. Good luck, -- Mark -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.3 (FreeBSD) iD8DBQFBffcb3x41pRYZE/gRAhr6AKDbQ9Y4o3wb+ulcqIVTXHo2PLWoDQCfRyb9 +Q0xloAdb4oUTExNhBjO2nM= =i2jz -END PGP SIGNATURE- ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Why co locked by server after the repository moving to another PC?
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Sam Song [EMAIL PROTECTED] writes: I met the problem when I tryied to checkout the repository moving to another PC(RED HAT 7.0). The repository worked fine locally on RED HAT 7.3. How come it didn't work right just removing to new home? [EMAIL PROTECTED] root]# cvs -d :pserver:[EMAIL PROTECTED]:/cvsroot login Logging in to :pserver:[EMAIL PROTECTED]:2401/cvsroot CVS password: [EMAIL PROTECTED] root]# cvs -z3 -d :pserver:[EMAIL PROTECTED]:/cvsroot co -P dmtxxzd-u-boot cvs server: Updating dmtxxzd-u-boot cvs server: failed to create lock directory in repository `/cvsroot/dmtxxzd-u-boot': Permission denied cvs server: failed to obtain dir lock in repository `/cvsroot/dmtxxzd-u-boot' cvs [server aborted]: read lock failed - giving up [EMAIL PROTECTED] root]# How to solve this? I searched archive but didn't get the nice message. If this is a FAQ, pls point out it to me. https://ccvs.cvshome.org/fom/cache/92.html It is likey to be ownership and group problems of your /cvsroot directory. -- Mark -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.3 (FreeBSD) iD8DBQFBffhJ3x41pRYZE/gRAvFTAJ9fqJXF9kgB8COnOzC/XnuP29+ZHwCff7q5 2iT9RxOLbsNJ+/tPqwCuTMc= =bKvY -END PGP SIGNATURE- ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Changing the name of a branch tag
Hello, I've set up my first release tree and therefore I've created a brunch. I forgot to tag the first release an I've taken the first release tag as the branch tag. Is it possible to rename the branch tag via cvs or must I change the files in the repository by hand and set up the checkt out release version after this. I noticed the wrong Tagging today as I made the first fix on the release. I checked following, which didn't worked: BRANCH-TAG: Tag I used for Branching (cvs tag -b BRANCH-TAG) NEW-BRANCH-TAG 1. Using Admin cvs admin -nBRANCH-TAG:NEW-BRANCH-TAG I get an error: cvs admin: /home/cvsroot/test/t1.cpp,v: symbolic name BRANCH-TAG already bound to 1.1.0.2 2. Using Tag cvs tag -r BRANCH-TAG NEW-BRANCH-TAG Tag is not on the Branch but on the files in the Brunch. Any suggestions? ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
installation
Title: installation Possibly the most stupid question ever but: I am running on XP, and developing on Oracle9iAS and Bussiness Components For Java. My challenge is now to test out different version control systems for our organization. How do I install the server elements? I have installed the client WinCVS, but I can't sort out the files on https://ccvs.cvshome.org/servlets/ProjectDocumentList (download) Of course using the winCVS gives me the message No protocols available, understandable. Can I install anything from https://ccvs.cvshome.org/servlets/ProjectDocumentList ? I don't even recognize the file extensions... Probably because I don't know anything about Linux.. Anyone have any tip to a cvs novise? Maria Therese Sanna Axia AS Statsminister Torpsvei 30 N - 1703 Sarpsborg Tlf: +4769128500 Mobil: +4797189290 ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Changing the name of a branch tag
Hallo Bernd, * On Tue, Oct 26, 2004 at 09:15:45AM +0200 Bernd wrote: 1. Using Admin cvs admin -nBRANCH-TAG:NEW-BRANCH-TAG Try it the other way around: cvs admin -n NEW-BRANCH-TAG:BRANCH-TAG Gruß, Spiro. -- Spiro R. Trikaliotis http://www.trikaliotis.net/ http://www.viceteam.org/ ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
AW: Changing the name of a branch tag
Hello Spiro, Thanks for the tip. It worked. It seems that I've missunderstud the agument order in my panic about the problems with the wrong tags. Regards Bernd -Ursprüngliche Nachricht- Von: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED] Gesendet: Dienstag, 26. Oktober 2004 11:20 An: [EMAIL PROTECTED] Betreff: Re: Changing the name of a branch tag Hallo Bernd, * On Tue, Oct 26, 2004 at 09:15:45AM +0200 Bernd wrote: 1. Using Admin cvs admin -nBRANCH-TAG:NEW-BRANCH-TAG Try it the other way around: cvs admin -n NEW-BRANCH-TAG:BRANCH-TAG Gruß, Spiro. -- Spiro R. Trikaliotis http://www.trikaliotis.net/ http://www.viceteam.org/ ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: CVS over SSH on different port
The host firewall.network.net is the external firewall and allows me to establish port forwarding to internal hosts via an SSH connection. No. It does not allow right now. But I want it do so. But it also has sshd running on itself, listening on 22 and I don't want to shut it down. Problem:How do I configure things with my CVSROOT and SSH configuration to allow me to checkout and commit to foo.my.network.net from my.laptop.somewhere.com that must go thru an SSH tunnel on the firewall.network.net in order to get to the cvs.my.network.net host. Well, I can get to it if I had only this as the problem. Since the firewall is under my control, I can enable portforwarding (Linux, iptables -- not an issue). The problem: - Firewall.network.net already has a sshd running on 22. I cannot use 22 for forwarding, since sshd is listening. I cannot use another port, because ext protocol does not allow me to use any port other than 22. export [EMAIL PROTECTED]:/cvs/root/path cannot be changed to export [EMAIL PROTECTED]:11:/cvs/root/path Cheers, Gaurav Vaish http://gallery.mastergaurav.org --- ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Supply of password for connecting to cvs from windows.
Hi, I have cvs installed on Linux and TortoiseCVS installed on windows clients. I have configured pserver on cvs and connecting through windows. It is working perfectly. This setup checkouts or checkins using password authentication by the pserver. However, since I am having a large number of users working across several projects, I need to get the password from the user and then update. This is required because the user not connected with a project may simply checkout or change and commit using a known username and this needs to be avoided. Please guide me how to configure cvs in Linux to do this. Thank you, Ragothaman. ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
ignoring whitespace in rdiff
cvs diff takes '-bw' to ignore whitespace. cvs rdiff (at least in the versions I have) doesn't have an option for this. Can someone please explain this to me? Does the 'feature release' stream have this feature? We're developing on windows, and some of our developers keep switching linefeed types, which makes rdiff a bit useless. I may have to resort to a linebreak-conversion on checkin, but I don't like the idea of automated chenges to entire files like that... thanks Dave ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
autentication
I dont undestand why many people use Pserver if ext-ssh is more secury. What is advantages of the Pserver? ___ Yahoo! Acesso Grátis - Internet rápida e grátis. Instale o discador agora! http://br.acesso.yahoo.com/ ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: installation
Maria Therese Sanna wrote: Possibly the most stupid question ever but: I am running on XP, and developing on Oracle9iAS and Bussiness Components For Java. My challenge is now to test out different version control systems for our organization. How do I install the server elements? I have installed the client WinCVS, but I can't sort out the files on https://ccvs.cvshome.org/servlets/ProjectDocumentList (download) Of course using the winCVS gives me the message No protocols available, understandable. Can I install anything from https://ccvs.cvshome.org/servlets/ProjectDocumentList ? I don't even recognize the file extensions... Probably because I don't know anything about Linux.. Anyone have any tip to a cvs novise? checkout Arthur Barrett's email here http://lists.gnu.org/archive/html/info-cvs/2004-10/msg00270.html 1) with WinCVS you are running CVSNT (originally derived from a cvshome version of cvs) 2) with cvshome CVS, the client and server are normally built in the same binary. I think it is the same with CVSNT. 3) .tar.bz2 files that have been tar'ed together and bzip2 compressed. Usually source code files. .tar.gz files that have been tar'ed together and gnu zip compressed (I think winzip can read them). Usually source code files. .ps post script file .asc PGP/GPG signature or signed file (allows for verification that you downloaded what was intended) .sig PGP/GPG detached signature against the same filename without the .sig extension. README text file begging to be read. .pdf Adobe Portable Document Format. Text and graphics in a format that most people can get a reader for. 4) as you are working on windows, and probably most of your team is as well from the way your question was asked, CVSNT is probably a better fit. Looking at the CVSNT page might help you decide. http://www.cvsnt.org/ Maria Therese Sanna -- Todd Denniston Crane Division, Naval Surface Warfare Center (NSWC Crane) Harnessing the Power of Technology for the Warfighter ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: CVS over SSH on different port
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Gaurav Vaish [EMAIL PROTECTED] writes:
The host firewall.network.net is the external firewall and
allows me to establish port forwarding to internal hosts
via an SSH connection.
No. It does not allow right now. But I want it do so. But it also
has sshd running on itself, listening on 22 and I don't want to shut
it down.
You are still confused.
The :pserver: is the one that listens and talks on a particular port.
The :ext: runs a copy of cvs in server mode over ssh and does not
actually consume any ports of its own. It is even possible to run :ext:
over kermit (or so I have been told). All you need is an eight-bit clean
cahnnel to pass the bits.
So, you need port 22 to continue to run SSHD. You also need to be
setting things up so that you are port forwarding the ability to login
via ssh to the system on which the cvs server is to be run locally.
Problem:How do I configure things with my CVSROOT and SSH
configuration to allow me to checkout and commit to
foo.my.network.net from my.laptop.somewhere.com that must
go thru an SSH tunnel on the firewall.network.net in order
to get to the cvs.my.network.net host.
Well, I can get to it if I had only this as the problem. Since the
firewall is under my control, I can enable portforwarding (Linux,
iptables -- not an issue).
The problem:
- Firewall.network.net already has a sshd running on 22.
I cannot use 22 for forwarding, since sshd is listening.
I cannot use another port, because ext protocol does not
allow me to use any port other than 22.
export [EMAIL PROTECTED]:/cvs/root/path
cannot be changed to
export [EMAIL PROTECTED]:11:/cvs/root/path
The :ext: protocol does not allow you to specify port numbers because
the transport of $CVS_RSH may or may not allow you to move to a separate
port number in any kind of a portable manner.
What is happening is that cvs will be running a command like:
${CVS_RSH:-rsh} mycvsserver -l user ${CVS_SERVER} server
given the environment
CVSROOT=:ext:[EMAIL PROTECTED]:/cvs/root/path
and the cvs protocol across the connection will be where it communicates
'Root /cvs/root/path' for you.
So, for setting up a cvs connection of :ext: you will want to make sure that
the command:
ssh mycvsserver -l user uname -a
works first and prints out the name of the remote host you are
attempting to use. If it does, then you can be fairly sure that the cvs
connection will also work.
Let us look at what the previous post I sent does...
| Suggested workaround:
|
| Created a $HOME/.ssh/config entry something like this:
|
| Host cvsserver
| HostKeyAlias cvs.my.network.net
| Hostname cvs.my.network.net
| ProxyCommand ssh firewall.network.net nc %h 22
The above ssh configuration means that whenever you do a connection to
the 'cvsserver' name it will open an ssh connection on cvs.my.network.net
transparently.
ssh cvsserver
will get you a login shell on cvs.my.network.net directly.
|
| You could do something like the following:
|
|export CVS_RSH=ssh
|export CVSROOT=:ext:cvsserver/path/to/cvsroot
|cvs checkout module
|
| This assumes that you have the 'nc' program
| (http://www.atstake.com/research/tools/network_utilities/)
|
| If you are not able to use nc, then something like the following might
| work for you...
|
| In your $HOME/.ssh/config file put something like this:
|
| Host cvsserver2
| HostKeyAlias cvs.my.network.net
| Hostname localhost
| Port 8822
|
| Then, in one window do a command like this:
|
| ssh -L 8822:cvs.my.network.net:22 firewall.network.net
The above command establishes that connections to the localhost port
8822 will be forwarded to cvs.my.network.net port 22. So, the command
ssh -p 8822 localhost
will get you a login prompt from the cvs.my.network.net host.
|
| and in another window
|
|export CVS_RSH=ssh
|export CVSROOT=:ext:cvsserver2/path/to/cvsroot
|cvs checkout module
|
| There are probably other ways to address the above solutions, but this
| may be a reasonable place to start.
I hope this helps.
Good luck,
-- Mark
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.3 (FreeBSD)
iD8DBQFBfnQI3x41pRYZE/gRAoCcAJ9bVHKZNPqNrDwHEK1TuL6QaT8epACfbRMv
Yd6q2BSVEMOSQcsm70VO+yU=
=8Q8B
-END PGP SIGNATURE-
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://lists.gnu.org/mailman/listinfo/info-cvs
Re: autentication
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Gleidson Sá Barreto [EMAIL PROTECTED] writes: I dont undestand why many people use Pserver if ext-ssh is more secury. Either do I. What is advantages of the Pserver? I have to assume it is mostly over worked administrators. They can enable it without needing to setup host accounts for all of their cvs users. However, they now need to do separate password management and they still need to maintain unique userids for the cvs commits (well, the feature branch allows them to use PAM-based authentication if they want to, but why would a security-minded administrator want yet another application that could cause an attach against passwords on the system?) They also need to worry that some future exploit of cvs will be a root exploit as the cvs pserver stuff starts life out of the inetd configuration as a 'root' user. The only benefit I can see for :pserver: is that it is simpler to grant anonymous read-only access to a repository. It is still possible to do given :ext:, but requires a bit more work by an administrator in this case. I would be completely in favor of removing :pserver: support from cvs. -- Mark -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.3 (FreeBSD) iD8DBQFBfnYg3x41pRYZE/gRAty7AJ9wTHNEBbu8nBCEu6UKoY0eM30WWwCg0GvN M6JwOEDg+7SFF/5WI/K0eLQ= =Ky8R -END PGP SIGNATURE- ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: ignoring whitespace in rdiff
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Clendenan, Dave [EMAIL PROTECTED] writes: cvs diff takes '-bw' to ignore whitespace. cvs rdiff (at least in the versions I have) doesn't have an option for this. Can someone please explain this to me? See below. Does the 'feature release' stream have this feature? No. We're developing on windows, and some of our developers keep switching linefeed types, which makes rdiff a bit useless. I may have to resort to a linebreak-conversion on checkin, but I don't like the idea of automated chenges to entire files like that... Line endings should be properly handled by the client already. The general topic of additional flags to 'cvs rdiff' (aka 'cvs patch') came up here: https://ccvs.cvshome.org/issues/show_bug.cgi?id=50 and Larry wrote: | -- Additional comments from Larry Jones Tue May 7 15:01:06 -0700 2002 -- | | cvs diff supports nearly all of the GNU diff options but cvs patch | (aka rdiff) hardly supports any of them because it was designed to | make patches, not to be a generic diff command. Given that, I don't | see any justification for adding -p to the miniscule set of options | that cvs patch accepts unless we ignore the original design and make | it into a generic diff command, which is problematic because some of | the existing patch options conflict with diff options. and Derek wrote: | -- Additional comments from Derek Price Mon May 20 07:45:29 -0700 2002 -- | | Except for breaking backwards compatibility, I'm not sure I agree with | Larry's argument. Isn't a straight `diff' the traditional way of | creating patches when CVS isn't involved? Also, making `cvs rdiff' a | remote version of `cvs diff' seems to make sense since that seems to | be consistent with the operation of the rest of the CVS commands. | | Closing this anyhow until someone with the time to work on it comes | along and reopens it. Issue 176 ( https://ccvs.cvshome.org/issues/show_bug.cgi?id=176 ) also requests the -p option for rdiff. Your request to add -b (ignore changes in amount of white space) and -w (ignore horizontal white space when comparing lines) are just the latest in the debate of how to deal with passing all of the possible diff options to the rdiff subsystem in a sane manner given that we have many options (D:RV:cflr:stu) to rdiff and many of them conflict with 'diff' (D:flrst). -- Mark -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.3 (FreeBSD) iD8DBQFBfoJV3x41pRYZE/gRAstuAJkBM0aL1Ucwsc0Gf5Us07ZZ7QHp6QCdH16k JlENv9iAo8The/P9pGe+J0w= =dsrQ -END PGP SIGNATURE- ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
CVS to Bugzilla integration script to contrib???
I have a script that applies the info from a CVS template into a Bugzilla comment that I want to put in the contrib. Carter Thompson is the original author but we've tailored it to our needs. How do I submit it? -- Chris T Fouts ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
RE: installation
Maria, If you are using WinCVS client then you are using the CVSNT client. Many of the new features of WinCVS (file rename, bug number, etc) are dependent on using a CVSNT server. CVSNT server is free (GPL - just like CVS) for Linux, Unix, Windows, Mac OS X and can be downloaded from here: http://www.cvsnt.com Just install the RPM on Linux. The open source newsgroup for CVSNT is available here: http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt or news://news.cvsnt.org/support.cvsnt Regards, Arthur Barrett -Original Message- From: [EMAIL PROTECTED] on behalf of Maria Therese Sanna Sent: Tue 10/26/2004 5:35 PM To: [EMAIL PROTECTED] Cc: Subject:installation Possibly the most stupid question ever but: I am running on XP, and developing on Oracle9iAS and Bussiness Components For Java. My challenge is now to test out different version control systems for our organization. How do I install the server elements? I have installed the client WinCVS, but I can't sort out the files on https://ccvs.cvshome.org/servlets/ProjectDocumentList (download) Of course using the winCVS gives me the message No protocols available, understandable. Can I install anything from https://ccvs.cvshome.org/servlets/ProjectDocumentList ? I don't even recognize the file extensions... Probably because I don't know anything about Linux.. Anyone have any tip to a cvs novise? Maria Therese Sanna Axia AS Statsminister Torpsvei 30 N - 1703 Sarpsborg Tlf: +4769128500 Mobil: +4797189290 ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
CVS merge conflict
Hi Anyone know of a script that can resolve conflicts (or any other nice unix tool). Lets say you know that you should use all from one version of the file and not the other. That should be quite easy to fix a script for. (But I'm too tired now and need to hit the bed.) I really don't want to do this manually. Please help me out ;-) Best Regards / Erik ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
RE: Supply of password for connecting to cvs from windows.
Ragothaman, If you are using TortoiseCVS client then you are using the CVSNT client. Are you sharing a single sandbox with several developers? If this is the case I think that the SSPI protocol may suit you better since the username is not coded into the CVSROOT (it comes from your windows login instead). However to use this with your Linux server you will have to use CVSNT Server. CVSNT server is free (GPL - just like CVS) for Linux, Unix, Windows, Mac OS X and can be downloaded from here: http://www.cvsnt.com Getting SSPI running on a Linux box is not entirely straightforward but the CVSNT newsgroup and web site have various articles. The open source newsgroup for CVSNT is available here: http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt or news://news.cvsnt.org/support.cvsnt Regards, Arthur Barrett -Original Message- From: [EMAIL PROTECTED] on behalf of Ragothaman Sent: Wed 10/27/2004 12:21 AM To: [EMAIL PROTECTED] Cc: Subject:Supply of password for connecting to cvs from windows. Hi, I have cvs installed on Linux and TortoiseCVS installed on windows clients. I have configured pserver on cvs and connecting through windows. It is working perfectly. This setup checkouts or checkins using password authentication by the pserver. However, since I am having a large number of users working across several projects, I need to get the password from the user and then update. This is required because the user not connected with a project may simply checkout or change and commit using a known username and this needs to be avoided. Please guide me how to configure cvs in Linux to do this. Thank you, Ragothaman. ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
RE: ignoring whitespace in rdiff
Dave, If you are using developing on windows then you are most likely using the CVSNT client. The open source newsgroup for CVSNT is available here and may be able to help (be sure to specify the server and client versions of CVS/CVSNT): http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt or news://news.cvsnt.org/support.cvsnt Regards, Arthur Barrett -Original Message- From: [EMAIL PROTECTED] on behalf of Clendenan, Dave Sent: Wed 10/27/2004 12:26 AM To: [EMAIL PROTECTED] Cc: Subject:ignoring whitespace in rdiff cvs diff takes '-bw' to ignore whitespace. cvs rdiff (at least in the versions I have) doesn't have an option for this. Can someone please explain this to me? Does the 'feature release' stream have this feature? We're developing on windows, and some of our developers keep switching linefeed types, which makes rdiff a bit useless. I may have to resort to a linebreak-conversion on checkin, but I don't like the idea of automated chenges to entire files like that... thanks Dave ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: ignoring whitespace in rdiff
On Wed, Oct 27, 2004 at 07:23:42AM +1000, Arthur Barrett wrote: Dave, If you are using developing on windows then you are most likely using the CVSNT client. Yes, we are using a combination of wincvs and tortoisecvs. The server is on linux, and is not CVSNT. Some of my linefeed woes seem to have been related to using a beta version of tortoisecvs (which I realize is not an issue for this list :) The problem for me is that our automated code review tool generates diffs via rdiff. Mark's explanation on the reasons behind the differences in diff/rdiff behaviour satisfied me, I guess I'll look into server-side cleanup. It's on my list for other things anyway (coding standard enforcement)... thanks Dave ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
RE: CVS merge conflict
this may suit your needs - just runs against a single file. you can drive it from 'find ... exec' if you have a bunch of files and a single revision tag... hth Dave -Original Message- From: Erik Andersson [mailto:[EMAIL PROTECTED] Sent: Tuesday, October 26, 2004 2:15 PM To: [EMAIL PROTECTED] Subject: CVS merge conflict Hi Anyone know of a script that can resolve conflicts (or any other nice unix tool). Lets say you know that you should use all from one version of the file and not the other. That should be quite easy to fix a script for. (But I'm too tired now and need to hit the bed.) I really don't want to do this manually. Please help me out ;-) Best Regards / Erik ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs stickyCheat.pl Description: Binary data ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: autentication
Mark D. Baushke wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Gleidson Sá Barreto [EMAIL PROTECTED] writes: I dont undestand why many people use Pserver if ext-ssh is more secury. Either do I. What is advantages of the Pserver? I have to assume it is mostly over worked administrators. They can enable it without needing to setup host accounts for all of their cvs users. Not needing to set up user accounts for people using CVS is my reason for using it, same as for why we use Cyrus imap - we don't want to give out shell accounts unless we absolutely have to, and ways to restrict shell users are buggy, insecure and inconsistant across platforms. It's not a case of overworked as such*, but not being generous with permissions that not necessarily trusted users need. However, they now need to do separate password management and they still need to maintain unique userids for the cvs commits (well, the feature branch allows them to use PAM-based authentication if they want to, but why would a security-minded administrator want yet another application that could cause an attach against passwords on the system?) Because attacking passwords to get into a CVS tree is a lot less risky than getting a shell account and running amok. This is why I looked at cvsnt on my UNIX boxes, it offers sserver, which is pserver over ssl without a load of hackery (and the complications introduced) on old CVS. They also need to worry that some future exploit of cvs will be a root exploit as the cvs pserver stuff starts life out of the inetd configuration as a 'root' user. See above re possible shell access. What's worse, a chrooted CVS repository, or your whole server? The only benefit I can see for :pserver: is that it is simpler to grant anonymous read-only access to a repository. It is still possible to do given :ext:, but requires a bit more work by an administrator in this case. You're not looking very hard. Carl * the usual disclaimer about overworked fits here :) -- === Vivitec Pty. Ltd. Suite 6, 51-55 City Rd. Southbank, 3006. Ph. +61 3 8626 5626 Fax +61 3 9682 1000 === ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Why co locked by server after the repository moving to another PC?
Mark D. Baushke [EMAIL PROTECTED] wrote How to solve this? I searched archive but didn't get the nice message. If this is a FAQ, pls point out it to me. https://ccvs.cvshome.org/fom/cache/92.html It is likey to be ownership and group problems of your /cvsroot directory. Under your instruction, I tried several times on changing group but all failed. So I listed my whole process as follows to check: When setuping the cvs, I had used some group commands. 1. useradd -d /cvsroot cvs 2. chmod 771 /cvsroot 3. useradd cvspub 4. usermod -G cvs cvspub I added passwd/writers/readers in /cvsroot/CVSROOT/ as root. So I had the checkout problem which I submitted. Then I tried to change the group as you suggested: chgrp -G cvs /cvsroot Still didn't work right. Then usermod -G cvs sam chmod g+s /cvsroot/ No matter what I tried, I couldn't checkout the moved repository from the former cvs PC. All I wanted was to remove the former cvs repository to a new home, red hat 7.0 host PC. ~ [EMAIL PROTECTED] workspace]# cvs -d :pserver:[EMAIL PROTECTED]:/cvsroot login Logging in to :pserver:[EMAIL PROTECTED]:2401/cvsroot CVS password: [EMAIL PROTECTED] workspace]# cvs -z3 -d :pserver:[EMAIL PROTECTED]:/cvsroot co dmtxxzd-u-boot cvs server: Updating dmtxxzd-u-boot cvs server: failed to create lock directory in repository `/cvsroot/dmtxxzd-u-boot': Permission denied cvs server: failed to obtain dir lock in repository `/cvsroot/dmtxxzd-u-boot' cvs [server aborted]: read lock failed - giving up [EMAIL PROTECTED] workspace]# ls cvs-problem dmtxxzd-u-boot ~~ [EMAIL PROTECTED] /]# ls /cvsroot/ -l total 20 drwxrwxr-x3 cvs cvs 4096 Oct 27 09:52 CVSROOT drwxr-xr-x5 cvs cvs 4096 Oct 26 03:35 Desktop drwxrwxr-x 15 sam cvs 4096 Oct 26 04:48 dmtxxzd-kernel drwxr-xr-x 25 sam cvs 4096 Oct 27 08:57 dmtxxzd-u-boot drwxrwxr-x 14 sam cvs 4096 Oct 25 14:11 lite_dw-kernel [EMAIL PROTECTED] /]# [EMAIL PROTECTED] /]# ls /cvsroot/dmtxxzd-u-boot/ -l total 424 -r--r--r--1 sam cvs 82853 Sep 9 04:50 CHANGELOG,v -r--r--r--1 sam cvs 15577 Sep 9 04:50 COPYING,v -r--r--r--1 sam cvs 8653 Sep 9 04:50 CREDITS,v -r--r--r--1 sam cvs 7832 Sep 9 04:50 MAINTAINERS,v -r-xr-xr-x1 sam cvs 6555 Sep 9 04:50 MAKEALL,v -r--r--r--1 sam cvs 43100 Sep 9 04:50 Makefile,v -r--r--r--1 sam cvs112867 Sep 9 04:50 README,v -r--r--r--1 sam cvs 1359 Sep 9 04:50 arm_config.mk,v drwxrwxr-x 139 sam cvs 4096 Oct 27 08:57 board drwxrwxr-x2 sam cvs 4096 Oct 27 08:58 common -r--r--r--1 sam cvs 5550 Sep 9 04:50 config.mk,v drwxrwxr-x 24 sam cvs 4096 Oct 27 08:58 cpu drwxrwxr-x2 sam cvs 4096 Oct 27 08:58 disk drwxrwxr-x2 sam cvs 4096 Oct 27 08:58 doc drwxrwxr-x3 sam cvs 4096 Oct 27 08:58 drivers drwxrwxr-x2 sam cvs 4096 Oct 27 08:58 dtt drwxrwxr-x2 sam cvs 4096 Oct 27 08:58 examples drwxrwxr-x7 sam cvs 4096 Oct 27 08:58 fs -r--r--r--1 sam cvs 1361 Sep 9 04:50 i386_config.mk,v drwxrwxr-x 16 sam cvs 4096 Oct 27 08:58 include drwxrwxr-x2 sam cvs 4096 Oct 27 08:58 lib_arm drwxrwxr-x2 sam cvs 4096 Oct 27 08:58 lib_generic drwxrwxr-x2 sam cvs 4096 Oct 27 08:58 lib_i386 drwxrwxr-x2 sam cvs 4096 Oct 27 08:58 lib_m68k drwxrwxr-x2 sam cvs 4096 Oct 27 08:58 lib_microblaze drwxrwxr-x2 sam cvs 4096 Oct 27 08:58 lib_mips drwxrwxr-x2 sam cvs 4096 Oct 27 08:58 lib_nios drwxrwxr-x2 sam cvs 4096 Oct 27 08:58 lib_ppc -r--r--r--1 sam cvs 1385 Sep 9 04:50 m68k_config.mk,v -r--r--r--1 sam cvs 1556 Sep 9 04:50 microblaze_config.mk,v -r--r--r--1 sam cvs 1356 Sep 9 04:50 mips_config.mk,v -r-xr-xr-x1 sam cvs 1581 Sep 9 04:50 mkconfig,v drwxrwxr-x2 sam cvs 4096 Oct 27 08:58 net -r--r--r--1 sam cvs 1390 Sep 9 04:50 nios_config.mk,v drwxrwxr-x3 sam cvs 4096 Oct 27 08:58 post -r--r--r--1 sam cvs 1387 Sep 9 04:50 ppc_config.mk,v -r--r--r--1 sam cvs 1784 Sep 9 04:50 readme,v drwxrwxr-x2 sam cvs 4096 Oct 27 08:58 rtc drwxrwxr-x9 sam cvs 4096 Oct 27 08:58 tools [EMAIL PROTECTED] /]# ls /cvsroot/CVSROOT/ -l total 108 drwxrwxr-x2 cvs cvs 4096 Oct 26 03:36 Emptydir -r--r--r--1 cvs cvs 493 Oct 26 03:36 checkoutlist
Re: CVS over SSH on different port
Thanks!
It works... :-)
I have one more query... on branching. Check the new thread.
Cheers,
Gaurav Vaish
http://gallery.mastergaurav.org
On Tue, 26 Oct 2004 08:58:00 -0700, Mark D. Baushke [EMAIL PROTECTED] wrote:
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Gaurav Vaish [EMAIL PROTECTED] writes:
The host firewall.network.net is the external firewall and
allows me to establish port forwarding to internal hosts
via an SSH connection.
No. It does not allow right now. But I want it do so. But it also
has sshd running on itself, listening on 22 and I don't want to shut
it down.
You are still confused.
The :pserver: is the one that listens and talks on a particular port.
The :ext: runs a copy of cvs in server mode over ssh and does not
actually consume any ports of its own. It is even possible to run :ext:
over kermit (or so I have been told). All you need is an eight-bit clean
cahnnel to pass the bits.
So, you need port 22 to continue to run SSHD. You also need to be
setting things up so that you are port forwarding the ability to login
via ssh to the system on which the cvs server is to be run locally.
Problem:How do I configure things with my CVSROOT and SSH
configuration to allow me to checkout and commit to
foo.my.network.net from my.laptop.somewhere.com that must
go thru an SSH tunnel on the firewall.network.net in order
to get to the cvs.my.network.net host.
Well, I can get to it if I had only this as the problem. Since the
firewall is under my control, I can enable portforwarding (Linux,
iptables -- not an issue).
The problem:
- Firewall.network.net already has a sshd running on 22.
I cannot use 22 for forwarding, since sshd is listening.
I cannot use another port, because ext protocol does not
allow me to use any port other than 22.
export [EMAIL PROTECTED]:/cvs/root/path
cannot be changed to
export [EMAIL PROTECTED]:11:/cvs/root/path
The :ext: protocol does not allow you to specify port numbers because
the transport of $CVS_RSH may or may not allow you to move to a separate
port number in any kind of a portable manner.
What is happening is that cvs will be running a command like:
${CVS_RSH:-rsh} mycvsserver -l user ${CVS_SERVER} server
given the environment
CVSROOT=:ext:[EMAIL PROTECTED]:/cvs/root/path
and the cvs protocol across the connection will be where it communicates
'Root /cvs/root/path' for you.
So, for setting up a cvs connection of :ext: you will want to make sure that
the command:
ssh mycvsserver -l user uname -a
works first and prints out the name of the remote host you are
attempting to use. If it does, then you can be fairly sure that the cvs
connection will also work.
Let us look at what the previous post I sent does...
| Suggested workaround:
|
| Created a $HOME/.ssh/config entry something like this:
|
| Host cvsserver
| HostKeyAlias cvs.my.network.net
| Hostname cvs.my.network.net
| ProxyCommand ssh firewall.network.net nc %h 22
The above ssh configuration means that whenever you do a connection to
the 'cvsserver' name it will open an ssh connection on cvs.my.network.net
transparently.
ssh cvsserver
will get you a login shell on cvs.my.network.net directly.
|
| You could do something like the following:
|
|export CVS_RSH=ssh
|export CVSROOT=:ext:cvsserver/path/to/cvsroot
|cvs checkout module
|
| This assumes that you have the 'nc' program
| (http://www.atstake.com/research/tools/network_utilities/)
|
| If you are not able to use nc, then something like the following might
| work for you...
|
| In your $HOME/.ssh/config file put something like this:
|
| Host cvsserver2
| HostKeyAlias cvs.my.network.net
| Hostname localhost
| Port 8822
|
| Then, in one window do a command like this:
|
| ssh -L 8822:cvs.my.network.net:22 firewall.network.net
The above command establishes that connections to the localhost port
8822 will be forwarded to cvs.my.network.net port 22. So, the command
ssh -p 8822 localhost
will get you a login prompt from the cvs.my.network.net host.
|
| and in another window
|
|export CVS_RSH=ssh
|export CVSROOT=:ext:cvsserver2/path/to/cvsroot
|cvs checkout module
|
| There are probably other ways to address the above solutions, but this
| may be a reasonable place to start.
I hope this helps.
Good luck,
-- Mark
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.2.3 (FreeBSD)
iD8DBQFBfnQI3x41pRYZE/gRAoCcAJ9bVHKZNPqNrDwHEK1TuL6QaT8epACfbRMv
Yd6q2BSVEMOSQcsm70VO+yU=
=8Q8B
-END PGP SIGNATURE-
___
Info-cvs mailing list
[EMAIL PROTECTED]
Branching
Hi, I created a branch (not tag) in cvs. Now, how do I create a/the new folder where the new phase of development will start (concurrent)? Cheers, Gaurav Vaish http://gallery.mastergaurav.org ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
Re: Branching
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Gaurav Vaish [EMAIL PROTECTED] writes: I created a branch (not tag) in cvs. Now, how do I create a/the new folder where the new phase of development will start (concurrent)? https://www.cvshome.org/docs/manual/cvs-1.11.17/cvs_5.html#SEC57 -- Mark -BEGIN PGP SIGNATURE- Version: GnuPG v1.2.3 (FreeBSD) iD8DBQFBfyfa3x41pRYZE/gRAtfwAJ9tXoNd2hX0LLdmSMnIhLJHeU0t1ACfUrNu 62jkikVqRGls3Z5UCnrfLWA= =O0AH -END PGP SIGNATURE- ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
