[inadyn-mt] Update to 2.24.43

mooninite mooninite at fedoraproject.org
Tue Jan 20 02:00:43 UTC 2015


commit c57c94a37146c785c10a042308690c6924ff5cad
Author: Michael Cronenworth <mike at cchtml.com>
Date:   Mon Jan 19 20:00:56 2015 -0600

    Update to 2.24.43

 .gitignore                       |   20 +----------
 inadyn-mt-2.24.38-cachdir.patch  |   25 -------------
 inadyn-mt-2.24.40-cachedir.patch |   24 ------------
 inadyn-mt-libao.patch            |   74 ++++++++++++++++++++++++++++++++++++++
 inadyn-mt.spec                   |   19 ++++++----
 inadyn.service                   |    4 ++-
 sources                          |    2 +-
 7 files changed, 90 insertions(+), 78 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6bc7fe1..894db04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1 @@
-inadyn-mt.v.02.18.36.tar.gz
-/inadyn-mt.v.02.18.42.tar.gz
-/inadyn-mt.v.02.18.50.tar.gz
-/inadyn-mt.v.02.20.08.tar.gz
-/inadyn-mt.v.02.20.20.tar.gz
-/inadyn-mt.v.02.20.22.tar.gz
-/inadyn-mt.v.02.20.28.tar.gz
-/inadyn-mt.v.02.20.32.tar.gz
-/inadyn-mt.v.02.20.34.tar.gz
-/inadyn-mt.v.02.20.38.tar.gz
-/inadyn-mt.v.02.20.40.tar.gz
-/inadyn-mt.v.02.20.44.tar.gz
-/inadyn-mt.v.02.24.06.tar.gz
-/inadyn-mt.v.02.24.24.tar.gz
-/inadyn-mt.v.02.24.30.tar.gz
-/inadyn-mt.v.02.24.34.tar.gz
-/inadyn-mt.v.02.24.36.tar.gz
-/inadyn-mt.v.02.24.40.tar.gz
-
+/inadyn-mt.v.02.24.43.tar.gz
diff --git a/inadyn-mt-libao.patch b/inadyn-mt-libao.patch
new file mode 100644
index 0000000..c0f7ce9
--- /dev/null
+++ b/inadyn-mt-libao.patch
@@ -0,0 +1,74 @@
+--- inadyn-mt.v.02.24.43/src/waveout.c.orig	2014-05-26 08:37:48.000000000 -0500
++++ inadyn-mt.v.02.24.43/src/waveout.c	2015-01-19 19:54:51.194407139 -0600
+@@ -62,6 +62,8 @@
+ 
+ #include <dlfcn.h>
+ 
++#define LIBAO_SONAME "libao.so.4"
++
+ static int	is_no_aolib=0;
+ 
+ #endif
+@@ -435,7 +437,7 @@
+ 
+ 	if (!(is_init)) {
+ 
+-		((FUNC_1) (get_func_addr(&aolib_handle,"libao.so","ao_initialize",ao_initialize_ptr)))();
++		((FUNC_1) (get_func_addr(&aolib_handle,LIBAO_SONAME,"ao_initialize",ao_initialize_ptr)))();
+ 
+ #ifndef NO_DYN_LOAD
+ 
+@@ -466,7 +468,7 @@
+ 
+ 	else 
+ 
+-		((FUNC_1) (get_func_addr(&aolib_handle,"libao.so","ao_shutdown",ao_shutdown_ptr)))();
++		((FUNC_1) (get_func_addr(&aolib_handle,LIBAO_SONAME,"ao_shutdown",ao_shutdown_ptr)))();
+ 
+ 
+ 	return 0;
+@@ -519,7 +521,7 @@
+ 
+ 	/* -- Setup for default driver -- */
+ 
+-	if ((driver=((FUNC_2) (get_func_addr(&aolib_handle,"libao.so","ao_default_driver_id",ao_default_driver_id_ptr)))())==-1) {
++	if ((driver=((FUNC_2) (get_func_addr(&aolib_handle,LIBAO_SONAME,"ao_default_driver_id",ao_default_driver_id_ptr)))())==-1) {
+ 
+ 		DBG_PRINTF((LOG_CRIT, "C:" MODULE_TAG "ao_default_driver_id() returned NO DRIVER (%s) in play_wave_open_os...\n",libao_err_name(errno)));
+ 	} 
+@@ -527,7 +529,7 @@
+ 
+ 		ao_info	*driver_info=NULL;
+ 
+-		if (!(driver_info=((FUNC_8) (get_func_addr(&aolib_handle,"libao.so","ao_driver_info",ao_driver_info_ptr)))(driver)))
++		if (!(driver_info=((FUNC_8) (get_func_addr(&aolib_handle,LIBAO_SONAME,"ao_driver_info",ao_driver_info_ptr)))(driver)))
+ 
+ 			DBG_PRINTF((LOG_CRIT, "C:" MODULE_TAG "ao_driver_info returned NULL (%s) in play_wave_open_os...\n",libao_err_name(errno)));
+ 		else
+@@ -540,7 +542,7 @@
+ 		format.byte_format=AO_FMT_LITTLE;
+ 		format.matrix="L,R";
+ 
+-		device=((FUNC_3) (get_func_addr(&aolib_handle,"libao.so","ao_open_live",ao_open_live_ptr)))(driver,(ao_sample_format *) &format,NULL);
++		device=((FUNC_3) (get_func_addr(&aolib_handle,LIBAO_SONAME,"ao_open_live",ao_open_live_ptr)))(driver,(ao_sample_format *) &format,NULL);
+ 
+ 		if (device==NULL) {
+ 
+@@ -563,7 +565,7 @@
+ 			}
+ 			else {		
+ 
+-				if (!(((FUNC_4) (get_func_addr(&aolib_handle,"libao.so","ao_play",ao_play_ptr)))(device,p_wave_play->wave_buff[p_wave_play->cur_buffer],bytes_read))) {
++				if (!(((FUNC_4) (get_func_addr(&aolib_handle,LIBAO_SONAME,"ao_play",ao_play_ptr)))(device,p_wave_play->wave_buff[p_wave_play->cur_buffer],bytes_read))) {
+ 
+ 					DBG_PRINTF((LOG_CRIT, "C:" MODULE_TAG "ao_play failed (%s) in play_wave_open_os...\n",libao_err_name(errno)));
+ 				}
+@@ -582,7 +584,7 @@
+ 
+ 		wait_done_playing(p_wave_play);		
+ 
+-		if (!(((FUNC_5) (get_func_addr(&aolib_handle,"libao.so","ao_close",ao_close_ptr)))(device))) {
++		if (!(((FUNC_5) (get_func_addr(&aolib_handle,LIBAO_SONAME,"ao_close",ao_close_ptr)))(device))) {
+ 
+ 			DBG_PRINTF((LOG_CRIT, "C:" MODULE_TAG "ao_close failed (%s) in play_wave_open_os...\n",libao_err_name(errno)));
+ 		}
diff --git a/inadyn-mt.spec b/inadyn-mt.spec
index e58ae95..52cf225 100644
--- a/inadyn-mt.spec
+++ b/inadyn-mt.spec
@@ -1,7 +1,7 @@
 Name:           inadyn-mt
 
-Version:        2.24.40
-Release:        3%{?dist}
+Version:        2.24.43
+Release:        1%{?dist}
 
 Summary:        Dynamic DNS Client
 
@@ -12,8 +12,7 @@ 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-2.24.40-cachedir.patch
+Patch1:         inadyn-mt-libao.patch
 
 BuildRequires:  automake autoconf
 BuildRequires:  libao-devel
@@ -46,7 +45,7 @@ should then fill in /etc/inadyn.conf with the appropriate detail
 
 %prep
 %setup -q -n %name.v.0%{version}
-%patch1 -p1 -b .cd
+%patch1 -p1 -b.libao
 
 %build
 rm -rf bin/
@@ -87,7 +86,7 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/inadyn-mt
 %systemd_preun inadyn.service
 
 %postun
-%systemd_postun_with_restart inadyn.services
+%systemd_postun_with_restart inadyn.service
 
 %files 
 %defattr(-,root,root,-)
@@ -101,6 +100,10 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/inadyn-mt
 %dir /var/cache/inadyn-mt/
 
 %changelog
+* Mon Jan 19 2015 Michael Cronenworth <mike at cchtml.com> - 2.24.43-1
+- New upstream release
+- Multiple packaging fixes (rhbz# 1090317)
+
 * Sun Dec  7 2014 Jochen Schmitt <Jochen herr-schmitt de> - 2.24.40-3
 - Make systemd unit file none-executable (#1171375)
 
@@ -332,10 +335,10 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/inadyn-mt
 * Wed Apr 27 2005 Jochen Schmitt <Jochen herr-schmitt de> 1.90-6
 - Add initscript
 
-* Thu Apr 26 2005 Jochen Schmitt <Jochen herr-schmitt de> 1.90-5
+* Tue Apr 26 2005 Jochen Schmitt <Jochen herr-schmitt de> 1.90-5
 - Add URL to Source0
 
-* Thu Apr 12 2005 Jochen Schmitt <Jochen herr-schmitt de> 1.90-4
+* Tue Apr 12 2005 Jochen Schmitt <Jochen herr-schmitt de> 1.90-4
 - Corrected use of percentage sign in changelog
 
 * Mon Apr 11 2005 Jochen Schmitt <Jochen herr-schmitt de> 1.90-3
diff --git a/inadyn.service b/inadyn.service
index f9eed10..10c5b9c 100644
--- a/inadyn.service
+++ b/inadyn.service
@@ -2,9 +2,11 @@
 Description=Inadyn-mt, register an IP Address to a dynamic DNS provider
 
 [Service]
+Type=forking
 User=nobody
 Group=nobody
 ExecStart=/usr/sbin/inadyn
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target
+
diff --git a/sources b/sources
index 73da409..2561add 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3a6fa37b3004dd4727a1e792563138f3  inadyn-mt.v.02.24.40.tar.gz
+ccef145f7c3e8c84aa7fe38c14b046f0  inadyn-mt.v.02.24.43.tar.gz


More information about the scm-commits mailing list