Apply patch (requested by christos in ticket #889):

Teach rcs about the new cvs "commitid" keyword, so that we don't bitch each
time we play with an RCS file maintained by CVS.

Update cvs for:
        - setuid fixes
        - acl support
        - path name resolution fixes
        - "compat format string" fixes so it can use the config files
           of older cvs versions.
Ticket 889