diff options
74 files changed, 2097 insertions, 235 deletions
diff --git a/community-testing/gdlmm/PKGBUILD b/community-testing/gdlmm/PKGBUILD new file mode 100644 index 000000000..fac4cc149 --- /dev/null +++ b/community-testing/gdlmm/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 69716 2012-04-22 23:41:47Z heftig $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +pkgname=gdlmm +pkgver=3.3.2 +pkgrel=2 +pkgdesc="C++ bindings for the gdl library" +arch=('x86_64' 'i686') +url="http://git.gnome.org/browse/gdlmm/" +depends=('gdl' 'gtkmm3') +options=(!libtool !emptydirs) +license=('LGPL') +source=("http://ftp.gnome.org/pub/GNOME/sources/gdlmm/3.3/$pkgname-$pkgver.tar.xz") +sha256sums=('cf3253be052737332b2b6e9dbd6f62d79cbc3f3398497158c0099dbc45741a46') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/gedit-plugins/PKGBUILD b/community-testing/gedit-plugins/PKGBUILD new file mode 100644 index 000000000..1403bb7c1 --- /dev/null +++ b/community-testing/gedit-plugins/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 69712 2012-04-22 23:14:40Z heftig $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Hugo Doria <hugo@archlinux.org> +# Contributor: Sergej Chodarev <sergejx@centrum.sk> +# Contributor: zhuqin <zhuqin83@gmail.com> + +pkgname=gedit-plugins +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Plugins for gedit" +arch=('x86_64' 'i686') +license=('GPL') +url="http://live.gnome.org/GeditPlugins" +depends=('gedit' 'dbus-python') +optdepends=('gucharmap: for charmap plugin' + 'vte3: for embedded terminal') +makedepends=('intltool' 'gnome-doc-utils' 'vte3') +options=('!libtool' '!emptydirs') +install=gedit-plugins.install +source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz") +sha256sums=('a66138b43e1a77f39258f04936be35163b4c6bfd49643791ca445cb3c3d60e0a') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --with-plugins=all \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR=$pkgdir install +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/gedit-plugins/gedit-plugins.install b/community-testing/gedit-plugins/gedit-plugins.install new file mode 100644 index 000000000..d5bcc00ae --- /dev/null +++ b/community-testing/gedit-plugins/gedit-plugins.install @@ -0,0 +1,23 @@ +pkgname=gedit-plugins + +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} + +pre_upgrade() { + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + usr/sbin/gconfpkg --uninstall ${pkgname} + fi +} + +post_upgrade() { + post_install $1 +} + + +post_remove() { + post_install $1 +} + + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/gtk-engine-unico/PKGBUILD b/community-testing/gtk-engine-unico/PKGBUILD new file mode 100644 index 000000000..dfcf116e0 --- /dev/null +++ b/community-testing/gtk-engine-unico/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 69673 2012-04-22 10:47:36Z bpiotrowski $ +# Maintainer: Bartlomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Hilinus <itahilinus[at]hotmail[dot]it> + +pkgname=gtk-engine-unico +pkgver=1.0.2 +pkgrel=1 +pkgdesc="Unico GTK3 theme engine" +arch=('i686' 'x86_64') +url="https://launchpad.net/unico" +license=('GPL') +depends=("gtk3") +options=(!libtool) +source=("http://launchpad.net/unico/1.0/$pkgver/+download/${pkgname#gtk-engine-}-$pkgver.tar.gz") +md5sums=('19fb3ecc36d4d13b4a76e26a4ebd6412') + + +build() { + cd ${srcdir}/${pkgname#gtk-engine-}-$pkgver + + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd ${srcdir}/${pkgname#gtk-engine-}-$pkgver + make DESTDIR=${pkgdir} install +} diff --git a/community-testing/nemiver/PKGBUILD b/community-testing/nemiver/PKGBUILD new file mode 100644 index 000000000..16ed100c9 --- /dev/null +++ b/community-testing/nemiver/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 69718 2012-04-22 23:49:26Z heftig $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: jordz <jordz@archlinux.us> + +pkgname=nemiver +pkgver=0.9.2 +pkgrel=2 +pkgdesc="C/C++ debugger for GNOME" +arch=('x86_64' 'i686') +license=('GPL') +url="http://www.gnome.org/projects/nemiver/" +depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'dconf' 'gsettings-desktop-schemas') +makedepends=('boost' 'intltool' 'gnome-doc-utils') +install=nemiver.install +source=("http://ftp.acc.umu.se/pub/GNOME/sources/nemiver/0.9/$pkgname-$pkgver.tar.xz") +options=('!libtool' '!emptydirs') +sha256sums=('770392965a45d728b798da3c6111c4e7cb55d51f109a78aedead99083f8e2520') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --with-boost \ + --disable-scrollkeeper \ + --enable-symsvis=yes \ + --enable-memoryview=yes \ + --disable-schemas-compile \ + --enable-gsettings=yes + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/nemiver/nemiver.install b/community-testing/nemiver/nemiver.install new file mode 100644 index 000000000..f6a1886e7 --- /dev/null +++ b/community-testing/nemiver/nemiver.install @@ -0,0 +1,15 @@ +post_upgrade() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + #update-desktop-database -q + #gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/community/javasqlite/PKGBUILD b/community/javasqlite/PKGBUILD index 64157d8c6..7a630833e 100644 --- a/community/javasqlite/PKGBUILD +++ b/community/javasqlite/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 58850 2011-11-19 00:04:26Z guillaume $ +# $Id: PKGBUILD 69678 2012-04-22 12:35:52Z guillaume $ +# Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=javasqlite -pkgver=20110827 +pkgver=20120209 pkgrel=1 pkgdesc="Java support for SQLite database engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.ch-werner.de/javasqlite/" -license=('BSD') -depends=('java-runtime<7') -makedepends=('java-environment<7' 'sqlite3') +license=('custom:BSD-style') +depends=('java-runtime' 'sqlite') +makedepends=('java-environment') options=('!libtool') source=(http://www.ch-werner.de/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('6fb577b1632425ddcf45f439886623b9') -sha1sums=('b64eb3955cfba2388dd0cda7a9d5a5ff46db22e9') +md5sums=('a5c4f7760ed002749560068b2bd4bb25') +sha1sums=('76aebb0a11b9e1f861ebaeab9ea3e5818b753ab3') build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,5 +29,3 @@ package() { make DESTDIR="$pkgdir" install install -D -m 644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } - -# vim:set ts=2 sw=2 et: diff --git a/community/mc/PKGBUILD b/community/mc/PKGBUILD index c68aaa2eb..0bfb9ac04 100644 --- a/community/mc/PKGBUILD +++ b/community/mc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 68243 2012-03-20 16:04:03Z schuay $ +# $Id: PKGBUILD 69681 2012-04-22 13:52:54Z schuay $ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: schuay <jakob.gruber@gmail.com> pkgname=mc -pkgver=4.8.2 +pkgver=4.8.3 pkgrel=1 pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander" arch=('i686' 'x86_64' 'mips64el') @@ -55,4 +55,4 @@ package() { -i "${pkgdir}/usr/lib/mc/extfs.d/s3+" } -md5sums=('54eba7680f3e24fbdb8d83e2cde9eca3') +md5sums=('12d38ad4969df3f8bbf66c3967a191ee') diff --git a/community/mplayer2/mplayer2.install b/community/mplayer2/mplayer2.install new file mode 100644 index 000000000..660593cf5 --- /dev/null +++ b/community/mplayer2/mplayer2.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD index 62ec5edea..ff27c5d97 100644 --- a/community/radvd/PKGBUILD +++ b/community/radvd/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69072 2012-04-08 22:59:52Z seblu $ +# $Id: PKGBUILD 69704 2012-04-22 21:26:38Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=radvd pkgver=1.8.5 -pkgrel=3 +pkgrel=4 pkgdesc='IPv6 Router Advertisement Daemon' url='http://www.litech.org/radvd/' license=('custom') @@ -17,7 +17,7 @@ source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" "$pkgname.conf" "$pkgname.service") sha1sums=('344c145bd29938b7eefb0210cf92bf18df3e191d' - 'efe02c38eac45bed065fd48c1e3e7753c90c7c2a' + '08dd01319682f4ef2e847d11aa375e0239c08c7a' '63ce41d790a0472e6b3b15928f6a71d1dbb7700d' '9cb6b2eaaf445fe8d17dfc50fde15709d4de7d1d') build() { diff --git a/community/radvd/radvd.rc b/community/radvd/radvd.rc index 26ad0dbf4..3cac104e7 100644 --- a/community/radvd/radvd.rc +++ b/community/radvd/radvd.rc @@ -4,37 +4,36 @@ . /etc/rc.d/functions . /etc/conf.d/${0##*/} -NAME='IPv6 Router Advertisement Daemon' DAEMON=/usr/sbin/radvd PIDFILE=${PIDFILE:-/run/${0##*/}.pid} DAEMON_OPTS+=("--pidfile=$PIDFILE") # check pid file [[ -r "$PIDFILE" ]] && - read PID < "$PIDFILE" && [[ -n $PID ]] && kill -0 $PID || unset PID + read PID < "$PIDFILE" && [[ -n $PID ]] && kill -0 $PID || unset PID case "$1" in - start) - stat_busy "Starting $NAME daemon" - [[ ! $PID ]] && $DAEMON "${DAEMON_OPTS[@]}" && - add_daemon $NAME && stat_done && exit 0 - stat_fail - ;; + start) + stat_busy "Starting ${0##*/} daemon" + [[ ! $PID ]] && $DAEMON "${DAEMON_OPTS[@]}" && + add_daemon ${0##*/} && stat_done && exit 0 + stat_fail + ;; stop) - stat_busy "Stopping $NAME daemon" - [[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && stat_done && exit 0 - stat_fail - ;; + stat_busy "Stopping ${0##*/} daemon" + [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0 + stat_fail + ;; restart) - $0 stop - $0 start - exit 0 - ;; - *) - echo "usage: ${0##*/} {start|stop|restart}" >&2 - ;; + $0 stop + $0 start + exit 0 + ;; + *) + echo "usage: ${0##*/} {start|stop|restart}" >&2 + ;; esac exit 1 -# vim:set ts=2 sw=2 ft=sh noet: +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD index 297188a87..5c74ce8df 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' 'mips64el') 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/community/tcpflow/PKGBUILD b/community/tcpflow/PKGBUILD index 701eb0ff5..97808eef0 100644 --- a/community/tcpflow/PKGBUILD +++ b/community/tcpflow/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 65859 2012-02-22 13:07:30Z cbrannon $ +# $Id: PKGBUILD 69671 2012-04-22 09:26:57Z cbrannon $ # Maintainer: Chris Brannon <cmbrannon79@gmail.com> # Contributor: Jeff Mickey <jeff@archlinux.org> pkgname=tcpflow -pkgver=1.1.0 +pkgver=1.2.6 pkgrel=1 pkgdesc="Captures data transmitted as part of TCP connections then stores the data conveniently" arch=('i686' 'x86_64' 'mips64el') url="http://afflib.org/software/tcpflow" license=('GPL') -depends=('gcc-libs' 'libpcap') -source=("http://afflib.org/downloads/$pkgname.tar.gz") -md5sums=('9b836b16575679e9d10f39ac7a98efbe') +depends=('gcc-libs' 'libpcap' 'zlib') +source=("https://github.com/downloads/simsong/$pkgname/$pkgname-$pkgver.tar.gz") build() { cd "$srcdir/$pkgname-$pkgver" @@ -23,3 +22,4 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install } +md5sums=('7562f8a1a65f1ce1238be84a1fe83bf6') diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD index 955217990..b8ea24688 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' 'mips64el') @@ -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 d3481fe70..09bc23ca6 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 @@ -10,8 +10,8 @@ else pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc') fi 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' 'mips64el') @@ -30,7 +30,7 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 gcc_pure64.patch gcc_mips64el_lib.patch gcc-4.7.0-cloog-0.17.patch) -md5sums=('e44a8484687ef52c02066d6434ecf42b' +md5sums=('9f9d082b64753d5908690500251fc52e' '489d2f5311535800a120efd8d18db719' 'ced48436c1b3c981d721a829f1094de1' '474b8f5a7dee6ddd96b95a7240bfb961' diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD index 5e8fe1088..e62ba7ebb 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 604065120..bc9f41093 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' 'mips64el') @@ -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 1db4b6786..73ab68c67 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' 'mips64el') 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/links/PKGBUILD b/core/links/PKGBUILD index c658dfa9e..a069b2729 100644 --- a/core/links/PKGBUILD +++ b/core/links/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 148998 2012-02-05 12:58:31Z eric $ +# $Id: PKGBUILD 156671 2012-04-22 20:30:45Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=links -pkgver=2.5 +pkgver=2.6 pkgrel=1 pkgdesc="A text WWW browser, similar to Lynx" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ provides=('links-g') conflicts=('links-g') replaces=('links-g') source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop) -sha1sums=('fe4bc37be8aebd9196c35ffef724435cea94349c' +sha1sums=('228bd726c176ea44d35fa12cafd97aa83214d9dc' 'f600e27c2a71184444f7dd07a10230aa44463a02') build() { diff --git a/core/ppl/PKGBUILD b/core/ppl/PKGBUILD index 42cfddddb..dbb31392e 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' 'mips64el') @@ -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/core/procps/PKGBUILD b/core/procps/PKGBUILD index 99d7884a7..d31ad48ee 100644 --- a/core/procps/PKGBUILD +++ b/core/procps/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 132740 2011-07-25 18:18:22Z foutrelis $ -# Maintainer: Eric Belanger <eric@archlinux.org> +# $Id: PKGBUILD 156669 2012-04-22 20:29:46Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=procps pkgver=3.2.8 -pkgrel=4 +pkgrel=5 pkgdesc="Utilities for monitoring your system and processes on your system" arch=('i686' 'x86_64' 'mips64el') url="http://procps.sourceforge.net/" @@ -80,7 +80,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" ldconfig=/bin/true install + make DESTDIR="${pkgdir}" lib="${pkgdir}/usr/lib/" ldconfig=/bin/true install install -D -m644 "${srcdir}/sysctl.conf" "${pkgdir}/etc/sysctl.conf" install -d "${pkgdir}/usr/include/proc" install -m644 proc/*.h "${pkgdir}/usr/include/proc" diff --git a/extra/emelfm2/PKGBUILD b/extra/emelfm2/PKGBUILD index 25e678531..d98d75a1c 100644 --- a/extra/emelfm2/PKGBUILD +++ b/extra/emelfm2/PKGBUILD @@ -1,30 +1,30 @@ -# $Id: PKGBUILD 151556 2012-02-27 17:34:40Z giovanni $ +# $Id: PKGBUILD 156677 2012-04-22 23:01:54Z eric $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: contrasutra pkgname=emelfm2 -pkgver=0.8.0 -pkgrel=2 +pkgver=0.8.1 +pkgrel=1 pkgdesc="A file manager that implements the popular two-pane design" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') url="http://emelfm2.net/" depends=('gtk2') -license=('GPL') -source=("http://emelfm2.net/rel/${pkgname}-${pkgver}.tar.bz2" - 'emelfm2-0.8.0-dsofix.patch') -md5sums=('8490d501e19009860f53ac6a98db74c1' - '0a6252eda0c3a98ba693148dfdd6ccba') +license=('GPL3') +source=("http://emelfm2.net/rel/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('5528bdd7001451dbdba95bf26ee588be9a0b86da') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i "${srcdir}/emelfm2-0.8.0-dsofix.patch" + cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX=/usr - make PREFIX=${pkgdir}/usr install - make PREFIX=${pkgdir}/usr install_i18n +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX="${pkgdir}/usr" install install_i18n - install -m 755 ${pkgdir}/usr/share/pixmaps/emelfm2/emelfm2_48.png \ - ${pkgdir}/usr/share/pixmaps/emelfm2.png + install -m 755 "${pkgdir}/usr/share/pixmaps/emelfm2/emelfm2_48.png" \ + "${pkgdir}/usr/share/pixmaps/emelfm2.png" sed -e '/Icon=/ s^emelfm2/emelfm2_48.png^emelfm2.png^' \ -e '/Categories=/ s^;$^;Application;Utility;^' \ - -i ${pkgdir}/usr/share/applications/emelfm2.desktop + -i "${pkgdir}/usr/share/applications/emelfm2.desktop" } diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD index d84d3602b..166deaa04 100644 --- a/extra/fvwm/PKGBUILD +++ b/extra/fvwm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 149155 2012-02-06 01:09:56Z eric $ +# $Id: PKGBUILD 156673 2012-04-22 21:38:48Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=fvwm -pkgver=2.6.4 +pkgver=2.6.5 pkgrel=1 pkgdesc="A multiple large virtual desktop window manager originally derived from twm" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ conflicts=('fvwm-devel') replaces=('fvwm-devel') options=('!emptydirs' '!makeflags') source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2 fvwm.desktop) -sha1sums=('635b803de5af8677c7f5b91a82b450799cfe3ce2' +sha1sums=('c4cf96df65817d501b41c6fd79cf22658dd516a8' '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb') build() { diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index 40bc1648a..7b4e3c2d4 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155767 2012-04-06 09:23:08Z andyrtr $ +# $Id: PKGBUILD 156663 2012-04-22 16:04:02Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=3.0.18 +pkgver=3.0.19 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +14,8 @@ depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12') makedepends=('strace') [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind') source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('f46539a39857012ccc338a59beb4ac46' - 'fbca6ee827d8db0cea0f9b670b2f5c6c') +md5sums=('05e85d18955edd5c0fe40fbb7ef168bd' + '52c7b7ecf7032322321bf667d86eb084') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -27,10 +27,10 @@ build() { make } -#check() { -# cd "${srcdir}/${pkgname}-${pkgver}" -# make -k check # passes all || /bin/true -#} +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make -k check # passes all || /bin/true +} package() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD index 5595aeb26..e4596b429 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' 'mips64el') @@ -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/ldns/Makefile.patch b/extra/ldns/Makefile.patch new file mode 100644 index 000000000..d98291ac9 --- /dev/null +++ b/extra/ldns/Makefile.patch @@ -0,0 +1,20 @@ +--- old/Makefile.in 2012-01-12 00:11:36.000000000 +1100 ++++ new/Makefile.in 2012-01-27 11:36:16.110154453 +1100 +@@ -130,7 +130,7 @@ + exit -1 ; \ + fi + drill/drill: $(DRILL_LOBJS) $(LIB) +- $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) -lldns -o drill/drill ++ $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill + + install-drill: drill/drill + $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) +@@ -157,7 +157,7 @@ + exit -1 ; \ + fi + $(EXAMPLE_PROGS): $(EXAMPLE_LOBJS) $(LIB) +- $(LINK_EXE) $@.lo $(LIBS) -lldns -o $@ ++ $(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@ + + $(TESTNS): $(TESTNS_LOBJS) $(LIB) + $(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -lldns -o $(TESTNS) diff --git a/extra/ldns/PKGBUILD b/extra/ldns/PKGBUILD new file mode 100644 index 000000000..e228c5355 --- /dev/null +++ b/extra/ldns/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 156644 2012-04-22 07:34:09Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: mathieui <mathieui@mathieui.net> +# Contributor: jiribb <jiribb@gmail.com> + +pkgname=ldns +pkgver=1.6.12 +pkgrel=1 +pkgdesc='Fast DNS library supporting recent RFCs, including Drill and other tools' +url='http://www.nlnetlabs.nl/projects/ldns/' +license=('custom:BSD') +arch=('i686' 'x86_64') +options=('!libtool') +depends=('openssl') +makedepends=('libpcap') +optdepends=('libpcap: ldns-dpa tool') +source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'Makefile.patch') +sha1sums=('1d61df0f666908551d5a62768f77d63e727810aa' + '01bce260e9639d9cd26109a689dddf2498e5026a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../Makefile.patch + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-static=no \ + --disable-rpath \ + --with-drill \ + --with-examples \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index 3c3de23bd..56d5eef06 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' 'mips64el') @@ -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 8b6c4d15e..0f4425672 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' 'mips64el') 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 b3b1cfdc7..66ecfa5f9 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' 'mips64el') @@ -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/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index cc46ffee0..8159e9582 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156497 2012-04-19 21:01:40Z guillaume $ +# $Id: PKGBUILD 156655 2012-04-22 13:28:46Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> -pkgname=('wireshark-cli' 'wireshark-gtk' 'wireshark-dev') +pkgname=('wireshark-cli' 'wireshark-gtk') pkgbase=wireshark pkgver=1.6.7 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua') @@ -38,6 +38,14 @@ package_wireshark-cli() { chgrp 150 "${pkgdir}/usr/bin/dumpcap" chmod 754 "${pkgdir}/usr/bin/dumpcap" rm "${pkgdir}/usr/bin/wireshark" + + # Headers + install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil} + + install -m644 color.h config.h register.h "${pkgdir}/usr/include/${pkgbase}" + for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do + install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d} + done } package_wireshark-gtk() { @@ -55,17 +63,3 @@ package_wireshark-gtk() { done install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop" } - -package_wireshark-dev() { - pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - header files" - depends=('wireshark-cli') - - cd "${srcdir}/${pkgbase}-${pkgver}" - - install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil} - - install -m644 color.h config.h register.h "${pkgdir}/usr/include/${pkgbase}" - for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do - install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d} - done -} diff --git a/extra/xfce4-battery-plugin/PKGBUILD b/extra/xfce4-battery-plugin/PKGBUILD index 54eaad736..a95bd61d9 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' 'mips64el') 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-diskperf-plugin/PKGBUILD b/extra/xfce4-diskperf-plugin/PKGBUILD index 54721ce7a..0b83f16fb 100644 --- a/extra/xfce4-diskperf-plugin/PKGBUILD +++ b/extra/xfce4-diskperf-plugin/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 149264 2012-02-06 17:00:23Z foutrelis $ +# $Id: PKGBUILD 156693 2012-04-23 00:17:10Z eric $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-diskperf-plugin -pkgver=2.3.0 -pkgrel=2 +pkgver=2.5.1 +pkgrel=1 pkgdesc="Plugin for the Xfce4 panel displaying instant disk/partition performance" arch=('i686' 'x86_64' 'mips64el') -license=('custom') +license=('BSD') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin" groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxfcegui4') # 'libxfce4ui') +depends=('xfce4-panel') makedepends=('intltool') -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/2.3/${pkgname}-${pkgver}.tar.bz2) -md5sums=('c6ece8123c762ee203cbc6fd5450b503') +options=('!libtool') +source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('b6053881f3ddff90a0a0baa655c84b27') 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 \ --libexecdir=/usr/lib \ @@ -31,7 +28,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/xfce4-mount-plugin/PKGBUILD b/extra/xfce4-mount-plugin/PKGBUILD index db5ec0194..7464bd8ea 100644 --- a/extra/xfce4-mount-plugin/PKGBUILD +++ b/extra/xfce4-mount-plugin/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 149250 2012-02-06 16:29:16Z foutrelis $ +# $Id: PKGBUILD 156689 2012-04-22 23:46:49Z eric $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-mount-plugin -pkgver=0.5.5 -pkgrel=2 -pkgdesc="plugin for the Xfce4 panel to mount and unmount volumes" +pkgver=0.6.1 +pkgrel=1 +pkgdesc="Plugin for the Xfce4 panel to mount and unmount volumes" arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') +license=('GPL') 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}/0.5/${pkgname}-${pkgver}.tar.bz2) -md5sums=('1d237468fe23e4e8c29195d9b99c4c5d') +source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('0b9dee13886639aea8b4ca3158b9cdf7') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -28,6 +29,6 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/xfce4-wavelan-plugin/PKGBUILD b/extra/xfce4-wavelan-plugin/PKGBUILD index 838faae0d..2797c31be 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' 'mips64el') 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 78512b848..ac04185ec 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' 'mips64el') @@ -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 a33c57e42..342d61fe5 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 @@ -13,8 +13,8 @@ _grub_915_ver=9 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386') [ "$CARCH" = "mips64el" ] && pkgname=('grub2-common' 'grub2-loongson') pkgbase=grub2 -pkgver=2.00beta3 -pkgrel=1.1 +pkgver=2.00beta4 +pkgrel=1 url="http://www.gnu.org/software/grub/" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -31,23 +31,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') - + '9735043d518e16f147f64ef283eceb2549fed860' + 'ce35d7ae75cd1b5b677e894e528f96add40e77b9' + '4ff0e12e65fb1d4d3f2a16e82eaaa43940b7dde7') _build_grub2-common_and_bios() { ## copy the source for building the common/bios package @@ -58,6 +59,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" @@ -189,7 +194,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..6e60c70c4 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 Fallback' --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/libre/linux-libre/ChangeLog b/libre/linux-libre/ChangeLog index 173a6c3cd..bbf62fc7c 100644 --- a/libre/linux-libre/ChangeLog +++ b/libre/linux-libre/ChangeLog @@ -1,9 +1,14 @@ +2012-04-24 André Silva <andre.paulista@adinet.com.uy> + + * linux-libre-3.3.3-1 + * Disabled CONFIG_STUB_POULSBO module https://labs.parabola.nu/issues/90 + 2012-04-08 André Silva <andre.paulista@adinet.com.uy> - * linux-libre 3.3.1-1.1 - * Disable CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47 + * linux-libre-3.3.1-1.1 + * Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47 2012-03-03 André Silva <andre.paulista@adinet.com.uy> * linux-libre-2.3.9-2 - * Enable CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14 + * Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14 diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 5b3d97223..17aecbeb2 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -12,9 +12,9 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=-LIBRE _basekernel=3.3 -_sublevel=2 +_sublevel=3 pkgver=${_basekernel}.${_sublevel} -_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.1 # nearly always the same as pkgver pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -32,20 +32,24 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' + 'fix-memblock-3.3.x.patch' + 'fix-r8712u-3.3.2.patch' 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5487da14ca81715a469c7594d39722fa' - 'b43d3bdecfa355bf45bd1154819e3687' - '559487f3e438ad95f1c80aa11abf2ed0' - 'f3749180b53d042091a483300ef04f8d' + 'b3584346eba0031be9e08c0c6d64fa85' + '8c97845fa581b5d8172694d85577d817' + '60c740318d677350ac5251300f6cbe73' 'a8a3843046926eb7ab81312cd438c5c5' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' + 'bfbac6688a9031372638438adccd4595' + '4be6f77e4c1533c4587dd48cfd50759e' 'bb7fd1aa23016c8057046b84fd4eb528' - 'acdce5260b0fb711cb9a0fbce984f0ef') + '107729418380124db470dda99425fdce') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -71,6 +75,15 @@ build() { # needed. patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch" + # Patch submitted upstream, waiting for inclusion: + # fix https://bugzilla.kernel.org/show_bug.cgi?id=43098 + # Arch Linux bug report #29351 + patch -Np1 -i "${srcdir}/fix-memblock-3.3.x.patch" + + # Patch submitted upstream, waiting for inclusion: + # Arch Linux bug report #29339 + # probably 3.3.4 will include it + patch -Np1 -i "${srcdir}/fix-r8712u-3.3.2.patch" # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 718c4f3b6..c58fe0e40 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.3.0-1 Kernel Configuration +# Linux/i386 3.3.3-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1166,7 +1166,30 @@ CONFIG_BQL=y # CONFIG_NET_PKTGEN=m CONFIG_NET_DROP_MONITOR=y -# CONFIG_HAMRADIO is not set +CONFIG_HAMRADIO=y + +# +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_SCC=m +# CONFIG_SCC_DELAY is not set +# CONFIG_SCC_TRXECHO is not set +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_BAYCOM_EPP=m +CONFIG_YAM=m # CONFIG_CAN is not set CONFIG_IRDA=m @@ -3892,7 +3915,7 @@ CONFIG_DRM_VMWGFX=m CONFIG_DRM_GMA500=m CONFIG_DRM_GMA600=y CONFIG_DRM_GMA3600=y -CONFIG_STUB_POULSBO=m +# CONFIG_STUB_POULSBO is not set CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_FB=y @@ -4774,7 +4797,135 @@ CONFIG_USBIP_HOST=m CONFIG_W35UND=m CONFIG_PRISM2_USB=m CONFIG_ECHO=m -# CONFIG_COMEDI is not set +CONFIG_COMEDI=m +# CONFIG_COMEDI_DEBUG is not set +CONFIG_COMEDI_MISC_DRIVERS=m +CONFIG_COMEDI_KCOMEDILIB=m +CONFIG_COMEDI_BOND=m +CONFIG_COMEDI_TEST=m +CONFIG_COMEDI_PARPORT=m +CONFIG_COMEDI_SERIAL2002=m +CONFIG_COMEDI_SKEL=m +CONFIG_COMEDI_ISA_DRIVERS=m +CONFIG_COMEDI_ACL7225B=m +CONFIG_COMEDI_PCL711=m +CONFIG_COMEDI_PCL724=m +CONFIG_COMEDI_PCL725=m +CONFIG_COMEDI_PCL726=m +CONFIG_COMEDI_PCL730=m +CONFIG_COMEDI_PCL812=m +CONFIG_COMEDI_PCL816=m +CONFIG_COMEDI_PCL818=m +CONFIG_COMEDI_PCM3724=m +CONFIG_COMEDI_PCM3730=m +CONFIG_COMEDI_RTI800=m +CONFIG_COMEDI_RTI802=m +CONFIG_COMEDI_DAS16M1=m +CONFIG_COMEDI_DAS16=m +CONFIG_COMEDI_DAS800=m +CONFIG_COMEDI_DAS1800=m +CONFIG_COMEDI_DAS6402=m +CONFIG_COMEDI_DT2801=m +CONFIG_COMEDI_DT2811=m +CONFIG_COMEDI_DT2814=m +CONFIG_COMEDI_DT2815=m +CONFIG_COMEDI_DT2817=m +CONFIG_COMEDI_DT282X=m +CONFIG_COMEDI_DMM32AT=m +CONFIG_COMEDI_FL512=m +CONFIG_COMEDI_AIO_AIO12_8=m +CONFIG_COMEDI_AIO_IIRO_16=m +CONFIG_COMEDI_C6XDIGIO=m +CONFIG_COMEDI_MPC624=m +CONFIG_COMEDI_ADQ12B=m +CONFIG_COMEDI_NI_AT_A2150=m +CONFIG_COMEDI_NI_AT_AO=m +CONFIG_COMEDI_NI_ATMIO=m +CONFIG_COMEDI_NI_ATMIO16D=m +CONFIG_COMEDI_PCMAD=m +CONFIG_COMEDI_PCMDA12=m +CONFIG_COMEDI_PCMMIO=m +CONFIG_COMEDI_PCMUIO=m +CONFIG_COMEDI_MULTIQ3=m +CONFIG_COMEDI_POC=m +CONFIG_COMEDI_PCI_DRIVERS=m +CONFIG_COMEDI_ADDI_APCI_035=m +CONFIG_COMEDI_ADDI_APCI_1032=m +CONFIG_COMEDI_ADDI_APCI_1500=m +CONFIG_COMEDI_ADDI_APCI_1516=m +CONFIG_COMEDI_ADDI_APCI_1564=m +CONFIG_COMEDI_ADDI_APCI_16XX=m +CONFIG_COMEDI_ADDI_APCI_2016=m +CONFIG_COMEDI_ADDI_APCI_2032=m +CONFIG_COMEDI_ADDI_APCI_2200=m +CONFIG_COMEDI_ADDI_APCI_3001=m +CONFIG_COMEDI_ADDI_APCI_3120=m +CONFIG_COMEDI_ADDI_APCI_3501=m +CONFIG_COMEDI_ADDI_APCI_3XXX=m +CONFIG_COMEDI_ADL_PCI6208=m +CONFIG_COMEDI_ADL_PCI7230=m +CONFIG_COMEDI_ADL_PCI7296=m +CONFIG_COMEDI_ADL_PCI7432=m +CONFIG_COMEDI_ADL_PCI8164=m +CONFIG_COMEDI_ADL_PCI9111=m +CONFIG_COMEDI_ADL_PCI9118=m +CONFIG_COMEDI_ADV_PCI1710=m +CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI_DIO=m +CONFIG_COMEDI_AMPLC_DIO200=m +CONFIG_COMEDI_AMPLC_PC236=m +CONFIG_COMEDI_AMPLC_PC263=m +CONFIG_COMEDI_AMPLC_PCI224=m +CONFIG_COMEDI_AMPLC_PCI230=m +CONFIG_COMEDI_CONTEC_PCI_DIO=m +CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_DYNA_PCI10XX=m +CONFIG_COMEDI_UNIOXX5=m +CONFIG_COMEDI_GSC_HPDI=m +CONFIG_COMEDI_ICP_MULTI=m +CONFIG_COMEDI_II_PCI20KC=m +CONFIG_COMEDI_DAQBOARD2000=m +CONFIG_COMEDI_JR3_PCI=m +CONFIG_COMEDI_KE_COUNTER=m +CONFIG_COMEDI_CB_PCIDAS64=m +CONFIG_COMEDI_CB_PCIDAS=m +CONFIG_COMEDI_CB_PCIDDA=m +CONFIG_COMEDI_CB_PCIDIO=m +# CONFIG_COMEDI_CB_PCIMDAS is not set +CONFIG_COMEDI_CB_PCIMDDA=m +CONFIG_COMEDI_ME4000=m +CONFIG_COMEDI_ME_DAQ=m +CONFIG_COMEDI_NI_6527=m +CONFIG_COMEDI_NI_65XX=m +CONFIG_COMEDI_NI_660X=m +CONFIG_COMEDI_NI_670X=m +CONFIG_COMEDI_NI_PCIDIO=m +CONFIG_COMEDI_NI_PCIMIO=m +CONFIG_COMEDI_RTD520=m +CONFIG_COMEDI_S526=m +CONFIG_COMEDI_S626=m +CONFIG_COMEDI_SSV_DNP=m +CONFIG_COMEDI_PCMCIA_DRIVERS=m +CONFIG_COMEDI_CB_DAS16_CS=m +CONFIG_COMEDI_DAS08_CS=m +CONFIG_COMEDI_NI_DAQ_700_CS=m +CONFIG_COMEDI_NI_DAQ_DIO24_CS=m +CONFIG_COMEDI_NI_LABPC_CS=m +CONFIG_COMEDI_NI_MIO_CS=m +CONFIG_COMEDI_QUATECH_DAQP_CS=m +CONFIG_COMEDI_USB_DRIVERS=m +CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_USBDUX=m +CONFIG_COMEDI_USBDUXFAST=m +CONFIG_COMEDI_USBDUXSIGMA=m +CONFIG_COMEDI_VMK80XX=m +CONFIG_COMEDI_NI_COMMON=m +CONFIG_COMEDI_MITE=m +CONFIG_COMEDI_NI_TIO=m +CONFIG_COMEDI_NI_LABPC=m +CONFIG_COMEDI_8255=m +CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_FC=m # CONFIG_FB_OLPC_DCON is not set CONFIG_ASUS_OLED=m # CONFIG_PANEL is not set @@ -4786,7 +4937,6 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m CONFIG_RTL8192E=m CONFIG_R8712U=m -CONFIG_R8712_AP=y CONFIG_RTS_PSTOR=m # CONFIG_RTS_PSTOR_DEBUG is not set CONFIG_RTS5139=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 454a61b84..279c94035 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1126,11 +1126,30 @@ CONFIG_BPF_JIT=y # CONFIG_NET_PKTGEN=m CONFIG_NET_DROP_MONITOR=y -# CONFIG_HAMRADIO is not set +CONFIG_HAMRADIO=y # CONFIG_CAN is not set CONFIG_IRDA=m # +# Packet Radio protocols +# +CONFIG_AX25=m +CONFIG_AX25_DAMA_SLAVE=y +CONFIG_NETROM=m +CONFIG_ROSE=m + +# +# AX.25 network device drivers +# +CONFIG_MKISS=m +CONFIG_6PACK=m +CONFIG_BPQETHER=m +CONFIG_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_YAM=m + +# # IrDA protocols # CONFIG_IRLAN=m @@ -3735,7 +3754,7 @@ CONFIG_DRM_VMWGFX=m CONFIG_DRM_GMA500=m CONFIG_DRM_GMA600=y CONFIG_DRM_GMA3600=y -CONFIG_STUB_POULSBO=m +# CONFIG_STUB_POULSBO is not set CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_FB=y @@ -4593,7 +4612,93 @@ CONFIG_USBIP_HOST=m CONFIG_W35UND=m CONFIG_PRISM2_USB=m CONFIG_ECHO=m -# CONFIG_COMEDI is not set +CONFIG_COMEDI=m +# CONFIG_COMEDI_DEBUG is not set +CONFIG_COMEDI_MISC_DRIVERS=m +CONFIG_COMEDI_KCOMEDILIB=m +CONFIG_COMEDI_BOND=m +CONFIG_COMEDI_TEST=m +CONFIG_COMEDI_PARPORT=m +CONFIG_COMEDI_SERIAL2002=m +CONFIG_COMEDI_SKEL=m +CONFIG_COMEDI_PCI_DRIVERS=m +CONFIG_COMEDI_ADDI_APCI_035=m +CONFIG_COMEDI_ADDI_APCI_1032=m +CONFIG_COMEDI_ADDI_APCI_1500=m +CONFIG_COMEDI_ADDI_APCI_1516=m +CONFIG_COMEDI_ADDI_APCI_1564=m +CONFIG_COMEDI_ADDI_APCI_16XX=m +CONFIG_COMEDI_ADDI_APCI_2016=m +CONFIG_COMEDI_ADDI_APCI_2032=m +CONFIG_COMEDI_ADDI_APCI_2200=m +CONFIG_COMEDI_ADDI_APCI_3001=m +CONFIG_COMEDI_ADDI_APCI_3120=m +CONFIG_COMEDI_ADDI_APCI_3501=m +CONFIG_COMEDI_ADDI_APCI_3XXX=m +CONFIG_COMEDI_ADL_PCI6208=m +CONFIG_COMEDI_ADL_PCI7230=m +CONFIG_COMEDI_ADL_PCI7296=m +CONFIG_COMEDI_ADL_PCI7432=m +CONFIG_COMEDI_ADL_PCI8164=m +CONFIG_COMEDI_ADL_PCI9111=m +CONFIG_COMEDI_ADL_PCI9118=m +CONFIG_COMEDI_ADV_PCI1710=m +CONFIG_COMEDI_ADV_PCI1723=m +CONFIG_COMEDI_ADV_PCI_DIO=m +CONFIG_COMEDI_AMPLC_DIO200=m +CONFIG_COMEDI_AMPLC_PC236=m +CONFIG_COMEDI_AMPLC_PC263=m +CONFIG_COMEDI_AMPLC_PCI224=m +CONFIG_COMEDI_AMPLC_PCI230=m +CONFIG_COMEDI_CONTEC_PCI_DIO=m +CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_DYNA_PCI10XX=m +CONFIG_COMEDI_UNIOXX5=m +CONFIG_COMEDI_GSC_HPDI=m +CONFIG_COMEDI_ICP_MULTI=m +CONFIG_COMEDI_II_PCI20KC=m +CONFIG_COMEDI_DAQBOARD2000=m +CONFIG_COMEDI_JR3_PCI=m +CONFIG_COMEDI_KE_COUNTER=m +CONFIG_COMEDI_CB_PCIDAS64=m +CONFIG_COMEDI_CB_PCIDAS=m +CONFIG_COMEDI_CB_PCIDDA=m +CONFIG_COMEDI_CB_PCIDIO=m +CONFIG_COMEDI_CB_PCIMDAS=m +CONFIG_COMEDI_CB_PCIMDDA=m +CONFIG_COMEDI_ME4000=m +CONFIG_COMEDI_ME_DAQ=m +CONFIG_COMEDI_NI_6527=m +CONFIG_COMEDI_NI_65XX=m +CONFIG_COMEDI_NI_660X=m +CONFIG_COMEDI_NI_670X=m +CONFIG_COMEDI_NI_PCIDIO=m +CONFIG_COMEDI_NI_PCIMIO=m +CONFIG_COMEDI_RTD520=m +CONFIG_COMEDI_S526=m +CONFIG_COMEDI_S626=m +CONFIG_COMEDI_SSV_DNP=m +CONFIG_COMEDI_PCMCIA_DRIVERS=m +CONFIG_COMEDI_CB_DAS16_CS=m +CONFIG_COMEDI_DAS08_CS=m +CONFIG_COMEDI_NI_DAQ_700_CS=m +CONFIG_COMEDI_NI_DAQ_DIO24_CS=m +CONFIG_COMEDI_NI_LABPC_CS=m +CONFIG_COMEDI_NI_MIO_CS=m +CONFIG_COMEDI_QUATECH_DAQP_CS=m +CONFIG_COMEDI_USB_DRIVERS=m +CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_USBDUX=m +CONFIG_COMEDI_USBDUXFAST=m +CONFIG_COMEDI_USBDUXSIGMA=m +CONFIG_COMEDI_VMK80XX=m +CONFIG_COMEDI_NI_COMMON=m +CONFIG_COMEDI_MITE=m +CONFIG_COMEDI_NI_TIO=m +CONFIG_COMEDI_NI_LABPC=m +CONFIG_COMEDI_8255=m +CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_FC=m CONFIG_ASUS_OLED=m # CONFIG_PANEL is not set CONFIG_R8187SE=m diff --git a/libre/linux-libre/fix-memblock-3.3.x.patch b/libre/linux-libre/fix-memblock-3.3.x.patch new file mode 100644 index 000000000..3f6c984f4 --- /dev/null +++ b/libre/linux-libre/fix-memblock-3.3.x.patch @@ -0,0 +1,65 @@ +From: Tejun Heo <tj <at> kernel.org> +Subject: [PATCH 3.4-rc3] memblock: memblock should be able to handle zero length operations +Newsgroups: gmane.linux.kernel, gmane.linux.kernel.stable +Date: 2012-04-20 15:31:34 GMT (2 days, 14 hours and 59 minutes ago) +24aa07882b "memblock, x86: Replace memblock_x86_reserve/free_range() +with generic ones" replaced x86 specific memblock operations with the +generic ones; unfortunately, it lost zero length operation handling in +the process making the kernel panic if somebody tries to reserve zero +length area. + +There isn't much to be gained by being cranky to zero length +operations and panicking is almost the worst response. Drop the +BUG_ON() in memblock_reserve() and update +memblock_add_region/isolate_range() so that all zero length operations +are handled as noops. + +Signed-off-by: Tejun Heo <tj <at> kernel.org> +Cc: stable <at> vger.kernel.org +Reported-by: Valere Monseur <valere.monseur <at> ymail.com> +Bisected-by: Joseph Freeman <jfree143dev <at> gmail.com> +Tested-by: Joseph Freeman <jfree143dev <at> gmail.com> +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=43098 +--- +This is causing early panics if anyone tries to reserve zero len area, +which unfortunately isn't too uncommon depending on BIOS. The fix is +fairly safe. Unsure which tree it should go through. Cc'ing Linus +and Ingo. + +Thanks. + + mm/memblock.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/mm/memblock.c b/mm/memblock.c +index 99f2855..a44eab3 100644 +--- a/mm/memblock.c ++++ b/mm/memblock.c +@@ -330,6 +330,9 @@ static int __init_memblock memblock_add_region(struct memblock_type *type, + phys_addr_t end = base + memblock_cap_size(base, &size); + int i, nr_new; + ++ if (!size) ++ return 0; ++ + /* special case for empty array */ + if (type->regions[0].size == 0) { + WARN_ON(type->cnt != 1 || type->total_size); +@@ -430,6 +433,9 @@ static int __init_memblock memblock_isolate_range(struct memblock_type *type, + + *start_rgn = *end_rgn = 0; + ++ if (!size) ++ return 0; ++ + /* we'll create at most two more regions */ + while (type->cnt + 2 > type->max) + if (memblock_double_array(type) < 0) +@@ -514,7 +520,6 @@ int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size) + (unsigned long long)base, + (unsigned long long)base + size, + (void *)_RET_IP_); +- BUG_ON(0 == size); + + return memblock_add_region(_rgn, base, size, MAX_NUMNODES); + } diff --git a/libre/linux-libre/fix-r8712u-3.3.2.patch b/libre/linux-libre/fix-r8712u-3.3.2.patch new file mode 100644 index 000000000..a83618dcd --- /dev/null +++ b/libre/linux-libre/fix-r8712u-3.3.2.patch @@ -0,0 +1,56 @@ +commit 2080913e017ab9f88379d93fd09546ad95faf87b +Author: Larry Finger <Larry.Finger@lwfinger.net> +Date: Sat Feb 25 18:10:21 2012 -0600 + + staging: r8712u: Fix regression caused by commit 8c213fa + + In commit 8c213fa "staging: r8712u: Use asynchronous firmware loading", + the command to release the firmware was placed in the wrong routine. + + In combination with the bug introduced in commit a5ee652 "staging: r8712u: + Interface-state not fully tracked", the driver attempts to upload firmware + that had already been released. This bug is the source of one of the + problems in https://bugs.archlinux.org/task/27996#comment89833. + + Tested-by: Alberto Lago Ballesteros <saniukeokusainaya@gmail.com> + Tested-by: Adrian <agib@gmx.de> + Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> + Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +diff --git a/drivers/staging/rtl8712/os_intfs.c b/drivers/staging/rtl8712/os_intfs.c +index 4cf175f..7bbd53a 100644 +--- a/drivers/staging/rtl8712/os_intfs.c ++++ b/drivers/staging/rtl8712/os_intfs.c +@@ -475,9 +475,6 @@ static int netdev_close(struct net_device *pnetdev) + r8712_free_assoc_resources(padapter); + /*s2-4.*/ + r8712_free_network_queue(padapter); +- release_firmware(padapter->fw); +- /* never exit with a firmware callback pending */ +- wait_for_completion(&padapter->rtl8712_fw_ready); + return 0; + } + +diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c +index fe0e2ff..e01fe14 100644 +--- a/drivers/staging/rtl8712/usb_intf.c ++++ b/drivers/staging/rtl8712/usb_intf.c +@@ -30,6 +30,7 @@ + + #include <linux/usb.h> + #include <linux/module.h> ++#include <linux/firmware.h> + + #include "osdep_service.h" + #include "drv_types.h" +@@ -620,6 +621,10 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf) + struct _adapter *padapter = netdev_priv(pnetdev); + struct usb_device *udev = interface_to_usbdev(pusb_intf); + ++ if (padapter->fw_found) ++ release_firmware(padapter->fw); ++ /* never exit with a firmware callback pending */ ++ wait_for_completion(&padapter->rtl8712_fw_ready); + usb_set_intfdata(pusb_intf, NULL); + if (padapter) { + if (drvpriv.drv_registered == true) diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 861ce1f51..dd133c2b1 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.3.2-1-LIBRE +KERNEL_VERSION=3.3.3-1-LIBRE post_install () { # updating module dependencies diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD new file mode 100644 index 000000000..ebfb32c78 --- /dev/null +++ b/testing/dnsutils/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 156648 2012-04-22 08:05:14Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: kevin <kevin@archlinux.org> +# Contributor: mario <mario_vazq@hotmail.com> + +pkgname=dnsutils + +# Use a period and not a hyphen before the patch level for proper versioning. +pkgver=9.9.0 +_pkgver=9.9.0 +pkgrel=2 + +pkgdesc='DNS utilities: dig host nslookup' +url='http://www.isc.org/software/bind/' +license=('custom:ISC') +arch=('i686' 'x86_64') +options=('!makeflags') +depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors') +source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" + 'remove-bind.patch') +sha1sums=('6be77c75c8649088b0ae7124d819b5f412bb0094' + 'b465ef6160b004838f04de9978fe1be8422af777') + +replaces=('bind-tools' 'host') + +build() { + cd "${srcdir}/bind-${_pkgver}" + + patch -p1 -i ../remove-bind.patch + export STD_CDEFINES='-DDIG_SIGCHASE' + + # hack to remove unused bloat from the binaries + CFLAGS+=' -fdata-sections -ffunction-sections' + LDFLAGS+=' -Wl,--gc-sections' + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-linux-caps \ + --with-openssl \ + --with-idn \ + + make +} + +package() { + cd "${srcdir}/bind-${_pkgver}" + install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + cd bin; make DESTDIR="${pkgdir}" install +} diff --git a/testing/dnsutils/remove-bind.patch b/testing/dnsutils/remove-bind.patch new file mode 100644 index 000000000..19d650964 --- /dev/null +++ b/testing/dnsutils/remove-bind.patch @@ -0,0 +1,25 @@ +diff -aur old/bin/Makefile.in new/bin/Makefile.in +--- old/bin/Makefile.in 2009-10-05 05:07:08.000000000 -0700 ++++ new/bin/Makefile.in 2011-08-28 19:16:17.245495043 -0700 +@@ -19,8 +19,7 @@ + VPATH = @srcdir@ + top_srcdir = @top_srcdir@ + +-SUBDIRS = named rndc dig dnssec tests tools nsupdate \ +- check confgen @PKCS11_TOOLS@ ++SUBDIRS = dig + TARGETS = + + @BIND9_MAKE_RULES@ +diff -aur old/lib/Makefile.in new/lib/Makefile.in +--- old/lib/Makefile.in 2007-06-19 16:47:13.000000000 -0700 ++++ new/lib/Makefile.in 2011-08-28 19:17:50.828688599 -0700 +@@ -23,7 +23,7 @@ + # Attempt to disable parallel processing. + .NOTPARALLEL: + .NO_PARALLEL: +-SUBDIRS = isc isccc dns isccfg bind9 lwres tests ++SUBDIRS = isc dns isccfg bind9 lwres + TARGETS = + + @BIND9_MAKE_RULES@ 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..9459596a7 --- /dev/null +++ b/testing/gmime/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 156679 2012-04-22 23:09:57Z heftig $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Ben <ben@benmazer.net> + +pkgname=gmime +pkgver=2.6.9 +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=('5ebb60a35fa5c0789fe10f6e4af5040cb7bc4a707a8a962fbd57b4fc5595c0b9') + +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/gtkpod/PKGBUILD b/testing/gtkpod/PKGBUILD new file mode 100644 index 000000000..7a3a1dff6 --- /dev/null +++ b/testing/gtkpod/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 156691 2012-04-22 23:50:01Z heftig $ +# Maintainer: Kevin Piche <kevin@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> + +pkgname=gtkpod +pkgver=2.1.1 +pkgrel=2 +pkgdesc="A platform independent GUI for Apple's iPod using GTK3" +arch=('i686' 'x86_64') +url="http://gtkpod.sourceforge.net" +license=('GPL') +depends=('anjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk') +makedepends=('flex' 'intltool') +optdepends=('libmp4v2: MP4/h264 support' + 'vorbis-tools: OGG support' + 'id3v2: mp3 conversion support') +install=gtkpod.install +options=('!libtool') +source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz") +md5sums=('36fd0324fd1d1da00fcddacef1b09983') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i 's#python#python2#' scripts/sync-palm-jppy.py + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/gtkpod/gtkpod.install b/testing/gtkpod/gtkpod.install new file mode 100644 index 000000000..c5d357a38 --- /dev/null +++ b/testing/gtkpod/gtkpod.install @@ -0,0 +1,12 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/ldns/Makefile.patch b/testing/ldns/Makefile.patch new file mode 100644 index 000000000..d98291ac9 --- /dev/null +++ b/testing/ldns/Makefile.patch @@ -0,0 +1,20 @@ +--- old/Makefile.in 2012-01-12 00:11:36.000000000 +1100 ++++ new/Makefile.in 2012-01-27 11:36:16.110154453 +1100 +@@ -130,7 +130,7 @@ + exit -1 ; \ + fi + drill/drill: $(DRILL_LOBJS) $(LIB) +- $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) -lldns -o drill/drill ++ $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill + + install-drill: drill/drill + $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) +@@ -157,7 +157,7 @@ + exit -1 ; \ + fi + $(EXAMPLE_PROGS): $(EXAMPLE_LOBJS) $(LIB) +- $(LINK_EXE) $@.lo $(LIBS) -lldns -o $@ ++ $(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@ + + $(TESTNS): $(TESTNS_LOBJS) $(LIB) + $(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -lldns -o $(TESTNS) diff --git a/testing/ldns/PKGBUILD b/testing/ldns/PKGBUILD new file mode 100644 index 000000000..d113c41ec --- /dev/null +++ b/testing/ldns/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 156650 2012-04-22 08:06:30Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: mathieui <mathieui@mathieui.net> +# Contributor: jiribb <jiribb@gmail.com> + +pkgname=ldns +pkgver=1.6.12 +pkgrel=2 +pkgdesc='Fast DNS library supporting recent RFCs' +url='http://www.nlnetlabs.nl/projects/ldns/' +license=('custom:BSD') +arch=('i686' 'x86_64') +options=('!libtool') +depends=('openssl' 'dnssec-anchors') +optdepends=('libpcap: ldns-dpa tool') +makedepends=('libpcap') +source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'Makefile.patch') +sha1sums=('1d61df0f666908551d5a62768f77d63e727810aa' + '01bce260e9639d9cd26109a689dddf2498e5026a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../Makefile.patch + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-static=no \ + --disable-rpath \ + --with-drill \ + --with-examples \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} 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/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..4cf19311a --- /dev/null +++ b/testing/nx/PKGBUILD @@ -0,0 +1,116 @@ +# $Id: PKGBUILD 156665 2012-04-22 17:10:42Z 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=2 +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/bin} + cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx/bin + cd ${pkgdir}/usr/lib/nx + ln -sv /usr/lib/nx/bin/nxproxy . + + # 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.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/bin} + 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/bin + cd ${pkgdir}/usr/lib/nx + ln -sv /usr/lib/nx/bin/nxauth . + + # 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/bin} + cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx/bin + cd ${pkgdir}/usr/lib/nx + ln -sv /usr/lib/nx/bin/nxagent . + + # 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/ diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD new file mode 100644 index 000000000..0a52bc805 --- /dev/null +++ b/testing/openssh/PKGBUILD @@ -0,0 +1,77 @@ +# $Id: PKGBUILD 156652 2012-04-22 08:07:55Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=openssh +pkgver=6.0p1 +pkgrel=1 +pkgdesc='Free version of the SSH connectivity tools' +url='http://www.openssh.org/portable.html' +license=('custom:BSD') +arch=('i686' 'x86_64') +depends=('krb5' 'openssl' 'libedit' 'ldns') +optdepends=('x11-ssh-askpass: input passphrase in X without a terminal') +source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz" + 'sshd.close-sessions' + 'sshd.confd' + 'sshd.pam' + 'sshd') +sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422' + '954bf1660aa32620c37034320877f4511b767ccb' + 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' + '3413909fd45a28701c92e6e5b59c6b65346ddb0f' + '21fa88de6cc1c7912e71655f50896ba17991a1c2') + +backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib/ssh \ + --sysconfdir=/etc/ssh \ + --with-ldns \ + --with-libedit \ + --with-ssl-engine \ + --with-pam \ + --with-privsep-user=nobody \ + --with-kerberos5=/usr \ + --with-xauth=/usr/bin/xauth \ + --with-mantype=man \ + --with-md5-passwords \ + + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # The connect.sh test must be run by a user with a decent login shell; + # chroot builds use nobody with /bin/false. + make tests || true +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd + install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd + install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd + install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE" + install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389 + + rm "${pkgdir}"/usr/share/man/man1/slogin.1 + ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz + + install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh + install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id + install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1 + + sed \ + -e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \ + -e '/^#UsePAM no$/c UsePAM yes' \ + -i "${pkgdir}"/etc/ssh/sshd_config +} diff --git a/testing/openssh/sshd b/testing/openssh/sshd new file mode 100755 index 000000000..1d68fb877 --- /dev/null +++ b/testing/openssh/sshd @@ -0,0 +1,45 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/sshd + +PIDFILE=/var/run/sshd.pid +PID=$(cat $PIDFILE 2>/dev/null) +if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then + PID= + rm $PIDFILE 2>/dev/null +fi + +case "$1" in + start) + stat_busy 'Starting Secure Shell Daemon' + /usr/bin/ssh-keygen -A + [[ -d /var/empty ]] || mkdir -p /var/empty + [[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS + if [[ $? -gt 0 ]]; then + stat_fail + else + add_daemon sshd + stat_done + fi + ;; + stop) + stat_busy 'Stopping Secure Shell Daemon' + [[ ! -z $PID ]] && kill $PID &> /dev/null + if [[ $? -gt 0 ]]; then + stat_fail + else + rm_daemon sshd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/openssh/sshd.close-sessions b/testing/openssh/sshd.close-sessions new file mode 100644 index 000000000..be2a709fc --- /dev/null +++ b/testing/openssh/sshd.close-sessions @@ -0,0 +1,17 @@ +# Close sshd sessions before shutting down the network; see FS#17389. + +sshd_close_sessions () { + if ck_daemon sshd; then + return + fi + /etc/rc.d/sshd stop + stat_busy "Stopping Secure Shell Sessions" + for i in $(pgrep sshd); do + if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then + kill $i + fi + done &>/dev/null + stat_done +} + +add_hook shutdown_start sshd_close_sessions diff --git a/testing/openssh/sshd.confd b/testing/openssh/sshd.confd new file mode 100644 index 000000000..5ce7c0079 --- /dev/null +++ b/testing/openssh/sshd.confd @@ -0,0 +1,4 @@ +# +# Parameters to be passed to sshd +# +SSHD_ARGS="" diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam new file mode 100644 index 000000000..c7b91cdfb --- /dev/null +++ b/testing/openssh/sshd.pam @@ -0,0 +1,12 @@ +#%PAM-1.0 +#auth required pam_securetty.so #Disable remote root +auth required pam_unix.so +auth required pam_env.so +account required pam_nologin.so +account required pam_unix.so +account required pam_time.so +password required pam_unix.so +session required pam_unix_session.so +session required pam_limits.so +-session optional pam_ck_connector.so nox11 +-session optional pam_systemd.so |