File cyrus-imapd-perl-5.14.patch of Package cyrus-imapd.3194
commit 27287454fb150b9d4f6d4b86d1e7dba4ea7934e2
Author: Ralf Haferkamp <rhafer@suse.de>
Date: Mon May 23 16:05:51 2011 +0200
Build with newer perl
Index: cyrus-imapd-2.3.16/perl/imap/IMAP.xs
===================================================================
--- cyrus-imapd-2.3.16.orig/perl/imap/IMAP.xs
+++ cyrus-imapd-2.3.16/perl/imap/IMAP.xs
@@ -124,10 +124,10 @@ void imclient_xs_cb(struct imclient *cli
SAVETMPS;
PUSHMARK(SP);
XPUSHs(sv_2mortal(newSVpv("-client", 0)));
- rv = newSVsv(&sv_undef);
+ rv = newSVsv(&PL_sv_undef);
sv_setref_pv(rv, NULL, (void *) rock->client);
XPUSHs(rv);
- if (rock->prock != &sv_undef) {
+ if (rock->prock != &PL_sv_undef) {
XPUSHs(sv_2mortal(newSVpv("-rock", 0)));
XPUSHs(sv_mortalcopy(rock->prock));
}
@@ -392,7 +392,7 @@ CODE:
ST(0) = sv_newmortal();
if(client->authenticated) {
- ST(0) = &sv_no;
+ ST(0) = &PL_sv_no;
return;
}
@@ -414,10 +414,10 @@ CODE:
rc = imclient_authenticate(client->imclient, mechlist, service, user,
minssf, maxssf);
if (rc)
- ST(0) = &sv_no;
+ ST(0) = &PL_sv_no;
else {
client->authenticated = 1;
- ST(0) = &sv_yes;
+ ST(0) = &PL_sv_yes;
}
int
@@ -449,12 +449,12 @@ CODE:
#ifdef HAVE_SSL
rc = imclient_starttls(client->imclient, tls_cert_file, tls_key_file, CAfile, CApath);
if (rc)
- ST(0) = &sv_no;
+ ST(0) = &PL_sv_no;
else {
- ST(0) = &sv_yes;
+ ST(0) = &PL_sv_yes;
}
#else
- ST(0) = &sv_no;
+ ST(0) = &PL_sv_no;
#endif /* HAVE_SSL */
void
@@ -514,7 +514,7 @@ PPCODE:
(val = hv_fetch(cb, "Rock", 4, 0)))
prock = *val;
else
- prock = &sv_undef;
+ prock = &PL_sv_undef;
/*
* build our internal rock, which is used by our internal
* callback handler to invoke the Perl callback
@@ -525,7 +525,7 @@ PPCODE:
rock = (struct xsccb *) safemalloc(sizeof *rock);
/* bump refcounts on these so they don't go away */
rock->pcb = SvREFCNT_inc(pcb);
- if (!prock) prock = &sv_undef;
+ if (!prock) prock = &PL_sv_undef;
rock->prock = SvREFCNT_inc(prock);
rock->client = client;
rock->autofree = 0;
@@ -652,9 +652,9 @@ PPCODE:
EXTEND(SP, 1);
pcb = av_shift(av);
if (strcmp(SvPV(pcb, arg), "OK") == 0)
- PUSHs(&sv_yes);
+ PUSHs(&PL_sv_yes);
else
- PUSHs(&sv_no);
+ PUSHs(&PL_sv_no);
pcb = perl_get_sv("@", TRUE);
sv_setsv(pcb, av_shift(av));
if (av_len(av) != -1) {
@@ -687,9 +687,9 @@ PPCODE:
EXTEND(SP, 2);
PUSHs(sv_2mortal(newSViv(fd)));
if (writep)
- PUSHs(&sv_yes);
+ PUSHs(&PL_sv_yes);
else
- PUSHs(&sv_no);
+ PUSHs(&PL_sv_no);
void
imclient_fromURL(client,url)