Bug#906019: wireguard-dkms: DKMS module version string not correct

2018-09-06 Thread Daniel Kahn Gillmor
On Thu 2018-09-06 09:15:32 +0200, Sedat Dilek wrote:
> let's look at my current installed dkms kernel-modules and especially
> virtualbox-dkms and compare with wireguard-dkms.
 […]
> In my POV 'dkms status' should only show the upstream version.
> Special patched versions of *-dkms packages from Debian can be shown
> when loading the module like virtualbox-dkms does.
>
> Not sure what dkms package offers for mechanisms to automatically
> modify the version string.
>
> Honestly, it's just cosmetics.

hm, i am a bit unsure that "cosmetics" is a good justification, but the
truth is that we haven't modified the sources for the wireguard kernel
module for ages -- so the version that we're running really is identical
to the upstream version, and probably should be reported as such.

I'm uploading 0.0.20180904-2 with this change -- but i've implemented it
slightly differently than you proposed:


https://salsa.debian.org/debian/wireguard/commit/c02ff8cd1cfa4c08ca593fbc06ecca8074a2c472

Let me know if there are any other problems!  I appreciate your bringing
this up.

  --dkg

PS in the future, when supplying diffs, i recommend using the "unified"
   diff format (diff -u) instead of "normal" -- unified is a lot easier
   to read, and is really the most widely-used standard in the F/LOSS
   community.


signature.asc
Description: PGP signature


Bug#906019: wireguard-dkms: DKMS module version string not correct

2018-09-06 Thread Sedat Dilek
On Wed, Sep 5, 2018 at 10:45 PM, Daniel Kahn Gillmor
 wrote:
> Control: tags 906019 + moreinfo
>
> On Mon 2018-08-13 12:04:42 +0200, Sedat Dilek wrote:
>> the version string for installed wireguard-dkms does not look correct to me.
>> This should be "0.0.20180802" not "0.0.20180802-1".
>
> I'm not convinced that this is correct.  In the event that a
> debian-specific revision of the package modifies the source, we'd want
> that reflected in the kernel module identification.  so including the -1
> in the kernel module version number indicates this.
>
> It also allows the local user to identify that the module used is from
> the debian packaging, as opposed to some other installation method.
>
> can you explain in more detail *why* you think the value should not
> contain the debian packaging revision number?  otherwise, i'm inclined
> to leave it as it is.
>

Hi,

thanks for the answer.

let's look at my current installed dkms kernel-modules and especially
virtualbox-dkms and compare with wireguard-dkms.

I have upgraded to latest WireGuard from Git (provided tarballs) and
generated my own Debian packages.

root@iniza:~# dkms status
acpi-call, 1.1.0, 4.17.0-3-amd64, x86_64: installed
acpi-call, 1.1.0, 4.19.0-rc2-4-iniza-llvmlinux, x86_64: installed
virtualbox, 5.2.18, 4.17.0-3-amd64, x86_64: installed
virtualbox, 5.2.18, 4.19.0-rc2-4-iniza-llvmlinux, x86_64: installed
wireguard, 0.0.20180904-1, 4.17.0-3-amd64, x86_64: installed
wireguard, 0.0.20180904-1, 4.19.0-rc2-4-iniza-llvmlinux, x86_64: installed

root@iniza:~# dpkg -l | grep virtualbox
ii  virtualbox5.2.18-dfsg-2
amd64x86 virtualization solution - base
binaries
ii  virtualbox-dkms   5.2.18-dfsg-2
all  x86 virtualization solution - kernel
module sources for dkms
ii  virtualbox-qt 5.2.18-dfsg-2
amd64x86 virtualization solution - Qt
based user interface

root@iniza:~# dmesg | grep -i vbox
[   53.689798] vboxdrv: loading out-of-tree module taints kernel.
[   53.720428] vboxdrv: Found 4 processor cores
[   53.747521] vboxdrv: TSC mode is Invariant, tentative frequency 2903993787 Hz
[   53.747540] vboxdrv: Successfully loaded version 5.2.18_Debian
(interface 0x00290001)
[   53.757945] VBoxNetFlt: Successfully started.
[   53.774307] VBoxNetAdp: Successfully started.
[   53.785961] VBoxPciLinuxInit
[   53.788605] vboxpci: IOMMU not found (not registered)

root@iniza:~# modinfo vboxdrv
filename:
/lib/modules/4.19.0-rc2-4-iniza-llvmlinux/updates/dkms/vboxdrv.ko
author: Oracle Corporation
description:Oracle VM VirtualBox Support Driver
license:GPL
version:5.2.18_Debian r123745 (0x00290001)
vermagic:   4.19.0-rc2-4-iniza-llvmlinux SMP mod_unload modversions
name:   vboxdrv
retpoline:  Y
depends:
srcversion: 7BBCF4E0A9630E429AFCF61
parm:   force_async_tsc:force the asynchronous TSC mode (int)

root@iniza:~# dpkg -l | grep wireguard
ii  wireguard 0.0.20180904-1
all  fast, modern, secure kernel VPN
tunnel (metapackage)
ii  wireguard-dkms0.0.20180904-1
all  fast, modern, secure kernel VPN
tunnel (DKMS version)
ii  wireguard-tools   0.0.20180904-1
amd64fast, modern, secure kernel VPN
tunnel (userland utilities)

