Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 7 Feb 2000 10:01:25 +0200 (EET)
From:      Martti Kuparinen <martti.kuparinen@research.zopps.fi>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/16554: [PATCH] ports/security/stunnel update
Message-ID:  <200002070801.KAA74586@ws125.research.zopps.fi>
next in thread | raw e-mail | index | archive | help 

>Number:         16554
>Category:       ports
>Synopsis:       [PATCH] ports/security/stunnel update
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb  7 00:10:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     Martti Kuparinen
>Release:        FreeBSD 3.4-RELEASE i386
>Organization:
Zopps Finland
>Environment:

	

>Description:

(This PR got bounced last week, so here it is again)

Here is a diff for security/stunnel. The new port files were
sent to me by Damian_Kuczynski@nik.gov.pl, I just created this
diff file. Thanks Damian!

>How-To-Repeat:

1. Apply the following patch
2. Remove patch-ab and patch-ac

>Fix:

diff -rc /usr/ports/security/stunnel/Makefile stunnel/Makefile
*** /usr/ports/security/stunnel/Makefile	Tue Jan 11 09:55:29 2000
--- stunnel/Makefile	Fri Feb  4 15:21:11 2000
***************
*** 1,12 ****
  # New ports collection makefile for:	stunnel
! # Version required:	3.4a
  # Date created:		Mon Jan 11 11:53:54 EET 1999
  # Whom:			Martti Kuparinen <martti.kuparinen@ericsson.com>
  #
  # $FreeBSD: ports/security/stunnel/Makefile,v 1.13 2000/01/11 01:16:04 foxfair Exp $
  #
  
! DISTNAME=	stunnel-3.4a
  CATEGORIES=	security
  MASTER_SITES=	http://opensores.thebunker.net/pub/mirrors/stunnel/ \
  		http://mike.daewoo.com.pl/computer/stunnel/ \
--- 1,12 ----
  # New ports collection makefile for:	stunnel
! # Version required:	3.6
  # Date created:		Mon Jan 11 11:53:54 EET 1999
  # Whom:			Martti Kuparinen <martti.kuparinen@ericsson.com>
  #
  # $FreeBSD: ports/security/stunnel/Makefile,v 1.13 2000/01/11 01:16:04 foxfair Exp $
  #
  
! DISTNAME=	stunnel-3.6
  CATEGORIES=	security
  MASTER_SITES=	http://opensores.thebunker.net/pub/mirrors/stunnel/ \
  		http://mike.daewoo.com.pl/computer/stunnel/ \
Only in stunnel: README.html
diff -rc /usr/ports/security/stunnel/files/md5 stunnel/files/md5
*** /usr/ports/security/stunnel/files/md5	Wed Sep  8 08:21:04 1999
--- stunnel/files/md5	Fri Feb  4 14:12:56 2000
***************
*** 1 ****
! MD5 (stunnel-3.4a.tar.gz) = 8bfd8ce5221999022fb9e927d46dca73
--- 1 ----
! MD5 (stunnel-3.6.tar.gz) = fb02e6dca39094297e4f6881189f981d
diff -rc /usr/ports/security/stunnel/patches/patch-aa stunnel/patches/patch-aa
*** /usr/ports/security/stunnel/patches/patch-aa	Thu Dec  9 16:17:26 1999
--- stunnel/patches/patch-aa	Fri Feb  4 14:12:07 2000
***************
*** 1,11 ****
! --- ssl.c.orig	Mon Sep  6 16:25:08 1999
! +++ ssl.c	Mon Sep  6 16:25:22 1999
! @@ -202,7 +202,7 @@
!                  strerror(errno));
!              goto dh_failed;
!          }
! -        if(!(dh=PEM_read_bio_DHparams(bio, NULL, NULL))) {
! +        if(!(dh=PEM_read_bio_DHparams(bio, NULL, NULL, NULL))) {
!              log(LOG_ERR, "Could not load DH parameters from %s",
!                  options.certfile);
!              goto dh_failed;
--- 1,38 ----
! --- configure.orig	Fri Feb  4 13:06:16 2000
! +++ configure	Fri Feb  4 13:10:42 2000
! @@ -1005,15 +1005,14 @@
!  else
!    echo "$ac_t""no" 1>&6
!  fi
! -
! -echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
! -echo "configure:1011: checking for pthread_create in -lpthread" >&5
! -ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
! +echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
! +echo "configure:1011: checking for pthread_create in -lc_r" >&5
! +ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
!  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
!    echo $ac_n "(cached) $ac_c" 1>&6
!  else
!    ac_save_LIBS="$LIBS"
! -LIBS="-lpthread  $LIBS"
! +LIBS="-lc_r  $LIBS"
!  cat > conftest.$ac_ext <<EOF
!  #line 1019 "configure"
!  #include "confdefs.h"
! @@ -1041,13 +1040,13 @@
!  fi
!  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
!    echo "$ac_t""yes" 1>&6
! -    ac_tr_lib=HAVE_LIB`echo pthread | sed -e 's/[^a-zA-Z0-9_]/_/g' \
! +    ac_tr_lib=HAVE_LIB`echo c_r | sed -e 's/[^a-zA-Z0-9_]/_/g' \
!      -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
!    cat >> confdefs.h <<EOF
!  #define $ac_tr_lib 1
!  EOF
!  
! -  LIBS="-lpthread $LIBS"
! +  LIBS="-lc_r $LIBS"
!  
!  else
!    echo "$ac_t""no" 1>&6


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200002070801.KAA74586>