rpms/inadyn-mt/devel inadyn-mt-ip.patch, NONE, 1.1 inadyn-mt-path.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 inadyn-mt.spec, 1.3, 1.4 inadyn.conf, 1.1, 1.2 inadyn.init, 1.1, 1.2 sources, 1.2, 1.3
Jochen Schmitt
s4504kr at fedoraproject.org
Tue May 11 17:31:41 UTC 2010
Author: s4504kr
Update of /cvs/pkgs/rpms/inadyn-mt/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3216
Modified Files:
.cvsignore inadyn-mt.spec inadyn.conf inadyn.init sources
Added Files:
inadyn-mt-ip.patch inadyn-mt-path.patch
Log Message:
New upstream release
inadyn-mt-ip.patch:
gethostname.c | 2 +-
ip.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE inadyn-mt-ip.patch ---
diff -up inadyn-mt.v.02.18.14/src/gethostname.c.ip inadyn-mt.v.02.18.14/src/gethostname.c
--- inadyn-mt.v.02.18.14/src/gethostname.c.ip 2010-02-13 21:42:46.000000000 +0100
+++ inadyn-mt.v.02.18.14/src/gethostname.c 2010-05-11 19:14:11.622786416 +0200
@@ -55,7 +55,7 @@ struct hostent * gethostname_re (const c
}
while (( res =
- gethostbyname_r(host,hostbuf,*tmphstbuf,*hstbuflen,&hp,&herr))
+ gethostbyname_r(host,hostbuf,*tmphstbuf,*hstbuflen,&hp,&herr))
&& (errno == ERANGE))
{
/* Enlarge the buffer. */
diff -up inadyn-mt.v.02.18.14/src/ip.c.ip inadyn-mt.v.02.18.14/src/ip.c
--- inadyn-mt.v.02.18.14/src/ip.c.ip 2010-05-11 19:18:24.355787869 +0200
+++ inadyn-mt.v.02.18.14/src/ip.c 2010-05-11 19:19:10.267787721 +0200
@@ -203,7 +203,7 @@ RC_TYPE ip_initialize(IP_SOCKET *p_self)
#ifndef HAVE_FUNC_GETHOSTBYNAME_R_NOT
char *tmphstbuf=NULL;
- unsigned hstbuflen=0;
+ size_t hstbuflen=0;
#endif
inadyn-mt-path.patch:
lang.c | 10 ++++++----
path.c | 13 ++++++-------
2 files changed, 12 insertions(+), 11 deletions(-)
--- NEW FILE inadyn-mt-path.patch ---
diff -up inadyn-mt.v.02.18.14/src/lang.c.xx inadyn-mt.v.02.18.14/src/lang.c
--- inadyn-mt.v.02.18.14/src/lang.c.xx 2010-05-11 18:39:05.238914650 +0200
+++ inadyn-mt.v.02.18.14/src/lang.c 2010-05-11 18:40:44.384788369 +0200
@@ -456,10 +456,12 @@ static RC_TYPE parser_utf_8_read_option(
}
static char *searchedLangFile(FILE *pLOG_FILE,char **dest,char *langFileName)
-{
-
-
- return searchedProgFile(pLOG_FILE,dest,"inadyn-mt","lang",3,langFileName);
+{
+ char *res = searchedProgFile(pLOG_FILE,dest,"inadyn-mt","lang",3,langFileName);
+ if (!res)
+ return searchedProgFile(pLOG_FILE,dest,"inadyn-mt", "lang",3,"en.lng");
+ else
+ return res;
}
char *lang_code(char *szCode,char *szLocale)
diff -up inadyn-mt.v.02.18.14/src/path.c.xx inadyn-mt.v.02.18.14/src/path.c
--- inadyn-mt.v.02.18.14/src/path.c.xx 2010-02-13 21:42:46.000000000 +0100
+++ inadyn-mt.v.02.18.14/src/path.c 2010-05-11 18:38:07.797788437 +0200
@@ -603,7 +603,6 @@ char *get_file(char *path,char *fileName
a_path=safe_malloc(strlen(path)+strlen(fileName)+1);
-
if (!(is_file(strcat(strcpy(a_path,path),fileName)))) {
@@ -640,7 +639,7 @@ char *progMetaFile(FILE *pLOG_FILE,char
return NULL;
-
+
dir=safe_malloc(strlen(in_dir)+strlen(path)+strlen(fileName)+2); /*add 1 for dir separater*/
strcpy(dir,in_dir);
@@ -703,7 +702,6 @@ char *progMetaFile(FILE *pLOG_FILE,char
#else
-
fp=utf_fopen(dir,"r");
@@ -796,12 +794,13 @@ char *searchedProgFile(FILE *pLOG_FILE,c
if (!(progMetaFile(pLOG_FILE,dest,normed_path,path_len,langFileName,ancestor_path(&a_path,root,cwd),cwd))) {
+
free(a_path); a_path=NULL;
- prefixed_path=safe_malloc(strlen("/usr/local/etc/")+strlen(root)+strlen(normed_path)+2);
+ prefixed_path=safe_malloc(strlen("/etc/")+strlen(root)+strlen(normed_path)+2);
- strcat(strcat(strcat(strcpy(prefixed_path,"/usr/local/etc/"),root),"/"),normed_path);
+ strcat(strcat(strcat(strcpy(prefixed_path,"/etc/"),root),"/"),normed_path);
/*
TODO: should search relative to where executing from (/bin, /usr/local/bin, should map to
/etc, /usr/local/etc respectively
@@ -810,9 +809,9 @@ char *searchedProgFile(FILE *pLOG_FILE,c
if (!(*dest=get_file(prefixed_path,langFileName))) {
- prefixed_path=safe_realloc(prefixed_path,strlen("/etc/")+strlen(root)+strlen(normed_path)+2);
+ prefixed_path=safe_realloc(prefixed_path,strlen("/usr/share/")+strlen(root)+strlen(normed_path)+2);
- strcat(strcat(strcat(strcpy(prefixed_path,"/etc/"),root),"/"),normed_path);
+ strcat(strcat(strcat(strcpy(prefixed_path,"/usr/share/"),root),"/"),normed_path);
*dest=get_file(prefixed_path,langFileName);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/inadyn-mt/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 30 Jul 2008 17:02:08 -0000 1.2
+++ .cvsignore 11 May 2010 17:31:41 -0000 1.3
@@ -1 +1 @@
-inadyn-mt.v.02.12.24.tar.gz
+inadyn-mt.v.02.18.14.tar.gz
Index: inadyn-mt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/inadyn-mt/devel/inadyn-mt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- inadyn-mt.spec 25 Jul 2009 03:20:16 -0000 1.3
+++ inadyn-mt.spec 11 May 2010 17:31:41 -0000 1.4
@@ -1,8 +1,9 @@
+
Name: inadyn-mt
-Version: 2.12.24
-Release: 3%{?dist}
+Version: 2.18.14
+Release: 1%{?dist}
Summary: Dynamic DNS Client
@@ -12,8 +13,12 @@ URL: http://inadyn-mt.sourcef
Source0: http://prdownloads.sourceforge.net/inadyn-mt/inadyn-mt.v.0%{version}.tar.gz
Source1: inadyn.conf
Source2: inadyn.init
+Patch1: inadyn-mt-path.patch
+Patch2: inadyn-mt-ip.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: libao-devel
+
Requires(post): /sbin/chkconfig
Requires(post): /sbin/service
Requires(preun): /sbin/chkconfig
@@ -33,7 +38,9 @@ provider's web interface to create the e
should then fill in /etc/inadyn.conf with the appropriate detail
%prep
-%setup -q -n %name
+%setup -q -n %name.v.0%{version}
+%patch1 -p1 -b .xx
+%patch2 -p1 -b .ip
%build
rm -rf bin/
@@ -43,7 +50,7 @@ make %{?_smp_mflags} CFLAGS="$RPM_OPT_FL
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-install -m 0755 bin/linux/inadyn-mt $RPM_BUILD_ROOT%{_sbindir}/inadyn
+install -m 0755 src/inadyn-mt $RPM_BUILD_ROOT%{_sbindir}/inadyn
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
@@ -66,8 +73,11 @@ mkdir -p $RPM_BUILD_ROOT%{_initrddir}
s|/etc/rc\.d/init\.d/|%{_initrddir}/|g' \
<%{SOURCE2} >$RPM_BUILD_ROOT%{_initrddir}/inadyn
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/inadyn-mt/lang
-cp lang/* $RPM_BUILD_ROOT%{_sysconfdir}/inadyn-mt/lang
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/inadyn-mt/lang
+cp lang/* $RPM_BUILD_ROOT%{_datadir}/inadyn-mt/lang
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/inadyn-mt/extra
+cp -R extra/* $RPM_BUILD_ROOT%{_datadir}/inadyn-mt/extra
%clean
rm -rf $RPM_BUILD_ROOT
@@ -95,14 +105,17 @@ fi
%config(noreplace) %{_sysconfdir}/inadyn.conf
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
-%dir %{_sysconfdir}/%{name}/lang
-%config(noreplace) %{_sysconfdir}/%{name}/lang/en.lng
+%{_datadir}/%{name}/
+
%changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.24-3
+* Sun Apr 25 2010 Jochen Schmitt <Jochen herr-schmitt de> 2.18.14-1
+- New upstream release
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 2.12.24-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.24-2
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> 2.12.24-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Wed Jul 30 2008 Jochen Schmitt <Jochen herr-schmitt de> 2.12.24-1
Index: inadyn.conf
===================================================================
RCS file: /cvs/pkgs/rpms/inadyn-mt/devel/inadyn.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- inadyn.conf 30 Jul 2008 17:02:08 -0000 1.1
+++ inadyn.conf 11 May 2010 17:31:41 -0000 1.2
@@ -3,3 +3,4 @@ password <Your Password>
alias <Your DynDNS Hostname>
update_period 60000
background
+syslog
\ No newline at end of file
Index: inadyn.init
===================================================================
RCS file: /cvs/pkgs/rpms/inadyn-mt/devel/inadyn.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- inadyn.init 30 Jul 2008 17:02:08 -0000 1.1
+++ inadyn.init 11 May 2010 17:31:41 -0000 1.2
@@ -40,7 +40,7 @@ prog=inadyn
start() {
# Start daemons.
echo -n $"Starting $prog: "
- daemon $ina_bin
+ daemon $ina_bin
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/inadyn-mt/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 30 Jul 2008 17:02:08 -0000 1.2
+++ sources 11 May 2010 17:31:41 -0000 1.3
@@ -1 +1 @@
-9e7a8a8841a6b3fe0c6f9412e581324b inadyn-mt.v.02.12.24.tar.gz
+dc170b9fe4c93bcf087957319f355661 inadyn-mt.v.02.18.14.tar.gz
More information about the scm-commits
mailing list