From ba0e9358cad62b75fa648cace6a321f6ab9764c8 Mon Sep 17 00:00:00 2001
From: dklimpel <5740567+dklimpel@users.noreply.github.com>
Date: Tue, 7 May 2024 22:13:21 +0200
Subject: [PATCH 01/13] add Debian Bookworm container image

---
 integration-tests/Dockerfile_bookworm | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 integration-tests/Dockerfile_bookworm

diff --git a/integration-tests/Dockerfile_bookworm b/integration-tests/Dockerfile_bookworm
new file mode 100644
index 000000000..28986fc40
--- /dev/null
+++ b/integration-tests/Dockerfile_bookworm
@@ -0,0 +1,13 @@
+FROM debian:bookworm
+
+RUN echo 'deb http://archive.debian.org/debian bookworm main' > /etc/apt/sources.list
+RUN echo 'deb http://archive.debian.org/debian-security bookworm/updates main' >> /etc/apt/sources.list
+
+RUN apt-get -o Acquire::Check-Valid-Until=false update && \
+    apt-get install -y apache2 apache2-doc apache2-utils chkconfig vim-tiny ca-certificates tinyproxy && \
+    apt-get remove -y vim-tiny && \
+    apt-get clean
+
+RUN chkconfig apache2 on
+RUN chkconfig tinyproxy on
+RUN mkfifo /pipe

From 1a5910eb83f45e533645d54b1938f1aaf953e574 Mon Sep 17 00:00:00 2001
From: dklimpel <5740567+dklimpel@users.noreply.github.com>
Date: Tue, 7 May 2024 22:19:39 +0200
Subject: [PATCH 02/13] add tests with bookworm

---
 Makefile                         | 12 +++++++++---
 integration-tests/goss/vars.yaml |  6 ++++++
 integration-tests/test.sh        |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index dfbac4da0..b8e05bb28 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ VENV := $(shell echo $${VIRTUAL_ENV-.venv})
 PYTHON := $(VENV)/bin/python
 DOCS_DEPS := $(VENV)/.docs.dependencies
 
-.PHONY: all build install test release bench fmt lint vet test-int-all gen centos7 wheezy trusty alpine3 arch test-int32 centos7-32 wheezy-32 trusty-32 alpine3-32 arch-32
+.PHONY: all build install test release bench fmt lint vet test-int-all gen centos7 wheezy bookworm trusty alpine3 arch test-int32 centos7-32 wheezy-32 trusty-32 alpine3-32 arch-32
 
 all: test-short-all test-int-all dgoss-sha256
 
@@ -96,8 +96,8 @@ test-darwin-all: test-short-all test-int-darwin-all
 test-linux-all: test-short-all test-int-64 test-int-32
 test-windows-all: test-short-all test-int-windows-all
 
-test-int-64: centos7 wheezy trusty alpine3 arch test-int-serve-linux-amd64
-test-int-32: centos7-32 wheezy-32 trusty-32 alpine3-32 arch-32
+test-int-64: centos7 wheezy bookworm trusty alpine3 arch test-int-serve-linux-amd64
+test-int-32: centos7-32 wheezy-32 bookworm-32 trusty-32 alpine3-32 arch-32
 test-int-darwin-all: test-int-validate-darwin-amd64 test-int-serve-darwin-amd64
 test-int-windows-all: test-int-validate-windows-amd64 test-int-serve-windows-amd64
 test-int-all: test-int-32 test-int-64
@@ -108,6 +108,9 @@ centos7-32: build
 wheezy-32: build
 	$(info INFO: Starting build $@)
 	cd integration-tests/ && ./test.sh wheezy 386
+bookworm-32: build
+	$(info INFO: Starting build $@)
+	cd integration-tests/ && ./test.sh bookworm 386
 trusty-32: build
 	$(info INFO: Starting build $@)
 	cd integration-tests/ && ./test.sh trusty 386
@@ -123,6 +126,9 @@ centos7: build
 wheezy: build
 	$(info INFO: Starting build $@)
 	cd integration-tests/ && ./test.sh wheezy amd64
+bookworm: build
+	$(info INFO: Starting build $@)
+	cd integration-tests/ && ./test.sh bookworm amd64
 trusty: build
 	$(info INFO: Starting build $@)
 	cd integration-tests/ && ./test.sh trusty amd64
