installing etc-cleanup tool in /usr/lib/firejail directory

(cherry picked from commit e6f2374)

Makefile

@@ -12,7 +12,7 @@ endif
 
 COMPLETIONDIRS = src/zsh_completion src/bash_completion
 
-APPS = src/firecfg/firecfg src/firejail/firejail src/firemon/firemon src/profstats/profstats src/jailcheck/jailcheck
+APPS = src/firecfg/firecfg src/firejail/firejail src/firemon/firemon src/profstats/profstats src/jailcheck/jailcheck src/etc-cleanup/etc-cleanup
 SBOX_APPS = src/fbuilder/fbuilder src/ftee/ftee src/fids/fids
 SBOX_APPS_NON_DUMPABLE = src/fcopy/fcopy src/fldd/fldd src/fnet/fnet src/fnetfilter/fnetfilter src/fzenity/fzenity
 SBOX_APPS_NON_DUMPABLE += src/fsec-optimize/fsec-optimize src/fsec-print/fsec-print src/fseccomp/fseccomp
@@ -200,6 +200,7 @@ endif
  install -m 0644 -t $(DESTDIR)$(libdir)/firejail $(MYLIBS) $(SECCOMP_FILTERS)
  install -m 0755 -t $(DESTDIR)$(libdir)/firejail $(SBOX_APPS)
  install -m 0755 -t $(DESTDIR)$(libdir)/firejail src/profstats/profstats
+ install -m 0755 -t $(DESTDIR)$(libdir)/firejail src/etc-cleanup/etc-cleanup
  # plugins w/o read permission (non-dumpable)
  install -m 0711 -t $(DESTDIR)$(libdir)/firejail $(SBOX_APPS_NON_DUMPABLE)
  install -m 0711 -t $(DESTDIR)$(libdir)/firejail src/fshaper/fshaper.sh

src/tools/cleanup_etc.c → src/etc-cleanup/main.c

@@ -18,15 +18,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <assert.h>
 #include "../include/etc_groups.h"
-#define errExit(msg) do { char msgout[500]; sprintf(msgout, "Error %s:%s(%d)", msg, __FUNCTION__, __LINE__); perror(msgout); exit(1);} while (0)
-
-
+#include "../include/common.h"
+#include <stdarg.h>
 
 #define MAX_BUF 4098
 #define MAX_ARR 1024
@@ -223,7 +217,7 @@ static void usage(void) {
  printf("Group and clean private-etc entries in one or more profile files.\n");
  printf("Options:\n");
  printf(" --debug - print debug messages\n");
- printf(" --help - this help screen\n");
+ printf(" -h, -?, --help - this help screen\n");
  printf(" --replace - replace profile file\n");
 }
 

src/include/etc_groups.h

@@ -20,6 +20,7 @@
 
 #ifndef ETC_GROUPS_H
 #define ETC_GROUPS_H
+#include <stddef.h>
 
 #define ETC_MAX 256