[arch-commits] CVS update of extra/network/ijb (PKGBUILD junkbuster-2.0.2-fixups.patch)

[Eric Belanger]

    Date: Friday, December 14, 2007 @ 02:39:26
  Author: eric
    Path: /home/cvs-extra/extra/network/ijb

 Removed: PKGBUILD (1.4) junkbuster-2.0.2-fixups.patch (1.1)

extra repo cleanup


-------------------------------+
 PKGBUILD                      |   22 ---------
 junkbuster-2.0.2-fixups.patch |   94 ----------------------------------------
 2 files changed, 116 deletions(-)


Index: extra/network/ijb/PKGBUILD
diff -u extra/network/ijb/PKGBUILD:1.4 extra/network/ijb/PKGBUILD:removed
--- extra/network/ijb/PKGBUILD:1.4	Tue Aug  7 22:21:00 2007
+++ extra/network/ijb/PKGBUILD	Fri Dec 14 02:39:26 2007
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD,v 1.4 2007/08/08 02:21:00 eric Exp $
-# Maintainer: dorphell <dorphell at archlinux.org>
-# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-
-pkgname=ijb
-pkgver=20
-pkgrel=1
-pkgdesc="The Internet Junkbuster Proxy (TM) blocks unwanted banner ads and protects your privacy from cookies and other threats"
-arch=('i686' 'x86_64')
-url="http://www.junkbuster.com/"
-license=('GPL')
-depends=('glibc')
-source=(http://www.junkbuster.com/$pkgname$pkgver.zip junkbuster-2.0.2-fixups.patch)
-md5sums=('4a384a649bf7bda12e5c3f8e0b809d08' '5079c8506664725532460b5c6d0e8865')
-
-build() {
-  cd $startdir/src/$pkgname$pkgver
-  patch -p1 < ../junkbuster-2.0.2-fixups.patch || return 1
-  make || return 1
-  install -D -m755 junkbuster $startdir/pkg/usr/bin/junkbuster
-  install -D -m644 junkbuster.1 $startdir/pkg/usr/man/man1/junkbuster.1
-}
Index: extra/network/ijb/junkbuster-2.0.2-fixups.patch
diff -u extra/network/ijb/junkbuster-2.0.2-fixups.patch:1.1 extra/network/ijb/junkbuster-2.0.2-fixups.patch:removed
--- extra/network/ijb/junkbuster-2.0.2-fixups.patch:1.1	Tue Aug  7 22:21:00 2007
+++ extra/network/ijb/junkbuster-2.0.2-fixups.patch	Fri Dec 14 02:39:26 2007
@@ -1,94 +0,0 @@
---- ijb20/filters.c
-+++ ijb20/filters.c
-@@ -652,7 +652,7 @@
- ij_untrusted_url(struct http_request *http, struct client_state *csp)
- {
- 	int n;
--	char *hostport, *path, *p, *v[9];
-+	char *hostport, *path, *referrer, *p, *v[9];
- 	char buf[BUFSIZ];
- 	struct url_spec **tl, *t;
- 
-@@ -700,9 +700,9 @@
- 	freez(hostport);
- 	freez(path    );
- 
--	strsav(p, "The referrer in this request was <strong>");
--	strsav(p, referrer);
--	strsav(p, "</strong><br>\n");
-+	p = strsav(p, "The referrer in this request was <strong>");
-+	p = strsav(p, referrer);
-+	p = strsav(p, "</strong><br>\n");
- 
- 	p = strsav(p, "<h3>The following referrers are trusted</h3>\n");
- 
---- ijb20/socks4.c
-+++ ijb20/socks4.c
-@@ -9,6 +9,7 @@
- #include <stdio.h>
- #include <sys/types.h>
- #include <errno.h>
-+#include <string.h>
- 
- #ifdef _WIN32
- #include <io.h>
-@@ -56,7 +57,7 @@
- 	unsigned char sbuf[BUFSIZ];
- 	struct socks_op    *c = (struct socks_op    *)cbuf;
- 	struct socks_reply *s = (struct socks_reply *)sbuf;
--	int web_server_addr;
-+	int web_server_addr = 0;
- 	int n, csiz, sfd, target_port;
- 	int err = 0;
- 	char *errstr, *target_host;
---- ijb20/ssplit.c
-+++ ijb20/ssplit.c
-@@ -19,6 +19,9 @@
-  */
- 
- #include <string.h>
-+#include <stdlib.h>
-+
-+extern void *zalloc(int);
- 
- int ssplit(char *s, char *c, char *v[], int n, int m, int l)
- {
---- ijb20/Makefile
-+++ ijb20/Makefile
-@@ -67,7 +67,7 @@
- #MORE_CFLAGS = -relax_pointers
- #LDFLAGS = -map junkbuster.xMAP
- 
--CFLAGS  = $(DEFAULT_CFLAGS) $(MORE_CFLAGS)
-+CFLAGS  += $(DEFAULT_CFLAGS) $(MORE_CFLAGS)
- 
- OBJS =	jcc.$(O) parsers.$(O) filters.$(O) loaders.$(O) bind.$(O) conn.$(O) \
- 	encode.$(O) ssplit.$(O) socks4.$(O) acl.$(O) gnu_regex.$(O) win32.$(O)
---- ijb20/jcc.h
-+++ ijb20/jcc.h
-@@ -39,6 +39,12 @@
- extern char *from;
- extern char *suppress_message; /* anw */
- 
-+struct list {
-+	char *str;
-+	struct list *last;
-+	struct list *next;
-+};
-+
- extern struct list       wafer_list[];
- extern struct list        xtra_list[];
- extern struct list       trust_info[];
-@@ -90,12 +96,6 @@
- 	int   ssl;
- };
- 
--struct list {
--	char *str;
--	struct list *last;
--	struct list *next;
--};
--
- int add_to_iob();
- 
- #define IOB_PEEK(CSP) ((CSP->iob->cur > CSP->iob->eod) ? (CSP->iob->eod - CSP->iob->cur) : 0)