diff options
52 files changed, 915 insertions, 224 deletions
diff --git a/community-testing/catalyst-dkms/PKGBUILD b/community-testing/catalyst-dkms/PKGBUILD index 7b455b1cc..05e501cda 100644 --- a/community-testing/catalyst-dkms/PKGBUILD +++ b/community-testing/catalyst-dkms/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77331 2012-10-08 22:59:34Z lcarlier $ +# $Id: PKGBUILD 78743 2012-10-23 22:15:52Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Vi0L0, wonder, Eduardo "kensai" Romero # Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert pkgname=catalyst-dkms -pkgver=12.9 -pkgrel=0.1 +pkgver=12.10 +pkgrel=1 pkgdesc="AMD proprietary gpu kernel driver" arch=('i686' 'x86_64') url="http://www.amd.com" @@ -14,10 +14,9 @@ depends=('dkms') optdepends=('linux-headers: build the module against Arch kernel' 'linux-lts-headers: build the module against LTS Arch kernel') replaces=('catalyst-lts-dkms') # useless -source=(#http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip - https://launchpad.net/ubuntu/quantal/+source/fglrx-installer/2:9.000-0ubuntu1/+files/fglrx-installer_9.000.orig.tar.gz +source=(http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${pkgver}-x86.x86_64.zip dkms.conf) -md5sums=('2bb6e8193fdddff9bbd2e3d9f9e8f39b' +md5sums=('ef6ecd984e47e80849215b33fbfa5b7f' '972049dc247a74a7162f2227078abcb0') install=catalyst.install @@ -32,14 +31,14 @@ package() { _archdir=x86 fi - #sh ./amd-driver-installer*.run --extract fglrx-install + sh ./amd-driver-installer*.run --extract fglrx-install - #cd fglrx-install + cd fglrx-install #patch -Np1 -i ../3.5-do_mmap.patch install -dm755 "${pkgdir}/usr/lib/modprobe.d" install -dm755 "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}" - cp -r lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" + cp -r common/lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" cp "arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/dkms.conf" @@ -47,5 +46,5 @@ package() { echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf" # license - install -Dm644 "${srcdir}/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" + install -Dm644 "common/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" } diff --git a/community-testing/catalyst-dkms/catalyst.install b/community-testing/catalyst-dkms/catalyst.install index 3adb1410d..655468646 100644 --- a/community-testing/catalyst-dkms/catalyst.install +++ b/community-testing/catalyst-dkms/catalyst.install @@ -1,22 +1,18 @@ -post_install() -{ - dkms add -m fglrx -v $1 - dkms build -m fglrx -v $1 +post_install() { dkms install -m fglrx -v $1 } -post_upgrade() -{ - # removing old version - dkms remove -m fglrx -v $2 --all - # then installing the new one - dkms add -m fglrx -v $1 - dkms build -m fglrx -v $1 - dkms install -m fglrx -v $1 +pre_upgrade() { + local curver=$2 + # $2 is unset due to a bug. Query current version using pacman as fallback + [ -n "$curver" ] || curver=$(pacman -Qi catalyst-dkms | awk '/^Version/{print $3}') + pre_remove $curver } -pre_remove() -{ - dkms remove -m fglrx -v $1 --all +post_upgrade() { + post_install $1 } +pre_remove() { + dkms remove -m fglrx -v $1 --all +} diff --git a/community-testing/connman/PKGBUILD b/community-testing/connman/PKGBUILD new file mode 100644 index 000000000..a52740fca --- /dev/null +++ b/community-testing/connman/PKGBUILD @@ -0,0 +1,46 @@ +#$Id: PKGBUILD 78716 2012-10-23 04:26:25Z dwallace $ +# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> +# Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com> + +pkgname=connman +pkgver=1.8 +pkgrel=2 +pkgdesc="Wireless LAN network manager" +url="http://connman.net/" +arch=('i686' 'x86_64') +license=('GPL2') +depends=('dbus-core' 'iptables' 'glib2' 'gnutls') +conflicts=('openresolv') +optdepends=('bluez: Support for Bluetooth devices' + 'wpa_supplicant: For WiFi devices') +makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn') +options=('!libtool') +source=('connmand-daemon' + "http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'allow_group_network.diff') + +md5sums=('88ece7cbf1d0d289545ce4f8553fdab8' + '689468f92a1dcb2c0e30d7d00410ad87' + 'a8d22ee089fb0ed725130d16ad393047') +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/allow_group_network.diff" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --with-systemdunitdir=/usr/lib/systemd/system \ + --enable-threads \ + --enable-openconnect \ + --enable-openvpn \ + --enable-polkit \ + --enable-client + + make +} + +package(){ + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + install -Dm755 "$srcdir"/connmand-daemon "$pkgdir"/etc/rc.d/connmand +} diff --git a/community-testing/connman/allow_group_network.diff b/community-testing/connman/allow_group_network.diff new file mode 100644 index 000000000..027d933f7 --- /dev/null +++ b/community-testing/connman/allow_group_network.diff @@ -0,0 +1,12 @@ +--- a/src/connman-polkit.conf 2010-11-05 12:09:04.285423955 -0200 ++++ b/src/connman-polkit.conf 2010-11-05 12:10:53.041423934 -0200 +@@ -5,6 +5,9 @@ + <allow own="net.connman"/> + <allow send_interface="net.connman.Agent"/> + </policy> ++ <policy group="network"> ++ <allow send_interface="net.connman.Agent"/> ++ </policy> + <policy context="default"> + <allow send_destination="net.connman"/> + </policy> diff --git a/community-testing/connman/connmand-daemon b/community-testing/connman/connmand-daemon new file mode 100755 index 000000000..aff1ddeb2 --- /dev/null +++ b/community-testing/connman/connmand-daemon @@ -0,0 +1,44 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +DESC="Connection Manager" +NAME="connmand" +ARGS="" +DAEMON="/usr/sbin/$NAME" + +PID=`pidof -o %PPID ${DAEMON}` +case "$1" in + start) + stat_busy "Starting ${DESC}" + if [ -z "$PID" ]; then + ${DAEMON} ${ARGS} + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon ${NAME} + stat_done + fi + ;; + stop) + stat_busy "Stopping ${DESC}" + [ ! -z "$PID" ] && killall ${DAEMON} &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon ${NAME} + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/community-testing/lxdm/PKGBUILD b/community-testing/lxdm/PKGBUILD index e569381bd..36a9ec902 100644 --- a/community-testing/lxdm/PKGBUILD +++ b/community-testing/lxdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78454 2012-10-18 22:15:34Z allan $ +# $Id: PKGBUILD 78734 2012-10-23 20:39:03Z dwallace $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: kiefer <jorgelmadrid@gmail.com> pkgname=lxdm pkgver=0.4.1 -pkgrel=17 +pkgrel=18 pkgdesc='Lightweight X11 Display Manager' arch=('i686' 'x86_64') url="http://sourceforge.net/projects/lxdm/" @@ -64,5 +64,6 @@ md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' '4c1d43e81e9a256e8d1ea7686c24b3d3' '2c4afdbe3532be4f90d8f6240d352766' '705f394052fdd0dec22e95321d170de0' - '34908bc0ec15b6ae4e1074f39fce44df' + '9cc734228696a3c6f06d91bba61b03c1' 'e8cc66eb1a2405d2d9d184a727cbd9d8') + diff --git a/community-testing/lxdm/lxdm-pam b/community-testing/lxdm/lxdm-pam index c62f62721..57f33b221 100644 --- a/community-testing/lxdm/lxdm-pam +++ b/community-testing/lxdm/lxdm-pam @@ -6,5 +6,5 @@ account required pam_unix.so session required pam_limits.so session required pam_unix.so password required pam_unix.so --session optional pam_systemd.so --session optional pam_loginuid.so +-session optional pam_loginuid.so +-session optional pam_systemd.so diff --git a/community-testing/unbound/PKGBUILD b/community-testing/unbound/PKGBUILD new file mode 100644 index 000000000..cefb077c0 --- /dev/null +++ b/community-testing/unbound/PKGBUILD @@ -0,0 +1,54 @@ +# $Id: PKGBUILD 78747 2012-10-23 22:58:34Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net> +# Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> + +pkgname=unbound +pkgver=1.4.18 +pkgrel=2 +pkgdesc='Validating, recursive, and caching DNS resolver' +url='http://unbound.net/' +license=('custom:BSD') +arch=('i686' 'x86_64') +options=('!libtool') +depends=('openssl' 'ldns') +makedepends=('expat') +optdepends=('expat: unbound-anchor') +backup=('etc/unbound/unbound.conf') +source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz" + 'unbound.service' + 'unbound.conf' + 'rc.d') +sha1sums=('b64b4c9f7981df4e7589ebb770a31352a09db3fb' + '5bc313cd978e4d6efe8c13600e838c70629be477' + '5d473ec2943fd85367cdb653fcd58e186f07383f' + 'dc96e772f467b32555df21d16fdb15e98194c228') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-static=no \ + --disable-rpath \ + --with-conf-file=/etc/unbound/unbound.conf \ + --with-pidfile=/run/unbound.pid \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" + install -D -m644 ../unbound.conf "${pkgdir}/etc/unbound/unbound.conf" + install -D -m644 doc/example.conf.in "${pkgdir}/etc/unbound/unbound.conf.example" + install -D -m644 ../unbound.service "${pkgdir}/usr/lib/systemd/system/unbound.service" +} diff --git a/community-testing/unbound/install b/community-testing/unbound/install new file mode 100644 index 000000000..964792592 --- /dev/null +++ b/community-testing/unbound/install @@ -0,0 +1,10 @@ +post_install() { + getent group unbound &>/dev/null || groupadd -r unbound >/dev/null + getent passwd unbound &>/dev/null || useradd -r -g unbound -d /etc/unbound -s /bin/false -c unbound unbound >/dev/null +} + +post_remove() { + getent passwd unbound &>/dev/null && userdel unbound >/dev/null + getent group unbound &>/dev/null && groupdel unbound >/dev/null + return 0 +} diff --git a/community-testing/unbound/rc.d b/community-testing/unbound/rc.d new file mode 100644 index 000000000..b5b6466de --- /dev/null +++ b/community-testing/unbound/rc.d @@ -0,0 +1,39 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +name=unbound +prog="/usr/sbin/unbound" + +PID=$(pidof -o %PPID $prog) + +case "$1" in +start) + stat_busy "Starting $name daemon" + [[ -z "$PID" ]] && eval $prog &>/dev/null \ + && { add_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +stop) + stat_busy "Stopping $name daemon" + [[ -n "$PID" ]] && kill $PID &>/dev/null \ + && { rm_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +reload) + stat_busy "Reloading $name daemon" + [[ -n "$PID" ]] && kill -SIGHUP $PID &>/dev/null \ + && { stat_done; } \ + || { stat_fail; exit 1; } + ;; +restart) + $0 stop + sleep 2 + $0 start + ;; +*) + echo "usage: $0 {start|stop|restart|reload}" + exit 1 + ;; +esac diff --git a/community-testing/unbound/unbound.conf b/community-testing/unbound/unbound.conf new file mode 100644 index 000000000..445bceff1 --- /dev/null +++ b/community-testing/unbound/unbound.conf @@ -0,0 +1,4 @@ +server: + username: "unbound" + directory: "/etc/unbound" + use-syslog: yes diff --git a/community-testing/unbound/unbound.service b/community-testing/unbound/unbound.service new file mode 100644 index 000000000..8b3c9576b --- /dev/null +++ b/community-testing/unbound/unbound.service @@ -0,0 +1,11 @@ +[Unit] +Description=Unbound DNS Resolver + +[Service] +PIDFile=/run/unbound.pid +ExecStart=/usr/sbin/unbound -d +ExecReload=/bin/kill -HUP $MAINPID +Restart=always + +[Install] +WantedBy=multi-user.target diff --git a/community/critter/PKGBUILD b/community/critter/PKGBUILD index 1c01a5742..848639171 100644 --- a/community/critter/PKGBUILD +++ b/community/critter/PKGBUILD @@ -1,16 +1,18 @@ -# $Id: PKGBUILD 63520 2012-02-05 11:53:03Z ibiru $ +# $Id: PKGBUILD 78732 2012-10-23 20:20:15Z lcarlier $ +# Maintainer: Laurent Carlier <Lordheavym@gmail.com> # Contributor: Allan McRae <mcrae_allan@hotmail.com> -# Maintainer: Daniel J Griffiths <griffithsdj@archlinux.us> +# Contributor: Daniel J Griffiths <griffithsdj@archlinux.us> pkgname=critter _origname=CriticalMass pkgver=1.0.2 -pkgrel=6 +pkgrel=7 pkgdesc="Critical Mass (aka Critter) is an SDL/OpenGL space shoot'em up game" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/criticalmass" license=('GPL') -depends=('sdl_image' 'sdl_mixer' 'mesa') +depends=('sdl_image' 'sdl_mixer' 'libgl') +makedepends=('mesa') source=(http://downloads.sourceforge.net/sourceforge/criticalmass/$_origname-${pkgver}.tar.bz2 critter-gcc43.patch criticalmass-1.0.2-libpng15.patch diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 03c783fff..7b94a0112 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 76882 2012-10-01 15:26:16Z spupykin $ +# $Id: PKGBUILD 78721 2012-10-23 08:36:04Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.4.17 -pkgrel=2 +pkgver=2.6.0 +pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') url="http://redis.io/" -#url="http://code.google.com/p/redis" license=('BSD') depends=('bash') makedepends=('gcc>=3.1' 'make' 'pkgconfig') @@ -19,25 +18,25 @@ source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.service" "redis.logrotate") -md5sums=('f921ce282fb1780cb4a5646e242dadea' +md5sums=('92f224a0df37e0b777a2eb3f38a2f128' '8d843919d9f165e9a47e56cadb4ac2ed' '5ab9fdb200e15c13b450fda77fa030b6' '9e2d75b7a9dc421122d673fe520ef17f') build() { - cd "$srcdir/${pkgname}-${pkgver}" - CFLAGS="$CFLAGS -std=c99" make FORCE_LIBC_MALLOC=yes + cd "$srcdir/${pkgname}-${pkgver}" + make MALLOC=libc } package() { - cd "$srcdir/${pkgname}-${pkgver}" - mkdir -p $pkgdir/usr/bin - make INSTALL_BIN="$pkgdir/usr/bin" PREFIX=/usr install + cd "$srcdir/${pkgname}-${pkgver}" + mkdir -p $pkgdir/usr/bin + make INSTALL_BIN="$pkgdir/usr/bin" PREFIX=/usr install - install -D -m755 "$srcdir/${pkgname}-${pkgver}/COPYING" "$pkgdir/usr/share/licenses/redis/COPYING" - install -D -m755 "$srcdir/redis.d" "$pkgdir/etc/rc.d/redis" - install -Dm644 "$srcdir"/redis.service "$pkgdir"/usr/lib/systemd/system/redis.service - install -Dm644 "$srcdir/redis.logrotate" "$pkgdir/etc/logrotate.d/redis" - sed -i 's|daemonize no|daemonize yes|;s|dir \./|dir /var/lib/redis/|;s|logfile stdout|logfile /var/log/redis.log| ' $srcdir/${pkgname}-${pkgver}/redis.conf - install -D -m644 "$srcdir/${pkgname}-${pkgver}/redis.conf" "$pkgdir/etc/redis.conf" + install -D -m755 "$srcdir/${pkgname}-${pkgver}/COPYING" "$pkgdir/usr/share/licenses/redis/COPYING" + install -D -m755 "$srcdir/redis.d" "$pkgdir/etc/rc.d/redis" + install -Dm644 "$srcdir"/redis.service "$pkgdir"/usr/lib/systemd/system/redis.service + install -Dm644 "$srcdir/redis.logrotate" "$pkgdir/etc/logrotate.d/redis" + sed -i 's|daemonize no|daemonize yes|;s|dir \./|dir /var/lib/redis/|;s|logfile stdout|logfile /var/log/redis.log| ' $srcdir/${pkgname}-${pkgver}/redis.conf + install -D -m644 "$srcdir/${pkgname}-${pkgver}/redis.conf" "$pkgdir/etc/redis.conf" } diff --git a/core/kmod/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch b/core/kmod/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch new file mode 100644 index 000000000..8c4ecf83c --- /dev/null +++ b/core/kmod/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch @@ -0,0 +1,165 @@ +From 88c247f7f18ac25181ddcaff97fbbecbd3a29f57 Mon Sep 17 00:00:00 2001 +From: Lucas De Marchi <lucas.de.marchi@gmail.com> +Date: Wed, 3 Oct 2012 16:28:24 -0300 +Subject: [PATCH] depmod: fix parsing of modules.order with compressed modules + +We now index the modules by uncompressed-relative-path instead of +relative-path. This is because the file modules.order, coming from +kernel, always comes with uncompressed paths. This fixes the issue of +not sorting the aliases correctly due to paths not matching when using +compressed modules. +--- + tools/depmod.c | 46 +++++++++++++++++++++++++++++----------------- + 1 file changed, 29 insertions(+), 17 deletions(-) + +diff --git a/tools/depmod.c b/tools/depmod.c +index 0bf2dea..ff19d6e 100644 +--- a/tools/depmod.c ++++ b/tools/depmod.c +@@ -39,6 +39,8 @@ + #define DEFAULT_VERBOSE LOG_WARNING + static int verbose = DEFAULT_VERBOSE; + ++#define KMOD_EXT_UNC 0 ++ + static const struct kmod_ext { + const char *ext; + size_t len; +@@ -1001,6 +1003,7 @@ struct mod { + uint16_t idx; /* index in depmod->modules.array */ + uint16_t users; /* how many modules depend on this one */ + uint8_t dep_loop : 1; ++ char *uncrelpath; /* same as relpath but ending in .ko */ + char modname[]; + }; + +@@ -1014,7 +1017,7 @@ struct depmod { + const struct cfg *cfg; + struct kmod_ctx *ctx; + struct array modules; +- struct hash *modules_by_relpath; ++ struct hash *modules_by_uncrelpath; + struct hash *modules_by_name; + struct hash *symbols; + unsigned int dep_loops; +@@ -1025,6 +1028,7 @@ static void mod_free(struct mod *mod) + DBG("free %p kmod=%p, path=%s\n", mod, mod->kmod, mod->path); + array_free_array(&mod->deps); + kmod_module_unref(mod->kmod); ++ free(mod->uncrelpath); + free(mod); + } + +@@ -1066,10 +1070,10 @@ static int depmod_init(struct depmod *depmod, struct cfg *cfg, + + array_init(&depmod->modules, 128); + +- depmod->modules_by_relpath = hash_new(512, NULL); +- if (depmod->modules_by_relpath == NULL) { ++ depmod->modules_by_uncrelpath = hash_new(512, NULL); ++ if (depmod->modules_by_uncrelpath == NULL) { + err = -errno; +- goto modules_by_relpath_failed; ++ goto modules_by_uncrelpath_failed; + } + + depmod->modules_by_name = hash_new(512, NULL); +@@ -1089,8 +1093,8 @@ static int depmod_init(struct depmod *depmod, struct cfg *cfg, + symbols_failed: + hash_free(depmod->modules_by_name); + modules_by_name_failed: +- hash_free(depmod->modules_by_relpath); +-modules_by_relpath_failed: ++ hash_free(depmod->modules_by_uncrelpath); ++modules_by_uncrelpath_failed: + return err; + } + +@@ -1100,7 +1104,7 @@ static void depmod_shutdown(struct depmod *depmod) + + hash_free(depmod->symbols); + +- hash_free(depmod->modules_by_relpath); ++ hash_free(depmod->modules_by_uncrelpath); + + hash_free(depmod->modules_by_name); + +@@ -1114,7 +1118,7 @@ static void depmod_shutdown(struct depmod *depmod) + static int depmod_module_add(struct depmod *depmod, struct kmod_module *kmod) + { + const struct cfg *cfg = depmod->cfg; +- const char *modname; ++ const char *modname, *lastslash; + size_t modnamelen; + struct mod *mod; + int err; +@@ -1134,7 +1138,8 @@ static int depmod_module_add(struct depmod *depmod, struct kmod_module *kmod) + array_init(&mod->deps, 4); + + mod->path = kmod_module_get_path(kmod); +- mod->baselen = strrchr(mod->path, '/') - mod->path; ++ lastslash = strrchr(mod->path, '/'); ++ mod->baselen = lastslash - mod->path; + if (strncmp(mod->path, cfg->dirname, cfg->dirnamelen) == 0 && + mod->path[cfg->dirnamelen] == '/') + mod->relpath = mod->path + cfg->dirnamelen + 1; +@@ -1144,25 +1149,32 @@ static int depmod_module_add(struct depmod *depmod, struct kmod_module *kmod) + err = hash_add_unique(depmod->modules_by_name, mod->modname, mod); + if (err < 0) { + ERR("hash_add_unique %s: %s\n", mod->modname, strerror(-err)); +- free(mod); +- return err; ++ goto fail; + } + + if (mod->relpath != NULL) { +- err = hash_add_unique(depmod->modules_by_relpath, +- mod->relpath, mod); ++ size_t uncrelpathlen = lastslash - mod->relpath + modnamelen ++ + kmod_exts[KMOD_EXT_UNC].len; ++ mod->uncrelpath = memdup(mod->relpath, uncrelpathlen + 1); ++ mod->uncrelpath[uncrelpathlen] = '\0'; ++ err = hash_add_unique(depmod->modules_by_uncrelpath, ++ mod->uncrelpath, mod); + if (err < 0) { + ERR("hash_add_unique %s: %s\n", + mod->relpath, strerror(-err)); + hash_del(depmod->modules_by_name, mod->modname); +- free(mod); +- return err; ++ goto fail; + } + } + + DBG("add %p kmod=%p, path=%s\n", mod, kmod, mod->path); + + return 0; ++ ++fail: ++ free(mod->uncrelpath); ++ free(mod); ++ return err; + } + + static int depmod_module_del(struct depmod *depmod, struct mod *mod) +@@ -1170,7 +1182,7 @@ static int depmod_module_del(struct depmod *depmod, struct mod *mod) + DBG("del %p kmod=%p, path=%s\n", mod, mod->kmod, mod->path); + + if (mod->relpath != NULL) +- hash_del(depmod->modules_by_relpath, mod->relpath); ++ hash_del(depmod->modules_by_uncrelpath, mod->relpath); + + hash_del(depmod->modules_by_name, mod->modname); + +@@ -1472,7 +1484,7 @@ static void depmod_modules_sort(struct depmod *depmod) + continue; + line[len - 1] = '\0'; + +- mod = hash_find(depmod->modules_by_relpath, line); ++ mod = hash_find(depmod->modules_by_uncrelpath, line); + if (mod == NULL) + continue; + mod->sort_idx = idx - total; +-- +1.7.12.4 + diff --git a/core/kmod/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch b/core/kmod/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch new file mode 100644 index 000000000..4ef3d2775 --- /dev/null +++ b/core/kmod/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch @@ -0,0 +1,33 @@ +From 66f3228d17d66d7e2dd484427259290fbc82b2f0 Mon Sep 17 00:00:00 2001 +From: Lucas De Marchi <lucas.demarchi@profusion.mobi> +Date: Mon, 8 Oct 2012 19:04:16 -0300 +Subject: [PATCH] libkmod: Add support for '.' in module parameter on kcmdline + +Otherwise we fail to parse arguments in kernel command line like +testmodule.testparam=1.5G + +Suggested-by: Selim T. Erdogan <selim@alumni.cs.utexas.edu> +--- + libkmod/libkmod-config.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c +index 70044f0..398468e 100644 +--- a/libkmod/libkmod-config.c ++++ b/libkmod/libkmod-config.c +@@ -567,8 +567,10 @@ static int kmod_config_parse_kcmdline(struct kmod_config *config) + modname = p + 1; + break; + case '.': +- *p = '\0'; +- param = p + 1; ++ if (param == NULL) { ++ *p = '\0'; ++ param = p + 1; ++ } + break; + case '=': + if (param != NULL) +-- +1.7.12.4 + diff --git a/core/kmod/PKGBUILD b/core/kmod/PKGBUILD index a35c01a4a..e5f78609e 100644 --- a/core/kmod/PKGBUILD +++ b/core/kmod/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166572 2012-09-12 13:25:27Z dreisner $ +# $Id: PKGBUILD 169581 2012-10-23 22:08:40Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=kmod pkgver=10 -pkgrel=1 +pkgrel=2 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64') url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' @@ -15,13 +15,23 @@ provides=('module-init-tools=3.16') conflicts=('module-init-tools') replaces=('module-init-tools') source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" + '0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch' + '0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch' "depmod-search.conf") md5sums=('e2a883c4df15a50f78a7a61d5b64089f' + '47005a6e70496d429d40e3fc4fd89755' + 'ecf5bfd4fd9ed14cf0dc1ce4025d256b' 'dd62cbf62bd8f212f51ef8c43bec9a77') build() { cd "$pkgname-$pkgver" + # upstream commit 88c247f7f18ac25181ddcaff97fbbecbd3a29f57 + patch -Np1 < "$srcdir/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch" + + # upstream commit 66f3228d17d66d7e2dd484427259290fbc82b2f0 + patch -Np1 < "$srcdir/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch" + ./configure \ --sysconfdir=/etc \ --enable-gtk-doc \ diff --git a/extra/asymptote/PKGBUILD b/extra/asymptote/PKGBUILD index 3a6ca6ec9..bbd3a3814 100644 --- a/extra/asymptote/PKGBUILD +++ b/extra/asymptote/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 168597 2012-10-13 11:46:36Z andyrtr $ +# $Id: PKGBUILD 169579 2012-10-23 20:01:18Z remy $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: Firmicus <francois.archlinux.org> # Contributor: bender02 at gmx dot com pkgname=asymptote -pkgver=2.20 +pkgver=2.21 pkgrel=1 pkgdesc="A vector graphics language (like metapost)" arch=('i686' 'x86_64') url="http://asymptote.sourceforge.net/" license=("GPL3") depends=('texlive-core' 'gc' 'freeglut' 'glu' 'gsl' 'fftw' 'libsigsegv') -makedepends=('ghostscript' 'imagemagick') +makedepends=('ghostscript' 'imagemagick' + 'mesa' # For OpenGL headers + ) optdepends=('python2: for the xasy GUI' 'python-imaging: for the xasy GUI' 'tix: for the xasy GUI') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz) install=texlive.install -sha1sums=('4c86ab71cff57a592944303b11d9bb6ec34f1cbd') +sha1sums=('946269c63b7aa3a7d2875f5faa8a0b8d3d36628c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/bin86/PKGBUILD b/extra/bin86/PKGBUILD index a5dbd1c25..a398fd4df 100644 --- a/extra/bin86/PKGBUILD +++ b/extra/bin86/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 142339 2011-11-08 16:07:12Z dreisner $ +# $Id: PKGBUILD 169577 2012-10-23 19:27:38Z eric $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=bin86 -pkgver=0.16.18 -pkgrel=3 +pkgver=0.16.19 +pkgrel=1 pkgdesc="A complete 8086 assembler and loader" arch=('i686' 'x86_64') license=('GPL') url="http://www.debath.co.uk/" depends=('glibc') -source=("http://www.debath.co.uk/dev86//$pkgname-$pkgver.tar.gz" +source=("http://www.debath.co.uk/dev86/$pkgname-$pkgver.tar.gz" bin86-0.16.17-x86_64-1.patch) -md5sums=('914068fb649b93642d1cf21857b75699' +md5sums=('0a20d79765a6855ce7c8c2d02b23a0f0' '92bdce7b0655cd2e9f83c83fc56d128e') build() { diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD index 50056ddf0..2be8a6b1e 100644 --- a/extra/kdevelop-php/PKGBUILD +++ b/extra/kdevelop-php/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168356 2012-10-09 06:48:14Z andrea $ +# $Id: PKGBUILD 169575 2012-10-23 17:21:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdevelop-php -pkgver=1.3.90 -_pkgver=4.3.90 +pkgver=1.4.0 +_pkgver=4.4.0 pkgrel=1 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta" arch=('i686' 'x86_64') @@ -13,21 +13,20 @@ depends=('kdevelop-pg-qt') makedepends=('cmake' 'automoc4') replaces=('kdevelop-php-docs') conflicts=('kdevelop-php-docs') -source=(http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2) -sha1sums=('11f9b3d2d27ad93aa666edae60d08f64ea82bb8d' - 'f11194f5672d78406b6c54d53b10c02384e5bf99') +source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2) +sha1sums=('c899aae94755dbc3f4fb72edfcb5b01a9f0eca43' + 'd06df690ea70d02707388851b61077bea8f9db1d') build() { - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release make + cd ../ # kdevelop-php-docs - cd "${srcdir}" mkdir build-docs cd build-docs cmake ../${pkgname}-docs-${pkgver} \ @@ -37,10 +36,11 @@ build() { } package() { - cd "${srcdir}/build" + cd build make DESTDIR="${pkgdir}" install + cd ../ # kdevelop-php-docs - cd "${srcdir}"/build-docs + cd build-docs make DESTDIR="${pkgdir}" install } diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD index 6efc30aa5..20bf24c2c 100644 --- a/extra/kdevelop/PKGBUILD +++ b/extra/kdevelop/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168354 2012-10-09 06:46:57Z andrea $ +# $Id: PKGBUILD 169573 2012-10-23 17:20:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=kdevelop -pkgver=4.3.90 +pkgver=4.4.0 pkgrel=1 pkgdesc="A C/C++ development environment for KDE" arch=('i686' 'x86_64') @@ -12,11 +12,10 @@ license=('GPL') depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-katepart') makedepends=('cmake' 'automoc4') install="${pkgname}.install" -source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('18ed2dccdeef8abe41c135cd3038038790b4e50a') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('271a6ab3dd6063175e9ce18810bed7437d451ecf') build() { - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -26,6 +25,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD index c7370bce0..07671abe4 100644 --- a/extra/kdevplatform/PKGBUILD +++ b/extra/kdevplatform/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168355 2012-10-09 06:47:34Z andrea $ +# $Id: PKGBUILD 169569 2012-10-23 17:17:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=kdevplatform -pkgver=1.3.90 -_pkgver=4.3.90 +pkgver=1.4.0 +_pkgver=4.4.0 pkgrel=1 pkgdesc="A C/C++ development platform for KDE" arch=('i686' 'x86_64') @@ -14,11 +14,10 @@ depends=('kdelibs' 'subversion' 'qjson') optdepends=("kdesdk-kompare: difference checking") makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install -source=("http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('88300217681caa5c69f09b6428f2a6298cbd4733') +source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('2db4fc073385c49d82de526273272da648a0af60') build() { - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -28,6 +27,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/tdb/PKGBUILD b/extra/tdb/PKGBUILD index 728d627ff..1f19f4400 100644 --- a/extra/tdb/PKGBUILD +++ b/extra/tdb/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 149549 2012-02-08 14:00:43Z tpowa $ +# $Id: PKGBUILD 169553 2012-10-23 13:47:25Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=tdb -pkgver=1.2.9 -pkgrel=2 -pkgdesc="A Trivia Database similar to GDBM but allows simultaneous commits" +pkgver=1.2.10 +pkgrel=1 +pkgdesc="A Trivial Database similar to GDBM but allows simultaneous commits" arch=(i686 x86_64) license=('GPL3') url="http://tdb.samba.org/" @@ -31,4 +31,4 @@ package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=$pkgdir/ install } -md5sums=('4d97d18bbe9040038d4e003495bb8cd1') +md5sums=('cc28048309df19782b04359282e9f98b') diff --git a/extra/usbview/PKGBUILD b/extra/usbview/PKGBUILD index e131c153f..21369ef29 100644 --- a/extra/usbview/PKGBUILD +++ b/extra/usbview/PKGBUILD @@ -1,23 +1,19 @@ -# $Id: PKGBUILD 169432 2012-10-21 07:40:08Z giovanni $ +# $Id: PKGBUILD 169543 2012-10-23 11:13:44Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=usbview -pkgver=1.1 -pkgrel=4 +pkgver=2.0 +pkgrel=2 pkgdesc="Display the topology of devices on the USB bus" arch=('i686' 'x86_64') -url="http://www.kroah.com/linux-usb/" +url="http://www.kroah.com/linux/usb/" license=('GPL') depends=('gtk3' 'desktop-file-utils') makedepends=('pkg-config' 'gendesk') install=${pkgname}.install -source=("http://www.kroah.com/linux-usb/${pkgname}-${pkgver}.tar.gz" - 'usbview-1.1-gtk3-port.patch' - 'usbview-1.1-missing-usbfs.patch') -md5sums=('8bf5e66351156356f3ad07454123affa' - '578ed1099228f205b728ee2d46ed6f56' - '02e4313887423d0057a7f4f15b7f37d4') +source=("http://www.kroah.com/linux/usb/${pkgname}-${pkgver}.tar.gz") +md5sums=('565f2e79f3924d14ab5b4d8aced557e5') build() { cd "${srcdir}" @@ -26,10 +22,6 @@ build() { cd "${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/usbview-1.1-gtk3-port.patch" - patch -Np1 -i "${srcdir}/usbview-1.1-missing-usbfs.patch" - - autoreconf ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/extra/usbview/usbview.install b/extra/usbview/usbview.install index e111ef946..b7f7e849b 100644 --- a/extra/usbview/usbview.install +++ b/extra/usbview/usbview.install @@ -1,5 +1,10 @@ post_install() { update-desktop-database -q + echo ">>> Debugfs must be mounted in order to use usbview." + echo ">>> As root execute:" + echo ">>> \"mount -t debugfs none /sys/kernel/debug\" or add" + echo ">>> \"none /sys/kernel/debug debugfs defaults 0 0\"" + echo ">>> to /etc/fstab" } post_upgrade() { @@ -7,5 +12,5 @@ post_upgrade() { } post_remove() { - post_install + update-desktop-database -q } diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 52ed7381d..1a5e41a37 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169487 2012-10-22 02:10:39Z tdziedzic $ +# $Id: PKGBUILD 169591 2012-10-24 01:48:33Z tdziedzic $ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,8 +6,8 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=709 -__hgrev=06e088d016ad +_patchlevel=712 +__hgrev=57e8b75298d6 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -21,10 +21,10 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -md5sums=('7a42c72b07e8bfe6795197a303b21d53' - '5c5723f3c39aaa716bd868d7edf9f563' +md5sums=('368435a6494a2559565ce4d668c4513c' + '1613bbbd2a794cd321db09c6cfe2d35f' '6e7adfbd5d26c1d161030ec203a7f243' - 'e57777374891063b9ca48a1fe392ac05' + '20fceda56badf201695c57999b0bc609' '10353a61aadc3f276692d0e17db1478e' 'd90413bd21f400313a785bb4010120cd') diff --git a/extra/vim/vimrc b/extra/vim/vimrc index 92d3ff980..fc18d2d5b 100644 --- a/extra/vim/vimrc +++ b/extra/vim/vimrc @@ -11,6 +11,6 @@ runtime! archlinux.vim " If you prefer the old-style vim functionalty, add 'runtime! vimrc_example.vim' -" Or better yet, read /usr/share/vim/vim72/vimrc_example.vim or the vim manual +" Or better yet, read /usr/share/vim/vim73/vimrc_example.vim or the vim manual " and configure vim to your own liking! diff --git a/extra/xf86-video-neomagic/PKGBUILD b/extra/xf86-video-neomagic/PKGBUILD index 3a2915274..cb909513b 100644 --- a/extra/xf86-video-neomagic/PKGBUILD +++ b/extra/xf86-video-neomagic/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 168579 2012-10-13 11:45:15Z andyrtr $ +# $Id: PKGBUILD 169532 2012-10-23 10:08:56Z jgc $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-neomagic pkgver=1.2.7 -pkgrel=2 +pkgrel=3 pkgdesc="X.org neomagic video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + git-fixes.patch) +sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76' + '38b67ce2b0ff94f68c8e1f221759fd7e2059383f4dac716356b5ef2ad695507e') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/git-fixes.patch" + autoreconf ./configure --prefix=/usr make } diff --git a/extra/xf86-video-neomagic/git-fixes.patch b/extra/xf86-video-neomagic/git-fixes.patch new file mode 100644 index 000000000..5ae5c7c1e --- /dev/null +++ b/extra/xf86-video-neomagic/git-fixes.patch @@ -0,0 +1,167 @@ +diff --git a/configure.ac b/configure.ac +index 29cf772..a6eafa3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -24,7 +24,7 @@ + AC_PREREQ([2.60]) + AC_INIT([xf86-video-neomagic], + [1.2.7], +- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], ++ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg&component=Driver/Neomagic], + [xf86-video-neomagic]) + AC_CONFIG_SRCDIR([Makefile.am]) + AC_CONFIG_HEADERS([config.h]) +@@ -53,14 +53,6 @@ AC_ARG_WITH(xorg-module-dir, + [moduledir="$withval"], + [moduledir="$libdir/xorg/modules"]) + +- +-# Store the list of server defined optional extensions in REQUIRED_MODULES +-XORG_DRIVER_CHECK_EXT(RANDR, randrproto) +-XORG_DRIVER_CHECK_EXT(RENDER, renderproto) +-XORG_DRIVER_CHECK_EXT(XV, videoproto) +-XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) +-XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto) +- + # Obtain compiler/linker options for the driver dependencies + PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) + +diff --git a/src/neo.h b/src/neo.h +index 6aecc33..6812e7a 100644 +--- a/src/neo.h ++++ b/src/neo.h +@@ -320,3 +320,14 @@ typedef struct { + #define PROBED_NM2097 0x83 + #define PROBED_NM2160 0x44 + #define PROBED_NM2200 0x45 ++ ++#define PCI_VENDOR_NEOMAGIC 0x10C8 ++#define PCI_CHIP_NM2070 0x0001 ++#define PCI_CHIP_NM2090 0x0002 ++#define PCI_CHIP_NM2093 0x0003 ++#define PCI_CHIP_NM2097 0x0083 ++#define PCI_CHIP_NM2160 0x0004 ++#define PCI_CHIP_NM2200 0x0005 ++#define PCI_CHIP_NM2230 0x0025 ++#define PCI_CHIP_NM2360 0x0006 ++#define PCI_CHIP_NM2380 0x0016 +diff --git a/src/neo_2090.c b/src/neo_2090.c +index 5049ab4..2f1efc8 100644 +--- a/src/neo_2090.c ++++ b/src/neo_2090.c +@@ -42,7 +42,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + #include "xf86.h" + #include "xf86_OSproc.h" + #include "compiler.h" +-#include "xf86PciInfo.h" + + /* Drivers that use XAA need this */ + #include "xf86fbman.h" +diff --git a/src/neo_dga.c b/src/neo_dga.c +index b6346c5..c5d60d5 100644 +--- a/src/neo_dga.c ++++ b/src/neo_dga.c +@@ -29,7 +29,6 @@ + #include "xf86.h" + #include "xf86_OSproc.h" + #include "xf86Pci.h" +-#include "xf86PciInfo.h" + #include "neo.h" + #include "neo_reg.h" + #include "dgaproc.h" +@@ -38,10 +37,10 @@ + static Bool NEO_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, + int *, int *, int *); + static Bool NEO_SetMode(ScrnInfoPtr, DGAModePtr); +-static void NEO_Sync(ScrnInfoPtr); + static int NEO_GetViewport(ScrnInfoPtr); + static void NEO_SetViewport(ScrnInfoPtr, int, int, int); + #ifdef HAVE_XAA_H ++static void NEO_Sync(ScrnInfoPtr); + static void NEO_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long); + static void NEO_BlitRect(ScrnInfoPtr, int, int, int, int, int, int); + #if 0 +@@ -57,8 +56,8 @@ DGAFunctionRec NEODGAFuncs = { + NEO_SetMode, + NEO_SetViewport, + NEO_GetViewport, +- NEO_Sync, + #ifdef HAVE_XAA_H ++ NEO_Sync, + NEO_FillRect, + NEO_BlitRect, + #if 0 +@@ -219,17 +218,14 @@ NEO_FillRect ( + } + } + +- + static void + NEO_Sync( + ScrnInfoPtr pScrn + ){ + NEOPtr pNEO = NEOPTR(pScrn); +-#ifdef HAVE_XAA_H + if(pNEO->AccelInfoRec) { + (*pNEO->AccelInfoRec->Sync)(pScrn); + } +-#endif + } + + static void +diff --git a/src/neo_driver.c b/src/neo_driver.c +index d7369e2..a17b925 100644 +--- a/src/neo_driver.c ++++ b/src/neo_driver.c +@@ -60,9 +60,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + #include "xf86RAC.h" + #endif + +-/* Drivers for PCI hardware need this */ +-#include "xf86PciInfo.h" +- + /* Drivers that need to access the PCI config space directly need this */ + #include "xf86Pci.h" + +@@ -72,9 +69,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + /* All drivers initialising the SW cursor need this */ + #include "mipointer.h" + +-/* All drivers implementing backing store need this */ +-#include "mibstore.h" +- + /* All drivers using the mi colormap manipulation need this */ + #include "micmap.h" + +@@ -1621,7 +1615,6 @@ NEOScreenInit(SCREEN_INIT_ARGS_DECL) + "Acceleration %s Initialized\n",ret ? "" : "not"); + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + xf86SetSilkenMouse(pScreen); + +diff --git a/src/neo_i2c.c b/src/neo_i2c.c +index 82d1f2a..5bbb3fb 100644 +--- a/src/neo_i2c.c ++++ b/src/neo_i2c.c +@@ -44,7 +44,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + #include "compiler.h" + + #include "xf86Pci.h" +-#include "xf86PciInfo.h" + + #include "vgaHW.h" + +diff --git a/src/neo_shadow.c b/src/neo_shadow.c +index 2df7657..04efe4f 100644 +--- a/src/neo_shadow.c ++++ b/src/neo_shadow.c +@@ -10,7 +10,6 @@ + + #include "xf86.h" + #include "xf86_OSproc.h" +-#include "xf86PciInfo.h" + #include "xf86Pci.h" + #include "shadowfb.h" + #include "servermd.h" diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index c94d23b3d..90bc2061a 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.47 +_kernver=3.0.48 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _pkgver=2012-10-03 pkgver=20121003 -pkgrel=2 +pkgrel=3 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://linuxwireless.org/' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 65e5e55b0..79a5a3478 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=47 +_sublevel=48 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.46 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.47 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '6ad7f8f5b7230d1425dcb2c0bc336cf8' + 'f3c64c1baf467178872287842d98008c' 'aed25ab047e1c0b020a1516c235c6a74' '7d37e8ce0f4bd5a957172b12ae742ea0' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '546d9b9893e49bddf13a106f890caf94') + '38e4df6e10a2f47243155ccf3313c46f') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 3dc3be117..257356678 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.47-1-LIBRE-LTS +KERNEL_VERSION=3.0.48-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 8fd3e3138..7749728a3 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -13,7 +13,7 @@ _basekernel=3.6 _sublevel=3 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.2 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.3 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -43,7 +43,7 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380' '9d3c56a4b999c8bfbd4018089a62f662' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '34508a324c3704662e9fc115d07735a3') + '656c0ceb21fe98a3d18e35201755efd1') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD index 18b474d64..fbff59b80 100644 --- a/libre/tp_smapi-libre-lts/PKGBUILD +++ b/libre/tp_smapi-libre-lts/PKGBUILD @@ -12,7 +12,7 @@ pkgname=tp_smapi-libre-lts _pkgname=tp_smapi _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS pkgver=0.41 -pkgrel=9.1 +pkgrel=9.2 pkgdesc="linux-libre-lts modules for ThinkPad's SMAPI functionality" arch=('i686' 'x86_64') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD index 3067a780e..238121c0c 100644 --- a/libre/virtualbox-libre-modules-lts/PKGBUILD +++ b/libre/virtualbox-libre-modules-lts/PKGBUILD @@ -8,7 +8,7 @@ pkgbase=virtualbox-libre-modules-lts pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts') pkgver=4.2.2 -pkgrel=1.1 +pkgrel=1.2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/multilib-testing/lib32-catalyst-utils/PKGBUILD b/multilib-testing/lib32-catalyst-utils/PKGBUILD index 753e5e26c..5d8c1dcc2 100644 --- a/multilib-testing/lib32-catalyst-utils/PKGBUILD +++ b/multilib-testing/lib32-catalyst-utils/PKGBUILD @@ -1,26 +1,25 @@ -# $Id: PKGBUILD 77335 2012-10-08 23:34:54Z lcarlier $ +# $Id: PKGBUILD 78745 2012-10-23 22:16:55Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Vi0L0, wonder, Eduardo "kensai" Romero # Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert pkgname=lib32-catalyst-utils -pkgver=12.9 -pkgrel=0.1 +pkgver=12.10 +pkgrel=1 pkgdesc="AMD Catalyst drivers libraries (32 bits)" arch=('x86_64') url="http://www.amd.com" license=('custom') -source=(#"http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip" - https://launchpad.net/ubuntu/quantal/+source/fglrx-installer/2:9.000-0ubuntu1/+files/fglrx-installer_9.000.orig.tar.gz) -md5sums=('2bb6e8193fdddff9bbd2e3d9f9e8f39b') +source=("http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${pkgver}-x86.x86_64.zip") +md5sums=('ef6ecd984e47e80849215b33fbfa5b7f') provides=('lib32-libgl') conflicts=('lib32-libgl' 'lib32-nvidia-utils') -#build() { -# cd ${srcdir} -# -# sh ./amd-driver-installer*.run --extract fglrx-install -#} +build() { + cd ${srcdir} + + sh ./amd-driver-installer*.run --extract fglrx-install +} package() { depends=("catalyst-utils=${pkgver}") @@ -29,20 +28,20 @@ package() { install -dm755 "${pkgdir}"/usr/lib32/{dri,xorg/modules/{dri,extensions/fglrx}} # binaries - cd ${srcdir} + cd ${srcdir}/fglrx-install install -m755 arch/x86/usr/X11R6/bin/fgl_glxgears "${pkgdir}/usr/bin/fgl_glxgears32" install -m755 arch/x86/usr/X11R6/bin/fglrxinfo "${pkgdir}/usr/bin/fglrxinfo32" # dri/gl/... drivers - cd ${srcdir}/xpic/usr/X11R6/lib/modules + cd ${srcdir}/fglrx-install/xpic/usr/X11R6/lib/modules install -m755 *.so "${pkgdir}/usr/lib32/xorg/modules/" - cd ${srcdir}/arch/x86/usr/X11R6/lib + cd ${srcdir}/fglrx-install/arch/x86/usr/X11R6/lib install -m755 modules/dri/fglrx_dri.so "${pkgdir}/usr/lib32/xorg/modules/dri/" ln -s /usr/lib32/xorg/modules/dri/fglrx_dri.so "${pkgdir}/usr/lib32/dri/" install -m755 fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/" install -m755 *.so* "${pkgdir}/usr/lib32/" install -m644 libAMDXvBA.cap "${pkgdir}/usr/lib32/" - cd ${srcdir}/arch/x86/usr/lib + cd ${srcdir}/fglrx-install/arch/x86/usr/lib install -m755 *.so* "${pkgdir}/usr/lib32/" # needed symlinks ln -s libatiuki.so.1.0 "${pkgdir}/usr/lib32/libatiuki.so.1" @@ -56,5 +55,5 @@ package() { rm "${pkgdir}"/usr/lib32/lib{amdocl*,OpenCL}.so* # licenses - install -Dm644 "${srcdir}/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" + install -Dm644 "${srcdir}/fglrx-install/common/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" } diff --git a/multilib/lib32-libldap/PKGBUILD b/multilib/lib32-libldap/PKGBUILD index 2396313e0..48f35c5bb 100644 --- a/multilib/lib32-libldap/PKGBUILD +++ b/multilib/lib32-libldap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74902 2012-08-09 08:08:00Z bluewind $ +# $Id: PKGBUILD 78742 2012-10-23 21:46:20Z bluewind $ # Maintainer: # Contributor: Judd Vinet <jvinet@zeroflux.org> _pkgbasename=libldap pkgname=lib32-$_pkgbasename -pkgver=2.4.32 +pkgver=2.4.33 pkgrel=1 pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries (32-bit)" arch=('x86_64') @@ -15,7 +15,7 @@ makedepends=(gcc-multilib) options=('!libtool') source=("ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-${pkgver}.tgz" 'ntlm.patch') -md5sums=('6a3e85cf61860ca5e8a1eba6753dd9d0' +md5sums=('5adae44897647c15ce5abbff313bc85a' '4258ddbef923d1f29f2843bc050f8c56') build() { diff --git a/testing/bison/PKGBUILD b/testing/bison/PKGBUILD index 069d61071..2e82c6d1b 100644 --- a/testing/bison/PKGBUILD +++ b/testing/bison/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164715 2012-08-04 00:56:52Z allan $ +# $Id: PKGBUILD 169565 2012-10-23 14:54:01Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> pkgname=bison -pkgver=2.6.2 +pkgver=2.6.4 pkgrel=1 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('glibc' 'm4' 'sh') groups=('base-devel') install=bison.install source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('dea291996f98c34c3fd8e389a9cf6ea1' - 'e6d78e6423e9e29f3b6c5deee839b41c') +md5sums=('8b2dc57eb9d2d6de4715d30de6b2ee07' + '89b9f75a9aa1b02418fef0e685bd44f2') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/testing/ekiga/PKGBUILD b/testing/ekiga/PKGBUILD index f41e4320f..551e20c50 100644 --- a/testing/ekiga/PKGBUILD +++ b/testing/ekiga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163545 2012-07-15 13:16:43Z ibiru $ +# $Id: PKGBUILD 169549 2012-10-23 12:35:22Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=ekiga -pkgver=3.3.2 -pkgrel=6 +pkgver=3.9.90 +pkgrel=1 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) @@ -15,14 +15,11 @@ optdepends=('evolution-data-server: Evolution integration') options=(!emptydirs) groups=('gnome-extra') install=ekiga.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - gcc47.patch) -sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a' - '9e3000016e1174be5d6cc60c89abeaeb61a98eb163a38abf11f4af4f2d6363ec') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('d905169c257173196d235bad6501682cd07752a6a29577620cc4dfb91d8b77a9') build() { cd "$pkgname-$pkgver" - patch -Np1 -i "$srcdir/gcc47.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-schemas-install \ --disable-scrollkeeper --enable-dbus diff --git a/testing/evince/PKGBUILD b/testing/evince/PKGBUILD index 504b698f1..98d1f5674 100644 --- a/testing/evince/PKGBUILD +++ b/testing/evince/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 169257 2012-10-18 19:28:43Z jgc $ +# $Id: PKGBUILD 169538 2012-10-23 11:07:56Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" @@ -10,12 +10,13 @@ arch=('i686' 'x86_64') license=('GPL') depends=('gtk3' 'libgxps' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') makedepends=('itstool' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection' 'docbook-xsl') -optdepends=('texlive-bin: DVI support') +optdepends=('texlive-bin: DVI support' + 'gvfs: bookmark support and session saving') groups=('gnome-extra') install=evince.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('8dfa7b9c2f0b910d06b1612ff445d3f3050c44d25f2e78718966374d30ab83f2') +sha256sums=('1b87b2579d438a126391f9044611b472e9f7b5b712e40b5645b0810164bc41b5') build() { cd "$pkgname-$pkgver" diff --git a/testing/gthumb/PKGBUILD b/testing/gthumb/PKGBUILD index 8d0b5540e..f35ef8f19 100644 --- a/testing/gthumb/PKGBUILD +++ b/testing/gthumb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169195 2012-10-18 19:24:39Z jgc $ +# $Id: PKGBUILD 169530 2012-10-23 07:37:59Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=gthumb -pkgver=3.1.1 +pkgver=3.1.2 pkgrel=1 pkgdesc="Image browser and viewer for the GNOME Desktop" arch=(i686 x86_64) @@ -23,7 +23,7 @@ optdepends=('libopenraw: read RAW files' options=('!libtool' '!emptydirs') install=gthumb.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('7e725ba38d1220ed09d0657dd365982547856aa0d03c775891de33d04c31e332') +sha256sums=('5e7f80b3ffa8a6e06b9f1bf0cfa869f772af4163b842a7f457c9dc68ff7e6f8f') build() { cd $pkgname-$pkgver diff --git a/testing/ldns/PKGBUILD b/testing/ldns/PKGBUILD new file mode 100644 index 000000000..4613191f4 --- /dev/null +++ b/testing/ldns/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 169587 2012-10-23 22:55:24Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: mathieui <mathieui@mathieui.net> +# Contributor: jiribb <jiribb@gmail.com> + +pkgname=ldns +pkgver=1.6.14 +pkgrel=1 +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") +sha1sums=('2ef5fbf33b25d2f7b736c332ebccc0862dd12d02') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./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/nautilus/PKGBUILD b/testing/nautilus/PKGBUILD index 039df8b52..51b68261e 100644 --- a/testing/nautilus/PKGBUILD +++ b/testing/nautilus/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 169168 2012-10-18 19:23:22Z jgc $ +# $Id: PKGBUILD 169536 2012-10-23 10:44:23Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nautilus -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="GNOME file manager" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ groups=('gnome') options=('!libtool' '!emptydirs') install=nautilus.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('44d9b967d39c6785f077e4a83e61b398d1676742b9795f9e82a645fc20e80d72') +sha256sums=('7b30cf1ce538c9d4cdff883f54d1edcbdffbe146dc1b819bbfacd5e6837df390') build() { cd "$pkgname-$pkgver" diff --git a/testing/nss-myhostname/PKGBUILD b/testing/nss-myhostname/PKGBUILD new file mode 100644 index 000000000..18b582043 --- /dev/null +++ b/testing/nss-myhostname/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 169556 2012-10-23 14:16:38Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Mantas M. <grawity@gmail.com> +pkgname="nss-myhostname" +pkgver=0.3 +pkgrel=3 +pkgdesc="NSS plugin providing host name resolution for the locally configured system hostname" +arch=(i686 x86_64) +url="http://0pointer.de/lennart/projects/nss-myhostname/" +license=('LGPL2.1') +depends=('glibc') +groups=('base') +source=("http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz") + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-lynx + make +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +md5sums=('d4ab9ac36c053ab8fb836db1cbd4a48f') diff --git a/testing/opal/PKGBUILD b/testing/opal/PKGBUILD index 555d21baf..962a5aae5 100644 --- a/testing/opal/PKGBUILD +++ b/testing/opal/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163079 2012-07-06 16:17:32Z ibiru $ +# $Id: PKGBUILD 169547 2012-10-23 12:23:23Z jgc $ # Maintainer: Jan de Groot <jan@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=opal -pkgver=3.10.5 -pkgrel=1 +pkgver=3.10.7 +pkgrel=2 pkgdesc="Open Phone Abstraction Library" arch=(i686 x86_64) url="http://www.opalvoip.org" @@ -13,7 +13,8 @@ makedepends=('ffmpeg') options=(!makeflags) source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2 opal-ffmpeg.patch) -md5sums=('22b0d716ed1cbc935245539e0bbab38f' '53bb06a376fb57a306522bfa6a573217') +md5sums=('8686bb930668067eefadab115d2ee1c2' + '0f05c01dada644b37805667ba9e81aa5') build() { cd "${srcdir}/opal-${pkgver}" diff --git a/testing/opal/opal-ffmpeg.patch b/testing/opal/opal-ffmpeg.patch index ebfd1f037..c40e1ddfb 100644 --- a/testing/opal/opal-ffmpeg.patch +++ b/testing/opal/opal-ffmpeg.patch @@ -1,7 +1,7 @@ -diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx ---- opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx 2012-04-26 06:56:01.000000000 +0200 -+++ opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx 2012-06-10 16:39:35.447021150 +0200 -@@ -51,6 +51,7 @@ +diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/plugins/video/H.263-1998/h263-1998.cxx +--- opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx 2012-08-23 04:18:42.000000000 +0200 ++++ opal-3.10.7.patched/plugins/video/H.263-1998/h263-1998.cxx 2012-08-28 19:53:12.080918973 +0200 +@@ -48,6 +48,7 @@ #endif #include "h263-1998.h" @@ -9,7 +9,7 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/ #include <limits> #include <iomanip> #include <stdio.h> -@@ -324,9 +325,9 @@ +@@ -317,9 +318,9 @@ // Level 2+ // works with eyeBeam, signaled via non-standard "D" if (atoi(value) == 1) @@ -21,7 +21,7 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/ return; } -@@ -335,9 +336,9 @@ +@@ -328,9 +329,9 @@ // Annex F: Advanced Prediction Mode // does not work with eyeBeam if (atoi(value) == 1) @@ -33,7 +33,7 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/ return; } #endif -@@ -367,9 +368,9 @@ +@@ -360,9 +361,9 @@ // Annex K: Slice Structure // does not work with eyeBeam if (atoi(value) != 0) @@ -45,7 +45,7 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/ return; } -@@ -377,9 +378,9 @@ +@@ -370,9 +371,9 @@ // Annex S: Alternative INTER VLC mode // does not work with eyeBeam if (atoi(value) == 1) @@ -56,8 +56,8 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/ + av_opt_set_int(m_context->priv_data, "aiv", 0, 0); return; } - } -@@ -445,15 +446,6 @@ + +@@ -450,15 +451,6 @@ PTRACE(5, m_prefix, "qmax set to " << m_context->qmax); PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size); @@ -73,7 +73,7 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/ return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0; } -@@ -516,7 +508,7 @@ +@@ -521,7 +513,7 @@ // Need to copy to local buffer to guarantee 16 byte alignment memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2); @@ -82,7 +82,7 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/ /* m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE; -@@ -598,13 +590,13 @@ +@@ -603,13 +595,13 @@ m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack; m_context->opaque = this; // used to separate out packets from different encode threads @@ -99,21 +99,23 @@ diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/ return true; } -diff -ru opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx ---- opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx 2012-04-26 06:56:00.000000000 +0200 -+++ opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx 2012-06-10 16:49:11.210568639 +0200 -@@ -25,6 +25,7 @@ +Only in opal-3.10.7.patched/plugins/video/H.263-1998: h263-1998.cxx.orig +diff -ru opal-3.10.7/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.7.patched/plugins/video/H.264/gpl/h264_helper.cxx +--- opal-3.10.7/plugins/video/H.264/gpl/h264_helper.cxx 2012-08-23 04:18:41.000000000 +0200 ++++ opal-3.10.7.patched/plugins/video/H.264/gpl/h264_helper.cxx 2012-08-28 19:53:12.080918973 +0200 +@@ -27,6 +27,7 @@ #include <fstream> #include <stdlib.h> #include <sys/stat.h> +#include <unistd.h> - - #ifndef PLUGINCODEC_TRACING -diff -ru opal-3.10.5/plugins/video/H.264/h264-x264.cxx opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx ---- opal-3.10.5/plugins/video/H.264/h264-x264.cxx 2012-04-26 06:56:00.000000000 +0200 -+++ opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx 2012-06-10 17:04:19.695646950 +0200 -@@ -1035,13 +1035,10 @@ + #ifdef HAVE_UNISTD_H + #include <unistd.h> +Only in opal-3.10.7.patched/plugins/video/H.264/gpl: h264_helper.cxx.orig +diff -ru opal-3.10.7/plugins/video/H.264/h264-x264.cxx opal-3.10.7.patched/plugins/video/H.264/h264-x264.cxx +--- opal-3.10.7/plugins/video/H.264/h264-x264.cxx 2012-08-23 04:18:41.000000000 +0200 ++++ opal-3.10.7.patched/plugins/video/H.264/h264-x264.cxx 2012-08-28 19:53:12.080918973 +0200 +@@ -1071,13 +1071,10 @@ return false; m_context->workaround_bugs = FF_BUG_AUTODETECT; @@ -128,32 +130,31 @@ diff -ru opal-3.10.5/plugins/video/H.264/h264-x264.cxx opal-3.10.5.patched/plugi CODEC_FLAG2_SKIP_RD | CODEC_FLAG2_CHUNKS; -diff -ru opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx ---- opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx 2012-04-26 06:56:00.000000000 +0200 -+++ opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx 2012-06-10 17:04:46.012171051 +0200 +Only in opal-3.10.7.patched/plugins/video/H.264: h264-x264.cxx.orig +diff -ru opal-3.10.7/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.7.patched/plugins/video/H.264/shared/x264wrap.cxx +--- opal-3.10.7/plugins/video/H.264/shared/x264wrap.cxx 2012-08-23 04:18:41.000000000 +0200 ++++ opal-3.10.7.patched/plugins/video/H.264/shared/x264wrap.cxx 2012-08-28 19:53:12.084252306 +0200 @@ -33,6 +33,7 @@ #include <codec/opalplugin.hpp> #include <stdio.h> +#include <unistd.h> + #ifdef HAVE_UNISTD_H + #include <unistd.h> +Only in opal-3.10.7.patched/plugins/video/H.264/shared: x264wrap.cxx.orig +diff -ru opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.7.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx +--- opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-08-23 04:18:44.000000000 +0200 ++++ opal-3.10.7.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-08-28 19:54:35.460923804 +0200 +@@ -103,6 +103,7 @@ - #if defined(X264_LICENSED) || defined(GPL_HELPER_APP) -diff -ru opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx ---- opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-04-26 06:56:02.000000000 +0200 -+++ opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx 2012-06-10 16:46:33.498089705 +0200 -@@ -101,8 +101,10 @@ - #include <libavutil/bswap.h> - #include <libavcodec/mpegvideo.h> - -+ #else /* LIBAVCODEC_HAVE_SOURCE_DIR */ - #include LIBAVCODEC_HEADER + #include "../common/ffmpeg.h" +#include <libavutil/opt.h> #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */ } -@@ -589,17 +591,17 @@ +@@ -589,17 +590,17 @@ m_avpicture->quality = m_videoQMin; #ifdef USE_ORIG @@ -174,7 +175,7 @@ diff -ru opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.5.patched/pl #endif m_avcontext->opaque = this; // for use in RTP callback } -@@ -804,7 +806,7 @@ +@@ -804,7 +805,7 @@ // Should the next frame be an I-Frame? if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0)) { @@ -183,7 +184,7 @@ diff -ru opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.5.patched/pl } else // No IFrame requested, let avcodec decide what to do { -@@ -1325,7 +1327,7 @@ +@@ -1325,7 +1326,7 @@ void MPEG4DecoderContext::SetStaticDecodingParams() { m_avcontext->flags |= CODEC_FLAG_4MV; diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD index b458cc960..a02c6e97e 100644 --- a/testing/openssh/PKGBUILD +++ b/testing/openssh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165904 2012-09-03 13:01:11Z bisson $ +# $Id: PKGBUILD 169589 2012-10-23 22:58:43Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=openssh pkgver=6.1p1 -pkgrel=2 +pkgrel=3 pkgdesc='Free version of the SSH connectivity tools' url='http://www.openssh.org/portable.html' license=('custom:BSD') @@ -25,10 +25,10 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver} 'sshd') sha1sums=('751c92c912310c3aa9cadc113e14458f843fc7b3' '954bf1660aa32620c37034320877f4511b767ccb' - '6c71de2c2ca9622aa8e863acd94b135555e11125' + '6df5be396f8c593bb511a249a1453294d18a01a6' 'bd6eae36c7ef9efb7147778baad7858b81f2d660' - '1fd209980ee2fcdd7b219883e8add0f5ca63388a' - 'b7acfce018efc111e7ce80dbe37b932caf7c2d53' + 'f9af4a442b804ab661cec0edb25dd76dee16d8d2' + 'e12fa910b26a5634e5a6ac39ce1399a132cf6796' 'ec102deb69cad7d14f406289d2fc11fee6eddbdd' '659e3ee95c269014783ff8b318c6f50bf7496fbd' '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7') diff --git a/testing/openssh/sshd.service b/testing/openssh/sshd.service index b5c098b73..633164e5d 100644 --- a/testing/openssh/sshd.service +++ b/testing/openssh/sshd.service @@ -11,7 +11,6 @@ Restart=always [Install] WantedBy=multi-user.target -Also=sshdgenkeys.service # This service file runs an SSH daemon that forks for each incoming connection. # If you prefer to spawn on-demand daemons, use sshd.socket and sshd@.service. diff --git a/testing/openssh/sshd.socket b/testing/openssh/sshd.socket index 1b9403c99..e09e32869 100644 --- a/testing/openssh/sshd.socket +++ b/testing/openssh/sshd.socket @@ -8,4 +8,3 @@ Accept=yes [Install] WantedBy=sockets.target -Also=sshdgenkeys.service diff --git a/testing/openssh/sshdgenkeys.service b/testing/openssh/sshdgenkeys.service index 47c1c3fd6..8c27d7110 100644 --- a/testing/openssh/sshdgenkeys.service +++ b/testing/openssh/sshdgenkeys.service @@ -13,6 +13,3 @@ ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub ExecStart=/usr/bin/ssh-keygen -A Type=oneshot RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/testing/ptlib/PKGBUILD b/testing/ptlib/PKGBUILD new file mode 100644 index 000000000..ed26e6d29 --- /dev/null +++ b/testing/ptlib/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 169545 2012-10-23 11:47:51Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=ptlib +pkgver=2.10.7 +pkgrel=2 +pkgdesc="Portable Windows Library" +arch=('i686' 'x86_64') +url="http://www.opalvoip.org" +license=('GPL') +depends=('sdl' 'libpulse' 'v4l-utils' 'libldap') +replaces=('pwlib') +conflicts=('pwlib') +source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2) +md5sums=('7fb74a97743fcc5f33d0f97dec7bc878') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --libdir=/usr/lib \ + --sysconfdir=/etc --localstatedir=/var \ + --enable-opal --enable-plugins \ + --enable-oss --enable-v4l2 \ + --disable-avc --enable-sdl \ + --enable-ipv6 --enable-v4l \ + --enable-dc --disable-odbc \ + --enable-expat --enable-httpforms + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/yelp/PKGBUILD b/testing/yelp/PKGBUILD index af6fb7ae1..5beeefb34 100644 --- a/testing/yelp/PKGBUILD +++ b/testing/yelp/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 169142 2012-10-18 19:22:09Z jgc $ +# $Id: PKGBUILD 169534 2012-10-23 10:29:09Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=yelp -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 pkgdesc="A help browser for GNOME" arch=('i686' 'x86_64') -depends=('webkitgtk3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2' +depends=('webkitgtk3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'xz' 'bzip2' 'desktop-file-utils' 'dconf') makedepends=('intltool' 'gtk-doc' 'itstool') groups=('gnome') @@ -16,7 +16,7 @@ options=('!emptydirs' '!libtool') url="http://www.gnome.org" install=yelp.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('966a513420674c488b18df0ffcf51f8b4687cdba04b1d1d5e76d59c0484ac048') +sha256sums=('55a0bd94405c2d2b6230d1be9f88fe978930f6228e4f1cc2f58f923421243404') build() { cd $pkgname-$pkgver |