From 7c1b94bb13e390ac2124ad4d26976cf8fd36f312 Mon Sep 17 00:00:00 2001 From: Josh Powers Date: Tue, 25 Oct 2022 19:54:43 -0600 Subject: [PATCH] privoxy: correctly format /etc/services additions This adds the missing protocol (e.g. /tcp and /udp) to the entry in /etc/services. If the entry already exists, it will add the /tcp to it. Otherwise, it will look and add the tcp and udp entries if either is missing. fixes: openwrt#19665 Signed-off-by: Josh Powers (cherry picked from commit 95edfa723c9e7b1b99361a86022b9b20ac6f8ead) --- net/privoxy/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/net/privoxy/Makefile b/net/privoxy/Makefile index 1f8e72a090..6ce0574afb 100644 --- a/net/privoxy/Makefile +++ b/net/privoxy/Makefile @@ -157,8 +157,15 @@ endef define Package/privoxy/postinst #!/bin/sh - grep -i privoxy $${IPKG_INSTROOT}/etc/services >/dev/null 2>&1 || \ - echo -e "privoxy\t8118" >> $${IPKG_INSTROOT}/etc/services + # if exists, update previous version entry missing protocol + (grep -E "privoxy.*8118$" $${IPKG_INSTROOT}/etc/services) > /dev/null \ + && sed -i "s/privoxy.*8118/privoxy\t\t8118\/tcp/" $${IPKG_INSTROOT}/etc/services + + # add missing tcp and udp entries + (grep -E "privoxy.*8118\/tcp" $${IPKG_INSTROOT}/etc/services) > /dev/null \ + || echo -e "privoxy\t\t8118/tcp" >> $${IPKG_INSTROOT}/etc/services + (grep -E "privoxy.*8118\/udp" $${IPKG_INSTROOT}/etc/services) > /dev/null \ + || echo -e "privoxy\t\t8118/udp" >> $${IPKG_INSTROOT}/etc/services endef $(eval $(call BuildPackage,privoxy)) -- 2.30.2