From owner-svn-ports-branches@FreeBSD.ORG Sun May 17 10:20:34 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4309C2B4; Sun, 17 May 2015 10:20:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2FDB61E18; Sun, 17 May 2015 10:20:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4HAKY7k092414; Sun, 17 May 2015 10:20:34 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4HAKXli092411; Sun, 17 May 2015 10:20:33 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201505171020.t4HAKXli092411@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 17 May 2015 10:20:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386594 - in branches/2015Q2/textproc/p5-xmltv: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 May 2015 10:20:34 -0000 Author: riggs Date: Sun May 17 10:20:32 2015 New Revision: 386594 URL: https://svnweb.freebsd.org/changeset/ports/386594 Log: MFH: r386583 - Fix runtime issue: The web site from which North American data is obtained has changed - Bump PORTREVISION - Pet portlint PR: 197667 Submitted by: fbsd@opal.com Approved by: portmgr (erwin) Added: branches/2015Q2/textproc/p5-xmltv/files/patch-grab-na_dd-tv_grab_na_dd.in - copied unchanged from r386583, head/textproc/p5-xmltv/files/patch-grab-na_dd-tv_grab_na_dd.in Modified: branches/2015Q2/textproc/p5-xmltv/Makefile branches/2015Q2/textproc/p5-xmltv/files/patch-Makefile.PL Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/textproc/p5-xmltv/Makefile ============================================================================== --- branches/2015Q2/textproc/p5-xmltv/Makefile Sun May 17 10:09:36 2015 (r386593) +++ branches/2015Q2/textproc/p5-xmltv/Makefile Sun May 17 10:20:32 2015 (r386594) @@ -3,7 +3,7 @@ PORTNAME= xmltv PORTVERSION= 0.5.65 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= textproc perl5 MASTER_SITES= SF PKGNAMEPREFIX= p5- @@ -20,7 +20,7 @@ XMLTV_DEPENDS= \ p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer \ p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \ p5-PerlIO-gzip>=0:${PORTSDIR}/archivers/p5-PerlIO-gzip \ - p5-CGI.pm>=0:${PORTSDIR}/www/p5-CGI.pm \ + p5-CGI>=0:${PORTSDIR}/www/p5-CGI \ p5-IO-Compress>=0:${PORTSDIR}/archivers/p5-IO-Compress \ p5-Data-Dumper>=0:${PORTSDIR}/devel/p5-Data-Dumper \ p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ Modified: branches/2015Q2/textproc/p5-xmltv/files/patch-Makefile.PL ============================================================================== --- branches/2015Q2/textproc/p5-xmltv/files/patch-Makefile.PL Sun May 17 10:09:36 2015 (r386593) +++ branches/2015Q2/textproc/p5-xmltv/files/patch-Makefile.PL Sun May 17 10:20:32 2015 (r386594) @@ -1,6 +1,6 @@ ---- ./Makefile.PL.orig 2014-07-27 08:07:00.036965435 +0100 -+++ ./Makefile.PL 2014-07-27 08:05:30.848965659 +0100 -@@ -1031,14 +1031,14 @@ +--- Makefile.PL.orig 2014-05-09 04:07:13 UTC ++++ Makefile.PL +@@ -1031,14 +1031,14 @@ END # Guess a default value for {install} based on whether # prerequisites were found. # @@ -17,7 +17,7 @@ # Need to set {install} for each component by prompting. foreach my $info (@opt_components) { my $missing = $info->{missing}; -@@ -1067,8 +1067,8 @@ +@@ -1067,8 +1067,8 @@ END die; } @@ -28,7 +28,7 @@ } } } -@@ -1272,8 +1272,8 @@ +@@ -1272,8 +1272,8 @@ END } # Remove existing non-working 'uninstall' target. Copied: branches/2015Q2/textproc/p5-xmltv/files/patch-grab-na_dd-tv_grab_na_dd.in (from r386583, head/textproc/p5-xmltv/files/patch-grab-na_dd-tv_grab_na_dd.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/textproc/p5-xmltv/files/patch-grab-na_dd-tv_grab_na_dd.in Sun May 17 10:20:32 2015 (r386594, copy of r386583, head/textproc/p5-xmltv/files/patch-grab-na_dd-tv_grab_na_dd.in) @@ -0,0 +1,13 @@ +--- grab/na_dd/tv_grab_na_dd.in.orig 2012-09-24 04:37:54 UTC ++++ grab/na_dd/tv_grab_na_dd.in +@@ -716,8 +716,8 @@ else + return "$dd_user" => "$local_pass"; + } + +- my $dd_service='http://docs.tms.tribune.com/tech/tmsdatadirect/schedulesdirect/tvDataDelivery.wsdl'; +- $dd_service='http://docs.tms.tribune.com/tech/tmsdatadirect/schedulesdirect/stage/tvDataDelivery.wsdl' if $opt_beta_data; ++ my $dd_service='http://dd.schedulesdirect.org/tech/tmsdatadirect/schedulesdirect/tvDataDelivery.wsdl'; ++ $dd_service='http://dd.schedulesdirect.org/tech/tmsdatadirect/schedulesdirect/stage/tvDataDelivery.wsdl' if $opt_beta_data; + + my $proxy='http://localhost/'; + if (exists $ENV{HTTP_PROXY}) From owner-svn-ports-branches@FreeBSD.ORG Sun May 17 12:46:18 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 42E9ACC6; Sun, 17 May 2015 12:46:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 30E761C08; Sun, 17 May 2015 12:46:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4HCkIGb063646; Sun, 17 May 2015 12:46:18 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4HCkICp063645; Sun, 17 May 2015 12:46:18 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201505171246.t4HCkICp063645@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 17 May 2015 12:46:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386606 - branches/2015Q2/ftp/twoftpd X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 May 2015 12:46:18 -0000 Author: riggs Date: Sun May 17 12:46:17 2015 New Revision: 386606 URL: https://svnweb.freebsd.org/changeset/ports/386606 Log: MFH: r386604 Un-break build (fix of MASTER_SITES lets fetch succeed) PR: 199410 Submitted by: portmaster@bsdforge.com Approved by: portmgr (erwin) Modified: branches/2015Q2/ftp/twoftpd/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/ftp/twoftpd/Makefile ============================================================================== --- branches/2015Q2/ftp/twoftpd/Makefile Sun May 17 12:42:37 2015 (r386605) +++ branches/2015Q2/ftp/twoftpd/Makefile Sun May 17 12:46:17 2015 (r386606) @@ -5,7 +5,7 @@ PORTNAME= twoftpd PORTVERSION= 1.42 PORTREVISION= 1 CATEGORIES= ftp -MASTER_SITES= http://untroubled.org/${PORTNAME}/ +MASTER_SITES= http://untroubled.org/archive/${PORTNAME}/ MAINTAINER= ports@FreeBSD.org COMMENT= Simple, secure, efficient FTP server From owner-svn-ports-branches@FreeBSD.ORG Mon May 18 18:20:24 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E515AFF5; Mon, 18 May 2015 18:20:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D0DA11E7F; Mon, 18 May 2015 18:20:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4IIKN0Q047229; Mon, 18 May 2015 18:20:23 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4IIKNfp047225; Mon, 18 May 2015 18:20:23 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201505181820.t4IIKNfp047225@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 18 May 2015 18:20:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386696 - in branches/2015Q2: chinese/mutt mail/mutt mail/mutt/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 May 2015 18:20:24 -0000 Author: jbeich Date: Mon May 18 18:20:22 2015 New Revision: 386696 URL: https://svnweb.freebsd.org/changeset/ports/386696 Log: MFH: r386495 mail/mutt: update patches - Fix sidebar patch [1]. This version introduces a new config variable "sidebar_shortpath" which is set to yes by default to ensure backwards compatibility. - Fix an issue with recent gpg (and gpgme) versions (GnuPG version 2.1 stops exporting the GPG_AGENT_INFO environment variable, so mutt can't check for the presence of that to ensure the agent is running). - Fix pgp key selection [2]. - Bump port revision because of major change to sidebar patch and gpg handling. PR: 199727 PR: 199115 [1] PR: 199341 [2] Submitted by: Udo.Schweigert@siemens.com (maintainer) Approved by: ports-secteam (delphij) Added: branches/2015Q2/mail/mutt/files/patch-gpg_agent_info - copied unchanged from r386495, head/mail/mutt/files/patch-gpg_agent_info branches/2015Q2/mail/mutt/files/patch-pgpkey.c - copied unchanged from r386495, head/mail/mutt/files/patch-pgpkey.c Modified: branches/2015Q2/chinese/mutt/Makefile branches/2015Q2/mail/mutt/Makefile branches/2015Q2/mail/mutt/files/extra-patch-sidebar branches/2015Q2/mail/mutt/files/extra-patch-sidebar-nntp branches/2015Q2/mail/mutt/files/extra-patch-sidebar-refresh Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/chinese/mutt/Makefile ============================================================================== --- branches/2015Q2/chinese/mutt/Makefile Mon May 18 17:44:32 2015 (r386695) +++ branches/2015Q2/chinese/mutt/Makefile Mon May 18 18:20:22 2015 (r386696) @@ -1,7 +1,7 @@ # Created by: David O'Brien (obrien@NUXI.com) # $FreeBSD$ -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= chinese MASTERDIR= ${.CURDIR}/../../mail/mutt Modified: branches/2015Q2/mail/mutt/Makefile ============================================================================== --- branches/2015Q2/mail/mutt/Makefile Mon May 18 17:44:32 2015 (r386695) +++ branches/2015Q2/mail/mutt/Makefile Mon May 18 18:20:22 2015 (r386696) @@ -3,7 +3,7 @@ PORTNAME= mutt PORTVERSION= 1.5.23 -PORTREVISION?= 7 +PORTREVISION?= 8 CATEGORIES+= mail ipv6 MASTER_SITES= ftp://ftp.mutt.org/mutt/ \ ftp://ftp.mutt.org/mutt/devel/ \ Modified: branches/2015Q2/mail/mutt/files/extra-patch-sidebar ============================================================================== --- branches/2015Q2/mail/mutt/files/extra-patch-sidebar Mon May 18 17:44:32 2015 (r386695) +++ branches/2015Q2/mail/mutt/files/extra-patch-sidebar Mon May 18 18:20:22 2015 (r386696) @@ -1,1416 +1,2314 @@ -Based on Gentoo's updated version of the Mutt Sidebar patch, -rebased to apply to pristine Mutt sources. +Taken from http://lunar-linux.org/~tchan/mutt/patch-1.5.23.sidebar.20140412.txt -http://prefix.gentooexperimental.org:8000/mutt-patches/file/8117acc3edc0/sidebar.patch - -diff -uNp -r mutt-1.5.22.orig/OPS mutt-1.5.22/OPS ---- mutt-1.5.22.orig/OPS Tue Feb 23 06:57:28 2010 -+++ mutt-1.5.22/OPS Fri Oct 18 10:18:45 2013 -@@ -179,3 +179,8 @@ OP_WHAT_KEY "display the keycode for a key press" - OP_MAIN_SHOW_LIMIT "show currently active limit pattern" - OP_MAIN_COLLAPSE_THREAD "collapse/uncollapse current thread" - OP_MAIN_COLLAPSE_ALL "collapse/uncollapse all threads" -+OP_SIDEBAR_SCROLL_UP "scroll the mailbox pane up 1 page" -+OP_SIDEBAR_SCROLL_DOWN "scroll the mailbox pane down 1 page" -+OP_SIDEBAR_NEXT "go down to next mailbox" -+OP_SIDEBAR_PREV "go to previous mailbox" -+OP_SIDEBAR_OPEN "open hilighted mailbox" -diff -uNp -r mutt-1.5.22.orig/PATCHES mutt-1.5.22/PATCHES ---- mutt-1.5.22.orig/PATCHES Sun Feb 21 05:51:26 2010 -+++ mutt-1.5.22/PATCHES Fri Oct 18 10:19:14 2013 -@@ -0,0 +1 @@ -+patch-1.5.22.sidebar.gentoo-openbsd diff -uNp -r mutt-1.5.22.orig/buffy.c mutt-1.5.22/buffy.c ---- mutt-1.5.22.orig/buffy.c Mon Apr 22 07:14:53 2013 -+++ mutt-1.5.22/buffy.c Fri Oct 18 10:18:45 2013 -@@ -161,6 +161,49 @@ void mutt_buffy_cleanup (const char *buf, struct stat - } - } - -+static int buffy_compare_name(const void *a, const void *b) { -+ const BUFFY *b1 = * (BUFFY * const *) a; -+ const BUFFY *b2 = * (BUFFY * const *) b; -+ -+ return mutt_strcoll(b1->path, b2->path); -+} -+ -+static BUFFY *buffy_sort(BUFFY *b) -+{ -+ BUFFY *tmp = b; -+ int buffycount = 0; -+ BUFFY **ary; -+ int i; -+ -+ if (!option(OPTSIDEBARSORT)) -+ return b; -+ -+ for (; tmp != NULL; tmp = tmp->next) -+ buffycount++; -+ -+ ary = (BUFFY **) safe_calloc(buffycount, sizeof (*ary)); -+ -+ tmp = b; -+ for (i = 0; tmp != NULL; tmp = tmp->next, i++) { -+ ary[i] = tmp; -+ } -+ -+ qsort(ary, buffycount, sizeof(*ary), buffy_compare_name); -+ -+ for (i = 0; i < buffycount - 1; i++) { -+ ary[i]->next = ary[i+1]; -+ } -+ ary[buffycount - 1]->next = NULL; -+ for (i = 1; i < buffycount; i++) { -+ ary[i]->prev = ary[i-1]; -+ } -+ ary[0]->prev = NULL; -+ -+ tmp = ary[0]; -+ free(ary); -+ return tmp; -+} -+ - BUFFY *mutt_find_mailbox (const char *path) - { - BUFFY *tmp = NULL; -@@ -282,6 +325,7 @@ int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, uns - else - (*tmp)->size = 0; - } -+ Incoming = buffy_sort(Incoming); - return 0; - } - -@@ -340,6 +384,68 @@ static int buffy_maildir_hasnew (BUFFY* mailbox) - return rc; - } - -+/* update message counts for the sidebar */ -+void buffy_maildir_update (BUFFY* mailbox) -+{ -+ char path[_POSIX_PATH_MAX]; -+ DIR *dirp; -+ struct dirent *de; -+ char *p; -+ -+ mailbox->msgcount = 0; -+ mailbox->msg_unread = 0; -+ mailbox->msg_flagged = 0; -+ -+ snprintf (path, sizeof (path), "%s/new", mailbox->path); -+ -+ if ((dirp = opendir (path)) == NULL) -+ { -+ mailbox->magic = 0; -+ return; -+ } -+ -+ while ((de = readdir (dirp)) != NULL) -+ { -+ if (*de->d_name == '.') -+ continue; -+ -+ if (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')) { -+ mailbox->new = 1; -+ mailbox->msgcount++; -+ mailbox->msg_unread++; -+ } -+ } -+ -+ closedir (dirp); -+ snprintf (path, sizeof (path), "%s/cur", mailbox->path); -+ -+ if ((dirp = opendir (path)) == NULL) -+ { -+ mailbox->magic = 0; -+ return; -+ } -+ -+ while ((de = readdir (dirp)) != NULL) -+ { -+ if (*de->d_name == '.') -+ continue; -+ -+ if (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')) { -+ mailbox->msgcount++; -+ if ((p = strstr (de->d_name, ":2,"))) { -+ if (!strchr (p + 3, 'T')) { -+ if (!strchr (p + 3, 'S')) -+ mailbox->msg_unread++; -+ if (strchr(p + 3, 'F')) -+ mailbox->msg_flagged++; -+ } -+ } -+ } -+ } -+ -+ closedir (dirp); -+} -+ - /* returns 1 if mailbox has new mail */ - static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb) - { -@@ -371,6 +477,20 @@ static int buffy_mbox_hasnew (BUFFY* mailbox, struct s - return rc; - } - -+/* update message counts for the sidebar */ -+void buffy_mbox_update (BUFFY* mailbox) -+{ -+ CONTEXT *ctx = NULL; -+ -+ ctx = mx_open_mailbox(mailbox->path, M_READONLY | M_QUIET | M_NOSORT | M_PEEK, NULL); -+ if(ctx) -+ { -+ mailbox->msgcount = ctx->msgcount; -+ mailbox->msg_unread = ctx->unread; -+ mx_close_mailbox(ctx, 0); -+ } -+} -+ - int mutt_buffy_check (int force) - { - BUFFY *tmp; -@@ -444,16 +564,19 @@ int mutt_buffy_check (int force) - { - case M_MBOX: - case M_MMDF: -+ buffy_mbox_update (tmp); - if (buffy_mbox_hasnew (tmp, &sb) > 0) - BuffyCount++; - break; - - case M_MAILDIR: -+ buffy_maildir_update (tmp); - if (buffy_maildir_hasnew (tmp) > 0) - BuffyCount++; - break; - - case M_MH: -+ mh_buffy_update (tmp->path, &tmp->msgcount, &tmp->msg_unread, &tmp->msg_flagged); - mh_buffy(tmp); - if (tmp->new) - BuffyCount++; -diff -uNp -r mutt-1.5.22.orig/buffy.h mutt-1.5.22/buffy.h ---- mutt-1.5.22.orig/buffy.h Mon Apr 22 07:14:53 2013 -+++ mutt-1.5.22/buffy.h Fri Oct 18 10:18:45 2013 -@@ -25,7 +25,11 @@ typedef struct buffy_t - char path[_POSIX_PATH_MAX]; - off_t size; - struct buffy_t *next; -+ struct buffy_t *prev; - short new; /* mailbox has new mail */ -+ int msgcount; /* total number of messages */ -+ int msg_unread; /* number of unread messages */ -+ int msg_flagged; /* number of flagged messages */ - short notified; /* user has been notified */ - short magic; /* mailbox type */ - short newly_created; /* mbox or mmdf just popped into existence */ -diff -uNp -r mutt-1.5.22.orig/color.c mutt-1.5.22/color.c ---- mutt-1.5.22.orig/color.c Tue Jan 15 07:37:15 2013 -+++ mutt-1.5.22/color.c Fri Oct 18 10:19:53 2013 -@@ -93,6 +93,8 @@ static const struct mapping_t Fields[] = - { "bold", MT_COLOR_BOLD }, - { "underline", MT_COLOR_UNDERLINE }, - { "index", MT_COLOR_INDEX }, -+ { "sidebar_new", MT_COLOR_NEW }, -+ { "sidebar_flagged", MT_COLOR_FLAGGED }, - { NULL, 0 } - }; - -diff -uNp -r mutt-1.5.22.orig/compose.c mutt-1.5.22/compose.c ---- mutt-1.5.22.orig/compose.c Fri Oct 18 05:48:24 2013 -+++ mutt-1.5.22/compose.c Fri Oct 18 10:22:12 2013 -@@ -72,7 +72,7 @@ enum - - #define HDR_XOFFSET 10 - #define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */ --#define W (COLS - HDR_XOFFSET) -+#define W (COLS - HDR_XOFFSET - SidebarWidth) - - static const char * const Prompts[] = - { -@@ -110,7 +110,7 @@ static void snd_entry (char *b, size_t blen, MUTTMENU - - static void redraw_crypt_lines (HEADER *msg) - { -- mvaddstr (HDR_CRYPT, 0, "Security: "); -+ mvaddstr (HDR_CRYPT, SidebarWidth, "Security: "); - - if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0) - { -@@ -142,7 +142,7 @@ static void redraw_crypt_lines (HEADER *msg) - } - - clrtoeol (); -- move (HDR_CRYPTINFO, 0); -+ move (HDR_CRYPTINFO, SidebarWidth); - clrtoeol (); - - if ((WithCrypto & APPLICATION_PGP) -@@ -159,7 +159,7 @@ static void redraw_crypt_lines (HEADER *msg) - && (msg->security & ENCRYPT) - && SmimeCryptAlg - && *SmimeCryptAlg) { -- mvprintw (HDR_CRYPTINFO, 40, "%s%s", _("Encrypt with: "), -+ mvprintw (HDR_CRYPTINFO, SidebarWidth + 40, "%s%s", _("Encrypt with: "), - NONULL(SmimeCryptAlg)); - } - } -@@ -172,7 +172,7 @@ static void redraw_mix_line (LIST *chain) - int c; - char *t; - -- mvaddstr (HDR_MIX, 0, " Mix: "); -+ mvaddstr (HDR_MIX, SidebarWidth, " Mix: "); - - if (!chain) - { -@@ -187,7 +187,7 @@ static void redraw_mix_line (LIST *chain) - if (t && t[0] == '0' && t[1] == '\0') - t = ""; - -- if (c + mutt_strlen (t) + 2 >= COLS) -+ if (c + mutt_strlen (t) + 2 >= COLS - SidebarWidth) - break; - - addstr (NONULL(t)); -@@ -239,7 +239,7 @@ static void draw_envelope_addr (int line, ADDRESS *add - - buf[0] = 0; - rfc822_write_address (buf, sizeof (buf), addr, 1); -- mvprintw (line, 0, TITLE_FMT, Prompts[line - 1]); -+ mvprintw (line, SidebarWidth, TITLE_FMT, Prompts[line - 1]); - mutt_paddstr (W, buf); - } - -@@ -249,10 +249,10 @@ static void draw_envelope (HEADER *msg, char *fcc) - draw_envelope_addr (HDR_TO, msg->env->to); - draw_envelope_addr (HDR_CC, msg->env->cc); - draw_envelope_addr (HDR_BCC, msg->env->bcc); -- mvprintw (HDR_SUBJECT, 0, TITLE_FMT, Prompts[HDR_SUBJECT - 1]); -+ mvprintw (HDR_SUBJECT, SidebarWidth, TITLE_FMT, Prompts[HDR_SUBJECT - 1]); - mutt_paddstr (W, NONULL (msg->env->subject)); - draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to); -- mvprintw (HDR_FCC, 0, TITLE_FMT, Prompts[HDR_FCC - 1]); -+ mvprintw (HDR_FCC, SidebarWidth, TITLE_FMT, Prompts[HDR_FCC - 1]); - mutt_paddstr (W, fcc); - - if (WithCrypto) -@@ -263,7 +263,7 @@ static void draw_envelope (HEADER *msg, char *fcc) - #endif - - SETCOLOR (MT_COLOR_STATUS); -- mvaddstr (HDR_ATTACH - 1, 0, _("-- Attachments")); -+ mvaddstr (HDR_ATTACH - 1, SidebarWidth, _("-- Attachments")); - clrtoeol (); - - NORMAL_COLOR; -@@ -299,7 +299,7 @@ static int edit_address_list (int line, ADDRESS **addr - /* redraw the expanded list so the user can see the result */ - buf[0] = 0; - rfc822_write_address (buf, sizeof (buf), *addr, 1); -- move (line, HDR_XOFFSET); -+ move (line, HDR_XOFFSET+SidebarWidth); - mutt_paddstr (W, buf); - - return 0; -@@ -544,7 +544,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for - if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) - { - mutt_str_replace (&msg->env->subject, buf); -- move (HDR_SUBJECT, HDR_XOFFSET); -+ move (HDR_SUBJECT, HDR_XOFFSET + SidebarWidth); - if (msg->env->subject) - mutt_paddstr (W, msg->env->subject); - else -@@ -562,7 +562,7 @@ int mutt_compose_menu (HEADER *msg, /* structure for - { - strfcpy (fcc, buf, fcclen); - mutt_pretty_mailbox (fcc, fcclen); -- move (HDR_FCC, HDR_XOFFSET); -+ move (HDR_FCC, HDR_XOFFSET + SidebarWidth); - mutt_paddstr (W, fcc); - fccSet = 1; - } -diff -uNp -r mutt-1.5.22.orig/curs_main.c mutt-1.5.22/curs_main.c ---- mutt-1.5.22.orig/curs_main.c Tue Jan 15 07:37:15 2013 -+++ mutt-1.5.22/curs_main.c Fri Oct 18 10:18:45 2013 -@@ -26,7 +26,9 @@ - #include "mailbox.h" - #include "mapping.h" - #include "sort.h" -+#include "buffy.h" - #include "mx.h" -+#include "sidebar.h" - - #ifdef USE_POP - #include "pop.h" -@@ -519,8 +521,12 @@ int mutt_index_menu (void) - menu->redraw |= REDRAW_STATUS; - if (do_buffy_notify) +*** mutt-1.5.23-orig/buffy.c 2014-03-12 11:03:44.000000000 -0500 +--- mutt-1.5.23/buffy.c 2014-04-12 15:33:54.000000000 -0500 +*************** +*** 161,166 **** +--- 161,209 ---- + } + } + ++ static int buffy_compare_name(const void *a, const void *b) { ++ const BUFFY *b1 = * (BUFFY * const *) a; ++ const BUFFY *b2 = * (BUFFY * const *) b; ++ ++ return mutt_strcoll(b1->path, b2->path); ++ } ++ ++ static BUFFY *buffy_sort(BUFFY *b) ++ { ++ BUFFY *tmp = b; ++ int buffycount = 0; ++ BUFFY **ary; ++ int i; ++ ++ if (!option(OPTSIDEBARSORT)) ++ return b; ++ ++ for (; tmp != NULL; tmp = tmp->next) ++ buffycount++; ++ ++ ary = (BUFFY **) safe_calloc(buffycount, sizeof (*ary)); ++ ++ tmp = b; ++ for (i = 0; tmp != NULL; tmp = tmp->next, i++) { ++ ary[i] = tmp; ++ } ++ ++ qsort(ary, buffycount, sizeof(*ary), buffy_compare_name); ++ ++ for (i = 0; i < buffycount - 1; i++) { ++ ary[i]->next = ary[i+1]; ++ } ++ ary[buffycount - 1]->next = NULL; ++ for (i = 1; i < buffycount; i++) { ++ ary[i]->prev = ary[i-1]; ++ } ++ ary[0]->prev = NULL; ++ ++ tmp = ary[0]; ++ free(ary); ++ return tmp; ++ } ++ + BUFFY *mutt_find_mailbox (const char *path) + { + BUFFY *tmp = NULL; +*************** +*** 196,204 **** +--- 239,251 ---- + static BUFFY *buffy_new (const char *path) + { + BUFFY* buffy; ++ char rp[PATH_MAX]; ++ char *r; + + buffy = (BUFFY *) safe_calloc (1, sizeof (BUFFY)); + strfcpy (buffy->path, path, sizeof (buffy->path)); ++ r = realpath(path, rp); ++ strfcpy (buffy->realpath, r ? rp : path, sizeof (buffy->realpath)); + buffy->next = NULL; + buffy->magic = 0; + +*************** +*** 243,250 **** + p = realpath (buf, f1); + for (tmp = &Incoming; *tmp; tmp = &((*tmp)->next)) { -- if (mutt_buffy_notify () && option (OPTBEEPNEW)) -- beep (); -+ if (mutt_buffy_notify ()) -+ { -+ menu->redraw |= REDRAW_FULL; -+ if (option (OPTBEEPNEW)) -+ beep (); +! q = realpath ((*tmp)->path, f2); +! if (mutt_strcmp (p ? p : buf, q ? q : (*tmp)->path) == 0) + { + dprint(3,(debugfile,"mailbox '%s' already registered as '%s'\n", buf, (*tmp)->path)); + break; +--- 290,297 ---- + p = realpath (buf, f1); + for (tmp = &Incoming; *tmp; tmp = &((*tmp)->next)) + { +! q = (*tmp)->realpath; +! if (mutt_strcmp (p ? p : buf, q) == 0) + { + dprint(3,(debugfile,"mailbox '%s' already registered as '%s'\n", buf, (*tmp)->path)); + break; +*************** +*** 282,287 **** +--- 329,335 ---- + else + (*tmp)->size = 0; + } ++ Incoming = buffy_sort(Incoming); + return 0; + } + +*************** +*** 306,311 **** +--- 354,364 ---- + return 0; + } + ++ if (option(OPTSIDEBAR) && mailbox->msg_unread > 0) { ++ mailbox->new = 1; ++ return 1; ++ } ++ + if ((dirp = opendir (path)) == NULL) + { + mailbox->magic = 0; +*************** +*** 340,345 **** +--- 393,464 ---- + return rc; + } + ++ /* update message counts for the sidebar */ ++ void buffy_maildir_update (BUFFY* mailbox) ++ { ++ char path[_POSIX_PATH_MAX]; ++ DIR *dirp; ++ struct dirent *de; ++ char *p; ++ ++ if(!option(OPTSIDEBAR)) ++ return; ++ ++ mailbox->msgcount = 0; ++ mailbox->msg_unread = 0; ++ mailbox->msg_flagged = 0; ++ ++ snprintf (path, sizeof (path), "%s/new", mailbox->path); ++ ++ if ((dirp = opendir (path)) == NULL) ++ { ++ mailbox->magic = 0; ++ return; ++ } ++ ++ while ((de = readdir (dirp)) != NULL) ++ { ++ if (*de->d_name == '.') ++ continue; ++ ++ if (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')) { ++ mailbox->new = 1; ++ mailbox->msgcount++; ++ mailbox->msg_unread++; ++ } ++ } ++ ++ closedir (dirp); ++ snprintf (path, sizeof (path), "%s/cur", mailbox->path); ++ ++ if ((dirp = opendir (path)) == NULL) ++ { ++ mailbox->magic = 0; ++ return; ++ } ++ ++ while ((de = readdir (dirp)) != NULL) ++ { ++ if (*de->d_name == '.') ++ continue; ++ ++ if (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')) { ++ mailbox->msgcount++; ++ if ((p = strstr (de->d_name, ":2,"))) { ++ if (!strchr (p + 3, 'T')) { ++ if (!strchr (p + 3, 'S')) ++ mailbox->msg_unread++; ++ if (strchr(p + 3, 'F')) ++ mailbox->msg_flagged++; ++ } + } ++ } ++ } ++ ++ mailbox->sb_last_checked = time(NULL); ++ closedir (dirp); ++ } ++ + /* returns 1 if mailbox has new mail */ + static int buffy_mbox_hasnew (BUFFY* mailbox, struct stat *sb) + { +*************** +*** 351,357 **** + else + statcheck = sb->st_mtime > sb->st_atime + || (mailbox->newly_created && sb->st_ctime == sb->st_mtime && sb->st_ctime == sb->st_atime); +! if (statcheck) + { + if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited) + { +--- 470,476 ---- + else + statcheck = sb->st_mtime > sb->st_atime + || (mailbox->newly_created && sb->st_ctime == sb->st_mtime && sb->st_ctime == sb->st_atime); +! if ((!option(OPTSIDEBAR) && statcheck) || (option(OPTSIDEBAR) && mailbox->msg_unread > 0)) + { + if (!option(OPTMAILCHECKRECENT) || sb->st_mtime > mailbox->last_visited) + { +*************** +*** 371,376 **** +--- 490,516 ---- + return rc; + } + ++ /* update message counts for the sidebar */ ++ void buffy_mbox_update (BUFFY* mailbox, struct stat *sb) ++ { ++ CONTEXT *ctx = NULL; ++ ++ if(!option(OPTSIDEBAR)) ++ return; ++ if(mailbox->sb_last_checked > sb->st_mtime && mailbox->msgcount != 0) ++ return; /* no check necessary */ ++ ++ ctx = mx_open_mailbox(mailbox->path, M_READONLY | M_QUIET | M_NOSORT | M_PEEK, NULL); ++ if(ctx) ++ { ++ mailbox->msgcount = ctx->msgcount; ++ mailbox->msg_unread = ctx->unread; ++ mailbox->msg_flagged = ctx->flagged; ++ mailbox->sb_last_checked = time(NULL); ++ mx_close_mailbox(ctx, 0); ++ } ++ } ++ + int mutt_buffy_check (int force) + { + BUFFY *tmp; +*************** +*** 444,460 **** + { + case M_MBOX: + case M_MMDF: + if (buffy_mbox_hasnew (tmp, &sb) > 0) + BuffyCount++; + break; + + case M_MAILDIR: + if (buffy_maildir_hasnew (tmp) > 0) + BuffyCount++; + break; + + case M_MH: +! mh_buffy(tmp); + if (tmp->new) + BuffyCount++; + break; +--- 584,603 ---- + { + case M_MBOX: + case M_MMDF: ++ buffy_mbox_update (tmp, &sb); + if (buffy_mbox_hasnew (tmp, &sb) > 0) + BuffyCount++; + break; + + case M_MAILDIR: ++ buffy_maildir_update (tmp); + if (buffy_maildir_hasnew (tmp) > 0) + BuffyCount++; + break; + + case M_MH: +! mh_buffy_update (tmp->path, &tmp->msgcount, &tmp->msg_unread, &tmp->msg_flagged, &tmp->sb_last_checked); +! mh_buffy(tmp); + if (tmp->new) + BuffyCount++; + break; +*** mutt-1.5.23-orig/buffy.h 2014-03-12 11:03:44.000000000 -0500 +--- mutt-1.5.23/buffy.h 2014-04-11 10:14:01.000000000 -0500 +*************** +*** 23,35 **** +--- 23,41 ---- + typedef struct buffy_t + { + char path[_POSIX_PATH_MAX]; ++ char realpath[_POSIX_PATH_MAX]; + off_t size; + struct buffy_t *next; ++ struct buffy_t *prev; + short new; /* mailbox has new mail */ ++ int msgcount; /* total number of messages */ ++ int msg_unread; /* number of unread messages */ ++ int msg_flagged; /* number of flagged messages */ + short notified; /* user has been notified */ + short magic; /* mailbox type */ + short newly_created; /* mbox or mmdf just popped into existence */ + time_t last_visited; /* time of last exit from this mailbox */ ++ time_t sb_last_checked; /* time of last buffy check from sidebar */ + } + BUFFY; + +*** mutt-1.5.23-orig/color.c 2014-03-12 11:03:45.000000000 -0500 +--- mutt-1.5.23/color.c 2014-04-11 10:14:01.000000000 -0500 +*************** +*** 93,98 **** +--- 93,100 ---- + { "bold", MT_COLOR_BOLD }, + { "underline", MT_COLOR_UNDERLINE }, + { "index", MT_COLOR_INDEX }, ++ { "sidebar_new", MT_COLOR_NEW }, ++ { "sidebar_flagged", MT_COLOR_FLAGGED }, + { NULL, 0 } + }; + +*** mutt-1.5.23-orig/compose.c 2014-03-12 11:03:45.000000000 -0500 +--- mutt-1.5.23/compose.c 2014-04-12 12:15:56.000000000 -0500 +*************** +*** 72,78 **** + + #define HDR_XOFFSET 10 + #define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */ +! #define W (COLS - HDR_XOFFSET) + + static const char * const Prompts[] = + { +--- 72,78 ---- + + #define HDR_XOFFSET 10 + #define TITLE_FMT "%10s" /* Used for Prompts, which are ASCII */ +! #define W (COLS - HDR_XOFFSET - SidebarWidth) + + static const char * const Prompts[] = + { +*************** +*** 110,116 **** + + static void redraw_crypt_lines (HEADER *msg) + { +! mvaddstr (HDR_CRYPT, 0, "Security: "); + + if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0) + { +--- 110,116 ---- + + static void redraw_crypt_lines (HEADER *msg) + { +! mvaddstr (HDR_CRYPT, SidebarWidth, "Security: "); + + if ((WithCrypto & (APPLICATION_PGP | APPLICATION_SMIME)) == 0) + { +*************** +*** 142,148 **** + } + + clrtoeol (); +! move (HDR_CRYPTINFO, 0); + clrtoeol (); + + if ((WithCrypto & APPLICATION_PGP) +--- 142,148 ---- + } + + clrtoeol (); +! move (HDR_CRYPTINFO, SidebarWidth); + clrtoeol (); + + if ((WithCrypto & APPLICATION_PGP) +*************** +*** 159,165 **** + && (msg->security & ENCRYPT) + && SmimeCryptAlg + && *SmimeCryptAlg) { +! mvprintw (HDR_CRYPTINFO, 40, "%s%s", _("Encrypt with: "), + NONULL(SmimeCryptAlg)); + } + } +--- 159,165 ---- + && (msg->security & ENCRYPT) + && SmimeCryptAlg + && *SmimeCryptAlg) { +! mvprintw (HDR_CRYPTINFO, SidebarWidth + 40, "%s%s", _("Encrypt with: "), + NONULL(SmimeCryptAlg)); + } + } +*************** +*** 172,178 **** + int c; + char *t; + +! mvaddstr (HDR_MIX, 0, " Mix: "); + + if (!chain) + { +--- 172,178 ---- + int c; + char *t; + +! mvaddstr (HDR_MIX, SidebarWidth, " Mix: "); + + if (!chain) + { +*************** +*** 187,193 **** + if (t && t[0] == '0' && t[1] == '\0') + t = ""; + +! if (c + mutt_strlen (t) + 2 >= COLS) + break; + + addstr (NONULL(t)); +--- 187,193 ---- + if (t && t[0] == '0' && t[1] == '\0') + t = ""; + +! if (c + mutt_strlen (t) + 2 >= COLS - SidebarWidth) + break; + + addstr (NONULL(t)); +*************** +*** 239,245 **** + + buf[0] = 0; + rfc822_write_address (buf, sizeof (buf), addr, 1); +! mvprintw (line, 0, TITLE_FMT, Prompts[line - 1]); + mutt_paddstr (W, buf); + } + +--- 239,245 ---- + + buf[0] = 0; + rfc822_write_address (buf, sizeof (buf), addr, 1); +! mvprintw (line, SidebarWidth, TITLE_FMT, Prompts[line - 1]); + mutt_paddstr (W, buf); + } + +*************** +*** 249,258 **** + draw_envelope_addr (HDR_TO, msg->env->to); + draw_envelope_addr (HDR_CC, msg->env->cc); + draw_envelope_addr (HDR_BCC, msg->env->bcc); +! mvprintw (HDR_SUBJECT, 0, TITLE_FMT, Prompts[HDR_SUBJECT - 1]); + mutt_paddstr (W, NONULL (msg->env->subject)); + draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to); +! mvprintw (HDR_FCC, 0, TITLE_FMT, Prompts[HDR_FCC - 1]); + mutt_paddstr (W, fcc); + + if (WithCrypto) +--- 249,258 ---- + draw_envelope_addr (HDR_TO, msg->env->to); + draw_envelope_addr (HDR_CC, msg->env->cc); + draw_envelope_addr (HDR_BCC, msg->env->bcc); +! mvprintw (HDR_SUBJECT, SidebarWidth, TITLE_FMT, Prompts[HDR_SUBJECT - 1]); + mutt_paddstr (W, NONULL (msg->env->subject)); + draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to); +! mvprintw (HDR_FCC, SidebarWidth, TITLE_FMT, Prompts[HDR_FCC - 1]); + mutt_paddstr (W, fcc); + + if (WithCrypto) +*************** +*** 263,269 **** + #endif + + SETCOLOR (MT_COLOR_STATUS); +! mvaddstr (HDR_ATTACH - 1, 0, _("-- Attachments")); + clrtoeol (); + + NORMAL_COLOR; +--- 263,269 ---- + #endif + + SETCOLOR (MT_COLOR_STATUS); +! mvaddstr (HDR_ATTACH - 1, SidebarWidth, _("-- Attachments")); + clrtoeol (); + + NORMAL_COLOR; +*************** +*** 299,305 **** + /* redraw the expanded list so the user can see the result */ + buf[0] = 0; + rfc822_write_address (buf, sizeof (buf), *addr, 1); +! move (line, HDR_XOFFSET); + mutt_paddstr (W, buf); + + return 0; +--- 299,305 ---- + /* redraw the expanded list so the user can see the result */ + buf[0] = 0; + rfc822_write_address (buf, sizeof (buf), *addr, 1); +! move (line, HDR_XOFFSET+SidebarWidth); + mutt_paddstr (W, buf); + + return 0; +*************** +*** 544,550 **** + if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) + { + mutt_str_replace (&msg->env->subject, buf); +! move (HDR_SUBJECT, HDR_XOFFSET); + if (msg->env->subject) + mutt_paddstr (W, msg->env->subject); + else +--- 544,550 ---- + if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) + { + mutt_str_replace (&msg->env->subject, buf); +! move (HDR_SUBJECT, HDR_XOFFSET + SidebarWidth); + if (msg->env->subject) + mutt_paddstr (W, msg->env->subject); + else +*************** +*** 562,568 **** + { + strfcpy (fcc, buf, fcclen); + mutt_pretty_mailbox (fcc, fcclen); +! move (HDR_FCC, HDR_XOFFSET); + mutt_paddstr (W, fcc); + fccSet = 1; + } +--- 562,568 ---- + { + strfcpy (fcc, buf, fcclen); + mutt_pretty_mailbox (fcc, fcclen); +! move (HDR_FCC, HDR_XOFFSET + SidebarWidth); + mutt_paddstr (W, fcc); + fccSet = 1; + } +*** mutt-1.5.23-orig/configure.ac 2014-03-12 11:26:40.000000000 -0500 +--- mutt-1.5.23/configure.ac 2014-04-11 10:14:01.000000000 -0500 +*************** +*** 1276,1281 **** +--- 1276,1283 ---- + AC_DEFINE(HAVE_LANGINFO_YESEXPR,1,[ Define if you have and nl_langinfo(YESEXPR). ]) + fi + ++ AC_CHECK_FUNCS(fmemopen open_memstream) ++ + dnl Documentation tools + have_openjade="no" + AC_PATH_PROG([OSPCAT], [ospcat], [none]) +*** mutt-1.5.23-orig/curs_main.c 2014-03-12 11:06:17.000000000 -0500 +--- mutt-1.5.23/curs_main.c 2014-04-12 21:45:21.000000000 -0500 +*************** +*** 26,32 **** +--- 26,34 ---- + #include "mailbox.h" + #include "mapping.h" + #include "sort.h" ++ #include "buffy.h" + #include "mx.h" ++ #include "sidebar.h" + + #ifdef USE_POP + #include "pop.h" +*************** +*** 519,538 **** + menu->redraw |= REDRAW_STATUS; + if (do_buffy_notify) + { +! if (mutt_buffy_notify () && option (OPTBEEPNEW)) +! beep (); + } + else + do_buffy_notify = 1; } - else - do_buffy_notify = 1; -@@ -532,6 +538,7 @@ int mutt_index_menu (void) - if (menu->redraw & REDRAW_FULL) - { - menu_redraw_full (menu); -+ draw_sidebar(menu->menu); - mutt_show_error (); - } - -@@ -554,9 +561,12 @@ int mutt_index_menu (void) - - if (menu->redraw & REDRAW_STATUS) + + if (op != -1) + mutt_curs_set (0); + + if (menu->redraw & REDRAW_FULL) + { + menu_redraw_full (menu); + mutt_show_error (); + } + + if (menu->menu == MENU_MAIN) +--- 521,551 ---- + menu->redraw |= REDRAW_STATUS; + if (do_buffy_notify) { -+ DrawFullLine = 1; - menu_status_line (buf, sizeof (buf), menu, NONULL (Status)); -+ DrawFullLine = 0; - move (option (OPTSTATUSONTOP) ? 0 : LINES-2, 0); - SETCOLOR (MT_COLOR_STATUS); -+ set_buffystats(Context); - mutt_paddstr (COLS, buf); - NORMAL_COLOR; - menu->redraw &= ~REDRAW_STATUS; -@@ -569,7 +579,7 @@ int mutt_index_menu (void) - menu->oldcurrent = -1; - - if (option (OPTARROWCURSOR)) -- move (menu->current - menu->top + menu->offset, 2); -+ move (menu->current - menu->top + menu->offset, SidebarWidth + 2); - else if (option (OPTBRAILLEFRIENDLY)) - move (menu->current - menu->top + menu->offset, 0); +! if (mutt_buffy_notify ()) +! { +! menu->redraw |= REDRAW_STATUS; +! if (option (OPTBEEPNEW)) +! beep (); +! } + } else -@@ -1070,6 +1080,7 @@ int mutt_index_menu (void) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@FreeBSD.ORG Mon May 18 18:43:00 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3EC1CB44; Mon, 18 May 2015 18:43:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 202C91260; Mon, 18 May 2015 18:43:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4IIh09d060901; Mon, 18 May 2015 18:43:00 GMT (envelope-from mmoll@FreeBSD.org) Received: (from mmoll@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4IIgxAe060894; Mon, 18 May 2015 18:42:59 GMT (envelope-from mmoll@FreeBSD.org) Message-Id: <201505181842.t4IIgxAe060894@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mmoll set sender to mmoll@FreeBSD.org using -f From: Michael Moll Date: Mon, 18 May 2015 18:42:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386698 - branches/2015Q2/devel/ruby-gems X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 May 2015 18:43:00 -0000 Author: mmoll Date: Mon May 18 18:42:58 2015 New Revision: 386698 URL: https://svnweb.freebsd.org/changeset/ports/386698 Log: MFH: r383109 devel/ruby-gems: update to 2.4.6 While here, sort plist. Approved by: ports-secteam (delphij) Modified: branches/2015Q2/devel/ruby-gems/Makefile branches/2015Q2/devel/ruby-gems/distinfo branches/2015Q2/devel/ruby-gems/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/devel/ruby-gems/Makefile ============================================================================== --- branches/2015Q2/devel/ruby-gems/Makefile Mon May 18 18:41:16 2015 (r386697) +++ branches/2015Q2/devel/ruby-gems/Makefile Mon May 18 18:42:58 2015 (r386698) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gems -PORTVERSION= 2.4.5 +PORTVERSION= 2.4.6 CATEGORIES= devel ruby MASTER_SITES= http://production.cf.rubygems.org/rubygems/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} Modified: branches/2015Q2/devel/ruby-gems/distinfo ============================================================================== --- branches/2015Q2/devel/ruby-gems/distinfo Mon May 18 18:41:16 2015 (r386697) +++ branches/2015Q2/devel/ruby-gems/distinfo Mon May 18 18:42:58 2015 (r386698) @@ -1,2 +1,2 @@ -SHA256 (ruby/rubygems-2.4.5.tgz) = 47d182ba52da02d4400601efbf62f64c25ff83856f8e269f8289333f292566d9 -SIZE (ruby/rubygems-2.4.5.tgz) = 446665 +SHA256 (ruby/rubygems-2.4.6.tgz) = 76d3f3b10aa824d23a511f098ab777c6473b98ffa733f7be4222408897b68db9 +SIZE (ruby/rubygems-2.4.6.tgz) = 447588 Modified: branches/2015Q2/devel/ruby-gems/pkg-plist ============================================================================== --- branches/2015Q2/devel/ruby-gems/pkg-plist Mon May 18 18:41:16 2015 (r386697) +++ branches/2015Q2/devel/ruby-gems/pkg-plist Mon May 18 18:42:58 2015 (r386698) @@ -86,14 +86,16 @@ bin/gem%%RUBY_VER_SHORT%% %%RUBY_SITELIBDIR%%/rubygems/psych_tree.rb %%RUBY_SITELIBDIR%%/rubygems/rdoc.rb %%RUBY_SITELIBDIR%%/rubygems/remote_fetcher.rb -%%RUBY_SITELIBDIR%%/rubygems/requirement.rb %%RUBY_SITELIBDIR%%/rubygems/request.rb %%RUBY_SITELIBDIR%%/rubygems/request/connection_pools.rb %%RUBY_SITELIBDIR%%/rubygems/request/http_pool.rb %%RUBY_SITELIBDIR%%/rubygems/request/https_pool.rb +%%RUBY_SITELIBDIR%%/rubygems/request_set.rb %%RUBY_SITELIBDIR%%/rubygems/request_set/gem_dependency_api.rb %%RUBY_SITELIBDIR%%/rubygems/request_set/lockfile.rb -%%RUBY_SITELIBDIR%%/rubygems/request_set.rb +%%RUBY_SITELIBDIR%%/rubygems/request_set/lockfile/parser.rb +%%RUBY_SITELIBDIR%%/rubygems/request_set/lockfile/tokenizer.rb +%%RUBY_SITELIBDIR%%/rubygems/requirement.rb %%RUBY_SITELIBDIR%%/rubygems/resolver.rb %%RUBY_SITELIBDIR%%/rubygems/resolver/activation_request.rb %%RUBY_SITELIBDIR%%/rubygems/resolver/api_set.rb @@ -125,35 +127,35 @@ bin/gem%%RUBY_VER_SHORT%% %%RUBY_SITELIBDIR%%/rubygems/security/signer.rb %%RUBY_SITELIBDIR%%/rubygems/security/trust_dir.rb %%RUBY_SITELIBDIR%%/rubygems/server.rb -%%RUBY_SITELIBDIR%%/rubygems/spec_fetcher.rb -%%RUBY_SITELIBDIR%%/rubygems/specification.rb -%%RUBY_SITELIBDIR%%/rubygems/stub_specification.rb +%%RUBY_SITELIBDIR%%/rubygems/source.rb %%RUBY_SITELIBDIR%%/rubygems/source/git.rb %%RUBY_SITELIBDIR%%/rubygems/source/installed.rb %%RUBY_SITELIBDIR%%/rubygems/source/local.rb %%RUBY_SITELIBDIR%%/rubygems/source/lock.rb %%RUBY_SITELIBDIR%%/rubygems/source/specific_file.rb %%RUBY_SITELIBDIR%%/rubygems/source/vendor.rb -%%RUBY_SITELIBDIR%%/rubygems/source.rb %%RUBY_SITELIBDIR%%/rubygems/source_list.rb %%RUBY_SITELIBDIR%%/rubygems/source_local.rb %%RUBY_SITELIBDIR%%/rubygems/source_specific_file.rb +%%RUBY_SITELIBDIR%%/rubygems/spec_fetcher.rb +%%RUBY_SITELIBDIR%%/rubygems/specification.rb %%RUBY_SITELIBDIR%%/rubygems/ssl_certs/AddTrustExternalCARoot-2048.pem %%RUBY_SITELIBDIR%%/rubygems/ssl_certs/AddTrustExternalCARoot.pem %%RUBY_SITELIBDIR%%/rubygems/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem %%RUBY_SITELIBDIR%%/rubygems/ssl_certs/DigiCertHighAssuranceEVRootCA.pem %%RUBY_SITELIBDIR%%/rubygems/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem %%RUBY_SITELIBDIR%%/rubygems/ssl_certs/GeoTrustGlobalCA.pem +%%RUBY_SITELIBDIR%%/rubygems/stub_specification.rb %%RUBY_SITELIBDIR%%/rubygems/syck_hack.rb %%RUBY_SITELIBDIR%%/rubygems/test_case.rb %%RUBY_SITELIBDIR%%/rubygems/test_utilities.rb %%RUBY_SITELIBDIR%%/rubygems/text.rb %%RUBY_SITELIBDIR%%/rubygems/uninstaller.rb %%RUBY_SITELIBDIR%%/rubygems/uri_formatter.rb +%%RUBY_SITELIBDIR%%/rubygems/user_interaction.rb %%RUBY_SITELIBDIR%%/rubygems/util.rb %%RUBY_SITELIBDIR%%/rubygems/util/list.rb %%RUBY_SITELIBDIR%%/rubygems/util/stringio.rb -%%RUBY_SITELIBDIR%%/rubygems/user_interaction.rb %%RUBY_SITELIBDIR%%/rubygems/validator.rb %%RUBY_SITELIBDIR%%/rubygems/version.rb %%RUBY_SITELIBDIR%%/rubygems/version_option.rb From owner-svn-ports-branches@FreeBSD.ORG Mon May 18 18:44:29 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2464EC59; Mon, 18 May 2015 18:44:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 129061283; Mon, 18 May 2015 18:44:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4IIiSTe061276; Mon, 18 May 2015 18:44:28 GMT (envelope-from mmoll@FreeBSD.org) Received: (from mmoll@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4IIiSms061274; Mon, 18 May 2015 18:44:28 GMT (envelope-from mmoll@FreeBSD.org) Message-Id: <201505181844.t4IIiSms061274@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mmoll set sender to mmoll@FreeBSD.org using -f From: Michael Moll Date: Mon, 18 May 2015 18:44:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386699 - branches/2015Q2/devel/ruby-gems X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 May 2015 18:44:29 -0000 Author: mmoll Date: Mon May 18 18:44:27 2015 New Revision: 386699 URL: https://svnweb.freebsd.org/changeset/ports/386699 Log: MFH: r386626 devel/ruby-gems: update to 2.4.7 PR: 200264 Differential Revision: https://reviews.freebsd.org/D2572 Submitted by: Santiago Pastorino Approved by: mat (mentor) Security: CVE-2015-3900 Approved by: ports-secteam (delphij) Modified: branches/2015Q2/devel/ruby-gems/Makefile branches/2015Q2/devel/ruby-gems/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/devel/ruby-gems/Makefile ============================================================================== --- branches/2015Q2/devel/ruby-gems/Makefile Mon May 18 18:42:58 2015 (r386698) +++ branches/2015Q2/devel/ruby-gems/Makefile Mon May 18 18:44:27 2015 (r386699) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gems -PORTVERSION= 2.4.6 +PORTVERSION= 2.4.7 CATEGORIES= devel ruby MASTER_SITES= http://production.cf.rubygems.org/rubygems/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} Modified: branches/2015Q2/devel/ruby-gems/distinfo ============================================================================== --- branches/2015Q2/devel/ruby-gems/distinfo Mon May 18 18:42:58 2015 (r386698) +++ branches/2015Q2/devel/ruby-gems/distinfo Mon May 18 18:44:27 2015 (r386699) @@ -1,2 +1,2 @@ -SHA256 (ruby/rubygems-2.4.6.tgz) = 76d3f3b10aa824d23a511f098ab777c6473b98ffa733f7be4222408897b68db9 -SIZE (ruby/rubygems-2.4.6.tgz) = 447588 +SHA256 (ruby/rubygems-2.4.7.tgz) = 62fabf8b1a3009cf65f0fc9c2bad68754aa229780d7139232c4ca9f4708ad6ec +SIZE (ruby/rubygems-2.4.7.tgz) = 447941 From owner-svn-ports-branches@FreeBSD.ORG Mon May 18 18:53:56 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C533BFBC; Mon, 18 May 2015 18:53:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9960913B2; Mon, 18 May 2015 18:53:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4IIruK4066406; Mon, 18 May 2015 18:53:56 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4IIrucD066404; Mon, 18 May 2015 18:53:56 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201505181853.t4IIrucD066404@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Mon, 18 May 2015 18:53:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386701 - in branches/2015Q2/graphics/gx: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 May 2015 18:53:56 -0000 Author: riggs Date: Mon May 18 18:53:55 2015 New Revision: 386701 URL: https://svnweb.freebsd.org/changeset/ports/386701 Log: MFH: r385958 - Un-break build; distfile is now fetchable again (new MASTER_SITES) - New port maintainer: Chris Hutchinson - Add LICENSE - Use PLIST_FILES instead of pkg-plist - Bump PORTREVISION - Update pkg-descr - Pet portlint PR: 199468 Submitted by: portmaster@bsdforge.com (maintainer) Reviewed by: riggs Approved by: ports-secteam (delphij) Added: branches/2015Q2/graphics/gx/files/ - copied from r385958, head/graphics/gx/files/ Deleted: branches/2015Q2/graphics/gx/pkg-plist Modified: branches/2015Q2/graphics/gx/Makefile branches/2015Q2/graphics/gx/pkg-descr Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/graphics/gx/Makefile ============================================================================== --- branches/2015Q2/graphics/gx/Makefile Mon May 18 18:49:20 2015 (r386700) +++ branches/2015Q2/graphics/gx/Makefile Mon May 18 18:53:55 2015 (r386701) @@ -3,19 +3,24 @@ PORTNAME= gx PORTVERSION= 0.4.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics -MASTER_SITES= http://perticone.homelinux.net/sergio/c++/gx/src/ +MASTER_SITES= http://BSDforge.com/projects/source/graphics/gx/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= portmaster@BSDforge.com COMMENT= Lightweight image viewer -BROKEN= No public distfiles +LICENSE= BSD2CLAUSE LIB_DEPENDS= libgnomevfsmm-2.6.so:${PORTSDIR}/devel/gnome-vfsmm -USES= gettext pkgconfig +USES= desktop-file-utils gettext pkgconfig USE_GNOME= gconfmm26 gtkmm24 GNU_CONFIGURE= yes +PLIST_FILES= bin/gx \ + share/applications/gx.desktop \ + share/pixmaps/gx.png \ + share/pixmaps/gx_logo.png \ + .include Modified: branches/2015Q2/graphics/gx/pkg-descr ============================================================================== --- branches/2015Q2/graphics/gx/pkg-descr Mon May 18 18:49:20 2015 (r386700) +++ branches/2015Q2/graphics/gx/pkg-descr Mon May 18 18:53:55 2015 (r386701) @@ -1,2 +1,4 @@ -gx is a small image viewer for Unix written in C++ (using gtkmm). It -can rotate, rescale, and zoom in/out an image. +gx is a small image viewer for UNIX like systems. It's written +in C++ (using gtkmm). It can rotate, rescale, and zoom images. + +WWW: http://BSDforge.com/projects/graphics/gx/ From owner-svn-ports-branches@FreeBSD.ORG Tue May 19 17:32:04 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 05A1F885; Tue, 19 May 2015 17:32:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CE0EC1C60; Tue, 19 May 2015 17:32:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4JHW3O4074836; Tue, 19 May 2015 17:32:03 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4JHW3xo074834; Tue, 19 May 2015 17:32:03 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201505191732.t4JHW3xo074834@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Tue, 19 May 2015 17:32:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386796 - in branches/2015Q2/security/ipsec-tools: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 May 2015 17:32:04 -0000 Author: brd Date: Tue May 19 17:32:02 2015 New Revision: 386796 URL: https://svnweb.freebsd.org/changeset/ports/386796 Log: MFH: r386793 - Update ipsec-tools with a patch from NetBSD to fix a memory leak. Approved by: portmgr (erwin) Added: branches/2015Q2/security/ipsec-tools/files/patch-src_racoon_gssapi.c - copied unchanged from r386793, head/security/ipsec-tools/files/patch-src_racoon_gssapi.c Modified: branches/2015Q2/security/ipsec-tools/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/security/ipsec-tools/Makefile ============================================================================== --- branches/2015Q2/security/ipsec-tools/Makefile Tue May 19 17:23:00 2015 (r386795) +++ branches/2015Q2/security/ipsec-tools/Makefile Tue May 19 17:32:02 2015 (r386796) @@ -8,6 +8,7 @@ PORTNAME= ipsec-tools PORTVERSION= 0.8.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= SF Copied: branches/2015Q2/security/ipsec-tools/files/patch-src_racoon_gssapi.c (from r386793, head/security/ipsec-tools/files/patch-src_racoon_gssapi.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/security/ipsec-tools/files/patch-src_racoon_gssapi.c Tue May 19 17:32:02 2015 (r386796, copy of r386793, head/security/ipsec-tools/files/patch-src_racoon_gssapi.c) @@ -0,0 +1,14 @@ +--- src/racoon/gssapi.c.orig 2015-05-19 16:38:06 UTC ++++ src/racoon/gssapi.c +@@ -192,6 +192,11 @@ gssapi_init(struct ph1handle *iph1) + gss_name_t princ, canon_princ; + OM_uint32 maj_stat, min_stat; + ++ if (iph1->rmconf == NULL) { ++ plog(LLV_ERROR, LOCATION, NULL, "no remote config\n"); ++ return -1; ++ } ++ + gps = racoon_calloc(1, sizeof (struct gssapi_ph1_state)); + if (gps == NULL) { + plog(LLV_ERROR, LOCATION, NULL, "racoon_calloc failed\n"); From owner-svn-ports-branches@FreeBSD.ORG Tue May 19 17:45:19 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B28ECA9; Tue, 19 May 2015 17:45:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 498771DA4; Tue, 19 May 2015 17:45:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4JHjJnC080330; Tue, 19 May 2015 17:45:19 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4JHjJIb080329; Tue, 19 May 2015 17:45:19 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201505191745.t4JHjJIb080329@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 19 May 2015 17:45:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386797 - branches/2015Q2/math/ann X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 May 2015 17:45:19 -0000 Author: amdmi3 Date: Tue May 19 17:45:18 2015 New Revision: 386797 URL: https://svnweb.freebsd.org/changeset/ports/386797 Log: MFH: r386778 - Fix library installation, unbreak static library Approved by: portmgr blanket Approved by: ports-secteam (erwin) Modified: branches/2015Q2/math/ann/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/math/ann/Makefile ============================================================================== --- branches/2015Q2/math/ann/Makefile Tue May 19 17:32:02 2015 (r386796) +++ branches/2015Q2/math/ann/Makefile Tue May 19 17:45:18 2015 (r386797) @@ -3,6 +3,7 @@ PORTNAME= ann PORTVERSION= 1.1.2 +PORTREVISION= 1 CATEGORIES= math science MASTER_SITES= http://www.cs.umd.edu/~mount/ANN/Files/1.1.2/ DISTNAME= ann_1.1.2 @@ -14,8 +15,8 @@ USE_LDCONFIG= yes USES= gmake post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/lib/libann.so.0 ${STAGEDIR}${PREFIX}/lib - ${INSTALL_PROGRAM} ${WRKSRC}/lib/libann.a ${STAGEDIR}${PREFIX}/lib + ${INSTALL_LIB} ${WRKSRC}/lib/libann.so.0 ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/lib/libann.a ${STAGEDIR}${PREFIX}/lib ${LN} -fs libann.so.0 ${STAGEDIR}${PREFIX}/lib/libann.so ${MKDIR} ${STAGEDIR}${PREFIX}/include/ANN ${INSTALL_DATA} ${WRKSRC}/include/ANN/* ${STAGEDIR}${PREFIX}/include/ANN From owner-svn-ports-branches@FreeBSD.ORG Tue May 19 18:35:51 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4D9B6C90; Tue, 19 May 2015 18:35:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3CA801345; Tue, 19 May 2015 18:35:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4JIZp6d005913; Tue, 19 May 2015 18:35:51 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4JIZpVZ005912; Tue, 19 May 2015 18:35:51 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201505191835.t4JIZpVZ005912@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 19 May 2015 18:35:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386801 - branches/2015Q2/audio/rem X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 May 2015 18:35:51 -0000 Author: amdmi3 Date: Tue May 19 18:35:50 2015 New Revision: 386801 URL: https://svnweb.freebsd.org/changeset/ports/386801 Log: MFH: r386780 - Don't install static libraries with INSTALL_LIB Approved by: portmgr blanket Approved by: ports-secteam (erwin) Modified: branches/2015Q2/audio/rem/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/audio/rem/Makefile ============================================================================== --- branches/2015Q2/audio/rem/Makefile Tue May 19 18:34:56 2015 (r386800) +++ branches/2015Q2/audio/rem/Makefile Tue May 19 18:35:50 2015 (r386801) @@ -2,7 +2,7 @@ PORTNAME= rem PORTVERSION= 0.4.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio devel MASTER_SITES= http://www.creytiv.com/pub/ @@ -23,6 +23,7 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} (cd ${WRKSRC}/include && \ ${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME}) - ${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.[sa]* ${STAGEDIR}${PREFIX}/lib + ${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.so ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib .include From owner-svn-ports-branches@FreeBSD.ORG Tue May 19 18:49:32 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 83A85354; Tue, 19 May 2015 18:49:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 57EE51515; Tue, 19 May 2015 18:49:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4JInWdI011845; Tue, 19 May 2015 18:49:32 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4JInVV7011836; Tue, 19 May 2015 18:49:31 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201505191849.t4JInVV7011836@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 19 May 2015 18:49:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386804 - branches/2015Q2/irc/py-gozerbot X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 May 2015 18:49:32 -0000 Author: amdmi3 Date: Tue May 19 18:49:31 2015 New Revision: 386804 URL: https://svnweb.freebsd.org/changeset/ports/386804 Log: MFH: r386770 - Fix manpage installation - Don't cat pkg-message from Makefile Approved by: portmgr blanket Approved by: ports-secteam (delhij) Modified: branches/2015Q2/irc/py-gozerbot/Makefile branches/2015Q2/irc/py-gozerbot/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/irc/py-gozerbot/Makefile ============================================================================== --- branches/2015Q2/irc/py-gozerbot/Makefile Tue May 19 18:43:22 2015 (r386803) +++ branches/2015Q2/irc/py-gozerbot/Makefile Tue May 19 18:49:31 2015 (r386804) @@ -3,7 +3,7 @@ PORTNAME= gozerbot PORTVERSION= 0.8.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= irc python MASTER_SITES= http://gozerbot.org/media/tarball/ \ ${MASTER_SITE_GOOGLE_CODE} @@ -21,21 +21,17 @@ XMPP_DESC= Jabber functions MYSQL_DESC= Mysql functions OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options -MAN1= gozerbot.1 - RUN_DEPENDS+= ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg .include post-install: - @${CAT} ${PKGMESSAGE} - .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${CP} -R ${WRKSRC}/doc/ ${STAGEDIR}${DOCSDIR} ${CP} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .endif - @${INSTALL_MAN} ${WRKSRC}/man/gozerbot.1.FreeBSD ${STAGEDIR}${MAN1PREFIX}/gozerbot.1 + @${INSTALL_MAN} ${WRKSRC}/man/gozerbot.1.FreeBSD ${STAGEDIR}${MAN1PREFIX}/man/man1/gozerbot.1 .if ${PORT_OPTIONS:MMYSQL} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb Modified: branches/2015Q2/irc/py-gozerbot/pkg-plist ============================================================================== --- branches/2015Q2/irc/py-gozerbot/pkg-plist Tue May 19 18:43:22 2015 (r386803) +++ branches/2015Q2/irc/py-gozerbot/pkg-plist Tue May 19 18:49:31 2015 (r386804) @@ -1,10 +1,10 @@ -gozerbot.1 bin/gozerbot bin/gozerbot-start bin/gozerbot-stop bin/gozerinit bin/gozerupgrade06 bin/gozerbot-merc +man/man1/gozerbot.1.gz %%PYTHON_SITELIBDIR%%/gozerbot/__init__.py %%PYTHON_SITELIBDIR%%/gozerbot/__init__.pyc %%PYTHON_SITELIBDIR%%/gozerbot/__init__.pyo From owner-svn-ports-branches@FreeBSD.ORG Wed May 20 00:53:24 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7CA2BCBA; Wed, 20 May 2015 00:53:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6B7121FDA; Wed, 20 May 2015 00:53:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4K0rOoo000521; Wed, 20 May 2015 00:53:24 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4K0rOHU000520; Wed, 20 May 2015 00:53:24 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201505200053.t4K0rOHU000520@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Wed, 20 May 2015 00:53:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386822 - branches/2015Q2/net/delegate X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2015 00:53:24 -0000 Author: danilo Date: Wed May 20 00:53:23 2015 New Revision: 386822 URL: https://svnweb.freebsd.org/changeset/ports/386822 Log: MFH: r386821 - Fix a stage violation PR: 200010 Submitted by: yuri@rawbw.com Approved by: ports-secteam (delphij) Modified: branches/2015Q2/net/delegate/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/net/delegate/Makefile ============================================================================== --- branches/2015Q2/net/delegate/Makefile Wed May 20 00:24:08 2015 (r386821) +++ branches/2015Q2/net/delegate/Makefile Wed May 20 00:53:23 2015 (r386822) @@ -43,7 +43,7 @@ post-install: @${MKDIR} ${WRKDIR}/tmp @${CP} ${STAGEDIR}${PREFIX}/sbin/delegated ${WRKDIR}/tmp/dg @${CHMOD} +w ${STAGEDIR}${PREFIX}/sbin/delegated - @${WRKDIR}/tmp/dg -Fesign -w ${STAGEDIR}${PREFIX}/sbin/delegated + @${WRKDIR}/tmp/dg DGROOT=${WRKDIR}/tmp/ -Fesign -w ${STAGEDIR}${PREFIX}/sbin/delegated @${CHMOD} -w ${STAGEDIR}${PREFIX}/sbin/delegated .include From owner-svn-ports-branches@FreeBSD.ORG Wed May 20 09:04:42 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9D1EE150; Wed, 20 May 2015 09:04:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8BC46187B; Wed, 20 May 2015 09:04:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4K94gRO043740; Wed, 20 May 2015 09:04:42 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4K94gEq043738; Wed, 20 May 2015 09:04:42 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201505200904.t4K94gEq043738@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 20 May 2015 09:04:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386847 - branches/2015Q2/www/thttpd X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2015 09:04:42 -0000 Author: amdmi3 Date: Wed May 20 09:04:41 2015 New Revision: 386847 URL: https://svnweb.freebsd.org/changeset/ports/386847 Log: MFH: r386830 - Chase distfile reroll Diff seem to be innocent, only functional change is in syslog priorities PR: 199562 Submitted by: amdmi3 Approved by: maintainer timeout (danfe, 1 month) Approved by: ports-secteam (delphij) Modified: branches/2015Q2/www/thttpd/Makefile branches/2015Q2/www/thttpd/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/www/thttpd/Makefile ============================================================================== --- branches/2015Q2/www/thttpd/Makefile Wed May 20 09:04:21 2015 (r386846) +++ branches/2015Q2/www/thttpd/Makefile Wed May 20 09:04:41 2015 (r386847) @@ -3,6 +3,7 @@ PORTNAME= thttpd PORTVERSION= 2.26 +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= http://www.acme.com/software/thttpd/ Modified: branches/2015Q2/www/thttpd/distinfo ============================================================================== --- branches/2015Q2/www/thttpd/distinfo Wed May 20 09:04:21 2015 (r386846) +++ branches/2015Q2/www/thttpd/distinfo Wed May 20 09:04:41 2015 (r386847) @@ -1,2 +1,2 @@ -SHA256 (thttpd-2.26.tar.gz) = 15b3f6c60f854061e333227e9ea9ff789d34a092c9365690a8c0d3ecfc85cbb7 -SIZE (thttpd-2.26.tar.gz) = 132950 +SHA256 (thttpd-2.26.tar.gz) = 4693d7c421fe1bd25553a8891cbb447d2bab3e0df01c029dadd79596b9bdb4c5 +SIZE (thttpd-2.26.tar.gz) = 133224 From owner-svn-ports-branches@FreeBSD.ORG Wed May 20 16:40:25 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EF33FA59; Wed, 20 May 2015 16:40:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD5041279; Wed, 20 May 2015 16:40:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4KGePQS067178; Wed, 20 May 2015 16:40:25 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4KGePN4067176; Wed, 20 May 2015 16:40:25 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201505201640.t4KGePN4067176@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 20 May 2015 16:40:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386864 - branches/2015Q2/comms/p5-SMS-SMS77 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2015 16:40:26 -0000 Author: antoine Date: Wed May 20 16:40:24 2015 New Revision: 386864 URL: https://svnweb.freebsd.org/changeset/ports/386864 Log: MFH: r384681 Make fetchable again, unbreak with Perl 5.21.0+. The difference in the distfiles is a regenerated META.yml and an added META.json. Sponsored by: Absolight Modified: branches/2015Q2/comms/p5-SMS-SMS77/Makefile branches/2015Q2/comms/p5-SMS-SMS77/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/comms/p5-SMS-SMS77/Makefile ============================================================================== --- branches/2015Q2/comms/p5-SMS-SMS77/Makefile Wed May 20 16:35:00 2015 (r386863) +++ branches/2015Q2/comms/p5-SMS-SMS77/Makefile Wed May 20 16:40:24 2015 (r386864) @@ -5,7 +5,7 @@ PORTNAME= SMS-SMS77 PORTVERSION= 0.01 PORTREVISION= 1 CATEGORIES= comms net perl5 -MASTER_SITES= http://www.w3r3wolf.de/files/sms77/ +MASTER_SITES= CPAN PKGNAMEPREFIX= p5- MAINTAINER= steinex@nognu.de @@ -14,6 +14,6 @@ COMMENT= Perl interface and script to se BUILD_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww USES= perl5 -USE_PERL5= configure +USE_PERL5= modbuild .include Modified: branches/2015Q2/comms/p5-SMS-SMS77/distinfo ============================================================================== --- branches/2015Q2/comms/p5-SMS-SMS77/distinfo Wed May 20 16:35:00 2015 (r386863) +++ branches/2015Q2/comms/p5-SMS-SMS77/distinfo Wed May 20 16:40:24 2015 (r386864) @@ -1,2 +1,2 @@ -SHA256 (SMS-SMS77-0.01.tar.gz) = bb436e7cb5ae3490730443c3d3060ff320fb90be781c6ccf4cd9996a74b06814 -SIZE (SMS-SMS77-0.01.tar.gz) = 4181 +SHA256 (SMS-SMS77-0.01.tar.gz) = 7dadda9e86733b78f271954df672d5953e7bb8418a2a1bcf7a6dc9ac9f16c2a9 +SIZE (SMS-SMS77-0.01.tar.gz) = 5057 From owner-svn-ports-branches@FreeBSD.ORG Wed May 20 16:43:22 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 29C6DB86; Wed, 20 May 2015 16:43:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 18D7712AA; Wed, 20 May 2015 16:43:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4KGhLrn071192; Wed, 20 May 2015 16:43:21 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4KGhLsc071186; Wed, 20 May 2015 16:43:21 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201505201643.t4KGhLsc071186@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 20 May 2015 16:43:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386865 - branches/2015Q2/cad/opencascade X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2015 16:43:22 -0000 Author: antoine Date: Wed May 20 16:43:20 2015 New Revision: 386865 URL: https://svnweb.freebsd.org/changeset/ports/386865 Log: MFH: r383477 Unbreak. The tarball had been rerolled again. Full diff available here: Modified: branches/2015Q2/cad/opencascade/Makefile branches/2015Q2/cad/opencascade/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/cad/opencascade/Makefile ============================================================================== --- branches/2015Q2/cad/opencascade/Makefile Wed May 20 16:40:24 2015 (r386864) +++ branches/2015Q2/cad/opencascade/Makefile Wed May 20 16:43:20 2015 (r386865) @@ -3,7 +3,7 @@ PORTNAME= opencascade PORTVERSION= 6.8.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad science MASTER_SITES= http://files.opencascade.com/OCCT/OCC_${PORTVERSION}_release/ Modified: branches/2015Q2/cad/opencascade/distinfo ============================================================================== --- branches/2015Q2/cad/opencascade/distinfo Wed May 20 16:40:24 2015 (r386864) +++ branches/2015Q2/cad/opencascade/distinfo Wed May 20 16:43:20 2015 (r386865) @@ -1,2 +1,2 @@ -SHA256 (opencascade-6.8.0.tgz) = b8d8293402b0ce828dd4319b48d14bad4137696ef76afeeca614e7ef81f7d371 -SIZE (opencascade-6.8.0.tgz) = 198310135 +SHA256 (opencascade-6.8.0.tgz) = 50b145655fd3a4448e291388650cd0dcab8f9d99201aba32e8d26aeff03e8e1c +SIZE (opencascade-6.8.0.tgz) = 198319238 From owner-svn-ports-branches@FreeBSD.ORG Wed May 20 16:46:37 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 32145D8D; Wed, 20 May 2015 16:46:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2068F12E6; Wed, 20 May 2015 16:46:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4KGkaD9071801; Wed, 20 May 2015 16:46:36 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4KGkZ4g071796; Wed, 20 May 2015 16:46:35 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201505201646.t4KGkZ4g071796@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 20 May 2015 16:46:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386866 - branches/2015Q2/devel/p4 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2015 16:46:37 -0000 Author: antoine Date: Wed May 20 16:46:35 2015 New Revision: 386866 URL: https://svnweb.freebsd.org/changeset/ports/386866 Log: MFH: r384961 Update p4 to 2014.2/1045032 Approved by: mentor (mat, implicit) Modified: branches/2015Q2/devel/p4/Makefile branches/2015Q2/devel/p4/distinfo.freebsd100x86 branches/2015Q2/devel/p4/distinfo.freebsd100x86_64 branches/2015Q2/devel/p4/distinfo.freebsd70x86 branches/2015Q2/devel/p4/distinfo.freebsd70x86_64 Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/devel/p4/Makefile ============================================================================== --- branches/2015Q2/devel/p4/Makefile Wed May 20 16:43:20 2015 (r386865) +++ branches/2015Q2/devel/p4/Makefile Wed May 20 16:46:35 2015 (r386866) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4 -PORTVERSION= 2014.2.1033284 +PORTVERSION= 2014.2.1045032 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ Modified: branches/2015Q2/devel/p4/distinfo.freebsd100x86 ============================================================================== --- branches/2015Q2/devel/p4/distinfo.freebsd100x86 Wed May 20 16:43:20 2015 (r386865) +++ branches/2015Q2/devel/p4/distinfo.freebsd100x86 Wed May 20 16:46:35 2015 (r386866) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1033284/bin.freebsd100x86/p4) = fdca0878416a9bec5ee2552e4b803883468c454fb8eb9ea7b9cdaa06b0f829a5 -SIZE (perforce/2014.2.1033284/bin.freebsd100x86/p4) = 2474416 +SHA256 (perforce/2014.2.1045032/bin.freebsd100x86/p4) = 1261bacd887cb09bcf79004a427784e3428ebef8ef7f8cd527e8f446feb3efb4 +SIZE (perforce/2014.2.1045032/bin.freebsd100x86/p4) = 2474416 Modified: branches/2015Q2/devel/p4/distinfo.freebsd100x86_64 ============================================================================== --- branches/2015Q2/devel/p4/distinfo.freebsd100x86_64 Wed May 20 16:43:20 2015 (r386865) +++ branches/2015Q2/devel/p4/distinfo.freebsd100x86_64 Wed May 20 16:46:35 2015 (r386866) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1033284/bin.freebsd100x86_64/p4) = 2a0f1e290b3938a3dfc8d40129f635afb14eb98a6305b6da9192b534395d34bb -SIZE (perforce/2014.2.1033284/bin.freebsd100x86_64/p4) = 2732720 +SHA256 (perforce/2014.2.1045032/bin.freebsd100x86_64/p4) = 676c424b485e90817e63592fc5f14ea151b489128078053989f2e85080d485c2 +SIZE (perforce/2014.2.1045032/bin.freebsd100x86_64/p4) = 2732720 Modified: branches/2015Q2/devel/p4/distinfo.freebsd70x86 ============================================================================== --- branches/2015Q2/devel/p4/distinfo.freebsd70x86 Wed May 20 16:43:20 2015 (r386865) +++ branches/2015Q2/devel/p4/distinfo.freebsd70x86 Wed May 20 16:46:35 2015 (r386866) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1033284/bin.freebsd70x86/p4) = 5bcde41d8b74f0d04ef840e2006dfabd08ae1a68b9855492a4921d42f47993ed -SIZE (perforce/2014.2.1033284/bin.freebsd70x86/p4) = 2555504 +SHA256 (perforce/2014.2.1045032/bin.freebsd70x86/p4) = 0c48532af152ba9ef187fd3a098ec0be0c5f8b9312becea4a27fe63ddec427ac +SIZE (perforce/2014.2.1045032/bin.freebsd70x86/p4) = 2555504 Modified: branches/2015Q2/devel/p4/distinfo.freebsd70x86_64 ============================================================================== --- branches/2015Q2/devel/p4/distinfo.freebsd70x86_64 Wed May 20 16:43:20 2015 (r386865) +++ branches/2015Q2/devel/p4/distinfo.freebsd70x86_64 Wed May 20 16:46:35 2015 (r386866) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.1033284/bin.freebsd70x86_64/p4) = b93538622cfd4101526959c571b172843326771ef4fd200cd1c22bfe8ce672da -SIZE (perforce/2014.2.1033284/bin.freebsd70x86_64/p4) = 2716456 +SHA256 (perforce/2014.2.1045032/bin.freebsd70x86_64/p4) = 3fbf5e0203bf4c2bc9b6107c8111c28e9d2f88372f6330fcff32057addf6c069 +SIZE (perforce/2014.2.1045032/bin.freebsd70x86_64/p4) = 2716456 From owner-svn-ports-branches@FreeBSD.ORG Wed May 20 16:52:56 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 845D198; Wed, 20 May 2015 16:52:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7371513C8; Wed, 20 May 2015 16:52:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4KGqu7j076262; Wed, 20 May 2015 16:52:56 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4KGquuG076260; Wed, 20 May 2015 16:52:56 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201505201652.t4KGquuG076260@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 20 May 2015 16:52:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386867 - branches/2015Q2/german/wordpress X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2015 16:52:56 -0000 Author: antoine Date: Wed May 20 16:52:55 2015 New Revision: 386867 URL: https://svnweb.freebsd.org/changeset/ports/386867 Log: MFH: r386356 Distfile was rerolled, no changes. Submitted by: sunpoet@ Modified: branches/2015Q2/german/wordpress/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/german/wordpress/distinfo ============================================================================== --- branches/2015Q2/german/wordpress/distinfo Wed May 20 16:46:35 2015 (r386866) +++ branches/2015Q2/german/wordpress/distinfo Wed May 20 16:52:55 2015 (r386867) @@ -1,2 +1,2 @@ -SHA256 (wordpress-4.2.2-de_DE.tar.gz) = 8ec6f54c25fa99446a8ef00fe966052c417beaa67e4e6452c8e672d6fbb8f237 -SIZE (wordpress-4.2.2-de_DE.tar.gz) = 6733820 +SHA256 (wordpress-4.2.2-de_DE.tar.gz) = 08546e93beb8558264f86392c389fb883c0a38a5058a8ca7877a88e2d36cdc13 +SIZE (wordpress-4.2.2-de_DE.tar.gz) = 6733834 From owner-svn-ports-branches@FreeBSD.ORG Wed May 20 19:16:19 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 16A27E03; Wed, 20 May 2015 19:16:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0480E1931; Wed, 20 May 2015 19:16:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4KJGIuE048432; Wed, 20 May 2015 19:16:18 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4KJGIhe048429; Wed, 20 May 2015 19:16:18 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201505201916.t4KJGIhe048429@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 20 May 2015 19:16:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386882 - in branches/2015Q2/ftp/proftpd: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2015 19:16:19 -0000 Author: delphij Date: Wed May 20 19:16:18 2015 New Revision: 386882 URL: https://svnweb.freebsd.org/changeset/ports/386882 Log: MFH: r386881 Fix proftpd unauthenticated copying of files via SITE CPFR/CPTO vulnerability. Security: CVE-2015-3306 Approved by: ports-secteam (self) Added: branches/2015Q2/ftp/proftpd/files/patch-CVE-2015-3306 - copied unchanged from r386881, head/ftp/proftpd/files/patch-CVE-2015-3306 Modified: branches/2015Q2/ftp/proftpd/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/ftp/proftpd/Makefile ============================================================================== --- branches/2015Q2/ftp/proftpd/Makefile Wed May 20 19:15:24 2015 (r386881) +++ branches/2015Q2/ftp/proftpd/Makefile Wed May 20 19:16:18 2015 (r386882) @@ -5,7 +5,7 @@ PORTNAME?= proftpd .if !defined(DISTVERSION) PORTVERSION?= ${PROFTPD_VERSION} .endif -PORTREVISION?= 6 +PORTREVISION?= 7 CATEGORIES?= ftp MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ https://github.com/downloads/proftpd/proftpd.github.com/ \ Copied: branches/2015Q2/ftp/proftpd/files/patch-CVE-2015-3306 (from r386881, head/ftp/proftpd/files/patch-CVE-2015-3306) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/ftp/proftpd/files/patch-CVE-2015-3306 Wed May 20 19:16:18 2015 (r386882, copy of r386881, head/ftp/proftpd/files/patch-CVE-2015-3306) @@ -0,0 +1,610 @@ +Index: contrib/mod_copy.c +=================================================================== +--- contrib/mod_copy.c ++++ contrib/mod_copy.c +@@ -2,7 +2,7 @@ + * ProFTPD: mod_copy -- a module supporting copying of files on the server + * without transferring the data to the client and back + * +- * Copyright (c) 2009-2012 TJ Saunders ++ * Copyright (c) 2009-2015 TJ Saunders + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -25,13 +25,11 @@ + * + * This is mod_copy, contrib software for proftpd 1.3.x and above. + * For more information contact TJ Saunders . +- * +- * $Id: mod_copy.c,v 1.8 2012/12/27 22:31:29 castaglia Exp $ + */ + + #include "conf.h" + +-#define MOD_COPY_VERSION "mod_copy/0.4" ++#define MOD_COPY_VERSION "mod_copy/0.5" + + /* Make sure the version of proftpd is as necessary. */ + #if PROFTPD_VERSION_NUMBER < 0x0001030401 +@@ -40,6 +38,8 @@ + + extern pr_response_t *resp_list, *resp_err_list; + ++static int copy_engine = TRUE; ++ + static const char *trace_channel = "copy"; + + /* These are copied largely from src/mkhome.c */ +@@ -165,7 +165,7 @@ static int copy_symlink(pool *p, const c + src_path, strerror(xerrno)); + + errno = xerrno; +- return -1; ++ return -1; + } + link_path[len] = '\0'; + +@@ -471,10 +471,37 @@ static int copy_paths(pool *p, const cha + return 0; + } + ++/* Configuration handlers ++ */ ++ ++/* usage: CopyEngine on|off */ ++MODRET set_copyengine(cmd_rec *cmd) { ++ int engine = -1; ++ config_rec *c; ++ ++ CHECK_ARGS(cmd, 1); ++ CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL); ++ ++ engine = get_boolean(cmd, 1); ++ if (engine == -1) { ++ CONF_ERROR(cmd, "expected Boolean parameter"); ++ } ++ ++ c = add_config_param(cmd->argv[0], 1, NULL); ++ c->argv[0] = palloc(c->pool, sizeof(int)); ++ *((int *) c->argv[0]) = engine; ++ ++ return PR_HANDLED(cmd); ++} ++ + /* Command handlers + */ + + MODRET copy_copy(cmd_rec *cmd) { ++ if (copy_engine == FALSE) { ++ return PR_DECLINED(cmd); ++ } ++ + if (cmd->argc < 2) { + return PR_DECLINED(cmd); + } +@@ -539,12 +566,26 @@ MODRET copy_cpfr(cmd_rec *cmd) { + register unsigned int i; + int res; + char *path = ""; ++ unsigned char *authenticated = NULL; ++ ++ if (copy_engine == FALSE) { ++ return PR_DECLINED(cmd); ++ } + + if (cmd->argc < 3 || + strncasecmp(cmd->argv[1], "CPFR", 5) != 0) { + return PR_DECLINED(cmd); + } + ++ authenticated = get_param_ptr(cmd->server->conf, "authenticated", FALSE); ++ if (authenticated == NULL || ++ *authenticated == FALSE) { ++ pr_response_add_err(R_530, _("Please login with USER and PASS")); ++ ++ errno = EPERM; ++ return PR_ERROR(cmd); ++ } ++ + CHECK_CMD_MIN_ARGS(cmd, 3); + + /* Construct the target file name by concatenating all the parameters after +@@ -594,12 +635,26 @@ MODRET copy_cpfr(cmd_rec *cmd) { + MODRET copy_cpto(cmd_rec *cmd) { + register unsigned int i; + char *from, *to = ""; ++ unsigned char *authenticated = NULL; ++ ++ if (copy_engine == FALSE) { ++ return PR_DECLINED(cmd); ++ } + + if (cmd->argc < 3 || + strncasecmp(cmd->argv[1], "CPTO", 5) != 0) { + return PR_DECLINED(cmd); + } + ++ authenticated = get_param_ptr(cmd->server->conf, "authenticated", FALSE); ++ if (authenticated == NULL || ++ *authenticated == FALSE) { ++ pr_response_add_err(R_530, _("Please login with USER and PASS")); ++ ++ errno = EPERM; ++ return PR_ERROR(cmd); ++ } ++ + CHECK_CMD_MIN_ARGS(cmd, 3); + + from = pr_table_get(session.notes, "mod_copy.cpfr-path", NULL); +@@ -632,6 +687,10 @@ MODRET copy_cpto(cmd_rec *cmd) { + } + + MODRET copy_log_site(cmd_rec *cmd) { ++ if (copy_engine == FALSE) { ++ return PR_DECLINED(cmd); ++ } ++ + if (cmd->argc < 3 || + strncasecmp(cmd->argv[1], "CPTO", 5) != 0) { + return PR_DECLINED(cmd); +@@ -643,23 +702,58 @@ MODRET copy_log_site(cmd_rec *cmd) { + return PR_DECLINED(cmd); + } + ++MODRET copy_post_pass(cmd_rec *cmd) { ++ config_rec *c; ++ ++ if (copy_engine == FALSE) { ++ return PR_DECLINED(cmd); ++ } ++ ++ /* The CopyEngine directive may have been changed for this user by ++ * e.g. mod_ifsession, thus we check again. ++ */ ++ c = find_config(main_server->conf, CONF_PARAM, "CopyEngine", FALSE); ++ if (c != NULL) { ++ copy_engine = *((int *) c->argv[0]); ++ } ++ ++ return PR_DECLINED(cmd); ++} ++ + /* Initialization functions + */ + + static int copy_sess_init(void) { ++ config_rec *c; ++ ++ c = find_config(main_server->conf, CONF_PARAM, "CopyEngine", FALSE); ++ if (c != NULL) { ++ copy_engine = *((int *) c->argv[0]); ++ } ++ ++ if (copy_engine == FALSE) { ++ return 0; ++ } ++ + /* Advertise support for the SITE command */ + pr_feat_add("SITE COPY"); +- + return 0; + } + + /* Module API tables + */ + ++static conftable copy_conftab[] = { ++ { "CopyEngine", set_copyengine, NULL }, ++ ++ { NULL } ++}; ++ + static cmdtable copy_cmdtab[] = { + { CMD, C_SITE, G_WRITE, copy_copy, FALSE, FALSE, CL_MISC }, + { CMD, C_SITE, G_DIRS, copy_cpfr, FALSE, FALSE, CL_MISC }, + { CMD, C_SITE, G_WRITE, copy_cpto, FALSE, FALSE, CL_MISC }, ++ { POST_CMD, C_PASS, G_NONE, copy_post_pass, FALSE, FALSE }, + { LOG_CMD, C_SITE, G_NONE, copy_log_site, FALSE, FALSE }, + { LOG_CMD_ERR, C_SITE, G_NONE, copy_log_site, FALSE, FALSE }, + +@@ -676,7 +770,7 @@ module copy_module = { + "copy", + + /* Module configuration handler table */ +- NULL, ++ copy_conftab, + + /* Module command handler table */ + copy_cmdtab, +Index: doc/contrib/mod_copy.html +=================================================================== +--- doc/contrib/mod_copy.html ++++ doc/contrib/mod_copy.html +@@ -1,5 +1,5 @@ +- +- ++ ++ + + + +@@ -27,22 +27,40 @@ ProFTPD 1.3.x, and is not compile + instructions are discussed here. + +

