From 56913dc8679143308408596f2872f3894b3ab9d0 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 24 Jul 2012 00:01:46 +0000 Subject: Tue Jul 24 00:01:46 UTC 2012 --- extra/ddrescue/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extra/ddrescue/PKGBUILD') diff --git a/extra/ddrescue/PKGBUILD b/extra/ddrescue/PKGBUILD index 53165693c..547e7286b 100644 --- a/extra/ddrescue/PKGBUILD +++ b/extra/ddrescue/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 162261 2012-06-24 16:23:55Z schiv $ +# $Id: PKGBUILD 163953 2012-07-22 16:34:28Z schiv $ # Maintainer: Ray Rashif # Contributor: Pierre Schmitz # Contributor: Paul Mattal pkgname=ddrescue pkgver=1.16 -pkgrel=1 +pkgrel=2 pkgdesc="GNU data recovery tool" arch=('i686' 'x86_64') url="http://www.gnu.org/software/ddrescue/ddrescue.html" -- cgit v1.2.3-54-g00ecf From 3083719ddb24bbb452e7ddba34bec067ea249056 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 25 Jul 2012 00:01:50 +0000 Subject: Wed Jul 25 00:01:50 UTC 2012 --- community-testing/cdfs/PKGBUILD | 4 +- community-testing/pingus/PKGBUILD | 4 +- community-testing/sage-mathematics/PKGBUILD | 103 +++++++++++++++++++++ .../sage-mathematics/SAGE-notebook.desktop | 19 ++++ .../sage-mathematics/sage-mathematics.install | 56 +++++++++++ community-testing/vhba-module/PKGBUILD | 13 +-- community-testing/vhba-module/vhba-module.install | 2 +- community/apper/PKGBUILD | 4 +- community/easystroke/PKGBUILD | 31 +++++++ community/easystroke/easystroke.install | 13 +++ community/fb-client/PKGBUILD | 6 +- community/fwbuilder/PKGBUILD | 5 +- community/kpartsplugin/PKGBUILD | 6 +- community/libcec/PKGBUILD | 4 +- community/linuxdoc-tools/PKGBUILD | 23 +++++ community/mathomatic/PKGBUILD | 6 +- community/polipo/PKGBUILD | 6 +- community/polipo/polipo.rc.d | 2 +- community/qt4pas/PKGBUILD | 4 +- community/r8168-lts/PKGBUILD | 6 +- community/tea/PKGBUILD | 6 +- community/ulogd/PKGBUILD | 16 +++- core/dbus-core/PKGBUILD | 10 +- extra/dbus/PKGBUILD | 8 +- extra/ddrescue/PKGBUILD | 2 +- extra/git/PKGBUILD | 12 +-- extra/imagemagick/PKGBUILD | 8 +- extra/nouveau-dri/PKGBUILD | 4 +- extra/qjackctl/PKGBUILD | 2 +- extra/rosegarden/PKGBUILD | 2 +- extra/xf86-video-intel/PKGBUILD | 6 +- extra/xfce4-weather-plugin/PKGBUILD | 22 ++--- kde-unstable/kdeplasma-addons/PKGBUILD | 16 +++- .../kdeplasma-addons/fix-twitter-auth.patch | 40 ++++++++ testing/btrfs-progs/70-btrfs.rules | 1 + testing/btrfs-progs/PKGBUILD | 46 +++++++++ testing/btrfs-progs/initcpio-hook-btrfs | 10 ++ testing/btrfs-progs/initcpio-install-btrfs | 17 ++++ 38 files changed, 457 insertions(+), 88 deletions(-) create mode 100644 community-testing/sage-mathematics/PKGBUILD create mode 100644 community-testing/sage-mathematics/SAGE-notebook.desktop create mode 100644 community-testing/sage-mathematics/sage-mathematics.install create mode 100644 community/easystroke/PKGBUILD create mode 100644 community/easystroke/easystroke.install create mode 100644 community/linuxdoc-tools/PKGBUILD create mode 100644 kde-unstable/kdeplasma-addons/fix-twitter-auth.patch create mode 100644 testing/btrfs-progs/70-btrfs.rules create mode 100644 testing/btrfs-progs/PKGBUILD create mode 100644 testing/btrfs-progs/initcpio-hook-btrfs create mode 100644 testing/btrfs-progs/initcpio-install-btrfs (limited to 'extra/ddrescue/PKGBUILD') diff --git a/community-testing/cdfs/PKGBUILD b/community-testing/cdfs/PKGBUILD index 0ea673faf..7f4d6d8ba 100644 --- a/community-testing/cdfs/PKGBUILD +++ b/community-testing/cdfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73211 2012-07-04 00:43:09Z dreisner $ +# $Id: PKGBUILD 74279 2012-07-23 12:36:00Z tpowa $ # Maintainer: Sergej Pupykin # Contributor: J. Santiago Hirschfeld pkgname=cdfs pkgver=2.6.27 -pkgrel=23 +pkgrel=25 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files." arch=(i686 x86_64) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/community-testing/pingus/PKGBUILD b/community-testing/pingus/PKGBUILD index 05fe24127..dc6972232 100644 --- a/community-testing/pingus/PKGBUILD +++ b/community-testing/pingus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73767 2012-07-15 13:19:53Z ibiru $ +# $Id: PKGBUILD 74300 2012-07-23 22:33:53Z lcarlier $ # Maintainer: Eric Belanger 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-testing/sage-mathematics/PKGBUILD b/community-testing/sage-mathematics/PKGBUILD new file mode 100644 index 000000000..24300f2e9 --- /dev/null +++ b/community-testing/sage-mathematics/PKGBUILD @@ -0,0 +1,103 @@ +# $Id: PKGBUILD 74291 2012-07-23 15:07:41Z dwallace $ +# Maintainer: Daniel Wallace +# Contributor: Antonio Rojas < nqn1976 @ gmail.com > +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: Osman Ugus +# Contributor: Stefan Husmann +# Special thanks to Nareto for moving the compile from the .install to the PKGBUILD + +pkgname=sage-mathematics +pkgver=5.1 +pkgrel=3 +pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' +url='http://www.sagemath.org' +arch=('i686' 'x86_64') +license=('GPL') +#depends=('readline') +makedepends=('gcc-fortran' 'desktop-file-utils') +optdepends=('imagemagick: some plotting functionality benefits from it' + 'texlive-core: some plotting functionality benefits from it, also to use SageTeX' + 'openssh: to use the notebook in secure mode' + 'ffmpeg: to show animations' + 'jsmath-fonts: native TeX fonts for the notebook') +options=('!makeflags') +install="${pkgname}.install" +source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar" + 'SAGE-notebook.desktop') + +build() { + cd sage-${pkgver} + + # fix "missing sage.all error" during build + unset CFLAGS + unset CXXFLAGS + + # fix build errors + unset LDFLAGS + + # don't build GCC + export SAGE_INSTALL_GCC='no' + + # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS + export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }') + export MAKE="make -j${SAGE_BUILD_THREADS}" + + # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran + export SAGE_FORTRAN='/usr/bin/gfortran' + export SAGE_FORTRAN_LIB='/usr/lib/libgfortran.so' + + # disable building with debugging support + export SAGE_DEBUG='no' + + # enable fat binaries (disables processor specific optimizations) + # comment out if you're only building it for yourself + export SAGE_FAT_BINARY='yes' + + # can't write to root in a clean chroot + export DOT_SAGE='/build/src/' + + # only build sage, no documents + #make build + make +} + +<< COMMENT +check() { + cd sage-${pkgver} + + # uncomment if we want to run all the tests (warning: very long) + #make ptestlong +} +COMMENT + +package() { + cd sage-${pkgver} + + # cp because make install is experimental and will corrupt the install + install -d ${pkgdir}/opt/sage + cp -dpr --no-preserve=ownership * ${pkgdir}/opt/sage + + # move SageTeX files to more appropriate directory + install -d ${pkgdir}/usr/share + mv ${pkgdir}/opt/sage/local/share/texmf \ + ${pkgdir}/usr/share + + desktop-file-install ${srcdir}/SAGE-notebook.desktop \ + --dir ${pkgdir}/usr/share/applications + + # create link to main binary + install -d ${pkgdir}/usr/bin + ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage + + # remove build logs + rm -f ${pkgdir}/opt/sage/*.log + rm -rf ${pkgdir}/opt/sage/spkg/logs + + # remove source packages, since they are rarely needed, they are 300mb in size (compressed) + rm -f ${pkgdir}/opt/sage/spkg/base/*spkg + rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg +} + +# vim :set ts=2 sw=2 et: +md5sums=('fa612f36387218d07b84f76995914c93' + 'dc391f12b7d17dd37326343ec0e99bbd') diff --git a/community-testing/sage-mathematics/SAGE-notebook.desktop b/community-testing/sage-mathematics/SAGE-notebook.desktop new file mode 100644 index 000000000..26a35d3ac --- /dev/null +++ b/community-testing/sage-mathematics/SAGE-notebook.desktop @@ -0,0 +1,19 @@ +[Desktop Entry] +Version=1.0 +Name=SAGE +Comment=SAGE NOTEBOOK +Comment[en_US]=SAGE NOTEBOOK +Exec=/opt/sage/sage -notebook +GenericName= +GenericName[de]= +Icon=/opt/sage/data/extcode/notebook/images/sageicon.png +MimeType= +Name[de]=SAGE +StartupNotify=true +Terminal=true +Type=Application +Categories=Science;Math; +X-DCOP-ServiceType= +X-KDE-SubstituteUID=false +X-KDE-Username= +GenericName[en_US]= diff --git a/community-testing/sage-mathematics/sage-mathematics.install b/community-testing/sage-mathematics/sage-mathematics.install new file mode 100644 index 000000000..6caa5299e --- /dev/null +++ b/community-testing/sage-mathematics/sage-mathematics.install @@ -0,0 +1,56 @@ +post_install() { + cd /opt/sage + + # set HOME because when sage updates its sage_root (after being moved) it will write files to ~/.sage with root ownership + # the files it writes to ~/.sage can be safely ignored + HOME=/tmp ./sage -c + + # add sagemath user for the daemon + useradd -r -c 'Sage daemon' -d /opt/sage -s /bin/false sagemath + + # Update LaTeX db to point to SageTeX + if [ -f /usr/bin/texhash ]; then + /usr/bin/texhash /usr/share/texmf + else + echo 'Warning: could not find /usr/bin/texhash' + echo 'SageTeX has been installed but you need to run:' + echo '# texhash /usr/share/texmf' + echo 'So that LaTeX will be able to find it.' + fi + +echo ' + ___ +/ (_) o | +\__ _ _ __ | +/ / |/ | | / \_| | | +\___/ | |_/|/\__/ \_/|/o + /| /| + \| \| + ________________________________ +< sage-mathematics, I mean, MOO! > + -------------------------------- + \ ^__^ + \ (oo)\_______ + (__)\ )\/\ + ||----w | + || || +' + +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + # Update LaTeX db to remove SageTeX entries + if [ -f /usr/bin/texhash ]; then + /usr/bin/texhash /usr/share/texmf + fi + + # remove the sagemath daemon user + userdel sagemath + + # clean up left overs + rm -rf /opt/sage +} diff --git a/community-testing/vhba-module/PKGBUILD b/community-testing/vhba-module/PKGBUILD index 2384a2c8a..cc8d2ef4d 100644 --- a/community-testing/vhba-module/PKGBUILD +++ b/community-testing/vhba-module/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 73232 2012-07-04 01:02:29Z dreisner $ +# $Id: PKGBUILD 74284 2012-07-23 12:36:47Z tpowa $ # Maintainer: Ray Rashif # Contributor: Mateusz Herych # Contributor: Charles Lindsay pkgname=vhba-module pkgver=20120422 -_extramodules=extramodules-3.4-ARCH -pkgrel=3 +_extramodules=extramodules-3.5-ARCH +pkgrel=5 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" license=('GPL') -depends=('linux>=3.4' 'linux<3.5') -makedepends=('linux-headers>=3.4') +depends=('linux>=3.5' 'linux<3.6') +makedepends=('linux-headers') options=(!makeflags) install=$pkgname.install source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" @@ -31,7 +31,8 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - install -D vhba.ko "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko" + install -Dm644 vhba.ko \ + "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko" sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \ "$startdir/vhba-module.install" diff --git a/community-testing/vhba-module/vhba-module.install b/community-testing/vhba-module/vhba-module.install index 8458b2ae7..86ad03a5e 100644 --- a/community-testing/vhba-module/vhba-module.install +++ b/community-testing/vhba-module/vhba-module.install @@ -1,7 +1,7 @@ post_upgrade() { ! grep -q 'cdemu' /etc/group && groupadd cdemu echo " > Updating module dependencies..." - EXTRAMODULES='extramodules-3.4-ARCH' + EXTRAMODULES='extramodules-3.5-ARCH' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/community/apper/PKGBUILD b/community/apper/PKGBUILD index 1f5df85bb..5fa8a5cca 100644 --- a/community/apper/PKGBUILD +++ b/community/apper/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 71050 2012-05-22 16:21:01Z idevolder $ +# $Id: PKGBUILD 74244 2012-07-23 06:20:32Z idevolder $ # Maintainer: BlackIkeEagle < ike DOT devolder AT gmail DOT com > # Contributor: Valeriy Lyasotskiy # Contributor: Zom @@ -6,7 +6,7 @@ pkgname=apper _pkgmainver=0.7 pkgver=0.7.2 -pkgrel=1 +pkgrel=3 pkgdesc="KDE tools for PackageKit" arch=('i686' 'x86_64') url="http://kde-apps.org/content/show.php/Apper?content=84745" diff --git a/community/easystroke/PKGBUILD b/community/easystroke/PKGBUILD new file mode 100644 index 000000000..e07fc5c7d --- /dev/null +++ b/community/easystroke/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Lukas Fleischer +# Contributor: Kevin Sullivan + +pkgname=easystroke +pkgver=0.5.5.1 +pkgrel=2 +pkgdesc='Use mouse gestures to initiate commands and hotkeys.' +arch=('i686' 'x86_64') +url='http://easystroke.sourceforge.net/' +license=('custom:ISC') +depends=('gtkmm' 'boost' 'libxtst' 'dbus-glib' 'xorg-server') +makedepends=('inputproto' 'intltool' 'gettext' 'xorg-server-devel' 'help2man') +install=easystroke.install +source=("http://downloads.sourceforge.net/easystroke/${pkgname}-${pkgver}.tar.gz") +md5sums=('ba989d1745415be94afd567e33d124bb') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make + make man +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make PREFIX=/usr DESTDIR="${pkgdir}" install + + install -Dm0644 "${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1" + install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/community/easystroke/easystroke.install b/community/easystroke/easystroke.install new file mode 100644 index 000000000..a64ba07ee --- /dev/null +++ b/community/easystroke/easystroke.install @@ -0,0 +1,13 @@ +pkgname=easystroke + +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD index 16a512f71..812d1f8f7 100644 --- a/community/fb-client/PKGBUILD +++ b/community/fb-client/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Florian "Bluewind" Pritz pkgname=fb-client -pkgver=1.0.3 +pkgver=1.0.4 pkgrel=1 pkgdesc="Client for paste.xinu.at" arch=('i686' 'x86_64') @@ -9,8 +9,8 @@ license=('GPL3') depends=('curl') optdepends=('xclip: for automatically copying the URL into the clipboard') source=(http://paste.xinu.at/data/client/fb-$pkgver.tar.gz{,.sig}) -md5sums=('d228e2475eaf0141ecff7c7a18ef97a1' - '69e60c7c20360262a5cf0b902c0219b2') +md5sums=('5b96884795a568dd07d7af3856427ea0' + 'e42a87b7c564c127d528fb34d596eacb') build() { cd "$srcdir/fb-$pkgver" diff --git a/community/fwbuilder/PKGBUILD b/community/fwbuilder/PKGBUILD index ae559607c..34e6edcb4 100644 --- a/community/fwbuilder/PKGBUILD +++ b/community/fwbuilder/PKGBUILD @@ -1,10 +1,11 @@ # $Id -# Maintainer: Kevin Piche +# Maintainer: BlackIkeEagle +# Contributor: Kevin Piche # Contributor: Tom Newsom pkgname=fwbuilder pkgver=5.1.0.3599 -pkgrel=1 +pkgrel=2 pkgdesc="Object-oriented GUI and set of compilers for various firewall platforms" url="http://www.fwbuilder.org/" arch=('i686' 'x86_64') diff --git a/community/kpartsplugin/PKGBUILD b/community/kpartsplugin/PKGBUILD index 7c4ece00b..8e9d6f0aa 100644 --- a/community/kpartsplugin/PKGBUILD +++ b/community/kpartsplugin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72379 2012-06-13 10:58:19Z tredaelli $ +# $Id: PKGBUILD 74287 2012-07-23 14:13:38Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: birdflesh # Contributor: Frikilinux pkgname=kpartsplugin -pkgver=20120605 +pkgver=20120723 pkgrel=1 pkgdesc="This plugin uses KDE's KParts to embed file viewers into non-KDE browsers" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL3' 'BSD') depends=('kdelibs') makedepends=('automoc4' 'cmake') source=("${url}${pkgname}-${pkgver}.tar.bz2" "LICENSE") -md5sums=('c6deb7b58b0bac9e5ef89afee83ef17c' +md5sums=('cf94ee866a934da97a04cd1619e16099' 'c4cc811349e40e9f34e77e27b902ad96') build(){ diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD index 8bcffba76..923548cc8 100644 --- a/community/libcec/PKGBUILD +++ b/community/libcec/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73164 2012-07-02 16:36:19Z idevolder $ +# $Id: PKGBUILD 74248 2012-07-23 06:33:04Z idevolder $ # Maintainer: BlackIkeEagle # Contributor: Philippe Cherel pkgname=libcec pkgver=1.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter" arch=('i686' 'x86_64') url="https://github.com/Pulse-Eight/libcec" diff --git a/community/linuxdoc-tools/PKGBUILD b/community/linuxdoc-tools/PKGBUILD new file mode 100644 index 000000000..22c533374 --- /dev/null +++ b/community/linuxdoc-tools/PKGBUILD @@ -0,0 +1,23 @@ +# $Id$ +# Maintainer: Sergej Pupykin +# Contributor: David Ell + +pkgname=linuxdoc-tools +pkgver=0.9.68 +pkgrel=1 +pkgdesc="Convert LinuxDoc SGML source into other formats" +arch=('i686' 'x86_64') +url="http://packages.debian.org/sid/linuxdoc-tools" +license=('GPL') +depends=('jade') +optdepends=('groff' 'texlive-bin') +source=(http://ftp.de.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver}.tar.gz) +md5sums=('68434f800ab3b68f44da790cc61cf766') + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -i '/extern int yyleng;/d' rtf-fix/rtf2rtf.l + ./configure --prefix=/usr --mandir=/usr/share/man + make + make DESTDIR="$pkgdir/" install +} diff --git a/community/mathomatic/PKGBUILD b/community/mathomatic/PKGBUILD index 851e6333c..f727347e2 100755 --- a/community/mathomatic/PKGBUILD +++ b/community/mathomatic/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73102 2012-07-01 10:04:33Z ttopper $ +# $Id: PKGBUILD 74240 2012-07-23 05:41:33Z ttopper $ # Contributor: G_Syme # Contributor: Stefan Husmann # Maintainer: Thorsten Töpper pkgname=mathomatic -pkgver=16.0.0 +pkgver=16.0.1 pkgrel=1 pkgdesc="General purpose Computer Algebra System written in C" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('python2: for running /usr/share/doc/mathomatic/factorial/factorial' 'm4: for complex operations using the matho script' 'gnuplot: for plotting') source=(http://mathomatic.org/$pkgname-$pkgver.tar.bz2) -md5sums=('a349471e997afcfa222964692780b567') +md5sums=('550c4c27da68db1d3d62ed2888828548') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/polipo/PKGBUILD b/community/polipo/PKGBUILD index dbffcd127..ee0685944 100644 --- a/community/polipo/PKGBUILD +++ b/community/polipo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72964 2012-06-25 17:08:53Z ttopper $ +# $Id: PKGBUILD 74295 2012-07-23 16:25:48Z ttopper $ # Maintainer: Thorsten Töpper # Contributor: Jelle van der Waa # Contributor: Thomas Holmquist @@ -7,7 +7,7 @@ pkgname=polipo pkgver=1.0.4.1 -pkgrel=5 +pkgrel=6 pkgdesc="A small and fast caching web proxy." arch=('i686' 'x86_64') url="http://www.pps.jussieu.fr/~jch/software/polipo/" @@ -19,7 +19,7 @@ source=("http://freehaven.net/~chrisd/polipo/polipo-$pkgver.tar.gz" "polipo.cron" "polipo.rc.d" "polipo.conf.d" "polipo.service") md5sums=('bfc5c85289519658280e093a270d6703' 'bac0e1a871964c931eb5f7a369b3243c' - '8f096b7d77a71e0772ce71a8c8b1b3e3' + '7406aad26807fb3a4e5f7b01ecb97a59' '685aa0c6070dee11c701932d23afcc6a' '109d0e8c15d669281ff14f8991ad0ed8') diff --git a/community/polipo/polipo.rc.d b/community/polipo/polipo.rc.d index 260fab050..0333ded57 100644 --- a/community/polipo/polipo.rc.d +++ b/community/polipo/polipo.rc.d @@ -19,7 +19,7 @@ case "$1" in [[ -f /run/$daemon_name.pid ]] && rm -f /run/$daemon_name.pid # RUN - sudo -u nobody /usr/bin/$daemon_name ${POLIPO_ARGS} + su -c "/usr/bin/$daemon_name ${POLIPO_ARGS}" -s /bin/sh - nobody # if [[ $? -gt 0 ]]; then stat_fail diff --git a/community/qt4pas/PKGBUILD b/community/qt4pas/PKGBUILD index f8711f222..92a9bbfe4 100644 --- a/community/qt4pas/PKGBUILD +++ b/community/qt4pas/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70222 2012-05-02 13:40:13Z idevolder $ +# $Id: PKGBUILD 74250 2012-07-23 06:35:45Z idevolder $ # Maintainer: BlackIkeEagle # Contributor: Fabien Wang pkgname=qt4pas pkgver=2.5 -pkgrel=1 +pkgrel=2 pkgdesc="Free Pascal Qt4 Binding Library" arch=('i686' 'x86_64') url="http://users.telenet.be/Jan.Van.hijfte/qtforfpc/fpcqt4.html" diff --git a/community/r8168-lts/PKGBUILD b/community/r8168-lts/PKGBUILD index df0540070..646527e32 100644 --- a/community/r8168-lts/PKGBUILD +++ b/community/r8168-lts/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73702 2012-07-14 13:07:16Z allan $ +# $Id: PKGBUILD 74289 2012-07-23 14:15:48Z mtorromeo $ # Maintainer: Massimiliano Torromeo pkgname=r8168-lts _pkgname=r8168 pkgver=8.031.00 -pkgrel=2 +pkgrel=3 pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts" url="http://www.realtek.com.tw" license=("GPL") @@ -17,10 +17,10 @@ md5sums=('ec1654f02e2dad930bbeb0210ddab7e5') sha256sums=('5c617b3c08aca18d1eb24d33f77df40020eb64fb32c8e4008265e08b7ffe5779') _extramodules=extramodules-3.0-lts -_kernver="$(cat /usr/lib/modules/$_extramodules/version || true)" build() { cd "$_pkgname-$pkgver" + local _kernver="$(cat /usr/lib/modules/$_extramodules/version)" make -C /usr/lib/modules/$_kernver/build \ SUBDIRS="$srcdir/$_pkgname-$pkgver/src" \ EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD index eb2752b20..cdc516d7d 100644 --- a/community/tea/PKGBUILD +++ b/community/tea/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 71527 2012-05-28 07:39:51Z spupykin $ +# $Id: PKGBUILD 74236 2012-07-23 05:26:38Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Andrea Scarpino # Contributor: Roman Kyrylych @@ -6,7 +6,7 @@ # Contributor: Zsolt Varadi pkgname=tea -pkgver=33.1.0 +pkgver=33.2.0 pkgrel=1 pkgdesc="A QT-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions." arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ depends=('qt' 'aspell' 'hunspell') install=tea.install source=(http://downloads.sourceforge.net/project/tea-editor/tea-editor/$pkgver/tea-$pkgver.tar.bz2 tea.desktop) -md5sums=('15593d59f6079f0114e390ec731a8527' +md5sums=('2d612e48ef014477f86db4323c513b74' '377ace3363124f4c086de0babb820761') build() { diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD index 08863143a..26a00d382 100644 --- a/community/ulogd/PKGBUILD +++ b/community/ulogd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73943 2012-07-17 09:54:26Z spupykin $ +# $Id: PKGBUILD 74257 2012-07-23 07:12:03Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Sebastien Luttringer # Contributor: Dale Blount @@ -6,14 +6,15 @@ pkgname=ulogd pkgver=2.0.0 -pkgrel=3 +pkgrel=4 pkgdesc='Userspace Packet Logging for netfilter' arch=('i686' 'x86_64') url='http://www.netfilter.org/projects/ulogd/index.html' license=('GPL2') depends=('libmnl') makedepends=('libmysqlclient' 'postgresql-libs' 'sqlite' 'libpcap' 'libdbi' - 'libnetfilter_acct' 'libnetfilter_log' 'libnetfilter_conntrack') + 'libnetfilter_acct' 'libnetfilter_log' 'libnetfilter_conntrack' + 'linuxdoc-tools' 'groff' 'texlive-core') optdepends=('postgresql-libs' 'sqlite' 'libpcap' @@ -34,13 +35,20 @@ build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --with-mysql --with-pgsql --with-dbi make + (cd doc && make) } package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - install -Dm0644 ulogd.conf $pkgdir/usr/share/ulogd/ulogd.conf.sample + + install -dm0755 "$pkgdir/usr/share/doc/ulogd" + install -Dm0644 ulogd.conf $pkgdir/usr/share/doc/ulogd/ulogd.conf.sample + install -Dm0644 doc/ulogd.{dvi,html,ps,sgml,txt} "$pkgdir/usr/share/doc/ulogd" + + install -dm0755 "$pkgdir/usr/share/ulogd" install -m644 doc/*.{table,sql} "$pkgdir/usr/share/ulogd" + install -D -m644 "$srcdir/logrotate" "$pkgdir/etc/logrotate.d/ulogd" install -D -m755 "$srcdir/rc" "$pkgdir/etc/rc.d/ulogd" } diff --git a/core/dbus-core/PKGBUILD b/core/dbus-core/PKGBUILD index 69c248f23..fce2f644e 100644 --- a/core/dbus-core/PKGBUILD +++ b/core/dbus-core/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163027 2012-07-06 01:27:03Z ibiru $ +# $Id: PKGBUILD 163991 2012-07-23 14:58:38Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Link Dupont # pkgname=dbus-core -pkgver=1.6.2 -pkgrel=2 +pkgver=1.6.4 +pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" arch=(i686 x86_64) @@ -15,8 +15,8 @@ options=(!libtool) install=dbus.install source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc} dbus) -md5sums=('7fbf877ed6ff7da6df90f07158373829' - '2cd74b6efca77e4e3aa2b7ccde770668' +md5sums=('5ec43dc4554cba638917317b2b4f7640' + '3d4482ee39b49da334441c76f83bf1cb' 'f0364f3f5dc5f653bb05d39aa36e3264') build() { diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD index 98333f1c5..0f9977539 100644 --- a/extra/dbus/PKGBUILD +++ b/extra/dbus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163028 2012-07-06 01:27:22Z ibiru $ +# $Id: PKGBUILD 163993 2012-07-23 14:58:54Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Link Dupont # pkgname=dbus -pkgver=1.6.2 +pkgver=1.6.4 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" @@ -12,8 +12,8 @@ license=('GPL' 'custom') depends=("dbus-core>=$pkgver" 'libx11') source=(http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.asc} 30-dbus) -md5sums=('7fbf877ed6ff7da6df90f07158373829' - '2cd74b6efca77e4e3aa2b7ccde770668' +md5sums=('5ec43dc4554cba638917317b2b4f7640' + '3d4482ee39b49da334441c76f83bf1cb' '9fafe8b28460aeaa6054309ef4c5ed92') build() { diff --git a/extra/ddrescue/PKGBUILD b/extra/ddrescue/PKGBUILD index 547e7286b..0fe7a3286 100644 --- a/extra/ddrescue/PKGBUILD +++ b/extra/ddrescue/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163953 2012-07-22 16:34:28Z schiv $ +# $Id: PKGBUILD 164005 2012-07-23 18:42:21Z schiv $ # Maintainer: Ray Rashif # Contributor: Pierre Schmitz # Contributor: Paul Mattal diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 29876c073..8ac267e07 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 163497 2012-07-13 14:43:17Z dan $ +# $Id: PKGBUILD 163990 2012-07-23 13:53:11Z dan $ # Maintainer: Dan McGee pkgname=git -pkgver=1.7.11.2 +pkgver=1.7.11.3 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64) @@ -100,7 +100,7 @@ package() { install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf } -sha1sums=('f67b4f6c0277250411c6872ae7b8a872ae11d313' - '78b46ca7b5037c61a58086879869dadeac9eea3e' - 'f2b41828bd912b72e2cb3e14677739c4f370de66' - '149e2da1ecb48872ddb31c0945afeaad1f9653d7') +md5sums=('23caacd9f3f421b6c05b40796df3505d' + 'f07bfe5a0f7e4165cab0091e710062dc' + '8e2648910fd5dd4f1c41d3c7fa9e9156' + '2e42bf97779a1c6411d89043334c9e78') diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index fb7d66d75..888a5c205 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163750 2012-07-19 04:55:07Z eric $ +# $Id: PKGBUILD 164013 2012-07-23 22:32:35Z eric $ # Maintainer: Eric Bélanger pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.8.4 +pkgver=6.7.8.6 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -12,14 +12,14 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('3cca01dad3596502a149229e28226b1b2a037915' +sha1sums=('4965710cf4dca18583691d121e22b114c84e0643' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.} sed '/AC_PATH_XTRA/d' -i configure.ac - autoreconf --install + autoreconf --force --install patch -p0 -i ../perlmagick.rpath.patch ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ diff --git a/extra/nouveau-dri/PKGBUILD b/extra/nouveau-dri/PKGBUILD index ad1daa62a..2848f0bff 100644 --- a/extra/nouveau-dri/PKGBUILD +++ b/extra/nouveau-dri/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163472 2012-07-12 17:49:23Z ibiru $ +# $Id: PKGBUILD 163980 2012-07-23 08:35:29Z ibiru $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke pkgname=nouveau-dri pkgver=8.0.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.15' 'libdrm-old' 'libdrm-nouveau1' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183') diff --git a/extra/qjackctl/PKGBUILD b/extra/qjackctl/PKGBUILD index 443368cc5..22c26cef6 100644 --- a/extra/qjackctl/PKGBUILD +++ b/extra/qjackctl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163951 2012-07-22 16:13:02Z schiv $ +# $Id: PKGBUILD 164008 2012-07-23 18:45:37Z schiv $ # Maintainer: Ray Rashif # Contributor: Tobias Kieslich diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD index 540948db7..8f73ae5a2 100644 --- a/extra/rosegarden/PKGBUILD +++ b/extra/rosegarden/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163949 2012-07-22 16:04:38Z schiv $ +# $Id: PKGBUILD 164009 2012-07-23 18:45:40Z schiv $ # Maintainer: Ray Rashif # Contributor: Giovanni Scafora # Contributor: damir diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index d15b41d82..a79d5a162 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163776 2012-07-19 20:25:09Z andyrtr $ +# $Id: PKGBUILD 163995 2012-07-23 15:03:27Z andyrtr $ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=xf86-video-intel -pkgver=2.20.0 +pkgver=2.20.1 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -18,7 +18,7 @@ conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'x options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('21949297220ceda32bba430f778c6409002079dc717c7190dbd1062ab4a56783') +sha256sums=('de340a527dfa26bba6f79b423c2fe2b1d70657e46fa3fb468613c047443ff424') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xfce4-weather-plugin/PKGBUILD b/extra/xfce4-weather-plugin/PKGBUILD index f7242f803..388880465 100644 --- a/extra/xfce4-weather-plugin/PKGBUILD +++ b/extra/xfce4-weather-plugin/PKGBUILD @@ -1,33 +1,27 @@ -# $Id: PKGBUILD 157901 2012-04-30 04:21:38Z foutrelis $ +# $Id: PKGBUILD 163983 2012-07-23 10:32:47Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Suzy Williams pkgname=xfce4-weather-plugin -pkgver=0.7.4 -pkgrel=3 +pkgver=0.8.0 +pkgrel=1 pkgdesc="A weather plugin for the Xfce4 panel" arch=('i686' 'x86_64') url="http://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin" license=('GPL2') groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxfcegui4' 'libxml2' 'hicolor-icon-theme') +depends=('xfce4-panel' 'libxml2' 'hicolor-icon-theme') makedepends=('intltool') options=('!libtool') install=$pkgname.install -source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.7/$pkgname-$pkgver.tar.bz2) -sha256sums=('3f76207b8a845d15bfec6825bd5300aedd086c455259c4dd8670a89a3c8ab382') +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/0.8/$pkgname-$pkgver.tar.bz2) +sha256sums=('37157456e41b1d6367ee3d785c92845d6b3d826cc1a3740282db5c3f6b0647b9') build() { cd "$srcdir/$pkgname-$pkgver" - # Switch to a working license key - # https://bugs.archlinux.org/task/26815 - sed -i \ - -e 's/^#define PARTNER_ID.*/#define PARTNER_ID "1003666583"/' \ - -e 's/^#define LICENSE_KEY.*/#define LICENSE_KEY "4128909340a9b2fc"/' \ - panel-plugin/weather.h - - ./configure --prefix=/usr \ + ./configure \ + --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ --localstatedir=/var \ diff --git a/kde-unstable/kdeplasma-addons/PKGBUILD b/kde-unstable/kdeplasma-addons/PKGBUILD index 2dff87e44..c04acefae 100644 --- a/kde-unstable/kdeplasma-addons/PKGBUILD +++ b/kde-unstable/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163433 2012-07-11 22:52:14Z andrea $ +# $Id: PKGBUILD 164003 2012-07-23 18:40:35Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -78,22 +78,28 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') pkgver=4.8.97 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL') groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'qjson') -source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('b56299d2197c3b6007454644361671cd7157ba30') +source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" + 'fix-twitter-auth.patch') +sha1sums=('b56299d2197c3b6007454644361671cd7157ba30' + 'dfe2260861047aba9c53c619bbfc2447490ebcc1') build() { - cd "${srcdir}" + cd ${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/fix-twitter-auth.patch + cd .. + mkdir build cd build cmake ../${pkgbase}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/kde-unstable/kdeplasma-addons/fix-twitter-auth.patch b/kde-unstable/kdeplasma-addons/fix-twitter-auth.patch new file mode 100644 index 000000000..0a55ce6ce --- /dev/null +++ b/kde-unstable/kdeplasma-addons/fix-twitter-auth.patch @@ -0,0 +1,40 @@ +commit edc7699f4f4b6d9fc0568b031143cb653ae4294e +Author: Sebastian Kügler +Date: Tue Jul 10 00:56:58 2012 +0200 + + fix authorization from twitter applet + + user in authorize() can be empty when it's already set in d->user, + respect that and successfully authorize. + + Thanks to phoenix_fbrd for finding this issue and the patch. + + REVIEW:105498 + BUG:302267 + + Please reopen the bug report if you still encounter crashes. + + Cherry-picked from 28f6d7cee7e81fda9ba396cc6477370a8ed3ada7 + +diff --git a/dataengines/microblog/koauth.cpp b/dataengines/microblog/koauth.cpp +index 565d79f..7566b95 100644 +--- a/dataengines/microblog/koauth.cpp ++++ b/dataengines/microblog/koauth.cpp +@@ -168,13 +168,15 @@ void KOAuth::run() + + void KOAuth::authorize(const QString &serviceBaseUrl, const QString &user, const QString &password) + { +- d->user = user; ++ if (!user.isEmpty()) { ++ d->user = user; ++ } + d->password = password; + d->serviceBaseUrl = serviceBaseUrl; + d->accessToken = QByteArray(); + d->accessTokenSecret = QByteArray(); + +- d->w->setUser(user); ++ d->w->setUser(d->user); + d->w->setServiceBaseUrl(serviceBaseUrl); + d->w->setPassword(password); + diff --git a/testing/btrfs-progs/70-btrfs.rules b/testing/btrfs-progs/70-btrfs.rules new file mode 100644 index 000000000..c0e8c776c --- /dev/null +++ b/testing/btrfs-progs/70-btrfs.rules @@ -0,0 +1 @@ +ACTION!="remove", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="btrfs", RUN+="/usr/bin/btrfs device scan /dev/%k" diff --git a/testing/btrfs-progs/PKGBUILD b/testing/btrfs-progs/PKGBUILD new file mode 100644 index 000000000..e7252b7ec --- /dev/null +++ b/testing/btrfs-progs/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 164015 2012-07-24 01:22:05Z dreisner $ +# Maintainer: Tom Gundersen +# Contributor: Tobias Powalowski +pkgname=btrfs-progs +pkgver=0.19.20120328 +pkgrel=4 +pkgdesc="btrfs filesystem utilities" +arch=(i686 x86_64) +depends=('glibc' 'e2fsprogs') +url="http://btrfs.wiki.kernel.org/" +replaces=('btrfs-progs-unstable') +conflicts=('btrfs-progs-unstable') +provides=('btrfs-progs-unstable') +license=('GPL2') +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz + 70-btrfs.rules + initcpio-install-btrfs + initcpio-hook-btrfs) +md5sums=('f4504e73cf9254779b78d5b2318ac570' + '345c62c8b267082361729ca5b647518f' + 'e5186ec3fe8a809b7473470128d1c4ab' + '9fb35142755b477a96cb7292f3d64839') + +build() { + cd $srcdir/$pkgname-$pkgver + make CFLAGS="$CFLAGS" +} + +package() { + cd $srcdir/$pkgname-$pkgver + make prefix=$pkgdir/usr install + # fix manpage + mkdir -p $pkgdir/usr/share/ + mv $pkgdir/usr/man $pkgdir/usr/share/man + mkdir -p ${pkgdir}/sbin + ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs + + # add udev rule + install -Dm644 "$srcdir/70-btrfs.rules" "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules" + + # install mkinitcpio hooks + install -Dm644 "$srcdir/initcpio-install-btrfs" \ + "$pkgdir/usr/lib/initcpio/install/btrfs" + install -Dm644 "$srcdir/initcpio-hook-btrfs" \ + "$pkgdir/usr/lib/initcpio/hooks/btrfs" +} diff --git a/testing/btrfs-progs/initcpio-hook-btrfs b/testing/btrfs-progs/initcpio-hook-btrfs new file mode 100644 index 000000000..913cec528 --- /dev/null +++ b/testing/btrfs-progs/initcpio-hook-btrfs @@ -0,0 +1,10 @@ +#!/usr/bin/ash + +run_hook() { + # if udevd is running, this is done async by add/change events + if [ "$udevd_running" -ne 1 ]; then + btrfs device scan + fi +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/testing/btrfs-progs/initcpio-install-btrfs b/testing/btrfs-progs/initcpio-install-btrfs new file mode 100644 index 000000000..aad263378 --- /dev/null +++ b/testing/btrfs-progs/initcpio-install-btrfs @@ -0,0 +1,17 @@ +#!/bin/bash + +build() { + add_module btrfs + add_binary btrfs + add_runscript + + add_file /usr/lib/udev/rules.d/70-btrfs.rules +} + +help() { + cat <