[arch-commits] Commit in radvd/trunk (01-fix-rdnssinfo-length-fix.patch PKGBUILD)

[Sébastien Luttringer]

    Date: Wednesday, July 30, 2014 @ 11:36:02
  Author: seblu
Revision: 116579

upgpkg: radvd 2.2-1

- Add patch from upstream branch for_seblu

Added:
  radvd/trunk/01-fix-rdnssinfo-length-fix.patch
Modified:
  radvd/trunk/PKGBUILD

-----------------------------------+
 01-fix-rdnssinfo-length-fix.patch |   25 +++++++++++++++++++++++++
 PKGBUILD                          |   15 +++++++++++----
 2 files changed, 36 insertions(+), 4 deletions(-)

Added: 01-fix-rdnssinfo-length-fix.patch
===================================================================
--- 01-fix-rdnssinfo-length-fix.patch	                        (rev 0)
+++ 01-fix-rdnssinfo-length-fix.patch	2014-07-30 09:36:02 UTC (rev 116579)
@@ -0,0 +1,25 @@
+From d1282b5ddeadd1d93f61cceb122b942c56e629dc Mon Sep 17 00:00:00 2001
+From: Reuben Hawkins <reubenhwk at gmail.com>
+Date: Tue, 29 Jul 2014 20:31:18 -0700
+Subject: [PATCH] send.c: rdnssinfo length fix
+
+---
+ send.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/send.c b/send.c
+index ec6b93b..a2dded6 100644
+--- a/send.c
++++ b/send.c
+@@ -329,7 +329,7 @@ static void add_rdnss(struct safe_buffer * sb, struct AdvRDNSS const *rdnss, int
+ 		memcpy(&rdnssinfo.nd_opt_rdnssi_addr2, &rdnss->AdvRDNSSAddr2, sizeof(struct in6_addr));
+ 		memcpy(&rdnssinfo.nd_opt_rdnssi_addr3, &rdnss->AdvRDNSSAddr3, sizeof(struct in6_addr));
+ 
+-		safe_buffer_append(sb, &rdnssinfo, sizeof(rdnssinfo));
++		safe_buffer_append(sb, &rdnssinfo, sizeof(rdnssinfo) - (3 - rdnss->AdvRDNSSNumber) * sizeof(struct in6_addr));
+ 
+ 		rdnss = rdnss->next;
+ 	}
+-- 
+2.0.3
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-30 08:19:02 UTC (rev 116578)
+++ PKGBUILD	2014-07-30 09:36:02 UTC (rev 116579)
@@ -4,7 +4,7 @@
 # Contributor: Mark Smith <markzzzsmith at yahoo.com.au>
 
 pkgname=radvd
-pkgver=2.1
+pkgver=2.2
 pkgrel=1
 pkgdesc='IPv6 Router Advertisement Daemon'
 url='http://www.litech.org/radvd/'
@@ -14,10 +14,17 @@
 arch=('i686' 'x86_64')
 backup=('etc/radvd.conf')
 source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.xz"{,.asc}
-        "$pkgname.service")
-sha1sums=('385ca18da5c1ef40a1b27854b081b0856f053a4a'
+        "$pkgname.service"
+        '01-fix-rdnssinfo-length-fix.patch')
+sha1sums=('23ce0a4f2a927dab15088fcc781934172f8c039e'
           'SKIP'
-          '2fdba3b0ed28c67dc1c04bfd1439fa4dece88bbc')
+          '2fdba3b0ed28c67dc1c04bfd1439fa4dece88bbc'
+          'e19cd657042ee9897cfd7b89fac39f34f0707877')
+
+prepare() {
+  patch -p1 -d $pkgname-$pkgver < '01-fix-rdnssinfo-length-fix.patch'
+}
+
 build() {
   cd $pkgname-$pkgver
   ./configure \