touchups and arm love

Package-Manager: portage-2.0.53

3 files changed, 50 insertions, 29 deletions

diff --git a/net-proxy/junkbuster/Manifest b/net-proxy/junkbuster/Manifest
index 3fd1cbaeabca..73f5da161ee7 100644
--- a/net-proxy/junkbuster/Manifest
+++ b/net-proxy/junkbuster/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 15fbc0d9bea8fbe199e524442d9804a4 ChangeLog 2294
-MD5 47113e45f70498a1a8bb442e5a0a8634 junkbuster-2.0.2-r3.ebuild 1005
-MD5 1d7888b1ea9ce027a9822471cd49a627 metadata.xml 218
 MD5 144473c056c1fe200cf39e691a8417ba files/digest-junkbuster-2.0.2-r3 70
-MD5 77a51c2ad0d03e74b67b9f6caa0d4048 files/junkbuster-2.0.2-fixups.patch 1871
+MD5 ef238cf40fce667ac4bcc1a2249f9e8f files/junkbuster-2.0.2-fixups.patch 2154
 MD5 362740b7af3aedc5db2c0a659e695af8 files/junkbuster.rc6 583
+MD5 f186de9faf629b6fdc8e5fb8ea2d02bf junkbuster-2.0.2-r3.ebuild 883
+MD5 1d7888b1ea9ce027a9822471cd49a627 metadata.xml 218
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDrINR2+ySkm8kpY0RAlgQAKCV9Go81ERb7pRjBQt4aiTjDvPpOgCfYtlp
+fJb2PEF011TvpQw6WxmCn2k=
+=aXjJ
+-----END PGP SIGNATURE-----
diff --git a/net-proxy/junkbuster/files/junkbuster-2.0.2-fixups.patch b/net-proxy/junkbuster/files/junkbuster-2.0.2-fixups.patch
index 47ed33eed0d0..434469a94b54 100644
--- a/net-proxy/junkbuster/files/junkbuster-2.0.2-fixups.patch
+++ b/net-proxy/junkbuster/files/junkbuster-2.0.2-fixups.patch
@@ -1,6 +1,5 @@
-diff -Nru ijb20.orig/filters.c ijb20/filters.c
---- ijb20.orig/filters.c	2000-03-29 16:05:42.000000000 +0300
-+++ ijb20/filters.c	2005-04-12 22:54:06.295702048 +0300
+--- ijb20/filters.c
++++ ijb20/filters.c
 @@ -652,7 +652,7 @@
  ij_untrusted_url(struct http_request *http, struct client_state *csp)
  {
@@ -32,9 +31,8 @@ diff -Nru ijb20.orig/filters.c ijb20/filters.c
  				urls_read, urls_rejected+1, perc_rej);
  
  			s = strsav(s,out_str);
-diff -Nru ijb20.orig/socks4.c ijb20/socks4.c
---- ijb20.orig/socks4.c	1998-10-30 23:58:48.000000000 +0200
-+++ ijb20/socks4.c	2005-04-12 22:44:47.367672024 +0300
+--- ijb20/socks4.c
++++ ijb20/socks4.c
 @@ -9,6 +9,7 @@
  #include <stdio.h>
  #include <sys/types.h>
@@ -52,9 +50,8 @@ diff -Nru ijb20.orig/socks4.c ijb20/socks4.c
  	int n, csiz, sfd, target_port;
  	int err = 0;
  	char *errstr, *target_host;
-diff -Nru ijb20.orig/ssplit.c ijb20/ssplit.c
---- ijb20.orig/ssplit.c	1998-10-30 23:58:48.000000000 +0200
-+++ ijb20/ssplit.c	2005-04-12 22:44:47.368671872 +0300
+--- ijb20/ssplit.c
++++ ijb20/ssplit.c
 @@ -19,6 +19,9 @@
   */
  
@@ -65,3 +62,25 @@ diff -Nru ijb20.orig/ssplit.c ijb20/ssplit.c
  
  int ssplit(char *s, char *c, char *v[], int n, int m, int l)
  {
+--- ijb20/Makefile
++++ ijb20/Makefile
+@@ -8,8 +8,8 @@
+ PROG   = junkbuster
+ O      = o
+ RM     = rm -f
+-CC     = gcc
+-MORE_CFLAGS = -O3 -D_DISTNAME="$(DISTNAME)" -D_DISTURL="$(DISTURL)"
++CC     ?= gcc
++MORE_CFLAGS = -D_DISTNAME="$(DISTNAME)" -D_DISTURL="$(DISTURL)"
+ 
+ # use this for Solaris 2.x
+ #LDFLAGS = -lnsl -lsocket 
+@@ -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)
diff --git a/net-proxy/junkbuster/junkbuster-2.0.2-r3.ebuild b/net-proxy/junkbuster/junkbuster-2.0.2-r3.ebuild
index 7269cdc67eae..d6d510098f4d 100644
--- a/net-proxy/junkbuster/junkbuster-2.0.2-r3.ebuild
+++ b/net-proxy/junkbuster/junkbuster-2.0.2-r3.ebuild
@@ -1,6 +1,7 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/junkbuster/junkbuster-2.0.2-r3.ebuild,v 1.2 2005/07/01 19:49:02 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/junkbuster/junkbuster-2.0.2-r3.ebuild,v 1.3 2005/12/23 23:07:00 vapier Exp $
+
 inherit eutils
 
 DESCRIPTION="Filtering HTTP proxy"
@@ -9,36 +10,27 @@ SRC_URI="http://www.waldherr.org/redhat/rpm/srpm/junkbuster-2.0.2-8.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc ppc ~amd64"
+KEYWORDS="~amd64 arm ppc sparc x86"
 IUSE=""
 
-DEPEND="virtual/libc"
+DEPEND=""
 
 S=${WORKDIR}/ijb20
 
 src_unpack() {
 	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-fixups.patch
-
-	sed -i -e 's:^CFLAGS *=:CFLAGS +=:' ${S}/Makefile
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-fixups.patch
 }
 
 src_install () {
-	dosbin junkbuster
-
-	dodir /etc/init.d
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/junkbuster.rc6 junkbuster
-
-	dodir /etc/junkbuster
+	dosbin junkbuster || die
+	newinitd "${FILESDIR}"/junkbuster.rc6 junkbuster
 	insinto /etc/junkbuster
 	doins blocklist config cookiefile forward imagelist
 
-	dohtml gpl.html ijbman.html ijbfaq.html
+	dohtml ijbman.html ijbfaq.html
 	dodoc README README.TOO README.WIN squid.txt
-
 	doman junkbuster.1
 
 	dodir /var/log/junkbuster