Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package aardvark-dns for openSUSE:Factory
checked in at 2023-04-12 12:52:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aardvark-dns (Old)
and /work/SRC/openSUSE:Factory/.aardvark-dns.new.19717 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aardvark-dns"
Wed Apr 12 12:52:27 2023 rev:3 rq:1078583 version:1.6.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/aardvark-dns/aardvark-dns.changes
2023-03-21 17:44:50.654781810 +0100
+++ /work/SRC/openSUSE:Factory/.aardvark-dns.new.19717/aardvark-dns.changes
2023-04-12 12:52:28.357237834 +0200
@@ -1,0 +2,32 @@
+Wed Apr 12 06:00:21 UTC 2023 - danish.prak...@suse.com
+
+- Update to version 1.6.0:
+ * v1.6.0 release
+ * Update release notes for v1.6.0
+ * fix(deps): update rust crate tokio to 1.27.0
+ * use lower TTL for contianer entries
+ * fix(deps): update rust crate syslog to ^6.0.1
+ * fix(deps): update rust crate futures-util to 0.3.28
+ * chore(deps): update dependency containers/automation_images to v20230330
+ * Disable Dependabot in favor of Renovate
+ * chore(deps): update dependency containers/automation_images to v20230320
+ * build(deps): bump futures-util from 0.3.26 to 0.3.27
+ * [CI:BUILD] Packit: trigger builds on commit to main branch
+ * build(deps): bump anyhow from 1.0.68 to 1.0.70
+ * fix lint issue with new rust version 1.68
+ * Cirrus: Update to newer CI VM images
+ * build(deps): bump chrono from 0.4.23 to 0.4.24
+ * build(deps): bump libc from 0.2.139 to 0.2.140
+ * build(deps): bump async-broadcast from 0.5.0 to 0.5.1
+ * build(deps): bump signal-hook from 0.3.14 to 0.3.15
+ * build(deps): bump futures-util from 0.3.25 to 0.3.26
+ * build(deps): bump tokio from 1.25.0 to 1.26.0
+ * [CI:DOCS] Clarify packit related comments
+ * [CI:BUILD] Packit: initial enablement
+ * Allow custom cargo binary path
+ * Switch to explicit platform list for `cargo vendor-filterer`
+ * bump to v1.6.0-dev
+ * Add renovate.json5
+ * Cirrus: Groom rust cache before updating
+
+-------------------------------------------------------------------
Old:
----
aardvark-dns-1.5.0.tar.gz
New:
----
aardvark-dns-1.6.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aardvark-dns.spec ++++++
--- /var/tmp/diff_new_pack.JteZzc/_old 2023-04-12 12:52:30.153248330 +0200
+++ /var/tmp/diff_new_pack.JteZzc/_new 2023-04-12 12:52:30.157248354 +0200
@@ -17,7 +17,7 @@
Name: aardvark-dns
-Version: 1.5.0
+Version: 1.6.0
Release: 0
Summary: Authoritative dns server for A/AAAA container records
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.JteZzc/_old 2023-04-12 12:52:30.189248541 +0200
+++ /var/tmp/diff_new_pack.JteZzc/_new 2023-04-12 12:52:30.193248564 +0200
@@ -3,7 +3,7 @@
<param name="url">https://github.com/containers/aardvark-dns</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="scm">git</param>
- <param name="revision">v1.5.0</param>
+ <param name="revision">v1.6.0</param>
<param name="match-tag">*</param>
<param name="versionrewrite-pattern">v(\d+\.\d+\.\d+)</param>
<param name="versionrewrite-replacement">\1</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.JteZzc/_old 2023-04-12 12:52:30.217248704 +0200
+++ /var/tmp/diff_new_pack.JteZzc/_new 2023-04-12 12:52:30.221248727 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/containers/aardvark-dns</param>
- <param
name="changesrevision">65480f45efe1f8c381f6ee06df3117d5c3d01f50</param></service></servicedata>
+ <param
name="changesrevision">fb411dded03c46e7496ed3e514401ebdc1783b37</param></service></servicedata>
(No newline at EOF)
++++++ aardvark-dns-1.5.0.tar.gz -> aardvark-dns-1.6.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aardvark-dns-1.5.0/.cirrus.yml
new/aardvark-dns-1.6.0/.cirrus.yml
--- old/aardvark-dns-1.5.0/.cirrus.yml 2023-02-01 16:22:45.000000000 +0100
+++ new/aardvark-dns-1.6.0/.cirrus.yml 2023-04-05 19:20:16.000000000 +0200
@@ -19,7 +19,7 @@
NETAVARK_URL:
"https://api.cirrus-ci.com/v1/artifact/github/containers/netavark/success/binary.zip?branch=${NETAVARK_BRANCH}";
# Save a little typing (path relative to $CIRRUS_WORKING_DIR)
SCRIPT_BASE: "./contrib/cirrus"
- IMAGE_SUFFIX: "c4987131005763584"
+ IMAGE_SUFFIX: "c20230330t153101z-f37f36d12"
FEDORA_NETAVARK_IMAGE: "fedora-netavark-${IMAGE_SUFFIX}"
FEDORA_NETAVARK_AMI: "fedora-netavark-aws-arm64-${IMAGE_SUFFIX}"
EC2_INST_TYPE: "t4g.xlarge"
@@ -41,11 +41,11 @@
image_name: "${FEDORA_NETAVARK_IMAGE}"
cargo_cache: &cargo_cache
folder: "$CARGO_HOME"
- fingerprint_key: "cargo_v1_${DEST_BRANCH}" # Cache for branch + PRs
+ fingerprint_script: echo -e
"cargo_v3_${DEST_BRANCH}_amd64\n---\n$(<Cargo.lock)\n---\n$(<Cargo.toml)"
reupload_on_changes: true
targets_cache: &targets_cache
folder: "$CARGO_TARGET_DIR"
- fingerprint_key: "targets_v1_${CIRRUS_BUILD_ID}" # Cache only within same
build
+ fingerprint_script: echo -e
"targets_v3_${CIRRUS_TAG}${DEST_BRANCH}${CIRRUS_PR}_amd64\n---\n$(<Cargo.lock)\n---\n$(<Cargo.toml)"
reupload_on_changes: true
bin_cache: &bin_cache
# This simply prevents rebuilding bin/aardvark-dns* or every subsequent
task.
@@ -54,6 +54,8 @@
reupload_on_changes: true
setup_script: &setup "$SCRIPT_BASE/setup.sh $CIRRUS_TASK_NAME"
main_script: &main "$SCRIPT_BASE/runner.sh $CIRRUS_TASK_NAME"
+ # N/B: This script comes from `main` on the netavark repo
+ cache_grooming_script: &groom bash "$SCRIPT_BASE/netavark_cache_groom.sh"
upload_caches: [ "cargo", "targets", "bin" ]
@@ -67,15 +69,16 @@
architecture: arm64 # CAUTION: This has to be "arm64", not aarch64.
cargo_cache: &cargo_cache_aarch64
<<: *cargo_cache
- fingerprint_key: "cargo_v1_${DEST_BRANCH}_aarch64"
+ fingerprint_script: echo -e
"cargo_v3_${DEST_BRANCH}_aarch64\n---\n$(<Cargo.lock)\n---\n$(<Cargo.toml)"
targets_cache: &targets_cache_aarch64
<<: *targets_cache
- fingerprint_key: "cargo_v1_${DEST_BRANCH}_aarch64"
+ fingerprint_script: echo -e
"targets_v3_${CIRRUS_TAG}${DEST_BRANCH}${CIRRUS_PR}_aarch64\n---\n$(<Cargo.lock)\n---\n$(<Cargo.toml)"
bin_cache: &bin_cache_aarch64
<<: *bin_cache
fingerprint_key: "cargo_v1_${DEST_BRANCH}_aarch64"
setup_script: *setup
main_script: *main
+ cache_grooming_script: *groom
upload_caches: [ "cargo", "targets", "bin" ]
# Downstream CI needs the aarch64 binaries from this CI system.
# However, we don't want to confuse architectures.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aardvark-dns-1.5.0/.github/dependabot.yml
new/aardvark-dns-1.6.0/.github/dependabot.yml
--- old/aardvark-dns-1.5.0/.github/dependabot.yml 2023-02-01
16:22:45.000000000 +0100
+++ new/aardvark-dns-1.6.0/.github/dependabot.yml 1970-01-01
01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: cargo
- directory: "/"
- schedule:
- interval: daily
- open-pull-requests-limit: 10
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aardvark-dns-1.5.0/.github/renovate.json5
new/aardvark-dns-1.6.0/.github/renovate.json5
--- old/aardvark-dns-1.5.0/.github/renovate.json5 1970-01-01
01:00:00.000000000 +0100
+++ new/aardvark-dns-1.6.0/.github/renovate.json5 2023-04-05
19:20:16.000000000 +0200
@@ -0,0 +1,59 @@
+/*
+ Renovate is a service similar to GitHub Dependabot, but with
+ (fantastically) more configuration options. So many options
+ in fact, if you're new I recommend glossing over this cheat-sheet
+ prior to the official documentation:
+
+ https://www.augmentedmind.de/2021/07/25/renovate-bot-cheat-sheet
+
+ Configuration Update/Change Procedure:
+ 1. Make changes
+ 2. Manually validate changes (from repo-root):
+
+ podman run -it \
+ -v ./.github/renovate.json5:/usr/src/app/renovate.json5:z \
+ docker.io/renovate/renovate:latest \
+ renovate-config-validator
+ 3. Commit.
+
+ Configuration Reference:
+ https://docs.renovatebot.com/configuration-options/
+
+ Monitoring Dashboard:
+ https://app.renovatebot.com/dashboard#github/containers
+
+ Note: The Renovate bot will create/manage it's business on
+ branches named 'renovate/*'. Otherwise, and by
+ default, the only the copy of this file that matters
+ is the one on the `main` branch. No other branches
+ will be monitored or touched in any way.
+*/
+
+{
+ "$schema": "https://docs.renovatebot.com/renovate-schema.json";,
+
+ /*************************************************
+ ****** Global/general configuration options *****
+ *************************************************/
+
+ // Re-use predefined sets of configuration options to DRY
+ "extends": [
+ //
https://github.com/containers/automation/blob/main/renovate/defaults.json5
+ "github>containers/automation//renovate/defaults.json5"
+ ],
+
+ // Permit automatic rebasing when base-branch changes by more than
+ // one commit.
+ "rebaseWhen": "behind-base-branch",
+
+ /*************************************************
+ *** Repository-specific configuration options ***
+ *************************************************/
+
+ // Don't leave dep. update. PRs "hanging", assign them to people.
+ "assignees": ["containers/netavark-maintainers"],
+
+ /**************************************************
+ ***** Manager-specific configuration options *****
+ **************************************************/
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aardvark-dns-1.5.0/.packit.sh
new/aardvark-dns-1.6.0/.packit.sh
--- old/aardvark-dns-1.5.0/.packit.sh 1970-01-01 01:00:00.000000000 +0100
+++ new/aardvark-dns-1.6.0/.packit.sh 2023-04-05 19:20:16.000000000 +0200
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# This script handles any custom processing of the spec file generated using
the `post-upstream-clone`
+# action and gets used by the fix-spec-file action in .packit.yaml.
+
+set -eo pipefail
+
+# Get Version from Cargo.toml in HEAD
+VERSION=$(grep '^version' Cargo.toml | cut -d\" -f2 | sed -e 's/-/~/')
+
+# Generate source tarball from HEAD
+git archive --prefix=aardvark-dns-$VERSION/ -o aardvark-dns-$VERSION.tar.gz
HEAD
+
+# RPM Spec modifications
+
+# Use the Version from Cargo.toml in rpm spec
+sed -i "s/^Version:.*/Version: $VERSION/" aardvark-dns.spec
+
+# Use Packit's supplied variable in the Release field in rpm spec
+sed -i "s/^Release:.*/Release: $PACKIT_RPMSPEC_RELEASE%{?dist}/"
aardvark-dns.spec
+
+# Use above generated tarball as Source in rpm spec
+sed -i "s/^Source:.*.tar.gz/Source: aardvark-dns-$VERSION.tar.gz/"
aardvark-dns.spec
+
+# Use the right build dir for autosetup stage in rpm spec
+sed -i "s/^%autosetup.*/%autosetup -Sgit -n %{name}-$VERSION/"
aardvark-dns.spec
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aardvark-dns-1.5.0/.packit.yaml
new/aardvark-dns-1.6.0/.packit.yaml
--- old/aardvark-dns-1.5.0/.packit.yaml 1970-01-01 01:00:00.000000000 +0100
+++ new/aardvark-dns-1.6.0/.packit.yaml 2023-04-05 19:20:16.000000000 +0200
@@ -0,0 +1,32 @@
+---
+# See the documentation for more information:
+# https://packit.dev/docs/configuration/
+
+# Build targets can be found at:
+# https://copr.fedorainfracloud.org/coprs/rhcontainerbot/packit-builds/
+
+specfile_path: aardvark-dns.spec
+
+jobs:
+ - &copr
+ job: copr_build
+ trigger: pull_request
+ owner: rhcontainerbot
+ project: packit-builds
+ enable_net: true
+ srpm_build_deps:
+ - cargo
+ - make
+ - openssl-devel
+ - rpkg
+ actions:
+ post-upstream-clone:
+ - "rpkg spec --outdir ./"
+ fix-spec-file:
+ - "bash .packit.sh"
+
+ - <<: *copr
+ # Run on commit to main branch
+ trigger: commit
+ branch: main
+ project: podman-next
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aardvark-dns-1.5.0/Cargo.lock
new/aardvark-dns-1.6.0/Cargo.lock
--- old/aardvark-dns-1.5.0/Cargo.lock 2023-02-01 16:22:45.000000000 +0100
+++ new/aardvark-dns-1.6.0/Cargo.lock 2023-04-05 19:20:16.000000000 +0200
@@ -4,7 +4,7 @@
[[package]]
name = "aardvark-dns"
-version = "1.5.0"
+version = "1.6.0"
dependencies = [
"anyhow",
"async-broadcast",
@@ -34,19 +34,18 @@
[[package]]
name = "anyhow"
-version = "1.0.68"
+version = "1.0.70"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
+checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
[[package]]
name = "async-broadcast"
-version = "0.5.0"
+version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "1b19760fa2b7301cf235360ffd6d3558b1ed4249edd16d6cca8d690cee265b95"
+checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b"
dependencies = [
"event-listener",
"futures-core",
- "parking_lot",
]
[[package]]
@@ -57,7 +56,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.98",
]
[[package]]
@@ -109,9 +108,9 @@
[[package]]
name = "chrono"
-version = "0.4.23"
+version = "0.4.24"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
+checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b"
dependencies = [
"iana-time-zone",
"js-sys",
@@ -149,7 +148,7 @@
"proc-macro-error",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.98",
]
[[package]]
@@ -201,7 +200,7 @@
"proc-macro2",
"quote",
"scratch",
- "syn",
+ "syn 1.0.98",
]
[[package]]
@@ -218,7 +217,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.98",
]
[[package]]
@@ -242,7 +241,7 @@
"heck",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.98",
]
[[package]]
@@ -281,9 +280,9 @@
[[package]]
name = "futures-core"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
[[package]]
name = "futures-executor"
@@ -304,15 +303,15 @@
[[package]]
name = "futures-task"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
[[package]]
name = "futures-util"
-version = "0.3.25"
+version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
dependencies = [
"futures-core",
"futures-task",
@@ -438,9 +437,9 @@
[[package]]
name = "libc"
-version = "0.2.139"
+version = "0.2.140"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
[[package]]
name = "link-cplusplus"
@@ -452,16 +451,6 @@
]
[[package]]
-name = "lock_api"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
name = "log"
version = "0.4.17"
source = "registry+https://github.com/rust-lang/crates.io-index";
@@ -483,12 +472,6 @@
checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
name = "memoffset"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
@@ -583,29 +566,6 @@
checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa"
[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-sys 0.36.1",
-]
-
-[[package]]
name = "percent-encoding"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
@@ -638,7 +598,7 @@
"proc-macro-error-attr",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.98",
"version_check",
]
@@ -655,9 +615,9 @@
[[package]]
name = "proc-macro2"
-version = "1.0.40"
+version = "1.0.54"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
+checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534"
dependencies = [
"unicode-ident",
]
@@ -670,9 +630,9 @@
[[package]]
name = "quote"
-version = "1.0.20"
+version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
+checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
dependencies = [
"proc-macro2",
]
@@ -718,15 +678,6 @@
]
[[package]]
-name = "redox_syscall"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
name = "resolv-conf"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
@@ -736,12 +687,6 @@
]
[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
name = "scratch"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
@@ -764,14 +709,14 @@
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.98",
]
[[package]]
name = "signal-hook"
-version = "0.3.14"
+version = "0.3.15"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
+checksum = "732768f1176d21d09e076c23a93123d40bba92d50c4058da34d45c8de8e682b9"
dependencies = [
"libc",
"signal-hook-registry",
@@ -800,9 +745,9 @@
[[package]]
name = "socket2"
-version = "0.4.4"
+version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
dependencies = [
"libc",
"winapi",
@@ -832,6 +777,17 @@
]
[[package]]
+name = "syn"
+version = "2.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
name = "syslog"
version = "6.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
@@ -876,7 +832,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.98",
]
[[package]]
@@ -918,31 +874,30 @@
[[package]]
name = "tokio"
-version = "1.25.0"
+version = "1.27.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af"
+checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001"
dependencies = [
"autocfg",
"bytes",
"libc",
- "memchr",
"mio",
"num_cpus",
"pin-project-lite",
"socket2",
"tokio-macros",
- "windows-sys 0.42.0",
+ "windows-sys 0.45.0",
]
[[package]]
name = "tokio-macros"
-version = "1.8.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
+checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce"
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 2.0.12",
]
[[package]]
@@ -974,7 +929,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.98",
]
[[package]]
@@ -1131,7 +1086,7 @@
"once_cell",
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.98",
"wasm-bindgen-shared",
]
@@ -1153,7 +1108,7 @@
dependencies = [
"proc-macro2",
"quote",
- "syn",
+ "syn 1.0.98",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -1210,24 +1165,33 @@
[[package]]
name = "windows-sys"
-version = "0.42.0"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
dependencies = [
"windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.0",
- "windows_i686_gnu 0.42.0",
- "windows_i686_msvc 0.42.0",
- "windows_x86_64_gnu 0.42.0",
+ "windows_aarch64_msvc 0.42.1",
+ "windows_i686_gnu 0.42.1",
+ "windows_i686_msvc 0.42.1",
+ "windows_x86_64_gnu 0.42.1",
"windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.0",
+ "windows_x86_64_msvc 0.42.1",
]
[[package]]
name = "windows_aarch64_gnullvm"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
[[package]]
name = "windows_aarch64_msvc"
@@ -1237,9 +1201,9 @@
[[package]]
name = "windows_aarch64_msvc"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
[[package]]
name = "windows_i686_gnu"
@@ -1249,9 +1213,9 @@
[[package]]
name = "windows_i686_gnu"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
[[package]]
name = "windows_i686_msvc"
@@ -1261,9 +1225,9 @@
[[package]]
name = "windows_i686_msvc"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
[[package]]
name = "windows_x86_64_gnu"
@@ -1273,15 +1237,15 @@
[[package]]
name = "windows_x86_64_gnu"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
[[package]]
name = "windows_x86_64_gnullvm"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
[[package]]
name = "windows_x86_64_msvc"
@@ -1291,6 +1255,6 @@
[[package]]
name = "windows_x86_64_msvc"
-version = "0.42.0"
+version = "0.42.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aardvark-dns-1.5.0/Cargo.toml
new/aardvark-dns-1.6.0/Cargo.toml
--- old/aardvark-dns-1.5.0/Cargo.toml 2023-02-01 16:22:45.000000000 +0100
+++ new/aardvark-dns-1.6.0/Cargo.toml 2023-04-05 19:20:16.000000000 +0200
@@ -1,6 +1,7 @@
[package]
name = "aardvark-dns"
-version = "1.5.0"
+# This version specification right below is reused by .packit.sh to generate
rpm version
+version = "1.6.0"
edition = "2018"
authors = ["github.com/containers"]
license = "Apache-2.0"
@@ -11,23 +12,30 @@
categories = ["containers", "networking", "dns", "podman"]
exclude = ["/.cirrus.yml", "/.github/*"]
+[package.metadata.vendor-filter]
+# This list is not exhaustive.
+platforms = ["x86_64-unknown-linux-gnu", "aarch64-unknown-linux-gnu",
"powerpc64le-unknown-linux-gnu",
+ "s390x-unknown-linux-gnu", "riscv64gc-unknown-linux-gnu",
+ "x86_64-unknown-linux-musl", "aarch64-unknown-linux-musl",
+ ]
+
# See more keys and their definitions at
https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
clap = { version = "3.2.23", features = ["derive"] }
-syslog = "^6.0"
+syslog = "^6.0.1"
log = "0.4.17"
trust-dns-server = "0.22.0"
trust-dns-proto = "0.22.0"
trust-dns-client = "0.22.0"
-anyhow = "1.0.68"
-futures-util = { version = "0.3.25", default-features = false }
-signal-hook = "0.3.13"
-tokio = { version = "1.25.0", features = ["macros", "rt-multi-thread", "net"] }
-async-broadcast = "0.5.0"
+anyhow = "1.0.70"
+futures-util = { version = "0.3.28", default-features = false }
+signal-hook = "0.3.15"
+tokio = { version = "1.27.0", features = ["macros", "rt-multi-thread", "net"] }
+async-broadcast = "0.5.1"
resolv-conf = "0.7.0"
nix = "0.26.2"
libc = "0.2"
[build-dependencies]
-chrono = "0.4.23"
+chrono = "0.4.24"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aardvark-dns-1.5.0/Makefile
new/aardvark-dns-1.6.0/Makefile
--- old/aardvark-dns-1.5.0/Makefile 2023-02-01 16:22:45.000000000 +0100
+++ new/aardvark-dns-1.6.0/Makefile 2023-04-05 19:20:16.000000000 +0200
@@ -18,6 +18,9 @@
# build w/ debugging features.
debug ?=
+# Set path to cargo executable
+CARGO ?= cargo
+
# All complication artifacts, including dependencies and intermediates
# will be stored here, for all architectures. Use a non-default name
# since the (default) 'target' is used/referenced ambiguously in many
@@ -47,7 +50,7 @@
.PHONY: build
build: bin $(CARGO_TARGET_DIR)
- cargo build $(release)
+ $(CARGO) build $(release)
cp $(CARGO_TARGET_DIR)/$(profile)/aardvark-dns bin/aardvark-dns$(if
$(debug),.debug,)
.PHONY: crate-publish
@@ -57,8 +60,8 @@
exit 1;\
fi
@echo "It is expected that you have already done 'cargo login' before
running this command. If not command may fail later"
- cargo publish --dry-run
- cargo publish
+ $(CARGO) publish --dry-run
+ $(CARGO) publish
.PHONY: clean
clean:
@@ -86,18 +89,18 @@
# Used by CI to compile the unit tests but not run them
.PHONY: build_unit
build_unit: $(CARGO_TARGET_DIR)
- cargo test --no-run
+ $(CARGO) test --no-run
#.PHONY: unit
unit: $(CARGO_TARGET_DIR)
- cargo test
+ $(CARGO) test
#.PHONY: code_coverage
# Can be used by CI and users to generate code coverage report based on
aardvark unit tests
code_coverage: $(CARGO_TARGET_DIR)
# Downloads tarpaulin only if same version is not present on local
- cargo install cargo-tarpaulin
- cargo tarpaulin -v
+ $(CARGO) install cargo-tarpaulin
+ $(CARGO) tarpaulin -v
#.PHONY: integration
integration: $(CARGO_TARGET_DIR)
@@ -110,20 +113,20 @@
.PHONY: validate
validate: $(CARGO_TARGET_DIR)
- cargo fmt --all -- --check
- cargo clippy -p aardvark-dns -- -D warnings
+ $(CARGO) fmt --all -- --check
+ $(CARGO) clippy -p aardvark-dns -- -D warnings
.PHONY: vendor-tarball
vendor-tarball: build install.cargo-vendor-filterer
VERSION=$(shell bin/aardvark-dns --version | cut -f2 -d" ") && \
- cargo vendor-filterer '--platform=*-unknown-linux-*' --format=tar.gz
--prefix vendor/ && \
+ $(CARGO) vendor-filterer --format=tar.gz --prefix vendor/ && \
mv vendor.tar.gz aardvark-dns-v$$VERSION-vendor.tar.gz && \
gzip -c bin/aardvark-dns > aardvark-dns.gz && \
sha256sum aardvark-dns.gz aardvark-dns-v$$VERSION-vendor.tar.gz >
sha256sum
.PHONY: install.cargo-vendor-filterer
install.cargo-vendor-filterer:
- cargo install cargo-vendor-filterer
+ $(CARGO) install cargo-vendor-filterer
.PHONY: help
help:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aardvark-dns-1.5.0/RELEASE_NOTES.md
new/aardvark-dns-1.6.0/RELEASE_NOTES.md
--- old/aardvark-dns-1.5.0/RELEASE_NOTES.md 2023-02-01 16:22:45.000000000
+0100
+++ new/aardvark-dns-1.6.0/RELEASE_NOTES.md 2023-04-05 19:20:16.000000000
+0200
@@ -1,5 +1,9 @@
# Release Notes
+## v1.6.0
+* dependency updates
+* lower the TTL to 60s for container names
+
## v1.5.0
* dependency updates
* code of conduct added
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aardvark-dns-1.5.0/aardvark-dns.spec.rpkg
new/aardvark-dns-1.6.0/aardvark-dns.spec.rpkg
--- old/aardvark-dns-1.5.0/aardvark-dns.spec.rpkg 2023-02-01
16:22:45.000000000 +0100
+++ new/aardvark-dns-1.6.0/aardvark-dns.spec.rpkg 2023-04-05
19:20:16.000000000 +0200
@@ -3,7 +3,14 @@
# The following tag is to get correct syntax highlighting for this file in vim
text editor
# vim: syntax=spec
-%global with_debug 0
+# RHEL doesn't include the package rust-packaging which provides %%__cargo
macro, but EPEL
+# does. So we set it separately here and skip rust-packaging dependency for
RHEL.
+# Buildability without EPEL is essential for packit builds.
+%if 0%{?rhel}
+%define __cargo %{_bindir}/env CARGO_HOME=.cargo RUSTC_BOOTSTRAP=1
RUSTFLAGS='-Copt-level=3 -Cdebuginfo=2 -Ccodegen-units=1
-Clink-arg=-Wl,-z,relro -Clink-arg=-Wl,-z,now --cap-lints=warn' %{_bindir}/cargo
+%endif
+
+%global with_debug 1
%if 0%{?with_debug}
%global _find_debuginfo_dwz_opts %{nil}
@@ -12,68 +19,42 @@
%global debug_package %{nil}
%endif
-# git_dir_name returns repository name derived from remote Git repository URL
-Name: {{{ git_dir_name }}}
-
+Name: {{{ git_dir_name }}}
Epoch: 101
-
-# git_dir_version returns version based on commit and tag history of the Git
project
-Version: {{{ git_dir_version }}}
-
-# This can be useful later for adding downstream patches
-Release: 1%{?dist}
-
-# Basic description of the package
+Version: {{{ git_dir_version }}}
+Release: 1%{?dist}
Summary: Authoritative DNS server for A/AAAA container records
-
-# License. We assume GPLv2+ here.
-License: ASL 2.0 and BSD and ISC and MIT
-
-# Home page of the project. Can also point to the public Git repository page.
-URL: https://github.com/containers/aardvark-dns
-
-# Detailed information about the source Git repository and the source commit
-# for the created rpm package
-VCS: {{{ git_dir_vcs }}}
-
-# git_dir_pack macro places the repository content (the source files) into a
tarball
-# and returns its filename. The tarball will be used to build the rpm.
-Source: {{{ git_dir_pack }}}
-
+License: ASL 2.0 and BSD and ISC and MIT
+URL: https://github.com/containers/aardvark-dns
+VCS: {{{ git_dir_vcs }}}
+Source: {{{ git_dir_pack }}}
BuildRequires: cargo
BuildRequires: git-core
BuildRequires: make
-
-ExclusiveArch: %{rust_arches}
+%if 0%{?fedora}
+BuildRequires: rust-packaging
+%endif
+ExclusiveArch: %{rust_arches}
%global _description %{expand:
%{summary}}
%description %{_description}
-# The following four sections already describe the rpm build process itself.
-# prep will extract the tarball defined as Source above and descend into it.
%prep
#{{{ git_dir_setup_macro }}}
%autosetup -Sgit -T -b 0 -n %{name}
-# This will invoke `make` command in the directory with the extracted sources.
%build
-%{__make} build
+%{__make} CARGO="%{__cargo}" build
-# This will copy the files generated by the `make` command above into
-# the installable rpm package.
%install
%{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} install
-# This lists all the files that are included in the rpm package and that
-# are going to be installed into target system where the rpm is installed.
%files
%license LICENSE
%dir %{_libexecdir}/podman
%{_libexecdir}/podman/%{name}
-# Finally, changes from the latest release of your application are generated
from
-# your project's Git history. It will be empty until you make first annotated
Git tag.
%changelog
{{{ git_dir_changelog }}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/aardvark-dns-1.5.0/contrib/cirrus/netavark_cache_groom.sh
new/aardvark-dns-1.6.0/contrib/cirrus/netavark_cache_groom.sh
--- old/aardvark-dns-1.5.0/contrib/cirrus/netavark_cache_groom.sh
1970-01-01 01:00:00.000000000 +0100
+++ new/aardvark-dns-1.6.0/contrib/cirrus/netavark_cache_groom.sh
2023-04-05 19:20:16.000000000 +0200
@@ -0,0 +1,23 @@
+#!/bin/bash
+#
+# This script is intended to be run from Cirrus-CI to prepare the
+# rust targets cache for re-use during subsequent runs. This mainly
+# involves removing files and directories which change frequently
+# but are cheap/quick to regenerate - i.e. prevent "cache-flapping".
+# Any other use of this script is not supported and may cause harm.
+
+set -eo pipefail
+
+SCRIPT_DIRPATH=$(dirname ${BASH_SOURCE[0]})
+source $SCRIPT_DIRPATH/lib.sh
+
+if [[ "$CIRRUS_CI" != true ]] || [[ -z "$DEST_BRANCH" ]]; then
+ die "Script is not intended for use outside of Cirrus-CI"
+fi
+
+SCRIPT_DEST=$SCRIPT_DIRPATH/cache_groom.sh
+showrun curl --location --silent --show-error -o $SCRIPT_DEST \
+
https://raw.githubusercontent.com/containers/netavark/$DEST_BRANCH/contrib/cirrus/cache_groom.sh
+
+# Certain common automation library calls assume execution from this file
+exec bash $SCRIPT_DEST
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aardvark-dns-1.5.0/src/dns/coredns.rs
new/aardvark-dns-1.6.0/src/dns/coredns.rs
--- old/aardvark-dns-1.5.0/src/dns/coredns.rs 2023-02-01 16:22:45.000000000
+0100
+++ new/aardvark-dns-1.6.0/src/dns/coredns.rs 2023-04-05 19:20:16.000000000
+0200
@@ -21,6 +21,12 @@
DnsStreamHandle,
};
+// Containers can be recreated with different ips quickly so
+// do not let the clients cache to dns response for to long,
+// aardvark-dns runs on the same host so caching is not that important.
+// see https://github.com/containers/netavark/discussions/644
+const CONTAINER_TTL: u32 = 60;
+
pub struct CoreDns {
name: Name, // name or origin
network_name: String, // raw network name
@@ -212,7 +218,7 @@
if let Ok(answer) =
Name::from_ascii(format!("{}.", entry)) {
req_clone.add_answer(
Record::new()
- .set_ttl(86400)
+ .set_ttl(CONTAINER_TTL)
.set_rr_type(RecordType::PTR)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::PTR(answer)))
@@ -294,7 +300,7 @@
req.add_answer(
Record::new()
.set_name(record_name.clone())
- .set_ttl(86400)
+ .set_ttl(CONTAINER_TTL)
.set_rr_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(ipv4)))
@@ -308,7 +314,7 @@
req.add_answer(
Record::new()
.set_name(record_name.clone())
- .set_ttl(86400)
+ .set_ttl(CONTAINER_TTL)
.set_rr_type(RecordType::AAAA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::AAAA(ipv6)))
@@ -337,7 +343,7 @@
));
if let Ok((cl, req_sender)) =
AsyncClient::connect(connection).await {
- let _ =
tokio::spawn(req_sender);
+ tokio::spawn(req_sender);
if let Some(resp) =
forward_dns_req(cl, req.clone()).await {
if reply(sender.clone(),
src_address, &resp).is_some() {
// request resolved
from following resolver so
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/aardvark-dns/vendor.tar.gz
/work/SRC/openSUSE:Factory/.aardvark-dns.new.19717/vendor.tar.gz differ: char
5, line 1
