commit: 2630355ae991ebe3a7e1c3d82bc9f93437d3e2f6 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Tue Nov 10 06:27:50 2015 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Tue Nov 10 06:32:09 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2630355a
net-misc/socat: Remove obsolete patches. Package-Manager: portage-2.2.24 net-misc/socat/files/socat-1.7.2.1-long-long.patch | 64 ---------------------- .../socat/files/socat-1.7.2.4-linux-3.17.patch | 14 ----- 2 files changed, 78 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 deleted file mode 100644 index 45a73dc..0000000 --- a/net-misc/socat/files/socat-1.7.2.1-long-long.patch +++ /dev/null @@ -1,64 +0,0 @@ -https://bugs.gentoo.org/436164 - -From cbb59d88e2d83ded78bd4b85a0c1a4f37be60589 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vap...@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 <vap...@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 deleted file mode 100644 index 6bf990a..0000000 --- a/net-misc/socat/files/socat-1.7.2.4-linux-3.17.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- 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)