From c9decc57c90f86a2545f1b0b57016da04c2ae5b9 Mon Sep 17 00:00:00 2001
From: Bill Fumerola <billf@FreeBSD.org>
Date: Mon, 7 Feb 2000 22:17:58 +0000
Subject: Add a patch that stops sslproxy from leaving zombies all over the
 place.

Submitted by:	rwatson

Upgrade to sslproxy.2000_Jan_29, with appropriate changes.
---
 security/sslproxy/Makefile           |  6 +++---
 security/sslproxy/distinfo           |  2 +-
 security/sslproxy/files/patch-aa     |  6 +++---
 security/sslproxy/files/sigchld.diff | 36 ++++++++++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 security/sslproxy/files/sigchld.diff

(limited to 'security/sslproxy')

diff --git a/security/sslproxy/Makefile b/security/sslproxy/Makefile
index 6dee18f9941f..4bcc184e8889 100644
--- a/security/sslproxy/Makefile
+++ b/security/sslproxy/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	sslproxy
-# Version required:	1998_Jun_14
+# Version required:	2000_Jan_29
 # Date created:		11 February 1999
 # Whom:			Alex Le Heux
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sslproxy.1998_Jun_14
-PKGNAME=	sslproxy-19980614
+DISTNAME=	sslproxy.2000_Jan_29
+PKGNAME=	sslproxy-20000129
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.obdev.at/pub/Products/sslproxy/
 
diff --git a/security/sslproxy/distinfo b/security/sslproxy/distinfo
index adfc2ae2f83e..cb4c6f8477cc 100644
--- a/security/sslproxy/distinfo
+++ b/security/sslproxy/distinfo
@@ -1 +1 @@
-MD5 (sslproxy.1998_Jun_14.tar.gz) = b3319dd7cfd9d674dcbcac77480cfc86
+MD5 (sslproxy.2000_Jan_29.tar.gz) = 784b9f24bd58af9a6de29fbb867f8f53
diff --git a/security/sslproxy/files/patch-aa b/security/sslproxy/files/patch-aa
index 15589e8a27a0..113f34088108 100644
--- a/security/sslproxy/files/patch-aa
+++ b/security/sslproxy/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun Jun 14 13:52:50 1998
-+++ Makefile	Sat Jan 29 16:48:49 2000
+--- Makefile.orig	Sat Jan 29 11:36:07 2000
++++ Makefile	Mon Feb  7 17:07:20 2000
 @@ -10,15 +10,13 @@
  
  
@@ -7,7 +7,7 @@
 -CC= gcc
 +CC?= gcc
  
--SSLROOT= /usr/local/ssl
+-SSLROOT= /usr/local/openssl
 -
 -CFLAGS= -Wall -I$(SSLROOT)/include -O
 +CFLAGS+= -I$(OPENSSLINC)
diff --git a/security/sslproxy/files/sigchld.diff b/security/sslproxy/files/sigchld.diff
new file mode 100644
index 000000000000..af6b0c960a94
--- /dev/null
+++ b/security/sslproxy/files/sigchld.diff
@@ -0,0 +1,36 @@
+--- /data/fbsd-ports/ports/security/sslproxy/work/sslproxy.1998_Jun_14/sslproxy.c	Thu Jan 13 22:51:14 2000
++++ sslproxy.c	Sun Jan 16 18:12:40 2000
+@@ -15,6 +15,20 @@
+ #include <openssl/ssl.h>
+ #include <openssl/err.h>
+ 
++#include <sys/types.h>
++#include <sys/wait.h>
++
++
++void
++child_handler(int arg)
++{
++	pid_t	pid;
++	int	dummy;
++
++	wait(&dummy);
++
++}
++
+ /* ------------------------------------------------------------------------- */
+ 
+ #define SRV_SSL_V23		0
+@@ -550,6 +564,12 @@
+ 		perror("listen");
+ 		exit(1);
+ 	}
++
++	if (signal(SIGCHLD, child_handler)) {
++		perror("signal");
++		exit(1);
++	}
++
+ 	fprintf(stderr, "proxy ready, listening for connections\n");
+ 	for(;;){
+ 		clientFd = accept(sockFd, NULL, NULL)
\ No newline at end of file
-- 
cgit v1.2.3