diff --git a/integration-tests/goss/vars.yaml b/integration-tests/goss/vars.yaml
index cbf6df778..675068649 100644
--- a/integration-tests/goss/vars.yaml
+++ b/integration-tests/goss/vars.yaml
@@ -25,5 +25,11 @@ wheezy:
     apache2: "2.2.22-13+deb7u13"
   services:
     apache2: ["2", "3", "5", "4"]
+bookworm:
+  proxy: http://127.0.0.1:8888
+  packages:
+    apache2: "2.4.59-1~deb12u1"
+  services:
+    apache2: ["2", "3", "5", "4"]
 
 overwrite: foo
diff --git a/integration-tests/test.sh b/integration-tests/test.sh
index 3225d37bf..a7b6decfe 100755
--- a/integration-tests/test.sh
+++ b/integration-tests/test.sh
@@ -4,7 +4,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../ci/lib/setup.sh" || exit 67
 # preserve current behaviour
 set -x
 
-os="${1:?"Need OS as 1st arg. e.g. alpine arch centos7 trusty wheezy"}"
+os="${1:?"Need OS as 1st arg. e.g. alpine arch centos7 trusty wheezy bookworm"}"
 arch="${2:?"Need arch as 2nd arg. e.g. amd64 386"}"
 
 vars_inline="{inline: bar, overwrite: bar}"

From b5e2aba46803b2bc28a6d40e935a8b846cfc820f Mon Sep 17 00:00:00 2001
From: dklimpel <5740567+dklimpel@users.noreply.github.com>
Date: Tue, 7 May 2024 22:32:59 +0200
Subject: [PATCH 03/13] add bookworm test files

---
 .../goss/bookworm/goss-aa-expected.yaml       |  17 ++
 .../goss/bookworm/goss-expected-q.yaml        | 127 +++++++++++++
 .../goss/bookworm/goss-expected.yaml          | 177 ++++++++++++++++++
 integration-tests/goss/bookworm/goss.yaml     |  35 ++++
 4 files changed, 356 insertions(+)
 create mode 100644 integration-tests/goss/bookworm/goss-aa-expected.yaml
 create mode 100644 integration-tests/goss/bookworm/goss-expected-q.yaml
 create mode 100644 integration-tests/goss/bookworm/goss-expected.yaml
 create mode 100644 integration-tests/goss/bookworm/goss.yaml

