diff options
author | markd <markd@pkgsrc.org> | 2016-01-10 19:05:27 +0000 |
---|---|---|
committer | markd <markd@pkgsrc.org> | 2016-01-10 19:05:27 +0000 |
commit | 078dd6c5b16c63965f2107674509e598c8504631 (patch) | |
tree | cc11933237754300d960507b260b1229b12a44f1 /x11 | |
parent | 743b9c2baa33317167ce3ec1b4ac4b156aff874d (diff) | |
download | pkgsrc-078dd6c5b16c63965f2107674509e598c8504631.tar.gz |
Update kde-runtime4 to 15.12.0
minor bugfixes.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/kde-runtime4/Makefile | 8 | ||||
-rw-r--r-- | x11/kde-runtime4/PLIST | 6 | ||||
-rw-r--r-- | x11/kde-runtime4/distinfo | 13 | ||||
-rw-r--r-- | x11/kde-runtime4/patches/patch-kioslave_bookmarks_kio_bookmarks.cpp | 24 | ||||
-rw-r--r-- | x11/kde-runtime4/patches/patch-kioslave_nfs_nfs__prot__xdr.c | 150 | ||||
-rw-r--r-- | x11/kde-runtime4/patches/patch-kioslave_nfs_rpc__nfs2__prot__xdr.c | 168 |
6 files changed, 181 insertions, 188 deletions
diff --git a/x11/kde-runtime4/Makefile b/x11/kde-runtime4/Makefile index d62f0051fa2..c2e1be65045 100644 --- a/x11/kde-runtime4/Makefile +++ b/x11/kde-runtime4/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.60 2016/01/06 10:46:55 adam Exp $ +# $NetBSD: Makefile,v 1.61 2016/01/10 19:05:27 markd Exp $ -DISTNAME= kde-runtime-${_KDE_VERSION} -PKGNAME= ${DISTNAME:S/-4/4-4/} -PKGREVISION= 7 +DISTNAME= kde-runtime-15.12.0 +PKGNAME= ${DISTNAME:S/-1/4-1/} CATEGORIES= x11 COMMENT= Runtime requirements for the KDE integrated X11 desktop +MASTER_SITES= ${MASTER_SITE_KDE:=applications/15.12.0/src/} .include "../../meta-pkgs/kde4/Makefile.kde4" diff --git a/x11/kde-runtime4/PLIST b/x11/kde-runtime4/PLIST index ae3b30a858b..66d675b00d7 100644 --- a/x11/kde-runtime4/PLIST +++ b/x11/kde-runtime4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2014/11/13 10:53:49 markd Exp $ +@comment $NetBSD: PLIST,v 1.8 2016/01/10 19:05:27 markd Exp $ bin/kcmshell4 bin/kde-cp bin/kde-mv @@ -257,10 +257,10 @@ lib/libkdeinit4_kwalletd.so lib/libknotifyplugin.so lib/libkwalletbackend.so lib/libkwalletbackend.so.4 -lib/libkwalletbackend.so.${PKGVERSION} +lib/libkwalletbackend.so.${KDELIBSVER} lib/libmolletnetwork.so lib/libmolletnetwork.so.4 -lib/libmolletnetwork.so.${PKGVERSION} +lib/libmolletnetwork.so.${KDELIBSVER} man/man1/kdesu.1 man/man1/plasmapkg.1 share/PolicyKit/policy/org.kde.kcontrol.kcmremotewidgets.policy diff --git a/x11/kde-runtime4/distinfo b/x11/kde-runtime4/distinfo index c3fa106f843..19cd34a7fed 100644 --- a/x11/kde-runtime4/distinfo +++ b/x11/kde-runtime4/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.12 2015/11/04 03:28:34 agc Exp $ +$NetBSD: distinfo,v 1.13 2016/01/10 19:05:27 markd Exp $ -SHA1 (kde-runtime-4.14.3.tar.xz) = d25357bf7e5d3922ce0c9b60921fb2fd738b7251 -RMD160 (kde-runtime-4.14.3.tar.xz) = dcbc8624066d83cc8dca85d5ceeb5b4cc327a8fa -SHA512 (kde-runtime-4.14.3.tar.xz) = 63b13f947915bb2eca5b85886610d1af480956b9e95a1ae77ce7c10b11576883a71bebf519335323a1f6c5dfcebe2ee0561b727cea6243756d412d9323feb244 -Size (kde-runtime-4.14.3.tar.xz) = 7867308 bytes +SHA1 (kde-runtime-15.12.0.tar.xz) = 30da08dfb51fade220df7f8cf3e3eab5669a2e18 +RMD160 (kde-runtime-15.12.0.tar.xz) = 37e6c3693e81b31a4b92a5eeb35f8c84602bf86d +SHA512 (kde-runtime-15.12.0.tar.xz) = 453f0538147bb3ea95d4d9e6c503f128f30a383ebe139dcf6df411688d9c245779e931c609e38ca7b94b58907e496af3299646654f53518bf2cb7aa22c8f9137 +Size (kde-runtime-15.12.0.tar.xz) = 7903824 bytes SHA1 (patch-ab) = f6af1c3e2502a91add9ceaa5375e76aee1e8c20c SHA1 (patch-ac) = fadc0c0d3b7c8f893a9249724f26e2fc2c7f0f1e SHA1 (patch-ad) = 285fbd72b3be665776acc61a55f3d65f35e338c4 @@ -12,6 +12,5 @@ SHA1 (patch-af) = 1a8f15ac1c8dadd59fe00ca7ca304ba41521f896 SHA1 (patch-ag) = 5ca9064552379792c32577875d07562d3f736ab7 SHA1 (patch-ai) = 3742a827c4b18cde06828ff585d3130062803b9a SHA1 (patch-ak) = 4fee3877613afddf179a7a8376586a6391b53c89 -SHA1 (patch-kioslave_bookmarks_kio_bookmarks.cpp) = 03b1c2680bc024604372cab0c1d7829fea68f658 -SHA1 (patch-kioslave_nfs_nfs__prot__xdr.c) = 3b779d367a90dbdf158e8f299b4f1de818a6180a +SHA1 (patch-kioslave_nfs_rpc__nfs2__prot__xdr.c) = f1d8dc8224e68ef323f06602bf4b856c785f15e4 SHA1 (patch-kwalletd_backend_blowfish.h) = 23bd9bf9671a770d203a10c46dc602145d2b9457 diff --git a/x11/kde-runtime4/patches/patch-kioslave_bookmarks_kio_bookmarks.cpp b/x11/kde-runtime4/patches/patch-kioslave_bookmarks_kio_bookmarks.cpp deleted file mode 100644 index 9b4a8e9d58b..00000000000 --- a/x11/kde-runtime4/patches/patch-kioslave_bookmarks_kio_bookmarks.cpp +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-kioslave_bookmarks_kio_bookmarks.cpp,v 1.1 2014/12/11 20:00:15 markd Exp $ - -Sanitize path -http://quickgit.kde.org/?p=kde-runtime.git&a=commit&h=d68703900edc8416fbcd2550cd336cbbb76decb9 - ---- kioslave/bookmarks/kio_bookmarks.cpp.orig 2014-10-30 23:50:20.000000000 +0000 -+++ kioslave/bookmarks/kio_bookmarks.cpp -@@ -22,6 +22,7 @@ - #include <stdlib.h> - - #include <qregexp.h> -+#include <qtextdocument.h> - - #include <kapplication.h> - #include <kcmdlineargs.h> -@@ -197,7 +198,7 @@ void BookmarksProtocol::get( const KUrl& - echoImage(regexp.cap(1), regexp.cap(2), url.queryItem("size")); - } else { - echoHead(); -- echo("<p class=\"message\">" + i18n("Wrong request: %1",path) + "</p>"); -+ echo("<p class=\"message\">" + i18n("Bad request: %1", Qt::escape(Qt::escape(url.prettyUrl()))) + "</p>"); - } - finished(); - } diff --git a/x11/kde-runtime4/patches/patch-kioslave_nfs_nfs__prot__xdr.c b/x11/kde-runtime4/patches/patch-kioslave_nfs_nfs__prot__xdr.c deleted file mode 100644 index aed42645689..00000000000 --- a/x11/kde-runtime4/patches/patch-kioslave_nfs_nfs__prot__xdr.c +++ /dev/null @@ -1,150 +0,0 @@ -$NetBSD: patch-kioslave_nfs_nfs__prot__xdr.c,v 1.1 2013/06/03 10:23:33 jperkin Exp $ - -*_U_LONG are obsolete and unavailable in 64-bit mode, use *_U_INT32 instead. - ---- kioslave/nfs/nfs_prot_xdr.c.orig 2013-05-03 04:36:36.766201695 +0000 -+++ kioslave/nfs/nfs_prot_xdr.c -@@ -141,16 +141,16 @@ xdr_fattr(XDR *xdrs, fattr *objp) - - } - else { -- IXDR_PUT_U_LONG(buf,objp->mode); -- IXDR_PUT_U_LONG(buf,objp->nlink); -- IXDR_PUT_U_LONG(buf,objp->uid); -- IXDR_PUT_U_LONG(buf,objp->gid); -- IXDR_PUT_U_LONG(buf,objp->size); -- IXDR_PUT_U_LONG(buf,objp->blocksize); -- IXDR_PUT_U_LONG(buf,objp->rdev); -- IXDR_PUT_U_LONG(buf,objp->blocks); -- IXDR_PUT_U_LONG(buf,objp->fsid); -- IXDR_PUT_U_LONG(buf,objp->fileid); -+ IXDR_PUT_U_INT32(buf,objp->mode); -+ IXDR_PUT_U_INT32(buf,objp->nlink); -+ IXDR_PUT_U_INT32(buf,objp->uid); -+ IXDR_PUT_U_INT32(buf,objp->gid); -+ IXDR_PUT_U_INT32(buf,objp->size); -+ IXDR_PUT_U_INT32(buf,objp->blocksize); -+ IXDR_PUT_U_INT32(buf,objp->rdev); -+ IXDR_PUT_U_INT32(buf,objp->blocks); -+ IXDR_PUT_U_INT32(buf,objp->fsid); -+ IXDR_PUT_U_INT32(buf,objp->fileid); - } - if (!xdr_nfstime(xdrs, &objp->atime)) { - return (FALSE); -@@ -202,16 +202,16 @@ xdr_fattr(XDR *xdrs, fattr *objp) - - } - else { -- objp->mode = IXDR_GET_U_LONG(buf); -- objp->nlink = IXDR_GET_U_LONG(buf); -- objp->uid = IXDR_GET_U_LONG(buf); -- objp->gid = IXDR_GET_U_LONG(buf); -- objp->size = IXDR_GET_U_LONG(buf); -- objp->blocksize = IXDR_GET_U_LONG(buf); -- objp->rdev = IXDR_GET_U_LONG(buf); -- objp->blocks = IXDR_GET_U_LONG(buf); -- objp->fsid = IXDR_GET_U_LONG(buf); -- objp->fileid = IXDR_GET_U_LONG(buf); -+ objp->mode = IXDR_GET_U_INT32(buf); -+ objp->nlink = IXDR_GET_U_INT32(buf); -+ objp->uid = IXDR_GET_U_INT32(buf); -+ objp->gid = IXDR_GET_U_INT32(buf); -+ objp->size = IXDR_GET_U_INT32(buf); -+ objp->blocksize = IXDR_GET_U_INT32(buf); -+ objp->rdev = IXDR_GET_U_INT32(buf); -+ objp->blocks = IXDR_GET_U_INT32(buf); -+ objp->fsid = IXDR_GET_U_INT32(buf); -+ objp->fileid = IXDR_GET_U_INT32(buf); - } - if (!xdr_nfstime(xdrs, &objp->atime)) { - return (FALSE); -@@ -295,10 +295,10 @@ xdr_sattr(XDR *xdrs, sattr *objp) - - } - else { -- IXDR_PUT_U_LONG(buf,objp->mode); -- IXDR_PUT_U_LONG(buf,objp->uid); -- IXDR_PUT_U_LONG(buf,objp->gid); -- IXDR_PUT_U_LONG(buf,objp->size); -+ IXDR_PUT_U_INT32(buf,objp->mode); -+ IXDR_PUT_U_INT32(buf,objp->uid); -+ IXDR_PUT_U_INT32(buf,objp->gid); -+ IXDR_PUT_U_INT32(buf,objp->size); - } - if (!xdr_nfstime(xdrs, &objp->atime)) { - return (FALSE); -@@ -326,10 +326,10 @@ xdr_sattr(XDR *xdrs, sattr *objp) - - } - else { -- objp->mode = IXDR_GET_U_LONG(buf); -- objp->uid = IXDR_GET_U_LONG(buf); -- objp->gid = IXDR_GET_U_LONG(buf); -- objp->size = IXDR_GET_U_LONG(buf); -+ objp->mode = IXDR_GET_U_INT32(buf); -+ objp->uid = IXDR_GET_U_INT32(buf); -+ objp->gid = IXDR_GET_U_INT32(buf); -+ objp->size = IXDR_GET_U_INT32(buf); - } - if (!xdr_nfstime(xdrs, &objp->atime)) { - return (FALSE); -@@ -575,9 +575,9 @@ xdr_writeargs(XDR *xdrs, writeargs *objp - - } - else { -- IXDR_PUT_U_LONG(buf,objp->beginoffset); -- IXDR_PUT_U_LONG(buf,objp->offset); -- IXDR_PUT_U_LONG(buf,objp->totalcount); -+ IXDR_PUT_U_INT32(buf,objp->beginoffset); -+ IXDR_PUT_U_INT32(buf,objp->offset); -+ IXDR_PUT_U_INT32(buf,objp->totalcount); - } - if (!xdr_bytes(xdrs, (char **)&objp->data.data_val, (u_int *)&objp->data.data_len, NFS_MAXDATA)) { - return (FALSE); -@@ -602,9 +602,9 @@ xdr_writeargs(XDR *xdrs, writeargs *objp - - } - else { -- objp->beginoffset = IXDR_GET_U_LONG(buf); -- objp->offset = IXDR_GET_U_LONG(buf); -- objp->totalcount = IXDR_GET_U_LONG(buf); -+ objp->beginoffset = IXDR_GET_U_INT32(buf); -+ objp->offset = IXDR_GET_U_INT32(buf); -+ objp->totalcount = IXDR_GET_U_INT32(buf); - } - if (!xdr_bytes(xdrs, (char **)&objp->data.data_val, (u_int *)&objp->data.data_len, NFS_MAXDATA)) { - return (FALSE); -@@ -808,11 +808,11 @@ xdr_statfsokres(XDR *xdrs, statfsokres * - - } - else { -- IXDR_PUT_U_LONG(buf,objp->tsize); -- IXDR_PUT_U_LONG(buf,objp->bsize); -- IXDR_PUT_U_LONG(buf,objp->blocks); -- IXDR_PUT_U_LONG(buf,objp->bfree); -- IXDR_PUT_U_LONG(buf,objp->bavail); -+ IXDR_PUT_U_INT32(buf,objp->tsize); -+ IXDR_PUT_U_INT32(buf,objp->bsize); -+ IXDR_PUT_U_INT32(buf,objp->blocks); -+ IXDR_PUT_U_INT32(buf,objp->bfree); -+ IXDR_PUT_U_INT32(buf,objp->bavail); - } - - return (TRUE); -@@ -837,11 +837,11 @@ xdr_statfsokres(XDR *xdrs, statfsokres * - - } - else { -- objp->tsize = IXDR_GET_U_LONG(buf); -- objp->bsize = IXDR_GET_U_LONG(buf); -- objp->blocks = IXDR_GET_U_LONG(buf); -- objp->bfree = IXDR_GET_U_LONG(buf); -- objp->bavail = IXDR_GET_U_LONG(buf); -+ objp->tsize = IXDR_GET_U_INT32(buf); -+ objp->bsize = IXDR_GET_U_INT32(buf); -+ objp->blocks = IXDR_GET_U_INT32(buf); -+ objp->bfree = IXDR_GET_U_INT32(buf); -+ objp->bavail = IXDR_GET_U_INT32(buf); - } - return(TRUE); - } diff --git a/x11/kde-runtime4/patches/patch-kioslave_nfs_rpc__nfs2__prot__xdr.c b/x11/kde-runtime4/patches/patch-kioslave_nfs_rpc__nfs2__prot__xdr.c new file mode 100644 index 00000000000..e4a9766e549 --- /dev/null +++ b/x11/kde-runtime4/patches/patch-kioslave_nfs_rpc__nfs2__prot__xdr.c @@ -0,0 +1,168 @@ +$NetBSD: patch-kioslave_nfs_rpc__nfs2__prot__xdr.c,v 1.1 2016/01/10 19:05:27 markd Exp $ + +*_U_LONG are obsolete and unavailable in 64-bit mode, use *_U_INT32 instead. + +--- kioslave/nfs/rpc_nfs2_prot_xdr.c.orig 2015-11-05 04:25:02.000000000 +0000 ++++ kioslave/nfs/rpc_nfs2_prot_xdr.c +@@ -115,16 +115,16 @@ xdr_fattr (XDR *xdrs, fattr *objp) + return FALSE; + + } else { +- IXDR_PUT_U_LONG(buf, objp->mode); +- IXDR_PUT_U_LONG(buf, objp->nlink); +- IXDR_PUT_U_LONG(buf, objp->uid); +- IXDR_PUT_U_LONG(buf, objp->gid); +- IXDR_PUT_U_LONG(buf, objp->size); +- IXDR_PUT_U_LONG(buf, objp->blocksize); +- IXDR_PUT_U_LONG(buf, objp->rdev); +- IXDR_PUT_U_LONG(buf, objp->blocks); +- IXDR_PUT_U_LONG(buf, objp->fsid); +- IXDR_PUT_U_LONG(buf, objp->fileid); ++ IXDR_PUT_U_INT32(buf, objp->mode); ++ IXDR_PUT_U_INT32(buf, objp->nlink); ++ IXDR_PUT_U_INT32(buf, objp->uid); ++ IXDR_PUT_U_INT32(buf, objp->gid); ++ IXDR_PUT_U_INT32(buf, objp->size); ++ IXDR_PUT_U_INT32(buf, objp->blocksize); ++ IXDR_PUT_U_INT32(buf, objp->rdev); ++ IXDR_PUT_U_INT32(buf, objp->blocks); ++ IXDR_PUT_U_INT32(buf, objp->fsid); ++ IXDR_PUT_U_INT32(buf, objp->fileid); + } + if (!xdr_nfstime (xdrs, &objp->atime)) + return FALSE; +@@ -160,16 +160,16 @@ xdr_fattr (XDR *xdrs, fattr *objp) + return FALSE; + + } else { +- objp->mode = IXDR_GET_U_LONG(buf); +- objp->nlink = IXDR_GET_U_LONG(buf); +- objp->uid = IXDR_GET_U_LONG(buf); +- objp->gid = IXDR_GET_U_LONG(buf); +- objp->size = IXDR_GET_U_LONG(buf); +- objp->blocksize = IXDR_GET_U_LONG(buf); +- objp->rdev = IXDR_GET_U_LONG(buf); +- objp->blocks = IXDR_GET_U_LONG(buf); +- objp->fsid = IXDR_GET_U_LONG(buf); +- objp->fileid = IXDR_GET_U_LONG(buf); ++ objp->mode = IXDR_GET_U_INT32(buf); ++ objp->nlink = IXDR_GET_U_INT32(buf); ++ objp->uid = IXDR_GET_U_INT32(buf); ++ objp->gid = IXDR_GET_U_INT32(buf); ++ objp->size = IXDR_GET_U_INT32(buf); ++ objp->blocksize = IXDR_GET_U_INT32(buf); ++ objp->rdev = IXDR_GET_U_INT32(buf); ++ objp->blocks = IXDR_GET_U_INT32(buf); ++ objp->fsid = IXDR_GET_U_INT32(buf); ++ objp->fileid = IXDR_GET_U_INT32(buf); + } + if (!xdr_nfstime (xdrs, &objp->atime)) + return FALSE; +@@ -230,10 +230,10 @@ xdr_sattr (XDR *xdrs, sattr *objp) + return FALSE; + + } else { +- IXDR_PUT_U_LONG(buf, objp->mode); +- IXDR_PUT_U_LONG(buf, objp->uid); +- IXDR_PUT_U_LONG(buf, objp->gid); +- IXDR_PUT_U_LONG(buf, objp->size); ++ IXDR_PUT_U_INT32(buf, objp->mode); ++ IXDR_PUT_U_INT32(buf, objp->uid); ++ IXDR_PUT_U_INT32(buf, objp->gid); ++ IXDR_PUT_U_INT32(buf, objp->size); + } + if (!xdr_nfstime (xdrs, &objp->atime)) + return FALSE; +@@ -253,10 +253,10 @@ xdr_sattr (XDR *xdrs, sattr *objp) + return FALSE; + + } else { +- objp->mode = IXDR_GET_U_LONG(buf); +- objp->uid = IXDR_GET_U_LONG(buf); +- objp->gid = IXDR_GET_U_LONG(buf); +- objp->size = IXDR_GET_U_LONG(buf); ++ objp->mode = IXDR_GET_U_INT32(buf); ++ objp->uid = IXDR_GET_U_INT32(buf); ++ objp->gid = IXDR_GET_U_INT32(buf); ++ objp->size = IXDR_GET_U_INT32(buf); + } + if (!xdr_nfstime (xdrs, &objp->atime)) + return FALSE; +@@ -455,9 +455,9 @@ xdr_writeargs (XDR *xdrs, writeargs *obj + return FALSE; + + } else { +- IXDR_PUT_U_LONG(buf, objp->beginoffset); +- IXDR_PUT_U_LONG(buf, objp->offset); +- IXDR_PUT_U_LONG(buf, objp->totalcount); ++ IXDR_PUT_U_INT32(buf, objp->beginoffset); ++ IXDR_PUT_U_INT32(buf, objp->offset); ++ IXDR_PUT_U_INT32(buf, objp->totalcount); + } + if (!xdr_bytes (xdrs, (char **)&objp->data.data_val, (u_int *) &objp->data.data_len, NFS_MAXDATA)) + return FALSE; +@@ -475,9 +475,9 @@ xdr_writeargs (XDR *xdrs, writeargs *obj + return FALSE; + + } else { +- objp->beginoffset = IXDR_GET_U_LONG(buf); +- objp->offset = IXDR_GET_U_LONG(buf); +- objp->totalcount = IXDR_GET_U_LONG(buf); ++ objp->beginoffset = IXDR_GET_U_INT32(buf); ++ objp->offset = IXDR_GET_U_INT32(buf); ++ objp->totalcount = IXDR_GET_U_INT32(buf); + } + if (!xdr_bytes (xdrs, (char **)&objp->data.data_val, (u_int *) &objp->data.data_len, NFS_MAXDATA)) + return FALSE; +@@ -637,11 +637,11 @@ xdr_statfsokres (XDR *xdrs, statfsokres + if (!xdr_u_int (xdrs, &objp->bavail)) + return FALSE; + } else { +- IXDR_PUT_U_LONG(buf, objp->tsize); +- IXDR_PUT_U_LONG(buf, objp->bsize); +- IXDR_PUT_U_LONG(buf, objp->blocks); +- IXDR_PUT_U_LONG(buf, objp->bfree); +- IXDR_PUT_U_LONG(buf, objp->bavail); ++ IXDR_PUT_U_INT32(buf, objp->tsize); ++ IXDR_PUT_U_INT32(buf, objp->bsize); ++ IXDR_PUT_U_INT32(buf, objp->blocks); ++ IXDR_PUT_U_INT32(buf, objp->bfree); ++ IXDR_PUT_U_INT32(buf, objp->bavail); + } + return TRUE; + } else if (xdrs->x_op == XDR_DECODE) { +@@ -658,11 +658,11 @@ xdr_statfsokres (XDR *xdrs, statfsokres + if (!xdr_u_int (xdrs, &objp->bavail)) + return FALSE; + } else { +- objp->tsize = IXDR_GET_U_LONG(buf); +- objp->bsize = IXDR_GET_U_LONG(buf); +- objp->blocks = IXDR_GET_U_LONG(buf); +- objp->bfree = IXDR_GET_U_LONG(buf); +- objp->bavail = IXDR_GET_U_LONG(buf); ++ objp->tsize = IXDR_GET_U_INT32(buf); ++ objp->bsize = IXDR_GET_U_INT32(buf); ++ objp->blocks = IXDR_GET_U_INT32(buf); ++ objp->bfree = IXDR_GET_U_INT32(buf); ++ objp->bavail = IXDR_GET_U_INT32(buf); + } + return TRUE; + } +@@ -840,7 +840,7 @@ xdr_ppathcnf (XDR *xdrs, ppathcnf *objp) + return FALSE; + + } else { +- IXDR_PUT_LONG(buf, objp->pc_link_max); ++ IXDR_PUT_INT32(buf, objp->pc_link_max); + IXDR_PUT_SHORT(buf, objp->pc_max_canon); + IXDR_PUT_SHORT(buf, objp->pc_max_input); + IXDR_PUT_SHORT(buf, objp->pc_name_max); +@@ -884,7 +884,7 @@ xdr_ppathcnf (XDR *xdrs, ppathcnf *objp) + return FALSE; + + } else { +- objp->pc_link_max = IXDR_GET_LONG(buf); ++ objp->pc_link_max = IXDR_GET_INT32(buf); + objp->pc_max_canon = IXDR_GET_SHORT(buf); + objp->pc_max_input = IXDR_GET_SHORT(buf); + objp->pc_name_max = IXDR_GET_SHORT(buf); |