Revision bump; added patch to fix missing check on ctime return value (was using strcpy(buf, ctime(...))). Also use socklen_t over int as it should be (fixes gcc-4 warning as well).

(Portage version: 2.0.51.21-r1)

5 files changed, 98 insertions, 12 deletions

diff --git a/sys-apps/dog/ChangeLog b/sys-apps/dog/ChangeLog
index 02096d09c28d..a308a5a3f94f 100644
--- a/sys-apps/dog/ChangeLog
+++ b/sys-apps/dog/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/dog
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dog/ChangeLog,v 1.11 2005/03/28 20:01:38 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dog/ChangeLog,v 1.12 2005/05/13 12:46:31 ka0ttic Exp $
+
+*dog-1.7-r1 (13 May 2005)
+
+  13 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/dog-1.7-check-ctime.diff, +dog-1.7-r1.ebuild:
+  Revision bump; added patch to fix missing check on ctime return value (was
+  using strcpy(buf, ctime(...))). Also use socklen_t over int as it should be
+  (fixes gcc-4 warning as well).
 
   28 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> metadata.xml:
   Move from base-system to shell-tools
diff --git a/sys-apps/dog/Manifest b/sys-apps/dog/Manifest
index b4bcfcbd3b92..36d23582528f 100644
--- a/sys-apps/dog/Manifest
+++ b/sys-apps/dog/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 8a5838fdfc978d8897bc8fd905a6d243 dog-1.7.ebuild 694
-MD5 75f2e62e2a2b30bf8d191575b2e7c7b4 ChangeLog 1322
+MD5 74341deb4684f32f0b21210b60f6e7c9 dog-1.7-r1.ebuild 765
+MD5 307b787209a6e574f63a3c99b642e22a ChangeLog 1642
 MD5 99ce5509db4b50f28a1f6675f8c09b2b metadata.xml 258
 MD5 39566b62f641a9ca7555f7bbea2878d9 files/1.7-manpage-touchup.patch 498
+MD5 d3467d0ce8367b6b549f383382437b24 files/digest-dog-1.7-r1 58
 MD5 d3467d0ce8367b6b549f383382437b24 files/digest-dog-1.7 58
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCW7T6EZCkKN40op4RAhuCAJwIO4017uv4iyByyi3nNspJhOXTdwCgoMQt
-nKW8J3+ZquRn216vrg+9Qak=
-=y/so
------END PGP SIGNATURE-----
+MD5 4af367da579347ba9b87e42418a0c3fd files/dog-1.7-check-ctime.diff 1409
diff --git a/sys-apps/dog/dog-1.7-r1.ebuild b/sys-apps/dog/dog-1.7-r1.ebuild
new file mode 100644
index 000000000000..5d1c588745b5
--- /dev/null
+++ b/sys-apps/dog/dog-1.7-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dog/dog-1.7-r1.ebuild,v 1.1 2005/05/13 12:46:31 ka0ttic Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Dog is better than cat"
+HOMEPAGE="http://jl.photodex.com/dog/"
+SRC_URI="http://jl.photodex.com/dog/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 ppc-macos sparc x86"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch ${FILESDIR}/${P}-check-ctime.diff
+	epatch ${FILESDIR}/${PV}-manpage-touchup.patch
+	sed -i \
+		-e 's/^CFLAGS/#CFLAGS/' \
+		-e "s/gcc/$(tc-getCC)/" \
+		Makefile || die "sed Makefile failed"
+}
+
+src_install() {
+	dobin dog || die
+	doman dog.1
+	dodoc README AUTHORS
+}
diff --git a/sys-apps/dog/files/digest-dog-1.7-r1 b/sys-apps/dog/files/digest-dog-1.7-r1
new file mode 100644
index 000000000000..0ab07c34f37b
--- /dev/null
+++ b/sys-apps/dog/files/digest-dog-1.7-r1
@@ -0,0 +1 @@
+MD5 9dd1e04efb7f8535a632bac2eef60a10 dog-1.7.tar.gz 30433
diff --git a/sys-apps/dog/files/dog-1.7-check-ctime.diff b/sys-apps/dog/files/dog-1.7-check-ctime.diff
new file mode 100644
index 000000000000..251c04d75a16
--- /dev/null
+++ b/sys-apps/dog/files/dog-1.7-check-ctime.diff
@@ -0,0 +1,53 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN dog-1.7.orig/dog.c dog-1.7/dog.c
+--- dog-1.7.orig/dog.c	2005-05-13 08:01:37.000000000 -0400
++++ dog-1.7/dog.c	2005-05-13 08:30:38.000000000 -0400
+@@ -36,6 +36,7 @@
+ #include <string.h>
+ #include "getopt.h"
+ #include <limits.h>
++#include <time.h>
+ #include <netdb.h>
+ 
+ // this is fun
+@@ -1321,26 +1322,35 @@
+   	InetSockAddr sa;
+ 	int newsock;
+ 	uint32 ipAddr;
+-	int k;
++	socklen_t k;
+ 	time_t curr_time;
+ 	char curr_date[64];
+ 
+ 	k = sizeof(sa);
+ 	while ((newsock=accept(sock,(struct sockaddr*)&sa,&k)) != -1) {
+ 		if (!no_bind_header) {
++			char *result = NULL;
+ 			ipAddr = ntohl(sa.addr);
+ 			time(&curr_time);
+-         strcpy(curr_date,ctime(&curr_time));
++			if (!(result = ctime(&curr_time))) {
++			    perror("ctime");
++			    goto done;
++			}
++			strncpy(curr_date, result, sizeof(curr_date) - 1);
+ 			while (!isalnum(curr_date[strlen(curr_date)-1])) {
+ 	         curr_date[strlen(curr_date)-1] = 0;
+ 			}
+ 			printf("# %s from %d.%d.%d.%d:%d\n",curr_date,(int)ipAddr>>24,(int)(ipAddr>>16)&0xff,(int)(ipAddr>>8)&0xff,(int)ipAddr&0xff,ntohs(sa.port));
+  		}
+-		straight_dump = newsock;
+-		DumpThings(argc,argv,hang_up_bind ? -1 : newsock);
+-		if (hang_up_bind) {
++
++		goto done;
++
++		done:
++		    straight_dump = newsock;
++		    DumpThings(argc,argv,hang_up_bind ? -1 : newsock);
++		    if (hang_up_bind) {
+ 			close(newsock);
+-		}
++		    }
+ 	}
+ }
+