Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-testing/blender/PKGBUILD
	community-testing/gambas2/PKGBUILD
	community-testing/gambas3/PKGBUILD
	community-testing/root/PKGBUILD
	community-testing/ted/PKGBUILD
	extra/cpufrequtils/PKGBUILD
	extra/libraw1394/PKGBUILD
	extra/musicbrainz/PKGBUILD
	extra/pm-utils/PKGBUILD
	extra/re2c/PKGBUILD
	extra/zip/PKGBUILD
	multilib/lib32-expat/PKGBUILD
	multilib/lib32-flac/PKGBUILD
	multilib/lib32-fontconfig/PKGBUILD
	multilib/lib32-giflib/PKGBUILD
	multilib/lib32-glew/PKGBUILD
	multilib/lib32-glib/PKGBUILD
	multilib/lib32-json-c/PKGBUILD
	multilib/lib32-lcms/PKGBUILD
	multilib/lib32-libao/PKGBUILD
	multilib/lib32-libasyncns/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-libice/PKGBUILD
	multilib/lib32-libmikmod/PKGBUILD
	multilib/lib32-libsm/PKGBUILD
	multilib/lib32-libsndfile/PKGBUILD
	multilib/lib32-libstdc++5/PKGBUILD
	multilib/lib32-libvorbis/PKGBUILD
	multilib/lib32-libxau/PKGBUILD
	multilib/lib32-libxcomposite/PKGBUILD
	multilib/lib32-libxdamage/PKGBUILD
	multilib/lib32-libxdmcp/PKGBUILD
	multilib/lib32-libxft/PKGBUILD
	multilib/lib32-libxinerama/PKGBUILD
	multilib/lib32-libxml2/PKGBUILD
	multilib/lib32-libxmu/PKGBUILD
	multilib/lib32-libxrender/PKGBUILD
	multilib/lib32-libxss/PKGBUILD
	multilib/lib32-libxt/PKGBUILD
	multilib/lib32-libxtst/PKGBUILD
	multilib/lib32-libxv/PKGBUILD
	multilib/lib32-libxvmc/PKGBUILD
	multilib/lib32-libxxf86vm/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/lib32-openal/PKGBUILD
	multilib/lib32-speex/PKGBUILD
	testing/kdelibs3/PKGBUILD
	testing/kmod/PKGBUILD
	testing/php/PKGBUILD
	testing/systemd/PKGBUILD

2 files changed, 140 insertions, 0 deletions

diff --git a/community-testing/ngrep/PKGBUILD b/community-testing/ngrep/PKGBUILD
new file mode 100644
index 000000000..ecf5da55b
--- /dev/null
+++ b/community-testing/ngrep/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 64087 2012-02-08 23:54:06Z allan $
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: dorphell <dorphell@archlinux.org>
+
+pkgname=ngrep
+pkgver=1.45
+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/'
+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" "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
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install
+  install -Dm0644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.txt"
+}
diff --git a/community-testing/ngrep/ngrep-fix-ipv6-support.patch b/community-testing/ngrep/ngrep-fix-ipv6-support.patch
new file mode 100644
index 000000000..9a07d7d38
--- /dev/null
+++ b/community-testing/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
++