Prepare for Release

Update to upstream version '5.3.9~git20210206.1e7145f'
with Debian dir 80bf993a47

README.md

@@ -23,14 +23,14 @@
 
 # Howto build/install
 1. You will need to blacklist another driver in order to use this one.
-2. "echo "blacklist r8188eu" > "/etc/modprobe.d/realtek.conf"
+2. `echo 'blacklist r8188eu'|sudo tee -a '/etc/modprobe.d/realtek.conf'`
-3. "make && make install"<br>
+3. `make && sudo make install`
 4. Reboot in order to blacklist and load the new driver/module.
 
 # MONITOR MODE howto
 Use these steps to enter monitor mode.
 ```
-$ sudo airmon-ng check-kill
+$ sudo airmon-ng check kill
 $ sudo ip link set <interface> down
 $ sudo iw dev <interface> set type monitor
 ```
@@ -42,7 +42,7 @@ $ aireplay -9 <interface>
 
 # NetworkManager configuration
 Add these lines below to "NetworkManager.conf" and ADD YOUR ADAPTER MAC below [keyfile]
-This will make the Network-Manager ignore the device, and therefor don't cause problems.
+This will make the Network-Manager ignore the device, and therefore don't cause problems.
 ```
 [device]
 wifi.scan-rand-mac-address=no

debian/changelog

@@ -1,3 +1,24 @@
+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

debian/patches/Change-dkms-version.patch

@@ -1,20 +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
 
+Forwarded: not-needed
 ---
  dkms.conf | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/dkms.conf b/dkms.conf
-index 1c14127..8bb65d0 100644
+index 1c14127..0ec5a51 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~git20200829"
++PACKAGE_VERSION="5.3.9_git20210206.1e7145f"
  CLEAN="'make' clean"
  BUILT_MODULE_NAME[0]=8188eu
  PROCS_NUM=`nproc`

debian/realtek-rtl8188eus-dkms.install

@@ -1,2 +1,2 @@
 #!/usr/bin/dh-exec
-realtek-rtl8188eus-dkms source: dh-exec-subst-unknown-variable debian/realtek-rtl8188eus-dkms.install DEB_VERSION_UPSTREA
+core hal include Kconfig Makefile os_dep platform usr/src/realtek-rtl8188eus-${DEB_VERSION_UPSTREAM}

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/watch

@@ -1,4 +1,9 @@
 version=4
-opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%realtek-rtl8188eus-dkms-$1.tar.gz%" \
+opts="mode=git, pretty=5.3.9~git%cd.%h, pgpmode=none" \
-   https://github.com/aircrack-ng/rtl8188eus/tags \
+  https://github.com/aircrack-ng/rtl8188eus.git \
-   (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate
+  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

os_dep/linux/ioctl_cfg80211.c

@@ -7088,18 +7088,16 @@ exit:
 	return ret;
 }
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
 static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
 	struct wireless_dev *wdev,
 #else
 	struct net_device *ndev,
 #endif
-	u16 frame_type, bool reg)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
+	struct mgmt_frame_regs *upd)
 #else
-static void cfg80211_rtw_update_mgmt_frame_register(struct wiphy *wiphy,
+	u16 frame_type, bool reg)
-						    struct wireless_dev *wdev,
-						    struct mgmt_frame_regs *upd)
 #endif
 
 {
@@ -7110,6 +7108,12 @@ static void cfg80211_rtw_update_mgmt_frame_register(struct wiphy *wiphy,
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0))
 	struct net_device *ndev = wdev_to_ndev(wdev);
 #endif
+
+/* hardcoded always true, to make it pass compilation */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
+	bool reg = true;
+#endif
+
 	_adapter *adapter;
 
 	struct rtw_wdev_priv *pwdev_priv;
@@ -7132,8 +7136,13 @@ static void cfg80211_rtw_update_mgmt_frame_register(struct wiphy *wiphy,
 
 	/* Wait QC Verify */
 	return;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))
+
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
+	switch (upd->interface_stypes) {
+#else
 	switch (frame_type) {
+#endif
+
 	case IEEE80211_STYPE_PROBE_REQ: /* 0x0040 */
 		SET_CFG80211_REPORT_MGMT(pwdev_priv, IEEE80211_STYPE_PROBE_REQ, reg);
 		break;
@@ -9454,10 +9463,10 @@ static struct cfg80211_ops rtw_cfg80211_ops = {
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE)
 	.mgmt_tx = cfg80211_rtw_mgmt_tx,
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 8, 0))	
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0))
-	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
+	.update_mgmt_frame_registrations = cfg80211_rtw_mgmt_frame_register,
 #else
-	.update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_register,
+	.mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,
 #endif
 #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34) && LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
 	.action = cfg80211_rtw_mgmt_tx,
@@ -9792,5 +9801,3 @@ void rtw_cfg80211_dev_res_unregister(struct dvobj_priv *dvobj)
 	rtw_wiphy_unregister(dvobj_to_wiphy(dvobj));
 #endif
 }
-
-#endif /* CONFIG_IOCTL_CFG80211 */

os_dep/linux/usb_intf.c

@@ -158,6 +158,7 @@ static struct usb_device_id rtw_usb_id_tbl[] = {
 	{USB_DEVICE(0x2001, 0x330F), .driver_info = RTL8188E}, /* DLink DWA-125 REV D1 */ 
 	{USB_DEVICE(0x2001, 0x3310), .driver_info = RTL8188E}, /* Dlink DWA-123 REV D1 */ 
 	{USB_DEVICE(0x2001, 0x3311), .driver_info = RTL8188E}, /* DLink GO-USB-N150 REV B1 */ 
+	{USB_DEVICE(0x2001, 0x331B), .driver_info = RTL8188E}, /* DLink DWA-121 REV B1 */ 
 	{USB_DEVICE(0x056E, 0x4008), .driver_info = RTL8188E}, /* Elecom WDC-150SU2M */ 	
 #endif
 

os_dep/osdep_service.c

@@ -2139,15 +2139,19 @@ static int isFileReadable(const char *path, u32 *sz)
 {
 	struct file *fp;
 	int ret = 0;
+	#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
 	mm_segment_t oldfs;
+	#endif
 	char buf;
 
 	fp = filp_open(path, O_RDONLY, 0);
 	if (IS_ERR(fp))
 		ret = PTR_ERR(fp);
 	else {
+		#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
 		oldfs = get_fs();
 		set_fs(KERNEL_DS);
+		#endif
 
 		if (1 != readFile(fp, &buf, 1))
 			ret = PTR_ERR(fp);
@@ -2159,8 +2163,9 @@ static int isFileReadable(const char *path, u32 *sz)
 			*sz = i_size_read(fp->f_dentry->d_inode);
 			#endif
 		}
-
+		#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
 		set_fs(oldfs);
+		#endif
 		filp_close(fp, NULL);
 	}
 	return ret;
@@ -2176,7 +2181,9 @@ static int isFileReadable(const char *path, u32 *sz)
 static int retriveFromFile(const char *path, u8 *buf, u32 sz)
 {
 	int ret = -1;
+	#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
 	mm_segment_t oldfs;
+	#endif
 	struct file *fp;
 
 	if (path && buf) {
@@ -2184,10 +2191,14 @@ static int retriveFromFile(const char *path, u8 *buf, u32 sz)
 		if (0 == ret) {
 			RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp);
 
+			#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
 			oldfs = get_fs();
 			set_fs(KERNEL_DS);
+			#endif
 			ret = readFile(fp, buf, sz);
+			#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
 			set_fs(oldfs);
+			#endif
 			closeFile(fp);
 
 			RTW_INFO("%s readFile, ret:%d\n", __FUNCTION__, ret);
@@ -2211,7 +2222,9 @@ static int retriveFromFile(const char *path, u8 *buf, u32 sz)
 static int storeToFile(const char *path, u8 *buf, u32 sz)
 {
 	int ret = 0;
+	#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
 	mm_segment_t oldfs;
+	#endif
 	struct file *fp;
 
 	if (path && buf) {
@@ -2219,10 +2232,14 @@ static int storeToFile(const char *path, u8 *buf, u32 sz)
 		if (0 == ret) {
 			RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp);
 
+			#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
 			oldfs = get_fs();
 			set_fs(KERNEL_DS);
+			#endif
 			ret = writeFile(fp, buf, sz);
+			#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
 			set_fs(oldfs);
+			#endif
 			closeFile(fp);
 
 			RTW_INFO("%s writeFile, ret:%d\n", __FUNCTION__, ret);