summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Gerus <arachnist@i.am-a.cat>2015-05-19 01:38:40 +0200
committerRobert Gerus <arachnist@i.am-a.cat>2015-05-19 01:38:40 +0200
commit38dd9a0823773425ec816961c0408045b9095b51 (patch)
treef48c13d50ea94fa3907274ab2e8620b2e900a821
parent0381e9911ad5a98f737ceff0c0fe88a424620b84 (diff)
downloadgentoo-overlay-38dd9a0823773425ec816961c0408045b9095b51.tar.gz
gentoo-overlay-38dd9a0823773425ec816961c0408045b9095b51.tar.bz2
gentoo-overlay-38dd9a0823773425ec816961c0408045b9095b51.tar.xz
gentoo-overlay-38dd9a0823773425ec816961c0408045b9095b51.zip
Import socat and fix for musl
-rw-r--r--net-misc/socat/Manifest4
-rw-r--r--net-misc/socat/files/socat-1.7.3.0-filan-build.patch30
-rw-r--r--net-misc/socat/files/socat-1.7.3.0-musl-comapt.patch11
-rw-r--r--net-misc/socat/socat-1.7.3.0.ebuild51
4 files changed, 96 insertions, 0 deletions
diff --git a/net-misc/socat/Manifest b/net-misc/socat/Manifest
new file mode 100644
index 0000000..dbd0349
--- /dev/null
+++ b/net-misc/socat/Manifest
@@ -0,0 +1,4 @@
+AUX socat-1.7.3.0-filan-build.patch 1164 SHA256 1916386401f633c4d4e74aa61ca3039580cb69b6d89e69e73e0eaf9d463c1c15 SHA512 479a189bbc0546e8838f40e770902c0c82d5fd042e1d94731d0036f66448810dd5ffcd5297b3ad4e474db8e037d211e65648a5f35f41827d7a320d6b2b8208bf WHIRLPOOL 187535c491bb3ba7b83df865077038a054c7aa7ba3a39ad3ba868db62db113bc876f4bf3da6cdffc5cfc03ac6f4ac5ceb5058cf8185622a3dce290772306fa41
+AUX socat-1.7.3.0-musl-comapt.patch 277 SHA256 609f0499d9c61cff6aa4b9be2fa4a7051463de986742f5af5181af1c7238ae86 SHA512 2032b6528cb27b69d8fb6a6f64af32fcc1f6e4934bb0d7c8931b38ab7ad5e27f6f4344a6cf49751fa3178cd725f954e195373362f7d5929e587d7f0309346059 WHIRLPOOL eb2d5ee79f39cfb41a0f9778759b81bd1db9431774f9b673013b3602d897b4b91fd31cba5682763f04562f509086fe9346e26736573ca1b4aa123e24ffe4c7aa
+DIST socat-1.7.3.0.tar.bz2 474633 SHA256 0767e850c0329b9fdf711c6cd468565cbbb28786ba1a8a1cbd5531d4016b3e04 SHA512 e567efd6cd31a517ffb1622983640396c6c1db93e8cc4be01b6047ac00b2fbd8474ffb9f96d2af33d24939cddb36ee4b71deb87a5a0101b1f1fb959fa436baad WHIRLPOOL 0ea897879e4d21d678e87c03d11c084a418b5ce179021f0f175db2f5877f250b6d56e42e38f6b9dbcdff7ce0d81970573d41b30a77b1768e659785792e5ae03f
+EBUILD socat-1.7.3.0.ebuild 1245 SHA256 1483b0abab3677a3373a61c39a819f15a0bb481b7ebeeece0d68a2804bb5d75e SHA512 a595e983d8e9a0c8ac336d42580ef93ec329294cbaadb42f11094d4245ccd18b29aa27bb4cc54f6f68fbc75c519827bf9bc8a1d66aa1a9500811cb5cfd773ab2 WHIRLPOOL 842722e2dd5d2a47eec5073c972c232e93135ed9fa14d2905e7994141c7133e75b2ff22585bfdf9aec737c8119039648b4d9150451578441d54d31e2f667ce01
diff --git a/net-misc/socat/files/socat-1.7.3.0-filan-build.patch b/net-misc/socat/files/socat-1.7.3.0-filan-build.patch
new file mode 100644
index 0000000..861c673
--- /dev/null
+++ b/net-misc/socat/files/socat-1.7.3.0-filan-build.patch
@@ -0,0 +1,30 @@
+From aae2ea107b543fa908956f2fdcdf6db684e4a2e6 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Fri, 24 Apr 2015 23:06:37 -0400
+Subject: [PATCH] filan: fix depend list
+
+The link line contains more objects than the depend line; sync them like
+procan does. Otherwise, parallel builds randomly fail.
+---
+ Makefile.in | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index f2a6edb..0c00459 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -118,8 +118,9 @@ PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o hostan.o error.o sycls.o sysut
+ procan: $(PROCAN_OBJS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(PROCAN_OBJS) $(CLIBS)
+
+-filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o
+- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o $(CLIBS)
++FILAN_OBJS=filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o
++filan: $(FILAN_OBJS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(FILAN_OBJS) $(CLIBS)
+
+ libxio.a: $(XIOOBJS) $(UTLOBJS)
+ $(AR) r $@ $(XIOOBJS) $(UTLOBJS)
+--
+2.3.5
+
diff --git a/net-misc/socat/files/socat-1.7.3.0-musl-comapt.patch b/net-misc/socat/files/socat-1.7.3.0-musl-comapt.patch
new file mode 100644
index 0000000..5ef90ac
--- /dev/null
+++ b/net-misc/socat/files/socat-1.7.3.0-musl-comapt.patch
@@ -0,0 +1,11 @@
+--- socat-1.7.2.4.orig/sysincludes.h
++++ socat-1.7.2.4/sysincludes.h
+@@ -134,7 +134,7 @@
+ #include <netpacket/packet.h>
+ #endif
+ #if HAVE_NETINET_IF_ETHER_H
+-#include <netinet/if_ether.h>
++#include <linux/if_ether.h>
+ #endif
+ #if HAVE_LINUX_IF_TUN_H
+ #include <linux/if_tun.h>
diff --git a/net-misc/socat/socat-1.7.3.0.ebuild b/net-misc/socat/socat-1.7.3.0.ebuild
new file mode 100644
index 0000000..f18198e
--- /dev/null
+++ b/net-misc/socat/socat-1.7.3.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/socat/socat-1.7.3.0.ebuild,v 1.11 2015/04/24 23:11:21 vapier Exp $
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Multipurpose relay (SOcket CAT)"
+HOMEPAGE="http://www.dest-unreach.org/socat/"
+MY_P=${P/_beta/-b}
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://www.dest-unreach.org/socat/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="ssl readline ipv6 tcpd"
+
+DEPEND="
+ ssl? ( >=dev-libs/openssl-0.9.6 )
+ readline? ( >=sys-libs/readline-4.1 )
+ tcpd? ( sys-apps/tcp-wrappers )
+"
+RDEPEND="${DEPEND}"
+
+RESTRICT="test"
+
+DOCS=(
+ BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ FILES PORTING README SECURITY
+)
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-filan-build.patch
+ epatch "${FILESDIR}"/${P}-musl-comapt.patch
+}
+
+src_configure() {
+ filter-flags '-Wno-error*' #293324
+ tc-export AR
+ econf \
+ $(use_enable ssl openssl) \
+ $(use_enable readline) \
+ $(use_enable ipv6 ip6) \
+ $(use_enable tcpd libwrap)
+}
+
+src_install() {
+ default
+
+ dohtml doc/*.html doc/*.css
+}