Attachment #154908 for bug #198980

Lines 25-30 Link Here

(-)comms/kermit/Makefile (+4 lines)
25		25
26	OPTIONS_DEFINE= DOCS EXAMPLES	26	OPTIONS_DEFINE= DOCS EXAMPLES
27		27
		28	.if (${OPENSSL_PORT:tl} == 'security/libressl')
		29	MAKE_ARGS+= -DNO_COMP -DNO_EGD
		30	.endif
		31
28	post-patch:	32	post-patch:
29	@${REINPLACE_CMD} -e 's,-O2 -pipe,${CFLAGS},' ${WRKSRC}/${MAKEFILE}	33	@${REINPLACE_CMD} -e 's,-O2 -pipe,${CFLAGS},' ${WRKSRC}/${MAKEFILE}
30		34




--- ck_ssl.c.orig	2011-07-06 13:03:32 UTC
+++ ck_ssl.c
@@ -1054,11 +1054,15 @@ ssl_display_comp(SSL * ssl)
     if (ssl == NULL)
         return;
 
+#ifndef NO_COMP
     if (ssl->expand == NULL || ssl->expand->meth == NULL)
+#endif
         printf("Compression: None\r\n");
+#ifndef NO_COMP
     else {
         printf("Compression: %s\r\n",ssl->expand->meth->name);
     }
+#endif
 }
 
 int
@@ -1483,9 +1487,13 @@ the build.\r\n\r\n");
         }
         debug(F110,"ssl_rnd_file",ssl_rnd_file,0);
 
+#ifndef NO_EGD
         rc1 = RAND_egd(ssl_rnd_file);
         debug(F111,"ssl_once_init","RAND_egd()",rc1);
-        if ( rc1 <= 0 ) {
+        if ( rc1 <= 0 ) 
+#endif
+	{
+
             rc2 = RAND_load_file(ssl_rnd_file, -1);
             debug(F111,"ssl_once_init","RAND_load_file()",rc1);
         }




--- makefile.orig	2015-03-27 21:34:55 UTC
+++ makefile
@@ -1785,9 +1785,11 @@ freebsd+ssl freebsd+openssl freebsd50+op
               echo "HAVE DES"; \
            else echo "NO DES"; \
 	fi; \
+	if test -n "$NO_EGD"  ; then EGD='-DNO_EGD' ; fi; \
+	if test -n "$NO_COMP" ; then COMP='-DNO_COMP' ; fi; \
 	$(MAKE) freebsd KTARGET=$${KTARGET:-$(@)} "CC = $(CC)" "CC2 = $(CC2)" \
 	KFLAGS="-DCK_AUTHENTICATION -DCK_SSL $(SSLINC) -DZLIB $$OPENSSLOPTION \
-	$$HAVE_DES $(KFLAGS)"  "LNKFLAGS = $(LNKFLAGS)" \
+	$$HAVE_DES $$EGD $$COMP $(KFLAGS)"  "LNKFLAGS = $(LNKFLAGS)" \
 	"LIBS= -lncurses -lcrypt -lssl -lcrypto -lutil -lm \
 	$(SSLLIB) $$DES_LIB $(LIBS)"; \
 	if [ ! -f ./wermit ] || [ ./ckcmai.o -nt ./wermit ] ; then \

Return to bug 198980

Line 0 Link Here

(-)comms/kermit/files/patch-ck__ssl.c (+33 lines)
	1	--- ck_ssl.c.orig 2011-07-06 13:03:32 UTC
	2	+++ ck_ssl.c
	3	@@ -1054,11 +1054,15 @@ ssl_display_comp(SSL * ssl)
	4	if (ssl == NULL)
	5	return;
	6
	7	+#ifndef NO_COMP
	8	if (ssl->expand == NULL \|\| ssl->expand->meth == NULL)
	9	+#endif
	10	printf("Compression: None\r\n");
	11	+#ifndef NO_COMP
	12	else {
	13	printf("Compression: %s\r\n",ssl->expand->meth->name);
	14	}
	15	+#endif
	16	}
	17
	18	int
	19	@@ -1483,9 +1487,13 @@ the build.\r\n\r\n");
	20	}
	21	debug(F110,"ssl_rnd_file",ssl_rnd_file,0);
	22
	23	+#ifndef NO_EGD
	24	rc1 = RAND_egd(ssl_rnd_file);
	25	debug(F111,"ssl_once_init","RAND_egd()",rc1);
	26	- if ( rc1 <= 0 ) {
	27	+ if ( rc1 <= 0 )
	28	+#endif
	29	+ {
	30	+
	31	rc2 = RAND_load_file(ssl_rnd_file, -1);
	32	debug(F111,"ssl_once_init","RAND_load_file()",rc1);
	33	}

Line 0 Link Here

(-)comms/kermit/files/patch-makefile (+15 lines)
	1	--- makefile.orig 2015-03-27 21:34:55 UTC
	2	+++ makefile
	3	@@ -1785,9 +1785,11 @@ freebsd+ssl freebsd+openssl freebsd50+op
	4	echo "HAVE DES"; \
	5	else echo "NO DES"; \
	6	fi; \
	7	+ if test -n "$NO_EGD" ; then EGD='-DNO_EGD' ; fi; \
	8	+ if test -n "$NO_COMP" ; then COMP='-DNO_COMP' ; fi; \
	9	$(MAKE) freebsd KTARGET=$${KTARGET:-$(@)} "CC = $(CC)" "CC2 = $(CC2)" \
	10	KFLAGS="-DCK_AUTHENTICATION -DCK_SSL $(SSLINC) -DZLIB $$OPENSSLOPTION \
	11	- $$HAVE_DES $(KFLAGS)" "LNKFLAGS = $(LNKFLAGS)" \
	12	+ $$HAVE_DES $$EGD $$COMP $(KFLAGS)" "LNKFLAGS = $(LNKFLAGS)" \
	13	"LIBS= -lncurses -lcrypt -lssl -lcrypto -lutil -lm \
	14	$(SSLLIB) $$DES_LIB $(LIBS)"; \
	15	if [ ! -f ./wermit ] \|\| [ ./ckcmai.o -nt ./wermit ] ; then \