From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- .../files/dahdi-tools-3.1.0-cplusplusexternc.patch | 26 ++++++++++++++ .../files/dahdi-tools-3.1.0-execinfo.patch | 40 ++++++++++++++++++++++ .../files/dahdi-tools-3.1.0-fno-common.patch | 39 +++++++++++++++++++++ 3 files changed, 105 insertions(+) create mode 100644 net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch create mode 100644 net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch create mode 100644 net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch (limited to 'net-misc/dahdi-tools/files') diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch new file mode 100644 index 000000000000..37d1402c404f --- /dev/null +++ b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-cplusplusexternc.patch @@ -0,0 +1,26 @@ +diff --git a/./dahdi-tools-3.1.0/xpp/hexfile.h.o b/./dahdi-tools-3.1.0/xpp/hexfile.h +index 33ff50d..3d03f98 100644 +--- a/xpp/hexfile.h ++++ b/xpp/hexfile.h +@@ -70,7 +70,9 @@ struct hexdata { + }; + + +-__BEGIN_DECLS ++#ifdef __cpluplus ++extern "C" { ++#endif + + typedef void (*parse_hexfile_report_func_t)(int level, const char *msg, ...) + #ifdef __GNUC__ +@@ -86,6 +88,9 @@ int dump_hexfile2(struct hexdata *hexdata, const char *outfile, uint8_t maxwidth + void dump_binary(struct hexdata *hexdata, const char *outfile); + void gen_hexline(const uint8_t *data, uint16_t addr, size_t len, FILE *output); + int bsd_checksum(struct hexdata *hexdata); +-__END_DECLS ++ ++#ifdef __cpluplus ++} ++#endif + + #endif diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch new file mode 100644 index 000000000000..b222a85d8cb9 --- /dev/null +++ b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-execinfo.patch @@ -0,0 +1,40 @@ +--- a/configure.ac 2020-03-28 22:28:35.614340050 +0200 ++++ b/configure.ac 2020-03-28 22:28:55.084181570 +0200 +@@ -161,6 +161,7 @@ + # Checks for header files. + AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h]) + AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h]) ++AC_CHECK_HEADERS([execinfo.h]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_C_INLINE +--- a/xpp/xtalk/debug.c 2020-03-28 22:41:43.507810560 +0200 ++++ b/xpp/xtalk/debug.c 2020-03-28 22:41:10.538087608 +0200 +@@ -27,8 +27,10 @@ + #include + #include +-#include + #include + #include ++#ifdef HAVE_EXECINFO_H ++#include ++#endif + + int verbose = LOG_INFO; + int debug_mask; +@@ -61,6 +63,7 @@ + /* from glibc info(1) */ + void print_backtrace(FILE *fp) + { ++#ifdef HAVE_EXECINFO_H + void *array[10]; + size_t size; + char **strings; +@@ -71,4 +74,7 @@ + for (i = 0; i < size; i++) + fprintf(fp, "%s\n", strings[i]); + free(strings); ++#else ++ fprintf(fp, "backtrace information only available if execinfo.h is available.\n"); ++#endif + } diff --git a/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch new file mode 100644 index 000000000000..3ca5bd2aa09b --- /dev/null +++ b/net-misc/dahdi-tools/files/dahdi-tools-3.1.0-fno-common.patch @@ -0,0 +1,39 @@ +diff --git a/xpp/mpptalk.c b/xpp/mpptalk.c +index fdb34f1..8fb3687 100644 +--- a/xpp/mpptalk.c ++++ b/xpp/mpptalk.c +@@ -237,7 +237,7 @@ union XTALK_PDATA(MPP) { + MEMBER(MPP, TWS_PORT_GET_REPLY); + MEMBER(MPP, TWS_PWR_GET); + MEMBER(MPP, TWS_PWR_GET_REPLY); +-} PACKED members; ++} PACKED; + + /* + * Statuses +diff --git a/xpp/xtalk/xtalk_raw.c b/xpp/xtalk/xtalk_raw.c +index 49e47d5..251a502 100644 +--- a/xpp/xtalk/xtalk_raw.c ++++ b/xpp/xtalk/xtalk_raw.c +@@ -48,7 +48,7 @@ CMD_DEF(XTALK, ACK, + + union XTALK_PDATA(XTALK) { + MEMBER(XTALK, ACK); +-} PACKED members; ++} PACKED; + + const struct xtalk_protocol xtalk_raw_proto = { + .name = "XTALK-RAW", +diff --git a/xpp/xtalk/xtalk_sync.c b/xpp/xtalk/xtalk_sync.c +index 18a5cad..ffa79d2 100644 +--- a/xpp/xtalk/xtalk_sync.c ++++ b/xpp/xtalk/xtalk_sync.c +@@ -60,7 +60,7 @@ union XTALK_PDATA(XTALK) { + MEMBER(XTALK, ACK); + MEMBER(XTALK, PROTO_GET); + MEMBER(XTALK, PROTO_GET_REPLY); +-} PACKED members; ++} PACKED; + + const struct xtalk_protocol xtalk_sync_proto = { + .name = "XTALK-SYNC", -- cgit v1.2.3