Merge branch 'master' of github.com:archlinuxarm/PKGBUILDs

2025-03-19 00:21:40 +00:00 · 2012-03-20 03:19:57 -04:00 · 2012-03-20 03:19:57 -04:00 · 1da3ed4fd4
commit 1da3ed4fd4
parent b4684afa62 98e5835139
141 changed files with 7784 additions and 2690 deletions
--- a/6
+++ b/6
@ -1,4 +1,4 @@
-pkgbuilds.git - README - 05/18/2011
+pkgbuilds.git - README - 03/15/2012
 --------------------------------------------------------------------------------
 This git repository hosts PKGBUILDs that have been modified from the upstream
 Arch Linux (http://archlinux.org) release in order to build on the ARMv5te and
@ -10,5 +10,9 @@ by the community to be pre-compiled and easily installed.  However, you're free
 to use the AUR just as you would on Arch, and we have included Yaourt to compile
 and install directly from AUR (yaourt -AS packagename).

+The alarm folder contains packages we have created or that have been submitted
+to us to enable functionality on ARM systems in use by the community.  These are
+packages that are not available in either upstream or AUR.
+
 These packages are meant to be built on Arch Linux ARM, found at
 http://archlinuxarm.org
--- a/alarm/h2n/.gitignore
+++ b/alarm/h2n/.gitignore
--- a/alarm/h2n/PKGBUILD
+++ b/alarm/h2n/PKGBUILD
--- a/alarm/libz160/PKGBUILD
+++ b/alarm/libz160/PKGBUILD
--- a/alarm/mochad/PKGBUILD
+++ b/alarm/mochad/PKGBUILD
@ -3,7 +3,7 @@
 plugrel=1

 pkgname=mochad
-pkgver=0.1.14
+pkgver=0.1.15
 pkgrel=1
 pkgdesc="A Linux TCP gateway daemon for the X10 CM15A RF and PL controller and the CM19A RF controller"
 arch=('arm' 'armv7h')
@ -11,7 +11,7 @@ license=('GPL')
 url="http://mochad.sourceforge.net/"
 depends=('libusb')
 source=(http://downloads.sf.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e2e64c00f4809f16c9a2e0c882e77eb5')
+md5sums=('e1de0c9e62e10236542e70c2f33aacc2')

 build() {
  cd "${srcdir}/${pkgname}-${pkgver}"
--- a/alarm/mouse-emul-git/PKGBUILD
+++ b/alarm/mouse-emul-git/PKGBUILD
--- a/alarm/mouse-emul-git/conf-d-mouse-emul
+++ b/alarm/mouse-emul-git/conf-d-mouse-emul
--- a/alarm/mouse-emul-git/rc-d-mouse-emul
+++ b/alarm/mouse-emul-git/rc-d-mouse-emul
--- a/alarm/nvidia-trimslice/PKGBUILD
+++ b/alarm/nvidia-trimslice/PKGBUILD
--- a/alarm/nvidia-trimslice/xorg.conf
+++ b/alarm/nvidia-trimslice/xorg.conf
--- a/alarm/ofono-git/PKGBUILD
+++ b/alarm/ofono-git/PKGBUILD
--- a/alarm/raspberrypi-firmware/PKGBUILD
+++ b/alarm/raspberrypi-firmware/PKGBUILD
@ -0,0 +1,26 @@
+plugrel=1
+noautobuild=1
+
+pkgname=raspberrypi-firmware
+pkgver=20120317
+pkgrel=1
+pkgdesc="Firmware files for Raspberry Pi"
+arch=('any')
+url="https://github.com/raspberrypi/firmware"
+makedepends=('git')
+license=('custom')
+provides=('raspberrypi-firmware')
+conflicts=()
+backup=(boot/{cmdline,config}.txt)
+replaces=()
+options=(!strip)
+source=(config.txt)
+md5sums=('0745afd44de4fe969b4ecb8d47d6a1c0')
+
+package() {
+  git clone git://github.com/raspberrypi/firmware.git
+  rm "${srcdir}"/firmware/boot/kernel.img
+  cat "${srcdir}"/config.txt > "${srcdir}"/firmware/boot/config.txt
+  cp -R "${srcdir}"/firmware/{boot,opt} "${pkgdir}"
+}
+
--- a/alarm/raspberrypi-firmware/config.txt
+++ b/alarm/raspberrypi-firmware/config.txt
@ -0,0 +1,3 @@
+#hdmi_mode=19
+arm_freq=800
+enable_l2cache=1
--- a/alarm/ti-connectivity/PKGBUILD
+++ b/alarm/ti-connectivity/PKGBUILD
--- a/alarm/xbmc-tegra/FEH.sh
+++ b/alarm/xbmc-tegra/FEH.sh
--- a/alarm/xbmc-tegra/PKGBUILD
+++ b/alarm/xbmc-tegra/PKGBUILD
--- a/alarm/xbmc-tegra/gles_bgra.patch
+++ b/alarm/xbmc-tegra/gles_bgra.patch
--- a/alarm/xbmc-tegra/xbmc-10.0-python-2.7.patch
+++ b/alarm/xbmc-tegra/xbmc-10.0-python-2.7.patch
--- a/alarm/xbmc-tegra/xbmc-10.1-gcc-4.6.patch
+++ b/alarm/xbmc-tegra/xbmc-10.1-gcc-4.6.patch
--- a/alarm/xbmc-tegra/xbmc-tegra.install
+++ b/alarm/xbmc-tegra/xbmc-tegra.install
--- a/alarm/xbmc-tegra/xbmcplugin_int_format.patch
+++ b/alarm/xbmc-tegra/xbmcplugin_int_format.patch
--- a/alarm/xf86-video-imx/PKGBUILD
+++ b/alarm/xf86-video-imx/PKGBUILD
--- a/alarm/xf86-video-omapfb/PKGBUILD
+++ b/alarm/xf86-video-omapfb/PKGBUILD
@ -7,7 +7,7 @@ plugrel=1

 pkgname="xf86-video-omapfb"
 pkgver=0.1.1.1
-pkgrel=1
+pkgrel=2
 arch=('armv7h')
 url="http://gitweb.pingu.fi/?p=xf86-video-omapfb.git"
 license=('GPL2')
--- a/alarm/z2-console-font/5x8.psf.gz
+++ b/alarm/z2-console-font/5x8.psf.gz
--- a/alarm/z2-console-font/PKGBUILD
+++ b/alarm/z2-console-font/PKGBUILD
--- a/alarm/z2-sdl-profile/PKGBUILD
+++ b/alarm/z2-sdl-profile/PKGBUILD
--- a/alarm/z2-sdl-profile/z2.sh
+++ b/alarm/z2-sdl-profile/z2.sh
--- a/aur/dropbear/PKGBUILD
+++ b/aur/dropbear/PKGBUILD
@ -1,33 +1,32 @@
-# Maintainer Kai Uwe Jesussek <kajot@gmx.net>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Jason Pierce <`echo 'moc tod liamg ta nosaj tod ecreip' | rev`>
 # Contributor: Jeremy Cowgar <jeremy@cowgar.com>

 plugrel=1
+
 pkgname=dropbear
-pkgver=0.53.1
+pkgver=2012.55
 pkgrel=1
-pkgdesc="Lightweight replacement for openssh"
-arch=('arm' 'i686' 'x86_64')
+pkgdesc="Lightweight replacement for sshd"
+arch=('i686' 'x86_64')
 url="http://matt.ucc.asn.au/dropbear/dropbear.html"
 license=('custom')
 depends=('zlib')
-provides=('openssh')
-conflicts=('openssh')
+backup=(etc/conf.d/dropbear)
 source=(http://matt.ucc.asn.au/$pkgname/releases/$pkgname-$pkgver.tar.bz2 \
        $pkgname-conf.d \
        $pkgname-rc.d)
-sha256sums=('e24d3cbecd3bc850b2b336b8eb50c845a285ceef8e22544938a582e163d36393'
-            'd5a3b08e4e79b841ba1cd592d79cf91cd9cd7948e683d35de550cb08bd3f285f'
-	    '29ab5438d15bfa727620fc04ec52ff55d676577b903c9261ce00bb291ae171a8')
+sha256sums=('04982af2a10b220fa940f9f72f276d612c9bb643cfbb5ee1416e5a0f00de9b0f'
+            'eaec8cecae4476a660351ba9079c91b7c379146a22df881bd24b81af8f50d74c'
+            '29ab5438d15bfa727620fc04ec52ff55d676577b903c9261ce00bb291ae171a8')

 build() {
  cd ${srcdir}/$pkgname-$pkgver

  sed -i 's:usr/libexec/sftp:usr/lib/ssh/sftp:' options.h

-  ./configure --prefix=/usr --enable-pam
-  LIBS="-lcrypt" make PROGRAMS="dropbear dropbearkey dropbearconvert dbclient scp" MULTI=0 STATIC=0 SCPPROGRESS=1
+  ./configure --prefix=/usr
+  LIBS="-lcrypt" make
 }

 package() {
@ -35,10 +34,6 @@ package() {

  make prefix=${pkgdir}/usr install

-#make it openssh compatible
-  ln -s /usr/bin/dbclient ${pkgdir}/usr/bin/ssh  
-  install -D -m755 scp ${pkgdir}/usr/bin/scp
-
 #man pages
  install -D -m644 dbclient.1 ${pkgdir}/usr/share/man/man1/dbclient.1
  install -D -m644 $pkgname.8 ${pkgdir}/usr/share/man/man8/$pkgname.8
--- a/aur/dropbear/dropbear-conf.d
+++ b/aur/dropbear/dropbear-conf.d
@ -1,8 +1,8 @@
 # the TCP port that Dropbear listens on
-DROPBEAR_PORT="0.0.0.0:22" # Default to local-only.
+DROPBEAR_PORT="127.0.0.1:22" # Default to local-only.

 # any additional arguments for Dropbear
-DROPBEAR_EXTRA_ARGS="" # Default to no-root logins.
+DROPBEAR_EXTRA_ARGS="-w" # Default to no-root logins.

 # specify an optional banner file containing a message to be
 # sent to clients before they connect, such as "/etc/issue.net"
--- a/aur/gmu-z2/PKGBUILD
+++ b/aur/gmu-z2/PKGBUILD
@ -1,23 +0,0 @@
-# Maintainer: Kai Uwe Jesussek <kajot@gmx.net>
-
-plugrel=1
-pkgname=gmu-z2
-pkgver=0.7.2
-pkgrel=1
-pkgdesc="A very nice Music Player, based on SDL, optimized for zipit z2"
-arch=('i686' 'x86_64' 'arm')
-url="http://wejp.k.vu"
-license=('GPL2')
-depends=('z2-sdl-profile' 'sdl' 'sdl_image' 'sdl_gfx' 'libvorbisdec-svn' 'flac' 'mpg123-arm' 'libmikmod' 'speex')
-source=('http://wejp.k.vu/files/gmu-0.7.2.tar.gz' 'gmu.conf' 'gmuinput.z2.conf' 'zipit-z2.keymap')
-md5sums=('dea481ab0f8f9f10b38aa21605dbb18d' 'b5e3da96885250a665600c4daac439a6' '705519d822f77ab3f48b7738751798f5' '5befd516c3d8226c5de8b3725cf27ba3')
-provides=('gmu')
-build() {
-	cd ${srcdir}/gmu-${pkgver}
-	make || return 1
-	make DESTDIR=${pkgdir} install
-	cd ${srcdir}
-	mkdir -p ${pkgdir}/usr/local/share/gmu/
-	cp gmu.conf gmuinput.z2.conf zipit-z2.keymap ${pkgdir}/usr/local/share/gmu/
-}
-
--- a/aur/gmu-z2/gmu.conf
+++ b/aur/gmu-z2/gmu.conf
@ -1,39 +0,0 @@
-DefaultPlayMode=random+repeat
-RememberLastPlaylist=yes
-RememberSettings=yes
-EnableCoverArtwork=yes
-CoverArtworkFilePattern=cover.jpg;cover.png;front.jpg;*.jpg;*.png
-LoadEmbeddedCoverArtwork=first
-LyricsFilePattern=$.txt;*.txt;*.nfo
-FileSystemCharset=UTF-8
-PlaylistSavePresets=rock.m3u;pop.m3u;electronic.m3u;classic.m3u;alternative.m3u;soundtrack.m3u;chiptunes.m3u;playlist1.m3u;playlist2.m3u;playlist3.m3u;playlist4.m3u;playlist5.m3u;playlist6.m3u;playlist7.m3u;playlist8.m3u;playlist9.m3u;playlist10.m3u
-TimeDisplay=remaining
-CPUClock=default
-DefaultFileBrowserPath=/
-VolumeControl=Software
-VolumeHardwareMixerChannel=0
-Volume=15
-DefaultSkin=default-modern
-AutoSelectCurrentPlaylistItem=yes
-AutoPlayOnProgramStart=no
-Scroll=always
-FileBrowserFoldersFirst=yes
-BacklightPowerOnOnTrackChange=no
-KeyMap=zipit-z2.keymap
-AllowVolumeControlInHoldState=no
-SecondsUntilBacklightPowerOff=0
-CoverArtworkLarge=no
-SmallCoverArtworkAlignment=right
-FirstRun=no
-ResumePlayback=yes
-InputConfigFile=gmuinput.z2.conf
-Shutdown=0
-ShutdownCommand=/sbin/poweroff
-Log.Enable=no
-Log.MinimumPlaytimeSec=30
-Log.MinimumPlaytimePercent=50
-LastPlayedPlaylistItem=None
-LastPlayedPlaylistItemTime=0
-SDL_frontend.Width=240
-SDL_frontend.Height=240
-SDL_frontend.Fullscreen=no
--- a/aur/gmu-z2/gmuinput.z2.conf
+++ b/aur/gmu-z2/gmuinput.z2.conf
@ -1,83 +0,0 @@
-FullKeyboard=yes
-Button-0=13,Return
-Button-1=32,Space
-Button-2=13,Enter
-Button-3=97,A
-Button-4=98,B
-Button-5=99,C
-Button-6=100,D
-Button-7=101,E
-Button-8=102,F
-Button-9=103,G
-Button-10=104,H
-Button-11=105,I
-Button-12=106,J
-Button-13=107,K
-Button-14=108,L
-Button-15=109,M
-Button-16=110,N
-Button-17=111,O
-Button-18=112,P
-Button-19=113,Q
-Button-20=114,R
-Button-21=115,S
-Button-22=116,T
-Button-23=117,U
-Button-24=118,V
-Button-25=119,W
-Button-26=120,X
-Button-27=121,Y
-Button-28=122,Z
-Button-29=43,+
-Button-30=45,-
-Button-31=32,Space
-Button-32=13,Enter
-Button-33=27,ESC
-Button-34=308,Alt
-Button-35=306,CTRL
-Button-36=305,CTRL_R
-Button-37=313,AltGr
-Button-38=304,ShiftL
-Button-39=303,ShiftR
-Button-40=8,Backspace
-Button-41=127,Delete
-Button-42=277,Insert
-Button-43=48,0
-Button-44=49,1
-Button-45=50,2
-Button-46=51,3
-Button-47=52,4
-Button-48=53,5
-Button-49=54,6
-Button-50=55,7
-Button-51=56,8
-Button-52=57,9
-Button-53=9,Tab
-Button-54=301,CapsLock
-Button-55=282,F1
-Button-56=283,F2
-Button-57=284,F3
-Button-58=285,F4
-Button-59=286,F5
-Button-60=287,F6
-Button-61=288,F7
-Button-62=289,F8
-Button-63=290,F9
-Button-64=291,F10
-Button-65=292,F11
-Button-66=293,F12
-Button-67=44,<
-Button-68=46,>
-Button-69=273,Up
-Button-70=274,Down
-Button-71=276,Left
-Button-72=275,Right
-Button-73=280,Volume+
-Button-74=281,Volume-
-Button-75=279,(B)
-Button-76=278,(A)
-Button-75=9,Tab
-Button-76=303,(L)
-Button-77=305,(R)
-Button-78=46,Dot
-Button-79=44,Comma
--- a/aur/gmu-z2/zipit-z2.keymap
+++ b/aur/gmu-z2/zipit-z2.keymap
@ -1,67 +0,0 @@
-# Gmu key mappings
-# Required keys: Modifier, Up, 
-# Down, Pause, ProgramInfo, Exit,
-# PlaylistPlayItem, PlaylistClear,
-# FileBrowserAddFileToPlaylistOrChDir
-# Buttons names are defined in gmuinput.conf.
-
-Modifier=Alt
-# Global mappings:
-Left=Left
-Right=Right
-Up=Up
-Down=Down
-IncreaseVolume=Volume+
-DecreaseVolume=Volume-
-ToggleTime=T
-Pause=P
-Stop=X
-ToggleView=Space
-PreviousTrack=Comma
-NextTrack=Dot
-SeekForward=M
-SeekBackward=N
-Hold=Mod+Up
-Exit=ESC
-ShutdownTimer=Mod+Down
-Help=H
-
-# Program info mappings:
-ProgramInfo=I
-ProgramInfoOkay=Enter
-# File browser mappings:
-#FileBrowserDirUp=LEFT
-#FileBrowserChDir=RIGHT
-
-FileBrowserPlayFile=A
-FileBrowserAddFileToPlaylistOrChDir=Enter
-FileBrowserAddDirToPlaylist=Y
-FileBrowserInsertFileIntoPlaylist=Mod+B
-FileBrowserNewPlFromDir=Mod+Y
-#FileBrowserDeleteFile=Mod+X
-# Playlist mappings:
-PlaylistPlayItem=Enter
-PlaylistToggleRandomMode=R
-PlaylistRemoveItem=Y
-PlaylistClear=Mod+C
-PlaylistSave=S
-# Playlist save dialog:
-PlaylistSaveSelect=Enter
-PlaylistSaveCancel=C
-PlaylistSaveLoadList=L
-PlaylistSaveAppendList=Mod+Y
-#PlaylistDeleteFile=Mod+X
-PlaylistQueue=Q
-# Track info mappings:
-TrackInfoToggleCover=A
-TrackInfoToggleText=B
-# Question dialog mappings: 
-QuestionYes=Enter
-QuestionNo=C
-# Setup mappings:
-SetupSelect=B
-SetupSaveAndExit=X
-SetupSaveAndRunGmu=Y
-SetupFileBrowserSelect=B
-SetupFileBrowserChDir=A
-SetupFileBrowserCancel=X
--- a/aur/libvorbisidec-svn/PKGBUILD
+++ b/aur/libvorbisidec-svn/PKGBUILD
@ -1,36 +0,0 @@
-# Maintainer: evnu <mamuelle@informatik.hu-berlin.de>
-plugrel=1
-pkgname=libvorbisdec-svn
-pkgver=17636
-pkgrel=1
-pkgdesc="Tremor is a fixed-point version of the Ogg Vorbis decoder for those platforms that can't do floating point math. It can be installed with libvorbis together"
-arch=('arm')
-url="http://wiki.xiph.org/index.php/Tremor"
-license=('GPL')
-depends=('libogg')
-makedepends=('subversion' 'autoconf' 'automake')
-source=()
-md5sums=()
-
-_svntrunk="http://svn.xiph.org/trunk/Tremor/"
-_svnmod=Tremor
-
-build() {
-	cd $srcdir
-			if [ -d "${_svnmod}"/.svn ]
-			then
-				msg "Starting SVN update ..."
-				cd "${_svnmod}"
-				svn up
-				msg "... updating finished."
-			else
-				msg "Starting SVN checkout ..."
-				svn co ${_svntrunk} 
-				msg "... checkout finished."
-			fi
-	cd $srcdir/${_svnmod}	
-	./autogen.sh --prefix=/usr/
-	make || return 1
-	make DESTDIR=${pkgdir} install || return 1
-}
-
--- a/aur/mplayer-z2/PKGBUILD
+++ b/aur/mplayer-z2/PKGBUILD
@ -1,52 +0,0 @@
-# $Id: PKGBUILD 117246 2011-03-30 14:23:30Z ibiru $
-# Maintainer: Kai Uwe Jesussek <kajot@gmx.net>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-plugrel=1
-pkgname=mplayer-z2
-pkgver=1.0rc4
-pkgrel=1
-pkgdesc="A movie player for linux"
-arch=('i686' 'x86_64' 'arm')
-depends=('libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss'
-         'smbclient' 'aalib' 'libcaca' 'x264' 'faac' 'ttf-dejavu' 'libxvmc' 'enca' 'mpg123-arm'
-         'opencore-amr' 'libdca' 'a52dec')
-license=('GPL')
-url="http://www.mplayerhq.hu/"
-makedepends=('unzip' 'yasm')
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-source=('mplayer-1.0rc4-pxa-wejp.patch' 'mplayer.conf' 'http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc4.tar.bz2' )
-conflicts=('mplayer')
-provides=('mplayer')
-md5sums=('480d11daa4962629e6fb26bd61993a0f'
-         '6e960e87b4aee28889f0ea5c65f711fb'
-         '1699c94de39da9c4c5d34e8f58e418f0')
-
-build() {
-  # Custom CFLAGS break the mplayer build
-  unset CFLAGS LDFLAGS
-
-  cd ${srcdir}/MPlayer-1.0rc4
-  patch -p1 < ${srcdir}/mplayer-1.0rc4-pxa-wejp.patch
-  ./configure --enable-armv5te --enable-iwmmxt --enable-pxa \
-  --enable-faad-fixed --enable-tremor-low \
-  --disable-mp3lib --disable-libvorbis --disable-vidix \
-  --extra-cflags="-march=iwmmxt" \
-  --disable-runtime-cpudetection --disable-sighandler \
-  --disable-live --enable-alsa --enable-mpg123 \
-  --extra-ldflags="-lmpg123" \
-  --confdir=/etc/mplayer
-
-  [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
-
-  #make
-  make -j1 DESTDIR=${pkgdir} install
-  install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/
-  mkdir -p ${pkgdir}/etc/mplayer/
-  cp ${srcdir}/mplayer.conf ${pkgdir}/etc/mplayer/
-  install -dm755 ${pkgdir}/usr/share/mplayer/
-  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf
-  rm -rf ${pkgdir}/usr/share/mplayer/font
-}
-
--- a/aur/mplayer-z2/mplayer-1.0rc4-pxa-wejp.patch
+++ b/aur/mplayer-z2/mplayer-1.0rc4-pxa-wejp.patch
@ -1,393 +0,0 @@
-diff -ruN MPlayer-1.0rc4/configure MPlayer-1.0rc4-pxa/configure
--- MPlayer-1.0rc4/configure	2010-07-29 02:31:57.000000000 +0200
-+++ MPlayer-1.0rc4-pxa/configure	2011-02-27 14:12:12.000000000 +0100
-@@ -630,6 +630,7 @@
- _svga=auto
- _vesa=auto
- _fbdev=auto
-+_pxa=no
- _dvb=auto
- _dxr2=auto
- _dxr3=auto
-@@ -997,6 +998,8 @@
-   --enable-fbdev)       _fbdev=yes      ;;
-   --disable-fbdev)      _fbdev=no       ;;
-   --enable-dvb)         _dvb=yes        ;;
-+  --enable-pxa)         _pxa=yes        ;;
-+  --disable-pxa)        _pxa=no         ;;
-   --disable-dvb)        _dvb=no         ;;
-   --enable-dxr2)        _dxr2=yes       ;;
-   --disable-dxr2)       _dxr2=no        ;;
-@@ -4875,7 +4878,15 @@
- fi
- echores "$_fbdev"
- 
-
-+echocheck "PXA27x Overlay Support"
-+if test "$_pxa" = yes ; then
-+  def_pxa='#define CONFIG_PXA 1'
-+  vomodules="pxa $vomodules"
-+else
-+  def_pxa='#undef CONFIG_PXA'
-+  novomodules="pxa $novomodules"
-+fi
-+echores "$_pxa"
- 
- echocheck "DVB"
- if test "$_dvb" = auto ; then
-@@ -8644,6 +8655,7 @@
- PRIORITY = $_priority
- PULSE = $_pulse
- PVR = $_pvr
-+PXA = $_pxa
- QTX_CODECS = $_qtx
- QTX_CODECS_WIN32 = $_qtx_codecs_win32
- QTX_EMULATION = $_qtx_emulation
-@@ -9121,6 +9133,7 @@
- $def_dxr2
- $def_dxr3
- $def_fbdev
-+$def_pxa
- $def_ggi
- $def_ggiwmh
- $def_gif
-diff -ruN MPlayer-1.0rc4/libvo/video_out.c MPlayer-1.0rc4-pxa/libvo/video_out.c
--- MPlayer-1.0rc4/libvo/video_out.c	2010-06-13 14:04:13.000000000 +0200
-+++ MPlayer-1.0rc4-pxa/libvo/video_out.c	2011-02-27 03:24:10.000000000 +0100
-@@ -114,6 +114,7 @@
- extern vo_functions_t video_out_fbdev;
- extern const vo_functions_t video_out_fbdev2;
- extern vo_functions_t video_out_svga;
-+extern const vo_functions_t video_out_pxa;
- extern const vo_functions_t video_out_png;
- extern const vo_functions_t video_out_ggi;
- extern const vo_functions_t video_out_aa;
-@@ -214,6 +215,9 @@
-         &video_out_fbdev,
-         &video_out_fbdev2,
- #endif
-+#ifdef CONFIG_PXA
-+        &video_out_pxa,
-+#endif
- #ifdef CONFIG_SVGALIB
-         &video_out_svga,
- #endif
-diff -ruN MPlayer-1.0rc4/libvo/vo_pxa.c MPlayer-1.0rc4-pxa/libvo/vo_pxa.c
--- MPlayer-1.0rc4/libvo/vo_pxa.c	1970-01-01 01:00:00.000000000 +0100
-+++ MPlayer-1.0rc4-pxa/libvo/vo_pxa.c	2011-02-26 22:18:06.000000000 +0100
-@@ -0,0 +1,304 @@
-+/*
-+ * Video driver for PXA27x/3xx Overlay 2
-+ * by Vasily Khoruzhick <anarsoul@gmail.com>
-+ * (C) 2007
-+ */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+
-+#include <linux/fb.h>
-+
-+#include <sys/ioctl.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <sys/mman.h>
-+
-+#include "config.h"
-+#include "video_out.h"
-+#include "video_out_internal.h"
-+#include "sub.h"
-+#include "aspect.h"
-+#include "mp_msg.h"
-+#include "subopt-helper.h"
-+
-+static vo_info_t info = {
-+    "PXA27x/3xx overlay",
-+    "pxa",
-+    "Vasily Khoruzhick <anarsoul@gmail.com>",
-+    ""
-+};
-+
-+LIBVO_EXTERN(pxa);
-+
-+/* VO driver state */
-+
-+static int overlay_width, overlay_height, overlay_x, overlay_y;
-+static int overlay_fd = -1;
-+static void *overlay_mem;
-+static size_t overlay_mem_size;
-+static uint8_t *y_plane;
-+static uint8_t *u_plane;
-+static uint8_t *v_plane;
-+
-+static int vo_pxa_check_format(uint32_t format)
-+{
-+    switch (format)
-+    {
-+        /* Planar YUV Formats */
-+        case IMGFMT_YV12:
-+        case IMGFMT_IYUV:
-+        case IMGFMT_I420:
-+            return( VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW
-+                    | VFCAP_ACCEPT_STRIDE );
-+            break;
-+
-+    }
-+
-+    mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: format %s is not supported\n",
-+        vo_format_name(format));
-+
-+    return 0;
-+}
-+
-+/*****************************************************************************
-+ * preinit
-+ *
-+ * Preinitializes driver
-+ *   arg - currently it's vo_subdevice
-+ *   returns: zero on successful initialization, non-zero on error.
-+ *
-+ ****************************************************************************/
-+static int preinit(const char *vo_subdevice)
-+{
-+    int r, fb = -1;
-+    struct fb_var_screeninfo fbvar;
-+
-+    fb = open("/dev/fb0", O_RDWR);
-+    r = ioctl(fb, FBIOGET_VSCREENINFO, &fbvar);
-+    if (r) {
-+        mp_msg(MSGT_VO, MSGL_V, "vo_pxa: get_vscreeninfo ioctl failed");
-+        return -1;
-+    }
-+
-+    overlay_width = fbvar.xres;
-+    overlay_height = fbvar.yres;
-+
-+    mp_msg(MSGT_VO, MSGL_V, "vo_pxa: main plane res is %dx%d\n",
-+        overlay_width, overlay_height);
-+
-+    close(fb);
-+
-+    return 0;
-+}
-+
-+
-+/*****************************************************************************
-+ * config
-+ *
-+ * Config the display driver.
-+ * params:
-+ *   src_width,srcheight: image source size
-+ *   dst_width,dst_height: size of the requested window size, just a hint
-+ *   fullscreen: flag, 0=windowd 1=fullscreen, just a hint
-+ *   title: window title, if available
-+ *   format: fourcc of pixel format
-+ * returns : zero on successful initialization, non-zero on error.
-+ *
-+ ****************************************************************************/
-+static int config(uint32_t src_width, uint32_t src_height,
-+                  uint32_t dst_width, uint32_t dst_height, uint32_t flags,
-+                  char *title, uint32_t format)
-+{
-+    int r;
-+    struct fb_var_screeninfo fbvar;
-+    struct fb_fix_screeninfo fbfix;
-+    int i;
-+
-+    mp_msg(MSGT_VO, MSGL_V, "vo_pxa: config() src_width:%d, src_height:%d, dst_width:%d, dst_height:%d\n",
-+       src_width, src_height, dst_width, dst_height);
-+
-+    /* Check format */
-+    if (!vo_pxa_check_format(format))
-+        goto error;
-+
-+    /* Check src image */
-+    if (src_width > overlay_width || src_height > overlay_height) {
-+        mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: src image is too big, scaling not supported.\n");
-+        goto error;
-+    }
-+
-+    if (dst_width > overlay_width || dst_height > overlay_height) {
-+        mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: dst is too big, scaling not supported.\n");
-+        goto error;
-+    }
-+
-+    if (src_width != dst_width || src_height != dst_height) {
-+        mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: src != dst, scaling not supported.\n");
-+        goto error;
-+    }
-+
-+    overlay_x = (overlay_width - dst_width) / 2;
-+    overlay_y = (overlay_height - dst_height) / 2;
-+
-+    overlay_fd = open("/dev/fb2", O_RDWR);
-+    r = ioctl(overlay_fd, FBIOGET_VSCREENINFO, &fbvar);
-+    if (r) {
-+        mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: get_vscreeninfo ioctl failed\n");
-+        goto error;
-+    }
-+
-+    fbvar.xres_virtual = fbvar.xres = overlay_width;
-+    fbvar.yres_virtual = fbvar.yres = overlay_height;
-+    fbvar.bits_per_pixel = 16;
-+    fbvar.activate = FB_ACTIVATE_NOW;
-+
-+    fbvar.nonstd = (4 << 20) | (0 << 10) | (0); /* YUV420P, X=0, Y=0 */
-+
-+    r = ioctl(overlay_fd, FBIOPUT_VSCREENINFO, &fbvar);
-+    if (r) {
-+        mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: put_vscreeninfo ioctl failed\n");
-+        goto error;
-+    }
-+    r = ioctl(overlay_fd, FBIOGET_FSCREENINFO, &fbfix);
-+    if (r) {
-+        mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: get_fscreeninfo ioctl failed\n");
-+        goto error;
-+    }
-+
-+    overlay_mem_size = fbfix.smem_len;
-+    overlay_mem = mmap(NULL, overlay_mem_size, (PROT_READ | PROT_WRITE),
-+        MAP_SHARED, overlay_fd, 0);
-+
-+    if (overlay_mem == MAP_FAILED) {
-+        mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: failed to mmap overlay");
-+        goto error;
-+    }
-+
-+    y_plane = overlay_mem;
-+    u_plane = y_plane + overlay_width * overlay_height;
-+    v_plane = u_plane + overlay_width * overlay_height / 4;
-+
-+    /* Fill the overlay with black */
-+    memset(y_plane, 16,
-+        overlay_width * overlay_height);
-+    memset(u_plane, 128,
-+        overlay_width * overlay_height / 4);
-+    memset(v_plane, 128,
-+        overlay_width * overlay_height / 4);
-+
-+    mp_msg(MSGT_VO, MSGL_V, "vo_pxa: configured and opened 2nd overlay");
-+
-+    return 0;
-+
-+error:
-+    if (overlay_mem)
-+        munmap(overlay_mem, overlay_mem_size);
-+    if (overlay_fd != -1)
-+        close(overlay_fd);
-+
-+    overlay_mem = NULL;
-+    overlay_fd = -1;
-+
-+    return -1;
-+}
-+
-+static int control(uint32_t request, void *data, ...)
-+{
-+    mp_msg(MSGT_VO, MSGL_V, "vo_pxa: control %08x\n", request );
-+
-+    switch( request )
-+    {
-+        case VOCTRL_QUERY_FORMAT:
-+            return( vo_pxa_check_format( *(uint32_t *)data ) );
-+            break;
-+    }
-+
-+    return VO_NOTIMPL;
-+}
-+
-+
-+int draw_frame(uint8_t *src[])
-+{
-+    return 1;
-+}
-+
-+
-+/*****************************************************************************
-+ *
-+ * draw_slice
-+ *
-+ * Draw a planar YUV slice to the buffer:
-+ * params:
-+ *   src[3] = source image planes (Y,U,V)
-+ *   stride[3] = source image planes line widths (in bytes)
-+ *   w,h = width*height of area to be copied (in Y pixels)
-+ *   x,y = position at the destination image (in Y pixels)
-+ *
-+ ****************************************************************************/
-+int draw_slice(uint8_t *src[], int stride[], int w,int h, int x,int y)
-+{
-+    int i;
-+
-+    x += overlay_x;
-+    y += overlay_y;
-+
-+    uint8_t *dst_y = y_plane + y * overlay_width + x;
-+    uint8_t *dst_u = u_plane + y * overlay_width / 4 + x / 2;
-+    uint8_t *dst_v = v_plane + y * overlay_width / 4 + x / 2;
-+    uint8_t *src_y = src[0];
-+    uint8_t *src_u = src[1];
-+    uint8_t *src_v = src[2];
-+
-+    mp_msg(MSGT_VO, MSGL_V, "vo_pxa: draw_slice() w %d h %d x %d y %d stride %d %d %d\n",
-+           w, h, x, y, stride[0], stride[1], stride[2] );
-+
-+    if (w + x > overlay_width || h + y > overlay_height) {
-+        mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: too big image\n");
-+        return 0;
-+    }
-+
-+    for (i = 0; i < h; i++) {
-+        fast_memcpy(dst_y, src_y, w);
-+        src_y += stride[0];
-+        dst_y += overlay_width;
-+    }
-+    for (i = 0; i < h / 2; i++) {
-+        fast_memcpy(dst_u, src_u, w / 2);
-+        fast_memcpy(dst_v, src_v, w / 2);
-+        src_u += stride[1];
-+        src_v += stride[2];
-+        dst_u += overlay_width / 2;
-+        dst_v += overlay_width / 2;
-+    }
-+
-+    return 0;
-+}
-+
-+static void draw_osd(void)
-+{
-+    /* FIXME */
-+    /* vo_draw_text(in_width, in_height, draw_alpha); */
-+}
-+
-+static void flip_page(void)
-+{
-+}
-+
-+static void check_events(void)
-+{
-+}
-+
-+static void uninit(void)
-+{
-+    if (overlay_mem)
-+        munmap(overlay_mem, overlay_mem_size);
-+    if (overlay_fd != -1)
-+        close(overlay_fd);
-+
-+    overlay_mem = NULL;
-+    overlay_fd = -1;
-+}
-diff -ruN MPlayer-1.0rc4/Makefile MPlayer-1.0rc4-pxa/Makefile
--- MPlayer-1.0rc4/Makefile	2010-07-29 19:08:19.000000000 +0200
-+++ MPlayer-1.0rc4-pxa/Makefile	2011-02-27 14:14:21.000000000 +0100
-@@ -541,6 +541,7 @@
- SRCS_MPLAYER-$(DXR3)         += libvo/vo_dxr3.c
- SRCS_MPLAYER-$(ESD)          += libao2/ao_esd.c
- SRCS_MPLAYER-$(FBDEV)        += libvo/vo_fbdev.c libvo/vo_fbdev2.c
-+SRCS_MPLAYER-$(PXA)          += libvo/vo_pxa.c
- SRCS_MPLAYER-$(GGI)          += libvo/vo_ggi.c
- SRCS_MPLAYER-$(GIF)          += libvo/vo_gif89a.c
- SRCS_MPLAYER-$(GL)           += libvo/gl_common.c libvo/vo_gl.c \
--- a/aur/mplayer-z2/mplayer.conf
+++ b/aur/mplayer-z2/mplayer.conf
@ -1,3 +0,0 @@
-ao=alsa
-vo=pxa
-vf=rotate=2
--- a/aur/netsurf-svn-z2/0002-netsurf-add-zipit-keymap.patch
+++ b/aur/netsurf-svn-z2/0002-netsurf-add-zipit-keymap.patch
@ -1,193 +0,0 @@
-Index: netsurf/framebuffer/fbtk/event.c
-===================================================================
--- netsurf/framebuffer/fbtk/event.c	(revision 12174)
-+++ netsurf/framebuffer/fbtk/event.c	(working copy)
-@@ -250,7 +250,7 @@
- 	-1,  -1,  -1,  13,  -1,  -1,  -1,  -1,  -1,  -1, /*  10 -  19 */
- 	-1,  -1,  -1,  -1,  -1,  -1,  -1,  27,  -1,  -1, /*  20 -  29 */
- 	-1,  -1, ' ', '!', '"', '~', '$',  -1, '&', '@', /*  30 -  39 */
-	'(', ')', '*', '+', '<', '_', '>', '?', ')', '!', /*  40 -  49 */
-+	'(', ')', '*', '+', '(', '_', ')', '?', ')', '!', /*  40 -  49 */
- 	'"', 243, '$', '%', '^', '&', '*', '(', ';', ':', /*  50 -  59 */
- 	'<', '+', '>', '?', '@',  -1,  -1,  -1,  -1,  -1, /*  60 -  69 */
- 	-1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, /*  70 -  79 */
-@@ -261,16 +261,34 @@
- 	'X', 'Y', 'Z',  -1,  -1,  -1,  -1,  -1,  -1,  -1, /* 120 - 129 */
- };
- 
-
-+static int alt_keymap[] = {
-+	/* 0    1    2    3    4    5    6    7    8    9               */
-+	-1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,   8,   9, /*   0 -   9 */
-+	-1,  -1,  -1,  13,  -1,  -1,  -1,  -1,  -1,  -1, /*  10 -  19 */
-+	-1,  -1,  -1,  -1,  -1,  -1,  -1,  27,  -1,  -1, /*  20 -  29 */
-+	-1,  -1, ' ', '!', '"', '#', '$',  -1, '&','\'', /*  30 -  39 */
-+	'(', ')', '*', '+', '<', '-', '>', '/', '0', '1', /*  40 -  49 */
-+	'2', '3', '4', '5', '6', '7', '8', '9', ':', ';', /*  50 -  59 */
-+	'<', '=', '>', '?', '@',  -1,  -1,  -1,  -1,  -1, /*  60 -  69 */
-+	-1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, /*  70 -  79 */
-+	-1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, /*  80 -  89 */
-+	-1, '[','\\', ']', '~', '_', '`', '$', '=', '+', /*  90 -  99 */
-+	'&', '3', '@', '"', '\'', '8', '[', ']', '-', '?', /* 100 - 109 */
-+	'_', '9', '0', '1', '4', '#', '5', '7', '*', '2', /* 110 - 119 */
-+	'/', '6', '!',  -1,  -1,  -1,  -1,  -1,  -1,  -1, /* 120 - 129 */
-+};
- /* exported function documented in fbtk.h */
- int
- fbtk_keycode_to_ucs4(int code, uint8_t mods)
- {
- 	int ucs4 = -1;
- 
-	if (mods) {
-+	if (mods & FBTK_MT_SHIFT) {
- 		if ((code >= 0) && (code < (int) NOF_ELEMENTS(sh_keymap)))
- 			ucs4 = sh_keymap[code];
-+	} else if (mods & FBTK_MT_ALT) {
-+		if ((code >= 0) && (code < (int) NOF_ELEMENTS(sh_keymap)))
-+			ucs4 = alt_keymap[code];
- 	} else {
- 		if ((code >= 0) && (code < (int) NOF_ELEMENTS(keymap)))
- 			ucs4 = keymap[code];
-Index: netsurf/framebuffer/fbtk/text.c
-===================================================================
--- netsurf/framebuffer/fbtk/text.c	(revision 12174)
-+++ netsurf/framebuffer/fbtk/text.c	(working copy)
-@@ -248,11 +248,18 @@
- 	if (cbi->event->type != NSFB_EVENT_KEY_DOWN) {
- 		switch (value) {
- 		case NSFB_KEY_RSHIFT:
-			modifier &= ~1;
-+		case NSFB_KEY_LSHIFT:
-+			modifier &= ~(FBTK_MT_SHIFT);
- 			break;
-+		
-+		case NSFB_KEY_LALT:
-+		case NSFB_KEY_RALT:
-+			modifier &= ~(FBTK_MT_ALT);
-+			break;
- 
-		case NSFB_KEY_LSHIFT:
-			modifier &= ~(1<<1);
-+		case NSFB_KEY_LCTRL:
-+		case NSFB_KEY_RCTRL:
-+			modifier &= ~(FBTK_MT_CTRL);
- 			break;
- 
- 		default:
-@@ -284,22 +291,38 @@
- 		break;
- 
- 	case NSFB_KEY_RSHIFT:
-		modifier |= 1;
-+	case NSFB_KEY_LSHIFT:
-+		modifier |= FBTK_MT_SHIFT;
- 		break;
- 
-	case NSFB_KEY_LSHIFT:
-		modifier |= 1<<1;
-+	case NSFB_KEY_LALT:
-+	case NSFB_KEY_RALT:
-+		modifier |= FBTK_MT_ALT;
- 		break;
- 
-	default:
-		/* allow for new character and null */
-		temp = realloc(widget->u.text.text, widget->u.text.idx + 2);
-+	case NSFB_KEY_LCTRL:
-+	case NSFB_KEY_RCTRL:
-+		modifier |= FBTK_MT_CTRL;
-+		break;
-+	case NSFB_KEY_ESCAPE:
-+		temp = realloc(widget->u.text.text, 1);
- 		if (temp != NULL) {
- 			widget->u.text.text = temp;
-			widget->u.text.text[widget->u.text.idx] = fbtk_keycode_to_ucs4(value, modifier);
-			widget->u.text.text[widget->u.text.idx + 1] = '\0';
-			widget->u.text.idx++;
-+			widget->u.text.text[0] = '\0';
-+			widget->u.text.idx = 0;
- 		}
-+		break;
-+	default:
-+		if (value >= 32 && value < 127) {
-+			/* allow for new character and null */
-+			temp = realloc(widget->u.text.text, widget->u.text.idx + 2);
-+			if (temp != NULL) {
-+				widget->u.text.text = temp;
-+				widget->u.text.text[widget->u.text.idx] = fbtk_keycode_to_ucs4(value, modifier);
-+				widget->u.text.text[widget->u.text.idx + 1] = '\0';
-+				widget->u.text.idx++;
-+			}
-+		}
- 
- 		break;
- 	}
-Index: netsurf/framebuffer/Makefile.target
-===================================================================
-Index: netsurf/framebuffer/gui.c
-===================================================================
--- netsurf/framebuffer/gui.c	(revision 12174)
-+++ netsurf/framebuffer/gui.c	(working copy)
-@@ -712,13 +712,20 @@
- 			break;
- 
- 		case NSFB_KEY_RSHIFT:
-			modifier |= 1;
-+		case NSFB_KEY_LSHIFT:
-+			modifier |= FBTK_MT_SHIFT;
- 			break;
- 
-		case NSFB_KEY_LSHIFT:
-			modifier |= 1<<1;
-+		case NSFB_KEY_LALT:
-+		case NSFB_KEY_RALT:
-+			modifier |= FBTK_MT_ALT;
- 			break;
- 
-+		case NSFB_KEY_LCTRL:
-+		case NSFB_KEY_RCTRL:
-+			modifier |= FBTK_MT_CTRL;
-+			break;
-+
- 		default:
- 			ucs4 = fbtk_keycode_to_ucs4(cbi->event->value.keycode,
- 						    modifier);
-@@ -731,11 +738,18 @@
- 	case NSFB_EVENT_KEY_UP:
- 		switch (cbi->event->value.keycode) {
- 		case NSFB_KEY_RSHIFT:
-			modifier &= ~1;
-+		case NSFB_KEY_LSHIFT:
-+			modifier &= ~(FBTK_MT_SHIFT);
- 			break;
-+		
-+		case NSFB_KEY_LALT:
-+		case NSFB_KEY_RALT:
-+			modifier &= ~(FBTK_MT_ALT);
-+			break;
- 
-		case NSFB_KEY_LSHIFT:
-			modifier &= ~(1<<1);
-+		case NSFB_KEY_LCTRL:
-+		case NSFB_KEY_RCTRL:
-+			modifier &= ~(FBTK_MT_CTRL);
- 			break;
- 
- 		default:
-Index: netsurf/framebuffer/fbtk.h
-===================================================================
--- netsurf/framebuffer/fbtk.h	(revision 12174)
-+++ netsurf/framebuffer/fbtk.h	(working copy)
-@@ -181,6 +181,12 @@
-  */
- bool fbtk_tgrab_pointer(fbtk_widget_t *widget);
- 
-+enum fbtk_mod_type {
-+	FBTK_MT_SHIFT = 1,
-+	FBTK_MT_ALT = 2,
-+	FBTK_MT_CTRL = 4,
-+};
-+
- /** Convert a framebuffer keycode to ucs4.
-  *
-  * Character mapping between keycode with modifier state and ucs-4.
--- a/aur/netsurf-svn-z2/0004-curl-disable-verify-peer.patch
+++ b/aur/netsurf-svn-z2/0004-curl-disable-verify-peer.patch
@ -1,13 +0,0 @@
-Index: content/fetchers/curl.c
-===================================================================
--- netsurf/content/fetchers/curl.c	(revision 12174)
-+++ netsurf/content/fetchers/curl.c	(working copy)
-@@ -586,7 +586,7 @@
- 		SETOPT(CURLOPT_PROXY, NULL);
- 	}
- 
-	if (urldb_get_cert_permissions(f->url)) {
-+	if (1) { //urldb_get_cert_permissions(f->url)) {
- 		/* Disable certificate verification */
- 		SETOPT(CURLOPT_SSL_VERIFYPEER, 0L);
- 		SETOPT(CURLOPT_SSL_VERIFYHOST, 0L);
--- a/aur/netsurf-svn-z2/0005-fix-content_get_width_height.patch
+++ b/aur/netsurf-svn-z2/0005-fix-content_get_width_height.patch
@ -1,24 +0,0 @@
-Index: content/content.c
-===================================================================
--- netsurf/content/content.c	(revision 12174)
-+++ netsurf/content/content.c	(working copy)
-@@ -1306,6 +1306,9 @@
-  */
- int content_get_width(hlcache_handle *h)
- {
-+	if (h == NULL)
-+		return 0;
-+
- 	return content__get_width(hlcache_handle_get_content(h));
- }
- 
-@@ -1325,6 +1328,9 @@
-  */
- int content_get_height(hlcache_handle *h)
- {
-+	if (h == NULL)
-+		return 0;
-+
- 	return content__get_height(hlcache_handle_get_content(h));
- }
- 
--- a/aur/netsurf-svn-z2/PKGBUILD
+++ b/aur/netsurf-svn-z2/PKGBUILD
@ -1,69 +0,0 @@
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-# Thanks to: Georgij Kondratjev <smpuj@bk.ru>
-
-plugrel=1
-
-pkgname=netsurf-svn-z2
-pkgver=12570
-pkgrel=1
-pkgdesc="Lightweight and fast web browser"
-arch=('arm' 'i686' 'x86_64')
-url="http://www.netsurf-browser.org/"
-license=("GPL")
-depends=('libnsfb-svn' 'libmng' 'curl' 'lcms' 'librsvg' 'libnsbmp-svn' 'libnsgif-svn' 'libcss-svn' 'hubbub-svn' 'libpng' 'libmng')
-optdepends=('mouse-emul-git: Mouse emulation')
-makedepends=('subversion')
-provides=('netsurf')
-conflicts=('netsurf')
-source=('0002-netsurf-add-zipit-keymap.patch'  '0004-curl-disable-verify-peer.patch'  '0005-fix-content_get_width_height.patch' 'netsurf.sh')
-md5sums=('36f5e546979269d93196ceedaa1f6fe8'
-         '41f9b588580af155e563412664935172'
-         '50e1d946985d5d5ae0e85e3f54bdbfd2'
-         '7ce7ad37c1375201d40f9690d4e12e2d')
-_svntrunk=svn://svn.netsurf-browser.org/trunk/netsurf
-_svnmod=netsurf-svn
-
-build() {
-  cd "$srcdir"
-
-  #msg "Fetching two extra files..."
-  curl http://www.sqlite.org/cvstrac/getfile/sqlite/tool/lemon.c -O || return 1
-  curl http://www.sqlite.org/cvstrac/getfile/sqlite/tool/lempar.c -O || return 1
-
-  if [ -d $_svnmod/.svn ]; then
-    (cd $_svnmod && svn up -r $pkgver)
-  else
-    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-  fi
-
-  msg "SVN checkout done or server timeout"
-
-  msg "Preparing..."
-  gcc lemon.c -o lemon
-  PATH=`pwd`:$PATH
-
-  cp -rT $_svnmod $_svnmod-build
-  ln -sf $_svnmod-build netsurf #will not compile otherwise
-  cd netsurf
-  patch -p1 < ../0002-netsurf-add-zipit-keymap.patch
-  patch -p1 < ../0004-curl-disable-verify-peer.patch
-  patch -p1 < ../0005-fix-content_get_width_height.patch
-  echo "override NETSURF_FB_FRONTEND := sdl" > Makefile.config
-
-  sed -i -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' ./framebuffer/convert_image.c
-  msg "Compiling Netsurf..."
-  make TARGET=framebuffer || return 1
-  
-  msg "Packaging executables..."
-  mkdir -p ${pkgdir}/usr/bin
-  install nsfb ${pkgdir}/usr/bin
-  install -Dm755 ${srcdir}/netsurf.sh ${pkgdir}/usr/bin/netsurf
-  install -d ${pkgdir}/usr/bin ${pkgdir}/usr/share/netsurf
-
-  msg "Packaging resources..."
-  rm -rf framebuffer/res/.svn gtk/res/docs/.svn
-  cp -RL framebuffer/res ${pkgdir}/usr/share/netsurf
-
-  msg "Cleaning up..."
-  find "$pkgdir" -name ".svn" -print0 | xargs -0 rm -rf
-}
--- a/aur/netsurf-svn-z2/netsurf.sh
+++ b/aur/netsurf-svn-z2/netsurf.sh
@ -1,2 +0,0 @@
-#!/bin/sh
-NETSURFRES=/usr/share/netsurf/res /usr/bin/nsfb $*
--- a/aur/openjdk6-debian/PKGBUILD
+++ b/aur/openjdk6-debian/PKGBUILD
@ -1,46 +0,0 @@
-# ALARM: Kevin Mihelich <kevin@plugapps.com>
-#  - This package uses Debian's armel openjdk6
-
-# Dropping plugrel so we don't index into builder, this package is
-#  screwing up deps in v7h.
-#plugrel=1
-
-pkgname=openjdk6-debian
-pkgver=6.b20pre1
-pkgrel=1
-pkgdesc="Debian's package of OpenJDK6, including the Zero and Shark VMs"
-depends=('glibc' 'gcc-libs')
-makedepends=()
-conflicts=('java-environment' 'java-runtime')
-provides=('java-environment=6' 'java-runtime=6' 'openjdk6')
-url="http://packages.debian.org/sid/openjdk-6-jre-zero"
-install=(openjdk6-debian.install)
-source=("http://ftp.us.debian.org/debian/pool/main/o/openjdk-6/openjdk-6-jre-headless_6b20~pre1-2_armel.deb"
-        "http://ftp.us.debian.org/debian/pool/main/o/openjdk-6/openjdk-6-jdk_6b20~pre1-2_armel.deb"
-        "http://ftp.us.debian.org/debian/pool/main/o/openjdk-6/openjdk-6-jre-lib_6b21~pre1-1_all.deb")
-arch=('arm')
-license="GPLv2"
-
-build() {
-        ar x `basename ${source[0]}`
-        tar xf data.tar.gz -C ${pkgdir}
-        ar x `basename ${source[0]}`
-        tar xf data.tar.gz -C ${pkgdir}
-
-        ar x `basename ${source[1]}`
-        tar xf data.tar.gz -C ${pkgdir}
-        ar x `basename ${source[1]}`
-        tar xf data.tar.gz -C ${pkgdir}
-
-        ar x `basename ${source[2]}`
-        tar xf data.tar.gz -C ${pkgdir}
-        ar x `basename ${source[2]}`
-        tar xf data.tar.gz -C ${pkgdir}
-
-        rm -rf ${pkgdir}/usr/share/lintian
-        mkdir -p ${pkgdir}/usr/bin
-}
-
-md5sums=('cc3dc3589774ede2371fc66695ebcb80'
-         '5887ac5a94b762678743ca2e6e55653c'
-         'f34f0b7163babd721fb298666c0176a6')
--- a/aur/openjdk6-debian/openjdk6-debian.install
+++ b/aur/openjdk6-debian/openjdk6-debian.install
@ -1,11 +0,0 @@
-post_install() {
-	ln -sf /usr/lib/jvm/java-6-openjdk/bin/* /usr/bin
-}
-
-post_upgrade() {
-	post_install
-}
-
-op=$1
-shift
-$op $*
--- a/aur/owfs/PKGBUILD
+++ b/aur/owfs/PKGBUILD
@ -3,8 +3,8 @@

 plugrel=1

-pkgname=owfs
-pkgver=2.8p8
+pkgname="owfs"
+pkgver=2.8p14
 pkgrel=1
 pkgdesc="An easy way to use the powerful 1-wire system of Dallas/Maxim."
 arch=('any')
@ -24,7 +24,7 @@ options=()
 install=
 source=(http://downloads.sourceforge.net/sourceforge/owfs/$pkgname-$pkgver.tar.gz)
 noextract=()
-md5sums=('56afd8857bf3ae51fadd7fce0c354b58')
+md5sums=('cd213fd9bbfed95cca2c833c0f14dd72')

 build() {
  cd "$srcdir/$pkgname-$pkgver"
@ -33,4 +33,3 @@ build() {
  make || return 1
  make DESTDIR="$pkgdir" install
 }
-
--- a/aur/package-query/PKGBUILD
+++ b/aur/package-query/PKGBUILD
@ -3,7 +3,7 @@
 plugrel=1

 pkgname=package-query
-pkgver=1.0
+pkgver=1.0.1
 pkgrel=1
 pkgdesc="Query ALPM and AUR"
 arch=('i686' 'x86_64')
@ -26,4 +26,4 @@ package ()

 # vim:set ts=2 sw=2 et:

-md5sums=('dd15d2f1e73c47b998a4e4fd13301379')
+md5sums=('c7d0c242437f8efd5de41a59b7b67f8c')
--- a/aur/pianobar/PKGBUILD
+++ b/aur/pianobar/PKGBUILD
@ -0,0 +1,32 @@
+# Maintainer: Mitch Bigelow <ipha00@gmail.com>
+
+# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
+#  - add gnutls depend
+plugrel=1
+
+pkgname=pianobar
+pkgver=2012.01.10
+pkgrel=1
+pkgdesc="console-based frontend for Pandora (official version)"
+url="http://6xq.net/0017"
+arch=('i686' 'x86_64')
+license=('MIT')
+depends=('libao' 'faad2' 'libmad' 'gnutls')
+source=(http://6xq.net/media/00/16/pianobar-$pkgver.tar.bz2)
+
+_builddir="$pkgname-$pkgver"
+
+build() {
+    cd "$_builddir"
+
+    make
+}
+
+package() {
+    cd "$_builddir"
+
+    make DESTDIR=$pkgdir PREFIX=/usr install
+    install -vDm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+md5sums=('448c57d65c71158674e8b30a8cfa217e')
--- a/aur/protobuf-c/PKGBUILD
+++ b/aur/protobuf-c/PKGBUILD
@ -4,7 +4,7 @@ plugrel=1

 pkgname=protobuf-c
 pkgver=0.15
-pkgrel=2
+pkgrel=3
 pkgdesc="C bindings for Google's Protocol Buffers"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/protobuf-c/"
@ -17,6 +17,7 @@ md5sums=('73ff0c8df50d2eee75269ad8f8c07dc8')
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 	./configure --prefix=/usr --disable-static
+    export MAKEFLAGS=-j1
 	make check
 }

--- a/aur/python2-cheetah/Changelog
+++ b/aur/python2-cheetah/Changelog
@ -0,0 +1,6 @@
+2012-01-31 Julien Nicoulaud <julien.nicoulaud@gmail.com>
+
+	* 2.4.4-4 :
+	Add changelog.
+	Remove unneeded shebang modification.
+
--- a/aur/python2-cheetah/PKGBUILD
+++ b/aur/python2-cheetah/PKGBUILD
@ -1,21 +1,23 @@
-# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
+# Maintainer: Julien Nicoulaud <julien.nicoulaud@gmail.com>
 # Contributor: James Rayner <james@archlinux.org>
 # Contributor: Todd Maynard <arch@toddmaynard.com>
+# Source: https://github.com/nicoulaj/archlinux-packages

 plugrel=1

 pkgname=python2-cheetah
 pkgver=2.4.4
-pkgrel=3
+pkgrel=4
 pkgdesc="A Python-powered template engine and code generator"
-arch=('i686' 'x86_64')
-url="http://www.cheetahtemplate.org/"
-license=('custom')
-depends=('python2' 'python-markdown')
-makedepends=('python2-distribute')
+arch=(i686 x86_64)
+url="http://www.cheetahtemplate.org"
+license=(custom)
+depends=(python2 python-markdown)
+makedepends=(python2-distribute)
 optdepends=('python2-pygments: for the CodeHighlighter filter')
-provides=('cheetah' 'python-cheetah')
-conflicts=('cheetah' 'python-cheetah')
+provides=(cheetah python-cheetah)
+conflicts=(cheetah python-cheetah)
+changelog=Changelog
 source=(http://pypi.python.org/packages/source/C/Cheetah/Cheetah-${pkgver}.tar.gz)
 md5sums=('853917116e731afbc8c8a43c37e6ddba')

@ -25,10 +27,10 @@ build() {
 }

 package() {
+  msg "Install..."
  cd "${srcdir}/Cheetah-${pkgver}"
-  python2 setup.py install --root="${pkgdir}"
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  python2 setup.py install --root="${pkgdir}" || return 1

-  find $pkgdir/usr/lib/python2.7/site-packages/Cheetah/ -name '*.py' | \
-    xargs sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|"
+  msg2 "Install copyright resources in /usr/share/licenses/${pkgname}..."
+  install -Dm644 "${srcdir}/Cheetah-${pkgver}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
--- a/aur/python2-configshell/PKGBUILD
+++ b/aur/python2-configshell/PKGBUILD
@ -1,22 +1,29 @@
 # Contributor: Johannes Dewender  arch at JonnyJD dot net 
-# Contributor: Kevin Mihelich <kevin@plugapps.com>

 plugrel=1

 pkgname=python2-configshell
-_pkgname=configshell
 pkgver=1.1
-pkgrel=3
+pkgrel=4
+epoch=
 pkgdesc="python framework for building simple CLI-based applications"
 arch=('any')
 url="http://www.risingtidesystems.com/git/?p=configshell.git;a=summary"
 license=('AGPL3')
-depends=('python2-simpleparse' 'python-urwid' 'epydoc')
-makedepends=('python2-distribute')
-source=(http://archlinuxarm.org/builder/src/"$_pkgname-$pkgver.tgz")
-md5sums=('2c9a1c7c4416970bc3049c959101c8f2')
+depends=('python2-simpleparse' 'python2-urwid' 'epydoc')
+provides=()
+conflicts=()
+options=()
+source=()
+md5sums=()
+
+_pkgname=configshell

 build() {
+  if [ ! -e "$_pkgname-$pkgver.tgz" ]; then
+    wget "http://www.risingtidesystems.com/git/?p=$_pkgname.git;a=snapshot;h=3ba5560219d7ae8545ce825f4ba778b5c2c90893;sf=tgz" -O "$_pkgname-$pkgver.tgz"
+  fi
+  bsdtar -xf "$srcdir/$_pkgname-$pkgver.tgz"
  cd "$srcdir/$_pkgname"
  python2 setup.py build
 }
@ -25,3 +32,5 @@ package() {
  cd "$srcdir/$_pkgname"
  python2 setup.py install --skip-build --root="$pkgdir/" --optimize=1
 }
+
+# vim:set ts=2 sw=2 et:
--- a/aur/sabnzbd/PKGBUILD
+++ b/aur/sabnzbd/PKGBUILD
@ -2,7 +2,7 @@ plugrel=1

 pkgname=sabnzbd
 _pkgname=SABnzbd
-pkgver=0.6.14
+pkgver=0.6.15
 pkgrel=1
 pkgdesc="A web-interface based binary newsgrabber with NZB file support"
 url="http://www.sabnzbd.org"
--- a/aur/umurmur/PKGBUILD
+++ b/aur/umurmur/PKGBUILD
@ -3,7 +3,7 @@
 plugrel=1

 pkgname=umurmur
-pkgver=0.2.7
+pkgver=0.2.8
 pkgrel=1
 pkgdesc="A minimalistic Mumble server"
 arch=('i686' 'x86_64')
@ -14,7 +14,7 @@ source=(http://umurmur.googlecode.com/files/${pkgname}-${pkgver}.tar.gz \
        umurmur.rc.d \
        umurmur.conf.d \
        umurmur.1)
-sha1sums=('f602f5257a52ca9a6812abc5ee0baa47d5ca4c37'
+sha1sums=('4e497663d0612efb1b61f61663a8d4c27e90777f'
          'c4f91846a6ee16437452c024652d2f5eca0c0c2a'
          '21749181b742154a3be984caa5e29ab62410e9cf'
          '07e1f5082faced4610ef97af2aacd52f583b9a5f')
@ -26,8 +26,8 @@ build() {
  make DESTDIR=${pkgdir} install || return 1

  install -Dm644 umurmur.conf.example ${pkgdir}/etc/umurmur/umurmur.conf
-  install -Dm755 ${startdir}/umurmur.rc.d ${pkgdir}/etc/rc.d/umurmur
-  install -Dm644 ${startdir}/umurmur.conf.d ${pkgdir}/etc/conf.d/umurmur
+  install -Dm755 ${srcdir}/umurmur.rc.d ${pkgdir}/etc/rc.d/umurmur
+  install -Dm644 ${srcdir}/umurmur.conf.d ${pkgdir}/etc/conf.d/umurmur
  
 }

--- a/aur/uwsgi/PKGBUILD
+++ b/aur/uwsgi/PKGBUILD
@ -1,29 +1,41 @@
-# -*- shell-script -*-
-#
-# $Id$
-#
-# Maintainer: Kevin Zuber <uKev@knet.eu>
+# Maintainer: Angel Velasquez <angvp@archlinux.org>  
 # Contributor: Vsevolod Balashov <vsevolod@balashov.name>, Kevin Zuber <uKev@knet.eu>

-python=python2
-name=uwsgi
 plugrel=1
-pkgname=$name
-pkgver=0.9.7.1
+
+pkgname=uwsgi
+pkgver=1.0.4
 pkgrel=1
 pkgdesc="a fast (pure C), self-healing, developer-friendly WSGI server"
-arch=(i686 x86_64 arm)
-url="http://projects.unbit.it/$name"
+arch=(i686 x86_64)
+url="http://projects.unbit.it/$pkgname"
 license=(GPL2)
-depends=("$python" libxml2)
-conflicts=(python-$name)
-makedepends=(gcc "$python")
-source=(http://projects.unbit.it/downloads/$name-$pkgver.tar.gz)
+depends=(python2 libxml2)
+conflicts=(python-$pkgname)
+makedepends=(gcc python2)
+backup=(etc/conf.d/uwsgid etc/uwsgi/uwsgi.ini)
+source=(http://projects.unbit.it/downloads/$pkgname-$pkgver.tar.gz
+        uwsgid.sh
+        uwsgi.ini
+        uwsgid.conf)
+md5sums=('559c8d1fa8274fb45437c277c0c7f121'
+         '3dd03dce734b50910b3a5e12da0fc062'
+         '495afaafac6da631a859ab72c5983c36'
+         '5db37c7dbfd432623883d125d7127fbf')

 build() {
-  cd $srcdir/$name-$pkgver
+  cd $srcdir/$pkgname-$pkgver
  CFLAGS='' make -f Makefile.Py27
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
  mkdir -p $pkgdir/usr/bin
  install -Dm755 uwsgi $pkgdir/usr/bin/uwsgi
+  mkdir -p $pkgdir/etc/rc.d
+  install -Dm755 $srcdir/uwsgid.sh $pkgdir/etc/rc.d/uwsgid
+  mkdir -p $pkgdir/etc/conf.d
+  install -Dm644 $srcdir/uwsgid.conf $pkgdir/etc/conf.d/uwsgid
+  mkdir -p $pkgdir/etc/uwsgi/apps
+  install -Dm644 $srcdir/uwsgi.ini $pkgdir/etc/uwsgi/uwsgi.ini
 }
-md5sums=('cb023f300eaace3cbf2f5817b8acafe0')
--- a/aur/uwsgi/uwsgi.ini
+++ b/aur/uwsgi/uwsgi.ini
@ -0,0 +1,3 @@
+[uwsgi]
+emperor = /etc/uwsgi/apps
+master = 1
--- a/aur/uwsgi/uwsgid.conf
+++ b/aur/uwsgi/uwsgid.conf
@ -0,0 +1,3 @@
+UWSGI_INI=/etc/uwsgi/uwsgi.ini
+UWSGI_PIDFILE=/var/run/uwsgid.pid
+UWSGI_DAEMONIZE=/var/log/uwsgid.log
--- a/aur/uwsgi/uwsgid.sh
+++ b/aur/uwsgi/uwsgid.sh
@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+. /etc/conf.d/uwsgid
+
+case "$1" in
+    start)
+        stat_busy "Starting uwsgid"
+        /usr/bin/uwsgi --daemonize "$UWSGI_DAEMONIZE" --ini "$UWSGI_INI" --pidfile "$UWSGI_PIDFILE" &>/dev/null
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            add_daemon uwsgid
+            stat_done
+        fi
+    ;;
+    stop)
+        stat_busy "Stopping uwsgid"
+        kill -QUIT `cat "$UWSGI_PIDFILE"` &>/dev/null
+        if [ $? -ne 0 ]; then
+            stat_fail
+        else
+            rm_daemon uwsgid
+            stat_done
+        fi
+    ;;
+    restart)
+        $0 stop
+        sleep 1
+        $0 start
+    ;;
+    *)
+    echo "usage: $0 {start|stop|restart}" 
+esac
+
+exit 0
--- a/aur/yaourt/PKGBUILD
+++ b/aur/yaourt/PKGBUILD
@ -4,7 +4,7 @@
 plugrel=1

 pkgname=yaourt
-pkgver=1.0
+pkgver=1.0.1
 pkgrel=1
 pkgdesc="A pacman wrapper with extended features and AUR support"
 arch=('any')
@ -29,4 +29,4 @@ package() {
 }

 # vim:set ts=2 sw=2 et:
-md5sums=('294c24fa584b79217b5ac186ed8593b7')
+md5sums=('d6455c854a6c16cc220babeda3f51d38')
--- a/community/gpicview/PKGBUILD
+++ b/community/gpicview/PKGBUILD
@ -0,0 +1,33 @@
+# $Id: PKGBUILD 52590 2011-07-26 09:08:13Z angvp $ 
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
+
+# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
+#  - rebuild for libpng - remove when bumped upstream
+
+plugrel=1
+
+pkgname=gpicview
+pkgver=0.2.2
+pkgrel=1.1
+pkgdesc="Picture viewer of the LXDE Desktop"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://lxde.org/"
+groups=('lxde')
+depends=('gtk2')
+makedepends=('pkgconfig' 'intltool')
+optdepends=('librsvg: For SVG support')
+source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
+md5sums=('943da9f4a23541accd5acdd4fb69966f')
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	LIBS="-lm" ./configure --sysconfdir=/etc --prefix=/usr
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
+}
--- a/community/lxappearance/PKGBUILD
+++ b/community/lxappearance/PKGBUILD
@ -0,0 +1,39 @@
+#$Id: PKGBUILD 60017 2011-12-03 08:38:35Z bpiotrowski $
+# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com>
+# Contributor: Angel Velasquez <angvp@archlinux.org>  
+# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
+
+# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
+#  - rebuild for libpng - remove when bumped upstream
+
+plugrel=1
+
+pkgname=lxappearance
+pkgver=0.5.1
+pkgrel=3.1
+pkgdesc="GTK+ theme switcher of the LXDE Desktop (manages icons and fonts)"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://lxde.org/"
+groups=('lxde')
+depends=('gtk2' 'intltool')
+makedepends=('pkgconfig')
+source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz
+        gtk-3.0.patch)
+
+build() {
+    cd "$srcdir/$pkgname-$pkgver"
+
+    patch -Np0 -i ../gtk-3.0.patch
+    ./configure --sysconfdir=/etc --prefix=/usr 
+    make 
+}
+
+package() {
+    cd "$srcdir/$pkgname-$pkgver"
+
+    make DESTDIR="$pkgdir" install 
+}
+
+md5sums=('34d157a7fe97ef0b93db8fab3f251e07'
+         '58fd450329972be03181c98e7287f3ae')
--- a/community/lxappearance/gtk-3.0.patch
+++ b/community/lxappearance/gtk-3.0.patch
@ -0,0 +1,111 @@
+--- src/lxappearance.c	2011-07-29 16:50:19.000000000 +0200
+++ src/lxappearance1.c	2011-07-30 18:51:40.323368701 +0200
+@@ -153,21 +153,33 @@
+ 
+     char* file_path = g_build_filename(g_get_home_dir(), ".gtkrc-2.0", NULL);
+     GString* content = g_string_sized_new(512);
+    GString* content3 = g_string_sized_new(512);
+     g_string_append(content,
+         "# DO NOT EDIT! This file will be overwritten by LXAppearance.\n"
+         "# Any customization should be done in ~/.gtkrc-2.0.mine instead.\n\n");
+    g_string_append(content3, "[Settings]\n"
+        "# DO NOT EDIT! This file will be overwritten by LXAppearance.\n");
+    
+     if(app.widget_theme)
+         g_string_append_printf(content,
+             "gtk-theme-name=\"%s\"\n", app.widget_theme);
+        g_string_append_printf(content3,
+            "gtk-theme-name = %s\n", app.widget_theme);
+     if(app.icon_theme)
+         g_string_append_printf(content,
+-            "gtk-icon-theme-name=\"%s\"\n", app.icon_theme);
+            "gtk-icon-theme-name=\"%s\"\n", app.icon_theme);        
+        g_string_append_printf(content3,
+            "gtk-icon-theme-name = %s\n", app.icon_theme);
+     if(app.default_font)
+         g_string_append_printf(content,
+             "gtk-font-name=\"%s\"\n", app.default_font);
+        g_string_append_printf(content3,
+            "gtk-font-name = %s\n", app.default_font);
+     if(app.cursor_theme)
+         g_string_append_printf(content,
+             "gtk-cursor-theme-name=\"%s\"\n", app.cursor_theme);
+        g_string_append_printf(content3,
+            "gtk-cursor-theme-name = %s\n", app.cursor_theme);
+     save_cursor_theme_name();
+ 
+     g_string_append_printf(content,
+@@ -196,20 +208,46 @@
+         app.enable_hinting ? 1 : 0
+         );
+ 
+   g_string_append_printf(content3,
+        "gtk-cursor-theme-size = %d\n"
+        "gtk-toolbar-style = %s\n"
+        "gtk-toolbar-icon-size = %s\n"
+        "gtk-button-images = %d\n"
+        "gtk-menu-images = %d\n"
+        "gtk-enable-event-sounds = %d\n"
+        "gtk-enable-input-feedback-sounds = %d\n"
+        "gtk-xft-antialias = %d\n"
+        "gtk-xft-hinting = %d\n",
+        app.cursor_theme_size,
+        tb_styles[app.toolbar_style],
+        tb_icon_sizes[app.toolbar_icon_size],
+        app.button_images ? 1 : 0,
+        app.menu_images ? 1 : 0,
+        app.enable_event_sound ? 1 : 0,
+        app.enable_input_feedback ? 1 : 0,
+        app.enable_antialising ? 1 : 0,
+        app.enable_hinting ? 1 : 0
+        );
+
+     if(app.hinting_style)
+         g_string_append_printf(content,
+             "gtk-xft-hintstyle=\"%s\"\n", app.hinting_style);
+        g_string_append_printf(content3,
+            "gtk-xft-hintstyle = %s\n", app.hinting_style);
+ 
+     if(app.font_rgba)
+         g_string_append_printf(content,
+             "gtk-xft-rgba=\"%s\"\n", app.font_rgba);
+        g_string_append_printf(content3,
+            "gtk-xft-rgba = %s\n", app.font_rgba);
+ 
+     if(app.color_scheme)
+     {
+         char* escaped = g_strescape(app.color_scheme, NULL);
+         g_string_append_printf(content,
+-            "gtk-color-scheme=\"%s\"\n",
+-            escaped);
+            "gtk-color-scheme=\"%s\"\n", escaped);
+        g_string_append_printf(content3,
+            "gtk-color-scheme = %s\n", escaped);
+         g_free(escaped);
+     }
+ 
+@@ -218,20 +256,20 @@
+         g_get_home_dir());
+ 
+     g_file_set_contents(file_path, content->str, content->len, NULL);
+    g_string_free(content, TRUE);
+ 
+     /* Save also for GTK3 */
+-    g_string_prepend(content, "[Settings] \n");
+-    char* file_path_gtk3 = g_build_filename(g_get_home_dir(), "gtk-3.0", NULL);
+-    char* file_path_settings = g_build_filename(g_get_home_dir(), "gtk-3.0", "settings.ini", NULL);
+    char* file_path_gtk3 = g_build_filename(g_get_user_config_dir(), "gtk-3.0", NULL);
+    char* file_path_settings = g_build_filename(g_get_user_config_dir(), "gtk-3.0", "settings.ini", NULL);
+ 
+     if (!g_file_test(file_path_gtk3, G_FILE_TEST_IS_DIR))
+     {
+         g_mkdir_with_parents(file_path_gtk3, 0755);
+     }
+ 
+-    g_file_set_contents(file_path_settings, content->str, content->len, NULL);
+    g_file_set_contents(file_path_settings, content3->str, content3->len, NULL);
+ 
+-    g_string_free(content, TRUE);
+    g_string_free(content3, TRUE);
+     g_free(file_path);
+ }
--- a/community/lxde-common/PKGBUILD
+++ b/community/lxde-common/PKGBUILD
@ -0,0 +1,38 @@
+# $Id: PKGBUILD 53456 2011-08-03 20:00:26Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+
+# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
+#  - rebuild for libpng - remove when bumped upstream
+
+plugrel=1
+
+pkgname=lxde-common
+pkgver=0.5.5
+pkgrel=1.1
+pkgdesc="Common files of the LXDE Desktop"
+arch=('i686' 'x86_64')
+license=('GPL2')
+groups=('lxde')
+depends=('libx11' 'glib2' 'lxde-icon-theme')
+url="http://lxde.org/"
+# startlxde is useless without lxsession 
+makedepends=(automake)
+optdepends=(lxsession-lite)
+backup=(etc/xdg/lxsession/LXDE/{desktop.conf,autostart})
+source=("http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz")
+md5sums=('e51a6b2a815a89fda1f497b509465a97')
+
+
+build() {
+    cd "$srcdir/$pkgname-$pkgver"
+    autoreconf
+    ./configure --sysconfdir=/etc --prefix=/usr
+}
+
+package() {
+    cd "$srcdir/$pkgname-$pkgver"
+    make DESTDIR="$pkgdir" install
+    install -Dm644 lxde-logout.desktop \
+      ${pkgdir}/usr/share/applications/lxde-logout.desktop
+}
--- a/community/lxde-common/lxde-common.install
+++ b/community/lxde-common/lxde-common.install
@ -0,0 +1,13 @@
+ICON_PATH=usr/share/icons/nuoveXT2
+
+post_install() {
+  gtk-update-icon-cache -q -t -f ${ICON_PATH}
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f ${ICON_PATH}
+}
--- a/community/lxpanel/PKGBUILD
+++ b/community/lxpanel/PKGBUILD
@ -0,0 +1,40 @@
+# $Id: PKGBUILD 61193 2011-12-24 11:33:27Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
+
+# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
+#  - rebuild for libpng - remove when bumped upstream
+
+plugrel=1
+
+pkgname=lxpanel
+pkgver=0.5.8
+pkgrel=2.1
+pkgdesc="Panel of the LXDE Desktop"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://lxde.org/"
+groups=('lxde')
+depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data')
+source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz
+        battery.patch)
+optdepends=(pcmanfm)
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	patch -Np1 -i "$srcdir/battery.patch"
+
+	./configure --sysconfdir=/etc --prefix=/usr 
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
+}
+md5sums=('129fae75d1cd3983fd94542c573a70a1'
+         '5fadb4d5aca09c81138677e91f995d98')
+md5sums=('129fae75d1cd3983fd94542c573a70a1'
+         '5fadb4d5aca09c81138677e91f995d98')
--- a/community/lxpanel/battery.patch
+++ b/community/lxpanel/battery.patch
@ -0,0 +1,72 @@
+diff --git plugins/batt/batt_sys.c plugins/batt/batt_sys.c
+index 54ff678..1eebab5 100644
+--- a/src/plugins/batt/batt_sys.c
+++ b/src/plugins/batt/batt_sys.c
+@@ -35,15 +35,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-battery* battery_new() {
+-    static int battery_num = 1;
+-    battery * b = g_new0 ( battery, 1 );
+-    battery_reset(b);
+-    b->battery_num = battery_num;
+-    battery_num++;
+-    return b;
+-}
+-
+ void battery_reset( battery * b) {
+     b->type_battery = TRUE;
+     b->capacity_unit = "mAh";
+@@ -58,6 +49,15 @@ void battery_reset( battery * b) {
+     b->state = NULL;
+ }
+ 
+battery* battery_new() {
+    static int battery_num = 1;
+    battery * b = g_new0 ( battery, 1 );
+    battery_reset(b);
+    b->battery_num = battery_num;
+    battery_num++;
+    return b;
+}
+
+ static gchar* parse_info_file(char *filename)
+ {
+     char *buf = NULL;
+@@ -194,7 +194,7 @@ void battery_update( battery *b ) {
+     
+     /* convert energy values (in mWh) to charge values (in mAh) if needed and possible */
+     if (b->last_capacity_unit != -1 && b->last_capacity == -1) {
+-	if (b->voltage != -1) {
+	if (b->voltage > 0) {
+ 	    b->last_capacity = b->last_capacity_unit * 1000 / b->voltage;
+ 	} else {
+ 	    b->last_capacity = b->last_capacity_unit;
+@@ -202,7 +202,7 @@ void battery_update( battery *b ) {
+ 	}
+     }
+     if (b->design_capacity_unit != -1 && b->design_capacity == -1) {
+-	if (b->voltage != -1) {
+	if (b->voltage > 0) {
+ 	    b->design_capacity = b->design_capacity_unit * 1000 / b->voltage;
+ 	} else {
+ 	    b->design_capacity = b->design_capacity_unit;
+@@ -210,7 +210,7 @@ void battery_update( battery *b ) {
+ 	}
+     }
+     if (b->remaining_energy != -1 && b->remaining_capacity == -1) {
+-	if (b->voltage != -1) {
+	if (b->voltage > 0) {
+ 	    b->remaining_capacity = b->remaining_energy * 1000 / b->voltage;
+ 	    b->present_rate = b->present_rate * 1000 / b->voltage;
+ 	} else {
+@@ -220,7 +220,7 @@ void battery_update( battery *b ) {
+     if (b->last_capacity < MIN_CAPACITY)
+ 	b->percentage = 0;
+     else
+-	b->percentage = ((float) b->remaining_energy * 100.0) / (float) b->last_capacity_unit;
+	b->percentage = (float) b->remaining_capacity * 100 / b->last_capacity;
+ 	    
+     if (b->percentage > 100)
+ 	b->percentage = 100;
--- a/community/lxtask/PKGBUILD
+++ b/community/lxtask/PKGBUILD
@ -0,0 +1,32 @@
+# $Id: PKGBUILD 56901 2011-10-16 07:43:53Z bpiotrowski $
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
+
+# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
+#  - rebuild for libpng - remove when bumped upstream
+
+plugrel=1
+
+pkgname=lxtask
+pkgver=0.1.4
+pkgrel=3.1
+pkgdesc="Task manager of the LXDE Desktop"
+arch=('i686' 'x86_64')
+license=('GPL2')
+url="http://lxde.org/"
+groups=('lxde')
+depends=('gtk2')
+makedepends=('pkgconfig' 'intltool')
+source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
+md5sums=('c4ab47d03d41a88696d64d3f1e78cf7f')
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	autoreconf
+	./configure --sysconfdir=/etc --prefix=/usr
+	make
+}
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
+}
--- a/community/mythtv/PKGBUILD
+++ b/community/mythtv/PKGBUILD
@ -13,7 +13,7 @@ plugrel=1

 pkgname=mythtv
 pkgver=0.24.2
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="A Homebrew PVR project"
 arch=('i686' 'x86_64')
@ -22,7 +22,7 @@ license=('GPL')
 depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libxinerama'
         'libxvmc' 'libxxf86vm' 'lirc-utils' 'mesa' 'mysql-clients'
         'mysql-python' 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp'
-         'python-lxml' 'wget' 'qtwebkit')
+         'python2-lxml' 'wget' 'qtwebkit')
 makedepends=('yasm')
 optdepends=('xmltv: to download tv listings')
 backup=('etc/conf.d/mythbackend')
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@ -7,7 +7,7 @@
 # Contributor: Jason Plum <max@warheads.net>

 pkgname=nodejs
-pkgver=0.6.12
+pkgver=0.6.13
 pkgrel=1
 plugrel=3
 pkgdesc='Evented I/O for V8 javascript'
--- a/community/tightvnc/PKGBUILD
+++ b/community/tightvnc/PKGBUILD
@ -1,5 +1,6 @@
-# $Id: PKGBUILD 150962 2012-02-24 10:13:24Z pierre $
-# Maintainer: Paul Mattal <paul@archlinux.org>
+# $Id: PKGBUILD 67960 2012-03-16 12:47:31Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Paul Mattal <paul@archlinux.org>

 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - patch to enable ARM building, contributed by vahokif
@ -8,44 +9,48 @@ plugrel=1

 pkgname=tightvnc
 pkgver=1.3.10
-pkgrel=6
+pkgrel=7
 pkgdesc="VNC Unix server && viewer"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.tightvnc.com"
-depends=('libjpeg' 'zlib' 'libxaw' 'libxp' 'xorg-xauth')
-makedepends=('imake')
+depends=('libjpeg' 'zlib' 'libxaw' 'libxp' 'xorg-xauth' 'perl')
+makedepends=('imake' 'setconf')
 conflicts=('vnc')
 options=('!makeflags')
 source=("http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2"
-        'tightvnc-fontpath-xcolors.patch'
+        'http://people.csail.mit.edu/jaffer/Color/rgb.txt'
        'tightvnc-1.3.10-arm.patch')
-md5sums=('397b35faad32d5246b6d44b142f8304f'
-         '21aa7f3376ec3c608ff22d199a19c601'
-         '0c10d9cd275d90ba5f13ffe3109443a2')
+sha256sums=('f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d'
+            'af6c056a95ae725f98534db22b9a4916d17f2356fdca84a4a038211a82fa8a73'
+            '8ee519594642ab9309f9f7a91bcd6938f2117a23452d19edf78259b46381bd40')

 build() {
  cd $srcdir/vnc_unixsrc
-  patch -Np1 -i ../tightvnc-fontpath-xcolors.patch
-  patch -Np1 -i ../tightvnc-1.3.10-arm.patch
-  sed -i 's|/usr/local/|/usr/share/|' vncserver
+  patch -Np1 -i "${srcdir}"/tightvnc-1.3.10-arm.patch

+  setconf tightvncserver.conf '$colorPath' \"/usr/share/tightvnc\"\;
+  setconf vncserver '$colorPath' \"/usr/share/tightvnc\"\;
+  setconf vncserver '$vncClasses' \"/usr/share/tightvnc\"\;
+  setconf vncserver '$fontPath' \"/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/\"\;
  xmkmf
  make World
  cd Xvnc
  ./configure
-  sed 's|PROTO_DEFINES =|PROTO_DEFINES = -D_XOPEN_SOURCE=500L|' \
-    -i programs/Xserver/os/Makefile lib/font/fc/Makefile
+  setconf programs/Xserver/os/Makefile PROTO_DEFINES "-D_XOPEN_SOURCE=500L"
+  setconf lib/font/fc/Makefile PROTO_DEFINES "-D_XOPEN_SOURCE=500L"
  make
 }

 package() {
-  cd $srcdir/vnc_unixsrc
-  mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1
-  ./vncinstall $pkgdir/usr/bin $pkgdir/usr/share/man
+  cd "$srcdir/vnc_unixsrc"

-  # install java classes
-  mkdir -p $pkgdir/usr/share/vnc/classes
-  install -Dm644 $srcdir/vnc_unixsrc/classes/* \
-    $pkgdir/usr/share/vnc/classes
+  mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man1"
+  ./vncinstall "$pkgdir/usr/bin" "$pkgdir/usr/share/man"
+  mkdir -p "$pkgdir/usr/share/$pkgname"
+  install -Dm644 "$srcdir/vnc_unixsrc/classes/"* \
+    "$pkgdir/usr/share/$pkgname"
+  install -Dm644 "$srcdir/rgb.txt" "$pkgdir/usr/share/$pkgname/rgb.txt"
 }
+
+# vim:set ts=2 sw=2 et:
--- a/community/tightvnc/tightvnc-fontpath-xcolors.patch
+++ b/community/tightvnc/tightvnc-fontpath-xcolors.patch
@ -1,13 +0,0 @@
-diff -urN vnc_unixsrc/vncserver vnc_unixsrc.fixed/vncserver
--- vnc_unixsrc/vncserver	2009-02-11 23:27:18.000000000 -0500
-+++ vnc_unixsrc.fixed/vncserver	2009-04-23 21:46:46.000000000 -0400
-@@ -34,7 +34,8 @@
- $desktopName = "X";
- $vncClasses = "/usr/local/vnc/classes";
- $vncUserDir = "$ENV{HOME}/.vnc";
-$fontPath = "unix/:7100";
-+$fontPath = "/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/";
-+$colorPath = "/usr/share/X11/rgb";
- $authType = "-rfbauth $vncUserDir/passwd";
- 
- # Read configuration from the system-wide and user files if present.
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@ -14,9 +14,9 @@ plugrel=1
 noautobuild=1

 pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
-pkgver=4.6.2
-pkgrel=7
-_snapshot=4.6-20120120
+pkgver=4.6.3
+pkgrel=1
+#_snapshot=4.6-20120120
 _libstdcppmanver=20111215		# Note: check source directory name when updating this
 pkgdesc="The GNU Compiler Collection"
 arch=('i686' 'x86_64')
@ -25,17 +25,16 @@ url="http://gcc.gnu.org"
 makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl')
 checkdepends=('dejagnu')
 options=('!libtool' '!emptydirs' '!distcc')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-        ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+        #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
        ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
        gcc_pure64.patch
        gcc-hash-style-both.patch
        gcc-4.6.2-cloog-0.17.patch)
-md5sums=('f7ca5d9f7a07216577f81318b7cf56ef'
+md5sums=('773092fe5194353b02bb0110052a972e'
         '450772ce32daed97d7383199f8797f33'
         '4030ee1c08dd1e843c0225b772360e76'
-         '4df25b623799b148a0703eaeec8fdf3f'
-         '68b596040715d889deecfb20cabf115e')
+         '4df25b623799b148a0703eaeec8fdf3f')

 if [ -n "${_snapshot}" ]; then
  _basedir="${srcdir}/gcc-${_snapshot}"
@ -244,3 +243,8 @@ package_gcc-objc()
  install -Dm644 ${_basedir}/COPYING.RUNTIME \
    ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
 }
+md5sums=('f7ca5d9f7a07216577f81318b7cf56ef'
+         '450772ce32daed97d7383199f8797f33'
+         '4030ee1c08dd1e843c0225b772360e76'
+         '4df25b623799b148a0703eaeec8fdf3f'
+         '68b596040715d889deecfb20cabf115e')
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@ -15,7 +15,7 @@ noautobuild=1

 pkgname=glibc
 pkgver=2.15
-pkgrel=5
+pkgrel=7
 _glibcdate=20111227
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
@ -30,44 +30,66 @@ backup=(etc/gai.conf
 options=('!strip' '!distcc')
 install=glibc.install
 source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz
-        http://archlinuxarm.org/builder/src/glibc-ports-2.15-20120104.tar.bz2
+        http://archlinuxarm.org/builder/src/glibc-ports-2.15.tar.bz2
        glibc-2.10-dont-build-timezone.patch
-        glibc-2.10-bz4781.patch
        glibc-__i686.patch
        glibc-2.12.2-ignore-origin-of-privileged-program.patch
        glibc-2.14-libdl-crash.patch
-        glibc-2.14-revert-4768ae77.patch
        glibc-2.14-reexport-rpc-interface.patch
        glibc-2.14-reinstall-nis-rpc-headers.patch
+        glibc-2.15-fix-res_query-assert.patch
        glibc-2.15-regex.patch
        glibc-2.15-lddebug-scopes.patch
        glibc-2.15-revert-c5a0802a.patch
        glibc-2.15-scanf.patch
        glibc-2.15-ifunc.patch
        glibc-2.15-avx.patch
+        glibc-2.15-strcasecmp-disable-avx.patch
        glibc-2.15-gb18030.patch
        glibc-2.15-revert-netlink-cache.patch
+        glibc-2.15-arena.patch
+        glibc-2.15-negative-result-cache.patch
+        glibc-2.15-multiarch-x86-strcmp.patch
+        glibc-2.15-vdso.patch
+        glibc-2.15-feraiseexcept-plt.patch
+        glibc-2.15-vfprintf-nargs.patch
+        glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
+        glibc-2.15-fmtmsg-locking.patch
+        glibc-2.15-non-signalling-comparisons.patch
+        glibc-2.15-rintf-rounding.patch
+        glibc-2.15-nearbyintf-rounding.patch
        nscd
        locale.gen.txt
        locale-gen)
 md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
-         '837e7be231f0cf1804e590b85132ac86'
+         '216bfdcce3689e037d38d8d724720187'
         '4dadb9203b69a3210d53514bb46f41c3'
-         '0c5540efc51c0b93996c51b57a8540ae'
         '40cd342e21f71f5e49e32622b25acc52'
-         'b042647ea7d6f22ad319e12e796bd13e'
+         'e60e33591c9ec1447e4cddadcbb9cf3a'
         '6970bcfeb3bf88913436d5112d16f588'
-         '7da8c554a3b591c7401d7023b1928afc'
         'c5de2a946215d647c8af5432ec4b0da0'
         '55febbb72139ac7b65757df085024b83'
+         '31f415b41197d85d3bbee3d1eecd06a3'
         'b3526cbd5e29773560dba725db99af5a'
         '3c219ddfb619b6df903cac4cc42c611d'
         '7ae3e426251ae33e73dbad71f9c91378'
-         '39353f53168f4a7509ba5fe0d9f218b8'
-         '136eb969f5d6bb6f5155f72a1a7cf23e'
+         'f0782ddbf38e0b30ec6b85348816046f'
+         '3d844b53b2dbb7c996e39c7ad932f55d'
         '41ae047ac88e8f6f547c70b0a0bc3b72'
+         'fccb89f6628f59752278e125c35941f8'
         'c4cd34f20ccd37817f6c1374bd4ee68e'
-         '6771b0b2bb8aa3870a259fd2f46c424f'
+         '94b61302a7ca6c5764d013dc7738fcfe'
+         'a9ffadcfd2d357f91fee0b861fd4a7c6'
+         '2c46b8e294de24c531f2253ff69aeef3'
+         '7a2998a04ebfcf8bf820540f490ce714'
+         '0d77d20fa7fe2f87ad945cb9edb4d91d'
+         'bfdefac3d705f41fbf84b1de1dc945af'
+         'dded423e264cdd178500f3e8ad62fe66'
+         '340deaa582a95ddde86edb624c3bfea0'
+         '6bbac50e6ff82187654e6a0a7bd849e7'
+         'c483504cf404ed0b44480af627813a97'
+         '1419d61fd1dbc6cdc48bb59da86fa66f'
+         '7ff501435078b1a2622124fbeaafc921'
         'b587ee3a70c9b3713099295609afde49'
         '07ac979b6ab5eeb778d55f041529d623'
         '476e9113489f93b348b21e144b6a8fcf')
@ -88,46 +110,43 @@ build() {
  ln -s ${srcdir}/${pkgname}-ports-${pkgver} ./ports

  # timezone data is in separate package (tzdata)
-  patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
+  patch -p1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch

-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
-  patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
-
-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
+  # undefine __i686 for gcc <= 4.6
  # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
-  patch -Np1 -i ${srcdir}/glibc-__i686.patch
+  # fix in http://sourceware.org/git/?p=glibc.git;a=commit;h=d4a54ac6 requires additional backporting...
+  patch -p1 -i ${srcdir}/glibc-__i686.patch

  # http://www.exploit-db.com/exploits/15274/
-  # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+  # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09  (fedora branch)
+  patch -p1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch

-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...)
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9  (fedora branch)
  # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
-  patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
-
-  # Revert commit causing issues with crappy DNS servers...
-  # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER!
-  # Note that both these patches appear not to fix the issue completely:
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...)
-  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch
+  patch -p1 -i ${srcdir}/glibc-2.14-libdl-crash.patch

  # re-export RPC interface until libtirpc is ready as a replacement
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873  (fedora branch)
  patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3  (fedora branch)
  patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch

-  # Fix up regcomp/regexec
+  # fix res_query assertion
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
+  patch -p1 -i ${srcdir}/glibc-2.15-fix-res_query-assert.patch
+
+  # fix up regcomp/regexec
  # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745
  patch -Np1 -i ${srcdir}/glibc-2.15-regex.patch

-  # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223 
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64  (only fedora branch...)
+  # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64  (fedora branch)
  patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch

  # revert commit c5a0802a - causes various hangs
  # https://bugzilla.redhat.com/show_bug.cgi?id=769421
+  # Note: fedora may have actual fix (not submitted upstream yet...)
+  # http://pkgs.fedoraproject.org/gitweb/?p=glibc.git;a=blob_plain;f=glibc-rh552960-2.patch
  patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch

  # fix realloc usage in vfscanf
@ -141,18 +160,65 @@ build() {
  # fix AVX detection
  # http://sourceware.org/git/?p=glibc.git;a=commit;h=afc5ed09
  # http://sourceware.org/git/?p=glibc.git;a=commit;h=08cf777f
-  patch -Np1 -i ${srcdir}/glibc-2.15-avx.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-avx.patch
+  # and "fix" strcasecmp
+  patch -p1 -i ${srcdir}/glibc-2.15-strcasecmp-disable-avx.patch

  # fix GB18030 charmap
  # http://sourceware.org/bugzilla/show_bug.cgi?id=11837
  # http://sourceware.org/git/?p=glibc.git;a=commit;h=2a57bd79  (fedora branch)
  # http://sourceware.org/git/?p=glibc.git;a=commit;h=3d828a61  (fedora branch)
-  patch -Np1 -i ${srcdir}/glibc-2.15-gb18030.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-gb18030.patch

  # fix crash in __nscd_get_mapping if nscd not running
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13594
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13594 (potential "fix" in comment)
  # reverts commit 3a2c0242 and other necessary following changes...
-  patch -Np1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch
+  patch -p1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch
+
+  # handle ARENA_TEST correctly
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=41b81892
+  patch -p1 -i ${srcdir}/glibc-2.15-arena.patch
+
+  # Do not cache negative results in nscd if these are transient
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=3e1aa84e
+  patch -p1 -i ${srcdir}/glibc-2.15-negative-result-cache.patch
+
+  # strcasecmp_l, strncasecmp_l act as strcmp for multiarch x86
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=0bab47b6
+  patch -p1 -i ${srcdir}/glibc-2.15-multiarch-x86-strcmp.patch
+
+  # always set l_used for vDSO.
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=1f393a11
+  patch -p1 -i ${srcdir}/glibc-2.15-vdso.patch
+
+  # fix x86 PLT slot usage for feraiseexcept
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=7c35ffed
+  patch -p1 -i ${srcdir}/glibc-2.15-feraiseexcept-plt.patch
+
+  # vfprintf nargs overflow - CVE-2012-0864
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13656
+  # http://sourceware.org/ml/libc-alpha/2012-02/msg00328.html
+  patch -p1 -i ${srcdir}/glibc-2.15-vfprintf-nargs.patch
+
+  # avoid out ouf bounds read in __libc_res_nquerydomain
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=8fdceb2e
+  patch -p1 -i ${srcdir}/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
+
+  # make fmtmsg function thread-safe
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=7724defc
+  patch -p1 -i ${srcdir}/glibc-2.15-fmtmsg-locking.patch
+
+  # use non-signaling floating-point comparisons in math functions
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=92221550
+  patch -p1 -i ${srcdir}/glibc-2.15-non-signalling-comparisons.patch
+
+  # fix rintf rounding.
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=fe45ce09
+  patch -p1 -i ${srcdir}/glibc-2.15-rintf-rounding.patch
+
+  # fix nearbyintf rounding
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=6cbeae47
+  patch -p1 -i ${srcdir}/glibc-2.15-nearbyintf-rounding.patch

  install -dm755 ${pkgdir}/etc
  touch ${pkgdir}/etc/ld.so.conf
--- a/core/glibc/glibc-2.10-bz4781.patch
+++ b/core/glibc/glibc-2.10-bz4781.patch
@ -1,42 +0,0 @@
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S
--- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S	2009-05-23 13:27:46.000000000 +1000
-@@ -120,9 +120,6 @@
- 	ret
- 
- L(thread_start):
-	cfi_startproc;
-	/* Clearing frame pointer is insufficient, use CFI.  */
-	cfi_undefined (eip);
- 	/* Note: %esi is zero.  */
- 	movl	%esi,%ebp	/* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- 	jmp	L(haspid)
- 	.previous
- #endif
-	cfi_endproc;
- 
- 	cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S
--- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-05-23 13:27:46.000000000 +1000
-@@ -89,9 +89,6 @@
- 	ret
- 
- L(thread_start):
-	cfi_startproc;
-	/* Clearing frame pointer is insufficient, use CFI.  */
-	cfi_undefined (rip);
- 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
- 	   the outermost frame obviously.  */
- 	xorl	%ebp, %ebp
-@@ -116,7 +113,6 @@
- 	/* Call exit with return value from function call. */
- 	movq	%rax, %rdi
- 	call	HIDDEN_JUMPTARGET (_exit)
-	cfi_endproc;
- 
- 	cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
--- a/core/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+++ b/core/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
@ -1,13 +1,3 @@
-From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Thu, 9 Dec 2010 15:00:59 +0100
-Subject: [PATCH 1/1] Ignore origin of privileged program
-
---
- ChangeLog       |    5 +++++
- elf/dl-object.c |    3 +++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
 diff --git a/elf/dl-object.c b/elf/dl-object.c
 index 22a1635..7674d49 100644
 --- a/elf/dl-object.c
@ -22,5 +12,3 @@ index 22a1635..7674d49 100644
 
   return new;
 }
-- 
-1.7.2
--- a/core/glibc/glibc-2.14-revert-4768ae77.patch
+++ b/core/glibc/glibc-2.14-revert-4768ae77.patch
@ -1,37 +0,0 @@
-diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
--- glibc-orig//resolv/res_send.c	2011-06-10 18:59:03.041436996 +1000
-+++ glibc/resolv/res_send.c	2011-06-10 19:08:09.379309323 +1000
-@@ -549,7 +549,7 @@
- 				    ns, ansp, ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
-			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+			if (n == 0)
- 				goto next_ns;
- 		} else {
- 			/* Use datagrams. */
-@@ -559,7 +559,7 @@
- 				    ansp2, nansp2, resplen2);
- 			if (n < 0)
- 				return (-1);
-			if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+			if (n == 0)
- 				goto next_ns;
- 			if (v_circuit)
- 			  // XXX Check whether both requests failed or
-@@ -1275,14 +1275,10 @@
- 				(*thisresplenp > *thisanssizp)
- 				? *thisanssizp : *thisresplenp);
- 
-			if (recvresp1 || (buf2 != NULL && recvresp2)) {
-			  *resplen2 = 0;
-+			if (recvresp1 || (buf2 != NULL && recvresp2))
- 			  return resplen;
-			}
- 			if (buf2 != NULL)
- 			  {
-			    /* No data from the first reply.  */
-			    resplen = 0;
- 			    /* We are waiting for a possible second reply.  */
- 			    if (hp->id == anhp->id)
- 			      recvresp1 = 1;
--- a/core/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
+++ b/core/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
@ -0,0 +1,24 @@
+diff --git a/resolv/res_query.c b/resolv/res_query.c
+index 947c651..abccd4a 100644
+--- a/resolv/res_query.c
+++ b/resolv/res_query.c
+@@ -556,12 +556,16 @@ __libc_res_nquerydomain(res_state statp,
+ 		 * copy without '.' if present.
+ 		 */
+ 		n = strlen(name);
+-		if (n >= MAXDNAME) {
+
+		/* Decrement N prior to checking it against MAXDNAME
+		   so that we detect a wrap to SIZE_MAX and return
+		   a reasonable error.  */
+		n--;
+		if (n >= MAXDNAME - 1) {
+ 			RES_SET_H_ERRNO(statp, NO_RECOVERY);
+ 			return (-1);
+ 		}
+-		n--;
+-		if (n >= 0 && name[n] == '.') {
+		if (name[n] == '.') {
+ 			strncpy(nbuf, name, n);
+ 			nbuf[n] = '\0';
+ 		} else
--- a/core/glibc/glibc-2.15-arena.patch
+++ b/core/glibc/glibc-2.15-arena.patch
@ -0,0 +1,29 @@
+diff --git a/malloc/arena.c b/malloc/arena.c
+index d3cf4b9..b1c9469 100644
+--- a/malloc/arena.c
+++ b/malloc/arena.c
+@@ -828,7 +828,7 @@ arena_get2(mstate a_tsd, size_t size)
+ 	{
+ 	  if (mp_.arena_max != 0)
+ 	    narenas_limit = mp_.arena_max;
+-	  else
+	  else if (narenas > mp_.arena_test)
+ 	    {
+ 	      int n  = __get_nprocs ();
+ 
+@@ -842,7 +842,14 @@ arena_get2(mstate a_tsd, size_t size)
+ 	}
+     repeat:;
+       size_t n = narenas;
+-      if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0))
+      /* NB: the following depends on the fact that (size_t)0 - 1 is a
+	 very large number and that the underflow is OK.  If arena_max
+	 is set the value of arena_test is irrelevant.  If arena_test
+	 is set but narenas is not yet larger or equal to arena_test
+	 narenas_limit is 0.  There is no possibility for narenas to
+	 be too big for the test to always fail since there is not
+	 enough address space to create that many arenas.  */
+      if (__builtin_expect (n <= narenas_limit - 1, 0))
+ 	{
+ 	  if (catomic_compare_and_exchange_bool_acq (&narenas, n + 1, n))
+ 	    goto repeat;
--- a/core/glibc/glibc-2.15-feraiseexcept-plt.patch
+++ b/core/glibc/glibc-2.15-feraiseexcept-plt.patch
@ -0,0 +1,20 @@
+diff --git a/sysdeps/i386/fpu/feupdateenv.c b/sysdeps/i386/fpu/feupdateenv.c
+index 70f9ee2..6e2ce35 100644
+--- a/sysdeps/i386/fpu/feupdateenv.c
+++ b/sysdeps/i386/fpu/feupdateenv.c
+@@ -1,5 +1,5 @@
+ /* Install given floating-point environment and raise exceptions.
+-   Copyright (C) 1997,99,2000,01,07,2010 Free Software Foundation, Inc.
+   Copyright (C) 1997,99,2000,01,07,2010,2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+ 
+@@ -44,7 +44,7 @@ __feupdateenv (const fenv_t *envp)
+   /* Raise the saved exception.  Incidently for us the implementation
+      defined format of the values in objects of type fexcept_t is the
+      same as the ones specified using the FE_* constants.  */
+-  feraiseexcept ((int) temp);
+  __feraiseexcept ((int) temp);
+ 
+   /* Success.  */
+   return 0;
--- a/core/glibc/glibc-2.15-fix-res_query-assert.patch
+++ b/core/glibc/glibc-2.15-fix-res_query-assert.patch
@ -0,0 +1,51 @@
+--- a/resolv/res_query.c	
+++ a/resolv/res_query.c	
+@@ -122,6 +122,7 @@ __libc_res_nquery(res_state statp,
+ 		  int *resplen2)
+ {
+ 	HEADER *hp = (HEADER *) answer;
+	HEADER *hp2;
+ 	int n, use_malloc = 0;
+ 	u_int oflags = statp->_flags;
+ 
+@@ -239,26 +240,25 @@ __libc_res_nquery(res_state statp,
+ 	  /* __libc_res_nsend might have reallocated the buffer.  */
+ 	  hp = (HEADER *) *answerp;
+ 
+-	/* We simplify the following tests by assigning HP to HP2.  It
+-	   is easy to verify that this is the same as ignoring all
+-	   tests of HP2.  */
+-	HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp;
+-
+-	if (n < (int) sizeof (HEADER) && answerp2 != NULL
+-	    && *resplen2 > (int) sizeof (HEADER))
+	/* We simplify the following tests by assigning HP to HP2 or
+	   vice versa.  It is easy to verify that this is the same as
+	   ignoring all tests of HP or HP2.  */
+	if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER))
+ 	  {
+-	    /* Special case of partial answer.  */
+-	    assert (hp != hp2);
+-	    hp = hp2;
+	    hp2 = hp;
+ 	  }
+-	else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
+-		 && n > (int) sizeof (HEADER))
+	else
+ 	  {
+-	    /* Special case of partial answer.  */
+-	    assert (hp != hp2);
+-	    hp2 = hp;
+	    hp2 = (HEADER *) *answerp2;
+	    if (n < (int) sizeof (HEADER))
+	      {
+	        hp = hp2;
+	      }
+ 	  }
+ 
+	/* Make sure both hp and hp2 are defined */
+	assert((hp != NULL) && (hp2 != NULL));
+
+ 	if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0)
+ 	    && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) {
+ #ifdef DEBUG
--- a/core/glibc/glibc-2.15-fmtmsg-locking.patch
+++ b/core/glibc/glibc-2.15-fmtmsg-locking.patch
@ -0,0 +1,148 @@
+diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c
+index 9203317..4c02302 100644
+--- a/stdlib/fmtmsg.c
+++ b/stdlib/fmtmsg.c
+@@ -103,7 +103,6 @@ fmtmsg (long int classification, const char *label, int severity,
+ 	const char *text, const char *action, const char *tag)
+ {
+   __libc_once_define (static, once);
+-  int result = MM_OK;
+   struct severity_info *severity_rec;
+ 
+   /* Make sure everything is initialized.  */
+@@ -124,17 +123,6 @@ fmtmsg (long int classification, const char *label, int severity,
+ 	return MM_NOTOK;
+     }
+ 
+-  for (severity_rec = severity_list; severity_rec != NULL;
+-       severity_rec = severity_rec->next)
+-    if (severity == severity_rec->severity)
+-      /* Bingo.  */
+-      break;
+-
+-  /* If we don't know anything about the severity level return an error.  */
+-  if (severity_rec == NULL)
+-    return MM_NOTOK;
+-
+-
+ #ifdef __libc_ptf_call
+   /* We do not want this call to be cut short by a thread
+      cancellation.  Therefore disable cancellation for now.  */
+@@ -143,54 +131,73 @@ fmtmsg (long int classification, const char *label, int severity,
+ 		   0);
+ #endif
+ 
+-  /* Now we can print.  */
+-  if (classification & MM_PRINT)
+-    {
+-      int do_label = (print & label_mask) && label != MM_NULLLBL;
+-      int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
+-      int do_text = (print & text_mask) && text != MM_NULLTXT;
+-      int do_action = (print & action_mask) && action != MM_NULLACT;
+-      int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
+-
+-      if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
+-		      do_label ? label : "",
+-		      do_label && (do_severity | do_text | do_action | do_tag)
+-		      ? ": " : "",
+-		      do_severity ? severity_rec->string : "",
+-		      do_severity && (do_text | do_action | do_tag)
+-		      ? ": " : "",
+-		      do_text ? text : "",
+-		      do_text && (do_action | do_tag) ? "\n" : "",
+-		      do_action ? "TO FIX: " : "",
+-		      do_action ? action : "",
+-		      do_action && do_tag ? "  " : "",
+-		      do_tag ? tag : "") < 0)
+-	/* Oh, oh.  An error occurred during the output.  */
+-	result = MM_NOMSG;
+-    }
+  __libc_lock_lock (lock);
+ 
+-  if (classification & MM_CONSOLE)
+  for (severity_rec = severity_list; severity_rec != NULL;
+       severity_rec = severity_rec->next)
+    if (severity == severity_rec->severity)
+      /* Bingo.  */
+      break;
+
+  /* If we don't know anything about the severity level return an error.  */
+  int result = MM_NOTOK;
+  if (severity_rec != NULL)
+     {
+-      int do_label = label != MM_NULLLBL;
+-      int do_severity = severity != MM_NULLSEV;
+-      int do_text = text != MM_NULLTXT;
+-      int do_action = action != MM_NULLACT;
+-      int do_tag = tag != MM_NULLTAG;
+-
+-      syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
+-	      do_label ? label : "",
+-	      do_label && (do_severity | do_text | do_action | do_tag)
+-	      ? ": " : "",
+-	      do_severity ? severity_rec->string : "",
+-	      do_severity && (do_text | do_action | do_tag) ? ": " : "",
+-	      do_text ? text : "",
+-	      do_text && (do_action | do_tag) ? "\n" : "",
+-	      do_action ? "TO FIX: " : "",
+-	      do_action ? action : "",
+-	      do_action && do_tag ? "  " : "",
+-	      do_tag ? tag : "");
+      result = MM_OK;
+
+      /* Now we can print.  */
+      if (classification & MM_PRINT)
+	{
+	  int do_label = (print & label_mask) && label != MM_NULLLBL;
+	  int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
+	  int do_text = (print & text_mask) && text != MM_NULLTXT;
+	  int do_action = (print & action_mask) && action != MM_NULLACT;
+	  int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
+	  int need_colon = (do_label
+			    && (do_severity | do_text | do_action | do_tag));
+
+	  if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
+			  do_label ? label : "",
+			  need_colon ? ": " : "",
+			  do_severity ? severity_rec->string : "",
+			  do_severity && (do_text | do_action | do_tag)
+			  ? ": " : "",
+			  do_text ? text : "",
+			  do_text && (do_action | do_tag) ? "\n" : "",
+			  do_action ? "TO FIX: " : "",
+			  do_action ? action : "",
+			  do_action && do_tag ? "  " : "",
+			  do_tag ? tag : "") < 0)
+	    /* Oh, oh.  An error occurred during the output.  */
+	    result = MM_NOMSG;
+	}
+
+      if (classification & MM_CONSOLE)
+	{
+	  int do_label = label != MM_NULLLBL;
+	  int do_severity = severity != MM_NULLSEV;
+	  int do_text = text != MM_NULLTXT;
+	  int do_action = action != MM_NULLACT;
+	  int do_tag = tag != MM_NULLTAG;
+	  int need_colon = (do_label
+			    && (do_severity | do_text | do_action | do_tag));
+
+	  syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
+		  do_label ? label : "",
+		  need_colon ? ": " : "",
+		  do_severity ? severity_rec->string : "",
+		  do_severity && (do_text | do_action | do_tag) ? ": " : "",
+		  do_text ? text : "",
+		  do_text && (do_action | do_tag) ? "\n" : "",
+		  do_action ? "TO FIX: " : "",
+		  do_action ? action : "",
+		  do_action && do_tag ? "  " : "",
+		  do_tag ? tag : "");
+	}
+     }
+ 
+  __libc_lock_unlock (lock);
+
+ #ifdef __libc_ptf_call
+   __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
+ #endif
--- a/core/glibc/glibc-2.15-ifunc.patch
+++ b/core/glibc/glibc-2.15-ifunc.patch
@ -1,23 +1,3 @@
-
-From 6ee65ed6ddbf04402fad0bec6aa9c73b9d982ae4 Mon Sep 17 00:00:00 2001
-From: Ulrich Drepper <drepper@gmail.com>
-Date: Fri, 27 Jan 2012 15:05:19 -0500
-Subject: [PATCH] Sort objects before relocations
-
---
- ChangeLog              |   11 ++++
- Makeconfig             |    6 ++
- NEWS                   |    4 +-
- elf/Makefile           |   15 +++++-
- elf/dl-open.c          |  128 ++++++++++++++++++++++++++++++++++++------------
- elf/tst-relsort1.c     |   19 +++++++
- elf/tst-relsort1mod1.c |    7 +++
- elf/tst-relsort1mod2.c |    7 +++
- 8 files changed, 160 insertions(+), 37 deletions(-)
- create mode 100644 elf/tst-relsort1.c
- create mode 100644 elf/tst-relsort1mod1.c
- create mode 100644 elf/tst-relsort1mod2.c
-
 diff --git a/Makeconfig b/Makeconfig
 index 2db2821..68547b2 100644
 --- a/Makeconfig
@ -280,6 +260,3 @@ index 0000000..a2c3e55
 +{
 +  return floor (d) != 0.0;
 +}
-- 
-1.7.3.4
-
--- a/core/glibc/glibc-2.15-multiarch-x86-strcmp.patch
+++ b/core/glibc/glibc-2.15-multiarch-x86-strcmp.patch
@ -0,0 +1,39 @@
+diff --git a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
+index d10e872..d4fcd2b 100644
+--- a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
+++ b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
+@@ -6,6 +6,8 @@ extern __typeof (strcasecmp_l) __strcasecmp_l_nonascii;
+ #define USE_IN_EXTENDED_LOCALE_MODEL    1
+ #include <string/strcasecmp.c>
+ 
+strong_alias (__strcasecmp_l_nonascii, __strcasecmp_l_ia32)
+
+ /* The needs of strcasecmp in libc are minimal, no need to go through
+    the IFUNC.  */
+ strong_alias (__strcasecmp_l_nonascii, __GI___strcasecmp_l)
+diff --git a/sysdeps/i386/i686/multiarch/strcmp.S b/sysdeps/i386/i686/multiarch/strcmp.S
+index 5410d17..b3b9eb8 100644
+--- a/sysdeps/i386/i686/multiarch/strcmp.S
+++ b/sysdeps/i386/i686/multiarch/strcmp.S
+@@ -111,6 +111,7 @@ END(STRCMP)
+ # endif
+ #endif
+ 
+-#ifndef USE_AS_STRNCMP
+#if !defined USE_AS_STRNCMP && !defined USE_AS_STRCASECMP_L \
+    && !defined USE_AS_STRNCASECMP_L
+ # include "../strcmp.S"
+ #endif
+diff --git a/sysdeps/i386/i686/multiarch/strncase_l-c.c b/sysdeps/i386/i686/multiarch/strncase_l-c.c
+index 0c68b8d..7e601af 100644
+--- a/sysdeps/i386/i686/multiarch/strncase_l-c.c
+++ b/sysdeps/i386/i686/multiarch/strncase_l-c.c
+@@ -6,6 +6,8 @@ extern __typeof (strncasecmp_l) __strncasecmp_l_nonascii;
+ #define USE_IN_EXTENDED_LOCALE_MODEL    1
+ #include <string/strncase.c>
+ 
+strong_alias (__strncasecmp_l_nonascii, __strncasecmp_l_ia32)
+
+ /* The needs of strcasecmp in libc are minimal, no need to go through
+    the IFUNC.  */
+ strong_alias (__strncasecmp_l_nonascii, __GI___strncasecmp_l)
--- a/core/glibc/glibc-2.15-nearbyintf-rounding.patch
+++ b/core/glibc/glibc-2.15-nearbyintf-rounding.patch
@ -0,0 +1,75 @@
+diff --git a/math/libm-test.inc b/math/libm-test.inc
+index c8186c8..1016753 100644
+--- a/math/libm-test.inc
+++ b/math/libm-test.inc
+@@ -4632,6 +4632,29 @@ nearbyint_test (void)
+   TEST_f_f (nearbyint, 524286.75, 524287.0);
+   TEST_f_f (nearbyint, 524288.75, 524289.0);
+ 
+  TEST_f_f (nearbyint, 1048576.75, 1048577.0);
+  TEST_f_f (nearbyint, 2097152.75, 2097153.0);
+  TEST_f_f (nearbyint, 2492472.75, 2492473.0);
+  TEST_f_f (nearbyint, 2886220.75, 2886221.0);
+  TEST_f_f (nearbyint, 3058792.75, 3058793.0);
+  TEST_f_f (nearbyint, -1048576.75, -1048577.0);
+  TEST_f_f (nearbyint, -2097152.75, -2097153.0);
+  TEST_f_f (nearbyint, -2492472.75, -2492473.0);
+  TEST_f_f (nearbyint, -2886220.75, -2886221.0);
+  TEST_f_f (nearbyint, -3058792.75, -3058793.0);
+#ifndef TEST_FLOAT
+  TEST_f_f (nearbyint, 70368744177664.75, 70368744177665.0);
+  TEST_f_f (nearbyint, 140737488355328.75, 140737488355329.0);
+  TEST_f_f (nearbyint, 281474976710656.75, 281474976710657.0);
+  TEST_f_f (nearbyint, 562949953421312.75, 562949953421313.0);
+  TEST_f_f (nearbyint, 1125899906842624.75, 1125899906842625.0);
+  TEST_f_f (nearbyint, -70368744177664.75, -70368744177665.0);
+  TEST_f_f (nearbyint, -140737488355328.75, -140737488355329.0);
+  TEST_f_f (nearbyint, -281474976710656.75, -281474976710657.0);
+  TEST_f_f (nearbyint, -562949953421312.75, -562949953421313.0);
+  TEST_f_f (nearbyint, -1125899906842624.75, -1125899906842625.0);
+#endif
+
+   END (nearbyint);
+ }
+ 
+diff --git a/sysdeps/ieee754/flt-32/s_nearbyintf.c b/sysdeps/ieee754/flt-32/s_nearbyintf.c
+index 04ef9ab..a6d602b 100644
+--- a/sysdeps/ieee754/flt-32/s_nearbyintf.c
+++ b/sysdeps/ieee754/flt-32/s_nearbyintf.c
+@@ -30,18 +30,12 @@ __nearbyintf(float x)
+ {
+ 	fenv_t env;
+ 	int32_t i0,j0,sx;
+-	u_int32_t i,i1;
+ 	float w,t;
+ 	GET_FLOAT_WORD(i0,x);
+ 	sx = (i0>>31)&1;
+ 	j0 = ((i0>>23)&0xff)-0x7f;
+ 	if(j0<23) {
+ 	    if(j0<0) {
+-		if((i0&0x7fffffff)==0) return x;
+-		i1 = (i0&0x07fffff);
+-		i0 &= 0xfff00000;
+-		i0 |= ((i1|-i1)>>9)&0x400000;
+-		SET_FLOAT_WORD(x,i0);
+ 		libc_feholdexceptf (&env);
+ 		w = TWO23[sx]+x;
+ 		t =  w-TWO23[sx];
+@@ -49,17 +43,11 @@ __nearbyintf(float x)
+ 		GET_FLOAT_WORD(i0,t);
+ 		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
+ 		return t;
+-	    } else {
+-		i = (0x007fffff)>>j0;
+-		if((i0&i)==0) return x; /* x is integral */
+-		i>>=1;
+-		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
+ 	    }
+ 	} else {
+ 	    if(__builtin_expect(j0==0x80, 0)) return x+x;	/* inf or NaN */
+ 	    else return x;		/* x is integral */
+ 	}
+-	SET_FLOAT_WORD(x,i0);
+ 	libc_feholdexceptf (&env);
+ 	w = TWO23[sx]+x;
+ 	t = w-TWO23[sx];
--- a/core/glibc/glibc-2.15-negative-result-cache.patch
+++ b/core/glibc/glibc-2.15-negative-result-cache.patch
@ -0,0 +1,138 @@
+diff --git a/nscd/aicache.c b/nscd/aicache.c
+index aaaf80d..e1f1244 100644
+--- a/nscd/aicache.c
+++ b/nscd/aicache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for host lookup.
+-   Copyright (C) 2004-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2004-2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
+ 
+@@ -514,8 +514,9 @@ next_nip:
+       if (fd != -1)
+ 	TEMP_FAILURE_RETRY (send (fd, &notfound, total, MSG_NOSIGNAL));
+ 
+-      /* If we cannot permanently store the result, so be it.  */
+-      if (__builtin_expect (db->negtimeout == 0, 0))
+      /* If we have a transient error or cannot permanently store the
+	 result, so be it.  */
+      if (rc4 == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	{
+ 	  /* Mark the old entry as obsolete.  */
+ 	  if (dh != NULL)
+diff --git a/nscd/grpcache.c b/nscd/grpcache.c
+index e9607c6..a698f36 100644
+--- a/nscd/grpcache.c
+++ b/nscd/grpcache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for group lookup.
+-   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+ 
+@@ -120,8 +120,9 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
+ 	  else
+ 	    written = total;
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (db->negtimeout == 0)
+	  /* If we have a transient error or cannot permanently store
+	     the result, so be it.  */
+	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
+diff --git a/nscd/hstcache.c b/nscd/hstcache.c
+index 4d68ade..c72feaa 100644
+--- a/nscd/hstcache.c
+++ b/nscd/hstcache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for host lookup.
+-   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+ 
+@@ -141,8 +141,9 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
+ 					MSG_NOSIGNAL)) != total)
+ 	    all_written = false;
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (__builtin_expect (db->negtimeout == 0, 0))
+	  /* If we have a transient error or cannot permanently store
+	     the result, so be it.  */
+	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
+diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
+index 4ac9942..2019991 100644
+--- a/nscd/initgrcache.c
+++ b/nscd/initgrcache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for host lookup.
+-   Copyright (C) 2004-2006, 2008, 2009, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2004-2006, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
+ 
+@@ -202,8 +202,9 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
+ 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
+ 						MSG_NOSIGNAL));
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (__builtin_expect (db->negtimeout == 0, 0))
+	  /* If we have a transient error or cannot permanently store
+	     the result, so be it.  */
+	  if (all_tryagain || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
+diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
+index 49e130c..e2ba09d 100644
+--- a/nscd/pwdcache.c
+++ b/nscd/pwdcache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for passwd lookup.
+-   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+ 
+@@ -124,8 +124,9 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
+ 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
+ 						MSG_NOSIGNAL));
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (__builtin_expect (db->negtimeout == 0, 0))
+	  /* If we have a transient error or cannot permanently store
+	     the result, so be it.  */
+	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
+diff --git a/nscd/servicescache.c b/nscd/servicescache.c
+index d3d5dce..a6337e3 100644
+--- a/nscd/servicescache.c
+++ b/nscd/servicescache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for services lookup.
+-   Copyright (C) 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@drepper.com>, 2007.
+ 
+@@ -108,8 +108,9 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
+ 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
+ 						MSG_NOSIGNAL));
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (__builtin_expect (db->negtimeout == 0, 0))
+	  /* If we have a transient error or cannot permanently store
+	     the result, so be it.  */
+	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
--- a/core/glibc/glibc-2.15-non-signalling-comparisons.patch
+++ b/core/glibc/glibc-2.15-non-signalling-comparisons.patch
@ -0,0 +1,886 @@
+diff --git a/math/w_acos.c b/math/w_acos.c
+index 3138408..0490933 100644
+--- a/math/w_acos.c
+++ b/math/w_acos.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ __acos (double x)
+ {
+-  if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isgreater (fabs (x), 1.0), 0)
+      && _LIB_VERSION != _IEEE_)
+     {
+       /* acos(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_acosf.c b/math/w_acosf.c
+index 0e41a2c..2500a7d 100644
+--- a/math/w_acosf.c
+++ b/math/w_acosf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ float
+ __acosf (float x)
+ {
+-  if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
+      && _LIB_VERSION != _IEEE_)
+     {
+       /* acos(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_acosh.c b/math/w_acosh.c
+index 0bd2686..d632987 100644
+--- a/math/w_acosh.c
+++ b/math/w_acosh.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ double
+ __acosh (double x)
+ {
+-  if (__builtin_expect (x < 1.0, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isless (x,  1.0), 0) && _LIB_VERSION != _IEEE_)
+     /* acosh(x<1) */
+     return __kernel_standard (x, x, 29);
+ 
+diff --git a/math/w_acoshf.c b/math/w_acoshf.c
+index c59bf94..f77df2b 100644
+--- a/math/w_acoshf.c
+++ b/math/w_acoshf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ float
+ __acoshf (float x)
+ {
+-  if (__builtin_expect (x < 1.0f, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isless (x, 1.0f), 0) && _LIB_VERSION != _IEEE_)
+     /* acosh(x<1) */
+     return __kernel_standard_f (x, x, 129);
+ 
+diff --git a/math/w_acoshl.c b/math/w_acoshl.c
+index 819bdfc..cc823b8 100644
+--- a/math/w_acoshl.c
+++ b/math/w_acoshl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ long double
+ __acoshl (long double x)
+ {
+-  if (__builtin_expect (x < 1.0L, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isless (x, 1.0L), 0) && _LIB_VERSION != _IEEE_)
+     /* acosh(x<1) */
+     return __kernel_standard (x, x, 229);
+ 
+diff --git a/math/w_acosl.c b/math/w_acosl.c
+index 6417068..05023b4 100644
+--- a/math/w_acosl.c
+++ b/math/w_acosl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ long double
+ __acosl (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
+      && _LIB_VERSION != _IEEE_)
+     {
+       /* acos(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_asin.c b/math/w_asin.c
+index d4e89ce..0fa9487 100644
+--- a/math/w_asin.c
+++ b/math/w_asin.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ __asin (double x)
+ {
+-  if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isgreater (fabs (x),  1.0), 0)
+      && _LIB_VERSION != _IEEE_)
+     {
+       /* asin(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_asinf.c b/math/w_asinf.c
+index 270961f..c28edab 100644
+--- a/math/w_asinf.c
+++ b/math/w_asinf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ float
+ __asinf (float x)
+ {
+-  if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
+      && _LIB_VERSION != _IEEE_)
+     {
+       /* asin(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_asinl.c b/math/w_asinl.c
+index 32e5273..e4036d8 100644
+--- a/math/w_asinl.c
+++ b/math/w_asinl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ long double
+ __asinl (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
+      && _LIB_VERSION != _IEEE_)
+     {
+       /* asin(|x|>1) */
+       feraiseexcept (FE_INVALID);
+diff --git a/math/w_atanh.c b/math/w_atanh.c
+index 1022bd5..190d2e9 100644
+--- a/math/w_atanh.c
+++ b/math/w_atanh.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,8 @@
+ double
+ __atanh (double x)
+ {
+-  if (__builtin_expect (fabs (x) >= 1.0, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isgreaterequal (fabs (x), 1.0), 0)
+      && _LIB_VERSION != _IEEE_)
+     return __kernel_standard (x, x,
+ 			      fabs (x) > 1.0
+ 			      ? 30		/* atanh(|x|>1) */
+diff --git a/math/w_atanhf.c b/math/w_atanhf.c
+index 3c8cf83..e0c5dc3 100644
+--- a/math/w_atanhf.c
+++ b/math/w_atanhf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,8 @@
+ float
+ __atanhf (float x)
+ {
+-  if (__builtin_expect (fabsf (x) >= 1.0f, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isgreaterequal (fabsf (x), 1.0f), 0)
+      && _LIB_VERSION != _IEEE_)
+     return __kernel_standard_f (x, x,
+ 				fabsf (x) > 1.0f
+ 				? 130		/* atanh(|x|>1) */
+diff --git a/math/w_atanhl.c b/math/w_atanhl.c
+index f582acf..319535d 100644
+--- a/math/w_atanhl.c
+++ b/math/w_atanhl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,8 @@
+ long double
+ __atanhl (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) >= 1.0L, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isgreaterequal (fabsl (x), 1.0L), 0)
+      && _LIB_VERSION != _IEEE_)
+     return __kernel_standard (x, x,
+ 			      fabsl (x) > 1.0L
+ 			      ? 230		/* atanh(|x|>1) */
+diff --git a/math/w_exp2.c b/math/w_exp2.c
+index bf22326..7a3b0af 100644
+--- a/math/w_exp2.c
+++ b/math/w_exp2.c
+@@ -12,7 +12,8 @@ static const double u_threshold = (double) (DBL_MIN_EXP - DBL_MANT_DIG - 1);
+ double
+ __exp2 (double x)
+ {
+-  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
+  if (__builtin_expect (islessequal (x, u_threshold)
+			|| isgreater (x, o_threshold), 0)
+       && _LIB_VERSION != _IEEE_ && __finite (x))
+     /* exp2 overflow: 44, exp2 underflow: 45 */
+     return __kernel_standard (x, x, 44 + (x <= o_threshold));
+diff --git a/math/w_exp2f.c b/math/w_exp2f.c
+index 7215fca..c4e9e94 100644
+--- a/math/w_exp2f.c
+++ b/math/w_exp2f.c
+@@ -12,7 +12,8 @@ static const float u_threshold = (float) (FLT_MIN_EXP - FLT_MANT_DIG - 1);
+ float
+ __exp2f (float x)
+ {
+-  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
+  if (__builtin_expect (islessequal (x, u_threshold)
+			|| isgreater (x, o_threshold), 0)
+       && _LIB_VERSION != _IEEE_ && __finitef (x))
+     /* exp2 overflow: 144, exp2 underflow: 145 */
+     return __kernel_standard_f (x, x, 144 + (x <= o_threshold));
+diff --git a/math/w_exp2l.c b/math/w_exp2l.c
+index ac8d231..442a637 100644
+--- a/math/w_exp2l.c
+++ b/math/w_exp2l.c
+@@ -13,7 +13,8 @@ static const long double u_threshold
+ long double
+ __exp2l (long double x)
+ {
+-  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
+  if (__builtin_expect (islessequal (x, u_threshold)
+			|| isgreater (x, o_threshold), 0)
+       && _LIB_VERSION != _IEEE_ && __finitel (x))
+     /* exp2 overflow: 244, exp2 underflow: 245 */
+     return __kernel_standard (x, x, 244 + (x <= o_threshold));
+diff --git a/math/w_j0.c b/math/w_j0.c
+index 1dff8b4..f8d3724 100644
+--- a/math/w_j0.c
+++ b/math/w_j0.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ j0 (double x)
+ {
+-  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
+      && _LIB_VERSION != _IEEE_)
+     /* j0(|x|>X_TLOSS) */
+     return __kernel_standard (x, x, 34);
+ 
+@@ -40,7 +41,8 @@ strong_alias (j0, j0l)
+ double
+ y0 (double x)
+ {
+-  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
+      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0)
+ 	{
+diff --git a/math/w_j0f.c b/math/w_j0f.c
+index fc52f26..cef36aa 100644
+--- a/math/w_j0f.c
+++ b/math/w_j0f.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ j0f (float x)
+ {
+-  if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0)
+  if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     /* j0(|x|>X_TLOSS) */
+     return __kernel_standard_f (x, x, 134);
+@@ -38,7 +38,8 @@ j0f (float x)
+ float
+ y0f (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
+  if (__builtin_expect (islessequal (x, 0.0f)
+                        || isgreater (x, (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0f)
+diff --git a/math/w_j0l.c b/math/w_j0l.c
+index 8d72d50..144f33c 100644
+--- a/math/w_j0l.c
+++ b/math/w_j0l.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ long double
+ __j0l (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
+      && _LIB_VERSION != _IEEE_)
+     /* j0(|x|>X_TLOSS) */
+     return __kernel_standard (x, x, 234);
+ 
+@@ -38,7 +39,8 @@ weak_alias (__j0l, j0l)
+ long double
+ __y0l (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
+      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0L)
+ 	{
+diff --git a/math/w_j1.c b/math/w_j1.c
+index 358e0e1..e9a5357 100644
+--- a/math/w_j1.c
+++ b/math/w_j1.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ j1 (double x)
+ {
+-  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
+      && _LIB_VERSION != _IEEE_)
+     /* j1(|x|>X_TLOSS) */
+     return __kernel_standard (x, x, 36);
+ 
+@@ -40,7 +41,8 @@ strong_alias (j1, j1l)
+ double
+ y1 (double x)
+ {
+-  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
+      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0)
+ 	{
+diff --git a/math/w_j1f.c b/math/w_j1f.c
+index 096fdf5..29bd949 100644
+--- a/math/w_j1f.c
+++ b/math/w_j1f.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ float
+ j1f (float x)
+ {
+-  if (__builtin_expect (fabsf (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isgreater (fabsf (x), X_TLOSS), 0)
+      && _LIB_VERSION != _IEEE_)
+     /* j1(|x|>X_TLOSS) */
+     return __kernel_standard_f (x, x, 136);
+ 
+@@ -37,7 +38,8 @@ j1f (float x)
+ float
+ y1f (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
+  if (__builtin_expect (islessequal (x, 0.0f)
+			|| isgreater (x, (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0f)
+diff --git a/math/w_j1l.c b/math/w_j1l.c
+index 93e4ee4..01b8551 100644
+--- a/math/w_j1l.c
+++ b/math/w_j1l.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ long double
+ __j1l (long double x)
+ {
+-  if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
+      && _LIB_VERSION != _IEEE_)
+     /* j1(|x|>X_TLOSS) */
+     return __kernel_standard (x, x, 236);
+ 
+@@ -38,7 +39,8 @@ weak_alias (__j1l, j1l)
+ long double
+ __y1l (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
+      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0L)
+ 	{
+diff --git a/math/w_jn.c b/math/w_jn.c
+index f0dd8c6..fd3fb16 100644
+--- a/math/w_jn.c
+++ b/math/w_jn.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,8 @@
+ double
+ jn (int n, double x)
+ {
+-  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
+      && _LIB_VERSION != _IEEE_)
+     /* jn(n,|x|>X_TLOSS) */
+     return __kernel_standard (n, x, 38);
+ 
+@@ -40,7 +41,8 @@ strong_alias (jn, jnl)
+ double
+ yn (int n, double x)
+ {
+-  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
+      && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0)
+ 	{
+diff --git a/math/w_jnf.c b/math/w_jnf.c
+index ef29eb4..36d6f6d 100644
+--- a/math/w_jnf.c
+++ b/math/w_jnf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ jnf (int n, float x)
+ {
+-  if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0)
+  if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     /* jn(n,|x|>X_TLOSS) */
+     return __kernel_standard_f (n, x, 138);
+@@ -38,7 +38,8 @@ jnf (int n, float x)
+ float
+ ynf (int n, float x)
+ {
+-  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
+  if (__builtin_expect (islessequal (x, 0.0f)
+			|| isgreater (x, (float) X_TLOSS), 0)
+       && _LIB_VERSION != _IEEE_)
+     {
+       if (x < 0.0f)
+diff --git a/math/w_log.c b/math/w_log.c
+index efc1c4c..ec33605 100644
+--- a/math/w_log.c
+++ b/math/w_log.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ double
+ __log (double x)
+ {
+-  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0)
+ 	{
+diff --git a/math/w_log10.c b/math/w_log10.c
+index 2717ade..fe799ad 100644
+--- a/math/w_log10.c
+++ b/math/w_log10.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ double
+ __log10 (double x)
+ {
+-  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0)
+ 	{
+diff --git a/math/w_log10f.c b/math/w_log10f.c
+index 60737ca..4b821f7 100644
+--- a/math/w_log10f.c
+++ b/math/w_log10f.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ __log10f (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0f)
+ 	{
+diff --git a/math/w_log10l.c b/math/w_log10l.c
+index b26f18c..0e5a137 100644
+--- a/math/w_log10l.c
+++ b/math/w_log10l.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ long double
+ __log10l (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0L)
+ 	{
+diff --git a/math/w_log2.c b/math/w_log2.c
+index 998e5d9..e58e109 100644
+--- a/math/w_log2.c
+++ b/math/w_log2.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ double
+ __log2 (double x)
+ {
+-  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0)
+ 	{
+diff --git a/math/w_log2f.c b/math/w_log2f.c
+index 6d91bf4..6963ed2 100644
+--- a/math/w_log2f.c
+++ b/math/w_log2f.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ __log2f (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0)
+ 	{
+diff --git a/math/w_log2l.c b/math/w_log2l.c
+index e51c1bc..eed04ff6c 100644
+--- a/math/w_log2l.c
+++ b/math/w_log2l.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ long double
+ __log2l (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0L)
+ 	{
+diff --git a/math/w_logf.c b/math/w_logf.c
+index 8aa27c8..38d408f 100644
+--- a/math/w_logf.c
+++ b/math/w_logf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ float
+ __logf (float x)
+ {
+-  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0f)
+ 	{
+diff --git a/math/w_logl.c b/math/w_logl.c
+index a3139ff..593b37d 100644
+--- a/math/w_logl.c
+++ b/math/w_logl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -25,7 +25,7 @@
+ long double
+ __logl (long double x)
+ {
+-  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
+     {
+       if (x == 0.0L)
+ 	{
+diff --git a/math/w_sqrt.c b/math/w_sqrt.c
+index 409a6df..f6ba542 100644
+--- a/math/w_sqrt.c
+++ b/math/w_sqrt.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ double
+ __sqrt (double x)
+ {
+-  if (__builtin_expect (x < 0.0, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isless (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
+     return __kernel_standard (x, x, 26); /* sqrt(negative) */
+ 
+   return __ieee754_sqrt (x);
+diff --git a/math/w_sqrtf.c b/math/w_sqrtf.c
+index 3c3d2f8..c128e9b 100644
+--- a/math/w_sqrtf.c
+++ b/math/w_sqrtf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ float
+ __sqrtf (float x)
+ {
+-  if (__builtin_expect (x < 0.0f, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isless (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
+     return __kernel_standard_f (x, x, 126); /* sqrt(negative) */
+ 
+   return __ieee754_sqrtf (x);
+diff --git a/math/w_sqrtl.c b/math/w_sqrtl.c
+index 5e18f44..2a4a048 100644
+--- a/math/w_sqrtl.c
+++ b/math/w_sqrtl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -24,7 +24,7 @@
+ long double
+ __sqrtl (long double x)
+ {
+-  if (__builtin_expect (x < 0.0L, 0) && _LIB_VERSION != _IEEE_)
+  if (__builtin_expect (isless (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
+     return __kernel_standard (x, x, 226); /* sqrt(negative) */
+ 
+   return __ieee754_sqrtl (x);
+diff --git a/sysdeps/ieee754/dbl-64/e_atanh.c b/sysdeps/ieee754/dbl-64/e_atanh.c
+index 9fc21ab..5f471b1 100644
+--- a/sysdeps/ieee754/dbl-64/e_atanh.c
+++ b/sysdeps/ieee754/dbl-64/e_atanh.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -46,7 +46,7 @@ __ieee754_atanh (double x)
+ {
+   double xa = fabs (x);
+   double t;
+-  if (xa < 0.5)
+  if (isless (xa, 0.5))
+     {
+       if (__builtin_expect (xa < 0x1.0p-28, 0))
+ 	{
+@@ -57,11 +57,11 @@ __ieee754_atanh (double x)
+       t = xa + xa;
+       t = 0.5 * __log1p (t + t * xa / (1.0 - xa));
+     }
+-  else if (__builtin_expect (xa < 1.0, 1))
+  else if (__builtin_expect (isless (xa, 1.0), 1))
+     t = 0.5 * __log1p ((xa + xa) / (1.0 - xa));
+   else
+     {
+-      if (xa > 1.0)
+      if (isgreater (xa, 1.0))
+ 	return (x - x) / (x - x);
+ 
+       return x / 0.0;
+diff --git a/sysdeps/ieee754/dbl-64/w_exp.c b/sysdeps/ieee754/dbl-64/w_exp.c
+index ee42587..b584ed8 100644
+--- a/sysdeps/ieee754/dbl-64/w_exp.c
+++ b/sysdeps/ieee754/dbl-64/w_exp.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -28,12 +28,12 @@ u_threshold= -7.45133219101941108420e+02;  /* 0xc0874910, 0xD52D3051 */
+ double
+ __exp (double x)
+ {
+-  if (__builtin_expect (x > o_threshold, 0))
+  if (__builtin_expect (isgreater (x, o_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard_f (x, x, 6);
+     }
+-  else if (__builtin_expect (x < u_threshold, 0))
+  else if (__builtin_expect (isless (x, u_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard_f (x, x, 7);
+diff --git a/sysdeps/ieee754/flt-32/e_atanhf.c b/sysdeps/ieee754/flt-32/e_atanhf.c
+index 75ed691..7af2f6c 100644
+--- a/sysdeps/ieee754/flt-32/e_atanhf.c
+++ b/sysdeps/ieee754/flt-32/e_atanhf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -46,7 +46,7 @@ __ieee754_atanhf (float x)
+ {
+   float xa = fabsf (x);
+   float t;
+-  if (xa < 0.5f)
+  if (isless (xa, 0.5f))
+     {
+       if (__builtin_expect (xa < 0x1.0p-28f, 0))
+ 	{
+@@ -57,11 +57,11 @@ __ieee754_atanhf (float x)
+       t = xa + xa;
+       t = 0.5f * __log1pf (t + t * xa / (1.0f - xa));
+     }
+-  else if (__builtin_expect (xa < 1.0f, 1))
+  else if (__builtin_expect (isless (xa, 1.0f), 1))
+     t = 0.5f * __log1pf ((xa + xa) / (1.0f - xa));
+   else
+     {
+-      if (xa > 1.0f)
+      if (isgreater (xa, 1.0f))
+ 	return (x - x) / (x - x);
+ 
+       return x / 0.0f;
+diff --git a/sysdeps/ieee754/flt-32/w_expf.c b/sysdeps/ieee754/flt-32/w_expf.c
+index 5500872..bc3b2f6 100644
+--- a/sysdeps/ieee754/flt-32/w_expf.c
+++ b/sysdeps/ieee754/flt-32/w_expf.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -28,12 +28,12 @@ u_threshold= -1.0397208405e+02;  /* 0xc2cff1b5 */
+ float
+ __expf (float x)
+ {
+-  if (__builtin_expect (x > o_threshold, 0))
+  if (__builtin_expect (isgreater (x, o_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard_f (x, x, 106);
+     }
+-  else if (__builtin_expect (x < u_threshold, 0))
+  else if (__builtin_expect (isless (x, u_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard_f (x, x, 107);
+diff --git a/sysdeps/ieee754/ldbl-96/w_expl.c b/sysdeps/ieee754/ldbl-96/w_expl.c
+index ec9d8a7..d61c0a3 100644
+--- a/sysdeps/ieee754/ldbl-96/w_expl.c
+++ b/sysdeps/ieee754/ldbl-96/w_expl.c
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
+ 
+@@ -30,12 +30,12 @@ u_threshold= -1.140019167866942050398521670162263001513e4;
+ long double
+ __expl (long double x)
+ {
+-  if (__builtin_expect (x > o_threshold, 0))
+  if (__builtin_expect (isgreater (x, o_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard (x, x, 206);
+     }
+-  else if (__builtin_expect (x < u_threshold, 0))
+  else if (__builtin_expect (isless (x, u_threshold), 0))
+     {
+       if (_LIB_VERSION != _IEEE_)
+ 	return __kernel_standard (x, x, 207);
--- a/core/glibc/glibc-2.15-revert-netlink-cache.patch
+++ b/core/glibc/glibc-2.15-revert-netlink-cache.patch
@ -1,20 +1,3 @@
-From 2a3a38c03b6e376a9bc8a1937641e5dee979bcbf Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Sat, 4 Feb 2012 15:28:54 +1000
-Subject: [PATCH] revert stuff
-
---
- include/ifaddrs.h                  |    5 -
- inet/check_pf.c                    |   18 +----
- nscd/connections.c                 |  119 ------------------------
- nscd/nscd-client.h                 |   18 +----
- nscd/nscd_gethst_r.c               |   23 +-----
- nscd/nscd_helper.c                 |   10 +-
- sysdeps/posix/getaddrinfo.c        |   10 +-
- sysdeps/unix/sysv/linux/Makefile   |    2 +-
- sysdeps/unix/sysv/linux/check_pf.c |  176 +++++++-----------------------------
- 9 files changed, 46 insertions(+), 335 deletions(-)
-
 diff --git a/include/ifaddrs.h b/include/ifaddrs.h
 index e1c6cac..50e4c48 100644
 --- a/include/ifaddrs.h
@ -695,6 +678,3 @@ index 0738a70..d5ad7ea 100644
 -	}
 -    }
 -}
-- 
-1.7.9
-
--- a/core/glibc/glibc-2.15-rintf-rounding.patch
+++ b/core/glibc/glibc-2.15-rintf-rounding.patch
@ -0,0 +1,158 @@
+diff --git a/math/libm-test.inc b/math/libm-test.inc
+index 6243e1e..c8186c8 100644
+--- a/math/libm-test.inc
+++ b/math/libm-test.inc
+@@ -5037,6 +5037,22 @@ rint_test (void)
+   TEST_f_f (rint, 262142.75, 262143.0);
+   TEST_f_f (rint, 524286.75, 524287.0);
+   TEST_f_f (rint, 524288.75, 524289.0);
+  TEST_f_f (rint, 1048576.75, 1048577.0);
+  TEST_f_f (rint, 2097152.75, 2097153.0);
+  TEST_f_f (rint, -1048576.75, -1048577.0);
+  TEST_f_f (rint, -2097152.75, -2097153.0);
+#ifndef TEST_FLOAT
+  TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
+  TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
+  TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
+  TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
+  TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
+  TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
+  TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
+  TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
+  TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
+  TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
+#endif
+ #ifdef TEST_LDOUBLE
+   /* The result can only be represented in long double.  */
+   TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
+@@ -5137,6 +5153,22 @@ rint_test_tonearest (void)
+       TEST_f_f (rint, -0.1, -0.0);
+       TEST_f_f (rint, -0.25, -0.0);
+       TEST_f_f (rint, -0.625, -1.0);
+      TEST_f_f (rint, 1048576.75, 1048577.0);
+      TEST_f_f (rint, 2097152.75, 2097153.0);
+      TEST_f_f (rint, -1048576.75, -1048577.0);
+      TEST_f_f (rint, -2097152.75, -2097153.0);
+#ifndef TEST_FLOAT
+      TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
+      TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
+      TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
+      TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
+      TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
+      TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
+      TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
+      TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
+      TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
+      TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
+#endif
+ #ifdef TEST_LDOUBLE
+       /* The result can only be represented in long double.  */
+       TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
+@@ -5207,6 +5239,22 @@ rint_test_towardzero (void)
+       TEST_f_f (rint, -0.1, -0.0);
+       TEST_f_f (rint, -0.25, -0.0);
+       TEST_f_f (rint, -0.625, -0.0);
+      TEST_f_f (rint, 1048576.75, 1048576.0);
+      TEST_f_f (rint, 2097152.75, 2097152.0);
+      TEST_f_f (rint, -1048576.75, -1048576.0);
+      TEST_f_f (rint, -2097152.75, -2097152.0);
+#ifndef TEST_FLOAT
+      TEST_f_f (rint, 70368744177664.75, 70368744177664.0);
+      TEST_f_f (rint, 140737488355328.75, 140737488355328.0);
+      TEST_f_f (rint, 281474976710656.75, 281474976710656.0);
+      TEST_f_f (rint, 562949953421312.75, 562949953421312.0);
+      TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0);
+      TEST_f_f (rint, -70368744177664.75, -70368744177664.0);
+      TEST_f_f (rint, -140737488355328.75, -140737488355328.0);
+      TEST_f_f (rint, -281474976710656.75, -281474976710656.0);
+      TEST_f_f (rint, -562949953421312.75, -562949953421312.0);
+      TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0);
+#endif
+ #ifdef TEST_LDOUBLE
+       /* The result can only be represented in long double.  */
+       TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L);
+@@ -5277,6 +5325,22 @@ rint_test_downward (void)
+       TEST_f_f (rint, -0.1, -1.0);
+       TEST_f_f (rint, -0.25, -1.0);
+       TEST_f_f (rint, -0.625, -1.0);
+      TEST_f_f (rint, 1048576.75, 1048576.0);
+      TEST_f_f (rint, 2097152.75, 2097152.0);
+      TEST_f_f (rint, -1048576.75, -1048577.0);
+      TEST_f_f (rint, -2097152.75, -2097153.0);
+#ifndef TEST_FLOAT
+      TEST_f_f (rint, 70368744177664.75, 70368744177664.0);
+      TEST_f_f (rint, 140737488355328.75, 140737488355328.0);
+      TEST_f_f (rint, 281474976710656.75, 281474976710656.0);
+      TEST_f_f (rint, 562949953421312.75, 562949953421312.0);
+      TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0);
+      TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
+      TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
+      TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
+      TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
+      TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
+#endif
+ #ifdef TEST_LDOUBLE
+       /* The result can only be represented in long double.  */
+       TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L);
+@@ -5347,6 +5411,22 @@ rint_test_upward (void)
+       TEST_f_f (rint, -0.1, -0.0);
+       TEST_f_f (rint, -0.25, -0.0);
+       TEST_f_f (rint, -0.625, -0.0);
+      TEST_f_f (rint, 1048576.75, 1048577.0);
+      TEST_f_f (rint, 2097152.75, 2097153.0);
+      TEST_f_f (rint, -1048576.75, -1048576.0);
+      TEST_f_f (rint, -2097152.75, -2097152.0);
+#ifndef TEST_FLOAT
+      TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
+      TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
+      TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
+      TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
+      TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
+      TEST_f_f (rint, -70368744177664.75, -70368744177664.0);
+      TEST_f_f (rint, -140737488355328.75, -140737488355328.0);
+      TEST_f_f (rint, -281474976710656.75, -281474976710656.0);
+      TEST_f_f (rint, -562949953421312.75, -562949953421312.0);
+      TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0);
+#endif
+ #ifdef TEST_LDOUBLE
+       /* The result can only be represented in long double.  */
+       TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
+diff --git a/sysdeps/ieee754/flt-32/s_rintf.c b/sysdeps/ieee754/flt-32/s_rintf.c
+index 9ea9b6f..9ba6b57 100644
+--- a/sysdeps/ieee754/flt-32/s_rintf.c
+++ b/sysdeps/ieee754/flt-32/s_rintf.c
+@@ -26,34 +26,22 @@ float
+ __rintf(float x)
+ {
+ 	int32_t i0,j0,sx;
+-	u_int32_t i,i1;
+ 	float w,t;
+ 	GET_FLOAT_WORD(i0,x);
+ 	sx = (i0>>31)&1;
+ 	j0 = ((i0>>23)&0xff)-0x7f;
+ 	if(j0<23) {
+ 	    if(j0<0) {
+-		if((i0&0x7fffffff)==0) return x;
+-		i1 = (i0&0x07fffff);
+-		i0 &= 0xfff00000;
+-		i0 |= ((i1|-i1)>>9)&0x400000;
+-		SET_FLOAT_WORD(x,i0);
+ 		w = TWO23[sx]+x;
+ 		t =  w-TWO23[sx];
+ 		GET_FLOAT_WORD(i0,t);
+ 		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
+ 		return t;
+-	    } else {
+-		i = (0x007fffff)>>j0;
+-		if((i0&i)==0) return x; /* x is integral */
+-		i>>=1;
+-		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
+ 	    }
+ 	} else {
+ 	    if(j0==0x80) return x+x;	/* inf or NaN */
+ 	    else return x;		/* x is integral */
+ 	}
+-	SET_FLOAT_WORD(x,i0);
+ 	w = TWO23[sx]+x;
+ 	return w-TWO23[sx];
+ }
--- a/core/glibc/glibc-2.15-scanf.patch
+++ b/core/glibc/glibc-2.15-scanf.patch
@ -1,13 +1,3 @@
-From 20b38e0301279a37a3f1e769843933bcc0d5f736 Mon Sep 17 00:00:00 2001
-From: Paul Pluzhnikov <ppluzhnikov@google.com>
-Date: Sun, 8 Jan 2012 20:13:35 -0500
-Subject: [PATCH 1/1] sscanf always calls realloc
-
---
- ChangeLog              |    5 +++++
- stdio-common/vfscanf.c |    4 ++--
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
 diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
 index 0e71deb..e18a6c3 100644
 --- a/stdio-common/vfscanf.c
@ -27,6 +17,3 @@ index 0e71deb..e18a6c3 100644
 	    {								    \
 	      wp = realloc (use_malloc ? wp : NULL, newsize);		    \
 	      if (wp == NULL)						    \
-- 
-1.7.3.4
-
--- a/core/glibc/glibc-2.15-strcasecmp-disable-avx.patch
+++ b/core/glibc/glibc-2.15-strcasecmp-disable-avx.patch
@ -0,0 +1,48 @@
+diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S
+index f93c83d..d8aa889 100644
+--- a/sysdeps/x86_64/multiarch/strcmp.S
+++ b/sysdeps/x86_64/multiarch/strcmp.S
+@@ -105,11 +105,6 @@ ENTRY(__strcasecmp)
+	jne	1f
+	call	__init_cpu_features
+ 1:
+-#  ifdef HAVE_AVX_SUPPORT
+-	leaq	__strcasecmp_avx(%rip), %rax
+-	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
+-	jnz	2f
+-#  endif
+	leaq	__strcasecmp_sse42(%rip), %rax
+	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
+	jnz	2f
+@@ -128,11 +123,6 @@ ENTRY(__strncasecmp)
+	jne	1f
+	call	__init_cpu_features
+ 1:
+-#  ifdef HAVE_AVX_SUPPORT
+-	leaq	__strncasecmp_avx(%rip), %rax
+-	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
+-	jnz	2f
+-#  endif
+	leaq	__strncasecmp_sse42(%rip), %rax
+	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
+	jnz	2f
+@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp)
+ # include "strcmp-sse42.S"
+
+
+-# ifdef HAVE_AVX_SUPPORT
+-#  if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L
+-#   define LABEL(l) .L##l##_avx
+-#   define GLABEL(l) l##_avx
+-#   define USE_AVX 1
+-#   undef STRCMP_SSE42
+-#   define STRCMP_SSE42 STRCMP_AVX
+-#   define SECTION avx
+-#   include "strcmp-sse42.S"
+-#  endif
+-# endif
+-
+-
+ # undef ENTRY
+ # define ENTRY(name) \
+	.type STRCMP_SSE2, @function; \
--- a/core/glibc/glibc-2.15-vdso.patch
+++ b/core/glibc/glibc-2.15-vdso.patch
@ -0,0 +1,40 @@
+diff --git a/elf/Makefile b/elf/Makefile
+index 8234ba7..25ffc57 100644
+--- a/elf/Makefile
+++ b/elf/Makefile
+@@ -1203,3 +1203,14 @@ $(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so
+ $(objpfx)tst-relsort1mod2.so: $(libm)
+ $(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \
+ 			   $(objpfx)tst-relsort1mod2.so
+
+tests: $(objpfx)tst-unused-dep.out
+
+$(objpfx)tst-unused-dep.out: $(objpfx)testobj1.so
+	LD_TRACE_LOADED_OBJECTS=1 \
+	LD_DEBUG=unused \
+	LD_PRELOAD= \
+	$(elf-objpfx)${rtld-installed-name} \
+	  --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \
+	  $< > $@
+	cmp $@ /dev/null > /dev/null
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 2e4f97f..3e15447 100644
+--- a/elf/rtld.c
+++ b/elf/rtld.c
+@@ -1,5 +1,5 @@
+ /* Run time dynamic linker.
+-   Copyright (C) 1995-2010, 2011 Free Software Foundation, Inc.
+   Copyright (C) 1995-2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -1375,6 +1375,9 @@ of this helper program; chances are you did not intend to run this program.\n\
+ 	  _dl_setup_hash (l);
+ 	  l->l_relocated = 1;
+ 
+	  /* The vDSO is always used.  */
+	  l->l_used = 1;
+
+ 	  /* Initialize l_local_scope to contain just this map.  This allows
+ 	     the use of dl_lookup_symbol_x to resolve symbols within the vdso.
+ 	     So we create a single entry list pointing to l_real as its only
--- a/core/glibc/glibc-2.15-vfprintf-nargs.patch
+++ b/core/glibc/glibc-2.15-vfprintf-nargs.patch
@ -0,0 +1,174 @@
+diff --git a/stdio-common/Makefile b/stdio-common/Makefile
+index a847b28..080badc 100644
+--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
+@@ -59,7 +59,8 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
+ 	 tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
+ 	 tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
+ 	 bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug20 bug21 bug22 \
+-	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24
+	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24 \
+	 bug-vfprintf-nargs
+ 
+ test-srcs = tst-unbputc tst-printf
+ 
+diff --git a/stdio-common/bug-vfprintf-nargs.c b/stdio-common/bug-vfprintf-nargs.c
+new file mode 100644
+index 0000000..13c66c0
+--- /dev/null
+++ b/stdio-common/bug-vfprintf-nargs.c
+@@ -0,0 +1,78 @@
+/* Test for vfprintf nargs allocation overflow (BZ #13656).
+   Copyright (C) 2012 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Kees Cook <keescook@chromium.org>, 2012.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <unistd.h>
+#include <inttypes.h>
+#include <string.h>
+#include <signal.h>
+
+static int
+format_failed (const char *fmt, const char *expected)
+{
+  char output[80];
+
+  printf ("%s : ", fmt);
+
+  memset (output, 0, sizeof output);
+  /* Having sprintf itself detect a failure is good.  */
+  if (sprintf (output, fmt, 1, 2, 3, "test") > 0
+      && strcmp (output, expected) != 0)
+    {
+      printf ("FAIL (output '%s' != expected '%s')\n", output, expected);
+      return 1;
+    }
+  puts ("ok");
+  return 0;
+}
+
+static int
+do_test (void)
+{
+  int rc = 0;
+  char buf[64];
+
+  /* Regular positionals work.  */
+  if (format_failed ("%1$d", "1") != 0)
+    rc = 1;
+
+  /* Regular width positionals work.  */
+  if (format_failed ("%1$*2$d", " 1") != 0)
+    rc = 1;
+
+  /* Positional arguments are constructed via read_int, so nargs can only
+     overflow on 32-bit systems.  On 64-bit systems, it will attempt to
+     allocate a giant amount of memory and possibly crash, which is the
+     expected situation.  Since the 64-bit behavior is arch-specific, only
+     test this on 32-bit systems.  */
+  if (sizeof (long int) == 4)
+    {
+      sprintf (buf, "%%1$d %%%" PRIdPTR "$d", UINT32_MAX / sizeof (int));
+      if (format_failed (buf, "1 %$d") != 0)
+        rc = 1;
+    }
+
+  return rc;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
+diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
+index 863cd5d..022e72b 100644
+--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
+@@ -235,6 +235,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
+      0 if unknown.  */
+   int readonly_format = 0;
+ 
+  /* For the argument descriptions, which may be allocated on the heap.  */
+  void *args_malloced = NULL;
+
+   /* This table maps a character into a number representing a
+      class.  In each step there is a destination label for each
+      class.  */
+@@ -1647,9 +1650,10 @@ do_positional:
+        determine the size of the array needed to store the argument
+        attributes.  */
+     size_t nargs = 0;
+-    int *args_type;
+-    union printf_arg *args_value = NULL;
+    size_t bytes_per_arg;
+    union printf_arg *args_value;
+     int *args_size;
+    int *args_type;
+ 
+     /* Positional parameters refer to arguments directly.  This could
+        also determine the maximum number of arguments.  Track the
+@@ -1698,13 +1702,33 @@ do_positional:
+ 
+     /* Determine the number of arguments the format string consumes.  */
+     nargs = MAX (nargs, max_ref_arg);
+    bytes_per_arg = sizeof (*args_value) + sizeof (*args_size)
+                    + sizeof (*args_type);
+
+    /* Check for potential integer overflow.  */
+    if (nargs > SIZE_MAX / bytes_per_arg)
+      {
+         done = -1;
+         goto all_done;
+      }
+ 
+     /* Allocate memory for the argument descriptions.  */
+-    args_type = alloca (nargs * sizeof (int));
+    if (__libc_use_alloca (nargs * bytes_per_arg))
+        args_value = alloca (nargs * bytes_per_arg);
+    else
+      {
+        args_value = args_malloced = malloc (nargs * bytes_per_arg);
+        if (args_value == NULL)
+          {
+            done = -1;
+            goto all_done;
+          }
+      }
+
+    args_size = &args_value[nargs].pa_int;
+    args_type = &args_size[nargs];
+     memset (args_type, s->_flags2 & _IO_FLAGS2_FORTIFY ? '\xff' : '\0',
+-	    nargs * sizeof (int));
+-    args_value = alloca (nargs * sizeof (union printf_arg));
+-    args_size = alloca (nargs * sizeof (int));
+	    nargs * sizeof (*args_type));
+ 
+     /* XXX Could do sanity check here: If any element in ARGS_TYPE is
+        still zero after this loop, format is invalid.  For now we
+@@ -1973,8 +1997,8 @@ do_positional:
+   }
+ 
+ all_done:
+-  if (__builtin_expect (workstart != NULL, 0))
+-    free (workstart);
+  free (args_malloced);
+  free (workstart);
+   /* Unlock the stream.  */
+   _IO_funlockfile (s);
+   _IO_cleanup_region_end (0);
--- a/core/kernel26-raspberrypi/PKGBUILD
+++ b/core/kernel26-raspberrypi/PKGBUILD
@ -1,101 +1,63 @@
 # Maintainer: Kevin Mihelich <kevin@archlinuxarm.org>

-# Rasberry Pi kernel and headers
-
+plugrel=1
 noautobuild=1
-plugrel=2

-pkgbase="kernel26-raspberrypi"
-pkgname=('kernel26-raspberrypi' 'kernel26-headers-raspberrypi')
-#_kernelname=${pkgname#kernel26}
-_kernelname=""
-_basekernel=2.6.35
-pkgver=${_basekernel}.7
-pkgrel=3
-makedepends=('xmlto' 'docbook-xsl' 'make' 'python2')
-arch=(arm)
+pkgbase="kernel26"
+pkgname=('kernel26-armada370' 'kernel26-headers-armada370')
+_kernelname=${pkgname#kernel26}
+_basekernel=2.6.35.9
+pkgver=${_basekernel}
+pkgrel=1
+makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'make')
+arch=('armv7h')
+CARCH=arm
 KARCH=arm
 license=('GPL2')
 url="http://www.kernel.org"
-source=('ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.35.7.tar.bz2'
-        'config'
-        'armdma.patch'
-        'args-uncompressed.txt'
-        'boot-uncompressed.txt'
-        'imagetool-uncompressed.py'
-        'rp-patches.tar.gz'
-        'sys_accept4.patch')
-md5sums=('f741879bcd3a5366a1bbe0ad5cdb7935'
-         'b5ef3218f0a0db43e0ad35f9eb0bce7e'
-         '6e7667c6c6348bfeca22eaaa05462d62'
-         '9335d1263fd426215db69841a380ea26'
-         'a00e424e2fbb8c5a5f77ba2c4871bed4'
-         '2f82dbe5752af65ff409d737caf11954'
-         '968a3a9468b90a8a50dae8cafb276760'
-         'fdbbc3c4f34d5959504f027bdc1e7a73')
+source=(linux-$pkgver.tar.bz2
+        config)

 build() {
-  cd "${srcdir}/linux-${pkgver}"
+  cd ${srcdir}/linux-$_basekernel

-  # Copy in the ethernet firmware, needed for make!
-  cp ${srcdir}/args-uncompressed.txt arch/arm/boot/
-  cp ${srcdir}/boot-uncompressed.txt arch/arm/boot/
-  cp ${srcdir}/imagetool-uncompressed.py arch/arm/boot/
-
-  # ALARM patches
-  patch -Np2 -i "${srcdir}/rp-patches/rpdh1.patch"
-  patch -Np1 -i "${srcdir}/rp-patches/smsc95xx.patch"
-  patch -Np1 -i "${srcdir}/armdma.patch"
-  patch -Np1 -i "${srcdir}/sys_accept4.patch"
-
-  cat "${srcdir}/config" > ./.config
+  cp ${srcdir}/config .config

  # set extraversion to pkgrel
  sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile

-  # Prepare sources
+  # get kernel version  
  make prepare
-  #make clean # sometimes git isn't clean
-  #make mrproper # same as above
+
  # Configure the kernel. Replace the line below with one of your choice.
  #make menuconfig # CLI menu for configuration
  #make nconfig # new CLI menu for configuration
  #make oldconfig # using old config from previous kernel version

-  # Copy back our configuration (use with new kernel version)
-  #cp ./.config ../${_basekernel}.config
-  
-  # Halt the build for configuration only
-  #return 1
-
  # Build!
-  make ${MAKEFLAGS} 
+
+  make ${MAKEFLAGS} uImage modules
 }

-package_kernel26-raspberrypi() {
-  pkgdesc="The Linux Kernel and modules - Raspberry Pi"
-  depends=('coreutils' 'module-init-tools>=3.12-2')
+package_kernel26-armada370() {
+  pkgdesc="The Linux Kernel and modules for Marvell Armada 370"
+  groups=('base')
+  depends=('coreutils' 'module-init-tools')
  replaces=('kernel24' 'kernel24-scsi' 'kernel26-scsi'
            'alsa-driver' 'ieee80211' 'hostap-driver26'
            'pwc' 'nforce' 'squashfs' 'unionfs' 'ivtv'
            'zd1211' 'kvm-modules' 'iwlwifi' 'rt2x00-cvs'
            'gspcav1' 'atl2' 'wlan-ng26' 'rt2500' 'nouveau-drm')
-  provides=('kernel26=2.6.35.7')
-  conflicts=('kernel26' 'kernel26-trimslice')
+  provides=("kernel26=${pkgver}")
  install=kernel26.install
-  optdepends=('crda: to set the correct wireless channels of your country')
-  
  KARCH=arm
-  cd "${srcdir}/linux-${pkgver}"
+
+  cd ${srcdir}/linux-$_basekernel
  # get kernel version
  _kernver="$(make kernelrelease)"
  mkdir -p ${pkgdir}/{lib/modules,lib/firmware,boot}
  make INSTALL_MOD_PATH=${pkgdir} modules_install
-#  cp System.map ${pkgdir}/boot/System.map26${_kernelname}
-  cd arch/$KARCH/boot/
-  /usr/bin/python2 imagetool-uncompressed.py
-  cd "${srcdir}/linux-${pkgver}"
-  cp arch/$KARCH/boot/kernel.img ${pkgdir}/boot/kernel.img
+  cp arch/$KARCH/boot/uImage ${pkgdir}/boot/uImage
  
  # set correct depmod command for install
  sed \
@ -105,22 +67,18 @@ package_kernel26-raspberrypi() {

  # remove build and source links
  rm -f ${pkgdir}/lib/modules/${_kernver}/{source,build}
-  # remove the firmware
-  rm -rf ${pkgdir}/lib/firmware
-  # gzip -9 all modules to save 100MB of space
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
 }

-package_kernel26-headers-raspberrypi() {
-  pkgdesc="Header files and scripts for building modules for kernel26 - Raspberry Pi"
-  provides=('kernel26-headers=2.6.35.7')
-  conflicts=('kernel26-headers' 'kernel26-headers-trimslice')
+package_kernel26-headers-armada370() {
+  pkgdesc="Header files and scripts for building modules for kernel26 for Marvell Armada 370"
+  provides=("kernel26-headers=${pkgver}")
  KARCH=arm
  
  mkdir -p ${pkgdir}/lib/modules/${_kernver}
  cd ${pkgdir}/lib/modules/${_kernver}
  ln -sf ../../../usr/src/linux-${_kernver} build
-  cd "${srcdir}/linux-${pkgver}"
+  
+  cd ${srcdir}/linux-$_basekernel
  install -D -m644 Makefile \
    ${pkgdir}/usr/src/linux-${_kernver}/Makefile
  install -D -m644 kernel/Makefile \
@ -129,19 +87,22 @@ package_kernel26-headers-raspberrypi() {
    ${pkgdir}/usr/src/linux-${_kernver}/.config
  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include

-  for i in acpi asm-generic config generated linux math-emu media net pcmcia scsi sound trace video xen; do
+  for i in acpi asm-generic config generated linux math-emu media net pcmcia scsi sound trace video; do
    cp -a include/$i ${pkgdir}/usr/src/linux-${_kernver}/include/
  done

  # copy arch includes for external modules
  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH
  cp -a arch/$KARCH/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
-  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-bcm2708
-  cp -a arch/$KARCH/mach-bcm2708/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-bcm2708/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-armada370
+  cp -a arch/$KARCH/mach-armada370/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-armada370
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/plat-armada
+  cp -a arch/$KARCH/plat-armada/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/plat-armada/

  # copy files necessary for later builds, like nvidia and vmware
  cp Module.symvers ${pkgdir}/usr/src/linux-${_kernver}
  cp -a scripts ${pkgdir}/usr/src/linux-${_kernver}
+
  # fix permissions on scripts dir
  chmod og-w -R ${pkgdir}/usr/src/linux-${_kernver}/scripts
  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions
@ -149,73 +110,64 @@ package_kernel26-headers-raspberrypi() {
  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/kernel

  cp arch/$KARCH/Makefile ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
-  if [ "$CARCH" = "i686" ]; then
-    cp arch/$KARCH/Makefile_32.cpu ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
-  fi
  cp arch/$KARCH/kernel/asm-offsets.s ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/kernel/

  # add headers for lirc package
  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video
  cp drivers/media/video/*.h  ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/
-  for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do
+  for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102 usbvideo; do
   mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/$i
   cp -a drivers/media/video/$i/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/$i
  done
-#  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/staging/usbvideo/
-#  cp -a drivers/staging/usbvideo/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/staging/usbvideo/
+
  # add docbook makefile
  install -D -m644 Documentation/DocBook/Makefile \
    ${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile
+
  # add dm headers
  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/md
  cp drivers/md/*.h  ${pkgdir}/usr/src/linux-${_kernver}/drivers/md
+
  # add inotify.h
  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include/linux
  cp include/linux/inotify.h ${pkgdir}/usr/src/linux-${_kernver}/include/linux/
+
  # add wireless headers
  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/
  cp net/mac80211/*.h ${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/
+
  # add dvb headers for external modules
-  # in reference to:
-  # http://bugs.archlinux.org/task/9912
  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core
  cp drivers/media/dvb/dvb-core/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/
+
  # add dvb headers for external modules
-  # in reference to:
-  # http://bugs.archlinux.org/task/11194
-  #mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/
-  #cp include/config/dvb/*.h ${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/
+  cp include/config/dvb/*.h ${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/
+
  # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
-  # in reference to:
-  # http://bugs.archlinux.org/task/13146
  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/
  cp drivers/media/dvb/frontends/lgdt330x.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/
  cp drivers/media/video/msp3400-driver.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/
+
  # add dvb headers  
-  # in reference to:
-  # http://bugs.archlinux.org/task/20402
  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb
  cp drivers/media/dvb/dvb-usb/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/
  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends
  cp drivers/media/dvb/frontends/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/
  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners
  cp drivers/media/common/tuners/*.h ${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/
+  
  # add xfs and shmem for aufs building
  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs
  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/mm
  cp fs/xfs/xfs_sb.h ${pkgdir}/usr/src/linux-${_kernver}/fs/xfs/xfs_sb.h
+
  # add headers vor virtualbox
-  # in reference to:
-  # http://bugs.archlinux.org/task/14568
  cp -a include/drm $pkgdir/usr/src/linux-${_kernver}/include/
+
  # add headers for broadcom wl
-  # in reference to:
-  # http://bugs.archlinux.org/task/14568
  cp -a include/trace $pkgdir/usr/src/linux-${_kernver}/include/
-  # add headers for crypto modules
-  # in reference to:
-  # http://bugs.archlinux.org/task/22081
-  cp -a include/crypto $pkgdir/usr/src/linux-${_kernver}/include/
+
  # copy in Kconfig files
  for i in `find . -name "Kconfig*"`; do 
    mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/`echo $i | sed 's|/Kconfig.*||'`
@ -224,17 +176,9 @@ package_kernel26-headers-raspberrypi() {

  chown -R root.root ${pkgdir}/usr/src/linux-${_kernver}
  find ${pkgdir}/usr/src/linux-${_kernver} -type d -exec chmod 755 {} \;
-  # strip scripts directory
-  find ${pkgdir}/usr/src/linux-${_kernver}/scripts  -type f -perm -u+w 2>/dev/null | while read binary ; do
-  case "$(file -bi "$binary")" in
-    *application/x-sharedlib*) # Libraries (.so)
-    /usr/bin/strip $STRIP_SHARED "$binary";;
-    *application/x-archive*) # Libraries (.a)
-    /usr/bin/strip $STRIP_STATIC "$binary";;
-    *application/x-executable*) # Binaries
-    /usr/bin/strip $STRIP_BINARIES "$binary";;
-    esac 
-  done 
+
  # remove unneeded architectures
  rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa,x86}
 }
+md5sums=('5ab59208c1258e830ac756c468ebf7e4'
+         'da5e8c6dd56392b6582e533bad7e6b20')
--- a/core/kernel26-armada370/config
+++ b/core/kernel26-armada370/config
--- a/core/kernel26-armada370/kernel26.install
+++ b/core/kernel26-armada370/kernel26.install
@ -0,0 +1,15 @@
+post_install() {
+echo "This package is for Marvell Armada 370."
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+  KERNEL_VERSION=2.6.35.9
+}
+
+op=$1
+shift
+$op $*
--- a/core/kernel26-raspberrypi/kernel26.install
+++ b/core/kernel26-raspberrypi/kernel26.install
@ -1,20 +0,0 @@
-KERNEL_NAME=
-KERNEL_VERSION=2.6.35-2
-
-post_install() {
-# ARM doesn't use mkinitcpio or anything like that
-# so we skip it here
-echo -e "\033[1mNotice\033[0m"
-echo ""
-echo "This package is built for the Raspberry Pi."
-echo ""
-/sbin/depmod ${KERNEL_VERSION}
-}
-
-post_upgrade() {
-	post_install
-}
-
-op=$1
-shift
-$op $*
--- a/core/kernel26-raspberrypi/kernel26.preset
+++ b/core/kernel26-raspberrypi/kernel26.preset
@ -1,17 +0,0 @@
-# mkinitcpio preset file for kernel26
-
-########################################
-# DO NOT EDIT THIS LINE:
-source /etc/mkinitcpio.d/kernel26.kver
-########################################
-ALL_config="/etc/mkinitcpio.conf"
-
-PRESETS=('default' 'fallback')
-
-#default_config="/etc/mkinitcpio.conf"
-default_image="/boot/kernel26.img"
-#default_options=""
-
-#fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/kernel26-fallback.img" 
-fallback_options="-S autodetect"
--- a/core/kernel26-raspberrypi/rp-patches.tar.gz
+++ b/core/kernel26-raspberrypi/rp-patches.tar.gz
--- a/core/kernel26-raspberrypi/sys_accept4.patch
+++ b/core/kernel26-raspberrypi/sys_accept4.patch
@ -1,22 +0,0 @@
-diff -rupN linux-2.6.35/arch/arm/include/asm/unistd.h linux-2.6.35.arm-sys_accept4/arch/arm/include/asm/unistd.h
--- linux-2.6.35/arch/arm/include/asm/unistd.h	2010-05-17 19:51:29.000000000 +0200
-+++ linux-2.6.35.arm-sys_accept4/arch/arm/include/asm/unistd.h	2010-08-03 14:34:35.000000000 +0200
-@@ -392,6 +392,7 @@
- #define __NR_rt_tgsigqueueinfo		(__NR_SYSCALL_BASE+363)
- #define __NR_perf_event_open		(__NR_SYSCALL_BASE+364)
- #define __NR_recvmmsg			(__NR_SYSCALL_BASE+365)
-+#define __NR_accept4			(__NR_SYSCALL_BASE+366)
-
- /*
-  * The following SWIs are ARM private.
-diff -rupN linux-2.6.35/arch/arm/kernel/calls.S linux-2.6.35.arm-sys_accept4/arch/arm/kernel/calls.S
--- linux-2.6.35/arch/arm/kernel/calls.S	2010-05-17 19:51:29.000000000 +0200
-+++ linux-2.6.35.arm-sys_accept4/arch/arm/kernel/calls.S	2010-08-03 14:34:35.000000000 +0200
-@@ -375,6 +375,7 @@
- 		CALL(sys_rt_tgsigqueueinfo)
- 		CALL(sys_perf_event_open)
- /* 365 */	CALL(sys_recvmmsg)
-+		CALL(sys_accept4)
- #ifndef syscalls_counted
- .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls
- #define syscalls_counted
--- a/core/linux-raspberrypi/PKGBUILD
+++ b/core/linux-raspberrypi/PKGBUILD
@ -0,0 +1,262 @@
+# Maintainer: Dave ... <pepdog?@?>
+
+noautobuild=1
+plugrel=6
+
+pkgbase=linux
+pkgname=('linux-raspberrypi' 'linux-headers-raspberrypi')
+# pkgname=linux-custom       # Build kernel with a different name
+_kernelname=${pkgname#linux}
+_basekernel=3.1
+pkgver=${_basekernel}.9
+pkgrel=7
+arch=('arm')
+url="http://www.kernel.org/"
+license=('GPL2')
+makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'git' 'python2')
+options=('!strip')
+source=('config'
+        'change-default-console-loglevel.patch'
+        'usb-add-reset-resume-quirk-for-several-webcams.patch'
+        'armdma.patch'
+        'args-uncompressed.txt'
+        'boot-uncompressed.txt'
+        'imagetool-uncompressed.py')
+md5sums=('079a2b49a56e997908b23381cb9b9b8a'
+         '9d3c56a4b999c8bfbd4018089a62f662'
+         'd00814b57448895e65fbbc800e8a58ba'
+         '6e7667c6c6348bfeca22eaaa05462d62'
+         '9335d1263fd426215db69841a380ea26'
+         'a00e424e2fbb8c5a5f77ba2c4871bed4'
+         '2f82dbe5752af65ff409d737caf11954')
+
+build() {
+  git clone --depth 1 https://github.com/raspberrypi/linux.git
+
+  cd "${srcdir}/linux"
+
+  # add upstream patch
+  #patch -p1 -i "${srcdir}/patch-${pkgver}"
+
+  # Add the USB_QUIRK_RESET_RESUME for several webcams
+  # FS#26528
+  patch -Np1 -i "${srcdir}/usb-add-reset-resume-quirk-for-several-webcams.patch"
+
+  # add latest fixes from stable queue, if needed
+  # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
+
+  # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
+  # remove this when a Kconfig knob is made available by upstream
+  # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
+  patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
+  cp ${srcdir}/args-uncompressed.txt arch/arm/boot/
+  cp ${srcdir}/boot-uncompressed.txt arch/arm/boot/
+  cp ${srcdir}/imagetool-uncompressed.py arch/arm/boot/
+
+  # ALARM: add dma_coherent_write_sync calls to USB EHCI driver"
+  patch -Np1 -i "${srcdir}/armdma.patch"
+
+  cat "${srcdir}/config" > ./.config
+
+  # set extraversion to pkgrel
+  sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile
+
+  # get kernel version
+  make prepare
+
+  # load configuration
+  # Configure the kernel. Replace the line below with one of your choice.
+  #make menuconfig # CLI menu for configuration
+  #make nconfig # new CLI menu for configuration
+  #make xconfig # X-based configuration
+  #make oldconfig # using old config from previous kernel version
+  # ... or manually edit .config
+
+  # Copy back our configuration (use with new kernel version)
+  #cp ./.config ../${pkgver}.config
+
+  ####################
+  # stop here
+  # this is useful to configure the kernel
+  #msg "Stopping build"
+  #return 1
+  ####################
+
+  #yes "" | make config
+
+  # build!
+  make ${MAKEFLAGS} modules uImage
+}
+
+package_linux-raspberrypi() {
+  pkgdesc="The Linux Kernel and modules for Raspberry Pi"
+  groups=('base')
+  depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'mkinitcpio>=0.7')
+  optdepends=('crda: to set the correct wireless channels of your country')
+  provides=('kernel26-raspberrypi' 'linux=${pkgver}')
+  conflicts=('kernel26' 'linux')
+  replaces=('kernel26')
+  backup=("etc/mkinitcpio.d/${pkgname}.preset")
+  install=${pkgname}.install
+
+  cd "${srcdir}/linux"
+
+  KARCH=arm
+
+  # get kernel version
+  _kernver="$(make kernelrelease)"
+
+  mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
+  make INSTALL_MOD_PATH="${pkgdir}" modules_install
+  cd arch/$KARCH/boot/
+  /usr/bin/python2 imagetool-uncompressed.py
+  cd "${srcdir}/linux"
+  cp arch/$KARCH/boot/kernel.img ${pkgdir}/boot/kernel.img
+  #cp arch/$KARCH/boot/uImage "${pkgdir}/boot/uImage"
+
+  # set correct depmod command for install
+  sed \
+    -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/g" \
+    -e  "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
+    -i "${startdir}/${pkgname}.install"
+
+  # remove build and source links
+  rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
+  # remove the firmware
+  rm -rf "${pkgdir}/lib/firmware"
+  # gzip -9 all modules to save 100MB of space
+  find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+  # make room for external modules
+  ln -s "../extramodules-${pkgver}-${_kernelname:-ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  # add real version for building modules and running depmod from post_install/upgrade
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${pkgver}-${_kernelname:-ARCH}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${pkgver}-${_kernelname:-ARCH}/version"
+}
+
+package_linux-headers-raspberrypi() {
+  pkgdesc="Header files and scripts for building modules for linux kernel for Raspberry Pi"
+  provides=('kernel26-headers' 'linux-headers=${pkgver}')
+  conflicts=('kernel26-headers')
+  replaces=('kernel26-headers')
+
+  mkdir -p "${pkgdir}/lib/modules/${_kernver}"
+
+  cd "${pkgdir}/lib/modules/${_kernver}"
+  ln -sf ../../../usr/src/linux-${_kernver} build
+
+  cd "${srcdir}/linux"
+  install -D -m644 Makefile \
+    "${pkgdir}/usr/src/linux-${_kernver}/Makefile"
+  install -D -m644 kernel/Makefile \
+    "${pkgdir}/usr/src/linux-${_kernver}/kernel/Makefile"
+  install -D -m644 .config \
+    "${pkgdir}/usr/src/linux-${_kernver}/.config"
+
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include"
+
+  for i in acpi asm-generic config crypto drm generated linux math-emu \
+    media net pcmcia scsi sound trace video xen; do
+    cp -a include/${i} "${pkgdir}/usr/src/linux-${_kernver}/include/"
+  done
+
+   # copy arch includes for external modules
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH
+  cp -a arch/$KARCH/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/
+  mkdir -p ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-kirkwood   
+  cp -a arch/$KARCH/mach-kirkwood/include ${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/mach-kirkwood/
+
+  # copy files necessary for later builds, like nvidia and vmware
+  cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}"
+  cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}"
+
+  # fix permissions on scripts dir
+  chmod og-w -R "${pkgdir}/usr/src/linux-${_kernver}/scripts"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/.tmp_versions"
+
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel"
+
+  cp arch/${KARCH}/Makefile "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+
+  if [ "${CARCH}" = "i686" ]; then
+    cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/"
+  fi
+
+  cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/kernel/"
+
+  # add headers for lirc package
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video"
+
+  cp drivers/media/video/*.h  "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/"
+
+  for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 sn9c102; do
+    mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
+    cp -a drivers/media/video/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/video/${i}"
+  done
+
+  # add docbook makefile
+  install -D -m644 Documentation/DocBook/Makefile \
+    "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile"
+
+  # add dm headers
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
+  cp drivers/md/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/md"
+
+  # add inotify.h
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/linux"
+  cp include/linux/inotify.h "${pkgdir}/usr/src/linux-${_kernver}/include/linux/"
+
+  # add wireless headers
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
+  cp net/mac80211/*.h "${pkgdir}/usr/src/linux-${_kernver}/net/mac80211/"
+
+  # add dvb headers for external modules
+  # in reference to:
+  # http://bugs.archlinux.org/task/9912
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core"
+  cp drivers/media/dvb/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-core/"
+  # and...
+  # http://bugs.archlinux.org/task/11194
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
+  cp include/config/dvb/*.h "${pkgdir}/usr/src/linux-${_kernver}/include/config/dvb/"
+
+  # add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+  # in reference to:
+  # http://bugs.archlinux.org/task/13146
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
+  cp drivers/media/dvb/frontends/lgdt330x.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
+  cp drivers/media/video/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
+
+  # add dvb headers
+  # in reference to:
+  # http://bugs.archlinux.org/task/20402
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb"
+  cp drivers/media/dvb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/dvb-usb/"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends"
+  cp drivers/media/dvb/frontends/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/dvb/frontends/"
+  mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners"
+  cp drivers/media/common/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/common/tuners/"
+
+  # copy in Kconfig files
+  for i in `find . -name "Kconfig*"`; do
+    mkdir -p "${pkgdir}"/usr/src/linux-${_kernver}/`echo ${i} | sed 's|/Kconfig.*||'`
+    cp ${i} "${pkgdir}/usr/src/linux-${_kernver}/${i}"
+  done
+
+  chown -R root.root "${pkgdir}/usr/src/linux-${_kernver}"
+  find "${pkgdir}/usr/src/linux-${_kernver}" -type d -exec chmod 755 {} \;
+
+  # strip scripts directory
+  find "${pkgdir}/usr/src/linux-${_kernver}/scripts" -type f -perm -u+w 2>/dev/null | while read binary ; do
+    case "$(file -bi "${binary}")" in
+      *application/x-sharedlib*) # Libraries (.so)
+        /usr/bin/strip ${STRIP_SHARED} "${binary}";;
+      *application/x-archive*) # Libraries (.a)
+        /usr/bin/strip ${STRIP_STATIC} "${binary}";;
+      *application/x-executable*) # Binaries
+        /usr/bin/strip ${STRIP_BINARIES} "${binary}";;
+    esac
+  done
+
+  # remove unneeded architectures
+  rm -rf "${pkgdir}"/usr/src/linux-${_kernver}/arch/{alpha,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,x86,xtensa}
+}
--- a/core/kernel26-raspberrypi/args-uncompressed.txt
+++ b/core/kernel26-raspberrypi/args-uncompressed.txt
--- a/Show more
+++ b/Show more