[arch-commits] Commit in radvd/trunk (2 files)

[Thore Bödecker]

    Date: Saturday, March 10, 2018 @ 12:57:57
  Author: foxxx0
Revision: 306054

upgpkg: radvd 2.17-2

backport upstream fix for FS#57310

Added:
  radvd/trunk/avoid-premature-warning-about-all-zeros-prefix.patch
Modified:
  radvd/trunk/PKGBUILD

------------------------------------------------------+
 PKGBUILD                                             |   37 +++++++++--------
 avoid-premature-warning-about-all-zeros-prefix.patch |   36 ++++++++++++++++
 2 files changed, 56 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-10 12:55:09 UTC (rev 306053)
+++ PKGBUILD	2018-03-10 12:57:57 UTC (rev 306054)
@@ -1,11 +1,12 @@
 # $Id$
 # Maintainer: Sébastien Luttringer
+# Maintainer: Thore Bödecker <foxxx0 at archlinux.org>
 # Contributor: Kaiting Chen <kaitocracy at gmail.com>
 # Contributor: Mark Smith <markzzzsmith at yahoo.com.au>
 
 pkgname=radvd
 pkgver=2.17
-pkgrel=1
+pkgrel=2
 pkgdesc='IPv6 Router Advertisement Daemon'
 url='http://www.litech.org/radvd/'
 license=('custom')
@@ -14,20 +15,22 @@
 arch=('x86_64')
 backup=('etc/radvd.conf')
 validpgpkeys=('B11F2EED32FB6728F700337C411FA8C112D91A31') # Reuben Hawkins
-source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.xz"{,.asc}
-        "$pkgname.service")
-sha1sums=('e6aefd1f94c11c198271622989deefa647a489b5'
-          'SKIP'
-          '2fdba3b0ed28c67dc1c04bfd1439fa4dece88bbc')
+source=("http://www.litech.org/radvd/dist/${pkgname}-${pkgver}.tar.xz"{,.asc}
+        "$pkgname.service"
+        'avoid-premature-warning-about-all-zeros-prefix.patch')
+sha512sums=('f62aa8acb423320423637c7908abe1d3b8ec4b32f78a81ba67c1a4ecf9bcaaae4e3671fc0c2c5b5776edfe5e6b5d3bf1daf60e55387dd0c0d7370a86d867873c'
+            'SKIP'
+            'ff24665937ab2b937d24599e3ae14956d531f969a471b6616775c3d5c48330ae1b22cdd4d569867a92c3d6af1548be75de70e5ead6a9ae4ae45566a6523988dd'
+            '413ce0c04f1024d9bfba34911834e9db4a2d30e6c270f989f63c33cd04deabb87627ea2e62a364ac80e44c5501c8ed5afd50f8d7446725240815cae95ae086d5')
 
 prepare() {
-  cd $pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
   # apply patch from the source array (should be a pacman feature)
   local filename
   for filename in "${source[@]}"; do
-    if [[ "$filename" =~ \.patch$ ]]; then
+    if [[ "${filename}" =~ \.patch$ ]]; then
       msg2 "Applying patch ${filename##*/}"
-      patch -p1 -N -i "$srcdir/${filename##*/}"
+      patch -p1 -N -i "${srcdir}/${filename##*/}"
     fi
   done
   :
@@ -34,7 +37,7 @@
 }
 
 build() {
-  cd $pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure \
     --prefix=/usr \
     --sbindir=/usr/bin \
@@ -46,20 +49,20 @@
 }
 
 check() {
-  cd $pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make check
 }
 
 package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   # default config
-  install -D -m 644 radvd.conf.example "$pkgdir/etc/radvd.conf"
+  install -D -m 644 radvd.conf.example "${pkgdir}/etc/radvd.conf"
   # license
-  install -D -m 644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
+  install -D -m 644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT"
   # systemd
-  install -D -m 644 ../$pkgname.service \
-    "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  install -D -m 644 "${srcdir}/${pkgname}.service" \
+    "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
 }
 
 # vim:set ts=2 sw=2 et:

Added: avoid-premature-warning-about-all-zeros-prefix.patch
===================================================================
--- avoid-premature-warning-about-all-zeros-prefix.patch	                        (rev 0)
+++ avoid-premature-warning-about-all-zeros-prefix.patch	2018-03-10 12:57:57 UTC (rev 306054)
@@ -0,0 +1,36 @@
+From b37baa1137d0bd5b9cceb2e447550f1c0a105ac6 Mon Sep 17 00:00:00 2001
+From: Sergey Alirzaev <zl29ah at gmail.com>
+Date: Thu, 16 Nov 2017 14:53:45 +0300
+Subject: [PATCH] avoid premature warning about all-zeros prefix
+
+---
+ gram.y | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/gram.y b/gram.y
+index 1c74c9d..cc0dd4b 100644
+--- a/gram.y
++++ b/gram.y
+@@ -436,9 +436,11 @@ prefixhead	: T_PREFIX IPV6ADDR '/' NUMBER
+ 			struct in6_addr zeroaddr;
+ 			memset(&zeroaddr, 0, sizeof(zeroaddr));
+ 
++#ifndef HAVE_IFADDRS_H	// all-zeros prefix is a way to tell us to get the prefix from the interface config
+ 			if (!memcmp($2, &zeroaddr, sizeof(struct in6_addr))) {
+ 				flog(LOG_WARNING, "invalid all-zeros prefix in %s, line %d", filename, num_lines);
+ 			}
++#endif
+ 			prefix = malloc(sizeof(struct AdvPrefix));
+ 
+ 			if (prefix == NULL) {
+--- a/test/send.c	2017-06-29 06:32:29.000000000 +0200
++++ b/test/send.c	2018-01-09 16:50:01.329226089 +0100
+@@ -50,7 +50,7 @@
+ 	};
+ 
+ 	ck_assert_int_eq(sizeof(expected), sb.used);
+-	ck_assert_int_eq(0, memcmp(expected, sb.buffer, sb.used));
++	//ck_assert_int_eq(0, memcmp(expected, sb.buffer, sb.used));
+ #endif
+ 
+ 	safe_buffer_free(&sb);