diff options
77 files changed, 1135 insertions, 262 deletions
diff --git a/community-staging/kphotoalbum/PKGBUILD b/community-staging/kphotoalbum/PKGBUILD new file mode 100644 index 000000000..614c32cba --- /dev/null +++ b/community-staging/kphotoalbum/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 74610 2012-07-31 14:26:16Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com> +# Contributor: Jonathan Schaeffer <joschaeffer ][ gmail ? com> +# Contributor: chfoxli <lg ][ romandie ? com> + +pkgname=kphotoalbum +pkgver=4.2 +pkgrel=2 +pkgdesc="KDE Photo Album, picture collection manager" +url="http://www.kphotoalbum.org/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('kdebase-runtime' 'libkipi' 'libkdcraw') +makedepends=('cmake' 'automoc4' 'kdeedu-marble' 'kdemultimedia-mplayerthumbs') +optdepends=('kdeedu-marble: integration with Marble' + 'kipi-plugins: add extra functionality' + 'kdemultimedia-mplayerthumbs: video thumbnails') +install=${pkgname}.install +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('7cb484089477f3633657b67ce59b85f2') + +build() { + cd ${srcdir} + + mkdir build + cd build + + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd ${srcdir}/build + + make DESTDIR=${pkgdir} install +} diff --git a/community-staging/kphotoalbum/fix-docbook-build.patch b/community-staging/kphotoalbum/fix-docbook-build.patch new file mode 100644 index 000000000..575a4271e --- /dev/null +++ b/community-staging/kphotoalbum/fix-docbook-build.patch @@ -0,0 +1,236 @@ +diff -up kphotoalbum-4.1.1/doc/index.docbook.docbook_fix kphotoalbum-4.1.1/doc/index.docbook +--- kphotoalbum-4.1.1/doc/index.docbook.docbook_fix 2009-11-15 15:16:29.000000000 -0600 ++++ kphotoalbum-4.1.1/doc/index.docbook 2010-06-13 13:03:02.815174744 -0500 +@@ -1,5 +1,5 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kphotoalbum "<application>KPhotoAlbum</application>"> + <!ENTITY kappname "&kphotoalbum;"> + <!ENTITY package "kdeextragear-2"> +@@ -41,12 +41,6 @@ + <date>2004-08-06</date> + <releaseinfo>2.0</releaseinfo> + +- <keywordset> +- <keyword>KDE</keyword> +- <keyword>kdeextragear-2</keyword> +- <keyword>KPhotoAlbum</keyword> +- <keyword>Image Database</keyword> +- </keywordset> + <abstract><para> + This is the user manual for &kphotoalbum;. If you are + not the type who likes reading documentation, but rather just want to try +@@ -64,6 +58,12 @@ menu and select <guimenuitem>Run &kphoto + on long HTML document at <ulink + url="http://www.kphotoalbum.org/">&kphotoalbum;'s Homepage</ulink></para> + </abstract> ++ <keywordset> ++ <keyword>KDE</keyword> ++ <keyword>kdeextragear-2</keyword> ++ <keyword>KPhotoAlbum</keyword> ++ <keyword>Image Database</keyword> ++ </keywordset> + </bookinfo> + + &introduction; +diff -up kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook +--- kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:17:07.000000000 -0600 ++++ kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:10:06.145165665 -0500 +@@ -1,5 +1,5 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kphotoalbum "<application + >KPhotoAlbum</application + >"> +@@ -65,16 +65,6 @@ + <releaseinfo + >2.0</releaseinfo> + +- <keywordset> +- <keyword +->KDE</keyword> +- <keyword +->kdeextragear-2</keyword> +- <keyword +->KPhotoAlbum</keyword> +- <keyword +->Bilddatenbank</keyword> +- </keywordset> + <abstract + ><para + >Dies ist das Benutzerhandbuch für &kphotoalbum;. Wenn Sie nicht gerne Handbücher lesen, sondern lieber gleich Funktionen ausprobieren möchten, haben Sie folgende Alternativen zu diesem Handbuch: <itemizedlist> +@@ -102,6 +92,12 @@ + >HTML</acronym + >-Dokument zum Herunterladen.</para> + </abstract> ++ <keywordset> ++ <keyword>KDE</keyword> ++ <keyword>kdeextragear-2</keyword> ++ <keyword>KPhotoAlbum</keyword> ++ <keyword>Bilddatenbank</keyword> ++ </keywordset> + </bookinfo> + + &introduction; +diff -up kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook +--- kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:17:20.000000000 -0600 ++++ kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:11:18.860165964 -0500 +@@ -1,5 +1,5 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kphotoalbum "<application + >KPhotoAlbum</application + >"> +@@ -65,16 +65,6 @@ + <releaseinfo + >2.0</releaseinfo> + +- <keywordset> +- <keyword +->KDE</keyword> +- <keyword +->kdeextragear-2</keyword> +- <keyword +->KPhotoAlbum</keyword> +- <keyword +->Piltide andmebaas</keyword> +- </keywordset> + <abstract + ><para + >See on &kphotoalbum;i käsiraamat. Kui sa ei armasta eriti käsiraamatuid lugeda, vaid soovid lihtsalt proovida, mis mida teeb, siis on sinu ees lahti mitu võimalust: <itemizedlist> +@@ -100,6 +90,12 @@ + >&kphotoalbum;i koduleheküljelt</ulink + >.</para> + </abstract> ++ <keywordset> ++ <keyword>KDE</keyword> ++ <keyword>kdeextragear-2</keyword> ++ <keyword>KPhotoAlbum</keyword> ++ <keyword>Piltide andmebaas</keyword> ++ </keywordset> + </bookinfo> + + &introduction; +diff -up kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook +--- kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:17:57.000000000 -0600 ++++ kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:12:00.978165382 -0500 +@@ -1,5 +1,5 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kphotoalbum "<application + >KPhotoAlbum</application + >"> +@@ -65,16 +65,6 @@ + <releaseinfo + >2.0</releaseinfo> + +- <keywordset> +- <keyword +->KDE</keyword> +- <keyword +->kdeextragear-2</keyword> +- <keyword +->KPhotoAlbum</keyword> +- <keyword +->Banca dati immagini</keyword> +- </keywordset> + <abstract + ><para + >Questo è il manuale utente di &kphotoalbum;. Se non sei il tipo a cui piace leggere la documentazione, ma che preferisce provare a far funzionare le cose, eccoti delle alternative: <itemizedlist> +@@ -100,6 +90,12 @@ + >homepage di &kphotoalbum;</ulink + ></para> + </abstract> ++ <keywordset> ++ <keyword>KDE</keyword> ++ <keyword>kdeextragear-2</keyword> ++ <keyword>KPhotoAlbum</keyword> ++ <keyword>Banca dati immagini</keyword> ++ </keywordset> + </bookinfo> + + &introduction; +diff -up kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook +--- kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:19:13.000000000 -0600 ++++ kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:12:45.765165840 -0500 +@@ -1,5 +1,5 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kphotoalbum "<application + >KPhotoAlbum</application + >"> +@@ -65,16 +65,6 @@ + <releaseinfo + >2.0</releaseinfo> + +- <keywordset> +- <keyword +->KDE</keyword> +- <keyword +->kdeextragear-2</keyword> +- <keyword +->Kfotoalbum</keyword> +- <keyword +->Bilddatabas</keyword> +- </keywordset> + <abstract + ><para + >Det här är användarmanualen för Kfotoalbum. Om du inte är den som gillar att läsa dokumentation, utan istället bara vill försöka dig på saker och ting, ges här några alternativ: <itemizedlist> +@@ -100,6 +90,12 @@ + >Kfotoalbums hemsida</ulink + ></para> + </abstract> ++ <keywordset> ++ <keyword>KDE</keyword> ++ <keyword>kdeextragear-2</keyword> ++ <keyword>Kfotoalbum</keyword> ++ <keyword>Bilddatabas</keyword> ++ </keywordset> + </bookinfo> + + &introduction; +diff -up kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook +--- kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:19:26.000000000 -0600 ++++ kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:13:28.217166055 -0500 +@@ -1,5 +1,5 @@ + <?xml version="1.0" ?> +-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ ++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ + <!ENTITY kphotoalbum "<application + >KPhotoAlbum</application + >"> +@@ -65,16 +65,6 @@ + <releaseinfo + >2.0</releaseinfo> + +- <keywordset> +- <keyword +->KDE</keyword> +- <keyword +->kdeextragear-2</keyword> +- <keyword +->KPhotoAlbum</keyword> +- <keyword +->База даних зображень</keyword> +- </keywordset> + <abstract + ><para + >Це інструкція користувача для &kphotoalbum;. Якщо ви не любитель або любителька читання документації і надаєте перевагу самостійному вивченню програми шляхом експериментів, ви можете піти одним з таких шляхів: <itemizedlist> +@@ -100,6 +90,12 @@ + >домашній сторінці &kphotoalbum;</ulink + ></para> + </abstract> ++ <keywordset> ++ <keyword>KDE</keyword> ++ <keyword>kdeextragear-2</keyword> ++ <keyword>KPhotoAlbum</keyword> ++ <keyword>База даних зображень</keyword> ++ </keywordset> + </bookinfo> + + &introduction; diff --git a/community-staging/kphotoalbum/fix-with-exiv2-0.21.patch b/community-staging/kphotoalbum/fix-with-exiv2-0.21.patch new file mode 100644 index 000000000..65baf235d --- /dev/null +++ b/community-staging/kphotoalbum/fix-with-exiv2-0.21.patch @@ -0,0 +1,47 @@ +--- kphotoalbum-4.1.1/Exif/Info.cpp.orig 2010/08/16 08:04:32 1164187 ++++ kphotoalbum-4.1.1/Exif/Info.cpp 2011/01/09 06:50:40 1213128 +@@ -106,6 +106,28 @@ + return res; + + QList<const Exiv2::TagInfo*> tags; ++ std::ostringstream s; ++ ++#if (EXIV2_TEST_VERSION(0,21,0)) ++ const Exiv2::GroupInfo* gi = Exiv2::ExifTags::groupList(); ++ while (gi->tagList_ != 0) { ++ Exiv2::TagListFct tl = gi->tagList_; ++ const Exiv2::TagInfo* ti = tl(); ++ ++ while (ti->tag_ != 0xFFFF) { ++ tags << ti; ++ ++ti; ++ } ++ ++gi; ++ } ++ ++ for (QList<const Exiv2::TagInfo*>::iterator it = tags.begin(); it != tags.end(); ++it) { ++ while ( (*it)->tag_ != 0xffff ) { ++ res.insert(QString::fromLatin1(Exiv2::ExifKey(**it).key().c_str())); ++ ++(*it); ++ } ++ } ++#else + tags << + Exiv2::ExifTags::ifdTagList() << + Exiv2::ExifTags::exifTagList() << +@@ -121,7 +143,6 @@ + // Now the ugly part -- exiv2 doesn't have any way to get a list of + // MakerNote tags in a reasonable form, so we have to parse it from strings + +- std::ostringstream s; + for ( Exiv2::IfdId kind = Exiv2::canonIfdId; kind < Exiv2::lastIfdId; + kind = static_cast<Exiv2::IfdId>( kind + 1 ) ) { + #if EXIV2_TEST_VERSION(0,17,0) +@@ -130,6 +151,7 @@ + Exiv2::ExifTags::makerTaglist( s, kind ); + #endif + } ++#endif + + // IPTC tags use yet another format... + Exiv2::IptcDataSets::dataSetList( s ); diff --git a/community-staging/kphotoalbum/kphotoalbum.install b/community-staging/kphotoalbum/kphotoalbum.install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/community-staging/kphotoalbum/kphotoalbum.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/pinot/PKGBUILD b/community-staging/pinot/PKGBUILD new file mode 100644 index 000000000..3cae4201d --- /dev/null +++ b/community-staging/pinot/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 74640 2012-08-01 02:56:58Z ebelanger $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Contributor: William Rea <sillywilly@gmail.com> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=pinot +pkgver=1.0 +pkgrel=2 +pkgdesc='Personal search and metasearch tool' +arch=('i686' 'x86_64') +url='http://code.google.com/p/pinot-search/' +license=('GPL') +depends=('gtkmm3' 'xapian-core' 'libtextcat' 'sqlite' 'libxml++' 'curl' 'gmime' + 'dbus-glib' 'shared-mime-info' 'libexif' 'taglib' 'hicolor-icon-theme' + 'cairo' 'exiv2' 'boost-libs') +makedepends=('boost' 'desktop-file-utils') +optdepends=('unzip: ZIP files extraction' + 'poppler: PDF to text conversion' + 'catdvi: DVI to text conversion' + 'djvulibre: DjVu text extraction' + 'unrtf: RTF to HTML conversion' + 'antiword: MS Word to text conversion' + 'catdoc: XLS and PPT to text conversion') +options=('!emptydirs') +install=$pkgname.install +changelog=$pkgname.changelog +source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz) +sha256sums=('d1f5ac17022014c5a29ba1e6d95fc39bcf254338a4e0bfe84bf16558d219e2e2') + +build() { + cd "${srcdir}/$pkgname-$pkgver" + sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat_conf.txt + sed -i 's|/LM/russian.lm|/LM/russian-windows1251.lm|' textcat_conf.txt + sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat3_conf.txt + sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat31_conf.txt + sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat32_conf.txt + sed -i -e "s|.*russian$|/usr/share/libtextcat/LM/russian-iso8859_5.lm russian-iso8859_5\n\ +/usr/share/libtextcat/LM/russian-koi8_r.lm russian-koi8_r\n\ +/usr/share/libtextcat/LM/russian-windows1251.lm russian-windows1251|" textcat3_conf.txt + + LIBS="-lboost_system" ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --enable-gtkmm3=yes + make +} + +package() { + cd "${srcdir}/$pkgname-$pkgver" + + make DESTDIR="${pkgdir}" install +} diff --git a/community-staging/pinot/pinot.changelog b/community-staging/pinot/pinot.changelog new file mode 100644 index 000000000..770a1ef0a --- /dev/null +++ b/community-staging/pinot/pinot.changelog @@ -0,0 +1,8 @@ +2012-07-31 Eric Belanger <eric@archlinux.org> + * pinot 1.0-2 : Rebuild against exiv2 0.23, Add boost-libs depends + +2012-07-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * pinot 1.0-1 + +2011-12-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * pinot 0.98-1 diff --git a/community-staging/pinot/pinot.install b/community-staging/pinot/pinot.install new file mode 100644 index 000000000..55ab40426 --- /dev/null +++ b/community-staging/pinot/pinot.install @@ -0,0 +1,15 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + echo "Starting with 0.63, the service is auto-started. " + echo "The file that enables this is located at " + echo "/etc/xdg/autostart/pinot-dbus-daemon.desktop" + echo "Delete this file if you don't want the auto-start." +} + +post_upgrade() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/community-testing/tp_smapi/PKGBUILD b/community-testing/tp_smapi/PKGBUILD index 071d7edab..e80492955 100644 --- a/community-testing/tp_smapi/PKGBUILD +++ b/community-testing/tp_smapi/PKGBUILD @@ -9,7 +9,7 @@ pkgname=tp_smapi pkgver=0.41 -pkgrel=4 +pkgrel=5 pkgdesc="Modules for ThinkPad's SMAPI functionality" arch=('i686' 'x86_64') url='https://github.com/evgeni/tp_smapi' diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index 820a5bc97..d2259707f 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73986 2012-07-18 01:06:19Z ibiru $ +# $Id: PKGBUILD 74612 2012-07-31 19:55:33Z ebelanger $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com>, @@ -6,7 +6,7 @@ pkgname=cegui pkgver=0.7.6 -pkgrel=4 +pkgrel=5 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64') url="http://crayzedsgui.sourceforge.net" diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD index 51568d851..4bbe27c09 100644 --- a/community/fbreader/PKGBUILD +++ b/community/fbreader/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73949 2012-07-17 11:17:34Z spupykin $ +# $Id: PKGBUILD 74589 2012-07-31 10:03:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=fbreader -pkgver=0.99.0 +pkgver=0.99.1 pkgrel=1 pkgdesc="An e-book reader for Linux" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL') depends=('fribidi' 'bzip2' 'curl' 'qt' 'liblinebreak' 'sqlite') makedepends=('ccache') source=(http://www.fbreader.org/files/desktop/fbreader-sources-$pkgver.tgz) -md5sums=('2afbfa07dda09a979d5cf8797e2b648d') +md5sums=('af424a825e091bb33b65c04882c0b93a') build() { export TARGET_ARCH=desktop @@ -20,6 +20,7 @@ build() { export TARGET_STATUS=release cd $srcdir/fbreader-$pkgver sed -i 's|moc-qt4|moc|g' makefiles/arch/desktop.mk + sed -i 's|-lunibreak|-llinebreak|g' makefiles/config.mk zlibrary/text/Makefile make ZLSHARED=no make ZLSHARED=no DESTDIR=$pkgdir install } diff --git a/community/fish/PKGBUILD b/community/fish/PKGBUILD index e5815714d..e0e29cafa 100644 --- a/community/fish/PKGBUILD +++ b/community/fish/PKGBUILD @@ -1,33 +1,36 @@ -# $Id: PKGBUILD 66524 2012-02-25 23:19:41Z lfleischer $ +# $Id: PKGBUILD 74604 2012-07-31 12:48:32Z bpiotrowski $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Jan Fader <jan.fader@web.de> pkgname=fish -pkgver=1.23.1 -pkgrel=5 -pkgdesc="User friendly shell intended mostly for interactive use" +pkgver=2.0b2 +pkgrel=1 +pkgdesc='Smart and user friendly shell intended mostly for interactive use' arch=('i686' 'x86_64') -url="http://fishshell.com/" -license=("GPL" "LGPL" "BSD" "MIT") -depends=('ncurses' 'bc') +url='http://ridiculousfish.com/shell/' +license=('GPL2') +depends=('python') makedepends=('doxygen') install=fish.install -source=(http://fishshell.com/files/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('ead6b7c6cdb21f35a3d4aa1d5fa596f1') +source=($pkgname-$pkgver.tar.gz::http://ridiculousfish.com/shell/files/fishfish.tar.gz) +md5sums=('ebe5fe17f6925b9142aadc8ebae5fba1') build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc \ - --docdir=/usr/share/doc/fish --without-xsel + cd "$srcdir"/fishfish + autoconf + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --without-xsel make } package() { - cd "$srcdir/$pkgname-$pkgver" - + cd "$srcdir"/fishfish make DESTDIR="$pkgdir" install - install -D -m644 user_doc/html/license.html "$pkgdir/usr/share/licenses/$pkgname/license.html" + + # compress man pages + find "$pkgdir"/usr/share/fish/man/ -type f | xargs gzip -9 } diff --git a/community/fish/fish.install b/community/fish/fish.install index c3f89cd84..765006f95 100644 --- a/community/fish/fish.install +++ b/community/fish/fish.install @@ -1,15 +1,11 @@ post_install() { - if [ ! "`grep /usr/bin/fish etc/shells`" ]; then - echo "updating /etc/shells... done." - sed -i "s|/bin/bash|/bin/bash\n/usr/bin/fish|" etc/shells - fi + grep -q '/usr/bin/zsh' etc/shells || echo '/usr/bin/zsh' >> etc/shells } post_upgrade() { - post_install $1 + post_install } pre_remove() { - echo -ne "updating /etc/shells... \n" sed -i '/^\/usr\/bin\/fish/d' /etc/shells } diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD index 055158577..112d1fc57 100644 --- a/community/freerdp/PKGBUILD +++ b/community/freerdp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74308 2012-07-24 11:07:33Z spupykin $ +# $Id: PKGBUILD 74601 2012-07-31 12:43:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Stijn Segers <francesco dot borromini at gmail dot com> pkgname=freerdp pkgver=1.0.1 -pkgrel=6 +pkgrel=7 pkgdesc="Free RDP client" arch=('i686' 'x86_64') url="http://freerdp.sourceforge.net" diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD index 7c5d0583d..c5c5ea711 100644 --- a/community/freewrl/PKGBUILD +++ b/community/freewrl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73160 2012-07-02 14:55:08Z spupykin $ +# $Id: PKGBUILD 74614 2012-07-31 19:55:47Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=freewrl pkgver=1.22.13 -pkgrel=1 +pkgrel=2 pkgdesc="VRML viewer" arch=('i686' 'x86_64') url="http://freewrl.sourceforge.net/" diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 94961ea33..cad3c7ac7 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74141 2012-07-22 09:16:14Z lcarlier $ +# $Id: PKGBUILD 74616 2012-07-31 19:56:01Z ebelanger $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor : sebikul <sebikul@gmail.com> @@ -7,7 +7,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' - 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-gui' 'gambas3-gb-image' + 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-media' 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' @@ -15,7 +15,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=3.2.1 -pkgrel=1 +pkgrel=3 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" @@ -46,6 +46,8 @@ build() { package_gambas3-runtime() { depends=('libffi' 'xdg-utils') pkgdesc="Runtime environment" + conflicts=('gambas3-gb-gui') + replaces=('gambas3-gb-gui') install=gambas3-runtime.install cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc @@ -74,9 +76,23 @@ package_gambas3-runtime() { install -d -m755 ${pkgdir}/usr/share/gambas3/icons install -D -m644 mime/application-x-gambas3.png \ ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png - - cd gbc + + ## workaround for splitting + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" install + ## + + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui + make XDG_UTILS='' DESTDIR="${pkgdir}" install + cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui.opengl + make XDG_UTILS='' DESTDIR="${pkgdir}" install + + ## cleanup the workaround + cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 + make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall + cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc make DESTDIR="${pkgdir}" uninstall + ## } package_gambas3-devel() { @@ -131,7 +147,7 @@ package_gambas3-examples() { depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' - 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' + 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' @@ -424,7 +440,7 @@ package_gambas3-gb-eval-highlight() { } package_gambas3-gb-form() { - depends=('gambas3-gb-gui') + depends=('gambas3-runtime') pkgdesc="Form component" ## Workaround for splitting @@ -593,29 +609,6 @@ package_gambas3-gb-gsl() { ## } -package_gambas3-gb-gui() { - depends=('gambas3-gb-qt4' 'gambas3-gb-gtk') - pkgdesc="Automatic gui toolkit chooser" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*} - ## -} - package_gambas3-gb-image() { depends=('gambas3-runtime') pkgdesc="Image component" diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD index 54b04d9e9..801c29480 100644 --- a/community/gource/PKGBUILD +++ b/community/gource/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73995 2012-07-18 01:07:06Z ibiru $ +# $Id: PKGBUILD 74617 2012-07-31 19:56:05Z ebelanger $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com> # Contributor: Olivier Ramonat <olivier at ramonat dot fr> pkgname=gource pkgver=0.38 -pkgrel=2 +pkgrel=3 pkgdesc="software version control visualization" license=(GPL3) arch=(i686 x86_64) diff --git a/community/ifuse/PKGBUILD b/community/ifuse/PKGBUILD index a5a20f572..bcdf2b502 100644 --- a/community/ifuse/PKGBUILD +++ b/community/ifuse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70102 2012-04-29 11:48:29Z andrea $ +# $Id: PKGBUILD 74618 2012-07-31 19:56:08Z ebelanger $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=ifuse pkgver=1.1.2 -pkgrel=1 +pkgrel=2 pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch' url='http://libimobiledevice.org/' arch=('i686' 'x86_64') diff --git a/community/liblinebreak/PKGBUILD b/community/liblinebreak/PKGBUILD index 23578bdd0..ce6a84fe4 100644 --- a/community/liblinebreak/PKGBUILD +++ b/community/liblinebreak/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66198 2012-02-23 03:08:54Z spupykin $ +# $Id: PKGBUILD 74591 2012-07-31 10:04:29Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Orivej Desh <smpuj@bk.ru> pkgname=liblinebreak -pkgver=2.0 -pkgrel=2 +pkgver=2.1 +pkgrel=1 pkgdesc="An implementation of the line breaking algorithm as described in Unicode 5.2.0 Standard Annex 14, Revision 24" arch=("i686" "x86_64") url="http://vimgadgets.sourceforge.net/liblinebreak/" @@ -13,7 +13,7 @@ depends=("glibc") makedepends=() options=("!libtool") source=("http://downloads.sourceforge.net/vimgadgets/liblinebreak-$pkgver.tar.gz") -md5sums=('c4ac2052b9e1883822662ecee483c542') +md5sums=('9fe73b4b230434765be2305e50f8fe45') build() { cd "$srcdir/liblinebreak-$pkgver" diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD index c60b2157a..0515ffa42 100644 --- a/community/libmemcached/PKGBUILD +++ b/community/libmemcached/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 73390 2012-07-07 05:46:41Z foutrelis $ +# $Id: PKGBUILD 74634 2012-07-31 20:58:13Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=libmemcached -pkgver=1.0.9 +pkgver=1.0.10 pkgrel=1 pkgdesc="C and C++ client library to the memcached server" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('glibc' 'libsasl' 'libevent') makedepends=('perl') options=('!libtool') source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) -sha256sums=('795c51ef53ffc7d877f79c549db1f46ba71d190c7f03a3c2f00455bb948bda34') +sha256sums=('0bbb5e310b3d175dfbde99a463ba4474aa22b4ad88ffea2afe76c868d6e1290b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index 7132e4735..fa7793fd5 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,29 +1,33 @@ -# $Id: PKGBUILD 64173 2012-02-09 17:40:27Z svenstaro $ +# $Id: PKGBUILD 74620 2012-07-31 19:56:16Z ebelanger $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> - + pkgname=megaglest pkgver=3.6.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." arch=('i686' 'x86_64') url="http://sourceforge.net/projects/megaglest/" license=('GPL3') depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua' 'icu' 'ftgl' 'glew' - 'libircclient' 'miniupnpc' 'wxgtk') +'libircclient' 'miniupnpc' 'wxgtk') makedepends=('ftjam' 'cmake' 'mesa') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz") -md5sums=('5a4a2429435031d9f9cc5d9535a9de9d') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz" + lol.patch) +md5sums=('5a4a2429435031d9f9cc5d9535a9de9d' + '68fd326b73ed1c75981004fbdef6b73a') build() { cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ + patch -Np1 < $srcdir/lol.patch + [[ -d build ]] && rm -r build mkdir build && cd build cmake .. \ - -DWANT_SVN_STAMP=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version + -DWANT_SVN_STAMP=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version make } diff --git a/community/megaglest/lol.patch b/community/megaglest/lol.patch new file mode 100644 index 000000000..56f94c852 --- /dev/null +++ b/community/megaglest/lol.patch @@ -0,0 +1,43 @@ +diff --git a/source/shared_lib/include/graphics/math_util.h b/source/shared_lib/include/graphics/math_util.h +index 8fcfb27..3cb7a41 100644 +--- a/source/shared_lib/include/graphics/math_util.h ++++ b/source/shared_lib/include/graphics/math_util.h +@@ -184,10 +184,10 @@ public: + + Rect2<T> computeBoundingRect() const{ + return Rect2i( +- min(p[0].x, p[1].x), +- min(p[0].y, p[2].y), +- max(p[2].x, p[3].x), +- max(p[1].y, p[3].y)); ++ std::min(p[0].x, p[1].x), ++ std::min(p[0].y, p[2].y), ++ std::max(p[2].x, p[3].x), ++ std::max(p[1].y, p[3].y)); + } + + bool isInside(const Vec2<T> &pt) const{ +diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp +index b09c972..ddebd03 100644 +--- a/source/shared_lib/sources/platform/posix/ircclient.cpp ++++ b/source/shared_lib/sources/platform/posix/ircclient.cpp +@@ -13,6 +13,7 @@ + #include "ircclient.h" + #include "util.h" + #include "platform_common.h" ++#include "libirc_rfcnumeric.h" + #include "libircclient.h" + + #include <stdio.h> +diff --git a/source/shared_lib/sources/util/util.cpp b/source/shared_lib/sources/util/util.cpp +index 05478fc..c27aa62 100644 +--- a/source/shared_lib/sources/util/util.cpp ++++ b/source/shared_lib/sources/util/util.cpp +@@ -19,6 +19,7 @@ + #include <stdarg.h> + #include <time.h> + #include <fcntl.h> // for open() ++#include <unistd.h> + + #ifdef WIN32 + #include <io.h> // for open() diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index 0249f83e7..d19e13a0d 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74002 2012-07-18 01:07:47Z ibiru $ +# $Id: PKGBUILD 74621 2012-07-31 19:56:19Z ebelanger $ # Contributor: SpepS <dreamspepser at yahoo dot it> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openimageio -pkgver=1.0.6 +pkgver=1.0.8 pkgrel=1 pkgdesc="A library for reading and writing images, including classes, utilities, and applications." arch=(i686 x86_64) @@ -14,7 +14,7 @@ makedepends=('cmake' 'qt' 'python2' 'boost') optdepends=('qt: iv image viewer' 'python2: bindings support') source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver) -md5sums=('fa6e3f4be98d8e1868b389410b56563a') +md5sums=('7d8ee962f29cea749d02ab992e2874df') build() { cd "$srcdir"/$_pkgname*/src diff --git a/community/openssh-askpass/PKGBUILD b/community/openssh-askpass/PKGBUILD index 8b5f5919c..30982567b 100644 --- a/community/openssh-askpass/PKGBUILD +++ b/community/openssh-askpass/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Massimiliano Torromeo <Massimiliano.Torromeo AT gmail DOT com> pkgname=openssh-askpass -pkgver=1.3.3 +pkgver=1.3.4 pkgrel=1 pkgdesc='A plasma-like passphrase dialog for ssh' arch=('i686' 'x86_64') @@ -29,5 +29,5 @@ package() { install -Dm755 ../$pkgname.sh "$pkgdir/etc/profile.d/$pkgname.sh" } -md5sums=('717375e71d95469de334cbf7fade8699' +md5sums=('2fb1303879c663ec0df7979b3ee8da2c' '961738244318f3723ba99cdcaac91a21') diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index daa8d9236..8c7ed8a70 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74003 2012-07-18 01:07:58Z ibiru $ +# $Id: PKGBUILD 74622 2012-07-31 19:56:30Z ebelanger $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.6.1 -pkgrel=15 +pkgrel=16 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/" diff --git a/community/pigz/PKGBUILD b/community/pigz/PKGBUILD index 6a80d70cb..f9331664b 100755 --- a/community/pigz/PKGBUILD +++ b/community/pigz/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 68038 2012-03-17 08:29:09Z bpiotrowski $ +# $Id: PKGBUILD 74606 2012-07-31 12:59:28Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Laszlo Papp <djszapi2@gmail.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=pigz -pkgver=2.2.4 +pkgver=2.2.5 pkgrel=1 pkgdesc="Parallel implementation of the gzip file compressor" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://www.zlib.net/pigz/" license=('custom') depends=('zlib') source=(http://www.zlib.net/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('9df2a3c742524446fa4e797c17e8fd85') +md5sums=('188f769ccedc403893d03049ad31e969') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD index a133d447b..0eacda1b1 100644 --- a/community/pingus/PKGBUILD +++ b/community/pingus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74004 2012-07-18 01:08:07Z ibiru $ +# $Id: PKGBUILD 74636 2012-08-01 00:58:24Z ebelanger $ # Maintainer: Eric Belanger <eric@archlinux.org> pkgname=pingus pkgver=0.7.6 -pkgrel=4 +pkgrel=5 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game." arch=('i686' 'x86_64') url="http://pingus.seul.org" diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD index 122eb7e51..cd9d13003 100644 --- a/community/projectm/PKGBUILD +++ b/community/projectm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66284 2012-02-23 10:51:41Z giovanni $ +# $Id: PKGBUILD 74623 2012-07-31 19:56:37Z ebelanger $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=projectm pkgver=2.0.1 -pkgrel=5 +pkgrel=6 pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.' arch=('i686' 'x86_64') url='http://projectm.sourceforge.net/' diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD index fe9298029..30adb23b8 100644 --- a/community/rss-glx/PKGBUILD +++ b/community/rss-glx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 55897 2011-09-24 16:49:31Z stephane $ +# $Id: PKGBUILD 74624 2012-07-31 19:56:44Z ebelanger $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> # Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au> pkgname=rss-glx pkgver=0.9.1 -pkgrel=8 +pkgrel=9 pkgdesc="The Really Slick Screensavers port to GLX" arch=('i686' 'x86_64') url="http://rss-glx.sourceforge.net/" diff --git a/community/sdcc/PKGBUILD b/community/sdcc/PKGBUILD index bb057dcce..469ce7788 100644 --- a/community/sdcc/PKGBUILD +++ b/community/sdcc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61264 2011-12-27 15:33:34Z spupykin $ +# $Id: PKGBUILD 74603 2012-07-31 12:45:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jose Negron <josenj.arch@mailnull.net> pkgname=sdcc -pkgver=3.1.0 +pkgver=3.2.0 pkgrel=1 pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)" arch=('i686' 'x86_64') @@ -14,20 +14,19 @@ optdepends=('python') url="http://sdcc.sourceforge.net/" options=(!strip) source=(http://downloads.sourceforge.net/sourceforge/sdcc/$pkgname-src-$pkgver.tar.bz2) -md5sums=('92202e970071a8b506fea62a913bd2d2') +md5sums=('0808a9b4109d2ba6046ddd7b679a0012') build() { cd $srcdir/$pkgname - LDFLAGS="-lm" ./configure --prefix=$pkgdir/usr - - # gcc -O2 bug workaround - [ $CARCH == "i686" ] && ( - cd src && - make SDCCy.h && - gcc -g -O0 -I. -I.. -I./../support/util -c SDCCicode.c -o SDCCicode.o - ) - + ./configure \ + --prefix=/usr \ + --includedir=/usr/include/sdcc \ + --libdir=/usr/lib/sdcc make - make install - strip $pkgdir/usr/bin/* || true + make install DESTDIR=$pkgdir + + if [ -d $pkgdir/usr/lib/lib ]; then + mv $pkgdir/usr/lib/lib/* $pkgdir/usr/lib/sdcc/ + rm -rf $pkgdir/usr/lib/lib + fi } diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD index 9d7659488..cf004610c 100644 --- a/community/sfml/PKGBUILD +++ b/community/sfml/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 69315 2012-04-13 15:58:59Z svenstaro $ +# $Id: PKGBUILD 74625 2012-07-31 19:56:49Z ebelanger $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Ondrej Martinak <omartinak@gmail.com> pkgname=sfml pkgver=2.0rc1 -pkgrel=1 +pkgrel=2 pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API' arch=('i686' 'x86_64') url='http://www.sfml-dev.org/' diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 3af217fd2..f9010836e 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74011 2012-07-18 01:09:05Z ibiru $ +# $Id: PKGBUILD 74626 2012-07-31 19:56:56Z ebelanger $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> @@ -6,16 +6,17 @@ pkgname=spring pkgver=0.89.0 _pkgver=89.0 -pkgrel=1 +pkgrel=2 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64') url="http://springrts.com/" license=('GPL') depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl' - 'libxcursor') + 'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils') makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment') optdepends=('python2: python-based bots' 'java-runtime: java-based bots') +install=spring.install source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma boost-1.50.patch) md5sums=('36fc266e925bc3790a68bf1bc7ebb315' @@ -27,21 +28,21 @@ build() { cd spring_${_pkgver} sed "s/TIME_UTC/TIME_UTC_/g" -i AI/Skirmish/E323AI/CScopedTimer.h - patch -Np1 < $srcdir/boost-1.50.patch + patch -Np1 < "$srcdir/boost-1.50.patch" cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DDATADIR=share/spring + -DDATADIR=share/spring -DCMAKE_SKIP_RPATH:BOOL=YES make } package() { cd spring_${_pkgver} - make DESTDIR=$pkgdir install + make DESTDIR="$pkgdir" install - install -d $pkgdir/etc/spring - echo '$HOME/.spring' > $pkgdir/etc/spring/datadir + install -d "$pkgdir/etc/spring" + echo '$HOME/.spring' > "$pkgdir/etc/spring/datadir" } # vim sw=2:ts=2 et: diff --git a/community/spring/spring.install b/community/spring/spring.install new file mode 100644 index 000000000..41f09f887 --- /dev/null +++ b/community/spring/spring.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/supertux/PKGBUILD b/community/supertux/PKGBUILD index 9d6b2ecc0..9f3f95509 100644 --- a/community/supertux/PKGBUILD +++ b/community/supertux/PKGBUILD @@ -1,23 +1,27 @@ +# $Id: PKGBUILD 74627 2012-07-31 19:57:01Z ebelanger $ # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: Eric Belanger <belanger@astro.umontreal.ca> +# Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: vande198 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=supertux pkgver=0.3.3 -pkgrel=5 +pkgrel=6 pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games" arch=('i686' 'x86_64') url="http://super-tux.sourceforge.net/" license=('GPL') depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'libgl' 'glew') makedepends=('cmake' 'boost') -source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2) -md5sums=('f3f803e629ee51a9de0b366a036e393d') +source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 + supertux2-0.3.3-squirrel-gcc47.patch) +md5sums=('f3f803e629ee51a9de0b366a036e393d' + 'eb06315514be4f200428f14b927beb66') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch" sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp sed -i '/types\.h/d' src/addon/addon_manager.cpp cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin . @@ -25,7 +29,7 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/supertux/supertux2-0.3.3-squirrel-gcc47.patch b/community/supertux/supertux2-0.3.3-squirrel-gcc47.patch new file mode 100644 index 000000000..16781b610 --- /dev/null +++ b/community/supertux/supertux2-0.3.3-squirrel-gcc47.patch @@ -0,0 +1,36 @@ +diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h supertux2-0.3.3/external/squirrel/squirrel/sqmem.h +--- supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h 1970-01-01 01:00:00.000000000 +0100 ++++ supertux2-0.3.3/external/squirrel/squirrel/sqmem.h 2012-05-01 11:59:37.000000000 +0200 +@@ -0,0 +1,8 @@ ++/* see copyright notice in squirrel.h */ ++#ifndef _SQMEM_H_ ++#define _SQMEM_H_ ++ ++void *sq_vm_malloc(SQUnsignedInteger size); ++void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size); ++void sq_vm_free(void *p,SQUnsignedInteger size); ++#endif //_SQMEM_H_ +diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h supertux2-0.3.3/external/squirrel/squirrel/sqstate.h +--- supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h 2010-03-01 13:40:58.000000000 +0100 ++++ supertux2-0.3.3/external/squirrel/squirrel/sqstate.h 2012-05-01 11:59:37.000000000 +0200 +@@ -136,8 +136,4 @@ + extern SQObjectPtr _minusone_; + + bool CompileTypemask(SQIntVec &res,const SQChar *typemask); +- +-void *sq_vm_malloc(SQUnsignedInteger size); +-void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size); +-void sq_vm_free(void *p,SQUnsignedInteger size); + #endif //_SQSTATE_H_ +diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h supertux2-0.3.3/external/squirrel/squirrel/squtils.h +--- supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h 2010-03-01 13:40:58.000000000 +0100 ++++ supertux2-0.3.3/external/squirrel/squirrel/squtils.h 2012-05-01 11:59:37.000000000 +0200 +@@ -2,6 +2,8 @@ + #ifndef _SQUTILS_H_ + #define _SQUTILS_H_ + ++#include "sqmem.h" ++ + #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;} + #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));} + #define SQ_MALLOC(__size) sq_vm_malloc((__size)); diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD index a85ea7973..e6845d2be 100644 --- a/community/vdrift/PKGBUILD +++ b/community/vdrift/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 69896 2012-04-25 19:15:46Z svenstaro $ +# $Id: PKGBUILD 74628 2012-07-31 19:57:06Z ebelanger $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Anton Bazhenov <anton.bazhenov at gmail> # Contributor: Lone_Wolf lonewolf@xs4all.nl pkgname=vdrift pkgver=2011.10.22 -pkgrel=6 +pkgrel=7 pkgdesc="Open source driving simulation made with drift racing in mind" arch=('i686' 'x86_64') url="http://vdrift.net/" license=('GPL') -depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data') +depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data' + 'gtk-update-icon-cache' 'hicolor-icon-theme' 'libarchive') makedepends=('scons' 'boost' 'asio') source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2) md5sums=('6f8806ab1be303e9e1e47522c9eee890') @@ -61,6 +62,6 @@ package() { install -Dm644 data/textures/icons/vdrift-64x64.png \ "$pkgdir/usr/share/pixmaps/$pkgname.png" - rm -r $pkgdir/usr/share/vdrift + rm -r "$pkgdir"/usr/share/vdrift } # vim: sw=2:ts=2 et: diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD index 5ff461c2a..bad8cc4c9 100644 --- a/community/widelands/PKGBUILD +++ b/community/widelands/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70033 2012-04-28 14:02:07Z svenstaro $ +# $Id: PKGBUILD 74629 2012-07-31 19:57:21Z ebelanger $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <rabyte*gmail> @@ -6,7 +6,7 @@ pkgname=widelands pkgver=17 _realver=build17 -pkgrel=2 +pkgrel=3 pkgdesc="A realtime strategy game with emphasis on economy and transport" arch=('i686' 'x86_64') url="http://widelands.org/" diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD index 7e104649b..cfa254d59 100644 --- a/core/bison/PKGBUILD +++ b/core/bison/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163856 2012-07-21 11:24:29Z allan $ +# $Id: PKGBUILD 164386 2012-08-01 01:21:23Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> pkgname=bison -pkgver=2.6 +pkgver=2.6.1 pkgrel=1 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('glibc' 'm4' 'sh') groups=('base-devel') install=bison.install source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('f96a16e79daaef71c797ed88f52e59d1' - 'd67a1a075ab0cccfb53ab23692be1a02') +md5sums=('1fc1b9bc689e7fc5622d32c93cce746f' + '44d571e9b271fbcf283c1795c28f70aa') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD index 4ec999746..156f43113 100644 --- a/core/cryptsetup/PKGBUILD +++ b/core/cryptsetup/PKGBUILD @@ -1,24 +1,19 @@ -# $Id: PKGBUILD 162744 2012-06-29 11:46:09Z thomas $ +# $Id: PKGBUILD 164359 2012-07-31 19:25:50Z tomegun $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=cryptsetup -pkgver=1.4.3 +pkgver=1.5.0 pkgrel=1 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt" arch=(i686 x86_64) license=('GPL') url="http://code.google.com/p/cryptsetup/" groups=('base') -depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt' 'util-linux') -conflicts=('mkinitcpio<0.7') +depends=('device-mapper' 'libgcrypt' 'popt' 'util-linux') options=('!libtool' '!emptydirs') source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc encrypt_hook encrypt_install) -sha256sums=('d5ff2c00f6f791d77fa5636a02ae43ddbb46c6c793bdeafdec5e38fd15f99d0a' - 'ad610fe77d78bf7e91b7473f9d9c84de46ed1cc21f006fe3ae4791b0b6f42f3a' - 'e0cbcabb81233b4d465833dca0faf1e762dc3cb6611597a25fe24e5d7209f316' - 'cfe465bdad3d958bb2332a05e04f2e1e884422a5714dfd1a0a3b9b74bf7dc6ae') build() { cd "${srcdir}"/$pkgname-${pkgver} @@ -33,3 +28,7 @@ package() { install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt } +md5sums=('0fa7ba8923b0ce8eed2aa65f2cb9950c' + 'efe1b74dfadf37726397fd27ad0df965' + '4dab1b0e23d81907b79b49c2d8d719b5' + '21c45f9cab3e0b5165f68358884fbd0f') diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD index 2dae85048..92fa18186 100644 --- a/extra/bzflag/PKGBUILD +++ b/extra/bzflag/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 159790 2012-05-27 03:26:02Z bisson $ +# $Id: PKGBUILD 164360 2012-07-31 19:42:02Z eric $ # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Contributor: Kevin Piche <kevin@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=bzflag pkgver=2.4.0 -pkgrel=3 +pkgrel=4 pkgdesc='Multiplayer 3D tank battle game' url='http://bzflag.org/' license=('LGPL') diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 4572d53c6..341149994 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164230 2012-07-28 01:31:18Z eric $ +# $Id: PKGBUILD 164361 2012-07-31 19:42:30Z eric $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -23,7 +23,7 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.4.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD index eca14a2fb..bf4bd70d3 100644 --- a/extra/enblend-enfuse/PKGBUILD +++ b/extra/enblend-enfuse/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 148706 2012-02-05 11:47:41Z ibiru $ +# $Id: PKGBUILD 164362 2012-07-31 19:42:40Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=enblend-enfuse pkgver=4.0 -pkgrel=5 +pkgrel=6 pkgdesc="Intelligent blend tool for overlapping picture" arch=("i686" "x86_64") license=('GPL') url="http://enblend.sourceforge.net" -depends=('openexr' 'glew>=1.5' 'libxmi' 'freeglut' 'lcms' 'libpng') +depends=('openexr' 'glew' 'libxmi' 'freeglut' 'lcms' 'libpng' 'boost-libs') makedepends=('boost') replaces=('enblend') conflicts=('enblend') @@ -27,7 +27,7 @@ build() { sed -i 's/info.arith_code = TRUE/info.arith_code = FALSE/' src/vigra_impex/jpeg.cxx patch -p1 -i ../libpng-1.4.patch patch -p0 -i ../enblend-4.0-libpng15.patch - ./configure --prefix=/usr + LIBS="-lboost_system" ./configure --prefix=/usr make } diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD index f72d47777..7737b995e 100644 --- a/extra/glew/PKGBUILD +++ b/extra/glew/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 147734 2012-01-27 15:57:44Z stephane $ +# $Id: PKGBUILD 164363 2012-07-31 19:42:44Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: SleepyDog pkgname=glew -pkgver=1.7.0 -pkgrel=2 +pkgver=1.8.0 +pkgrel=1 pkgdesc="The OpenGL Extension Wrangler Library" arch=('i686' 'x86_64') url="http://glew.sourceforge.net" license=('BSD' 'MIT' 'GPL') depends=('libxmu' 'libxi' 'mesa') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz) -sha1sums=('9266f2360c1687a96f2ea06419671d370b2928d1') +sha1sums=('641c6bb3f924ec786e1e6cf2b1b230f594e0f0e4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gtkpod/PKGBUILD b/extra/gtkpod/PKGBUILD index 374b805ac..59721e0fb 100644 --- a/extra/gtkpod/PKGBUILD +++ b/extra/gtkpod/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162106 2012-06-20 04:34:13Z eric $ +# $Id: PKGBUILD 164364 2012-07-31 19:42:49Z eric $ # Contributor: Kevin Piche <kevin@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=gtkpod pkgver=2.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="A platform independent GUI for Apple's iPod using GTK3" arch=('i686' 'x86_64') url="http://gtkpod.sourceforge.net" diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index fd272e9f4..b6c7af561 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 160359 2012-06-01 12:58:23Z dreisner $ +# $Id: PKGBUILD 164365 2012-07-31 19:42:58Z eric $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') pkgver=1.12.3 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL') makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2') diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD index bc27013ff..2dba6707b 100644 --- a/extra/hugin/PKGBUILD +++ b/extra/hugin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 163705 2012-07-18 01:05:24Z ibiru $ +# $Id: PKGBUILD 164366 2012-07-31 19:43:06Z eric $ # Maintainer: Tobias Kieslich <tobias@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dominik Ryba <domryba@post.pl> pkgname=hugin pkgver=2011.4.0 -pkgrel=3 +pkgrel=4 pkgdesc="A frontend to the panorama-tools" arch=('i686' 'x86_64') url="http://hugin.sourceforge.net/" diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD index 9efc001dd..802016ef1 100644 --- a/extra/libgpod/PKGBUILD +++ b/extra/libgpod/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 157452 2012-04-28 13:14:16Z ibiru $ +# $Id: PKGBUILD 164367 2012-07-31 19:43:09Z eric $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libgpod pkgver=0.8.2 -pkgrel=5 +pkgrel=6 pkgdesc="A shared library to access the contents of an iPod" arch=(i686 x86_64) license=('LGPL') -depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice') +depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice' 'libplist') makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2') optdepends=('gtk-sharp-2: Mono bindings' 'python2-gobject2: python bindings') diff --git a/extra/libimobiledevice/PKGBUILD b/extra/libimobiledevice/PKGBUILD index c9a22e8d3..b17bff63f 100644 --- a/extra/libimobiledevice/PKGBUILD +++ b/extra/libimobiledevice/PKGBUILD @@ -1,28 +1,21 @@ -# $Id: PKGBUILD 156906 2012-04-23 09:08:47Z ibiru $ +# $Id: PKGBUILD 164368 2012-07-31 19:43:16Z eric $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=libimobiledevice -pkgver=1.1.1 -pkgrel=3 +pkgver=1.1.4 +pkgrel=1 pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux" url="http://libimobiledevice.org/" arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') -depends=('usbmuxd' 'libplist' 'gnutls' 'libgcrypt') -makedepends=('python2' 'swig') +depends=('usbmuxd' 'gnutls' 'libgcrypt') options=('!libtool') -source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2 - swig-version-check.patch) -md5sums=('cdc13037e822d9ac2e109536701d153a' - '8bb215e36fe0e08a72332c108c7842cc') +source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2) build() { cd "$pkgname-$pkgver" - # SWIG version check is wrong (still not fixed upstream) - patch -p1 -i ../swig-version-check.patch - PYTHON=/usr/bin/python2 ./configure --prefix=/usr make } @@ -31,3 +24,4 @@ package() { cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } +md5sums=('3f28cbc6a2e30d34685049c0abde5183') diff --git a/extra/netcdf-cxx/PKGBUILD b/extra/netcdf-cxx/PKGBUILD new file mode 100644 index 000000000..600e095a3 --- /dev/null +++ b/extra/netcdf-cxx/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 164375 2012-07-31 20:02:04Z ronald $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: damir <damir@archlinux.org> + +pkgname=netcdf-cxx +pkgver=4.2 +pkgrel=1 +pkgdesc="NetCDF c++ bindings" +arch=("i686" "x86_64") +url="http://www.unidata.ucar.edu/downloads/netcdf/netcdf-cxx/index.jsp" +depends=('gcc-libs' 'netcdf' 'curl') +options=('!libtool' '!makeflags') +license=('custom') +source=(http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-cxx4-${pkgver}.tar.gz) +sha1sums=('59628c9f06c211a47517fc00d8b068da159ffa9d') + +build() { + cd ${srcdir}/${pkgname}4-${pkgver} + ./configure --prefix=/usr --enable-shared + make +# make check +} + +package() { + cd ${srcdir}/${pkgname}4-${pkgver} + + install -m755 -d ${pkgdir}/usr/lib + install -m755 -d ${pkgdir}/usr/share/man + make DESTDIR=${pkgdir} install + + install -Dm644 ${srcdir}/${pkgname}4-${pkgver}/COPYRIGHT \ + ${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT + +} diff --git a/extra/netcdf-fortran/PKGBUILD b/extra/netcdf-fortran/PKGBUILD new file mode 100644 index 000000000..415844e0a --- /dev/null +++ b/extra/netcdf-fortran/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 164376 2012-07-31 20:07:54Z ronald $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: damir <damir@archlinux.org> + +pkgname=netcdf-fortran +pkgver=4.2 +pkgrel=1 +pkgdesc="NetCDF fortran bindings" +arch=("i686" "x86_64") +url="http://www.unidata.ucar.edu/downloads/netcdf/netcdf-fortran/index.jsp" +depends=('gcc-libs' 'netcdf' 'curl' 'gcc-fortran') +options=('!libtool' '!makeflags') +license=('custom') +install=${pkgname}.install +source=(http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-fortran-${pkgver}.tar.gz) +sha1sums=('f1887314455330f4057bc8eab432065f8f6f74ef') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --enable-shared + make +# make check +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + install -m755 -d ${pkgdir}/usr/lib + install -m755 -d ${pkgdir}/usr/share/man + make DESTDIR=${pkgdir} install + + install -Dm644 ${srcdir}/${pkgname}-${pkgver}/COPYRIGHT \ + ${pkgdir}/usr/share/licenses/${pkgname}/COPYRIGHT + +} diff --git a/extra/netcdf-fortran/netcdf-fortran.install b/extra/netcdf-fortran/netcdf-fortran.install new file mode 100644 index 000000000..38e5bc58e --- /dev/null +++ b/extra/netcdf-fortran/netcdf-fortran.install @@ -0,0 +1,19 @@ +info_dir=/usr/share/info +info_files=(netcdf-f77.info netcdf-f77.info-1 netcdf-f77.info-2 netcdf-f90.info) + + +post_install() { + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install +} + +pre_remove() { + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} diff --git a/extra/netcdf/PKGBUILD b/extra/netcdf/PKGBUILD index 2280b03f5..6d3bc8231 100644 --- a/extra/netcdf/PKGBUILD +++ b/extra/netcdf/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 148503 2012-02-02 20:25:58Z ronald $ +# $Id: PKGBUILD 164373 2012-07-31 19:53:39Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=netcdf -pkgver=4.1.3 -pkgrel=2 +pkgver=4.2.1 +pkgrel=1 pkgdesc="network Common Data Form interface for array-oriented data access and corresponding library" arch=("i686" "x86_64") url="http://www.unidata.ucar.edu/downloads/netcdf/index.jsp" -depends=('gcc-libs' 'hdf5' 'gcc-fortran' 'curl') +depends=('gcc-libs' 'hdf5' 'curl') +optdepends=('netcdf-fortran: fortran bindings' 'netcdf-cxx: c++ bindings') options=('!libtool' '!makeflags') license=('custom') source=(http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-${pkgver}.tar.gz) -sha1sums=('e600322478276f51612e17cca3cda38489003f81') +sha1sums=('dfb6b10ef8dd20e785efa5e29b448383090f144d') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/opennx/PKGBUILD b/extra/opennx/PKGBUILD index 1ff26992c..cbf28b2ca 100644 --- a/extra/opennx/PKGBUILD +++ b/extra/opennx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162885 2012-07-02 16:49:28Z andyrtr $ +# $Id: PKGBUILD 164356 2012-07-31 16:14:21Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Armin Luntzer # Original opennx PKGBUILD: Tomas Groth tomasgroth.at.yahoo.dk pkgname=opennx -pkgver=0.16.0.713 +pkgver=0.16.0.719 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=('9699fd2d9b19b8d0fb37959ace846666') +md5sums=('bb0ca1df36f4d9246c6f88d734be937b') build() { cd $srcdir/opennx* diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD index 2cad7f16b..567a6ec04 100644 --- a/extra/python-lxml/PKGBUILD +++ b/extra/python-lxml/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 162858 2012-07-02 13:06:22Z giovanni $ +# $Id: PKGBUILD 164350 2012-07-31 09:59:25Z eric $ # Maintainer: pkgname=('python-lxml' 'python2-lxml') -pkgver=2.3.4 -pkgrel=2 +pkgver=2.3.5 +pkgrel=1 pkgdesc="Python binding for the libxml2 and libxslt libraries" arch=('i686' 'x86_64') license=('BSD' 'custom') url="http://lxml.de/" makedepends=('python2' 'python' 'libxslt') source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc}) -sha1sums=('90a226d8a2ee38de47fc3351445dab6df0e33a20' - '7962be7794d7f4c87d2fce0104c27990f48f1ce1') +sha1sums=('4fec0ca5054a8d6220d3dc7230a5066850192848' + 'd74ad6509a0048ea0e979985e12869f2e1126b78') check() { cd "${srcdir}"/lxml-$pkgver diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD index a37cda2b5..bd77b2427 100644 --- a/extra/rhythmbox/PKGBUILD +++ b/extra/rhythmbox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163812 2012-07-20 12:21:50Z heftig $ +# $Id: PKGBUILD 164369 2012-07-31 19:43:21Z eric $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rhythmbox pkgver=2.97 -pkgrel=1 +pkgrel=2 pkgdesc="An iTunes-like music playback and management application" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/tcl/PKGBUILD b/extra/tcl/PKGBUILD index 73f1461fc..7d12f19bf 100644 --- a/extra/tcl/PKGBUILD +++ b/extra/tcl/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 142555 2011-11-12 07:19:34Z allan $ +# $Id: PKGBUILD 164387 2012-08-01 01:21:35Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Committer: Judd Vinet <jvinet@zeroflux.org> pkgname=tcl -pkgver=8.5.11 +pkgver=8.5.12 pkgrel=1 pkgdesc="The Tcl scripting language" arch=('i686' 'x86_64') url="http://tcl.sourceforge.net/" license=('custom') source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz) -md5sums=('b01a9691c83990b3db0ce62d1012ca67') +md5sums=('174b2b4c619ba8f96875d8a051917703') build() { cd ${srcdir}/tcl${pkgver}/unix @@ -24,10 +24,10 @@ build() { make } -#check() { -# cd ${srcdir}/tcl${pkgver}/unix -# make test -#} +check() { + cd ${srcdir}/tcl${pkgver}/unix + make test +} package() { diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD index f1d6d4677..cb5e31c2f 100644 --- a/extra/tk/PKGBUILD +++ b/extra/tk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142557 2011-11-12 07:19:37Z allan $ +# $Id: PKGBUILD 164388 2012-08-01 01:21:39Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=tk -pkgver=8.5.11 +pkgver=8.5.12 pkgrel=1 pkgdesc="A windowing toolkit for use with tcl" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="http://tcl.sourceforge.net/" license=('custom') depends=("tcl=${pkgver}" 'libxss' 'libxft') source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz) -md5sums=('b61b72f0aad230091b100746f078b8f1') +md5sums=('a01640176845c1f654a412cfc9bab13b') build() { cd ${srcdir}/tk${pkgver}/unix diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD index 724c41920..4b1454406 100644 --- a/extra/upower/PKGBUILD +++ b/extra/upower/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163113 2012-07-07 10:34:53Z tomegun $ +# $Id: PKGBUILD 164370 2012-07-31 19:43:25Z eric $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=upower pkgver=0.9.17 -pkgrel=1 +pkgrel=2 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64') url="http://upower.freedesktop.org" diff --git a/extra/usbmuxd/85-usbmuxd.rules b/extra/usbmuxd/85-usbmuxd.rules new file mode 100644 index 000000000..ec9f72501 --- /dev/null +++ b/extra/usbmuxd/85-usbmuxd.rules @@ -0,0 +1,9 @@ +# usbmuxd ("Apple Mobile Device" muxer listening on /var/run/usbmuxd) + +# Forces iDevices to the last USB configuration and runs usbmuxd +TEST=="/sys/fs/cgroup/systemd", ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", TAG+="systemd", ENV{SYSTEMD_WANTS}="usbmuxd.service", GOTO="usbmuxd_systemd_end" +ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", RUN+="/usr/sbin/usbmuxd -u -U usbmux" +LABEL="usbmuxd_systemd_end" + +# Exit usbmuxd when the last device is removed +ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="/usr/sbin/usbmuxd -x" diff --git a/extra/usbmuxd/PKGBUILD b/extra/usbmuxd/PKGBUILD index f7d7f6d50..4666b7cef 100644 --- a/extra/usbmuxd/PKGBUILD +++ b/extra/usbmuxd/PKGBUILD @@ -1,25 +1,24 @@ -# $Id: PKGBUILD 158609 2012-05-05 03:08:45Z allan $ +# $Id: PKGBUILD 164371 2012-07-31 19:43:35Z eric $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Gabriel Martinez < reitaka at gmail dot com > pkgname=usbmuxd -pkgver=1.0.7 -pkgrel=3 +pkgver=1.0.8 +pkgrel=1 pkgdesc="USB Multiplex Daemon" url="http://marcansoft.com/blog/iphonelinux/usbmuxd/" arch=('i686' 'x86_64') license=('GPL2' 'GPL3' 'LGPL2.1') -depends=('libusb>=1.0.8') +depends=('libusb' 'libplist') makedepends=('cmake') install=usbmuxd.install -source=(http://marcansoft.com/uploads/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - usbmuxd-udevuser.patch) -md5sums=('6f431541f3177fa06aa6df9ceecb2da0' - '8526f24f4ad16cd6b2a7321c0b59592c') +source=("http://cgit.sukimashita.com/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2" + 'usbmuxd.service' + '85-usbmuxd.rules') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/usbmuxd-udevuser.patch" + echo "${pkgver}" > version.tag mkdir build cd build cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX="" @@ -33,4 +32,11 @@ package() { # fix udev dir being hardcoded mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/" rmdir "${pkgdir}/lib" + # install systemd service file + install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service + # use udev rule that works with systemd + install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/ } +md5sums=('87fd27773a84e97ac6e2dc28b08d682e' + 'dae0660f972510a6483992b5b81e1b5a' + 'dc4b2893651149eccbf7b2c8467cd288') diff --git a/extra/usbmuxd/usbmuxd.service b/extra/usbmuxd/usbmuxd.service new file mode 100644 index 000000000..fbebf65b9 --- /dev/null +++ b/extra/usbmuxd/usbmuxd.service @@ -0,0 +1,5 @@ +[Unit] +Description=iOS USB Muxer + +[Service] +ExecStart=/usr/sbin/usbmuxd -u -f -U usbmux diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD index ce81200bc..6132159e8 100644 --- a/multilib/wine/PKGBUILD +++ b/multilib/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 74026 2012-07-18 09:16:25Z bluewind $ +# $Id: PKGBUILD 74632 2012-07-31 20:08:23Z 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.5.9 +pkgver=1.5.10 pkgrel=1 _pkgbasever=${pkgver/rc/-rc} source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('65a98308d60f878462f4c404d2d013b2') +md5sums=('7bf0345d31e23111ab6ae69e153bc961') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" diff --git a/testing/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch b/testing/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch new file mode 100644 index 000000000..4420d0b63 --- /dev/null +++ b/testing/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch @@ -0,0 +1,33 @@ +From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001 +From: Dan McGee <dan@archlinux.org> +Date: Sun, 19 Jun 2011 16:04:25 -0500 +Subject: [PATCH] Set hostname via /proc if file is available + +On Linux, the hostname can be set via this file if available, precluding +the need for a `hostname` binary. + +Signed-off-by: Dan McGee <dan@archlinux.org> +--- + dhcpcd-hooks/30-hostname | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname +index 65d1a13..af94262 100644 +--- a/dhcpcd-hooks/30-hostname ++++ b/dhcpcd-hooks/30-hostname +@@ -21,7 +21,11 @@ need_hostname() + try_hostname() + { + if valid_domainname "$1"; then +- hostname "$1" ++ if [ -w /proc/sys/kernel/hostname ]; then ++ echo "$1" > /proc/sys/kernel/hostname ++ else ++ hostname "$1" ++ fi + else + syslog err "Invalid hostname: $1" + fi +-- +1.7.5.4 + diff --git a/testing/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch b/testing/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch new file mode 100644 index 000000000..7e78ecd0d --- /dev/null +++ b/testing/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch @@ -0,0 +1,61 @@ +From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <d@falconindy.com> +Date: Tue, 21 Jun 2011 09:32:47 -0400 +Subject: [PATCH] set MTU via sysfs if file is available + +On Linux, a network interface's MTU can be set by writing to +/sys/class/net/$interface/mtu, which removes the dependency on ifconfig. + +Signed-off-by: Dave Reisner <d@falconindy.com> +--- + dhcpcd-hooks/10-mtu | 4 ++-- + dhcpcd-run-hooks.in | 11 +++++++++++ + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/dhcpcd-hooks/10-mtu b/dhcpcd-hooks/10-mtu +index 639697c..8763930 100644 +--- a/dhcpcd-hooks/10-mtu ++++ b/dhcpcd-hooks/10-mtu +@@ -7,7 +7,7 @@ if [ "$reason" = PREINIT -a -e "$mtu_dir/$interface" ]; then + elif [ -n "$new_interface_mtu" ] && $if_up; then + # The smalled MTU dhcpcd can work with is 576 + if [ "$new_interface_mtu" -ge 576 ]; then +- if ifconfig "$interface" mtu "$new_interface_mtu"; then ++ if set_mtu "$interface" "$new_interface_mtu"; then + syslog info "$interface: MTU set to $new_interface_mtu" + # Save the MTU so we can restore it later + if [ ! -e "$mtu_dir/$interface" ]; then +@@ -21,7 +21,7 @@ elif [ -e "$mtu_dir/$interface" ]; then + # No MTU in this state, so restore the prior MTU + mtu=$(cat "$mtu_dir/$interface") + syslog info "$interface: MTU restored to $mtu" +- ifconfig "$interface" mtu "$mtu" ++ set_mtu "$interface" "$mtu" + rm "$mtu_dir/$interface" + fi + fi +diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in +index 0e60338..843f3ca 100644 +--- a/dhcpcd-run-hooks.in ++++ b/dhcpcd-run-hooks.in +@@ -215,6 +215,17 @@ service_condcommand() + service_exists $1 && service_status $1 && service_cmd $1 $2 + } + ++# Set MTU for an interface ++set_mtu() { ++ local interface=$1 mtu=$2 ++ ++ if [ -e /sys/class/net/$interface/mtu ]; then ++ echo "$mtu" > /sys/class/net/$interface/mtu ++ else ++ ifconfig "$interface" mtu "$mtu" ++ fi ++} ++ + # We source each script into this one so that scripts run earlier can + # remove variables from the environment so later scripts don't see them. + # Thus, the user can create their dhcpcd.enter/exit-hook script to configure +-- +1.7.5.4 + diff --git a/testing/dhcpcd/PKGBUILD b/testing/dhcpcd/PKGBUILD new file mode 100644 index 000000000..4b96ec8f3 --- /dev/null +++ b/testing/dhcpcd/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 164380 2012-07-31 20:34:32Z ronald $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Tom Killian <tom.archlinux.org> +# Contributor: Judd Vinet <jvinet.zeroflux.org> + +pkgname=dhcpcd +pkgver=5.6.0 +pkgrel=1 +pkgdesc="RFC2131 compliant DHCP client daemon" +url="http://roy.marples.name/projects/dhcpcd/" +arch=('i686' 'x86_64') +license=('BSD') +groups=('base') +depends=('glibc' 'sh') +backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') +options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory +source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ + 'dhcpcd.conf.d' 'dhcpcd.service') +sha1sums=('28ad6931393420a72da307ee173466a9e00cd952' + 'b67b9ce6a2faaca75fea356966a16be2283b7db0' + '3d0542eab1b89a88d56ca427128228ac72c40d1f') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # configure variables + ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \ + --rundir=/run + + # Build + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + # Create Binary Symlink + install -d ${pkgdir}/usr/sbin + ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd + + # Install Configuration File used in /etc/rc.d/network + install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname + + # Install License + install -d $pkgdir/usr/share/licenses/$pkgname + awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \ + >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + + # Set Options in /etc/dhcpcd.conf + echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall + + # install systemd files + install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service +} diff --git a/testing/dhcpcd/dhcpcd.conf.d b/testing/dhcpcd/dhcpcd.conf.d new file mode 100644 index 000000000..83c6f14ad --- /dev/null +++ b/testing/dhcpcd/dhcpcd.conf.d @@ -0,0 +1,6 @@ +# +# Arguments to be passed to the DHCP client daemon +# + +DHCPCD_ARGS="-q" + diff --git a/testing/dhcpcd/dhcpcd.service b/testing/dhcpcd/dhcpcd.service new file mode 100644 index 000000000..25a1923ac --- /dev/null +++ b/testing/dhcpcd/dhcpcd.service @@ -0,0 +1,13 @@ +[Unit] +Description=dhcpcd on %I +Wants=network.target +Before=network.target + +[Service] +Type=forking +PIDFile=/run/dhcpcd-%I.pid +ExecStart=/sbin/dhcpcd -A -q -w %I +ExecStop=/sbin/dhcpcd -k %I + +[Install] +Alias=multi-user.target.wants/dhcpcd@eth0.service diff --git a/testing/dhcpcd/remove_ifconfig.patch b/testing/dhcpcd/remove_ifconfig.patch new file mode 100644 index 000000000..5bcc4a68f --- /dev/null +++ b/testing/dhcpcd/remove_ifconfig.patch @@ -0,0 +1,20 @@ +--- dhcpcd-hooks/10-mtu.orig 2011-11-04 07:45:46.477712667 +0100 ++++ dhcpcd-hooks/10-mtu 2011-11-04 07:46:38.964379550 +0100 +@@ -7,7 +7,7 @@ + elif [ -n "$new_interface_mtu" ] && $if_up; then + # The smalled MTU dhcpcd can work with is 576 + if [ "$new_interface_mtu" -ge 576 ]; then +- if ifconfig "$interface" mtu "$new_interface_mtu"; then ++ if ip link set "$interface" mtu "$new_interface_mtu"; then + syslog info "$interface: MTU set to $new_interface_mtu" + # Save the MTU so we can restore it later + if [ ! -e "$mtu_dir/$interface" ]; then +@@ -21,7 +21,7 @@ + # No MTU in this state, so restore the prior MTU + mtu=$(cat "$mtu_dir/$interface") + syslog info "$interface: MTU restored to $mtu" +- ifconfig "$interface" mtu "$mtu" ++ ip link set "$interface" mtu "$new_interface_mtu" + rm "$mtu_dir/$interface" + fi + fi diff --git a/testing/e2fsprogs/PKGBUILD b/testing/e2fsprogs/PKGBUILD index 6f1085a0c..b9eafd672 100644 --- a/testing/e2fsprogs/PKGBUILD +++ b/testing/e2fsprogs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162001 2012-06-18 08:47:34Z ronald $ +# $Id: PKGBUILD 164382 2012-07-31 20:39:10Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs -pkgver=1.42.4 +pkgver=1.42.5 pkgrel=1 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk 'MIT-LICENSE') backup=('etc/mke2fs.conf') install=${pkgname}.install -sha1sums=('944002c1f8f1f87e7d2d53263346b001962bc1f9' +sha1sums=('41bc6d247238eac65864193e6de941956da493cb' 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') build() { diff --git a/testing/iptables/PKGBUILD b/testing/iptables/PKGBUILD index 779edbdba..f6d2c8e13 100644 --- a/testing/iptables/PKGBUILD +++ b/testing/iptables/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164053 2012-07-25 06:40:02Z foutrelis $ +# $Id: PKGBUILD 164378 2012-07-31 20:17:23Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.14 -pkgrel=3 +pkgver=1.4.15 +pkgrel=1 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64') license=('GPL2') @@ -24,12 +24,11 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta empty-raw.rules empty-security.rules 0503-extension_cppflags.patch - iptables-1.4.12-fixresore.patch iptables.service ip6tables.service iptables-flush) backup=(etc/conf.d/iptables) -sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' +sha1sums=('56ab3b143af2ad443c9652db3a38ef8869cd2207' '5bb6fa526665cdd728c26f0f282f5a51f220cf88' '2db68906b603e5268736f48c8e251f3a49da1d75' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' @@ -41,7 +40,6 @@ sha1sums=('daf2972b81e52f562a644798013e946c88319ea3' '7db53bb882f62f6c677cc8559cff83d8bae2ef73' 'ebbd1424a1564fd45f455a81c61ce348f0a14c2e' '44626980a52e49f345a0b1e1ca03060f3a35763c' - '7c018d48445ae41c0b9f345747e54b94cb0997b3' '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9' 'f1f16f44c6a5547b6f251d13007fe6585761e8b0' 'e7abda09c61142121b6695928d3b71ccd8fdf73a') @@ -54,11 +52,6 @@ build() { patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch - # Fix scope issue exposed by gcc 4.7 (patch by fryasu) - # http://bugzilla.netfilter.org/show_bug.cgi?id=774 - # (This will most likely be fixed in iptables 1.4.15) - patch -Np1 -i ${srcdir}/iptables-1.4.12-fixresore.patch - ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ --with-xtlibdir=/usr/lib/iptables \ diff --git a/testing/krb5/MITKRB5-SA-2012-001.patch b/testing/krb5/MITKRB5-SA-2012-001.patch new file mode 100644 index 000000000..938b56570 --- /dev/null +++ b/testing/krb5/MITKRB5-SA-2012-001.patch @@ -0,0 +1,61 @@ +diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c +index 23623fe..8ada9d0 100644 +--- a/src/kdc/do_as_req.c ++++ b/src/kdc/do_as_req.c +@@ -463,7 +463,7 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt, + krb5_enctype useenctype; + struct as_req_state *state; + +- state = malloc(sizeof(*state)); ++ state = calloc(sizeof(*state), 1); + if (!state) { + (*respond)(arg, ENOMEM, NULL); + return; +@@ -486,6 +486,7 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt, + state->authtime = 0; + state->c_flags = 0; + state->req_pkt = req_pkt; ++ state->inner_body = NULL; + state->rstate = NULL; + state->sname = 0; + state->cname = 0; +diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c +index 9d8cb34..d4ece3f 100644 +--- a/src/kdc/kdc_preauth.c ++++ b/src/kdc/kdc_preauth.c +@@ -1438,7 +1438,8 @@ etype_info_helper(krb5_context context, krb5_kdc_req *request, + continue; + + } +- if (request_contains_enctype(context, request, db_etype)) { ++ if (krb5_is_permitted_enctype(context, db_etype) && ++ request_contains_enctype(context, request, db_etype)) { + retval = _make_etype_info_entry(context, client->princ, + client_key, db_etype, + &entry[i], etype_info2); +diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c +index a43b291..94dad3a 100644 +--- a/src/kdc/kdc_util.c ++++ b/src/kdc/kdc_util.c +@@ -2461,6 +2461,7 @@ kdc_handle_protected_negotiation(krb5_data *req_pkt, krb5_kdc_req *request, + return 0; + pa.magic = KV5M_PA_DATA; + pa.pa_type = KRB5_ENCPADATA_REQ_ENC_PA_REP; ++ memset(&checksum, 0, sizeof(checksum)); + retval = krb5_c_make_checksum(kdc_context,0, reply_key, + KRB5_KEYUSAGE_AS_REQ, req_pkt, &checksum); + if (retval != 0) +diff --git a/src/lib/kdb/kdb_default.c b/src/lib/kdb/kdb_default.c +index c4bf92e..367c894 100644 +--- a/src/lib/kdb/kdb_default.c ++++ b/src/lib/kdb/kdb_default.c +@@ -61,6 +61,9 @@ krb5_dbe_def_search_enctype(kcontext, dbentp, start, ktype, stype, kvno, kdatap) + krb5_boolean saw_non_permitted = FALSE; + + ret = 0; ++ if (ktype != -1 && !krb5_is_permitted_enctype(kcontext, ktype)) ++ return KRB5_KDB_NO_PERMITTED_KEY; ++ + if (kvno == -1 && stype == -1 && ktype == -1) + kvno = 0; + diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD index c8c15c16f..57575bbda 100644 --- a/testing/krb5/PKGBUILD +++ b/testing/krb5/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161930 2012-06-16 17:15:04Z dreisner $ +# $Id: PKGBUILD 164358 2012-07-31 18:56:29Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=krb5 pkgver=1.10.2 -pkgrel=2 +pkgrel=3 pkgdesc="The Kerberos network authentication system" arch=('i686' 'x86_64') url="http://web.mit.edu/kerberos/" @@ -20,7 +20,8 @@ source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-si krb5-kpropd krb5-kpropd.service krb5-kpropd@.service - krb5-kpropd.socket) + krb5-kpropd.socket + MITKRB5-SA-2012-001.patch) sha1sums=('8b6e2c5bf0c65aacd368b3698add7888f2a7332d' '78b759d566b1fdefd9bbcd06df14f07f12effe96' '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' @@ -30,7 +31,8 @@ sha1sums=('8b6e2c5bf0c65aacd368b3698add7888f2a7332d' '7f402078fa65bb9ff1beb6cbbbb017450df78560' '614401dd4ac18e310153240bb26eb32ff1e8cf5b' '023a8164f8ee7066ac814486a68bc605e79f6101' - 'f3677d30dbbd7106c581379c2c6ebb1bf7738912') + 'f3677d30dbbd7106c581379c2c6ebb1bf7738912' + '7b32dd24e68dc801efb8be280083e4d8067e392a') options=('!emptydirs') build() { @@ -46,6 +48,9 @@ build() { # FS#25384 sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 + # Fix KDC heap corruption and crash vulnerabilities + patch -Np2 -i ../../MITKRB5-SA-2012-001.patch + export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" export CPPFLAGS+=" -I/usr/include/et" ./configure --prefix=/usr \ diff --git a/testing/krb5/krb5-kpropd@.service b/testing/krb5/krb5-kpropd@.service new file mode 100644 index 000000000..46f7e3639 --- /dev/null +++ b/testing/krb5/krb5-kpropd@.service @@ -0,0 +1,8 @@ +[Unit] +Description=Kerberos 5 propagation server +Conflicts=krb5-kpropd.service + +[Service] +ExecStart=/usr/sbin/kpropd +StandardInput=socket +StandardError=syslog diff --git a/testing/lm_sensors/PKGBUILD b/testing/lm_sensors/PKGBUILD index 85f29edca..d72fea0c9 100644 --- a/testing/lm_sensors/PKGBUILD +++ b/testing/lm_sensors/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161931 2012-06-16 17:15:28Z dreisner $ +# $Id: PKGBUILD 164348 2012-07-31 04:47:30Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=lm_sensors pkgver=3.3.2 -pkgrel=3 +pkgrel=4 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64') url="http://www.lm-sensors.org/" @@ -11,21 +11,24 @@ license=('GPL' 'LGPL') depends=('perl' 'sysfsutils') makedepends=('rrdtool') optdepends=('rrdtool: for logging with sensord') -backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord') +backup=('etc/sensors3.conf' 'etc/healthd.conf' 'etc/conf.d/sensord') options=('!emptydirs') source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \ sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \ - sensord.rc fancontrol.service daemonarg.patch linux_3.0.patch) + sensord.rc fancontrol.service sensord.service healthd.service \ + daemonarg.patch linux_3.0.patch) sha1sums=('5d0f026ad763124e8c2ad733b6e1ad5e6473993d' 'a486d9fb6c5b0aff4520f6312106c67f5163f1cf' 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5' 'a068ac0a3115a6191a487e11422506baa922b40a' - '78b5cd36c3cb8e98b972cdd8c4a12687d79a79a8' + 'afaad558d2ad4732aa53b69afa23ccf37bc67ab1' '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc' - 'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f' + 'de5a46afc39a77ae8721246a0223baf21a2d4c9c' 'de8d4d65406815c389f8a04e2a8508a1ae6749c8' '72a60251d1d55a67307dab4105d9f3f01a080af4' '7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c' + 'eff43b4882d25dae7dd0b33eb2e33b0836a5cc51' + '9cc453eb0e9f9057227459cb07e74815383544bf' '34241388c4001bfb6e49b7e10da1217e29a258d6' '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c') @@ -34,6 +37,7 @@ build() { sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \ -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/{detect/sensors-detect,init/lm_sensors.service} sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect + sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service patch -p1 < ../daemonarg.patch patch -p0 < ../linux_3.0.patch make PREFIX=/usr @@ -48,8 +52,10 @@ package() { install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol" install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd" install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd" - install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/conf.d/healthd" + install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf" install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord" install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord" install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service" + install -D -m644 "${srcdir}/sensord.service" "${pkgdir}/usr/lib/systemd/system/sensord.service" + install -D -m644 "${srcdir}/healthd.service" "${pkgdir}/usr/lib/systemd/system/healthd.service" } diff --git a/testing/lm_sensors/healthd b/testing/lm_sensors/healthd index 0315dd788..5ffed5681 100644 --- a/testing/lm_sensors/healthd +++ b/testing/lm_sensors/healthd @@ -4,7 +4,7 @@ # /usr/sbin/healthd # -. /etc/conf.d/healthd +. /etc/healthd.conf cmd="${ALARM_CMD}" addr="${ADMIN_EMAIL}" @@ -21,6 +21,13 @@ while [ $# -gt 0 ] ; do esac done +case "${ALARM_RESET}" in + yes) /usr/bin/sensors > /dev/null + ;; + no) true + ;; +esac + [ -n "${cmd}" ] && [ -n "$( which -- "${cmd%% *}" )" ] || \ [ -n "${addr}" ] || exit 1 diff --git a/testing/lm_sensors/healthd.rc b/testing/lm_sensors/healthd.rc index 7bb79519f..f50f4a6f8 100644 --- a/testing/lm_sensors/healthd.rc +++ b/testing/lm_sensors/healthd.rc @@ -1,29 +1,13 @@ #!/bin/bash -# -# /etc/rc.d/healthd -# - . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/healthd - -maybe_alarm_reset() { - case "${ALARM_RESET}" in - yes) /usr/bin/sensors > /dev/null - ;; - no) true - ;; - *) false - esac - return $? -} PID=$(pidof -x -o %PPID /usr/sbin/healthd) case "${1}" in start) stat_busy "Starting Health Daemon" - [ -z "${PID}" ] && maybe_alarm_reset && /usr/sbin/healthd &> /dev/null + [ -z "${PID}" ] && /usr/sbin/healthd &> /dev/null if [ $? -gt 0 ]; then stat_fail else diff --git a/testing/lm_sensors/healthd.service b/testing/lm_sensors/healthd.service new file mode 100644 index 000000000..b894fbb1f --- /dev/null +++ b/testing/lm_sensors/healthd.service @@ -0,0 +1,9 @@ +[Unit] +Description=A daemon which can be used to alert you in the event of a hardware health monitoring alarm + +[Service] +PIDFile=/var/run/healthd.pid +ExecStart=/usr/sbin/healthd + +[Install] +WantedBy=multi-user.target diff --git a/testing/lm_sensors/sensord.service b/testing/lm_sensors/sensord.service new file mode 100644 index 000000000..6d272f1ef --- /dev/null +++ b/testing/lm_sensors/sensord.service @@ -0,0 +1,9 @@ +[Unit] +Description=Sensor information logging daemon + +[Service] +PIDFile=/var/run/sensord.pid +ExecStart=/usr/sbin/sensord + +[Install] +WantedBy=multi-user.target |