website: apt-key is deprecated

[Floris Renaud]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52439

On April 21, 2022, Ubuntu Jammy Jellyfish will be released. On this version 
of Ubuntu, it is no longer possible to add the Winehq key through apt-key. 
This is also no longer possible on Debian Bookworm.
To make the installation of Wine on the different Ubuntu and Debian 
distributions the same, the idea is to switch to .sources files. This will 
allow the WineHQ repository to be added with:

Download and install the key:
   wget -nc https://dl.winehq.org/wine-builds/winehq.key
   sudo mv winehq.key /usr/share/keyrings/winehq-archive.key

Download and install the sources file for your distro, for example bookworm
   wget -nc https://dl.winehq.org/wine-builds/winehq-bookworm.sources
   sudo mv winehq-bookworm.sources /etc/apt/sources.list.d/

Where winehq-bookworm.sources contains the following:

Types: deb
URIs: https://dl.winehq.org/wine-builds/debian
Suites: bookworm
Components: main
Architectures: amd64 i386
Signed-By: /usr/share/keyrings/winehq-archive.key

In the future (starting with apt version 2.3.10), this approach also makes 
it possible to embed the winehq key in the .sources file.
Attached are the sources files for the supported Debian and Ubuntu versions 
and already for Ubuntu Jammy.

Can these files be uploaded to dl.winehq.org?

Floris

[Alexandre Julliard]

Floris Renaud  writes:
> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52439
>
> On April 21, 2022, Ubuntu Jammy Jellyfish will be released. On this
> version of Ubuntu, it is no longer possible to add the Winehq key
> through apt-key. This is also no longer possible on Debian Bookworm.
> To make the installation of Wine on the different Ubuntu and Debian
> distributions the same, the idea is to switch to .sources files. This
> will allow the WineHQ repository to be added with:
>
> Download and install the key:
>   wget -nc https://dl.winehq.org/wine-builds/winehq.key
>   sudo mv winehq.key /usr/share/keyrings/winehq-archive.key
>
> Download and install the sources file for your distro, for example bookworm
>   wget -nc https://dl.winehq.org/wine-builds/winehq-bookworm.sources
>   sudo mv winehq-bookworm.sources /etc/apt/sources.list.d/
>
> Where winehq-bookworm.sources contains the following:
>
> Types: deb
> URIs: https://dl.winehq.org/wine-builds/debian
> Suites: bookworm
> Components: main
> Architectures: amd64 i386
> Signed-By: /usr/share/keyrings/winehq-archive.key
>
> In the future (starting with apt version 2.3.10), this approach also
> makes it possible to embed the winehq key in the .sources file.
> Attached are the sources files for the supported Debian and Ubuntu
> versions and already for Ubuntu Jammy.
>
> Can these files be uploaded to dl.winehq.org?

If we want to do this, the files should be generated from the obs-sync
script [1], like other similar files.

[1] https://source.winehq.org/git/tools.git/blob/HEAD:/packaging/obs/obs-sync

[Sveinar Søpler]

On 05.04.2022 18:04, Alexandre Julliard wrote:
> If we want to do this, the files should be generated from the obs-sync
> script [1], like other similar files.
>
> [1] https://source.winehq.org/git/tools.git/blob/HEAD:/packaging/obs/obs-sync

Something like this? Can't really test it.. but should hopefully put 
winehq-focal.sources (if $1 is ubuntu, and $2 is focal) in 
https://dl.winehq.org/wine-builds/ubuntu/dists/focal/ and so on

--- a/obs-sync
+++ b/obs-sync
@@ -135,11 +135,24 @@ Architecture: $2
  EOF
  }

+make_apt_sources ()
+{
+    cat <<EOF
+Types: deb
+URIs: https://dl.winehq.org/wine-builds/$1
+Suites: $2
+Components: main
+Architectures: amd64 i386
+Signed-By: /usr/share/keyrings/winehq-archive.key
+EOF
+}
+
  # index debian packages for a single suite
  # usage: index_deb <platform> <codename> [<suite>]
  index_deb ()
  {
      dest=dest/$1/dists/$2
+    make_apt_sources $1 $2 >$dest/winehq-$2.sources
      apt_ftparchive="apt-ftparchive -c $basedir/apt.cfg -d 
$basedir/.cache/apt-cache-$2.db -s $basedir/apt-override"

for arch in $deb_archs

[PATCH] packaging: Create apt sources files

[Floris Renaud]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52439
Patch by Sveinar Søpler

Signed-off-by: Floris Renaud

To keep the same style as the rest of the file, I also included a description of the function.
---
 packaging/obs/obs-sync | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync
index b0ec672..a6ff59d 100755
--- a/packaging/obs/obs-sync
+++ b/packaging/obs/obs-sync
@@ -135,11 +135,25 @@ Architecture: $2
 EOF
 }

+# create an apt .sources file
+# usage: make_apt_sources <platform> <codename>
+make_apt_sources ()
+{
+    cat <<EOF
+Types: deb
+URIs: https://dl.winehq.org/wine-builds/$1
+Suites: $2
+Components: main
+Signed-By: /usr/share/keyrings/winehq-archive.key
+EOF
+}
+
 # index debian packages for a single suite
 # usage: index_deb <platform> <codename> [<suite>]
 index_deb ()
 {
     dest=dest/$1/dists/$2
+    make_apt_sources $1 $2 >dest/winehq-$2.sources
     apt_ftparchive="apt-ftparchive -c $basedir/apt.cfg -d $basedir/.cache/apt-cache-$2.db -s $basedir/apt-override"

for arch in $deb_archs

[PATCH v2] packaging: Create apt sources files

[Floris Renaud]

Signed-off-by: Floris Renaud 
---
 packaging/obs/obs-sync | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync
index b0ec672..3b2385b 100755
--- a/packaging/obs/obs-sync
+++ b/packaging/obs/obs-sync
@@ -135,11 +135,26 @@ Architecture: $2
 EOF
 }

+# create an apt .sources file
+# usage: make_apt_sources <platform> <codename>
+make_apt_sources ()
+{
+    cat <<EOF
+Types: deb
+URIs: https://dl.winehq.org/wine-builds/$1
+Suites: $2
+Components: main
+Architectures: amd64 i386
+Signed-By: /usr/share/keyrings/winehq-archive.key
+EOF
+}
+
 # index debian packages for a single suite
 # usage: index_deb <platform> <codename> [<suite>]
 index_deb ()
 {
     dest=dest/$1/dists/$2
+    make_apt_sources $1 $2 >$dest/winehq-$2.sources
     apt_ftparchive="apt-ftparchive -c $basedir/apt.cfg -d $basedir/.cache/apt-cache-$2.db -s $basedir/apt-override"

for arch in $deb_archs