From fbd9603c619db8a960bd9c091211a8abd16c9534 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 22 Sep 2013 03:01:36 -0700 Subject: Sun Sep 22 02:53:38 PDT 2013 --- community/avrdude/PKGBUILD | 10 +++---- community/converseen/PKGBUILD | 6 ++-- community/cuneiform/PKGBUILD | 6 ++-- community/ettercap/PKGBUILD | 33 +++++++++++----------- community/ettercap/ettercap.desktop | 8 ------ .../ettercap/org.archlinux.pkexec.ettercap.policy | 19 ------------- core/systemd/PKGBUILD | 12 ++++---- core/systemd/initcpio-hook-udev | 2 ++ core/systemd/initcpio-install-systemd | 17 ++++++----- core/systemd/initcpio-install-udev | 1 + extra/ibus/PKGBUILD | 15 ++++------ extra/imagemagick/PKGBUILD | 6 ++-- extra/inkscape/PKGBUILD | 4 +-- extra/pstoedit/PKGBUILD | 4 +-- extra/qemu/PKGBUILD | 10 +++---- 15 files changed, 65 insertions(+), 88 deletions(-) delete mode 100644 community/ettercap/ettercap.desktop delete mode 100644 community/ettercap/org.archlinux.pkexec.ettercap.policy diff --git a/community/avrdude/PKGBUILD b/community/avrdude/PKGBUILD index 9262a5e85..b514e1d35 100644 --- a/community/avrdude/PKGBUILD +++ b/community/avrdude/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 92157 2013-06-01 20:12:04Z jelle $ +# $Id: PKGBUILD 97484 2013-09-21 11:43:49Z jelle $ # Contributor: Corrado Primier # Maintainer: Brad Fanella pkgname=avrdude -pkgver=5.11.1 -pkgrel=4 +pkgver=6.0.1 +pkgrel=1 pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers" arch=('i686' 'x86_64') url="http://www.nongnu.org/avrdude/" license=('GPL') depends=('libusbx' 'readline' 'libftdi') source=(http://download.savannah.gnu.org/releases/avrdude/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('3a43e288cb32916703b6945e3f260df9' - '0c23b005d4090aef4e081476aabc1958') +md5sums=('346ec2e46393a54ac152b95abf1d9850' + 'SKIP') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD index e482e7fdc..4ca2a8980 100644 --- a/community/converseen/PKGBUILD +++ b/community/converseen/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 95471 2013-08-12 20:28:10Z eric $ +# $Id: PKGBUILD 97491 2013-09-21 18:36:28Z eric $ # Maintainer: Giovanni Scafora # Contributor: archtux pkgname=converseen pkgver=0.6.4 -pkgrel=2 +pkgrel=3 pkgdesc="The batch image converter and resizer" arch=('i686' 'x86_64') url="http://converseen.sourceforge.net/" license=('GPL3') -depends=('imagemagick' 'qt4' 'libwmf' 'openexr') +depends=('imagemagick' 'qt4' 'libwmf' 'openexr' 'libwebp') makedepends=('cmake') install=converseen.install source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") diff --git a/community/cuneiform/PKGBUILD b/community/cuneiform/PKGBUILD index 9858fe328..25f153351 100644 --- a/community/cuneiform/PKGBUILD +++ b/community/cuneiform/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 95472 2013-08-12 20:28:12Z eric $ +# $Id: PKGBUILD 97492 2013-09-21 18:36:29Z eric $ # Maintainer: Sergej Pupykin # Contributor: Maxim Vuets pkgname=cuneiform pkgver=1.1.0 _dpkgver=1.1 -pkgrel=9 +pkgrel=10 pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages." arch=('i686' 'x86_64') url="https://launchpad.net/cuneiform-linux" @@ -33,7 +33,7 @@ build() { } check() { - ldd ${srcdir}/${pkgname}-linux-${pkgver}/builddir/cuneiform | grep Magick >/dev/null + ldd "${srcdir}/${pkgname}-linux-${pkgver}/builddir/cuneiform" | grep Magick >/dev/null } package() { diff --git a/community/ettercap/PKGBUILD b/community/ettercap/PKGBUILD index 4250f3d44..a7ab4c80f 100644 --- a/community/ettercap/PKGBUILD +++ b/community/ettercap/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 88226 2013-04-14 19:02:25Z jelle $ +# $Id: PKGBUILD 97482 2013-09-21 10:35:04Z jelle $ # Maintainer: # Contributor: Tom Newsom pkgbase=ettercap pkgname=('ettercap' 'ettercap-gtk') -pkgver=0.7.6 -pkgrel=2 +pkgver=0.8.0 +pkgrel=1 arch=('i686' 'x86_64') url="http://ettercap.github.com/ettercap/" license=('GPL') depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet') makedepends=('ghostscript' 'cmake' 'libpcap' 'libltdl' 'libnet' 'gtk2') options=('!libtool' '!makeflags' '!emptydirs') -source=("https://github.com/Ettercap/ettercap/archive/v$pkgver.tar.gz" "ettercap.desktop" "org.archlinux.pkexec.ettercap.policy") -md5sums=('7c5f5e1fd4002afdfd13765ef92866e1' - '51ae9f08e37a0621b3caeedb8e4d47d7' - '473867a0ee6da9cfb048b3d332c3d71f') +source=("https://github.com/Ettercap/ettercap/archive/v$pkgver.tar.gz") +md5sums=('067514bb53ff76b81d578676e2048319') + build() { cd "${srcdir}" @@ -24,13 +23,13 @@ build() { cd ${pkgbase}-${pkgver} mkdir build cd build - cmake -D ENABLE_GTK=OFF -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../ + cmake -D ENABLE_GTK=OFF -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release ../ make cd "$srcdir"/${pkgbase}-${pkgver}-gtk mkdir build cd build - cmake -D ENABLE_GTK=ON -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=RELEASE ../ + cmake -D ENABLE_GTK=ON -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release ../ make } @@ -45,7 +44,7 @@ package_ettercap() { package_ettercap-gtk() { pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK frontend" - depends+=('gtk2' 'polkit') + depends+=('gtk2') backup=('etc/ettercap/etter.conf') conflicts=('ettercap') provides=('ettercap') @@ -56,18 +55,18 @@ package_ettercap-gtk() { cd "${srcdir}"/${pkgbase}-${pkgver}-gtk/build make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/ettercap.desktop" "${pkgdir}/usr/share/applications/ettercap.desktop" - install -Dm644 "${srcdir}/${pkgbase}-${pkgver}-gtk/desktop/ettercap.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/ettercap.svg" +#install -Dm644 "${srcdir}/ettercap.desktop" "${pkgdir}/usr/share/applications/ettercap.desktop" +#install -Dm644 "${srcdir}/${pkgbase}-${pkgver}-gtk/desktop/ettercap.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/ettercap.svg" # Install policy file - install -Dm644 "${srcdir}/org.archlinux.pkexec.ettercap.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.ettercap.policy" + #install -Dm644 "${srcdir}/org.archlinux.pkexec.ettercap.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.ettercap.policy" # We need rename the original script - mv "${pkgdir}/usr/bin/ettercap" "${pkgdir}/usr/bin/ettercap.elf" + #mv "${pkgdir}/usr/bin/ettercap" "${pkgdir}/usr/bin/ettercap.elf" # Install launcher script - echo '#!/bin/sh' > ${pkgdir}/usr/bin/ettercap - echo 'pkexec --disable-internal-agent "/usr/bin/ettercap.elf" "$@"' >> ${pkgdir}/usr/bin/ettercap - chmod 755 ${pkgdir}/usr/bin/ettercap + #echo '#!/bin/sh' > ${pkgdir}/usr/bin/ettercap + #echo 'pkexec --disable-internal-agent "/usr/bin/ettercap.elf" "$@"' >> ${pkgdir}/usr/bin/ettercap + #chmod 755 ${pkgdir}/usr/bin/ettercap } diff --git a/community/ettercap/ettercap.desktop b/community/ettercap/ettercap.desktop deleted file mode 100644 index 71f8c8ce8..000000000 --- a/community/ettercap/ettercap.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Ettercap -Comment=Nework sniffer/analyser -Exec=ettercap -G -Icon=ettercap -Terminal=false -Type=Application -Categories=Network; diff --git a/community/ettercap/org.archlinux.pkexec.ettercap.policy b/community/ettercap/org.archlinux.pkexec.ettercap.policy deleted file mode 100644 index 7908d7232..000000000 --- a/community/ettercap/org.archlinux.pkexec.ettercap.policy +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - Authentication is required to run Ettercap - ettercap - - auth_admin - auth_admin - auth_admin - - /usr/bin/ettercap.elf - true - - - diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 6a84686ad..e5f054629 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -4,13 +4,13 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') pkgver=207 -pkgrel=3 +pkgrel=5 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd' 'libxslt' 'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz') -options=('!libtool') +options=('!libtool' 'strip' 'debug') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-systemd' @@ -19,9 +19,9 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 0001-swap-fix-reverse-dependencies.patch 0002-swap-create-.wants-symlink-to-auto-swap-devices.patch) md5sums=('7799f3cc9d289b8db1c1fa56ae7ecd88' - '2de72238ed5c0df62a7c3b6bdaf8cb7c' - '9027b31a875e74a45623954b3b23d09f' - 'd83d45e67cd75cdbafb81c96a7485319' + '29245f7a240bfba66e2b1783b63b6b40' + '8b68b0218a3897d4d37a6ccf47914774' + 'bde43090d4ac0ef048e3eaee8202a407' '9eb0a46aa2a3a6d74117f9a174dbe168' '182be4c729aaecde249b7b05b48a481f' 'b54fbe35e2689ac36cda9ac4a5a86f24') @@ -37,6 +37,8 @@ prepare() { build() { cd "$pkgname-$pkgver" + CFLAGS+=' -g' + ./configure \ --libexecdir=/usr/lib \ --localstatedir=/var \ diff --git a/core/systemd/initcpio-hook-udev b/core/systemd/initcpio-hook-udev index 227a8d034..0bc32e008 100644 --- a/core/systemd/initcpio-hook-udev +++ b/core/systemd/initcpio-hook-udev @@ -1,6 +1,8 @@ #!/usr/bin/ash run_earlyhook() { + kmod static-nodes --format=tmpfiles --output=/run/tmpfiles.d/kmod.conf + systemd-tmpfiles --prefix=/dev --create /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never udevd_running=1 } diff --git a/core/systemd/initcpio-install-systemd b/core/systemd/initcpio-install-systemd index ac86d338d..2c59074a7 100644 --- a/core/systemd/initcpio-install-systemd +++ b/core/systemd/initcpio-install-systemd @@ -101,6 +101,7 @@ build() { # systemd add_binary /usr/lib/systemd/systemd /init + add_binary /usr/bin/systemd-tmpfiles # generate sysroot.mount and sysroot-usr.mount add_file "/usr/lib/systemd/system-generators/systemd-fstab-generator" @@ -114,12 +115,7 @@ build() { 99-systemd.rules \ map add_systemd_unit \ - systemd-udevd-control.socket \ - systemd-udevd-kernel.socket \ - sockets.target \ - systemd-journald.service \ - systemd-udevd.service \ - systemd-udev-trigger.service \ + ctrl-alt-del.target \ initrd-cleanup.service \ initrd-fs.target \ initrd-parse-etc.service \ @@ -128,8 +124,15 @@ build() { initrd-switch-root.target \ initrd-udevadm-cleanup-db.service \ initrd.target \ + kmod-static-nodes.service \ + sockets.target \ systemd-fsck@.service \ - ctrl-alt-del.target + systemd-journald.service \ + systemd-tmpfiles-setup-dev.service \ + systemd-udev-trigger.service \ + systemd-udevd-control.socket \ + systemd-udevd-kernel.socket \ + systemd-udevd.service add_symlink "/usr/lib/systemd/system/default.target" "initrd.target" diff --git a/core/systemd/initcpio-install-udev b/core/systemd/initcpio-install-udev index 2f6f15d0b..419c19e58 100644 --- a/core/systemd/initcpio-install-udev +++ b/core/systemd/initcpio-install-udev @@ -6,6 +6,7 @@ build() { add_file "/etc/udev/udev.conf" add_binary /usr/lib/systemd/systemd-udevd add_binary /usr/bin/udevadm + add_binary /usr/bin/systemd-tmpfiles for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do add_file "/usr/lib/udev/rules.d/$rules" diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD index 016d40dbe..e13054e0d 100644 --- a/extra/ibus/PKGBUILD +++ b/extra/ibus/PKGBUILD @@ -1,22 +1,19 @@ -# $Id: PKGBUILD 194263 2013-09-11 22:22:58Z eric $ -# Contributor: Rainy -# Contributor: Lee.MaRS -# Contributor: Daniel J Griffiths -# Maintainer: Brad Fanella +# $Id: PKGBUILD 194672 2013-09-21 02:17:57Z eric $ +# Maintainer: pkgname=ibus -pkgver=1.5.3 -pkgrel=2 +pkgver=1.5.4 +pkgrel=1 pkgdesc="Next Generation Input Bus for Linux" arch=('i686' 'x86_64') url="http://ibus.googlecode.com" license=('LGPL') depends=('hicolor-icon-theme' 'gtk2' 'gtk3' 'python2-gobject' 'libnotify') -makedepends=('gobject-introspection' 'vala' 'dconf' 'iso-codes' 'intltool') +makedepends=('gobject-introspection' 'vala' 'dconf' 'gconf' 'iso-codes' 'intltool') options=('!libtool') install=ibus.install source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('51ba186cbf5e1e194ba0cd22b81f00d9d40ec521') +sha1sums=('2ce4b4d728a4685fd77360d0097b0e568f920c7b') build() { cd ${pkgname}-${pkgver} diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 3fd9a4ac2..3c6e7ae68 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193716 2013-08-29 06:22:01Z eric $ +# $Id: PKGBUILD 194676 2013-09-21 18:35:37Z eric $ # Maintainer: Eric Bélanger pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.6.9 +pkgver=6.8.6.10 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -14,7 +14,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('c1e8b19f6afc19751c7c777688f0005d36917f9e' +sha1sums=('807380b2221b5fed789bc895e8e4c3758237be9a' 'e143cf9d530fabf3b58023899b5cc544ba93daec') prepare() { diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 86d71efa7..48046d56d 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 192476 2013-08-12 20:25:43Z eric $ +# $Id: PKGBUILD 194677 2013-09-21 18:35:38Z eric $ # Maintainer: Gaetan Bisson # Contributor: Tobias Kieslich # Contributor: tobias pkgname=inkscape pkgver=0.48.4 -pkgrel=10 +pkgrel=11 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD index 7612f88fe..f74af1c52 100644 --- a/extra/pstoedit/PKGBUILD +++ b/extra/pstoedit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 192480 2013-08-12 20:25:47Z eric $ +# $Id: PKGBUILD 194678 2013-09-21 18:35:39Z eric $ # Maintainer: Ronald van Haren # Contributor: damir # Contributor: Tobias Powalowski pkgname=pstoedit pkgver=3.62 -pkgrel=2 +pkgrel=3 pkgdesc="Translates PostScript and PDF graphics into other vector formats" arch=('i686' 'x86_64') url="http://www.pstoedit.net/" diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD index e6ff9a5f2..458e6c515 100644 --- a/extra/qemu/PKGBUILD +++ b/extra/qemu/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 191616 2013-07-27 20:19:26Z tpowa $ +# $Id: PKGBUILD 194681 2013-09-21 21:20:52Z tpowa $ # Maintainer: Tobias Powalowski pkgname=('qemu' 'libcacard') -pkgver=1.5.2 +pkgver=1.5.3 pkgrel=1 arch=('i686' 'x86_64') license=('GPL2' 'LGPL2.1') @@ -34,7 +34,8 @@ package_qemu() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install rm "${pkgdir}/usr/share/qemu/bios.bin" - + rm "${pkgdir}/usr/share/qemu/acpi-dsdt.aml" + rm "${pkgdir}/usr/share/qemu/q35-acpi-dsdt.aml" install -D -m644 "${srcdir}/65-kvm.rules" \ "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules" # bridge_helper needs suid @@ -65,6 +66,5 @@ package_libcacard() { cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/ cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/ } - -md5sums=('04b94189ba587b3280713ded3b7f959a' +md5sums=('7a7ce91bea6a69e55b3c6e20e4999898' '9d6de26867a05c306157e3d3c612b28a') -- cgit v1.2.3-54-g00ecf