Skip to content

Commit

Permalink
patch CVS slightly, so it also supports 1.11.1p1 'tag' config
Browse files Browse the repository at this point in the history
XXX we used this as Id first (like obsd), then CVSHeader (but
XXX only in 2004, which was ocvs’ last year anyway), so this
XXX is still partly off
  • Loading branch information
mirabilos committed Jun 25, 2014
1 parent cfc8797 commit 3af42bf
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 2 deletions.
38 changes: 38 additions & 0 deletions cvs_1.12.13+real-12.0.1.debdiff
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
diff -u cvs-1.12.13+real/debian/changelog cvs-1.12.13+real/debian/changelog
--- cvs-1.12.13+real/debian/changelog
+++ cvs-1.12.13+real/debian/changelog
@@ -1,3 +1,9 @@
+cvs (2:1.12.13+real-12.0.1) tarent; urgency=medium
+
+ * Support tag= in config for compat
+
+ -- Thorsten Glaser <[email protected]> Wed, 25 Jun 2014 12:50:32 +0200
+
cvs (2:1.12.13+real-12) unstable; urgency=medium

* Add texlive-fonts-recommended B-D (thanks Norbert Preining)
diff -u cvs-1.12.13+real/src/parseinfo.c cvs-1.12.13+real/src/parseinfo.c
--- cvs-1.12.13+real/src/parseinfo.c
+++ cvs-1.12.13+real/src/parseinfo.c
@@ -701,6 +701,21 @@
retval->MaxCompressionLevel = dummy_sizet;
}
#endif /* SERVER_SUPPORT */
+ else if (!strcmp (line, "tag")) {
+ char *pp;
+
+ pp = Xasprintf("%s=Id", p);
+ RCS_setlocalid (infopath, ln, &retval->keywords, pp);
+ free(pp);
+
+#if !defined(LOCK_COMPATIBILITY) || !defined(SUPPORT_OLD_INFO_FMT_STRINGS)
+ error (0, 0, "%s: found keyword '%s' in repository",
+ infopath, line);
+ error (readonlyfs ? 0 : 1, 0, readonlyfs
+ ? "Danger: Granting read access to incompatible repository!"
+ : "Do not try to access a cvs 1.11 repository!");
+#endif
+ }
#if !defined(LOCK_COMPATIBILITY) || !defined(SUPPORT_OLD_INFO_FMT_STRINGS)
else if ((!strcmp (line, "tag")) || (!strcmp (line, "umask"))
|| (!strcmp (line, "DisableXProg")) || (!strcmp (line, "dlimit"))
2 changes: 1 addition & 1 deletion jupp-ncvs.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ domain=mirbsd.org
remote=/git/jupp-ncvs
prepend=/git/jupp-ocvs
set -A torm_branches -- tg
set -A pprm_tags -- joe-3_1@76ae739fc5c61a8a234a8575adb0e41d868b57a7
set -A pprm_tags -- joe-3_1@d246b588de12b3bdee3b293eb90bbde5b2f2a3c8
2 changes: 1 addition & 1 deletion jupp.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ set -A torm_branches -- MIRBSD_10 MIRBSD_8 openbsd tg
set -A torm_tags -- MIRBSD_10_BASE MIRBSD_8_BASE MIRBSD_9_BASE \
cvs-200507211800 cvs-200509212000 \
paxmirabilis-20120605 paxmirabilis-20120606
set -A pprm_tags -- joe-3_1@7e95a26d87cefbb2c452be29c55f4c43ae574794
set -A pprm_tags -- joe-3_1@25de25dd75a6fa7f74a767bd907f963b38f8adcf

0 comments on commit 3af42bf

Please sign in to comment.