+-The most current version of mod_copy can be found at: +-

+-  http://www.castaglia.org/proftpd/
+-
++The most current version of mod_copy is distributed with the ++ProFTPD source code. + +

Author

+

+ Please contact TJ Saunders <tj at castaglia.org> with any + questions, concerns, or suggestions regarding this module. + ++

Directives

++ ++ +

SITE Commands

+ + ++

++

++

CopyEngine

++Syntax: CopyEngine on|off
++Default: CopyEngine on
++Context: server config, <VirtualHost>, <Global>
++Module: mod_radius
++Compatibility: 1.3.6rc1 and later ++ ++

++The CopyEngine directive enables or disables the module's ++handling of SITE COPY et al commands. If it is set to ++off this module ignores these commands. ++ ++

+

+

SITE CPFR

+ This SITE command specifies the source file/directory to use +@@ -118,13 +136,8 @@ your existing server: +

+


+ +-Author: $Author: castaglia $
+-Last Updated: $Date: 2010/03/10 19:20:43 $
+- +-
+- + +-© Copyright 2009-2010 TJ Saunders
++© Copyright 2009-2015 TJ Saunders
+ All Rights Reserved
+ + +Index: tests/t/lib/ProFTPD/Tests/Modules/mod_copy.pm +=================================================================== +--- tests/t/lib/ProFTPD/Tests/Modules/mod_copy.pm ++++ tests/t/lib/ProFTPD/Tests/Modules/mod_copy.pm +@@ -21,6 +21,11 @@ my $TESTS = { + test_class => [qw(forking)], + }, + ++ copy_file_no_login => { ++ order => ++$order, ++ test_class => [qw(bug forking)], ++ }, ++ + copy_dir => { + order => ++$order, + test_class => [qw(forking)], +@@ -86,6 +91,11 @@ my $TESTS = { + test_class => [qw(forking)], + }, + ++ copy_cpfr_cpto_no_login => { ++ order => ++$order, ++ test_class => [qw(bug forking)], ++ }, ++ + copy_cpto_no_cpfr => { + order => ++$order, + test_class => [qw(forking)], +@@ -263,6 +273,137 @@ sub copy_file { + unlink($log_file); + } + ++sub copy_file_no_login { ++ my $self = shift; ++ my $tmpdir = $self->{tmpdir}; ++ ++ my $config_file = "$tmpdir/copy.conf"; ++ my $pid_file = File::Spec->rel2abs("$tmpdir/copy.pid"); ++ my $scoreboard_file = File::Spec->rel2abs("$tmpdir/copy.scoreboard"); ++ ++ my $log_file = File::Spec->rel2abs('tests.log'); ++ ++ my $auth_user_file = File::Spec->rel2abs("$tmpdir/copy.passwd"); ++ my $auth_group_file = File::Spec->rel2abs("$tmpdir/copy.group"); ++ ++ my $user = 'proftpd'; ++ my $passwd = 'test'; ++ my $group = 'ftpd'; ++ my $home_dir = File::Spec->rel2abs($tmpdir); ++ my $uid = 500; ++ my $gid = 500; ++ ++ # Make sure that, if we're running as root, that the home directory has ++ # permissions/privs set for the account we create ++ if ($< == 0) { ++ unless (chmod(0755, $home_dir)) { ++ die("Can't set perms on $home_dir to 0755: $!"); ++ } ++ ++ unless (chown($uid, $gid, $home_dir)) { ++ die("Can't set owner of $home_dir to $uid/$gid: $!"); ++ } ++ } ++ ++ auth_user_write($auth_user_file, $user, $passwd, $uid, $gid, $home_dir, ++ '/bin/bash'); ++ auth_group_write($auth_group_file, $group, $gid, $user); ++ ++ my $src_file = File::Spec->rel2abs("$home_dir/foo.txt"); ++ if (open(my $fh, "> $src_file")) { ++ print $fh "Hello, World!\n"; ++ ++ unless (close($fh)) { ++ die("Can't write $src_file: $!"); ++ } ++ ++ } else { ++ die("Can't open $src_file: $!"); ++ } ++ ++ my $dst_file = File::Spec->rel2abs("$home_dir/bar.txt"); ++ ++ my $config = { ++ PidFile => $pid_file, ++ ScoreboardFile => $scoreboard_file, ++ SystemLog => $log_file, ++ ++ AuthUserFile => $auth_user_file, ++ AuthGroupFile => $auth_group_file, ++ ++ IfModules => { ++ 'mod_delay.c' => { ++ DelayEngine => 'off', ++ }, ++ }, ++ }; ++ ++ my ($port, $config_user, $config_group) = config_write($config_file, $config); ++ ++ # Open pipes, for use between the parent and child processes. Specifically, ++ # the child will indicate when it's done with its test by writing a message ++ # to the parent. ++ my ($rfh, $wfh); ++ unless (pipe($rfh, $wfh)) { ++ die("Can't open pipe: $!"); ++ } ++ ++ my $ex; ++ ++ # Fork child ++ $self->handle_sigchld(); ++ defined(my $pid = fork()) or die("Can't fork: $!"); ++ if ($pid) { ++ eval { ++ my $client = ProFTPD::TestSuite::FTP->new('127.0.0.1', $port); ++ ++ eval { $client->site('COPY', 'foo.txt', 'bar.txt') }; ++ unless ($@) { ++ die("SITE COPY succeeded unexpectedly"); ++ } ++ ++ my $resp_code = $client->response_code(); ++ my $resp_msg = $client->response_msg(); ++ ++ my $expected; ++ $expected = 530; ++ $self->assert($expected == $resp_code, ++ test_msg("Expected response code $expected, got $resp_code")); ++ ++ $expected = "Please login with USER and PASS"; ++ $self->assert($expected eq $resp_msg, ++ test_msg("Expected response message '$expected', got '$resp_msg'")); ++ }; ++ ++ if ($@) { ++ $ex = $@; ++ } ++ ++ $wfh->print("done\n"); ++ $wfh->flush(); ++ ++ } else { ++ eval { server_wait($config_file, $rfh) }; ++ if ($@) { ++ warn($@); ++ exit 1; ++ } ++ ++ exit 0; ++ } ++ ++ # Stop server ++ server_stop($pid_file); ++ ++ $self->assert_child_ok($pid); ++ ++ if ($ex) { ++ die($ex); ++ } ++ ++ unlink($log_file); ++} ++ + sub copy_dir { + my $self = shift; + my $tmpdir = $self->{tmpdir}; +@@ -2578,6 +2719,153 @@ sub copy_cpfr_cpto { + }; + + if ($@) { ++ $ex = $@; ++ } ++ ++ $wfh->print("done\n"); ++ $wfh->flush(); ++ ++ } else { ++ eval { server_wait($config_file, $rfh) }; ++ if ($@) { ++ warn($@); ++ exit 1; ++ } ++ ++ exit 0; ++ } ++ ++ # Stop server ++ server_stop($pid_file); ++ ++ $self->assert_child_ok($pid); ++ ++ if ($ex) { ++ die($ex); ++ } ++ ++ unlink($log_file); ++} ++ ++sub copy_cpfr_cpto_no_login { ++ my $self = shift; ++ my $tmpdir = $self->{tmpdir}; ++ ++ my $config_file = "$tmpdir/copy.conf"; ++ my $pid_file = File::Spec->rel2abs("$tmpdir/copy.pid"); ++ my $scoreboard_file = File::Spec->rel2abs("$tmpdir/copy.scoreboard"); ++ ++ my $log_file = File::Spec->rel2abs('tests.log'); ++ ++ my $auth_user_file = File::Spec->rel2abs("$tmpdir/copy.passwd"); ++ my $auth_group_file = File::Spec->rel2abs("$tmpdir/copy.group"); ++ ++ my $user = 'proftpd'; ++ my $passwd = 'test'; ++ my $group = 'ftpd'; ++ my $home_dir = File::Spec->rel2abs($tmpdir); ++ my $uid = 500; ++ my $gid = 500; ++ ++ # Make sure that, if we're running as root, that the home directory has ++ # permissions/privs set for the account we create ++ if ($< == 0) { ++ unless (chmod(0755, $home_dir)) { ++ die("Can't set perms on $home_dir to 0755: $!"); ++ } ++ ++ unless (chown($uid, $gid, $home_dir)) { ++ die("Can't set owner of $home_dir to $uid/$gid: $!"); ++ } ++ } ++ ++ auth_user_write($auth_user_file, $user, $passwd, $uid, $gid, $home_dir, ++ '/bin/bash'); ++ auth_group_write($auth_group_file, $group, $gid, $user); ++ ++ my $src_file = File::Spec->rel2abs("$home_dir/foo.txt"); ++ if (open(my $fh, "> $src_file")) { ++ print $fh "Hello, World!\n"; ++ ++ unless (close($fh)) { ++ die("Can't write $src_file: $!"); ++ } ++ ++ } else { ++ die("Can't open $src_file: $!"); ++ } ++ ++ my $dst_file = File::Spec->rel2abs("$home_dir/bar.txt"); ++ ++ my $config = { ++ PidFile => $pid_file, ++ ScoreboardFile => $scoreboard_file, ++ SystemLog => $log_file, ++ ++ AuthUserFile => $auth_user_file, ++ AuthGroupFile => $auth_group_file, ++ ++ IfModules => { ++ 'mod_delay.c' => { ++ DelayEngine => 'off', ++ }, ++ }, ++ }; ++ ++ my ($port, $config_user, $config_group) = config_write($config_file, $config); ++ ++ # Open pipes, for use between the parent and child processes. Specifically, ++ # the child will indicate when it's done with its test by writing a message ++ # to the parent. ++ my ($rfh, $wfh); ++ unless (pipe($rfh, $wfh)) { ++ die("Can't open pipe: $!"); ++ } ++ ++ my $ex; ++ ++ # Fork child ++ $self->handle_sigchld(); ++ defined(my $pid = fork()) or die("Can't fork: $!"); ++ if ($pid) { ++ eval { ++ my $client = ProFTPD::TestSuite::FTP->new('127.0.0.1', $port); ++ ++ eval { $client->site('CPFR', 'foo.txt') }; ++ unless ($@) { ++ die("SITE CPFR succeeded unexpectedly"); ++ } ++ ++ my $resp_code = $client->response_code(); ++ my $resp_msg = $client->response_msg(); ++ ++ my $expected; ++ $expected = 530; ++ $self->assert($expected == $resp_code, ++ test_msg("Expected response code $expected, got $resp_code")); ++ ++ $expected = "Please login with USER and PASS"; ++ $self->assert($expected eq $resp_msg, ++ test_msg("Expected response message '$expected', got '$resp_msg'")); ++ ++ eval { $client->site('CPTO', 'bar.txt') }; ++ unless ($@) { ++ die("SITE CPTO succeeded unexpectedly"); ++ } ++ ++ $resp_code = $client->response_code(); ++ $resp_msg = $client->response_msg(); ++ ++ $expected = 530; ++ $self->assert($expected == $resp_code, ++ test_msg("Expected response code $expected, got $resp_code")); ++ ++ $expected = "Please login with USER and PASS"; ++ $self->assert($expected eq $resp_msg, ++ test_msg("Expected response message '$expected', got '$resp_msg'")); ++ }; ++ ++ if ($@) { + $ex = $@; + } + From owner-svn-ports-branches@FreeBSD.ORG Wed May 20 19:48:35 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BDBF5DEB; Wed, 20 May 2015 19:48:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ABACB1D6E; Wed, 20 May 2015 19:48:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4KJmZlE064443; Wed, 20 May 2015 19:48:35 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4KJmYn9064435; Wed, 20 May 2015 19:48:34 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201505201948.t4KJmYn9064435@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 20 May 2015 19:48:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386885 - in branches/2015Q2/audio/tagtool: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2015 19:48:35 -0000 Author: amdmi3 Date: Wed May 20 19:48:34 2015 New Revision: 386885 URL: https://svnweb.freebsd.org/changeset/ports/386885 Log: MFH: r386879 - Fix runtime problem, applications was unusable [1] - Remove unneeded REINPLACE PR: 200166 [1] Submitted by: valery@vslash.com [1] Approved by: ports-secteam (erwin) Added: branches/2015Q2/audio/tagtool/files/patch-src_Makefile.in - copied unchanged from r386879, head/audio/tagtool/files/patch-src_Makefile.in Modified: branches/2015Q2/audio/tagtool/Makefile branches/2015Q2/audio/tagtool/files/patch-configure branches/2015Q2/audio/tagtool/files/patch-src__main.c Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/audio/tagtool/Makefile ============================================================================== --- branches/2015Q2/audio/tagtool/Makefile Wed May 20 19:47:51 2015 (r386884) +++ branches/2015Q2/audio/tagtool/Makefile Wed May 20 19:48:34 2015 (r386885) @@ -4,7 +4,7 @@ PORTNAME= tagtool PORTVERSION= 0.12.3 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= audio MASTER_SITES= SF @@ -25,8 +25,4 @@ INSTALLS_ICONS= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lpthread -logg -lm -post-patch: - @${FIND} ${WRKSRC} -name "Makefile.in" | \ - ${XARGS} ${REINPLACE_CMD} -e 's|-Wno-pointer-sign||g' - .include Modified: branches/2015Q2/audio/tagtool/files/patch-configure ============================================================================== --- branches/2015Q2/audio/tagtool/files/patch-configure Wed May 20 19:47:51 2015 (r386884) +++ branches/2015Q2/audio/tagtool/files/patch-configure Wed May 20 19:48:34 2015 (r386885) @@ -1,6 +1,6 @@ ---- configure.orig 2007-02-28 05:34:14.000000000 +0900 -+++ configure 2009-03-09 02:12:05.000000000 +0900 -@@ -9044,8 +9044,10 @@ +--- configure.orig 2015-05-20 17:11:37 UTC ++++ configure +@@ -9044,8 +9044,10 @@ echo "${ECHO_T}$LINGUAS" >&6; } glib_save_prefix="$prefix" glib_save_exec_prefix="$exec_prefix" @@ -11,7 +11,7 @@ if test "x$CATOBJEXT" = "x.mo" ; then localedir=`eval echo "${libdir}/locale"` else -@@ -9053,6 +9055,7 @@ +@@ -9053,6 +9055,7 @@ else fi prefix="$glib_save_prefix" exec_prefix="$glib_save_exec_prefix" Copied: branches/2015Q2/audio/tagtool/files/patch-src_Makefile.in (from r386879, head/audio/tagtool/files/patch-src_Makefile.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/audio/tagtool/files/patch-src_Makefile.in Wed May 20 19:48:34 2015 (r386885, copy of r386879, head/audio/tagtool/files/patch-src_Makefile.in) @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig 2015-05-20 17:11:37 UTC ++++ src/Makefile.in +@@ -193,7 +193,7 @@ tagtool_CFLAGS = -Wall -Wno-pointer-sign + ${vorbis_cflags} -DDATADIR='"$(datadir)/${PACKAGE_NAME}"' + + +-tagtool_LDFLAGS = -export-dynamic ++tagtool_LDFLAGS = -export-dynamic -rdynamic + tagtool_LDADD = $(GTK_LIBS) + + tagtool_SOURCES = file_list.c file_list.h file_util.c file_util.h \ Modified: branches/2015Q2/audio/tagtool/files/patch-src__main.c ============================================================================== --- branches/2015Q2/audio/tagtool/files/patch-src__main.c Wed May 20 19:47:51 2015 (r386884) +++ branches/2015Q2/audio/tagtool/files/patch-src__main.c Wed May 20 19:48:34 2015 (r386885) @@ -1,6 +1,6 @@ ---- src/main.c.orig 2006-12-18 03:01:22.000000000 +0900 -+++ src/main.c 2009-03-09 02:20:45.000000000 +0900 -@@ -120,6 +120,7 @@ +--- src/main.c.orig 2006-12-17 18:01:22 UTC ++++ src/main.c +@@ -120,6 +120,7 @@ int main(int argc, char *argv[]) } } From owner-svn-ports-branches@FreeBSD.ORG Wed May 20 20:33:59 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CF576BFD; Wed, 20 May 2015 20:33:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BDD1D1309; Wed, 20 May 2015 20:33:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4KKXxgt089310; Wed, 20 May 2015 20:33:59 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4KKXxpv089309; Wed, 20 May 2015 20:33:59 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201505202033.t4KKXxpv089309@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 20 May 2015 20:33:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386891 - branches/2015Q2/www/dotproject X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2015 20:33:59 -0000 Author: amdmi3 Date: Wed May 20 20:33:58 2015 New Revision: 386891 URL: https://svnweb.freebsd.org/changeset/ports/386891 Log: MFH: r386264 [1], r386886 [2] - Add CPE info - Fix shebangs Approved by: portmgr blanket Approved by: ports-secteam blanket (delphij) [1] Approved by: ports-secteam (erwin) [2] Modified: branches/2015Q2/www/dotproject/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/www/dotproject/Makefile ============================================================================== --- branches/2015Q2/www/dotproject/Makefile Wed May 20 20:28:09 2015 (r386890) +++ branches/2015Q2/www/dotproject/Makefile Wed May 20 20:33:58 2015 (r386891) @@ -2,6 +2,7 @@ PORTNAME= dotproject PORTVERSION= 2.1.7 +PORTREVISION= 1 CATEGORIES= www devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/dotProject%20Version%20${PORTVERSION} @@ -10,6 +11,8 @@ COMMENT= Open Source Project Management LICENSE= GPLv2 +USES= cpe shebangfix +SHEBANG_FILES= misc/cvs2cl/cvs2cl.pl WRKSRC= ${WRKDIR}/${PORTNAME} NO_BUILD= yes USE_PHP= gd mysql session zlib From owner-svn-ports-branches@FreeBSD.ORG Wed May 20 21:38:32 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C43AF8F6; Wed, 20 May 2015 21:38:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9672F1A5E; Wed, 20 May 2015 21:38:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4KLcWIG020081; Wed, 20 May 2015 21:38:32 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4KLcW65020076; Wed, 20 May 2015 21:38:32 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201505202138.t4KLcW65020076@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Wed, 20 May 2015 21:38:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386894 - in branches/2015Q2/java/openjdk6: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2015 21:38:32 -0000 Author: jkim Date: Wed May 20 21:38:31 2015 New Revision: 386894 URL: https://svnweb.freebsd.org/changeset/ports/386894 Log: MFH: r386893 Fix build without precompiled headers and apply r384056 to java/openjdk6. Approved by: ports-secteam (delphij) Modified: branches/2015Q2/java/openjdk6/Makefile branches/2015Q2/java/openjdk6/files/patch-set Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/java/openjdk6/Makefile ============================================================================== --- branches/2015Q2/java/openjdk6/Makefile Wed May 20 21:05:25 2015 (r386893) +++ branches/2015Q2/java/openjdk6/Makefile Wed May 20 21:38:31 2015 (r386894) @@ -186,6 +186,18 @@ COPYFILES= \ .include +.if ${COMPILER_TYPE} == clang +.if ${COMPILER_VERSION} >= 35 +MAKE_ENV+= COMPILER_WARNINGS_FATAL=false +.endif +MAKE_ENV+= USE_CLANG=true +.endif + +# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html +.if ${COMPILER_TYPE} == gcc +MAKE_ENV+= USE_PRECOMPILED_HEADER=0 +.endif + .if empty(ICONV_LIB) ICONV_CPPFLAGS= -DLIBICONV_PLUG .else @@ -194,13 +206,6 @@ ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICON .endif ZLIB_LDFLAGS?= -lz -.if ${COMPILER_TYPE} == "clang" -.if ${COMPILER_VERSION} >= 35 -MAKE_ENV+= COMPILER_WARNINGS_FATAL=false -.endif -MAKE_ENV+= USE_CLANG=true -.endif - post-extract: @for d in ${COPYDIRS}; do \ ${MKDIR} `echo ${WRKSRC}/$$d | ${SED} 's/linux/bsd/g;'`; \ Modified: branches/2015Q2/java/openjdk6/files/patch-set ============================================================================== --- branches/2015Q2/java/openjdk6/files/patch-set Wed May 20 21:05:25 2015 (r386893) +++ branches/2015Q2/java/openjdk6/files/patch-set Wed May 20 21:38:31 2015 (r386894) @@ -2525,6 +2525,16 @@ #endif // PRODUCT } else { assert(_real_start_word == NULL && _real_end_word == NULL, "invariant"); +--- hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp ++++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp +@@ -25,6 +25,7 @@ + #ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_INLINE_HPP + #define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_INLINE_HPP + ++#include "gc_implementation/parallelScavenge/psOldGen.hpp" + #include "gc_implementation/parallelScavenge/psPromotionManager.hpp" + #include "gc_implementation/parallelScavenge/psScavenge.hpp" + --- hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp +++ hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp @@ -144,9 +144,9 @@ From owner-svn-ports-branches@FreeBSD.ORG Wed May 20 21:51:54 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE814C6E; Wed, 20 May 2015 21:51:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 928E91C40; Wed, 20 May 2015 21:51:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4KLpsJs029222; Wed, 20 May 2015 21:51:54 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4KLpsDk029221; Wed, 20 May 2015 21:51:54 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201505202151.t4KLpsDk029221@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 20 May 2015 21:51:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386896 - branches/2015Q2/security/rubygem-ezcrypto/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2015 21:51:54 -0000 Author: antoine Date: Wed May 20 21:51:53 2015 New Revision: 386896 URL: https://svnweb.freebsd.org/changeset/ports/386896 Log: MFH: r386895 Fix patching Reported by: pkg-fallout Modified: branches/2015Q2/security/rubygem-ezcrypto/files/patch-gemspec Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/security/rubygem-ezcrypto/files/patch-gemspec ============================================================================== --- branches/2015Q2/security/rubygem-ezcrypto/files/patch-gemspec Wed May 20 21:46:36 2015 (r386895) +++ branches/2015Q2/security/rubygem-ezcrypto/files/patch-gemspec Wed May 20 21:51:53 2015 (r386896) @@ -9,7 +9,7 @@ s.homepage = "http://ezcrypto.rubyforge.org" s.requirements = ["none"] s.rubyforge_project = "ezcrypto" - s.rubygems_version = "2.4.5" + s.rubygems_version = "2.4.7" s.summary = "Simplified encryption library." - s.test_files = ["test/active_crypto_test.rb", "test/agree2.com.cert", "test/association_key_holder_test.rb", "test/database.yml", "test/debug.log", "test/digest_test.rb", "test/dsakey.pem", "test/dsapubkey.pem", "test/dsig_test.rb", "test/encrypt_test.rb", "test/ezcrypto_test.rb", "test/key_holder_test.rb", "test/protectedsigner.pem", "test/sf-class2-root.crt", "test/sf_intermediate.crt", "test/store", "test/test_helper.rb", "test/testchild.pem", "test/testchild.req", "test/testpub.pem", "test/testsigner.cert", "test/testsigner.pem", "test/valicert_class2_root.crt"] + s.test_files = ["test/active_crypto_test.rb", "test/agree2.com.cert", "test/association_key_holder_test.rb", "test/database.yml", "test/debug.log", "test/digest_test.rb", "test/dsakey.pem", "test/dsapubkey.pem", "test/dsig_test.rb", "test/encrypt_test.rb", "test/ezcrypto_test.rb", "test/key_holder_test.rb", "test/protectedsigner.pem", "test/sf-class2-root.crt", "test/sf_intermediate.crt", "test/test_helper.rb", "test/testchild.pem", "test/testchild.req", "test/testpub.pem", "test/testsigner.cert", "test/testsigner.pem", "test/valicert_class2_root.crt"] From owner-svn-ports-branches@FreeBSD.ORG Wed May 20 22:00:24 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4175AF81; Wed, 20 May 2015 22:00:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2FF571C9D; Wed, 20 May 2015 22:00:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4KM0OTH030771; Wed, 20 May 2015 22:00:24 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4KM0Oua030770; Wed, 20 May 2015 22:00:24 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201505202200.t4KM0Oua030770@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Wed, 20 May 2015 22:00:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386898 - branches/2015Q2/cad/qcad X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2015 22:00:24 -0000 Author: amdmi3 Date: Wed May 20 22:00:23 2015 New Revision: 386898 URL: https://svnweb.freebsd.org/changeset/ports/386898 Log: MFH: r386828 - Don't install static libraries with INSTALL_LIB Approved by: portmgr blanket Approved by: ports-secteam (delphij) Modified: branches/2015Q2/cad/qcad/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/cad/qcad/Makefile ============================================================================== --- branches/2015Q2/cad/qcad/Makefile Wed May 20 21:56:42 2015 (r386897) +++ branches/2015Q2/cad/qcad/Makefile Wed May 20 22:00:23 2015 (r386898) @@ -3,7 +3,7 @@ PORTNAME= qcad PORTVERSION= 3.7.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= cad MASTER_SITES= http://github.com/${PORTNAME}/${PORTNAME}/archive/${DISTNAME}.tar.gz?dummy=/ \ https://github.com/${PORTNAME}/${PORTNAME}/archive/${DISTNAME}.tar.gz?dummy=/ @@ -69,7 +69,7 @@ do-install: ${LN} -sf ${PREFIX}/lib/${lib}.0 ${STAGEDIR}${PREFIX}/lib/${lib} .endfor .for lib in ${STALIBS:C|^|lib|:C|$|.a|} - ${INSTALL_LIB} ${RESDIR}/${lib} ${STAGEDIR}${PREFIX}/lib/ + ${INSTALL_DATA} ${RESDIR}/${lib} ${STAGEDIR}${PREFIX}/lib/ .endfor ${MKDIR} ${STAGEDIR}${DATADIR} .for dir in ${SHRDIR} From owner-svn-ports-branches@FreeBSD.ORG Thu May 21 05:41:17 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2E2A78DD; Thu, 21 May 2015 05:41:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1C084111D; Thu, 21 May 2015 05:41:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4L5fGrx061285; Thu, 21 May 2015 05:41:16 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4L5fGv6061283; Thu, 21 May 2015 05:41:16 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201505210541.t4L5fGv6061283@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 21 May 2015 05:41:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386907 - branches/2015Q2/security/easy-rsa X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 May 2015 05:41:17 -0000 Author: bdrewery Date: Thu May 21 05:41:16 2015 New Revision: 386907 URL: https://svnweb.freebsd.org/changeset/ports/386907 Log: MFH r386906: Update to 2.2.2. Modified: branches/2015Q2/security/easy-rsa/Makefile branches/2015Q2/security/easy-rsa/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/security/easy-rsa/Makefile ============================================================================== --- branches/2015Q2/security/easy-rsa/Makefile Thu May 21 05:08:48 2015 (r386906) +++ branches/2015Q2/security/easy-rsa/Makefile Thu May 21 05:41:16 2015 (r386907) @@ -1,10 +1,8 @@ # $FreeBSD$ PORTNAME= easy-rsa -DISTVERSION= 2.2.0_master +DISTVERSION= 2.2.2 CATEGORIES= security net-mgmt -MASTER_SITES= http://swupdate.openvpn.net/community/releases/ \ - http://build.openvpn.net/downloads/releases/ # Eric F. Crist does not require my # approval for changes to this package. -- mandree@FreeBSD.org @@ -13,6 +11,10 @@ COMMENT= Small RSA key management packag LICENSE= GPLv2 +USE_GITHUB= yes +GH_ACCOUNT= OpenVPN + GNU_CONFIGURE= yes +USES= autoreconf .include Modified: branches/2015Q2/security/easy-rsa/distinfo ============================================================================== --- branches/2015Q2/security/easy-rsa/distinfo Thu May 21 05:08:48 2015 (r386906) +++ branches/2015Q2/security/easy-rsa/distinfo Thu May 21 05:41:16 2015 (r386907) @@ -1,2 +1,2 @@ -SHA256 (easy-rsa-2.2.0_master.tar.gz) = d23ddc3a764b40d03ada76f387c92ae4dcf4f5266da54c2bae130325b05eebe2 -SIZE (easy-rsa-2.2.0_master.tar.gz) = 80460 +SHA256 (easy-rsa-2.2.2_GH0.tar.gz) = 38f1f84e9b966df8b312365c7c75a455bdf003abdd5156e7106fa9c7771583ae +SIZE (easy-rsa-2.2.2_GH0.tar.gz) = 24453 From owner-svn-ports-branches@FreeBSD.ORG Thu May 21 16:19:01 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 872742B6; Thu, 21 May 2015 16:19:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5B0A612F6; Thu, 21 May 2015 16:19:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4LGJ1uB086195; Thu, 21 May 2015 16:19:01 GMT (envelope-from danilo@FreeBSD.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4LGJ0mT086185; Thu, 21 May 2015 16:19:00 GMT (envelope-from danilo@FreeBSD.org) Message-Id: <201505211619.t4LGJ0mT086185@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: danilo set sender to danilo@FreeBSD.org using -f From: Danilo Egea Gondolfo Date: Thu, 21 May 2015 16:19:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386944 - branches/2015Q2/x11-fm/gnome-commander2 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 May 2015 16:19:01 -0000 Author: danilo Date: Thu May 21 16:18:59 2015 New Revision: 386944 URL: https://svnweb.freebsd.org/changeset/ports/386944 Log: MFH: r386899 - Update to 1.4.6 - Bugfix for a bug which resulted in storing clear-text passwords [1] [1] - https://bugzilla.gnome.org/show_bug.cgi?id=653573 Approved by: ports-secteam (delphij) Modified: branches/2015Q2/x11-fm/gnome-commander2/Makefile branches/2015Q2/x11-fm/gnome-commander2/distinfo branches/2015Q2/x11-fm/gnome-commander2/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/x11-fm/gnome-commander2/Makefile ============================================================================== --- branches/2015Q2/x11-fm/gnome-commander2/Makefile Thu May 21 16:12:27 2015 (r386943) +++ branches/2015Q2/x11-fm/gnome-commander2/Makefile Thu May 21 16:18:59 2015 (r386944) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gnome-commander -PORTVERSION= 1.4.5 -PORTREVISION= 1 +PORTVERSION= 1.4.6 PORTEPOCH= 1 CATEGORIES= x11-fm gnome MASTER_SITES= GNOME/sources/gnome-commander/1.4 Modified: branches/2015Q2/x11-fm/gnome-commander2/distinfo ============================================================================== --- branches/2015Q2/x11-fm/gnome-commander2/distinfo Thu May 21 16:12:27 2015 (r386943) +++ branches/2015Q2/x11-fm/gnome-commander2/distinfo Thu May 21 16:18:59 2015 (r386944) @@ -1,2 +1,2 @@ -SHA256 (gnome2/gnome-commander-1.4.5.tar.xz) = 01da8a02f3387b47d86a4cbff93c6f74c6e4fbeb94bc54a8a6e60084d6c0b17f -SIZE (gnome2/gnome-commander-1.4.5.tar.xz) = 6314848 +SHA256 (gnome2/gnome-commander-1.4.6.tar.xz) = 55f3dd2ee4295c4b88a5c7810bbbd1db126213871b263dd5a44c0d48e8ef3a01 +SIZE (gnome2/gnome-commander-1.4.6.tar.xz) = 6350560 Modified: branches/2015Q2/x11-fm/gnome-commander2/pkg-plist ============================================================================== --- branches/2015Q2/x11-fm/gnome-commander2/pkg-plist Thu May 21 16:12:27 2015 (r386943) +++ branches/2015Q2/x11-fm/gnome-commander2/pkg-plist Thu May 21 16:18:59 2015 (r386944) @@ -236,6 +236,7 @@ share/gnome/help/gnome-commander/sl/lega share/gnome/help/gnome-commander/sl/releases.xml share/locale/ar/LC_MESSAGES/gnome-commander.mo share/locale/bg/LC_MESSAGES/gnome-commander.mo +share/locale/bs/LC_MESSAGES/gnome-commander.mo share/locale/ca/LC_MESSAGES/gnome-commander.mo share/locale/cs/LC_MESSAGES/gnome-commander.mo share/locale/da/LC_MESSAGES/gnome-commander.mo From owner-svn-ports-branches@FreeBSD.ORG Fri May 22 15:54:57 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 66E6EA6; Fri, 22 May 2015 15:54:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5381E1782; Fri, 22 May 2015 15:54:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4MFsv2b001903; Fri, 22 May 2015 15:54:57 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4MFsug2001899; Fri, 22 May 2015 15:54:56 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201505221554.t4MFsug2001899@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 22 May 2015 15:54:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387030 - branches/2015Q2/security/gnutls X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 May 2015 15:54:57 -0000 Author: delphij Date: Fri May 22 15:54:56 2015 New Revision: 387030 URL: https://svnweb.freebsd.org/changeset/ports/387030 Log: MFH: r387029 Update to 3.3.15. PR: 198875 Approved by: ports-secteam@ (self) Modified: branches/2015Q2/security/gnutls/Makefile branches/2015Q2/security/gnutls/distinfo branches/2015Q2/security/gnutls/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/security/gnutls/Makefile ============================================================================== --- branches/2015Q2/security/gnutls/Makefile Fri May 22 15:46:08 2015 (r387029) +++ branches/2015Q2/security/gnutls/Makefile Fri May 22 15:54:56 2015 (r387030) @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= gnutls -PORTVERSION= 3.2.21 +PORTVERSION= 3.3.15 CATEGORIES= security net -MASTER_SITES= GNUPG/gnutls/v3.2 +MASTER_SITES= GNUPG/gnutls/v${PORTVERSION:R} MAINTAINER= bdrewery@FreeBSD.org COMMENT= GNU Transport Layer Security library @@ -15,6 +15,8 @@ LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.L LIB_DEPENDS= libnettle.so:${PORTSDIR}/security/nettle \ libtasn1.so:${PORTSDIR}/security/libtasn1 +BUILD_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss +RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss USES= cpe gmake iconv libtool makeinfo pathfix pkgconfig tar:xz USE_LDCONFIG= yes Modified: branches/2015Q2/security/gnutls/distinfo ============================================================================== --- branches/2015Q2/security/gnutls/distinfo Fri May 22 15:46:08 2015 (r387029) +++ branches/2015Q2/security/gnutls/distinfo Fri May 22 15:54:56 2015 (r387030) @@ -1,2 +1,2 @@ -SHA256 (gnutls-3.2.21.tar.xz) = 824196254cf9162b9ff841677f292d108ca1efa6cf8ae1c02b9a8682a3d7087f -SIZE (gnutls-3.2.21.tar.xz) = 5162040 +SHA256 (gnutls-3.3.15.tar.xz) = 8961227852911a1974e15bc017ddbcd4779876c867226d199f06648d8b27ba4b +SIZE (gnutls-3.3.15.tar.xz) = 6286288 Modified: branches/2015Q2/security/gnutls/pkg-plist ============================================================================== --- branches/2015Q2/security/gnutls/pkg-plist Fri May 22 15:46:08 2015 (r387029) +++ branches/2015Q2/security/gnutls/pkg-plist Fri May 22 15:54:56 2015 (r387030) @@ -1,5 +1,4 @@ bin/certtool -bin/danetool bin/gnutls-cli bin/gnutls-cli-debug bin/gnutls-serv @@ -20,9 +19,10 @@ include/gnutls/openpgp.h include/gnutls/openssl.h include/gnutls/pkcs11.h include/gnutls/pkcs12.h +include/gnutls/self-test.h include/gnutls/tpm.h include/gnutls/x509.h -include/gnutls/xssl.h +include/gnutls/x509-ext.h info/gnutls-client-server-use-case.png info/gnutls-handshake-sequence.png info/gnutls-handshake-state.png @@ -37,19 +37,12 @@ info/pkcs11-vision.png %%LIBDANE%%lib/libgnutls-dane.so %%LIBDANE%%lib/libgnutls-dane.so.0 %%LIBDANE%%lib/libgnutls-dane.so.0.4.1 -lib/libgnutls-openssl.a lib/libgnutls-openssl.so lib/libgnutls-openssl.so.27 lib/libgnutls-openssl.so.27.0.2 -lib/libgnutls-xssl.a -lib/libgnutls-xssl.so -lib/libgnutls-xssl.so.0 -lib/libgnutls-xssl.so.0.0.0 -lib/libgnutls.a lib/libgnutls.so lib/libgnutls.so.28 -lib/libgnutls.so.28.30.12 -lib/libgnutlsxx.a +lib/libgnutls.so.28.41.7 lib/libgnutlsxx.so lib/libgnutlsxx.so.28 lib/libgnutlsxx.so.28.1.0 @@ -133,6 +126,7 @@ man/man3/gnutls_certificate_set_x509_sim man/man3/gnutls_certificate_set_x509_simple_pkcs12_mem.3.gz man/man3/gnutls_certificate_set_x509_system_trust.3.gz man/man3/gnutls_certificate_set_x509_trust.3.gz +man/man3/gnutls_certificate_set_x509_trust_dir.3.gz man/man3/gnutls_certificate_set_x509_trust_file.3.gz man/man3/gnutls_certificate_set_x509_trust_mem.3.gz man/man3/gnutls_certificate_type_get.3.gz @@ -141,6 +135,7 @@ man/man3/gnutls_certificate_type_get_nam man/man3/gnutls_certificate_type_list.3.gz man/man3/gnutls_certificate_type_set_priority.3.gz man/man3/gnutls_certificate_verification_status_print.3.gz +man/man3/gnutls_certificate_verify_peers.3.gz man/man3/gnutls_certificate_verify_peers2.3.gz man/man3/gnutls_certificate_verify_peers3.3.gz man/man3/gnutls_check_version.3.gz @@ -159,6 +154,7 @@ man/man3/gnutls_cipher_get_name.3.gz man/man3/gnutls_cipher_get_tag_size.3.gz man/man3/gnutls_cipher_init.3.gz man/man3/gnutls_cipher_list.3.gz +man/man3/gnutls_cipher_self_test.3.gz man/man3/gnutls_cipher_set_iv.3.gz man/man3/gnutls_cipher_set_priority.3.gz man/man3/gnutls_cipher_suite_get_name.3.gz @@ -170,6 +166,7 @@ man/man3/gnutls_compression_get_name.3.g man/man3/gnutls_compression_list.3.gz man/man3/gnutls_compression_set_priority.3.gz man/man3/gnutls_credentials_clear.3.gz +man/man3/gnutls_credentials_get.3.gz man/man3/gnutls_credentials_set.3.gz man/man3/gnutls_db_check_entry.3.gz man/man3/gnutls_db_check_entry_time.3.gz @@ -200,6 +197,7 @@ man/man3/gnutls_dh_set_prime_bits.3.gz man/man3/gnutls_digest_get_id.3.gz man/man3/gnutls_digest_get_name.3.gz man/man3/gnutls_digest_list.3.gz +man/man3/gnutls_digest_self_test.3.gz man/man3/gnutls_dtls_cookie_send.3.gz man/man3/gnutls_dtls_cookie_verify.3.gz man/man3/gnutls_dtls_get_data_mtu.3.gz @@ -217,6 +215,7 @@ man/man3/gnutls_error_is_fatal.3.gz man/man3/gnutls_error_to_alert.3.gz man/man3/gnutls_est_record_overhead_size.3.gz man/man3/gnutls_fingerprint.3.gz +man/man3/gnutls_fips140_mode_enabled.3.gz man/man3/gnutls_global_deinit.3.gz man/man3/gnutls_global_init.3.gz man/man3/gnutls_global_set_audit_log_function.3.gz @@ -271,6 +270,7 @@ man/man3/gnutls_mac_get_key_size.3.gz man/man3/gnutls_mac_get_name.3.gz man/man3/gnutls_mac_get_nonce_size.3.gz man/man3/gnutls_mac_list.3.gz +man/man3/gnutls_mac_self_test.3.gz man/man3/gnutls_mac_set_priority.3.gz man/man3/gnutls_ocsp_req_add_cert.3.gz man/man3/gnutls_ocsp_req_add_cert_id.3.gz @@ -309,6 +309,7 @@ man/man3/gnutls_ocsp_status_request_enab man/man3/gnutls_ocsp_status_request_get.3.gz man/man3/gnutls_ocsp_status_request_is_checked.3.gz man/man3/gnutls_openpgp_crt_check_hostname.3.gz +man/man3/gnutls_openpgp_crt_check_hostname2.3.gz man/man3/gnutls_openpgp_crt_deinit.3.gz man/man3/gnutls_openpgp_crt_export.3.gz man/man3/gnutls_openpgp_crt_export2.3.gz @@ -375,6 +376,8 @@ man/man3/gnutls_openpgp_privkey_set_pref man/man3/gnutls_openpgp_privkey_sign_hash.3.gz man/man3/gnutls_openpgp_send_cert.3.gz man/man3/gnutls_openpgp_set_recv_key_function.3.gz +man/man3/gnutls_packet_deinit.3.gz +man/man3/gnutls_packet_get.3.gz man/man3/gnutls_pcert_deinit.3.gz man/man3/gnutls_pcert_import_openpgp.3.gz man/man3/gnutls_pcert_import_openpgp_raw.3.gz @@ -391,11 +394,13 @@ man/man3/gnutls_pk_bits_to_sec_param.3.g man/man3/gnutls_pk_get_id.3.gz man/man3/gnutls_pk_get_name.3.gz man/man3/gnutls_pk_list.3.gz +man/man3/gnutls_pk_self_test.3.gz man/man3/gnutls_pk_to_sign.3.gz man/man3/gnutls_pkcs11_add_provider.3.gz man/man3/gnutls_pkcs11_copy_secret_key.3.gz man/man3/gnutls_pkcs11_copy_x509_crt.3.gz man/man3/gnutls_pkcs11_copy_x509_privkey.3.gz +man/man3/gnutls_pkcs11_crt_is_known.3.gz man/man3/gnutls_pkcs11_deinit.3.gz man/man3/gnutls_pkcs11_delete_url.3.gz man/man3/gnutls_pkcs11_get_pin_function.3.gz @@ -406,6 +411,9 @@ man/man3/gnutls_pkcs11_obj_export.3.gz man/man3/gnutls_pkcs11_obj_export2.3.gz man/man3/gnutls_pkcs11_obj_export3.3.gz man/man3/gnutls_pkcs11_obj_export_url.3.gz +man/man3/gnutls_pkcs11_obj_flags_get_str.3.gz +man/man3/gnutls_pkcs11_obj_get_exts.3.gz +man/man3/gnutls_pkcs11_obj_get_flags.3.gz man/man3/gnutls_pkcs11_obj_get_info.3.gz man/man3/gnutls_pkcs11_obj_get_type.3.gz man/man3/gnutls_pkcs11_obj_import_url.3.gz @@ -414,6 +422,7 @@ man/man3/gnutls_pkcs11_obj_list_import_u man/man3/gnutls_pkcs11_obj_list_import_url2.3.gz man/man3/gnutls_pkcs11_obj_set_pin_function.3.gz man/man3/gnutls_pkcs11_privkey_deinit.3.gz +man/man3/gnutls_pkcs11_privkey_export_pubkey.3.gz man/man3/gnutls_pkcs11_privkey_export_url.3.gz man/man3/gnutls_pkcs11_privkey_generate.3.gz man/man3/gnutls_pkcs11_privkey_generate2.3.gz @@ -490,14 +499,21 @@ man/man3/gnutls_priority_set_direct.3.gz man/man3/gnutls_priority_sign_list.3.gz man/man3/gnutls_privkey_decrypt_data.3.gz man/man3/gnutls_privkey_deinit.3.gz +man/man3/gnutls_privkey_export_dsa_raw.3.gz +man/man3/gnutls_privkey_export_ecc_raw.3.gz +man/man3/gnutls_privkey_export_rsa_raw.3.gz +man/man3/gnutls_privkey_generate.3.gz man/man3/gnutls_privkey_get_pk_algorithm.3.gz man/man3/gnutls_privkey_get_type.3.gz +man/man3/gnutls_privkey_import_dsa_raw.3.gz +man/man3/gnutls_privkey_import_ecc_raw.3.gz man/man3/gnutls_privkey_import_ext.3.gz man/man3/gnutls_privkey_import_ext2.3.gz man/man3/gnutls_privkey_import_openpgp.3.gz man/man3/gnutls_privkey_import_openpgp_raw.3.gz man/man3/gnutls_privkey_import_pkcs11.3.gz man/man3/gnutls_privkey_import_pkcs11_url.3.gz +man/man3/gnutls_privkey_import_rsa_raw.3.gz man/man3/gnutls_privkey_import_tpm_raw.3.gz man/man3/gnutls_privkey_import_tpm_url.3.gz man/man3/gnutls_privkey_import_url.3.gz @@ -509,6 +525,7 @@ man/man3/gnutls_privkey_sign_data.3.gz man/man3/gnutls_privkey_sign_hash.3.gz man/man3/gnutls_privkey_sign_raw_data.3.gz man/man3/gnutls_privkey_status.3.gz +man/man3/gnutls_privkey_verify_params.3.gz man/man3/gnutls_protocol_get_id.3.gz man/man3/gnutls_protocol_get_name.3.gz man/man3/gnutls_protocol_get_version.3.gz @@ -532,14 +549,14 @@ man/man3/gnutls_pubkey_deinit.3.gz man/man3/gnutls_pubkey_encrypt_data.3.gz man/man3/gnutls_pubkey_export.3.gz man/man3/gnutls_pubkey_export2.3.gz +man/man3/gnutls_pubkey_export_dsa_raw.3.gz +man/man3/gnutls_pubkey_export_ecc_raw.3.gz +man/man3/gnutls_pubkey_export_ecc_x962.3.gz +man/man3/gnutls_pubkey_export_rsa_raw.3.gz man/man3/gnutls_pubkey_get_key_id.3.gz man/man3/gnutls_pubkey_get_key_usage.3.gz man/man3/gnutls_pubkey_get_openpgp_key_id.3.gz man/man3/gnutls_pubkey_get_pk_algorithm.3.gz -man/man3/gnutls_pubkey_get_pk_dsa_raw.3.gz -man/man3/gnutls_pubkey_get_pk_ecc_raw.3.gz -man/man3/gnutls_pubkey_get_pk_ecc_x962.3.gz -man/man3/gnutls_pubkey_get_pk_rsa_raw.3.gz man/man3/gnutls_pubkey_get_preferred_hash_algorithm.3.gz man/man3/gnutls_pubkey_get_verify_algorithm.3.gz man/man3/gnutls_pubkey_import.3.gz @@ -566,6 +583,7 @@ man/man3/gnutls_pubkey_verify_data.3.gz man/man3/gnutls_pubkey_verify_data2.3.gz man/man3/gnutls_pubkey_verify_hash.3.gz man/man3/gnutls_pubkey_verify_hash2.3.gz +man/man3/gnutls_pubkey_verify_params.3.gz man/man3/gnutls_random_art.3.gz man/man3/gnutls_range_split.3.gz man/man3/gnutls_record_can_use_length_hiding.3.gz @@ -578,6 +596,7 @@ man/man3/gnutls_record_get_discarded.3.g man/man3/gnutls_record_get_max_size.3.gz man/man3/gnutls_record_overhead_size.3.gz man/man3/gnutls_record_recv.3.gz +man/man3/gnutls_record_recv_packet.3.gz man/man3/gnutls_record_recv_seq.3.gz man/man3/gnutls_record_send.3.gz man/man3/gnutls_record_send_range.3.gz @@ -601,6 +620,7 @@ man/man3/gnutls_rsa_params_init.3.gz man/man3/gnutls_safe_renegotiation_status.3.gz man/man3/gnutls_sec_param_get_name.3.gz man/man3/gnutls_sec_param_to_pk_bits.3.gz +man/man3/gnutls_sec_param_to_symmetric_bits.3.gz man/man3/gnutls_server_name_get.3.gz man/man3/gnutls_server_name_set.3.gz man/man3/gnutls_session_channel_binding.3.gz @@ -649,6 +669,7 @@ man/man3/gnutls_srp_set_client_credentia man/man3/gnutls_srp_set_prime_bits.3.gz man/man3/gnutls_srp_set_server_credentials_file.3.gz man/man3/gnutls_srp_set_server_credentials_function.3.gz +man/man3/gnutls_srp_set_server_fake_salt_seed.3.gz man/man3/gnutls_srp_verifier.3.gz man/man3/gnutls_srtp_get_keys.3.gz man/man3/gnutls_srtp_get_mki.3.gz @@ -662,6 +683,10 @@ man/man3/gnutls_store_commitment.3.gz man/man3/gnutls_store_pubkey.3.gz man/man3/gnutls_strerror.3.gz man/man3/gnutls_strerror_name.3.gz +man/man3/gnutls_subject_alt_names_deinit.3.gz +man/man3/gnutls_subject_alt_names_get.3.gz +man/man3/gnutls_subject_alt_names_init.3.gz +man/man3/gnutls_subject_alt_names_set.3.gz man/man3/gnutls_supplemental_get_name.3.gz man/man3/gnutls_tdb_deinit.3.gz man/man3/gnutls_tdb_init.3.gz @@ -689,8 +714,22 @@ man/man3/gnutls_transport_set_push_funct man/man3/gnutls_transport_set_vec_push_function.3.gz man/man3/gnutls_url_is_supported.3.gz man/man3/gnutls_verify_stored_pubkey.3.gz +man/man3/gnutls_x509_aia_deinit.3.gz +man/man3/gnutls_x509_aia_get.3.gz +man/man3/gnutls_x509_aia_init.3.gz +man/man3/gnutls_x509_aia_set.3.gz +man/man3/gnutls_x509_aki_deinit.3.gz +man/man3/gnutls_x509_aki_get_cert_issuer.3.gz +man/man3/gnutls_x509_aki_get_id.3.gz +man/man3/gnutls_x509_aki_init.3.gz +man/man3/gnutls_x509_aki_set_cert_issuer.3.gz +man/man3/gnutls_x509_aki_set_id.3.gz man/man3/gnutls_x509_crl_check_issuer.3.gz man/man3/gnutls_x509_crl_deinit.3.gz +man/man3/gnutls_x509_crl_dist_points_deinit.3.gz +man/man3/gnutls_x509_crl_dist_points_get.3.gz +man/man3/gnutls_x509_crl_dist_points_init.3.gz +man/man3/gnutls_x509_crl_dist_points_set.3.gz man/man3/gnutls_x509_crl_export.3.gz man/man3/gnutls_x509_crl_export2.3.gz man/man3/gnutls_x509_crl_get_authority_key_gn_serial.3.gz @@ -699,6 +738,7 @@ man/man3/gnutls_x509_crl_get_crt_count.3 man/man3/gnutls_x509_crl_get_crt_serial.3.gz man/man3/gnutls_x509_crl_get_dn_oid.3.gz man/man3/gnutls_x509_crl_get_extension_data.3.gz +man/man3/gnutls_x509_crl_get_extension_data2.3.gz man/man3/gnutls_x509_crl_get_extension_info.3.gz man/man3/gnutls_x509_crl_get_extension_oid.3.gz man/man3/gnutls_x509_crl_get_issuer_dn.3.gz @@ -713,6 +753,8 @@ man/man3/gnutls_x509_crl_get_this_update man/man3/gnutls_x509_crl_get_version.3.gz man/man3/gnutls_x509_crl_import.3.gz man/man3/gnutls_x509_crl_init.3.gz +man/man3/gnutls_x509_crl_iter_crt_serial.3.gz +man/man3/gnutls_x509_crl_iter_deinit.3.gz man/man3/gnutls_x509_crl_list_import.3.gz man/man3/gnutls_x509_crl_list_import2.3.gz man/man3/gnutls_x509_crl_print.3.gz @@ -740,7 +782,9 @@ man/man3/gnutls_x509_crq_get_dn2.3.gz man/man3/gnutls_x509_crq_get_dn_by_oid.3.gz man/man3/gnutls_x509_crq_get_dn_oid.3.gz man/man3/gnutls_x509_crq_get_extension_by_oid.3.gz +man/man3/gnutls_x509_crq_get_extension_by_oid2.3.gz man/man3/gnutls_x509_crq_get_extension_data.3.gz +man/man3/gnutls_x509_crq_get_extension_data2.3.gz man/man3/gnutls_x509_crq_get_extension_info.3.gz man/man3/gnutls_x509_crq_get_key_id.3.gz man/man3/gnutls_x509_crq_get_key_purpose_oid.3.gz @@ -772,6 +816,7 @@ man/man3/gnutls_x509_crq_sign.3.gz man/man3/gnutls_x509_crq_sign2.3.gz man/man3/gnutls_x509_crq_verify.3.gz man/man3/gnutls_x509_crt_check_hostname.3.gz +man/man3/gnutls_x509_crt_check_hostname2.3.gz man/man3/gnutls_x509_crt_check_issuer.3.gz man/man3/gnutls_x509_crt_check_revocation.3.gz man/man3/gnutls_x509_crt_cpy_crl_dist_points.3.gz @@ -791,7 +836,9 @@ man/man3/gnutls_x509_crt_get_dn_by_oid.3 man/man3/gnutls_x509_crt_get_dn_oid.3.gz man/man3/gnutls_x509_crt_get_expiration_time.3.gz man/man3/gnutls_x509_crt_get_extension_by_oid.3.gz +man/man3/gnutls_x509_crt_get_extension_by_oid2.3.gz man/man3/gnutls_x509_crt_get_extension_data.3.gz +man/man3/gnutls_x509_crt_get_extension_data2.3.gz man/man3/gnutls_x509_crt_get_extension_info.3.gz man/man3/gnutls_x509_crt_get_extension_oid.3.gz man/man3/gnutls_x509_crt_get_fingerprint.3.gz @@ -807,6 +854,7 @@ man/man3/gnutls_x509_crt_get_issuer_uniq man/man3/gnutls_x509_crt_get_key_id.3.gz man/man3/gnutls_x509_crt_get_key_purpose_oid.3.gz man/man3/gnutls_x509_crt_get_key_usage.3.gz +man/man3/gnutls_x509_crt_get_name_constraints.3.gz man/man3/gnutls_x509_crt_get_pk_algorithm.3.gz man/man3/gnutls_x509_crt_get_pk_dsa_raw.3.gz man/man3/gnutls_x509_crt_get_pk_rsa_raw.3.gz @@ -850,11 +898,13 @@ man/man3/gnutls_x509_crt_set_dn.3.gz man/man3/gnutls_x509_crt_set_dn_by_oid.3.gz man/man3/gnutls_x509_crt_set_expiration_time.3.gz man/man3/gnutls_x509_crt_set_extension_by_oid.3.gz +man/man3/gnutls_x509_crt_set_issuer_alt_name.3.gz man/man3/gnutls_x509_crt_set_issuer_dn.3.gz man/man3/gnutls_x509_crt_set_issuer_dn_by_oid.3.gz man/man3/gnutls_x509_crt_set_key.3.gz man/man3/gnutls_x509_crt_set_key_purpose_oid.3.gz man/man3/gnutls_x509_crt_set_key_usage.3.gz +man/man3/gnutls_x509_crt_set_name_constraints.3.gz man/man3/gnutls_x509_crt_set_pin_function.3.gz man/man3/gnutls_x509_crt_set_policy.3.gz man/man3/gnutls_x509_crt_set_private_key_usage_period.3.gz @@ -879,6 +929,49 @@ man/man3/gnutls_x509_dn_import.3.gz man/man3/gnutls_x509_dn_init.3.gz man/man3/gnutls_x509_dn_oid_known.3.gz man/man3/gnutls_x509_dn_oid_name.3.gz +man/man3/gnutls_x509_ext_deinit.3.gz +man/man3/gnutls_x509_ext_export_aia.3.gz +man/man3/gnutls_x509_ext_export_authority_key_id.3.gz +man/man3/gnutls_x509_ext_export_basic_constraints.3.gz +man/man3/gnutls_x509_ext_export_crl_dist_points.3.gz +man/man3/gnutls_x509_ext_export_key_purposes.3.gz +man/man3/gnutls_x509_ext_export_key_usage.3.gz +man/man3/gnutls_x509_ext_export_name_constraints.3.gz +man/man3/gnutls_x509_ext_export_policies.3.gz +man/man3/gnutls_x509_ext_export_private_key_usage_period.3.gz +man/man3/gnutls_x509_ext_export_proxy.3.gz +man/man3/gnutls_x509_ext_export_subject_alt_names.3.gz +man/man3/gnutls_x509_ext_export_subject_key_id.3.gz +man/man3/gnutls_x509_ext_import_aia.3.gz +man/man3/gnutls_x509_ext_import_authority_key_id.3.gz +man/man3/gnutls_x509_ext_import_basic_constraints.3.gz +man/man3/gnutls_x509_ext_import_crl_dist_points.3.gz +man/man3/gnutls_x509_ext_import_key_purposes.3.gz +man/man3/gnutls_x509_ext_import_key_usage.3.gz +man/man3/gnutls_x509_ext_import_name_constraints.3.gz +man/man3/gnutls_x509_ext_import_policies.3.gz +man/man3/gnutls_x509_ext_import_private_key_usage_period.3.gz +man/man3/gnutls_x509_ext_import_proxy.3.gz +man/man3/gnutls_x509_ext_import_subject_alt_names.3.gz +man/man3/gnutls_x509_ext_import_subject_key_id.3.gz +man/man3/gnutls_x509_ext_print.3.gz +man/man3/gnutls_x509_key_purpose_deinit.3.gz +man/man3/gnutls_x509_key_purpose_get.3.gz +man/man3/gnutls_x509_key_purpose_init.3.gz +man/man3/gnutls_x509_key_purpose_set.3.gz +man/man3/gnutls_x509_name_constraints_add_excluded.3.gz +man/man3/gnutls_x509_name_constraints_add_permitted.3.gz +man/man3/gnutls_x509_name_constraints_check.3.gz +man/man3/gnutls_x509_name_constraints_check_crt.3.gz +man/man3/gnutls_x509_name_constraints_deinit.3.gz +man/man3/gnutls_x509_name_constraints_get_excluded.3.gz +man/man3/gnutls_x509_name_constraints_get_permitted.3.gz +man/man3/gnutls_x509_name_constraints_init.3.gz +man/man3/gnutls_x509_othername_to_virtual.3.gz +man/man3/gnutls_x509_policies_deinit.3.gz +man/man3/gnutls_x509_policies_get.3.gz +man/man3/gnutls_x509_policies_init.3.gz +man/man3/gnutls_x509_policies_set.3.gz man/man3/gnutls_x509_policy_release.3.gz man/man3/gnutls_x509_privkey_cpy.3.gz man/man3/gnutls_x509_privkey_deinit.3.gz @@ -915,6 +1008,7 @@ man/man3/gnutls_x509_trust_list_add_cas. man/man3/gnutls_x509_trust_list_add_crls.3.gz man/man3/gnutls_x509_trust_list_add_named_crt.3.gz man/man3/gnutls_x509_trust_list_add_system_trust.3.gz +man/man3/gnutls_x509_trust_list_add_trust_dir.3.gz man/man3/gnutls_x509_trust_list_add_trust_file.3.gz man/man3/gnutls_x509_trust_list_add_trust_mem.3.gz man/man3/gnutls_x509_trust_list_deinit.3.gz @@ -924,19 +1018,8 @@ man/man3/gnutls_x509_trust_list_remove_c man/man3/gnutls_x509_trust_list_remove_trust_file.3.gz man/man3/gnutls_x509_trust_list_remove_trust_mem.3.gz man/man3/gnutls_x509_trust_list_verify_crt.3.gz +man/man3/gnutls_x509_trust_list_verify_crt2.3.gz man/man3/gnutls_x509_trust_list_verify_named_crt.3.gz -man/man3/xssl_client_init.3.gz -man/man3/xssl_cred_deinit.3.gz -man/man3/xssl_cred_init.3.gz -man/man3/xssl_deinit.3.gz -man/man3/xssl_flush.3.gz -man/man3/xssl_get_session.3.gz -man/man3/xssl_getdelim.3.gz -man/man3/xssl_printf.3.gz -man/man3/xssl_read.3.gz -man/man3/xssl_server_init.3.gz -man/man3/xssl_sinit.3.gz -man/man3/xssl_write.3.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-alert.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-cert-select-pkcs11.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-cert-select.c @@ -946,8 +1029,6 @@ man/man3/xssl_write.3.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-resume.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-srp.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-x509.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-xssl1.c -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-client-xssl2.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-crq.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-ocsp-client.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-pkcs11-list.c From owner-svn-ports-branches@FreeBSD.ORG Fri May 22 16:17:05 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0D4EC74F; Fri, 22 May 2015 16:17:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F005D1A3E; Fri, 22 May 2015 16:17:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4MGH4dG012624; Fri, 22 May 2015 16:17:04 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4MGH4eX012623; Fri, 22 May 2015 16:17:04 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201505221617.t4MGH4eX012623@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 22 May 2015 16:17:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387032 - branches/2015Q2/security/gnutls X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 May 2015 16:17:05 -0000 Author: delphij Date: Fri May 22 16:17:04 2015 New Revision: 387032 URL: https://svnweb.freebsd.org/changeset/ports/387032 Log: MFH: r387031 Fix plist when LIBDANE is defined (PORTREVISION not bumped because package wouldn't be successful in the case). Pointy hat to: delphij Reported by: sunpoet Approved by: ports-secteam Modified: branches/2015Q2/security/gnutls/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/security/gnutls/pkg-plist ============================================================================== --- branches/2015Q2/security/gnutls/pkg-plist Fri May 22 16:16:34 2015 (r387031) +++ branches/2015Q2/security/gnutls/pkg-plist Fri May 22 16:17:04 2015 (r387032) @@ -1,4 +1,5 @@ bin/certtool +%%LIBDANE%%bin/danetool bin/gnutls-cli bin/gnutls-cli-debug bin/gnutls-serv @@ -33,10 +34,9 @@ info/gnutls-modauth.png info/gnutls-pgp.png info/gnutls-x509.png info/pkcs11-vision.png -%%LIBDANE%%lib/libgnutls-dane.a %%LIBDANE%%lib/libgnutls-dane.so %%LIBDANE%%lib/libgnutls-dane.so.0 -%%LIBDANE%%lib/libgnutls-dane.so.0.4.1 +%%LIBDANE%%lib/libgnutls-dane.so.0.5.0 lib/libgnutls-openssl.so lib/libgnutls-openssl.so.27 lib/libgnutls-openssl.so.27.0.2 From owner-svn-ports-branches@FreeBSD.ORG Fri May 22 22:12:13 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C5144D53; Fri, 22 May 2015 22:12:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B1CAF1539; Fri, 22 May 2015 22:12:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4MMCDGL004732; Fri, 22 May 2015 22:12:13 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4MMCBYX004725; Fri, 22 May 2015 22:12:11 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201505222212.t4MMCBYX004725@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 22 May 2015 22:12:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387085 - in branches/2015Q2: databases/php56-odbc/files databases/php56-pdo_sqlite databases/php56-sqlite3 lang/php56 security/php56-mcrypt textproc/php56-pspell X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 May 2015 22:12:13 -0000 Author: delphij Date: Fri May 22 22:12:11 2015 New Revision: 387085 URL: https://svnweb.freebsd.org/changeset/ports/387085 Log: MFH: r384787 (ale) Update to 5.6.8 release. PR: 199585 Submitted by: Franco Fichtner Approved by: ports-secteam Modified: branches/2015Q2/databases/php56-odbc/files/patch-config.m4 branches/2015Q2/databases/php56-pdo_sqlite/Makefile branches/2015Q2/databases/php56-sqlite3/Makefile branches/2015Q2/lang/php56/Makefile branches/2015Q2/lang/php56/distinfo branches/2015Q2/security/php56-mcrypt/Makefile branches/2015Q2/textproc/php56-pspell/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/databases/php56-odbc/files/patch-config.m4 ============================================================================== --- branches/2015Q2/databases/php56-odbc/files/patch-config.m4 Fri May 22 21:55:32 2015 (r387084) +++ branches/2015Q2/databases/php56-odbc/files/patch-config.m4 Fri May 22 22:12:11 2015 (r387085) @@ -1,5 +1,5 @@ ---- config.m4.orig 2015-03-19 00:19:30.000000000 +0000 -+++ config.m4 2015-04-01 08:21:21.242902661 +0000 +--- config.m4.orig 2015-04-15 18:05:57.000000000 +0000 ++++ config.m4 2015-04-26 12:08:54.914235064 +0000 @@ -100,13 +100,17 @@ dnl configure options dnl @@ -17,113 +17,113 @@ -[ --with-adabas[=DIR] Include Adabas D support [/usr/local]]) +[ --with-adabas[=DIR] Include Adabas D support [/usr/local]], no, no) + AC_MSG_CHECKING([for Adabas support]) if test "$PHP_ADABAS" != "no"; then - AC_MSG_CHECKING([for Adabas support]) -@@ -133,7 +137,7 @@ +@@ -135,7 +139,7 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(sapdb,, -[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]]) +[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]], no, no) + AC_MSG_CHECKING([for SAP DB support]) if test "$PHP_SAPDB" != "no"; then - AC_MSG_CHECKING([for SAP DB support]) -@@ -151,7 +155,7 @@ +@@ -155,7 +159,7 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(solid,, -[ --with-solid[=DIR] Include Solid support [/usr/local/solid]]) +[ --with-solid[=DIR] Include Solid support [/usr/local/solid]], no, no) + AC_MSG_CHECKING(for Solid support) if test "$PHP_SOLID" != "no"; then - AC_MSG_CHECKING(for Solid support) -@@ -176,7 +180,7 @@ +@@ -182,7 +186,7 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(ibm-db2,, -[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]]) +[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]], no, no) + AC_MSG_CHECKING(for IBM DB2 support) if test "$PHP_IBM_DB2" != "no"; then - AC_MSG_CHECKING(for IBM DB2 support) -@@ -213,7 +217,7 @@ +@@ -221,7 +225,7 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(ODBCRouter,, -[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]]) +[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]], no, no) + AC_MSG_CHECKING(for ODBCRouter.com support) if test "$PHP_ODBCROUTER" != "no"; then - AC_MSG_CHECKING(for ODBCRouter.com support) -@@ -234,7 +238,7 @@ +@@ -244,7 +248,7 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(empress,, [ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH] - (Empress Version >= 8.60 required)]) + (Empress Version >= 8.60 required)], no, no) + AC_MSG_CHECKING(for Empress support) if test "$PHP_EMPRESS" != "no"; then - AC_MSG_CHECKING(for Empress support) -@@ -258,7 +262,7 @@ +@@ -270,7 +274,7 @@ PHP_ARG_WITH(empress-bcs,, [ --with-empress-bcs[=DIR] Include Empress Local Access support [\$EMPRESSPATH] - (Empress Version >= 8.60 required)]) + (Empress Version >= 8.60 required)], no, no) + AC_MSG_CHECKING(for Empress local access support) if test "$PHP_EMPRESS_BCS" != "no"; then - AC_MSG_CHECKING(for Empress local access support) -@@ -296,7 +300,7 @@ +@@ -310,7 +314,7 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(birdstep,, -[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]]) +[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]], no, no) + AC_MSG_CHECKING(for Birdstep support) if test "$PHP_BIRDSTEP" != "no"; then - AC_MSG_CHECKING(for Birdstep support) -@@ -350,7 +354,7 @@ +@@ -366,7 +370,7 @@ running this configure script: CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" LDFLAGS=-lunix - CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"]) + CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"], no, no) + AC_MSG_CHECKING(for a custom ODBC support) if test "$PHP_CUSTOM_ODBC" != "no"; then - AC_MSG_CHECKING(for a custom ODBC support) -@@ -370,7 +374,7 @@ +@@ -388,7 +392,7 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(iodbc,, --[ --with-iodbc[=DIR] Include iODBC support]) -+[ --with-iodbc[=DIR] Include iODBC support], no, no) +-[ --with-iodbc[=DIR] Include iODBC support [/usr/local]]) ++[ --with-iodbc[=DIR] Include iODBC support [/usr/local]], no, no) + AC_MSG_CHECKING(for iODBC support) if test "$PHP_IODBC" != "no"; then - AC_MSG_CHECKING(for iODBC support) -@@ -406,7 +410,7 @@ +@@ -426,7 +430,7 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(esoob,, -[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]]) +[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]], no, no) + AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support) if test "$PHP_ESOOB" != "no"; then - AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support) -@@ -426,7 +430,7 @@ +@@ -448,7 +452,7 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(unixODBC,, -[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]]) +[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]], no, no) + AC_MSG_CHECKING(for unixODBC support) if test "$PHP_UNIXODBC" != "no"; then - AC_MSG_CHECKING(for unixODBC support) -@@ -447,7 +451,7 @@ +@@ -471,7 +475,7 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(dbmaker,, -[ --with-dbmaker[=DIR] Include DBMaker support]) +[ --with-dbmaker[=DIR] Include DBMaker support], no, no) + AC_MSG_CHECKING(for DBMaker support) if test "$PHP_DBMAKER" != "no"; then - AC_MSG_CHECKING(for DBMaker support) Modified: branches/2015Q2/databases/php56-pdo_sqlite/Makefile ============================================================================== --- branches/2015Q2/databases/php56-pdo_sqlite/Makefile Fri May 22 21:55:32 2015 (r387084) +++ branches/2015Q2/databases/php56-pdo_sqlite/Makefile Fri May 22 22:12:11 2015 (r387085) @@ -1,7 +1,6 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= databases MASTERDIR= ${.CURDIR}/../../lang/php56 Modified: branches/2015Q2/databases/php56-sqlite3/Makefile ============================================================================== --- branches/2015Q2/databases/php56-sqlite3/Makefile Fri May 22 21:55:32 2015 (r387084) +++ branches/2015Q2/databases/php56-sqlite3/Makefile Fri May 22 22:12:11 2015 (r387085) @@ -1,7 +1,6 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= databases MASTERDIR= ${.CURDIR}/../../lang/php56 Modified: branches/2015Q2/lang/php56/Makefile ============================================================================== --- branches/2015Q2/lang/php56/Makefile Fri May 22 21:55:32 2015 (r387084) +++ branches/2015Q2/lang/php56/Makefile Fri May 22 22:12:11 2015 (r387085) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php56 -PORTVERSION= 5.6.7 +PORTVERSION= 5.6.8 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} Modified: branches/2015Q2/lang/php56/distinfo ============================================================================== --- branches/2015Q2/lang/php56/distinfo Fri May 22 21:55:32 2015 (r387084) +++ branches/2015Q2/lang/php56/distinfo Fri May 22 22:12:11 2015 (r387085) @@ -1,4 +1,4 @@ -SHA256 (php-5.6.7.tar.bz2) = 02954fb74c61a7879d48ebdcd4ecb78aa0056f4215ca9b096232de28eb8f17bc -SIZE (php-5.6.7.tar.bz2) = 13697400 +SHA256 (php-5.6.8.tar.bz2) = 0af0045745d61eeb74a3ea744529a2481b27cb689da720e6c0250675043724e4 +SIZE (php-5.6.8.tar.bz2) = 13724681 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 SIZE (php-5.5.x-mail-header.patch) = 3379 Modified: branches/2015Q2/security/php56-mcrypt/Makefile ============================================================================== --- branches/2015Q2/security/php56-mcrypt/Makefile Fri May 22 21:55:32 2015 (r387084) +++ branches/2015Q2/security/php56-mcrypt/Makefile Fri May 22 22:12:11 2015 (r387085) @@ -1,7 +1,6 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= security MASTERDIR= ${.CURDIR}/../../lang/php56 Modified: branches/2015Q2/textproc/php56-pspell/Makefile ============================================================================== --- branches/2015Q2/textproc/php56-pspell/Makefile Fri May 22 21:55:32 2015 (r387084) +++ branches/2015Q2/textproc/php56-pspell/Makefile Fri May 22 22:12:11 2015 (r387085) @@ -1,7 +1,6 @@ # Created by: Alex Dupre # $FreeBSD$ -PORTREVISION= 1 CATEGORIES= textproc MASTERDIR= ${.CURDIR}/../../lang/php56 From owner-svn-ports-branches@FreeBSD.ORG Fri May 22 23:47:37 2015 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 49056FB; Fri, 22 May 2015 23:47:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1D9211EE0; Fri, 22 May 2015 23:47:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4MNla3u050462; Fri, 22 May 2015 23:47:36 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4MNlaMO050459; Fri, 22 May 2015 23:47:36 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201505222347.t4MNlaMO050459@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Fri, 22 May 2015 23:47:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r387091 - in branches/2015Q2/devel/pcre: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 May 2015 23:47:37 -0000 Author: delphij Date: Fri May 22 23:47:35 2015 New Revision: 387091 URL: https://svnweb.freebsd.org/changeset/ports/387091 Log: MFH: r387090 Security update to 8.37. Security: CVE-2015-2325 Security: CVE-2015-2326 Approved by: ports-secteam Added: branches/2015Q2/devel/pcre/files/ - copied from r387090, head/devel/pcre/files/ Modified: branches/2015Q2/devel/pcre/Makefile branches/2015Q2/devel/pcre/distinfo branches/2015Q2/devel/pcre/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/devel/pcre/Makefile ============================================================================== --- branches/2015Q2/devel/pcre/Makefile Fri May 22 23:46:26 2015 (r387090) +++ branches/2015Q2/devel/pcre/Makefile Fri May 22 23:47:35 2015 (r387091) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pcre -PORTVERSION= 8.35 -PORTREVISION= 2 +PORTVERSION= 8.37 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \ ftp://ftp.csx.cam.ac.uk/pub/software/programming/%SUBDIR%/ \ Modified: branches/2015Q2/devel/pcre/distinfo ============================================================================== --- branches/2015Q2/devel/pcre/distinfo Fri May 22 23:46:26 2015 (r387090) +++ branches/2015Q2/devel/pcre/distinfo Fri May 22 23:47:35 2015 (r387091) @@ -1,2 +1,2 @@ -SHA256 (pcre-8.35.tar.bz2) = a961c1c78befef263cc130756eeca7b674b4e73a81533293df44e4265236865b -SIZE (pcre-8.35.tar.bz2) = 1522220 +SHA256 (pcre-8.37.tar.bz2) = 51679ea8006ce31379fb0860e46dd86665d864b5020fc9cd19e71260eef4789d +SIZE (pcre-8.37.tar.bz2) = 1557603 Modified: branches/2015Q2/devel/pcre/pkg-plist ============================================================================== --- branches/2015Q2/devel/pcre/pkg-plist Fri May 22 23:46:26 2015 (r387090) +++ branches/2015Q2/devel/pcre/pkg-plist Fri May 22 23:47:35 2015 (r387091) @@ -10,24 +10,24 @@ include/pcrecpp.h lib/libpcre.a lib/libpcre.so lib/libpcre.so.1 -lib/libpcre.so.1.2.3 +lib/libpcre.so.1.2.5 lib/libpcre.so.3 lib/libpcre16.a lib/libpcre16.so lib/libpcre16.so.0 -lib/libpcre16.so.0.2.3 +lib/libpcre16.so.0.2.5 lib/libpcre32.a lib/libpcre32.so lib/libpcre32.so.0 -lib/libpcre32.so.0.0.3 +lib/libpcre32.so.0.0.5 lib/libpcrecpp.a lib/libpcrecpp.so lib/libpcrecpp.so.0 -lib/libpcrecpp.so.0.0.0 +lib/libpcrecpp.so.0.0.1 lib/libpcreposix.a lib/libpcreposix.so lib/libpcreposix.so.0 -lib/libpcreposix.so.0.0.2 +lib/libpcreposix.so.0.0.3 libdata/pkgconfig/libpcre.pc libdata/pkgconfig/libpcre16.pc libdata/pkgconfig/libpcre32.pc