[bot] AutoMerging: merge all upstream's changes:

* https://github.com/coolsnowwolf/lede: Update RTL8125 Driver to 9.009.02-1 (coolsnowwolf#9781) n2n: dynamic link to libcap (coolsnowwolf#9779) Update fast-classifier.c (coolsnowwolf#9777)
jy755 · Jul 17, 2022 · e3dc72e · e3dc72e
2 parents d92595b + 75cf686
commit e3dc72e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/package/lean/n2n/Makefile b/package/lean/n2n/Makefile
@@ -26,12 +26,12 @@ define Package/n2n/template
   SUBMENU:=VPN
   TITLE:=N2N Peer-to-peer VPN
   URL:=http://www.ntop.org/n2n
-  DEPENDS:=+libcap +libopenssl +libpthread +libzstd
+  DEPENDS:=+libopenssl +libpthread +libzstd
 endef
 
 define Package/n2n
   $(call Package/n2n/template)
-  DEPENDS+=+kmod-tun +resolveip
+  DEPENDS+=+libcap +kmod-tun +resolveip
 endef
 
 define Package/n2n/description

diff --git a/package/lean/n2n/patches/100-dynamic-libcap.patch b/package/lean/n2n/patches/100-dynamic-libcap.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -185,7 +185,7 @@ if(N2N_OPTION_USE_PCAPLIB AND (NOT DEFIN
+   # Linux Capabilities
+   find_library(CAP_LIB cap)
+   if(CAP_LIB)
+-    target_link_libraries(edge cap.a)
++    target_link_libraries(edge cap)
+     set(CMAKE_REQUIRED_LIBRARIES ${CAP_LIB})
+     ADD_DEFINITIONS("-DHAVE_LIBCAP")
+   endif()
diff --git a/package/lean/r8125/Makefile b/package/lean/r8125/Makefile
@@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=r8125
-PKG_VERSION:=9.009.01-1
+PKG_VERSION:=9.009.02-1
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/awesometic/realtek-r8125-dkms/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=cdb80e51d330c89495fcf01b096792af079856f1feb6474c282d4ad954e3fda2
+PKG_HASH:=e3f0a0a02a4ba847cb962ea7e12c89e3f4ab732944f04ebeb76d4d9711fa8ca6
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/realtek-$(PKG_NAME)-dkms-$(PKG_VERSION)
 
 PKG_LICENSE:=GPL-2.0-only

diff --git a/package/lean/shortcut-fe/fast-classifier/src/fast-classifier.c b/package/lean/shortcut-fe/fast-classifier/src/fast-classifier.c
@@ -451,7 +451,7 @@ static u32 fc_conn_hash(sfe_ip_addr_t *saddr, sfe_ip_addr_t *daddr,
  */
 static int fast_classifier_update_protocol(struct sfe_connection_create *p_sic, struct nf_conn *ct)
 {
-  #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
+  #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
     struct net *net=NULL ;
     struct nf_tcp_net *tn=NULL;
 	#endif
@@ -465,7 +465,7 @@ static int fast_classifier_update_protocol(struct sfe_connection_create *p_sic,
 		p_sic->dest_td_max_window = ct->proto.tcp.seen[1].td_maxwin;
 		p_sic->dest_td_end = ct->proto.tcp.seen[1].td_end;
 		p_sic->dest_td_max_end = ct->proto.tcp.seen[1].td_maxend;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
 	net = nf_ct_net(ct);
 	tn = nf_tcp_pernet(net);
 	if ((tn&&tn->tcp_no_window_check)