Date: Thursday, February 8, 2018 @ 12:29:29
  Author: anthraxx
Revision: 290275

upgpkg: cjdns 20.1-1

Modified:
  cjdns/trunk/PKGBUILD
Deleted:
  cjdns/trunk/1107.patch

------------+
 1107.patch |  143 -----------------------------------------------------------
 PKGBUILD   |   26 ++++------
 2 files changed, 10 insertions(+), 159 deletions(-)

Deleted: 1107.patch
===================================================================
--- 1107.patch  2018-02-08 12:21:41 UTC (rev 290274)
+++ 1107.patch  2018-02-08 12:29:29 UTC (rev 290275)
@@ -1,143 +0,0 @@
-From 249c5b7e57f4d383978eab1d6340a1f31994a606 Mon Sep 17 00:00:00 2001
-From: PoroCYon <pcy@national.shitposting.agency>
-Date: Mon, 11 Sep 2017 17:47:34 +0200
-Subject: [PATCH 1/4] fix uv__getiovmax returning -1
-
----
- node_build/dependencies/libuv/src/unix/stream.c | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/node_build/dependencies/libuv/src/unix/stream.c 
b/node_build/dependencies/libuv/src/unix/stream.c
-index 1175f9bcf..711f16baa 100644
---- a/node_build/dependencies/libuv/src/unix/stream.c
-+++ b/node_build/dependencies/libuv/src/unix/stream.c
-@@ -714,8 +714,18 @@ static int uv__getiovmax() {
-   return IOV_MAX;
- #elif defined(_SC_IOV_MAX)
-   static int iovmax = -1;
--  if (iovmax == -1)
-+  if (iovmax == -1) {
-+    errno = 0;
-     iovmax = sysconf(_SC_IOV_MAX);
-+    if (iovmax == -1) {
-+      if (errno) {
-+        iovmax = 1;
-+      }
-+      /*else {
-+        iovmax = 1024;
-+      }*/
-+    }
-+  }
-   return iovmax;
- #else
-   return 1024;
-@@ -752,7 +762,7 @@ static void uv__write(uv_stream_t* stream) {
-   iovmax = uv__getiovmax();
- 
-   /* Limit iov count to avoid EINVALs from writev() */
--  if (iovcnt > iovmax)
-+  if (iovcnt > iovmax && iovmax != -1)
-     iovcnt = iovmax;
- 
-   /*
-
-From fc73f49ebdf668d4185dcd4f89807d4444562655 Mon Sep 17 00:00:00 2001
-From: PoroCYon <pcy@national.shitposting.agency>
-Date: Mon, 11 Sep 2017 17:53:56 +0200
-Subject: [PATCH 2/4] fix uv__getiovmax calling sysconf(3) even after a 'valid'
- -1
-
----
- node_build/dependencies/libuv/src/unix/stream.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/node_build/dependencies/libuv/src/unix/stream.c 
b/node_build/dependencies/libuv/src/unix/stream.c
-index 711f16baa..b721570d8 100644
---- a/node_build/dependencies/libuv/src/unix/stream.c
-+++ b/node_build/dependencies/libuv/src/unix/stream.c
-@@ -713,8 +713,8 @@ static int uv__getiovmax() {
- #if defined(IOV_MAX)
-   return IOV_MAX;
- #elif defined(_SC_IOV_MAX)
--  static int iovmax = -1;
--  if (iovmax == -1) {
-+  static int iovmax = -2;
-+  if (iovmax == -2) {
-     errno = 0;
-     iovmax = sysconf(_SC_IOV_MAX);
-     if (iovmax == -1) {
-
-From b119f17342a806d48a750c56adb32c17316f931e Mon Sep 17 00:00:00 2001
-From: PoroCYon <pcy@national.shitposting.agency>
-Date: Tue, 12 Sep 2017 17:35:01 +0200
-Subject: [PATCH 3/4] On Linux, take UIO_IOVMAX into account.
-
----
- node_build/dependencies/libuv/src/unix/stream.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/node_build/dependencies/libuv/src/unix/stream.c 
b/node_build/dependencies/libuv/src/unix/stream.c
-index b721570d8..09add6387 100644
---- a/node_build/dependencies/libuv/src/unix/stream.c
-+++ b/node_build/dependencies/libuv/src/unix/stream.c
-@@ -19,6 +19,10 @@
-  * IN THE SOFTWARE.
-  */
- 
-+#if !defined(_GNU_SOURCE) && defined(__linux__)
-+#define _GNU_SOURCE
-+#endif
-+
- #include "uv.h"
- #include "internal.h"
- 
-@@ -35,6 +39,10 @@
- #include <unistd.h>
- #include <limits.h> /* IOV_MAX */
- 
-+#if !defined(IOV_MAX) && defined(__linux__)
-+#include <linux/uio.h>
-+#endif
-+
- #if defined(__APPLE__)
- # include <sys/event.h>
- # include <sys/time.h>
-@@ -721,9 +729,15 @@ static int uv__getiovmax() {
-       if (errno) {
-         iovmax = 1;
-       }
-+#ifdef __linux__
-+      else {
-+        iovmax = UIO_IOVMAX;
-+      }
-+#else
-       /*else {
-         iovmax = 1024;
-       }*/
-+#endif
-     }
-   }
-   return iovmax;
-
-From 690d80c6a3e11cf6731b589d8d7752f8b2540594 Mon Sep 17 00:00:00 2001
-From: PoroCYon <pcy@national.shitposting.agency>
-Date: Tue, 12 Sep 2017 17:43:17 +0200
-Subject: [PATCH 4/4] Fix buid on arm64-v8a
-
----
- node_build/dependencies/libuv/src/unix/stream.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/node_build/dependencies/libuv/src/unix/stream.c 
b/node_build/dependencies/libuv/src/unix/stream.c
-index 09add6387..c4a2c529e 100644
---- a/node_build/dependencies/libuv/src/unix/stream.c
-+++ b/node_build/dependencies/libuv/src/unix/stream.c
-@@ -729,7 +729,7 @@ static int uv__getiovmax() {
-       if (errno) {
-         iovmax = 1;
-       }
--#ifdef __linux__
-+#if defined(__linux__) && defined(UIO_IOVMAX)
-       else {
-         iovmax = UIO_IOVMAX;
-       }

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2018-02-08 12:21:41 UTC (rev 290274)
+++ PKGBUILD    2018-02-08 12:29:29 UTC (rev 290275)
@@ -5,8 +5,8 @@
 # Contributor: Xyne
 
 pkgname=cjdns
-pkgver=20
-pkgrel=2
+pkgver=20.1
+pkgrel=1
 pkgdesc='Routing engine designed for security, scalability, speed and ease of 
use'
 url='https://github.com/cjdelisle/cjdns'
 arch=('x86_64')
@@ -15,16 +15,9 @@
 optdepends=('nodejs: optional utilities support')
 makedepends=('nodejs' 'python2')
 install=cjdns.install
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/cjdelisle/${pkgname}/archive/cjdns-v${pkgver}.tar.gz
-        1107.patch)
-sha512sums=('afa63daea3c3bd3e16dd0a326ebdc2afcb411c595e66552c3156c59c36af21c0b2278b3299b1053b98d381790311beeb14547afdf3d182170c446867d2199a94'
-            
'3ad5bd71b706a99a429b54d3fe2241c21c0fb417a76df27b30db46e8c6fec22d952c1a1643bac2540f79a3790fd2cc1177fd4c1fe8562df86623fb6d64bc5d68')
+source=(${pkgname}-${pkgver}.tar.gz::https://github.com/cjdelisle/${pkgname}/archive/cjdns-v${pkgver}.tar.gz)
+sha512sums=('519835f489359fb677d35040862dece20b75d84716281096f2c32c8531e8d784d852d8e2709d8c67e8098ad819f62c2a2ef1647fbad3e28e3e20f502d23cd3e7')
 
-prepare() {
-  cd ${pkgname}-${pkgname}-v${pkgver}
-  patch -p1 -i "${srcdir}/1107.patch"
-}
-
 build() {
   cd ${pkgname}-${pkgname}-v${pkgver}
   CJDNS_RELEASE_VERSION="${pkgver}" \
@@ -33,12 +26,12 @@
 
 package() {
   cd ${pkgname}-${pkgname}-v${pkgver}
-  install -Dm 755 cjdroute "${pkgdir}/usr/bin/cjdroute"
-  install -Dm 644 contrib/systemd/${pkgname}.service 
"${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
-  install -Dm 644 contrib/systemd/${pkgname}-resume.service 
"${pkgdir}/usr/lib/systemd/system/${pkgname}-resume.service"
-  install -Dm 644 doc/man/cjdroute.conf.5 
"${pkgdir}/usr/share/man/man5/cjdroute.conf.5"
-  install -Dm 644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"
+  install -Dm 755 cjdroute -t "${pkgdir}/usr/bin"
+  install -Dm 644 contrib/systemd/{cjdns,cjdns-resume}.service \
+    -t "${pkgdir}/usr/lib/systemd/system"
+  install -Dm 644 doc/man/cjdroute.conf.5 -t "${pkgdir}/usr/share/man/man5"
   install -Dm 644 -t "${pkgdir}/usr/share/doc/${pkgname}" \
+    README.md \
     doc/admin-api.md \
     doc/configure.md \
     doc/djc_layer_model.md \
@@ -49,6 +42,7 @@
     doc/shorewall_and_vpn_gateway_howto.md \
     doc/tunnel.md
   cp -a tools "${pkgdir}/usr/lib/${pkgname}"
+  cp -a node_modules "${pkgdir}/usr/lib/${pkgname}/node_modules"
 }
 
 # vim: ts=2 sw=2 et:

Reply via email to