* resync with pkg-citadel, fix package build