diff options
29 files changed, 356 insertions, 346 deletions
diff --git a/community/freevo/PKGBUILD b/community/freevo/PKGBUILD index 06bc412ae..086a863d0 100644 --- a/community/freevo/PKGBUILD +++ b/community/freevo/PKGBUILD @@ -1,29 +1,32 @@ -# $Id: PKGBUILD 67624 2012-03-13 14:36:08Z lcarlier $ +# $Id: PKGBUILD 73149 2012-07-02 12:22:07Z giovanni $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=freevo pkgver=1.9.0 -pkgrel=7 -pkgdesc="Freevo is an open-source home theatre PC platform based on Linux and a number of open-source audio/video tools." +pkgrel=8 +pkgdesc="An open-source home theatre PC platform" url="http://freevo.sourceforge.net/" license=('GPL2') arch=('i686' 'x86_64') -depends=('lame' 'flac' 'faad2' 'cdparanoia' 'vorbis-tools' \ - 'fbset' 'smpeg' 'pil' 'python-pysqlite-legacy' \ - 'pyxml' 'lsdvd' 'twisted' 'python2-numpy' 'python-pygame'\ - 'kaa-metadata' 'kaa-imlib2' 'python-beautifulsoup' 'python-html5lib') -optdepends=('mplayer: most features' 'xine-lib: can be used instead of mplayer' 'tvtime: watching tv' 'xmltv: parsing online tv guides') +depends=('lame' 'flac' 'faad2' 'cdparanoia' 'vorbis-tools' 'fbset' + 'smpeg' 'pil' 'python-pysqlite-legacy' 'pyxml' 'lsdvd' + 'twisted' 'python2-numpy' 'python-pygame' 'kaa-metadata' + 'kaa-imlib2' 'python2-beautifulsoup3' 'python-html5lib') +optdepends=('mplayer: most features' + 'xine-lib: can be used instead of mplayer' + 'tvtime: watching tv' + 'xmltv: parsing online tv guides') install=freevo.install options=('docs') -source=(http://downloads.sourceforge.net/freevo/$pkgname-$pkgver.tar.gz \ - freevo.desktop - imdb-html5lib.patch) +source=("http://downloads.sourceforge.net/freevo/$pkgname-$pkgver.tar.gz" + 'freevo.desktop' + 'imdb-html5lib.patch') sha1sums=('0533a2d4ff8a7b09b3b233fdf303ff56bda22d16' '5f6e76dc58496f072aca29257c24be5ffa9c6c7d' '57e1099527603500c594fbffa2cb7233b636eed1') build() { - cd ${srcdir}/$pkgname-$pkgver + cd ${srcdir}/${pkgname}-${pkgver} # patch from http://sourceforge.net/tracker/index.php?func=detail&aid=2924872&group_id=46652&atid=446895 patch -p0 < ${srcdir}/imdb-html5lib.patch @@ -32,12 +35,13 @@ build() { install -Dm644 local_conf.py.example ${pkgdir}/usr/share/doc/freevo/local_conf.py.example # install .desktop file and icon - install -Dm644 ${srcdir}/$pkgname-$pkgver/share/icons/misc/freevo_app.png \ - ${pkgdir}/usr/share/pixmaps/freevo.png + install -Dm644 ${srcdir}/${pkgname}-${pkgver}/share/icons/misc/freevo_app.png \ + ${pkgdir}/usr/share/pixmaps/freevo.png install -Dm644 ${srcdir}/freevo.desktop \ - ${pkgdir}/usr/share/applications/freevo.desktop + ${pkgdir}/usr/share/applications/freevo.desktop # fix executable for python 2.7 - sed -i "s|search = ('python', 'python2')|search = ('python2', 'python2.7')|" ${pkgdir}/usr/bin/freevo + sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ + $(find ${pkgdir} -regex ".*.py\|.*.recipe") + sed -i "s:python:python2:g" ${pkgdir}/usr/share/freevo/htdocs/downloadurl } - diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD index 4ff18322b..7c5d0583d 100644 --- a/community/freewrl/PKGBUILD +++ b/community/freewrl/PKGBUILD @@ -1,34 +1,31 @@ -# $Id: PKGBUILD 63566 2012-02-05 11:56:27Z ibiru $ +# $Id: PKGBUILD 73160 2012-07-02 14:55:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=freewrl -pkgver=1.22.10 -pkgrel=8 +pkgver=1.22.13 +pkgrel=1 pkgdesc="VRML viewer" arch=('i686' 'x86_64') url="http://freewrl.sourceforge.net/" license=('GPL') depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' 'sox' 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js') -makedepends=('java-environment') +makedepends=('java-environment' 'xulrunner') options=(!libtool) -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 - build-fix.patch) -md5sums=('07fd8f193d14799ffb95a59a4887fc88' - '52e4b6aacebcaf18cbec8975e0eb7fd8') +source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('7e432c7a9eb5d00497d34d93e2b4d420') build() { . /etc/profile.d/jre.sh . /etc/profile.d/jdk.sh cd $srcdir/$pkgname-$pkgver - patch -p1 <$srcdir/build-fix.patch export JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX -DJS_THREADSAFE $(pkg-config --cflags nspr)" export JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) -lmozjs185" ./configure \ --prefix=/usr --with-fontsdir=/usr/share/fonts/TTF --enable-libeai \ - --enable-libcurl --with-expat=/usr --with-target=x11 --disable-plugin \ - --disable-mozilla-js --disable-xulrunner-js --disable-firefox-js \ + --enable-libcurl --with-expat=/usr --with-target=x11 --enable-plugin \ + --disable-mozilla-js --enable-xulrunner-js --disable-firefox-js \ --disable-seamonkey-js make } diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD index 23602edf5..66860b3d4 100644 --- a/community/john/PKGBUILD +++ b/community/john/PKGBUILD @@ -6,7 +6,7 @@ pkgname=john pkgver=1.7.9 -pkgrel=5 +pkgrel=6 _jumbover=6 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)" arch=('i686' 'x86_64') @@ -57,7 +57,7 @@ build() { package() { # config file - sed -i 's|$JOHN/john.local.conf|/etc/john.local.conf|g' ${srcdir}/john-$pkgver/run/john.conf + sed -i 's|$JOHN/john.local.conf|/etc/john/john.local.conf|g' ${srcdir}/john-$pkgver/run/john.conf sed -i 's|$JOHN|/usr/share/john|g' ${srcdir}/john-$pkgver/run/john.conf install -Dm644 ${srcdir}/john-$pkgver/run/john.conf ${pkgdir}/etc/john/john.conf diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD index 8d0d849df..8bcffba76 100644 --- a/community/libcec/PKGBUILD +++ b/community/libcec/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72656 2012-06-18 17:44:25Z idevolder $ +# $Id: PKGBUILD 73164 2012-07-02 16:36:19Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: Philippe Cherel <philippe.cherel@mayenne.org> pkgname=libcec -pkgver=1.7.0 +pkgver=1.7.1 pkgrel=1 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter" arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ url="https://github.com/Pulse-Eight/libcec" license=('GPL') depends=('udev' 'lockdev') source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver") -_srcfolder=Pulse-Eight-libcec-b9761e8 -sha256sums=('28ed8c326bbe1c181f4f4c41660e2f1f6097494647f05a51b30a6034b8171b30') +_srcfolder=Pulse-Eight-libcec-cd67a27 +sha256sums=('a560a792376bce73526f32ede89985b923d899cdf2f739be99e466b322b3211d') options=(!libtool) build() { diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 6d6d72484..46ce5a7fe 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71690 2012-06-01 13:05:20Z dreisner $ +# $Id: PKGBUILD 73136 2012-07-02 10:22:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=0.9.12 -pkgrel=8 +pkgver=0.9.13 +pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -37,7 +37,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirt.tmpfiles.d openbsd-netcat-default.patch libvirt-libnl3.patch) -md5sums=('5e842bc55733ceba60c64767580ff3e4' +md5sums=('86cbe53ee662e3b9e8bb0c63c737ba27' 'c43244c40a0437038c82089618e7beaa' '3ed0e24f5b5e25bf553f5427d64915e6' '8297b1be794a24cc77f66af9380ace59' diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD new file mode 100644 index 000000000..50a5118f0 --- /dev/null +++ b/community/lxc/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 73154 2012-07-02 12:50:42Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Andrea Zucchelli <zukka77@gmail.com> +# Contributor: Jonathan Liu <net147@gmail.com> +# Maintainer: Jon Nordby <jononor@gmail.com> + +pkgname=lxc +pkgver=0.8.0_rc1 +pkgrel=1 +pkgdesc="Linux Containers" +arch=('i686' 'x86_64') +url="http://lxc.sourceforge.net/" +depends=('bash' 'perl') +license=('LGPL') +source=("http://lxc.sourceforge.net/download/lxc/$pkgname-${pkgver/_/-}.tar.gz") +md5sums=('06ceecf4dbe1be988fc903ad8dd34d29') + +build() { + cd "$srcdir/$pkgname-${pkgver/_/-}" + + ./configure \ + --prefix=/usr \ + --localstatedir=/var \ + --libexecdir=/usr/bin \ + --sysconfdir=/etc \ + --disable-doc + make +} + +package() { + cd "$srcdir/$pkgname-${pkgver/_/-}" + + make DESTDIR="$pkgdir" install + install -d -m755 "$pkgdir/var/lib/lxc" + + cd doc + find . -type f -name '*.1' -exec install -D -m644 "{}" "$pkgdir/usr/share/man/man1/{}" \; + find . -type f -name '*.5' -exec install -D -m644 "{}" "$pkgdir/usr/share/man/man5/{}" \; + find . -type f -name '*.7' -exec install -D -m644 "{}" "$pkgdir/usr/share/man/man7/{}" \; +} diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD index fafb6e54c..e3c22feaa 100644 --- a/community/qtractor/PKGBUILD +++ b/community/qtractor/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 67085 2012-03-03 16:18:50Z schiv $ +# $Id: PKGBUILD 73166 2012-07-02 17:42:18Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Philipp Überbacher <hollunder at gmx dot at> pkgname=qtractor -pkgver=0.5.4 +pkgver=0.5.5 pkgrel=1 pkgdesc="Audio/MIDI multitrack sequencer" arch=('i686' 'x86_64') url="http://qtractor.sourceforge.net/" license=('GPL') -depends=('qt' 'jack' 'slv2' 'libmad' 'liblo' - 'libsamplerate' 'rubberband') +depends=('qt' 'jack' 'suil' 'lilv' 'libmad' + 'libsamplerate' 'rubberband' 'liblo') makedepends=('ladspa' 'dssi') [ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('9f52ff00ed66d6de07dc444537949ed9') +md5sums=('ec3ad0f427a9e629fb0c42d10b4c2259') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD index 04529d1c4..aa68e7c98 100644 --- a/community/sage-mathematics/PKGBUILD +++ b/community/sage-mathematics/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73103 2012-07-01 13:56:11Z dwallace $ +# $Id: PKGBUILD 73127 2012-07-02 04:22:14Z dwallace $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Antonio Rojas < nqn1976 @ gmail.com > # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -8,37 +8,26 @@ pkgname=sage-mathematics pkgver=5.0.1 -pkgrel=2 +pkgrel=3 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' url='http://www.sagemath.org' arch=('i686' 'x86_64') license=('GPL') #depends=('readline') -depends=('ppl') -makedepends=('gcc-fortran' 'gcc-libs' 'desktop-file-utils' 'imagemagick' 'texlive-core') +makedepends=('gcc-fortran' 'desktop-file-utils') optdepends=('imagemagick: some plotting functionality benefits from it' 'texlive-core: some plotting functionality benefits from it, also to use SageTeX' - 'sage-mathematics-spkgs: original packages used to build additional packages') + 'openssh: to use the notebook in secure mode' + 'ffmpeg: to show animations' + 'jsmath-fonts: native TeX fonts for the notebook') options=('!makeflags') install="${pkgname}.install" source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar" 'SAGE-notebook.desktop') -md5sums=('1538dbcfac04482b3837ba06bb75f073' - 'dc391f12b7d17dd37326343ec0e99bbd') build() { cd sage-${pkgver} - # modularization of sage, sort of :) - # fixes the following error: - # bash: symbol lookup error: bash: undefined symbol: rl_filename_rewrite_hook - # remove this hack when sage uses a readline 6.1 or greater, or when sage uses its own internal bash - # this is for people who have custom kernels (sage works this around by checking uname -r) - #mkdir -p spkg/installed - #touch spkg/installed/readline-6.1 - mkdir -p spkg/installed - touch spkg/installed/ppl-0.11.2 - # fix "missing sage.all error" during build unset CFLAGS unset CXXFLAGS @@ -46,6 +35,9 @@ build() { # fix build errors unset LDFLAGS + # don't build GCC + export SAGE_INSTALL_GCC='no' + # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }') export MAKE="make -j${SAGE_BUILD_THREADS}" @@ -98,11 +90,14 @@ package() { ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage # remove build logs - rm -f ${pkgdir}/opt/sage/install.log + rm -f ${pkgdir}/opt/sage/*.log rm -rf ${pkgdir}/opt/sage/spkg/logs # remove source packages, since they are rarely needed, they are 300mb in size (compressed) - # no need to package them together, put into sage-mathematics-spkgs rm -f ${pkgdir}/opt/sage/spkg/base/*spkg rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg } + +# vim :set ts=2 sw=2 et: +md5sums=('1538dbcfac04482b3837ba06bb75f073' + 'dc391f12b7d17dd37326343ec0e99bbd') diff --git a/core/links/PKGBUILD b/core/links/PKGBUILD index 49cfa6fca..135074e88 100644 --- a/core/links/PKGBUILD +++ b/core/links/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 156671 2012-04-22 20:30:45Z eric $ +# $Id: PKGBUILD 162886 2012-07-02 17:59:15Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=links -pkgver=2.6 +pkgver=2.7 pkgrel=1 pkgdesc="A text WWW browser, similar to Lynx" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ provides=('links-g') conflicts=('links-g') replaces=('links-g') source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop) -sha1sums=('228bd726c176ea44d35fa12cafd97aa83214d9dc' +sha1sums=('1e362a7e27078d630edf5868145a46247cda8cc3' 'f600e27c2a71184444f7dd07a10230aa44463a02') build() { diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD index 3ac2cfefc..b7af1290a 100644 --- a/core/openldap/PKGBUILD +++ b/core/openldap/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 162155 2012-06-22 12:56:36Z dreisner $ +# $Id: PKGBUILD 162887 2012-07-02 18:03:02Z eric $ # Maintainer: pkgbase=openldap pkgname=('libldap' 'openldap') pkgver=2.4.31 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.openldap.org/" license=('custom') makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux') source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz - slapd slapd.default slapd.service + slapd slapd.default slapd.service slapd.tmpfiles ntlm.patch mutex-end-of-struct-sigsegv.patch) sha1sums=('8315a283fb3724abe6062e38d93bb69298d05765' 'bd1ea19256d3d467f1f803e0f4046ef50f17628f' 'd89b8a533045123f1ab46c9c430cf132d58a20a4' 'a2cdab7e800a9f0c8b1e319a68598a12f4af27a4' + 'f86a82e35ebe15026980467c9dee4007e686b795' 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef' '694269dad78c7a806649c2d7f57bb7e503df3af1') @@ -100,5 +101,6 @@ package_openldap() { install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd install -Dm644 "${srcdir}"/slapd.service "${pkgdir}"/usr/lib/systemd/system/slapd.service + install -Dm644 "${srcdir}"/slapd.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/slapd.conf install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/core/openldap/slapd.tmpfiles b/core/openldap/slapd.tmpfiles new file mode 100644 index 000000000..5f63bd636 --- /dev/null +++ b/core/openldap/slapd.tmpfiles @@ -0,0 +1 @@ +D /run/openldap 0750 ldap ldap - diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 5347acf40..60740c4fb 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160652 2012-06-03 08:11:02Z giovanni $ +# $Id: PKGBUILD 162864 2012-07-02 14:49:26Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.2.2 +pkgver=2.2.3 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('9f59b5d71969cbb2671702cd2a7a5a11' +md5sums=('f4c70af3892d964b83b2718bde44c2f8' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/opennx/PKGBUILD b/extra/opennx/PKGBUILD index 9ee9d9e0b..1ff26992c 100644 --- a/extra/opennx/PKGBUILD +++ b/extra/opennx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162243 2012-06-24 08:25:53Z andyrtr $ +# $Id: PKGBUILD 162885 2012-07-02 16:49:28Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Armin Luntzer # Original opennx PKGBUILD: Tomas Groth tomasgroth.at.yahoo.dk pkgname=opennx -pkgver=0.16.0.712 +pkgver=0.16.0.713 pkgrel=1 pkgdesc="A GPL replacement for the NoMachine client, patched to always show the session chooser" url="http://opennx.sf.net/" @@ -14,7 +14,7 @@ depends=('wxgtk' 'libcups' 'libxext' 'libxft' 'xorg-xauth' 'curl') makedepends=('zip' 'opensc' 'libpulse' 'smbclient' 'libusb-compat') #optdepends=('cups: for full local printing support') source=(http://downloads.sourceforge.net/project/opennx/opennx/CI-source/opennx-$pkgver.tar.gz) -md5sums=('f9cf99a9dc13de9ef6d219db83dec344') +md5sums=('9699fd2d9b19b8d0fb37959ace846666') build() { cd $srcdir/opennx* diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD index 023c1c0d2..2cad7f16b 100644 --- a/extra/python-lxml/PKGBUILD +++ b/extra/python-lxml/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 154469 2012-03-28 22:33:23Z eric $ +# $Id: PKGBUILD 162858 2012-07-02 13:06:22Z giovanni $ # Maintainer: pkgname=('python-lxml' 'python2-lxml') pkgver=2.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="Python binding for the libxml2 and libxslt libraries" arch=('i686' 'x86_64') license=('BSD' 'custom') @@ -21,7 +21,7 @@ check() { package_python2-lxml() { depends=('python2' 'libxslt') - optdepends=('python-beautifulsoup: support for parsing not well formed HTML') + optdepends=('python2-beautifulsoup3: support for parsing not well formed HTML') cd "${srcdir}"/lxml-$pkgver python2 setup.py install --root="${pkgdir}" --optimize=1 diff --git a/extra/xf86-video-ast/PKGBUILD b/extra/xf86-video-ast/PKGBUILD index 76025dea9..0a876c8a7 100644 --- a/extra/xf86-video-ast/PKGBUILD +++ b/extra/xf86-video-ast/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 154223 2012-03-24 10:34:56Z jgc $ +# $Id: PKGBUILD 162869 2012-07-02 16:09:01Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-ast -pkgver=0.93.10 +pkgver=0.96.0 pkgrel=1 pkgdesc="X.org ASPEED AST Graphics video driver" arch=(i686 x86_64) @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.12.0') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('c9d466fef391bdf960f79b82f1f776a1c1ab870e93475c3d1b3d028531fac4e0') +sha256sums=('73ac2bc3999add5a77c9d5d38d3651d5e50ab7bbac81d710912ab3125fc1ab3c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-cirrus/PKGBUILD b/extra/xf86-video-cirrus/PKGBUILD index 036da6db8..af708a937 100644 --- a/extra/xf86-video-cirrus/PKGBUILD +++ b/extra/xf86-video-cirrus/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 154221 2012-03-24 10:34:01Z jgc $ +# $Id: PKGBUILD 162871 2012-07-02 16:11:19Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-cirrus -pkgver=1.4.0 +pkgver=1.5.0 pkgrel=1 pkgdesc="X.org Cirrus Logic video driver" arch=(i686 x86_64) @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('2b07fa5d4a86acb277d72c7ae35566ae21b08836645c6a88e7662422af5e962e') +sha256sums=('e506a97cce667d71971e8fcc163285b791ca508365593f3dc1e191f3411fdfed') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-fbdev/PKGBUILD b/extra/xf86-video-fbdev/PKGBUILD index a42599a23..f4d70a393 100644 --- a/extra/xf86-video-fbdev/PKGBUILD +++ b/extra/xf86-video-fbdev/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153333 2012-03-12 20:53:25Z andyrtr $ +# $Id: PKGBUILD 162873 2012-07-02 16:14:07Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-fbdev -pkgver=0.4.2 -pkgrel=6 +pkgver=0.4.3 +pkgrel=1 pkgdesc="X.org framebuffer video driver" arch=(i686 x86_64) license=('custom') @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.11.99.903') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('c8562f997d56c9fec50df6ca9892f39f43ff4c2c') +sha256sums=('ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index eaa97b02d..f83c7c6ba 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,30 +1,57 @@ -# $Id: PKGBUILD 160623 2012-06-02 21:15:09Z andyrtr $ +# $Id: PKGBUILD 162867 2012-07-02 14:58:51Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> -pkgname=xf86-video-intel +pkgbase=xf86-video-intel +pkgname=('xf86-video-intel-uxa' 'xf86-video-intel-sna') pkgver=2.19.0 -pkgrel=3 -pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" +pkgrel=6 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') -depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'udev>=183') +depends=('intel-dri' 'libxvmc' 'libpciaccess' 'libdrm' 'xcb-util>=0.3.9' 'libxfixes' 'systemd-tools') makedepends=('xorg-server-devel>=1.12.0' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'libxrender') -conflicts=('xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +source=(${url}/archive/individual/driver/${pkgbase}-${pkgver}.tar.bz2) sha1sums=('131934cf5e90bd48c883804cc644c4cb8b1de100') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-dri + cd "${srcdir}/${pkgbase}-${pkgver}" + mkdir build-{UXA,SNA} + + pushd build-UXA + ../configure --prefix=/usr --enable-dri --enable-uxa + make + popd + + pushd build-SNA + ../configure --prefix=/usr --enable-dri --enable-sna --enable-vmap make + popd } -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install +package_xf86-video-intel-uxa() { + + pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers with UXA acceleration" + provides=('xf86-video-intel') + replaces=('xf86-video-intel') + conflicts=('xf86-video-intel-sna' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy' 'xf86-video-intel') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install -C build-UXA + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} + +package_xf86-video-intel-sna() { + + pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers with SNA acceleration" + provides=('xf86-video-intel') + conflicts=('xf86-video-intel-uxa' 'xorg-server<1.12.0' 'xf86-video-i810' 'xf86-video-intel-legacy' 'xf86-video-intel') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install -C build-SNA install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/xf86-video-mach64/PKGBUILD b/extra/xf86-video-mach64/PKGBUILD index 08486fd5a..b2ac34779 100644 --- a/extra/xf86-video-mach64/PKGBUILD +++ b/extra/xf86-video-mach64/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 162821 2012-07-01 07:42:19Z andyrtr $ +# $Id: PKGBUILD 162875 2012-07-02 16:16:24Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-mach64 -pkgver=6.9.1 -pkgrel=2 +pkgver=6.9.2 +pkgrel=1 pkgdesc="X.org mach64 video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel>=1.12.0') makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa') optdepends=('mach64-dri: DRI1 support from community repo') conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('9f6ad49f07c8785a64caac6f4aaf58fc7746a24b718491d047c45bc1ee9e834e') +sha256sums=('e3967d6ee953cd907c6a9e38b132b90db8173565198f6a65fe1e8c398dc06293') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-mga/PKGBUILD b/extra/xf86-video-mga/PKGBUILD index f9787f09d..7207a02a6 100644 --- a/extra/xf86-video-mga/PKGBUILD +++ b/extra/xf86-video-mga/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162826 2012-07-01 07:47:12Z andyrtr $ +# $Id: PKGBUILD 162877 2012-07-02 16:18:31Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-mga -pkgver=1.5.0 -pkgrel=2 +pkgver=1.6.0 +pkgrel=1 pkgdesc="X.org mga video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -15,7 +15,7 @@ conflicts=('xorg-server<1.12.0') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('ca983d780dd90115c0599980a7a83425b5e4eeb16f2e8c7fed15823fcbe7830e') +sha256sums=('f0894fd8ddb1984d9212880544b7a7c30294e374df52bcce0c2acc93d434ce15') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD index c47d3cb10..acde9d1b2 100644 --- a/extra/xf86-video-r128/PKGBUILD +++ b/extra/xf86-video-r128/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162828 2012-07-01 07:49:03Z andyrtr $ +# $Id: PKGBUILD 162879 2012-07-02 16:20:25Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-r128 -pkgver=6.8.2 -pkgrel=2 +pkgver=6.8.3 +pkgrel=1 pkgdesc="X.org ati Rage128 video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -15,7 +15,7 @@ conflicts=('xorg-server<1.12.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('7b41135c3d177e61644573e5c16e35fd9eff98b4d6685c9c6de9e33401e904b1') +sha256sums=('855e8cf72c3a7704e12f331fe8a4b354518753c6ff3aa61ed156cf6e7530f02b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD index c87813a25..588cc3213 100644 --- a/extra/xf86-video-savage/PKGBUILD +++ b/extra/xf86-video-savage/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162830 2012-07-01 07:51:56Z andyrtr $ +# $Id: PKGBUILD 162881 2012-07-02 16:22:29Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-savage -pkgver=2.3.4 -pkgrel=2 +pkgver=2.3.5 +pkgrel=1 pkgdesc="X.org savage video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -15,7 +15,7 @@ conflicts=('xorg-server<1.12.0') options=(!libtool) groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('3a666a66339686ad4dd85b0665cc300e8a7fc6d38b49a9e8e8d48f393627be49') +sha256sums=('4b5b52aad9413a9d8717ff0aa3290d110dd5cdb5c93eebda4a5fff1c5ccf63e4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-sisusb/PKGBUILD b/extra/xf86-video-sisusb/PKGBUILD index 57339c20f..2bc90e5d3 100644 --- a/extra/xf86-video-sisusb/PKGBUILD +++ b/extra/xf86-video-sisusb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153370 2012-03-12 20:54:32Z andyrtr $ +# $Id: PKGBUILD 162883 2012-07-02 16:26:42Z andyrtr $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-sisusb -pkgver=0.9.4 -pkgrel=6 +pkgver=0.9.5 +pkgrel=1 pkgdesc="X.org SiS USB video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -13,14 +13,11 @@ makedepends=('xorg-server-devel>=1.11.99.903') conflicts=('xorg-server<1.11.99.903') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - sisusb-0.9.4-git.patch) -sha1sums=('600fd49dffe00121f9042555fea55948653d1a7e' - 'd74ce7732889c7a00d9d2dcd2bfc8be05c6eb912') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('6508f0edcbbca978f97665953135fb564e988fed437a7c56611f8355bb4daa6b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/sisusb-0.9.4-git.patch ./configure --prefix=/usr make } diff --git a/staging/binutils/PKGBUILD b/staging/binutils/PKGBUILD new file mode 100644 index 000000000..067cf289f --- /dev/null +++ b/staging/binutils/PKGBUILD @@ -0,0 +1,95 @@ +# $Id: PKGBUILD 162862 2012-07-02 13:30:53Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc + +pkgname=binutils +pkgver=2.22 +pkgrel=8 +_date=20120323 +pkgdesc="A set of programs to assemble and manipulate binary and object files" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/binutils/" +license=('GPL') +groups=('base-devel') +depends=('glibc>=2.16' 'zlib') +checkdepends=('dejagnu') +options=('!libtool' '!distcc' '!ccache') +install=binutils.install +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) +md5sums=('de2ac4298732827f8af706fc24020330') + +mksource() { + mkdir ${pkgname}-${_date} + cd ${pkgname}-${_date} + export _TAG=binutils-2_22-branch + export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src' + cvs -z9 co -r $_TAG binutils || return 1 + mv src binutils + tar -cvjf ../binutils-${pkgver}_${_date}.tar.bz2 binutils/* +} + +build() { + cd ${srcdir} + mkdir binutils-build && cd binutils-build + + [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib" + + ${srcdir}/binutils/configure --prefix=/usr \ + --enable-ld=default --enable-gold \ + --enable-plugins --enable-threads \ + --enable-shared $CONFIGFLAG + + # check the host environment and makes sure all the necessary tools are available + make configure-host + + make tooldir=${pkgdir}/usr + + # Rebuild libiberty.a with -fPIC + cp -a libiberty libiberty-pic + make -C libiberty-pic clean + make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic + + # Rebuild libbfd.a with -fPIC + # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API + cp -a bfd bfd-pic + make -C bfd-pic clean + make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic + + # Rebuild libopcodes.a with -fPIC + cp -a opcodes opcodes-pic + make -C opcodes-pic clean + make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic +} + +check() { + cd ${srcdir}/binutils-build + + # do not abort on errors - manually check log files + # gold testsuite does not build with _FORTIFY_SOURCE (due to -O0 -Werror) + make CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}" \ + CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}" -k check || true +} + +package() { + cd ${srcdir}/binutils-build + make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install + + # Add some useful headers + install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include + install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include + + # install libraries rebuilt with -fPIC + install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib + install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib + install -m644 opcodes/libopcodes.a ${pkgdir}/usr/lib + + # Remove Windows/Novell specific man pages + rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}* + + # Remove these symlinks, they are not ABI stable. + # Programs should compile static to the .a file. + rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so + echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so + echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so +} diff --git a/staging/binutils/binutils.install b/staging/binutils/binutils.install new file mode 100644 index 000000000..8bf9f3a47 --- /dev/null +++ b/staging/binutils/binutils.install @@ -0,0 +1,17 @@ +infodir=usr/share/info +filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info) + +post_upgrade() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + diff --git a/staging/gcc/PKGBUILD b/staging/gcc/PKGBUILD index 7bbb7f7c0..4c3dfc6f4 100644 --- a/staging/gcc/PKGBUILD +++ b/staging/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162787 2012-06-30 13:53:51Z allan $ +# $Id: PKGBUILD 162860 2012-07-02 13:12:42Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') pkgver=4.7.1 -pkgrel=2 +pkgrel=4 #_snapshot=4.7-20120505 _libstdcppmanver=20120605 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" @@ -20,15 +20,15 @@ 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.patch - gcc-4.7.0-cloog-0.17.patch gcc-4.7.1-libada-pic.patch - gcc-4.7.1-libgo-write.patch) + gcc-4.7.1-libgo-write.patch + gcc-4.7.1-libgo-mksysinfo.patch) md5sums=('933e6f15f51c031060af64a9e14149ff' '767c62f9a047c4434f2345decf1d0819' 'ced48436c1b3c981d721a829f1094de1' - '575f7d17b022e609447a590e481b18b5' '2acbc9d35cc9d72329dc71d6b1f162ef' - 'df82dd175ac566c8a6d46b11ac21f14c') + 'df82dd175ac566c8a6d46b11ac21f14c' + '8e847244dba042d0aa3297713edaf70c') if [ -n "${_snapshot}" ]; then @@ -50,15 +50,15 @@ build() { patch -p1 -i ${srcdir}/gcc_pure64.patch fi - # compatibility with latest cloog - patch -p1 -i ${srcdir}/gcc-4.7.0-cloog-0.17.patch - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679 patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch # bug to file... patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch + # http://gcc.gnu.org/ml/gcc-patches/2012-06/msg01946.html + patch -p0 -i ${srcdir}/gcc-4.7.1-libgo-mksysinfo.patch + echo ${pkgver} > gcc/BASE-VER cd ${srcdir} @@ -75,6 +75,7 @@ build() { --disable-libstdcxx-pch --enable-libstdcxx-time \ --enable-gnu-unique-object --enable-linker-build-id \ --with-ppl --enable-cloog-backend=isl \ + --disable-ppl-version-check --disable-cloog-version-check \ --enable-lto --enable-gold --enable-ld=default \ --enable-plugin --with-plugin-ld=ld.gold \ --with-linker-hash-style=gnu \ @@ -100,7 +101,7 @@ package_gcc-libs() { pkgdesc="Runtime libraries shipped by GCC" groups=('base') - depends=('glibc>=2.15') + depends=('glibc>=2.16') install=gcc-libs.install cd gcc-build diff --git a/staging/gcc/gcc-4.7.1-libgo-mksysinfo.patch b/staging/gcc/gcc-4.7.1-libgo-mksysinfo.patch new file mode 100644 index 000000000..427efe8a6 --- /dev/null +++ b/staging/gcc/gcc-4.7.1-libgo-mksysinfo.patch @@ -0,0 +1,15 @@ +--- libgo/mksysinfo.sh 2012-06-29 14:23:30.684708901 +0200 ++++ libgo/mksysinfo.sh 2012-06-29 14:23:20.782761973 +0200 +@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go | + # The rusage struct. + rusage=`grep '^type _rusage struct' gen-sysinfo.go` + if test "$rusage" != ""; then +- rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'` +- rusage=`echo $rusage | sed -e 's/^ *//'` + # Remove anonymous unions from GNU/Linux <bits/resource.h>. + rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'` ++ rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'` ++ rusage=`echo $rusage | sed -e 's/^ *//'` + nrusage= + while test -n "$rusage"; do + field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'` diff --git a/staging/glibc/PKGBUILD b/staging/glibc/PKGBUILD index 0cf078e34..69a502a4c 100644 --- a/staging/glibc/PKGBUILD +++ b/staging/glibc/PKGBUILD @@ -1,230 +1,53 @@ -# $Id: PKGBUILD 161319 2012-06-09 07:38:36Z allan $ +# $Id: PKGBUILD 162892 2012-07-02 22:56:58Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: valgrind requires rebuilt with each major glibc version pkgname=glibc -pkgver=2.15 -pkgrel=12 -_glibcdate=20111227 +pkgver=2.16.0 +pkgrel=1 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') groups=('base') -depends=('linux-api-headers>=3.3' 'tzdata') -makedepends=('gcc>=4.6') +depends=('linux-api-headers>=3.4' 'tzdata') +makedepends=('gcc>=4.7') backup=(etc/gai.conf etc/locale.gen etc/nscd.conf) options=('!strip') install=glibc.install -source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz - glibc-2.15-do-not-install-timezone-files.patch - glibc-2.15-do-not-install-timezone-files-2.patch - glibc-__i686.patch - glibc-2.14-libdl-crash.patch - glibc-2.14-reexport-rpc-interface.patch - glibc-2.14-reinstall-nis-rpc-headers.patch +source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} glibc-2.15-fix-res_query-assert.patch - glibc-2.15-regex.patch - glibc-2.15-lddebug-scopes.patch glibc-2.15-revert-c5a0802a.patch - glibc-2.15-scanf.patch - glibc-2.15-ifunc.patch - glibc-2.15-avx.patch - glibc-2.15-strcasecmp-disable-avx.patch - glibc-2.15-gb18030.patch.gz - glibc-2.15-revert-netlink-cache.patch - glibc-2.15-arena.patch - glibc-2.15-negative-result-cache.patch - glibc-2.15-multiarch-x86-strcmp.patch - glibc-2.15-vdso.patch - glibc-2.15-feraiseexcept-plt.patch - glibc-2.15-vfprintf-nargs.patch - glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch - glibc-2.15-fmtmsg-locking.patch - glibc-2.15-non-signalling-comparisons.patch - glibc-2.15-rintf-rounding.patch - glibc-2.15-nearbyintf-rounding.patch - glibc-2.15-confstr-local-buffer-extent.patch - glibc-2.15-testsuite.patch nscd.rcd nscd.service nscd.tmpfiles locale.gen.txt locale-gen) -md5sums=('6ffdf5832192b92f98bdd125317c0dfc' - '7ef69c530a15106de93e4de2df2d393e' - 'b6c619e5cf91829a15ce34dccef676d5' - 'addfddd648a4bf832eb126aba944ebae' - '6970bcfeb3bf88913436d5112d16f588' - 'c5de2a946215d647c8af5432ec4b0da0' - '55febbb72139ac7b65757df085024b83' +md5sums=('80b181b02ab249524ec92822c0174cf7' + '2a1221a15575820751c325ef4d2fbb90' '31f415b41197d85d3bbee3d1eecd06a3' - 'b3526cbd5e29773560dba725db99af5a' - '3c219ddfb619b6df903cac4cc42c611d' - '7ae3e426251ae33e73dbad71f9c91378' - 'f0782ddbf38e0b30ec6b85348816046f' - '3d844b53b2dbb7c996e39c7ad932f55d' - '41ae047ac88e8f6f547c70b0a0bc3b72' - 'fccb89f6628f59752278e125c35941f8' - '001a4044ac3d59aca6ee144eaca57ab2' - '94b61302a7ca6c5764d013dc7738fcfe' - 'a9ffadcfd2d357f91fee0b861fd4a7c6' - '2c46b8e294de24c531f2253ff69aeef3' - '7a2998a04ebfcf8bf820540f490ce714' - '0d77d20fa7fe2f87ad945cb9edb4d91d' - 'bfdefac3d705f41fbf84b1de1dc945af' - '3443e89c1e98089cd6c3e3c23f0c3d85' - '340deaa582a95ddde86edb624c3bfea0' - '6bbac50e6ff82187654e6a0a7bd849e7' - 'c483504cf404ed0b44480af627813a97' - '1419d61fd1dbc6cdc48bb59da86fa66f' - '7ff501435078b1a2622124fbeaafc921' - '8d1023a51e0932681b46440d5f8551ee' - '6962c3fa29306bfbf6f0d22b19cb825d' + '0a0383d50d63f1c02919fe9943b82014' '589d79041aa767a5179eaa4e2737dd3f' 'ad8a9af15ab7eeaa23dc7ee85024af9f' 'bccbe5619e75cf1d97312ec3681c605c' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') - -mksource() { - git clone git://sourceware.org/git/glibc.git - pushd glibc - #git checkout -b glibc-2.15-arch origin/release/2.15/master - git checkout -b glibc-2.15-arch origin/master - popd - tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/* -} - - build() { - cd ${srcdir}/glibc - - # timezone data is in separate package (tzdata) - # http://sourceware.org/git/?p=glibc.git;a=commit;h=482ff4da - patch -p1 -i ${srcdir}/glibc-2.15-do-not-install-timezone-files.patch - # http://sourceware.org/git/?p=glibc.git;a=commit;h=a458e7fe - patch -p1 -i ${srcdir}/glibc-2.15-do-not-install-timezone-files-2.patch - - # undefine __i686 - # http://sourceware.org/glibc/wiki/Release/2.15#Build_Failures - patch -p1 -i ${srcdir}/glibc-__i686.patch - - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (fedora branch) - # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html - patch -p1 -i ${srcdir}/glibc-2.14-libdl-crash.patch - - # re-export RPC interface until libtirpc is ready as a replacement - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (fedora branch) - patch -p1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (fedora branch) - patch -p1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch + cd ${srcdir}/${pkgname}-${pkgver} # fix res_query assertion # http://sourceware.org/bugzilla/show_bug.cgi?id=13013 patch -p1 -i ${srcdir}/glibc-2.15-fix-res_query-assert.patch - # fix up regcomp/regexec - # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745 - patch -p1 -i ${srcdir}/glibc-2.15-regex.patch - - # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223 - # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64 (fedora branch) - patch -p1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch - # revert commit c5a0802a - causes various hangs - # https://bugzilla.redhat.com/show_bug.cgi?id=769421 - # Note: fedora may have actual fix (not submitted upstream yet...) - # http://pkgs.fedoraproject.org/gitweb/?p=glibc.git;a=blob_plain;f=glibc-rh552960-2.patch + # https://bugzilla.redhat.com/show_bug.cgi?id=552960 patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch - # fix realloc usage in vfscanf - # http://sourceware.org/git/?p=glibc.git;a=commit;h=20b38e03 - patch -p1 -i ${srcdir}/glibc-2.15-scanf.patch - - # fix ifunc relocations - # http://sourceware.org/git/?p=glibc.git;a=commit;h=6ee65ed6 - patch -p1 -i ${srcdir}/glibc-2.15-ifunc.patch - - # fix AVX detection - # http://sourceware.org/git/?p=glibc.git;a=commit;h=afc5ed09 - # http://sourceware.org/git/?p=glibc.git;a=commit;h=08cf777f - patch -p1 -i ${srcdir}/glibc-2.15-avx.patch - # and "fix" strcasecmp - patch -p1 -i ${srcdir}/glibc-2.15-strcasecmp-disable-avx.patch - - # fix GB18030 charmap - # http://sourceware.org/bugzilla/show_bug.cgi?id=11837 - # http://sourceware.org/git/?p=glibc.git;a=commit;h=2a57bd79 (fedora branch) - # http://sourceware.org/git/?p=glibc.git;a=commit;h=3d828a61 (fedora branch) - patch -p1 -i ${srcdir}/glibc-2.15-gb18030.patch - - # fix crash in __nscd_get_mapping if nscd not running - # http://sourceware.org/bugzilla/show_bug.cgi?id=13594 (potential fix in comment) - # reverts commit 3a2c0242 and other necessary following changes... - patch -p1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch - - # handle ARENA_TEST correctly - # http://sourceware.org/git/?p=glibc.git;a=commit;h=41b81892 - patch -p1 -i ${srcdir}/glibc-2.15-arena.patch - - # Do not cache negative results in nscd if these are transient - # http://sourceware.org/git/?p=glibc.git;a=commit;h=3e1aa84e - patch -p1 -i ${srcdir}/glibc-2.15-negative-result-cache.patch - - # strcasecmp_l, strncasecmp_l act as strcmp for multiarch x86 - # http://sourceware.org/git/?p=glibc.git;a=commit;h=0bab47b6 - patch -p1 -i ${srcdir}/glibc-2.15-multiarch-x86-strcmp.patch - - # always set l_used for vDSO. - # http://sourceware.org/git/?p=glibc.git;a=commit;h=1f393a11 - patch -p1 -i ${srcdir}/glibc-2.15-vdso.patch - - # fix x86 PLT slot usage for feraiseexcept - # http://sourceware.org/git/?p=glibc.git;a=commit;h=7c35ffed - patch -p1 -i ${srcdir}/glibc-2.15-feraiseexcept-plt.patch - - # vfprintf nargs overflow - CVE-2012-0864 - # http://sourceware.org/git/?p=glibc.git;a=commit;h=7c1f4834 - patch -p1 -i ${srcdir}/glibc-2.15-vfprintf-nargs.patch - - # avoid out ouf bounds read in __libc_res_nquerydomain - # http://sourceware.org/git/?p=glibc.git;a=commit;h=8fdceb2e - patch -p1 -i ${srcdir}/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch - - # make fmtmsg function thread-safe - # http://sourceware.org/git/?p=glibc.git;a=commit;h=7724defc - patch -p1 -i ${srcdir}/glibc-2.15-fmtmsg-locking.patch - - # use non-signaling floating-point comparisons in math functions - # http://sourceware.org/git/?p=glibc.git;a=commit;h=92221550 - patch -p1 -i ${srcdir}/glibc-2.15-non-signalling-comparisons.patch - - # fix rintf rounding. - # http://sourceware.org/git/?p=glibc.git;a=commit;h=fe45ce09 - patch -p1 -i ${srcdir}/glibc-2.15-rintf-rounding.patch - - # fix nearbyintf rounding - # http://sourceware.org/git/?p=glibc.git;a=commit;h=6cbeae47 - patch -p1 -i ${srcdir}/glibc-2.15-nearbyintf-rounding.patch - - # 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 - - # fix testsuite failures with --as-needed - # http://sourceware.org/git/?p=glibc.git;a=commit;h=d4c2917f - patch -p1 -i ${srcdir}/glibc-2.15-testsuite.patch - - install -dm755 ${pkgdir}/etc - touch ${pkgdir}/etc/ld.so.conf - cd ${srcdir} mkdir glibc-build cd glibc-build @@ -241,12 +64,14 @@ build() { CFLAGS=${CFLAGS/-fstack-protector/} CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} - ${srcdir}/glibc/configure --prefix=/usr \ + ${srcdir}/${pkgname}-${pkgver}/configure --prefix=/usr \ --libdir=/usr/lib --libexecdir=/usr/lib \ --with-headers=/usr/include \ --enable-add-ons=nptl,libidn \ + --enable-obsolete-rpc \ --enable-kernel=2.6.32 \ --enable-bind-now --disable-profile \ + --enable-stackguard-randomization \ --enable-multi-arch # build libraries with hardening disabled @@ -270,39 +95,37 @@ check() { package() { cd ${srcdir}/glibc-build + + install -dm755 ${pkgdir}/etc + touch ${pkgdir}/etc/ld.so.conf + make install_root=${pkgdir} install rm -f ${pkgdir}/etc/ld.so.{cache,conf} install -dm755 ${pkgdir}/{etc/rc.d,usr/{sbin,lib/{,locale,systemd/system,tmpfiles.d}}} - install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf + install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf install -m755 ${srcdir}/nscd.rcd ${pkgdir}/etc/rc.d/nscd install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf - install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf + install -m644 ${srcdir}/${pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin # create /etc/locale.gen install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen - sed -i "s|/| |g" ${srcdir}/glibc/localedata/SUPPORTED - sed -i 's|\\| |g' ${srcdir}/glibc/localedata/SUPPORTED - sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/glibc/localedata/SUPPORTED - cat ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen - sed -i "s|^|#|g" ${pkgdir}/etc/locale.gen + sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \ + ${srcdir}/glibc-2.16.0/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen if [[ ${CARCH} = "x86_64" ]]; then - # fix for the linker + # fix paths and compliance with binary blobs... sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd - # Comply with multilib binaries, they look for the linker in /lib64 - mkdir ${pkgdir}/lib64 - cd ${pkgdir}/lib64 - ln -v -s ../lib/ld* . + ln -s /lib ${pkgdir}/lib64 fi - + # Do not strip the following files for improved debugging support # ("improved" as in not breaking gdb and valgrind...): # ld-${pkgver}.so @@ -320,9 +143,9 @@ package() { strip $STRIP_STATIC usr/lib/*.a - strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \ - lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ - lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ + strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \ + lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \ + lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \ lib/{libmemusage,libpcprofile,libSegFault}.so \ usr/lib/{pt_chown,{audit,gconv}/*.so} } diff --git a/staging/glibc/glibc-2.15-revert-c5a0802a.patch b/staging/glibc/glibc-2.15-revert-c5a0802a.patch index f532b95e8..d8894723a 100644 --- a/staging/glibc/glibc-2.15-revert-c5a0802a.patch +++ b/staging/glibc/glibc-2.15-revert-c5a0802a.patch @@ -118,9 +118,9 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde #include <tcb-offsets.h> #include <pthread-pi-defines.h> -#include <pthread-errnos.h> + #include <stap-probe.h> #include <kernel-features.h> - @@ -137,14 +136,11 @@ __pthread_cond_wait: cmpl $PI_BIT, %eax jne 61f @@ -161,7 +161,7 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde -#if cond_lock != 0 - addq $cond_lock, %rdi -#endif -- cmpq $-1, dep_mutex-cond_lock(%rdi) +- LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi) - movl $LLL_PRIVATE, %eax - movl $LLL_SHARED, %esi - cmovne %eax, %esi @@ -187,7 +187,7 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde -#if cond_lock != 0 - addq $cond_lock, %rdi -#endif -- cmpq $-1, dep_mutex-cond_lock(%rdi) +- LP_OP(cmp) $-1, dep_mutex-cond_lock(%rdi) - movl $LLL_PRIVATE, %eax - movl $LLL_SHARED, %esi - cmovne %eax, %esi @@ -199,7 +199,7 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde -93: - /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */ - xorq %r10, %r10 -- movq dep_mutex(%rdi), %r8 +- mov dep_mutex(%rdi), %R8_LP - leaq cond_futex(%rdi), %rdi - jmp 90b -.LcleanupEND2: @@ -224,6 +224,3 @@ diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysde + .uleb128 0 .Lcstend: - -Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.orig -Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.rej |