From 0020cc650ff973f269f23332e82fc097254d0adc Mon Sep 17 00:00:00 2001 From: root Date: Sun, 12 Feb 2012 23:15:07 +0000 Subject: Sun Feb 12 23:15:07 UTC 2012 --- community/blender/PKGBUILD | 2 +- community/bti/PKGBUILD | 2 +- community/cclive/PKGBUILD | 4 +- community/ccze/PKGBUILD | 4 +- community/cegui/PKGBUILD | 4 +- community/cherokee/PKGBUILD | 4 +- community/courier-maildrop/PKGBUILD | 2 +- community/courier-mta/PKGBUILD | 6 +- community/courier-mta/courier-mta.install | 2 +- community/desmume/PKGBUILD | 34 +++++++++ community/exim/PKGBUILD | 6 +- community/freemat/PKGBUILD | 8 +- community/gambas2/PKGBUILD | 6 +- community/gambas3/PKGBUILD | 4 +- community/gnote/PKGBUILD | 4 +- community/gource/PKGBUILD | 4 +- community/gsmartcontrol/PKGBUILD | 2 +- community/i3-wm/PKGBUILD | 4 +- community/leafnode/PKGBUILD | 7 +- community/lorcon/PKGBUILD | 6 +- community/nginx/PKGBUILD | 4 +- community/ngrep/PKGBUILD | 10 ++- community/ngrep/ngrep-fix-ipv6-support.patch | 107 +++++++++++++++++++++++++++ community/opencollada/PKGBUILD | 2 +- community/p3scan/PKGBUILD | 8 +- community/pidgin-musictracker/PKGBUILD | 4 +- community/pkgtools/PKGBUILD | 2 +- community/pound/PKGBUILD | 17 +++-- community/privoxy/PKGBUILD | 4 +- community/remind/PKGBUILD | 11 +-- community/root/PKGBUILD | 2 +- community/setconf/PKGBUILD | 4 +- community/slock/PKGBUILD | 18 ++--- community/snort/PKGBUILD | 6 +- community/ted/PKGBUILD | 4 +- community/winefish/PKGBUILD | 4 +- community/xmms-imms/PKGBUILD | 4 +- 37 files changed, 242 insertions(+), 84 deletions(-) create mode 100644 community/desmume/PKGBUILD create mode 100644 community/ngrep/ngrep-fix-ipv6-support.patch (limited to 'community') diff --git a/community/blender/PKGBUILD b/community/blender/PKGBUILD index 0f23b4ae5..824e25a61 100644 --- a/community/blender/PKGBUILD +++ b/community/blender/PKGBUILD @@ -14,7 +14,7 @@ _svn=false pkgname=blender pkgver=2.61 -pkgrel=4 +pkgrel=5 epoch=3 pkgdesc="A fully integrated 3D graphics creation suite" arch=('i686' 'x86_64') diff --git a/community/bti/PKGBUILD b/community/bti/PKGBUILD index 63b104f0c..ca2987c1b 100644 --- a/community/bti/PKGBUILD +++ b/community/bti/PKGBUILD @@ -4,7 +4,7 @@ pkgname=bti pkgver=032 -pkgrel=1 +pkgrel=2 pkgdesc='Console client for Twitter and identi.ca' arch=('i686' 'x86_64') url='http://gregkh.github.com/bti/' diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD index 758c47069..37126e79f 100644 --- a/community/cclive/PKGBUILD +++ b/community/cclive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 60841 2011-12-19 01:09:02Z lfleischer $ +# $Id: PKGBUILD 64309 2012-02-11 23:19:16Z allan $ # Maintainer: Lukas Fleischer # Contributor: joyfulgirl@archlinux.us # Contributor: nathan owe ndowens04 at gmail dot com pkgname=cclive pkgver=0.7.8 -pkgrel=1 +pkgrel=2 pkgdesc='Commandline downloader for popular video websites.' arch=('i686' 'x86_64') url='http://cclive.sourceforge.net/' diff --git a/community/ccze/PKGBUILD b/community/ccze/PKGBUILD index 0ff0df300..36b524e47 100644 --- a/community/ccze/PKGBUILD +++ b/community/ccze/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 24887 2010-08-29 16:28:18Z jlichtblau $ +# $Id: PKGBUILD 64311 2012-02-11 23:19:24Z allan $ # Maintainer: Jaroslav Lichtblau pkgname=ccze pkgver=0.2.1 -pkgrel=5 +pkgrel=6 pkgdesc="Robust and modular log colorizer with many plugins" arch=('i686' 'x86_64') url="http://freshmeat.net/projects/ccze/" diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index 770d47ef4..1f43ed396 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 62687 2012-01-24 14:37:57Z svenstaro $ +# $Id: PKGBUILD 64313 2012-02-11 23:19:28Z allan $ # Maintainer: Sven-Hendrik Haase # Contributor: Juergen Hoetzel # Contributor: William Rea , @@ -6,7 +6,7 @@ pkgname=cegui pkgver=0.7.6 -pkgrel=1 +pkgrel=2 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64') url="http://crayzedsgui.sourceforge.net" diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD index 28b5f9c15..a7a8a958b 100644 --- a/community/cherokee/PKGBUILD +++ b/community/cherokee/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 58385 2011-11-12 17:16:09Z ibiru $ +# $Id: PKGBUILD 64315 2012-02-11 23:19:41Z allan $ # Maintainer: Evangelos Foutras # Contributor: Link Dupont pkgname=cherokee pkgver=1.2.101 -pkgrel=2 +pkgrel=3 pkgdesc="A very fast, flexible and easy to configure Web Server" arch=('i686' 'x86_64') url="http://www.cherokee-project.com/" diff --git a/community/courier-maildrop/PKGBUILD b/community/courier-maildrop/PKGBUILD index 02564d120..e11ea49ca 100644 --- a/community/courier-maildrop/PKGBUILD +++ b/community/courier-maildrop/PKGBUILD @@ -6,7 +6,7 @@ pkgname=courier-maildrop _srcname=maildrop pkgver=2.5.5 -pkgrel=1 +pkgrel=2 pkgdesc="mail delivery agent - procmail like but nicer syntax" arch=('i686' 'x86_64') license=('GPL2') diff --git a/community/courier-mta/PKGBUILD b/community/courier-mta/PKGBUILD index 12ec10476..52deb71eb 100644 --- a/community/courier-mta/PKGBUILD +++ b/community/courier-mta/PKGBUILD @@ -8,7 +8,7 @@ pkgname=courier-mta pkgver=0.67.0 -pkgrel=1 +pkgrel=2 pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig" arch=(i686 x86_64) license=('GPL2') @@ -23,7 +23,7 @@ backup=('etc/courier/imapd.cnf' 'etc/courier/pop3d.cnf' \ url="http://courier-mta.org" depends=('courier-authlib>=0.63.0' 'gamin' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates') optdepends=('libldap') -makedepends=('apache>=2.2.9-3' 'pam>=1.0.1-2' 'expect' 'gnupg' 'libldap' 'gamin') +makedepends=('apache' 'pam' 'expect' 'gnupg' 'libldap' 'gamin') provides=('smtp-server' 'smtp-forwarder' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop') conflicts=('courier-imap' 'smtp-forwarder' 'smtp-server' 'imap-server' 'courier-maildrop' 'ucspi-tcp') options=('!libtool') @@ -65,6 +65,8 @@ build() { 's|--with-authchangepwdir=/var/tmp/dev/null|--with-authchangepwdir=$libexecdir/authlib|' \ configure && chmod 755 configure + LDFLAGS+=",-L /usr/lib/courier-authlib -lcourierauth" + echo $LDFLAGS # courier is more about configuring than compiling :-), lets start the mess ./configure --prefix=/usr \ --sysconfdir=/etc/courier \ diff --git a/community/courier-mta/courier-mta.install b/community/courier-mta/courier-mta.install index e835e3efd..b0d827e43 100644 --- a/community/courier-mta/courier-mta.install +++ b/community/courier-mta/courier-mta.install @@ -20,7 +20,7 @@ post_upgrade() { post_install $1 echo "Please migrate to the new daemon format:" echo "/etc/rc.d/courier-imap has been split into separate daemons:" - echo " imapd, imads-ssl, pop3d, pop3d-ssl" + echo " imapd, imapd-ssl, pop3d, pop3d-ssl" echo "This elimates the need for /etc/conf.d/courier-imap" echo "Update your /etc/rc.conf and manually add the desired daemons. Make sure" echo "you first start authdaemond before any other of these daemons." diff --git a/community/desmume/PKGBUILD b/community/desmume/PKGBUILD new file mode 100644 index 000000000..65a01fb7d --- /dev/null +++ b/community/desmume/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 38953 2011-02-03 21:59:54Z bfanella $ +# Maintainer: Jonathan Conder +# Maintainer: Brad Fanella +# Contributor: Arkham +# Contributor: Nathan Jones +# Contributor: Javier "Phrodo_00" Aravena +# Contributor: angvp +# Contributor: Allan +# Contributor: w0rm +# Contributor: vEX +# Contributor: Asher256 + +pkgname=desmume +pkgver=0.9.7 +pkgrel=3 +pkgdesc="Nintendo DS emulator" +arch=('i686' 'x86_64') +url="http://desmume.org/" +license=('GPL') +depends=('agg' 'gtkglext' 'intltool' 'libgl' 'libglade' 'mesa') +replaces=('desmume-core' 'desmume-cli' 'desmume-gtk' 'desmume-glade') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") +sha256sums=('0a0f7ef3cc76ff0bbc6f3df47c3689653617074ea7ffc354e9fa1240c5336523') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --enable-wifi + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD index aefe386cd..cd78dbde4 100644 --- a/community/exim/PKGBUILD +++ b/community/exim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61949 2012-01-11 15:21:55Z stephane $ +# $Id: PKGBUILD 64321 2012-02-11 23:20:47Z allan $ # Maintainer: Angel Velasquez # Maintainer: judd pkgname=exim pkgver=4.77 -pkgrel=2 +pkgrel=3 pkgdesc="Message Transfer Agent" arch=('x86_64' 'i686') url="http://www.exim.org/" @@ -16,7 +16,7 @@ depends=('db' 'pcre' 'pam' 'openssl' 'libldap') provides=('smtp-server') conflicts=('smtp-server') options=('!makeflags') -source=("ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-$pkgver.tar.bz2" +source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2" aliases exim exim.logrotate diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD index 2609674ba..b218cb149 100644 --- a/community/freemat/PKGBUILD +++ b/community/freemat/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62525 2012-01-20 17:49:51Z spupykin $ +# $Id: PKGBUILD 64323 2012-02-11 23:21:03Z allan $ # Maintainer: Sergej Pupykin # Contributor: William Rea pkgname=freemat pkgver=4.1 -pkgrel=1 +pkgrel=2 pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing" arch=('i686' 'x86_64') url="http://freemat.sourceforge.net" @@ -34,6 +34,10 @@ build() { -DPYTHON_EXECUTABLE=/usr/bin/python2 \ . make +} +package() { + cd $srcdir/FreeMat-$pkgver-Source + make DESTDIR=$pkgdir install sed -i "s|/FreeMat-.*/|/FreeMat-$pkgver/|g" $startdir/freemat.install rm $pkgdir/usr/bin/blas.ini diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index b4fb28737..bbe551098 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63574 2012-02-05 11:57:16Z ibiru $ +# $Id: PKGBUILD 64325 2012-02-11 23:21:25Z allan $ # Maintainer : Laurent Carlier # Contributor: Biru Ionut # Contributor: Andrea Scarpino @@ -20,12 +20,12 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') pkgver=2.23.1 -pkgrel=7 +pkgrel=8 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" depends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'libgl' 'gtk2' 'librsvg' 'xdg-utils' - 'postgresql-libs>=8.4.1' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' + 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft' 'libxcursor' 'libsm') makedepends=('intltool' 'mysql' 'postgresql') diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 929cf8517..c98d351b4 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63866 2012-02-06 12:50:38Z lcarlier $ +# $Id: PKGBUILD 64327 2012-02-11 23:21:36Z allan $ # Maintainer: Laurent Carlier pkgbase=gambas3 @@ -13,7 +13,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') pkgver=3.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD index fff5fe176..1c69f7f97 100644 --- a/community/gnote/PKGBUILD +++ b/community/gnote/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60974 2011-12-19 21:58:11Z ibiru $ +# $Id: PKGBUILD 64329 2012-02-11 23:21:43Z allan $ # Maintainer: Ionut Biru # Contributor: uastasi pkgname=gnote pkgver=0.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="A note taking application." arch=('i686' 'x86_64') url="http://live.gnome.org/Gnote" diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD index 63e0ee8e5..3ddf40c63 100644 --- a/community/gource/PKGBUILD +++ b/community/gource/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 55965 2011-09-27 03:33:41Z svenstaro $ +# $Id: PKGBUILD 64331 2012-02-11 23:21:51Z allan $ # Maintainer: Sven-Hendrik Haase # Contributor: Jose Valecillos # Contributor: Olivier Ramonat pkgname=gource pkgver=0.37 -pkgrel=1 +pkgrel=2 pkgdesc="software version control visualization" license=(GPL3) arch=(i686 x86_64) diff --git a/community/gsmartcontrol/PKGBUILD b/community/gsmartcontrol/PKGBUILD index 2a4035393..87325e3d5 100644 --- a/community/gsmartcontrol/PKGBUILD +++ b/community/gsmartcontrol/PKGBUILD @@ -2,7 +2,7 @@ pkgname=gsmartcontrol pkgver=0.8.6 -pkgrel=2 +pkgrel=3 pkgdesc="A graphical user interface for the smartctl hard disk drive health inspection tool." arch=('i686' 'x86_64') url="http://gsmartcontrol.berlios.de/home/index.php/en/Home" diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD index b46eaf767..c7037f07c 100644 --- a/community/i3-wm/PKGBUILD +++ b/community/i3-wm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 63859 2012-02-06 10:27:05Z ttopper $ +# $Id: PKGBUILD 64335 2012-02-11 23:22:02Z allan $ # Maintainer: Thorsten Töpper pkgname=i3-wm _pkgsourcename=i3 pkgver=4.1.2 -pkgrel=3 +pkgrel=4 pkgdesc="An improved dynamic tiling window manager" arch=('i686' 'x86_64') url="http://i3wm.org/" diff --git a/community/leafnode/PKGBUILD b/community/leafnode/PKGBUILD index 35c4efb62..5be60f7df 100644 --- a/community/leafnode/PKGBUILD +++ b/community/leafnode/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 59410 2011-11-24 15:33:29Z spupykin $ +# $Id: PKGBUILD 64337 2012-02-11 23:22:13Z allan $ # Maintainer: Sergej Pupykin pkgname=leafnode pkgver=1.11.8 -pkgrel=4 +pkgrel=5 pkgdesc="implements a store & forward NNTP proxy (client and server) with IPv4 and IPv6" arch=('i686' 'x86_64') url="http://leafnode.sourceforge.net/" @@ -25,6 +25,9 @@ build() { sed -i 's|#define NEWS_USER .*|#define NEWS_USER "news"|' config.h sed -i 's|#define NEWS_GROUP .*|#define NEWS_GROUP "news"|' config.h make +} +package() { + cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install chown -R root.root $pkgdir install -D -m0644 $srcdir/leafnode.xinetd $pkgdir/etc/xinetd.d/leafnode diff --git a/community/lorcon/PKGBUILD b/community/lorcon/PKGBUILD index 21645c76e..3f821cb23 100644 --- a/community/lorcon/PKGBUILD +++ b/community/lorcon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64224 2012-02-10 23:08:10Z arodseth $ +# $Id: PKGBUILD 64291 2012-02-11 15:46:46Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Brad Fanella # Contributor: fnord0 [fnord0 riseup net] @@ -6,14 +6,14 @@ pkgname=lorcon pkgver=224 -pkgrel=1 +pkgrel=2 pkgdesc="Loss Of Radio CONnectivity: A generic library for injecting 802.11 frames" url='http://802.11ninja.net/' license=('GPL') arch=('x86_64' 'i686') depends=('libpcap') makedepends=('subversion') -provides=('lorcon-old-svn') +replaces=('lorcon-old-svn') options=('!libtool') _svntrunk="http://802.11ninja.net/svn/lorcon/trunk" _svnrev=$pkgver diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 84b951d14..2aacb6a5d 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 60863 2011-12-19 16:15:47Z bpiotrowski $ +# $Id: PKGBUILD 64339 2012-02-11 23:22:19Z allan $ # Maintainer: Sergej Pupykin # Maintainer: Bartłomiej Piotrowski # Contributor: Miroslaw Szot pkgname=nginx pkgver=1.0.11 -pkgrel=1 +pkgrel=2 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64') depends=('pcre' 'zlib' 'openssl') diff --git a/community/ngrep/PKGBUILD b/community/ngrep/PKGBUILD index 085b842b3..2b50b67f6 100644 --- a/community/ngrep/PKGBUILD +++ b/community/ngrep/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 59191 2011-11-21 14:35:44Z lfleischer $ +# $Id: PKGBUILD 64341 2012-02-11 23:22:31Z allan $ # Maintainer: Lukas Fleischer # Contributor: Eric Belanger # Contributor: dorphell pkgname=ngrep pkgver=1.45 -pkgrel=7 +pkgrel=8 pkgdesc='A grep-like utility that allows you to search for network packets on an interface.' arch=('i686' 'x86_64') url='http://ngrep.sourceforge.net/' @@ -13,11 +13,13 @@ license=('custom') depends=('libpcap>=1.0.0') # Fix build failure when using "-j" (FS#27091). options=(!makeflags) -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('bc8150331601f3b869549c94866b4f1c') +source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2" "ngrep-fix-ipv6-support.patch") +md5sums=('bc8150331601f3b869549c94866b4f1c' '90e6dfb335bccf12615d3c468ceeb60f') +# Added patch for broken ipv6 support (FS#27225) build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i $srcdir/ngrep-fix-ipv6-support.patch ./configure --prefix=/usr --with-pcap-includes=/usr/include/pcap --enable-ipv6 make diff --git a/community/ngrep/ngrep-fix-ipv6-support.patch b/community/ngrep/ngrep-fix-ipv6-support.patch new file mode 100644 index 000000000..9a07d7d38 --- /dev/null +++ b/community/ngrep/ngrep-fix-ipv6-support.patch @@ -0,0 +1,107 @@ +diff -rupN trunk/ngrep-fix-ipv6-support.patch trunk.notarch/ngrep-fix-ipv6-support.patch +--- trunk/ngrep-fix-ipv6-support.patch 1970-01-01 01:00:00.000000000 +0100 ++++ trunk.notarch/ngrep-fix-ipv6-support.patch 2011-11-30 05:12:48.068790633 +0100 +@@ -0,0 +1,40 @@ ++--- ngrep-1.45.ds2/ngrep.c 2010-04-21 12:16:52.000000000 +0200 +++++ ngrep-1.45.ds2-ipv6-patch/ngrep.c 2010-04-21 12:11:49.581088102 +0200 ++@@ -711,10 +711,12 @@ void process(u_char *d, struct pcap_pkth ++ data = (unsigned char *)(tcp_pkt) + tcphdr_offset; ++ len -= link_offset + ip_hl + tcphdr_offset; ++ +++/* ++ #if USE_IPv6 ++ if (ip_ver == 6) ++ len -= ntohs(ip6_pkt->ip6_plen); ++-#endif +++#endif +++*/ ++ ++ if ((int32_t)len < 0) ++ len = 0; ++@@ -731,11 +733,12 @@ void process(u_char *d, struct pcap_pkth ++ data = (unsigned char *)(udp_pkt) + udphdr_offset; ++ len -= link_offset + ip_hl + udphdr_offset; ++ +++/* ++ #if USE_IPv6 ++ if (ip_ver == 6) ++ len -= ntohs(ip6_pkt->ip6_plen); ++ #endif ++- +++*/ ++ if ((int32_t)len < 0) ++ len = 0; ++ ++@@ -769,7 +772,7 @@ void process(u_char *d, struct pcap_pkth ++ uint16_t icmp6hdr_offset = (frag_offset) ? 0 : 4; ++ ++ data = (unsigned char *)(icmp6_pkt) + icmp6hdr_offset; ++- len -= link_offset + ip_hl + ntohs(ip6_pkt->ip6_plen) + icmp6hdr_offset; +++ len -= link_offset + ip_hl + icmp6hdr_offset; ++ ++ if ((int32_t)len < 0) ++ len = 0; ++ +diff -rupN trunk/ngrep-system-pcre.patch trunk.notarch/ngrep-system-pcre.patch +--- trunk/ngrep-system-pcre.patch 1970-01-01 01:00:00.000000000 +0100 ++++ trunk.notarch/ngrep-system-pcre.patch 2011-11-30 05:12:48.068790633 +0100 +@@ -0,0 +1,59 @@ ++diff -urN ngrep-1.45/configure.in ngrep-1.45-patched/configure.in ++--- ngrep-1.45/configure.in 2006-11-14 21:43:56.000000000 -0600 +++++ ngrep-1.45-patched/configure.in 2006-11-29 10:34:48.000000000 -0600 ++@@ -28,8 +28,8 @@ ++ dnl ++ ++ EXTRA_DEFINES="" ++-EXTRA_INCLUDES="" ++-EXTRA_LIBS="" +++EXTRA_INCLUDES="$EXTRA_INCLUDES" +++EXTRA_LIBS="$EXTRA_LIBS" ++ ++ ++ dnl ++@@ -130,8 +130,8 @@ ++ echo 'Configuring Perl-Compatible Regular Expression (PCRE) library ...' ++ echo ++ ++- REGEX_DIR='pcre-5.0' ++- REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o" +++# REGEX_DIR='pcre-5.0' +++# REGEX_OBJS="$REGEX_DIR/pcre.o $REGEX_DIR/study.o" ++ USE_PCRE="1" ++ ++ else ++@@ -146,7 +146,7 @@ ++ ++ fi ++ ++-( cd $REGEX_DIR && ./configure ) +++#( cd $REGEX_DIR && ./configure ) ++ ++ AC_SUBST(REGEX_DIR) ++ AC_SUBST(REGEX_OBJS) ++diff -urN ngrep-1.45/Makefile.in ngrep-1.45-patched/Makefile.in ++--- ngrep-1.45/Makefile.in 2006-11-28 07:35:37.000000000 -0600 +++++ ngrep-1.45-patched/Makefile.in 2006-11-29 08:20:32.000000000 -0600 ++@@ -38,7 +38,7 @@ ++ ++ all: $(TARGET) ++ ++-$(TARGET): $(REGEX_OBJS) $(OBJS) +++$(TARGET): $(OBJS) ++ $(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) ++ ++ debug: $(REGEX_OBJS) $(OBJS) ++diff -urN ngrep-1.45/ngrep.c ngrep-1.45-patched/ngrep.c ++--- ngrep-1.45/ngrep.c 2006-11-28 07:38:43.000000000 -0600 +++++ ngrep-1.45-patched/ngrep.c 2006-11-29 08:10:48.000000000 -0600 ++@@ -92,7 +92,7 @@ ++ #endif ++ ++ #if USE_PCRE ++-#include "pcre-5.0/pcre.h" +++#include "pcre.h" ++ #else ++ #include "regex-0.12/regex.h" ++ #endif ++ diff --git a/community/opencollada/PKGBUILD b/community/opencollada/PKGBUILD index 7a94ea7c1..2e08bdaba 100644 --- a/community/opencollada/PKGBUILD +++ b/community/opencollada/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Sven-Hendrik Haase # Contributor: Liganic pkgname=opencollada -pkgver=864 +pkgver=867 pkgrel=1 pkgdesc="Stream based reader and writer library for COLLADA files" arch=(i686 x86_64) diff --git a/community/p3scan/PKGBUILD b/community/p3scan/PKGBUILD index 407feff1b..c2dd1382b 100644 --- a/community/p3scan/PKGBUILD +++ b/community/p3scan/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 59176 2011-11-21 13:12:02Z spupykin $ +# $Id: PKGBUILD 64345 2012-02-11 23:22:52Z allan $ # Maintainer: Sergej Pupykin # Contributor: v01d pkgname=p3scan pkgver=2.3.2 -pkgrel=5 +pkgrel=6 pkgdesc="Fully transparent POP3/SMTP proxy with Anti-Virus and SPAM protection" arch=('i686' 'x86_64') url="http://p3scan.sourceforge.net/" @@ -25,6 +25,10 @@ build() { sed -ri 's|^LOCATION=.+$|LOCATION=/usr|' ripmime/Makefile sed -ri 's|\$\(SYSINS\) -v -m 550 --strip p3scan \$\(PREFIX\)/sbin/|$(SYSINS) -D -v -m 550 --strip p3scan $(DESTDIR)/usr/sbin/|' Makefile make +} + +package() { + cd $srcdir/$pkgname-$pkgver # Create base dirs, the Makefile assumes they're there install -d $pkgdir/usr/sbin $pkgdir/etc/rc.d $pkgdir/usr/man/man8 diff --git a/community/pidgin-musictracker/PKGBUILD b/community/pidgin-musictracker/PKGBUILD index 16300fcf3..476e4bdca 100644 --- a/community/pidgin-musictracker/PKGBUILD +++ b/community/pidgin-musictracker/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57892 2011-11-04 08:42:55Z lfleischer $ +# $Id: PKGBUILD 64347 2012-02-11 23:23:00Z allan $ # Maintainer: Lukas Fleischer # Contributor: Angel Velasquez # Contributor: Ionut Biru @@ -6,7 +6,7 @@ pkgname=pidgin-musictracker pkgver=0.4.22 -pkgrel=2 +pkgrel=3 pkgdesc="A plugin for Pidgin which displays the music track currently playing." url='http://code.google.com/p/pidgin-musictracker' license=('GPL2') diff --git a/community/pkgtools/PKGBUILD b/community/pkgtools/PKGBUILD index 922bb5fa3..e38f71649 100644 --- a/community/pkgtools/PKGBUILD +++ b/community/pkgtools/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Daenyth pkgname=pkgtools pkgver=23 -pkgrel=3 +pkgrel=4 pkgdesc="A collection of scripts for Arch Linux packages" arch=('i686' 'x86_64') url="http://bbs.archlinux.org/viewtopic.php?pid=384196" diff --git a/community/pound/PKGBUILD b/community/pound/PKGBUILD index 02d82fec0..363b16dcc 100644 --- a/community/pound/PKGBUILD +++ b/community/pound/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 24210 2010-08-23 09:28:35Z spupykin $ +# $Id: PKGBUILD 64351 2012-02-11 23:23:24Z allan $ # Maintainer: Sergej Pupykin # Maintainer: Douglas Soares de Andrade # Contributor: Roberto Alsina pkgname=pound -pkgver=2.5 -pkgrel=2 +pkgver=2.6 +pkgrel=1 pkgdesc="A reverse proxy, load balancer, and SSL wrapper" arch=('i686' 'x86_64') url="http://www.apsis.ch/pound/index_html" @@ -17,7 +17,7 @@ source=(http://www.apsis.ch/pound/Pound-$pkgver.tgz pound.runit pound.cfg pound-2.5-openssl.patch) -md5sums=('8a39f5902094619afcda7d12d9d8342c' +md5sums=('8c913b527332694943c4c67c8f152071' '4df8548f106fca08323e8e4071beaa43' '716cc0bf334b594751bece24c7d1df2d' '8937808acd22c6391ebe4340af8df854' @@ -26,11 +26,14 @@ md5sums=('8a39f5902094619afcda7d12d9d8342c' build() { cd $srcdir/Pound-$pkgver # Patch to build against OpenSSL 1.0.0 (Thanks Fedora!) - patch -p1 -i $srcdir/pound-2.5-openssl.patch || return 1 +# patch -p1 -i $srcdir/pound-2.5-openssl.patch || return 1 ./configure --prefix=/usr --sysconfdir=/etc/pound - make || return 1 + make +} +package() { + cd $srcdir/Pound-$pkgver install -d $pkgdir/usr/sbin - make DESTDIR=$pkgdir install || return 1 + make DESTDIR=$pkgdir install chown root.root -R $pkgdir/usr install -d $pkgdir/etc/rc.d install -m0755 $srcdir/pound.init $pkgdir/etc/rc.d/pound diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD index 8fdd42121..80ce2bd02 100644 --- a/community/privoxy/PKGBUILD +++ b/community/privoxy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 61278 2011-12-28 01:38:00Z seblu $ +# $Id: PKGBUILD 64353 2012-02-11 23:23:45Z allan $ # Maintainer: Lukas Fleischer # Contributor: Juergen Hoetzel # Contributor: basilburn (basilburn), Paul Bredbury (brebs) pkgname=privoxy pkgver=3.0.19 -pkgrel=1 +pkgrel=2 pkgdesc='A web proxy with advanced filtering capabilities.' arch=('i686' 'x86_64') url='http://www.privoxy.org' diff --git a/community/remind/PKGBUILD b/community/remind/PKGBUILD index 27bb61ee9..3b98b5121 100644 --- a/community/remind/PKGBUILD +++ b/community/remind/PKGBUILD @@ -4,16 +4,17 @@ # Maintainer: Daniel J Griffiths pkgname=remind -pkgver=3.01.10 -pkgrel=2 -pkgdesc='A sophisticated calendar and alarm progam.' +pkgver=3.01.12 +pkgrel=1 +pkgdesc='A sophisticated calendar and alarm program.' arch=('i686' 'x86_64') url='http://www.roaringpenguin.com/penguin/open_source_remind.php' license=('GPL') depends=('tk' 'tcllib') -source=("http://www.roaringpenguin.com/files/download/${pkgname}-0${pkgver}.tar.gz") +source=("http://www.roaringpenguin.com/files/download/${pkgname}-0${pkgver}.tar.gz"{,.sig}) options=('!emptydirs') -md5sums=('f6f7829d3ac92e0d6d463c59b5e6ce3f') +md5sums=('de16cbfc3ee94defcb1abdf78b2ebcd1' + '4be6e58ad5117fe2299489b01db45d48') build() { cd "${pkgname}-0${pkgver}" diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD index d277db4ec..e0084d40d 100644 --- a/community/root/PKGBUILD +++ b/community/root/PKGBUILD @@ -3,7 +3,7 @@ pkgname=root pkgver=5.32.00 -pkgrel=3 +pkgrel=4 pkgdesc='C++ data analysis framework and interpreter from CERN.' arch=('i686' 'x86_64') url='http://root.cern.ch' diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD index 7c1f188be..6783a0d0f 100644 --- a/community/setconf/PKGBUILD +++ b/community/setconf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 62734 2012-01-25 13:50:09Z arodseth $ +# $Id: PKGBUILD 64357 2012-02-11 23:24:08Z allan $ # Maintainer: Alexander Rødseth pkgname=setconf pkgver=0.3.2 -pkgrel=3 +pkgrel=4 pkgdesc="Utility to easily change settings in Makefiles and configuration files" arch=('x86_64' 'i686') url="http://setconf.roboticoverlords.org/" diff --git a/community/slock/PKGBUILD b/community/slock/PKGBUILD index 678470104..b297f6690 100644 --- a/community/slock/PKGBUILD +++ b/community/slock/PKGBUILD @@ -1,28 +1,26 @@ -# $Id: PKGBUILD 59019 2011-11-20 20:12:50Z spupykin $ +# $Id: PKGBUILD 64276 2012-02-11 10:23:57Z bluewind $ # Maintainer: Sergej Pupykin # Contributor: Sebastian A. Liem pkgname=slock -pkgver=0.9 -# Fix FS#21738 -_pkgver="4d3769ac5d02" -pkgrel=6 +pkgver=1.0 +pkgrel=1 pkgdesc="A simple screen locker for X" arch=('i686' 'x86_64') url="http://tools.suckless.org/slock" license=('MIT') depends=('libxext') -#source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz") -source=("slock-$pkgver.tar.bz2::http://hg.suckless.org/slock/archive/$_pkgver.tar.gz") -md5sums=('7d22a7435324f7c879b6e87054a32309') +source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz") +#source=("slock-$pkgver.tar.bz2::http://hg.suckless.org/slock/archive/$_pkgver.tar.gz") +md5sums=('98503f0dae5acc15c90b81ffd423f987') build() { - cd "$srcdir/slock-$_pkgver" + cd "$srcdir/slock-$pkgver" make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 } package() { - cd "$srcdir/slock-$_pkgver" + cd "$srcdir/slock-$pkgver" make PREFIX=/usr DESTDIR="$pkgdir" install install -m644 -D LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/snort/PKGBUILD b/community/snort/PKGBUILD index 9a9a03107..445886fb0 100644 --- a/community/snort/PKGBUILD +++ b/community/snort/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 62466 2012-01-20 07:55:34Z lfleischer $ +# $Id: PKGBUILD 64359 2012-02-11 23:24:21Z allan $ # Maintainer: Lukas Fleischer # Contributor: Hugo Doria # Contributor: Kessia 'even' Pinheiro @@ -7,7 +7,7 @@ pkgname=snort pkgver=2.9.2.1 -pkgrel=1 +pkgrel=2 pkgdesc='A lightweight network intrusion detection system.' arch=('i686' 'x86_64') url='http://www.snort.org' @@ -21,7 +21,7 @@ backup=('etc/conf.d/snort' 'etc/snort/classification.config') options=('!makeflags' '!libtool') install='snort.install' -source=('http://www.snort.org/downloads/1419' +source=('http://www.snort.org/downloads/1416' 'snort' 'snort.conf.d') md5sums=('2f3e2b6ee72adbdfac73cb1c6c14bd61' diff --git a/community/ted/PKGBUILD b/community/ted/PKGBUILD index 3695c15dc..770a39bd4 100644 --- a/community/ted/PKGBUILD +++ b/community/ted/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 63752 2012-02-05 12:11:51Z ibiru $ +# $Id: PKGBUILD 64361 2012-02-11 23:24:27Z allan $ # Maintainer: Sergej Pupykin pkgname=ted pkgver=2.21 -pkgrel=4 +pkgrel=5 pkgdesc="An easy rich text processor (with footnote support)" arch=('i686' 'x86_64') url="http://www.nllgg.nl/Ted/" diff --git a/community/winefish/PKGBUILD b/community/winefish/PKGBUILD index a2fb79c8c..b08aeba86 100644 --- a/community/winefish/PKGBUILD +++ b/community/winefish/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 60333 2011-12-11 17:42:32Z bpiotrowski $ +# $Id: PKGBUILD 64363 2012-02-11 23:24:33Z allan $ # Maintainer: Bartłomiej Piotrowski # Contributor: Allan McRae # Contributor: Claudio Riva @@ -6,7 +6,7 @@ pkgname=winefish pkgver=1.3.3 -pkgrel=10 +pkgrel=11 pkgdesc="LaTeX editor based on Bluefish with auto-completion and syntax highlighting" url="http://winefish.berlios.de/" arch=('i686' 'x86_64') diff --git a/community/xmms-imms/PKGBUILD b/community/xmms-imms/PKGBUILD index 6e6fe309b..9ff793010 100644 --- a/community/xmms-imms/PKGBUILD +++ b/community/xmms-imms/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 18268 2010-06-02 09:55:31Z spupykin $ +# $Id: PKGBUILD 64367 2012-02-11 23:25:01Z allan $ # Maintainer: Sergej Pupykin # Maintainer: Kritoke # Contributor: Kritoke pkgname=xmms-imms pkgver=3.1.0_rc8 -pkgrel=2 +pkgrel=3 pkgdesc="An intelligent playlist plug-in for XMMS that tracks your listening patterns and dynamically adapts to your taste." arch=(i686 x86_64) license=("GPL") -- cgit v1.2.3-54-g00ecf