From 561f2901e4c547b0bd95e5eb08ea11bfc981f870 Mon Sep 17 00:00:00 2001 From: Robert Alessi Date: Mon, 21 Jun 2021 15:29:19 +0200 Subject: use macchanger for the wireless instead of wpa_supplicant --- debian/changelog | 5 +++-- my-x200.confd | 28 +++++++++++++++++++++++----- my-x200.initd | 6 +++++- my-x200_0.7-4.debian.tar.xz | Bin 1572 -> 0 bytes my-x200_0.7-4.dsc | 41 ----------------------------------------- my-x200_0.7-4_amd64.deb | Bin 5184 -> 0 bytes my-x200_0.7-5.debian.tar.xz | Bin 0 -> 1604 bytes my-x200_0.7-5.dsc | 41 +++++++++++++++++++++++++++++++++++++++++ my-x200_0.7-5_amd64.deb | Bin 0 -> 5416 bytes my-x200_0.7.orig.tar.gz | Bin 8818 -> 17338 bytes 10 files changed, 72 insertions(+), 49 deletions(-) delete mode 100644 my-x200_0.7-4.debian.tar.xz delete mode 100644 my-x200_0.7-4.dsc delete mode 100644 my-x200_0.7-4_amd64.deb create mode 100644 my-x200_0.7-5.debian.tar.xz create mode 100644 my-x200_0.7-5.dsc create mode 100644 my-x200_0.7-5_amd64.deb diff --git a/debian/changelog b/debian/changelog index b162f0e..8f5dae1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -my-x200 (0.7-4) UNRELEASED; urgency=medium +my-x200 (0.7-5) UNRELEASED; urgency=medium * Initial release. * Removed remnant lines left of openrc-run in initd file @@ -7,5 +7,6 @@ my-x200 (0.7-4) UNRELEASED; urgency=medium * Added conflict with acpi-support * Map ThinkVantage to /etc/init.d/my-x200 refresh * Kill radio only if enable_privacy is set to true + * Added an option to use macchanger for the wireless interface - -- Robert Alessi Mon, 22 Feb 2021 17:59:57 +0100 + -- Robert Alessi Fri, 18 Jun 2021 16:37:01 +0200 diff --git a/my-x200.confd b/my-x200.confd index ae9606e..0080db2 100644 --- a/my-x200.confd +++ b/my-x200.confd @@ -30,21 +30,39 @@ PWMFREQ_RATE="0x8bb7b16dc5b6a" # IMPORTANT NOTICE: As dhcpcd uses ANY ONE network interface that is # connected to the DHCP device to generate the DIUD-LLT file, the -# wireless interface MUST have its MAC address spoofed as well. To -# make wpa_supplicant handle this, add the following lines in +# wireless interface MUST have its MAC address spoofed as well. + +# To have wpa_supplicant handle this, add the following lines in # /etc/wpa_supplicant/wpa_supplicant.conf: +# # ctrl_interface=DIR=/run/wpa_supplicant GROUP=netdev # update_config=1 # mac_addr=1 # preassoc_mac_addr=1 +# +# Alternatively, supply the actual wireless interface name as value of +# the variable 'wireless_interface' below. # Finally, it is advisable to set the hostname to "localhost" and have # "hostname_short" in /etc/dhcpcd.conf so that the actual hostname of # the machine should not be sent to the DHCP server. -enable_privacy="false" # either 'true' or 'false' -wired_interface="" # supply the actual interface name! In case of - # doubt, see the output of 'ls /sys/class/net/' +enable_privacy="false" # either 'true' or 'false' + +# If not set below, the MAC address of the wired interface will not be +# spoofed. +wired_interface="" # supply the actual interface name! In case of + # doubt, see the output of 'ls /sys/class/net/' + +# If not set below, the MAC address of the wireless interface will not +# be spoofed, unless the spoofing is handled by wpa_supplicant as +# described above. +wireless_interface="" # supply the actual interface name! In case of + # doubt, see the output of 'ls /sys/class/net/' + +# macchanger options: +macchanger_options="-r" # this sets a fully random MAC. Adapt. (Read + # `man macchanger` on how to do this.) ################## # Backup options # diff --git a/my-x200.initd b/my-x200.initd index bb05cf4..7212d52 100644 --- a/my-x200.initd +++ b/my-x200.initd @@ -82,7 +82,11 @@ do_privacy() { then printf '0004' > /var/lib/dhcpcd/duid cat /proc/sys/kernel/random/boot_id >> /var/lib/dhcpcd/duid - /usr/bin/macchanger -r $wired_interface + /usr/bin/macchanger "$macchanger_options" $wired_interface + fi + if [ -n "${wireless_interface}" ] + then + /usr/bin/macchanger "$macchanger_options" $wireless_interface fi fi } diff --git a/my-x200_0.7-4.debian.tar.xz b/my-x200_0.7-4.debian.tar.xz deleted file mode 100644 index 4d7873e..0000000 Binary files a/my-x200_0.7-4.debian.tar.xz and /dev/null differ diff --git a/my-x200_0.7-4.dsc b/my-x200_0.7-4.dsc deleted file mode 100644 index f9d34ba..0000000 --- a/my-x200_0.7-4.dsc +++ /dev/null @@ -1,41 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -Format: 3.0 (quilt) -Source: my-x200 -Binary: my-x200 -Architecture: any -Version: 0.7-4 -Maintainer: Robert Alessi -Homepage: http://git.robertalessi.net/my-x200 -Standards-Version: 4.3.0 -Build-Depends: debhelper (>= 10) -Package-List: - my-x200 deb misc optional arch=any -Checksums-Sha1: - 7a8ff3718b1fe417282b34f703a864a5d6e5f319 8818 my-x200_0.7.orig.tar.gz - 81e7c0229dba9a6434a6cc599534af911f62ef60 1572 my-x200_0.7-4.debian.tar.xz -Checksums-Sha256: - 46cb0eb50526a721742ca2edca7a030b023c5b6de61387837613fb9fce4590f7 8818 my-x200_0.7.orig.tar.gz - c3b0b8c5494538c719b46d195fd29745ee9f0ac6f055d687e234718042d4bde8 1572 my-x200_0.7-4.debian.tar.xz -Files: - c0eccaafaef86ee44961d88ec3b3b5e0 8818 my-x200_0.7.orig.tar.gz - 54503bb01e31c237289c4ada0dbc64ee 1572 my-x200_0.7-4.debian.tar.xz - ------BEGIN PGP SIGNATURE----- - -iQJMBAEBCAA2FiEERaXhpjEUeDwRCTLxF3PpJICFyMcFAmAz5rwYHGFsZXNzaUBy -b2JlcnRhbGVzc2kubmV0AAoJEBdz6SSAhcjHXgAP/iIDdjWkjBQC5fqstnebKAEP -VQMsFOtBeX9X5nsK4QSZoKZqpqxhhi068zE0oBVr/NLoyKO/sTncbiQfpL1XCz5e -itgnM67pwGH9lwemMr4sBKDtdyMtG+Abp8vQtfYNmBz43UYw0qNNhtep0NHTdkj5 -qq22qeBOSLfrBryYFjsAEPSBg+VIyTbWnGlk0K4H/Vfstsg/qKiOQz3cjQMEPtkw -xg7J86U6P9N7+chYeWFZuTxWmd7dD02s9D5RMSVo/sr9KBzl5t3mkJeZJdWHeR2n -8AfcnXRsjggGItRkRodD4nbUTVNspHL5+eW6TgegirMLqKoqIZvGg10Pocb7ZQOf -sku3uQNrOoRXgppDxN26TLBC3aLpN4/n3Nh7BNvJp5R8mdA72TSkwa14WpqNVSWJ -tc/5SMpZ0gCLESAR5dZlcHXG2sm2fvbeQmnxwZUWVSn0Fjh9GuugW9gfI85507Hx -TpasLKcfFJfQpqv9lU3b0Mi9mD1wYda/yhpKdDL0gdDjKuaXZOZtQQWZNeet1d1t -6NNc0gTVSHLv40aSZ3ftJu4SXkZJVCr8EHv2AOQHwnapsAKJa3Re1Z2wD9T3FVw+ -96lRZR/HGYs7ZnDrxkQVg7D6LPxhQixyA0SUreFPitrrVFVcMbgFN67trX2Mln4y -FPe3EYiNtTkRp2Wqcqkj -=qlI4 ------END PGP SIGNATURE----- diff --git a/my-x200_0.7-4_amd64.deb b/my-x200_0.7-4_amd64.deb deleted file mode 100644 index 1c1970e..0000000 Binary files a/my-x200_0.7-4_amd64.deb and /dev/null differ diff --git a/my-x200_0.7-5.debian.tar.xz b/my-x200_0.7-5.debian.tar.xz new file mode 100644 index 0000000..4dff02f Binary files /dev/null and b/my-x200_0.7-5.debian.tar.xz differ diff --git a/my-x200_0.7-5.dsc b/my-x200_0.7-5.dsc new file mode 100644 index 0000000..5825d48 --- /dev/null +++ b/my-x200_0.7-5.dsc @@ -0,0 +1,41 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +Format: 3.0 (quilt) +Source: my-x200 +Binary: my-x200 +Architecture: any +Version: 0.7-5 +Maintainer: Robert Alessi +Homepage: http://git.robertalessi.net/my-x200 +Standards-Version: 4.3.0 +Build-Depends: debhelper (>= 10) +Package-List: + my-x200 deb misc optional arch=any +Checksums-Sha1: + 66069ebc2b2e796dd2334bb63d926d2eccd7a404 17338 my-x200_0.7.orig.tar.gz + 223b83ba3200c97c4e8113cc1b8b5f118614b59f 1604 my-x200_0.7-5.debian.tar.xz +Checksums-Sha256: + 4c1c07ea13e132abf139041d2725858b136fce58e5f25d6ec56833f73da8e401 17338 my-x200_0.7.orig.tar.gz + fd545db5384b077baeb22c3da2cfd959c53ec40a2c2b552021d12c873d167b34 1604 my-x200_0.7-5.debian.tar.xz +Files: + 032368f2035f07d58e9b13cb17995fbb 17338 my-x200_0.7.orig.tar.gz + 433b243972ffb3c12c556b045b545ba2 1604 my-x200_0.7-5.debian.tar.xz + +-----BEGIN PGP SIGNATURE----- + +iQJMBAEBCAA2FiEERaXhpjEUeDwRCTLxF3PpJICFyMcFAmDQk5wYHGFsZXNzaUBy +b2JlcnRhbGVzc2kubmV0AAoJEBdz6SSAhcjHTFcP/2sY2EaaYh1Z/9A899mVbH/T +Zj8AoBbnsRfztgqbz53ayA66455ZYzXKeY6xIpByBLFIvFKaGsHbQZR/RHiT+aos +KyS+apnjd+xBj1aOYCFf3wskkywTwawY0jUoI5UbPuBMD1m6axtnRelfuMdNx/FA +HUkc5EdUvw62ET/Me4Eae3fuoTWEodMfQl1yeb5iWE/qKZ4a0GeYVF2+uocLKxOE +eT2UZFmbu45vrAu+Ok86BGGSCHpZUqnvYPwx58rV8p/x/urTnNmNjBBopvkH8ng2 +qMtXdFaS1qrxe+gz9Zfjd7gAQjpsOrMYnBtYG6mxkiZ1c5sHsV9JQjHadB/QMDul +LkymQ8dJB652Cy8oV6oaWRRCwmJOMNwuyYX7L9KpkJJLHNHmdq1oR5zjuX9TaDvo +Gk1R6ZVjxWJernt6L5bdD/ktxE8EmOf8Sb5YEwr2YVHyEp9GHIe9G6dV+cNQ0TXh +O85bRSvuN6PK1T1cx+sLnvlVhwg7xHbHHe6uhVrwfvjo6pL2JDEsZOXSI5GBnF5c +Zxpu7nLJA5IWq3A789Qnz4TgI+3+CJsSldVkBJGcncdqUmBJEoqluUeJRG5OA0Td +oqnwfl9hfi4qz20qCryEpauaJrdRe/yjcpxC/7CWhhY6QbZSYc5WGbwvndoZmM5p +LHJkwuuLBbLpdQTBtX8X +=Si3X +-----END PGP SIGNATURE----- diff --git a/my-x200_0.7-5_amd64.deb b/my-x200_0.7-5_amd64.deb new file mode 100644 index 0000000..5433a00 Binary files /dev/null and b/my-x200_0.7-5_amd64.deb differ diff --git a/my-x200_0.7.orig.tar.gz b/my-x200_0.7.orig.tar.gz index dacfa54..1b44f13 100644 Binary files a/my-x200_0.7.orig.tar.gz and b/my-x200_0.7.orig.tar.gz differ -- cgit v1.2.3