ports/139098: [PATCH] security/sks upgrade to 1.1.1

[John Marshall]

>Number:         139098
>Category:       ports
>Synopsis:       [PATCH] security/sks upgrade to 1.1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 24 05:40:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     John Marshall
>Release:        FreeBSD 8.0-RC1 i386
>Organization:
Riverwillow Pty Ltd
>Environment:
System: FreeBSD rwsrv05.mby.riverwillow.net.au 8.0-RC1 FreeBSD 8.0-RC1 #0: Fri Sep 18 13:35:00 AEST 2009 root at rwsrv05.mby.riverwillow.net.au:/spare/obj/usr/src/sys/RWSRV05 i386


	
>Description:

SKS 1.1.1 was released on 12-Aug-2009.
http://lists.gnu.org/archive/html/sks-devel/2009-08/msg00027.html

The attached patch upgrades security/sks from 1.1.0_1 to the current
release version.  I have patched and installed the port successfully on
FreeBSD 7.2-RELEASE/i386 and 8.0-RC1/i386.

Makefile Changes:
 - MASTER_SITES changed to GOOGLE_CODE
 - PROJECTHOST added (for MASTER_SITE_GOOGLE_CODE)
 - ALL_TARGET removed (was causing man page to be built a second time)
 - post-extract target added to create an empty ${WRKSRC}Makefile.local
   to stop the build complaining about the missing file.

Files Changes:
 - files/patch-dbserver.ml removed. Not applicable to SKS 1.1.1

>How-To-Repeat:
	
>Fix:

	

--- sks111.diff begins here ---
diff -urN sks101_1/Makefile sks/Makefile
--- sks101_1/Makefile	2009-01-30 18:46:19.000000000 +1100
+++ sks/Makefile	2009-09-24 13:20:19.000000000 +1000
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	sks
-PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTVERSION=	1.1.1
 CATEGORIES=	security
-MASTER_SITES=	http://minskyprimus.net/sks/releases/
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GOOGLE_CODE
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	johans at stack.nl
 COMMENT=	Synchronizing Key Server, a fast OpenPGP keyserver
 
+PROJECTHOST=	sks-keyserver
+
 USE_OCAML=	yes
 USE_BDB=	46+
 USE_PERL5_BUILD=yes
@@ -25,13 +25,15 @@
 		BDBLIB="-L${BDB_LIB_DIR}" \
 		LIBDB="-l${BDB_LIB_NAME}" \
 		MANDIR="${MANPREFIX}/man"
-ALL_TARGET=	all sks.8.gz
 
 PLIST_FILES=	bin/sks bin/sks_add_mail bin/sks_build.sh
 MAN8=		sks.8
 MANCOMPRESSED=	yes
 PORTDOCS=	BUGS README TODO
 
+post-extract:
+	@: > ${WRKSRC}/Makefile.local
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff -urN sks101_1/distinfo sks/distinfo
--- sks101_1/distinfo	2008-06-22 01:12:10.000000000 +1000
+++ sks/distinfo	2009-09-24 11:17:09.000000000 +1000
@@ -1,3 +1,3 @@
-MD5 (sks-1.1.0.tgz) = e774100ccb73044f0f6009dc75d67045
-SHA256 (sks-1.1.0.tgz) = f851a6375820595d7a7b1ef3b4ec7322ed27862215fa53efa74f76d9fd7626f2
-SIZE (sks-1.1.0.tgz) = 272456
+MD5 (sks-1.1.1.tgz) = 120361b88cf6820c108c6746ac464488
+SHA256 (sks-1.1.1.tgz) = 3cad29126e2d0cd904e9c92b0393ee4756f40916af33346bc5075b836fea8362
+SIZE (sks-1.1.1.tgz) = 273833
diff -urN sks101_1/files/patch-dbserver.ml sks/files/patch-dbserver.ml
--- sks101_1/files/patch-dbserver.ml	2009-01-30 18:46:19.000000000 +1100
+++ sks/files/patch-dbserver.ml	1970-01-01 10:00:00.000000000 +1000
@@ -1,50 +0,0 @@
-# HG changeset patch
-# User Yaron M. Minsky <yminsky at gmail.com>
-# Date 1211591563 14400
-# Node ID 1957b3075022809b4742d0190e87f76ccee55a56
-# Parent a032cd3cb2ee139b318bfcd9336b5e58e8cb67dc
-fixed bug in handling of send_mailsyncs flag
-
---- dbserver.ml	Sat May 10 18:45:52 2008 -0400
-+++ dbserver.ml	Fri May 23 21:12:43 2008 -0400
-@@ -631,24 +631,24 @@
- 	 then (Ehandlers.repeat_forever_simple checkpoint_interval checkpoint)
- 	 else (Ehandlers.repeat_forever_simple sync_interval sync)) 
- 	@
--	Ehandlers.repeat_forever_simple !Settings.membership_reload_time
--	 Membership.reset_membership_time
-+	  Ehandlers.repeat_forever_simple !Settings.membership_reload_time
-+	  Membership.reset_membership_time
- 	@
--	(Ehandlers.repeat_forever 10. 
--	   (Eventloop.make_tc ~cb:transmit_keys ~timeout:0
--	      ~name:"mail transmit keys" )
--	)
-+	  (if !Settings.send_mailsyncs then
-+	     (Ehandlers.repeat_forever 10. 
-+	        (Eventloop.make_tc ~cb:transmit_keys ~timeout:0
-+	           ~name:"mail transmit keys" )
-+	     )
-+	   else [])
- 	@
--	(if !Settings.send_mailsyncs then
--	   (Ehandlers.repeat_forever 10. 
--	      (Eventloop.make_tc ~name:"mailsync" ~timeout:0
--		 ~cb:(Mailsync.load_mailed_keys 
--			~addkey:(Keydb.add_key_merge ~newkey:false)))
--	   )
--	 else [])
-+	  (Ehandlers.repeat_forever 10. 
-+	     (Eventloop.make_tc ~name:"mailsync" ~timeout:0
-+		~cb:(Mailsync.load_mailed_keys 
-+		       ~addkey:(Keydb.add_key_merge ~newkey:false)))
-+	  )
- 	@
--	(Ehandlers.repeat_at_hour !Settings.stat_calc_hour
--	   calculate_stats_page)
-+	  (Ehandlers.repeat_at_hour !Settings.stat_calc_hour
-+	     calculate_stats_page)
-       )
- 
-       (
-
--- sks111.diff ends here ---


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