many fix0rs

14 files changed, 41 insertions, 454 deletions

diff --git a/sys-apps/tcp-wrappers/ChangeLog b/sys-apps/tcp-wrappers/ChangeLog
index 71adba375fef..44800d6e9371 100644
--- a/sys-apps/tcp-wrappers/ChangeLog
+++ b/sys-apps/tcp-wrappers/ChangeLog
@@ -1,12 +1,18 @@
 # ChangeLog for sys-apps/tcp-wrappers
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/ChangeLog,v 1.9 2003/02/09 19:26:55 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/ChangeLog,v 1.10 2003/02/10 09:05:33 seemant Exp $
+
+*tcp-wrappers-7.6-r5.ebuild (16 Dec 2002)
+
+  09 Feb 2003; Seemant Kulleen <seemant@gentoo.org> *.ebuild :
+
+  Moved patchsets to tarballs on the gentoo mirrors.  Also, sed expression
+  delimiters converted from / to : closing bug #15006 by Blu3
+  <david+gentoo.org@blue-labs.org>
 
   09 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
   Added hppa to keywords.
 
-*tcp-wrappers-7.6-r5.ebuild (16 Dec 2002)
-
   16 Dec 2002; Daniel Ahlberg <aliz@gentoo.org> tcp-wrappers-7.6-r5.ebuild :
   Added compilation and installation of libwrap.so, closes #12014. 
   Rewrote parts of ebuild switched to epatch (from eutils) to handle patch files.
diff --git a/sys-apps/tcp-wrappers/files/7.6-patches/01_all_Makefile.patch.bz2 b/sys-apps/tcp-wrappers/files/7.6-patches/01_all_Makefile.patch.bz2
deleted file mode 100644
index 3e7bf03ed446..000000000000
--- a/sys-apps/tcp-wrappers/files/7.6-patches/01_all_Makefile.patch.bz2
+++ /dev/null
diff --git a/sys-apps/tcp-wrappers/files/7.6-patches/02_all_misc.patch.bz2 b/sys-apps/tcp-wrappers/files/7.6-patches/02_all_misc.patch.bz2
deleted file mode 100644
index 6398b245b023..000000000000
--- a/sys-apps/tcp-wrappers/files/7.6-patches/02_all_misc.patch.bz2
+++ /dev/null
diff --git a/sys-apps/tcp-wrappers/files/7.6-patches/03_all_misc.patch.bz2 b/sys-apps/tcp-wrappers/files/7.6-patches/03_all_misc.patch.bz2
deleted file mode 100644
index 31b2f1e42806..000000000000
--- a/sys-apps/tcp-wrappers/files/7.6-patches/03_all_misc.patch.bz2
+++ /dev/null
diff --git a/sys-apps/tcp-wrappers/files/7.6-patches/04_all_ipv6.patch.bz2 b/sys-apps/tcp-wrappers/files/7.6-patches/04_all_ipv6.patch.bz2
deleted file mode 100644
index b1931ab8fb1f..000000000000
--- a/sys-apps/tcp-wrappers/files/7.6-patches/04_all_ipv6.patch.bz2
+++ /dev/null
diff --git a/sys-apps/tcp-wrappers/files/7.6-patches/05_all_tcpd_h.patch.bz2 b/sys-apps/tcp-wrappers/files/7.6-patches/05_all_tcpd_h.patch.bz2
deleted file mode 100644
index d1bc35249c99..000000000000
--- a/sys-apps/tcp-wrappers/files/7.6-patches/05_all_tcpd_h.patch.bz2
+++ /dev/null
diff --git a/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r4 b/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r4
index bca5a7ef66fa..82eb994037c2 100644
--- a/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r4
+++ b/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r4
@@ -1 +1,2 @@
 MD5 e6fa25f71226d090f34de3f6b122fb5a tcp_wrappers_7.6.tar.gz 99438
+MD5 591fdb9956103577889a97454275381a tcp-wrappers-7.6-r4-gentoo.tar.bz2 11377
diff --git a/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r5 b/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r5
index bca5a7ef66fa..84f78c5a2b81 100644
--- a/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r5
+++ b/sys-apps/tcp-wrappers/files/digest-tcp-wrappers-7.6-r5
@@ -1 +1,2 @@
 MD5 e6fa25f71226d090f34de3f6b122fb5a tcp_wrappers_7.6.tar.gz 99438
