diff options
| -rw-r--r-- | mk/image.mk | 1 | ||||
| -rw-r--r-- | package/flex/Makefile | 1 | ||||
| -rw-r--r-- | package/vsftpd/Makefile | 8 | ||||
| -rw-r--r-- | package/vsftpd/patches/patch-Makefile | 48 | ||||
| -rw-r--r-- | package/vsftpd/patches/patch-builddefs_h | 9 | ||||
| -rwxr-xr-x | scripts/create.sh | 2 | ||||
| -rw-r--r-- | target/config/Config.in | 3 | ||||
| -rw-r--r-- | toolchain/kernel-headers/patches/3.11.5/sgidefs.patch | 18 |
8 files changed, 49 insertions, 41 deletions
diff --git a/mk/image.mk b/mk/image.mk index 43561b1c9..2273b4af7 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -95,6 +95,7 @@ ifeq ($(ADK_TARGET_ABI_N64),y) mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} rm -rf ${TARGET_DIR}/lib/ ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib + -mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} rm -rf ${TARGET_DIR}/usr/lib/ (cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib) diff --git a/package/flex/Makefile b/package/flex/Makefile index ca7f8112a..221f8b5bf 100644 --- a/package/flex/Makefile +++ b/package/flex/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 201d3f38758d95436cbc64903386de0b PKG_DESCR:= fast lexical analyzer PKG_SECTION:= lang +PKG_BUILDDEP:= m4-host PKG_URL:= http://flex.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/} PKG_OPTS:= dev diff --git a/package/vsftpd/Makefile b/package/vsftpd/Makefile index 8c986c759..982cc111e 100644 --- a/package/vsftpd/Makefile +++ b/package/vsftpd/Makefile @@ -4,13 +4,15 @@ include ${TOPDIR}/rules.mk PKG_NAME:= vsftpd -PKG_VERSION:= 2.3.4 +PKG_VERSION:= 3.0.2 PKG_RELEASE:= 1 -PKG_MD5SUM:= 2ea5d19978710527bb7444d93b67767a +PKG_MD5SUM:= 8b00c749719089401315bd3c44dddbb2 PKG_DESCR:= a fast and secure FTP server PKG_SECTION:= www +PKG_DEPENDS:= libcap +PKG_BUILDDEP:= libcap PKG_URL:= http://vsftpd.beasts.org/ -PKG_SITES:= http://security.appspot.com/downloads/ +PKG_SITES:= https://security.appspot.com/downloads/ include ${TOPDIR}/mk/package.mk diff --git a/package/vsftpd/patches/patch-Makefile b/package/vsftpd/patches/patch-Makefile index 83d21ca48..fecf5ff17 100644 --- a/package/vsftpd/patches/patch-Makefile +++ b/package/vsftpd/patches/patch-Makefile @@ -1,34 +1,28 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- vsftpd-2.3.4.orig/Makefile 2009-05-22 21:44:52.000000000 +0200 -+++ vsftpd-2.3.4/Makefile 2011-10-13 21:01:57.600352003 +0200 -@@ -1,12 +1,12 @@ +--- vsftpd-3.0.2.orig/Makefile 2012-09-16 09:27:35.000000000 +0200 ++++ vsftpd-3.0.2/Makefile 2013-11-09 11:38:47.000000000 +0100 +@@ -1,16 +1,16 @@ # Makefile for systems with GNU tools -CC = gcc +CC ?= gcc INSTALL = install IFLAGS = -idirafter dummyinc #CFLAGS = -g --CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion -+CFLAGS ?= -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion +-CFLAGS = -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 \ ++CFLAGS ?= -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 \ + -Wall -W -Wshadow -Werror -Wformat-security \ + -D_FORTIFY_SOURCE=2 \ + #-pedantic -Wconversion -LIBS = `./vsf_findlibs.sh` --LINK = -Wl,-s -+LIBS = -lcrypt -+LINK = ++LIBS = -lcap -lcrypt + LINK = -Wl,-s +-LDFLAGS = -fPIE -pie -Wl,-z,relro -Wl,-z,now ++LDFLAGS ?= -fPIE -pie -Wl,-z,relro -Wl,-z,now OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \ tunables.o ftpdataio.o secbuf.o ls.o \ -@@ -17,6 +17,8 @@ OBJS = main.o utility.o prelogin.o ftpcm - ssl.o sslslave.o ptracesandbox.o ftppolicy.o sysutil.o sysdeputil.o - - -+DESTDIR = -+ - .c.o: - $(CC) -c $*.c $(CFLAGS) $(IFLAGS) - -@@ -24,21 +26,20 @@ vsftpd: $(OBJS) - $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS) +@@ -29,21 +29,8 @@ vsftpd: $(OBJS) + $(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS) install: - if [ -x /usr/local/sbin ]; then \ @@ -47,19 +41,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ - if [ -x /etc/xinetd.d ]; then \ - $(INSTALL) -m 644 xinetd.d/vsftpd /etc/xinetd.d/vsftpd; fi + mkdir -p $(DESTDIR)/usr/sbin -+ $(INSTALL) -m 755 vsftpd $(DESTDIR)/usr/sbin/ -+ mkdir -p $(DESTDIR)/usr/share/man/man8 -+ $(INSTALL) -m 644 vsftpd.8 $(DESTDIR)/usr/share/man/man8/ -+ mkdir -p $(DESTDIR)/usr/share/man/man5 -+ $(INSTALL) -m 644 vsftpd.conf.5 $(DESTDIR)/usr/share/man/man5/ -+ mkdir -p $(DESTDIR)/etc/xinetd.d -+ $(INSTALL) -m 644 xinetd.d/vsftpd $(DESTDIR)/etc/xinetd.d/ -+ -+uninstall: -+ rm -f $(DESTDIR)/usr/sbin/vsftpd -+ rm -f $(DESTDIR)/usr/share/man/man8/vsftpd.8 -+ rm -f $(DESTDIR)/usr/share/man/man5/vsftpd.conf.5 -+ rm -f $(DESTDIR)/etc/xinetd.d/vsftpd ++ $(INSTALL) -m 755 vsftpd $(DESTDIR)/usr/sbin/vsftpd clean: rm -f *.o *.swp vsftpd diff --git a/package/vsftpd/patches/patch-builddefs_h b/package/vsftpd/patches/patch-builddefs_h index f44129e15..27c31dd8b 100644 --- a/package/vsftpd/patches/patch-builddefs_h +++ b/package/vsftpd/patches/patch-builddefs_h @@ -1,11 +1,14 @@ ---- vsftpd-2.3.4.orig/builddefs.h 2010-08-06 02:50:31.000000000 +0200 -+++ vsftpd-2.3.4/builddefs.h 2011-10-13 21:06:37.080352120 +0200 -@@ -2,7 +2,7 @@ +--- vsftpd-3.0.2.orig/builddefs.h 2012-04-05 05:24:56.000000000 +0200 ++++ vsftpd-3.0.2/builddefs.h 2013-11-09 11:31:34.000000000 +0100 +@@ -2,8 +2,10 @@ #define VSF_BUILDDEFS_H #undef VSF_BUILD_TCPWRAPPERS -#define VSF_BUILD_PAM +#undef VSF_BUILD_PAM #undef VSF_BUILD_SSL ++#undef VSF_SYSDEP_HAVE_LIBCAP ++#undef VSF_SYSDEP_HAVE_CAPABILITIES #endif /* VSF_BUILDDEFS_H */ + diff --git a/scripts/create.sh b/scripts/create.sh index e96f4db77..ef6e644ab 100755 --- a/scripts/create.sh +++ b/scripts/create.sh @@ -37,7 +37,7 @@ esac test -n "$KSH_VERSION" || if ! which mksh >/dev/null 2>&1; then make package=mksh fetch || exit 1 - df=mksh-R40f.cpio.gz + df=mksh-R48b.tgz rm -rf build_mksh mkdir -p build_mksh gzip -dc dl/"$df" | (cd build_mksh; cpio -mid) diff --git a/target/config/Config.in b/target/config/Config.in index 6fe4c280a..d6cfaafd0 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -731,6 +731,7 @@ config ADK_TARGET_ROOTFS_MMC config ADK_TARGET_ROOTFS_ARCHIVE bool "Archive usable for different filesystems" + select ADK_KERNEL_EXT2_FS if ADK_HARDWARE_QEMU help Use this option if your root filesystem is ext2/ext3/ext4/xfs. @@ -746,7 +747,7 @@ config ADK_TARGET_ROOT_EXT4_RASPBERRY_PI choice prompt "Root filesystem type" -depends on ADK_TARGET_ROOTFS_ARCHIVE && !ADK_TARGET_SYSTEM_RASPBERRY_PI +depends on ADK_TARGET_ROOTFS_ARCHIVE && !ADK_TARGET_SYSTEM_RASPBERRY_PI && !ADK_HARDWARE_QEMU default ADK_TARGET_ROOT_EXT2_FS config ADK_TARGET_ROOT_EXT2 diff --git a/toolchain/kernel-headers/patches/3.11.5/sgidefs.patch b/toolchain/kernel-headers/patches/3.11.5/sgidefs.patch new file mode 100644 index 000000000..f00a284d9 --- /dev/null +++ b/toolchain/kernel-headers/patches/3.11.5/sgidefs.patch @@ -0,0 +1,18 @@ +diff -Nur linux-3.11.5.orig/arch/mips/include/uapi/asm/sgidefs.h linux-3.11.5/arch/mips/include/uapi/asm/sgidefs.h +--- linux-3.11.5.orig/arch/mips/include/uapi/asm/sgidefs.h 2013-10-14 03:14:45.000000000 +0200 ++++ linux-3.11.5/arch/mips/include/uapi/asm/sgidefs.h 2013-11-08 22:01:28.000000000 +0100 +@@ -11,14 +11,6 @@ + #define __ASM_SGIDEFS_H + + /* +- * Using a Linux compiler for building Linux seems logic but not to +- * everybody. +- */ +-#ifndef __linux__ +-#error Use a Linux compiler or give up. +-#endif +- +-/* + * Definitions for the ISA levels + * + * With the introduction of MIPS32 / MIPS64 instruction sets definitions |