From 94b6df06fb57bdcbaddcdab0bd96e490b408d949 Mon Sep 17 00:00:00 2001
From: Michael Hashizume <michael.hashizume@puppet.com>
Date: Tue, 27 Sep 2022 09:16:59 -0700
Subject: [PATCH] (PA-4573) Removes Debian 9

Debian 9 ("stretch") hit end the end of its LTS support in June
2022. This commit removes Debian 9 from all Vanagon platforms
and components.
---
 configs/components/_base-ruby-selinux.rb |  4 ++--
 configs/components/augeas.rb             |  6 +-----
 configs/components/boost.rb              |  2 +-
 configs/components/runtime-agent.rb      |  2 +-
 configs/platforms/debian-9-amd64.rb      | 15 ---------------
 configs/platforms/debian-9-i386.rb       | 16 ----------------
 6 files changed, 5 insertions(+), 40 deletions(-)
 delete mode 100644 configs/platforms/debian-9-amd64.rb
 delete mode 100644 configs/platforms/debian-9-i386.rb

diff --git a/configs/components/_base-ruby-selinux.rb b/configs/components/_base-ruby-selinux.rb
index d315ae6f9..82d314471 100644
--- a/configs/components/_base-ruby-selinux.rb
+++ b/configs/components/_base-ruby-selinux.rb
@@ -8,7 +8,7 @@
 host_ruby ||= settings[:host_ruby]
 ruby_bindir ||= settings[:ruby_bindir]
 
-if platform.name =~ /el-(6|7)|debian-9|ubuntu-(16|18.04-amd64)/
+if platform.name =~ /el-(6|7)|ubuntu-(16|18.04-amd64)/
   pkg.version "2.0.94"
   pkg.md5sum "544f75aab11c2af352facc51af12029f"
   pkg.url "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20100525/devel/libselinux-#{pkg.get_version}.tar.gz"
@@ -36,7 +36,7 @@
 cflags = ""
 
 # The platforms below use pl-build-tools
-unless platform.name =~ /el-(6|7)|debian-9|ubuntu-(16|18.04-amd64)/
+unless platform.name =~ /el-(6|7)|ubuntu-(16|18.04-amd64)/
   cc = '/usr/bin/gcc'
   cflags += "#{settings[:cppflags]} #{settings[:cflags]}"
 end
diff --git a/configs/components/augeas.rb b/configs/components/augeas.rb
index 930f02900..30b05275b 100644
--- a/configs/components/augeas.rb
+++ b/configs/components/augeas.rb
@@ -72,11 +72,7 @@
       pkg.environment "LDFLAGS", settings[:ldflags]
     end
   elsif platform.is_deb?
-    if platform.name =~ /debian-9/
-      pkg.requires 'libreadline7'
-    else
-      pkg.requires 'libreadline6'
-    end
+    pkg.requires 'libreadline6'
 
     if platform.is_cross_compiled_linux?
       pkg.environment "PATH", "/opt/pl-build-tools/bin:$(PATH):#{settings[:bindir]}"
diff --git a/configs/components/boost.rb b/configs/components/boost.rb
index aefc850e2..59eecd3bb 100644
--- a/configs/components/boost.rb
+++ b/configs/components/boost.rb
@@ -117,7 +117,7 @@
     pkg.environment "CXXFLAGS", "-pthread"
     pkg.environment "PATH", "/opt/freeware/bin:/opt/pl-build-tools/bin:$(PATH)"
     linkflags = "-Wl,-L#{settings[:libdir]},-L/opt/pl-build-tools/lib"
-  elsif platform.name =~ /debian-9|el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-(:?14.04|18.04-amd64)/
+  elsif platform.name =~ /el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-(:?14.04|18.04-amd64)/
     pkg.environment "PATH", "/opt/pl-build-tools/bin:#{settings[:bindir]}:$(PATH)"
     linkflags = "-Wl,-rpath=#{settings[:libdir]},-rpath=#{settings[:libdir]}64"
   else
diff --git a/configs/components/runtime-agent.rb b/configs/components/runtime-agent.rb
index d4f9dd2df..fc2d0c02a 100644
--- a/configs/components/runtime-agent.rb
+++ b/configs/components/runtime-agent.rb
@@ -43,7 +43,7 @@
     pkg.install_file "#{settings[:tools_root]}/bin/libiconv-2.dll", "#{settings[:ruby_bindir]}/libiconv-2.dll"
     pkg.install_file "#{settings[:tools_root]}/bin/libffi-6.dll", "#{settings[:ruby_bindir]}/libffi-6.dll"
   elsif platform.is_solaris? ||
-        platform.name =~ /debian-9|el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-(:?14.04|18.04-amd64)/
+        platform.name =~ /el-[567]|redhatfips-7|sles-(:?11|12)|ubuntu-(:?14.04|18.04-amd64)/
     pkg.install do
       "bash runtime.sh #{libdir} puppet"
     end
diff --git a/configs/platforms/debian-9-amd64.rb b/configs/platforms/debian-9-amd64.rb
deleted file mode 100644
index 98a712c39..000000000
--- a/configs/platforms/debian-9-amd64.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-platform "debian-9-amd64" do |plat|
-  plat.inherit_from_default
-
-  packages = %w(
-    libbz2-dev
-    libreadline-dev
-    libselinux1-dev
-    openjdk-8-jdk
-    pl-cmake
-    pl-gcc swig
-    systemtap-sdt-dev
-    zlib1g-dev
-  )
-  plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends #{packages.join(' ')}"
-end
diff --git a/configs/platforms/debian-9-i386.rb b/configs/platforms/debian-9-i386.rb
deleted file mode 100644
index 6e9a6ce0b..000000000
--- a/configs/platforms/debian-9-i386.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-platform "debian-9-i386" do |plat|
-  plat.inherit_from_default
-
-  packages = %w(
-    libbz2-dev
-    libreadline-dev
-    libselinux1-dev
-    openjdk-8-jdk
-    pl-cmake
-    pl-gcc
-    swig
-    systemtap-sdt-dev
-    zlib1g-dev
-  )
-  plat.provision_with "export DEBIAN_FRONTEND=noninteractive; apt-get update -qq; apt-get install -qy --no-install-recommends #{packages.join(' ')}"
-end