summaryrefslogtreecommitdiff
path: root/net/bftpd/patches/patch-aa
diff options
context:
space:
mode:
authortron <tron>2010-06-07 19:06:20 +0000
committertron <tron>2010-06-07 19:06:20 +0000
commit88d6887dcf9d12374aa92741eae2f294e28d27b1 (patch)
tree85d105baf710a49e245141f8688f879d0a7fc0a6 /net/bftpd/patches/patch-aa
parent6e307d019b739ccbfc1961924787252ad5a67056 (diff)
downloadpkgsrc-88d6887dcf9d12374aa92741eae2f294e28d27b1.tar.gz
Pullup ticket #3140 - requested by kefren
net/bftpd: security update Revisions pulled up: - net/bftpd/Makefile 1.11-1.12 - net/bftpd/distinfo 1.5-1.6 - net/bftpd/patches/patch-aa 1.4 - net/bftpd/patches/patch-ab delete - net/bftpd/patches/patch-ac 1.1 --- Module Name: pkgsrc Committed By: obache Date: Thu May 27 14:14:30 UTC 2010 Modified Files: pkgsrc/net/bftpd: Makefile distinfo pkgsrc/net/bftpd/patches: patch-aa Added Files: pkgsrc/net/bftpd/patches: patch-ac Removed Files: pkgsrc/net/bftpd/patches: patch-ab Log Message: Update bftpd to 2.8 Based on PR#43352 by Wen Heping. pkgsrc changes: * set LICENSE=gnu-gpl-v2 * simplify patch-aa. * remove patch-ab, replace with SUBST instead, and also replace /etc in manpage. * add patch-ac for fixes standalone mode. XXX: IPv4 only * cosmetics fixes. --- Module Name: pkgsrc Committed By: obache Date: Fri Jun 4 04:30:45 UTC 2010 Modified Files: pkgsrc/net/bftpd: Makefile distinfo Log Message: Update bftpd to 2.9. Jesse Smith <jessefrgsmith@yahoo.ca> -> 2.9 - Bftpdwill attempt to create it's utmp directory if that directory does not exist. Fixes issue on Ubuntu where the direcotry is wiped out at each reboot. - The ROOTDIR option now works properly for anonymous users. Thanks to Paul for reporting this bug.
Diffstat (limited to 'net/bftpd/patches/patch-aa')
-rw-r--r--net/bftpd/patches/patch-aa27
1 files changed, 10 insertions, 17 deletions
diff --git a/net/bftpd/patches/patch-aa b/net/bftpd/patches/patch-aa
index 00d133f48e9..b26f2e29445 100644
--- a/net/bftpd/patches/patch-aa
+++ b/net/bftpd/patches/patch-aa
@@ -1,16 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2008/07/10 15:52:03 joerg Exp $
+$NetBSD: patch-aa,v 1.3.20.1 2010/06/07 19:06:20 tron Exp $
---- Makefile.in.orig 2003-05-09 16:47:48.000000000 -0500
+--- Makefile.in.orig 2010-04-05 00:22:43.000000000 +0000
+++ Makefile.in
-@@ -4,6 +4,7 @@ INSTALL=@INSTALL@
- CFLAGS=@CFLAGS@ @DEFS@ -Wall -I. -DVERSION=\"$(VERSION)\" @DEBUG@
- LIBS=@LIBS@
- prefix=@prefix@
-+datadir=@datadir@
- mandir=@mandir@
- sbindir=@sbindir@
- DESTDIR=
-@@ -26,14 +27,9 @@ bftpd: $(OBJS)
+@@ -26,15 +26,9 @@ bftpd: $(OBJS)
$(OBJS): $(HEADERS) Makefile
install: all
@@ -18,13 +10,14 @@ $NetBSD: patch-aa,v 1.3 2008/07/10 15:52:03 joerg Exp $
- $(INSTALL) -g 0 -m 644 -o 0 bftpd.8 $(DESTDIR)/$(mandir)/man8
- [ -f $(DESTDIR)/etc/bftpd.conf ] || \
- $(INSTALL) -g 0 -m 600 -o 0 bftpd.conf $(DESTDIR)/etc
-- touch /var/log/bftpd.log
-- chmod 644 /var/log/bftpd.log
-- mkdir -p /var/run/bftpd
-- chmod 755 /var/run/bftpd
+- mkdir -p $(DESTDIR)/var/log
+- touch $(DESTDIR)/var/log/bftpd.log
+- chmod 644 $(DESTDIR)/var/log/bftpd.log
+- mkdir -p $(DESTDIR)/var/run/bftpd
+- chmod 755 $(DESTDIR)/var/run/bftpd
+ $(INSTALL) -m 700 bftpd $(DESTDIR)/$(prefix)/sbin
+ $(INSTALL) -m 644 bftpd.8 $(DESTDIR)/$(mandir)/man8
-+ $(INSTALL) -m 600 bftpd.conf $(DESTDIR)/$(datadir)/examples/bftpd
++ $(INSTALL) -m 600 bftpd.conf $(DESTDIR)/$(prefix)/share/examples/bftpd
clean distclean:
- rm -f *~ $(OBJS) bftpd mksources.finished
+ rm -f *~ $(OBJS) bftpd mksources.finished config.cache