Skip to content
Snippets Groups Projects
Verified Commit 8e16750f authored by Richard Muzik's avatar Richard Muzik
Browse files

patches/packages: fix broken patches

Some changes were merged in OpenWrt for openssh and openvpn packages
broking our patches.

Links:
- https://github.com/openwrt/packages/commit/8a1e03011acd4def2cc43973df2ea40560ad4771
- https://github.com/openwrt/packages/commit/1301ccb894d741ce161ebf54648249c89ddd948a
parent f7b21bbb
Branches
Tags
1 merge request!725Fix preparation of openvpn and openssh
Pipeline #124945 failed with stages
in 7 minutes and 28 seconds
......@@ -14,15 +14,15 @@ diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index d384a2052..76c83b770 100644
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -223,6 +223,7 @@ define Package/openssh-server/install
install -d -m0700 $(1)/etc/ssh
@@ -227,6 +227,7 @@ define Package/openssh-server/install
install -d -m0700 $(1)/etc/ssh $(1)/etc/ssh/sshd_config.d
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/ssh/sshd_config $(1)/etc/ssh/
sed -r -i 's,^#(HostKey /etc/ssh/ssh_host_(rsa|ed25519)_key)$$$$,\1,' $(1)/etc/ssh/sshd_config
+ sed -i 's/^#PermitRootLogin.*/PermitRootLogin yes/' $(1)/etc/ssh/sshd_config
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/sshd.init $(1)/etc/init.d/sshd
$(INSTALL_DIR) $(1)/lib/preinit
@@ -235,6 +236,7 @@ define Package/openssh-server-pam/install
@@ -239,6 +240,7 @@ define Package/openssh-server-pam/install
$(call Package/openssh-server/install,$(1))
sed -i 's,#PasswordAuthentication yes,PasswordAuthentication no,g' $(1)/etc/ssh/sshd_config
sed -i 's,#UsePAM no,UsePAM yes,g' $(1)/etc/ssh/sshd_config
......
......@@ -15,19 +15,6 @@ Signed-off-by: Ivan Pavlov <AuthorReflex@gmail.com>
net/openvpn/files/openvpn.init | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index 213f027fd..ac76841b8 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openvpn
PKG_VERSION:=2.5.7
-PKG_RELEASE:=3
+PKG_RELEASE:=4
PKG_SOURCE_URL:=\
https://build.openvpn.net/downloads/releases/ \
diff --git a/net/openvpn/files/openvpn.init b/net/openvpn/files/openvpn.init
index b5f612e46..6eb305135 100644
--- a/net/openvpn/files/openvpn.init
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment