diff options
59 files changed, 1803 insertions, 485 deletions
diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD index d5f5589f0..85d8c6f48 100644 --- a/community/gendesk/PKGBUILD +++ b/community/gendesk/PKGBUILD @@ -1,41 +1,34 @@ -# $Id: PKGBUILD 68578 2012-03-28 14:04:58Z arodseth $ +# $Id: PKGBUILD 68610 2012-03-29 14:55:20Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Thanks to Moonprincessluna at DeviantArt for the default icon: # http://mylittlepixel.deviantart.com/gallery/35405924#/d4pt23a pkgname=gendesk -pkgver=0.2 +pkgver=0.3 pkgrel=1 pkgdesc="Utility to generate .desktop files and download icons" arch=('x86_64' 'i686') url="http://roboticoverlords.org/gendesk/" license=('MIT') depends=('glibc') -makedepends=('go') +makedepends=('go>=2:1-2') conflicts=('go-hg') source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.gz" "http://roboticoverlords.org/images/default.png") -sha256sums=('51de3dd28ac38da82ca1db1428aad44348bc2edc491931ed0146044e781ca2e8' +sha256sums=('a8d7ba4eacb01351f220ee93f5b72d3e58848f1de6b578d6b1d579e328a2aa37' '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837') -options=(!strip) -if [ "$CARCH" = "x86_64" ]; then - _go=6 -else - _go=8 -fi build() { cd "$srcdir/$pkgname-$pkgver" msg2 "Compiling..." - "${_go}g" "$pkgname.go" - "${_go}l" -o "$pkgname" "$pkgname.$_go" + go build } package() { cd "$srcdir/$pkgname-$pkgver" - install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" + install -Dm755 "$pkgname-$pkgver" "$pkgdir/usr/bin/$pkgname" install -Dm644 "$srcdir/default.png" "$pkgdir/usr/share/pixmaps/default.png" install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 9294711b8..03bbc4b5a 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 68595 2012-03-29 03:48:22Z vegai $ +# $Id: PKGBUILD 68608 2012-03-29 13:28:45Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Andres Perera <andres87p gmail> # Contributor: Matthew Bauer <mjbauer95@gmail.com> # Contributor: Christian Himpel <chressie at gmail dot com> +# Contributor: Mike "str1ngs" Rosset pkgname=go pkgver=1 -pkgrel=1 +pkgrel=2 epoch=2 pkgdesc='Google Go compiler and tools (release version)' arch=('i686' 'x86_64') url="http://golang.org/" license=('custom') -depends=('perl' 'ed') +depends=('perl' 'ed' 'gawk') makedepends=('mercurial' 'inetutils') -options=('!strip') +options=('!strip' '!emptydirs') install=$pkgname.install source=($pkgname.sh) -md5sums=('67c472bfcfdb760d1d1f0a87cfe3661f') +md5sums=('e7087d190fd519db3be5adb3a51194cc') build() { _hgroot="https://go.googlecode.com/hg/" @@ -35,13 +36,13 @@ build() { fi msg "Mercurial checkout done or server timeout" - msg "Starting make..." rm -rf "$srcdir/$_hgrepo-build" cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build" cd "$srcdir/$_hgrepo-build" export GOROOT="$srcdir/$_hgrepo-build" + export GOOS_FINAL="/usr/lib/go" export GOOS=linux export GOBIN="$GOROOT/bin" export PATH="$GOBIN:$PATH" @@ -57,10 +58,14 @@ package() { install -Dm644 LICENSE $pkgdir/usr/share/licenses/go/LICENSE install -Dm644 misc/bash/go $pkgdir/etc/bash_completion.d/go - install -Dm644 misc/emacs/go-mode-load.el $pkgdir/usr/share/emacs/site-lisp/go-mode-load.el - install -Dm644 misc/emacs/go-mode.el $pkgdir/usr/share/emacs/site-lisp/go-mode.el - install -Dm644 misc/vim/ftdetect/gofiletype.vim $pkgdir/usr/share/vim/vimfiles/ftdetect/gofiletype.vim - install -Dm644 misc/vim/syntax/go.vim $pkgdir/usr/share/vim/vimfiles/syntax/go.vim + install -Dm644 misc/emacs/go-mode-load.el \ + $pkgdir/usr/share/emacs/site-lisp/go-mode-load.el + install -Dm644 misc/emacs/go-mode.el \ + $pkgdir/usr/share/emacs/site-lisp/go-mode.el + install -Dm644 misc/vim/ftdetect/gofiletype.vim \ + $pkgdir/usr/share/vim/vimfiles/ftdetect/gofiletype.vim + install -Dm644 misc/vim/syntax/go.vim \ + $pkgdir/usr/share/vim/vimfiles/syntax/go.vim mkdir -p $pkgdir/{etc/profile.d,usr/{share/go,lib/go,lib/go/src}} @@ -69,18 +74,23 @@ package() { ln -s /usr/share/go/doc $pkgdir/usr/lib/go/doc cp -r pkg $pkgdir/usr/lib/go cp -r $GOROOT/src/pkg $pkgdir/usr/lib/go/src/ + cp -r $GOROOT/src/cmd $pkgdir/usr/lib/go/src/cmd cp -r $GOROOT/src/lib9 $pkgdir/usr/lib/go/src/ cp -r $GOROOT/lib $pkgdir/usr/lib/go/ install -Dm644 src/Make.* $pkgdir/usr/lib/go/src - # remove object files from target src dir + # Remove object files from target src dir find $pkgdir/usr/lib/go/src/ -type f -name '*.[ao]' -delete find $pkgdir/usr/lib/go/src/pkg -type f -executable -delete # Headers for C modules - install -Dm644 src/pkg/runtime/runtime.h $pkgdir/usr/lib/go/src/pkg/runtime/runtime.h - install -Dm644 src/pkg/runtime/cgocall.h $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h + install -Dm644 src/pkg/runtime/runtime.h \ + $pkgdir/usr/lib/go/src/pkg/runtime/runtime.h + install -Dm644 src/pkg/runtime/cgocall.h \ + $pkgdir/usr/lib/go/src/pkg/runtime/cgocall.h install $srcdir/go.sh $pkgdir/etc/profile.d/ } + +# vim:set ts=2 sw=2 et: diff --git a/community/go/go.sh b/community/go/go.sh index 4aa526a11..8393dc8d2 100755 --- a/community/go/go.sh +++ b/community/go/go.sh @@ -1,3 +1 @@ export GOROOT=/usr/lib/go -export GOOS=linux -export GOBIN=/usr/bin diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index 2192356f2..37d697e12 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 63458 2012-02-04 10:12:39Z stativ $ +# $Id: PKGBUILD 68602 2012-03-29 08:23:57Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=11.0.2 -_pkgver=111.277 +pkgver=11.1 +_pkgver=117.105 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url="http://www.jetbrains.org/" license=('apache') depends=('glibc') source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('156fddbdeba44bb9427c05fe567f7070') +md5sums=('bb9943b052bcdb4832ea9b2f3f72848b') build() { cd "$srcdir" diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD index 55dff70e4..68fb8e2bd 100644 --- a/community/sxiv/PKGBUILD +++ b/community/sxiv/PKGBUILD @@ -1,24 +1,23 @@ -# Maintainer: BartÅ‚omiej Piotrowski <barthalion@gmail.com> +# Maintainer: BartÅ‚omiej Piotrowski <barthalion@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Bert Muennich <muennich at informatik.hu-berlin.de> # Contributor: Brad Fanella <bradfanella@archlinux.us> pkgname=sxiv pkgver=1.0 -pkgrel=2 +pkgrel=3 pkgdesc='simple x image viewer' arch=('i686' 'x86_64') license=('GPL2') install=sxiv.install url='https://github.com/muennich/sxiv' -depends=('libx11' 'xproto' 'imlib2' 'giflib' 'desktop-file-utils') +depends=('libx11' 'xproto' 'imlib2' 'giflib' 'libexif' 'desktop-file-utils') source=("https://github.com/downloads/muennich/sxiv/sxiv-${pkgver}.tar.gz" 'sxiv.desktop' 'config.h') md5sums=('c887e0af1e4d5a101b285a46d288c419' '1dda85ff6bed4de337f8fb303075ed11' - '67c470b605eae732aed4a8119a70832b') - + 'c3e6c4b86da6b17687699dbd32c7717b') build() { cd "sxiv-${pkgver}" diff --git a/community/sxiv/config.h b/community/sxiv/config.h index f84629cb4..cc95fd46a 100644 --- a/community/sxiv/config.h +++ b/community/sxiv/config.h @@ -3,7 +3,7 @@ /* auto-orientate jpeg files according to their exif tags? * (requires libexif [-lexif] to be installed) */ -#define EXIF_SUPPORT 0 +#define EXIF_SUPPORT 1 /* load all frames from gif files and support gif animations? * (requires giflib [-lgif] to be installed) */ diff --git a/community/sxiv/sxiv.install b/community/sxiv/sxiv.install index c50e26c78..f09c533f4 100644 --- a/community/sxiv/sxiv.install +++ b/community/sxiv/sxiv.install @@ -1,8 +1,8 @@ post_install () { update-desktop-database -q - echo "* Look into config.h to customize sxiv to your needs." - echo " Use 'makepkg --skipinteg' to rebuild the package after changing config.h." + echo "* Edit config.h in sxiv's PKGBUILD directory (generally /var/abs/community/sxiv/)" + echo " and rebuild package if you want to change settings." echo "* Create the directory ~/.sxiv/ to enable thumbnail caching." echo " See sxiv(1) for more information." } diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD index 3cc3378cc..bf8da587f 100644 --- a/core/dhcpcd/PKGBUILD +++ b/core/dhcpcd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 150154 2012-02-13 15:50:03Z ronald $ +# $Id: PKGBUILD 154510 2012-03-29 17:58:41Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd -pkgver=5.5.4 +pkgver=5.5.5 pkgrel=1 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/dhcpcd/" @@ -15,19 +15,16 @@ depends=('glibc' 'sh') backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ - 'dhcpcd.conf.d' '0001-Set-hostname-via-proc-if-file-is-available.patch' \ - '0001-set-MTU-via-sysfs-if-file-is-available.patch') -sha1sums=('8aa42abd28d49cce5b179998490c36f6c490e338' - 'b67b9ce6a2faaca75fea356966a16be2283b7db0' - 'ee85adac972a8172a9d9b3a1bdd46e0430301582' - 'afbed18dc5544f7d0b81e2266b322ca12becf9a4') + 'dhcpcd.conf.d') +sha1sums=('1856ad1535f2c7551cefcb492af24d345c6a1b50' + 'b67b9ce6a2faaca75fea356966a16be2283b7db0') build() { cd ${srcdir}/${pkgname}-${pkgver} - # remove net-tools dep - patch -Np1 -i ${srcdir}/0001-Set-hostname-via-proc-if-file-is-available.patch - patch -Np1 -i ${srcdir}/0001-set-MTU-via-sysfs-if-file-is-available.patch + # remove net-tools dep (upstream now) +# patch -Np1 -i ${srcdir}/0001-Set-hostname-via-proc-if-file-is-available.patch +# patch -Np1 -i ${srcdir}/0001-set-MTU-via-sysfs-if-file-is-available.patch # configure variables ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \ diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD index 39c901d19..41e704157 100644 --- a/core/gnupg/PKGBUILD +++ b/core/gnupg/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 154386 2012-03-27 12:00:15Z bisson $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# $Id: PKGBUILD 154487 2012-03-29 08:18:37Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=gnupg -pkgver=2.0.18 -pkgrel=2 +pkgver=2.0.19 +pkgrel=1 pkgdesc='Complete and free implementation of the OpenPGP standard' url='http://www.gnupg.org/' license=('GPL') @@ -16,29 +17,30 @@ optdepends=('curl: gpg2keys_curl' 'texinfo: documentation') makedepends=('curl' 'libldap' 'libusb-compat' 'texinfo') depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr') -install=${pkgname}.install -source=(ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-$pkgver.tar.bz2{,.sig}) -sha1sums=('5ec2f718760cc3121970a140aeea004b64545c46' - 'c1b15a6c204434081e2bd8249dde233b6c88c4d0') +source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}) +sha1sums=('190c09e6688f688fb0a5cf884d01e240d957ac1f' + 'f6e6830610a8629b0aad69d789373bf8ca481733') + +install=install conflicts=('gnupg2') provides=("gnupg2=${pkgver}") replaces=('gnupg2') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg + make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check + cd "${srcdir}/${pkgname}-${pkgver}" + make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - ln -s gpg2 "${pkgdir}"/usr/bin/gpg - ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + ln -s gpg2 "${pkgdir}"/usr/bin/gpg + ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz } diff --git a/core/gnupg/install b/core/gnupg/install new file mode 100644 index 000000000..3a5dc9fd6 --- /dev/null +++ b/core/gnupg/install @@ -0,0 +1,20 @@ +info_dir=/usr/share/info +info_files=(gnupg.info gnupg.info-1 gnupg.info-2) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null + done +} diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index e5dbf286e..1f9c4ccf4 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 153568 2012-03-16 04:06:01Z bisson $ +# $Id: PKGBUILD 154496 2012-03-29 15:43:20Z bisson $ # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=clamav pkgver=0.97.4 -pkgrel=1 +pkgrel=2 pkgdesc='Anti-virus toolkit for Unix' url='http://www.clamav.net/' license=('GPL') @@ -17,12 +17,14 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver 'rc.d' 'conf.d' 'logrotate' + 'tmpfiles.d' 'config.patch') sha1sums=('56f90cf8a73acba8f97beca86b42c65c3923935d' - '50cfe02c97e4297a0efd25b23142408380305d30' + 'c9d508c1e5972f0f849d8694c1872455fa9e74de' 'cb116cdab49a810381a515cbcfb6a6c148547f07' - 'be3310d2b41a68ce06e33c84ab68ffe59fdce104' - '701a61571788d10ff7af01597785835c6bfea918') + '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee' + 'a224ea9b4d0f4f196827347d54bed51e11c197ea' + '1c8ef193919b041135115170acd6313f008de808') install=install @@ -44,15 +46,16 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - # make sure conf files get installed, because make install + # Make sure conf files get installed, because make install # doesn't do that if clamav is already installed upon building. install -D -m644 etc/clamd.conf "${pkgdir}/etc/clamav/clamd.conf" install -D -m644 etc/freshclam.conf "${pkgdir}/etc/clamav/freshclam.conf" + install -D -m644 ../tmpfiles.d "${pkgdir}/usr/lib/tmpfiles.d/clamav.conf" install -D -m644 ../logrotate "${pkgdir}/etc/logrotate.d/clamav" install -D -m644 ../conf.d "${pkgdir}/etc/conf.d/clamav" install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/clamav" - # un-distribute databases to require freshclam + # Un-distribute databases to require freshclam. rm "${pkgdir}"/var/lib/clamav/*.cvd } diff --git a/extra/clamav/config.patch b/extra/clamav/config.patch index a0105bd48..0640df2c3 100644 --- a/extra/clamav/config.patch +++ b/extra/clamav/config.patch @@ -9,7 +9,7 @@ diff -arU 0 old/etc/clamd.conf new/etc/clamd.conf +LogTime yes @@ -61 +61 @@ -#PidFile /var/run/clamd.pid -+PidFile /var/run/clamav/clamd.pid ++PidFile /run/clamav/clamd.pid @@ -65 +65 @@ -#TemporaryDirectory /var/tmp +TemporaryDirectory /tmp diff --git a/extra/clamav/install b/extra/clamav/install index 144134dde..a2092e815 100644 --- a/extra/clamav/install +++ b/extra/clamav/install @@ -2,9 +2,9 @@ post_install() { getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null - install -d /var/log/clamav - chown clamav:root /var/log/clamav chown -R clamav:clamav /var/lib/clamav + install -o clamav -g clamav -d /run/clamav + install -o clamav -g clamav -d /var/log/clamav } post_remove() { diff --git a/extra/clamav/logrotate b/extra/clamav/logrotate index d1dc94dce..6a9051bed 100644 --- a/extra/clamav/logrotate +++ b/extra/clamav/logrotate @@ -2,7 +2,7 @@ create 644 clamav clamav sharedscripts postrotate - /bin/kill -HUP `cat /var/run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true - /bin/kill -HUP `cat /var/run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true + /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true + /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true endscript } diff --git a/extra/clamav/rc.d b/extra/clamav/rc.d index 04e959903..127c86c0f 100644 --- a/extra/clamav/rc.d +++ b/extra/clamav/rc.d @@ -3,8 +3,7 @@ . /etc/rc.conf . /etc/rc.d/functions -[[ -f /etc/conf.d/clamav ]] && . /etc/conf.d/clamav -[[ -d /var/run/clamav ]] || install -d -o clamav -g root /var/run/clamav +[[ -f /etc/conf.d/clamav ]] && source /etc/conf.d/clamav PID_FC=$(pidof -o %PPID /usr/bin/freshclam) PID_CD=$(pidof -o %PPID /usr/sbin/clamd) @@ -24,7 +23,7 @@ case "$1" in sleep 1 if [[ $START_FRESHCLAM = yes ]]; then stat_busy "Starting FreshClam" - [[ -z $PID_FC ]] && /usr/bin/freshclam -p /var/run/clamav/freshclam.pid -d $FRESHCLAM_OPTS + [[ -z $PID_FC ]] && /usr/bin/freshclam -p /run/clamav/freshclam.pid -d $FRESHCLAM_OPTS if [[ $? -gt 0 ]]; then stat_fail else diff --git a/extra/clamav/tmpfiles.d b/extra/clamav/tmpfiles.d new file mode 100644 index 000000000..22d29941e --- /dev/null +++ b/extra/clamav/tmpfiles.d @@ -0,0 +1 @@ +d /run/clamav 0755 clamav clamav diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 9a58608bd..52be2e1bf 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153938 2012-03-20 20:33:27Z andyrtr $ +# $Id: PKGBUILD 154508 2012-03-29 17:30:54Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.32 +pkgver=2.4.33 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) @@ -16,7 +16,7 @@ source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 COPYING # git_fixes.diff ) -sha1sums=('4aab6cc1c0d2a4822ffd83bd3da0e7a5479bf842' +sha1sums=('4da2c635491724e44326871e6a49ccfec0b6b5a6' '825ff5e0c4238b31bdea52f104bfec8949270e25' 'ba3dcd636997ee0d30df14b03dae05c24ae5d094') diff --git a/extra/libzip/PKGBUILD b/extra/libzip/PKGBUILD index 1439f4d6b..b95a3a411 100644 --- a/extra/libzip/PKGBUILD +++ b/extra/libzip/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 150601 2012-02-18 22:35:18Z pierre $ +# $Id: PKGBUILD 154546 2012-03-30 00:01:03Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libzip -pkgver=0.10 -pkgrel=2 +pkgver=0.10.1 +pkgrel=1 pkgdesc="A C library for reading, creating, and modifying zip archives" url="http://www.nih.at/libzip/index.html" -license=('GPL2') +license=('BSD') arch=('i686' 'x86_64') depends=('zlib') options=('!libtool') -source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.gz" +source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'fix-headers.patch') -md5sums=('47cdfcbc08c8bea0b52fdee4bf591622' +md5sums=('d3e933ae049204badccf605f20aaecde' '249395bd3a426c4c4e993e9d4753e1dd') build() { @@ -27,5 +27,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 00c71f598..bc13e5ef8 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 152665 2012-03-08 10:07:57Z andrea $ +# $Id: PKGBUILD 154524 2012-03-29 20:18:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') -pkgver=4.8.0 -pkgrel=6 +pkgver=4.8.1 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -18,31 +18,18 @@ _pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}" source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' - 'fix-qgraphicsscene-regression.patch' - 'improved-filter-event.patch' - 'qurl-backward-compatibility.patch' - 'improve-cups-support.patch') -md5sums=('e8a5fdbeba2927c948d9f477a6abe904' + 'gcc47.patch') +md5sums=('7960ba8e18ca31f0c6e4895a312f92ff' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' '6b771c8a81dd90b45e8a79afa0e5bbfd' - 'c2e91fc028250a590e76effe234468e2' - '444ebeb716d7c7379835efb8aa88e6c8' - '7bc255a36733d0fbc80c1902ade4beca' - 'c439c7731c25387352d8453ca7574971') + 'd8a0e81075b290ddc18ecd33b9b7ee22') build() { cd "${srcdir}"/${_pkgfqn} - # (FS#28707) - patch -p1 -i "${srcdir}"/fix-qgraphicsscene-regression.patch - # (FS#27757) (KDEBUG#275469) - patch -p1 -i "${srcdir}"/improved-filter-event.patch - patch -p1 -i "${srcdir}"/qurl-backward-compatibility.patch - - # (FS#28381) (KDEBUG#180051) - patch -p1 -i "${srcdir}"/improve-cups-support.patch + patch -p1 -i "${srcdir}"/gcc47.patch export QT4DIR="${srcdir}"/${_pkgfqn} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} diff --git a/extra/qt/gcc47.patch b/extra/qt/gcc47.patch new file mode 100644 index 000000000..62c436e6a --- /dev/null +++ b/extra/qt/gcc47.patch @@ -0,0 +1,27 @@ +diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h +--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h.me 2012-01-24 11:24:14.729942043 +0100 ++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSGlobalObject.h 2012-01-24 14:28:39.848109534 +0100 +@@ -57,9 +57,7 @@ namespace JSC { + + class JSGlobalObject : public JSVariableObject { + protected: +- using JSVariableObject::JSVariableObjectData; +- +- struct JSGlobalObjectData : public JSVariableObjectData { ++ struct JSGlobalObjectData : public JSVariableObject::JSVariableObjectData { + // We use an explicit destructor function pointer instead of a + // virtual destructor because we want to avoid adding a vtable + // pointer to this struct. Adding a vtable pointer would force the +diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h +--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h.me 2012-01-24 11:40:07.167856677 +0100 ++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSStaticScopeObject.h 2012-01-24 14:28:34.640306629 +0100 +@@ -32,8 +32,7 @@ namespace JSC{ + + class JSStaticScopeObject : public JSVariableObject { + protected: +- using JSVariableObject::JSVariableObjectData; +- struct JSStaticScopeObjectData : public JSVariableObjectData { ++ struct JSStaticScopeObjectData : public JSVariableObject::JSVariableObjectData { + JSStaticScopeObjectData() + : JSVariableObjectData(&symbolTable, ®isterStore + 1) + { diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD index 5cce5b37c..a9aae7f3d 100644 --- a/extra/xf86-video-ati/PKGBUILD +++ b/extra/xf86-video-ati/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153325 2012-03-12 20:53:16Z andyrtr $ +# $Id: PKGBUILD 154506 2012-03-29 17:23:01Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-video-ati -pkgver=6.14.3 -pkgrel=2 +pkgver=6.14.4 +pkgrel=1 pkgdesc="X.org ati video driver" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -15,7 +15,7 @@ conflicts=('xorg-server<1.11.99.902') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('db635e2e2858d5db90362f546ac0adad85474bad') +sha1sums=('75ad000bc00599e1797134f2d20d3094cba6af92') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/dconf/PKGBUILD b/gnome-unstable/dconf/PKGBUILD index 45eebf827..c06b4f085 100644 --- a/gnome-unstable/dconf/PKGBUILD +++ b/gnome-unstable/dconf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153810 2012-03-19 19:00:08Z ibiru $ +# $Id: PKGBUILD 154522 2012-03-29 19:57:35Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=dconf -pkgver=0.11.7 +pkgver=0.12.0 pkgrel=1 pkgdesc="A low-level configuration system." arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=('vala' 'gtk3') optdepends=('gtk3: for dconf-editor') install=dconf.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('ea0edb75157d8976c9256ee0d82faa37bf146c4d85c4c29ef0f8bcfbcdb35641') +sha256sums=('9c020e2ff0adb19ff9bc3d73ce15388fb42c52b12ed751bdb59ce53a660461af') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/gnome-color-manager/PKGBUILD b/gnome-unstable/gnome-color-manager/PKGBUILD index 3891cfbc6..bb93744b7 100644 --- a/gnome-unstable/gnome-color-manager/PKGBUILD +++ b/gnome-unstable/gnome-color-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153527 2012-03-15 15:04:38Z ibiru $ +# $Id: PKGBUILD 154521 2012-03-29 19:55:41Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-color-manager -pkgver=3.3.91 +pkgver=3.4.0 pkgrel=1 pkgdesc="Color profile manager for the GNOME desktop" arch=(i686 x86_64) @@ -15,7 +15,7 @@ install=gnome-color-manager.install options=('!libtool' '!emptydirs') groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e7d5eba332a3eb6f1ebccca881e0298809527ca9ac45f1b24bb60afb550b1d7a') +sha256sums=('fcca7292d14dcffea01463bb24833346b415ee189611821399ca96d6638d812d') build(){ cd $pkgname-$pkgver diff --git a/gnome-unstable/gnome-disk-utility/PKGBUILD b/gnome-unstable/gnome-disk-utility/PKGBUILD index 37d0db881..2c0e60377 100644 --- a/gnome-unstable/gnome-disk-utility/PKGBUILD +++ b/gnome-unstable/gnome-disk-utility/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 152833 2012-03-09 19:02:37Z ibiru $ +# $Id: PKGBUILD 154502 2012-03-29 15:55:52Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Silvio Knizek (killermoehre) pkgname=gnome-disk-utility -pkgver=3.3.93 +pkgver=3.4.0 pkgrel=1 pkgdesc="Disk Management Utility for GNOME" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnome.org" +groups=('gnome-extra') depends=('gtk3' 'udisks2' 'hicolor-icon-theme') makedepends=('intltool') options=('!libtool' '!emptydirs') install=gnome-disk-utility.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('714d6a986ae04762d1a4ee6696ae3869f301e82a23701e2d4378e4263e04f20f') +sha256sums=('1d5b7ba73ee2b5373ea8a087902ab05339723c72eab278670856375280e02f03') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/gnome-documents/PKGBUILD b/gnome-unstable/gnome-documents/PKGBUILD index a037b7c10..dc84bbeae 100644 --- a/gnome-unstable/gnome-documents/PKGBUILD +++ b/gnome-unstable/gnome-documents/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153895 2012-03-20 09:47:24Z ibiru $ +# $Id: PKGBUILD 154543 2012-03-29 21:25:35Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-documents -pkgver=0.3.92 +pkgver=0.4.0 pkgrel=1 pkgdesc="Documents Manager for GNOME" arch=(i686 x86_64) @@ -15,7 +15,7 @@ optdepends=('unoconv: Support for Libreoffice document types') options=('!libtool') install=gnome-documents.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('8873070d7797bfc500483c05154c81dc06c2da8601984923da56770e0e9db027') +sha256sums=('aabb40c179b0b8c4a5441f9f2a8329bf1c9af5ed6b3b31271eab1f35bd84903d') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/gnome-font-viewer/PKGBUILD b/gnome-unstable/gnome-font-viewer/PKGBUILD index 24e60d435..2bee1aeb1 100644 --- a/gnome-unstable/gnome-font-viewer/PKGBUILD +++ b/gnome-unstable/gnome-font-viewer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153840 2012-03-19 20:34:31Z ibiru $ +# $Id: PKGBUILD 154499 2012-03-29 15:49:21Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-font-viewer -pkgver=3.3.92 +pkgver=3.4.0 pkgrel=1 pkgdesc="GNOME font viewer and thumbnailer" arch=(i686 x86_64) @@ -13,8 +13,8 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" groups=('gnome-extra') install=gnome-font-viewer.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b57abcca1f49ef9da99c311a0eaa5fcfe4b13c9fc83f5208a6f5e5e1f784c7db') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('6311fc6e390b7ddfde4fbe5954452d0846a0b3991e9e52f179be3969e6033a76') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/gnome-power-manager/PKGBUILD b/gnome-unstable/gnome-power-manager/PKGBUILD index 7826713f8..987521b18 100644 --- a/gnome-unstable/gnome-power-manager/PKGBUILD +++ b/gnome-unstable/gnome-power-manager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153783 2012-03-19 17:17:11Z ibiru $ +# $Id: PKGBUILD 154518 2012-03-29 19:49:04Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-power-manager -pkgver=3.3.92 +pkgver=3.4.0 pkgrel=1 pkgdesc="Power management tools." arch=(i686 x86_64) @@ -14,8 +14,8 @@ makedepends=('intltool') options=(!emptydirs) install=gnome-power-manager.install groups=(gnome-extra) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('8f712adfc44870115939785ce65d7ab0c0a7e6b1cf92354b6fc4a517f47e2661') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('2c47786a1ed85b6ba48ad5e74e2584ab7cbc0127fda46359ec4671b1c0286c71') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/gnome-system-log/PKGBUILD b/gnome-unstable/gnome-system-log/PKGBUILD index 98c3c5bf2..08a39e474 100644 --- a/gnome-unstable/gnome-system-log/PKGBUILD +++ b/gnome-unstable/gnome-system-log/PKGBUILD @@ -1,7 +1,8 @@ -# $Id: PKGBUILD 153837 2012-03-19 20:31:19Z ibiru $ +# $Id: PKGBUILD 154500 2012-03-29 15:50:01Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> + pkgname=gnome-system-log -pkgver=3.3.92 +pkgver=3.4.0 pkgrel=1 pkgdesc="View your system logs" arch=(i686 x86_64) @@ -12,7 +13,7 @@ makedepends=('intltool' 'gnome-doc-utils') groups=('gnome-extra') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('316d897c73bd24b5637811ee31402e043f5e1e7ccd1ba2914e7470d1ac87487b') +sha256sums=('7eea66e1cef32c0ad7f0027564d371123dfbfb1866fd172d9d498b5dd701528b') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/gnome-themes-standard/PKGBUILD b/gnome-unstable/gnome-themes-standard/PKGBUILD index 5bf395bd9..3a3001b60 100644 --- a/gnome-unstable/gnome-themes-standard/PKGBUILD +++ b/gnome-unstable/gnome-themes-standard/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153887 2012-03-20 09:30:22Z ibiru $ +# $Id: PKGBUILD 154504 2012-03-29 16:01:39Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=gnome-themes-standard -pkgver=3.3.92 +pkgver=3.4.0 pkgrel=1 pkgdesc="Default themes for the GNOME desktop" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ replaces=('gnome-themes') conflicts=('gnome-themes') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('bfcb95952e63a07b9c157b16530f19eea4f773e604e79986fb06d8c00edcc776') +sha256sums=('6c85056db16b748a14c412554371a22f096b981d2eca3ae3d6922a435d43b0fd') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/gtk3/PKGBUILD b/gnome-unstable/gtk3/PKGBUILD index c88604a04..19a217713 100644 --- a/gnome-unstable/gtk3/PKGBUILD +++ b/gnome-unstable/gtk3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153924 2012-03-20 18:53:02Z ibiru $ +# $Id: PKGBUILD 154516 2012-03-29 19:47:27Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.3.20 +pkgver=3.4.0 pkgrel=1 -pkgdesc="GTK+ is a multi-platform toolkit (v3)" +pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=('i686' 'x86_64') url="http://www.gtk.org/" install=gtk3.install @@ -15,7 +15,7 @@ backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz settings.ini) -sha256sums=('2327df9b2eca97d4817a6adbf127bf77141c4bafb2f79b6a91c9495b272d8501' +sha256sums=('00af8be8bc60355e08a8f57e3e7503c916cec5cd5c6acb3eaedb01330b81f3e0' 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') build() { cd "gtk+-$pkgver" diff --git a/gnome-unstable/gvfs/PKGBUILD b/gnome-unstable/gvfs/PKGBUILD index 321915d34..da6ddcbf6 100644 --- a/gnome-unstable/gvfs/PKGBUILD +++ b/gnome-unstable/gvfs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153812 2012-03-19 19:03:29Z ibiru $ +# $Id: PKGBUILD 154541 2012-03-29 21:19:52Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') -pkgver=1.11.5 +pkgver=1.12.0 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') @@ -11,7 +11,7 @@ makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio url="http://www.gnome.org" options=(!libtool) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('bad32db5cadba842ca8d65a641a2014c64a96470ef113e33e3609d62c2c34a5c') +sha256sums=('87ffb27fd884be65570d64530c3121f9e49848070b62a26e39cd363f6a6bd555') build() { cd "$pkgbase-$pkgver" diff --git a/gnome-unstable/libimobiledevice/PKGBUILD b/gnome-unstable/libimobiledevice/PKGBUILD index 49c782fbf..b2c328d8d 100644 --- a/gnome-unstable/libimobiledevice/PKGBUILD +++ b/gnome-unstable/libimobiledevice/PKGBUILD @@ -1,26 +1,27 @@ -# $Id: PKGBUILD 154116 2012-03-23 14:00:54Z ibiru $ +# $Id: PKGBUILD 154539 2012-03-29 21:10:42Z heftig $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=libimobiledevice -pkgver=1.1.2 -pkgrel=1 +pkgver=1.1.1 +pkgrel=3 pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux" url="http://libimobiledevice.org/" arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') -depends=('usbmuxd' 'libplist') -makedepends=('python2' 'cython2') +depends=('usbmuxd' 'libplist' 'gnutls' 'libgcrypt') +makedepends=('python2' 'swig') options=('!libtool') -source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2) -md5sums=('82851e4ca9794ee660ffca9f78c8e068') +source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2 + swig-version-check.patch) +md5sums=('cdc13037e822d9ac2e109536701d153a' + '8bb215e36fe0e08a72332c108c7842cc') build() { cd "$pkgname-$pkgver" - mkdir "$srcdir/cython2-path" - ln -s /usr/bin/cython2 "$srcdir/cython2-path/cython" - export PATH="$srcdir/cython2-path:$PATH" + # SWIG version check is wrong (still not fixed upstream) + patch -p1 -i ../swig-version-check.patch PYTHON=/usr/bin/python2 ./configure --prefix=/usr make diff --git a/gnome-unstable/libimobiledevice/swig-version-check.patch b/gnome-unstable/libimobiledevice/swig-version-check.patch new file mode 100644 index 000000000..c56b095db --- /dev/null +++ b/gnome-unstable/libimobiledevice/swig-version-check.patch @@ -0,0 +1,14 @@ +diff -Nur libimobiledevice-1.0.3.old/configure libimobiledevice-1.0.3/configure +--- libimobiledevice-1.0.3.old/configure 2010-10-04 07:38:37.000000000 -0700 ++++ libimobiledevice-1.0.3/configure 2010-10-08 05:43:05.466686656 -0700 +@@ -3477,9 +3477,7 @@ + if test -z "$available_patch" ; then + available_patch=0 + fi +- if test $available_major -ne $required_major \ +- -o $available_minor -ne $required_minor \ +- -o $available_patch -lt $required_patch ; then ++ if test $available_major -lt $required_major ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required. You have $swig_version. You should look at http://www.swig.org" >&5 + $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required. You have $swig_version. You should look at http://www.swig.org" >&2;} + SWIG=false diff --git a/gnome-unstable/libplist/PKGBUILD b/gnome-unstable/libplist/PKGBUILD index 479273b22..2cfe2ca26 100644 --- a/gnome-unstable/libplist/PKGBUILD +++ b/gnome-unstable/libplist/PKGBUILD @@ -1,25 +1,24 @@ -# $Id: PKGBUILD 154114 2012-03-23 13:52:45Z ibiru $ +# $Id: PKGBUILD 154538 2012-03-29 21:09:37Z heftig $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=libplist pkgver=1.8 -pkgrel=1 +pkgrel=2 pkgdesc="A library to handle Apple Property List format whereas it's binary or XML" url="http://libimobiledevice.org/" arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') -depends=('libxml2' 'python2') -makedepends=('cmake' 'cython2') +depends=('glib2' 'libxml2' 'python2') +makedepends=('cmake' 'swig') source=(http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2) sha256sums=('a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec') build() { mkdir build cd build - cmake ../"$pkgname-$pkgver" \ + cmake ../$pkgname-$pkgver \ -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DCYTHON_EXECUTABLE=/usr/bin/cython2 \ -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX:PATH=/usr make diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 91ad4a5cf..29870d611 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -50,6 +50,7 @@ DESTARCH="x86_64" build() { cd $srcdir/$pkgname-$pkgver + fgrep -rlZ pkglib_DATA --include Makefile.am . | xargs -0 sed -i 's/pkglib_DATA/pkgdata_DATA/g' # optimizations break the build -- disable them # adding special devices to grub, patches are from fedora diff --git a/libre/grub2/20_memtest86+ b/libre/grub2/20_memtest86+ index 41ca11f02..1d3096f6b 100644 --- a/libre/grub2/20_memtest86+ +++ b/libre/grub2/20_memtest86+ @@ -4,11 +4,13 @@ # if memtest is installed on the system. # ######################################################## -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib +prefix="/usr" +exec_prefix="${prefix}" -. ${libdir}/grub/grub-mkconfig_lib +datarootdir="/usr/share" +datadir="${datarootdir}" + +. "${datadir}/grub/grub-mkconfig_lib" MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin" CLASS="--class memtest86 --class gnu --class tool" diff --git a/libre/grub2/PKGBUILD b/libre/grub2/PKGBUILD index 9f445eb1d..d84f8a62c 100644 --- a/libre/grub2/PKGBUILD +++ b/libre/grub2/PKGBUILD @@ -1,206 +1,254 @@ # Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Keshav P R <skodabenz at rocketmail dot com> +# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> +# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> -# The src pkg includes grub2_bzr_export.sh to create newer grub-extras snapshots. Modify the paths in it accordingly. +_grub_bzr_rev="4169" +_pkgver="2.00~beta2" -# _grub2_rev=3238 - -_grub2_lua_ver=20 -_grub2_gpxe_ver=12 -_grub2_ntldr_ver=17 -_grub2_915_ver=7 +_grub_lua_ver=24 +_grub_gpxe_ver=12 +_grub_ntldr_ver=21 +_grub_915_ver=9 pkgname=('grub2-common' 'grub2-bios' 'grub2-efi-i386') -pkgbase="grub2" -pkgver='1.99' -pkgrel=4 +pkgbase=grub2 +pkgver=2.00beta2 +pkgrel=3 url="http://www.gnu.org/software/grub/" arch=('i686' 'x86_64') license=('GPL3') -epoch=1 -makedepends=('bdf-unifont' 'python2' 'xz' 'autogen' 'texinfo' 'help2man' 'gettext' 'device-mapper') -options=(strip purge docs zipman !emptydirs) - -# "http://alpha.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" -source=("ftp://ftp.gnu.org/gnu/grub/grub-1.99.tar.xz" - "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub2_lua_ver}.tar.xz" - "ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz" - "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz" - "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz" - 'archlinux_grub2_mkconfig_fixes.patch' - 'grub.default' - 'grub.cfg' - '20_memtest86+' - 'grub2_bzr_export.sh' - 'parabola-mkconfig.patch') - -noextract=("grub2_extras_lua_r${_grub2_lua_ver}.tar.xz" - "grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz" - "grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz" - "grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz") - -sha1sums=('a5ae9558f30ce7757a76aa130088b053a87e2fb6' - '9f2dbf7a3faab24ca92266400aa513fecd3895c8' +epoch="1" +makedepends=('rsync' 'xz' 'bdf-unifont' 'python' 'autogen' 'texinfo' + 'help2man' 'gettext' 'device-mapper' 'fuse' 'dosfstools' 'efibootmgr') + +# source=("ftp://ftp.archlinux.org/other/grub2/grub_r${_grub_bzr_rev}.tar.xz" +source=("http://alpha.gnu.org/gnu/grub/grub-${_pkgver}".tar.xz + "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" + "ftp://ftp.archlinux.org/other/grub2/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" + "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" + "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" + 'archlinux_grub_mkconfig_fixes.patch' + 'grub.default' + 'grub.cfg' + '20_memtest86+') + +noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz" + "grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" + "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" + "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz") + +sha1sums=('2ba583f9466fb676b0ae3d7a9a82d1299b153a98' + '89290031b974780c6df76893836d2477d4add895' 'b04994c005910b4bf123f034b30109d5c8d6fd86' - 'e0c1a97770cc23226cf4535c029ef50b17f67974' - '8bcaed545956bb33581e1b97ac96a2c3717ec793' - 'b7e5510c7b171e9c4dbddb42bbf54ce5ee86e2de' - 'd1252b837b13ebf817dbc45cfd4d772c7d1b621f' - '7df0516c6c45816aa330b775f1ed6f652e4f0380' - '82a27eca5277218cf57c6c5767e0b17a72f62229' - 'beb31419045db70fee7401aa6448c220a491e2a3' - '27930016362d6647282405183b9977f0a7b15c1a') + 'eb4b35b4c36b64f9405cbcbc538cb205171c1c0a' + 'd5ae2efec25616028a9d89e98b6e454f1c4c415f' + 'cdace8067562fab04aaacac8d99a4ea612fa0c5b' + '348b148d5183825f31a3d24a7ebf2d6a709f4e6a' + '6f0870673b9f994163326a416432aee7eacdbfc5' + 'ce35d7ae75cd1b5b677e894e528f96add40e77b9') -build() { - # set architecture dependent variables - if [ "${CARCH}" = "x86_64" ] ; then - _EFIEMU="--enable-efiemu" - else - _EFIEMU="--disable-efiemu" - fi - _HOST="${CARCH}" +_build_grub2-common_and_bios() { - build_grub2-common_and_bios - build_grub2-efi -} + ## copy the source for building the common/bios package + cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub_bios-${_pkgver}" + cd "${srcdir}/grub_bios-${_pkgver}" + + ## Apply Archlinux specific fixes to enable grub-mkconfig detect Arch kernels and initramfs + patch -Np1 -i "${srcdir}/archlinux_grub_mkconfig_fixes.patch" + echo + + ## add the grub-extra sources + export GRUB_CONTRIB="${srcdir}/grub_bios-${_pkgver}/grub-extras/" + install -d "${srcdir}/grub_bios-${_pkgver}/grub-extras" + + bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \ + -C "${srcdir}/grub_bios-${_pkgver}/grub-extras" + + bsdtar xf "${srcdir}/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" \ + -C "${srcdir}/grub_bios-${_pkgver}/grub-extras" + + bsdtar xf "${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" \ + -C "${srcdir}/grub_bios-${_pkgver}/grub-extras" + + bsdtar xf "${srcdir}/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" \ + -C "${srcdir}/grub_bios-${_pkgver}/grub-extras" -build_grub2-common_and_bios() { - # copy the source for building the common/bios package - cp -r ${srcdir}/grub-${pkgver} ${srcdir}/grub2_bios-${pkgver} - - ## Apply Archlinux specific fixes to enable grub2-mkconfig detect Arch kernels and initramfs - cd ${srcdir}/grub2_bios-${pkgver} - patch -Np1 -i ${srcdir}/archlinux_grub2_mkconfig_fixes.patch - patch -Np1 -i ${srcdir}/parabola-mkconfig.patch - - # add the grub-extra sources - export GRUB_CONTRIB=${srcdir}/grub2_bios-${pkgver}/grub2-extras/ - install -d ${srcdir}/grub2_bios-${pkgver}/grub2-extras - bsdtar xf ${srcdir}/grub2_extras_lua_r${_grub2_lua_ver}.tar.xz \ - -C ${srcdir}/grub2_bios-${pkgver}/grub2-extras - bsdtar xf ${srcdir}/grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz \ - -C ${srcdir}/grub2_bios-${pkgver}/grub2-extras - bsdtar xf ${srcdir}/grub2_extras_ntldr-img_r${_grub2_ntldr_ver}.tar.xz \ - -C ${srcdir}/grub2_bios-${pkgver}/grub2-extras - bsdtar xf ${srcdir}/grub2_extras_915resolution_r${_grub2_915_ver}.tar.xz \ - -C ${srcdir}/grub2_bios-${pkgver}/grub2-extras - - ## Need to use python2 - sed -i 's|python|python2|' ${srcdir}/grub2_bios-${pkgver}/autogen.sh - - # start the actual build process - cd ${srcdir}/grub2_bios-${pkgver} + ## Requires python2 + # sed 's|python |python2 |g' -i "${srcdir}/grub_bios-${_pkgver}/autogen.sh" + + ## start the actual build process + cd "${srcdir}/grub_bios-${_pkgver}" ./autogen.sh - + ## fix unifont.bdf location so grub-mkfont can create *.pf2 files - sed -i 's|/usr/share/fonts/unifont|/usr/share/fonts/misc|' ${srcdir}/grub2_bios-${pkgver}/configure - -# mkdir ${srcdir}/grub2_bios-${pkgver}/BUILD_BIOS -# cd ${srcdir}/grub2_bios-${pkgver}/BUILD_BIOS - + sed 's|/usr/share/fonts/unifont|/usr/share/fonts/misc|g' -i "${srcdir}/grub_bios-${_pkgver}/configure" + + # install -d "${srcdir}/grub_bios-${_pkgver}/BUILD_BIOS" + # cd "${srcdir}/grub_bios-${_pkgver}/BUILD_BIOS" + CFLAGS="" ./configure \ - --with-platform=pc --enable-mm-debug \ - ${_EFIEMU} --host=${CARCH}-unknown-linux-gnu \ - --enable-grub-mkfont --prefix=/usr \ - --bindir=/bin --sbindir=/sbin \ - --mandir=/usr/share/man --infodir=/usr/share/info \ - --sysconfdir=/etc --enable-nls \ - --program-transform-name=s,grub,grub, - CFLAGS="" make + --with-platform="pc" \ + --target="i386" \ + --host="${CARCH}-unknown-linux-gnu" \ + "${_EFIEMU}" \ + --enable-mm-debug \ + --enable-nls \ + --enable-device-mapper \ + --enable-cache-stats \ + --enable-grub-mkfont \ + --enable-grub-mount \ + --prefix="/usr" \ + --bindir="/usr/bin" \ + --sbindir="/usr/sbin" \ + --mandir="/usr/share/man" \ + --infodir="/usr/share/info" \ + --datarootdir="/usr/share" \ + --sysconfdir="/etc" \ + --program-prefix="" \ + --with-bootdir="/boot" \ + --with-grubdir="grub" \ + --disable-werror + + CFLAGS="" make + } -build_grub2-efi() { - # copy the source for building the efi package - cp -r ${srcdir}/grub-${pkgver} ${srcdir}/grub2_efi-${pkgver} - - # add the grub-extra sources - export GRUB_CONTRIB=${srcdir}/grub2_efi-${pkgver}/grub2-extras/ - install -d ${srcdir}/grub2_efi-${pkgver}/grub2-extras - bsdtar xf ${srcdir}/grub2_extras_lua_r${_grub2_lua_ver}.tar.xz \ - -C ${srcdir}/grub2_efi-${pkgver}/grub2-extras - bsdtar xf ${srcdir}/grub2_extras_gpxe_r${_grub2_gpxe_ver}.tar.xz \ - -C ${srcdir}/grub2_efi-${pkgver}/grub2-extras - - ## Need to use python2 - sed -i 's|python|python2|' ${srcdir}/grub2_efi-${pkgver}/autogen.sh - - # start the actual build process - cd ${srcdir}/grub2_efi-${pkgver} +_build_grub2-efi-i386() { + + ## copy the source for building the efi package + cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub_efi-${_pkgver}" + cd "${srcdir}/grub_efi-${_pkgver}" + + export GRUB_CONTRIB="${srcdir}/grub_efi-${_pkgver}/grub-extras/" + install -d "${srcdir}/grub_efi-${_pkgver}/grub-extras" + + bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \ + -C "${srcdir}/grub_efi-${_pkgver}/grub-extras" + + bsdtar xf "${srcdir}/grub2_extras_gpxe_r${_grub_gpxe_ver}.tar.xz" \ + -C "${srcdir}/grub_efi-${_pkgver}/grub-extras" + + ## Requires python2 + # sed 's|python |python2 |g' -i "${srcdir}/grub_efi-${_pkgver}/autogen.sh" + + cd "${srcdir}/grub_efi-${_pkgver}" ./autogen.sh CFLAGS="" ./configure \ - --with-platform=efi --target=i386 \ - --enable-mm-debug --disable-efiemu \ - --host=${CARCH}-unknown-linux-gnu \ - --prefix=/usr --bindir=/bin \ - --sbindir=/sbin --mandir=/usr/share/man \ - --infodir=/usr/share/info --sysconfdir=/etc \ - --enable-nls --program-transform-name=s,grub,grub, - CFLAGS="" make + --with-platform="efi" \ + --target="i386" \ + --host="${CARCH}-unknown-linux-gnu" \ + --disable-efiemu \ + --enable-mm-debug \ + --enable-nls \ + --enable-device-mapper \ + --enable-cache-stats \ + --enable-grub-mkfont \ + --enable-grub-mount \ + --prefix="/usr" \ + --bindir="/usr/bin" \ + --sbindir="/usr/sbin" \ + --mandir="/usr/share/man" \ + --infodir="/usr/share/info" \ + --datarootdir="/usr/share" \ + --sysconfdir="/etc" \ + --program-prefix="" \ + --with-bootdir="/boot" \ + --with-grubdir="grub" \ + --disable-werror + + CFLAGS="" make +} + +#_get_locale_files() { +# +# cd "${srcdir}/grub-${_pkgver}" +# rsync -Lrtvz translationproject.org::tp/latest/grub/ "${srcdir}/grub-${_pkgver}/po" || true +# (cd "${srcdir}/grub-${_pkgver}/po" && ls *.po | cut -d. -f1 | xargs) > "${srcdir}/grub-${_pkgver}/po/LINGUAS" +#} + +build() { + + ## set architecture dependent variables + if [[ "${CARCH}" == 'x86_64' ]]; then + _EFIEMU="--enable-efiemu" + else + _EFIEMU="--disable-efiemu" + fi + + _HOST="${CARCH}" + + cd "${srcdir}/grub-${_pkgver}" + # _get_locale_files + + _build_grub2-common_and_bios + _build_grub2-efi-i386 + } package_grub2-common() { + pkgdesc="The GNU GRand Unified Bootloader version 2 - Files common for all platforms" - install="grub2.install" - depends=('xz' 'freetype2' 'device-mapper' 'gettext' 'texinfo') + depends=('xz' 'freetype2' 'gettext' 'device-mapper' 'fuse' 'sh') conflicts=('grub') backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom') - cd ${srcdir}/grub2_bios-${pkgver} - make DESTDIR=${pkgdir} install - - install -Dm755 ${pkgdir}/sbin/grub-install ${pkgdir}/sbin/grub_bios-install - install -Dm755 ${pkgdir}/sbin/grub-install ${pkgdir}/sbin/grub_efi_x86_64-install - install -Dm755 ${pkgdir}/sbin/grub-install ${pkgdir}/sbin/grub_efi_i386-install - - sed -i "s|^\(target_cpu\)=.*|\1=i386|; \ - s|^\(platform\)=.*|\1=pc|" \ - ${pkgdir}/sbin/grub_bios-install - - sed -i "s|^\(target_cpu\)=.*|\1=x86_64|; \ - s|^\(platform\)=.*|\1=efi|" \ - ${pkgdir}/sbin/grub_efi_x86_64-install - - sed -i "s|^\(target_cpu\)=.*|\1=i386|; \ - s|^\(platform\)=.*|\1=efi|" \ - ${pkgdir}/sbin/grub_efi_i386-install - + optdepends=('libisoburn: provides xorriso for generating grub rescue iso using grub-mkrescue' + 'os-prober: to detect other OSes when generating grub.cfg in BIOS systems' + 'mtools: for grub-mkrescue FAT FS support') + install="grub2.install" + options=('strip' 'purge' 'docs' 'zipman' '!emptydirs') + + cd "${srcdir}/grub_bios-${_pkgver}" + make DESTDIR="${pkgdir}/" install + ## install extra /etc/grub.d/ files - install -Dm755 ${srcdir}/20_memtest86+ ${pkgdir}/etc/grub.d/20_memtest86+ - + install -D -m0755 "${srcdir}/20_memtest86+" "${pkgdir}/etc/grub.d/20_memtest86+" + ## install /etc/default/grub (used by grub-mkconfig) - install -Dm644 ${srcdir}/grub.default ${pkgdir}/etc/default/grub + install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" ## install grub.cfg (needed so it doesn't get removed on upgrading because it was previously here) - install -Dm644 ${srcdir}/grub.cfg ${pkgdir}/boot/grub/grub.cfg + install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg" # remove platform specific files - rm -rf ${pkgdir}/usr/lib/grub/i386-pc/ + rm -rf "${pkgdir}/usr/lib/grub/i386-pc/" + } package_grub2-bios() { - pkgdesc="The GNU GRand Unified Bootloader version 2 - Built for PC BIOS" - depends=(grub2-common=${epoch}:${pkgver}) - replaces=('grub2' 'grub2-libre') - provides=('grub2' 'grub2-libre') - - cd ${srcdir}/grub2_bios-${pkgver} - make DESTDIR=${pkgdir} install + + pkgdesc="The GNU GRand Unified Bootloader version 2 - Built for i386 PC BIOS" + depends=("grub2-common=${epoch}:${pkgver}") + options=('!strip' '!emptydirs') + + cd "${srcdir}/grub_bios-${_pkgver}" + make DESTDIR="${pkgdir}/" install ## remove non platform-specific files - rm -rf ${pkgdir}/{boot,bin,sbin,etc,usr/share} - rm ${pkgdir}/usr/lib/grub/{grub-mkconfig_lib,update-grub_lib} + rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}} + + ## remove gdb debugging related files + rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true + rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true + rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true + } package_grub2-efi-i386() { pkgdesc="The GNU GRand Unified Bootloader version 2 - i386 UEFI version" depends=("grub2-common=${epoch}:${pkgver}" 'dosfstools' 'efibootmgr') - optdepends=('mtools') - - cd ${srcdir}/grub2_efi-${pkgver} - make DESTDIR=${pkgdir} install + options=('!strip' '!emptydirs') + + cd "${srcdir}/grub_efi-${_pkgver}" + make DESTDIR="${pkgdir}/" install ## remove non platform-specific files - rm -rf ${pkgdir}/{boot,bin,sbin,etc,usr/share} - rm ${pkgdir}/usr/lib/grub/{grub-mkconfig_lib,update-grub_lib} + rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}} + + ## remove gdb debugging related files + rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.module || true + rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.image || true + rm -f "${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true + } diff --git a/libre/grub2/archlinux_grub2_mkconfig_fixes.patch b/libre/grub2/archlinux_grub2_mkconfig_fixes.patch index 11805e309..ef4b10ee6 100644 --- a/libre/grub2/archlinux_grub2_mkconfig_fixes.patch +++ b/libre/grub2/archlinux_grub2_mkconfig_fixes.patch @@ -1,7 +1,21 @@ -diff -Nur a/util/grub.d/00_header.in b/util/grub.d/00_header.in ---- a/util/grub.d/00_header.in 2011-04-06 13:14:27.000000000 +0200 -+++ b/util/grub.d/00_header.in 2011-08-01 15:19:57.919100452 +0200 -@@ -100,6 +100,14 @@ +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index 859c2e8..c754dd7 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -242,6 +242,8 @@ export GRUB_DEFAULT \ + GRUB_THEME \ + GRUB_GFXPAYLOAD_LINUX \ + GRUB_DISABLE_OS_PROBER \ ++ GRUB_COLOR_NORMAL \ ++ GRUB_COLOR_HIGHLIGHT \ + GRUB_INIT_TUNE \ + GRUB_SAVEDEFAULT \ + GRUB_ENABLE_CRYPTODISK \ +diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in +index d9bcc15..a93dcb7 100644 +--- a/util/grub.d/00_header.in ++++ b/util/grub.d/00_header.in +@@ -100,6 +100,14 @@ cat <<EOF EOF @@ -16,10 +30,11 @@ diff -Nur a/util/grub.d/00_header.in b/util/grub.d/00_header.in serial=0; gfxterm=0; for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do -diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in ---- a/util/grub.d/10_linux.in 2011-05-14 22:36:49.000000000 +0200 -+++ b/util/grub.d/10_linux.in 2011-08-01 15:56:53.324779083 +0200 -@@ -31,8 +31,8 @@ +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index bc738f2..a6ab326 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -31,8 +31,8 @@ CLASS="--class gnu-linux --class gnu --class os" if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then OS=GNU/Linux else @@ -30,7 +45,16 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in fi # loop-AES arranges things so that /dev/loop/X can be our root device, but -@@ -65,7 +65,9 @@ +@@ -48,7 +48,7 @@ if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" + || uses_abstraction "${GRUB_DEVICE}" lvm; then + LINUX_ROOT_DEVICE=${GRUB_DEVICE} + else +- LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} ++ LINUX_ROOT_DEVICE="/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" + fi + + if [ "x`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" = xbtrfs ]; then +@@ -65,7 +65,9 @@ linux_entry () version="$2" recovery="$3" args="$4" @@ -41,7 +65,17 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in title="$(gettext_quoted "%s, with Linux %s (recovery mode)")" else title="$(gettext_quoted "%s, with Linux %s")" -@@ -132,7 +134,7 @@ +@@ -113,7 +115,9 @@ EOF + fi + printf '%s\n' "${prepare_boot_cache}" + fi ++ + message="$(gettext_printf "Loading Linux %s ..." ${version})" ++ + cat << EOF + echo '$message' + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} +@@ -132,11 +136,11 @@ EOF case x`uname -m` in xi?86 | xx86_64) @@ -50,22 +84,39 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi done` ;; *) -@@ -160,7 +162,8 @@ +- list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do ++ list=`for i in /boot/vmlinuz* /boot/vmlinux* /vmlinuz* /vmlinux* /boot/kernel-* ; do + if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi + done` ;; + esac +@@ -151,16 +155,19 @@ while [ "x$list" != "x" ] ; do + dirname=`dirname $linux` + rel_dirname=`make_system_path_relative_to_its_root $dirname` + version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` +- alt_version=`echo $version | sed -e "s,\.old$,,g"` ++ base_init=`echo $basename | sed -e "s,vmlinuz,initramfs,g"` ++ alt_version="${base_init}-fallback" + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + + initrd= ++ + for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ + "initrd-${version}" "initramfs-${version}.img" \ "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ "initrd-${alt_version}" "initramfs-${alt_version}.img" \ "initramfs-genkernel-${version}" \ - "initramfs-genkernel-${alt_version}"; do + "initramfs-genkernel-${alt_version}" \ -+ "${basename/vmlinuz/kernel}.img"; do ++ "${basename/vmlinuz/initramfs}.img" "${basename/vmlinuz/kernel}.img"; do if test -e "${dirname}/${i}" ; then initrd="$i" break -@@ -190,6 +193,15 @@ +@@ -190,6 +197,16 @@ while [ "x$list" != "x" ] ; do linux_entry "${OS}" "${version}" false \ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" + for i in "initramfs-${version}-fallback.img" \ -+ "${basename/vmlinuz/kernel}-fallback.img"; do ++ "${basename/vmlinuz/initramfs}-fallback.img" "${basename/vmlinuz/kernel}-fallback.img"; do + if test -e "${dirname}/${i}"; then + initrd="$i" + linux_entry "${OS}" "${version}" true \ @@ -73,18 +124,7 @@ diff -Nur a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in + break + fi + done ++ if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then linux_entry "${OS}" "${version}" true \ "single ${GRUB_CMDLINE_LINUX}" -diff -Nur a/util/grub-mkconfig.in b/util/grub-mkconfig.in ---- a/util/grub-mkconfig.in 2011-04-06 17:45:53.000000000 +0200 -+++ b/util/grub-mkconfig.in 2011-08-01 15:20:49.256867648 +0200 -@@ -252,6 +252,8 @@ - GRUB_THEME \ - GRUB_GFXPAYLOAD_LINUX \ - GRUB_DISABLE_OS_PROBER \ -+ GRUB_COLOR_NORMAL \ -+ GRUB_COLOR_HIGHLIGHT \ - GRUB_INIT_TUNE \ - GRUB_SAVEDEFAULT \ - GRUB_BADRAM diff --git a/libre/grub2/archlinux_grub_mkconfig_fixes.patch b/libre/grub2/archlinux_grub_mkconfig_fixes.patch new file mode 100644 index 000000000..4b4cba92a --- /dev/null +++ b/libre/grub2/archlinux_grub_mkconfig_fixes.patch @@ -0,0 +1,141 @@ +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index df3b733..65a7fff 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -213,6 +213,8 @@ export GRUB_DEFAULT \ + GRUB_THEME \ + GRUB_GFXPAYLOAD_LINUX \ + GRUB_DISABLE_OS_PROBER \ ++ GRUB_COLOR_NORMAL \ ++ GRUB_COLOR_HIGHLIGHT \ + GRUB_INIT_TUNE \ + GRUB_SAVEDEFAULT \ + GRUB_ENABLE_CRYPTODISK \ +diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in +index 765bfdc..b148558 100644 +--- a/util/grub.d/00_header.in ++++ b/util/grub.d/00_header.in +@@ -115,6 +115,14 @@ cat <<EOF + + EOF + ++if [ x$GRUB_COLOR_NORMAL != x ] && [ x$GRUB_COLOR_HIGHLIGHT != x ] ; then ++ cat << EOF ++set menu_color_normal=$GRUB_COLOR_NORMAL ++set menu_color_highlight=$GRUB_COLOR_HIGHLIGHT ++ ++EOF ++fi ++ + serial=0; + gfxterm=0; + for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do +diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in +index 8c75fab..0d4a137 100644 +--- a/util/grub.d/10_linux.in ++++ b/util/grub.d/10_linux.in +@@ -87,6 +87,8 @@ linux_entry () + case $type in + recovery) + title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;; ++ fallback) ++ title="$(gettext_printf "%s, with Linux %s (Fallback initramfs)" "${os}" "${version}")" ;; + *) + title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;; + esac +@@ -100,7 +102,7 @@ linux_entry () + else + echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/" + fi +- if [ x$type != xrecovery ] ; then ++ if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then + save_default_entry | sed -e "s/^/\t/" + fi + +@@ -132,7 +134,8 @@ linux_entry () + fi + printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/" + fi +- message="$(gettext_printf "Loading Linux %s ..." ${version})" ++ ++ message="$(gettext_printf "Loading Linux %s ..." "${version}")" + sed "s/^/$submenu_indentation/" << EOF + echo '$message' + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} +@@ -181,13 +184,29 @@ while [ "x$list" != "x" ] ; do + alt_version=`echo $version | sed -e "s,\.old$,,g"` + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + ++ if test -e "/etc/arch-release" ; then ++ if echo "${basename}" | grep -q 'vmlinuz-linux' ; then ++ version="`echo "${basename}" | sed -e 's,vmlinuz-linux,,g'`" ++ ++ if [ "x${version}" = "x" ] ; then ++ version="core repo kernel" ++ else ++ version="`echo "${version}" | sed -e 's,-,,g'`" ++ version="${version} kernel" ++ fi ++ fi ++ fi ++ + initrd= ++ initrd_arch="`echo "${basename}" | sed -e 's,vmlinuz,initramfs,g'`" ++ + for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ + "initrd-${version}" "initramfs-${version}.img" \ + "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ + "initrd-${alt_version}" "initramfs-${alt_version}.img" \ + "initramfs-genkernel-${version}" \ +- "initramfs-genkernel-${alt_version}"; do ++ "initramfs-genkernel-${alt_version}" \ ++ "${initrd_arch}.img" ; do + if test -e "${dirname}/${i}" ; then + initrd="$i" + break +@@ -215,6 +234,22 @@ while [ "x$list" != "x" ] ; do + linux_root_device_thisversion=${GRUB_DEVICE} + fi + ++ if test -e "/etc/arch-release" ; then ++ is_first_entry="false" ++ ++ linux_entry "${OS}" "${version}" true \ ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ ++ for i in "${initrd_arch}-fallback.img" "initramfs-${version}-fallback.img" ; do ++ if test -e "${dirname}/${i}" ; then ++ initrd="${i}" ++ linux_entry "${OS}" "${version}" fallback \ ++ "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ break ++ fi ++ done ++ fi ++ + if [ "x$is_first_entry" = xtrue ]; then + linux_entry "${OS}" "${version}" simple \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" +@@ -228,8 +263,11 @@ while [ "x$list" != "x" ] ; do + echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {" + fi + ++ if ! test -e "/etc/arch-release" ; then + linux_entry "${OS}" "${version}" advanced \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" ++ fi ++ + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then + linux_entry "${OS}" "${version}" recovery \ + "single ${GRUB_CMDLINE_LINUX}" +@@ -241,8 +279,10 @@ done + + # If at least one kernel was found, then we need to + # add a closing '}' for the submenu command. ++if ! test -e "/etc/arch-release" ; then + if [ x"$is_first_entry" != xtrue ]; then + echo '}' + fi ++fi + + echo "$title_correction_code" diff --git a/libre/grub2/fix_stack_pointer_handling_16_relocator.patch b/libre/grub2/fix_stack_pointer_handling_16_relocator.patch new file mode 100644 index 000000000..edc0ef502 --- /dev/null +++ b/libre/grub2/fix_stack_pointer_handling_16_relocator.patch @@ -0,0 +1,13 @@ +diff --git a/grub-core/lib/i386/relocator16.S b/grub-core/lib/i386/relocator16.S +index c3768f4..982415d 100644 +--- a/grub-core/lib/i386/relocator16.S ++++ b/grub-core/lib/i386/relocator16.S +@@ -130,7 +130,7 @@ VARIABLE(grub_relocator16_ss) + .byte 0xb8 + VARIABLE(grub_relocator16_sp) + .word 0 +- movw %ax, %ss ++ movzwl %ax, %esp + + /* movw imm32, %edx. */ + .byte 0x66, 0xba diff --git a/libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch b/libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch new file mode 100644 index 000000000..e1de26859 --- /dev/null +++ b/libre/grub2/grub-mkconfig-Use_outside_GRUB_PREFIX_if_defined.patch @@ -0,0 +1,15 @@ +diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in +index 859c2e8..c4391dc 100644 +--- a/util/grub-mkconfig.in ++++ b/util/grub-mkconfig.in +@@ -40,7 +40,9 @@ self=`basename $0` + grub_probe="${sbindir}/`echo grub-probe | sed "${transform}"`" + grub_script_check="${bindir}/`echo grub-script-check | sed "${transform}"`" + +-GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"` ++if test -z "${GRUB_PREFIX}"; then ++ GRUB_PREFIX=`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"` ++fi + + . "${datadir}/@PACKAGE@/grub-mkconfig_lib" + diff --git a/libre/grub2/grub.cfg b/libre/grub2/grub.cfg index 1f0e41471..4f5a21991 100644 --- a/libre/grub2/grub.cfg +++ b/libre/grub2/grub.cfg @@ -1,26 +1,127 @@ -# Config file for GRUB2 - The GNU GRand Unified Bootloader -# /boot/grub/grub.cfg - -# DEVICE NAME CONVERSIONS # -# Linux Grub -# ------------------------- -# /dev/fd0 (fd0) -# /dev/sda (hd0) -# /dev/sdb2 (hd1,2) -# /dev/sda3 (hd0,3) +# DO NOT EDIT THIS FILE +# +# It is automatically generated by grub-mkconfig using templates +# from /etc/grub.d and settings from /etc/default/grub # -# Timeout for menu -set timeout=5 +### BEGIN /etc/grub.d/00_header ### +insmod part_gpt +insmod part_msdos +if [ -s $prefix/grubenv ]; then + load_env +fi +set default="0" +if [ "${prev_saved_entry}" ]; then + set saved_entry="${prev_saved_entry}" + save_env saved_entry + set prev_saved_entry= + save_env prev_saved_entry + set boot_once=true +fi + +function savedefault { + if [ -z "${boot_once}" ]; then + saved_entry="${chosen}" + save_env saved_entry + fi +} + +function load_video { + if [ x$feature_all_video_module = xy ]; then + insmod all_video + else + insmod efi_gop + insmod efi_uga + insmod ieee1275_fb + insmod vbe + insmod vga + insmod video_bochs + insmod video_cirrus + fi +} -# Set default boot entry as Entry 0 -set default=0 +if [ x$feature_default_font_path = xy ] ; then + font=unicode +else +insmod part_gpt +insmod ext2 +set root='hd0,gpt9' +if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root --hint-bios=hd0,gpt9 --hint-efi=hd0,gpt9 --hint-baremetal=ahci0,gpt9 0cc6e472-7f98-42ff-b7f3-309b641377ad +else + search --no-floppy --fs-uuid --set=root 0cc6e472-7f98-42ff-b7f3-309b641377ad +fi + font="/usr/share/grub/unicode.pf2" +fi -# (0) Parabola GNU/Linux-libre -menuentry "Parabola GNU/Linux-libre" { -set root=(hd0,1) -linux /vmlinuz26 root=/dev/sda1 ro -initrd /kernel26.img +if loadfont $font ; then + set gfxmode=auto + load_video + insmod gfxterm + set locale_dir=$prefix/locale + set lang=en_US + insmod gettext +fi +terminal_input console +terminal_output gfxterm +set timeout=5 +### END /etc/grub.d/00_header ### + +### BEGIN /etc/grub.d/10_linux ### +menuentry 'Parabola GNU/Linux-libre, with Linux libre' --class parabolagnu/linux-libre --class gnu-linux --class gnu --class os { + load_video + set gfxpayload=keep + insmod gzio + insmod part_gpt + insmod ext2 + set root='hd0,gpt3' + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root --hint-bios=hd0,gpt3 --hint-efi=hd0,gpt3 --hint-baremetal=ahci0,gpt3 2ccd62fe-2204-44e8-bcfd-ce33996f9852 + else + search --no-floppy --fs-uuid --set=root 2ccd62fe-2204-44e8-bcfd-ce33996f9852 + fi + echo 'Loading Linux libre ...' + linux /vmlinuz-linux-libre root=/dev/disk/by-uuid/0cc6e472-7f98-42ff-b7f3-309b641377ad ro quiet + echo 'Loading initial ramdisk ...' + initrd /initramfs-linux-libre.img } +menuentry 'Parabola GNU/Linux-libre, with Linux libre Fallback' --class parabolagnu/linux-libre --class gnu-linux --class gnu --class os { + load_video + set gfxpayload=keep + insmod gzio + insmod part_gpt + insmod ext2 + set root='hd0,gpt3' + if [ x$feature_platform_search_hint = xy ]; then + search --no-floppy --fs-uuid --set=root --hint-bios=hd0,gpt3 --hint-efi=hd0,gpt3 --hint-baremetal=ahci0,gpt3 2ccd62fe-2204-44e8-bcfd-ce33996f9852 + else + search --no-floppy --fs-uuid --set=root 2ccd62fe-2204-44e8-bcfd-ce33996f9852 + fi + echo 'Loading Linux libre ...' + linux /vmlinuz-linux-libre root=/dev/disk/by-uuid/0cc6e472-7f98-42ff-b7f3-309b641377ad ro quiet + echo 'Loading initial ramdisk ...' + initrd /initramfs-linux-libre-fallback.img +} +### END /etc/grub.d/10_linux ### + +### BEGIN /etc/grub.d/20_linux_xen ### +### END /etc/grub.d/20_linux_xen ### + +### BEGIN /etc/grub.d/20_memtest86+ ### +### END /etc/grub.d/20_memtest86+ ### + +### BEGIN /etc/grub.d/30_os-prober ### +### END /etc/grub.d/30_os-prober ### + +### BEGIN /etc/grub.d/40_custom ### +# This file provides an easy way to add custom menu entries. Simply type the +# menu entries you want to add after this comment. Be careful not to change +# the 'exec tail' line above. +### END /etc/grub.d/40_custom ### +### BEGIN /etc/grub.d/41_custom ### +if [ -f $prefix/custom.cfg ]; then + source $prefix/custom.cfg; +fi +### END /etc/grub.d/41_custom ### diff --git a/libre/grub2/grub.default b/libre/grub2/grub.default index fecc09af6..4ab37bbfc 100644 --- a/libre/grub2/grub.default +++ b/libre/grub2/grub.default @@ -1,10 +1,7 @@ -# If you change this file, run 'update-grub' afterwards to update -# /boot/grub/grub.cfg. - GRUB_DEFAULT=0 GRUB_TIMEOUT=5 GRUB_DISTRIBUTOR="Parabola GNU/Linux-libre" -GRUB_CMDLINE_LINUX_DEFAULT="quiet" +GRUB_CMDLINE_LINUX_DEFAULT="quiet add_efi_memmap" GRUB_CMDLINE_LINUX="" # Preload both GPT and MBR modules so that they are not missed @@ -37,8 +34,8 @@ GRUB_DISABLE_RECOVERY=true # Uncomment and set to the desired menu colors. Used by normal and wallpaper # modes only. Entries specified as foreground/background. -GRUB_COLOR_NORMAL="light-blue/black" -GRUB_COLOR_HIGHLIGHT="light-cyan/blue" +#GRUB_COLOR_NORMAL="light-blue/black" +#GRUB_COLOR_HIGHLIGHT="light-cyan/blue" # Uncomment one of them for the gfx desired, a image background or a gfxtheme #GRUB_BACKGROUND="/path/to/wallpaper" diff --git a/libre/grub2/grub2.install b/libre/grub2/grub2.install index 9baf14776..000533553 100644 --- a/libre/grub2/grub2.install +++ b/libre/grub2/grub2.install @@ -7,7 +7,11 @@ post_install() { install -Dm644 /boot/grub/grub.cfg.pacsave /boot/grub/grub.cfg fi - echo -n "Generating grub.cfg.example config file... " + cat << 'EOM' +Generating grub.cfg.example config file... +This may fail on some machines running a custom kernel. +EOM + grub-mkconfig -o /boot/grub/grub.cfg.example 2> /dev/null echo "done." diff --git a/libre/grub2/grub2_automake_1.11.2_pkglib_to_pkgdata.patch b/libre/grub2/grub2_automake_1.11.2_pkglib_to_pkgdata.patch new file mode 100644 index 000000000..0e396b210 --- /dev/null +++ b/libre/grub2/grub2_automake_1.11.2_pkglib_to_pkgdata.patch @@ -0,0 +1,134 @@ +diff --git a/ChangeLog_Keshav b/ChangeLog_Keshav +new file mode 100644 +index 0000000..0eafd65 +--- /dev/null ++++ b/ChangeLog_Keshav +@@ -0,0 +1,12 @@ ++2012-01-04 Keshav P R <the.ridikulus.rat@gmail.com> ++ ++ Fixes for automake 1.11.2 ++ ++ * conf/Makefile.common: Change pkglib_SCRIPTS to pkgdata_SCRIPTS. ++ * conf/Makefile.common: Change pkglib_DATA to pkgdata_DATA. ++ * Makefile.am: Likewise. ++ * gentpl.py: Likewise. ++ * util/grub-mkstandalone.in: Likewise. ++ * util/grub-mknetdir.in: Likewise. ++ * util/grub-mkrescue.in: Likewise. ++ * util/grub-mkstandalone.in: Likewise. +diff --git a/Makefile.am b/Makefile.am +index c5f486e..395b0dd 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -101,8 +101,8 @@ CLEANFILES += widthspec.h + # Install config.h into platformdir + platform_HEADERS = config.h + +-pkglib_DATA += grub-mkconfig_lib +-pkglib_DATA += update-grub_lib ++pkgdata_DATA += grub-mkconfig_lib ++pkgdata_DATA += update-grub_lib + + + if COND_i386_coreboot +diff --git a/conf/Makefile.common b/conf/Makefile.common +index 751188b..bbd59cc 100644 +--- a/conf/Makefile.common ++++ b/conf/Makefile.common +@@ -137,7 +137,7 @@ KERNEL_HEADER_FILES = + + man_MANS = + noinst_DATA = +-pkglib_DATA = ++pkgdata_DATA = + bin_SCRIPTS = + sbin_SCRIPTS = + bin_PROGRAMS = +@@ -147,7 +147,7 @@ check_SCRIPTS = + grubconf_DATA = + check_PROGRAMS = + noinst_SCRIPTS = +-pkglib_SCRIPTS = ++pkgdata_SCRIPTS = + noinst_PROGRAMS = + grubconf_SCRIPTS = + noinst_LIBRARIES = +diff --git a/gentpl.py b/gentpl.py +index 3008b80..a935f4d 100644 +--- a/gentpl.py ++++ b/gentpl.py +@@ -512,7 +512,7 @@ def script(platform): + r += "[+ ENDIF +]" + + r += rule("[+ name +]", platform_sources(platform) + " $(top_builddir)/config.status", """ +-$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkglib_DATA@,$(pkglib_DATA),g' > $@ ++$(top_builddir)/config.status --file=-:$< | sed -e 's,@pkgdata_DATA@,$(pkgdata_DATA),g' > $@ + chmod a+x [+ name +] + """) + +diff --git a/util/grub-mknetdir.in b/util/grub-mknetdir.in +index e5a2172..7f6a36d 100644 +--- a/util/grub-mknetdir.in ++++ b/util/grub-mknetdir.in +@@ -30,7 +30,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@ + host_os=@host_os@ + localedir=@datadir@/locale + datarootdir=@datarootdir@ +-pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" ++pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" + + self=`basename $0` + +@@ -183,7 +183,7 @@ process_input_dir () + cp -f "$file" "$grubdir/" + fi + done +- for file in ${pkglib_DATA}; do ++ for file in ${pkgdata_DATA}; do + if test -f "${input_dir}/${file}"; then + cp -f "${input_dir}/${file}" "$grubdir/" + fi +diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in +index eff7708..f6b96d4 100644 +--- a/util/grub-mkrescue.in ++++ b/util/grub-mkrescue.in +@@ -27,7 +27,7 @@ libdir=@libdir@ + PACKAGE_NAME=@PACKAGE_NAME@ + PACKAGE_TARNAME=@PACKAGE_TARNAME@ + PACKAGE_VERSION=@PACKAGE_VERSION@ +-pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" ++pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" + + self=`basename $0` + +@@ -163,7 +163,7 @@ process_input_dir () + cp -f "$file" ${iso9660_dir}/boot/grub/${platform}/ + fi + done +- for file in ${pkglib_DATA}; do ++ for file in ${pkgdata_DATA}; do + if test -f "${input_dir}/${file}"; then + cp -f "${input_dir}/${file}" ${iso9660_dir}/boot/grub/${platform}/ + fi +diff --git a/util/grub-mkstandalone.in b/util/grub-mkstandalone.in +index b0dbf9b..92b7306 100644 +--- a/util/grub-mkstandalone.in ++++ b/util/grub-mkstandalone.in +@@ -27,7 +27,7 @@ libdir=@libdir@ + PACKAGE_NAME=@PACKAGE_NAME@ + PACKAGE_TARNAME=@PACKAGE_TARNAME@ + PACKAGE_VERSION=@PACKAGE_VERSION@ +-pkglib_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" ++pkgdata_DATA="moddep.lst command.lst fs.lst partmap.lst parttool.lst handler.lst video.lst crypto.lst terminal.lst" + + self=`basename $0` + +@@ -163,7 +163,7 @@ for file in "${source_directory}/"*.mod "${source_directory}/"efiemu32.o "${sour + fi + done + +-for file in ${pkglib_DATA}; do ++for file in ${pkgdata_DATA}; do + if test -f "${source_directory}/${file}"; then + cp -f "${source_directory}/${file}" "${memdisk_dir}"/boot/grub/ + fi diff --git a/libre/grub2/grub2_bzr_export.sh b/libre/grub2/grub2_bzr_export.sh index 7c42d0c28..f40588f82 100644 --- a/libre/grub2/grub2_bzr_export.sh +++ b/libre/grub2/grub2_bzr_export.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ## For actual repos @@ -9,65 +9,67 @@ ## For launchpad mirror -# bzr branch lp:~skodabenz/grub/grub2-extras-lua lua -# bzr branch lp:~skodabenz/grub/grub2-extras-gpxe gpxe -# bzr branch lp:~skodabenz/grub/grub2-extras-ntldr-img ntldr-img -# bzr branch lp:~skodabenz/grub/grub2-extras-915resolution 915resolution +# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-lua lua +# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-gpxe gpxe +# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-ntldr-img ntldr-img +# bzr branch lp:~the-ridikulus-rat/grub/grub2-extras-915resolution 915resolution ## grub-extras zfs is integrated into grub2 bzr main repo and is no longer needed separately. -wd=${PWD}/ -output_dir=${wd}/ +_WD="${PWD}/" +_OUTPUT_DIR="${_WD}/" -grub2_bzr_dir=${wd}/grub2_BZR/ -grub2_bzr_exp_dir=${wd}/grub2_experimental_BZR/ -grub2_extras_dir=${wd}/grub2_extras_BZR/ +_ACTUAL_PKGVER="1.99" -main_snapshot() { +_GRUB2_BZR_REPO_DIR="${_WD}/grub2_BZR/" +_GRUB2_BZR_EXP_REPO_DIR="${_WD}/grub2_experimental_BZR/" +_GRUB2_EXTRAS_REPOS_DIR="${_WD}/grub2_extras_BZR/" + +_MAIN_SNAPSHOT() { - cd ${grub2_bzr_dir}/ + cd "${_GRUB2_BZR_REPO_DIR}/" echo - revnum=$(bzr revno ${grub2_bzr_dir}) - bzr export --root=grub2 --format=tar ${output_dir}/grub2_r${revnum}.tar + _REVNUM="$(bzr revno ${_GRUB2_BZR_REPO_DIR})" + bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub2_r${_REVNUM}.tar" echo - cd ${output_dir}/ + cd "${_OUTPUT_DIR}/" - xz -9 ${output_dir}/grub2_r${revnum}.tar + xz -9 "${_OUTPUT_DIR}/grub2_r${_REVNUM}.tar" echo } -exp_snapshot() { +_EXP_SNAPSHOT() { - cd ${grub2_bzr_exp_dir}/ + cd "${_GRUB2_BZR_EXP_REPO_DIR}/" echo - revnum=$(bzr revno ${grub2_bzr_exp_dir}) - bzr export --root=grub2_exp --format=tar ${output_dir}/grub2_exp_r${revnum}.tar + _REVNUM="$(bzr revno ${_GRUB2_BZR_EXP_REPO_DIR})" + bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub2_exp_r${_REVNUM}.tar" echo - cd ${output_dir}/ + cd "${_OUTPUT_DIR}/" - xz -9 ${output_dir}/grub2_exp_r${revnum}.tar + xz -9 "${_OUTPUT_DIR}/grub2_exp_r${_REVNUM}.tar" echo } -extras_snapshot() { +_EXTRAS_SNAPSHOT() { - cd ${grub2_extras_dir}/${grub2_extras_name}/ + cd "${_GRUB2_EXTRAS_REPOS_DIR}/${_GRUB2_EXTRAS_NAME}/" echo - revnum=$(bzr revno ${grub2_extras_dir}/${grub2_extras_name}) - bzr export --root=${grub2_extras_name} --format=tar ${output_dir}/grub2_extras_${grub2_extras_name}_r${revnum}.tar + _REVNUM="$(bzr revno ${_GRUB2_EXTRAS_REPOS_DIR}/${_GRUB2_EXTRAS_NAME})" + bzr export --root="${_GRUB2_EXTRAS_NAME}" --format=tar "${_OUTPUT_DIR}/grub2_extras_${_GRUB2_EXTRAS_NAME}_r${_REVNUM}.tar" echo - cd ${output_dir}/ + cd "${_OUTPUT_DIR}/" echo - xz -9 ${output_dir}/grub2_extras_${grub2_extras_name}_r${revnum}.tar + xz -9 "${_OUTPUT_DIR}/grub2_extras_${_GRUB2_EXTRAS_NAME}_r${_REVNUM}.tar" echo } @@ -76,28 +78,36 @@ echo set -x -e -# main_snapshot +echo -# exp_snapshot +_MAIN_SNAPSHOT -grub2_extras_name="lua" -extras_snapshot +echo -grub2_extras_name="gpxe" -extras_snapshot +# _EXP_SNAPSHOT + +echo -grub2_extras_name="ntldr-img" -extras_snapshot +_GRUB2_EXTRAS_NAME="lua" +_EXTRAS_SNAPSHOT -grub2_extras_name="915resolution" -extras_snapshot +_GRUB2_EXTRAS_NAME="gpxe" +_EXTRAS_SNAPSHOT + +_GRUB2_EXTRAS_NAME="ntldr-img" +_EXTRAS_SNAPSHOT + +_GRUB2_EXTRAS_NAME="915resolution" +_EXTRAS_SNAPSHOT + +echo set +x +e echo -unset wd -unset output_dir -unset grub2_bzr_dir -unset grub2_extras_dir -unset grub2_extras_name +unset _WD +unset _OUTPUT_DIR +unset _GRUB2_BZR_REPO_DIR +unset _GRUB2_EXTRAS_REPOS_DIR +unset _GRUB2_EXTRAS_NAME diff --git a/libre/grub2/grub_extras_lua_args_fix.patch b/libre/grub2/grub_extras_lua_args_fix.patch new file mode 100644 index 000000000..5cb317ce3 --- /dev/null +++ b/libre/grub2/grub_extras_lua_args_fix.patch @@ -0,0 +1,13 @@ +diff --git a/grub-extras/lua/grub_lib.c b/grub-extras/lua/grub_lib.c +index 9014320..055d620 100644 +--- a/grub-extras/lua/grub_lib.c ++++ b/grub-extras/lua/grub_lib.c +@@ -466,7 +466,7 @@ grub_lua_add_menu (lua_State *state) + if (! p) + return push_result (state); + +- grub_normal_add_menu_entry (n, args, NULL, NULL, NULL, NULL, p, 0); ++ grub_normal_add_menu_entry (n, args, NULL, NULL, NULL, NULL, NULL, p, 0); + } + else + { diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD index d8e8b0db1..21e0f4cec 100644 --- a/libre/thunderbird-libre/PKGBUILD +++ b/libre/thunderbird-libre/PKGBUILD @@ -3,10 +3,10 @@ # Contributor: Alexander Baldeck <alexander@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Anders Bostrom <anders.bostrom@home.se> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> pkgname=thunderbird-libre -pkgver=11.0 +pkgver=11.0.1 pkgrel=1 pkgdesc="Standalone Mail/News reader" arch=('i686' 'x86_64') @@ -26,7 +26,7 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/sourc channel-prefs.js vendor.js libvpx.patch) -md5sums=('1d7127a3282e62d95eb9b59d47291b70' +md5sums=('b500560a006cb10194281263c78841f2' 'ca98c2bf1017b33e19dae22fdcef2e73' 'af3e5b344d2edf1c7d61bb0a5a96de9a' 'aea906acf72c43dd82ead2fabcc1c6db' diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD index adb5fbe05..b6ae4e2ea 100644 --- a/multilib-testing/gcc-multilib/PKGBUILD +++ b/multilib-testing/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68430 2012-03-24 13:40:21Z heftig $ +# $Id: PKGBUILD 68618 2012-03-29 21:59:22Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -8,8 +8,8 @@ pkgbase='gcc-multilib' pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') pkgver=4.7.0 -pkgrel=2 -#_snapshot=4.6-20120120 +pkgrel=3 +_snapshot=4.7-20120324 _libstdcppmanver=20120307 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection for multilib" arch=('x86_64') @@ -19,16 +19,17 @@ makedepends=('binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib' 'lib32-glibc>=2.14') checkdepends=('dejagnu') options=('!libtool' '!emptydirs') -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++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64-multilib.patch gcc-4.7.0-cloog-0.17.patch) -md5sums=('2a0f1d99fda235c29d40b561f81d9a77' +md5sums=('947f9a70dcbb4baaf20b1e95b518048e' '489d2f5311535800a120efd8d18db719' 'ec24c32d3d1030c2bc8cb2ad2d1dc629' '575f7d17b022e609447a590e481b18b5') + if [ -n "${_snapshot}" ]; then _basedir="${srcdir}/gcc-${_snapshot}" else diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD index e6298fdc0..a821c9be6 100644 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ b/multilib-testing/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68428 2012-03-24 13:21:15Z heftig $ +# $Id: PKGBUILD 68617 2012-03-29 21:43:51Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> @@ -9,7 +9,7 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.15 -pkgrel=8 +pkgrel=10 _glibcdate=20111227 pkgdesc="GNU C Library for multilib" arch=('x86_64') @@ -47,11 +47,12 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda glibc-2.15-non-signalling-comparisons.patch glibc-2.15-rintf-rounding.patch glibc-2.15-nearbyintf-rounding.patch + glibc-2.15-confstr-local-buffer-extent.patch lib32-glibc.conf) md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '7ef69c530a15106de93e4de2df2d393e' 'b6c619e5cf91829a15ce34dccef676d5' - '40cd342e21f71f5e49e32622b25acc52' + 'addfddd648a4bf832eb126aba944ebae' 'e60e33591c9ec1447e4cddadcbb9cf3a' '6970bcfeb3bf88913436d5112d16f588' 'c5de2a946215d647c8af5432ec4b0da0' @@ -77,6 +78,7 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' 'c483504cf404ed0b44480af627813a97' '1419d61fd1dbc6cdc48bb59da86fa66f' '7ff501435078b1a2622124fbeaafc921' + '8d1023a51e0932681b46440d5f8551ee' '6e052f1cb693d5d3203f50f9d4e8c33b') build() { @@ -89,8 +91,7 @@ build() { patch -p1 -i ${srcdir}/glibc-2.15-do-not-install-timezone-files-2.patch # undefine __i686 - # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html - # fix in http://sourceware.org/git/?p=glibc.git;a=commit;h=d4a54ac6 requires additional backporting... + # http://sourceware.org/glibc/wiki/Release/2.15#Build_Failures patch -p1 -i ${srcdir}/glibc-__i686.patch # http://www.exploit-db.com/exploits/15274/ @@ -195,6 +196,11 @@ build() { # http://sourceware.org/git/?p=glibc.git;a=commit;h=6cbeae47 patch -p1 -i ${srcdir}/glibc-2.15-nearbyintf-rounding.patch + # fix varaible scope issue in confstr + # http://sourceware.org/git/?p=glibc.git;a=commit;h=ac4c54f0 + # http://sourceware.org/git/?p=glibc.git;a=commit;h=d6a403f9 + patch -p1 -i ${srcdir}/glibc-2.15-confstr-local-buffer-extent.patch + cd ${srcdir} mkdir glibc-build cd glibc-build @@ -202,6 +208,7 @@ build() { export CC="gcc -m32" # Hack to fix NPTL issues with Xen, only required on 32bit platforms + # TODO: make separate glibc-xen package for i686 export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" echo "slibdir=/usr/lib32" >> configparms diff --git a/multilib-testing/lib32-glibc/glibc-2.15-confstr-local-buffer-extent.patch b/multilib-testing/lib32-glibc/glibc-2.15-confstr-local-buffer-extent.patch new file mode 100644 index 000000000..483b28532 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.15-confstr-local-buffer-extent.patch @@ -0,0 +1,297 @@ +diff --git a/posix/confstr.c b/posix/confstr.c +index 3c9566d..cad6561 100644 +--- a/posix/confstr.c ++++ b/posix/confstr.c +@@ -35,6 +34,10 @@ confstr (name, buf, len) + const char *string = ""; + size_t string_len = 1; + ++ /* Note that this buffer must be large enough for the longest strings ++ used below. */ ++ char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"]; ++ + switch (name) + { + case _CS_PATH: +@@ -53,59 +56,55 @@ confstr (name, buf, len) + wint_t types are no greater than the width of type long. + + Currently this means all environment which the system allows. */ +- { +- char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"]; +- +- string_len = 0; ++ string_len = 0; + #ifndef _POSIX_V7_ILP32_OFF32 +- if (__sysconf (_SC_V7_ILP32_OFF32) > 0) ++ if (__sysconf (_SC_V7_ILP32_OFF32) > 0) + #endif + #if !defined _POSIX_V7_ILP32_OFF32 || _POSIX_V7_ILP32_OFF32 > 0 +- { +- memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32", +- sizeof "POSIX_V7_ILP32_OFF32" - 1); +- string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1; +- } ++ { ++ memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32", ++ sizeof "POSIX_V7_ILP32_OFF32" - 1); ++ string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1; ++ } + #endif + #ifndef _POSIX_V7_ILP32_OFFBIG +- if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0) ++ if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0) + #endif + #if !defined _POSIX_V7_ILP32_OFFBIG || _POSIX_V7_ILP32_OFFBIG > 0 +- { +- if (string_len) +- restenvs[string_len++] = '\n'; +- memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG", +- sizeof "POSIX_V7_ILP32_OFFBIG" - 1); +- string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1; +- } ++ { ++ if (string_len) ++ restenvs[string_len++] = '\n'; ++ memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG", ++ sizeof "POSIX_V7_ILP32_OFFBIG" - 1); ++ string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1; ++ } + #endif + #ifndef _POSIX_V7_LP64_OFF64 +- if (__sysconf (_SC_V7_LP64_OFF64) > 0) ++ if (__sysconf (_SC_V7_LP64_OFF64) > 0) + #endif + #if !defined _POSIX_V7_LP64_OFF64 || _POSIX_V7_LP64_OFF64 > 0 +- { +- if (string_len) +- restenvs[string_len++] = '\n'; +- memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64", +- sizeof "POSIX_V7_LP64_OFF64" - 1); +- string_len += sizeof "POSIX_V7_LP64_OFF64" - 1; +- } ++ { ++ if (string_len) ++ restenvs[string_len++] = '\n'; ++ memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64", ++ sizeof "POSIX_V7_LP64_OFF64" - 1); ++ string_len += sizeof "POSIX_V7_LP64_OFF64" - 1; ++ } + #endif + #ifndef _POSIX_V7_LPBIG_OFFBIG +- if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0) ++ if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0) + #endif + #if !defined _POSIX_V7_LPBIG_OFFBIG || _POSIX_V7_LPBIG_OFFBIG > 0 +- { +- if (string_len) +- restenvs[string_len++] = '\n'; +- memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG", +- sizeof "POSIX_V7_LPBIG_OFFBIG" - 1); +- string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1; +- } +-#endif +- restenvs[string_len++] = '\0'; +- string = restenvs; +- } ++ { ++ if (string_len) ++ restenvs[string_len++] = '\n'; ++ memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG", ++ sizeof "POSIX_V7_LPBIG_OFFBIG" - 1); ++ string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1; ++ } ++#endif ++ restenvs[string_len++] = '\0'; ++ string = restenvs; + break; + + case _CS_V6_WIDTH_RESTRICTED_ENVS: +@@ -116,59 +115,55 @@ confstr (name, buf, len) + wint_t types are no greater than the width of type long. + + Currently this means all environment which the system allows. */ +- { +- char restenvs[4 * sizeof "POSIX_V6_LPBIG_OFFBIG"]; +- +- string_len = 0; ++ string_len = 0; + #ifndef _POSIX_V6_ILP32_OFF32 +- if (__sysconf (_SC_V6_ILP32_OFF32) > 0) ++ if (__sysconf (_SC_V6_ILP32_OFF32) > 0) + #endif + #if !defined _POSIX_V6_ILP32_OFF32 || _POSIX_V6_ILP32_OFF32 > 0 +- { +- memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32", +- sizeof "POSIX_V6_ILP32_OFF32" - 1); +- string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1; +- } ++ { ++ memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32", ++ sizeof "POSIX_V6_ILP32_OFF32" - 1); ++ string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1; ++ } + #endif + #ifndef _POSIX_V6_ILP32_OFFBIG +- if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0) ++ if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0) + #endif + #if !defined _POSIX_V6_ILP32_OFFBIG || _POSIX_V6_ILP32_OFFBIG > 0 +- { +- if (string_len) +- restenvs[string_len++] = '\n'; +- memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG", +- sizeof "POSIX_V6_ILP32_OFFBIG" - 1); +- string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1; +- } ++ { ++ if (string_len) ++ restenvs[string_len++] = '\n'; ++ memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG", ++ sizeof "POSIX_V6_ILP32_OFFBIG" - 1); ++ string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1; ++ } + #endif + #ifndef _POSIX_V6_LP64_OFF64 +- if (__sysconf (_SC_V6_LP64_OFF64) > 0) ++ if (__sysconf (_SC_V6_LP64_OFF64) > 0) + #endif + #if !defined _POSIX_V6_LP64_OFF64 || _POSIX_V6_LP64_OFF64 > 0 +- { +- if (string_len) +- restenvs[string_len++] = '\n'; +- memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64", +- sizeof "POSIX_V6_LP64_OFF64" - 1); +- string_len += sizeof "POSIX_V6_LP64_OFF64" - 1; +- } ++ { ++ if (string_len) ++ restenvs[string_len++] = '\n'; ++ memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64", ++ sizeof "POSIX_V6_LP64_OFF64" - 1); ++ string_len += sizeof "POSIX_V6_LP64_OFF64" - 1; ++ } + #endif + #ifndef _POSIX_V6_LPBIG_OFFBIG +- if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0) ++ if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0) + #endif + #if !defined _POSIX_V6_LPBIG_OFFBIG || _POSIX_V6_LPBIG_OFFBIG > 0 +- { +- if (string_len) +- restenvs[string_len++] = '\n'; +- memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG", +- sizeof "POSIX_V6_LPBIG_OFFBIG" - 1); +- string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1; +- } +-#endif +- restenvs[string_len++] = '\0'; +- string = restenvs; +- } ++ { ++ if (string_len) ++ restenvs[string_len++] = '\n'; ++ memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG", ++ sizeof "POSIX_V6_LPBIG_OFFBIG" - 1); ++ string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1; ++ } ++#endif ++ restenvs[string_len++] = '\0'; ++ string = restenvs; + break; + + case _CS_V5_WIDTH_RESTRICTED_ENVS: +@@ -179,59 +174,55 @@ confstr (name, buf, len) + wint_t types are no greater than the width of type long. + + Currently this means all environment which the system allows. */ +- { +- char restenvs[4 * sizeof "XBS5_LPBIG_OFFBIG"]; +- +- string_len = 0; ++ string_len = 0; + #ifndef _XBS5_ILP32_OFF32 +- if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0) ++ if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0) + #endif + #if !defined _XBS5_ILP32_OFF32 || _XBS5_ILP32_OFF32 > 0 +- { +- memcpy (restenvs + string_len, "XBS5_ILP32_OFF32", +- sizeof "XBS5_ILP32_OFF32" - 1); +- string_len += sizeof "XBS5_ILP32_OFF32" - 1; +- } ++ { ++ memcpy (restenvs + string_len, "XBS5_ILP32_OFF32", ++ sizeof "XBS5_ILP32_OFF32" - 1); ++ string_len += sizeof "XBS5_ILP32_OFF32" - 1; ++ } + #endif + #ifndef _XBS5_ILP32_OFFBIG +- if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0) ++ if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0) + #endif + #if !defined _XBS5_ILP32_OFFBIG || _XBS5_ILP32_OFFBIG > 0 +- { +- if (string_len) +- restenvs[string_len++] = '\n'; +- memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG", +- sizeof "XBS5_ILP32_OFFBIG" - 1); +- string_len += sizeof "XBS5_ILP32_OFFBIG" - 1; +- } ++ { ++ if (string_len) ++ restenvs[string_len++] = '\n'; ++ memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG", ++ sizeof "XBS5_ILP32_OFFBIG" - 1); ++ string_len += sizeof "XBS5_ILP32_OFFBIG" - 1; ++ } + #endif + #ifndef _XBS5_LP64_OFF64 +- if (__sysconf (_SC_XBS5_LP64_OFF64) > 0) ++ if (__sysconf (_SC_XBS5_LP64_OFF64) > 0) + #endif + #if !defined _XBS5_LP64_OFF64 || _XBS5_LP64_OFF64 > 0 +- { +- if (string_len) +- restenvs[string_len++] = '\n'; +- memcpy (restenvs + string_len, "XBS5_LP64_OFF64", +- sizeof "XBS5_LP64_OFF64" - 1); +- string_len += sizeof "XBS5_LP64_OFF64" - 1; +- } ++ { ++ if (string_len) ++ restenvs[string_len++] = '\n'; ++ memcpy (restenvs + string_len, "XBS5_LP64_OFF64", ++ sizeof "XBS5_LP64_OFF64" - 1); ++ string_len += sizeof "XBS5_LP64_OFF64" - 1; ++ } + #endif + #ifndef _XBS5_LPBIG_OFFBIG +- if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0) ++ if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0) + #endif + #if !defined _XBS5_LPBIG_OFFBIG || _XBS5_LPBIG_OFFBIG > 0 +- { +- if (string_len) +- restenvs[string_len++] = '\n'; +- memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG", +- sizeof "XBS5_LPBIG_OFFBIG" - 1); +- string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1; +- } +-#endif +- restenvs[string_len++] = '\0'; +- string = restenvs; +- } ++ { ++ if (string_len) ++ restenvs[string_len++] = '\n'; ++ memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG", ++ sizeof "XBS5_LPBIG_OFFBIG" - 1); ++ string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1; ++ } ++#endif ++ restenvs[string_len++] = '\0'; ++ string = restenvs; + break; + + case _CS_XBS5_ILP32_OFF32_CFLAGS: diff --git a/multilib-testing/lib32-glibc/glibc-__i686.patch b/multilib-testing/lib32-glibc/glibc-__i686.patch index 28d5dd424..16f84c536 100644 --- a/multilib-testing/lib32-glibc/glibc-__i686.patch +++ b/multilib-testing/lib32-glibc/glibc-__i686.patch @@ -1,13 +1,31 @@ -diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile ---- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 -+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 -@@ -1,6 +1,7 @@ - # The mpn functions need a #define for asm syntax flavor. --# Every i386 port in use uses gas syntax (I think). --asm-CPPFLAGS += -DGAS_SYNTAX -+# Every i386 port in use uses gas syntax (I think). Don't replace -+# __i686 in __i686.get_pc_thunk.bx. -+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 - - # The i386 `long double' is a distinct type we support. - long-double-fcts = yes +diff --git a/nptl/sysdeps/pthread/pt-initfini.c b/nptl/sysdeps/pthread/pt-initfini.c +index 9c00dc0..f5d4df8 100644 +--- a/nptl/sysdeps/pthread/pt-initfini.c ++++ b/nptl/sysdeps/pthread/pt-initfini.c +@@ -45,6 +45,11 @@ + /* Embed an #include to pull in the alignment and .end directives. */ + asm ("\n#include \"defs.h\""); + ++asm ("\n#if defined __i686 && defined __ASSEMBLER__"); ++asm ("\n#undef __i686"); ++asm ("\n#define __i686 __i686"); ++asm ("\n#endif"); ++ + /* The initial common code ends here. */ + asm ("\n/*@HEADER_ENDS*/"); + +diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h +index 64ef400..726b1df 100644 +--- a/sysdeps/unix/sysv/linux/i386/sysdep.h ++++ b/sysdeps/unix/sysv/linux/i386/sysdep.h +@@ -29,6 +29,10 @@ + #include <dl-sysdep.h> + #include <tls.h> + ++#if defined __i686 && defined __ASSEMBLER__ ++#undef __i686 ++#define __i686 __i686 ++#endif + + /* For Linux we can use the system call table in the header file + /usr/include/asm/unistd.h diff --git a/multilib/lib32-qt/PKGBUILD b/multilib/lib32-qt/PKGBUILD index 7292935ba..cd562cdaf 100644 --- a/multilib/lib32-qt/PKGBUILD +++ b/multilib/lib32-qt/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 66706 2012-02-27 17:24:47Z bluewind $ +# $Id: PKGBUILD 68612 2012-03-29 15:13:50Z bluewind $ # Maintainer: Florian Pritz <flo@xssn.at> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> _pkgbasename=qt pkgname=lib32-$_pkgbasename -pkgver=4.8.0 -pkgrel=2 +pkgver=4.8.1 +pkgrel=1 pkgdesc='A cross-platform application and UI framework (32-bit)' arch=('x86_64') url='http://qt-project.org/' @@ -20,7 +20,7 @@ makedepends=(cups gcc-multilib lib32-{mesa,libcups,libxfixes,gtk2}) options=('!libtool') _pkgfqn="${_pkgbasename}-everywhere-opensource-src-${pkgver}" source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz") -md5sums=('e8a5fdbeba2927c948d9f477a6abe904') +md5sums=('7960ba8e18ca31f0c6e4895a312f92ff') build() { cd $srcdir/$_pkgfqn diff --git a/testing/dhcpcd/PKGBUILD b/testing/dhcpcd/PKGBUILD index c6fa89171..1966156df 100644 --- a/testing/dhcpcd/PKGBUILD +++ b/testing/dhcpcd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 154120 2012-03-23 16:23:31Z ronald $ +# $Id: PKGBUILD 154512 2012-03-29 18:07:25Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Killian <tom.archlinux.org> # Contributor: Judd Vinet <jvinet.zeroflux.org> pkgname=dhcpcd -pkgver=5.5.5 +pkgver=5.5.6 pkgrel=1 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/dhcpcd/" @@ -16,16 +16,12 @@ backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ 'dhcpcd.conf.d') -sha1sums=('1856ad1535f2c7551cefcb492af24d345c6a1b50' +sha1sums=('7f9ca207bce051252c0acb6a6cae3de22babcb20' 'b67b9ce6a2faaca75fea356966a16be2283b7db0') build() { cd ${srcdir}/${pkgname}-${pkgver} - # remove net-tools dep (upstream now) -# patch -Np1 -i ${srcdir}/0001-Set-hostname-via-proc-if-file-is-available.patch -# patch -Np1 -i ${srcdir}/0001-set-MTU-via-sysfs-if-file-is-available.patch - # configure variables ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \ --rundir=/run diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD index 58cfee44d..fc8d037f5 100644 --- a/testing/glibc/PKGBUILD +++ b/testing/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 154260 2012-03-25 02:50:05Z allan $ +# $Id: PKGBUILD 154485 2012-03-29 05:49:49Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.15 -pkgrel=9 +pkgrel=10 _glibcdate=20111227 pkgdesc="GNU C Library" arch=('i686' 'x86_64') @@ -49,14 +49,14 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-2.15-non-signalling-comparisons.patch glibc-2.15-rintf-rounding.patch glibc-2.15-nearbyintf-rounding.patch - glibc-2.15-confstr-strdup.patch + glibc-2.15-confstr-local-buffer-extent.patch nscd locale.gen.txt locale-gen) md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '7ef69c530a15106de93e4de2df2d393e' 'b6c619e5cf91829a15ce34dccef676d5' - '40cd342e21f71f5e49e32622b25acc52' + 'addfddd648a4bf832eb126aba944ebae' 'e60e33591c9ec1447e4cddadcbb9cf3a' '6970bcfeb3bf88913436d5112d16f588' 'c5de2a946215d647c8af5432ec4b0da0' @@ -82,7 +82,7 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' 'c483504cf404ed0b44480af627813a97' '1419d61fd1dbc6cdc48bb59da86fa66f' '7ff501435078b1a2622124fbeaafc921' - '41f94da2f8db856b091a2d670d68eee3' + '8d1023a51e0932681b46440d5f8551ee' 'b587ee3a70c9b3713099295609afde49' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') @@ -108,8 +108,7 @@ build() { patch -p1 -i ${srcdir}/glibc-2.15-do-not-install-timezone-files-2.patch # undefine __i686 - # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html - # fix in http://sourceware.org/git/?p=glibc.git;a=commit;h=d4a54ac6 requires additional backporting... + # http://sourceware.org/glibc/wiki/Release/2.15#Build_Failures patch -p1 -i ${srcdir}/glibc-__i686.patch # http://www.exploit-db.com/exploits/15274/ @@ -214,8 +213,10 @@ build() { # http://sourceware.org/git/?p=glibc.git;a=commit;h=6cbeae47 patch -p1 -i ${srcdir}/glibc-2.15-nearbyintf-rounding.patch - # fix varaible scope issue exposed with gcc-4.7 and -O2 - patch -p1 -i ${srcdir}/glibc-2.15-confstr-strdup.patch + # fix varaible scope issue in confstr + # http://sourceware.org/git/?p=glibc.git;a=commit;h=ac4c54f0 + # http://sourceware.org/git/?p=glibc.git;a=commit;h=d6a403f9 + patch -p1 -i ${srcdir}/glibc-2.15-confstr-local-buffer-extent.patch install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf @@ -226,6 +227,7 @@ build() { if [[ ${CARCH} = "i686" ]]; then # Hack to fix NPTL issues with Xen, only required on 32bit platforms + # TODO: make separate glibc-xen package for i686 export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" fi diff --git a/testing/glibc/glibc-2.15-confstr-local-buffer-extent.patch b/testing/glibc/glibc-2.15-confstr-local-buffer-extent.patch new file mode 100644 index 000000000..483b28532 --- /dev/null +++ b/testing/glibc/glibc-2.15-confstr-local-buffer-extent.patch @@ -0,0 +1,297 @@ +diff --git a/posix/confstr.c b/posix/confstr.c +index 3c9566d..cad6561 100644 +--- a/posix/confstr.c ++++ b/posix/confstr.c +@@ -35,6 +34,10 @@ confstr (name, buf, len) + const char *string = ""; + size_t string_len = 1; + ++ /* Note that this buffer must be large enough for the longest strings ++ used below. */ ++ char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"]; ++ + switch (name) + { + case _CS_PATH: +@@ -53,59 +56,55 @@ confstr (name, buf, len) + wint_t types are no greater than the width of type long. + + Currently this means all environment which the system allows. */ +- { +- char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"]; +- +- string_len = 0; ++ string_len = 0; + #ifndef _POSIX_V7_ILP32_OFF32 +- if (__sysconf (_SC_V7_ILP32_OFF32) > 0) ++ if (__sysconf (_SC_V7_ILP32_OFF32) > 0) + #endif + #if !defined _POSIX_V7_ILP32_OFF32 || _POSIX_V7_ILP32_OFF32 > 0 +- { +- memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32", +- sizeof "POSIX_V7_ILP32_OFF32" - 1); +- string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1; +- } ++ { ++ memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32", ++ sizeof "POSIX_V7_ILP32_OFF32" - 1); ++ string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1; ++ } + #endif + #ifndef _POSIX_V7_ILP32_OFFBIG +- if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0) ++ if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0) + #endif + #if !defined _POSIX_V7_ILP32_OFFBIG || _POSIX_V7_ILP32_OFFBIG > 0 +- { +- if (string_len) +- restenvs[string_len++] = '\n'; +- memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG", +- sizeof "POSIX_V7_ILP32_OFFBIG" - 1); +- string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1; +- } ++ { ++ if (string_len) ++ restenvs[string_len++] = '\n'; ++ memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG", ++ sizeof "POSIX_V7_ILP32_OFFBIG" - 1); ++ string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1; ++ } + #endif + #ifndef _POSIX_V7_LP64_OFF64 +- if (__sysconf (_SC_V7_LP64_OFF64) > 0) ++ if (__sysconf (_SC_V7_LP64_OFF64) > 0) + #endif + #if !defined _POSIX_V7_LP64_OFF64 || _POSIX_V7_LP64_OFF64 > 0 +- { +- if (string_len) +- restenvs[string_len++] = '\n'; +- memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64", +- sizeof "POSIX_V7_LP64_OFF64" - 1); +- string_len += sizeof "POSIX_V7_LP64_OFF64" - 1; +- } ++ { ++ if (string_len) ++ restenvs[string_len++] = '\n'; ++ memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64", ++ sizeof "POSIX_V7_LP64_OFF64" - 1); ++ string_len += sizeof "POSIX_V7_LP64_OFF64" - 1; ++ } + #endif + #ifndef _POSIX_V7_LPBIG_OFFBIG +- if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0) ++ if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0) + #endif + #if !defined _POSIX_V7_LPBIG_OFFBIG || _POSIX_V7_LPBIG_OFFBIG > 0 +- { +- if (string_len) +- restenvs[string_len++] = '\n'; +- memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG", +- sizeof "POSIX_V7_LPBIG_OFFBIG" - 1); +- string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1; +- } +-#endif +- restenvs[string_len++] = '\0'; +- string = restenvs; +- } ++ { ++ if (string_len) ++ restenvs[string_len++] = '\n'; ++ memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG", ++ sizeof "POSIX_V7_LPBIG_OFFBIG" - 1); ++ string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1; ++ } ++#endif ++ restenvs[string_len++] = '\0'; ++ string = restenvs; + break; + + case _CS_V6_WIDTH_RESTRICTED_ENVS: +@@ -116,59 +115,55 @@ confstr (name, buf, len) + wint_t types are no greater than the width of type long. + + Currently this means all environment which the system allows. */ +- { +- char restenvs[4 * sizeof "POSIX_V6_LPBIG_OFFBIG"]; +- +- string_len = 0; ++ string_len = 0; + #ifndef _POSIX_V6_ILP32_OFF32 +- if (__sysconf (_SC_V6_ILP32_OFF32) > 0) ++ if (__sysconf (_SC_V6_ILP32_OFF32) > 0) + #endif + #if !defined _POSIX_V6_ILP32_OFF32 || _POSIX_V6_ILP32_OFF32 > 0 +- { +- memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32", +- sizeof "POSIX_V6_ILP32_OFF32" - 1); +- string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1; +- } ++ { ++ memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32", ++ sizeof "POSIX_V6_ILP32_OFF32" - 1); ++ string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1; ++ } + #endif + #ifndef _POSIX_V6_ILP32_OFFBIG +- if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0) ++ if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0) + #endif + #if !defined _POSIX_V6_ILP32_OFFBIG || _POSIX_V6_ILP32_OFFBIG > 0 +- { +- if (string_len) +- restenvs[string_len++] = '\n'; +- memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG", +- sizeof "POSIX_V6_ILP32_OFFBIG" - 1); +- string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1; +- } ++ { ++ if (string_len) ++ restenvs[string_len++] = '\n'; ++ memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG", ++ sizeof "POSIX_V6_ILP32_OFFBIG" - 1); ++ string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1; ++ } + #endif + #ifndef _POSIX_V6_LP64_OFF64 +- if (__sysconf (_SC_V6_LP64_OFF64) > 0) ++ if (__sysconf (_SC_V6_LP64_OFF64) > 0) + #endif + #if !defined _POSIX_V6_LP64_OFF64 || _POSIX_V6_LP64_OFF64 > 0 +- { +- if (string_len) +- restenvs[string_len++] = '\n'; +- memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64", +- sizeof "POSIX_V6_LP64_OFF64" - 1); +- string_len += sizeof "POSIX_V6_LP64_OFF64" - 1; +- } ++ { ++ if (string_len) ++ restenvs[string_len++] = '\n'; ++ memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64", ++ sizeof "POSIX_V6_LP64_OFF64" - 1); ++ string_len += sizeof "POSIX_V6_LP64_OFF64" - 1; ++ } + #endif + #ifndef _POSIX_V6_LPBIG_OFFBIG +- if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0) ++ if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0) + #endif + #if !defined _POSIX_V6_LPBIG_OFFBIG || _POSIX_V6_LPBIG_OFFBIG > 0 +- { +- if (string_len) +- restenvs[string_len++] = '\n'; +- memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG", +- sizeof "POSIX_V6_LPBIG_OFFBIG" - 1); +- string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1; +- } +-#endif +- restenvs[string_len++] = '\0'; +- string = restenvs; +- } ++ { ++ if (string_len) ++ restenvs[string_len++] = '\n'; ++ memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG", ++ sizeof "POSIX_V6_LPBIG_OFFBIG" - 1); ++ string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1; ++ } ++#endif ++ restenvs[string_len++] = '\0'; ++ string = restenvs; + break; + + case _CS_V5_WIDTH_RESTRICTED_ENVS: +@@ -179,59 +174,55 @@ confstr (name, buf, len) + wint_t types are no greater than the width of type long. + + Currently this means all environment which the system allows. */ +- { +- char restenvs[4 * sizeof "XBS5_LPBIG_OFFBIG"]; +- +- string_len = 0; ++ string_len = 0; + #ifndef _XBS5_ILP32_OFF32 +- if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0) ++ if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0) + #endif + #if !defined _XBS5_ILP32_OFF32 || _XBS5_ILP32_OFF32 > 0 +- { +- memcpy (restenvs + string_len, "XBS5_ILP32_OFF32", +- sizeof "XBS5_ILP32_OFF32" - 1); +- string_len += sizeof "XBS5_ILP32_OFF32" - 1; +- } ++ { ++ memcpy (restenvs + string_len, "XBS5_ILP32_OFF32", ++ sizeof "XBS5_ILP32_OFF32" - 1); ++ string_len += sizeof "XBS5_ILP32_OFF32" - 1; ++ } + #endif + #ifndef _XBS5_ILP32_OFFBIG +- if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0) ++ if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0) + #endif + #if !defined _XBS5_ILP32_OFFBIG || _XBS5_ILP32_OFFBIG > 0 +- { +- if (string_len) +- restenvs[string_len++] = '\n'; +- memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG", +- sizeof "XBS5_ILP32_OFFBIG" - 1); +- string_len += sizeof "XBS5_ILP32_OFFBIG" - 1; +- } ++ { ++ if (string_len) ++ restenvs[string_len++] = '\n'; ++ memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG", ++ sizeof "XBS5_ILP32_OFFBIG" - 1); ++ string_len += sizeof "XBS5_ILP32_OFFBIG" - 1; ++ } + #endif + #ifndef _XBS5_LP64_OFF64 +- if (__sysconf (_SC_XBS5_LP64_OFF64) > 0) ++ if (__sysconf (_SC_XBS5_LP64_OFF64) > 0) + #endif + #if !defined _XBS5_LP64_OFF64 || _XBS5_LP64_OFF64 > 0 +- { +- if (string_len) +- restenvs[string_len++] = '\n'; +- memcpy (restenvs + string_len, "XBS5_LP64_OFF64", +- sizeof "XBS5_LP64_OFF64" - 1); +- string_len += sizeof "XBS5_LP64_OFF64" - 1; +- } ++ { ++ if (string_len) ++ restenvs[string_len++] = '\n'; ++ memcpy (restenvs + string_len, "XBS5_LP64_OFF64", ++ sizeof "XBS5_LP64_OFF64" - 1); ++ string_len += sizeof "XBS5_LP64_OFF64" - 1; ++ } + #endif + #ifndef _XBS5_LPBIG_OFFBIG +- if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0) ++ if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0) + #endif + #if !defined _XBS5_LPBIG_OFFBIG || _XBS5_LPBIG_OFFBIG > 0 +- { +- if (string_len) +- restenvs[string_len++] = '\n'; +- memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG", +- sizeof "XBS5_LPBIG_OFFBIG" - 1); +- string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1; +- } +-#endif +- restenvs[string_len++] = '\0'; +- string = restenvs; +- } ++ { ++ if (string_len) ++ restenvs[string_len++] = '\n'; ++ memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG", ++ sizeof "XBS5_LPBIG_OFFBIG" - 1); ++ string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1; ++ } ++#endif ++ restenvs[string_len++] = '\0'; ++ string = restenvs; + break; + + case _CS_XBS5_ILP32_OFF32_CFLAGS: diff --git a/testing/glibc/glibc-__i686.patch b/testing/glibc/glibc-__i686.patch index 28d5dd424..16f84c536 100644 --- a/testing/glibc/glibc-__i686.patch +++ b/testing/glibc/glibc-__i686.patch @@ -1,13 +1,31 @@ -diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile ---- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000 -+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000 -@@ -1,6 +1,7 @@ - # The mpn functions need a #define for asm syntax flavor. --# Every i386 port in use uses gas syntax (I think). --asm-CPPFLAGS += -DGAS_SYNTAX -+# Every i386 port in use uses gas syntax (I think). Don't replace -+# __i686 in __i686.get_pc_thunk.bx. -+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686 - - # The i386 `long double' is a distinct type we support. - long-double-fcts = yes +diff --git a/nptl/sysdeps/pthread/pt-initfini.c b/nptl/sysdeps/pthread/pt-initfini.c +index 9c00dc0..f5d4df8 100644 +--- a/nptl/sysdeps/pthread/pt-initfini.c ++++ b/nptl/sysdeps/pthread/pt-initfini.c +@@ -45,6 +45,11 @@ + /* Embed an #include to pull in the alignment and .end directives. */ + asm ("\n#include \"defs.h\""); + ++asm ("\n#if defined __i686 && defined __ASSEMBLER__"); ++asm ("\n#undef __i686"); ++asm ("\n#define __i686 __i686"); ++asm ("\n#endif"); ++ + /* The initial common code ends here. */ + asm ("\n/*@HEADER_ENDS*/"); + +diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h +index 64ef400..726b1df 100644 +--- a/sysdeps/unix/sysv/linux/i386/sysdep.h ++++ b/sysdeps/unix/sysv/linux/i386/sysdep.h +@@ -29,6 +29,10 @@ + #include <dl-sysdep.h> + #include <tls.h> + ++#if defined __i686 && defined __ASSEMBLER__ ++#undef __i686 ++#define __i686 __i686 ++#endif + + /* For Linux we can use the system call table in the header file + /usr/include/asm/unistd.h diff --git a/testing/openmpi/PKGBUILD b/testing/openmpi/PKGBUILD new file mode 100644 index 000000000..4b462b7b7 --- /dev/null +++ b/testing/openmpi/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 154489 2012-03-29 09:52:47Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +pkgname=openmpi +pkgver=1.5.5 +pkgrel=1 +pkgdesc="High performance message passing library (MPI)" +arch=('i686' 'x86_64') +url="http://www.open-mpi.org" +license=('custom') +depends=('gcc' 'gcc-fortran' 'openssh' 'valgrind' 'libtool' 'hwloc') +makedepends=('inetutils') +options=(!libtool) +source=(http://www.open-mpi.org/software/ompi/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2 + openmpi-1.5.4-fix-fakeroot-execution.patch) +sha1sums=('206e555f6d376443f2342f721d944e67dd1a04ef' + 'ec46abb6f9e01daca910e4079b9abc036db9ed20') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Fix fakeroot problem (FS#28644) + patch -Np1 -i ../openmpi-1.5.4-fix-fakeroot-execution.patch + + ./configure --prefix=/usr \ + --sysconfdir=/etc/${pkgname} \ + --mandir=/usr/share/man \ + --enable-mpi-f90 \ + --libdir=/usr/lib/${pkgname} \ + --with-threads=posix \ + --enable-smp-locks \ + --with-valgrind \ + --enable-memchecker \ + --enable-debug \ + --enable-pretty-print-stacktrace \ + --without-slurm \ + --with-hwloc=/usr \ + --with-libltdl=/usr \ + FC=/usr/bin/gfortran \ + LDFLAGS="$LDFLAGS -Wl,-z,noexecstack" + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + # FS#28583 + install -d -m 755 "${pkgdir}"/usr/lib/pkgconfig + for i in ompi-c.pc ompi-cxx.pc ompi-f77.pc ompi-f90.pc ompi.pc; do + ln -sf /usr/lib/openmpi/pkgconfig/$i "${pkgdir}"/usr/lib/pkgconfig/ + done + + # Openmpi's otfinfo conflicts with the one from texlive + mv "${pkgdir}"/usr/bin/otfinfo{,mpi} + + # Openmpi's otfdump conflicts with the one from libotf + mv "${pkgdir}"/usr/bin/otfdump{,ompi} + + # Remove dangling symlink + rm "${pkgdir}"/usr/share/man/man1/orteCC.1 + + install -d -m 755 "${pkgdir}"/etc/ld.so.conf.d + echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf + + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch b/testing/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch new file mode 100644 index 000000000..dc9dcfeae --- /dev/null +++ b/testing/openmpi/openmpi-1.5.4-fix-fakeroot-execution.patch @@ -0,0 +1,43 @@ +Description: If running under Debian fakeroot then its important + that this hook is disabled; a new stat check was introduced in + 1.5.x which preceeds the FAKEROOT check resulting in a SEGFAULT. +Author: James Page <james.page@ubuntu.com> +Origin: https://svn.open-mpi.org/trac/ompi/changeset/21489 + +Index: openmpi-1.5.4/opal/mca/memory/linux/hooks.c +=================================================================== +--- openmpi-1.5.4.orig/opal/mca/memory/linux/hooks.c 2012-02-15 12:59:39.986314651 +0000 ++++ openmpi-1.5.4/opal/mca/memory/linux/hooks.c 2012-02-15 13:14:57.744722517 +0000 +@@ -738,15 +738,6 @@ + check_result_t r1, r2, lp, lpp; + bool want_rcache = false, found_driver = false; + +- /* First, check if ummunotify is present on the system. If it is, +- then we don't need to do the following ptmalloc2 hacks. +- open/mmap on the device may fail during init, but if /dev/ummunotify +- exists, we assume that the user/administrator *wants* to use +- ummunotify. */ +- if (stat("/dev/ummunotify", &st) == 0) { +- return; +- } +- + /* Yes, checking for an MPI MCA parameter here is an abstraction + violation. Cope. Yes, even checking for *any* MCA parameter + here (without going through the MCA param API) is an +@@ -769,6 +760,15 @@ + return; + } + ++ /* Next, check if ummunotify is present on the system. If it is, ++ then we don't need to do the following ptmalloc2 hacks. ++ open/mmap on the device may fail during init, but if /dev/ummunotify ++ exists, we assume that the user/administrator *wants* to use ++ ummunotify. */ ++ if (stat("/dev/ummunotify", &st) == 0) { ++ return; ++ } ++ + /* Look for sentinel files (directories) to see if various network + drivers are loaded (yes, I know, further abstraction + violations...). + |