Prepare for Release

Update to upstream version '5.3.9~git20220319.0958f29'
with Debian dir c14f50d3d0

debian/README.Debian

@@ -0,0 +1,5 @@
+realtek-rtl8188eus-dkms for Debian
+---------------------------------
+
+This package was automatically generated by the DKMS system,
+for distribution on Debian based operating systems.

debian/changelog

@@ -0,0 +1,87 @@
+realtek-rtl8188eus-dkms (5.3.9~git20220319.0958f29-0kali2) kali-dev; urgency=medium
+
+  * Add a patch to fix build build with kernel 5.17
+
+ -- Sophie Brun <sophie@offensive-security.com>  Wed, 18 May 2022 17:50:10 +0200
+
+realtek-rtl8188eus-dkms (5.3.9~git20220319.0958f29-0kali1) kali-dev; urgency=medium
+
+  * New upstream version 5.3.9~git20220319.0958f29
+  * Refresh patches
+
+ -- Sophie Brun <sophie@offensive-security.com>  Thu, 12 May 2022 11:02:51 +0200
+
+realtek-rtl8188eus-dkms (5.3.9~git20210504.6146193-0kali2) kali-dev; urgency=medium
+
+  [ Ben Wilson ]
+  * Remove template comment and switch spaces to tabs
+
+  [ Sophie Brun ]
+  * Add a patch to fix the compilation with kernel 5.15
+
+ -- Sophie Brun <sophie@offensive-security.com>  Tue, 14 Dec 2021 17:56:08 +0100
+
+realtek-rtl8188eus-dkms (5.3.9~git20210504.6146193-0kali1) kali-dev; urgency=medium
+
+  * New upstream version 5.3.9~git20210504.6146193
+  * Refresh patches
+
+ -- Sophie Brun <sophie@offensive-security.com>  Tue, 28 Sep 2021 11:00:05 +0200
+
+realtek-rtl8188eus-dkms (5.3.9~git20210206.1e7145f-0kali2) kali-dev; urgency=medium
+
+  * Bump Standards-Version to 4.5.1
+  * Blacklist r8188eu
+
+ -- Sophie Brun <sophie@offensive-security.com>  Tue, 13 Jul 2021 10:50:42 +0200
+
+realtek-rtl8188eus-dkms (5.3.9~git20210206.1e7145f-0kali1) kali-dev; urgency=medium
+
+  * Update debian/watch
+  * New upstream version 5.3.9~git20210206.1e7145f
+  * Refresh patches
+
+ -- Sophie Brun <sophie@offensive-security.com>  Wed, 14 Apr 2021 17:25:11 +0200
+
+realtek-rtl8188eus-dkms (5.3.9~git20201227-0kali1) kali-dev; urgency=medium
+
+  * New upstream version 5.3.9~git20201227
+  * Refresh patches
+
+ -- Sophie Brun <sophie@offensive-security.com>  Tue, 26 Jan 2021 17:04:18 +0100
+
+realtek-rtl8188eus-dkms (5.3.9~git20200829-0kali2) kali-dev; urgency=medium
+
+  * Fix errors introduced in 5a7f22 (lintian-overrides)
+
+ -- Sophie Brun <sophie@offensive-security.com>  Wed, 16 Sep 2020 15:54:13 +0200
+
+realtek-rtl8188eus-dkms (5.3.9~git20200829-0kali1) kali-dev; urgency=medium
+
+  * New upstream version 5.3.9~git20200829
+  * Refresh patches
+  * Add comment in debian/copyright
+  * Bump Standards-Version to 4.5.0
+  * Add lintian-overrides for dh-exec-subst-unknown-variable
+
+ -- Sophie Brun <sophie@offensive-security.com>  Wed, 16 Sep 2020 15:07:29 +0200
+
+realtek-rtl8188eus-dkms (5.3.9~git20200710-0kali1) kali-dev; urgency=medium
+
+  * New upstream version 5.3.9~20200710
+
+ -- Sophie Brun <sophie@offensive-security.com>  Fri, 10 Jul 2020 08:49:51 +0200
+
+realtek-rtl8188eus-dkms (5.3.9~git20200316-0kali1) kali-dev; urgency=medium
+
+  * Configure git-buildpackage for Kali
+  * Add GitLab's CI configuration file
+  * New upstream version 5.3.9~git20200316
+
+ -- Sophie Brun <sophie@offensive-security.com>  Thu, 14 May 2020 11:45:14 +0200
+
+realtek-rtl8188eus-dkms (5.3.9~20191129-0kali1) kali-dev; urgency=medium
+
+  * Initial release (see 5842)
+
+ -- Sophie Brun <sophie@offensive-security.com>  Tue, 17 Dec 2019 17:14:38 +0100

