diff options
Diffstat (limited to 'package')
34 files changed, 497 insertions, 326 deletions
diff --git a/package/Config.in b/package/Config.in index faee5c30b..8a0250630 100644 --- a/package/Config.in +++ b/package/Config.in @@ -189,6 +189,9 @@ source "package/cramfs/Config.in" source "package/curlftpfs/Config.in" source "package/dosfstools/Config.in" source "package/e2fsprogs/Config.in" +source "package/exfat/Config.in" +source "package/exfat-utils/Config.in" +source "package/f2fs-tools/Config.in" source "package/flashbench/Config.in" source "package/genext2fs/Config.in" source "package/genromfs/Config.in" @@ -674,6 +677,7 @@ source "package/netsnmp/Config.in" source "package/netstat-nat/Config.in" source "package/network-manager/Config.in" source "package/nfacct/Config.in" +source "package/nmap/Config.in" source "package/noip/Config.in" source "package/ngircd/Config.in" source "package/ngrep/Config.in" @@ -728,6 +732,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS source "package/wget/Config.in" endif source "package/wireless_tools/Config.in" +source "package/wireshark/Config.in" source "package/wpa_supplicant/Config.in" source "package/xinetd/Config.in" source "package/xl2tp/Config.in" diff --git a/package/connman/connman.mk b/package/connman/connman.mk index 73ea70d93..bb528b4a9 100644 --- a/package/connman/connman.mk +++ b/package/connman/connman.mk @@ -4,7 +4,7 @@ # ####################################################### -CONNMAN_VERSION = 1.10 +CONNMAN_VERSION = 1.11 CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman/ CONNMAN_DEPENDENCIES = libglib2 dbus iptables gnutls CONNMAN_INSTALL_STAGING = YES diff --git a/package/exfat-utils/Config.in b/package/exfat-utils/Config.in new file mode 100644 index 000000000..1fc68be8a --- /dev/null +++ b/package/exfat-utils/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_EXFAT_UTILS + bool "exfat-utils" + depends on BR2_LARGEFILE + depends on BR2_USE_WCHAR + help + exFAT filesystem utilities. + + http://code.google.com/p/exfat/ + +comment "exfat-utils requires a toolchain with LARGEFILE and WCHAR support" + depends on !BR2_LARGEFILE || !BR2_USE_WCHAR diff --git a/package/exfat-utils/exfat-utils.mk b/package/exfat-utils/exfat-utils.mk new file mode 100644 index 000000000..de66d55ff --- /dev/null +++ b/package/exfat-utils/exfat-utils.mk @@ -0,0 +1,24 @@ +############################################################# +# +# exfat-utils +# +############################################################# + +EXFAT_UTILS_VERSION = 1.0.1 +EXFAT_UTILS_SITE = http://exfat.googlecode.com/files +EXFAT_UTILS_DEPENDENCIES = host-scons +EXFAT_UTILS_LICENSE = GPLv3+ +EXFAT_UTILS_LICENSE_FILES = COPYING + +define EXFAT_UTILS_BUILD_CMDS + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) $(SCONS)) +endef + +define EXFAT_UTILS_INSTALL_TARGET_CMDS + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) $(SCONS) \ + DESTDIR=$(TARGET_DIR)/usr/bin install) +endef + +$(eval $(generic-package)) diff --git a/package/exfat/Config.in b/package/exfat/Config.in new file mode 100644 index 000000000..c7e7fdbf0 --- /dev/null +++ b/package/exfat/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_EXFAT + bool "exFAT (FUSE)" + depends on BR2_LARGEFILE # libfuse + depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse + depends on BR2_USE_MMU # libfuse + depends on BR2_USE_WCHAR + select BR2_PACKAGE_LIBFUSE + help + A full-featured exFAT file system implementation for GNU/Linux + and other Unix-like systems as a FUSE module. + + http://code.google.com/p/exfat/ + +comment "exfat requires a toolchain with LARGEFILE, WCHAR and threads support" + depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package/exfat/exfat.mk b/package/exfat/exfat.mk new file mode 100644 index 000000000..bc794a02c --- /dev/null +++ b/package/exfat/exfat.mk @@ -0,0 +1,25 @@ +############################################################# +# +# exfat +# +############################################################# + +EXFAT_VERSION = 1.0.1 +EXFAT_SITE = http://exfat.googlecode.com/files +EXFAT_SOURCE = fuse-exfat-$(EXFAT_VERSION).tar.gz +EXFAT_DEPENDENCIES = host-scons libfuse +EXFAT_LICENSE = GPLv3+ +EXFAT_LICENSE_FILES = COPYING + +define EXFAT_BUILD_CMDS + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) $(SCONS)) +endef + +define EXFAT_INSTALL_TARGET_CMDS + (cd $(@D); \ + $(TARGET_CONFIGURE_OPTS) $(SCONS) \ + DESTDIR=$(TARGET_DIR)/usr/sbin install) +endef + +$(eval $(generic-package)) diff --git a/package/f2fs-tools/Config.in b/package/f2fs-tools/Config.in new file mode 100644 index 000000000..20db9283a --- /dev/null +++ b/package/f2fs-tools/Config.in @@ -0,0 +1,12 @@ +config BR2_PACKAGE_F2FS_TOOLS + bool "f2fs-tools" + select BR2_PACKAGE_UTIL_LINUX + depends on BR2_LARGEFILE + depends on BR2_USE_WCHAR # util-linux + help + Tools for Flash-Friendly File System (F2FS) + + http://sourceforge.net/projects/f2fs-tools/ + +comment "f2fs-tools requires a toolchain with LARGEFILE and WCHAR support" + depends on !(BR2_LARGEFILE && BR2_USE_WCHAR) diff --git a/package/f2fs-tools/f2fs-tools.mk b/package/f2fs-tools/f2fs-tools.mk new file mode 100644 index 000000000..f217bf426 --- /dev/null +++ b/package/f2fs-tools/f2fs-tools.mk @@ -0,0 +1,17 @@ +############################################################# +# +# f2fs-tools +# +############################################################# + +F2FS_TOOLS_VERSION = e3eadd686ed1da1828f32977a36b694bc0090f4e +F2FS_TOOLS_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git +F2FS_TOOLS_SITE_METHOD = git +F2FS_TOOLS_CONF_ENV = ac_cv_file__git=no +F2FS_TOOLS_DEPENDENCIES = host-pkgconf util-linux +# GIT version, shipped without configure +F2FS_TOOLS_AUTORECONF = YES +F2FS_LICENSE = GPLv2 +F2FS_LICENSE_FILES = COPYING + +$(eval $(autotools-package)) diff --git a/package/json-c/json-c-no-reentrant.patch b/package/json-c/json-c-no-reentrant.patch index a01181cfb..31343c0a8 100644 --- a/package/json-c/json-c-no-reentrant.patch +++ b/package/json-c/json-c-no-reentrant.patch @@ -8,26 +8,24 @@ patch to avoid having to autoreconfigure the package. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Index: b/Makefile.am +Index: b/Makefile.am.inc =================================================================== ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ +--- a/Makefile.am.inc ++++ b/Makefile.am.inc +@@ -1,2 +1,2 @@ -AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT +AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE - EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc - Index: b/Makefile.in =================================================================== --- a/Makefile.in +++ b/Makefile.in -@@ -219,7 +219,7 @@ +@@ -263,7 +263,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE -D_REENTRANT +AM_CFLAGS = -Wall -Wwrite-strings -Werror -std=gnu99 -D_GNU_SOURCE - EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc + EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj + SUBDIRS = . tests lib_LTLIBRARIES = libjson.la - pkgconfigdir = $(libdir)/pkgconfig diff --git a/package/json-c/json-c.mk b/package/json-c/json-c.mk index ed4a6d0a7..a0b5cae5a 100644 --- a/package/json-c/json-c.mk +++ b/package/json-c/json-c.mk @@ -4,8 +4,8 @@ # ################################################################################ -JSON_C_VERSION = 0.9 -JSON_C_SITE = http://oss.metaparadigm.com/json-c/ +JSON_C_VERSION = 0.10 +JSON_C_SITE = https://github.com/downloads/json-c/json-c JSON_C_INSTALL_STAGING = YES $(eval $(autotools-package)) diff --git a/package/linenoise/linenoise-get-columns.patch b/package/linenoise/linenoise-get-columns.patch deleted file mode 100644 index 4fb9e4085..000000000 --- a/package/linenoise/linenoise-get-columns.patch +++ /dev/null @@ -1,20 +0,0 @@ -returns the default value (80) when a real value is not available -(0 is not an acceptable value for COLUMNS, the width of the screen). - -see pull request on upstream : http://github.com/antirez/linenoise/pull/31 - -Signed-off-by: Francois Perrad <francois.perrad@gadz.org> - -Index: b/linenoise.c -=================================================================== ---- a/linenoise.c -+++ b/linenoise.c -@@ -182,7 +182,7 @@ - static int getColumns(void) { - struct winsize ws; - -- if (ioctl(1, TIOCGWINSZ, &ws) == -1) return 80; -+ if (ioctl(1, TIOCGWINSZ, &ws) == -1 || ws.ws_col == 0) return 80; - return ws.ws_col; - } - diff --git a/package/linenoise/linenoise.mk b/package/linenoise/linenoise.mk index 343a10756..fb739602a 100644 --- a/package/linenoise/linenoise.mk +++ b/package/linenoise/linenoise.mk @@ -3,7 +3,7 @@ # linenoise # ############################################################# -LINENOISE_VERSION = g8c9b481 +LINENOISE_VERSION = g27a3b4d LINENOISE_SITE = http://github.com/antirez/linenoise/tarball/master LINENOISE_LICENSE = BSD-2c LINENOISE_INSTALL_STAGING = YES diff --git a/package/luajit/luajit.mk b/package/luajit/luajit.mk index 844122e90..bf9cfe835 100644 --- a/package/luajit/luajit.mk +++ b/package/luajit/luajit.mk @@ -4,7 +4,7 @@ # ############################################################# -LUAJIT_VERSION = 2.0.0 +LUAJIT_VERSION = 2.0.1 LUAJIT_SOURCE = LuaJIT-$(LUAJIT_VERSION).tar.gz LUAJIT_SITE = http://luajit.org/download LUAJIT_LICENSE = MIT diff --git a/package/nmap/Config.in b/package/nmap/Config.in new file mode 100644 index 000000000..be1be33db --- /dev/null +++ b/package/nmap/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_NMAP + bool "nmap" + depends on BR2_INET_IPV6 + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_PCRE + help + Nmap ("Network Mapper") is a free and open source (license) + utility for network discovery and security auditing. + + http://nmap.org + +comment "nmap requires a toolchain with C++, IPV6 and thread support" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk new file mode 100644 index 000000000..a5b085d7f --- /dev/null +++ b/package/nmap/nmap.mk @@ -0,0 +1,24 @@ +############################################################# +# +# nmap +# +############################################################# + +NMAP_VERSION = 6.01 +NMAP_SITE = http://nmap.org/dist +NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 +NMAP_DEPENDENCIES = libpcap pcre +NMAP_CONF_OPT = --without-liblua --without-zenmap \ + --with-libdnet=included --with-liblinear=included \ + --with-libpcre="$(STAGING_DIR)/usr" +NMAP_LICENSE = GPLv2 +NMAP_LICENSE_FILES = COPYING + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +NMAP_CONF_OPT += --with-openssl="$(STAGING_DIR)/usr" +NMAP_DEPENDENCIES += openssl +else +NMAP_CONF_OPT += --without-openssl +endif + +$(eval $(autotools-package)) diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 9f50f9135..bd3dd338e 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -498,6 +498,7 @@ define QT_CONFIGURE_CMDS -no-separate-debug-info \ -prefix /usr \ -plugindir /usr/lib/qt/plugins \ + -importdir /usr/lib/qt/imports \ -hostprefix $(STAGING_DIR) \ -fast \ -no-rpath \ @@ -610,6 +611,14 @@ define QT_INSTALL_TARGET_PLUGINS fi endef +# Import installation +define QT_INSTALL_TARGET_IMPORTS + if [ -d $(STAGING_DIR)/usr/lib/qt/imports/ ] ; then \ + mkdir -p $(TARGET_DIR)/usr/lib/qt/imports ; \ + cp -dpfr $(STAGING_DIR)/usr/lib/qt/imports/* $(TARGET_DIR)/usr/lib/qt/imports ; \ + fi +endef + # Fonts installation ifneq ($(QT_FONTS),) define QT_INSTALL_TARGET_FONTS @@ -628,6 +637,7 @@ endif define QT_INSTALL_TARGET_CMDS $(QT_INSTALL_TARGET_LIBS) $(QT_INSTALL_TARGET_PLUGINS) + $(QT_INSTALL_TARGET_IMPORTS) $(QT_INSTALL_TARGET_FONTS) $(QT_INSTALL_TARGET_FONTS_TTF) endef diff --git a/package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch b/package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch new file mode 100644 index 000000000..cc25c564c --- /dev/null +++ b/package/tvheadend/tvheadend-001-no-auto-download-dvbscans.patch @@ -0,0 +1,66 @@ +Do not download transponder data as part of the build + +If dvb-scan is enabled, tvheadend will download the transponders data +from the dvb-apps package. This does not play well with buildroot. + +Instead, we rely on the dvb-apps package to install those files, so +it is no longer needed to install those as part of tvheadend. + +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> + +diff -durN tvheadend-v3.5.orig/configure tvheadend-v3.5/configure +--- tvheadend-v3.5.orig/configure 2013-02-15 14:41:26.000000000 +0100 ++++ tvheadend-v3.5/configure 2013-02-16 15:41:16.675556099 +0100 +@@ -178,15 +178,16 @@ + # + # DVB scan + # +-if enabled linuxdvb && enabled dvbscan; then +- printf "${TAB}" "fetching dvb-scan files ..." +- ${ROOTDIR}/support/getmuxlist +- if [ $? -ne 0 ]; then +- echo "fail" +- die "Failed to fetch dvb-scan data (use --disable-dvbscan)" +- fi +- echo "ok" +-fi ++# For buildroot, we already installed those files via the dvb-apps package ++#if enabled linuxdvb && enabled dvbscan; then ++# printf "${TAB}" "fetching dvb-scan files ..." ++# ${ROOTDIR}/support/getmuxlist ++# if [ $? -ne 0 ]; then ++# echo "fail" ++# die "Failed to fetch dvb-scan data (use --disable-dvbscan)" ++# fi ++# echo "ok" ++#fi + + # ########################################################################### + # Write config +Binary files tvheadend-v3.5.orig/.configure.swp and tvheadend-v3.5/.configure.swp differ +diff -durN tvheadend-v3.5.orig/Makefile tvheadend-v3.5/Makefile +--- tvheadend-v3.5.orig/Makefile 2013-02-15 14:41:26.000000000 +0100 ++++ tvheadend-v3.5/Makefile 2013-02-16 15:41:38.218821287 +0100 +@@ -207,7 +207,7 @@ + SRCS-${CONFIG_BUNDLE} += bundle.c + BUNDLES-yes += docs/html docs/docresources src/webui/static + BUNDLES-yes += data/conf +-BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan ++#BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan + BUNDLES = $(BUNDLES-yes) + + # +diff -durN tvheadend-v3.5.orig/support/posix.mk tvheadend-v3.5/support/posix.mk +--- tvheadend-v3.5.orig/support/posix.mk 2013-02-15 14:41:26.000000000 +0100 ++++ tvheadend-v3.5/support/posix.mk 2013-02-16 15:42:41.015290003 +0100 +@@ -15,6 +15,10 @@ + + find ${DESTDIR}${datadir}/tvheadend -name .git -exec rm -rf {} \; &>/dev/null || /bin/true + ++ mkdir -p ${DESTDIR}${datadir}/tvheadend/data ++ rm -f ${DESTDIR}${datadir}/tvheadend/data/dvb-scan ++ ln -sf /usr/share/dvb ${DESTDIR}${datadir}/tvheadend/data/dvb-scan ++ + uninstall: + rm -f ${DESTDIR}${bindir)/tvheadend + rm -f ${DESTDIR}${mandir)/tvheadend.1 diff --git a/package/tvheadend/tvheadend-002-no-check_config.patch b/package/tvheadend/tvheadend-002-no-check_config.patch new file mode 100644 index 000000000..a0edcdcfd --- /dev/null +++ b/package/tvheadend/tvheadend-002-no-check_config.patch @@ -0,0 +1,23 @@ +Makefile: do not use check_config + +test(1) only uses the second to compare two files dates. +test(1) also does a strict comparison wrt. dates. + +But, on very fast systems, the configure and .config.mk +files may be created in the same second, and so would lead +to a false comparison of the files' dates. + +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> + +diff -durN tvheadend-v3.5.orig/Makefile tvheadend-v3.5/Makefile +--- tvheadend-v3.5.orig/Makefile 2013-02-17 15:15:03.228749505 +0100 ++++ tvheadend-v3.5/Makefile 2013-02-17 15:15:51.591923062 +0100 +@@ -246,7 +246,7 @@ + $(CURDIR)/configure $(CONFIGURE_ARGS) + + # Binary +-${PROG}: check_config $(OBJS) $(ALLDEPS) ++${PROG}: $(OBJS) $(ALLDEPS) + $(CC) -o $@ $(OBJS) $(CFLAGS) $(LDFLAGS) + + # Object diff --git a/package/tvheadend/tvheadend-fix-Werror.patch b/package/tvheadend/tvheadend-fix-Werror.patch deleted file mode 100644 index 5f6dbad82..000000000 --- a/package/tvheadend/tvheadend-fix-Werror.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit 1334869bf0ea668e58e1c72daa3c09c1a95b5d81 -Author: Alexey I. Froloff <raorn@raorn.name> -Date: Wed Oct 24 21:10:15 2012 +0400 - - [PR-172] Fix compilatioin issues on OpenWRT - - Fix SHA1_* function names - Fix unused variables and functions - ---- -"Yann E. MORIN" <yann.morin.1998@free.fr>: - For buildroot, I removed the SHA_* fixes, as we're not affected. - No point in fixing something that does not bug us. - -diff --git a/src/trap.c b/src/trap.c -index bd76118..b0fe543 100644 ---- a/src/trap.c -+++ b/src/trap.c -@@ -67,6 +67,7 @@ sappend(char *buf, size_t l, const char *fmt, ...) - /** - * - */ -+#if ENABLE_EXECINFO - static int - add2lineresolve(const char *binary, void *addr, char *buf0, size_t buflen) - { -@@ -126,6 +127,7 @@ add2lineresolve(const char *binary, void *addr, char *buf0, size_t buflen) - close(fd[0]); - return 0; - } -+#endif /* ENABLE_EXECINFO */ - - - -@@ -133,8 +135,8 @@ static void - traphandler(int sig, siginfo_t *si, void *UC) - { - ucontext_t *uc = UC; -- char buf[200]; - #if ENABLE_EXECINFO -+ char buf[200]; - static void *frames[MAXFRAMES]; - int nframes = backtrace(frames, MAXFRAMES); - Dl_info dli; diff --git a/package/tvheadend/tvheadend-no-auto-download-dvbscans.patch b/package/tvheadend/tvheadend-no-auto-download-dvbscans.patch deleted file mode 100644 index 963d4f2b7..000000000 --- a/package/tvheadend/tvheadend-no-auto-download-dvbscans.patch +++ /dev/null @@ -1,60 +0,0 @@ -Do not download transponder data as part of the build - -If dvb-scan is enabled, tvheadend will download the transponders data -from the dvb-apps package. This does not play well with buildroot. - -Instead, we rely on the dvb-apps package to install those files, so -it is no longer needed to install those as part of tvheadend. - -Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> - -diff -durN tvheadend-v3.3.orig//configure tvheadend-v3.3/configure ---- tvheadend-v3.3.orig//configure 2012-09-25 15:32:31.000000000 +0200 -+++ tvheadend-v3.3/configure 2012-12-28 17:17:23.580253413 +0100 -@@ -96,13 +96,14 @@ - # - # DVB scan - # --if enabled linuxdvb && enabled dvbscan; then -- if [ ! -d ${ROOTDIR}/data/dvb-scan ]; then -- echo -n "Fetching dvb-scan files... " -- ${ROOTDIR}/support/getmuxlist &> /dev/null || die "Failed to fetch dvb-scan files (use --disable-dvbscan to skip)" -- echo "done" -- fi --fi -+# For buildroot, we already installed those files via the dvb-apps package -+#if enabled linuxdvb && enabled dvbscan; then -+# if [ ! -d ${ROOTDIR}/data/dvb-scan ]; then -+# echo -n "Fetching dvb-scan files... " -+# ${ROOTDIR}/support/getmuxlist &> /dev/null || die "Failed to fetch dvb-scan files (use --disable-dvbscan to skip)" -+# echo "done" -+# fi -+#fi - - # ########################################################################### - # Write config -diff -durN tvheadend-v3.3.orig//Makefile tvheadend-v3.3/Makefile ---- tvheadend-v3.3.orig//Makefile 2012-09-25 15:32:31.000000000 +0200 -+++ tvheadend-v3.3/Makefile 2012-12-28 17:17:47.573497346 +0100 -@@ -180,7 +180,7 @@ - SRCS-${CONFIG_BUNDLE} += bundle.c - BUNDLES-yes += docs/html docs/docresources src/webui/static - BUNDLES-yes += data/conf --BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan -+#BUNDLES-${CONFIG_DVBSCAN} += data/dvb-scan - BUNDLES = $(BUNDLES-yes) - - # -diff -durN tvheadend-v3.3.orig//support/posix.mk tvheadend-v3.3/support/posix.mk ---- tvheadend-v3.3.orig//support/posix.mk 2012-09-25 15:32:31.000000000 +0200 -+++ tvheadend-v3.3/support/posix.mk 2012-12-28 17:19:28.903121722 +0100 -@@ -12,7 +12,8 @@ - mkdir -p ${DESTDIR}${datadir}/tvheadend/$$bundle ;\ - cp -r $$bundle/* ${DESTDIR}${datadir}/tvheadend/$$bundle ;\ - done -- -+ mkdir -p ${DESTDIR}${datadir}/tvheadend/data -+ ln -sf /usr/share/dvb ${DESTDIR}${datadir}/tvheadend/data/dvb-scan - - uninstall: - rm -f ${DESTDIR}${bindir)/tvheadend diff --git a/package/tvheadend/tvheadend-no-wordexp.patch b/package/tvheadend/tvheadend-no-wordexp.patch deleted file mode 100644 index ae290edaf..000000000 --- a/package/tvheadend/tvheadend-no-wordexp.patch +++ /dev/null @@ -1,20 +0,0 @@ -epggrab: do not include wordexp.h - -Nothing from wordexp.h is needed (stray include?) - -Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> ---- -Patch sent upstream, but no mailing-list. :-( -Status: awaiting feedback. - -diff -durN tvheadend-v3.3.orig/src/epggrab.c tvheadend-v3.3/src/epggrab.c ---- tvheadend-v3.3.orig/src/epggrab.c 2012-09-25 15:32:31.000000000 +0200 -+++ tvheadend-v3.3/src/epggrab.c 2012-12-31 19:22:29.768431849 +0100 -@@ -20,7 +20,6 @@ - #include <stdlib.h> - #include <string.h> - #include <assert.h> --#include <wordexp.h> - #include <unistd.h> - #include <sys/types.h> - #include <sys/un.h> diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk index 51007812c..5a971b854 100644 --- a/package/tvheadend/tvheadend.mk +++ b/package/tvheadend/tvheadend.mk @@ -4,7 +4,7 @@ # ############################################################## -TVHEADEND_VERSION = v3.3 +TVHEADEND_VERSION = v3.5 TVHEADEND_SITE = http://github.com/tvheadend/tvheadend/tarball/$(TVHEADEND_VERSION) TVHEADEND_LICENSE = GPLv3+ TVHEADEND_LICENSE_FILES = LICENSE diff --git a/package/vtun/Config.in b/package/vtun/Config.in index 7afda9e2a..fc352125c 100644 --- a/package/vtun/Config.in +++ b/package/vtun/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_VTUN - bool "vtun - BEWARE: read package/vtun/README.txt before use" + bool "vtun" select BR2_PACKAGE_LZO select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_ZLIB diff --git a/package/vtun/README.txt b/package/vtun/README.txt deleted file mode 100644 index 5ee047958..000000000 --- a/package/vtun/README.txt +++ /dev/null @@ -1,37 +0,0 @@ -Previous vtun was version 2.6. -This does not buld because its "configure" requires -that -llzo contains "lzolx_decompress". -"vtun" does not build, evenm if liblzo is available. - -The LZO package currently used by buildroot -does not contain ANY reference to "lzolx_decompress" - -"vtun" has been upgraded to 3.0.2 and now builds OK, -but is yet to be tested on a target. -The previous patch containing three diffs, -has been broken up into three files. - -The second patch fails. - -This patch tries to replace a perl script -($(VTUN_DIR)/scripts/vtund.rc.debian) -with a shell script with the same name. - -In vtun-3.0.2, vtund.rc.debian is a shell script which is -fairly similar to the shell script provided by the patch. -For now, it has been decided not to replace this shell -script with the script generated by the patch for 2.6 - -vtun will thus be built with the 3.0.2 vtund.rc.debian. -The start-stop-daemon parameters and other things -in this script may be inappropriate for something based on busybox. - -I will leave the decision which script to use, -the 2-6 script or the 3.0.2 script to someone else. - -Both files are kept in the directory, but should -be removed once it has been decided what to do -about this script. - -Signed-Off by: Ulf Samuelsson <ulf.samuelsson@atmel.com> - diff --git a/package/vtun/vtun-3.0.2-001-Makefile.in.patch b/package/vtun/vtun-001-fix-installation.patch index 1f9396926..d9659fa88 100644 --- a/package/vtun/vtun-3.0.2-001-Makefile.in.patch +++ b/package/vtun/vtun-001-fix-installation.patch @@ -1,6 +1,17 @@ -diff -urN vtun/Makefile.in vtun-2.6/Makefile.in ---- vtun/Makefile.in 2002-12-20 09:55:47.000000000 -0700 -+++ vtun-2.6/Makefile.in 2003-06-05 12:38:31.000000000 -0600 +Makefile.in: fix installation steps + +Not sure what the reason for that patch is, but originally added by Ulf +Samuelsson <ulf.samuelsson@atmel.com>, when upgrading from 2.6.x to 3.0.2. + +yann.morin.1998@free.fr: the initial commit in the Buildroot tree had the +SoB by Ulf, but it was not explicitly reproduced here in the patch; so I +added it here directly in the patch. + +Somewhat-signed-off-by: Ulf Samuelsson <ulf.samuelsson@atmel.com> +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> +diff -durN vtun-3.0.3.orig/Makefile.in vtun-3.0.3/Makefile.in +--- vtun-3.0.3.orig/Makefile.in 2012-07-09 06:55:38.000000000 +0200 ++++ vtun-3.0.3/Makefile.in 2013-02-16 23:28:47.034036869 +0100 @@ -28,7 +28,7 @@ LEXFLAGS = -t @@ -10,7 +21,7 @@ diff -urN vtun/Makefile.in vtun-2.6/Makefile.in prefix = @prefix@ exec_prefix = @exec_prefix@ -@@ -86,15 +86,15 @@ +@@ -89,16 +89,15 @@ install_config: $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR) @@ -26,8 +37,8 @@ diff -urN vtun/Makefile.in vtun-2.6/Makefile.in $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR) $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR) $(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR) +- $(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund + $(INSTALL) -m 755 -D $(INSTALL_OWNER) scripts/vtund.rc.debian \ + $(DESTDIR)$(ETC_DIR)/init.d/S90vtun # DO NOT DELETE THIS LINE -- make depend depends on it. - diff --git a/package/vtun/vtun-002-fix-ssl-headers-checks.patch b/package/vtun/vtun-002-fix-ssl-headers-checks.patch new file mode 100644 index 000000000..765411af8 --- /dev/null +++ b/package/vtun/vtun-002-fix-ssl-headers-checks.patch @@ -0,0 +1,47 @@ +configure.in: do not hard-code search patch for SSL headers + +Do. Not. Do. That. It breaks cross-compilation. + +Also use the SSL headers dir to look for blowfish headers. + +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> + +diff -durN vtun-3.0.3.orig/configure.in vtun-3.0.3/configure.in +--- vtun-3.0.3.orig/configure.in 2009-03-29 12:08:51.000000000 +0200 ++++ vtun-3.0.3/configure.in 2013-02-16 23:44:44.004339680 +0100 +@@ -166,7 +166,7 @@ + AC_MSG_RESULT() + AC_CHECKING( for md5 Library and Header files ... ) + AC_SEARCH_HEADERS(md5.h, +- $SSL_HDR_DIR /usr/include/openssl "" /usr/include /usr/include/ssl /usr/local/include /usr/local/ssl/include /usr/include/sys, ++ $SSL_HDR_DIR "" , + , + AC_MSG_ERROR( SSL headers not found. ) + ) +@@ -176,7 +176,7 @@ + AC_MSG_RESULT() + AC_CHECKING( for blowfish Library and Header files ... ) + AC_SEARCH_HEADERS(blowfish.h, +- $BLOWFISH_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include /usr/include/crypto, ++ $BLOWFISH_HDR_DIR $SSL_HDR_DIR, + AC_CHECK_LIB(crypto, BF_set_key, + [ + LIBS="$LIBS -lcrypto" +@@ -193,7 +193,7 @@ + AC_MSG_RESULT() + AC_CHECKING( for AES Library and Header files ... ) + AC_SEARCH_HEADERS(aes.h, +- $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include /usr/include/crypto, ++ $SSL_HDR_DIR , + AC_CHECK_LIB(crypto, AES_set_encrypt_key, + [ + AC_DEFINE(HAVE_SSL_AES) +@@ -208,7 +208,7 @@ + AC_MSG_RESULT() + AC_CHECKING( for EVP Library and Header files ... ) + AC_SEARCH_HEADERS(evp.h, +- $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include /usr/include/crypto, ++ $SSL_HDR_DIR , + AC_CHECK_LIB(crypto, EVP_EncryptInit, + [ + AC_DEFINE(HAVE_SSL_EVP) diff --git a/package/vtun/vtun-003-fixup-configure.in.patch b/package/vtun/vtun-003-fixup-configure.in.patch new file mode 100644 index 000000000..cb2ac67aa --- /dev/null +++ b/package/vtun/vtun-003-fixup-configure.in.patch @@ -0,0 +1,92 @@ +configure.in: minimal syntax fixup for autoreconf + +This is the strictly minimal syntax fixups to make autoreconf happy... + +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> + +--- +Note: configure.in is still full of incorrect syntax, but fixing it is +a task for another day, and would have to be upstreamed. But upstream +looks to be moribund at best, if not dead... :-( + +So, keep it for ourselves for now... Too bad, vtun is really helpfull. + +--- vtun-3.0.3.orig/configure.in 2013-02-16 23:54:52.582451817 +0100 ++++ vtun-3.0.3/configure.in 2013-02-17 00:03:13.640887353 +0100 +@@ -110,10 +110,10 @@ + AC_SEARCH_LIBS(nanosleep, rt posix4) + + dnl Check for setproctitle in libutil +-AC_SEARCH_LIBS(setproctitle, util bsd, AC_DEFINE(HAVE_SETPROC_TITLE) ) ++AC_SEARCH_LIBS(setproctitle, util bsd, AC_DEFINE([HAVE_SETPROC_TITLE],[],[Define to set title in /proc]) ) + + if test "$SHAPER" = "yes"; then +- AC_DEFINE(HAVE_SHAPER) ++ AC_DEFINE([HAVE_SHAPER],[],[Define to use shapper]) + fi + + if test "$ZLIB" = "yes"; then +@@ -121,7 +121,7 @@ + AC_CHECKING( for ZLIB Library and Header files ... ) + AC_CHECK_LIB(z, deflate, + LIBS="$LIBS -lz" +- AC_DEFINE(HAVE_ZLIB), ++ AC_DEFINE([HAVE_ZLIB],[],[Define to use ZLIB]), + AC_MSG_ERROR( Zlib library not found.) + ) + fi +@@ -148,7 +148,7 @@ + AC_CHECK_LIB($I, lzo1x_decompress, + [ + LIBS="$LIBS -l"$I +- AC_DEFINE(HAVE_LZO) ++ AC_DEFINE([HAVE_LZO],[],[Define to use LZO]) + havelzo=1 + ] + ) +@@ -180,8 +180,8 @@ + AC_CHECK_LIB(crypto, BF_set_key, + [ + LIBS="$LIBS -lcrypto" +- AC_DEFINE(HAVE_SSL) +- AC_DEFINE(HAVE_SSL_BLOWFISH) ++ AC_DEFINE([HAVE_SSL],[],[Define to use SSL]) ++ AC_DEFINE([HAVE_SSL_BLOWFISH],[],[Define to use blowfish]) + ], + AC_MSG_ERROR( SSL library not found. ) + ), +@@ -196,7 +196,7 @@ + $SSL_HDR_DIR , + AC_CHECK_LIB(crypto, AES_set_encrypt_key, + [ +- AC_DEFINE(HAVE_SSL_AES) ++ AC_DEFINE([HAVE_SSL_AES],[],[Define to use AES]) + ], + AC_MSG_ERROR( AES library not found. ) + ), +@@ -211,7 +211,7 @@ + $SSL_HDR_DIR , + AC_CHECK_LIB(crypto, EVP_EncryptInit, + [ +- AC_DEFINE(HAVE_SSL_EVP) ++ AC_DEFINE([HAVE_SSL_EVP],[],Define to use EVP) + ], + AC_MSG_ERROR( EVP library not found. ) + ), +@@ -220,7 +220,7 @@ + fi + + if test "$NATHACK" = "yes"; then +- AC_DEFINE(ENABLE_NAT_HACK) ++ AC_DEFINE([ENABLE_NAT_HACK],[],[Define to use NAT hack]) + fi + + if test "$SOCKS" = "yes"; then +@@ -274,6 +274,6 @@ + REL=`echo 'BRANCH-3_X' | tr -d '$: \-' | sed 's/^[A-Za-z]*//' | sed 's/\_/\./'` + changequote([,]) + +-AC_DEFINE_UNQUOTED(VTUN_VER, "$REL `date '+%m/%d/%Y'`") ++AC_DEFINE_UNQUOTED([VTUN_VER], ["$REL `date '+%m/%d/%Y'`"], [vtun version]) + + AC_OUTPUT(Makefile) diff --git a/package/vtun/vtun-3.0.2-003-configure.patch b/package/vtun/vtun-3.0.2-003-configure.patch deleted file mode 100644 index 7ddc0431a..000000000 --- a/package/vtun/vtun-3.0.2-003-configure.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- vtun-2.6/configure.dist 2004-03-11 10:39:10.000000000 -0600 -+++ vtun-2.6/configure 2004-03-11 10:45:52.000000000 -0600 -@@ -2112,7 +2112,7 @@ - echo $ac_n "checking "for blowfish.h"""... $ac_c" 1>&6 - echo "configure:2114: checking "for blowfish.h"" >&5 - ac_hdr_found=no -- for p in $BLOWFISH_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include /usr/include/crypto; do -+ for p in $BLOWFISH_HDR_DIR $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include /usr/include/crypto; do - if test -n "$p"; then - dir="$p" - else - diff --git a/package/vtun/vtun.mk b/package/vtun/vtun.mk index 7bc0a81e5..2affa2e44 100644 --- a/package/vtun/vtun.mk +++ b/package/vtun/vtun.mk @@ -7,10 +7,11 @@ # ############################################################# -VTUN_VERSION = 3.0.2 +VTUN_VERSION = 3.0.3 VTUN_SOURCE = vtun-$(VTUN_VERSION).tar.gz VTUN_SITE = http://downloads.sourceforge.net/project/vtun/vtun/$(VTUN_VERSION) VTUN_DEPENDENCIES = zlib lzo openssl +VTUN_AUTORECONF = YES VTUN_CONF_OPT = \ --with-ssl-headers=$(STAGING_DIR)/usr/include/openssl \ diff --git a/package/vtun/vtund.rc.debian-2.6 b/package/vtun/vtund.rc.debian-2.6 deleted file mode 100644 index eb8226e9c..000000000 --- a/package/vtun/vtund.rc.debian-2.6 +++ /dev/null @@ -1,50 +0,0 @@ -#! /bin/sh -# - -PATH=/bin:/usr/bin:/sbin:/usr/sbin -DAEMON=/usr/sbin/vtund -CONFFILE=/etc/vtund-start.conf -PIDPREFIX=/var/run/vtund - -test -f $DAEMON || exit 0 - -case "$1" in - start) - # find all the defined tunnels - egrep -v '^[:space:]*(#.*)?$' $CONFFILE | while true; - do - read i - # no more lines available? done, then. - if [ $? != 0 ] ; then break; fi - SARGS=`echo $i|sed -ne 's/--server--\s*/-s -P /p'`; - if [ -n "$SARGS" ]; - then - echo "Starting vtund server." - start-stop-daemon -S -x $DAEMON -- $SARGS; - else - # split args into host and rest - HOST=`echo $i|cut -f 1 -d " "`; - TARGET=`echo $i|cut -f 2 -d " "`; - echo "Starting vtund client $HOST to $TARGET."; - start-stop-daemon -S -x $DAEMON -- $i; - - fi - done - ;; - stop) - echo "Stopping vtund."; - start-stop-daemon -K -x vtund; - ;; - - restart|reload|force-reload) - $0 stop - sleep 1; - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2 - exit 1 - ;; -esac -exit 0 - diff --git a/package/vtun/vtund.rc.debian-3.0.2 b/package/vtun/vtund.rc.debian-3.0.2 deleted file mode 100644 index 5158663f1..000000000 --- a/package/vtun/vtund.rc.debian-3.0.2 +++ /dev/null @@ -1,61 +0,0 @@ -#! /bin/sh -# -# submitted by Morgon Kanter -# - -PATH=/bin:/usr/bin:/sbin:/usr/sbin -DAEMON=/usr/sbin/vtund -CONFFILE=/etc/vtund-start.conf -PIDPREFIX=/var/run/vtund - -test -f $DAEMON || exit 0 - -case "$1" in - start) - # find all the defined tunnels - egrep -v '^[:space:]*(#.*)?$' $CONFFILE | while true; - do - read i - # no more lines available? done, then. - if [ $? != 0 ] ; then break; fi - SARGS=`echo $i|sed -ne 's/--server--\s*/-s -P /p'`; - if [ -n "$SARGS" ]; - then - echo "Starting vtund server." - start-stop-daemon --start --exec $DAEMON --pidfile $PIDPREFIX.pid -- $SARGS; - else - # split args into host and rest - HOST=`echo $i|cut -f 1 -d " "`; - TARGET=`echo $i|cut -f 2 -d " "`; - echo "Starting vtund client $HOST to $TARGET."; - start-stop-daemon --start --exec $DAEMON --pidfile $PIDPREFIX.$HOST.pid -- $i; - - fi - done - ;; - stop) - echo "Stopping vtund."; - for i in $PIDPREFIX*; - do - start-stop-daemon --stop --pidfile $i; - rm -f $i; - done - ;; - reload|force-reload) - echo "Reloading vtund."; - for i in $PIDPREFIX*; - do - start-stop-daemon --stop --signal 1 --pidfile $i; - done - ;; - restart) - $0 stop - sleep 1; - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2 - exit 1 - ;; -esac -exit 0 diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in new file mode 100644 index 000000000..e6d4e7255 --- /dev/null +++ b/package/wireshark/Config.in @@ -0,0 +1,14 @@ +config BR2_PACKAGE_WIRESHARK + bool "wireshark" + select BR2_PACKAGE_LIBPCAP + select BR2_PACKAGE_LIBGCRYPT + select BR2_PACKAGE_LIBGLIB2 + depends on BR2_USE_WCHAR # glib2 + help + Network traffic sniffer and protocol decoder. Currently only tshark, + the console interface, is enabled. + + http://www.wireshark.org + +comment "wireshark requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/wireshark/wireshark-dont-include-prefix.patch b/package/wireshark/wireshark-dont-include-prefix.patch new file mode 100644 index 000000000..567af9a0b --- /dev/null +++ b/package/wireshark/wireshark-dont-include-prefix.patch @@ -0,0 +1,41 @@ +configure.in: don't add the build host's /usr/include and /usr/lib to the +search path of include files and libraries. This is not what you want when +cross compiling. + +Sent upstream as https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7926. + +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- +diff -Nuar wireshark-1.8.3.orig/configure.in wireshark-1.8.3/configure.in +--- wireshark-1.8.3.orig/configure.in 2012-08-15 23:33:32.000000000 +0300 ++++ wireshark-1.8.3/configure.in 2012-10-28 10:07:54.864388531 +0200 +@@ -635,29 +635,6 @@ + AC_SUBST(CORESERVICES_FRAMEWORKS) + AC_SUBST(LAUNCHSERVICES_FRAMEWORKS) + +-# +-# If using $prefix we add "$prefix/include" to the include search path +-# and "$prefix/lib" to the library search path. +-# +-if test "x$prefix" != "x" ; then +- AC_MSG_CHECKING(whether to use $prefix for headers and libraries) +- if test -d $prefix/include ; then +- AC_MSG_RESULT(yes) +- # +- # Arrange that we search for header files in "$prefix/include", as +- # various packages we use may have been installed under "$prefix/include". +- # +- CPPFLAGS="$CPPFLAGS -I$prefix/include" +- +- # +- # Arrange that we search for libraries in "$prefix/lib". +- # +- AC_WIRESHARK_ADD_DASH_L(LDFLAGS, $prefix/lib) +- else +- AC_MSG_RESULT(no) +- fi +-fi +- + dnl Look in /usr/local for header files and libraries ? + dnl XXX FIXME don't include /usr/local if it is already in the system + dnl search path as this causes gcc 3.2 on Linux to complain about a change diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk new file mode 100644 index 000000000..2e89987de --- /dev/null +++ b/package/wireshark/wireshark.mk @@ -0,0 +1,23 @@ +############################################################# +# +# wireshark +# +############################################################# + +WIRESHARK_VERSION = 1.8.5 +WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2 +WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions +WIRESHARK_LICENSE = wireshark license +WIRESHARK_LICENSE_FILES = COPYING +WIRESHARK_DEPENDENCIES = libpcap libgcrypt libglib2 +WIRESHARK_AUTORECONF = YES +WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ + ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config + +# wireshark adds -I$includedir to CFLAGS, causing host/target headers mixup. +# Work around it by pointing includedir at staging +WIRESHARK_CONF_OPT = --disable-wireshark --without-krb5 --disable-usr-local \ + --enable-static=no --with-gnutls=no \ + --includedir=$(STAGING_DIR)/usr/include + +$(eval $(call autotools-package)) |