diff options
48 files changed, 911 insertions, 273 deletions
diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD index ebc9f9ac1..e6d6afd77 100644 --- a/community/bird/PKGBUILD +++ b/community/bird/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 74872 2012-08-08 02:08:13Z seblu $ +# $Id: PKGBUILD 75510 2012-08-26 17:46:55Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=bird pkgname=('bird' 'bird6') pkgver=1.3.8 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://bird.network.cz/' license=('GPL2') @@ -17,8 +17,8 @@ source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz" md5sums=('965fee1be1d5cd45ceef3926e49c18ce' '5e5346a057f187f56cce928b7e423636' '25241a4d7ef639506e0080431b2c1690' - 'e82a0519dca0b289685fda44787f5911' - 'c32e7f6cf1be6ed6f9aa98feea25176d') + '14e684c84249b8f7748d94eee6df155a' + '4988006fc8169c5e00771c75ca67e78f') build() { cd $pkgbase-$pkgver diff --git a/community/bird/bird.service b/community/bird/bird.service index ebdcd6078..b72247208 100644 --- a/community/bird/bird.service +++ b/community/bird/bird.service @@ -2,9 +2,9 @@ Description=BIRD routing daemon [Service] -ExecStart=/usr/sbin/bird -ExecReload=/bin/sh -c "echo configure | /usr/sbin/birdc" -ExecStop=/bin/sh -c "echo down | /usr/sbin/birdc" +ExecStart=/usr/sbin/bird -d +ExecReload=/usr/sbin/birdc configure +ExecStop=/usr/sbin/birdc down [Install] WantedBy=multi-user.target diff --git a/community/bird/bird6.service b/community/bird/bird6.service index e4b824ee2..4d245d187 100644 --- a/community/bird/bird6.service +++ b/community/bird/bird6.service @@ -1,10 +1,10 @@ [Unit] -Description=BIRD6 routing daemon +Description=BIRD IPv6 routing daemon [Service] -ExecStart=/usr/sbin/bird6 -ExecReload=/bin/sh -c "echo configure | /usr/sbin/birdc6" -ExecStop=/bin/sh -c "echo down | /usr/sbin/birdc6" +ExecStart=/usr/sbin/bird6 -d +ExecReload=/usr/sbin/bird6c configure +ExecStop=/usr/sbin/bird6c down [Install] WantedBy=multi-user.target diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index 0729d863a..8e3b43785 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74752 2012-08-03 10:54:18Z spupykin $ +# $Id: PKGBUILD 75539 2012-08-26 22:26:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: farid <farid at archlinuc-br.org> @@ -6,7 +6,7 @@ pkgbase=gmic pkgname=('gmic' 'gimp-plugin-gmic') -pkgver=1.5.1.7 +pkgver=1.5.1.8 pkgrel=1 pkgdesc="image procession framework" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ makedepends=('gimp' 'fftw' 'lapack' 'opencv' 'graphicsmagick' 'openexr' 'imagema options=('docs' '!emptydirs') source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_$pkgver.tar.gz" opencv-buildfix.patch) -md5sums=('da53449144f0edc9431358118e574e7c' +md5sums=('1fc38346269bdd829dd7c4864a27fbc3' '8d1cf5000239099255d25c7d3dbe5728') build() { diff --git a/community/hwinfo/PKGBUILD b/community/hwinfo/PKGBUILD index 710e7ce51..1da0199a3 100644 --- a/community/hwinfo/PKGBUILD +++ b/community/hwinfo/PKGBUILD @@ -1,6 +1,6 @@ -# $Id: PKGBUILD 66324 2012-02-23 14:26:30Z arodseth $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: Alexander Rødseth <rodseth@gmail.com> +# $Id: PKGBUILD 75503 2012-08-26 12:50:22Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Gergely Imreh <imrehgATgmailDOTcom> # Contributor: champus # Contributor: madeye @@ -8,18 +8,18 @@ # Contributor: ninja_pt pkgname=hwinfo -pkgver=19.1 -_subver=1.2 +pkgver=20.0 +_subver=1.4 pkgrel=1 pkgdesc='Hardware detection tool from openSUSE' arch=('x86_64' 'i686') -url='http://www.opensuse.org/' +url='http://download.opensuse.org/source/factory/repo/oss/suse/src/' license=('GPL2') depends=('perl' 'libx86emu') makedepends=('sysfsutils' 'rpmextract' 'flex') source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-$pkgver-$_subver.src.rpm" 'custom_ioctl.patch') -sha256sums=('77b67512f7a7a027200233b6c89be2b777f96b2a6d742b695cb062f9cf4ec258' +sha256sums=('466423b00fda00bc5e927352fb8d2f52b4d4e4b298401cd44c48231951c2a26b' '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d') build() { diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD index f7fc69cef..765256ee8 100644 --- a/community/kadu/PKGBUILD +++ b/community/kadu/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 74225 2012-07-23 03:08:13Z allan $ +# $Id: PKGBUILD 75490 2012-08-26 06:32:00Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Mateusz Herych # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=kadu -pkgver=0.12.0 -pkgrel=2 +pkgver=0.12.1 +pkgrel=1 pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client" arch=('i686' 'x86_64') url="http://www.kadu.net/" license=('GPL') -depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit' 'xdg-utils') +depends=('libgadu' 'libxss' 'enchant' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit' 'xdg-utils') makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') install=kadu.install source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2) -md5sums=('9e89dfa84561e408b26dae207e176198') +md5sums=('1be664676ff0fba0bc246baaaa44a35c') build() { cd "$srcdir" diff --git a/community/kdesvn/PKGBUILD b/community/kdesvn/PKGBUILD index 66ada8eea..96d0a7028 100644 --- a/community/kdesvn/PKGBUILD +++ b/community/kdesvn/PKGBUILD @@ -1,29 +1,23 @@ -# $Id: PKGBUILD 66895 2012-02-29 22:49:56Z giovanni $ +# $Id: PKGBUILD 75515 2012-08-26 19:36:08Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=kdesvn -pkgver=1.5.5 -pkgrel=2 +pkgver=1.6.0 +pkgrel=1 pkgdesc="A pure C++ SVN-client for KDE" arch=('i686' 'x86_64') url="http://kdesvn.alwins-world.de/" license=('GPL') depends=('kdebase-runtime' 'subversion') -makedepends=('automoc4' 'cmake') +makedepends=('automoc4' 'cmake' 'patch') conflicts=('qsvn') -install=kdesvn.install -source=("http://kdesvn.alwins-world.de/downloads/${pkgname}-${pkgver}.tar.bz2" - 'kdesvn-1.5.5-qt48.patch' - 'kdesvn-1.5.5-doctype-version.patch') -md5sums=('8f11d31cc55fba408b7971541ee261d0' - 'a7440581e373e06e4290e1f0d905c6f2' - '64368d7cb40ce9fe7656f886337628b8') +install=$pkgname.install +changelog=$pkgname.changelog +source=(http://kdesvn.alwins-world.de/downloads/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('05686f246b76810f90a9f80f1d45cdccf812b42e18fa10a16b14e7d27d370f96') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/kdesvn-1.5.5-qt48.patch" - patch -Np1 -i "${srcdir}/kdesvn-1.5.5-doctype-version.patch" + cd ${srcdir}/$pkgname-$pkgver cmake . \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -35,13 +29,13 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/$pkgname-$pkgver - make DESTDIR="${pkgdir}" install + make DESTDIR=${pkgdir} install - #removing conflicting files - kdesdk +#removing conflicting files - kdesdk rm -f ${pkgdir}/usr/share/kde4/services/svn* - #removing $srcdir reference +#removing $srcdir reference rm -rf ${pkgdir}/usr/share/doc } diff --git a/community/kdesvn/kdesvn.changelog b/community/kdesvn/kdesvn.changelog new file mode 100644 index 000000000..0a9b5d864 --- /dev/null +++ b/community/kdesvn/kdesvn.changelog @@ -0,0 +1,58 @@ +2012-08-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 1.6.0-1 + +2010-09-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 1.5.5 + +2010-04-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 1.5.3 + +2010-01-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 1.5.1 + +2010-01-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 1.5.0 + +2009-10-01 Biru Ionut <ionut@archlinux.ro> + * Update to major release 1.4.1 + +2009-07-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 1.3.2 + +2009-05-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 1.3.1 + +2009-05-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * FS#14602 fixed in 1.3.0-2 + +2009-04-30 Biru Ionut <biru.ionut@gmail.com> + * rebuild for x86_64 #FS14506 + +2009-04-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 1.3.0 + +2009-02-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 1.2.4 + +2009-01-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 1.2.3 + +2008-11-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 1.2.2 + +2008-10-08 Eric Belanger <eric@archlinux.org> + * Removed unneede file sourcing + +2008-10-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Removed conflicting files in 1.2.1-2 + * The one provided with kdesdk are more complete. + +2008-10-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 1.2.1 - KDE4 version + +2008-09-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 1.0.2 + +2008-08-31 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * Update to major release 1.0.1 + diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD index 245985415..9617be403 100644 --- a/community/lilypond/PKGBUILD +++ b/community/lilypond/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 62129 2012-01-16 13:56:57Z bisson $ +# $Id: PKGBUILD 75534 2012-08-26 20:38:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=lilypond -pkgver=2.14.2 -pkgrel=4 +pkgver=2.16.0 +pkgrel=1 pkgdesc="An automated music engraving system" arch=('i686' 'x86_64') url="http://lilypond.org" @@ -16,9 +16,9 @@ makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils' 'gsfonts' 'texi2html') options=('emptydirs') install=lilypond.install -source=(http://download.linuxaudio.org/lilypond/sources/v2.14/$pkgname-$pkgver.tar.gz +source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz texlive-workaround.patch) -md5sums=('4053a19e03181021893981280feb9aaa' +md5sums=('c4637d5f3e485c529c2d98fe372c41fe' 'ff32863f3eed67ac744e50bc4fc67a87') build() { @@ -31,7 +31,7 @@ build() { done rm -rf python/out/ - patch -p1 <$srcdir/texlive-workaround.patch +# patch -p1 <$srcdir/texlive-workaround.patch PYTHON=/usr/bin/python2 ./configure --prefix=/usr make diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD index 34eb54b98..b822689f8 100644 --- a/community/opendkim/PKGBUILD +++ b/community/opendkim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73808 2012-07-15 20:18:52Z spupykin $ +# $Id: PKGBUILD 75522 2012-08-26 20:09:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Thomas Jost <schnouki@schnouki.net> pkgname=opendkim -pkgver=2.6.5 +pkgver=2.6.7 pkgrel=1 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter." arch=(i686 x86_64) @@ -17,7 +17,7 @@ install=opendkim.install source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz opendkim.conf opendkim.rc) -md5sums=('fde50b442af3fa2ecaee53f4eb9c9c15' +md5sums=('8dd327c1c3f3ffdbc436ef7df877940e' '3e2bb1058ac0662f01e675aa6ac7ee8f' '093f5c098a45cc68753f97e45a5b374c') diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD index 0a76172f3..2dbe33894 100644 --- a/community/parole/PKGBUILD +++ b/community/parole/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 74960 2012-08-10 09:27:53Z spupykin $ +# $Id: PKGBUILD 75524 2012-08-26 20:10:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: TDY <tdy@gmx.com> pkgname=parole -pkgver=0.3.0 +pkgver=0.3.0.3 pkgrel=1 pkgdesc="A modern media player based on the GStreamer framework" arch=('i686' 'x86_64') @@ -16,14 +16,17 @@ optdepends=('xulrunner>=1.9.1: browser plugin') conflicts=('parole-media-player-git') options=('!libtool') install=parole.install -source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -md5sums=('869b1c1f3a02d46ab17755d043b3e719') +#source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) +source=(http://git.xfce.org/apps/parole/snapshot/parole-$pkgver.tar.bz2) +md5sums=('19b57753085c1effb3157df0f1373f4c') build() { cd "$srcdir/$pkgname-$pkgver" # Work around DSO linking issue - LDFLAGS+=' -lX11' +# LDFLAGS+=' -lX11' + + [ -x configure ] || ./autogen.sh ./configure --prefix=/usr --libexecdir=/usr/lib --enable-taglib --enable-libnotify make diff --git a/community/pdnsd/PKGBUILD b/community/pdnsd/PKGBUILD index 9a1f40211..b6c872299 100644 --- a/community/pdnsd/PKGBUILD +++ b/community/pdnsd/PKGBUILD @@ -1,28 +1,33 @@ -# $Id: PKGBUILD 72793 2012-06-22 12:51:32Z dreisner $ +# $Id: PKGBUILD 75512 2012-08-26 18:24:09Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Henrik Nymann Jensen <h@henriknj.dk> pkgname=pdnsd -pkgver=1.2.9 -pkgrel=2 -pkgdesc="Is a proxy DNS server with permanent caching" +pkgver=1.2.9.a +_pkgver=${pkgver/.a/a} +pkgrel=1 +pkgdesc="Proxy DNS server with permanent caching" arch=(i686 x86_64) url="http://members.home.nl/p.a.rombouts/pdnsd/" license=('GPL') depends=('glibc') -#backup=('etc/pdnsd.conf') -source=(http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$pkgver-par.tar.gz - pdnsd - pdnsd.service) -md5sums=('037f79d191b98974ffc2c9649727bf66' +source=(http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$_pkgver-par.tar.gz + rc.d + service) +md5sums=('2f3e705d59a0f9308ad9504b24400769' '3670bd47c9303fbb655d9216715512de' 'fad5e518d126b29fc947941d57a0a494') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc - make - make DESTDIR=$pkgdir install - install -Dm0755 $srcdir/pdnsd $pkgdir/etc/rc.d/pdnsd - install -Dm0644 $srcdir/pdnsd.service $pkgdir/usr/lib/systemd/system/pdnsd.service + cd $srcdir/$pkgname-$_pkgver + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd $srcdir/$pkgname-$_pkgver + make DESTDIR=$pkgdir install + + install -Dm0755 $srcdir/rc.d $pkgdir/etc/rc.d/pdnsd + install -Dm0644 $srcdir/service $pkgdir/usr/lib/systemd/system/pdnsd.service } diff --git a/community/pdnsd/rc.d b/community/pdnsd/rc.d new file mode 100644 index 000000000..34a541d18 --- /dev/null +++ b/community/pdnsd/rc.d @@ -0,0 +1,37 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/pdnsd` +case "$1" in + start) + stat_busy "Starting pdnsd Daemon" + if [ -z "$PID" ]; then + /usr/sbin/pdnsd -d + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon pdnsd + stat_done + fi + ;; + stop) + stat_busy "Stopping pdnsd Daemon" + [ ! -z "$PID" ] && kill -TERM $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon pdnsd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/community/pdnsd/service b/community/pdnsd/service new file mode 100644 index 000000000..5821dbcb2 --- /dev/null +++ b/community/pdnsd/service @@ -0,0 +1,9 @@ +[Unit] +Description=proxy name server +After=network.target + +[Service] +ExecStart=/usr/sbin/pdnsd + +[Install] +WantedBy=multi-user.target diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index 3eddfd0e3..f1cc5061a 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 74573 2012-07-30 19:10:22Z jlichtblau $ +#$Id: PKGBUILD 75532 2012-08-26 20:15:34Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp -pkgver=0.6.2 +pkgver=0.6.3 pkgrel=1 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ optdepends=('flac: native FLAC support' 'ffmpeg' 'libsamplerate' 'wavpack') install=$pkgname.install source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('c7638521e2ffb91beda11010a3f27958fc446b7e582e3d5e92c7dc5a751aa096') +sha256sums=('98f5b8121d475ead81c788ec9d5346c8da537e342c0d99eaff08586af4c92ca8') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index ca63f9574..5d80b8321 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,6 @@ +2012-08-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.6.3-1 + 2012-07-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.6.2-1 diff --git a/community/spectrwm/PKGBUILD b/community/spectrwm/PKGBUILD index 236e1cc76..0d69a030c 100644 --- a/community/spectrwm/PKGBUILD +++ b/community/spectrwm/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 74745 2012-08-03 03:13:40Z kkeen $ +# $Id: PKGBUILD 75507 2012-08-26 15:22:17Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spectrwm -pkgver=1.2.0 +pkgver=2.0.1 pkgrel=1 pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way." arch=('i686' 'x86_64') url="http://www.spectrwm.org" _watch="https://opensource.conformal.com/snapshots/spectrwm/" license=('custom:ISC') -depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'profont') +depends=('dmenu' 'xcb-util' 'xcb-util-wm' 'xcb-util-keysyms' 'libxrandr' 'libxft' 'libxcursor' 'profont') replaces=('scrotwm') makedepends=('libxt') optdepends=('scrot: screenshots' 'xlockmore: screenlocking' 'terminus-font: great font') @@ -18,7 +18,7 @@ backup=(etc/spectrwm.conf) source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgname-$pkgver.tgz \ LICENSE \ baraction.sh) -md5sums=('81cca08d4a5f66023a7c246621b0cccc' +md5sums=('ed553574e65bb364e26d359790e204f2' 'a67cfe51079481e5b0eab1ad371379e3' '950d663692e1da56e0ac864c6c3ed80e') diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD index 1a64e03a6..3458739e9 100644 --- a/community/usb_modeswitch/PKGBUILD +++ b/community/usb_modeswitch/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73810 2012-07-15 20:19:38Z spupykin $ +# $Id: PKGBUILD 75530 2012-08-26 20:12:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=usb_modeswitch -pkgver=1.2.3 -pkgrel=2 -_pkgdata=20120531 +pkgver=1.2.4 +pkgrel=1 +_pkgdata=20120815 pkgdesc="Activating switchable USB devices on Linux." arch=('i686' 'x86_64') url="http://www.draisberghof.de/usb_modeswitch/" @@ -15,9 +15,9 @@ backup=("etc/$pkgname.conf") source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2" "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2" "usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt") -md5sums=('9b29e8b0d93d7604a9e5efc4696d37a3' - '4a948331d5b9fccba4a89d3e62040cc3' - 'dffc247648ed7359820c9caae413704a') +md5sums=('dbd4ce7966d7b4a5a0604a8280f7164d' + '12d7de3210e45ad6f48791d12bbdbf61' + '3588e76bf08f6c9ed51a1de4d086795e') build() { cd $srcdir/usb-modeswitch-$pkgver/ diff --git a/community/v8/PKGBUILD b/community/v8/PKGBUILD index ee8a50969..3c8fffb2c 100644 --- a/community/v8/PKGBUILD +++ b/community/v8/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 69009 2012-04-07 21:25:28Z kchen $ +# $Id: PKGBUILD 75499 2012-08-26 09:56:04Z jelle $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: tocer <tocer.deng@gmail.com> pkgname=v8 -pkgver=3.9.9 +pkgver=3.13.0 pkgrel=1 pkgdesc='A fast and modern javascript engine' arch=('i686' 'x86_64') url='http://code.google.com/p/v8' license=('BSD') depends=('gcc-libs') -makedepends=('subversion' 'scons') +makedepends=('scons') +source=("v8.tar.gz::https://github.com/v8/v8/tarball/$pkgver") +md5sums=('55878a54d5dc5674a5ade223d55965f6') build() { - _source="http://v8.googlecode.com/svn/tags/${pkgver}" - svn checkout "$_source" "${srcdir}/v8-${pkgver}" - cd "${srcdir}/${pkgname}-${pkgver}" + cd $srcdir/$pkgname-$pkgname-* [ "$CARCH" = 'i686' ] && SCONS_ARCH=ia32 [ "$CARCH" = 'x86_64' ] && SCONS_ARCH=x64 @@ -24,13 +24,18 @@ build() { scons mode=release library=shared arch=$SCONS_ARCH scons d8 arch=$SCONS_ARCH - find include -type f \ - -exec install -Dm644 {} ${pkgdir}/usr/{} \; - rm -rf ${pkgdir}/usr/include/.svn +} + +package() { + cd ${srcdir}/${pkgname}-$pkgname-* install -Dm755 d8 "${pkgdir}/usr/bin/d8" install -Dm755 libv8.so "${pkgdir}/usr/lib/libv8.so" + # Include headers + install -d $pkgdir/usr/include + install -Dm755 include/*.h $pkgdir/usr/include + install -d ${pkgdir}/usr/share/licenses/v8 install -m644 LICENSE* ${pkgdir}/usr/share/licenses/v8 } diff --git a/community/vsftpd/vsftpd-ssl.service b/community/vsftpd/vsftpd-ssl.service index f46b05fcd..b5b84b3c3 100644 --- a/community/vsftpd/vsftpd-ssl.service +++ b/community/vsftpd/vsftpd-ssl.service @@ -2,7 +2,7 @@ Description=vsftpd daemon (legacy implicit SSL) [Service] -ExecStart=/usr/sbin/vsftpd -olisten_ipv6=yes -oimplicit_ssl=yes +ExecStart=/usr/sbin/vsftpd -oimplicit_ssl=yes ExecReload=/bin/kill -HUP $MAINPID KillMode=process diff --git a/community/vsftpd/vsftpd.service b/community/vsftpd/vsftpd.service index d4f7251ba..cbd10d9d1 100644 --- a/community/vsftpd/vsftpd.service +++ b/community/vsftpd/vsftpd.service @@ -2,7 +2,7 @@ Description=vsftpd daemon [Service] -ExecStart=/usr/sbin/vsftpd -olisten_ipv6=yes +ExecStart=/usr/sbin/vsftpd ExecReload=/bin/kill -HUP $MAINPID KillMode=process diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD index 056882f7e..7ffe5899d 100644 --- a/extra/libindi/PKGBUILD +++ b/extra/libindi/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libindi -pkgver=0.9.1 +pkgver=0.9.5 pkgrel=1 pkgdesc="A distributed control protocol designed to operate astronomical instrumentation" url="http://www.indilib.org/index.php?title=Main_Page" @@ -11,12 +11,9 @@ license=('GPL2') arch=('i686' 'x86_64') depends=('libnova' 'cfitsio' 'boost-libs' 'libusb-compat') makedepends=('pkgconfig' 'cmake' 'boost') -provides=('indilib') -replaces=('indilib') -conflicts=('indilib') options=('!libtool') source=("http://downloads.sourceforge.net/indi/${pkgname}_${pkgver}.tar.gz") -md5sums=('546ab197a4311d03f566747e425de0d2') +md5sums=('357aed5dd2f2d713bb243120f022763a') build() { cd "${srcdir}" diff --git a/kernels/linux-libre-aufs_friendly/PKGBUILD b/kernels/linux-libre-aufs_friendly/PKGBUILD index 7f2101b18..9dc2cbbce 100644 --- a/kernels/linux-libre-aufs_friendly/PKGBUILD +++ b/kernels/linux-libre-aufs_friendly/PKGBUILD @@ -35,9 +35,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'i915-fix-ghost-tv-output.patch' 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") - -_kernelname=${pkgbase#linux-libre} -_localversionname=-LIBRE-AUFS_FRIENDLY md5sums=('5487da14ca81715a469c7594d39722fa' 'ce7d959667b9f158b1fb814b5806950a' '9824d09d2a659db17a6468e27ccc29ad' @@ -58,6 +55,9 @@ if [ "$CARCH" != "mips64el" ]; then unset md5sums[${#md5sums[@]}-1] fi +_kernelname=${pkgbase#linux-libre} +_localversionname=-LIBRE-AUFS_FRIENDLY + build() { cd "${srcdir}/linux-${_basekernel}" diff --git a/kernels/linux-libre-lts-rt/PKGBUILD b/kernels/linux-libre-lts-rt/PKGBUILD index 74a883c1b..33ebb0965 100644 --- a/kernels/linux-libre-lts-rt/PKGBUILD +++ b/kernels/linux-libre-lts-rt/PKGBUILD @@ -36,10 +36,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'i915-fix-ghost-tv-output.patch' 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") - -_kernelname=${pkgbase#linux-libre} -_localversionname=-LIBRE-LTS-RT -_aurversionkernelname=-rt-lts # in this case, in the aur version on Archlinux, the kernel name is different than ours md5sums=('5f64180fe7df4e574dac5911b78f5067' 'b4ebaa2ebf8418c75aba96fd4dd6daf3' '11bb95e505726abd1e1adfa522ef178f' @@ -59,6 +55,10 @@ if [ "$CARCH" != "mips64el" ]; then unset md5sums[${#md5sums[@]}-1] fi +_kernelname=${pkgbase#linux-libre} +_localversionname=-LIBRE-LTS-RT +_aurversionkernelname=-rt-lts # in this case, in the aur version on Archlinux, the kernel name is different than ours + build() { cd "${srcdir}/linux-${_basekernel}" diff --git a/kernels/linux-libre-lts-xen/PKGBUILD b/kernels/linux-libre-lts-xen/PKGBUILD index 71a136f93..b4915b8d2 100644 --- a/kernels/linux-libre-lts-xen/PKGBUILD +++ b/kernels/linux-libre-lts-xen/PKGBUILD @@ -23,9 +23,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' 'ext4-options.patch') - -_kernelname=${pkgbase#linux-libre} -_localversionname=-LIBRE-LTS-XEN md5sums=('5f64180fe7df4e574dac5911b78f5067' '2748e4e15dada12fe284e9ae341a4652' '162fda63a1b6f9e0bf801e30cbb52195' @@ -35,6 +32,9 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' '263725f20c0b9eb9c353040792d644e5' 'bb7fd1aa23016c8057046b84fd4eb528') +_kernelname=${pkgbase#linux-libre} +_localversionname=-LIBRE-LTS-XEN + build() { cd "${srcdir}/linux-${_basekernel}" diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 6348f4093..79d8c5adb 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -36,9 +36,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'i915-fix-ghost-tv-output.patch' '3.4.4-fix-backlight-regression.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") - -_kernelname=${pkgbase#linux-libre} -_localversionname=-LIBRE-RT md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' '6ef5ab23e1999605f0185a6fc4d224f2' '8ddc7ee43b418e06121bd09fa0e97bf6' @@ -58,6 +55,9 @@ if [ "$CARCH" != "mips64el" ]; then unset md5sums[${#md5sums[@]}-1] fi +_kernelname=${pkgbase#linux-libre} +_localversionname=-LIBRE-RT + build() { cd "${srcdir}/linux-${_basekernel}" diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 7f14d134d..11b614694 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -26,9 +26,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' 'ext4-options.patch') - -_kernelname=${pkgbase#linux-libre} -_localversionname=-LIBRE-XEN md5sums=('5487da14ca81715a469c7594d39722fa' '6d9d139e4b53802615833372728cc0e4' '08169715a665016e8e54a92f98768494' @@ -38,6 +35,9 @@ md5sums=('5487da14ca81715a469c7594d39722fa' '263725f20c0b9eb9c353040792d644e5' 'bb7fd1aa23016c8057046b84fd4eb528') +_kernelname=${pkgbase#linux-libre} +_localversionname=-LIBRE-XEN + build() { cd "${srcdir}/linux-${_basekernel}" diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD new file mode 100644 index 000000000..700c6b818 --- /dev/null +++ b/libre/cdfs-libre/PKGBUILD @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgname=cdfs +pkgname=cdfs-libre +pkgver=2.6.27 +pkgrel=27 +pkgdesc="File system module libre that 'exports' all tracks and boot images on a CD as normal files." +arch=(i686 x86_64) +url="http://www.elis.UGent.be/~ronsse/cdfs/" +license=('GPL') +makedepends=('linux-libre-headers') +replaces=('cdfs') +conflicts=('cdfs') +provides=("cdfs=${pkgver}") +install=cdfs.install +source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$_pkgname-$pkgver.tar.bz2" + "cdfs-3.0.patch" + "cdfs-3.2.patch" + "cdfs-3.4.patch") +md5sums=('ac64c014a90e3c488394832ea29605b3' + 'aba7da94a9dcbb8a93ea423cb6958fef' + 'e934407b3460257a301822ffc4ab3933' + '9215e7bdac728bd2f889fb525e543454') + +build() { + _kernver=`pacman -Q linux-libre | cut -d . -f 2 | cut -f 1 -d -` + depends=("linux-libre>=3.${_kernver}" "linux-libre<3.`expr ${_kernver} + 1`") + _kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-LIBRE/version` + + cd $srcdir/$_pkgname-$pkgver + patch -p1 <$srcdir/cdfs-3.0.patch + patch -p1 <$srcdir/cdfs-3.2.patch + patch -p1 <$srcdir/cdfs-3.4.patch + make KDIR=/usr/lib/modules/${_kernverfull}/build + install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-LIBRE/cdfs.ko + sed -i "s|extramodules-.*-LIBRE|extramodules-3.${_kernver}-LIBRE|" $startdir/cdfs.install +} diff --git a/libre/cdfs-libre/cdfs-3.0.patch b/libre/cdfs-libre/cdfs-3.0.patch new file mode 100644 index 000000000..445a28970 --- /dev/null +++ b/libre/cdfs-libre/cdfs-3.0.patch @@ -0,0 +1,274 @@ +diff -wbBur cdfs-2.6.27/cddata.c cdfs-2.6.27.my/cddata.c +--- cdfs-2.6.27/cddata.c 2009-12-21 17:04:03.000000000 +0300 ++++ cdfs-2.6.27.my/cddata.c 2011-07-24 21:18:44.000000000 +0400 +@@ -83,7 +83,7 @@ + #else + .mmap = generic_file_readonly_mmap, + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27) +- .sendfile = generic_file_sendfile ++// .sendfile = generic_file_sendfile + #else + .splice_read = generic_file_splice_read + #endif +diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c +--- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300 ++++ cdfs-2.6.27.my/root.c 2011-07-25 13:16:59.000000000 +0400 +@@ -32,19 +30,14 @@ + * Added code to transform /proc/cdfs into a sequential synthetic file. * + *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/ + +- + #include <linux/seq_file.h> +- +-#ifndef OLD_KERNEL + #include <linux/statfs.h> +-#endif ++#include <linux/sched.h> + + extern struct seq_operations cdfs_operations; + extern struct _track_info *dummy_track_p; + +-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) + struct inode *cdfs_iget(struct super_block *sp, unsigned long ino); +-#endif + /*============================================================================* + * cdfs_open() * + * Description: * +@@ -115,15 +108,8 @@ + + /********************************************************************/ + +-#ifdef OLD_KERNEL +-static struct super_block * cdfs_mount(struct super_block *sb, void *data, int silent){ +- kdev_t dev = sb->s_dev; +- int i, j, t; +- struct cdrom_tochdr hdr; +-#else + static int cdfs_fill_super(struct super_block *sb, void *data, int silent){ + int i, t; +-#endif + struct cdrom_tocentry entry; + int no_audio=0, no_data=0; + cd * this_cd; +@@ -131,24 +117,13 @@ + + PRINT("cdfs_mount\n"); + +-#ifdef OLD_KERNEL +- MOD_INC_USE_COUNT; +- +- set_blocksize(dev, CD_FRAMESIZE); // voor bread met ide-cd +-#else + sb_set_blocksize(sb, CD_FRAMESIZE); // voor bread met ide-cd +-#endif + + sb->s_blocksize = CD_FRAMESIZE; + sb->s_blocksize_bits = 11; + + if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){ +-#ifdef OLD_KERNEL +- MOD_DEC_USE_COUNT; +- return NULL; +-#else + return -ENOMEM; +-#endif + } + + this_cd->mode = MODE; +@@ -160,13 +135,8 @@ + + // Initialize cache for maximum sector size + if (!(this_cd->cache = kmalloc(CD_FRAMESIZE_RAWER*CACHE_SIZE, GFP_KERNEL))) { +-#ifdef OLD_KERNEL +- MOD_DEC_USE_COUNT; +- return NULL; +-#else + kfree(cdfs_info(sb)); + return -ENOMEM; +-#endif + } + + // Cache is still invalid +@@ -183,23 +153,13 @@ + if (this_cd->toc_scsi){ + if (cdfs_toc_read_full(sb)){ + printk("TOC read failed\n"); +-#ifdef OLD_KERNEL +- MOD_DEC_USE_COUNT; +- return NULL; +-#else + goto invalid; +-#endif + } + } else { + //if (cdfs_ioctl(sb, CDROMREADTOCHDR, (unsigned long)&hdr)){ + if (cdfs_toc_read(sb)){ + printk("cdfs_toc_read failed\n"); +-#ifdef OLD_KERNEL +- MOD_DEC_USE_COUNT; +- return NULL; +-#else + goto invalid; +-#endif + } + } + +@@ -365,11 +325,7 @@ + sb->s_flags |= MS_RDONLY; + sb->s_op = &cdfs_ops; + /* always get inode status */ +-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) + retinode=cdfs_iget(sb, 0); +-#else +- retinode=iget(sb, 0); +-#endif + if ( IS_ERR(retinode) ) + return PTR_ERR(retinode); + +@@ -379,16 +335,12 @@ + + cdfs_proc_cd = this_cd; + +-#ifdef OLD_KERNEL +- return sb; +-#else + return 0; + + invalid: + kfree(this_cd->cache); + kfree(cdfs_info(sb)); + return -EINVAL; +-#endif + } + + /************************************************************************/ +@@ -410,27 +362,12 @@ + // Remove /proc entry + cdfs_proc_cd = NULL; + kfree(cdfs_info(sb)); +- +-#ifdef OLD_KERNEL +- MOD_DEC_USE_COUNT; +-#endif +- + } + + /************************************************************************/ + +-#ifdef OLD_KERNEL +-static int cdfs_statfs(struct super_block *sb, struct statfs *buf) { +- cd * this_cd = cdfs_info(sb); +-#else +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) + static int cdfs_statfs(struct dentry *d, struct kstatfs *buf) { + cd * this_cd = cdfs_info(d->d_sb); +-#else +-static int cdfs_statfs(struct super_block *sb, struct kstatfs *buf) { +- cd * this_cd = cdfs_info(sb); +-#endif +-#endif + PRINT("rmfs_statfs\n"); + + buf->f_type = CDFS_MAGIC; +@@ -460,11 +397,7 @@ + + /************************************************************************/ + +-#ifdef OLD_KERNEL +-static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry){ +-#else + static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){ +-#endif + struct inode * inode; + int i; + cd * this_cd = cdfs_info(dir->i_sb); +@@ -480,15 +413,9 @@ + /* Use goto and read inode with iget()/cdfs_iget() */ + /* Thanks to David Howells for patch and Master class in his mail */ + found: +-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) + inode = cdfs_iget(dir->i_sb, i); + if (IS_ERR(inode)) + return ERR_CAST(inode); +-#else +- inode = iget(dir->i_sb, i); +- if (!inode) +- return ERR_PTR(-ENOMEM); +-#endif + d_add(dentry, inode); + return NULL; + } +@@ -529,12 +456,8 @@ + i->i_fop = &cdfs_dir_operations; + } else { /* file */ + i->i_size = this_cd->track[i->i_ino].size; +-#ifdef OLD_KERNEL +- i->i_mtime = i->i_atime = i->i_ctime = this_cd->track[i->i_ino].time; +-#else + i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = this_cd->track[i->i_ino].time; + i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0; +-#endif + i->i_mode = this_cd->mode; + if ((this_cd->track[i->i_ino].type==DATA) && this_cd->track[i->i_ino].iso_size) { + i->i_fop = &cdfs_cddata_file_operations; +@@ -587,33 +510,21 @@ + /******************************************************************/ + + static struct super_operations cdfs_ops = { +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25) +- .read_inode = cdfs_read_inode, +-#endif + .put_super = cdfs_umount, + .statfs = cdfs_statfs + }; + +-#ifdef OLD_KERNEL +-static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount); +-#else +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18) +-static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) { +- return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt); +-#else +-static struct super_block *cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) { +- return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super); +-#endif +-} ++//static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) { ++// return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt); ++//} + + static struct file_system_type cdfs_fs_type = { + .owner = THIS_MODULE, + .name = "cdfs", +- .get_sb = cdfs_get_sb, ++// .get_sb = cdfs_get_sb, + .kill_sb = kill_block_super, + .fs_flags = FS_REQUIRES_DEV + }; +-#endif + + /******************************************************/ + +@@ -621,10 +532,6 @@ + MODULE_DESCRIPTION("CDfs: a CD filesystem"); + MODULE_LICENSE("GPL"); + +-#ifdef OLD_KERNEL +-EXPORT_NO_SYMBOLS; +-#endif +- + /******************************************************************/ + + static int __init cdfs_init(void) { +@@ -676,11 +583,7 @@ + + if (!options) return; + +-#ifdef OLD_KERNEL +- for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) { +-#else + while ((this_char = strsep(&options,",")) != NULL) { +-#endif + + if (!strcmp(this_char,"single")) + this_cd->single=TRUE; diff --git a/libre/cdfs-libre/cdfs-3.2.patch b/libre/cdfs-libre/cdfs-3.2.patch new file mode 100644 index 000000000..b4ea610b5 --- /dev/null +++ b/libre/cdfs-libre/cdfs-3.2.patch @@ -0,0 +1,12 @@ +diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c +--- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300 ++++ cdfs-2.6.27.my/root.c 2012-01-18 11:23:03.000000000 +0400 +@@ -517,7 +517,7 @@ + + i->i_uid = this_cd->uid; + i->i_gid = this_cd->gid; +- i->i_nlink = 1; ++ i->__i_nlink = 1; + i->i_op = &cdfs_inode_operations; + i->i_fop = NULL; + i->i_data.a_ops = NULL; diff --git a/libre/cdfs-libre/cdfs-3.4.patch b/libre/cdfs-libre/cdfs-3.4.patch new file mode 100644 index 000000000..8e66bd85c --- /dev/null +++ b/libre/cdfs-libre/cdfs-3.4.patch @@ -0,0 +1,12 @@ +diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c +--- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300 ++++ cdfs-2.6.27.my/root.c 2012-06-15 17:09:27.000000000 +0400 +@@ -375,7 +375,7 @@ + + PRINT("retinode = %ld\n", retinode->i_ino); + +- sb->s_root = d_alloc_root(retinode); ++ sb->s_root = d_make_root(retinode); + + cdfs_proc_cd = this_cd; +
\ No newline at end of file diff --git a/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install new file mode 100644 index 000000000..1c3cb4f8e --- /dev/null +++ b/libre/cdfs-libre/cdfs.install @@ -0,0 +1,14 @@ +post_install() { + EXTRAMODULES='extramodules-3.5-LIBRE' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.5-LIBRE' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.5-LIBRE' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index e7d044b92..03c280487 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=41 +_sublevel=42 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.41 # nearly always the same as pkgver @@ -29,11 +29,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'i915-fix-ghost-tv-output.patch' 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") - -_kernelname=${pkgbase#linux-libre} -_localversionname=-LIBRE-LTS md5sums=('5f64180fe7df4e574dac5911b78f5067' - 'b4ebaa2ebf8418c75aba96fd4dd6daf3' + '8f1c9341d99e941b07d1d6f85f1953aa' '8cd05778fc1c2d8145b3b9932b4e3164' '87a54dc6251cf2adf35f72ddeddb6ea8' 'c072b17032e80debc6a8626299245d46' @@ -50,6 +47,9 @@ if [ "$CARCH" != "mips64el" ]; then unset md5sums[${#md5sums[@]}-1] fi +_kernelname=${pkgbase#linux-libre} +_localversionname=-LIBRE-LTS + build() { cd "${srcdir}/linux-${_basekernel}" diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index e92e5eb16..05124e7ab 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.41-1-LIBRE-LTS +KERNEL_VERSION=3.0.42-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' @@ -33,7 +33,7 @@ post_install () { post_upgrade() { pacman -Q grub &>/dev/null hasgrub=$? - pacman -Q grub2-common &>/dev/null + pacman -Q grub-common &>/dev/null hasgrub2=$? pacman -Q lilo &>/dev/null haslilo=$? diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 661fec088..e63be980b 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,9 +10,9 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.5 -_sublevel=2 +_sublevel=3 pkgver=${_basekernel}.${_sublevel} -pkgrel=1.1 +pkgrel=1 _lxopkgver=${_basekernel}.2 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -29,12 +29,12 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' + 'alsa-powersave-3.5.x.patch' + 'watchdog-3.5.x.patch' + 'i915-i2c-crash-3.5.x.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") - -_kernelname=${pkgbase#linux-libre} -_localversionname=-LIBRE md5sums=('2407fc9563a74acaf38aa0c06516eb1c' - 'b081f37b73c652cbb0d5193174092709' + '861f5f97c75b1a572fc5078605248ea3' '3ba164b409d8024fdd433f3cc4ae1fea' 'fa1e2ab2f036974199374f015f5a2c46' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -42,6 +42,9 @@ md5sums=('2407fc9563a74acaf38aa0c06516eb1c' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' + 'c1d58e712112cf8f95e7831012a1e67a' + 'ae13ed1e92bba07e9b17cf5c8d89683c' + 'ff4a203dd52e4dfb5d60948bb667d06d' 'd822cc131b20090f39b0d448b0e1f8be') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. @@ -49,6 +52,9 @@ if [ "$CARCH" != "mips64el" ]; then unset md5sums[${#md5sums[@]}-1] fi +_kernelname=${pkgbase#linux-libre} +_localversionname=-LIBRE + build() { cd "${srcdir}/linux-${_basekernel}" @@ -59,6 +65,17 @@ build() { # Add freedo as boot logo patch -Np1 -i "${srcdir}/boot-logo.patch" + # fix alsa powersave bug, probably fixed in 3.5.4 + # https://bugs.archlinux.org/task/31255 + patch -Np1 -i "${srcdir}/alsa-powersave-3.5.x.patch" + + # fix broken watchdog + # https://bugzilla.kernel.org/show_bug.cgi?id=44991 + patch -Np1 -i "${srcdir}/watchdog-3.5.x.patch" + + # fix i915 i2c crash + # https://bugzilla.kernel.org/show_bug.cgi?id=46381 + patch -Np1 -i "${srcdir}/i915-i2c-crash-3.5.x.patch" # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param) # remove this when a Kconfig knob is made available by upstream diff --git a/libre/linux-libre/alsa-powersave-3.5.x.patch b/libre/linux-libre/alsa-powersave-3.5.x.patch new file mode 100644 index 000000000..189fd1ceb --- /dev/null +++ b/libre/linux-libre/alsa-powersave-3.5.x.patch @@ -0,0 +1,29 @@ +From: Takashi Iwai <tiwai@suse.de> +Date: Mon, 20 Aug 2012 19:25:22 +0000 (+0200) +Subject: ALSA: hda - Fix leftover codec->power_transition +X-Git-Tag: v3.6-rc3~14^2~1 +X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux.git;a=commitdiff_plain;h=535b6c51fe8293c88ce919cdfc4390c67a1cb6d1 + +ALSA: hda - Fix leftover codec->power_transition + +When the codec turn-on operation is canceled by the immediate +power-on, the driver left the power_transition flag as is. +This caused the persistent avoidance of power-save behavior. + +Cc: <stable@vger.kernel.org> [v3.5+] +Signed-off-by: Takashi Iwai <tiwai@suse.de> +--- + +diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c +index c3077d5..f560051 100644 +--- a/sound/pci/hda/hda_codec.c ++++ b/sound/pci/hda/hda_codec.c +@@ -4454,6 +4454,8 @@ static void __snd_hda_power_up(struct hda_codec *codec, bool wait_power_down) + * then there is no need to go through power up here. + */ + if (codec->power_on) { ++ if (codec->power_transition < 0) ++ codec->power_transition = 0; + spin_unlock(&codec->power_lock); + return; + } diff --git a/libre/linux-libre/i915-i2c-crash-3.5.x.patch b/libre/linux-libre/i915-i2c-crash-3.5.x.patch new file mode 100644 index 000000000..d202b531c --- /dev/null +++ b/libre/linux-libre/i915-i2c-crash-3.5.x.patch @@ -0,0 +1,47 @@ +From cee25168e9c4ef7f9417632af2dc78b8521dfda7 Mon Sep 17 00:00:00 2001 +From: Jani Nikula <jani.nikula@intel.com> +Date: Mon, 13 Aug 2012 17:33:02 +0300 +Subject: [PATCH] drm/i915: ensure i2c adapter is all set before adding it + +i2c_add_adapter() may do i2c transfers on the bus to detect supported +devices. Therefore the adapter needs to be all set before adding it. This +was not the case for the bit-banging fallback, resulting in an oops if the +device detection GMBUS transfers timed out. Fix the issue by calling +i2c_add_adapter() only after intel_gpio_setup(). + +LKML-Reference: <5021F00B.7000503@ionic.de> +Tested-by: Mihai Moldovan <ionic@ionic.de> +Signed-off-by: Jani Nikula <jani.nikula@intel.com> +Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> +--- + drivers/gpu/drm/i915/intel_i2c.c | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c +index d79500b..b9755f6 100644 +--- a/drivers/gpu/drm/i915/intel_i2c.c ++++ b/drivers/gpu/drm/i915/intel_i2c.c +@@ -486,9 +486,6 @@ int intel_setup_gmbus(struct drm_device *dev) + bus->dev_priv = dev_priv; + + bus->adapter.algo = &gmbus_algorithm; +- ret = i2c_add_adapter(&bus->adapter); +- if (ret) +- goto err; + + /* By default use a conservative clock rate */ + bus->reg0 = port | GMBUS_RATE_100KHZ; +@@ -498,6 +495,10 @@ int intel_setup_gmbus(struct drm_device *dev) + bus->force_bit = true; + + intel_gpio_setup(bus, port); ++ ++ ret = i2c_add_adapter(&bus->adapter); ++ if (ret) ++ goto err; + } + + intel_i2c_reset(dev_priv->dev); +-- +1.7.7.6 + diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 59b77b82d..0cd51930e 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.5.2-1.1-LIBRE +KERNEL_VERSION=3.5.3-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' @@ -33,7 +33,7 @@ post_install () { post_upgrade() { pacman -Q grub &>/dev/null hasgrub=$? - pacman -Q grub2-common &>/dev/null + pacman -Q grub-common &>/dev/null hasgrub2=$? pacman -Q lilo &>/dev/null haslilo=$? diff --git a/libre/linux-libre/watchdog-3.5.x.patch b/libre/linux-libre/watchdog-3.5.x.patch new file mode 100644 index 000000000..7ac1e6732 --- /dev/null +++ b/libre/linux-libre/watchdog-3.5.x.patch @@ -0,0 +1,60 @@ +diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c +index 027cc8f..a05fdfc 100644 +--- a/drivers/mfd/lpc_ich.c ++++ b/drivers/mfd/lpc_ich.c +@@ -765,7 +765,6 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev, + u32 base_addr_cfg; + u32 base_addr; + int ret; +- bool acpi_conflict = false; + struct resource *res; + + /* Setup power management base register */ +@@ -780,20 +779,11 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev, + res = wdt_io_res(ICH_RES_IO_TCO); + res->start = base_addr + ACPIBASE_TCO_OFF; + res->end = base_addr + ACPIBASE_TCO_END; +- ret = acpi_check_resource_conflict(res); +- if (ret) { +- acpi_conflict = true; +- goto wdt_done; +- } + + res = wdt_io_res(ICH_RES_IO_SMI); + res->start = base_addr + ACPIBASE_SMI_OFF; + res->end = base_addr + ACPIBASE_SMI_END; +- ret = acpi_check_resource_conflict(res); +- if (ret) { +- acpi_conflict = true; +- goto wdt_done; +- } ++ + lpc_ich_enable_acpi_space(dev); + + /* +@@ -813,11 +803,6 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev, + res = wdt_mem_res(ICH_RES_MEM_GCS); + res->start = base_addr + ACPIBASE_GCS_OFF; + res->end = base_addr + ACPIBASE_GCS_END; +- ret = acpi_check_resource_conflict(res); +- if (ret) { +- acpi_conflict = true; +- goto wdt_done; +- } + } + + lpc_ich_finalize_cell(&lpc_ich_cells[LPC_WDT], id); +@@ -825,9 +810,6 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev, + 1, NULL, 0); + + wdt_done: +- if (acpi_conflict) +- pr_warn("Resource conflict(s) found affecting %s\n", +- lpc_ich_cells[LPC_WDT].name); + return ret; + } + +-- +1.7.1 + +
\ No newline at end of file diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 4b3384c25..0968afd17 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=25 +pkgrel=26 epoch=1 _extramodules=extramodules-3.5-LIBRE arch=('i686' 'x86_64' 'mips64el') @@ -63,7 +63,7 @@ build() { } package_lirc-libre() { - pkgdesc="Linux-libre Infrared Remote Control kernel modules for stock libre kernel" + pkgdesc="Linux-libre Infrared Remote Control kernel modules for stock kernel libre" depends=('lirc-utils-libre' 'linux-libre>=3.4' 'linux-libre<3.5') replaces=('lirc' 'lirc+pctv') conflicts=('lirc') diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 5e5b3411f..51c847e40 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20120422 _extramodules=extramodules-3.5-LIBRE -pkgrel=7.1 +pkgrel=8 pkgdesc="Kernel libre module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index 18b529e63..096fbc594 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-modules' 'virtualbox-libre-parabola-modules') pkgver=4.1.20 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/staging/telepathy-kde-common-internals/PKGBUILD b/staging/telepathy-kde-common-internals/PKGBUILD new file mode 100644 index 000000000..6759bd0ce --- /dev/null +++ b/staging/telepathy-kde-common-internals/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 165596 2012-08-26 19:03:12Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> + +pkgname=telepathy-kde-common-internals +_pkgname=ktp-common-internals +pkgver=0.5.0 +pkgrel=1 +pkgdesc="Common components for KDE-Telepathy" +arch=('i686' 'x86_64') +url="http://community.kde.org/Real-Time_Communication_and_Collaboration" +license=('GPL') +depends=('kdelibs' 'telepathy-qt' 'telepathy-mission-control') +makedepends=('cmake' 'automoc4') +groups=('kde-telepathy') +install=${pkgname}.install +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") +sha1sums=('34bac58049ede6df4fce1215fbc3b4ffc9671cba') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${_pkgname}-${pkgver} \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + make +} + +package() { + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install +} diff --git a/staging/telepathy-kde-common-internals/telepathy-kde-common-internals.install b/staging/telepathy-kde-common-internals/telepathy-kde-common-internals.install new file mode 100644 index 000000000..0b9f228a9 --- /dev/null +++ b/staging/telepathy-kde-common-internals/telepathy-kde-common-internals.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_update() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/staging/telepathy-logger-qt/PKGBUILD b/staging/telepathy-logger-qt/PKGBUILD new file mode 100644 index 000000000..9a1a1900b --- /dev/null +++ b/staging/telepathy-logger-qt/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 165594 2012-08-26 18:55:38Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: George Brooke <george+arch.aur@george-brooke.co.uk> + +pkgname=telepathy-logger-qt +pkgver=0.5.0 +pkgrel=1 +pkgdesc="Qt bindings for telepathy logger" +arch=('i686' 'x86_64') +url='https://projects.kde.org/projects/extragear/network/telepathy/telepathy-logger-qt' +license=('GPL') +depends=('telepathy-qt' 'telepathy-logger' 'qt-gstreamer' 'boost-libs') +makedepends=('automoc4' 'cmake' 'python2' 'boost' 'doxygen') +source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('09d949e60c5b140b20c61ec1d52830e7b98cd50e') + +build() { + cd "$srcdir" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir" install +} diff --git a/testing/libevent/PKGBUILD b/testing/libevent/PKGBUILD new file mode 100644 index 000000000..dff51f733 --- /dev/null +++ b/testing/libevent/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 165586 2012-08-26 13:51:21Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Judd <jvinet@zeroflux.org> + +pkgname=libevent +pkgver=2.0.20 +pkgrel=1 +pkgdesc="An event notification library" +arch=('i686' 'x86_64') +url="http://www.monkey.org/~provos/libevent/" +license=('BSD') +depends=('openssl') +optdepends=('python2: to use event_rpcgen.py') +options=('!libtool') +source=(https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-$pkgver-stable.tar.gz{,.asc}) + +build() { + cd "${srcdir}/${pkgname}-${pkgver}-stable" + sed -i 's#python#python2#' event_rpcgen.py + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}-stable" + make check || true # this never worked, should be taken upstream +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-stable" + make DESTDIR="${pkgdir}" install +} +md5sums=('94270cdee32c0cd0aa9f4ee6ede27e8e' + '5310233871ef2f2b3536114bf0377a42') diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD index b20882fd5..81b59dc32 100644 --- a/testing/systemd/PKGBUILD +++ b/testing/systemd/PKGBUILD @@ -2,48 +2,39 @@ # Contributor: Tom Gundersen <teg@jklm.no> pkgbase=systemd -pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') -pkgver=188 +pkgname=('systemd' 'systemd-sysvcompat') +pkgver=189 pkgrel=2 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' - 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'xz') + 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers' + 'pam' 'xz') options=('!libtool') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' - '0001-Reinstate-TIMEOUT-handling.patch' 'locale.sh' - 0001-shutdown-recursively-mark-root-as-private-before-piv.patch - 0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch + '0001-Reinstate-TIMEOUT-handling.patch' 'use-split-usr-path.patch') -md5sums=('d89b42699695554949d072ef46c0dfc9' +md5sums=('ac2eb313f5dce79622f60aac56bca66d' 'e99e9189aa2f6084ac28b8ddf605aeb8' '59e91c4d7a69b7bf12c86a9982e37ced' 'df69615503ad293c9ddf9d8b7755282d' - '5543be25f205f853a21fa5ee68e03f0d' 'f15956945052bb911e5df81cf5e7e5dc' - '49d145ef3ca299025c085555314212b6' - 'bccb994f4cfbd251b6c34d7d90a6ba0f' + '5543be25f205f853a21fa5ee68e03f0d' '482dba45a783f06c2239f1355f4ce72f') build() { cd "$pkgname-$pkgver" - # still waiting on ipw2x00 to get fixed... + # still waiting on ipw2x00, et al to get fixed... patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch" - patch -Np1 <"$srcdir/use-split-usr-path.patch" - - # http://bugs.archlinux.org/task/31089 - # upstream c516c8d17f77a1c761447f4c40c8dfffeda2e06d - patch -Np1 <"$srcdir/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch" - # http://bugs.archlinux.org/task/31092 - # upstream 4bfa638d43c05e8db052cd55818765bb3575a405 - patch -Np1 <"$srcdir/0001-shutdown-recursively-mark-root-as-private-before-piv.patch" + # hang onto this until we do the /{,s}bin merge + patch -Np1 <"$srcdir/use-split-usr-path.patch" ./configure \ --libexecdir=/usr/lib \ @@ -53,25 +44,25 @@ build() { --enable-gtk-doc \ --disable-audit \ --disable-ima \ - --with-pamlibdir=/usr/lib/security \ --with-distro=arch \ --with-usb-ids-path=/usr/share/hwdata/usb.ids \ - --with-pci-ids-path=/usr/share/hwdata/pci.ids \ - --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware + --with-pci-ids-path=/usr/share/hwdata/pci.ids make } package_systemd() { pkgdesc="system and service manager" - depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam' - "systemd-tools=$pkgver" 'util-linux' 'xz') - optdepends=('initscripts: legacy support for hostname and vconsole setup' - 'initscripts-systemd: legacy generator for initialization scripts' + depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' + 'pam' 'util-linux' 'xz') + provides=("libsystemd=$pkgver" "systemd-tools=$pkgver" "udev=$pkgver") + replaces=('libsystemd' 'systemd-tools' 'udev') + conflicts=('libsystemd' 'systemd-tools' 'udev') + optdepends=('initscripts: legacy support for /etc/rc.conf' 'python2-cairo: systemd-analyze' 'python2-dbus: systemd-analyze' - 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' - 'systemd-sysvcompat: symlink package to provide sysvinit binaries') + 'systemd-sysvcompat: symlink package to provide sysvinit binaries' + 'cryptsetup: required for encrypted block devices') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf etc/dbus-1/system.d/org.freedesktop.hostname1.conf etc/dbus-1/system.d/org.freedesktop.login1.conf @@ -80,7 +71,8 @@ package_systemd() { etc/systemd/system.conf etc/systemd/user.conf etc/systemd/logind.conf - etc/systemd/journald.conf) + etc/systemd/journald.conf + etc/udev/udev.conf) install="systemd.install" make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install @@ -101,104 +93,13 @@ package_systemd() { rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" rmdir "$pkgdir/etc/systemd/system/getty.target.wants" - ### get rid of RPM macros - rm -r "$pkgdir/etc/rpm/macros.systemd" + # get rid of RPM macros + rm -r "$pkgdir/etc/rpm" # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work. # https://pokersource.info/show_bug.cgi?id=50989 sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" - ### split off libsystemd (libs, includes, pkgconfig, man3) - rm -rf "$srcdir/_libsystemd" - install -dm755 "$srcdir"/_libsystemd/usr/{include,lib/pkgconfig} - cd "$srcdir"/_libsystemd - mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib - mv "$pkgdir/usr/include/systemd" usr/include - mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig - - ### split out manpages for sysvcompat - rm -rf "$srcdir/_sysvcompat" - install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ - mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ - "$srcdir"/_sysvcompat/usr/share/man/man8 - - ### split out systemd-tools/udev - rm -rf "$srcdir/_tools" - install -dm755 \ - "$srcdir"/_tools/etc/udev \ - "$srcdir"/_tools/usr/bin \ - "$srcdir"/_tools/usr/include \ - "$srcdir"/_tools/usr/lib/udev \ - "$srcdir"/_tools/usr/lib/systemd/system/{sysinit,sockets}.target.wants \ - "$srcdir"/_tools/usr/lib/girepository-1.0 \ - "$srcdir"/_tools/usr/share/pkgconfig \ - "$srcdir"/_tools/usr/share/gir-1.0 \ - "$srcdir"/_tools/usr/share/gtk-doc/html/{g,lib}udev \ - "$srcdir"/_tools/usr/share/man/man{1,5,7,8} - - cd "$srcdir/_tools" - mv "$pkgdir"/etc/udev etc - mv "$pkgdir"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d etc - mv "$pkgdir"/usr/bin/udevadm usr/bin - mv "$pkgdir"/usr/bin/systemd-machine-id-setup usr/bin - mv "$pkgdir"/usr/lib/pkgconfig usr/lib - mv "$pkgdir"/usr/lib/systemd/systemd-udevd usr/lib/systemd - mv "$pkgdir"/usr/lib/systemd/system/systemd-udev* usr/lib/systemd/system - mv "$pkgdir"/usr/lib/systemd/system/sysinit.target.wants/systemd-udev* usr/lib/systemd/system/sysinit.target.wants - mv "$pkgdir"/usr/lib/systemd/system/sockets.target.wants/systemd-udev* usr/lib/systemd/system/sockets.target.wants - mv "$pkgdir"/usr/lib/lib{,g}udev* usr/lib - mv "$pkgdir"/usr/lib/{binfmt,sysctl,modules-load,tmpfiles}.d usr/lib - mv "$pkgdir"/usr/lib/udev usr/lib - mv "$pkgdir"/usr/include/{libudev.h,gudev-1.0} usr/include - mv "$pkgdir"/usr/lib/girepository-1.0 usr/lib - mv "$pkgdir"/usr/share/pkgconfig/udev.pc usr/share/pkgconfig - mv "$pkgdir"/usr/share/gir-1.0 usr/share - mv "$pkgdir"/usr/share/gtk-doc/html/{g,lib}udev usr/share/gtk-doc/html - mv "$pkgdir"/usr/share/man/man7/udev.7 usr/share/man/man7 - mv "$pkgdir"/usr/share/man/man8/{systemd-tmpfiles,udevadm}.8 usr/share/man/man8 - mv "$pkgdir"/usr/share/man/man8/systemd-udevd{,.service,{-control,-kernel}.socket}.8 usr/share/man/man8 - mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1 usr/share/man/man1 - mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5 - mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf,crypttab}.5 usr/share/man/man5 - mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin - mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd -} - -package_systemd-sysvcompat() { - pkgdesc="sysvinit compat for systemd" - conflicts=('sysvinit' 'initscripts') - - mv "$srcdir/_sysvcompat"/* "$pkgdir" - - install -dm755 "$pkgdir/sbin" - for tool in runlevel reboot shutdown poweroff halt telinit; do - ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool" - done - - ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init" - - install -Dm755 "$srcdir/locale.sh" "$pkgdir/etc/profile.d/locale.sh" -} - -package_libsystemd() { - pkgdesc="systemd client libraries" - depends=('xz') - - mv "$srcdir/_libsystemd"/* "$pkgdir" -} - -package_systemd-tools() { - pkgdesc='standalone tools from systemd' - url='http://www.freedesktop.org/wiki/Software/systemd' - depends=('acl' 'bash' 'glibc' 'glib2' 'libsystemd' 'kmod' 'hwids' 'util-linux' 'kbd') - optdepends=('cryptsetup: required for encrypted block devices') - provides=("udev=$pkgver") - conflicts=('udev') - replaces=('udev') - install='systemd-tools.install' - - mv "$srcdir/_tools/"* "$pkgdir" - # the path to udevadm is hardcoded in some places install -d "$pkgdir/sbin" ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm" @@ -220,8 +121,29 @@ package_systemd-tools() { install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp" # XXX: kill off coredump rule until the journal can recover coredumps - # this file needs to come back as part of systemd, not systemd-tools rm "$pkgdir/usr/lib/sysctl.d/coredump.conf" + + ### split out manpages for sysvcompat + rm -rf "$srcdir/_sysvcompat" + install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ + mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ + "$srcdir"/_sysvcompat/usr/share/man/man8 +} + +package_systemd-sysvcompat() { + pkgdesc="sysvinit compat for systemd" + conflicts=('sysvinit' 'initscripts') + + mv "$srcdir/_sysvcompat"/* "$pkgdir" + + install -dm755 "$pkgdir/sbin" + for tool in runlevel reboot shutdown poweroff halt telinit; do + ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool" + done + + ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init" + + install -Dm755 "$srcdir/locale.sh" "$pkgdir/etc/profile.d/locale.sh" } # vim: ft=sh syn=sh et diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install index e369f094d..784926e17 100644 --- a/testing/systemd/systemd.install +++ b/testing/systemd/systemd.install @@ -8,22 +8,14 @@ post_install() { # enable getty@tty1 by default, but don't track the file systemctl enable getty@.service + systemd-machine-id-setup + echo ":: Append 'init=/bin/systemd' to your kernel command line in your" echo " bootloader to replace sysvinit with systemd" } post_upgrade() { - if sd_booted; then - # we moved the binary in 44-2 to /usr, so a reexec leads to a - # coredump. refuse this reexec and warn the user that they should - # reboot instead. - if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then - echo "warning: refusing to reexec systemd. the system should be rebooted." - else - systemctl daemon-reload - systemctl daemon-reexec - fi - fi + systemd-machine-id-setup # getty@tty1.service is no longer enabled by default, but we don't want to break # existing setups. |