diff options
42 files changed, 1132 insertions, 76 deletions
diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index 516b94be4..7bb76768d 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 44325 2011-04-05 15:37:14Z stativ $ +# $Id: PKGBUILD 47243 2011-05-19 13:26:51Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=10.0.3 -_pkgver=103.255 +pkgver=10.5 +_pkgver=107.105 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url="http://www.jetbrains.org/" license=('apache') depends=('glibc') source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('0309a9583febf6d9bfc803c386efcad4') +md5sums=('365d1a5ee9255175065c764d634b3698') build() { cd "$srcdir" diff --git a/community/libzrtpcpp/PKGBUILD b/community/libzrtpcpp/PKGBUILD index 5b61a13c6..0723c10b4 100644 --- a/community/libzrtpcpp/PKGBUILD +++ b/community/libzrtpcpp/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 32643 2010-11-16 09:56:02Z spupykin $ +# $Id: PKGBUILD 47218 2011-05-19 07:44:23Z andrea $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: # Contributor: Jeff Mickey <jeff@archlinux.org> @@ -6,7 +6,7 @@ pkgname=libzrtpcpp pkgver=1.4.2 -pkgrel=4 +pkgrel=5 pkgdesc="An extension to Real-time Transport Protocol (RTP) which describes a method of Diffie-Hellman key agreement for Secure Real-time Transport Protocol (SRTP)" arch=('i686' 'x86_64') url="http://zfoneproject.com" diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD index 45b9cb4ee..e81415f80 100644 --- a/community/mythplugins/PKGBUILD +++ b/community/mythplugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 42515 2011-03-17 12:34:35Z andrea $ +# $Id: PKGBUILD 47233 2011-05-19 08:56:57Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -14,8 +14,9 @@ pkgname=('mythplugins-mytharchive' 'mythplugins-mythweather' 'mythplugins-mythweb' 'mythplugins-mythzoneminder') -pkgver=0.24 -pkgrel=3 +pkgver=0.24.1 +pkgrel=1 +epoch=1 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') @@ -27,7 +28,7 @@ makedepends=("mythtv>=$pkgver" 'cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'perl-xml-xpath' 'perl-image-size' 'perl-datetime-format-iso8601') source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2" 'mtd.rc') -md5sums=('2bcb195a82475648040910d7afd054d1' +md5sums=('76aeefeff70b550b2d35c2d9d751df18' '476c12ba074794ad7f4ae092bdf949d6') build() { @@ -128,7 +129,7 @@ package_mythplugins-mythweb() { mkdir -p "$pkgdir/srv/http/mythweb"/{image_cache,php_sessions} cp -R "$srcdir/$pkgbase-$pkgver/mythweb"/* "$pkgdir/srv/http/mythweb" chown -R http:http "$pkgdir/srv/http/mythweb" - chmod g+rw "$pkgdir/srv/http/mythweb"/{image_cache,php_sessions,data} + chmod g+rw "$pkgdir/srv/http/mythweb"/{image_cache,php_sessions} } package_mythplugins-mythzoneminder() { diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 257c6c0bb..3a5e51c84 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 46888 2011-05-13 13:31:23Z jconder $ +# $Id: PKGBUILD 47228 2011-05-19 08:27:51Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,8 +6,8 @@ # Contributor: dorphell <dorphell@archlinux.org> pkgname=mythtv -pkgver=0.24 -pkgrel=2 +pkgver=0.24.1 +pkgrel=1 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') @@ -24,7 +24,7 @@ install='mythtv.install' source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" 'mythbackend.rc' 'mythbackend.conf') -md5sums=('1abe1d3cc72fdbde6daa4247dedbf29a' +md5sums=('6870c679619ec58456e76839745411d8' 'feadcc9ad064d93d6dceab1efc0bd9ed' 'bb8e4033d82428d827570fae9ba15e6a') diff --git a/community/nut/PKGBUILD b/community/nut/PKGBUILD index 5ac4a6796..2c279da72 100644 --- a/community/nut/PKGBUILD +++ b/community/nut/PKGBUILD @@ -2,14 +2,14 @@ # Contributor: Slash <demodevil5 [at] yahoo [dot] com> pkgname=nut -pkgver=16.10 +pkgver=16.11 pkgrel=1 pkgdesc='Records what you eat and analyzes your meals for nutrient levels in terms of the Daily Value or DV which is the standard for food labeling in the US.' url='http://nut.sourceforge.net/' license=('GPL') arch=('i686' 'x86_64') source=("http://downloads.sourceforge.net/project/nut/nut/${pkgver}/nut-${pkgver}.tar.gz") -md5sums=('7b360d0cc7fed5361f1220385af7aa1b') +md5sums=('dc3dee1abd590fdf40f8c33671404398') build() { cd ${pkgname}-${pkgver} diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD index ba1a9b22a..aa0f011a6 100644 --- a/community/systemd/PKGBUILD +++ b/community/systemd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 45855 2011-04-30 03:24:21Z dreisner $ +# $Id: PKGBUILD 47254 2011-05-20 00:38:37Z dreisner $ # Maintainer: Dave Reisner <d@falconindy.com> pkgname=systemd -pkgver=26 +pkgver=27 pkgrel=1 pkgdesc="Session and Startup manager" arch=('i686' 'x86_64') @@ -20,12 +20,14 @@ optdepends=('cryptsetup: required for encrypted block devices' groups=('systemd') options=('!libtool') backup=(etc/systemd/system.conf - etc/tmpfiles.d/systemd.conf - etc/tmpfiles.d/x11.conf) + etc/tmpfiles.d/console.conf + usr/lib/tmpfiles.d/legacy.conf + usr/lib/tmpfiles.d/systemd.conf + usr/lib/tmpfiles.d/x11.conf) install=systemd.install source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2" "os-release") -md5sums=('b7c468aa400c64d02d533eba6359e283' +md5sums=('6d6319e1817960459f13b300c4881f18' '752636def0db3c03f121f8b4f44a63cd') build() { diff --git a/community/twinkle/PKGBUILD b/community/twinkle/PKGBUILD index a7e4d92ad..152d08e3d 100644 --- a/community/twinkle/PKGBUILD +++ b/community/twinkle/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 41011 2011-03-03 04:44:11Z tdziedzic $ +# $Id: PKGBUILD 47223 2011-05-19 07:52:09Z andrea $ # Maintainer: # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> @@ -6,7 +6,7 @@ pkgname=twinkle pkgver=1.4.2 -pkgrel=8 +pkgrel=9 pkgdesc="A softphone for voice over IP and instant messaging communications using the SIP protocol" arch=('i686' 'x86_64') url="http://www.twinklephone.com/" diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD index be9e1c172..9869a976c 100644 --- a/core/file/PKGBUILD +++ b/core/file/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123428 2011-05-11 11:07:46Z allan $ +# $Id: PKGBUILD 123963 2011-05-15 08:19:29Z tpowa $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=file pkgver=5.07 -pkgrel=1 +pkgrel=3 pkgdesc="File type identification utility" arch=('i686' 'x86_64') license=('custom') @@ -13,9 +13,11 @@ url="http://www.darwinsys.com/file/" depends=('glibc' 'zlib') options=('!libtool') source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz - file-5.05-zip64.patch) + file-5.05-zip64.patch + file-5.07-zip-detect.patch) md5sums=('b8d1f9a8a644067bd0a703cebf3f4858' - '385f020467debd98bd2d8df6143f93d0') + '385f020467debd98bd2d8df6143f93d0' + 'bcbf2e152f38003a2736298bbd0f37f8') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,7 +25,7 @@ build() { # identify zip64 files patch -Np1 -i ${srcdir}/file-5.05-zip64.patch - + patch -Np1 -i ${srcdir}/file-5.07-zip-detect.patch ./configure --prefix=/usr --datadir=/usr/share/file make } diff --git a/core/file/file-5.07-zip-detect.patch b/core/file/file-5.07-zip-detect.patch new file mode 100644 index 000000000..3e8f128d8 --- /dev/null +++ b/core/file/file-5.07-zip-detect.patch @@ -0,0 +1,13 @@ +--- file-5.07/magic/Magdir/archive.old 2011-04-23 17:02:48.000000000 +0200 ++++ file-5.07/magic/Magdir/archive 2011-05-15 10:14:44.509271579 +0200 +@@ -654,6 +654,10 @@ + >>>>78 string -template Template + !:mime application/vnd.oasis.opendocument.image-template + ++>26 byte x Zip archive data ++ ++ ++ + # StarView Metafile + # From Pierre Ducroquet <pinaraf@pinaraf.info> + 0 string VCLMTF StarView MetaFile diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD index a2c47a73c..d2b07cf23 100644 --- a/core/grep/PKGBUILD +++ b/core/grep/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 91020 2010-09-21 03:26:36Z allan $ +# $Id: PKGBUILD 124062 2011-05-16 11:49:29Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=grep -pkgver=2.7 +pkgver=2.8 pkgrel=1 pkgdesc="A string search utility" arch=('i686' 'x86_64') @@ -14,12 +14,16 @@ depends=('glibc' 'pcre' 'sh') makedepends=('texinfo') install=${pkgname}.install source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('6dd9931a52501519d7779a27cf953326') +md5sums=('b59003c42b330bdabd417e00d07102da') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --bindir=/bin --without-included-regex make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} make check } diff --git a/core/grep/grep.install b/core/grep/grep.install index ba97d8994..7cd31301f 100644 --- a/core/grep/grep.install +++ b/core/grep/grep.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info filelist=(grep.info) post_install() { diff --git a/extra/curl/PKGBUILD b/extra/curl/PKGBUILD index 2e1f2dd4e..13048e9d9 100644 --- a/extra/curl/PKGBUILD +++ b/extra/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 120474 2011-04-24 01:23:51Z angvp $ +# $Id: PKGBUILD 123955 2011-05-14 18:55:23Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> @@ -6,12 +6,12 @@ pkgname=curl pkgver=7.21.6 -pkgrel=1 +pkgrel=2 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64') url="http://curl.haxx.se" license=('MIT') -depends=('zlib' 'openssl' 'bash' 'ca-certificates') +depends=('zlib' 'openssl' 'bash' 'ca-certificates' 'libssh2') options=('!libtool') source=(http://curl.haxx.se/download/${pkgname}-${pkgver}.tar.bz2 curlbuild.h) diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index 62c9797a6..d2cc35459 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 123419 2011-05-11 10:13:28Z bisson $ +# $Id: PKGBUILD 124340 2011-05-19 23:17:46Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=1.14 +pkgver=1.14.1 pkgrel=1 pkgdesc='Fast, lightweight image viewer which uses imlib2' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ depends=('giblib' 'curl' 'libxinerama') optdepends=('perl: feh-cam, webcam wrapper for feh') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('da8886b62aa46c8e85cbced73ef14d704ab66907') +sha1sums=('4d35b14c41cd8a753e6d8d334bab216c69361688') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libssh2/PKGBUILD b/extra/libssh2/PKGBUILD new file mode 100644 index 000000000..ddf30e72c --- /dev/null +++ b/extra/libssh2/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 124297 2011-05-19 05:00:38Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: ice-man <icemanf@gmail.com> + +pkgname=libssh2 +pkgver=1.2.7 +pkgrel=2 +pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" +url="http://www.libssh2.org/" +arch=('i686' 'x86_64') +license=('BSD') +depends=('openssl') +makedepends=('zlib') +options=('!libtool') +source=("http://www.libssh2.org/download/${pkgname}-${pkgver}.tar.gz") +md5sums=('a5d78344886f1282e4008c09bf568076') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD index 1cde9ae89..4ab535225 100644 --- a/extra/moc/PKGBUILD +++ b/extra/moc/PKGBUILD @@ -1,11 +1,9 @@ -# $Id: PKGBUILD 107458 2011-01-25 20:51:09Z remy $ -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: dorphell <dorphell@gmx.net> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# $Id: PKGBUILD 124292 2011-05-19 04:47:01Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=moc pkgver=2.4.4 -pkgrel=3 +pkgrel=4 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats" arch=('i686' 'x86_64') url="http://moc.daper.net/" @@ -18,27 +16,32 @@ optdepends=('speex: for using the speex plugin' 'libmpcdec: for using the musepack plugin' 'wavpack: for using the wavpack plugin' 'libmodplug: for using the modplug plugin') -options=('!libtool' 'force') -source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2) -md5sums=('647c770a5542a4ae5437386807a89796') -sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db') +options=('!libtool') +source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2 \ + gcc-undefined-symbols.diff curl-streams.diff) +md5sums=('647c770a5542a4ae5437386807a89796' + 'efacb8559e9145e15b0c25f8fa2a9d79' + 'bb9be1e80762851c57075c99a612af2f') +sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db' + 'a811a4ac7e049914aab528d3f06a6be6634c2720' + 'a58ca952d7f3b0ede19b95c53da96c090d0a94c4') build() { - cd ${srcdir}/${pkgname}-${pkgver} - - 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) - ./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 - make + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p0 -i ../gcc-undefined-symbols.diff + patch -p1 -i ../curl-streams.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) + ./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 + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/moc/curl-streams.diff b/extra/moc/curl-streams.diff new file mode 100644 index 000000000..2dbc38d54 --- /dev/null +++ b/extra/moc/curl-streams.diff @@ -0,0 +1,28 @@ +diff -u moc-2.4.4/io_curl.c moc-2.4.4/io_curl.c +--- a/io_curl.c 2007-07-08 08:54:45.000000000 +0200 ++++ b/io_curl.c 2011-05-18 09:09:40.000000000 +0200 +@@ -338,6 +338,8 @@ + fd_set read_fds, write_fds, exc_fds; + int max_fd; + int ret; ++ long milliseconds; ++ struct timeval timeout; + + logit ("Doing select()..."); + +@@ -356,8 +358,14 @@ + if (s->curl.wake_up_pipe[0] > max_fd) + max_fd = s->curl.wake_up_pipe[0]; + ++ curl_multi_timeout(s->curl.multi_handle, &milliseconds); ++ if(milliseconds <= 0) ++ milliseconds = 1000; /* just a cautionary default */ ++ timeout.tv_sec = milliseconds / 1000; ++ timeout.tv_usec = (milliseconds % 1000) * 1000; ++ + ret = select (max_fd + 1, &read_fds, &write_fds, +- &exc_fds, NULL); ++ &exc_fds, &timeout); + + if (ret < 0 && errno == EINTR) { + logit ("Interrupted"); diff --git a/extra/moc/gcc-undefined-symbols.diff b/extra/moc/gcc-undefined-symbols.diff new file mode 100644 index 000000000..09e9b8bda --- /dev/null +++ b/extra/moc/gcc-undefined-symbols.diff @@ -0,0 +1,12 @@ +--- decoder.c~ 2011-05-08 09:28:28.077137883 +0200 ++++ decoder.c 2011-05-10 21:40:48.887941968 +0200 +@@ -259,6 +259,9 @@ + for (i = 0; i < plugins_num; i++) + if (plugins[i].decoder->destroy) + plugins[i].decoder->destroy (); ++ for (i = 0; i < plugins_num; i++) ++ if (plugins[i].handle) ++ lt_dlclose(plugins[i].handle); + + if (lt_dlexit()) + logit ("lt_exit() failed: %s", lt_dlerror()); diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index 6843a2881..d22a45cfd 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 123813 2011-05-13 12:45:42Z bisson $ +# $Id: PKGBUILD 124325 2011-05-19 16:07:15Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Paul Mattal <paul@archlinux.org> pkgname=postfix pkgver=2.8.3 -pkgrel=2 +pkgrel=3 pkgdesc='Secure, fast, easy to administer drop in replacement for Sendmail (MTA)' url='http://www.postfix.org/' arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${p 'rc.d') sha1sums=('2604066f158f5327449960afd6334b996dc01799' '5fc3de6c7df1e5851a0a379e825148868808318b' - '050e6afc5886049682c945ce147b3c47fe113939') + '40c6be2eb55e6437a402f43775cdb3d22ea87a66') provides=('smtp-server' 'smtp-forwarder') replaces=('postfix-mysql' 'postfix-pgsql') diff --git a/extra/postfix/rc.d b/extra/postfix/rc.d index 94ccc2af0..fa314bb84 100755 --- a/extra/postfix/rc.d +++ b/extra/postfix/rc.d @@ -4,24 +4,23 @@ . /etc/rc.d/functions name=postfix -PID=$(pidof -o %PPID /usr/lib/postfix/master) case "$1" in start) stat_busy "Starting $name daemon" - [[ -z "$PID" ]] && /usr/sbin/postfix start &>/dev/null \ + /usr/sbin/postfix start &>/dev/null \ && { add_daemon $name; stat_done; } \ || { stat_fail; exit 1; } ;; stop) stat_busy "Stopping $name daemon" - [[ -n "$PID" ]] && /usr/sbin/postfix stop &>/dev/null \ + /usr/sbin/postfix stop &>/dev/null \ && { rm_daemon $name; stat_done; } \ || { stat_fail; exit 1; } ;; reload) stat_busy "Reloading $name daemon" - [[ -n "$PID" ]] && kill -HUP $PID &>/dev/null \ + /usr/sbin/postfix reload &>/dev/null \ && { stat_done; } \ || { stat_fail; exit 1; } ;; diff --git a/extra/telepathy-qt4/PKGBUILD b/extra/telepathy-qt4/PKGBUILD index 72c54c85e..033611f63 100644 --- a/extra/telepathy-qt4/PKGBUILD +++ b/extra/telepathy-qt4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 122345 2011-05-03 23:56:05Z andrea $ +# $Id: PKGBUILD 124315 2011-05-19 11:49:47Z andrea $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-qt4 -pkgver=0.5.16 +pkgver=0.6.0 pkgrel=1 pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ options=('!libtool') depends=('qt' 'telepathy-farsight') makedepends=('libxslt' 'python2' 'cmake') source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('82e36c051c74d323b329f69ac2c5427f') +md5sums=('2acb266af1a3f55f7104830ac8db2090') build() { cd "${srcdir}" diff --git a/extra/xfce4-settings/PKGBUILD b/extra/xfce4-settings/PKGBUILD index 9758849a8..ba264dd3d 100644 --- a/extra/xfce4-settings/PKGBUILD +++ b/extra/xfce4-settings/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 112925 2011-03-07 18:53:16Z andyrtr $ +# $Id: PKGBUILD 124328 2011-05-19 16:30:23Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=xfce4-settings -pkgver=4.8.1 -pkgrel=2 +pkgver=4.8.2 +pkgrel=1 pkgdesc="Settings manager for xfce" arch=('i686' 'x86_64') license=('GPL2') @@ -16,7 +16,7 @@ makedepends=('intltool') optdepends=('libcanberra: for sound control') source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2 xfce4-settings-4.6.0.patch) -md5sums=('0097476baadcc9bc9841d6b8e687b8eb' +md5sums=('a45420fea20f29265ab6785cb1d07377' '3046732e5d73c9939e7674602eadb1e2') build() { diff --git a/kde-unstable/calligra/PKGBUILD b/kde-unstable/calligra/PKGBUILD new file mode 100644 index 000000000..f155259d7 --- /dev/null +++ b/kde-unstable/calligra/PKGBUILD @@ -0,0 +1,341 @@ +# $Id: PKGBUILD 124312 2011-05-19 09:43:16Z andrea $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> + +pkgbase=calligra +pkgname=('calligra-filters' + 'calligra-interfaces' + 'calligra-libs' + 'calligra-plugins' + 'calligra-pics' + 'calligra-servicetypes' + 'calligra-templates' + 'calligra-tools' + 'calligra-karbon' + 'calligra-karbon-doc' + 'calligra-kexi' + 'calligra-kexi-doc' + 'calligra-kformula' + 'calligra-kformula-doc' + 'calligra-kounavail' + 'calligra-kplato' + 'calligra-stage' + 'calligra-stage-doc' + 'calligra-krita' + 'calligra-tables' + 'calligra-tables-doc' + 'calligra-words' + 'calligra-handbook' + 'calligra-thesaurus-doc' + 'calligra-braindump' + 'calligra-flow') +pkgver=2.3.71 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.calligra-suite.org' +license=('FDL1.2' 'GPL2' 'LGPL') +makedepends=('kdelibs' 'kdepimlibs' 'eigen' 'lcms2' 'postgresql-libs' 'freetds' + 'kdegraphics-okular' 'libgsf' 'libwpd' 'libwpg' 'pstoedit' 'glew' + 'gsl' 'cmake' 'automoc4' 'boost') +groups=('calligra') +source=("http://download.kde.org/unstable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") +md5sums=('f280add8d1d57cc701dc105fc92d2504') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_calligra-filters() { + pkgdesc="Filters for the Calligra office suite" + optdepends=('libgsf: Microsoft Word document importer' + 'libwpd: WordPerfect document importer' + 'libwpg: Corel WordPerfect Graphics image importer' + 'pstoedit: Karbon EPS import filter' + 'kdegraphics-libs: support for raw images') + conflicts=('koffice-filters') + replaces=('koffice-filters') + install=calligra-filters.install + + cd "${srcdir}"/build/filters + make DESTDIR="${pkgdir}" install +} + +package_calligra-interfaces() { + pkgdesc="Interfaces for the Calligra office suite" + depends=('calligra-libs') + conflicts=('koffice-interfaces') + replaces=('koffice-interfaces') + + cd "${srcdir}"/build/interfaces + make DESTDIR="${pkgdir}" install +} + +package_calligra-libs() { + pkgdesc="Libraries for the Calligra office suite" + depends=('kdepimlibs' 'lcms2' 'calligra-servicetypes') + conflicts=('koffice-libs') + replaces=('koffice-libs') + + cd "${srcdir}"/build/libs + make DESTDIR="${pkgdir}" install +} + +package_calligra-plugins() { + pkgdesc="Plugins for the Calligra office suite" + depends=('calligra-libs') + conflicts=('koffice-plugins' 'koffice-kchart') + replaces=('koffice-plugins' 'koffice-kchart') + + cd "${srcdir}"/build/plugins + make DESTDIR="${pkgdir}" install +} + +package_calligra-pics() { + pkgdesc="Icons for the Calligra office suite" + depends=('calligra-libs') + conflicts=('koffice-pics') + replaces=('koffice-pics') + install=calligra.install + + cd "${srcdir}"/build/pics + make DESTDIR="${pkgdir}" install +} + +package_calligra-servicetypes() { + pkgdesc="Servicetypes for the Calligra office suite" + conflicts=('koffice-servicetypes') + replaces=('koffice-servicetypes') + install=calligra.install + + cd "${srcdir}"/build/servicetypes + make DESTDIR="${pkgdir}" install +} + +package_calligra-templates() { + pkgdesc="Templates for the Calligra office suite" + conflicts=('koffice-templates') + replaces=('koffice-templates') + + cd "${srcdir}"/build/templates + make DESTDIR="${pkgdir}" install +} + +package_calligra-tools() { + pkgdesc="Tools for the Calligra office suite" + depends=('calligra-libs') + conflicts=('koffice-tools') + replaces=('koffice-tools') + install=calligra-tools.install + + cd "${srcdir}"/build/tools + make DESTDIR="${pkgdir}" install +} + +#### package common files done ##### + +#### package apps and their docs ##### + +package_calligra-karbon() { + pkgdesc="Create scalable vector drawings" + depends=('calligra-libs' 'calligra-templates') + conflicts=('koffice-karbon') + replaces=('koffice-karbon') + install=calligra-karbon.install + + cd "${srcdir}"/build/karbon + make DESTDIR="${pkgdir}" install +} + +package_calligra-karbon-doc() { + pkgdesc="Documentation for Karbon" + depends=('calligra-karbon') + conflicts=('koffice-karbon-doc') + replaces=('koffice-karbon-doc') + + cd "${srcdir}"/build/doc/karbon + make DESTDIR="${pkgdir}" install +} + +package_calligra-kexi() { + pkgdesc="Develop desktop database applications" + depends=('calligra-libs' 'calligra-templates') + conflicts=('koffice-kexi') + replaces=('koffice-kexi') + install=calligra-kexi.install + + cd "${srcdir}"/build/kexi + make DESTDIR="${pkgdir}" install +} + +package_calligra-kexi-doc() { + pkgdesc="Documentation for Kexi" + depends=('calligra-kexi') + conflicts=('koffice-kexi-doc') + replaces=('koffice-kexi-doc') + + cd "${srcdir}"/build/doc/kexi + make DESTDIR="${pkgdir}" install +} + +package_calligra-kformula() { + pkgdesc="Formula editor" + depends=('calligra-libs' 'calligra-templates') + conflicts=('koffice-kformula') + replaces=('koffice-kformula') + install=calligra-kformula.install + + cd "${srcdir}"/build/kformula + make DESTDIR="${pkgdir}" install +} + +package_calligra-kformula-doc() { + pkgdesc="Documentation for KFormula" + depends=('calligra-kformula') + conflicts=('koffice-kformula-doc') + replaces=('koffice-kformula-doc') + + cd "${srcdir}"/build/doc/kformula + make DESTDIR="${pkgdir}" install +} + +package_calligra-kounavail() { + pkgdesc="Unavailable Calligra Document" + depends=('calligra-libs') + conflicts=('koffice-kounavail') + replaces=('koffice-kounavail') + + cd "${srcdir}"/build/kounavail + make DESTDIR="${pkgdir}" install +} + +package_calligra-kplato() { + pkgdesc="Calligra Project Management Component" + depends=('calligra-words') + conflicts=('koffice-kplato') + replaces=('koffice-kplato') + install=calligra-kplato.install + + cd "${srcdir}"/build/kplato + make DESTDIR="${pkgdir}" install +} + +package_calligra-stage() { + pkgdesc="Write presentation documents" + depends=('calligra-libs' 'calligra-templates') + optdepends=('koffice-filters: import/export filters') + conflicts=('koffice-kpresenter') + replaces=('koffice-kpresenter') + install=calligra-stage.install + + cd "${srcdir}"/build/kpresenter + make DESTDIR="${pkgdir}" install +} + +package_calligra-stage-doc() { + pkgdesc="Documentation for Stage" + depends=('calligra-stage') + conflicts=('koffice-kpresenter-doc') + replaces=('koffice-kpresenter-doc') + + cd "${srcdir}"/build/doc/stage + make DESTDIR="${pkgdir}" install +} + +package_calligra-krita() { + pkgdesc="Edit and paint images" + depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'glew' + 'qimageblitz' 'poppler-qt' 'openexr' 'opengtl') + optdepends=('koffice-filters: import/export filters') + conflicts=('koffice-krita') + replaces=('koffice-krita') + install=calligra-krita.install + + cd "${srcdir}"/build/krita + make DESTDIR="${pkgdir}" install +} + +package_calligra-tables() { + pkgdesc="Write spreadsheet documents" + depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'gsl') + optdepends=('koffice-filters: import/export filters') + conflicts=('koffice-kspread') + replaces=('koffice-kspread') + install=calligra-tables.install + + cd "${srcdir}"/build/tables + make DESTDIR="${pkgdir}" install +} + +package_calligra-tables-doc() { + pkgdesc="Documentation for Tables" + depends=('calligra-tables') + conflicts=('koffice-kspread-doc') + replaces=('koffice-kspread-doc') + + cd "${srcdir}"/build/doc/tables + make DESTDIR="${pkgdir}" install +} + +package_calligra-words() { + pkgdesc="Word Processor" + depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'calligra-pics' + 'calligra-kounavail') + optdepends=('koffice-filters: import/export filters') + conflicts=('koffice-kword') + replaces=('koffice-kword') + install=calligra-words.install + + cd "${srcdir}"/build/words + make DESTDIR="${pkgdir}" install +} + +package_calligra-handbook() { + pkgdesc="Documentation for Calligra" + conflicts=('koffice-handbook') + replaces=('koffice-handbook') + + cd "${srcdir}"/build/doc/calligra + make DESTDIR="${pkgdir}" install +} + +package_calligra-thesaurus-doc() { + pkgdesc="Documentation for Thesaurus" + conflicts=('koffice-thesaurus-doc') + replaces=('koffice-thesaurus-doc') + + cd "${srcdir}"/build/doc/thesaurus + make DESTDIR="${pkgdir}" install +} + +package_calligra-braindump() { + pkgdesc="Notes and idea gathering" + install=calligra-braindump.install + + cd "${srcdir}"/build/braindump + make DESTDIR="${pkgdir}" install +} + +package_calligra-flow() { + pkgdesc="Flowchart & Diagram Editing" + install=calligra-flow.install + + cd "${srcdir}"/build/flow + make DESTDIR="${pkgdir}" install +} + +package_calligra-flow-doc() { + pkgdesc="Documentation for Flow" + depends=('calligra-flow') + + cd "${srcdir}"/build/doc/flow + make DESTDIR="${pkgdir}" install +} + +##### package apps done ##### diff --git a/kde-unstable/calligra/calligra-braindump.install b/kde-unstable/calligra/calligra-braindump.install new file mode 100644 index 000000000..c2179f6e2 --- /dev/null +++ b/kde-unstable/calligra/calligra-braindump.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/kde-unstable/calligra/calligra-filters.install b/kde-unstable/calligra/calligra-filters.install new file mode 100644 index 000000000..7c8a8bd2b --- /dev/null +++ b/kde-unstable/calligra/calligra-filters.install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/calligra/calligra-flow.install b/kde-unstable/calligra/calligra-flow.install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/kde-unstable/calligra/calligra-flow.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/calligra/calligra-karbon.install b/kde-unstable/calligra/calligra-karbon.install new file mode 100644 index 000000000..c2179f6e2 --- /dev/null +++ b/kde-unstable/calligra/calligra-karbon.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/kde-unstable/calligra/calligra-kexi.install b/kde-unstable/calligra/calligra-kexi.install new file mode 100644 index 000000000..b8c7ebf27 --- /dev/null +++ b/kde-unstable/calligra/calligra-kexi.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/calligra/calligra-kformula.install b/kde-unstable/calligra/calligra-kformula.install new file mode 100644 index 000000000..c2179f6e2 --- /dev/null +++ b/kde-unstable/calligra/calligra-kformula.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/kde-unstable/calligra/calligra-kplato.install b/kde-unstable/calligra/calligra-kplato.install new file mode 100644 index 000000000..c2179f6e2 --- /dev/null +++ b/kde-unstable/calligra/calligra-kplato.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/kde-unstable/calligra/calligra-krita.install b/kde-unstable/calligra/calligra-krita.install new file mode 100644 index 000000000..33d234a02 --- /dev/null +++ b/kde-unstable/calligra/calligra-krita.install @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/kde-unstable/calligra/calligra-stage.install b/kde-unstable/calligra/calligra-stage.install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/kde-unstable/calligra/calligra-stage.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/calligra/calligra-tables.install b/kde-unstable/calligra/calligra-tables.install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/kde-unstable/calligra/calligra-tables.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/calligra/calligra-tools.install b/kde-unstable/calligra/calligra-tools.install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/kde-unstable/calligra/calligra-tools.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/calligra/calligra-words.install b/kde-unstable/calligra/calligra-words.install new file mode 100644 index 000000000..6c87527e2 --- /dev/null +++ b/kde-unstable/calligra/calligra-words.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/kde-unstable/calligra/calligra.install b/kde-unstable/calligra/calligra.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/kde-unstable/calligra/calligra.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/sqlite3/PKGBUILD b/testing/sqlite3/PKGBUILD new file mode 100644 index 000000000..63be526f7 --- /dev/null +++ b/testing/sqlite3/PKGBUILD @@ -0,0 +1,75 @@ +# $Id: PKGBUILD 124333 2011-05-19 19:31:27Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> + +pkgbase="sqlite3" +pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') +_amalgamationver=3070603 +_amalgamationver2=${_amalgamationver/00/} +_docver=3070600 +pkgver=${_amalgamationver2//0/.} +pkgrel=1 +pkgdesc="A C library that implements an SQL database engine" +arch=('i686' 'x86_64') +license=('custom') +url="http://www.sqlite.org/" +makedepends=('tcl' 'readline>=6.0.00') +source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA) + http://www.sqlite.org/sqlite-autoconf-$_amalgamationver.tar.gz + #http://www.sqlite.org/sqlite-doc-${_amalgamationver}.zip + http://www.sqlite.org/sqlite-doc-${_docver}.zip + license.txt) +options=('!libtool' '!emptydirs') +md5sums=('7eb41eea5ffa5cbe359a48629084c425' + '1c9b9da6f98f1da2d8958254662c393c' + 'c1cdbc5544034d9012e421e75a5e4890') + +build() { + export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE" + + # build sqlite + cd "$srcdir"/sqlite-autoconf-$_amalgamationver + ./configure --prefix=/usr \ + --disable-static + make + + # build the tcl extension + cd "$srcdir"/sqlite-autoconf-$_amalgamationver/tea + ./configure --prefix=/usr \ + --with-system-sqlite + make + +} + +package_sqlite3() { + + pkgdesc="A C library that implements an SQL database engine" + depends=('readline>=6.0.00') + conflicts=('sqlite') + replaces=('sqlite') + + cd ${srcdir}/sqlite-autoconf-$_amalgamationver + make DESTDIR=${pkgdir} install + + # license + install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license.txt +} + +package_sqlite3-tcl() { + + pkgdesc="sqlite3 Tcl Extension Architecture (TEA)" + depends=('sqlite3>=3.7.5') + + cd ${srcdir}/sqlite-autoconf-$_amalgamationver/tea + make DESTDIR=${pkgdir} install +} + +package_sqlite3-doc() { + pkgdesc="most of the static HTML files that comprise this website, including all of the SQL Syntax and the C/C++ interface specs and other miscellaneous documentation" + #arch=('any') - not yet supported + + #cd ${srcdir}/sqlite-doc-${_amalgamationver} + cd ${srcdir}/sqlite-doc-${_docver} + mkdir -p ${pkgdir}/usr/share/doc/${pkgbase} + cp -R * ${pkgdir}/usr/share/doc/${pkgbase}/ +} diff --git a/testing/sqlite3/license.txt b/testing/sqlite3/license.txt new file mode 100644 index 000000000..118c5d5e6 --- /dev/null +++ b/testing/sqlite3/license.txt @@ -0,0 +1,33 @@ +SQLite Copyright +SQLite is in the +Public Domain + + +All of the deliverable code in SQLite has been dedicated to the public domain by the authors. All code authors, and representatives of the companies they work for, have signed affidavits dedicating their contributions to the public domain and originals of those signed affidavits are stored in a firesafe at the main offices of Hwaci. Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original SQLite code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means. + +The previous paragraph applies to the deliverable code in SQLite - those parts of the SQLite library that you actually bundle and ship with a larger application. Portions of the documentation and some code used as part of the build process might fall under other licenses. The details here are unclear. We do not worry about the licensing of the documentation and build code so much because none of these things are part of the core deliverable SQLite library. + +All of the deliverable code in SQLite has been written from scratch. No code has been taken from other projects or from the open internet. Every line of code can be traced back to its original author, and all of those authors have public domain dedications on file. So the SQLite code base is clean and is uncontaminated with licensed code from other projects. +Obtaining An Explicit License To Use SQLite + +Even though SQLite is in the public domain and does not require a license, some users want to obtain a license anyway. Some reasons for obtaining a license include: +You are using SQLite in a jurisdiction that does not recognize the public domain. +You are using SQLite in a jurisdiction that does not recognize the right of an author to dedicate their work to the public domain. +You want to hold a tangible legal document as evidence that you have the legal right to use and distribute SQLite. +Your legal department tells you that you have to purchase a license. + +If you feel like you really have to purchase a license for SQLite, Hwaci, the company that employs the architect and principal developers of SQLite, will sell you one. +Contributed Code + +In order to keep SQLite completely free and unencumbered by copyright, all new contributors to the SQLite code base are asked to dedicate their contributions to the public domain. If you want to send a patch or enhancement for possible inclusion in the SQLite source tree, please accompany the patch with the following statement: +The author or authors of this code dedicate any and all copyright interest in this code to the public domain. We make this dedication for the benefit of the public at large and to the detriment of our heirs and successors. We intend this dedication to be an overt act of relinquishment in perpetuity of all present and future rights to this code under copyright law. + +We are not able to accept patches or changes to SQLite that are not accompanied by a statement such as the above. In addition, if you make changes or enhancements as an employee, then a simple statement such as the above is insufficient. You must also send by surface mail a copyright release signed by a company officer. A signed original of the copyright release should be mailed to: +Hwaci +6200 Maple Cove Lane +Charlotte, NC 28269 +USA + +A template copyright release is available in PDF or HTML. You can use this release to make future changes. + +see http://www.sqlite.org/copyright.html
\ No newline at end of file diff --git a/testing/udev/80-drivers.rules b/testing/udev/80-drivers.rules new file mode 100644 index 000000000..56ac06cb4 --- /dev/null +++ b/testing/udev/80-drivers.rules @@ -0,0 +1,14 @@ +# do not edit this file, it will be overwritten on update + +ACTION=="remove", GOTO="drivers_end" + +DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}" +SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/lib/udev/load-modules.sh tifm_sd" +SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh tifm_ms" +SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh ms_block" +SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh mspro_block" +SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block" +SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg" +SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/lib/udev/load-modules.sh ppdev" + +LABEL="drivers_end" diff --git a/testing/udev/81-arch.rules b/testing/udev/81-arch.rules new file mode 100644 index 000000000..3e71a9118 --- /dev/null +++ b/testing/udev/81-arch.rules @@ -0,0 +1,114 @@ +# Udev rules for Archlinux by Tobias Powalowski <tpowa@archlinux.org> +# do not edit this file, it will be overwritten on update +# +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %k the kernel name for the device. +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute. +# %% the '%' char itself. +# +# There are a number of modifiers that are allowed to be used in some of the +# fields. See the udev man page for a full description of them. +# 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" + +# permissions for IDE CD devices +SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", GROUP="optical" + +# permissions for SCSI CD devices +SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", SYMLINK+="scd%n", GROUP="optical" +SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", GROUP="optical" + +# permissions for removable devices like cardreaders or sticks +KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="0", GROUP="storage" + +# permissions for firewire external drives +KERNEL=="sd*", ATTRS{scsi_level}=="5", GROUP="storage" + +# permissions for usb to scsi external adapters +KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="7", GROUP="storage" + +# permissions for ide storage like pcmcia card readers +ACTION!="add", GOTO="pcmcia_end" +SUBSYSTEM!="block", GOTO="pcmcia_end" +KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode" +KERNEL=="hd*", IMPORT{parent}=="ID_*" +KERNEL=="hd*", ENV{ID_TYPE}=="generic", GROUP="storage" +LABEL="pcmcia_end" + +# permissions for SCSI scanners +SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="6", GROUP="scanner" + +# mem +KERNEL=="ram0", SYMLINK+="ramdisk" +KERNEL=="ram1", SYMLINK+="ram" + +# video4linux + +KERNEL=="vbi0", SYMLINK+="vbi" +KERNEL=="radio0", SYMLINK+="radio" +KERNEL=="radio[0-9]*", GROUP="video" +KERNEL=="video0", SYMLINK+="video" +KERNEL=="vtx0", SYMLINK+="vtx" + +# video devices +### xorg resets those permissions, adjust your xorg.conf! +KERNEL=="3dfx*", GROUP="video" +KERNEL=="fb[0-9]*", GROUP="video" + +# misc +KERNEL=="sgi_fetchop", MODE="0666" +KERNEL=="sonypi", MODE="0666" + +# USB devices +KERNEL=="legousbtower*", MODE="0666" + +# kbd devices +KERNEL=="kbd", MODE="0664" + +# miscellaneous +KERNEL=="rtc|rtc0", GROUP="audio", MODE="0664" +####################################### +# Permissions and Symlinks - end +####################################### diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD new file mode 100644 index 000000000..26d06b7e2 --- /dev/null +++ b/testing/udev/PKGBUILD @@ -0,0 +1,102 @@ +# $Id: PKGBUILD 124322 2011-05-19 15:55:28Z tomegun $ +# Maintainer: Aaron Griffin <aaron@archlinux.org> +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Maintainer: Thomas Bächler <thomas@archlinux.org> +# Maintainer: Tom Gundersen <teg@jklm.no> + +pkgbase="udev" +pkgname=('udev' 'udev-compat') +pkgver=169 +pkgrel=1 +arch=(i686 x86_64) +url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" +license=('GPL') +groups=('base') +# older initscripts versions required start_udev +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) + +build() { + cd $srcdir/$pkgbase-$pkgver + ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\ + --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system\ + --disable-rule-generator + make +} + +package_udev() { + pkgdesc="The userspace dev tools (udev)" + depends=('glibc' 'coreutils' 'util-linux' 'libusb-compat' 'glib2' + 'module-init-tools>=3.11' 'pciutils') + install=udev.install + backup=(etc/udev/udev.conf + etc/modprobe.d/framebuffer_blacklist.conf) + conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07') + replaces=('devfsd') + + 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/ + for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko.gz' -exec basename {} .ko.gz \;); do + echo "blacklist $mod" + done | sort -u > $pkgdir/etc/modprobe.d/framebuffer_blacklist.conf + + # create static devices in /lib/udev/devices/ + mkdir ${pkgdir}/lib/udev/devices/pts + mkdir ${pkgdir}/lib/udev/devices/shm + + mknod -m 0600 ${pkgdir}/lib/udev/devices/console c 5 1 + mknod -m 0666 ${pkgdir}/lib/udev/devices/null c 1 3 + mknod -m 0660 ${pkgdir}/lib/udev/devices/zero c 1 5 + mknod -m 0666 ${pkgdir}/lib/udev/devices/kmsg c 1 11 + + ln -snf /proc/self/fd ${pkgdir}/lib/udev/devices/fd + ln -snf /proc/self/fd/0 ${pkgdir}/lib/udev/devices/stdin + ln -snf /proc/self/fd/1 ${pkgdir}/lib/udev/devices/stdout + ln -snf /proc/self/fd/2 ${pkgdir}/lib/udev/devices/stderr + ln -snf /proc/kcore ${pkgdir}/lib/udev/devices/core + + # these static devices are created for convenience, to autoload the modules if necessary + # /dev/loop0 + mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0 + chgrp disk ${pkgdir}/lib/udev/devices/loop0 + # /dev/net/tun + mkdir ${pkgdir}/lib/udev/devices/net + mknod -m 0666 ${pkgdir}/lib/udev/devices/net/tun c 10 200 + # /dev/fuse + mknod -m 0666 ${pkgdir}/lib/udev/devices/fuse c 10 229 + # /dev/ppp + mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0 + + # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group + for i in $pkgdir/lib/udev/rules.d/*.rules; do + sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; + s#GROUP="tape"#GROUP="storage"#g; + s#GROUP="cdrom"#GROUP="optical"#g' $i + done +} + +package_udev-compat() { + pkgdesc="The userspace dev tools (udev) - additional rules for older kernels" + depends=('udev') + groups=('') + cd $srcdir/$pkgbase-$pkgver + install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules +} +md5sums=('967c66e6b8e29d7cfc98326c5b00454d' + '4427855146513a4703ab5c7eb8a0156e' + 'd8725e64fd0ce6e784ae795fae424c0a' + 'f91fddc67609b45b244a624977c4247b') diff --git a/testing/udev/load-modules.sh b/testing/udev/load-modules.sh new file mode 100755 index 000000000..1e2af913e --- /dev/null +++ b/testing/udev/load-modules.sh @@ -0,0 +1,80 @@ +#!/bin/bash +# Implement blacklisting for udev-loaded modules + +[ $# -ne 1 ] && exit 1 + +. /etc/rc.conf + +# grab modules from rc.conf +BLACKLIST="${MOD_BLACKLIST[@]}" +MODPROBE="/sbin/modprobe" +LOGGER="/usr/bin/logger" +RESOLVEALIAS="${MODPROBE} --resolve-alias" +USEBLACKLIST="--use-blacklist" + +if [ -f /proc/cmdline ]; then + for cmd in $(cat /proc/cmdline); do + case $cmd in + disablemodules=*) eval $cmd ;; + load_modules=off) exit ;; + esac + done + #parse cmdline entries of the form "disablemodules=x,y,z" + if [ -n "$disablemodules" ]; then + BLACKLIST="$BLACKLIST $(echo $disablemodules | sed 's|,| |g')" + fi +fi + +#MODULES entries in rc.conf that begin with ! are blacklisted +for mod in ${MODULES[@]}; do + if [ "${mod}" != "${mod#!}" ]; then + BLACKLIST="$BLACKLIST ${mod#!}" + fi +done + +if [ "$MOD_AUTOLOAD" = "yes" -o "$MOD_AUTOLOAD" = "YES" ]; then + if [ -n "${BLACKLIST}" ]; then + # If an alias name is on the blacklist, load no modules for this device + if echo "${BLACKLIST}" | /bin/grep -q -e " $1 " -e "^$1 " -e " $1\$"; then + $LOGGER -p info -t "$(basename $0)" "Not loading module alias '$1' because it is blacklisted" + exit + fi + #sanitize the blacklist + BLACKLIST="$(echo "$BLACKLIST" | sed -e 's|-|_|g')" + # Try to find all modules for the alias + mods=$($RESOLVEALIAS $1) + # If no modules could be found, try if the alias name is a module name + # In that case, omit the --use-blacklist parameter to imitate normal modprobe behaviour + [ -z "${mods}" ] && $MODPROBE -qni $1 && mods="$1" && USEBLACKLIST="" + [ -z "${mods}" ] && $LOGGER -p local0.debug -t "$(basename $0)" "'$1' is not a valid module or alias name" + for mod in ${mods}; do + # Find the module and all its dependencies + deps="$($MODPROBE -i --show-depends ${mod})" + [ $? -ne 0 ] && continue + + #sanitize the module names + deps="$(echo "$deps" | sed \ + -e "s#^insmod /lib.*/\(.*\)\.ko.*#\1#g" \ + -e 's|-|_|g')" + + # If the module or any of its dependencies is blacklisted, don't load it + for dep in $deps; do + if echo "${BLACKLIST}" | /bin/grep -q -e " ${dep} " -e "^${dep} " -e " ${dep}\$"; then + if [ "${dep}" = "${mod}" ]; then + $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because it is blacklisted" + else + $LOGGER -p local0.info -t "$(basename $0)" "Not loading module '${mod}' for alias '$1' because its dependency '${dep}' is blacklisted" + fi + continue 2 + fi + done + # modprobe usually uses the "blacklist" statements from modprobe.conf only to blacklist all aliases + # of a module, but not the module itself. We use --use-blacklist here so that modprobe also blacklists + # module names if we resolved alias names manually above + $MODPROBE $USEBLACKLIST ${mod} + done + else + $MODPROBE $USEBLACKLIST $1 + fi +fi +# vim: set et ts=4: diff --git a/testing/udev/udev.install b/testing/udev/udev.install new file mode 100644 index 000000000..b2ed69467 --- /dev/null +++ b/testing/udev/udev.install @@ -0,0 +1,49 @@ +# arg 1: the new package version +# arg 2: the old package version + +post_upgrade() { + if [ "$(vercmp $2 100)" -lt 0 ]; then + echo "ATTENTION UDEV:" + echo "----------" + echo "udev >=098 rules syntax has changed, please update your own rules." + echo "udev >=099 Added persistent network and CD/DVD Symlink generator rules." + echo "Please read the instructions carefully before reboot." + echo "They are located in /etc/udev/readme-udev-arch.txt" + echo "----------" + fi + if [ "$(vercmp $2 169)" -lt 0 ]; then + echo "ATTENTION UDEV:" + echo "---------------" + echo "Kernel 2.6.32 or newer is now required." + echo "OSS emulation modules are not loaded by default, add to rc.conf if needed." + echo "Arch specific cd symlinks are now no longer created." + echo "cd and net persistent rules will no longer be autogenerated," + echo "see <https://wiki.archlinux.org/index.php/Udev> for details." + echo "Errors are now logged (possibly to the console) by default." + echo "---------------" + fi +} + +post_install() { + # If a ramfs is mounted, we still need to make sure that /dev/{console,null,zero} exist + # The Archlinux installer bind-mounts /dev to /mnt/dev, thus making the real /dev invisible + ROOTDIR="" + [ "$(stat -c %D /)" != "$(stat -c %D /dev)" ] && ROOTDIR=$(mktemp -d /tmp/udevinstall.XXXXXX) + [ -n "${ROOTDIR}" ] && mount --bind / ${ROOTDIR} + if [ ! -c ${ROOTDIR}/dev/console ]; then + rm -f ${ROOTDIR}/dev/console + mknod -m600 ${ROOTDIR}/dev/console c 5 1 + fi + if [ ! -c ${ROOTDIR}/dev/null ]; then + rm -f ${ROOTDIR}/dev/null + mknod -m644 ${ROOTDIR}/dev/null c 1 3 + fi + if [ ! -c ${ROOTDIR}/dev/zero ]; then + rm -f ${ROOTDIR}/dev/zero + mknod -m644 ${ROOTDIR}/dev/zero c 1 5 + fi + if [ -n "${ROOTDIR}" ]; then + umount ${ROOTDIR} + rmdir ${ROOTDIR} + fi +} |