diff options
58 files changed, 1399 insertions, 253 deletions
diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 7098aea82..a640f65f0 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55124 2011-09-02 23:27:00Z giovanni $ +# $Id: PKGBUILD 55335 2011-09-10 01:42:32Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre -pkgver=0.8.17 +pkgver=0.8.18 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz desktop_integration.patch) -md5sums=('dbd9acc24367d099725dfc4461298738' +md5sums=('6347327567c92ce7ebf82b308e1f6610' '253ce4fe5d01f8ff76b63cd3825755ea') build() { diff --git a/community/dillo/PKGBUILD b/community/dillo/PKGBUILD index 2bef1fd6a..979a4a267 100644 --- a/community/dillo/PKGBUILD +++ b/community/dillo/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 52646 2011-07-26 17:04:09Z spupykin $ +# $Id: PKGBUILD 55292 2011-09-09 09:39:35Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: dorphell <dorphell@archlinux.org> pkgname=dillo -pkgver=2.2.1 +pkgver=3.0 pkgrel=1 pkgdesc="A small, fast graphical web browser built on FLTK" arch=(i686 x86_64) url="http://www.dillo.org" license=('GPL') -depends=('fltk2' 'libjpeg' 'perl' 'openssl' 'libpng' 'gcc-libs' 'libxcursor' +depends=('fltk' 'libjpeg' 'perl' 'openssl' 'libpng' 'gcc-libs' 'libxcursor' 'libxi' 'libxinerama') backup=(etc/dillo/{dillorc,dpidrc}) -source=(http://www.dillo.org/download/$pkgname-$pkgver.tar.bz2 - libpng14.patch) -md5sums=('8875d0188b9281fa2dd683220dcf58a8' - '5336bd3a3b4698c5250ce59e4f2ff91a') +source=(http://www.dillo.org/download/$pkgname-$pkgver.tar.bz2) +md5sums=('448f44a923222270cb0c84e55adc1be1') build() { cd "$srcdir/$pkgname-$pkgver" -# patch -Np1 -i "$srcdir/libpng14.patch" ./configure --prefix=/usr --sysconfdir=/etc --enable-cookies --enable-dlgui \ --enable-ssl make diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 6221c2218..4790cc4ee 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Christian Himpel <chressie at gmail dot com> pkgname=go -pkgver=r59 +pkgver=r60 pkgrel=1 epoch=1 pkgdesc='Google Go compiler and tools (release version)' @@ -83,6 +83,10 @@ package() { install -Dm644 src/Make.* $pkgdir/usr/lib/go/src + # 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 diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index bce6212fc..37ff847c7 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 52254 2011-07-22 15:49:20Z spupykin $ +# $Id: PKGBUILD 55304 2011-09-09 16:08:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zuf <kontakt.zuf@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=kdenlive pkgver=0.8svn20110722 -pkgrel=1 +pkgrel=2 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64') url="http://www.kdenlive.org/" license=('GPL') -depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz') +depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz' + 'libqzeitgeist') makedepends=('automoc4' 'cmake' 'gettext') install=kdenlive.install +options=('docs') #source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") source=("http://arch.p5n.pp.ru/~sergej/dl/kdenlive-${pkgver}.tar.bz2") md5sums=('390fcbce02274ee99b2a6d6a234bef0c') diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD index 7b03c3c8a..bffe4ceeb 100644 --- a/community/kid3/PKGBUILD +++ b/community/kid3/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 40017 2011-02-19 14:10:28Z jlichtblau $ +# $Id: PKGBUILD 55325 2011-09-09 23:42:21Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Alois Nespor <alois.nespor@gmail.com> pkgname=kid3 -pkgver=1.6 +pkgver=2.0 pkgrel=1 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE" arch=('i686' 'x86_64') url="http://kid3.sourceforge.net/" license=('GPL') -depends=('id3lib' 'kdelibs' 'tunepimp') +depends=('id3lib' 'kdebase-runtime' 'kdelibs' 'tunepimp') makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl') options=('!makeflags') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('974208d5545a9a2bb192dc1a3cfaa64f2269d4f7001d150255ce3f3a3f6723c2') +sha256sums=('bdf4ff4f929d7ad6d5b0a6b2661e76ac83216ae94d84a7886f68011c3b7110cd') build() { cd ${srcdir} diff --git a/community/kid3/kid3.changelog b/community/kid3/kid3.changelog index d3f588ba6..0d001bcb8 100644 --- a/community/kid3/kid3.changelog +++ b/community/kid3/kid3.changelog @@ -1,3 +1,6 @@ +2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * kid3 2.0-1 + 2011-02-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * kid3 1.6 diff --git a/community/kid3/kid3.install b/community/kid3/kid3.install index 1c0de2e4f..8ec315e7c 100644 --- a/community/kid3/kid3.install +++ b/community/kid3/kid3.install @@ -1,11 +1,12 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q } post_upgrade() { - post_install + post_install $1 } post_remove() { - post_install + post_install $1 } diff --git a/community/pkgtools/PKGBUILD b/community/pkgtools/PKGBUILD index fc69319c4..4acf5b01d 100644 --- a/community/pkgtools/PKGBUILD +++ b/community/pkgtools/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Daenyth <Daenyth+Arch AT gmail DOT com> pkgname=pkgtools pkgver=23 -pkgrel=1 +pkgrel=2 pkgdesc="A collection of scripts for Arch Linux packages" arch=('i686' 'x86_64') url="http://bbs.archlinux.org/viewtopic.php?pid=384196" @@ -22,7 +22,15 @@ build() { cd "$srcdir/Daenyth-$pkgname"-* make +} + +package() { + cd "$srcdir/Daenyth-$pkgname"-* + make DESTDIR="$pkgdir" install + + # fix infinite loop in autotools configure scripts + sed -i '/export -f command_not_found_handle/d' "$pkgdir/usr/share/pkgtools/pkgfile-hook.bash" } # vim:set ts=2 sw=2 et: diff --git a/community/portaudio_cpp/PKGBUILD b/community/portaudio_cpp/PKGBUILD index 0c666ed5c..58b782570 100644 --- a/community/portaudio_cpp/PKGBUILD +++ b/community/portaudio_cpp/PKGBUILD @@ -1,28 +1,26 @@ -# Based on 'portaudio' package - Eric Belanger <belanger@astro.umontreal.ca> +# $Id: PKGBUILD 55337 2011-09-10 02:09:27Z ebelanger $ # Maintainer: Bob Finch <w9ya@qrparci.net> pkgname=portaudio_cpp -pkgver=19_20071207 -pkgrel=2 +pkgver=19_20110326 +pkgrel=1 pkgdesc="PortAudio c++ bindings" +arch=('i686' 'x86_64') url="http://www.portaudio.com/" -source=(http://www.portaudio.com/archives/pa_stable_v$pkgver.tar.gz) -depends=('portaudio=19_20071207' 'gcc-libs') license=('custom') -arch=('i686' 'x86_64') +depends=("portaudio=${pkgver}" 'gcc-libs') options=('!libtool') -md5sums=('d2943e4469834b25afe62cc51adc025f') +source=(http://www.portaudio.com/archives/pa_stable_v$pkgver.tgz) +md5sums=('8f266ce03638419ef46e4efcb0fabde6') build() { - cd $srcdir/portaudio - ./configure --prefix=/usr - make || return 1 - - install -D -m644 LICENSE.txt\ - $pkgdir/usr/share/licenses/$pkgname/LICENSE.txt - - cd $srcdir/portaudio/bindings/cpp - ./configure --prefix=/usr - make || return 1 + cd "$srcdir/portaudio" + ./configure --prefix=/usr --enable-cxx + make +} + +package() { + cd "$srcdir/portaudio/bindings/cpp" make DESTDIR=$pkgdir install + install -D -m644 ../../LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt" } diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 111839dbc..196b19cd0 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 52050 2011-07-19 20:29:33Z jlichtblau $ +# $Id: PKGBUILD 55314 2011-09-09 20:35:12Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt -pkgver=1.2.2 +pkgver=1.2.3 pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-mimetypes.xml) -sha256sums=('37c241d84e2525c9daa73d05c7101912031944a8ef7f399acdf5f731da8f443d' +sha256sums=('d3b676f6a9f14e18eadc2c18de743a666b70b9ba28f2b6772c9484e277e03be8' 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index e7031e937..4e71ad105 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.2.3-1 + 2011-07-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qlandkartegt 1.2.2-1 diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 38e573a30..cd4aefbf8 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 54767 2011-08-24 14:13:47Z spupykin $ +# $Id: PKGBUILD 55302 2011-09-09 14:03:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell -pkgver=0.11.0 -pkgrel=3 +pkgver=0.11.1 +pkgrel=2 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64') url="http://yorba.org/shotwell/" @@ -15,7 +15,7 @@ depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libr makedepends=('intltool' 'vala') install=shotwell.install source=("http://yorba.org/download/shotwell/0.11/shotwell-${pkgver}.tar.bz2") -md5sums=('f0e942b639d899a91c3cf343f6f553bb') +md5sums=('e2c388bfce992b5437281c4fc29357d9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/shotwell/shotwell.install b/community/shotwell/shotwell.install index 9e61524c4..bab8ecd29 100644 --- a/community/shotwell/shotwell.install +++ b/community/shotwell/shotwell.install @@ -2,23 +2,14 @@ pkgname=shotwell post_install() { gtk-update-icon-cache -fq -t usr/share/icons/hicolor - usr/sbin/gconfpkg --install ${pkgname} update-desktop-database -q glib-compile-schemas usr/share/glib-2.0/schemas } -pre_upgrade() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - post_upgrade() { post_install $1 } -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - post_remove() { update-desktop-database -q gtk-update-icon-cache -fq -t usr/share/icons/hicolor diff --git a/community/tracker/PKGBUILD b/community/tracker/PKGBUILD index 8b5d25fed..1ac40989b 100644 --- a/community/tracker/PKGBUILD +++ b/community/tracker/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 54423 2011-08-18 09:42:45Z spupykin $ +# $Id: PKGBUILD 55298 2011-09-09 09:43:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Alexander Fehr <pizzapunk gmail com> pkgname=tracker -pkgver=0.10.22 -pkgrel=2 +pkgver=0.10.26 +pkgrel=1 pkgdesc="Powerful object database, tag/metadata database, search tool and indexer" arch=('i686' 'x86_64') url="http://www.gnome.org/projects/tracker/" @@ -26,7 +26,7 @@ provides=('libtracker') install=tracker.install source=(http://ftp.gnome.org/pub/GNOME/sources/tracker/0.10/tracker-$pkgver.tar.bz2 tracker-0.10-gnome3-nautilus-extension.patch) -md5sums=('1248742586be5c95871ea59718457657' +md5sums=('3a9e9f8f07b0020c9276571e99cfdb66' '316f1647afe178a87400a476ef1b62a0') build() { diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD new file mode 100644 index 000000000..29c749205 --- /dev/null +++ b/community/wine/PKGBUILD @@ -0,0 +1,143 @@ +# $Id: PKGBUILD 55318 2011-09-09 21:53:02Z svenstaro $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Eduardo Romero <eduardo@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=wine +pkgver=1.3.28 +pkgrel=1 + +_pkgbasever=${pkgver/rc/-rc} + +source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) +md5sums=('70574d609161cec8523804cd9364bcd2') + +pkgdesc="A compatibility layer for running Windows programs" +url="http://www.winehq.com" +arch=(i686 x86_64) +license=(LGPL) +install=wine.install + +depends=( + fontconfig lib32-fontconfig + mesa lib32-mesa + libxcursor lib32-libxcursor + libxrandr lib32-libxrandr + libxdamage lib32-libxdamage + libxxf86dga lib32-libxxf86dga + libxi lib32-libxi + alsa-lib lib32-alsa-lib + desktop-file-utils +) + +makedepends=(autoconf ncurses bison perl fontforge flex prelink + 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2' + giflib lib32-giflib + libxpm lib32-libxpm + libpng lib32-libpng + libxinerama lib32-libxinerama + libxcomposite lib32-libxcomposite + libxmu lib32-libxmu + libxxf86vm lib32-libxxf86vm + libxml2 lib32-libxml2 + libxslt lib32-libxslt + libldap lib32-libldap + lcms lib32-lcms + mpg123 lib32-mpg123 + openal lib32-openal + libcups lib32-libcups + gnutls lib32-gnutls + v4l-utils lib32-v4l-utils + oss +) + +optdepends=( + giflib lib32-giflib + libpng lib32-libpng + libldap lib32-libldap + lcms lib32-lcms + libxml2 lib32-libxml2 + mpg123 lib32-mpg123 + openal lib32-openal + libcups lib32-libcups + gnutls lib32-gnutls + v4l-utils lib32-v4l-utils + oss +) + +if [[ $CARCH == i686 ]]; then + # Strip lib32 etc. on i686 + depends=(${depends[@]/*32-*/}) + makedepends=(${makedepends[@]/*32-*/}) + makedepends=(${makedepends[@]/*-multilib*/}) + optdepends=(${optdepends[@]/*32-*/}) +else + provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver") + conflicts=('bin32-wine' 'wine-wow64') + replaces=('bin32-wine') +fi + +build() { + cd "$srcdir" + + # Allow ccache to work + mv $pkgname-$_pkgbasever $pkgname + + # Get rid of old build dirs + rm -rf $pkgname-{32,64}-build + mkdir $pkgname-32-build + + if [[ $CARCH == x86_64 ]]; then + msg2 "Building Wine-64..." + + mkdir $pkgname-64-build + cd "$srcdir/$pkgname-64-build" + ../$pkgname/configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib \ + --with-x \ + --enable-win64 + + make + + _wine32opts=( + --libdir=/usr/lib32 + --with-wine64="$srcdir/$pkgname-64-build" + ) + + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + fi + + msg2 "Building Wine-32..." + cd "$srcdir/$pkgname-32-build" + ../$pkgname/configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-x \ + "${_wine32opts[@]}" + + make +} + +package() { + msg2 "Packaging Wine-32..." + cd "$srcdir/$pkgname-32-build" + + if [[ $CARCH == i686 ]]; then + make prefix="$pkgdir/usr" install + else + make prefix="$pkgdir/usr" \ + libdir="$pkgdir/usr/lib32" \ + dlldir="$pkgdir/usr/lib32/wine" install + + msg2 "Packaging Wine-64..." + cd "$srcdir/$pkgname-64-build" + make prefix="$pkgdir/usr" \ + libdir="$pkgdir/usr/lib" \ + dlldir="$pkgdir/usr/lib/wine" install + fi +} + +# vim:set ts=8 sts=2 sw=2 et: diff --git a/community/wine/wine.install b/community/wine/wine.install new file mode 100644 index 000000000..f71262186 --- /dev/null +++ b/community/wine/wine.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." + echo "If you are on x86_64, the default WINEARCH will be win64." + echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." + echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." + echo "See the Arch wiki on wine for more information." +} + +post_remove() { + update-desktop-database -q +} diff --git a/community/xnee/PKGBUILD b/community/xnee/PKGBUILD index ca671adaa..092a0c83a 100644 --- a/community/xnee/PKGBUILD +++ b/community/xnee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 44669 2011-04-10 20:26:28Z jlichtblau $ +# $Id: PKGBUILD 55315 2011-09-09 20:38:51Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=xnee -pkgver=3.09 +pkgver=3.10 pkgrel=1 pkgdesc="A program to record, distribute, and replay X (X11) protocol data" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('texinfo') options=('!libtool' '!emptydirs') changelog=$pkgname.changelog source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('1145add697e4932007396bc093336689efa934dd92e701f0aaefe388990e2720') +sha256sums=('6260e02f4938d18a548e6a6716ae48e34f1bf33c7a832d5eda35d4191fb86b56') build() { cd ${srcdir}/$pkgname-$pkgver @@ -28,4 +28,3 @@ package() { make DESTDIR=${pkgdir} install } - diff --git a/community/xnee/xnee.changelog b/community/xnee/xnee.changelog index a096a22e8..f3e20ccfe 100644 --- a/community/xnee/xnee.changelog +++ b/community/xnee/xnee.changelog @@ -1,3 +1,6 @@ +2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * xnee 3.10-1 + 2011-04-10 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * xnee 3.09-1 diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index 799f19ad6..8715f7d04 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 133073 2011-07-27 15:33:16Z dan $ +# $Id: PKGBUILD 137571 2011-09-09 20:06:23Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.12 -pkgrel=2 +pkgver=1.4.12.1 +pkgrel=1 pkgdesc="A Linux kernel packet control tool" arch=('i686' 'x86_64') license=('GPL2') @@ -24,7 +24,7 @@ source=(http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar empty-raw.rules empty-security.rules) backup=(etc/conf.d/iptables) -sha1sums=('6c3f6eceadf5dab570d757d74a7194ef75be3ee3' +sha1sums=('86022c3b5129ad7105f5087ec1349e99cc5a9728' '5bb6fa526665cdd728c26f0f282f5a51f220cf88' '2db68906b603e5268736f48c8e251f3a49da1d75' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' @@ -35,7 +35,6 @@ sha1sums=('6c3f6eceadf5dab570d757d74a7194ef75be3ee3' '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e') - build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -43,6 +42,9 @@ build() { sed -i '87 i libxt_RATEEST.so: libxt_RATEEST.oo' extensions/GNUmakefile.in sed -i '88 i \\t${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -lm -shared ${LDFLAGS} -o $@ $<;\n' extensions/GNUmakefile.in + # FS#25358: libxt_statistic.so undefined symbol: lround + export LDFLAGS="-lm" + ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ --with-xtlibdir=/usr/lib/iptables \ diff --git a/extra/chkrootkit/PKGBUILD b/extra/chkrootkit/PKGBUILD index e47387bcc..8e00d17b6 100644 --- a/extra/chkrootkit/PKGBUILD +++ b/extra/chkrootkit/PKGBUILD @@ -1,24 +1,31 @@ -# $Id: PKGBUILD 52041 2009-09-14 15:18:27Z giovanni $ -# Maintainer: Hugo Doria <hugo@archlinux.org> -# Contributor: Gregor Ibic <gregor.ibic@intelicom.si> +# $Id: PKGBUILD 137609 2011-09-10 03:51:07Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=chkrootkit pkgver=0.49 -pkgrel=1 -pkgdesc="Locally checks for signs of a rootkit." +pkgrel=2 +pkgdesc="Locally checks for signs of a rootkit" arch=('i686' 'x86_64') url="http://www.chkrootkit.org" -depends=('bash') +depends=('sh' 'net-tools') license=('BSD') source=(ftp://ftp.pangeia.com.br/pub/seg/pac/${pkgname}.tar.gz fix-tools-path.patch) -md5sums=('304d840d52840689e0ab0af56d6d3a18' '6a2f3038114b8b14e1ad74e30fe44eee') +md5sums=('304d840d52840689e0ab0af56d6d3a18' + '6a2f3038114b8b14e1ad74e30fe44eee') +sha1sums=('cec1a3c482b95b20d3a946b07fffb23290abc4a6' + 'f192cda177ec1920ce3313ed983ac44ee571ca6c') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -p0 < ${srcdir}/fix-tools-path.patch - chown root:root * - make sense || return 1 - find ${srcdir}/${pkgname}-${pkgver} -perm /u+x -type f \ - -execdir install -D -m755 "{}" ${pkgdir}/usr/bin/"{}" ";" - install -D -m644 COPYRIGHT $startdir/pkg/usr/share/licenses/$pkgname/LICENSE.txt + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i "${srcdir}/fix-tools-path.patch" + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + for i in check_wtmpx chkdirs chklastlog chkproc chkrootkit chkrootkit.orig \ + chkutmp chkwtmp ifpromisc strings-static ; do + install -D -m755 $i "${pkgdir}/usr/bin/$i" + done + install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD index 68629172d..d448e4eb2 100644 --- a/extra/fcitx/PKGBUILD +++ b/extra/fcitx/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 136943 2011-09-03 10:34:07Z andrea $ +# $Id: PKGBUILD 137540 2011-09-09 07:00:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: csslayer <wengxt AT gmail com> pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt') -pkgver=4.1.0 +pkgver=4.1.1 pkgrel=1 arch=('i686' 'x86_64') url="http://code.google.com/p/fcitx/" license=('GPL') makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu') source=("http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('d6aa9ce3344582ba92e850940c20dd28bf98e264') +sha1sums=('465ede4722d2bb0c7fcf2d1a5206c9ce922902a4') build() { cd "${srcdir}" diff --git a/extra/freealut/PKGBUILD b/extra/freealut/PKGBUILD index b334ea987..ae34c1a82 100644 --- a/extra/freealut/PKGBUILD +++ b/extra/freealut/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 27261 2009-02-18 02:47:12Z eric $ -# Maintainer: Dorphell -# Maintainer: Travis Willard <travisw@wmpub.ca> +# $Id: PKGBUILD 137589 2011-09-09 23:35:10Z allan $ +# Maintainer: # Contributor: Arkamririon <Arkamririon@gmx.net> pkgname=freealut pkgver=1.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="OpenAL Utility Toolkit (ALUT)" arch=('i686' 'x86_64') url="http://www.openal.org" license=("LGPL") -depends=('openal>=1.6.372') +depends=('openal') +options=('!libtool') source=(http://connect.creativelabs.com/openal/Downloads/ALUT/$pkgname-$pkgver.tar.gz) md5sums=('e089b28a0267faabdb6c079ee173664a') build() { cd $srcdir/$pkgname-$pkgver ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - find $startdir/pkg -name '*.la' -exec rm {} \; } diff --git a/extra/libglademm/PKGBUILD b/extra/libglademm/PKGBUILD index 61ca5e168..2b5e5ffcf 100644 --- a/extra/libglademm/PKGBUILD +++ b/extra/libglademm/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 13345 2008-09-26 21:07:05Z jgc $ +# $Id: PKGBUILD 137593 2011-09-10 00:04:11Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> + pkgname=libglademm pkgver=2.6.7 -pkgrel=1 +pkgrel=2 pkgdesc="A C++ wrapper for libglade." -arch=(i686 x86_64) +arch=('i686' 'x86_64') +url="http://gtkmm.sourceforge.net/" license=('LGPL') depends=('libglade>=2.6.3' 'gtkmm>=2.14.1') makedepends=('pkgconfig') options=('!libtool') -url="http://gtkmm.sourceforge.net/" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.6/${pkgname}-${pkgver}.tar.bz2) md5sums=('f9ca5b67f6c551ea98790ab5f21c19d0') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libmygpo-qt/PKGBUILD b/extra/libmygpo-qt/PKGBUILD index d75e8840c..eb6325f6e 100644 --- a/extra/libmygpo-qt/PKGBUILD +++ b/extra/libmygpo-qt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 124554 2011-05-22 22:58:16Z andrea $ +# $Id: PKGBUILD 137565 2011-09-09 17:36:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libmygpo-qt -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=1 pkgdesc="A C++/Qt client library for gpodder.net" arch=('i686' 'x86_64') @@ -11,13 +11,13 @@ license=('LGPL2.1') depends=('qjson') makedepends=('cmake') source=("http://stefan.derkits.at/files/${pkgname}/${pkgname}.${pkgver}.tar.gz") -md5sums=('0ed91cc9483f4634e8709a0ea95baeba') +md5sums=('9c840d6a7dc96055c6eb5a7d36d02a7c') build() { cd "${srcdir}" mkdir build cd build - cmake ../${pkgname}.${pkgver} \ + cmake ../${pkgname} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr make diff --git a/extra/libstdc++5/PKGBUILD b/extra/libstdc++5/PKGBUILD index ad9e5c374..3de174843 100644 --- a/extra/libstdc++5/PKGBUILD +++ b/extra/libstdc++5/PKGBUILD @@ -1,38 +1,49 @@ -# $Id: PKGBUILD 35574 2009-04-14 04:10:12Z eric $ +# $Id: PKGBUILD 137600 2011-09-10 01:24:58Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libstdc++5 pkgver=3.3.6 -pkgrel=3 +pkgrel=4 pkgdesc="GNU Standard C++ library version 3" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://gcc.gnu.org" license=('GPL' 'LGPL') depends=('gcc-libs') makedepends=('binutils' 'gcc') options=('!libtool' '!makeflags') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2 gcc-3.4.3-no_multilib_amd64.patch) -md5sums=(18c52e6fb8966b7700665dca289d077f 6b3d00b8d079805be1b895f7f6ce47a0 \ - 088e0807e677010cafe4e590e8711be1) +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2 + 'gcc-3.4.3-no_multilib_amd64.patch') +md5sums=('18c52e6fb8966b7700665dca289d077f' + '6b3d00b8d079805be1b895f7f6ce47a0' + '088e0807e677010cafe4e590e8711be1') build(){ - export CFLAGS=$(echo $CFLAGS | sed 's|-mtune=generic||') - export CXXFLAGS=$(echo $CXXFLAGS | sed 's|-mtune=generic||') + export CFLAGS="-march=${CARCH/_/-} -O2 -pipe" + export CXXFLAGS="-march=${CARCH/_/-} -O2 -pipe" + cd ${srcdir}/gcc-${pkgver} if [ "$CARCH" = "x86_64" ]; then - patch -Np0 -i ../gcc-3.4.3-no_multilib_amd64.patch || return 1 + patch -Np0 -i $srcdir/gcc-3.4.3-no_multilib_amd64.patch fi + + # fix build issue with recent gcc + sed -i "s#O_CREAT#O_CREAT, 0666#" gcc/collect2.c # No fixincludes sed -i -e 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + mkdir ../gcc-build cd ../gcc-build ../gcc-${pkgver}/configure --prefix=/usr --enable-shared \ --enable-languages=c++ --enable-threads=posix --enable-__cxa_atexit \ --disable-multilib --libdir=/usr/lib - make all-target-libstdc++-v3 BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" || return 1 - make DESTDIR=${pkgdir} install-target-libstdc++-v3 || return 1 + make all-target-libstdc++-v3 BOOT_CFLAGS="${CFLAGS}" STAGE1_CFLAGS="-O" +} + +package() { + cd ${srcdir}/gcc-build + make DESTDIR=${pkgdir} install-target-libstdc++-v3 # Remove includefiles and libs provided by gcc rm -rf ${pkgdir}/usr/{include,share/locale} diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD index cf09d5f97..2e859b3a3 100644 --- a/extra/lyx/PKGBUILD +++ b/extra/lyx/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 133449 2011-07-28 03:31:32Z heftig $ +# $Id: PKGBUILD 137569 2011-09-09 19:59:53Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=lyx -pkgver=2.0.0 -pkgrel=3 +pkgver=2.0.1 +pkgrel=1 pkgdesc="An advanced open-source document processor." arch=('i686' 'x86_64') url="http://www.lyx.org" -depends=('qt' 'texlive-core' 'python2' 'perl' 'imagemagick' 'aspell' 'aiksaurus' 'boost-libs') -makedepends=('boost') +depends=('qt' 'texlive-core' 'python2' 'perl' 'imagemagick' 'enchant' 'boost-libs') +makedepends=('boost' 'libmythes') license=('GPL') source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz \ lyx.desktop) -sha1sums=('27bf0ee623aae0e59780d9f627cdf5cb788a2516' - 'e207a0b14d58aeb7b83f8fc47ab2e668cbc66844') +install=lyx.install +sha1sums=('225b4d853f38463e986a9b42a39cac432da56d8a' + 'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -22,7 +23,8 @@ build() { sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp export CXXFLAGS="$CXXFLAGS -fpermissive" ./configure --prefix=/usr \ - --with-frontend=qt4 --without-included-boost + --with-frontend=qt4 --without-included-boost \ + --without-included-mythes make } diff --git a/extra/lyx/lyx.desktop b/extra/lyx/lyx.desktop index 91a90d810..649b30c98 100644 --- a/extra/lyx/lyx.desktop +++ b/extra/lyx/lyx.desktop @@ -1,9 +1,14 @@ [Desktop Entry] -Name=Lyx -Comment=Latex WYSIWYM Editor -Icon=/usr/share/lyx/images/lyx.png -Exec=lyx -Terminal=false +Version=1.0 Type=Application +Name=LyX Document Processor +GenericName=Document Processor +Comment=High level LaTeX frontend +Exec=lyx %F +TryExec=lyx +Icon=lyx StartupNotify=false -Categories=Office; +StartupWMClass=Lyx +Terminal=false +Categories=Office;WordProcessor;Qt; +MimeType=text/x-lyx;application/x-lyx; diff --git a/extra/lyx/lyx.install b/extra/lyx/lyx.install new file mode 100644 index 000000000..c15c17b3a --- /dev/null +++ b/extra/lyx/lyx.install @@ -0,0 +1,14 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove () { + post_install +} + + + diff --git a/extra/mono-addins/PKGBUILD b/extra/mono-addins/PKGBUILD index 5c8181a91..75de85ba0 100644 --- a/extra/mono-addins/PKGBUILD +++ b/extra/mono-addins/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 84508 2010-06-30 16:42:46Z daniel $ +# $Id: PKGBUILD 137544 2011-09-09 07:19:25Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: tardo <tardo@nagi-fanboi.net> pkgname=mono-addins -pkgver=0.5 +pkgver=0.6.2 pkgrel=1 pkgdesc="A generic framework for creating extensible applications and for creating libraries which extend those applications" arch=('i686' 'x86_64') url="http://www.mono-project.com/Mono.Addins" license=('custom:MIT') -depends=('gtk-sharp-2>=2.12.8' 'mono>=2.6.4') +depends=('gtk-sharp-2>=2.12.8' 'mono>=2.10.5') makedepends=('pkgconfig') -source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('22c8dd470caed090b3c77c9423e5b3c6') +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +md5sums=('afbbe5e9fdf9b03911bc8e6b94feb60b') build() { export MONO_SHARED_DIR="${srcdir}/.wabi" diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD index d4fec3349..c25f2f01e 100644 --- a/extra/mono/PKGBUILD +++ b/extra/mono/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 120910 2011-04-27 09:25:47Z daniel $ +# $Id: PKGBUILD 137542 2011-09-09 07:16:56Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Brice Carpentier <brice@dlfp.org> pkgname=mono -pkgver=2.10.2 +pkgver=2.10.5 pkgrel=1 pkgdesc="Free implementation of the .NET platform including runtime and compiler" arch=(i686 x86_64) @@ -14,9 +14,9 @@ makedepends=('pkgconfig') options=('!libtool' '!makeflags') provides=('monodoc') conflicts=('monodoc') -source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 mono.rc.d) -md5sums=('bff057dc3e56b8841bbb1abe053858bb' +md5sums=('1954f11932e82b2ae3b64b2ae9344d90' '8315e46c6a6e9625502521fc0ad1a322') build() { diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD index a7c6daf1b..a58ed2b24 100644 --- a/extra/monodevelop-debugger-gdb/PKGBUILD +++ b/extra/monodevelop-debugger-gdb/PKGBUILD @@ -1,16 +1,15 @@ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=monodevelop-debugger-gdb -pkgver=2.4 +pkgver=2.6 pkgrel=1 pkgdesc="Mono Debugger support" arch=('i686' 'x86_64') url="http://monodevelop.com" license=('GPL') -depends=('monodevelop>=2.4' 'gdb') +depends=('monodevelop>=2.6' 'gdb') makedepends=('mono') -source=(http://ftp.novell.com/pub/mono/sources/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('f5bf8cd4dfdffac928329d98cd56985b') +source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.gz) build() { export MONO_SHARED_DIR="${srcdir}/.wabi" @@ -23,3 +22,4 @@ build() { make DESTDIR="${pkgdir}" install } +md5sums=('c503d0be06c81e0ed2e217fc6e095494') diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index 0566a975e..3eda7b451 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -3,26 +3,23 @@ # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=monodevelop -pkgver=2.4.2 -pkgrel=2 +pkgver=2.6 +pkgrel=1 pkgdesc="An IDE primarily designed for C# and other .NET languages" arch=('i686' 'x86_64') url="http://www.monodevelop.org" license=('GPL') -depends=('mono>=2.10.1' 'mono-addins>=0.5' 'gnome-sharp' 'gecko-sharp-2.0>=0.10') +depends=('mono>=2.10.5' 'mono-addins>=0.6.2' 'gnome-sharp' 'gecko-sharp-2.0>=0.10') options=(!makeflags) install=monodevelop.install -source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - monodevelop_gnome3.patch) -md5sums=('05d20deada26a115418cb1b4526b8d15' - 'fd011f41af212fe87fb9997ebf074188') +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('5bc5f42f9710b6a1fb5180e8050b519b') build() { export MONO_SHARED_DIR=$srcdir/src/.wabi mkdir -p $MONO_SHARED_DIR cd $srcdir/$pkgname-$pkgver - patch -p1 < ${srcdir}/monodevelop_gnome3.patch || return 1 ./configure --prefix=/usr --disable-update-mimedb --disable-update-desktopdb make || return 1 } diff --git a/extra/psi/PKGBUILD b/extra/psi/PKGBUILD index cf3d17109..d8769aed9 100644 --- a/extra/psi/PKGBUILD +++ b/extra/psi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 107019 2011-01-20 14:18:34Z pierre $ +# $Id: PKGBUILD 137579 2011-09-09 21:39:09Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=psi pkgver=0.14 -pkgrel=4 +pkgrel=5 pkgdesc='Instant messaging application designed for the Jabber IM' url='http://psi-im.org/' license=('GPL') diff --git a/extra/rarian/PKGBUILD b/extra/rarian/PKGBUILD index b83caff46..f6ddb58b0 100644 --- a/extra/rarian/PKGBUILD +++ b/extra/rarian/PKGBUILD @@ -1,18 +1,15 @@ -# $Id: PKGBUILD 11986 2008-09-06 21:33:59Z jgc $ +# $Id: PKGBUILD 137591 2011-09-09 23:51:24Z allan $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=rarian pkgver=0.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="Documentation meta-data library, designed as a replacement for Scrollkeeper." arch=('i686' 'x86_64') url="http://rarian.freedesktop.org/" license=('GPL') depends=('gcc-libs') makedepends=('libxslt') -conflicts=('scrollkeeper') -provides=('scrollkeeper') -replaces=('scrollkeeper') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.8/${pkgname}-${pkgver}.tar.bz2 user-segfault.patch) @@ -20,10 +17,14 @@ md5sums=('75091185e13da67a0ff4279de1757b94' '457e9827197009cfa360911fe49a5ad7') build() { - cd ${startdir}/src/${pkgname}-${pkgver} - patch -p0 -i ${srcdir}/user-segfault.patch || return 1 + cd ${srcdir}/${pkgname}-${pkgver} + patch -p0 -i ${srcdir}/user-segfault.patch ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static || return 1 - make || return 1 - make DESTDIR=${startdir}/pkg install || return 1 + --localstatedir=/var --disable-static + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${startdir}/pkg install } diff --git a/extra/sdl_sound/PKGBUILD b/extra/sdl_sound/PKGBUILD index f452d63bf..e33a1addd 100644 --- a/extra/sdl_sound/PKGBUILD +++ b/extra/sdl_sound/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 22260 2008-12-24 15:29:53Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 137585 2011-09-09 23:22:23Z allan $ +# Maintainer: # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sdl_sound pkgver=1.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="A library to decode several popular sound file formats, such as .WAV and .MP3" arch=('i686' 'x86_64') url="http://icculus.org/SDL_sound/" @@ -23,7 +23,11 @@ build() { CXXFLAGS="$CXXFLAGS -I/usr/include/smpeg" \ ./configure --prefix=/usr - make || return 1 + make +} + +package() { + cd ${srcdir}/SDL_sound-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/smpeg/PKGBUILD b/extra/smpeg/PKGBUILD index 46e52f304..9503a1bae 100644 --- a/extra/smpeg/PKGBUILD +++ b/extra/smpeg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 26425 2009-02-07 22:15:52Z eric $ +# $Id: PKGBUILD 137587 2011-09-09 23:30:58Z allan $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=smpeg pkgver=0.4.4 -pkgrel=5 +pkgrel=6 pkgdesc="SDL MPEG Player Library" arch=('i686' 'x86_64') url="http://icculus.org/smpeg/" @@ -13,17 +13,24 @@ depends=('sdl') makedepends=('gtk' 'mesa') optdepends=('gtk: to use gtv ' 'mesa: to use glmovie') options=('!libtool' '!makeflags') -source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/${pkgname}-${pkgver}.tar.gz smpeg-0.4.4-gcc41.patch) -md5sums=('59c76ac704088ef5539210190c4e1fe3' '8b979a58307d7196655758bd3d2466c4') -sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259' '7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e') +source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/${pkgname}-${pkgver}.tar.gz + smpeg-0.4.4-gcc41.patch) +md5sums=('59c76ac704088ef5539210190c4e1fe3' + '8b979a58307d7196655758bd3d2466c4') +sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259' + '7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -p1 < ../smpeg-0.4.4-gcc41.patch || return 1 - ./configure --prefix=/usr --mandir=/usr/share/man || return 1 - make LDFLAGS+=-lstdc++ || return 1 - make DESTDIR=${pkgdir} install || return 1 + patch -p1 -i $srcdir/smpeg-0.4.4-gcc41.patch + ./configure --prefix=/usr --mandir=/usr/share/man + make LDFLAGS+=-lstdc++ +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install - #fix aclocal warnings - sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4 || return 1 + # fix aclocal warnings + sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4 } diff --git a/extra/speex/PKGBUILD b/extra/speex/PKGBUILD index 672dc9887..7bf7e7b22 100644 --- a/extra/speex/PKGBUILD +++ b/extra/speex/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 7447 2008-08-02 04:56:05Z eric $ +# $Id: PKGBUILD 137583 2011-09-09 22:58:20Z allan $ +# Maintainer: # Contributer: Jason Chu <jason@archlinux.org> -# Maintainer: Jason Chu <jason@archlinux.org> pkgname=speex pkgver=1.2rc1 -pkgrel=1 +pkgrel=2 pkgdesc="A free codec for free speech" arch=('i686' 'x86_64') +url="http://www.speex.org/" license=('BSD') depends=('libogg') options=('!libtool') source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) md5sums=('c4438b22c08e5811ff10e2b06ee9b9ae') -url="http://www.speex.org/" build() { - cd $startdir/src/speex-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make || return 1 - make DESTDIR=$startdir/pkg install - #to fix kde detection - cp $startdir/pkg/usr/include/speex/* $startdir/pkg/usr/include/ - install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE + cd $srcdir/speex-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd $srcdir/speex-$pkgver + make DESTDIR=$startdir/pkg install + + install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/LICENSE } diff --git a/extra/streamripper/PKGBUILD b/extra/streamripper/PKGBUILD index 009f2eb27..8cceccb06 100644 --- a/extra/streamripper/PKGBUILD +++ b/extra/streamripper/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 51858 2009-09-12 21:44:06Z eric $ -# Contributor: damir <damir@archlinux.org> -# Maintainer: Thayer Williams <thayer@archlinux.org> +# $Id: PKGBUILD 137607 2011-09-10 03:20:46Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=streamripper pkgver=1.64.6 -pkgrel=1 +pkgrel=2 pkgdesc="Records and splits streaming mp3 into tracks" arch=('i686' 'x86_64') url="http://streamripper.sourceforge.net" license=('GPL') -depends=('glibc' 'glib2' 'libmad' 'faad2>=2.7' 'libvorbis') +depends=('glib2' 'libmad' 'faad2' 'libvorbis') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/streamripper/streamripper-$pkgver.tar.gz) +source=(http://downloads.sourceforge.net/sourceforge/streamripper/streamripper-${pkgver}.tar.gz) md5sums=('a37a1a8b8f9228522196a122a1c2dd32') sha1sums=('bc8a8d3ad045e0772ca691d2063c39efcc0dca45') build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="$pkgdir" install } diff --git a/extra/sweep/PKGBUILD b/extra/sweep/PKGBUILD index 3b664723e..0cc3698c7 100644 --- a/extra/sweep/PKGBUILD +++ b/extra/sweep/PKGBUILD @@ -1,20 +1,25 @@ -# $Id: PKGBUILD 54821 2009-10-11 19:41:33Z giovanni $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 137595 2011-09-10 00:12:32Z allan $ +# Maintainer: # Contributer: Jason Chu <jchu@xentac.net> + pkgname=sweep pkgver=0.9.3 -pkgrel=1 +pkgrel=2 pkgdesc="Sound editing and mixing program" -arch=(i686 x86_64) +arch=('i686' 'x86_64') +url="http://www.metadecks.org/software/sweep/" license=('GPL2') depends=('gtk2' 'libsamplerate' 'libmad' 'libvorbis' 'alsa-lib' 'speex') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -url="http://www.metadecks.org/software/sweep/" +md5sums=('69e19bad2673f20e15224c0a5b5d4c85') build() { - cd $startdir/src/sweep-$pkgver + cd $srcdir/sweep-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make || return 1 - make prefix=$startdir/pkg/usr sysconfdir=$startdir/pkg/etc localstatedir=$startdir/pkg/var install + make +} + +package() { + cd $srcdir/sweep-$pkgver + make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc localstatedir=$pkgdir/var install } -md5sums=('69e19bad2673f20e15224c0a5b5d4c85') diff --git a/extra/t1lib/PKGBUILD b/extra/t1lib/PKGBUILD index 96f0c7a6d..50d8a4c8e 100644 --- a/extra/t1lib/PKGBUILD +++ b/extra/t1lib/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 18717 2008-11-08 21:45:38Z giovanni $ +# $Id: PKGBUILD 137602 2011-09-10 01:36:02Z allan $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Rainer Moll <renari@arcor.de> pkgname=t1lib pkgver=5.1.2 -pkgrel=2 +pkgrel=3 pkgdesc="Library for generating character- and string-glyphs from Adobe Type 1 fonts" -arch=(i686 x86_64) -license=("GPL") +arch=('i686' 'x86_64') +url="http://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html" +license=('GPL') depends=('libxaw') options=(!libtool) -url="http://www.ibiblio.org/pub/Linux/libs/graphics/!INDEX.html" source=(http://www.ibiblio.org/pub/Linux/libs/graphics/${pkgname}-${pkgver}.tar.gz ) md5sums=('a5629b56b93134377718009df1435f3c') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr - make without_doc || return 1 - make DESTDIR="${pkgdir}" install || return 1 + make without_doc +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/t1lib/overflow.patch b/extra/t1lib/overflow.patch new file mode 100644 index 000000000..9f033c0de --- /dev/null +++ b/extra/t1lib/overflow.patch @@ -0,0 +1,15 @@ +--- t1env.c.orig 2007-09-16 19:56:38.319184208 +0200 ++++ t1env.c 2007-09-16 20:05:02.057070439 +0200 +@@ -611,6 +611,12 @@ + #endif + strcat( pathbuf, DIRECTORY_SEP); + /* And finally the filename: */ ++ /* If current pathbuf + StrippedName + 1 byte for NULL is bigger than pathbuf ++ let's try next pathbuf */ ++ if( strlen(pathbuf) + strlen(StrippedName) + 1 > sizeof(pathbuf) ) { ++ i++; ++ continue; ++ } + strcat( pathbuf, StrippedName); + + /* Check for existence of the path: */ diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD index 3d4c1e7f2..ce7c1fbf2 100644 --- a/extra/texmacs/PKGBUILD +++ b/extra/texmacs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122838 2011-05-06 11:44:16Z ronald $ +# $Id: PKGBUILD 137567 2011-09-09 18:36:00Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=texmacs -pkgver=1.0.7.10 +pkgver=1.0.7.12 pkgrel=1 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one." arch=('i686' 'x86_64') @@ -12,8 +12,9 @@ license=('GPL') depends=('perl' 'guile' 'texlive-core' 'python2' 'libxext' 'freetype2') # do not remove texlive-core dependency, as it is needed! optdepends=('transfig: convert images using fig2ps') -source=(ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-${pkgver}-src.tar.gz) -sha1sums=('12491496e68b62aa07369748770771a8c2378129') +#source=(ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-${pkgver}-src.tar.gz) +source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-1.0.7.12-src.tar.gz) +sha1sums=('9a6560dc2d8e685b97f4afe468b38d89bd29ca9d') build() { cd ${srcdir}/TeXmacs-${pkgver}-src @@ -23,7 +24,8 @@ build() { sed -i '/^LDPATH/d' src/makefile.in ./configure --prefix=/usr \ --mandir=/usr/share/man \ - --libexecdir=/usr/lib + --libexecdir=/usr/lib \ + --disable-qt make } diff --git a/extra/windowmaker-crm-git/PKGBUILD b/extra/windowmaker-crm-git/PKGBUILD index 6a4789552..b2b1b4f1e 100644 --- a/extra/windowmaker-crm-git/PKGBUILD +++ b/extra/windowmaker-crm-git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 94218 2010-10-05 16:33:23Z daniel $ +# $Id: PKGBUILD 137555 2011-09-09 11:26:39Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=windowmaker-crm-git -pkgver=20101005 +pkgver=20110909 pkgrel=1 pkgdesc="An X11 window manager with a NEXTSTEP look and feel - git version from Carlos R. Mafra" arch=(i686 x86_64) @@ -13,7 +13,7 @@ options=('!libtool') provides=('windowmaker') conflicts=('windowmaker') source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop) -md5sums=('8cc7e736a8d7e446f696b80fc7dcb79c' +md5sums=('594f66f40130fe49b6350579f4d54c2b' '2fba97bebfd691836b92b8f0db79ff13') build() { @@ -22,7 +22,7 @@ build() { ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --enable-xinerama \ --with-nlsdir=/usr/share/locale --with-gnustepdir=/usr/lib/GNUstep \ - --enable-usermenu --enable-modelock + --enable-usermenu --enable-modelock --enable-xrandr make || return 1 make DESTDIR=$pkgdir install || return 1 install -D -m644 COPYING.WTFPL $pkgdir/usr/share/licenses/$pkgname/COPYING.WTFPL diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 0f4be9c87..3d76eab90 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 136353 2011-08-27 08:38:05Z ibiru $ +# $Id: PKGBUILD 137559 2011-09-09 12:10:57Z guillaume $ # Maintainer: Guillaume ALAUX <guillaume at alaux dot net> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> pkgname=(wireshark-cli wireshark-gtk) pkgbase=wireshark -pkgver=1.6.1 -pkgrel=3 +pkgver=1.6.2 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'libgcrypt' 'lua') url="http://www.wireshark.org/" options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('dc1e8c9800b64130674b120a183e2308') +md5sums=('301677b5f8150265315632fb6247e06e') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD index c7e5a441f..1ab882ce8 100644 --- a/extra/wxmaxima/PKGBUILD +++ b/extra/wxmaxima/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Vinay S Shastry <vinayshastry@gmail.com> pkgname=wxmaxima -pkgver=11.04.0 +pkgver=11.08.0 pkgrel=1 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://wxmaxima.sourceforge.net/" license=('GPL2') depends=('maxima' 'libxml2' 'wxgtk') source=(http://downloads.sourceforge.net/$pkgname/wxMaxima-$pkgver.tar.gz) -sha1sums=('eef566c6b135943fada0ce844ed4f370374c6392') +sha1sums=('852a772e4b982bc355120cc95ee6f3d600ce011b') build() { cd "${srcdir}/wxMaxima-${pkgver}" diff --git a/gnome-unstable/gdm/PKGBUILD b/gnome-unstable/gdm/PKGBUILD index d151c85c7..8b1ff95ad 100644 --- a/gnome-unstable/gdm/PKGBUILD +++ b/gnome-unstable/gdm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 137518 2011-09-08 14:13:16Z ibiru $ +# $Id: PKGBUILD 137581 2011-09-09 22:14:52Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gdm -pkgver=3.1.90 -pkgrel=4 +pkgver=3.1.91 +pkgrel=1 pkgdesc="Gnome Display Manager (a reimplementation of xdm)" arch=('i686' 'x86_64') license=('GPL') @@ -17,22 +17,20 @@ install=gdm.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz fix_external_program_directories.patch gdm - gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam - fix-consolekit-registration.patch) -sha256sums=('3fb9c52b8a18f39539c53d84645b89836de25a3eb3a0b84388e76a4f988178bf' - 'b7c19ab68dc38216f751be6d1e66d617fb9011e23185590e52ac1974d3bc1afb' + gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam) +sha256sums=('a9163b711f9cdd005b872575226dd97e06b3eb5e34369aae905e96677e682ef2' + '55654861b14fea344bc7a43fa265c9aaffcd16f5cf56360483fff5d4dc83cf15' '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550' 'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d' '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e' 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19' '0dbb37b4e2a2a2dd2305f0f69cf32d63d353d34aacaf805d2c2ec52fbe558bb4' 'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd' - '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834' - '405d82ad12ea6371ddc031e7d86e5d2ade6fe054bebbfaf24c89ac0a85fcef1c') + '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834') + build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/fix_external_program_directories.patch" - patch -Np1 -i "${srcdir}/fix-consolekit-registration.patch" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gdm \ @@ -57,5 +55,6 @@ package() { install -Dm755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/gdm" chmod 1770 "${pkgdir}/var/log/gdm" + chmod 700 "${pkgdir}/var/lib/gdm/.config/dconf" rm -rf "${pkgdir}/var/run" "${pkgdir}/var/gdm" "${pkgdir}/etc/gconf" } diff --git a/gnome-unstable/gdm/fix_external_program_directories.patch b/gnome-unstable/gdm/fix_external_program_directories.patch index ce55b1d20..b74530dd2 100644 --- a/gnome-unstable/gdm/fix_external_program_directories.patch +++ b/gnome-unstable/gdm/fix_external_program_directories.patch @@ -1,6 +1,6 @@ -diff -Nur gdm-3.1.90.orig/daemon/gdm-server.c gdm-3.1.90/daemon/gdm-server.c ---- gdm-3.1.90.orig/daemon/gdm-server.c 2011-09-02 13:13:16.132989960 +0000 -+++ gdm-3.1.90/daemon/gdm-server.c 2011-09-03 08:00:30.007431483 +0000 +diff -Nur gdm-3.1.91.orig/daemon/gdm-server.c gdm-3.1.91/daemon/gdm-server.c +--- gdm-3.1.91.orig/daemon/gdm-server.c 2011-09-09 21:58:06.586838200 +0000 ++++ gdm-3.1.91/daemon/gdm-server.c 2011-09-09 21:58:14.583578916 +0000 @@ -131,7 +131,7 @@ g_return_val_if_fail (GDM_IS_SERVER (server), NULL); @@ -10,19 +10,19 @@ diff -Nur gdm-3.1.90.orig/daemon/gdm-server.c gdm-3.1.90/daemon/gdm-server.c server->priv->display_name); g_debug ("GdmServer: Running helper %s", command); -diff -Nur gdm-3.1.90.orig/data/gdm-shell.session.in gdm-3.1.90/data/gdm-shell.session.in ---- gdm-3.1.90.orig/data/gdm-shell.session.in 2011-09-02 13:13:16.136323327 +0000 -+++ gdm-3.1.90/data/gdm-shell.session.in 2011-09-03 08:01:06.721067234 +0000 +diff -Nur gdm-3.1.91.orig/data/gdm-shell.session.in gdm-3.1.91/data/gdm-shell.session.in +--- gdm-3.1.91.orig/data/gdm-shell.session.in 2011-09-09 21:58:06.613505113 +0000 ++++ gdm-3.1.91/data/gdm-shell.session.in 2011-09-09 21:59:00.300668930 +0000 @@ -1,5 +1,5 @@ [GNOME Session] Name=Display Manager RequiredComponents=gnome-shell;gnome-settings-daemon; --IsRunnableHelper=bash -c "gnome-shell --help | grep -q gdm-mode && (gnome-shell --version | grep -q '3.1.90$' && false || true) && (mutter --version | grep -q '3.1.90$' && false || true) && @libexecdir@/gnome-session-check-accelerated" -+IsRunnableHelper=bash -c "gnome-shell --help | grep -q gdm-mode && (gnome-shell --version | grep -q '3.1.90$' && false || true) && (mutter --version | grep -q '3.1.90$' && false || true) && /usr/lib/gnome-session/gnome-session-check-accelerated" +-IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated ++IsRunnableHelper=/usr/lib/gnome-session/gnome-session-check-accelerated FallbackSession=gdm-fallback -diff -Nur gdm-3.1.90.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.1.90/gui/simple-chooser/gdm-chooser-session.c ---- gdm-3.1.90.orig/gui/simple-chooser/gdm-chooser-session.c 2011-09-02 13:13:16.136323327 +0000 -+++ gdm-3.1.90/gui/simple-chooser/gdm-chooser-session.c 2011-09-03 08:00:30.010764843 +0000 +diff -Nur gdm-3.1.91.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.1.91/gui/simple-chooser/gdm-chooser-session.c +--- gdm-3.1.91.orig/gui/simple-chooser/gdm-chooser-session.c 2011-09-09 21:58:06.613505113 +0000 ++++ gdm-3.1.91/gui/simple-chooser/gdm-chooser-session.c 2011-09-09 21:58:14.583578916 +0000 @@ -131,7 +131,7 @@ ret = FALSE; diff --git a/gnome-unstable/json-glib/PKGBUILD b/gnome-unstable/json-glib/PKGBUILD new file mode 100644 index 000000000..9d6ec4b39 --- /dev/null +++ b/gnome-unstable/json-glib/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 137563 2011-09-09 14:19:59Z ibiru $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=json-glib +pkgver=0.13.90 +pkgrel=1 +pkgdesc="JSON library built on GLib" +arch=('i686' 'x86_64') +url="http://live.gnome.org/JsonGlib" +license=('GPL') +depends=('glib2') +makedepends=('gobject-introspection') +options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.xz) +sha256sums=('9014919ed26da0765f8b784d9b604d963b77922db388d29bf08fb3beced8d7ff') + +build(){ + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/testing/coreutils/PKGBUILD b/testing/coreutils/PKGBUILD new file mode 100644 index 000000000..62bb2d221 --- /dev/null +++ b/testing/coreutils/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 137548 2011-09-09 09:49:34Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=coreutils +pkgver=8.13 +pkgrel=1 +pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" +arch=('i686' 'x86_64') +license=('GPL3') +url="http://www.gnu.org/software/coreutils" +groups=('base') +depends=('glibc' 'shadow' 'pam' 'acl' 'gmp' 'libcap') +replaces=('mktemp') +backup=('etc/pam.d/su') +install=${pkgname}.install +options=('!emptydirs') +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz + coreutils-uname.patch + coreutils-pam.patch + su.pam) +md5sums=('8e1675c6c336ff55557c698706a63d6c' + 'c4fcca138b6abf6d443d48a6f0cd8833' + 'aad79a2aa6d566c375d7bdd1b0767278' + 'fa85e5cce5d723275b14365ba71a8aad') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # added su wheel group pam patch (from fedora git) + patch -Np1 -i ${srcdir}/coreutils-pam.patch + + # linux specific uname improvement (from gentoo portage) + patch -Np1 -i ${srcdir}/coreutils-uname.patch + + autoreconf -v + ./configure --prefix=/usr \ + --enable-install-program=su \ + --enable-no-install-program=groups,hostname,kill,uptime \ + --enable-pam + make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make RUN_EXPENSIVE_TESTS=yes check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + cd ${pkgdir}/usr/bin + install -dm755 ${pkgdir}/{bin,usr/sbin} + + # binaries required by FHS + _fhs="cat chgrp chmod chown cp date dd df echo false ln ls \ + mkdir mknod mv pwd rm rmdir stty su sync true uname" + mv ${_fhs} ${pkgdir}/bin + + # binaries required by various Arch scripts + _bin="cut dir dircolors du install mkfifo readlink shred \ + sleep touch tr vdir" + mv ${_bin} ${pkgdir}/bin + ln -sf /bin/sleep ${pkgdir}/usr/bin/sleep + + mv chroot ${pkgdir}/usr/sbin + install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su +} diff --git a/testing/coreutils/coreutils-pam.patch b/testing/coreutils/coreutils-pam.patch new file mode 100644 index 000000000..e61908f3f --- /dev/null +++ b/testing/coreutils/coreutils-pam.patch @@ -0,0 +1,428 @@ +diff -urNp coreutils-8.4-orig/configure.ac coreutils-8.4/configure.ac +--- coreutils-8.4-orig/configure.ac 2010-01-11 18:20:42.000000000 +0100 ++++ coreutils-8.4/configure.ac 2010-02-12 10:17:46.000000000 +0100 +@@ -126,6 +126,13 @@ if test "$gl_gcc_warnings" = yes; then + AC_SUBST([GNULIB_WARN_CFLAGS]) + fi + ++dnl Give the chance to enable PAM ++AC_ARG_ENABLE(pam, dnl ++[ --enable-pam Enable use of the PAM libraries], ++[AC_DEFINE(USE_PAM, 1, [Define if you want to use PAM]) ++LIB_PAM="-ldl -lpam -lpam_misc" ++AC_SUBST(LIB_PAM)]) ++ + AC_FUNC_FORK + + optional_bin_progs= +diff -urNp coreutils-8.4-orig/doc/coreutils.texi coreutils-8.4/doc/coreutils.texi +--- coreutils-8.4-orig/doc/coreutils.texi 2010-01-03 18:06:20.000000000 +0100 ++++ coreutils-8.4/doc/coreutils.texi 2010-02-12 10:17:46.000000000 +0100 +@@ -15081,8 +15081,11 @@ to certain shells, etc.). + @findex syslog + @command{su} can optionally be compiled to use @code{syslog} to report + failed, and optionally successful, @command{su} attempts. (If the system +-supports @code{syslog}.) However, GNU @command{su} does not check if the +-user is a member of the @code{wheel} group; see below. ++supports @code{syslog}.) ++ ++This version of @command{su} has support for using PAM for ++authentication. You can edit @file{/etc/pam.d/su} to customize its ++behaviour. + + The program accepts the following options. Also see @ref{Common options}. + +@@ -15124,6 +15127,8 @@ environment variables except @env{TERM}, + @env{PATH} to a compiled-in default value. Change to @var{user}'s home + directory. Prepend @samp{-} to the shell's name, intended to make it + read its login startup file(s). ++Additionaly @env{DISPLAY} and @env{XAUTHORITY} environment variables ++are preserved as well for PAM functionality. + + @item -m + @itemx -p +@@ -15163,33 +15168,6 @@ Exit status: + the exit status of the subshell otherwise + @end display + +-@cindex wheel group, not supported +-@cindex group wheel, not supported +-@cindex fascism +-@subsection Why GNU @command{su} does not support the @samp{wheel} group +- +-(This section is by Richard Stallman.) +- +-@cindex Twenex +-@cindex MIT AI lab +-Sometimes a few of the users try to hold total power over all the +-rest. For example, in 1984, a few users at the MIT AI lab decided to +-seize power by changing the operator password on the Twenex system and +-keeping it secret from everyone else. (I was able to thwart this coup +-and give power back to the users by patching the kernel, but I +-wouldn't know how to do that in Unix.) +- +-However, occasionally the rulers do tell someone. Under the usual +-@command{su} mechanism, once someone learns the root password who +-sympathizes with the ordinary users, he or she can tell the rest. The +-``wheel group'' feature would make this impossible, and thus cement the +-power of the rulers. +- +-I'm on the side of the masses, not that of the rulers. If you are +-used to supporting the bosses and sysadmins in whatever they do, you +-might find this idea strange at first. +- +- + @node timeout invocation + @section @command{timeout}: Run a command with a time limit + +diff -urNp coreutils-8.4-orig/src/Makefile.am coreutils-8.4/src/Makefile.am +--- coreutils-8.4-orig/src/Makefile.am 2010-01-03 18:06:20.000000000 +0100 ++++ coreutils-8.4/src/Makefile.am 2010-02-12 10:17:46.000000000 +0100 +@@ -361,7 +361,7 @@ factor_LDADD += $(LIB_GMP) + uptime_LDADD += $(GETLOADAVG_LIBS) + + # for crypt +-su_LDADD += $(LIB_CRYPT) ++su_LDADD += $(LIB_CRYPT) @LIB_PAM@ + + # for various ACL functions + copy_LDADD += $(LIB_ACL) +diff -urNp coreutils-8.4-orig/src/su.c coreutils-8.4/src/su.c +--- coreutils-8.4-orig/src/su.c 2010-02-12 10:15:15.000000000 +0100 ++++ coreutils-8.4/src/su.c 2010-02-12 10:24:29.000000000 +0100 +@@ -37,6 +37,16 @@ + restricts who can su to UID 0 accounts. RMS considers that to + be fascist. + ++#ifdef USE_PAM ++ ++ Actually, with PAM, su has nothing to do with whether or not a ++ wheel group is enforced by su. RMS tries to restrict your access ++ to a su which implements the wheel group, but PAM considers that ++ to be fascist, and gives the user/sysadmin the opportunity to ++ enforce a wheel group by proper editing of /etc/pam.conf ++ ++#endif ++ + Compile-time options: + -DSYSLOG_SUCCESS Log successful su's (by default, to root) with syslog. + -DSYSLOG_FAILURE Log failed su's (by default, to root) with syslog. +@@ -53,6 +63,15 @@ + #include <pwd.h> + #include <grp.h> + ++#ifdef USE_PAM ++# include <signal.h> ++# include <sys/wait.h> ++# include <sys/fsuid.h> ++# include <unistd.h> ++# include <security/pam_appl.h> ++# include <security/pam_misc.h> ++#endif /* USE_PAM */ ++ + #include "system.h" + #include "getpass.h" + +@@ -120,10 +139,17 @@ + /* The user to become if none is specified. */ + #define DEFAULT_USER "root" + ++#ifndef USE_PAM + char *crypt (char const *key, char const *salt); ++#endif + +-static void run_shell (char const *, char const *, char **, size_t) ++static void run_shell (char const *, char const *, char **, size_t, ++ const struct passwd *) ++#ifdef USE_PAM ++ ; ++#else + ATTRIBUTE_NORETURN; ++#endif + + /* If true, pass the `-f' option to the subshell. */ + static bool fast_startup; +@@ -209,7 +235,26 @@ log_su (struct passwd const *pw, bool su + } + #endif + ++#ifdef USE_PAM ++static pam_handle_t *pamh = NULL; ++static int retval; ++static struct pam_conv conv = { ++ misc_conv, ++ NULL ++}; ++ ++#define PAM_BAIL_P if (retval) { \ ++ pam_end(pamh, PAM_SUCCESS); \ ++ return 0; \ ++} ++#define PAM_BAIL_P_VOID if (retval) { \ ++ pam_end(pamh, PAM_SUCCESS); \ ++return; \ ++} ++#endif ++ + /* Ask the user for a password. ++ If PAM is in use, let PAM ask for the password if necessary. + Return true if the user gives the correct password for entry PW, + false if not. Return true without asking for a password if run by UID 0 + or if PW has an empty password. */ +@@ -217,6 +262,44 @@ log_su (struct passwd const *pw, bool su + static bool + correct_password (const struct passwd *pw) + { ++#ifdef USE_PAM ++ struct passwd *caller; ++ char *tty_name, *ttyn; ++ retval = pam_start(PROGRAM_NAME, pw->pw_name, &conv, &pamh); ++ PAM_BAIL_P; ++ ++ if (getuid() != 0 && !isatty(0)) { ++ fprintf(stderr, "standard in must be a tty\n"); ++ exit(1); ++ } ++ ++ caller = getpwuid(getuid()); ++ if(caller != NULL && caller->pw_name != NULL) { ++ retval = pam_set_item(pamh, PAM_RUSER, caller->pw_name); ++ PAM_BAIL_P; ++ } ++ ++ ttyn = ttyname(0); ++ if (ttyn) { ++ if (strncmp(ttyn, "/dev/", 5) == 0) ++ tty_name = ttyn+5; ++ else ++ tty_name = ttyn; ++ retval = pam_set_item(pamh, PAM_TTY, tty_name); ++ PAM_BAIL_P; ++ } ++ retval = pam_authenticate(pamh, 0); ++ PAM_BAIL_P; ++ retval = pam_acct_mgmt(pamh, 0); ++ if (retval == PAM_NEW_AUTHTOK_REQD) { ++ /* password has expired. Offer option to change it. */ ++ retval = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); ++ PAM_BAIL_P; ++ } ++ PAM_BAIL_P; ++ /* must be authenticated if this point was reached */ ++ return 1; ++#else /* !USE_PAM */ + char *unencrypted, *encrypted, *correct; + #if HAVE_GETSPNAM && HAVE_STRUCT_SPWD_SP_PWDP + /* Shadow passwd stuff for SVR3 and maybe other systems. */ +@@ -241,6 +324,7 @@ correct_password (const struct passwd *p + encrypted = crypt (unencrypted, correct); + memset (unencrypted, 0, strlen (unencrypted)); + return STREQ (encrypted, correct); ++#endif /* !USE_PAM */ + } + + /* Update `environ' for the new shell based on PW, with SHELL being +@@ -254,12 +338,18 @@ modify_environment (const struct passwd + /* Leave TERM unchanged. Set HOME, SHELL, USER, LOGNAME, PATH. + Unset all other environment variables. */ + char const *term = getenv ("TERM"); ++ char const *display = getenv ("DISPLAY"); ++ char const *xauthority = getenv ("XAUTHORITY"); + if (term) + term = xstrdup (term); + environ = xmalloc ((6 + !!term) * sizeof (char *)); + environ[0] = NULL; + if (term) + xsetenv ("TERM", term); ++ if (display) ++ xsetenv ("DISPLAY", display); ++ if (xauthority) ++ xsetenv ("XAUTHORITY", xauthority); + xsetenv ("HOME", pw->pw_dir); + xsetenv ("SHELL", shell); + xsetenv ("USER", pw->pw_name); +@@ -292,8 +382,13 @@ change_identity (const struct passwd *pw + { + #ifdef HAVE_INITGROUPS + errno = 0; +- if (initgroups (pw->pw_name, pw->pw_gid) == -1) ++ if (initgroups (pw->pw_name, pw->pw_gid) == -1) { ++#ifdef USE_PAM ++ pam_close_session(pamh, 0); ++ pam_end(pamh, PAM_ABORT); ++#endif + error (EXIT_CANCELED, errno, _("cannot set groups")); ++ } + endgrent (); + #endif + if (setgid (pw->pw_gid)) +@@ -302,6 +397,31 @@ change_identity (const struct passwd *pw + error (EXIT_CANCELED, errno, _("cannot set user id")); + } + ++#ifdef USE_PAM ++static int caught=0; ++/* Signal handler for parent process later */ ++static void su_catch_sig(int sig) ++{ ++ ++caught; ++} ++ ++int ++pam_copyenv (pam_handle_t *pamh) ++{ ++ char **env; ++ ++ env = pam_getenvlist(pamh); ++ if(env) { ++ while(*env) { ++ if (putenv (*env)) ++ xalloc_die (); ++ env++; ++ } ++ } ++ return(0); ++} ++#endif ++ + /* Run SHELL, or DEFAULT_SHELL if SHELL is empty. + If COMMAND is nonzero, pass it to the shell with the -c option. + Pass ADDITIONAL_ARGS to the shell as more arguments; there +@@ -309,17 +429,49 @@ change_identity (const struct passwd *pw + + static void + run_shell (char const *shell, char const *command, char **additional_args, +- size_t n_additional_args) ++ size_t n_additional_args, const struct passwd *pw) + { + size_t n_args = 1 + fast_startup + 2 * !!command + n_additional_args + 1; + char const **args = xnmalloc (n_args, sizeof *args); + size_t argno = 1; ++#ifdef USE_PAM ++ int child; ++ sigset_t ourset; ++ int status; ++ ++ retval = pam_open_session(pamh,0); ++ if (retval != PAM_SUCCESS) { ++ fprintf (stderr, "could not open session\n"); ++ exit (1); ++ } ++ ++/* do this at the last possible moment, because environment variables may ++ be passed even in the session phase ++*/ ++ if(pam_copyenv(pamh) != PAM_SUCCESS) ++ fprintf (stderr, "error copying PAM environment\n"); ++ ++ /* Credentials should be set in the parent */ ++ if (pam_setcred(pamh, PAM_ESTABLISH_CRED) != PAM_SUCCESS) { ++ pam_close_session(pamh, 0); ++ fprintf(stderr, "could not set PAM credentials\n"); ++ exit(1); ++ } ++ ++ child = fork(); ++ if (child == 0) { /* child shell */ ++ change_identity (pw); ++ pam_end(pamh, 0); ++#endif + + if (simulate_login) + { + char *arg0; + char *shell_basename; + ++ if(chdir(pw->pw_dir)) ++ error(0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); ++ + shell_basename = last_component (shell); + arg0 = xmalloc (strlen (shell_basename) + 2); + arg0[0] = '-'; +@@ -344,6 +496,67 @@ run_shell (char const *shell, char const + error (0, errno, "%s", shell); + exit (exit_status); + } ++#ifdef USE_PAM ++ } else if (child == -1) { ++ fprintf(stderr, "can not fork user shell: %s", strerror(errno)); ++ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); ++ pam_close_session(pamh, 0); ++ pam_end(pamh, PAM_ABORT); ++ exit(1); ++ } ++ /* parent only */ ++ sigfillset(&ourset); ++ if (sigprocmask(SIG_BLOCK, &ourset, NULL)) { ++ fprintf(stderr, "%s: signal malfunction\n", PROGRAM_NAME); ++ caught = 1; ++ } ++ if (!caught) { ++ struct sigaction action; ++ action.sa_handler = su_catch_sig; ++ sigemptyset(&action.sa_mask); ++ action.sa_flags = 0; ++ sigemptyset(&ourset); ++ if (sigaddset(&ourset, SIGTERM) ++ || sigaddset(&ourset, SIGALRM) ++ || sigaction(SIGTERM, &action, NULL) ++ || sigprocmask(SIG_UNBLOCK, &ourset, NULL)) { ++ fprintf(stderr, "%s: signal masking malfunction\n", PROGRAM_NAME); ++ caught = 1; ++ } ++ } ++ if (!caught) { ++ do { ++ int pid; ++ ++ pid = waitpid(-1, &status, WUNTRACED); ++ ++ if (((pid_t)-1 != pid) && (0 != WIFSTOPPED (status))) { ++ kill(getpid(), WSTOPSIG(status)); ++ /* once we get here, we must have resumed */ ++ kill(pid, SIGCONT); ++ } ++ } while (0 != WIFSTOPPED(status)); ++ } ++ ++ if (caught) { ++ fprintf(stderr, "\nSession terminated, killing shell..."); ++ kill (child, SIGTERM); ++ } ++ /* Not checking retval on this because we need to call close session */ ++ pam_setcred(pamh, PAM_DELETE_CRED | PAM_SILENT); ++ retval = pam_close_session(pamh, 0); ++ PAM_BAIL_P_VOID; ++ retval = pam_end(pamh, PAM_SUCCESS); ++ PAM_BAIL_P_VOID; ++ if (caught) { ++ sleep(2); ++ kill(child, SIGKILL); ++ fprintf(stderr, " ...killed.\n"); ++ exit(-1); ++ } ++ exit ((0 != WIFEXITED (status)) ? WEXITSTATUS (status) ++ : WTERMSIG (status) + 128); ++#endif /* USE_PAM */ + } + + /* Return true if SHELL is a restricted shell (one not returned by +@@ -511,9 +724,9 @@ main (int argc, char **argv) + shell = xstrdup (shell ? shell : pw->pw_shell); + modify_environment (pw, shell); + ++#ifndef USE_PAM + change_identity (pw); +- if (simulate_login && chdir (pw->pw_dir) != 0) +- error (0, errno, _("warning: cannot change directory to %s"), pw->pw_dir); ++#endif + + /* error() flushes stderr, but does not check for write failure. + Normally, we would catch this via our atexit() hook of +@@ -523,5 +736,5 @@ main (int argc, char **argv) + if (ferror (stderr)) + exit (EXIT_CANCELED); + +- run_shell (shell, command, argv + optind, MAX (0, argc - optind)); ++ run_shell (shell, command, argv + optind, MAX (0, argc - optind), pw); + } diff --git a/testing/coreutils/coreutils-uname.patch b/testing/coreutils/coreutils-uname.patch new file mode 100644 index 000000000..b458abeba --- /dev/null +++ b/testing/coreutils/coreutils-uname.patch @@ -0,0 +1,173 @@ +On linux platforms, grok /proc/cpuinfo for the CPU/vendor info. + +Prob not suitable for upstream seeing as how it's 100% linux-specific +http://lists.gnu.org/archive/html/bug-coreutils/2005-09/msg00063.html + +Patch originally by Carlos E. Gorges <carlos@techlinux.com.br>, but +heavily reworked to suck less. + +To add support for additional platforms, check out the show_cpuinfo() +func in the linux/arch/<ARCH>/ source tree of the kernel. + +--- coreutils/src/uname.c ++++ coreutils/src/uname.c +@@ -50,6 +50,11 @@ + # include <mach-o/arch.h> + #endif + ++#if defined(__linux__) ++# define USE_PROCINFO ++# define UNAME_HARDWARE_PLATFORM ++#endif ++ + #include "system.h" + #include "error.h" + #include "quote.h" +@@ -138,6 +143,117 @@ + exit (status); + } + ++#if defined(USE_PROCINFO) ++ ++# if defined(__s390__) || defined(__s390x__) ++# define CPUINFO_FILE "/proc/sysinfo" ++# define CPUINFO_FORMAT "%64[^\t :]%*[ :]%256[^\n]%c" ++# else ++# define CPUINFO_FILE "/proc/cpuinfo" ++# define CPUINFO_FORMAT "%64[^\t:]\t:%256[^\n]%c" ++# endif ++ ++# define PROCINFO_PROCESSOR 0 ++# define PROCINFO_HARDWARE_PLATFORM 1 ++ ++static void __eat_cpuinfo_space(char *buf) ++{ ++ /* first eat trailing space */ ++ char *tmp = buf + strlen(buf) - 1; ++ while (tmp > buf && isspace(*tmp)) ++ *tmp-- = '\0'; ++ /* then eat leading space */ ++ tmp = buf; ++ while (*tmp && isspace(*tmp)) ++ tmp++; ++ if (tmp != buf) ++ memmove(buf, tmp, strlen(tmp)+1); ++ /* finally collapse whitespace */ ++ tmp = buf; ++ while (tmp[0] && tmp[1]) { ++ if (isspace(tmp[0]) && isspace(tmp[1])) { ++ memmove(tmp, tmp+1, strlen(tmp)); ++ continue; ++ } ++ ++tmp; ++ } ++} ++ ++static int __linux_procinfo(int x, char *fstr, size_t s) ++{ ++ FILE *fp; ++ ++ char *procinfo_keys[] = { ++ /* --processor --hardware-platform */ ++ #if defined(__alpha__) ++ "cpu model", "system type" ++ #elif defined(__arm__) ++ "Processor", "Hardware" ++ #elif defined(__avr32__) ++ "processor", "cpu family" ++ #elif defined(__bfin__) ++ "CPU", "BOARD Name" ++ #elif defined(__cris__) ++ "cpu", "cpu model" ++ #elif defined(__frv__) ++ "CPU-Core", "System" ++ #elif defined(__i386__) || defined(__x86_64__) ++ "model name", "vendor_id" ++ #elif defined(__ia64__) ++ "family", "vendor" ++ #elif defined(__hppa__) ++ "cpu", "model" ++ #elif defined(__m68k__) ++ "CPU", "MMU" ++ #elif defined(__mips__) ++ "cpu model", "system type" ++ #elif defined(__powerpc__) || defined(__powerpc64__) ++ "cpu", "machine" ++ #elif defined(__s390__) || defined(__s390x__) ++ "Type", "Manufacturer" ++ #elif defined(__sh__) ++ "cpu type", "machine" ++ #elif defined(sparc) || defined(__sparc__) ++ "type", "cpu" ++ #elif defined(__vax__) ++ "cpu type", "cpu" ++ #else ++ "unknown", "unknown" ++ #endif ++ }; ++ ++ if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) { ++ char key[65], value[257], eol, *ret = NULL; ++ ++ while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) { ++ __eat_cpuinfo_space(key); ++ if (!strcmp(key, procinfo_keys[x])) { ++ __eat_cpuinfo_space(value); ++ ret = value; ++ break; ++ } ++ if (eol != '\n') { ++ /* we need two fscanf's here in case the previous ++ * length limit caused us to read right up to the ++ * newline ... doing "%*[^\n]\n" wont eat the newline ++ */ ++ fscanf(fp, "%*[^\n]"); ++ fscanf(fp, "\n"); ++ } ++ } ++ fclose(fp); ++ ++ if (ret) { ++ strncpy(fstr, ret, s); ++ return 0; ++ } ++ } ++ ++ return -1; ++} ++ ++#endif ++ + /* Print ELEMENT, preceded by a space if something has already been + printed. */ + +@@ -250,10 +344,14 @@ main (int argc, char **argv) + if (toprint & PRINT_PROCESSOR) + { + char const *element = unknown; +-#if HAVE_SYSINFO && defined SI_ARCHITECTURE ++#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO) + { + static char processor[257]; ++#if defined(USE_PROCINFO) ++ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor)) ++#else + if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor)) ++#endif + element = processor; + } + #endif +@@ -306,9 +404,13 @@ main (int argc, char **argv) + if (element == unknown) + { + static char hardware_platform[257]; ++#if defined(USE_PROCINFO) ++ if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform)) ++#else + size_t s = sizeof hardware_platform; + static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM }; + if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0) ++#endif + element = hardware_platform; + } + #endif diff --git a/testing/coreutils/coreutils.install b/testing/coreutils/coreutils.install new file mode 100644 index 000000000..8caae6686 --- /dev/null +++ b/testing/coreutils/coreutils.install @@ -0,0 +1,21 @@ +infodir=usr/share/info +filelist=(coreutils.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + diff --git a/testing/coreutils/su.pam b/testing/coreutils/su.pam new file mode 100644 index 000000000..cf15f40f1 --- /dev/null +++ b/testing/coreutils/su.pam @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth sufficient pam_rootok.so +# Uncomment the following line to implicitly trust users in the "wheel" group. +#auth sufficient pam_wheel.so trust use_uid +# Uncomment the following line to require a user to be in the "wheel" group. +#auth required pam_wheel.so use_uid +auth required pam_unix.so +account required pam_unix.so +session required pam_unix.so diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD index c01f9882b..c73a8cd30 100644 --- a/testing/util-linux/PKGBUILD +++ b/testing/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 136465 2011-08-29 20:31:00Z tomegun $ +# $Id: PKGBUILD 137553 2011-09-09 11:23:27Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.20 -pkgrel=1 +pkgrel=2 pkgdesc="Miscellaneous system utilities for Linux" url="http://userweb.kernel.org/~kzak/util-linux-ng/" arch=('i686' 'x86_64') @@ -15,12 +15,21 @@ conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2') provides=('linux32' "util-linux-ng=${pkgver}") license=('GPL2') options=('!libtool') -source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2) +source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2 + agetty-typo.patch + write-freopen.patch + dmesg-non-printk.patch + dmesg-space.patch) optdepends=('perl: for chkdupexe support') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # patches from master + for patch in agetty-typo.patch write-freopen.patch dmesg-non-printk.patch dmesg-space.patch; do + patch -Np1 -i "${srcdir}/${patch}" + done + # hardware clock sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i include/pathnames.h @@ -40,4 +49,8 @@ package() { make DESTDIR="${pkgdir}" install } -md5sums=('4dcacdbdafa116635e52b977d9d0e879') +md5sums=('4dcacdbdafa116635e52b977d9d0e879' + '13838c6dd8df686e0f01ad0f236d2690' + '465817ff8f7c08411c8011ee91b50318' + 'f3ca75a1a22a2a739c5c22d92dc07ab0' + 'd9768f0b42d36d72c02ac7797b922ba1') diff --git a/testing/util-linux/agetty-typo.patch b/testing/util-linux/agetty-typo.patch new file mode 100644 index 000000000..a333d6280 --- /dev/null +++ b/testing/util-linux/agetty-typo.patch @@ -0,0 +1,27 @@ +From 89aed1c950376d828e1e0ddef94909a028e0517d Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Wed, 7 Sep 2011 07:37:03 +0200 +Subject: [PATCH] agetty: double equals sign typo in opentty() + +Reported-by: Francesco Cosoleto <cosoleto@gmail.com> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + term-utils/agetty.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/term-utils/agetty.c b/term-utils/agetty.c +index 733be38..35bb389 100644 +--- a/term-utils/agetty.c ++++ b/term-utils/agetty.c +@@ -985,7 +985,7 @@ static void open_tty(char *tty, struct termios *tp, struct options *op) + * In case of a virtual console the ioctl TIOCMGET fails and + * the error number will be set to EINVAL. + */ +- if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno = EINVAL)) { ++ if (ioctl(STDIN_FILENO, TIOCMGET, &serial) < 0 && (errno == EINVAL)) { + op->flags |= F_VCONSOLE; + if (!op->term) + op->term = DEFAULT_VCTERM; +-- +1.7.6.1 + diff --git a/testing/util-linux/dmesg-non-printk.patch b/testing/util-linux/dmesg-non-printk.patch new file mode 100644 index 000000000..ea2354420 --- /dev/null +++ b/testing/util-linux/dmesg-non-printk.patch @@ -0,0 +1,69 @@ +From 22f69825778f992ff98ed100252bf5e00a15d9d1 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Wed, 31 Aug 2011 12:28:39 +0200 +Subject: [PATCH] dmesg: fix for non-CONFIG_PRINTK_TIME kernels + + * dmesg(1) incorrectly assumes that lines like "<6>\n" + are broken. + + * it's more robust to assume the end of the record is "\n<" + + * print \n for empty lines + +Reported-by: "Gabor Z. Papp" <gzp@papp.hu> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + sys-utils/dmesg.c | 16 ++++++++-------- + 1 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c +index 6090f4e..8e7bb4b 100644 +--- a/sys-utils/dmesg.c ++++ b/sys-utils/dmesg.c +@@ -442,12 +442,12 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) + + if (!begin) + begin = p; +- if (*p == '\n') +- end = p; + if (i + 1 == rec->next_size) { + end = p + 1; + i++; +- } ++ } else if (*p == '\n' && *(p + 1) == '<') ++ end = p; ++ + if (begin && !*begin) + begin = NULL; /* zero(s) at the end of the buffer? */ + if (!begin || !end) +@@ -469,9 +469,6 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) + } + } + +- if (end <= begin) +- return -1; /* error */ +- + if (*begin == '[' && (*(begin + 1) == ' ' || + isdigit(*(begin + 1)))) { + if (ctl->delta || ctl->ctime) { +@@ -534,12 +531,15 @@ static void print_buffer(const char *buf, size_t size, + } + + while (get_next_record(ctl, &rec) == 0) { +- if (!rec.mesg_size) +- continue; + + if (!accept_record(ctl, &rec)) + continue; + ++ if (!rec.mesg_size) { ++ putchar('\n'); ++ continue; ++ } ++ + if (ctl->decode && rec.level >= 0 && rec.facility >= 0) + printf("%-6s:%-6s: ", facility_names[rec.facility].name, + level_names[rec.level].name); +-- +1.7.6.1 + diff --git a/testing/util-linux/dmesg-space.patch b/testing/util-linux/dmesg-space.patch new file mode 100644 index 000000000..2038888cc --- /dev/null +++ b/testing/util-linux/dmesg-space.patch @@ -0,0 +1,31 @@ +From 31c9099a81d3a9c70fdceb198eebed678173d954 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Fri, 2 Sep 2011 14:42:04 +0200 +Subject: [PATCH] dmesg: remove extra space only after time stamp + +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + sys-utils/dmesg.c | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/sys-utils/dmesg.c b/sys-utils/dmesg.c +index 8e7bb4b..b3713a0 100644 +--- a/sys-utils/dmesg.c ++++ b/sys-utils/dmesg.c +@@ -480,11 +480,10 @@ static int get_next_record(struct dmesg_control *ctl, struct dmesg_record *rec) + break; + } + } ++ if (begin < end && *begin == ' ') ++ begin++; + } + +- if (begin < end && *begin == ' ') +- begin++; +- + rec->mesg = begin; + rec->mesg_size = end - begin; + +-- +1.7.6.1 + diff --git a/testing/util-linux/write-freopen.patch b/testing/util-linux/write-freopen.patch new file mode 100644 index 000000000..a2014a107 --- /dev/null +++ b/testing/util-linux/write-freopen.patch @@ -0,0 +1,27 @@ +From b89fdd9c05a6e5f12ab56441389e5ee9d1d7f30f Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Tue, 6 Sep 2011 03:18:46 +0200 +Subject: [PATCH] write: fix path for freopen() + +Reported-by: xinglp <xinglp@gmail.com> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + term-utils/write.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/term-utils/write.c b/term-utils/write.c +index a825f62..a70eb7b 100644 +--- a/term-utils/write.c ++++ b/term-utils/write.c +@@ -322,7 +322,7 @@ void do_write(char *tty, char *mytty, uid_t myuid) + + if (strlen(tty) + 6 > sizeof(path)) + errx(EXIT_FAILURE, _("tty path %s too long"), tty); +- printf(path, "/dev/%s", tty); ++ snprintf(path, sizeof(path), "/dev/%s", tty); + if ((freopen(path, "w", stdout)) == NULL) + err(EXIT_FAILURE, "%s", path); + +-- +1.7.6.1 + |