From 0005fa07886135d6adfec59f2d722df229b7af12 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 30 Nov 2013 22:07:38 +0100
Subject: use a substvar to set the archive-keyring in debian/control

Adds a small helper to extract the small information bits we store in
apt-vendor.ent and uses it in debian/rules to set apt:keyring as a
substvar for debian/control populated with the &keyring-package; info
---
 vendor/getinfo | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100755 vendor/getinfo

(limited to 'vendor/getinfo')

diff --git a/vendor/getinfo b/vendor/getinfo
new file mode 100755
index 000000000..df5a44e5c
--- /dev/null
+++ b/vendor/getinfo
@@ -0,0 +1,36 @@
+#!/bin/sh
+# small helper to extract information form *.ent files
+
+BASEDIR="$(readlink -f "$(dirname $0)")"
+INFO="$(readlink -f "${BASEDIR}/current/apt-vendor.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() {
+	grep --max-count=1 "^<!ENTITY $1 \"" "${2:-$INFO}" | cut -d'"' -f 2
+}
+
+getfield() {
+	local FIELD="$(getrawfield "$@")"
+	FIELD="${FIELD#*>}"
+	echo "${FIELD%<*}"
+}
+
+case "$1" in
+debian-stable-codename)
+	getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
+	;;
+ubuntu-codename)
+	getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
+	;;
+keyring-package)
+	getfield "$1"
+	;;
+*)
+	echo >&2 "Unknown data field $1 requested"
+	exit 2
+	;;
+esac
-- 
cgit v1.2.3


From 5b2c6ddcc0e45c92c544032ad2bb91bdf7222d7c Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 30 Nov 2013 23:11:43 +0100
Subject: generate apt-key script with vendor info about keys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The apt-key script uses quiet a few keyring files for operation which
are specific to the distribution it is build on and is hence one of the
most patched parts – even if it is not that often used anymore now that
a fragment directory for trusted.gpg exists.
---
 vendor/getinfo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'vendor/getinfo')

diff --git a/vendor/getinfo b/vendor/getinfo
index df5a44e5c..ac816e10e 100755
--- a/vendor/getinfo
+++ b/vendor/getinfo
@@ -26,7 +26,7 @@ debian-stable-codename)
 ubuntu-codename)
 	getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
 	;;
-keyring-package)
+keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri)
 	getfield "$1"
 	;;
 *)
-- 
cgit v1.2.3


From 6de58cbf6b78506898ef23ca26b068eedf8ed97f Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Sat, 21 Dec 2013 17:56:32 +0100
Subject: vendor/getinfo:

* vendor/getinfo:
  - fix ubuntu-codename
---
 vendor/getinfo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'vendor/getinfo')

diff --git a/vendor/getinfo b/vendor/getinfo
index ac816e10e..992b30cf4 100755
--- a/vendor/getinfo
+++ b/vendor/getinfo
@@ -24,7 +24,7 @@ debian-stable-codename)
 	getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
 	;;
 ubuntu-codename)
-	getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
+	getrawfield 'ubuntu-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
 	;;
 keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri)
 	getfield "$1"
-- 
cgit v1.2.3


From 62f6ecbf2f204d95e98fc5480c5a0db43b52d2be Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Sat, 21 Dec 2013 18:18:51 +0100
Subject: vendor/steamos/*:

* vendor/steamos/*:
  - add steamos support
---
 vendor/getinfo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'vendor/getinfo')

diff --git a/vendor/getinfo b/vendor/getinfo
index 992b30cf4..861fd3d17 100755
--- a/vendor/getinfo
+++ b/vendor/getinfo
@@ -26,7 +26,7 @@ debian-stable-codename)
 ubuntu-codename)
 	getrawfield 'ubuntu-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
 	;;
-keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri)
+keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri|current-distro-codename)
 	getfield "$1"
 	;;
 *)
-- 
cgit v1.2.3