diff --git a/integration-tests/goss/bookworm/goss-aa-expected.yaml b/integration-tests/goss/bookworm/goss-aa-expected.yaml
new file mode 100644
index 000000000..c40018b00
--- /dev/null
+++ b/integration-tests/goss/bookworm/goss-aa-expected.yaml
@@ -0,0 +1,17 @@
+package:
+  apache2:
+    installed: true
+    versions:
+    - 2.4.59-1~deb12u1
+port:
+  tcp:80:
+    listening: true
+    ip:
+    - 0.0.0.0
+service:
+  apache2:
+    enabled: true
+    running: true
+process:
+  apache2:
+    running: true
diff --git a/integration-tests/goss/bookworm/goss-expected-q.yaml b/integration-tests/goss/bookworm/goss-expected-q.yaml
new file mode 100644
index 000000000..6ca24f862
--- /dev/null
+++ b/integration-tests/goss/bookworm/goss-expected-q.yaml
@@ -0,0 +1,127 @@
+file:
+  /etc/passwd:
+    exists: true
+    contents: []
+  /tmp/goss/foobar:
+    exists: false
+    contents: []
+package:
+  apache2:
+    installed: true
+  foobar:
+    installed: false
+  vim-tiny:
+    installed: false
+addr:
+  tcp://httpbin:22:
+    reachable: false
+    timeout: 1000
+  tcp://httpbin:80:
+    reachable: true
+    timeout: 1000
+  udp://8.8.8.8:53:
+    reachable: true
+    timeout: 1000
+port:
+  tcp:80:
+    listening: true
+  tcp:9999:
+    listening: false
+  tcp6:80:
+    listening: false
+service:
+  apache2:
+    enabled: true
+    running: true
+  foobar:
+    enabled: false
+    running: false
+user:
+  foobar:
+    exists: false
+  www-data:
+    exists: true
+group:
+  foobar:
+    exists: false
+  www-data:
+    exists: true
+command:
+  echo 'hi':
+    exit-status: 0
+    stdout: ""
+    stderr: ""
+    timeout: 10000
+  foobar:
+    exit-status: 127
+    stdout: ""
+    stderr: ""
+    timeout: 10000
+dns:
+  CAA:dnstest.io:
+    resolvable: true
+    timeout: 1000
+    server: 8.8.8.8
+  CNAME:c.dnstest.io:
+    resolvable: true
+    timeout: 1000
+    server: 8.8.8.8
+  MX:dnstest.io:
+    resolvable: true
+    timeout: 1000
+    server: 8.8.8.8
+  NS:dnstest.io:
+    resolvable: true
+    timeout: 1000
+    server: 8.8.8.8
+  PTR:54.243.154.1:
+    resolvable: true
+    timeout: 1000
+    server: 8.8.8.8
+  SRV:_https._tcp.dnstest.io:
+    resolvable: true
+    timeout: 1000
+    server: 8.8.8.8
+  TXT:txt._test.dnstest.io:
+    resolvable: true
+    timeout: 1000
+    server: 8.8.8.8
+  ip6.dnstest.io:
+    resolvable: true
+    timeout: 1000
+    server: 8.8.8.8
+  localhost:
+    resolvable: true
+    timeout: 1000
+process:
+  apache2:
+    running: true
+  foobar:
+    running: false
+kernel-param:
+  kernel.ostype:
+    value: Linux
+mount:
+  /dev:
+    exists: true
+    timeout: 1000
+http:
+  http://google.com:
+    status: 301
+    allow-insecure: false
+    no-follow-redirects: true
+    timeout: 5000
+    body: []
+  https://www.apple.com:
+    status: 200
+    allow-insecure: false
+    no-follow-redirects: false
+    timeout: 5000
+    body: []
+    proxy: http://127.0.0.1:8888
+  https://www.google.com:
+    status: 200
+    allow-insecure: false
+    no-follow-redirects: false
+    timeout: 5000
+    body: []
diff --git a/integration-tests/goss/bookworm/goss-expected.yaml b/integration-tests/goss/bookworm/goss-expected.yaml
new file mode 100644
index 000000000..a926df82d
--- /dev/null
+++ b/integration-tests/goss/bookworm/goss-expected.yaml
@@ -0,0 +1,177 @@
+file:
+  /etc/passwd:
+    exists: true
+    mode: "0644"
+    owner: root
+    group: root
+    filetype: file
+    contents: []
+  /tmp/goss/foobar:
+    exists: false
+    contents: []
+package:
+  apache2:
+    installed: true
+    versions:
+    - 2.4.59-1~deb12u1
+  foobar:
+    installed: false
+  vim-tiny:
+    installed: false
+addr:
+  tcp://httpbin:22:
+    reachable: false
+    timeout: 1000
+  tcp://httpbin:80:
+    reachable: true
+    timeout: 1000
+  udp://8.8.8.8:53:
+    reachable: true
+    timeout: 1000
+port:
+  tcp:80:
+    listening: true
+    ip:
+    - 0.0.0.0
+  tcp:9999:
+    listening: false
+    ip: []
+  tcp6:80:
+    listening: false
+    ip: []
+service:
+  apache2:
+    enabled: true
+    running: true
+  foobar:
+    enabled: false
+    running: false
+user:
+  foobar:
+    exists: false
+  www-data:
+    exists: true
+    uid: 33
+    gid: 33
+    groups:
+    - www-data
+    home: /var/www
+    shell: /bin/sh
+group:
+  foobar:
+    exists: false
+  www-data:
+    exists: true
+    gid: 33
+command:
+  echo 'hi':
+    exit-status: 0
+    stdout:
+    - hi
+    stderr: ""
+    timeout: 10000
+  foobar:
+    exit-status: 127
+    stdout: ""
+    stderr:
+    - 'sh: 1: foobar: not found'
+    timeout: 10000
+dns:
+  CAA:dnstest.io:
+    resolvable: true
+    addrs:
+    - 0 issue comodoca.com
+    - 0 issue letsencrypt.org
+    - 0 issuewild ;
+    timeout: 1000
+    server: 8.8.8.8
+  CNAME:c.dnstest.io:
+    resolvable: true
+    addrs:
+    - a.dnstest.io.
+    timeout: 1000
+    server: 8.8.8.8
+  MX:dnstest.io:
+    resolvable: true
+    addrs:
+    - 10 b.dnstest.io.
+    - 5 a.dnstest.io.
+    timeout: 1000
+    server: 8.8.8.8
+  NS:dnstest.io:
+    resolvable: true
+    addrs:
+    - ns1.dnstest.io.
+    - ns2.dnstest.io.
+    timeout: 1000
+    server: 8.8.8.8
+  PTR:54.243.154.1:
+    resolvable: true
+    addrs:
+    - ec2-54-243-154-1.compute-1.amazonaws.com.
+    timeout: 1000
+    server: 8.8.8.8
+  SRV:_https._tcp.dnstest.io:
+    resolvable: true
+    addrs:
+    - 0 5 443 a.dnstest.io.
+    - 10 10 443 b.dnstest.io.
+    timeout: 1000
+    server: 8.8.8.8
+  TXT:txt._test.dnstest.io:
+    resolvable: true
+    addrs:
+    - Hello DNS
+    timeout: 1000
+    server: 8.8.8.8
+  ip6.dnstest.io:
+    resolvable: true
+    addrs:
+    - 2404:6800:4001:807::200e
+    timeout: 1000
+    server: 8.8.8.8
+  localhost:
+    resolvable: true
+    addrs:
+    - 127.0.0.1
+    - ::1
+    timeout: 1000
+process:
+  apache2:
+    running: true
+  foobar:
+    running: false
+kernel-param:
+  kernel.ostype:
+    value: Linux
+mount:
+  /dev:
+    exists: true
+    opts:
+    - rw
+    - nosuid
+    vfs-opts:
+    - rw
+    source: tmpfs
+    filesystem: tmpfs
+    timeout: 1000
+http:
+  http://google.com:
+    status: 301
+    allow-insecure: false
+    no-follow-redirects: true
+    timeout: 5000
+    body: []
+  https://www.apple.com:
+    status: 200
+    allow-insecure: false
+    no-follow-redirects: false
+    timeout: 5000
+    body: []
+    proxy: http://127.0.0.1:8888
+  https://www.google.com:
+    status: 200
+    allow-insecure: false
+    no-follow-redirects: false
+    timeout: 5000
+    body: []
diff --git a/integration-tests/goss/bookworm/goss.yaml b/integration-tests/goss/bookworm/goss.yaml
new file mode 100644
index 000000000..c83ed1d0e
--- /dev/null
+++ b/integration-tests/goss/bookworm/goss.yaml
@@ -0,0 +1,35 @@
+---
+service:
+  autofs:
+    enabled: false
+    running: false
+user:
+  www-data:
+    exists: true
+    uid: 33
+    gid: 33
+    groups:
+    - www-data
+    home: "/var/www"
+group:
+  www-data:
+    exists: true
+    gid: 33
+process:
+  apache2:
+    running: true
+port:
+  tcp:80:
+    listening: true
+    ip:
+    - '0.0.0.0'
+addr:
+  tcp://127.0.0.1:80:
+    reachable: true
+    timeout: 500
+    local-address: 127.0.0.1
+gossfile:
+  "../goss-s*.yaml": {}
+  bypath:
+    file: "../goss-dummy.yaml"
+

