From 9a91a7d4e9f5ea3d8f7f822dbec6f0d2ee10b0b2 Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremyrand@danwin1210.de>
Date: Sat, 7 May 2022 13:51:58 +0000
Subject: [PATCH 1/2] Add coredns-utils project

---
 projects/coredns-utils/build  | 35 +++++++++++++++++++++++++++++++++++
 projects/coredns-utils/config | 22 ++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 projects/coredns-utils/build
 create mode 100644 projects/coredns-utils/config

diff --git a/projects/coredns-utils/build b/projects/coredns-utils/build
new file mode 100644
index 0000000..6b3a486
--- /dev/null
+++ b/projects/coredns-utils/build
@@ -0,0 +1,35 @@
+#!/bin/bash
+[% c("var/set_default_env") -%]
+[% pc('go', 'var/setup', { go_tarfile => c('input_files_by_name/go') }) %]
+export CGO_ENABLED=[% c("var/cgo") %]
+distdir=/var/tmp/dist/[% project %]
+mkdir -p $distdir
+
+[% FOREACH dep = c("var/go_lib_deps") -%]
+  tar -C /var/tmp/dist -xf [% c('input_files_by_name/' _ dep) %]
+[% END -%]
+
+mkdir -p $GOPATH/src/github.com/coredns
+tar -C $GOPATH/src/github.com/coredns -xf [% project %]-[% c('version') %].tar.gz
+mv $GOPATH/src/github.com/coredns/coredns-utils-[% c('version') %] $GOPATH/src/github.com/coredns/coredns-utils
+
+# TODO: Remove static build ID after migrating to Go 1.13.3+
+go install $TAGS -ldflags '-s -buildid=' github.com/coredns/coredns-utils/coredns-keygen
+
+[% IF c("var/linux-x86_64") -%]
+  GOPATHBIN="${GOPATH}/bin"
+[% ELSE -%]
+  GOPATHBIN="${GOPATH}/bin/${GOOS}_${GOARCH}"
+[% END -%]
+
+cd /var/tmp/dist
+
+# Build as executable
+
+cp -a $GOPATHBIN/coredns-keygen[% IF c("var/windows") %].exe[% END %] $distdir/
+
+cd $distdir
+[% c('tar', {
+   tar_src   => [ '.' ],
+   tar_args  => '-czf ' _ dest_dir _ '/' _ c('filename'),
+  }) %]
diff --git a/projects/coredns-utils/config b/projects/coredns-utils/config
new file mode 100644
index 0000000..8497af2
--- /dev/null
+++ b/projects/coredns-utils/config
@@ -0,0 +1,22 @@
+version: '[% c("abbrev") %]'
+git_url:  https://github.com/coredns/coredns-utils.git
+git_hash: 'c07df082698203e12b1b31dea9c6183cc676833e'
+filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
+
+var:
+  container:
+    use_container: 1
+  go_lib_deps:
+    - godns
+  go_lib_install:
+    - github.com/coredns/coredns-utils/coredns-keygen
+  cgo: 0
+  build_go_lib_pre: |
+    export CGO_ENABLED=[% c("var/cgo") %] 
+
+input_files:
+  - project: container-image
+  - name: go
+    project: go
+  - name: godns
+    project: godns

From 32d5ee8277616efe32a8b04519af6aaab1e98bb9 Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremyrand@danwin1210.de>
Date: Sat, 7 May 2022 13:55:00 +0000
Subject: [PATCH 2/2] plain-binaries: Add coredns-utils dependency

---
 projects/plain-binaries/build  | 1 +
 projects/plain-binaries/config | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/projects/plain-binaries/build b/projects/plain-binaries/build
index 67bfa3b..a816466 100644
--- a/projects/plain-binaries/build
+++ b/projects/plain-binaries/build
@@ -7,6 +7,7 @@ mkdir -p $distdir
 [% IF c("var/windows") %]
   tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/certinject') %]
 [% END %]
+tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/coredns-utils') %]
 tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/encaya') %]
 tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/generate_nmc_cert') %]
 tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/ncdns') %]
diff --git a/projects/plain-binaries/config b/projects/plain-binaries/config
index 20479dc..db1122d 100644
--- a/projects/plain-binaries/config
+++ b/projects/plain-binaries/config
@@ -10,6 +10,8 @@ input_files:
   - name: certinject
     project: certinject
     enable: '[% c("var/windows") %]'
+  - name: coredns-utils
+    project: coredns-utils
   - name: encaya
     project: encaya
   - name: generate_nmc_cert