- apply xinitrc fix
- fix build (add missing prototypes)
- rel 7