summary refs log tree commit diff
path: root/pkgs/servers/ftp/vsftpd/fix.patch
blob: aefce9395617de96463b43336e187041b1ce5913 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
diff -rc vsftpd-2.0.3/Makefile vsftpd-2.0.3-new/Makefile
*** vsftpd-2.0.3/Makefile	Fri Mar 11 20:34:15 2005
--- vsftpd-2.0.3-new/Makefile	Mon Sep 12 17:06:31 2005
***************
*** 5,11 ****
  #CFLAGS = -g
  CFLAGS	=	-O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
  
- LIBS	=	`./vsf_findlibs.sh`
  LINK	=	-Wl,-s
  
  OBJS	=	main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
--- 5,10 ----
***************
*** 24,44 ****
  	$(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS)
  
  install:
! 	if [ -x /usr/local/sbin ]; then \
! 		$(INSTALL) -m 755 vsftpd /usr/local/sbin/vsftpd; \
  	else \
! 		$(INSTALL) -m 755 vsftpd /usr/sbin/vsftpd; fi
! 	if [ -x /usr/local/man ]; then \
! 		$(INSTALL) -m 644 vsftpd.8 /usr/local/man/man8/vsftpd.8; \
! 		$(INSTALL) -m 644 vsftpd.conf.5 /usr/local/man/man5/vsftpd.conf.5; \
! 	elif [ -x /usr/share/man ]; then \
! 		$(INSTALL) -m 644 vsftpd.8 /usr/share/man/man8/vsftpd.8; \
! 		$(INSTALL) -m 644 vsftpd.conf.5 /usr/share/man/man5/vsftpd.conf.5; \
  	else \
! 		$(INSTALL) -m 644 vsftpd.8 /usr/man/man8/vsftpd.8; \
! 		$(INSTALL) -m 644 vsftpd.conf.5 /usr/man/man5/vsftpd.conf.5; fi
! 	if [ -x /etc/xinetd.d ]; then \
! 		$(INSTALL) -m 644 xinetd.d/vsftpd /etc/xinetd.d/vsftpd; fi
  
  clean:
  	rm -f *.o *.swp vsftpd
--- 23,41 ----
  	$(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS)
  
  install:
! 	if [ -x $$out/sbin ]; then \
! 		$(INSTALL) -m 755 vsftpd $$out/sbin/vsftpd; \
  	else \
! 		$(INSTALL) -m 755 vsftpd $$out/sbin/vsftpd; fi
! 	if [ -x $$out/man ]; then \
! 		$(INSTALL) -m 644 vsftpd.8 $$out/man/man8/vsftpd.8; \
! 		$(INSTALL) -m 644 vsftpd.conf.5 $$out/man/man5/vsftpd.conf.5; \
! 	elif [ -x $$out/share/man ]; then \
! 		$(INSTALL) -m 644 vsftpd.8 $$out/man/man8/vsftpd.8; \
! 		$(INSTALL) -m 644 vsftpd.conf.5 $$out/share/man/man5/vsftpd.conf.5; \
  	else \
! 		$(INSTALL) -m 644 vsftpd.8 $$out/man/man8/vsftpd.8; \
! 		$(INSTALL) -m 644 vsftpd.conf.5 $$out/man/man5/vsftpd.conf.5; fi
  
  clean:
  	rm -f *.o *.swp vsftpd