Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/unbound merge conflicts and update configuratio...
details: https://anonhg.NetBSD.org/src/rev/0990366e6cfd
branches: trunk
changeset: 370692:0990366e6cfd
user: christos <christos%NetBSD.org@localhost>
date: Sat Sep 24 18:11:42 2022 +0000
description:
merge conflicts and update configuration between 1.13.1 and 1.16.3
diffstat:
external/bsd/unbound/dist/.github/FUNDING.yml | 2 -
external/bsd/unbound/dist/.travis.yml | 344 ------
external/bsd/unbound/dist/config.guess | 1264 ++++++++++++-----------
external/bsd/unbound/dist/config.sub | 96 +-
external/bsd/unbound/dist/libunbound/unbound.h | 34 +-
external/bsd/unbound/dist/services/authzone.c | 2 +-
external/bsd/unbound/dist/util/mini_event.c | 9 +
external/bsd/unbound/dist/util/netevent.c | 218 +++-
external/bsd/unbound/include/config.h | 55 +-
9 files changed, 986 insertions(+), 1038 deletions(-)
diffs (truncated from 3491 to 300 lines):
diff -r 40d8010e01f2 -r 0990366e6cfd external/bsd/unbound/dist/.github/FUNDING.yml
--- a/external/bsd/unbound/dist/.github/FUNDING.yml Sat Sep 24 18:08:44 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-github: [NLnetLabs]
-custom: ['https://nlnetlabs.nl/funding/']
diff -r 40d8010e01f2 -r 0990366e6cfd external/bsd/unbound/dist/.travis.yml
--- a/external/bsd/unbound/dist/.travis.yml Sat Sep 24 18:08:44 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,344 +0,0 @@
-language: c
-
-git:
- depth: 5
-
-addons:
- apt:
- packages:
- - libssl-dev
- - libevent-dev
- - libexpat-dev
- - clang
- homebrew:
- packages:
- - openssl
- - libevent
- - expat
- update: true
-
-jobs:
- include:
- - os: linux
- name: GCC on Linux, Amd64
- compiler: gcc
- arch: amd64
- env:
- - CONFIG_OPTS="--enable-debug --disable-flto"
- - os: linux
- name: Clang on Linux, Amd64
- compiler: clang
- arch: amd64
- env:
- - CONFIG_OPTS="--enable-debug --disable-flto"
- - os: osx
- name: Clang on OS X, Amd64
- compiler: clang
- arch: amd64
- env:
- - TEST_OSX=yes
- - CONFIG_OPTS="--enable-debug --disable-flto --with-ssl=/usr/local/opt/openssl/"
- - os: linux
- name: Libevent, GCC on Linux, Amd64
- compiler: gcc
- arch: amd64
- env:
- - TEST_LIBEVENT=yes
- - CONFIG_OPTS="--with-libevent"
- - os: linux
- name: Libevent, Clang on Linux, Amd64
- compiler: clang
- arch: amd64
- env:
- - TEST_LIBEVENT=yes
- - CONFIG_OPTS="--with-libevent"
- - os: osx
- name: Libevent, Clang on OS X, Amd64
- compiler: clang
- arch: amd64
- env:
- - TEST_OSX=yes
- - TEST_LIBEVENT=yes
- - CONFIG_OPTS="--with-ssl=/usr/local/opt/openssl/ --with-libevent=/usr/local/opt/libevent/"
- - os: linux
- name: UBsan, GCC on Linux, Amd64
- compiler: gcc
- arch: amd64
- dist: bionic
- env:
- - TEST_UBSAN=yes
- - os: linux
- name: UBsan, Clang on Linux, Amd64
- compiler: clang
- arch: amd64
- dist: bionic
- env:
- - TEST_UBSAN=yes
- - os: linux
- name: Asan, GCC on Linux, Amd64
- compiler: gcc
- arch: amd64
- dist: bionic
- env:
- - TEST_ASAN=yes
- - os: linux
- name: Asan, Clang on Linux, Amd64
- compiler: clang
- arch: amd64
- dist: bionic
- env:
- - TEST_ASAN=yes
- - os: linux
- name: GCC on Linux, Aarch64
- compiler: gcc
- arch: arm64
- dist: bionic
- env:
- - CONFIG_OPTS="--enable-debug --disable-flto"
- - os: linux
- name: Clang on Linux, Aarch64
- compiler: clang
- arch: arm64
- dist: bionic
- env:
- - CONFIG_OPTS="--enable-debug --disable-flto"
- - os: linux
- name: GCC on Linux, PowerPC64
- compiler: gcc
- arch: ppc64le
- dist: bionic
- env:
- - CONFIG_OPTS="--enable-debug --disable-flto"
- - os: linux
- name: Clang on Linux, PowerPC64
- compiler: clang
- arch: ppc64le
- dist: bionic
- env:
- - CONFIG_OPTS="--enable-debug --disable-flto"
- - os: linux
- name: GCC on Linux, s390x
- compiler: gcc
- arch: s390x
- dist: bionic
- env:
- - CONFIG_OPTS="--enable-debug --disable-flto"
- - os: linux
- name: Clang on Linux, s390x
- compiler: clang
- arch: s390x
- dist: bionic
- env:
- - CONFIG_OPTS="--enable-debug --disable-flto"
- - os: osx
- osx_image: xcode10
- name: Apple iPhone on iOS, armv7
- compiler: clang
- env:
- - TEST_IOS=yes
- - AUTOTOOLS_HOST=armv7-apple-ios
- - OPENSSL_HOST=ios-cross
- - IOS_SDK=iPhoneOS
- - IOS_CPU=armv7s
- - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
- - os: osx
- osx_image: xcode10
- name: Apple iPhone on iOS, arm64
- compiler: clang
- env:
- - TEST_IOS=yes
- - AUTOTOOLS_HOST=aarch64-apple-ios
- - OPENSSL_HOST=ios64-cross
- - IOS_SDK=iPhoneOS
- - IOS_CPU=arm64
- - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
- - os: osx
- osx_image: xcode10
- name: Apple TV on iOS, arm64
- compiler: clang
- env:
- - TEST_IOS=yes
- - AUTOTOOLS_HOST=aarch64-apple-ios
- - OPENSSL_HOST=ios64-cross
- - IOS_SDK=AppleTVOS
- - IOS_CPU=arm64
- - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
- - os: osx
- osx_image: xcode10
- name: Apple Watch on iOS, armv7
- compiler: clang
- env:
- - TEST_IOS=yes
- - AUTOTOOLS_HOST=armv7-apple-ios
- - OPENSSL_HOST=ios-cross
- - IOS_SDK=WatchOS
- - IOS_CPU=armv7k
- - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
- - os: osx
- osx_image: xcode10
- name: iPhoneSimulator on OS X, i386
- env:
- - TEST_IOS=yes
- - AUTOTOOLS_HOST=i386-apple-ios
- - OPENSSL_HOST=iphoneos-cross
- - IOS_CPU=i386
- - IOS_SDK=iPhoneSimulator
- - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
- - os: osx
- osx_image: xcode10
- name: iPhoneSimulator on OS X, x86_64
- env:
- - TEST_IOS=yes
- - AUTOTOOLS_HOST=x86_64-apple-ios
- - OPENSSL_HOST=iphoneos-cross
- - IOS_CPU=x86_64
- - IOS_SDK=iPhoneSimulator
- - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
- - os: osx
- osx_image: xcode10
- name: AppleTVSimulator on OS X, x86_64
- env:
- - TEST_IOS=yes
- - AUTOTOOLS_HOST=x86_64-apple-ios
- - OPENSSL_HOST=iphoneos-cross
- - IOS_CPU=x86_64
- - IOS_SDK=AppleTVSimulator
- - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
- - os: osx
- osx_image: xcode10
- name: WatchSimulator on OS X, i386
- env:
- - TEST_IOS=yes
- - AUTOTOOLS_HOST=i386-apple-ios
- - OPENSSL_HOST=iphoneos-cross
- - IOS_CPU=i386
- - IOS_SDK=WatchSimulator
- - IOS_PREFIX="$HOME/$IOS_SDK-$IOS_CPU"
- - os: linux
- name: Android armv7a, Linux, Amd64
- compiler: clang
- arch: amd64
- dist: bionic
- env:
- - TEST_ANDROID=yes
- - AUTOTOOLS_HOST=armv7a-linux-androideabi
- - OPENSSL_HOST=android-arm
- - ANDROID_CPU=armv7a
- - ANDROID_API=23
- - ANDROID_PREFIX="$HOME/android$ANDROID_API-$ANDROID_CPU"
- - ANDROID_SDK_ROOT="$HOME/android-sdk"
- - ANDROID_NDK_ROOT="$HOME/android-ndk"
- - os: linux
- name: Android aarch64, Linux, Amd64
- compiler: clang
- arch: amd64
- dist: bionic
- env:
- - TEST_ANDROID=yes
- - AUTOTOOLS_HOST=aarch64-linux-android
- - OPENSSL_HOST=android-arm64
- - ANDROID_CPU=aarch64
- - ANDROID_API=23
- - ANDROID_PREFIX="$HOME/android$ANDROID_API-$ANDROID_CPU"
- - ANDROID_SDK_ROOT="$HOME/android-sdk"
- - ANDROID_NDK_ROOT="$HOME/android-ndk"
- - os: linux
- name: Android x86, Linux, Amd64
- compiler: clang
- arch: amd64
- dist: bionic
- env:
- - TEST_ANDROID=yes
- - AUTOTOOLS_HOST=i686-linux-android
- - OPENSSL_HOST=android-x86
- - ANDROID_CPU=x86
- - ANDROID_API=23
- - ANDROID_PREFIX="$HOME/android$ANDROID_API-$ANDROID_CPU"
- - ANDROID_SDK_ROOT="$HOME/android-sdk"
- - ANDROID_NDK_ROOT="$HOME/android-ndk"
- - os: linux
- name: Android x86_64, Linux, Amd64
- compiler: clang
- arch: amd64
- dist: bionic
- env:
- - TEST_ANDROID=yes
- - AUTOTOOLS_HOST=x86_64-linux-android
- - OPENSSL_HOST=android-x86_64
- - ANDROID_CPU=x86_64
- - ANDROID_API=23
- - ANDROID_PREFIX="$HOME/android$ANDROID_API-$ANDROID_CPU"
- - ANDROID_SDK_ROOT="$HOME/android-sdk"
- - ANDROID_NDK_ROOT="$HOME/android-ndk"
-
- allow_failures:
- - os: linux
- name: Android armv7a, Linux, Amd64
- - os: linux
- name: Android aarch64, Linux, Amd64
- - os: linux
- name: Android x86, Linux, Amd64
- - os: linux
- name: Android x86_64, Linux, Amd64
-
-before_script:
- - |
- if [ "$TEST_ANDROID" = "yes" ]; then
- ./contrib/android/install_tools.sh
- elif [ "$TEST_IOS" = "yes" ]; then
- ./contrib/ios/install_tools.sh
- fi
Home |
Main Index |
Thread Index |
Old Index