Merge remote-tracking branch 'upstream/master' into openelec-settings

packages/addons/networking/analyzer/tcpdump/changelog.txt

@@ -1,12 +0,0 @@
-3.0.1
-- bump addon version
-
-2.1.3
-- updated to tcpdump-4.3.0
-- updated to libpcap-1.3.0
-
-2.1.2
-- rebuild
-
-2.1.1
-- initial addon based on tcpdump-4.1.1

packages/debug/meta

@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="acpica cpuid dmidecode dstat evtest gdb hddtemp htop i2c-tools iftop pmtools powertop smem strace wireless_tools"
+PKG_DEPENDS="acpica cpuid dmidecode dstat evtest gdb hddtemp htop i2c-tools iftop pmtools powertop smem strace wireless_tools tcpdump"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"

packages/devel/elfutils/build

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+strip_lto
+
+cd $PKG_BUILD
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --disable-werror \
+            --disable-progs \
+            --with-zlib \
+            --without-bzlib \
+            --without-lzma \
+
+make V=1
+$MAKEINSTALL

packages/devel/elfutils/install

@@ -1,6 +1,9 @@
+#!/bin/sh
+
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2010-2011 Roman Weber (roman@openelec.tv)
 #
 #  This Program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -18,6 +21,8 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-import os
+. config/options $1
-import sys
+
-import xbmcaddon
+mkdir -p $INSTALL/usr/lib
+  cp -P $PKG_BUILD/libdw/*.so* $INSTALL/usr/lib
+  cp -P $PKG_BUILD/libelf/*.so* $INSTALL/usr/lib

packages/devel/elfutils/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="elfutils"
+PKG_VERSION="0.155"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://fedorahosted.org/elfutils/"
+PKG_URL="https://fedorahosted.org/releases/e/l/elfutils/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="zlib"
+PKG_BUILD_DEPENDS="toolchain zlib"
+PKG_PRIORITY="optional"
+PKG_SECTION="devel"
+PKG_SHORTDESC="elfutils: collection of utilities to handle ELF objects"
+PKG_LONGDESC="Elfutils is a collection of utilities, including eu-ld (a linker), eu-nm (for listing symbols from object files), eu-size (for listing the section sizes of an object or archive file), eu-strip (for discarding symbols), eu-readelf (to see the raw ELF file structures), and eu-elflint (to check for well-formed ELF files)."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"

packages/devel/elfutils/patches/bk/elfutils-02-argp-support.patch

@@ -0,0 +1,92 @@
+Allow the usage of an external implementation of the argp functions
+
+uClibc lack the argp family of functions that glibc has. Therefore, we
+add a check in the configure script to see if argp_parse is available
+in the C library. If not, we look if it is available in the additional
+'argp' library. If so, we link against that library. If not, we error
+out.
+
+This allows to build elfutils against uClibc with an external argp
+library.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -269,6 +269,13 @@
+ 	enable_progs=yes)
+ AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes)
+ 
++AC_CHECK_FUNC([argp_parse])
++if test "$ac_cv_func_argp_parse" != yes; then
++   AC_CHECK_LIB([argp],[argp_parse],ARGP_LIBS=-largp,
++		AC_MSG_ERROR([No argp_parse function available.]))
++fi
++AC_SUBST(ARGP_LIBS)
++
+ dnl Test for zlib and bzlib, gives ZLIB/BZLIB .am
+ dnl conditional and config.h USE_ZLIB/USE_BZLIB #define.
+ save_LIBS="$LIBS"
+Index: b/src/Makefile.am
+===================================================================
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -98,26 +98,29 @@
+ # Buggy old compilers.
+ readelf_no_Werror = yes
+ 
+-readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
++readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
++	$(ARGP_LIBS)
+ nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
+-	   $(demanglelib)
+-size_LDADD = $(libelf) $(libeu) $(libmudflap)
+-strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
+-ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
++	   $(demanglelib) $(ARGP_LIBS)
++size_LDADD = $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS)
++strip_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl $(ARGP_LIBS)
++ld_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl $(ARGP_LIBS)
+ if NATIVE_LD
+ # -ldl is always needed for libebl.
+ ld_LDADD += libld_elf.a
+ endif
+ ld_LDFLAGS = -rdynamic
+-elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
+-findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap)
+-addr2line_LDADD = $(libdw) $(libelf) $(libmudflap)
+-elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl
+-objdump_LDADD  = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl
+-ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap)
+-strings_LDADD = $(libelf) $(libeu) $(libmudflap)
+-ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap)
+-unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl
++elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl $(ARGP_LIBS)
++findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap) $(ARGP_LIBS)
++addr2line_LDADD = $(libdw) $(libelf) $(libmudflap) $(ARGP_LIBS)
++elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl $(ARGP_LIBS)
++objdump_LDADD  = $(libasm) $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl \
++	$(ARGP_LIBS)
++ranlib_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS)
++strings_LDADD = $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS)
++ar_LDADD = libar.a $(libelf) $(libeu) $(libmudflap) $(ARGP_LIBS)
++unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libmudflap) -ldl \
++	$(ARGP_LIBS)
+ 
+ ldlex.o: ldscript.c
+ ldlex_no_Werror = yes
+Index: b/libdw/Makefile.am
+===================================================================
+--- a/libdw/Makefile.am
++++ b/libdw/Makefile.am
+@@ -111,7 +111,7 @@
+ 		-Wl,--enable-new-dtags,-rpath,$(pkglibdir) \
+ 		-Wl,--version-script,$<,--no-undefined \
+ 		-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
+-		-ldl $(zip_LIBS)
++		-ldl $(zip_LIBS) $(ARGP_LIBS)
+ 	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
+ 	ln -fs $@ $@.$(VERSION)
+ 

packages/devel/elfutils/patches/bk/elfutils-03-memcpy-def.patch

@@ -0,0 +1,24 @@
+Provide a compatibility alias __memcpy
+
+For some reason, libelf uses the internal glibc alias __memcpy, which
+doesn't exist in uClibc. Add a manual alias so that the build can
+proceed with uClibc.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/libelf/libelf.h
+===================================================================
+--- a/libelf/libelf.h
++++ b/libelf/libelf.h
+@@ -34,6 +34,11 @@
+ /* Get the ELF types.  */
+ #include <elf.h>
+ 
++#ifndef _LIBC
++#ifndef __mempcpy
++#define __mempcpy mempcpy
++#endif
++#endif
+ 
+ /* Known translation types.  */
+ typedef enum

