From 38055b6a97c9bde506a27aaa3b73ec5c8be97625 Mon Sep 17 00:00:00 2001 From: Eric Sandall Date: Fri, 20 Oct 2006 16:14:59 -0700 Subject: vsftpd: fixing bug 12451 --- ftp/vsftpd/HISTORY | 3 +++ ftp/vsftpd/mk.diff | 14 ++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ftp/vsftpd/HISTORY b/ftp/vsftpd/HISTORY index 51c7b4cecd..199f0cfa01 100644 --- a/ftp/vsftpd/HISTORY +++ b/ftp/vsftpd/HISTORY @@ -1,3 +1,6 @@ +2006-08-20 Mathieu Lonjaret + * mk.diff: Solving bug 12451 + 2006-03-12 Karsten Behrmann * DETAILS: (automated) Add KEYWORDS diff --git a/ftp/vsftpd/mk.diff b/ftp/vsftpd/mk.diff index ebd5a32a32..d02617c76e 100644 --- a/ftp/vsftpd/mk.diff +++ b/ftp/vsftpd/mk.diff @@ -1,5 +1,5 @@ ---- Makefile 2003-09-15 13:41:58.000000000 +0200 -+++ Makefile.cp 2003-12-14 18:43:29.000000000 +0100 +--- Makefile 2006-07-03 14:25:41.000000000 +0200 ++++ Makefile.cp 2006-08-20 15:33:47.000000000 +0200 @@ -3,7 +3,7 @@ INSTALL = install IFLAGS = -idirafter dummyinc @@ -9,8 +9,8 @@ LIBS = `./vsf_findlibs.sh` LINK = -Wl,-s -@@ -23,21 +23,9 @@ - $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) +@@ -24,21 +24,11 @@ + $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS) install: - if [ -x /usr/local/sbin ]; then \ @@ -29,8 +29,10 @@ - if [ -x /etc/xinetd.d ]; then \ - $(INSTALL) -m 644 xinetd.d/vsftpd /etc/xinetd.d/vsftpd; fi + $(INSTALL) -m 755 vsftpd /usr/sbin/vsftpd; -+ $(INSTALL) -m 644 vsftpd.8 /usr/man/man8/vsftpd.8; -+ $(INSTALL) -m 644 vsftpd.conf.5 /usr/man/man5/vsftpd.conf.5; ++ mkdir -p /usr/share/man/man8/; ++ $(INSTALL) -m 644 vsftpd.8 /usr/share/man/man8/vsftpd.8; ++ mkdir -p /usr/share/man/man5; ++ $(INSTALL) -m 644 vsftpd.conf.5 /usr/share/man/man5/vsftpd.conf.5; clean: rm -f *.o *.swp vsftpd -- cgit v1.2.3