diff -Nru golang-github-coreos-pkg-3/build golang-github-coreos-pkg-4/build --- golang-github-coreos-pkg-3/build 2016-07-27 23:37:14.000000000 +0000 +++ golang-github-coreos-pkg-4/build 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -#!/bin/bash -e - -go build ./... diff -Nru golang-github-coreos-pkg-3/build.sh golang-github-coreos-pkg-4/build.sh --- golang-github-coreos-pkg-3/build.sh 1970-01-01 00:00:00.000000000 +0000 +++ golang-github-coreos-pkg-4/build.sh 2018-01-08 23:06:52.000000000 +0000 @@ -0,0 +1,3 @@ +#!/bin/bash -e + +go build ./... diff -Nru golang-github-coreos-pkg-3/capnslog/logmap.go golang-github-coreos-pkg-4/capnslog/logmap.go --- golang-github-coreos-pkg-3/capnslog/logmap.go 2016-07-27 23:37:14.000000000 +0000 +++ golang-github-coreos-pkg-4/capnslog/logmap.go 2018-01-08 23:06:52.000000000 +0000 @@ -95,6 +95,11 @@ return nil } +// Returns an empty string, only here to fulfill the pflag.Value interface. +func (l *LogLevel) Type() string { + return "" +} + // ParseLevel translates some potential loglevel strings into their corresponding levels. func ParseLevel(s string) (LogLevel, error) { switch s { diff -Nru golang-github-coreos-pkg-3/capnslog/pkg_logger.go golang-github-coreos-pkg-4/capnslog/pkg_logger.go --- golang-github-coreos-pkg-3/capnslog/pkg_logger.go 2016-07-27 23:37:14.000000000 +0000 +++ golang-github-coreos-pkg-4/capnslog/pkg_logger.go 2018-01-08 23:06:52.000000000 +0000 @@ -37,6 +37,14 @@ } } +// SetLevel allows users to change the current logging level. +func (p *PackageLogger) SetLevel(l LogLevel) { + logger.Lock() + defer logger.Unlock() + p.level = l +} + +// LevelAt checks if the given log level will be outputted under current setting. func (p *PackageLogger) LevelAt(l LogLevel) bool { logger.Lock() defer logger.Unlock() @@ -80,6 +88,12 @@ p.internalLog(calldepth, CRITICAL, s) panic(s) } + +func (p *PackageLogger) Panicln(args ...interface{}) { + s := fmt.Sprintln(args...) + p.internalLog(calldepth, CRITICAL, s) + panic(s) +} func (p *PackageLogger) Fatalf(format string, args ...interface{}) { p.Logf(CRITICAL, format, args...) diff -Nru golang-github-coreos-pkg-3/capnslog/README.md golang-github-coreos-pkg-4/capnslog/README.md --- golang-github-coreos-pkg-3/capnslog/README.md 2016-07-27 23:37:14.000000000 +0000 +++ golang-github-coreos-pkg-4/capnslog/README.md 2018-01-08 23:06:52.000000000 +0000 @@ -21,7 +21,7 @@ Splitting streams is probably not the job of your program, but rather, your log aggregation framework. If you must split output streams, again, `main` configures this and you can write a very simple two-output struct that satisfies io.Writer. -Fancy colorful formatting and JSON output are beyond the scope of a basic logging framework -- they're application/log-collector dependant. These are, at best, provided as options, but more likely, provided by your application. +Fancy colorful formatting and JSON output are beyond the scope of a basic logging framework -- they're application/log-collector dependent. These are, at best, provided as options, but more likely, provided by your application. ##### Log objects are an interface diff -Nru golang-github-coreos-pkg-3/code-of-conduct.md golang-github-coreos-pkg-4/code-of-conduct.md --- golang-github-coreos-pkg-3/code-of-conduct.md 1970-01-01 00:00:00.000000000 +0000 +++ golang-github-coreos-pkg-4/code-of-conduct.md 2018-01-08 23:06:52.000000000 +0000 @@ -0,0 +1,61 @@ +## CoreOS Community Code of Conduct + +### Contributor Code of Conduct + +As contributors and maintainers of this project, and in the interest of +fostering an open and welcoming community, we pledge to respect all people who +contribute through reporting issues, posting feature requests, updating +documentation, submitting pull requests or patches, and other activities. + +We are committed to making participation in this project a harassment-free +experience for everyone, regardless of level of experience, gender, gender +identity and expression, sexual orientation, disability, personal appearance, +body size, race, ethnicity, age, religion, or nationality. + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery +* Personal attacks +* Trolling or insulting/derogatory comments +* Public or private harassment +* Publishing others' private information, such as physical or electronic addresses, without explicit permission +* Other unethical or unprofessional conduct. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct. By adopting this Code of Conduct, +project maintainers commit themselves to fairly and consistently applying these +principles to every aspect of managing this project. Project maintainers who do +not follow or enforce the Code of Conduct may be permanently removed from the +project team. + +This code of conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting a project maintainer, Brandon Philips +, and/or Rithu John . + +This Code of Conduct is adapted from the Contributor Covenant +(http://contributor-covenant.org), version 1.2.0, available at +http://contributor-covenant.org/version/1/2/0/ + +### CoreOS Events Code of Conduct + +CoreOS events are working conferences intended for professional networking and +collaboration in the CoreOS community. Attendees are expected to behave +according to professional standards and in accordance with their employer’s +policies on appropriate workplace behavior. + +While at CoreOS events or related social networking opportunities, attendees +should not engage in discriminatory or offensive speech or actions including +but not limited to gender, sexuality, race, age, disability, or religion. +Speakers should be especially aware of these concerns. + +CoreOS does not condone any statements by speakers contrary to these standards. +CoreOS reserves the right to deny entrance and/or eject from an event (without +refund) any individual found to be engaging in discriminatory or offensive +speech or actions. + +Please bring any concerns to the immediate attention of designated on-site +staff, Brandon Philips , and/or Rithu John . diff -Nru golang-github-coreos-pkg-3/debian/changelog golang-github-coreos-pkg-4/debian/changelog --- golang-github-coreos-pkg-3/debian/changelog 2017-02-08 20:34:14.000000000 +0000 +++ golang-github-coreos-pkg-4/debian/changelog 2019-10-08 03:01:08.000000000 +0000 @@ -1,3 +1,26 @@ +golang-github-coreos-pkg (4-2) unstable; urgency=medium + + * Standards-Version: 4.4.1 + + -- Dmitry Smirnov Tue, 08 Oct 2019 14:01:08 +1100 + +golang-github-coreos-pkg (4-1) unstable; urgency=medium + + [ Alexandre Viau ] + * Point Vcs-* urls to salsa.debian.org. + + [ Jelmer Vernooij ] + * Use secure copyright file specification URI. + + [ Dmitry Smirnov ] + * New upstream release. + * Added myself to Uploaders. + * DH & compat to version 12. + * Testsuite: autopkgtest-pkg-go + * Priority: optional; Standards-Version: 4.4.0. + + -- Dmitry Smirnov Wed, 25 Sep 2019 21:52:23 +1000 + golang-github-coreos-pkg (3-1) unstable; urgency=medium * New upstream release. diff -Nru golang-github-coreos-pkg-3/debian/compat golang-github-coreos-pkg-4/debian/compat --- golang-github-coreos-pkg-3/debian/compat 2017-02-08 20:34:14.000000000 +0000 +++ golang-github-coreos-pkg-4/debian/compat 2019-09-25 11:46:25.000000000 +0000 @@ -1 +1 @@ -9 +12 diff -Nru golang-github-coreos-pkg-3/debian/control golang-github-coreos-pkg-4/debian/control --- golang-github-coreos-pkg-3/debian/control 2017-02-08 20:34:14.000000000 +0000 +++ golang-github-coreos-pkg-4/debian/control 2019-10-08 03:00:44.000000000 +0000 @@ -1,20 +1,22 @@ Source: golang-github-coreos-pkg Section: devel -Priority: extra +Priority: optional +Standards-Version: 4.4.1 Maintainer: Debian Go Packaging Team Uploaders: Martín Ferrari , Tim Potter , -Build-Depends: debhelper (>= 9), + Dmitry Smirnov , +Build-Depends: debhelper (>= 12~), dh-golang (>= 1.17~), golang-any, golang-github-coreos-go-systemd-dev, golang-golang-x-crypto-dev, golang-yaml.v2-dev, -Standards-Version: 3.9.8 Homepage: https://github.com/coreos/pkg -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-go/packages/golang-github-coreos-pkg.git -Vcs-Git: https://anonscm.debian.org/git/pkg-go/packages/golang-github-coreos-pkg.git +Vcs-Browser: https://salsa.debian.org/go-team/packages/golang-github-coreos-pkg +Vcs-Git: https://salsa.debian.org/go-team/packages/golang-github-coreos-pkg.git XS-Go-Import-Path: github.com/coreos/pkg +Testsuite: autopkgtest-pkg-go Package: golang-github-coreos-pkg-dev Architecture: all diff -Nru golang-github-coreos-pkg-3/debian/copyright golang-github-coreos-pkg-4/debian/copyright --- golang-github-coreos-pkg-3/debian/copyright 2017-02-08 20:34:14.000000000 +0000 +++ golang-github-coreos-pkg-4/debian/copyright 2019-09-25 11:46:25.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: pkg Source: https://github.com/coreos/pkg diff -Nru golang-github-coreos-pkg-3/debian/gitlab-ci.yml golang-github-coreos-pkg-4/debian/gitlab-ci.yml --- golang-github-coreos-pkg-3/debian/gitlab-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ golang-github-coreos-pkg-4/debian/gitlab-ci.yml 2019-09-25 11:46:25.000000000 +0000 @@ -0,0 +1,28 @@ + +# auto-generated, DO NOT MODIFY. +# The authoritative copy of this file lives at: +# https://salsa.debian.org/go-team/ci/blob/master/cmd/ci/gitlabciyml.go + +# TODO: publish under debian-go-team/ci +image: stapelberg/ci2 + +test_the_archive: + artifacts: + paths: + - before-applying-commit.json + - after-applying-commit.json + script: + # Create an overlay to discard writes to /srv/gopath/src after the build: + - "rm -rf /cache/overlay/{upper,work}" + - "mkdir -p /cache/overlay/{upper,work}" + - "mount -t overlay overlay -o lowerdir=/srv/gopath/src,upperdir=/cache/overlay/upper,workdir=/cache/overlay/work /srv/gopath/src" + - "export GOPATH=/srv/gopath" + - "export GOCACHE=/cache/go" + # Build the world as-is: + - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > before-applying-commit.json" + # Copy this package into the overlay: + - "GBP_CONF_FILES=:debian/gbp.conf gbp buildpackage --git-no-pristine-tar --git-ignore-branch --git-ignore-new --git-export-dir=/tmp/export --git-no-overlay --git-tarball-dir=/nonexistant --git-cleaner=/bin/true --git-builder='dpkg-buildpackage -S -d --no-sign'" + - "pgt-gopath -dsc /tmp/export/*.dsc" + # Rebuild the world: + - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > after-applying-commit.json" + - "ci-diff before-applying-commit.json after-applying-commit.json" diff -Nru golang-github-coreos-pkg-3/debian/rules golang-github-coreos-pkg-4/debian/rules --- golang-github-coreos-pkg-3/debian/rules 2017-02-08 20:34:14.000000000 +0000 +++ golang-github-coreos-pkg-4/debian/rules 2019-09-25 11:55:56.000000000 +0000 @@ -4,4 +4,3 @@ %: dh $@ --buildsystem=golang --with=golang - diff -Nru golang-github-coreos-pkg-3/test golang-github-coreos-pkg-4/test --- golang-github-coreos-pkg-3/test 2016-07-27 23:37:14.000000000 +0000 +++ golang-github-coreos-pkg-4/test 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -#!/bin/bash -e -# -# Run all tests (not including functional) -# ./test -# ./test -v -# -# Run tests for one package -# PKG=./unit ./test -# PKG=ssh ./test -# - -# Invoke ./cover for HTML output -COVER=${COVER:-"-cover"} - -source ./build - -TESTABLE="cryptoutil flagutil timeutil netutil yamlutil httputil health multierror dlopen progressutil" -FORMATTABLE="$TESTABLE capnslog" - -# user has not provided PKG override -if [ -z "$PKG" ]; then - TEST=$TESTABLE - FMT=$FORMATTABLE - -# user has provided PKG override -else - # strip out slashes and dots from PKG=./foo/ - TEST=${PKG//\//} - TEST=${TEST//./} - - # only run gofmt on packages provided by user - FMT="$TEST" -fi - -# split TEST into an array and prepend repo path to each local package -split=(${TEST// / }) -TEST=${split[@]/#/github.com/coreos/pkg/} - -echo "Running tests..." -go test ${COVER} $@ ${TEST} - -echo "Checking gofmt..." -fmtRes=$(gofmt -l $FMT) -if [ -n "${fmtRes}" ]; then - echo -e "gofmt checking failed:\n${fmtRes}" - exit 255 -fi - -echo "Checking govet..." -vetRes=$(go vet $TEST) -if [ -n "${vetRes}" ]; then - echo -e "govet checking failed:\n${vetRes}" - exit 255 -fi - -echo "Success" diff -Nru golang-github-coreos-pkg-3/test.sh golang-github-coreos-pkg-4/test.sh --- golang-github-coreos-pkg-3/test.sh 1970-01-01 00:00:00.000000000 +0000 +++ golang-github-coreos-pkg-4/test.sh 2018-01-08 23:06:52.000000000 +0000 @@ -0,0 +1,56 @@ +#!/bin/bash -e +# +# Run all tests (not including functional) +# ./test.sh +# ./test.sh -v +# +# Run tests for one package +# PKG=./unit ./test.sh +# PKG=ssh ./test.sh +# + +# Invoke ./cover for HTML output +COVER=${COVER:-"-cover"} + +source ./build.sh + +TESTABLE="cryptoutil flagutil timeutil netutil yamlutil httputil health multierror dlopen progressutil" +FORMATTABLE="$TESTABLE capnslog" + +# user has not provided PKG override +if [ -z "$PKG" ]; then + TEST=$TESTABLE + FMT=$FORMATTABLE + +# user has provided PKG override +else + # strip out slashes and dots from PKG=./foo/ + TEST=${PKG//\//} + TEST=${TEST//./} + + # only run gofmt on packages provided by user + FMT="$TEST" +fi + +# split TEST into an array and prepend repo path to each local package +split=(${TEST// / }) +TEST=${split[@]/#/github.com/coreos/pkg/} + +echo "Running tests..." +go test ${COVER} $@ ${TEST} + +echo "Checking gofmt..." +fmtRes=$(gofmt -l $FMT) +if [ -n "${fmtRes}" ]; then + echo -e "gofmt checking failed:\n${fmtRes}" + exit 255 +fi + +echo "Checking govet..." +vetRes=$(go vet $TEST) +if [ -n "${vetRes}" ]; then + echo -e "govet checking failed:\n${vetRes}" + exit 255 +fi + +echo "Success" diff -Nru golang-github-coreos-pkg-3/.travis.yml golang-github-coreos-pkg-4/.travis.yml --- golang-github-coreos-pkg-3/.travis.yml 2016-07-27 23:37:14.000000000 +0000 +++ golang-github-coreos-pkg-4/.travis.yml 2018-01-08 23:06:52.000000000 +0000 @@ -5,4 +5,4 @@ - 1.6.2 script: - - ./test + - ./test.sh