summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-05-20 00:04:49 +0000
committerroot <root@rshg054.dnsready.net>2012-05-20 00:04:49 +0000
commitaad2fba0fc475162b566f1577d8e7a020cd9e80d (patch)
treef289660c47a6cbbf3b68078aeb56f5c19e30a662
parent5d334c7470b5851fbacd4545c8ee0ea676a21ccc (diff)
Sun May 20 00:04:49 UTC 2012
-rw-r--r--community-staging/ktikz/PKGBUILD27
-rw-r--r--community-staging/ktikz/ktikz.install14
-rw-r--r--community/acpid/PKGBUILD39
-rw-r--r--community/acpid/acpid.conf5
-rw-r--r--community/acpid/acpid.rc40
-rw-r--r--community/acpid/acpid.service7
-rw-r--r--community/acpid/acpid.socket8
-rw-r--r--community/acpid/handler.sh62
-rw-r--r--community/deadbeef/PKGBUILD6
-rw-r--r--community/gsoap/PKGBUILD6
-rw-r--r--community/hardlink/PKGBUILD27
-rw-r--r--community/hostapd/PKGBUILD18
-rw-r--r--community/hubbub/PKGBUILD9
-rw-r--r--community/intellij-idea-libs/PKGBUILD8
-rw-r--r--community/lazarus/PKGBUILD2
-rw-r--r--community/libcss/PKGBUILD8
-rw-r--r--community/libwapcaplet/PKGBUILD12
-rw-r--r--community/r8168-lts/PKGBUILD6
-rw-r--r--community/snort/PKGBUILD6
-rw-r--r--community/sslh/PKGBUILD33
-rw-r--r--community/sslh/sslh.rc1
-rw-r--r--core/mdadm/PKGBUILD24
-rw-r--r--core/mdadm/mdadm.service8
-rw-r--r--core/xinetd/PKGBUILD16
-rw-r--r--core/xinetd/xinetd.service10
-rw-r--r--extra/eclipse/PKGBUILD6
-rw-r--r--extra/eclipse/eclipse.install4
-rw-r--r--extra/glib-perl/PKGBUILD6
-rw-r--r--extra/icu/PKGBUILD12
-rw-r--r--extra/icu/fix_broken_regex.diff35
-rw-r--r--extra/libunistring/PKGBUILD29
-rw-r--r--extra/libunistring/libunistring.install22
-rw-r--r--extra/mcpp/PKGBUILD13
-rw-r--r--extra/mcpp/fs28284.patch100
-rw-r--r--extra/rosegarden/PKGBUILD6
-rw-r--r--extra/xf86-video-ati/PKGBUILD35
-rw-r--r--extra/xorg-server/PKGBUILD17
-rw-r--r--extra/xorg-server/git-fixes.patch1812
-rw-r--r--testing/gc/PKGBUILD35
-rw-r--r--testing/rasqal/PKGBUILD35
-rw-r--r--testing/sudo/PKGBUILD8
41 files changed, 2292 insertions, 285 deletions
diff --git a/community-staging/ktikz/PKGBUILD b/community-staging/ktikz/PKGBUILD
new file mode 100644
index 000000000..d20dfbdcb
--- /dev/null
+++ b/community-staging/ktikz/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Peter Lewis <plewis@aur.archlinux.org>
+# Contributor: linuxSEAT <--put_my_name_here--@gmail.com>
+# Contributor: Le_J <clej37 at gmail dot com>
+
+pkgname=ktikz
+pkgver=0.10
+pkgrel=4
+pkgdesc="A small application helping you to create TikZ diagrams (from the LaTeX pgf package)"
+arch=('i686' 'x86_64')
+url="http://www.hackenberger.at/blog/ktikz-editor-for-the-tikz-language/"
+license=("GPL")
+depends=('poppler-qt' 'kdelibs')
+makedepends=('automoc4' 'cmake' 'docbook-xml')
+source=("http://www.hackenberger.at/ktikz/"$pkgname"_"$pkgver".tar.gz")
+md5sums=('e8f0826cba2447250bcdcd389a71a2ac')
+
+build() {
+ cd "$srcdir"/"$pkgname"
+
+ cmake -DCMAKE_INSTALL_PREFIX=`kde4-config --prefix`
+ make
+}
+
+package() {
+ cd "$srcdir"/"$pkgname"
+ make DESTDIR="$pkgdir" install
+}
diff --git a/community-staging/ktikz/ktikz.install b/community-staging/ktikz/ktikz.install
new file mode 100644
index 000000000..210d1ac2b
--- /dev/null
+++ b/community-staging/ktikz/ktikz.install
@@ -0,0 +1,14 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor > /dev/null
+ update-mime-database /usr/share/mime > /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/acpid/PKGBUILD b/community/acpid/PKGBUILD
index 53ff54a87..677e10b47 100644
--- a/community/acpid/PKGBUILD
+++ b/community/acpid/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69396 2012-04-15 17:01:41Z seblu $
+# $Id: PKGBUILD 70904 2012-05-18 22:37:04Z seblu $
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
# Contributor: xduugu
# Contributor: Manolis Tzanidakis
@@ -6,7 +6,7 @@
pkgname=acpid
pkgver=2.0.16
-pkgrel=1
+pkgrel=2
pkgdesc='A daemon for delivering ACPI power management events with netlink support'
arch=('i686' 'x86_64')
url='http://tedfelix.com/linux/acpid-netlink.html'
@@ -16,15 +16,19 @@ optdepends=('perl: use perl based examples')
replaces=('acpid2')
backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid')
source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.xz"
- 'acpid'
+ 'acpid.rc'
+ 'acpid.conf'
+ 'acpid.socket'
+ 'acpid.service'
'anything'
- 'handler.sh'
- 'acpid.conf.d')
+ 'handler.sh')
md5sums=('d59fc02c9c34f0d5c137495302e2c074'
- 'd69203a032c4583f9abaafcf21a7ed84'
+ '077475c75fbdd9de75f9a397130ccd91'
+ '929c6d2e91295c22ed9ec6212d7eabef'
+ 'ee6cb99e50e580c50331a73045412ae9'
+ '953e26477c5d4f5f013d6861c04b4af6'
'2d37b98d6e74bab815604b8b48c6cfd4'
- '615439f4a89716c747907d4fc3c8df75'
- '929c6d2e91295c22ed9ec6212d7eabef')
+ '74ee3c33714ff5cb44f30c9a0dceeef0')
build() {
cd $pkgname-$pkgver
@@ -33,15 +37,22 @@ build() {
}
package() {
- cd $pkgname-$pkgver
+ pushd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
+ popd
+
+ # default config
+ install -Dm644 anything "$pkgdir/etc/acpi/events/anything"
+ install -Dm755 handler.sh "$pkgdir/etc/acpi/handler.sh"
- install -Dm755 ../acpid "$pkgdir/etc/rc.d/acpid"
- install -Dm644 ../anything "$pkgdir/etc/acpi/events/anything"
- install -Dm755 ../handler.sh "$pkgdir/etc/acpi/handler.sh"
- install -Dm644 ../acpid.conf.d "$pkgdir/etc/conf.d/acpid"
+ # initscripts
+ install -Dm755 acpid.rc "$pkgdir/etc/rc.d/acpid"
+ install -Dm644 acpid.conf "$pkgdir/etc/conf.d/acpid"
+ install -Dm644 acpid.socket "$pkgdir/usr/lib/systemd/system/acpid.socket"
+ install -Dm644 acpid.service "$pkgdir/usr/lib/systemd/system/acpid.service"
- chmod 755 "$pkgdir"/usr/sbin/acpid
+ # fix acpid rights
+ chmod 755 "$pkgdir/usr/sbin/acpid"
}
# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/acpid/acpid.conf b/community/acpid/acpid.conf
new file mode 100644
index 000000000..b60103a2d
--- /dev/null
+++ b/community/acpid/acpid.conf
@@ -0,0 +1,5 @@
+#
+# Arguments to be passed to the acpid daemon
+#
+
+ACPID_ARGS=""
diff --git a/community/acpid/acpid.rc b/community/acpid/acpid.rc
new file mode 100644
index 000000000..674f4621b
--- /dev/null
+++ b/community/acpid/acpid.rc
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+[[ -f /etc/conf.d/acpid ]] && . /etc/conf.d/acpid
+
+PID=$(pidof -o %PPID /usr/sbin/acpid)
+case "$1" in
+ start)
+ stat_busy "Starting acpid"
+ [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ add_daemon acpid
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping acpid"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon acpid
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+esac
+exit 0
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/acpid/acpid.service b/community/acpid/acpid.service
new file mode 100644
index 000000000..31fcc0575
--- /dev/null
+++ b/community/acpid/acpid.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=ACPI event daemon
+Requires=acpid.socket
+
+[Service]
+EnvironmentFile=/etc/conf.d/acpid
+ExecStart=/usr/sbin/acpid -f $ACPID_ARGS
diff --git a/community/acpid/acpid.socket b/community/acpid/acpid.socket
new file mode 100644
index 000000000..1e5365bf1
--- /dev/null
+++ b/community/acpid/acpid.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=ACPID Listen Socket
+
+[Socket]
+ListenStream=/run/acpid.socket
+
+[Install]
+WantedBy=sockets.target
diff --git a/community/acpid/handler.sh b/community/acpid/handler.sh
index aac143a9a..b5a548f43 100644
--- a/community/acpid/handler.sh
+++ b/community/acpid/handler.sh
@@ -9,16 +9,24 @@ set $*
case "$1" in
button/power)
- #echo "PowerButton pressed!">/dev/tty5
case "$2" in
- PBTN|PWRF) logger "PowerButton pressed: $2" ;;
- *) logger "ACPI action undefined: $2" ;;
+ PBTN|PWRF)
+ logger "PowerButton pressed: $2"
+ poweroff
+ ;;
+ *)
+ logger "ACPI action undefined: $2"
+ ;;
esac
;;
button/sleep)
case "$2" in
- SLPB|SBTN) echo -n mem >/sys/power/state ;;
- *) logger "ACPI action undefined: $2" ;;
+ SLPB|SBTN)
+ echo -n mem >/sys/power/state
+ ;;
+ *)
+ logger "ACPI action undefined: $2"
+ ;;
esac
;;
ac_adapter)
@@ -28,43 +36,51 @@ case "$1" in
00000000)
echo -n $minspeed >$setspeed
#/etc/laptop-mode/laptop-mode start
- ;;
+ ;;
00000001)
echo -n $maxspeed >$setspeed
#/etc/laptop-mode/laptop-mode stop
- ;;
+ ;;
esac
;;
- *) logger "ACPI action undefined: $2" ;;
+ *)
+ logger "ACPI action undefined: $2"
+ ;;
esac
;;
battery)
case "$2" in
BAT0)
case "$4" in
- 00000000) #echo "offline" >/dev/tty5
- ;;
- 00000001) #echo "online" >/dev/tty5
- ;;
+ 00000000)
+ logger 'Battery online'
+ ;;
+ 00000001)
+ logger 'Battery offline'
+ ;;
esac
;;
- CPU0)
+ CPU0)
;;
*) logger "ACPI action undefined: $2" ;;
esac
;;
button/lid)
- case "$3" in
- close)
- #echo "LID closed!">/dev/tty5
- ;;
- open)
- #echo "LID opened!">/dev/tty5
- ;;
- esac
- ;;
-
+ case "$3" in
+ close)
+ logger 'LID closed'
+ ;;
+ open)
+ logger 'LID opened'
+ ;;
+ *)
+ logger "ACPI action undefined: $3"
+ ;;
+ esac
+ ;;
*)
logger "ACPI group/action undefined: $1 / $2"
;;
esac
+
+# vim:set ts=4 sw=4 ft=sh et:
diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD
index 07120f0d6..3d14a89b5 100644
--- a/community/deadbeef/PKGBUILD
+++ b/community/deadbeef/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70693 2012-05-14 21:35:24Z lfleischer $
+# $Id: PKGBUILD 70879 2012-05-18 11:38:46Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
pkgname=deadbeef
pkgver=0.5.4
-pkgrel=1
+pkgrel=2
pkgdesc='An audio player for GNU/Linux based on GTK2.'
arch=('i686' 'x86_64')
url='http://deadbeef.sourceforge.net'
@@ -12,7 +12,7 @@ license=('GPL2')
depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils')
makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb'
'ffmpeg' 'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip'
- 'libsamplerate')
+ 'libsamplerate' 'yasm')
optdepends=('libsamplerate: for Resampler plugin'
'libvorbis: for Ogg Vorbis playback'
'libmad: for MP1/MP2/MP3 playback'
diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD
index da3ed0a7e..57e1a992b 100644
--- a/community/gsoap/PKGBUILD
+++ b/community/gsoap/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64430 2012-02-13 06:18:52Z spupykin $
+# $Id: PKGBUILD 70883 2012-05-18 13:41:50Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Tor Krill <tor@krill.nu>
# Contributor: Lee.MaRS <leemars@gmail.com>
pkgname=gsoap
-pkgver=2.8.7
+pkgver=2.8.8
pkgrel=1
pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++"
url="http://www.cs.fsu.edu/~engelen/soap.html"
@@ -14,7 +14,7 @@ depends=('openssl' 'zlib' 'gcc-libs')
makedepends=('autoconf' 'automake')
source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip
LICENSE)
-md5sums=('48a8dfddffd8f10b3ca82a6a9583e206'
+md5sums=('cffb523b66eb36c51ca455645f1cfeb0'
'27aaa3f5166db94d44044c11a7b2c37b')
build() {
diff --git a/community/hardlink/PKGBUILD b/community/hardlink/PKGBUILD
new file mode 100644
index 000000000..edf5d6973
--- /dev/null
+++ b/community/hardlink/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 70897 2012-05-18 22:12:06Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+
+pkgname=hardlink
+pkgver=0.2.0
+pkgrel=1
+pkgdesc='Replace file copies using hardlinks'
+arch=('i686' 'x86_64')
+url='http://jak-linux.org/projects/hardlink/'
+license=('custom: MIT')
+depends=('glibc' 'pcre')
+source=("http://jak-linux.org/projects/hardlink/hardlink_$pkgver.tar.gz")
+md5sums=('4c1621ee7850a1c8b316735a7bced993')
+
+build() {
+ cd $pkgname-$pkgver
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ # install icense
+ install -Dm 644 debian/copyright "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD
index caa14c7c5..02d9efcfd 100644
--- a/community/hostapd/PKGBUILD
+++ b/community/hostapd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 67614 2012-03-13 14:20:23Z spupykin $
+# $Id: PKGBUILD 70872 2012-05-18 10:00:26Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=hostapd
-pkgver=0.7.3
-pkgrel=8
+pkgver=1.0
+pkgrel=1
pkgdesc="daemon for wireless software access points"
arch=('i686' 'x86_64')
url="http://hostap.epitest.fi/hostapd/"
@@ -25,25 +25,19 @@ backup=('etc/hostapd/hostapd.conf'
'etc/hostapd/wired.conf')
install=hostapd.install
source=(http://hostap.epitest.fi/releases/$pkgname-$pkgver.tar.gz
- hostap_allow-linking-with-libnl-3.2.patch
config
hostapd
hostapd.conf.d)
-md5sums=('91a7c8d0f090b7104152d3455a84c112'
- 'e904e62b12c5d64132dd9441e8b45dce'
+md5sums=('236247a7bbd4f60d5fa3e99849d1ffc9'
'5d7ee10b04e33f22c37be56a4c33dddb'
'd570327c385f34a4af24d3a0d61cea19'
'f169534b0f59b341f6df1a21e0344511')
build() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch"
-
- cd hostapd
+ cd "$srcdir/$pkgname-$pkgver"/hostapd
cp "$srcdir/config" ./.config
-
sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' hostapd.conf
-
+ export CFLAGS="$CFLAGS `pkg-config --cflags libnl-3.0`"
make
}
diff --git a/community/hubbub/PKGBUILD b/community/hubbub/PKGBUILD
index cf1651064..5510e5d13 100644
--- a/community/hubbub/PKGBUILD
+++ b/community/hubbub/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 59698 2011-11-29 12:42:33Z arodseth $
+# $Id: PKGBUILD 70911 2012-05-18 23:52:08Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
+
pkgname=hubbub
-pkgver=0.1.1
-pkgrel=2
+pkgver=0.1.2
+pkgrel=1
pkgdesc="HTML5 compliant parsing library"
arch=('x86_64' 'i686')
url="http://www.netsurf-browser.org/projects/hubbub/"
license=('MIT')
depends=('libparserutils')
source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz")
-md5sums=('98f49be58e228010c88381bc39f39e19')
+sha256sums=('95a1d5a71055b28a8e4ce4dc8516b8f0ed691c5ee03525bf73600495657f1b52')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index 5a81c144c..565c5597e 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 68868 2012-04-04 11:24:37Z stativ $
+# $Id: PKGBUILD 70885 2012-05-18 16:05:18Z stativ $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=intellij-idea-libs
-pkgver=11.1.1
-_pkgver=117.117
+pkgver=11.1.2
+_pkgver=117.418
pkgrel=1
pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE"
arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="http://www.jetbrains.org/"
license=('apache')
depends=('glibc')
source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz)
-md5sums=('09f814cc26b6c98d6e5f0fdf2aaa293c')
+md5sums=('eae2d36d088677e1d5670986da311f85')
build() {
cd "$srcdir"
diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD
index a488b7e06..fc1a1ebcf 100644
--- a/community/lazarus/PKGBUILD
+++ b/community/lazarus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70843 2012-05-17 18:23:03Z idevolder $
+# $Id: PKGBUILD 70866 2012-05-18 06:01:51Z ebelanger $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jens Adam (byte/jra) <j_adam@web.de>
# Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
diff --git a/community/libcss/PKGBUILD b/community/libcss/PKGBUILD
index a05aac7a3..f455c9485 100644
--- a/community/libcss/PKGBUILD
+++ b/community/libcss/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 64859 2012-02-18 18:11:23Z arodseth $
+# $Id: PKGBUILD 70909 2012-05-18 23:49:56Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=libcss
-pkgver=0.1.1
+pkgver=0.1.2
pkgrel=1
pkgdesc="CSS parser and selection engine"
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
url="http://www.netsurf-browser.org/projects/libcss/"
license=('MIT')
depends=('libparserutils' 'libwapcaplet')
source=("http://www.netsurf-browser.org/projects/releases/libcss-$pkgver-src.tar.gz")
-sha256sums=('383c424c1f7134be67e22a7a633e31d47ba6b87aba835a4e73eca893aa01c0a0')
+sha256sums=('92c112a059bc5ae490392439401005b47ca5c270f891f6317b64aac738ae1f5e')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/libwapcaplet/PKGBUILD b/community/libwapcaplet/PKGBUILD
index 4eb5dd94e..62c641f11 100644
--- a/community/libwapcaplet/PKGBUILD
+++ b/community/libwapcaplet/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 64868 2012-02-18 18:47:16Z arodseth $
+# $Id: PKGBUILD 70913 2012-05-18 23:56:14Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=libwapcaplet
-pkgver=0.1.0
-pkgrel=3
+pkgver=0.1.1
+pkgrel=1
pkgdesc="String internment library with rapid string comparison"
arch=('x86_64' 'i686')
url="http://www.netsurf-browser.org/projects/libwapcaplet/"
license=('MIT')
source=("http://www.netsurf-browser.org/projects/releases/$pkgname-$pkgver-src.tar.gz")
-sha256sums=('e58df9d4ee18344946d5c7c17fb99f29269027dafd875e2fe10bb1fb9d7fc1a7')
+sha256sums=('cf05159d7d515523697ce07228cff6a6339dc6bdcfec3e02e3b72d8b773f5258')
build() {
- cd "$srcdir/$pkgname-$pkgver-src"
+ cd "$srcdir/$pkgname-$pkgver"
make PREFIX=/usr COMPONENT_TYPE="lib-shared"
make PREFIX=/usr COMPONENT_TYPE="lib-static"
}
package() {
- cd "$srcdir/$pkgname-$pkgver-src"
+ cd "$srcdir/$pkgname-$pkgver"
make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-shared"
make install PREFIX=/usr DESTDIR="$pkgdir" COMPONENT_TYPE="lib-static"
diff --git a/community/r8168-lts/PKGBUILD b/community/r8168-lts/PKGBUILD
index cb5c70e38..c34f660cc 100644
--- a/community/r8168-lts/PKGBUILD
+++ b/community/r8168-lts/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 70815 2012-05-17 08:00:37Z mtorromeo $
+# $Id: PKGBUILD 70870 2012-05-18 08:29:14Z mtorromeo $
# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
pkgname=r8168-lts
_pkgname=r8168
pkgver=8.030.00
-pkgrel=1
-pkgdesc="A kernel module for Realtek 8168 network cards for kernel26-lts"
+pkgrel=2
+pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts"
url="http://www.realtek.com.tw"
license=("GPL")
arch=('i686' 'x86_64')
diff --git a/community/snort/PKGBUILD b/community/snort/PKGBUILD
index e64dfe966..23495b212 100644
--- a/community/snort/PKGBUILD
+++ b/community/snort/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69276 2012-04-11 23:23:45Z lfleischer $
+# $Id: PKGBUILD 70868 2012-05-18 06:19:27Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Hugo Doria <hugo@archlinux.org>
# Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
@@ -6,7 +6,7 @@
# Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
pkgname=snort
-pkgver=2.9.2.2
+pkgver=2.9.2.3
pkgrel=1
pkgdesc='A lightweight network intrusion detection system.'
arch=('i686' 'x86_64')
@@ -24,7 +24,7 @@ install='snort.install'
source=("http://www.snort.org/dl/snort-current/${pkgname}-${pkgver}.tar.gz"
'snort'
'snort.conf.d')
-md5sums=('4254389550e3be31afebc70e64e6002f'
+md5sums=('9ddb26005d864577fca66a9a1cdfdc8a'
'361b8b9e40b9af0164f6b3e3da2e8277'
'b4fb8a68490589cd34df93de7609bfac')
diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD
index 7b4254d11..1d2f48306 100644
--- a/community/sslh/PKGBUILD
+++ b/community/sslh/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70458 2012-05-08 13:27:24Z seblu $
+# $Id: PKGBUILD 70896 2012-05-18 22:00:49Z 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.12
+pkgver=1.13b
pkgrel=1
pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
arch=('i686' 'x86_64')
@@ -14,38 +14,37 @@ depends=('libconfig')
backup=('etc/conf.d/sslh' 'etc/sslh.conf')
source=("http://www.rutschle.net/tech/$pkgname-$pkgver.tar.gz"
'sslh.rc'
- 'sslh.conf'
- 'sslh.service')
-md5sums=('265014ecdae4512eacca91aaff0b9a81'
- 'e1c44f8160b7fef397f81db63eec8421'
- 'c51c63d2b28080bae4c1c7a0c469bab7'
- 'ee8a4fcfc1f6839f7c93deb6f59f7fd6')
+ 'sslh.conf')
+md5sums=('fbd8934e6f799437c562866f09afee5b'
+ 'c2a0c7c58d091acf5b4672f58066ee8f'
+ 'c51c63d2b28080bae4c1c7a0c469bab7')
build() {
- cd $pkgname-$pkgver
+ #cd $pkgname-$pkgver
+ cd $pkgname-1.13
# fix archlinux path in manpage
sed -i 's/init.d/rc.d/' sslh.pod
sed -i 's+/etc/default+/etc/conf.d+' sslh.pod
- # remove default pidfile in example
- sed -i '/pidfile:/d' example.cfg
- # daemon mode by default (as not overridable in command line)
- sed -i 's/foreground: true;/foreground: false;/' example.cfg
- make
+ make VERSION=\"v$pkgver\"
}
package() {
# install initscripts
install -Dm 755 sslh.rc "$pkgdir/etc/rc.d/sslh"
install -Dm 644 sslh.conf "$pkgdir/etc/conf.d/sslh"
- # install systemd service
- install -Dm 644 sslh.service "$pkgdir/usr/lib/systemd/system/sslh.service"
# manually install to have both ssl-fork and ssl-select
- cd $pkgname-$pkgver
+ #cd $pkgname-$pkgver
+ cd $pkgname-1.13
install -Dm 0755 sslh-fork "$pkgdir/usr/bin/sslh-fork"
install -Dm 0755 sslh-select "$pkgdir/usr/bin/sslh-select"
ln -s sslh-fork "$pkgdir/usr/bin/sslh"
+ # install manpage
install -Dm 0644 sslh.8.gz "$pkgdir/usr/share/man/man8/sslh.8.gz"
+ # install example file
install -Dm 0644 example.cfg "$pkgdir/etc/sslh.conf"
+ # install systemd service
+ install -Dm 644 scripts/systemd.sslh.service \
+ "$pkgdir/usr/lib/systemd/system/sslh.service"
}
# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/sslh/sslh.rc b/community/sslh/sslh.rc
index cd5397cad..456e122f4 100644
--- a/community/sslh/sslh.rc
+++ b/community/sslh/sslh.rc
@@ -6,6 +6,7 @@
DAEMON=/usr/bin/sslh
PID=$(pidof -o %PPID $DAEMON)
+DAEMON_OPTS="--background $DAEMON_OPTS"
case "$1" in
start)
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD
index 82b034a36..d270ca783 100644
--- a/core/mdadm/PKGBUILD
+++ b/core/mdadm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 158626 2012-05-05 03:23:11Z dreisner $
+# $Id: PKGBUILD 159240 2012-05-18 16:47:23Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=mdadm
-pkgver=3.2.3
-pkgrel=3
+pkgver=3.2.4
+pkgrel=1
pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
arch=(i686 x86_64)
license=('GPL')
@@ -18,8 +18,17 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
mdadm_install
mdadm_hook
mdadm_udev_install
+ mdadm.service
disable-werror.patch)
replaces=('raidtools')
+md5sums=('c25007b981e0f5362eacdad385ff0e15'
+ '8333d405f550317c2bacd5510bf1cb60'
+ '00cbed931db4f15b6ce49e3e7d433966'
+ '9b01e96b6c3c218fb61628c9281fe688'
+ 'fbb5542d9bdf87441a11dd7e7a0a17f8'
+ '2318b99701dba9b01a6891c62be7bc1c'
+ 'aafb5f9ac8437a284cbf948b9b13b179'
+ '4ad87b74a4bc9a34621280abe0e0c3e4')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -44,11 +53,6 @@ package() {
# move /lib/* to /usr/lib/
mv $pkgdir/lib/udev $pkgdir/usr/lib/
rm -rf $pkgdir/lib
+ # systemd service file
+ install -D -m644 $srcdir/mdadm.service $pkgdir/usr/lib/systemd/system/mdadm.service
}
-md5sums=('d789d6ecb9c1d5ebcc64f0fc52bca92f'
- '8333d405f550317c2bacd5510bf1cb60'
- '00cbed931db4f15b6ce49e3e7d433966'
- '9b01e96b6c3c218fb61628c9281fe688'
- 'fbb5542d9bdf87441a11dd7e7a0a17f8'
- '2318b99701dba9b01a6891c62be7bc1c'
- '4ad87b74a4bc9a34621280abe0e0c3e4')
diff --git a/core/mdadm/mdadm.service b/core/mdadm/mdadm.service
new file mode 100644
index 000000000..8389715e8
--- /dev/null
+++ b/core/mdadm/mdadm.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=MDADM Event Monitor
+
+[Service]
+ExecStart=/sbin/mdadm --monitor --scan
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD
index f8cb321f1..bf2ec3550 100644
--- a/core/xinetd/PKGBUILD
+++ b/core/xinetd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 142541 2011-11-11 21:16:44Z tpowa $
+# $Id: PKGBUILD 159242 2012-05-18 16:47:27Z tpowa $
# Maintainer:
# Contributor: Judd <jvinet@zeroflux.org>
pkgname=xinetd
-pkgver=2.3.14
-pkgrel=8
+pkgver=2.3.15
+pkgrel=1
pkgdesc="A secure replacement for inetd"
arch=('i686' 'x86_64')
url="http://www.xinetd.org/"
@@ -15,12 +15,14 @@ source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz
xinetd.conf
xinetd
servers
- services)
-md5sums=('567382d7972613090215c6c54f9b82d9'
+ services
+ xinetd.service)
+md5sums=('77358478fd58efa6366accae99b8b04c'
'f109f699a07bc8cfb5791060f5e87f9e'
'ea37a2794f202e6b953d9b6956dad16a'
'21f47b4aa20921cfaddddd9f9a407f81'
- '9fa2061dc7dd738c8424251deb86f81e')
+ '9fa2061dc7dd738c8424251deb86f81e'
+ '4473d8b2b6c984626d9f73a0b89711ee')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -38,6 +40,8 @@ package() {
install -Dm644 $srcdir/servers $pkgdir/etc/xinetd.d/servers
install -Dm644 $srcdir/services $pkgdir/etc/xinetd.d/services
+ # install systemd files
+ install -Dm644 $srcdir/xinetd.service $pkgdir/usr/lib/systemd/system/xinetd.service
# install license
install -Dm644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT
}
diff --git a/core/xinetd/xinetd.service b/core/xinetd/xinetd.service
new file mode 100644
index 000000000..ac80139e2
--- /dev/null
+++ b/core/xinetd/xinetd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=A secure replacement for inetd
+After=network.service
+
+[Service]
+ExecStart=/usr/sbin/xinetd -dontfork
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD
index 15f28a62b..a84ad10f0 100644
--- a/extra/eclipse/PKGBUILD
+++ b/extra/eclipse/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151734 2012-03-01 20:07:28Z ibiru $
+# $Id: PKGBUILD 159243 2012-05-18 17:00:08Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Paul Mattal <paul@archlinux.org>
# Contributor: Andrew Wright <andreww@photism.org>
@@ -7,12 +7,12 @@
pkgname=eclipse
pkgver=3.7.2
-pkgrel=2
+pkgrel=3
_date=201202080800
pkgdesc="An IDE for Java and other languages"
arch=('i686' 'x86_64')
url="http://eclipse.org"
-depends=('java-environment' 'gtk2' 'unzip' 'libwebkit')
+depends=('java-environment' 'gtk2' 'unzip' 'libwebkit' 'libxtst')
install=${pkgname}.install
makedepends=('zip')
conflicts=('xulrunner')
diff --git a/extra/eclipse/eclipse.install b/extra/eclipse/eclipse.install
index c3485476c..a2930a4ff 100644
--- a/extra/eclipse/eclipse.install
+++ b/extra/eclipse/eclipse.install
@@ -3,9 +3,9 @@ post_install() {
}
post_upgrade() {
- post_install $1
+ post_install
}
post_remove() {
- post-install $1
+ post_install
}
diff --git a/extra/glib-perl/PKGBUILD b/extra/glib-perl/PKGBUILD
index a0dd232fc..c94632d8a 100644
--- a/extra/glib-perl/PKGBUILD
+++ b/extra/glib-perl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 143682 2011-11-28 11:19:06Z jgc $
+# $Id: PKGBUILD 159216 2012-05-18 10:00:28Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Sarah Hay <sarah@archlinux.org>
pkgname=glib-perl
-pkgver=1.241
+pkgver=1.242
pkgrel=1
pkgdesc="Perl wrappers for glib 2.x, including GObject"
arch=(i686 x86_64)
@@ -13,7 +13,7 @@ options=('!emptydirs')
depends=('glib2>=2.24.1' 'perl>=5.14')
makedepends=('perl-extutils-depends>=0.302' 'perl-extutils-pkgconfig>=1.12')
source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz)
-md5sums=('412118238a372041b130c27d7992f5c3')
+md5sums=('59c176888e8ef8139c4e1b8c2d45f1d0')
build() {
cd "${srcdir}/Glib-${pkgver}"
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index 3469310ad..7e166f46a 100644
--- a/extra/icu/PKGBUILD
+++ b/extra/icu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156886 2012-04-23 09:08:21Z ibiru $
+# $Id: PKGBUILD 159211 2012-05-18 09:16:01Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Art Gramlich <art@gramlich-net.com>
pkgname=icu
pkgver=49.1.1
-pkgrel=1
+pkgrel=2
pkgdesc="International Components for Unicode library"
arch=(i686 x86_64)
url="http://www.icu-project.org/"
@@ -12,14 +12,18 @@ license=('custom:"icu"')
depends=('gcc-libs' 'sh')
source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz
http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz
- icu.8198.revert.icu5431.patch)
+ icu.8198.revert.icu5431.patch
+ fix_broken_regex.diff)
md5sums=('7c53f83e0327343f4060c0eb83842daf'
- 'ebd5470fc969c75e52baf4af94a9ee82')
+ 'ebd5470fc969c75e52baf4af94a9ee82'
+ '5bbcd600fdf9b35cbd89a06cab522f3f')
build() {
cd ${srcdir}/icu/source
# fix Malayalam encoding https://bugzilla.redhat.com/show_bug.cgi?id=654200
patch -Rp3 -i ${srcdir}/icu.8198.revert.icu5431.patch
+ # patch broken regex - https://bugs.archlinux.org/task/29700 / http://bugs.icu-project.org/trac/ticket/9276
+ patch -Np0 -i ${srcdir}/fix_broken_regex.diff
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man
diff --git a/extra/icu/fix_broken_regex.diff b/extra/icu/fix_broken_regex.diff
new file mode 100644
index 000000000..8161a1107
--- /dev/null
+++ b/extra/icu/fix_broken_regex.diff
@@ -0,0 +1,35 @@
+--- i18n/regexcmp.cpp
++++ i18n/regexcmp.cpp
+@@ -3307,8 +3307,29 @@
+
+ case URX_STRING_I:
+- // TODO: Is the case-folded string the longest?
+- // If so we can optimize this the same as URX_STRING.
+- loc++;
+- currentLen = INT32_MAX;
++ // TODO: This code assumes that any user string that matches will be no longer
++ // than our compiled string, with case insensitive matching.
++ // Our compiled string has been case-folded already.
++ //
++ // Any matching user string will have no more code points than our
++ // compiled (folded) string. Folding may add code points, but
++ // not remove them.
++ //
++ // There is a potential problem if a supplemental code point
++ // case-folds to a BMP code point. In this case our compiled string
++ // could be shorter (in code units) than a matching user string.
++ //
++ // At this time (Unicode 6.1) there are no such characters, and this case
++ // is not being handled. A test, intltest regex/Bug9283, will fail if
++ // any problematic characters are added to Unicode.
++ //
++ // If this happens, we can make a set of the BMP chars that the
++ // troublesome supplementals fold to, scan our string, and bump the
++ // currentLen one extra for each that is found.
++ //
++ {
++ loc++;
++ int32_t stringLenOp = (int32_t)fRXPat->fCompiledPat->elementAti(loc);
++ currentLen = safeIncrement(currentLen, URX_VAL(stringLenOp));
++ }
+ break;
diff --git a/extra/libunistring/PKGBUILD b/extra/libunistring/PKGBUILD
new file mode 100644
index 000000000..5cbc2003a
--- /dev/null
+++ b/extra/libunistring/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Emmanuel 'guinness' Boudreault
+# Contributor: Patrick McCarty <pnorcks at gmail dot com>
+
+pkgname=libunistring
+pkgver=0.9.3
+pkgrel=5
+pkgdesc="Library for manipulating Unicode strings and C strings."
+url="http://www.gnu.org/software/libunistring/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('glibc')
+install=${pkgname}.install
+options=('!libtool')
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('db8eca3b64163abadf8c40e5cecc261f')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libunistring/libunistring.install b/extra/libunistring/libunistring.install
new file mode 100644
index 000000000..58dd2ef8e
--- /dev/null
+++ b/extra/libunistring/libunistring.install
@@ -0,0 +1,22 @@
+infodir=usr/share/info
+filelist=(libunistring.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/extra/mcpp/PKGBUILD b/extra/mcpp/PKGBUILD
index 04a0e6223..6ed62f1f8 100644
--- a/extra/mcpp/PKGBUILD
+++ b/extra/mcpp/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 137665 2011-09-10 11:18:34Z pierre $
+# $Id: PKGBUILD 159222 2012-05-18 11:58:32Z jgc $
# Maintainer: Alexander Baldeck <alexander@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=mcpp
pkgver=2.7.2
-pkgrel=3
+pkgrel=4
pkgdesc="Matsui's CPP implementation precisely conformed to standards"
arch=('i686' 'x86_64')
license=('custom')
url="http://mcpp.sourceforge.net"
depends=('glibc')
options=('!libtool')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'namlen.patch')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+ namlen.patch
+ fs28284.patch)
md5sums=('512de48c87ab023a69250edc7a0c7b05'
- '0bfc6177a58e912a9e23e368578dd3fe')
+ '0bfc6177a58e912a9e23e368578dd3fe'
+ 'ba668fc6996e538f2e0c096f9eb282ce')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/namlen.patch"
+ patch -Np1 -i "${srcdir}/fs28284.patch"
./configure --prefix=/usr --enable-mcpplib --disable-static
make
}
diff --git a/extra/mcpp/fs28284.patch b/extra/mcpp/fs28284.patch
new file mode 100644
index 000000000..960203cf4
--- /dev/null
+++ b/extra/mcpp/fs28284.patch
@@ -0,0 +1,100 @@
+diff -c -r -N ../mcpp-2.7.2/src/internal.H ./src/internal.H
+*** ../mcpp-2.7.2/src/internal.H 2008-08-27 10:31:16.000000000 -0230
+--- ./src/internal.H 2009-12-17 21:01:35.000000000 -0330
+***************
+*** 390,395 ****
+--- 390,397 ----
+ extern char identifier[]; /* Lastly scanned name */
+ extern IFINFO ifstack[]; /* Information of #if nesting */
+ extern char work_buf[];
++ extern FILEINFO * sh_file;
++ extern int sh_line;
+ /* Temporary buffer for directive line and macro expansion */
+
+ /* main.c */
+***************
+*** 557,562 ****
+ #endif
+ #endif
+
+! #if HOST_HAVE_STPCPY
+ extern char * stpcpy( char * dest, const char * src);
+ #endif
+--- 559,564 ----
+ #endif
+ #endif
+
+! #if HOST_HAVE_STPCPY && !defined(stpcpy)
+ extern char * stpcpy( char * dest, const char * src);
+ #endif
+diff -c -r -N ../mcpp-2.7.2/src/main.c ./src/main.c
+*** ../mcpp-2.7.2/src/main.c 2008-11-05 05:04:46.000000000 -0330
+--- ./src/main.c 2009-12-17 20:42:42.000000000 -0330
+***************
+*** 326,331 ****
+--- 326,333 ----
+ = FALSE;
+ option_flags.trig = TRIGRAPHS_INIT;
+ option_flags.dig = DIGRAPHS_INIT;
++ sh_file = NULL;
++ sh_line = 0;
+ }
+
+ int mcpp_lib_main
+diff -c -r -N ../mcpp-2.7.2/src/support.c ./src/support.c
+*** ../mcpp-2.7.2/src/support.c 2008-06-10 06:02:33.000000000 -0230
+--- ./src/support.c 2009-12-17 20:42:39.000000000 -0330
+***************
+*** 188,194 ****
+ size_t length
+ )
+ {
+! if (mem_buf_p->bytes_avail < length) { /* Need to allocate more memory */
+ size_t size = MAX( BUF_INCR_SIZE, length);
+
+ if (mem_buf_p->buffer == NULL) { /* 1st append */
+--- 188,194 ----
+ size_t length
+ )
+ {
+! if (mem_buf_p->bytes_avail < length + 1) { /* Need to allocate more memory */
+ size_t size = MAX( BUF_INCR_SIZE, length);
+
+ if (mem_buf_p->buffer == NULL) { /* 1st append */
+***************
+*** 1722,1727 ****
+--- 1722,1729 ----
+ sp -= 2;
+ while (*sp != '\n') /* Until end of line */
+ mcpp_fputc( *sp++, OUT);
++ mcpp_fputc( '\n', OUT);
++ wrong_line = TRUE;
+ }
+ goto end_line;
+ default: /* Not a comment */
+diff -c -r -N ../mcpp-2.7.2/src/system.c ./src/system.c
+*** ../mcpp-2.7.2/src/system.c 2008-11-26 06:23:51.000000000 -0330
+--- ./src/system.c 2009-12-17 20:42:42.000000000 -0330
+***************
+*** 3858,3863 ****
+--- 3858,3866 ----
+ }
+ #endif
+
++ FILEINFO* sh_file;
++ int sh_line;
++
+ void sharp(
+ FILEINFO * sharp_file,
+ int flag /* Flag to append to the line for GCC */
+***************
+*** 3868,3875 ****
+ * else (i.e. 'sharp_file' is NULL) 'infile'.
+ */
+ {
+- static FILEINFO * sh_file;
+- static int sh_line;
+ FILEINFO * file;
+ int line;
+
+--- 3871,3876 ----
diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD
index f8cf3e311..e1d2a0f85 100644
--- a/extra/rosegarden/PKGBUILD
+++ b/extra/rosegarden/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 142547 2011-11-11 23:39:40Z schiv $
+# $Id: PKGBUILD 159220 2012-05-18 11:33:18Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: damir <damir@archlinux.org>
# Contributor: Robert Emil Berge <robert@rebi.no>
pkgname=rosegarden
-pkgver=11.11
+pkgver=12.04
pkgrel=1
pkgdesc="MIDI/audio sequencer and notation editor"
arch=('i686' 'x86_64')
@@ -23,7 +23,7 @@ optdepends=('lilypond: notation display'
[ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support')
install=$pkgname.install
source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('1db7bb5289f08e634e2f1207ae163ad7')
+md5sums=('b11f4fcad69df45365d2125181524559')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD
index 341982471..a6d670028 100644
--- a/extra/xf86-video-ati/PKGBUILD
+++ b/extra/xf86-video-ati/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 158858 2012-05-12 13:09:32Z andyrtr $
+# $Id: PKGBUILD 159235 2012-05-18 15:27:54Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=xf86-video-ati
-pkgver=6.14.4
-pkgrel=4
+pkgver=6.14.99
+_gitdate=20120517
+pkgrel=0.${_gitdate}
pkgdesc="X.org ati video driver"
arch=('i686' 'x86_64')
url="http://xorg.freedesktop.org/"
@@ -14,7 +15,8 @@ makedepends=('xorg-server-devel>=1.11.99.902' 'xf86driproto' 'mesa' 'glproto')
conflicts=('xorg-server<1.11.99.902')
groups=('xorg-drivers' 'xorg')
options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+source=(#${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ ${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2::http://cgit.freedesktop.org/xorg/driver/xf86-video-ati/snapshot/xf86-video-ati-3fb694b308ebadd1b849836059b6b56bb19385f7.tar.gz
git_fixes.diff
0000-poor-man-s-solid-picture-support-for-r300-r600.patch
0001-poor-man-s-solid-picture-support-for-evergreen.patch
@@ -26,24 +28,33 @@ sha1sums=('75ad000bc00599e1797134f2d20d3094cba6af92'
'69359a6623fe0f2214790c8ad40cac1a680a3825'
'c0709ab82728e34838a8aeead7d1b79b7faf09bd'
'77a519e250c27a9fb94eeb52da655eed7c5f2eca')
+sha1sums=('80c12b88e193354af204b13689b2fae922922c6c'
+ '8b774e2f0310075cff2b7d874b0bed38d6245769'
+ '787f88c428f56ca6e96ba5eaf043a30bddfd0e23'
+ '69359a6623fe0f2214790c8ad40cac1a680a3825'
+ 'c0709ab82728e34838a8aeead7d1b79b7faf09bd'
+ '77a519e250c27a9fb94eeb52da655eed7c5f2eca')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ${srcdir}/git_fixes.diff
+ #cd ${srcdir}/${pkgname}-${pkgver}
+ cd ${srcdir}/${pkgname}*
+ #patch -Np1 -i ${srcdir}/git_fixes.diff
# fix rendering issues with recent cairo - testing attemp taken from https://bugs.freedesktop.org/show_bug.cgi?id=47266
# and http://lists.x.org/archives/xorg-driver-ati/2012-April/022724.html
- patch -Np1 -i ${srcdir}/0000-poor-man-s-solid-picture-support-for-r300-r600.patch
- patch -Np1 -i ${srcdir}/0001-poor-man-s-solid-picture-support-for-evergreen.patch
- patch -Np1 -i ${srcdir}/0002-poor-man-s-solid-picture-support-for-r100.patch
- patch -Np1 -i ${srcdir}/0003-poor-man-s-solid-picture-support-for-r200.patch
+# patch -Np1 -i ${srcdir}/0000-poor-man-s-solid-picture-support-for-r300-r600.patch
+# patch -Np1 -i ${srcdir}/0001-poor-man-s-solid-picture-support-for-evergreen.patch
+# patch -Np1 -i ${srcdir}/0002-poor-man-s-solid-picture-support-for-r100.patch
+# patch -Np1 -i ${srcdir}/0003-poor-man-s-solid-picture-support-for-r200.patch
- ./configure --prefix=/usr --enable-dri
+ ./autogen.sh --prefix=/usr --enable-dri
+# ./configure --prefix=/usr --enable-dri
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ #cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${srcdir}/${pkgname}*
make "DESTDIR=${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 0ab1942fa..27d16ef44 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158860 2012-05-12 13:09:37Z andyrtr $
+# $Id: PKGBUILD 159237 2012-05-18 15:27:59Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=xorg-server
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.12.1
-pkgrel=2
+pkgver=1.12.1.901
+pkgrel=3
arch=('i686' 'x86_64')
license=('custom')
url="http://xorg.freedesktop.org"
@@ -17,14 +17,15 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
autoconfig-nvidia.patch
autoconfig-sis.patch
EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
- #git-fixes.patch
+ git-fixes.patch
xvfb-run
xvfb-run.1
10-quirks.conf)
-sha1sums=('922b963901f4711449b53fb32ce3e14f5b642766'
+sha1sums=('bb9985bae271aa896de7fa12e49a0dbd8e244d2c'
'63836e5cfb4ae7353fb2e31239a544409c7ead32'
'175de5630b43dbc97778adfba5563b7fdd77f11f'
'4acb39587f73bcbb9a331377d6ef99cb73eb95a8'
+ '526cbffbc742dc3449065e3501d290a607d80aa3'
'c94f742d3f9cabf958ae58e4015d9dd185aabedc'
'6838fc00ef4618c924a77e0fb03c05346080908a'
'993798f3d22ad672d769dae5f48d1fa068d5578f')
@@ -41,10 +42,10 @@ build() {
# fix glitches and crashes with EXA and cairo 1.12
# taken from https://bugs.freedesktop.org/show_bug.cgi?id=47266
# and reworked for 1.12.1 changes
- patch -Np1 -i ${srcdir}/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
+# patch -Np1 -i ${srcdir}/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
- # Add post-release patches from 1.11 branch
-# patch -Np1 -i "${srcdir}/git-fixes.patch"
+ # Add post-release patches from 1.12 branch
+ patch -Np1 -i ${srcdir}/git-fixes.patch
autoreconf -fi
./configure --prefix=/usr \
diff --git a/extra/xorg-server/git-fixes.patch b/extra/xorg-server/git-fixes.patch
index 27da61eca..f6ca2426b 100644
--- a/extra/xorg-server/git-fixes.patch
+++ b/extra/xorg-server/git-fixes.patch
@@ -1,161 +1,1717 @@
-From 89626304ea1ad316c5b7145a40f09377148cff21 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Thu, 20 Oct 2011 13:43:01 +0000
-Subject: xf86Crtc: handle no outputs with no modes harder.
+From b5bf0ac5405eab77f26bb2f8726644232af17178 Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp@keithp.com>
+Date: Wed, 11 Apr 2012 16:28:21 +0000
+Subject: hw/xfree86: Spurious ');' in xf86vmode.c messed up indentation badly
-If you started an X server with no connected outputs, we pick a default
-1024x768 mode, however if you then ran an xvidmode using app against that
-server it would segfault the server due to not finding any valid modes.
+Inside the unfinished XF86VIDMODE_EVENTS #ifdef block the
+function definition for xf86VidModeNotifyEvent had an extra ');'
+before the prototype argument declarations. This was harmless for the
+compiler as the code never gets used, but completely messed up the
+file re-indentation. This patch removes the spurious characters in
+preparation for re-indenting the file.
-This was due to the no output mode set code, only adding the modes to the
-scrn->modes once, when something called randr 1.2 xf86SetScrnInfoModes would
-get called and remove all the modes and we'd end up with 0.
-
-This change fixes xf86SetScrnInfoModes to always report a scrn mode of at
-least 1024x768, and pushes the initial configuration to just call it instead
-of setting up the mode itself.
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=746926
+Signed-off-by: Keith Packard <keithp@keithp.com>
+(cherry picked from commit 592bd0ae2b60cd6f6afd3efc40f5f659b12900b4)
+---
+diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
+index 6e2a8e9..9f64f8e 100644
+--- a/hw/xfree86/dixmods/extmod/xf86vmode.c
++++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
+@@ -75,7 +75,7 @@ static unsigned char XF86VidModeReqCode = 0;
+ #ifdef XF86VIDMODE_EVENTS
+ static int XF86VidModeEventBase = 0;
+
+-static void SXF86VidModeNotifyEvent();
++static void SXF86VidModeNotifyEvent(
+ xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent * /* to */
+ );
+
+--
+cgit v0.9.0.2-2-gbebe
+From 3ad72a80088fe3236f38bd0696b04f399e24fe3d Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp@keithp.com>
+Date: Wed, 11 Apr 2012 16:33:54 +0000
+Subject: hw/xfree86: Re-indent xf86vmode.c
-I've seen other bugs like this on other distros so it might also actually fix them.
+This is the result of re-running the 'x-indent.sh' script over
+xf86vmode.c to clean up the disaster caused by broken syntax in the
+file.
-Signed-off-by: Dave Airlie <airlied@redhat.com>
-Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
-(cherry picked from commit 17416e88dcfcc584fe5f87580d5d2b719b3521c3)
+(cherry picked from commit 9779b904c7c0b49c74054c22c420012c40595cdc)
---
-diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index d75cd77..8906806 100644
---- a/hw/xfree86/modes/xf86Crtc.c
-+++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -1915,19 +1915,25 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn)
- break;
+diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
+index 9f64f8e..68c4b58 100644
+--- a/hw/xfree86/dixmods/extmod/xf86vmode.c
++++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
+@@ -75,8 +75,7 @@ static unsigned char XF86VidModeReqCode = 0;
+ #ifdef XF86VIDMODE_EVENTS
+ static int XF86VidModeEventBase = 0;
+
+-static void SXF86VidModeNotifyEvent(
+-xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent * /* to */
++static void SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * /* from */ , xXF86VidModeNotifyEvent * /* to */
+ );
+
+ static RESTYPE EventType; /* resource type for event masks */
+@@ -117,20 +116,22 @@ static DevPrivateKeyRec ScreenPrivateKeyRec;
+ #define DEBUG_P(x) /**/
+ #endif
+ static int
+- ClientMajorVersion(ClientPtr client) {
++ClientMajorVersion(ClientPtr client)
++{
+ VidModePrivPtr pPriv;
+
+- pPriv = VM_GETPRIV(client);
++ pPriv = VM_GETPRIV(client);
+ if (!pPriv)
+- return 0;
++ return 0;
+ else
+- return pPriv->major;
++ return pPriv->major;
+ }
++
+ #ifdef XF86VIDMODE_EVENTS
+ static void
+- CheckScreenPrivate(pScreen)
++CheckScreenPrivate(pScreen)
+ ScreenPtr
+- pScreen;
++ pScreen;
+ {
+ SetupScreen(pScreen);
+
+@@ -142,9 +143,10 @@ ScreenPtr
+ }
+ }
+
+-static XF86VidModeScreenPrivatePtr MakeScreenPrivate(pScreen)
++static XF86VidModeScreenPrivatePtr
++MakeScreenPrivate(pScreen)
+ ScreenPtr
+- pScreen;
++ pScreen;
+ {
+ SetupScreen(pScreen);
+
+@@ -160,18 +162,22 @@ ScreenPtr
+ }
+
+ static unsigned long
+- getEventMask(ScreenPtr pScreen, ClientPtr client) {
++getEventMask(ScreenPtr pScreen, ClientPtr client)
++{
+ SetupScreen(pScreen);
+ XF86VidModeEventPtr pEv;
+
+ if (!pPriv)
+- return 0;
++ return 0;
+ for (pEv = pPriv->events; pEv; pEv = pEv->next)
+ if (pEv->client == client)
+ return pEv->mask;
+- return 0;
+-} static Bool
+- setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask) {
++ return 0;
++}
++
++static Bool
++setEventMask(ScreenPtr pScreen, ClientPtr client, unsigned long mask)
++{
+ SetupScreen(pScreen);
+ XF86VidModeEventPtr pEv, *pPrev;
+
+@@ -181,7 +187,8 @@ static unsigned long
+ pPriv = MakeScreenPrivate(pScreen);
+ if (!pPriv)
+ return FALSE;
+- } for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next)
++ }
++ for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next)
+ if (pEv->client == client)
+ break;
+ if (mask == 0) {
+@@ -208,38 +215,43 @@ static unsigned long
+ }
+
+ static int
+- XF86VidModeFreeEvents(pointer value, XID id) {
++XF86VidModeFreeEvents(pointer value, XID id)
++{
+ XF86VidModeEventPtr pOld = (XF86VidModeEventPtr) value;
+ ScreenPtr pScreen = pOld->screen;
+- SetupScreen(pScreen);
++
++ SetupScreen(pScreen);
+ XF86VidModeEventPtr pEv, *pPrev;
+
+ if (!pPriv)
+- return TRUE;
++ return TRUE;
+ for (pPrev = &pPriv->events; pEv = *pPrev; pPrev = &pEv->next)
+ if (pEv == pOld)
+ break;
+ if (!pEv)
+- return TRUE;
++ return TRUE;
+ *pPrev = pEv->next;
+- free(pEv);
+- CheckScreenPrivate(pScreen);
+- return TRUE;
+-} static void
+- SendXF86VidModeNotify(ScreenPtr pScreen, int state, Bool forced) {
++ free(pEv);
++ CheckScreenPrivate(pScreen);
++ return TRUE;
++}
++
++static void
++SendXF86VidModeNotify(ScreenPtr pScreen, int state, Bool forced)
++{
+ XF86VidModeScreenPrivatePtr pPriv;
+ XF86VidModeEventPtr pEv;
+ unsigned long mask;
+ xXF86VidModeNotifyEvent ev;
+ int kind;
+
+- UpdateCurrentTimeIf();
+- mask = XF86VidModeNotifyMask;
+- pScreen = screenInfo.screens[pScreen->myNum];
+- pPriv = GetScreenPrivate(pScreen);
++ UpdateCurrentTimeIf();
++ mask = XF86VidModeNotifyMask;
++ pScreen = screenInfo.screens[pScreen->myNum];
++ pPriv = GetScreenPrivate(pScreen);
+ if (!pPriv)
+- return;
+- kind = XF86VidModeModeChange;
++ return;
++ kind = XF86VidModeModeChange;
+ for (pEv = pPriv->events; pEv; pEv = pEv->next) {
+ if (!(pEv->mask & mask))
+ continue;
+@@ -251,8 +263,10 @@ static int
+ ev.forced = forced;
+ WriteEventsToClient(pEv->client, 1, (xEvent *) &ev);
+ }} static void
+- SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * from,
+- xXF86VidModeNotifyEvent * to) {
++
++SXF86VidModeNotifyEvent(xXF86VidModeNotifyEvent * from,
++ xXF86VidModeNotifyEvent * to)
++{
+ to->type = from->type;
+ to->state = from->state;
+ cpswaps(from->sequenceNumber, to->sequenceNumber);
+@@ -264,29 +278,31 @@ static int
+ #endif
+
+ static int
+- ProcXF86VidModeQueryVersion(ClientPtr client) {
++ProcXF86VidModeQueryVersion(ClientPtr client)
++{
+ xXF86VidModeQueryVersionReply rep;
+
+- DEBUG_P("XF86VidModeQueryVersion");
++ DEBUG_P("XF86VidModeQueryVersion");
+
+- REQUEST_SIZE_MATCH(xXF86VidModeQueryVersionReq);
+- rep.type = X_Reply;
+- rep.length = 0;
+- rep.sequenceNumber = client->sequence;
+- rep.majorVersion = SERVER_XF86VIDMODE_MAJOR_VERSION;
+- rep.minorVersion = SERVER_XF86VIDMODE_MINOR_VERSION;
++ REQUEST_SIZE_MATCH(xXF86VidModeQueryVersionReq);
++ rep.type = X_Reply;
++ rep.length = 0;
++ rep.sequenceNumber = client->sequence;
++ rep.majorVersion = SERVER_XF86VIDMODE_MAJOR_VERSION;
++ rep.minorVersion = SERVER_XF86VIDMODE_MINOR_VERSION;
+ if (client->swapped) {
+ swaps(&rep.sequenceNumber);
+ swapl(&rep.length);
+ swaps(&rep.majorVersion);
+ swaps(&rep.minorVersion);
+- } WriteToClient(client, sizeof(xXF86VidModeQueryVersionReply),
+- (char *) &rep);
++ }
++ WriteToClient(client, sizeof(xXF86VidModeQueryVersionReply), (char *) &rep);
+ return Success;
+ }
+
+ static int
+- ProcXF86VidModeGetModeLine(ClientPtr client) {
++ProcXF86VidModeGetModeLine(ClientPtr client)
++{
+ REQUEST(xXF86VidModeGetModeLineReq);
+ xXF86VidModeGetModeLineReply rep;
+ xXF86OldVidModeGetModeLineReply oldrep;
+@@ -294,11 +310,11 @@ static int
+ int dotClock;
+ int ver;
+
+- DEBUG_P("XF86VidModeGetModeline");
++ DEBUG_P("XF86VidModeGetModeline");
+
+- ver = ClientMajorVersion(client);
+- REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq);
+- rep.type = X_Reply;
++ ver = ClientMajorVersion(client);
++ REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq);
++ rep.type = X_Reply;
+ if (ver < 2) {
+ rep.length = bytes_to_int32(SIZEOF(xXF86OldVidModeGetModeLineReply) -
+ SIZEOF(xGenericReply));
+@@ -386,7 +402,8 @@ static int
+ }
+
+ static int
+- ProcXF86VidModeGetAllModeLines(ClientPtr client) {
++ProcXF86VidModeGetAllModeLines(ClientPtr client)
++{
+ REQUEST(xXF86VidModeGetAllModeLinesReq);
+ xXF86VidModeGetAllModeLinesReply rep;
+ xXF86VidModeModeInfo mdinf;
+@@ -395,38 +412,39 @@ static int
+ int modecount, dotClock;
+ int ver;
+
+- DEBUG_P("XF86VidModeGetAllModelines");
++ DEBUG_P("XF86VidModeGetAllModelines");
+
+- REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq);
++ REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq);
+
+ if (stuff->screen >= screenInfo.numScreens)
+- return BadValue;
++ return BadValue;
+
+- ver = ClientMajorVersion(client);
++ ver = ClientMajorVersion(client);
+
+- modecount = VidModeGetNumOfModes(stuff->screen);
++ modecount = VidModeGetNumOfModes(stuff->screen);
+ if (modecount < 1)
+- return VidModeErrorBase + XF86VidModeExtensionDisabled;
++ return VidModeErrorBase + XF86VidModeExtensionDisabled;
+
+ if (!VidModeGetFirstModeline(stuff->screen, &mode, &dotClock))
+- return BadValue;
++ return BadValue;
+
+- rep.type = X_Reply;
+- rep.length = SIZEOF(xXF86VidModeGetAllModeLinesReply) -
++ rep.type = X_Reply;
++ rep.length = SIZEOF(xXF86VidModeGetAllModeLinesReply) -
+ SIZEOF(xGenericReply);
+ if (ver < 2)
+- rep.length += modecount * sizeof(xXF86OldVidModeModeInfo);
++ rep.length += modecount * sizeof(xXF86OldVidModeModeInfo);
+ else
+- rep.length += modecount * sizeof(xXF86VidModeModeInfo);
+- rep.length >>= 2;
+- rep.sequenceNumber = client->sequence;
+- rep.modecount = modecount;
++ rep.length += modecount * sizeof(xXF86VidModeModeInfo);
++ rep.length >>= 2;
++ rep.sequenceNumber = client->sequence;
++ rep.modecount = modecount;
+ if (client->swapped) {
+ swaps(&rep.sequenceNumber);
+ swapl(&rep.length);
+ swapl(&rep.modecount);
+- } WriteToClient(client, sizeof(xXF86VidModeGetAllModeLinesReply),
+- (char *) &rep);
++ }
++ WriteToClient(client, sizeof(xXF86VidModeGetAllModeLinesReply),
++ (char *) &rep);
+
+ do {
+ mdinf.dotclock = dotClock;
+@@ -492,7 +510,8 @@ static int
+ && VidModeGetModeValue(mode, VIDMODE_FLAGS) == stuff->flags )
+
+ static int
+- ProcXF86VidModeAddModeLine(ClientPtr client) {
++ProcXF86VidModeAddModeLine(ClientPtr client)
++{
+ REQUEST(xXF86VidModeAddModeLineReq);
+ xXF86OldVidModeAddModeLineReq *oldstuff =
+ (xXF86OldVidModeAddModeLineReq *) client->requestBuffer;
+@@ -502,9 +521,9 @@ static int
+ int dotClock;
+ int ver;
+
+- DEBUG_P("XF86VidModeAddModeline");
++ DEBUG_P("XF86VidModeAddModeline");
+
+- ver = ClientMajorVersion(client);
++ ver = ClientMajorVersion(client);
+ if (ver < 2) {
+ /* convert from old format */
+ stuff = &newstuff;
+@@ -533,7 +552,8 @@ static int
+ stuff->after_vsyncend = oldstuff->after_vsyncend;
+ stuff->after_vtotal = oldstuff->after_vtotal;
+ stuff->after_flags = oldstuff->after_flags;
+- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
++ }
++ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
+ ErrorF("AddModeLine - scrn: %d clock: %ld\n",
+ (int) stuff->screen, (unsigned long) stuff->dotclock);
+ ErrorF("AddModeLine - hdsp: %d hbeg: %d hend: %d httl: %d\n",
+@@ -654,7 +674,8 @@ static int
+ }
+
+ static int
+- ProcXF86VidModeDeleteModeLine(ClientPtr client) {
++ProcXF86VidModeDeleteModeLine(ClientPtr client)
++{
+ REQUEST(xXF86VidModeDeleteModeLineReq);
+ xXF86OldVidModeDeleteModeLineReq *oldstuff =
+ (xXF86OldVidModeDeleteModeLineReq *) client->requestBuffer;
+@@ -663,9 +684,9 @@ static int
+ int len, dotClock;
+ int ver;
+
+- DEBUG_P("XF86VidModeDeleteModeline");
++ DEBUG_P("XF86VidModeDeleteModeline");
+
+- ver = ClientMajorVersion(client);
++ ver = ClientMajorVersion(client);
+ if (ver < 2) {
+ /* convert from old format */
+ stuff = &newstuff;
+@@ -683,7 +704,8 @@ static int
+ stuff->vtotal = oldstuff->vtotal;
+ stuff->flags = oldstuff->flags;
+ stuff->privsize = oldstuff->privsize;
+- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
++ }
++ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
+ ErrorF("DeleteModeLine - scrn: %d clock: %ld\n",
+ (int) stuff->screen, (unsigned long) stuff->dotclock);
+ ErrorF(" hdsp: %d hbeg: %d hend: %d httl: %d\n",
+@@ -777,7 +799,8 @@ static int
+ }
+
+ static int
+- ProcXF86VidModeModModeLine(ClientPtr client) {
++ProcXF86VidModeModModeLine(ClientPtr client)
++{
+ REQUEST(xXF86VidModeModModeLineReq);
+ xXF86OldVidModeModModeLineReq *oldstuff =
+ (xXF86OldVidModeModModeLineReq *) client->requestBuffer;
+@@ -786,9 +809,9 @@ static int
+ int len, dotClock;
+ int ver;
+
+- DEBUG_P("XF86VidModeModModeline");
++ DEBUG_P("XF86VidModeModModeline");
+
+- ver = ClientMajorVersion(client);
++ ver = ClientMajorVersion(client);
+ if (ver < 2) {
+ /* convert from old format */
+ stuff = &newstuff;
+@@ -805,7 +828,8 @@ static int
+ stuff->vtotal = oldstuff->vtotal;
+ stuff->flags = oldstuff->flags;
+ stuff->privsize = oldstuff->privsize;
+- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
++ }
++ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
+ ErrorF("ModModeLine - scrn: %d hdsp: %d hbeg: %d hend: %d httl: %d\n",
+ (int) stuff->screen, stuff->hdisplay, stuff->hsyncstart,
+ stuff->hsyncend, stuff->htotal);
+@@ -903,7 +927,8 @@ static int
+ }
+
+ static int
+- ProcXF86VidModeValidateModeLine(ClientPtr client) {
++ProcXF86VidModeValidateModeLine(ClientPtr client)
++{
+ REQUEST(xXF86VidModeValidateModeLineReq);
+ xXF86OldVidModeValidateModeLineReq *oldstuff =
+ (xXF86OldVidModeValidateModeLineReq *) client->requestBuffer;
+@@ -913,9 +938,9 @@ static int
+ int len, status, dotClock;
+ int ver;
+
+- DEBUG_P("XF86VidModeValidateModeline");
++ DEBUG_P("XF86VidModeValidateModeline");
+
+- ver = ClientMajorVersion(client);
++ ver = ClientMajorVersion(client);
+ if (ver < 2) {
+ /* convert from old format */
+ stuff = &newstuff;
+@@ -933,7 +958,8 @@ static int
+ stuff->vtotal = oldstuff->vtotal;
+ stuff->flags = oldstuff->flags;
+ stuff->privsize = oldstuff->privsize;
+- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
++ }
++ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
+ ErrorF("ValidateModeLine - scrn: %d clock: %ld\n",
+ (int) stuff->screen, (unsigned long) stuff->dotclock);
+ ErrorF(" hdsp: %d hbeg: %d hend: %d httl: %d\n",
+@@ -1022,7 +1048,8 @@ static int
+ }
+
+ static int
+- ProcXF86VidModeSwitchMode(ClientPtr client) {
++ProcXF86VidModeSwitchMode(ClientPtr client)
++{
+ REQUEST(xXF86VidModeSwitchModeReq);
+
+ DEBUG_P("XF86VidModeSwitchMode");
+@@ -1035,8 +1062,11 @@ static int
+ VidModeZoomViewport(stuff->screen, (short) stuff->zoom);
+
+ return Success;
+-} static int
+- ProcXF86VidModeSwitchToMode(ClientPtr client) {
++}
++
++static int
++ProcXF86VidModeSwitchToMode(ClientPtr client)
++{
+ REQUEST(xXF86VidModeSwitchToModeReq);
+ xXF86OldVidModeSwitchToModeReq *oldstuff =
+ (xXF86OldVidModeSwitchToModeReq *) client->requestBuffer;
+@@ -1045,9 +1075,9 @@ static int
+ int len, dotClock;
+ int ver;
+
+- DEBUG_P("XF86VidModeSwitchToMode");
++ DEBUG_P("XF86VidModeSwitchToMode");
+
+- ver = ClientMajorVersion(client);
++ ver = ClientMajorVersion(client);
+ if (ver < 2) {
+ /* convert from old format */
+ stuff = &newstuff;
+@@ -1065,7 +1095,8 @@ static int
+ stuff->vtotal = oldstuff->vtotal;
+ stuff->flags = oldstuff->flags;
+ stuff->privsize = oldstuff->privsize;
+- } if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
++ }
++ if (xf86GetVerbosity() > DEFAULT_XF86VIDMODE_VERBOSITY) {
+ ErrorF("SwitchToMode - scrn: %d clock: %ld\n",
+ (int) stuff->screen, (unsigned long) stuff->dotclock);
+ ErrorF(" hdsp: %d hbeg: %d hend: %d httl: %d\n",
+@@ -1138,7 +1169,8 @@ static int
+ }
+
+ static int
+- ProcXF86VidModeLockModeSwitch(ClientPtr client) {
++ProcXF86VidModeLockModeSwitch(ClientPtr client)
++{
+ REQUEST(xXF86VidModeLockModeSwitchReq);
+
+ REQUEST_SIZE_MATCH(xXF86VidModeLockModeSwitchReq);
+@@ -1152,53 +1184,57 @@ static int
+ return VidModeErrorBase + XF86VidModeZoomLocked;
+
+ return Success;
+-} static int
+- ProcXF86VidModeGetMonitor(ClientPtr client) {
++}
++
++static int
++ProcXF86VidModeGetMonitor(ClientPtr client)
++{
+ REQUEST(xXF86VidModeGetMonitorReq);
+ xXF86VidModeGetMonitorReply rep;
+ CARD32 *hsyncdata, *vsyncdata;
+ int i, nHsync, nVrefresh;
+ pointer monitor;
+
+- DEBUG_P("XF86VidModeGetMonitor");
++ DEBUG_P("XF86VidModeGetMonitor");
+
+- REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq);
++ REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq);
+
+ if (stuff->screen >= screenInfo.numScreens)
+- return BadValue;
++ return BadValue;
+
+ if (!VidModeGetMonitor(stuff->screen, &monitor))
+- return BadValue;
++ return BadValue;
+
+- nHsync = VidModeGetMonitorValue(monitor, VIDMODE_MON_NHSYNC, 0).i;
+- nVrefresh = VidModeGetMonitorValue(monitor, VIDMODE_MON_NVREFRESH, 0).i;
++ nHsync = VidModeGetMonitorValue(monitor, VIDMODE_MON_NHSYNC, 0).i;
++ nVrefresh = VidModeGetMonitorValue(monitor, VIDMODE_MON_NVREFRESH, 0).i;
+
+- rep.type = X_Reply;
++ rep.type = X_Reply;
+ if ((char *) (VidModeGetMonitorValue(monitor, VIDMODE_MON_VENDOR, 0)).ptr)
+- rep.vendorLength = strlen((char *) (VidModeGetMonitorValue(monitor,
+- VIDMODE_MON_VENDOR,
+- 0)).ptr);
++ rep.vendorLength = strlen((char *) (VidModeGetMonitorValue(monitor,
++ VIDMODE_MON_VENDOR,
++ 0)).ptr);
+ else
+- rep.vendorLength = 0;
++ rep.vendorLength = 0;
+ if ((char *) (VidModeGetMonitorValue(monitor, VIDMODE_MON_MODEL, 0)).ptr)
+- rep.modelLength = strlen((char *) (VidModeGetMonitorValue(monitor,
+- VIDMODE_MON_MODEL,
+- 0)).ptr);
++ rep.modelLength = strlen((char *) (VidModeGetMonitorValue(monitor,
++ VIDMODE_MON_MODEL,
++ 0)).ptr);
+ else
+- rep.modelLength = 0;
+- rep.length =
++ rep.modelLength = 0;
++ rep.length =
+ bytes_to_int32(SIZEOF(xXF86VidModeGetMonitorReply) -
+ SIZEOF(xGenericReply) + (nHsync +
+ nVrefresh) * sizeof(CARD32) +
+ pad_to_int32(rep.vendorLength) +
+ pad_to_int32(rep.modelLength));
+- rep.sequenceNumber = client->sequence;
+- rep.nhsync = nHsync;
+- rep.nvsync = nVrefresh;
+- hsyncdata = malloc(nHsync * sizeof(CARD32));
++ rep.sequenceNumber = client->sequence;
++ rep.nhsync = nHsync;
++ rep.nvsync = nVrefresh;
++ hsyncdata = malloc(nHsync * sizeof(CARD32));
+ if (!hsyncdata) {
+ return BadAlloc;
+- } vsyncdata = malloc(nVrefresh * sizeof(CARD32));
++ }
++ vsyncdata = malloc(nVrefresh * sizeof(CARD32));
+
+ if (!vsyncdata) {
+ free(hsyncdata);
+@@ -1208,19 +1244,18 @@ static int
+ for (i = 0; i < nHsync; i++) {
+ hsyncdata[i] = (unsigned short) (VidModeGetMonitorValue(monitor,
+ VIDMODE_MON_HSYNC_LO,
+- i)).
+- f | (unsigned
+- short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_HSYNC_HI,
+- i)).f << 16;
++ i)).f |
++ (unsigned
++ short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_HSYNC_HI,
++ i)).f << 16;
+ }
+ for (i = 0; i < nVrefresh; i++) {
+ vsyncdata[i] = (unsigned short) (VidModeGetMonitorValue(monitor,
+ VIDMODE_MON_VREFRESH_LO,
+- i)).
+- f | (unsigned
+- short) (VidModeGetMonitorValue(monitor,
+- VIDMODE_MON_VREFRESH_HI,
+- i)).f << 16;
++ i)).f |
++ (unsigned
++ short) (VidModeGetMonitorValue(monitor, VIDMODE_MON_VREFRESH_HI,
++ i)).f << 16;
+ }
+
+ if (client->swapped) {
+@@ -1249,38 +1284,40 @@ static int
+ }
+
+ static int
+- ProcXF86VidModeGetViewPort(ClientPtr client) {
++ProcXF86VidModeGetViewPort(ClientPtr client)
++{
+ REQUEST(xXF86VidModeGetViewPortReq);
+ xXF86VidModeGetViewPortReply rep;
+ int x, y;
+
+- DEBUG_P("XF86VidModeGetViewPort");
++ DEBUG_P("XF86VidModeGetViewPort");
+
+- REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq);
++ REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq);
+
+ if (stuff->screen >= screenInfo.numScreens)
+- return BadValue;
++ return BadValue;
+
+- rep.type = X_Reply;
+- rep.length = 0;
+- rep.sequenceNumber = client->sequence;
++ rep.type = X_Reply;
++ rep.length = 0;
++ rep.sequenceNumber = client->sequence;
+
+- VidModeGetViewPort(stuff->screen, &x, &y);
+- rep.x = x;
+- rep.y = y;
++ VidModeGetViewPort(stuff->screen, &x, &y);
++ rep.x = x;
++ rep.y = y;
+
+ if (client->swapped) {
+ swaps(&rep.sequenceNumber);
+ swapl(&rep.length);
+ swapl(&rep.x);
+ swapl(&rep.y);
+- } WriteToClient(client, SIZEOF(xXF86VidModeGetViewPortReply),
+- (char *) &rep);
++ }
++ WriteToClient(client, SIZEOF(xXF86VidModeGetViewPortReply), (char *) &rep);
+ return Success;
+ }
+
+ static int
+- ProcXF86VidModeSetViewPort(ClientPtr client) {
++ProcXF86VidModeSetViewPort(ClientPtr client)
++{
+ REQUEST(xXF86VidModeSetViewPortReq);
+
+ DEBUG_P("XF86VidModeSetViewPort");
+@@ -1294,8 +1331,11 @@ static int
+ return BadValue;
+
+ return Success;
+-} static int
+- ProcXF86VidModeGetDotClocks(ClientPtr client) {
++}
++
++static int
++ProcXF86VidModeGetDotClocks(ClientPtr client)
++{
+ REQUEST(xXF86VidModeGetDotClocksReq);
+ xXF86VidModeGetDotClocksReply rep;
+ int n;
+@@ -1304,31 +1344,33 @@ static int
+ int *Clocks = NULL;
+ Bool ClockProg;
+
+- DEBUG_P("XF86VidModeGetDotClocks");
++ DEBUG_P("XF86VidModeGetDotClocks");
+
+- REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq);
++ REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq);
+
+ if (stuff->screen >= screenInfo.numScreens)
+- return BadValue;
++ return BadValue;
+
+- numClocks = VidModeGetNumOfClocks(stuff->screen, &ClockProg);
++ numClocks = VidModeGetNumOfClocks(stuff->screen, &ClockProg);
+
+- rep.type = X_Reply;
+- rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetDotClocksReply)
+- - SIZEOF(xGenericReply) + numClocks);
+- rep.sequenceNumber = client->sequence;
+- rep.clocks = numClocks;
+- rep.maxclocks = MAXCLOCKS;
+- rep.flags = 0;
++ rep.type = X_Reply;
++ rep.length = bytes_to_int32(SIZEOF(xXF86VidModeGetDotClocksReply)
++ - SIZEOF(xGenericReply) + numClocks);
++ rep.sequenceNumber = client->sequence;
++ rep.clocks = numClocks;
++ rep.maxclocks = MAXCLOCKS;
++ rep.flags = 0;
+
+ if (!ClockProg) {
+ Clocks = malloc(numClocks * sizeof(int));
+ if (!Clocks)
+- return BadValue;
++ return BadValue;
+ if (!VidModeGetClocks(stuff->screen, Clocks)) {
+ free(Clocks);
+ return BadValue;
+- }} if (ClockProg) {
++ }
++ }
++ if (ClockProg) {
+ rep.flags |= CLKFLAG_PROGRAMABLE;
}
+ if (client->swapped) {
+@@ -1356,7 +1398,8 @@ static int
+ }
+
+ static int
+- ProcXF86VidModeSetGamma(ClientPtr client) {
++ProcXF86VidModeSetGamma(ClientPtr client)
++{
+ REQUEST(xXF86VidModeSetGammaReq);
+
+ DEBUG_P("XF86VidModeSetGamma");
+@@ -1372,79 +1415,89 @@ static int
+ return BadValue;
+
+ return Success;
+-} static int
+- ProcXF86VidModeGetGamma(ClientPtr client) {
++}
++
++static int
++ProcXF86VidModeGetGamma(ClientPtr client)
++{
+ REQUEST(xXF86VidModeGetGammaReq);
+ xXF86VidModeGetGammaReply rep;
+ float red, green, blue;
+
+- DEBUG_P("XF86VidModeGetGamma");
++ DEBUG_P("XF86VidModeGetGamma");
+
+- REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq);
++ REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq);
+
+ if (stuff->screen >= screenInfo.numScreens)
+- return BadValue;
++ return BadValue;
+
+- rep.type = X_Reply;
+- rep.length = 0;
+- rep.sequenceNumber = client->sequence;
++ rep.type = X_Reply;
++ rep.length = 0;
++ rep.sequenceNumber = client->sequence;
+ if (!VidModeGetGamma(stuff->screen, &red, &green, &blue))
+- return BadValue;
+- rep.red = (CARD32) (red * 10000.);
+- rep.green = (CARD32) (green * 10000.);
+- rep.blue = (CARD32) (blue * 10000.);
++ return BadValue;
++ rep.red = (CARD32) (red * 10000.);
++ rep.green = (CARD32) (green * 10000.);
++ rep.blue = (CARD32) (blue * 10000.);
+ if (client->swapped) {
+ swaps(&rep.sequenceNumber);
+ swapl(&rep.length);
+ swapl(&rep.red);
+ swapl(&rep.green);
+ swapl(&rep.blue);
+- } WriteToClient(client, sizeof(xXF86VidModeGetGammaReply), (char *) &rep);
++ }
++ WriteToClient(client, sizeof(xXF86VidModeGetGammaReply), (char *) &rep);
+
+ return Success;
+ }
+
+ static int
+- ProcXF86VidModeSetGammaRamp(ClientPtr client) {
++ProcXF86VidModeSetGammaRamp(ClientPtr client)
++{
+ CARD16 *r, *g, *b;
+ int length;
+- REQUEST(xXF86VidModeSetGammaRampReq);
++
++ REQUEST(xXF86VidModeSetGammaRampReq);
+
+ if (stuff->screen >= screenInfo.numScreens)
+- return BadValue;
++ return BadValue;
+
+ if (stuff->size != VidModeGetGammaRampSize(stuff->screen))
+- return BadValue;
++ return BadValue;
+
+- length = (stuff->size + 1) & ~1;
++ length = (stuff->size + 1) & ~1;
+
+- REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length * 6);
++ REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length * 6);
+
+- r = (CARD16 *) &stuff[1];
+- g = r + length;
+- b = g + length;
++ r = (CARD16 *) &stuff[1];
++ g = r + length;
++ b = g + length;
+
+ if (!VidModeSetGammaRamp(stuff->screen, stuff->size, r, g, b))
+- return BadValue;
++ return BadValue;
+
+- return Success;
+-} static int
+- ProcXF86VidModeGetGammaRamp(ClientPtr client) {
++ return Success;
++}
++
++static int
++ProcXF86VidModeGetGammaRamp(ClientPtr client)
++{
+ CARD16 *ramp = NULL;
+ int length;
+ size_t ramplen = 0;
+ xXF86VidModeGetGammaRampReply rep;
+- REQUEST(xXF86VidModeGetGammaRampReq);
++
++ REQUEST(xXF86VidModeGetGammaRampReq);
+
+ if (stuff->screen >= screenInfo.numScreens)
+- return BadValue;
++ return BadValue;
+
+ if (stuff->size != VidModeGetGammaRampSize(stuff->screen))
+- return BadValue;
++ return BadValue;
+
+- REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq);
++ REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq);
+
+- length = (stuff->size + 1) & ~1;
++ length = (stuff->size + 1) & ~1;
+
+ if (stuff->size) {
+ ramplen = length * 3 * sizeof(CARD16);
+@@ -1455,7 +1508,9 @@ static int
+ ramp, ramp + length, ramp + (length * 2))) {
+ free(ramp);
+ return BadValue;
+- }} rep.type = X_Reply;
++ }
++ }
++ rep.type = X_Reply;
+ rep.length = (length >> 1) * 3;
+ rep.sequenceNumber = client->sequence;
+ rep.size = stuff->size;
+@@ -1476,47 +1531,53 @@ static int
+ }
+
+ static int
+- ProcXF86VidModeGetGammaRampSize(ClientPtr client) {
++ProcXF86VidModeGetGammaRampSize(ClientPtr client)
++{
+ xXF86VidModeGetGammaRampSizeReply rep;
+- REQUEST(xXF86VidModeGetGammaRampSizeReq);
++
++ REQUEST(xXF86VidModeGetGammaRampSizeReq);
+
+ if (stuff->screen >= screenInfo.numScreens)
+- return BadValue;
++ return BadValue;
+
+- REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq);
++ REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq);
-- if (scrn->modes != NULL) {
-- /* For some reason, scrn->modes is circular, unlike the other mode
-- * lists. How great is that?
-- */
-- for (last = scrn->modes; last && last->next; last = last->next)
-- ;
-- last->next = scrn->modes;
-- scrn->modes->prev = last;
-- if (mode) {
-- while (scrn->modes != mode)
-- scrn->modes = scrn->modes->next;
-- }
-+ if (!scrn->modes) {
-+ scrn->modes = xf86ModesAdd(scrn->modes,
-+ xf86CVTMode(scrn->display->virtualX,
-+ scrn->display->virtualY,
-+ 60, 0, 0));
-+ }
-+
-+ /* For some reason, scrn->modes is circular, unlike the other mode
-+ * lists. How great is that?
-+ */
-+ for (last = scrn->modes; last && last->next; last = last->next)
-+ ;
-+ last->next = scrn->modes;
-+ scrn->modes->prev = last;
-+ if (mode) {
-+ while (scrn->modes != mode)
-+ scrn->modes = scrn->modes->next;
+- rep.type = X_Reply;
+- rep.length = 0;
+- rep.sequenceNumber = client->sequence;
+- rep.size = VidModeGetGammaRampSize(stuff->screen);
++ rep.type = X_Reply;
++ rep.length = 0;
++ rep.sequenceNumber = client->sequence;
++ rep.size = VidModeGetGammaRampSize(stuff->screen);
+ if (client->swapped) {
+ swaps(&rep.sequenceNumber);
+ swapl(&rep.length);
+ swaps(&rep.size);
+- } WriteToClient(client, sizeof(xXF86VidModeGetGammaRampSizeReply),
+- (char *) &rep);
++ }
++ WriteToClient(client, sizeof(xXF86VidModeGetGammaRampSizeReply),
++ (char *) &rep);
+
+ return Success;
+ }
+
+ static int
+- ProcXF86VidModeGetPermissions(ClientPtr client) {
++ProcXF86VidModeGetPermissions(ClientPtr client)
++{
+ xXF86VidModeGetPermissionsReply rep;
+- REQUEST(xXF86VidModeGetPermissionsReq);
++
++ REQUEST(xXF86VidModeGetPermissionsReq);
+
+ if (stuff->screen >= screenInfo.numScreens)
+- return BadValue;
++ return BadValue;
+
+- REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq);
++ REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq);
+
+- rep.type = X_Reply;
+- rep.length = 0;
+- rep.sequenceNumber = client->sequence;
+- rep.permissions = XF86VM_READ_PERMISSION;
++ rep.type = X_Reply;
++ rep.length = 0;
++ rep.sequenceNumber = client->sequence;
++ rep.permissions = XF86VM_READ_PERMISSION;
+ if (xf86GetVidModeEnabled() &&
+ (xf86GetVidModeAllowNonLocal() || LocalClient(client))) {
+ rep.permissions |= XF86VM_WRITE_PERMISSION;
+- } if (client->swapped) {
++ }
++ if (client->swapped) {
+ swaps(&rep.sequenceNumber);
+ swapl(&rep.length);
+ swapl(&rep.permissions);
+@@ -1528,21 +1589,23 @@ static int
+ }
+
+ static int
+- ProcXF86VidModeSetClientVersion(ClientPtr client) {
++ProcXF86VidModeSetClientVersion(ClientPtr client)
++{
+ REQUEST(xXF86VidModeSetClientVersionReq);
+
+ VidModePrivPtr pPriv;
+
+- DEBUG_P("XF86VidModeSetClientVersion");
++ DEBUG_P("XF86VidModeSetClientVersion");
+
+- REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq);
++ REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq);
+
+ if ((pPriv = VM_GETPRIV(client)) == NULL) {
+ pPriv = malloc(sizeof(VidModePrivRec));
+ if (!pPriv)
+ return BadAlloc;
+ VM_SETPRIV(client, pPriv);
+- } pPriv->major = stuff->major;
++ }
++ pPriv->major = stuff->major;
+
+ pPriv->minor = stuff->minor;
+
+@@ -1550,85 +1613,103 @@ static int
+ }
+
+ static int
+- ProcXF86VidModeDispatch(ClientPtr client) {
++ProcXF86VidModeDispatch(ClientPtr client)
++{
+ REQUEST(xReq);
+ switch (stuff->data) {
+ case X_XF86VidModeQueryVersion:
+ return ProcXF86VidModeQueryVersion(client);
+- case X_XF86VidModeGetModeLine:return ProcXF86VidModeGetModeLine(client);
+- case X_XF86VidModeGetMonitor:return ProcXF86VidModeGetMonitor(client);
+- case X_XF86VidModeGetAllModeLines:return
+- ProcXF86VidModeGetAllModeLines(client);
+- case X_XF86VidModeValidateModeLine:return
+- ProcXF86VidModeValidateModeLine(client);
+- case X_XF86VidModeGetViewPort:return ProcXF86VidModeGetViewPort(client);
+- case X_XF86VidModeGetDotClocks:return
+- ProcXF86VidModeGetDotClocks(client);
+- case X_XF86VidModeSetClientVersion:return
+- ProcXF86VidModeSetClientVersion(client);
+- case X_XF86VidModeGetGamma:return ProcXF86VidModeGetGamma(client);
+- case X_XF86VidModeGetGammaRamp:return
+- ProcXF86VidModeGetGammaRamp(client);
+- case X_XF86VidModeGetGammaRampSize:return
+- ProcXF86VidModeGetGammaRampSize(client);
+- case X_XF86VidModeGetPermissions:return
+- ProcXF86VidModeGetPermissions(client);
+- default:if (!xf86GetVidModeEnabled())
++ case X_XF86VidModeGetModeLine:
++ return ProcXF86VidModeGetModeLine(client);
++ case X_XF86VidModeGetMonitor:
++ return ProcXF86VidModeGetMonitor(client);
++ case X_XF86VidModeGetAllModeLines:
++ return ProcXF86VidModeGetAllModeLines(client);
++ case X_XF86VidModeValidateModeLine:
++ return ProcXF86VidModeValidateModeLine(client);
++ case X_XF86VidModeGetViewPort:
++ return ProcXF86VidModeGetViewPort(client);
++ case X_XF86VidModeGetDotClocks:
++ return ProcXF86VidModeGetDotClocks(client);
++ case X_XF86VidModeSetClientVersion:
++ return ProcXF86VidModeSetClientVersion(client);
++ case X_XF86VidModeGetGamma:
++ return ProcXF86VidModeGetGamma(client);
++ case X_XF86VidModeGetGammaRamp:
++ return ProcXF86VidModeGetGammaRamp(client);
++ case X_XF86VidModeGetGammaRampSize:
++ return ProcXF86VidModeGetGammaRampSize(client);
++ case X_XF86VidModeGetPermissions:
++ return ProcXF86VidModeGetPermissions(client);
++ default:
++ if (!xf86GetVidModeEnabled())
+ return VidModeErrorBase + XF86VidModeExtensionDisabled;
+ if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) {
+ switch (stuff->data) {
+ case X_XF86VidModeAddModeLine:
+ return ProcXF86VidModeAddModeLine(client);
+- case X_XF86VidModeDeleteModeLine:return
+- ProcXF86VidModeDeleteModeLine(client);
+- case X_XF86VidModeModModeLine:return
+- ProcXF86VidModeModModeLine(client);
+- case X_XF86VidModeSwitchMode:return
+- ProcXF86VidModeSwitchMode(client);
+- case X_XF86VidModeSwitchToMode:return
+- ProcXF86VidModeSwitchToMode(client);
+- case X_XF86VidModeLockModeSwitch:return
+- ProcXF86VidModeLockModeSwitch(client);
+- case X_XF86VidModeSetViewPort:return
+- ProcXF86VidModeSetViewPort(client);
+- case X_XF86VidModeSetGamma:return
+- ProcXF86VidModeSetGamma(client);
+- case X_XF86VidModeSetGammaRamp:return
+- ProcXF86VidModeSetGammaRamp(client);
+- default:return BadRequest;
+- }}
++ case X_XF86VidModeDeleteModeLine:
++ return ProcXF86VidModeDeleteModeLine(client);
++ case X_XF86VidModeModModeLine:
++ return ProcXF86VidModeModModeLine(client);
++ case X_XF86VidModeSwitchMode:
++ return ProcXF86VidModeSwitchMode(client);
++ case X_XF86VidModeSwitchToMode:
++ return ProcXF86VidModeSwitchToMode(client);
++ case X_XF86VidModeLockModeSwitch:
++ return ProcXF86VidModeLockModeSwitch(client);
++ case X_XF86VidModeSetViewPort:
++ return ProcXF86VidModeSetViewPort(client);
++ case X_XF86VidModeSetGamma:
++ return ProcXF86VidModeSetGamma(client);
++ case X_XF86VidModeSetGammaRamp:
++ return ProcXF86VidModeSetGammaRamp(client);
++ default:
++ return BadRequest;
++ }
++ }
+ else
+- return VidModeErrorBase + XF86VidModeClientNotLocal;
++ return VidModeErrorBase + XF86VidModeClientNotLocal;
}
+ }
+
+ static int
+- SProcXF86VidModeQueryVersion(ClientPtr client) {
++SProcXF86VidModeQueryVersion(ClientPtr client)
++{
+ REQUEST(xXF86VidModeQueryVersionReq);
+ swaps(&stuff->length);
+ return ProcXF86VidModeQueryVersion(client);
+-} static int
+- SProcXF86VidModeGetModeLine(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeGetModeLine(ClientPtr client)
++{
+ REQUEST(xXF86VidModeGetModeLineReq);
+ swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xXF86VidModeGetModeLineReq);
+ swaps(&stuff->screen);
+ return ProcXF86VidModeGetModeLine(client);
+-} static int
+- SProcXF86VidModeGetAllModeLines(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeGetAllModeLines(ClientPtr client)
++{
+ REQUEST(xXF86VidModeGetAllModeLinesReq);
+ swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xXF86VidModeGetAllModeLinesReq);
+ swaps(&stuff->screen);
+ return ProcXF86VidModeGetAllModeLines(client);
+-} static int
+- SProcXF86VidModeAddModeLine(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeAddModeLine(ClientPtr client)
++{
+ xXF86OldVidModeAddModeLineReq *oldstuff =
+ (xXF86OldVidModeAddModeLineReq *) client->requestBuffer;
+ int ver;
+
+- REQUEST(xXF86VidModeAddModeLineReq);
+- ver = ClientMajorVersion(client);
++ REQUEST(xXF86VidModeAddModeLineReq);
++ ver = ClientMajorVersion(client);
+ if (ver < 2) {
+ swaps(&oldstuff->length);
+ REQUEST_AT_LEAST_SIZE(xXF86OldVidModeAddModeLineReq);
+@@ -1666,13 +1747,14 @@ static int
+ }
+
+ static int
+- SProcXF86VidModeDeleteModeLine(ClientPtr client) {
++SProcXF86VidModeDeleteModeLine(ClientPtr client)
++{
+ xXF86OldVidModeDeleteModeLineReq *oldstuff =
+ (xXF86OldVidModeDeleteModeLineReq *) client->requestBuffer;
+ int ver;
+
+- REQUEST(xXF86VidModeDeleteModeLineReq);
+- ver = ClientMajorVersion(client);
++ REQUEST(xXF86VidModeDeleteModeLineReq);
++ ver = ClientMajorVersion(client);
+ if (ver < 2) {
+ swaps(&oldstuff->length);
+ REQUEST_AT_LEAST_SIZE(xXF86OldVidModeDeleteModeLineReq);
+@@ -1710,13 +1792,14 @@ static int
+ }
+
+ static int
+- SProcXF86VidModeModModeLine(ClientPtr client) {
++SProcXF86VidModeModModeLine(ClientPtr client)
++{
+ xXF86OldVidModeModModeLineReq *oldstuff =
+ (xXF86OldVidModeModModeLineReq *) client->requestBuffer;
+ int ver;
+
+- REQUEST(xXF86VidModeModModeLineReq);
+- ver = ClientMajorVersion(client);
++ REQUEST(xXF86VidModeModModeLineReq);
++ ver = ClientMajorVersion(client);
+ if (ver < 2) {
+ swaps(&oldstuff->length);
+ REQUEST_AT_LEAST_SIZE(xXF86OldVidModeModModeLineReq);
+@@ -1754,13 +1837,14 @@ static int
+ }
+
+ static int
+- SProcXF86VidModeValidateModeLine(ClientPtr client) {
++SProcXF86VidModeValidateModeLine(ClientPtr client)
++{
+ xXF86OldVidModeValidateModeLineReq *oldstuff =
+ (xXF86OldVidModeValidateModeLineReq *) client->requestBuffer;
+ int ver;
+
+- REQUEST(xXF86VidModeValidateModeLineReq);
+- ver = ClientMajorVersion(client);
++ REQUEST(xXF86VidModeValidateModeLineReq);
++ ver = ClientMajorVersion(client);
+ if (ver < 2) {
+ swaps(&oldstuff->length);
+ REQUEST_AT_LEAST_SIZE(xXF86OldVidModeValidateModeLineReq);
+@@ -1798,44 +1882,60 @@ static int
+ }
+
+ static int
+- SProcXF86VidModeSwitchMode(ClientPtr client) {
++SProcXF86VidModeSwitchMode(ClientPtr client)
++{
+ REQUEST(xXF86VidModeSwitchModeReq);
+ swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xXF86VidModeSwitchModeReq);
+ swaps(&stuff->screen);
+ swaps(&stuff->zoom);
+ return ProcXF86VidModeSwitchMode(client);
+-} static int
+- SProcXF86VidModeSwitchToMode(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeSwitchToMode(ClientPtr client)
++{
+ REQUEST(xXF86VidModeSwitchToModeReq);
+ swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xXF86VidModeSwitchToModeReq);
+ swapl(&stuff->screen);
+ return ProcXF86VidModeSwitchToMode(client);
+-} static int
+- SProcXF86VidModeLockModeSwitch(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeLockModeSwitch(ClientPtr client)
++{
+ REQUEST(xXF86VidModeLockModeSwitchReq);
+ swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xXF86VidModeLockModeSwitchReq);
+ swaps(&stuff->screen);
+ swaps(&stuff->lock);
+ return ProcXF86VidModeLockModeSwitch(client);
+-} static int
+- SProcXF86VidModeGetMonitor(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeGetMonitor(ClientPtr client)
++{
+ REQUEST(xXF86VidModeGetMonitorReq);
+ swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xXF86VidModeGetMonitorReq);
+ swaps(&stuff->screen);
+ return ProcXF86VidModeGetMonitor(client);
+-} static int
+- SProcXF86VidModeGetViewPort(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeGetViewPort(ClientPtr client)
++{
+ REQUEST(xXF86VidModeGetViewPortReq);
+ swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xXF86VidModeGetViewPortReq);
+ swaps(&stuff->screen);
+ return ProcXF86VidModeGetViewPort(client);
+-} static int
+- SProcXF86VidModeSetViewPort(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeSetViewPort(ClientPtr client)
++{
+ REQUEST(xXF86VidModeSetViewPortReq);
+ swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xXF86VidModeSetViewPortReq);
+@@ -1843,23 +1943,32 @@ static int
+ swapl(&stuff->x);
+ swapl(&stuff->y);
+ return ProcXF86VidModeSetViewPort(client);
+-} static int
+- SProcXF86VidModeGetDotClocks(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeGetDotClocks(ClientPtr client)
++{
+ REQUEST(xXF86VidModeGetDotClocksReq);
+ swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xXF86VidModeGetDotClocksReq);
+ swaps(&stuff->screen);
+ return ProcXF86VidModeGetDotClocks(client);
+-} static int
+- SProcXF86VidModeSetClientVersion(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeSetClientVersion(ClientPtr client)
++{
+ REQUEST(xXF86VidModeSetClientVersionReq);
+ swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xXF86VidModeSetClientVersionReq);
+ swaps(&stuff->major);
+ swaps(&stuff->minor);
+ return ProcXF86VidModeSetClientVersion(client);
+-} static int
+- SProcXF86VidModeSetGamma(ClientPtr client) {
++}
+
- scrn->currentMode = scrn->modes;
- #ifdef XFreeXDGA
- if (scrn->pScreen)
-@@ -2529,16 +2535,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
- width, height);
++static int
++SProcXF86VidModeSetGamma(ClientPtr client)
++{
+ REQUEST(xXF86VidModeSetGammaReq);
+ swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xXF86VidModeSetGammaReq);
+@@ -1868,120 +1977,145 @@ static int
+ swapl(&stuff->green);
+ swapl(&stuff->blue);
+ return ProcXF86VidModeSetGamma(client);
+-} static int
+- SProcXF86VidModeGetGamma(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeGetGamma(ClientPtr client)
++{
+ REQUEST(xXF86VidModeGetGammaReq);
+ swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xXF86VidModeGetGammaReq);
+ swaps(&stuff->screen);
+ return ProcXF86VidModeGetGamma(client);
+-} static int
+- SProcXF86VidModeSetGammaRamp(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeSetGammaRamp(ClientPtr client)
++{
+ int length;
+- REQUEST(xXF86VidModeSetGammaRampReq);
+- swaps(&stuff->length);
+- REQUEST_AT_LEAST_SIZE(xXF86VidModeSetGammaRampReq);
+- swaps(&stuff->size);
+- swaps(&stuff->screen);
+- length = ((stuff->size + 1) & ~1) * 6;
+- REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length);
+- SwapRestS(stuff);
+- return ProcXF86VidModeSetGammaRamp(client);
+-} static int
+- SProcXF86VidModeGetGammaRamp(ClientPtr client) {
++
++ REQUEST(xXF86VidModeSetGammaRampReq);
++ swaps(&stuff->length);
++ REQUEST_AT_LEAST_SIZE(xXF86VidModeSetGammaRampReq);
++ swaps(&stuff->size);
++ swaps(&stuff->screen);
++ length = ((stuff->size + 1) & ~1) * 6;
++ REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length);
++ SwapRestS(stuff);
++ return ProcXF86VidModeSetGammaRamp(client);
++}
++
++static int
++SProcXF86VidModeGetGammaRamp(ClientPtr client)
++{
+ REQUEST(xXF86VidModeGetGammaRampReq);
+ swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampReq);
+ swaps(&stuff->size);
+ swaps(&stuff->screen);
+ return ProcXF86VidModeGetGammaRamp(client);
+-} static int
+- SProcXF86VidModeGetGammaRampSize(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeGetGammaRampSize(ClientPtr client)
++{
+ REQUEST(xXF86VidModeGetGammaRampSizeReq);
+ swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xXF86VidModeGetGammaRampSizeReq);
+ swaps(&stuff->screen);
+ return ProcXF86VidModeGetGammaRampSize(client);
+-} static int
+- SProcXF86VidModeGetPermissions(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeGetPermissions(ClientPtr client)
++{
+ REQUEST(xXF86VidModeGetPermissionsReq);
+ swaps(&stuff->length);
+ REQUEST_SIZE_MATCH(xXF86VidModeGetPermissionsReq);
+ swaps(&stuff->screen);
+ return ProcXF86VidModeGetPermissions(client);
+-} static int
+- SProcXF86VidModeDispatch(ClientPtr client) {
++}
++
++static int
++SProcXF86VidModeDispatch(ClientPtr client)
++{
+ REQUEST(xReq);
+ switch (stuff->data) {
+ case X_XF86VidModeQueryVersion:
+ return SProcXF86VidModeQueryVersion(client);
+- case X_XF86VidModeGetModeLine:return
+- SProcXF86VidModeGetModeLine(client);
+- case X_XF86VidModeGetMonitor:return SProcXF86VidModeGetMonitor(client);
+- case X_XF86VidModeGetAllModeLines:return
+- SProcXF86VidModeGetAllModeLines(client);
+- case X_XF86VidModeGetViewPort:return
+- SProcXF86VidModeGetViewPort(client);
+- case X_XF86VidModeValidateModeLine:return
+- SProcXF86VidModeValidateModeLine(client);
+- case X_XF86VidModeGetDotClocks:return
+- SProcXF86VidModeGetDotClocks(client);
+- case X_XF86VidModeSetClientVersion:return
+- SProcXF86VidModeSetClientVersion(client);
+- case X_XF86VidModeGetGamma:return SProcXF86VidModeGetGamma(client);
+- case X_XF86VidModeGetGammaRamp:return
+- SProcXF86VidModeGetGammaRamp(client);
+- case X_XF86VidModeGetGammaRampSize:return
+- SProcXF86VidModeGetGammaRampSize(client);
+- case X_XF86VidModeGetPermissions:return
+- SProcXF86VidModeGetPermissions(client);
+- default:if (!xf86GetVidModeEnabled())
++ case X_XF86VidModeGetModeLine:
++ return SProcXF86VidModeGetModeLine(client);
++ case X_XF86VidModeGetMonitor:
++ return SProcXF86VidModeGetMonitor(client);
++ case X_XF86VidModeGetAllModeLines:
++ return SProcXF86VidModeGetAllModeLines(client);
++ case X_XF86VidModeGetViewPort:
++ return SProcXF86VidModeGetViewPort(client);
++ case X_XF86VidModeValidateModeLine:
++ return SProcXF86VidModeValidateModeLine(client);
++ case X_XF86VidModeGetDotClocks:
++ return SProcXF86VidModeGetDotClocks(client);
++ case X_XF86VidModeSetClientVersion:
++ return SProcXF86VidModeSetClientVersion(client);
++ case X_XF86VidModeGetGamma:
++ return SProcXF86VidModeGetGamma(client);
++ case X_XF86VidModeGetGammaRamp:
++ return SProcXF86VidModeGetGammaRamp(client);
++ case X_XF86VidModeGetGammaRampSize:
++ return SProcXF86VidModeGetGammaRampSize(client);
++ case X_XF86VidModeGetPermissions:
++ return SProcXF86VidModeGetPermissions(client);
++ default:
++ if (!xf86GetVidModeEnabled())
+ return VidModeErrorBase + XF86VidModeExtensionDisabled;
+ if (xf86GetVidModeAllowNonLocal() || LocalClient(client)) {
+ switch (stuff->data) {
+ case X_XF86VidModeAddModeLine:
+ return SProcXF86VidModeAddModeLine(client);
+- case X_XF86VidModeDeleteModeLine:return
+- SProcXF86VidModeDeleteModeLine(client);
+- case X_XF86VidModeModModeLine:return
+- SProcXF86VidModeModModeLine(client);
+- case X_XF86VidModeSwitchMode:return
+- SProcXF86VidModeSwitchMode(client);
+- case X_XF86VidModeSwitchToMode:return
+- SProcXF86VidModeSwitchToMode(client);
+- case X_XF86VidModeLockModeSwitch:return
+- SProcXF86VidModeLockModeSwitch(client);
+- case X_XF86VidModeSetViewPort:return
+- SProcXF86VidModeSetViewPort(client);
+- case X_XF86VidModeSetGamma:return
+- SProcXF86VidModeSetGamma(client);
+- case X_XF86VidModeSetGammaRamp:return
+- SProcXF86VidModeSetGammaRamp(client);
+- default:return BadRequest;
+- }}
++ case X_XF86VidModeDeleteModeLine:
++ return SProcXF86VidModeDeleteModeLine(client);
++ case X_XF86VidModeModModeLine:
++ return SProcXF86VidModeModModeLine(client);
++ case X_XF86VidModeSwitchMode:
++ return SProcXF86VidModeSwitchMode(client);
++ case X_XF86VidModeSwitchToMode:
++ return SProcXF86VidModeSwitchToMode(client);
++ case X_XF86VidModeLockModeSwitch:
++ return SProcXF86VidModeLockModeSwitch(client);
++ case X_XF86VidModeSetViewPort:
++ return SProcXF86VidModeSetViewPort(client);
++ case X_XF86VidModeSetGamma:
++ return SProcXF86VidModeSetGamma(client);
++ case X_XF86VidModeSetGammaRamp:
++ return SProcXF86VidModeSetGammaRamp(client);
++ default:
++ return BadRequest;
++ }
++ }
+ else
+- return VidModeErrorBase + XF86VidModeClientNotLocal;
++ return VidModeErrorBase + XF86VidModeClientNotLocal;
+ }
+ }
+
+ void
+- XFree86VidModeExtensionInit(void) {
++XFree86VidModeExtensionInit(void)
++{
+ ExtensionEntry *extEntry;
+ ScreenPtr pScreen;
+ int i;
+ Bool enabled = FALSE;
+
+- DEBUG_P("XFree86VidModeExtensionInit");
++ DEBUG_P("XFree86VidModeExtensionInit");
+
+ if (!dixRegisterPrivateKey(&VidModeClientPrivateKeyRec, PRIVATE_CLIENT, 0))
+- return;
++ return;
+ #ifdef XF86VIDMODE_EVENTS
+ if (!dixRegisterPrivateKey(&ScreenPrivateKeyRec, PRIVATE_SCREEN, 0))
+- return;
++ return;
+ #endif
+
+ #ifdef XF86VIDMODE_EVENTS
+- EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent");
++ EventType = CreateNewResourceType(XF86VidModeFreeEvents, "VidModeEvent");
+ #endif
+
+ for (i = 0; i < screenInfo.numScreens; i++) {
+@@ -1990,8 +2124,8 @@ void
+ enabled = TRUE;
}
+ /* This means that the DDX doesn't want the vidmode extension enabled */
+- if (!enabled)
+- return;
++ if (!enabled)
++ return;
-- if (have_outputs) {
-- /* Mirror output modes to scrn mode list */
-- xf86SetScrnInfoModes (scrn);
-- } else {
-- /* Clear any existing modes from scrn->modes */
-- while (scrn->modes != NULL)
-- xf86DeleteMode(&scrn->modes, scrn->modes);
-- scrn->modes = xf86ModesAdd(scrn->modes,
-- xf86CVTMode(width, height, 60, 0, 0));
-- }
-+ xf86SetScrnInfoModes (scrn);
-
- success = TRUE;
- bailout:
+ if (
+ #ifdef XF86VIDMODE_EVENTS
--
cgit v0.9.0.2-2-gbebe
-From 97f2ae60fc0cc755abd8b88df826fcb1a20464fe Mon Sep 17 00:00:00 2001
-From: Christopher Yeleighton <giecrilj@stegny.2a.pl>
-Date: Tue, 25 Oct 2011 01:47:06 +0000
-Subject: Bug 38420: Xvfb crashes in miInitVisuals() when started with depth=2
+From 15607cf2dc87405606b20113011f1ebd97637d32 Mon Sep 17 00:00:00 2001
+From: Daniel Kurtz <djkurtz@chromium.org>
+Date: Thu, 12 Apr 2012 00:11:10 +0000
+Subject: dix: don't BUG_WARN for button events from button-only device
-https://bugs.freedesktop.org/show_bug.cgi?id=38420
+Events from button-only devices still need coordinates, and they get them
+from scale_to_desktop(). Therefore, a dev without valuators is not a bug.
+However, a dev with valuators, but less than two of them still is a bug.
-Exit with fatal error message, not segfault.
+This was noticed when unplugging a "Creative Technology SB Arena Headset",
+which has some BTNs and some KEYs, but no REL or ABS valuators.
+It emits [BTN_3] = 0 on unplug, which would trigger the BUG_WARN.
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-Signed-off-by: Keith Packard <keithp@keithp.com>
-(cherry picked from commit 7d50211ab57a35910d79fc3f67ae89aff91fa995)
+Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
+Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+(cherry picked from commit c5a45b0f7658c77725adce2b64a0fbd62f208328)
---
-diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
-index 31ed505..dce3f84 100644
---- a/hw/vfb/InitOutput.c
-+++ b/hw/vfb/InitOutput.c
-@@ -864,6 +864,8 @@ vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
- (1 << DirectColor)),
- 10, TrueColor, 0x3ff00000, 0x000ffc00, 0x000003ff);
- break;
-+ default:
-+ return FALSE;
- }
+diff --git a/dix/getevents.c b/dix/getevents.c
+index 4e0af45..9dc9617 100644
+--- a/dix/getevents.c
++++ b/dix/getevents.c
+@@ -842,7 +842,7 @@ scale_to_desktop(DeviceIntPtr dev, ValuatorMask *mask,
+ ScreenPtr scr = miPointerGetScreen(dev);
+ double x, y;
- miSetPixmapDepths ();
+- BUG_WARN(!dev->valuator || dev->valuator->numAxes < 2);
++ BUG_WARN(dev->valuator && dev->valuator->numAxes < 2);
+ if (!dev->valuator || dev->valuator->numAxes < 2) {
+ /* if we have no axes, last.valuators must be in screen coords
+ * anyway */
--
cgit v0.9.0.2-2-gbebe
-From 34bb83b9df20ff63dbb147ed661f39efb8bae8e4 Mon Sep 17 00:00:00 2001
+From f8d2ca759ad37d5e99d462f21a2259ce17bb1a00 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 24 Oct 2011 02:00:32 +0000
-Subject: dix: block signals when closing all devices
+Date: Wed, 18 Apr 2012 05:56:37 +0000
+Subject: dix: indentation fix
-When closing down all devices, we manually unset master for all attached
-devices, but the device's sprite info still points to the master's sprite
-info. This leaves us a window where the master is freed already but the
-device isn't yet. A signal during that window causes dereference of the
-already freed spriteInfo in mieqEnqueue's EnqueueScreen macro.
-
-Simply block signals when removing all devices. It's not like we're really
-worrying about high-responsive input at this stage.
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+(cherry picked from commit ebf214876a4885a98ded4f5525925b69005fae05)
+---
+diff --git a/dix/dispatch.c b/dix/dispatch.c
+index 9a2e22f..d971805 100644
+--- a/dix/dispatch.c
++++ b/dix/dispatch.c
+@@ -416,8 +416,8 @@ Dispatch(void)
+ if (XSERVER_REQUEST_START_ENABLED())
+ XSERVER_REQUEST_START(LookupMajorName(client->majorOp),
+ client->majorOp,
+- ((xReq *) client->requestBuffer)->
+- length, client->index,
++ ((xReq *) client->requestBuffer)->length,
++ client->index,
+ client->requestBuffer);
+ #endif
+ if (result > (maxBigRequestSize << 2))
+--
+cgit v0.9.0.2-2-gbebe
+From f012f0c48dedba4df69cc1a1ecdf8ee5d37daca9 Mon Sep 17 00:00:00 2001
+From: Michal Suchanek <hramrach@gmail.com>
+Date: Thu, 26 Apr 2012 13:11:20 +0000
+Subject: dmx: Annotate dmxlog.c with _X_ATTRIBUTE_PRINTF and _X_NORETURN
-https://bugzilla.redhat.com/show_bug.cgi?id=737031
+and fix resulting printf warning in dmxLogVisual
+Signed-off-by: Michal Suchanek <hramrach@gmail.com>
+Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Julien Cristau <jcristau@debian.org>
-(cherry picked from commit d7c44a7c9760449bef263413ad3b20f19b1dc95a)
+(cherry picked from commit d662fa2450856777b59c4b62b912395a8bfd52fd)
+---
+diff --git a/hw/dmx/dmxlog.c b/hw/dmx/dmxlog.c
+index b56bb93..151f672 100644
+--- a/hw/dmx/dmxlog.c
++++ b/hw/dmx/dmxlog.c
+@@ -86,6 +86,8 @@ ErrorF(const char *format, ...)
+
+ /** Provide an VFatalError function when used stand-alone. */
+ static void
++VFatalError(const char *format, va_list args) _X_ATTRIBUTE_PRINTF(1, 0) _X_NORETURN;
++static void
+ VFatalError(const char *format, va_list args)
+ {
+ vfprintf(stderr, format, args); /* RATS: We assume the format string
+@@ -104,7 +106,9 @@ VErrorF(const char *format, va_list args)
+ }
+ #else
+ /** This function was removed between XFree86 4.3.0 and XFree86 4.4.0. */
+-extern void AbortServer(void);
++extern void AbortServer(void) _X_NORETURN;
++static void
++VFatalError(const char *format, va_list args) _X_ATTRIBUTE_PRINTF(1, 0) _X_NORETURN;
+ static void
+ VFatalError(const char *format, va_list args)
+ {
+@@ -166,6 +170,8 @@ dmxHeader(dmxLogLevel logLevel, DMXInputInfo * dmxInput,
+ /* Prints the error message with the appropriate low-level X output
+ * routine. */
+ static void
++dmxMessage(dmxLogLevel logLevel, const char *format, va_list args) _X_ATTRIBUTE_PRINTF(2, 0);
++static void
+ dmxMessage(dmxLogLevel logLevel, const char *format, va_list args)
+ {
+ if (logLevel == dmxFatal || logLevel >= dmxCurrentLogLevel) {
+@@ -303,10 +309,11 @@ dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, int defaultVisual)
+ class = "DirectColor";
+ break;
+ }
++#define VisualLogFormat "0x%02lx %s %2db %db/rgb %3d 0x%04lx 0x%04lx 0x%04lx%s\n"
+
+ if (dmxScreen) {
+ dmxLogOutput(dmxScreen,
+- "0x%02x %s %2db %db/rgb %3d 0x%04x 0x%04x 0x%04x%s\n",
++ VisualLogFormat,
+ vi->visualid, class, vi->depth, vi->bits_per_rgb,
+ vi->colormap_size,
+ vi->red_mask, vi->green_mask, vi->blue_mask,
+@@ -314,7 +321,7 @@ dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi, int defaultVisual)
+ }
+ else {
+ dmxLog(dmxInfo,
+- " 0x%02x %s %2db %db/rgb %3d 0x%04x 0x%04x 0x%04x%s\n",
++ " " VisualLogFormat,
+ vi->visualid, class, vi->depth, vi->bits_per_rgb,
+ vi->colormap_size,
+ vi->red_mask, vi->green_mask, vi->blue_mask,
+diff --git a/hw/dmx/dmxlog.h b/hw/dmx/dmxlog.h
+index 4d4cd26..162484b 100644
+--- a/hw/dmx/dmxlog.h
++++ b/hw/dmx/dmxlog.h
+@@ -55,18 +55,23 @@ typedef enum {
+ /* Logging functions used by Xserver/hw/dmx routines. */
+ extern dmxLogLevel dmxSetLogLevel(dmxLogLevel newLevel);
+ extern dmxLogLevel dmxGetLogLevel(void);
+-extern void dmxLog(dmxLogLevel logLevel, const char *format, ...);
+-extern void dmxLogCont(dmxLogLevel logLevel, const char *format, ...);
++extern void dmxLog(dmxLogLevel logLevel, const char *format,
++ ...) _X_ATTRIBUTE_PRINTF(2, 3);
++extern void dmxLogCont(dmxLogLevel logLevel, const char *format,
++ ...) _X_ATTRIBUTE_PRINTF(2, 3);
+ extern const char *dmxEventName(int type);
+
+ #ifndef DMX_LOG_STANDALONE
+-extern void dmxLogOutput(DMXScreenInfo * dmxScreen, const char *format, ...);
++extern void dmxLogOutput(DMXScreenInfo * dmxScreen, const char *format,
++ ...) _X_ATTRIBUTE_PRINTF(2, 3);
+ extern void dmxLogOutputCont(DMXScreenInfo * dmxScreen, const char *format,
+- ...);
++ ...) _X_ATTRIBUTE_PRINTF(2, 3);
+ extern void dmxLogOutputWarning(DMXScreenInfo * dmxScreen, const char *format,
+- ...);
+-extern void dmxLogInput(DMXInputInfo * dmxInput, const char *format, ...);
+-extern void dmxLogInputCont(DMXInputInfo * dmxInput, const char *format, ...);
++ ...) _X_ATTRIBUTE_PRINTF(2, 3);
++extern void dmxLogInput(DMXInputInfo * dmxInput, const char *format,
++ ...) _X_ATTRIBUTE_PRINTF(2, 3);
++extern void dmxLogInputCont(DMXInputInfo * dmxInput, const char *format,
++ ...) _X_ATTRIBUTE_PRINTF(2, 3);
+ extern void dmxLogArgs(dmxLogLevel logLevel, int argc, char **argv);
+ extern void dmxLogVisual(DMXScreenInfo * dmxScreen, XVisualInfo * vi,
+ int defaultVisual);
+--
+cgit v0.9.0.2-2-gbebe
+From 58dfb13953af71021317b9d85230b1163198f031 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu@apple.com>
+Date: Thu, 10 May 2012 07:53:20 +0000
+Subject: Revert "dix: when disabling a device, release all buttons and keys"
+
+This reverts commit 90299556db24543bb7365e8c2897deca3aa219e7.
+
+The commit being reverted triggered a segfault on server shutdown when a
+device posts raw events after the root windows are forced to NULL.
+
+https://lists.debian.org/debian-x/2012/05/msg00240.html
+
+Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
---
diff --git a/dix/devices.c b/dix/devices.c
-index 0ccf252..cbdd4ea 100644
+index d0e99bd..0125504 100644
--- a/dix/devices.c
+++ b/dix/devices.c
-@@ -982,6 +982,8 @@ CloseDownDevices(void)
- {
- DeviceIntPtr dev;
-
-+ OsBlockSignals();
-+
- /* Float all SDs before closing them. Note that at this point resources
- * (e.g. cursors) have been freed already, so we can't just call
- * AttachDevice(NULL, dev, NULL). Instead, we have to forcibly set master
-@@ -1004,6 +1006,8 @@ CloseDownDevices(void)
- inputInfo.keyboard = NULL;
- inputInfo.pointer = NULL;
- XkbDeleteRulesDflts();
-+
-+ OsReleaseSignals();
- }
+@@ -432,8 +432,6 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
+ if (*prev != dev)
+ return FALSE;
- /**
+- ReleaseButtonsAndKeys(dev);
+-
+ /* float attached devices */
+ if (IsMaster(dev)) {
+ for (other = inputInfo.devices; other; other = other->next) {
--
cgit v0.9.0.2-2-gbebe
diff --git a/testing/gc/PKGBUILD b/testing/gc/PKGBUILD
new file mode 100644
index 000000000..43dd94dbc
--- /dev/null
+++ b/testing/gc/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 159218 2012-05-18 10:37:19Z jgc $
+# Maintainer: Daniel Isenmann <daniel [at] archlinux.org>
+# Contributor: dorphell <dorphell@gmx.net>
+
+pkgname=gc
+pkgver=7.2
+pkgrel=1
+pkgdesc="A garbage collector for C and C++"
+arch=('i686' 'x86_64')
+url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
+license=('GPL')
+source=("http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${pkgname}-${pkgver}.tar.gz")
+depends=('gcc-libs')
+options=('!libtool')
+md5sums=('d17aecedef3d73e75387fb63558fa4eb')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --enable-cplusplus
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+
+ rm -rf "${pkgdir}/usr/share/gc"
+ install -m755 -d "${pkgdir}/usr/share/doc/gc"
+ install -m644 doc/README{,.{changes,contributors,environment,linux}} \
+ "${pkgdir}/usr/share/doc/gc/"
+
+ sed -i -e 's/GC_MALLOC 1L/gc 3/' doc/gc.man
+ install -m755 -d "${pkgdir}/usr/share/man/man3"
+ install -m644 doc/gc.man "${pkgdir}/usr/share/man/man3/gc.3"
+}
diff --git a/testing/rasqal/PKGBUILD b/testing/rasqal/PKGBUILD
new file mode 100644
index 000000000..c3a223adb
--- /dev/null
+++ b/testing/rasqal/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 159230 2012-05-18 13:15:02Z tomegun $
+# Maintainer: Tom Gundersen <teg@jklm.no>
+# Contributor: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Lawrence Lee <valheru@facticius.net>
+
+pkgname=rasqal
+epoch=1
+pkgver=0.9.29
+pkgrel=1
+pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings"
+url="http://librdf.org/rasqal"
+license=('GPL' 'LGPL')
+arch=('i686' 'x86_64')
+depends=('raptor' 'mpfr')
+options=('!libtool')
+source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz)
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --disable-static \
+ --enable-release
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make -k check || true # still fails some checks
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+}
+md5sums=('49e4b75a0c67465edf55dd20606715fa')
diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD
index e5f1f2745..aba029e27 100644
--- a/testing/sudo/PKGBUILD
+++ b/testing/sudo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 159209 2012-05-18 01:02:05Z allan $
+# $Id: PKGBUILD 159228 2012-05-18 13:03:43Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=sudo
-_ver=1.8.5
+_ver=1.8.5p1
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
pkgrel=1
pkgdesc="Give certain users the ability to run some commands as root"
@@ -15,8 +15,8 @@ backup=('etc/sudoers' 'etc/pam.d/sudo')
options=('!libtool' '!makeflags')
source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig}
sudo.pam)
-md5sums=('8d5a664bba74b19ca0b40db1d90f2cee'
- 'ca687f88f718546ddbafb6b556684348'
+md5sums=('3b843e60e0bb226a24dd784345cbbba8'
+ '0f789f30462c2658afe9bd16602d76b1'
'4e7ad4ec8f2fe6a40e12bcb2c0b256e3')
build() {