From be9e322846c628cf57f7523227ba62ea44b27d70 Mon Sep 17 00:00:00 2001
From: caelebfi <gorden.mende@solusar.de>
Date: Mon, 28 Nov 2022 09:00:40 +0100
Subject: [PATCH] committing changes in /etc made by "apt install tcpdump -y"

Packages with configuration changes:
+tcpdump 4.99.0-2+deb11u1 armhf

Package changes:
+tcpdump 4.99.0-2+deb11u1 armhf
---
 .etckeeper                       |  2 +
 apparmor.d/local/usr.bin.tcpdump |  0
 apparmor.d/usr.bin.tcpdump       | 69 ++++++++++++++++++++++++++++++++
 group                            |  1 +
 group-                           |  2 +-
 gshadow                          |  1 +
 gshadow-                         |  2 +-
 passwd                           |  1 +
 passwd-                          |  3 +-
 9 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 apparmor.d/local/usr.bin.tcpdump
 create mode 100644 apparmor.d/usr.bin.tcpdump

diff --git a/.etckeeper b/.etckeeper
index 0ce89cf4..c94467d4 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -117,10 +117,12 @@ maybe chmod 0755 'apparmor'
 maybe chmod 0755 'apparmor.d'
 maybe chmod 0755 'apparmor.d/local'
 maybe chmod 0644 'apparmor.d/local/usr.bin.man'
+maybe chmod 0644 'apparmor.d/local/usr.bin.tcpdump'
 maybe chmod 0644 'apparmor.d/local/usr.sbin.ntpd'
 maybe chmod 0755 'apparmor.d/tunables'
 maybe chmod 0644 'apparmor.d/tunables/ntpd'
 maybe chmod 0644 'apparmor.d/usr.bin.man'
+maybe chmod 0644 'apparmor.d/usr.bin.tcpdump'
 maybe chmod 0644 'apparmor.d/usr.sbin.ntpd'
 maybe chmod 0755 'apparmor/init'
 maybe chmod 0755 'apparmor/init/network-interface-security'
diff --git a/apparmor.d/local/usr.bin.tcpdump b/apparmor.d/local/usr.bin.tcpdump
new file mode 100644
index 00000000..e69de29b
diff --git a/apparmor.d/usr.bin.tcpdump b/apparmor.d/usr.bin.tcpdump
new file mode 100644
index 00000000..732a691f
--- /dev/null
+++ b/apparmor.d/usr.bin.tcpdump
@@ -0,0 +1,69 @@
+# vim:syntax=apparmor
+#include <tunables/global>
+
+profile tcpdump /usr/bin/tcpdump {
+  #include <abstractions/base>
+  #include <abstractions/nameservice>
+  #include <abstractions/user-tmp>
+
+  capability net_raw,
+  capability setuid,
+  capability setgid,
+  capability dac_override,
+  capability chown,
+  network raw,
+  network packet,
+
+  # for -D
+  @{PROC}/bus/usb/ r,
+  @{PROC}/bus/usb/** r,
+
+  # for finding an interface
+  /dev/ r,
+  @{PROC}/[0-9]*/net/dev r,
+  /sys/bus/usb/devices/ r,
+  /sys/class/net/ r,
+  /sys/devices/**/net/** r,
+
+  # for -j
+  capability net_admin,
+
+  # for tracing USB bus, which libpcap supports
+  /dev/usbmon* r,
+  /dev/bus/usb/ r,
+  /dev/bus/usb/** r,
+
+  # for init_etherarray(), with -e
+  /etc/ethers r,
+
+  # for USB probing (see libpcap-1.1.x/pcap-usb-linux.c:probe_devices())
+  /dev/bus/usb/**/[0-9]* w,
+
+  # for -z
+  /{usr/,}bin/gzip ixr,
+  /{usr/,}bin/bzip2 ixr,
+
+  # for -F and -w
+  audit deny @{HOME}/.* mrwkl,
+  audit deny @{HOME}/.*/ rw,
+  audit deny @{HOME}/.*/** mrwkl,
+  audit deny @{HOME}/bin/ rw,
+  audit deny @{HOME}/bin/** mrwkl,
+  owner @{HOME}/ r,
+  owner @{HOME}/** rw,
+
+  # for -r, -F and -w
+  /**.[pP][cC][aA][pP] rw,
+  /**.[cC][aA][pP] rw,
+  # -W adds a numerical suffix
+  /**.[pP][cC][aA][pP][0-9]* rw,
+  /**.[cC][aA][pP][0-9]* rw,
+
+  # for convenience with -r (ie, read pcap files from other sources)
+  /var/log/snort/*log* r,
+
+  /usr/bin/tcpdump mr,
+
+  # Site-specific additions and overrides. See local/README for details.
+  #include <local/usr.bin.tcpdump>
+}
diff --git a/group b/group
index 56ed737d..06b770eb 100644
--- a/group
+++ b/group
@@ -70,3 +70,4 @@ iobroker:x:1001:
 ghost:x:993:
 docker:x:995:
 wheel:x:1002:pi
+tcpdump:x:115:
diff --git a/group- b/group-
index 20c10f86..56ed737d 100644
--- a/group-
+++ b/group-
@@ -69,4 +69,4 @@ Debian-exim:x:124:
 iobroker:x:1001:
 ghost:x:993:
 docker:x:995:
-wheel:x:1002:
+wheel:x:1002:pi
diff --git a/gshadow b/gshadow
index 02ee915c..13fb7336 100644
--- a/gshadow
+++ b/gshadow
@@ -70,3 +70,4 @@ iobroker:!::
 ghost:!::
 docker:!::
 wheel:!::pi
+tcpdump:!::
diff --git a/gshadow- b/gshadow-
index 44e2e153..02ee915c 100644
--- a/gshadow-
+++ b/gshadow-
@@ -69,4 +69,4 @@ Debian-exim:!::
 iobroker:!::
 ghost:!::
 docker:!::
-wheel:!::
+wheel:!::pi
diff --git a/passwd b/passwd
index 08720998..5619dae2 100644
--- a/passwd
+++ b/passwd
@@ -40,3 +40,4 @@ Debian-exim:x:118:124::/var/spool/exim4:/usr/sbin/nologin
 iobroker:x:1001:1001::/home/iobroker:/usr/sbin/nologin
 ghost:x:997:993::/home/ghost:/bin/bash
 dnsmasq:x:110:65534:dnsmasq,,,:/var/lib/misc:/usr/sbin/nologin
+tcpdump:x:119:115::/nonexistent:/usr/sbin/nologin
diff --git a/passwd- b/passwd-
index 5ac93cea..5619dae2 100644
--- a/passwd-
+++ b/passwd-
@@ -39,4 +39,5 @@ tftp:x:117:123:tftp daemon,,,:/srv/tftp:/usr/sbin/nologin
 Debian-exim:x:118:124::/var/spool/exim4:/usr/sbin/nologin
 iobroker:x:1001:1001::/home/iobroker:/usr/sbin/nologin
 ghost:x:997:993::/home/ghost:/bin/bash
-dnsmasq:x:110:65534::/var/lib/misc:/usr/sbin/nologin
+dnsmasq:x:110:65534:dnsmasq,,,:/var/lib/misc:/usr/sbin/nologin
+tcpdump:x:119:115::/nonexistent:/usr/sbin/nologin