packages/devel/elfutils/patches/elfutils-no_textrel_check.patch

@@ -0,0 +1,77 @@
+diff -Naur elfutils-0.155/libasm/Makefile.am elfutils-0.155.patch/libasm/Makefile.am
+--- elfutils-0.155/libasm/Makefile.am	2012-08-27 20:27:31.000000000 +0200
++++ elfutils-0.155.patch/libasm/Makefile.am	2013-03-05 18:11:43.841545009 +0100
+@@ -69,7 +69,6 @@
+ 		-Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \
+ 		-Wl,--soname,$@.$(VERSION) \
+ 		../libebl/libebl.a ../libelf/libelf.so  $(libasm_so_LDLIBS)
+-	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
+ 	ln -fs $@ $@.$(VERSION)
+ 
+ install: install-am libasm.so
+diff -Naur elfutils-0.155/libasm/Makefile.in elfutils-0.155.patch/libasm/Makefile.in
+--- elfutils-0.155/libasm/Makefile.in	2012-08-27 20:29:45.000000000 +0200
++++ elfutils-0.155.patch/libasm/Makefile.in	2013-03-05 18:12:05.604432305 +0100
+@@ -654,7 +654,6 @@
+ @MUDFLAP_FALSE@		-Wl,--version-script,$(srcdir)/libasm.map,--no-undefined \
+ @MUDFLAP_FALSE@		-Wl,--soname,$@.$(VERSION) \
+ @MUDFLAP_FALSE@		../libebl/libebl.a ../libelf/libelf.so  $(libasm_so_LDLIBS)
+-@MUDFLAP_FALSE@	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
+ @MUDFLAP_FALSE@	ln -fs $@ $@.$(VERSION)
+ 
+ @MUDFLAP_FALSE@install: install-am libasm.so
+diff -Naur elfutils-0.155/libdw/Makefile.am elfutils-0.155.patch/libdw/Makefile.am
+--- elfutils-0.155/libdw/Makefile.am	2012-08-27 20:27:31.000000000 +0200
++++ elfutils-0.155.patch/libdw/Makefile.am	2013-03-05 18:12:26.753322780 +0100
+@@ -112,7 +112,6 @@
+ 		-Wl,--version-script,$<,--no-undefined \
+ 		-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
+ 		-ldl $(zip_LIBS)
+-	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
+ 	ln -fs $@ $@.$(VERSION)
+ 
+ install: install-am libdw.so
+diff -Naur elfutils-0.155/libdw/Makefile.in elfutils-0.155.patch/libdw/Makefile.in
+--- elfutils-0.155/libdw/Makefile.in	2012-08-27 20:29:45.000000000 +0200
++++ elfutils-0.155.patch/libdw/Makefile.in	2013-03-05 18:12:41.272246520 +0100
+@@ -844,7 +844,6 @@
+ @MUDFLAP_FALSE@		-Wl,--version-script,$<,--no-undefined \
+ @MUDFLAP_FALSE@		-Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\
+ @MUDFLAP_FALSE@		-ldl $(zip_LIBS)
+-@MUDFLAP_FALSE@	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
+ @MUDFLAP_FALSE@	ln -fs $@ $@.$(VERSION)
+ 
+ @MUDFLAP_FALSE@install: install-am libdw.so
+diff -Naur elfutils-0.155/libelf/Makefile.am elfutils-0.155.patch/libelf/Makefile.am
+--- elfutils-0.155/libelf/Makefile.am	2012-08-27 20:27:31.000000000 +0200
++++ elfutils-0.155.patch/libelf/Makefile.am	2013-03-05 18:13:23.328024851 +0100
+@@ -106,7 +106,6 @@
+ 	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
+ 		-Wl,--version-script,$(srcdir)/libelf.map,--no-undefined \
+ 		-Wl,--soname,$@.$(VERSION),-z,defs,-z,relro $(libelf_so_LDLIBS)
+-	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
+ 	ln -fs $@ $@.$(VERSION)
+ 
+ install: install-am libelf.so
+diff -Naur elfutils-0.155/libelf/Makefile.in elfutils-0.155.patch/libelf/Makefile.in
+--- elfutils-0.155/libelf/Makefile.in	2012-08-27 20:29:45.000000000 +0200
++++ elfutils-0.155.patch/libelf/Makefile.in	2013-03-05 18:13:37.270951393 +0100
+@@ -830,7 +830,6 @@
+ @MUDFLAP_FALSE@	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
+ @MUDFLAP_FALSE@		-Wl,--version-script,$(srcdir)/libelf.map,--no-undefined \
+ @MUDFLAP_FALSE@		-Wl,--soname,$@.$(VERSION),-z,defs,-z,relro $(libelf_so_LDLIBS)
+-@MUDFLAP_FALSE@	if readelf -d $@ | fgrep -q TEXTREL; then exit 1; fi
+ @MUDFLAP_FALSE@	ln -fs $@ $@.$(VERSION)
+ 
+ @MUDFLAP_FALSE@install: install-am libelf.so
+diff -Naur elfutils-0.155/src/Makefile.in elfutils-0.155.patch/src/Makefile.in
+--- elfutils-0.155/src/Makefile.in	2012-08-27 20:29:46.000000000 +0200
++++ elfutils-0.155.patch/src/Makefile.in	2013-03-05 18:14:22.361713943 +0100
+@@ -867,7 +867,6 @@
+ @NATIVE_LD_FALSE@	$(LINK) -shared -o $@ -Wl,--whole-archive,$<,--no-whole-archive \
+ @NATIVE_LD_FALSE@		$(libelf) $(libeu) \
+ @NATIVE_LD_FALSE@		-Wl,--version-script,$(srcdir)/libld_elf_i386.map
+-@NATIVE_LD_FALSE@	$(textrel_check)
+ 
+ # Special rule to make it possible to define libld_elf_a_SOURCES as we do.
+ # Otherwise make would complain.

