Compare commits

..

6 Commits
master ... f9

Author SHA1 Message Date
Fedora Release Engineering 1cf4a2a631 dist-git conversion 2010-07-29 09:19:39 +00:00
Bill Nottingham 125c7618aa Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:42:35 +00:00
Ivana Varekova 6547890b91 - extend clio patch - thanks Kevin R. Page 2008-09-23 09:45:25 +00:00
Ivana Varekova ca9f4ca809 - add clio patch (454178) - thanks Michael Ekstrand 2008-09-19 10:12:23 +00:00
alexlan 1711434fb7 Patch from Kevin Page <krp[AT]fedoraproject org>:
- corrected documentation for visor module use
- removed 60-pilot.rules in preference to upstream's 60-libpisock.rules to
    match README.fedora
2008-07-06 02:07:47 +00:00
Jesse Keating fd7ed8abf1 Initialize branch F-9 for pilot-link 2008-04-21 14:39:34 +00:00
16 changed files with 248 additions and 5497 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
pilot-link-0.12.5.tar.bz2
pilot-link-0.12.3.tar.bz2

View File

@ -1,104 +0,0 @@
ACTION!="add", GOTO="pilot_link_end"
SUBSYSTEM!="usb", GOTO="pilot_link_end"
# Sony
ATTR{idVendor}!="054c", GOTO="pilot_link_sony_end"
# Sony NR and other Palm OS 4.1
ATTR{idProduct}=="000a", ENV{ID_PDA}="1"
# Sony S S320 and other Palm OS 3.5
ATTR{idProduct}=="0038", ENV{ID_PDA}="1"
# Sony T, SJ series, and other Palm OS 4.0
ATTR{idProduct}=="0066", ENV{ID_PDA}="1"
# Sony S360
ATTR{idProduct}=="0095", ENV{ID_PDA}="1"
# Sony NR70V/U
ATTR{idProduct}=="009a", ENV{ID_PDA}="1"
# Sony NX
ATTR{idProduct}=="00da", ENV{ID_PDA}="1"
# Sony NZ
ATTR{idProduct}=="00e9", ENV{ID_PDA}="1"
# Sony UX
ATTR{idProduct}=="0144", ENV{ID_PDA}="1"
# Sony TJ
ATTR{idProduct}=="0169", ENV{ID_PDA}="1"
LABEL="pilot_link_sony_end"
# Handspring
ATTR{idVendor}!="082d", GOTO="pilot_link_handspring_end"
# Visor/Treo 300
ATTR{idProduct}=="0100", ENV{ID_PDA}="1"
# Treo
ATTR{idProduct}=="0200", ENV{ID_PDA}="1"
# Treo 600
ATTR{idProduct}=="0300", ENV{ID_PDA}="1"
LABEL="pilot_link_handspring_end"
# Palm, Inc. and palmOne
ATTR{idVendor}!="0830", GOTO="pilot_link_palm_end"
# m500
ATTR{idProduct}=="0001", ENV{ID_PDA}="1"
# m505
ATTR{idProduct}=="0002", ENV{ID_PDA}="1"
# m515
ATTR{idProduct}=="0003", ENV{ID_PDA}="1"
# unknown
ATTR{idProduct}=="0010", ENV{ID_PDA}="1"
# unknown
ATTR{idProduct}=="0011", ENV{ID_PDA}="1"
# i705
ATTR{idProduct}=="0020", ENV{ID_PDA}="1"
# Tungsten Z
ATTR{idProduct}=="0030", ENV{ID_PDA}="1"
# Tungsten W
ATTR{idProduct}=="0031", ENV{ID_PDA}="1"
# m125
ATTR{idProduct}=="0040", ENV{ID_PDA}="1"
# m130
ATTR{idProduct}=="0050", ENV{ID_PDA}="1"
# unknown
ATTR{idProduct}=="0051", ENV{ID_PDA}="1"
# unknown
ATTR{idProduct}=="0052", ENV{ID_PDA}="1"
# unknown
ATTR{idProduct}=="0053", ENV{ID_PDA}="1"
# Tungsten series, Zire 71
ATTR{idProduct}=="0060", ENV{ID_PDA}="1"
# Zire 21, 31, 72, Z22, Tungsten E2, T3, TX, Treo 650, 680, LifeDrive
ATTR{idProduct}=="0061", ENV{ID_PDA}="1"
# Zire 21, 31, 72, Z22, Tungsten E2, T3, TX, Treo 650, 680, LifeDrive
ATTR{idProduct}=="0062", ENV{ID_PDA}="1"
# Zire 21, 31, 72, Z22, Tungsten E2, T3, TX, Treo 650, 680, LifeDrive
ATTR{idProduct}=="0063", ENV{ID_PDA}="1"
# Zire
ATTR{idProduct}=="0070", ENV{ID_PDA}="1"
# Zire
ATTR{idProduct}=="0071", ENV{ID_PDA}="1"
# m100
ATTR{idProduct}=="0080", ENV{ID_PDA}="1"
# unknown
ATTR{idProduct}=="0099", ENV{ID_PDA}="1"
# unknown
ATTR{idProduct}=="0100", ENV{ID_PDA}="1"
LABEL="pilot_link_palm_end"
# Samsung i330
ATTR{idVendor}=="04e8", ATTR{idProduct}=="8001", ENV{ID_PDA}="1"
# Garmin IQUE 3600
ATTR{idVendor}=="091e", ATTR{idProduct}=="0004", ENV{ID_PDA}="1"
# Kyocera 7135 Smartphone
ATTR{idVendor}=="0c88", ATTR{idProduct}=="0021", ENV{ID_PDA}="1"
# Kyocera 6035 Smartphone
ATTR{idVendor}=="0c88", ATTR{idProduct}=="a226", ENV{ID_PDA}="1"
# Tapwave Zodiac, Zodiac2
ATTR{idVendor}=="12ef", ATTR{idProduct}=="0100", ENV{ID_PDA}="1"
# Aceeca MEZ1000
ATTR{idVendor}=="4766", ATTR{idProduct}=="0001", ENV{ID_PDA}="1"
# Alphasmart Dana
ATTR{idVendor}=="081e", ATTR{idProduct}=="df00", ENV{ID_PDA}="1"
LABEL="pilot_link_end"

View File

@ -29,13 +29,6 @@ https://bugzilla.redhat.com/
Visor module setup
------------------
Note since F-12, the default access for libusb pilot-link has changed
again to use udev, so you may need to remove
/lib/udev/rules.d/69-pilot-link.rules before executing the following.
For more discussion see:
https://bugzilla.redhat.com/show_bug.cgi?id=529259
The Visor module is a backwards compatibility solution to expose the USB
connection of newer Palm handhelds as a serial device, which is what
older versions of pilot-link and dependent packages require to work.
@ -81,4 +74,4 @@ on their serial port (e.g. /dev/ttyS0) or /dev/pilot can be symlinked to
the serial port.
Kevin R. Page, 2007-12-11
Alex Lancaster, 2009-11-15
Alex Lancaster, 2008-01-07

View File

