gnunet: update source, improve packaging

 * always re-create config-file when service is started
 * use /lib/upgrade/keep.d instead of /etc/sysupgrade.conf sed'ery

Signed-off-by: Daniel Golle <[email protected]>

diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index 0d4c8554cd1bdc7ccb414e4b97efbfeda42b0f9a..ea65e98011ff7eede3ac4158ba27c23f6d03b725 100644 (file)
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnunet
-PKG_SOURCE_VERSION:=36068
+PKG_SOURCE_VERSION:=36094
 PKG_VERSION:=0.10.1-svn$(PKG_SOURCE_VERSION)
 PKG_RELEASE:=1
 
@@ -164,6 +164,7 @@ define Package/gnunet/install
        $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/gnunet/hellos/* $(1)/usr/share/gnunet/hellos
        $(INSTALL_DIR) $(1)/etc/init.d/
        $(INSTALL_BIN) ./files/gnunet.init $(1)/etc/init.d/gnunet
+       $(INSTALL_DATA) ./files/gnunet.upgrade $(1)/lib/upgrade/keep.d/gnunet
 endef
 
 define Build/InstallDev
@@ -173,20 +174,6 @@ define Build/InstallDev
        $(CP) $(PKG_INSTALL_DIR)/usr/include/gnunet/*.h $(1)/usr/include/gnunet
 endef
 
-define Package/gnunet/postinst
-#!/bin/sh
-grep -qc "/etc/gnunet" "$${IPKG_INSTROOT}"/etc/sysupgrade.conf >/dev/null ||
-       echo "/etc/gnunet/" >> "$${IPKG_INSTROOT}"/etc/sysupgrade.conf
-
-endef
-
-define Package/gnunet/postrm
-#!/bin/sh
-grep -qc "/etc/gnunet" "$${IPKG_INSTROOT}"/etc/sysupgrade.conf >/dev/null &&
-       sed -i '/\/etc\/gnunet/d' "$${IPKG_INSTROOT}"/etc/sysupgrade.conf
-
-endef
-
 DEPENDS_conversation:=+gnunet-gns +libgst1app +libgst1audio +libgstreamer1 +glib2 +pulseaudio-daemon +libopus +libogg
 BIN_conversation:=conversation conversation-test
 LIB_conversation:=conversation microphone speaker

diff --git a/net/gnunet/files/gnunet.init b/net/gnunet/files/gnunet.init
index 6e12030a3e3a8841376ecab8b4e1e25225c4d204..c21bbd55ce09a9ef4eb2406af54cd09fcbb1c821 100644 (file)
--- a/net/gnunet/files/gnunet.init
+++ b/net/gnunet/files/gnunet.init
@@ -32,9 +32,11 @@ fix_libexec_permissions() {
 }
 
 prepare_config() {
-       mkdir -p $GNUNET_HOME
-       chown gnunet:gnunet $GNUNET_HOME
-       chmod 0750 $GNUNET_HOME
+       if [ ! -e "$GNUNET_HOME" ]; then
+               mkdir -p $GNUNET_HOME
+               chown gnunet:gnunet $GNUNET_HOME
+               chmod 0750 $GNUNET_HOME
+       fi
        touch $CONFIGFILE
        chown root:gnunet $CONFIGFILE
        chmod 0640 $CONFIGFILE
@@ -74,7 +76,7 @@ prepare_config() {
 
 start_service() {
        fix_libexec_permissions
-       [ ! -e $GNUNET_HOME ] && prepare_config
+       prepare_config
 
        procd_open_instance
        procd_set_param user gnunet

diff --git a/net/gnunet/files/gnunet.upgrade b/net/gnunet/files/gnunet.upgrade
new file mode 100644 (file)
index 0000000..f488957
--- /dev/null
+++ b/net/gnunet/files/gnunet.upgrade
@@ -0,0 +1 @@
+/etc/gnunet