Date: Monday, September 17, 2018 @ 21:09:14 Author: felixonmars Revision: 382788
upgpkg: dnssec-tools 2.2.3-1 Modified: dnssec-tools/trunk/PKGBUILD Deleted: dnssec-tools/trunk/glibc-2.25.patch ------------------+ PKGBUILD | 32 +++++-------- glibc-2.25.patch | 128 ----------------------------------------------------- 2 files changed, 13 insertions(+), 147 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-09-17 21:06:36 UTC (rev 382787) +++ PKGBUILD 2018-09-17 21:09:14 UTC (rev 382788) @@ -2,8 +2,8 @@ # Contributor: Luca Fulchir <[email protected]> pkgname=dnssec-tools -pkgver=2.2 -pkgrel=12 +pkgver=2.2.3 +pkgrel=1 pkgdesc="libval & dnssec management tools" arch=('x86_64') url="http://www.dnssec-tools.org"; @@ -10,31 +10,26 @@ license=('BSD') conflicts=('libval' 'libval_shim' 'libsres') backup=('etc/dnssec-tools/dnssec-tools.conf' 'etc/dnssec-tools/resolv.conf' 'etc/dnssec-tools/root.hints' 'etc/dnssec-tools/dnsval.conf') -depends=('dnsutils' 'perl' 'perl-timedate' 'perl-net-dns' 'perl-net-dns-sec' 'perl-mailtools' 'bind' 'openssl-1.0' 'glibc' 'pth') +depends=('dnsutils' 'perl' 'perl-timedate' 'perl-net-dns' 'perl-net-dns-sec' 'perl-mailtools' 'bind' 'openssl' 'glibc' 'pth') optdepends=('perl-tk: for GUI components' 'perl-graphviz: for GUI components') options=('!emptydirs') -source=(http://www.dnssec-tools.org/download/${pkgname}-${pkgver}.tar.gz +source=(https://github.com/DNSSEC-Tools/DNSSEC-Tools/archive/dnssec-tools-$pkgver.tar.gz makefile-dependency.patch - dnssec-tools-link.patch - glibc-2.25.patch) -sha256sums=('4f45033a7a27382fe5284de705a1792277dfbe9a149d369b95d787865a44ef66' + dnssec-tools-link.patch) +sha256sums=('bc4286beff38c6d951137753b40fb3bd98a2d62d73be094b9ce062dec7b5bcb5' 'fb23565ff9afabf85dc812ab500a3652add4537e9519a49214e329de3d2171f9' - 'c499ce75b27d89b456c9b79d7051d63bdfeb35835e95e0cd312f1a55b1881c85' - 'd5485691e4d1604bc2e0d06a66068f9f930c94cb2012e4d89ffee5615542d296') + 'c499ce75b27d89b456c9b79d7051d63bdfeb35835e95e0cd312f1a55b1881c85') install="dnssec-tools.install" prepare() { # patch for race condition with -j 2+ - cd "$srcdir/${pkgname}-${pkgver}" + cd DNSSEC-Tools-dnssec-tools-$pkgver/dnssec-tools patch -p0 -i "$srcdir/makefile-dependency.patch" # patch for linking errors patch -p1 -i "$srcdir/dnssec-tools-link.patch" - # patch for glibc 2.25 compatibility - patch -p1 -i "$srcdir/glibc-2.25.patch" - sed -e '/^maninstall:/,+3s:$(MKPATH) $(mandir)/$(man1dir):$(MKPATH) $(DESTDIR)/$(mandir)/$(man1dir):' \ -i Makefile.in sed -e 's:/usr/local/etc:/etc:g' \ @@ -56,9 +51,8 @@ } build() { - cd "$srcdir/${pkgname}-${pkgver}" + cd DNSSEC-Tools-dnssec-tools-$pkgver/dnssec-tools - export CFLAGS="$CFLAGS -I/usr/include/openssl-1.0" ./configure \ --exec_prefix=/usr \ --prefix=/usr \ @@ -72,13 +66,13 @@ } package() { - cd "$srcdir/${pkgname}-${pkgver}" - make install DESTDIR="${pkgdir}" - cp validator/etc/dnsval.conf validator/etc/root.hints "${pkgdir}"/etc/dnssec-tools/ + cd DNSSEC-Tools-dnssec-tools-$pkgver/dnssec-tools + make install DESTDIR="$pkgdir" + cp validator/etc/dnsval.conf validator/etc/root.hints "$pkgdir"/etc/dnssec-tools/ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" - cd "${pkgdir}/etc/dnssec-tools" + cd "$pkgdir"/etc/dnssec-tools mkdir KEY-SAFE touch KEY-SAFE/.pacmankeep Deleted: glibc-2.25.patch =================================================================== --- glibc-2.25.patch 2018-09-17 21:06:36 UTC (rev 382787) +++ glibc-2.25.patch 2018-09-17 21:09:14 UTC (rev 382788) @@ -1,128 +0,0 @@ -diff --git a/validator/include/validator/validator-compat.h b/validator/include/validator/validator-compat.h -index c6ebf23..515df6d 100644 ---- a/validator/include/validator/validator-compat.h -+++ b/validator/include/validator/validator-compat.h -@@ -678,6 +678,11 @@ typedef enum __ns_rcode { - #define ns_t_zxfr 256 /* BIND-specific, nonstandard. */ - #endif /* HAVE_NS_T_KX */ - -+/* glibc 2.25 is missing ns_t_zxfr */ -+#if !defined(ns_t_zxfr) -+#define ns_t_zxfr 256 /* BIND-specific, nonstandard. */ -+#endif /* glibc 2.25 */ -+ - #if !HAVE_DECL_NS_T_DS - #define ns_t_ds 43 - #endif -@@ -818,53 +823,6 @@ typedef enum __ns_flag { - ns_f_max - } ns_flag; - --/* The Algorithm field of the KEY and SIG RR's is an integer, {1..254} */ --#define NS_ALG_MD5RSA 1 /* MD5 with RSA */ --#define NS_ALG_DH 2 /* Diffie Hellman KEY */ --#define NS_ALG_DSA 3 /* DSA KEY */ --#define NS_ALG_DSS NS_ALG_DSA --#define NS_ALG_EXPIRE_ONLY 253 /* No alg, no security */ --#define NS_ALG_PRIVATE_OID 254 /* Key begins with OID giving alg */ -- --/* Protocol values */ --/* value 0 is reserved */ --#define NS_KEY_PROT_TLS 1 --#define NS_KEY_PROT_EMAIL 2 --#define NS_KEY_PROT_DNSSEC 3 --#define NS_KEY_PROT_IPSEC 4 --#define NS_KEY_PROT_ANY 255 -- --/* Signatures */ --#define NS_MD5RSA_MIN_BITS 512 /* Size of a mod or exp in bits */ --#define NS_MD5RSA_MAX_BITS 2552 -- /* Total of binary mod and exp */ --#define NS_MD5RSA_MAX_BYTES ((NS_MD5RSA_MAX_BITS+7/8)*2+3) -- /* Max length of text sig block */ --#define NS_MD5RSA_MAX_BASE64 (((NS_MD5RSA_MAX_BYTES+2)/3)*4) --#define NS_MD5RSA_MIN_SIZE ((NS_MD5RSA_MIN_BITS+7)/8) --#define NS_MD5RSA_MAX_SIZE ((NS_MD5RSA_MAX_BITS+7)/8) -- --#define NS_DSA_SIG_SIZE 41 --#define NS_DSA_MIN_SIZE 213 --#define NS_DSA_MAX_BYTES 405 -- --/* Offsets into SIG record rdata to find various values */ --#define NS_SIG_TYPE 0 /* Type flags */ --#define NS_SIG_ALG 2 /* Algorithm */ --#define NS_SIG_LABELS 3 /* How many labels in name */ --#define NS_SIG_OTTL 4 /* Original TTL */ --#define NS_SIG_EXPIR 8 /* Expiration time */ --#define NS_SIG_SIGNED 12 /* Signature time */ --#define NS_SIG_FOOT 16 /* Key footprint */ --#define NS_SIG_SIGNER 18 /* Domain name of who signed it */ -- --/* How RR types are represented as bit-flags in NXT records */ --#define NS_NXT_BITS 8 --#define NS_NXT_BIT_SET( n,p) (p[(n)/NS_NXT_BITS] |= (0x80>>((n)%NS_NXT_BITS))) --#define NS_NXT_BIT_CLEAR(n,p) (p[(n)/NS_NXT_BITS] &= ~(0x80>>((n)%NS_NXT_BITS))) --#define NS_NXT_BIT_ISSET(n,p) (p[(n)/NS_NXT_BITS] & (0x80>>((n)%NS_NXT_BITS))) --#define NS_NXT_MAX 127 -- - /* - * Inline versions of get/put short/long. Pointer is advanced. - */ -@@ -931,6 +889,57 @@ int ns_parse_ttl(const char *, u_long *); - - #endif /* HAVE_ARPA_NAMESER_H */ - -+/* glibc 2.25 passes HAVE_ARPA_NAMESER_H, but doesn't have NS_ALG_MD5RSA and more defines. */ -+#if !defined(HAVE_ARPA_NAMESER_H) || defined(eabi) || defined(ANDROID) ||defined(__OpenBSD__) || !defined(NS_ALG_MD5RSA) -+/* The Algorithm field of the KEY and SIG RR's is an integer, {1..254} */ -+#define NS_ALG_MD5RSA 1 /* MD5 with RSA */ -+#define NS_ALG_DH 2 /* Diffie Hellman KEY */ -+#define NS_ALG_DSA 3 /* DSA KEY */ -+#define NS_ALG_DSS NS_ALG_DSA -+#define NS_ALG_EXPIRE_ONLY 253 /* No alg, no security */ -+#define NS_ALG_PRIVATE_OID 254 /* Key begins with OID giving alg */ -+ -+/* Protocol values */ -+/* value 0 is reserved */ -+#define NS_KEY_PROT_TLS 1 -+#define NS_KEY_PROT_EMAIL 2 -+#define NS_KEY_PROT_DNSSEC 3 -+#define NS_KEY_PROT_IPSEC 4 -+#define NS_KEY_PROT_ANY 255 -+ -+/* Signatures */ -+#define NS_MD5RSA_MIN_BITS 512 /* Size of a mod or exp in bits */ -+#define NS_MD5RSA_MAX_BITS 2552 -+ /* Total of binary mod and exp */ -+#define NS_MD5RSA_MAX_BYTES ((NS_MD5RSA_MAX_BITS+7/8)*2+3) -+ /* Max length of text sig block */ -+#define NS_MD5RSA_MAX_BASE64 (((NS_MD5RSA_MAX_BYTES+2)/3)*4) -+#define NS_MD5RSA_MIN_SIZE ((NS_MD5RSA_MIN_BITS+7)/8) -+#define NS_MD5RSA_MAX_SIZE ((NS_MD5RSA_MAX_BITS+7)/8) -+ -+#define NS_DSA_SIG_SIZE 41 -+#define NS_DSA_MIN_SIZE 213 -+#define NS_DSA_MAX_BYTES 405 -+ -+/* Offsets into SIG record rdata to find various values */ -+#define NS_SIG_TYPE 0 /* Type flags */ -+#define NS_SIG_ALG 2 /* Algorithm */ -+#define NS_SIG_LABELS 3 /* How many labels in name */ -+#define NS_SIG_OTTL 4 /* Original TTL */ -+#define NS_SIG_EXPIR 8 /* Expiration time */ -+#define NS_SIG_SIGNED 12 /* Signature time */ -+#define NS_SIG_FOOT 16 /* Key footprint */ -+#define NS_SIG_SIGNER 18 /* Domain name of who signed it */ -+ -+/* How RR types are represented as bit-flags in NXT records */ -+#define NS_NXT_BITS 8 -+#define NS_NXT_BIT_SET( n,p) (p[(n)/NS_NXT_BITS] |= (0x80>>((n)%NS_NXT_BITS))) -+#define NS_NXT_BIT_CLEAR(n,p) (p[(n)/NS_NXT_BITS] &= ~(0x80>>((n)%NS_NXT_BITS))) -+#define NS_NXT_BIT_ISSET(n,p) (p[(n)/NS_NXT_BITS] & (0x80>>((n)%NS_NXT_BITS))) -+#define NS_NXT_MAX 127 -+#endif -+/* glibc 2.25 */ -+ - int libsres_msg_getflag(ns_msg han, int flag); - /* - * at one open ns_msg_getflag was a macro on Linux, but now it is a
