diff options
Diffstat (limited to 'net/bftpd/patches')
| -rw-r--r-- | net/bftpd/patches/patch-aa | 27 | ||||
| -rw-r--r-- | net/bftpd/patches/patch-ab | 9 | ||||
| -rw-r--r-- | net/bftpd/patches/patch-ac | 14 |
3 files changed, 24 insertions, 26 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 diff --git a/net/bftpd/patches/patch-ab b/net/bftpd/patches/patch-ab deleted file mode 100644 index 7e09d7c60fa..00000000000 --- a/net/bftpd/patches/patch-ab +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/06/02 13:13:15 jmmv Exp $ - ---- mypaths.h.orig 2003-05-09 23:47:48.000000000 +0200 -+++ mypaths.h -@@ -1,2 +1,4 @@ -+#ifndef PATH_BFTPD_CONF - #define PATH_BFTPD_CONF "/etc/bftpd.conf" -+#endif - #define PATH_STATUSLOG "/dev/null" diff --git a/net/bftpd/patches/patch-ac b/net/bftpd/patches/patch-ac new file mode 100644 index 00000000000..7d0546a40a0 --- /dev/null +++ b/net/bftpd/patches/patch-ac @@ -0,0 +1,14 @@ +$NetBSD: patch-ac,v 1.1.2.2 2010/06/07 19:06:20 tron Exp $ + +Bind failed: Address famly not supported by protocol family + +--- main.c.orig 2010-04-11 12:21:24.000000000 +0000 ++++ main.c +@@ -248,6 +248,7 @@ int main(int argc, char **argv) + sizeof(i)); + #endif + memset((void *) &myaddr, 0, sizeof(myaddr)); ++ myaddr.sin_family = AF_INET; + if (!((port = strtoul(config_getoption("PORT"), NULL, 10)))) + port = DEFAULT_PORT; + myaddr.sin_port = htons(port); |