Index: CVSROOT/modules
===================================================================
RCS file: /home/pcvs/CVSROOT/modules,v
retrieving revision 1.16591
diff -u -r1.16591 modules
--- CVSROOT/modules	10 Nov 2006 21:08:20 -0000	1.16591
+++ CVSROOT/modules	11 Nov 2006 02:05:16 -0000
@@ -8055,6 +8055,7 @@
 oskit		ports/devel/oskit
 osmose		ports/emulators/osmose
 osrtspproxy	ports/net/osrtspproxy
+osslsigncode	ports/security/osslsigncode
 ossp-al		ports/devel/ossp-al
 ossp-cfg	ports/devel/ossp-cfg
 ossp-ex		ports/devel/ossp-ex
Index: ports/security/Makefile
===================================================================
RCS file: /home/pcvs/ports/security/Makefile,v
retrieving revision 1.833
diff -u -r1.833 Makefile
--- ports/security/Makefile	31 Oct 2006 02:43:25 -0000	1.833
+++ ports/security/Makefile	11 Nov 2006 02:05:16 -0000
@@ -297,6 +297,7 @@
     SUBDIR += openvpn-devel
     SUBDIR += opieprint
     SUBDIR += osiris
+    SUBDIR += osslsigncode
     SUBDIR += outguess
     SUBDIR += p5-Authen-Captcha
     SUBDIR += p5-Authen-CyrusSASL
Index: ports/security/osslsigncode/Makefile
===================================================================
RCS file: ports/security/osslsigncode/Makefile
diff -N ports/security/osslsigncode/Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ports/security/osslsigncode/Makefile	11 Nov 2006 02:05:16 -0000
@@ -0,0 +1,30 @@
+# New ports collection makefile for:	osslsigncode
+# Date created:		9 November 2006
+# Whom:			snb@threerings.net
+#
+# $FreeBSD$
+#
+
+PORTNAME=	osslsigncode
+PORTVERSION=	1.2
+CATEGORIES=	security devel
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+
+MAINTAINER=	snb@threerings.net
+COMMENT=	OpenSSL-based signcode utility
+
+PLIST_FILES=	bin/osslsigncode
+
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_OPENSSL=	yes
+
+.if !defined(WITHOUT_CURL)
+LIB_DEPENDS+=	curl.3:${PORTSDIR}/ftp/curl
+.endif
+
+.include <bsd.port.mk>
Index: ports/security/osslsigncode/distinfo
===================================================================
RCS file: ports/security/osslsigncode/distinfo
diff -N ports/security/osslsigncode/distinfo
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ports/security/osslsigncode/distinfo	11 Nov 2006 02:05:16 -0000
@@ -0,0 +1,3 @@
+MD5 (osslsigncode-1.2.tar.gz) = e97a583463feddcce524cc4067a57e04
+SHA256 (osslsigncode-1.2.tar.gz) = 5cd55fa974b06bf89ee128137a969e58a8c6ea1df20b100ddb6b23a58682bec8
+SIZE (osslsigncode-1.2.tar.gz) = 83752
Index: ports/security/osslsigncode/pkg-descr
===================================================================
RCS file: ports/security/osslsigncode/pkg-descr
diff -N ports/security/osslsigncode/pkg-descr
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ports/security/osslsigncode/pkg-descr	11 Nov 2006 02:05:16 -0000
@@ -0,0 +1,4 @@
+Platform-independent tool for Authenticode signing of EXE/CAB files - uses
+OpenSSL and libcurl. It also supports timestamping.
+
+WWW: http://sourceforge.net/projects/osslsigncode/
Index: ports/security/osslsigncode/files/patch-osslsigncode.c
===================================================================
RCS file: ports/security/osslsigncode/files/patch-osslsigncode.c
diff -N ports/security/osslsigncode/files/patch-osslsigncode.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ports/security/osslsigncode/files/patch-osslsigncode.c	11 Nov 2006 02:05:16 -0000
@@ -0,0 +1,15 @@
+--- osslsigncode.c.orig	Fri Jan 21 04:23:44 2005
++++ osslsigncode.c	Thu Nov  9 15:31:37 2006
+@@ -610,9 +610,10 @@
+         
+         BIO_write(hash, indata + i, st.st_size - i);
+ 
+-	/* pad (with 0's) pe file to 8 byte boundary */
++	/* pad (with 0's) pe file to 8 byte boundary, but do not pad at all if 
++	   already aligned on 8 byte boundary. See http://sourceforge.net/tracker/index.php?func=detail&aid=1422627&group_id=129143&atid=713906 */
+ 	len = 8 - st.st_size % 8;
+-	if (len > 0) {
++	if (len > 0 && len != 8) {
+ 	  memset(buf, 0, len);
+ 	  BIO_write(hash, buf, len);
+ 	  st.st_size += len;