From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 9 Oct 2017 18:53:29 +0100
Subject: reinit the tree, so we can have metadata

---
 sys-apps/dog/files/1.7-manpage-touchup.patch    | 18 +++++++++
 sys-apps/dog/files/dog-1.7-64bit-goodness.patch | 33 +++++++++++++++
 sys-apps/dog/files/dog-1.7-check-ctime.diff     | 53 +++++++++++++++++++++++++
 sys-apps/dog/files/dog-1.7-strfry.patch         | 13 ++++++
 4 files changed, 117 insertions(+)
 create mode 100644 sys-apps/dog/files/1.7-manpage-touchup.patch
 create mode 100644 sys-apps/dog/files/dog-1.7-64bit-goodness.patch
 create mode 100644 sys-apps/dog/files/dog-1.7-check-ctime.diff
 create mode 100644 sys-apps/dog/files/dog-1.7-strfry.patch

(limited to 'sys-apps/dog/files')

diff --git a/sys-apps/dog/files/1.7-manpage-touchup.patch b/sys-apps/dog/files/1.7-manpage-touchup.patch
new file mode 100644
index 000000000000..17400a5207f5
--- /dev/null
+++ b/sys-apps/dog/files/1.7-manpage-touchup.patch
@@ -0,0 +1,18 @@
+The correct syntax of the -w option does not have a space between 
+the -w and the cols ... the manpage seems to imply differently though 
+so let's fix it.
+
+http://bugs.gentoo.org/show_bug.cgi?id=69660
+
+--- a/dog.1
++++ b/dog.1
+@@ -8,3 +8,3 @@
+ .B dog
+-[\-AbBeEnstTuv] [\-w cols] [\-l lines] 
++[\-AbBeEnstTuv] [\-w<cols>] [\-l lines] 
+ [\-\-show\-all] [\-\-number\-nonblank] [\-\-no\-blanks] [\-\-bind=port]
+@@ -64,3 +64,3 @@
+ .TP
+-.I \-w n
++.I \-w<n>
+ Print first n characters of each line (default=80)
diff --git a/sys-apps/dog/files/dog-1.7-64bit-goodness.patch b/sys-apps/dog/files/dog-1.7-64bit-goodness.patch
new file mode 100644
index 000000000000..5f053ace0feb
--- /dev/null
+++ b/sys-apps/dog/files/dog-1.7-64bit-goodness.patch
@@ -0,0 +1,33 @@
+diff -ur dog-1.7/dog.c dog-1.7-64bit/dog.c
+--- a/dog.c	2000-06-21 18:04:43.000000000 +0200
++++ b/dog.c	2005-05-23 10:40:58.613766328 +0200
+@@ -38,22 +38,13 @@
+ #include <limits.h>
+ #include <netdb.h>
+ 
+-// this is fun
+-#if defined(__alpha)
+-#define uint16	unsigned short
+-#define int16	short
+-#define uint32	unsigned int
+-#define int32	int
+-#define uint64	unsigned long
+-#define int64	long
+-#else
+-#define uint16	unsigned short
+-#define int16	short
+-#define uint32	unsigned long
+-#define int32	long
+-#define uint64	unsigned long long
+-#define int64	long long
+-#endif
++#define uint16	uint16_t
++#define int16	int16_t
++#define uint32	uint32_t
++#define int32	int32_t
++#define uint64	uint64_t
++#define int64	int64_t
++
+ #if defined(__STDC__)
+ #define __dog_signed		signed
+ #else
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..03442b8e45d5
--- /dev/null
+++ b/sys-apps/dog/files/dog-1.7-check-ctime.diff
@@ -0,0 +1,53 @@
+diff --exclude='*~' --exclude='.*' -I '# $Id$
+--- a/dog.c	2005-05-13 08:01:37.000000000 -0400
++++ b/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);
+-		}
++		    }
+ 	}
+ }
+ 
diff --git a/sys-apps/dog/files/dog-1.7-strfry.patch b/sys-apps/dog/files/dog-1.7-strfry.patch
new file mode 100644
index 000000000000..cfdae3e787ed
--- /dev/null
+++ b/sys-apps/dog/files/dog-1.7-strfry.patch
@@ -0,0 +1,13 @@
+See Gentoo bug 251675. Upstream appears to be dead.
+
+--- a/dog.c	2009-04-09 23:29:16.307661147 -0500
++++ b/dog.c	2009-04-09 23:30:11.353664890 -0500
+@@ -552,7 +552,7 @@
+ 	
+ 	// strfry()
+ #if ALLOW_STRFRY
+-	if (opt_strfry) {
++	if (opt_strfry && str_len > 0) {
+ 		strfry(str);
+ 	}
+ #endif
-- 
cgit v1.2.3