diff options
39 files changed, 998 insertions, 113 deletions
diff --git a/community-testing/gtranslator/PKGBUILD b/community-testing/gtranslator/PKGBUILD index 9ad34ee63..c77a0183d 100644 --- a/community-testing/gtranslator/PKGBUILD +++ b/community-testing/gtranslator/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69147 2012-04-09 20:24:34Z bgyorgy $ +# $Id: PKGBUILD 69657 2012-04-21 22:10:45Z bgyorgy $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Christer Solskogen (solskogen@carebears.mine.nu) pkgname=gtranslator -pkgver=2.91.2 +pkgver=2.91.3 pkgrel=1 pkgdesc="An enhanced gettext po file editor for the GNOME" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog source=(http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz) -sha256sums=('884c14b5a556c0bb5764315530eda43542a0a887a2142cc3c75f8c917a8ff49e') +sha256sums=('0e398cf7909d1fbaf9db66e20913553b38d1af7cad097f5bc8cc229d9ffbc594') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/community-testing/gtranslator/gtranslator.changelog b/community-testing/gtranslator/gtranslator.changelog index 33e27a489..ab84fa46c 100644 --- a/community-testing/gtranslator/gtranslator.changelog +++ b/community-testing/gtranslator/gtranslator.changelog @@ -1,3 +1,6 @@ +2012-04-21 Balló György <ballogyor+arch at gmail dot com> + * gtranslator 2.91.3-1 + 2012-04-09 Balló György <ballogyor+arch at gmail dot com> * gtranslator 2.91.2-1 replace gtkspell dependency with gtkspell3 diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD index 51667b8c6..adac2e46a 100644 --- a/community/sslh/PKGBUILD +++ b/community/sslh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69412 2012-04-15 23:37:55Z seblu $ +# $Id: PKGBUILD 69659 2012-04-22 00:48:23Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Le_suisse <lesuisse.dev+aur at gmail dot com> # Contributor: Jason Rodriguez <jason-aur@catloaf.net> pkgname=sslh -pkgver=1.10 -pkgrel=6 +pkgver=1.11 +pkgrel=1 pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer' arch=('i686' 'x86_64') url='http://www.rutschle.net/tech/sslh.shtml' @@ -15,9 +15,9 @@ source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz" 'sslh.rc' 'sslh.conf' 'sslh.service') -md5sums=('bc34e9a4770d634633e70589c72708cc' +md5sums=('4ea599f0fa31ae235646e5a200b8f8fb' 'f64da291e97f1a99c33cb6ebf939b95b' - '808199410bd6ab67421bf3544f805d1a' + 'a098fb6b03a3435b223e16aed0e65e0b' 'ee8a4fcfc1f6839f7c93deb6f59f7fd6') build() { diff --git a/community/sslh/sslh.conf b/community/sslh/sslh.conf index eb79e7c51..b22a325ef 100644 --- a/community/sslh/sslh.conf +++ b/community/sslh/sslh.conf @@ -1,3 +1,3 @@ # vim:set ts=2 sw=2 ft=sh noet: -DAEMON_OPTS='-p 192.168.0.1:443 --ssh 127.0.0.1:22 --ssl 127.0.0.1:443 -u nobody -P /var/lock/sslh.lock' +DAEMON_OPTS='-p 192.168.0.1:443 --ssh 127.0.0.1:22 --ssl 127.0.0.1:443 -u nobody' diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD index 9233159be..d374faf8b 100644 --- a/core/e2fsprogs/PKGBUILD +++ b/core/e2fsprogs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153601 2012-03-16 15:10:42Z ronald $ +# $Id: PKGBUILD 156633 2012-04-21 23:34:11Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs -pkgver=1.42.1 +pkgver=1.42.2 pkgrel=1 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk 'MIT-LICENSE') backup=('etc/mke2fs.conf') install=${pkgname}.install -sha1sums=('c25c73de98737b5f6fb9debec36bfb6416b0ac07' +sha1sums=('bfba3716b78310cf2a288909f13214a718d91e25' 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') build() { diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index e50b0eb4b..eb8f9fc8a 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155995 2012-04-11 03:50:59Z allan $ +# $Id: PKGBUILD 156586 2012-04-21 10:26:57Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,8 +6,8 @@ pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') pkgver=4.7.0 -pkgrel=4 -_snapshot=4.7-20120407 +pkgrel=5 +_snapshot=4.7-20120414 _libstdcppmanver=20120307 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch gcc-4.7.0-cloog-0.17.patch) -md5sums=('e44a8484687ef52c02066d6434ecf42b' +md5sums=('9f9d082b64753d5908690500251fc52e' '489d2f5311535800a120efd8d18db719' 'ced48436c1b3c981d721a829f1094de1' '575f7d17b022e609447a590e481b18b5') diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD index 41e704157..cfc51b06a 100644 --- a/core/gnupg/PKGBUILD +++ b/core/gnupg/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 154487 2012-03-29 08:18:37Z bisson $ +# $Id: PKGBUILD 156582 2012-04-21 09:42:46Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> @@ -6,7 +6,7 @@ pkgname=gnupg pkgver=2.0.19 -pkgrel=1 +pkgrel=2 pkgdesc='Complete and free implementation of the OpenPGP standard' url='http://www.gnupg.org/' license=('GPL') @@ -42,5 +42,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install ln -s gpg2 "${pkgdir}"/usr/bin/gpg + ln -s gpg2 "${pkgdir}"/usr/bin/gpgv ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz } diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index b065622ff..42d5e009e 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148436 2012-01-31 20:35:00Z ronald $ +# $Id: PKGBUILD 156635 2012-04-21 23:34:43Z allan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.12.2 +pkgver=1.4.13 pkgrel=1 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64') @@ -24,7 +24,7 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta empty-raw.rules empty-security.rules) backup=(etc/conf.d/iptables) -sha1sums=('4dc8cdf1b711b23ed88eaaaa0e0e157d2bf2d81c' +sha1sums=('bf1f1896e052d1813a7c96fa70f88be8dab3ff86' '5bb6fa526665cdd728c26f0f282f5a51f220cf88' '2db68906b603e5268736f48c8e251f3a49da1d75' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' @@ -43,15 +43,16 @@ build() { sed -i '87 i libxt_RATEEST.so: libxt_RATEEST.oo' extensions/GNUmakefile.in sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' extensions/GNUmakefile.in - # FS#25358: libxt_statistic.so undefined symbol: lround - export LDFLAGS='-lm' + # use system one + rm include/linux/types.h ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ --with-xtlibdir=/usr/lib/iptables \ --enable-devel --enable-libipq \ --enable-shared --enable-static -# build fails when not enabling static, see if we can remove it on next build +# build fails when not enabling static, see if we can remove it on next build +# 1.4.13 still fails make } @@ -59,9 +60,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - unset CFLAGS - unset LDFLAGS - make DESTDIR="${pkgdir}" install cd "${srcdir}" diff --git a/core/libssh2/PKGBUILD b/core/libssh2/PKGBUILD index 051fa0215..fcdd8d45f 100644 --- a/core/libssh2/PKGBUILD +++ b/core/libssh2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 149700 2012-02-09 04:56:34Z dreisner $ +# $Id: PKGBUILD 156610 2012-04-21 17:49:44Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,7 +6,7 @@ # Contributor: ice-man <icemanf@gmail.com> pkgname=libssh2 -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=1 pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" url="http://www.libssh2.org/" @@ -14,11 +14,11 @@ arch=('i686' 'x86_64') license=('BSD') depends=('openssl') makedepends=('zlib') -provides=('libssh2.so=1-64') +provides=('libssh2.so') options=('!libtool') source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc}) -md5sums=('ee670161d8c5dff93ae84a3f34f15669' - 'd30af693479e5e88036ffb61ab8d0dc9') +md5sums=('b94106e046af37fdc0734e487842fe66' + 'd120a091e9f594c6608815d72b07c7a3') build() { cd "$pkgname-$pkgver" diff --git a/core/ppl/PKGBUILD b/core/ppl/PKGBUILD index a956ae0b4..ca648d973 100644 --- a/core/ppl/PKGBUILD +++ b/core/ppl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151929 2012-03-04 10:58:12Z allan $ +# $Id: PKGBUILD 156588 2012-04-21 10:27:00Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: ezzetabi <ezzetabi at gawab dot com> pkgname=ppl -pkgver=0.12 +pkgver=0.12.1 pkgrel=1 pkgdesc="A modern library for convex polyhedra and other numerical abstractions." arch=('i686' 'x86_64') @@ -12,8 +12,8 @@ license=('GPL3') depends=('gmp>=5.0') options=('!docs' '!libtool') source=(http://bugseng.com/products/ppl/download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz{,.sign}) -md5sums=('47a5548d4e3d98cf6b97e4fd3e5db513' - '41869f374e70d0a4d2faa61566365b9d') +md5sums=('cec8144f2072ac45a850214cca97d075' + '43eeeb147f9d8b3608aead63486c9545') build() { cd $srcdir/ppl-$pkgver diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD index 160551b35..55d289c7d 100644 --- a/extra/help2man/PKGBUILD +++ b/extra/help2man/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155915 2012-04-09 08:06:09Z giovanni $ +# $Id: PKGBUILD 156577 2012-04-21 07:39:14Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> pkgname=help2man -pkgver=1.40.8 +pkgver=1.40.9 pkgrel=1 pkgdesc="Conversion tool to create man files" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('perl-locale-gettext') install=help2man.install source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('5a58c9900affd16013e091a89dcddf58') +md5sums=('243aa6d549888c265616f2a082777a56') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index 5ab9b90da..0dd4b3f3e 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 156047 2012-04-12 08:06:44Z ibiru $ +# $Id: PKGBUILD 156598 2012-04-21 13:33:33Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libtorrent-rasterbar -pkgver=0.16.0 +pkgver=0.15.10 pkgrel=1 +epoch=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" url="http://www.rasterbar.com/products/libtorrent/" arch=('i686' 'x86_64') @@ -13,7 +14,7 @@ depends=('boost-libs' 'geoip' 'python2') makedepends=('boost') options=('!libtool' '!emptydirs') source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('212d910f6c06f06ef1b54d7e2dd68de18f6d9c73') +sha1sums=('3e461d9ede5fab3fb59be6a9f0cbc52121d536c4') build() { cd "$pkgname-$pkgver" diff --git a/extra/libwpd/PKGBUILD b/extra/libwpd/PKGBUILD index e70cdb796..c5846bdd5 100644 --- a/extra/libwpd/PKGBUILD +++ b/extra/libwpd/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 151318 2012-02-25 13:42:09Z allan $ +# $Id: PKGBUILD 156639 2012-04-22 00:00:22Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=libwpd -pkgver=0.9.2 -pkgrel=2 +pkgver=0.9.4 +pkgrel=1 pkgdesc="Library for importing WordPerfect (tm) documents" arch=('i686' 'x86_64') url="http://libwpd.sourceforge.net/" license=('LGPL') depends=('gcc-libs') makedepends=('libgsf>=1.14.20') -options=('!libtool') +options=('!libtool' '!emptydirs') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('da43f18da732f6156cef145d06613960') +md5sums=('d30d1726c3b113db70daaae423dd4448') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 1a4f8b0a0..1989f538c 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156477 2012-04-19 09:35:14Z giovanni $ +# $Id: PKGBUILD 156579 2012-04-21 07:48:29Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.04.18 +pkgver=2012.04.21 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('52248a7081e2989777258df4e37be966') +md5sums=('2e06ec6343be2c8355ce9fd3289f7c87') build() { cd ${srcdir}/live diff --git a/extra/xfce4-battery-plugin/PKGBUILD b/extra/xfce4-battery-plugin/PKGBUILD index 0b78657f9..cb2122cde 100644 --- a/extra/xfce4-battery-plugin/PKGBUILD +++ b/extra/xfce4-battery-plugin/PKGBUILD @@ -1,30 +1,24 @@ -# $Id: PKGBUILD 151509 2012-02-26 21:57:00Z foutrelis $ +# $Id: PKGBUILD 156575 2012-04-21 05:17:50Z eric $ # Maintainer: aurelien <aurelien@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-battery-plugin -pkgver=1.0.0 -pkgrel=3 +pkgver=1.0.1 +pkgrel=1 pkgdesc="A battery monitor plugin for the Xfce panel" arch=('i686' 'x86_64') license=('GPL2') url="http://xfce-goodies.berlios.de/" groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme') +depends=('xfce4-panel') makedepends=('intltool') options=('!libtool') install=$pkgname.install -source=(http://archive.xfce.org/src/panel-plugins/$pkgname/1.0/$pkgname-$pkgver.tar.bz2 - show-time-when-on-battery.patch) -sha256sums=('c28bb580e6b932c017b5bc6b2e75de8c3557e08d9606c7a70134aa035f8a121f' - '7cabd72a462406295e438a2aae89c09af9f759b5c257f7ecd19ae02c81250575') +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +sha256sums=('28c20a9cfa4461e5411b428aecad4a3c2f49eab69bb9a208b6ebb151c8bf212f') build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # Fix FS#27438: Remaining time not shown on some systems - patch -Np1 -i "$srcdir/show-time-when-on-battery.patch" - + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/xfce4-wavelan-plugin/PKGBUILD b/extra/xfce4-wavelan-plugin/PKGBUILD index 3f8a24f2a..118008f86 100644 --- a/extra/xfce4-wavelan-plugin/PKGBUILD +++ b/extra/xfce4-wavelan-plugin/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 149266 2012-02-06 17:02:00Z foutrelis $ +# $Id: PKGBUILD 156573 2012-04-21 04:42:41Z eric $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-wavelan-plugin -pkgver=0.5.6 -pkgrel=2 -pkgdesc="plugin to monitor wifi connectivity for the Xfce4 panel" +pkgver=0.5.10 +pkgrel=1 +pkgdesc="Plugin to monitor wifi connectivity for the Xfce4 panel" arch=('i686' 'x86_64') license=('custom') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin/" groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxfcegui4') +depends=('xfce4-panel') makedepends=('intltool') options=('!libtool') -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pkgver}.tar.bz2) -md5sums=('b23a4c9c2a206242ee4db8186dd01801') +source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('a4cd20ef471123936e762a139f1025e1') build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # Work around DSO linking issue - LDFLAGS+=' -Wl,--copy-dt-needed-entries' + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -32,7 +29,7 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/xorg-xmodmap/PKGBUILD b/extra/xorg-xmodmap/PKGBUILD index 344db5ba7..30058312a 100644 --- a/extra/xorg-xmodmap/PKGBUILD +++ b/extra/xorg-xmodmap/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 154170 2012-03-23 20:52:44Z andyrtr $ +# $Id: PKGBUILD 156637 2012-04-21 23:46:44Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xmodmap -pkgver=1.0.6 +pkgver=1.0.7 pkgrel=1 pkgdesc="Utility for modifying keymaps and button mappings" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('libx11') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xmodmap-${pkgver}.tar.bz2) -sha1sums=('0d235069c87f365902cd36ac8b2ccb01205fa9fb') +sha1sums=('9f9c6b7bd058c09a8e15b1c4f4eccb972e51ffef') build() { cd "${srcdir}/xmodmap-${pkgver}" diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD index df7449cba..cf1afc868 100644 --- a/libre/grub2/PKGBUILD +++ b/libre/grub2/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> -_grub_bzr_rev="4169" -_pkgver="2.00~beta3" +_grub_bzr_rev="4232" +_pkgver="2.00~beta4" _grub_lua_ver=24 _grub_gpxe_ver=12 @@ -12,8 +12,8 @@ _grub_915_ver=9 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386') pkgbase=grub2 -pkgver=2.00beta3 -pkgrel=1.1 +pkgver=2.00beta4 +pkgrel=1 url="http://www.gnu.org/software/grub/" arch=('i686' 'x86_64') license=('GPL3') @@ -30,23 +30,24 @@ source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz 'parabola_grub_mkconfig_fixes.patch' 'grub.default' 'grub.cfg' - '20_memtest86+') + '20_memtest86+' + 'grub-install.fix') noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz" "grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz") -sha1sums=('96bfdf4d53767faaf2c744ee82d4d703e4b672a2' +sha1sums=('72d7f46a67dd7e958105e7faac72e646ef6e9f11' '89290031b974780c6df76893836d2477d4add895' 'b04994c005910b4bf123f034b30109d5c8d6fd86' 'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a' 'd5ae2efec25616028a9d89e98b6e454f1c4c415f' - 'bf8e692c3920f0cf125ee77f14b8432133cae84d' + '31aa740fc225b3f3ed4917843038f9e8658a71be' '348b148d5183825f31a3d24a7ebf2d6a709f4e6a' - '6f0870673b9f994163326a416432aee7eacdbfc5' - 'ce35d7ae75cd1b5b677e894e528f96add40e77b9') - + '22063a0c7a779997a7763123a3064f7c1586674b' + 'ce35d7ae75cd1b5b677e894e528f96add40e77b9' + '4ff0e12e65fb1d4d3f2a16e82eaaa43940b7dde7') _build_grub2-common_and_bios() { ## copy the source for building the common/bios package @@ -57,6 +58,10 @@ _build_grub2-common_and_bios() { patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch" echo + ## upstream grub-install fix + ## http://lists.gnu.org/archive/html/help-grub/2012-04/msg00096.html + patch -Np0 -i "${srcdir}/grub-install.fix" + ## add the grub-extra sources export GRUB_CONTRIB="${srcdir}/grub_bios-${_pkgver}/grub-extras/" install -d "${srcdir}/grub_bios-${_pkgver}/grub-extras" @@ -188,7 +193,7 @@ build() { package_grub2-common() { - pkgdesc="The GNU GRand Unified Bootloader version 2 - Files common for all platforms" + pkgdesc="The GNU GRand Unified Bootloader version 2 - Files common for all platforms (Parabola rebranded)" depends=('xz' 'freetype2' 'gettext' 'device-mapper' 'fuse' 'sh') conflicts=('grub') backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom') diff --git a/libre/grub2/grub-install.fix b/libre/grub2/grub-install.fix new file mode 100644 index 000000000..29e74bd44 --- /dev/null +++ b/libre/grub2/grub-install.fix @@ -0,0 +1,11 @@ +=== modified file 'grub-core/kern/emu/hostdisk.c' +--- grub-core/kern/emu/hostdisk.c 2012-04-18 21:48:52 +0000 ++++ grub-core/kern/emu/hostdisk.c 2012-04-19 18:35:06 +0000 +@@ -1081,7 +1081,7 @@ + { + int fd; + grub_disk_addr_t max = ~0ULL; +- fd = open_device (disk, sector, O_RDONLY, &max); ++ fd = open_device (disk, sector, O_WRONLY, &max); + if (fd < 0) + return grub_errno; diff --git a/libre/grub2/grub.cfg b/libre/grub2/grub.cfg index 4f5a21991..9fffc564d 100644 --- a/libre/grub2/grub.cfg +++ b/libre/grub2/grub.cfg @@ -69,7 +69,7 @@ set timeout=5 ### END /etc/grub.d/00_header ### ### BEGIN /etc/grub.d/10_linux ### -menuentry 'Parabola GNU/Linux-libre, with Linux libre' --class parabolagnu/linux-libre --class gnu-linux --class gnu --class os { +menuentry 'Parabola GNU/Linux-libre, with Linux libre' --class parabola --class gnu-linux --class gnu --class os { load_video set gfxpayload=keep insmod gzio @@ -86,7 +86,7 @@ menuentry 'Parabola GNU/Linux-libre, with Linux libre' --class parabolagnu/linux echo 'Loading initial ramdisk ...' initrd /initramfs-linux-libre.img } -menuentry 'Parabola GNU/Linux-libre, with Linux libre Fallback' --class parabolagnu/linux-libre --class gnu-linux --class gnu --class os { +menuentry 'Parabola GNU/Linux-libre, with Linux libre' --class parabola --class gnu-linux --class gnu --class os { load_video set gfxpayload=keep insmod gzio diff --git a/libre/grub2/parabola_grub_mkconfig_fixes.patch b/libre/grub2/parabola_grub_mkconfig_fixes.patch index d199dc86a..19022aec6 100644 --- a/libre/grub2/parabola_grub_mkconfig_fixes.patch +++ b/libre/grub2/parabola_grub_mkconfig_fixes.patch @@ -1,5 +1,5 @@ diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in -index df3b733..65a7fff 100644 +index 516be86..5f37db2 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in @@ -213,6 +213,8 @@ export GRUB_DEFAULT \ @@ -31,7 +31,7 @@ index 765bfdc..b148558 100644 gfxterm=0; for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in -index 8c75fab..0d4a137 100644 +index 14402e8..64c9bb5 100644 --- a/util/grub.d/10_linux.in +++ b/util/grub.d/10_linux.in @@ -31,7 +31,7 @@ @@ -71,7 +71,7 @@ index 8c75fab..0d4a137 100644 sed "s/^/$submenu_indentation/" << EOF echo '$message' linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} -@@ -181,13 +184,29 @@ while [ "x$list" != "x" ] ; do +@@ -190,7 +193,22 @@ while [ "x$list" != "x" ] ; do alt_version=`echo $version | sed -e "s,\.old$,,g"` linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" @@ -94,15 +94,17 @@ index 8c75fab..0d4a137 100644 for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ "initrd-${version}" "initramfs-${version}.img" \ "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ - "initrd-${alt_version}" "initramfs-${alt_version}.img" \ +@@ -198,7 +216,8 @@ while [ "x$list" != "x" ] ; do "initramfs-genkernel-${version}" \ -- "initramfs-genkernel-${alt_version}"; do -+ "initramfs-genkernel-${alt_version}" \ + "initramfs-genkernel-${alt_version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ +- "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do ++ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \ + "${initrd_arch}.img" ; do if test -e "${dirname}/${i}" ; then initrd="$i" break -@@ -215,6 +234,22 @@ while [ "x$list" != "x" ] ; do +@@ -226,6 +245,22 @@ while [ "x$list" != "x" ] ; do linux_root_device_thisversion=${GRUB_DEVICE} fi @@ -125,7 +127,7 @@ index 8c75fab..0d4a137 100644 if [ "x$is_first_entry" = xtrue ]; then linux_entry "${OS}" "${version}" simple \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" -@@ -228,8 +263,11 @@ while [ "x$list" != "x" ] ; do +@@ -239,8 +274,11 @@ while [ "x$list" != "x" ] ; do echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {" fi @@ -137,7 +139,7 @@ index 8c75fab..0d4a137 100644 if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then linux_entry "${OS}" "${version}" recovery \ "single ${GRUB_CMDLINE_LINUX}" -@@ -241,8 +279,10 @@ done +@@ -252,8 +290,10 @@ done # If at least one kernel was found, then we need to # add a closing '}' for the submenu command. diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD index 8df922e2d..412f2ccce 100644 --- a/multilib/gcc-multilib/PKGBUILD +++ b/multilib/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69269 2012-04-11 15:52:28Z heftig $ +# $Id: PKGBUILD 69647 2012-04-21 10:27:12Z allan $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -8,8 +8,8 @@ pkgbase='gcc-multilib' pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') pkgver=4.7.0 -pkgrel=4 -_snapshot=4.7-20120407 +pkgrel=5 +_snapshot=4.7-20120414 _libstdcppmanver=20120307 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection for multilib" arch=('x86_64') @@ -24,7 +24,7 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64-multilib.patch gcc-4.7.0-cloog-0.17.patch) -md5sums=('e44a8484687ef52c02066d6434ecf42b' +md5sums=('9f9d082b64753d5908690500251fc52e' '489d2f5311535800a120efd8d18db719' 'ec24c32d3d1030c2bc8cb2ad2d1dc629' '575f7d17b022e609447a590e481b18b5') diff --git a/multilib/lib32-openssl/PKGBUILD b/multilib/lib32-openssl/PKGBUILD index 458437e3e..89ee33b51 100644 --- a/multilib/lib32-openssl/PKGBUILD +++ b/multilib/lib32-openssl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69606 2012-04-20 10:28:01Z bluewind $ +# $Id: PKGBUILD 69650 2012-04-21 13:38:28Z pschmitz $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> _pkgbasename=openssl @@ -7,7 +7,7 @@ _ver=1.0.1a # use a pacman compatible version scheme pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} #pkgver=$_ver -pkgrel=1 +pkgrel=1.1 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security (32-bit)' arch=('x86_64') url='https://www.openssl.org' @@ -37,10 +37,12 @@ build() { # set ca dir to /etc/ssl by default patch -p0 -i $srcdir/ca-dir.patch # mark stack as non-executable: http://bugs.archlinux.org/task/12434 + # workaround for PR#2771: OPENSSL_NO_TLS1_2_CLIENT ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib32 \ shared zlib enable-md2 \ linux-elf \ - -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" + -Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" \ + -DOPENSSL_NO_TLS1_2_CLIENT make MAKEDEPPROG="${CC}" depend make diff --git a/testing/freenx/PKGBUILD b/testing/freenx/PKGBUILD new file mode 100644 index 000000000..0e5aaf81b --- /dev/null +++ b/testing/freenx/PKGBUILD @@ -0,0 +1,95 @@ +# $Id: PKGBUILD 156628 2012-04-21 23:25:55Z andyrtr $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +#Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> + +pkgname=freenx +pkgver=0.7.3 +pkgrel=11 +pkgdesc="Free Software (GPL) Implementation of the NX Server" +arch=(i686 x86_64) +url="http://freenx.berlios.de" +license=('GPL') +depends=('nx-common' 'nx-x11' 'nxagent' 'nxproxy' 'gnu-netcat' 'inetutils' 'openssh' 'expect' 'python' + 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg') +optdepends=('cups: adds printing support') +makedepends=('imake') +options=('!makeflags') +conflicts=('nxserver') +provides=('nxserver') +backup=(etc/nxserver/node.conf) +install=freenx.install +source=(http://download.berlios.de/freenx/$pkgname-server-$pkgver.tar.gz + keymap.patch + nxagent-startup.patch + freenx-latest-svn.patch + remove-dialog.patch + freenx-server-0.7.3-nxipp.patch) +md5sums=('856f597e139018f7ed62713c9d6c9ed5' + 'f0867659c925f6363fb2b7661f349248' + '30dc16d8e2093ff71d5834a169ad9d00' + '788f30322783cf2c2dc833e2e4d5e8ad' + 'cae1773312506eeefe6a8de07c492bd8' + 'b3244c52a6bafc6d9b528eb4d4426e36') + +build() { + # patch and install nxserver + cd $srcdir/$pkgname-server-$pkgver + # add latest svn fixes + patch -Np3 -i ../freenx-latest-svn.patch + # patch from inside nx + patch < gentoo-nomachine.diff + # patch broken keymap remapping + patch -Np0 -i ${srcdir}/keymap.patch + # patch nxagent startup to avoid login issues + patch -Np0 -i ${srcdir}/nxagent-startup.patch + # check for cups existance and then symlinks the backend + patch -Np1 -i ${srcdir}/freenx-server-0.7.3-nxipp.patch + # remove broken dialog function + patch -Np0 -i ${srcdir}/remove-dialog.patch + sed -i -e 's,authorized_keys2,authorized_keys,g' nxloadconfig + sed -i -e 's,\/usr\/NX,\/usr\/lib/nx,g' nxloadconfig node.conf.sample + sed -i -e 's,netcat,nc,g' nxloadconfig + sed -i -e 's/utmp/nx/g' nxsetup + sed -i -e 's,/usr/X11R6/bin/xauth,/usr/bin/xauth,g' nxloadconfig + sed -i -e 's,COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile",COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile",g' nxloadconfig + sed -i -e 's,COMMAND_MD5SUM="openssl md5",COMMAND_MD5SUM="md5sum",g' nxloadconfig node.conf.sample + sed -i -e 's|AGENT_EXTRA_OPTIONS_X=""|AGENT_EXTRA_OPTIONS_X="-co /usr/share/X11/rgb -fp /usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 -xkbdir /usr/share/X11/xkb"|g' nxloadconfig + sed -i -e 's/ENABLE_AUTORECONNECT_BEFORE_140="1"/ENABLE_AUTORECONNECT_BEFORE_140="0"/g' nxloadconfig + sed -i -e 's,/etc/init.d/ssh,/etc/rc.d/sshd,g' nxsetup + sed -i -e 's,libXcomp.so,libXcomp.so.3,g' nxloadconfig + sed -i -e 's,libXcompext.so,libXcompext.so.3,g' nxloadconfig + sed -i -e 's,libXrender.so.1.2,libXrender.so.1.2.2:$APPLICATION_LIBRARY_PATH/libXcompsh.so.3:$APPLICATION_LIBRARY_PATH/libXcompshad.so.3,g' nxloadconfig + sed -i -e 's:NX_ETC_DIR\=$NX_DIR\/etc:NX_ETC_DIR=\/etc\/nxserver:g' nxloadconfig + sed -i -e 's:NX_SESS_DIR=$NX_DIR\/var\/db:NX_SESS_DIR=\/var\/lib\/nxserver\/db:g' nxloadconfig + sed -i -e 's:NX_HOME_DIR=$NX_DIR:NX_HOME_DIR=\/var\/lib\/nxserver:g' nxloadconfig + sed -i -e 's:NOMACHINE_NX_HOME_DIR="/usr/lib/nx/home/nx":NOMACHINE_NX_HOME_DIR="/var/lib/nxserver/home/nx":g' nxloadconfig node.conf.sample + sed -i -e 's:\/usr\/NX:\/usr\/lib\/nx:g' nxdialog + + # fix key generation + sed -i -e 's,AUTOMATIC="no",AUTOMATIC="yes",g' nxsetup + + make +} + +package() { + cd $srcdir/$pkgname-server-$pkgver + + make install DESTDIR="${pkgdir}" + + # create symlinks + install -dm755 ${pkgdir}/usr/bin + cd ${pkgdir}/usr/bin + for file in ${pkgdir}/usr/lib/nx/bin/*; do + ln -sv /usr/lib/nx/bin/`basename $file` . + done + + mv $pkgdir/etc/nxserver/node.conf.sample $pkgdir/etc/nxserver/node.conf + + # create some missing nxserver directories + mkdir -m700 -p $pkgdir/var/lib/nxserver/{home/nx,db} + mkdir -m700 -p $pkgdir/usr/lib/nx/share + + # remove files that are part of nxclient + rm -f ${pkgdir}/usr/lib/nx/bin/nxprint + rm -f ${pkgdir}/usr/bin/nxprint +} diff --git a/testing/freenx/freenx-latest-svn.patch b/testing/freenx/freenx-latest-svn.patch new file mode 100644 index 000000000..bcc8ddd17 --- /dev/null +++ b/testing/freenx/freenx-latest-svn.patch @@ -0,0 +1,288 @@ +diff -ur freenx-server-0.7.3//ChangeLog ../trunk/freenx-server//ChangeLog +--- freenx-server-0.7.3//ChangeLog 2008-08-22 02:44:43.000000000 +0200 ++++ ../trunk/freenx-server//ChangeLog 2011-01-26 23:23:36.850005855 +0100 +@@ -1,3 +1,20 @@ ++xx.11.2008 FreeNX 0.7.4 ++ * Opened the 0.7.4 development. ++ * Fixed missing export of NX_ETC_DIR in Makefile, ++ so node.conf.sample is installed correctly. ++ (fabianx@bat.berlios.de) ++ * Fixed broken round-robin load balance algorithm. ++ (fabianx@bat.berlios.de) ++ * Fixed --terminate|--suspend|--force-terminate for ++ load balancing case. ++ (fabianx@bat.berlios.de) ++ * Fixed --terminate|--suspend|--force-terminate for ++ usermode case. ++ (fabianx@bat.berlios.de) ++ * Fixed non-encrypted session mode. You might need to ++ set EXTERNAL_PROXY_IP in node.conf. ++ (fabianx@bat.berlios.de) ++ + 18.08.2008 FreeNX 0.7.3 "Priscilla One Year Edition" + * Opened the 0.7.3 development. + * Added logging of failed authentication attempts +diff -ur freenx-server-0.7.3//Makefile ../trunk/freenx-server//Makefile +--- freenx-server-0.7.3//Makefile 2008-08-18 04:16:25.000000000 +0200 ++++ ../trunk/freenx-server//Makefile 2011-01-26 23:23:36.856672521 +0100 +@@ -8,7 +8,7 @@ + all: + cd nxviewer-passwd && xmkmf && make Makefiles && make depend + source nxloadconfig &&\ +- export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION &&\ ++ export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\ + for i in $(SUBDIRS) ; \ + do\ + echo "making" all "in $$i..."; \ +@@ -44,5 +44,5 @@ + + install: + source nxloadconfig &&\ +- export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION &&\ ++ export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\ + $(MAKE) nxenv_install +diff -ur freenx-server-0.7.3//node.conf.sample ../trunk/freenx-server//node.conf.sample +--- freenx-server-0.7.3//node.conf.sample 2008-08-22 02:44:43.000000000 +0200 ++++ ../trunk/freenx-server//node.conf.sample 2011-01-26 23:23:36.850005855 +0100 +@@ -37,7 +37,7 @@ + # + # https://mail.kde.org/mailman/listinfo/freenx-knx + # +-# SVN: $Id: node.conf.sample 580 2008-08-22 00:44:43Z fabianx $ ++# SVN: $Id: node.conf.sample 613 2008-09-01 20:42:31Z fabianx $ + + ######################################################################### + # General FreeNX directives +@@ -47,6 +47,11 @@ + # different than the default hostname (as returned by `hostname`) + #SERVER_NAME="$(hostname)" + ++# The node ip which is used by NX Node in unecnrypted session mode. ++# Set it if you want to use a specific external ip or the autodetection ++# is not working. ++#EXTERNAL_PROXY_IP="" ++ + # The port number where local 'sshd' is listening. + #SSHD_PORT=22 + +diff -ur freenx-server-0.7.3//nxloadconfig ../trunk/freenx-server//nxloadconfig +--- freenx-server-0.7.3//nxloadconfig 2008-08-22 02:44:43.000000000 +0200 ++++ ../trunk/freenx-server//nxloadconfig 2011-01-26 23:23:36.856672521 +0100 +@@ -5,7 +5,7 @@ + # + # License: GPL, version 2 + # +-# SVN: $Id: nxloadconfig 580 2008-08-22 00:44:43Z fabianx $ ++# SVN: $Id: nxloadconfig 613 2008-09-01 20:42:31Z fabianx $ + # + # ======================================================================== + +@@ -52,7 +52,7 @@ + # DO NOT TOUCH unless you REALLY know what you are doing + ######################################################################### + +-NX_VERSION=3.2.0-73 ++NX_VERSION=3.2.0-74-SVN + NX_LICENSE="OS (GPL, using backend: %BACKEND%)" + + # Where can different nx components be found +@@ -85,6 +85,7 @@ + # General FreeNX directives + + SERVER_NAME="$(hostname)" ++EXTERNAL_PROXY_IP="" + SSHD_PORT=22 + + # Authentication / Security directives +diff -ur freenx-server-0.7.3//nxnode ../trunk/freenx-server//nxnode +--- freenx-server-0.7.3//nxnode 2008-08-22 02:44:43.000000000 +0200 ++++ ../trunk/freenx-server//nxnode 2011-01-26 23:23:36.853339188 +0100 +@@ -13,7 +13,7 @@ + # + # License: GNU GPL, version 2 + # +-# SVN: $Id: nxnode 580 2008-08-22 00:44:43Z fabianx $ ++# SVN: $Id: nxnode 613 2008-09-01 20:42:31Z fabianx $ + # + # 21.06.2004: - Full reconnection support + +@@ -1184,6 +1184,17 @@ + [ -z "$userip" -a "$host" = "127.0.0.1" ] && userip="127.0.0.1" + [ -z "$userip" ] && userip="*" + fi ++ ++ # We need our own external IP ++ proxyip="$EXTERNAL_PROXY_IP" ++ ++ if [ -z "$proxyip" -a -n "$host" ] ++ then ++ [ "$host" = "127.0.0.1" ] && host=$(hostname) ++ proxyip=$(ping -c1 "$host" | grep 'PING' | cut -d'(' -f2 | cut -d')' -f1) ++ fi ++ ++ [ -z "$proxyip" ] && proxyip="127.0.0.1" + + # ok, lets make the session dir first: + +@@ -1316,7 +1327,7 @@ + NX> 705 Session display: $display + NX> 703 Session type: $type + NX> 701 Proxy cookie: $proxy_cookie +-NX> 702 Proxy IP: $userip ++NX> 702 Proxy IP: $proxyip + NX> 706 Agent cookie: $cookie + NX> 704 Session cache: $type + NX> 707 SSL tunneling: $ssl_tunnel +diff -ur freenx-server-0.7.3//nxserver ../trunk/freenx-server//nxserver +--- freenx-server-0.7.3//nxserver 2008-08-22 02:44:43.000000000 +0200 ++++ ../trunk/freenx-server//nxserver 2011-01-26 23:23:36.856672521 +0100 +@@ -11,7 +11,7 @@ + # + # License: GNU GPL, version 2 + # +-# SVN: $Id: nxserver 580 2008-08-22 00:44:43Z fabianx $ ++# SVN: $Id: nxserver 612 2008-08-25 03:28:15Z fabianx $ + # + + # Read the config file +@@ -1192,7 +1192,7 @@ + # Lock held + + SERVER_LB_NR=$(cat $NX_SESS_DIR/round-robin 2>/dev/null) +- let SERVER_LB_NR=(SERVER_LB_NR+1) % SERVER_LB_NR_OF_HOSTS ++ let SERVER_LB_NR=(SERVER_LB_NR+1)%SERVER_LB_NR_OF_HOSTS + echo $SERVER_LB_NR >$NX_SESS_DIR/round-robin + + # Exit critical section +@@ -1961,71 +1961,71 @@ + session_history "$user" "$sessid" + } + +-cmd_terminate() ++cmd_execute() + { +- CMD_PARAMS=$(cmd_parse_3_params "$2") +- [ -z "$CMD_PARAMS" ] && exit 1 +- for i in $CMD_PARAMS; ++ cmd_host="$1" ++ cmd_user="$2" ++ cmd_cmd="$3" ++ ++ if [ "$ENABLE_USERMODE_AUTHENTICATION" = "1" ] ++ then ++ sh -c "$cmd_cmd" ++ elif [ "$cmd_host" = "127.0.0.1" -o "$cmd_host" = "localhost" ] ++ then ++ su - "$cmd_user" -c "$cmd_cmd" ++ else ++ ssh "$cmd_host" su - "$cmd_user" -c "'$cmd_cmd'" ++ fi ++} ++ ++cmd_terminate_or_send() ++{ ++ CMD="$1" ++ ++ if [ "$CMD" = "--broadcast" ] ++ then ++ CMD_PARAMS=$(session_find_all) ++ [ -z "$CMD_PARAMS" ] && cmd_abort "Error: No running session could be found." ++ else ++ CMD_PARAMS=$(cmd_parse_3_params "$2") ++ [ -z "$CMD_PARAMS" ] && exit 1 ++ shift ++ fi ++ shift ++ ++ for i in $CMD_PARAMS + do + CMDLINE=$(session_get_cmdline $i) + cmd_sessionid=$(getparam sessionId) ++ cmd_display=$(getparam display) + cmd_user=$(getparam userName) + cmd_type=$(getparam type) + cmd_status=$(getparam status) ++ cmd_host=$(getparam host) + + # is it a "good" session? +- case "$1" in ++ case "$CMD" in + --suspend) + if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type" + then +- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --suspend" ++ echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --suspend" + fi + ;; + --terminate) +- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --terminate" ++ echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --terminate" + ;; + --force-terminate) +- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --terminate" ++ echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --terminate" + session_close $cmd_sessionid + ;; +- esac +- done +- +-} +- +-cmd_send() +-{ +- if [ "$1" = "--broadcast" ] +- then +- CMD_PARAMS=$(session_find_all) +- [ -z "$CMD_PARAMS" ] && cmd_abort "Error: No running session could be found." +- else +- CMD_PARAMS=$(cmd_parse_3_params "$2") +- [ -z "$CMD_PARAMS" ] && exit 1 +- shift +- fi +- shift +- for i in $CMD_PARAMS; +- do +- CMDLINE=$(session_get_cmdline $i) +- cmd_display=$(getparam display) +- cmd_user=$(getparam userName) +- cmd_type=$(getparam type) +- cmd_status=$(getparam status) +- cmd_host=$(getparam host) +- +- # is it a "good" session? +- if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type" +- then +- if [ "$cmd_host" = "127.0.0.1" -o "$cmd_host" = "localhost" ] ++ --send|--broadcast) ++ # is it a "good" session? ++ if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type" + then +- su - "$cmd_user" -c "$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &" +- else +- ssh $cmd_host su - "$cmd_user" -c "'$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &'" ++ cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &" + fi +- fi ++ esac + done +- #nxnode_start --send "$CMD_PARAMS" + } + + # +@@ -2099,13 +2099,13 @@ + cmd_history "$@" + ;; + --terminate|--suspend|--force-terminate) +- cmd_terminate "$@" ++ cmd_terminate_or_send "$@" + ;; + --cleanup) +- cmd_terminate "--force-terminate" "*" ++ cmd_terminate_or_send "--force-terminate" "*" + ;; + --send|--broadcast) +- cmd_send "$@" ++ cmd_terminate_or_send "$@" + ;; + *) + cmd_abort "Error: Function $CMD not implemented yet." diff --git a/testing/freenx/freenx-server-0.7.3-nxipp.patch b/testing/freenx/freenx-server-0.7.3-nxipp.patch new file mode 100644 index 000000000..81b286593 --- /dev/null +++ b/testing/freenx/freenx-server-0.7.3-nxipp.patch @@ -0,0 +1,17 @@ +diff -up freenx-server-0.7.3/nxsetup~ freenx-server-0.7.3/nxsetup +--- freenx-server-0.7.3/nxsetup~ 2011-12-30 23:04:53.515194711 +0200 ++++ freenx-server-0.7.3/nxsetup 2011-12-30 23:05:55.499954085 +0200 +@@ -366,11 +366,10 @@ EOF + + echo "done" + +- if [ -d "$CUPS_BACKEND" ] ++ if [ -d "$CUPS_BACKEND" ] && [ ! -f "$CUPS_IPP_BACKEND" ] + then + echo -n "Setting up cups nxipp backend ..." +- cp -af "$CUPS_BACKEND/ipp" "$CUPS_IPP_BACKEND" +- chmod 755 "$CUPS_IPP_BACKEND" ++ ln -sf "$CUPS_BACKEND/ipp" "$CUPS_IPP_BACKEND" + echo "done" + fi + } diff --git a/testing/freenx/freenx.install b/testing/freenx/freenx.install new file mode 100644 index 000000000..0f3260166 --- /dev/null +++ b/testing/freenx/freenx.install @@ -0,0 +1,59 @@ +post_install() { + # Make sure the group and user "nx" exists on this system and have the correct values + if grep -q "^nx:" /etc/group &> /dev/null ; then + groupmod -g 85 -n nx nx &> /dev/null + else + groupadd -g 85 nx &> /dev/null + fi + + if grep -q "^nx:" /etc/passwd 2> /dev/null ; then + usermod -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx nx &> /dev/null + else + useradd -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx -r nx &> /dev/null + fi + + # setting up freenx + echo 'Generating keys ...' + /usr/lib/nx/bin/nxsetup --install 2>&1 >/dev/null + + echo "ATTENTION FREENX:" + echo "For correct setup please take a look at the wiki:" + echo "http://wiki.archlinux.org/index.php/FreeNX" +} + +post_upgrade() { + # Make sure the group and user "nx" exists on this system and have the correct values + if grep -q "^nx:" /etc/group &> /dev/null ; then + groupmod -g 85 -n nx nx &> /dev/null + else + groupadd -g 85 nx &> /dev/null + fi + + if grep -q "^nx:" /etc/passwd 2> /dev/null ; then + usermod -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx nx &> /dev/null + else + useradd -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx -r nx &> /dev/null + fi + + # setting up freenx + echo "Rerunning nxsetup ..." + /usr/lib/nx/bin/nxsetup --install 2>&1 >/dev/null + + if [ "`vercmp $2 0.7.3-10.1`" -lt 0 ]; then + # important upgrade notice + echo "*** config file location has been moved ***" + echo "Please apply your local settings from /opt/NX/etc/node.conf.pacsave" + echo "into /etc/nxserver/node.conf. A new key set is required." + echo "Please copy to your clients the new client key:" + echo "\"/var/lib/nxserver/home/nx/.ssh/client.id_dsa.key\"" + echo "When you have FreeNX server running clean up with \"rm -rf /opt/NX\"." + fi +} + +# arg 1: the old package version +pre_remove() { + /usr/lib/nx/bin/nxsetup --uninstall --purge 2>&1 >/dev/null +# usr/sbin/groupdel nx &>/dev/null + userdel nx &> /dev/null + groupdel nx &> /dev/null || /bin/true +} diff --git a/testing/freenx/keymap.patch b/testing/freenx/keymap.patch new file mode 100644 index 000000000..a0bb678e4 --- /dev/null +++ b/testing/freenx/keymap.patch @@ -0,0 +1,32 @@ +=== modified file 'nxnode' +--- nxnode 2009-01-14 04:22:40 +0000 ++++ nxnode 2009-01-14 04:24:02 +0000 +@@ -555,7 +555,8 @@ + + # Start the agent + +- PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $P $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 & ++ #PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $P $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 & ++ PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 & + fi + + # +@@ -1094,6 +1095,8 @@ + # Rootless fix from 2x nxserver 1.5.0 + realtype=$type + [ "$type" = "unix-application" -o "$type" = "unix-default" ] && realtype="unix-desktop" ++ [ "$type" = "unix-gnome" ] && realtype="gnome" ++ [ "$type" = "unix-kde" ] && realtype="kde" + + # NX 2.1.0 file-sharing port options + client=$(getparam client) +@@ -1272,7 +1275,7 @@ + umask 0077 + + cat << EOF > "$USER_FAKE_HOME/.nx/C-$sess_id/options" +-${keyboard:+keyboard=$keyboard,}${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$realtype,cleanup=0,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${aux:+,aux=$aux}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}${clipboard:+,clipboard=$clipboard}${menu:+,menu=$menu}:$display ++nx/nx,${keyboard:+keyboard=$keyboard,}${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${geometry:+geometry=$geometry,}${client:+client=$client,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$realtype${clipboard:+,clipboard=$clipboard}${composite:+composite=$composite},cleanup=0,product=LFE/None/LFEN/None,shmem=1,${backingstore:+backingstore=$backingstore,}shpix=1,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${aux:+,aux=$aux}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}${menu:+,menu=$menu}:$display + EOF + umask $OLD_UMASK + #samba=$samba, + diff --git a/testing/freenx/nxagent-startup.patch b/testing/freenx/nxagent-startup.patch new file mode 100644 index 000000000..e3c5497c1 --- /dev/null +++ b/testing/freenx/nxagent-startup.patch @@ -0,0 +1,12 @@ +--- nxnode~ 2010-04-30 15:42:46.000000000 +0200 ++++ nxnode 2010-04-30 15:42:46.000000000 +0200 +@@ -328,6 +328,9 @@ + NODE_WM_PID=$! + fi + ++ # Patch - delay to allow nxagent to complete launching ++ sleep 4 ++ + echo "Xft.dpi: 96" | DISPLAY=:$display xrdb -merge >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 + [ -d /etc/X11/Xresources ] && xrdb -display :$display -merge /etc/X11/Xresources/* >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 + diff --git a/testing/freenx/remove-dialog.patch b/testing/freenx/remove-dialog.patch new file mode 100644 index 000000000..054f1f6c4 --- /dev/null +++ b/testing/freenx/remove-dialog.patch @@ -0,0 +1,32 @@ +--- nxdialog~ 2011-02-01 09:05:28.993333438 +0100 ++++ nxdialog 2011-02-01 09:05:29.010000106 +0100 +@@ -85,29 +85,6 @@ + then + dialog_interface="xdialog" + DIALOG=/usr/bin/Xdialog # just in case that we have no good path +-elif [ -x /usr/bin/dialog ] +-then +- #JJK: Added 'dialog_interface=dialog' option because Xdialog not standard +- #JJK: on some distros such as Fedora and xmessage won't handle long +- #JJK: lists of ppd files while the combination of 'dialog' and 'xterm' +- #JJK: should be present on most setups. +- +- dialog_interface="dialog" +- DIALOG=/usr/bin/dialog +- if [ -z "$NXCLIENT_FIRST_TIME" ] +- then +- # Run only once in case of subdialogs. Capture result in tempfile +- TMPFILE=$(mktemp /tmp/nxclient.XXXXX) +- export NXCLIENT_FIRST_TIME=1 +- +- xterm -geometry 120x24+100+100 +sb -title "NXclient" -e \ +- /bin/bash -c "$DIALOG --infobox 'Please wait...' 3 25; $0 $INPUTS | tee $TMPFILE" || exit 1 +- +- #Need to recover the last line output (and not remove non-printing chars, because --stdout is used) +- tail -1 $TMPFILE +- rm -f $TMPFILE +- exit 0 +- fi + else + dialog_interface="xmessage" + xmessage=$(which xmessage 2>/dev/null) diff --git a/testing/gmime/PKGBUILD b/testing/gmime/PKGBUILD new file mode 100644 index 000000000..144cc95b4 --- /dev/null +++ b/testing/gmime/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 156594 2012-04-21 11:48:59Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Ben <ben@benmazer.net> + +pkgname=gmime +pkgver=2.6.8 +pkgrel=1 +pkgdesc="Core mime parsing library" +arch=('i686' 'x86_64') +license=('GPL') +url="http://spruce.sourceforge.net/gmime/" +depends=('glib2' 'gpgme' 'zlib') +makedepends=('gtk-sharp-2') +options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('cf434bc52329554b403ce08344a9c429f5807bbd67b2f1a6857daa145a2830d7') + +build() { + # get rid of that .wapi errors in fakeroot + export MONO_SHARED_DIR="$srcdir/weird" + mkdir -p "$MONO_SHARED_DIR" + + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr --enable-smime \ + --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/libgsf/PKGBUILD b/testing/libgsf/PKGBUILD new file mode 100644 index 000000000..d9e44d8ae --- /dev/null +++ b/testing/libgsf/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 156592 2012-04-21 11:46:06Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> + +pkgname=libgsf +pkgver=1.14.23 +pkgrel=1 +arch=(i686 x86_64) +pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats" +url="http://www.gnome.org/" +license=('GPL' 'LGPL') +options=('!libtool') +depends=('libxml2' 'gdk-pixbuf2' 'bzip2') +makedepends=('intltool' 'gobject-introspection') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz) +sha256sums=('bfc1c6178f5319d5e6d854c380ce26542f9a103a5ff31c9d25a834e0be52fb17') + +build() { + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package_libgsf() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/lv2/PKGBUILD b/testing/lv2/PKGBUILD index 4304bb131..16aef9dae 100644 --- a/testing/lv2/PKGBUILD +++ b/testing/lv2/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 156537 2012-04-20 17:48:38Z schiv $ +# $Id: PKGBUILD 156605 2012-04-21 17:24:19Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> pkgname=lv2 pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Successor to the LADSPA audio plug-in standard" url="http://lv2plug.in/" license=('LGPL' 'custom') arch=('i686' 'x86_64') makedepends=('python2' 'libsndfile' 'gtk2') optdepends=('libsndfile: lv2-eg-sampler' - 'gkt2: lv2-eg-sampler') + 'gtk2: lv2-eg-sampler') provides=('lv2core') conflicts=('lv2core') replaces=('lv2core') diff --git a/testing/nx-common/NXproto.h.64bit.diff b/testing/nx-common/NXproto.h.64bit.diff new file mode 100644 index 000000000..ac326ebcd --- /dev/null +++ b/testing/nx-common/NXproto.h.64bit.diff @@ -0,0 +1,66 @@ +--- nxcomp.old/NXproto.h 2006-06-19 19:55:56.000000000 +0200 ++++ nxcomp/NXproto.h 2007-02-12 18:17:41.000000000 +0100 +@@ -26,6 +26,30 @@ + #include <X11/Xmd.h> + #include <X11/Xproto.h> + ++/* ++ Copied from Xproto.h ++ */ ++ ++/* For the purpose of the structure definitions in this file, ++we must redefine the following types in terms of Xmd.h's types, which may ++include bit fields. All of these are #undef'd at the end of this file, ++restoring the definitions in X.h. */ ++ ++#define Window CARD32 ++#define Drawable CARD32 ++#define Font CARD32 ++#define Pixmap CARD32 ++#define Cursor CARD32 ++#define Colormap CARD32 ++#define GContext CARD32 ++#define Atom CARD32 ++#define VisualID CARD32 ++#define Time CARD32 ++#define KeyCode CARD8 ++#define KeySym CARD32 ++ ++/* End copied from Xproto.h */ ++ + #define sz_xNXGetControlParametersReq 4 + #define sz_xNXGetCleanupParametersReq 4 + #define sz_xNXGetImageParametersReq 4 +@@ -343,9 +367,9 @@ + CARD8 dstDepth; + CARD32 srcLength B32; + CARD32 dstLength B32; +- INT16 srcX B16, srcY B16; ++ CARD16 srcX B16, srcY B16; + CARD16 srcWidth B16, srcHeight B16; +- INT16 dstX B16, dstY B16; ++ CARD16 dstX B16, dstY B16; + CARD16 dstWidth B16, dstHeight B16; + } xNXPutPackedImageReq; + +@@ -463,4 +487,20 @@ + } + #endif + ++/* Copied from Xproto.h */ ++ ++/* restore these definitions back to the typedefs in X.h */ ++#undef Window ++#undef Drawable ++#undef Font ++#undef Pixmap ++#undef Cursor ++#undef Colormap ++#undef GContext ++#undef Atom ++#undef VisualID ++#undef Time ++#undef KeyCode ++#undef KeySym ++ + #endif /* NXproto_H */ diff --git a/testing/nx-common/PKGBUILD b/testing/nx-common/PKGBUILD new file mode 100644 index 000000000..bace88ed4 --- /dev/null +++ b/testing/nx-common/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 156626 2012-04-21 23:25:51Z andyrtr $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> + +pkgname=nx-common +pkgver=3.5.0 +pkgrel=5 +pkgdesc="NoMachine NX common package for client and server" +arch=('i686' 'x86_64') +license=('GPL') +url="http://nomachine.com/" +depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'libxcomp') # 'bash' +makedepends=('xorg-server-devel' 'nx-headers') +source=(http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz + http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz + nxcompsh-gcc43.patch) +options=('!libtool') +md5sums=('84ade443b79ea079380b754aba9d392e' + 'f52fcdb38e09f8dcfb9ff0344dfbbbd6' + 'b6c279654dac421fc3dd1a27d66ff53c') + +build() { + # nxcompsh + cd ${srcdir}/nxcompsh + patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch + ./configure --prefix=/usr/lib/nx + make + + # nxssh + cd ${srcdir}/nxssh + sed -i "s:NX.h:nx/NX.h:g" clientloop.c packet.c proxy.c + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib + make +} + +package() { + install -dm755 ${pkgdir}/usr/{bin,lib/nx} + + # nxcompsh + cd ${srcdir}/nxcompsh + cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx + cd ${pkgdir}/usr/lib/ + ln -sv /usr/lib/nx/libXcompsh.so{,.3,.3.5.0} . + # ^ really needed? + + # nxssh + cd ${srcdir}/nxssh + install -D -m755 nxssh ${pkgdir}/usr/lib/nx/bin/nxssh + cd ${pkgdir}/usr/bin + ln -sv /usr/lib/nx/bin/nxssh . +} diff --git a/testing/nx-common/nx-3.5.0-libpng15.patch b/testing/nx-common/nx-3.5.0-libpng15.patch new file mode 100644 index 000000000..c8f2a9559 --- /dev/null +++ b/testing/nx-common/nx-3.5.0-libpng15.patch @@ -0,0 +1,30 @@ +diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp +--- nxcomp.orig/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 ++++ nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 +@@ -414,7 +414,7 @@ + + png_read_info(pngPtr, infoPtr); + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -565,7 +565,7 @@ + + png_read_info( pngPtr, infoPtr ) ; + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -709,7 +709,7 @@ + png_read_info(pngPtr, infoPtr) ; + + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } diff --git a/testing/nx-common/nxcompsh-gcc43.patch b/testing/nx-common/nxcompsh-gcc43.patch new file mode 100644 index 000000000..681a0dab5 --- /dev/null +++ b/testing/nx-common/nxcompsh-gcc43.patch @@ -0,0 +1,19 @@ +--- nxcompsh/Misc.h~ 2007-06-04 13:39:49.000000000 +0200 ++++ nxcompsh/Misc.h 2008-04-12 12:46:24.000000000 +0200 +@@ -18,10 +18,12 @@ + #ifndef Misc_H + #define Misc_H + +-#include <iostream.h> ++#include <iostream> + +-#include <errno.h> +-#include <string.h> ++#include <cerrno> ++#include <cstring> ++ ++using namespace std; + + // + // Error handling macros. + diff --git a/testing/nx/PKGBUILD b/testing/nx/PKGBUILD new file mode 100644 index 000000000..6db55bcd4 --- /dev/null +++ b/testing/nx/PKGBUILD @@ -0,0 +1,108 @@ +# $Id: PKGBUILD 156624 2012-04-21 23:25:48Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> + +pkgbase=nx +pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers') +pkgver=3.5.0.12 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://wiki.x2go.org/" +license=('GPL') +options=('!makeflags') +makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages + 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends + ) +source=(http://code.x2go.org/releases/source/nx-libs/nx-libs_$pkgver-full.tar.gz + nx-x11.ld.so.conf.d) +md5sums=('a2011e034a318016cf2260c30a567301' + 'f2ec60c7e2d81bef2f7292d2b33681a6') + +build() { + cd "${srcdir}/nx-libs_$pkgver" + make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include" + # fake install + mkdir $srcdir/fakeinstall + make DESTDIR="$srcdir/fakeinstall" install +} + +package_libxcomp() { + + pkgdesc="NX X compression library" + depends=('libjpeg-turbo' 'libpng' 'gcc-libs') + + install -dm755 ${pkgdir}/usr/lib/nx/lib + cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx/lib + cd ${pkgdir}/usr/lib/ + ln -sv /usr/lib/nx/lib/libXcomp.so{,.3,.3.5.0} . +} + +package_nxproxy() { + + pkgdesc="NX proxy" + depends=('libxcomp') + + install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx} + cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx + # the wrapper + cp -a ${srcdir}/nx-libs_$pkgver/bin/nxproxy ${pkgdir}/usr/bin + chmod +x ${pkgdir}/usr/bin/nxproxy + cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1 +} + +package_nx-xcompext() { + + pkgdesc="Xcompext/Xcompshad library for NX" + depends=('libxcomp' 'nx-x11') + + install -dm755 ${pkgdir}/usr/lib/nx + #cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib/nx + cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so.3.5.0 ${pkgdir}/usr/lib/nx + cd ${pkgdir}/usr/lib/nx + ln -sv libXcompext.so.3.5.0 libXcompext.so.3 + ln -sv libXcompext.so.3.5.0 libXcompext.so + cd ${pkgdir}/usr/lib/ + ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} . +} + +package_nx-x11() { + + pkgdesc="NX-X11 lib for the NX framework" + depends=('libxcomp') + + install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx} + cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx + + cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx + # the wrapper + cp -a ${srcdir}/nx-libs_$pkgver/bin/nxauth ${pkgdir}/usr/bin + chmod +x ${pkgdir}/usr/bin/nxauth + + install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf" +} + +package_nxagent() { + + pkgdesc="NX X server based on Xnest" + depends=('nx-xcompext') + + install -dm755 ${pkgdir}/usr/{bin,lib/nx} + cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx + # the wrapper + cp -a ${srcdir}/nx-libs_$pkgver/bin/nxagent ${pkgdir}/usr/bin + chmod +x ${pkgdir}/usr/bin/nxagent + # required nxcompshad libs + cp -a ${srcdir}/nx-libs_$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx + cd ${pkgdir}/usr/lib/nx + ln -sv libXcompshad.so.3.5.0 libXcompshad.so.3 + ln -sv libXcompshad.so.3.5.0 libXcompshad.so + cd ${pkgdir}/usr/lib/ + ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} . +} + +package_nx-headers() { + + pkgdesc="NX headers" + + install -dm755 ${pkgdir}/usr/include/nx + cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx +} diff --git a/testing/nx/nx-x11.ld.so.conf.d b/testing/nx/nx-x11.ld.so.conf.d new file mode 100644 index 000000000..5d15cb6e2 --- /dev/null +++ b/testing/nx/nx-x11.ld.so.conf.d @@ -0,0 +1 @@ +/usr/lib/nx/ |