Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

nginx: update to version 1.17.10 and fix bug

Browse source 
If one file is a hard link to another, `mv` will not overwrite it;
`rm -f` the destinations beforehand.

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
This commit is contained in:
Peter Stadler 2020-04-16 11:40:05 +02:00
parent d8bad7ad70
commit 8de2a47a10
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
net/nginx/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=nginx PKG_NAME:=nginx
PKG_VERSION:=1.17.9 PKG_VERSION:=1.17.10
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://nginx.org/download/ PKG_SOURCE_URL:=https://nginx.org/download/
PKG_HASH:=7dd65d405c753c41b7fdab9415cfb4bdbaf093ec6d9f7432072d52cb7bcbb689 PKG_HASH:=a9aa73f19c352a6b166d78e2a664bb3ef1295bbe6d3cc5aa7404bd4664ab4b83
PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> \ PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> \
Ansuel Smith <ansuelsmth@gmail.com> Ansuel Smith <ansuelsmth@gmail.com>
@ -426,7 +426,7 @@ Package/nginx-all-module/install = $(Package/nginx-ssl/install)
define Package/nginx-ssl/prerm define Package/nginx-ssl/prerm
#!/bin/sh #!/bin/sh
[ -z "$${IPKG_INSTROOT}" ] || exit 0 [ -z "$${IPKG_INSTROOT}" ] || exit 0
if [ "$${PKG_UPGRADE}" == "1" ]; then if [ "$${PKG_UPGRADE}" = "1" ]; then
eval $$(/usr/bin/nginx-util get_env) eval $$(/usr/bin/nginx-util get_env)
TMP_CRT=$$(mktemp -p "$${CONF_DIR}" "$${LAN_NAME}.crt.tmp-XXXXXX") TMP_CRT=$$(mktemp -p "$${CONF_DIR}" "$${LAN_NAME}.crt.tmp-XXXXXX")
ln -f "$${CONF_DIR}$${LAN_NAME}.crt" "$${TMP_CRT}" ln -f "$${CONF_DIR}$${LAN_NAME}.crt" "$${TMP_CRT}"
@ -434,8 +434,12 @@ if [ "$${PKG_UPGRADE}" == "1" ]; then
ln -f "$${CONF_DIR}$${LAN_NAME}.key" "$${TMP_KEY}" ln -f "$${CONF_DIR}$${LAN_NAME}.key" "$${TMP_KEY}"
fi fi
/usr/bin/nginx-util del_ssl /usr/bin/nginx-util del_ssl
[ -f "$${TMP_CRT}" ] && mv -f "$${TMP_CRT}" "$${CONF_DIR}$${LAN_NAME}.crt" [ -f "$${TMP_CRT}" ] &&
[ -f "$${TMP_KEY}" ] && mv -f "$${TMP_KEY}" "$${CONF_DIR}$${LAN_NAME}.key" rm -f "$${CONF_DIR}$${LAN_NAME}.crt" &&
mv -f "$${TMP_CRT}" "$${CONF_DIR}$${LAN_NAME}.crt"
[ -f "$${TMP_KEY}" ] &&
rm -f "$${CONF_DIR}$${LAN_NAME}.key" &&
mv -f "$${TMP_KEY}" "$${CONF_DIR}$${LAN_NAME}.key"
exit 0 exit 0
endef endef