diff options
89 files changed, 1045 insertions, 698 deletions
diff --git a/.gitignore b/.gitignore index 3ac956900..68214f10b 100644 --- a/.gitignore +++ b/.gitignore @@ -56,6 +56,7 @@ /target/packages/Config.in /target/config/Config.in.system.default /target/config/Config.in.system +/target/config/Config.in.scripts /target/config/Config.in.native /target/config/Config.in.arch /target/config/Config.in.prereq @@ -32,11 +32,6 @@ config ADK_CHOOSE_TARGET_SYSTEM source "target/config/Config.in" -menu "Runtime configuration" -depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM -source "target/config/Config.in.runtime" -endmenu - menu "Package collection" depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM source "target/packages/Config.in" @@ -89,6 +84,11 @@ source "package/Config.in.auto.global" source "package/Config.in.auto" endmenu +menu "Runtime configuration" +depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM +source "target/config/Config.in.runtime" +endmenu + choice prompt "Kernel Version" depends on ADK_TOOLCHAIN_ONLY @@ -18,7 +18,6 @@ - add grsec kernel patch - microblaze: add cfgfs partition to dts, add partition to spartan dts - evaluate libguestfs for image creation -- port w3m - port msmtp - rutorrent porting - lms perl diff --git a/adk/tools/pkgmaker.c b/adk/tools/pkgmaker.c index 51d31aa70..6997f3def 100644 --- a/adk/tools/pkgmaker.c +++ b/adk/tools/pkgmaker.c @@ -304,13 +304,18 @@ static char *toupperstr(char *string) { int main() { - DIR *pkgdir, *pkglistdir; + DIR *pkgdir, *pkglistdir, *scriptdir; struct dirent *pkgdirp; - FILE *pkg, *cfg, *menuglobal, *section; + struct dirent *scriptdirp; + size_t len; + FILE *pkg, *cfg, *menuglobal, *section, *initscript, *icfg; char hvalue[MAXVALUE]; char buf[MAXPATH]; + char ibuf[MAXPATH]; char tbuf[MAXPATH]; char path[MAXPATH]; + char script[MAXPATH]; + char script2[MAXPATH]; char spath[MAXPATH]; char dir[MAXPATH]; char variable[2*MAXVAR]; @@ -320,9 +325,10 @@ int main() { char *pkg_need_cxx, *pkg_need_java, *pkgname, *sysname, *pkg_debug; char *pkg_libc_depends, *pkg_host_depends, *pkg_system_depends, *pkg_arch_depends, *pkg_flavours, *pkg_flavours_string, *pkg_choices, *pseudo_name; char *packages, *pkg_name_u, *pkgs, *pkg_opts, *pkg_libname; - char *saveptr, *p_ptr, *s_ptr, *pkg_helper; + char *saveptr, *p_ptr, *s_ptr, *pkg_helper, *sname, *sname2; int result; StrMap *pkgmap, *sectionmap; + const char runtime[] = "target/config/Config.in.scripts"; pkg_name = NULL; pkg_descr = NULL; @@ -355,6 +361,7 @@ int main() { s_ptr = NULL; unlink("package/Config.in.auto"); + unlink(runtime); /* open global sectionfile */ menuglobal = fopen("package/Config.in.auto.global", "w"); if (menuglobal == NULL) @@ -410,6 +417,7 @@ int main() { fprintf(cfg, "\t C library header files.\n\n"); fclose(cfg); + /* read Makefile's for all packages */ pkgdir = opendir("package"); while ((pkgdirp = readdir(pkgdir)) != NULL) { @@ -421,6 +429,57 @@ int main() { if (pkg == NULL) continue; + /* runtime configuration */ + if (snprintf(script, MAXPATH, "package/%s/files", pkgdirp->d_name) < 0) + fatal_error("script variable creation failed."); + scriptdir = opendir(script); + if (scriptdir != NULL) { + while ((scriptdirp = readdir(scriptdir)) != NULL) { + /* skip dotfiles */ + if (strncmp(scriptdirp->d_name, ".", 1) > 0) { + len = strlen(scriptdirp->d_name); + if (strlen(".init") > len) + continue; + if (strncmp(scriptdirp->d_name + len - strlen(".init"), ".init", strlen(".init")) == 0) { + if (snprintf(script, MAXPATH, "package/%s/files/%s", pkgdirp->d_name, scriptdirp->d_name) < 0) + fatal_error("script variable creation failed."); + initscript = fopen(script, "r"); + if (initscript == NULL) + continue; + + while (fgets(ibuf, MAXPATH, initscript) != NULL) { + if (strncmp("#PKG", ibuf, 4) == 0) { + sname = strdup(ibuf+5); + sname[strlen(sname)-1] = '\0'; + sname2 = strdup(scriptdirp->d_name); + sname2[strlen(sname2)-5] = '\0'; + icfg = fopen(runtime, "a"); + if (icfg == NULL) + continue; + if (strncmp("busybox", sname, 7) == 0) + fprintf(icfg, "config ADK_RUNTIME_START_%s_%s\n", toupperstr(sname), toupperstr(sname2)); + else + fprintf(icfg, "config ADK_RUNTIME_START_%s\n", toupperstr(sname)); + fprintf(icfg, "\tprompt \"Start %s on boot\"\n", sname2); + fprintf(icfg, "\tboolean\n"); + if (strncmp("busybox", sname, 7) == 0) + fprintf(icfg, "\tdepends on BUSYBOX_%s\n", toupperstr(sname2)); + else + fprintf(icfg, "\tdepends on ADK_PACKAGE_%s\n", toupperstr(sname)); + fprintf(icfg, "\tdepends on ADK_RUNTIME_START_SERVICES\n"); + fprintf(icfg, "\tdefault n\n\n"); + fclose(icfg); + } + continue; + free(sname); + free(sname2); + } + } + } + } + closedir(scriptdir); + } + /* skip manually maintained packages */ if (snprintf(path, MAXPATH, "package/%s/Config.in.manual", pkgdirp->d_name) < 0) fatal_error("can not create path variable."); @@ -621,7 +680,6 @@ int main() { fclose(cfg); free(pkgs); - /* skip packages without binary package output */ if (nobinpkgs == 1) continue; diff --git a/mk/build.mk b/mk/build.mk index af1313206..6dcf88f1a 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -18,6 +18,7 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_LEAVE_ETC_ALONE=n \ ADK_SIMPLE_NETWORK_CONFIG=n \ ADK_USE_CCACHE=n \ + ADK_RUNTIME_START_SERVICES=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_E2FSCK_STATIC=n \ ADK_PACKAGE_KEXECINIT=n \ @@ -41,8 +42,9 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PKG_TEST=n \ ADK_PKG_MPDBOX=n \ ADK_PKG_DEVELOPMENT=n \ - ADK_TOOLCHAIN_GCC_USE_SSP=n \ - ADK_TOOLCHAIN_GCC_USE_LTO=n \ + ADK_TOOLCHAIN_USE_SSP=n \ + ADK_TOOLCHAIN_USE_LTO=n \ + ADK_TOOLCHAIN_USE_GOLD=n \ BUSYBOX_IFPLUGD=n \ BUSYBOX_EXTRA_COMPAT=n \ BUSYBOX_FEATURE_IFCONFIG_SLIP=n \ diff --git a/mk/package.mk b/mk/package.mk index eba9c446a..c23530e17 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -178,6 +178,9 @@ $$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE} @for file in conffiles preinst postinst prerm postrm; do \ [ ! -f ./files/$(2).$$$$file ] || cp ./files/$(2).$$$$file $$(IDIR_$(1))/CONTROL/$$$$file; \ done +ifeq ($(ADK_RUNTIME_START_$(1)),y) + $(SED) "s#NO#YES#" $$(IDIR_$(1))/CONTROL/postinst +endif ifneq ($(ADK_DEBUG),y) @echo "Package: $$(shell echo $(2) | tr '_' '-')-dbg" > $(WRKDIR)/.$(2)-dbg.control @echo "Section: debug" >> $(WRKDIR)/.$(2)-dbg.control diff --git a/mk/vars.mk b/mk/vars.mk index e804ad5e6..2f2ecc134 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -111,13 +111,19 @@ TARGET_LDFLAGS+= -Wl,--secure-plt endif endif -ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),) +ifeq ($(ADK_STATIC),y) +TARGET_CFLAGS+= -static +TARGET_CXXFLAGS+= -static +TARGET_LDFLAGS+= -static +endif + +ifneq ($(ADK_TOOLCHAIN_USE_SSP),) TARGET_CFLAGS+= -fstack-protector TARGET_CXXFLAGS+= -fstack-protector TARGET_LDFLAGS+= -fstack-protector endif -ifneq ($(ADK_TOOLCHAIN_GCC_USE_LTO),) +ifneq ($(ADK_TOOLCHAIN_USE_LTO),) TARGET_CFLAGS+= -flto TARGET_CXXFLAGS+= -flto TARGET_LDFLAGS+= -flto diff --git a/package/avahi/Makefile b/package/avahi/Makefile index bd203e79e..a79afbb20 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -61,7 +61,7 @@ CONFIGURE_ARGS+= --enable-glib \ --with-avahi-user=avahi \ --with-avahi-group=avahi -ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) CONFIGURE_ARGS+= --enable-stack-protector else CONFIGURE_ARGS+= --disable-stack-protector diff --git a/package/busybox/Makefile b/package/busybox/Makefile index fce16fa32..6b07623b0 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:= 5 +PKG_RELEASE:= 6 PKG_MD5SUM:= 795394f83903b5eec6567d51eebb417e PKG_DESCR:= core utilities for embedded systems PKG_SECTION:= base @@ -60,6 +60,10 @@ do-build: do-install: $(MAKE) ${BB_MAKE_FLAGS} install $(MAKE_TRACE) $(CP) $(WRKINST)/* $(IDIR_BUSYBOX)/ +ifeq ($(BUSYBOX_IFUPDOWN),y) + $(INSTALL_DIR) $(IDIR_BUSYBOX)/etc/init.d + $(INSTALL_BIN) ./files/network $(IDIR_BUSYBOX)/etc/init.d +endif ifeq ($(ADK_DEBUG),y) ${INSTALL_BIN} $(WRKBUILD)/busybox_unstripped \ $(IDIR_BUSYBOX)/bin/busybox diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in index 4c05e5dae..f13267eac 100644 --- a/package/busybox/config/miscutils/Config.in +++ b/package/busybox/config/miscutils/Config.in @@ -281,7 +281,7 @@ config BUSYBOX_CHRT config BUSYBOX_CROND bool "crond" - default y + default n select BUSYBOX_FEATURE_SYSLOG help Crond is a background daemon that parses individual crontab @@ -301,7 +301,7 @@ config BUSYBOX_FEATURE_CROND_D config BUSYBOX_FEATURE_CROND_CALL_SENDMAIL bool "Report command output via email (using sendmail)" - default y + default n depends on BUSYBOX_CROND help Command output will be sent to corresponding user via email. @@ -747,7 +747,7 @@ config BUSYBOX_WALL config BUSYBOX_WATCHDOG bool "watchdog" - default y + default n depends on !BUSYBOX_DISABLE_WATCHDOG select BUSYBOX_PLATFORM_LINUX help diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index e350a1b16..fa5a7cd47 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -748,7 +748,7 @@ config BUSYBOX_NSLOOKUP config BUSYBOX_NTPD bool "ntpd" depends on !BUSYBOX_DISABLE_NTPD - default y + default n select BUSYBOX_PLATFORM_LINUX help The NTP client/server daemon. diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in index 6ece73097..e0f20fc49 100644 --- a/package/busybox/config/networking/udhcp/Config.in +++ b/package/busybox/config/networking/udhcp/Config.in @@ -12,7 +12,7 @@ config BUSYBOX_UDHCPC6 config BUSYBOX_UDHCPD bool "udhcp server (udhcpd)" - default y + default n select BUSYBOX_PLATFORM_LINUX help udhcpd is a DHCP server geared primarily toward embedded systems, diff --git a/package/busybox/files/busybox.postinst b/package/busybox/files/busybox.postinst index c71a536ce..d403ff481 100644 --- a/package/busybox/files/busybox.postinst +++ b/package/busybox/files/busybox.postinst @@ -5,7 +5,8 @@ add_rcconf network network YES add_rcconf crond crond NO add_rcconf watchdog watchdog NO add_rcconf watchdog_flags watchdog_flags '-t 10 -T 20' -add_rcconf 'use "-C32" normally, "NO" to disable' syslogd_flags '-C32' +add_rcconf syslogd NO +add_rcconf 'use "-C32" normally' syslogd_flags '-C32' add_rcconf inetd inetd NO add_rcconf ntpd ntpd NO add_rcconf ntpd_flags ntpd_flags '-p time.fu-berlin.de' diff --git a/package/busybox/files/network.init b/package/busybox/files/network index 4989fcbcb..4989fcbcb 100644 --- a/package/busybox/files/network.init +++ b/package/busybox/files/network diff --git a/package/busybox/files/syslog.init b/package/busybox/files/syslogd.init index 7a85430ca..7a85430ca 100644 --- a/package/busybox/files/syslog.init +++ b/package/busybox/files/syslogd.init diff --git a/package/busybox/files/udhcpd.init b/package/busybox/files/udhcpd.init index f626fb732..edec3ac91 100644 --- a/package/busybox/files/udhcpd.init +++ b/package/busybox/files/udhcpd.init @@ -1,5 +1,5 @@ #!/bin/sh -#PKG udhcpd +#PKG busybox #INIT 50 . /etc/rc.conf diff --git a/package/busybox/patches/001-ipkg.patch b/package/busybox/patches/001-ipkg.patch index 5f392d06b..1b65a5c90 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 2014-02-17 14:25:39.802534016 +0100 ++++ busybox-1.21.1/archival/Config.src 2014-04-07 12:36:32.391575261 +0200 @@ -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 2014-02-17 14:25:39.802534016 +0100 ++++ busybox-1.21.1/archival/ipkg.c 2014-04-07 12:36:32.391575261 +0200 @@ -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 2014-02-17 14:25:39.802534016 +0100 ++++ busybox-1.21.1/archival/Kbuild.src 2014-04-07 12:36:32.391575261 +0200 @@ -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 2014-02-17 14:25:39.802534016 +0100 ++++ busybox-1.21.1/archival/libarchive/Kbuild.src 2014-04-07 12:36:32.391575261 +0200 @@ -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 2014-02-17 14:25:39.826534090 +0100 ++++ busybox-1.21.1/archival/libipkg/args.c 2014-04-07 12:36:32.391575261 +0200 @@ -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 2014-02-17 14:25:39.826534090 +0100 ++++ busybox-1.21.1/archival/libipkg/args.h 2014-04-07 12:36:32.391575261 +0200 @@ -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 2014-02-17 14:25:39.826534090 +0100 ++++ busybox-1.21.1/archival/libipkg/conffile.c 2014-04-07 12:36:32.391575261 +0200 @@ -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 2014-02-17 14:25:39.826534090 +0100 ++++ busybox-1.21.1/archival/libipkg/conffile.h 2014-04-07 12:36:32.391575261 +0200 @@ -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 2014-02-17 14:25:39.850534164 +0100 ++++ busybox-1.21.1/archival/libipkg/conffile_list.c 2014-04-07 12:36:32.391575261 +0200 @@ -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 2014-02-17 14:25:39.850534164 +0100 ++++ busybox-1.21.1/archival/libipkg/conffile_list.h 2014-04-07 12:36:32.391575261 +0200 @@ -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 2014-02-17 14:25:39.850534164 +0100 ++++ busybox-1.21.1/archival/libipkg/file_util.c 2014-04-07 12:36:32.391575261 +0200 @@ -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 2014-02-17 14:25:39.850534164 +0100 ++++ busybox-1.21.1/archival/libipkg/file_util.h 2014-04-07 12:36:32.391575261 +0200 @@ -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 2014-02-17 14:25:39.850534164 +0100 ++++ busybox-1.21.1/archival/libipkg/hash_table.c 2014-04-07 12:36:32.391575261 +0200 @@ -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 2014-02-17 14:25:39.854534176 +0100 ++++ busybox-1.21.1/archival/libipkg/hash_table.h 2014-04-07 12:36:32.391575261 +0200 @@ -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 2014-02-17 14:25:39.858534188 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_cmd.c 2014-04-07 12:36:32.411575387 +0200 @@ -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 2014-02-17 14:25:39.858534188 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_cmd.h 2014-04-07 12:36:32.411575387 +0200 @@ -0,0 +1,41 @@ +/* ipkg_cmd.h - the itsy package management system + @@ -2441,7 +2441,7 @@ 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 2014-02-17 19:29:30.303924578 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_conf.c 2014-04-07 12:36:32.411575387 +0200 @@ -0,0 +1,739 @@ +/* ipkg_conf.c - the itsy package management system + @@ -3184,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 2014-02-17 14:25:39.858534188 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_conf.h 2014-04-07 12:36:32.411575387 +0200 @@ -0,0 +1,107 @@ +/* ipkg_conf.h - the itsy package management system + @@ -3295,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 2014-02-17 14:25:39.858534188 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_configure.c 2014-04-07 12:36:32.411575387 +0200 @@ -0,0 +1,40 @@ +/* ipkg_configure.c - the itsy package management system + @@ -3339,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 2014-02-17 14:25:39.858534188 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_configure.h 2014-04-07 12:36:32.411575387 +0200 @@ -0,0 +1,25 @@ +/* ipkg_configure.h - the itsy package management system + @@ -3368,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 2014-02-17 14:25:39.858534188 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_download.c 2014-04-07 12:36:32.411575387 +0200 @@ -0,0 +1,195 @@ +/* ipkg_download.c - the itsy package management system + @@ -3567,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 2014-02-17 14:25:39.858534188 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_download.h 2014-04-07 12:36:32.411575387 +0200 @@ -0,0 +1,30 @@ +/* ipkg_download.h - the itsy package management system + @@ -3601,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 2014-02-17 14:25:39.858534188 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg.h 2014-04-07 12:36:32.411575387 +0200 @@ -0,0 +1,68 @@ +/* ipkg.h - the itsy package management system + @@ -3673,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 2014-02-17 14:25:39.858534188 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_includes.h 2014-04-07 12:36:32.411575387 +0200 @@ -0,0 +1,82 @@ +#ifndef IPKG_INCLUDES_H +#define IPKG_INCLUDES_H @@ -3759,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 2014-02-17 14:25:39.858534188 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_install.c 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,1982 @@ +/* ipkg_install.c - the itsy package management system + @@ -5745,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 2014-02-17 14:25:39.858534188 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_install.h 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,35 @@ +/* ipkg_install.h - the itsy package management system + @@ -5784,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 2014-02-17 14:25:39.858534188 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_message.c 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,35 @@ +/* ipkg_message.c - the itsy package management system + @@ -5823,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 2014-02-17 14:25:39.858534188 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_message.h 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,32 @@ +/* ipkg_message.h - the itsy package management system + @@ -5859,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 2014-02-17 14:25:39.858534188 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_remove.c 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,385 @@ +/* ipkg_remove.c - the itsy package management system + @@ -6248,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 2014-02-17 14:25:39.858534188 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_remove.h 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,33 @@ +/* ipkg_remove.h - the itsy package management system + @@ -6285,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 2014-02-17 14:25:39.858534188 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.c 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,79 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6368,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_upgrade.h 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,18 @@ +/* ipkg_upgrade.c - the itsy package management system + @@ -6390,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_utils.c 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,185 @@ +/* ipkg_utils.c - the itsy package management system + @@ -6579,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/ipkg_utils.h 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,29 @@ +/* ipkg_utils.h - the itsy package management system + @@ -6612,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/Kbuild 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,60 @@ +# Makefile for busybox +# @@ -6676,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/libipkg.c 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,583 @@ +/* ipkglib.c - the itsy package management system + @@ -7263,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/libipkg.h 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,78 @@ +/* ipkglib.h - the itsy package management system + @@ -7345,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/nv_pair.c 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,40 @@ +/* nv_pair.c - the itsy package management system + @@ -7389,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/nv_pair.h 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,32 @@ +/* nv_pair.h - the itsy package management system + @@ -7425,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/nv_pair_list.c 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,98 @@ +/* nv_pair_list.c - the itsy package management system + @@ -7527,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/nv_pair_list.h 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,60 @@ +/* nv_pair_list.h - the itsy package management system + @@ -7591,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg.c 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,1757 @@ +/* pkg.c - the itsy package management system + @@ -9352,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_depends.c 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,1032 @@ +/* pkg_depends.c - the itsy package management system + @@ -10388,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_depends.h 2014-04-07 12:36:32.415575413 +0200 @@ -0,0 +1,105 @@ +/* pkg_depends.h - the itsy package management system + @@ -10497,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_dest.c 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,92 @@ +/* pkg_dest.c - the itsy package management system + @@ -10593,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_dest.h 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,38 @@ +/* pkg_dest.h - the itsy package management system + @@ -10635,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_dest_list.c 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,85 @@ +/* pkg_dest_list.c - the itsy package management system + @@ -10724,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_dest_list.h 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,50 @@ +/* pkg_dest_list.h - the itsy package management system + @@ -10778,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_extract.c 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,255 @@ +/* pkg_extract.c - the itsy package management system + @@ -11037,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_extract.h 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,32 @@ +/* pkg_extract.c - the itsy package management system + @@ -11073,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg.h 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,229 @@ +/* pkg.h - the itsy package management system + @@ -11306,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_hash.c 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,623 @@ +/* ipkg_hash.c - the itsy package management system + @@ -11933,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 2014-02-17 14:25:39.862534201 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_hash.h 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,61 @@ +/* pkg_hash.h - the itsy package management system + @@ -11998,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 2014-02-17 14:25:39.866534213 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_parse.c 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,368 @@ +/* pkg_parse.c - the itsy package management system + @@ -12370,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 2014-02-17 14:25:39.866534213 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_parse.h 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,31 @@ +/* pkg_parse.h - the itsy package management system + @@ -12405,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 2014-02-17 14:25:39.866534213 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_src.c 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,43 @@ +/* pkg_src.c - the itsy package management system + @@ -12452,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 2014-02-17 14:25:39.866534213 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_src.h 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,34 @@ +/* pkg_src.h - the itsy package management system + @@ -12490,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 2014-02-17 14:25:39.866534213 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_src_list.c 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,75 @@ +/* pkg_src_list.c - the itsy package management system + @@ -12569,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 2014-02-17 14:25:39.866534213 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_src_list.h 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,57 @@ +/* pkg_src_list.h - the itsy package management system + @@ -12630,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 2014-02-17 14:25:39.866534213 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_vec.c 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,231 @@ +/* pkg_vec.c - the itsy package management system + @@ -12865,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 2014-02-17 14:25:39.866534213 +0100 ++++ busybox-1.21.1/archival/libipkg/pkg_vec.h 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,62 @@ +/* pkg_vec.h - the itsy package management system + @@ -12931,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 2014-02-17 14:25:39.866534213 +0100 ++++ busybox-1.21.1/archival/libipkg/sprintf_alloc.h 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,25 @@ +/* sprintf_alloca.c -- like sprintf with memory allocation + @@ -12960,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 2014-02-17 14:25:39.866534213 +0100 ++++ busybox-1.21.1/archival/libipkg/str_list.c 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,76 @@ +/* str_list.c - the itsy package management system + @@ -13040,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 2014-02-17 14:25:39.866534213 +0100 ++++ busybox-1.21.1/archival/libipkg/str_list.h 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,51 @@ +/* str_list.h - the itsy package management system + @@ -13095,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 2014-02-17 14:25:39.866534213 +0100 ++++ busybox-1.21.1/archival/libipkg/str_util.c 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,69 @@ +/* str_utils.c - the itsy package management system + @@ -13168,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 2014-02-17 14:25:39.866534213 +0100 ++++ busybox-1.21.1/archival/libipkg/str_util.h 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,27 @@ +/* str_utils.h - the itsy package management system + @@ -13199,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 2014-02-17 14:25:39.866534213 +0100 ++++ busybox-1.21.1/archival/libipkg/user.c 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,49 @@ +/* user.c - the itsy package management system + @@ -13252,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 2014-02-17 14:25:39.866534213 +0100 ++++ busybox-1.21.1/archival/libipkg/user.h 2014-04-07 12:36:32.419575442 +0200 @@ -0,0 +1,23 @@ +/* user.c - the itsy package management system + @@ -13279,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 2014-02-17 14:25:39.886534275 +0100 ++++ busybox-1.21.1/archival/libipkg/void_list.c 2014-04-07 12:36:32.423575470 +0200 @@ -0,0 +1,194 @@ +/* void_list.c - the itsy package management system + @@ -13477,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 2014-02-17 14:25:39.886534275 +0100 ++++ busybox-1.21.1/archival/libipkg/void_list.h 2014-04-07 12:36:32.423575470 +0200 @@ -0,0 +1,59 @@ +/* void_list.h - the itsy package management system + @@ -13540,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 2014-02-17 14:25:39.886534275 +0100 ++++ busybox-1.21.1/archival/libipkg/xsystem.c 2014-04-07 12:36:32.423575470 +0200 @@ -0,0 +1,64 @@ +/* xsystem.c - system(3) with error messages + @@ -13608,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 2014-02-17 14:25:39.890534287 +0100 ++++ busybox-1.21.1/archival/libipkg/xsystem.h 2014-04-07 12:36:32.423575470 +0200 @@ -0,0 +1,34 @@ +/* xsystem.h - system(3) with error messages + @@ -13646,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 2014-02-17 14:25:39.890534287 +0100 ++++ busybox-1.21.1/include/applets.src.h 2014-04-07 12:36:32.423575470 +0200 @@ -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)) @@ -13657,17 +13657,22 @@ 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 2014-02-17 14:25:39.890534287 +0100 -@@ -79,7 +79,7 @@ ++++ busybox-1.21.1/include/bb_archive.h 2014-04-07 12:37:05.279788781 +0200 +@@ -79,7 +79,6 @@ /* Archiver specific. Can make it a union if it ever gets big */ #define PAX_NEXT_FILE 0 #define PAX_GLOBAL 1 -#if ENABLE_TAR || ENABLE_DPKG || ENABLE_DPKG_DEB -+#if ENABLE_TAR || ENABLE_DPKG || ENABLE_DPKG_DEB || ENABLE_IPKG smallint tar__end; # if ENABLE_FEATURE_TAR_GNU_EXTENSIONS char* tar__longname; -@@ -98,7 +98,7 @@ +@@ -92,13 +91,12 @@ + # if ENABLE_FEATURE_TAR_SELINUX + char* tar__sctx[2]; + # endif +-#endif + #if ENABLE_CPIO || ENABLE_RPM2CPIO || ENABLE_RPM + uoff_t cpio__blocks; struct hardlinks_t *cpio__hardlinks_to_create; struct hardlinks_t *cpio__created_hardlinks; #endif @@ -13678,7 +13683,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 2014-02-17 14:25:39.890534287 +0100 ++++ busybox-1.21.1/include/usage.src.h 2014-04-07 12:36:32.423575470 +0200 @@ -19,4 +19,80 @@ #define busybox_notes_usage \ "Hello world!\n" @@ -13762,7 +13767,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 2014-02-17 14:25:39.890534287 +0100 ++++ busybox-1.21.1/Makefile 2014-04-07 12:36:32.423575470 +0200 @@ -466,6 +466,7 @@ libs-y := \ archival/ \ diff --git a/package/dansguardian/Makefile b/package/dansguardian/Makefile index 711bf0edb..fd7142d5f 100644 --- a/package/dansguardian/Makefile +++ b/package/dansguardian/Makefile @@ -26,7 +26,7 @@ ifeq ($(ADK_COMPILE_DANSGUARDIAN_WITH_UCLIBCXX),y) LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lm -lc -lgcc_s endif -ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) LIBRARIES+=-lssp endif diff --git a/package/dmidecode/Makefile b/package/dmidecode/Makefile index 8829c91b2..4eb004dc7 100644 --- a/package/dmidecode/Makefile +++ b/package/dmidecode/Makefile @@ -18,7 +18,7 @@ $(eval $(call PKG_template,DMIDECODE,dmidecode,$(PKG_VERSION)-${PKG_RELEASE},${P CONFIG_STYLE:= manual -ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) TARGET_LDFLAGS+= -lssp endif diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 319c7522f..58c55376d 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -14,7 +14,6 @@ PKG_SITES:= http://matt.ucc.asn.au/dropbear/releases/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 -PKG_DFLT_DROPBEAR:= y if !ADK_TOOLCHAIN_ONLY && !ADK_PKG_TEST PKG_SUBPKGS:= DROPBEAR DBCONVERT PKGSD_DBCONVERT:= Utility for converting SSH private keys @@ -26,8 +25,6 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,DROPBEAR,dropbear,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) $(eval $(call PKG_template,DBCONVERT,dropbearconvert,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_DBCONVERT},${PKG_SECTION})) -TARGET_LDFLAGS+= $(ADK_TARGET_ABI_CFLAGS) - ifeq ($(ADK_STATIC),y) TARGET_LDFLAGS+= -static endif diff --git a/package/dropbear/files/dropbear.postinst b/package/dropbear/files/dropbear.postinst index 11c7923bb..c39e16944 100644 --- a/package/dropbear/files/dropbear.postinst +++ b/package/dropbear/files/dropbear.postinst @@ -1,4 +1,4 @@ #!/bin/sh . $IPKG_INSTROOT/etc/functions.sh -add_rcconf '"NO" to disable' dropbear_flags " " -add_rcconf dropbear dropbear YES +add_rcconf dropbear_flags dropbear_flags " " +add_rcconf dropbear dropbear NO diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index d82f9d643..6a3f60fdd 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= ffmpeg -PKG_VERSION:= 2.1.1 +PKG_VERSION:= 2.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 2719ab2b3311ac3775b9cdeb66c54849 +PKG_MD5SUM:= 744febca199548c9393b1f1ed05ccdd8 PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs PKG_FDEPENDS:= libpthread @@ -100,9 +100,8 @@ $(eval $(call PKG_template,FFSERVER,ffserver,${PKG_VERSION}-${PKG_RELEASE},${PKG $(eval $(call PKG_template,FFPROBE,ffprobe,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_FFPROBE},${PKGSC_FFPROBE})) #$(eval $(call PKG_template,FFPLAY,ffplay,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_FFPLAY},${PKGSD_FFPLAY},${PKGSC_FFPLAY})) -TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) TARGET_CFLAGS:= $(subst Os,O2,$(TARGET_CFLAGS)) -TARGET_CPPFLAGS+= -D_POSIX_SOURCE=1 -D_GNU_SOURCE=1 +TARGET_CPPFLAGS+= -D_POSIX_SOURCE -D_GNU_SOURCE ifeq ($(ADK_TARGET_CPU_WITH_MMX),y) CONFIGURE_CPU_OPTS:= --enable-mmx diff --git a/package/fltk/Makefile b/package/fltk/Makefile index 00795d0b6..d294570b2 100644 --- a/package/fltk/Makefile +++ b/package/fltk/Makefile @@ -30,7 +30,7 @@ ifeq ($(ADK_COMPILE_LIBFLTK_WITH_UCLIBCXX),y) LIBRARIES:=-nodefaultlibs -luClibc++ -lgcc -lgcc_s -lm -lc endif -ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) LIBRARIES+=-lssp -lssp_nonshared endif diff --git a/package/gcc/Makefile b/package/gcc/Makefile index 76e58d954..24571fb3e 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -39,12 +39,6 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPS64EL),y) CONFIGURE_ARGS+= --with-abi=$(ADK_TARGET_MIPS_ABI) endif -ifeq ($(ADK_TOOLCHAIN_GCC_SJLJ),y) -CONFIGURE_ARGS+= --enable-sjlj-exceptions -else -CONFIGURE_ARGS+= --disable-sjlj-exceptions -endif - ifneq ($(ADK_PACKAGE_GXX),) CONFIGURE_ARGS+= --enable-languages=c,c++ else @@ -57,7 +51,6 @@ else CONFIGURE_ARGS+= --enable-target-optspace endif - CONFIGURE_ENV+= have_sys_sdt_h=no CONFIGURE_ARGS+= --host=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \ diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile index 19d678a7a..82f23f375 100644 --- a/package/id3lib/Makefile +++ b/package/id3lib/Makefile @@ -28,7 +28,7 @@ ifeq ($(ADK_COMPILE_ID3LIB_WITH_UCLIBCXX),y) LIBRARIES:=-nodefaultlibs -luClibc++ -lz -lm -lc -lgcc endif -ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) LIBRARIES+=-lssp -fstack-protector endif diff --git a/package/iperf/Makefile b/package/iperf/Makefile index d867dd210..da2c5f156 100644 --- a/package/iperf/Makefile +++ b/package/iperf/Makefile @@ -22,7 +22,7 @@ $(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPEN TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) TARGET_CXXFLAGS:= $(filter-out -flto,$(TARGET_CXXFLAGS)) -ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) TARGET_LDFLAGS+= -lssp endif diff --git a/package/iptables/Makefile b/package/iptables/Makefile index d9fa9fd2a..93e8500d0 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -5,31 +5,37 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iptables PKG_VERSION:= 1.4.21 -PKG_RELEASE:= 2 +PKG_RELEASE:= 5 PKG_MD5SUM:= 536d048c8e8eeebcd9757d0863ebb0c0 -PKG_DESCR:= The netfilter firewalling software +PKG_DESCR:= netfilter firewalling software PKG_SECTION:= firewall PKG_DEPENDS:= kmod-ip-nf-iptables kmod-nf-conntrack PKG_DEPENDS+= kmod-nf-conntrack-ipv4 kmod-full-nat PKG_DEPENDS+= kmod-ip-nf-target-masquerade kmod-ip-nf-target-reject PKG_DEPENDS+= kmod-ip-nf-filter kmod-ip-nf-match-state PKG_DEPENDS+= kmod-netfilter-xt-target-tcpmss -PKG_DEPENDS+= kmod-ip6-nf-iptables kmod-nf-conntrack-ipv6 -PKG_DEPENDS+= kmod-ip6-nf-filter kmod-ip6-nf-target-reject +PKG_BUILDDEP:= autotool libnetfilter_conntrack PKG_URL:= http://www.netfilter.org/ PKG_SITES:= http://www.netfilter.org/projects/iptables/files/ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 +PKG_SUBPKGS:= IPTABLES IP6TABLES +PKGSD_IPTABLES:= iptables for IPv4 +PKGSD_IP6TABLES:= iptables for IPv6 +PKGSS_IP6TABLES:= iptables kmod-ip6-nf-iptables kmod-nf-conntrack-ipv6 kmod-ip6-nf-filter kmod-ip6-nf-target-reject + include ${TOPDIR}/mk/package.mk # right now default extensions are builtin # use --disable-static in CONFIGURE_ARGS to change and optimize package #include ${LINUX_DIR}/.config -$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,IPTABLES,iptables,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_IPTABLES},${PKG_SECTION},${PKG_OPTS})) +$(eval $(call PKG_template,IP6TABLES,ip6tables,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_IP6TABLES},${PKGSD_IP6TABLES},${PKG_SECTION},${PKG_OPTS})) +AUTOTOOL_STYLE:= autoreconf TARGET_LDFLAGS+= -fPIC CONFIGURE_ARGS+= --enable-devel @@ -41,9 +47,11 @@ iptables-install: ${CP} ${WRKINST}/usr/lib/libiptc.so* ${IDIR_IPTABLES}/usr/lib ${CP} ${WRKINST}/usr/lib/libip4tc.so* ${IDIR_IPTABLES}/usr/lib ${CP} ${WRKINST}/usr/lib/libxtables.so* ${IDIR_IPTABLES}/usr/lib - ${INSTALL_DIR} ${IDIR_IPTABLES}/{usr/lib,etc,usr/sbin} - ${INSTALL_DATA} ./files/firewall6.conf ${IDIR_IPTABLES}/etc - ${CP} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IPTABLES}/usr/sbin - ${CP} ${WRKINST}/usr/lib/libip6tc.so* ${IDIR_IPTABLES}/usr/lib + +ip6tables-install: + ${INSTALL_DIR} ${IDIR_IP6TABLES}/{usr/lib,etc,usr/sbin} + ${INSTALL_DATA} ./files/firewall6.conf ${IDIR_IP6TABLES}/etc + ${CP} ${WRKINST}/usr/sbin/ip6tables ${IDIR_IP6TABLES}/usr/sbin + ${CP} ${WRKINST}/usr/lib/libip6tc.so* ${IDIR_IP6TABLES}/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/iptables/files/firewall6.init b/package/iptables/files/firewall6.init index bedb639a9..162b98a4f 100755 --- a/package/iptables/files/firewall6.init +++ b/package/iptables/files/firewall6.init @@ -1,5 +1,5 @@ #!/bin/sh -#PKG iptables +#PKG ip6tables #INIT 45 . /etc/rc.conf diff --git a/package/osiris/files/osirisd.postinst b/package/iptables/files/ip6tables.postinst index 04e53ac93..09645104b 100644 --- a/package/osiris/files/osirisd.postinst +++ b/package/iptables/files/ip6tables.postinst @@ -1,3 +1,4 @@ #!/bin/sh . $IPKG_INSTROOT/etc/functions.sh -add_rcconf osirisd osirisd NO + +add_rcconf iptables firewall6 NO diff --git a/package/iptables/files/iptables.postinst b/package/iptables/files/iptables.postinst index b418e73f9..89b0af164 100644 --- a/package/iptables/files/iptables.postinst +++ b/package/iptables/files/iptables.postinst @@ -2,4 +2,3 @@ . $IPKG_INSTROOT/etc/functions.sh add_rcconf iptables firewall NO -add_rcconf iptables firewall6 NO diff --git a/package/iptables/patches/patch-extensions_GNUmakefile_in b/package/iptables/patches/patch-extensions_GNUmakefile_in new file mode 100644 index 000000000..cc922cc28 --- /dev/null +++ b/package/iptables/patches/patch-extensions_GNUmakefile_in @@ -0,0 +1,28 @@ +--- iptables-1.4.21.orig/extensions/GNUmakefile.in 2013-11-22 12:18:13.000000000 +0100 ++++ iptables-1.4.21/extensions/GNUmakefile.in 2014-04-08 11:49:28.000000000 +0200 +@@ -21,7 +21,7 @@ regular_CPPFLAGS = @regular_CPPFLAGS@ + kinclude_CPPFLAGS = @kinclude_CPPFLAGS@ + + AM_CFLAGS = ${regular_CFLAGS} +-AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS} ++AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS} @libnetfilter_conntrack_CFLAGS@ + AM_DEPFLAGS = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@ + AM_LDFLAGS = @noundef_LDFLAGS@ + +@@ -93,7 +93,7 @@ lib%.so: lib%.oo + ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< -L../libxtables/.libs -lxtables ${$*_LIBADD}; + + lib%.oo: ${srcdir}/lib%.c +- ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} ${$*_CFLAGADD} -o $@ -c $<; ++ ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<; + + libxt_NOTRACK.so: libxt_CT.so + ln -fs $< $@ +@@ -106,6 +106,7 @@ xt_statistic_LIBADD = -lm + @HAVE_LIBNETFILTER_CONNTRACK_TRUE@xt_connlabel_LIBADD = @libnetfilter_conntrack_LIBS@ + + @HAVE_LIBNETFILTER_CONNTRACK_TRUE@xt_connlabel_CFLAGADD = @libnetfilter_conntrack_CFLAGS@ ++xt_connlabel_LIBADD = @libnetfilter_conntrack_LIBS@ + + # + # Static bits diff --git a/package/iptables/patches/patch-libxtables_Makefile_am b/package/iptables/patches/patch-libxtables_Makefile_am new file mode 100644 index 000000000..d05a100aa --- /dev/null +++ b/package/iptables/patches/patch-libxtables_Makefile_am @@ -0,0 +1,11 @@ +--- iptables-1.4.21.orig/libxtables/Makefile.am 2013-11-22 12:18:13.000000000 +0100 ++++ iptables-1.4.21/libxtables/Makefile.am 2014-04-08 11:51:20.000000000 +0200 +@@ -10,7 +10,7 @@ libxtables_la_LIBADD = + if ENABLE_STATIC + # With --enable-static, shipped extensions are linked into the main executable, + # so we need all the LIBADDs here too +-libxtables_la_LIBADD += -lm ++libxtables_la_LIBADD += -lm ${libnetfilter_conntrack_LIBS} + endif + if ENABLE_SHARED + libxtables_la_CFLAGS = ${AM_CFLAGS} diff --git a/package/libatomic_ops/Makefile b/package/libatomic_ops/Makefile new file mode 100644 index 000000000..9ead522d7 --- /dev/null +++ b/package/libatomic_ops/Makefile @@ -0,0 +1,30 @@ +# 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:= libatomic_ops +PKG_VERSION:= 7.4.0 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 59f9a7cc845dcc775e7b7901eb582766 +PKG_DESCR:= atomic operations library +PKG_SECTION:= libs +PKG_URL:= http://www.hboehm.info/gc/ +PKG_SITES:= http://www.hboehm.info/gc/gc_source/ +PKG_OPTS:= dev + +include $(TOPDIR)/mk/host.mk +include $(TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,LIBATOMIC_OPS,libatomic_ops,$(PKG_VERSION)-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBATOMIC_OPS,libatomic_ops,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +HOST_STYLE:= auto + +libatomic_ops-install: + $(INSTALL_DIR) $(IDIR_LIBATOMIC_OPS)/usr/lib + $(CP) $(WRKINST)/usr/lib/libatomic_ops*.so* \ + $(IDIR_LIBATOMIC_OPS)/usr/lib + +include ${TOPDIR}/mk/host-bottom.mk +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libgc/Makefile b/package/libgc/Makefile new file mode 100644 index 000000000..731c7f98b --- /dev/null +++ b/package/libgc/Makefile @@ -0,0 +1,35 @@ +# 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:= libgc +PKG_VERSION:= 7.4.0 +PKG_RELEASE:= 2 +PKG_MD5SUM:= f40d9a47c90d60791eeecb484f8df5ee +PKG_DESCR:= garbage collector library +PKG_SECTION:= libs +PKG_BUILDDEP:= libatomic_ops +HOST_BUILDDEP:= libatomic_ops-host +PKG_URL:= http://www.hboehm.info/gc/ +PKG_SITES:= http://www.hboehm.info/gc/gc_source/ +PKG_OPTS:= dev + +DISTFILES= gc-${PKG_VERSION}.tar.gz +WRKDIST= ${WRKDIR}/gc-${PKG_VERSION} + +include $(TOPDIR)/mk/host.mk +include $(TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,LIBGC,libgc,$(PKG_VERSION)-${PKG_RELEASE})) +$(eval $(call PKG_template,LIBGC,libgc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +HOST_STYLE:= auto + +libgc-install: + $(INSTALL_DIR) $(IDIR_LIBGC)/usr/lib + $(CP) $(WRKINST)/usr/lib/libgc*.so* \ + $(IDIR_LIBGC)/usr/lib + +include ${TOPDIR}/mk/host-bottom.mk +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libgc/patches/patch-os_dep_c b/package/libgc/patches/patch-os_dep_c new file mode 100644 index 000000000..6a5e00f87 --- /dev/null +++ b/package/libgc/patches/patch-os_dep_c @@ -0,0 +1,39 @@ +--- gc-7.4.0.orig/os_dep.c 2013-11-15 21:11:03.000000000 +0100 ++++ gc-7.4.0/os_dep.c 2014-04-10 07:14:09.000000000 +0200 +@@ -16,36 +16,6 @@ + + #include "private/gc_priv.h" + +-#if defined(LINUX) && !defined(POWERPC) && !defined(NO_SIGCONTEXT_H) +-# include <linux/version.h> +-# if (LINUX_VERSION_CODE <= 0x10400) +- /* Ugly hack to get struct sigcontext_struct definition. Required */ +- /* for some early 1.3.X releases. Will hopefully go away soon. */ +- /* in some later Linux releases, asm/sigcontext.h may have to */ +- /* be included instead. */ +-# define __KERNEL__ +-# include <asm/signal.h> +-# undef __KERNEL__ +-# else +- /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */ +- /* struct sigcontext. libc6 (glibc2) uses "struct sigcontext" in */ +- /* prototypes, so we have to include the top-level sigcontext.h to */ +- /* make sure the former gets defined to be the latter if appropriate. */ +-# include <features.h> +-# if 2 <= __GLIBC__ +-# if 2 == __GLIBC__ && 0 == __GLIBC_MINOR__ +- /* glibc 2.1 no longer has sigcontext.h. But signal.h */ +- /* has the right declaration for glibc 2.1. */ +-# include <sigcontext.h> +-# endif /* 0 == __GLIBC_MINOR__ */ +-# else /* __GLIBC__ < 2 */ +- /* libc5 doesn't have <sigcontext.h>: go directly with the kernel */ +- /* one. Check LINUX_VERSION_CODE to see which we should reference. */ +-# include <asm/sigcontext.h> +-# endif /* __GLIBC__ < 2 */ +-# endif +-#endif /* LINUX && !POWERPC */ +- + #if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MACOS) \ + && !defined(MSWINCE) && !defined(__CC_ARM) + # include <sys/types.h> diff --git a/package/libnetfilter_conntrack/Makefile b/package/libnetfilter_conntrack/Makefile index 14ee92b30..842eff7bd 100644 --- a/package/libnetfilter_conntrack/Makefile +++ b/package/libnetfilter_conntrack/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 18cf80c4b339a3285e78822dbd4f08d7 PKG_DESCR:= API to connection tracking state table PKG_SECTION:= libs -PKG_DEPENDS:= libnfnetlink -PKG_BUILDDEP:= libnfnetlink +PKG_DEPENDS:= libnfnetlink libmnl +PKG_BUILDDEP:= libnfnetlink libmnl PKG_URL:= http://www.netfilter.org/projects/libnetfilter_conntrack/ PKG_SITES:= http://www.netfilter.org/projects/libnetfilter_conntrack/files/ PKG_OPTS:= dev diff --git a/package/libnfnetlink/Makefile b/package/libnfnetlink/Makefile index ae10b6ef3..0d4da94dd 100644 --- a/package/libnfnetlink/Makefile +++ b/package/libnfnetlink/Makefile @@ -5,9 +5,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libnfnetlink PKG_VERSION:= 1.0.1 -PKG_RELEASE:= 3 +PKG_RELEASE:= 5 PKG_MD5SUM:= 98927583d2016a9fb1936fed992e2c5e -PKG_DESCR:= low-level library for netfilter related kernel/userspace communication +PKG_DESCR:= netfilter related kernel/userspace communication PKG_SECTION:= libs PKG_URL:= http://www.netfilter.org/projects/libnfnetlink/ PKG_SITES:= http://www.netfilter.org/projects/libnfnetlink/files/ diff --git a/package/libnfnetlink/patches/patch-include_libnfnetlink_libnfnetlink_h b/package/libnfnetlink/patches/patch-include_libnfnetlink_libnfnetlink_h index 679be187d..d69bc16d0 100644 --- a/package/libnfnetlink/patches/patch-include_libnfnetlink_libnfnetlink_h +++ b/package/libnfnetlink/patches/patch-include_libnfnetlink_libnfnetlink_h @@ -1,10 +1,77 @@ --- libnfnetlink-1.0.1.orig/include/libnfnetlink/libnfnetlink.h 2010-05-09 23:31:56.000000000 +0200 -+++ libnfnetlink-1.0.1/include/libnfnetlink/libnfnetlink.h 2013-08-20 18:44:17.220339451 +0200 ++++ libnfnetlink-1.0.1/include/libnfnetlink/libnfnetlink.h 2014-04-10 07:47:04.000000000 +0200 @@ -15,6 +15,7 @@ #define aligned_u64 unsigned long long __attribute__((aligned(8))) #endif -+#include <sys/types.h> ++#include <stdint.h> #include <sys/socket.h> /* for sa_family_t */ #include <linux/netlink.h> #include <libnfnetlink/linux_nfnetlink.h> +@@ -55,7 +56,7 @@ struct nfnlhdr { + struct nfnl_callback { + int (*call)(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data); + void *data; +- u_int16_t attr_count; ++ uint16_t attr_count; + }; + + struct nfnl_handle; +@@ -69,7 +70,7 @@ extern struct nfnl_handle *nfnl_open(voi + extern int nfnl_close(struct nfnl_handle *); + + extern struct nfnl_subsys_handle *nfnl_subsys_open(struct nfnl_handle *, +- u_int8_t, u_int8_t, ++ uint8_t, uint8_t, + unsigned int); + extern void nfnl_subsys_close(struct nfnl_subsys_handle *); + +@@ -88,8 +89,8 @@ extern int nfnl_sendiov(const struct nfn + const struct iovec *iov, unsigned int num, + unsigned int flags); + extern void nfnl_fill_hdr(struct nfnl_subsys_handle *, struct nlmsghdr *, +- unsigned int, u_int8_t, u_int16_t, u_int16_t, +- u_int16_t); ++ unsigned int, uint8_t, uint16_t, uint16_t, ++ uint16_t); + extern __attribute__((deprecated)) int + nfnl_talk(struct nfnl_handle *, struct nlmsghdr *, pid_t, + unsigned, struct nlmsghdr *, +@@ -103,8 +104,8 @@ nfnl_listen(struct nfnl_handle *, + /* receiving */ + extern ssize_t nfnl_recv(const struct nfnl_handle *h, unsigned char *buf, size_t len); + extern int nfnl_callback_register(struct nfnl_subsys_handle *, +- u_int8_t type, struct nfnl_callback *cb); +-extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, u_int8_t type); ++ uint8_t type, struct nfnl_callback *cb); ++extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, uint8_t type); + extern int nfnl_handle_packet(struct nfnl_handle *, char *buf, int len); + + /* parsing */ +@@ -180,12 +181,12 @@ extern int nfnl_query(struct nfnl_handle + + /* nfnl attribute handling functions */ + extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int); +-extern int nfnl_addattr8(struct nlmsghdr *, int, int, u_int8_t); +-extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t); +-extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t); ++extern int nfnl_addattr8(struct nlmsghdr *, int, int, uint8_t); ++extern int nfnl_addattr16(struct nlmsghdr *, int, int, uint16_t); ++extern int nfnl_addattr32(struct nlmsghdr *, int, int, uint32_t); + extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int); +-extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t); +-extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t); ++extern int nfnl_nfa_addattr16(struct nfattr *, int, int, uint16_t); ++extern int nfnl_nfa_addattr32(struct nfattr *, int, int, uint32_t); + extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); + #define nfnl_parse_nested(tb, max, nfa) \ + nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa))) +@@ -197,7 +198,7 @@ extern int nfnl_parse_attr(struct nfattr + ({ (tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; }) + + extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, +- u_int16_t type, u_int32_t len, ++ uint16_t type, uint32_t len, + unsigned char *val); + extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h, + unsigned int size); diff --git a/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_compat_h b/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_compat_h index 9ea8016a3..2679e67c3 100644 --- a/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_compat_h +++ b/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_compat_h @@ -1,6 +1,15 @@ --- libnfnetlink-1.0.1.orig/include/libnfnetlink/linux_nfnetlink_compat.h 2008-06-18 14:36:57.000000000 +0200 -+++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink_compat.h 2014-04-05 09:33:12.251169468 +0200 -@@ -20,8 +20,8 @@ ++++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink_compat.h 2014-04-08 09:00:23.000000000 +0200 +@@ -3,6 +3,8 @@ + #ifndef __KERNEL__ + /* Old nfnetlink macros for userspace */ + ++#include <stdint.h> ++ + /* nfnetlink groups: Up to 32 maximum */ + #define NF_NETLINK_CONNTRACK_NEW 0x00000001 + #define NF_NETLINK_CONNTRACK_UPDATE 0x00000002 +@@ -20,8 +22,8 @@ struct nfattr { diff --git a/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_h b/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_h index 9f89c6f55..86b231660 100644 --- a/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_h +++ b/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_h @@ -1,5 +1,13 @@ --- libnfnetlink-1.0.1.orig/include/libnfnetlink/linux_nfnetlink.h 2008-06-18 14:36:57.000000000 +0200 -+++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink.h 2014-04-05 09:34:31.863222315 +0200 ++++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink.h 2014-04-08 09:31:12.000000000 +0200 +@@ -1,6 +1,6 @@ + #ifndef _NFNETLINK_H + #define _NFNETLINK_H +-#include <linux/types.h> ++#include <stdint.h> + #include <libnfnetlink/linux_nfnetlink_compat.h> + + enum nfnetlink_groups { @@ -25,9 +25,9 @@ enum nfnetlink_groups { /* General form of address family dependent message. */ diff --git a/package/libnfnetlink/patches/patch-src_libnfnetlink_c b/package/libnfnetlink/patches/patch-src_libnfnetlink_c new file mode 100644 index 000000000..006da1f6d --- /dev/null +++ b/package/libnfnetlink/patches/patch-src_libnfnetlink_c @@ -0,0 +1,233 @@ +--- libnfnetlink-1.0.1.orig/src/libnfnetlink.c 2012-08-13 19:56:29.000000000 +0200 ++++ libnfnetlink-1.0.1/src/libnfnetlink.c 2014-04-10 07:37:41.000000000 +0200 +@@ -38,6 +38,7 @@ + + #include <stdlib.h> + #include <stdio.h> ++#include <stdint.h> + #include <unistd.h> + #include <errno.h> + #include <string.h> +@@ -72,9 +73,9 @@ + + struct nfnl_subsys_handle { + struct nfnl_handle *nfnlh; +- u_int32_t subscriptions; +- u_int8_t subsys_id; +- u_int8_t cb_count; ++ uint32_t subscriptions; ++ uint8_t subsys_id; ++ uint8_t cb_count; + struct nfnl_callback *cb; /* array of callbacks */ + }; + +@@ -86,11 +87,11 @@ struct nfnl_handle { + int fd; + struct sockaddr_nl local; + struct sockaddr_nl peer; +- u_int32_t subscriptions; +- u_int32_t seq; +- u_int32_t dump; +- u_int32_t rcv_buffer_size; /* for nfnl_catch */ +- u_int32_t flags; ++ uint32_t subscriptions; ++ uint32_t seq; ++ uint32_t dump; ++ uint32_t rcv_buffer_size; /* for nfnl_catch */ ++ uint32_t flags; + struct nlmsghdr *last_nlhdr; + struct nfnl_subsys_handle subsys[NFNL_MAX_SUBSYS+1]; + }; +@@ -145,7 +146,7 @@ unsigned int nfnl_portid(const struct nf + static int recalc_rebind_subscriptions(struct nfnl_handle *nfnlh) + { + int i, err; +- u_int32_t new_subscriptions = nfnlh->subscriptions; ++ uint32_t new_subscriptions = nfnlh->subscriptions; + + for (i = 0; i < NFNL_MAX_SUBSYS; i++) + new_subscriptions |= nfnlh->subsys[i].subscriptions; +@@ -273,8 +274,8 @@ void nfnl_set_rcv_buffer_size(struct nfn + * a valid address that points to a nfnl_subsys_handle structure is returned. + */ + struct nfnl_subsys_handle * +-nfnl_subsys_open(struct nfnl_handle *nfnlh, u_int8_t subsys_id, +- u_int8_t cb_count, u_int32_t subscriptions) ++nfnl_subsys_open(struct nfnl_handle *nfnlh, uint8_t subsys_id, ++ uint8_t cb_count, uint32_t subscriptions) + { + struct nfnl_subsys_handle *ssh; + +@@ -435,10 +436,10 @@ int nfnl_sendiov(const struct nfnl_handl + */ + void nfnl_fill_hdr(struct nfnl_subsys_handle *ssh, + struct nlmsghdr *nlh, unsigned int len, +- u_int8_t family, +- u_int16_t res_id, +- u_int16_t msg_type, +- u_int16_t msg_flags) ++ uint8_t family, ++ uint16_t res_id, ++ uint16_t msg_type, ++ uint16_t msg_flags) + { + assert(ssh); + assert(nlh); +@@ -848,14 +849,14 @@ int nfnl_nfa_addattr_l(struct nfattr *nf + } + + /** +- * nfnl_addattr8 - Add u_int8_t attribute to nlmsghdr ++ * nfnl_addattr8 - Add uint8_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header + * @type: type of new attribute + * @data: content of new attribute + */ +-int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, u_int8_t data) ++int nfnl_addattr8(struct nlmsghdr *n, int maxlen, int type, uint8_t data) + { + assert(n); + assert(maxlen > 0); +@@ -865,7 +866,7 @@ int nfnl_addattr8(struct nlmsghdr *n, in + } + + /** +- * nfnl_nfa_addattr16 - Add u_int16_t attribute to struct nfattr ++ * nfnl_nfa_addattr16 - Add uint16_t attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -874,7 +875,7 @@ int nfnl_addattr8(struct nlmsghdr *n, in + * + */ + int nfnl_nfa_addattr16(struct nfattr *nfa, int maxlen, int type, +- u_int16_t data) ++ uint16_t data) + { + assert(nfa); + assert(maxlen > 0); +@@ -884,7 +885,7 @@ int nfnl_nfa_addattr16(struct nfattr *nf + } + + /** +- * nfnl_addattr16 - Add u_int16_t attribute to nlmsghdr ++ * nfnl_addattr16 - Add uint16_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header +@@ -893,7 +894,7 @@ int nfnl_nfa_addattr16(struct nfattr *nf + * + */ + int nfnl_addattr16(struct nlmsghdr *n, int maxlen, int type, +- u_int16_t data) ++ uint16_t data) + { + assert(n); + assert(maxlen > 0); +@@ -903,7 +904,7 @@ int nfnl_addattr16(struct nlmsghdr *n, i + } + + /** +- * nfnl_nfa_addattr32 - Add u_int32_t attribute to struct nfattr ++ * nfnl_nfa_addattr32 - Add uint32_t attribute to struct nfattr + * + * @nfa: struct nfattr + * @maxlen: maximal length of nfattr buffer +@@ -912,7 +913,7 @@ int nfnl_addattr16(struct nlmsghdr *n, i + * + */ + int nfnl_nfa_addattr32(struct nfattr *nfa, int maxlen, int type, +- u_int32_t data) ++ uint32_t data) + { + assert(nfa); + assert(maxlen > 0); +@@ -922,7 +923,7 @@ int nfnl_nfa_addattr32(struct nfattr *nf + } + + /** +- * nfnl_addattr32 - Add u_int32_t attribute to nlmsghdr ++ * nfnl_addattr32 - Add uint32_t attribute to nlmsghdr + * + * @n: netlink message header to which attribute is to be added + * @maxlen: maximum length of netlink message header +@@ -931,7 +932,7 @@ int nfnl_nfa_addattr32(struct nfattr *nf + * + */ + int nfnl_addattr32(struct nlmsghdr *n, int maxlen, int type, +- u_int32_t data) ++ uint32_t data) + { + assert(n); + assert(maxlen > 0); +@@ -979,7 +980,7 @@ int nfnl_parse_attr(struct nfattr *tb[], + * + */ + void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, +- u_int16_t type, u_int32_t len, unsigned char *val) ++ uint16_t type, uint32_t len, unsigned char *val) + { + assert(iov); + assert(nfa); +@@ -1114,7 +1115,7 @@ struct nlmsghdr *nfnl_get_msg_next(struc + * appropiately. + */ + int nfnl_callback_register(struct nfnl_subsys_handle *ssh, +- u_int8_t type, struct nfnl_callback *cb) ++ uint8_t type, struct nfnl_callback *cb) + { + assert(ssh); + assert(cb); +@@ -1137,7 +1138,7 @@ int nfnl_callback_register(struct nfnl_s + * On sucess, 0 is returned. On error, -1 is returned and errno is + * set appropiately. + */ +-int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, u_int8_t type) ++int nfnl_callback_unregister(struct nfnl_subsys_handle *ssh, uint8_t type) + { + assert(ssh); + +@@ -1160,8 +1161,8 @@ int nfnl_check_attributes(const struct n + assert(nfa); + + int min_len; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + const struct nfnl_subsys_handle *ssh; + struct nfnl_callback *cb; + +@@ -1211,8 +1212,8 @@ static int __nfnl_handle_msg(struct nfnl + int len) + { + struct nfnl_subsys_handle *ssh; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + int err = 0; + + if (subsys_id > NFNL_MAX_SUBSYS) +@@ -1242,7 +1243,7 @@ int nfnl_handle_packet(struct nfnl_handl + { + + while (len >= NLMSG_SPACE(0)) { +- u_int32_t rlen; ++ uint32_t rlen; + struct nlmsghdr *nlh = (struct nlmsghdr *)buf; + + if (nlh->nlmsg_len < sizeof(struct nlmsghdr) +@@ -1284,8 +1285,8 @@ static int nfnl_is_error(struct nfnl_han + static int nfnl_step(struct nfnl_handle *h, struct nlmsghdr *nlh) + { + struct nfnl_subsys_handle *ssh; +- u_int8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); +- u_int8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); ++ uint8_t type = NFNL_MSG_TYPE(nlh->nlmsg_type); ++ uint8_t subsys_id = NFNL_SUBSYS_ID(nlh->nlmsg_type); + + /* Is this an error message? */ + if (nfnl_is_error(h, nlh)) { diff --git a/package/mksh/Makefile b/package/mksh/Makefile index 4f65a97f7..76f15499e 100644 --- a/package/mksh/Makefile +++ b/package/mksh/Makefile @@ -23,11 +23,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call HOST_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR},${PKG_SECTION})) -ifeq ($(ADK_STATIC),y) -TARGET_CFLAGS+= -static -TARGET_LDFLAGS+= -static -endif - TARGET_CPPFLAGS+= -DMKSH_SMALL=1 TARGET_LDFLAGS+= -static-libgcc diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile index 46f7595c5..235fb0809 100644 --- a/package/mrd6/Makefile +++ b/package/mrd6/Makefile @@ -26,7 +26,7 @@ ifeq (${ADK_COMPILE_MRD6_WITH_UCLIBCXX},y) LIBRARIES:=-nodefaultlibs -luClibc++ endif -ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) LIBRARIES+=-lssp -lssp_nonshared endif diff --git a/package/net-tools/Makefile b/package/net-tools/Makefile index e550059a4..a83c0a6e0 100644 --- a/package/net-tools/Makefile +++ b/package/net-tools/Makefile @@ -23,7 +23,7 @@ $(eval $(call PKG_template,ARP,arp,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS}, CONFIG_STYLE:= manual INSTALL_STYLE:= manual -ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) TARGET_LDFLAGS+= -lssp endif diff --git a/package/nmap/Makefile b/package/nmap/Makefile index 09035c248..cd2e690d7 100644 --- a/package/nmap/Makefile +++ b/package/nmap/Makefile @@ -21,7 +21,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,NMAP,nmap,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) LIBRARIES+=-lssp -lssp_nonshared endif diff --git a/package/omxplayer/Makefile b/package/omxplayer/Makefile index 696f8901b..c36174f43 100644 --- a/package/omxplayer/Makefile +++ b/package/omxplayer/Makefile @@ -4,10 +4,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:= omxplayer -# actually d1a4a0e1030249e40e2e9bb04518f1b786b18488 from 7.01.2014 -PKG_VERSION:= 0.3 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 1882cac6032baa59291068af30df1702 +# actually 1ca2f7adaa7f6a92410d9664e76c395537659dba from 07.04.2014 +PKG_VERSION:= 0.4 +PKG_RELEASE:= 2 +PKG_MD5SUM:= d4efff32305bd16315e6fa4f80ea2a98 PKG_DESCR:= video player for raspberry pi PKG_SECTION:= multimedia PKG_DEPENDS:= libffmpeg boost bcm2835-vc libfreetype libpcre diff --git a/package/omxplayer/patches/patch-Makefile b/package/omxplayer/patches/patch-Makefile index f7caae300..03a6f5e8b 100644 --- a/package/omxplayer/patches/patch-Makefile +++ b/package/omxplayer/patches/patch-Makefile @@ -1,14 +1,20 @@ ---- omxplayer-0.2.orig/Makefile 2013-10-11 15:17:41.000000000 +0200 -+++ omxplayer-0.2/Makefile 2013-10-11 15:30:49.000000000 +0200 +--- omxplayer-0.4.orig/Makefile 2014-04-07 13:50:34.000000000 +0200 ++++ omxplayer-0.4/Makefile 2014-04-07 16:25:29.144139758 +0200 @@ -2,9 +2,9 @@ include Makefile.include CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST --LDFLAGS+=-L./ -ldbus-1 -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -Lffmpeg_compiled/usr/local/lib/ -+LDFLAGS+=-L./ -ldbus-1 -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lkhrn_static +-LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz ++LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lkhrn_static -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ +INCLUDES+=-I./ -Ilinux DIST ?= omxplayer-dist +@@ -71,5 +71,4 @@ dist: omxplayer.bin + cp omxplayer omxplayer.bin $(DIST)/usr/bin + cp COPYING $(DIST)/usr/share/doc/ + cp README.md $(DIST)/usr/share/doc/README +- cp -a ffmpeg_compiled/usr/local/lib/*.so* $(DIST)/usr/lib/omxplayer/ + cd $(DIST); tar -czf ../$(DIST).tgz * diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 4d0c4e9da..7d80662e2 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -50,7 +50,7 @@ CONFIGURE_ARGS+= --with-kerberos5="${STAGING_TARGET_DIR}/usr" TARGET_LDFLAGS+= -L$(STAGING_TARGET_DIR)/usr/lib/heimdal -Wl,-rpath -Wl,/usr/lib/heimdal endif -ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) CONFIGURE_ARGS+= --with-stackprotect else CONFIGURE_ARGS+= --without-stackprotect diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 4bca87621..145733c2a 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -4,10 +4,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssl -PKG_VERSION:= 1.0.1f -PKG_RELEASE:= 2 -PKG_MD5SUM:= f26b09c028a0541cab33da697d522b25 -PKG_DESCR:= OpenSSL (Secure Socket Layer) libraries +PKG_VERSION:= 1.0.1g +PKG_RELEASE:= 1 +PKG_MD5SUM:= de62b43dfcd858e66a74bee1c834e959 +PKG_DESCR:= Secure Socket Layer libraries PKG_SECTION:= libs PKG_DEPENDS:= zlib PKG_BUILDDEP:= zlib diff --git a/package/osiris/Makefile b/package/osiris/Makefile deleted file mode 100644 index c2921b37a..000000000 --- a/package/osiris/Makefile +++ /dev/null @@ -1,39 +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:= osiris -PKG_VERSION:= 4.2.3 -PKG_RELEASE:= 1 -PKG_MD5SUM:= 1951c7dc0fe729af9ffaf58910340d12 -PKG_DESCR:= Host Integrity Monitoring System (scanning agent) -PKG_SECTION:= admin -PKG_DEPENDS:= libopenssl libpthread -PKG_BUILDDEP:= openssl -PKG_URL:= http://osiris.shmoo.com/ -PKG_SITES:= http://openadk.org/distfiles/ - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,OSIRIS,osiris,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIGURE_ENV+= ac_cv_openssldir="${STAGING_TARGET_DIR}/usr" \ - ac_cv_have_accrights_in_msghdr=no \ - ac_cv_have_control_in_msghdr=yes -CONFIGURE_ARGS+= --with-osiris-user=root \ - --with-root-dir=/var/lib/osiris \ - --with-readline=no -XAKE_FLAGS+= ar=${TARGET_CROSS}ar \ - INTERACTIVE=0 -TARGET_CFLAGS+= -DOPENSSL_NO_RIPEMD - -post-configure: - (cd ${WRKDIST}/src/osirisd/modules && ./genmods.sh); - -osiris-install: - ${INSTALL_DIR} ${IDIR_OSIRIS}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/sbin/osirisd \ - ${IDIR_OSIRIS}/usr/sbin/ - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/osiris/files/osirisd.init b/package/osiris/files/osirisd.init deleted file mode 100644 index b412e7e73..000000000 --- a/package/osiris/files/osirisd.init +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -#PKG osirisd -#INIT 75 -. /etc/rc.conf - -case $1 in -autostop) ;; -autostart) - test x"${osirisd:-NO}" = x"NO" && exit 0 - exec sh $0 start - ;; -start) - [ -d /var/lib/osiris ] || mkdir -p /var/lib/osiris - /usr/sbin/osirisd - ;; -stop) - kill $(pgrep -f /usr/sbin/osirisd) - ;; -restart) - sh $0 stop - sh $0 start - ;; -*) - echo "Usage: $0 {start | stop | restart}" - exit 1 - ;; -esac -exit $? diff --git a/package/osiris/patches/patch-configure b/package/osiris/patches/patch-configure deleted file mode 100644 index 6dce9a8fb..000000000 --- a/package/osiris/patches/patch-configure +++ /dev/null @@ -1,113 +0,0 @@ ---- osiris-4.2.3.orig/configure 2006-07-28 01:57:51.000000000 +0200 -+++ osiris-4.2.3/configure 2011-01-21 20:40:11.234913757 +0100 -@@ -3403,7 +3403,7 @@ else - fi - - --OS_NAME=`uname` -+OS_NAME=Linux - AUTOHEADER=echo - - if test "x$prefix" = "xNONE" ; then -@@ -3573,7 +3573,6 @@ else - - for ssldir in $tryssldir "" /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do - CPPFLAGS="$saved_CPPFLAGS" -- LDFLAGS="$saved_LDFLAGS" - - # GOD DAMN FUCKING STATIC BINARIES ON SOLARIS CAN EAT MY ASS. - -@@ -3596,29 +3595,6 @@ else - if test ! -z "$ssldir" -a ! -d "$ssldir" ; then - continue; - fi -- if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then -- # Try to use $ssldir/lib if it exists, otherwise -- # $ssldir -- if test -d "$ssldir/lib" ; then -- LDFLAGS="-L$ssldir/lib $saved_LDFLAGS" -- if test ! -z "$need_dash_r" ; then -- LDFLAGS="-R$ssldir/lib $LDFLAGS" -- fi -- else -- LDFLAGS="-L$ssldir $saved_LDFLAGS" -- if test ! -z "$need_dash_r" ; then -- LDFLAGS="-R$ssldir $LDFLAGS" -- fi -- fi -- -- # Try to use $ssldir/include if it exists, otherwise -- # $ssldir -- if test -d "$ssldir/include" ; then -- CPPFLAGS="-I$ssldir/include $saved_CPPFLAGS" -- else -- CPPFLAGS="-I$ssldir $saved_CPPFLAGS" -- fi -- fi - - # Basic test to check for compatible version and correct linking - -@@ -3694,34 +3670,6 @@ fi - echo "$as_me:$LINENO: result: $ac_cv_openssldir" >&5 - echo "${ECHO_T}$ac_cv_openssldir" >&6 - --if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ; then --# AC_DEFINE(HAVE_OPENSSL) -- ssldir=$ac_cv_openssldir -- if test ! -z "$ssldir" -a "x$ssldir" != "x/usr"; then -- # Try to use $ssldir/lib if it exists, otherwise -- # $ssldir -- if test -d "$ssldir/lib" ; then -- LDFLAGS="-L$ssldir/lib $saved_LDFLAGS" -- if test ! -z "$need_dash_r" ; then -- LDFLAGS="-R$ssldir/lib $LDFLAGS" -- fi -- else -- LDFLAGS="-L$ssldir $saved_LDFLAGS" -- if test ! -z "$need_dash_r" ; then -- LDFLAGS="-R$ssldir $LDFLAGS" -- fi -- fi -- # Try to use $ssldir/include if it exists, otherwise -- # $ssldir -- if test -d "$ssldir/include" ; then -- CPPFLAGS="-I$ssldir/include $saved_CPPFLAGS" -- else -- CPPFLAGS="-I$ssldir $saved_CPPFLAGS" -- fi -- fi --fi -- -- - case "$OS_NAME" in - SunOS*) - LIBS="$saved_LIBS $ssldir/lib/libssl.a $ssldir/lib/libcrypto.a" -@@ -3738,7 +3686,7 @@ CYGWIN*) - esac - - --DB_CONFIG_ARGS="--enable-shared=no --enable-static=yes" -+DB_CONFIG_ARGS="--enable-shared=no --enable-static=yes --target=${target_alias} --host=${host_alias} --build=${build_alias}" - - case "${OS_NAME}" in - MINGW32*) -@@ -4448,11 +4396,6 @@ cat >>confdefs.h <<_ACEOF - #define SYSTEM_LINUX 1 - _ACEOF - -- -- rc=`grep -c krb5 /usr/include/openssl/ssl.h` -- if test $rc -ne 0; then -- CPPFLAGS="-I/usr/kerberos/include/ ${CPPFLAGS}" -- fi - ;; - BSD*) - -@@ -11394,7 +11337,6 @@ chmod ug+x src/install/install.sh - echo " Osiris MD Directory: ${with_md_root_dir}" - echo " Osiris MD user: ${with_osiris_md_user}" - echo " Osiris MD config dir: ${with_md_conf_dir}" -- cd ./src/osirisd/modules;./genmods.sh;cd ../../.. - echo " ==> use one of the following targets:" - echo "" - echo " all: make everything, agent, CLI and management console." diff --git a/package/osiris/patches/patch-src_db-4_2_52_dist_configure b/package/osiris/patches/patch-src_db-4_2_52_dist_configure deleted file mode 100644 index 45c04bec4..000000000 --- a/package/osiris/patches/patch-src_db-4_2_52_dist_configure +++ /dev/null @@ -1,12 +0,0 @@ ---- osiris-4.2.3.orig/src/db-4.2.52/dist/configure 2006-07-28 01:57:51.000000000 +0200 -+++ osiris-4.2.3/src/db-4.2.52/dist/configure 2011-01-16 14:41:34.000000000 +0100 -@@ -3498,7 +3498,8 @@ freebsd*) - LDFLAGS="$LDFLAGS -pthread";; - gnu*|k*bsd*-gnu|linux*) - optimize_def="-O2" -- CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT";; -+ CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT" -+ LDFLAGS="$LDFLAGS -pthread";; - hpux*) CPPFLAGS="$CPPFLAGS -D_REENTRANT";; - irix*) optimize_def="-O2" - CPPFLAGS="$CPPFLAGS -D_SGI_MP_SOURCE";; diff --git a/package/osiris/patches/patch-src_db-4_2_52_dist_ltmain_sh b/package/osiris/patches/patch-src_db-4_2_52_dist_ltmain_sh deleted file mode 100644 index 8b9084264..000000000 --- a/package/osiris/patches/patch-src_db-4_2_52_dist_ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- osiris-4.2.3.orig/src/db-4.2.52/dist/ltmain.sh 2006-07-28 01:57:51.000000000 +0200 -+++ osiris-4.2.3/src/db-4.2.52/dist/ltmain.sh 2011-01-16 14:08:34.000000000 +0100 -@@ -1298,7 +1298,7 @@ EOF - # but this is not reliable with gcc because gcc may use -mfoo to - # select a different linker, different libraries, etc, while - # -Wl,-mfoo simply passes -mfoo to the linker. -- -m*) -+ -m*|-fstack-protector*|-flto) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` diff --git a/package/osiris/patches/patch-src_libosiris_Makefile_in b/package/osiris/patches/patch-src_libosiris_Makefile_in deleted file mode 100644 index 458fc8bbd..000000000 --- a/package/osiris/patches/patch-src_libosiris_Makefile_in +++ /dev/null @@ -1,41 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- osiris-4.2.3.orig/src/libosiris/Makefile.in 2006-07-28 01:57:51.000000000 +0200 -+++ osiris-4.2.3/src/libosiris/Makefile.in 2014-01-03 17:24:45.000000000 +0100 -@@ -105,7 +105,7 @@ libosiris_a_SOURCES = list.c message.c s - filter_uid.c filter_gid.c filter_user.c \ - filter_group.c filter_header.c filter_file.c \ - filter_suffix.c filter_md5.c filter_sha.c \ -- filter_ripemd.c filter_sid.c filter_permissions.c \ -+ filter_sid.c filter_permissions.c \ - string_list.h ssl_utilities.h utilities.h \ - regex.h regex.c debug.h debug.c strcasestr.c \ - error.h strptime.h -@@ -128,11 +128,10 @@ am_libosiris_a_OBJECTS = list.$(OBJEXT) - filter_python.$(OBJEXT) filter_script.$(OBJEXT) \ - filter_gzip.$(OBJEXT) filter_zip.$(OBJEXT) filter_tar.$(OBJEXT) \ - filter_pgp.$(OBJEXT) filter_rpm.$(OBJEXT) filter_uid.$(OBJEXT) \ -- filter_gid.$(OBJEXT) filter_user.$(OBJEXT) \ -+ filter_gid.$(OBJEXT) filter_user.$(OBJEXT) filter_sid.$(OBJEXT) \ - filter_group.$(OBJEXT) filter_header.$(OBJEXT) \ - filter_file.$(OBJEXT) filter_suffix.$(OBJEXT) \ - filter_md5.$(OBJEXT) filter_sha.$(OBJEXT) \ -- filter_ripemd.$(OBJEXT) filter_sid.$(OBJEXT) \ - filter_permissions.$(OBJEXT) regex.$(OBJEXT) debug.$(OBJEXT) \ - strcasestr.$(OBJEXT) - libosiris_a_OBJECTS = $(am_libosiris_a_OBJECTS) -@@ -158,7 +157,6 @@ am__depfiles_maybe = depfiles - @AMDEP_TRUE@ ./$(DEPDIR)/filter_permissions.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/filter_pgp.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/filter_python.Po \ --@AMDEP_TRUE@ ./$(DEPDIR)/filter_ripemd.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/filter_rpm.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/filter_script.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/filter_sgid.Po \ -@@ -224,7 +222,6 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter_permissions.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter_pgp.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter_python.Po@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter_ripemd.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter_rpm.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter_script.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter_sgid.Po@am__quote@ diff --git a/package/osiris/patches/patch-src_libosiris_configuration_c b/package/osiris/patches/patch-src_libosiris_configuration_c deleted file mode 100644 index f4b164b52..000000000 --- a/package/osiris/patches/patch-src_libosiris_configuration_c +++ /dev/null @@ -1,27 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- osiris-4.2.3.orig/src/libosiris/configuration.c 2006-07-28 01:57:51.000000000 +0200 -+++ osiris-4.2.3/src/libosiris/configuration.c 2009-05-10 21:06:49.000000000 +0200 -@@ -105,9 +105,11 @@ static struct keywords hash_keywords[] = - { "sha1", HASH_SHA }, - { "sha-1", HASH_SHA }, - -+#ifndef OPENSSL_NO_RIPEMD - { "ripemd", HASH_RIPEMD }, - { "ripemd-160", HASH_RIPEMD }, - { "ripemd160", HASH_RIPEMD }, -+#endif - - { NULL, 0 } - }; -@@ -119,9 +121,11 @@ static char * valid_hash_values[] = - "sha", - "sha1", - "sha-1", -+#ifndef OPENSSL_NO_RIPEMD - "ripemd", - "ripemd160", - "ripemd-160", -+#endif - NULL - }; - diff --git a/package/osiris/patches/patch-src_libosiris_configuration_h b/package/osiris/patches/patch-src_libosiris_configuration_h deleted file mode 100644 index 6cf7c3540..000000000 --- a/package/osiris/patches/patch-src_libosiris_configuration_h +++ /dev/null @@ -1,13 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- osiris-4.2.3.orig/src/libosiris/configuration.h 2006-07-28 01:57:51.000000000 +0200 -+++ osiris-4.2.3/src/libosiris/configuration.h 2009-05-10 21:19:28.000000000 +0200 -@@ -45,7 +45,9 @@ - #define HASH_DEFAULT HASH_MD5 - #define HASH_MD5 1 - #define HASH_SHA 2 -+#ifndef OPENSSL_NO_RIPEMD - #define HASH_RIPEMD 3 -+#endif - - /* config keyword types */ - diff --git a/package/osiris/patches/patch-src_libosiris_filter_c b/package/osiris/patches/patch-src_libosiris_filter_c deleted file mode 100644 index d7306ea14..000000000 --- a/package/osiris/patches/patch-src_libosiris_filter_c +++ /dev/null @@ -1,35 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- osiris-4.2.3.orig/src/libosiris/filter.c 2006-07-28 01:57:51.000000000 +0200 -+++ osiris-4.2.3/src/libosiris/filter.c 2009-05-10 21:02:44.000000000 +0200 -@@ -66,7 +66,9 @@ static struct keywords filter_keywords[] - { "suffix", FILTER_TYPE_SUFFIX }, - { "md5", FILTER_TYPE_MD5 }, - { "sha", FILTER_TYPE_SHA }, -+#ifndef OPENSSL_NO_RIPEMD - { "ripemd", FILTER_TYPE_RIPEMD }, -+#endif - { "permissions", FILTER_TYPE_PERMISSIONS }, - { NULL, 0 } - }; -@@ -179,9 +181,11 @@ int setup_filter_function( OSI_FILTER *a - action_filter->perform = filter_sha; - break; - -+#ifndef OPENSSL_NO_RIPEMD - case FILTER_TYPE_RIPEMD: - action_filter->perform = filter_ripemd; - break; -+#endif - - case FILTER_TYPE_PERMISSIONS: - action_filter->perform = filter_permissions; -@@ -220,7 +224,9 @@ osi_bool filter_is_dynamic( int filter_t - case FILTER_TYPE_SUFFIX: - case FILTER_TYPE_MD5: - case FILTER_TYPE_SHA: -+#ifndef OPENSSL_NO_RIPEMD - case FILTER_TYPE_RIPEMD: -+#endif - case FILTER_TYPE_PERMISSIONS: - - return TRUE; diff --git a/package/osiris/patches/patch-src_libosiris_filter_h b/package/osiris/patches/patch-src_libosiris_filter_h deleted file mode 100644 index c7463306d..000000000 --- a/package/osiris/patches/patch-src_libosiris_filter_h +++ /dev/null @@ -1,23 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- osiris-4.2.3.orig/src/libosiris/filter.h 2006-07-28 01:57:51.000000000 +0200 -+++ osiris-4.2.3/src/libosiris/filter.h 2009-05-10 21:15:10.000000000 +0200 -@@ -61,7 +61,9 @@ - #define FILTER_TYPE_SUFFIX 19 - #define FILTER_TYPE_MD5 20 - #define FILTER_TYPE_SHA 21 -+#ifndef OPENSSL_NO_RIPEMD - #define FILTER_TYPE_RIPEMD 22 -+#endif - #define FILTER_TYPE_PERMISSIONS 23 - #define FILTER_TYPE_SID 24 - -@@ -143,7 +145,9 @@ osi_bool filter_file( const char *file_p - osi_bool filter_suffix( const char *file_path, FILTER_CONTEXT *context ); - osi_bool filter_md5( const char *file_path, FILTER_CONTEXT *context ); - osi_bool filter_sha( const char *file_path, FILTER_CONTEXT *context ); -+#ifndef OPENSSL_NO_RIPEMD - osi_bool filter_ripemd( const char *file_path, FILTER_CONTEXT *context ); -+#endif - osi_bool filter_permissions( const char *file_path, FILTER_CONTEXT *context ); - - #endif diff --git a/package/osiris/patches/patch-src_libosiris_osi_common_h b/package/osiris/patches/patch-src_libosiris_osi_common_h deleted file mode 100644 index b30462a3c..000000000 --- a/package/osiris/patches/patch-src_libosiris_osi_common_h +++ /dev/null @@ -1,10 +0,0 @@ ---- osiris-4.2.3.orig/src/libosiris/osi_common.h 2006-07-28 01:57:51.000000000 +0200 -+++ osiris-4.2.3/src/libosiris/osi_common.h 2014-01-03 17:33:53.000000000 +0100 -@@ -31,6 +31,7 @@ - #ifndef OSI_COMMON_H - #define OSI_COMMON_H - -+#include <sys/types.h> - #include "config.h" - - /* for atomic_t */ diff --git a/package/osiris/patches/patch-src_libosiris_ssl_utilities_c b/package/osiris/patches/patch-src_libosiris_ssl_utilities_c deleted file mode 100644 index 47563591b..000000000 --- a/package/osiris/patches/patch-src_libosiris_ssl_utilities_c +++ /dev/null @@ -1,30 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- osiris-4.2.3.orig/src/libosiris/ssl_utilities.c 2006-07-28 01:57:51.000000000 +0200 -+++ osiris-4.2.3/src/libosiris/ssl_utilities.c 2009-05-10 20:41:31.000000000 +0200 -@@ -51,7 +51,9 @@ - #include <openssl/rand.h> - #include <openssl/md5.h> - #include <openssl/sha.h> -+#ifndef OPENSSL_NO_RIPEMD - #include <openssl/ripemd.h> -+#endif - - #ifdef WIN32 - #include <winsock.h> -@@ -337,6 +339,7 @@ int hash_file_sha( const char *file_path - return -1; - } - -+#ifndef OPENSSL_NO_RIPEMD - /****************************************************************************** - ** - ** Function: hash_file_ripemd -@@ -433,7 +436,7 @@ int hash_file_ripemd( const char *file_p - - return -1; - } -- -+#endif - - /****************************************************************************** - ** diff --git a/package/osiris/patches/patch-src_libosiris_ssl_utilities_h b/package/osiris/patches/patch-src_libosiris_ssl_utilities_h deleted file mode 100644 index 668096983..000000000 --- a/package/osiris/patches/patch-src_libosiris_ssl_utilities_h +++ /dev/null @@ -1,14 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- osiris-4.2.3.orig/src/libosiris/ssl_utilities.h 2006-07-28 01:57:51.000000000 +0200 -+++ osiris-4.2.3/src/libosiris/ssl_utilities.h 2009-05-10 20:42:04.000000000 +0200 -@@ -59,8 +59,10 @@ int hash_file_md5( const char *file_path - int hash_file_sha( const char *file_path, FILE *file, - char *buffer, int buffer_size ); - -+#ifndef OPENSSL_NO_RIPEMD - int hash_file_ripemd( const char *file_path, FILE *file, - char *buffer, int buffer_size ); -+#endif - - /* random SSL utilities. */ - diff --git a/package/osiris/patches/patch-src_libosiris_utilities_c b/package/osiris/patches/patch-src_libosiris_utilities_c deleted file mode 100644 index ec5a26ee7..000000000 --- a/package/osiris/patches/patch-src_libosiris_utilities_c +++ /dev/null @@ -1,13 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- osiris-4.2.3.orig/src/libosiris/utilities.c 2006-07-28 01:57:51.000000000 +0200 -+++ osiris-4.2.3/src/libosiris/utilities.c 2009-05-10 20:37:18.000000000 +0200 -@@ -60,7 +60,9 @@ - - #include <openssl/md5.h> - #include <openssl/sha.h> -+#ifndef OPENSSL_NO_RIPEMD - #include <openssl/ripemd.h> -+#endif - - #include "utilities.h" - #include "error.h" diff --git a/package/osiris/patches/patch-src_osirisd_modules_Makefile_am b/package/osiris/patches/patch-src_osirisd_modules_Makefile_am deleted file mode 100644 index 332a866d5..000000000 --- a/package/osiris/patches/patch-src_osirisd_modules_Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ ---- osiris-4.2.3.orig/src/osirisd/modules/Makefile.am 2006-07-28 01:57:51.000000000 +0200 -+++ osiris-4.2.3/src/osirisd/modules/Makefile.am 2011-01-21 20:47:14.568658281 +0100 -@@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)/src \ - noinst_SCRIPTS = modules - - unused.o: -- $(CC) -c unused.c -+ $(CC) $(CFLAGS) -c unused.c - - libmodules_a_DEPENDENCIES = unused.o - diff --git a/package/osiris/patches/patch-src_osirisd_modules_Makefile_in b/package/osiris/patches/patch-src_osirisd_modules_Makefile_in deleted file mode 100644 index 459702dec..000000000 --- a/package/osiris/patches/patch-src_osirisd_modules_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- osiris-4.2.3.orig/src/osirisd/modules/Makefile.in 2006-07-28 01:57:51.000000000 +0200 -+++ osiris-4.2.3/src/osirisd/modules/Makefile.in 2011-01-21 20:47:02.618658788 +0100 -@@ -254,7 +254,7 @@ uninstall-am: uninstall-info-am - - - unused.o: -- $(CC) -c unused.c -+ $(CC) $(CFLAGS) -c unused.c - - modules: - ./genmods.sh diff --git a/package/osiris/patches/patch-src_osirisd_scanner_c b/package/osiris/patches/patch-src_osirisd_scanner_c deleted file mode 100644 index ee3927bf0..000000000 --- a/package/osiris/patches/patch-src_osirisd_scanner_c +++ /dev/null @@ -1,33 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- osiris-4.2.3.orig/src/osirisd/scanner.c 2006-07-28 01:57:51.000000000 +0200 -+++ osiris-4.2.3/src/osirisd/scanner.c 2009-05-10 20:43:04.000000000 +0200 -@@ -839,12 +839,14 @@ void populate_scan_record( SCANNER *scan - MAX_CHECKSUM_LENGTH ); - break; - -+#ifndef OPENSSL_NO_RIPEMD - case HASH_RIPEMD: - - rc = hash_file_ripemd( scan_record->path, file_handle, - scan_record->checksum, - MAX_CHECKSUM_LENGTH ); - break; -+#endif - - default: - -@@ -987,12 +989,14 @@ void populate_scan_record( SCANNER *scan - MAX_CHECKSUM_LENGTH ); - break; - -+#ifndef OPENSSL_NO_RIPEMD - case HASH_RIPEMD: - - rc = hash_file_ripemd( scan_record->path, file_handle, - scan_record->checksum, - MAX_CHECKSUM_LENGTH ); - break; -+#endif - - default: - diff --git a/package/osiris/patches/patch-src_osirismd_md_control_c b/package/osiris/patches/patch-src_osirismd_md_control_c deleted file mode 100644 index 0c33533c8..000000000 --- a/package/osiris/patches/patch-src_osirismd_md_control_c +++ /dev/null @@ -1,16 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- osiris-4.2.3.orig/src/osirismd/md_control.c 2006-12-05 13:02:48.000000000 +0100 -+++ osiris-4.2.3/src/osirismd/md_control.c 2009-05-10 21:28:06.000000000 +0200 -@@ -3259,9 +3259,9 @@ osi_bool generate_session_key_hash( unsi - int index; - char checksum[41]; - -- SHA_Init( &context ); -- SHA_Update( &context, key, (unsigned long)keysize ); -- SHA_Final( &( digest[0] ), &context ); -+ SHA1_Init( &context ); -+ SHA1_Update( &context, key, (unsigned long)keysize ); -+ SHA1_Final( &( digest[0] ), &context ); - - for ( index = 0; index < SHA_DIGEST_LENGTH; index++ ) - { diff --git a/package/sudo/Makefile b/package/sudo/Makefile index 0c3d9562f..ea4bb908c 100644 --- a/package/sudo/Makefile +++ b/package/sudo/Makefile @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --without-pam \ --without-sendmail \ --with-env-editor -ifeq ($(ADK_TOOLCHAIN_GCC_USE_SSP),y) +ifeq ($(ADK_TOOLCHAIN_USE_SSP),y) CONFIGURE_ARGS+= --enable-hardening else CONFIGURE_ARGS+= --disable-hardening diff --git a/package/tcl/Makefile b/package/tcl/Makefile index df231ffdc..9a01a2978 100644 --- a/package/tcl/Makefile +++ b/package/tcl/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tcl -PKG_VERSION:= 8.5.9 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 8512d8db3233041dd68a81476906012a +PKG_VERSION:= 8.6.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= aae4b701ee527c6e4e1a6f9c7399882e PKG_DESCR:= TCL scripting language PKG_SECTION:= lang PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=tcl/} @@ -35,6 +35,6 @@ tcl-install: cd ${IDIR_TCL}/usr/bin && ln -sf tclsh8.5 tclsh ${CP} ${WRKINST}/usr/lib/*.so* ${IDIR_TCL}/usr/lib ${CP} ${WRKINST}/usr/lib/tcl8 ${IDIR_TCL}/usr/lib - ${CP} ${WRKINST}/usr/lib/tcl8.5 ${IDIR_TCL}/usr/lib + ${CP} ${WRKINST}/usr/lib/tcl8.6 ${IDIR_TCL}/usr/lib include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/tcl/patches/patch-unix_Makefile_in b/package/tcl/patches/patch-unix_Makefile_in deleted file mode 100644 index 38340c80b..000000000 --- a/package/tcl/patches/patch-unix_Makefile_in +++ /dev/null @@ -1,21 +0,0 @@ ---- tcl8.5.9.orig/unix/Makefile.in 2010-09-08 19:40:48.000000000 +0200 -+++ tcl8.5.9/unix/Makefile.in 2014-01-20 11:13:05.000000000 +0100 -@@ -101,7 +101,8 @@ CFLAGS_OPTIMIZE = @CFLAGS_OPTIMIZE@ - #CFLAGS = $(CFLAGS_DEBUG) - #CFLAGS = $(CFLAGS_OPTIMIZE) - #CFLAGS = $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) --CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -+#CFLAGS = @CFLAGS_DEFAULT@ @CFLAGS@ -+CFLAGS = @CFLAGS@ - - # Flags to pass to the linker - LDFLAGS_DEBUG = @LDFLAGS_DEBUG@ -@@ -737,7 +738,7 @@ install-binaries: binaries - fi - @EXTRA_INSTALL_BINARIES@ - --install-libraries: libraries $(INSTALL_TZDATA) install-msgs -+install-libraries: libraries - @for i in "$(INCLUDE_INSTALL_DIR)" "$(SCRIPT_INSTALL_DIR)"; \ - do \ - if [ ! -d "$$i" ] ; then \ diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile index 6979f144e..624e9ef3f 100644 --- a/package/tinyproxy/Makefile +++ b/package/tinyproxy/Makefile @@ -5,9 +5,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= tinyproxy PKG_VERSION:= 1.8.3 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= eca927f7f6a9ce8394b2b256361978a7 PKG_DESCR:= lightweight HTTP and HTTPS proxy +PKG_BUILDDEP:= autotool PKG_SECTION:= proxy PKG_URL:= https://www.banu.com/tinyproxy/ PKG_SITES:= https://www.banu.com/pub/tinyproxy/1.8/ @@ -16,6 +17,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,TINYPROXY,tinyproxy,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --disable-regexcheck tinyproxy-install: diff --git a/package/tinyproxy/patches/patch-Makefile_am b/package/tinyproxy/patches/patch-Makefile_am new file mode 100644 index 000000000..443ae2e78 --- /dev/null +++ b/package/tinyproxy/patches/patch-Makefile_am @@ -0,0 +1,10 @@ +--- tinyproxy-1.8.3.orig/Makefile.am 2011-08-16 14:14:34.000000000 +0200 ++++ tinyproxy-1.8.3/Makefile.am 2014-04-07 08:43:20.000000000 +0200 +@@ -2,7 +2,6 @@ SUBDIRS = \ + src \ + data \ + etc \ +- docs \ + m4macros \ + tests + diff --git a/package/tinyproxy/patches/patch-configure_ac b/package/tinyproxy/patches/patch-configure_ac new file mode 100644 index 000000000..b3fd83dc9 --- /dev/null +++ b/package/tinyproxy/patches/patch-configure_ac @@ -0,0 +1,27 @@ +--- tinyproxy-1.8.3.orig/configure.ac 2011-08-16 14:14:58.000000000 +0200 ++++ tinyproxy-1.8.3/configure.ac 2014-04-07 08:43:06.000000000 +0200 +@@ -282,24 +282,12 @@ AC_SUBST(CPPFLAGS) + AC_SUBST(LIBS) + AC_SUBST(ADDITIONAL_OBJECTS) + +-# Check for asciidoc +-AC_PATH_PROG(A2X, a2x, no) +-AM_CONDITIONAL(HAVE_A2X, test "x$A2X" != "xno") +-if test x"$A2X" = x"no"; then +- AC_MSG_ERROR([Test for asciidoc failed. See the file 'INSTALL' for help.]) +-fi +- + AC_CONFIG_FILES([ + Makefile + src/Makefile + data/Makefile + data/templates/Makefile + etc/Makefile +-docs/Makefile +-docs/man5/Makefile +-docs/man5/tinyproxy.conf.txt +-docs/man8/Makefile +-docs/man8/tinyproxy.txt + m4macros/Makefile + tests/Makefile + tests/scripts/Makefile diff --git a/package/w3m/Makefile b/package/w3m/Makefile new file mode 100644 index 000000000..cd0ae7913 --- /dev/null +++ b/package/w3m/Makefile @@ -0,0 +1,31 @@ +# 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:= w3m +PKG_VERSION:= 0.5.3 +PKG_RELEASE:= 3 +PKG_MD5SUM:= 1b845a983a50b8dec0169ac48479eacc +PKG_DESCR:= console web browser +PKG_SECTION:= browser +PKG_DEPENDS:= libgc libncurses +PKG_BUILDDEP:= libgc-host libgc ncurses +PKG_URL:= http://w3m.sourceforge.net/ +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=w3m/} + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,W3M,w3m,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +TARGET_LDFLAGS+= -lncurses -ltinfo +CONFIGURE_ENV+= ac_cv_func_setpgrp_void=yes +CONFIGURE_ARGS+= --with-termlib=ncurses \ + --enable-image=no + +w3m-install: + $(INSTALL_DIR) $(IDIR_W3M)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/w3m \ + $(IDIR_W3M)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/w3m/patches/patch-Makefile_in b/package/w3m/patches/patch-Makefile_in new file mode 100644 index 000000000..d8058d0e9 --- /dev/null +++ b/package/w3m/patches/patch-Makefile_in @@ -0,0 +1,35 @@ +--- w3m-0.5.3.orig/Makefile.in 2011-01-04 10:22:18.000000000 +0100 ++++ w3m-0.5.3/Makefile.in 2014-04-08 21:21:10.000000000 +0200 +@@ -176,8 +176,20 @@ functable.c: funcname.tab mktable$(EXT) + ./mktable$(EXT) 100 functable.tab > $@ + -rm -f functable.tab + +-mktable$(EXT): mktable.o dummy.o Str.o hash.o myctype.o +- $(CC) $(CFLAGS) -o mktable mktable.o dummy.o Str.o hash.o myctype.o $(LDFLAGS) $(LIBS) $(GC_LIBS) ++Str-host.o: ++ $(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c -o $@ $(srcdir)/Str.c ++ ++hash-host.o: ++ $(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c -o $@ $(srcdir)/hash.c ++ ++myctype-host.o: ++ $(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c -o $@ $(srcdir)/myctype.c ++ ++mktable-host.o: ++ $(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -c -o $@ $(srcdir)/mktable.c ++ ++mktable$(EXT): mktable-host.o dummy-host.o Str-host.o hash-host.o myctype-host.o ++ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o mktable mktable-host.o dummy-host.o Str-host.o hash-host.o myctype-host.o $(LDFLAGS_FOR_BUILD) $(LIBS) $(GC_LIBS) + + $(BOOKMARKER): w3mbookmark.o dummy.o $(ALIB) + $(CC) $(CFLAGS) -o $(BOOKMARKER) w3mbookmark.o dummy.o $(LDFLAGS) $(LIBS) $(EXT_LIBS) +@@ -194,6 +206,9 @@ inflate.o: inflate.c + libwc/libwc.a: libwc + libwc: + (cd libwc && $(MAKE) CC='$(CC0)' OPTS='$(OPTS)') ++ ++dummy-host.o: entity.c ++ $(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DDUMMY -c -o $@ $? + + dummy.o: entity.c + $(CC) $(CFLAGS) -DDUMMY -c -o $@ $? diff --git a/package/w3m/patches/patch-istream_c b/package/w3m/patches/patch-istream_c new file mode 100644 index 000000000..83743eda0 --- /dev/null +++ b/package/w3m/patches/patch-istream_c @@ -0,0 +1,38 @@ +--- w3m-0.5.3.orig/istream.c 2011-01-04 10:22:22.000000000 +0100 ++++ w3m-0.5.3/istream.c 2014-04-08 19:58:01.000000000 +0200 +@@ -22,8 +22,8 @@ + static void basic_close(int *handle); + static int basic_read(int *handle, char *buf, int len); + +-static void file_close(struct file_handle *handle); +-static int file_read(struct file_handle *handle, char *buf, int len); ++static void file_close(struct wfile_handle *handle); ++static int file_read(struct wfile_handle *handle, char *buf, int len); + + static int str_read(Str handle, char *buf, int len); + +@@ -114,7 +114,7 @@ newFileStream(FILE * f, void (*closep) ( + stream = New(union input_stream); + init_base_stream(&stream->base, STREAM_BUF_SIZE); + stream->file.type = IST_FILE; +- stream->file.handle = New(struct file_handle); ++ stream->file.handle = New(struct wfile_handle); + stream->file.handle->f = f; + if (closep) + stream->file.handle->close = closep; +@@ -658,13 +658,13 @@ basic_read(int *handle, char *buf, int l + } + + static void +-file_close(struct file_handle *handle) ++file_close(struct wfile_handle *handle) + { + handle->close(handle->f); + } + + static int +-file_read(struct file_handle *handle, char *buf, int len) ++file_read(struct wfile_handle *handle, char *buf, int len) + { + return fread(buf, 1, len, handle->f); + } diff --git a/package/w3m/patches/patch-istream_h b/package/w3m/patches/patch-istream_h new file mode 100644 index 000000000..b6a6a867b --- /dev/null +++ b/package/w3m/patches/patch-istream_h @@ -0,0 +1,20 @@ +--- w3m-0.5.3.orig/istream.h 2003-10-20 18:41:56.000000000 +0200 ++++ w3m-0.5.3/istream.h 2014-04-08 19:57:31.000000000 +0200 +@@ -20,7 +20,7 @@ struct stream_buffer { + + typedef struct stream_buffer *StreamBuffer; + +-struct file_handle { ++struct wfile_handle { + FILE *f; + void (*close) (); + }; +@@ -53,7 +53,7 @@ struct base_stream { + + struct file_stream { + struct stream_buffer stream; +- struct file_handle *handle; ++ struct wfile_handle *handle; + char type; + char iseos; + int (*read) (); diff --git a/package/w3m/patches/patch-main_c b/package/w3m/patches/patch-main_c new file mode 100644 index 000000000..9f14ab1c1 --- /dev/null +++ b/package/w3m/patches/patch-main_c @@ -0,0 +1,11 @@ +--- w3m-0.5.3.orig/main.c 2011-01-04 10:42:19.000000000 +0100 ++++ w3m-0.5.3/main.c 2014-04-08 19:59:04.000000000 +0200 +@@ -833,7 +833,7 @@ main(int argc, char **argv, char **envp) + mySignal(SIGPIPE, SigPipe); + #endif + +- orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); ++ GC_set_warn_proc(wrap_GC_warn_proc); + err_msg = Strnew(); + if (load_argc == 0) { + /* no URL specified */ diff --git a/package/zile/Makefile b/package/zile/Makefile new file mode 100644 index 000000000..0a8711548 --- /dev/null +++ b/package/zile/Makefile @@ -0,0 +1,31 @@ +# 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:= zile +PKG_VERSION:= 2.4.11 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 7a460ccec64e3bec2835697b2eae533c +PKG_DESCR:= tiny emacs clone +PKG_SECTION:= editor +PKG_DEPENDS:= libgc +PKG_BUILDDEP:= autotool libgc +PKG_URL:= http://www.gnu.org/software/zile/ +PKG_SITES:= ${MASTER_SITE_GNU:=zile/} + +PKG_LIBC_DEPENDS:= glibc + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,ZILE,zile,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +AUTOTOOL_STYLE:= autoreconf +TARGET_LDFLAGS+= -ltinfo + +zile-install: + $(INSTALL_DIR) $(IDIR_ZILE)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/zile \ + $(IDIR_ZILE)/usr/bin + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/zile/patches/patch-Makefile_am b/package/zile/patches/patch-Makefile_am new file mode 100644 index 000000000..4d25fc5f0 --- /dev/null +++ b/package/zile/patches/patch-Makefile_am @@ -0,0 +1,23 @@ +--- zile-2.4.11.orig/Makefile.am 2014-02-24 22:42:16.000000000 +0100 ++++ zile-2.4.11/Makefile.am 2014-04-08 14:25:07.000000000 +0200 +@@ -36,12 +36,10 @@ PERL_BUILDTIME = \ + + EXTRA_DIST = \ + FAQ \ +- build-aux/zile-help2man-wrapper \ + $(PERL_BUILDTIME) + + doc_DATA = AUTHORS FAQ NEWS + +-include doc/Makefile.am + include src/Makefile.am + include tests/Makefile.am + +@@ -49,7 +47,6 @@ PRODUCTIONSOURCES = \ + configure.ac \ + Makefile.am \ + $(PERL_BUILDTIME) \ +- doc/Makefile.am \ + src/Makefile.am \ + $(src_zile_base_SOURCE_FILES) \ + src/tbl_opts.h.in diff --git a/scripts/install-rpi.sh b/scripts/install-rpi.sh index ed85cc53e..0cf88cf4c 100755 --- a/scripts/install-rpi.sh +++ b/scripts/install-rpi.sh @@ -7,13 +7,28 @@ if [ $(id -u) -ne 0 ];then exit 1 fi +f=0 for tool in parted sfdisk mkfs.vfat mkfs.ext4;do if ! which $tool >/dev/null; then echo "Checking if $tool is installed... failed" f=1 fi done -[[ $f -eq 1 ]] && exit 1 +if [ $f -eq 1 ];then exit 1;fi + +datadir=0 +keep=0 +while getopts "dk" ch; do + case $ch in + d) + datadir=1 + ;; + k) + keep=1 + ;; + esac +done +shift $((OPTIND - 1)) if [ -z $1 ];then echo "Please give your SD card device as first parameter" @@ -34,7 +49,7 @@ else echo "WARNING: This will destroy all data on $1 - type Yes to continue!" read y if [ "$y" = "Yes" ];then - $sfdisk -l $1 2>&1 |grep 'No medium' + env LC_ALL=C sfdisk -l $1 2>&1 |grep 'No medium' if [ $? -eq 0 ];then echo "No medium found" exit 1 @@ -66,28 +81,48 @@ rootpart=${1}2 parted -s $1 mklabel msdos sleep 2 maxsize=$(env LC_ALL=C parted $1 -s unit cyl print |awk '/^Disk/ { print $3 }'|sed -e 's/cyl//') -rootsize=$(($maxsize-34)) -datasize=$(($maxsize-2)) + +if [ $datadir -eq 0 ];then + rootsize=$(($maxsize-2)) +else + rootsize=$(($maxsize-34)) + datasize=$(($maxsize-2)) +fi parted -s $1 unit cyl mkpart primary fat32 -- 0 16 -parted -s $1 unit cyl mkpart primary ext2 -- 16 $rootsize -parted -s $1 unit cyl mkpart primary ext2 $rootsize $datasize -parted -s $1 unit cyl mkpart primary fat32 $datasize $maxsize -parted -s $1 set 1 boot on -sfdisk --change-id $1 4 88 +if [ $datadir -eq 0 ];then + parted -s $1 unit cyl mkpart primary ext2 -- 16 $rootsize + parted -s $1 unit cyl mkpart primary fat32 $rootsize $maxsize + sfdisk --change-id $1 3 88 +else + parted -s $1 unit cyl mkpart primary ext2 -- 16 $rootsize + parted -s $1 unit cyl mkpart primary ext2 $rootsize $datasize + parted -s $1 unit cyl mkpart primary fat32 $datasize $maxsize + parted -s $1 set 1 boot on + sfdisk --change-id $1 4 88 +fi sleep 2 mkfs.vfat ${1}1 >/dev/null mkfs.ext4 -q -O ^huge_file ${1}2 -mkfs.ext4 -q -O ^huge_file ${1}3 +if [ $datadir -eq 1 ];then + if [ $keep -eq 0 ];then + mkfs.ext4 -q -O ^huge_file ${1}3 + fi +fi sync sleep 2 tmp=$(mktemp -d) mount -t ext4 ${rootpart} $tmp mkdir $tmp/boot -mkdir $tmp/data -mount -t ext4 ${1}3 $tmp/data -mkdir $tmp/data/mpd $tmp/data/xbmc +if [ $datadir -eq 1 ];then + if [ $keep -eq 0 ];then + mkdir $tmp/data + mount -t ext4 ${1}3 $tmp/data + mkdir $tmp/data/mpd $tmp/data/xbmc + umount $tmp/data + fi +fi mount -t vfat ${1}1 $tmp/boot sleep 1 echo "Extracting install archive" @@ -95,8 +130,9 @@ tar -C $tmp -xzpf $2 echo "Fixing permissions" chmod 1777 $tmp/tmp chmod 4755 $tmp/bin/busybox -echo "/dev/mmcblk0p3 /data ext4 rw 0 0" >>$tmp/etc/fstab -umount $tmp/data +if [ $datadir -eq 1 ];then + echo "/dev/mmcblk0p3 /data ext4 rw 0 0" >>$tmp/etc/fstab +fi umount $tmp/boot umount $tmp echo "Successfully installed." diff --git a/target/arm/Makefile b/target/arm/Makefile index 13f6ea62b..f781bdd27 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -59,7 +59,7 @@ endif @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) @echo "Use following command to install it on SD card:" - @echo "sudo ./scripts/install-rpi.sh /dev/sdb $(FW_DIR)/$(ROOTFSTARBALL)" + @echo "sudo ./scripts/install-rpi.sh /dev/sdx $(FW_DIR)/$(ROOTFSTARBALL)" endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM)$(ADK_TARGET_SYSTEM_QEMU_ARMHF),y) @cp $(KERNEL) $(FW_DIR)/$(TARGET_KERNEL) diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 776a1a6f9..ea023d0df 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -7,6 +7,14 @@ config ADK_RUNTIME_HOSTNAME help Set your target hostname. +config ADK_RUNTIME_START_SERVICES + prompt "start some services by default" + boolean + default n + help + +source "target/config/Config.in.scripts" + config ADK_RUNTIME_SSH_PUBKEY string "SSH public key (root user only)" default "" diff --git a/target/packages/pkg-available/console b/target/packages/pkg-available/console index ef688a3af..68ff1f0b5 100644 --- a/target/packages/pkg-available/console +++ b/target/packages/pkg-available/console @@ -3,6 +3,7 @@ config ADK_PKG_CONSOLE default n select ADK_PACKAGE_ALSA_UTILS select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER + select ADK_PACKAGE_DROPBEAR select ADK_PACKAGE_SCREEN select ADK_PACKAGE_SUDO select ADK_PACKAGE_LINKS diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox index b67197c11..31fd10381 100644 --- a/target/packages/pkg-available/mpdbox +++ b/target/packages/pkg-available/mpdbox @@ -2,6 +2,8 @@ config ADK_PKG_MPDBOX bool "Choose packages for MPDBox system" default n select ADK_PACKAGE_MPDBOX + select ADK_PACKAGE_DROPBEAR + select BUSYBOX_NTPD select ADK_PACKAGE_CIFS_UTILS select ADK_PACKAGE_NFS_UTILS select ADK_PACKAGE_NFS_UTILS_CLIENT @@ -55,6 +57,7 @@ config ADK_PKG_MPDBOX select ADK_KPACKAGE_KMOD_SND_INTEL8X0 if ADK_TARGET_SYSTEM_QEMU_I686 select ADK_KPACKAGE_KMOD_SND_USB_AUDIO select ADK_KPACKAGE_KMOD_USB_STORAGE + select ADK_KPACKAGE_KMOD_SND_BCM2708_SOC_HIFIBERRY_DAC if ADK_TARGET_SYSTEM_RASPBERRY_PI help Create a small mpdbox. diff --git a/target/x86/kernel/generic-pc b/target/x86/kernel/generic-pc index f665a27c6..8b26b4d30 100644 --- a/target/x86/kernel/generic-pc +++ b/target/x86/kernel/generic-pc @@ -17,3 +17,7 @@ CONFIG_E100=y CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_ATA=y +CONFIG_ATA_SFF=y +CONFIG_ATA_BMDMA=y +CONFIG_ATA_PIIX=y diff --git a/toolchain/Config.in b/toolchain/Config.in index 54016212a..9ae0142db 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -10,26 +10,38 @@ config ADK_TOOLCHAIN_GCC_CXX boolean default y -config ADK_TOOLCHAIN_GCC_SSP - prompt "Enable Stack Smashing Protection in GCC" +config ADK_TOOLCHAIN_SSP + prompt "Enable Stack Smashing Protection" boolean default y -config ADK_TOOLCHAIN_GCC_USE_SSP +config ADK_TOOLCHAIN_USE_SSP prompt "Use SSP for all packages" boolean - depends on ADK_TOOLCHAIN_GCC_SSP + depends on ADK_TOOLCHAIN_SSP default n -config ADK_TOOLCHAIN_GCC_LTO - prompt "Enable Link Time Optimization in GCC" +config ADK_TOOLCHAIN_LTO + prompt "Enable Link Time Optimization" boolean default y -config ADK_TOOLCHAIN_GCC_USE_LTO +config ADK_TOOLCHAIN_USE_LTO prompt "Use Link Time Optimization for all packages" boolean - depends on ADK_TOOLCHAIN_GCC_LTO + depends on ADK_TOOLCHAIN_LTO + default n + +config ADK_TOOLCHAIN_GOLD + prompt "Enable GOLD as linker" + boolean + depends on !ADK_LINUX_MIPS + default y + +config ADK_TOOLCHAIN_USE_GOLD + prompt "Use GOLD as linker for all packages" + boolean + depends on ADK_TOOLCHAIN_GOLD default n endmenu diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 4d34e3566..87cea2987 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -6,12 +6,24 @@ include Makefile.inc include ../rules.mk include ${TOPDIR}/mk/buildhlp.mk -ifeq ($(ADK_TOOLCHAIN_GCC_SSP),y) +ifeq ($(ADK_TOOLCHAIN_SSP),y) CONFOPTS+= --enable-libssp else CONFOPTS+= --disable-libssp endif +ifeq ($(ADK_TOOLCHAIN_LTO),y) +CONFOPTS+= --enable-lto +else +CONFOPTS+= --disable-lto +endif + +ifeq ($(ADK_TOOLCHAIN_GOLD),y) +CONFOPTS+= --enable-gold +else +CONFOPTS+= --disable-gold +endif + ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) CONFOPTS+= --with-arch=armv6 endif diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 611de97bf..eee524ba3 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -202,11 +202,18 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled # remove duplicate tools, convert hardlinks to symlinks set -e; \ cd $(TOOLCHAIN_DIR)/usr/$(GNU_TARGET_NAME)/bin; \ - for app in ar as c++ g++ gcc ld ld.bfd nm objcopy objdump ranlib strip; do \ + for app in ar as c++ g++ gcc ld ld.gold ld.bfd nm objcopy objdump ranlib strip; do \ ln -sf ../../bin/$(GNU_TARGET_NAME)-$${app} $${app}; \ done; (cd $(TOOLCHAIN_DIR)/usr/bin && \ ln -sf $(GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc-${PKG_VERSION}) +ifeq ($(ADK_TOOLCHAIN_USE_GOLD),y) + (cd $(TOOLCHAIN_DIR)/usr/bin && \ + ln -sf $(GNU_TARGET_NAME)-ld.gold $(GNU_TARGET_NAME)-ld) +else + (cd $(TOOLCHAIN_DIR)/usr/bin && \ + ln -sf $(GNU_TARGET_NAME)-ld.bfd $(GNU_TARGET_NAME)-ld) +endif cd $(STAGING_TARGET_DIR)/lib && \ ln -sf libstdc++.so.6.0.18 libstdc++.so && \ ln -sf libstdc++.so.6.0.18 libstdc++.so.6 |