diff options
Diffstat (limited to 'net-proxy/polipo/files')
| -rw-r--r-- | net-proxy/polipo/files/config | 8 | ||||
| -rw-r--r-- | net-proxy/polipo/files/polipo-1.1.1-cve-2020-36420.patch | 26 | ||||
| -rw-r--r-- | net-proxy/polipo/files/polipo.crond-2 | 22 | ||||
| -rw-r--r-- | net-proxy/polipo/files/polipo.initd-5 | 65 | ||||
| -rw-r--r-- | net-proxy/polipo/files/polipo_at.service | 11 |
5 files changed, 0 insertions, 132 deletions
diff --git a/net-proxy/polipo/files/config b/net-proxy/polipo/files/config deleted file mode 100644 index 4c9235582594..000000000000 --- a/net-proxy/polipo/files/config +++ /dev/null @@ -1,8 +0,0 @@ -daemonise=false -diskCacheRoot=/var/cache/polipo/ -proxyAddress=127.0.0.1 -proxyName=localhost -serverSlots=4 -serverMaxSlots=8 -cacheIsShared=true -allowedClients=127.0.0.1 diff --git a/net-proxy/polipo/files/polipo-1.1.1-cve-2020-36420.patch b/net-proxy/polipo/files/polipo-1.1.1-cve-2020-36420.patch deleted file mode 100644 index 20fca8cf30a5..000000000000 --- a/net-proxy/polipo/files/polipo-1.1.1-cve-2020-36420.patch +++ /dev/null @@ -1,26 +0,0 @@ -Reject packet with malformed range field instead of raising assert. -This fixes CVE-2020-36420 and makes polipo conformant to RFC7233. ---- a/server.c 2014-05-15 02:19:43.000000000 +0400 -+++ b/server.c 2021-08-11 13:42:55.156568391 +0300 -@@ -1468,7 +1468,6 @@ - int port; - int x, y, z; - -- assert(from >= 0 && (to < 0 || to > from)); - assert(closure == NULL); - assert(!(object->flags & OBJECT_LOCAL)); - assert(object->type == OBJECT_HTTP); -@@ -1499,6 +1498,13 @@ - notifyObject(object); - return 1; - } -+ -+ if(!(from >= 0 && (to < 0 || to > from))) { -+ do_log(L_ERROR, "Invalid Range field in the header: from=%d, to=%d.\n", from, to); -+ abortObject(object, 400, internAtom("Invalid range header field")); -+ notifyObject(object); -+ return 1; -+ } - - memcpy(name, ((char*)object->key) + x, y - x); - name[y - x] = '\0'; diff --git a/net-proxy/polipo/files/polipo.crond-2 b/net-proxy/polipo/files/polipo.crond-2 deleted file mode 100644 index 6b2d609d6d6a..000000000000 --- a/net-proxy/polipo/files/polipo.crond-2 +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -# Loop through all init.d instances -for f in /etc/init.d/polipo*; do - # only proceed if daemon is running - "${f}" --quiet status || continue - - myname="${f#/etc/init.d/polipo}" - conffile="/etc/polipo/config${myname}" - pidfile="/var/run/polipo${myname}.pid" - - # check if disk cache is enabled - polipo -v -c "${CONFFILE}" | - awk '$1 ~ /diskCacheRoot/ { if ($3 == "(none)") exit 1}' || - continue - - # Expire old cached objects - kill -USR1 $(cat "${pidfile}") - sleep 1 - nice -n 15 su -s "/bin/sh" -c "polipo -c ${conffile} -x" polipo > /dev/null - kill -USR2 $(cat "${pidfile}") -done diff --git a/net-proxy/polipo/files/polipo.initd-5 b/net-proxy/polipo/files/polipo.initd-5 deleted file mode 100644 index 08f3394eda68..000000000000 --- a/net-proxy/polipo/files/polipo.initd-5 +++ /dev/null @@ -1,65 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -CONFFILE="/etc/polipo/config${SVCNAME#polipo}" -PIDFILE="/var/run/${SVCNAME}.pid" - -depend() { - use net -} - -checkconfig() { - { polipo -v -c "${CONFFILE}" || return 1 ; } | { - local retvalue=0 - local name type value desc - while read name type value desc ; do - case ${name} in - configFile) - if [ "${value}" = "(none)" ] ; then - eerror "Unable to read configuration file /etc/polipo/config" - retvalue=1 - fi - ;; - daemonise) - if [ "${value}" != "false" ] ; then - eerror "Configuration option not supported by this init script: ${name}=${value}" - retvalue=1 - fi - ;; - pidFile) - if [ "${value}" != "(none)" ] ; then - eerror "Configuration option not supported by this init script: ${name}=${value}" - retvalue=1 - fi - ;; - diskCacheRoot) - if [ "${value}" != "(none)" ] ; then - # Ensure that cache directory exists and have proper permissions - if ! [ -d "{value}" ]; then - mkdir -p -m 0750 "${value}" - chown polipo:polipo "${value}" - fi - fi - ;; - esac - done - return ${retvalue} - } -} - -start() { - checkconfig || return 1 - - ebegin "Starting ${SVCNAME} HTTP proxy" - start-stop-daemon --start --user polipo \ - --background --pidfile "${PIDFILE}" --make-pidfile \ - --exec /usr/bin/polipo -- -c "${CONFFILE}" - eend $? -} - -stop() { - ebegin "Stopping ${SVCNAME} HTTP proxy" - start-stop-daemon --stop --pidfile "${PIDFILE}" - eend $? -} diff --git a/net-proxy/polipo/files/polipo_at.service b/net-proxy/polipo/files/polipo_at.service deleted file mode 100644 index 5018ac6c75e0..000000000000 --- a/net-proxy/polipo/files/polipo_at.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Polipo Proxy Server -After=network.target - -[Service] -ExecStart=/usr/bin/polipo -c /etc/polipo/%i -User=polipo -PrivateDevices=yes - -[Install] -WantedBy=multi-user.target |