From 30fe681bffa1bf38f1fdd650ee8f3631e0f57015 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 12 Jan 2018 02:33:17 +0000 Subject: [PATCH] abiupdate.py: Add support for security mirrors --- debian/bin/abiupdate.py | 13 ++++++++++++- debian/changelog | 3 +++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/debian/bin/abiupdate.py b/debian/bin/abiupdate.py index d35e50ba8..10e3473b7 100755 --- a/debian/bin/abiupdate.py +++ b/debian/bin/abiupdate.py @@ -19,6 +19,7 @@ default_url_base = "http://deb.debian.org/debian/" default_url_base_incoming = "http://incoming.debian.org/debian-buildd/" default_url_base_ports = "http://ftp.ports.debian.org/debian-ports/" default_url_base_ports_incoming = "http://incoming.ports.debian.org/" +default_url_base_security = "http://security.debian.org/" class url_debian_flat(object): @@ -44,6 +45,11 @@ class url_debian_ports_pool(url_debian_pool): return self.base + "pool-" + arch + "/main/" + source[0] + "/" + source + "/" + filename +class url_debian_security_pool(url_debian_pool): + def __call__(self, source, filename, arch): + return self.base + "pool/updates/main/" + source[0] + "/" + source + "/" + filename + + class Main(object): dir = None @@ -182,10 +188,12 @@ if __name__ == '__main__': options.add_option("-i", "--incoming", action="store_true", dest="incoming") options.add_option("--incoming-config", action="store_true", dest="incoming_config") options.add_option("--ports", action="store_true", dest="ports") + options.add_option("--security", action="store_true", dest="security") options.add_option("-u", "--url-base", dest="url_base", default=default_url_base) options.add_option("--url-base-incoming", dest="url_base_incoming", default=default_url_base_incoming) options.add_option("--url-base-ports", dest="url_base_ports", default=default_url_base_ports) options.add_option("--url-base-ports-incoming", dest="url_base_ports_incoming", default=default_url_base_ports_incoming) + options.add_option("--url-base-security", dest="url_base_security", default=default_url_base_security) opts, args = options.parse_args() @@ -201,11 +209,14 @@ if __name__ == '__main__': url_base_incoming = url_debian_pool(opts.url_base_incoming) url_base_ports = url_debian_ports_pool(opts.url_base_ports) url_base_ports_incoming = url_debian_flat(opts.url_base_ports_incoming) + url_base_security = url_debian_security_pool(opts.url_base_security) if opts.incoming_config: url = url_config = url_base_incoming else: url_config = url_base - if opts.ports: + if opts.security: + url = url_base_security + elif opts.ports: url = url_base_ports_incoming if opts.incoming else url_base_ports else: url = url_base_incoming if opts.incoming else url_base diff --git a/debian/changelog b/debian/changelog index d7448a4da..90fcdcc49 100644 --- a/debian/changelog +++ b/debian/changelog @@ -48,6 +48,9 @@ linux (4.14.13-1) UNRELEASED; urgency=medium [ Riku Voipio ] * [arm64] disable CONFIG_HW_RANDOM_OMAP until the IRQ storm bug is fixed + [ Ben Hutchings ] + * abiupdate.py: Add support for security mirrors + -- Salvatore Bonaccorso Wed, 10 Jan 2018 09:58:46 +0100 linux (4.14.12-2) unstable; urgency=medium