Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/pam-u2f/dist merge conflicts between 1.0.8 and ...
details: https://anonhg.NetBSD.org/src/rev/88aa0662ae7e
branches: trunk
changeset: 987356:88aa0662ae7e
user: christos <christos%NetBSD.org@localhost>
date: Fri Sep 24 13:11:38 2021 +0000
description:
merge conflicts between 1.0.8 and 1.2.0
diffstat:
external/bsd/pam-u2f/dist/.travis.yml | 253 ----------
external/bsd/pam-u2f/dist/b64.c | 1 +
external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-clang7.sh | 6 -
external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-clang8.sh | 6 -
external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-gcc7.sh | 10 -
external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-gcc8.sh | 6 -
external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-gcc9.sh | 6 -
external/bsd/pam-u2f/dist/build-aux/ci/build-linux.sh | 10 -
external/bsd/pam-u2f/dist/build-aux/ci/build-osx11-clang.sh | 6 -
external/bsd/pam-u2f/dist/build-aux/ci/build-osx9.4-clang.sh | 6 -
external/bsd/pam-u2f/dist/build-aux/ci/build-xenial-clang7.sh | 6 -
external/bsd/pam-u2f/dist/build-aux/ci/build-xenial-clang8.sh | 6 -
external/bsd/pam-u2f/dist/build-aux/ci/build-xenial-gcc7.sh | 6 -
external/bsd/pam-u2f/dist/build-aux/ci/build-xenial-gcc8.sh | 6 -
external/bsd/pam-u2f/dist/build-aux/ci/build-xenial-gcc9.sh | 6 -
external/bsd/pam-u2f/dist/drop_privs.h | 15 +-
external/bsd/pam-u2f/dist/pam-u2f.c | 75 ++-
external/bsd/pam-u2f/dist/util.h | 21 +-
18 files changed, 84 insertions(+), 367 deletions(-)
diffs (truncated from 698 to 300 lines):
diff -r f301378b1c5a -r 88aa0662ae7e external/bsd/pam-u2f/dist/.travis.yml
--- a/external/bsd/pam-u2f/dist/.travis.yml Fri Sep 24 13:08:16 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,253 +0,0 @@
-language: c
-
-matrix:
- include:
- - name: Xenial gcc-7
- os: linux
- compiler: gcc-7
- dist: xenial
- addons:
- apt:
- sources:
- - sourceline: 'ppa:yubico/stable'
- - ubuntu-toolchain-r-test
- packages:
- - autoconf
- - check
- - gcc-7
- - gengetopt
- - help2man
- - libfido2-dev
- - libpam-dev
- - libssl-dev
- - libtool
- - pkg-config
- script: ./build-aux/ci/build-xenial-gcc7.sh
- - name: Xenial gcc-8
- os: linux
- compiler: gcc-8
- dist: xenial
- addons:
- apt:
- sources:
- - sourceline: 'ppa:yubico/stable'
- - ubuntu-toolchain-r-test
- packages:
- - autoconf
- - check
- - gcc-8
- - gengetopt
- - help2man
- - libfido2-dev
- - libpam-dev
- - libssl-dev
- - libtool
- - pkg-config
- script: ./build-aux/ci/build-xenial-gcc8.sh
- - name: Xenial gcc-9
- os: linux
- compiler: gcc-9
- dist: xenial
- addons:
- apt:
- sources:
- - sourceline: 'ppa:yubico/stable'
- - ubuntu-toolchain-r-test
- packages:
- - autoconf
- - check
- - gcc-9
- - gengetopt
- - help2man
- - libfido2-dev
- - libpam-dev
- - libssl-dev
- - libtool
- - pkg-config
- script: ./build-aux/ci/build-xenial-gcc9.sh
- - name: Xenial clang-7
- os: linux
- compiler: clang-7
- dist: xenial
- addons:
- apt:
- sources:
- - sourceline: 'ppa:yubico/stable'
- - ubuntu-toolchain-r-test
- - llvm-toolchain-xenial-7
- packages:
- - autoconf
- - check
- - clang-7
- - gengetopt
- - help2man
- - libfido2-dev
- - libpam-dev
- - libssl-dev
- - libtool
- - pkg-config
- script: ./build-aux/ci/build-xenial-clang7.sh
- - name: Xenial clang-8
- os: linux
- compiler: clang-8
- dist: xenial
- addons:
- apt:
- sources:
- - sourceline: 'ppa:yubico/stable'
- - ubuntu-toolchain-r-test
- - llvm-toolchain-xenial-8
- packages:
- - autoconf
- - check
- - clang-8
- - gengetopt
- - help2man
- - libfido2-dev
- - libpam-dev
- - libssl-dev
- - libtool
- - pkg-config
- script: ./build-aux/ci/build-xenial-clang8.sh
- - name: Bionic gcc-7 and clang-format
- os: linux
- compiler: gcc-7
- dist: bionic
- addons:
- apt:
- sources:
- - sourceline: 'ppa:yubico/stable'
- - ubuntu-toolchain-r-test
- packages:
- - autoconf
- - check
- - clang-format-6.0
- - gcc-7
- - gengetopt
- - help2man
- - libfido2-dev
- - libpam-dev
- - libssl-dev
- - libtool
- - pkg-config
- script: ./build-aux/ci/build-bionic-gcc7.sh
- - name: Bionic gcc-8
- os: linux
- compiler: gcc-8
- dist: bionic
- addons:
- apt:
- sources:
- - sourceline: 'ppa:yubico/stable'
- - ubuntu-toolchain-r-test
- packages:
- - autoconf
- - check
- - gcc-8
- - gengetopt
- - help2man
- - libfido2-dev
- - libpam-dev
- - libssl-dev
- - libtool
- - pkg-config
- script: ./build-aux/ci/build-bionic-gcc8.sh
- - name: Bionic gcc-9
- os: linux
- compiler: gcc-9
- dist: bionic
- addons:
- apt:
- sources:
- - sourceline: 'ppa:yubico/stable'
- - sourceline: 'ppa:ubuntu-toolchain-r/test'
- packages:
- - autoconf
- - check
- - gcc-9
- - gengetopt
- - help2man
- - libfido2-dev
- - libpam-dev
- - libssl-dev
- - libtool
- - pkg-config
- script: ./build-aux/ci/build-bionic-gcc9.sh
- - name: Bionic clang-7
- os: linux
- compiler: clang-7
- dist: bionic
- addons:
- apt:
- sources:
- - sourceline: 'ppa:yubico/stable'
- - sourceline: 'ppa:ubuntu-toolchain-r/test'
- - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-7 main'
- key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
- packages:
- - autoconf
- - check
- - clang-7
- - gengetopt
- - help2man
- - libfido2-dev
- - libpam-dev
- - libssl-dev
- - libtool
- - pkg-config
- script: ./build-aux/ci/build-bionic-clang7.sh
- - name: Bionic clang-8
- os: linux
- compiler: clang-8
- dist: bionic
- addons:
- apt:
- sources:
- - sourceline: 'ppa:yubico/stable'
- - sourceline: 'ppa:ubuntu-toolchain-r/test'
- - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main'
- key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
- packages:
- - autoconf
- - check
- - clang-8
- - gengetopt
- - help2man
- - libfido2-dev
- - libpam-dev
- - libssl-dev
- - libtool
- - pkg-config
- script: ./build-aux/ci/build-bionic-clang8.sh
- - name: macOS xcode9.4
- os: osx
- osx_image: xcode9.4
- compiler: clang
- addons:
- homebrew:
- packages:
- - check
- - cmake
- - gengetopt
- - help2man
- - mandoc
- - openssl@1.1
- - pkg-config
- update: true
- script: ./build-aux/ci/build-osx9.4-clang.sh
- - name: macOS xcode11
- os: osx
- osx_image: xcode11
- compiler: clang
- addons:
- homebrew:
- packages:
- - check
- - cmake
- - gengetopt
- - help2man
- - mandoc
- - openssl@1.1
- - pkg-config
- update: true
- script: ./build-aux/ci/build-osx11-clang.sh
diff -r f301378b1c5a -r 88aa0662ae7e external/bsd/pam-u2f/dist/b64.c
--- a/external/bsd/pam-u2f/dist/b64.c Fri Sep 24 13:08:16 2021 +0000
+++ b/external/bsd/pam-u2f/dist/b64.c Fri Sep 24 13:11:38 2021 +0000
@@ -4,6 +4,7 @@
#include <openssl/bio.h>
#include <openssl/evp.h>
+#include <limits.h>
#include <stdint.h>
#include <string.h>
diff -r f301378b1c5a -r 88aa0662ae7e external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-clang7.sh
--- a/external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-clang7.sh Fri Sep 24 13:08:16 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-BUILDROOT="$(git rev-parse --show-toplevel)"
-
-source $BUILDROOT/build-aux/ci/build-linux.sh
diff -r f301378b1c5a -r 88aa0662ae7e external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-clang8.sh
--- a/external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-clang8.sh Fri Sep 24 13:08:16 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-BUILDROOT="$(git rev-parse --show-toplevel)"
-
-source $BUILDROOT/build-aux/ci/build-linux.sh
diff -r f301378b1c5a -r 88aa0662ae7e external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-gcc7.sh
--- a/external/bsd/pam-u2f/dist/build-aux/ci/build-bionic-gcc7.sh Fri Sep 24 13:08:16 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-BUILDROOT="$(git rev-parse --show-toplevel)"
-
-set +x
-source $BUILDROOT/build-aux/ci/format-code.sh "$(git rev-parse HEAD~)"
-set -x
Home |
Main Index |
Thread Index |
Old Index