diff options
25 files changed, 857 insertions, 102 deletions
diff --git a/community-testing/vhba-module/60-vhba.rules b/community-testing/vhba-module/60-vhba.rules new file mode 100644 index 000000000..91de6f86a --- /dev/null +++ b/community-testing/vhba-module/60-vhba.rules @@ -0,0 +1 @@ +KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu" diff --git a/community-testing/vhba-module/PKGBUILD b/community-testing/vhba-module/PKGBUILD new file mode 100644 index 000000000..685a5db1d --- /dev/null +++ b/community-testing/vhba-module/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 71080 2012-05-23 14:37:08Z heftig $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Mateusz Herych <heniekk@gmail.com> +# Contributor: Charles Lindsay <charles@chaoslizard.org> + +pkgname=vhba-module +pkgver=20120422 +_extramodules=extramodules-3.4-ARCH +pkgrel=1 +pkgdesc="Kernel module that emulates SCSI devices" +arch=('i686' 'x86_64') +url="http://cdemu.sourceforge.net/" +license=('GPL') +depends=('linux>=3.4' 'linux<3.5') +makedepends=('linux-headers>=3.4') +install=$pkgname.install +source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" + '60-vhba.rules') +md5sums=('d97372da1d270d1605742b2995fb6678' + '549bd2d9696bd1884c8eed7193c00e21') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + _kernver="$(cat /lib/modules/$_extramodules/version)" + + make -j1 KDIR=/usr/src/linux-$_kernver +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + install -D vhba.ko "$pkgdir/lib/modules/$_extramodules/vhba.ko" + + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \ + "$startdir/vhba-module.install" + + install -Dm644 "$srcdir/60-vhba.rules" \ + "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/vhba-module/vhba-module.install b/community-testing/vhba-module/vhba-module.install new file mode 100644 index 000000000..73029498f --- /dev/null +++ b/community-testing/vhba-module/vhba-module.install @@ -0,0 +1,22 @@ +post_upgrade() { + ! grep -q 'cdemu' /etc/group && groupadd cdemu + echo " > Updating module dependencies..." + EXTRAMODULES='extramodules-3.2-ARCH' + depmod $(cat /lib/modules/$EXTRAMODULES/version) +} + + +post_install() { + echo " > Adding 'cdemu' group" + ! grep -q 'cdemu' /etc/group && groupadd cdemu + echo " > Add 'vhba' to your modules array to autoload it" + post_upgrade +} + +post_remove() { + post_upgrade + echo "Removing 'cdemu' group" + groupdel cdemu +} + +# vim:set ts=2 sw=2 et: diff --git a/community/cutter/PKGBUILD b/community/cutter/PKGBUILD index b59a652f7..80c13857f 100644 --- a/community/cutter/PKGBUILD +++ b/community/cutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65098 2012-02-20 03:38:53Z spupykin $ +# $Id: PKGBUILD 71088 2012-05-23 18:06:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=cutter pkgver=1.03 -pkgrel=4 +pkgrel=5 pkgdesc="TCP/IP Connection cutting on Linux Firewalls and Routers" arch=('i686' 'x86_64') url="http://www.lowth.com/cutter/" @@ -15,6 +15,7 @@ md5sums=('50093db9b64277643969ee75b83ebbd1') build() { cd $srcdir/$pkgname-$pkgver + sed -i 's|/proc/net/ip_conntrack|/proc/net/nf_conntrack|g' cutter.c make install -D -m 0755 ./cutter $pkgdir/usr/bin/tcp-cutter } diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD index ac17b81f1..4f8085581 100644 --- a/community/libmemcached/PKGBUILD +++ b/community/libmemcached/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 70077 2012-04-29 03:10:00Z foutrelis $ +# $Id: PKGBUILD 71092 2012-05-23 19:58:18Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=libmemcached -pkgver=1.0.7 +pkgver=1.0.8 pkgrel=1 pkgdesc="C and C++ client library to the memcached server" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('glibc' 'libsasl' 'libevent') makedepends=('perl') options=('!libtool') source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) -sha256sums=('3efa86c9733eaad55d7119cb16769424e2aa6c22b3392e8f973946fce6678d81') +sha256sums=('03f4eb91634f1434a93d4709eccd0c4cce3eb296b54f2b1998ca4a9ce1661ca5') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/pidgin-talkfilters/PKGBUILD b/community/pidgin-talkfilters/PKGBUILD new file mode 100644 index 000000000..39a171c78 --- /dev/null +++ b/community/pidgin-talkfilters/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Connor Behan <connor.behan@gmail.com> + +pkgname=pidgin-talkfilters +pkgver=2.7.0 +pkgrel=1 +pkgdesc="Implements GNU Talkfilters in pidgin chats" +arch=(i686 x86_64) +url="http://www.guifications.org/projects/purple-plugin-pack" +license=('GPL') +depends=('pidgin' 'talkfilters') +makedepends=('intltool' 'gettext' 'python2') +options=(!libtool) +source=(https://www.guifications.org/attachments/download/201/purple-plugin-pack-${pkgver}.tar.bz2) + +build() { + cd "$srcdir"/purple-plugin-pack-${pkgver} + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --with-plugins=talkfilters + make +} + +package() { + cd "$srcdir"/purple-plugin-pack-${pkgver} + make DESTDIR="$pkgdir" install + rm -rf "${pkgdir}"/usr/share +} + +md5sums=('a1ee405e81ad955798af7b2a6a8564fb') diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD index b2489c6a1..5466de114 100644 --- a/core/dnsutils/PKGBUILD +++ b/core/dnsutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 157123 2012-04-24 08:19:47Z bisson $ +# $Id: PKGBUILD 159411 2012-05-23 22:28:25Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: mario <mario_vazq@hotmail.com> @@ -6,9 +6,9 @@ pkgname=dnsutils # Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.9.0 -_pkgver=9.9.0 -pkgrel=2 +pkgver=9.9.1 +_pkgver=9.9.1 +pkgrel=1 pkgdesc='DNS utilities: dig host nslookup' url='http://www.isc.org/software/bind/' @@ -18,7 +18,7 @@ options=('!makeflags') depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors') source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'remove-bind.patch') -sha1sums=('6be77c75c8649088b0ae7124d819b5f412bb0094' +sha1sums=('c963de85ba6f55d7615471b29b356efe6c844e9c' 'b465ef6160b004838f04de9978fe1be8422af777') replaces=('bind-tools' 'host') diff --git a/core/ldns/PKGBUILD b/core/ldns/PKGBUILD index bd7fe152d..e936b0b9d 100644 --- a/core/ldns/PKGBUILD +++ b/core/ldns/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 157125 2012-04-24 08:19:51Z bisson $ +# $Id: PKGBUILD 159413 2012-05-23 22:28:28Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: mathieui <mathieui@mathieui.net> # Contributor: jiribb <jiribb@gmail.com> pkgname=ldns -pkgver=1.6.12 -pkgrel=2 +pkgver=1.6.13 +pkgrel=1 pkgdesc='Fast DNS library supporting recent RFCs' url='http://www.nlnetlabs.nl/projects/ldns/' license=('custom:BSD') @@ -14,16 +14,12 @@ options=('!libtool') depends=('openssl' 'dnssec-anchors') optdepends=('libpcap: ldns-dpa tool') makedepends=('libpcap') -source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'Makefile.patch') -sha1sums=('1d61df0f666908551d5a62768f77d63e727810aa' - '01bce260e9639d9cd26109a689dddf2498e5026a') +source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('859f633d10b763f06b602e2113828cbbd964c7eb') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../Makefile.patch - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD index d9d5619a0..4d8ed4bb0 100644 --- a/core/pciutils/PKGBUILD +++ b/core/pciutils/PKGBUILD @@ -1,23 +1,20 @@ -# $Id: PKGBUILD 150279 2012-02-16 08:29:09Z tpowa $ +# $Id: PKGBUILD 159402 2012-05-23 20:09:18Z tomegun $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=pciutils pkgver=3.1.9 -pkgrel=1 +pkgrel=2 pkgdesc="PCI bus configuration space access library and tools" arch=(i686 x86_64) license=('GPL2') groups=('base') -url="http://mj.ucw.cz/pciutils.html" -optdepends=('sh: required by update-pciids') -makedepends=('wget') -depends=('glibc') +url="http://mj.ucw.cz/sw/pciutils/" +depends=('glibc' 'hwids') source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2 ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz) md5sums=('e958f5ffb93b12972964381c38f27eb3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./update-pciids.sh make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all cp lib/libpci.a "${srcdir}/" make clean @@ -28,4 +25,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/" + # this is now supplied by the hwids package + rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8.gz,hwdata}} } diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index 0251c026c..9916a3a9c 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 158599 2012-05-05 02:34:43Z dreisner $ +# $Id: PKGBUILD 159406 2012-05-23 20:09:27Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,9 +6,9 @@ pkgname=udev pkgver=182 -pkgrel=2 +pkgrel=4 pkgdesc="The userspace dev tools (udev)" -depends=('util-linux' 'glib2' 'kmod' 'pciutils' 'usbutils' 'bash' 'acl') +depends=('util-linux' 'glib2' 'kmod' 'hwids' 'bash' 'acl') install=udev.install arch=(i686 x86_64) license=('GPL') @@ -22,6 +22,11 @@ url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" backup=(etc/udev/udev.conf) groups=('base') options=(!makeflags !libtool) +md5sums=('023877e6cc0d907994b8c648beab542b' + '0fa3eac115ad0140af1582d941b15f2c' + '94b816896bf23275c0598fc8e07270c3' + 'e433c11d38cf4f877b41d06e2753ebe0' + 'e6faf4c3fe456f10d8efd2487d5e3cb7') build() { cd $srcdir/$pkgname-$pkgver @@ -33,7 +38,9 @@ build() { --sysconfdir=/etc \ --libexecdir=/usr/lib \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware + --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware \ + --with-usb-ids-path=/usr/share/hwdata/usb.ids \ + --with-pci-ids-path=/usr/share/hwdata/pci.ids make } @@ -67,8 +74,3 @@ package() { s#GROUP="cdrom"#GROUP="optical"#g' $i done } -md5sums=('023877e6cc0d907994b8c648beab542b' - '0fa3eac115ad0140af1582d941b15f2c' - '94b816896bf23275c0598fc8e07270c3' - 'a4dd853050bf2e0ae6b2e3d2c75499c2' - 'd2b16edc6d806b5dafdbbad43ae5a3de') diff --git a/core/udev/initcpio-hooks-udev b/core/udev/initcpio-hooks-udev index 87aa7960f..313a88130 100644 --- a/core/udev/initcpio-hooks-udev +++ b/core/udev/initcpio-hooks-udev @@ -1,9 +1,20 @@ -# vim: set ft=sh: -run_hook () -{ - msg -n ":: Triggering uevents..." +#!/usr/bin/ash + +run_earlyhook() { + /usr/lib/udev/udevd --daemon --resolve-names=never + udevd_running=1 +} + +run_hook() { + msg ":: Triggering uevents..." udevadm trigger --action=add --type=subsystems udevadm trigger --action=add --type=devices udevadm settle - msg "done." } + +run_cleanuphook() { + udevadm control --exit + udevadm info --cleanup-db +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/udev/initcpio-install-udev b/core/udev/initcpio-install-udev index 6bc9cfb28..e33664459 100644 --- a/core/udev/initcpio-install-udev +++ b/core/udev/initcpio-install-udev @@ -1,9 +1,7 @@ #!/bin/bash build() { - FILES="/etc/udev/udev.conf" - SCRIPT="udev" - + add_file "/etc/udev/udev.conf" add_binary /usr/lib/udev/udevd add_binary /usr/bin/udevadm @@ -13,6 +11,8 @@ build() { for tool in ata_id scsi_id; do add_file "/usr/lib/udev/$tool" done + + add_runscript } help() { diff --git a/core/usbutils/PKGBUILD b/core/usbutils/PKGBUILD index 7a926591f..65b4963cb 100644 --- a/core/usbutils/PKGBUILD +++ b/core/usbutils/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 153529 2012-03-15 17:34:25Z tomegun $ +# $Id: PKGBUILD 159404 2012-05-23 20:09:22Z tomegun $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Judd Vinet <jvinet@zeroflux.org> # Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com> pkgname=usbutils pkgver=005 -pkgrel=1 +pkgrel=2 pkgdesc="USB Device Utilities" arch=(i686 x86_64) license=('GPL') groups=('base') -depends=('libusb') +depends=('libusb' 'hwids') optdepends=('python2: for lsusb.py usage' - 'coreutils: for lsusb.py usage' - 'wget: for update-usbids.sh usage') + 'coreutils: for lsusb.py usage') url="http://linux-usb.sourceforge.net/" # currently broken: http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" @@ -30,6 +29,8 @@ build() { package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install + # this is now in the hwids package + rm -rf $pkgdir/usr/{share/hwdata,sbin} } md5sums=('6a21f7b6c02b76df5e8a7c208d746654' '45766196895b4cc50b53cd56e1bbf3d1') diff --git a/extra/misdnuser/PKGBUILD b/extra/misdnuser/PKGBUILD index 9de576e21..218939f10 100644 --- a/extra/misdnuser/PKGBUILD +++ b/extra/misdnuser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 159134 2012-05-16 12:27:20Z tpowa $ +# $Id: PKGBUILD 159389 2012-05-23 11:25:46Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=misdnuser -pkgver=2.0.13_20120513 +pkgver=2.0.13_20120522 pkgrel=1 pkgdesc="Tools and library for mISDN" arch=('i686' 'x86_64') @@ -43,3 +43,7 @@ md5sums=('f61339c3a28a370cd971957e6ef07f5c' '2009563b144de037ecb20f8d727a772e' '638b399f7e0937639960c4dfb3d5138e' '42c3b46880a68c3883ee1ed00af34b45') +md5sums=('c1967b47c919234ce3423b56a868d81f' + '2009563b144de037ecb20f8d727a772e' + '638b399f7e0937639960c4dfb3d5138e' + '42c3b46880a68c3883ee1ed00af34b45') diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 1db4ad683..b62e713bd 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 156133 2012-04-14 10:06:17Z andrea $ +# $Id: PKGBUILD 159391 2012-05-23 12:59:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') -pkgver=4.8.1 -pkgrel=2 +pkgver=4.8.2 +pkgrel=1 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -15,34 +15,20 @@ makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib2' 'dbu 'mysql' 'unixodbc' 'cups' 'gtk2') options=('!libtool') _pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}" -source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz" +source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qtconfig.desktop' - 'gcc47.patch' - 'improve-cups-support.patch' - 'fix-buffer-overflow.patch' - 'fix-cursortox-crash.patch') -md5sums=('7960ba8e18ca31f0c6e4895a312f92ff' + 'improve-cups-support.patch') +md5sums=('3c1146ddf56247e16782f96910a8423b' 'fc211414130ab2764132e7370f8e5caa' '85179f5e0437514f8639957e1d8baf62' 'f11852b97583610f3dbb669ebc3e21bc' '6b771c8a81dd90b45e8a79afa0e5bbfd' - 'd8a0e81075b290ddc18ecd33b9b7ee22' - 'c439c7731c25387352d8453ca7574971' - 'c493dca3c11fffb9af6719c6735cb0d2' - '13171b6aec2f240be05feb968178f70e') + 'c439c7731c25387352d8453ca7574971') build() { cd "${srcdir}"/${_pkgfqn} - patch -p1 -i "${srcdir}"/gcc47.patch - - # (FS#29158) - patch -p1 -i "${srcdir}"/fix-buffer-overflow.patch - - # (FS#29402) (QTBUG#24718) - patch -p1 -i "${srcdir}"/fix-cursortox-crash.patch - # (FS#28381) (KDEBUG#180051) patch -p1 -i "${srcdir}"/improve-cups-support.patch diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index c0c13dd98..8c289f466 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,49 +1,106 @@ -# $Id: PKGBUILD 146627 2012-01-14 15:25:15Z andrea $ +# $Id: PKGBUILD 159414 2012-05-23 22:31:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=qtwebkit -pkgver=2.2.1 -pkgrel=2 +pkgver=2.2.2 +pkgrel=1 arch=('i686' 'x86_64') url='http://trac.webkit.org/wiki/QtWebKit' pkgdesc='An open source web browser engine (Qt port)' license=('LGPL2.1' 'GPL3') -depends=('qt' 'gperf' 'bison' 'gstreamer0.10-base') -makedepends=('python2' 'mesa' 'chrpath') +depends=('qt' 'gstreamer0.10-base') +makedepends=('python2' 'mesa' 'gperf') conflicts=('qt<4.8') -#source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz" -source=("ftp://ftp.archlinux.org/other/${pkgname}/QtWebKit-${pkgver}.tar.gz" - "ftp://ftp.archlinux.org/other/${pkgname}/qwebview-4.8.0.tar.bz2" - 'python2-path.patch') -sha1sums=('283fc116882157df0474af496be73bb9b34cb001' - '0e44b27a0f71aceb91a89a2c28ab6331126518d9' - 'b0ef3d5596171e3900a685df9bcfac3068ad6330') +_qtver=4.8.2 +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-source.tar.gz" + "ftp://ftp.archlinux.org/other/${pkgname}/qwebview-${_qtver}.tar.xz" + 'glibc.patch' + 'fix-build.patch') +sha1sums=('914d7cc099e5b6181c2d74fc7a74e1b4478b75a4' + '33c83272ed8110180ee6e7e3733e68cc513e2802' + '9e47ba5725a2ebd072b8bff31fa2f71aa83f0333' + 'c6dfb001b0412a8adfcb7f1f565a24314a753448') build() { - cd "${srcdir}"/QtWebKit-${pkgver} + cd "${srcdir}"/${pkgname}-${pkgver}-source - patch -p1 -i "${srcdir}"/python2-path.patch + patch -p1 -i "${srcdir}"/glibc.patch + patch -p1 -i "${srcdir}"/fix-build.patch - cd Tools/Scripts - ./build-webkit --qt \ - --prefix=/usr \ - --makeargs="${MAKEFLAGS}" \ - --release \ - --3d-canvas + # move headers + mv include Source/ + + cd Source + qmake + cd ../ + + make -C Source # Build the QWebView plugin (FS#27914) - cd "${srcdir}"/QtWebKit-${pkgver}/qwebview-4.8.0/plugins/qwebview + cd "${srcdir}"/${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/qwebview qmake make } package() { - cd "${srcdir}"/QtWebKit-${pkgver} - make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install + cd "${srcdir}"/${pkgname}-${pkgver}-source + make INSTALL_ROOT="${pkgdir}" -C Source install - # Fix RPATH - chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/qt/imports/QtWebKit/libqmlwebkitplugin.so - - cd "${srcdir}"/QtWebKit-${pkgver}/qwebview-4.8.0/plugins/qwebview + cd "${srcdir}"/${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/qwebview make INSTALL_ROOT="${pkgdir}" install } + +_source() { + local _current_dir=$(pwd) + local _tmp=$(mktemp -d --tmpdir) + + cd _tmp + git clone git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git + + # fetch the make-package.py script + git clone git://qt.gitorious.org/qtwebkit/tools.git + + # create the qtwebkit tarball + cd qtwebkit + git checkout -b ${pkgname}-${pkgver} ${pkgname}-${pkgver} + + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + ../tools/make-package.py + python2 ../tools/make-package.py + + mv ${pkgname}-${pkgver}-source.tar.gz ${_current_dir}/ + + cd .. + + # create the qwebview plugin tarball + mkdir qwebview-${_qtver} + cd qwebview-${_qtver} + wget http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz + tar xf qt-everywhere-opensource-src-${_qtver}.tar.gz + mkdir -p ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/ + cp -ra qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/qwebview \ + ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/ + + cat > ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/plugins.pro <<"EOF" +TEMPLATE = subdirs +CONFIG += ordered + +REQUIRES = !CONFIG(static,shared|static) +contains(QT_CONFIG, webkit): SUBDIRS += qwebview +EOF + + cat > $(_tmp)/header.txt <<"EOF" +INCLUDEPATH += ../../../Source/include +LIBS += -L../../../Source/lib + +EOF + + cat $(_tmp)/header.txt qt-everywhere-opensource-src-${_qtver}/tools/designer/src/plugins/plugins.pri > \ + ${pkgname}-${pkgver}-source/qwebview-${_qtver}/plugins/plugins.pri + + tar cJf qwebview-${_qtver}.tar.xz ${pkgname}-${pkgver}-source + + mv qwebview-${_qtver}.tar.xz ${_current_dir}/ + + rm -rf ${_tmp} +} diff --git a/extra/qtwebkit/fix-build.patch b/extra/qtwebkit/fix-build.patch new file mode 100644 index 000000000..46313bbe9 --- /dev/null +++ b/extra/qtwebkit/fix-build.patch @@ -0,0 +1,36 @@ +diff -up qtwebkit-2.2.2-source/Source/WebKit.pri.no_Werror qtwebkit-2.2.2-source/Source/WebKit.pri +--- qtwebkit-2.2.2-source/Source/WebKit.pri.no_Werror 2012-05-22 09:30:37.000000000 -0500 ++++ qtwebkit-2.2.2-source/Source/WebKit.pri 2012-05-22 09:51:42.126610618 -0500 +@@ -102,7 +102,7 @@ CONFIG -= warn_on + + # Treat warnings as errors on x86/Linux/GCC + linux-g++* { +- !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror ++ #!CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror + + greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) { + if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) { + +diff -up webkit-qtwebkit/Source/common.pri.me webkit-qtwebkit/Source/common.pri +--- webkit-qtwebkit/Source/common.pri.me 2012-01-24 14:51:49.000000000 +0100 ++++ webkit-qtwebkit/Source/common.pri 2012-01-24 14:52:01.000000000 +0100 +@@ -3,12 +3,12 @@ + contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 + contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 + +-linux-g++ { +-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { +- message(Using gold linker) +- QMAKE_LFLAGS+=-fuse-ld=gold +-} +-} ++#linux-g++ { ++#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { ++# message(Using gold linker) ++# QMAKE_LFLAGS+=-fuse-ld=gold ++#} ++#} + + # We use this flag on production branches + # See https://bugs.webkit.org/show_bug.cgi?id=60824 +diff -up webkit-qtwebkit/Source/JavaScriptCore/runtime/JSGlobalObject.h.me webkit-qtwebkit/Source/JavaScriptCore/runtime/JSGlobalObject.h diff --git a/extra/qtwebkit/glibc.patch b/extra/qtwebkit/glibc.patch new file mode 100644 index 000000000..bd7cb9416 --- /dev/null +++ b/extra/qtwebkit/glibc.patch @@ -0,0 +1,339 @@ +diff -up webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am.glib231 webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am +--- webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am.glib231 2011-11-09 16:32:47.000000000 +0100 ++++ webkit-qtwebkit/Source/JavaScriptCore/GNUmakefile.list.am 2011-12-21 12:50:19.000000000 +0100 +@@ -438,7 +438,6 @@ javascriptcore_sources += \ + Source/JavaScriptCore/wtf/gobject/GRefPtr.h \ + Source/JavaScriptCore/wtf/gobject/GTypedefs.h \ + Source/JavaScriptCore/wtf/gtk/MainThreadGtk.cpp \ +- Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp \ + Source/JavaScriptCore/wtf/HashCountedSet.h \ + Source/JavaScriptCore/wtf/HashFunctions.h \ + Source/JavaScriptCore/wtf/HashIterators.h \ +diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp +--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp.glib231 2011-11-09 16:32:47.000000000 +0100 ++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.cpp 2011-12-21 12:50:19.000000000 +0100 +@@ -37,18 +37,6 @@ template <> void freeOwnedGPtr<GList>(GL + g_list_free(ptr); + } + +-template <> void freeOwnedGPtr<GCond>(GCond* ptr) +-{ +- if (ptr) +- g_cond_free(ptr); +-} +- +-template <> void freeOwnedGPtr<GMutex>(GMutex* ptr) +-{ +- if (ptr) +- g_mutex_free(ptr); +-} +- + template <> void freeOwnedGPtr<GPatternSpec>(GPatternSpec* ptr) + { + if (ptr) +diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h +--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h.glib231 2011-11-09 16:32:47.000000000 +0100 ++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GOwnPtr.h 2011-12-21 12:50:19.000000000 +0100 +@@ -35,8 +35,6 @@ namespace WTF { + template <typename T> inline void freeOwnedGPtr(T* ptr); + template<> void freeOwnedGPtr<GError>(GError*); + template<> void freeOwnedGPtr<GList>(GList*); +-template<> void freeOwnedGPtr<GCond>(GCond*); +-template<> void freeOwnedGPtr<GMutex>(GMutex*); + template<> void freeOwnedGPtr<GPatternSpec>(GPatternSpec*); + template<> void freeOwnedGPtr<GDir>(GDir*); + +diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h +--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.glib231 2011-11-09 16:32:47.000000000 +0100 ++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2011-12-21 12:50:19.000000000 +0100 +@@ -39,7 +39,6 @@ typedef void* gpointer; + typedef struct _GAsyncResult GAsyncResult; + typedef struct _GCancellable GCancellable; + typedef struct _GCharsetConverter GCharsetConverter; +-typedef struct _GCond GCond; + typedef struct _GDir GDir; + typedef struct _GdkAtom* GdkAtom; + typedef struct _GdkCursor GdkCursor; +@@ -52,7 +51,6 @@ typedef struct _GFile GFile; + typedef struct _GHashTable GHashTable; + typedef struct _GInputStream GInputStream; + typedef struct _GList GList; +-typedef struct _GMutex GMutex; + typedef struct _GPatternSpec GPatternSpec; + typedef struct _GPollableOutputStream GPollableOutputStream; + typedef struct _GSocketClient GSocketClient; +diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp +--- webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp.glib231 2011-12-21 12:52:25.000000000 +0100 ++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/gtk/ThreadingGtk.cpp 2011-12-21 12:52:28.000000000 +0100 +@@ -1,248 +0,0 @@ +-/* +- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved. +- * Copyright (C) 2007 Justin Haygood (jhaygood@reaktix.com) +- * +- * Redistribution and use in source and binary forms, with or without +- * modification, are permitted provided that the following conditions +- * are met: +- * +- * 1. Redistributions of source code must retain the above copyright +- * notice, this list of conditions and the following disclaimer. +- * 2. Redistributions in binary form must reproduce the above copyright +- * notice, this list of conditions and the following disclaimer in the +- * documentation and/or other materials provided with the distribution. +- * 3. Neither the name of Apple Inc. ("Apple") nor the names of +- * its contributors may be used to endorse or promote products derived +- * from this software without specific prior written permission. +- * +- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY +- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY +- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +- */ +- +-#include "config.h" +-#include "Threading.h" +- +-#if !USE(PTHREADS) +- +-#include "CurrentTime.h" +-#include "HashMap.h" +-#include "MainThread.h" +-#include "RandomNumberSeed.h" +-#include <wtf/StdLibExtras.h> +- +-#include <glib.h> +-#include <limits.h> +- +-namespace WTF { +- +-typedef HashMap<ThreadIdentifier, GThread*> ThreadMap; +- +-static Mutex* atomicallyInitializedStaticMutex; +- +-static Mutex& threadMapMutex() +-{ +- DEFINE_STATIC_LOCAL(Mutex, mutex, ()); +- return mutex; +-} +- +-void initializeThreading() +-{ +- if (!g_thread_supported()) +- g_thread_init(NULL); +- ASSERT(g_thread_supported()); +- +- if (!atomicallyInitializedStaticMutex) { +- atomicallyInitializedStaticMutex = new Mutex; +- threadMapMutex(); +- initializeRandomNumberGenerator(); +- } +-} +- +-void lockAtomicallyInitializedStaticMutex() +-{ +- ASSERT(atomicallyInitializedStaticMutex); +- atomicallyInitializedStaticMutex->lock(); +-} +- +-void unlockAtomicallyInitializedStaticMutex() +-{ +- atomicallyInitializedStaticMutex->unlock(); +-} +- +-static ThreadMap& threadMap() +-{ +- DEFINE_STATIC_LOCAL(ThreadMap, map, ()); +- return map; +-} +- +-static ThreadIdentifier identifierByGthreadHandle(GThread*& thread) +-{ +- MutexLocker locker(threadMapMutex()); +- +- ThreadMap::iterator i = threadMap().begin(); +- for (; i != threadMap().end(); ++i) { +- if (i->second == thread) +- return i->first; +- } +- +- return 0; +-} +- +-static ThreadIdentifier establishIdentifierForThread(GThread*& thread) +-{ +- ASSERT(!identifierByGthreadHandle(thread)); +- +- MutexLocker locker(threadMapMutex()); +- +- static ThreadIdentifier identifierCount = 1; +- +- threadMap().add(identifierCount, thread); +- +- return identifierCount++; +-} +- +-static GThread* threadForIdentifier(ThreadIdentifier id) +-{ +- MutexLocker locker(threadMapMutex()); +- +- return threadMap().get(id); +-} +- +-static void clearThreadForIdentifier(ThreadIdentifier id) +-{ +- MutexLocker locker(threadMapMutex()); +- +- ASSERT(threadMap().contains(id)); +- +- threadMap().remove(id); +-} +- +-ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, const char*) +-{ +- GThread* thread; +- if (!(thread = g_thread_create(entryPoint, data, TRUE, 0))) { +- LOG_ERROR("Failed to create thread at entry point %p with data %p", entryPoint, data); +- return 0; +- } +- +- ThreadIdentifier threadID = establishIdentifierForThread(thread); +- return threadID; +-} +- +-void initializeCurrentThreadInternal(const char*) +-{ +-} +- +-int waitForThreadCompletion(ThreadIdentifier threadID, void** result) +-{ +- ASSERT(threadID); +- +- GThread* thread = threadForIdentifier(threadID); +- +- void* joinResult = g_thread_join(thread); +- if (result) +- *result = joinResult; +- +- clearThreadForIdentifier(threadID); +- return 0; +-} +- +-void detachThread(ThreadIdentifier) +-{ +-} +- +-ThreadIdentifier currentThread() +-{ +- GThread* currentThread = g_thread_self(); +- if (ThreadIdentifier id = identifierByGthreadHandle(currentThread)) +- return id; +- return establishIdentifierForThread(currentThread); +-} +- +-void yield() +-{ +- g_thread_yield(); +-} +- +-Mutex::Mutex() +- : m_mutex(g_mutex_new()) +-{ +-} +- +-Mutex::~Mutex() +-{ +-} +- +-void Mutex::lock() +-{ +- g_mutex_lock(m_mutex.get()); +-} +- +-bool Mutex::tryLock() +-{ +- return g_mutex_trylock(m_mutex.get()); +-} +- +-void Mutex::unlock() +-{ +- g_mutex_unlock(m_mutex.get()); +-} +- +-ThreadCondition::ThreadCondition() +- : m_condition(g_cond_new()) +-{ +-} +- +-ThreadCondition::~ThreadCondition() +-{ +-} +- +-void ThreadCondition::wait(Mutex& mutex) +-{ +- g_cond_wait(m_condition.get(), mutex.impl().get()); +-} +- +-bool ThreadCondition::timedWait(Mutex& mutex, double absoluteTime) +-{ +- // Time is in the past - return right away. +- if (absoluteTime < currentTime()) +- return false; +- +- // Time is too far in the future for g_cond_timed_wait - wait forever. +- if (absoluteTime > INT_MAX) { +- wait(mutex); +- return true; +- } +- +- int timeSeconds = static_cast<int>(absoluteTime); +- int timeMicroseconds = static_cast<int>((absoluteTime - timeSeconds) * 1000000.0); +- +- GTimeVal targetTime; +- targetTime.tv_sec = timeSeconds; +- targetTime.tv_usec = timeMicroseconds; +- +- return g_cond_timed_wait(m_condition.get(), mutex.impl().get(), &targetTime); +-} +- +-void ThreadCondition::signal() +-{ +- g_cond_signal(m_condition.get()); +-} +- +-void ThreadCondition::broadcast() +-{ +- g_cond_broadcast(m_condition.get()); +-} +- +- +-} +- +-#endif // !USE(PTHREADS) +diff -up webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h.glib231 webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h +--- webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h.glib231 2011-11-09 16:32:47.000000000 +0100 ++++ webkit-qtwebkit/Source/JavaScriptCore/wtf/ThreadingPrimitives.h 2011-12-21 12:50:19.000000000 +0100 +@@ -44,8 +44,6 @@ + + #if USE(PTHREADS) + #include <pthread.h> +-#elif PLATFORM(GTK) +-#include "GOwnPtr.h" + #endif + + #if PLATFORM(QT) +@@ -66,10 +64,6 @@ typedef pthread_rwlock_t PlatformReadWri + typedef void* PlatformReadWriteLock; + #endif + typedef pthread_cond_t PlatformCondition; +-#elif PLATFORM(GTK) +-typedef GOwnPtr<GMutex> PlatformMutex; +-typedef void* PlatformReadWriteLock; // FIXME: Implement. +-typedef GOwnPtr<GCond> PlatformCondition; + #elif PLATFORM(QT) + typedef QT_PREPEND_NAMESPACE(QMutex)* PlatformMutex; + typedef void* PlatformReadWriteLock; // FIXME: Implement. diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD new file mode 100644 index 000000000..4709af354 --- /dev/null +++ b/testing/krb5/PKGBUILD @@ -0,0 +1,77 @@ +# $Id: PKGBUILD 159408 2012-05-23 20:51:29Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> + +pkgname=krb5 +pkgver=1.10.1 +pkgrel=3 +pkgdesc="The Kerberos network authentication system" +arch=('i686' 'x86_64') +url="http://web.mit.edu/kerberos/" +license=('custom') +depends=('e2fsprogs' 'libldap' 'keyutils') +makedepends=('perl') +backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf') +source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar + krb5-1.10.1-gcc47.patch + krb5-kadmind + krb5-kdc + krb5-kpropd) +sha1sums=('f9f3b77173f68b268b43e4f9c29bf7c9f3fd1f0e' + '78b759d566b1fdefd9bbcd06df14f07f12effe96' + '2aa229369079ed1bbb201a1ef72c47bf143f4dbe' + '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393' + '7f402078fa65bb9ff1beb6cbbbb017450df78560') +options=('!emptydirs') + +build() { + tar zxvf ${pkgname}-${pkgver}.tar.gz + cd "${srcdir}/${pkgname}-${pkgver}/src" + + # With gcc47 : deltat.c:1694:12: error: 'yylval' may be used uninitialized + # in this function [-Werror=maybe-uninitialized] + # As this is generated code, just ignore the complaint. + patch -Np2 -i ../../krb5-1.10.1-gcc47.patch + rm lib/krb5/krb/deltat.c + + # FS#25384 + sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4 + + export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all" + export CPPFLAGS+=" -I/usr/include/et" + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --localstatedir=/var/lib \ + --enable-shared \ + --with-system-et \ + --with-system-ss \ + --disable-rpath \ + --without-tcl \ + --enable-dns-for-realm \ + --with-ldap \ + --without-system-verto + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/src" + make DESTDIR="${pkgdir}" EXAMPLEDIR=/usr/share/doc/${pkgname}/examples install + + # Fix FS#29889 + install -m 644 plugins/kdb/ldap/libkdb_ldap/kerberos.{ldif,schema} "${pkgdir}"/usr/share/doc/${pkgname}/examples + + # Sample KDC config file + install -dm 755 "${pkgdir}"/var/lib/krb5kdc + install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf + + # Default configuration file + install -dm 755 "${pkgdir}"/etc + install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf + + install -dm 755 "${pkgdir}"/etc/rc.d + install -m 755 ../../krb5-{kdc,kadmind,kpropd} "${pkgdir}"/etc/rc.d + + install -dm 755 "${pkgdir}"/usr/share/aclocal + install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal + + install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/krb5/krb5-1.10.1-gcc47.patch b/testing/krb5/krb5-1.10.1-gcc47.patch new file mode 100644 index 000000000..ffd01c2a3 --- /dev/null +++ b/testing/krb5/krb5-1.10.1-gcc47.patch @@ -0,0 +1,11 @@ +diff -Naur krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y krb5-1.10.1/src/lib/krb5/krb/x-deltat.y +--- krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y 2011-09-06 07:34:32.000000000 -0400 ++++ krb5-1.10.1/src/lib/krb5/krb/x-deltat.y 2012-03-24 13:15:11.543551318 -0400 +@@ -44,6 +44,7 @@ + #ifdef __GNUC__ + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wuninitialized" ++#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" + #endif + + #include <ctype.h> diff --git a/testing/krb5/krb5-kadmind b/testing/krb5/krb5-kadmind new file mode 100644 index 000000000..04df0dcff --- /dev/null +++ b/testing/krb5/krb5-kadmind @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/kadmind` +case "$1" in + start) + stat_busy "Starting Kerberos Admin Daemon" + if [ -z "$PID" ]; then + /usr/sbin/kadmind + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon krb5-kadmind + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Admin Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon krb5-kadmind + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/testing/krb5/krb5-kdc b/testing/krb5/krb5-kdc new file mode 100644 index 000000000..05a03411e --- /dev/null +++ b/testing/krb5/krb5-kdc @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/krb5kdc` +case "$1" in + start) + stat_busy "Starting Kerberos Authentication" + if [ -z "$PID" ]; then + /usr/sbin/krb5kdc + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon krb5-kdc + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Authentication" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon krb5-kdc + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/testing/krb5/krb5-kpropd b/testing/krb5/krb5-kpropd new file mode 100644 index 000000000..a0077d68e --- /dev/null +++ b/testing/krb5/krb5-kpropd @@ -0,0 +1,40 @@ +#!/bin/bash + +# general config +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/kpropd` +case "$1" in + start) + stat_busy "Starting Kerberos Database Propagation Daemon" + if [ -z "$PID" ]; then + /usr/sbin/kpropd -S + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon kpropd + stat_done + fi + ;; + stop) + stat_busy "Stopping Kerberos Database Propagation Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon kpropd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" + ;; +esac +exit 0 diff --git a/testing/llvm/PKGBUILD b/testing/llvm/PKGBUILD index 53d5c042c..002ea62ea 100644 --- a/testing/llvm/PKGBUILD +++ b/testing/llvm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 159378 2012-05-22 20:41:17Z foutrelis $ +# $Id: PKGBUILD 159399 2012-05-23 19:31:18Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sebastian Nowicki <sebnow@gmail.com> @@ -11,25 +11,29 @@ pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer') pkgver=3.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://llvm.org/" license=('custom:University of Illinois/NCSA Open Source License') makedepends=('libffi' 'python2' 'ocaml') source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.src.tar.gz http://llvm.org/releases/$pkgver/clang-$pkgver.src.tar.gz + http://dev.archlinux.org/~foutrelis/sources/compiler-rt/compiler-rt-$pkgver.src.tar.xz llvm-Config-config.h llvm-Config-llvm-config.h cindexer-clang-path.patch clang-pure64.patch - enable-lto.patch) + enable-lto.patch + clang-3.1-fix-libprofile_rt.a-location.patch) sha256sums=('1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab' 'ff63e215dcd3e2838ffdea38502f8d35bab17e487f3c3799579961e452d5a786' + '563d8a5ef86123ed8775e115ad7f90c1aa3e80f70b4e587f1bccab2c10753558' '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3' '597dc5968c695bbdbb0eac9e8eb5117fcd2773bc91edf5ec103ecffffab8bc48' '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92' '288a82fbff17bc554f5863734246500e637882af33ee8511019d5e0d6cd20524' - 'f7145e203ffb4ce2c01976027f7840a9520e5341a9945f2459b6b11e5422d5b7') + 'f7145e203ffb4ce2c01976027f7840a9520e5341a9945f2459b6b11e5422d5b7' + '0d32ad283566357ca1bfbeb4cbe6b0b961943b79d3d718ed0435101c05629137') build() { cd "$srcdir/$pkgname-$pkgver.src" @@ -39,6 +43,9 @@ build() { rm -rf tools/clang cp -r "$srcdir/clang-$pkgver.src" tools/clang + rm -rf projects/compiler-rt + cp -r "$srcdir/compiler-rt-$pkgver.src" projects/compiler-rt + # Fix symbolic links from OCaml bindings to LLVM libraries sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml @@ -68,6 +75,10 @@ build() { # Use gold instead of default linker, and always use the plugin patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch" + # Fix FS#29984: [clang] -coverage is broken + patch -d tools/clang -Np1 -i \ + "$srcdir/clang-3.1-fix-libprofile_rt.a-location.patch" + # Apply strip option to configure _optimized_switch="enable" [[ $(check_option strip) == n ]] && _optimized_switch="disable" diff --git a/testing/llvm/clang-3.1-fix-libprofile_rt.a-location.patch b/testing/llvm/clang-3.1-fix-libprofile_rt.a-location.patch new file mode 100644 index 000000000..080aa4fca --- /dev/null +++ b/testing/llvm/clang-3.1-fix-libprofile_rt.a-location.patch @@ -0,0 +1,12 @@ +diff -upr clang-3.1.src.orig/lib/Driver/Tools.cpp clang-3.1.src/lib/Driver/Tools.cpp +--- clang-3.1.src.orig/lib/Driver/Tools.cpp 2012-04-19 00:32:25.000000000 +0300 ++++ clang-3.1.src/lib/Driver/Tools.cpp 2012-05-23 21:12:08.000000000 +0300 +@@ -193,7 +193,7 @@ static void addProfileRT(const ToolChain + // libprofile_rt.so. We used to use the -l:libprofile_rt.a syntax, but that is + // not supported by old linkers. + std::string ProfileRT = +- std::string(TC.getDriver().Dir) + "/../lib/libprofile_rt.a"; ++ std::string(TC.getDriver().Dir) + "/../lib/llvm/libprofile_rt.a"; + + CmdArgs.push_back(Args.MakeArgString(ProfileRT)); + } |