sendip: PKGBUILD review by svenstaro

3 files changed, 31 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7ffc7a296cce..041f2020fa75 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,7 +10,7 @@ pkgbase = sendip
 	source = https://www-x.antd.nist.gov/ipv6/sendip/sendip-2.5-mec-3a2.tar.gz
 	source = sendip-2.5.patch
 	sha512sums = 5ab1a7b58c41f795dde40c46c679e62926f9b9a69ba7a22caedc677a2cd32091b97a554d2f0915dc72aa1c4968daa5b8b080d0b442ee2c6cbbc43eb8ae9845ee
-	sha512sums = 8e198c18042e7d2fc3559315196ee0899738d2483ec2349f0f5e449e9a94758281900fd95bdb24c14a7b9e874c9452076ff5ab51ed573634e850655bbde48faa
+	sha512sums = 1b72502f013cd905bf26c10d9f5e43e2ab9ac43f311a1e4c2f0d33de1578d5d125e0e5132f9c45fa89b67428ac20adcf093e3b56870c2d514d5bc1f1a8be8907
 
 pkgname = sendip
 
diff --git a/PKGBUILD b/PKGBUILD
index 53fd1d450b2a..7037e176b4f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,21 +13,20 @@ depends=('glibc')
 source=(https://www-x.antd.nist.gov/ipv6/sendip/sendip-${pkgver}-mec-3a2.tar.gz
         ${pkgname}-${pkgver}.patch)
 sha512sums=('5ab1a7b58c41f795dde40c46c679e62926f9b9a69ba7a22caedc677a2cd32091b97a554d2f0915dc72aa1c4968daa5b8b080d0b442ee2c6cbbc43eb8ae9845ee'
-            '8e198c18042e7d2fc3559315196ee0899738d2483ec2349f0f5e449e9a94758281900fd95bdb24c14a7b9e874c9452076ff5ab51ed573634e850655bbde48faa')
+            '1b72502f013cd905bf26c10d9f5e43e2ab9ac43f311a1e4c2f0d33de1578d5d125e0e5132f9c45fa89b67428ac20adcf093e3b56870c2d514d5bc1f1a8be8907')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}-mec-${_pkgver}"
+  cd ${pkgname}-${pkgver}-mec-${_pkgver}
   # reformat some while loops to prevent compilation errors
-  patch -p1 < "${srcdir}/${pkgname}-${pkgver}.patch"
-  sed -i 's|_BSD_SOURCE|_DEFAULT_SOURCE|' csum.c
+  patch -p0 < "${srcdir}"/${pkgname}-${pkgver}.patch
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-mec-${_pkgver}"
+  cd ${pkgname}-${pkgver}-mec-${_pkgver}
   make PREFIX=/usr
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-mec-${_pkgver}"
-  make PREFIX="${pkgdir}/usr" install
+  cd ${pkgname}-${pkgver}-mec-${_pkgver}
+  make PREFIX="${pkgdir}"/usr install
 }
diff --git a/sendip-2.5.patch b/sendip-2.5.patch
index 59eb5ae1fa77..af3e849bf5bc 100644
--- a/sendip-2.5.patch
+++ b/sendip-2.5.patch
@@ -1,7 +1,18 @@
-diff --git a/mec/protoname.c b/mec/protoname.c
-index 4fee90e..f4183b4 100644
---- a/mec/protoname.c
-+++ b/mec/protoname.c
+diff --git csum.c csum.c
+--- csum.c	2009-04-13 19:38:41.000000000 +0200
++++ csum.c	2019-10-28 17:50:13.731987947 +0100
+@@ -6,7 +6,7 @@
+  */
+
+ #define __USE_BSD    /* GLIBC */
+-#define _BSD_SOURCE  /* LIBC5 */
++#define _DEFAULT_SOURCE  /* LIBC5 */
+ #include <sys/types.h>
+ #include <netinet/in_systm.h>
+ #include <netinet/in.h>
+diff --git mec/protoname.c mec/protoname.c
+--- mec/protoname.c	2010-01-28 22:19:35.000000000 +0100
++++ mec/protoname.c	2019-10-28 17:50:01.155315624 +0100
 @@ -14,6 +14,7 @@
  #include <string.h>
  #include <netdb.h>
@@ -10,11 +21,10 @@ index 4fee90e..f4183b4 100644
 
  #include "mec/ipv6ext.h"
 
-diff --git a/rip.c b/rip.c
-index bda372d..a13a9e2 100644
---- a/rip.c
-+++ b/rip.c
-@@ -63,7 +63,8 @@ bool do_opt(char *opt, char *arg, sendip_data *pack) {
+diff --git rip.c rip.c
+--- rip.c	2015-01-30 01:17:48.000000000 +0100
++++ rip.c	2019-10-28 17:50:01.155315624 +0100
+@@ -63,7 +63,8 @@
  		ripopt = RIP_OPTION(pack);
  		p=q=arg;
  		/* TODO: if arg is malformed, this could segfault */
@@ -24,11 +34,10 @@ index bda372d..a13a9e2 100644
  		rippack->addressFamily= htons((p==q)?2:(u_int16_t)strtoul(p, (char **)0, 0));
  		pack->modified |= RIP_MOD_ADDRFAM;
  		p=++q; while(*(q++)!=':') /* do nothing */; *(--q)='\0';
-diff --git a/ripng.c b/ripng.c
-index 1dab2a1..fec2de6 100644
---- a/ripng.c
-+++ b/ripng.c
-@@ -77,7 +77,8 @@ bool do_opt(char *opt, char *arg, sendip_data *pack) {
+diff -Naur ripng.c ripng.c
+--- ripng.c	2009-03-26 05:06:42.000000000 +0100
++++ ripng.c	2019-10-28 17:50:01.155315624 +0100
+@@ -77,7 +77,8 @@
  		ripopt = RIPNG_ENTRY(pack);
  		p=q=arg;
  		/* TODO: if arg is malformed, this could segfault */
@@ -36,5 +45,5 @@ index 1dab2a1..fec2de6 100644
 +		while(*(q++)!='/') /* do nothing */;
 +		*(--q)='\0';
  		ripopt->prefix = (p==q)?in6addr_any:inet6_addr(p);
- 
+
  		p=++q; while(*(q++)!='/') /* do nothing */; *(--q)='\0';