diff options
47 files changed, 683 insertions, 2693 deletions
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 9e1f0af31..22dfe4907 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90140 2013-05-07 06:36:32Z faidoc $ +# $Id: PKGBUILD 90266 2013-05-10 17:14:37Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=1.8.1 +pkgver=1.8.2 pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64' 'mips64el') @@ -31,7 +31,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/ "switch-applications.patch" "fallback-helpers.patch" "idle-dim.patch") -sha256sums=('c7ef75572d4967265a16102e7fa0734db35c33ee792c01dcb9eff7e43e711530' +sha256sums=('83179f98f9e6c88928146d43a9d3f581c64706c0a60dac5e58d845a30a275a91' 'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30' 'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426' '0971ac14bc31167d3b94ea93e608c5d49518a12b89f40c97f84d80e715657aa3' diff --git a/community/fdupes/PKGBUILD b/community/fdupes/PKGBUILD index f458d9ad4..cbae5b25e 100644 --- a/community/fdupes/PKGBUILD +++ b/community/fdupes/PKGBUILD @@ -1,28 +1,29 @@ -# $Id: PKGBUILD 67613 2012-03-13 14:16:46Z lcarlier $ +# $Id: PKGBUILD 90262 2013-05-10 16:06:17Z jelle $ # Maintainer: Daenyth <Daenyth+Arch at gmail dot com> # Contributor: Chris Winter <twidds at gmail dot com> pkgname=fdupes -pkgver=1.40 -pkgrel=6.1 +pkgver=1.51 +pkgrel=1 pkgdesc="a program for identifying or deleting duplicate files residing within specified directories" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fdupes/" license=('MIT') depends=(glibc) source=(http://fdupes.googlecode.com/files/$pkgname-$pkgver.tar.gz LICENSE) -md5sums=('11de9ab4466089b6acbb62816b30b189' '47f17890218f832f870bf7a02eaeb017') +md5sums=('47d0410c90c9e51e450933ba35a32b62' + '47f17890218f832f870bf7a02eaeb017') build() { cd $srcdir/$pkgname-$pkgver - make + make PREFIX=/usr } package(){ cd $srcdir/$pkgname-$pkgver install -d ${pkgdir}/usr/{share/man/man1,bin} - make INSTALLDIR=${pkgdir}/usr/bin MANPAGEDIR=${pkgdir}/usr/share/man install - install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + make PREFIX=$pkgdir/usr DESTDIR=${pkgdir}/usr/bin INSTALLDIR=${pkgdir}/usr/bin MAN_DIR=${pkgdir}/usr/share/man/man1 install + install -D -m644 $srcdir/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD index 1861dd10b..54f9011b7 100644 --- a/community/filezilla/PKGBUILD +++ b/community/filezilla/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90239 2013-05-09 21:10:16Z bluewind $ +# $Id: PKGBUILD 90268 2013-05-10 20:25:25Z bluewind $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=filezilla -pkgver=3.7.0 +pkgver=3.7.0.1 pkgrel=1 pkgdesc="Fast and reliable FTP, FTPS and SFTP client" arch=('i686' 'x86_64' 'mips64el') @@ -31,4 +31,4 @@ package() { make DESTDIR="${pkgdir}" install } -md5sums=('de827a062ec316d0da99936aeaaeeb79') +md5sums=('cb07cf02ee4cc767e10e8a022ad0ce0d') diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD index fd0692e96..9ad14990e 100644 --- a/community/geany-plugins/PKGBUILD +++ b/community/geany-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86001 2013-03-10 22:54:56Z arodseth $ +# $Id: PKGBUILD 90241 2013-05-09 23:30:17Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: djgera @@ -6,12 +6,12 @@ pkgname=geany-plugins pkgver=1.23 -pkgrel=1 +pkgrel=2 pkgdesc='Plugins for Geany' arch=('x86_64' 'i686' 'mips64el') url='http://plugins.geany.org/' license=('GPL') -depends=("geany=$pkgver" 'gtkspell' 'libwebkit' 'ctpl' 'gpgme' 'vte' +depends=("geany=$pkgver" 'gtkspell' 'webkitgtk2' 'ctpl' 'gpgme' 'vte' 'desktop-file-utils' 'gtk-update-icon-cache' 'lua51') makedepends=('intltool' 'vala' 'gdb' 'cppcheck') optdepends=('hspell: hebrew spell checker') @@ -23,7 +23,6 @@ sha256sums=('ff26860edd1cbaea88c73bd8c2bd02f9ba04046674f05d3696baf66582e2bf58') build() { cd "$srcdir/$pkgname-$pkgver" - # The geanylua plugin currently doesn't work with lua 5.2, only 5.1 ./configure --prefix=/usr --libexecdir=/usr/lib make } diff --git a/community/libseccomp/PKGBUILD b/community/libseccomp/PKGBUILD new file mode 100644 index 000000000..9bdaee4fc --- /dev/null +++ b/community/libseccomp/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Daniel Micay <danielmicay@gmail.com> +# Contributor: Patryk Kowalczyk < patryk at kowalczyk dot ws> + +pkgname=libseccomp +pkgver=2.0.0 +pkgrel=2 +pkgdesc='Enhanced seccomp library' +arch=('i686' 'x86_64') +license=('LGPL2.1') +url="http://sourceforge.net/projects/libseccomp/" +depends=('glibc') +source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('f988feac6a3425f2c918f32b28df1caa') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD index e5944628f..d480fae5f 100644 --- a/community/lxc/PKGBUILD +++ b/community/lxc/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 87850 2013-04-08 09:23:47Z spupykin $ +# $Id: PKGBUILD 90274 2013-05-10 21:44:25Z thestinger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andrea Zucchelli <zukka77@gmail.com> +# Contributor: Daniel Micay <danielmicay@gmail.com> # Contributor: Jonathan Liu <net147@gmail.com> -# Maintainer: Jon Nordby <jononor@gmail.com> +# Contributor: Jon Nordby <jononor@gmail.com> pkgname=lxc pkgver=0.9.0 epoch=1 -pkgrel=1 +pkgrel=2 pkgdesc="Linux Containers" arch=('i686' 'x86_64' 'mips64el') url="http://lxc.sourceforge.net/" -depends=('bash' 'perl') +depends=('bash' 'perl' 'libseccomp') license=('LGPL') source=("http://lxc.sourceforge.net/download/lxc/$pkgname-${pkgver/_/-}.tar.gz") md5sums=('8552a4479090616f4bc04d8473765fc9') @@ -24,7 +25,8 @@ build() { --libexecdir=/usr/bin \ --sysconfdir=/etc \ --disable-apparmor \ - --disable-doc + --disable-doc \ + --enable-seccomp make } diff --git a/community/midori/PKGBUILD b/community/midori/PKGBUILD index 87815fc98..2f4cc6259 100644 --- a/community/midori/PKGBUILD +++ b/community/midori/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87825 2013-04-07 13:05:16Z arodseth $ +# $Id: PKGBUILD 90243 2013-05-09 23:40:12Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -8,13 +8,13 @@ pkgname=midori pkgver=0.5.0 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight web browser based on Gtk WebKit' arch=('x86_64' 'i686' 'mips64el') url='http://www.twotoasts.de/index.php?/pages/midori_summary.html' license=('LGPL2.1') -install=midori.install -depends=('libzeitgeist' 'libwebkit' 'libnotify' 'libxss' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils') +install="$pkgname.install" +depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils') makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2' 'vala' 'gcr') optdepends=('gstreamer0.10-ugly-plugins: HTML5 videos support' 'aria2: download utility') diff --git a/community/ncdu/PKGBUILD b/community/ncdu/PKGBUILD index 398ab5ec2..251e231fc 100644 --- a/community/ncdu/PKGBUILD +++ b/community/ncdu/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 76727 2012-09-27 22:43:52Z bisson $ +# $Id: PKGBUILD 90258 2013-05-10 15:34:37Z jelle $ # Contributor: lp76 <l.peduto@gmail.com> # Contributor: Daenyth <Daenyth+Arch AT gmail DOT com> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=ncdu -pkgver=1.9 +pkgver=1.10 pkgrel=1 pkgdesc='Disk usage analyzer with an ncurses interface' url='http://dev.yorhel.nl/ncdu/' @@ -13,7 +13,7 @@ license=('custom:MIT') depends=('ncurses') arch=('i686' 'x86_64' 'mips64el') source=("http://dev.yorhel.nl/download/${pkgname}-${pkgver}.tar.gz") -sha1sums=('27cb5464b192db8ffdf0a894fe51d29985348eb0') +sha1sums=('cf3b5fbb5b69cbae5425bfff2660ac3d8224a605') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD index 77ac92c0c..511a19114 100644 --- a/community/nemiver/PKGBUILD +++ b/community/nemiver/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 89588 2013-04-30 08:28:34Z arodseth $ +# $Id: PKGBUILD 90245 2013-05-09 23:52:58Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: jordz <jordz@archlinux.us> pkgname=nemiver pkgver=0.9.4 -pkgrel=3 +pkgrel=4 pkgdesc='C/C++ debugger for GNOME' arch=('x86_64' 'i686' 'mips64el') license=('GPL') url='http://www.gnome.org/projects/nemiver/' install="$pkgname.install" -depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'dconf' 'gsettings-desktop-schemas') +depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'gsettings-desktop-schemas') makedepends=('boost' 'intltool' 'itstool') source=("http://ftp.acc.umu.se/pub/GNOME/sources/nemiver/0.9/$pkgname-$pkgver.tar.xz") options=('!libtool' '!emptydirs') @@ -28,8 +28,8 @@ build() { --disable-scrollkeeper \ --enable-symsvis=yes \ --enable-memoryview=yes \ - --enable-gsettings=yes -# --disable-schemas-compile \ + --enable-gsettings=yes \ + --disable-schemas-compile make } diff --git a/extra/notification-daemon/PKGBUILD b/community/notification-daemon/PKGBUILD index 8bba639c3..ae78b32cc 100644 --- a/extra/notification-daemon/PKGBUILD +++ b/community/notification-daemon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183449 2013-04-21 22:11:53Z heftig $ +# $Id: PKGBUILD 90252 2013-05-10 04:00:26Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Mark Rosenstand <mark@borkware.net> diff --git a/extra/notification-daemon/notification-daemon.install b/community/notification-daemon/notification-daemon.install index 8a1aa3433..8a1aa3433 100644 --- a/extra/notification-daemon/notification-daemon.install +++ b/community/notification-daemon/notification-daemon.install diff --git a/extra/polkit-gnome/PKGBUILD b/community/polkit-gnome/PKGBUILD index 4d6f53310..0e351d88e 100644 --- a/extra/polkit-gnome/PKGBUILD +++ b/community/polkit-gnome/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 141266 2011-10-27 16:27:38Z ibiru $ +# $Id: PKGBUILD 90254 2013-05-10 04:01:53Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: onestep_ua <onestep@ukr.net> diff --git a/extra/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/community/polkit-gnome/polkit-gnome-authentication-agent-1.desktop index fc2acc28d..fc2acc28d 100644 --- a/extra/polkit-gnome/polkit-gnome-authentication-agent-1.desktop +++ b/community/polkit-gnome/polkit-gnome-authentication-agent-1.desktop diff --git a/core/libtirpc/PKGBUILD b/core/libtirpc/PKGBUILD index c6dcfadb8..fb70c3cc8 100644 --- a/core/libtirpc/PKGBUILD +++ b/core/libtirpc/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 170257 2012-11-06 12:56:18Z tomegun $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# $Id: PKGBUILD 185038 2013-05-10 16:21:42Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libtirpc -pkgver=0.2.2 -pkgrel=4 +pkgver=0.2.3 +pkgrel=1 pkgdesc="Transport Independent RPC library (SunRPC replacement)" arch=(i686 x86_64 mips64el) url="http://libtirpc.sourceforge.net/" @@ -12,31 +13,22 @@ depends=('libgssglue') backup=('etc/netconfig') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/libtirpc/${pkgname}-${pkgver}.tar.bz2 - libtirpc-0.2.1-fortify.patch - libtirpc-0.2.3rc1.patch - libtirpc-fix-segfault-0.2.2.patch) -md5sums=('74c41c15c2909f7d11d9c7bfa7db6273' - '2e5c067f1651469dfbbdc91d3c9c60e8' - 'ac2a1657b44f4a99c37d8265b05b9133' - '5a3ab55934cad4e8b38fc90c54756472') + libtirpc-build.patch) build() { cd "${srcdir}/${pkgname}-${pkgver}" - # fix http://bugs.gentoo.org/293593 - # https://bugs.archlinux.org/task/20082 - patch -Np1 -i ../libtirpc-0.2.1-fortify.patch - # add patches from fedora git to make nfs-utils compile again - patch -Np1 -i ../libtirpc-0.2.3rc1.patch - patch -Np1 -i ../libtirpc-fix-segfault-0.2.2.patch - sh autogen.sh - autoreconf -fisv - ./configure --prefix=/usr --enable-gss + + patch -p1 <"$srcdir/libtirpc-build.patch" + + ./configure --prefix=/usr --sysconf=/etc --enable-gss + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -D -m644 doc/etc_netconfig "${pkgdir}"/etc/netconfig install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } +md5sums=('b70e6c12a369a91e69fcc3b9feb23d61' + 'd4c0eef2f0891abf06cd4146eb51ed36') diff --git a/core/libtirpc/libtirpc-0.2.1-fortify.patch b/core/libtirpc/libtirpc-0.2.1-fortify.patch deleted file mode 100644 index 7375bf83e..000000000 --- a/core/libtirpc/libtirpc-0.2.1-fortify.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: libtirpc-0.2.1/src/getrpcport.c -=================================================================== ---- libtirpc-0.2.1.orig/src/getrpcport.c -+++ libtirpc-0.2.1/src/getrpcport.c -@@ -54,11 +54,11 @@ getrpcport(host, prognum, versnum, proto - - if ((hp = gethostbyname(host)) == NULL) - return (0); -+ if (hp->h_length != sizeof(addr.sin_addr.s_addr)) -+ return (0); - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_port = 0; -- if (hp->h_length > sizeof(addr)) -- hp->h_length = sizeof(addr); - memcpy(&addr.sin_addr.s_addr, hp->h_addr, (size_t)hp->h_length); - /* Inconsistent interfaces need casts! :-( */ - return (pmap_getport(&addr, (u_long)prognum, (u_long)versnum, diff --git a/core/libtirpc/libtirpc-0.2.3rc1.patch b/core/libtirpc/libtirpc-0.2.3rc1.patch deleted file mode 100644 index d57a59e1f..000000000 --- a/core/libtirpc/libtirpc-0.2.3rc1.patch +++ /dev/null @@ -1,637 +0,0 @@ -diff --git a/src/Makefile.am b/src/Makefile.am -index 7ee8cbc..6731ff9 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -50,7 +50,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln - rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ - rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \ - svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ -- auth_time.c auth_des.c authdes_prot.c des_crypt.c -+ auth_time.c auth_des.c authdes_prot.c - - ## XDR - libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c -diff --git a/src/auth_des.c b/src/auth_des.c -index 37e7667..f0c8b8c 100644 ---- a/src/auth_des.c -+++ b/src/auth_des.c -@@ -223,6 +223,7 @@ authdes_pk_seccreate(const char *servername, netobj *pkey, u_int window, - goto failed; - } - ad->ad_nis_srvr = NULL; /* not needed any longer */ -+ auth_get(auth); /* Reference for caller */ - return (auth); - - failed: -@@ -472,6 +473,12 @@ authdes_destroy(AUTH *auth) - FREE(auth, sizeof(AUTH)); - } - -+static bool_t -+authdes_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere) -+{ -+ return ((*xfunc)(xdrs, xwhere)); -+} -+ - static struct auth_ops * - authdes_ops(void) - { -@@ -487,6 +494,8 @@ authdes_ops(void) - ops.ah_validate = authdes_validate; - ops.ah_refresh = authdes_refresh; - ops.ah_destroy = authdes_destroy; -+ ops.ah_wrap = authdes_wrap; -+ ops.ah_unwrap = authdes_wrap; - } - mutex_unlock(&authdes_ops_lock); - return (&ops); -diff --git a/src/auth_gss.c b/src/auth_gss.c -index df3017a..a992049 100644 ---- a/src/auth_gss.c -+++ b/src/auth_gss.c -@@ -200,6 +200,8 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec) - - if (!authgss_refresh(auth)) - auth = NULL; -+ else -+ auth_get(auth); /* Reference for caller */ - - clnt->cl_auth = save_auth; - -@@ -555,9 +557,20 @@ authgss_destroy_context(AUTH *auth) - - if (gd->gc.gc_ctx.length != 0) { - if (gd->established) { -+ AUTH *save_auth = NULL; -+ -+ /* Make sure we use the right auth_ops */ -+ if (gd->clnt->cl_auth != auth) { -+ save_auth = gd->clnt->cl_auth; -+ gd->clnt->cl_auth = auth; -+ } -+ - gd->gc.gc_proc = RPCSEC_GSS_DESTROY; - clnt_call(gd->clnt, NULLPROC, (xdrproc_t)xdr_void, NULL, - (xdrproc_t)xdr_void, NULL, AUTH_TIMEOUT); -+ -+ if (save_auth != NULL) -+ gd->clnt->cl_auth = save_auth; - } - gss_release_buffer(&min_stat, &gd->gc.gc_ctx); - /* XXX ANDROS check size of context - should be 8 */ -diff --git a/src/auth_none.c b/src/auth_none.c -index a439ec6..008c589 100644 ---- a/src/auth_none.c -+++ b/src/auth_none.c -@@ -155,6 +155,12 @@ authnone_destroy(AUTH *client) - { - } - -+static bool_t -+authnone_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere) -+{ -+ return ((*xfunc)(xdrs, xwhere)); -+} -+ - static struct auth_ops * - authnone_ops() - { -@@ -170,6 +176,8 @@ authnone_ops() - ops.ah_validate = authnone_validate; - ops.ah_refresh = authnone_refresh; - ops.ah_destroy = authnone_destroy; -+ ops.ah_wrap = authnone_wrap; -+ ops.ah_unwrap = authnone_wrap; - } - mutex_unlock(&ops_lock); - return (&ops); -diff --git a/src/auth_unix.c b/src/auth_unix.c -index c2469da..4b9b13f 100644 ---- a/src/auth_unix.c -+++ b/src/auth_unix.c -@@ -162,6 +162,7 @@ authunix_create(machname, uid, gid, len, aup_gids) - */ - auth->ah_cred = au->au_origcred; - marshal_new_auth(auth); -+ auth_get(auth); /* Reference for caller */ - return (auth); - #ifndef _KERNEL - cleanup_authunix_create: -@@ -396,6 +397,12 @@ marshal_new_auth(auth) - XDR_DESTROY(xdrs); - } - -+static bool_t -+authunix_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere) -+{ -+ return ((*xfunc)(xdrs, xwhere)); -+} -+ - static struct auth_ops * - authunix_ops() - { -@@ -411,6 +418,8 @@ authunix_ops() - ops.ah_validate = authunix_validate; - ops.ah_refresh = authunix_refresh; - ops.ah_destroy = authunix_destroy; -+ ops.ah_wrap = authunix_wrap; -+ ops.ah_unwrap = authunix_wrap; - } - mutex_unlock(&ops_lock); - return (&ops); -diff --git a/src/authgss_prot.c b/src/authgss_prot.c -index 9d7fa09..0168318 100644 ---- a/src/authgss_prot.c -+++ b/src/authgss_prot.c -@@ -161,6 +161,7 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - databuflen = end - start - 4; - XDR_SETPOS(xdrs, start + 4); - databuf.value = XDR_INLINE(xdrs, databuflen); -+ databuf.length = databuflen; - - xdr_stat = FALSE; - -@@ -169,7 +170,6 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - XDR_SETPOS(xdrs, start); - if (!xdr_u_int(xdrs, (u_int *)&databuflen)) - return (FALSE); -- databuf.length = databuflen; - - /* Checksum rpc_gss_data_t. */ - maj_stat = gss_get_mic(&min_stat, ctx, qop, -diff --git a/src/clnt_dg.c b/src/clnt_dg.c -index 79fed5d..4a1f60a 100644 ---- a/src/clnt_dg.c -+++ b/src/clnt_dg.c -@@ -366,7 +366,7 @@ call_again: - - if ((! XDR_PUTINT32(xdrs, (int32_t *)&proc)) || - (! AUTH_MARSHALL(cl->cl_auth, xdrs)) || -- (! (*xargs)(xdrs, argsp))) { -+ (! AUTH_WRAP(cl->cl_auth, xdrs, xargs, argsp))) { - cu->cu_error.re_status = RPC_CANTENCODEARGS; - goto out; - } -@@ -400,8 +400,8 @@ get_reply: - * (We assume that this is actually only executed once.) - */ - reply_msg.acpted_rply.ar_verf = _null_auth; -- reply_msg.acpted_rply.ar_results.where = resultsp; -- reply_msg.acpted_rply.ar_results.proc = xresults; -+ reply_msg.acpted_rply.ar_results.where = NULL; -+ reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; - - fd.fd = cu->cu_fd; - fd.events = POLLIN; -@@ -512,6 +512,10 @@ get_reply: - &reply_msg.acpted_rply.ar_verf)) { - cu->cu_error.re_status = RPC_AUTHERROR; - cu->cu_error.re_why = AUTH_INVALIDRESP; -+ } else if (! AUTH_UNWRAP(cl->cl_auth, &reply_xdrs, -+ xresults, resultsp)) { -+ if (cu->cu_error.re_status == RPC_SUCCESS) -+ cu->cu_error.re_status = RPC_CANTDECODERES; - } - if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) { - xdrs->x_op = XDR_FREE; -diff --git a/src/clnt_vc.c b/src/clnt_vc.c -index 359063c..097cae8 100644 ---- a/src/clnt_vc.c -+++ b/src/clnt_vc.c -@@ -364,7 +364,7 @@ call_again: - if ((! XDR_PUTBYTES(xdrs, ct->ct_u.ct_mcallc, ct->ct_mpos)) || - (! XDR_PUTINT32(xdrs, (int32_t *)&proc)) || - (! AUTH_MARSHALL(cl->cl_auth, xdrs)) || -- (! (*xdr_args)(xdrs, args_ptr))) { -+ (! AUTH_WRAP(cl->cl_auth, xdrs, xdr_args, args_ptr))) { - if (ct->ct_error.re_status == RPC_SUCCESS) - ct->ct_error.re_status = RPC_CANTENCODEARGS; - (void)xdrrec_endofrecord(xdrs, TRUE); -@@ -420,7 +420,8 @@ call_again: - &reply_msg.acpted_rply.ar_verf)) { - ct->ct_error.re_status = RPC_AUTHERROR; - ct->ct_error.re_why = AUTH_INVALIDRESP; -- } else if (! (*xdr_results)(xdrs, results_ptr)) { -+ } else if (! AUTH_UNWRAP(cl->cl_auth, xdrs, -+ xdr_results, results_ptr)) { - if (ct->ct_error.re_status == RPC_SUCCESS) - ct->ct_error.re_status = RPC_CANTDECODERES; - } -diff --git a/src/svc.c b/src/svc.c -index b4a63d0..08cd6c9 100644 ---- a/src/svc.c -+++ b/src/svc.c -@@ -77,9 +77,6 @@ static struct svc_callout - - extern rwlock_t svc_lock; - extern rwlock_t svc_fd_lock; --#ifdef HAVE_LIBGSSAPI --extern struct svc_auth_ops svc_auth_gss_ops; --#endif - - static struct svc_callout *svc_find (rpcprog_t, rpcvers_t, - struct svc_callout **, char *); -@@ -717,11 +714,9 @@ svc_getreq_common (fd) - SVC_DESTROY (xprt); - break; - } -- else if ((xprt->xp_auth != NULL) --#ifdef HAVE_LIBGSSAPI -- && (xprt->xp_auth->svc_ah_ops != &svc_auth_gss_ops) --#endif -- ) { -+ else if ((xprt->xp_auth != NULL) && -+ (xprt->xp_auth->svc_ah_private == NULL)) -+ { - xprt->xp_auth = NULL; - } - } -diff --git a/src/svc_auth.c b/src/svc_auth.c -index c6b3a0b..e80d5f9 100644 ---- a/src/svc_auth.c -+++ b/src/svc_auth.c -@@ -98,8 +98,8 @@ _authenticate(rqst, msg) - rqst->rq_xprt->xp_verf.oa_length = 0; - cred_flavor = rqst->rq_cred.oa_flavor; - switch (cred_flavor) { -- case AUTH_NULL: -- dummy = _svcauth_null(rqst, msg); -+ case AUTH_NONE: -+ dummy = _svcauth_none(rqst, msg); - return (dummy); - case AUTH_SYS: - dummy = _svcauth_unix(rqst, msg); -@@ -132,15 +132,6 @@ _authenticate(rqst, msg) - return (AUTH_REJECTEDCRED); - } - --/*ARGSUSED*/ --enum auth_stat --_svcauth_null(rqst, msg) -- struct svc_req *rqst; -- struct rpc_msg *msg; --{ -- return (AUTH_OK); --} -- - /* - * Allow the rpc service to register new authentication types that it is - * prepared to handle. When an authentication flavor is registered, -diff --git a/src/svc_auth_unix.c b/src/svc_auth_unix.c -index ce83859..9585069 100644 ---- a/src/svc_auth_unix.c -+++ b/src/svc_auth_unix.c -@@ -43,6 +43,8 @@ - - #include <rpc/rpc.h> - -+extern SVCAUTH svc_auth_none; -+ - /* - * Unix longhand authenticator - */ -@@ -67,6 +69,8 @@ _svcauth_unix(rqst, msg) - assert(rqst != NULL); - assert(msg != NULL); - -+ rqst->rq_xprt->xp_auth = &svc_auth_none; -+ - area = (struct area *) rqst->rq_clntcred; - aup = &area->area_aup; - aup->aup_machname = area->area_machname; -@@ -142,5 +146,6 @@ _svcauth_short(rqst, msg) - struct svc_req *rqst; - struct rpc_msg *msg; - { -+ rqst->rq_xprt->xp_auth = &svc_auth_none; - return (AUTH_REJECTEDCRED); - } -diff --git a/src/svc_dg.c b/src/svc_dg.c -index 66a56ee..5ef9df2 100644 ---- a/src/svc_dg.c -+++ b/src/svc_dg.c -@@ -134,6 +134,7 @@ svc_dg_create(fd, sendsize, recvsize) - su->su_cache = NULL; - xprt->xp_fd = fd; - xprt->xp_p2 = su; -+ xprt->xp_auth = NULL; - xprt->xp_verf.oa_base = su->su_verfbody; - svc_dg_ops(xprt); - xprt->xp_rtaddr.maxlen = sizeof (struct sockaddr_storage); -@@ -234,10 +235,27 @@ svc_dg_reply(xprt, msg) - bool_t stat = FALSE; - size_t slen; - -+ xdrproc_t xdr_results; -+ caddr_t xdr_location; -+ bool_t has_args; -+ -+ if (msg->rm_reply.rp_stat == MSG_ACCEPTED && -+ msg->rm_reply.rp_acpt.ar_stat == SUCCESS) { -+ has_args = TRUE; -+ xdr_results = msg->acpted_rply.ar_results.proc; -+ xdr_location = msg->acpted_rply.ar_results.where; -+ -+ msg->acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; -+ msg->acpted_rply.ar_results.where = NULL; -+ } else -+ has_args = FALSE; -+ - xdrs->x_op = XDR_ENCODE; - XDR_SETPOS(xdrs, 0); - msg->rm_xid = su->su_xid; -- if (xdr_replymsg(xdrs, msg)) { -+ if (xdr_replymsg(xdrs, msg) && -+ (!has_args || -+ (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) { - struct msghdr *msg = &su->su_msghdr; - struct iovec iov; - -@@ -264,7 +282,12 @@ svc_dg_getargs(xprt, xdr_args, args_ptr) - xdrproc_t xdr_args; - void *args_ptr; - { -- return (*xdr_args)(&(su_data(xprt)->su_xdrs), args_ptr); -+ if (! SVCAUTH_UNWRAP(xprt->xp_auth, &(su_data(xprt)->su_xdrs), -+ xdr_args, args_ptr)) { -+ (void)svc_freeargs(xprt, xdr_args, args_ptr); -+ return FALSE; -+ } -+ return TRUE; - } - - static bool_t -@@ -288,6 +311,10 @@ svc_dg_destroy(xprt) - xprt_unregister(xprt); - if (xprt->xp_fd != -1) - (void)close(xprt->xp_fd); -+ if (xprt->xp_auth != NULL) { -+ SVCAUTH_DESTROY(xprt->xp_auth); -+ xprt->xp_auth = NULL; -+ } - XDR_DESTROY(&(su->su_xdrs)); - (void) mem_free(rpc_buffer(xprt), su->su_iosz); - (void) mem_free(su, sizeof (*su)); -diff --git a/src/svc_vc.c b/src/svc_vc.c -index aaaf2d7..74632e2 100644 ---- a/src/svc_vc.c -+++ b/src/svc_vc.c -@@ -172,6 +172,7 @@ svc_vc_create(fd, sendsize, recvsize) - xprt->xp_p1 = r; - xprt->xp_p2 = NULL; - xprt->xp_p3 = NULL; -+ xprt->xp_auth = NULL; - xprt->xp_verf = _null_auth; - svc_vc_rendezvous_ops(xprt); - xprt->xp_port = (u_short)-1; /* It is the rendezvouser */ -@@ -283,6 +284,7 @@ makefd_xprt(fd, sendsize, recvsize) - xdrrec_create(&(cd->xdrs), sendsize, recvsize, - xprt, read_vc, write_vc); - xprt->xp_p1 = cd; -+ xprt->xp_auth = NULL; - xprt->xp_verf.oa_base = cd->verf_body; - svc_vc_ops(xprt); /* truely deals with calls */ - xprt->xp_port = 0; /* this is a connection, not a rendezvouser */ -@@ -412,6 +414,10 @@ __svc_vc_dodestroy(xprt) - XDR_DESTROY(&(cd->xdrs)); - mem_free(cd, sizeof(struct cf_conn)); - } -+ if (xprt->xp_auth != NULL) { -+ SVCAUTH_DESTROY(xprt->xp_auth); -+ xprt->xp_auth = NULL; -+ } - if (xprt->xp_rtaddr.buf) - mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen); - if (xprt->xp_ltaddr.buf) -@@ -610,7 +616,11 @@ svc_vc_recv(xprt, msg) - } - - xdrs->x_op = XDR_DECODE; -- (void)xdrrec_skiprecord(xdrs); -+ /* -+ * No need skip records with nonblocking connections -+ */ -+ if (cd->nonblock == FALSE) -+ (void)xdrrec_skiprecord(xdrs); - if (xdr_callmsg(xdrs, msg)) { - cd->x_id = msg->rm_xid; - return (TRUE); -@@ -628,8 +638,13 @@ svc_vc_getargs(xprt, xdr_args, args_ptr) - - assert(xprt != NULL); - /* args_ptr may be NULL */ -- return ((*xdr_args)(&(((struct cf_conn *)(xprt->xp_p1))->xdrs), -- args_ptr)); -+ -+ if (! SVCAUTH_UNWRAP(xprt->xp_auth, -+ &(((struct cf_conn *)(xprt->xp_p1))->xdrs), -+ xdr_args, args_ptr)) { -+ return FALSE; -+ } -+ return TRUE; - } - - static bool_t -@@ -658,15 +673,35 @@ svc_vc_reply(xprt, msg) - XDR *xdrs; - bool_t rstat; - -+ xdrproc_t xdr_results; -+ caddr_t xdr_location; -+ bool_t has_args; -+ - assert(xprt != NULL); - assert(msg != NULL); - - cd = (struct cf_conn *)(xprt->xp_p1); - xdrs = &(cd->xdrs); - -+ if (msg->rm_reply.rp_stat == MSG_ACCEPTED && -+ msg->rm_reply.rp_acpt.ar_stat == SUCCESS) { -+ has_args = TRUE; -+ xdr_results = msg->acpted_rply.ar_results.proc; -+ xdr_location = msg->acpted_rply.ar_results.where; -+ -+ msg->acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; -+ msg->acpted_rply.ar_results.where = NULL; -+ } else -+ has_args = FALSE; -+ - xdrs->x_op = XDR_ENCODE; - msg->rm_xid = cd->x_id; -- rstat = xdr_replymsg(xdrs, msg); -+ rstat = FALSE; -+ if (xdr_replymsg(xdrs, msg) && -+ (!has_args || -+ (SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) { -+ rstat = TRUE; -+ } - (void)xdrrec_endofrecord(xdrs, TRUE); - return (rstat); - } -diff --git a/src/xdr_rec.c b/src/xdr_rec.c -index 4e815d7..2aca623 100644 ---- a/src/xdr_rec.c -+++ b/src/xdr_rec.c -@@ -64,7 +64,6 @@ - #include <rpc/clnt.h> - #include <stddef.h> - #include "rpc_com.h" --#include <unistd.h> - static bool_t xdrrec_getlong(XDR *, long *); - static bool_t xdrrec_putlong(XDR *, const long *); - static bool_t xdrrec_getbytes(XDR *, char *, u_int); -@@ -330,22 +329,22 @@ xdrrec_getpos(xdrs) - RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; - off_t pos; - -- pos = lseek((int)(u_long)rstrm->tcp_handle, (off_t)0, 1); -- if (pos != -1) -- switch (xdrs->x_op) { -+ switch (xdrs->x_op) { - -- case XDR_ENCODE: -- pos += rstrm->out_finger - rstrm->out_base; -- break; -+ case XDR_ENCODE: -+ pos = rstrm->out_finger - rstrm->out_base -+ - BYTES_PER_XDR_UNIT; -+ break; - -- case XDR_DECODE: -- pos -= rstrm->in_boundry - rstrm->in_finger; -- break; -+ case XDR_DECODE: -+ pos = rstrm->in_boundry - rstrm->in_finger -+ - BYTES_PER_XDR_UNIT; -+ break; - -- default: -- pos = (off_t) -1; -- break; -- } -+ default: -+ pos = (off_t) -1; -+ break; -+ } - return ((u_int) pos); - } - -diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h -index 734e6b9..5f66e67 100644 ---- a/tirpc/rpc/auth.h -+++ b/tirpc/rpc/auth.h -@@ -203,8 +203,22 @@ typedef struct __auth { - - } *ah_ops; - void *ah_private; -+ int ah_refcnt; - } AUTH; - -+static __inline int -+auth_get(AUTH *auth) -+{ -+ return __sync_add_and_fetch(&auth->ah_refcnt, 1); -+} -+ -+static __inline int -+auth_put(AUTH *auth) -+{ -+ return __sync_sub_and_fetch(&auth->ah_refcnt, 1); -+} -+ -+ - - /* - * Authentication ops. -@@ -234,10 +248,23 @@ typedef struct __auth { - #define auth_refresh(auth, msg) \ - ((*((auth)->ah_ops->ah_refresh))(auth, msg)) - --#define AUTH_DESTROY(auth) \ -- ((*((auth)->ah_ops->ah_destroy))(auth)) --#define auth_destroy(auth) \ -- ((*((auth)->ah_ops->ah_destroy))(auth)) -+#define AUTH_DESTROY(auth) \ -+ do { \ -+ int refs; \ -+ if ((refs = auth_put((auth))) == 0) \ -+ ((*((auth)->ah_ops->ah_destroy))(auth));\ -+ log_debug("%s: auth_put(), refs %d\n", \ -+ __func__, refs); \ -+ } while (0) -+ -+#define auth_destroy(auth) \ -+ do { \ -+ int refs; \ -+ if ((refs = auth_put((auth))) == 0) \ -+ ((*((auth)->ah_ops->ah_destroy))(auth));\ -+ log_debug("%s: auth_put(), refs %d\n", \ -+ __func__, refs); \ -+ } while (0) - - #define AUTH_WRAP(auth, xdrs, xfunc, xwhere) \ - ((*((auth)->ah_ops->ah_wrap))(auth, xdrs, \ -@@ -373,7 +400,7 @@ __END_DECLS - __BEGIN_DECLS - struct svc_req; - struct rpc_msg; --enum auth_stat _svcauth_null (struct svc_req *, struct rpc_msg *); -+enum auth_stat _svcauth_none (struct svc_req *, struct rpc_msg *); - enum auth_stat _svcauth_short (struct svc_req *, struct rpc_msg *); - enum auth_stat _svcauth_unix (struct svc_req *, struct rpc_msg *); - __END_DECLS -diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h -index e3d6897..d2881ad 100644 ---- a/tirpc/rpc/des.h -+++ b/tirpc/rpc/des.h -@@ -33,6 +33,9 @@ - * Copyright (c) 1986 by Sun Microsystems, Inc. - */ - -+#ifndef _RPC_DES_H_ -+#define _RPC_DES_H_ -+ - #define DES_MAXLEN 65536 /* maximum # of bytes to encrypt */ - #define DES_QUICKLEN 16 /* maximum # of bytes to encrypt quickly */ - -@@ -80,3 +83,5 @@ struct desparams { - * Software DES. - */ - extern int _des_crypt( char *, int, struct desparams * ); -+ -+#endif -diff --git a/tirpc/rpc/svc_auth.h b/tirpc/rpc/svc_auth.h -index 659e90c..14269d1 100644 ---- a/tirpc/rpc/svc_auth.h -+++ b/tirpc/rpc/svc_auth.h -@@ -44,17 +44,23 @@ - /* - * Interface to server-side authentication flavors. - */ --typedef struct { -+typedef struct SVCAUTH { - struct svc_auth_ops { -- int (*svc_ah_wrap)(void); -- int (*svc_ah_unwrap)(void); -- int (*svc_ah_destroy)(void); -+ int (*svc_ah_wrap)(struct SVCAUTH *, XDR *, xdrproc_t, -+ caddr_t); -+ int (*svc_ah_unwrap)(struct SVCAUTH *, XDR *, xdrproc_t, -+ caddr_t); -+ int (*svc_ah_destroy)(struct SVCAUTH *); - } *svc_ah_ops; - caddr_t svc_ah_private; - } SVCAUTH; - --#define SVCAUTH_DESTROY(cred) ((*(cred)->svc_ah_ops->svc_ah_destroy)()) --#define svcauth_destroy(cred) ((*(cred)->svc_ah_ops->svc_ah_destroy)()) -+#define SVCAUTH_WRAP(auth, xdrs, xfunc, xwhere) \ -+ ((*((auth)->svc_ah_ops->svc_ah_wrap))(auth, xdrs, xfunc, xwhere)) -+#define SVCAUTH_UNWRAP(auth, xdrs, xfunc, xwhere) \ -+ ((*((auth)->svc_ah_ops->svc_ah_unwrap))(auth, xdrs, xfunc, xwhere)) -+#define SVCAUTH_DESTROY(auth) \ -+ ((*((auth)->svc_ah_ops->svc_ah_destroy))(auth)) - - /* - * Server side authenticator diff --git a/core/libtirpc/libtirpc-0.2.3rc3.patch b/core/libtirpc/libtirpc-0.2.3rc3.patch deleted file mode 100644 index 14577186b..000000000 --- a/core/libtirpc/libtirpc-0.2.3rc3.patch +++ /dev/null @@ -1,1312 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 97c6f2c..7ff80a4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -23,6 +23,7 @@ AC_HEADER_DIRENT - AC_PREFIX_DEFAULT(/usr) - AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h]) - AC_CHECK_LIB([pthread], [pthread_create]) -+AC_CHECK_LIB([nsl], [yp_get_default_domain]) - - - AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile]) -diff --git a/doc/Makefile.am b/doc/Makefile.am -index cc4fa76..f8c88b5 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -1,5 +1,5 @@ - - install: install-am -- $(mkinstalldirs) $(DESTDIR)/etc -- cp -p ./etc_netconfig $(DESTDIR)/etc/netconfig -- chmod 0644 $(DESTDIR)/etc/netconfig -+ $(mkinstalldirs) $(DESTDIR)/$(sysconfdir) -+ cp -p ./etc_netconfig $(DESTDIR)/$(sysconfdir)/netconfig -+ chmod 0644 $(DESTDIR)/$(sysconfdir)/netconfig -diff --git a/src/Makefile.am b/src/Makefile.am -index 7ee8cbc..66350f5 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -40,7 +40,7 @@ lib_LTLIBRARIES = libtirpc.la - # release number of your package. This is an abuse that only fosters - # misunderstanding of the purpose of library versions." - # --libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:10:0 -+libtirpc_la_LDFLAGS = -lpthread -version-info 1:10:0 - - libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \ - clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \ -@@ -48,17 +48,16 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln - getrpcport.c mt_misc.c pmap_clnt.c pmap_getmaps.c pmap_getport.c \ - pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \ - rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ -- rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_generic.c \ -- svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ -- auth_time.c auth_des.c authdes_prot.c des_crypt.c -+ rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ -+ svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ -+ auth_time.c auth_des.c authdes_prot.c - - ## XDR - libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c - - ## Secure-RPC - if GSS -- libtirpc_la_SOURCES += auth_gss.c authgss_prot.c svc_auth_gss.c \ -- svc_auth_none.c -+ libtirpc_la_SOURCES += auth_gss.c authgss_prot.c svc_auth_gss.c - libtirpc_la_LDFLAGS += $(GSSGLUE_LIBS) - libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSGLUE_CFLAGS) - endif -diff --git a/src/auth_des.c b/src/auth_des.c -index 37e7667..f0c8b8c 100644 ---- a/src/auth_des.c -+++ b/src/auth_des.c -@@ -223,6 +223,7 @@ authdes_pk_seccreate(const char *servername, netobj *pkey, u_int window, - goto failed; - } - ad->ad_nis_srvr = NULL; /* not needed any longer */ -+ auth_get(auth); /* Reference for caller */ - return (auth); - - failed: -@@ -472,6 +473,12 @@ authdes_destroy(AUTH *auth) - FREE(auth, sizeof(AUTH)); - } - -+static bool_t -+authdes_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere) -+{ -+ return ((*xfunc)(xdrs, xwhere)); -+} -+ - static struct auth_ops * - authdes_ops(void) - { -@@ -487,6 +494,8 @@ authdes_ops(void) - ops.ah_validate = authdes_validate; - ops.ah_refresh = authdes_refresh; - ops.ah_destroy = authdes_destroy; -+ ops.ah_wrap = authdes_wrap; -+ ops.ah_unwrap = authdes_wrap; - } - mutex_unlock(&authdes_ops_lock); - return (&ops); -diff --git a/src/auth_gss.c b/src/auth_gss.c -index df3017a..539101e 100644 ---- a/src/auth_gss.c -+++ b/src/auth_gss.c -@@ -87,9 +87,9 @@ print_rpc_gss_sec(struct rpc_gss_sec *ptr) - int i; - char *p; - -- log_debug("rpc_gss_sec:"); -+ gss_log_debug("rpc_gss_sec:"); - if(ptr->mech == NULL) -- log_debug("NULL gss_OID mech"); -+ gss_log_debug("NULL gss_OID mech"); - else { - fprintf(stderr, " mechanism_OID: {"); - p = (char *)ptr->mech->elements; -@@ -151,7 +151,7 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec) - struct rpc_gss_data *gd; - OM_uint32 min_stat = 0; - -- log_debug("in authgss_create()"); -+ gss_log_debug("in authgss_create()"); - - memset(&rpc_createerr, 0, sizeof(rpc_createerr)); - -@@ -200,6 +200,8 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec) - - if (!authgss_refresh(auth)) - auth = NULL; -+ else -+ auth_get(auth); /* Reference for caller */ - - clnt->cl_auth = save_auth; - -@@ -214,7 +216,7 @@ authgss_create_default(CLIENT *clnt, char *service, struct rpc_gss_sec *sec) - gss_buffer_desc sname; - gss_name_t name = GSS_C_NO_NAME; - -- log_debug("in authgss_create_default()"); -+ gss_log_debug("in authgss_create_default()"); - - - sname.value = service; -@@ -225,7 +227,7 @@ authgss_create_default(CLIENT *clnt, char *service, struct rpc_gss_sec *sec) - &name); - - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_import_name", maj_stat, min_stat); -+ gss_log_status("gss_import_name", maj_stat, min_stat); - rpc_createerr.cf_stat = RPC_AUTHERROR; - return (NULL); - } -@@ -247,7 +249,7 @@ authgss_get_private_data(AUTH *auth, struct authgss_private_data *pd) - { - struct rpc_gss_data *gd; - -- log_debug("in authgss_get_private_data()"); -+ gss_log_debug("in authgss_get_private_data()"); - - if (!auth || !pd) - return (FALSE); -@@ -267,7 +269,7 @@ authgss_get_private_data(AUTH *auth, struct authgss_private_data *pd) - static void - authgss_nextverf(AUTH *auth) - { -- log_debug("in authgss_nextverf()"); -+ gss_log_debug("in authgss_nextverf()"); - /* no action necessary */ - } - -@@ -281,7 +283,7 @@ authgss_marshal(AUTH *auth, XDR *xdrs) - OM_uint32 maj_stat, min_stat; - bool_t xdr_stat; - -- log_debug("in authgss_marshal()"); -+ gss_log_debug("in authgss_marshal()"); - - gd = AUTH_PRIVATE(auth); - -@@ -316,7 +318,7 @@ authgss_marshal(AUTH *auth, XDR *xdrs) - &rpcbuf, &checksum); - - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_get_mic", maj_stat, min_stat); -+ gss_log_status("gss_get_mic", maj_stat, min_stat); - if (maj_stat == GSS_S_CONTEXT_EXPIRED) { - gd->established = FALSE; - authgss_destroy_context(auth); -@@ -341,7 +343,7 @@ authgss_validate(AUTH *auth, struct opaque_auth *verf) - gss_buffer_desc signbuf, checksum; - OM_uint32 maj_stat, min_stat; - -- log_debug("in authgss_validate()"); -+ gss_log_debug("in authgss_validate()"); - - gd = AUTH_PRIVATE(auth); - -@@ -377,7 +379,7 @@ authgss_validate(AUTH *auth, struct opaque_auth *verf) - maj_stat = gss_verify_mic(&min_stat, gd->ctx, &signbuf, - &checksum, &qop_state); - if (maj_stat != GSS_S_COMPLETE || qop_state != gd->sec.qop) { -- log_status("gss_verify_mic", maj_stat, min_stat); -+ gss_log_status("gss_verify_mic", maj_stat, min_stat); - if (maj_stat == GSS_S_CONTEXT_EXPIRED) { - gd->established = FALSE; - authgss_destroy_context(auth); -@@ -395,7 +397,7 @@ authgss_refresh(AUTH *auth) - gss_buffer_desc *recv_tokenp, send_token; - OM_uint32 maj_stat, min_stat, call_stat, ret_flags; - -- log_debug("in authgss_refresh()"); -+ gss_log_debug("in authgss_refresh()"); - - gd = AUTH_PRIVATE(auth); - -@@ -414,9 +416,9 @@ authgss_refresh(AUTH *auth) - #ifdef DEBUG - /* print the token we just received */ - if (recv_tokenp != GSS_C_NO_BUFFER) { -- log_debug("The token we just received (length %d):", -+ gss_log_debug("The token we just received (length %d):", - recv_tokenp->length); -- log_hexdump(recv_tokenp->value, recv_tokenp->length, 0); -+ gss_log_hexdump(recv_tokenp->value, recv_tokenp->length, 0); - } - #endif - maj_stat = gss_init_sec_context(&min_stat, -@@ -439,7 +441,7 @@ authgss_refresh(AUTH *auth) - } - if (maj_stat != GSS_S_COMPLETE && - maj_stat != GSS_S_CONTINUE_NEEDED) { -- log_status("gss_init_sec_context", maj_stat, min_stat); -+ gss_log_status("gss_init_sec_context", maj_stat, min_stat); - break; - } - if (send_token.length != 0) { -@@ -447,9 +449,9 @@ authgss_refresh(AUTH *auth) - - #ifdef DEBUG - /* print the token we are about to send */ -- log_debug("The token being sent (length %d):", -+ gss_log_debug("The token being sent (length %d):", - send_token.length); -- log_hexdump(send_token.value, send_token.length, 0); -+ gss_log_hexdump(send_token.value, send_token.length, 0); - #endif - - call_stat = clnt_call(gd->clnt, NULLPROC, -@@ -498,7 +500,7 @@ authgss_refresh(AUTH *auth) - - if (maj_stat != GSS_S_COMPLETE - || qop_state != gd->sec.qop) { -- log_status("gss_verify_mic", maj_stat, min_stat); -+ gss_log_status("gss_verify_mic", maj_stat, min_stat); - if (maj_stat == GSS_S_CONTEXT_EXPIRED) { - gd->established = FALSE; - authgss_destroy_context(auth); -@@ -531,7 +533,7 @@ authgss_service(AUTH *auth, int svc) - { - struct rpc_gss_data *gd; - -- log_debug("in authgss_service()"); -+ gss_log_debug("in authgss_service()"); - - if (!auth) - return(FALSE); -@@ -549,15 +551,26 @@ authgss_destroy_context(AUTH *auth) - struct rpc_gss_data *gd; - OM_uint32 min_stat; - -- log_debug("in authgss_destroy_context()"); -+ gss_log_debug("in authgss_destroy_context()"); - - gd = AUTH_PRIVATE(auth); - - if (gd->gc.gc_ctx.length != 0) { - if (gd->established) { -+ AUTH *save_auth = NULL; -+ -+ /* Make sure we use the right auth_ops */ -+ if (gd->clnt->cl_auth != auth) { -+ save_auth = gd->clnt->cl_auth; -+ gd->clnt->cl_auth = auth; -+ } -+ - gd->gc.gc_proc = RPCSEC_GSS_DESTROY; - clnt_call(gd->clnt, NULLPROC, (xdrproc_t)xdr_void, NULL, - (xdrproc_t)xdr_void, NULL, AUTH_TIMEOUT); -+ -+ if (save_auth != NULL) -+ gd->clnt->cl_auth = save_auth; - } - gss_release_buffer(&min_stat, &gd->gc.gc_ctx); - /* XXX ANDROS check size of context - should be 8 */ -@@ -582,7 +595,7 @@ authgss_destroy(AUTH *auth) - struct rpc_gss_data *gd; - OM_uint32 min_stat; - -- log_debug("in authgss_destroy()"); -+ gss_log_debug("in authgss_destroy()"); - - gd = AUTH_PRIVATE(auth); - -@@ -603,7 +616,7 @@ authgss_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr) - { - struct rpc_gss_data *gd; - -- log_debug("in authgss_wrap()"); -+ gss_log_debug("in authgss_wrap()"); - - gd = AUTH_PRIVATE(auth); - -@@ -620,7 +633,7 @@ authgss_unwrap(AUTH *auth, XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr) - { - struct rpc_gss_data *gd; - -- log_debug("in authgss_unwrap()"); -+ gss_log_debug("in authgss_unwrap()"); - - gd = AUTH_PRIVATE(auth); - -diff --git a/src/auth_none.c b/src/auth_none.c -index a439ec6..008c589 100644 ---- a/src/auth_none.c -+++ b/src/auth_none.c -@@ -155,6 +155,12 @@ authnone_destroy(AUTH *client) - { - } - -+static bool_t -+authnone_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere) -+{ -+ return ((*xfunc)(xdrs, xwhere)); -+} -+ - static struct auth_ops * - authnone_ops() - { -@@ -170,6 +176,8 @@ authnone_ops() - ops.ah_validate = authnone_validate; - ops.ah_refresh = authnone_refresh; - ops.ah_destroy = authnone_destroy; -+ ops.ah_wrap = authnone_wrap; -+ ops.ah_unwrap = authnone_wrap; - } - mutex_unlock(&ops_lock); - return (&ops); -diff --git a/src/auth_unix.c b/src/auth_unix.c -index c2469da..4b9b13f 100644 ---- a/src/auth_unix.c -+++ b/src/auth_unix.c -@@ -162,6 +162,7 @@ authunix_create(machname, uid, gid, len, aup_gids) - */ - auth->ah_cred = au->au_origcred; - marshal_new_auth(auth); -+ auth_get(auth); /* Reference for caller */ - return (auth); - #ifndef _KERNEL - cleanup_authunix_create: -@@ -396,6 +397,12 @@ marshal_new_auth(auth) - XDR_DESTROY(xdrs); - } - -+static bool_t -+authunix_wrap(AUTH *auth, XDR *xdrs, xdrproc_t xfunc, caddr_t xwhere) -+{ -+ return ((*xfunc)(xdrs, xwhere)); -+} -+ - static struct auth_ops * - authunix_ops() - { -@@ -411,6 +418,8 @@ authunix_ops() - ops.ah_validate = authunix_validate; - ops.ah_refresh = authunix_refresh; - ops.ah_destroy = authunix_destroy; -+ ops.ah_wrap = authunix_wrap; -+ ops.ah_unwrap = authunix_wrap; - } - mutex_unlock(&ops_lock); - return (&ops); -diff --git a/src/authgss_prot.c b/src/authgss_prot.c -index 9d7fa09..a3c93c9 100644 ---- a/src/authgss_prot.c -+++ b/src/authgss_prot.c -@@ -64,10 +64,10 @@ xdr_rpc_gss_buf(XDR *xdrs, gss_buffer_t buf, u_int maxsize) - if (xdr_stat && xdrs->x_op == XDR_DECODE) - buf->length = tmplen; - -- log_debug("xdr_rpc_gss_buf: %s %s (%p:%d)", -- (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode", -- (xdr_stat == TRUE) ? "success" : "failure", -- buf->value, buf->length); -+ gss_log_debug("xdr_rpc_gss_buf: %s %s (%p:%d)", -+ (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode", -+ (xdr_stat == TRUE) ? "success" : "failure", -+ buf->value, buf->length); - - return xdr_stat; - } -@@ -83,12 +83,12 @@ xdr_rpc_gss_cred(XDR *xdrs, struct rpc_gss_cred *p) - xdr_enum(xdrs, (enum_t *)&p->gc_svc) && - xdr_rpc_gss_buf(xdrs, &p->gc_ctx, MAX_AUTH_BYTES)); - -- log_debug("xdr_rpc_gss_cred: %s %s " -- "(v %d, proc %d, seq %d, svc %d, ctx %p:%d)", -- (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode", -- (xdr_stat == TRUE) ? "success" : "failure", -- p->gc_v, p->gc_proc, p->gc_seq, p->gc_svc, -- p->gc_ctx.value, p->gc_ctx.length); -+ gss_log_debug("xdr_rpc_gss_cred: %s %s " -+ "(v %d, proc %d, seq %d, svc %d, ctx %p:%d)", -+ (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode", -+ (xdr_stat == TRUE) ? "success" : "failure", -+ p->gc_v, p->gc_proc, p->gc_seq, p->gc_svc, -+ p->gc_ctx.value, p->gc_ctx.length); - - return (xdr_stat); - } -@@ -101,10 +101,10 @@ xdr_rpc_gss_init_args(XDR *xdrs, gss_buffer_desc *p) - - xdr_stat = xdr_rpc_gss_buf(xdrs, p, maxlen); - -- log_debug("xdr_rpc_gss_init_args: %s %s (token %p:%d)", -- (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode", -- (xdr_stat == TRUE) ? "success" : "failure", -- p->value, p->length); -+ gss_log_debug("xdr_rpc_gss_init_args: %s %s (token %p:%d)", -+ (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode", -+ (xdr_stat == TRUE) ? "success" : "failure", -+ p->value, p->length); - - return (xdr_stat); - } -@@ -123,13 +123,13 @@ xdr_rpc_gss_init_res(XDR *xdrs, struct rpc_gss_init_res *p) - xdr_u_int(xdrs, &p->gr_win) && - xdr_rpc_gss_buf(xdrs, &p->gr_token, tok_maxlen)); - -- log_debug("xdr_rpc_gss_init_res %s %s " -- "(ctx %p:%d, maj %d, min %d, win %d, token %p:%d)", -- (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode", -- (xdr_stat == TRUE) ? "success" : "failure", -- p->gr_ctx.value, p->gr_ctx.length, -- p->gr_major, p->gr_minor, p->gr_win, -- p->gr_token.value, p->gr_token.length); -+ gss_log_debug("xdr_rpc_gss_init_res %s %s " -+ "(ctx %p:%d, maj %d, min %d, win %d, token %p:%d)", -+ (xdrs->x_op == XDR_ENCODE) ? "encode" : "decode", -+ (xdr_stat == TRUE) ? "success" : "failure", -+ p->gr_ctx.value, p->gr_ctx.length, -+ p->gr_major, p->gr_minor, p->gr_win, -+ p->gr_token.value, p->gr_token.length); - - return (xdr_stat); - } -@@ -161,6 +161,7 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - databuflen = end - start - 4; - XDR_SETPOS(xdrs, start + 4); - databuf.value = XDR_INLINE(xdrs, databuflen); -+ databuf.length = databuflen; - - xdr_stat = FALSE; - -@@ -169,13 +170,12 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - XDR_SETPOS(xdrs, start); - if (!xdr_u_int(xdrs, (u_int *)&databuflen)) - return (FALSE); -- databuf.length = databuflen; - - /* Checksum rpc_gss_data_t. */ - maj_stat = gss_get_mic(&min_stat, ctx, qop, - &databuf, &wrapbuf); - if (maj_stat != GSS_S_COMPLETE) { -- log_debug("gss_get_mic failed"); -+ gss_log_debug("gss_get_mic failed"); - return (FALSE); - } - /* Marshal checksum. */ -@@ -189,7 +189,7 @@ xdr_rpc_gss_wrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - maj_stat = gss_wrap(&min_stat, ctx, TRUE, qop, &databuf, - &conf_state, &wrapbuf); - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_wrap", maj_stat, min_stat); -+ gss_log_status("gss_wrap", maj_stat, min_stat); - return (FALSE); - } - /* Marshal databody_priv. */ -@@ -222,13 +222,13 @@ xdr_rpc_gss_unwrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - if (svc == RPCSEC_GSS_SVC_INTEGRITY) { - /* Decode databody_integ. */ - if (!xdr_rpc_gss_buf(xdrs, &databuf, (u_int)-1)) { -- log_debug("xdr decode databody_integ failed"); -+ gss_log_debug("xdr decode databody_integ failed"); - return (FALSE); - } - /* Decode checksum. */ - if (!xdr_rpc_gss_buf(xdrs, &wrapbuf, (u_int)-1)) { - gss_release_buffer(&min_stat, &databuf); -- log_debug("xdr decode checksum failed"); -+ gss_log_debug("xdr decode checksum failed"); - return (FALSE); - } - /* Verify checksum and QOP. */ -@@ -238,14 +238,14 @@ xdr_rpc_gss_unwrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - - if (maj_stat != GSS_S_COMPLETE || qop_state != qop) { - gss_release_buffer(&min_stat, &databuf); -- log_status("gss_verify_mic", maj_stat, min_stat); -+ gss_log_status("gss_verify_mic", maj_stat, min_stat); - return (FALSE); - } - } - else if (svc == RPCSEC_GSS_SVC_PRIVACY) { - /* Decode databody_priv. */ - if (!xdr_rpc_gss_buf(xdrs, &wrapbuf, (u_int)-1)) { -- log_debug("xdr decode databody_priv failed"); -+ gss_log_debug("xdr decode databody_priv failed"); - return (FALSE); - } - /* Decrypt databody. */ -@@ -258,7 +258,7 @@ xdr_rpc_gss_unwrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - if (maj_stat != GSS_S_COMPLETE || qop_state != qop || - conf_state != TRUE) { - gss_release_buffer(&min_stat, &databuf); -- log_status("gss_unwrap", maj_stat, min_stat); -+ gss_log_status("gss_unwrap", maj_stat, min_stat); - return (FALSE); - } - } -@@ -271,7 +271,7 @@ xdr_rpc_gss_unwrap_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - - /* Verify sequence number. */ - if (xdr_stat == TRUE && seq_num != seq) { -- log_debug("wrong sequence number in databody"); -+ gss_log_debug("wrong sequence number in databody"); - return (FALSE); - } - return (xdr_stat); -@@ -300,7 +300,7 @@ xdr_rpc_gss_data(XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr, - #include <ctype.h> - - void --log_debug(const char *fmt, ...) -+gss_log_debug(const char *fmt, ...) - { - va_list ap; - -@@ -312,7 +312,7 @@ log_debug(const char *fmt, ...) - } - - void --log_status(char *m, OM_uint32 maj_stat, OM_uint32 min_stat) -+gss_log_status(char *m, OM_uint32 maj_stat, OM_uint32 min_stat) - { - OM_uint32 min; - gss_buffer_desc msg; -@@ -332,7 +332,7 @@ log_status(char *m, OM_uint32 maj_stat, OM_uint32 min_stat) - } - - void --log_hexdump(const u_char *buf, int len, int offset) -+gss_log_hexdump(const u_char *buf, int len, int offset) - { - u_int i, j, jm; - int c; -@@ -367,17 +367,17 @@ log_hexdump(const u_char *buf, int len, int offset) - #else - - void --log_debug(const char *fmt, ...) -+gss_log_debug(const char *fmt, ...) - { - } - - void --log_status(char *m, OM_uint32 maj_stat, OM_uint32 min_stat) -+gss_log_status(char *m, OM_uint32 maj_stat, OM_uint32 min_stat) - { - } - - void --log_hexdump(const u_char *buf, int len, int offset) -+gss_log_hexdump(const u_char *buf, int len, int offset) - { - } - -diff --git a/src/clnt_dg.c b/src/clnt_dg.c -index 79fed5d..4a1f60a 100644 ---- a/src/clnt_dg.c -+++ b/src/clnt_dg.c -@@ -366,7 +366,7 @@ call_again: - - if ((! XDR_PUTINT32(xdrs, (int32_t *)&proc)) || - (! AUTH_MARSHALL(cl->cl_auth, xdrs)) || -- (! (*xargs)(xdrs, argsp))) { -+ (! AUTH_WRAP(cl->cl_auth, xdrs, xargs, argsp))) { - cu->cu_error.re_status = RPC_CANTENCODEARGS; - goto out; - } -@@ -400,8 +400,8 @@ get_reply: - * (We assume that this is actually only executed once.) - */ - reply_msg.acpted_rply.ar_verf = _null_auth; -- reply_msg.acpted_rply.ar_results.where = resultsp; -- reply_msg.acpted_rply.ar_results.proc = xresults; -+ reply_msg.acpted_rply.ar_results.where = NULL; -+ reply_msg.acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; - - fd.fd = cu->cu_fd; - fd.events = POLLIN; -@@ -512,6 +512,10 @@ get_reply: - &reply_msg.acpted_rply.ar_verf)) { - cu->cu_error.re_status = RPC_AUTHERROR; - cu->cu_error.re_why = AUTH_INVALIDRESP; -+ } else if (! AUTH_UNWRAP(cl->cl_auth, &reply_xdrs, -+ xresults, resultsp)) { -+ if (cu->cu_error.re_status == RPC_SUCCESS) -+ cu->cu_error.re_status = RPC_CANTDECODERES; - } - if (reply_msg.acpted_rply.ar_verf.oa_base != NULL) { - xdrs->x_op = XDR_FREE; -diff --git a/src/clnt_vc.c b/src/clnt_vc.c -index 359063c..097cae8 100644 ---- a/src/clnt_vc.c -+++ b/src/clnt_vc.c -@@ -364,7 +364,7 @@ call_again: - if ((! XDR_PUTBYTES(xdrs, ct->ct_u.ct_mcallc, ct->ct_mpos)) || - (! XDR_PUTINT32(xdrs, (int32_t *)&proc)) || - (! AUTH_MARSHALL(cl->cl_auth, xdrs)) || -- (! (*xdr_args)(xdrs, args_ptr))) { -+ (! AUTH_WRAP(cl->cl_auth, xdrs, xdr_args, args_ptr))) { - if (ct->ct_error.re_status == RPC_SUCCESS) - ct->ct_error.re_status = RPC_CANTENCODEARGS; - (void)xdrrec_endofrecord(xdrs, TRUE); -@@ -420,7 +420,8 @@ call_again: - &reply_msg.acpted_rply.ar_verf)) { - ct->ct_error.re_status = RPC_AUTHERROR; - ct->ct_error.re_why = AUTH_INVALIDRESP; -- } else if (! (*xdr_results)(xdrs, results_ptr)) { -+ } else if (! AUTH_UNWRAP(cl->cl_auth, xdrs, -+ xdr_results, results_ptr)) { - if (ct->ct_error.re_status == RPC_SUCCESS) - ct->ct_error.re_status = RPC_CANTDECODERES; - } -diff --git a/src/rpc_soc.c b/src/rpc_soc.c -index c678429..63d2197 100644 ---- a/src/rpc_soc.c -+++ b/src/rpc_soc.c -@@ -560,12 +560,10 @@ clntunix_create(raddr, prog, vers, sockp, sendsz, recvsz) - u_int recvsz; - { - struct netbuf *svcaddr; -- struct netconfig *nconf; - CLIENT *cl; - int len; - - cl = NULL; -- nconf = NULL; - svcaddr = NULL; - if (((svcaddr = malloc(sizeof(struct netbuf))) == NULL ) || - ((svcaddr->buf = malloc(sizeof(struct sockaddr_un))) == NULL)) { -diff --git a/src/svc.c b/src/svc.c -index b4a63d0..08cd6c9 100644 ---- a/src/svc.c -+++ b/src/svc.c -@@ -77,9 +77,6 @@ static struct svc_callout - - extern rwlock_t svc_lock; - extern rwlock_t svc_fd_lock; --#ifdef HAVE_LIBGSSAPI --extern struct svc_auth_ops svc_auth_gss_ops; --#endif - - static struct svc_callout *svc_find (rpcprog_t, rpcvers_t, - struct svc_callout **, char *); -@@ -717,11 +714,9 @@ svc_getreq_common (fd) - SVC_DESTROY (xprt); - break; - } -- else if ((xprt->xp_auth != NULL) --#ifdef HAVE_LIBGSSAPI -- && (xprt->xp_auth->svc_ah_ops != &svc_auth_gss_ops) --#endif -- ) { -+ else if ((xprt->xp_auth != NULL) && -+ (xprt->xp_auth->svc_ah_private == NULL)) -+ { - xprt->xp_auth = NULL; - } - } -diff --git a/src/svc_auth.c b/src/svc_auth.c -index c6b3a0b..e80d5f9 100644 ---- a/src/svc_auth.c -+++ b/src/svc_auth.c -@@ -98,8 +98,8 @@ _authenticate(rqst, msg) - rqst->rq_xprt->xp_verf.oa_length = 0; - cred_flavor = rqst->rq_cred.oa_flavor; - switch (cred_flavor) { -- case AUTH_NULL: -- dummy = _svcauth_null(rqst, msg); -+ case AUTH_NONE: -+ dummy = _svcauth_none(rqst, msg); - return (dummy); - case AUTH_SYS: - dummy = _svcauth_unix(rqst, msg); -@@ -132,15 +132,6 @@ _authenticate(rqst, msg) - return (AUTH_REJECTEDCRED); - } - --/*ARGSUSED*/ --enum auth_stat --_svcauth_null(rqst, msg) -- struct svc_req *rqst; -- struct rpc_msg *msg; --{ -- return (AUTH_OK); --} -- - /* - * Allow the rpc service to register new authentication types that it is - * prepared to handle. When an authentication flavor is registered, -diff --git a/src/svc_auth_gss.c b/src/svc_auth_gss.c -index 54b23b1..9c74313 100644 ---- a/src/svc_auth_gss.c -+++ b/src/svc_auth_gss.c -@@ -87,13 +87,13 @@ svcauth_gss_set_svc_name(gss_name_t name) - { - OM_uint32 maj_stat, min_stat; - -- log_debug("in svcauth_gss_set_svc_name()"); -+ gss_log_debug("in svcauth_gss_set_svc_name()"); - - if (_svcauth_gss_name != NULL) { - maj_stat = gss_release_name(&min_stat, &_svcauth_gss_name); - - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_release_name", maj_stat, min_stat); -+ gss_log_status("gss_release_name", maj_stat, min_stat); - return (FALSE); - } - _svcauth_gss_name = NULL; -@@ -101,7 +101,7 @@ svcauth_gss_set_svc_name(gss_name_t name) - maj_stat = gss_duplicate_name(&min_stat, name, &_svcauth_gss_name); - - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_duplicate_name", maj_stat, min_stat); -+ gss_log_status("gss_duplicate_name", maj_stat, min_stat); - return (FALSE); - } - -@@ -115,7 +115,7 @@ svcauth_gss_import_name(char *service) - gss_buffer_desc namebuf; - OM_uint32 maj_stat, min_stat; - -- log_debug("in svcauth_gss_import_name()"); -+ gss_log_debug("in svcauth_gss_import_name()"); - - namebuf.value = service; - namebuf.length = strlen(service); -@@ -124,7 +124,7 @@ svcauth_gss_import_name(char *service) - (gss_OID)GSS_C_NT_HOSTBASED_SERVICE, &name); - - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_import_name", maj_stat, min_stat); -+ gss_log_status("gss_import_name", maj_stat, min_stat); - return (FALSE); - } - if (svcauth_gss_set_svc_name(name) != TRUE) { -@@ -139,14 +139,14 @@ svcauth_gss_acquire_cred(void) - { - OM_uint32 maj_stat, min_stat; - -- log_debug("in svcauth_gss_acquire_cred()"); -+ gss_log_debug("in svcauth_gss_acquire_cred()"); - - maj_stat = gss_acquire_cred(&min_stat, _svcauth_gss_name, 0, - GSS_C_NULL_OID_SET, GSS_C_ACCEPT, - &_svcauth_gss_creds, NULL, NULL); - - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_acquire_cred", maj_stat, min_stat); -+ gss_log_status("gss_acquire_cred", maj_stat, min_stat); - return (FALSE); - } - return (TRUE); -@@ -157,12 +157,12 @@ svcauth_gss_release_cred(void) - { - OM_uint32 maj_stat, min_stat; - -- log_debug("in svcauth_gss_release_cred()"); -+ gss_log_debug("in svcauth_gss_release_cred()"); - - maj_stat = gss_release_cred(&min_stat, &_svcauth_gss_creds); - - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_release_cred", maj_stat, min_stat); -+ gss_log_status("gss_release_cred", maj_stat, min_stat); - return (FALSE); - } - -@@ -181,7 +181,7 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst, - gss_OID mech; - OM_uint32 maj_stat = 0, min_stat = 0, ret_flags, seq; - -- log_debug("in svcauth_gss_accept_context()"); -+ gss_log_debug("in svcauth_gss_accept_context()"); - - gd = SVCAUTH_PRIVATE(rqst->rq_xprt->xp_auth); - gc = (struct rpc_gss_cred *)rqst->rq_clntcred; -@@ -208,7 +208,7 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst, - - if (gr->gr_major != GSS_S_COMPLETE && - gr->gr_major != GSS_S_CONTINUE_NEEDED) { -- log_status("accept_sec_context", gr->gr_major, gr->gr_minor); -+ gss_log_status("accept_sec_context", gr->gr_major, gr->gr_minor); - gd->ctx = GSS_C_NO_CONTEXT; - gss_release_buffer(&min_stat, &gr->gr_token); - return (FALSE); -@@ -238,7 +238,7 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst, - maj_stat = gss_display_name(&min_stat, gd->client_name, - &gd->cname, &gd->sec.mech); - if (maj_stat != GSS_S_COMPLETE) { -- log_status("display_name", maj_stat, min_stat); -+ gss_log_status("display_name", maj_stat, min_stat); - return (FALSE); - } - #ifdef DEBUG -@@ -248,19 +248,19 @@ svcauth_gss_accept_sec_context(struct svc_req *rqst, - - gss_oid_to_str(&min_stat, mech, &mechname); - -- log_debug("accepted context for %.*s with " -- "<mech %.*s, qop %d, svc %d>", -- gd->cname.length, (char *)gd->cname.value, -- mechname.length, (char *)mechname.value, -- gd->sec.qop, gd->sec.svc); -+ gss_log_debug("accepted context for %.*s with " -+ "<mech %.*s, qop %d, svc %d>", -+ gd->cname.length, (char *)gd->cname.value, -+ mechname.length, (char *)mechname.value, -+ gd->sec.qop, gd->sec.svc); - - gss_release_buffer(&min_stat, &mechname); - } - #elif HAVE_HEIMDAL -- log_debug("accepted context for %.*s with " -- "<mech {}, qop %d, svc %d>", -- gd->cname.length, (char *)gd->cname.value, -- gd->sec.qop, gd->sec.svc); -+ gss_log_debug("accepted context for %.*s with " -+ "<mech {}, qop %d, svc %d>", -+ gd->cname.length, (char *)gd->cname.value, -+ gd->sec.qop, gd->sec.svc); - #endif - #endif /* DEBUG */ - seq = htonl(gr->gr_win); -@@ -289,7 +289,7 @@ svcauth_gss_validate(struct svc_rpc_gss_data *gd, struct rpc_msg *msg) - u_char rpchdr[128]; - int32_t *buf; - -- log_debug("in svcauth_gss_validate()"); -+ gss_log_debug("in svcauth_gss_validate()"); - - memset(rpchdr, 0, sizeof(rpchdr)); - -@@ -326,7 +326,7 @@ svcauth_gss_validate(struct svc_rpc_gss_data *gd, struct rpc_msg *msg) - &qop_state); - - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_verify_mic", maj_stat, min_stat); -+ gss_log_status("gss_verify_mic", maj_stat, min_stat); - return (FALSE); - } - return (TRUE); -@@ -339,7 +339,7 @@ svcauth_gss_nextverf(struct svc_req *rqst, u_int num) - gss_buffer_desc signbuf, checksum; - OM_uint32 maj_stat, min_stat; - -- log_debug("in svcauth_gss_nextverf()"); -+ gss_log_debug("in svcauth_gss_nextverf()"); - - if (rqst->rq_xprt->xp_auth == NULL) - return (FALSE); -@@ -353,7 +353,7 @@ svcauth_gss_nextverf(struct svc_req *rqst, u_int num) - &signbuf, &checksum); - - if (maj_stat != GSS_S_COMPLETE) { -- log_status("gss_get_mic", maj_stat, min_stat); -+ gss_log_status("gss_get_mic", maj_stat, min_stat); - return (FALSE); - } - rqst->rq_xprt->xp_verf.oa_flavor = RPCSEC_GSS; -@@ -373,7 +373,7 @@ _svcauth_gss(struct svc_req *rqst, struct rpc_msg *msg, bool_t *no_dispatch) - struct rpc_gss_init_res gr; - int call_stat, offset; - -- log_debug("in svcauth_gss()"); -+ gss_log_debug("in svcauth_gss()"); - - /* Initialize reply. */ - rqst->rq_xprt->xp_verf = _null_auth; -@@ -519,7 +519,7 @@ svcauth_gss_destroy(SVCAUTH *auth) - struct svc_rpc_gss_data *gd; - OM_uint32 min_stat; - -- log_debug("in svcauth_gss_destroy()"); -+ gss_log_debug("in svcauth_gss_destroy()"); - - gd = SVCAUTH_PRIVATE(auth); - -@@ -540,7 +540,7 @@ svcauth_gss_wrap(SVCAUTH *auth, XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr) - { - struct svc_rpc_gss_data *gd; - -- log_debug("in svcauth_gss_wrap()"); -+ gss_log_debug("in svcauth_gss_wrap()"); - - gd = SVCAUTH_PRIVATE(auth); - -@@ -557,7 +557,7 @@ svcauth_gss_unwrap(SVCAUTH *auth, XDR *xdrs, xdrproc_t xdr_func, caddr_t xdr_ptr - { - struct svc_rpc_gss_data *gd; - -- log_debug("in svcauth_gss_unwrap()"); -+ gss_log_debug("in svcauth_gss_unwrap()"); - - gd = SVCAUTH_PRIVATE(auth); - -diff --git a/src/svc_auth_unix.c b/src/svc_auth_unix.c -index ce83859..9585069 100644 ---- a/src/svc_auth_unix.c -+++ b/src/svc_auth_unix.c -@@ -43,6 +43,8 @@ - - #include <rpc/rpc.h> - -+extern SVCAUTH svc_auth_none; -+ - /* - * Unix longhand authenticator - */ -@@ -67,6 +69,8 @@ _svcauth_unix(rqst, msg) - assert(rqst != NULL); - assert(msg != NULL); - -+ rqst->rq_xprt->xp_auth = &svc_auth_none; -+ - area = (struct area *) rqst->rq_clntcred; - aup = &area->area_aup; - aup->aup_machname = area->area_machname; -@@ -142,5 +146,6 @@ _svcauth_short(rqst, msg) - struct svc_req *rqst; - struct rpc_msg *msg; - { -+ rqst->rq_xprt->xp_auth = &svc_auth_none; - return (AUTH_REJECTEDCRED); - } -diff --git a/src/svc_dg.c b/src/svc_dg.c -index 66a56ee..081db61 100644 ---- a/src/svc_dg.c -+++ b/src/svc_dg.c -@@ -134,6 +134,7 @@ svc_dg_create(fd, sendsize, recvsize) - su->su_cache = NULL; - xprt->xp_fd = fd; - xprt->xp_p2 = su; -+ xprt->xp_auth = NULL; - xprt->xp_verf.oa_base = su->su_verfbody; - svc_dg_ops(xprt); - xprt->xp_rtaddr.maxlen = sizeof (struct sockaddr_storage); -@@ -234,10 +235,27 @@ svc_dg_reply(xprt, msg) - bool_t stat = FALSE; - size_t slen; - -+ xdrproc_t xdr_results; -+ caddr_t xdr_location; -+ bool_t has_args; -+ -+ if (msg->rm_reply.rp_stat == MSG_ACCEPTED && -+ msg->rm_reply.rp_acpt.ar_stat == SUCCESS) { -+ has_args = TRUE; -+ xdr_results = msg->acpted_rply.ar_results.proc; -+ xdr_location = msg->acpted_rply.ar_results.where; -+ -+ msg->acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; -+ msg->acpted_rply.ar_results.where = NULL; -+ } else -+ has_args = FALSE; -+ - xdrs->x_op = XDR_ENCODE; - XDR_SETPOS(xdrs, 0); - msg->rm_xid = su->su_xid; -- if (xdr_replymsg(xdrs, msg)) { -+ if (xdr_replymsg(xdrs, msg) && -+ (!has_args || (xprt->xp_auth && -+ SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) { - struct msghdr *msg = &su->su_msghdr; - struct iovec iov; - -@@ -264,7 +282,12 @@ svc_dg_getargs(xprt, xdr_args, args_ptr) - xdrproc_t xdr_args; - void *args_ptr; - { -- return (*xdr_args)(&(su_data(xprt)->su_xdrs), args_ptr); -+ if (! SVCAUTH_UNWRAP(xprt->xp_auth, &(su_data(xprt)->su_xdrs), -+ xdr_args, args_ptr)) { -+ (void)svc_freeargs(xprt, xdr_args, args_ptr); -+ return FALSE; -+ } -+ return TRUE; - } - - static bool_t -@@ -288,6 +311,10 @@ svc_dg_destroy(xprt) - xprt_unregister(xprt); - if (xprt->xp_fd != -1) - (void)close(xprt->xp_fd); -+ if (xprt->xp_auth != NULL) { -+ SVCAUTH_DESTROY(xprt->xp_auth); -+ xprt->xp_auth = NULL; -+ } - XDR_DESTROY(&(su->su_xdrs)); - (void) mem_free(rpc_buffer(xprt), su->su_iosz); - (void) mem_free(su, sizeof (*su)); -diff --git a/src/svc_vc.c b/src/svc_vc.c -index aaaf2d7..4c70de8 100644 ---- a/src/svc_vc.c -+++ b/src/svc_vc.c -@@ -172,6 +172,7 @@ svc_vc_create(fd, sendsize, recvsize) - xprt->xp_p1 = r; - xprt->xp_p2 = NULL; - xprt->xp_p3 = NULL; -+ xprt->xp_auth = NULL; - xprt->xp_verf = _null_auth; - svc_vc_rendezvous_ops(xprt); - xprt->xp_port = (u_short)-1; /* It is the rendezvouser */ -@@ -283,6 +284,7 @@ makefd_xprt(fd, sendsize, recvsize) - xdrrec_create(&(cd->xdrs), sendsize, recvsize, - xprt, read_vc, write_vc); - xprt->xp_p1 = cd; -+ xprt->xp_auth = NULL; - xprt->xp_verf.oa_base = cd->verf_body; - svc_vc_ops(xprt); /* truely deals with calls */ - xprt->xp_port = 0; /* this is a connection, not a rendezvouser */ -@@ -412,6 +414,10 @@ __svc_vc_dodestroy(xprt) - XDR_DESTROY(&(cd->xdrs)); - mem_free(cd, sizeof(struct cf_conn)); - } -+ if (xprt->xp_auth != NULL) { -+ SVCAUTH_DESTROY(xprt->xp_auth); -+ xprt->xp_auth = NULL; -+ } - if (xprt->xp_rtaddr.buf) - mem_free(xprt->xp_rtaddr.buf, xprt->xp_rtaddr.maxlen); - if (xprt->xp_ltaddr.buf) -@@ -610,7 +616,11 @@ svc_vc_recv(xprt, msg) - } - - xdrs->x_op = XDR_DECODE; -- (void)xdrrec_skiprecord(xdrs); -+ /* -+ * No need skip records with nonblocking connections -+ */ -+ if (cd->nonblock == FALSE) -+ (void)xdrrec_skiprecord(xdrs); - if (xdr_callmsg(xdrs, msg)) { - cd->x_id = msg->rm_xid; - return (TRUE); -@@ -628,8 +638,13 @@ svc_vc_getargs(xprt, xdr_args, args_ptr) - - assert(xprt != NULL); - /* args_ptr may be NULL */ -- return ((*xdr_args)(&(((struct cf_conn *)(xprt->xp_p1))->xdrs), -- args_ptr)); -+ -+ if (! SVCAUTH_UNWRAP(xprt->xp_auth, -+ &(((struct cf_conn *)(xprt->xp_p1))->xdrs), -+ xdr_args, args_ptr)) { -+ return FALSE; -+ } -+ return TRUE; - } - - static bool_t -@@ -658,15 +673,35 @@ svc_vc_reply(xprt, msg) - XDR *xdrs; - bool_t rstat; - -+ xdrproc_t xdr_results; -+ caddr_t xdr_location; -+ bool_t has_args; -+ - assert(xprt != NULL); - assert(msg != NULL); - - cd = (struct cf_conn *)(xprt->xp_p1); - xdrs = &(cd->xdrs); - -+ if (msg->rm_reply.rp_stat == MSG_ACCEPTED && -+ msg->rm_reply.rp_acpt.ar_stat == SUCCESS) { -+ has_args = TRUE; -+ xdr_results = msg->acpted_rply.ar_results.proc; -+ xdr_location = msg->acpted_rply.ar_results.where; -+ -+ msg->acpted_rply.ar_results.proc = (xdrproc_t)xdr_void; -+ msg->acpted_rply.ar_results.where = NULL; -+ } else -+ has_args = FALSE; -+ - xdrs->x_op = XDR_ENCODE; - msg->rm_xid = cd->x_id; -- rstat = xdr_replymsg(xdrs, msg); -+ rstat = FALSE; -+ if (xdr_replymsg(xdrs, msg) && -+ (!has_args || (xprt->xp_auth && -+ SVCAUTH_WRAP(xprt->xp_auth, xdrs, xdr_results, xdr_location)))) { -+ rstat = TRUE; -+ } - (void)xdrrec_endofrecord(xdrs, TRUE); - return (rstat); - } -diff --git a/src/xdr_rec.c b/src/xdr_rec.c -index 4e815d7..2aca623 100644 ---- a/src/xdr_rec.c -+++ b/src/xdr_rec.c -@@ -64,7 +64,6 @@ - #include <rpc/clnt.h> - #include <stddef.h> - #include "rpc_com.h" --#include <unistd.h> - static bool_t xdrrec_getlong(XDR *, long *); - static bool_t xdrrec_putlong(XDR *, const long *); - static bool_t xdrrec_getbytes(XDR *, char *, u_int); -@@ -330,22 +329,22 @@ xdrrec_getpos(xdrs) - RECSTREAM *rstrm = (RECSTREAM *)xdrs->x_private; - off_t pos; - -- pos = lseek((int)(u_long)rstrm->tcp_handle, (off_t)0, 1); -- if (pos != -1) -- switch (xdrs->x_op) { -+ switch (xdrs->x_op) { - -- case XDR_ENCODE: -- pos += rstrm->out_finger - rstrm->out_base; -- break; -+ case XDR_ENCODE: -+ pos = rstrm->out_finger - rstrm->out_base -+ - BYTES_PER_XDR_UNIT; -+ break; - -- case XDR_DECODE: -- pos -= rstrm->in_boundry - rstrm->in_finger; -- break; -+ case XDR_DECODE: -+ pos = rstrm->in_boundry - rstrm->in_finger -+ - BYTES_PER_XDR_UNIT; -+ break; - -- default: -- pos = (off_t) -1; -- break; -- } -+ default: -+ pos = (off_t) -1; -+ break; -+ } - return ((u_int) pos); - } - -diff --git a/tirpc/rpc/auth.h b/tirpc/rpc/auth.h -index 734e6b9..e7bbe36 100644 ---- a/tirpc/rpc/auth.h -+++ b/tirpc/rpc/auth.h -@@ -51,6 +51,7 @@ - #include <sys/cdefs.h> - #include <sys/socket.h> - #include <sys/types.h> -+#include <stdio.h> - - - #define MAX_AUTH_BYTES 400 -@@ -203,8 +204,22 @@ typedef struct __auth { - - } *ah_ops; - void *ah_private; -+ int ah_refcnt; - } AUTH; - -+static __inline int -+auth_get(AUTH *auth) -+{ -+ return __sync_add_and_fetch(&auth->ah_refcnt, 1); -+} -+ -+static __inline int -+auth_put(AUTH *auth) -+{ -+ return __sync_sub_and_fetch(&auth->ah_refcnt, 1); -+} -+ -+ - - /* - * Authentication ops. -@@ -234,10 +249,29 @@ typedef struct __auth { - #define auth_refresh(auth, msg) \ - ((*((auth)->ah_ops->ah_refresh))(auth, msg)) - --#define AUTH_DESTROY(auth) \ -- ((*((auth)->ah_ops->ah_destroy))(auth)) --#define auth_destroy(auth) \ -- ((*((auth)->ah_ops->ah_destroy))(auth)) -+#if defined(__GNUC__) && defined(DEBUG) -+#define auth_log_debug(fmt,args...) printf(stderr, fmt, args) -+#else -+#define auth_log_debug(fmt,args...) -+#endif -+ -+#define AUTH_DESTROY(auth) \ -+ do { \ -+ int refs; \ -+ if ((refs = auth_put((auth))) == 0) \ -+ ((*((auth)->ah_ops->ah_destroy))(auth));\ -+ auth_log_debug("%s: auth_put(), refs %d\n", \ -+ __func__, refs); \ -+ } while (0) -+ -+#define auth_destroy(auth) \ -+ do { \ -+ int refs; \ -+ if ((refs = auth_put((auth))) == 0) \ -+ ((*((auth)->ah_ops->ah_destroy))(auth));\ -+ auth_log_debug("%s: auth_put(), refs %d\n", \ -+ __func__, refs); \ -+ } while (0) - - #define AUTH_WRAP(auth, xdrs, xfunc, xwhere) \ - ((*((auth)->ah_ops->ah_wrap))(auth, xdrs, \ -@@ -373,7 +407,7 @@ __END_DECLS - __BEGIN_DECLS - struct svc_req; - struct rpc_msg; --enum auth_stat _svcauth_null (struct svc_req *, struct rpc_msg *); -+enum auth_stat _svcauth_none (struct svc_req *, struct rpc_msg *); - enum auth_stat _svcauth_short (struct svc_req *, struct rpc_msg *); - enum auth_stat _svcauth_unix (struct svc_req *, struct rpc_msg *); - __END_DECLS -diff --git a/tirpc/rpc/auth_gss.h b/tirpc/rpc/auth_gss.h -index 633b11f..fc3ffbd 100644 ---- a/tirpc/rpc/auth_gss.h -+++ b/tirpc/rpc/auth_gss.h -@@ -120,10 +120,10 @@ bool_t authgss_service __P((AUTH *auth, int svc)); - bool_t authgss_get_private_data __P((AUTH *auth, - struct authgss_private_data *)); - --void log_debug __P((const char *fmt, ...)); --void log_status __P((char *m, OM_uint32 major, -+void gss_log_debug __P((const char *fmt, ...)); -+void gss_log_status __P((char *m, OM_uint32 major, - OM_uint32 minor)); --void log_hexdump __P((const u_char *buf, int len, int offset)); -+void gss_log_hexdump __P((const u_char *buf, int len, int offset)); - - __END_DECLS - -diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h -index e3d6897..d2881ad 100644 ---- a/tirpc/rpc/des.h -+++ b/tirpc/rpc/des.h -@@ -33,6 +33,9 @@ - * Copyright (c) 1986 by Sun Microsystems, Inc. - */ - -+#ifndef _RPC_DES_H_ -+#define _RPC_DES_H_ -+ - #define DES_MAXLEN 65536 /* maximum # of bytes to encrypt */ - #define DES_QUICKLEN 16 /* maximum # of bytes to encrypt quickly */ - -@@ -80,3 +83,5 @@ struct desparams { - * Software DES. - */ - extern int _des_crypt( char *, int, struct desparams * ); -+ -+#endif -diff --git a/tirpc/rpc/svc_auth.h b/tirpc/rpc/svc_auth.h -index 659e90c..14269d1 100644 ---- a/tirpc/rpc/svc_auth.h -+++ b/tirpc/rpc/svc_auth.h -@@ -44,17 +44,23 @@ - /* - * Interface to server-side authentication flavors. - */ --typedef struct { -+typedef struct SVCAUTH { - struct svc_auth_ops { -- int (*svc_ah_wrap)(void); -- int (*svc_ah_unwrap)(void); -- int (*svc_ah_destroy)(void); -+ int (*svc_ah_wrap)(struct SVCAUTH *, XDR *, xdrproc_t, -+ caddr_t); -+ int (*svc_ah_unwrap)(struct SVCAUTH *, XDR *, xdrproc_t, -+ caddr_t); -+ int (*svc_ah_destroy)(struct SVCAUTH *); - } *svc_ah_ops; - caddr_t svc_ah_private; - } SVCAUTH; - --#define SVCAUTH_DESTROY(cred) ((*(cred)->svc_ah_ops->svc_ah_destroy)()) --#define svcauth_destroy(cred) ((*(cred)->svc_ah_ops->svc_ah_destroy)()) -+#define SVCAUTH_WRAP(auth, xdrs, xfunc, xwhere) \ -+ ((*((auth)->svc_ah_ops->svc_ah_wrap))(auth, xdrs, xfunc, xwhere)) -+#define SVCAUTH_UNWRAP(auth, xdrs, xfunc, xwhere) \ -+ ((*((auth)->svc_ah_ops->svc_ah_unwrap))(auth, xdrs, xfunc, xwhere)) -+#define SVCAUTH_DESTROY(auth) \ -+ ((*((auth)->svc_ah_ops->svc_ah_destroy))(auth)) - - /* - * Server side authenticator diff --git a/core/libtirpc/libtirpc-build.patch b/core/libtirpc/libtirpc-build.patch new file mode 100644 index 000000000..8b4e31d67 --- /dev/null +++ b/core/libtirpc/libtirpc-build.patch @@ -0,0 +1,51 @@ +From 3fc89804556fe9a97977f28df6e3c1b5aae22f29 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <teg@jklm.no> +Date: Sun, 7 Apr 2013 22:58:19 +0200 +Subject: [PATCH] build: build with automake >=1.13 + +See: <http://www.gnu.org/software/automake/manual/html_node/Public-Macros.html> + +Also fix a couple of related deprecation warnings. + +Signed-off-by: Tom Gundersen <teg@jklm.no> +--- + configure.ac | 4 ++-- + src/Makefile.am | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4a4adba..3de776a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,5 @@ + AC_INIT(libtirpc, 0.2.3) +-AM_INIT_AUTOMAKE(libtirpc, 0.2.3) ++AM_INIT_AUTOMAKE + AM_MAINTAINER_MODE + AC_CONFIG_SRCDIR([src/auth_des.c]) + AC_CONFIG_MACRO_DIR([m4]) +@@ -39,7 +39,7 @@ if test "x$enable_ipv6" != xno; then + fi + + AC_PROG_CC +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_PROG_LIBTOOL + AC_HEADER_DIRENT + AC_PREFIX_DEFAULT(/usr) +diff --git a/src/Makefile.am b/src/Makefile.am +index 2dd7768..078b0d0 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -6,7 +6,7 @@ + ## anything like that. + + +-INCLUDES = -I$(top_srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \ ++AM_CPPFLAGS = -I$(top_srcdir)/tirpc -DPORTMAP -DINET6 -DVERSION="\"$(VERSION)\"" \ + -D_GNU_SOURCE -Wall -pipe + + lib_LTLIBRARIES = libtirpc.la +-- +1.8.2 + diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index 50daf2751..768cf9d69 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184188 2013-05-03 10:22:57Z tpowa $ +# $Id: PKGBUILD 185039 2013-05-10 16:21:44Z tomegun $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org> @@ -6,15 +6,15 @@ # Contributor: Marco Lima <cipparello gmail com> pkgname=nfs-utils -pkgver=1.2.7 -pkgrel=1 +pkgver=1.2.8 +pkgrel=3 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64' 'mips64el') url='http://nfs.sourceforge.net' license=('GPL') backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf}) -depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper') -makedepends=('pkgconfig' 'autoconf' 'automake' 'sqlite') +depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper' 'sqlite') +makedepends=('pkgconfig' 'autoconf' 'automake') source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 nfs-common.conf nfs-server.conf @@ -35,7 +35,7 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn blkmapd.service nfs-utils.conf) install=nfs-utils.install -md5sums=('3b5ca797197765dc0c3a4122720c7716' +md5sums=('6e7d97de51e428a0b8698c16ca23db77' 'f73f197a16b02c3e248488ec35c4cf43' '9cef69bc686cc5dcac23fbb51450747d' 'ff585faf410a62c4333a027c50b56bae' diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD index 347809f28..0257a6aa3 100644 --- a/core/pam/PKGBUILD +++ b/core/pam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168736 2012-10-15 05:13:56Z tpowa $ +# $Id: PKGBUILD 185040 2013-05-10 16:21:45Z tomegun $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=pam pkgver=1.1.6 -pkgrel=1 +pkgrel=3 pkgdesc="PAM (Pluggable Authentication Modules) library" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') diff --git a/core/rpcbind/PKGBUILD b/core/rpcbind/PKGBUILD index 96385c96b..4e68056b1 100644 --- a/core/rpcbind/PKGBUILD +++ b/core/rpcbind/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165796 2012-08-30 15:24:19Z tpowa $ +# $Id: PKGBUILD 185041 2013-05-10 16:21:46Z tomegun $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=rpcbind pkgver=0.2.0 -pkgrel=9 +pkgrel=11 pkgdesc="portmap replacement which supports RPC over various protocols" arch=(i686 x86_64 'mips64el') depends=('bash' 'glibc' 'libtirpc') diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 0e6efae5f..aab0934c4 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 181138 2013-04-01 07:43:20Z bpiotrowski $ +# $Id: PKGBUILD 185036 2013-05-10 14:39:15Z bpiotrowski $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=1.2 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') @@ -22,7 +22,7 @@ if [ "${CARCH}" != "mips64el" ]; then makedepends=('yasm' 'libvdpau') fi source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -sha256sums=('9a39fbc07dae0c893059e07491bcfb1e2409cc220f72b41eed23a04becea5aaf') +sha256sums=('0302375c3a64e9c2facfa7cbeb1aa333a39fdf6bbacda228cd48e04bf9ee32ca') build() { cd $pkgname-$pkgver diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 47f0232a9..420b9cbe0 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183712 2013-04-27 12:28:29Z dan $ +# $Id: PKGBUILD 185043 2013-05-10 16:49:05Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.2.2 +pkgver=1.8.2.3 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -107,7 +107,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('f7407df37facf579dcaa979266cc3c59' - '765e8b9bbed49333f78103c6afd1dd0b' +md5sums=('03ebfd403a8cf355da0e3f15e53b8925' + '891481ec6ecd9ee530701378e5b61d3f' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 36d87ad95..5c31a4028 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 180567 2013-03-23 15:06:13Z andyrtr $ +# $Id: PKGBUILD 185059 2013-05-10 18:32:00Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gnutls -pkgver=3.1.10 +pkgver=3.1.11 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') -license=('GPL3' 'LGPL') +license=('GPL3' 'LGPL2.1') url="http://www.gnutls.org/" install=gnutls.install options=('!libtool' '!zipman') @@ -15,8 +15,8 @@ depends=('gcc-libs>=4.7.1-5' 'libtasn1>=3.0' 'readline' 'zlib' 'nettle>=2.4' 'p1 makedepends=('strace' 'datefudge') [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind') source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('9e73aa5c3ef3b7358159a31302e25aa7' - '062dd4fe7d527dadbb3d9e9fb240510f') +md5sums=('b1c8f431f7c258a1e76cdba05cc1dd88' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index eca20ebf2..ac39bf8cd 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184407 2013-05-06 19:38:32Z foutrelis $ +# $Id: PKGBUILD 185016 2013-05-10 07:10:14Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -19,9 +19,9 @@ pkgname=('libreoffice-common' 'libreoffice-extension-report-builder' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.0.2.2 -pkgver=4.0.2 -pkgrel=4 +_LOver=4.0.3.3 +pkgver=4.0.3 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -74,17 +74,11 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll - ${_additional_source_url}/libcdr-0.0.11.tar.bz2 + ${_additional_source_url}/libcdr-0.0.12.tar.bz2 ${_additional_source_url}/libmspub-0.0.5.tar.bz2 - ${_additional_source_url}/libvisio-0.0.25.tar.bz2 + ${_additional_source_url}/libvisio-0.0.26.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff - libreoffice-common.sh libreoffice-common.csh - gcc48_1.diff - gcc48_2.diff - remove_unused_vars.diff - gcc48_3.diff - gcc48_4.diff - gcc48_5.diff) + libreoffice-common.sh libreoffice-common.csh) noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 @@ -114,12 +108,12 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - libcdr-0.0.11.tar.bz2 + libcdr-0.0.12.tar.bz2 libmspub-0.0.5.tar.bz2 - libvisio-0.0.25.tar.bz2) -md5sums=('2c92879fa8c50d0071c4703afb7d10bf' - '22e99e58aa32417dd7c132f40ae7654b' - '8b61fbfa6bcd18213b5744f2b8a289b0' + libvisio-0.0.26.tar.bz2) +md5sums=('7bcde561375f3bbce08f6d05451c8ad7' + '994b1f3015668335c30b53ddd3d60dc8' + '05b9ba0e86181bda3afeadcaba9202a3' 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -149,39 +143,21 @@ md5sums=('2c92879fa8c50d0071c4703afb7d10bf' '0168229624cfac409e766913506961a8' '17410483b5b5f267aa18b7e00b65e6e0' '185d60944ea767075d27247c3162b3bc' - '107a3d18f637b342684b3c21eb0fcd7d' + '6db2c96a4ae5977da8b84893c1441038' '881c4628ec5f54d47f35d5d19e335662' - '92bde158f249b9b27f76f48cc65a0242' + '2f638cf6f92cec59c9205ac3cbf1702e' '07d2bf5ad839a394cca008b3ec6e7bb1' '4195735a80876ae812fca5736b50192a' - 'e7e4b3e70e99e5cba8f8dfcacf3b0d87' - '941aab11a42c8052cc1999434ae82bcd' - 'caf426e9eefb99108adba6cf231de348' - 'c367454b402720eea064280d0dfb291b' - '69aef9ea67856714e0ad3b5600b49bd7' - '424c346c52d1a3ee7b1008cdcf89ed82' - 'aed5397524af27a8cceced54a30edf23') + 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') build() { -# unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH -# [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh -# [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh - cd ${srcdir}/libreoffice-$_LOver # fix exttextcat build error # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] unset CPPFLAGS - # git commits from 2013-03-09 with "GCC" to fix gcc 4.8 issues -# patch -Np1 -i ${srcdir}/gcc48_1.diff -# patch -Np1 -i ${srcdir}/gcc48_2.diff -# patch -Np1 -i ${srcdir}/remove_unused_vars.diff -# patch -Np1 -i ${srcdir}/gcc48_3.diff -# patch -Np1 -i ${srcdir}/gcc48_4.diff -# patch -Np1 -i ${srcdir}/gcc48_5.diff - # move external sources into place mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources for source in "${noextract[@]}"; do diff --git a/extra/libreoffice/gcc48_1.diff b/extra/libreoffice/gcc48_1.diff deleted file mode 100644 index 7ee6bd249..000000000 --- a/extra/libreoffice/gcc48_1.diff +++ /dev/null @@ -1,52 +0,0 @@ -From 6bea5311d70f518444fe3218cf0b6f49bd93cc34 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 08 Mar 2013 09:36:44 +0000 -Subject: Work around GCC 4.8 -Werror=unused-local-typedefs in boost - -Change-Id: Ib137c5c5764333d7a878c5e996e6983a277d3856 ---- -diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk -index 2fcae8c..fde6fa6 100644 ---- a/boost/UnpackedTarball_boost.mk -+++ b/boost/UnpackedTarball_boost.mk -@@ -52,6 +52,8 @@ boost_patches += boost_1_44_0-clang-warnings.patch - # in GCC-4.7 experimental": - boost_patches += boost_1_44_0-gthreads.patch - -+boost_patches += boost_1_44_0-gcc4.8.patch -+ - $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) - - $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL))) -diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch -new file mode 100644 -index 0000000..9fc603e ---- a/dev/null -+++ b/boost/boost_1_44_0-gcc4.8.patch -@@ -0,0 +1,24 @@ -+--- misc/boost_1_44_0/boost/bind/arg.hpp -++++ misc/build/boost_1_44_0/boost/bind/arg.hpp -+@@ -35,6 +35,8 @@ -+ { -+ // static assert I == is_placeholder<T>::value -+ typedef char T_must_be_placeholder[ I == is_placeholder<T>::value? 1: -1 ]; -++ T_must_be_placeholder dummy; (void) dummy; -++ // silence -Werror=unused-local-typedefs (GCC 4.8) -+ } -+ }; -+ -+--- misc/boost_1_44_0/boost/concept/detail/general.hpp -++++ misc/build/boost_1_44_0/boost/concept/detail/general.hpp -+@@ -68,7 +68,9 @@ -+ # define BOOST_CONCEPT_ASSERT_FN( ModelFnPtr ) \ -+ typedef ::boost::concepts::detail::instantiate< \ -+ &::boost::concepts::requirement_<ModelFnPtr>::failed> \ -+- BOOST_PP_CAT(boost_concept_check,__LINE__) -++ BOOST_PP_CAT(boost_concept_check,__LINE__); \ -++ BOOST_PP_CAT(boost_concept_check,__LINE__) BOOST_PP_CAT(boost_concept_check_dummy,__LINE__)() -++ // silence -Werror=unused-local-typedefs (GCC 4.8) -+ -+ }} -+ --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/gcc48_2.diff b/extra/libreoffice/gcc48_2.diff deleted file mode 100644 index 559adddfa..000000000 --- a/extra/libreoffice/gcc48_2.diff +++ /dev/null @@ -1,45 +0,0 @@ -From c6cfd44717643b0630b5f8fd3262c243fdaaf239 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 08 Mar 2013 09:54:45 +0000 -Subject: Work around GCC 4.8 -Werror=format= in python3 - -...complainging that "‘PyArg_ParseTuple’ is an unrecognized format function -type." - -Change-Id: I125af6669010c4c9c1a18cc7c1a4895acc89338b ---- -diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk -index d8c0862..87adff0 100644 ---- a/python3/UnpackedTarball_python3.mk -+++ b/python3/UnpackedTarball_python3.mk -@@ -30,6 +30,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ - python3/python-3.3.0-ssl.patch.1 \ - python3/python-3.3.0-implicit-int.patch.1 \ - python3/python-3.3.0-ffi-clang.patch.1 \ -+ python3/python-3.3.0-gcc-4.8.patch.1 \ - )) - - ifneq ($(OS),WNT) -diff --git a/python3/python-3.3.0-gcc-4.8.patch.1 b/python3/python-3.3.0-gcc-4.8.patch.1 -new file mode 100644 -index 0000000..8fb7107 ---- a/dev/null -+++ b/python3/python-3.3.0-gcc-4.8.patch.1 -@@ -0,0 +1,15 @@ -+--- Python-3.3.0/Include/modsupport.h 2012-09-29 10:00:26.000000000 +0200 -++++ Python-3.3.0/Include/modsupport.h 2013-03-08 10:46:28.671938738 +0100 -+@@ -26,7 +26,11 @@ -+ /* Due to a glitch in 3.2, the _SizeT versions weren't exported from the DLL. */ -+ #if !defined(PY_SSIZE_T_CLEAN) || !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 -+ PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...); -+-PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3); -++PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) -++#ifdef PY_SSIZE_T_CLEAN -++ Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3) -++#endif -++ ; -+ PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *, -+ const char *, char **, ...); -+ PyAPI_FUNC(int) PyArg_ValidateKeywordArguments(PyObject *); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/gcc48_3.diff b/extra/libreoffice/gcc48_3.diff deleted file mode 100644 index 395fe7928..000000000 --- a/extra/libreoffice/gcc48_3.diff +++ /dev/null @@ -1,46 +0,0 @@ -From 52c5eb20fd96d63e17cb9cd18912030131bcc787 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 08 Mar 2013 09:59:05 +0000 -Subject: -Werror=unused-local-typedefs (GCC 4.8) - -Change-Id: Ib1dedbe8e273463fa47573486d67dc9d509953db ---- -diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx -index f8267c6..810470e 100644 ---- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx -+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx -@@ -608,7 +608,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( - putenv(strdup(osJavaHome.getStr())); - #endif - -- typedef jint JNICALL JNI_InitArgs_Type(void *); - typedef jint JNICALL JNI_CreateVM_Type(JavaVM **, JNIEnv **, void *); - rtl::OUString sSymbolCreateJava( - RTL_CONSTASCII_USTRINGPARAM("JNI_CreateJavaVM")); -diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx b/sd/source/ui/dlg/RemoteDialogClientBox.cxx -index 8c4f129..2694218 100644 ---- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx -+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx -@@ -201,8 +201,6 @@ void ClientBox::DeleteRemoved() - - if ( ! m_vRemovedEntries.empty() ) - { -- typedef std::vector< TClientBoxEntry >::iterator ITER; -- - m_vRemovedEntries.clear(); - } - -diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx -index cd7df65..1eb94c9 100644 ---- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx -+++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx -@@ -225,7 +225,6 @@ void MasterPageObserver::Implementation::AddEventListener ( - - // Tell the new listener about all the master pages that are - // currently in use. -- typedef ::std::vector<String> StringList; - MasterPageContainer::iterator aDocumentIterator; - for (aDocumentIterator=maUsedMasterPages.begin(); - aDocumentIterator!=maUsedMasterPages.end(); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/gcc48_4.diff b/extra/libreoffice/gcc48_4.diff deleted file mode 100644 index 4dd92c7aa..000000000 --- a/extra/libreoffice/gcc48_4.diff +++ /dev/null @@ -1,223 +0,0 @@ -From 72c62e0e83598862e1c6e00e4264d7720aa94e41 Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 08 Mar 2013 10:45:35 +0000 -Subject: -Werror=unused-local-typedefs (GCC 4.8) - -Change-Id: I873813e30e44712d6793bad91938eb847b55a7bb ---- -diff --git a/boost/boost_1_44_0-gcc4.8.patch b/boost/boost_1_44_0-gcc4.8.patch -index 9fc603e..2d2beeb 100644 ---- a/boost/boost_1_44_0-gcc4.8.patch -+++ b/boost/boost_1_44_0-gcc4.8.patch -@@ -1,3 +1,45 @@ -+--- misc/boost_1_44_0/boost/algorithm/string/detail/finder.hpp -++++ misc/build/boost_1_44_0/boost/algorithm/string/detail/finder.hpp -+@@ -142,7 +142,6 @@ -+ ForwardIteratorT End, -+ std::forward_iterator_tag ) const -+ { -+- typedef ForwardIteratorT input_iterator_type; -+ typedef iterator_range<ForwardIteratorT> result_type; -+ -+ first_finder_type first_finder( -+@@ -263,7 +262,6 @@ -+ ForwardIteratorT End, -+ unsigned int N) const -+ { -+- typedef ForwardIteratorT input_iterator_type; -+ typedef iterator_range<ForwardIteratorT> result_type; -+ -+ // Sanity check -+@@ -298,7 +296,6 @@ -+ ForwardIteratorT End, -+ unsigned int N) const -+ { -+- typedef ForwardIteratorT input_iterator_type; -+ typedef iterator_range<ForwardIteratorT> result_type; -+ -+ // Sanity check -+@@ -362,7 +359,6 @@ -+ unsigned int N, -+ std::random_access_iterator_tag ) -+ { -+- typedef ForwardIteratorT input_iterator_type; -+ typedef iterator_range<ForwardIteratorT> result_type; -+ -+ if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) ) -+@@ -436,7 +432,6 @@ -+ unsigned int N, -+ std::random_access_iterator_tag ) -+ { -+- typedef ForwardIteratorT input_iterator_type; -+ typedef iterator_range<ForwardIteratorT> result_type; -+ -+ if ( (End<=Begin) || ( static_cast<unsigned int>(End-Begin) < N ) ) - --- misc/boost_1_44_0/boost/bind/arg.hpp - +++ misc/build/boost_1_44_0/boost/bind/arg.hpp - @@ -35,6 +35,8 @@ -@@ -22,3 +64,163 @@ - - }} - -+--- misc/boost_1_44_0/boost/date_time/date_parsing.hpp -++++ misc/build/boost_1_44_0/boost/date_time/date_parsing.hpp -+@@ -113,7 +113,6 @@ -+ spec_str = "mdy"; -+ } -+ -+- typedef typename date_type::year_type year_type; -+ typedef typename date_type::month_type month_type; -+ unsigned pos = 0; -+ unsigned short year(0), month(0), day(0); -+@@ -159,7 +158,7 @@ -+ parse_undelimited_date(const std::string& s) { -+ int offsets[] = {4,2,2}; -+ int pos = 0; -+- typedef typename date_type::year_type year_type; -++ //typedef typename date_type::year_type year_type; -+ //typename date_type::ymd_type ymd((year_type::min)(),1,1); -+ unsigned short y = 0, m = 0, d = 0; -+ -+--- misc/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp -++++ misc/build/boost_1_44_0/boost/date_time/local_time/local_time_io.hpp -+@@ -36,7 +36,6 @@ -+ boost::io::ios_flags_saver iflags(os); -+ typedef local_date_time time_type;//::utc_time_type typename -+ typedef date_time::time_facet<time_type, CharT> custom_time_facet; -+- typedef std::time_put<CharT> std_time_facet; -+ std::ostreambuf_iterator<CharT> oitr(os); -+ -+ if(std::has_facet<custom_time_facet>(os.getloc())) { -+@@ -123,7 +122,6 @@ -+ const boost::local_time::local_time_period& p) { -+ boost::io::ios_flags_saver iflags(os); -+ typedef boost::date_time::time_facet<local_date_time, CharT> custom_facet; -+- typedef std::time_put<CharT> std_time_facet; -+ std::ostreambuf_iterator<CharT> oitr(os); -+ if (std::has_facet<custom_facet>(os.getloc())) { -+ std::use_facet<custom_facet>(os.getloc()).put(oitr, os, os.fill(), p); -+--- misc/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp -++++ misc/build/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp -+@@ -47,7 +47,6 @@ -+ const ptime& p) { -+ boost::io::ios_flags_saver iflags(os); -+ typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet; -+- typedef std::time_put<CharT> std_ptime_facet; -+ std::ostreambuf_iterator<CharT> oitr(os); -+ if (std::has_facet<custom_ptime_facet>(os.getloc())) -+ std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p); -+@@ -114,7 +113,6 @@ -+ const boost::posix_time::time_period& p) { -+ boost::io::ios_flags_saver iflags(os); -+ typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet; -+- typedef std::time_put<CharT> std_time_facet; -+ std::ostreambuf_iterator<CharT> oitr(os); -+ if (std::has_facet<custom_ptime_facet>(os.getloc())) { -+ std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), p); -+@@ -180,7 +178,6 @@ -+ { -+ boost::io::ios_flags_saver iflags(os); -+ typedef boost::date_time::time_facet<ptime, CharT> custom_ptime_facet; -+- typedef std::time_put<CharT> std_ptime_facet; -+ std::ostreambuf_iterator<CharT> oitr(os); -+ if (std::has_facet<custom_ptime_facet>(os.getloc())) -+ std::use_facet<custom_ptime_facet>(os.getloc()).put(oitr, os, os.fill(), td); -+--- misc/boost_1_44_0/boost/date_time/string_convert.hpp -++++ misc/build/boost_1_44_0/boost/date_time/string_convert.hpp -+@@ -21,7 +21,6 @@ -+ inline -+ std::basic_string<OutputT> convert_string_type(const std::basic_string<InputT>& inp_str) -+ { -+- typedef std::basic_string<InputT> input_type; -+ typedef std::basic_string<OutputT> output_type; -+ output_type result; -+ result.insert(result.begin(), inp_str.begin(), inp_str.end()); -+--- misc/boost_1_44_0/boost/date_time/strings_from_facet.hpp -++++ misc/build/boost_1_44_0/boost/date_time/strings_from_facet.hpp -+@@ -35,7 +35,6 @@ -+ { -+ typedef std::basic_string<charT> string_type; -+ typedef std::vector<string_type> collection_type; -+- typedef std::basic_ostringstream<charT> ostream_type; -+ typedef std::ostreambuf_iterator<charT> ostream_iter_type; -+ typedef std::basic_ostringstream<charT> stringstream_type; -+ typedef std::time_put<charT> time_put_facet_type; -+@@ -85,7 +84,6 @@ -+ { -+ typedef std::basic_string<charT> string_type; -+ typedef std::vector<string_type> collection_type; -+- typedef std::basic_ostringstream<charT> ostream_type; -+ typedef std::ostreambuf_iterator<charT> ostream_iter_type; -+ typedef std::basic_ostringstream<charT> stringstream_type; -+ typedef std::time_put<charT> time_put_facet_type; -+--- misc/boost_1_44_0/boost/multi_array/concept_checks.hpp -++++ misc/build/boost_1_44_0/boost/multi_array/concept_checks.hpp -+@@ -39,8 +39,6 @@ -+ -+ template <typename Array, typename IdxGen, typename Call_Type> -+ static void call(Array& a, const IdxGen& idgen, Call_Type c) { -+- typedef typename Array::index_range index_range_; -+- typedef typename Array::index index_; -+ idgen_helper<N-1>::call(a,idgen[c],c); -+ } -+ }; -+@@ -50,8 +48,6 @@ -+ -+ template <typename Array, typename IdxGen, typename Call_Type> -+ static void call(Array& a, const IdxGen& idgen, Call_Type) { -+- typedef typename Array::index_range index_range_; -+- typedef typename Array::index index_; -+ a[ idgen ]; -+ } -+ }; -+--- misc/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp -++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp -+@@ -307,7 +307,6 @@ -+ #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) -+ typedef impl::grammar_helper_base<GrammarT> helper_base_t; -+ typedef grammar_helper_list<GrammarT> helper_list_t; -+- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; -+ -+ helper_list_t& helpers = -+ # if !defined(__GNUC__) || (__GNUC__ > 2) -+@@ -318,6 +317,7 @@ -+ -+ # if (defined(BOOST_MSVC) && (BOOST_MSVC < 1300)) \ -+ || defined(BOOST_INTEL_CXX_VERSION) -++ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; -+ for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i) -+ (*i)->undefine(self); -+ # else -+--- misc/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp -++++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/primitives/primitives.hpp -+@@ -47,7 +47,6 @@ -+ typename parser_result<self_t, ScannerT>::type -+ parse(ScannerT const& scan) const -+ { -+- typedef typename parser_result<self_t, ScannerT>::type result_t; -+ typedef typename ScannerT::value_t value_t; -+ typedef typename ScannerT::iterator_t iterator_t; -+ -+--- misc/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp -++++ misc/build/boost_1_44_0/boost/spirit/home/classic/error_handling/exceptions.hpp -+@@ -140,7 +140,6 @@ -+ parse(ScannerT const& scan) const -+ { -+ typedef typename parser_result<ParserT, ScannerT>::type result_t; -+- typedef typename ScannerT::iterator_t iterator_t; -+ -+ result_t hit = this->subject().parse(scan); -+ if (!hit) -+--- misc/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp -++++ misc/build/boost_1_44_0/boost/spirit/home/classic/utility/functor_parser.hpp -+@@ -49,8 +49,6 @@ -+ typename parser_result<self_t, ScannerT>::type -+ parse(ScannerT const& scan) const -+ { -+- typedef typename parser_result<self_t, ScannerT>::type result_t; -+- typedef typename ScannerT::value_t value_t; -+ typedef typename ScannerT::iterator_t iterator_t; -+ -+ iterator_t const s(scan.first); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/gcc48_5.diff b/extra/libreoffice/gcc48_5.diff deleted file mode 100644 index f63571039..000000000 --- a/extra/libreoffice/gcc48_5.diff +++ /dev/null @@ -1,34 +0,0 @@ -From 157ce65588ec8ef4ff8f805f7b8a64fefdd9edec Mon Sep 17 00:00:00 2001 -From: Stephan Bergmann <sbergman@redhat.com> -Date: Fri, 08 Mar 2013 11:07:11 +0000 -Subject: Work around GCC 4.8 -Werror=virtual-move-assign - -...complaining that "defaulted move assignment for ‘cppcanvas::SpriteCanvas’ -calls a non-trivial move assignment operator for virtual base -‘cppcanvas::BitmapCanvas’." - -Change-Id: I4dc92176dbec62f0ae4fa7d2842073077ecb8fc3 ---- -diff --git a/cppcanvas/inc/cppcanvas/spritecanvas.hxx b/cppcanvas/inc/cppcanvas/spritecanvas.hxx -index 59aa3da..6a606b3 100644 ---- a/cppcanvas/inc/cppcanvas/spritecanvas.hxx -+++ b/cppcanvas/inc/cppcanvas/spritecanvas.hxx -@@ -24,6 +24,7 @@ - #include <osl/diagnose.h> - #include <basegfx/vector/b2dsize.hxx> - -+#include <boost/noncopyable.hpp> - #include <boost/shared_ptr.hpp> - - -@@ -48,7 +49,7 @@ namespace cppcanvas - - /** SpriteCanvas interface - */ -- class SpriteCanvas : public virtual BitmapCanvas -+ class SpriteCanvas : public virtual BitmapCanvas, private boost::noncopyable - { - public: - virtual bool updateScreen( bool bUpdateAll ) const = 0; --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libreoffice/remove_unused_vars.diff b/extra/libreoffice/remove_unused_vars.diff deleted file mode 100644 index 7970b913c..000000000 --- a/extra/libreoffice/remove_unused_vars.diff +++ /dev/null @@ -1,26 +0,0 @@ -From 305bf19e390aebdf2d20ea052a92f782e8d1185c Mon Sep 17 00:00:00 2001 -From: Thomas Arnhold <thomas@arnhold.org> -Date: Sun, 24 Feb 2013 17:39:08 +0000 -Subject: loplugin: unused variables - -And some fallout. - -Change-Id: I8dfc12f3566e72d79d4f9930284c92577aa485a1 ---- -(limited to 'sd/source/ui/toolpanel/controls/MasterPageObserver.cxx') - -diff --git a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx -index 1d27c9d..cd7df65 100644 ---- a/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx -+++ b/sd/source/ui/toolpanel/controls/MasterPageObserver.cxx -@@ -226,8 +226,6 @@ void MasterPageObserver::Implementation::AddEventListener ( - // Tell the new listener about all the master pages that are - // currently in use. - typedef ::std::vector<String> StringList; -- StringList aNewMasterPages; -- StringList aRemovedMasterPages; - MasterPageContainer::iterator aDocumentIterator; - for (aDocumentIterator=maUsedMasterPages.begin(); - aDocumentIterator!=maUsedMasterPages.end(); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD index cbbdfa233..007735319 100644 --- a/extra/maxima/PKGBUILD +++ b/extra/maxima/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178301 2013-02-19 19:05:06Z ronald $ +# $Id: PKGBUILD 185029 2013-05-10 12:32:47Z juergen $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir@archlinux.org> pkgname=maxima -pkgver=5.29.1 +pkgver=5.30.0 pkgrel=1 pkgdesc="Maxima - a sophisticated computer algebra system" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ url="http://maxima.sourceforge.net" if [ "${CARCH}" == "mips64el" ] ; then depends=('clisp' 'texinfo' 'sh') else - depends=('sbcl=1.1.4' 'texinfo' 'sh') + depends=('sbcl=1.1.7' 'texinfo' 'sh') fi makedepends=('python2') optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface') @@ -21,7 +21,7 @@ optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/ options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima install=maxima.install source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop") -sha1sums=('9be04303d6a5472bc95576b7de7286fa4b8ff604' +sha1sums=('ae009d71524f55264b346b03dac8e504e3b18ac0' '4398ebb1ec85ccfa12f37516a56d60c26f74b18b') build() { @@ -37,6 +37,9 @@ build() { fi ./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \ --libexecdir=/usr/lib $lisp + + # help avoid (re)running makeinfo/tex + touch doc/info/maxima.info make } diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index 0dd9b420b..235d2716a 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 178844 2013-02-27 16:21:24Z jgc $ +# $Id: PKGBUILD 185090 2013-05-10 21:54:30Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss pkgver=3.14.3 -pkgrel=2 +pkgrel=3 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64 'mips64el') url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') -_nsprver=4.9.5 +_nsprver=4.9.6 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh') makedepends=('perl') options=('!strip') diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index 55f2b86c8..430e0d077 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184427 2013-05-06 19:39:27Z foutrelis $ +# $Id: PKGBUILD 185057 2013-05-10 18:09:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qt4 pkgver=4.8.4 -pkgrel=17 +pkgrel=18 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -31,14 +31,16 @@ replaces=('qt<=4.8.4') conflicts=('qt') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz" - 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' 'linguist-qt4.desktop' + 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' + 'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop' 'improve-cups-support.patch' 'declarative-fix-sigbus.patch') md5sums=('89c5ecba180cae74c66260ac732dc5cb' 'a16638f4781e56e7887ff8212a322ecc' - '4f0152ba6d645e81218b23ba8beeb42d' - '283a00ff7f662dca481b70d6daa826e0' - '027683880235708d4bc270a7ef961183' + '8a28b3f52dbeb685d4b69440b520a3e1' + '9727c406c240990870c905696a8c5bd1' + '0e384663d3dd32abe35f5331c4147569' + 'b859c5673e5098c39f72b2252947049e' 'c439c7731c25387352d8453ca7574971' 'aac963d05a9d5733e2bfce9e26607f51') @@ -100,10 +102,26 @@ package() { # install missing icons and desktop files install -D -m644 src/gui/dialogs/images/qtlogo-64.png \ - "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qt4logo.png" + "${pkgdir}"/usr/share/icons/hicolor/64x64/apps/qt4logo.png + install -D -m644 tools/assistant/tools/assistant/images/assistant.png \ + "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/assistant-qt4.png + install -D -m644 tools/assistant/tools/assistant/images/assistant-128.png \ + "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/assistant-qt4.png + install -D -m644 tools/designer/src/designer/images/designer.png \ + "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/designer-qt4.png + for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -D -m644 ${icon} \ + "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/linguist-qt4.png + done + install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer.png \ + "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/qdbusviewer-qt4.png + install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \ + "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/qdusviewer-qt4.png + install -d "${pkgdir}"/usr/share/applications - install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig}-qt4.desktop \ - "${pkgdir}/usr/share/applications/" + install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig,qdbusviewer}-qt4.desktop \ + "${pkgdir}"/usr/share/applications/ # Useful symlinks for cmake and configure scripts install -d "${pkgdir}"/usr/bin diff --git a/extra/qt4/assistant-qt4.desktop b/extra/qt4/assistant-qt4.desktop index d2904beb2..d874d612b 100644 --- a/extra/qt4/assistant-qt4.desktop +++ b/extra/qt4/assistant-qt4.desktop @@ -2,7 +2,7 @@ Name=Qt4 Assistant Comment=Shows Qt4 documentation and examples Exec=assistant-qt4 -Icon=assistant +Icon=assistant-qt4 Terminal=false Encoding=UTF-8 Type=Application diff --git a/extra/qt4/designer-qt4.desktop b/extra/qt4/designer-qt4.desktop index 514146e78..86ea4eda5 100644 --- a/extra/qt4/designer-qt4.desktop +++ b/extra/qt4/designer-qt4.desktop @@ -3,7 +3,7 @@ Name=Qt4 Designer GenericName=Interface Designer Comment=Design GUIs for Qt4 applications Exec=designer-qt4 -Icon=designer +Icon=designer-qt4 MimeType=application/x-designer; Terminal=false Encoding=UTF-8 diff --git a/extra/qt4/linguist-qt4.desktop b/extra/qt4/linguist-qt4.desktop index 61036b307..765c88275 100644 --- a/extra/qt4/linguist-qt4.desktop +++ b/extra/qt4/linguist-qt4.desktop @@ -2,7 +2,7 @@ Name=Qt4 Linguist Comment=Add translations to Qt4 applications Exec=linguist-qt4 -Icon=linguist +Icon=linguist-qt4 MimeType=text/vnd.trolltech.linguist;application/x-linguist; Terminal=false Encoding=UTF-8 diff --git a/extra/qt4/qdbusviewer-qt4.desktop b/extra/qt4/qdbusviewer-qt4.desktop new file mode 100644 index 000000000..2d4218c9b --- /dev/null +++ b/extra/qt4/qdbusviewer-qt4.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Qt4 QDbusViewer +GenericName=D-Bus Debugger +Comment=Debug D-Bus applications +Exec=qdbusviewer-qt4 +Icon=qdbusviewer-qt4 +Terminal=false +Type=Application +Categories=Qt;Development;Debugger; + diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD index d032d9d56..2d46784a0 100644 --- a/extra/sbcl/PKGBUILD +++ b/extra/sbcl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178213 2013-02-18 09:01:22Z juergen $ +# $Id: PKGBUILD 185032 2013-05-10 12:58:50Z juergen $ # Contributor: John Proctor <jproctor@prium.net> # Contributor: Daniel White <daniel@whitehouse.id.au> # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Leslie Polzer (skypher) pkgname=sbcl -pkgver=1.1.4 +pkgver=1.1.7 pkgrel=1 pkgdesc="Steel Bank Common Lisp" url="http://www.sbcl.org/" @@ -13,20 +13,39 @@ arch=('i686' 'x86_64' 'mips64el') license=('custom') depends=('glibc' 'zlib') provides=('common-lisp' 'cl-asdf') -makedepends=('sbcl' 'texinfo') +makedepends=('sbcl') [ "$CARCH" = "mips64el" ] && \ -makedepends=('clisp' 'texinfo') +makedepends=('clisp') install=sbcl.install source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" - "arch-fixes.lisp") -md5sums=('9d82ec89abbaf265fbfc71a24445dd66' - '7ac0c1936547f4278198b8bf7725204d') + "arch-fixes.lisp" + "ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-4.13a.tar.gz" + "texinfo-4.13a-data_types.patch") +md5sums=('ca3dd0ce2943e10a1c86ff5f40db3f85' + '7ac0c1936547f4278198b8bf7725204d' + '71ba711519209b5fb583fed2b3d86fcb' + 'd8574782ff7def1e2dc5c291dbeaec18') + + +# Temporary Texinfo legacy build +# See: http://sourceforge.net/mailarchive/message.php?msg_id=30747919 + +build-texinfo-legacy() { + cd ${srcdir}/texinfo-4.13 + patch -Np1 -i $srcdir/texinfo-4.13a-data_types.patch + mkdir -p $srcdir/texinfo-instroot + ./configure --prefix=$srcdir/texinfo-instroot + make install +} build() { + build-texinfo-legacy + export PATH=$srcdir/texinfo-instroot/bin:$PATH + cd "$srcdir/$pkgname-$pkgver" - export CFLAGS+=" -D_GNU_SOURCE -DSBCL_HOME=\\\"/usr/lib/sbcl\\\"" - export GNUMAKE="make -e" + export CFLAGS+=" -D_GNU_SOURCE -fno-omit-frame-pointer -DSBCL_HOME=/usr/lib/sbcl" + export GNUMAKE="make" # build system uses LINKFLAGS and OS_LIBS to build LDFLAGS export LINKFLAGS="$LDFLAGS" @@ -43,9 +62,9 @@ build() { EOF if [ "$CARCH" = "mips64el" ]; then - sh make.sh clisp + sh make.sh clisp --prefix=/usr else - sh make.sh sbcl + sh make.sh sbcl --prefix=/usr fi make -C doc/manual info } @@ -53,7 +72,8 @@ EOF package() { cd "$srcdir/$pkgname-$pkgver" - INSTALL_ROOT="$pkgdir/usr" sh install.sh + # cannot have both SBCL_HOME and INSTALL_ROOT + SBCL_HOME="" INSTALL_ROOT="$pkgdir/usr" sh install.sh src/runtime/sbcl --core output/sbcl.core --script "${srcdir}/arch-fixes.lisp" mv sbcl-new.core "${pkgdir}/usr/lib/sbcl/sbcl.core" diff --git a/extra/sbcl/texinfo-4.13a-data_types.patch b/extra/sbcl/texinfo-4.13a-data_types.patch new file mode 100644 index 000000000..2a87c2146 --- /dev/null +++ b/extra/sbcl/texinfo-4.13a-data_types.patch @@ -0,0 +1,32 @@ +diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c +--- texinfo-4.13/info/window.c_old 2009-08-04 13:46:15.000000000 +0200 ++++ texinfo-4.13/info/window.c 2009-08-04 13:47:29.000000000 +0200 +@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st + const char *carried_over_ptr; + size_t carried_over_len, carried_over_count; + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); ++ size_t cur_len = mb_len (mbi_cur (iter)); + int replen; + int delim = 0; + int rc; +@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage) + mbi_advance (iter)) + { + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); ++ size_t cur_len = mb_len (mbi_cur (iter)); + + if (cur_len == 1) + { +@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line, + mbi_advance (iter)) + { + const char *cur_ptr = mbi_cur_ptr (iter); +- int cur_len = mb_len (mbi_cur (iter)); +- int replen; ++ size_t cur_len = mb_len (mbi_cur (iter)); ++ size_t replen; + + if (cur_ptr >= endp) + break; diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD index aee8750a3..c78ff1934 100644 --- a/extra/soprano/PKGBUILD +++ b/extra/soprano/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184138 2013-05-02 15:21:00Z andrea $ +# $Id: PKGBUILD 185050 2013-05-10 17:29:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=soprano -pkgver=2.9.1 +pkgver=2.9.2 pkgrel=1 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('qt4' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base') makedepends=('cmake' 'doxygen') [ "$CARCH" != "mips64el" ] && makedepends+=('java-environment') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('c7beb1bda475f363fa0afb58edc541fe') +md5sums=('60ce910cf3c8e4655c614b45d73f2b2a') build() { mkdir build diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD index 97a1b4f12..6637e134c 100644 --- a/libre/blender-addon-luxrender/PKGBUILD +++ b/libre/blender-addon-luxrender/PKGBUILD @@ -3,12 +3,12 @@ pkgname=blender-addon-luxrender _pkgname=${pkgname:14:3}${pkgname::5}25 _srcver=c9deae0646d0 -pkgver=1.2.1.v2.66 +pkgver=1.2.1.v2.67 _pkgver=${pkgver::5} _reqname=${pkgname::7} _reqver=${pkgver:7} -_reqep=7 -pkgrel=2 +_reqep=8 +pkgrel=1 pkgdesc="$_pkgname: A addon for the ${_reqname^} which allows render and export with LuxRender (built for the $_reqname-libre package)" arch=any url=http://www.${pkgname:14}.net/ diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index bb72f209f..61bbef162 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 184141 2013-05-02 15:29:52Z tpowa $ +# $Id: PKGBUILD 184766 2013-05-08 09:12:14Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,7 +7,7 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=76 +_sublevel=77 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.76 # nearly always the same as pkgver @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' - 'e405de6581d02d44c2c06a81a1d93f93' + '8b2ca0f6a92462ba9e544f02fc450c03' 'fe0e9b4415b82f306fc1b63eb9a742a4' '69a689019ea0b6ed46b387907f14bc8a' 'c072b17032e80debc6a8626299245d46' @@ -387,7 +387,7 @@ _package-headers() { done # remove unneeded architectures - rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} + rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,microblaze,mn10300,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,um,unicore32,v850,xtensa} if [ "$CARCH" = "mips64el" ]; then rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86 else diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index d4fbc8398..0030c7ce2 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.76-1-LIBRE-LTS +KERNEL_VERSION=3.0.77-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index 3e9ae0e9e..2e3126da7 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -7,13 +7,13 @@ pkgname=luxrender-libre _pkgflag=libre pkgver=1.2.1 _pkgver=3066b2161439 -pkgrel=2 +pkgrel=3 pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.${pkgname%-$_pkgflag}.net/" license=('GPL') depends=('boost-libs' 'freeimage' 'openexr' 'libcl' 'libgl') -optdepends=('luxblend25: Blender exporter' 'qt4: Qt GUI' \ +optdepends=('blender-addon-luxrender: Blender for renderer and exporter' 'qt4: Qt GUI' \ 'python: Python interface (pylux)') makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=${pkgver::3}" 'python' 'opencl-headers') provides=(${pkgname%-$_pkgflag}=$pkgver) diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD index 8a578eeda..4cf483641 100644 --- a/libre/virtualbox-libre/PKGBUILD +++ b/libre/virtualbox-libre/PKGBUILD @@ -108,7 +108,7 @@ md5sums=('654e45054ae6589452508d37403dc800' 'c7951fe6888d939f3a7d0dafe477e82b' '4da8eeb2ece7e475fc7a0d1003da26c6' '5e4187af59726d71c5be48d0cd816c34' - '5ea240a7f85a1f2e875dbd247a6982aa' + '7c5eca076af3d0601f5321f99b815b9c' '50387fba578646a9d29de3f917a199d2') prepare() { diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index dec34abb9..c3e2e4ad4 100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -1,5 +1,5 @@ --- VirtualBox-4.2.12.orig/Config.kmk 2013-04-12 07:33:55.000000000 -0300 -+++ VirtualBox-4.2.12/Config.kmk 2013-05-09 22:45:16.882436950 -0300 ++++ VirtualBox-4.2.12/Config.kmk 2013-05-10 15:03:20.817944799 -0300 @@ -56,9 +56,6 @@ PROPS_SYSMODS_ACCUMULATE_L += INTERMEDIATES PROPS_MISCBINS_ACCUMULATE_L += INTERMEDIATES @@ -10,23 +10,7 @@ # Install paths ## @todo This will change after 4.1 is branched off! # What is now 'bin' and 'lib' will be moved down under 'staged/', except on -@@ -94,7 +91,6 @@ - INST_SYS = $(INST_BIN) - INST_TESTCASE = $(INST_BIN)testcase/ - INST_ADDITIONS = $(INST_BIN)additions/ -- INST_ADDITIONS_ISO = $(INST_BIN) - - # other paths - INST_TESTSUITE = testsuite/ -@@ -119,7 +115,6 @@ - INST_SYS = $(INST_BIN) - INST_TESTCASE = $(INST_BIN)testcase/ - INST_ADDITIONS = $(INST_BIN)additions/ -- INST_ADDITIONS_ISO = $(INST_ADDITIONS) - - INST_TESTSUITE = testsuite/ - INST_LIB = lib/ -@@ -129,18 +124,13 @@ +@@ -129,9 +126,6 @@ endif INST_DOC = doc/ @@ -36,16 +20,15 @@ INST_PACKAGES = packages/ VBOX_PATH_SDK = $(patsubst %/,%,$(PATH_STAGE)/$(INST_SDK)) - VBOX_PATH_DIST = $(patsubst %/,%,$(PATH_STAGE)/$(INST_DIST)) - VBOX_PATH_TESTSUITE = $(patsubst %/,%,$(PATH_STAGE)/$(INST_TESTSUITE)) +@@ -140,7 +134,6 @@ VBOX_PATH_ADDITIONS = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS)) --VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO)) + VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO)) VBOX_PATH_ADDITIONS_LIB = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_LIB)) -VBOX_PATH_EXTPACK_PUEL= $(patsubst %/,%,$(PATH_STAGE)/$(INST_EXTPACK_PUEL)) VBOX_PATH_PACKAGES = $(patsubst %/,%,$(PATH_STAGE)/$(INST_PACKAGES)) -@@ -215,7 +205,6 @@ +@@ -215,7 +208,6 @@ export VBOX_ADDITIONS_SH_MODE = release export VBOX_DOCUMENTATION_SH_MODE = release export VBOX_EFI_SH_MODE = release @@ -53,16 +36,7 @@ endif # Some info on the vendor -@@ -313,7 +302,7 @@ - endif - # Don't create the additions ISO. - # (Used by the additions build server, don't invert it.) --#VBOX_WITHOUT_ADDITIONS_ISO = 1 -+ VBOX_WITHOUT_ADDITIONS_ISO = 1 - ## @} - - ## @name Documentation -@@ -368,8 +357,6 @@ +@@ -368,8 +360,6 @@ VBOX_WITH_USB = 1 # Enable the USB 1.1 controller plus virtual USB HID devices. VBOX_WITH_VUSB = 1 @@ -71,7 +45,7 @@ # Enable the ISCSI feature. VBOX_WITH_ISCSI = 1 # Enable INIP support in the ISCSI feature. -@@ -441,9 +428,6 @@ +@@ -441,9 +431,6 @@ ifdef VBOX_WITH_USB VBOX_WITH_VUSB = 1 endif @@ -81,7 +55,7 @@ ifdef VBOX_WITH_PCI_PASSTHROUGH VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1 endif -@@ -584,8 +568,6 @@ +@@ -584,8 +571,6 @@ if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win) VBOX_WITH_CROGL = 1 endif @@ -90,7 +64,7 @@ # Enable S3 support (requires libcurl) VBOX_WITH_S3 = 1 # Enable Host=>Guest Drag'n'Drop -@@ -625,17 +607,6 @@ +@@ -625,17 +610,6 @@ endif ## @} @@ -108,7 +82,7 @@ ## @name Misc ## @{ # Enable Seamless mode -@@ -826,14 +797,6 @@ +@@ -826,14 +800,6 @@ # Skip stuff. # @@ -123,7 +97,7 @@ # VBOX_QUICK can be used by core developers to speed to the build ifdef VBOX_QUICK # undefine variables by assigning blank. -@@ -888,7 +851,6 @@ +@@ -888,7 +854,6 @@ VBOX_WITH_TESTSUITE= VBOX_WITH_QTGUI= VBOX_WITH_USB= @@ -131,7 +105,7 @@ VBOX_WITH_DOCS= VBOX_WITH_PDM_ASYNC_COMPLETION= VBOX_WITH_KCHMVIEWER= -@@ -910,7 +872,6 @@ +@@ -910,7 +875,6 @@ VBOX_WITH_CROGL= VBOX_WITH_DEBUGGER= VBOX_WITH_DOCS= @@ -139,7 +113,7 @@ VBOX_WITH_HARDENING= VBOX_WITH_HEADLESS= VBOX_WITH_HGCM= -@@ -983,7 +944,7 @@ +@@ -983,7 +947,7 @@ # # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set. # @@ -148,7 +122,7 @@ , $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x)))) if $(words $(VBOX_ONLY_BUILD)) > 1 $(error VBox: More than one VBOX_ONLY build enabled! $(VBOX_ONLY_BUILD)) -@@ -1001,9 +962,6 @@ +@@ -1001,9 +965,6 @@ # ifdef VBOX_OSE VBOX_WITH_VRDP= @@ -158,7 +132,7 @@ VBOX_WITH_PCI_PASSTHROUGH_IMPL= VBOX_WITH_OS2_ADDITIONS_BIN= VBOX_WITH_SECURELABEL= -@@ -1135,10 +1093,6 @@ +@@ -1135,10 +1096,6 @@ VBOX_WITH_KCHMVIEWER= endif @@ -169,7 +143,7 @@ # # Mark OSE builds clearly, helps figuring out limitations more easily. # -@@ -1743,9 +1697,6 @@ +@@ -1743,9 +1700,6 @@ # bin2c (convert binary files into C arrays) VBOX_BIN2C ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE) @@ -179,7 +153,7 @@ # VBoxCmp (simple /bin/cmp with more sensible output) VBOX_VBOXCMP ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE) -@@ -2633,13 +2584,6 @@ +@@ -2633,13 +2587,6 @@ SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE) endif @@ -193,7 +167,7 @@ SDK_VBOX_BLD_OPENSSL = . SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL SDK_VBOX_BLD_OPENSSL_LIBS ?= \ -@@ -4100,99 +4044,6 @@ +@@ -4100,99 +4047,6 @@ TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin)) @@ -419,69 +393,8 @@ echo echo "Successfully generated '$CNF' and '$ENV'." --- VirtualBox-4.2.12.orig/Makefile.kmk 2013-04-12 07:33:55.000000000 -0300 -+++ VirtualBox-4.2.12/Makefile.kmk 2013-05-09 23:09:45.756804164 -0300 -@@ -177,41 +177,6 @@ - INSTALLS += buildserver-additions - endif - --# --# Install additions iso from the build server. --# The $(CP)/$(RM) stuff can be replaced by a simple $(TOUCH) once that has --# been added to kBuild. --# --buildserver-additions_INST = $(INST_ADDITIONS_ISO) --buildserver-additions_MODE = 0644 --buildserver-additions_SOURCES = $(PATH_TARGET)/VBoxGuestAdditions.iso --buildserver-additions_CLEANS = \ -- $(buildserver-additions_0_OUTDIR)/unpacked.ts \ -- $(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip \ -- $(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip.tmp \ -- $(PATH_TARGET)/VBoxGuestAdditions.iso -- --$$(buildserver-additions_0_OUTDIR)/unpacked.ts +| $(PATH_TARGET)/VBoxGuestAdditions.iso: \ -- $$(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip -- $(call MSG_L1,Unpacking additions archive) -- $(QUIET)$(TOOL_ZIP_UNPACK) $(TOOL_ZIP_UNPACKFLAGS) -o $< -d $(PATH_TARGET) -- $(APPEND) -t $@ "done" -- --$$(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip: $(VBOX_SVN_REV_KMK) $(PATH_DEVTOOLS)/bin/additions.sh | $$(dir $$@) -- $(RM) -f $@ $@.tmp -- ifneq ($(KBUILD_HOST),win) -- $(SHELL) $(PATH_DEVTOOLS)/bin/additions.sh --cmd fetch --filename $@.tmp -- else -- $(KMK) --affinity 1 -f $(MAKEFILE) buildserver-additions-affinity-hack -- endif -- $(CP) -f $@.tmp $@ -- $(RM) -f $@.tmp -- -- ifeq ($(KBUILD_HOST),win) --buildserver-additions-affinity-hack: -- $(SHELL) $(PATH_DEVTOOLS)/bin/additions.sh --cmd fetch --filename $(buildserver-additions_0_OUTDIR)/VBoxGuestAdditions.zip.tmp -- endif --endif # VBOX_WITH_ADDITIONS_FROM_BUILD_SERVER - - - # -@@ -327,18 +292,6 @@ - ifn1of ($(KBUILD_TARGET), l4 linux win) - VBOX_PATH_STAGED ?= . - -- # Additions. -- ifndef VBOX_WITH_LINUX_ADDITIONS -- ifndef VBOX_WITH_WIN32_ADDITIONS -- ifneq ($(wildcard $(VBOX_PATH_STAGED)/VBoxGuestAdditions.iso),) -- INSTALLS += staged-additions -- staged-additions_INST = $(INST_ADDITIONS_ISO) -- staged-additions_MODE = 0644 -- staged-additions_SOURCES = $(VBOX_PATH_STAGED)/VBoxGuestAdditions.iso -- endif -- endif -- endif -- - # guesttool.exe - ifndef VBOX_WITH_WIN32_ADDITIONS - ifneq ($(wildcard $(VBOX_PATH_STAGED)/guesttool.exe),) -@@ -388,7 +341,6 @@ ++++ VirtualBox-4.2.12/Makefile.kmk 2013-05-10 15:04:21.967970195 -0300 +@@ -388,7 +388,6 @@ include/VBox \ include/VBox/vmm \ include/VBox/com \ @@ -489,25 +402,7 @@ include/VBox/HostServices \ include/VBox/GuestHost \ include/VBox/HGSMI \ -@@ -983,17 +935,8 @@ - - additions-packing: - + $(KMK) VBOX_ONLY_ADDITIONS=1 \ -- VBOX_WITH_ADDITIONS_ISO.freebsd.amd64= \ -- VBOX_WITH_ADDITIONS_ISO.freebsd.x86= \ -- VBOX_WITH_ADDITIONS_ISO.linux.amd64= \ -- VBOX_WITH_ADDITIONS_ISO.linux.x86=1 \ - VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE=1 \ -- VBOX_WITH_ADDITIONS_ISO.os2.x86=1 \ -- VBOX_WITH_ADDITIONS_ISO.solaris.amd64=1 \ -- VBOX_WITH_ADDITIONS_ISO.solaris.x86=1 \ - VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 \ -- VBOX_WITH_ADDITIONS_ISO.win.amd64=1 \ -- VBOX_WITH_ADDITIONS_ISO.win.x86=1 \ - -C src/VBox/Additions \ - $(VBOX_PATH_ADDITIONS)/VBoxGuestAdditions.zip - -@@ -1010,200 +953,6 @@ +@@ -1010,200 +1009,6 @@ # @@ -1106,14 +1001,374 @@ else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_TESTSUITE && !VBOX_ONLY_DOCS # ---- VirtualBox-4.2.12.orig/src/VBox/Additions/Makefile.kmk 2013-04-12 07:34:09.000000000 -0300 -+++ VirtualBox-4.2.12/src/VBox/Additions/Makefile.kmk 2013-05-09 23:06:58.029922668 -0300 -@@ -42,7 +42,7 @@ - # - # ==> All we have to worry about is what to do on the target we're on. - # --VBOX_WITH_ADDITIONS_ISO.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = 1 -+VBOX_WITH_ADDITIONS_ISO.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = 0 +--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp 2013-04-12 07:37:59.000000000 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp 2013-05-10 16:26:44.137679260 -0300 +@@ -1829,166 +1829,12 @@ + "available on this virtual machine, and shared folders " + "cannot be used without them. To use shared folders inside " + "the virtual machine, please install the Guest Additions " +- "if they are not installed, or re-install them if they are " +- "not working correctly, by selecting <b>Install Guest Additions</b> " +- "from the <b>Devices</b> menu. " ++ "if they are not installed." + "If they are installed but the machine is not yet fully started " + "then shared folders will be available once it is.</p>"), + "remindAboutGuestAdditionsAreNotActive"); + } - # Include sub-makefiles. - include $(PATH_SUB_CURRENT)/common/Makefile.kmk +-bool UIMessageCenter::cannotFindGuestAdditions() +-{ +- return messageYesNo(mainMachineWindowShown(), Question, +- tr("<p>Could not find the VirtualBox Guest Additions " +- "CD image file.</nobr></p><p>Do you wish to " +- "download this CD image from the Internet?</p>")); +-} +- +-void UIMessageCenter::cannotMountGuestAdditions(const QString &strMachineName) +-{ +- message(mainMachineWindowShown(), Error, +- tr("<p>Could not insert the VirtualBox Guest Additions " +- "installer CD image into the virtual machine <b>%1</b>, as the machine " +- "has no CD/DVD-ROM drives. Please add a drive using the " +- "storage page of the virtual machine settings dialog.</p>") +- .arg(strMachineName)); +-} +- +-bool UIMessageCenter::confirmDownloadAdditions(const QString &strUrl, qulonglong uSize) +-{ +- QLocale loc(VBoxGlobal::languageId()); +- return messageOkCancel(networkManagerOrMainMachineWindowShown(), Question, +- tr("<p>Are you sure you want to download the VirtualBox " +- "Guest Additions CD image from " +- "<nobr><a href=\"%1\">%2</a></nobr> " +- "(size %3 bytes)?</p>").arg(strUrl).arg(strUrl).arg(loc.toString(uSize)), +- 0, /* pcszAutoConfirmId */ +- tr("Download", "additions")); +-} +- +-bool UIMessageCenter::confirmMountAdditions(const QString &strUrl, const QString &strSrc) +-{ +- return messageOkCancel(networkManagerOrMainMachineWindowShown(), Question, +- tr("<p>The VirtualBox Guest Additions CD image has been " +- "successfully downloaded from " +- "<nobr><a href=\"%1\">%2</a></nobr> " +- "and saved locally as <nobr><b>%3</b>.</nobr></p>" +- "<p>Do you wish to register this CD image and mount it " +- "on the virtual CD/DVD drive?</p>") +- .arg(strUrl).arg(strUrl).arg(strSrc), +- 0, /* pcszAutoConfirmId */ +- tr("Mount", "additions")); +-} +- +-void UIMessageCenter::warnAboutAdditionsCantBeSaved(const QString &strTarget) +-{ +- message(networkManagerOrMainMachineWindowShown(), Error, +- tr("<p>Failed to save the downloaded file as <nobr><b>%1</b>.</nobr></p>") +- .arg(QDir::toNativeSeparators(strTarget))); +-} +- +-bool UIMessageCenter::askAboutUserManualDownload(const QString &strMissedLocation) +-{ +- return messageOkCancel(mainWindowShown(), Question, +- tr("<p>Could not find the VirtualBox User Manual " +- "<nobr><b>%1</b>.</nobr></p><p>Do you wish to " +- "download this file from the Internet?</p>") +- .arg(strMissedLocation), +- 0, /* Auto-confirm Id */ +- tr("Download", "additions")); +-} +- +-bool UIMessageCenter::confirmUserManualDownload(const QString &strURL, qulonglong uSize) +-{ +- QLocale loc(VBoxGlobal::languageId()); +- return messageOkCancel(networkManagerOrMainWindowShown(), Question, +- tr("<p>Are you sure you want to download the VirtualBox " +- "User Manual from " +- "<nobr><a href=\"%1\">%2</a></nobr> " +- "(size %3 bytes)?</p>").arg(strURL).arg(strURL).arg(loc.toString(uSize)), +- 0, /* Auto-confirm Id */ +- tr("Download", "additions")); +-} +- +-void UIMessageCenter::warnAboutUserManualDownloaded(const QString &strURL, const QString &strTarget) +-{ +- message(networkManagerOrMainWindowShown(), Warning, +- tr("<p>The VirtualBox User Manual has been " +- "successfully downloaded from " +- "<nobr><a href=\"%1\">%2</a></nobr> " +- "and saved locally as <nobr><b>%3</b>.</nobr></p>") +- .arg(strURL).arg(strURL).arg(strTarget)); +-} +- +-void UIMessageCenter::warnAboutUserManualCantBeSaved(const QString &strURL, const QString &strTarget) +-{ +- message(networkManagerOrMainWindowShown(), Error, +- tr("<p>The VirtualBox User Manual has been " +- "successfully downloaded from " +- "<nobr><a href=\"%1\">%2</a></nobr> " +- "but can't be saved locally as <nobr><b>%3</b>.</nobr></p>" +- "<p>Please choose another location for that file.</p>") +- .arg(strURL).arg(strURL).arg(strTarget)); +-} +- +-bool UIMessageCenter::proposeDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion) +-{ +- return messageOkCancel(mainWindowShown(), +- Question, +- tr("<p>You have an old version (%1) of the <b><nobr>%2</nobr></b> installed.</p>" +- "<p>Do you wish to download latest one from the Internet?</p>") +- .arg(strExtPackVersion).arg(strExtPackName), +- 0, /* Auto-confirm Id */ +- tr("Download", "extension pack")); +-} +- +-bool UIMessageCenter::requestUserDownloadExtensionPack(const QString &strExtPackName, const QString &strExtPackVersion, const QString &strVBoxVersion) +-{ +- return message(mainWindowShown(), Info, +- tr("<p>You have version %1 of the <b><nobr>%2</nobr></b> installed.</p>" +- "<p>You should download and install version %3 of this extension pack from Oracle!</p>") +- .arg(strExtPackVersion).arg(strExtPackName).arg(strVBoxVersion), +- 0, /* Auto-confirm Id */ +- QIMessageBox::Ok | QIMessageBox::Default, +- 0, +- 0, +- tr("Ok", "extension pack")); +-} +- +-bool UIMessageCenter::confirmDownloadExtensionPack(const QString &strExtPackName, const QString &strURL, qulonglong uSize) +-{ +- QLocale loc(VBoxGlobal::languageId()); +- return messageOkCancel(networkManagerOrMainWindowShown(), Question, +- tr("<p>Are you sure you want to download the <b><nobr>%1</nobr></b> " +- "from <nobr><a href=\"%2\">%2</a></nobr> (size %3 bytes)?</p>") +- .arg(strExtPackName, strURL, loc.toString(uSize)), +- 0, /* Auto-confirm Id */ +- tr("Download", "extension pack")); +-} +- +-bool UIMessageCenter::proposeInstallExtentionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo) +-{ +- return messageOkCancel(networkManagerOrMainWindowShown(), Question, +- tr("<p>The <b><nobr>%1</nobr></b> has been " +- "successfully downloaded from <nobr><a href=\"%2\">%2</a></nobr> " +- "and saved locally as <nobr><b>%3</b>.</nobr></p>" +- "<p>Do you wish to install this extension pack?</p>") +- .arg(strExtPackName, strFrom, strTo), +- 0, /* Auto-confirm Id */ +- tr ("Install", "extension pack")); +-} +- +-void UIMessageCenter::warnAboutExtentionPackCantBeSaved(const QString &strExtPackName, const QString &strFrom, const QString &strTo) +-{ +- message(networkManagerOrMainWindowShown(), Error, +- tr("<p>The <b><nobr>%1</nobr></b> has been " +- "successfully downloaded from <nobr><a href=\"%2\">%2</a></nobr> " +- "but can't be saved locally as <nobr><b>%3</b>.</nobr></p>" +- "<p>Please choose another location for that file.</p>") +- .arg(strExtPackName, strFrom, strTo)); +-} +- + void UIMessageCenter::cannotConnectRegister(QWidget *pParent, + const QString &strUrl, + const QString &strReason) +@@ -2572,162 +2418,6 @@ + formatErrorInfo(progress.GetErrorInfo())); + } + +-void UIMessageCenter::cannotUpdateGuestAdditions(const CProgress &progress, +- QWidget *pParent /* = NULL */) const +-{ +- AssertWrapperOk(progress); +- +- message(pParent ? pParent : mainWindowShown(), +- Error, +- tr("Failed to update Guest Additions. The Guest Additions installation image will be mounted to provide a manual installation."), +- formatErrorInfo(progress.GetErrorInfo())); +-} +- +-void UIMessageCenter::cannotOpenExtPack(const QString &strFilename, +- const CExtPackManager &extPackManager, +- QWidget *pParent) +-{ +- message(pParent ? pParent : mainWindowShown(), +- Error, +- tr("Failed to open the Extension Pack <b>%1</b>.").arg(strFilename), +- formatErrorInfo(extPackManager)); +-} +- +-void UIMessageCenter::badExtPackFile(const QString &strFilename, +- const CExtPackFile &extPackFile, +- QWidget *pParent) +-{ +- message(pParent ? pParent : mainWindowShown(), +- Error, +- tr("Failed to open the Extension Pack <b>%1</b>.").arg(strFilename), +- "<!--EOM-->" + extPackFile.GetWhyUnusable()); +-} +- +-void UIMessageCenter::cannotInstallExtPack(const QString &strFilename, +- const CExtPackFile &extPackFile, +- const CProgress &progress, +- QWidget *pParent) +-{ +- if (!pParent) +- pParent = mainWindowShown(); +- QString strErrInfo = !extPackFile.isOk() || progress.isNull() +- ? formatErrorInfo(extPackFile) : formatErrorInfo(progress.GetErrorInfo()); +- message(pParent, +- Error, +- tr("Failed to install the Extension Pack <b>%1</b>.").arg(strFilename), +- strErrInfo); +-} +- +-void UIMessageCenter::cannotUninstallExtPack(const QString &strPackName, const CExtPackManager &extPackManager, +- const CProgress &progress, QWidget *pParent) +-{ +- if (!pParent) +- pParent = mainWindowShown(); +- QString strErrInfo = !extPackManager.isOk() || progress.isNull() +- ? formatErrorInfo(extPackManager) : formatErrorInfo(progress.GetErrorInfo()); +- message(pParent, +- Error, +- tr("Failed to uninstall the Extension Pack <b>%1</b>.").arg(strPackName), +- strErrInfo); +-} +- +-bool UIMessageCenter::confirmInstallingPackage(const QString &strPackName, const QString &strPackVersion, +- const QString &strPackDescription, QWidget *pParent) +-{ +- return messageOkCancel(pParent ? pParent : mainWindowShown(), +- Question, +- tr("<p>You are about to install a VirtualBox extension pack. " +- "Extension packs complement the functionality of VirtualBox and can contain system level software " +- "that could be potentially harmful to your system. Please review the description below and only proceed " +- "if you have obtained the extension pack from a trusted source.</p>" +- "<p><table cellpadding=0 cellspacing=0>" +- "<tr><td><b>Name: </b></td><td>%1</td></tr>" +- "<tr><td><b>Version: </b></td><td>%2</td></tr>" +- "<tr><td><b>Description: </b></td><td>%3</td></tr>" +- "</table></p>") +- .arg(strPackName).arg(strPackVersion).arg(strPackDescription), +- 0, +- tr("&Install")); +-} +- +-bool UIMessageCenter::confirmReplacePackage(const QString &strPackName, const QString &strPackVersionNew, +- const QString &strPackVersionOld, const QString &strPackDescription, +- QWidget *pParent) +-{ +- if (!pParent) +- pParent = pParent ? pParent : mainWindowShown(); /* this is boring stuff that messageOkCancel should do! */ +- +- QString strBelehrung = tr("Extension packs complement the functionality of VirtualBox and can contain " +- "system level software that could be potentially harmful to your system. " +- "Please review the description below and only proceed if you have obtained " +- "the extension pack from a trusted source."); +- +- QByteArray ba1 = strPackVersionNew.toUtf8(); +- QByteArray ba2 = strPackVersionOld.toUtf8(); +- int iVerCmp = RTStrVersionCompare(ba1.constData(), ba2.constData()); +- +- bool fRc; +- if (iVerCmp > 0) +- fRc = messageOkCancel(pParent, +- Question, +- tr("<p>An older version of the extension pack is already installed, would you like to upgrade? " +- "<p>%1</p>" +- "<p><table cellpadding=0 cellspacing=0>" +- "<tr><td><b>Name: </b></td><td>%2</td></tr>" +- "<tr><td><b>New Version: </b></td><td>%3</td></tr>" +- "<tr><td><b>Current Version: </b></td><td>%4</td></tr>" +- "<tr><td><b>Description: </b></td><td>%5</td></tr>" +- "</table></p>") +- .arg(strBelehrung).arg(strPackName).arg(strPackVersionNew).arg(strPackVersionOld).arg(strPackDescription), +- 0, +- tr("&Upgrade")); +- else if (iVerCmp < 0) +- fRc = messageOkCancel(pParent, +- Question, +- tr("<p>An newer version of the extension pack is already installed, would you like to downgrade? " +- "<p>%1</p>" +- "<p><table cellpadding=0 cellspacing=0>" +- "<tr><td><b>Name: </b></td><td>%2</td></tr>" +- "<tr><td><b>New Version: </b></td><td>%3</td></tr>" +- "<tr><td><b>Current Version: </b></td><td>%4</td></tr>" +- "<tr><td><b>Description: </b></td><td>%5</td></tr>" +- "</table></p>") +- .arg(strBelehrung).arg(strPackName).arg(strPackVersionNew).arg(strPackVersionOld).arg(strPackDescription), +- 0, +- tr("&Downgrade")); +- else +- fRc = messageOkCancel(pParent, +- Question, +- tr("<p>The extension pack is already installed with the same version, would you like reinstall it? " +- "<p>%1</p>" +- "<p><table cellpadding=0 cellspacing=0>" +- "<tr><td><b>Name: </b></td><td>%2</td></tr>" +- "<tr><td><b>Version: </b></td><td>%3</td></tr>" +- "<tr><td><b>Description: </b></td><td>%4</td></tr>" +- "</table></p>") +- .arg(strBelehrung).arg(strPackName).arg(strPackVersionOld).arg(strPackDescription), +- 0, +- tr("&Reinstall")); +- return fRc; +-} +- +-bool UIMessageCenter::confirmRemovingPackage(const QString &strPackName, QWidget *pParent) +-{ +- return messageOkCancel(pParent ? pParent : mainWindowShown(), +- Question, +- tr("<p>You are about to remove the VirtualBox extension pack <b>%1</b>.</p>" +- "<p>Are you sure you want to proceed?</p>").arg(strPackName), +- 0, +- tr("&Remove")); +-} +- +-void UIMessageCenter::notifyAboutExtPackInstalled(const QString &strPackName, QWidget *pParent) +-{ +- message(pParent ? pParent : mainWindowShown(), +- Info, +- tr("The extension pack <br><nobr><b>%1</b><nobr><br> was installed successfully.").arg(strPackName)); +-} +- + void UIMessageCenter::warnAboutIncorrectPort(QWidget *pParent) const + { + message(pParent, Error, +--- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-04-12 07:38:01.000000000 -0300 ++++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp 2013-05-10 17:03:11.087825690 -0300 +@@ -650,27 +650,6 @@ + } + }; + +-class PerformInstallGuestToolsAction : public UIActionSimple +-{ +- Q_OBJECT; +- +-public: +- +- PerformInstallGuestToolsAction(QObject *pParent) +- : UIActionSimple(pParent, ":/guesttools_16px.png", ":/guesttools_disabled_16px.png") +- { +- retranslateUi(); +- } +- +-protected: +- +- void retranslateUi() +- { +- setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "&Install Guest Additions...")), gMS->shortcut(UIMachineShortcuts::InstallGuestAdditionsShortcut))); +- setStatusTip(QApplication::translate("UIActionPool", "Mount the Guest Additions installation image")); +- } +-}; +- + #ifdef VBOX_WITH_DEBUGGER_GUI + class MenuDebugAction : public UIActionMenu + { +@@ -889,7 +868,6 @@ + m_pool[UIActionIndexRuntime_Simple_NetworkAdaptersDialog] = new ShowNetworkAdaptersDialogAction(this); + m_pool[UIActionIndexRuntime_Simple_SharedFoldersDialog] = new ShowSharedFoldersDialogAction(this); + m_pool[UIActionIndexRuntime_Toggle_VRDEServer] = new ToggleVRDEServerAction(this); +- m_pool[UIActionIndexRuntime_Simple_InstallGuestTools] = new PerformInstallGuestToolsAction(this); + + #ifdef VBOX_WITH_DEBUGGER_GUI + /* 'Debug' actions: */ |