debian/control

@@ -0,0 +1,19 @@
+Source: realtek-rtl8188eus-dkms
+Section: contrib/kernel
+Priority: optional
+Maintainer: Kali Developers <devel@kali.org>
+Uploaders: Sophie Brun <sophie@offensive-security.com>
+Build-Depends: debhelper-compat (= 12), dkms, dh-exec
+Standards-Version: 4.5.1
+Homepage: https://github.com/aircrack-ng/rtl8188eus
+Vcs-Browser: https://gitlab.com/kalilinux/packages/realtek-rtl8188eus-dkms
+Vcs-Git: https://gitlab.com/kalilinux/packages/realtek-rtl8188eus-dkms.git
+
+Package: realtek-rtl8188eus-dkms
+Architecture: all
+Depends: dkms (>= 1.95), ${misc:Depends}
+Description: Realtek RTL8188EUS driver in DKMS format
+ This package provides the source code for RTL8188EUS Linux driver (with
+ monitor mode and frame injection) to be build with dkms. Kernel sources or
+ headers are required to compile this module.
+

debian/copyright

@@ -0,0 +1,34 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: realtek-rtl8188eus-dkms
+Source: https://github.com/aircrack-ng/rtl8188eus
+Comment: dkms package built during installation
+
+Files: *
+Copyright: 2007 - 2017 Realtek Corporation.
+License: GPL-2
+
+Files: os_dep/linux/rhashtable.*
+Copyright: 2015 Herbert Xu <herbert@gondor.apana.org.au>
+           2014-2015 Thomas Graf <tgraf@suug.ch>
+	   2008-2014 Patrick McHardy <kaber@trash.net>
+License: GPL-2
+
+Files: debian/*
+Copyright: 2019 Sophie Brun <sophie@offensive-security.com>
+License: GPL-2
+
+License: GPL-2
+ This package is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 as published
+ by the Free Software Foundation.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

debian/gbp.conf

@@ -0,0 +1,10 @@
+[DEFAULT]
+debian-branch = kali/master
+debian-tag = kali/%(version)s
+pristine-tar = True
+
+[pq]
+patch-numbers = False
+
+[dch]
+multimaint-merge = True

debian/kali-ci.yml

@@ -0,0 +1,2 @@
+include:
+  - https://gitlab.com/kalilinux/tools/kali-ci-pipeline/raw/master/recipes/kali.yml

debian/patches/Change-dkms-version.patch

@@ -0,0 +1,20 @@
+From: Sophie Brun <sophie@offensive-security.com>
+Date: Fri, 10 Jul 2020 08:49:31 +0200
+Subject: Change dkms version
+
+Forwarded: not-needed
+---
+ dkms.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dkms.conf b/dkms.conf
+index 1c14127..1708d4c 100644
+--- a/dkms.conf
++++ b/dkms.conf
+@@ -1,5 +1,5 @@
+ PACKAGE_NAME="realtek-rtl8188eus"
+-PACKAGE_VERSION="5.3.9~20200316"
++PACKAGE_VERSION="5.3.9~git20220319.0958f29"
+ CLEAN="'make' clean"
+ BUILT_MODULE_NAME[0]=8188eu
+ PROCS_NUM=`nproc`

debian/patches/add-support-kernel-5.17.patch

@@ -0,0 +1,72 @@
+From: Sophie Brun <sophie@offensive-security.com>
+Date: Wed, 18 May 2022 17:47:55 +0200
+Subject: Build support with kernel v5.17
+
+
+Origin: https://github.com/aircrack-ng/rtl8188eus/commit/13cc38399eb44f234a52dde5f94509e54a09c71f
+---
+ os_dep/linux/os_intfs.c | 8 ++++++++
+ os_dep/linux/rtw_proc.c | 4 ++++
+ os_dep/osdep_service.c  | 4 ++++
+ 3 files changed, 16 insertions(+)
+
+diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c
+index bd7da8b..f006fc8 100644
+--- a/os_dep/linux/os_intfs.c
++++ b/os_dep/linux/os_intfs.c
+@@ -1199,7 +1199,11 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *addr)
+ 	}
+ 
+ 	_rtw_memcpy(adapter_mac_addr(padapter), sa->sa_data, ETH_ALEN); /* set mac addr to adapter */
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
++	eth_hw_addr_set(pnetdev, sa->sa_data);
++#else
+ 	_rtw_memcpy(pnetdev->dev_addr, sa->sa_data, ETH_ALEN); /* set mac addr to net_device */
++#endif
+ 
+ #if 0
+ 	if (rtw_is_hw_init_completed(padapter)) {
+@@ -1628,7 +1632,11 @@ int rtw_os_ndev_register(_adapter *adapter, const char *name)
+ 	/* alloc netdev name */
+ 	rtw_init_netdev_name(ndev, name);
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
++	eth_hw_addr_set(ndev, adapter_mac_addr(adapter));
++#else
+ 	_rtw_memcpy(ndev->dev_addr, adapter_mac_addr(adapter), ETH_ALEN);
++#endif
+ #if defined(CONFIG_NET_NS)
+     dev_net_set(ndev, wiphy_net(adapter_to_wiphy(adapter)));
+ #endif //defined(CONFIG_NET_NS)
+diff --git a/os_dep/linux/rtw_proc.c b/os_dep/linux/rtw_proc.c
+index 8a0fd3e..8b1a424 100644
+--- a/os_dep/linux/rtw_proc.c
++++ b/os_dep/linux/rtw_proc.c
+@@ -45,6 +45,10 @@ inline struct proc_dir_entry *get_rtw_drv_proc(void)
+ #define get_proc_net init_net.proc_net
+ #endif
+ 
++#if(LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
++#define PDE_DATA(inode) pde_data(inode)
++#endif
++
+ inline struct proc_dir_entry *rtw_proc_create_dir(const char *name, struct proc_dir_entry *parent, void *data)
+ {
+ 	struct proc_dir_entry *entry;
+diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c
+index 81b951d..7367bca 100644
+--- a/os_dep/osdep_service.c
++++ b/os_dep/osdep_service.c
+@@ -1268,8 +1268,12 @@ u32 _rtw_down_sema(_sema *sema)
+ inline void thread_exit(_completion *comp)
+ {
+ #ifdef PLATFORM_LINUX
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
++	kthread_complete_and_exit(comp, 0);
++#else
+ 	complete_and_exit(comp, 0);
+ #endif
++#endif
+ 
+ #ifdef PLATFORM_FREEBSD
+ 	printf("%s", "RTKTHREAD_exit");

debian/patches/series

@@ -0,0 +1,2 @@
+Change-dkms-version.patch
+add-support-kernel-5.17.patch

debian/r8188eus-dkms.conf

@@ -0,0 +1,2 @@
+# blacklist the driver
+blacklist r8188eu

debian/realtek-rtl8188eus-dkms.docs

@@ -0,0 +1 @@
+README.md

debian/realtek-rtl8188eus-dkms.install

@@ -0,0 +1,3 @@
+#!/usr/bin/dh-exec
+core hal include Kconfig Makefile os_dep platform usr/src/realtek-rtl8188eus-${DEB_VERSION_UPSTREAM}
+debian/r8188eus-dkms.conf etc/modprobe.d

debian/rules

@@ -0,0 +1,22 @@
+#!/usr/bin/make -f
+
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+include /usr/share/dpkg/pkg-info.mk
+export DEB_VERSION_UPSTREAM
+
+%:
+	dh $@ --with dkms
+
+override_dh_dkms:
+	dh_dkms -V $(DEB_VERSION_UPSTREAM) -- dkms.conf
+
+override_dh_fixperms:
+	dh_fixperms
+	find debian/realtek-rtl8188eus-dkms/usr/src -type f -exec chmod -x {} \;
+
+# Nothing to configure, build or auto-install (all is done after
+# installation using dkms)
+override_dh_auto_configure:
+override_dh_auto_build:
+override_dh_auto_install:

debian/script-targz

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e
+
+if [ "$1" = '--upstream-version' ]; then
+    new_version="$2"
+else
+    printf "Missing --upstream-version argument" 1>&2
+    exit 1
+fi
+
+DEB_SOURCE="$(dpkg-parsechangelog -SSource)"
+
+default_branch="$(git remote show https://github.com/aircrack-ng/rtl8188eus.git | grep 'HEAD' | sed 's/.*: v//')"
+
+version="$(echo ${new_version} | sed 's/~git.*//')"
+
+# fails if the upstream default branch has changed and is no longer the
+# version mentioned in debian/watch
+if [ "${default_branch}" != "${version}" ]; then
+    exit 1
+fi

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/source/lintian-overrides

@@ -0,0 +1,2 @@
+#we export the variable provided by /usr/share/dpkg/pkg-info.mk
+realtek-rtl8188eus-dkms source: dh-exec-subst-unknown-variable debian/realtek-rtl8188eus-dkms.install DEB_VERSION_UPSTREAM

debian/watch

@@ -0,0 +1,9 @@
+version=4
+opts="mode=git, pretty=5.3.9~git%cd.%h, pgpmode=none" \
+  https://github.com/aircrack-ng/rtl8188eus.git \
+  HEAD debian debian/script-targz
+
+# Use the following when upstream starts to tag releases:
+#opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%realtek-rtl8188eus-dkms-$1.tar.gz%" \
+#   https://github.com/aircrack-ng/rtl8188eus/tags \
+#   (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate

include/ieee80211.h

@@ -1529,7 +1529,6 @@ enum ieee80211_state {
 	(((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \
 				     (((Addr[5]) & 0xff) == 0xff))
 #else
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 00))
 extern __inline int is_multicast_mac_addr(const u8 *addr)
 {
 	return (addr[0] != 0xff) && (0x01 & addr[0]);
@@ -1546,24 +1545,6 @@ extern __inline int is_zero_mac_addr(const u8 *addr)
 	return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) &&   \
 		(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
 }
-#else 
-static __inline int is_multicast_mac_addr(const u8 *addr)
-{
-	return (addr[0] != 0xff) && (0x01 & addr[0]);
-}
-
-static __inline int is_broadcast_mac_addr(const u8 *addr)
-{
-	return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) &&   \
-		(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
-}
-
-static __inline int is_zero_mac_addr(const u8 *addr)
-{
-	return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) &&   \
-		(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
-}
-#endif /* LINUX_VERSION_CODE */
 #endif /* PLATFORM_FREEBSD */
 
 #define CFG_IEEE80211_RESERVE_FCS (1<<0)

os_dep/linux/os_intfs.c

@@ -1199,11 +1199,7 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *addr)
 	}
 
 	_rtw_memcpy(adapter_mac_addr(padapter), sa->sa_data, ETH_ALEN); /* set mac addr to adapter */
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
-	eth_hw_addr_set(pnetdev, sa->sa_data);
-#else
 	_rtw_memcpy(pnetdev->dev_addr, sa->sa_data, ETH_ALEN); /* set mac addr to net_device */
-#endif
 
 #if 0
 	if (rtw_is_hw_init_completed(padapter)) {
@@ -1632,11 +1628,7 @@ int rtw_os_ndev_register(_adapter *adapter, const char *name)
 	/* alloc netdev name */
 	rtw_init_netdev_name(ndev, name);
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
-	eth_hw_addr_set(ndev, adapter_mac_addr(adapter));
-#else
 	_rtw_memcpy(ndev->dev_addr, adapter_mac_addr(adapter), ETH_ALEN);
-#endif
 #if defined(CONFIG_NET_NS)
     dev_net_set(ndev, wiphy_net(adapter_to_wiphy(adapter)));
 #endif //defined(CONFIG_NET_NS)

os_dep/linux/rtw_proc.c

@@ -45,10 +45,6 @@ inline struct proc_dir_entry *get_rtw_drv_proc(void)
 #define get_proc_net init_net.proc_net
 #endif
 
-#if(LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
-#define PDE_DATA(inode) pde_data(inode)
-#endif
-
 inline struct proc_dir_entry *rtw_proc_create_dir(const char *name, struct proc_dir_entry *parent, void *data)
 {
 	struct proc_dir_entry *entry;

os_dep/osdep_service.c

@@ -1268,12 +1268,8 @@ u32 _rtw_down_sema(_sema *sema)
 inline void thread_exit(_completion *comp)
 {
 #ifdef PLATFORM_LINUX
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
-	kthread_complete_and_exit(comp, 0);
-#else
 	complete_and_exit(comp, 0);
 #endif
-#endif
 
 #ifdef PLATFORM_FREEBSD
 	printf("%s", "RTKTHREAD_exit");