From f7e9c307a377e03b17639f608bb0d82c0569ebc8 Mon Sep 17 00:00:00 2001
From: dklimpel <5740567+dklimpel@users.noreply.github.com>
Date: Tue, 7 May 2024 22:52:03 +0200
Subject: [PATCH 04/13] remove source lists

---
 integration-tests/Dockerfile_bookworm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/integration-tests/Dockerfile_bookworm b/integration-tests/Dockerfile_bookworm
index 28986fc40..e0f9a09e7 100644
--- a/integration-tests/Dockerfile_bookworm
+++ b/integration-tests/Dockerfile_bookworm
@@ -1,8 +1,5 @@
 FROM debian:bookworm
 
-RUN echo 'deb http://archive.debian.org/debian bookworm main' > /etc/apt/sources.list
-RUN echo 'deb http://archive.debian.org/debian-security bookworm/updates main' >> /etc/apt/sources.list
-
 RUN apt-get -o Acquire::Check-Valid-Until=false update && \
     apt-get install -y apache2 apache2-doc apache2-utils chkconfig vim-tiny ca-certificates tinyproxy && \
     apt-get remove -y vim-tiny && \

From ba83b98f0bfd3e641706cc41541fde98dc308b72 Mon Sep 17 00:00:00 2001
From: dklimpel <5740567+dklimpel@users.noreply.github.com>
Date: Tue, 7 May 2024 23:06:49 +0200
Subject: [PATCH 05/13] remove chkconfig

