Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/cdfs/PKGBUILD
	community-testing/open-vm-tools-modules/PKGBUILD
	community-testing/open-vm-tools/PKGBUILD
	community-testing/virtualbox/PKGBUILD
	extra/gnome-device-manager/PKGBUILD
	extra/iptraf/PKGBUILD
	extra/lirc-utils/PKGBUILD
	extra/squeeze/PKGBUILD
	extra/texi2html/PKGBUILD
	extra/thunar-vfs/PKGBUILD
	gnome-unstable/accountsservice/PKGBUILD
	gnome-unstable/anjuta/PKGBUILD
	gnome-unstable/at-spi/PKGBUILD
	gnome-unstable/at-spi2-atk/PKGBUILD
	gnome-unstable/at-spi2-core/PKGBUILD
	gnome-unstable/atk/PKGBUILD
	gnome-unstable/atkmm/PKGBUILD
	gnome-unstable/avahi/PKGBUILD
	gnome-unstable/brasero/PKGBUILD
	gnome-unstable/cairomm/PKGBUILD
	gnome-unstable/cheese/PKGBUILD
	gnome-unstable/clutter-gst/PKGBUILD
	gnome-unstable/clutter-gtk/PKGBUILD
	gnome-unstable/clutter-gtk2/PKGBUILD
	gnome-unstable/clutter/PKGBUILD
	gnome-unstable/dconf/PKGBUILD
	gnome-unstable/devhelp/PKGBUILD
	gnome-unstable/ekiga/PKGBUILD
	gnome-unstable/empathy/PKGBUILD
	gnome-unstable/eog-plugins/PKGBUILD
	gnome-unstable/eog/PKGBUILD
	gnome-unstable/epiphany-extensions/PKGBUILD
	gnome-unstable/epiphany/PKGBUILD
	gnome-unstable/evince/PKGBUILD
	gnome-unstable/evolution-data-server/PKGBUILD
	gnome-unstable/evolution-exchange/PKGBUILD
	gnome-unstable/evolution/PKGBUILD
	gnome-unstable/farsight2/PKGBUILD
	gnome-unstable/file-roller/PKGBUILD
	gnome-unstable/folks/PKGBUILD
	gnome-unstable/gcalctool/PKGBUILD
	gnome-unstable/gconf-editor/PKGBUILD
	gnome-unstable/gconf/PKGBUILD
	gnome-unstable/gdk-pixbuf2/PKGBUILD
	gnome-unstable/gdl/PKGBUILD
	gnome-unstable/gdm/PKGBUILD
	gnome-unstable/gedit/PKGBUILD
	gnome-unstable/gjs/PKGBUILD
	gnome-unstable/glade/PKGBUILD
	gnome-unstable/glib-networking/PKGBUILD
	gnome-unstable/glib2/PKGBUILD
	gnome-unstable/glibmm/PKGBUILD
	gnome-unstable/gnome-applets/PKGBUILD
	gnome-unstable/gnome-bluetooth/PKGBUILD
	gnome-unstable/gnome-color-manager/PKGBUILD
	gnome-unstable/gnome-control-center/PKGBUILD
	gnome-unstable/gnome-desktop/PKGBUILD
	gnome-unstable/gnome-disk-utility/PKGBUILD
	gnome-unstable/gnome-games/PKGBUILD
	gnome-unstable/gnome-keyring/PKGBUILD
	gnome-unstable/gnome-media/PKGBUILD
	gnome-unstable/gnome-menus/PKGBUILD
	gnome-unstable/gnome-nettool/PKGBUILD
	gnome-unstable/gnome-panel/PKGBUILD
	gnome-unstable/gnome-pilot/PKGBUILD
	gnome-unstable/gnome-power-manager/PKGBUILD
	gnome-unstable/gnome-screensaver/PKGBUILD
	gnome-unstable/gnome-session/PKGBUILD
	gnome-unstable/gnome-settings-daemon/PKGBUILD
	gnome-unstable/gnome-shell/PKGBUILD
	gnome-unstable/gnome-system-monitor/PKGBUILD
	gnome-unstable/gnome-terminal/PKGBUILD
	gnome-unstable/gnome-themes-standard/PKGBUILD
	gnome-unstable/gnome-user-share/PKGBUILD
	gnome-unstable/gnome-utils/PKGBUILD
	gnome-unstable/gobject-introspection/PKGBUILD
	gnome-unstable/gthumb/PKGBUILD
	gnome-unstable/gtk-vnc/PKGBUILD
	gnome-unstable/gtk2/PKGBUILD
	gnome-unstable/gtk3/PKGBUILD
	gnome-unstable/gtkhtml4/PKGBUILD
	gnome-unstable/gtkmm/PKGBUILD
	gnome-unstable/gtkmm3/PKGBUILD
	gnome-unstable/gtksourceview3/PKGBUILD
	gnome-unstable/gucharmap/PKGBUILD
	gnome-unstable/gvfs/PKGBUILD
	gnome-unstable/lcms2/PKGBUILD
	gnome-unstable/libcanberra/PKGBUILD
	gnome-unstable/libchamplain/PKGBUILD
	gnome-unstable/libdmapsharing/PKGBUILD
	gnome-unstable/libgda/PKGBUILD
	gnome-unstable/libgdata/PKGBUILD
	gnome-unstable/libgnome-keyring/PKGBUILD
	gnome-unstable/libgnome-media-profiles/PKGBUILD
	gnome-unstable/libgnomekbd/PKGBUILD
	gnome-unstable/libgpod/PKGBUILD
	gnome-unstable/libgweather/PKGBUILD
	gnome-unstable/libimobiledevice/PKGBUILD
	gnome-unstable/libnice/PKGBUILD
	gnome-unstable/libnotify/PKGBUILD
	gnome-unstable/libpeas/PKGBUILD
	gnome-unstable/librsvg/PKGBUILD
	gnome-unstable/libsocialweb/PKGBUILD
	gnome-unstable/libsoup/PKGBUILD
	gnome-unstable/libunique/PKGBUILD
	gnome-unstable/libunique3/PKGBUILD
	gnome-unstable/libwebkit/PKGBUILD
	gnome-unstable/libwnck/PKGBUILD
	gnome-unstable/libwnck3/PKGBUILD
	gnome-unstable/libxklavier/PKGBUILD
	gnome-unstable/metacity/PKGBUILD
	gnome-unstable/mousetweaks/PKGBUILD
	gnome-unstable/mutter/PKGBUILD
	gnome-unstable/mx/PKGBUILD
	gnome-unstable/nautilus-open-terminal/PKGBUILD
	gnome-unstable/nautilus-sendto/PKGBUILD
	gnome-unstable/nautilus/PKGBUILD
	gnome-unstable/network-manager-applet/PKGBUILD
	gnome-unstable/networkmanager-openvpn/PKGBUILD
	gnome-unstable/networkmanager-pptp/PKGBUILD
	gnome-unstable/networkmanager-vpnc/PKGBUILD
	gnome-unstable/networkmanager/PKGBUILD
	gnome-unstable/notification-daemon/PKGBUILD
	gnome-unstable/opal/PKGBUILD
	gnome-unstable/pangomm/PKGBUILD
	gnome-unstable/pidgin/PKGBUILD
	gnome-unstable/polkit-gnome/PKGBUILD
	gnome-unstable/polkit/PKGBUILD
	gnome-unstable/ptlib/PKGBUILD
	gnome-unstable/pygobject/PKGBUILD
	gnome-unstable/pygtk/PKGBUILD
	gnome-unstable/rest/PKGBUILD
	gnome-unstable/rhythmbox/PKGBUILD
	gnome-unstable/seahorse/PKGBUILD
	gnome-unstable/sound-juicer/PKGBUILD
	gnome-unstable/telepathy-gabble/PKGBUILD
	gnome-unstable/telepathy-glib/PKGBUILD
	gnome-unstable/telepathy-logger/PKGBUILD
	gnome-unstable/telepathy-mission-control/PKGBUILD
	gnome-unstable/tomboy/PKGBUILD
	gnome-unstable/totem-plparser/PKGBUILD
	gnome-unstable/totem/PKGBUILD
	gnome-unstable/upower/PKGBUILD
	gnome-unstable/vinagre/PKGBUILD
	gnome-unstable/vino/PKGBUILD
	gnome-unstable/vte/PKGBUILD
	gnome-unstable/yelp/PKGBUILD
	gnome-unstable/zenity/PKGBUILD
	libre-testing/kernel26-libre/PKGBUILD
	multilib-testing/lib32-libdrm/PKGBUILD
	staging/kdeaccessibility/PKGBUILD
	staging/kdeadmin/PKGBUILD
	staging/kdeartwork/PKGBUILD
	staging/kdebase-runtime/PKGBUILD
	staging/kdebase-workspace/PKGBUILD
	staging/kdebase/PKGBUILD
	staging/kdebindings/PKGBUILD
	staging/kdeedu/PKGBUILD
	staging/kdegames/PKGBUILD
	staging/kdegraphics/PKGBUILD
	staging/kdelibs/PKGBUILD
	staging/kdemultimedia/PKGBUILD
	staging/kdenetwork/PKGBUILD
	staging/kdepimlibs/PKGBUILD
	staging/kdeplasma-addons/PKGBUILD
	staging/kdeplasma-applets-networkmanagement/PKGBUILD
	staging/kdesdk/PKGBUILD
	staging/kdetoys/PKGBUILD
	staging/kdeutils/PKGBUILD
	staging/kdewebdev/PKGBUILD
	staging/strigi/PKGBUILD
	testing/aufs2-util/PKGBUILD
	testing/crda/PKGBUILD
	testing/dhcpcd/PKGBUILD
	testing/dmraid/PKGBUILD
	testing/eventlog/PKGBUILD
	testing/fakeroot/PKGBUILD
	testing/gnutls/PKGBUILD
	testing/libdrm/PKGBUILD
	testing/libgcrypt/PKGBUILD
	testing/libgpg-error/PKGBUILD
	testing/libpipeline/PKGBUILD
	testing/libx11/PKGBUILD
	testing/lilo/PKGBUILD
	testing/lirc/PKGBUILD
	testing/madwifi/PKGBUILD
	testing/man-db/PKGBUILD
	testing/mlocate/PKGBUILD
	testing/ncurses/PKGBUILD
	testing/python2/PKGBUILD
	testing/rsync/PKGBUILD
	testing/sqlite3/PKGBUILD
	testing/sudo/PKGBUILD
	testing/syslog-ng/PKGBUILD
	testing/tzdata/PKGBUILD
	testing/xf86-input-acecad/PKGBUILD
	testing/xf86-input-aiptek/PKGBUILD
	testing/xf86-input-evdev/PKGBUILD
	testing/xf86-input-joystick/PKGBUILD
	testing/xf86-input-keyboard/PKGBUILD
	testing/xf86-input-mouse/PKGBUILD
	testing/xf86-input-synaptics/PKGBUILD
	testing/xf86-input-void/PKGBUILD
	testing/xf86-input-wacom/PKGBUILD
	testing/xf86-video-apm/PKGBUILD
	testing/xf86-video-ark/PKGBUILD
	testing/xf86-video-ast/PKGBUILD
	testing/xf86-video-ati/PKGBUILD
	testing/xf86-video-chips/PKGBUILD
	testing/xf86-video-cirrus/PKGBUILD
	testing/xf86-video-dummy/PKGBUILD
	testing/xf86-video-fbdev/PKGBUILD
	testing/xf86-video-glint/PKGBUILD
	testing/xf86-video-i128/PKGBUILD
	testing/xf86-video-i740/PKGBUILD
	testing/xf86-video-intel/PKGBUILD
	testing/xf86-video-mach64/PKGBUILD
	testing/xf86-video-mga/PKGBUILD
	testing/xf86-video-neomagic/PKGBUILD
	testing/xf86-video-nouveau/PKGBUILD
	testing/xf86-video-nv/PKGBUILD
	testing/xf86-video-openchrome/PKGBUILD
	testing/xf86-video-r128/PKGBUILD
	testing/xf86-video-rendition/PKGBUILD
	testing/xf86-video-s3/PKGBUILD
	testing/xf86-video-s3virge/PKGBUILD
	testing/xf86-video-savage/PKGBUILD
	testing/xf86-video-siliconmotion/PKGBUILD
	testing/xf86-video-sis/PKGBUILD
	testing/xf86-video-sisusb/PKGBUILD
	testing/xf86-video-tdfx/PKGBUILD
	testing/xf86-video-trident/PKGBUILD
	testing/xf86-video-tseng/PKGBUILD
	testing/xf86-video-unichrome/PKGBUILD
	testing/xf86-video-v4l/PKGBUILD
	testing/xf86-video-vesa/PKGBUILD
	testing/xf86-video-voodoo/PKGBUILD
	testing/xf86-video-xgi/PKGBUILD
	testing/xf86-video-xgixp/PKGBUILD
	testing/xorg-server/PKGBUILD
	testing/xz/PKGBUILD

