From 851b6a097165af4d51c0db01b5e05256e5006896 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 11:00:48 +0200 Subject: Adding upstream version 2.6.1. Signed-off-by: Daniel Baumann --- vendor/CMakeLists.txt | 39 ++++++++++++++++ vendor/README | 72 ++++++++++++++++++++++++++++ vendor/blankon/apt-vendor.ent | 17 +++++++ vendor/blankon/sources.list.in | 10 ++++ vendor/debian/apt-vendor.ent | 20 ++++++++ vendor/debian/sources.list.in | 8 ++++ vendor/getinfo | 83 +++++++++++++++++++++++++++++++++ vendor/procursus/apt-vendor.ent | 15 ++++++ vendor/procursus/sources.list.in | 3 ++ vendor/raspbian/apt-vendor.ent | 13 ++++++ vendor/raspbian/sources.list.in | 6 +++ vendor/steamos/apt-vendor.ent | 15 ++++++ vendor/steamos/sources.list.in | 3 ++ vendor/ubuntu/apt-vendor.ent | 20 ++++++++ vendor/ubuntu/apt.conf-01-vendor-ubuntu | 2 + vendor/ubuntu/sources.list.in | 10 ++++ 16 files changed, 336 insertions(+) create mode 100644 vendor/CMakeLists.txt create mode 100644 vendor/README create mode 100644 vendor/blankon/apt-vendor.ent create mode 100644 vendor/blankon/sources.list.in create mode 100644 vendor/debian/apt-vendor.ent create mode 100644 vendor/debian/sources.list.in create mode 100755 vendor/getinfo create mode 100644 vendor/procursus/apt-vendor.ent create mode 100644 vendor/procursus/sources.list.in create mode 100644 vendor/raspbian/apt-vendor.ent create mode 100644 vendor/raspbian/sources.list.in create mode 100644 vendor/steamos/apt-vendor.ent create mode 100644 vendor/steamos/sources.list.in create mode 100644 vendor/ubuntu/apt-vendor.ent create mode 100644 vendor/ubuntu/apt.conf-01-vendor-ubuntu create mode 100644 vendor/ubuntu/sources.list.in (limited to 'vendor') diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt new file mode 100644 index 0000000..f6d8869 --- /dev/null +++ b/vendor/CMakeLists.txt @@ -0,0 +1,39 @@ +# Determine the current vendor, export to CURRENT_VENDOR +if (NOT DEFINED CURRENT_VENDOR) + execute_process(COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/getinfo current + OUTPUT_VARIABLE CURRENT_VENDOR_OUT OUTPUT_STRIP_TRAILING_WHITESPACE) + + set(CURRENT_VENDOR "${CURRENT_VENDOR_OUT}" CACHE STRING "Select the system vendor") + message(STATUS "Detected vendor: ${CURRENT_VENDOR_OUT}") +else() + message(STATUS "Detected vendor: ${CURRENT_VENDOR} (cached)") +endif() + +# Handle sources.list example +if (WITH_DOC OR WITH_DOC_EXAMPLES) +add_vendor_file(OUTPUT sources.list + INPUT "${CURRENT_VENDOR}/sources.list.in" + MODE 644 + VARIABLES sourceslist-list-format + debian-stable-codename + debian-oldstable-codename + debian-testing-codename + ubuntu-codename + current-codename) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sources.list + DESTINATION ${CMAKE_INSTALL_DOCDIR}/examples) +endif() + +# Handle apt.conf snippets +file(GLOB conffiles ${CURRENT_VENDOR}/apt.conf-*) +foreach(file ${conffiles}) + file(RELATIVE_PATH confname ${CMAKE_CURRENT_SOURCE_DIR}/${CURRENT_VENDOR}/ ${file}) + string(REPLACE "apt.conf-" "" confname "${confname}") + install(FILES "${file}" + DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/apt/apt.conf.d/" + RENAME "${confname}") +endforeach() + +if (EXISTS "${CURRENT_VENDOR}/CMakeLists.txt") + add_subdirectory(${CURRENT_VENDOR}) +endif() diff --git a/vendor/README b/vendor/README new file mode 100644 index 0000000..6846c84 --- /dev/null +++ b/vendor/README @@ -0,0 +1,72 @@ +The vendor system in APT is an experiment to help distributions ship a stock +apt release instead of applying documentation patches to it, increasing +maintenance burden for everyone and hiding 'interesting' patches in the mix. + +The provided information is used in the apt-key script and in documentation +like manpages and example configuration files. If you have patches modifying +additional bits and pieces currently not covered by this system please +contact us so we can change this! + + +== Adding a new vendor + +In the same directory you found this README in you should create a new +directory with the name of your distribution (as defined by dpkg-vendor, + e.g. via "dpkg-vendor --query Vendor"). The name is case-insensitive, +but ensure that the name is otherwise correct and the other fields in +your deb-origin(5) file are correct as well as our buildsystem relies on +this information. + +If no information is found for the current vendor at buildtime, the system +looks for a vendor the current vendor is a derivative of, falling back to +Debian if all else fails. + +The directory should include 2 files at the moment. It is best to look +at the files of other distributions to understand what values are to be +expected. Some additional notes about them can be found below. + +If we happen to include new fields/files in this system, we will opt for +using a sensible default rather than failing the build or similar, so +you are recommend to watch this space. +Ensure also that your information is up-to-date! + +Contributing a new vendor as well as updating a existing one is best done +by opening a bug in the Debian BTS against apt with a patch attached. + + +== apt-vendor.ent + +The format used is the one DocBook XML uses. The file is included as an +entity file in the manpages xml source, so the syntax has to be valid! + +The keyring-* settings are additionally used also in the creation of the +apt-key script and the keyring-package in particular as a dependency for apt. + +The field current-codename is optional and can be used in sources.list.in. + +The fields sourceslist-list-format and sourceslist-sources-format are used as +examples in the sources.list manpage and the first one is additionally +available in the sources.list.in template. +They should in general reflect the default sources of your distro. + +== sources.list.in + +An example for a sources.list which will be shipped in /usr/share/doc. +This file will NOT be installed in /etc or otherwise used by apt. + +You can use some placeholders in this file, namely: +* &debian-stable-codename; +* &debian-oldstable-codename; +* &debian-testing-codename; +* &ubuntu-codename; +* &sourceslist-list-format; +with the value you would expect based on the name. + +The placeholder ¤t-codename; is yours and can be set in apt-vendor.ent + + +== apt.conf-* + +Files in your vendor directory following this naming scheme will be picked up +by the debian/rules file and installed in /etc/apt/apt.conf.d/ directory, with +"apt.conf-" removed from the beginning of the filename. diff --git a/vendor/blankon/apt-vendor.ent b/vendor/blankon/apt-vendor.ent new file mode 100644 index 0000000..ea7625f --- /dev/null +++ b/vendor/blankon/apt-vendor.ent @@ -0,0 +1,17 @@ + + +blankon-keyring"> +/usr/share/keyrings/blankon-archive-keyring.gpg"> +/usr/share/keyrings/blankon-archive-removed-keys.gpg"> + + + + + + + diff --git a/vendor/blankon/sources.list.in b/vendor/blankon/sources.list.in new file mode 100644 index 0000000..2322e97 --- /dev/null +++ b/vendor/blankon/sources.list.in @@ -0,0 +1,10 @@ +# See sources.list(5) manpage for more information +# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. +deb http://arsip.blankonlinux.or.id/blankon ¤t-codename; main restricted +deb-src http://arsip.blankonlinux.or.id/blankon ¤t-codename; main restricted + +deb http://arsip.blankonlinux.or.id/blankon ¤t-codename;-security main restricted +deb-src http://arsip.blankonlinux.or.id/blankon ¤t-codename;-security main restricted + +deb http://arsip.blankonlinux.or.id/blankon ¤t-codename;-updates main restricted +deb-src http://arsip.blankonlinux.or.id/blankon ¤t-codename;-updates main restricted diff --git a/vendor/debian/apt-vendor.ent b/vendor/debian/apt-vendor.ent new file mode 100644 index 0000000..4d02343 --- /dev/null +++ b/vendor/debian/apt-vendor.ent @@ -0,0 +1,20 @@ + + +debian-archive-keyring"> + + + + + + + diff --git a/vendor/debian/sources.list.in b/vendor/debian/sources.list.in new file mode 100644 index 0000000..8f83dfd --- /dev/null +++ b/vendor/debian/sources.list.in @@ -0,0 +1,8 @@ +# See sources.list(5) manpage for more information +# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. +&sourceslist-list-format; + +# Uncomment if you want the apt-get source function to work +#deb-src http://deb.debian.org/debian &debian-stable-codename; main contrib non-free +#deb-src http://deb.debian.org/debian &debian-stable-codename;-updates main contrib non-free +#deb-src http://deb.debian.org/debian-security &debian-stable-codename;-security main contrib non-free diff --git a/vendor/getinfo b/vendor/getinfo new file mode 100755 index 0000000..2ef257c --- /dev/null +++ b/vendor/getinfo @@ -0,0 +1,83 @@ +#!/bin/sh +# small helper to extract information form *.ent files + +BASEDIR="$(readlink -f "$(dirname $0)")" + +getcurrent() { + # search for an exact match to use the correct sources.list example + cd $BASEDIR + DISTROS="$(find . -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 2 | LC_ALL=C sort)" + for DISTRO in $DISTROS; do + if dpkg-vendor --is $DISTRO; then + echo $DISTRO + return 0 + fi + done + + # if we haven't found a specific, look for a deriving + # we do ubuntu and debian last as those are the biggest families + # and would therefore potentially 'shadow' smaller families + # (especially debian as it sorts quiet early) + for DISTRO in $DISTROS; do + if [ "$DISTRO" = 'debian' -o "$DISTRO" = 'ubuntu' ]; then continue; fi + if dpkg-vendor --derives-from $DISTRO; then + echo $DISTRO + return 0 + fi + done + + # Do the ubuntu/debian dance we talked about + if dpkg-vendor --derives-from ubuntu; then + echo ubuntu + return 0 + fi + + echo debian + return 0 +} + +if [ "$1" = "--vendor" ]; then + CURRENT_VENDOR="$2" + shift 2 +else + CURRENT_VENDOR=$(getcurrent) +fi +INFO="$(readlink -f "${BASEDIR}/$CURRENT_VENDOR/apt-vendor.ent")" +VERBATIM="${BASEDIR}/../doc/apt-verbatim.ent" + +if [ -z "$INFO" ] || [ ! -e "$INFO" ]; then + echo >&2 'The current vendor is not valid or not chosen by the buildsystem yet.' + exit 1 +fi + +getrawfield() { + awk "/}" + echo "${FIELD%<*}" +} + +case "$1" in +debian-stable-codename|debian-oldstable-codename|debian-testing-codename|ubuntu-codename) + getrawfield "$1" "$VERBATIM" + ;; +sourceslist-list-format|keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri|current-codename) + exec $0 --vendor $CURRENT_VENDOR 'vendor' "$@" + ;; +vendor) + getfield "$2" + ;; +verbatim) + getfield "$2" "$VERBATIM" + ;; +current) + echo $CURRENT_VENDOR + ;; +*) + echo >&2 "Unknown data field $1 requested" + exit 2 + ;; +esac diff --git a/vendor/procursus/apt-vendor.ent b/vendor/procursus/apt-vendor.ent new file mode 100644 index 0000000..0dd1d7a --- /dev/null +++ b/vendor/procursus/apt-vendor.ent @@ -0,0 +1,15 @@ + + +procursus-keyring"> + + + + + + + + + diff --git a/vendor/procursus/sources.list.in b/vendor/procursus/sources.list.in new file mode 100644 index 0000000..246d2e3 --- /dev/null +++ b/vendor/procursus/sources.list.in @@ -0,0 +1,3 @@ +# See sources.list(5) manpage for more information +# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. +&sourceslist-list-format; diff --git a/vendor/raspbian/apt-vendor.ent b/vendor/raspbian/apt-vendor.ent new file mode 100644 index 0000000..96d9fb7 --- /dev/null +++ b/vendor/raspbian/apt-vendor.ent @@ -0,0 +1,13 @@ + + +raspbian-archive-keyring"> +/usr/share/keyrings/raspbian-archive-keyring.gpg"> +/usr/share/keyrings/raspbian-archive-removed-keys.gpg"> + + + + + diff --git a/vendor/raspbian/sources.list.in b/vendor/raspbian/sources.list.in new file mode 100644 index 0000000..ea4ee60 --- /dev/null +++ b/vendor/raspbian/sources.list.in @@ -0,0 +1,6 @@ +# See sources.list(5) manpage for more information +# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. +&sourceslist-list-format; + +# Uncomment if you want the apt-get source function to work +#deb-src http://mirrordirector.raspbian.org/raspbian &debian-stable-codename; main contrib non-free diff --git a/vendor/steamos/apt-vendor.ent b/vendor/steamos/apt-vendor.ent new file mode 100644 index 0000000..7cf100f --- /dev/null +++ b/vendor/steamos/apt-vendor.ent @@ -0,0 +1,15 @@ + + +valve-archive-keyring"> +/usr/share/keyrings/valve-archive-keyring.gpg"> +/usr/share/keyrings/valve-archive-removed-keys.gpg"> + + + + + + diff --git a/vendor/steamos/sources.list.in b/vendor/steamos/sources.list.in new file mode 100644 index 0000000..246d2e3 --- /dev/null +++ b/vendor/steamos/sources.list.in @@ -0,0 +1,3 @@ +# See sources.list(5) manpage for more information +# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. +&sourceslist-list-format; diff --git a/vendor/ubuntu/apt-vendor.ent b/vendor/ubuntu/apt-vendor.ent new file mode 100644 index 0000000..dcebc92 --- /dev/null +++ b/vendor/ubuntu/apt-vendor.ent @@ -0,0 +1,20 @@ + + +ubuntu-keyring"> +/usr/share/keyrings/ubuntu-archive-keyring.gpg"> +/usr/share/keyrings/ubuntu-archive-removed-keys.gpg"> + + + + + diff --git a/vendor/ubuntu/apt.conf-01-vendor-ubuntu b/vendor/ubuntu/apt.conf-01-vendor-ubuntu new file mode 100644 index 0000000..30d25a7 --- /dev/null +++ b/vendor/ubuntu/apt.conf-01-vendor-ubuntu @@ -0,0 +1,2 @@ +Acquire::Changelogs::AlwaysOnline "true"; +Acquire::http::User-Agent-Non-Interactive "true"; diff --git a/vendor/ubuntu/sources.list.in b/vendor/ubuntu/sources.list.in new file mode 100644 index 0000000..00db2f8 --- /dev/null +++ b/vendor/ubuntu/sources.list.in @@ -0,0 +1,10 @@ +# See sources.list(5) manpage for more information +# Remember that CD-ROMs, DVDs and such are managed through the apt-cdrom tool. +deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted +deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted + +deb http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted +deb-src http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted + +deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted +deb-src http://us.archive.ubuntu.com/ubuntu &ubuntu-codename;-updates main restricted -- cgit v1.2.3