diff options
| author | root <root@rshg047.dnsready.net> | 2011-05-29 22:47:27 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-05-29 22:47:27 +0000 |
| commit | c399070d50c89903ec1dea55aa4aa5147a367565 (patch) | |
| tree | 13b71e682dd1e75ccb4c76cfb39934288a7c184e | |
| parent | a0a7a3e16a1399233b436e64dba17a6cca315393 (diff) | |
Sun May 29 22:47:27 UTC 2011
34 files changed, 558 insertions, 142 deletions
diff --git a/community/calcurse/PKGBUILD b/community/calcurse/PKGBUILD index 84c696bde..75b80c91f 100644 --- a/community/calcurse/PKGBUILD +++ b/community/calcurse/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 44138 2011-04-03 20:43:17Z lfleischer $ +# $Id: PKGBUILD 48143 2011-05-28 23:23:26Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: wain <wain.at.gmx.net> pkgname=calcurse -pkgver=2.8 -pkgrel=2 +pkgver=2.9.0 +pkgrel=1 pkgdesc='A text-based personal organizer.' arch=('i686' 'x86_64') url='http://calcurse.org/' license=('BSD') depends=('ncurses') source=("http://calcurse.org/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('124d40c0912b12021996220f02b759cc') +md5sums=('3ff0229581060d43232a6fb56b0cd07a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/flickcurl/PKGBUILD b/community/flickcurl/PKGBUILD index 47e29d560..c168a2416 100644 --- a/community/flickcurl/PKGBUILD +++ b/community/flickcurl/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 44887 2011-04-12 12:28:24Z spupykin $ +# $Id: PKGBUILD 48114 2011-05-28 21:04:15Z remy $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=flickcurl pkgver=1.21 -pkgrel=1 +pkgrel=2 pkgdesc="C library for the Flickr API" arch=(i686 x86_64) url="http://librdf.org/flickcurl/" license=('GPL') depends=(raptor) -makedepends=() source=(http://download.dajobe.org/flickcurl/flickcurl-$pkgver.tar.gz) md5sums=('d4d364231505dc22a6af42be7bc85edf') diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD index f192e2052..14791d62b 100644 --- a/community/pcsclite/PKGBUILD +++ b/community/pcsclite/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 45280 2011-04-18 23:09:30Z giovanni $ +# $Id: PKGBUILD 48094 2011-05-28 15:09:58Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com> pkgname=pcsclite pkgver=1.7.2 -pkgrel=1 +pkgrel=2 pkgdesc="PC/SC Architecture smartcard middleware library" arch=('i686' 'x86_64') url="https://alioth.debian.org/projects/pcsclite/" license=('BSD') -depends=('libusb') +depends=('udev') makedepends=('pkgconfig') options=('!libtool' '!docs') source=(https://alioth.debian.org/frs/download.php/3533/pcsc-lite-${pkgver}.tar.bz2 @@ -21,8 +21,7 @@ build() { cd "${srcdir}/pcsc-lite-${pkgver}" ./configure --prefix=/usr \ - --disable-libudev \ - --enable-libusb \ + --enable-libudev \ --sysconfdir=/etc \ --enable-usbdropdir=/usr/lib/pcsc/drivers diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD index 74bbe8876..84d40eeb8 100644 --- a/community/projectm/PKGBUILD +++ b/community/projectm/PKGBUILD @@ -1,32 +1,31 @@ -# $Id: PKGBUILD 78581 2010-04-26 20:01:05Z andrea $ -# Maintainer: +# $Id: PKGBUILD 48148 2011-05-29 00:07:23Z lfleischer $ +# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=projectm pkgver=2.0.1 -pkgrel=2 -pkgdesc="A music visualizer which uses 3D accelerated iterative image based rendering" +pkgrel=3 +pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.' arch=('i686' 'x86_64') -url="http://projectm.sourceforge.net/" +url='http://projectm.sourceforge.net/' license=('LGPL') depends=('gcc-libs' 'ftgl' 'glew' 'gtkglext') makedepends=('pkgconfig' 'cmake') -source=(http://downloads.sourceforge.net/${pkgname}/projectM-${pkgver}-Source.tar.gz) -md5sums=('f8bf795878cdbbef54784cf2390b4c89') +source=("http://downloads.sourceforge.net/${pkgname}/projectM-${pkgver}-Source.tar.gz" + 'libprojectM-2.0.1-pkg-config.patch') +md5sums=('f8bf795878cdbbef54784cf2390b4c89' + 'c271ec8c541eb281f1294287bdbc3488') build() { - cd ${srcdir} -# sed -i 's|FTGL/FTGL.h|FTGL/ftgl.h|' Renderer.hpp || return 1 -# sed -i "s|#include <iostream>|#include <cstdio>\n#include <iostream>|" BuiltinParams.cpp || return 1 - mkdir build - cd build - cmake ../projectM-${pkgver}-Source \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release || return 1 - make || return 1 + cd "${srcdir}/projectM-${pkgver}-Source" + + patch -p0 -i ../libprojectM-2.0.1-pkg-config.patch + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release + make } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install || return 1 + cd "${srcdir}/projectM-${pkgver}-Source" + make DESTDIR="${pkgdir}" install } diff --git a/community/projectm/libprojectM-2.0.1-pkg-config.patch b/community/projectm/libprojectM-2.0.1-pkg-config.patch new file mode 100644 index 000000000..415e92fd7 --- /dev/null +++ b/community/projectm/libprojectM-2.0.1-pkg-config.patch @@ -0,0 +1,10 @@ +--- libprojectM.pc.orig 2011-05-29 01:52:53.869288700 +0200 ++++ libprojectM.pc 2011-05-29 01:53:08.604851407 +0200 +@@ -1,6 +1,6 @@ + prefix=/usr/local + exec_prefix=/usr/local +-libdir= ++libdir=${exec_prefix}/lib + includedir=/usr/local/include + pkgdatadir=/usr/local/share/projectM + sysconfdir=/usr/local/share/projectM diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index cf53e5511..776460e97 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 47038 2011-05-14 10:40:55Z jelle $ +# $Id: PKGBUILD 48128 2011-05-28 22:25:50Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.2.7 +pkgver=2.2.8 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") -md5sums=('86937a61b9788d1d06fbfbd2bff03916' +md5sums=('106af5e3d4646588fd27be499227e14c' 'bf61968d18d0e42529880f5c488ea9ed' '9e2d75b7a9dc421122d673fe520ef17f') diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 4c795a861..6e7e40006 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,33 +1,35 @@ -# $Id: PKGBUILD 45502 2011-04-22 15:22:48Z spupykin $ +# $Id: PKGBUILD 48133 2011-05-28 22:32:26Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell -pkgver=0.9.3 +pkgver=0.10 pkgrel=1 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64') url="http://yorba.org/shotwell/" license=('LGPL2.1') -depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' - 'libraw' 'librsvg' 'json-glib' 'desktop-file-utils' 'gnome-vfs') +depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libraw' 'librsvg' 'json-glib' 'desktop-file-utils' 'gnome-vfs') makedepends=('intltool' 'vala') install=shotwell.install -source=(http://yorba.org/download/shotwell/0.9/${pkgname}-${pkgver}.tar.bz2) -md5sums=('b1a3281be7d4ff8eac98289bcd129387') +source=("http://yorba.org/download/shotwell/${pkgver}/shotwell-${pkgver}.tar.bz2") +md5sums=('680c688cefdf6929f0a995d755b9f8f7') build() { cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ --disable-schemas-install \ --disable-desktop-update \ --disable-icon-update + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD index 32746ffbf..f16a5a1c4 100644 --- a/community/warzone2100/PKGBUILD +++ b/community/warzone2100/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 39013 2011-02-05 01:04:18Z lcarlier $ +# $Id: PKGBUILD 48138 2011-05-28 22:59:33Z lcarlier $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> pkgname=warzone2100 -pkgver=2.3.7 +pkgver=2.3.8 pkgrel=1 pkgdesc="3D realtime strategy game on a future Earth" url="http://wz2100.net/" @@ -12,7 +12,7 @@ license=('GPL') depends=('sdl_net' 'libgl' 'openal' 'libjpeg' 'libpng' 'libvorbis' 'libtheora' 'libmad' 'physfs' 'mesa' 'quesoglc' 'popt' 'ttf-dejavu') makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip') source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('67c2bb506fc59336eb830ff50303745d') +md5sums=('612306c1b6a9d38b632ea3168b824f5e') build() { cd ${pkgname}-${pkgver} diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index 574435eef..e58f87add 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 107680 2011-01-26 22:30:45Z thomas $ +# $Id: PKGBUILD 123921 2011-05-14 11:29:02Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=mkinitcpio-busybox -pkgver=1.18.2 +pkgver=1.18.4 pkgrel=1 pkgdesc="base initramfs tools" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ license=('GPL') depends=('glibc') source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2 config) -sha256sums=('aa7e1cec8cd9c7f4e56098b9e4bb2ab5d593d5a35f766ad9e6a312289bf57080' +sha256sums=('4d24d37bd6f1bd153e8cf9a984ec2f32f18464f73ca535e2cc2e8be9694097fa' 'dd6dca08fbc335f1394e0f1b619df6895349c759d0c6e43456aed411e16d4194') build() { diff --git a/core/udev/81-arch.rules b/core/udev/81-arch.rules index 21127a729..3e71a9118 100644 --- a/core/udev/81-arch.rules +++ b/core/udev/81-arch.rules @@ -28,10 +28,6 @@ # check if the device has already been claimed by a driver ACTION!="add", GOTO="drivers_end" -# SOUND addon modules -SUBSYSTEM=="sound", RUN+="/lib/udev/load-modules.sh snd-pcm-oss" -SUBSYSTEM=="sound", RUN+="/lib/udev/load-modules.sh snd-seq-oss" - #PNP addon modules SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0800", RUN+="/lib/udev/load-modules.sh pcspkr" SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP051[01]*", RUN+="/lib/udev/load-modules.sh irtty-sir" @@ -50,26 +46,6 @@ LABEL="drivers_end" ##################################### ##################################### -###### CD/DVD symlinks - begin -##################################### -ACTION=="add|change", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", IMPORT="cdrom_id --export $tempnode" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", IMPORT="cdrom_id --export $tempnode" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="scd[a-z]", IMPORT="cdrom_id --export $tempnode" -ENV{ID_CDROM}=="?*", SYMLINK+="cd/cdrom-%b" -ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cd/cdrw-%b" -ENV{ID_CDROM_DVD}=="?*", SYMLINK+="cd/dvd-%b" -ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="cd/dvdrw-%b" -ACTION=="add|change", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", RUN+="cdsymlinks.sh" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="hd[a-z]", RUN+="cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sr[0-9]*", RUN+="cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sg[0-9]*", RUN+="cdsymlinks.sh" -##################################### -###### CD/DVD symlinks - end -##################################### - -##################################### # Additional Archlinux # Permissions and Symlinks - begin ##################################### diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index d596361c9..0db5f45cf 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 124183 2011-05-17 13:17:56Z tomegun $ +# $Id: PKGBUILD 125635 2011-05-27 11:47:52Z tomegun $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> @@ -6,8 +6,8 @@ pkgbase="udev" pkgname=('udev' 'udev-compat') -pkgver=168 -pkgrel=2 +pkgver=171 +pkgrel=1 arch=(i686 x86_64) url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" license=('GPL') @@ -18,18 +18,16 @@ makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 80-drivers.rules 81-arch.rules - load-modules.sh - cdsymlinks.sh - 01-settle.patch - 02-settle.patch) + load-modules.sh + static-audio-nodes-permissions.patch) build() { cd $srcdir/$pkgbase-$pkgver - # fix https://bugs.archlinux.org/task/24288 - patch -Np1 -i ../01-settle.patch - patch -Np1 -i ../02-settle.patch + # fix https://bugs.archlinux.org/task/24362 (will be in udev-172) + patch -Np1 -i ../static-audio-nodes-permissions.patch ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\ - --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system + --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system\ + --disable-rule-generator make } @@ -51,16 +49,6 @@ package_udev() { install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules # install our module loading subsystem install -D -m755 $srcdir/load-modules.sh $pkgdir/lib/udev/load-modules.sh - # install cdsymlinks.sh - install -D -m755 $srcdir/cdsymlinks.sh $pkgdir/lib/udev/cdsymlinks.sh - # disable error logging to prevent startup failures printed to vc on boot - sed -i -e 's|udev_log="err"|udev_log="0"|g' $pkgdir/etc/udev/udev.conf - # disable persistent cdromsymlinks and network by default - # and move it to /etc/udev/rules.d - mv $pkgdir/lib/udev/rules.d/75-persistent-net-generator.rules \ - $pkgdir/etc/udev/rules.d/75-persistent-net-generator.rules.optional - mv $pkgdir/lib/udev/rules.d/75-cd-aliases-generator.rules \ - $pkgdir/etc/udev/rules.d/75-cd-aliases-generator.rules.optional # create framebuffer blacklist mkdir -p $pkgdir/etc/modprobe.d/ @@ -101,9 +89,6 @@ package_udev() { s#GROUP="tape"#GROUP="storage"#g; s#GROUP="cdrom"#GROUP="optical"#g' $i done - - # Provided by the bluez package, remove this line when updating to udev>=169 - rm ${pkgdir}/lib/udev/hid2hci } package_udev-compat() { @@ -114,10 +99,8 @@ package_udev-compat() { install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules } -sha256sums=('9ddc43173cf7b397c8cc01d26d644932ff2c2259b3a5eea7be90db96a28080e2' - '0cb99cc7cea92238dd6b19a4c104c3b9e9f744c6b9d6b4382c7cd22be18c98f9' - '377c13f20de32776107dddc8324f599f31320e8dd1185e3282856aee5cb08499' - 'c6b41afb24e8f496064d8baad844697a6515cea1b7e0389054cd8a2053477377' - 'cc0d281926bf2f1ac816c0060a2afc59444ddf0f8dab6e2d9924a2a7c8de4a13' - '70d2fd079901bf9940c4811ec91634da0d8b3425ebcdbffeba5a73cb616be650' - 'fe9d1aafb1a620108790d82960577de4eb757450c35a146475aed3f5e9356f1a') +md5sums=('bdf4617284be2ecac11767437417e209' + '4427855146513a4703ab5c7eb8a0156e' + 'd8725e64fd0ce6e784ae795fae424c0a' + 'f91fddc67609b45b244a624977c4247b' + '4f625aea95a5597afd8cdf189421f193') diff --git a/core/udev/static-audio-nodes-permissions.patch b/core/udev/static-audio-nodes-permissions.patch new file mode 100644 index 000000000..b1fc4f935 --- /dev/null +++ b/core/udev/static-audio-nodes-permissions.patch @@ -0,0 +1,27 @@ +From 3e227830ad6494700e18ae03297e8fb833ff26bf Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay.sievers@vrfy.org> +Date: Fri, 27 May 2011 02:50:29 +0200 +Subject: [PATCH] rules: apply 'audio' group of the static snd/{seq,timer} + nodes + +--- + rules/rules.d/50-udev-default.rules | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules +index cd745ef..cacb533 100644 +--- a/rules/rules.d/50-udev-default.rules ++++ b/rules/rules.d/50-udev-default.rules +@@ -38,7 +38,8 @@ SUBSYSTEM=="graphics", GROUP="video" + SUBSYSTEM=="drm", GROUP="video" + + # sound +-SUBSYSTEM=="sound", GROUP="audio" ++SUBSYSTEM=="sound", GROUP="audio", \ ++ OPTIONS+="static_node=snd/seq", OPTIONS+="static_node=snd/timer" + + # DVB (video) + SUBSYSTEM=="dvb", GROUP="video" +-- +1.7.5.3 + diff --git a/core/udev/udev.install b/core/udev/udev.install index e953ec743..b2ed69467 100644 --- a/core/udev/udev.install +++ b/core/udev/udev.install @@ -11,6 +11,17 @@ post_upgrade() { echo "They are located in /etc/udev/readme-udev-arch.txt" echo "----------" fi + if [ "$(vercmp $2 169)" -lt 0 ]; then + echo "ATTENTION UDEV:" + echo "---------------" + echo "Kernel 2.6.32 or newer is now required." + echo "OSS emulation modules are not loaded by default, add to rc.conf if needed." + echo "Arch specific cd symlinks are now no longer created." + echo "cd and net persistent rules will no longer be autogenerated," + echo "see <https://wiki.archlinux.org/index.php/Udev> for details." + echo "Errors are now logged (possibly to the console) by default." + echo "---------------" + fi } post_install() { diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD index a727c4ca0..adefe545d 100644 --- a/extra/cheese/PKGBUILD +++ b/extra/cheese/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 120785 2011-04-26 15:12:27Z ibiru $ +# $Id: PKGBUILD 125706 2011-05-28 10:53:12Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=cheese pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" arch=(i686 x86_64) license=('GPL') -depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'clutter-gst' +depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad' 'clutter-gst' 'clutter-gtk' 'mx' 'libgee' 'gnome-video-effects' 'hicolor-icon-theme') makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool' 'gobject-introspection') groups=('gnome-extra') diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD index 2e32d5ea8..7663c273b 100644 --- a/extra/epiphany/PKGBUILD +++ b/extra/epiphany/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 122054 2011-05-02 05:12:37Z heftig $ +# $Id: PKGBUILD 125696 2011-05-28 10:41:59Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=epiphany pkgver=3.0.2 -pkgrel=1 +pkgrel=2 install=epiphany.install pkgdesc="A GNOME3 web browser based on the WebKit rendering engine." arch=('i686' 'x86_64') license=('GPL') depends=('libsoup-gnome' 'gsettings-desktop-schemas' 'libwebkit3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils' - 'hicolor-icon-theme') + 'hicolor-icon-theme' 'seed') makedepends=('intltool' 'networkmanager' 'gnome-doc-utils' 'startup-notification') options=('!libtool' '!emptydirs') groups=('gnome') @@ -23,7 +23,8 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var \ --disable-scrollkeeper \ - --enable-network-manager + --enable-network-manager \ + --enable-seed make } diff --git a/extra/gnucash/PKGBUILD b/extra/gnucash/PKGBUILD index 0f432f735..afa3bd5e9 100644 --- a/extra/gnucash/PKGBUILD +++ b/extra/gnucash/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 119590 2011-04-12 15:33:34Z eric $ +# $Id: PKGBUILD 125742 2011-05-29 04:00:08Z eric $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Mark Schneider <queueRAM@gmail.com> pkgname=gnucash -pkgver=2.4.5 +pkgver=2.4.6 pkgrel=1 pkgdesc="A personal and small-business financial-accounting application" arch=('i686' 'x86_64') @@ -20,8 +20,8 @@ optdepends=('evince: for print preview' options=('!libtool' '!makeflags') install=gnucash.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('94168fe959743fc342812ac3a01814a1') -sha1sums=('4f40b039ee8e9bcc15d49a8ed52bd7ef94bc8126') +md5sums=('b7d5fbb1bddf3618c97ebeeb76408ebe') +sha1sums=('b6d4a6bc327ef5a260d070215a14a3180b474ad8') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libdmapsharing/PKGBUILD b/extra/libdmapsharing/PKGBUILD index 7f53d6f01..fb532e990 100644 --- a/extra/libdmapsharing/PKGBUILD +++ b/extra/libdmapsharing/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 117405 2011-04-01 16:34:19Z ibiru $ +# $Id: PKGBUILD 125725 2011-05-28 15:53:41Z ibiru $ #Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libdmapsharing -pkgver=2.9.7 +pkgver=2.9.12 pkgrel=1 -pkgdesc="Libdmapsharing is a library you may use to access and share DMAP content" +pkgdesc="A library that implements the DMAP family of protocols" arch=('i686' 'x86_64') url="http://www.flyn.org/projects/libdmapsharing/index.html" license=('LGPL2.1') depends=('libsoup' 'avahi' 'gstreamer0.10-base' 'gdk-pixbuf2') options=('!libtool') source=(http://www.flyn.org/projects/libdmapsharing/${pkgname}-${pkgver}.tar.gz) -md5sums=('5eeded6d82ed2c2f6f310b9bd484798c') +md5sums=('ec34948df21e9ba0656c917b10fed1c3') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --with-mdns=avahi make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index 8264735d7..0dc103a82 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 108496 2011-01-31 15:55:57Z jgc $ +# $Id: PKGBUILD 125631 2011-05-27 10:55:14Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=nspr -pkgver=4.8.7 +pkgver=4.8.8 pkgrel=1 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=('zip') options=(!emptydirs) source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz nspr.pc.in) -md5sums=('97e30989a56ab813453b71261849c200' +md5sums=('b3a961d2e0ff3331745220984c70b6a9' 'bce1611f3117b53fc904cab549c09967') build() { @@ -32,6 +32,10 @@ build() { --enable-optimize \ --disable-debug ${confflags} make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install NSPR_LIBS=`./config/nspr-config --libs` diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD index 039509b3c..bdd3377d4 100644 --- a/extra/nss/PKGBUILD +++ b/extra/nss/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 109101 2011-02-06 10:02:09Z andyrtr $ +# $Id: PKGBUILD 125630 2011-05-27 10:55:00Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nss -pkgver=3.12.9 +pkgver=3.12.10 pkgrel=1 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64) @@ -11,14 +11,14 @@ _nsprver=4.8.7 depends=("nspr>=${_nsprver}" 'sqlite3>=3.7.5' 'zlib' 'sh') makedepends=('perl') replaces=('nss-nspr') +options=('!strip') source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz nss-no-rpath.patch nss.pc.in nss-config.in add_spi+cacert_ca_certs.patch ssl-renegotiate-transitional.patch) -options=('!strip') -md5sums=('bd32f183ca28440c1744650be31a9ccc' +md5sums=('027954e894f02732f4e66cd854261145' 'e5c97db0c884d5f4cfda21e562dc9bba' 'c547b030c57fe1ed8b77c73bf52b3ded' '46bee81908f1e5b26d6a7a2e14c64d9f' diff --git a/extra/ntrack/PKGBUILD b/extra/ntrack/PKGBUILD index 3f4c5ff17..6140cb6dc 100644 --- a/extra/ntrack/PKGBUILD +++ b/extra/ntrack/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 118407 2011-04-06 16:43:17Z andrea $ +# $Id: PKGBUILD 125701 2011-05-28 10:48:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=ntrack pkgver=13 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="A network connectivity tracking library" arch=('i686' 'x86_64') @@ -11,13 +11,17 @@ url="http://launchpad.net/ntrack/" license=('LGPL') depends=('qt' 'libnl' 'gcc-libs') makedepends=('python2') -optdepends=('python2') -source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz") -md5sums=('90596b924a108f8b4eea52239ba64369') -options=('!libtool') +source=("http://launchpad.net/${pkgname}/main/0${pkgver}/+download/${pkgname}-0${pkgver}.tar.gz" + 'dead-loop-fix.patch') +md5sums=('90596b924a108f8b4eea52239ba64369' + '02bda6ae15ef04b6a7d9273c37752681') +options=('!libtool' '!emptydirs') build() { cd "${srcdir}/${pkgname}-0${pkgver}" + + patch -p0 -i "${srcdir}"/dead-loop-fix.patch + ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/extra/ntrack/dead-loop-fix.patch b/extra/ntrack/dead-loop-fix.patch new file mode 100644 index 000000000..133bb4ace --- /dev/null +++ b/extra/ntrack/dead-loop-fix.patch @@ -0,0 +1,14 @@ +=== modified file 'modules/ntrack-libnl.c' +--- modules/ntrack-libnl.c 2011-04-25 16:28:19 +0000 ++++ modules/ntrack-libnl.c 2011-04-25 17:25:24 +0000 +@@ -394,6 +394,9 @@ + if (rtnl_link_get_ifindex(link) > iindex) + break; + i = i->next; ++ ++ if (i == linklist) ++ break; + } + return result; + } + diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD index 3aed2023f..7176a7ce2 100644 --- a/extra/rhythmbox/PKGBUILD +++ b/extra/rhythmbox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 121957 2011-04-30 20:53:21Z eric $ +# $Id: PKGBUILD 125726 2011-05-28 15:54:25Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rhythmbox -pkgver=2.90.1 -pkgrel=3 +pkgver=2.90.1.git20110528 +pkgrel=1 pkgdesc="An iTunes-like music player/libary" arch=('i686' 'x86_64') license=('GPL') @@ -20,8 +20,8 @@ optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' options=('!libtool' '!emptydirs' '!strip') install=rhythmbox.install #source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.13/${pkgname}-${pkgver}.tar.bz2) -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-20110426.tar.xz) -sha256sums=('513cfa653cf68a05b1fe5f6e41744af4baed0d0fff169000b3153effa232e23d') +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('8e73675d36a90950034862e1aaa8db96267c8c4563823983d3ee2dc239c0a4f0') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 1a636f80e..e54d2ecb6 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 125527 2011-05-26 14:21:55Z giovanni $ +# $Id: PKGBUILD 125719 2011-05-28 14:45:23Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=1.1.9 -pkgrel=2 +pkgrel=3 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" @@ -18,7 +18,8 @@ depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio' 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') makedepends=('avahi' 'pkgconfig' 'libxpm' 'live-media' 'libnotify' 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' - 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse') + 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse' + 'lirc-utils' 'gnutls' 'libcaca') optdepends=('avahi: for service discovery using bonjour protocol' 'libnotify: for notification plugin' 'ncurses: for ncurses interface support' diff --git a/multilib/lib32-libjpeg-turbo/PKGBUILD b/multilib/lib32-libjpeg-turbo/PKGBUILD new file mode 100644 index 000000000..09102ad96 --- /dev/null +++ b/multilib/lib32-libjpeg-turbo/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 48100 2011-05-28 16:27:44Z bluewind $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com> + +_pkgbasename=libjpeg-turbo +pkgname=lib32-$_pkgbasename +pkgver=1.1.1 +pkgrel=1 +pkgdesc="libjpeg derivative with accelerated baseline JPEG compression and decompression (32-bit)" +arch=('x86_64') +url="http://libjpeg-turbo.virtualgl.org/" +license=('GPL' 'custom') +depends=('lib32-glibc' $_pkgbasename) +makedepends=('nasm' gcc-multilib) +provides=('lib32-libjpeg=8.0.2') +conflicts=('lib32-libjpeg') +replaces=('lib32-libjpeg') +options=('!libtool') +source=(http://sourceforge.net/projects/$_pkgbasename/files/$pkgver/$_pkgbasename-$pkgver.tar.gz) +md5sums=('03b9c1406c7bfdc204313c2917ce6962') + +build() { + cd "$srcdir/$_pkgbasename-$pkgver" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + sed -i "s|NAFLAGS='-felf64 -DELF -D__x86_64__'|NAFLAGS='-felf32 -DELF -D__x86_64__'|" configure + ./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man --libdir=/usr/lib32 --without-simd + make +} + +package() { + cd "$srcdir/$_pkgbasename-$pkgver" + + make DESTDIR="$pkgdir/" install + rm -rf "${pkgdir}"/usr/{include,share,bin,sbin} + mkdir -p "$pkgdir/usr/share/licenses" + ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname" +} diff --git a/multilib/lib32-udev/PKGBUILD b/multilib/lib32-udev/PKGBUILD index 32f92ba54..081db8c4a 100644 --- a/multilib/lib32-udev/PKGBUILD +++ b/multilib/lib32-udev/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=('lib32-udev') -pkgver=166 +pkgver=171 pkgrel=1 arch=('x86_64') pkgdesc="The userspace dev tools (udev) (32-bit)" @@ -14,7 +14,7 @@ options=(!makeflags !libtool) depends=('lib32-glibc' 'lib32-glib2' 'lib32-acl' 'lib32-libusb-compat' 'udev') makedepends=('gcc-multilib' 'coreutils' 'util-linux' 'pciutils' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.bz2) -md5sums=('4db27d73fdbe94f47fd89fdd105c2dfb') +md5sums=('bdf4617284be2ecac11767437417e209') build() { export CC="gcc -m32" diff --git a/multilib/wine/PKGBUILD b/multilib/wine/PKGBUILD index 9d0aab6eb..ebed5e756 100644 --- a/multilib/wine/PKGBUILD +++ b/multilib/wine/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 46925 2011-05-13 19:38:18Z bluewind $ +# $Id: PKGBUILD 48109 2011-05-28 20:43:37Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Eduardo Romero <eduardo@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=wine -pkgver=1.3.20 -pkgrel=1 +pkgver=1.3.21 +pkgrel=2 _pkgbasever=${pkgver/rc/-rc} source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) -md5sums=('2d9fe8755172a21ddc453d720a497ad9') +md5sums=('dfcefe48a9aae82f7f1aa4d2c6617961') pkgdesc="A compatibility layer for running Windows programs" url="http://www.winehq.com" @@ -26,6 +26,7 @@ depends=( libxrandr lib32-libxrandr libxdamage lib32-libxdamage libxxf86dga lib32-libxxf86dga + libxi lib32-libxi alsa-lib lib32-alsa-lib desktop-file-utils ) diff --git a/testing/cryptsetup/PKGBUILD b/testing/cryptsetup/PKGBUILD new file mode 100644 index 000000000..15d191ead --- /dev/null +++ b/testing/cryptsetup/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 125738 2011-05-28 17:14:11Z thomas $ +# Maintainer: Thomas Bächler <thomas@archlinux.org> +pkgname=cryptsetup +pkgver=1.3.1 +pkgrel=1 +pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" +arch=(i686 x86_64) +license=('GPL') +url="http://code.google.com/p/cryptsetup/" +groups=('base') +depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt') +conflicts=('mkinitcpio<0.5.99') +options=('!libtool' '!emptydirs') +source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 + encrypt_hook + encrypt_install) +sha256sums=('7ceb18a0c91fa1546077b41b93463dd2ec9d7f83e6fd93757fb84cc608206a6a' + '64601eae6fbf3e3afceccec5877557aa208a82497c33cc94ad0a686b4022b5dc' + '07918fc349b3a7c4a73e8ad1cc3d97a2a79ebc7655090ab9ebb00b1e092c85aa') + +build() { + cd $srcdir/$pkgname-${pkgver} + ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib + make +} + +package() { + cd $srcdir/$pkgname-${pkgver} + make DESTDIR=$pkgdir install + # install hook + install -D -m644 $srcdir/encrypt_hook $pkgdir/lib/initcpio/hooks/encrypt + install -D -m644 $srcdir/encrypt_install $pkgdir/lib/initcpio/install/encrypt + # Fix pkgconfig location + install -d -m755 $pkgdir/usr/lib + mv $pkgdir/lib/pkgconfig $pkgdir/usr/lib/ +} diff --git a/testing/cryptsetup/encrypt_hook b/testing/cryptsetup/encrypt_hook new file mode 100644 index 000000000..e84bc6ed7 --- /dev/null +++ b/testing/cryptsetup/encrypt_hook @@ -0,0 +1,131 @@ +# vim: set ft=sh: +# TODO this one needs some work to work with lots of different +# encryption schemes +run_hook () +{ + /sbin/modprobe -a -q dm-crypt >/dev/null 2>&1 + if [ -e "/sys/class/misc/device-mapper" ]; then + if [ ! -e "/dev/mapper/control" ]; then + /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + fi + [ "${quiet}" = "y" ] && CSQUIET=">/dev/null" + + # Get keyfile if specified + ckeyfile="/crypto_keyfile.bin" + if [ "x${cryptkey}" != "x" ]; then + ckdev="$(echo "${cryptkey}" | cut -d: -f1)" + ckarg1="$(echo "${cryptkey}" | cut -d: -f2)" + ckarg2="$(echo "${cryptkey}" | cut -d: -f3)" + if poll_device "${ckdev}" ${rootdelay}; then + case ${ckarg1} in + *[!0-9]*) + # Use a file on the device + # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path + mkdir /ckey + mount -r -t ${ckarg1} ${ckdev} /ckey + dd if=/ckey/${ckarg2} of=${ckeyfile} >/dev/null 2>&1 + umount /ckey + ;; + *) + # Read raw data from the block device + # ckarg1 is numeric: ckarg1=offset, ckarg2=length + dd if=${ckdev} of=${ckeyfile} bs=1 skip=${ckarg1} count=${ckarg2} >/dev/null 2>&1 + ;; + esac + fi + [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." + fi + + if [ -n "${cryptdevice}" ]; then + DEPRECATED_CRYPT=0 + cryptdev="$(echo "${cryptdevice}" | cut -d: -f1)" + cryptname="$(echo "${cryptdevice}" | cut -d: -f2)" + else + DEPRECATED_CRYPT=1 + cryptdev="${root}" + cryptname="root" + fi + + warn_deprecated() { + echo "The syntax 'root=${root}' where '${root}' is an encrypted volume is deprecated" + echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead." + } + + if poll_device "${cryptdev}" ${rootdelay}; then + if /sbin/cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + dopassphrase=1 + # If keyfile exists, try to use that + if [ -f ${ckeyfile} ]; then + if eval /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; then + dopassphrase=0 + else + echo "Invalid keyfile. Reverting to passphrase." + fi + fi + # Ask for a passphrase + if [ ${dopassphrase} -gt 0 ]; then + echo "" + echo "A password is required to access the ${cryptname} volume:" + + #loop until we get a real password + while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${CSQUIET}; do + sleep 2; + done + fi + if [ -e "/dev/mapper/${cryptname}" ]; then + if [ ${DEPRECATED_CRYPT} -eq 1 ]; then + export root="/dev/mapper/root" + fi + else + err "Password succeeded, but ${cryptname} creation failed, aborting..." + exit 1 + fi + elif [ -n "${crypto}" ]; then + [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated + msg "Non-LUKS encrypted device found..." + if [ $# -ne 5 ]; then + err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip" + err "Non-LUKS decryption not attempted..." + return 1 + fi + exe="/sbin/cryptsetup create ${cryptname} ${cryptdev}" + tmp=$(echo "${crypto}" | cut -d: -f1) + [ -n "${tmp}" ] && exe="${exe} --hash \"${tmp}\"" + tmp=$(echo "${crypto}" | cut -d: -f2) + [ -n "${tmp}" ] && exe="${exe} --cipher \"${tmp}\"" + tmp=$(echo "${crypto}" | cut -d: -f3) + [ -n "${tmp}" ] && exe="${exe} --key-size \"${tmp}\"" + tmp=$(echo "${crypto}" | cut -d: -f4) + [ -n "${tmp}" ] && exe="${exe} --offset \"${tmp}\"" + tmp=$(echo "${crypto}" | cut -d: -f5) + [ -n "${tmp}" ] && exe="${exe} --skip \"${tmp}\"" + if [ -f ${ckeyfile} ]; then + exe="${exe} --key-file ${ckeyfile}" + else + exe="${exe} --verify-passphrase" + echo "" + echo "A password is required to access the ${cryptname} volume:" + fi + eval "${exe} ${CSQUIET}" + + if [ $? -ne 0 ]; then + err "Non-LUKS device decryption failed. verify format: " + err " crypto=hash:cipher:keysize:offset:skip" + exit 1 + fi + if [ -e "/dev/mapper/${cryptname}" ]; then + if [ ${DEPRECATED_CRYPT} -eq 1 ]; then + export root="/dev/mapper/root" + fi + else + err "Password succeeded, but ${cryptname} creation failed, aborting..." + exit 1 + fi + else + err "Failed to open encryption mapping: The device ${cryptdev} is not a LUKS volume and the crypto= paramater was not specified." + fi + fi + rm -f ${ckeyfile} + fi +} diff --git a/testing/cryptsetup/encrypt_install b/testing/cryptsetup/encrypt_install new file mode 100644 index 000000000..25a2ae45c --- /dev/null +++ b/testing/cryptsetup/encrypt_install @@ -0,0 +1,27 @@ +# vim: set ft=sh: + +install () +{ + if [ -z "${CRYPTO_MODULES}" ]; then + MODULES=" dm-crypt $(all_modules "/crypto/") " + else + MODULES=" dm-crypt ${CRYPTO_MODULES} " + fi + FILES="" + SCRIPT="encrypt" + add_dir "/dev/mapper" + [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup" + [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup" + add_binary "/sbin/dmsetup" + add_file "/lib/udev/rules.d/10-dm.rules" + add_file "/lib/udev/rules.d/13-dm-disk.rules" + add_file "/lib/udev/rules.d/95-dm-notify.rules" + add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" +} + +help () +{ +cat<<HELPEOF + This hook allows for an encrypted root device. +HELPEOF +} diff --git a/testing/lvm2/11-dm-initramfs.rules b/testing/lvm2/11-dm-initramfs.rules new file mode 100644 index 000000000..d2c167324 --- /dev/null +++ b/testing/lvm2/11-dm-initramfs.rules @@ -0,0 +1,3 @@ +# needed with new udev/mkinitcpio and as implemented in dracut: +# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54> +SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist" diff --git a/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff b/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff new file mode 100644 index 000000000..e75499e8e --- /dev/null +++ b/testing/lvm2/Be-quiet-on-removing-cache-on-read-only-fs.diff @@ -0,0 +1,17 @@ +Do not issue an error message when unable to remove .cache on read-only fs. +=================================================================== +RCS file: /cvs/lvm2/LVM2/lib/filters/filter-persistent.c,v +retrieving revision 1.49 +retrieving revision 1.50 +diff -u -r1.49 -r1.50 +--- LVM2/lib/filters/filter-persistent.c 2011/04/22 12:05:33 1.49 ++++ LVM2/lib/filters/filter-persistent.c 2011/05/12 12:42:48 1.50 +@@ -108,7 +108,7 @@ + log_very_verbose("Obtaining device list from " + "udev. Removing obolete %s.", + pf->file); +- if (unlink(pf->file) < 0) ++ if (unlink(pf->file) < 0 && errno != EROFS) + log_sys_error("unlink", pf->file); + } + return 1; diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD new file mode 100644 index 000000000..39e3b4561 --- /dev/null +++ b/testing/lvm2/PKGBUILD @@ -0,0 +1,72 @@ +# $Id: PKGBUILD 125735 2011-05-28 17:12:36Z thomas $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgbase=lvm2 +pkgname=('lvm2' 'device-mapper') +pkgver=2.02.85 +_pkgverlvm=${pkgver} +pkgrel=2 +arch=('i686' 'x86_64') +url="http://sourceware.org/lvm2/" +license=('GPL2' 'LGPL2.1') +groups=('base') +conflicts=('mkinitcpio<0.5.99') +source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz + lvm2_install + lvm2_hook + Be-quiet-on-removing-cache-on-read-only-fs.diff + 11-dm-initramfs.rules) +md5sums=('91785ca438e5ce679dd3a386b183d552' + '9fbe01c6e3fca4634b4a38ecdc2f562f' + 'cf05f2c7281e24269ea9dcc6b4e106ba' + '6db89da27928d2415a8e26cd0a842712' + '69e40679cd8b3658bfc619e48baae125') +sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7' + '3f11db76189bcbc32d6b16a1b05ca3499e3e7b47' + '1cd20e8fbad6fd7d5c0f54e831fbf58ae564b440' + '6d7dd04be291d7537235704c816a701fd5beacc0' + 'f6a554eea9557c3c236df2943bb6e7e723945c41') + +build() { + cd "${srcdir}/LVM2.${_pkgverlvm}" + sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh + patch -p1 -i ../Be-quiet-on-removing-cache-on-read-only-fs.diff + unset LDFLAGS + ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ + --includedir=/usr/include --with-usrlibdir=/usr/lib \ + --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ + --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules + make +} + +package_device-mapper() { + pkgdesc="Device mapper userspace library and tools" + url="http://sourceware.org/dm/" + depends=('glibc' 'udev') + + cd "${srcdir}/LVM2.${_pkgverlvm}" + make DESTDIR="${pkgdir}" install_device-mapper + # extra udev rule for device-mapper in initramfs + install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules" +} + +package_lvm2() { + pkgdesc="Logical Volume Manager 2 utilities" + depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') + conflicts=('lvm' 'mkinitcpio<0.5.99') + backup=('etc/lvm/lvm.conf') + options=('!makeflags') + + cd "${srcdir}/LVM2.${_pkgverlvm}" + make DESTDIR="${pkgdir}" install_lvm2 + # install applib + cd liblvm + make DESTDIR="${pkgdir}" install + cd .. + # /etc directories + install -d "${pkgdir}"/etc/lvm/{archive,backup} + # mkinitcpio hook + install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2" + install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2" +} diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook new file mode 100644 index 000000000..86d2ea582 --- /dev/null +++ b/testing/lvm2/lvm2_hook @@ -0,0 +1,24 @@ +# vim:set ft=sh: +run_hook () +{ + /sbin/modprobe -q dm-mod >/dev/null 2>&1 + if [ -e "/sys/class/misc/device-mapper" ]; then + if [ ! -e "/dev/mapper/control" ]; then + /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + fi + + # If the lvmwait= parameter has been specified on the command line + # wait for the device(s) before trying to activate the volume group(s) + if [ -n "${lvmwait}" ]; then + for pvdev in $(echo ${lvmwait} | sed 's|,| |g'); do + poll_device ${pvdev} ${rootdelay} + done + fi + + [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" + + msg "Activating logical volumes..." + [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit + eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET + fi +} diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install new file mode 100644 index 000000000..0df69f81b --- /dev/null +++ b/testing/lvm2/lvm2_install @@ -0,0 +1,30 @@ +# vim: set ft=sh: + +install () +{ + MODULES=" dm-mod dm-snapshot dm-mirror" + BINARIES="" + FILES="" + SCRIPT="lvm2" + + add_dir "/dev/mapper" + add_binary "/sbin/lvm" + add_binary "/sbin/dmsetup" + add_file "/lib/udev/rules.d/10-dm.rules" + add_file "/lib/udev/rules.d/13-dm-disk.rules" + add_file "/lib/udev/rules.d/95-dm-notify.rules" + add_file "/lib/udev/rules.d/11-dm-lvm.rules" + add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules" +} + +help () +{ +cat<<HELPEOF + This hook loads the necessary modules for an LVM2 root device. + + The optional lvmwait= parameter followed by a comma-separated + list of device names can be given on the command line. + It will cause the hook to wait until all given devices exist + before trying to scan and activate any volume groups. +HELPEOF +} |