diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-17 22:24:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-17 22:24:44 +0100 |
| commit | da133cad10885ca36be26b1b043c737e295a4cd4 (patch) | |
| tree | 3fb8e1189dce7188c4681144f96982d30c4511bd | |
| parent | 638c9f989542642d52859a56913ae5c2ace93e69 (diff) | |
| parent | 642a45334676311b50bd2b45ae49c45f8b86c86d (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
TODO
87 files changed, 2442 insertions, 553 deletions
@@ -97,7 +97,7 @@ prompt "Kernel Version" depends on ADK_TOOLCHAIN_ONLY config ADK_KERNEL_VERSION_TOOLCHAIN - prompt "3.11.10" + prompt "3.12.6" boolean depends on ADK_TOOLCHAIN_ONLY @@ -1,6 +1,10 @@ - qemu-system-mips64el memory alloc probs - hash-style=gnu for non-mips and non-musl - add toolchain archive creation target +- add hash-style=gnu for non-mips non-musl +- add arm hard and softfloat toolchains +- add misp64 n32/n64 toolchains +- add support for static toolchains - add fb full screen logo - update gcc to 4.8.2 - port opkg with gpg signing diff --git a/mk/build.mk b/mk/build.mk index 77b70a3f8..07fcbc793 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -544,7 +544,7 @@ endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) # build all target architecture and libc combinations (toolchain only) bulktoolchain: - for libc in uclibc eglibc glibc;do \ + for libc in uclibc eglibc glibc musl;do \ while read arch; do \ mkdir -p $(TOPDIR)/bin/toolchain_$${arch}_$$libc; \ ( \ diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index ae4a99069..34c639a62 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,8 +1,8 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y) -KERNEL_VERSION:= 3.11.10 +KERNEL_VERSION:= 3.12.6 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 59f352d3f4e2cdf6755f79e09fa09176 +KERNEL_MD5SUM:= ab2fcc368e20d804e77970196154fb9e endif ifeq ($(ADK_KERNEL_VERSION_3_12_6),y) KERNEL_VERSION:= 3.12.6 diff --git a/mk/modules.mk b/mk/modules.mk index f5660ba97..00667de3e 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1736,3 +1736,14 @@ $(eval $(call KMOD_template,SCx200_ACB,scx200-acb,\ $(MODULES_DIR)/kernel/drivers/i2c/busses/scx200_acb \ ,25)) +# +# VirtIO +# +$(eval $(call KMOD_template,VIRTIO_BLK,virtio-block,\ + $(MODULES_DIR)/kernel/drivers/net/virtio_blk \ +,20)) + +$(eval $(call KMOD_template,VIRTIO_NET,virtio-net,\ + $(MODULES_DIR)/kernel/drivers/net/virtio_net \ +,40)) + diff --git a/mk/rootfs.mk b/mk/rootfs.mk index f1d0bdf3a..5ec5f3107 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -13,6 +13,9 @@ MTDDEV:= root=/dev/mtdblock0 ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y) ROOTFS:= root=/dev/sda1 endif +ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) +ROOTFS:= root=/dev/vda1 +endif endif ifeq ($(ADK_TARGET_SYSTEM_MIKROTIK_RB532),y) diff --git a/mk/vars.mk b/mk/vars.mk index 014017ee8..bc6689cb8 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -82,7 +82,7 @@ TARGET_CFLAGS_LIBC:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident -fhonour-copts $(T endif TARGET_CXXFLAGS:= $(TARGET_CFLAGS_ARCH) -fwrapv -fno-ident TARGET_LDFLAGS:= -L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib \ - -Wl,-O2 -Wl,-rpath -Wl,/usr/lib \ + -Wl,-O1 -Wl,-rpath -Wl,/usr/lib \ -Wl,-rpath-link -Wl,${STAGING_TARGET_DIR}/usr/lib \ $(ADK_TARGET_ABI_LDFLAGS) $(TARGET_CFLAGS_ARCH) # security optimization, see http://www.akkadia.org/drepper/dsohowto.pdf diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 10e914178..06b4ce766 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 64 +PKG_RELEASE:= 65 PKG_SECTION:= base PKG_DESCR:= basic files and scripts PKG_BUILDDEP:= pkgconf-host file-host @@ -95,6 +95,12 @@ ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},) endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) echo 'export LD_LIBRARY_PATH=/opt/vc/lib' >> $(IDIR_BASE_FILES)/etc/profile +ifneq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI)$(ADK_TARGET_SYSTEM_IBM_X40)$(ADK_TARGET_SYSTEM_LEMOTE_YEELONG),) + echo 'export IPKGTMPDIR=/root/.ipkg' >> $(IDIR_BASE_FILES)/etc/profile +else + echo 'export IPKGTMPDIR=/tmp >> $(IDIR_BASE_FILES)/etc/profile +endif + endif # simple network configuration diff --git a/package/bcm2835-firmware/Makefile b/package/bcm2835-bootloader/Makefile index a67d1a3ad..8cd28cdd3 100644 --- a/package/bcm2835-firmware/Makefile +++ b/package/bcm2835-bootloader/Makefile @@ -3,27 +3,28 @@ include ${TOPDIR}/rules.mk -PKG_NAME:= bcm2835-firmware +PKG_NAME:= bcm2835-bootloader # actually f46e6d9cb9a6bf419fe2a428a8a586239e93aa2d from 07.01.2014 +# https://github.com/raspberrypi/firmware PKG_VERSION:= 0.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= e4c1b8f3dd13ae8742a7831c19d212b0 -PKG_DESCR:= firmware for raspberry pi (bcm2835) -PKG_SECTION:= base +PKG_MD5SUM:= dba84ce20fc8a8c1bf473758d9350e19 +PKG_DESCR:= bootloader for raspberry pi (bcm2835) +PKG_SECTION:= boot PKG_SITES:= http://openadk.org/distfiles/ PKG_SYSTEM_DEPENDS:= raspberry-pi include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,BCM2835_FIRMWARE,bcm2835-firmware,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,BCM2835_BOOTLOADER,bcm2835-bootloader,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual BUILD_STYLE:= manual INSTALL_STYLE:= manual do-install: - ${INSTALL_DIR} ${IDIR_BCM2835_FIRMWARE}/boot - ${CP} ${WRKBUILD}/boot/* ${IDIR_BCM2835_FIRMWARE}/boot/ + ${INSTALL_DIR} ${IDIR_BCM2835_BOOTLOADER}/boot + ${CP} ${WRKBUILD}/boot/* ${IDIR_BCM2835_BOOTLOADER}/boot/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/boost/Makefile b/package/boost/Makefile index d5f4325fc..2951c1e8c 100644 --- a/package/boost/Makefile +++ b/package/boost/Makefile @@ -5,10 +5,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= boost PKG_VERSION:= 1.55.0 -PKG_RELEASE:= 2 +PKG_RELEASE:= 4 PKG_MD5SUM:= 93780777cfbf999a600f62883bd54b17 PKG_DESCR:= boost C++ library PKG_SECTION:= libs +PKG_BUILDDEP:= autotool bzip2-host python2-host PKG_URL:= http://www.boost.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=boost/} PKG_OPTS:= dev @@ -18,24 +19,24 @@ PKG_ARCH_DEPENDS:= !m68k DISTFILES:= boost_1_55_0.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}_1_55_0 -PKG_FLAVOURS_BOOST:= date_time graph graph_parallel iostreams math program_options python regex serialization signals system test thread wave - -PKGFD_date_time:= with date-time -PKGFD_python:= with Python -PKGFB_python:= python2 -PKGFS_python:= python2 -PKGFD_iostreams:= with iostreams -PKGFD_graph:= with graph -PKGFD_graph_parallel:= with graph_parallel -PKGFD_math:= with math -PKGFD_program_options:= with program_options -PKGFD_regex:= with regex -PKGFD_serialization:= with serialization -PKGFD_signals:= with signals -PKGFD_system:= with system -PKGFD_test:= with test -PKGFD_thread:= with thread -PKGFD_wave:= with wave +PKG_FLAVOURS_BOOST:= DATE_TIME GRAPH GRAPH_PARALLEL IOSTREAMS MATH PROGRAM_OPTIONS PYTHON REGEX SERIALIZATION SIGNALS SYSTEM TEST THREAD WAVE + +PKGFD_DATE_TIME:= with date-time +PKGFD_PYTHON:= with Python +PKGFB_PYTHON:= python2 +PKGFS_PYTHON:= python2 +PKGFD_IOSTREAMS:= with iostreams +PKGFD_GRAPH:= with graph +PKGFD_GRAPH_PARALLEL:= with graph_parallel +PKGFD_MATH:= with math +PKGFD_PROGRAM_OPTIONS:= with program_options +PKGFD_REGEX:= with regex +PKGFD_SERIALIZATION:= with serialization +PKGFD_SIGNALS:= with signals +PKGFD_SYSTEM:= with system +PKGFD_TEST:= with test +PKGFD_THREAD:= with thread +PKGFD_WAVE:= with wave include ${TOPDIR}/mk/package.mk @@ -107,7 +108,7 @@ endif GPP_PATH:= ${STAGING_HOST_DIR}/bin/${GNU_TARGET_NAME}-g++ GPP_VERSION:= "`${GPP_PATH} -v 2>&1 | tail -1 | awk '{print $$3}'`" BJAM_PATH:= "`find ${WRKBUILD} -type f -name "bjam$(EXEEXT)"`" -PYTHON_PATH:= ${STAGING_TARGET_DIR}/usr/bin/python +PYTHON_PATH:= ${STAGING_HOST_DIR}/usr/bin/python PYTHON_INCLUDE:="`find ${STAGING_TARGET_DIR}/usr/include/ -maxdepth 1 -type d -name "python*" | head -1`" PYTHON_LIB:= "`find ${STAGING_TARGET_DIR}/usr/lib/ -maxdepth 1 -type d -name "python*" | head -1`" USER_JAM:= ${WRKBUILD}/tools/build/v2/user-config.jam @@ -141,6 +142,7 @@ endif --layout=versioned \ --disable-long-double \ --without-mpi \ + --debug-configuration \ ${CONFIGURE_ARGS} \ install \ ) diff --git a/package/busybox/Makefile b/package/busybox/Makefile index 1d50365e3..d4184a37a 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= busybox PKG_VERSION:= 1.21.1 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 795394f83903b5eec6567d51eebb417e PKG_DESCR:= core utilities for embedded systems PKG_SECTION:= base diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch index 07d31b802..5f392d06b 100644 --- a/package/busybox/patches/001-ipkg.patch +++ b/package/busybox/patches/001-ipkg.patch @@ -1,6 +1,6 @@ diff -Nur busybox-1.21.1.orig/archival/Config.src busybox-1.21.1/archival/Config.src --- busybox-1.21.1.orig/archival/Config.src 2013-05-12 01:30:43.000000000 +0200 -+++ busybox-1.21.1/archival/Config.src 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/Config.src 2014-02-17 14:25:39.802534016 +0100 @@ -214,6 +214,12 @@ are actually slower than gzip at equivalent compression ratios and take up 3.2K of code. @@ -16,7 +16,7 @@ diff -Nur busybox-1.21.1.orig/archival/Config.src busybox-1.21.1/archival/Config default y diff -Nur busybox-1.21.1.orig/archival/ipkg.c busybox-1.21.1/archival/ipkg.c --- busybox-1.21.1.orig/archival/ipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/ipkg.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/ipkg.c 2014-02-17 14:25:39.802534016 +0100 @@ -0,0 +1,28 @@ +/* ipkg.c - the itsy package management system + @@ -48,7 +48,7 @@ diff -Nur busybox-1.21.1.orig/archival/ipkg.c busybox-1.21.1/archival/ipkg.c +} diff -Nur busybox-1.21.1.orig/archival/Kbuild.src busybox-1.21.1/archival/Kbuild.src --- busybox-1.21.1.orig/archival/Kbuild.src 2013-05-12 01:30:43.000000000 +0200 -+++ busybox-1.21.1/archival/Kbuild.src 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/Kbuild.src 2014-02-17 14:25:39.802534016 +0100 @@ -22,6 +22,7 @@ lib-$(CONFIG_LZOP) += lzop.o bbunzip.o lib-$(CONFIG_GZIP) += gzip.o bbunzip.o @@ -59,7 +59,7 @@ diff -Nur busybox-1.21.1.orig/archival/Kbuild.src busybox-1.21.1/archival/Kbuild lib-$(CONFIG_UNLZMA) += bbunzip.o diff -Nur busybox-1.21.1.orig/archival/libarchive/Kbuild.src busybox-1.21.1/archival/libarchive/Kbuild.src --- busybox-1.21.1.orig/archival/libarchive/Kbuild.src 2013-06-29 16:58:06.000000000 +0200 -+++ busybox-1.21.1/archival/libarchive/Kbuild.src 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libarchive/Kbuild.src 2014-02-17 14:25:39.802534016 +0100 @@ -25,14 +25,14 @@ \ data_align.o \ @@ -79,7 +79,7 @@ diff -Nur busybox-1.21.1.orig/archival/libarchive/Kbuild.src busybox-1.21.1/arch diff -Nur busybox-1.21.1.orig/archival/libipkg/args.c busybox-1.21.1/archival/libipkg/args.c --- busybox-1.21.1.orig/archival/libipkg/args.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/args.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/args.c 2014-02-17 14:25:39.826534090 +0100 @@ -0,0 +1,242 @@ +/* args.c - parse command-line args + @@ -325,7 +325,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/args.c busybox-1.21.1/archival/li +} diff -Nur busybox-1.21.1.orig/archival/libipkg/args.h busybox-1.21.1/archival/libipkg/args.h --- busybox-1.21.1.orig/archival/libipkg/args.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/args.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/args.h 2014-02-17 14:25:39.826534090 +0100 @@ -0,0 +1,72 @@ +/* args.h - parse command-line args + @@ -401,7 +401,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/args.h busybox-1.21.1/archival/li +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.c busybox-1.21.1/archival/libipkg/conffile.c --- busybox-1.21.1.orig/archival/libipkg/conffile.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/conffile.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/conffile.c 2014-02-17 14:25:39.826534090 +0100 @@ -0,0 +1,65 @@ +/* conffile.c - the itsy package management system + @@ -470,7 +470,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.c busybox-1.21.1/archiva +} diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.h busybox-1.21.1/archival/libipkg/conffile.h --- busybox-1.21.1.orig/archival/libipkg/conffile.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/conffile.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/conffile.h 2014-02-17 14:25:39.826534090 +0100 @@ -0,0 +1,30 @@ +/* conffile.h - the itsy package management system + @@ -504,7 +504,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile.h busybox-1.21.1/archiva + diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.c busybox-1.21.1/archival/libipkg/conffile_list.c --- busybox-1.21.1.orig/archival/libipkg/conffile_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/conffile_list.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/conffile_list.c 2014-02-17 14:25:39.850534164 +0100 @@ -0,0 +1,47 @@ +/* conffile_list.c - the itsy package management system + @@ -555,7 +555,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.c busybox-1.21.1/ar + diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.h busybox-1.21.1/archival/libipkg/conffile_list.h --- busybox-1.21.1.orig/archival/libipkg/conffile_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/conffile_list.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/conffile_list.h 2014-02-17 14:25:39.850534164 +0100 @@ -0,0 +1,36 @@ +/* conffile_list.h - the itsy package management system + @@ -595,7 +595,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/conffile_list.h busybox-1.21.1/ar + diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.c busybox-1.21.1/archival/libipkg/file_util.c --- busybox-1.21.1.orig/archival/libipkg/file_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/file_util.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/file_util.c 2014-02-17 14:25:39.850534164 +0100 @@ -0,0 +1,186 @@ +/* file_util.c - convenience routines for common stat operations + @@ -785,7 +785,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.c busybox-1.21.1/archiv + diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.h busybox-1.21.1/archival/libipkg/file_util.h --- busybox-1.21.1.orig/archival/libipkg/file_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/file_util.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/file_util.h 2014-02-17 14:25:39.850534164 +0100 @@ -0,0 +1,29 @@ +/* file_util.h - convenience routines for common file operations + @@ -818,7 +818,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/file_util.h busybox-1.21.1/archiv +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.c busybox-1.21.1/archival/libipkg/hash_table.c --- busybox-1.21.1.orig/archival/libipkg/hash_table.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/hash_table.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/hash_table.c 2014-02-17 14:25:39.850534164 +0100 @@ -0,0 +1,155 @@ +/* hash.c - hash tables for ipkg + @@ -977,7 +977,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.c busybox-1.21.1/archi + diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.h busybox-1.21.1/archival/libipkg/hash_table.h --- busybox-1.21.1.orig/archival/libipkg/hash_table.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/hash_table.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/hash_table.h 2014-02-17 14:25:39.854534176 +0100 @@ -0,0 +1,44 @@ +/* hash.h - hash tables for ipkg + @@ -1025,7 +1025,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/hash_table.h busybox-1.21.1/archi +#endif /* _HASH_TABLE_H_ */ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.21.1/archival/libipkg/ipkg_cmd.c --- busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_cmd.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_cmd.c 2014-02-17 14:25:39.858534188 +0100 @@ -0,0 +1,1367 @@ +/* ipkg_cmd.c - the itsy package management system + @@ -2396,7 +2396,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.c busybox-1.21.1/archiva + diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.21.1/archival/libipkg/ipkg_cmd.h --- busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_cmd.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_cmd.h 2014-02-17 14:25:39.858534188 +0100 @@ -0,0 +1,41 @@ +/* ipkg_cmd.h - the itsy package management system + @@ -2441,8 +2441,8 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_cmd.h busybox-1.21.1/archiva +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c busybox-1.21.1/archival/libipkg/ipkg_conf.c --- busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_conf.c 2013-11-02 15:26:12.000000000 +0100 -@@ -0,0 +1,711 @@ ++++ busybox-1.21.1/archival/libipkg/ipkg_conf.c 2014-02-17 19:29:30.303924578 +0100 +@@ -0,0 +1,739 @@ +/* ipkg_conf.c - the itsy package management system + + Carl D. Worth @@ -2548,6 +2548,9 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c busybox-1.21.1/archiv +int ipkg_conf_init(ipkg_conf_t *conf, const args_t *args) +{ + int err; ++ int remountroot; ++ struct mntent *mnt; ++ FILE *f; + char *tmp_dir_base; + nv_pair_list_t tmp_dest_nv_pair_list; + char * lists_dir =NULL; @@ -2571,16 +2574,41 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c busybox-1.21.1/archiv + if (args->tmp_dir) + tmp_dir_base = args->tmp_dir; + else -+ tmp_dir_base = getenv("TMPDIR"); ++ tmp_dir_base = getenv("IPKGTMPDIR"); + sprintf_alloc(&conf->tmp_dir, "%s/%s", + tmp_dir_base ? tmp_dir_base : IPKG_CONF_DEFAULT_TMP_DIR_BASE, + IPKG_CONF_TMP_DIR_SUFFIX); ++ ++ remountroot = 0; ++ /* check if /dev/root is mounted read-only */ ++ if ((f = setmntent("/proc/mounts", "r")) == NULL) ++ fprintf (stderr, "Checking /proc/mounts failed\n"); ++ while ((mnt = getmntent(f)) != NULL) { ++ if (strcmp(mnt->mnt_fsname, "/dev/root") == 0 && ++ hasmntopt(mnt, MNTOPT_RO) != NULL) { ++ remountroot = 1; ++ } ++ } ++ endmntent(f); ++ ++ if (remountroot) { ++ /* mount rootfs read-write */ ++ if (mount("","/",0,MS_REMOUNT,0)<0) ++ fprintf (stderr, "Mounting rootfs read-write failed\n"); ++ } ++ mkdir(tmp_dir_base, S_IRWXU); + conf->tmp_dir = mkdtemp(conf->tmp_dir); + if (conf->tmp_dir == NULL) { + fprintf(stderr, "%s: Failed to create temporary directory `%s': %s\n", + __FUNCTION__, conf->tmp_dir, strerror(errno)); + return errno; + } ++ if (remountroot) { ++ sync(); ++ /* mount rootfs read-only */ ++ if (mount("","/",0,MS_REMOUNT|MS_RDONLY,0)<0) ++ fprintf (stderr, "Mounting rootfs read-only failed\n"); ++ } + + conf->force_depends = 0; + conf->force_defaults = 0; @@ -3156,7 +3184,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.c busybox-1.21.1/archiv +} diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.h busybox-1.21.1/archival/libipkg/ipkg_conf.h --- busybox-1.21.1.orig/archival/libipkg/ipkg_conf.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_conf.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_conf.h 2014-02-17 14:25:39.858534188 +0100 @@ -0,0 +1,107 @@ +/* ipkg_conf.h - the itsy package management system + @@ -3267,7 +3295,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_conf.h busybox-1.21.1/archiv +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.c busybox-1.21.1/archival/libipkg/ipkg_configure.c --- busybox-1.21.1.orig/archival/libipkg/ipkg_configure.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_configure.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_configure.c 2014-02-17 14:25:39.858534188 +0100 @@ -0,0 +1,40 @@ +/* ipkg_configure.c - the itsy package management system + @@ -3311,7 +3339,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.c busybox-1.21.1/a + diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.h busybox-1.21.1/archival/libipkg/ipkg_configure.h --- busybox-1.21.1.orig/archival/libipkg/ipkg_configure.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_configure.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_configure.h 2014-02-17 14:25:39.858534188 +0100 @@ -0,0 +1,25 @@ +/* ipkg_configure.h - the itsy package management system + @@ -3340,7 +3368,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_configure.h busybox-1.21.1/a +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.c busybox-1.21.1/archival/libipkg/ipkg_download.c --- busybox-1.21.1.orig/archival/libipkg/ipkg_download.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_download.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_download.c 2014-02-17 14:25:39.858534188 +0100 @@ -0,0 +1,195 @@ +/* ipkg_download.c - the itsy package management system + @@ -3539,7 +3567,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.c busybox-1.21.1/ar +} diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.h busybox-1.21.1/archival/libipkg/ipkg_download.h --- busybox-1.21.1.orig/archival/libipkg/ipkg_download.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_download.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_download.h 2014-02-17 14:25:39.858534188 +0100 @@ -0,0 +1,30 @@ +/* ipkg_download.h - the itsy package management system + @@ -3573,7 +3601,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_download.h busybox-1.21.1/ar +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg.h busybox-1.21.1/archival/libipkg/ipkg.h --- busybox-1.21.1.orig/archival/libipkg/ipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg.h 2014-02-17 14:25:39.858534188 +0100 @@ -0,0 +1,68 @@ +/* ipkg.h - the itsy package management system + @@ -3645,7 +3673,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg.h busybox-1.21.1/archival/li +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_includes.h busybox-1.21.1/archival/libipkg/ipkg_includes.h --- busybox-1.21.1.orig/archival/libipkg/ipkg_includes.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_includes.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_includes.h 2014-02-17 14:25:39.858534188 +0100 @@ -0,0 +1,82 @@ +#ifndef IPKG_INCLUDES_H +#define IPKG_INCLUDES_H @@ -3731,7 +3759,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_includes.h busybox-1.21.1/ar +#endif /* IPKG_INCLUDES_H */ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.c busybox-1.21.1/archival/libipkg/ipkg_install.c --- busybox-1.21.1.orig/archival/libipkg/ipkg_install.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_install.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_install.c 2014-02-17 14:25:39.858534188 +0100 @@ -0,0 +1,1982 @@ +/* ipkg_install.c - the itsy package management system + @@ -5717,7 +5745,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.c busybox-1.21.1/arc +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.h busybox-1.21.1/archival/libipkg/ipkg_install.h --- busybox-1.21.1.orig/archival/libipkg/ipkg_install.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_install.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_install.h 2014-02-17 14:25:39.858534188 +0100 @@ -0,0 +1,35 @@ +/* ipkg_install.h - the itsy package management system + @@ -5756,7 +5784,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_install.h busybox-1.21.1/arc +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.c busybox-1.21.1/archival/libipkg/ipkg_message.c --- busybox-1.21.1.orig/archival/libipkg/ipkg_message.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_message.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_message.c 2014-02-17 14:25:39.858534188 +0100 @@ -0,0 +1,35 @@ +/* ipkg_message.c - the itsy package management system + @@ -5795,7 +5823,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.c busybox-1.21.1/arc +} diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.h busybox-1.21.1/archival/libipkg/ipkg_message.h --- busybox-1.21.1.orig/archival/libipkg/ipkg_message.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_message.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_message.h 2014-02-17 14:25:39.858534188 +0100 @@ -0,0 +1,32 @@ +/* ipkg_message.h - the itsy package management system + @@ -5831,7 +5859,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_message.h busybox-1.21.1/arc +#endif /* _IPKG_MESSAGE_H_ */ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.c busybox-1.21.1/archival/libipkg/ipkg_remove.c --- busybox-1.21.1.orig/archival/libipkg/ipkg_remove.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_remove.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_remove.c 2014-02-17 14:25:39.858534188 +0100 @@ -0,0 +1,385 @@ +/* ipkg_remove.c - the itsy package management system + @@ -6220,7 +6248,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.c busybox-1.21.1/arch +} diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.h busybox-1.21.1/archival/libipkg/ipkg_remove.h --- busybox-1.21.1.orig/archival/libipkg/ipkg_remove.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_remove.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_remove.h 2014-02-17 14:25:39.858534188 +0100 @@ -0,0 +1,33 @@ +/* ipkg_remove.h - the itsy package management system + @@ -6257,7 +6285,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_remove.h busybox-1.21.1/arch +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.21.1/archival/libipkg/ipkg_upgrade.c --- busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.c 2014-02-17 14:25:39.858534188 +0100 @@ -0,0 +1,79 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6340,7 +6368,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.c busybox-1.21.1/arc +} diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.21.1/archival/libipkg/ipkg_upgrade.h --- busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.h 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,18 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6362,7 +6390,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_upgrade.h busybox-1.21.1/arc +int ipkg_upgrade_pkg(ipkg_conf_t *conf, pkg_t *old); diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.c busybox-1.21.1/archival/libipkg/ipkg_utils.c --- busybox-1.21.1.orig/archival/libipkg/ipkg_utils.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_utils.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_utils.c 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,185 @@ +/* ipkg_utils.c - the itsy package management system + @@ -6551,7 +6579,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.c busybox-1.21.1/archi + diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.h busybox-1.21.1/archival/libipkg/ipkg_utils.h --- busybox-1.21.1.orig/archival/libipkg/ipkg_utils.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/ipkg_utils.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_utils.h 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,29 @@ +/* ipkg_utils.h - the itsy package management system + @@ -6584,7 +6612,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/ipkg_utils.h busybox-1.21.1/archi +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/Kbuild busybox-1.21.1/archival/libipkg/Kbuild --- busybox-1.21.1.orig/archival/libipkg/Kbuild 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/Kbuild 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/Kbuild 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,60 @@ +# Makefile for busybox +# @@ -6648,7 +6676,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/Kbuild busybox-1.21.1/archival/li +CFLAGS += -DIPKGLIBDIR="\"/usr/lib\"" -DHOST_CPU_STR="\"$(IPKG_ARCH)\"" diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.c busybox-1.21.1/archival/libipkg/libipkg.c --- busybox-1.21.1.orig/archival/libipkg/libipkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/libipkg.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/libipkg.c 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,583 @@ +/* ipkglib.c - the itsy package management system + @@ -7235,7 +7263,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.c busybox-1.21.1/archival +} diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.h busybox-1.21.1/archival/libipkg/libipkg.h --- busybox-1.21.1.orig/archival/libipkg/libipkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/libipkg.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/libipkg.h 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,78 @@ +/* ipkglib.h - the itsy package management system + @@ -7317,7 +7345,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/libipkg.h busybox-1.21.1/archival +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.c busybox-1.21.1/archival/libipkg/nv_pair.c --- busybox-1.21.1.orig/archival/libipkg/nv_pair.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/nv_pair.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/nv_pair.c 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,40 @@ +/* nv_pair.c - the itsy package management system + @@ -7361,7 +7389,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.c busybox-1.21.1/archival + diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.h busybox-1.21.1/archival/libipkg/nv_pair.h --- busybox-1.21.1.orig/archival/libipkg/nv_pair.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/nv_pair.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/nv_pair.h 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,32 @@ +/* nv_pair.h - the itsy package management system + @@ -7397,7 +7425,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair.h busybox-1.21.1/archival + diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.c busybox-1.21.1/archival/libipkg/nv_pair_list.c --- busybox-1.21.1.orig/archival/libipkg/nv_pair_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/nv_pair_list.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/nv_pair_list.c 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,98 @@ +/* nv_pair_list.c - the itsy package management system + @@ -7499,7 +7527,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.c busybox-1.21.1/arc +} diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.h busybox-1.21.1/archival/libipkg/nv_pair_list.h --- busybox-1.21.1.orig/archival/libipkg/nv_pair_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/nv_pair_list.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/nv_pair_list.h 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,60 @@ +/* nv_pair_list.h - the itsy package management system + @@ -7563,7 +7591,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/nv_pair_list.h busybox-1.21.1/arc + diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.c busybox-1.21.1/archival/libipkg/pkg.c --- busybox-1.21.1.orig/archival/libipkg/pkg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg.c 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,1757 @@ +/* pkg.c - the itsy package management system + @@ -9324,7 +9352,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.c busybox-1.21.1/archival/lib +} diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.c busybox-1.21.1/archival/libipkg/pkg_depends.c --- busybox-1.21.1.orig/archival/libipkg/pkg_depends.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg_depends.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_depends.c 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,1032 @@ +/* pkg_depends.c - the itsy package management system + @@ -10360,7 +10388,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.c busybox-1.21.1/arch +} diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.h busybox-1.21.1/archival/libipkg/pkg_depends.h --- busybox-1.21.1.orig/archival/libipkg/pkg_depends.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg_depends.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_depends.h 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,105 @@ +/* pkg_depends.h - the itsy package management system + @@ -10469,7 +10497,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_depends.h busybox-1.21.1/arch +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.c busybox-1.21.1/archival/libipkg/pkg_dest.c --- busybox-1.21.1.orig/archival/libipkg/pkg_dest.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg_dest.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_dest.c 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,92 @@ +/* pkg_dest.c - the itsy package management system + @@ -10565,7 +10593,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.c busybox-1.21.1/archiva +} diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.h busybox-1.21.1/archival/libipkg/pkg_dest.h --- busybox-1.21.1.orig/archival/libipkg/pkg_dest.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg_dest.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_dest.h 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,38 @@ +/* pkg_dest.h - the itsy package management system + @@ -10607,7 +10635,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest.h busybox-1.21.1/archiva + diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.21.1/archival/libipkg/pkg_dest_list.c --- busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg_dest_list.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_dest_list.c 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,85 @@ +/* pkg_dest_list.c - the itsy package management system + @@ -10696,7 +10724,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.c busybox-1.21.1/ar +} diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.21.1/archival/libipkg/pkg_dest_list.h --- busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg_dest_list.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_dest_list.h 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,50 @@ +/* pkg_dest_list.h - the itsy package management system + @@ -10750,7 +10778,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_dest_list.h busybox-1.21.1/ar + diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.c busybox-1.21.1/archival/libipkg/pkg_extract.c --- busybox-1.21.1.orig/archival/libipkg/pkg_extract.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg_extract.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_extract.c 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,255 @@ +/* pkg_extract.c - the itsy package management system + @@ -11009,7 +11037,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.c busybox-1.21.1/arch +} diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.h busybox-1.21.1/archival/libipkg/pkg_extract.h --- busybox-1.21.1.orig/archival/libipkg/pkg_extract.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg_extract.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_extract.h 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,32 @@ +/* pkg_extract.c - the itsy package management system + @@ -11045,7 +11073,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_extract.h busybox-1.21.1/arch +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.h busybox-1.21.1/archival/libipkg/pkg.h --- busybox-1.21.1.orig/archival/libipkg/pkg.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg.h 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,229 @@ +/* pkg.h - the itsy package management system + @@ -11278,7 +11306,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg.h busybox-1.21.1/archival/lib +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.c busybox-1.21.1/archival/libipkg/pkg_hash.c --- busybox-1.21.1.orig/archival/libipkg/pkg_hash.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg_hash.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_hash.c 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,623 @@ +/* ipkg_hash.c - the itsy package management system + @@ -11905,7 +11933,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.c busybox-1.21.1/archiva + diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.h busybox-1.21.1/archival/libipkg/pkg_hash.h --- busybox-1.21.1.orig/archival/libipkg/pkg_hash.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg_hash.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_hash.h 2014-02-17 14:25:39.862534201 +0100 @@ -0,0 +1,61 @@ +/* pkg_hash.h - the itsy package management system + @@ -11970,7 +11998,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_hash.h busybox-1.21.1/archiva + diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.c busybox-1.21.1/archival/libipkg/pkg_parse.c --- busybox-1.21.1.orig/archival/libipkg/pkg_parse.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg_parse.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_parse.c 2014-02-17 14:25:39.866534213 +0100 @@ -0,0 +1,368 @@ +/* pkg_parse.c - the itsy package management system + @@ -12342,7 +12370,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.c busybox-1.21.1/archiv +} diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.h busybox-1.21.1/archival/libipkg/pkg_parse.h --- busybox-1.21.1.orig/archival/libipkg/pkg_parse.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg_parse.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_parse.h 2014-02-17 14:25:39.866534213 +0100 @@ -0,0 +1,31 @@ +/* pkg_parse.h - the itsy package management system + @@ -12377,7 +12405,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_parse.h busybox-1.21.1/archiv +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.c busybox-1.21.1/archival/libipkg/pkg_src.c --- busybox-1.21.1.orig/archival/libipkg/pkg_src.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg_src.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_src.c 2014-02-17 14:25:39.866534213 +0100 @@ -0,0 +1,43 @@ +/* pkg_src.c - the itsy package management system + @@ -12424,7 +12452,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.c busybox-1.21.1/archival + diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.h busybox-1.21.1/archival/libipkg/pkg_src.h --- busybox-1.21.1.orig/archival/libipkg/pkg_src.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg_src.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_src.h 2014-02-17 14:25:39.866534213 +0100 @@ -0,0 +1,34 @@ +/* pkg_src.h - the itsy package management system + @@ -12462,7 +12490,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src.h busybox-1.21.1/archival +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.c busybox-1.21.1/archival/libipkg/pkg_src_list.c --- busybox-1.21.1.orig/archival/libipkg/pkg_src_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg_src_list.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_src_list.c 2014-02-17 14:25:39.866534213 +0100 @@ -0,0 +1,75 @@ +/* pkg_src_list.c - the itsy package management system + @@ -12541,7 +12569,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.c busybox-1.21.1/arc +} diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.h busybox-1.21.1/archival/libipkg/pkg_src_list.h --- busybox-1.21.1.orig/archival/libipkg/pkg_src_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg_src_list.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_src_list.h 2014-02-17 14:25:39.866534213 +0100 @@ -0,0 +1,57 @@ +/* pkg_src_list.h - the itsy package management system + @@ -12602,7 +12630,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_src_list.h busybox-1.21.1/arc + diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.c busybox-1.21.1/archival/libipkg/pkg_vec.c --- busybox-1.21.1.orig/archival/libipkg/pkg_vec.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg_vec.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_vec.c 2014-02-17 14:25:39.866534213 +0100 @@ -0,0 +1,231 @@ +/* pkg_vec.c - the itsy package management system + @@ -12837,7 +12865,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.c busybox-1.21.1/archival + diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.h busybox-1.21.1/archival/libipkg/pkg_vec.h --- busybox-1.21.1.orig/archival/libipkg/pkg_vec.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/pkg_vec.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_vec.h 2014-02-17 14:25:39.866534213 +0100 @@ -0,0 +1,62 @@ +/* pkg_vec.h - the itsy package management system + @@ -12903,7 +12931,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/pkg_vec.h busybox-1.21.1/archival + diff -Nur busybox-1.21.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.21.1/archival/libipkg/sprintf_alloc.h --- busybox-1.21.1.orig/archival/libipkg/sprintf_alloc.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/sprintf_alloc.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/sprintf_alloc.h 2014-02-17 14:25:39.866534213 +0100 @@ -0,0 +1,25 @@ +/* sprintf_alloca.c -- like sprintf with memory allocation + @@ -12932,7 +12960,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/sprintf_alloc.h busybox-1.21.1/ar +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.c busybox-1.21.1/archival/libipkg/str_list.c --- busybox-1.21.1.orig/archival/libipkg/str_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/str_list.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/str_list.c 2014-02-17 14:25:39.866534213 +0100 @@ -0,0 +1,76 @@ +/* str_list.c - the itsy package management system + @@ -13012,7 +13040,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.c busybox-1.21.1/archiva +} diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.h busybox-1.21.1/archival/libipkg/str_list.h --- busybox-1.21.1.orig/archival/libipkg/str_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/str_list.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/str_list.h 2014-02-17 14:25:39.866534213 +0100 @@ -0,0 +1,51 @@ +/* str_list.h - the itsy package management system + @@ -13067,7 +13095,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/str_list.h busybox-1.21.1/archiva +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.c busybox-1.21.1/archival/libipkg/str_util.c --- busybox-1.21.1.orig/archival/libipkg/str_util.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/str_util.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/str_util.c 2014-02-17 14:25:39.866534213 +0100 @@ -0,0 +1,69 @@ +/* str_utils.c - the itsy package management system + @@ -13140,7 +13168,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.c busybox-1.21.1/archiva + diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.h busybox-1.21.1/archival/libipkg/str_util.h --- busybox-1.21.1.orig/archival/libipkg/str_util.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/str_util.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/str_util.h 2014-02-17 14:25:39.866534213 +0100 @@ -0,0 +1,27 @@ +/* str_utils.h - the itsy package management system + @@ -13171,7 +13199,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/str_util.h busybox-1.21.1/archiva +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/user.c busybox-1.21.1/archival/libipkg/user.c --- busybox-1.21.1.orig/archival/libipkg/user.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/user.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/user.c 2014-02-17 14:25:39.866534213 +0100 @@ -0,0 +1,49 @@ +/* user.c - the itsy package management system + @@ -13224,7 +13252,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/user.c busybox-1.21.1/archival/li +} diff -Nur busybox-1.21.1.orig/archival/libipkg/user.h busybox-1.21.1/archival/libipkg/user.h --- busybox-1.21.1.orig/archival/libipkg/user.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/user.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/user.h 2014-02-17 14:25:39.866534213 +0100 @@ -0,0 +1,23 @@ +/* user.c - the itsy package management system + @@ -13251,7 +13279,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/user.h busybox-1.21.1/archival/li + diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.c busybox-1.21.1/archival/libipkg/void_list.c --- busybox-1.21.1.orig/archival/libipkg/void_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/void_list.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/void_list.c 2014-02-17 14:25:39.886534275 +0100 @@ -0,0 +1,194 @@ +/* void_list.c - the itsy package management system + @@ -13449,7 +13477,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.c busybox-1.21.1/archiv +} diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.h busybox-1.21.1/archival/libipkg/void_list.h --- busybox-1.21.1.orig/archival/libipkg/void_list.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/void_list.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/void_list.h 2014-02-17 14:25:39.886534275 +0100 @@ -0,0 +1,59 @@ +/* void_list.h - the itsy package management system + @@ -13512,7 +13540,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/void_list.h busybox-1.21.1/archiv +#endif diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.c busybox-1.21.1/archival/libipkg/xsystem.c --- busybox-1.21.1.orig/archival/libipkg/xsystem.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/xsystem.c 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/xsystem.c 2014-02-17 14:25:39.886534275 +0100 @@ -0,0 +1,64 @@ +/* xsystem.c - system(3) with error messages + @@ -13580,7 +13608,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.c busybox-1.21.1/archival + diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.h busybox-1.21.1/archival/libipkg/xsystem.h --- busybox-1.21.1.orig/archival/libipkg/xsystem.h 1970-01-01 01:00:00.000000000 +0100 -+++ busybox-1.21.1/archival/libipkg/xsystem.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/archival/libipkg/xsystem.h 2014-02-17 14:25:39.890534287 +0100 @@ -0,0 +1,34 @@ +/* xsystem.h - system(3) with error messages + @@ -13618,7 +13646,7 @@ diff -Nur busybox-1.21.1.orig/archival/libipkg/xsystem.h busybox-1.21.1/archival + diff -Nur busybox-1.21.1.orig/include/applets.src.h busybox-1.21.1/include/applets.src.h --- busybox-1.21.1.orig/include/applets.src.h 2013-06-29 16:58:06.000000000 +0200 -+++ busybox-1.21.1/include/applets.src.h 2013-11-02 15:27:08.000000000 +0100 ++++ busybox-1.21.1/include/applets.src.h 2014-02-17 14:25:39.890534287 +0100 @@ -199,6 +199,7 @@ IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP)) IF_IPCRM(APPLET(ipcrm, BB_DIR_USR_BIN, BB_SUID_DROP)) @@ -13629,7 +13657,7 @@ diff -Nur busybox-1.21.1.orig/include/applets.src.h busybox-1.21.1/include/apple IF_IPRULE(APPLET(iprule, BB_DIR_SBIN, BB_SUID_DROP)) diff -Nur busybox-1.21.1.orig/include/bb_archive.h busybox-1.21.1/include/bb_archive.h --- busybox-1.21.1.orig/include/bb_archive.h 2013-06-29 16:58:06.000000000 +0200 -+++ busybox-1.21.1/include/bb_archive.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/include/bb_archive.h 2014-02-17 14:25:39.890534287 +0100 @@ -79,7 +79,7 @@ /* Archiver specific. Can make it a union if it ever gets big */ #define PAX_NEXT_FILE 0 @@ -13650,7 +13678,7 @@ diff -Nur busybox-1.21.1.orig/include/bb_archive.h busybox-1.21.1/include/bb_arc /* How to process any sub archive, e.g. get_header_tar_gz */ diff -Nur busybox-1.21.1.orig/include/usage.src.h busybox-1.21.1/include/usage.src.h --- busybox-1.21.1.orig/include/usage.src.h 2013-05-12 01:30:43.000000000 +0200 -+++ busybox-1.21.1/include/usage.src.h 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/include/usage.src.h 2014-02-17 14:25:39.890534287 +0100 @@ -19,4 +19,80 @@ #define busybox_notes_usage \ "Hello world!\n" @@ -13734,7 +13762,7 @@ diff -Nur busybox-1.21.1.orig/include/usage.src.h busybox-1.21.1/include/usage.s #endif diff -Nur busybox-1.21.1.orig/Makefile busybox-1.21.1/Makefile --- busybox-1.21.1.orig/Makefile 2013-06-29 17:00:18.000000000 +0200 -+++ busybox-1.21.1/Makefile 2013-11-02 15:26:12.000000000 +0100 ++++ busybox-1.21.1/Makefile 2014-02-17 14:25:39.890534287 +0100 @@ -466,6 +466,7 @@ libs-y := \ archival/ \ diff --git a/package/bzr/Makefile b/package/bzr/Makefile index 2875092ab..f1166b02c 100644 --- a/package/bzr/Makefile +++ b/package/bzr/Makefile @@ -4,15 +4,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:= bzr -PKG_VERSION:= 2.5.1 +PKG_VERSION:= 2.6.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= ac5079858364a046071000d5cdccb67b +PKG_MD5SUM:= 28c86653d0df10d202c6b842deb0ea35 PKG_DESCR:= bazaar PKG_SECTION:= scm PKG_BUILDDEP:= python2 PKG_DEPENDS:= python2 PKG_URL:= http://bazaar.canonical.com/en/ -PKG_SITES:= https://launchpad.net/bzr/2.5/2.5.1/+download/ +PKG_SITES:= https://launchpad.net/bzr/2.6/2.6.0/+download/ + +PKG_HOST_DEPENDS:= !darwin include $(TOPDIR)/mk/package.mk diff --git a/package/cups/Makefile b/package/cups/Makefile index f67813494..5c39f054c 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cups PKG_VERSION:= 1.7.1 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 55277c40fd4b7183dc3671d39c5c42b7 PKG_DESCR:= Common Unix Printing System PKG_SECTION:= net/misc @@ -48,7 +48,7 @@ HOST_CONFIGURE_ARGS+= --disable-tcp-wrappers \ --with-components=core \ --with-rcdir=$(STAGING_HOST_DIR)/etc CONFIGURE_ENV+= ac_cv_func_sigset=no \ - OPTIM='-fPIC -std=c89' + OPTIM='-fPIC -std=c89' LSB_BUILD=y CONFIGURE_ARGS+= --with-cups-user=cups \ --with-cups-group=cups \ diff --git a/package/file/Makefile b/package/file/Makefile index 23940a73c..8596d160d 100644 --- a/package/file/Makefile +++ b/package/file/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= file -PKG_VERSION:= 5.15 +PKG_VERSION:= 5.17 PKG_RELEASE:= 1 -PKG_MD5SUM:= 3f99565532f548d7540912c4642d1ede +PKG_MD5SUM:= e19c47e069ced7b01ccb4db402cc01d3 PKG_DESCR:= a file type guesser PKG_SECTION:= utils PKG_BUILDDEP:= file-host diff --git a/package/gdb/patches/patch-gdb_amd64-linux-nat_c b/package/gdb/patches/patch-gdb_amd64-linux-nat_c deleted file mode 100644 index c50f1adf1..000000000 --- a/package/gdb/patches/patch-gdb_amd64-linux-nat_c +++ /dev/null @@ -1,81 +0,0 @@ ---- gdb-7.6.orig/gdb/amd64-linux-nat.c 2013-03-11 09:25:57.000000000 +0100 -+++ gdb-7.6/gdb/amd64-linux-nat.c 2013-10-26 22:30:11.000000000 +0200 -@@ -25,15 +25,13 @@ - #include "regset.h" - #include "linux-nat.h" - #include "amd64-linux-tdep.h" --#include "linux-btrace.h" --#include "btrace.h" - - #include "gdb_assert.h" - #include "gdb_string.h" - #include "elf/common.h" - #include <sys/uio.h> - #include <sys/ptrace.h> --#include <sys/debugreg.h> -+#include "debugreg.h" - #include <sys/syscall.h> - #include <sys/procfs.h> - #include <sys/user.h> -@@ -1121,47 +1119,6 @@ amd64_linux_read_description (struct tar - } - } - --/* Enable branch tracing. */ -- --static struct btrace_target_info * --amd64_linux_enable_btrace (ptid_t ptid) --{ -- struct btrace_target_info *tinfo; -- struct gdbarch *gdbarch; -- -- errno = 0; -- tinfo = linux_enable_btrace (ptid); -- -- if (tinfo == NULL) -- error (_("Could not enable branch tracing for %s: %s."), -- target_pid_to_str (ptid), safe_strerror (errno)); -- -- /* Fill in the size of a pointer in bits. */ -- gdbarch = target_thread_architecture (ptid); -- tinfo->ptr_bits = gdbarch_ptr_bit (gdbarch); -- -- return tinfo; --} -- --/* Disable branch tracing. */ -- --static void --amd64_linux_disable_btrace (struct btrace_target_info *tinfo) --{ -- int errcode = linux_disable_btrace (tinfo); -- -- if (errcode != 0) -- error (_("Could not disable branch tracing: %s."), safe_strerror (errcode)); --} -- --/* Teardown branch tracing. */ -- --static void --amd64_linux_teardown_btrace (struct btrace_target_info *tinfo) --{ -- /* Ignore errors. */ -- linux_disable_btrace (tinfo); --} - - /* Provide a prototype to silence -Wmissing-prototypes. */ - void _initialize_amd64_linux_nat (void); -@@ -1201,13 +1158,6 @@ _initialize_amd64_linux_nat (void) - - t->to_read_description = amd64_linux_read_description; - -- /* Add btrace methods. */ -- t->to_supports_btrace = linux_supports_btrace; -- t->to_enable_btrace = amd64_linux_enable_btrace; -- t->to_disable_btrace = amd64_linux_disable_btrace; -- t->to_teardown_btrace = amd64_linux_teardown_btrace; -- t->to_read_btrace = linux_read_btrace; -- - /* Register the target. */ - linux_nat_add_target (t); - linux_nat_set_new_thread (t, amd64_linux_new_thread); diff --git a/package/gdb/patches/patch-gdb_common_gdb_thread_db_h b/package/gdb/patches/patch-gdb_common_gdb_thread_db_h deleted file mode 100644 index ddcea422f..000000000 --- a/package/gdb/patches/patch-gdb_common_gdb_thread_db_h +++ /dev/null @@ -1,37 +0,0 @@ -* added from https://github.com/rofl0r/sabotage - ---- gdb-7.6.orig/gdb/common/gdb_thread_db.h 2013-01-01 07:32:54.000000000 +0100 -+++ gdb-7.6/gdb/common/gdb_thread_db.h 2013-08-13 16:37:40.000000000 +0200 -@@ -1,17 +1,6 @@ - #ifdef HAVE_THREAD_DB_H - #include <thread_db.h> - --#ifndef LIBTHREAD_DB_SO --#define LIBTHREAD_DB_SO "libthread_db.so.1" --#endif -- --#ifndef LIBTHREAD_DB_SEARCH_PATH --/* $sdir appears before $pdir for some minimal security protection: -- we trust the system libthread_db.so a bit more than some random -- libthread_db associated with whatever libpthread the app is using. */ --#define LIBTHREAD_DB_SEARCH_PATH "$sdir:$pdir" --#endif -- - #else - - /* Copyright (C) 1999-2013 Free Software Foundation, Inc. -@@ -453,3 +442,14 @@ extern td_err_e td_thr_dbresume (const t - #endif /* thread_db.h */ - - #endif /* HAVE_THREAD_DB_H */ -+ -+#ifndef LIBTHREAD_DB_SO -+#define LIBTHREAD_DB_SO "libthread_db.so.1" -+#endif -+ -+#ifndef LIBTHREAD_DB_SEARCH_PATH -+/* $sdir appears before $pdir for some minimal security protection: -+ we trust the system libthread_db.so a bit more than some random -+ libthread_db associated with whatever libpthread the app is using. */ -+#define LIBTHREAD_DB_SEARCH_PATH "$sdir:$pdir" -+#endif diff --git a/package/gdb/patches/patch-gdb_config_i386_linux64_mh b/package/gdb/patches/patch-gdb_config_i386_linux64_mh deleted file mode 100644 index 4db9c518b..000000000 --- a/package/gdb/patches/patch-gdb_config_i386_linux64_mh +++ /dev/null @@ -1,11 +0,0 @@ ---- gdb-7.6.orig/gdb/config/i386/linux64.mh 2013-03-11 09:25:58.000000000 +0100 -+++ gdb-7.6/gdb/config/i386/linux64.mh 2013-09-04 13:19:59.000000000 +0200 -@@ -3,7 +3,7 @@ NATDEPFILES= inf-ptrace.o fork-child.o \ - i386-nat.o amd64-nat.o amd64-linux-nat.o \ - linux-nat.o linux-osdata.o \ - proc-service.o linux-thread-db.o linux-fork.o \ -- linux-procfs.o linux-ptrace.o linux-btrace.o -+ linux-procfs.o linux-ptrace.o - NAT_FILE= config/nm-linux.h - NAT_CDEPS = $(srcdir)/proc-service.list - diff --git a/package/gdb/patches/patch-gdb_config_i386_linux_mh b/package/gdb/patches/patch-gdb_config_i386_linux_mh deleted file mode 100644 index c137b8a0a..000000000 --- a/package/gdb/patches/patch-gdb_config_i386_linux_mh +++ /dev/null @@ -1,12 +0,0 @@ ---- gdb-7.6.orig/gdb/config/i386/linux.mh 2013-03-11 09:25:58.000000000 +0100 -+++ gdb-7.6/gdb/config/i386/linux.mh 2013-09-04 13:19:46.000000000 +0200 -@@ -4,8 +4,7 @@ NAT_FILE= config/nm-linux.h - NATDEPFILES= inf-ptrace.o fork-child.o \ - i386-nat.o i386-linux-nat.o \ - proc-service.o linux-thread-db.o \ -- linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o \ -- linux-btrace.o -+ linux-nat.o linux-osdata.o linux-fork.o linux-procfs.o linux-ptrace.o - NAT_CDEPS = $(srcdir)/proc-service.list - - # The dynamically loaded libthread_db needs access to symbols in the diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index 9f2c1bae9..b160c1d5f 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gnutls -PKG_VERSION:= 3.2.3 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 7c0dd4f77dc70c64d2f385aeb2df4157 +PKG_VERSION:= 3.2.9 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 9ae2bfa55d4c12dd6005cfb7014977f9 PKG_DESCR:= GNU TLS library PKG_SECTION:= crypto PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp diff --git a/package/grub-bin/Makefile b/package/grub-bin/Makefile index b767e616a..7b52cdafa 100644 --- a/package/grub-bin/Makefile +++ b/package/grub-bin/Makefile @@ -10,7 +10,7 @@ PKG_VERSION:= 1.98 PKG_RELEASE:= 2 PKG_MD5SUM:= 50dbe739776f904c318be05faf1d7ce5 PKG_DESCR:= GRUB2 bootloader (binary package) -PKG_SECTION:= base +PKG_SECTION:= boot PKG_SITES:= http://openadk.org/distfiles/ PKG_URL:= http://www.gnu.org/software/grub diff --git a/package/grub/Makefile b/package/grub/Makefile index 4b429c786..cfe17a227 100644 --- a/package/grub/Makefile +++ b/package/grub/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.98 PKG_RELEASE:= 1 PKG_MD5SUM:= c0bcf60e524739bb64e3a2d4e3732a59 PKG_DESCR:= GRUB2 bootloader (source package) -PKG_SECTION:= base +PKG_SECTION:= boot PKG_URL:= http://www.gnu.org/software/grub PKG_SITES:= ftp://alpha.gnu.org/gnu/grub/ diff --git a/package/krb5/Makefile b/package/krb5/Makefile index c20a09ce5..2af556c9e 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -4,16 +4,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:= krb5 -PKG_VERSION:= 1.11.3 -PKG_RELEASE:= 4 -PKG_MD5SUM:= 56f0ae274b285320b8a597cb89442449 +PKG_VERSION:= 1.12.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 524b1067b619cb5bf780759b6884c3f5 PKG_DESCR:= MIT kerberos server PKG_SECTION:= crypto PKG_DEPENDS:= libkrb5 libncurses libss libcom-err keyutils PKG_DEPENDS+= libpthread PKG_BUILDDEP:= ncurses e2fsprogs gettext-tiny bison-host PKG_URL:= http://web.mit.edu/kerberos/ -PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.11/ +PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.12/ PKG_NOPARALLEL:= 1 PKG_LIBNAME:= libkrb5 PKG_OPTS:= dev diff --git a/package/krb5/patches/patch-src_include_k5-int_h b/package/krb5/patches/patch-src_include_k5-int_h index 1c6dd8e05..65bd936e6 100644 --- a/package/krb5/patches/patch-src_include_k5-int_h +++ b/package/krb5/patches/patch-src_include_k5-int_h @@ -1,6 +1,6 @@ ---- krb5-1.11.3.orig/src/include/k5-int.h 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/include/k5-int.h 2013-08-14 14:05:17.000000000 +0200 -@@ -1156,7 +1156,7 @@ void k5_free_pa_otp_challenge(krb5_conte +--- krb5-1.12.1.orig/src/include/k5-int.h 2014-01-16 01:44:15.000000000 +0100 ++++ krb5-1.12.1/src/include/k5-int.h 2014-02-11 18:55:39.000000000 +0100 +@@ -904,7 +904,7 @@ void k5_free_pa_otp_challenge(krb5_conte void k5_free_pa_otp_req(krb5_context context, krb5_pa_otp_req *val); /* #include "krb5/wordsize.h" -- comes in through base-defs.h. */ diff --git a/package/krb5/patches/patch-src_include_osconf_hin b/package/krb5/patches/patch-src_include_osconf_hin deleted file mode 100644 index cd22cccf4..000000000 --- a/package/krb5/patches/patch-src_include_osconf_hin +++ /dev/null @@ -1,21 +0,0 @@ ---- krb5-1.11.3.orig/src/include/osconf.hin 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/include/osconf.hin 2013-08-14 14:05:17.000000000 +0200 -@@ -58,14 +58,14 @@ - #define DEFAULT_PLUGIN_BASE_DIR "@LIBDIR/krb5/plugins" - #define PLUGIN_EXT "@DYNOBJEXT" - --#define DEFAULT_KDB_FILE "@LOCALSTATEDIR/krb5kdc/principal" --#define DEFAULT_KEYFILE_STUB "@LOCALSTATEDIR/krb5kdc/.k5." --#define KRB5_DEFAULT_ADMIN_ACL "@LOCALSTATEDIR/krb5kdc/krb5_adm.acl" -+#define DEFAULT_KDB_FILE "@SYSCONFDIR/krb5kdc/principal" -+#define DEFAULT_KEYFILE_STUB "@SYSCONFDIR/krb5kdc/.k5." -+#define KRB5_DEFAULT_ADMIN_ACL "@SYSCONFDIR/krb5kdc/krb5_adm.acl" - /* Used by old admin server */ - #define DEFAULT_ADMIN_ACL "@LOCALSTATEDIR/krb5kdc/kadm_old.acl" - - /* Location of KDC profile */ --#define DEFAULT_KDC_PROFILE "@LOCALSTATEDIR/krb5kdc/kdc.conf" -+#define DEFAULT_KDC_PROFILE "@SYSCONFDIR/krb5kdc/kdc.conf" - #define KDC_PROFILE_ENV "KRB5_KDC_PROFILE" - - #if TARGET_OS_MAC diff --git a/package/krb5/patches/patch-src_kdc_main_c b/package/krb5/patches/patch-src_kdc_main_c deleted file mode 100644 index 5b2e32607..000000000 --- a/package/krb5/patches/patch-src_kdc_main_c +++ /dev/null @@ -1,10 +0,0 @@ ---- krb5-1.11.3.orig/src/kdc/main.c 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/kdc/main.c 2013-08-14 14:05:17.000000000 +0200 -@@ -34,7 +34,6 @@ - #include <sys/wait.h> - - #include "k5-int.h" --#include "com_err.h" - #include "adm.h" - #include "adm_proto.h" - #include "kdc_util.h" diff --git a/package/krb5/patches/patch-src_krb5-config_in b/package/krb5/patches/patch-src_krb5-config_in deleted file mode 100644 index cfbe7b475..000000000 --- a/package/krb5/patches/patch-src_krb5-config_in +++ /dev/null @@ -1,22 +0,0 @@ ---- krb5-1.11.3.orig/src/krb5-config.in 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/krb5-config.in 2013-08-14 14:05:17.000000000 +0200 -@@ -34,8 +34,6 @@ libdir=@libdir@ - CC_LINK='@CC_LINK@' - KDB5_DB_LIB=@KDB5_DB_LIB@ - LDFLAGS='@LDFLAGS@' --RPATH_FLAG='@RPATH_FLAG@' --PROG_RPATH_FLAGS='@PROG_RPATH_FLAGS@' - PTHREAD_CFLAGS='@PTHREAD_CFLAGS@' - DL_LIB='@DL_LIB@' - DEFCCNAME='@DEFCCNAME@' -@@ -213,10 +211,7 @@ if test -n "$do_libs"; then - # Ugly gross hack for our build tree - lib_flags=`echo $CC_LINK | sed -e 's/\$(CC)//' \ - -e 's/\$(PURE)//' \ -- -e 's#\$(PROG_RPATH_FLAGS)#'"$PROG_RPATH_FLAGS"'#' \ -- -e 's#\$(PROG_RPATH)#'$libdir'#' \ - -e 's#\$(PROG_LIBPATH)#'$libdirarg'#' \ -- -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \ - -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \ - -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \ - -e 's#\$(CFLAGS)##'` diff --git a/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c b/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c index dd47baea6..e29061185 100644 --- a/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c +++ b/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c @@ -1,11 +1,11 @@ ---- krb5-1.11.3.orig/src/lib/kadm5/alt_prof.c 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/lib/kadm5/alt_prof.c 2013-10-09 09:42:35.000000000 +0200 -@@ -164,7 +164,7 @@ krb5_aprof_get_boolean(krb5_pointer acon - char **values; - char *valp; +--- krb5-1.12.1.orig/src/lib/kadm5/alt_prof.c 2014-01-16 01:44:15.000000000 +0100 ++++ krb5-1.12.1/src/lib/kadm5/alt_prof.c 2014-02-11 18:55:39.000000000 +0100 +@@ -155,7 +155,7 @@ krb5_aprof_get_boolean(krb5_pointer acon + krb5_error_code ret; + char **values, *valp; int idx; - krb5_boolean val; + krb5_boolean val = 0; - kret = krb5_aprof_getvals (acontext, hierarchy, &values); - if (kret) + ret = krb5_aprof_getvals(acontext, hierarchy, &values); + if (ret) diff --git a/package/krb5/patches/patch-src_lib_krad_packet_c b/package/krb5/patches/patch-src_lib_krad_packet_c new file mode 100644 index 000000000..71d3c53e1 --- /dev/null +++ b/package/krb5/patches/patch-src_lib_krad_packet_c @@ -0,0 +1,12 @@ +--- krb5-1.12.1.orig/src/lib/krad/packet.c 2014-01-16 01:44:15.000000000 +0100 ++++ krb5-1.12.1/src/lib/krad/packet.c 2014-02-11 19:01:06.000000000 +0100 +@@ -253,8 +253,8 @@ krad_packet_new_request(krb5_context ctx + { + krb5_error_code retval; + krad_packet *pkt; +- uchar id; + size_t attrset_len; ++ uchar id = NULL; + + pkt = packet_new(); + if (pkt == NULL) { diff --git a/package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c b/package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c index a451a2710..f121d4b37 100644 --- a/package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c +++ b/package/krb5/patches/patch-src_lib_krb5_krb_gic_pwd_c @@ -1,5 +1,5 @@ ---- krb5-1.11.3.orig/src/lib/krb5/krb/gic_pwd.c 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/lib/krb5/krb/gic_pwd.c 2013-08-14 14:05:17.000000000 +0200 +--- krb5-1.12.1.orig/src/lib/krb5/krb/gic_pwd.c 2014-01-16 01:44:15.000000000 +0100 ++++ krb5-1.12.1/src/lib/krb5/krb/gic_pwd.c 2014-02-11 18:55:39.000000000 +0100 @@ -1,6 +1,6 @@ /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ #include "k5-int.h" @@ -7,4 +7,4 @@ +#include <et/com_err.h> #include "init_creds_ctx.h" #include "int-proto.h" - + #include "os-proto.h" diff --git a/package/krb5/patches/patch-src_lib_krb5_krb_preauth2_c b/package/krb5/patches/patch-src_lib_krb5_krb_preauth2_c deleted file mode 100644 index c2d8a1a0e..000000000 --- a/package/krb5/patches/patch-src_lib_krb5_krb_preauth2_c +++ /dev/null @@ -1,11 +0,0 @@ ---- krb5-1.11.3.orig/src/lib/krb5/krb/preauth2.c 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/lib/krb5/krb/preauth2.c 2013-10-09 09:30:28.000000000 +0200 -@@ -957,7 +957,7 @@ krb5_do_preauth(krb5_context context, kr - size_t i, h; - int out_pa_list_size = 0; - krb5_pa_data **out_pa_list = NULL; -- krb5_error_code ret, module_ret; -+ krb5_error_code ret, module_ret = 0; - krb5_responder_fn responder = opte->opt_private->responder; - static const int paorder[] = { PA_INFO, PA_REAL }; - diff --git a/package/krb5/patches/patch-src_lib_krb5_krb_sendauth_c b/package/krb5/patches/patch-src_lib_krb5_krb_sendauth_c deleted file mode 100644 index 21f503a99..000000000 --- a/package/krb5/patches/patch-src_lib_krb5_krb_sendauth_c +++ /dev/null @@ -1,11 +0,0 @@ ---- krb5-1.11.3.orig/src/lib/krb5/krb/sendauth.c 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/lib/krb5/krb/sendauth.c 2013-08-14 14:05:18.000000000 +0200 -@@ -25,7 +25,7 @@ - */ - - #include "k5-int.h" --#include "com_err.h" -+#include <et/com_err.h> - #include "auth_con.h" - #include <errno.h> - #include <stdio.h> diff --git a/package/krb5/patches/patch-src_lib_krb5_unicode_ucstr_c b/package/krb5/patches/patch-src_lib_krb5_unicode_ucstr_c deleted file mode 100644 index 1651c4df7..000000000 --- a/package/krb5/patches/patch-src_lib_krb5_unicode_ucstr_c +++ /dev/null @@ -1,11 +0,0 @@ ---- krb5-1.11.3.orig/src/lib/krb5/unicode/ucstr.c 2013-06-03 23:39:43.000000000 +0200 -+++ krb5-1.11.3/src/lib/krb5/unicode/ucstr.c 2013-10-09 09:34:54.000000000 +0200 -@@ -109,7 +109,7 @@ krb5int_utf8_normalize( - krb5_data ** newdataptr, - unsigned flags) - { -- int i, j, len, clen, outpos, ucsoutlen, outsize; -+ int i, j, len, clen, outpos = 0, ucsoutlen, outsize; - char *out = NULL, *outtmp, *s; - krb5_ucs4 *ucs = NULL, *p, *ucsout = NULL; - krb5_data *newdata; diff --git a/package/mc/Makefile b/package/mc/Makefile index 267553653..a4931f94b 100644 --- a/package/mc/Makefile +++ b/package/mc/Makefile @@ -4,17 +4,19 @@ include ${TOPDIR}/rules.mk PKG_NAME:= mc -PKG_VERSION:= 4.7.0.2 -PKG_RELEASE:= 2 -PKG_MD5SUM:= f48b2c8dd140aeb36f59d16a662f0779 +PKG_VERSION:= 4.8.11 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 1a2d74b75ddbff0b0d6cdc04bf4a7d31 PKG_DESCR:= norton commander clone PKG_SECTION:= misc PKG_DEPENDS:= glib libncurses PKG_BUILDDEP:= glib ncurses PKG_URL:= http://www.midnight-commander.org/ -PKG_SITES:= http://openadk.org/distfiles/ +PKG_SITES:= http://ftp.midnight-commander.org/ PKG_NOPARALLEL:= 1 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,MC,mc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) @@ -45,7 +47,7 @@ mc-install: ${INSTALL_DIR} ${IDIR_MC}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/mc ${IDIR_MC}/usr/bin/ cd ${IDIR_MC}/usr/bin && ln -fs mc mcedit && ln -fs mc mcview - cd ${WRKINST}/etc/mc && ${CP} cedit.menu mc.ext \ - mc.lib mc.menu extfs ${IDIR_MC}/etc/mc/ + cd ${WRKINST}/etc/mc && ${CP} mcedit.menu mc.ext \ + mc.menu ${IDIR_MC}/etc/mc/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mc/patches/patch-Makefile_in b/package/mc/patches/patch-Makefile_in deleted file mode 100644 index db881370a..000000000 --- a/package/mc/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- mc-4.7.0.2.orig/Makefile.in 2010-02-02 16:24:55.000000000 +0100 -+++ mc-4.7.0.2/Makefile.in 2010-02-06 00:46:00.203084693 +0100 -@@ -308,7 +308,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = 1.5 --SUBDIRS = intl po lib src doc contrib misc -+SUBDIRS = intl po lib src contrib misc - EXTRA_DIST = - dist_noinst_SCRIPTS = build-glib2.sh - dist_noinst_HEADERS = $(top_srcdir)/version.h diff --git a/package/mc/patches/patch-lib_tty_key_c b/package/mc/patches/patch-lib_tty_key_c new file mode 100644 index 000000000..342eb8657 --- /dev/null +++ b/package/mc/patches/patch-lib_tty_key_c @@ -0,0 +1,18 @@ +--- mc-4.8.11.orig/lib/tty/key.c 2013-11-29 19:27:07.000000000 +0100 ++++ mc-4.8.11/lib/tty/key.c 2014-02-11 20:02:34.000000000 +0100 +@@ -1946,6 +1946,7 @@ int + tty_get_event (struct Gpm_Event *event, gboolean redo_event, gboolean block) + { + int c; ++ static int flag = 0; /* Return value from select */ + #ifdef HAVE_LIBGPM + static struct Gpm_Event ev; /* Mouse event */ + #endif +@@ -1978,7 +1979,6 @@ tty_get_event (struct Gpm_Event *event, + while (pending_keys == NULL) + { + int nfd; +- static int flag = 0; /* Return value from select */ + fd_set select_set; + + FD_ZERO (&select_set); diff --git a/package/mc/patches/patch-lib_tty_tty-ncurses_c b/package/mc/patches/patch-lib_tty_tty-ncurses_c new file mode 100644 index 000000000..5058bd79e --- /dev/null +++ b/package/mc/patches/patch-lib_tty_tty-ncurses_c @@ -0,0 +1,27 @@ +--- mc-4.8.11.orig/lib/tty/tty-ncurses.c 2013-11-29 19:27:07.000000000 +0100 ++++ mc-4.8.11/lib/tty/tty-ncurses.c 2014-02-12 12:40:05.000000000 +0100 +@@ -65,7 +65,7 @@ + + /*** file scope macro definitions ****************************************************************/ + +-#if defined(_AIX) && !defined(CTRL) ++#if !defined(CTRL) + #define CTRL(x) ((x) & 0x1f) + #endif + +@@ -530,6 +530,7 @@ tty_print_anychar (int c) + if (mc_global.utf8_display || c > 255) + { + int res; ++ unsigned char str[UTF8_CHAR_LEN + 1]; + + res = g_unichar_to_utf8 (c, (char *) str); + if (res == 0) +@@ -540,7 +541,6 @@ tty_print_anychar (int c) + } + else + { +- unsigned char str[UTF8_CHAR_LEN + 1]; + const char *s; + + str[res] = '\0'; diff --git a/package/monit/patches/patch-configure b/package/monit/patches/patch-configure new file mode 100644 index 000000000..47c84cd38 --- /dev/null +++ b/package/monit/patches/patch-configure @@ -0,0 +1,11 @@ +--- monit-5.6.orig/configure 2013-09-03 14:55:49.000000000 +0200 ++++ monit-5.6/configure 2014-02-10 18:05:03.000000000 +0100 +@@ -13575,7 +13575,7 @@ fi + # ------------------------------------------------------------------------ + + # Backward compatibility until we get ride of arch settings +-architecture=`uname` ++architecture=Linux + if test "$architecture" = "SunOS" + then + ARCH="SOLARIS" diff --git a/package/mozjs/Makefile b/package/mozjs/Makefile index 3d08b64cf..390df7cf1 100644 --- a/package/mozjs/Makefile +++ b/package/mozjs/Makefile @@ -13,6 +13,8 @@ PKG_BUILDDEP:= bzip2-host python2-host nspr PKG_SITES:= http://ftp.mozilla.org/pub/mozilla.org/js/ PKG_OPTS:= dev +PKG_HOST_DEPENDS:= !darwin + DISTFILES:= ${PKG_NAME}${PKG_VERSION}.tar.gz WRKDIST= ${WRKDIR}/${PKG_NAME}${PKG_VERSION} WRKSRC= ${WRKDIST}/js/src diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 6a756a4a9..09035c248 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -27,6 +27,7 @@ endif TARGET_CPPFLAGS+= -DNOLUA TARGET_LDFLAGS+= -lpthread +CONFIGURE_ENV+= ac_cv_dnet_bsd_bpf=no CONFIGURE_ARGS+= --without-openssl \ --without-zenmap \ --without-ndiff \ diff --git a/package/nmap/patches/patch-liblinear_Makefile b/package/nmap/patches/patch-liblinear_Makefile new file mode 100644 index 000000000..fdb24470d --- /dev/null +++ b/package/nmap/patches/patch-liblinear_Makefile @@ -0,0 +1,16 @@ +--- nmap-6.40.orig/liblinear/Makefile 2011-09-23 23:15:09.000000000 +0200 ++++ nmap-6.40/liblinear/Makefile 2014-02-11 19:38:23.000000000 +0100 +@@ -1,10 +1,10 @@ + CXX ?= g++ + CC ?= gcc +-CFLAGS = -Wall -Wconversion -O3 -fPIC ++CFLAGS ?= -Wall -Wconversion -O3 -fPIC + LIBS = blas/blas.a + SHVER = 1 +-AR = ar +-RANLIB = ranlib ++AR ?= ar ++RANLIB ?= ranlib + #LIBS = -lblas + + all: train predict diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile index 5ea96d0f3..ffc3a188f 100644 --- a/package/openjdk7/Makefile +++ b/package/openjdk7/Makefile @@ -13,10 +13,11 @@ PKG_BUILDDEP:= gettext-tiny-host glib-host flex-host bison-host qemu-host PKG_BUILDDEP+= fastjar-host libICE-host libSM-host libX11-host util-macros-host libXt-host PKG_BUILDDEP+= xineramaproto-host libXinerama-host recordproto-host libXi-host libXtst-host freetype-host PKG_BUILDDEP+= renderproto-host libXrender-host alsa-lib-host libffi-host gcj-host ecj-host jikes-host -PKG_BUILDDEP+= classpath-host jamvm-host ant-host cups-host openjdk7-host +PKG_BUILDDEP+= classpath-host jamvm-host ant-host cups-host openjdk7-host nss PKG_BUILDDEP+= alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups PKG_BUILDDEP+= libX11 libXt libXp libXinerama libXrender libXtst libiconv-tiny -PKG_DEPENDS:= zlib libstdcxx libffi libpthread libxtst libxi libgcc +PKG_DEPENDS:= zlib libstdcxx libffi libpthread libxtst libxi libgcc cups +PKG_DEPENDS+= libfreetype libxrender libx11 libxext libpthread nss PKG_URL:= http://openjdk.org/ PKG_SITES:= http://icedtea.classpath.org/download/source/ @@ -66,6 +67,7 @@ CONFIGURE_COMMON:= --disable-docs \ --with-rmic=$(BOOTSTRAPJDK)/bin/rmic \ --with-native2ascii=$(BOOTSTRAPJDK)/bin/native2ascii \ --with-gcj=$(STAGING_HOST_DIR)/usr/bin/gcj \ + --enable-nss \ --without-hotspot-build \ --disable-system-jpeg \ --disable-system-lcms \ diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch index 75884d124..2d7caa27b 100644 --- a/package/openjdk7/patches/openadk.patch +++ b/package/openjdk7/patches/openadk.patch @@ -3203,8 +3203,8 @@ diff -Nur icedtea-2.4.5.orig/Makefile.in.orig icedtea-2.4.5/Makefile.in.orig +.NOEXPORT: diff -Nur icedtea-2.4.5.orig/patches/openadk.patch icedtea-2.4.5/patches/openadk.patch --- icedtea-2.4.5.orig/patches/openadk.patch 1970-01-01 01:00:00.000000000 +0100 -+++ icedtea-2.4.5/patches/openadk.patch 2014-02-10 18:48:24.000000000 +0100 -@@ -0,0 +1,544 @@ ++++ icedtea-2.4.5/patches/openadk.patch 2014-02-12 12:48:40.000000000 +0100 +@@ -0,0 +1,687 @@ +diff -Nur openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2014-01-28 18:58:08.000000000 +0100 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2014-02-10 11:31:48.000000000 +0100 @@ -3321,6 +3321,19 @@ diff -Nur icedtea-2.4.5.orig/patches/openadk.patch icedtea-2.4.5/patches/openadk + endif + endif + endif ++diff -Nur openjdk.orig/jdk/make/common/Sanity.gmk openjdk/jdk/make/common/Sanity.gmk ++--- openjdk.orig/jdk/make/common/Sanity.gmk 2014-01-28 19:02:26.000000000 +0100 +++++ openjdk/jdk/make/common/Sanity.gmk 2014-02-12 12:28:47.000000000 +0100 ++@@ -91,8 +91,7 @@ ++ sane-ld_run_path \ ++ sane-alt_bootdir \ ++ sane-bootdir \ ++- sane-local-bootdir \ ++- sane-alsa-headers +++ sane-local-bootdir ++ ++ ifdef OPENJDK ++ sanity-all:: sane-freetype +diff -Nur openjdk.orig/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk +--- openjdk.orig/jdk/make/common/shared/Platform.gmk 2014-01-28 19:02:26.000000000 +0100 ++++ openjdk/jdk/make/common/shared/Platform.gmk 2014-02-10 11:32:16.000000000 +0100 @@ -3334,6 +3347,64 @@ diff -Nur icedtea-2.4.5.orig/patches/openadk.patch icedtea-2.4.5/patches/openadk + archExpr = case "$(mach)" in \ + i[3-9]86) \ + echo i586 \ ++diff -Nur openjdk.orig/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk ++--- openjdk.orig/jdk/make/common/shared/Sanity.gmk 2014-01-28 19:02:26.000000000 +0100 +++++ openjdk/jdk/make/common/shared/Sanity.gmk 2014-02-12 12:31:12.000000000 +0100 ++@@ -114,11 +114,6 @@ ++ elif [ -f /etc/lsb-release ] ; then \ ++ $(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's@.*DISTRIB_RELEASE=\(.*\)@\1@'; \ ++ fi) ++- ALSA_INCLUDE=/usr/include/alsa/version.h ++- ALSA_LIBRARY=/usr/lib/libasound.so ++- _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \ ++- $(SED) -e 's@.*"\(.*\)".*@\1@' ) ++- ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION)) ++ endif ++ ++ ifeq ($(PLATFORM), macosx) ++@@ -225,7 +220,6 @@ ++ sane-compiler \ ++ sane-link \ ++ sane-cacerts \ ++- sane-alsa-headers \ ++ sane-ant_version \ ++ sane-zip_version \ ++ sane-unzip_version \ ++@@ -1381,34 +1375,6 @@ ++ endif ++ endif ++ ++-###################################################### ++-# Check that ALSA headers and libs are installed and ++-# that the header has the right version. We only ++-# need /usr/include/alsa/version.h and /usr/lib/libasound.so ++-###################################################### ++- ++-ifdef REQUIRED_ALSA_VERSION ++- ALSA_CHECK := $(call CheckVersions,$(ALSA_VERSION),$(REQUIRED_ALSA_VERSION)) ++-endif ++-sane-alsa-headers: ++-ifdef REQUIRED_ALSA_VERSION ++- @if [ "$(ALSA_CHECK)" != "missing" ] ; then \ ++- if [ "$(ALSA_CHECK)" != "same" -a "$(ALSA_CHECK)" != "newer" ] ; then \ ++- $(ECHO) "ERROR: The ALSA version must be $(REQUIRED_ALSA_VERSION) or higher. \n" \ ++- " You have the following ALSA version installed: $${alsa_version} \n" \ ++- " Please reinstall ALSA (drivers and lib). You can download \n" \ ++- " the source distribution from http://www.alsa-project.org \n" \ ++- " or go to http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \ ++- "" >> $(ERROR_FILE) ; \ ++- fi ; \ ++- else \ ++- $(ECHO) "ERROR: You seem to not have installed ALSA $(REQUIRED_ALSA_VERSION) or higher. \n" \ ++- " Please install ALSA (drivers and lib). You can download the \n" \ ++- " source distribution from http://www.alsa-project.org or go to \n" \ ++- " http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \ ++- "" >> $(ERROR_FILE) ; \ ++- fi ++-endif ++ ++ # If a sanity file doesn't exist, just make sure it's dir exists ++ $(SANITY_FILES): +diff -Nur openjdk.orig/jdk/make/java/instrument/Makefile openjdk/jdk/make/java/instrument/Makefile +--- openjdk.orig/jdk/make/java/instrument/Makefile 2014-01-28 19:02:26.000000000 +0100 ++++ openjdk/jdk/make/java/instrument/Makefile 2014-02-10 11:31:49.000000000 +0100 @@ -3712,13 +3783,85 @@ diff -Nur icedtea-2.4.5.orig/patches/openadk.patch icedtea-2.4.5/patches/openadk + +diff -Nur openjdk-boot.orig/hotspot/make/linux/makefiles/zero.make openjdk-boot/hotspot/make/linux/makefiles/zero.make +--- openjdk-boot.orig/hotspot/make/linux/makefiles/zero.make 2014-01-28 18:58:08.000000000 +0100 -++++ openjdk-boot/hotspot/make/linux/makefiles/zero.make 2014-02-10 18:35:50.000000000 +0100 +++++ openjdk-boot/hotspot/make/linux/makefiles/zero.make 2014-02-11 17:33:53.000000000 +0100 +@@ -33,4 +33,4 @@ + + # Make sure libffi is included + CFLAGS += $(LIBFFI_CFLAGS) +-LIBS_VM += $(LIBFFI_LIBS) ++LIBS_VM += $(FFI_LDFLAGS) -Wl,-Bstatic $(LIBFFI_LIBS) -Wl,-Bdynamic ++diff -Nur openjdk-boot.orig/jdk/make/common/Sanity.gmk openjdk-boot/jdk/make/common/Sanity.gmk ++--- openjdk-boot.orig/jdk/make/common/Sanity.gmk 2014-01-28 19:02:26.000000000 +0100 +++++ openjdk-boot/jdk/make/common/Sanity.gmk 2014-02-11 14:46:04.000000000 +0100 ++@@ -91,8 +91,7 @@ ++ sane-ld_run_path \ ++ sane-alt_bootdir \ ++ sane-bootdir \ ++- sane-local-bootdir \ ++- sane-alsa-headers +++ sane-local-bootdir ++ ++ ifdef OPENJDK ++ sanity-all:: sane-freetype ++diff -Nur openjdk-boot.orig/jdk/make/common/shared/Sanity.gmk openjdk-boot/jdk/make/common/shared/Sanity.gmk ++--- openjdk-boot.orig/jdk/make/common/shared/Sanity.gmk 2014-01-28 19:02:26.000000000 +0100 +++++ openjdk-boot/jdk/make/common/shared/Sanity.gmk 2014-02-11 14:45:37.000000000 +0100 ++@@ -114,11 +114,6 @@ ++ elif [ -f /etc/lsb-release ] ; then \ ++ $(EGREP) DISTRIB_RELEASE /etc/lsb-release | $(SED) -e 's@.*DISTRIB_RELEASE=\(.*\)@\1@'; \ ++ fi) ++- ALSA_INCLUDE=/usr/include/alsa/version.h ++- ALSA_LIBRARY=/usr/lib/libasound.so ++- _ALSA_VERSION := $(shell $(EGREP) SND_LIB_VERSION_STR $(ALSA_INCLUDE) | \ ++- $(SED) -e 's@.*"\(.*\)".*@\1@' ) ++- ALSA_VERSION := $(call GetVersion,$(_ALSA_VERSION)) ++ endif ++ ++ ifeq ($(PLATFORM), macosx) ++@@ -225,7 +220,6 @@ ++ sane-compiler \ ++ sane-link \ ++ sane-cacerts \ ++- sane-alsa-headers \ ++ sane-ant_version \ ++ sane-zip_version \ ++ sane-unzip_version \ ++@@ -1381,35 +1375,6 @@ ++ endif ++ endif ++ ++-###################################################### ++-# Check that ALSA headers and libs are installed and ++-# that the header has the right version. We only ++-# need /usr/include/alsa/version.h and /usr/lib/libasound.so ++-###################################################### ++- ++-ifdef REQUIRED_ALSA_VERSION ++- ALSA_CHECK := $(call CheckVersions,$(ALSA_VERSION),$(REQUIRED_ALSA_VERSION)) ++-endif ++-sane-alsa-headers: ++-ifdef REQUIRED_ALSA_VERSION ++- @if [ "$(ALSA_CHECK)" != "missing" ] ; then \ ++- if [ "$(ALSA_CHECK)" != "same" -a "$(ALSA_CHECK)" != "newer" ] ; then \ ++- $(ECHO) "ERROR: The ALSA version must be $(REQUIRED_ALSA_VERSION) or higher. \n" \ ++- " You have the following ALSA version installed: $${alsa_version} \n" \ ++- " Please reinstall ALSA (drivers and lib). You can download \n" \ ++- " the source distribution from http://www.alsa-project.org \n" \ ++- " or go to http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \ ++- "" >> $(ERROR_FILE) ; \ ++- fi ; \ ++- else \ ++- $(ECHO) "ERROR: You seem to not have installed ALSA $(REQUIRED_ALSA_VERSION) or higher. \n" \ ++- " Please install ALSA (drivers and lib). You can download the \n" \ ++- " source distribution from http://www.alsa-project.org or go to \n" \ ++- " http://www.freshrpms.net/docs/alsa/ for precompiled RPM packages. \n" \ ++- "" >> $(ERROR_FILE) ; \ ++- fi ++-endif ++- ++ # If a sanity file doesn't exist, just make sure it's dir exists ++ $(SANITY_FILES): ++ -@$(prep-target) +diff -Nur openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk openjdk-boot/jdk/make/sun/awt/mawt.gmk +--- openjdk-boot.orig/jdk/make/sun/awt/mawt.gmk 2014-01-28 19:02:26.000000000 +0100 ++++ openjdk-boot/jdk/make/sun/awt/mawt.gmk 2014-02-10 18:28:56.000000000 +0100 diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 284036ece..a56ee80de 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssh -PKG_VERSION:= 6.2p1 +PKG_VERSION:= 6.5p1 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7b2d9dd75b5cf267ea1737ec75500316 +PKG_MD5SUM:= a084e7272b8cbd25afe0f5dce4802fef PKG_DESCR:= OpenSSH PKG_SECTION:= net/security PKG_BUILDDEP:= zlib openssl diff --git a/package/openssh/patches/patch-cipher_c b/package/openssh/patches/patch-cipher_c index e7169b576..059d3cf86 100644 --- a/package/openssh/patches/patch-cipher_c +++ b/package/openssh/patches/patch-cipher_c @@ -1,7 +1,7 @@ diff -Nur openssh-6.2p1.orig/cipher.c openssh-6.2p1/cipher.c ---- openssh-6.2p1.orig/cipher.c 2013-02-12 01:00:35.000000000 +0100 -+++ openssh-6.2p1/cipher.c 2013-08-20 08:56:48.923159083 +0200 -@@ -69,23 +69,33 @@ struct Cipher { +--- openssh-6.5p1.orig/cipher.c 2014-01-25 23:37:26.000000000 +0100 ++++ openssh-6.5p1/cipher.c 2014-02-11 15:26:16.000000000 +0100 +@@ -75,23 +75,33 @@ static const struct Cipher ciphers[] = { { "none", SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null }, { "des", SSH_CIPHER_DES, 8, 8, 0, 0, 0, 1, EVP_des_cbc }, { "3des", SSH_CIPHER_3DES, 8, 16, 0, 0, 0, 1, evp_ssh1_3des }, diff --git a/package/openssh/patches/patch-digest_c b/package/openssh/patches/patch-digest_c new file mode 100644 index 000000000..feead7711 --- /dev/null +++ b/package/openssh/patches/patch-digest_c @@ -0,0 +1,12 @@ +--- openssh-6.5p1.orig/digest.c 2014-01-20 02:41:53.000000000 +0100 ++++ openssh-6.5p1/digest.c 2014-02-11 17:41:23.000000000 +0100 +@@ -44,7 +44,9 @@ struct ssh_digest { + /* NB. Indexed directly by algorithm number */ + const struct ssh_digest digests[] = { + { SSH_DIGEST_MD5, "MD5", 16, EVP_md5 }, ++#ifndef OPENSSL_NO_RIPEMD + { SSH_DIGEST_RIPEMD160, "RIPEMD160", 20, EVP_ripemd160 }, ++#endif + { SSH_DIGEST_SHA1, "SHA1", 20, EVP_sha1 }, + #ifdef HAVE_EVP_SHA256 /* XXX replace with local if missing */ + { SSH_DIGEST_SHA256, "SHA256", 32, EVP_sha256 }, diff --git a/package/openssh/patches/patch-mac_c b/package/openssh/patches/patch-mac_c index df8eac301..7812de4b2 100644 --- a/package/openssh/patches/patch-mac_c +++ b/package/openssh/patches/patch-mac_c @@ -1,7 +1,7 @@ diff -Nur openssh-6.2p1.orig/mac.c openssh-6.2p1/mac.c ---- openssh-6.2p1.orig/mac.c 2012-12-12 01:00:37.000000000 +0100 -+++ openssh-6.2p1/mac.c 2013-08-20 08:56:49.123256567 +0200 -@@ -68,8 +68,10 @@ struct { +--- openssh-6.5p1.orig/mac.c 2014-01-10 00:37:05.000000000 +0100 ++++ openssh-6.5p1/mac.c 2014-02-11 15:26:16.000000000 +0100 +@@ -70,8 +70,10 @@ static const struct macalg macs[] = { #endif { "hmac-md5", SSH_EVP, EVP_md5, 0, 0, 0, 0 }, { "hmac-md5-96", SSH_EVP, EVP_md5, 96, 0, 0, 0 }, @@ -12,7 +12,7 @@ diff -Nur openssh-6.2p1.orig/mac.c openssh-6.2p1/mac.c { "umac-64@openssh.com", SSH_UMAC, NULL, 0, 128, 64, 0 }, { "umac-128@openssh.com", SSH_UMAC128, NULL, 0, 128, 128, 0 }, -@@ -82,7 +84,9 @@ struct { +@@ -84,7 +86,9 @@ static const struct macalg macs[] = { #endif { "hmac-md5-etm@openssh.com", SSH_EVP, EVP_md5, 0, 0, 0, 1 }, { "hmac-md5-96-etm@openssh.com", SSH_EVP, EVP_md5, 96, 0, 0, 1 }, diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 3065611c0..b364b368f 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssl -PKG_VERSION:= 1.0.1e -PKG_RELEASE:= 2 -PKG_MD5SUM:= 66bf6f10f060d561929de96f9dfe5b8c +PKG_VERSION:= 1.0.1f +PKG_RELEASE:= 1 +PKG_MD5SUM:= f26b09c028a0541cab33da697d522b25 PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries PKG_SECTION:= libs PKG_DEPENDS:= zlib diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile index 9222a54ff..e3a5e4ac0 100644 --- a/package/openvpn/Makefile +++ b/package/openvpn/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 06e5f93dbf13f2c19647ca15ffc23ac1 PKG_DESCR:= Open Source VPN solution using SSL PKG_SECTION:= net/security +PKG_BUILDDEP:= autotool PKG_DEPENDS:= kmod-tun ip PKG_URL:= http://openvpn.net/ PKG_SITES:= http://swupdate.openvpn.org/community/releases/ @@ -35,6 +36,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,OPENVPN,openvpn,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf + ifneq ($(ADK_PACKAGE_OPENVPN_WITH_LZO),) CONFIGURE_ARGS+= --enable-lzo else diff --git a/package/openvpn/patches/patch-configure_ac b/package/openvpn/patches/patch-configure_ac new file mode 100644 index 000000000..c0a43dae4 --- /dev/null +++ b/package/openvpn/patches/patch-configure_ac @@ -0,0 +1,31 @@ +--- openvpn-2.3.2.orig/configure.ac 2013-05-31 14:00:25.000000000 +0200 ++++ openvpn-2.3.2/configure.ac 2014-02-15 14:45:30.000000000 +0100 +@@ -353,19 +353,13 @@ AC_PROG_MAKE_SET + + AC_ARG_VAR([IFCONFIG], [full path to ipconfig utility]) + AC_ARG_VAR([ROUTE], [full path to route utility]) +-AC_ARG_VAR([IPROUTE], [full path to ip utility]) + AC_ARG_VAR([NETSTAT], [path to netstat utility]) # tests + AC_ARG_VAR([MAN2HTML], [path to man2html utility]) + AC_ARG_VAR([GIT], [path to git utility]) +-AC_PATH_PROGS([IFCONFIG], [ifconfig],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) +-AC_PATH_PROGS([ROUTE], [route],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) +-AC_PATH_PROGS([IPROUTE], [ip],, [$PATH:/usr/local/sbin:/usr/sbin:/sbin]) + AC_CHECK_PROGS([NETSTAT], [netstat], [netstat], [$PATH:/usr/local/sbin:/usr/sbin:/sbin:/etc]) # tests + AC_CHECK_PROGS([MAN2HTML], [man2html]) + AC_CHECK_PROGS([GIT], [git]) # optional +-AC_DEFINE_UNQUOTED([IFCONFIG_PATH], ["$IFCONFIG"], [Path to ifconfig tool]) +-AC_DEFINE_UNQUOTED([IPROUTE_PATH], ["$IPROUTE"], [Path to iproute tool]) +-AC_DEFINE_UNQUOTED([ROUTE_PATH], ["$ROUTE"], [Path to route tool]) ++AC_DEFINE_UNQUOTED([IPROUTE_PATH], ["/sbin"], [Path to iproute tool]) + + # + # Libtool +@@ -982,7 +976,6 @@ else + fi + + if test "${enable_iproute2}" = "yes"; then +- test -z "${IPROUTE}" && AC_MSG_ERROR([ip utility is required but missing]) + AC_DEFINE([ENABLE_IPROUTE], [1], [enable iproute2 support]) + else + if test "${WIN32}" != "yes"; then diff --git a/package/perl/files/config.sh.mips.eglibc b/package/perl/files/config.sh.mips.eglibc new file mode 100644 index 000000000..3f5ea27a7 --- /dev/null +++ b/package/perl/files/config.sh.mips.eglibc @@ -0,0 +1,1118 @@ +#!/bin/sh +# +# This file was produced by running the Configure script. It holds all the +# definitions figured out by Configure. Should you modify one of these values, +# do not forget to propagate your changes by running "Configure -der". You may +# instead choose to run each of the .SH files by yourself, or "Configure -S". +# + +# Package name : perl5 +# Source directory : . +# Configuration time: Wed Feb 12 19:23:11 CET 2014 +# Configured by : root +# Target system : linux openadk 3.12.6 #1 wed feb 12 14:44:36 cet 2014 mips gnulinux + +: Configure command line arguments. +config_arg0='./Configure' +config_args='-des' +config_argc=1 +config_arg1='-des' + +Author='' +Date='$Date' +Header='' +Id='$Id' +Locker='' +Log='$Log' +RCSfile='$RCSfile' +Revision='$Revision' +Source='' +State='' +_a='.a' +_exe='' +_o='.o' +afs='false' +afsroot='/afs' +alignbytes='8' +ansi2knr='' +aphostname='/bin/hostname' +api_revision='5' +api_subversion='0' +api_version='18' +api_versionstring='5.18.0' +ar='ar' +archlib='/usr/lib/perl5/5.18.1/mips-linux' +archlibexp='/usr/lib/perl5/5.18.1/mips-linux' +archname64='' +archname='mips-linux' +archobjs='' +asctime_r_proto='0' +awk='awk' +baserev='5.0' +bash='' +bin='/usr/bin' +bin_ELF='define' +binexp='/usr/bin' +bison='bison' +bootstrap_charset='undef' +byacc='byacc' +byteorder='4321' +c='' +castflags='0' +cat='cat' +cc='%%CC%%' +cccdlflags='-fPIC' +ccdlflags='-Wl,-E' +ccflags='%%CFLAGS%%' +ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' +ccname='gcc' +ccsymbols='' +ccversion='' +cf_by='root' +cf_email='root@openadk.nonet' +cf_time='Wed Feb 12 19:23:11 CET 2014' +charbits='8' +charsize='1' +chgrp='' +chmod='chmod' +chown='' +clocktype='clock_t' +comm='comm' +compress='' +contains='grep' +cp='cp' +cpio='' +cpp='cpp' +cpp_stuff='42' +cppccsymbols='' +cppflags='%%CPPFLAGS%%' +cpplast='-' +cppminus='-' +cpprun='%%CPP%%' +cppstdin='%%CPP%%' +cppsymbols='LANGUAGE_C=1 MIPSEB=1 R3000=1 _ABIO32=1 _FILE_OFFSET_BITS=64 _LANGUAGE_C=1 _LARGEFILE_SOURCE=1 _MIPSEB=1 _MIPS_ARCH="mips1" _MIPS_ARCH_MIPS1=1 _MIPS_FPSET=16 _MIPS_ISA=_MIPS_ISA_MIPS1 _MIPS_SIM=1 _MIPS_SZINT=32 _MIPS_SZLONG=32 _MIPS_SZPTR=32 _MIPS_TUNE="mips1" _MIPS_TUNE_MIPS1=1 _POSIX_C_SOURCE=200809L _POSIX_SOURCE=1 _R3000=1 __ACCUM_EPSILON__=0x1P-15K __ACCUM_FBIT__=15 __ACCUM_IBIT__=16 __ACCUM_MAX__=0X7FFFFFFFP-15K __ACCUM_MIN__=(-0X1P15K-0X1P15K) __ATOMIC_ACQUIRE=2 __ATOMIC_ACQ_REL=4 __ATOMIC_CONSUME=1 __ATOMIC_RELAXED=0 __ATOMIC_RELEASE=3 __ATOMIC_SEQ_CST=5 __BIGGEST_ALIGNMENT__=8 __BYTE_ORDER__=4321 __CHAR16_TYPE__=short\ unsigned\ int __CHAR32_TYPE__=unsigned\ int __CHAR_BIT__=8 __DA_FBIT__=31 __DA_IBIT__=32 __DBL_DECIMAL_DIG__=17 __DBL_DENORM_MIN__=((double)4.9406564584124654e-324L) __DBL_DIG__=15 __DBL_EPSILON__=((double)2.2204460492503131e-16L) __DBL_HAS_DENORM__=1 __DBL_HAS_INFINITY__=1 __DBL_HAS_QUIET_NAN__=1 __DBL_MANT_DIG__=53 __DBL_MAX_10_EXP__=308 __DBL_MAX_EXP__=1024 __DBL_MAX__=((double)1.7976931348623157e+308L) __DBL_MIN_10_EXP__=(-307) __DBL_MIN_EXP__=(-1021) __DBL_MIN__=((double)2.2250738585072014e-308L) __DEC128_EPSILON__=1E-33DL __DEC128_MANT_DIG__=34 __DEC128_MAX_EXP__=6145 __DEC128_MAX__=9.999999999999999999999999999999999E6144DL __DEC128_MIN_EXP__=(-6142) __DEC128_MIN__=1E-6143DL __DEC128_SUBNORMAL_MIN__=0.000000000000000000000000000000001E-6143DL __DEC32_EPSILON__=1E-6DF __DEC32_MANT_DIG__=7 __DEC32_MAX_EXP__=97 __DEC32_MAX__=9.999999E96DF __DEC32_MIN_EXP__=(-94) __DEC32_MIN__=1E-95DF __DEC32_SUBNORMAL_MIN__=0.000001E-95DF __DEC64_EPSILON__=1E-15DD __DEC64_MANT_DIG__=16 __DEC64_MAX_EXP__=385 __DEC64_MAX__=9.999999999999999E384DD __DEC64_MIN_EXP__=(-382) __DEC64_MIN__=1E-383DD __DEC64_SUBNORMAL_MIN__=0.000000000000001E-383DD __DECIMAL_DIG__=17 __DEC_EVAL_METHOD__=2 __DQ_FBIT__=63 __DQ_IBIT__=0 __ELF__=1 __FINITE_MATH_ONLY__=0 __FLOAT_WORD_ORDER__=4321 __FLT_DECIMAL_DIG__=9 __FLT_DENORM_MIN__=1.4012984643248171e-45F __FLT_DIG__=6 __FLT_EPSILON__=1.1920928955078125e-7F __FLT_EVAL_METHOD__=0 __FLT_HAS_DENORM__=1 __FLT_HAS_INFINITY__=1 __FLT_HAS_QUIET_NAN__=1 __FLT_MANT_DIG__=24 __FLT_MAX_10_EXP__=38 __FLT_MAX_EXP__=128 __FLT_MAX__=3.4028234663852886e+38F __FLT_MIN_10_EXP__=(-37) __FLT_MIN_EXP__=(-125) __FLT_MIN__=1.1754943508222875e-38F __FLT_RADIX__=2 __FRACT_EPSILON__=0x1P-15R __FRACT_FBIT__=15 __FRACT_IBIT__=0 __FRACT_MAX__=0X7FFFP-15R __FRACT_MIN__=(-0.5R-0.5R) __GCC_ATOMIC_BOOL_LOCK_FREE=2 __GCC_ATOMIC_CHAR16_T_LOCK_FREE=2 __GCC_ATOMIC_CHAR32_T_LOCK_FREE=2 __GCC_ATOMIC_CHAR_LOCK_FREE=2 __GCC_ATOMIC_INT_LOCK_FREE=2 __GCC_ATOMIC_LLONG_LOCK_FREE=1 __GCC_ATOMIC_LONG_LOCK_FREE=2 __GCC_ATOMIC_POINTER_LOCK_FREE=2 __GCC_ATOMIC_SHORT_LOCK_FREE=2 __GCC_ATOMIC_TEST_AND_SET_TRUEVAL=1 __GCC_ATOMIC_WCHAR_T_LOCK_FREE=2 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_1=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_2=1 __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4=1 __GLIBC_MINOR__=18 __GLIBC__=2 __GNUC_GNU_INLINE__=1 __GNUC_MINOR__=7 __GNUC_PATCHLEVEL__=3 __GNUC__=4 __GNU_LIBRARY__=6 __GXX_ABI_VERSION=1002 __HA_FBIT__=7 __HA_IBIT__=8 __HQ_FBIT__=15 __HQ_IBIT__=0 __INT16_C=__INT16_C __INT16_MAX__=32767 __INT16_TYPE__=short\ int __INT32_C=__INT32_C __INT32_MAX__=2147483647 __INT32_TYPE__=int __INT64_C=__INT64_C __INT64_MAX__=9223372036854775807LL __INT64_TYPE__=long\ long\ int __INT8_C=__INT8_C __INT8_MAX__=127 __INT8_TYPE__=signed\ char __INTMAX_C=__INTMAX_C __INTMAX_MAX__=9223372036854775807LL __INTMAX_TYPE__=long\ long\ int __INTPTR_MAX__=2147483647 __INTPTR_TYPE__=int __INT_FAST16_MAX__=2147483647 __INT_FAST16_TYPE__=int __INT_FAST32_MAX__=2147483647 __INT_FAST32_TYPE__=int __INT_FAST64_MAX__=9223372036854775807LL __INT_FAST64_TYPE__=long\ long\ int __INT_FAST8_MAX__=127 __INT_FAST8_TYPE__=signed\ char __INT_LEAST16_MAX__=32767 __INT_LEAST16_TYPE__=short\ int __INT_LEAST32_MAX__=2147483647 __INT_LEAST32_TYPE__=int __INT_LEAST64_MAX__=9223372036854775807LL __INT_LEAST64_TYPE__=long\ long\ int __INT_LEAST8_MAX__=127 __INT_LEAST8_TYPE__=signed\ char __INT_MAX__=2147483647 __LACCUM_EPSILON__=0x1P-31LK __LACCUM_FBIT__=31 __LACCUM_IBIT__=32 __LACCUM_MAX__=0X7FFFFFFFFFFFFFFFP-31LK __LACCUM_MIN__=(-0X1P31LK-0X1P31LK) __LANGUAGE_C=1 __LANGUAGE_C__=1 __LDBL_DENORM_MIN__=4.9406564584124654e-324L __LDBL_DIG__=15 __LDBL_EPSILON__=2.2204460492503131e-16L __LDBL_HAS_DENORM__=1 __LDBL_HAS_INFINITY__=1 __LDBL_HAS_QUIET_NAN__=1 __LDBL_MANT_DIG__=53 __LDBL_MAX_10_EXP__=308 __LDBL_MAX_EXP__=1024 __LDBL_MAX__=1.7976931348623157e+308L __LDBL_MIN_10_EXP__=(-307) __LDBL_MIN_EXP__=(-1021) __LDBL_MIN__=2.2250738585072014e-308L __LFRACT_EPSILON__=0x1P-31LR __LFRACT_FBIT__=31 __LFRACT_IBIT__=0 __LFRACT_MAX__=0X7FFFFFFFP-31LR __LFRACT_MIN__=(-0.5LR-0.5LR) __LLACCUM_EPSILON__=0x1P-31LLK __LLACCUM_FBIT__=31 __LLACCUM_IBIT__=32 __LLACCUM_MAX__=0X7FFFFFFFFFFFFFFFP-31LLK __LLACCUM_MIN__=(-0X1P31LLK-0X1P31LLK) __LLFRACT_EPSILON__=0x1P-63LLR __LLFRACT_FBIT__=63 __LLFRACT_IBIT__=0 __LLFRACT_MAX__=0X7FFFFFFFFFFFFFFFP-63LLR __LLFRACT_MIN__=(-0.5LLR-0.5LLR) __LONG_LONG_MAX__=9223372036854775807LL __LONG_MAX__=2147483647L __MIPSEB=1 __MIPSEB__=1 __ORDER_BIG_ENDIAN__=4321 __ORDER_LITTLE_ENDIAN__=1234 __ORDER_PDP_ENDIAN__=3412 __PIC__=1 __PRAGMA_REDEFINE_EXTNAME=1 __PTRDIFF_MAX__=2147483647 __PTRDIFF_TYPE__=int __QQ_FBIT__=7 __QQ_IBIT__=0 __R3000=1 __R3000__=1 __REGISTER_PREFIX__= __SACCUM_EPSILON__=0x1P-7HK __SACCUM_FBIT__=7 __SACCUM_IBIT__=8 __SACCUM_MAX__=0X7FFFP-7HK __SACCUM_MIN__=(-0X1P7HK-0X1P7HK) __SA_FBIT__=15 __SA_IBIT__=16 __SCHAR_MAX__=127 __SFRACT_EPSILON__=0x1P-7HR __SFRACT_FBIT__=7 __SFRACT_IBIT__=0 __SFRACT_MAX__=0X7FP-7HR __SFRACT_MIN__=(-0.5HR-0.5HR) __SHRT_MAX__=32767 __SIG_ATOMIC_MAX__=2147483647 __SIG_ATOMIC_MIN__=(-2147483647\ -\ 1) __SIG_ATOMIC_TYPE__=int __SIZEOF_DOUBLE__=8 __SIZEOF_FLOAT__=4 __SIZEOF_INT__=4 __SIZEOF_LONG_DOUBLE__=8 __SIZEOF_LONG_LONG__=8 __SIZEOF_LONG__=4 __SIZEOF_POINTER__=4 __SIZEOF_PTRDIFF_T__=4 __SIZEOF_SHORT__=2 __SIZEOF_SIZE_T__=4 __SIZEOF_WCHAR_T__=4 __SIZEOF_WINT_T__=4 __SIZE_MAX__=4294967295U __SIZE_TYPE__=unsigned\ int __SQ_FBIT__=31 __SQ_IBIT__=0 __STDC_HOSTED__=1 __STDC__=1 __TA_FBIT__=63 __TA_IBIT__=64 __TQ_FBIT__=127 __TQ_IBIT__=0 __UACCUM_EPSILON__=0x1P-16UK __UACCUM_FBIT__=16 __UACCUM_IBIT__=16 __UACCUM_MAX__=0XFFFFFFFFP-16UK __UACCUM_MIN__=0.0UK __UDA_FBIT__=32 __UDA_IBIT__=32 __UDQ_FBIT__=64 __UDQ_IBIT__=0 __UFRACT_EPSILON__=0x1P-16UR __UFRACT_FBIT__=16 __UFRACT_IBIT__=0 __UFRACT_MAX__=0XFFFFP-16UR __UFRACT_MIN__=0.0UR __UHA_FBIT__=8 __UHA_IBIT__=8 __UHQ_FBIT__=16 __UHQ_IBIT__=0 __UINT16_C=__UINT16_C __UINT16_MAX__=65535 __UINT16_TYPE__=short\ unsigned\ int __UINT32_C=__UINT32_C __UINT32_MAX__=4294967295U __UINT32_TYPE__=unsigned\ int __UINT64_C=__UINT64_C __UINT64_MAX__=18446744073709551615ULL __UINT64_TYPE__=long\ long\ unsigned\ int __UINT8_C=__UINT8_C __UINT8_MAX__=255 __UINT8_TYPE__=unsigned\ char __UINTMAX_C=__UINTMAX_C __UINTMAX_MAX__=18446744073709551615ULL __UINTMAX_TYPE__=long\ long\ unsigned\ int __UINTPTR_MAX__=4294967295U __UINTPTR_TYPE__=unsigned\ int __UINT_FAST16_MAX__=4294967295U __UINT_FAST16_TYPE__=unsigned\ int __UINT_FAST32_MAX__=4294967295U __UINT_FAST32_TYPE__=unsigned\ int __UINT_FAST64_MAX__=18446744073709551615ULL __UINT_FAST64_TYPE__=long\ long\ unsigned\ int __UINT_FAST8_MAX__=255 __UINT_FAST8_TYPE__=unsigned\ char __UINT_LEAST16_MAX__=65535 __UINT_LEAST16_TYPE__=short\ unsigned\ int __UINT_LEAST32_MAX__=4294967295U __UINT_LEAST32_TYPE__=unsigned\ int __UINT_LEAST64_MAX__=18446744073709551615ULL __UINT_LEAST64_TYPE__=long\ long\ unsigned\ int __UINT_LEAST8_MAX__=255 __UINT_LEAST8_TYPE__=unsigned\ char __ULACCUM_EPSILON__=0x1P-32ULK __ULACCUM_FBIT__=32 __ULACCUM_IBIT__=32 __ULACCUM_MAX__=0XFFFFFFFFFFFFFFFFP-32ULK __ULACCUM_MIN__=0.0ULK __ULFRACT_EPSILON__=0x1P-32ULR __ULFRACT_FBIT__=32 __ULFRACT_IBIT__=0 __ULFRACT_MAX__=0XFFFFFFFFP-32ULR __ULFRACT_MIN__=0.0ULR __ULLACCUM_EPSILON__=0x1P-32ULLK __ULLACCUM_FBIT__=32 __ULLACCUM_IBIT__=32 __ULLACCUM_MAX__=0XFFFFFFFFFFFFFFFFP-32ULLK __ULLACCUM_MIN__=0.0ULLK __ULLFRACT_EPSILON__=0x1P-64ULLR __ULLFRACT_FBIT__=64 __ULLFRACT_IBIT__=0 __ULLFRACT_MAX__=0XFFFFFFFFFFFFFFFFP-64ULLR __ULLFRACT_MIN__=0.0ULLR __UQQ_FBIT__=8 __UQQ_IBIT__=0 __USACCUM_EPSILON__=0x1P-8UHK __USACCUM_FBIT__=8 __USACCUM_IBIT__=8 __USACCUM_MAX__=0XFFFFP-8UHK __USACCUM_MIN__=0.0UHK __USA_FBIT__=16 __USA_IBIT__=16 __USER_LABEL_PREFIX__= __USE_BSD=1 __USE_FILE_OFFSET64=1 __USE_LARGEFILE=1 __USE_MISC=1 __USE_POSIX199309=1 __USE_POSIX199506=1 __USE_POSIX2=1 __USE_POSIX=1 __USE_SVID=1 __USFRACT_EPSILON__=0x1P-8UHR __USFRACT_FBIT__=8 __USFRACT_IBIT__=0 __USFRACT_MAX__=0XFFP-8UHR __USFRACT_MIN__=0.0UHR __USQ_FBIT__=32 __USQ_IBIT__=0 __UTA_FBIT__=64 __UTA_IBIT__=64 __UTQ_FBIT__=128 __UTQ_IBIT__=0 __VERSION__="4.7.3" __WCHAR_MAX__=2147483647 __WCHAR_MIN__=(-2147483647\ -\ 1) __WCHAR_TYPE__=int __WINT_MAX__=4294967295U __WINT_MIN__=0U __WINT_TYPE__=unsigned\ int __gnu_linux__=1 __linux=1 __linux__=1 __mips=1 __mips__=1 __mips_abicalls=1 __mips_fpr=32 __mips_hard_float=1 __pic__=1 __unix=1 __unix__=1 _mips=1 linux=1 mips=1 unix=1' +crypt_r_proto='0' +cryptlib='' +csh='csh' +ctermid_r_proto='0' +ctime_r_proto='0' +d_Gconvert='gcvt((x),(n),(b))' +d_PRIEUldbl='define' +d_PRIFUldbl='define' +d_PRIGUldbl='define' +d_PRIXU64='define' +d_PRId64='define' +d_PRIeldbl='define' +d_PRIfldbl='define' +d_PRIgldbl='define' +d_PRIi64='define' +d_PRIo64='define' +d_PRIu64='define' +d_PRIx64='define' +d_SCNfldbl='define' +d__fwalk='undef' +d_access='define' +d_accessx='undef' +d_aintl='undef' +d_alarm='define' +d_archlib='define' +d_asctime64='undef' +d_asctime_r='undef' +d_atolf='undef' +d_atoll='define' +d_attribute_deprecated='define' +d_attribute_format='define' +d_attribute_malloc='define' +d_attribute_nonnull='define' +d_attribute_noreturn='define' +d_attribute_pure='define' +d_attribute_unused='define' +d_attribute_warn_unused_result='define' +d_bcmp='define' +d_bcopy='define' +d_bsd='undef' +d_bsdgetpgrp='undef' +d_bsdsetpgrp='undef' +d_builtin_choose_expr='define' +d_builtin_expect='define' +d_bzero='define' +d_c99_variadic_macros='define' +d_casti32='define' +d_castneg='define' +d_charvspr='undef' +d_chown='define' +d_chroot='define' +d_chsize='undef' +d_class='undef' +d_clearenv='define' +d_closedir='define' +d_cmsghdr_s='define' +d_const='define' +d_copysignl='define' +d_cplusplus='undef' +d_crypt='define' +d_crypt_r='undef' +d_csh='undef' +d_ctermid='define' +d_ctermid_r='undef' +d_ctime64='undef' +d_ctime_r='undef' +d_cuserid='define' +d_dbl_dig='define' +d_dbminitproto='undef' +d_difftime64='undef' +d_difftime='define' +d_dir_dd_fd='undef' +d_dirfd='define' +d_dirnamlen='undef' +d_dlerror='define' +d_dlopen='define' +d_dlsymun='undef' +d_dosuid='undef' +d_drand48_r='undef' +d_drand48proto='define' +d_dup2='define' +d_eaccess='define' +d_endgrent='define' +d_endgrent_r='undef' +d_endhent='define' +d_endhostent_r='undef' +d_endnent='define' +d_endnetent_r='undef' +d_endpent='define' +d_endprotoent_r='undef' +d_endpwent='define' +d_endpwent_r='undef' +d_endsent='define' +d_endservent_r='undef' +d_eofnblk='define' +d_eunice='undef' +d_faststdio='define' +d_fchdir='define' +d_fchmod='define' +d_fchown='define' +d_fcntl='define' +d_fcntl_can_lock='define' +d_fd_macros='define' +d_fd_set='define' +d_fds_bits='undef' +d_fgetpos='define' +d_finite='define' +d_finitel='define' +d_flexfnam='define' +d_flock='define' +d_flockproto='define' +d_fork='define' +d_fp_class='undef' +d_fpathconf='define' +d_fpclass='undef' +d_fpclassify='undef' +d_fpclassl='undef' +d_fpos64_t='undef' +d_frexpl='define' +d_fs_data_s='undef' +d_fseeko='define' +d_fsetpos='define' +d_fstatfs='define' +d_fstatvfs='define' +d_fsync='define' +d_ftello='define' +d_ftime='undef' +d_futimes='define' +d_gdbm_ndbm_h_uses_prototypes='undef' +d_gdbmndbm_h_uses_prototypes='undef' +d_getaddrinfo='define' +d_getcwd='define' +d_getespwnam='undef' +d_getfsstat='undef' +d_getgrent='define' +d_getgrent_r='undef' +d_getgrgid_r='undef' +d_getgrnam_r='undef' +d_getgrps='define' +d_gethbyaddr='define' +d_gethbyname='define' +d_gethent='define' +d_gethname='define' +d_gethostbyaddr_r='undef' +d_gethostbyname_r='undef' +d_gethostent_r='undef' +d_gethostprotos='define' +d_getitimer='define' +d_getlogin='define' +d_getlogin_r='undef' +d_getmnt='undef' +d_getmntent='define' +d_getnameinfo='define' +d_getnbyaddr='define' +d_getnbyname='define' +d_getnent='define' +d_getnetbyaddr_r='undef' +d_getnetbyname_r='undef' +d_getnetent_r='undef' +d_getnetprotos='define' +d_getpagsz='define' +d_getpbyname='define' +d_getpbynumber='define' +d_getpent='define' +d_getpgid='define' +d_getpgrp2='undef' +d_getpgrp='define' +d_getppid='define' +d_getprior='define' +d_getprotobyname_r='undef' +d_getprotobynumber_r='undef' +d_getprotoent_r='undef' +d_getprotoprotos='define' +d_getprpwnam='undef' +d_getpwent='define' +d_getpwent_r='undef' +d_getpwnam_r='undef' +d_getpwuid_r='undef' +d_getsbyname='define' +d_getsbyport='define' +d_getsent='define' +d_getservbyname_r='undef' +d_getservbyport_r='undef' +d_getservent_r='undef' +d_getservprotos='define' +d_getspnam='define' +d_getspnam_r='undef' +d_gettimeod='define' +d_gmtime64='undef' +d_gmtime_r='undef' +d_gnulibc='define' +d_grpasswd='define' +d_hasmntopt='define' +d_htonl='define' +d_ilogbl='define' +d_inc_version_list='undef' +d_index='undef' +d_inetaton='define' +d_inetntop='define' +d_inetpton='define' +d_int64_t='define' +d_ip_mreq='define' +d_ip_mreq_source='define' +d_ipv6_mreq='define' +d_ipv6_mreq_source='undef' +d_isascii='define' +d_isblank='define' +d_isfinite='undef' +d_isinf='define' +d_isnan='define' +d_isnanl='define' +d_killpg='define' +d_lchown='define' +d_ldbl_dig='define' +d_libm_lib_version='define' +d_link='define' +d_localtime64='undef' +d_localtime_r='undef' +d_localtime_r_needs_tzset='undef' +d_locconv='define' +d_lockf='define' +d_longdbl='define' +d_longlong='define' +d_lseekproto='define' +d_lstat='define' +d_madvise='define' +d_malloc_good_size='undef' +d_malloc_size='undef' +d_mblen='define' +d_mbstowcs='define' +d_mbtowc='define' +d_memchr='define' +d_memcmp='define' +d_memcpy='define' +d_memmove='define' +d_memset='define' +d_mkdir='define' +d_mkdtemp='define' +d_mkfifo='define' +d_mkstemp='define' +d_mkstemps='define' +d_mktime64='undef' +d_mktime='define' +d_mmap='define' +d_modfl='define' +d_modfl_pow32_bug='undef' +d_modflproto='define' +d_mprotect='define' +d_msg='define' +d_msg_ctrunc='define' +d_msg_dontroute='define' +d_msg_oob='define' +d_msg_peek='define' +d_msg_proxy='define' +d_msgctl='define' +d_msgget='define' +d_msghdr_s='define' +d_msgrcv='define' +d_msgsnd='define' +d_msync='define' +d_munmap='define' +d_mymalloc='undef' +d_ndbm='undef' +d_ndbm_h_uses_prototypes='undef' +d_nice='define' +d_nl_langinfo='define' +d_nv_preserves_uv='define' +d_nv_zero_is_allbits_zero='define' +d_off64_t='undef' +d_old_pthread_create_joinable='undef' +d_oldpthreads='undef' +d_oldsock='undef' +d_open3='define' +d_pathconf='define' +d_pause='define' +d_perl_otherlibdirs='undef' +d_phostname='undef' +d_pipe='define' +d_poll='define' +d_portable='define' +d_prctl='define' +d_prctl_set_name='define' +d_printf_format_null='define' +d_procselfexe='undef' +d_pseudofork='undef' +d_pthread_atfork='undef' +d_pthread_attr_setscope='define' +d_pthread_yield='undef' +d_pwage='undef' +d_pwchange='undef' +d_pwclass='undef' +d_pwcomment='undef' +d_pwexpire='undef' +d_pwgecos='define' +d_pwpasswd='define' +d_pwquota='undef' +d_qgcvt='define' +d_quad='define' +d_random_r='undef' +d_readdir64_r='undef' +d_readdir='define' +d_readdir_r='undef' +d_readlink='define' +d_readv='define' +d_recvmsg='define' +d_rename='define' +d_rewinddir='define' +d_rmdir='define' +d_safebcpy='undef' +d_safemcpy='undef' +d_sanemcmp='define' +d_sbrkproto='define' +d_scalbnl='define' +d_sched_yield='define' +d_scm_rights='define' +d_seekdir='define' +d_select='define' +d_sem='define' +d_semctl='define' +d_semctl_semid_ds='define' +d_semctl_semun='define' +d_semget='define' +d_semop='define' +d_sendmsg='define' +d_setegid='define' +d_seteuid='define' +d_setgrent='define' +d_setgrent_r='undef' +d_setgrps='define' +d_sethent='define' +d_sethostent_r='undef' +d_setitimer='define' +d_setlinebuf='define' +d_setlocale='define' +d_setlocale_r='undef' +d_setnent='define' +d_setnetent_r='undef' +d_setpent='define' +d_setpgid='define' +d_setpgrp2='undef' +d_setpgrp='define' +d_setprior='define' +d_setproctitle='undef' +d_setprotoent_r='undef' +d_setpwent='define' +d_setpwent_r='undef' +d_setregid='define' +d_setresgid='define' +d_setresuid='define' +d_setreuid='define' +d_setrgid='undef' +d_setruid='undef' +d_setsent='define' +d_setservent_r='undef' +d_setsid='define' +d_setvbuf='define' +d_sfio='undef' +d_shm='define' +d_shmat='define' +d_shmatprototype='define' +d_shmctl='define' +d_shmdt='define' +d_shmget='define' +d_sigaction='define' +d_signbit='define' +d_sigprocmask='define' +d_sigsetjmp='define' +d_sin6_scope_id='define' +d_sitearch='define' +d_snprintf='define' +d_sockaddr_in6='define' +d_sockaddr_sa_len='undef' +d_sockatmark='define' +d_sockatmarkproto='define' +d_socket='define' +d_socklen_t='define' +d_sockpair='define' +d_socks5_init='undef' +d_sprintf_returns_strlen='define' +d_sqrtl='define' +d_srand48_r='undef' +d_srandom_r='undef' +d_sresgproto='undef' +d_sresuproto='undef' +d_statblks='define' +d_statfs_f_flags='define' +d_statfs_s='define' +d_static_inline='define' +d_statvfs='define' +d_stdio_cnt_lval='undef' +d_stdio_ptr_lval='define' +d_stdio_ptr_lval_nochange_cnt='undef' +d_stdio_ptr_lval_sets_cnt='define' +d_stdio_stream_array='undef' +d_stdiobase='define' +d_stdstdio='define' +d_strchr='define' +d_strcoll='define' +d_strctcpy='define' +d_strerrm='strerror(e)' +d_strerror='define' +d_strerror_r='undef' +d_strftime='define' +d_strlcat='undef' +d_strlcpy='undef' +d_strtod='define' +d_strtol='define' +d_strtold='define' +d_strtoll='define' +d_strtoq='define' +d_strtoul='define' +d_strtoull='define' +d_strtouq='define' +d_strxfrm='define' +d_suidsafe='undef' +d_symlink='define' +d_syscall='define' +d_syscallproto='define' +d_sysconf='define' +d_sysernlst='' +d_syserrlst='define' +d_system='define' +d_tcgetpgrp='define' +d_tcsetpgrp='define' +d_telldir='define' +d_telldirproto='define' +d_time='define' +d_timegm='define' +d_times='define' +d_tm_tm_gmtoff='define' +d_tm_tm_zone='define' +d_tmpnam_r='undef' +d_truncate='define' +d_ttyname_r='undef' +d_tzname='define' +d_u32align='undef' +d_ualarm='define' +d_umask='define' +d_uname='define' +d_union_semun='undef' +d_unordered='undef' +d_unsetenv='define' +d_usleep='define' +d_usleepproto='define' +d_ustat='define' +d_vendorarch='undef' +d_vendorbin='undef' +d_vendorlib='undef' +d_vendorscript='undef' +d_vfork='undef' +d_void_closedir='undef' +d_voidsig='define' +d_voidtty='' +d_volatile='define' +d_vprintf='define' +d_vsnprintf='define' +d_wait4='define' +d_waitpid='define' +d_wcstombs='define' +d_wctomb='define' +d_writev='define' +d_xenix='undef' +date='date' +db_hashtype='u_int32_t' +db_prefixtype='size_t' +db_version_major='' +db_version_minor='' +db_version_patch='' +defvoidused='15' +direntrytype='struct dirent' +dlext='so' +dlsrc='dl_dlopen.xs' +doublesize='8' +drand01='drand48()' +drand48_r_proto='0' +dtrace='' +dynamic_ext='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared' +eagain='EAGAIN' +ebcdic='undef' +echo='echo' +egrep='egrep' +emacs='' +endgrent_r_proto='0' +endhostent_r_proto='0' +endnetent_r_proto='0' +endprotoent_r_proto='0' +endpwent_r_proto='0' +endservent_r_proto='0' +eunicefix=':' +exe_ext='' +expr='expr' +extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize XS/APItest XS/Typemap arybase attributes mro re threads threads/shared Archive/Extract Archive/Tar Attribute/Handlers AutoLoader B/Debug B/Deparse B/Lint CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML CPANPLUS CPANPLUS/Dist/Build Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/ParseXS File/CheckTree File/Fetch File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Log/Message Log/Message/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata Module/Pluggable NEXT Net/Ping Object/Accessor Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/LaTeX Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Term/UI Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings if lib libnet parent perlfaq podlators' +extern_C='extern' +extras='' +fflushNULL='define' +fflushall='undef' +find='' +firstmakefile='makefile' +flex='' +fpossize='16' +fpostype='fpos_t' +freetype='void' +from=':' +full_ar='%%AR%%' +full_csh='csh' +full_sed='/bin/sed' +gccansipedantic='' +gccosandvers='' +gccversion='4.7.3' +getgrent_r_proto='0' +getgrgid_r_proto='0' +getgrnam_r_proto='0' +gethostbyaddr_r_proto='0' +gethostbyname_r_proto='0' +gethostent_r_proto='0' +getlogin_r_proto='0' +getnetbyaddr_r_proto='0' +getnetbyname_r_proto='0' +getnetent_r_proto='0' +getprotobyname_r_proto='0' +getprotobynumber_r_proto='0' +getprotoent_r_proto='0' +getpwent_r_proto='0' +getpwnam_r_proto='0' +getpwuid_r_proto='0' +getservbyname_r_proto='0' +getservbyport_r_proto='0' +getservent_r_proto='0' +getspnam_r_proto='0' +gidformat='"lu"' +gidsign='1' +gidsize='4' +gidtype='gid_t' +glibpth='/usr/shlib /lib /usr/lib /usr/lib/386 /lib/386 /usr/ccs/lib /usr/ucblib /usr/local/lib ' +gmake='gmake' +gmtime_r_proto='0' +gnulibc_version='2.18' +grep='grep' +groupcat='cat /etc/group' +groupstype='gid_t' +gzip='gzip' +h_fcntl='false' +h_sysfile='true' +hint='recommended' +hostcat='cat /etc/hosts' +html1dir=' ' +html1direxp='' +html3dir=' ' +html3direxp='' +i16size='2' +i16type='short' +i32size='4' +i32type='long' +i64size='8' +i64type='long long' +i8size='1' +i8type='signed char' +i_arpainet='define' +i_assert='define' +i_bsdioctl='' +i_crypt='define' +i_db='undef' +i_dbm='undef' +i_dirent='define' +i_dld='undef' +i_dlfcn='define' +i_fcntl='undef' +i_float='define' +i_fp='undef' +i_fp_class='undef' +i_gdbm='undef' +i_gdbm_ndbm='undef' +i_gdbmndbm='undef' +i_grp='define' +i_ieeefp='undef' +i_inttypes='define' +i_langinfo='define' +i_libutil='undef' +i_limits='define' +i_locale='define' +i_machcthr='undef' +i_malloc='define' +i_mallocmalloc='undef' +i_math='define' +i_memory='undef' +i_mntent='define' +i_ndbm='undef' +i_netdb='define' +i_neterrno='undef' +i_netinettcp='define' +i_niin='define' +i_poll='define' +i_prot='undef' +i_pthread='define' +i_pwd='define' +i_rpcsvcdbm='undef' +i_sfio='undef' +i_sgtty='undef' +i_shadow='define' +i_socks='undef' +i_stdarg='define' +i_stdbool='define' +i_stddef='define' +i_stdlib='define' +i_string='define' +i_sunmath='undef' +i_sysaccess='undef' +i_sysdir='define' +i_sysfile='define' +i_sysfilio='undef' +i_sysin='undef' +i_sysioctl='define' +i_syslog='define' +i_sysmman='define' +i_sysmode='undef' +i_sysmount='define' +i_sysndir='undef' +i_sysparam='define' +i_syspoll='define' +i_sysresrc='define' +i_syssecrt='undef' +i_sysselct='define' +i_syssockio='undef' +i_sysstat='define' +i_sysstatfs='define' +i_sysstatvfs='define' +i_systime='define' +i_systimek='undef' +i_systimes='define' +i_systypes='define' +i_sysuio='define' +i_sysun='define' +i_sysutsname='define' +i_sysvfs='define' +i_syswait='define' +i_termio='undef' +i_termios='define' +i_time='define' +i_unistd='define' +i_ustat='define' +i_utime='define' +i_values='define' +i_varargs='undef' +i_varhdr='stdarg.h' +i_vfork='undef' +ignore_versioned_solibs='y' +inc_version_list=' ' +inc_version_list_init='0' +incpath='' +inews='' +initialinstalllocation='/usr/bin' +installarchlib='/usr/lib/perl5/5.18.1/mips-linux' +installbin='/usr/bin' +installhtml1dir='' +installhtml3dir='' +installman1dir='' +installman3dir='' +installprefix='/usr' +installprefixexp='/usr' +installprivlib='/usr/lib/perl5/5.18.1' +installscript='/usr/bin' +installsitearch='/usr/lib/perl5/site_perl/5.18.1/mips-linux' +installsitebin='/usr/bin' +installsitehtml1dir='' +installsitehtml3dir='' +installsitelib='/usr/lib/perl5/site_perl/5.18.1' +installsiteman1dir='' +installsiteman3dir='' +installsitescript='/usr/bin' +installstyle='lib/perl5' +installusrbinperl='undef' +installvendorarch='' +installvendorbin='' +installvendorhtml1dir='' +installvendorhtml3dir='' +installvendorlib='' +installvendorman1dir='' +installvendorman3dir='' +installvendorscript='' +intsize='4' +issymlink='test -h' +ivdformat='"ld"' +ivsize='4' +ivtype='long' +known_extensions='B Compress/Raw/Bzip2 Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/DosGlob File/Glob Filter/Util/Call GDBM_File Hash/Util Hash/Util/FieldHash I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/mmap PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Tie/Hash/NamedCapture Time/HiRes Time/Piece Unicode/Collate Unicode/Normalize VMS/DCLsym VMS/Stdio Win32 Win32API/File Win32CORE XS/APItest XS/Typemap arybase attributes mro re threads threads/shared ' +ksh='' +ld='%%LD%%' +ld_can_script='define' +lddlflags='-shared %%LDFLAGS%%' +ldflags='%%LDFLAGS%%' +ldflags_uselargefiles='' +ldlibpthname='LD_LIBRARY_PATH' +less='less' +lib_ext='.a' +libc='' +libperl='libperl.a' +libpth='%%LIBDIRS%%' +libs='-ldl -lm -lcrypt -lutil -lc' +libsdirs='%%LIBDIRS%%' +libsfiles=' libdl.so libm.so libcrypt.so libutil.so libc.so' +#libsfound=' /lib/libdl.so /lib/libm.so /lib/libcrypt.so /lib/libutil.so /usr/lib/libc.so' +libspath='%%LIBDIRS%%' +libswanted='sfio socket inet nm ndbm gdbm dbm db malloc dl dld ld sun m crypt sec util c cposix posix ucb BSD gdbm_compat' +libswanted_uselargefiles='' +line='' +lint='' +lkflags='' +ln='ln' +lns='/bin/ln -s' +localtime_r_proto='0' +locincpth='/usr/local/include /opt/local/include /usr/gnu/include /opt/gnu/include /usr/GNU/include /opt/GNU/include' +loclibpth='/usr/local/lib /opt/local/lib /usr/gnu/lib /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib' +longdblsize='8' +longlongsize='8' +longsize='4' +lp='' +lpr='' +ls='ls' +lseeksize='8' +lseektype='off_t' +mad='undef' +madlyh='' +madlyobj='' +madlysrc='' +mail='' +mailx='' +make='make' +make_set_make='#' +mallocobj='' +mallocsrc='' +malloctype='void *' +man1dir=' ' +man1direxp='' +man1ext='0' +man3dir=' ' +man3direxp='' +man3ext='0' +mips_type='' +mistrustnm='' +mkdir='mkdir' +mmaptype='void *' +modetype='mode_t' +more='more' +multiarch='undef' +mv='' +myarchname='mips-linux' +mydomain='.nonet' +myhostname='openadk' +myuname='linux openadk 3.12.6 #1 wed feb 12 14:44:36 cet 2014 mips gnulinux ' +n='-n' +need_va_copy='undef' +netdb_hlen_type='size_t' +netdb_host_type='const void *' +netdb_name_type='const char *' +netdb_net_type='in_addr_t' +nm='nm' +nm_opt='' +nm_so_opt='--dynamic' +nonxs_ext='Archive/Extract Archive/Tar Attribute/Handlers AutoLoader B/Debug B/Deparse B/Lint CGI CPAN CPAN/Meta CPAN/Meta/Requirements CPAN/Meta/YAML CPANPLUS CPANPLUS/Dist/Build Carp Config/Perl/V Devel/SelfStubber Digest Dumpvalue Env Errno ExtUtils/CBuilder ExtUtils/Command ExtUtils/Constant ExtUtils/Install ExtUtils/MakeMaker ExtUtils/Manifest ExtUtils/ParseXS File/CheckTree File/Fetch File/Path File/Temp FileCache Filter/Simple Getopt/Long HTTP/Tiny I18N/Collate I18N/LangTags IO/Compress IO/Zlib IPC/Cmd IPC/Open3 JSON/PP Locale/Codes Locale/Maketext Locale/Maketext/Simple Log/Message Log/Message/Simple Math/BigInt Math/BigRat Math/Complex Memoize Module/Build Module/CoreList Module/Load Module/Load/Conditional Module/Loaded Module/Metadata Module/Pluggable NEXT Net/Ping Object/Accessor Package/Constants Params/Check Parse/CPAN/Meta Perl/OSType PerlIO/via/QuotedPrint Pod/Checker Pod/Escapes Pod/Functions Pod/Html Pod/LaTeX Pod/Parser Pod/Perldoc Pod/Simple Pod/Usage Safe Search/Dict SelfLoader Term/ANSIColor Term/Cap Term/Complete Term/ReadLine Term/UI Test Test/Harness Test/Simple Text/Abbrev Text/Balanced Text/ParseWords Text/Tabs Thread/Queue Thread/Semaphore Tie/File Tie/Memoize Tie/RefHash Time/Local XSLoader autodie autouse base bignum constant encoding/warnings if lib libnet parent perlfaq podlators' +nroff='nroff' +nvEUformat='"E"' +nvFUformat='"F"' +nvGUformat='"G"' +nv_overflows_integers_at='256.0*256.0*256.0*256.0*256.0*256.0*2.0*2.0*2.0*2.0*2.0' +nv_preserves_uv_bits='32' +nveformat='"e"' +nvfformat='"f"' +nvgformat='"g"' +nvsize='8' +nvtype='double' +o_nonblock='O_NONBLOCK' +obj_ext='.o' +old_pthread_create_joinable='' +optimize='-O2' +orderlib='false' +osname='linux' +osvers='3.12.6' +otherlibdirs=' ' +package='perl5' +pager='/usr/bin/less -R' +passcat='cat /etc/passwd' +patchlevel='18' +path_sep=':' +perl5='' +perl='perl' +perl_patchlevel='' +perl_static_inline='static __inline__' +perladmin='root@openadk.nonet' +perllibs='-ldl -lm -lcrypt -lutil -lc' +perlpath='/usr/bin/perl' +pg='pg' +phostname='hostname' +pidtype='pid_t' +plibpth='/lib/mips-openadk-linux-gnu/4.7.3 /lib /usr/lib/mips-openadk-linux-gnu/4.7.3 /usr/lib' +pmake='' +pr='' +prefix='/usr' +prefixexp='/usr' +privlib='/usr/lib/perl5/5.18.1' +privlibexp='/usr/lib/perl5/5.18.1' +procselfexe='' +prototype='define' +ptrsize='4' +quadkind='3' +quadtype='long long' +randbits='48' +randfunc='drand48' +random_r_proto='0' +randseedtype='long' +ranlib=':' +rd_nodata='-1' +readdir64_r_proto='0' +readdir_r_proto='0' +revision='5' +rm='rm' +rm_try='/bin/rm -f try try a.out .out try.[cho] try..o core core.try* try.core*' +rmail='' +run='' +runnm='false' +sGMTIME_max='2147483647' +sGMTIME_min='-2147483648' +sLOCALTIME_max='2147483647' +sLOCALTIME_min='-2147483648' +sPRIEUldbl='"E"' +sPRIFUldbl='"F"' +sPRIGUldbl='"G"' +sPRIXU64='"LX"' +sPRId64='"Ld"' +sPRIeldbl='"e"' +sPRIfldbl='"f"' +sPRIgldbl='"g"' +sPRIi64='"Li"' +sPRIo64='"Lo"' +sPRIu64='"Lu"' +sPRIx64='"Lx"' +sSCNfldbl='"f"' +sched_yield='sched_yield()' +scriptdir='/usr/bin' +scriptdirexp='/usr/bin' +sed='sed' +seedfunc='srand48' +selectminbits='32' +selecttype='fd_set *' +sendmail='' +setgrent_r_proto='0' +sethostent_r_proto='0' +setlocale_r_proto='0' +setnetent_r_proto='0' +setprotoent_r_proto='0' +setpwent_r_proto='0' +setservent_r_proto='0' +sh='/bin/sh' +shar='' +sharpbang='#!' +shmattype='void *' +shortsize='2' +shrpenv='' +shsharp='true' +sig_count='128' +sig_name='ZERO HUP INT QUIT ILL TRAP ABRT EMT FPE KILL BUS SEGV SYS PIPE ALRM TERM USR1 USR2 CHLD PWR WINCH URG IO STOP TSTP CONT TTIN TTOU VTALRM PROF XCPU XFSZ NUM32 NUM33 RTMIN NUM35 NUM36 NUM37 NUM38 NUM39 NUM40 NUM41 NUM42 NUM43 NUM44 NUM45 NUM46 NUM47 NUM48 NUM49 NUM50 NUM51 NUM52 NUM53 NUM54 NUM55 NUM56 NUM57 NUM58 NUM59 NUM60 NUM61 NUM62 NUM63 NUM64 NUM65 NUM66 NUM67 NUM68 NUM69 NUM70 NUM71 NUM72 NUM73 NUM74 NUM75 NUM76 NUM77 NUM78 NUM79 NUM80 NUM81 NUM82 NUM83 NUM84 NUM85 NUM86 NUM87 NUM88 NUM89 NUM90 NUM91 NUM92 NUM93 NUM94 NUM95 NUM96 NUM97 NUM98 NUM99 NUM100 NUM101 NUM102 NUM103 NUM104 NUM105 NUM106 NUM107 NUM108 NUM109 NUM110 NUM111 NUM112 NUM113 NUM114 NUM115 NUM116 NUM117 NUM118 NUM119 NUM120 NUM121 NUM122 NUM123 NUM124 NUM125 NUM126 RTMAX IOT CLD POLL ' +sig_name_init='"ZERO", "HUP", "INT", "QUIT", "ILL", "TRAP", "ABRT", "EMT", "FPE", "KILL", "BUS", "SEGV", "SYS", "PIPE", "ALRM", "TERM", "USR1", "USR2", "CHLD", "PWR", "WINCH", "URG", "IO", "STOP", "TSTP", "CONT", "TTIN", "TTOU", "VTALRM", "PROF", "XCPU", "XFSZ", "NUM32", "NUM33", "RTMIN", "NUM35", "NUM36", "NUM37", "NUM38", "NUM39", "NUM40", "NUM41", "NUM42", "NUM43", "NUM44", "NUM45", "NUM46", "NUM47", "NUM48", "NUM49", "NUM50", "NUM51", "NUM52", "NUM53", "NUM54", "NUM55", "NUM56", "NUM57", "NUM58", "NUM59", "NUM60", "NUM61", "NUM62", "NUM63", "NUM64", "NUM65", "NUM66", "NUM67", "NUM68", "NUM69", "NUM70", "NUM71", "NUM72", "NUM73", "NUM74", "NUM75", "NUM76", "NUM77", "NUM78", "NUM79", "NUM80", "NUM81", "NUM82", "NUM83", "NUM84", "NUM85", "NUM86", "NUM87", "NUM88", "NUM89", "NUM90", "NUM91", "NUM92", "NUM93", "NUM94", "NUM95", "NUM96", "NUM97", "NUM98", "NUM99", "NUM100", "NUM101", "NUM102", "NUM103", "NUM104", "NUM105", "NUM106", "NUM107", "NUM108", "NUM109", "NUM110", "NUM111", "NUM112", "NUM113", "NUM114", "NUM115", "NUM116", "NUM117", "NUM118", "NUM119", "NUM120", "NUM121", "NUM122", "NUM123", "NUM124", "NUM125", "NUM126", "RTMAX", "IOT", "CLD", "POLL", 0' +sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 6 18 22 ' +sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 6, 18, 22, 0' +sig_size='131' +signal_t='void' +sitearch='/usr/lib/perl5/site_perl/5.18.1/mips-linux' +sitearchexp='/usr/lib/perl5/site_perl/5.18.1/mips-linux' +sitebin='/usr/bin' +sitebinexp='/usr/bin' +sitehtml1dir='' +sitehtml1direxp='' +sitehtml3dir='' +sitehtml3direxp='' +sitelib='/usr/lib/perl5/site_perl/5.18.1' +sitelib_stem='/usr/lib/perl5/site_perl' +sitelibexp='/usr/lib/perl5/site_perl/5.18.1' +siteman1dir='' +siteman1direxp='' +siteman3dir='' +siteman3direxp='' +siteprefix='/usr' +siteprefixexp='/usr' +sitescript='/usr/bin' +sitescriptexp='/usr/bin' +sizesize='4' +sizetype='size_t' +sleep='' +smail='' +so='so' +sockethdr='' +socketlib='' +socksizetype='socklen_t' +sort='sort' +spackage='Perl5' +spitshell='cat' +srand48_r_proto='0' +srandom_r_proto='0' +src='.' +ssizetype='ssize_t' +st_ino_sign='1' +st_ino_size='8' +startperl='#!/usr/bin/perl' +startsh='#!/bin/sh' +static_ext=' ' +stdchar='char' +stdio_base='((fp)->_IO_read_base)' +stdio_bufsiz='((fp)->_IO_read_end - (fp)->_IO_read_base)' +stdio_cnt='((fp)->_IO_read_end - (fp)->_IO_read_ptr)' +stdio_filbuf='' +stdio_ptr='((fp)->_IO_read_ptr)' +stdio_stream_array='' +strerror_r_proto='0' +strings='/usr/include/string.h' +submit='' +subversion='1' +sysman='/usr/man/man1' +tail='' +tar='' +targetarch='' +tbl='' +tee='' +test='test' +timeincl='/usr/include/sys/time.h /usr/include/time.h ' +timetype='time_t' +tmpnam_r_proto='0' +to=':' +touch='touch' +tr='tr' +trnl='\n' +troff='' +ttyname_r_proto='0' +u16size='2' +u16type='unsigned short' +u32size='4' +u32type='unsigned long' +u64size='8' +u64type='unsigned long long' +u8size='1' +u8type='unsigned char' +uidformat='"lu"' +uidsign='1' +uidsize='4' +uidtype='uid_t' +uname='uname' +uniq='uniq' +uquadtype='unsigned long long' +use5005threads='undef' +use64bitall='undef' +use64bitint='undef' +usecrosscompile='undef' +usedevel='undef' +usedl='define' +usedtrace='undef' +usefaststdio='undef' +useithreads='undef' +usekernprocpathname='undef' +uselargefiles='define' +uselongdouble='undef' +usemallocwrap='define' +usemorebits='undef' +usemultiplicity='undef' +usemymalloc='n' +usenm='false' +usensgetexecutablepath='undef' +useopcode='true' +useperlio='define' +useposix='true' +usereentrant='undef' +userelocatableinc='undef' +usesfio='false' +useshrplib='false' +usesitecustomize='undef' +usesocks='undef' +usethreads='undef' +usevendorprefix='undef' +useversionedarchname='undef' +usevfork='false' +usrinc='%%INCDIRS%%' +uuname='' +uvXUformat='"lX"' +uvoformat='"lo"' +uvsize='4' +uvtype='unsigned long' +uvuformat='"lu"' +uvxformat='"lx"' +vaproto='define' +vendorarch='' +vendorarchexp='' +vendorbin='' +vendorbinexp='' +vendorhtml1dir=' ' +vendorhtml1direxp='' +vendorhtml3dir=' ' +vendorhtml3direxp='' +vendorlib='' +vendorlib_stem='' +vendorlibexp='' +vendorman1dir=' ' +vendorman1direxp='' +vendorman3dir=' ' +vendorman3direxp='' +vendorprefix='' +vendorprefixexp='' +vendorscript='' +vendorscriptexp='' +version='5.18.1' +version_patchlevel_string='version 18 subversion 1' +versiononly='undef' +vi='' +voidflags='15' +xlibpth='/usr/lib/386 /lib/386' +yacc='yacc' +yaccflags='' +zcat='' +zip='zip' +PERL_REVISION=5 +PERL_VERSION=18 +PERL_SUBVERSION=1 +PERL_API_REVISION=5 +PERL_API_VERSION=18 +PERL_API_SUBVERSION=0 +PERL_PATCHLEVEL='' +PERL_CONFIG_SH=true +: Variables propagated from previous config.sh file. +libdb_needs_pthread='N' diff --git a/package/polkit/Makefile b/package/polkit/Makefile index 5ed8333e3..5be0cd1df 100644 --- a/package/polkit/Makefile +++ b/package/polkit/Makefile @@ -15,6 +15,8 @@ PKG_URL:= http://www.freedesktop.org/wiki/Software/polkit/ PKG_SITES:= http://openadk.org/distfiles/ PKG_OPTS:= dev +PKG_HOST_DEPENDS:= !darwin + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,POLKIT,polkit,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) diff --git a/package/section.lst b/package/section.lst index 795840988..9476cb44d 100644 --- a/package/section.lst +++ b/package/section.lst @@ -1,4 +1,5 @@ base Base System +boot Boot Loaders browser Browser / Editor / Pager editor Browser / Editor / Pager pager Browser / Editor / Pager @@ -21,7 +22,7 @@ lang Programming / Languages libs Libraries mail Mail misc Misc -multimedia Multimedia +multimedia Multimedia / Audio / Video net Networking net/fs Network Filesystems net/misc Networking Misc diff --git a/package/systemd/Makefile b/package/systemd/Makefile deleted file mode 100644 index 5fe43a086..000000000 --- a/package/systemd/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include ${TOPDIR}/rules.mk - -PKG_NAME:= systemd -PKG_VERSION:= 208 -PKG_RELEASE:= 4 -PKG_MD5SUM:= df64550d92afbffb4f67a434193ee165 -PKG_DESCR:= System and Service Manager -PKG_SECTION:= utils -PKG_DEPENDS:= libblkid libcap -PKG_BUILDDEP:= autotool usbutils glib kmod util-linux libcap -PKG_BUILDDEP+= libgcrypt gperf-host -PKG_URL:= http://freedesktop.org/wiki/Software/systemd/ -PKG_SITES:= http://www.freedesktop.org/software/systemd/ - -PKG_LIBC_DEPENDS:= eglibc glibc -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,SYSTEMD,systemd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -AUTOTOOL_STYLE:= autoreconf -TARGET_LDFLAGS+= -lrt -CONFIGURE_ARGS+= --disable-static \ - --without-python \ - --enable-gudev \ - --disable-manpages \ - --disable-polkit - -# TODO -systemd-install: - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/systemd/files/udev.conffiles b/package/systemd/files/udev.conffiles deleted file mode 100644 index 50a5fb889..000000000 --- a/package/systemd/files/udev.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/udev/udev.conf diff --git a/package/systemd/patches/patch-Makefile_am b/package/systemd/patches/patch-Makefile_am deleted file mode 100644 index c35e6d461..000000000 --- a/package/systemd/patches/patch-Makefile_am +++ /dev/null @@ -1,20 +0,0 @@ ---- systemd-208.orig/Makefile.am 2013-10-02 04:57:09.000000000 +0200 -+++ systemd-208/Makefile.am 2013-12-14 16:18:32.000000000 +0100 -@@ -23,7 +23,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - AM_MAKEFLAGS = --no-print-directory - AUTOMAKE_OPTIONS = color-tests parallel-tests - --SUBDIRS = . po -+SUBDIRS = . - - # remove targets if the command fails - .DELETE_ON_ERROR: -@@ -537,8 +537,6 @@ dist_doc_DATA = \ - LICENSE.MIT \ - DISTRO_PORTING - --@INTLTOOL_POLICY_RULE@ -- - # ------------------------------------------------------------------------------ - - MANPAGES = diff --git a/package/systemd/patches/patch-configure_ac b/package/systemd/patches/patch-configure_ac deleted file mode 100644 index e3aeaa5c0..000000000 --- a/package/systemd/patches/patch-configure_ac +++ /dev/null @@ -1,12 +0,0 @@ ---- systemd-208.orig/configure.ac 2013-10-02 01:54:26.000000000 +0200 -+++ systemd-208/configure.ac 2013-12-13 16:37:55.000000000 +0100 -@@ -47,9 +47,6 @@ LT_INIT([disable-static]) - AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not supported by systemd])]) - AS_IF([test "x$enable_largefile" = "xno"], [AC_MSG_ERROR([--disable-largefile is not supported by systemd])]) - --# i18n stuff for the PolicyKit policy files --IT_PROG_INTLTOOL([0.40.0]) -- - GETTEXT_PACKAGE=systemd - AC_SUBST(GETTEXT_PACKAGE) - diff --git a/package/systemd/patches/patch-src_gudev_gudev-1_0_pc_in b/package/systemd/patches/patch-src_gudev_gudev-1_0_pc_in deleted file mode 100644 index 1758a8957..000000000 --- a/package/systemd/patches/patch-src_gudev_gudev-1_0_pc_in +++ /dev/null @@ -1,13 +0,0 @@ ---- systemd-208.orig/src/gudev/gudev-1.0.pc.in 2013-08-13 22:02:46.000000000 +0200 -+++ systemd-208/src/gudev/gudev-1.0.pc.in 2014-01-10 16:50:37.000000000 +0100 -@@ -1,7 +1,7 @@ - prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -+exec_prefix=@prefix@ -+libdir=${prefix}/lib -+includedir=${prefix}/include - - Name: gudev-1.0 - Description: GObject bindings for libudev diff --git a/package/systemd/patches/patch-src_libudev_libudev_pc_in b/package/systemd/patches/patch-src_libudev_libudev_pc_in deleted file mode 100644 index 7bc3ab6f3..000000000 --- a/package/systemd/patches/patch-src_libudev_libudev_pc_in +++ /dev/null @@ -1,15 +0,0 @@ ---- systemd-208.orig/src/libudev/libudev.pc.in 2013-08-13 22:02:46.000000000 +0200 -+++ systemd-208/src/libudev/libudev.pc.in 2013-12-14 17:20:31.000000000 +0100 -@@ -6,9 +6,9 @@ - # (at your option) any later version. - - prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -+exec_prefix=${prefix}/usr -+libdir=${prefix}/lib -+includedir=${prefix}/include - - Name: libudev - Description: Library to access udev device information diff --git a/scripts/ipkg-build b/scripts/ipkg-build index 47158c409..22600e8e0 100644 --- a/scripts/ipkg-build +++ b/scripts/ipkg-build @@ -82,7 +82,7 @@ You probably want to remove them: " >&2 [ "$?" -ne 0 ] && PKG_ERROR=1 if [ -z "$section" ]; then echo "The Section field should have one of the following values:" >&2 - echo "admin, base, comm, editors, extras, games, graphics, kernel, lang, libs, misc, net, scm, text, web, x11" >&2 + echo "admin, base, boot, comm, editors, extras, games, graphics, kernel, lang, libs, misc, net, scm, text, web, x11" >&2 fi priority=`required_field Priority` diff --git a/scripts/scan-pkgs.sh b/scripts/scan-pkgs.sh index 79d416569..1ff957c25 100644 --- a/scripts/scan-pkgs.sh +++ b/scripts/scan-pkgs.sh @@ -61,6 +61,10 @@ if [[ -n $ADK_NATIVE ]];then fi fi +if [[ -n $ADK_PACKAGE_XBMC ]]; then + NEED_JAVA="$NEED_JAVA xbmc" +fi + if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then NEED_XKBCOMP="$NEED_XKBCOMP xkeyboard-config" fi @@ -78,7 +82,6 @@ if [[ -n $ADK_PACKAGE_XKEYBOARD_CONFIG ]]; then fi if [[ -n $ADK_PACKAGE_LIBXFONT ]]; then - NEED_WWW="$NEED_WWW libXfont" NEED_XMLTO="$NEED_XMLTO libXfont" fi @@ -258,6 +261,13 @@ if [[ -n $NEED_DBUSGLIB ]]; then fi fi +if [[ -n $NEED_JAVA ]]; then + if ! which java >/dev/null 2>&1; then + echo >&2 You need java to build $NEED_JAVA + out=1 + fi +fi + if [[ -n $ADK_USE_CCACHE ]]; then if ! which ccache >/dev/null 2>&1; then echo >&2 You have selected to build with ccache, but ccache could not be found. diff --git a/target/arm/sys-available/keyasic-ka2000 b/target/arm/sys-available/keyasic-ka2000 index d4ed74282..cc193e2ef 100644 --- a/target/arm/sys-available/keyasic-ka2000 +++ b/target/arm/sys-available/keyasic-ka2000 @@ -8,8 +8,8 @@ config ADK_TARGET_SYSTEM_KEYASIC_KA2000 select ADK_CPU_ARMV5 select ADK_TARGET_NO_FPU select ADK_TOOLCHAIN - select ADK_STATIC - select BUSYBOX_STATIC + select ADK_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_MUSL + select BUSYBOX_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_MUSL help KeyASIC KA2000 aka Transcend WifiSD. Build a toolchain only and make all binaries static. diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi index 9fd1c1b2a..36d96b064 100644 --- a/target/arm/sys-available/raspberry-pi +++ b/target/arm/sys-available/raspberry-pi @@ -9,7 +9,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_INPUT - select ADK_PACKAGE_BCM2835_FIRMWARE + select ADK_PACKAGE_BCM2835_BOOTLOADER select ADK_TARGET_KERNEL_ZIMAGE select ADK_USE_KERNEL_MINICONFIG help diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm index ade935950..956acab7a 100644 --- a/target/arm/sys-available/toolchain-arm +++ b/target/arm/sys-available/toolchain-arm @@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM select ADK_TOOLCHAIN select ADK_EABI select ADK_TARGET_NO_FPU + select ADK_TARGET_PACKAGE_TGZ help ARM toolchain (little endian). diff --git a/target/arm/sys-available/toolchain-armeb b/target/arm/sys-available/toolchain-armeb index 8a99ca78a..4756e0db2 100644 --- a/target/arm/sys-available/toolchain-armeb +++ b/target/arm/sys-available/toolchain-armeb @@ -6,6 +6,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_ARMEB select ADK_TOOLCHAIN select ADK_EABI select ADK_TARGET_NO_FPU + select ADK_TARGET_PACKAGE_TGZ help ARM toolchain (big endian). diff --git a/target/config/Config.in b/target/config/Config.in index 4b35b7a50..99e810528 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -97,6 +97,12 @@ config ADK_TARGET_ABI default "n32" if ADK_n32 default "64" if ADK_n64 +config ADK_TARGET_ABI_MIPS_O32 + boolean + select ADK_o32 + depends on !ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS + default y + choice prompt "Target ABI" depends on ADK_TARGET_KERNEL64 && ADK_LINUX_MIPS @@ -166,6 +172,23 @@ config ADK_TARGET_KERNEL_MINICONFIG default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI choice +prompt "Qemu Emulation using VirtIO drivers" +depends on ADK_TARGET_SYSTEM_QEMU_SPARC64 + +config ADK_TARGET_QEMU_WITH_VIRTIO + boolean "enabled" + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_VIRTIO + select ADK_KERNEL_VIRTIO_PCI + select ADK_KERNEL_VIRTIO_NET + select ADK_KERNEL_VIRTIO_BLK + +config ADK_TARGET_QEMU_WITHOUT_VIRTIO + boolean "disabled" + +endchoice + +choice prompt "Qemu MICROBLAZE Emulation" depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE || ADK_TARGET_SYSTEM_QEMU_MICROBLAZEEL @@ -461,7 +484,7 @@ config ADK_TARGET_CPU_ARCH config ADK_TARGET_ABI_CFLAGS string - default "-mabi=32" if ADK_TARGET_ABI_O32 + default "-mabi=32" if ADK_TARGET_ABI_O32 || ADK_TARGET_ABI_MIPS_O32 default "-mabi=n32" if ADK_TARGET_ABI_N32 default "-mabi=64" if ADK_TARGET_ABI_N64 default "-m32" if ADK_TARGET_ABI_32 @@ -474,9 +497,10 @@ config ADK_TARGET_ABI_LDFLAGS config ADK_TARGET_KERNEL_LDFLAGS string - default "-mabi=64" if ADK_TARGET_ABI_N32 - default "-mabi=64" if ADK_TARGET_ABI_O32 - default "-mabi=64" if ADK_TARGET_ABI_N64 + default "-mabi=64" if ADK_TARGET_ABI_N32 && ADK_TARGET_KERNEL64 + default "-mabi=64" if ADK_TARGET_ABI_O32 && ADK_TARGET_KERNEL64 + default "-mabi=64" if ADK_TARGET_ABI_N64 && ADK_TARGET_KERNEL64 + default "" config ADK_TARGET_CFLAGS string diff --git a/target/linux/Config.in b/target/linux/Config.in index e4b81dd2f..f4ead4caf 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -25,3 +25,4 @@ source target/linux/config/Config.in.serial source target/linux/config/Config.in.spi source target/linux/config/Config.in.kvm source target/linux/config/Config.in.debug +source target/linux/config/Config.in.virtio diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index cdd602cd7..7d189a063 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -144,38 +144,6 @@ config ADK_KERNEL_B44 default n help -config ADK_KERNEL_E1000 - boolean - select ADK_KERNEL_NETDEVICES - select ADK_KERNEL_NET_ETHERNET - select ADK_KERNEL_NETDEV_1000 - default y if ADK_TARGET_SYSTEM_VBOX_I686 - default y if ADK_TARGET_SYSTEM_IBM_X40 - default y if ADK_NATIVE_SYSTEM_IBM_X40 - default y if ADK_TARGET_SYSTEM_QEMU_I686 - default y if ADK_TARGET_SYSTEM_QEMU_X86_64 - default n - help - -config ADK_KERNEL_E1000E - boolean - select ADK_KERNEL_NETDEVICES - select ADK_KERNEL_NET_ETHERNET - select ADK_KERNEL_NETDEV_1000 - default y if ADK_TARGET_SYSTEM_TAROX_PC - default y if ADK_NATIVE_SYSTEM_TAROX_PC - default n - help - -config ADK_KERNEL_SKY2 - boolean - select ADK_KERNEL_NETDEVICES - select ADK_KERNEL_NET_ETHERNET - select ADK_KERNEL_NETDEV_1000 - default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76 - default n - help - config ADK_KERNEL_R8169 boolean select ADK_KERNEL_NETDEVICES diff --git a/target/linux/config/Config.in.virtio b/target/linux/config/Config.in.virtio new file mode 100644 index 000000000..4ee027baa --- /dev/null +++ b/target/linux/config/Config.in.virtio @@ -0,0 +1,37 @@ +config ADK_KERNEL_VIRTIO + boolean + +config ADK_KERNEL_VIRTIO_PCI + boolean + +config ADK_KERNEL_VIRTIO_NET + boolean + +config ADK_KERNEL_VIRTIO_BLK + boolean + +menu "Virtio driver support" +depends on !ADK_TARGET_QEMU_WITH_VIRTIO && ADK_HARDWARE_QEMU + +config ADK_KPACKAGE_KMOD_VIRTIO_NET + prompt "kmod-virtio-net.................... Virtio net driver" + tristate + select ADK_KERNEL_VIRTIO + select ADK_KERNEL_VIRTIO_PCI + depends on !ADK_KERNEL_VIRTIO_NET + default n + help + Enables support for Virtio Net driver. + +config ADK_KPACKAGE_KMOD_VIRTIO_BLK + prompt "kmod-virtio-block.................. Virtio block driver" + tristate + select ADK_KERNEL_VIRTIO + select ADK_KERNEL_VIRTIO_PCI + select ADK_KERNEL_BLK_DEV + depends on !ADK_KERNEL_VIRTIO_BLK + default n + help + Enables support for Virtio Block driver. + +endmenu diff --git a/target/m68k/sys-available/toolchain-m68k b/target/m68k/sys-available/toolchain-m68k index 4cfe403a7..0bc27683b 100644 --- a/target/m68k/sys-available/toolchain-m68k +++ b/target/m68k/sys-available/toolchain-m68k @@ -3,6 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_M68K select ADK_m68k select ADK_toolchain_m68k select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Build a m68k toolchain. diff --git a/target/microblaze/sys-available/toolchain-microblaze b/target/microblaze/sys-available/toolchain-microblaze index 3e1c34436..6fb76c5f5 100644 --- a/target/microblaze/sys-available/toolchain-microblaze +++ b/target/microblaze/sys-available/toolchain-microblaze @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MICROBLAZE select ADK_big select ADK_toolchain_microblaze select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Microblaze toolchain. diff --git a/target/microblaze/sys-available/toolchain-microblazeel b/target/microblaze/sys-available/toolchain-microblazeel index eb66d103f..8992e5550 100644 --- a/target/microblaze/sys-available/toolchain-microblazeel +++ b/target/microblaze/sys-available/toolchain-microblazeel @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MICROBLAZEEL select ADK_little select ADK_toolchain_microblazeel select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Microblaze toolchain. diff --git a/target/mips/sys-available/toolchain-mips b/target/mips/sys-available/toolchain-mips index 783d71fa0..9e93cfdcd 100644 --- a/target/mips/sys-available/toolchain-mips +++ b/target/mips/sys-available/toolchain-mips @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS select ADK_big select ADK_toolchain_mips select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help MIPS toolchain. diff --git a/target/mips/sys-available/toolchain-mipsel b/target/mips/sys-available/toolchain-mipsel index 7eb9a743f..4c197b808 100644 --- a/target/mips/sys-available/toolchain-mipsel +++ b/target/mips/sys-available/toolchain-mipsel @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPSEL select ADK_little select ADK_toolchain_mipsel select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help MIPS toolchain. diff --git a/target/ppc/sys-available/toolchain-ppc b/target/ppc/sys-available/toolchain-ppc index 0faea45e5..340834f16 100644 --- a/target/ppc/sys-available/toolchain-ppc +++ b/target/ppc/sys-available/toolchain-ppc @@ -3,6 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC select ADK_ppc select ADK_toolchain_ppc select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Build a ppc toolchain. diff --git a/target/ppc64/sys-available/toolchain-ppc64 b/target/ppc64/sys-available/toolchain-ppc64 index 3574e863c..5a38c89f0 100644 --- a/target/ppc64/sys-available/toolchain-ppc64 +++ b/target/ppc64/sys-available/toolchain-ppc64 @@ -3,6 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC64 select ADK_ppc64 select ADK_toolchain_ppc64 select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Build a ppc64 toolchain. diff --git a/target/sh/sys-available/toolchain-sh b/target/sh/sys-available/toolchain-sh index 33fdfa446..8fb17a472 100644 --- a/target/sh/sys-available/toolchain-sh +++ b/target/sh/sys-available/toolchain-sh @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SH select ADK_toolchain_sh select ADK_CPU_SH4 select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Build a superh toolchain (sh4). diff --git a/target/sparc/sys-available/toolchain-sparc b/target/sparc/sys-available/toolchain-sparc index 5d1a6c044..e668592e2 100644 --- a/target/sparc/sys-available/toolchain-sparc +++ b/target/sparc/sys-available/toolchain-sparc @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC select ADK_toolchain_sparc select ADK_CPU_SPARC_V8 select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Build a sparc toolchain. diff --git a/target/sparc64/Makefile b/target/sparc64/Makefile index 73f765f96..7a31c1499 100644 --- a/target/sparc64/Makefile +++ b/target/sparc64/Makefile @@ -18,7 +18,12 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_SPARC64),y) @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)" @echo "Start qemu with following command line:" - @echo 'qemu-system-sparc64 -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img -append "root=/dev/sda1"' +ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) + @echo 'qemu-system-sparc64 -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) -drive file=qemu-${CPU_ARCH}.img,if=virtio,index=0 \ + -net nic,model=virtio -net user' +else + @echo 'qemu-system-sparc64 -nographic -kernel $(BIN_DIR)/$(TARGET_KERNEL) qemu-${CPU_ARCH}.img' +endif endif endif ifeq ($(ADK_TARGET_FS),initramfs) diff --git a/target/sparc64/kernel/qemu-sparc64 b/target/sparc64/kernel/qemu-sparc64 index 73e26ec4d..5119f1225 100644 --- a/target/sparc64/kernel/qemu-sparc64 +++ b/target/sparc64/kernel/qemu-sparc64 @@ -16,10 +16,6 @@ CONFIG_SCSI=y CONFIG_SCSI_DMA=y CONFIG_BLK_DEV_SD=y CONFIG_SCSI_LOWLEVEL=y -CONFIG_ATA=y -CONFIG_ATA_SFF=y -CONFIG_ATA_BMDMA=y -CONFIG_PATA_CMD64X=y CONFIG_NETDEVICES=y CONFIG_NET_CORE=y CONFIG_ETHERNET=y diff --git a/target/sparc64/sys-available/toolchain-sparc64 b/target/sparc64/sys-available/toolchain-sparc64 index 060cc62dd..15eaca575 100644 --- a/target/sparc64/sys-available/toolchain-sparc64 +++ b/target/sparc64/sys-available/toolchain-sparc64 @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC64 select ADK_toolchain_sparc64 select ADK_CPU_SPARC_V9 select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Build a sparc64 toolchain. diff --git a/target/x86/sys-available/toolchain-i686 b/target/x86/sys-available/toolchain-i686 index e4c02a0e5..bec515fca 100644 --- a/target/x86/sys-available/toolchain-i686 +++ b/target/x86/sys-available/toolchain-i686 @@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86 select ADK_toolchain_x86 select ADK_CPU_I686 select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Build a x86 toolchain (i686 optimized). diff --git a/target/x86_64/sys-available/toolchain-x86_64 b/target/x86_64/sys-available/toolchain-x86_64 index 0c175da69..fd1025270 100644 --- a/target/x86_64/sys-available/toolchain-x86_64 +++ b/target/x86_64/sys-available/toolchain-x86_64 @@ -3,6 +3,7 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64 select ADK_x86_64 select ADK_toolchain_x86_64 select ADK_TOOLCHAIN + select ADK_TARGET_PACKAGE_TGZ help Build a x86_64 toolchain. diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 26f1dc96a..c547591a0 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -26,6 +26,7 @@ GCC_CONFOPTS= --prefix=$(STAGING_HOST_DIR) \ --disable-cloog-version-check \ --without-ppl \ --without-cloog \ + --without-isl \ --disable-nls ifeq ($(ADK_TOOLCHAIN_GCC_SJLJ),y) @@ -61,13 +62,21 @@ GCC_CONFOPTS+= --disable-lto endif ifeq ($(ARCH),m68k) +ifeq ($(ADK_TARGET_LIBC),uclibc) GCC_CONFOPTS+= --disable-tls else GCC_CONFOPTS+= --enable-tls endif +else +GCC_CONFOPTS+= --enable-tls +endif ifeq ($(ARCH),powerpc) +ifeq ($(ADK_TARGET_LIBC),uclibc) +GCC_CONFOPTS+= --disable-target-optspace --with-long-double-128 --enable-secureplt +else GCC_CONFOPTS+= --disable-target-optspace --with-long-double-64 --enable-secureplt +endif else GCC_CONFOPTS+= --enable-target-optspace endif @@ -107,7 +116,7 @@ $(GCC_BUILD_DIR_MINIMAL)/.configured: mkdir -p $(GCC_BUILD_DIR_MINIMAL) # these symlinks are very important, do not remove rm -rf $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include - ln -sf ${STAGING_TARGET_DIR}/include $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include + ln -sf ${STAGING_TARGET_DIR}/usr/include $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include rm -rf ${STAGING_HOST_DIR}/$(REAL_GNU_TARGET_NAME)/lib ln -sf ${STAGING_TARGET_DIR}/lib $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/lib ifeq ($(ADK_LINUX_SH),y) @@ -177,10 +186,12 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled done; # remove duplicate tools, convert hardlinks to symlinks set -e; \ - cd $(STAGING_HOST_DIR)/bin; \ - for app in ar as c++ g++ gcc gcc-${PKG_VERSION} ld ld.bfd nm objcopy objdump ranlib strip; do \ - ln -sf ../$(REAL_GNU_TARGET_NAME)/bin/$${app} $(REAL_GNU_TARGET_NAME)-$${app}; \ + cd $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/bin; \ + for app in ar as c++ g++ gcc ld ld.bfd nm objcopy objdump ranlib strip; do \ + ln -sf ../../bin/$(REAL_GNU_TARGET_NAME)-$${app} $${app}; \ done; + (cd $(STAGING_HOST_DIR)/bin && \ + ln -sf $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-gcc-${PKG_VERSION}) # setup symlink, so that gcc/g++ find cc1plus (cd $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/ && \ ln -sf ../libexec .) @@ -194,6 +205,8 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled @-test -d $(STAGING_TARGET_DIR)/lib64 && \ cd $(STAGING_TARGET_DIR)/lib64 && \ ln -sf libstdc++.so.6.0.17 libstdc++.so + # cleanup unneeded docs + rm -rf $(STAGING_HOST_DIR)/share touch $@ include ${TOPDIR}/mk/toolchain.mk diff --git a/toolchain/gcc/patches/4.8.2/musl-cross.patch b/toolchain/gcc/patches/4.8.2/musl-cross.patch new file mode 100644 index 000000000..5c5db86b3 --- /dev/null +++ b/toolchain/gcc/patches/4.8.2/musl-cross.patch @@ -0,0 +1,698 @@ +# HG changeset patch +# Parent df1a439b9058b07024ca556225d55535f5feb5dd +Use the generic implementation of libstdc++ primitives when we're on musl, not the glibc one. + +diff -r df1a439b9058 libstdc++-v3/configure.host +--- a/libstdc++-v3/configure.host Tue Dec 31 14:52:24 2013 -0500 ++++ b/libstdc++-v3/configure.host Tue Dec 31 14:54:49 2013 -0500 +@@ -264,6 +264,13 @@ + os_include_dir="os/bsd/freebsd" + ;; + gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) ++ # check for musl by target ++ case "${host_os}" in ++ *-musl*) ++ os_include_dir="os/generic" ++ ;; ++ *) ++ + if [ "$uclibc" = "yes" ]; then + os_include_dir="os/uclibc" + elif [ "$bionic" = "yes" ]; then +@@ -272,6 +279,9 @@ + os_include_dir="os/gnu-linux" + fi + ;; ++ ++ esac ++ ;; + hpux*) + os_include_dir="os/hpux" + ;; +# HG changeset patch +# Parent e5b4564f249f8634194bdabef4b3057d0e54ee97 +Adding -mmusl as a musl libc specifier, and the necessary hacks for it to know how to find musl's dynamic linker. + +diff -r e5b4564f249f gcc/config.gcc +--- a/gcc/config.gcc Tue Dec 31 14:54:49 2013 -0500 ++++ b/gcc/config.gcc Tue Dec 31 14:54:52 2013 -0500 +@@ -550,7 +550,7 @@ + esac + + # Common C libraries. +-tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3" ++tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" + + # Common parts for widely ported systems. + case ${target} in +@@ -653,6 +653,9 @@ + *-*-*uclibc*) + tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" + ;; ++ *-*-*musl*) ++ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" ++ ;; + *) + tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" + ;; +diff -r e5b4564f249f gcc/config/linux.h +--- a/gcc/config/linux.h Tue Dec 31 14:54:49 2013 -0500 ++++ b/gcc/config/linux.h Tue Dec 31 14:54:52 2013 -0500 +@@ -32,10 +32,12 @@ + #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) + #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) + #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) ++#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) + #else + #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) + #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) + #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) ++#define OPTION_MUSL (linux_libc == LIBC_MUSL) + #endif + + #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ +@@ -53,18 +55,21 @@ + uClibc or Bionic is the default C library and whether + -muclibc or -mglibc or -mbionic has been passed to change the default. */ + +-#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \ +- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}" ++#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \ ++ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}" + + #if DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M) + #elif DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M) + #elif DEFAULT_LIBC == LIBC_BIONIC +-#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ +- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U) ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M) ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ ++ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B) + #else + #error "Unsupported DEFAULT_LIBC" + #endif /* DEFAULT_LIBC */ +@@ -84,21 +89,21 @@ + + #define GNU_USER_DYNAMIC_LINKER \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ +- BIONIC_DYNAMIC_LINKER) ++ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) + #define GNU_USER_DYNAMIC_LINKER32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \ +- BIONIC_DYNAMIC_LINKER32) ++ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) + #define GNU_USER_DYNAMIC_LINKER64 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \ +- BIONIC_DYNAMIC_LINKER64) ++ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) + #define GNU_USER_DYNAMIC_LINKERX32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \ +- BIONIC_DYNAMIC_LINKERX32) ++ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32) + + /* Determine whether the entire c99 runtime + is present in the runtime library. */ + #undef TARGET_C99_FUNCTIONS +-#define TARGET_C99_FUNCTIONS (OPTION_GLIBC) ++#define TARGET_C99_FUNCTIONS (OPTION_GLIBC || OPTION_MUSL) + + /* Whether we have sincos that follows the GNU extension. */ + #undef TARGET_HAS_SINCOS +@@ -107,3 +112,74 @@ + /* Whether we have Bionic libc runtime */ + #undef TARGET_HAS_BIONIC + #define TARGET_HAS_BIONIC (OPTION_BIONIC) ++ ++/* musl avoids problematic includes by rearranging the include directories. ++ * Unfortunately, this is mostly duplicated from cppdefault.c */ ++#if DEFAULT_LIBC == LIBC_MUSL ++#define INCLUDE_DEFAULTS_MUSL_GPP \ ++ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \ ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \ ++ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \ ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \ ++ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \ ++ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, ++ ++#ifdef LOCAL_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_LOCAL \ ++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \ ++ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, ++#else ++#define INCLUDE_DEFAULTS_MUSL_LOCAL ++#endif ++ ++#ifdef PREFIX_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_PREFIX \ ++ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_PREFIX ++#endif ++ ++#ifdef CROSS_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_CROSS \ ++ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_CROSS ++#endif ++ ++#ifdef TOOL_INCLUDE_DIR ++#define INCLUDE_DEFAULTS_MUSL_TOOL \ ++ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0}, ++#else ++#define INCLUDE_DEFAULTS_MUSL_TOOL ++#endif ++ ++#ifdef NATIVE_SYSTEM_HEADER_DIR ++#define INCLUDE_DEFAULTS_MUSL_NATIVE \ ++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ ++ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 }, ++#else ++#define INCLUDE_DEFAULTS_MUSL_NATIVE ++#endif ++ ++#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT) ++# undef INCLUDE_DEFAULTS_MUSL_LOCAL ++# define INCLUDE_DEFAULTS_MUSL_LOCAL ++# undef INCLUDE_DEFAULTS_MUSL_NATIVE ++# define INCLUDE_DEFAULTS_MUSL_NATIVE ++#else ++# undef INCLUDE_DEFAULTS_MUSL_CROSS ++# define INCLUDE_DEFAULTS_MUSL_CROSS ++#endif ++ ++#undef INCLUDE_DEFAULTS ++#define INCLUDE_DEFAULTS \ ++ { \ ++ INCLUDE_DEFAULTS_MUSL_GPP \ ++ INCLUDE_DEFAULTS_MUSL_PREFIX \ ++ INCLUDE_DEFAULTS_MUSL_CROSS \ ++ INCLUDE_DEFAULTS_MUSL_TOOL \ ++ INCLUDE_DEFAULTS_MUSL_NATIVE \ ++ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ ++ { 0, 0, 0, 0, 0, 0 } \ ++ } ++#endif +diff -r e5b4564f249f gcc/config/linux.opt +--- a/gcc/config/linux.opt Tue Dec 31 14:54:49 2013 -0500 ++++ b/gcc/config/linux.opt Tue Dec 31 14:54:52 2013 -0500 +@@ -30,3 +30,7 @@ + muclibc + Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) + Use uClibc C library ++ ++mmusl ++Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc) ++Use musl C library +diff -r e5b4564f249f gcc/ginclude/stddef.h +--- a/gcc/ginclude/stddef.h Tue Dec 31 14:54:49 2013 -0500 ++++ b/gcc/ginclude/stddef.h Tue Dec 31 14:54:52 2013 -0500 +@@ -181,6 +181,7 @@ + #ifndef _GCC_SIZE_T + #ifndef _SIZET_ + #ifndef __size_t ++#ifndef __DEFINED_size_t /* musl */ + #define __size_t__ /* BeOS */ + #define __SIZE_T__ /* Cray Unicos/Mk */ + #define _SIZE_T +@@ -197,6 +198,7 @@ + #define ___int_size_t_h + #define _GCC_SIZE_T + #define _SIZET_ ++#define __DEFINED_size_t /* musl */ + #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ + || defined(__FreeBSD_kernel__) + /* __size_t is a typedef on FreeBSD 5, must not trash it. */ +@@ -214,6 +216,7 @@ + typedef long ssize_t; + #endif /* __BEOS__ */ + #endif /* !(defined (__GNUG__) && defined (size_t)) */ ++#endif /* __DEFINED_size_t */ + #endif /* __size_t */ + #endif /* _SIZET_ */ + #endif /* _GCC_SIZE_T */ +# HG changeset patch +# Parent e08e44e39f5edde422f444487422046147d5821e +A fix for libgomp to correctly request a POSIX version for time support. + +diff -r e08e44e39f5e libgomp/config/posix/time.c +--- a/libgomp/config/posix/time.c Tue Dec 31 14:54:52 2013 -0500 ++++ b/libgomp/config/posix/time.c Tue Dec 31 14:54:55 2013 -0500 +@@ -28,6 +28,8 @@ + The following implementation uses the most simple POSIX routines. + If present, POSIX 4 clocks should be used instead. */ + ++#define _POSIX_C_SOURCE 199309L /* for clocks */ ++ + #include "libgomp.h" + #include <unistd.h> + #if TIME_WITH_SYS_TIME +diff -r 809c85574bfe libgcc/unwind-dw2-fde-dip.c +--- a/libgcc/unwind-dw2-fde-dip.c Tue Dec 31 14:54:55 2013 -0500 ++++ b/libgcc/unwind-dw2-fde-dip.c Tue Dec 31 14:54:58 2013 -0500 +@@ -46,33 +46,13 @@ + #include "unwind-compat.h" + #include "gthr.h" + +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \ +- || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) ++#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) && defined(TARGET_DL_ITERATE_PHDR) + # define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(__BIONIC__) +-# define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(__FreeBSD__) && __FreeBSD__ >= 7 +-# define ElfW __ElfN +-# define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(__OpenBSD__) +-# define ElfW(type) Elf_##type +-# define USE_PT_GNU_EH_FRAME +-#endif +- +-#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ +- && defined(TARGET_DL_ITERATE_PHDR) \ +- && defined(__sun__) && defined(__svr4__) +-# define USE_PT_GNU_EH_FRAME ++# ifdef __OpenBSD__ ++# define ElfW(type) Elf_##typ ++# elif defined(__FreeBSD__) && __FreeBSD__ >= 7 ++# define ElfW __ElfN ++# endif + #endif + + #if defined(USE_PT_GNU_EH_FRAME) +diff -r 03604918697c gcc/configure +--- a/gcc/configure Tue Dec 31 14:54:58 2013 -0500 ++++ b/gcc/configure Tue Dec 31 14:55:01 2013 -0500 +@@ -26739,6 +26739,9 @@ + else + gcc_cv_libc_provides_ssp=no + case "$target" in ++ *-*-musl*) ++ # All versions of musl provide stack protector ++ gcc_cv_libc_provides_ssp=yes;; + *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu) + # glibc 2.4 and later provides __stack_chk_fail and + # either __stack_chk_guard, or TLS access to stack guard canary. +@@ -26772,6 +26775,7 @@ + # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now + # simply assert that glibc does provide this, which is true for all + # realistically usable GNU/Hurd configurations. ++ # All supported versions of musl provide it as well + gcc_cv_libc_provides_ssp=yes;; + *-*-darwin* | *-*-freebsd*) + ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail" +@@ -26854,6 +26858,9 @@ + gcc_cv_target_dl_iterate_phdr=no + fi + ;; ++ *-linux-musl*) ++ gcc_cv_target_dl_iterate_phdr=yes ++ ;; + esac + + if test x$gcc_cv_target_dl_iterate_phdr = xyes; then +diff -r 03604918697c gcc/configure.ac +--- a/gcc/configure.ac Tue Dec 31 14:54:58 2013 -0500 ++++ b/gcc/configure.ac Tue Dec 31 14:55:01 2013 -0500 +@@ -4722,6 +4722,9 @@ + gcc_cv_libc_provides_ssp, + [gcc_cv_libc_provides_ssp=no + case "$target" in ++ *-*-musl*) ++ # All versions of musl provide stack protector ++ gcc_cv_libc_provides_ssp=yes;; + *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu) + [# glibc 2.4 and later provides __stack_chk_fail and + # either __stack_chk_guard, or TLS access to stack guard canary. +@@ -4755,6 +4758,7 @@ + # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now + # simply assert that glibc does provide this, which is true for all + # realistically usable GNU/Hurd configurations. ++ # All supported versions of musl provide it as well + gcc_cv_libc_provides_ssp=yes;; + *-*-darwin* | *-*-freebsd*) + AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes], +@@ -4820,6 +4824,9 @@ + gcc_cv_target_dl_iterate_phdr=no + fi + ;; ++ *-linux-musl*) ++ gcc_cv_target_dl_iterate_phdr=yes ++ ;; + esac + GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR]) + if test x$gcc_cv_target_dl_iterate_phdr = xyes; then +# HG changeset patch +# Parent 600a8a422ccaf5627ad1f5a138e7398df2b9e9d8 +Get rid of ever-broken fixincludes on musl. + +diff -r 600a8a422cca fixincludes/mkfixinc.sh +--- a/fixincludes/mkfixinc.sh Tue Dec 31 14:55:01 2013 -0500 ++++ b/fixincludes/mkfixinc.sh Tue Dec 31 14:55:04 2013 -0500 +@@ -19,7 +19,8 @@ + powerpc-*-eabi* | \ + powerpc-*-rtems* | \ + powerpcle-*-eabisim* | \ +- powerpcle-*-eabi* ) ++ powerpcle-*-eabi* | \ ++ *-musl* ) + # IF there is no include fixing, + # THEN create a no-op fixer and exit + (echo "#! /bin/sh" ; echo "exit 0" ) > ${target} +# HG changeset patch +# Parent 4696c3bf3d913eca88e9385ea9717541dfe1e033 +Support for i386-linux-musl and x86_64-linux-musl. + +diff -r 4696c3bf3d91 gcc/config/i386/linux.h +--- a/gcc/config/i386/linux.h Tue Dec 31 14:55:04 2013 -0500 ++++ b/gcc/config/i386/linux.h Tue Dec 31 14:55:08 2013 -0500 +@@ -21,3 +21,4 @@ + + #define GNU_USER_LINK_EMULATION "elf_i386" + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" +diff -r 4696c3bf3d91 gcc/config/i386/linux64.h +--- a/gcc/config/i386/linux64.h Tue Dec 31 14:55:04 2013 -0500 ++++ b/gcc/config/i386/linux64.h Tue Dec 31 14:55:08 2013 -0500 +@@ -30,3 +30,7 @@ + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" + #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" + #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" ++ ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" ++#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" +diff -r 4696c3bf3d91 libitm/config/linux/x86/tls.h +--- a/libitm/config/linux/x86/tls.h Tue Dec 31 14:55:04 2013 -0500 ++++ b/libitm/config/linux/x86/tls.h Tue Dec 31 14:55:08 2013 -0500 +@@ -25,16 +25,19 @@ + #ifndef LIBITM_X86_TLS_H + #define LIBITM_X86_TLS_H 1 + +-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) ++#if defined(__GLIBC_PREREQ) ++#if __GLIBC_PREREQ(2, 10) + /* Use slots in the TCB head rather than __thread lookups. + GLIBC has reserved words 10 through 13 for TM. */ + #define HAVE_ARCH_GTM_THREAD 1 + #define HAVE_ARCH_GTM_THREAD_DISP 1 + #endif ++#endif + + #include "config/generic/tls.h" + +-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) ++#if defined(__GLIBC_PREREQ) ++#if __GLIBC_PREREQ(2, 10) + namespace GTM HIDDEN { + + #ifdef __x86_64__ +@@ -101,5 +104,6 @@ + + } // namespace GTM + #endif /* >= GLIBC 2.10 */ ++#endif + + #endif // LIBITM_X86_TLS_H +# HG changeset patch +# Parent 6738fd6f6fcc2a72f2ba527bda3325642af26885 +Support for arm-linux-musl. + +diff -r 6738fd6f6fcc gcc/config/arm/linux-eabi.h +--- a/gcc/config/arm/linux-eabi.h Tue Dec 31 14:55:08 2013 -0500 ++++ b/gcc/config/arm/linux-eabi.h Tue Dec 31 14:55:11 2013 -0500 +@@ -77,6 +77,23 @@ + %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ + %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" + ++/* For ARM musl currently supports four dynamic linkers: ++ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI ++ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI ++ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB ++ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB ++ musl does not support the legacy OABI mode. ++ All the dynamic linkers live in /lib. ++ We default to soft-float, EL. */ ++#undef MUSL_DYNAMIC_LINKER ++#if TARGET_BIG_ENDIAN_DEFAULT ++#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}" ++#else ++#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}" ++#endif ++#define MUSL_DYNAMIC_LINKER \ ++ "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1" ++ + /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to + use the GNU/Linux version, not the generic BPABI version. */ + #undef LINK_SPEC +diff -r 6738fd6f6fcc libitm/config/arm/hwcap.cc +--- a/libitm/config/arm/hwcap.cc Tue Dec 31 14:55:08 2013 -0500 ++++ b/libitm/config/arm/hwcap.cc Tue Dec 31 14:55:11 2013 -0500 +@@ -40,7 +40,11 @@ + + #ifdef __linux__ + #include <unistd.h> ++#ifdef __GLIBC__ + #include <sys/fcntl.h> ++#else ++#include <fcntl.h> ++#endif + #include <elf.h> + + static void __attribute__((constructor)) +# HG changeset patch +# Parent 7d7383f638705a01fdc18e0e7e0c9cdb6387fc5d +Support for mips-linux-musl. + +diff -r 7d7383f63870 gcc/config/mips/linux.h +--- a/gcc/config/mips/linux.h Tue Dec 31 14:55:11 2013 -0500 ++++ b/gcc/config/mips/linux.h Tue Dec 31 14:55:14 2013 -0500 +@@ -18,3 +18,10 @@ + <http://www.gnu.org/licenses/>. */ + + #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++ ++#if TARGET_ENDIAN_DEFAULT == 0 /* LE */ ++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" ++#else ++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" ++#endif ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E ".so.1" +# HG changeset patch +# Parent 89df6d7e91c686da676ce27ef9b9d10522810c26 +Support for powerpc-linux-musl. + +diff -r 89df6d7e91c6 gcc/config.gcc +--- a/gcc/config.gcc Tue Dec 31 14:55:14 2013 -0500 ++++ b/gcc/config.gcc Tue Dec 31 14:55:17 2013 -0500 +@@ -2117,6 +2117,10 @@ + powerpc*-*-linux*paired*) + tm_file="${tm_file} rs6000/750cl.h" ;; + esac ++ case ${target} in ++ *-linux*-musl*) ++ enable_secureplt=yes ;; ++ esac + if test x${enable_secureplt} = xyes; then + tm_file="rs6000/secureplt.h ${tm_file}" + fi +diff -r 89df6d7e91c6 gcc/config/rs6000/linux64.h +--- a/gcc/config/rs6000/linux64.h Tue Dec 31 14:55:14 2013 -0500 ++++ b/gcc/config/rs6000/linux64.h Tue Dec 31 14:55:17 2013 -0500 +@@ -354,17 +354,21 @@ + #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" + #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" + #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1" + #if DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" + #elif DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" + #else + #error "Unsupported DEFAULT_LIBC" + #endif + #define GNU_USER_DYNAMIC_LINKER32 \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) + #define GNU_USER_DYNAMIC_LINKER64 \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) + + #undef DEFAULT_ASM_ENDIAN + #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) +diff -r 89df6d7e91c6 gcc/config/rs6000/secureplt.h +--- a/gcc/config/rs6000/secureplt.h Tue Dec 31 14:55:14 2013 -0500 ++++ b/gcc/config/rs6000/secureplt.h Tue Dec 31 14:55:17 2013 -0500 +@@ -18,3 +18,4 @@ + <http://www.gnu.org/licenses/>. */ + + #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" ++#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" +diff -r 89df6d7e91c6 gcc/config/rs6000/sysv4.h +--- a/gcc/config/rs6000/sysv4.h Tue Dec 31 14:55:14 2013 -0500 ++++ b/gcc/config/rs6000/sysv4.h Tue Dec 31 14:55:17 2013 -0500 +@@ -550,6 +550,9 @@ + #ifndef CC1_SECURE_PLT_DEFAULT_SPEC + #define CC1_SECURE_PLT_DEFAULT_SPEC "" + #endif ++#ifndef LINK_SECURE_PLT_DEFAULT_SPEC ++#define LINK_SECURE_PLT_DEFAULT_SPEC "" ++#endif + + /* Pass -G xxx to the compiler and set correct endian mode. */ + #define CC1_SPEC "%{G*} %(cc1_cpu)" \ +@@ -600,7 +603,8 @@ + + /* Override the default target of the linker. */ + #define LINK_TARGET_SPEC \ +- ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") ++ ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \ ++ "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}" + + /* Any specific OS flags. */ + #define LINK_OS_SPEC "\ +@@ -778,15 +782,18 @@ + + #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" + #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1" + #if DEFAULT_LIBC == LIBC_UCLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" ++#elif DEFAULT_LIBC == LIBC_MUSL ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" + #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC +-#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" ++#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" + #else + #error "Unsupported DEFAULT_LIBC" + #endif + #define GNU_USER_DYNAMIC_LINKER \ +- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) ++ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) + + #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -912,6 +919,7 @@ + { "cc1_endian_little", CC1_ENDIAN_LITTLE_SPEC }, \ + { "cc1_endian_default", CC1_ENDIAN_DEFAULT_SPEC }, \ + { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ ++ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \ + { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ + { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ + { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ +diff -r d7ce17b2f2d6 gcc/config/aarch64/aarch64-linux.h +--- a/gcc/config/aarch64/aarch64-linux.h Tue Dec 31 14:55:17 2013 -0500 ++++ b/gcc/config/aarch64/aarch64-linux.h Tue Dec 31 14:55:20 2013 -0500 +@@ -21,7 +21,11 @@ + #ifndef GCC_AARCH64_LINUX_H + #define GCC_AARCH64_LINUX_H + ++/* The AArch64 port currently supports two dynamic linkers: ++ - ld-linux-aarch64.so.1 - GLIBC dynamic linker ++ - ld-musl-aarch64.so.1 - musl libc dynamic linker */ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1" + + #define CPP_SPEC "%{pthread:-D_REENTRANT}" + +# HG changeset patch +# Parent f2601e4063d0d58d8ab04185e8baefd560d09496 +Microblaze support (again). + + +diff -r f2601e4063d0 -r 0736dfe1aa0d gcc/config/microblaze/linux.h +--- a/gcc/config/microblaze/linux.h Tue Dec 31 14:55:20 2013 -0500 ++++ b/gcc/config/microblaze/linux.h Tue Dec 31 15:09:52 2013 -0500 +@@ -25,7 +25,22 @@ + #undef TLS_NEEDS_GOT + #define TLS_NEEDS_GOT 1 + +-#define DYNAMIC_LINKER "/lib/ld.so.1" ++#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */ ++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" ++#else ++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" ++#endif ++ ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1" ++#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" ++ ++#if DEFAULT_LIBC == LIBC_MUSL ++#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER ++#else ++#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER ++#endif ++ ++ + #undef SUBTARGET_EXTRA_SPECS + #define SUBTARGET_EXTRA_SPECS \ + { "dynamic_linker", DYNAMIC_LINKER } +From 478ee0c03a08e2ef9371fd88d516738936943e78 Mon Sep 17 00:00:00 2001 +From: David Holsgrove <david.holsgrove@xilinx.com> +Date: Fri, 28 Sep 2012 16:32:03 +1000 +Subject: [PATCH 06/11] [Patch, microblaze]: Add SIZE_TYPE and PTRDIFF_TYPE to + microblaze.h + +Fixes warnings like; + +warning: format '%zX' expects argument of type 'size_t', +but argument 3 has type 'unsigned int' [-Wformat] + +Changelog + +2013-03-18 David Holsgrove <david.holsgrove@xilinx.com> + + * gcc/config/microblaze/microblaze.h: Define SIZE_TYPE + and PTRDIFF_TYPE. + +Signed-off-by: David Holsgrove <david.holsgrove@xilinx.com> +--- + gcc/config/microblaze/microblaze.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/gcc/config/microblaze/microblaze.h b/gcc/config/microblaze/microblaze.h +index 19cdfed..e772a3f 100644 +--- a/gcc/config/microblaze/microblaze.h ++++ b/gcc/config/microblaze/microblaze.h +@@ -213,6 +213,12 @@ extern enum pipeline_type microblaze_pipe; + #define STRICT_ALIGNMENT 1 + #define PCC_BITFIELD_TYPE_MATTERS 1 + ++#undef SIZE_TYPE ++#define SIZE_TYPE "unsigned int" ++ ++#undef PTRDIFF_TYPE ++#define PTRDIFF_TYPE "int" ++ + #define CONSTANT_ALIGNMENT(EXP, ALIGN) \ + ((TREE_CODE (EXP) == STRING_CST || TREE_CODE (EXP) == CONSTRUCTOR) \ + && (ALIGN) < BITS_PER_WORD \ +-- +1.7.9.5 + diff --git a/toolchain/gdb/Makefile.inc b/toolchain/gdb/Makefile.inc index 0ac2dc8c3..23912e1e6 100644 --- a/toolchain/gdb/Makefile.inc +++ b/toolchain/gdb/Makefile.inc @@ -2,8 +2,8 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= gdb -PKG_VERSION:= 7.6 -PKG_MD5SUM:= fda57170e4d11cdde74259ca575412a8 +PKG_VERSION:= 7.7 +PKG_MD5SUM:= 271a18f41858a7e98b28ae4eb91287c9 PKG_RELEASE:= 1 PKG_SITES:= ${MASTER_SITE_GNU:=gdb/} DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/tools/adk/pkgmaker.c b/tools/adk/pkgmaker.c index 3609691b6..d2c444f4f 100644 --- a/tools/adk/pkgmaker.c +++ b/tools/adk/pkgmaker.c @@ -33,7 +33,7 @@ #define MAXVALUE 168 #define MAXVAR 64 #define MAXPATH 320 -#define HASHSZ 32 +#define HASHSZ 96 static int nobinpkgs; |