- Fix compilation and installation error in CURRENT.

- maintainer is committer now.
- Style fix in patch-*

PR: 23255

7 files changed, 52 insertions, 4 deletions

diff --git a/net/SSLtelnet/Makefile b/net/SSLtelnet/Makefile
index e5818bc0c664..b74a7a2d5f3a 100644
--- a/net/SSLtelnet/Makefile
+++ b/net/SSLtelnet/Makefile
@@ -15,10 +15,16 @@ MAINTAINER=		issei@jp.FreeBSD.org
 
 USE_OPENSSL=		YES
 
+PLIST_SUB+=		OPENSSLDIR="${OPENSSLDIR}"
+
 .if !defined(BATCH)
 INSTALL_TARGET=		install certificate
 .endif
 
+# Make sure that whole directory tree exists.
+pre-install:
+	${MKDIR} ${OPENSSLDIR}/certs
+
 post-install:
 	strip $(PREFIX)/bin/telnet
 	strip $(PREFIX)/libexec/telnetd
diff --git a/net/SSLtelnet/files/patch-aa b/net/SSLtelnet/files/patch-aa
index c00635d9144a..1aac4699add4 100644
--- a/net/SSLtelnet/files/patch-aa
+++ b/net/SSLtelnet/files/patch-aa
@@ -62,4 +62,3 @@
 +	ln -s telnetd.pem `openssl x509 -noout -hash < telnetd.pem`.0 ;\
 +	chmod 600 $(OPENSSLDIR)/certs/telnetd.pem; \
  	)
- 
diff --git a/net/SSLtelnet/files/patch-af b/net/SSLtelnet/files/patch-af
index 7baffcbb1866..0540f99f62cf 100644
--- a/net/SSLtelnet/files/patch-af
+++ b/net/SSLtelnet/files/patch-af
@@ -77,4 +77,3 @@
 +	termbuf.c_iflag &= ~ISTRIP;
  #endif
  }
- 
diff --git a/net/SSLtelnet/files/patch-ak b/net/SSLtelnet/files/patch-ak
index 56ba27966759..896e36470d21 100644
--- a/net/SSLtelnet/files/patch-ak
+++ b/net/SSLtelnet/files/patch-ak
@@ -8,4 +8,3 @@
 +      rsa=RSA_generate_key(512,RSA_F4,NULL,NULL);
        if (ssl_debug_flag)
  	  BIO_printf(bio_err,"Generation of temp (512 bit) RSA key done\r\n");
-    
diff --git a/net/SSLtelnet/files/patch-am b/net/SSLtelnet/files/patch-am
new file mode 100644
index 000000000000..a385599eea64
--- /dev/null
+++ b/net/SSLtelnet/files/patch-am
@@ -0,0 +1,43 @@
+--- telnet/commands.c.old	Sun Jan  7 10:03:38 2001
++++ telnet/commands.c	Sun Jan  7 10:16:53 2001
+@@ -55,7 +55,7 @@
+ #include <netdb.h>
+ #include <ctype.h>
+ #include <pwd.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include <errno.h>
+ 
+ #include <arpa/telnet.h>
+@@ -100,7 +100,8 @@
+ extern char **genget();
+ extern int Ambiguous();
+ 
+-static call();
++typedef int (*intrtn_t)();
++static int call(intrtn_t, ...);
+ 
+ typedef struct {
+ 	char	*name;		/* command name */
+@@ -2550,18 +2551,14 @@
+  */
+ 
+     /*VARARGS1*/
+-    static
+-call(va_alist)
+-    va_dcl
++    static int
++call(intrtn_t routine, ...)
+ {
+     va_list ap;
+-    typedef int (*intrtn_t)();
+-    intrtn_t routine;
+     char *args[100];
+     int argno = 0;
+ 
+-    va_start(ap);
+-    routine = (va_arg(ap, intrtn_t));
++    va_start(ap, routine);
+     while ((args[argno++] = va_arg(ap, char *)) != 0) {
+ 	;
+     }
diff --git a/net/SSLtelnet/pkg-descr b/net/SSLtelnet/pkg-descr
index 688541192c6f..a7697d197fa7 100644
--- a/net/SSLtelnet/pkg-descr
+++ b/net/SSLtelnet/pkg-descr
@@ -1,6 +1,6 @@
 This program suports both certification and cryptogoraphic with using SSL.
 
-If you do not have certification (/usr/local/openssl/certs/telnet.pem) provided
+If you do not have certification (/etc/ssl/certs/telnet.pem) provided
 by CA, this port make dummy certification. Of cource it is useless to certify
 but you can use SSL telnet/telnetd in encryption only mode with it.
 
diff --git a/net/SSLtelnet/pkg-plist b/net/SSLtelnet/pkg-plist
index 75a8b02c4a13..e97f9d87e472 100644
--- a/net/SSLtelnet/pkg-plist
+++ b/net/SSLtelnet/pkg-plist
@@ -1,2 +1,4 @@
 bin/telnet
 libexec/telnetd
+@exec mkdir %%OPENSSLDIR%%/certs
+@exec if [ ! -f $(OPENSSLDIR)/certs/telnetd.pem ]; then cd %%OPENSSLDIR%%/certs; openssl req -new -x509 -nodes -days 365 -out telnetd.pem -keyout telnetd.pem; ln -s telnetd.pem `openssl x509 -noout -hash < telnetd.pem`.0 ; chmod 600 $(OPENSSLDIR)/certs/telnetd.pem; fi