1 --- cvs-1.12.13.orig/debian/patches/85_normalize_correct_roots
2 +++ cvs-1.12.13/debian/patches/85_normalize_correct_roots
4 +# Apply patch from 120042, which only tries to parse pserver, gserver
5 +# and kserver methods when doing cvs login. (closes: #120042).
7 +# Patch from Horms <horms@vergenet.net>
8 +diff -ruN cvs-1.12.13-old/src/login.c cvs-1.12.13/src/login.c
9 +--- cvs-1.12.13-old/src/login.c 2006-02-26 22:10:42.000000000 +0800
10 ++++ cvs-1.12.13/src/login.c 2006-02-26 22:25:14.000000000 +0800
11 +@@ -200,11 +200,21 @@
15 +- tmp_root_canonical = normalize_cvsroot (tmp_root);
16 +- if (strcmp (cvsroot_canonical, tmp_root_canonical) == 0)
19 +- free (tmp_root_canonical);
20 ++ switch (tmp_root->method)
22 ++ case gserver_method:
23 ++ case pserver_method:
24 ++#ifdef HAVE_KERBEROS
25 ++ case kserver_method:
26 ++#endif /* HAVE_KERBEROS */
27 ++ tmp_root_canonical = normalize_cvsroot (tmp_root);
28 ++ if (strcmp (cvsroot_canonical, tmp_root_canonical) == 0)
30 ++ free (tmp_root_canonical);