2 files changed, 0 insertions, 57 deletions

diff --git a/extra/libtiff/ChangeLog b/extra/libtiff/ChangeLog
deleted file mode 100644
index 88edcc7fc..000000000
--- a/extra/libtiff/ChangeLog
+++ /dev/null
@@ -1,35 +0,0 @@
-2010-06-20  Eric Belanger  <eric@archlinux.org>
-
-	* libtiff 3.9.4-1
-	* Upstream update
-
-2009-11-05  Eric Belanger  <eric@archlinux.org>
-
-	* libtiff 3.9.2-1
-	* Upstream update
-
-2009-08-28  Eric Belanger  <eric@archlinux.org>
-
-	* libtiff 3.9.1-1
-	* Upstream update
-
-2009-08-26  Eric Belanger  <eric@archlinux.org>
-
-	* libtiff 3.9.0-1
-	* Upstream update
-	* Updated url
-	* Updated patches
-
-2009-08-14  Eric Belanger  <eric@archlinux.org>
-
-	* libtiff 3.8.2-6
-	* Added security fixes (close FS#15931)
-
-2008-09-05  Eric Belanger  <eric@archlinux.org>
-
-	* libtiff 3.8.2-4
-	* Applied patch to fix buffer underflow in LZW decoding	(tiff-3.8.2-CVE-2008-2327.patch)
-	* Added license
-	* Added freeglut optdepends
-	* FHS man pages
-	* Added ChangeLog
diff --git a/extra/libtiff/libtiff-CVE-2009-2285.patch b/extra/libtiff/libtiff-CVE-2009-2285.patch
deleted file mode 100644
index 435a84b53..000000000
--- a/extra/libtiff/libtiff-CVE-2009-2285.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: tiff-3.8.2/libtiff/tif_lzw.c
-===================================================================
---- tiff-3.8.2.orig/libtiff/tif_lzw.c
-+++ tiff-3.8.2/libtiff/tif_lzw.c
-@@ -421,7 +421,7 @@ LZWDecode(TIFF* tif, tidata_t op0, tsize
- 			NextCode(tif, sp, bp, code, GetNextCode);
- 			if (code == CODE_EOI)
- 				break;
--			if (code == CODE_CLEAR) {
-+			if (code >= CODE_CLEAR) {
- 				TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- 				"LZWDecode: Corrupted LZW table at scanline %d",
- 				tif->tif_row);
-@@ -624,7 +624,7 @@ LZWDecodeCompat(TIFF* tif, tidata_t op0,
- 			NextCode(tif, sp, bp, code, GetNextCodeCompat);
- 			if (code == CODE_EOI)
- 				break;
--			if (code == CODE_CLEAR) {
-+			if (code >= CODE_CLEAR) {
- 				TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
- 				"LZWDecode: Corrupted LZW table at scanline %d",
- 				tif->tif_row);