diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-08-29 22:47:16 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-08-29 22:47:16 +0100 |
commit | 8993ea73a9714d22178ba6ada8c04be83cd71ec7 (patch) | |
tree | eec3cc3c457b3e760f6ca631fd51e0c004705e88 /net-libs/libsrtp/files | |
parent | ae838334efa4ecfd172331e8f5ae4eea8c5dd876 (diff) |
gentoo auto-resync : 29:08:2022 - 22:47:16
Diffstat (limited to 'net-libs/libsrtp/files')
-rw-r--r-- | net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch | 26 | ||||
-rw-r--r-- | net-libs/libsrtp/files/libsrtp-2.2.0-pcap-automagic-r0.patch | 20 | ||||
-rw-r--r-- | net-libs/libsrtp/files/libsrtp-2.4.2-doc.patch | 42 |
3 files changed, 42 insertions, 46 deletions
diff --git a/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch b/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch deleted file mode 100644 index 771ae0f51448..000000000000 --- a/net-libs/libsrtp/files/libsrtp-2.2.0-gcc-10.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/crypto/math/datatypes.c b/crypto/math/datatypes.c -index c0dfece..ec2fe6d 100644 ---- a/crypto/math/datatypes.c -+++ b/crypto/math/datatypes.c -@@ -79,7 +79,7 @@ int octet_get_weight(uint8_t octet) - - /* the value MAX_PRINT_STRING_LEN is defined in datatypes.h */ - --char bit_string[MAX_PRINT_STRING_LEN]; -+static char bit_string[MAX_PRINT_STRING_LEN]; - - uint8_t srtp_nibble_to_hex_char(uint8_t nibble) - { -diff --git a/test/util.c b/test/util.c -index eb203f4..04e149c 100644 ---- a/test/util.c -+++ b/test/util.c -@@ -47,7 +47,7 @@ - #include <string.h> - #include <stdint.h> - --char bit_string[MAX_PRINT_STRING_LEN]; -+static char bit_string[MAX_PRINT_STRING_LEN]; - - static inline int hex_char_to_nibble(uint8_t c) - { diff --git a/net-libs/libsrtp/files/libsrtp-2.2.0-pcap-automagic-r0.patch b/net-libs/libsrtp/files/libsrtp-2.2.0-pcap-automagic-r0.patch deleted file mode 100644 index 1075825945cb..000000000000 --- a/net-libs/libsrtp/files/libsrtp-2.2.0-pcap-automagic-r0.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -uNr libsrtp-2.2.0.ORIG/configure.ac libsrtp-2.2.0/configure.ac ---- libsrtp-2.2.0.ORIG/configure.ac 2018-06-18 13:28:52.385014993 +0100 -+++ libsrtp-2.2.0/configure.ac 2018-06-18 13:31:09.217020686 +0100 -@@ -273,6 +273,8 @@ - - dnl Checking for PCAP - -+AC_ARG_ENABLE([pcap], AS_HELP_STRING([--disable-pcap], [Build without `pcap' library (-lpcap)])) -+AS_IF([test "x$enable_pcap" != "xno"], [ - PCAP_LIB="" - AC_CHECK_LIB([pcap], [pcap_create], - [PCAP_LIB="-lpcap" -@@ -284,6 +286,7 @@ - AC_DEFINE([HAVE_PCAP], [1], [Define to 1 if you have the `winpcap' library (-lwpcap)]) - AC_SUBST([HAVE_PCAP], [1])]) - AC_SUBST([PCAP_LIB]) -+]) - - AC_MSG_CHECKING([whether to redirect logging to stdout]) - AC_ARG_ENABLE([log-stdout], diff --git a/net-libs/libsrtp/files/libsrtp-2.4.2-doc.patch b/net-libs/libsrtp/files/libsrtp-2.4.2-doc.patch new file mode 100644 index 000000000000..571c3f3c5d44 --- /dev/null +++ b/net-libs/libsrtp/files/libsrtp-2.4.2-doc.patch @@ -0,0 +1,42 @@ +--- a/doc/Doxyfile.in ++++ b/doc/Doxyfile.in +@@ -771,13 +771,13 @@ WARN_LOGFILE = + # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING + # Note: If this tag is empty the current directory is searched. + +-INPUT = ../README.md \ +- ../include/srtp.h \ +- ../crypto/include/auth.h \ +- ../crypto/include/cipher.h \ +- ../crypto/include/crypto_types.h \ +- ../crypto/include/err.h \ +- crypto_kernel.txt ++INPUT = @TOP_SRCDIR@/README.md \ ++ @TOP_SRCDIR@/include/srtp.h \ ++ @TOP_SRCDIR@/crypto/include/auth.h \ ++ @TOP_SRCDIR@/crypto/include/cipher.h \ ++ @TOP_SRCDIR@/crypto/include/crypto_types.h \ ++ @TOP_SRCDIR@/crypto/include/err.h \ ++ @TOP_SRCDIR@/doc/crypto_kernel.txt + + # This tag can be used to specify the character encoding of the source files + # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +@@ -1104,7 +1104,7 @@ HTML_FOOTER = + # obsolete. + # This tag requires that the tag GENERATE_HTML is set to YES. + +-HTML_STYLESHEET = docs.css ++HTML_STYLESHEET = @TOP_SRCDIR@/doc/docs.css + + # The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined + # cascading style sheets that are included after the standard style sheets +--- a/doc/meson.build ++++ b/doc/meson.build +@@ -8,6 +8,7 @@ endif + + doc_config = configuration_data() + doc_config.set('LIBSRTPVERSIONNUMBER', meson.project_version()) ++doc_config.set('TOP_SRCDIR', meson.source_root()) + + doxyfile = configure_file(input: 'Doxyfile.in', + output: 'Doxyfile', |