From 3293b412a81ef0ff8c6fd0b809a9586752e7133a Mon Sep 17 00:00:00 2001
From: Jan Dubois <jan.dubois@suse.com>
Date: Thu, 21 Dec 2023 16:38:23 -0800
Subject: [PATCH 1/3] =?UTF-8?q?Bump=20Alpine=203.18.0=20=E2=86=92=203.19.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jan Dubois <jan.dubois@suse.com>
---
 .github/workflows/release.yml | 2 +-
 Makefile                      | 2 +-
 src/aports                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4819fa5..ebfe639 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -8,7 +8,7 @@ on:
   pull_request:
 
 env:
-  ALPINE_VERSION: 3.18.0
+  ALPINE_VERSION: 3.19.0
   DOCKER_BUILDKIT: 1
 
 jobs:
diff --git a/Makefile b/Makefile
index 44a1e02..4c5905f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-ALPINE_VERSION ?= 3.18.0
+ALPINE_VERSION ?= 3.19.0
 REPO_VERSION ?= $(shell echo "$(ALPINE_VERSION)" | sed -E 's/^([0-9]+\.[0-9]+).*/v\1/')
 GIT_TAG ?= $(shell echo "v$(ALPINE_VERSION)" | sed 's/^vedge$$/origin\/master/')
 BUILD_ID ?= $(shell git describe --tags)
diff --git a/src/aports b/src/aports
index 8b72c40..d015023 160000
--- a/src/aports
+++ b/src/aports
@@ -1 +1 @@
-Subproject commit 8b72c4075123f7310c54ae09e83016890cadefd3
+Subproject commit d01502332b773d59a09220aac959a3c18c429ce3

From 0d0956b705606c890a07276af4264a74f1b0832a Mon Sep 17 00:00:00 2001
From: Jan Dubois <jan.dubois@suse.com>
Date: Tue, 9 Jan 2024 18:29:56 -0800
Subject: [PATCH 2/3] Alpine 3.19 has working PAM support by default

Signed-off-by: Jan Dubois <jan.dubois@suse.com>
---
 build.sh          | 1 -
 genapkovl-lima.sh | 5 +----
 mkimg.lima.sh     | 2 +-
 sshd.pam          | 4 ----
 4 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 sshd.pam

diff --git a/build.sh b/build.sh
index d866949..817589d 100755
--- a/build.sh
+++ b/build.sh
@@ -22,7 +22,6 @@ ${DOCKER} run --rm \
     -v "${PWD}/qemu-${QEMU_VERSION}-copying:/home/build/qemu-copying:ro" \
     -v "${PWD}/cri-dockerd-${CRI_DOCKERD_VERSION}-${ARCH}:/home/build/cri-dockerd.tar.gz:ro" \
     -v "${PWD}/cri-dockerd-${CRI_DOCKERD_VERSION}-${ARCH}.LICENSE:/home/build/cri-dockerd.license:ro" \
-    -v "${PWD}/sshd.pam:/home/build/sshd.pam:ro" \
     $(env | grep ^LIMA_ | xargs -n 1 printf -- '-e %s ') \
     -e "LIMA_REPO_VERSION=${REPO_VERSION}" \
     -e "LIMA_BUILD_ID=${BUILD_ID}" \
diff --git a/genapkovl-lima.sh b/genapkovl-lima.sh
index b1b325c..d2bff87 100755
--- a/genapkovl-lima.sh
+++ b/genapkovl-lima.sh
@@ -44,7 +44,7 @@ EOF
 mkdir -p "$tmp"/etc/apk
 makefile root:root 0644 "$tmp"/etc/apk/world <<EOF
 alpine-base
-openssh-server-pam
+openssh-server
 EOF
 
 rc_add devfs sysinit
@@ -99,9 +99,6 @@ EOF
 
 rc_add lima-overlay default
 
-mkdir -p "$tmp"/etc/pam.d
-cp /home/build/sshd.pam "${tmp}/etc/pam.d/sshd"
-
 if [ "${LIMA_INSTALL_LIMA_INIT}" == "true" ]; then
     rc_add lima-init default
     rc_add lima-init-local default
diff --git a/mkimg.lima.sh b/mkimg.lima.sh
index 95474fc..54533e3 100755
--- a/mkimg.lima.sh
+++ b/mkimg.lima.sh
@@ -13,7 +13,7 @@ profile_lima() {
 	kernel_cmdline="console=hvc0 console=tty0 console=ttyS0,115200"
 	syslinux_serial="0 115200"
 	apkovl="genapkovl-lima.sh"
-	apks="$apks openssh-server-pam"
+	apks="$apks openssh-server"
         if [ "${LIMA_INSTALL_CA_CERTIFICATES}" == "true" ]; then
             apks="$apks ca-certificates"
         fi
diff --git a/sshd.pam b/sshd.pam
deleted file mode 100644
index a11bd10..0000000
--- a/sshd.pam
+++ /dev/null
@@ -1,4 +0,0 @@
-auth      include   system-login
-account   include   system-login
-password  include   system-login
-session   include   system-login

From 07a8600eaf423f417ef51b3cb40c5185e44da7cf Mon Sep 17 00:00:00 2001
From: Jan Dubois <jan.dubois@suse.com>
Date: Tue, 9 Jan 2024 18:35:18 -0800
Subject: [PATCH 3/3] Update actions/checkout@v2 to @v4

Signed-off-by: Jan Dubois <jan.dubois@suse.com>
---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ebfe639..f84fd51 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 60
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 1
         submodules: recursive