[arch-commits] Commit in cjdns/trunk (PKGBUILD cjdns.install)

[Levente Polyak]

Date: Tuesday, March 14, 2017 @ 22:26:59
  Author: anthraxx
Revision: 216326

upgpkg: cjdns 19.1-2 (less noisy install and added opt tools)

Modified:
  cjdns/trunk/PKGBUILD
  cjdns/trunk/cjdns.install

---+
 PKGBUILD  |7 +--
 cjdns.install |   10 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-14 20:34:07 UTC (rev 216325)
+++ PKGBUILD2017-03-14 22:26:59 UTC (rev 216326)
@@ -6,12 +6,13 @@
 
 pkgname=cjdns
 pkgver=19.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Routing engine designed for security, scalability, speed and ease of 
use'
 url='https://github.com/cjdelisle/cjdns'
 arch=('i686' 'x86_64')
 license=('GPL3')
 depends=('glibc' 'sh')
+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)
@@ -20,7 +21,8 @@
 
 build() {
   cd ${pkgname}-${pkgname}-v${pkgver}
-  CJDNS_RELEASE_VERSION="${pkgver}" bash 'do'
+  CJDNS_RELEASE_VERSION="${pkgver}" \
+node ./node_build/make.js
 }
 
 package() {
@@ -40,6 +42,7 @@
 doc/security_specification.md \
 doc/shorewall_and_vpn_gateway_howto.md \
 doc/tunnel.md
+  cp -a tools "${pkgdir}/usr/lib/${pkgname}"
 }
 
 # vim: ts=2 sw=2 et:

Modified: cjdns.install
===
--- cjdns.install   2017-03-14 20:34:07 UTC (rev 216325)
+++ cjdns.install   2017-03-14 22:26:59 UTC (rev 216326)
@@ -4,19 +4,19 @@
 
   if [[ ! -e "${config_path}" ]] ; then
 echo "Generating ${config_file}... "
-(umask 077 && cjdroute --genconf > "${config_path}") || 
+(umask 077 && cjdroute --genconf > "${config_path}") ||
   echo "ERROR: Failed to generate and install ${config_file}"
 echo "
 >>> The keys in ${config_path} have been autogenerated during
->>> install, they are not defaults and do not need to be overwritten."
-  fi
-  echo "
+>>> install, they are not defaults and do not need to be overwritten.
+
 >>> Protect ${config_path}! A lost conf file means you have
 >>> lost your password and connections and anyone who connected
 >>> to you will no longer be able to connect. A *compromised*
 >>> conf file means that other people can impersonate you on
 >>> the network.
-  "
+"
+  fi
 }
 
 post_upgrade() {

[arch-commits] Commit in cjdns/trunk (PKGBUILD cjdns.install)

[Levente Polyak]

Date: Tuesday, August 4, 2015 @ 18:10:24
  Author: anthraxx
Revision: 137939

upgpkg: cjdns 16.1-3

updpkg cjdns 16.1-3

Added:
  cjdns/trunk/cjdns.install
Modified:
  cjdns/trunk/PKGBUILD

---+
 PKGBUILD  |4 ++--
 cjdns.install |   26 ++
 2 files changed, 28 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-04 15:19:31 UTC (rev 137938)
+++ PKGBUILD2015-08-04 16:10:24 UTC (rev 137939)
@@ -6,7 +6,7 @@
 
 pkgname=cjdns
 pkgver=16.1
-pkgrel=2
+pkgrel=3
 pkgdesc='A routing engine designed for security, scalability, speed and ease 
of use'
 url='https://github.com/cjdelisle/cjdns'
 arch=('i686' 'x86_64')
@@ -13,6 +13,7 @@
 license=('GPL3')
 depends=('glibc' 'sh')
 makedepends=('nodejs' 'python2')
+install=cjdns.install
 
source=(${pkgname}-${pkgver}.tar.gz::https://github.com/cjdelisle/${pkgname}/archive/cjdns-v${pkgver}.tar.gz)
 
sha512sums=('f9c2777c972dfc4fbed28c02434fbbb8ff5b740c5d5f7d9be353547c3a4e42f7b376e2ab0e68aa98d0234c4229b00b221ed0f6cdb7e3d33448fe1ea7e02d8af7')
 
@@ -24,7 +25,6 @@
 package() {
   cd ${pkgname}-${pkgname}-v${pkgver}
   install -Dm 755 cjdroute ${pkgdir}/usr/bin/cjdroute
-  install -Dm 755 contrib/sh/run-cjdroute.sh ${pkgdir}/usr/bin/run-cjdroute
   install -Dm 644 contrib/systemd/${pkgname}.service 
${pkgdir}/usr/lib/systemd/system/${pkgname}.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

Added: cjdns.install
===
--- cjdns.install   (rev 0)
+++ cjdns.install   2015-08-04 16:10:24 UTC (rev 137939)
@@ -0,0 +1,26 @@
+post_install() {
+  local config_file=cjdroute.conf
+  local config_path=/etc/${config_file}
+
+  if [[ ! -e ${config_path} ]] ; then
+echo Generating ${config_file}... 
+(umask 077  cjdroute --genconf  ${config_path}) || 
+  echo ERROR: Failed to generate and install ${config_file}
+echo 
+ The keys in ${config_path} have been autogenerated during
+ install, they are not defaults and do not need to be overwritten.
+  fi
+  echo 
+ Protect ${config_path}! A lost conf file means you have
+ lost your password and connections and anyone who connected
+ to you will no longer be able to connect. A *compromised*
+ conf file means that other people can impersonate you on
+ the network.
+  
+}
+
+post_upgrade() {
+  post_install
+}
+
+# vim: ts=2 sw=2 et: