diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 20 | ||||
| -rw-r--r-- | dateformat.patch | 13 | ||||
| -rw-r--r-- | rootcheck.patch | 16 |
4 files changed, 53 insertions, 8 deletions
@@ -1,16 +1,20 @@ -# Generated by mksrcinfo v8 -# Fri Mar 16 18:48:40 UTC 2018 pkgbase = dnssec-reverb-git pkgdesc = Shell script based DNSSEC key management tool - pkgver = r13.376067d + pkgver = r30.9aa8e24 pkgrel = 1 url = https://github.com/northox/dnssec-reverb arch = any license = Simplified BSD + makedepends = git optdepends = dnssec-tools: DNSSEC tools for BIND optdepends = ldns: tools for NSD + backup = etc/dnssec-reverb.conf + backup = etc/dnssec-reverb.conf-bind source = dnssec-reverb::git+https://github.com/northox/dnssec-reverb.git + source = dateformat.patch + source = rootcheck.patch md5sums = SKIP + md5sums = 8d7cb4088b45171ec9c3b64f95785464 + md5sums = 172c4bc58fce6706259ace9b9d068e8f pkgname = dnssec-reverb - @@ -1,8 +1,9 @@ -# Maintainer: Bjoern Franke <bjo@nord-west.org> +# Maintainer: Thomas Haider <t.haider@deprecate.de> +# Contributor: Bjoern Franke <bjo@nord-west.org> pkgbase=dnssec-reverb-git pkgname=dnssec-reverb -pkgver=r13.376067d +pkgver=r30.9aa8e24 pkgrel=1 pkgdesc="Shell script based DNSSEC key management tool" arch=('any') @@ -10,14 +11,25 @@ url="https://github.com/northox/dnssec-reverb" license=('Simplified BSD') optdepends=('dnssec-tools: DNSSEC tools for BIND' 'ldns: tools for NSD') -source=("${pkgname}::git+https://github.com/northox/${pkgname}.git") -md5sums=('SKIP') +makedepends=('git') +backup=('etc/dnssec-reverb.conf' 'etc/dnssec-reverb.conf-bind') +source=("${pkgname}::git+https://github.com/northox/${pkgname}.git" + "dateformat.patch" + "rootcheck.patch") +md5sums=('SKIP' + '8d7cb4088b45171ec9c3b64f95785464' + '172c4bc58fce6706259ace9b9d068e8f') pkgver() { cd "${srcdir}/${pkgname}" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } +build() { + cd "${srcdir}/${pkgname-git}" + git apply ${srcdir}/dateformat.patch + git apply ${srcdir}/rootcheck.patch +} package() { cd "${srcdir}/${pkgname}" diff --git a/dateformat.patch b/dateformat.patch new file mode 100644 index 000000000000..c0bf524ed95a --- /dev/null +++ b/dateformat.patch @@ -0,0 +1,13 @@ +diff --git a/dnssec-reverb b/dnssec-reverb +index ad133ad..3eafb0b 100755 +--- a/dnssec-reverb ++++ b/dnssec-reverb +@@ -160,7 +160,7 @@ sign() + EXPIRE=$EXPIRE_ABS + fi + $SIGNZONE_CMD "$_SIGN_PARAM" -e "$EXP" -o "$ZONE" -f "$ZONEFILE.signed" "$ZONEFILE.tmp" "$KEYDIR/$ZSK" "$KEYDIR/$KSK" $KSS || Fatal "failed to sign zone" && $CHECKZONE_CMD $ZONE $ZONE +- TT=$EXPIRE; date -r "$TT" '+%Y/%m/%d %H:%M:%S' > "$KEYDIR/$ZSK.expire" ++ TT=$EXPIRE; date -d "@$TT" '+%Y/%m/%d %H:%M:%S' > "$KEYDIR/$ZSK.expire" + rm "$ZONEFILE.tmp" + eval "$RELOAD_CMD" + } diff --git a/rootcheck.patch b/rootcheck.patch new file mode 100644 index 000000000000..0b462bb8f18c --- /dev/null +++ b/rootcheck.patch @@ -0,0 +1,16 @@ +diff --git a/dnssec-reverb b/dnssec-reverb +index ad133ad..e204334 100755 +--- a/dnssec-reverb ++++ b/dnssec-reverb +@@ -34,11 +34,6 @@ Fatal() + exit 1 + } + +-if [ $(id -u) != 0 ]; then +- Fatal "must be root" +-fi +- +- + # load conf + CONF="dnssec-reverb.conf" + if [ -r "$DNSSEC_REVERB_CONF/$CONF" ]; then |