---
 integration-tests/Dockerfile_bookworm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/integration-tests/Dockerfile_bookworm b/integration-tests/Dockerfile_bookworm
index e0f9a09e7..9c074d10c 100644
--- a/integration-tests/Dockerfile_bookworm
+++ b/integration-tests/Dockerfile_bookworm
@@ -1,10 +1,10 @@
 FROM debian:bookworm
 
 RUN apt-get -o Acquire::Check-Valid-Until=false update && \
-    apt-get install -y apache2 apache2-doc apache2-utils chkconfig vim-tiny ca-certificates tinyproxy && \
+    apt-get install -y apache2 apache2-doc apache2-utils vim-tiny ca-certificates tinyproxy && \
     apt-get remove -y vim-tiny && \
     apt-get clean
 
-RUN chkconfig apache2 on
-RUN chkconfig tinyproxy on
+RUN update-rc.d apache2 defaults
+RUN update-rc.d tinyproxy defaults
 RUN mkfifo /pipe

From 1c946a47c3c2602e125b550d7fac458b6d3005e0 Mon Sep 17 00:00:00 2001
From: dklimpel <5740567+dklimpel@users.noreply.github.com>
Date: Tue, 7 May 2024 23:30:42 +0200
Subject: [PATCH 06/13] add init package

---
 integration-tests/Dockerfile_bookworm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration-tests/Dockerfile_bookworm b/integration-tests/Dockerfile_bookworm
index 9c074d10c..38004eb9a 100644
--- a/integration-tests/Dockerfile_bookworm
+++ b/integration-tests/Dockerfile_bookworm
@@ -1,7 +1,7 @@
 FROM debian:bookworm
 
 RUN apt-get -o Acquire::Check-Valid-Until=false update && \
-    apt-get install -y apache2 apache2-doc apache2-utils vim-tiny ca-certificates tinyproxy && \
+    apt-get install -y init apache2 apache2-doc apache2-utils vim-tiny ca-certificates tinyproxy && \
     apt-get remove -y vim-tiny && \
     apt-get clean
 

From 5a795a040401f1ef8e1a9d3c15fc48998443500e Mon Sep 17 00:00:00 2001
From: dklimpel <5740567+dklimpel@users.noreply.github.com>
Date: Fri, 10 May 2024 13:29:33 +0200
Subject: [PATCH 07/13] fix image and tests

---
 integration-tests/Dockerfile_bookworm | 9 ++++-----
 integration-tests/goss/vars.yaml      | 2 +-
 integration-tests/test.sh             | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/integration-tests/Dockerfile_bookworm b/integration-tests/Dockerfile_bookworm
index 38004eb9a..482c29740 100644
--- a/integration-tests/Dockerfile_bookworm
+++ b/integration-tests/Dockerfile_bookworm
@@ -1,10 +1,9 @@
 FROM debian:bookworm
 
 RUN apt-get -o Acquire::Check-Valid-Until=false update && \
-    apt-get install -y init apache2 apache2-doc apache2-utils vim-tiny ca-certificates tinyproxy && \
+    apt-get install -y apache2=2.4.59-1~deb12u1 ca-certificates tinyproxy vim-tiny systemd systemd-sysv && \
     apt-get remove -y vim-tiny && \
-    apt-get clean
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-RUN update-rc.d apache2 defaults
-RUN update-rc.d tinyproxy defaults
-RUN mkfifo /pipe
+RUN mkfifo /pipe
\ No newline at end of file
diff --git a/integration-tests/goss/vars.yaml b/integration-tests/goss/vars.yaml
index 675068649..578e93277 100644
--- a/integration-tests/goss/vars.yaml
+++ b/integration-tests/goss/vars.yaml
@@ -30,6 +30,6 @@ bookworm:
   packages:
     apache2: "2.4.59-1~deb12u1"
   services:
-    apache2: ["2", "3", "5", "4"]
+    apache2: []
 
 overwrite: foo
diff --git a/integration-tests/test.sh b/integration-tests/test.sh
index a7b6decfe..8c7036dab 100755
--- a/integration-tests/test.sh
+++ b/integration-tests/test.sh
@@ -36,7 +36,7 @@ fi
 network=goss-test
 docker network create --driver bridge  --subnet '172.19.0.0/16' $network
 docker run -d --name httpbin --network $network kennethreitz/httpbin
