Merge pull request #547 from c-po/dropbear

dropbear: T6195: package upgrade 2022.83-1+deb12u1

packages/dropbear/Jenkinsfile

@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2023 VyOS maintainers and contributors
+// Copyright (C) 2022-2024 VyOS maintainers and contributors
 //
 // This program is free software; you can redistribute it and/or modify
 // in order to easy exprort images built to "external" world
@@ -21,7 +21,7 @@
 
 def pkgList = [
     ['name': 'dropbear',
-     'scmCommit': 'debian/2022.83-1',
+     'scmCommit': 'debian/2022.83-1+deb12u1',
      'scmUrl': 'https://salsa.debian.org/debian/dropbear.git',
      'buildCmd': 'sudo mk-build-deps --install --tool "apt-get --yes --no-install-recommends"; cd ..; ./build.sh'],
 ]

packages/dropbear/build.sh

@@ -19,5 +19,9 @@ if [ -d $PATCH_DIR ]; then
 fi
 
 cd ${SRC}
+
+echo "I: Installing build dependencies"
+sudo apt-get install -y libpam0g-dev
+
 echo "I: Build Debian Package"
 dpkg-buildpackage -uc -us -tc -b

vars/buildPackage.groovy

@@ -194,6 +194,13 @@ def call(description=null, pkgList=null, buildCmd=null, buildArm=false, changesP
                                     sh(script: "ssh ${SSH_OPTS} ${SSH_REMOTE} -t \"uncron-add 'reprepro -v -b ${VYOS_REPO_PATH} removesrc ${RELEASE} ${PACKAGE}'\"")
                                 }
                             }
+                            files = findFiles(glob: '**/*-build-deps_*.deb')
+                            if (files) {
+                                echo "Remove Debian build dependency files from the workspace..."
+                                files.each { FILE ->
+                                    sh(script: "rm -f ${FILE}")
+                                }
+                            }
 
                             files = findFiles(glob: '**/*.deb')
                             if (files) {