diff options
| author | root <root@rshg047.dnsready.net> | 2011-06-09 22:46:45 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-06-09 22:46:45 +0000 |
| commit | 8634a064b17334eb58699897220aeed2fc9a54db (patch) | |
| tree | 8991573625a440a1f27d8da1abb3ae61fa4d0137 | |
| parent | 498f3fc095103b2a220a00b27d43f4dae02d5459 (diff) | |
Thu Jun 9 22:46:45 UTC 2011
50 files changed, 985 insertions, 348 deletions
diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index 3aec09748..70605b513 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 43081 2011-03-23 22:18:26Z spupykin $ +# $Id: PKGBUILD 48949 2011-06-08 09:13:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Adam (byte/jra) <j_adam@web.de> pkgname=lazarus pkgver=0.9.30 -pkgrel=1 +pkgrel=2 pkgdesc='Delphi-like IDE for FreePascal' url='http://www.lazarus.freepascal.org/' license=('GPL2' 'MPL' 'custom:LGPL') @@ -18,6 +18,10 @@ md5sums=('5ece11700df569ebb518ccca37d93f1d') build() { cd $srcdir/${pkgname} make FPC=/usr/bin/fpc clean bigide +} + +package() { + cd $srcdir/${pkgname} # skip the 'make install' mess completely and do everything manually mkdir -p $pkgdir/usr/lib/lazarus $pkgdir/usr/bin $pkgdir/usr/share/man/man1 $pkgdir/usr/share/doc diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD index bb99a60fa..b333bc372 100644 --- a/community/packagekit/PKGBUILD +++ b/community/packagekit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 47014 2011-05-14 04:04:32Z jconder $ +# $Id: PKGBUILD 48954 2011-06-08 10:33:59Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> pkgbase='packagekit' pkgname=('packagekit' 'packagekit-qt' 'packagekit-qt2' 'packagekit-python') -pkgver=0.6.14 -pkgrel=2 +pkgver=0.6.15 +pkgrel=1 pkgdesc="A system designed to make installation and updates of packages easier." arch=('i686' 'x86_64') url="http://www.packagekit.org" @@ -12,17 +12,12 @@ makedepends=('dbus-glib' 'gobject-introspection' 'gtk-doc' 'intltool' 'networkmanager' 'pacman' 'pm-utils' 'polkit' 'python2' 'qt' 'shared-mime-info' 'sqlite3' 'udev') options=('!libtool') -source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.bz2" - 'alpm.patch') -sha256sums=('2efe643be619b6d7db61ccad81261ac7a686cd0000ffd87f04baadec7857e7df' - '774016e27a60ea6588fa6f63363dfa290d7596b3dae29d0a829593ce2e46f38a') +source=("http://www.packagekit.org/releases/PackageKit-$pkgver.tar.bz2") +sha256sums=('52b6d52721253d1b5cdc3b403f4fb366782a258c786d194594deaafbc153779b') build() { cd "$srcdir/PackageKit-$pkgver" - patch -Np1 -i "$srcdir/alpm.patch" - sed -i 's@cache/pacman/pkg@cache/pacman/pkg/@' 'backends/alpm/Makefile.in' - sed -i 's@SUBDIRS = test@SUBDIRS =@' 'backends/Makefile.in' sed -i 's@python @python2 @' 'lib/python/packagekit/Makefile.in' sed -i 's@bin/python@bin/python2@' 'lib/python/packagekit/'*.py diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index 8428d9f3e..4962430fc 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 48916 2011-06-07 16:02:27Z svenstaro $ +# $Id: PKGBUILD 48974 2011-06-09 02:24:35Z svenstaro $ # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> -# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Dan Vratil <progdan@progdansoft.com> # Contributor: thotypous <matiasΘarchlinux-br·org> @@ -11,13 +11,13 @@ pkgbase=qtcreator #pkgname=('qtcreator' 'qtcreator-todo-plugin' 'qtcreator-artisticstyle-plugin') pkgname=('qtcreator' 'qtcreator-todo-plugin') pkgver=2.2.0 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64') url='http://qt.nokia.com/products/developer-tools' license=('LGPL') depends=('qt>=4.7.3') -makedepends=('git' 'qt-private-headers>=4.7.3') +makedepends=('qt-private-headers>=4.7.3') options=('docs') source=("http://get.qt.nokia.com/qtcreator/qt-creator-${pkgver}-src.tar.gz" 'http://download.berlios.de/astyleplugin/ArtisticStylePlugin-0.6-src.zip' @@ -28,8 +28,6 @@ md5sums=('4e02382db7b850f3a3b20c6a8707269e' '734a6f375e595de796f9802087845dfe' '2c3ffbd66845b37be9804f2966815a10') -#_gitroot_todo="git://gitorious.org/qt-creator-todo-plugin/qt-creator-todo-plugin.git" - build() { cd ${srcdir} mkdir build @@ -43,7 +41,7 @@ build() { cd $srcdir/qt-creator-todo-plugin-qt-creator-todo-plugin sed -i "s|QTC_BUILD_DIR = .*|QTC_BUILD_DIR = ${srcdir}/build|g" todoplugin.pro sed -i "s|QTC_SOURCE_DIR = .*|QTC_SOURCE_DIR = $srcdir/qt-creator-${pkgver}-src/|g" todoplugin.pro - sed -i "s|\"2.0.92\"|\"${pkgver}\"|g" todo.pluginspec + sed -i "s|\"2.1.81\"|\"${pkgver}\"|g" todo.pluginspec qmake make @@ -59,7 +57,8 @@ package_qtcreator() { 'cmake: for cmake project suppport' 'openssh-askpass: for ssh support' 'git: for git support' - 'mercurial: for mercurial support') + 'mercurial: for mercurial support' + 'bzr: for bazaar support') cd ${srcdir}/build diff --git a/community/solfege/PKGBUILD b/community/solfege/PKGBUILD index c69ddd790..af0593ccc 100644 --- a/community/solfege/PKGBUILD +++ b/community/solfege/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 42458 2011-03-16 20:03:30Z schiv $ +# $Id: PKGBUILD 48966 2011-06-08 20:39:27Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: sickhate <sickhate@tux-linux.net> pkgname=solfege -pkgver=3.18.7 +pkgver=3.18.8 pkgrel=1 pkgdesc="Music education and ear training software" -arch=(i686 x86_64) +arch=('i686' 'x86_64') url="http://www.solfege.org/" license=('GPL3') depends=('pygtk' 'libgtkhtml') @@ -16,9 +16,9 @@ makedepends=('ghostscript' 'gnome-doc-utils' 'librsvg' 'libxslt' optdepends=('timidity++: Software MIDI support') changelog=$pkgname.changelog install=$pkgname.install -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - solfege.desktop) -md5sums=('c65df6e0eb7a724b8a81e41d23344e02' +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + 'solfege.desktop') +md5sums=('5e166de37f223b79e78c656661828e5d' '22b89dcfd9e7c98ab238942139b8a970') build() { diff --git a/community/solfege/solfege.changelog b/community/solfege/solfege.changelog index 00b82a49e..a2c6f173b 100644 --- a/community/solfege/solfege.changelog +++ b/community/solfege/solfege.changelog @@ -1,19 +1,3 @@ -2011-03-17 Ray Rashif <schiv@archlinux.org> - - * Version bump: 3.18.7 - upstream release - -2010-10-13 Ray Rashif <schiv@archlinux.org> - - * Version bump: 3.18.4 - upstream release - -2010-10-10 Ray Rashif <schiv@archlinux.org> - - * Version bump: 3.18.3 - upstream release - - 2010-10-02 Ray Rashif <schiv@archlinux.org> * Version bump: 3.17.0 diff --git a/community/vtk/PKGBUILD b/community/vtk/PKGBUILD index 359ebf5f1..5ca8bca0f 100644 --- a/community/vtk/PKGBUILD +++ b/community/vtk/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer: Thomas Dziedzic < gostrc at gmail > +# Contributor: Christofer Bertonha <christoferbertonha at gmail dot com> # Contributor: leepesjee <lpeschier at xs4all dot nl> # Contributor: Olivier Medoc # Contributor: ignotus @@ -7,7 +8,7 @@ pkgname=vtk pkgver=5.6.1 -pkgrel=6 +pkgrel=7 pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.' arch=('i686' 'x86_64') url='http://www.vtk.org' @@ -32,7 +33,7 @@ build() { # remove next time version bump sed -i '31 i#include <vtksys/cstddef>' Common/vtkPythonUtil.cxx - # fix for libpng 1.4 + # fix for libpng 1.4 - remove next time version bump for _FILE in `grep -Rl "png_set_gray_1_2_4_to_8" *` do sed -i 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' ${_FILE} @@ -72,9 +73,9 @@ build() { -DVTK_WRAP_JAVA:BOOL=ON \ -DVTK_WRAP_PYTHON:BOOL=ON \ -DVTK_WRAP_TCL:BOOL=ON \ - -DVTK_PYTHON_SETUP_ARGS:STRING="--prefix=${pkgdir}/usr" \ + -DVTK_PYTHON_SETUP_ARGS:STRING="--root=${pkgdir}" \ -DVTK_USE_QT:BOOL=ON \ - -DDESIRED_QT_VERSION:STRING=4 \ + -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \ -DVTK_USE_GUISUPPORT:BOOL=ON \ -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \ -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \ @@ -95,11 +96,6 @@ package() { mv -v ${pkgdir}/usr/lib/${pkgname}-${pkgver:0:3}/java/${pkgname}.jar \ ${pkgdir}/usr/share/java/${pkgname} - # Move the qt-designer plugin to the appropriate location - install -dv ${pkgdir}/usr/lib/qt - mv -v ${pkgdir}/usr/plugins \ - ${pkgdir}/usr/lib/qt - # Install license install -dv ${pkgdir}/usr/share/licenses/${pkgname} install -m644 ${srcdir}/VTK/Copyright.txt \ diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index e63b4f02f..8fdbe0149 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 120920 2011-04-27 11:05:23Z allan $ +# $Id: PKGBUILD 126199 2011-06-02 14:37:57Z bisson $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=coreutils pkgver=8.12 -pkgrel=1 +pkgrel=2 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64') license=('GPL3') @@ -35,8 +35,8 @@ build() { autoreconf -v ./configure --prefix=/usr \ - --enable-install-program=su \ - --enable-no-install-program=groups,hostname,kill,uptime \ + --enable-install-program=su,hostname \ + --enable-no-install-program=groups,kill,uptime \ --enable-pam make } @@ -54,8 +54,8 @@ package() { install -dm755 ${pkgdir}/{bin,usr/sbin} # binaries required by FHS - _fhs="cat chgrp chmod chown cp date dd df echo false ln ls \ - mkdir mknod mv pwd rm rmdir stty su sync true uname" + _fhs="cat chgrp chmod chown cp date dd df echo false hostname \ + ln ls mkdir mknod mv pwd rm rmdir stty su sync true uname" mv ${_fhs} ${pkgdir}/bin # binaries required by various Arch scripts diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD index fa31f11ed..f9479bd84 100644 --- a/core/iproute2/PKGBUILD +++ b/core/iproute2/PKGBUILD @@ -1,15 +1,17 @@ -# $Id: PKGBUILD 107230 2011-01-22 18:51:34Z ronald $ +# $Id: PKGBUILD 126335 2011-06-04 22:38:16Z tomegun $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 -pkgver=2.6.37 -pkgrel=1 +pkgver=2.6.38 +pkgrel=3 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') license=('GPL2') url="http://www.linux-foundation.org/en/Net:Iproute2" -depends=('linux-atm' 'perl') +depends=('perl') +makedepends=('linux-atm') +optdepends=('linux-atm: ATM support') provides=('iproute') conflicts=('iproute') replaces=('iproute') @@ -18,7 +20,7 @@ backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_pro 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.bz2 'iproute2-fhs.patch') -sha1sums=('7852fb66fb745dc3c1fabee24d7d8ff017c48d36' +sha1sums=('e9f6d457a06866a2a20a6cba6b3a039b2ec3e14a' '2416b11252364d7a6c742eabb4a6924a75637a46') build() { @@ -37,6 +39,11 @@ package() { make DESTDIR=$pkgdir install + # allow loopback to be started before /usr is mounted, this may not be supported in the future + mkdir -p ${pkgdir}/sbin + mv ${pkgdir}/usr/sbin/ip ${pkgdir}/sbin/ip + ln -s /sbin/ip ${pkgdir}/usr/sbin/ip + # libnetlink isn't installed, install it FS#19385 install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD index b50b5669d..d9b2380bc 100644 --- a/core/net-tools/PKGBUILD +++ b/core/net-tools/PKGBUILD @@ -1,18 +1,16 @@ -# $Id: PKGBUILD 38718 2009-05-10 07:37:29Z tpowa $ +# $Id: PKGBUILD 126212 2011-06-02 16:50:35Z bisson $ # Maintainer: judd <jvinet@zeroflux.org> pkgname=net-tools pkgver=1.60 -pkgrel=14 +pkgrel=16 pkgdesc="Configuration tools for Linux networking" arch=(i686 x86_64) license=('GPL') url="http://www.tazenda.demon.co.uk/phil/net-tools" -groups=('base') depends=('glibc') -backup=('etc/conf.d/nisdomainname') source=(http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2 net-tools.patch gcc340.patch net-tools-1.60-2.6-compilefix.patch - net-tools-1.60-miiioctl.patch nisdomainname.conf.d + net-tools-1.60-miiioctl.patch net-tools-1.60-nameif.patch net-tools-1.60-nameif_strncpy.patch) options=(!makeflags) @@ -21,20 +19,25 @@ md5sums=('888774accab40217dde927e21979c165' 'b52d899cba9956bb0055150506f41ac1' '51de6eabe2d6d6dc860f72c41cee636b' 'c16109863bc63f3dad4ef35305a340bb' - 'af3eef5d4837939f7858eec692aa4671' '29a32617382fab1735acba4d920f1fcd' 'e66466b9304dac85eb42b32f1ec3b284') build() { cd $srcdir/$pkgname-$pkgver - patch -Np1 -i ../net-tools.patch || return 1 - patch -Np1 -i ../net-tools-1.60-2.6-compilefix.patch || return 1 - patch -Np1 -i ../net-tools-1.60-miiioctl.patch || return 1 - patch -Np1 -i ../gcc340.patch || return 1 - patch -Np1 -i ${srcdir}/net-tools-1.60-nameif.patch || return 1 - patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch || return 1 - yes "" | make || return 1 + patch -Np1 -i ../net-tools.patch + patch -Np1 -i ../net-tools-1.60-2.6-compilefix.patch + patch -Np1 -i ../net-tools-1.60-miiioctl.patch + patch -Np1 -i ../gcc340.patch + patch -Np1 -i ${srcdir}/net-tools-1.60-nameif.patch + patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch + yes "" | make +} + +package() { + cd $srcdir/$pkgname-$pkgver make BASEDIR=$pkgdir update - install -D -m644 ../nisdomainname.conf.d \ - $pkgdir/etc/conf.d/nisdomainname + + # the following is provided by yp-tools and coreutils + rm "${pkgdir}"/bin/{{,dns,nis,yp}domainname,hostname} + rm "${pkgdir}"/usr/share/man/man1/{{,dns,nis,yp}domainname,hostname}.1 } diff --git a/core/udev/81-arch.rules b/core/udev/81-arch.rules index 3e71a9118..cd4e3e9b4 100644 --- a/core/udev/81-arch.rules +++ b/core/udev/81-arch.rules @@ -19,37 +19,6 @@ # global stuff # -##################################### -###### Hotplug rules - begin -# Only additional modules, -# which are not detectable, -# are loaded here! -##################################### -# check if the device has already been claimed by a driver -ACTION!="add", GOTO="drivers_end" - -#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" -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNPb02f", RUN+="/lib/udev/load-modules.sh analog" - -# PARPORT addon modules -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh lp" -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh ppdev" - -# fix ide cdrom detection on old proliant servers -SUBSYSTEM=="pci", ENV{MODALIAS}=="pci:v00000E11d00000001sv00000000sd00000000bc06sc02i00", RUN+="/lib/udev/load-modules.sh ide-generic" - -LABEL="drivers_end" -##################################### -##### Hotplug rules - end -##################################### - -##################################### -# Additional Archlinux -# Permissions and Symlinks - begin -##################################### - # permission for sg devices KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660" diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index 0db5f45cf..b80fd7707 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 125635 2011-05-27 11:47:52Z tomegun $ +# $Id: PKGBUILD 126202 2011-06-02 14:49:12Z tomegun $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> @@ -7,7 +7,7 @@ pkgbase="udev" pkgname=('udev' 'udev-compat') pkgver=171 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" license=('GPL') @@ -16,15 +16,15 @@ groups=('base') options=(!makeflags !libtool) makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 - 80-drivers.rules - 81-arch.rules - load-modules.sh - static-audio-nodes-permissions.patch) + 81-arch.rules + static-audio-nodes-group.patch + static-nodes-permissions.patch) build() { cd $srcdir/$pkgbase-$pkgver # fix https://bugs.archlinux.org/task/24362 (will be in udev-172) - patch -Np1 -i ../static-audio-nodes-permissions.patch + patch -Np1 -i ../static-audio-nodes-group.patch + patch -Np1 -i ../static-nodes-permissions.patch ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\ --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system\ --disable-rule-generator @@ -43,12 +43,8 @@ package_udev() { cd $srcdir/$pkgbase-$pkgver make DESTDIR=${pkgdir} install - # Replace original 80-drivers.rules with custom one. - install -D -m644 $srcdir/80-drivers.rules $pkgdir/lib/udev/rules.d/80-drivers.rules # Install our rule for permissions and symlinks 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 # create framebuffer blacklist mkdir -p $pkgdir/etc/modprobe.d/ @@ -100,7 +96,6 @@ package_udev-compat() { install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules } md5sums=('bdf4617284be2ecac11767437417e209' - '4427855146513a4703ab5c7eb8a0156e' - 'd8725e64fd0ce6e784ae795fae424c0a' - 'f91fddc67609b45b244a624977c4247b' - '4f625aea95a5597afd8cdf189421f193') + '6ee44e3feb8e0f037947e7d4ca273f12' + '4f625aea95a5597afd8cdf189421f193' + 'f9e50b8dfcd2215f5423ff9bc04ecf68') diff --git a/core/udev/static-audio-nodes-group.patch b/core/udev/static-audio-nodes-group.patch new file mode 100644 index 000000000..b1fc4f935 --- /dev/null +++ b/core/udev/static-audio-nodes-group.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/static-nodes-permissions.patch b/core/udev/static-nodes-permissions.patch new file mode 100644 index 000000000..51e6ad6bc --- /dev/null +++ b/core/udev/static-nodes-permissions.patch @@ -0,0 +1,57 @@ +From c112873b5bc9ebbae39c32f502bc6211f33546cc Mon Sep 17 00:00:00 2001 +From: Kay Sievers <kay.sievers@vrfy.org> +Date: Mon, 30 May 2011 02:12:02 +0200 +Subject: [PATCH 1/2] rules: static_node - use 0660 if group is given to get + the cigar + +>> On Tue, May 24, 2011 at 15:33, Tom Gundersen <teg@jklm.no> wrote: +> +> Close, but no cigar. Looks like the static nodes are not assigned +> permissions 0660 even if a gid is set (the nodes have perms 0600). +> +> Cheers, +> +> Tom +--- + udev/udev-rules.c | 10 ++++++++-- + 1 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/udev/udev-rules.c b/udev/udev-rules.c +index 48395e7..56a258d 100644 +--- a/udev/udev-rules.c ++++ b/udev/udev-rules.c +@@ -2709,8 +2709,9 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules) + case TK_A_STATIC_NODE: { + char filename[UTIL_PATH_SIZE]; + struct stat stats; ++ + /* we assure, that the permissions tokens are sorted before the static token */ +- if (mode == 0 && uid == 0 && gid == 0) ++ if (uid == 0 && gid == 0) + goto next; + util_strscpyl(filename, sizeof(filename), udev_get_dev_path(rules->udev), "/", + &rules->buf[cur->key.value_off], NULL); +@@ -2718,14 +2719,19 @@ void udev_rules_apply_static_dev_perms(struct udev_rules *rules) + goto next; + if (!S_ISBLK(stats.st_mode) && !S_ISCHR(stats.st_mode)) + goto next; +- if (mode != 0 && mode != (stats.st_mode & 0777)) { ++ ++ if (mode == 0 && gid > 0) ++ mode = 0660; ++ if (mode != (stats.st_mode & 0777)) { + chmod(filename, mode); + info(rules->udev, "chmod '%s' %#o\n", filename, mode); + } ++ + if ((uid != 0 && uid != stats.st_uid) || (gid != 0 && gid != stats.st_gid)) { + chown(filename, uid, gid); + info(rules->udev, "chown '%s' %u %u\n", filename, uid, gid); + } ++ + utimensat(AT_FDCWD, filename, NULL, 0); + break; + } +-- +1.7.5.2 + diff --git a/core/udev/udev.install b/core/udev/udev.install index b2ed69467..5c02dd15b 100644 --- a/core/udev/udev.install +++ b/core/udev/udev.install @@ -22,6 +22,22 @@ post_upgrade() { echo "Errors are now logged (possibly to the console) by default." echo "---------------" fi + if [ "$(vercmp $2 172)" -lt 0 ]; then + echo "ATTENTION UDEV:" + echo "---------------" + echo "Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and" + echo "blacklisting in MODULES no longer works." + echo "See 'man modprobe.conf' for a replacement to blacklisting." + echo "To disable a module mod1 on the kernel command line, use" + echo "mod1.disable=1" + echo "or" + echo "modprobe.blacklist=mod1" + echo " --" + echo "The following modules are no longer unconditionally loaded:" + echo " pcspkr irtty-sir analog lp ppdev ide-generic" + echo "Add them to MODULES in rc.conf if you need them." + echo "---------------" + fi } post_install() { diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 2cd51fe07..63f079778 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 118164 2011-04-05 16:57:59Z bisson $ +# $Id: PKGBUILD 126809 2011-06-07 12:12:31Z bisson $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi pkgver=0.6.30 -pkgrel=2 +pkgrel=3 pkgdesc='A multicast/unicast DNS-SD framework' arch=('i686' 'x86_64') url='http://www.avahi.org/' @@ -27,54 +27,49 @@ conflicts=('howl' 'mdnsresponder') provides=('howl' 'mdnsresponder') replaces=('howl' 'mdnsresponder') options=('!libtool') -source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz - avahi-daemon-dbus.patch - gnome-nettool.png) +source=("http://www.avahi.org/download/avahi-${pkgver}.tar.gz" + 'avahi-daemon-dbus.patch' + 'gnome-nettool.png') sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06' - '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61' + '36735096a6eeb3a4012fe14f875259ee8558e220' 'cf56387c88aed246b9f435efc182ef44de4d52f3') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf - patch -Np0 -i "${srcdir}/avahi-daemon-dbus.patch" + sed -i 's/netdev/network/g' avahi-daemon/avahi-dbus.conf + patch -p1 -i "../avahi-daemon-dbus.patch" - # pygtk requires python2; make it explicit in case other python are installed: FS#21865 - PYTHON=python2 \ - PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \ - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --disable-monodoc \ - --disable-doxygen-doc \ - --disable-xmltoman \ - --enable-compat-libdns_sd \ - --enable-compat-howl \ - --with-distro=archlinux \ - --with-avahi-priv-access-group=network \ - --with-autoipd-user=avahi \ - --with-autoipd-group=avahi \ - --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999 + # pygtk requires python2; make it explicit in case other python are installed: FS#21865 + PYTHON=python2 \ + PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \ + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --disable-monodoc \ + --disable-doxygen-doc \ + --disable-xmltoman \ + --enable-compat-libdns_sd \ + --enable-compat-howl \ + --with-distro=archlinux \ + --with-avahi-priv-access-group=network \ + --with-autoipd-user=avahi \ + --with-autoipd-group=avahi \ + --with-systemdsystemunitdir=/lib/systemd/system # See FS#20999 - make + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m 644 ../gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png - make DESTDIR="${pkgdir}" install - - # howl and mdnsresponder compatability - cd "${pkgdir}"/usr/include - ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h - ln -s avahi-compat-howl howl - cd "${pkgdir}"/usr/lib/pkgconfig - ln -s avahi-compat-howl.pc howl.pc - - sed -i '1c #!/usr/bin/python2' "$pkgdir"/usr/bin/avahi-{bookmarks,discover} - - install -D -m 644 "${srcdir}"/gnome-nettool.png "${pkgdir}"/usr/share/pixmaps/gnome-nettool.png + cd "${pkgdir}" + sed -i '1c #!/usr/bin/python2' usr/bin/avahi-{bookmarks,discover} + # howl and mdnsresponder compatability + (cd usr/include; ln -s avahi-compat-libdns_sd/dns_sd.h dns_sd.h; ln -s avahi-compat-howl howl) + (cd usr/lib/pkgconfig; ln -s avahi-compat-howl.pc howl.pc) } diff --git a/extra/avahi/avahi-daemon-dbus.patch b/extra/avahi/avahi-daemon-dbus.patch index a168f0387..ef7272082 100644 --- a/extra/avahi/avahi-daemon-dbus.patch +++ b/extra/avahi/avahi-daemon-dbus.patch @@ -1,11 +1,11 @@ ---- initscript/archlinux/avahi-daemon.in 2010-08-17 22:23:46.510293144 +0200 -+++ initscript/archlinux/avahi-daemon.in 2010-08-17 22:46:58.110163026 +0200 -@@ -33,6 +35,8 @@ +diff -aur old/initscript/archlinux/avahi-daemon.in new/initscript/archlinux/avahi-daemon.in +--- old/initscript/archlinux/avahi-daemon.in 2010-06-29 05:30:35.000000000 +0200 ++++ new/initscript/archlinux/avahi-daemon.in 2011-06-07 12:20:03.237701492 +0200 +@@ -33,6 +33,7 @@ case "$1" in start) + ck_daemon dbus && /etc/rc.d/dbus start -+ modprobe capability &> /dev/null stat_busy "Starting $DESC" $DAEMON -D > /dev/null 2>&1 if [ $? -gt 0 ]; then diff --git a/extra/nx-common/PKGBUILD b/extra/nx-common/PKGBUILD index ae282c3c4..85fc78ce6 100644 --- a/extra/nx-common/PKGBUILD +++ b/extra/nx-common/PKGBUILD @@ -1,58 +1,54 @@ -# $Id: PKGBUILD 75689 2010-04-02 17:16:35Z andyrtr $ -# Maintainer Tobias Powalowski <tpowa@archlinux.org> +# $Id: PKGBUILD 126698 2011-06-06 18:56:52Z andyrtr $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> + pkgname=nx-common -pkgver=3.4.0 -pkgrel=4 +pkgver=3.5.0 +pkgrel=1 pkgdesc="NoMachine NX common package for client and server" arch=('i686' 'x86_64') license=('GPL') url="http://nomachine.com/" -depends=('libjpeg>=8' 'libpng>=1.4.0' 'openssl>=1.0.0' 'gcc-libs' 'audiofile' 'alsa-lib' 'bash') -source=(\ -#Compression libs and proxy sources -http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-7.tar.gz \ -http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz \ -# ESD Support -http://64.34.161.181/download/$pkgver/sources/nxesd-$pkgver-2.tar.gz -# 64bit fixes -NXproto.h.64bit.diff -nx-gcc44.patch) +depends=('libjpeg-turbo>=1.1.1' 'libpng>=1.4.5' 'openssl>=1.0.0' 'gcc-libs' 'bash') +makedepends=('xorg-server-devel') +source=( #Compression libs and proxy sources + http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-1.tar.gz + http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz + http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-1.tar.gz + nxcompsh-gcc43.patch) options=(!libtool) -md5sums=('cba926f2b855231a8fc3e0dabff52855' - '18b81d850223ea84de244f8a9509c4b1' - '65d55f2a86baa59343432261cabd52ec' - '58341ba70dfab92ff38570071fbbf88a' - 'c805442f1500d8d6de15ec224f63277e') +md5sums=('30a182146479004ec63b8a1b9adccfcf' + '84ade443b79ea079380b754aba9d392e' + '9f13262bc0bf5187fcc7e22924955bc7' + 'b6c279654dac421fc3dd1a27d66ff53c') build() { - cd ${srcdir} -# patch -Np1 -i ${srcdir}/nx-gcc44.patch - + # nxcomp + cd ${srcdir}/nxcomp + ./configure --prefix=/opt/NX + make + # nxcompsh + cd ${srcdir}/nxcompsh + patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch + ./configure --prefix=/opt/NX + make + # nxssh + cd ${srcdir}/nxssh + ./configure --prefix=/opt/NX + make +} + +package() { mkdir -p ${pkgdir}/opt/NX/bin mkdir -p ${pkgdir}/opt/NX/lib + # nxcomp cd ${srcdir}/nxcomp - if [ "$CARCH" = "x86_64" ]; then - patch -Np1 -i ../NXproto.h.64bit.diff || return 1 - fi - - ./configure --prefix=/opt/NX - make || return 1 - cp -a libXcomp.so.* ${pkgdir}/opt/NX/lib - cd ${pkgdir}/opt/NX/lib - ln -s libXcomp.so.1 libXcomp.so - + cp -a libXcomp.so* ${pkgdir}/opt/NX/lib + # nxcompsh + cd ${srcdir}/nxcompsh + cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib + # nxssh cd ${srcdir}/nxssh - ./configure --prefix=/opt/NX - make || return 1 install -D -m755 nxssh ${pkgdir}/opt/NX/bin/nxssh - - cd ${srcdir}/nxesd - ./configure --prefix=/opt/NX - make || return 1 - make DESTDIR=${pkgdir} install || return 1 - # fix libxcomp linking - cd ${pkgdir}/opt/NX/lib - ln -s libXcomp.so.3 libXcomp.so.1 } diff --git a/extra/nx-common/nxcompsh-gcc43.patch b/extra/nx-common/nxcompsh-gcc43.patch new file mode 100644 index 000000000..681a0dab5 --- /dev/null +++ b/extra/nx-common/nxcompsh-gcc43.patch @@ -0,0 +1,19 @@ +--- nxcompsh/Misc.h~ 2007-06-04 13:39:49.000000000 +0200 ++++ nxcompsh/Misc.h 2008-04-12 12:46:24.000000000 +0200 +@@ -18,10 +18,12 @@ + #ifndef Misc_H + #define Misc_H + +-#include <iostream.h> ++#include <iostream> + +-#include <errno.h> +-#include <string.h> ++#include <cerrno> ++#include <cstring> ++ ++using namespace std; + + // + // Error handling macros. + diff --git a/extra/nxserver/PKGBUILD b/extra/nxserver/PKGBUILD index 5609baf0b..99b5bc2aa 100644 --- a/extra/nxserver/PKGBUILD +++ b/extra/nxserver/PKGBUILD @@ -1,96 +1,92 @@ -# $Id: PKGBUILD 109665 2011-02-11 18:01:54Z andyrtr $ +# $Id: PKGBUILD 126704 2011-06-06 19:21:37Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> pkgname=nxserver -pkgver=3.4.0 -pkgrel=8 +pkgver=3.5.0 +pkgrel=1 pkgdesc="NoMachine NX is the next-generation X compression and roundtrip suppression scheme." arch=(i686 x86_64) url="http://nomachine.com/" license=('GPL') -depends=("nx-common>=$pkgver" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8' +depends=("nx-common" 'libxaw' 'libxrender' 'libxp' 'gcc-libs' 'libjpeg>=8' #>=$pkgver 'libxpm' 'libpng>=1.4.0' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'freetype2' 'xorg-sessreg') makedepends=('imake') source=( #X11 support programs and libraries -http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-4.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-7.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxauth-$pkgver-3.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-7.tar.gz +http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-1.tar.gz +http://64.34.161.181/download/$pkgver/sources/nxwin-$pkgver-1.tar.gz +http://64.34.161.181/download/$pkgver/sources/nxauth-$pkgver-1.tar.gz +http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-1.tar.gz # needed to provide NX.h and -LXcomp - part of nx-common #X11 Agent sources -http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-16.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-2.tar.gz +http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-2.tar.gz +http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz # needed to get X11 built - part of nx-common #Compression libs and proxy sources -http://64.34.161.181/download/$pkgver/sources/nxproxy-$pkgver-2.tar.gz +http://64.34.161.181/download/$pkgver/sources/nxproxy-$pkgver-1.tar.gz http://64.34.161.181/download/$pkgver/sources/nxcompext-$pkgver-1.tar.gz -http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-3.tar.gz -#64bit fixes -NXproto.h.64bit.diff +http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-2.tar.gz # gcc 43 fix -nxcompsh-gcc43.patch -nxcompshad-gcc43.patch -nx-gcc44.patch) +nxcompsh-gcc43.patch) options=(!libtool) -md5sums=('38a84d4521a41e5ff988a84181ddcaf5' - 'f45d183360067ede979c18fc964824ab' - 'bfb758edd51271b31aa6b902557fa0cc' - 'cba926f2b855231a8fc3e0dabff52855' - 'ec82183635a6ef627cb19d53d4a004ce' - 'f94501249ad7d4453524f88ef0cfb1ff' - '95ce93520d463a3d18cdd5d19c321e85' - '605a8e2a136f89477f0059a0d2af4582' - '15deba68e12e13b524a723b49e7ec813' - '58341ba70dfab92ff38570071fbbf88a' - 'b6c279654dac421fc3dd1a27d66ff53c' - '01cea8bc5997ae2c3790cbcb7d624c86' - 'c805442f1500d8d6de15ec224f63277e') +md5sums=('54ac7dd8806928b991b0819cf76b37dd' + '271cef5b5345b8de77b0f6a0ce1a3b0d' + 'cf38ec1e5a5f6453946cd387c14f2684' + '30a182146479004ec63b8a1b9adccfcf' + '7b0f60d5a3c54f22da7d81aac055836e' + '84ade443b79ea079380b754aba9d392e' + '488bb4d9b8e9f82dc272b4e6e9c57d30' + 'abde2ccc33e31fc695031c2cfb60f3dd' + '90a762dd9eb19c8c97876ad837923857' + 'b6c279654dac421fc3dd1a27d66ff53c') build() { cd ${srcdir} - mkdir -p ${pkgdir}/opt/NX/bin - mkdir -p ${pkgdir}/opt/NX/lib - patch -Np0 -i ${srcdir}/nxcompsh-gcc43.patch || return 1 - patch -Np0 -i ${srcdir}/nxcompshad-gcc43.patch || return 1 -# patch -Np1 -i ../nx-gcc44.patch || return 1 - + + # nxcomp cd ${srcdir}/nxcomp - if [ "$CARCH" = "x86_64" ]; then - patch -Np1 -i ../NXproto.h.64bit.diff || return 1 - fi ./configure --prefix=/opt/NX - make || return 1 - + make + # nxcompshad cd ${srcdir}/nxcompshad ./configure --prefix=/opt/NX - make || return 1 - cp -a libXcompshad.so* ${pkgdir}/opt/NX/lib - + make + # nxcompsh cd ${srcdir}/nxcompsh + patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch ./configure --prefix=/opt/NX - make || return 1 - cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib - + make + # nxproxy cd ${srcdir}/nxproxy ./configure --prefix=/opt/NX - make || return 1 - make prefix=${pkgdir}/opt/NX install || return 1 + make + # nx-X11 + cd ${srcdir}/nx-X11 + make World + # nxcompext + cd ${srcdir}/nxcompext + ./configure --prefix=/opt/NX + make +} +package() { + mkdir -p ${pkgdir}/opt/NX/bin + mkdir -p ${pkgdir}/opt/NX/lib + + # nxcompshad + cd ${srcdir}/nxcompshad + cp -a libXcompshad.so* ${pkgdir}/opt/NX/lib + # nxproxy + cd ${srcdir}/nxproxy + make prefix=${pkgdir}/opt/NX install + # nx-X11 cd ${srcdir}/nx-X11 - make World || return 1 cp -a lib/X11/libX11.so* ${pkgdir}/opt/NX/lib cp -a lib/Xext/libXext.so* ${pkgdir}/opt/NX/lib cp -a lib/Xrender/libXrender.so* ${pkgdir}/opt/NX/lib install -D -m755 programs/Xserver/nxagent ${pkgdir}/opt/NX/bin/nxagent install -D -m755 programs/nxauth/nxauth ${pkgdir}/opt/NX/bin/nxauth - + # nxcompext cd ${srcdir}/nxcompext - ./configure --prefix=/opt/NX - make || return 1 cp -a libXcompext.so* ${pkgdir}/opt/NX/lib - - # fix libXcompext linking - cd ${pkgdir}/opt/NX/lib - ln -s libXcompext.so.3 libXcompext.so.1 -} +}
\ No newline at end of file diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD index 306b2e386..6b490bb32 100644 --- a/extra/openjdk6/PKGBUILD +++ b/extra/openjdk6/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 126340 2011-06-04 23:48:31Z andyrtr $ +# $Id: PKGBUILD 126852 2011-06-08 05:53:21Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> @@ -6,12 +6,12 @@ pkgname=('openjdk6' 'openjdk6-src') pkgbase="openjdk6" #_date=20100715 _javaver=6 -_icedteaver=1.10.1 +_icedteaver=1.10.2 _openjdk_version=b22 _openjdk_date=28_feb_2011 #pkgver=${_javaver}.${_openjdk_version}_0.hg_${_date} pkgver=${_javaver}.${_openjdk_version}_${_icedteaver} -pkgrel=2 +pkgrel=1 url='http://icedtea.classpath.org' arch=('i686' 'x86_64') license=('custom') @@ -32,7 +32,7 @@ source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar openjdk6.profile openjdk6.profile.csh) noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz) -md5sums=('f3b31b9f591afc752372addacb1eb335' +md5sums=('83041b2d0de66cb5289813cc6f05af11' '2d2bbbb0f9b81f1fec41ec730da8a933' 'ef7a8b3624ea904bf584bc46d79b5e75' '91adfd41e6f001add4f92ae31216b1e3' @@ -40,7 +40,7 @@ md5sums=('f3b31b9f591afc752372addacb1eb335' '5da3e39fa60985576c4f37d1491efbe2' 'f7e7a212e50abb56a6ef1a2b1bd27405' 'ee1afda124d5927345014ab382ef581e' - '409812b5675f9678b1c9e1a12a945a9a' + '9b4d368f5ee08de248eaf029303a446c' '74c4a7adc782edd087802bf92ae3d6d0' 'fdf295e2f186dfa4d308691a3d7ac8c5') diff --git a/extra/openjdk6/nonreparenting-wm.diff b/extra/openjdk6/nonreparenting-wm.diff index ec890b434..65fa66e89 100644 --- a/extra/openjdk6/nonreparenting-wm.diff +++ b/extra/openjdk6/nonreparenting-wm.diff @@ -2,22 +2,16 @@ diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWM.java b/jdk/src/solaris/clas index 68d1ff7..878327e 100644 --- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java +++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java -@@ -98,11 +98,14 @@ class XWM implements MWMConstants, XUtilConstants { - ICE_WM = 10, +@@ -99,7 +99,8 @@ METACITY_WM = 11, COMPIZ_WM = 12, -- LG3D_WM = 13; -+ LG3D_WM = 13, -+ OTHER_NONREPARENTING_WM = 14; + LG3D_WM = 13, +- MUTTER_WM = 14; ++ MUTTER_WM = 14, ++ OTHER_NONREPARENTING_WM = 15; public String toString() { switch (WMID) { case NO_WM: - return "NO WM"; -+ case OTHER_NONREPARENTING_WM: -+ return "Other non-reparenting WM"; - case OTHER_WM: - return "Other WM"; - case OPENLOOK_WM: @@ -564,7 +567,7 @@ class XWM implements MWMConstants, XUtilConstants { } diff --git a/extra/qemu-kvm/PKGBUILD b/extra/qemu-kvm/PKGBUILD index 8e1165edc..04b21679e 100644 --- a/extra/qemu-kvm/PKGBUILD +++ b/extra/qemu-kvm/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 124173 2011-05-17 12:44:55Z tpowa $ +# $Id: PKGBUILD 126938 2011-06-08 20:01:54Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=qemu-kvm -pkgver=0.14.0 +pkgver=0.14.1 pkgrel=2 pkgdesc="Latest KVM QEMU is a generic and open source processor emulator which achieves a good emulation speed by using dynamic translation." arch=(i686 x86_64) @@ -53,5 +53,5 @@ package() esac done } -md5sums=('4ea6f412d85a826e0b0690f5c4c59f13' +md5sums=('ed37a2c0b1981220b842920140574c63' 'b316a066d2f1bb57d8f5b7ea1d0d1caf') diff --git a/extra/unison/PKGBUILD b/extra/unison/PKGBUILD index 021950ef5..059ab98a2 100644 --- a/extra/unison/PKGBUILD +++ b/extra/unison/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 110780 2011-02-22 07:48:24Z tpowa $ +# $Id: PKGBUILD 126943 2011-06-08 20:05:25Z tpowa $ #Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=unison -pkgver=2.40.61 -pkgrel=1 +pkgver=2.40.63 +pkgrel=2 pkgdesc="Unison is a file-synchronization tool" arch=(i686 x86_64) license=('GPL2') @@ -42,5 +42,5 @@ build() { cd $startdir/pkg//usr/bin ln -s unison-gtk2 unison-x11 } -md5sums=('9d48796b115704321c6a4a50dd0928ee' +md5sums=('3281207850cf6f0a17fe73f371893bd3' '2daecba7705455a8e4b769e48b059872') diff --git a/extra/yp-tools/PKGBUILD b/extra/yp-tools/PKGBUILD index 9d09fd38a..8cf4b6960 100644 --- a/extra/yp-tools/PKGBUILD +++ b/extra/yp-tools/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 91704 2010-09-27 17:42:28Z bisson $ -# Maintainer: dorphell <dorphell@archlinux.org> +# $Id: PKGBUILD 126193 2011-06-02 14:34:36Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=yp-tools pkgver=2.12 -pkgrel=1 +pkgrel=2 pkgdesc='Linux NIS Tools' arch=('i686' 'x86_64') url='http://www.linux-nis.org/nis/yp-tools/' license=('GPL2') -depends=('ypbind-mt' 'glibc') +depends=('ypbind-mt') source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz") sha1sums=('10b0ef5d4c5723e0716d7a1431a900c0ba6ef703') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --disable-domainname + ./configure --prefix=/usr make } diff --git a/extra/ypbind-mt/PKGBUILD b/extra/ypbind-mt/PKGBUILD index ddb807725..45cf58258 100644 --- a/extra/ypbind-mt/PKGBUILD +++ b/extra/ypbind-mt/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 123631 2011-05-11 23:05:30Z bisson $ +# $Id: PKGBUILD 126308 2011-06-04 12:37:21Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=ypbind-mt pkgver=1.33 -pkgrel=1 +pkgrel=2 pkgdesc='Linux NIS daemon' arch=('i686' 'x86_64') url='http://www.linux-nis.org/nis/ypbind-mt/' license=('GPL2') depends=('rpcbind' 'openslp') -backup=('etc/yp.conf' 'etc/conf.d/ypbind') +optdepends=('yp-tools: to set a domain name') +backup=('etc/yp.conf' 'etc/conf.d/ypbind' 'etc/conf.d/nisdomainname') source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz" + 'nisdomainname.conf' 'ypbind.conf' 'ypbind') sha1sums=('49f578d15aa5d4f4130a2e96cd9c0e519263fc88' + 'eb00aecc0679e25a36b007e797f4468b40cb3e8e' '07dee386d001fb9e9e6b76dda8af5b2092e5a4a2' - '66f6ea2f622e0724e6017bf835d4f7f4a5bf9534') + '112fc2aedfe3f761325b69647b7938bc1be5bfcd') build() { cd "$srcdir/$pkgname-$pkgver" @@ -31,5 +34,6 @@ package() { install -D -m644 etc/yp.conf "$pkgdir"/etc/yp.conf install -D -m755 ../ypbind "$pkgdir"/etc/rc.d/ypbind install -D -m644 ../ypbind.conf "$pkgdir"/etc/conf.d/ypbind + install -D -m644 ../nisdomainname.conf "$pkgdir"/etc/conf.d/nisdomainname install -d -m755 "$pkgdir"/var/yp/binding } diff --git a/extra/ypbind-mt/nisdomainname.conf b/extra/ypbind-mt/nisdomainname.conf new file mode 100644 index 000000000..bbbbf8fc7 --- /dev/null +++ b/extra/ypbind-mt/nisdomainname.conf @@ -0,0 +1,4 @@ +# +# NIS domain to be set in /etc/rc.d/ypbind +# +NISDOMAINNAME="" diff --git a/extra/ypbind-mt/ypbind b/extra/ypbind-mt/ypbind index 5ef5cf5b3..6a5ef11e3 100755 --- a/extra/ypbind-mt/ypbind +++ b/extra/ypbind-mt/ypbind @@ -2,35 +2,34 @@ . /etc/rc.conf . /etc/rc.d/functions + . /etc/conf.d/ypbind +. /etc/conf.d/nisdomainname + +name=ypbind +PID=$(pidof -o %PPID /usr/sbin/ypbind) case "$1" in - start) - stat_busy "Starting NIS Bind Daemon" - [ -f /etc/defaultdomain ] && /bin/domainname -F /etc/defaultdomain - /usr/sbin/ypbind $YPBIND_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon ypbind - stat_done - fi - ;; - stop) - stat_busy "Stopping NIS Bind Daemon" - killall -q /usr/sbin/ypbind - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon ypbind - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" +start) + stat_busy "Starting $name daemon" + [[ -n $NISDOMAINNAME ]] && /usr/bin/domainname "$NISDOMAINNAME" &>/dev/null + [[ -z "$PID" ]] && /usr/sbin/ypbind $YPBIND_ARGS &>/dev/null \ + && { add_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +stop) + stat_busy "Stopping $name daemon" + [[ -n "$PID" ]] && kill $PID &>/dev/null \ + && { rm_daemon $name; stat_done; } \ + || { stat_fail; exit 1; } + ;; +restart) + $0 stop + sleep 1 + $0 start + ;; +*) + echo "usage: $0 {start|stop|restart}" + exit 1 + ;; esac diff --git a/libre/hardinfo/ChangeLog b/libre/hardinfo/ChangeLog new file mode 100644 index 000000000..faf242a7b --- /dev/null +++ b/libre/hardinfo/ChangeLog @@ -0,0 +1,20 @@ +2009-04-06 Eric Belanger <eric@archlinux.org> + + * hardinfo 0.5.1-1 + * Upstream update + +2009-03-29 Eric Belanger <eric@archlinux.org> + + * hardinfo 0.5c-1 + * Upstream update + +2008-08-13 Eric Belanger <eric@archlinux.org> + + * hardinfo 0.4.2.3-3 + * Rebuilt against gnutls 2.4.1 + +2008-04-06 Eric Belanger <eric@archlinux.org> + + * hardinfo 0.4.2.3-2 + * Rebuilt against libsoup 2.4 + * Added ChangeLog diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD new file mode 100644 index 000000000..869d2f52a --- /dev/null +++ b/libre/hardinfo/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 17993 2010-05-29 04:49:43Z ebelanger $ +# Maintainer: Eric Belanger <eric@archlinux.org> + +pkgname=hardinfo +pkgver=0.5.1 +pkgrel=2.1 +pkgdesc="A system information and benchmark tool." +arch=('i686' 'x86_64') +url="http://hardinfo.berlios.de/wiki/index.php/Main_Page" +license=('GPL2') +depends=('gtk2' 'libsoup' 'gnutls') +options=('!emptydirs') +source=(http://download.berlios.de/hardinfo/${pkgname}-${pkgver}.tar.bz2 \ + fixsensors.patch hardinfo.distro) +md5sums=('6fb38992e140f2fab16518ae1f38e188' + '05c212db07b9f152cdea052ff7bb28fa' + '2c609f4b3c7f202d043bdef082c2bef0') +sha1sums=('983f0445aa60e02156bc5a5eaedeffb30b8e4d64' + 'd2151dce76dca238102937d0e15541f172bca530' + '9425e09191cd3a365a3afce57ca1973a6439fa57') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 < ../fixsensors.patch + sed -i 's|/usr/lib64|/usr/lib|' configure + ./configure --prefix=/usr + sed -i 's|lib64|lib|' binreloc.c + sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/linux/{parisc,ppc,m68k,x86,common,mips,sparc,x86_64}/modules.h + sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/this/modules.h + sed -i 's|{ DB_PREFIX "debian_version", "deb" },|{ DB_PREFIX "hardinfo.distro", "parabola" },{ DB_PREFIX "debian_version", "deb" },|' computer.h + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 ../hardinfo.distro "${pkgdir}/etc/hardinfo.distro" +} diff --git a/libre/hardinfo/fixsensors.patch b/libre/hardinfo/fixsensors.patch new file mode 100644 index 000000000..812c29458 --- /dev/null +++ b/libre/hardinfo/fixsensors.patch @@ -0,0 +1,13 @@ + diff -upNr hardinfo-0.4.2.2.orign/util.c hardinfo-0.4.2.2/util.c +--- hardinfo-0.4.2.2.orign/util.c 2007-07-20 16:45:08.000000000 +0200 ++++ hardinfo-0.4.2.2/util.c 2007-07-26 10:15:32.000000000 +0200 +@@ -996,7 +996,8 @@ gchar *h_strdup_cprintf(const gchar * fo + if (source) { + retn = g_strconcat(source, buffer, NULL); + g_free(buffer); +- g_free(source); ++ if(strlen(source)) ++ g_free(source); + } else { + retn = buffer; + } diff --git a/libre/hardinfo/hardinfo.distro b/libre/hardinfo/hardinfo.distro new file mode 100644 index 000000000..cf378523a --- /dev/null +++ b/libre/hardinfo/hardinfo.distro @@ -0,0 +1 @@ +Parabola GNU/Linux-Libre diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index 5fe5f654f..dd0d5b045 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar> pkgname=initscripts -pkgver=2011.06.1 +pkgver=2011.06.3 pkgrel=1.1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('i686' 'x86_64') @@ -13,10 +13,11 @@ url="http://parabolagnulinux.org" license=('GPL2') groups=('base') backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless) -depends=('bash' 'grep' 'coreutils' 'udev>=167' - 'net-tools' 'ncurses' 'kbd' 'findutils' 'sysvinit') +depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=171' 'iproute2' + 'ncurses' 'kbd' 'findutils' 'sysvinit') optdepends=('bridge-utils: Network bridging support' 'dhcpcd: DHCP network configuration' + 'net-tools: legacy network support' 'wireless_tools: Wireless networking') install=initscripts.install source=("https://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2" @@ -27,3 +28,5 @@ package() { make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } +md5sums=('cbd4320b6b1790f8c1fd80917650a566' + '027576534885b8d5dded9be546057b12') diff --git a/libre/initscripts/initscripts.install b/libre/initscripts/initscripts.install index 360101c10..56f69248a 100644 --- a/libre/initscripts/initscripts.install +++ b/libre/initscripts/initscripts.install @@ -4,4 +4,8 @@ post_upgrade() { echo "==> Original file saved as /etc/inittab.pacsave" sed -i'.pacsave' 's#vc/\([0-9]\)#tty\1#' /etc/inittab fi + if [ "$(vercmp $2 2011.06.1)" -lt 0 ]; then + echo "Blacklisting of modules is no longer supported in rc.conf," + echo "please add blacklist entries to /etc/modprobe.d/ instead." + fi } diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD index 88d0b2d57..f89ea885f 100644 --- a/staging/kdebase-workspace/PKGBUILD +++ b/staging/kdebase-workspace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126533 2011-06-06 06:09:21Z andrea $ +# $Id: PKGBUILD 126875 2011-06-08 14:37:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace pkgver=4.6.4 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Base Workspace" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -28,7 +28,7 @@ options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'fixpath.patch' 'terminate-server.patch') -sha1sums=('303f4881b3c87d1bdbdfc8c4b5fd5a2492191d87' +sha1sums=('44aef9ad37cf291e9e7528b2c915f8fc129d735e' '8c2bdefb23a03b753b78d16944d03fa3939d2d99' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' 'f7b38af38549242a240f1a90ab9964ca8a366129' diff --git a/testing/jfsutils/PKGBUILD b/testing/jfsutils/PKGBUILD new file mode 100644 index 000000000..f0342bad0 --- /dev/null +++ b/testing/jfsutils/PKGBUILD @@ -0,0 +1,24 @@ +# $Id: PKGBUILD 126948 2011-06-08 20:07:37Z tpowa $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +pkgname=jfsutils +pkgver=1.1.15 +pkgrel=2 +pkgdesc="JFS filesystem utilities" +arch=(i686 x86_64) +url="http://jfs.sourceforge.net" +license=('GPL') +groups=('base') +depends=('util-linux-ng') +source=(http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz) +md5sums=('8809465cd48a202895bc2a12e1923b5d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --sbindir=/sbin + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install +} diff --git a/testing/lirc/PKGBUILD b/testing/lirc/PKGBUILD new file mode 100644 index 000000000..e5c346ebb --- /dev/null +++ b/testing/lirc/PKGBUILD @@ -0,0 +1,103 @@ +# $Id: PKGBUILD 126857 2011-06-08 09:51:14Z jgc $ +# Maintainer: Paul Mattal <paul@archlinux.org> + +pkgbase=lirc +pkgname=('lirc' 'lirc-utils') +pkgver=0.9.0 +pkgrel=3 +epoch=1 +_kernver=2.6.39-ARCH +arch=('i686' 'x86_64') +url="http://www.lirc.org/" +license=('GPL') +makedepends=('help2man' 'kernel26-headers>=2.6.39' 'kernel26-headers<2.6.40' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python') +options=('!makeflags' '!strip') +source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2 + lirc_wpc8769l.patch + lircd-handle-large-config.patch + lirc_atiusb-kfifo.patch + kernel-2.6.39.patch + lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd) +md5sums=('b232aef26f23fe33ea8305d276637086' + '1cce37e18e3f6f46044abab29016d18f' + 'b70cc9640505205446ec47b7d4779f38' + '1f8b104a2365d9f93404b143f499059b' + '087a7d102e1c96bf1179f38db2b0b237' + '8d0e238dc0eda95e340fe570605da492' + '85f7fdac55e5256967241864049bf5e9' + '3deb02604b37811d41816e9b4385fcc3' + '5b1f8c9cd788a39a6283f93302ce5c6e' + 'f0c0ac930326168035f0c8e24357ae55' + '69d099e6deedfa3c1ee2b6e82d9b8bfb') + +build() { + cd "${srcdir}/lirc-${pkgver}" + patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch" + patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch" + patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch" + patch -Np1 -i "${srcdir}/kernel-2.6.39.patch" + + sed -i '/AC_PATH_XTRA/d' configure.ac + sed -e 's/@X_CFLAGS@//g' \ + -e 's/@X_LIBS@//g' \ + -e 's/@X_PRE_LIBS@//g' \ + -e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am + libtoolize + autoreconf + + PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \ + --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \ + --with-moduledir=/lib/modules/${_kernver}/kernel/drivers/misc \ + --with-transmitter + + # Remove drivers already in kernel + sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \ + -e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \ + -e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \ + -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile + make +} + +package_lirc() { + pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" + depends=('lirc-utils' 'kernel26>=2.6.39' 'kernel26<2.6.40') + replaces=('lirc+pctv') + install=lirc.install + + cd "${srcdir}/lirc-${pkgver}/drivers" + make DESTDIR="${pkgdir}" install + + # set the kernel we've built for inside the install script + sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" "${startdir}/lirc.install" + # gzip -9 modules + find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; +} + +package_lirc-utils() { + pkgdesc="Linux Infrared Remote Control utils" + depends=('alsa-lib' 'libx11' 'libftdi' 'libirman') + optdepends=('python2: pronto2lirc utility') + options=('strip' '!libtool') + backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf') + + cd "${srcdir}/lirc-${pkgver}" + make DESTDIR="${pkgdir}" install + install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d" + cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d" + cp -rp remotes "${pkgdir}/usr/share/lirc" + chmod -R go-w "${pkgdir}/usr/share/lirc/" + + # install the logrotate config + install -Dm644 "${srcdir}/lirc.logrotate" "${pkgdir}/etc/logrotate.d/lirc" + + # install conf.d file + install -Dm644 "${srcdir}/lircd.conf" "${pkgdir}/etc/conf.d/lircd.conf" + + # install conf.d file + install -Dm644 "${srcdir}/irexec.conf" "${pkgdir}/etc/conf.d/irexec.conf" + + install -d "${pkgdir}/etc/lirc" + + # remove built modules + rm -r "${pkgdir}/lib/" +} diff --git a/testing/lirc/irexec.conf b/testing/lirc/irexec.conf new file mode 100644 index 000000000..f911c7515 --- /dev/null +++ b/testing/lirc/irexec.conf @@ -0,0 +1,5 @@ +# +# Parameters for irexec daemon (path to lircrc) +# + +IREXEC_OPTS=""
\ No newline at end of file diff --git a/testing/lirc/irexecd b/testing/lirc/irexecd new file mode 100755 index 000000000..a64b033a5 --- /dev/null +++ b/testing/lirc/irexecd @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/irexec.conf + +PID=`pidof -o %PPID /usr/bin/irexec` +case "$1" in + start) + stat_busy "Starting IREXEC Daemon" + [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon irexecd + stat_done + fi + ;; + stop) + stat_busy "Stopping IREXEC Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon irexecd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 + diff --git a/testing/lirc/kernel-2.6.39.patch b/testing/lirc/kernel-2.6.39.patch new file mode 100644 index 000000000..7353d61ca --- /dev/null +++ b/testing/lirc/kernel-2.6.39.patch @@ -0,0 +1,54 @@ +diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c +--- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c 2011-03-25 23:28:18.000000000 +0100 ++++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c 2011-06-07 17:02:20.356580306 +0200 +@@ -48,7 +48,6 @@ + #include <linux/slab.h> + #include <linux/module.h> + #include <linux/kmod.h> +-#include <linux/smp_lock.h> + #include <linux/completion.h> + #include <linux/uaccess.h> + #include <linux/usb.h> +diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c +--- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c 2011-03-25 23:28:18.000000000 +0100 ++++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c 2011-06-07 17:04:19.725933627 +0200 +@@ -555,8 +555,8 @@ + kfree(ir); + return -EINVAL; + } +- printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n", +- adap->id, addr, ir->c.name); ++ printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n", ++ addr, ir->c.name); + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) + /* register device */ +diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c +--- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-03-25 23:28:18.000000000 +0100 ++++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-06-07 17:07:23.984935411 +0200 +@@ -361,14 +361,14 @@ + size = count << 3; + + ldata = (unsigned long *) data_buf; +- next_one = generic_find_next_le_bit(ldata, size, 0); ++ next_one = find_next_zero_bit_le(ldata, size, 0); + + if (next_one > 0) + put_pulse_bit(next_one + * WPC8769L_USECS_PER_BIT); + + while (next_one < size) { +- next_zero = generic_find_next_zero_le_bit(ldata, ++ next_zero = find_next_zero_bit_le(ldata, + size, next_one + 1); + + put_space_bit( +@@ -376,7 +376,7 @@ + * WPC8769L_USECS_PER_BIT); + + if (next_zero < size) { +- next_one = generic_find_next_le_bit(ldata, ++ next_one = find_next_bit_le(ldata, + size, next_zero + 1); + + put_pulse_bit( diff --git a/testing/lirc/lirc.install b/testing/lirc/lirc.install new file mode 100644 index 000000000..26fb1391e --- /dev/null +++ b/testing/lirc/lirc.install @@ -0,0 +1,16 @@ +KERNEL_VERSION=2.6.39-ARCH + +post_install() { + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod $KERNEL_VERSION > /dev/null 2>&1 +} + +post_upgrade() { + post_install +} + +# arg 1: the old package version +post_remove() { + post_install +} diff --git a/testing/lirc/lirc.logrotate b/testing/lirc/lirc.logrotate new file mode 100644 index 000000000..623c4f328 --- /dev/null +++ b/testing/lirc/lirc.logrotate @@ -0,0 +1,5 @@ +/var/log/lircd { + missingok + notifempty + delaycompress +} diff --git a/testing/lirc/lirc_atiusb-kfifo.patch b/testing/lirc/lirc_atiusb-kfifo.patch new file mode 100644 index 000000000..a64984dce --- /dev/null +++ b/testing/lirc/lirc_atiusb-kfifo.patch @@ -0,0 +1,31 @@ +From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001 +From: Jason Martin <publicmsu@gmail.com> +Date: Fri, 3 Jun 2011 00:12:51 -0400 +Subject: [PATCH] lirc_atiusb: fix buffer alloc to work with new kfifo + +I came across posts with regards to lirc_atiusb and its compatibility +with newer kernels, and their use of kfifo.I spent a little bit of time +this evening, and was able to correct the issues with the driver, and +now have a functioning lirc_atiusb device under the 2.6.38 kernel. + +Signed-off-by: Jarod Wilson <jarod@redhat.com> +--- + drivers/lirc_atiusb/lirc_atiusb.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c +index 52080de..bf2b631 100644 +--- a/drivers/lirc_atiusb/lirc_atiusb.c ++++ b/drivers/lirc_atiusb/lirc_atiusb.c +@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf) + goto new_irctl_failure_check; + } + +- if (lirc_buffer_init(driver->rbuf, dclen, 1)) { ++ if (lirc_buffer_init(driver->rbuf, dclen, 2)) { + mem_failure = 4; + goto new_irctl_failure_check; + } +-- +1.7.0.1 + diff --git a/testing/lirc/lirc_wpc8769l.patch b/testing/lirc/lirc_wpc8769l.patch new file mode 100644 index 000000000..e4e2a049b --- /dev/null +++ b/testing/lirc/lirc_wpc8769l.patch @@ -0,0 +1,88 @@ +From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?= <skandalfo@gmail.com> +Date: Wed, 30 Mar 2011 16:46:35 -0400 +Subject: [PATCH] Make lirc_wpc8769l functional again + +Signed-off-by: Jarod Wilson <jarod@redhat.com> +--- + drivers/lirc_wpc8769l/lirc_wpc8769l.c | 28 +++++++++++++++++----------- + 1 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c +index f820d11..4d04063 100644 +--- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c ++++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c +@@ -816,10 +816,6 @@ static int set_use_inc(void *data) + /* Reset last timeout value. */ + lastus = 0; + +- /* Init the read buffer. */ +- if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) +- return -ENOMEM; +- + /* Acquire the IRQ. */ + result = request_irq(irq, irq_handler, + IRQF_DISABLED | IRQF_SHARED, +@@ -863,9 +859,6 @@ static void set_use_dec(void *data) + /* Free the IRQ. */ + free_irq(irq, THIS_MODULE); + dprintk("Freed IRQ %d\n", irq); +- +- /* Free the RX buffer. */ +- lirc_buffer_free(&rbuf); + } + + static struct lirc_driver driver = { +@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void) + /* Do load-time checks. */ + wpc8769l_power_up_and_check_if_we_woke_us_up(); + ++ /* Init the read buffer. */ ++ if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) { ++ rc = -ENOMEM; ++ goto exit_platform_exit; ++ } ++ + /* Configure the driver hooks. */ + driver.features = LIRC_CAN_REC_MODE2; ++ driver.dev = &lirc_wpc8769l_platform_dev->dev; + driver.minor = lirc_register_driver(&driver); + if (driver.minor < 0) { + eprintk("lirc_register_driver failed!\n"); + rc = -EIO; +- goto exit_platform_exit; ++ goto exit_release_buffer; + } + + iprintk("Driver loaded.\n"); + + return 0; /* Everything OK. */ + ++exit_release_buffer: ++ lirc_buffer_free(&rbuf); ++ + exit_platform_exit: + lirc_wpc8769l_platform_exit(); + +@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init); + + static void __exit lirc_wpc8769l_module_exit(void) + { +- /* Unregister the platform driver and device. */ +- lirc_wpc8769l_platform_exit(); +- + /* Unregister the LIRC driver. */ + lirc_unregister_driver(driver.minor); + ++ /* Free the buffer. */ ++ lirc_buffer_free(&rbuf); ++ ++ /* Unregister the platform driver and device. */ ++ lirc_wpc8769l_platform_exit(); ++ + /* Release the second range. */ + if (baseport2) + release_region(baseport2, WPC8769L_IO_REGION_2_SIZE); +-- +1.7.0.1 + diff --git a/testing/lirc/lircd b/testing/lirc/lircd new file mode 100755 index 000000000..e9739b36e --- /dev/null +++ b/testing/lirc/lircd @@ -0,0 +1,52 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +. /etc/conf.d/lircd.conf + +PID=$(pidof -o %PPID /usr/sbin/lircd) +LIRCD_SYMLINKFILE=/dev/lircd +LIRCD_SOCKET=/var/run/lirc/lircd +case "$1" in + start) + stat_busy "Starting LIRC Daemon" + [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null + rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE + if [ $? -ne 0 ]; then + stat_fail + exit 0 + fi + [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS" + [ -z "$PID" ] && + if [ -n "$LIRC_DEVICE" ] ; then + eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE + else + /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE + fi + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon lircd + stat_done + fi + ;; + stop) + stat_busy "Stopping LIRC Daemon" + rm -f $LIRCD_SYMLINKFILE + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon lircd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 start|stop|restart" +esac +exit 0 diff --git a/testing/lirc/lircd-handle-large-config.patch b/testing/lirc/lircd-handle-large-config.patch new file mode 100644 index 000000000..85bc20518 --- /dev/null +++ b/testing/lirc/lircd-handle-large-config.patch @@ -0,0 +1,39 @@ +From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001 +From: Jarod Wilson <jarod@redhat.com> +Date: Wed, 6 Apr 2011 11:04:12 -0400 +Subject: [PATCH] lircd: handle larger config files in write_socket better + +Pointed out by Michael Zanetti on list, irsend LIST has issues with long +config files, which didn't exist in maintainer mode, as we were using a +do while loop to make sure we spit out everything. Just use that loop +all the time. + +Signed-off-by: Jarod Wilson <jarod@redhat.com> +--- + daemons/lircd.c | 8 ++------ + 1 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/daemons/lircd.c b/daemons/lircd.c +index 6c21a3a..ddcca05 100644 +--- a/daemons/lircd.c ++++ b/daemons/lircd.c +@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len) + int done, todo = len; + + while (todo) { +-#ifdef SIM_REC + do { + done = write(fd, buf, todo); +- } +- while (done < 0 && errno == EAGAIN); +-#else +- done = write(fd, buf, todo); +-#endif ++ } while (done < 0 && errno == EAGAIN); ++ + if (done <= 0) + return (done); + buf += done; +-- +1.7.0.1 + diff --git a/testing/lirc/lircd.conf b/testing/lirc/lircd.conf new file mode 100644 index 000000000..760dab065 --- /dev/null +++ b/testing/lirc/lircd.conf @@ -0,0 +1,8 @@ +# +# Parameters for lirc daemon +# + +LIRC_DEVICE="/dev/lirc0" +LIRC_DRIVER="" +LIRC_EXTRAOPTS="" +LIRC_CONFIGFILE="" diff --git a/testing/lirc/lircmd b/testing/lirc/lircmd new file mode 100755 index 000000000..220c47c9c --- /dev/null +++ b/testing/lirc/lircmd @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/lircmd` +case "$1" in + start) + stat_busy "Starting lircmd Daemon" + [ -z "$PID" ] && /usr/sbin/lircmd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon lircmd + stat_done + fi + ;; + stop) + stat_busy "Stopping lircmd Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon lircmd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/moc/PKGBUILD b/testing/moc/PKGBUILD index d94540c70..535afc1a5 100644 --- a/testing/moc/PKGBUILD +++ b/testing/moc/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 125870 2011-05-30 20:58:06Z eric $ +# $Id: PKGBUILD 126916 2011-06-08 17:30:45Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=moc pkgver=20110528 -pkgrel=1 +pkgrel=2 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats" arch=('i686' 'x86_64') url="http://moc.daper.net/" license=('GPL') -depends=('libmad' 'libid3tag' 'jack' 'curl' 'libsamplerate' 'libtool') +depends=('libmad' 'libid3tag' 'jack' 'curl' 'libsamplerate' 'libtool' 'file') makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug') optdepends=('speex: for using the speex plugin' 'ffmpeg: for using the ffmpeg plugin' @@ -19,23 +19,22 @@ optdepends=('speex: for using the speex plugin' options=('!libtool') source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \ gcc-undefined-symbols.diff) -md5sums=('e9394640fecb725ad8146575a3091134' +md5sums=('003fd01af2165264eb666040e4f586cd' 'efacb8559e9145e15b0c25f8fa2a9d79') -sha1sums=('d09c27602a60e3e9fde476e13d7c1a8b21489505' +sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf' 'a811a4ac7e049914aab528d3f06a6be6634c2720') build() { cd "${srcdir}/${pkgname}" patch -p0 -i ../gcc-undefined-symbols.diff - sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' decoder_plugins/ffmpeg/ffmpeg.c - sed -i 's|avcodec_decode_audio|avcodec_decode_audio2|' decoder_plugins/ffmpeg/ffmpeg.c + # Disabling aac to use the external ffmpeg to play them (FS#13164) ./autogen.sh ./configure --prefix=/usr --without-rcc --without-aac \ --with-oss --with-alsa --with-jack --with-mp3 \ --with-musepack --with-vorbis --with-flac --with-wavpack \ --with-sndfile --with-modplug --with-ffmpeg --with-speex \ - --with-samplerate --with-curl + --with-samplerate --with-curl --disable-debug make } diff --git a/testing/mod_perl/PKGBUILD b/testing/mod_perl/PKGBUILD index 33f4e7901..4c76eb05b 100644 --- a/testing/mod_perl/PKGBUILD +++ b/testing/mod_perl/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 125232 2011-05-25 19:12:54Z foutrelis $ +# $Id: PKGBUILD 126963 2011-06-08 23:54:03Z foutrelis $ # Maintainer: Firmicus <francois.archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=mod_perl pkgver=2.0.5 -pkgrel=2 +pkgrel=4 pkgdesc="Apache module that embeds the Perl interpreter within the server" -url="http://search.cpan.org/dist/${_realname}/" -depends=('perl=5.12.3' 'apache' 'db' 'apr-util') +url="http://search.cpan.org/dist/${pkgname}/" +depends=('perl' 'apache' 'db' 'apr-util') license=('APACHE') arch=('i686' 'x86_64') options=(!emptydirs) diff --git a/testing/pidgin/PKGBUILD b/testing/pidgin/PKGBUILD index 879ac94dc..e0c7170bd 100644 --- a/testing/pidgin/PKGBUILD +++ b/testing/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 126837 2011-06-07 16:22:39Z foutrelis $ +# $Id: PKGBUILD 126958 2011-06-08 23:47:29Z foutrelis $ # Maintainer: Evangelos Foutras <foutrelis@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,7 +7,7 @@ pkgname=('pidgin' 'libpurple' 'finch') pkgver=2.8.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://pidgin.im/" license=('GPL') |