I faced this issue, when I tried to apply the patch, when include/ctl/ctlDefaultPrivileges.h and ctl/ctlDefaultPrivileges.cpp. I had to remove these two files before applying the patch.
Just a quick note. Your patch applies cleanly, but doesn't compile for me. I get all those errors (see attached file). I don't have time to work on this right now, but will do so this afternoon.