-opts=(--env OS=$os --cap-add SYS_ADMIN -v "$PWD/goss:/goss" -d --name "$container_name" --security-opt seccomp:unconfined --security-opt label:disable)
+opts=(--env OS=$os --cap-add SYS_ADMIN -v "$PWD/goss:/goss" -d --name "$container_name" --security-opt seccomp:unconfined --security-opt label:disable --privileged)
 id=$(docker run "${opts[@]}" --network $network "aelsabbahy/goss_$os" /sbin/init)
 ip=$(docker inspect --format '{{ .NetworkSettings.IPAddress }}' "$id")
 trap "rv=\$?; docker rm -vf $id;docker rm -vf httpbin;docker network rm $network; exit \$rv" INT TERM EXIT

From 7647c1a7caefd8f25aab73d9a440e7f23fb232d4 Mon Sep 17 00:00:00 2001
From: dklimpel <5740567+dklimpel@users.noreply.github.com>
Date: Fri, 10 May 2024 13:30:16 +0200
Subject: [PATCH 08/13] add new line add end

---
 integration-tests/Dockerfile_bookworm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration-tests/Dockerfile_bookworm b/integration-tests/Dockerfile_bookworm
index 482c29740..00950fe84 100644
--- a/integration-tests/Dockerfile_bookworm
+++ b/integration-tests/Dockerfile_bookworm
@@ -6,4 +6,4 @@ RUN apt-get -o Acquire::Check-Valid-Until=false update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-RUN mkfifo /pipe
\ No newline at end of file
+RUN mkfifo /pipe

From 86d233a2ca57386c04483992b39b98601feb35e8 Mon Sep 17 00:00:00 2001
From: dklimpel <5740567+dklimpel@users.noreply.github.com>
Date: Fri, 10 May 2024 15:16:28 +0200
Subject: [PATCH 09/13] fix apache user shell

---
 integration-tests/goss/bookworm/goss-expected.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration-tests/goss/bookworm/goss-expected.yaml b/integration-tests/goss/bookworm/goss-expected.yaml
index a926df82d..ebc1ed6af 100644
--- a/integration-tests/goss/bookworm/goss-expected.yaml
+++ b/integration-tests/goss/bookworm/goss-expected.yaml
@@ -56,7 +56,7 @@ user:
     groups:
     - www-data
     home: /var/www
-    shell: /bin/sh
+    shell: /usr/bin/nologin
 group:
   foobar:
     exists: false

From 003e24abea55de438b41858123ce61da04afd78c Mon Sep 17 00:00:00 2001
From: dklimpel <5740567+dklimpel@users.noreply.github.com>
Date: Fri, 10 May 2024 15:42:55 +0200
Subject: [PATCH 10/13] fix typo

---
 integration-tests/goss/bookworm/goss-expected.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/integration-tests/goss/bookworm/goss-expected.yaml b/integration-tests/goss/bookworm/goss-expected.yaml
index ebc1ed6af..bd0316344 100644
--- a/integration-tests/goss/bookworm/goss-expected.yaml
+++ b/integration-tests/goss/bookworm/goss-expected.yaml
@@ -56,7 +56,7 @@ user:
     groups:
     - www-data
     home: /var/www
-    shell: /usr/bin/nologin
+    shell: /usr/sbin/nologin
 group:
   foobar:
     exists: false

From e55f9fdb27b8a5cf815fadea29950801a4dcc9b6 Mon Sep 17 00:00:00 2001
From: dklimpel <5740567+dklimpel@users.noreply.github.com>
Date: Sat, 6 Jul 2024 15:23:44 +0200
Subject: [PATCH 11/13] use own .PHONY directive to avoid merge conflicts

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d1e843bc1..ae46472b4 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ VENV := $(shell echo $${VIRTUAL_ENV-.venv})
 PYTHON := $(VENV)/bin/python
 DOCS_DEPS := $(VENV)/.docs.dependencies
 
-.PHONY: all build install test release bench fmt lint vet test-int-all gen centos7 wheezy bookworm trusty alpine3 arch test-int32 centos7-32 wheezy-32 trusty-32 alpine3-32 arch-32
+.PHONY: all build install test release bench fmt lint vet test-int-all gen centos7 wheezy trusty alpine3 arch test-int32 centos7-32 wheezy-32 trusty-32 alpine3-32 arch-32
 
 all: test-short-all test-int-all dgoss-sha256
 
