[inadyn-mt/f20] Fix wrong NetworkManger dispatcher directory

Jochen Schmitt s4504kr at fedoraproject.org
Thu May 1 08:49:37 UTC 2014


commit f91313e92bf85b7eb061099af8a0f8a51dfe609e
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Thu May 1 10:49:54 2014 +0200

    Fix wrong NetworkManger dispatcher directory

 inadyn-mt-02.24.36-sig11.patch  |   47 ---------------------------------------
 inadyn-mt-2.24.38-cachdir.patch |   25 ++++++++++++++++++++
 inadyn-mt.spec                  |   24 +++++++++++++++-----
 inadyn.service                  |    2 -
 sources                         |    2 +-
 5 files changed, 44 insertions(+), 56 deletions(-)
---
diff --git a/inadyn-mt-2.24.38-cachdir.patch b/inadyn-mt-2.24.38-cachdir.patch
new file mode 100644
index 0000000..f841cfb
--- /dev/null
+++ b/inadyn-mt-2.24.38-cachdir.patch
@@ -0,0 +1,25 @@
+diff -up inadyn-mt.v.02.24.38/man/inadyn8.tmpfile inadyn-mt.v.02.24.38/man/inadyn8
+diff -up inadyn-mt.v.02.24.38/man/inadyn-mt.8.tmpfile inadyn-mt.v.02.24.38/man/inadyn-mt.8
+--- inadyn-mt.v.02.24.38/man/inadyn-mt.8.tmpfile	2014-04-27 10:29:35.092816620 +0200
++++ inadyn-mt.v.02.24.38/man/inadyn-mt.8	2014-04-27 10:31:05.162680058 +0200
+@@ -184,7 +184,7 @@ Fine timer control.  Slow, or speed time
+ The name, including the full path, of a log file.
+ .TP
+ .I \-\-cache_dir
+-Directory to which ip, and time update files are written.  Defaults to /tmp on **NIX systems.
++Directory to which ip, and time update files are written.  Defaults to /var/cache/inadyn-mt on Fedora systems.
+ .TP
+ .I \-\-background
+ run in background. Output is sent to the UNIX syslog facilities or to a log file, if one was specified.
+diff -up inadyn-mt.v.02.24.38/src/dyndns.h.tmpfile inadyn-mt.v.02.24.38/src/dyndns.h
+--- inadyn-mt.v.02.24.38/src/dyndns.h.tmpfile	2014-04-27 10:25:01.277343956 +0200
++++ inadyn-mt.v.02.24.38/src/dyndns.h	2014-04-27 10:26:11.629884831 +0200
+@@ -112,7 +112,7 @@ typedef enum
+ /*inadyn backward compatibility*/
+ #define DYNDNS_DEFAULT_CONFIG_FILE			"/etc/inadyn.conf"
+ 
+-#define DYNDNS_DEFAULT_CACHE_PREFIX			"/tmp/"
++#define DYNDNS_DEFAULT_CACHE_PREFIX			"/var/cache/inadyn-mt/"
+ #define DYNDNS_DEFAULT_IP_FILE				"inadyn_ip.cache"
+ #define DYNDNS_DEFAULT_TIME_FILE			"inadyn_time.cache"
+ 
diff --git a/inadyn-mt.spec b/inadyn-mt.spec
index 1066249..aff7f7a 100644
--- a/inadyn-mt.spec
+++ b/inadyn-mt.spec
@@ -1,7 +1,7 @@
 Name:           inadyn-mt
 
-Version:        2.24.36
-Release:        12%{?dist}
+Version:        2.24.38
+Release:        2%{?dist}
 
 Summary:        Dynamic DNS Client
 
@@ -12,7 +12,8 @@ Source0:        http://prdownloads.sourceforge.net/inadyn-mt/inadyn-mt.v.0%{vers
 Source1:        inadyn-mt.conf
 Source2:        inadyn.service
 Source3:        inadyn-nm-dispatcher
-Patch1:		inadyn-mt-02.24.36-sig11.patch
+
+Patch1:         inadyn-mt-2.24.38-cachedir.patch
 
 BuildRequires:  automake autoconf
 BuildRequires:  libao-devel
@@ -74,8 +75,10 @@ cp -R extra/* $RPM_BUILD_ROOT%{_datadir}/inadyn-mt/extra
 mkdir -p ${RPM_BUILD_ROOT}%{_unitdir}
 install -p %{SOURCE2} ${RPM_BUILD_ROOT}%{_unitdir}
 
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/NetworkManager/dispatcher
-install -p %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/NetworkManager/dispatcher/30-inadyn
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/NetworkManager/dispatcher.d
+install -p %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/NetworkManager/dispatcher.d/30-inadyn
+
+mkdir -p $RPM_BUILD_ROOT/var/cache/inadyn-mt
 
 %post
 %systemd_post inadyn.service
@@ -93,10 +96,19 @@ install -p %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/NetworkManager/dispatcher/
 %{_unitdir}/inadyn.service
 %{_mandir}/man*/*
 %config(noreplace) %{_sysconfdir}/%{name}.conf
-%config(noreplace) %{_sysconfdir}/NetworkManager/dispatcher/30-inadyn
+%config(noreplace) %{_sysconfdir}/NetworkManager/dispatcher.d/30-inadyn
 %{_datadir}/%{name}/
+%dir /var/cache/inadyn-mt/
 
 %changelog
+* Wed Apr 30 2014 Jochen Schmitt <Jochen herr-schmitt de> - 2.24.38-2
+- Fix wrong NetworkManger dispatcher directory
+
+* Sun Apr 27 2014 Jochen Schmitt <Jochen herr-schmitt de> - 2.24.38-1
+- New upstream release
+- Remove'type=forking' from service file (#1036471)
+- Set default cache dir to /var/cache/inadyn-mt (#1090533)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.36-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/inadyn.service b/inadyn.service
index 5daba1b..a175e86 100644
--- a/inadyn.service
+++ b/inadyn.service
@@ -1,9 +1,7 @@
 [Unit]
 Description=Inadyn-mt, register an IP Address to a dynamic DNS provider
-After=syslog.target
 
 [Service]
-Type=forking
 ExecStart=/usr/sbin/inadyn
 
 [Install]
diff --git a/sources b/sources
index dfa2970..700a5b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-14c044a2754417b344be364eeccc6779  inadyn-mt.v.02.24.36.tar.gz
+e868ab86df2eb20a1d98c11e8564e52c  inadyn-mt.v.02.24.38.tar.gz


More information about the scm-commits mailing list