- hey I wanted you deleted

5 files changed, 0 insertions, 266 deletions

diff --git a/net-proxy/middleman/files/conf.d/mman b/net-proxy/middleman/files/conf.d/mman
deleted file mode 100644
index 3ed0e52c7b8e..000000000000
--- a/net-proxy/middleman/files/conf.d/mman
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# MiddleMan filtering proxy server
-#
-LOGFILE=/var/log/mman.log
-CONFIG=/etc/mman/config.xml
-LOGLEVEL=32767
-SECTION=/etc/mman/section.xml
diff --git a/net-proxy/middleman/files/digest-middleman-2.0.1-r2 b/net-proxy/middleman/files/digest-middleman-2.0.1-r2
deleted file mode 100644
index 51552b4c26df..000000000000
--- a/net-proxy/middleman/files/digest-middleman-2.0.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8bf596a4810184c8f7534d63b1e94cf1 middleman-2.0.1.tar.gz 743404
-RMD160 8139602064976c3280a629255f0dafb6e6a1837c middleman-2.0.1.tar.gz 743404
-SHA256 c1a90e62aaec6b7ccfab03259536835f5eeee10fc9ed6a0aa9da083bdf87502a middleman-2.0.1.tar.gz 743404
diff --git a/net-proxy/middleman/files/init.d/mman b/net-proxy/middleman/files/init.d/mman
deleted file mode 100755
index 9412c0ed869a..000000000000
--- a/net-proxy/middleman/files/init.d/mman
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/middleman/files/init.d/mman,v 1.1 2005/04/22 19:15:11 mrness Exp $
-
-
-opts="depend checkconfig stop start"
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ ! -e /etc/mman/config.xml ]; then
-		eerror "You need to create a /etc/mman/config.xml first."
-		return 1
-	fi
-}
-
-stop() {
-	ebegin "Stopping mman"
-	start-stop-daemon --stop --quiet --pidfile /var/run/mman.pid
-	result=$?
-	eend $result
-}
-
-start() {
-	local myopts="-p /var/run/mman.pid"
-	[ "${CONFIG}" != ""  ] && myopts="${myopts} -c ${CONFIG}"
-	[ "${LOGFILE}"  != "" ] && myopts="${myopts} -l ${LOGFILE}"
-	[ "${LOGLEVEL}" != "" ] && myopts="${myopts} -d ${LOGLEVEL}"
-	[ "${SECTION}" != "" ] && myopts="${myopts} -s ${SECTION}"
-
-	ebegin "Starting mman"
-	start-stop-daemon --start --quiet --exec /usr/bin/mman -- ${myopts}
-	result=$?
-	eend $result
-}
diff --git a/net-proxy/middleman/files/middleman-2.0.1-gcc41.patch b/net-proxy/middleman/files/middleman-2.0.1-gcc41.patch
deleted file mode 100644
index 6139eeb51ecb..000000000000
--- a/net-proxy/middleman/files/middleman-2.0.1-gcc41.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nru middleman-2.0.1.orig/src/forward.c middleman-2.0.1/src/forward.c
---- middleman-2.0.1.orig/src/forward.c	2004-03-12 00:27:16.000000000 +0200
-+++ middleman-2.0.1/src/forward.c	2006-09-24 12:23:44.378288750 +0300
-@@ -237,12 +237,12 @@
- 	/* this proxy's address */
- 	icppacket.hostaddr = 0;
- 	if (connection->interface != NULL)
--		inet_pton(AF_INET, connection->interface, (struct addr_in *) &icppacket.hostaddr);
-+		inet_pton(AF_INET, connection->interface, &icppacket.hostaddr);
- 
- 	/* client's address */
- 	memset(icppacket.payload, 0, 4);
- 	if (connection->ip != NULL)
--		inet_pton(AF_INET, connection->ip, (struct addr_in *) &icppacket.payload);
-+		inet_pton(AF_INET, connection->ip, &icppacket.payload);
- 
- 	s_strncpy((char *) &icppacket.payload[4], connection->header->url, ICP_MESSAGE_MAX - 4);
- 
-diff -Nru middleman-2.0.1.orig/src/main.c middleman-2.0.1/src/main.c
---- middleman-2.0.1.orig/src/main.c	2004-03-12 00:28:57.000000000 +0200
-+++ middleman-2.0.1/src/main.c	2005-04-06 21:12:10.580927424 +0300
-@@ -407,7 +407,7 @@
- #else
- 	pcre_free = xfree;
- 	// grr... argument to malloc is int on some systems, and long on others
--	(void *) pcre_malloc = (void *) xmalloc;
-+	pcre_malloc = (void* (*)(size_t)) xmalloc;
- #endif
- 
- 	global->dns_cache = hash_create(DNS_HASH_SIZE);
-diff -Nru middleman-2.0.1.orig/src/stats.c middleman-2.0.1/src/stats.c
---- middleman-2.0.1.orig/src/stats.c	2004-03-12 00:27:16.000000000 +0200
-+++ middleman-2.0.1/src/stats.c	2005-04-06 21:11:29.636151976 +0300
-@@ -175,7 +175,7 @@
- 
- 	sc.name = stat;
- 	sc.type = type | StatCounter::CALLBACK;
--	(void *)sc.value.callback = (void *)cb;
-+	sc.value.callback = (void* (*)())cb;
- 
- 	counter_list.push_back(sc);
- 
-@@ -193,7 +193,7 @@
- 
- 	sc.name = stat;
- 	sc.type = type | StatCounter::CALLBACK;
--	(void *)sc.value.callback = (void *)cb;
-+	sc.value.callback = (void* (*)())cb;
- 
- 	counter_list.push_back(sc);
- 
-diff -Nru middleman-2.0.1.orig/src/template.c middleman-2.0.1/src/template.c
---- middleman-2.0.1.orig/src/template.c	2004-03-12 00:27:16.000000000 +0200
-+++ middleman-2.0.1/src/template.c	2006-09-24 12:05:30.900516250 +0300
-@@ -132,7 +132,7 @@
- 	if (ret != NULL && parsable == TRUE)
- 		template_parse(connection, ret);
- 
--	if (templ != NULL && ret != NULL && code != NULL)
-+	if (ret != NULL && code != NULL)
- 		*code = templ->code;
- 
-       out:
diff --git a/net-proxy/middleman/files/middleman-2.0.1-putlog-fix.patch b/net-proxy/middleman/files/middleman-2.0.1-putlog-fix.patch
deleted file mode 100644
index 27f5931378a8..000000000000
--- a/net-proxy/middleman/files/middleman-2.0.1-putlog-fix.patch
+++ /dev/null
@@ -1,155 +0,0 @@
---- middleman-2.0.1/src/log.c.orig	2004-07-28 15:42:46.389571608 -0400
-+++ middleman-2.0.1/src/log.c	2004-07-28 15:43:11.422765984 -0400
-@@ -30,6 +30,8 @@
- #include <syslog.h>
- #endif				/* USE_SYSLOG */
- 
-+#define LINELEN		512
-+
- int logfd = -1;
- extern int loglevel;
- extern int daemonize;
-@@ -46,105 +48,99 @@
- 	time_t tt;
- 	struct tm *tv;
- #endif
--	int ret;
- 	va_list valist;
--	char buf[1024], *ptr;
-+	char ptr[LINELEN], tmp[LINELEN];
- 
- 	pthread_mutex_lock(&logfile_lock);
- 
--	ptr = buf;
--
- #ifndef USE_SYSLOG
- 	time(&tt);
- 	tv = localtime(&tt);
- 
--	ptr += strftime(ptr, 24, TIMEFORMAT, tv);
-+	strftime(ptr, 24, TIMEFORMAT, tv);
-+	sprintf(tmp, " [%u] ", (unsigned int) getpid());
-+	strcat(ptr, tmp);
- 
--	ptr += sprintf(ptr, " [%u] ", (unsigned int) getpid());
- #endif
- 
- 	switch (level) {
- 	case MMLOG_REQUEST:
--		ptr += sprintf(ptr, "request: ");
-+		strcat(ptr, "request: ");
- 		break;
- 	case MMLOG_NETWORK:
--		ptr += sprintf(ptr, "network: ");
-+		strcat(ptr, "network: ");
- 		break;
- 	case MMLOG_FILTER:
--		ptr += sprintf(ptr, "url filter: ");
-+		strcat(ptr, "url filter: ");
- 		break;
- 	case MMLOG_HEADER:
--		ptr += sprintf(ptr, "header: ");
-+		strcat(ptr, "header: ");
- 		break;
- 	case MMLOG_MIME:
--		ptr += sprintf(ptr, "mime filter: ");
-+		strcat(ptr, "mime filter: ");
- 		break;
- 	case MMLOG_COOKIE:
--		ptr += sprintf(ptr, "cooke filter: ");
-+		strcat(ptr, "cooke filter: ");
- 		break;
- 	case MMLOG_REDIRECT:
--		ptr += sprintf(ptr, "redirect: ");
-+		strcat(ptr, "redirect: ");
- 		break;
- 	case MMLOG_TEMPLATE:
--		ptr += sprintf(ptr, "template: ");
-+		strcat(ptr, "template: ");
- 		break;
- 	case MMLOG_KEYWORDS:
--		ptr += sprintf(ptr, "keyword filter: ");
-+		strcat(ptr, "keyword filter: ");
- 		break;
- 	case MMLOG_REWRITE:
--		ptr += sprintf(ptr, "rewriting: ");
-+		strcat(ptr, "rewriting: ");
- 		break;
- 	case MMLOG_LIMITS:
--		ptr += sprintf(ptr, "limits: ");
-+		strcat(ptr, "limits: ");
- 		break;
- 	case MMLOG_PREFETCH:
--		ptr += sprintf(ptr, "prefetch: ");
-+		strcat(ptr, "prefetch: ");
- 		break;
- 	case MMLOG_CACHE:
--		ptr += sprintf(ptr, "cache: ");
-+		strcat(ptr, "cache: ");
- 		break;
- 	case MMLOG_ICP:
--		ptr += sprintf(ptr, "ICP: ");
-+		strcat(ptr, "ICP: ");
- 		break;
- 	case MMLOG_FORWARD:
--		ptr += sprintf(ptr, "forwarding: ");
-+		strcat(ptr, "forwarding: ");
- 		break;
- 	case MMLOG_SECURITY:
--		ptr += sprintf(ptr, "security: ");
-+		strcat(ptr, "security: ");
- 		break;
- 	case MMLOG_WARN:
--		ptr += sprintf(ptr, "warning: ");
-+		strcat(ptr, "warning: ");
- 		break;
- 	case MMLOG_ERROR:
--		ptr += sprintf(ptr, "error: ");
-+		strcat(ptr, "error: ");
- 		break;
- 	case MMLOG_DEBUG:
--		ptr += sprintf(ptr, "debug: ");
-+		strcat(ptr, "debug: ");
- 		break;
- 	}
- 
- 	va_start(valist, fmt);
--	ret = vsnprintf(ptr, sizeof(buf) - (ptr - buf), fmt, valist);
-+	vsnprintf(tmp, LINELEN - strlen(ptr) - 1, fmt, valist);
- 	va_end(valist);
-+	s_strncat(ptr, tmp, LINELEN - strlen(ptr) - 1);
-+	strcat(ptr, "\n");
- 
--	ptr += (ret > sizeof(buf) || ret == -1) ? sizeof(buf) - (ptr - buf) : ret;
- 
- 	if (level != MMLOG_DEBUG)
--		logbuffer_add(global->logbuffer, buf);
--
--	if (*(ptr - 1) != '\n') {
--		*(ptr++) = '\n';
--		*ptr = '\0';
--	}
-+		logbuffer_add(global->logbuffer, ptr);
- 
- 	if ((loglevel & level) && daemonize == FALSE)
--		printf("%s", buf);
-+		printf("%s", ptr);
- 
- 	if (!*logfile || !(loglevel & level))
- 		goto out;
- 
- #ifdef USE_SYSLOG
--	syslog(LOG_INFO, "%s", buf);
-+	syslog(LOG_INFO, "%s", ptr);
- #else
- 	if (logfd == -1) {
- 		logfd = open(logfile, O_RDWR | O_CREAT, 0640);
-@@ -154,7 +150,7 @@
- 		lseek(logfd, 0, SEEK_END);
- 	}
- 
--	write(logfd, buf, strlen(buf));
-+	write(logfd, ptr, strlen(ptr));
- #endif
-       out:
- 	pthread_mutex_unlock(&logfile_lock);