diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-proxy/tinyproxy | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-proxy/tinyproxy')
-rw-r--r-- | net-proxy/tinyproxy/Manifest | 1 | ||||
-rw-r--r-- | net-proxy/tinyproxy/files/tinyproxy-1.8.1-ldflags.patch | 11 | ||||
-rw-r--r-- | net-proxy/tinyproxy/files/tinyproxy-1.8.1-minimal.patch | 10 | ||||
-rw-r--r-- | net-proxy/tinyproxy/files/tinyproxy-1.8.2.initd | 45 | ||||
-rw-r--r-- | net-proxy/tinyproxy/files/tinyproxy-1.8.3-r2-DoS-Prevention.patch | 183 | ||||
-rw-r--r-- | net-proxy/tinyproxy/files/tinyproxy-1.8.3-r2.initd | 41 | ||||
-rw-r--r-- | net-proxy/tinyproxy/files/tinyproxy-1.8.3.initd | 41 | ||||
-rw-r--r-- | net-proxy/tinyproxy/files/tinyproxy.service | 9 | ||||
-rw-r--r-- | net-proxy/tinyproxy/files/tinyproxy.tmpfiles.conf | 1 | ||||
-rw-r--r-- | net-proxy/tinyproxy/metadata.xml | 13 | ||||
-rw-r--r-- | net-proxy/tinyproxy/tinyproxy-1.8.3-r3.ebuild | 85 |
11 files changed, 440 insertions, 0 deletions
diff --git a/net-proxy/tinyproxy/Manifest b/net-proxy/tinyproxy/Manifest new file mode 100644 index 000000000000..dd9d4489eb1f --- /dev/null +++ b/net-proxy/tinyproxy/Manifest @@ -0,0 +1 @@ +DIST tinyproxy-1.8.3.tar.bz2 202430 SHA256 be559b54eb4772a703ad35239d1cb59d32f7cf8a739966742622d57df88b896e SHA512 69f1262b39d37f44a42621a0d25985632cdb790c8d9b49335a49a68c0f5237b97b111252856cba119895ac066770645560d2d7cd2de31f02103fa55fb4b3290c WHIRLPOOL f423b49e7cef6c98f69070e0598f4447cf8333cfc9e253dd6c459541922e5b2ed5c7604dc2e3f3de61a616d6381ff83df1625a8ad40a83d32d44f633ac98447c diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.8.1-ldflags.patch b/net-proxy/tinyproxy/files/tinyproxy-1.8.1-ldflags.patch new file mode 100644 index 000000000000..bd40ec33e31a --- /dev/null +++ b/net-proxy/tinyproxy/files/tinyproxy-1.8.1-ldflags.patch @@ -0,0 +1,11 @@ +--- a/configure.ac 2010-03-09 12:41:45.000000000 +0100 ++++ b/configure.ac 2010-05-17 23:07:39.000000000 +0200 +@@ -222,7 +222,7 @@ + CFLAGS="-DNDEBUG $CFLAGS" + fi + +-LDFLAGS="-Wl,-z,defs" ++LDFLAGS="$LDFLAGS -Wl,-z,defs" + + dnl + dnl Make sure we can actually handle the "--with-*" and "--enable-*" stuff. diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.8.1-minimal.patch b/net-proxy/tinyproxy/files/tinyproxy-1.8.1-minimal.patch new file mode 100644 index 000000000000..82793a8894d0 --- /dev/null +++ b/net-proxy/tinyproxy/files/tinyproxy-1.8.1-minimal.patch @@ -0,0 +1,10 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -2,7 +2,6 @@ + src \ + data \ + etc \ +- docs \ + m4macros \ + tests + diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.8.2.initd b/net-proxy/tinyproxy/files/tinyproxy-1.8.2.initd new file mode 100644 index 000000000000..d55aaaea5154 --- /dev/null +++ b/net-proxy/tinyproxy/files/tinyproxy-1.8.2.initd @@ -0,0 +1,45 @@ +#!/sbin/runscript +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +CONFFILE="/etc/${SVCNAME}.conf" + +depend() { + use logger dns + need net +} + +checkconfig() { + if [ ! -f "${CONFFILE}" ]; then + eerror "Configuration file ${CONFFILE} not found!" + return 1 + fi + + PIDFILE=$(sed -n -e 's/^[[:space:]]*PidFile[[:space:]]\+"\(.*\)"[[:space:]]*$/\1/p' "${CONFFILE}") + return 0 +} + +start() { + checkconfig || return 1 + + ebegin "Starting tinyproxy" + if [ -n "${PIDFILE}" ]; then + start-stop-daemon --start --pidfile "${PIDFILE}" --startas /usr/sbin/tinyproxy -- -c "${CONFFILE}" + else + start-stop-daemon --start --exec /usr/sbin/tinyproxy -- -c "${CONFFILE}" + fi + eend $? +} + +stop() { + checkconfig || return 1 + + ebegin "Stopping tinyproxy" + if [ -n "${PIDFILE}" ]; then + start-stop-daemon --stop --pidfile "${PIDFILE}" + else + start-stop-daemon --stop --exec /usr/sbin/tinyproxy + fi + eend $? +} diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.8.3-r2-DoS-Prevention.patch b/net-proxy/tinyproxy/files/tinyproxy-1.8.3-r2-DoS-Prevention.patch new file mode 100644 index 000000000000..059f178c1ee2 --- /dev/null +++ b/net-proxy/tinyproxy/files/tinyproxy-1.8.3-r2-DoS-Prevention.patch @@ -0,0 +1,183 @@ +https://banu.com/bugzilla/show_bug.cgi?id=110#c4 + +From 526215dbb4abb1cff9a170343fa50dbda9492eb1 Mon Sep 17 00:00:00 2001 +From: Michael Adam <obnox@samba.org> +Date: Fri, 15 Mar 2013 12:34:01 +0100 +Subject: [PATCH 1/2] [BB#110] secure the hashmaps by adding a seed + +Based on patch provided by gpernot@praksys.org on bugzilla. + +Signed-off-by: Michael Adam <obnox@samba.org> +--- + configure.ac | 2 ++ + src/child.c | 1 + + src/hashmap.c | 14 ++++++++------ + 3 files changed, 11 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ecbcba0..cc40e85 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -205,6 +205,8 @@ AC_CHECK_FUNCS([gethostname inet_ntoa memchr memset select socket strcasecmp \ + AC_CHECK_FUNCS([isascii memcpy setrlimit ftruncate regcomp regexec]) + AC_CHECK_FUNCS([strlcpy strlcat]) + ++AC_CHECK_FUNCS([time rand srand]) ++ + + dnl Enable extra warnings + DESIRED_FLAGS="-fdiagnostics-show-option -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Wfloat-equal -Wundef -Wformat=2 -Wlogical-op -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Waggregate-return -Winit-self -Wpacked --std=c89 -ansi -pedantic -Wno-overlength-strings -Wc++-compat -Wno-long-long -Wno-overlength-strings -Wdeclaration-after-statement -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-qual -Wcast-align -Wwrite-strings -Wp,-D_FORTIFY_SOURCE=2 -fno-common" +diff --git a/src/child.c b/src/child.c +index 34e20e0..0d778d9 100644 +--- a/src/child.c ++++ b/src/child.c +@@ -196,6 +196,7 @@ static void child_main (struct child_s *ptr) + } + + ptr->connects = 0; ++ srand(time(NULL)); + + while (!config.quit) { + ptr->status = T_WAITING; +diff --git a/src/hashmap.c b/src/hashmap.c +index f46fdcb..8cf7c6b 100644 +--- a/src/hashmap.c ++++ b/src/hashmap.c +@@ -50,6 +50,7 @@ struct hashbucket_s { + }; + + struct hashmap_s { ++ uint32_t seed; + unsigned int size; + hashmap_iter end_iterator; + +@@ -65,7 +66,7 @@ struct hashmap_s { + * + * If any of the arguments are invalid a negative number is returned. + */ +-static int hashfunc (const char *key, unsigned int size) ++static int hashfunc (const char *key, unsigned int size, uint32_t seed) + { + uint32_t hash; + +@@ -74,7 +75,7 @@ static int hashfunc (const char *key, unsigned int size) + if (size == 0) + return -ERANGE; + +- for (hash = tolower (*key++); *key != '\0'; key++) { ++ for (hash = seed; *key != '\0'; key++) { + uint32_t bit = (hash & 1) ? (1 << (sizeof (uint32_t) - 1)) : 0; + + hash >>= 1; +@@ -104,6 +105,7 @@ hashmap_t hashmap_create (unsigned int nbuckets) + if (!ptr) + return NULL; + ++ ptr->seed = (uint32_t)rand(); + ptr->size = nbuckets; + ptr->buckets = (struct hashbucket_s *) safecalloc (nbuckets, + sizeof (struct +@@ -201,7 +203,7 @@ hashmap_insert (hashmap_t map, const char *key, const void *data, size_t len) + if (!data || len < 1) + return -ERANGE; + +- hash = hashfunc (key, map->size); ++ hash = hashfunc (key, map->size, map->seed); + if (hash < 0) + return hash; + +@@ -382,7 +384,7 @@ ssize_t hashmap_search (hashmap_t map, const char *key) + if (map == NULL || key == NULL) + return -EINVAL; + +- hash = hashfunc (key, map->size); ++ hash = hashfunc (key, map->size, map->seed); + if (hash < 0) + return hash; + +@@ -416,7 +418,7 @@ ssize_t hashmap_entry_by_key (hashmap_t map, const char *key, void **data) + if (!map || !key || !data) + return -EINVAL; + +- hash = hashfunc (key, map->size); ++ hash = hashfunc (key, map->size, map->seed); + if (hash < 0) + return hash; + +@@ -451,7 +453,7 @@ ssize_t hashmap_remove (hashmap_t map, const char *key) + if (map == NULL || key == NULL) + return -EINVAL; + +- hash = hashfunc (key, map->size); ++ hash = hashfunc (key, map->size, map->seed); + if (hash < 0) + return hash; + +-- +1.7.9.5 + +https://banu.com/bugzilla/show_bug.cgi?id=110#c5 + +From f1189daec6866efeb44f24073cd19d7ece86e537 Mon Sep 17 00:00:00 2001 +From: Michael Adam <obnox@samba.org> +Date: Fri, 15 Mar 2013 13:10:01 +0100 +Subject: [PATCH 2/2] [BB#110] limit the number of headers per request to + prevent DoS + +Based on patch provided by gpernot@praksys.org on bugzilla. + +Signed-off-by: Michael Adam <obnox@samba.org> +--- + src/reqs.c | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +diff --git a/src/reqs.c b/src/reqs.c +index 2de43a8..af014ba 100644 +--- a/src/reqs.c ++++ b/src/reqs.c +@@ -611,12 +611,19 @@ add_header_to_connection (hashmap_t hashofheaders, char *header, size_t len) + } + + /* ++ * define max number of headers. ++ * big enough to handle legitimate cases, but limited to avoid DoS ++ */ ++#define MAX_HEADERS 10000 ++ ++/* + * Read all the headers from the stream + */ + static int get_all_headers (int fd, hashmap_t hashofheaders) + { + char *line = NULL; + char *header = NULL; ++ int count; + char *tmp; + ssize_t linelen; + ssize_t len = 0; +@@ -625,7 +632,7 @@ static int get_all_headers (int fd, hashmap_t hashofheaders) + assert (fd >= 0); + assert (hashofheaders != NULL); + +- for (;;) { ++ for (count = 0; count < MAX_HEADERS; count++) { + if ((linelen = readline (fd, &line)) <= 0) { + safefree (header); + safefree (line); +@@ -691,6 +698,14 @@ static int get_all_headers (int fd, hashmap_t hashofheaders) + + safefree (line); + } ++ ++ /* ++ * if we get there, this is we reached MAX_HEADERS count ++ * bail out with error ++ */ ++ safefree (header); ++ safefree (line); ++ return -1; + } + + /* +-- +1.7.9.5 diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.8.3-r2.initd b/net-proxy/tinyproxy/files/tinyproxy-1.8.3-r2.initd new file mode 100644 index 000000000000..6342a5dce18e --- /dev/null +++ b/net-proxy/tinyproxy/files/tinyproxy-1.8.3-r2.initd @@ -0,0 +1,41 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +get_config() { + res=$(awk '$1 == "'$1'" { s=$2 } END { print s }' "$CONFFILE") + + if [ "x$res" = "x" ]; then + echo "$2" + else + eval echo "$res" + fi +} + +: ${CONFFILE:="/etc/${SVCNAME}.conf"} + +command=/usr/sbin/tinyproxy +command_args="-c ${CONFFILE}" +pidfile=$(get_config PidFile /run/tinyproxy/${SVCNAME}.pid) + +depend() { + config "$CONFFILE" + + use dns + + [ "$(get_config Syslog Off)" = "On" ] && \ + use logger +} + +start_pre() { + piddir=$(dirname ${pidfile}) + + if [ "${piddir}" = "/run" ]; then + eerror "Please change your PidFile settings to be within the" + eerror "/run/tinyproxy directory" + eend 1 + else + checkpath -d -o $(get_config User tinyproxy):$(get_config Group tinyproxy) ${piddir} + fi +} diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.8.3.initd b/net-proxy/tinyproxy/files/tinyproxy-1.8.3.initd new file mode 100644 index 000000000000..0539996033eb --- /dev/null +++ b/net-proxy/tinyproxy/files/tinyproxy-1.8.3.initd @@ -0,0 +1,41 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +get_config() { + res=$(awk '$1 == "'$1'" { s=$2 } END { print s }' "$CONFFILE") + + if [ "x$res" = "x" ]; then + echo "$2" + else + eval echo "$res" + fi +} + +: ${CONFFILE:="/etc/${SVCNAME}.conf"} + +command=/usr/sbin/tinyproxy +command_args="-c ${CONFFILE}" +pidfile=$(get_config PidFile /var/run/tinyproxy/${SVCNAME}.pid) + +depend() { + config "$CONFFILE" + + use dns + + [ "$(get_config Syslog Off)" = "On" ] && \ + use logger +} + +start_pre() { + piddir=$(dirname ${pidfile}) + + if [ "${piddir}" = "/var/run" ]; then + eerror "Please change your PidFile settings to be within the" + eerror "/var/run/tinyproxy directory" + eend 1 + else + checkpath -d -o $(get_config User tinyproxy):$(get_config Group tinyproxy) ${piddir} + fi +} diff --git a/net-proxy/tinyproxy/files/tinyproxy.service b/net-proxy/tinyproxy/files/tinyproxy.service new file mode 100644 index 000000000000..4d860df76938 --- /dev/null +++ b/net-proxy/tinyproxy/files/tinyproxy.service @@ -0,0 +1,9 @@ +[Unit] +Description=Tinyproxy Web Proxy Server +After=network.target + +[Service] +ExecStart=/usr/sbin/tinyproxy -d -c /etc/tinyproxy.conf + +[Install] +WantedBy=multi-user.target diff --git a/net-proxy/tinyproxy/files/tinyproxy.tmpfiles.conf b/net-proxy/tinyproxy/files/tinyproxy.tmpfiles.conf new file mode 100644 index 000000000000..80251df0d20c --- /dev/null +++ b/net-proxy/tinyproxy/files/tinyproxy.tmpfiles.conf @@ -0,0 +1 @@ +d /var/run/tinyproxy 0770 tinyproxy tinyproxy - diff --git a/net-proxy/tinyproxy/metadata.xml b/net-proxy/tinyproxy/metadata.xml new file mode 100644 index 000000000000..32a47aa24c86 --- /dev/null +++ b/net-proxy/tinyproxy/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<maintainer><email>maintainer-needed@gentoo.org</email></maintainer> +<longdescription>A lightweight HTTP/SSL proxy</longdescription> +<use> + <flag name='filter-proxy'>Enable filtering of domains/URLS</flag> + <flag name='reverse-proxy'>Enable reverse proxying</flag> + <flag name='transparent-proxy'>Enable transparent proxying</flag> + <flag name='upstream-proxy'>Enable upstream proxying</flag> + <flag name='xtinyproxy-header'>Include the X-Tinyproxy header</flag> +</use> +</pkgmetadata> diff --git a/net-proxy/tinyproxy/tinyproxy-1.8.3-r3.ebuild b/net-proxy/tinyproxy/tinyproxy-1.8.3-r3.ebuild new file mode 100644 index 000000000000..f31cf7d3f297 --- /dev/null +++ b/net-proxy/tinyproxy/tinyproxy-1.8.3-r3.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit autotools eutils systemd user + +DESCRIPTION="A lightweight HTTP/SSL proxy" +HOMEPAGE="http://www.banu.com/tinyproxy/" +SRC_URI="http://www.banu.com/pub/${PN}/1.8/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 ~arm ia64 ppc sparc x86" + +IUSE="test debug +filter-proxy minimal reverse-proxy + transparent-proxy +upstream-proxy +xtinyproxy-header" + +REQUIRED_USE="test? ( xtinyproxy-header )" + +DEPEND="!minimal? ( app-text/asciidoc )" + +pkg_setup() { + enewgroup ${PN} + enewuser ${PN} "" "" "" ${PN} +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.8.1-ldflags.patch + epatch "${FILESDIR}"/${P}-r2-DoS-Prevention.patch + + use minimal && epatch "${FILESDIR}/${PN}-1.8.1-minimal.patch" + + sed -i \ + -e "s|nobody|${PN}|g" \ + -e 's|/var/run/|/run/|g' \ + etc/${PN}.conf.in || die "sed failed" + + sed -i \ + -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' \ + configure.ac || die + + eautoreconf +} + +src_configure() { + if use minimal; then + ln -s /bin/true "${T}"/a2x + export PATH="${T}:${PATH}" + fi + + econf \ + $(use_enable debug) \ + $(use_enable filter-proxy filter) \ + $(use_enable reverse-proxy reverse) \ + $(use_enable transparent-proxy transparent) \ + $(use_enable upstream-proxy upstream) \ + $(use_enable xtinyproxy-header xtinyproxy) \ + --disable-silent-rules \ + --localstatedir=/var +} + +src_test() { + # The make check target does not run the test suite + emake test +} + +src_install() { + default + + dodoc AUTHORS ChangeLog NEWS README TODO + + diropts -m0775 -o ${PN} -g ${PN} + keepdir /var/log/${PN} + + newinitd "${FILESDIR}"/${PN}-1.8.3-r2.initd tinyproxy + systemd_dounit "${FILESDIR}"/${PN}.service + systemd_dotmpfilesd "${FILESDIR}"/${PN}.tmpfiles.conf +} + +pkg_postinst() { + elog "For filtering domains and URLs, enable filter option in the configuration" + elog "file and add them to the filter file (one domain or URL per line)." +} |