From b70ab6990a556385ee64dae7fd1a7c3c8dcc99ee Mon Sep 17 00:00:00 2001
From: Markus Stenberg <markus.stenberg@iki.fi>
Date: Tue, 15 Sep 2015 11:53:49 +0300
Subject: [PATCH] hnetd: Bump, use DDZ script, and remove the OpenWrt-specific
 scripts as they match the ones in git repository anyway for pcp and ohp.

---
 hnetd/Makefile         |  9 ++++----
 hnetd/files/hnetd.init |  6 ++++++
 hnetd/files/ohp-script | 48 ------------------------------------------
 hnetd/files/pcp-script | 46 ----------------------------------------
 4 files changed, 11 insertions(+), 98 deletions(-)
 delete mode 100644 hnetd/files/ohp-script
 delete mode 100644 hnetd/files/pcp-script

diff --git a/hnetd/Makefile b/hnetd/Makefile
index 3e92239..df9e950 100644
--- a/hnetd/Makefile
+++ b/hnetd/Makefile
@@ -7,8 +7,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hnetd
-PKG_SOURCE_VERSION:=c0b0c31b8fa4fbe47208e49685ccc9976532738a
-PKG_VERSION:=2015-09-08-$(PKG_SOURCE_VERSION)
+PKG_SOURCE_VERSION:=d802317b77b02af7b5a6531d2eba1d2b790cac9a
+PKG_VERSION:=2015-09-15-$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
@@ -115,8 +115,9 @@ define Package/hnetd-$(BUILD_VARIANT)/install
 	$(INSTALL_BIN) ./files/hnetd.init $(1)/etc/init.d/hnetd
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DATA) ./files/hnet.config $(1)/etc/config/hnet
-	$(INSTALL_BIN) ./files/ohp-script $(1)/usr/sbin/hnetd-ohp-script
-	$(INSTALL_BIN) ./files/pcp-script $(1)/usr/sbin/hnetd-pcp-script
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/ohp.script $(1)/usr/sbin/hnetd-ohp-script
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/ddz.script $(1)/usr/sbin/hnetd-ddz-script
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/pcp.script $(1)/usr/sbin/hnetd-pcp-script
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/hnetd-routing $(1)/usr/sbin/hnetd-routing
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/hnetd.defaults $(1)/etc/uci-defaults/x-hnetd.defaults
diff --git a/hnetd/files/hnetd.init b/hnetd/files/hnetd.init
index 742de48..3ca2c2e 100644
--- a/hnetd/files/hnetd.init
+++ b/hnetd/files/hnetd.init
@@ -12,6 +12,8 @@ DNSMASQ_DIR=/tmp/dnsmasq.d
 DNSMASQ_SCRIPT=/etc/init.d/dnsmasq
 OHP_SCRIPT=/usr/sbin/hnetd-ohp-script
 OHP_BINARY=/usr/sbin/ohybridproxy
+DDZ_SCRIPT=/usr/sbin/hnetd-ddz-script
+DDZ_BINARY=/usr/sbin/zonestitcher
 PCP_SCRIPT=/usr/sbin/hnetd-pcp-script
 PCP_BINARY=/usr/sbin/minimalist-pcproxy
 MULTICAST_SCRIPT=/usr/sbin/hnet-multicast
@@ -38,6 +40,10 @@ start_service() {
         then
             procd_append_param command -n "$HOSTNAME"
         fi
+        if [ -f $DDZ_BINARY ]
+        then
+            procd_append_param command -z $DDZ_SCRIPT
+        fi
     fi
 	
     # Enable multicast if present and installed
diff --git a/hnetd/files/ohp-script b/hnetd/files/ohp-script
deleted file mode 100644
index aebaa1d..0000000
--- a/hnetd/files/ohp-script
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh 
-#-*-sh-*-
-#
-# $Id: ohp-script $
-#
-# Author: Markus Stenberg <mstenber@cisco.com>
-#
-# Copyright (c) 2014 cisco Systems, Inc.
-#
-# Created:       Fri Jan 17 11:46:30 2014 mstenber
-# Last modified: Mon Feb  3 14:39:15 2014 mstenber
-# Edit time:     15 min
-#
-
-# This is minimalist init.d-like start/stop script for
-# ohybridproxy. However, as ohybridproxy receives it's configuration
-# via command line, the 'start' command is also equivalent to
-# 'restart', and has bunch of extra arguments..
-
-OHP=ohybridproxy
-
-start() {
-    $OHP $* &
-}
-
-stop() {
-    killall -9 $OHP
-}
-
-
-CMD=$1
-# For debugging purposes
-LOGNAME=`basename $0`
-echo "$*" | logger -t "$LOGNAME"
-case $CMD in
-  start)
-    shift
-    stop
-    start $*
-    ;;
-  stop)
-  stop
-    ;;
-  *)
-    echo "Only start [config]/stop supported"
-    exit 1
-  ;;
-esac
diff --git a/hnetd/files/pcp-script b/hnetd/files/pcp-script
deleted file mode 100644
index 88648d2..0000000
--- a/hnetd/files/pcp-script
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-#-*-sh-*-
-#
-# $Id: pcp-script $
-#
-# Author: Markus Stenberg <mstenber@cisco.com>
-#
-# Copyright (c) 2014 cisco Systems, Inc.
-#
-# Created:       Fri Jan 17 11:46:30 2014 mstenber
-# Last modified: Fri May 30 13:27:57 2014 mstenber
-# Edit time:     16 min
-#
-
-# Copied from ohp-script.. Same idea. Just prod minimalist-pcproxy as
-# needed, hoping the miniupnpd is taken care of by the system.
-
-PCP=minimalist-pcproxy
-
-start() {
-    $PCP $* &
-}
-
-stop() {
-    killall -9 $PCP
-}
-
-
-CMD=$1
-# For debugging purposes
-LOGNAME=`basename $0`
-echo "$*" | logger -t "$LOGNAME"
-case $CMD in
-  start)
-    shift
-    stop
-    start $*
-    ;;
-  stop)
-  stop
-    ;;
-  *)
-    echo "Only start [config]/stop supported"
-    exit 1
-  ;;
-esac