@@ -108,6 +108,7 @@ centos7-32: build
 wheezy-32: build
 	$(info INFO: Starting build $@)
 	cd integration-tests/ && ./test.sh wheezy 386
+.PHONY: bookworm
 bookworm-32: build
 	$(info INFO: Starting build $@)
 	cd integration-tests/ && ./test.sh bookworm 386

From 950ce5e413cf8a4a7bdc7ecf01777a73189bef0c Mon Sep 17 00:00:00 2001
From: dklimpel <5740567+dklimpel@users.noreply.github.com>
Date: Sat, 6 Jul 2024 15:26:11 +0200
Subject: [PATCH 12/13] fix PHONY

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ae46472b4..175cbd7eb 100644
--- a/Makefile
+++ b/Makefile
@@ -108,7 +108,7 @@ centos7-32: build
 wheezy-32: build
 	$(info INFO: Starting build $@)
 	cd integration-tests/ && ./test.sh wheezy 386
-.PHONY: bookworm
+.PHONY: bookworm-32
 bookworm-32: build
 	$(info INFO: Starting build $@)
 	cd integration-tests/ && ./test.sh bookworm 386
@@ -127,6 +127,7 @@ centos7: build
 wheezy: build
 	$(info INFO: Starting build $@)
 	cd integration-tests/ && ./test.sh wheezy amd64
+.PHONY: bookworm
 bookworm: build
 	$(info INFO: Starting build $@)
 	cd integration-tests/ && ./test.sh bookworm amd64

From b02b1c299b89911cf772d3246e6d6b29ff7402bc Mon Sep 17 00:00:00 2001
From: dklimpel <5740567+dklimpel@users.noreply.github.com>
Date: Fri, 15 Nov 2024 23:02:27 +0100
Subject: [PATCH 13/13] bump apache2

---
 integration-tests/Dockerfile_bookworm                 | 2 +-
 integration-tests/goss/bookworm/goss-aa-expected.yaml | 2 +-
 integration-tests/goss/bookworm/goss-expected.yaml    | 2 +-
 integration-tests/goss/vars.yaml                      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/integration-tests/Dockerfile_bookworm b/integration-tests/Dockerfile_bookworm
index 00950fe84..2663f7951 100644
--- a/integration-tests/Dockerfile_bookworm
+++ b/integration-tests/Dockerfile_bookworm
@@ -1,7 +1,7 @@
 FROM debian:bookworm
 
 RUN apt-get -o Acquire::Check-Valid-Until=false update && \
-    apt-get install -y apache2=2.4.59-1~deb12u1 ca-certificates tinyproxy vim-tiny systemd systemd-sysv && \
+    apt-get install -y apache2=2.4.62-1~deb12u2 ca-certificates tinyproxy vim-tiny systemd systemd-sysv && \
     apt-get remove -y vim-tiny && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/integration-tests/goss/bookworm/goss-aa-expected.yaml b/integration-tests/goss/bookworm/goss-aa-expected.yaml
index c40018b00..5349698ec 100644
--- a/integration-tests/goss/bookworm/goss-aa-expected.yaml
+++ b/integration-tests/goss/bookworm/goss-aa-expected.yaml
@@ -2,7 +2,7 @@ package:
   apache2:
     installed: true
     versions:
-    - 2.4.59-1~deb12u1
+    - 2.4.62-1~deb12u2
 port:
   tcp:80:
     listening: true
diff --git a/integration-tests/goss/bookworm/goss-expected.yaml b/integration-tests/goss/bookworm/goss-expected.yaml
index bd0316344..fc6e58a99 100644
--- a/integration-tests/goss/bookworm/goss-expected.yaml
+++ b/integration-tests/goss/bookworm/goss-expected.yaml
@@ -13,7 +13,7 @@ package:
   apache2:
     installed: true
     versions:
-    - 2.4.59-1~deb12u1
+    - 2.4.62-1~deb12u2
   foobar:
     installed: false
   vim-tiny:
diff --git a/integration-tests/goss/vars.yaml b/integration-tests/goss/vars.yaml
index 0b3b4d3de..2e2742f43 100644
--- a/integration-tests/goss/vars.yaml
+++ b/integration-tests/goss/vars.yaml
@@ -34,7 +34,7 @@ wheezy:
 bookworm:
   proxy: http://127.0.0.1:8888
   packages:
-    apache2: "2.4.59-1~deb12u1"
+    apache2: "2.4.62-1~deb12u2"
   services:
     apache2: []