packages/devel/elfutils/patches/elfutils-only_libdw_libelf.patch

@@ -0,0 +1,26 @@
+diff -Naur elfutils-0.155/Makefile.am elfutils-0.155.patch/Makefile.am
+--- elfutils-0.155/Makefile.am	2012-08-27 20:27:31.000000000 +0200
++++ elfutils-0.155.patch/Makefile.am	2013-03-05 18:38:47.565095550 +0100
+@@ -23,8 +23,7 @@
+ pkginclude_HEADERS = version.h
+ 
+ # Add doc back when we have some real content.
+-SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \
+-	  src po tests
++SUBDIRS = config m4 lib libelf libebl libdwfl libdw
+ 
+ EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
+ 	     COPYING COPYING-GPLV2 COPYING-LGPLV3
+diff -Naur elfutils-0.155/Makefile.in elfutils-0.155.patch/Makefile.in
+--- elfutils-0.155/Makefile.in	2012-08-27 20:29:45.000000000 +0200
++++ elfutils-0.155.patch/Makefile.in	2013-03-05 18:39:11.176974119 +0100
+@@ -256,8 +256,7 @@
+ pkginclude_HEADERS = version.h
+ 
+ # Add doc back when we have some real content.
+-SUBDIRS = config m4 lib libelf libebl libdwfl libdw libcpu libasm backends \
+-	  src po tests
++SUBDIRS = config m4 lib libelf libebl libdwfl libdw
+ 
+ EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \
+ 	     COPYING COPYING-GPLV2 COPYING-LGPLV3

