fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Mainline

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2021-04-17 00:17:46 +08:00
commit e46eaffee2
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
6 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTED.md
View File

@ -67,7 +67,6 @@ luci-theme-infinityfreedom source: [xiaoqingfengATGH/luci-theme-infinityfreedom]
luci-proto-minieap source: [ysc3839/luci-proto-minieap](https://github.com/ysc3839/luci-proto-minieap).
## Download Mirrors
[182.140.223.146](http://182.140.223.146/dl) by [hzjnet@163.com](mailto://hzjnet@163.com).<br/>
[openwrt.cc](https://openwrt.cc/dl/immortalwrt) by [@SuLingGG](https://github.com/SuLingGG).
## License

10
package/kernel/linux/modules/crypto.mk
View File

@ -319,7 +319,15 @@ $(eval $(call KernelPackage,crypto-hmac))
define KernelPackage/crypto-hw-ccp
TITLE:=AMD Cryptographic Coprocessor
DEPENDS:=+kmod-crypto-authenc +kmod-crypto-hash +kmod-crypto-manager +kmod-random-core +kmod-crypto-sha1 +kmod-crypto-sha256 +kmod-crypto-rsa
DEPENDS:= \
@TARGET_x86 \
+kmod-crypto-authenc \
+kmod-crypto-hash \
+kmod-crypto-manager \
+kmod-crypto-rsa \
+kmod-crypto-sha1 \
+kmod-crypto-sha256 \
+kmod-random-core
KCONFIG:= \
CONFIG_CRYPTO_HW=y \
CONFIG_CRYPTO_DEV_CCP=y \

11
package/lean/dnsforwarder/files/etc/init.d/dnsforwarder
View File

@ -196,6 +196,12 @@ start()
uci commit dhcp
/etc/init.d/dnsmasq restart
fi
local dnsmasq_server_addr=$(uci get dhcp.@dnsmasq[0].server 2>/dev/null)
if [ -n "${dnsmasq_server_addr}" ]; then
uci set dhcp.@dnsmasq[0].noresolv=1
uci commit dhcp
/etc/init.d/dnsmasq restart
fi
add_cron
}
@ -204,8 +210,11 @@ stop()
del_cron
logger -t stopping dnsforwarder
local addr=$(uci get dnsforwarder.@arguments[0].addr 2>/dev/null)
local dnsmasq=$(uci get dnsforwarder.@arguments[0].dnsmasq 2>/dev/null)
addr=${addr/:/#}
uci del_list dhcp.@dnsmasq[0].server=$addr 2>/dev/null
if [ "${dnsmasq}" = "1" ]; then
uci del_list dhcp.@dnsmasq[0].server=$addr 2>/dev/null
fi
uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.d/resolv.conf.auto 2>/dev/null
uci delete dhcp.@dnsmasq[0].noresolv 2>/dev/null
uci delete dhcp.@dnsmasq[0].serversfile 2>/dev/null

4
package/libs/libsemanage/Makefile
View File

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=libsemanage
PKG_VERSION:=3.2
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/3.2
@ -58,6 +58,8 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libsemanage.pc $(1)/usr/lib/pkgconfig/
$(SED) 's,/usr/include,$$$${prefix}/include,g' $(1)/usr/lib/pkgconfig/libsemanage.pc
$(SED) 's,/usr/lib,$$$${exec_prefix}/lib,g' $(1)/usr/lib/pkgconfig/libsemanage.pc
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
endef

3
scripts/download.pl
View File

@ -280,9 +280,8 @@ foreach my $mirror (@ARGV) {
}
}
unshift @mirrors, "https://openwrt.cc/dl/immortalwrt/openwrt-18.06";
unshift @mirrors, "https://mirror01.download.immortalwrt.org/openwrt-18.06-k5.4";
unshift @mirrors, "http://182.140.223.146/dl";
push @mirrors, "https://openwrt.cc/dl/immortalwrt/openwrt-18.06";
push @mirrors, 'https://sources.cdn.openwrt.org';
push @mirrors, 'https://sources.openwrt.org';
push @mirrors, 'https://mirror2.openwrt.org/sources';

16
target/linux/ramips/files/drivers/net/ethernet/ralink/mt7530.c
View File

@ -341,9 +341,11 @@ mt7530_r32(struct mt7530_priv *priv, u32 reg)
if (priv->bus) {
u16 high, low;
mdiobus_write(priv->bus, 0x1f, 0x1f, (reg >> 6) & 0x3ff);
low = mdiobus_read(priv->bus, 0x1f, (reg >> 2) & 0xf);
high = mdiobus_read(priv->bus, 0x1f, 0x10);
mutex_lock(&priv->bus->mdio_lock);
__mdiobus_write(priv->bus, 0x1f, 0x1f, (reg >> 6) & 0x3ff);
low = __mdiobus_read(priv->bus, 0x1f, (reg >> 2) & 0xf);
high = __mdiobus_read(priv->bus, 0x1f, 0x10);
mutex_unlock(&priv->bus->mdio_lock);
return (high << 16) | (low & 0xffff);
}
@ -358,9 +360,11 @@ static void
mt7530_w32(struct mt7530_priv *priv, u32 reg, u32 val)
{
if (priv->bus) {
mdiobus_write(priv->bus, 0x1f, 0x1f, (reg >> 6) & 0x3ff);
mdiobus_write(priv->bus, 0x1f, (reg >> 2) & 0xf, val & 0xffff);
mdiobus_write(priv->bus, 0x1f, 0x10, val >> 16);
mutex_lock(&priv->bus->mdio_lock);
__mdiobus_write(priv->bus, 0x1f, 0x1f, (reg >> 6) & 0x3ff);
__mdiobus_write(priv->bus, 0x1f, (reg >> 2) & 0xf, val & 0xffff);
__mdiobus_write(priv->bus, 0x1f, 0x10, val >> 16);
mutex_unlock(&priv->bus->mdio_lock);
return;
}