diff options
author | J0WI <J0WI@users.noreply.github.com> | 2021-03-29 03:24:05 +0200 |
---|---|---|
committer | Rasmus Thomsen <oss@cogitri.dev> | 2021-04-22 08:40:41 +0000 |
commit | 7d6dbbe568dbe8886e9bf8d3ebca14b1c6841ec0 (patch) | |
tree | c9cb635f02dd632f96e11b1f3cf9bb31dab918d7 /main/privoxy/privoxy-alpine.patch | |
parent | 39973cd27e0b6445adcc4a5dacf29ee66a96acab (diff) |
main/privoxy: security upgrade to 3.0.32
Diffstat (limited to 'main/privoxy/privoxy-alpine.patch')
-rw-r--r-- | main/privoxy/privoxy-alpine.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/main/privoxy/privoxy-alpine.patch b/main/privoxy/privoxy-alpine.patch index c04030613c7..7f46879d024 100644 --- a/main/privoxy/privoxy-alpine.patch +++ b/main/privoxy/privoxy-alpine.patch @@ -2,9 +2,9 @@ diff --git a/GNUmakefile.in b/GNUmakefile.in index 2593901..c3a681a 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in -@@ -62,8 +62,8 @@ MAN_DIR = @mandir@ - MAN_DEST = $(MAN_DIR)/man1 - MAN_PAGE = privoxy.1 +@@ -62,8 +62,8 @@ + MAN_DEST = $(MAN_DIR)/man8 + MAN_PAGE = privoxy.8 SHARE_DEST = @datadir@ -DOC_DEST = $(SHARE_DEST)/doc/privoxy -VAR_DEST = @localstatedir@ @@ -13,17 +13,17 @@ index 2593901..c3a681a 100644 LOGS_DEST = $(VAR_DEST)/log/privoxy PIDS_DEST = $(VAR_DEST)/run -@@ -922,34 +922,8 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T +@@ -964,34 +964,8 @@ fi ;\ $(ECHO) Installing configuration files to $(DESTDIR)$(CONF_DEST);\ for i in $(CONFIGS); do \ - if [ "$$i" = "default.action" ] || [ "$$i" = "default.filter" ] ; then \ - $(RM) $(DESTDIR)$(CONF_DEST)/$$i ;\ - $(ECHO) Installing fresh $$i;\ - $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ -- elif [ -s "$(CONF_DEST)/$$i" ]; then \ +- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ +- elif [ -s "$(DESTDIR)$(CONF_DEST)/$$i" ]; then \ - $(ECHO) Installing $$i as $$i.new ;\ -- $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\ + $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST)/$$i.new || exit 1;\ - NEW=1;\ - else \ - $(INSTALL) $$INSTALL_CONF $$i $(DESTDIR)$(CONF_DEST) || exit 1;\ @@ -47,7 +47,7 @@ index 2593901..c3a681a 100644 - $(CHMOD) $(RWD_MODE) $(DESTDIR)$(LOG_DEST)/logfile || exit 1 ;\ if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \ if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \ - $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.orig | \ + $(SED) 's+%PROGRAM%+$(PROGRAM)+' slackware/rc.privoxy.in | \ diff --git a/config b/config index 8b20f92..25596d6 100644 --- a/config |