From ca7fb97ba05aa3ba1c07baf8652409f5ef7b6bc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Sun, 15 Aug 2021 14:59:16 +0200
Subject: [PATCH] remove stretch from default repositories/targets

---
 Makefile             | 4 ++--
 dput.cf              | 6 ------
 eobuildall           | 2 +-
 eobuilder/cmdline.py | 6 +++---
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 356a939..e551a6d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ uninstall:
 	rm /etc/cron.daily/eobuilder
 
 chroots:
-	for DIST in stretch buster bullseye; do \
+	for DIST in buster bullseye; do \
 		for ARCH in i386 amd64; do \
 			mkdir -p /var/cache/pbuilder/$$DIST-$$ARCH/base.cow; \
 			DIST=$$DIST ARCH=$$ARCH cowbuilder --create --configfile ./pbuilderrc --keyring ./entrouvert.gpg; \
@@ -26,7 +26,7 @@ chroots:
 	done
 
 chroots-update:
-	for DIST in stretch buster bullseye; do \
+	for DIST in buster bullseye; do \
 		for ARCH in i386 amd64; do \
 			mkdir -p /var/cache/pbuilder/$$DIST-$$ARCH/base.cow; \
 			DIST=$$DIST ARCH=$$ARCH cowbuilder --update --configfile ./pbuilderrc --keyring ./entrouvert.gpg; \
diff --git a/dput.cf b/dput.cf
index 3ed4adf..5daabef 100644
--- a/dput.cf
+++ b/dput.cf
@@ -2,18 +2,12 @@
 method = scp
 fqdn = deb.entrouvert.org
 
-[stretch-eobuilder]
-incoming = /var/vhosts/deb.entrouvert.org/incoming/stretch-eobuilder
-
 [buster-eobuilder]
 incoming = /var/vhosts/deb.entrouvert.org/incoming/buster-eobuilder
 
 [bullseye-eobuilder]
 incoming = /var/vhosts/deb.entrouvert.org/incoming/bullseye-eobuilder
 
-[stretch-hotfix]
-incoming = /var/vhosts/deb.entrouvert.org/incoming/stretch-hotfix
-
 [buster-hotfix]
 incoming = /var/vhosts/deb.entrouvert.org/incoming/buster-hotfix
 
diff --git a/eobuildall b/eobuildall
index 0160f80..7a8eeb3 100755
--- a/eobuildall
+++ b/eobuildall
@@ -50,7 +50,7 @@ def build_module(config, module):
     try:
         dists = config.get('dists', module)
     except (ConfigParser.NoSectionError, ConfigParser.NoOptionError):
-        dists = 'stretch,buster,bullseye'
+        dists = 'buster,bullseye'
     rc = os.system('/usr/local/bin/eobuilder -d %(dists)s %(module)s' % {'dists': dists, 'module': module})
     if rc == 0:
         return 'ok'
diff --git a/eobuilder/cmdline.py b/eobuilder/cmdline.py
index 4e53f10..43f0346 100644
--- a/eobuilder/cmdline.py
+++ b/eobuilder/cmdline.py
@@ -27,7 +27,7 @@ class MultipleOption(Option):
 def parse_cmdline():
     parser = OptionParser(
         option_class=MultipleOption,
-        usage='usage: %prog [OPTIONS] -d [bullseye|,buster|,stretch] GIT_REPOSITORY_NAME',
+        usage='usage: %prog [OPTIONS] -d [bullseye|,buster] GIT_REPOSITORY_NAME',
     )
     parser.add_option(
         "-a",
@@ -47,7 +47,7 @@ def parse_cmdline():
         dest="distrib",
         metavar='DISTRIBUTIONS',
         default=[],
-        help="DISTRIBUTIONS: bullseye, buster and / or stretch",
+        help="DISTRIBUTIONS: bullseye and/or buster",
     )
     parser.add_option(
         "-f", "--force", action="store_true", dest="force", default=False, help="force a new build"
@@ -104,7 +104,7 @@ def parse_cmdline():
         default=[],
         dest="repositories",
         metavar='DISTRIBUTION:REPOSITORY, DISTRIBUTION:REPOSITORY',
-        help="DISTRIBUTION:REPOSITORY: bullseye:bullseye-eobuilder, buster:buster-eobuilder, stretch:stretch-eobuilder",
+        help="DISTRIBUTION:REPOSITORY: bullseye:bullseye-eobuilder, buster:buster-eobuilder",
     )
     parser.add_option(
         "--no-dput",