Switch to OPIE

8 files changed, 66 insertions, 28 deletions

diff --git a/ftp/wu-ftpd+ipv6/Makefile b/ftp/wu-ftpd+ipv6/Makefile
index d00721369c3e..95ca009264d3 100644
--- a/ftp/wu-ftpd+ipv6/Makefile
+++ b/ftp/wu-ftpd+ipv6/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	wu-ftpd
 PORTVERSION=	2.6.1
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.wu-ftpd.org/pub/wu-ftpd/
 
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ae b/ftp/wu-ftpd+ipv6/files/patch-ae
new file mode 100644
index 000000000000..39924aea5bfc
--- /dev/null
+++ b/ftp/wu-ftpd+ipv6/files/patch-ae
@@ -0,0 +1,13 @@
+--- src/config/config.fbs.bak	Sat Jul  1 22:03:07 2000
++++ src/config/config.fbs	Sun Jul 29 23:37:56 2001
+@@ -79,10 +79,6 @@
+ typedef void SIGNAL_TYPE;
+ 
+ #include "../config.h"
+-/* SKEY should always be defined on FreeBSD */
+-#ifndef SKEY
+-#define SKEY
+-#endif
+ #ifdef SKEY
+ #define SKEY_NAME
+ #endif
diff --git a/ftp/wu-ftpd+ipv6/files/patch-ai b/ftp/wu-ftpd+ipv6/files/patch-ai
index 5b3051f5d1c4..13a3588117c7 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-ai
+++ b/ftp/wu-ftpd+ipv6/files/patch-ai
@@ -1,15 +1,17 @@
---- config.h.orig	Mon Feb 21 03:51:58 2000
-+++ config.h	Mon Feb 21 04:18:17 2000
-@@ -101,7 +101,7 @@
-  * See FIXES-2.4-HOBBIT for more information on this option.
+--- config.h.orig	Sun Jul 29 23:29:57 2001
++++ config.h	Sun Jul 29 23:30:55 2001
+@@ -109,9 +109,7 @@
+  * Add OPIE support -- REQUIRES OPIE libraries
   */
  
--#undef SKEY
-+/* #undef SKEY */
+-#if !defined (LINUX)		/* Linux autodetects OPIE */
+-#undef OPIE
+-#endif
++#define OPIE
  
  /*
-  * OPIE
-@@ -132,7 +132,7 @@
+  * ALTERNATE_CD
+@@ -132,7 +130,7 @@
   * Define this if you want to use RFC 931 'authentication' - this improves
   * the logging at the cost of a possible slight delay in connection.
   */
@@ -18,7 +20,7 @@
  
  /*
   * BUFFER_SIZE
-@@ -232,7 +232,7 @@
+@@ -232,7 +230,7 @@
   * Undefine this to let NOOP reset the idle timeout.
   */
  
@@ -27,7 +29,7 @@
  
  /*
   * XFERLOG_REALPATH
-@@ -286,7 +286,7 @@
+@@ -286,7 +284,7 @@
   * the risk of PASV port race stealing the connection.  It also is non-RFC
   * compliant, so it may cause problems for some client sites.
   */
diff --git a/ftp/wu-ftpd+ipv6/files/patch-am b/ftp/wu-ftpd+ipv6/files/patch-am
index 5516dbd3ba1a..63b9551ecc1b 100644
--- a/ftp/wu-ftpd+ipv6/files/patch-am
+++ b/ftp/wu-ftpd+ipv6/files/patch-am
@@ -1,11 +1,14 @@
---- src/makefiles/Makefile.fbs.orig	Tue Aug 31 03:55:26 1999
-+++ src/makefiles/Makefile.fbs	Wed Oct 20 20:34:07 1999
-@@ -30,7 +30,7 @@
+--- src/makefiles/Makefile.fbs.orig	Sat Jul  1 22:57:50 2000
++++ src/makefiles/Makefile.fbs	Sun Jul 29 23:33:47 2001
+@@ -30,9 +30,9 @@
  #CC       = cc
  IFLAGS   = -I.. -I../support
  LFLAGS   = -L../support -s
 -CFLAGS   = -O ${IFLAGS} ${LFLAGS} -DNO_CRYPT_PROTO
 +CFLAGS   += ${IFLAGS} ${LFLAGS} -DNO_CRYPT_PROTO
  XOBJS    = 
- LIBES    = -lsupport -lutil -lskey -lmd -lcrypt 
+-LIBES    = -lsupport -lutil -lskey -lmd -lcrypt 
++LIBES    = -lsupport -lutil -lopie -lmd -lcrypt
  LIBC     = /usr/lib/libc.a
