diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /sys-apps/dog |
reinit the tree, so we can have metadata
Diffstat (limited to 'sys-apps/dog')
-rw-r--r-- | sys-apps/dog/Manifest | 9 | ||||
-rw-r--r-- | sys-apps/dog/dog-1.7-r6.ebuild | 43 | ||||
-rw-r--r-- | sys-apps/dog/files/1.7-manpage-touchup.patch | 18 | ||||
-rw-r--r-- | sys-apps/dog/files/dog-1.7-64bit-goodness.patch | 33 | ||||
-rw-r--r-- | sys-apps/dog/files/dog-1.7-check-ctime.diff | 53 | ||||
-rw-r--r-- | sys-apps/dog/files/dog-1.7-strfry.patch | 13 | ||||
-rw-r--r-- | sys-apps/dog/metadata.xml | 8 |
7 files changed, 177 insertions, 0 deletions
diff --git a/sys-apps/dog/Manifest b/sys-apps/dog/Manifest new file mode 100644 index 000000000000..2dd7e3f24eb6 --- /dev/null +++ b/sys-apps/dog/Manifest @@ -0,0 +1,9 @@ +AUX 1.7-manpage-touchup.patch 502 SHA256 0e2ab435e58f0a37c6a99d553e9d23bee200f79ccf65bd543895370bdfafd256 SHA512 b10244561296a082c98e79623789f660d4c964c4c32dc8e60962847b6f8fc4f9843c1c5dab96ac9f9202255b55c424131c91b22f9442f2ee2a241948dac5b4c3 WHIRLPOOL 1b44fa5a2ce2c6bce22fe7a79d06fdcec5e93211652ad32af8ea624d1ee8ecd9fd84a861593c2d212c45d0bda4ca7f25744c9be877555fa792d00f44bc7424b2 +AUX dog-1.7-64bit-goodness.patch 773 SHA256 0f8faf9963fd3e12efb7349a1c63d455650877b087bb0048f54daa67aec24e7b SHA512 479086b023302886618fab874d2466d6a79b755f62de11b37fa26070f266fec7ae4578affdca4746ca7e1eb728ba29fce537c3c53ee52ac54e36cbe75e3de36e WHIRLPOOL bc4b6e995a0ff83cf5ef74c85aea8b3b400652e9a4e102b6dc7d99f7e5ab2509c295697b241b4d08f0b6fe140218f09fe24e1c9d12ecbd6c1af150c550c17c71 +AUX dog-1.7-check-ctime.diff 1355 SHA256 74b275706cc7a61374db34b4b9883b3d24b1d3d1714e51847974d16b5ab3c4b0 SHA512 8892c0ad357ca53dd00e6402dadd1ce05ae52cf6c8eb9745ef1406ab95bd1357558b94d85e0b8eb3a8de7a209e8be9f9e020cc378804f88b180496b294de8b5b WHIRLPOOL 17a543388d91701025fd15d772e6c44b133935d81040a14adc908ea8633b93db8e8cde4134f8fc9b5d92334af55926987aeccd71584d71e8ffb48df80f4403bc +AUX dog-1.7-strfry.patch 287 SHA256 e5700703d3be2875a75788bcc30d16e99e044e6065ef1f17b7aa5fec92316ed6 SHA512 a00051d4a190c56d08c4cfd2ebc9cf5201dc945043906b9185547b83c478220675a1f99f1fdc6903b0150ae2942868ab951a650ce0104989c702a268077a2513 WHIRLPOOL 5a54edff46e295d73abb9c1286448c84dff9b981b20591bd6f37a09e1912d94740297bf3af0a629ce6ccfa122ee56d6fb9cdc41d415af017356cfde6109e0c20 +DIST dog-1.7.tar.gz 30433 SHA256 6c5386d1b6401d6410baa8f0da343de5625cd3d59b6273dcee81997c372522ca SHA512 852373ba988075a47c60c38da0ff3a344f996e6e149d23e1061d6f8fbb0999f32c975c323944375ba758e5663efa57f62c8ff88d46264f72196ea450eacfa4f5 WHIRLPOOL 1c9b41628970b2c7b085c6b01ef40a77058b8b010bbd38713b1f131ce30bc49f64cb03bbcf91bb6eeec5909fbced58d531d78d17a3cec46e6000d7d5f43a1fb2 +EBUILD dog-1.7-r6.ebuild 971 SHA256 44a815921bc90d26503f3e2aada3dbfd02e583d3148547bfad60e9299a7442de SHA512 37f2adc853937d5cc8befe60c2a391741ebacbe4ce414127b342cea8e054ecf33e819c8bf2a85d63f356ab764d1132bd29c785b69b83a33a2428216c3d536753 WHIRLPOOL 5d711bd5fee0ff8579452acee450f144f7f95d46346b03afbafed29a64c70098992ecd7032f13456f7dc27f3dbf6923a82fcefb3fb1fb2f8ce9c4e8d59d969f2 +MISC ChangeLog 3075 SHA256 8024cfcec99397be1c4fb0cc8c48643db5530174adb6ffad08880b1ec6b7eb27 SHA512 1564a8f2f00776c55e8f779ff2677ef5776014ec4209991957a075a575d0dfe8cbae610d5331e5f42caf9934be5146c93a7189c85af8793ef4c1d9435d108b3e WHIRLPOOL 422ab4c536aff0451243c24947f912e5a4a8d4ba54fc88dd8a5464aeaac8a3a267a109569b723b65df641b75ad635fdac9cc4808e24b01ec3b822f2c6b55f142 +MISC ChangeLog-2015 4650 SHA256 3b2d1c106cb0a598fd54e0ae2b279adb8c48ff09b64b50adf8a091f2f563f3d2 SHA512 e90244cbcf52b5f67e9eb2af0f905567b15c55a95147070601478da4d5c2c35a457881099dd077c56ce8951b17531690af71ed9984f6f33e59a505c561d74426 WHIRLPOOL 4e92883509687103206e9615fef835e9c1d472863f070a08c0850703f3fe977fb3295b52984b9ce15df0dc1ea49fa57a8cbec4859d178ef90e7fcddc0453f0cb +MISC metadata.xml 265 SHA256 5c4f9426c69dd2191012bf8aae1952f4f6298c1f6ff0ec1e45fe0e05327694e9 SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25 WHIRLPOOL 2fa84a9f23f48e804ab20a6fabe2707f86227bded2a41d3af30958db5a69bc6276140a7f035a256caeca5a8b8ce1c240383c300a90fc4a83334c178769bc3519 diff --git a/sys-apps/dog/dog-1.7-r6.ebuild b/sys-apps/dog/dog-1.7-r6.ebuild new file mode 100644 index 000000000000..7b302d7d6f7b --- /dev/null +++ b/sys-apps/dog/dog-1.7-r6.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit toolchain-funcs + +DESCRIPTION="Dog is better than cat" +# the best HOMEPAGE we have. +HOMEPAGE="https://packages.gentoo.org/package/sys-apps/dog" +SRC_URI="mirror://gentoo/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris" + +PATCHES=( + "${FILESDIR}"/${P}-check-ctime.diff + "${FILESDIR}"/${PV}-manpage-touchup.patch + "${FILESDIR}"/${P}-64bit-goodness.patch + "${FILESDIR}"/${P}-strfry.patch +) + +src_prepare() { + default + + if [[ "${CHOST}" == *-solaris* ]]; then + sed -i '/gcc.*-o dog/s/$/ -lsocket -lnsl/' \ + Makefile || die "sed Makefile failed" + fi + + sed -i \ + -e 's,^CFLAGS,#CFLAGS,' \ + -e "s,gcc,$(tc-getCC)," \ + -e 's:-o dog:$(LDFLAGS) -o dog:g' \ + Makefile || die "sed Makefile failed" +} + +src_install() { + dobin "${PN}" + doman "${PN}.1" + einstalldocs +} 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 diff --git a/sys-apps/dog/metadata.xml b/sys-apps/dog/metadata.xml new file mode 100644 index 000000000000..3cf14bf74636 --- /dev/null +++ b/sys-apps/dog/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>shell-tools@gentoo.org</email> + <name>Gentoo Shell Tools Project</name> + </maintainer> +</pkgmetadata> |