+MD5 d926682ce0bc067251bc95e87c555ad2 tcp-wrappers-7.6-r5-gentoo.tar.bz2 14289
diff --git a/sys-apps/tcp-wrappers/files/tcp_wrappers_7.6-ipv6-1.6.diff.gz b/sys-apps/tcp-wrappers/files/tcp_wrappers_7.6-ipv6-1.6.diff.gz
deleted file mode 100644
index 55c348c41ef4..000000000000
--- a/sys-apps/tcp-wrappers/files/tcp_wrappers_7.6-ipv6-1.6.diff.gz
+++ /dev/null
diff --git a/sys-apps/tcp-wrappers/files/tcp_wrappers_7.6-stdc.diff b/sys-apps/tcp-wrappers/files/tcp_wrappers_7.6-stdc.diff
deleted file mode 100644
index b63714e9243a..000000000000
--- a/sys-apps/tcp-wrappers/files/tcp_wrappers_7.6-stdc.diff
+++ /dev/null
@@ -1,199 +0,0 @@
---- tcpd.h_orig	2002-04-06 07:40:57.000000000 +0200
-+++ tcpd.h	2002-04-06 07:38:43.000000000 +0200
-@@ -65,17 +65,34 @@
- /* Global functions. */
- 
- #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
-+#ifdef __STDC__
-+extern void fromhost(struct request_info *);			/* get/validate client host info */
-+#else
- extern void fromhost();			/* get/validate client host info */
-+#endif
- #else
- #define fromhost sock_host		/* no TLI support needed */
- #endif
- 
--extern int hosts_access();		/* access control */
--extern void shell_cmd();		/* execute shell command */
--extern char *percent_x();		/* do %<char> expansion */
--extern void rfc931();			/* client name from RFC 931 daemon */
--extern void clean_exit();		/* clean up and exit */
--extern void refuse();			/* clean up and exit */
-+#ifdef __STDC__
-+extern int hosts_access(struct request_info *);		/* access control */
-+extern void shell_cmd(char *);		/* execute shell command */
-+extern char *percent_x(char *, int, char *, struct request_info *);		/* do %<char> expansion */
-+#ifdef INET6
-+extern void rfc931(struct sockaddr *, struct sockaddr *, char *);			/* client name from RFC 931 daemon */
-+#else
-+extern void rfc931(struct sockaddr_in *, struct sockaddr_in *, char *);			/* client name from RFC 931 daemon */
-+#endif
-+extern void clean_exit(struct request_info *);		/* clean up and exit */
-+extern void refuse(struct request_info *);			/* clean up and exit */
-+#else
-+extern int hosts_access();     /* access control */
-+extern void shell_cmd();	   /* execute shell command */
-+extern char *percent_x();	   /* do %<char> expansion */
-+extern void rfc931();		   /* client name from RFC 931 daemon */
-+extern void clean_exit();	   /* clean up and exit */
-+extern void refuse();		   /* clean up and exit */
-+#endif
- extern char *xgets();			/* fgets() on steroids */
- extern char *split_at();		/* strchr() and split */
- extern unsigned long dot_quad_addr();	/* restricted inet_addr() */
-@@ -121,28 +134,47 @@
-   * host_info structures serve as caches for the lookup results.
-   */
- 
--extern char *eval_user();		/* client user */
--extern char *eval_hostname();		/* printable hostname */
--extern char *eval_hostaddr();		/* printable host address */
--extern char *eval_hostinfo();		/* host name or address */
--extern char *eval_client();		/* whatever is available */
--extern char *eval_server();		/* whatever is available */
-+#ifdef __STDC__
-+extern char *eval_user(struct request_info *);		/* client user */
-+extern char *eval_hostname(struct host_info *);		/* printable hostname */
-+extern char *eval_hostaddr(struct host_info *);		/* printable host address */
-+extern char *eval_hostinfo(struct host_info *);		/* host name or address */
-+extern char *eval_client(struct request_info *);		/* whatever is available */
-+extern char *eval_server(struct request_info *);		/* whatever is available */
-+#else
-+extern char *eval_user();	   /* client user */
-+extern char *eval_hostname();	   /* printable hostname */
-+extern char *eval_hostaddr();	   /* printable host address */
-+extern char *eval_hostinfo();	   /* host name or address */
-+extern char *eval_client(); 	   /* whatever is available */
-+extern char *eval_server(); 	   /* whatever is available */
-+#endif
- #define eval_daemon(r)	((r)->daemon)	/* daemon process name */
- #define eval_pid(r)	((r)->pid)	/* process id */
- 
- /* Socket-specific methods, including DNS hostname lookups. */
- 
--extern void sock_host();		/* look up endpoint addresses */
--extern void sock_hostname();		/* translate address to hostname */
--extern void sock_hostaddr();		/* address to printable address */
-+#ifdef __STDC__
-+extern void sock_host(struct request_info *);		/* look up endpoint addresses */
-+extern void sock_hostname(struct host_info *);		/* translate address to hostname */
-+extern void sock_hostaddr(struct host_info *);		/* address to printable address */
-+#else
-+extern void sock_host();	   /* look up endpoint addresses */
-+extern void sock_hostname();	   /* translate address to hostname */
-+extern void sock_hostaddr();	   /* address to printable address */
-+#endif
- #define sock_methods(r) \
- 	{ (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }
- 
- /* The System V Transport-Level Interface (TLI) interface. */
- 
- #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
-+#ifdef __STDC__
-+extern void tli_host(struct request_info *);			/* look up endpoint addresses etc. */
-+#else
- extern void tli_host();			/* look up endpoint addresses etc. */
- #endif
-+#endif
- 
-  /*
-   * Problem reporting interface. Additional file/line context is reported
-@@ -182,42 +214,70 @@
-   * behavior.
-   */
- 
--extern void process_options();		/* execute options */
-+extern void process_options(char *, struct request_info *);		/* execute options */
- extern int dry_run;			/* verification flag */
- 
- /* Bug workarounds. */
- 
- #ifdef INET_ADDR_BUG			/* inet_addr() returns struct */
- #define inet_addr fix_inet_addr
-+#ifdef __STDC__
-+extern long fix_inet_addr(char *);
-+#else
- extern long fix_inet_addr();
- #endif
-+#endif
- 
- #ifdef BROKEN_FGETS			/* partial reads from sockets */
- #define fgets fix_fgets
-+#ifdef __STDC__
-+extern char *fix_fgets(char *, int, FILE *);
-+#else
- extern char *fix_fgets();
- #endif
-+#endif
- 
- #ifdef RECVFROM_BUG			/* no address family info */
- #define recvfrom fix_recvfrom
-+#ifdef __STDC__
-+extern int fix_recvfrom(int, char *, int, int, struct sockaddr *, int);
-+#else
- extern int fix_recvfrom();
- #endif
-+#endif
- 
- #ifdef GETPEERNAME_BUG			/* claims success with UDP */
- #define getpeername fix_getpeername
-+#ifdef __STDC__
-+extern int fix_getpeername(int, struct sockaddr *, int*);
-+#else
- extern int fix_getpeername();
- #endif
-+#endif
- 
- #ifdef SOLARIS_24_GETHOSTBYNAME_BUG	/* lists addresses as aliases */
- #define gethostbyname fix_gethostbyname
-+#ifdef __STDC__
-+extern struct hostent *fix_gethostbyname(char *, char *);
-+#else
- extern struct hostent *fix_gethostbyname();
- #endif
-+#endif
- 
- #ifdef USE_STRSEP			/* libc calls strtok() */
- #define strtok	fix_strtok
-+#ifdef __STDC__
-+extern char *fix_strtok(char *, char *);
-+#else
- extern char *fix_strtok();
- #endif
-+#endif
- 
- #ifdef LIBC_CALLS_STRTOK		/* libc calls strtok() */
- #define strtok	my_strtok
-+#ifdef __STDC__
-+extern char *my_strtok(char *, char *);
-+#else
- extern char *my_strtok();
- #endif
-+#endif
---- scaffold.c_orig	2002-04-06 08:32:26.000000000 +0200
-+++ scaffold.c	2002-04-06 08:32:50.000000000 +0200
-@@ -40,7 +40,6 @@
-   */
- int     allow_severity = SEVERITY;
- int     deny_severity = LOG_WARNING;
--int     rfc931_timeout = RFC931_TIMEOUT;
- 
- /* dup_hostent - create hostent in one memory block */
- 
-@@ -324,16 +323,6 @@
-     exit(0);
- }
- 
--/* dummy function  to intercept the real rfc931() */
--
--/* ARGSUSED */
--
--void    rfc931(request)
--struct request_info *request;
--{
--    strcpy(request->user, unknown);
--}
--
- /* check_path - examine accessibility */
- 
- int     check_path(path, st)
diff --git a/sys-apps/tcp-wrappers/files/tcp_wrappers_7.6.dif b/sys-apps/tcp-wrappers/files/tcp_wrappers_7.6.dif
deleted file mode 100644
index a3b9f1df3713..000000000000
--- a/sys-apps/tcp-wrappers/files/tcp_wrappers_7.6.dif
+++ /dev/null
@@ -1,185 +0,0 @@
---- hosts_access.c
-+++ hosts_access.c	2000/01/21 16:06:56
-@@ -33,6 +33,7 @@
- #include <errno.h>
- #include <setjmp.h>
- #include <string.h>
-+#include <rpcsvc/ypclnt.h>
- 
- extern char *fgets();
- extern int errno;
-@@ -88,6 +89,33 @@
- #define	BUFLEN 2048
- 
- /* hosts_access - host access control facility */
-+
-+int
-+yp_get_default_domain (char **outdomain)
-+{
-+  static char __ypdomainname[1025] = "\0";
-+  int result = YPERR_SUCCESS;;
-+  *outdomain = NULL;
-+
-+  if (__ypdomainname[0] == '\0')
-+    {
-+      if (getdomainname (__ypdomainname, 1024))
-+        result = YPERR_NODOM;
-+      else if (strcmp (__ypdomainname, "(none)") == 0)
-+        {
-+          /* If domainname is not set, some Systems will return "(none)" */
-+          __ypdomainname[0] = '\0';
-+          result = YPERR_NODOM;
-+        }
-+      else
-+        *outdomain = __ypdomainname;
-+    }
-+  else
-+    *outdomain = __ypdomainname;
-+
-+  return result;
-+}
-+
- 
- int     hosts_access(request)
- struct request_info *request;
---- Makefile
-+++ Makefile	2000/01/21 16:45:52
-@@ -44,7 +44,7 @@
- #REAL_DAEMON_DIR=/usr/etc
- #
- # SysV.4 Solaris 2.x OSF AIX
--#REAL_DAEMON_DIR=/usr/sbin
-+REAL_DAEMON_DIR=/usr/sbin
- #
- # BSD 4.4
- #REAL_DAEMON_DIR=/usr/libexec
-@@ -143,8 +143,9 @@
- 
- linux:
- 	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
--	LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \
--	NETGROUP= TLI= EXTRA_CFLAGS="-DBROKEN_SO_LINGER" all
-+	LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= \
-+	NETGROUP=-DNETGROUP TLI= \
-+	EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DINET6=1 -Dss_family=__ss_family" all
- 
- # This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x.
- hpux hpux8 hpux9 hpux10:
-@@ -229,7 +230,7 @@
- 
- # Amdahl UTS 2.1.5 (Richard.Richmond@bridge.bst.bls.com)
- uts215:
--	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \   
-+	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
- 	LIBS="-lsocket" RANLIB=echo \
- 	ARFLAGS=rv AUX_OBJ=setenv.o NETGROUP=-DNO_NETGROUP TLI= all
- 
-@@ -472,7 +473,7 @@
- # If your system supports vsyslog(), comment out the following definition.
- # If in doubt leave it in, it won't harm.
- 
--VSYSLOG	= -Dvsyslog=myvsyslog
-+#VSYSLOG	= -Dvsyslog=myvsyslog
- 
- # End of the system dependencies.
- #################################
-@@ -491,7 +492,7 @@
- # Uncomment the next definition to turn on the language extensions
- # (examples: allow, deny, banners, twist and spawn).
- # 
--#STYLE	= -DPROCESS_OPTIONS	# Enable language extensions.
-+STYLE	= -DPROCESS_OPTIONS	# Enable language extensions.
- 
- ################################################################
- # Optional: Changing the default disposition of logfile records
-@@ -514,7 +515,7 @@
- #
- # The LOG_XXX names below are taken from the /usr/include/syslog.h file.
- 
--FACILITY= LOG_MAIL	# LOG_MAIL is what most sendmail daemons use
-+FACILITY= LOG_AUTHPRIV	# LOG_MAIL is what most sendmail daemons use
- 
- # The syslog priority at which successful connections are logged.
- 
-@@ -531,7 +532,7 @@
- # and with Solaris < 2.4. APPEND_DOT will not work with hostnames taken
- # from /etc/hosts or from NIS maps. It does work with DNS through NIS.
- #
--# DOT= -DAPPEND_DOT
-+DOT= -DAPPEND_DOT
- 
- ##################################################
- # Optional: Always attempt remote username lookups
-@@ -551,7 +552,7 @@
- # still do selective username lookups as documented in the hosts_access.5
- # and hosts_options.5 manual pages (`nroff -man' format).
- #
--#AUTH	= -DALWAYS_RFC931
-+AUTH	= -DALWAYS_RFC931
- #
- # The default username lookup timeout is 10 seconds. This may not be long
- # enough for slow hosts or networks, but is enough to irritate PC users.
-@@ -610,7 +611,7 @@
- # Paranoid mode implies hostname lookup. In order to disable hostname
- # lookups altogether, see the next section.
- 
--PARANOID= -DPARANOID
-+#PARANOID= -DPARANOID
- 
- ########################################
- # Optional: turning off hostname lookups
-@@ -649,7 +650,7 @@
- # source-routed traffic in the kernel. Examples: 4.4BSD derivatives,
- # Solaris 2.x, and Linux. See your system documentation for details.
- #
--# KILL_OPT= -DKILL_IP_OPTIONS
-+#KILL_OPT= -DKILL_IP_OPTIONS
- 
- ## End configuration options
- ############################
-@@ -659,12 +660,12 @@
- SHELL	= /bin/sh
- .c.o:;	$(CC) $(CFLAGS) -c $*.c
- 
--CFLAGS	= -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
-+CFLAGS	= -O2 -pipe -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
- 	$(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
- 	-DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
- 	-DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
- 	$(UCHAR) $(TABLES) $(STRINGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \
--	$(VSYSLOG) $(HOSTNAME)
-+	$(VSYSLOG)
- 
- LIB_OBJ= hosts_access.o options.o shell_cmd.o rfc931.o eval.o \
- 	hosts_ctl.o refuse.o percent_x.o clean_exit.o $(AUX_OBJ) \
---- README.ipv6
-+++ README.ipv6	2000/01/21 15:52:43
-@@ -0,0 +1,17 @@
-+;; IPv6 patch for tcp_wrappers_7.6 1.6
-+;; Aug 23, 1999 by Hajimu UMEMOTO <ume@mahoroba.org>
-+;;
-+;; This patch supports IPv4/IPv6 dual stack and IPv4-mapped IPv6 address.
-+;; You can replace stock tcpd or libwrap.a with this.
-+;; IPv6 address pattern is as a `[net]/prefixlen' pair.
-+;; This patch was tested on KAME/FreeBSD, KAME/FreeBSD3, KAME/NetBSD,
-+;; RedHat 5.1 with kernel 2.1.126, and RedHat 6.0 with kernel 2.2.10.
-+;;
-+;; CAUTION:
-+;; Back out change for field separater.  Now, field separater is `:'
-+;; not `|'.  To specify IPv6 address, enclose IPv6 address with `['
-+;; and `]'.
-+;;
-+;; For Linux users:
-+;; If your libc doesn't have sockaddr_storage, try target `linux-old'.
-+
---- safe_finger.c
-+++ safe_finger.c	2000/01/21 16:06:56
-@@ -31,7 +31,7 @@
- 
- /* Local stuff */
- 
--char    path[] = "PATH=/bin:/usr/bin:/usr/ucb:/usr/bsd:/etc:/usr/etc:/usr/sbin";
-+char    path[] = "PATH=/bin:/usr/bin:/usr/sbin";
- 
- #define	TIME_LIMIT	60		/* Do not keep listinging forever */
- #define	INPUT_LENGTH	100000		/* Do not keep listinging forever */
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r3.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r3.ebuild
deleted file mode 100644
index 86d215160332..000000000000
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r3.ebuild,v 1.8 2002/12/09 04:37:26 manson Exp $
-
-MY_P="tcp_wrappers_${PV}"
-PATCH0="${MY_P}.dif"
-PATCH1="${MY_P}-ipv6-1.6.diff.gz"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="tcp wrappers"
-SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"
-HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
-KEYWORDS="x86 sparc "
-SLOT="0"
-LICENSE="freedist"
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/
-	patch -p0 < ${FILESDIR}/${PATCH0} || die
-	gzip -dc ${FILESDIR}/${PATCH1} | patch -p2 || die
-
-	cp Makefile Makefile.orig
-	sed -e "s/-O2/${CFLAGS}/" \
-		-e "s:AUX_OBJ=.*:AUX_OBJ= \\\:" Makefile.orig > Makefile
-}
-
-src_compile() {
-	make ${MAKEOPTS} \
-		REAL_DAEMON_DIR=/usr/sbin \
-		linux || die
-}
-
-src_install() {
-	dosbin tcpd tcpdchk tcpdmatch safe_finger try-from
-	doman *.[358]
-	dosym hosts_access.5.gz /usr/share/man/man5/hosts.allow.5.gz
-	dosym hosts_access.5.gz /usr/share/man/man5/hosts.deny.5.gz
-	dolib.a libwrap.a
-	insinto /usr/include
-	doins tcpd.h
-
-	dodoc BLURB CHANGES DISCLAIMER README*
-}
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r4.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r4.ebuild
index 966e06485185..6f35a010d19f 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r4.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r4.ebuild
@@ -1,30 +1,35 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r4.ebuild,v 1.14 2003/02/09 19:26:55 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r4.ebuild,v 1.15 2003/02/10 09:05:33 seemant Exp $
+
+inherit eutils
+
+MY_P=${P//-/_}
 
-MY_P="tcp_wrappers_${PV}"
-PATCH0="${MY_P}.dif"
-PATCH1="${MY_P}-ipv6-1.6.diff.gz"
-PATCH2="${MY_P}-stdc.diff"
 S=${WORKDIR}/${MY_P}
-DESCRIPTION="tcp wrappers"
-SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"
+DESCRIPTION="TCP Wrappers"
+SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
+	http://cvs.gentoo.org/~seemant/${PF}-gentoo.tar.bz2"
 HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
-KEYWORDS="x86 ppc sparc alpha mips hppa"
+
 SLOT="0"
 LICENSE="freedist"
+KEYWORDS="x86 ppc sparc alpha mips hppa"
+
 DEPEND="virtual/glibc"
 
 src_unpack() {
 	unpack ${A}
-	
-	cd ${S}/
-	patch -p0 < ${FILESDIR}/${PATCH0} || die
-	gzip -dc ${FILESDIR}/${PATCH1} | patch -p2 || die
-	patch -p0 < ${FILESDIR}/${PATCH2} || die
+
+	PATCHDIR=${WORKDIR}/${PV}-patches
+
+	cd ${S}
+	epatch ${PATCHDIR}/${MY_P}-ipv6-1.6.diff
+	epatch ${PATCHDIR}/${MY_P}-stdc.diff
+	epatch ${PATCHDIR}/${MY_P}.diff
 	
 	cp Makefile Makefile.orig
-	sed -e "s/-O2/${CFLAGS} -fPIC/" \
+	sed -e "s:-O2:${CFLAGS} -fPIC:" \
 		-e "s:AUX_OBJ=.*:AUX_OBJ= \\\:" Makefile.orig > Makefile
 
 }
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r5.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r5.ebuild
index ac655a071b09..d26c5f4a730a 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r5.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r5.ebuild
@@ -1,27 +1,30 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r5.ebuild,v 1.2 2003/02/09 19:26:55 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcp-wrappers/tcp-wrappers-7.6-r5.ebuild,v 1.3 2003/02/10 09:05:33 seemant Exp $
 
 inherit eutils
 
-MY_P="${PN//-/_}_${PV}"
+MY_P=${P//-/_}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="tcp wrappers"
-SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz"
+SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
+	http://cvs.gentoo.org/~seemant/${PF}-gentoo.tar.bz2"
 HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
+
 SLOT="0"
 LICENSE="freedist"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
+
 DEPEND="virtual/glibc"
 
 src_unpack() {
 	unpack ${A}
 	
-	cd ${S}/
-	epatch ${FILESDIR}/${PV}-patches
+	cd ${S}
+	epatch ${WORKDIR}/${PV}-patches
 	
 	cp Makefile Makefile.orig
-	sed -e "s/-O/${CFLAGS} -fPIC/" \
+	sed -e "s:-O:${CFLAGS} -fPIC:" \
 		-e "s:AUX_OBJ=.*:AUX_OBJ= \\\:" \
 		-e "s:SOMINOR = 7.6:SOMINOR = ${PV}:" Makefile.orig > Makefile