Attachment 160381 Details for Bug 202677 – Update to 0.92

[patch] Update to 0.92

cone.diff (text/plain), 10.12 KB, created by yamagi on 2015-08-26 15:18:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: yamagi

Created: 2015-08-26 15:18:53 UTC

Size: 10.12 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(Revision 395361)
>+++ Makefile	(Arbeitskopie)
>@@ -1,14 +1,8 @@
>-# Created by: Matthias Andree <matthias.andree@gmx.de>
> # $FreeBSD$
> 
> PORTNAME=	cone
>-PORTVERSION=	0.90
>-PORTREVISION=	4
>+PORTVERSION=	0.92
> CATEGORIES=	mail
>-# This is for beta versions, leave it in please:
>-#MASTER_SITES=	http://www.courier-mta.org/beta/${PORTNAME}/ \
>-#		http://www.lerctr.org/~ler/
>-# This is for release versions, leave it in please:
> MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
> 
> MAINTAINER=	uffe@uffe.org
>@@ -16,33 +10,28 @@
> 
> LICENSE=	GPLv3
> 
>-LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
>+LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell \
>+				libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode
> BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
> USES=		fam gettext gmake iconv ncurses perl5 shebangfix tar:bzip2
> USE_GNOME=	libxml2
>-USE_GCC=	yes
> 
> SHEBANG_FILES=	sysconftool
> 
> CPPFLAGS+=	-I${LOCALBASE}/include \
>-		-D_XOPEN_SOURCE_EXTENDED \
>-		-I${WRKDIR} -D_XOPEN_SOURCE_EXTENDED
>+		-D_XOPEN_SOURCE_EXTENDED
> LDFLAGS+=	-L${LOCALBASE}/lib
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS+=	-C --without-db --with-certdb=${PREFIX}/share/cone/rootcerts --exec-prefix=${PREFIX}
>-CONFIGURE_ENV=	REHASH="${PERL} ${SCRIPTDIR}/c_rehash"
>+CONFIGURE_ARGS+=	--with-certdb=${PREFIX}/share/cone/rootcerts --exec-prefix=${PREFIX}
> 
>-INSTALL_TARGET=	install-strip
>-
> OPTIONS_DEFINE=	DOCS
> 
>-post-extract:
>-		@${MKDIR} ${WRKDIR}/ncursesw
>-		${LN} -s ${LOCALBASE}/include/ncurses/ncurses.h ${WRKDIR}/ncursesw/curses.h
>-
> post-install:
>+		${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/leaf
>+		${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mailtool
>+		${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/cone
> 		${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${STAGEDIR}${PREFIX}/sbin/cone-sysconftool
> 		${RM} -f ${STAGEDIR}${PREFIX}/share/cone/rootcerts/.0
> 		@${MKDIR} ${STAGEDIR}${DOCSDIR}
>Index: distinfo
>===================================================================
>--- distinfo	(Revision 395361)
>+++ distinfo	(Arbeitskopie)
>@@ -1,2 +1,2 @@
>-SHA256 (cone-0.90.tar.bz2) = b03edfbf3392fb7b8d93574dad2bc4c7cbfca8890afabac8b99b21a9f46d8733
>-SIZE (cone-0.90.tar.bz2) = 3906323
>+SHA256 (cone-0.92.tar.bz2) = bfc1170565d931ac9b8a674410f44cb2472c7b755b5bb97e9915d37fdfe9d631
>+SIZE (cone-0.92.tar.bz2) = 3774451
>Index: files/patch-cone_cursesmessage.C
>===================================================================
>--- files/patch-cone_cursesmessage.C	(Revision 0)
>+++ files/patch-cone_cursesmessage.C	(Arbeitskopie)
>@@ -0,0 +1,15 @@
>+--- cone/cursesmessage.C.orig	2015-08-26 11:54:25 UTC
>++++ cone/cursesmessage.C
>+@@ -3761,10 +3761,10 @@ bool CursesMessage::decrypt(std::string 
>+ 			gi.passphrase_fd=passphrase_fd.c_str();
>+ 		}
>+ 
>+-		gi.input_func= &tempSaveText.input_func;
>++		gi.input_func= &CursesMessage::DecryptSaveText::input_func;
>+ 		gi.input_func_arg= &tempSaveText;
>+ 
>+-		gi.output_func= &tempSaveText.output_func;
>++		gi.output_func= &CursesMessage::DecryptSaveText::output_func; 
>+ 		gi.output_func_arg= &tempSaveText;
>+ 
>+ 		gi.errhandler_func= &tempSaveText.err_func;
>
>EigenschaftsÃ¤nderungen: files/patch-cone_cursesmessage.C
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-curses-cursescontainer-C.diff
>===================================================================
>--- files/patch-curses-cursescontainer-C.diff	(Revision 395361)
>+++ files/patch-curses-cursescontainer-C.diff	(Arbeitskopie)
>@@ -1,11 +0,0 @@
>---- curses/cursescontainer.C.orig	2014-06-24 00:25:29.000000000 +0200
>-+++ curses/cursescontainer.C	2014-06-24 00:25:42.000000000 +0200
>-@@ -10,7 +10,7 @@
>- using namespace std;
>- 
>- CursesContainer::CursesContainer(CursesContainer *parent)
>--	: Curses(parent), drawIndex(0)
>-+	: Curses(parent), drawIndex()
>- {
>- }
>- 
>Index: files/patch-libmail-envelope-h.diff
>===================================================================
>--- files/patch-libmail-envelope-h.diff	(Revision 395361)
>+++ files/patch-libmail-envelope-h.diff	(Arbeitskopie)
>@@ -1,10 +0,0 @@
>---- libmail/envelope.H.orig	2014-06-24 00:28:56.000000000 +0200
>-+++ libmail/envelope.H	2014-06-24 00:29:36.000000000 +0200
>-@@ -8,6 +8,7 @@
>- 
>- #include <vector>
>- #include <string>
>-+#include <ctime>
>- 
>- #include "namespace.H"
>- 
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(Revision 395361)
>+++ pkg-plist	(Arbeitskopie)
>@@ -1,16 +1,19 @@
> bin/cone
> bin/leaf
> bin/mailtool
>-sbin/cone-sysconftool
>-etc/cone.dist
>+%%ETCDIR%%.dist
> libexec/cone
> man/man1/cone.1.gz
>+man/man1/leaf.1.gz
> man/man1/mailtool.1.gz
>-man/man1/leaf.1.gz
>+sbin/cone-sysconftool
> %%DATADIR%%/APPLICATION.PDF.filter
>+%%DATADIR%%/FAQ.html
> %%DATADIR%%/IMAGE.GIF.filter
> %%DATADIR%%/IMAGE.JPEG.filter
> %%DATADIR%%/IMAGE.PNG.filter
>+%%DATADIR%%/INSTALL.html
>+%%DATADIR%%/README.html
> %%DATADIR%%/account-checknewmail.html
> %%DATADIR%%/account-copymessagesto.html
> %%DATADIR%%/account-createfolder.html
>@@ -71,7 +74,6 @@
> %%DATADIR%%/cppnamespace.html
> %%DATADIR%%/emailaddress.html
> %%DATADIR%%/envelope.html
>-%%DATADIR%%/FAQ.html
> %%DATADIR%%/folder-addmessage.html
> %%DATADIR%%/folder-clone.html
> %%DATADIR%%/folder-create.html
>@@ -97,9 +99,10 @@
> %%DATADIR%%/header-list.html
> %%DATADIR%%/header-mime.html
> %%DATADIR%%/header-plain.html
>+%%DATADIR%%/http.handler
>+%%DATADIR%%/https.handler
>+%%DATADIR%%/icon.gif
> %%DATADIR%%/index.html
>-%%DATADIR%%/icon.gif
>-%%DATADIR%%/INSTALL.html
> %%DATADIR%%/leaf.html
> %%DATADIR%%/libmail-folder.html
> %%DATADIR%%/libmail-misc.html
>@@ -148,12 +151,11 @@
> %%DATADIR%%/misc.html
> %%DATADIR%%/moredocs.html
> %%DATADIR%%/native.html
>-%%DATADIR%%/README.html
> %%DATADIR%%/search.html
> %%DATADIR%%/smap1.html
> %%DATADIR%%/smapconcurrency.html
>+%%DATADIR%%/smapcopymovemessages.html
> %%DATADIR%%/smapfolders.html
>-%%DATADIR%%/smapcopymovemessages.html
> %%DATADIR%%/smaplogout.html
> %%DATADIR%%/smapmessagecontents.html
> %%DATADIR%%/smapsyntax.html
>@@ -160,6 +162,4 @@
> %%DATADIR%%/smapusingfolders.html
> %%DATADIR%%/store.html
> %%DATADIR%%/synchronous.html
>-%%DATADIR%%/http.handler
>-%%DATADIR%%/https.handler
> %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
>Index: scripts/c_rehash
>===================================================================
>--- scripts/c_rehash	(Revision 395361)
>+++ scripts/c_rehash	(Arbeitskopie)
>@@ -1,155 +0,0 @@
>-#!/usr/bin/perl
>-
>-
>-# Perl c_rehash script, scan all files in a directory
>-# and add symbolic links to their hash values.
>-
>-my $openssl;
>-
>-my $dir = "/etc/ssl";
>-
>-if(defined $ENV{OPENSSL}) {
>-	$openssl = $ENV{OPENSSL};
>-} else {
>-	$openssl = "openssl";
>-	$ENV{OPENSSL} = $openssl;
>-}
>-
>-if(! -f $openssl) {
>-	my $found = 0;
>-	foreach (split /:/, $ENV{PATH}) {
>-		if(-f "$_/$openssl") {
>-			$found = 1;
>-			last;
>-		}
>-	}
>-	if($found == 0) {
>-		print STDERR "c_rehash: rehashing skipped ('openssl' program not available)\n";
>-		exit 0;
>-	}
>-}
>-
>-if(@ARGV) {
>-	@dirlist = @ARGV;
>-} elsif($ENV{SSL_CERT_DIR}) {
>-	@dirlist = split /:/, $ENV{SSL_CERT_DIR};
>-} else {
>-	$dirlist[0] = "$dir/certs";
>-}
>-
>-
>-foreach (@dirlist) {
>-	if(-d $_ and -w $_) {
>-		hash_dir($_);
>-	}
>-}
>-
>-sub hash_dir {
>-	my %hashlist;
>-	print "Doing $_[0]\n";
>-	chdir $_[0];
>-	opendir(DIR, ".");
>-	my @flist = readdir(DIR);
>-	# Delete any existing symbolic links
>-	foreach (grep {/^[\da-f]+\.r{0,1}\d+$/} @flist) {
>-		if(-l $_) {
>-			unlink $_;
>-		}
>-	}
>-	closedir DIR;
>-	FILE: foreach $fname (grep {/\.pem$/} @flist) {
>-		# Check to see if certificates and/or CRLs present.
>-		my ($cert, $crl) = check_file($fname);
>-		if(!$cert && !$crl) {
>-			print STDERR "WARNING: $fname does not contain a certificate or CRL: skipping\n";
>-			next;
>-		}
>-		link_hash_cert($fname) if($cert);
>-		link_hash_crl($fname) if($crl);
>-	}
>-}
>-
>-sub check_file {
>-	my ($is_cert, $is_crl) = (0,0);
>-	my $fname = $_[0];
>-	open IN, $fname;
>-	while(<IN>) {
>-		if(/^-----BEGIN (.*)-----/) {
>-			my $hdr = $1;
>-			if($hdr =~ /^(X509 |TRUSTED |)CERTIFICATE$/) {
>-				$is_cert = 1;
>-				last if($is_crl);
>-			} elsif($hdr eq "X509 CRL") {
>-				$is_crl = 1;
>-				last if($is_cert);
>-			}
>-		}
>-	}
>-	close IN;
>-	return ($is_cert, $is_crl);
>-}
>-
>-
>-# Link a certificate to its subject name hash value, each hash is of
>-# the form <hash>.<n> where n is an integer. If the hash value already exists
>-# then we need to up the value of n, unless its a duplicate in which
>-# case we skip the link. We check for duplicates by comparing the
>-# certificate fingerprints
>-
>-sub link_hash_cert {
>-		my $fname = $_[0];
>-		my ($hash, $fprint) = `$openssl x509 -hash -fingerprint -noout -in $fname`;
>-		chomp $hash;
>-		chomp $fprint;
>-		$fprint =~ s/^.*=//;
>-		$fprint =~ tr/://d;
>-		my $suffix = 0;
>-		# Search for an unused hash filename
>-		while(exists $hashlist{"$hash.$suffix"}) {
>-			# Hash matches: if fingerprint matches its a duplicate cert
>-			if($hashlist{"$hash.$suffix"} eq $fprint) {
>-				print STDERR "WARNING: Skipping duplicate certificate $fname\n";
>-				return;
>-			}
>-			$suffix++;
>-		}
>-		$hash .= ".$suffix";
>-		print "$fname => $hash\n";
>-		$symlink_exists=eval {symlink("",""); 1};
>-		if ($symlink_exists) {
>-			symlink $fname, $hash;
>-		} else {
>-			system ("cp", $fname, $hash);
>-		}
>-		$hashlist{$hash} = $fprint;
>-}
>-
>-# Same as above except for a CRL. CRL links are of the form <hash>.r<n>
>-
>-sub link_hash_crl {
>-		my $fname = $_[0];
>-		my ($hash, $fprint) = `$openssl crl -hash -fingerprint -noout -in $fname`;
>-		chomp $hash;
>-		chomp $fprint;
>-		$fprint =~ s/^.*=//;
>-		$fprint =~ tr/://d;
>-		my $suffix = 0;
>-		# Search for an unused hash filename
>-		while(exists $hashlist{"$hash.r$suffix"}) {
>-			# Hash matches: if fingerprint matches its a duplicate cert
>-			if($hashlist{"$hash.r$suffix"} eq $fprint) {
>-				print STDERR "WARNING: Skipping duplicate CRL $fname\n";
>-				return;
>-			}
>-			$suffix++;
>-		}
>-		$hash .= ".r$suffix";
>-		print "$fname => $hash\n";
>-		$symlink_exists=eval {symlink("",""); 1};
>-		if ($symlink_exists) {
>-			symlink $fname, $hash;
>-		} else {
>-			system ("cp", $fname, $hash);
>-		}
>-		$hashlist{$hash} = $fprint;
>-}

Actions: View | Diff

Attachments on bug 202677: 160381 | 162123 | 162445