From owner-svn-ports-branches@FreeBSD.ORG Sun Jun 7 20:52: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 37C7C50C; Sun, 7 Jun 2015 20:52:19 +0000 (UTC) (envelope-from delphij@FreeBSD.org) 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 1A74611C0; Sun, 7 Jun 2015 20:52:19 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t57KqI8r099411; Sun, 7 Jun 2015 20:52:18 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t57KqIHQ099408; Sun, 7 Jun 2015 20:52:18 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201506072052.t57KqIHQ099408@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Sun, 7 Jun 2015 20:52:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r388778 - 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: Sun, 07 Jun 2015 20:52:19 -0000 Author: delphij Date: Sun Jun 7 20:52:17 2015 New Revision: 388778 URL: https://svnweb.freebsd.org/changeset/ports/388778 Log: MFH: r388777 Apply upstream fixes of several buffer overflow issues: r1555 Fix forward reference offset bug. r1556 Fix forward referencing bugs. r1557 Fix buffer overflow for repeated conditional when referencing a duplicate name. r1558 Fix buffer overflow for named recursive back reference when the name is duplicated. r1559 Fix named forward reference to duplicate group number overflow bug. r1560 Fix buffer overflow for lookbehind within mutually recursive subroutines. r1562 Fix another buffer overflow. Note that regression tests were not included in this patchset, however the actual test cases have been run against both old and new code to make sure that the issues were fixed properly. Obtained from: PCRE svn (revisions detalied above) Security: CVE-2015-3210, CVE-2015-3217 Approved by: ports-secteam@ Added: branches/2015Q2/devel/pcre/files/patch-buffer-overflow - copied unchanged from r388777, head/devel/pcre/files/patch-buffer-overflow Modified: branches/2015Q2/devel/pcre/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/devel/pcre/Makefile ============================================================================== --- branches/2015Q2/devel/pcre/Makefile Sun Jun 7 20:50:41 2015 (r388777) +++ branches/2015Q2/devel/pcre/Makefile Sun Jun 7 20:52:17 2015 (r388778) @@ -3,6 +3,7 @@ PORTNAME= pcre PORTVERSION= 8.37 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \ ftp://ftp.csx.cam.ac.uk/pub/software/programming/%SUBDIR%/ \ Copied: branches/2015Q2/devel/pcre/files/patch-buffer-overflow (from r388777, head/devel/pcre/files/patch-buffer-overflow) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/devel/pcre/files/patch-buffer-overflow Sun Jun 7 20:52:17 2015 (r388778, copy of r388777, head/devel/pcre/files/patch-buffer-overflow) @@ -0,0 +1,296 @@ +--- pcre_compile.c.orig 2015-04-13 15:54:01 UTC ++++ pcre_compile.c +@@ -1799,7 +1799,7 @@ for (;;) + case OP_ASSERTBACK: + case OP_ASSERTBACK_NOT: + do cc += GET(cc, 1); while (*cc == OP_ALT); +- cc += PRIV(OP_lengths)[*cc]; ++ cc += 1 + LINK_SIZE; + break; + + /* Skip over things that don't match chars */ +@@ -3985,11 +3985,12 @@ have their offsets adjusted. That one of + is called, the partially compiled regex must be temporarily terminated with + OP_END. + +-This function has been extended with the possibility of forward references for +-recursions and subroutine calls. It must also check the list of such references +-for the group we are dealing with. If it finds that one of the recursions in +-the current group is on this list, it adjusts the offset in the list, not the +-value in the reference (which is a group number). ++This function has been extended to cope with forward references for recursions ++and subroutine calls. It must check the list of such references for the ++group we are dealing with. If it finds that one of the recursions in the ++current group is on this list, it does not adjust the value in the reference ++(which is a group number). After the group has been scanned, all the offsets in ++the forward reference list for the group are adjusted. + + Arguments: + group points to the start of the group +@@ -4005,29 +4006,21 @@ static void + adjust_recurse(pcre_uchar *group, int adjust, BOOL utf, compile_data *cd, + size_t save_hwm_offset) + { ++int offset; ++pcre_uchar *hc; + pcre_uchar *ptr = group; + + while ((ptr = (pcre_uchar *)find_recurse(ptr, utf)) != NULL) + { +- int offset; +- pcre_uchar *hc; +- +- /* See if this recursion is on the forward reference list. If so, adjust the +- reference. */ +- + for (hc = (pcre_uchar *)cd->start_workspace + save_hwm_offset; hc < cd->hwm; + hc += LINK_SIZE) + { + offset = (int)GET(hc, 0); +- if (cd->start_code + offset == ptr + 1) +- { +- PUT(hc, 0, offset + adjust); +- break; +- } ++ if (cd->start_code + offset == ptr + 1) break; + } + +- /* Otherwise, adjust the recursion offset if it's after the start of this +- group. */ ++ /* If we have not found this recursion on the forward reference list, adjust ++ the recursion's offset if it's after the start of this group. */ + + if (hc >= cd->hwm) + { +@@ -4037,6 +4030,15 @@ while ((ptr = (pcre_uchar *)find_recurse + + ptr += 1 + LINK_SIZE; + } ++ ++/* Now adjust all forward reference offsets for the group. */ ++ ++for (hc = (pcre_uchar *)cd->start_workspace + save_hwm_offset; hc < cd->hwm; ++ hc += LINK_SIZE) ++ { ++ offset = (int)GET(hc, 0); ++ PUT(hc, 0, offset + adjust); ++ } + } + + +@@ -4465,7 +4467,7 @@ const pcre_uchar *tempptr; + const pcre_uchar *nestptr = NULL; + pcre_uchar *previous = NULL; + pcre_uchar *previous_callout = NULL; +-size_t save_hwm_offset = 0; ++size_t item_hwm_offset = 0; + pcre_uint8 classbits[32]; + + /* We can fish out the UTF-8 setting once and for all into a BOOL, but we +@@ -4767,6 +4769,7 @@ for (;; ptr++) + zeroreqchar = reqchar; + zeroreqcharflags = reqcharflags; + previous = code; ++ item_hwm_offset = cd->hwm - cd->start_workspace; + *code++ = ((options & PCRE_DOTALL) != 0)? OP_ALLANY: OP_ANY; + break; + +@@ -4818,6 +4821,7 @@ for (;; ptr++) + /* Handle a real character class. */ + + previous = code; ++ item_hwm_offset = cd->hwm - cd->start_workspace; + + /* PCRE supports POSIX class stuff inside a class. Perl gives an error if + they are encountered at the top level, so we'll do that too. */ +@@ -5930,7 +5934,7 @@ for (;; ptr++) + { + register int i; + int len = (int)(code - previous); +- size_t base_hwm_offset = save_hwm_offset; ++ size_t base_hwm_offset = item_hwm_offset; + pcre_uchar *bralink = NULL; + pcre_uchar *brazeroptr = NULL; + +@@ -5985,7 +5989,7 @@ for (;; ptr++) + if (repeat_max <= 1) /* Covers 0, 1, and unlimited */ + { + *code = OP_END; +- adjust_recurse(previous, 1, utf, cd, save_hwm_offset); ++ adjust_recurse(previous, 1, utf, cd, item_hwm_offset); + memmove(previous + 1, previous, IN_UCHARS(len)); + code++; + if (repeat_max == 0) +@@ -6009,7 +6013,7 @@ for (;; ptr++) + { + int offset; + *code = OP_END; +- adjust_recurse(previous, 2 + LINK_SIZE, utf, cd, save_hwm_offset); ++ adjust_recurse(previous, 2 + LINK_SIZE, utf, cd, item_hwm_offset); + memmove(previous + 2 + LINK_SIZE, previous, IN_UCHARS(len)); + code += 2 + LINK_SIZE; + *previous++ = OP_BRAZERO + repeat_type; +@@ -6267,7 +6271,7 @@ for (;; ptr++) + { + int nlen = (int)(code - bracode); + *code = OP_END; +- adjust_recurse(bracode, 1 + LINK_SIZE, utf, cd, save_hwm_offset); ++ adjust_recurse(bracode, 1 + LINK_SIZE, utf, cd, item_hwm_offset); + memmove(bracode + 1 + LINK_SIZE, bracode, IN_UCHARS(nlen)); + code += 1 + LINK_SIZE; + nlen += 1 + LINK_SIZE; +@@ -6401,7 +6405,7 @@ for (;; ptr++) + else + { + *code = OP_END; +- adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, save_hwm_offset); ++ adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, item_hwm_offset); + memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len)); + code += 1 + LINK_SIZE; + len += 1 + LINK_SIZE; +@@ -6450,7 +6454,7 @@ for (;; ptr++) + + default: + *code = OP_END; +- adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, save_hwm_offset); ++ adjust_recurse(tempcode, 1 + LINK_SIZE, utf, cd, item_hwm_offset); + memmove(tempcode + 1 + LINK_SIZE, tempcode, IN_UCHARS(len)); + code += 1 + LINK_SIZE; + len += 1 + LINK_SIZE; +@@ -6623,7 +6627,7 @@ for (;; ptr++) + newoptions = options; + skipbytes = 0; + bravalue = OP_CBRA; +- save_hwm_offset = cd->hwm - cd->start_workspace; ++ item_hwm_offset = cd->hwm - cd->start_workspace; + reset_bracount = FALSE; + + /* Deal with the extended parentheses; all are introduced by '?', and the +@@ -6769,7 +6773,7 @@ for (;; ptr++) + ptr++; + } + namelen = (int)(ptr - name); +- if (lengthptr != NULL) *lengthptr += IMM2_SIZE; ++ if (lengthptr != NULL) skipbytes += IMM2_SIZE; + } + + /* Check the terminator */ +@@ -7173,14 +7177,26 @@ for (;; ptr++) + number. If the name is not found, set the value to 0 for a forward + reference. */ + ++ recno = 0; + ng = cd->named_groups; + for (i = 0; i < cd->names_found; i++, ng++) + { + if (namelen == ng->length && + STRNCMP_UC_UC(name, ng->name, namelen) == 0) +- break; ++ { ++ open_capitem *oc; ++ recno = ng->number; ++ if (is_recurse) break; ++ for (oc = cd->open_caps; oc != NULL; oc = oc->next) ++ { ++ if (oc->number == recno) ++ { ++ oc->flag = TRUE; ++ break; ++ } ++ } ++ } + } +- recno = (i < cd->names_found)? ng->number : 0; + + /* Count named back references. */ + +@@ -7191,6 +7207,19 @@ for (;; ptr++) + 16-bit data item. */ + + *lengthptr += IMM2_SIZE; ++ ++ /* If this is a forward reference and we are within a (?|...) group, ++ the reference may end up as the number of a group which we are ++ currently inside, that is, it could be a recursive reference. In the ++ real compile this will be picked up and the reference wrapped with ++ OP_ONCE to make it atomic, so we must space in case this occurs. */ ++ ++ /* In fact, this can happen for a non-forward reference because ++ another group with the same number might be created later. This ++ issue is fixed "properly" in PCRE2. As PCRE1 is now in maintenance ++ only mode, we finesse the bug by allowing more memory always. */ ++ ++ /* if (recno == 0) */ *lengthptr += 2 + 2*LINK_SIZE; + } + + /* In the real compile, search the name table. We check the name +@@ -7247,6 +7276,7 @@ for (;; ptr++) + { + if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE; + previous = code; ++ item_hwm_offset = cd->hwm - cd->start_workspace; + *code++ = ((options & PCRE_CASELESS) != 0)? OP_DNREFI : OP_DNREF; + PUT2INC(code, 0, index); + PUT2INC(code, 0, count); +@@ -7360,6 +7390,7 @@ for (;; ptr++) + HANDLE_RECURSION: + + previous = code; ++ item_hwm_offset = cd->hwm - cd->start_workspace; + called = cd->start_code; + + /* When we are actually compiling, find the bracket that is being +@@ -7561,7 +7592,11 @@ for (;; ptr++) + previous = NULL; + cd->iscondassert = FALSE; + } +- else previous = code; ++ else ++ { ++ previous = code; ++ item_hwm_offset = cd->hwm - cd->start_workspace; ++ } + + *code = bravalue; + tempcode = code; +@@ -7809,7 +7844,7 @@ for (;; ptr++) + const pcre_uchar *p; + pcre_uint32 cf; + +- save_hwm_offset = cd->hwm - cd->start_workspace; /* Normally this is set when '(' is read */ ++ item_hwm_offset = cd->hwm - cd->start_workspace; /* Normally this is set when '(' is read */ + terminator = (*(++ptr) == CHAR_LESS_THAN_SIGN)? + CHAR_GREATER_THAN_SIGN : CHAR_APOSTROPHE; + +@@ -7877,6 +7912,7 @@ for (;; ptr++) + HANDLE_REFERENCE: + if (firstcharflags == REQ_UNSET) firstcharflags = REQ_NONE; + previous = code; ++ item_hwm_offset = cd->hwm - cd->start_workspace; + *code++ = ((options & PCRE_CASELESS) != 0)? OP_REFI : OP_REF; + PUT2INC(code, 0, recno); + cd->backref_map |= (recno < 32)? (1 << recno) : 1; +@@ -7906,6 +7942,7 @@ for (;; ptr++) + if (!get_ucp(&ptr, &negated, &ptype, &pdata, errorcodeptr)) + goto FAILED; + previous = code; ++ item_hwm_offset = cd->hwm - cd->start_workspace; + *code++ = ((escape == ESC_p) != negated)? OP_PROP : OP_NOTPROP; + *code++ = ptype; + *code++ = pdata; +@@ -7946,6 +7983,7 @@ for (;; ptr++) + + { + previous = (escape > ESC_b && escape < ESC_Z)? code : NULL; ++ item_hwm_offset = cd->hwm - cd->start_workspace; + *code++ = (!utf && escape == ESC_C)? OP_ALLANY : escape; + } + } +@@ -7989,6 +8027,7 @@ for (;; ptr++) + + ONE_CHAR: + previous = code; ++ item_hwm_offset = cd->hwm - cd->start_workspace; + + /* For caseless UTF-8 mode when UCP support is available, check whether + this character has more than one other case. If so, generate a special From owner-svn-ports-branches@FreeBSD.ORG Mon Jun 8 02:32:50 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 384D1E9A; Mon, 8 Jun 2015 02:32:50 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) 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 264B61001; Mon, 8 Jun 2015 02:32:50 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t582WooA072729; Mon, 8 Jun 2015 02:32:50 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t582Wn3x072727; Mon, 8 Jun 2015 02:32:49 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201506080232.t582Wn3x072727@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Mon, 8 Jun 2015 02:32:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r388826 - branches/2015Q2/www/py-django 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, 08 Jun 2015 02:32:50 -0000 Author: lwhsu Date: Mon Jun 8 02:32:49 2015 New Revision: 388826 URL: https://svnweb.freebsd.org/changeset/ports/388826 Log: MFH: r388118 - Update to 1.8.2 PR: 200543 Submitted by: Jason Unovitch Security: 48504af7-07ad-11e5-879c-00e0814cab4e Approved by: ports-secteam (delphij) Modified: branches/2015Q2/www/py-django/Makefile branches/2015Q2/www/py-django/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/www/py-django/Makefile ============================================================================== --- branches/2015Q2/www/py-django/Makefile Mon Jun 8 01:43:23 2015 (r388825) +++ branches/2015Q2/www/py-django/Makefile Mon Jun 8 02:32:49 2015 (r388826) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django -PORTVERSION= 1.7.7 +PORTVERSION= 1.8.2 CATEGORIES= www python MASTER_SITES= https://www.djangoproject.com/m/releases/${PORTVERSION}/ \ CHEESESHOP Modified: branches/2015Q2/www/py-django/distinfo ============================================================================== --- branches/2015Q2/www/py-django/distinfo Mon Jun 8 01:43:23 2015 (r388825) +++ branches/2015Q2/www/py-django/distinfo Mon Jun 8 02:32:49 2015 (r388826) @@ -1,2 +1,2 @@ -SHA256 (python/Django-1.7.7.tar.gz) = 4816f892063569ca9a77584fa23cb4995c1b3b954ef875102a8219229cbd2e33 -SIZE (python/Django-1.7.7.tar.gz) = 7603286 +SHA256 (python/Django-1.8.2.tar.gz) = 3bb60536b2fb2084612fc9486634295e7208790029081842524916b5a66d206f +SIZE (python/Django-1.8.2.tar.gz) = 7275112 From owner-svn-ports-branches@FreeBSD.ORG Mon Jun 8 02:35:50 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 9CEB9183; Mon, 8 Jun 2015 02:35:50 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) 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 8AE511050; Mon, 8 Jun 2015 02:35:50 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t582Zodl073357; Mon, 8 Jun 2015 02:35:50 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t582Zo8r073355; Mon, 8 Jun 2015 02:35:50 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201506080235.t582Zo8r073355@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Mon, 8 Jun 2015 02:35:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r388827 - branches/2015Q2/www/py-django-devel 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, 08 Jun 2015 02:35:50 -0000 Author: lwhsu Date: Mon Jun 8 02:35:49 2015 New Revision: 388827 URL: https://svnweb.freebsd.org/changeset/ports/388827 Log: MFH: r388120 - Update to snapshot 20150531 PR: 200543 Submitted by: Jason Unovitch Security: 48504af7-07ad-11e5-879c-00e0814cab4e Approved by: ports-secteam (delphij) Modified: branches/2015Q2/www/py-django-devel/Makefile branches/2015Q2/www/py-django-devel/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/www/py-django-devel/Makefile ============================================================================== --- branches/2015Q2/www/py-django-devel/Makefile Mon Jun 8 02:32:49 2015 (r388826) +++ branches/2015Q2/www/py-django-devel/Makefile Mon Jun 8 02:35:49 2015 (r388827) @@ -14,14 +14,13 @@ COMMENT= High-level Python Web framework LICENSE= BSD3CLAUSE -SNAPSHOTDATE= 20150326 +SNAPSHOTDATE= 20150531 USES= cpe gettext python USE_GITHUB= yes USE_PYTHON= autoplist distutils -GH_ACCOUNT= ${PORTNAME} -GH_TAGNAME= 3e64f3d +GH_TAGNAME= c954931 GH_COMMIT= ${GH_TAGNAME} CONFLICTS= py2[0-9]-django-[0-9]* Modified: branches/2015Q2/www/py-django-devel/distinfo ============================================================================== --- branches/2015Q2/www/py-django-devel/distinfo Mon Jun 8 02:32:49 2015 (r388826) +++ branches/2015Q2/www/py-django-devel/distinfo Mon Jun 8 02:35:49 2015 (r388827) @@ -1,2 +1,2 @@ -SHA256 (python/Django-20150326.tar.gz) = 7e1cbf533d845a572b3579eb04d48f38a274992936a2d22ab686c5c2a25bdb5e -SIZE (python/Django-20150326.tar.gz) = 7482543 +SHA256 (python/django-django-20150531-c954931_GH0.tar.gz) = bd1fee340007cd2745d21b05d9fbfb3811b02f64ab361e2241d365fc9ceff352 +SIZE (python/django-django-20150531-c954931_GH0.tar.gz) = 6896535 From owner-svn-ports-branches@FreeBSD.ORG Mon Jun 8 18:16:59 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 D5C64C1F; Mon, 8 Jun 2015 18:16:59 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: from mail-wi0-x235.google.com (mail-wi0-x235.google.com [IPv6:2a00:1450:400c:c05::235]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6EA351938; Mon, 8 Jun 2015 18:16:59 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: by wibdq8 with SMTP id dq8so94199415wib.1; Mon, 08 Jun 2015 11:16:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=YVC5IRVCHGSND3FkhnMaN7uqof/Lr5AjNVuRjfL30Wk=; b=SAlcF3fIufCo3OF2DFZxZitNmspuRWpVrNkCpvdEawZ//dpbk7jUmIFiexrkpjxVSv snxgz900+NQHRBmTP2Clh7lvtDeb3DVw+rngPnaChEeqn7BB+kGBybOaDocaFs3pU97S gOBZC2Pj5WA6NyVEV3DO9451bxNtTSW0/2Uzs3/yGJvephjnvMrfEOPszGRpPOtzupkC yHYXfX5BdQ7dHQGBY5P5NzVuLUnt2cQ8c9bN05BuWmy+rBAebUcqlOqHNx3B9WQBzPY3 kY4diqHMyJo9KewNMiDEGmPMS9X9SbGKPzj6+G/9iRx9llov7sZg0fO0wdkO4L9Y/6M3 SomA== MIME-Version: 1.0 X-Received: by 10.180.106.73 with SMTP id gs9mr24169847wib.1.1433787417961; Mon, 08 Jun 2015 11:16:57 -0700 (PDT) Sender: antoine.brodin.freebsd@gmail.com Received: by 10.194.17.130 with HTTP; Mon, 8 Jun 2015 11:16:57 -0700 (PDT) In-Reply-To: <201506080232.t582Wn3x072727@svn.freebsd.org> References: <201506080232.t582Wn3x072727@svn.freebsd.org> Date: Mon, 8 Jun 2015 20:16:57 +0200 X-Google-Sender-Auth: xtFlH-L8ZlfCWoaOVQUAL0NiQ3Y Message-ID: Subject: Re: svn commit: r388826 - branches/2015Q2/www/py-django From: Antoine Brodin To: Li-Wen Hsu Cc: "ports-committers@freebsd.org" , "svn-ports-all@freebsd.org" , svn-ports-branches@freebsd.org Content-Type: text/plain; charset=UTF-8 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, 08 Jun 2015 18:17:00 -0000 On Mon, Jun 8, 2015 at 4:32 AM, Li-Wen Hsu wrote: > Author: lwhsu > Date: Mon Jun 8 02:32:49 2015 > New Revision: 388826 > URL: https://svnweb.freebsd.org/changeset/ports/388826 > > Log: > MFH: r388118 > > - Update to 1.8.2 > > PR: 200543 > Submitted by: Jason Unovitch > Security: 48504af7-07ad-11e5-879c-00e0814cab4e > > Approved by: ports-secteam (delphij) > > Modified: > branches/2015Q2/www/py-django/Makefile > branches/2015Q2/www/py-django/distinfo > Directory Properties: > branches/2015Q2/ (props changed) Hi, Just a reminder, blankets/approvals doesn't preclude you from testing your changes (yay, py-django is now broken in the quarterly branch) Cheers, Antoine From owner-svn-ports-branches@FreeBSD.ORG Tue Jun 9 19:57:06 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 E8EA3E25; Tue, 9 Jun 2015 19:57:05 +0000 (UTC) (envelope-from garga@FreeBSD.org) 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 D60D310D4; Tue, 9 Jun 2015 19:57:05 +0000 (UTC) (envelope-from garga@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t59Jv5AO085997; Tue, 9 Jun 2015 19:57:05 GMT (envelope-from garga@FreeBSD.org) Received: (from garga@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t59Jv4MY085992; Tue, 9 Jun 2015 19:57:04 GMT (envelope-from garga@FreeBSD.org) Message-Id: <201506091957.t59Jv4MY085992@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: garga set sender to garga@FreeBSD.org using -f From: Renato Botelho Date: Tue, 9 Jun 2015 19:57:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r388995 - in branches/2015Q2/security/strongswan: . 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, 09 Jun 2015 19:57:06 -0000 Author: garga Date: Tue Jun 9 19:57:04 2015 New Revision: 388995 URL: https://svnweb.freebsd.org/changeset/ports/388995 Log: MFH: r388905 Update to 5.3.2 PR: 200721 Approved by: strongswan@Nanoteq.com (maintainer) Security: CVE-2015-3991 Sponsored by: Netgate Approved by: portmgr (erwin) Added: branches/2015Q2/security/strongswan/files/patch-src_starter_starterstroke.c - copied unchanged from r388905, head/security/strongswan/files/patch-src_starter_starterstroke.c branches/2015Q2/security/strongswan/files/patch-src_stroke_stroke.c - copied unchanged from r388905, head/security/strongswan/files/patch-src_stroke_stroke.c Modified: branches/2015Q2/security/strongswan/Makefile branches/2015Q2/security/strongswan/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/security/strongswan/Makefile ============================================================================== --- branches/2015Q2/security/strongswan/Makefile Tue Jun 9 19:53:01 2015 (r388994) +++ branches/2015Q2/security/strongswan/Makefile Tue Jun 9 19:57:04 2015 (r388995) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= strongswan -PORTVERSION= 5.3.0 +PORTVERSION= 5.3.2 CATEGORIES= security MASTER_SITES= http://download.strongswan.org/ \ http://download2.strongswan.org/ Modified: branches/2015Q2/security/strongswan/distinfo ============================================================================== --- branches/2015Q2/security/strongswan/distinfo Tue Jun 9 19:53:01 2015 (r388994) +++ branches/2015Q2/security/strongswan/distinfo Tue Jun 9 19:57:04 2015 (r388995) @@ -1,2 +1,2 @@ -SHA256 (strongswan-5.3.0.tar.bz2) = 824da31a1ff89ac2500d56705e6f9ce06fe5260f9caaeb1da35ea13a8691d284 -SIZE (strongswan-5.3.0.tar.bz2) = 4263420 +SHA256 (strongswan-5.3.2.tar.bz2) = a4a9bc8c4e42bdc4366a87a05a02bf9f425169a7ab0c6f4482d347e44acbf225 +SIZE (strongswan-5.3.2.tar.bz2) = 4320601 Copied: branches/2015Q2/security/strongswan/files/patch-src_starter_starterstroke.c (from r388905, head/security/strongswan/files/patch-src_starter_starterstroke.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/security/strongswan/files/patch-src_starter_starterstroke.c Tue Jun 9 19:57:04 2015 (r388995, copy of r388905, head/security/strongswan/files/patch-src_starter_starterstroke.c) @@ -0,0 +1,10 @@ +--- src/starter/starterstroke.c.orig 2015-06-09 09:46:26 UTC ++++ src/starter/starterstroke.c +@@ -16,6 +16,7 @@ + + #include + #include ++#include + #include + + #include Copied: branches/2015Q2/security/strongswan/files/patch-src_stroke_stroke.c (from r388905, head/security/strongswan/files/patch-src_stroke_stroke.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/security/strongswan/files/patch-src_stroke_stroke.c Tue Jun 9 19:57:04 2015 (r388995, copy of r388905, head/security/strongswan/files/patch-src_stroke_stroke.c) @@ -0,0 +1,10 @@ +--- src/stroke/stroke.c.orig 2015-06-09 09:46:03 UTC ++++ src/stroke/stroke.c +@@ -17,6 +17,7 @@ + #include + #include + #include ++#include + #include + #include + From owner-svn-ports-branches@FreeBSD.ORG Tue Jun 9 23:23:31 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 EBEDFF97; Tue, 9 Jun 2015 23:23:31 +0000 (UTC) (envelope-from delphij@FreeBSD.org) 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 D83CE1668; Tue, 9 Jun 2015 23:23:31 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t59NNV05090574; Tue, 9 Jun 2015 23:23:31 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t59NNTQ6090558; Tue, 9 Jun 2015 23:23:29 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201506092323.t59NNTQ6090558@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 9 Jun 2015 23:23:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r389009 - in branches/2015Q2/print/cups-base: . 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, 09 Jun 2015 23:23:32 -0000 Author: delphij Date: Tue Jun 9 23:23:28 2015 New Revision: 389009 URL: https://svnweb.freebsd.org/changeset/ports/389009 Log: MFH: r389006 Security update to 2.0.3. Approved by: ports-secteam Added: branches/2015Q2/print/cups-base/files/patch-data_cups.pam - copied unchanged from r389006, head/print/cups-base/files/patch-data_cups.pam branches/2015Q2/print/cups-base/files/patch-scheduler_Makefile - copied unchanged from r389006, head/print/cups-base/files/patch-scheduler_Makefile Deleted: branches/2015Q2/print/cups-base/files/patch-cups-cups.h branches/2015Q2/print/cups-base/files/patch-cups.pam branches/2015Q2/print/cups-base/files/patch-scheduler__dirsvc.c Modified: branches/2015Q2/print/cups-base/Makefile branches/2015Q2/print/cups-base/distinfo branches/2015Q2/print/cups-base/files/patch-conf-Makefile branches/2015Q2/print/cups-base/files/patch-configure branches/2015Q2/print/cups-base/files/patch-data-Makefile branches/2015Q2/print/cups-base/files/patch-scheduler__auth.c branches/2015Q2/print/cups-base/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/print/cups-base/Makefile ============================================================================== --- branches/2015Q2/print/cups-base/Makefile Tue Jun 9 23:17:10 2015 (r389008) +++ branches/2015Q2/print/cups-base/Makefile Tue Jun 9 23:23:28 2015 (r389009) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cups -PORTVERSION= 1.7.3 +PORTVERSION= 2.0.3 DISTVERSIONSUFFIX= -source #PORTREVISION= defined further CATEGORIES= print @@ -55,18 +55,18 @@ OPTIONS_SINGLE_SSL= GNUTLS OPENSSL OPTIONS_DEFAULT= OPENSSL OPTIONS_SUB= yes .if defined(CUPS_CLIENT) -PORTREVISION= 4 +PORTREVISION= 0 LICENSE= LGPL21 CUPS_SUFFIX= -client OPTIONS_RADIO= ZEROCONF OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER OPTIONS_DEFAULT+= MDNSRESPONDER .elif defined(CUPS_IMAGE) -PORTREVISION= 3 +PORTREVISION= 0 CUPS_SUFFIX= -image LICENSE= LGPL21 .else -PORTREVISION= 4 +PORTREVISION= 0 CUPS_SUFFIX= -base # No DOCS option. Files are needed by web interface. OPTIONS_DEFINE= DBUS ICONS LIBPAPER LIBUSB PAM XDG_OPEN @@ -187,8 +187,10 @@ RUN_DEPENDS+= xdg-open:${PORTSDIR}/deve . if ${PORT_OPTIONS:MLIBUSB} CONFIGURE_ARGS+= --enable-libusb +PLIST_SUB+= LIBUSB="" . else CONFIGURE_ARGS+= --disable-libusb +PLIST_SUB+= LIBUSB="@comment " . endif . if ${PORT_OPTIONS:MICONS} Modified: branches/2015Q2/print/cups-base/distinfo ============================================================================== --- branches/2015Q2/print/cups-base/distinfo Tue Jun 9 23:17:10 2015 (r389008) +++ branches/2015Q2/print/cups-base/distinfo Tue Jun 9 23:23:28 2015 (r389009) @@ -1,2 +1,2 @@ -SHA256 (cups-1.7.3-source.tar.bz2) = fa989f856d1499169dc442fb2311053ea42fe455ca2721693ba5a9fe4b333e31 -SIZE (cups-1.7.3-source.tar.bz2) = 8792641 +SHA256 (cups-2.0.3-source.tar.bz2) = bc3167048690a7379f29a37d9fbd2143cf0ca033b54eedd9333ddfc4ee258881 +SIZE (cups-2.0.3-source.tar.bz2) = 8797220 Modified: branches/2015Q2/print/cups-base/files/patch-conf-Makefile ============================================================================== --- branches/2015Q2/print/cups-base/files/patch-conf-Makefile Tue Jun 9 23:17:10 2015 (r389008) +++ branches/2015Q2/print/cups-base/files/patch-conf-Makefile Tue Jun 9 23:23:28 2015 (r389009) @@ -1,16 +1,34 @@ ---- conf/Makefile.orig 2011-03-03 00:19:41.555484014 +0100 -+++ conf/Makefile 2011-03-03 00:20:17.791387420 +0100 -@@ -90,10 +90,10 @@ +--- conf/Makefile.orig 2013-05-29 11:51:34 UTC ++++ conf/Makefile +@@ -77,7 +77,7 @@ install-data: + $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \ + fi ; \ + done +- $(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.default ++ $(INSTALL_CONFIG) -g $(CUPS_GROUP) cupsd.conf $(SERVERROOT)/cupsd.conf.sample + $(INSTALL_DIR) -m 755 $(DATADIR)/mime + for file in $(REPLACE); do \ + if test -r $(DATADIR)/mime/$$file ; then \ +@@ -90,10 +90,10 @@ install-data: done -if test x$(PAMDIR) != x; then \ $(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \ - if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \ - $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \ -+ if test -r $(BUILDROOT)$(PAMDIR)/cups.default ; then \ -+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.default.N ; \ ++ if test -r $(BUILDROOT)$(PAMDIR)/cups.sample ; then \ ++ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.sample.N ; \ else \ - $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \ -+ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.default ; \ ++ $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.sample ; \ fi ; \ fi +@@ -124,7 +124,7 @@ install-libs: + # + + uninstall: +- for file in $(KEEP) $(REPLACE) cupsd.conf.default; do \ ++ for file in $(KEEP) $(REPLACE) cupsd.conf.sample; do \ + $(RM) $(SERVERROOT)/$$file; \ + done + -$(RMDIR) $(SERVERROOT) Modified: branches/2015Q2/print/cups-base/files/patch-configure ============================================================================== --- branches/2015Q2/print/cups-base/files/patch-configure Tue Jun 9 23:17:10 2015 (r389008) +++ branches/2015Q2/print/cups-base/files/patch-configure Tue Jun 9 23:23:28 2015 (r389009) @@ -1,6 +1,6 @@ ---- ./configure.orig 2014-05-27 14:33:29.000000000 -0400 -+++ ./configure 2014-07-01 13:49:23.000000000 -0400 -@@ -566,6 +566,7 @@ +--- configure.orig 2015-02-09 19:38:35 UTC ++++ configure +@@ -586,6 +586,7 @@ ac_unique_file="cups/cups.h" # Factoring default headers for most tests. ac_includes_default="\ #include @@ -8,16 +8,7 @@ #ifdef HAVE_SYS_TYPES_H # include #endif -@@ -5238,7 +5239,7 @@ - - - if test "x$PKGCONFIG" != x; then -- if test x$enable_libusb = xyes -o $uname != Darwin; then -+ if test x$enable_libusb = xyes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb-1.0" >&5 - $as_echo_n "checking for libusb-1.0... " >&6; } - if $PKGCONFIG --exists libusb-1.0; then -@@ -5249,6 +5250,13 @@ +@@ -5382,6 +5383,13 @@ $as_echo "yes" >&6; } CFLAGS="$CFLAGS `$PKGCONFIG --cflags libusb-1.0`" LIBUSB="`$PKGCONFIG --libs libusb-1.0`" USBQUIRKS="\$(DATADIR)/usb" @@ -31,7 +22,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } -@@ -5527,7 +5535,7 @@ +@@ -5663,7 +5671,7 @@ $as_echo "yes" >&6; } CFLAGS="$CFLAGS `$PKGCONFIG --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE" SERVERLIBS="$SERVERLIBS `$PKGCONFIG --libs dbus-1`" DBUS_NOTIFIER="dbus" @@ -40,3 +31,21 @@ SAVELIBS="$LIBS" LIBS="$LIBS $DBUS_NOTIFIERLIBS" ac_fn_c_check_func "$LINENO" "dbus_message_iter_init_append" "ac_cv_func_dbus_message_iter_init_append" +@@ -8646,7 +8654,7 @@ fi + fi + + # Find the PAM configuration directory, if any... +- for dir in /private/etc/pam.d /etc/pam.d; do ++ for dir in /usr/local/etc/pam.d /etc/pam.d; do + if test -d $dir; then + PAMDIR=$dir + break; +@@ -8899,7 +8907,7 @@ fi + + LARGEFILE="" + if test x$enable_largefile != xno; then +- LARGEFILE="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" ++ LARGEFILE="-D_LARGEFILE_SOURCE " + + if test x$ac_cv_sys_large_files = x1; then + LARGEFILE="$LARGEFILE -D_LARGE_FILES" Modified: branches/2015Q2/print/cups-base/files/patch-data-Makefile ============================================================================== --- branches/2015Q2/print/cups-base/files/patch-data-Makefile Tue Jun 9 23:17:10 2015 (r389008) +++ branches/2015Q2/print/cups-base/files/patch-data-Makefile Tue Jun 9 23:23:28 2015 (r389009) @@ -1,6 +1,6 @@ ---- data/Makefile.orig 2013-05-29 15:51:34.000000000 +0400 -+++ data/Makefile 2013-12-11 17:17:05.670284926 +0400 -@@ -86,14 +86,14 @@ +--- data/Makefile.orig 2013-05-29 11:51:34 UTC ++++ data/Makefile +@@ -86,14 +86,14 @@ install: all install-data install-header # install-data: Copied: branches/2015Q2/print/cups-base/files/patch-data_cups.pam (from r389006, head/print/cups-base/files/patch-data_cups.pam) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/print/cups-base/files/patch-data_cups.pam Tue Jun 9 23:23:28 2015 (r389009, copy of r389006, head/print/cups-base/files/patch-data_cups.pam) @@ -0,0 +1,7 @@ +--- data/cups.pam.orig 2006-06-23 00:14:22 UTC ++++ data/cups.pam +@@ -1,2 +1,2 @@ +-auth required /lib/security/pam_pwdb.so nullok shadow +-account required /lib/security/pam_pwdb.so ++auth include system ++account include system Copied: branches/2015Q2/print/cups-base/files/patch-scheduler_Makefile (from r389006, head/print/cups-base/files/patch-scheduler_Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/print/cups-base/files/patch-scheduler_Makefile Tue Jun 9 23:23:28 2015 (r389009, copy of r389006, head/print/cups-base/files/patch-scheduler_Makefile) @@ -0,0 +1,20 @@ +--- scheduler/Makefile.orig 2014-10-21 11:55:01 UTC ++++ scheduler/Makefile +@@ -172,7 +172,7 @@ install-data: + $(INSTALL_DIR) -m 1770 -g $(CUPS_GROUP) $(REQUESTS)/tmp + echo Creating $(CACHEDIR)... + $(INSTALL_DIR) -m 770 -g $(CUPS_GROUP) $(CACHEDIR) +- if test "x$(INITDIR)" != x; then \ ++ if test "x$(xxINITDIR)" != x; then \ + echo Installing init scripts...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ + $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDIR)/init.d/cups; \ +@@ -184,7 +184,7 @@ install-data: + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/rc0.d; \ + $(LN) ../init.d/cups $(BUILDROOT)$(INITDIR)/rc0.d/K$(RCSTOP)cups; \ + fi +- if test "x$(INITDDIR)" != x; then \ ++ if test "x$(xxINITDDIR)" != x; then \ + echo Installing init script...; \ + $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDDIR); \ + $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR); \ Modified: branches/2015Q2/print/cups-base/files/patch-scheduler__auth.c ============================================================================== --- branches/2015Q2/print/cups-base/files/patch-scheduler__auth.c Tue Jun 9 23:17:10 2015 (r389008) +++ branches/2015Q2/print/cups-base/files/patch-scheduler__auth.c Tue Jun 9 23:23:28 2015 (r389009) @@ -1,20 +1,20 @@ ---- scheduler/auth.c.orig +--- scheduler/auth.c.orig 2014-08-28 15:37:22 UTC +++ scheduler/auth.c -@@ -556,7 +556,7 @@ +@@ -491,7 +491,7 @@ cupsdAuthorize(cupsd_client_t *con) /* I peersize = sizeof(peercred); -# ifdef __APPLE__ +# if defined(__APPLE__) || defined(__FreeBSD__) - if (getsockopt(con->http.fd, 0, LOCAL_PEERCRED, &peercred, &peersize)) + if (getsockopt(httpGetFd(con->http), 0, LOCAL_PEERCRED, &peercred, &peersize)) # else - if (getsockopt(con->http.fd, SOL_SOCKET, SO_PEERCRED, &peercred, &peersize)) -@@ -1155,7 +1155,7 @@ + if (getsockopt(httpGetFd(con->http), SOL_SOCKET, SO_PEERCRED, &peercred, &peersize)) +@@ -953,7 +953,7 @@ cupsdAuthorize(cupsd_client_t *con) /* I peersize = sizeof(peercred); -# ifdef __APPLE__ +# if defined(__APPLE__) || defined(__FreeBSD__) - if (getsockopt(con->http.fd, 0, LOCAL_PEERCRED, &peercred, &peersize)) + if (getsockopt(httpGetFd(con->http), 0, LOCAL_PEERCRED, &peercred, &peersize)) # else - if (getsockopt(con->http.fd, SOL_SOCKET, SO_PEERCRED, &peercred, + if (getsockopt(httpGetFd(con->http), SOL_SOCKET, SO_PEERCRED, &peercred, Modified: branches/2015Q2/print/cups-base/pkg-plist ============================================================================== --- branches/2015Q2/print/cups-base/pkg-plist Tue Jun 9 23:17:10 2015 (r389008) +++ branches/2015Q2/print/cups-base/pkg-plist Tue Jun 9 23:23:28 2015 (r389009) @@ -21,7 +21,6 @@ bin/cupstestppd bin/ipptool bin/lp bin/lpoptions -bin/lppasswd bin/lpq bin/lpr bin/lpr-cups @@ -43,9 +42,7 @@ lib/libcupsmime.so.1 lib/libcupsppdc.so lib/libcupsppdc.so.1 libexec/cups/backend/http -libexec/cups/backend/https libexec/cups/backend/ipp -libexec/cups/backend/ipps libexec/cups/backend/lpd libexec/cups/backend/snmp libexec/cups/backend/socket @@ -70,11 +67,10 @@ libexec/cups/notifier/rss man/man1/cancel.1.gz man/man1/cupstestdsc.1.gz man/man1/cupstestppd.1.gz -@comment man/man1/ippfind.1.gz +man/man1/cups.1.gz man/man1/ipptool.1.gz man/man1/lp.1.gz man/man1/lpoptions.1.gz -man/man1/lppasswd.1.gz man/man1/lpq.1.gz man/man1/lpr.1.gz man/man1/lprm.1.gz @@ -100,7 +96,10 @@ man/man7/backend.7.gz man/man7/filter.7.gz man/man7/notifier.7.gz man/man8/accept.8.gz +man/man8/cupsd-logs.8.gz +man/man8/cupsd-helper.8.gz man/man8/cups-deviced.8.gz +man/man8/cups-exec.8.gz man/man8/cups-driverd.8.gz man/man8/cups-lpd.8.gz man/man8/cups-snmp.8.gz @@ -186,76 +185,6 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/add-printer.tmpl %%DATADIR%%/templates/add-rss-subscription.tmpl %%DATADIR%%/templates/admin.tmpl -%%DATADIR%%/templates/ca/add-class.tmpl -%%DATADIR%%/templates/ca/add-printer.tmpl -%%DATADIR%%/templates/ca/add-rss-subscription.tmpl -%%DATADIR%%/templates/ca/admin.tmpl -%%DATADIR%%/templates/ca/choose-device.tmpl -%%DATADIR%%/templates/ca/choose-make.tmpl -%%DATADIR%%/templates/ca/choose-model.tmpl -%%DATADIR%%/templates/ca/choose-serial.tmpl -%%DATADIR%%/templates/ca/choose-uri.tmpl -%%DATADIR%%/templates/ca/class-added.tmpl -%%DATADIR%%/templates/ca/class-confirm.tmpl -%%DATADIR%%/templates/ca/class-deleted.tmpl -%%DATADIR%%/templates/ca/class-jobs-header.tmpl -%%DATADIR%%/templates/ca/class-modified.tmpl -%%DATADIR%%/templates/ca/class.tmpl -%%DATADIR%%/templates/ca/classes-header.tmpl -%%DATADIR%%/templates/ca/classes.tmpl -%%DATADIR%%/templates/ca/command.tmpl -%%DATADIR%%/templates/ca/edit-config.tmpl -%%DATADIR%%/templates/ca/error-op.tmpl -%%DATADIR%%/templates/ca/error.tmpl -%%DATADIR%%/templates/ca/header.tmpl -%%DATADIR%%/templates/ca/help-header.tmpl -%%DATADIR%%/templates/ca/help-printable.tmpl -%%DATADIR%%/templates/ca/help-trailer.tmpl -%%DATADIR%%/templates/ca/job-cancel.tmpl -%%DATADIR%%/templates/ca/job-hold.tmpl -%%DATADIR%%/templates/ca/job-move.tmpl -%%DATADIR%%/templates/ca/job-moved.tmpl -%%DATADIR%%/templates/ca/job-release.tmpl -%%DATADIR%%/templates/ca/job-restart.tmpl -%%DATADIR%%/templates/ca/jobs-header.tmpl -%%DATADIR%%/templates/ca/jobs.tmpl -%%DATADIR%%/templates/ca/list-available-printers.tmpl -%%DATADIR%%/templates/ca/modify-class.tmpl -%%DATADIR%%/templates/ca/modify-printer.tmpl -%%DATADIR%%/templates/ca/norestart.tmpl -%%DATADIR%%/templates/ca/option-boolean.tmpl -%%DATADIR%%/templates/ca/option-conflict.tmpl -%%DATADIR%%/templates/ca/option-header.tmpl -%%DATADIR%%/templates/ca/option-pickmany.tmpl -%%DATADIR%%/templates/ca/option-pickone.tmpl -%%DATADIR%%/templates/ca/option-trailer.tmpl -%%DATADIR%%/templates/ca/pager.tmpl -%%DATADIR%%/templates/ca/printer-accept.tmpl -%%DATADIR%%/templates/ca/printer-added.tmpl -%%DATADIR%%/templates/ca/printer-configured.tmpl -%%DATADIR%%/templates/ca/printer-confirm.tmpl -%%DATADIR%%/templates/ca/printer-default.tmpl -%%DATADIR%%/templates/ca/printer-deleted.tmpl -%%DATADIR%%/templates/ca/printer-jobs-header.tmpl -%%DATADIR%%/templates/ca/printer-modified.tmpl -%%DATADIR%%/templates/ca/printer-purge.tmpl -%%DATADIR%%/templates/ca/printer-reject.tmpl -%%DATADIR%%/templates/ca/printer-start.tmpl -%%DATADIR%%/templates/ca/printer-stop.tmpl -%%DATADIR%%/templates/ca/printer.tmpl -%%DATADIR%%/templates/ca/printers-header.tmpl -%%DATADIR%%/templates/ca/printers.tmpl -%%DATADIR%%/templates/ca/restart.tmpl -%%DATADIR%%/templates/ca/samba-export.tmpl -%%DATADIR%%/templates/ca/samba-exported.tmpl -%%DATADIR%%/templates/ca/search.tmpl -%%DATADIR%%/templates/ca/set-printer-options-header.tmpl -%%DATADIR%%/templates/ca/set-printer-options-trailer.tmpl -%%DATADIR%%/templates/ca/subscription-added.tmpl -%%DATADIR%%/templates/ca/subscription-canceled.tmpl -%%DATADIR%%/templates/ca/test-page.tmpl -%%DATADIR%%/templates/ca/trailer.tmpl -%%DATADIR%%/templates/ca/users.tmpl %%DATADIR%%/templates/choose-device.tmpl %%DATADIR%%/templates/choose-make.tmpl %%DATADIR%%/templates/choose-model.tmpl @@ -270,76 +199,6 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/classes-header.tmpl %%DATADIR%%/templates/classes.tmpl %%DATADIR%%/templates/command.tmpl -%%DATADIR%%/templates/cs/add-class.tmpl -%%DATADIR%%/templates/cs/add-printer.tmpl -%%DATADIR%%/templates/cs/add-rss-subscription.tmpl -%%DATADIR%%/templates/cs/admin.tmpl -%%DATADIR%%/templates/cs/choose-device.tmpl -%%DATADIR%%/templates/cs/choose-make.tmpl -%%DATADIR%%/templates/cs/choose-model.tmpl -%%DATADIR%%/templates/cs/choose-serial.tmpl -%%DATADIR%%/templates/cs/choose-uri.tmpl -%%DATADIR%%/templates/cs/class-added.tmpl -%%DATADIR%%/templates/cs/class-confirm.tmpl -%%DATADIR%%/templates/cs/class-deleted.tmpl -%%DATADIR%%/templates/cs/class-jobs-header.tmpl -%%DATADIR%%/templates/cs/class-modified.tmpl -%%DATADIR%%/templates/cs/class.tmpl -%%DATADIR%%/templates/cs/classes-header.tmpl -%%DATADIR%%/templates/cs/classes.tmpl -%%DATADIR%%/templates/cs/command.tmpl -%%DATADIR%%/templates/cs/edit-config.tmpl -%%DATADIR%%/templates/cs/error-op.tmpl -%%DATADIR%%/templates/cs/error.tmpl -%%DATADIR%%/templates/cs/header.tmpl -%%DATADIR%%/templates/cs/help-header.tmpl -%%DATADIR%%/templates/cs/help-printable.tmpl -%%DATADIR%%/templates/cs/help-trailer.tmpl -%%DATADIR%%/templates/cs/job-cancel.tmpl -%%DATADIR%%/templates/cs/job-hold.tmpl -%%DATADIR%%/templates/cs/job-move.tmpl -%%DATADIR%%/templates/cs/job-moved.tmpl -%%DATADIR%%/templates/cs/job-release.tmpl -%%DATADIR%%/templates/cs/job-restart.tmpl -%%DATADIR%%/templates/cs/jobs-header.tmpl -%%DATADIR%%/templates/cs/jobs.tmpl -%%DATADIR%%/templates/cs/list-available-printers.tmpl -%%DATADIR%%/templates/cs/modify-class.tmpl -%%DATADIR%%/templates/cs/modify-printer.tmpl -%%DATADIR%%/templates/cs/norestart.tmpl -%%DATADIR%%/templates/cs/option-boolean.tmpl -%%DATADIR%%/templates/cs/option-conflict.tmpl -%%DATADIR%%/templates/cs/option-header.tmpl -%%DATADIR%%/templates/cs/option-pickmany.tmpl -%%DATADIR%%/templates/cs/option-pickone.tmpl -%%DATADIR%%/templates/cs/option-trailer.tmpl -%%DATADIR%%/templates/cs/pager.tmpl -%%DATADIR%%/templates/cs/printer-accept.tmpl -%%DATADIR%%/templates/cs/printer-added.tmpl -%%DATADIR%%/templates/cs/printer-configured.tmpl -%%DATADIR%%/templates/cs/printer-confirm.tmpl -%%DATADIR%%/templates/cs/printer-default.tmpl -%%DATADIR%%/templates/cs/printer-deleted.tmpl -%%DATADIR%%/templates/cs/printer-jobs-header.tmpl -%%DATADIR%%/templates/cs/printer-modified.tmpl -%%DATADIR%%/templates/cs/printer-purge.tmpl -%%DATADIR%%/templates/cs/printer-reject.tmpl -%%DATADIR%%/templates/cs/printer-start.tmpl -%%DATADIR%%/templates/cs/printer-stop.tmpl -%%DATADIR%%/templates/cs/printer.tmpl -%%DATADIR%%/templates/cs/printers-header.tmpl -%%DATADIR%%/templates/cs/printers.tmpl -%%DATADIR%%/templates/cs/restart.tmpl -%%DATADIR%%/templates/cs/samba-export.tmpl -%%DATADIR%%/templates/cs/samba-exported.tmpl -%%DATADIR%%/templates/cs/search.tmpl -%%DATADIR%%/templates/cs/set-printer-options-header.tmpl -%%DATADIR%%/templates/cs/set-printer-options-trailer.tmpl -%%DATADIR%%/templates/cs/subscription-added.tmpl -%%DATADIR%%/templates/cs/subscription-canceled.tmpl -%%DATADIR%%/templates/cs/test-page.tmpl -%%DATADIR%%/templates/cs/trailer.tmpl -%%DATADIR%%/templates/cs/users.tmpl %%DATADIR%%/templates/de/add-class.tmpl %%DATADIR%%/templates/de/add-printer.tmpl %%DATADIR%%/templates/de/add-rss-subscription.tmpl @@ -364,7 +223,6 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/de/header.tmpl %%DATADIR%%/templates/de/help-header.tmpl %%DATADIR%%/templates/de/help-printable.tmpl -%%DATADIR%%/templates/de/help-trailer.tmpl %%DATADIR%%/templates/de/job-cancel.tmpl %%DATADIR%%/templates/de/job-hold.tmpl %%DATADIR%%/templates/de/job-move.tmpl @@ -386,13 +244,13 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/de/pager.tmpl %%DATADIR%%/templates/de/printer-accept.tmpl %%DATADIR%%/templates/de/printer-added.tmpl +%%DATADIR%%/templates/de/printer-cancel-jobs.tmpl %%DATADIR%%/templates/de/printer-configured.tmpl %%DATADIR%%/templates/de/printer-confirm.tmpl %%DATADIR%%/templates/de/printer-default.tmpl %%DATADIR%%/templates/de/printer-deleted.tmpl %%DATADIR%%/templates/de/printer-jobs-header.tmpl %%DATADIR%%/templates/de/printer-modified.tmpl -%%DATADIR%%/templates/de/printer-purge.tmpl %%DATADIR%%/templates/de/printer-reject.tmpl %%DATADIR%%/templates/de/printer-start.tmpl %%DATADIR%%/templates/de/printer-stop.tmpl @@ -459,13 +317,13 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/es/pager.tmpl %%DATADIR%%/templates/es/printer-accept.tmpl %%DATADIR%%/templates/es/printer-added.tmpl +%%DATADIR%%/templates/es/printer-cancel-jobs.tmpl %%DATADIR%%/templates/es/printer-configured.tmpl %%DATADIR%%/templates/es/printer-confirm.tmpl %%DATADIR%%/templates/es/printer-default.tmpl %%DATADIR%%/templates/es/printer-deleted.tmpl %%DATADIR%%/templates/es/printer-jobs-header.tmpl %%DATADIR%%/templates/es/printer-modified.tmpl -%%DATADIR%%/templates/es/printer-purge.tmpl %%DATADIR%%/templates/es/printer-reject.tmpl %%DATADIR%%/templates/es/printer-start.tmpl %%DATADIR%%/templates/es/printer-stop.tmpl @@ -483,150 +341,10 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/es/test-page.tmpl %%DATADIR%%/templates/es/trailer.tmpl %%DATADIR%%/templates/es/users.tmpl -%%DATADIR%%/templates/fr/add-class.tmpl -%%DATADIR%%/templates/fr/add-printer.tmpl -%%DATADIR%%/templates/fr/add-rss-subscription.tmpl -%%DATADIR%%/templates/fr/admin.tmpl -%%DATADIR%%/templates/fr/choose-device.tmpl -%%DATADIR%%/templates/fr/choose-make.tmpl -%%DATADIR%%/templates/fr/choose-model.tmpl -%%DATADIR%%/templates/fr/choose-serial.tmpl -%%DATADIR%%/templates/fr/choose-uri.tmpl -%%DATADIR%%/templates/fr/class-added.tmpl -%%DATADIR%%/templates/fr/class-confirm.tmpl -%%DATADIR%%/templates/fr/class-deleted.tmpl -%%DATADIR%%/templates/fr/class-jobs-header.tmpl -%%DATADIR%%/templates/fr/class-modified.tmpl -%%DATADIR%%/templates/fr/class.tmpl -%%DATADIR%%/templates/fr/classes-header.tmpl -%%DATADIR%%/templates/fr/classes.tmpl -%%DATADIR%%/templates/fr/command.tmpl -%%DATADIR%%/templates/fr/edit-config.tmpl -%%DATADIR%%/templates/fr/error-op.tmpl -%%DATADIR%%/templates/fr/error.tmpl -%%DATADIR%%/templates/fr/header.tmpl -%%DATADIR%%/templates/fr/help-header.tmpl -%%DATADIR%%/templates/fr/help-printable.tmpl -%%DATADIR%%/templates/fr/help-trailer.tmpl -%%DATADIR%%/templates/fr/job-cancel.tmpl -%%DATADIR%%/templates/fr/job-hold.tmpl -%%DATADIR%%/templates/fr/job-move.tmpl -%%DATADIR%%/templates/fr/job-moved.tmpl -%%DATADIR%%/templates/fr/job-release.tmpl -%%DATADIR%%/templates/fr/job-restart.tmpl -%%DATADIR%%/templates/fr/jobs-header.tmpl -%%DATADIR%%/templates/fr/jobs.tmpl -%%DATADIR%%/templates/fr/list-available-printers.tmpl -%%DATADIR%%/templates/fr/modify-class.tmpl -%%DATADIR%%/templates/fr/modify-printer.tmpl -%%DATADIR%%/templates/fr/norestart.tmpl -%%DATADIR%%/templates/fr/option-boolean.tmpl -%%DATADIR%%/templates/fr/option-conflict.tmpl -%%DATADIR%%/templates/fr/option-header.tmpl -%%DATADIR%%/templates/fr/option-pickmany.tmpl -%%DATADIR%%/templates/fr/option-pickone.tmpl -%%DATADIR%%/templates/fr/option-trailer.tmpl -%%DATADIR%%/templates/fr/pager.tmpl -%%DATADIR%%/templates/fr/printer-accept.tmpl -%%DATADIR%%/templates/fr/printer-added.tmpl -%%DATADIR%%/templates/fr/printer-configured.tmpl -%%DATADIR%%/templates/fr/printer-confirm.tmpl -%%DATADIR%%/templates/fr/printer-default.tmpl -%%DATADIR%%/templates/fr/printer-deleted.tmpl -%%DATADIR%%/templates/fr/printer-jobs-header.tmpl -%%DATADIR%%/templates/fr/printer-modified.tmpl -%%DATADIR%%/templates/fr/printer-purge.tmpl -%%DATADIR%%/templates/fr/printer-reject.tmpl -%%DATADIR%%/templates/fr/printer-start.tmpl -%%DATADIR%%/templates/fr/printer-stop.tmpl -%%DATADIR%%/templates/fr/printer.tmpl -%%DATADIR%%/templates/fr/printers-header.tmpl -%%DATADIR%%/templates/fr/printers.tmpl -%%DATADIR%%/templates/fr/restart.tmpl -%%DATADIR%%/templates/fr/samba-export.tmpl -%%DATADIR%%/templates/fr/samba-exported.tmpl -%%DATADIR%%/templates/fr/search.tmpl -%%DATADIR%%/templates/fr/set-printer-options-header.tmpl -%%DATADIR%%/templates/fr/set-printer-options-trailer.tmpl -%%DATADIR%%/templates/fr/subscription-added.tmpl -%%DATADIR%%/templates/fr/subscription-canceled.tmpl -%%DATADIR%%/templates/fr/test-page.tmpl -%%DATADIR%%/templates/fr/trailer.tmpl -%%DATADIR%%/templates/fr/users.tmpl %%DATADIR%%/templates/header.tmpl %%DATADIR%%/templates/help-header.tmpl %%DATADIR%%/templates/help-printable.tmpl %%DATADIR%%/templates/help-trailer.tmpl -%%DATADIR%%/templates/it/add-class.tmpl -%%DATADIR%%/templates/it/add-printer.tmpl -%%DATADIR%%/templates/it/add-rss-subscription.tmpl -%%DATADIR%%/templates/it/admin.tmpl -%%DATADIR%%/templates/it/choose-device.tmpl -%%DATADIR%%/templates/it/choose-make.tmpl -%%DATADIR%%/templates/it/choose-model.tmpl -%%DATADIR%%/templates/it/choose-serial.tmpl -%%DATADIR%%/templates/it/choose-uri.tmpl -%%DATADIR%%/templates/it/class-added.tmpl -%%DATADIR%%/templates/it/class-confirm.tmpl -%%DATADIR%%/templates/it/class-deleted.tmpl -%%DATADIR%%/templates/it/class-jobs-header.tmpl -%%DATADIR%%/templates/it/class-modified.tmpl -%%DATADIR%%/templates/it/class.tmpl -%%DATADIR%%/templates/it/classes-header.tmpl -%%DATADIR%%/templates/it/classes.tmpl -%%DATADIR%%/templates/it/command.tmpl -%%DATADIR%%/templates/it/edit-config.tmpl -%%DATADIR%%/templates/it/error-op.tmpl -%%DATADIR%%/templates/it/error.tmpl -%%DATADIR%%/templates/it/header.tmpl -%%DATADIR%%/templates/it/help-header.tmpl -%%DATADIR%%/templates/it/help-printable.tmpl -%%DATADIR%%/templates/it/help-trailer.tmpl -%%DATADIR%%/templates/it/job-cancel.tmpl -%%DATADIR%%/templates/it/job-hold.tmpl -%%DATADIR%%/templates/it/job-move.tmpl -%%DATADIR%%/templates/it/job-moved.tmpl -%%DATADIR%%/templates/it/job-release.tmpl -%%DATADIR%%/templates/it/job-restart.tmpl -%%DATADIR%%/templates/it/jobs-header.tmpl -%%DATADIR%%/templates/it/jobs.tmpl -%%DATADIR%%/templates/it/list-available-printers.tmpl -%%DATADIR%%/templates/it/modify-class.tmpl -%%DATADIR%%/templates/it/modify-printer.tmpl -%%DATADIR%%/templates/it/norestart.tmpl -%%DATADIR%%/templates/it/option-boolean.tmpl -%%DATADIR%%/templates/it/option-conflict.tmpl -%%DATADIR%%/templates/it/option-header.tmpl -%%DATADIR%%/templates/it/option-pickmany.tmpl -%%DATADIR%%/templates/it/option-pickone.tmpl -%%DATADIR%%/templates/it/option-trailer.tmpl -%%DATADIR%%/templates/it/pager.tmpl -%%DATADIR%%/templates/it/printer-accept.tmpl -%%DATADIR%%/templates/it/printer-added.tmpl -%%DATADIR%%/templates/it/printer-configured.tmpl -%%DATADIR%%/templates/it/printer-confirm.tmpl -%%DATADIR%%/templates/it/printer-default.tmpl -%%DATADIR%%/templates/it/printer-deleted.tmpl -%%DATADIR%%/templates/it/printer-jobs-header.tmpl -%%DATADIR%%/templates/it/printer-modified.tmpl -%%DATADIR%%/templates/it/printer-purge.tmpl -%%DATADIR%%/templates/it/printer-reject.tmpl -%%DATADIR%%/templates/it/printer-start.tmpl -%%DATADIR%%/templates/it/printer-stop.tmpl -%%DATADIR%%/templates/it/printer.tmpl -%%DATADIR%%/templates/it/printers-header.tmpl -%%DATADIR%%/templates/it/printers.tmpl -%%DATADIR%%/templates/it/restart.tmpl -%%DATADIR%%/templates/it/samba-export.tmpl -%%DATADIR%%/templates/it/samba-exported.tmpl -%%DATADIR%%/templates/it/search.tmpl -%%DATADIR%%/templates/it/set-printer-options-header.tmpl -%%DATADIR%%/templates/it/set-printer-options-trailer.tmpl -%%DATADIR%%/templates/it/subscription-added.tmpl -%%DATADIR%%/templates/it/subscription-canceled.tmpl -%%DATADIR%%/templates/it/test-page.tmpl -%%DATADIR%%/templates/it/trailer.tmpl -%%DATADIR%%/templates/it/users.tmpl %%DATADIR%%/templates/ja/add-class.tmpl %%DATADIR%%/templates/ja/add-printer.tmpl %%DATADIR%%/templates/ja/add-rss-subscription.tmpl @@ -673,13 +391,13 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/ja/pager.tmpl %%DATADIR%%/templates/ja/printer-accept.tmpl %%DATADIR%%/templates/ja/printer-added.tmpl +%%DATADIR%%/templates/ja/printer-cancel-jobs.tmpl %%DATADIR%%/templates/ja/printer-configured.tmpl %%DATADIR%%/templates/ja/printer-confirm.tmpl %%DATADIR%%/templates/ja/printer-default.tmpl %%DATADIR%%/templates/ja/printer-deleted.tmpl %%DATADIR%%/templates/ja/printer-jobs-header.tmpl %%DATADIR%%/templates/ja/printer-modified.tmpl -%%DATADIR%%/templates/ja/printer-purge.tmpl %%DATADIR%%/templates/ja/printer-reject.tmpl %%DATADIR%%/templates/ja/printer-start.tmpl %%DATADIR%%/templates/ja/printer-stop.tmpl @@ -718,87 +436,19 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/pager.tmpl %%DATADIR%%/templates/printer-accept.tmpl %%DATADIR%%/templates/printer-added.tmpl +%%DATADIR%%/templates/printer-cancel-jobs.tmpl %%DATADIR%%/templates/printer-configured.tmpl %%DATADIR%%/templates/printer-confirm.tmpl %%DATADIR%%/templates/printer-default.tmpl %%DATADIR%%/templates/printer-deleted.tmpl %%DATADIR%%/templates/printer-jobs-header.tmpl %%DATADIR%%/templates/printer-modified.tmpl -%%DATADIR%%/templates/printer-purge.tmpl %%DATADIR%%/templates/printer-reject.tmpl %%DATADIR%%/templates/printer-start.tmpl %%DATADIR%%/templates/printer-stop.tmpl %%DATADIR%%/templates/printer.tmpl %%DATADIR%%/templates/printers-header.tmpl %%DATADIR%%/templates/printers.tmpl -%%DATADIR%%/templates/pt_BR/add-class.tmpl -%%DATADIR%%/templates/pt_BR/add-printer.tmpl -%%DATADIR%%/templates/pt_BR/add-rss-subscription.tmpl -%%DATADIR%%/templates/pt_BR/admin.tmpl -%%DATADIR%%/templates/pt_BR/choose-device.tmpl -%%DATADIR%%/templates/pt_BR/choose-make.tmpl -%%DATADIR%%/templates/pt_BR/choose-model.tmpl -%%DATADIR%%/templates/pt_BR/choose-serial.tmpl -%%DATADIR%%/templates/pt_BR/choose-uri.tmpl -%%DATADIR%%/templates/pt_BR/class-added.tmpl -%%DATADIR%%/templates/pt_BR/class-confirm.tmpl -%%DATADIR%%/templates/pt_BR/class-deleted.tmpl -%%DATADIR%%/templates/pt_BR/class-jobs-header.tmpl -%%DATADIR%%/templates/pt_BR/class-modified.tmpl -%%DATADIR%%/templates/pt_BR/class.tmpl -%%DATADIR%%/templates/pt_BR/classes-header.tmpl -%%DATADIR%%/templates/pt_BR/classes.tmpl -%%DATADIR%%/templates/pt_BR/command.tmpl -%%DATADIR%%/templates/pt_BR/edit-config.tmpl -%%DATADIR%%/templates/pt_BR/error-op.tmpl -%%DATADIR%%/templates/pt_BR/error.tmpl -%%DATADIR%%/templates/pt_BR/header.tmpl -%%DATADIR%%/templates/pt_BR/help-header.tmpl -%%DATADIR%%/templates/pt_BR/job-cancel.tmpl -%%DATADIR%%/templates/pt_BR/job-hold.tmpl -%%DATADIR%%/templates/pt_BR/job-move.tmpl -%%DATADIR%%/templates/pt_BR/job-moved.tmpl -%%DATADIR%%/templates/pt_BR/job-release.tmpl -%%DATADIR%%/templates/pt_BR/job-restart.tmpl -%%DATADIR%%/templates/pt_BR/jobs-header.tmpl -%%DATADIR%%/templates/pt_BR/jobs.tmpl -%%DATADIR%%/templates/pt_BR/list-available-printers.tmpl -%%DATADIR%%/templates/pt_BR/modify-class.tmpl -%%DATADIR%%/templates/pt_BR/modify-printer.tmpl -%%DATADIR%%/templates/pt_BR/norestart.tmpl -%%DATADIR%%/templates/pt_BR/option-boolean.tmpl -%%DATADIR%%/templates/pt_BR/option-conflict.tmpl -%%DATADIR%%/templates/pt_BR/option-header.tmpl -%%DATADIR%%/templates/pt_BR/option-pickmany.tmpl -%%DATADIR%%/templates/pt_BR/option-pickone.tmpl -%%DATADIR%%/templates/pt_BR/option-trailer.tmpl -%%DATADIR%%/templates/pt_BR/pager.tmpl -%%DATADIR%%/templates/pt_BR/printer-accept.tmpl -%%DATADIR%%/templates/pt_BR/printer-added.tmpl -%%DATADIR%%/templates/pt_BR/printer-configured.tmpl -%%DATADIR%%/templates/pt_BR/printer-confirm.tmpl -%%DATADIR%%/templates/pt_BR/printer-default.tmpl -%%DATADIR%%/templates/pt_BR/printer-deleted.tmpl -%%DATADIR%%/templates/pt_BR/printer-jobs-header.tmpl -%%DATADIR%%/templates/pt_BR/printer-modified.tmpl -%%DATADIR%%/templates/pt_BR/printer-purge.tmpl -%%DATADIR%%/templates/pt_BR/printer-reject.tmpl -%%DATADIR%%/templates/pt_BR/printer-start.tmpl -%%DATADIR%%/templates/pt_BR/printer-stop.tmpl -%%DATADIR%%/templates/pt_BR/printer.tmpl -%%DATADIR%%/templates/pt_BR/printers-header.tmpl -%%DATADIR%%/templates/pt_BR/printers.tmpl -%%DATADIR%%/templates/pt_BR/restart.tmpl -%%DATADIR%%/templates/pt_BR/samba-export.tmpl -%%DATADIR%%/templates/pt_BR/samba-exported.tmpl -%%DATADIR%%/templates/pt_BR/search.tmpl -%%DATADIR%%/templates/pt_BR/set-printer-options-header.tmpl -%%DATADIR%%/templates/pt_BR/set-printer-options-trailer.tmpl -%%DATADIR%%/templates/pt_BR/subscription-added.tmpl -%%DATADIR%%/templates/pt_BR/subscription-canceled.tmpl -%%DATADIR%%/templates/pt_BR/test-page.tmpl -%%DATADIR%%/templates/pt_BR/trailer.tmpl -%%DATADIR%%/templates/pt_BR/users.tmpl %%DATADIR%%/templates/restart.tmpl %%DATADIR%%/templates/ru/add-class.tmpl %%DATADIR%%/templates/ru/add-printer.tmpl @@ -824,7 +474,6 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/ru/header.tmpl %%DATADIR%%/templates/ru/help-header.tmpl %%DATADIR%%/templates/ru/help-printable.tmpl -%%DATADIR%%/templates/ru/help-trailer.tmpl %%DATADIR%%/templates/ru/job-cancel.tmpl %%DATADIR%%/templates/ru/job-hold.tmpl %%DATADIR%%/templates/ru/job-move.tmpl @@ -846,13 +495,13 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/ru/pager.tmpl %%DATADIR%%/templates/ru/printer-accept.tmpl %%DATADIR%%/templates/ru/printer-added.tmpl +%%DATADIR%%/templates/ru/printer-cancel-jobs.tmpl %%DATADIR%%/templates/ru/printer-configured.tmpl %%DATADIR%%/templates/ru/printer-confirm.tmpl %%DATADIR%%/templates/ru/printer-default.tmpl %%DATADIR%%/templates/ru/printer-deleted.tmpl %%DATADIR%%/templates/ru/printer-jobs-header.tmpl %%DATADIR%%/templates/ru/printer-modified.tmpl -%%DATADIR%%/templates/ru/printer-purge.tmpl %%DATADIR%%/templates/ru/printer-reject.tmpl %%DATADIR%%/templates/ru/printer-start.tmpl %%DATADIR%%/templates/ru/printer-stop.tmpl @@ -881,13 +530,11 @@ sbin/ulpt-cupsd.sh %%DATADIR%%/templates/trailer.tmpl %%DATADIR%%/templates/users.tmpl %%LIBUSB%%%%DATADIR%%/usb/org.cups.usb-quirks -%%DOCSDIR%%/ca/index.html -%%DOCSDIR%%/cs/index.html +%%DOCSDIR%%/apple-touch-icon.png %%DOCSDIR%%/cups-printable.css %%DOCSDIR%%/cups.css %%DOCSDIR%%/de/index.html %%DOCSDIR%%/es/index.html -%%DOCSDIR%%/fr/index.html %%DOCSDIR%%/help/accounting.html %%DOCSDIR%%/help/api-array.html %%DOCSDIR%%/help/api-cgi.html @@ -907,11 +554,18 @@ sbin/ulpt-cupsd.sh %%DOCSDIR%%/help/license.html %%DOCSDIR%%/help/man-backend.html %%DOCSDIR%%/help/man-cancel.html +%%DOCSDIR%%/help/man-classes.conf.html +%%DOCSDIR%%/help/man-client.conf.html %%DOCSDIR%%/help/man-cups-config.html +%%DOCSDIR%%/help/man-cups-files.conf.html %%DOCSDIR%%/help/man-cups-lpd.html %%DOCSDIR%%/help/man-cups-snmp.html +%%DOCSDIR%%/help/man-cups.html %%DOCSDIR%%/help/man-cupsaccept.html %%DOCSDIR%%/help/man-cupsaddsmb.html +%%DOCSDIR%%/help/man-cupsd-helper.html +%%DOCSDIR%%/help/man-cupsd-logs.html +%%DOCSDIR%%/help/man-cupsd.conf.html %%DOCSDIR%%/help/man-cupsd.html %%DOCSDIR%%/help/man-cupsenable.html %%DOCSDIR%%/help/man-cupstestdsc.html @@ -925,7 +579,6 @@ sbin/ulpt-cupsd.sh %%DOCSDIR%%/help/man-lpinfo.html %%DOCSDIR%%/help/man-lpmove.html %%DOCSDIR%%/help/man-lpoptions.html -%%DOCSDIR%%/help/man-lppasswd.html %%DOCSDIR%%/help/man-lpq.html %%DOCSDIR%%/help/man-lpr.html %%DOCSDIR%%/help/man-lprm.html @@ -938,6 +591,8 @@ sbin/ulpt-cupsd.sh %%DOCSDIR%%/help/man-ppdi.html %%DOCSDIR%%/help/man-ppdmerge.html %%DOCSDIR%%/help/man-ppdpo.html +%%DOCSDIR%%/help/man-printers.conf.html +%%DOCSDIR%%/help/man-subscriptions.conf.html %%DOCSDIR%%/help/network.html %%DOCSDIR%%/help/options.html %%DOCSDIR%%/help/overview.html @@ -945,18 +600,7 @@ sbin/ulpt-cupsd.sh %%DOCSDIR%%/help/postscript-driver.html %%DOCSDIR%%/help/ppd-compiler.html %%DOCSDIR%%/help/raster-driver.html -%%DOCSDIR%%/help/ref-access_log.html -%%DOCSDIR%%/help/ref-classes-conf.html -%%DOCSDIR%%/help/ref-client-conf.html -%%DOCSDIR%%/help/ref-cups-files-conf.html -%%DOCSDIR%%/help/ref-cupsd-conf.html -%%DOCSDIR%%/help/ref-error_log.html -%%DOCSDIR%%/help/ref-mailto-conf.html -%%DOCSDIR%%/help/ref-page_log.html %%DOCSDIR%%/help/ref-ppdcfile.html -%%DOCSDIR%%/help/ref-printers-conf.html -%%DOCSDIR%%/help/ref-snmp-conf.html -%%DOCSDIR%%/help/ref-subscriptions-conf.html %%DOCSDIR%%/help/security.html %%DOCSDIR%%/help/sharing.html %%DOCSDIR%%/help/spec-banner.html @@ -970,7 +614,6 @@ sbin/ulpt-cupsd.sh %%DOCSDIR%%/help/spec-raster.html %%DOCSDIR%%/help/spec-stp.html %%DOCSDIR%%/help/translation.html -%%DOCSDIR%%/help/whatsnew.html %%DOCSDIR%%/images/color-wheel.png %%DOCSDIR%%/images/cups-block-diagram.png %%DOCSDIR%%/images/cups-command-chain.png @@ -978,6 +621,7 @@ sbin/ulpt-cupsd.sh %%DOCSDIR%%/images/cups-postscript-chain.png %%DOCSDIR%%/images/cups-raster-chain.png %%DOCSDIR%%/images/cups.png +%%DOCSDIR%%/images/generic.png %%DOCSDIR%%/images/left.gif %%DOCSDIR%%/images/raster-organization.png %%DOCSDIR%%/images/raster.png @@ -988,9 +632,7 @@ sbin/ulpt-cupsd.sh %%DOCSDIR%%/images/unsel.gif %%DOCSDIR%%/images/wait.gif %%DOCSDIR%%/index.html -%%DOCSDIR%%/it/index.html %%DOCSDIR%%/ja/index.html -%%DOCSDIR%%/pt_BR/index.html %%DOCSDIR%%/robots.txt %%DOCSDIR%%/ru/index.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ulpt-cupsd.conf @@ -1006,7 +648,6 @@ share/locale/es/cups_es.po share/locale/fr/cups_fr.po share/locale/it/cups_it.po share/locale/ja/cups_ja.po -share/locale/pt_BR/cups_pt_BR.po share/locale/ru/cups_ru.po @dir etc/cups/interfaces @dir etc/cups/ppd From owner-svn-ports-branches@FreeBSD.ORG Tue Jun 9 23:35:47 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 E552A4D8; Tue, 9 Jun 2015 23:35:47 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) 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 D241818C0; Tue, 9 Jun 2015 23:35:47 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t59NZlem096125; Tue, 9 Jun 2015 23:35:47 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t59NZlSs096123; Tue, 9 Jun 2015 23:35:47 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201506092335.t59NZlSs096123@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Tue, 9 Jun 2015 23:35:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r389012 - branches/2015Q2/www/py-django 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, 09 Jun 2015 23:35:48 -0000 Author: lwhsu Date: Tue Jun 9 23:35:47 2015 New Revision: 389012 URL: https://svnweb.freebsd.org/changeset/ports/389012 Log: - Fix bits forgot in previous merge Approved by: ports-secteam (build fix blanket) Modified: branches/2015Q2/www/py-django/Makefile Modified: branches/2015Q2/www/py-django/Makefile ============================================================================== --- branches/2015Q2/www/py-django/Makefile Tue Jun 9 23:30:05 2015 (r389011) +++ branches/2015Q2/www/py-django/Makefile Tue Jun 9 23:35:47 2015 (r389012) @@ -31,8 +31,7 @@ OPTIONS_GROUP= DATABASE OPTIONS_GROUP_DATABASE= PGSQL MYSQL SQLITE HTMLDOCS_DESC= Install HTML documentation (requires Sphinx) -PLIST_FILES= man/man1/django-admin.1.gz \ - man/man1/gather_profile_stats.1.gz +PLIST_FILES= man/man1/django-admin.1.gz PGSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg2>0:${PORTSDIR}/databases/py-psycopg2 MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.2:${PORTSDIR}/databases/py-MySQLdb From owner-svn-ports-branches@FreeBSD.ORG Tue Jun 9 23:41:42 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 4AB4976F; Tue, 9 Jun 2015 23:41:42 +0000 (UTC) (envelope-from delphij@FreeBSD.org) 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 38EBB1A9B; Tue, 9 Jun 2015 23:41:42 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t59NfgcC000856; Tue, 9 Jun 2015 23:41:42 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t59NfgAA000855; Tue, 9 Jun 2015 23:41:42 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201506092341.t59NfgAA000855@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Tue, 9 Jun 2015 23:41:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r389014 - branches/2015Q2/print/cups 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, 09 Jun 2015 23:41:42 -0000 Author: delphij Date: Tue Jun 9 23:41:41 2015 New Revision: 389014 URL: https://svnweb.freebsd.org/changeset/ports/389014 Log: MFH: r389013 Bump version after cups-base update. Noticed by: jkim Approved by: ports-secteam Modified: branches/2015Q2/print/cups/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/print/cups/Makefile ============================================================================== --- branches/2015Q2/print/cups/Makefile Tue Jun 9 23:41:15 2015 (r389013) +++ branches/2015Q2/print/cups/Makefile Tue Jun 9 23:41:41 2015 (r389014) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= cups -PORTVERSION= 1.7.3 -PORTREVISION= 1 +PORTVERSION= 2.0.3 CATEGORIES= print MASTER_SITES= # empty DISTFILES= # empty From owner-svn-ports-branches@FreeBSD.ORG Wed Jun 10 05:27:54 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 27AD08E3; Wed, 10 Jun 2015 05:27:54 +0000 (UTC) (envelope-from jkim@FreeBSD.org) 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 08AA21986; Wed, 10 Jun 2015 05:27:54 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5A5RrX7070504; Wed, 10 Jun 2015 05:27:53 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5A5RqTX070499; Wed, 10 Jun 2015 05:27:52 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201506100527.t5A5RqTX070499@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Wed, 10 Jun 2015 05:27:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r389019 - branches/2015Q2/print/cups-base 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, 10 Jun 2015 05:27:54 -0000 Author: jkim Date: Wed Jun 10 05:27:52 2015 New Revision: 389019 URL: https://svnweb.freebsd.org/changeset/ports/389019 Log: MFH: r389015 CUPS 2.x does not support OpenSSL any more. Switch to GNU TLS by default. Approved by: ports-secteam (delphij) Modified: branches/2015Q2/print/cups-base/Makefile branches/2015Q2/print/cups-base/pkg-descr branches/2015Q2/print/cups-base/pkg-descr.client branches/2015Q2/print/cups-base/pkg-descr.image branches/2015Q2/print/cups-base/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/print/cups-base/Makefile ============================================================================== --- branches/2015Q2/print/cups-base/Makefile Wed Jun 10 03:50:29 2015 (r389018) +++ branches/2015Q2/print/cups-base/Makefile Wed Jun 10 05:27:52 2015 (r389019) @@ -15,6 +15,9 @@ COMMENT= Common UNIX Printing System: ${ LICENSE= GPLv2 +LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ + libgcrypt.so:${PORTSDIR}/security/libgcrypt + CONFLICTS= LPRng-[0-9]* UNIQUENAME= ${PORTNAME}${PKGNAMESUFFIX} @@ -36,7 +39,7 @@ CONFIGURE_ARGS+= --localstatedir=/var --with-domainsocket=${CUPS_SOCKET} \ --with-cachedir=${CUPS_CACHEDIR} \ --with-pam-module="unix" \ - --enable-ssl + --enable-gnutls CUPS_CACHEDIR?= /var/db/cups CUPS_SPOOLDIR= /var/spool/cups @@ -50,23 +53,20 @@ GROUPS= cups USERS= cups # UNIQUENAME must be set before bsd.port.pre.mk so OPTIONSFILE can be included -OPTIONS_SINGLE= SSL -OPTIONS_SINGLE_SSL= GNUTLS OPENSSL -OPTIONS_DEFAULT= OPENSSL OPTIONS_SUB= yes .if defined(CUPS_CLIENT) -PORTREVISION= 0 +PORTREVISION= 1 LICENSE= LGPL21 CUPS_SUFFIX= -client OPTIONS_RADIO= ZEROCONF OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER OPTIONS_DEFAULT+= MDNSRESPONDER .elif defined(CUPS_IMAGE) -PORTREVISION= 0 +PORTREVISION= 1 CUPS_SUFFIX= -image LICENSE= LGPL21 .else -PORTREVISION= 0 +PORTREVISION= 1 CUPS_SUFFIX= -base # No DOCS option. Files are needed by web interface. OPTIONS_DEFINE= DBUS ICONS LIBPAPER LIBUSB PAM XDG_OPEN @@ -127,17 +127,6 @@ PLIST_SUB+= OVERWRITE="@comment " CONFIGURE_ARGS+= --with-printcap=${PREFIX}/etc/printcap .endif -.if ${PORT_OPTIONS:MGNUTLS} -CONFIGURE_ARGS+= --disable-openssl --enable-gnutls -LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ - libgnutls.so:${PORTSDIR}/security/gnutls -.endif - -.if ${PORT_OPTIONS:MOPENSSL} -USE_OPENSSL= yes -CONFIGURE_ARGS+= --disable-gnutls --enable-openssl -.endif - # Don't use CONFIGURE_ARGS+=--without-* to disable web interpreters because it # will set the path of the interpreter to "no" and set it's existence to TRUE. .if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) Modified: branches/2015Q2/print/cups-base/pkg-descr ============================================================================== --- branches/2015Q2/print/cups-base/pkg-descr Wed Jun 10 03:50:29 2015 (r389018) +++ branches/2015Q2/print/cups-base/pkg-descr Wed Jun 10 05:27:52 2015 (r389019) @@ -17,7 +17,5 @@ non-PostScript printers. Sample drivers that use these filters. This software is available in the cups-pstoraster port. -LICENSE: GPL2 or later with exception to link with OpenSSL - WWW: http://www.cups.org/ [original text by greid@ukug.uk.freebsd.org] Modified: branches/2015Q2/print/cups-base/pkg-descr.client ============================================================================== --- branches/2015Q2/print/cups-base/pkg-descr.client Wed Jun 10 03:50:29 2015 (r389018) +++ branches/2015Q2/print/cups-base/pkg-descr.client Wed Jun 10 05:27:52 2015 (r389019) @@ -1,5 +1,3 @@ This provides libcups for applications to access CUPS. -LICENSE: LGPL2 or later with exception to link with OpenSSL - WWW: http://www.cups.org/ Modified: branches/2015Q2/print/cups-base/pkg-descr.image ============================================================================== --- branches/2015Q2/print/cups-base/pkg-descr.image Wed Jun 10 03:50:29 2015 (r389018) +++ branches/2015Q2/print/cups-base/pkg-descr.image Wed Jun 10 05:27:52 2015 (r389019) @@ -1,5 +1,3 @@ This provides libcupsimage for applications to process CUPS raster files. -LICENSE: LGPL2 or later with exception to link with OpenSSL - WWW: http://www.cups.org/ Modified: branches/2015Q2/print/cups-base/pkg-plist ============================================================================== --- branches/2015Q2/print/cups-base/pkg-plist Wed Jun 10 03:50:29 2015 (r389018) +++ branches/2015Q2/print/cups-base/pkg-plist Wed Jun 10 05:27:52 2015 (r389019) @@ -42,7 +42,9 @@ lib/libcupsmime.so.1 lib/libcupsppdc.so lib/libcupsppdc.so.1 libexec/cups/backend/http +libexec/cups/backend/https libexec/cups/backend/ipp +libexec/cups/backend/ipps libexec/cups/backend/lpd libexec/cups/backend/snmp libexec/cups/backend/socket From owner-svn-ports-branches@FreeBSD.ORG Wed Jun 10 14:38:25 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 8D58EAD7; Wed, 10 Jun 2015 14:38:25 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) 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 797ED1778; Wed, 10 Jun 2015 14:38:25 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5AEcPmD054065; Wed, 10 Jun 2015 14:38:25 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5AEcPGW054064; Wed, 10 Jun 2015 14:38:25 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201506101438.t5AEcPGW054064@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Wed, 10 Jun 2015 14:38:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r389037 - branches/2015Q2/www/py-django-devel 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, 10 Jun 2015 14:38:25 -0000 Author: lwhsu Date: Wed Jun 10 14:38:24 2015 New Revision: 389037 URL: https://svnweb.freebsd.org/changeset/ports/389037 Log: - Use the old distname, new GH_* stuff isn't in 2015Q2 Approved by: ports-secteam (build fix blanket) Modified: branches/2015Q2/www/py-django-devel/distinfo Modified: branches/2015Q2/www/py-django-devel/distinfo ============================================================================== --- branches/2015Q2/www/py-django-devel/distinfo Wed Jun 10 14:22:04 2015 (r389036) +++ branches/2015Q2/www/py-django-devel/distinfo Wed Jun 10 14:38:24 2015 (r389037) @@ -1,2 +1,2 @@ -SHA256 (python/django-django-20150531-c954931_GH0.tar.gz) = bd1fee340007cd2745d21b05d9fbfb3811b02f64ab361e2241d365fc9ceff352 -SIZE (python/django-django-20150531-c954931_GH0.tar.gz) = 6896535 +SHA256 (python/Django-20150531.tar.gz) = ea95940a51f2b0cacfa4c8289cba77736ce098159af0a9caf340bf1b9b44f605 +SIZE (python/Django-20150531.tar.gz) = 6896887 From owner-svn-ports-branches@FreeBSD.ORG Wed Jun 10 14:41:58 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 0531DCE4; Wed, 10 Jun 2015 14:41:58 +0000 (UTC) (envelope-from lwhsu@FreeBSD.cs.nctu.edu.tw) Received: from FreeBSD.cs.nctu.edu.tw (FreeBSD.cs.nctu.edu.tw [140.113.17.209]) by mx1.freebsd.org (Postfix) with ESMTP id C2E82197F; Wed, 10 Jun 2015 14:41:57 +0000 (UTC) (envelope-from lwhsu@FreeBSD.cs.nctu.edu.tw) Received: by FreeBSD.cs.nctu.edu.tw (Postfix, from userid 1058) id 95E7E221E; Wed, 10 Jun 2015 22:41:55 +0800 (CST) Date: Wed, 10 Jun 2015 22:41:55 +0800 From: Li-Wen Hsu To: Antoine Brodin Cc: "ports-committers@freebsd.org" , "svn-ports-all@freebsd.org" , svn-ports-branches@freebsd.org Subject: Re: svn commit: r388826 - branches/2015Q2/www/py-django Message-ID: <20150610144155.GA99338@FreeBSD.cs.nctu.edu.tw> References: <201506080232.t582Wn3x072727@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) 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, 10 Jun 2015 14:41:58 -0000 On Mon, Jun 08, 2015 at 20:16:57 +0200, Antoine Brodin wrote: > On Mon, Jun 8, 2015 at 4:32 AM, Li-Wen Hsu wrote: > > Author: lwhsu > > Date: Mon Jun 8 02:32:49 2015 > > New Revision: 388826 > > URL: https://svnweb.freebsd.org/changeset/ports/388826 > > > > Log: > > MFH: r388118 > > > > - Update to 1.8.2 > > > > PR: 200543 > > Submitted by: Jason Unovitch > > Security: 48504af7-07ad-11e5-879c-00e0814cab4e > > > > Approved by: ports-secteam (delphij) > > > > Modified: > > branches/2015Q2/www/py-django/Makefile > > branches/2015Q2/www/py-django/distinfo > > Directory Properties: > > branches/2015Q2/ (props changed) > > Hi, > > Just a reminder, blankets/approvals doesn't preclude you from testing > your changes (yay, py-django is now broken in the quarterly branch) Yeah, sorry about that, I missed something during the merge. I should test gain after the merge! And for www/py-django-devel, things are more tricky, the new GH_* stuff wasn't there, so it needs different handling... Li-Wen -- Li-Wen Hsu http://lwhsu.org From owner-svn-ports-branches@FreeBSD.ORG Wed Jun 10 20:29:40 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 9123FF64; Wed, 10 Jun 2015 20:29:40 +0000 (UTC) (envelope-from delphij@FreeBSD.org) 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 64E9D172A; Wed, 10 Jun 2015 20:29:40 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5AKTewf049185; Wed, 10 Jun 2015 20:29:40 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5AKTdAY049177; Wed, 10 Jun 2015 20:29:39 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201506102029.t5AKTdAY049177@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 10 Jun 2015 20:29:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r389144 - branches/2015Q2/databases/pgbouncer 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, 10 Jun 2015 20:29:40 -0000 Author: delphij Date: Wed Jun 10 20:29:39 2015 New Revision: 389144 URL: https://svnweb.freebsd.org/changeset/ports/389144 Log: MFH: r389143 Security update to 1.5.5, while there also move the upstream to github. PR: 200537 Approved by: ports-secteam Modified: branches/2015Q2/databases/pgbouncer/Makefile branches/2015Q2/databases/pgbouncer/distinfo branches/2015Q2/databases/pgbouncer/pkg-descr Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/databases/pgbouncer/Makefile ============================================================================== --- branches/2015Q2/databases/pgbouncer/Makefile Wed Jun 10 20:28:54 2015 (r389143) +++ branches/2015Q2/databases/pgbouncer/Makefile Wed Jun 10 20:29:39 2015 (r389144) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= pgbouncer -PORTVERSION= 1.5.4 -PORTREVISION= 6 +PORTVERSION= 1.5.5 CATEGORIES= databases -MASTER_SITES= http://pgfoundry.org/frs/download.php/3393/ +MASTER_SITES= https://pgbouncer.github.io/downloads/ MAINTAINER= m.tsatsenko@gmail.com COMMENT= Lightweight connection pooler for PostgreSQL @@ -15,7 +14,7 @@ LICENSE= BSD2CLAUSE LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 BUILD_DEPENDS+= ${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed -PORTSCOUT= site:http://pgfoundry.org/frs/?group_id=1000258 +PORTSCOUT= site:https://pgbouncer.github.io/downloads/ USERS= pgbouncer GROUPS= pgbouncer Modified: branches/2015Q2/databases/pgbouncer/distinfo ============================================================================== --- branches/2015Q2/databases/pgbouncer/distinfo Wed Jun 10 20:28:54 2015 (r389143) +++ branches/2015Q2/databases/pgbouncer/distinfo Wed Jun 10 20:29:39 2015 (r389144) @@ -1,2 +1,2 @@ -SHA256 (pgbouncer-1.5.4.tar.gz) = 08040482f4c887e14d8c8c46fab838fff640c0f3cf231f86ad7f766b7a292280 -SIZE (pgbouncer-1.5.4.tar.gz) = 339610 +SHA256 (pgbouncer-1.5.5.tar.gz) = d65a192d1e2e69bf445d536f10211857959fc38e0247d1974e8008253080e234 +SIZE (pgbouncer-1.5.5.tar.gz) = 336145 Modified: branches/2015Q2/databases/pgbouncer/pkg-descr ============================================================================== --- branches/2015Q2/databases/pgbouncer/pkg-descr Wed Jun 10 20:28:54 2015 (r389143) +++ branches/2015Q2/databases/pgbouncer/pkg-descr Wed Jun 10 20:29:39 2015 (r389144) @@ -1,3 +1,3 @@ Lightweight connection pooler for PostgreSQL. -WWW: http://pgfoundry.org/projects/pgbouncer/ +WWW: https://pgbouncer.github.io/ From owner-svn-ports-branches@FreeBSD.ORG Thu Jun 11 14:21:05 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 C9280228; Thu, 11 Jun 2015 14:21:05 +0000 (UTC) (envelope-from zi@FreeBSD.org) 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 AB62F1B83; Thu, 11 Jun 2015 14:21:05 +0000 (UTC) (envelope-from zi@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5BEL5qB094263; Thu, 11 Jun 2015 14:21:05 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5BEL5a4094072; Thu, 11 Jun 2015 14:21:05 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201506111421.t5BEL5a4094072@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Thu, 11 Jun 2015 14:21:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r389214 - in branches/2015Q2/www/apache22: . 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: Thu, 11 Jun 2015 14:21:05 -0000 Author: zi Date: Thu Jun 11 14:21:04 2015 New Revision: 389214 URL: https://svnweb.freebsd.org/changeset/ports/389214 Log: - Merge logjam fix from head - Bump PORTREVISION PR: 200756 With hat: ports-secteam Approved by: ports-secteam MFH: r386904,388386 Added: branches/2015Q2/www/apache22/files/patch-modules_ssl_ssl__engine__dh.c - copied, changed from r386904, head/www/apache22/files/patch-modules_ssl_ssl__engine__dh.c Modified: branches/2015Q2/www/apache22/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/www/apache22/Makefile ============================================================================== --- branches/2015Q2/www/apache22/Makefile Thu Jun 11 14:16:10 2015 (r389213) +++ branches/2015Q2/www/apache22/Makefile Thu Jun 11 14:21:04 2015 (r389214) @@ -2,7 +2,7 @@ PORTNAME= apache22 PORTVERSION= 2.2.29 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= httpd-${PORTVERSION} @@ -174,6 +174,12 @@ post-configure: @${REINPLACE_CMD} -e "s,%%WWWOWN%%,${WWWOWN}," -e "s,%%WWWGRP%%,${WWWGRP}," ${WRKSRC}/docs/conf/httpd.conf @${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/support/envvars-std +pre-build: +.if ${PORT_OPTIONS:MSSL} + @${ECHO_MSG} "===> Generating unique DH group to mitigate Logjam attack (this will take a while)" + (cd ${WRKSRC}/modules/ssl && ${SETENV} HOME=${WRKDIR} ${PERL} ssl_engine_dh.c) +.endif + post-install: @${MKDIR} ${ETC_SUBDIRS:S|^|${STAGEDIR}${ETCDIR}/|} ${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${STAGEDIR}${ETCDIR}/Includes/ Copied and modified: branches/2015Q2/www/apache22/files/patch-modules_ssl_ssl__engine__dh.c (from r386904, head/www/apache22/files/patch-modules_ssl_ssl__engine__dh.c) ============================================================================== --- head/www/apache22/files/patch-modules_ssl_ssl__engine__dh.c Thu May 21 02:13:07 2015 (r386904, copy source) +++ branches/2015Q2/www/apache22/files/patch-modules_ssl_ssl__engine__dh.c Thu Jun 11 14:21:04 2015 (r389214) @@ -1,5 +1,74 @@ --- modules/ssl/ssl_engine_dh.c.orig 2006-07-12 03:38:44 UTC +++ modules/ssl/ssl_engine_dh.c +@@ -33,7 +33,7 @@ + /* ----BEGIN GENERATED SECTION-------- */ + + /* +-** Diffie-Hellman-Parameters: (512 bit) ++** Diffie-Hellman-Parameters: (2048 bit) + ** prime: + ** 00:9f:db:8b:8a:00:45:44:f0:04:5f:17:37:d0:ba: + ** 2e:0b:27:4c:df:1a:9f:58:82:18:fb:43:53:16:a1: +@@ -41,7 +41,7 @@ + ** 0e:3e:30:06:80:a3:03:0c:6e:4c:37:57:d0:8f:70: + ** e6:aa:87:10:33 + ** generator: 2 (0x2) +-** Diffie-Hellman-Parameters: (1024 bit) ++** Diffie-Hellman-Parameters: (3072 bit) + ** prime: + ** 00:d6:7d:e4:40:cb:bb:dc:19:36:d6:93:d3:4a:fd: + ** 0a:d5:0c:84:d2:39:a4:5f:52:0b:b8:81:74:cb:98: +@@ -55,7 +55,7 @@ + ** generator: 2 (0x2) + */ + +-static unsigned char dh512_p[] = { ++static unsigned char dh2048_p[] = { + 0x9F, 0xDB, 0x8B, 0x8A, 0x00, 0x45, 0x44, 0xF0, 0x04, 0x5F, 0x17, 0x37, + 0xD0, 0xBA, 0x2E, 0x0B, 0x27, 0x4C, 0xDF, 0x1A, 0x9F, 0x58, 0x82, 0x18, + 0xFB, 0x43, 0x53, 0x16, 0xA1, 0x6E, 0x37, 0x41, 0x71, 0xFD, 0x19, 0xD8, +@@ -63,17 +63,17 @@ static unsigned char dh512_p[] = { + 0x80, 0xA3, 0x03, 0x0C, 0x6E, 0x4C, 0x37, 0x57, 0xD0, 0x8F, 0x70, 0xE6, + 0xAA, 0x87, 0x10, 0x33, + }; +-static unsigned char dh512_g[] = { ++static unsigned char dh2048_g[] = { + 0x02, + }; + +-static DH *get_dh512(void) ++static DH *get_dh2048(void) + { +- return modssl_dh_configure(dh512_p, sizeof(dh512_p), +- dh512_g, sizeof(dh512_g)); ++ return modssl_dh_configure(dh2048_p, sizeof(dh2048_p), ++ dh2048_g, sizeof(dh2048_g)); + } + +-static unsigned char dh1024_p[] = { ++static unsigned char dh3072_p[] = { + 0xD6, 0x7D, 0xE4, 0x40, 0xCB, 0xBB, 0xDC, 0x19, 0x36, 0xD6, 0x93, 0xD3, + 0x4A, 0xFD, 0x0A, 0xD5, 0x0C, 0x84, 0xD2, 0x39, 0xA4, 0x5F, 0x52, 0x0B, + 0xB8, 0x81, 0x74, 0xCB, 0x98, 0xBC, 0xE9, 0x51, 0x84, 0x9F, 0x91, 0x2E, +@@ -86,14 +86,14 @@ static unsigned char dh1024_p[] = { + 0x88, 0xAE, 0xAA, 0x74, 0x7D, 0xE0, 0xF4, 0xD6, 0xE2, 0xBD, 0x68, 0xB0, + 0xE7, 0x39, 0x3E, 0x0F, 0x24, 0x21, 0x8E, 0xB3, + }; +-static unsigned char dh1024_g[] = { ++static unsigned char dh3072_g[] = { + 0x02, + }; + +-static DH *get_dh1024(void) ++static DH *get_dh3072(void) + { +- return modssl_dh_configure(dh1024_p, sizeof(dh1024_p), +- dh1024_g, sizeof(dh1024_g)); ++ return modssl_dh_configure(dh3072_p, sizeof(dh3072_p), ++ dh3072_g, sizeof(dh3072_g)); + } + + /* ----END GENERATED SECTION---------- */ @@ -102,12 +102,12 @@ DH *ssl_dh_GetTmpParam(int nKeyLen) { DH *dh; @@ -33,8 +102,8 @@ $rand = "-rand $rand" if ($rand ne ''); -system("openssl gendh $rand -out dh512.pem 512"); -system("openssl gendh $rand -out dh1024.pem 1024"); -+system("openssl gendh $rand -out dh2048.pem 2048"); -+system("openssl gendh $rand -out dh3072.pem 3072"); ++system("openssl gendh -out dh2048.pem 2048"); ++system("openssl gendh -out dh3072.pem 3072"); # generate DH param info my $dhinfo = ''; From owner-svn-ports-branches@FreeBSD.ORG Thu Jun 11 19:27:56 2015 Return-Path: Delivered-To: svn-ports-branches@hub.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 462DF924; Thu, 11 Jun 2015 19:27:56 +0000 (UTC) (envelope-from rene@FreeBSD.org) 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 3430519F3; Thu, 11 Jun 2015 19:27:56 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5BJRuSv051800; Thu, 11 Jun 2015 19:27:56 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5BJRtuV051795; Thu, 11 Jun 2015 19:27:55 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201506111927.t5BJRtuV051795@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Thu, 11 Jun 2015 19:27:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r389247 - branches/2015Q2/www/chromium 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, 11 Jun 2015 19:27:56 -0000 Author: rene Date: Thu Jun 11 19:27:55 2015 New Revision: 389247 URL: https://svnweb.freebsd.org/changeset/ports/389247 Log: MFH: r389245 www/chromium: update to 43.0.2357.124 (bugfix release). While here remove spurious DISTFILES declaration. Changelog: https://chromium.googlesource.com/chromium/src/+log/43.0.2357.81..43.0.2357.124 Approved by: ports-secteam (delphij, zi) Modified: branches/2015Q2/www/chromium/Makefile branches/2015Q2/www/chromium/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/www/chromium/Makefile ============================================================================== --- branches/2015Q2/www/chromium/Makefile Thu Jun 11 19:19:59 2015 (r389246) +++ branches/2015Q2/www/chromium/Makefile Thu Jun 11 19:27:55 2015 (r389247) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 43.0.2357.81 +PORTVERSION= 43.0.2357.124 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= chromium@FreeBSD.org COMMENT= Google web browser based on WebKit Modified: branches/2015Q2/www/chromium/distinfo ============================================================================== --- branches/2015Q2/www/chromium/distinfo Thu Jun 11 19:19:59 2015 (r389246) +++ branches/2015Q2/www/chromium/distinfo Thu Jun 11 19:27:55 2015 (r389247) @@ -1,2 +1,2 @@ -SHA256 (chromium-43.0.2357.81.tar.xz) = b15511eb6830df871323dbb46aa82070abca57b6fc6e493f34f64d5fe78d04a3 -SIZE (chromium-43.0.2357.81.tar.xz) = 304276332 +SHA256 (chromium-43.0.2357.124.tar.xz) = 22c126d1840e9fccf609bb0cd572035ac00338d53916381a33bd9ee0ca5aa826 +SIZE (chromium-43.0.2357.124.tar.xz) = 304342308 From owner-svn-ports-branches@FreeBSD.ORG Fri Jun 12 00:23:24 2015 Return-Path: Delivered-To: svn-ports-branches@hub.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 D0E98A18; Fri, 12 Jun 2015 00:23:24 +0000 (UTC) (envelope-from avilla@FreeBSD.org) 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 BEBFE1B0C; Fri, 12 Jun 2015 00:23:24 +0000 (UTC) (envelope-from avilla@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5C0NORC004799; Fri, 12 Jun 2015 00:23:24 GMT (envelope-from avilla@FreeBSD.org) Received: (from avilla@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5C0NO93004798; Fri, 12 Jun 2015 00:23:24 GMT (envelope-from avilla@FreeBSD.org) Message-Id: <201506120023.t5C0NO93004798@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: avilla set sender to avilla@FreeBSD.org using -f From: Alberto Villa Date: Fri, 12 Jun 2015 00:23:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r389256 - branches/2015Q2/multimedia/vid.stab/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, 12 Jun 2015 00:23:24 -0000 Author: avilla Date: Fri Jun 12 00:23:24 2015 New Revision: 389256 URL: https://svnweb.freebsd.org/changeset/ports/389256 Log: MFH: r389231 multimedia/vid.stab: fix build on ARM and MIPS The project was hardcoding SSE support, thus making the build fail on ARM and MIPS architectures. PR: 197133 Approved by: portmgr Added: branches/2015Q2/multimedia/vid.stab/files/ - copied from r389231, head/multimedia/vid.stab/files/ Modified: Directory Properties: branches/2015Q2/ (props changed) From owner-svn-ports-branches@FreeBSD.ORG Fri Jun 12 15:09:51 2015 Return-Path: Delivered-To: svn-ports-branches@hub.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 B1B57419; Fri, 12 Jun 2015 15:09:51 +0000 (UTC) (envelope-from brd@FreeBSD.org) 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 935DD63B; Fri, 12 Jun 2015 15:09:51 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5CF9pHU045485; Fri, 12 Jun 2015 15:09:51 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5CF9n2I045470; Fri, 12 Jun 2015 15:09:49 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201506121509.t5CF9n2I045470@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Fri, 12 Jun 2015 15:09:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r389276 - in branches/2015Q2/security: ossec-hids-client ossec-hids-local ossec-hids-server 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, 12 Jun 2015 15:09:51 -0000 Author: brd Date: Fri Jun 12 15:09:49 2015 New Revision: 389276 URL: https://svnweb.freebsd.org/changeset/ports/389276 Log: MFH r389271 Update security/ossec-hids-* to 2.8.2. Approved by: portmgr (erwin) Approved by: swills (mentor) Security: c470db07-1098-11e5-b6a8-002590263bf5 Modified: branches/2015Q2/security/ossec-hids-client/Makefile branches/2015Q2/security/ossec-hids-client/pkg-plist.client branches/2015Q2/security/ossec-hids-local/Makefile branches/2015Q2/security/ossec-hids-server/Makefile branches/2015Q2/security/ossec-hids-server/distinfo branches/2015Q2/security/ossec-hids-server/pkg-plist Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/security/ossec-hids-client/Makefile ============================================================================== --- branches/2015Q2/security/ossec-hids-client/Makefile Fri Jun 12 14:42:23 2015 (r389275) +++ branches/2015Q2/security/ossec-hids-client/Makefile Fri Jun 12 15:09:49 2015 (r389276) @@ -1,7 +1,7 @@ # Created by: Valerio Daelli # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= The client port of ossec-hids CLIENT_ONLY= yes Modified: branches/2015Q2/security/ossec-hids-client/pkg-plist.client ============================================================================== --- branches/2015Q2/security/ossec-hids-client/pkg-plist.client Fri Jun 12 14:42:23 2015 (r389275) +++ branches/2015Q2/security/ossec-hids-client/pkg-plist.client Fri Jun 12 15:09:49 2015 (r389276) @@ -45,24 +45,25 @@ %%PORTNAME%%/agentless/ssh.exp %%PORTNAME%%/agentless/register_host.sh %%PORTNAME%%/agentless/su.exp -@dirrmtry %%PORTNAME%%/agentless -@dirrmtry %%PORTNAME%%/active-response/bin -@dirrmtry %%PORTNAME%%/active-response -@dirrmtry %%PORTNAME%%/etc/shared -@dirrmtry %%PORTNAME%%/etc/ -@dirrmtry %%PORTNAME%%/var/run -@dirrmtry %%PORTNAME%%/var -@dirrmtry %%PORTNAME%%/queue/syscheck -@dirrmtry %%PORTNAME%%/queue/rids +@dir %%PORTNAME%%/agentless +@dir %%PORTNAME%%/active-response/bin +@dir %%PORTNAME%%/active-response +@dir %%PORTNAME%%/etc/shared +@dir %%PORTNAME%%/etc +@dir %%PORTNAME%%/tmp +@dir %%PORTNAME%%/var/run +@dir %%PORTNAME%%/var +@dir %%PORTNAME%%/queue/syscheck +@dir %%PORTNAME%%/queue/rids @owner ossec -@dirrmtry %%PORTNAME%%/queue/ossec -@dirrmtry %%PORTNAME%%/queue/diff +@dir %%PORTNAME%%/queue/ossec +@dir %%PORTNAME%%/queue/diff @owner -@dirrmtry %%PORTNAME%%/queue/alerts -@dirrmtry %%PORTNAME%%/queue -@dirrmtry %%PORTNAME%%/logs -@dirrmtry %%PORTNAME%%/bin +@dir %%PORTNAME%%/queue/alerts +@dir %%PORTNAME%%/queue +@dir %%PORTNAME%%/logs +@dir %%PORTNAME%%/bin @owner ossec -@dirrmtry %%PORTNAME%%/.ssh +@dir %%PORTNAME%%/.ssh @owner -@dirrmtry %%PORTNAME%% +@dir %%PORTNAME%% Modified: branches/2015Q2/security/ossec-hids-local/Makefile ============================================================================== --- branches/2015Q2/security/ossec-hids-local/Makefile Fri Jun 12 14:42:23 2015 (r389275) +++ branches/2015Q2/security/ossec-hids-local/Makefile Fri Jun 12 15:09:49 2015 (r389276) @@ -1,7 +1,7 @@ # Created by: Valerio Daelli # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= The client and server (local) port of ossec-hids LOCAL_ONLY= yes Modified: branches/2015Q2/security/ossec-hids-server/Makefile ============================================================================== --- branches/2015Q2/security/ossec-hids-server/Makefile Fri Jun 12 14:42:23 2015 (r389275) +++ branches/2015Q2/security/ossec-hids-server/Makefile Fri Jun 12 15:09:49 2015 (r389276) @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= ossec-hids -PORTVERSION= 2.8.1 -PORTREVISION?= 1 +PORTVERSION= 2.8.2 +PORTREVISION?= 0 CATEGORIES= security -MASTER_SITES= http://www.ossec.net/files/ \ - http://www.ossec.net/files/old/ +USE_GITHUB= yes +GH_ACCOUNT= ossec PKGNAMESUFFIX= -server MAINTAINER= brd@FreeBSD.org @@ -54,10 +54,12 @@ USES+= pgsql .endif .endif +STRIP_FILES= ossec-luac agent_control ossec-lua ossec-dbd ossec-regex ossec-monitord ossec-makelists verify-agent-conf ossec-analysisd ossec-agentlessd syscheck_control ossec-execd manage_agents ossec-csyslogd ossec-syscheckd ossec-logtest ossec-authd ossec-logcollector list_agents ossec-maild clear_stats ossec-remoted ossec-reportd rootcheck_control syscheck_update .if defined(CLIENT_ONLY) SUB_LIST+= PRECMD=: PKGNAMESUFFIX= -client CONFLICTS= ossec-hids-server-[0-9]* ossec-hids-local-[0-9]* +STRIP_FILES= agent-auth manage_agents ossec-agentd ossec-execd ossec-logcollector ossec-lua ossec-luac ossec-syscheckd .elif defined(LOCAL_ONLY) SUB_LIST+= PRECMD=ossechids_start_precmd PKGNAMESUFFIX= -local @@ -106,6 +108,9 @@ do-install: post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}/etc +.for file in ${STRIP_FILES} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/ossec-hids/bin/${file} +.endfor .if defined(CLIENT_ONLY) @${CP} ${WRKSRC}/etc/ossec-agent.conf ${STAGEDIR}${PREFIX}/${PORTNAME}/etc/ossec.conf.sample Modified: branches/2015Q2/security/ossec-hids-server/distinfo ============================================================================== --- branches/2015Q2/security/ossec-hids-server/distinfo Fri Jun 12 14:42:23 2015 (r389275) +++ branches/2015Q2/security/ossec-hids-server/distinfo Fri Jun 12 15:09:49 2015 (r389276) @@ -1,2 +1,2 @@ -SHA256 (ossec-hids-2.8.1.tar.gz) = 03c073761aa484fe21a9fcc0ea318ba132ff2466c64360408046a4b8e527b529 -SIZE (ossec-hids-2.8.1.tar.gz) = 1634812 +SHA256 (ossec-ossec-hids-2.8.2_GH0.tar.gz) = 61e0892175a79fe119c8bab886cd41fcc3be9b84526600b06c18fa178a59cb34 +SIZE (ossec-ossec-hids-2.8.2_GH0.tar.gz) = 1635142 Modified: branches/2015Q2/security/ossec-hids-server/pkg-plist ============================================================================== --- branches/2015Q2/security/ossec-hids-server/pkg-plist Fri Jun 12 14:42:23 2015 (r389275) +++ branches/2015Q2/security/ossec-hids-server/pkg-plist Fri Jun 12 15:09:49 2015 (r389276) @@ -131,40 +131,40 @@ @owner root @group ossec @mode 550 -@dirrmtry %%PORTNAME%%/.ssh -@dirrmtry %%PORTNAME%%/active-response/bin -@dirrmtry %%PORTNAME%%/active-response -@dirrmtry %%PORTNAME%%/agentless -@dirrmtry %%PORTNAME%%/bin -@dirrmtry %%PORTNAME%%/etc/shared -@dirrmtry %%PORTNAME%%/etc -@dirrmtry %%PORTNAME%%/queue/rootcheck -@dirrmtry %%PORTNAME%%/rules -@dirrmtry %%PORTNAME%%/tmp +@dir %%PORTNAME%%/.ssh +@dir %%PORTNAME%%/active-response/bin +@dir %%PORTNAME%%/active-response +@dir %%PORTNAME%%/agentless +@dir %%PORTNAME%%/bin +@dir %%PORTNAME%%/etc/shared +@dir %%PORTNAME%%/etc +@dir %%PORTNAME%%/queue/rootcheck +@dir %%PORTNAME%%/rules +@dir %%PORTNAME%%/tmp @mode 770 -@dirrmtry %%PORTNAME%%/var/run +@dir %%PORTNAME%%/var/run @mode 550 -@dirrmtry %%PORTNAME%%/var +@dir %%PORTNAME%%/var @owner ossec @mode 770 -@dirrmtry %%PORTNAME%%/queue/alerts -@dirrmtry %%PORTNAME%%/queue/ossec +@dir %%PORTNAME%%/queue/alerts +@dir %%PORTNAME%%/queue/ossec @mode 750 -@dirrmtry %%PORTNAME%%/queue/fts -@dirrmtry %%PORTNAME%%/queue/syscheck -@dirrmtry %%PORTNAME%%/queue/diff -@dirrmtry %%PORTNAME%%/queue/agentless -@dirrmtry %%PORTNAME%%/stats -@dirrmtry %%PORTNAME%%/logs/alerts -@dirrmtry %%PORTNAME%%/logs/archives -@dirrmtry %%PORTNAME%%/logs/firewall -@dirrmtry %%PORTNAME%%/logs +@dir %%PORTNAME%%/queue/fts +@dir %%PORTNAME%%/queue/syscheck +@dir %%PORTNAME%%/queue/diff +@dir %%PORTNAME%%/queue/agentless +@dir %%PORTNAME%%/stats +@dir %%PORTNAME%%/logs/alerts +@dir %%PORTNAME%%/logs/archives +@dir %%PORTNAME%%/logs/firewall +@dir %%PORTNAME%%/logs @owner ossecr -@dirrmtry %%PORTNAME%%/queue/agent-info -@dirrmtry %%PORTNAME%%/queue/rids +@dir %%PORTNAME%%/queue/agent-info +@dir %%PORTNAME%%/queue/rids @owner ossec @mode 550 -@dirrmtry %%PORTNAME%%/queue +@dir %%PORTNAME%%/queue @owner root @mode 550 -@dirrmtry %%PORTNAME%% +@dir %%PORTNAME%% From owner-svn-ports-branches@FreeBSD.ORG Sat Jun 13 03:16:56 2015 Return-Path: Delivered-To: svn-ports-branches@hub.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 75BF32A6; Sat, 13 Jun 2015 03:16:56 +0000 (UTC) (envelope-from rene@FreeBSD.org) 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 49C897AA; Sat, 13 Jun 2015 03:16:56 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5D3GusS016025; Sat, 13 Jun 2015 03:16:56 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5D3Gt7Z016023; Sat, 13 Jun 2015 03:16:55 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201506130316.t5D3Gt7Z016023@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sat, 13 Jun 2015 03:16:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r389314 - branches/2015Q2/www/chromium 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: Sat, 13 Jun 2015 03:16:56 -0000 Author: rene Date: Sat Jun 13 03:16:55 2015 New Revision: 389314 URL: https://svnweb.freebsd.org/changeset/ports/389314 Log: MFH: r389311 www/chromium: update to 43.0.2357.125 - re-enable the TEST option as the distfile is available - re-add DISTFILES to get distinfo correct Changelog: https://chromium.googlesource.com/chromium/src/+log/43.0.2357.124..43.0.2357.125 Approved by: portmgr (erwin) Modified: branches/2015Q2/www/chromium/Makefile branches/2015Q2/www/chromium/distinfo Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/www/chromium/Makefile ============================================================================== --- branches/2015Q2/www/chromium/Makefile Sat Jun 13 03:03:51 2015 (r389313) +++ branches/2015Q2/www/chromium/Makefile Sat Jun 13 03:16:55 2015 (r389314) @@ -2,9 +2,10 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 43.0.2357.124 +PORTVERSION= 43.0.2357.125 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on MAINTAINER= chromium@FreeBSD.org COMMENT= Google web browser based on WebKit @@ -127,7 +128,7 @@ GYP_DEFINES+= google_api_key=AIzaSyBsp9n SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" -OPTIONS_DEFINE= CODECS GCONF PULSEAUDIO KERBEROS DEBUG #TEST +OPTIONS_DEFINE= CODECS GCONF PULSEAUDIO TEST KERBEROS DEBUG CODECS_DESC= Compile and enable patented codecs like H.264 OPTIONS_DEFAULT= CODECS GCONF KERBEROS Modified: branches/2015Q2/www/chromium/distinfo ============================================================================== --- branches/2015Q2/www/chromium/distinfo Sat Jun 13 03:03:51 2015 (r389313) +++ branches/2015Q2/www/chromium/distinfo Sat Jun 13 03:16:55 2015 (r389314) @@ -1,2 +1,4 @@ -SHA256 (chromium-43.0.2357.124.tar.xz) = 22c126d1840e9fccf609bb0cd572035ac00338d53916381a33bd9ee0ca5aa826 -SIZE (chromium-43.0.2357.124.tar.xz) = 304342308 +SHA256 (chromium-43.0.2357.125.tar.xz) = af1774d093f90f9ccfd7def3b2b3a8caa109274ac28d4bec0285e50f8a5a5405 +SIZE (chromium-43.0.2357.125.tar.xz) = 304342620 +SHA256 (chromium-43.0.2357.125-testdata.tar.xz) = ae2ee269015d5f1de514ce763e5d46014523a8823dd8ce8b9249681a2bc70d19 +SIZE (chromium-43.0.2357.125-testdata.tar.xz) = 114573352 From owner-svn-ports-branches@FreeBSD.ORG Sat Jun 13 03:32:10 2015 Return-Path: Delivered-To: svn-ports-branches@hub.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 C0A9B582; Sat, 13 Jun 2015 03:32:10 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) 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 ADFD6BE1; Sat, 13 Jun 2015 03:32:10 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5D3WAZQ025446; Sat, 13 Jun 2015 03:32:10 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5D3WAbp025442; Sat, 13 Jun 2015 03:32:10 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201506130332.t5D3WAbp025442@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Sat, 13 Jun 2015 03:32:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r389315 - in branches/2015Q2/Mk: . Uses 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: Sat, 13 Jun 2015 03:32:10 -0000 Author: bdrewery Date: Sat Jun 13 03:32:09 2015 New Revision: 389315 URL: https://svnweb.freebsd.org/changeset/ports/389315 Log: MFH: r383692 - Make it possible to override _MAKE_JOBS when MAKE_JOBS_NUMBER=1 - Override it for USES=ninja With this commit and r383571, ports using ninja and waf now respect MAKE_JOBS_NUMBER when it's equal to 1 PR: 197910 With hat: portmgr Modified: branches/2015Q2/Mk/Uses/ninja.mk branches/2015Q2/Mk/bsd.port.mk Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/Mk/Uses/ninja.mk ============================================================================== --- branches/2015Q2/Mk/Uses/ninja.mk Sat Jun 13 03:16:55 2015 (r389314) +++ branches/2015Q2/Mk/Uses/ninja.mk Sat Jun 13 03:32:09 2015 (r389315) @@ -27,6 +27,8 @@ CMAKE_ARGS+= -GNinja MAKEFILE= MAKE_CMD= ninja MAKE_FLAGS= +# Set a minimal job of 1 +_MAKE_JOBS= -j${MAKE_JOBS_NUMBER} _DESTDIR_VIA_ENV= yes .endif Modified: branches/2015Q2/Mk/bsd.port.mk ============================================================================== --- branches/2015Q2/Mk/bsd.port.mk Sat Jun 13 03:16:55 2015 (r389314) +++ branches/2015Q2/Mk/bsd.port.mk Sat Jun 13 03:32:09 2015 (r389315) @@ -2061,7 +2061,7 @@ ${lang}FLAGS+= ${${lang}FLAGS_${ARCH}} # Multiple make jobs support .if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE) -_MAKE_JOBS= # +_MAKE_JOBS?= # MAKE_JOBS_NUMBER= 1 .else .if defined(MAKE_JOBS_NUMBER) From owner-svn-ports-branches@FreeBSD.ORG Sat Jun 13 11:10:01 2015 Return-Path: Delivered-To: svn-ports-branches@hub.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 038D9B07; Sat, 13 Jun 2015 11:10:01 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) 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 E2732D64; Sat, 13 Jun 2015 11:10:00 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5DBA0wh064350; Sat, 13 Jun 2015 11:10:00 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5DB9q8F064222; Sat, 13 Jun 2015 11:09:52 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201506131109.t5DB9q8F064222@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 13 Jun 2015 11:09:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r389345 - in branches/2015Q2: Mk audio/opus audio/opus-tools audio/opusfile devel/bugzilla44 lang/spidermonkey17 mail/linux-thunderbird mail/thunderbird mail/thunderbird-i18n textproc/s... 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: Sat, 13 Jun 2015 11:10:01 -0000 Author: jbeich Date: Sat Jun 13 11:09:51 2015 New Revision: 389345 URL: https://svnweb.freebsd.org/changeset/ports/389345 Log: MFH: r388939 bsd.sites.mk: cleanup MOZILLA mirrors - Switch to CDN by default as mirrors are no longer kept up to date - Drop obsolete pointer to http://www.mozilla.org/mirrors.html - Drop redundant BUGZILLA and MOZILLA_EXTEND - Shorten MASTER_SITES in gecko@ ports - Move MOZILLA_ADDONS to bsd.sites.mk - Move one of MOZILLA mirrors with old addons under MOZILLA_ADDONS - Addons CDN redirects to https://, so don't mislead with http:// https://blog.mozilla.org/it/2012/08/03/dear-mozilla-mirrors-thank-you/ Differential Revision: https://reviews.freebsd.org/D2550 Tested by: distilator Reviewed by: mat (partial) Approved by: bz-ports (ohauer), portmgr blanket (office@ et al.) Approved by: portmgr (bapt, earlier version) Approved by: ports-secteam (delphij) Modified: branches/2015Q2/Mk/bsd.sites.mk branches/2015Q2/audio/opus-tools/Makefile branches/2015Q2/audio/opus/Makefile branches/2015Q2/audio/opusfile/Makefile branches/2015Q2/devel/bugzilla44/Makefile branches/2015Q2/lang/spidermonkey17/Makefile branches/2015Q2/mail/linux-thunderbird/Makefile branches/2015Q2/mail/thunderbird-i18n/Makefile branches/2015Q2/mail/thunderbird/Makefile branches/2015Q2/textproc/so-hunspell/Makefile branches/2015Q2/textproc/sr-hunspell/Makefile branches/2015Q2/textproc/ss-hunspell/Makefile branches/2015Q2/textproc/tk-hunspell/Makefile branches/2015Q2/textproc/tn-hunspell/Makefile branches/2015Q2/textproc/ts-hunspell/Makefile branches/2015Q2/textproc/ve-hunspell/Makefile branches/2015Q2/textproc/xh-hunspell/Makefile branches/2015Q2/textproc/yi-hunspell/Makefile branches/2015Q2/textproc/zu-hunspell/Makefile branches/2015Q2/www/firefox-esr-i18n/Makefile branches/2015Q2/www/firefox-esr/Makefile branches/2015Q2/www/firefox-i18n/Makefile branches/2015Q2/www/firefox/Makefile branches/2015Q2/www/libxul/Makefile branches/2015Q2/www/linux-firefox/Makefile branches/2015Q2/www/linux-seamonkey/Makefile branches/2015Q2/www/seamonkey-i18n/Makefile branches/2015Q2/www/seamonkey/Makefile branches/2015Q2/www/xpi-adblock/Makefile.xpi branches/2015Q2/www/xpi-downthemall/Makefile Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/Mk/bsd.sites.mk ============================================================================== --- branches/2015Q2/Mk/bsd.sites.mk Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/Mk/bsd.sites.mk Sat Jun 13 11:09:51 2015 (r389345) @@ -770,43 +770,18 @@ MASTER_SITE_MOZDEV+= \ http://ftp.osuosl.org/pub/mozdev/%SUBDIR%/ .endif -# releases.mozilla.org mirror sites -# -# For the full list, see the following: -# -# http://www.mozilla.org/mirrors.html -# .if !defined(IGNORE_MASTER_SITE_MOZILLA) MASTER_SITE_MOZILLA+= \ - https://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ - http://mirror3.mirrors.tds.net/pub/mozilla.org/%SUBDIR%/ \ - http://mozilla.isc.org/pub/mozilla.org/%SUBDIR%/ \ http://releases.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ - http://kyoto-mz-dl.sinet.ad.jp/pub/mozilla.org/%SUBDIR%/ \ - http://jp-nii01.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ - http://jp-nii02.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ - http://mirror.internode.on.net/pub/mozilla/%SUBDIR%/ \ - http://ftp.acc.umu.se/pub/mozilla.org/%SUBDIR%/ \ - http://mozilla.c3sl.ufpr.br/releases/%SUBDIR%/ \ - http://www.gtlib.gatech.edu/pub/mozilla.org/%SUBDIR%/ \ - ftp://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ - ftp://ftp.fh-wolfenbuettel.de/pub/www/mozilla/%SUBDIR%/ \ - ftp://ftp.informatik.rwth-aachen.de/pub/mirror/ftp.mozilla.org/pub/%SUBDIR%/ \ - http://ftp.twaren.net/Unix/Mozilla/%SUBDIR%/ -.endif - -.if !defined(IGNORE_MASTER_SITE_BUGZILLA) -MASTER_SITE_BUGZILLA+= \ https://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ http://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ - ftp://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ - http://mirror.internode.on.net/pub/mozilla/%SUBDIR%/ + ftp://ftp.mozilla.org/pub/mozilla.org/%SUBDIR%/ .endif -.if !defined(IGNORE_MASTER_SITE_MOZILLA_EXTENDED) -MASTER_SITE_MOZILLA_EXTENDED+= \ - http://releases.mozilla.org/pub/mozilla.org/%SUBDIR%/ \ - ${MASTER_SITE_MOZILLA} +.if !defined(IGNORE_MASTER_SITE_MOZILLA_ADDONS) +MASTER_SITE_MOZILLA_ADDONS+= \ + https://addons.cdn.mozilla.net/user-media/%SUBDIR%/ \ + http://kyoto-mz-dl.sinet.ad.jp/pub/mozilla.org/%SUBDIR%/ .endif .if !defined(IGNORE_MASTER_SITE_MPLAYERHQ) Modified: branches/2015Q2/audio/opus-tools/Makefile ============================================================================== --- branches/2015Q2/audio/opus-tools/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/audio/opus-tools/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -5,7 +5,7 @@ PORTVERSION= 0.1.9 PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/opus/ \ - ${MASTER_SITE_MOZILLA_EXTENDED} + ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= opus MAINTAINER= naddy@FreeBSD.org Modified: branches/2015Q2/audio/opus/Makefile ============================================================================== --- branches/2015Q2/audio/opus/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/audio/opus/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -5,7 +5,7 @@ PORTVERSION= 1.1 PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/opus/ \ - ${MASTER_SITE_MOZILLA_EXTENDED} + ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= opus MAINTAINER= naddy@FreeBSD.org Modified: branches/2015Q2/audio/opusfile/Makefile ============================================================================== --- branches/2015Q2/audio/opusfile/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/audio/opusfile/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -5,7 +5,7 @@ PORTVERSION= 0.6 PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://downloads.xiph.org/releases/opus/ \ - ${MASTER_SITE_MOZILLA_EXTENDED} + ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= opus MAINTAINER= liangtai.s16@gmail.com Modified: branches/2015Q2/devel/bugzilla44/Makefile ============================================================================== --- branches/2015Q2/devel/bugzilla44/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/devel/bugzilla44/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -3,7 +3,7 @@ PORTNAME= bugzilla PORTVERSION= 4.4.8 CATEGORIES= devel -MASTER_SITES= BUGZILLA +MASTER_SITES= MOZILLA MASTER_SITE_SUBDIR= webtools webtools/archived MAINTAINER= bz-ports@FreeBSD.org Modified: branches/2015Q2/lang/spidermonkey17/Makefile ============================================================================== --- branches/2015Q2/lang/spidermonkey17/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/lang/spidermonkey17/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -5,7 +5,7 @@ PORTNAME= spidermonkey17 DISTVERSION= 1.7.0 PORTREVISION= 1 CATEGORIES= lang -MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} +MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= js DISTNAME= js-${DISTVERSION} Modified: branches/2015Q2/mail/linux-thunderbird/Makefile ============================================================================== --- branches/2015Q2/mail/linux-thunderbird/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/mail/linux-thunderbird/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -5,7 +5,7 @@ PORTNAME= thunderbird DISTVERSION= 31.7.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US/ + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above Modified: branches/2015Q2/mail/thunderbird-i18n/Makefile ============================================================================== --- branches/2015Q2/mail/thunderbird-i18n/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/mail/thunderbird-i18n/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -5,7 +5,7 @@ PORTNAME= thunderbird-i18n PORTVERSION= 31.7.0 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi/ + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${THUNDERBIRD_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} Modified: branches/2015Q2/mail/thunderbird/Makefile ============================================================================== --- branches/2015Q2/mail/thunderbird/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/mail/thunderbird/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -5,7 +5,7 @@ PORTNAME= thunderbird DISTVERSION= 31.7.0 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} Modified: branches/2015Q2/textproc/so-hunspell/Makefile ============================================================================== --- branches/2015Q2/textproc/so-hunspell/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/textproc/so-hunspell/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -4,7 +4,7 @@ PORTNAME= hunspell PORTVERSION= 1.0.2 PORTREVISION= 1 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/13375 +MASTER_SITES= MOZILLA_ADDONS/addons/13375 PKGNAMEPREFIX= so- DISTNAME= qaamuuska_af_soomaaliga-${PORTVERSION}-tb+fx EXTRACT_SUFX= .xpi Modified: branches/2015Q2/textproc/sr-hunspell/Makefile ============================================================================== --- branches/2015Q2/textproc/sr-hunspell/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/textproc/sr-hunspell/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -4,7 +4,7 @@ PORTNAME= hunspell PORTVERSION= 0.18 PORTREVISION= 1 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/10894 +MASTER_SITES= MOZILLA_ADDONS/addons/10894 PKGNAMEPREFIX= sr- DISTNAME= serbian_dictionary-${PORTVERSION}-fx+tb+sm EXTRACT_SUFX= .xpi Modified: branches/2015Q2/textproc/ss-hunspell/Makefile ============================================================================== --- branches/2015Q2/textproc/ss-hunspell/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/textproc/ss-hunspell/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -4,7 +4,7 @@ PORTNAME= hunspell PORTVERSION= 20110323 PORTREVISION= 1 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/46614 +MASTER_SITES= MOZILLA_ADDONS/addons/46614 PKGNAMEPREFIX= ss- DISTNAME= swati_spell_checker-${PORTVERSION}-tb+sm+fx+fn EXTRACT_SUFX= .xpi Modified: branches/2015Q2/textproc/tk-hunspell/Makefile ============================================================================== --- branches/2015Q2/textproc/tk-hunspell/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/textproc/tk-hunspell/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -3,7 +3,7 @@ PORTNAME= hunspell PORTVERSION= 0.1.6 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/204314 +MASTER_SITES= MOZILLA_ADDONS/addons/204314 PKGNAMEPREFIX= tk- DISTNAME= turkmen_spell_checker_dictionary-${PORTVERSION}-tb+fx+sm EXTRACT_SUFX= .xpi Modified: branches/2015Q2/textproc/tn-hunspell/Makefile ============================================================================== --- branches/2015Q2/textproc/tn-hunspell/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/textproc/tn-hunspell/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -4,7 +4,7 @@ PORTNAME= hunspell PORTVERSION= 20110323 PORTREVISION= 1 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/46617 +MASTER_SITES= MOZILLA_ADDONS/addons/46617 PKGNAMEPREFIX= tn- DISTNAME= tswana_spell_checker-${PORTVERSION}-tb+sm+fx+fn EXTRACT_SUFX= .xpi Modified: branches/2015Q2/textproc/ts-hunspell/Makefile ============================================================================== --- branches/2015Q2/textproc/ts-hunspell/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/textproc/ts-hunspell/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -4,7 +4,7 @@ PORTNAME= hunspell PORTVERSION= 20110323 PORTREVISION= 1 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/46611 +MASTER_SITES= MOZILLA_ADDONS/addons/46611 PKGNAMEPREFIX= ts- DISTNAME= tsonga_spell_checker-${PORTVERSION}-tb+sm+fx+fn EXTRACT_SUFX= .xpi Modified: branches/2015Q2/textproc/ve-hunspell/Makefile ============================================================================== --- branches/2015Q2/textproc/ve-hunspell/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/textproc/ve-hunspell/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -4,7 +4,7 @@ PORTNAME= hunspell PORTVERSION= 20110323 PORTREVISION= 1 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/46601 +MASTER_SITES= MOZILLA_ADDONS/addons/46601 PKGNAMEPREFIX= ve- DISTNAME= venda_spell_checker-${PORTVERSION}-tb+fn+fx+sm EXTRACT_SUFX= .xpi Modified: branches/2015Q2/textproc/xh-hunspell/Makefile ============================================================================== --- branches/2015Q2/textproc/xh-hunspell/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/textproc/xh-hunspell/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -4,7 +4,7 @@ PORTNAME= hunspell PORTVERSION= 20110323 PORTREVISION= 1 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/46599 +MASTER_SITES= MOZILLA_ADDONS/addons/46599 PKGNAMEPREFIX= xh- DISTNAME= xhosa_spell_checker-${PORTVERSION}-tb+fn+fx+sm EXTRACT_SUFX= .xpi Modified: branches/2015Q2/textproc/yi-hunspell/Makefile ============================================================================== --- branches/2015Q2/textproc/yi-hunspell/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/textproc/yi-hunspell/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -3,7 +3,7 @@ PORTNAME= hunspell PORTVERSION= 0.0.3 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/222538 +MASTER_SITES= MOZILLA_ADDONS/addons/222538 PKGNAMEPREFIX= yi- DISTNAME= yiddish_spell_checker_yivo-${PORTVERSION}-sm+fn+fx+tb EXTRACT_SUFX= .xpi Modified: branches/2015Q2/textproc/zu-hunspell/Makefile ============================================================================== --- branches/2015Q2/textproc/zu-hunspell/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/textproc/zu-hunspell/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -4,7 +4,7 @@ PORTNAME= hunspell PORTVERSION= 20110323 PORTREVISION= 1 CATEGORIES= textproc -MASTER_SITES= MOZILLA_EXTENDED/addons/46490 +MASTER_SITES= MOZILLA_ADDONS/addons/46490 PKGNAMEPREFIX= zu- DISTNAME= zulu_spell_checker-${PORTVERSION}-tb+fn+fx+sm EXTRACT_SUFX= .xpi Modified: branches/2015Q2/www/firefox-esr-i18n/Makefile ============================================================================== --- branches/2015Q2/www/firefox-esr-i18n/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/www/firefox-esr-i18n/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -5,7 +5,7 @@ PORTNAME= firefox PORTVERSION= 31.7.0 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}esr/linux-i686/xpi \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}esr-candidates/build2/linux-i686/xpi/ + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}esr-candidates/build2/linux-i686/xpi PKGNAMEPREFIX= PKGNAMESUFFIX= -esr-i18n DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} Modified: branches/2015Q2/www/firefox-esr/Makefile ============================================================================== --- branches/2015Q2/www/firefox-esr/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/www/firefox-esr/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -7,7 +7,7 @@ DISTVERSIONSUFFIX=esr.source PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source/ + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source PKGNAMESUFFIX= -esr MAINTAINER= gecko@FreeBSD.org Modified: branches/2015Q2/www/firefox-i18n/Makefile ============================================================================== --- branches/2015Q2/www/firefox-i18n/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/www/firefox-i18n/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -5,7 +5,7 @@ PORTNAME= firefox-i18n PORTVERSION= 38.0.1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi/ + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} Modified: branches/2015Q2/www/firefox/Makefile ============================================================================== --- branches/2015Q2/www/firefox/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/www/firefox/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -7,7 +7,7 @@ DISTVERSIONSUFFIX=.source PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla Modified: branches/2015Q2/www/libxul/Makefile ============================================================================== --- branches/2015Q2/www/libxul/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/www/libxul/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -5,7 +5,7 @@ PORTNAME= libxul DISTVERSION= 31.7.0 CATEGORIES?= www devel MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \ - https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${DISTVERSION}esr-candidates/build2/source/ + MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build2/source DISTNAME= firefox-${DISTVERSION}esr.source MAINTAINER?= gecko@FreeBSD.org Modified: branches/2015Q2/www/linux-firefox/Makefile ============================================================================== --- branches/2015Q2/www/linux-firefox/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/www/linux-firefox/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -6,7 +6,7 @@ DISTVERSION= 38.0.1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US/ + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla Modified: branches/2015Q2/www/linux-seamonkey/Makefile ============================================================================== --- branches/2015Q2/www/linux-seamonkey/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/www/linux-seamonkey/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -5,7 +5,7 @@ PORTNAME= seamonkey DISTVERSION= 2.33.1 CATEGORIES= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/linux-i686/en-US \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US/ + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/linux-i686/en-US MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser Modified: branches/2015Q2/www/seamonkey-i18n/Makefile ============================================================================== --- branches/2015Q2/www/seamonkey-i18n/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/www/seamonkey-i18n/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -5,7 +5,7 @@ PORTNAME= seamonkey-i18n PORTVERSION= 2.33.1 CATEGORIES= www mail news editors irc MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/langpack \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/langpack/ + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/langpack PKGNAMEPREFIX= DISTFILES= ${SEAMONKEY_I18N_:S/$/.langpack.xpi/:S/^/seamonkey-${PORTVERSION}./} DIST_SUBDIR= xpi/${DISTNAME} Modified: branches/2015Q2/www/seamonkey/Makefile ============================================================================== --- branches/2015Q2/www/seamonkey/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/www/seamonkey/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -6,7 +6,7 @@ DISTVERSION= 2.33.1 PORTREVISION= 2 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} Modified: branches/2015Q2/www/xpi-adblock/Makefile.xpi ============================================================================== --- branches/2015Q2/www/xpi-adblock/Makefile.xpi Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/www/xpi-adblock/Makefile.xpi Sat Jun 13 11:09:51 2015 (r389345) @@ -58,8 +58,6 @@ # xpi ports do not depend on their master applications. You can install an # extension before the app and run relink when the app is present. -MASTER_SITE_MOZILLA_ADDONS= http://addons.cdn.mozilla.net/user-media/%SUBDIR%/ - .ifndef MASTER_SITES MASTER_SITES?= MOZILLA_ADDONS .ifdef XPI_NUM Modified: branches/2015Q2/www/xpi-downthemall/Makefile ============================================================================== --- branches/2015Q2/www/xpi-downthemall/Makefile Sat Jun 13 11:08:22 2015 (r389344) +++ branches/2015Q2/www/xpi-downthemall/Makefile Sat Jun 13 11:09:51 2015 (r389345) @@ -5,14 +5,13 @@ PORTNAME= downthemall PORTVERSION= 2.0.17 DISTVERSIONSUFFIX= -fx+sm CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} -MASTER_SITE_SUBDIR= addons/201 MAINTAINER= gecko@FreeBSD.org COMMENT= Lets you download all the links in a webpage and much more XPI_DISTNAME= downthemall +XPI_NUM= 201 XPI_ID= {DDC359D1-844A-42a7-9AA1-88A850A938A8} .include "${.CURDIR}/../xpi-adblock/Makefile.xpi" From owner-svn-ports-branches@FreeBSD.ORG Sat Jun 13 14:04:34 2015 Return-Path: Delivered-To: svn-ports-branches@hub.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 D469F93D; Sat, 13 Jun 2015 14:04:34 +0000 (UTC) (envelope-from brd@FreeBSD.org) 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 C2551CCA; Sat, 13 Jun 2015 14:04:34 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5DE4YlB063649; Sat, 13 Jun 2015 14:04:34 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5DE4Yjm063648; Sat, 13 Jun 2015 14:04:34 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201506131404.t5DE4Yjm063648@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Sat, 13 Jun 2015 14:04:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r389436 - branches/2015Q2/security/ossec-hids-server 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: Sat, 13 Jun 2015 14:04:34 -0000 Author: brd Date: Sat Jun 13 14:04:34 2015 New Revision: 389436 URL: https://svnweb.freebsd.org/changeset/ports/389436 Log: Direct commit to fix the distinfo for security/ossec-hids-* with the older USE_GITHUB support. Approved by: zi (mentor Approved by: ports-secteam (zi) Modified: branches/2015Q2/security/ossec-hids-server/distinfo Modified: branches/2015Q2/security/ossec-hids-server/distinfo ============================================================================== --- branches/2015Q2/security/ossec-hids-server/distinfo Sat Jun 13 13:57:26 2015 (r389435) +++ branches/2015Q2/security/ossec-hids-server/distinfo Sat Jun 13 14:04:34 2015 (r389436) @@ -1,2 +1,2 @@ -SHA256 (ossec-ossec-hids-2.8.2_GH0.tar.gz) = 61e0892175a79fe119c8bab886cd41fcc3be9b84526600b06c18fa178a59cb34 -SIZE (ossec-ossec-hids-2.8.2_GH0.tar.gz) = 1635142 +SHA256 (ossec-hids-2.8.2_GH0.tar.gz) = 61e0892175a79fe119c8bab886cd41fcc3be9b84526600b06c18fa178a59cb34 +SIZE (ossec-hids-2.8.2_GH0.tar.gz) = 1635142 From owner-svn-ports-branches@FreeBSD.ORG Sat Jun 13 18:52:13 2015 Return-Path: Delivered-To: svn-ports-branches@hub.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 37E18779; Sat, 13 Jun 2015 18:52:13 +0000 (UTC) (envelope-from xmj@FreeBSD.org) 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 267179D7; Sat, 13 Jun 2015 18:52:13 +0000 (UTC) (envelope-from xmj@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5DIqD7a019676; Sat, 13 Jun 2015 18:52:13 GMT (envelope-from xmj@FreeBSD.org) Received: (from xmj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5DIqD7E019675; Sat, 13 Jun 2015 18:52:13 GMT (envelope-from xmj@FreeBSD.org) Message-Id: <201506131852.t5DIqD7E019675@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: xmj set sender to xmj@FreeBSD.org using -f From: Johannes Jost Meixner Date: Sat, 13 Jun 2015 18:52:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r389479 - branches/2015Q2 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: Sat, 13 Jun 2015 18:52:13 -0000 Author: xmj Date: Sat Jun 13 18:52:12 2015 New Revision: 389479 URL: https://svnweb.freebsd.org/changeset/ports/389479 Log: MFH: r389229 www/linux-*-flashplugin11: update to 11.2r202.466 - update to 11.2r202.466 - fix 13 CVEs. Reported by: kwm@ Approved by: ports-secteam (zi) Security: 1e63db88-1050-11e5-a4df-c485083ca99c Security: CVE-2015-3096 Security: CVE-2015-3097 Security: CVE-2015-3098 Security: CVE-2015-3099 Security: CVE-2015-3100 Security: CVE-2015-3101 Security: CVE-2015-3102 Security: CVE-2015-3103 Security: CVE-2015-3104 Security: CVE-2015-3105 Security: CVE-2015-3106 Security: CVE-2015-3107 Security: CVE-2015-3108 Sponsored by: Perceivon OÜ Modified: Directory Properties: branches/2015Q2/ (props changed)