fixed FTBFS on F19
This commit is contained in:
Peter Schiffer 2013-02-25 15:23:30 +01:00
parent 9c1f4c4691
commit ffeef28295
2 changed files with 35 additions and 5 deletions

View File

@ -0,0 +1,24 @@
diff -up pilot-link-0.12.5/libpisock/md5.c.ftbfs-f19 pilot-link-0.12.5/libpisock/md5.c
--- pilot-link-0.12.5/libpisock/md5.c.ftbfs-f19 2013-02-25 15:17:31.708780677 +0100
+++ pilot-link-0.12.5/libpisock/md5.c 2013-02-25 15:15:07.771861922 +0100
@@ -125,7 +125,7 @@ void MD5Final(UINT8 digest[16], struct M
byteSwap(ctx->buf, 4);
memcpy(digest, ctx->buf, 16);
- memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
+ memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
}
#ifndef ASM_MD5
diff -up pilot-link-0.12.5/popt/popthelp.c.ftbfs-f19 pilot-link-0.12.5/popt/popthelp.c
--- pilot-link-0.12.5/popt/popthelp.c.ftbfs-f19 2004-08-25 17:06:39.000000000 +0200
+++ pilot-link-0.12.5/popt/popthelp.c 2013-02-25 15:16:34.593606516 +0100
@@ -683,7 +683,7 @@ static int showShortOptions(const struct
s[0] = '\0';
/*@-branchstate@*/ /* FIX: W2DO? */
if (str == NULL) {
- memset(s, 0, sizeof(s));
+ memset(s, 0, sizeof(*s));
str = s;
}
/*@=branchstate@*/

View File

@ -2,7 +2,7 @@
Name: pilot-link
Version: 0.12.5
Release: 14%{?dist}
Release: 15%{?dist}
Epoch: 2
# libpisock/md5.c Public Domain
# libpisock/blob.c LGPLv2+
@ -26,6 +26,7 @@ Patch10: pilot-link-0.12.3-clio.patch
Patch11: pilot-link-0.12.5-mp.patch
Patch12: pilot-link-0.12.5-redefinePerlsymbols.patch
Patch13: pilot-link-0.12.5-compiler_warnings.patch
Patch14: pilot-link-0.12.5-ftbfs-f19.patch
Requires: pilot-link-libs = %{epoch}:%{version}-%{release}
@ -92,6 +93,7 @@ Libraries for applications communicating with PalmPilot
%patch11 -p1 -b .mp
%patch12 -p1 -b .symbol
%patch13 -p1 -b .compiler
%patch14 -p1 -b .ftbfs-f19
iconv -f windows-1252 -t UTF8 doc/README.usb > doc/README.usb.aux
mv doc/README.usb.aux doc/README.usb
iconv -f windows-1252 -t UTF8 ChangeLog > ChangeLog.aux
@ -207,6 +209,10 @@ rm -rf %{buildroot}
/lib/udev/rules.d/69-pilot-link.rules
%changelog
* Mon Feb 25 2013 Peter Schiffer <pschiffe@redhat.com> - 2:0.12.5-12
- resolves: #914386
fixed FTBFS on F19
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.12.5-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
@ -254,7 +260,7 @@ rm -rf %{buildroot}
- Resolves: #659292
split libraries to a separate package
* Mon Nov 12 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 2:0.12.5-2
* Fri Nov 12 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 2:0.12.5-2
- Resolves: #642435
udev rules broken for pilot-link
@ -371,7 +377,7 @@ rm -rf %{buildroot}
- Enable Perl bindings
- Include important docs such as README.usb
* Tue Aug 29 2007 Ivana Varekova <varekova@redhat.com> - 2:0.12.2-5
* Wed Aug 29 2007 Ivana Varekova <varekova@redhat.com> - 2:0.12.2-5
- Rebuild for selinux ppc32 issue.
- fix open function calls
@ -555,7 +561,7 @@ rm -rf %{buildroot}
* Wed Jun 19 2002 Than Ngo <than@redhat.com> 0.9.5-19
- don't forcibly strip binaries
* Mon Jun 11 2002 Than Ngo <than@redhat.com> 0.9.5-18
* Tue Jun 11 2002 Than Ngo <than@redhat.com> 0.9.5-18
- get rid of tcl/tk dependency (bug #66480)
* Wed Jun 05 2002 Than Ngo <than@redhat.com> 0.9.5-17
@ -657,7 +663,7 @@ rm -rf %{buildroot}
* Thu Jan 21 1999 Bill Nottingham <notting@redhat.com>
- arm fix
* Fri Sep 24 1998 Michael Maher <mike@redhat.com>
* Thu Sep 24 1998 Michael Maher <mike@redhat.com>
- cleaned up spec file, updated package
* Tue May 19 1998 Michael Maher <mike@redhat.com>