packages/devel/slang/install

@@ -23,4 +23,4 @@
 . config/options $1
 
   mkdir -p $INSTALL/usr/lib/
-    cp -PR $PKG_BUILD/src/elfobjs/libslang.so* $INSTALL/usr/lib/
+    cp -PR $PKG_BUILD/src/*/libslang.so* $INSTALL/usr/lib/

packages/linux/build

@@ -77,11 +77,12 @@ if [ "$DEVTOOLS" = yes ]; then
     export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/lib -L$SYSROOT_PREFIX/usr/lib"
 
     make CROSS_COMPILE="$TARGET_PREFIX" \
+         ARCH="$TARGET_ARCH" \
          V=1 \
          DEBUG=false \
          NLS=false \
          NO_GTK2=true \
-         NO_LIBELF=true \
+         NO_LIBELF=false \
          NO_LIBPERL=true \
          NO_LIBPYTHON=false \
          PYTHON=$SYSROOT_PREFIX/usr/bin/python \

packages/linux/meta

@@ -46,6 +46,6 @@ if [ "$LINUX" = "ti-omap4" ]; then
 fi
 
 if [ "$DEVTOOLS" = "yes" ]; then
-  PKG_DEPENDS="$PKG_DEPENDS newt"
+  PKG_DEPENDS="$PKG_DEPENDS newt elfutils Python"
-  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS newt"
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS newt elfutils Python"
 fi

packages/network/tcpdump/install

@@ -22,5 +22,6 @@
 
 . config/options $1
 
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
+mkdir -p $INSTALL/usr/sbin
-  cp $PKG_BUILD/tcpdump $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_BUILD/tcpdump $INSTALL/usr/sbin
+

packages/network/tcpdump/meta

@@ -27,11 +27,9 @@ PKG_URL="http://www.tcpdump.org/release/tcpdump-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain libpcap"
 PKG_PRIORITY=optional
-PKG_SECTION="network/analyzer"
+PKG_SECTION="network"
 PKG_SHORTDESC="powerful tool for network monitoring and data acquisition"
 PKG_LONGDESC="This program allows you to dump the traffic on a network. tcpdump is able to examine IPv4, ICMPv4, IPv6, ICMPv6, UDP, TCP, SNMP, AFS BGP, RIP, PIM, DVMRP, IGMP, SMB, OSPF, NFS and many other packet types."
-
+PKG_IS_ADDON="no"
-PKG_IS_ADDON="yes"
-PKG_ADDON_TYPE="xbmc.python.script"
 
 PKG_AUTORECONF="yes"