root@iniza:~# modprobe -v wireguard
insmod /lib/modules/4.19.0-rc2-4-iniza-llvmlinux/kernel/net/ipv4/udp_tunnel.ko
insmod 
/lib/modules/4.19.0-rc2-4-iniza-llvmlinux/kernel/net/ipv6/ip6_udp_tunnel.ko
insmod /lib/modules/4.19.0-rc2-4-iniza-llvmlinux/updates/dkms/wireguard.ko

root@iniza:~# modinfo wireguard
filename:
/lib/modules/4.19.0-rc2-4-iniza-llvmlinux/updates/dkms/wireguard.ko
license:GPL v2
description:Fast, modern, and secure VPN tunnel
author: Jason A. Donenfeld 
version:0.0.20180904-1
alias:  rtnl-link-wireguard
alias:  net-pf-16-proto-16-family-wireguard
vermagic:   4.19.0-rc2-4-iniza-llvmlinux SMP mod_unload modversions
name:   wireguard
retpoline:  Y
depends:udp_tunnel,ip6_udp_tunnel
srcversion: CBED02F5CE3F691380640F6

root@iniza:~# dmesg | tail -2
[  443.032699] wireguard: WireGuard 0.0.20180904-1 loaded. See
www.wireguard.com for information.
[  443.032703] wireguard: Copyright (C) 2015-2018 Jason A. Donenfeld
. All Rights Reserved.

In my POV 'dkms status' should only show the upstream version.
Special patched versions of *-dkms packages from Debian can be shown
when loading the module like virtualbox-dkms does.

Not sure what dkms package offers for mechanisms to automatically
modify the version string.

Honestly, it's just cosmetics.

Regards,
- Sedat -

P.S.: When modprobing acpi-call it shows no status in the logs (e.g. dmesg).



Bug#906019: wireguard-dkms: DKMS module version string not correct

2018-09-05 Thread Daniel Kahn Gillmor
Control: tags 906019 + moreinfo

On Mon 2018-08-13 12:04:42 +0200, Sedat Dilek wrote:
> the version string for installed wireguard-dkms does not look correct to me.
> This should be "0.0.20180802" not "0.0.20180802-1".

I'm not convinced that this is correct.  In the event that a
debian-specific revision of the package modifies the source, we'd want
that reflected in the kernel module identification.  so including the -1
in the kernel module version number indicates this.

It also allows the local user to identify that the module used is from
the debian packaging, as opposed to some other installation method.

can you explain in more detail *why* you think the value should not
contain the debian packaging revision number?  otherwise, i'm inclined
to leave it as it is.

--dkg



Bug#906019: wireguard-dkms: DKMS module version string not correct

2018-08-13 Thread Sedat Dilek
Package: wireguard-dkms
Version: 0.0.20180802-1
Severity: normal

Dear Maintainer,

the version string for installed wireguard-dkms does not look correct to me.
This should be "0.0.20180802" not "0.0.20180802-1".

root@iniza# LANG=C dkms status -k 4.18.0-rc8-5-iniza-llvmlinux
acpi-call, 1.1.0, 4.18.0-rc8-5-iniza-llvmlinux, x86_64: installed
virtualbox, 5.2.16, 4.18.0-rc8-5-iniza-llvmlinux, x86_64: installed
wireguard, 0.0.20180802-1, 4.18.0-rc8-5-iniza-llvmlinux, x86_64: installed

I have tried to fix it like this...

sdi@iniza:~/src/wireguard$ diff --color
wireguard-0.0.20180802/debian/rules
wireguard-0.0.20180809/debian/rules
13c13
<   $(MAKE) -C src DESTDIR=../debian/wireguard-dkms
DKMSDIR=/usr/src/wireguard-$(DEB_VERSION)/ dkms-install
---
>   $(MAKE) -C src DESTDIR=../debian/wireguard-dkms 
> DKMSDIR=/usr/src/wireguard-$(DEB_VERSION_UPSTREAM)/ dkms-install
22c22
<   dh_dkms -p wireguard-dkms -- src/dkms.conf
---
>   dh_dkms -V $(DEB_VERSION_UPSTREAM) -p wireguard-dkms -- src/dkms.conf

...but wireless-tools package with debug-symbols is not built.

After installing my packages this looks correct to me:

root@iniza# LANG=C dkms status -m wireguard
wireguard, 0.0.20180809, 4.17.0-1-amd64, x86_64: installed
wireguard, 0.0.20180809, 4.18.0-1-iniza-llvmlinux, x86_64: installed

I have already informed the maintainer via PM.

Thanks.

Regards,
- Sedat -

-- System Information:
Debian Release: buster/sid
  APT prefers testing
  APT policy: (500, 'testing'), (500, 'stable'), (99,
'buildd-unstable'), (99, 'buildd-experimental'), (99, 'experimental'),
(99, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 4.18.0-1-iniza-llvmlinux (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8),
LANGUAGE= (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages wireguard-dkms depends on:
ii  dkms  2.6.1-1

Versions of packages wireguard-dkms recommends:
ii  wireguard-tools  0.0.20180809-1~buster+dileks1

wireguard-dkms suggests no packages.

-- no debconf information