Prepare for Release

Update to upstream version '5.3.9~git20220829.4ba8e08'
with Debian dir acb483443a

debian/README.Debian

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

debian/changelog

@@ -1,3 +1,31 @@
+realtek-rtl8188eus-dkms (5.3.9~git20220829.4ba8e08-0kali1) kali-dev; urgency=medium
+
+  [ Arnaud Rebillout ]
+  * No more dh-exec (requires compat 13)
+  * Switch to dh-sequence-dkms
+  * Set PACKAGE_VERSION in override_dh_dkms
+
+  [ Kali Janitor ]
+  * Trim trailing whitespace.
+  * debian/copyright: use spaces rather than tabs to start continuation lines.
+  * Set upstream metadata fields: Bug-Database, Bug-Submit.
+  * Update standards version to 4.6.1, no changes needed.
+
+  [ Sophie Brun ]
+  * New upstream version 5.3.9~git20220829.4ba8e08
+  * Refresh patches
+  * Import upstream patch to fix the build with Linux 5.19
+
+ -- Sophie Brun <sophie@offensive-security.com>  Thu, 06 Oct 2022 15:05:27 +0200
+
+realtek-rtl8188eus-dkms (5.3.9~git20220319.0958f29-0kali3) kali-dev; urgency=medium
+
+  * Remove useless patch (we change version in debian/rules)
+  * Refresh patch
+  * Add a patch to fix the build with kernel 5.18
+
+ -- Sophie Brun <sophie@offensive-security.com>  Tue, 21 Jun 2022 12:20:45 +0200
+
 realtek-rtl8188eus-dkms (5.3.9~git20220319.0958f29-0kali2) kali-dev; urgency=medium
 
   * Add a patch to fix build build with kernel 5.17

debian/control

@@ -3,8 +3,8 @@ 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
+Build-Depends: debhelper-compat (= 13), dh-sequence-dkms
-Standards-Version: 4.5.1
+Standards-Version: 4.6.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
@@ -16,4 +16,3 @@ 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/patches/Change-dkms-version.patch

@@ -1,20 +0,0 @@
-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/Fix-build-for-linux-kernel-5.17.patch

@@ -0,0 +1,29 @@
+From: Sophie Brun <sophie@offensive-security.com>
+Date: Tue, 21 Jun 2022 12:15:03 +0200
+Subject: Fix build for linux kernel >= 5.17
+
+Origin: https://github.com/aircrack-ng/rtl8188eus/commit/0f1905259ec9b85fd1453be3abd322ff543e12bc
+---
+ include/ieee80211.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/ieee80211.h b/include/ieee80211.h
+index 89d2eff..5d7ebe1 100644
+--- a/include/ieee80211.h
++++ b/include/ieee80211.h
+@@ -1535,13 +1535,13 @@ extern __inline int is_multicast_mac_addr(const u8 *addr)
+ 	return (addr[0] != 0xff) && (0x01 & addr[0]);
+ }
+ 
+-extern __inline int is_broadcast_mac_addr(const u8 *addr)
++__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));
+ }
+ 
+-extern __inline int is_zero_mac_addr(const u8 *addr)
++__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));

debian/patches/Fix-for-linux-5.19.patch

@@ -0,0 +1,49 @@
+From: Sophie Brun <sophie@offensive-security.com>
+Date: Thu, 6 Oct 2022 15:53:31 +0200
+Subject: Fix for linux 5.19
+
+Origin: https://github.com/aircrack-ng/rtl8188eus/pull/205
+---
+ os_dep/linux/ioctl_cfg80211.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
+index 86c45b9..02ed8dc 100644
+--- a/os_dep/linux/ioctl_cfg80211.c
++++ b/os_dep/linux/ioctl_cfg80211.c
+@@ -417,7 +417,11 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, u8
+ 	if (ret != _SUCCESS)
+ 		goto exit;
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
++	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef, 0);
++#else
+ 	cfg80211_ch_switch_notify(adapter->pnetdev, &chdef);
++#endif
+ 
+ #else
+ 	int freq = rtw_ch2freq(ch);
+@@ -4876,7 +4880,11 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd
+ 	return ret;
+ }
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
++static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev, unsigned int link_id)
++#else
+ static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
++#endif
+ {
+ 	_adapter *adapter = (_adapter *)rtw_netdev_priv(ndev);
+ 
+@@ -9634,7 +9642,11 @@ void rtw_wdev_unregister(struct wireless_dev *wdev)
+ 	rtw_cfg80211_indicate_scan_done(adapter, _TRUE);
+ 
+ 	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)) || defined(COMPAT_KERNEL_RELEASE)
++	#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
++	if (wdev->connected) {
++	#else
+ 	if (wdev->current_bss) {
++	#endif
+ 		RTW_INFO(FUNC_ADPT_FMT" clear current_bss by cfg80211_disconnected\n", FUNC_ADPT_ARG(adapter));
+ 		rtw_cfg80211_indicate_disconnect(adapter, 0, 1);
+ 	}

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

@@ -2,71 +2,23 @@ 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 ++++
+ 1 file changed, 4 insertions(+)
- 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
+index 8b1a424..9bd4041 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)
+@@ -39,6 +39,10 @@ inline struct proc_dir_entry *get_rtw_drv_proc(void)
- #define get_proc_net init_net.proc_net
+ #define proc_get_parent_data(inode) PDE((inode))->parent->data
  #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)
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24))
- {
+ #define get_proc_net proc_net
- 	struct proc_dir_entry *entry;
+ #else
-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

@@ -1,2 +1,3 @@
-Change-dkms-version.patch
 add-support-kernel-5.17.patch
+Fix-build-for-linux-kernel-5.17.patch
+Fix-for-linux-5.19.patch

debian/realtek-rtl8188eus-dkms.install

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

debian/rules

@@ -1,18 +1,17 @@
 #!/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
+	dh $@
 
 override_dh_dkms:
-	dh_dkms -V $(DEB_VERSION_UPSTREAM) -- dkms.conf
+	# Force PACKAGE_VERSION to be DEB_VERSION_UPSTREAM
+	sed -i dkms.conf -e 's%^PACKAGE_VERSION=.*%PACKAGE_VERSION="$(DEB_VERSION_UPSTREAM)"%'
+	dh_dkms -- dkms.conf
 
-override_dh_fixperms:
+execute_after_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

debian/source/lintian-overrides

@@ -1,2 +0,0 @@
-#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/upstream/metadata

@@ -0,0 +1,3 @@
+---
+Bug-Database: https://github.com/aircrack-ng/rtl8188eus/issues
+Bug-Submit: https://github.com/aircrack-ng/rtl8188eus/issues/new

include/ieee80211.h

@@ -1529,6 +1529,7 @@ 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]);
@@ -1545,6 +1546,24 @@ 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,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)

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;

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");