Skip to contentSkip to conversation

inadyn: bump to version 1.99.11

PATCH New Gustavo Zacarias 2 participants 3 messages Oct 16, 2014

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/1 inadyn: bump to version 1.99.11

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.

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/inadyn/S70inadyn   | 10 ++++++----
 package/inadyn/inadyn.hash |  2 ++
 package/inadyn/inadyn.mk   | 26 ++++++++++++--------------
 3 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 package/inadyn/inadyn.hash
package/inadyn/S70inadyn +6 -4
index 24d0813..02a4c0d 100644
@@ -14,12 +14,14 @@ VR_INADYN=/var/run/inadyn
 
 case "$1" in
         start)
-                echo "Starting inadyn."
-                start-stop-daemon -S -x /usr/sbin/inadyn
+                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/sbin/inadyn
+                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)
package/inadyn/inadyn.hash new file +2 -0
new file mode 100644
index 0000000..e69feb2
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	7e2bfc5df32848abd814548c87bf1d2731ffcf34ad180d8204d94239cb7ad590	inadyn-1.99.11.tar.gz
package/inadyn/inadyn.mk +12 -14
index 21e983e..74bb679 100644
@@ -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))
Signature · 1 line
2.0.4
#1 lore raw

PATCH 1/1 inadyn: bump to version 1.99.11

Dear Gustavo Zacarias,

Quoted 3 lines · Gustavo Zacarias

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.

And make the installation of the default config file conditional.

Quoted 4 lines

case "$1" in
start)

package/inadyn/S70inadyn +0 -2
-                echo "Starting inadyn."
-                start-stop-daemon -S -x /usr/sbin/inadyn

package/inadyn/S70inadyn VR_INADYN=/var/run/inadyn · line 24

Quoted 10 lines
package/inadyn/S70inadyn +6 -2
+                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/sbin/inadyn
+                echo  "Stopping inadyn: "
+                start-stop-daemon -q -K -x /usr/bin/inadyn
+		[ $? == 0 ] && echo "OK" || echo "FAIL"

There's a mix of tabs and spaces being used in the added lines.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#2 lore raw

PATCH 1/1 inadyn: bump to version 1.99.11

Quoted 1 line · Thomas Petazzoni

There's a mix of tabs and spaces being used in the added lines.

I normally do tabs and my added lines do that, didn't see there were spaces in there before, i'll convert everything to tabs. Regards.