@ -0,0 +1,71 @@
? bluetooth-session-register.diff
? cscope.out
? pilot-link-0.12.0.tar.gz
? bindings/Python/setup-standalone.py
? src/pilot-csd
? src/pilot-debugsh
? src/pilot-dlpsh
? src/pilot-foto-treo600
? src/pilot-foto-treo650
? src/pilot-getram
? src/pilot-getrom
? src/pilot-getromtoken
? src/pilot-hinotes
? src/pilot-install-datebook
? src/pilot-install-expenses
? src/pilot-install-hinote
? src/pilot-install-memo
? src/pilot-install-netsync
? src/pilot-install-todo
? src/pilot-install-todos
? src/pilot-install-user
? src/pilot-memos
? src/pilot-nredir
? src/pilot-read-expenses
? src/pilot-read-ical
? src/pilot-read-notepad
? src/pilot-read-palmpix
? src/pilot-read-screenshot
? src/pilot-read-todos
? src/pilot-read-veo
? src/pilot-reminders
Index: libpisock/bluetooth.c
===================================================================
RCS file: /cvs/pilot-link/pilot-link_src/libpisock/bluetooth.c,v
retrieving revision 1.3
diff -a -u -p -r1.3 bluetooth.c
--- libpisock/bluetooth.c 8 Feb 2007 17:08:52 -0000 1.3
+++ libpisock/bluetooth.c 28 Dec 2007 12:31:24 -0000
@@ -167,19 +167,19 @@ add_hotsync(sdp_session_t *session,
}
static int
-register_sdp (uint32_t *handle, int *channel, sdp_session_t *sess)
+register_sdp (uint32_t *handle, int *channel, sdp_session_t **sess)
{
svc_info_t si;
bdaddr_t interface;
bacpy (&interface, BDADDR_ANY);
- sess = sdp_connect (&interface, BDADDR_LOCAL, 0);
+ *sess = sdp_connect (&interface, BDADDR_LOCAL, 0);
- if (!sess)
+ if (*sess == NULL)
return -1;
memset (&si, 0, sizeof(si));
si.name = "HOTSYNC";
- return add_hotsync (sess, 0, &interface, &si, handle, channel);
+ return add_hotsync (*sess, 0, &interface, &si, handle, channel);
}
static int
@@ -325,7 +325,7 @@ pi_bluetooth_protocol (pi_device_t *dev)
static void
pi_bluetooth_register_hotsync_sdp (struct pi_bluetooth_data *data)
{
- if (register_sdp (&data->handle, &data->channel, data->sess) < 0) {
+ if (register_sdp (&data->handle, &data->channel, &data->sess) < 0) {
data->channel = -1;
data->handle = 0;
data->sess = NULL;

View File

@ -0,0 +1,13 @@
diff -up pilot-link-0.12.2/libpisock/usb.c.pom pilot-link-0.12.2/libpisock/usb.c
--- pilot-link-0.12.2/libpisock/usb.c.pom 2008-02-07 15:03:58.000000000 +0100
+++ pilot-link-0.12.2/libpisock/usb.c 2008-02-07 15:02:51.000000000 +0100
@@ -810,7 +810,8 @@ pi_usb_dev_t known_devices[] = {
{
.vendor = 0x0830,
.product = 0x0061,
+ .idstr = "Zire 31, 72, Z22",
+ .flags = USB_INIT_TAPWAVE,
- .idstr = "Zire 31, 72",
},
{

View File

@ -1,6 +1,5 @@
diff -up pilot-link-0.12.5/libpisock/serial.c.pom pilot-link-0.12.5/libpisock/serial.c
--- pilot-link-0.12.5/libpisock/serial.c.pom 2006-10-12 16:21:22.000000000 +0200
+++ pilot-link-0.12.5/libpisock/serial.c 2010-06-24 10:35:48.000000000 +0200
--- pilot-link-0.12.2/libpisock/serial.c.pom 2006-10-12 16:21:22.000000000 +0200
+++ pilot-link-0.12.2/libpisock/serial.c 2007-08-29 16:31:25.000000000 +0200
@@ -286,7 +286,7 @@ pi_serial_connect(pi_socket_t *ps, struc
data->establishrate = data->rate = 57600;
}
@ -19,9 +18,8 @@ diff -up pilot-link-0.12.5/libpisock/serial.c.pom pilot-link-0.12.5/libpisock/se
int save_errno = errno;
#ifdef MAXPATHLEN
char realport[MAXPATHLEN];
diff -up pilot-link-0.12.5/libpisock/usb.c.pom pilot-link-0.12.5/libpisock/usb.c
--- pilot-link-0.12.5/libpisock/usb.c.pom 2010-06-24 09:24:56.000000000 +0200
+++ pilot-link-0.12.5/libpisock/usb.c 2010-06-24 10:36:08.000000000 +0200
--- pilot-link-0.12.2/libpisock/usb.c.pom 2007-02-09 15:26:09.000000000 +0100
+++ pilot-link-0.12.2/libpisock/usb.c 2007-08-29 16:23:42.000000000 +0200
@@ -267,7 +267,7 @@ pi_usb_connect(pi_socket_t *ps, struct s
data->establishrate = data->rate = 57600;
}
@ -40,3 +38,14 @@ diff -up pilot-link-0.12.5/libpisock/usb.c.pom pilot-link-0.12.5/libpisock/usb.c
if (result < 0)
return result;
--- pilot-link-0.12.2/src/pilot-schlep.c.pom 2006-10-12 16:21:21.000000000 +0200
+++ pilot-link-0.12.2/src/pilot-schlep.c 2007-08-29 16:44:40.000000000 +0200
@@ -38,7 +38,7 @@ static int Fetch(int sd, char *filename)
fd;
pi_buffer_t *buffer;
- fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC);
+ fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0666);
if (fd < 0)
return -1;

View File

@ -1,6 +1,6 @@
diff -up pilot-link-0.12.4/libpisock/usb.c.clio pilot-link-0.12.4/libpisock/usb.c
--- pilot-link-0.12.4/libpisock/usb.c.clio 2009-05-28 14:55:43.000000000 +0200
+++ pilot-link-0.12.4/libpisock/usb.c 2009-05-28 14:56:57.000000000 +0200
diff -up pilot-link-0.12.3/libpisock/usb.c.clio pilot-link-0.12.3/libpisock/usb.c
--- pilot-link-0.12.3/libpisock/usb.c.clio 2008-09-19 12:06:52.000000000 +0200
+++ pilot-link-0.12.3/libpisock/usb.c 2008-09-23 10:57:22.000000000 +0200
@@ -655,6 +655,7 @@ pi_usb_dev_t known_devices[] = {
.vendor = 0x054c,
.product = 0x0066,
@ -9,3 +9,11 @@ diff -up pilot-link-0.12.4/libpisock/usb.c.clio pilot-link-0.12.4/libpisock/usb.
},
{
@@ -698,6 +699,7 @@ pi_usb_dev_t known_devices[] = {
.vendor = 0x054c,
.product = 0x0169,
.idstr = "Sony TJ",
+ .flags = USB_INIT_SONY_CLIE,
},
/* AlphaSmart */

View File

@ -0,0 +1,15 @@
diff -up pilot-link-0.12.3/include/pi-md5.h.md5 pilot-link-0.12.3/include/pi-md5.h
--- pilot-link-0.12.3/include/pi-md5.h.md5 2006-10-17 15:24:07.000000000 +0200
+++ pilot-link-0.12.3/include/pi-md5.h 2007-12-11 08:47:56.000000000 +0100
@@ -13,8 +13,10 @@
#ifndef MD5_H
#define MD5_H
+#include <stdint.h>
+
#define UINT8 unsigned char
-#define UINT32 unsigned long
+#define UINT32 uint32_t
struct MD5Context {
UINT32 buf[4];

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,24 +0,0 @@
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

@ -1,22 +0,0 @@
diff -ur pilot-link-0.12.5.orig/configure pilot-link-0.12.5/configure
--- pilot-link-0.12.5.orig/configure 2010-02-07 04:42:29.000000000 +0100
+++ pilot-link-0.12.5/configure 2014-05-09 15:36:30.466127800 +0200
@@ -2604,12 +2604,12 @@
enable_werror=no
-save_CFLAGS="$CFLAGS"
-CFLAGS=`echo $save_CFLAGS | sed -e s/-Werror//g`
-CXXFLAGS=`echo $save_CXXFLAGS | sed -e s/-Werror//g`
-if test "x$CFLAGS" != "x$save_CFLAGS"; then
- enable_werror="yes"
-fi
+#save_CFLAGS="$CFLAGS"
+#CFLAGS=`echo $save_CFLAGS | sed -e s/-Werror//g`
+#CXXFLAGS=`echo $save_CXXFLAGS | sed -e s/-Werror//g`
+#if test "x$CFLAGS" != "x$save_CFLAGS"; then
+# enable_werror="yes"
+#fi
ac_aux_dir=

View File

@ -1,13 +0,0 @@
diff -up pilot-link-0.12.5/doc/man/pilot-install-expenses.1.pom pilot-link-0.12.5/doc/man/pilot-install-expenses.1
--- pilot-link-0.12.5/doc/man/pilot-install-expenses.1.pom 2010-02-07 04:43:11.000000000 +0100
+++ pilot-link-0.12.5/doc/man/pilot-install-expenses.1 2011-03-09 17:12:30.000000000 +0100
@@ -76,7 +76,7 @@ Add the number of attendees to the expen
\fB\-\-city\fR \fBSTRING\fR
.PP
-Add entries to the "City" field in the expense record\&. These are free\-form values, and can be the name of the location, city, or town that the expense record occured in\&.
+Add entries to the "City" field in the expense record\&. These are free\-form values, and can be the name of the location, city, or town that the expense record occurred in\&.
\fB\-n\fR,
\fB\-\-note\fR \fBSTRING\fR
diff -up pilot-link-0.12.5/doc/man/pilot-install-netsync.1.pom pilot-link-0.12.5/doc/man/pilot-install-netsync.1

View File

@ -1,584 +0,0 @@
diff -up pilot-link-0.12.5/bindings/Perl/Pilot.xs.symbol pilot-link-0.12.5/bindings/Perl/Pilot.xs
--- pilot-link-0.12.5/bindings/Perl/Pilot.xs.symbol 2007-11-12 18:49:54.000000000 +0100
+++ pilot-link-0.12.5/bindings/Perl/Pilot.xs 2011-07-01 16:03:35.080212371 +0200
@@ -47,6 +47,10 @@
#include "const-c.inc"
+#ifndef sv_yes
+#define sv_yes PL_sv_yes
+#define sv_no PL_sv_no
+#endif
typedef unsigned char * CPTR;
@@ -160,7 +164,7 @@ SvChar4(arg)
#define pack_dbinfo(arg, var, failure) { \
if (failure < 0) { \
- arg = &sv_undef; \
+ arg = &PL_sv_undef; \
self->errnop = failure; \
} else { \
HV * i = newHV(); \
@@ -214,15 +218,15 @@ SvChar4(arg)
var.createDate = (s = hv_fetch(i, "createDate", 10, 0)) ? SvIV(*s) : 0;\
var.modifyDate = (s = hv_fetch(i, "modifyDate", 10, 0)) ? SvIV(*s) : 0;\
var.backupDate = (s = hv_fetch(i, "backupDate", 10, 0)) ? SvIV(*s) : 0;\
- if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,na) : 0) \
- strncpy(var.name, SvPV(*s, na), sizeof(var.name)); \
+ if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,PL_na) : 0) \
+ strncpy(var.name, SvPV(*s, PL_na), sizeof(var.name)); \
} else {\
croak("argument is not a hash reference"); \
}
#define pack_userinfo(arg, var, failure) { \
if (failure < 0) { \
- arg = &sv_undef; \
+ arg = &PL_sv_undef; \
self->errnop = failure; \
} else { \
HV * i = newHV(); \
@@ -246,8 +250,8 @@ SvChar4(arg)
var.lastSyncPC = (s = hv_fetch(i, "lastSyncPC", 10, 0)) ? SvIV(*s) : 0;\
var.lastSyncDate = (s = hv_fetch(i, "lastSyncDate", 12, 0)) ? SvIV(*s) : 0;\
var.successfulSyncDate = (s = hv_fetch(i, "successfulSyncDate", 18, 0)) ? SvIV(*s) : 0;\
- if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,na) : 0)\
- strncpy(var.username, SvPV(*s, na), sizeof(var.username));\
+ if ((s = hv_fetch(i, "name", 4, 0)) ? SvPV(*s,PL_na) : 0)\
+ strncpy(var.username, SvPV(*s, PL_na), sizeof(var.username));\
} else {\
croak("argument is not a hash reference");\
}
@@ -287,7 +291,7 @@ SvChar4(arg)
}\
} else {\
self->errnop = result;\
- PUSHs(&sv_undef);\
+ PUSHs(&PL_sv_undef);\
}
#define PackSI\
@@ -329,7 +333,7 @@ SvChar4(arg)
}\
} else {\
self->errnop = result;\
- PUSHs(&sv_undef);\
+ PUSHs(&PL_sv_undef);\
}
#define PackRecord {\
@@ -421,7 +425,7 @@ SvChar4(arg)
}\
} else {\
self->errnop = result;\
- PUSHs(&sv_undef);\
+ PUSHs(&PL_sv_undef);\
}
#define PackResource\
@@ -473,7 +477,7 @@ SvChar4(arg)
}\
} else {\
self->errnop = result;\
- PUSHs(&sv_undef);\
+ PUSHs(&PL_sv_undef);\
}
#define PackPref\
@@ -536,7 +540,7 @@ SvChar4(arg)
croak("Unable to create resource");\
} else {\
self->errnop = result;\
- PUSHs(&sv_undef);\
+ PUSHs(&PL_sv_undef);\
}
void doUnpackCategory(HV * self, struct CategoryAppInfo * c)
@@ -576,7 +580,7 @@ void doPackCategory(HV * self, struct Ca
if ((s = hv_fetch(self, "categoryName", 12, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV))
for (i=0;i<16;i++)
- strncpy(c->name[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16);
+ strncpy(c->name[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16);
else
for (i=0;i<16;i++)
strcpy(c->name[i], "");
@@ -602,7 +606,7 @@ void doPackCategory(HV * self, struct Ca
int SvList(SV * arg, char **list)
{
int i;
- char * str = SvPV(arg, na);
+ char * str = SvPV(arg, PL_na);
for (i=0;list[i];i++)
if (strcasecmp(list[i], str)==0)
return i;
@@ -781,11 +785,11 @@ Pack(record)
croak("Invalid advance unit %d encountered", u);
}
} else {
- if (strEQ(SvPV(*s, na), "minutes"))
+ if (strEQ(SvPV(*s, PL_na), "minutes"))
u = 0;
- else if (strEQ(SvPV(*s, na), "hours"))
+ else if (strEQ(SvPV(*s, PL_na), "hours"))
u = 1;
- else if (strEQ(SvPV(*s, na), "days"))
+ else if (strEQ(SvPV(*s, PL_na), "days"))
u = 2;
else
croak("Invalid advance unit %d encountered", u);
@@ -850,10 +854,10 @@ Pack(record)
}
}
- a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,na) : 0;
+ a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,PL_na) : 0;
if (!a.description)
croak("appointments must contain a description");
- a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,na) : 0;
+ a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,PL_na) : 0;
if (pack_Appointment(&a, &pibuf, datebook_v1) < 0) {
croak("pack_Appointment failed");
@@ -897,7 +901,7 @@ UnpackAppBlock(record)
}
SvPV(record,len);
- if (unpack_AppointmentAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_AppointmentAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
doUnpackCategory(ret, &a.category);
@@ -1023,8 +1027,8 @@ Pack(record)
a.indefinite = 1;
}
- a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,na) : 0;
- a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,na) : 0;
+ a.description = (s = hv_fetch(h, "description", 11, 0)) ? SvPV(*s,PL_na) : 0;
+ a.note = (s = hv_fetch(h, "note", 4, 0)) ? SvPV(*s,PL_na) : 0;
if (pack_ToDo(&a, &pibuf, todo_v1) < 0) {
croak("pack_ToDo failed");
@@ -1065,7 +1069,7 @@ UnpackAppBlock(record)
}
SvPV(record,len);
- if (unpack_ToDoAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_ToDoAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
doUnpackCategory(ret, &a.category);
@@ -1160,7 +1164,7 @@ Unpack(record)
hv_store(ret, "entry", 5, newRV_noinc((SV*)e), 0);
for (i=0;i<19;i++) {
- av_push(e, a.entry[i] ? newSVpv(a.entry[i],0) : &sv_undef);
+ av_push(e, a.entry[i] ? newSVpv(a.entry[i],0) : &PL_sv_undef);
}
hv_store(ret, "showPhone", 9, newSViv(a.showPhone), 0);
@@ -1200,7 +1204,7 @@ Pack(record)
if ((s = hv_fetch(h, "entry", 5, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV))
for (i=0;i<19;i++)
- a.entry[i] = ((s=av_fetch(av, i, 0)) && SvOK(*s)) ? SvPV(*s,na) : 0;
+ a.entry[i] = ((s=av_fetch(av, i, 0)) && SvOK(*s)) ? SvPV(*s,PL_na) : 0;
else
for (i=0;i<19;i++)
a.entry[i] = 0;
@@ -1249,7 +1253,7 @@ UnpackAppBlock(record)
}
SvPV(record,len);
- if (unpack_AddressAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_AddressAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
doUnpackCategory(ret, &a.category);
@@ -1309,13 +1313,13 @@ PackAppBlock(record)
a.sortByCompany = (s = hv_fetch(h, "sortByCompany", 13, 0)) ? SvIV(*s) : 0;
if ((s = hv_fetch(h, "label", 5, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV))
- for (i=0;i<22;i++) strncpy(a.labels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16);
+ for (i=0;i<22;i++) strncpy(a.labels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16);
else
for (i=0;i<22;i++) a.labels[i][0] = 0;
for (i=0;i<22;i++) a.labels[i][15] = 0;
if ((s = hv_fetch(h, "phoneLabel", 10, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(av=(AV*)SvRV(*s))==SVt_PVAV))
- for (i=0;i<8;i++) strncpy(a.phoneLabels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,na) : "", 16);
+ for (i=0;i<8;i++) strncpy(a.phoneLabels[i], (s=av_fetch(av, i, 0)) ? SvPV(*s,PL_na) : "", 16);
else
for (i=0;i<8;i++) a.phoneLabels[i][0] = 0;
for (i=0;i<8;i++) a.phoneLabels[i][15] = 0;
@@ -1396,7 +1400,7 @@ Pack(record)
else {
if ((s = hv_fetch(h, "text", 4, 0)))
- a.text = SvPV(*s,na);
+ a.text = SvPV(*s,PL_na);
else
a.text = 0;
@@ -1438,7 +1442,7 @@ UnpackAppBlock(record)
}
SvPV(record,len);
- if (unpack_MemoAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_MemoAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
doUnpackCategory(ret, &a.category);
@@ -1510,7 +1514,7 @@ Unpack(record)
SvPV(record,len);
if (len > 0) { /* len == 0 if deleted flag is set */
- if (unpack_Expense(&e, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_Expense(&e, (CPTR)SvPV(record, PL_na), len)>0) {
hv_store(ret, "date", 4, newRV_noinc((SV*)tmtoav(&e.date)), 0);
hv_store(ret, "type", 4, newSVlist(e.type,ExpenseTypeNames),0);
@@ -1570,15 +1574,15 @@ Pack(record)
avtotm((AV*)SvRV(*s), &e.date);
else
croak("expense record must contain date");
- if ((s = hv_fetch(h, "amount", 6, 0))) e.amount = SvPV(*s,na);
+ if ((s = hv_fetch(h, "amount", 6, 0))) e.amount = SvPV(*s,PL_na);
else e.amount = 0;
- if ((s = hv_fetch(h, "vendor", 6, 0))) e.vendor = SvPV(*s,na);
+ if ((s = hv_fetch(h, "vendor", 6, 0))) e.vendor = SvPV(*s,PL_na);
else e.vendor = 0;
- if ((s = hv_fetch(h, "city", 4, 0))) e.city = SvPV(*s,na);
+ if ((s = hv_fetch(h, "city", 4, 0))) e.city = SvPV(*s,PL_na);
else e.city = 0;
- if ((s = hv_fetch(h, "attendess", 9, 0))) e.attendees = SvPV(*s,na);
+ if ((s = hv_fetch(h, "attendess", 9, 0))) e.attendees = SvPV(*s,PL_na);
else e.attendees = 0;
- if ((s = hv_fetch(h, "note", 4, 0))) e.note = SvPV(*s,na);
+ if ((s = hv_fetch(h, "note", 4, 0))) e.note = SvPV(*s,PL_na);
else e.note = 0;
len = pack_Expense(&e, mybuf, 0xffff);
@@ -1619,7 +1623,7 @@ UnpackAppBlock(record)
}
SvPV(record,len);
- if (unpack_ExpenseAppInfo(&e, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_ExpenseAppInfo(&e, (CPTR)SvPV(record, PL_na), len)>0) {
hv_store(ret, "sortOrder", 9, newSVlist(e.sortOrder,ExpenseSortNames),0);
a = newAV();
@@ -1662,15 +1666,15 @@ PackAppBlock(record)
HV * hv;
if ((s=av_fetch(av, i, 0)) && SvOK(*s) && SvRV(*s) && (SvTYPE(hv=(HV*)SvRV(*s))==SVt_PVHV)) {
if (s = hv_fetch(hv, "name", 4, 0)) {
- strncpy(e.currencies[i].name, SvPV(*s, na), 16);
+ strncpy(e.currencies[i].name, SvPV(*s, PL_na), 16);
e.currencies[i].name[15] = 0;
}
if (s = hv_fetch(hv, "symbol", 6, 0)) {
- strncpy(e.currencies[i].symbol, SvPV(*s, na), 4);
+ strncpy(e.currencies[i].symbol, SvPV(*s, PL_na), 4);
e.currencies[i].symbol[3] = 0;
}
if (s = hv_fetch(hv, "rate", 4, 0)) {
- strncpy(e.currencies[i].rate, SvPV(*s, na), 8);
+ strncpy(e.currencies[i].rate, SvPV(*s, PL_na), 8);
e.currencies[i].rate[7] = 0;
}
}
@@ -1718,7 +1722,7 @@ UnpackPref(record)
}
SvPV(record,len);
- if (unpack_ExpensePref(&a, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_ExpensePref(&a, (CPTR)SvPV(record, PL_na), len)>0) {
hv_store(ret, "unitOfDistance", 14, newSVlist(a.unitOfDistance, ExpenseDistanceNames), 0);
hv_store(ret, "currentCategory", 15, newSViv(a.currentCategory), 0);
@@ -1811,7 +1815,7 @@ Unpack(record)
SvPV(record,len);
if (len > 0) { /* len == 0 if deleted flag is set */
- if (unpack_Mail(&a, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_Mail(&a, (CPTR)SvPV(record, PL_na), len)>0) {
if (a.subject) hv_store(ret, "subject", 7, newSVpv(a.subject,0), 0);
if (a.from) hv_store(ret, "from", 4, newSVpv(a.from,0), 0);
@@ -1858,14 +1862,14 @@ Pack(record)
}
else {
- a.subject = (s = hv_fetch(h, "subject", 7, 0)) ? SvPV(*s,na) : 0;
- a.from = (s = hv_fetch(h, "from", 4, 0)) ? SvPV(*s,na) : 0;
- a.to = (s = hv_fetch(h, "to", 2, 0)) ? SvPV(*s,na) : 0;
- a.cc = (s = hv_fetch(h, "cc", 2, 0)) ? SvPV(*s,na) : 0;
- a.bcc = (s = hv_fetch(h, "bcc", 3, 0)) ? SvPV(*s,na) : 0;
- a.replyTo = (s = hv_fetch(h, "replyTo", 7, 0)) ? SvPV(*s,na) : 0;
- a.sentTo = (s = hv_fetch(h, "sentTo", 6, 0)) ? SvPV(*s,na) : 0;
- a.body = (s = hv_fetch(h, "body", 4, 0)) ? SvPV(*s,na) : 0;
+ a.subject = (s = hv_fetch(h, "subject", 7, 0)) ? SvPV(*s,PL_na) : 0;
+ a.from = (s = hv_fetch(h, "from", 4, 0)) ? SvPV(*s,PL_na) : 0;
+ a.to = (s = hv_fetch(h, "to", 2, 0)) ? SvPV(*s,PL_na) : 0;
+ a.cc = (s = hv_fetch(h, "cc", 2, 0)) ? SvPV(*s,PL_na) : 0;
+ a.bcc = (s = hv_fetch(h, "bcc", 3, 0)) ? SvPV(*s,PL_na) : 0;
+ a.replyTo = (s = hv_fetch(h, "replyTo", 7, 0)) ? SvPV(*s,PL_na) : 0;
+ a.sentTo = (s = hv_fetch(h, "sentTo", 6, 0)) ? SvPV(*s,PL_na) : 0;
+ a.body = (s = hv_fetch(h, "body", 4, 0)) ? SvPV(*s,PL_na) : 0;
a.read = (s = hv_fetch(h, "read", 4, 0)) ? SvIV(*s) : 0;
a.signature = (s = hv_fetch(h, "signature", 9, 0)) ? SvIV(*s) : 0;
@@ -1913,7 +1917,7 @@ UnpackAppBlock(record)
}
SvPV(record,len);
- if (unpack_MailAppInfo(&a, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_MailAppInfo(&a, (CPTR)SvPV(record, PL_na), len)>0) {
doUnpackCategory(ret, &a.category);
@@ -1989,7 +1993,7 @@ UnpackSyncPref(record)
}
SvPV(record,len);
- if (unpack_MailSyncPref(&a, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_MailSyncPref(&a, (CPTR)SvPV(record, PL_na), len)>0) {
hv_store(ret, "syncType", 8, newSVlist(a.syncType, MailSyncTypeNames), 0);
hv_store(ret, "getHigh", 7, newSViv(a.getHigh), 0);
@@ -2033,9 +2037,9 @@ PackSyncPref(record, id)
a.getContaining = (s=hv_fetch(h,"getContaining",13,0)) ? SvIV(*s) : 0;
a.truncate = (s=hv_fetch(h,"truncate",8,0)) ? SvIV(*s) : 0;
- a.filterTo = (s=hv_fetch(h,"filterTo",8,0)) ? SvPV(*s,na) : 0;
- a.filterFrom = (s=hv_fetch(h,"filterFrom",10,0)) ? SvPV(*s,na) : 0;
- a.filterSubject = (s=hv_fetch(h,"filterSubject",13,0)) ? SvPV(*s,na) : 0;
+ a.filterTo = (s=hv_fetch(h,"filterTo",8,0)) ? SvPV(*s,PL_na) : 0;
+ a.filterFrom = (s=hv_fetch(h,"filterFrom",10,0)) ? SvPV(*s,PL_na) : 0;
+ a.filterSubject = (s=hv_fetch(h,"filterSubject",13,0)) ? SvPV(*s,PL_na) : 0;
len = pack_MailSyncPref(&a, mybuf, 0xffff);
@@ -2073,7 +2077,7 @@ UnpackSignaturePref(record)
}
SvPV(record,len);
- if (unpack_MailSignaturePref(&a, (CPTR)SvPV(record, na), len)>0) {
+ if (unpack_MailSignaturePref(&a, (CPTR)SvPV(record, PL_na), len)>0) {
if (a.signature)
hv_store(ret, "signature", 9, newSVpv(a.signature, 0), 0);
@@ -2099,7 +2103,7 @@ PackSignaturePref(record, id)
RETVAL = record;
else {
- a.signature = (s=hv_fetch(h,"signature",9,0)) ? SvPV(*s,na) : 0;
+ a.signature = (s=hv_fetch(h,"signature",9,0)) ? SvPV(*s,PL_na) : 0;
len = pack_MailSignaturePref(&a, mybuf, 0xffff);
@@ -2129,7 +2133,7 @@ write(socket, msg)
{
STRLEN len;
SvPV(msg, len);
- RETVAL = pi_write(socket,SvPV(msg,na),len);
+ RETVAL = pi_write(socket,SvPV(msg,PL_na),len);
}
SV *
@@ -2146,7 +2150,7 @@ read(socket, len)
if (result >=0)
RETVAL = newSVpvn((char *) pibuf.data, result);
else
- RETVAL = &sv_undef;
+ RETVAL = &PL_sv_undef;
}
OUTPUT:
RETVAL
@@ -2282,7 +2286,7 @@ class(self, name=0)
croak("DBClasses doesn't exist");
if (SvOK(name)) {
(void)SvPV(name,len);
- s = hv_fetch(h, SvPV(name,na), len, 0);
+ s = hv_fetch(h, SvPV(name,PL_na), len, 0);
}
if (!s)
s = hv_fetch(h, "", 0, 0);
@@ -2577,7 +2581,7 @@ getRecords(self)
{
int result = dlp_ReadOpenDBInfo(self->socket, self->handle, &RETVAL);
if (result < 0) {
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
self->errnop = result;
}
}
@@ -2745,7 +2749,7 @@ setResource(self, data)
result = dlp_WriteResource(self->socket, self->handle, type, id, c, len);
if (result < 0) {
self->errnop = result;
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
} else
RETVAL = newSViv(result);
}
@@ -2798,7 +2802,7 @@ getPref(self, id=0, backup=1)
r = dlp_CloseDB(self->socket, self->handle);
result = dlp_ReadAppPreference(self->socket, creator, id, backup, 0xFFFF, mybuf, &len, &version);
if (pi_version(self->socket)< 0x101)
- r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,na), &self->handle);
+ r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,PL_na), &self->handle);
ReturnReadPref(mybuf, len);
}
@@ -2822,10 +2826,10 @@ setPref(self, data)
r = dlp_CloseDB(self->socket, self->handle);
result = dlp_WriteAppPreference(self->socket, creator, id, backup, version, buf, len);
if (pi_version(self->socket)< 0x101)
- r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,na), &self->handle);
+ r = dlp_OpenDB(self->socket, self->dbcard, self->dbmode, SvPV(self->dbname,PL_na), &self->handle);
if (result < 0) {
self->errnop = result;
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
} else {
RETVAL = newSViv(result);
}
@@ -2861,7 +2865,7 @@ setPrefRaw(self, data, number, version,
result = dlp_WriteAppPreference(self->socket, creator, number, backup, version, buf, len);
if (result < 0) {
self->errnop = result;
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
} else {
RETVAL = newSViv(result);
}
@@ -2904,7 +2908,7 @@ getTime(self)
int result = dlp_GetSysDateTime(self->socket, &t);
if (result < 0) {
self->errnop = result;
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
} else
RETVAL = newSViv(t);
}
@@ -2929,7 +2933,7 @@ getSysInfo(self)
int result = dlp_ReadSysInfo(self->socket, &si);
if (result < 0) {
self->errnop = result;
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
} else {
HV * i = newHV();
hv_store(i, "romVersion", 10, newSViv(si.romVersion), 0);\
@@ -2951,7 +2955,7 @@ getCardInfo(self, cardno=0)
int result = dlp_ReadStorageInfo(self->socket, cardno, &c);
if (result < 0) {
self->errnop = result;
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
} else {
HV * i = newHV();
hv_store(i, "card", 6, newSViv(c.card), 0);\
@@ -3037,7 +3041,7 @@ newPref(self, creator, id=0, version=0,
croak("Default PrefClass not defined");
PUSHMARK(sp);
XPUSHs(newSVsv(*s));
- XPUSHs(&sv_undef);
+ XPUSHs(&PL_sv_undef);
XPUSHs(sv_2mortal(newSVChar4(creator)));
if (id)
XPUSHs(id);
@@ -3107,7 +3111,7 @@ open(self, name, mode=0, cardno=0)
result = dlp_OpenDB(self->socket, cardno, nummode, name, &handle);
if (result<0) {
self->errnop = result;
- RETVAL = &sv_undef;
+ RETVAL = &PL_sv_undef;
} else {
int type;
PDA__Pilot__DLP__DB * x = malloc(sizeof(PDA__Pilot__DLP__DB));
@@ -3156,7 +3160,7 @@ create(self, name, creator, type, flags,
int result = dlp_CreateDB(self->socket, creator, type, cardno, flags, version, name, &handle);
if (result<0) {
self->errnop = result;
- RETVAL = &sv_undef;
+ RETVAL = &PL_sv_undef;
} else {
PDA__Pilot__DLP__DB * x = malloc(sizeof(PDA__Pilot__DLP__DB));
SV * sv = newSViv((IV)(void*)x);
@@ -3224,7 +3228,7 @@ setPref(self, data)
result = dlp_WriteAppPreference(self->socket, creator, id, backup, version, buf, len);
if (result < 0) {
self->errnop = result;
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
} else {
RETVAL = newSViv(result);
}
@@ -3248,7 +3252,7 @@ setPrefRaw(self, data, creator, number,
result = dlp_WriteAppPreference(self->socket, creator, number, backup, version, buf, len);
if (result < 0) {
self->errnop = result;
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
} else {
RETVAL = newSViv(result);
}
@@ -3350,7 +3354,7 @@ findDBInfo(self, start, name, creator, t
else
t = 0;
result = dlp_FindDBInfo(self->socket, cardno, start,
- SvOK(name) ? SvPV(name,na) : 0,
+ SvOK(name) ? SvPV(name,PL_na) : 0,
t, c, &info);
pack_dbinfo(RETVAL, info, result);
}
@@ -3367,7 +3371,7 @@ getFeature(self, creator, number)
unsigned long f;
int result;
if ((result = dlp_ReadFeature(self->socket, creator, number, &f))<0) {
- RETVAL = newSVsv(&sv_undef);
+ RETVAL = newSVsv(&PL_sv_undef);
self->errnop = result;
} else {
RETVAL = newSViv(f);
@@ -3397,7 +3401,7 @@ getROMToken(self,token)
}
void
-callApplication(self, creator, type, action, data=&sv_undef)
+callApplication(self, creator, type, action, data=&PL_sv_undef)
PDA::Pilot::DLP *self
Char4 creator
Char4 type
@@ -3410,7 +3414,7 @@ callApplication(self, creator, type, act
int result;
(void)SvPV(data,len);
result = dlp_CallApplication(self->socket, creator,
- type, action, len, SvPV(data,na),
+ type, action, len, SvPV(data,PL_na),
&retcode, &pibuf);
EXTEND(sp, 2);
if (result >= 0) {
@@ -3419,7 +3423,7 @@ callApplication(self, creator, type, act
PUSHs(sv_2mortal(newSViv(retcode)));
}
} else
- PUSHs(&sv_undef);
+ PUSHs(&PL_sv_undef);
}
int
@@ -3530,7 +3534,7 @@ class(self, name=0)
croak("DBClasses doesn't exist");
if (SvOK(name)) {
(void)SvPV(name, len);
- s = hv_fetch(h, SvPV(name, na), len, 0);
+ s = hv_fetch(h, SvPV(name, PL_na), len, 0);
}
if (!s)
s = hv_fetch(h, "", 0, 0);

View File

@ -1,37 +1,47 @@
%global perl_version %(eval "`%{__perl} -V:version`"; echo $version)
%define support_perl 1
%define perl_version %(eval "`%{__perl} -V:version`"; echo $version)
Summary: File transfer utilities between Linux and PalmPilots
Name: pilot-link
Version: 0.12.5
Release: 43%{?dist}
Version: 0.12.3
Release: 16%{?dist}
Epoch: 2
# libpisock/md5.c Public Domain
# libpisock/blob.c LGPLv2+
# libpisock/contact.c GPLv2
# kittykiller.c GPLv2+
License: GPLv2 and GPLv2+ and LGPLv2+ and Public Domain
License: GPLv2 and GPLv2+ and LGPLv2+ and TCL
Group: Applications/Communications
Summary: File transfer utilities between Linux and PalmPilots
URL: http://www.pilot-link.org/
Source0: http://downloads.pilot-link.org/%{name}-%{version}.tar.bz2
Source1: blacklist-visor
Source2: README.fedora
Source3: 60-pilot.perms
Source4: 69-pilot-link.rules
Patch0: pilot-link-0.12.1-var.patch
Patch1: pilot-link-0.12.2-open.patch
Patch2: pilot-link-0.12.3-clio.patch
Patch3: pilot-link-0.12.5-mp.patch
Patch4: pilot-link-0.12.5-redefinePerlsymbols.patch
Patch5: pilot-link-0.12.5-compiler_warnings.patch
Patch6: pilot-link-0.12.5-ftbfs-f19.patch
Patch7: pilot-link-0.12.5-aarch64.patch
Patch8: pilot-link-0.12.5-ftbfs-f21.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: pilot-link-%{version}.tar.bz2
Source3: blacklist-visor
Source4: README.fedora
Source5: 60-pilot.perms
ExcludeArch: s390 s390x
BuildRequires: gcc
BuildRequires: perl(ExtUtils::MakeMaker), libpng-devel, readline-devel
BuildRequires: libusb-devel, bluez-libs-devel, perl-devel, perl-generators, perl(Devel::PPPort)
Requires: pilot-link-libs = %{epoch}:%{version}-%{release}
#Patch1: pilot-link-0.11.0-perlmd5.patch # May be still applied
#Patch2: pilot-link-0.11.0-perlpollute.patch # May be still applied
#Patch3: pilot-link-0.11.2-malsync.patch # May be still applied
Patch4: pilot-link-0.12.1-var.patch
Patch6: pilot-link-0.12.2-open.patch
Patch7: pilot-link-0.12.3-md5.patch
Patch8: bluetooth-session-register.diff
Patch9: pilot-link-0.12.2-Zire.patch
Patch10: pilot-link-0.12.3-clio.patch
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
%if %{support_perl}
Requires: perl(:MODULE_COMPAT_%{perl_version})
BuildRequires: perl(ExtUtils::MakeMaker)
%endif
BuildRequires: libpng-devel
BuildRequires: readline-devel
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
BuildRequires: libusb-devel
BuildRequires: bluez-libs-devel
%description
This suite of tools allows you to upload and download programs and
@ -46,8 +56,11 @@ Hat Linux system.
%package devel
Summary: PalmPilot development header files
Requires: pilot-link-libs = %{epoch}:%{version}-%{release}
Requires: libpng-devel, readline-devel
Group: Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: libpng-devel
Requires: readline-devel
%description devel
This package contains the development headers that are used to build
@ -57,79 +70,69 @@ necessary to build static pilot applications.
If you want to develop PalmPilot synchronizing applications, you'll
need to install pilot-link-devel.
%package perl
Summary: PalmPilot utilies written in perl
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: perl(:MODULE_COMPAT_%{perl_version})
%description perl
This package contains utilities that depend on perl
%package libs
Summary: PalmPilot libraries
%description libs
Libraries for applications communicating with PalmPilot
%{perl_default_filter}
%prep
%prep
%setup -q
%patch0 -p1 -b .var
%patch1 -p1 -b .open
%patch2 -p1 -b .clio
%patch3 -p1 -b .mp
%patch4 -p1 -b .symbol
%patch5 -p1 -b .compiler
%patch6 -p1 -b .ftbfs-f19
%patch7 -p1 -b .aarch64
%patch8 -p1 -b .ftbfs-f21
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
mv ChangeLog.aux ChangeLog
iconv -f windows-1252 -t UTF8 NEWS > NEWS.aux
mv NEWS.aux NEWS
%patch4 -p1 -b .var
%if %{support_perl}
#%patch1 -p1 -b .perlmd5
#%patch2 -p1 -b .perlpollute
#%patch3 -p1 -b .malsync
%endif
%patch6 -p1 -b .open
%patch7 -p1 -b .md5
%patch8 -p0 -b .bluetooth-sdp
%patch9 -p1 -b .Zire
%patch10 -p1 -b .clio
%build
%configure \
--with-python=no \
--with-itcl=no \
--with-tk=no \
--with-tcl=no \
--with-java=no \
--with-cpp=yes \
--with-perl=yes \
--enable-conduits \
--enable-libusb
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
autoreconf -is
CFLAGS="%{optflags}" %configure \
--with-python=no \
--with-itcl=no \
--with-tk=no \
--with-tcl=no \
--with-java=no \
--with-cpp=yes \
%if %{support_perl}
--with-perl=yes \
%else
--with-perl=no \
%endif
--enable-conduits \
--enable-libusb
make %{?_smp_mflags}
make
%install
make install DESTDIR=%{buildroot} libdir=%{_libdir}
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} libdir=%{_libdir}
make install -C doc/man DESTDIR=%{buildroot} libdir=%{_libdir}
%if %{support_perl}
if test -f bindings/Perl/Makefile.PL ; then
cd bindings/Perl
perl -pi -e 's|^\$libdir =.*|\$libdir = "%{buildroot}%{_libdir}";|g' Makefile.PL
CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS=vendor
make -B || :
make
cd ../..
cd bindings/Perl
perl -pi -e 's|^\$libdir =.*|\$libdir = "%{buildroot}%{_libdir}";|g' Makefile.PL
CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS=vendor
make -B || :
make
cd ../..
fi
%endif
cd bindings/Perl
make pure_install PERL_INSTALL_ROOT=%{buildroot} %{?_smp_mflags}
cd ../..
# remove files and fix perms
find %{buildroot}%{_libdir}/perl5/ -type f -name '.packlist' -exec rm -f {} \;
find %{buildroot}%{_libdir}/perl5/ -type f -name '*.bs' -size 0 -exec rm -f {} \;
find %{buildroot}%{_libdir}/perl5/ -type f -name '*.so' -exec chmod 0755 {} \;
find %{buildroot}%{_libdir}/perl5/ -type f -name '*.pod' -exec rm -f {} \;
rm -f %{buildroot}%{_libdir}/perl5/perllocal.pod
rm -f %{buildroot}%{_libdir}/perl5/*/*/*/PDA/dump.pl
%if %{support_perl}
cd bindings/Perl
make pure_install PERL_INSTALL_ROOT=%{buildroot}
cd ../..
# remove files and fix perms
find %{buildroot}%{_libdir}/perl5/ -type f -name '.packlist' -exec rm -f {} \;
find %{buildroot}%{_libdir}/perl5/ -type f -name '*.bs' -size 0 -exec rm -f {} \;
find %{buildroot}%{_libdir}/perl5/ -type f -name '*.so' -exec chmod 0755 {} \;
rm -f %{buildroot}%{_libdir}/perl5/*/*/perllocal.pod
rm -f %{buildroot}%{_libdir}/perl5/*/*/*/PDA/dump.pl
%else
rm -f %{buildroot}%{_mandir}/man1/ietf2datebook*
%endif
# remove files we don't want to include
rm -f %{buildroot}%{_libdir}/*.la
@ -142,248 +145,49 @@ rm -f %{buildroot}%{_bindir}/pilot-prc
# Put visor to blacklist
mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d/
install -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/modprobe.d/blacklist-visor.conf
install -p -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/modprobe.d/blacklist-visor
# put README.fedora into tree
cp %{SOURCE2} README.fedora
cp %{SOURCE4} README.fedora
# install visor configs to share/udev
install -p -m644 %{SOURCE3} %{buildroot}%{_datadir}/pilot-link/udev
install -p -m644 %{SOURCE5} %{buildroot}%{_datadir}/pilot-link/udev
# now that rules are moved out HAL, install to /lib/udev/
install -d %{buildroot}/lib/udev/rules.d/
install -p -m644 %{SOURCE4} %{buildroot}/lib/udev/rules.d/
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog README NEWS doc/README.usb doc/README.debugging doc/README.libusb README.fedora
%{_libdir}/*.so.*
%if %{support_perl}
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/PDA*
%endif
%{_bindir}/*
%exclude %{_bindir}/pilot-ietf2datebook
%exclude %{_bindir}/pilot-sync-plan
%exclude %{_bindir}/pilot-undelete
%{_datadir}/pilot-link
%{_mandir}/man?/*
%exclude %{_mandir}/man1/ietf2datebook*
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-visor
%files devel
%defattr(-,root,root)
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
%{_includedir}/*
%{_datadir}/aclocal/*.m4
%files perl
%{_bindir}/pilot-ietf2datebook
%{_bindir}/pilot-sync-plan
%{_bindir}/pilot-undelete
%{_mandir}/man1/ietf2datebook*
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/PDA*
%files libs
%doc COPYING
%{_libdir}/*.so.*
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-visor.conf
/lib/udev/rules.d/69-pilot-link.rules
%changelog
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.12.5-43
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 2:0.12.5-42
- Perl 5.30 rebuild
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2:0.12.5-41
- Rebuild for readline 8.0
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.12.5-40
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.12.5-39
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sun Jul 01 2018 Jitka Plesnikova <jplesnik@redhat.com> - 2:0.12.5-38
- Perl 5.28 rebuild
* Thu Jun 28 2018 Nikola Forró <nforro@redhat.com> - 2:0.12.5-37
- Remove ldconfig from scriptlets
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 2:0.12.5-36
- Perl 5.28 rebuild
* Tue Feb 20 2018 Nikola Forró <nforro@redhat.com> - 2:0.12.5-35
- Add missing gcc build dependency
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.12.5-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.12.5-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.12.5-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 2:0.12.5-31
- Perl 5.26 rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.12.5-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 2:0.12.5-29
- Rebuild for readline 7.x
* Sat May 14 2016 Jitka Plesnikova <jplesnik@redhat.com> - 2:0.12.5-28
- Perl 5.24 rebuild
* Tue Apr 19 2016 Nikola Forró <nforro@redhat.com> - 2:0.12.5-27
- Add perl-devel to build dependencies
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2:0.12.5-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.12.5-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Wed Jun 03 2015 Jitka Plesnikova <jplesnik@redhat.com> - 2:0.12.5-24
- Perl 5.22 rebuild
* Wed Oct 29 2014 jchaloup <jchaloup@redhat.com> - 2:0.12.5-23
- Add build dependency on perl(Devel::PPPort)
resolves: #1158434
* Tue Aug 26 2014 Jitka Plesnikova <jplesnik@redhat.com> - 2:0.12.5-22
- Perl 5.20 rebuild
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.12.5-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.12.5-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Fri May 09 2014 Peter Schiffer <pschiffe@redhat.com> - 2:0.12.5-19
- resolves: #1058770
fixed FTBFS on F21
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.12.5-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 2:0.12.5-17
- Perl 5.18 rebuild
* Wed Apr 10 2013 Peter Schiffer <pschiffe@redhat.com> - 2:0.12.5-16
- resolves: #926340
added support for aarch64
- cleaned .spec file
* Mon Feb 25 2013 Peter Schiffer <pschiffe@redhat.com> - 2:0.12.5-15
- 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
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.12.5-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Fri Jun 08 2012 Petr Pisar <ppisar@redhat.com> - 2:0.12.5-12
- Perl 5.16 rebuild
* Fri Jun 01 2012 Peter Schiffer <pschiffe@redhat.com> - 2:0.12.5-11
- related: #757011
cleaned patch
- resolves: #733987
added requires for pilot-link-libs to pilot-link, removed obsoletes
pilot-link from pilot-link-libs
- resolves: #733989
moved udev rules to the libs subpackage, so it could be used without
main package
* Fri Jan 13 2012 Peter Schiffer <pschiffe@redhat.com> - 2:0.12.5-10
- related: #757011
fix FTBS on 32bit system
* Thu Jan 12 2012 Peter Schiffer <pschiffe@redhat.com> - 2:0.12.5-9
- related: #757011
fix FTBS
* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 2:0.12.5-8
- Rebuild for new libpng
* Fri Jun 17 2011 Marcela Mašláňová <mmaslano@redhat.com> - 2:0.12.5-7
- Perl mass rebuild
- add patch pilot-link-0.12.5-redefinePerlsymbols.patch - pilot-link was using
old POLLUTED symbols, which shouldn't be used anymore 717939
- added perl_default_filter - don't provide Pilot.so
* Wed Mar 09 2011 Ivana Hutarova Varekova <varekova@redhat.com> - 2:0.12.5-6
- resolves: #675222
install-expenses(1) manpage fix
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.12.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Tue Jan 4 2011 Ivana Hutarova Varekova <varekova@redhat.com> - 2:0.12.5-4
- Resolves: #659292
split libraries to a separate package
* Fri Nov 12 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 2:0.12.5-2
- Resolves: #642435
udev rules broken for pilot-link
* Thu Jun 24 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 2:0.12.5-1
- update to 0.12.5
* Fri Jun 18 2010 Ivana Hutarova Varekova <varekova@redhat.com> - 2:0.12.4-10
- fix rules configure file (#599640)
* Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 2:0.12.4-9
- Mass rebuild with perl-5.12.0
* Fri Mar 5 2010 Ivana Hutarova Varekova 2:0.12.4-8
- remove rpath
fix the license tag
remove autoreconf and optflags setting
* Tue Jan 5 2010 Jan Gorig <jgorig@redhat.com> 2:0.12.4-7
- fix build (#551970)
* Fri Dec 18 2009 Ivana Hutarova Varekova <varekova@redhat.com> 2:0.12.4-6
- fix source tag, add Public Domain license
* Mon Dec 7 2009 Stepan Kasal <skasal@redhat.com> - 2:0.12.4-5
- rebuild against perl 5.10.1
* Sun Nov 15 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2:0.12.4-4
- Better udev rules, thanks to Kevin Kofler
* Sun Nov 15 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2:0.12.4-3
- Install udev rules again, updated for new ACL handling by udev (#529259)
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.12.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Thu May 28 2009 Ivana Varekova <varekova@redhat.com> - 2:0.12.4-1
- update to 0.12.4
- remove obsolete patches
* Wed Apr 15 2009 Ivana Varekova <varekova@redhat.com> - 2:0.12.3-20
- rename blacklist-visor to blacklist-visor.conf (#494765)
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2:0.12.3-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Tue Sep 23 2008 Ivana Varekova <varekova@redhat.com> - 2:0.12.3-18
* Tue Sep 23 2008 Ivana Varekova <varekova@redhat.com> - 2:0.12.3-16
- extend clio patch - thanks Kevin R. Page
* Fri Sep 19 2008 Ivana Varekova <varekova@redhat.com> - 2:0.12.3-17
- split perl subpackage (461758) - thanks Peter Robinson
- spec file cleanup
* Fri Sep 19 2008 Ivana Varekova <varekova@redhat.com> - 2:0.12.3-16
* Fri Sep 19 2008 Ivana Varekova <varekova@redhat.com> - 2:0.12.3-15
- add clio patch (454178) - thanks Michael Ekstrand
* Thu Sep 11 2008 - Bastien Nocera <bnocera@redhat.com> - 2:0.12.3-15
- Rebuild
* Sun Jun 15 2008 Kevin Page <krp[AT]fedoraproject org> - 2:0.12.3-14
* Fri Jun 06 2008 Kevin Page <krp[AT]fedoraproject org> - 2:0.12.3-14
- corrected documentation for visor module use
* Wed Mar 26 2008 Ivana Varekova <varekova@redhat.com> 2:0.12.3-13
@ -411,7 +215,7 @@ install -p -m644 %{SOURCE4} %{buildroot}/lib/udev/rules.d/
* Fri Jan 11 2008 Ivana Varekova <varekova@redhat.com> - 2:0.12.3-6
- Synchronize with F-8 branch:
- remove visor modul remove from %%post script
- remove visor modul remove from %post script
- Change README.fedora use "ttyUSB[13579]" in 60-pilot.rules
* Wed Jan 09 2008 - Bastien Nocera <bnocera@redhat.com> - 2:0.12.3-5
@ -421,7 +225,7 @@ install -p -m644 %{SOURCE4} %{buildroot}/lib/udev/rules.d/
* Mon Jan 7 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 2:0.12.3-4
- Synchronize with F-8 branch:
- Add README.fedora and visor configs as fallbacks (#280251: thanks Kevin Page)
- Don't tag HAL/PolicyKit files as %%config (#427840)
- Don't tag HAL/PolicyKit files as %config (#427840)
- Remove visor module if currently loaded (#280251)
* Fri Jan 4 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 2:0.12.3-3
@ -441,7 +245,7 @@ install -p -m644 %{SOURCE4} %{buildroot}/lib/udev/rules.d/
- Enable Perl bindings
- Include important docs such as README.usb
* Wed Aug 29 2007 Ivana Varekova <varekova@redhat.com> - 2:0.12.2-5
* Tue Aug 29 2007 Ivana Varekova <varekova@redhat.com> - 2:0.12.2-5
- Rebuild for selinux ppc32 issue.
- fix open function calls
@ -625,7 +429,7 @@ install -p -m644 %{SOURCE4} %{buildroot}/lib/udev/rules.d/
* Wed Jun 19 2002 Than Ngo <than@redhat.com> 0.9.5-19
- don't forcibly strip binaries
* Tue Jun 11 2002 Than Ngo <than@redhat.com> 0.9.5-18
* Mon 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
@ -727,7 +531,7 @@ install -p -m644 %{SOURCE4} %{buildroot}/lib/udev/rules.d/
* Thu Jan 21 1999 Bill Nottingham <notting@redhat.com>
- arm fix
* Thu Sep 24 1998 Michael Maher <mike@redhat.com>
* Fri Sep 24 1998 Michael Maher <mike@redhat.com>
- cleaned up spec file, updated package
* Tue May 19 1998 Michael Maher <mike@redhat.com>

View File

@ -1 +1 @@
568c55bf504b044f6fbd50baa407c990 pilot-link-0.12.5.tar.bz2
257124484d50552679c53cae8e118aa3 pilot-link-0.12.3.tar.bz2