summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-misc/socat/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-misc/socat/files')
-rw-r--r--net-misc/socat/files/socat-1.7.2.1-long-long.patch64
-rw-r--r--net-misc/socat/files/socat-1.7.2.4-linux-3.17.patch14
-rw-r--r--net-misc/socat/files/socat-1.7.3.0-filan-build.patch30
3 files changed, 108 insertions, 0 deletions
diff --git a/net-misc/socat/files/socat-1.7.2.1-long-long.patch b/net-misc/socat/files/socat-1.7.2.1-long-long.patch
new file mode 100644
index 000000000000..45a73dccb2c5
--- /dev/null
+++ b/net-misc/socat/files/socat-1.7.2.1-long-long.patch
@@ -0,0 +1,64 @@
+https://bugs.gentoo.org/436164
+
+From cbb59d88e2d83ded78bd4b85a0c1a4f37be60589 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Thu, 25 Oct 2012 22:34:12 -0400
+Subject: [PATCH] support long long sizes with more basic types
+
+Some newer ABIs (like x32) use 64bit sizes with basic types.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ compat.h | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/compat.h b/compat.h
+index d581fad..ecff2ee 100644
+--- a/compat.h
++++ b/compat.h
+@@ -232,6 +232,10 @@
+ #define F_time "%ld"
+ # elif HAVE_BASIC_TIME_T==6
+ #define F_time "%lu"
++# elif HAVE_BASIC_TIME_T==7
++#define F_time "%Ld"
++# elif HAVE_BASIC_TIME_T==8
++#define F_time "%Lu"
+ # else
+ #error "HAVE_BASIC_TIME_T is out of range:" HAVE_BASIC_TIME_T
+ # endif
+@@ -256,6 +260,10 @@
+ #define F_socklen "%ld"
+ # elif HAVE_BASIC_SOCKLEN_T==6
+ #define F_socklen "%lu"
++# elif HAVE_BASIC_SOCKLEN_T==7
++#define F_socklen "%Ld"
++# elif HAVE_BASIC_SOCKLEN_T==8
++#define F_socklen "%Lu"
+ # else
+ #error "HAVE_BASIC_SOCKLEN_T is out of range:" HAVE_BASIC_SOCKLEN_T
+ # endif
+@@ -404,6 +412,10 @@
+ #define F_st_nlink "%ld"
+ # elif HAVE_TYPEOF_ST_NLINK==6
+ #define F_st_nlink "%lu"
++# elif HAVE_TYPEOF_ST_NLINK==7
++#define F_st_nlink "%Ld"
++# elif HAVE_TYPEOF_ST_NLINK==8
++#define F_st_nlink "%Lu"
+ # else
+ #error "HAVE_TYPEOF_ST_NLINK is out of range:" HAVE_TYPEOF_ST_NLINK
+ # endif
+@@ -481,6 +493,10 @@
+ #define F_st_blksize "%ld"
+ # elif HAVE_TYPEOF_ST_BLKSIZE==6
+ #define F_st_blksize "%lu"
++# elif HAVE_TYPEOF_ST_BLKSIZE==7
++#define F_st_blksize "%Ld"
++# elif HAVE_TYPEOF_ST_BLKSIZE==8
++#define F_st_blksize "%Lu"
+ # else
+ #error "HAVE_TYPEOF_ST_BLKSIZE is out of range:" HAVE_TYPEOF_ST_BLKSIZE
+ # endif
+--
+1.7.12
diff --git a/net-misc/socat/files/socat-1.7.2.4-linux-3.17.patch b/net-misc/socat/files/socat-1.7.2.4-linux-3.17.patch
new file mode 100644
index 000000000000..6bf990a9b610
--- /dev/null
+++ b/net-misc/socat/files/socat-1.7.2.4-linux-3.17.patch
@@ -0,0 +1,14 @@
+--- a/configure.in
++++ b/configure.in
+@@ -80,7 +80,10 @@
+ AC_CHECK_HEADERS(termios.h linux/if_tun.h)
+ AC_CHECK_HEADERS(net/if_dl.h)
+ AC_CHECK_HEADERS(linux/types.h)
+-AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [#include <linux/types.h>])
++AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [AC_INCLUDES_DEFAULT
++ #if HAVE_LINUX_TYPES_H
++ #include <linux/types.h>
++ #endif])
+ AC_CHECK_HEADERS(sys/utsname.h sys/select.h sys/file.h)
+ AC_CHECK_HEADERS(util.h bsd/libutil.h libutil.h sys/stropts.h regex.h)
+ AC_CHECK_HEADERS(linux/fs.h linux/ext2_fs.h)
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 000000000000..861c673ad91d
--- /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
+