3 files changed, 60 insertions, 38 deletions

diff --git a/security/linux-f8-openssl/Makefile b/security/linux-f8-openssl/Makefile
index a5be6edca011..c4b5d7e0f940 100644
--- a/security/linux-f8-openssl/Makefile
+++ b/security/linux-f8-openssl/Makefile
@@ -1,21 +1,25 @@
-# New ports collection makefile for:	linux-openssl
-# Date created:		2006-08-04
-# Whom:			Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
+# New ports collection makefile for:	security/linux-f8-openssl
+# Date created:				2008-04-09
+# Whom:					bsam
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openssl
-PORTVERSION=	0.9.7f
+PORTVERSION=	0.9.8b
 CATEGORIES=	security linux
-DISTNAME=	${PORTNAME}-${PORTVERSION}-7.10
+PKGNAMEPREFIX=	linux-f8-
+DISTNAME=	${PORTNAME}-${PORTVERSION}-${RPMVERSION}
 
-MAINTAINER=	acm@FreeBSD.org
-COMMENT=	SSL and crypto library (Linux Version)
+MAINTAINER=	emulation@FreeBSD.org
+COMMENT=	The OpenSSL toolkit (Linux Fedora 8)
 
 USE_LINUX_RPM=	yes
-LINUX_DIST_VER=	4
+LINUX_DIST_VER=	8
+RPMVERSION=	17.fc8
+BRANDELF_FILES=	usr/bin/openssl
 USE_LDCONFIG=	yes
-DESCR=	${.CURDIR}/../${PORTNAME}/pkg-descr
+
+DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/security/linux-f8-openssl/distinfo.i386 b/security/linux-f8-openssl/distinfo.i386
index 749347d51ac1..05e4bb254784 100644
--- a/security/linux-f8-openssl/distinfo.i386
+++ b/security/linux-f8-openssl/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/4/openssl-0.9.7f-7.10.i386.rpm) = 10b0af84502fa18f9894e9e759cecd64
-SHA256 (rpm/i386/fedora/4/openssl-0.9.7f-7.10.i386.rpm) = 34db0416f11692b5fc5b8885149cf4487420e0435fcb09ca65ce77d30dda5e81
-SIZE (rpm/i386/fedora/4/openssl-0.9.7f-7.10.i386.rpm) = 1280954
-MD5 (rpm/i386/fedora/4/openssl-0.9.7f-7.10.src.rpm) = 7a208caac25c849bea298129a50cd07b
-SHA256 (rpm/i386/fedora/4/openssl-0.9.7f-7.10.src.rpm) = 2e931c0b46d8378ae1e625a0cb8ae7d769701cbd3d4b9fbf1b266b18404e0b9a
-SIZE (rpm/i386/fedora/4/openssl-0.9.7f-7.10.src.rpm) = 3056780
+MD5 (rpm/i386/fedora/8/openssl-0.9.8b-17.fc8.i386.rpm) = e18d1bf8915814ce848c2e2acdfe2bfe
+SHA256 (rpm/i386/fedora/8/openssl-0.9.8b-17.fc8.i386.rpm) = d13ebc29346da570479a255e8cefd157763abc53280a66d412f5b1a334ab0a7d
+SIZE (rpm/i386/fedora/8/openssl-0.9.8b-17.fc8.i386.rpm) = 1511606
+MD5 (rpm/i386/fedora/8/openssl-0.9.8b-17.fc8.src.rpm) = 5929f4fa70274647c2de1be32e0c9fa4
+SHA256 (rpm/i386/fedora/8/openssl-0.9.8b-17.fc8.src.rpm) = 45f9c75a0a22276a57643402b46195102f304c9a6c2a2eedd1f36bafcc11ce2c
+SIZE (rpm/i386/fedora/8/openssl-0.9.8b-17.fc8.src.rpm) = 2897711
diff --git a/security/linux-f8-openssl/pkg-plist b/security/linux-f8-openssl/pkg-plist
index 87387228902b..58c9cc9e61f8 100644
--- a/security/linux-f8-openssl/pkg-plist
+++ b/security/linux-f8-openssl/pkg-plist
@@ -1,3 +1,5 @@
+@comment file listing
+etc/pki/tls/cert.pem
 etc/pki/tls/certs/Makefile
 etc/pki/tls/certs/ca-bundle.crt
 etc/pki/tls/certs/make-dummy-cert
@@ -6,24 +8,32 @@ etc/pki/tls/misc/c_hash
 etc/pki/tls/misc/c_info
 etc/pki/tls/misc/c_issuer
 etc/pki/tls/misc/c_name
