diff options
Diffstat (limited to 'ftp/wzdftpd/files')
-rw-r--r-- | ftp/wzdftpd/files/patch-ac-helpers__tls.m4 | 11 | ||||
-rw-r--r-- | ftp/wzdftpd/files/patch-libwzd-core_wzd_tls.c | 52 | ||||
-rw-r--r-- | ftp/wzdftpd/files/wzdftpd.in | 25 |
3 files changed, 0 insertions, 88 deletions
diff --git a/ftp/wzdftpd/files/patch-ac-helpers__tls.m4 b/ftp/wzdftpd/files/patch-ac-helpers__tls.m4 deleted file mode 100644 index 86f9dd704ec5..000000000000 --- a/ftp/wzdftpd/files/patch-ac-helpers__tls.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- ac-helpers/tls.m4.orig -+++ ac-helpers/tls.m4 -@@ -22,7 +22,7 @@ - ) - - if test "$gnutls" = "yes"; then --AM_PATH_LIBGNUTLS(0.9.8,wzd_have_gnutls=yes) -+PKG_CHECK_MODULES(LIBGNUTLS, [gnutls], [wzd_have_gnutls=yes], [wzd_have_gnutls=no]) - fi - - # openssl is checked only if gnutls was not found or disabled diff --git a/ftp/wzdftpd/files/patch-libwzd-core_wzd_tls.c b/ftp/wzdftpd/files/patch-libwzd-core_wzd_tls.c deleted file mode 100644 index 6c755286c6e3..000000000000 --- a/ftp/wzdftpd/files/patch-libwzd-core_wzd_tls.c +++ /dev/null @@ -1,52 +0,0 @@ ---- libwzd-core/wzd_tls.c.orig 2007-10-25 17:25:33 UTC -+++ libwzd-core/wzd_tls.c -@@ -946,19 +946,13 @@ int tls_exit(void) - - static gnutls_session initialize_tls_session(gnutls_connection_end con_end) - { -- /* Allow connections to servers that have OpenPGP keys as well. -- */ -- const int cert_type_priority[3] = { GNUTLS_CRT_X509, GNUTLS_CRT_OPENPGP, 0 }; -- - gnutls_session session; - - gnutls_init(&session, con_end); - -- /* avoid calling all the priority functions, since the defaults -- * are adequate. -+ /* Allow connections to servers that have OpenPGP keys as well. - */ -- gnutls_set_default_priority(session); -- gnutls_certificate_type_set_priority(session, cert_type_priority); -+ gnutls_priority_set_direct(session, "NORMAL:+CTYPE-OPENPGP", NULL); - - gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred); - -@@ -1001,27 +995,6 @@ int tls_auth (const char *type, wzd_cont - } - - /** \todo XXX parse TLS cipher names */ -- { -- /** Note that the priority is set on the client. The server does not use -- * the algorithm's priority except for disabling algorithms that were not -- * specified. -- */ -- const int cipherPriority[] = -- { -- GNUTLS_CIPHER_ARCFOUR_128, -- GNUTLS_CIPHER_3DES_CBC, -- GNUTLS_CIPHER_AES_128_CBC, -- GNUTLS_CIPHER_AES_256_CBC, -- GNUTLS_CIPHER_ARCFOUR_40, --#if ( (LIBGNUTLS_VERSION_MAJOR > 1) || (LIBGNUTLS_VERSION_MINOR >= 3) ) -- GNUTLS_CIPHER_RC2_40_CBC, -- GNUTLS_CIPHER_DES_CBC, --#endif -- 0 -- }; -- -- gnutls_cipher_set_priority(session, cipherPriority); -- } - - /* ensure socket is non-blocking */ - #if defined(_MSC_VER) || (defined(__CYGWIN__) && defined(WINSOCK_SUPPORT)) diff --git a/ftp/wzdftpd/files/wzdftpd.in b/ftp/wzdftpd/files/wzdftpd.in deleted file mode 100644 index 2be8e0ee1fca..000000000000 --- a/ftp/wzdftpd/files/wzdftpd.in +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -# Start or stop wzdftpd - -# PROVIDE: wzdftpd -# REQUIRE: DAEMON -# BEFORE: LOGIN -# KEYWORD: shutdown -# - -# Add the following lines to /etc/rc.conf to enable wzdftpd -# wzdftpd_enable="YES" -# wzdftpd_flags="<set as needed>" - -wzdftpd_enable=${wzdftpd_enable:-"NO"} # Enable wzdftpd - -. /etc/rc.subr - -name="wzdftpd" -rcvar=wzdftpd_enable -command="%%PREFIX%%/sbin/${name}" -required_files="%%PREFIX%%/etc/wzdftpd/wzd.cfg" - -load_rc_config $name -run_rc_command "$1" |