From patchwork Thu Oct 16 17:06:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 400334 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id AA93A14009A for ; Fri, 17 Oct 2014 04:06:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E324833909; Thu, 16 Oct 2014 17:06:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ABvcq-CVivcb; Thu, 16 Oct 2014 17:06:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 8BD1733891; Thu, 16 Oct 2014 17:06:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 3B07F1C288A for ; Thu, 16 Oct 2014 17:06:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3951291D8E for ; Thu, 16 Oct 2014 17:06:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X3eKSS6UMaYC for ; Thu, 16 Oct 2014 17:06:17 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from www.zacarias.com.ar (www.zacarias.com.ar [62.210.192.172]) by whitealder.osuosl.org (Postfix) with ESMTPS id 46CEE91E15 for ; Thu, 16 Oct 2014 17:06:17 +0000 (UTC) Received: from asgard (cpe-186-23-17-245.telecentro-reversos.com.ar [186.23.17.245] (may be forged)) (authenticated bits=0) by www.zacarias.com.ar (8.14.9/8.14.9) with ESMTP id s9GH6AbO008328 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 16 Oct 2014 17:06:13 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1413479175; bh=PAcpRbE7fLGu84WaZdXgPaGyixT90bECL2nkRvAdv9c=; h=From:To:Cc:Subject:Date; b=XW3zTYtBsD1t9PLkSFzHb+14tRyFREPDf2/HBz771OvU52UJRuqev60SOKYL8aosY bcsLPAu4JsjPITv7ZsPnWqP7W/JPGf2yd8LFMQGVFa6rojvNyic4et5dcK+ZKZB+G8 YEP4dcOMksRloI/3CQQU2nxB8uUA1nLI1hGZMLhI= Received: by asgard (sSMTP sendmail emulation); Thu, 16 Oct 2014 14:06:05 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Thu, 16 Oct 2014 14:06:05 -0300 Message-Id: <1413479165-20184-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 2.0.4 X-Virus-Scanned: clamav-milter 0.98.4 at www X-Virus-Status: Clean Subject: [Buildroot] [PATCHv2] inadyn: bump to version 1.99.11 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Update initscript for the /usr/sbin -> /usr/bin change which is the default installation directory now that it's using autotools infra. Also add hash file. Make the initscript use tabs instead of spaces. Make the config file installation conditional. Now with optional gnutls support for HTTPS. Signed-off-by: Gustavo Zacarias --- package/inadyn/S70inadyn | 35 ++++++++++++++++++----------------- package/inadyn/inadyn.hash | 2 ++ package/inadyn/inadyn.mk | 26 ++++++++++++-------------- 3 files changed, 32 insertions(+), 31 deletions(-) create mode 100644 package/inadyn/inadyn.hash diff --git a/package/inadyn/S70inadyn b/package/inadyn/S70inadyn index 24d0813..b5d7eed 100644 --- a/package/inadyn/S70inadyn +++ b/package/inadyn/S70inadyn @@ -13,23 +13,24 @@ VR_INADYN=/var/run/inadyn [ ! -d $VR_INADYN ] && mkdir -p $VR_INADYN case "$1" in - start) - echo "Starting inadyn." - start-stop-daemon -S -x /usr/sbin/inadyn - ;; - stop) - echo "Stopping inadyn." - start-stop-daemon -q -K -x /usr/sbin/inadyn - rm -f /var/run/inadyn/inadyn.pid - ;; - restart) - "$0" stop - "$0" start - ;; - *) - echo $"Usage: $0 {start|stop|restart}" - exit 1 + start) + echo "Starting inadyn: " + start-stop-daemon -S -x /usr/bin/inadyn + [ $? == 0 ] && echo "OK" || echo "FAIL" + ;; + stop) + echo "Stopping inadyn: " + start-stop-daemon -q -K -x /usr/bin/inadyn + [ $? == 0 ] && echo "OK" || echo "FAIL" + rm -f /var/run/inadyn/inadyn.pid + ;; + restart) + "$0" stop + "$0" start + ;; + *) + echo $"Usage: $0 {start|stop|restart}" + exit 1 esac exit $? - diff --git a/package/inadyn/inadyn.hash b/package/inadyn/inadyn.hash new file mode 100644 index 0000000..e69feb2 --- /dev/null +++ b/package/inadyn/inadyn.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 7e2bfc5df32848abd814548c87bf1d2731ffcf34ad180d8204d94239cb7ad590 inadyn-1.99.11.tar.gz diff --git a/package/inadyn/inadyn.mk b/package/inadyn/inadyn.mk index 21e983e..74bb679 100644 --- a/package/inadyn/inadyn.mk +++ b/package/inadyn/inadyn.mk @@ -4,33 +4,31 @@ # ################################################################################ -INADYN_VERSION = 1.99.9 +INADYN_VERSION = 1.99.11 INADYN_SITE = $(call github,troglobit,inadyn,$(INADYN_VERSION)) INADYN_LICENSE = GPLv2+ INADYN_LICENSE_FILES = COPYING LICENSE ifeq ($(BR2_PACKAGE_OPENSSL),y) +INADYN_CONF_OPTS += --enable-openssl INADYN_DEPENDENCIES += openssl +else ifeq ($(BR2_PACKAGE_GNUTLS),y) +INADYN_DEPENDENCIES += gnutls else -define INADYN_DISABLE_OPENSSL - $(SED) '/ssl/Id' $(@D)/config.mk -endef +INADYN_CONF_OPTS += --disable-ssl endif -INADYN_POST_PATCH_HOOKS += INADYN_DISABLE_OPENSSL - -define INADYN_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef -define INADYN_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/inadyn $(TARGET_DIR)/usr/sbin/inadyn - $(INSTALL) -D -m 0600 package/inadyn/inadyn.conf \ - $(TARGET_DIR)/etc/inadyn.conf +define INADYN_INSTALL_SAMPLE_CONFIG + @if [ ! -f $(TARGET_DIR)/etc/inadyn.conf ]; then \ + $(INSTALL) -D -m 0600 package/inadyn/inadyn.conf \ + $(TARGET_DIR)/etc/inadyn.conf; \ + fi endef +INADYN_POST_INSTALL_TARGET_HOOKS += INADYN_INSTALL_SAMPLE_CONFIG define INADYN_INSTALL_INIT_SYSV $(INSTALL) -D -m 0755 package/inadyn/S70inadyn \ $(TARGET_DIR)/etc/init.d/S70inadyn endef -$(eval $(generic-package)) +$(eval $(autotools-package))