rpms/pilot-link/FC-4 pilot-link-0.12.0-pre3-buffer.patch, NONE, 1.1 pilot-link-0.12.0-pre3-lib64.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 pilot-link.spec, 1.26, 1.27 sources, 1.9, 1.10 pilot-link-0.12.0-pre2-gcc4.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jun 15 11:04:44 UTC 2005
Author: than
Update of /cvs/dist/rpms/pilot-link/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv26641
Modified Files:
.cvsignore pilot-link.spec sources
Added Files:
pilot-link-0.12.0-pre3-buffer.patch
pilot-link-0.12.0-pre3-lib64.patch
Removed Files:
pilot-link-0.12.0-pre2-gcc4.patch
Log Message:
- fix non utf-8 in changelog #159582
- apply patch to fix compiler warnings
- 0.12.0-pre3
pilot-link-0.12.0-pre3-buffer.patch:
pilot-foto.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE pilot-link-0.12.0-pre3-buffer.patch ---
--- pilot-link-0.12.0-pre3/src/pilot-foto.c.orig 2005-06-08 20:23:45.000000000 +0200
+++ pilot-link-0.12.0-pre3/src/pilot-foto.c 2005-06-08 20:18:46.000000000 +0200
@@ -532,6 +532,7 @@
***********************************************************************/
int do_install(int sd, const char **install_files)
{
+ const int max_photo_name=30;
int n, ret, i;
struct pi_file *pf;
struct DBInfo info;
@@ -541,7 +542,7 @@
unsigned char buf[0x1010];
char pdb_file[256];
char log_text[256];
- char installed_name[20];
+ char installed_name[max_photo_name];
struct stat sbuf;
@@ -566,13 +567,12 @@
info.modifyDate=ltime;
info.backupDate=-2082816000;
-#define MAX_PHOTO_NAME 30
for (i=0; install_files[i]; i++) {
- strncpy(installed_name, install_files[i], MAX_PHOTO_NAME);
- installed_name[MAX_PHOTO_NAME]='\0';
+ strncpy(installed_name, install_files[i], max_photo_name);
+ installed_name[max_photo_name-1]='\0';
/* todo check maximum file name length */
- if (strlen(install_files[i]) > MAX_PHOTO_NAME - 3) {
- strcpy(&installed_name[MAX_PHOTO_NAME - 3], ".jpg");
+ if (strlen(install_files[i]) > max_photo_name - 5) {
+ strcpy(&installed_name[max_photo_name - 5], ".jpg");
printf("%s being truncated to %s: ", install_files[i], installed_name);
}
strcpy(info.name, installed_name);
pilot-link-0.12.0-pre3-lib64.patch:
configure | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE pilot-link-0.12.0-pre3-lib64.patch ---
--- pilot-link-0.12.0-pre3/configure.tn 2005-06-08 16:04:27.000000000 +0200
+++ pilot-link-0.12.0-pre3/configure 2005-06-08 16:05:44.000000000 +0200
@@ -22479,7 +22479,7 @@
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
msg_popt="yes (system)"
- POPT_LIBS="-lpopt"
+ POPT_LIBS="-L$libdir -lpopt"
fi
else
with_included_popt="no"
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/pilot-link/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 13 Mar 2005 21:59:06 -0000 1.9
+++ .cvsignore 15 Jun 2005 11:04:41 -0000 1.10
@@ -1,2 +1,3 @@
pilot-link-0.11.8.tar.bz2
pilot-link-0.12.0-pre2.tar.gz
+pilot-link-0.12.0-pre3.tar.bz2
Index: pilot-link.spec
===================================================================
RCS file: /cvs/dist/rpms/pilot-link/FC-4/pilot-link.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- pilot-link.spec 13 Mar 2005 21:59:06 -0000 1.26
+++ pilot-link.spec 15 Jun 2005 11:04:41 -0000 1.27
@@ -4,8 +4,8 @@
Summary: File transfer utilities between Linux and PalmPilots.
Name: pilot-link
Version: 0.12.0
-Release: 0.pre2.0
-Source: pilot-link-%{version}-pre2.tar.gz
+Release: 0.pre3.0.fc4.1
+Source: pilot-link-%{version}-pre3.tar.bz2
Url: http://www.pilot-link.org/
Patch1: pilot-link-0.11.0-perlmd5.patch
Patch2: pilot-link-0.11.0-perlpollute.patch
@@ -14,7 +14,8 @@
Patch6: pilot-link-0.11.8-size.patch
Patch7: pilot-link-0.11.8-readfile.patch
Patch9: pilot-link-0.11.8-misc1.patch
-Patch10: pilot-link-0.12.0-pre2-gcc4.patch
+Patch10: pilot-link-0.12.0-pre3-lib64.patch
+Patch11: pilot-link-0.12.0-pre3-buffer.patch
Epoch: 1
License: GPL
Group: Applications/Communications
@@ -58,7 +59,7 @@
need to install pilot-link-devel.
%prep
-%setup -q -n %{name}-%{version}-pre2
+%setup -q -n %{name}-%{version}-pre3
%if %{support_perl}
%patch1 -p1 -b .perlmd5
%patch2 -p1 -b .perlpollute
@@ -68,7 +69,8 @@
#%patch6 -p1 -b .size
#%patch7 -p1 -b .read
%patch9 -p1 -b .misc1
-%patch10 -p1 -b .gcc4
+%patch10 -p1 -b .lib64
+%patch11 -p1 -b .buffer
%build
CFLAGS="$RPM_OPT_FLAGS" %configure \
@@ -142,6 +144,11 @@
%{_datadir}/aclocal/*.m4
%changelog
+* Wed Jun 15 2005 Than Ngo <than at redhat.com> 0.12.0-0.pre3.0.fc4.1
+- fix non utf-8 in changelog #159582
+- apply patch to fix compiler warnings
+- 0.12.0-pre3
+
* Sun Mar 13 2005 Than Ngo <than at redhat.com> 0.12.0-0.pre2.0
- 0.12.0-pre2
- fix build gcc 4 problem
@@ -266,7 +273,7 @@
* Fri Aug 10 2001 Than Ngo <than at redhat.com>
- add epoch (bug #51429)
-* Mon Jul 16 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Mon Jul 16 2001 Trond Eivind Glomsrød <teg at redhat.com>
- s/Copyright/License/
- Add dependency on main package for the devel subpackage
@@ -283,7 +290,7 @@
- rebuild for C++ exception handling on ia64
* Thu Feb 01 2001 Than Ngo <than at redhat.com>
-- cleanup patch from Jürgen Stuber to fix "Weird packet" error (Bug #25360)
+- cleanup patch from Jürgen Stuber to fix "Weird packet" error (Bug #25360)
* Mon Nov 20 2000 Than Ngo <than at redhat.com>
- update 0.9.5pre3 snapshot from CVS
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/pilot-link/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 13 Mar 2005 21:59:06 -0000 1.9
+++ sources 15 Jun 2005 11:04:41 -0000 1.10
@@ -1 +1 @@
-20f3cd21e9b2c216f2097cb6bdca19b3 pilot-link-0.12.0-pre2.tar.gz
+1f684edc1ae9e13dd84485bb50da4b9c pilot-link-0.12.0-pre3.tar.bz2
--- pilot-link-0.12.0-pre2-gcc4.patch DELETED ---
More information about the fedora-cvs-commits
mailing list