From 8d2f60aa1b83f52700c0f73bf65acce130428273 Mon Sep 17 00:00:00 2001 From: Ark74 Date: Mon, 29 Sep 2025 01:32:47 -0600 Subject: [PATCH] apt: backport apt 3 improving deb822 --- helpers/DATA/apt/trisquel/apt-vendor.ent | 14 +++---- helpers/DATA/apt/trisquel/sources.list.in | 10 ----- helpers/DATA/apt/trisquel/trisquel.sources.in | 40 +++++++++++++++++++ helpers/make-apt | 10 ++++- 4 files changed, 54 insertions(+), 20 deletions(-) delete mode 100644 helpers/DATA/apt/trisquel/sources.list.in create mode 100644 helpers/DATA/apt/trisquel/trisquel.sources.in diff --git a/helpers/DATA/apt/trisquel/apt-vendor.ent b/helpers/DATA/apt/trisquel/apt-vendor.ent index c443816..e61a665 100644 --- a/helpers/DATA/apt/trisquel/apt-vendor.ent +++ b/helpers/DATA/apt/trisquel/apt-vendor.ent @@ -6,15 +6,11 @@ - + +Signed-By: /usr/share/keyrings/trisquel-archive-keyring.gpg"> diff --git a/helpers/DATA/apt/trisquel/sources.list.in b/helpers/DATA/apt/trisquel/sources.list.in deleted file mode 100644 index 9c530ba..0000000 --- a/helpers/DATA/apt/trisquel/sources.list.in +++ /dev/null @@ -1,10 +0,0 @@ -# See sources.list(5) manpage for more information -# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. -deb http://archive.trisquel.org/trisquel &trisquel-codename; main -deb-src http://archive.trisquel.org/trisquel &trisquel-codename; main - -deb http://archive.trisquel.org/trisquel &trisquel-codename;-security main -deb-src http://archive.trisquel.org/trisquel &trisquel-codename;-security main - -deb http://archive.trisquel.org/trisquel &trisquel-codename;-updates main -deb-src http://archive.trisquel.org/trisquel &trisquel-codename;-updates main diff --git a/helpers/DATA/apt/trisquel/trisquel.sources.in b/helpers/DATA/apt/trisquel/trisquel.sources.in new file mode 100644 index 0000000..32f8209 --- /dev/null +++ b/helpers/DATA/apt/trisquel/trisquel.sources.in @@ -0,0 +1,40 @@ +## Trisquel distribution repository +## +## The following settings can be adjusted to configure which packages to use from Trisquel. +## Mirror your choices (except for URIs and Suites) in the security section below to +## ensure timely security updates. +## +## Types: Append deb-src to enable the fetching of source package. +## URIs: A URL to the repository (you may add multiple URLs) +## Suites: The following additional suites can be configured +## -updates - Major bug fix updates produced after the final release of the +## distribution. +## -backports - software from this repository may not have been tested as +## extensively as that contained in the main release, although it includes +## newer versions of some applications which may provide useful features. +## Also, please note that software in backports WILL NOT receive any review +## or updates from the Trisquel security team. +## +## See the sources.list(5) manual page for further settings. + +# Trisquel repositories for supported software and updates +Types: deb +URIs: http://archive.trisquel.org/trisquel/ +Suites: &trisquel-codename; &trisquel-codename;-updates &trisquel-codename;-security +Components: main +Signed-By: /usr/share/keyrings/trisquel-archive-keyring.gpg + +# Uncomment to enable source package repositories +Types: deb-src +URIs: http://archive.trisquel.org/trisquel/ +Suites: &trisquel-codename; &trisquel-codename;-updates &trisquel-codename;-security +Components: main +Signed-By: /usr/share/keyrings/trisquel-archive-keyring.gpg + +# Uncomment to enable optional backports repository +Enabled: no +Types: deb deb-src +URIs: http://archive.trisquel.org/trisquel/ +Suites: &trisquel-codename;-backports +Components: main +Signed-By: /usr/share/keyrings/trisquel-archive-keyring.gpg diff --git a/helpers/make-apt b/helpers/make-apt index 4442978..42a7f02 100644 --- a/helpers/make-apt +++ b/helpers/make-apt @@ -1,5 +1,6 @@ #!/bin/sh # +# Copyright (C) 2025 Luis Guzmán # Copyright (C) 2008-2018 Rubén Rodríguez # # This program is free software; you can redistribute it and/or modify @@ -20,7 +21,10 @@ #STAGE-1-DEBOOTSTRAP VERSION=4 +CMXSLVER=1 COMPONENT=main +EXTERNAL='deb-src http://ftp.debian.org/debian trixie main' +REPOKEY=6ED0E7B82643E131 . ./config @@ -31,8 +35,12 @@ replace Ubuntu Trisquel . sed -i "s|trisquel-codename \".*\"|trisquel-codename \"$CODENAME\"|" doc/apt-verbatim.ent replace "http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg" "http://archive.trisquel.org/trisquel/trisquel-archive-signkey.gpg" . +replace http://security.ubuntu.com/ubuntu http://archive.trisquel.org/trisquel . +replace http://archive.ubuntu.com/ubuntu/ http://archive.trisquel.org/trisquel . replace ubuntu-keyring trisquel-keyring . replace ubuntu-archive-keyring trisquel-archive-keyring . +sed -i 's|https://snapshot.ubuntu.com/ubuntu/|https://archive.trisquel.org/trisquel/|' abicheck/symbol-merge.py +sed -i 's|debian.sources|trisquel.sources|' abicheck/symbol-merge.py # hack, preserve this test untouched cp test/libapt/cdromfindpackages_test.cc /tmp @@ -105,7 +113,7 @@ EOF ## end non-free examples -/bin/sed -i 's_http://archive.ubuntu.com/ubuntu/project/_http://archive.trisquel.info/trisquel/_g; s/ubuntu-archive-keyring/trisquel-archive-keyring/g; s/ubuntu-keyring/trisquel-keyring/g; ' cmdline/apt-key.in debian/control* +/bin/sed -i 's_http://archive.ubuntu.com/ubuntu/project/_http://archive.trisquel.info/trisquel/_g; s/ubuntu-archive-keyring/trisquel-archive-keyring/g; s/ubuntu-keyring/trisquel-keyring/g; ' debian/control* replace Ubuntu Trisquel methods/http.cc replace ubuntu-archive.gpg trisquel-archive.gpg .