Skip to content

Commit

Permalink
acme: Get listener name from /proc/PID/exe instead of netstat output
Browse files Browse the repository at this point in the history
It seems the command name output from netstat can be truncated in weird
ways, so let's get the binary name from /proc instead and use that for
matching which listener we have.

Fixes openwrt#15071.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
  • Loading branch information
tohojo authored and pull[bot] committed Oct 2, 2021
1 parent 8922696 commit a587f95
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion net/acme/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=acme
PKG_VERSION:=2.8.7
PKG_RELEASE:=5
PKG_RELEASE:=6

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/acmesh-official/acme.sh/tar.gz/$(PKG_VERSION)?
Expand Down
4 changes: 2 additions & 2 deletions net/acme/files/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ pre_checks()

for listener in $(get_listeners); do
pid="${listener%/*}"
cmd="${listener#*/}"
cmd="$(basename $(readlink /proc/$pid/exe))"

case "$cmd" in
uhttpd)
Expand All @@ -100,7 +100,7 @@ pre_checks()
return 1
fi
;;
nginx*)
nginx)
if [ "$NGINX_WEBSERVER" -eq "1" ]; then
debug "Already handled nginx; skipping"
continue
Expand Down

0 comments on commit a587f95

Please sign in to comment.