diff options
28 files changed, 301 insertions, 88 deletions
diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD index 60a20a49d..037e0a9cf 100644 --- a/community/busybox/PKGBUILD +++ b/community/busybox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66360 2012-02-24 00:42:04Z spupykin $ +# $Id: PKGBUILD 69589 2012-04-19 10:16:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Pranaitis <jens@jenux.homelinux.org> @@ -11,13 +11,16 @@ url="http://www.busybox.net" license=('GPL') makedepends=("make" "gcc" "sed" "ncurses") source=($url/downloads/$pkgname-$pkgver.tar.bz2 + http://git.exherbo.org/arbor.git/plain/packages/sys-apps/busybox/files/linux-headers-fix.patch config) install=busybox.install md5sums=('9c0cae5a0379228e7b55e5b29528df8e' + '853097e2f1477f962d6f268c1b3ebd78' 'edd5c66c974ccc1b0030fd00beaa1b02') build() { cd "$srcdir/$pkgname-$pkgver" + patch -p1 <$srcdir/linux-headers-fix.patch cp $srcdir/config .config # if you want to run menuconfig uncomment the following line: # make menuconfig ; return 1 diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD index 58d29b681..d72b7df7b 100644 --- a/community/c++-gtk-utils/PKGBUILD +++ b/community/c++-gtk-utils/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 68461 2012-03-25 08:30:58Z giovanni $ +# $Id: PKGBUILD 69584 2012-04-19 09:02:57Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=c++-gtk-utils -pkgver=2.0.6 +pkgver=2.0.7 pkgrel=1 pkgdesc="Classes and functions for programming in GTK+" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL2.1') depends=('gtk3') options=('!libtool') source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('06a16582721120ae13fa04c65e3617c0') +md5sums=('aea6396d780d053e798caed5c6a95cac') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/etl/PKGBUILD b/community/etl/PKGBUILD index a17e33636..3c87df6d6 100644 --- a/community/etl/PKGBUILD +++ b/community/etl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65164 2012-02-20 05:28:07Z spupykin $ +# $Id: PKGBUILD 69579 2012-04-19 07:26:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=etl -pkgver=0.04.14 -pkgrel=2 +pkgver=0.04.15 +pkgrel=1 pkgdesc="VoriaETL: C++ STL complementory multiplatform template library" arch=(i686 x86_64) url="http://synfig.org" @@ -14,7 +14,7 @@ conflicts=('synfig-etl') replaces=('synfig-etl') #source=(http://arch.p5n.pp.ru/~sergej/dl/synfig-0.63.04.tar.gz) source=(http://downloads.sourceforge.net/project/synfig/ETL/$pkgver/ETL-$pkgver.tar.gz) -md5sums=('7cb91905cbe07af327340aeba2226c06') +md5sums=('aac5038cdb4067100e57fb52337b0cfd') build() { cd $srcdir/ETL-$pkgver diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index 220779a00..b84855059 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64414 2012-02-13 03:46:16Z spupykin $ +# $Id: PKGBUILD 69581 2012-04-19 07:27:11Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig -pkgver=0.63.04 +pkgver=0.63.05 pkgrel=1 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64) @@ -18,7 +18,7 @@ options=(!libtool) source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz build-fix.patch ffmpeg-0.8.patch) -md5sums=('baa0df3a51d101600771e0d45fcc7d22' +md5sums=('8591cf17c26405d68d2cc050a2929292' 'b5568b06fae1a7ee465b5380b1139b83' 'ebf41046097cfd778dee9a9854561dae') diff --git a/community/synfigstudio/PKGBUILD b/community/synfigstudio/PKGBUILD index b468906c6..818ad5e61 100644 --- a/community/synfigstudio/PKGBUILD +++ b/community/synfigstudio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64416 2012-02-13 03:47:06Z spupykin $ +# $Id: PKGBUILD 69586 2012-04-19 09:14:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfigstudio -pkgver=0.63.04 +pkgver=0.63.05 pkgrel=1 pkgdesc="Professional vector animation program (GUI)" arch=(i686 x86_64) @@ -15,7 +15,7 @@ makedepends=('openexr' 'imagemagick' 'xorg-fonts-100dpi' 'xorg-fonts-75dpi' install=synfigstudio.install options=('!libtool') source=(http://downloads.sourceforge.net/project/synfig/synfigstudio/$pkgver/synfigstudio-$pkgver.tar.gz) -md5sums=('6bc0d5410df032df6c518adca824ddb6') +md5sums=('ca01b7523118e32c904b681d8ff0a085') build() { cd $srcdir/synfigstudio-$pkgver diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD index b7347da07..7f3df45e7 100644 --- a/core/openssl/PKGBUILD +++ b/core/openssl/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 156330 2012-04-17 06:27:45Z pierre $ +# $Id: PKGBUILD 156488 2012-04-19 14:22:45Z bisson $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=openssl -_ver=1.0.1 +_ver=1.0.1a # use a pacman compatible version scheme -# pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} -pkgver=$_ver -pkgrel=3 +pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} +#pkgver=$_ver +pkgrel=1 pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security' arch=('i686' 'x86_64') url='https://www.openssl.org' @@ -19,16 +19,12 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz" "https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc" 'fix-manpages.patch' 'no-rpath.patch' - 'ca-dir.patch' - 'disable-tls12-client.patch' - 'vpaes.patch') -md5sums=('134f168bc2a8333f19f81d684841710b' - 'efbe93c11747fed52e60567819409d8a' + 'ca-dir.patch') +md5sums=('a0104320c0997cd33e18b8ea798609d1' + 'df6d2432d3ff03f72fa6744d6f1a7f34' '5bbc0655bda2af95bc8eb568963ce8ba' 'dc78d3d06baffc16217519242ce92478' - '3bf51be3a1bbd262be46dc619f92aa90' - '26432b9d7af63c63828b6405c9185400' - '55ad53e8ec3db1db6978af55e3ce1b5d') + '3bf51be3a1bbd262be46dc619f92aa90') build() { cd $srcdir/$pkgname-$_ver @@ -48,10 +44,6 @@ build() { patch -p0 -i $srcdir/no-rpath.patch # set ca dir to /etc/ssl by default patch -p0 -i $srcdir/ca-dir.patch - # workaround for PR#2771 - patch -p1 -i $srcdir/disable-tls12-client.patch - # fix for PR#2775 - patch -p1 -i $srcdir/vpaes.patch # mark stack as non-executable: http://bugs.archlinux.org/task/12434 ./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \ shared zlib enable-md2 ${optflags} \ diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD index 6e2041ba4..009fe1136 100644 --- a/extra/kdevelop-php/PKGBUILD +++ b/extra/kdevelop-php/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153918 2012-03-20 14:06:28Z andrea $ +# $Id: PKGBUILD 156483 2012-04-19 10:23:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdevelop-php -pkgver=1.3.0 -_pkgver=4.3.0 +pkgver=1.3.1 +_pkgver=4.3.1 pkgrel=1 pkgdesc="PHP language and documentation plugin for KDevelop/Quanta" arch=('i686' 'x86_64') @@ -14,8 +14,8 @@ makedepends=('cmake' 'automoc4') replaces=('kdevelop-php-docs') conflicts=('kdevelop-php-docs') source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2) -sha1sums=('8ae280cf5085c473b6b95b3683629b49d19dfe12' - '398001b7d192af4c71bddb246dfd59d61db02618') +sha1sums=('c5d31de0bf0ae4b242b6265851807e5b44606525' + '2b5c3dd2b26196a83bc95cfe8ee595e160f595f0') build() { cd "${srcdir}" diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD index 8a679c943..7890cd561 100644 --- a/extra/kdevelop/PKGBUILD +++ b/extra/kdevelop/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 153916 2012-03-20 14:05:01Z andrea $ +# $Id: PKGBUILD 156481 2012-04-19 10:22:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=kdevelop -pkgver=4.3.0 +pkgver=4.3.1 pkgrel=1 pkgdesc="A C/C++ development environment for KDE" arch=('i686' 'x86_64') url="http://www.kdevelop.org/" license=('GPL') -depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-kwrite') +depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-katepart') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('06a91f9ae0fc15bcec12a92bd9c30a7517b3b8e0') +sha1sums=('99596bf333bf5a62547f3dc0800674db146eb401') build() { cd "${srcdir}" diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD index 4b489927e..a60d25716 100644 --- a/extra/kdevplatform/PKGBUILD +++ b/extra/kdevplatform/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153914 2012-03-20 14:01:46Z andrea $ +# $Id: PKGBUILD 156479 2012-04-19 10:22:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=kdevplatform -pkgver=1.3.0 -_pkgver=4.3.0 +pkgver=1.3.1 +_pkgver=4.3.1 pkgrel=1 pkgdesc="A C/C++ development platform for KDE" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ optdepends=("kdesdk-kompare: difference checking") makedepends=('cmake' 'automoc4' 'boost') install=${pkgname}.install source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('990ec335418445ae11b8ee11aa9a25729994de59') +sha1sums=('bba0cefdac6de83c8d3354534a94e8500dccda37') build() { cd "${srcdir}" diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD index 2d30106bb..6a3cd512f 100644 --- a/extra/link-grammar/PKGBUILD +++ b/extra/link-grammar/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143897 2011-11-30 19:52:19Z giovanni $ +# $Id: PKGBUILD 156475 2012-04-19 09:19:16Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=link-grammar -pkgver=4.7.4 -pkgrel=2 +pkgver=4.7.5 +pkgrel=1 pkgdesc="A Grammar Checking library" arch=('i686' 'x86_64') url="http://www.abisource.com/downloads/link-grammar/" @@ -12,7 +12,7 @@ license=('BSD') depends=('glibc') options=('!libtool' '!makeflags') source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('e90e702a953641713a1292db20677bd2') +md5sums=('598e531d8f213e0a2b211631e5c7e5bb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 090556f7b..1a4f8b0a0 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155693 2012-04-05 06:04:51Z giovanni $ +# $Id: PKGBUILD 156477 2012-04-19 09:35:14Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.04.04 +pkgver=2012.04.18 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('25ad098a6e4a2e329ca6295a9ba27074') +md5sums=('52248a7081e2989777258df4e37be966') build() { cd ${srcdir}/live @@ -28,7 +28,7 @@ build() { package() { cd ${srcdir}/live - for dir in BasicUsageEnvironment UsageEnvironment groupsock liveMedia; do + for dir in BasicUsageEnvironment groupsock liveMedia UsageEnvironment; do install -dm755 ${pkgdir}/usr/{bin,lib,include/${dir}} install -m644 ${dir}/*.a "${pkgdir}/usr/lib" install -m644 ${dir}/include/*.h* "${pkgdir}/usr/include/${dir}" diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD index c51ab4609..7caabccb0 100644 --- a/extra/qrencode/PKGBUILD +++ b/extra/qrencode/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155309 2012-04-01 16:17:46Z bluewind $ +# $Id: PKGBUILD 156492 2012-04-19 15:59:03Z bluewind $ # Maintainer: Florian Pritz< flo@xinu.at> # Contributor: Dany Martineau <dany.luc.martineau@gmail.com> pkgname=qrencode -pkgver=3.3.0 +pkgver=3.3.1 pkgrel=1 pkgdesc="C library for encoding data in a QR Code symbol." arch=(i686 x86_64) @@ -13,7 +13,7 @@ url="http://megaui.net/fukuchi/works/qrencode/index.en.html" license=('GPL') options=(!libtool) source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('b7531107ffd8e4f9ce262e87893b01ca') +md5sums=('14920ba9d0515bddcaebfbd728229c5d') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD index 924610761..fca464709 100644 --- a/extra/scim/PKGBUILD +++ b/extra/scim/PKGBUILD @@ -1,34 +1,41 @@ -# $Id: PKGBUILD 137306 2011-09-06 22:52:36Z bisson $ +# $Id: PKGBUILD 156513 2012-04-20 01:11:09Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Gan Lu <rhythm.gan@gmail.com> pkgname=scim -pkgver=1.4.11 -pkgrel=2 +pkgver=1.4.12 +pkgrel=1 pkgdesc='Input method user interface and development platform' url='http://www.scim-im.org/projects/scim' -license=('GPL') -arch=('i686' 'x86_64') +license=('LGPL') options=('!libtool') +arch=('i686' 'x86_64') makedepends=('intltool') -depends=('gtk2' 'libtool') +depends=('libltdl' 'gtk2') backup=('etc/scim/config' 'etc/scim/global') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('e202e42df52f5c9a88f6ae4d4ce04f94bc22e27c') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'ftp://ftp.archlinux.org/other/scim/scim-docs-20120420.tar.xz') +sha1sums=('948180ec0af18e435a95edbdb840cf41f3b24d32' + 'b2cccb43673e1760abf6825768bc4354a981a0ad') + +# Docs tarball temporarily generated with: +# svn co https://scim.svn.sourceforge.net/svnroot/scim/scim/trunk/docs docs install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" + mv ../docs . ./bootstrap + sed 's/\$nls_cv_use_gnu_gettext/yes/' -i configure + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --disable-static \ - --with-gnu-ld \ - --with-x \ + --with-gtk-version=2 # still a couple issues with 3 make } diff --git a/extra/scim/install b/extra/scim/install index 405061cb4..c05312bfd 100644 --- a/extra/scim/install +++ b/extra/scim/install @@ -1,7 +1,5 @@ post_install() { - echo -n 'updating gtk.immodules... ' /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules - echo 'done.' } post_upgrade() { diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 83693d62f..cfce9bffb 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 155972 2012-04-10 13:26:02Z tdziedzic $ +# $Id: PKGBUILD 156508 2012-04-20 01:03:19Z tdziedzic $ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -10,7 +10,7 @@ _patchlevel=495 __hgrev=a104dae7f903 _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('custom:vim') url="http://www.vim.org" @@ -52,6 +52,9 @@ mksource() { } build() { + # remove -O2 because there is a crash with python because of it + export CFLAGS="-march=x86-64 -mtune=generic -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" + cd "${srcdir}" cp -a ${pkgname}-${pkgver} vim-build @@ -91,6 +94,18 @@ build() { make } +check() { + # disable tests because they seem to freeze + + cd "${srcdir}"/vim-build + + #make test + + cd "${srcdir}"/gvim-build + + #make test +} + package_vim() { pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm') diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index f50c28492..60a330305 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 154405 2012-03-27 21:06:46Z guillaume $ -# Maintainer: Guillaume ALAUX <guillaume at alaux dot net> +# $Id: PKGBUILD 156497 2012-04-19 21:01:40Z guillaume $ +# Maintainer: Guillaume ALAUX <guillaume@archlinux.org> # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de> -pkgname=(wireshark-cli wireshark-gtk) +pkgname=('wireshark-cli' 'wireshark-gtk' 'wireshark-dev') pkgbase=wireshark -pkgver=1.6.6 +pkgver=1.6.7 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') @@ -11,7 +11,7 @@ makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' 'li url="http://www.wireshark.org/" options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('61145ccd7684b3cfb159fc902fedfecf') +md5sums=('7e39f1c0ea4abd8bffa5122df800ca5d') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -55,3 +55,17 @@ package_wireshark-gtk() { done install -Dm644 wireshark.desktop "${pkgdir}/usr/share/applications/wireshark.desktop" } + +package_wireshark-dev() { + pkgdesc="A free network protocol analyzer for Unix/Linux and Windows - header files" + depends=('wireshark-cli') + + cd "${srcdir}/${pkgbase}-${pkgver}" + + install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil} + + install -m644 color.h config.h register.h "${pkgdir}/usr/include/${pkgbase}" + for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do + install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d} + done +} diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index c97763c2a..0af6437d1 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -25,7 +25,7 @@ makedepends=('xmlto' 'docbook-xsl') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}-gnu/patch-${_basekernel}-gnu-${_pkgver}-gnu.xz" - "http://repo.parabolagnulinux.org/other/patch-${_pkgver}-${_rtpatchver}.patch.xz" + "http://www.kernel.org/pub/linux/kernel/projects/rt/3.2/patch-${_pkgver}-${_rtpatchver}.patch.xz" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index a5a37437c..63ffbc03d 100644 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-rt -KERNEL_VERSION=3.2.15-1-LIBRE-RT +KERNEL_VERSION=3.2.15-1-rt26-LIBRE-RT post_install () { # updating module dependencies diff --git a/libre/mariadb/PKGBUILD b/libre/mariadb/PKGBUILD index df4bb9a16..a5b733e9f 100644 --- a/libre/mariadb/PKGBUILD +++ b/libre/mariadb/PKGBUILD @@ -10,7 +10,7 @@ pkgbase=mariadb _pkgbase=MariaDB pkgname=("lib${pkgbase}client" "${pkgbase}-clients" "${pkgbase}") pkgver=5.5.23 -pkgrel=1.4 +pkgrel=1.5 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.${pkgbase}.org/" @@ -39,7 +39,7 @@ build() { -DMYSQL_DATADIR=/var/lib/${falsename} \ -DMYSQL_UNIX_ADDR=/var/run/${falsename}/${falsename}.sock \ -DDEFAULT_CHARSET=utf8 \ - -DDEFAULT_COLLATION=utf8_general_ci \ + -DDEFAULT_COLLATION=utf8_unicode_ci \ -DENABLED_LOCAL_INFILE=ON \ -DINSTALL_INFODIR=share/${falsename}/docs \ -DINSTALL_MANDIR=share/man \ @@ -60,6 +60,7 @@ build() { -DWITH_EMBEDDED_SERVER=ON \ -DWITH_INNOBASE_STORAGE_ENGINE=1 \ -DWITH_PARTITION_STORAGE_ENGINE=1 \ + -DWITH_PBXT_STORAGE_ENGINE=1 \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ diff --git a/testing/cogl/PKGBUILD b/testing/cogl/PKGBUILD index 05ebe35b3..f26b71002 100644 --- a/testing/cogl/PKGBUILD +++ b/testing/cogl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 155032 2012-04-01 11:31:05Z heftig $ +# $Id: PKGBUILD 156493 2012-04-19 16:37:07Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cogl -pkgver=1.10.0 +pkgver=1.10.2 pkgrel=1 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango') makedepends=('mesa' 'gobject-introspection') options=(!libtool !emptydirs) source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('544b648cd5dc0a0ea438acd89d83727d82d6c29927db33a519ce2b28dc1ad07d') +sha256sums=('042cf87ec35d2eac78719856356e415dd5333f9f613093c5db8b438630c1ecb3') build() { cd "$pkgname-$pkgver" diff --git a/testing/gnupg/PKGBUILD b/testing/gnupg/PKGBUILD new file mode 100644 index 000000000..edf608de2 --- /dev/null +++ b/testing/gnupg/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 156501 2012-04-19 23:08:56Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> + +pkgname=gnupg +pkgver=2.0.19 +pkgrel=2 +pkgdesc='Complete and free implementation of the OpenPGP standard' +url='http://www.gnupg.org/' +license=('GPL') +arch=('i686' 'x86_64') +optdepends=('curl: gpg2keys_curl' + 'libldap: gpg2keys_ldap' + 'libusb-compat: scdaemon' + 'texinfo: documentation') +makedepends=('curl' 'libldap' 'libusb-compat' 'texinfo') +depends=('bzip2' 'libksba' 'libgcrypt' 'pth' 'libassuan' 'readline' 'pinentry' 'dirmngr') +source=("ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,.sig}) +sha1sums=('190c09e6688f688fb0a5cf884d01e240d957ac1f' + 'f6e6830610a8629b0aad69d789373bf8ca481733') + +install=install + +conflicts=('gnupg2') +provides=("gnupg2=${pkgver}") +replaces=('gnupg2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --libexecdir=/usr/lib/gnupg + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + ln -s gpg2 "${pkgdir}"/usr/bin/gpg + ln -s gpg2 "${pkgdir}"/usr/bin/gpgv + ln -s gpg2.1.gz "${pkgdir}"/usr/share/man/man1/gpg.1.gz +} diff --git a/testing/gnupg/install b/testing/gnupg/install new file mode 100644 index 000000000..3a5dc9fd6 --- /dev/null +++ b/testing/gnupg/install @@ -0,0 +1,20 @@ +info_dir=/usr/share/info +info_files=(gnupg.info gnupg.info-1 gnupg.info-2) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info ${info_dir}/$f ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for f in ${info_files[@]}; do + usr/bin/install-info --delete ${info_dir}/$f ${info_dir}/dir 2> /dev/null + done +} diff --git a/testing/kmod/PKGBUILD b/testing/kmod/PKGBUILD index a027ee19f..964def177 100644 --- a/testing/kmod/PKGBUILD +++ b/testing/kmod/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155335 2012-04-01 20:12:30Z tomegun $ +# $Id: PKGBUILD 156503 2012-04-19 23:17:12Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=kmod -pkgver=7 -pkgrel=2 +pkgver=8 +pkgrel=1 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64') url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' @@ -17,7 +17,7 @@ source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.t "depmod-search.conf" "0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch" "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch") -md5sums=('7bd916ae1c8a38e7697fdd8118bc98eb' +md5sums=('d4e3d038b5370b1e8ff237c55666aa64' 'dd62cbf62bd8f212f51ef8c43bec9a77' 'ba73b9e98db1abbf41274f922fcfbd55' 'c9af56636c5667cf4ce3a31ea56e03d9') diff --git a/testing/lvm2/11-dm-initramfs.rules b/testing/lvm2/11-dm-initramfs.rules new file mode 100644 index 000000000..d2c167324 --- /dev/null +++ b/testing/lvm2/11-dm-initramfs.rules @@ -0,0 +1,3 @@ +# needed with new udev/mkinitcpio and as implemented in dracut: +# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54> +SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist" diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD new file mode 100644 index 000000000..37ce623dc --- /dev/null +++ b/testing/lvm2/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 156515 2012-04-20 02:14:32Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Maintainer: Thomas Bächler <thomas@archlinux.org> + +pkgbase=lvm2 +pkgname=('lvm2' 'device-mapper') +pkgver=2.02.95 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://sourceware.org/lvm2/" +license=('GPL2' 'LGPL2.1') +groups=('base') +source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} + lvm2_install + lvm2_hook + 11-dm-initramfs.rules) +sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85' + '45f5e31045065e7bdf5d6f2e21c857b4978024b4' + '08007f13cf1a9caf6e4aca76dd2ed6a4ab037601' + '7d63aa838703c9f986531a78164b556f765f5cce' + 'f6a554eea9557c3c236df2943bb6e7e723945c41') + +build() { + cd "${srcdir}/LVM2.${pkgver}" + unset LDFLAGS + ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var \ + --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ + --enable-udev_sync --enable-udev_rules + make +} + +package_device-mapper() { + pkgdesc="Device mapper userspace library and tools" + url="http://sourceware.org/dm/" + depends=('glibc' 'udev') + + cd "${srcdir}/LVM2.${pkgver}" + make DESTDIR="${pkgdir}" install_device-mapper + # extra udev rule for device-mapper in initramfs + install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules" +} + +package_lvm2() { + pkgdesc="Logical Volume Manager 2 utilities" + depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') + conflicts=('lvm' 'mkinitcpio<0.7') + backup=('etc/lvm/lvm.conf') + options=('!makeflags') + + cd "${srcdir}/LVM2.${pkgver}" + make DESTDIR="${pkgdir}" install_lvm2 + # install applib + make -C liblvm DESTDIR="${pkgdir}" install + # /etc directories + install -d "${pkgdir}"/etc/lvm/{archive,backup} + # mkinitcpio hook + install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2" + install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2" +} diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook new file mode 100644 index 000000000..efb104998 --- /dev/null +++ b/testing/lvm2/lvm2_hook @@ -0,0 +1,25 @@ +# vim:set ft=sh: +run_hook () +{ + /sbin/modprobe -q dm-mod >/dev/null 2>&1 + if [ -e "/sys/class/misc/device-mapper" ]; then + if [ ! -e "/dev/mapper/control" ]; then + local major minor + IFS=: read major minor < /sys/class/misc/device-mapper/dev + mkdir /dev/mapper + mknod "/dev/mapper/control" c ${major} ${minor} + fi + + # If the lvmwait= parameter has been specified on the command line + # wait for the device(s) before trying to activate the volume group(s) + for pvdev in ${lvmwait//,/ }; do + poll_device ${pvdev} ${rootdelay} + done + + [ "${quiet}" = "y" ] && LVMQUIET=">/dev/null" + + msg "Activating logical volumes..." + [ -d /etc/lvm ] && /sbin/lvm vgscan + eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET + fi +} diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install new file mode 100644 index 000000000..98a995b14 --- /dev/null +++ b/testing/lvm2/lvm2_install @@ -0,0 +1,29 @@ +# vim: set ft=sh: + +build() +{ + MODULES=" dm-mod dm-snapshot dm-mirror" + BINARIES="" + FILES="" + SCRIPT="lvm2" + + add_binary "/sbin/lvm" + add_binary "/sbin/dmsetup" + add_file "/usr/lib/udev/rules.d/10-dm.rules" + add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" + add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" + add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules" + add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" +} + +help () +{ +cat<<HELPEOF + This hook loads the necessary modules for an LVM2 root device. + + The optional lvmwait= parameter followed by a comma-separated + list of device names can be given on the command line. + It will cause the hook to wait until all given devices exist + before trying to scan and activate any volume groups. +HELPEOF +} diff --git a/testing/rhythmbox/PKGBUILD b/testing/rhythmbox/PKGBUILD index f0c7de120..07e88f91c 100644 --- a/testing/rhythmbox/PKGBUILD +++ b/testing/rhythmbox/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 155254 2012-04-01 11:36:54Z heftig $ +# $Id: PKGBUILD 156495 2012-04-19 20:31:39Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rhythmbox pkgver=2.96 -pkgrel=1 +pkgrel=2 pkgdesc="An iTunes-like music playback and management application" arch=('i686' 'x86_64') license=('GPL') url="http://www.rhythmbox.org" depends=('clutter' 'clutter-gtk' 'clutter-gst' 'dconf' 'desktop-file-utils' 'grilo' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib' 'libdmapsharing' 'libgpod' 'libmtp' 'libmusicbrainz3' - 'libnotify' 'libpeas' 'libwebkit3' 'lirc-utils' 'media-player-info' 'mx' 'python2-gobject' 'python2-mako' 'totem-plparser') + 'libnotify' 'libpeas' 'libwebkit3' 'lirc-utils' 'media-player-info' 'mx' 'python2-gobject' 'python2-mako' 'totem-plparser' 'tdb') makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection') optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' 'gstreamer0.10-bad-plugins: Extra media codecs' |