From 52442b30a60f3a0dc7bc0eb214d123d001987c83 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 7 Sep 2011 15:14:25 +0000 Subject: Wed Sep 7 15:14:25 UTC 2011 --- extra/bind/PKGBUILD | 15 ++++--- extra/boost/PKGBUILD | 14 ++++-- extra/boost/exceptions.patch | 25 +++++++++++ extra/ettercap/PKGBUILD | 75 +++++++++++++++++++------------- extra/ettercap/ettercap-gtk.install | 11 +++++ extra/ettercap/ettercap.desktop | 9 ++++ extra/librsvg/PKGBUILD | 9 ++-- extra/libssh2/PKGBUILD | 21 +++++---- extra/libxml++/PKGBUILD | 8 ++-- extra/oprofile/PKGBUILD | 5 ++- extra/oprofile/oprofile.install | 7 ++- extra/scim/PKGBUILD | 11 ++--- extra/telepathy-mission-control/PKGBUILD | 6 +-- 13 files changed, 143 insertions(+), 73 deletions(-) create mode 100644 extra/boost/exceptions.patch create mode 100644 extra/ettercap/ettercap-gtk.install create mode 100644 extra/ettercap/ettercap.desktop (limited to 'extra') diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD index fe39e6a60..0053d4c6e 100644 --- a/extra/bind/PKGBUILD +++ b/extra/bind/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 136713 2011-08-31 16:36:47Z bisson $ +# $Id: PKGBUILD 137100 2011-09-06 08:10:20Z bisson $ # Maintainer: Gaetan Bisson # Contributor: judd # Contributor: Mario Vazquez @@ -6,9 +6,9 @@ pkgname=bind # Use a period and not a hyphen before the patch level for proper versioning. -pkgver=9.8.0.P4 -_pkgver=9.8.0-P4 -pkgrel=2 +pkgver=9.8.1 +_pkgver=9.8.1 +pkgrel=1 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols' url='http://www.isc.org/software/bind/' @@ -26,7 +26,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz" 'named.logrotate' 'localhost.zone' '127.0.0.zone') -sha1sums=('969864200c1516a8bea54266de60f316d79182b4' +sha1sums=('7e6ed6ebc896b1de33a9f440233066c60539de4c' 'cbdecd1ea8e7b612b33b63d66bc57273795d1f54' 'b433ba99f23e3db305f8ce293fe4ce6d1b8d4cfb' '18f477f510df31e6c6f547ee2d5fc46e973479bf' @@ -57,10 +57,11 @@ build() { --disable-static \ --disable-linux-caps \ --with-openssl \ - --with-gssapi \ --with-libxml2 \ --with-libtool \ - --with-dlz-dlopen \ + + # temporary fix for issue reported upstream + ln -s .libs/driver.o bin/tests/system/dlzexternal/ make } diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index abeaf0569..6f372d4cf 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 132748 2011-07-25 19:08:12Z ibiru $ +# $Id: PKGBUILD 137203 2011-09-06 17:17:14Z andrea $ # Maintainer: kevin # Contributor: Giovanni Scafora # Contributor: Kritoke @@ -8,13 +8,15 @@ pkgbase=boost pkgname=('boost-libs' 'boost') pkgver=1.47.0 _boostver=${pkgver//./_} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.boost.org/" makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') -source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz) +source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz + exceptions.patch) license=('custom') -md5sums=('ff180a5276bec773a7625cac7e2288e8') +md5sums=('ff180a5276bec773a7625cac7e2288e8' + '9b44c28b36303152050c8c82469569c5') _stagedir="${srcdir}/stagedir" @@ -25,6 +27,10 @@ build() { echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam echo "using mpi ;" >> build/v2/user-config.jam + # http://web.archiveorange.com/archive/v/Q0J4VE5bwsy3zxRXqUgd + cd "${srcdir}"/${pkgbase}_${_boostver} + patch -p0 -i "${srcdir}"/exceptions.patch + # build bjam cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine" ./build.sh cc diff --git a/extra/boost/exceptions.patch b/extra/boost/exceptions.patch new file mode 100644 index 000000000..9faa71526 --- /dev/null +++ b/extra/boost/exceptions.patch @@ -0,0 +1,25 @@ +diff -up boost/numeric/conversion/converter_policies.hpp\~ boost/numeric/conversion/converter_policies.hpp +--- boost/numeric/conversion/converter_policies.hpp~ 2008-10-13 11:00:03.000000000 +0200 ++++ boost/numeric/conversion/converter_policies.hpp 2011-07-22 11:46:40.961876274 +0200 +@@ -20,6 +20,7 @@ + + #include "boost/mpl/if.hpp" + #include "boost/mpl/integral_c.hpp" ++#include "boost/throw_exception.hpp" + + namespace boost { namespace numeric + { +@@ -159,9 +160,9 @@ struct def_overflow_handler + void operator() ( range_check_result r ) // throw(negative_overflow,positive_overflow) + { + if ( r == cNegOverflow ) +- throw negative_overflow() ; ++ boost::throw_exception( negative_overflow() ) ; + else if ( r == cPosOverflow ) +- throw positive_overflow() ; ++ boost::throw_exception( positive_overflow() ) ; + } + } ; + + +Diff finished. Fri Jul 22 11:46:49 2011 diff --git a/extra/ettercap/PKGBUILD b/extra/ettercap/PKGBUILD index fcba9b8b4..3fae3deba 100644 --- a/extra/ettercap/PKGBUILD +++ b/extra/ettercap/PKGBUILD @@ -1,38 +1,28 @@ -# $Id: PKGBUILD 135334 2011-08-12 21:28:33Z giovanni $ +# $Id: PKGBUILD 137221 2011-09-06 20:08:46Z andrea $ # Maintainer: # Contributor: Tom Newsom -pkgname=ettercap -pkgver=NG_0.7.3 -_origver=NG-0.7.3 -pkgrel=18 -pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console" +pkgbase=ettercap +pkgname=('ettercap' 'ettercap-gtk') +pkgver=NG_0.7.4.1 +_origver=${pkgver/_/-} +pkgrel=1 arch=('i686' 'x86_64') url="http://ettercap.sourceforge.net/" license=('GPL') -depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet') -makedepends=('libnet' 'pkgconfig') -backup=('etc/etter.conf') -options=(!libtool) -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_origver}.tar.gz" - 01_pointers_and_ints_dont_mix.diff - ettercap-NG-0.7.3_dns_support_on_x86_64.patch) -md5sums=('28fb15cd024162c55249888fe1b97820' - 'c8f2b004f69ac3522ffebb530478b324' - 'd44f80292afcefdc13cba9a30c6391d6') +depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet' + 'pkgconfig' 'gtk2') +source=("http://drizztbsd.github.com/${pkgbase}/dist/${pkgbase}-${_origver}.tar.gz" + 'ettercap.desktop') +md5sums=('c6ae5f86361a85a8e193051f594a74fa' + '6fb03d9c890430d3afa84466bb01781b') build() { - cd ${srcdir}/${pkgname}-${_origver} - unset LDFLAGS - - libtoolize --force --copy - aclocal - autoconf - - patch -Np1 -i ${srcdir}/01_pointers_and_ints_dont_mix.diff - - [ "$CARCH" = "x86_64" ] && patch -Np1 -i ${srcdir}/ettercap-NG-0.7.3_dns_support_on_x86_64.patch + cd "${srcdir}" + + cp -r ${pkgbase}-${_origver} ${pkgbase}-${_origver}-gtk + cd ${pkgbase}-${_origver} ./configure --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -40,12 +30,37 @@ build() { --enable-plugins \ --enable-https \ --disable-gtk - sed -i 's/LTDL_SHLIB_EXT/\".so\"/' src/ec_plugins.c make + + cd ../${pkgbase}-${_origver}-gtk + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --datarootdir=/usr/share \ + --enable-plugins \ + --enable-https + make +} + +package_ettercap() { + pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - console" + depends=('ncurses' 'openssl' 'libpcap' 'zlib' 'pcre' 'libtool' 'libnet') + backup=('etc/etter.conf') + options=('!libtool') + + cd "${srcdir}"/${pkgbase}-${_origver} + make DESTDIR="${pkgdir}" install } -package() { - cd ${srcdir}/${pkgname}-${_origver} +package_ettercap-gtk() { + pkgdesc="A network sniffer/interceptor/logger for ethernet LANs - GTK" + depends=('ettercap' 'gtk2' 'gksu') + install=ettercap-gtk.install - make DESTDIR=${pkgdir} install + cd "${srcdir}"/${pkgbase}-${_origver}-gtk + install -Dm755 src/ettercap "${pkgdir}"/usr/bin/ettercap-gtk + install -Dm644 "${srcdir}"/ettercap.desktop \ + "${pkgdir}"/usr/share/applications/ettercap.desktop + install -Dm644 desktop/ettercap.xpm \ + "${pkgdir}"/usr/share/pixmaps/ettercap.xpm } diff --git a/extra/ettercap/ettercap-gtk.install b/extra/ettercap/ettercap-gtk.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/extra/ettercap/ettercap-gtk.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/ettercap/ettercap.desktop b/extra/ettercap/ettercap.desktop new file mode 100644 index 000000000..35261ebf4 --- /dev/null +++ b/extra/ettercap/ettercap.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=ettercap +GenericName=Ettercap +Comment=Multipurpose sniffer/interceptor/logger +Icon=ettercap.xpm +Exec=gksu "/usr/sbin/ettercap --gtk" +Terminal=false +Categories=Application;Network;System;Security;GTK diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD index 3104e7ce4..d11672b26 100644 --- a/extra/librsvg/PKGBUILD +++ b/extra/librsvg/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 117525 2011-04-04 10:15:22Z ibiru $ +# $Id: PKGBUILD 137295 2011-09-06 22:08:52Z heftig $ # Maintainer: Jan de Groot pkgname=librsvg -pkgver=2.34.0 +pkgver=2.34.1 pkgrel=1 pkgdesc="SAX-based renderer for SVG files into a GdkPixbuf" arch=(i686 x86_64) license=('LGPL') depends=('gdk-pixbuf2' 'pango' 'libcroco') makedepends=('intltool') -optdepends=('python2: rsvg commandline utility') options=('!libtool' '!emptydirs') url="http://librsvg.sourceforge.net/" install=librsvg.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.34/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('9d2111e086dcffd12466f48ab1ca088654011684c499a4cc4676da918290f3cd') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.34/${pkgname}-${pkgver}.tar.xz) +sha256sums=('4f2ab987eed2943b5a0ce3dde1672d2bc87123bee66d885dd7307eb7ede756db') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libssh2/PKGBUILD b/extra/libssh2/PKGBUILD index 03ce4e88d..00a2e5bb3 100644 --- a/extra/libssh2/PKGBUILD +++ b/extra/libssh2/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 136215 2011-08-24 15:37:17Z angvp $ -# Maintainer: Angel Velasquez +# $Id: PKGBUILD 137230 2011-09-06 21:12:10Z dreisner $ +# Maintainer: Dave Reisner +# Contributor: Angel Velasquez # Contributor: Sergej Pupykin # Contributor: Andrea Scarpino # Contributor: ice-man pkgname=libssh2 -pkgver=1.2.9 +pkgver=1.3.0 pkgrel=1 pkgdesc="A library implementing the SSH2 protocol as defined by Internet Drafts" url="http://www.libssh2.org/" @@ -14,17 +15,19 @@ license=('BSD') depends=('openssl') makedepends=('zlib') options=('!libtool') -source=("http://www.libssh2.org/download/${pkgname}-${pkgver}.tar.gz") -md5sums=('62ea143c41c6ed437a55d6a0b0579f2f') +source=("http://www.libssh2.org/download/$pkgname-$pkgver.tar.gz"{,.asc}) +md5sums=('6425331899ccf1015f1ed79448cb4709' + '6ddcc9f2b37941f8291d7494ee8f89b7') build() { - cd ${srcdir}/${pkgname}-${pkgver} + 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 + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/libxml++/PKGBUILD b/extra/libxml++/PKGBUILD index 53566fd25..198544cbb 100644 --- a/extra/libxml++/PKGBUILD +++ b/extra/libxml++/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 120095 2011-04-19 21:39:40Z ibiru $ +# $Id: PKGBUILD 137178 2011-09-06 09:14:31Z ibiru $ # Maintainer: damir pkgbase=libxml++ pkgname=('libxml++' 'libxml++-docs') -pkgver=2.34.1 +pkgver=2.34.2 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') url="http://libxmlplusplus.sourceforge.net/" makedepends=('pkgconfig' 'glibmm-docs' 'libxml2' 'glibmm') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.34/${pkgbase}-${pkgver}.tar.bz2) -sha256sums=('664f3636c425554bf5e7d1b60253244e2d723899be8a971fc54332148bfce040') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.34/${pkgbase}-${pkgver}.tar.xz) +sha256sums=('77daba20ab76631071d4ed4cc18fa2e981160ca05ae661e8d146f2b0728f9baa') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/oprofile/PKGBUILD b/extra/oprofile/PKGBUILD index a36ca0995..b557d828e 100644 --- a/extra/oprofile/PKGBUILD +++ b/extra/oprofile/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135638 2011-08-16 21:35:38Z eric $ +# $Id: PKGBUILD 137218 2011-09-06 19:49:42Z eric $ # Maintainer : Aaron Griffin pkgname=oprofile pkgver=0.9.7 -pkgrel=1 +pkgrel=2 pkgdesc="A system-wide profiler for Linux systems, capable of profiling all running code at low overhead" arch=('i686' 'x86_64') url="http://oprofile.sourceforge.net" @@ -26,6 +26,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install + install -d "$pkgdir/var/lib/oprofile" # installing development libraries - FS#20089 install -m644 libutil/op_types.h libop/op_sample_file.h libutil/op_list.h libop/op_events.h libop/op_cpu_type.h libop/op_config.h libdb/odb.h "$pkgdir/usr/include" diff --git a/extra/oprofile/oprofile.install b/extra/oprofile/oprofile.install index 025c9725a..5cd3e7e22 100644 --- a/extra/oprofile/oprofile.install +++ b/extra/oprofile/oprofile.install @@ -1,11 +1,14 @@ post_install(){ groupadd -g 492 oprofile &>/dev/null - useradd -u 492 -g oprofile -s /bin/false oprofile &>/dev/null + useradd -u 492 -g oprofile -d /var/lib/oprofile -s /bin/false oprofile &>/dev/null } post_upgrade(){ getent group oprofile >/dev/null 2>&1 || groupadd -g 492 oprofile &>/dev/null - getent passwd oprofile >/dev/null 2>&1 || useradd -u 492 -g oprofile -s /bin/false oprofile &>/dev/null + getent passwd oprofile >/dev/null 2>&1 || useradd -u 492 -g oprofile -d /var/lib/oprofile -s /bin/false oprofile &>/dev/null + if [ "$(vercmp $2 0.9.7-2)" -lt 0 ] ; then + usermod -d /var/lib/oprofile oprofile + fi } post_remove(){ diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD index f8d96e585..924610761 100644 --- a/extra/scim/PKGBUILD +++ b/extra/scim/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 134853 2011-08-08 03:28:47Z bisson $ +# $Id: PKGBUILD 137306 2011-09-06 22:52:36Z bisson $ # Maintainer: Gaetan Bisson # Contributor: damir # Contributor: Gan Lu pkgname=scim pkgver=1.4.11 -pkgrel=1 +pkgrel=2 pkgdesc='Input method user interface and development platform' url='http://www.scim-im.org/projects/scim' license=('GPL') @@ -14,16 +14,13 @@ options=('!libtool') makedepends=('intltool') depends=('gtk2' 'libtool') backup=('etc/scim/config' 'etc/scim/global') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'wtf.patch') -sha1sums=('dd93094f62e5707db88d4f0e7ebd3392ae75b942' - '14d2be6c8f9f4af6494c3e806d3cadef5803597a') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('e202e42df52f5c9a88f6ae4d4ce04f94bc22e27c') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../wtf.patch # revert broken commit 303 ./bootstrap ./configure \ diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index 76e77def9..930bab3ae 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 132301 2011-07-22 16:07:21Z ibiru $ +# $Id: PKGBUILD 137223 2011-09-06 20:13:49Z ibiru $ # Maintainer: Ionut Biru # Contributor: Ju Liu # Contributor: Bjorn Lindeijer # Contributor: Andreas Zwinkau pkgname=telepathy-mission-control -pkgver=5.8.0 +pkgver=5.8.1 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('telepathy-glib' 'libgnome-keyring') makedepends=('libxslt' 'python2') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz) -md5sums=('a708767687a6515058ee1a3654eda5c1') +md5sums=('91c616e082c6326087ec5236beef67ae') build() { cd "$srcdir/$pkgname-$pkgver" -- cgit v1.2.3-54-g00ecf