Jelajahi Sumber

fix musl compile

Waldemar Brodkorb 10 tahun lalu
induk
melakukan
0cd0354285

+ 1 - 1
package/vsftpd/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		vsftpd
 PKG_VERSION:=		3.0.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		8b00c749719089401315bd3c44dddbb2
 PKG_DESCR:=		a fast and secure FTP server
 PKG_SECTION:=		www

+ 2 - 2
package/vsftpd/patches/patch-Makefile

@@ -1,5 +1,5 @@
 --- 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
++++ vsftpd-3.0.2/Makefile	2014-02-11 12:59:30.000000000 +0100
 @@ -1,16 +1,16 @@
  # Makefile for systems with GNU tools
 -CC 	=	gcc
@@ -21,7 +21,7 @@
  
  OBJS	=	main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
  		tunables.o ftpdataio.o secbuf.o ls.o \
-@@ -29,21 +29,8 @@ vsftpd: $(OBJS) 
+@@ -29,21 +29,8 @@ vsftpd: $(OBJS)
  	$(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS)
  
  install:

+ 13 - 0
package/vsftpd/patches/patch-sysdeputil_c

@@ -0,0 +1,13 @@
+--- vsftpd-3.0.2.orig/sysdeputil.c	2012-09-16 06:18:04.000000000 +0200
++++ vsftpd-3.0.2/sysdeputil.c	2014-02-11 14:21:18.000000000 +0100
+@@ -81,6 +81,10 @@
+   #include <linux/unistd.h>
+   #include <errno.h>
+   #include <syscall.h>
++/* for musl */
++#if !defined(__GLIBC__)
++#define WTMPX_FILE "/dev/null"
++#endif
+ #endif
+ 
+ #if defined(__linux__) && !defined(__ia64__) && !defined(__s390__)