diff options
| -rw-r--r-- | net-analyzer/netcat6/ChangeLog | 13 | ||||
| -rw-r--r-- | net-analyzer/netcat6/Manifest | 16 | ||||
| -rw-r--r-- | net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch | 311 | ||||
| -rw-r--r-- | net-analyzer/netcat6/netcat6-0.5.ebuild | 29 | ||||
| -rw-r--r-- | net-analyzer/netcat6/netcat6-1.0-r1.ebuild | 40 | ||||
| -rw-r--r-- | net-analyzer/ssldump/Manifest | 14 |
6 files changed, 367 insertions, 56 deletions
diff --git a/net-analyzer/netcat6/ChangeLog b/net-analyzer/netcat6/ChangeLog index d6991d91bfb5..bc52b4bf7b0a 100644 --- a/net-analyzer/netcat6/ChangeLog +++ b/net-analyzer/netcat6/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-analyzer/netcat6 -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/ChangeLog,v 1.9 2007/07/09 16:41:02 jer Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/ChangeLog,v 1.10 2008/10/25 15:33:21 pva Exp $ + +*netcat6-1.0-r1 (25 Oct 2008) + + 25 Oct 2008; Peter Volkov <pva@gentoo.org> + +files/netcat6-1.0-unix-sockets.patch, -netcat6-0.5.ebuild, + +netcat6-1.0-r1.ebuild: + Added patch to make netcat6 listen on unix sockets, bug #235160, thank + Georgi Georgiev for this patch. Added bluetooth support. Removed old + version. 09 Jul 2007; Jeroen Roovers <jer@gentoo.org> netcat6-1.0.ebuild: Stable for HPPA (as informally requested by armin76). diff --git a/net-analyzer/netcat6/Manifest b/net-analyzer/netcat6/Manifest index 9e831dfce649..3ac047bdb7d7 100644 --- a/net-analyzer/netcat6/Manifest +++ b/net-analyzer/netcat6/Manifest @@ -1,16 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -DIST nc6-0.5.tar.bz2 200077 RMD160 a840829c7bc0d2f9b7cb0d26e5de138207e1c2dd SHA1 e9a7350012ee04dff70d2c6f715d322c790976c5 SHA256 fc0f377e257c5221f14274e33b78d861cd3eb9b4db7118ec4a6926ad29f08c80 +AUX netcat6-1.0-unix-sockets.patch 8798 RMD160 a34cde020b43acd0e96c946a6f549f36a4215e00 SHA1 63e976bdaa378825bd414fb0f975a5a4c73f9ef5 SHA256 c82d3ae349d7cf142a839066fef2fc1f98903260cec6e30d08aca375487a5c7b DIST nc6-1.0.tar.bz2 264257 RMD160 c5444976925ffece7f27fc1ff3c16ebe19998b78 SHA1 1c361a8060be427fe1b2209d7155e26670e0c1b9 SHA256 eb35e7a05a60bf94496075a3a246d7bf63fcdba2ca7ceb6844852a1ff6478206 -EBUILD netcat6-0.5.ebuild 760 RMD160 ba405e8d2b0e76ef01b1f856bc2f935c8c91528a SHA1 66641d22938675a74454956f93b3174acc22bb1d SHA256 9eeadb749093aa25b77b18e73a3ffc9ef795bb96f25685d3bdd132a600a87c25 +EBUILD netcat6-1.0-r1.ebuild 985 RMD160 62c8d2c5fed0872c3674f7217371c570c847f42c SHA1 ecb65e650ca61057ddee0331e010ca39a07643a1 SHA256 e21d7b12bc09d54bf819c6256da7b339ad2ea69ccf7575b2d83f7e05d103d1f2 EBUILD netcat6-1.0.ebuild 760 RMD160 cb1587a4c877d88ca97f1686394342694bd8505c SHA1 be667d50898eadf8fbb42ed5505ba7c83b5566fe SHA256 522cb654f53d7faf750378ca50385c265493393e9635c84260120ef21c7eeee4 -MISC ChangeLog 1088 RMD160 b4a0091776752a93ffaf83c10da83ab94152264b SHA1 603be1902a087ae6cbd04d617069c73001429b5b SHA256 7b2e857abd483b23e0d477d488ede493ecae0b35fc57f7863a1a407fdd138f81 +MISC ChangeLog 1409 RMD160 29c6129a79d09e94be93c576509656558b932df0 SHA1 f75220da8f20ea1a27c9b087a6adc25d08746833 SHA256 1c93a1b18f9526e042158d3b43fdd3324bb021d7b0b4b0792c817ae179eb177f MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.7 (GNU/Linux) - -iD8DBQFIQNoxj9hvisErhMIRAhXIAJ9t2/QcNyTci8Q9Ovqvhn8HjRsUlwCfdYq/ -MfiUpR13kCrsuZSxqSFL0Ek= -=vfUY ------END PGP SIGNATURE----- diff --git a/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch b/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch new file mode 100644 index 000000000000..d5cb90bd1ec9 --- /dev/null +++ b/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch @@ -0,0 +1,311 @@ +=== modified file 'docs/nc6.1.in' +--- docs/nc6.1.in 2008-10-25 14:16:55 +0000 ++++ docs/nc6.1.in 2008-10-25 14:17:11 +0000 +@@ -160,6 +160,10 @@ + With this option set, netcat6 will use UDP as the transport protocol (TCP is + the default). + .TP 13 ++.I \-U, --unix ++With this option set, netcat6 will connect to a unix domain socket. ++The listen mode has not been implemented yet. ++.TP 13 + .I \-v + Enable verbose mode. This gives some basic information about what netcat6 + is doing. Use it twice for extra verbosity. + +=== modified file 'src/Makefile.am' +--- src/Makefile.am 2008-10-25 14:16:55 +0000 ++++ src/Makefile.am 2008-10-25 14:17:09 +0000 +@@ -6,6 +6,7 @@ + network.h \ + afindep.h \ + bluez.h \ ++ unixsocket.h \ + netsupport.h \ + parser.h \ + readwrite.h \ +@@ -20,6 +21,7 @@ + afindep.c \ + netsupport.c \ + parser.c \ ++ unixsocket.c \ + readwrite.c \ + io_stream.c \ + connection.c + +=== modified file 'src/connection.c' +--- src/connection.c 2008-10-25 14:16:55 +0000 ++++ src/connection.c 2008-10-25 14:17:09 +0000 +@@ -109,6 +109,9 @@ + fatal_internal("unavailable bluez support required"); + #endif + break; ++ case PROTO_UNIX: ++ ainfo->ai_family = PF_UNIX; ++ break; + default: + fatal_internal("unknown socket domain"); + } +@@ -144,6 +147,10 @@ + fatal_internal("unavailable bluez support required"); + #endif + break; ++ case UNIX_PROTOCOL: ++ ainfo->ai_protocol = 0; ++ ainfo->ai_socktype = SOCK_STREAM; ++ break; + default: + fatal_internal("unknown socket type"); + } + +=== modified file 'src/connection.h' +--- src/connection.h 2008-10-25 14:16:55 +0000 ++++ src/connection.h 2008-10-25 14:17:09 +0000 +@@ -31,12 +31,14 @@ + PROTO_UNSPECIFIED, + PROTO_IPv6, + PROTO_IPv4, ++ PROTO_UNIX, + PROTO_BLUEZ + } sock_family_t; + + typedef enum sock_protocol { + TCP_PROTOCOL, + UDP_PROTOCOL, ++ UNIX_PROTOCOL, + SCO_PROTOCOL, + L2CAP_PROTOCOL + } sock_protocol_t; + +=== modified file 'src/network.c' +--- src/network.c 2008-10-25 14:16:55 +0000 ++++ src/network.c 2008-10-25 14:17:09 +0000 +@@ -23,6 +23,7 @@ + #include "network.h" + #include "connection.h" + #include "afindep.h" ++#include "unixsocket.h" + #ifdef ENABLE_BLUEZ + #include "bluez.h" + #endif/*ENABLE_BLUEZ*/ +@@ -113,6 +114,11 @@ + + /* invoke the appropriate connector for the protocol family */ + switch (ca_family(attrs)) { ++ case PROTO_UNIX: ++ fd = unixsocket_connect(&hints, ++ remote->address, ++ timeout, &socktype); ++ break; + #ifdef ENABLE_BLUEZ + case PROTO_BLUEZ: + fd = bluez_connect(&hints, + +=== modified file 'src/parser.c' +--- src/parser.c 2008-10-25 14:16:55 +0000 ++++ src/parser.c 2008-10-25 14:17:09 +0000 +@@ -109,7 +109,9 @@ + {"bluetooth", no_argument, NULL, 'b'}, + #define OPT_SCO 24 + {"sco", no_argument, NULL, 0 }, +-#define OPT_MAX 25 ++#define OPT_UNIX_SOCKET 25 ++ {"unix", no_argument, NULL, 'U'}, ++#define OPT_MAX 26 + {0, 0, 0, 0} + }; + +@@ -160,7 +162,7 @@ + _verbosity_level = 0; + + /* option recognition loop */ +- while ((c = getopt_long(argc, argv, "46be:hlnp:q:s:uvw:xX", ++ while ((c = getopt_long(argc, argv, "46be:hlnp:q:s:uUvw:xX", + long_options, &option_index)) >= 0) + { + switch (c) { +@@ -231,6 +233,9 @@ + family = PROTO_IPv6; + ca_set_flag(attrs, CA_STRICT_IPV6); + break; ++ case 'U': ++ family = PROTO_UNIX; ++ break; + case 'b': + family = PROTO_BLUEZ; + break; +@@ -330,6 +335,9 @@ + /* set default protocols */ + if (protocol == PROTO_UNSPECIFIED) { + switch (family) { ++ case PROTO_UNIX: ++ protocol = UNIX_PROTOCOL; ++ break; + case PROTO_BLUEZ: + protocol = L2CAP_PROTOCOL; + break; +@@ -344,6 +352,11 @@ + fatal(_("cannot specify UDP protocol and bluetooth")); + if (protocol == SCO_PROTOCOL && family != PROTO_BLUEZ) + fatal(_("--sco requires --bluetooth (-b)")); ++ if (protocol == UNIX_PROTOCOL && family != PROTO_UNIX) ++ fatal(_("--unix does not need protocol specifications")); ++ ++ if (family == PROTO_UNIX && listen_mode) ++ fatal(_("--unix cannot --listen yet")); + + /* check compiled options */ + #ifndef ENABLE_BLUEZ +@@ -380,6 +393,10 @@ + fatal_internal("unknown/unsupported bluetooth " + "protocol %d", protocol); + break; ++ case PROTO_UNIX: ++ if (protocol != UNIX_PROTOCOL) ++ fatal_internal("unknown/unsupported UNIX protocol %d", protocol); ++ break; + default: + fatal_internal("invalid protocol family %d", family); + } +@@ -425,18 +442,18 @@ + fatal(_("cannot set both --recv-only and --send-only")); + } + +- /* check ports have not been specified with --sco */ +- if (protocol == SCO_PROTOCOL) { ++ /* check ports have not been specified with --sco and --unix */ ++ if (protocol == SCO_PROTOCOL || protocol == UNIX_PROTOCOL) { + if (remote_address.service != NULL) +- fatal(_("--sco does not support remote port")); ++ fatal(_("--sco and --unix do not support remote port")); + if (local_address.service != NULL) +- fatal(_("--sco does not support local port (-p)")); ++ fatal(_("--sco and --unix do not support local port (-p)")); + } + + /* check mode specific option availability and interactions */ + if (listen_mode == true) { + /* check port has been specified (except with sco) */ +- if (local_address.service == NULL && protocol != SCO_PROTOCOL) { ++ if (local_address.service == NULL && protocol != SCO_PROTOCOL && protocol != UNIX_PROTOCOL) { + fatal(_("in listen mode you must specify a port " + "with the -p switch")); + } +@@ -450,6 +467,7 @@ + /* check port has been specified (except with sco) */ + if (remote_address.address == NULL || + (remote_address.service == NULL && ++ protocol != UNIX_PROTOCOL && + protocol != SCO_PROTOCOL)) + { + fatal(_("you must specify the address/port couple " +@@ -553,6 +571,8 @@ + fprintf(fp, " -6 %s\n", _("Use only IPv6")); + fprintf(fp, " -b, --bluetooth %s\n", + _("Use Bluetooth (defaults to L2CAP protocol)")); ++ fprintf(fp, " -U, --unix %s\n", ++ _("Connect to unix domain sockets")); + fprintf(fp, " --buffer-size=BYTES %s\n", _("Set buffer size")); + fprintf(fp, " --continuous %s\n", + _("Continuously accept connections\n" + +=== added file 'src/unixsocket.c' +--- src/unixsocket.c 1970-01-01 00:00:00 +0000 ++++ src/unixsocket.c 2008-10-25 14:17:09 +0000 +@@ -0,0 +1,78 @@ ++/* ++ * unixsocket.c - address family independant networking functions ++ */ ++#include "system.h" ++#include "unixsocket.h" ++#include "misc.h" ++#include "netsupport.h" ++#include "parser.h" ++ ++#include <assert.h> ++#include <errno.h> ++#include <string.h> ++#include <stdlib.h> ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <sys/un.h> ++#include <unistd.h> ++#include <limits.h> ++ ++RCSID("@(#) $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch,v 1.1 2008/10/25 15:33:22 pva Exp $"); ++ ++ ++int unixsocket_connect(const struct addrinfo *hints, ++ const char *remote_address, ++ time_t timeout, int *rt_socktype) ++{ ++ int err, fd = -1; ++ struct sockaddr_un sa; ++ const struct addrinfo *ptr = hints; ++ ++ /* make sure arguments are valid and preconditions are respected */ ++ assert(hints != NULL); ++ assert(remote_address != NULL && strlen(remote_address) > 0); ++ assert(sizeof(sa.sun_path) >= strlen(remote_address)); ++ ++ sa.sun_family = ptr->ai_family; ++ strncpy(sa.sun_path, remote_address, sizeof(sa.sun_path)); ++ ++ ++ /* create the socket */ ++ fd = socket(ptr->ai_family, ptr->ai_socktype, ptr->ai_protocol); ++ if (fd < 0) { ++ warning("cannot create the socket: %s", strerror(errno)); ++ return -1; ++ } ++ ++ /* attempt the connection */ ++ err = connect_with_timeout(fd, (struct sockaddr *)&sa, sizeof(sa), timeout); ++ ++ if (err != 0) ++ { ++ /* check error code */ ++ if (verbose_mode()) { ++ /* use different error message for timeout */ ++ if (errno == ETIMEDOUT) { ++ /* connection timed out */ ++ warning(_("timeout while connecting to %s"), remote_address); ++ } ++ else { ++ /* connection failed */ ++ warning(_("cannot connect to %s: %s"), remote_address, strerror(errno)); ++ } ++ } ++ close(fd); ++ return -1; ++ } ++ ++ assert(ptr == NULL || fd >= 0); ++ ++ /* let the user know the connection has been established */ ++ if (verbose_mode()) warning(_("%s open"), remote_address); ++ ++ /* return the socktype */ ++ if (rt_socktype != NULL) *rt_socktype = ptr->ai_socktype; ++ ++ return fd; ++} ++ + +=== added file 'src/unixsocket.h' +--- src/unixsocket.h 1970-01-01 00:00:00 +0000 ++++ src/unixsocket.h 2008-10-25 14:17:09 +0000 +@@ -0,0 +1,12 @@ ++#ifndef UNIXSOCKET_H ++#define UNIXSOCKET_H ++ ++#include <netdb.h> ++#include <sys/types.h> ++ ++/* establish a connection and return a new fd and socktype */ ++int unixsocket_connect(const struct addrinfo *hints, ++ const char *remote_address, ++ time_t timeout, int *socktype); ++ ++#endif + diff --git a/net-analyzer/netcat6/netcat6-0.5.ebuild b/net-analyzer/netcat6/netcat6-0.5.ebuild deleted file mode 100644 index b2dd7aa20ff8..000000000000 --- a/net-analyzer/netcat6/netcat6-0.5.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/netcat6-0.5.ebuild,v 1.4 2006/07/02 20:22:50 vapier Exp $ - -DESCRIPTION="netcat clone with better IPv6 support, improved code, etc..." -HOMEPAGE="http://netcat6.sourceforge.net/" -SRC_URI="http://ftp.deepspace6.net/pub/sources/nc6/nc6-${PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha ~amd64 arm hppa ia64 m68k ~ppc s390 sh ~sparc x86" -IUSE="ipv6 nls" - -DEPEND="" - -S=${WORKDIR}/nc6-${PV} - -src_compile() { - econf \ - $(use_enable ipv6) \ - $(use_enable nls) \ - || die - emake || die -} - -src_install() { - make install DESTDIR="${D}" || die - dodoc AUTHORS BUGS README NEWS TODO CREDITS ChangeLog -} diff --git a/net-analyzer/netcat6/netcat6-1.0-r1.ebuild b/net-analyzer/netcat6/netcat6-1.0-r1.ebuild new file mode 100644 index 000000000000..54f973234e49 --- /dev/null +++ b/net-analyzer/netcat6/netcat6-1.0-r1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/netcat6-1.0-r1.ebuild,v 1.1 2008/10/25 15:33:21 pva Exp $ + +inherit eutils autotools + +DESCRIPTION="netcat clone with better IPv6 support, improved code, etc..." +HOMEPAGE="http://netcat6.sourceforge.net/" +SRC_URI="ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-${PV}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sh ~sparc ~x86" +IUSE="ipv6 nls bluetooth" + +DEPEND="bluetooth? ( net-wireless/bluez-libs )" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/nc6-${PV} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/netcat6-1.0-unix-sockets.patch" + eautoreconf +} + +src_compile() { + econf \ + $(use_enable ipv6) \ + $(use_enable bluetooth bluez) \ + $(use_enable nls) + emake || die +} + +src_install() { + make DESTDIR="${D}" install || die + dodoc AUTHORS BUGS README NEWS TODO CREDITS ChangeLog +} diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest index 8f5f045f4890..0237cbadabbf 100644 --- a/net-analyzer/ssldump/Manifest +++ b/net-analyzer/ssldump/Manifest @@ -1,19 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX ssldump-0.9-DLT_LINUX_SLL.patch 328 RMD160 81ef38b8f68833be6d0f90885e71988f669afb25 SHA1 8b5912ebaa8370ee530ade6b2c0ffd66bb40b7b0 SHA256 d17547df10730424c4cfdb21ec2db94e63f685ac26223333c8cd452c22eeba06 AUX ssldump-0.9-configure-dylib.patch 327 RMD160 c657a76dd4286256d65a7e3e649a3e422ec8d02b SHA1 700406b077539d33218094e497afaab15f8425e7 SHA256 3655ee69e445a299eac5286983cb2b8ccbe2bf69d6bc30a220b688c4c55d8ee8 AUX ssldump-0.9-libpcap-header.patch 246 RMD160 0c38f12cd0fa23a10d3e4fc6a8d548a5ec352d05 SHA1 9440310b0f3435781f365c0394e11f3aa1e1c396 SHA256 942d1b1620ed49463d2b9359ae16d0083325408e40bb360c328dcce4ee50f1fd AUX ssldump-0.9-openssl-0.9.8.compile-fix.patch 626 RMD160 88f375d073b951108c1cdf16e71ff4dde263d83e SHA1 330c45882729eea8628647d5ad603dcb8c95b672 SHA256 c0fa3dc3cea2872178e883d939c92d084a02458edfebeb4f2aaed0d32160ab63 DIST ssldump-0.9b3.tar.gz 137435 RMD160 941cf8f2ef8459ec4f9ce65772e134505d46566f SHA1 a633a9a811a138eac5ed440d583473b644135ef5 SHA256 6422c16718d27c270bbcfcc1272c4f9bd3c0799c351f1d6dd54fdc162afdab1e -EBUILD ssldump-0.9-r1.ebuild 1069 RMD160 cc6c1b9f1a8f344244b32b0799e878aacf171fd5 SHA1 a7ccb1f906a665e55b8e5db7faae26bd001b7c99 SHA256 c9d0580d40a07914dfa6eecf354d49175c700980902e1d7cb9a84f75dcd64bcc +EBUILD ssldump-0.9-r1.ebuild 1068 RMD160 333e09535aa6bcb665a9329291a7d6663361373f SHA1 0f16b935c14400768f331705267b5724fe7b32ff SHA256 37a6e76d6c7297191ae05b63a1d659e478ea5990bbc4a3a142776ab398834f7e EBUILD ssldump-0.9.ebuild 963 RMD160 f9b9510612133b740a7698163401c162717acd1e SHA1 29fbab4c225b89c539d64445769c2dd4d4cb6b89 SHA256 c327dac8038541ad980d74ce7a09ee19c29d807ace6194eab3f43ed0b47dd203 -MISC ChangeLog 2286 RMD160 6f7c0bc635102917bbae4b135d8ec3955fb55f71 SHA1 ec3daab2ee179d26a7dd990e4cec5e839075319e SHA256 8f732240a83367b20353f4c00d5133db29f45e51fc7a007f86d668802572962a +MISC ChangeLog 2383 RMD160 01427f9f676d0cf2cbab185042a7445bfeaa2d91 SHA1 d6fc4e399e6b8078ce2b682369489a53a00dcf1d SHA256 3bf4244d8a2c2d2e4e7cc27aee3bc64db3153bd3a803e3e4b32e2303a7316577 MISC metadata.xml 245 RMD160 f1d049e617f898a986a683fe58eed04a95c743e6 SHA1 c65b7f2884eb28392358f234fd40d313a5112f18 SHA256 ad9d4f8a55c8a1eaadcfa8d2fff0ac3a302530ab91a80972c1e0b30666a719f6 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAkkDIQ0ACgkQkKaRLQcq0GL8ngCeLQd1i11GAgx1t7Yq30bLuS9n -LV0An2gL9jFx8lAj/Bjc6UDg28XE5/8T -=Ypoz ------END PGP SIGNATURE----- |