[oe-commits] org.oe.dev vsftpd: clean up proper

[nail commit]

vsftpd: clean up proper

Author: nail at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 3e1adbc3c19ac71287b5a3e6200f3fe6bde5c106
ViewMTN: http://monotone.openembedded.org/revision.psp?id=3e1adbc3c19ac71287b5a3e6200f3fe6bde5c106
Files:
1
packages/vsftpd/vsftpd_2.0.1.bb
packages/vsftpd/vsftpd_2.0.3.bb
packages/vsftpd/vsftpd-2.0.5
packages/vsftpd/vsftpd-2.0.5/makefile.patch
packages/vsftpd/vsftpd-2.0.5/nopam.patch
Diffs:

#
# mt diff -r5fc1e00b1f6c726219569e2d7c369e4f378259cb -r3e1adbc3c19ac71287b5a3e6200f3fe6bde5c106
#
# 
# 
# delete "packages/vsftpd/vsftpd_2.0.1.bb"
# 
# delete "packages/vsftpd/vsftpd_2.0.3.bb"
# 
# add_dir "packages/vsftpd/vsftpd-2.0.5"
# 
# add_file "packages/vsftpd/vsftpd-2.0.5/makefile.patch"
#  content [6c860ef97bfa38716ca3b7b79953757b6b534e43]
# 
# add_file "packages/vsftpd/vsftpd-2.0.5/nopam.patch"
#  content [23035372a6a5fedadd6885da953dadd9dbec934d]
# 
============================================================
--- packages/vsftpd/vsftpd-2.0.5/makefile.patch	6c860ef97bfa38716ca3b7b79953757b6b534e43
+++ packages/vsftpd/vsftpd-2.0.5/makefile.patch	6c860ef97bfa38716ca3b7b79953757b6b534e43
@@ -0,0 +1,47 @@
+diff -ur vsftpd-2.0.1_org/Makefile vsftpd-2.0.1_patch/Makefile
+--- vsftpd-2.0.1_org/Makefile	2004-06-06 18:21:27.000000000 +0200
++++ vsftpd-2.0.1_patch/Makefile	2004-07-21 09:50:25.245576352 +0200
+@@ -5,7 +5,7 @@
+ #CFLAGS = -g
+ CFLAGS	=	-O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
+ 
+-LIBS	=	`./vsf_findlibs.sh`
++LIBS	=	-lssl -lcrypto -lnsl -lresolv
+ LINK	=	-Wl,-s
+ 
+ OBJS	=	main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
+@@ -24,21 +24,21 @@
+ 	$(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS)
+ 
+ install:
+-	if [ -x /usr/local/sbin ]; then \
+-		$(INSTALL) -m 755 vsftpd /usr/local/sbin/vsftpd; \
++	if [ -x ${DESTDIR}/usr/local/sbin ]; then \
++		$(INSTALL) -m 755 vsftpd ${DESTDIR}/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; \
++		$(INSTALL) -m 755 vsftpd ${DESTDIR}/usr/sbin/vsftpd; fi
++	if [ -x ${DESTDIR}/usr/local/man ]; then \
++		$(INSTALL) -m 644 vsftpd.8 ${DESTDIR}/usr/local/man/man8/vsftpd.8; \
++		$(INSTALL) -m 644 vsftpd.conf.5 ${DESTDIR}/usr/local/man/man5/vsftpd.conf.5; \
++	elif [ -x ${DESTDIR}/usr/share/man ]; then \
++		$(INSTALL) -m 644 vsftpd.8 ${DESTDIR}/usr/share/man/man8/vsftpd.8; \
++		$(INSTALL) -m 644 vsftpd.conf.5 ${DESTDIR}/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
++		$(INSTALL) -m 644 vsftpd.8 ${DESTDIR}/usr/man/man8/vsftpd.8; \
++		$(INSTALL) -m 644 vsftpd.conf.5 ${DESTDIR}/usr/man/man5/vsftpd.conf.5; fi
++	if [ -x ${DESTDIR}/etc/xinetd.d ]; then \
++		$(INSTALL) -m 644 xinetd.d/vsftpd ${DESTDIR}/etc/xinetd.d/vsftpd; fi
+ 
+ clean:
+ 	rm -f *.o *.swp vsftpd
============================================================
--- packages/vsftpd/vsftpd-2.0.5/nopam.patch	23035372a6a5fedadd6885da953dadd9dbec934d
+++ packages/vsftpd/vsftpd-2.0.5/nopam.patch	23035372a6a5fedadd6885da953dadd9dbec934d
@@ -0,0 +1,12 @@
+diff -ur vsftpd-2.0.1_org/builddefs.h vsftpd-2.0.1_patch/builddefs.h
+--- vsftpd-2.0.1_org/builddefs.h	2004-07-02 16:36:59.000000000 +0200
++++ vsftpd-2.0.1_patch/builddefs.h	2004-07-21 09:34:49.044900488 +0200
+@@ -2,7 +2,7 @@
+ #define VSF_BUILDDEFS_H
+ 
+ #undef VSF_BUILD_TCPWRAPPERS
+-#define VSF_BUILD_PAM
++#undef VSF_BUILD_PAM
+ #undef VSF_BUILD_SSL
+ 
+ #endif /* VSF_BUILDDEFS_H */