+ LINTFLAGS=	
+ LKERB    = -lauth -lckrb -lkrb -ldes
diff --git a/ftp/wu-ftpd/Makefile b/ftp/wu-ftpd/Makefile
index d00721369c3e..95ca009264d3 100644
--- a/ftp/wu-ftpd/Makefile
+++ b/ftp/wu-ftpd/Makefile
@@ -9,6 +9,7 @@
 
 PORTNAME=	wu-ftpd
 PORTVERSION=	2.6.1
+PORTREVISION=	1
 CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.wu-ftpd.org/pub/wu-ftpd/
 
diff --git a/ftp/wu-ftpd/files/patch-ae b/ftp/wu-ftpd/files/patch-ae
new file mode 100644
index 000000000000..39924aea5bfc
--- /dev/null
+++ b/ftp/wu-ftpd/files/patch-ae
@@ -0,0 +1,13 @@
+--- src/config/config.fbs.bak	Sat Jul  1 22:03:07 2000
++++ src/config/config.fbs	Sun Jul 29 23:37:56 2001
+@@ -79,10 +79,6 @@
+ typedef void SIGNAL_TYPE;
+ 
+ #include "../config.h"
+-/* SKEY should always be defined on FreeBSD */
+-#ifndef SKEY
+-#define SKEY
+-#endif
+ #ifdef SKEY
+ #define SKEY_NAME
+ #endif
diff --git a/ftp/wu-ftpd/files/patch-ai b/ftp/wu-ftpd/files/patch-ai
index 5b3051f5d1c4..13a3588117c7 100644
--- a/ftp/wu-ftpd/files/patch-ai
+++ b/ftp/wu-ftpd/files/patch-ai
@@ -1,15 +1,17 @@
---- config.h.orig	Mon Feb 21 03:51:58 2000
-+++ config.h	Mon Feb 21 04:18:17 2000
-@@ -101,7 +101,7 @@
-  * See FIXES-2.4-HOBBIT for more information on this option.
+--- config.h.orig	Sun Jul 29 23:29:57 2001
++++ config.h	Sun Jul 29 23:30:55 2001
+@@ -109,9 +109,7 @@
+  * Add OPIE support -- REQUIRES OPIE libraries
   */
  
--#undef SKEY
-+/* #undef SKEY */
+-#if !defined (LINUX)		/* Linux autodetects OPIE */
+-#undef OPIE
+-#endif
++#define OPIE
  
  /*
-  * OPIE
-@@ -132,7 +132,7 @@
+  * ALTERNATE_CD
+@@ -132,7 +130,7 @@
   * Define this if you want to use RFC 931 'authentication' - this improves
   * the logging at the cost of a possible slight delay in connection.
   */
@@ -18,7 +20,7 @@
  
  /*
   * BUFFER_SIZE
-@@ -232,7 +232,7 @@
+@@ -232,7 +230,7 @@
   * Undefine this to let NOOP reset the idle timeout.
   */
  
@@ -27,7 +29,7 @@
  
  /*
   * XFERLOG_REALPATH
-@@ -286,7 +286,7 @@
+@@ -286,7 +284,7 @@
   * the risk of PASV port race stealing the connection.  It also is non-RFC
   * compliant, so it may cause problems for some client sites.
   */
diff --git a/ftp/wu-ftpd/files/patch-am b/ftp/wu-ftpd/files/patch-am
index 5516dbd3ba1a..63b9551ecc1b 100644
--- a/ftp/wu-ftpd/files/patch-am
+++ b/ftp/wu-ftpd/files/patch-am
@@ -1,11 +1,14 @@
---- src/makefiles/Makefile.fbs.orig	Tue Aug 31 03:55:26 1999
-+++ src/makefiles/Makefile.fbs	Wed Oct 20 20:34:07 1999
-@@ -30,7 +30,7 @@
+--- src/makefiles/Makefile.fbs.orig	Sat Jul  1 22:57:50 2000
++++ src/makefiles/Makefile.fbs	Sun Jul 29 23:33:47 2001
+@@ -30,9 +30,9 @@
  #CC       = cc
  IFLAGS   = -I.. -I../support
  LFLAGS   = -L../support -s
 -CFLAGS   = -O ${IFLAGS} ${LFLAGS} -DNO_CRYPT_PROTO
 +CFLAGS   += ${IFLAGS} ${LFLAGS} -DNO_CRYPT_PROTO
  XOBJS    = 
- LIBES    = -lsupport -lutil -lskey -lmd -lcrypt 
+-LIBES    = -lsupport -lutil -lskey -lmd -lcrypt 
++LIBES    = -lsupport -lutil -lopie -lmd -lcrypt
  LIBC     = /usr/lib/libc.a
+ LINTFLAGS=	
+ LKERB    = -lauth -lckrb -lkrb -ldes