Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 30 insertions, 41 deletions

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/package/xf86-input-evdev/Makefile b/package/xf86-input-evdev/Makefile
index 2dddafd46..d2e5c3db3 100644
--- a/package/xf86-input-evdev/Makefile
+++ b/package/xf86-input-evdev/Makefile
@@ -9,10 +9,11 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		2d3f7111b8284cec81884023c4bb4a11
 PKG_DESCR:=		X11 driver for Event driver
 PKG_SECTION:=		x11/drivers
-PKG_DEPENDS:=		xorg-server kmod-input-evdev
-PKG_BUILDDEP:=		xorg-server
+PKG_DEPENDS:=		xorg-server kmod-input-evdev libudev
+PKG_BUILDDEP:=		xorg-server systemd
 PKG_SITES:=		${MASTER_SITE_XORG}
 
+PKG_LIBC_DEPENDS:=	eglibc glibc musl
 PKG_ARCH_DEPENDS:=	!avr32 !m68k
 
 PKG_CFLINE_XF86_INPUT_EVDEV:= depends on ADK_TARGET_WITH_INPUT