-etc/pki/tls/cert.pem
 etc/pki/tls/openssl.cnf
-lib/libcrypto.so.0.9.7f
-lib/libcrypto.so.5
-lib/libssl.so.0.9.7f
-lib/libssl.so.5
+lib/libcrypto.so.0.9.8b
+lib/libcrypto.so.6
+lib/libssl.so.0.9.8b
+lib/libssl.so.6
 usr/bin/openssl
-usr/share/doc/openssl-0.9.7f/CHANGES
-usr/share/doc/openssl-0.9.7f/FAQ
-usr/share/doc/openssl-0.9.7f/INSTALL
-usr/share/doc/openssl-0.9.7f/LICENSE
-usr/share/doc/openssl-0.9.7f/NEWS
-usr/share/doc/openssl-0.9.7f/README
-usr/share/doc/openssl-0.9.7f/c-indentation.el
-usr/share/doc/openssl-0.9.7f/openssl.txt
-usr/share/doc/openssl-0.9.7f/openssl_button.gif
-usr/share/doc/openssl-0.9.7f/openssl_button.html
-usr/share/doc/openssl-0.9.7f/ssleay.txt
+usr/lib/openssl/engines/lib4758cca.so
+usr/lib/openssl/engines/libaep.so
+usr/lib/openssl/engines/libatalla.so
+usr/lib/openssl/engines/libchil.so
+usr/lib/openssl/engines/libcswift.so
+usr/lib/openssl/engines/libgmp.so
+usr/lib/openssl/engines/libnuron.so
+usr/lib/openssl/engines/libsureware.so
+usr/lib/openssl/engines/libubsec.so
+usr/share/doc/openssl-0.9.8b/CHANGES
+usr/share/doc/openssl-0.9.8b/FAQ
+usr/share/doc/openssl-0.9.8b/INSTALL
+usr/share/doc/openssl-0.9.8b/LICENSE
+usr/share/doc/openssl-0.9.8b/NEWS
+usr/share/doc/openssl-0.9.8b/README
+usr/share/doc/openssl-0.9.8b/c-indentation.el
+usr/share/doc/openssl-0.9.8b/openssl.txt
+usr/share/doc/openssl-0.9.8b/openssl_button.gif
+usr/share/doc/openssl-0.9.8b/openssl_button.html
+usr/share/doc/openssl-0.9.8b/ssleay.txt
 usr/share/man/man1/asn1parse.1ssl.gz
 usr/share/man/man1/ca.1ssl.gz
 usr/share/man/man1/ciphers.1ssl.gz
@@ -33,6 +43,8 @@ usr/share/man/man1/dgst.1ssl.gz
 usr/share/man/man1/dhparam.1ssl.gz
 usr/share/man/man1/dsa.1ssl.gz
 usr/share/man/man1/dsaparam.1ssl.gz
+usr/share/man/man1/ec.1ssl.gz
+usr/share/man/man1/ecparam.1ssl.gz
 usr/share/man/man1/enc.1ssl.gz
 usr/share/man/man1/errstr.1ssl.gz
 usr/share/man/man1/gendsa.1ssl.gz
@@ -66,13 +78,19 @@ usr/share/man/man1/verify.1ssl.gz
 usr/share/man/man1/version.1ssl.gz
 usr/share/man/man1/x509.1ssl.gz
 usr/share/man/man5/config.5ssl.gz
+usr/share/man/man5/x509v3_config.5ssl.gz
 usr/share/man/man7/Modes_of_DES.7ssl.gz
 usr/share/man/man7/des_modes.7ssl.gz
-@dirrm usr/share/doc/openssl-0.9.7f
-@dirrmtry etc/pki/tls/private
-@dirrmtry etc/pki/tls/misc
-@dirrmtry etc/pki/tls/certs
-@dirrmtry etc/pki/tls
+@comment deal with empty directories installed by the port
+@exec /bin/mkdir -p %D/etc/pki/CA/private
 @dirrmtry etc/pki/CA/private
-@dirrmtry etc/pki/CA
-@dirrmtry etc/pki
+@exec /bin/mkdir -p %D/etc/pki/tls/private
+@dirrmtry etc/pki/tls/private
+@comment non-empty directory listing in revers order
+@dirrm usr/share/doc/openssl-0.9.8b
+@dirrm usr/lib/openssl/engines
+@dirrm usr/lib/openssl
+@dirrm etc/pki/tls/misc
+@dirrm etc/pki/tls/certs
+@dirrm etc/pki/tls
+@dirrm etc/pki/CA