From f7db94eb28d0a8c4d80d8b9de9573ba886a31784 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Fri, 18 Dec 2020 09:08:52 +0100 Subject: [PATCH] Remove incbin from ext and referencs to it --- .../debian/dnsdist/debian-buster/copyright | 4 - .../debian/dnsdist/debian-jessie/copyright | 4 - .../debian/dnsdist/debian-stretch/copyright | 4 - ext/Makefile.am | 3 +- ext/incbin/UNLICENSE | 24 -- ext/incbin/incbin.h | 223 ------------------ pdns/dnsdistdist/Makefile.am | 2 - pdns/dnsdistdist/ext/incbin/UNLICENSE | 1 - pdns/dnsdistdist/ext/incbin/incbin.h | 1 - pdns/recursordist/ext/Makefile.am | 4 +- pdns/recursordist/ext/incbin | 1 - 11 files changed, 3 insertions(+), 268 deletions(-) delete mode 100644 ext/incbin/UNLICENSE delete mode 100644 ext/incbin/incbin.h delete mode 120000 pdns/dnsdistdist/ext/incbin/UNLICENSE delete mode 120000 pdns/dnsdistdist/ext/incbin/incbin.h delete mode 120000 pdns/recursordist/ext/incbin diff --git a/builder-support/debian/dnsdist/debian-buster/copyright b/builder-support/debian/dnsdist/debian-buster/copyright index 4457ca9492..0b011f2772 100644 --- a/builder-support/debian/dnsdist/debian-buster/copyright +++ b/builder-support/debian/dnsdist/debian-buster/copyright @@ -12,10 +12,6 @@ Copyright: 2002-2016 PowerDNS.COM BV and contributors License: GPL-2 with OpenSSL Exception Comment: Debian packaging is under same license as upstream code -Files: ext/incbin/* -Copyright: 2015, Dale Weiler -License: Unlicense - Files: ext/json11/* Copyright: 2013 Dropbox, Inc. License: Expat diff --git a/builder-support/debian/dnsdist/debian-jessie/copyright b/builder-support/debian/dnsdist/debian-jessie/copyright index 366955ef34..43038fe5d7 100644 --- a/builder-support/debian/dnsdist/debian-jessie/copyright +++ b/builder-support/debian/dnsdist/debian-jessie/copyright @@ -12,10 +12,6 @@ Copyright: 2002-2016 PowerDNS.COM BV and contributors License: GPL-2 with OpenSSL Exception Comment: Debian packaging is under same license as upstream code -Files: ext/incbin/* -Copyright: 2015, Dale Weiler -License: Unlicense - Files: ext/json11/* Copyright: 2013 Dropbox, Inc. License: Expat diff --git a/builder-support/debian/dnsdist/debian-stretch/copyright b/builder-support/debian/dnsdist/debian-stretch/copyright index 366955ef34..43038fe5d7 100644 --- a/builder-support/debian/dnsdist/debian-stretch/copyright +++ b/builder-support/debian/dnsdist/debian-stretch/copyright @@ -12,10 +12,6 @@ Copyright: 2002-2016 PowerDNS.COM BV and contributors License: GPL-2 with OpenSSL Exception Comment: Debian packaging is under same license as upstream code -Files: ext/incbin/* -Copyright: 2015, Dale Weiler -License: Unlicense - Files: ext/json11/* Copyright: 2013 Dropbox, Inc. License: Expat diff --git a/ext/Makefile.am b/ext/Makefile.am index 1a99b60386..7c0a42d419 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -9,5 +9,4 @@ DIST_SUBDIRS = \ yahttp EXTRA_DIST = \ - luawrapper/include/LuaContext.hpp \ - incbin/incbin.h + luawrapper/include/LuaContext.hpp diff --git a/ext/incbin/UNLICENSE b/ext/incbin/UNLICENSE deleted file mode 100644 index 68a49daad8..0000000000 --- a/ext/incbin/UNLICENSE +++ /dev/null @@ -1,24 +0,0 @@ -This is free and unencumbered software released into the public domain. - -Anyone is free to copy, modify, publish, use, compile, sell, or -distribute this software, either in source code form or as a compiled -binary, for any purpose, commercial or non-commercial, and by any -means. - -In jurisdictions that recognize copyright laws, the author or authors -of this software dedicate any and all copyright interest in the -software to the public domain. We make this dedication for the benefit -of the public at large and to the detriment of our heirs and -successors. We intend this dedication to be an overt act of -relinquishment in perpetuity of all present and future rights to this -software under copyright law. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -For more information, please refer to diff --git a/ext/incbin/incbin.h b/ext/incbin/incbin.h deleted file mode 100644 index c10e247804..0000000000 --- a/ext/incbin/incbin.h +++ /dev/null @@ -1,223 +0,0 @@ -/** - * @file incbin.h - * @author Dale Weiler - * @brief Utility for including binary files - * - * Facilities for including binary files into the current translation unit and - * making use from them externally in other translation units. - */ -#ifndef INCBIN_HDR -#define INCBIN_HDR -#include - -#if defined(__SSE__) || defined(__neon__) -# define INCBIN_ALIGNMENT_INDEX 4 -#elif defined(__AVX__) -# define INCBIN_ALIGNMENT_INDEX 5 -#else -# if ULONG_MAX == 0xffffffffu -# define INCBIN_ALIGNMENT_INDEX 2 -# else -# define INCBIN_ALIGNMENT_INDEX 3 -# endif -#endif - -/* Lookup table of (1 << n) where `n' is `INCBIN_ALIGNMENT_INDEX' */ -#define INCBIN_ALIGN_SHIFT_0 1 -#define INCBIN_ALIGN_SHIFT_1 2 -#define INCBIN_ALIGN_SHIFT_2 4 -#define INCBIN_ALIGN_SHIFT_3 8 -#define INCBIN_ALIGN_SHIFT_4 16 -#define INCBIN_ALIGN_SHIFT_5 32 - -/* Common preprocessor utilities */ -#define INCBIN_STR(X) #X -#define INCBIN_STRINGIZE(X) INCBIN_STR(X) - -#define INCBIN_CAT(X, Y) X ## Y -#define INCBIN_CONCATENATE(X, Y) INCBIN_CAT(X, Y) - -#define INCBIN_ALIGNMENT \ - INCBIN_CONCATENATE(INCBIN_ALIGN_SHIFT_, INCBIN_ALIGNMENT_INDEX) - -/* Green Hills uses a different directive for including binary data */ -#if defined(__ghs__) -# define INCBIN_MACRO "\tINCBIN" -#else -# define INCBIN_MACRO ".incbin" -#endif - -#ifndef _MSC_VER -# define INCBIN_ALIGN \ - __attribute__((aligned(INCBIN_ALIGNMENT))) -#else -# define INCBIN_ALIGN __declspec(align(INCBIN_ALIGNMENT)) -#endif - -#if defined(__arm__) || /* GNU C and RealView */ \ - defined(__arm) || /* Diab */ \ - defined(_ARM) /* ImageCraft */ -# define INCBIN_ARM -#endif - -#ifdef __GNUC__ -/* Utilize .balign where supported */ -# define INCBIN_ALIGN_HOST ".balign " INCBIN_STRINGIZE(INCBIN_ALIGNMENT) "\n" -# define INCBIN_ALIGN_BYTE ".balign 1\n" -#elif defined(INCBIN_ARM) -/* - * On arm assemblers, the alignment value is calculated as (1 << n) where `n' is - * the shift count. This is the value passed to `.align' - */ -# define INCBIN_ALIGN_HOST ".align" INCBIN_STRINGIZE(INCBIN_ALIGNMENT_INDEX) "\n" -# define INCBIN_ALIGN_BYTE ".align 0\n" -#else -/* We assume other inline assembler's treat `.align' as `.balign' */ -# define INCBIN_ALIGN_HOST ".align" INCBIN_STRINGIZE(INCBIN_ALIGNMENT) "\n" -# define INCBIN_ALIGN_BYTE ".align 1\n" -#endif - -/* INCBIN_CONST is used by incbin.c generated files */ -#if defined(__cplusplus) -# define INCBIN_EXTERNAL extern "C" -# define INCBIN_CONST extern const -#else -# define INCBIN_EXTERNAL extern -# define INCBIN_CONST const -#endif - -#if defined(__APPLE__) -/* The directives are different for Apple branded compilers */ -# define INCBIN_SECTION ".const_data\n" -# define INCBIN_GLOBAL(NAME) ".globl " INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME "\n" -# define INCBIN_INT ".long " -# define INCBIN_MANGLE "_" -# define INCBIN_BYTE ".byte " -# define INCBIN_TYPE(...) -#else -# define INCBIN_SECTION ".section .rodata\n" -# define INCBIN_GLOBAL(NAME) ".global " INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME "\n" -# define INCBIN_INT ".int " -# if defined(__USER_LABEL_PREFIX__) -# define INCBIN_MANGLE INCBIN_STRINGIZE(__USER_LABEL_PREFIX__) -# else -# define INCBIN_MANGLE "" -# endif -# if defined(INCBIN_ARM) -/* On arm assemblers, `@' is used as a line comment token */ -# define INCBIN_TYPE(NAME) ".type " INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME ", %object\n" -# else -/* It's safe to use `@' on other architectures */ -# define INCBIN_TYPE(NAME) ".type " INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME ", @object\n" -# endif -# define INCBIN_BYTE ".byte " -#endif - -/** - * @breif Specify the prefix to use for symbol names. - * - * By default this is `g', producing symbols of the form: - * @code - * #include "incbin.h" - * INCBIN(Foo, "foo.txt"); - * - * // Now you have the following symbols: - * // const unsigned char gFooData[]; - * // const unsigned char *gFooEnd; - * // const unsigned int gFooSize; - * @endcode - * - * If however you specify a prefix before including: e.g: - * @code - * #define INCBIN_PREFIX incbin - * #include "incbin.h" - * INCBIN(Foo, "foo.txt"); - * - * // Now you have the following symbols instead: - * // const unsigned char incbinFooData[]; - * // const unsigned char *incbinFooEnd; - * // const unsigned int incbinFooSize; - * @endcode - */ -#if !defined(INCBIN_PREFIX) -# define INCBIN_PREFIX g -#endif - -/** - * @brief Externally reference binary data included in another translation unit. - * - * Produces three external symbols that reference the binary data included in - * another translation unit. - * - * The symbol names are a concatenation of `INCBIN_PREFIX' before *NAME*; with - * "Data", as well as "End" and "Size" after. An example is provided below. - * - * @param NAME The name given for the binary data - * - * @code - * INCBIN_EXTERN(Foo); - * - * // Now you have the following symbols: - * // extern const unsigned char FooData[]; - * // extern const unsigned char *FooEnd; - * // extern const unsigned int FooSize; - * @endcode - */ -#define INCBIN_EXTERN(NAME) \ - INCBIN_EXTERNAL const INCBIN_ALIGN unsigned char INCBIN_CONCATENATE(INCBIN_PREFIX, NAME ## Data)[]; \ - INCBIN_EXTERNAL const INCBIN_ALIGN unsigned char *INCBIN_CONCATENATE(INCBIN_PREFIX, NAME ## End); \ - INCBIN_EXTERNAL const unsigned int INCBIN_CONCATENATE(INCBIN_PREFIX, NAME ## Size) - -/** - * @brief Include a binary file into the current translation unit. - * - * Includes a binary file into the current translation unit, producing three symbols - * for objects that encode the data and size respectively. - * - * The symbol names are a concatenation of `INCBIN_PREFIX' before *NAME*; with - * "Data", as well as "End" and "Size" after. An example is provided below. - * - * @param NAME The name to associate with this binary data (as an identifier.) - * @param FILENAME The file to include (as a string literal.) - * - * @code - * INCBIN(Icon, "icon.png"); - * - * // Now you have the following symbols: - * // const unsigned char IconData[]; - * // const unsigned char *IconEnd; - * // const unsigned int IconSize; - * @endcode - * - * @warning This must be used in global scope - * - * To externally reference the data included by this in another translation unit - * please @see INCBIN_EXTERN. - */ -#ifdef _MSC_VER -#define INCBIN(NAME, FILENAME) \ - INCBIN_EXTERN(NAME) -#else -#define INCBIN(NAME, FILENAME) \ - __asm__(INCBIN_SECTION \ - INCBIN_GLOBAL(NAME ## Data) \ - INCBIN_TYPE(NAME ## Data) \ - INCBIN_ALIGN_HOST \ - INCBIN_MANGLE INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME "Data:\n" \ - INCBIN_MACRO " \"" FILENAME "\"\n" \ - INCBIN_GLOBAL(NAME ## End) \ - INCBIN_TYPE(NAME ## End) \ - INCBIN_ALIGN_BYTE \ - INCBIN_MANGLE INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME "End:\n" \ - INCBIN_BYTE "1\n" \ - INCBIN_GLOBAL(NAME ## Size) \ - INCBIN_TYPE(NAME ## Size) \ - INCBIN_ALIGN_HOST \ - INCBIN_MANGLE INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME "Size:\n" \ - INCBIN_INT INCBIN_MANGLE INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME "End - " \ - INCBIN_MANGLE INCBIN_STRINGIZE(INCBIN_PREFIX) #NAME "Data\n" \ - ); \ - INCBIN_EXTERN(NAME) - -#endif -#endif diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am index 951fc03609..f6116851fe 100644 --- a/pdns/dnsdistdist/Makefile.am +++ b/pdns/dnsdistdist/Makefile.am @@ -82,7 +82,6 @@ EXTRA_DIST=COPYING \ delaypipe.cc delaypipe.hh \ html \ contrib \ - ext/incbin/UNLICENSE \ incfiles \ src_js \ dnsdist.service.in \ @@ -174,7 +173,6 @@ dnsdist_SOURCES = \ ednscookies.cc ednscookies.hh \ ednsoptions.cc ednsoptions.hh \ ednssubnet.cc ednssubnet.hh \ - ext/incbin/incbin.h \ ext/json11/json11.cpp \ ext/json11/json11.hpp \ ext/libbpf/libbpf.h \ diff --git a/pdns/dnsdistdist/ext/incbin/UNLICENSE b/pdns/dnsdistdist/ext/incbin/UNLICENSE deleted file mode 120000 index 2af878d82d..0000000000 --- a/pdns/dnsdistdist/ext/incbin/UNLICENSE +++ /dev/null @@ -1 +0,0 @@ -../../../../ext/incbin/UNLICENSE \ No newline at end of file diff --git a/pdns/dnsdistdist/ext/incbin/incbin.h b/pdns/dnsdistdist/ext/incbin/incbin.h deleted file mode 120000 index ef17090c2c..0000000000 --- a/pdns/dnsdistdist/ext/incbin/incbin.h +++ /dev/null @@ -1 +0,0 @@ -../../../../ext/incbin/incbin.h \ No newline at end of file diff --git a/pdns/recursordist/ext/Makefile.am b/pdns/recursordist/ext/Makefile.am index b4b000d059..a908d92a41 100644 --- a/pdns/recursordist/ext/Makefile.am +++ b/pdns/recursordist/ext/Makefile.am @@ -10,5 +10,5 @@ DIST_SUBDIRS = \ EXTRA_DIST = \ luawrapper/include/LuaContext.hpp \ - yahttp/LICENSE \ - json11/LICENSE.txt incbin/incbin.h + json11/LICENSE.txt \ + yahttp/LICENSE diff --git a/pdns/recursordist/ext/incbin b/pdns/recursordist/ext/incbin deleted file mode 120000 index e033579050..0000000000 --- a/pdns/recursordist/ext/incbin +++ /dev/null @@ -1 +0,0 @@ -../../../ext/incbin \ No newline at end of file -- 2.47.2