From owner-svn-ports-branches@freebsd.org Sun Dec 4 19:37:33 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB2B5C6774B; Sun, 4 Dec 2016 19:37:33 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 88922CBC; Sun, 4 Dec 2016 19:37:33 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB4JbWEP065634; Sun, 4 Dec 2016 19:37:32 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB4JbVBk065617; Sun, 4 Dec 2016 19:37:31 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201612041937.uB4JbVBk065617@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sun, 4 Dec 2016 19:37:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r427796 - in branches/2016Q4: emulators/xen-kernel emulators/xen-kernel/files sysutils/xen-tools sysutils/xen-tools/files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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, 04 Dec 2016 19:37:34 -0000 Author: junovitch Date: Sun Dec 4 19:37:31 2016 New Revision: 427796 URL: https://svnweb.freebsd.org/changeset/ports/427796 Log: MFH: r427568 xen: update to 4.7.1 Xen 4.7.1 contains the following XSAs: 184, 185, 186, 187, 188 and 190 which where missing in the previous package. Additionally XSAs 191, 192, 193, 194, 195, 197 and 198 are also applied. PR: 214936 Approved by: bapt Approved by: ports-secteam (with hat) Sponsored by: Citrix Systems R&D Security: CVE-2016-7092 Security: CVE-2016-7093 Security: CVE-2016-7094 Security: CVE-2016-7154 Security: CVE-2016-7777 Security: CVE-2016-9379 Security: CVE-2016-9380 Security: CVE-2016-9381 Security: CVE-2016-9382 Security: CVE-2016-9383 Security: CVE-2016-9384 Security: CVE-2016-9385 Security: CVE-2016-9386 Security: https://vuxml.FreeBSD.org/freebsd/45ca25b5-ba4d-11e6-ae1b-002590263bf5.html Security: https://vuxml.FreeBSD.org/freebsd/49211361-ba4d-11e6-ae1b-002590263bf5.html Security: https://vuxml.FreeBSD.org/freebsd/4aae54be-ba4d-11e6-ae1b-002590263bf5.html Security: https://vuxml.FreeBSD.org/freebsd/4d7cf654-ba4d-11e6-ae1b-002590263bf5.html Security: https://vuxml.FreeBSD.org/freebsd/50ac2e96-ba4d-11e6-ae1b-002590263bf5.html Security: https://vuxml.FreeBSD.org/freebsd/523bb0b7-ba4d-11e6-ae1b-002590263bf5.html Security: https://vuxml.FreeBSD.org/freebsd/53dbd096-ba4d-11e6-ae1b-002590263bf5.html Security: https://vuxml.FreeBSD.org/freebsd/5555120d-ba4d-11e6-ae1b-002590263bf5.html Security: https://vuxml.FreeBSD.org/freebsd/56f0f11e-ba4d-11e6-ae1b-002590263bf5.html Security: https://vuxml.FreeBSD.org/freebsd/58685e23-ba4d-11e6-ae1b-002590263bf5.html Security: https://vuxml.FreeBSD.org/freebsd/59f79c99-ba4d-11e6-ae1b-002590263bf5.html Added: branches/2016Q4/emulators/xen-kernel/files/xsa191.patch - copied unchanged from r427568, head/emulators/xen-kernel/files/xsa191.patch branches/2016Q4/emulators/xen-kernel/files/xsa192.patch - copied unchanged from r427568, head/emulators/xen-kernel/files/xsa192.patch branches/2016Q4/emulators/xen-kernel/files/xsa193-4.7.patch - copied unchanged from r427568, head/emulators/xen-kernel/files/xsa193-4.7.patch branches/2016Q4/emulators/xen-kernel/files/xsa194.patch - copied unchanged from r427568, head/emulators/xen-kernel/files/xsa194.patch branches/2016Q4/emulators/xen-kernel/files/xsa195.patch - copied unchanged from r427568, head/emulators/xen-kernel/files/xsa195.patch branches/2016Q4/sysutils/xen-tools/files/0001-libxl-fix-creation-of-pkgconf-install-dir.patch - copied unchanged from r427568, head/sysutils/xen-tools/files/0001-libxl-fix-creation-of-pkgconf-install-dir.patch branches/2016Q4/sysutils/xen-tools/files/0001-tools-configure-fix-pkg-config-install-path-for-Free.patch - copied unchanged from r427568, head/sysutils/xen-tools/files/0001-tools-configure-fix-pkg-config-install-path-for-Free.patch branches/2016Q4/sysutils/xen-tools/files/xsa197-qemuu.patch - copied unchanged from r427568, head/sysutils/xen-tools/files/xsa197-qemuu.patch branches/2016Q4/sysutils/xen-tools/files/xsa198.patch - copied unchanged from r427568, head/sysutils/xen-tools/files/xsa198.patch Deleted: branches/2016Q4/emulators/xen-kernel/files/xsa182-unstable.patch branches/2016Q4/emulators/xen-kernel/files/xsa183-unstable.patch branches/2016Q4/sysutils/xen-tools/files/xsa184-qemuu-master.patch Modified: branches/2016Q4/emulators/xen-kernel/Makefile branches/2016Q4/emulators/xen-kernel/distinfo branches/2016Q4/sysutils/xen-tools/Makefile branches/2016Q4/sysutils/xen-tools/distinfo branches/2016Q4/sysutils/xen-tools/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/emulators/xen-kernel/Makefile ============================================================================== --- branches/2016Q4/emulators/xen-kernel/Makefile Sun Dec 4 19:35:14 2016 (r427795) +++ branches/2016Q4/emulators/xen-kernel/Makefile Sun Dec 4 19:37:31 2016 (r427796) @@ -2,10 +2,10 @@ PORTNAME= xen PKGNAMESUFFIX= -kernel -PORTVERSION= 4.7.0 -PORTREVISION= 3 +PORTVERSION= 4.7.1 +PORTREVISION= 0 CATEGORIES= emulators -MASTER_SITES= http://bits.xensource.com/oss-xen/release/${PORTVERSION}/ +MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ MAINTAINER= royger@FreeBSD.org COMMENT= Hypervisor using a microkernel design @@ -40,9 +40,11 @@ PLIST_FILES= /boot/xen \ EXTRA_PATCHES= ${FILESDIR}/0001-xen-logdirty-prevent-preemption-if-finished.patch:-p1 \ ${FILESDIR}/0002-xen-rework-paging_log_dirty_op-to-work-with-hvm-gues.patch:-p1 \ ${FILESDIR}/kconf_arch.patch:-p1 \ - ${FILESDIR}/xsa182-unstable.patch:-p1 \ - ${FILESDIR}/xsa183-unstable.patch:-p1 - + ${FILESDIR}/xsa191.patch \ + ${FILESDIR}/xsa192.patch \ + ${FILESDIR}/xsa193-4.7.patch \ + ${FILESDIR}/xsa194.patch \ + ${FILESDIR}/xsa195.patch .include Modified: branches/2016Q4/emulators/xen-kernel/distinfo ============================================================================== --- branches/2016Q4/emulators/xen-kernel/distinfo Sun Dec 4 19:35:14 2016 (r427795) +++ branches/2016Q4/emulators/xen-kernel/distinfo Sun Dec 4 19:37:31 2016 (r427796) @@ -1,3 +1,3 @@ -TIMESTAMP = 1467644898 -SHA256 (xen-4.7.0.tar.gz) = be5876144d49729572ae06142e0bb93f1c1f2695578141eff2931995add24623 -SIZE (xen-4.7.0.tar.gz) = 20702550 +TIMESTAMP = 1480690512 +SHA256 (xen-4.7.1.tar.gz) = e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe +SIZE (xen-4.7.1.tar.gz) = 20706864 Copied: branches/2016Q4/emulators/xen-kernel/files/xsa191.patch (from r427568, head/emulators/xen-kernel/files/xsa191.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/emulators/xen-kernel/files/xsa191.patch Sun Dec 4 19:37:31 2016 (r427796, copy of r427568, head/emulators/xen-kernel/files/xsa191.patch) @@ -0,0 +1,152 @@ +From: Andrew Cooper +Subject: x86/hvm: Fix the handling of non-present segments + +In 32bit, the data segments may be NULL to indicate that the segment is +ineligible for use. In both 32bit and 64bit, the LDT selector may be NULL to +indicate that the entire LDT is ineligible for use. However, nothing in Xen +actually checks for this condition when performing other segmentation +checks. (Note however that limit and writeability checks are correctly +performed). + +Neither Intel nor AMD specify the exact behaviour of loading a NULL segment. +Experimentally, AMD zeroes all attributes but leaves the base and limit +unmodified. Intel zeroes the base, sets the limit to 0xfffffff and resets the +attributes to just .G and .D/B. + +The use of the segment information in the VMCB/VMCS is equivalent to a native +pipeline interacting with the segment cache. The present bit can therefore +have a subtly different meaning, and it is now cooked to uniformly indicate +whether the segment is usable or not. + +GDTR and IDTR don't have access rights like the other segments, but for +consistency, they are treated as being present so no special casing is needed +elsewhere in the segmentation logic. + +AMD hardware does not consider the present bit for %cs and %tr, and will +function as if they were present. They are therefore unconditionally set to +present when reading information from the VMCB, to maintain the new meaning of +usability. + +Intel hardware has a separate unusable bit in the VMCS segment attributes. +This bit is inverted and stored in the present field, so the hvm code can work +with architecturally-common state. + +This is XSA-191. + +Signed-off-by: Andrew Cooper +Reviewed-by: Jan Beulich +--- + xen/arch/x86/hvm/hvm.c | 8 ++++++++ + xen/arch/x86/hvm/svm/svm.c | 4 ++++ + xen/arch/x86/hvm/vmx/vmx.c | 20 +++++++++++--------- + xen/arch/x86/x86_emulate/x86_emulate.c | 4 ++++ + 4 files changed, 27 insertions(+), 9 deletions(-) + +diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c +index 704fd64..deb1783 100644 +--- a/xen/arch/x86/hvm/hvm.c ++++ b/xen/arch/x86/hvm/hvm.c +@@ -2512,6 +2512,10 @@ bool_t hvm_virtual_to_linear_addr( + */ + addr = (uint32_t)(addr + reg->base); + ++ /* Segment not valid for use (cooked meaning of .p)? */ ++ if ( !reg->attr.fields.p ) ++ goto out; ++ + switch ( access_type ) + { + case hvm_access_read: +@@ -2767,6 +2771,10 @@ static int hvm_load_segment_selector( + hvm_get_segment_register( + v, (sel & 4) ? x86_seg_ldtr : x86_seg_gdtr, &desctab); + ++ /* Segment not valid for use (cooked meaning of .p)? */ ++ if ( !desctab.attr.fields.p ) ++ goto fail; ++ + /* Check against descriptor table limit. */ + if ( ((sel & 0xfff8) + 7) > desctab.limit ) + goto fail; +diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c +index 16427f6..4cba406 100644 +--- a/xen/arch/x86/hvm/svm/svm.c ++++ b/xen/arch/x86/hvm/svm/svm.c +@@ -627,6 +627,7 @@ static void svm_get_segment_register(struct vcpu *v, enum x86_segment seg, + { + case x86_seg_cs: + memcpy(reg, &vmcb->cs, sizeof(*reg)); ++ reg->attr.fields.p = 1; + reg->attr.fields.g = reg->limit > 0xFFFFF; + break; + case x86_seg_ds: +@@ -660,13 +661,16 @@ static void svm_get_segment_register(struct vcpu *v, enum x86_segment seg, + case x86_seg_tr: + svm_sync_vmcb(v); + memcpy(reg, &vmcb->tr, sizeof(*reg)); ++ reg->attr.fields.p = 1; + reg->attr.fields.type |= 0x2; + break; + case x86_seg_gdtr: + memcpy(reg, &vmcb->gdtr, sizeof(*reg)); ++ reg->attr.bytes = 0x80; + break; + case x86_seg_idtr: + memcpy(reg, &vmcb->idtr, sizeof(*reg)); ++ reg->attr.bytes = 0x80; + break; + case x86_seg_ldtr: + svm_sync_vmcb(v); +diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c +index 9a8f694..a652c52 100644 +--- a/xen/arch/x86/hvm/vmx/vmx.c ++++ b/xen/arch/x86/hvm/vmx/vmx.c +@@ -1035,10 +1035,12 @@ void vmx_get_segment_register(struct vcpu *v, enum x86_segment seg, + reg->sel = sel; + reg->limit = limit; + +- reg->attr.bytes = (attr & 0xff) | ((attr >> 4) & 0xf00); +- /* Unusable flag is folded into Present flag. */ +- if ( attr & (1u<<16) ) +- reg->attr.fields.p = 0; ++ /* ++ * Fold VT-x representation into Xen's representation. The Present bit is ++ * unconditionally set to the inverse of unusable. ++ */ ++ reg->attr.bytes = ++ (!(attr & (1u << 16)) << 7) | (attr & 0x7f) | ((attr >> 4) & 0xf00); + + /* Adjust for virtual 8086 mode */ + if ( v->arch.hvm_vmx.vmx_realmode && seg <= x86_seg_tr +@@ -1118,11 +1120,11 @@ static void vmx_set_segment_register(struct vcpu *v, enum x86_segment seg, + } + } + +- attr = ((attr & 0xf00) << 4) | (attr & 0xff); +- +- /* Not-present must mean unusable. */ +- if ( !reg->attr.fields.p ) +- attr |= (1u << 16); ++ /* ++ * Unfold Xen representation into VT-x representation. The unusable bit ++ * is unconditionally set to the inverse of present. ++ */ ++ attr = (!(attr & (1u << 7)) << 16) | ((attr & 0xf00) << 4) | (attr & 0xff); + + /* VMX has strict consistency requirement for flag G. */ + attr |= !!(limit >> 20) << 15; +diff --git a/xen/arch/x86/x86_emulate/x86_emulate.c b/xen/arch/x86/x86_emulate/x86_emulate.c +index 7a707dc..7cb6f98 100644 +--- a/xen/arch/x86/x86_emulate/x86_emulate.c ++++ b/xen/arch/x86/x86_emulate/x86_emulate.c +@@ -1367,6 +1367,10 @@ protmode_load_seg( + &desctab, ctxt)) ) + return rc; + ++ /* Segment not valid for use (cooked meaning of .p)? */ ++ if ( !desctab.attr.fields.p ) ++ goto raise_exn; ++ + /* Check against descriptor table limit. */ + if ( ((sel & 0xfff8) + 7) > desctab.limit ) + goto raise_exn; Copied: branches/2016Q4/emulators/xen-kernel/files/xsa192.patch (from r427568, head/emulators/xen-kernel/files/xsa192.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/emulators/xen-kernel/files/xsa192.patch Sun Dec 4 19:37:31 2016 (r427796, copy of r427568, head/emulators/xen-kernel/files/xsa192.patch) @@ -0,0 +1,64 @@ +From: Jan Beulich +Subject: x86/HVM: don't load LDTR with VM86 mode attrs during task switch + +Just like TR, LDTR is purely a protected mode facility and hence needs +to be loaded accordingly. Also move its loading to where it +architecurally belongs. + +This is XSA-192. + +Signed-off-by: Jan Beulich +Reviewed-by: Andrew Cooper +Tested-by: Andrew Cooper + +--- a/xen/arch/x86/hvm/hvm.c ++++ b/xen/arch/x86/hvm/hvm.c +@@ -2728,17 +2728,16 @@ static void hvm_unmap_entry(void *p) + } + + static int hvm_load_segment_selector( +- enum x86_segment seg, uint16_t sel) ++ enum x86_segment seg, uint16_t sel, unsigned int eflags) + { + struct segment_register desctab, cs, segr; + struct desc_struct *pdesc, desc; + u8 dpl, rpl, cpl; + bool_t writable; + int fault_type = TRAP_invalid_tss; +- struct cpu_user_regs *regs = guest_cpu_user_regs(); + struct vcpu *v = current; + +- if ( regs->eflags & X86_EFLAGS_VM ) ++ if ( eflags & X86_EFLAGS_VM ) + { + segr.sel = sel; + segr.base = (uint32_t)sel << 4; +@@ -2986,6 +2985,8 @@ void hvm_task_switch( + if ( rc != HVMCOPY_okay ) + goto out; + ++ if ( hvm_load_segment_selector(x86_seg_ldtr, tss.ldt, 0) ) ++ goto out; + + if ( hvm_set_cr3(tss.cr3, 1) ) + goto out; +@@ -3008,13 +3009,12 @@ void hvm_task_switch( + } + + exn_raised = 0; +- if ( hvm_load_segment_selector(x86_seg_ldtr, tss.ldt) || +- hvm_load_segment_selector(x86_seg_es, tss.es) || +- hvm_load_segment_selector(x86_seg_cs, tss.cs) || +- hvm_load_segment_selector(x86_seg_ss, tss.ss) || +- hvm_load_segment_selector(x86_seg_ds, tss.ds) || +- hvm_load_segment_selector(x86_seg_fs, tss.fs) || +- hvm_load_segment_selector(x86_seg_gs, tss.gs) ) ++ if ( hvm_load_segment_selector(x86_seg_es, tss.es, tss.eflags) || ++ hvm_load_segment_selector(x86_seg_cs, tss.cs, tss.eflags) || ++ hvm_load_segment_selector(x86_seg_ss, tss.ss, tss.eflags) || ++ hvm_load_segment_selector(x86_seg_ds, tss.ds, tss.eflags) || ++ hvm_load_segment_selector(x86_seg_fs, tss.fs, tss.eflags) || ++ hvm_load_segment_selector(x86_seg_gs, tss.gs, tss.eflags) ) + exn_raised = 1; + + rc = hvm_copy_to_guest_virt( Copied: branches/2016Q4/emulators/xen-kernel/files/xsa193-4.7.patch (from r427568, head/emulators/xen-kernel/files/xsa193-4.7.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/emulators/xen-kernel/files/xsa193-4.7.patch Sun Dec 4 19:37:31 2016 (r427796, copy of r427568, head/emulators/xen-kernel/files/xsa193-4.7.patch) @@ -0,0 +1,68 @@ +From: Jan Beulich +Subject: x86/PV: writes of %fs and %gs base MSRs require canonical addresses + +Commit c42494acb2 ("x86: fix FS/GS base handling when using the +fsgsbase feature") replaced the use of wrmsr_safe() on these paths +without recognizing that wr{f,g}sbase() use just wrmsrl() and that the +WR{F,G}SBASE instructions also raise #GP for non-canonical input. + +Similarly arch_set_info_guest() needs to prevent non-canonical +addresses from getting stored into state later to be loaded by context +switch code. For consistency also check stack pointers and LDT base. +DR0..3, otoh, already get properly checked in set_debugreg() (albeit +we discard the error there). + +The SHADOW_GS_BASE check isn't strictly necessary, but I think we +better avoid trying the WRMSR if we know it's going to fail. + +This is XSA-193. + +Reported-by: Andrew Cooper +Signed-off-by: Jan Beulich +Reviewed-by: Andrew Cooper + +--- a/xen/arch/x86/domain.c ++++ b/xen/arch/x86/domain.c +@@ -890,7 +890,13 @@ int arch_set_info_guest( + { + if ( !compat ) + { +- if ( !is_canonical_address(c.nat->user_regs.eip) || ++ if ( !is_canonical_address(c.nat->user_regs.rip) || ++ !is_canonical_address(c.nat->user_regs.rsp) || ++ !is_canonical_address(c.nat->kernel_sp) || ++ (c.nat->ldt_ents && !is_canonical_address(c.nat->ldt_base)) || ++ !is_canonical_address(c.nat->fs_base) || ++ !is_canonical_address(c.nat->gs_base_kernel) || ++ !is_canonical_address(c.nat->gs_base_user) || + !is_canonical_address(c.nat->event_callback_eip) || + !is_canonical_address(c.nat->syscall_callback_eip) || + !is_canonical_address(c.nat->failsafe_callback_eip) ) +--- a/xen/arch/x86/traps.c ++++ b/xen/arch/x86/traps.c +@@ -2723,19 +2723,22 @@ static int emulate_privileged_op(struct + switch ( regs->_ecx ) + { + case MSR_FS_BASE: +- if ( is_pv_32bit_domain(currd) ) ++ if ( is_pv_32bit_domain(currd) || ++ !is_canonical_address(msr_content) ) + goto fail; + wrfsbase(msr_content); + v->arch.pv_vcpu.fs_base = msr_content; + break; + case MSR_GS_BASE: +- if ( is_pv_32bit_domain(currd) ) ++ if ( is_pv_32bit_domain(currd) || ++ !is_canonical_address(msr_content) ) + goto fail; + wrgsbase(msr_content); + v->arch.pv_vcpu.gs_base_kernel = msr_content; + break; + case MSR_SHADOW_GS_BASE: +- if ( is_pv_32bit_domain(currd) ) ++ if ( is_pv_32bit_domain(currd) || ++ !is_canonical_address(msr_content) ) + goto fail; + if ( wrmsr_safe(MSR_SHADOW_GS_BASE, msr_content) ) + goto fail; Copied: branches/2016Q4/emulators/xen-kernel/files/xsa194.patch (from r427568, head/emulators/xen-kernel/files/xsa194.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/emulators/xen-kernel/files/xsa194.patch Sun Dec 4 19:37:31 2016 (r427796, copy of r427568, head/emulators/xen-kernel/files/xsa194.patch) @@ -0,0 +1,144 @@ +From 71096b016f7fd54a72af73576948cb25cf42ebcb Mon Sep 17 00:00:00 2001 +From: Roger Pau Monné Date: Wed, 2 Nov 2016 15:02:00 +0000 +Subject: [PATCH] libelf: fix stack memory leak when loading 32 bit symbol + tables + +The 32 bit Elf structs are smaller than the 64 bit ones, which means that +when loading them there's some padding left uninitialized at the end of each +struct (because the size indicated in e_ehsize and e_shentsize is +smaller than the size of elf_ehdr and elf_shdr). + +Fix this by introducing a new helper that is used to set +[caller_]xdest_{base/size} and that takes care of performing the appropriate +memset of the region. This newly introduced helper is then used to set and +unset xdest_{base/size} in elf_load_bsdsyms. Now that the full struct +is zeroed, there's no need to specifically zero the undefined section. + +This is XSA-194. + +Suggested-by: Ian Jackson + +Also remove the open coded (and redundant with the earlier +elf_memset_unchecked()) use of caller_xdest_* from elf_init(). + +Signed-off-by: Roger Pau Monné +Signed-off-by: Jan Beulich +Signed-off-by: Ian Jackson +--- + xen/common/libelf/libelf-loader.c | 14 +++----------- + xen/common/libelf/libelf-tools.c | 11 +++++++++-- + xen/include/xen/libelf.h | 15 +++++++++------ + 3 files changed, 21 insertions(+), 19 deletions(-) + +diff --git a/xen/common/libelf/libelf-loader.c b/xen/common/libelf/libelf-loader.c +index 4d3ae4d..bc1f87b 100644 +--- a/xen/common/libelf/libelf-loader.c ++++ b/xen/common/libelf/libelf-loader.c +@@ -43,8 +43,6 @@ elf_errorstatus elf_init(struct elf_binary *elf, const char *image_input, size_t + elf->ehdr = ELF_MAKE_HANDLE(elf_ehdr, (elf_ptrval)image_input); + elf->class = elf_uval_3264(elf, elf->ehdr, e32.e_ident[EI_CLASS]); + elf->data = elf_uval_3264(elf, elf->ehdr, e32.e_ident[EI_DATA]); +- elf->caller_xdest_base = NULL; +- elf->caller_xdest_size = 0; + + /* Sanity check phdr. */ + offset = elf_uval(elf, elf->ehdr, e_phoff) + +@@ -284,9 +282,8 @@ do { \ + #define SYMTAB_INDEX 1 + #define STRTAB_INDEX 2 + +- /* Allow elf_memcpy_safe to write to symbol_header. */ +- elf->caller_xdest_base = &header; +- elf->caller_xdest_size = sizeof(header); ++ /* Allow elf_memcpy_safe to write to header. */ ++ elf_set_xdest(elf, &header, sizeof(header)); + + /* + * Calculate the position of the various elements in GUEST MEMORY SPACE. +@@ -319,11 +316,7 @@ do { \ + elf_store_field_bitness(elf, header_handle, e_phentsize, 0); + elf_store_field_bitness(elf, header_handle, e_phnum, 0); + +- /* Zero the undefined section. */ +- section_handle = ELF_MAKE_HANDLE(elf_shdr, +- ELF_REALPTR2PTRVAL(&header.elf_header.section[SHN_UNDEF])); + shdr_size = elf_uval(elf, elf->ehdr, e_shentsize); +- elf_memset_safe(elf, ELF_HANDLE_PTRVAL(section_handle), 0, shdr_size); + + /* + * The symtab section header is going to reside in section[SYMTAB_INDEX], +@@ -404,8 +397,7 @@ do { \ + } + + /* Remove permissions from elf_memcpy_safe. */ +- elf->caller_xdest_base = NULL; +- elf->caller_xdest_size = 0; ++ elf_set_xdest(elf, NULL, 0); + + #undef SYMTAB_INDEX + #undef STRTAB_INDEX +diff --git a/xen/common/libelf/libelf-tools.c b/xen/common/libelf/libelf-tools.c +index 5a4757b..e73e729 100644 +--- a/xen/common/libelf/libelf-tools.c ++++ b/xen/common/libelf/libelf-tools.c +@@ -59,8 +59,7 @@ bool elf_access_ok(struct elf_binary * elf, + return 1; + if ( elf_ptrval_in_range(ptrval, size, elf->dest_base, elf->dest_size) ) + return 1; +- if ( elf_ptrval_in_range(ptrval, size, +- elf->caller_xdest_base, elf->caller_xdest_size) ) ++ if ( elf_ptrval_in_range(ptrval, size, elf->xdest_base, elf->xdest_size) ) + return 1; + elf_mark_broken(elf, "out of range access"); + return 0; +@@ -373,6 +372,14 @@ bool elf_phdr_is_loadable(struct elf_binary *elf, ELF_HANDLE_DECL(elf_phdr) phdr + return ((p_type == PT_LOAD) && (p_flags & (PF_R | PF_W | PF_X)) != 0); + } + ++void elf_set_xdest(struct elf_binary *elf, void *addr, uint64_t size) ++{ ++ elf->xdest_base = addr; ++ elf->xdest_size = size; ++ if ( addr != NULL ) ++ elf_memset_safe(elf, ELF_REALPTR2PTRVAL(addr), 0, size); ++} ++ + /* + * Local variables: + * mode: C +diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h +index 95b5370..cf62bc7 100644 +--- a/xen/include/xen/libelf.h ++++ b/xen/include/xen/libelf.h +@@ -210,13 +210,11 @@ struct elf_binary { + uint64_t bsd_symtab_pend; + + /* +- * caller's other acceptable destination +- * +- * Again, these are trusted and must be valid (or 0) so long +- * as the struct elf_binary is in use. ++ * caller's other acceptable destination. ++ * Set by elf_set_xdest. Do not set these directly. + */ +- void *caller_xdest_base; +- uint64_t caller_xdest_size; ++ void *xdest_base; ++ uint64_t xdest_size; + + #ifndef __XEN__ + /* misc */ +@@ -494,5 +492,10 @@ static inline void ELF_ADVANCE_DEST(struct elf_binary *elf, uint64_t amount) + } + } + ++/* Specify a (single) additional destination, to which the image may ++ * cause writes. As with dest_base and dest_size, the values provided ++ * are trusted and must be valid so long as the struct elf_binary ++ * is in use or until elf_set_xdest(,0,0) is called. */ ++void elf_set_xdest(struct elf_binary *elf, void *addr, uint64_t size); + + #endif /* __XEN_LIBELF_H__ */ +-- +2.1.4 + Copied: branches/2016Q4/emulators/xen-kernel/files/xsa195.patch (from r427568, head/emulators/xen-kernel/files/xsa195.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/emulators/xen-kernel/files/xsa195.patch Sun Dec 4 19:37:31 2016 (r427796, copy of r427568, head/emulators/xen-kernel/files/xsa195.patch) @@ -0,0 +1,45 @@ +From: Jan Beulich +Subject: x86emul: fix huge bit offset handling + +We must never chop off the high 32 bits. + +This is XSA-195. + +Reported-by: George Dunlap +Signed-off-by: Jan Beulich +Reviewed-by: Andrew Cooper + +--- a/xen/arch/x86/x86_emulate/x86_emulate.c ++++ b/xen/arch/x86/x86_emulate/x86_emulate.c +@@ -2549,6 +2549,12 @@ x86_emulate( + else + { + /* ++ * Instructions such as bt can reference an arbitrary offset from ++ * their memory operand, but the instruction doing the actual ++ * emulation needs the appropriate op_bytes read from memory. ++ * Adjust both the source register and memory operand to make an ++ * equivalent instruction. ++ * + * EA += BitOffset DIV op_bytes*8 + * BitOffset = BitOffset MOD op_bytes*8 + * DIV truncates towards negative infinity. +@@ -2560,14 +2566,15 @@ x86_emulate( + src.val = (int32_t)src.val; + if ( (long)src.val < 0 ) + { +- unsigned long byte_offset; +- byte_offset = op_bytes + (((-src.val-1) >> 3) & ~(op_bytes-1)); ++ unsigned long byte_offset = ++ op_bytes + (((-src.val - 1) >> 3) & ~(op_bytes - 1L)); ++ + ea.mem.off -= byte_offset; + src.val = (byte_offset << 3) + src.val; + } + else + { +- ea.mem.off += (src.val >> 3) & ~(op_bytes - 1); ++ ea.mem.off += (src.val >> 3) & ~(op_bytes - 1L); + src.val &= (op_bytes << 3) - 1; + } + } Modified: branches/2016Q4/sysutils/xen-tools/Makefile ============================================================================== --- branches/2016Q4/sysutils/xen-tools/Makefile Sun Dec 4 19:35:14 2016 (r427795) +++ branches/2016Q4/sysutils/xen-tools/Makefile Sun Dec 4 19:37:31 2016 (r427796) @@ -2,10 +2,10 @@ PORTNAME= xen PKGNAMESUFFIX= -tools -PORTVERSION= 4.7.0 -PORTREVISION= 4 +PORTVERSION= 4.7.1 +PORTREVISION= 0 CATEGORIES= sysutils emulators -MASTER_SITES= http://bits.xensource.com/oss-xen/release/${PORTVERSION}/ +MASTER_SITES= http://downloads.xenproject.org/release/xen/${PORTVERSION}/ MAINTAINER= royger@FreeBSD.org COMMENT= Xen management tool, based on LibXenlight @@ -43,7 +43,10 @@ QEMU_ARGS= --disable-gtk \ --disable-curl \ --cxx=c++ -EXTRA_PATCHES= ${FILESDIR}/var_paths.patch:-p1 +EXTRA_PATCHES= ${FILESDIR}/var_paths.patch:-p1 \ + ${FILESDIR}/xsa198.patch:-p1 \ + ${FILESDIR}/0001-libxl-fix-creation-of-pkgconf-install-dir.patch \ + ${FILESDIR}/0001-tools-configure-fix-pkg-config-install-path-for-Free.patch CONFIGURE_ARGS+= --with-extra-qemuu-configure-args="${QEMU_ARGS}" \ --with-system-seabios=${LOCALBASE}/share/seabios/bios.bin Modified: branches/2016Q4/sysutils/xen-tools/distinfo ============================================================================== --- branches/2016Q4/sysutils/xen-tools/distinfo Sun Dec 4 19:35:14 2016 (r427795) +++ branches/2016Q4/sysutils/xen-tools/distinfo Sun Dec 4 19:37:31 2016 (r427796) @@ -1,3 +1,3 @@ -TIMESTAMP = 1467644940 -SHA256 (xen-4.7.0.tar.gz) = be5876144d49729572ae06142e0bb93f1c1f2695578141eff2931995add24623 -SIZE (xen-4.7.0.tar.gz) = 20702550 +TIMESTAMP = 1480690512 +SHA256 (xen-4.7.1.tar.gz) = e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe +SIZE (xen-4.7.1.tar.gz) = 20706864 Copied: branches/2016Q4/sysutils/xen-tools/files/0001-libxl-fix-creation-of-pkgconf-install-dir.patch (from r427568, head/sysutils/xen-tools/files/0001-libxl-fix-creation-of-pkgconf-install-dir.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/sysutils/xen-tools/files/0001-libxl-fix-creation-of-pkgconf-install-dir.patch Sun Dec 4 19:37:31 2016 (r427796, copy of r427568, head/sysutils/xen-tools/files/0001-libxl-fix-creation-of-pkgconf-install-dir.patch) @@ -0,0 +1,35 @@ +From 45434adc3c94f5229744beaa12028aa23f63b9e7 Mon Sep 17 00:00:00 2001 +From: Roger Pau Monne +Date: Wed, 23 Nov 2016 16:56:39 +0000 +Subject: [PATCH] libxl: fix creation of pkgconf install dir +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When PKG_INSTALLDIR was introduced the creation of the previous pkgconf install +directory was not changed. Fix this by correctly using PKG_INSTALLDIR for the +directory creation in libxl Makefile. + +Signed-off-by: Roger Pau Monné +Acked-by: Wei Liu +Release-acked-by: Wei Liu +--- + tools/libxl/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile +index f5053a0..ef01785 100644 +--- a/tools/libxl/Makefile ++++ b/tools/libxl/Makefile +@@ -308,7 +308,7 @@ install: all + $(INSTALL_DIR) $(DESTDIR)$(includedir) + $(INSTALL_DIR) $(DESTDIR)$(BASH_COMPLETION_DIR) + $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN) +- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/pkgconfig ++ $(INSTALL_DIR) $(DESTDIR)$(PKG_INSTALLDIR) + $(INSTALL_PROG) xl $(DESTDIR)$(sbindir) + $(INSTALL_PROG) libxl-save-helper $(DESTDIR)$(LIBEXEC_BIN) + $(INSTALL_SHLIB) libxenlight.so.$(MAJOR).$(MINOR) $(DESTDIR)$(libdir) +-- +2.9.3 (Apple Git-75) + Copied: branches/2016Q4/sysutils/xen-tools/files/0001-tools-configure-fix-pkg-config-install-path-for-Free.patch (from r427568, head/sysutils/xen-tools/files/0001-tools-configure-fix-pkg-config-install-path-for-Free.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/sysutils/xen-tools/files/0001-tools-configure-fix-pkg-config-install-path-for-Free.patch Sun Dec 4 19:37:31 2016 (r427796, copy of r427568, head/sysutils/xen-tools/files/0001-tools-configure-fix-pkg-config-install-path-for-Free.patch) @@ -0,0 +1,66 @@ +From 4000a7c7d7b0e01837abd3918e393f289c07d68c Mon Sep 17 00:00:00 2001 +From: Roger Pau Monne +Date: Tue, 25 Oct 2016 11:53:28 +0200 +Subject: [PATCH] tools/configure: fix pkg-config install path for FreeBSD +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +pkg-config from FreeBSD ports doesn't have ${prefix}/share/pkgconfig in the +default search path, fix this by having a PKG_INSTALLDIR variable that can +be changed on a per-OS basis. + +It would be best to use PKG_INSTALLDIR as defined by the pkg.m4 macro, but +sadly this also reports a wrong value on FreeBSD (${libdir}/pkgconfig, which +expands to /usr/local/lib/pkgconfig by default, and is also _not_ part of +the default pkg-config search path). + +This patch should not change the behavior for Linux installs. + +Signed-off-by: Roger Pau Monné +Reported-by: Alexander Nusov +Acked-by: Wei Liu +Release-acked-by: Wei Liu +--- + config/FreeBSD.mk | 1 + + config/Paths.mk.in | 2 ++ + tools/libxl/Makefile | 4 ++-- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/config/FreeBSD.mk b/config/FreeBSD.mk +index bb3a5d0..afeaefb 100644 +--- a/config/FreeBSD.mk ++++ b/config/FreeBSD.mk +@@ -2,3 +2,4 @@ include $(XEN_ROOT)/config/StdGNU.mk + + # No wget on FreeBSD base system + WGET = ftp ++PKG_INSTALLDIR = ${prefix}/libdata/pkgconfig +diff --git a/config/Paths.mk.in b/config/Paths.mk.in +index 62cea48..a603295 100644 +--- a/config/Paths.mk.in ++++ b/config/Paths.mk.in +@@ -56,3 +56,5 @@ XENFIRMWAREDIR := @XENFIRMWAREDIR@ + + XEN_CONFIG_DIR := @XEN_CONFIG_DIR@ + XEN_SCRIPT_DIR := @XEN_SCRIPT_DIR@ ++ ++PKG_INSTALLDIR := ${SHAREDIR}/pkgconfig +diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile +index 79e4019..af0a3ad 100644 +--- a/tools/libxl/Makefile ++++ b/tools/libxl/Makefile +@@ -320,8 +320,8 @@ install: all + $(INSTALL_DATA) libxlutil.a $(DESTDIR)$(libdir) + $(INSTALL_DATA) libxl.h libxl_event.h libxl_json.h _libxl_types.h _libxl_types_json.h _libxl_list.h libxl_utils.h libxl_uuid.h libxlutil.h $(DESTDIR)$(includedir) + $(INSTALL_DATA) bash-completion $(DESTDIR)$(BASH_COMPLETION_DIR)/xl.sh +- $(INSTALL_DATA) xenlight.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/ +- $(INSTALL_DATA) xlutil.pc $(DESTDIR)$(SHAREDIR)/pkgconfig/ ++ $(INSTALL_DATA) xenlight.pc $(DESTDIR)$(PKG_INSTALLDIR) ++ $(INSTALL_DATA) xlutil.pc $(DESTDIR)$(PKG_INSTALLDIR) + + .PHONY: clean + clean: +-- +2.9.3 (Apple Git-75) + Copied: branches/2016Q4/sysutils/xen-tools/files/xsa197-qemuu.patch (from r427568, head/sysutils/xen-tools/files/xsa197-qemuu.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/sysutils/xen-tools/files/xsa197-qemuu.patch Sun Dec 4 19:37:31 2016 (r427796, copy of r427568, head/sysutils/xen-tools/files/xsa197-qemuu.patch) @@ -0,0 +1,63 @@ +From: Jan Beulich +Subject: xen: fix ioreq handling + +Avoid double fetches and bounds check size to avoid overflowing +internal variables. + +This is XSA-197. + +Reported-by: yanghongke +Signed-off-by: Jan Beulich +Reviewed-by: Stefano Stabellini + +--- a/xen-hvm.c ++++ b/xen-hvm.c +@@ -810,6 +810,10 @@ static void cpu_ioreq_pio(ioreq_t *req) + trace_cpu_ioreq_pio(req, req->dir, req->df, req->data_is_ptr, req->addr, + req->data, req->count, req->size); + ++ if (req->size > sizeof(uint32_t)) { ++ hw_error("PIO: bad size (%u)", req->size); ++ } ++ + if (req->dir == IOREQ_READ) { + if (!req->data_is_ptr) { + req->data = do_inp(req->addr, req->size); +@@ -846,6 +850,10 @@ static void cpu_ioreq_move(ioreq_t *req) + trace_cpu_ioreq_move(req, req->dir, req->df, req->data_is_ptr, req->addr, + req->data, req->count, req->size); + ++ if (req->size > sizeof(req->data)) { ++ hw_error("MMIO: bad size (%u)", req->size); ++ } ++ + if (!req->data_is_ptr) { + if (req->dir == IOREQ_READ) { + for (i = 0; i < req->count; i++) { +@@ -1010,11 +1018,13 @@ static int handle_buffered_iopage(XenIOS + req.df = 1; + req.type = buf_req->type; + req.data_is_ptr = 0; ++ xen_rmb(); + qw = (req.size == 8); + if (qw) { + buf_req = &buf_page->buf_ioreq[(rdptr + 1) % + IOREQ_BUFFER_SLOT_NUM]; + req.data |= ((uint64_t)buf_req->data) << 32; ++ xen_rmb(); + } + + handle_ioreq(state, &req); +@@ -1045,7 +1055,11 @@ static void cpu_handle_ioreq(void *opaqu + + handle_buffered_iopage(state); + if (req) { +- handle_ioreq(state, req); ++ ioreq_t copy = *req; ++ ++ xen_rmb(); ++ handle_ioreq(state, ©); ++ req->data = copy.data; + + if (req->state != STATE_IOREQ_INPROCESS) { + fprintf(stderr, "Badness in I/O request ... not in service?!: " Copied: branches/2016Q4/sysutils/xen-tools/files/xsa198.patch (from r427568, head/sysutils/xen-tools/files/xsa198.patch) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/sysutils/xen-tools/files/xsa198.patch Sun Dec 4 19:37:31 2016 (r427796, copy of r427568, head/sysutils/xen-tools/files/xsa198.patch) @@ -0,0 +1,62 @@ +From 71a389ae940bc52bf897a6e5becd73fd8ede94c5 Mon Sep 17 00:00:00 2001 +From: Ian Jackson +Date: Thu, 3 Nov 2016 16:37:40 +0000 +Subject: [PATCH] pygrub: Properly quote results, when returning them to the + caller: + +* When the caller wants sexpr output, use `repr()' + This is what Xend expects. + + The returned S-expressions are now escaped and quoted by Python, + generally using '...'. Previously kernel and ramdisk were unquoted + and args was quoted with "..." but without proper escaping. This + change may break toolstacks which do not properly dequote the + returned S-expressions. + +* When the caller wants "simple" output, crash if the delimiter is + contained in the returned value. + + With --output-format=simple it does not seem like this could ever + happen, because the bootloader config parsers all take line-based + input from the various bootloader config files. + + With --output-format=simple0, this can happen if the bootloader + config file contains nul bytes. + +This is XSA-198. + +Signed-off-by: Ian Jackson +Tested-by: Ian Jackson +Reviewed-by: Andrew Cooper +--- + tools/pygrub/src/pygrub | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub +index 40f9584..dd0c8f7 100755 +--- a/tools/pygrub/src/pygrub ++++ b/tools/pygrub/src/pygrub +@@ -721,14 +721,17 @@ def sniff_netware(fs, cfg): + return cfg + + def format_sxp(kernel, ramdisk, args): +- s = "linux (kernel %s)" % kernel ++ s = "linux (kernel %s)" % repr(kernel) + if ramdisk: +- s += "(ramdisk %s)" % ramdisk ++ s += "(ramdisk %s)" % repr(ramdisk) + if args: +- s += "(args \"%s\")" % args ++ s += "(args %s)" % repr(args) + return s + + def format_simple(kernel, ramdisk, args, sep): ++ for check in (kernel, ramdisk, args): ++ if check is not None and sep in check: ++ raise RuntimeError, "simple format cannot represent delimiter-containing value" + s = ("kernel %s" % kernel) + sep + if ramdisk: + s += ("ramdisk %s" % ramdisk) + sep +-- +2.1.4 + Modified: branches/2016Q4/sysutils/xen-tools/pkg-plist ============================================================================== --- branches/2016Q4/sysutils/xen-tools/pkg-plist Sun Dec 4 19:35:14 2016 (r427795) +++ branches/2016Q4/sysutils/xen-tools/pkg-plist Sun Dec 4 19:37:31 2016 (r427796) @@ -514,8 +514,8 @@ sbin/xl %%PORTDOCS%%%%DOCSDIR%%/html/misc/xl-psr.html %%PORTDOCS%%%%DOCSDIR%%/html/misc/xsm-flask.txt %%PORTDOCS%%%%DOCSDIR%%/html/misc/livepatch.html -share/pkgconfig/xenlight.pc -share/pkgconfig/xlutil.pc +libdata/pkgconfig/xenlight.pc +libdata/pkgconfig/xlutil.pc share/qemu-xen/qemu/QEMU,cgthree.bin share/qemu-xen/qemu/QEMU,tcx.bin share/qemu-xen/qemu/acpi-dsdt.aml From owner-svn-ports-branches@freebsd.org Sun Dec 4 21:03:16 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3B740C66647; Sun, 4 Dec 2016 21:03:16 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 F08362FA; Sun, 4 Dec 2016 21:03:15 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB4L3FZc002741; Sun, 4 Dec 2016 21:03:15 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB4L3FK3002738; Sun, 4 Dec 2016 21:03:15 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201612042103.uB4L3FK3002738@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Sun, 4 Dec 2016 21:03:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r427804 - branches/2016Q4/mail/roundcube 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.23 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, 04 Dec 2016 21:03:16 -0000 Author: junovitch Date: Sun Dec 4 21:03:14 2016 New Revision: 427804 URL: https://svnweb.freebsd.org/changeset/ports/427804 Log: MFH: r423243 r423250 r423479 r427802 mail/roundcube: Update to 1.2.1 - Update to 1.2.1 - Add missing .htaccess file in WWWDIR [1] - Switch WANT_PHP_WEB to USES= php:web - Add description for DB options group - Convert all ${PORT_OPTIONS:Mfoo} to OPTIONS framework - Convert target conditionals to target-OPT-on PR: 196016 [1] Submitted by: Lukasz Wasikowski [1] Approved by: Maintainer timeout mail/roundcube: fix dependency when using SQLite, bump PORTREVISION mail/roundcube: 1.2.1 -> 1.2.2 PR: 196026 Changes: https://github.com/roundcube/roundcubemail/wiki/Changelog#release-122 Submitted by: brnrd Approved by: ale (maintainer timeout) mail/roundcube: update 1.2.2 -> 1.2.3; add NO_ARCH while here Changes: https://github.com/roundcube/roundcubemail/wiki/Changelog#release-123 PR: 214925 Submitted by: brnrd Security: https://vuxml.FreeBSD.org/freebsd/125f5958-b611-11e6-a9a5-b499baebfeaf.html Approved by: ports-secteam (with hat) Modified: branches/2016Q4/mail/roundcube/Makefile branches/2016Q4/mail/roundcube/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/mail/roundcube/Makefile ============================================================================== --- branches/2016Q4/mail/roundcube/Makefile Sun Dec 4 21:03:13 2016 (r427803) +++ branches/2016Q4/mail/roundcube/Makefile Sun Dec 4 21:03:14 2016 (r427804) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= roundcube -DISTVERSION= 1.2.0 -PORTREVISION= 1 +DISTVERSION= 1.2.3 PORTEPOCH= 1 CATEGORIES?= mail www MASTER_SITES= https://github.com/roundcube/roundcubemail/releases/download/${DISTVERSION}/ @@ -13,17 +12,18 @@ COMMENT= Fully skinnable XHTML/CSS webma LICENSE= GPLv3 +NO_ARCH= yes NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}mail-${DISTVERSION} -RCUBECOMP= SQL config index.php installer logs plugins program robots.txt skins temp vendor +RCUBECOMP= SQL config .htaccess index.php installer logs \ + plugins program robots.txt skins temp vendor PORTDOCS= CHANGELOG INSTALL README.md UPGRADING -USES= cpe +USES= cpe php:web CPE_PRODUCT= webmail CPE_VENDOR= roundcube -WANT_PHP_WEB= yes USE_PHP= pcre mbstring session iconv dom xml json intl zip filter openssl fileinfo exif OPTIONS_DEFINE= LDAP GD PSPELL NSC DOCS @@ -31,6 +31,7 @@ OPTIONS_SINGLE= DB OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE OPTIONS_DEFAULT=MYSQL +DB_DESC= Database backend MYSQL_DESC= Use MySQL backend PGSQL_DESC= Use PostgreSQL backend SQLITE_DESC= Use SQLite backend @@ -39,44 +40,17 @@ GD_DESC= Enable GD support (image conver PSPELL_DESC= Enable PSpell support (internal spellcheck) NSC_DESC= Install network spellchecker -.include +GD_VARS= use_php+=gd +LDAP_VARS= use_php+=ldap +MYSQL_VARS= use_php+=pdo_mysql +NSC_IMPLIES= PSPELL +NSC_VARS= use_php+=simplexml rcubecomp+=spellchecker.php +PGSQL_VARS= use_php+=pdo_pgsql +PSPELL_VARS= use_php+=pspell +SQLITE_VARS= use_php+=pdo_sqlite -.if ${PORT_OPTIONS:MMYSQL} -USE_PHP+= pdo_mysql -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PHP+= pdo_pgsql -.endif - -.if ${PORT_OPTIONS:MSQLITE} -USE_PHP+= pdo_sqlite -.endif - -.if ${PORT_OPTIONS:MLDAP} -USE_PHP+= ldap -.endif - -.if ${PORT_OPTIONS:MGD} -USE_PHP+= gd -.endif - -.if ${PORT_OPTIONS:MPSPELL} || ${PORT_OPTIONS:MNSC} -USE_PHP+= pspell -.endif - -.if ${PORT_OPTIONS:MNSC} -RCUBECOMP+= spellchecker.php -USE_PHP+= simplexml -PLIST_SUB+= SPELLCHECK="" -.else -PLIST_SUB+= SPELLCHECK="@comment " -.endif - -.if ${PORT_OPTIONS:MNSC} -post-extract: +post-extract-NSC: @${CP} ${FILESDIR}/spellchecker.php ${WRKSRC} -.endif post-patch: @${FIND} ${WRKSRC} -name \*.orig -type f -delete @@ -87,12 +61,6 @@ do-install: .for i in ${RCUBECOMP} @cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${WWWDIR} .endfor -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR} -.for i in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/ -.endfor -.endif @(cd ${WRKSRC}; ${FIND} bin ${RCUBECOMP} -not -type d) | ${SORT} | \ ${SED} -ne 's,^,${WWWDIR_REL}/,p' >> ${TMPPLIST} @${ECHO_CMD} '@exec chown ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/logs' \ @@ -100,4 +68,10 @@ do-install: @${ECHO_CMD} '@exec chown ${WWWOWN}:${WWWGRP} %D/${WWWDIR_REL}/temp' \ >> ${TMPPLIST} +do-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} +.for i in ${PORTDOCS} + @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/ +.endfor + .include Modified: branches/2016Q4/mail/roundcube/distinfo ============================================================================== --- branches/2016Q4/mail/roundcube/distinfo Sun Dec 4 21:03:13 2016 (r427803) +++ branches/2016Q4/mail/roundcube/distinfo Sun Dec 4 21:03:14 2016 (r427804) @@ -1,3 +1,3 @@ -TIMESTAMP = 1465476478 -SHA256 (roundcubemail-1.2.0-complete.tar.gz) = 574895da03b5ad78eaf0843a78e0c0ab734a9327b4ba47b72405b768cb2854cc -SIZE (roundcubemail-1.2.0-complete.tar.gz) = 3748290 +TIMESTAMP = 1480409130 +SHA256 (roundcubemail-1.2.3-complete.tar.gz) = d7f1d041557639c442691a1e5fa791ab77aa97327a0d328a22e0220f3cb2ca97 +SIZE (roundcubemail-1.2.3-complete.tar.gz) = 3894127 From owner-svn-ports-branches@freebsd.org Sun Dec 4 22:20:30 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E71CAC67E30; Sun, 4 Dec 2016 22:20:30 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 9E55D130D; Sun, 4 Dec 2016 22:20:30 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB4MKT8N031858; Sun, 4 Dec 2016 22:20:29 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB4MKTlp031856; Sun, 4 Dec 2016 22:20:29 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201612042220.uB4MKTlp031856@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Sun, 4 Dec 2016 22:20:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r427812 - in branches/2016Q4/security/py-cryptography: . 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.23 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, 04 Dec 2016 22:20:31 -0000 Author: feld Date: Sun Dec 4 22:20:29 2016 New Revision: 427812 URL: https://svnweb.freebsd.org/changeset/ports/427812 Log: MFH: r427810 security/py-cryptography: Update to 1.6 Changelog: https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst PR: 214915 Approved by: ports-secteam (with hat) Security: CVE-2016-9243 Deleted: branches/2016Q4/security/py-cryptography/files/ Modified: branches/2016Q4/security/py-cryptography/Makefile branches/2016Q4/security/py-cryptography/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/security/py-cryptography/Makefile ============================================================================== --- branches/2016Q4/security/py-cryptography/Makefile Sun Dec 4 22:19:58 2016 (r427811) +++ branches/2016Q4/security/py-cryptography/Makefile Sun Dec 4 22:20:29 2016 (r427812) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cryptography -PORTVERSION= 1.4 +PORTVERSION= 1.6 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -21,8 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six> TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \ ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601 -USES= python -USE_OPENSSL= yes +USES= python ssl USE_PYTHON= autoplist distutils CFLAGS+= -I${OPENSSLINC} Modified: branches/2016Q4/security/py-cryptography/distinfo ============================================================================== --- branches/2016Q4/security/py-cryptography/distinfo Sun Dec 4 22:19:58 2016 (r427811) +++ branches/2016Q4/security/py-cryptography/distinfo Sun Dec 4 22:20:29 2016 (r427812) @@ -1,3 +1,3 @@ -TIMESTAMP = 1471010865 -SHA256 (cryptography-1.4.tar.gz) = bb149540ed90c4b2171bf694fe6991d6331bc149ae623c8ff419324f4222d128 -SIZE (cryptography-1.4.tar.gz) = 399707 +TIMESTAMP = 1480367088 +SHA256 (cryptography-1.6.tar.gz) = 4d0d86d2c8d3fc89133c3fa0d164a688a458b6663ab6fa965c80d6c2cdaf9b3f +SIZE (cryptography-1.6.tar.gz) = 410073 From owner-svn-ports-branches@freebsd.org Mon Dec 5 00:01:47 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47FE1C673C9; Mon, 5 Dec 2016 00:01:47 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 229F810D4; Mon, 5 Dec 2016 00:01:47 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB501ksA075365; Mon, 5 Dec 2016 00:01:46 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB501kSw075363; Mon, 5 Dec 2016 00:01:46 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201612050001.uB501kSw075363@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 5 Dec 2016 00:01:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r427820 - branches/2016Q4/graphics/ImageMagick7 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.23 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, 05 Dec 2016 00:01:47 -0000 Author: feld Date: Mon Dec 5 00:01:46 2016 New Revision: 427820 URL: https://svnweb.freebsd.org/changeset/ports/427820 Log: MFH: r427819 graphics/ImageMagick7: Update to 7.0.3-7 Summarized ChangeLog since 7.0.2-9: * Off by one memory allocation (reference https://github.com/ImageMagick/ImageMagick/issues/296). * The -extent option now matches the results of IMv6 (reference https://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=30779). * Prevent fault in MSL interpreter (reference https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=30797). * Mask composite produces proper results for the convert utility (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=29675). * Added layer RLE compression to the PSD encoder. * Fixed incorrect parsing with ordered dither. (reference https://github.com/ImageMagick/ImageMagick/issues/254) * Unit test pass again after small SUN image patch. * Fixed incorrect RLE decoding when reading a DCM image that contains multiple segments. * Fixed incorrect RLE decoding when reading an SGI image (reference https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=30514) * Added layer RLE compression to the PSD encoder. * Added define 'psd:preserve-opacity-mask' to preserve the opacity mask in a PSD file. * Fixed issue where the display window was used instead of the data window when reading EXR files (reference https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&p=137849). * Fixed reading DXT1 images with an alpha channel. * Fixed incorrect padding calculation in PSD encoder. * Added define 'psd:additional-info' to preserve the additional information in a PSD file. * Prevent buffer overflow in BMP & SGI coders (bug report from pwchen&rayzhong of tencent). * Prevent buffer overflow and other problems in SIXEL, PDB, MAP, TIFF and CALS coders (bug report from Donghai Zhu). * The -stream option now increments the pixel pointer properly (reference https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=30327). PR: 214511 Approved by: ports-secteam (with hat) Modified: branches/2016Q4/graphics/ImageMagick7/Makefile branches/2016Q4/graphics/ImageMagick7/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/graphics/ImageMagick7/Makefile ============================================================================== --- branches/2016Q4/graphics/ImageMagick7/Makefile Sun Dec 4 23:59:10 2016 (r427819) +++ branches/2016Q4/graphics/ImageMagick7/Makefile Mon Dec 5 00:01:46 2016 (r427820) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ImageMagick -DISTVERSION= 7.0.2-9 +DISTVERSION= 7.0.3-7 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ http://www.imagemagick.org/download/legacy/ \ Modified: branches/2016Q4/graphics/ImageMagick7/distinfo ============================================================================== --- branches/2016Q4/graphics/ImageMagick7/distinfo Sun Dec 4 23:59:10 2016 (r427819) +++ branches/2016Q4/graphics/ImageMagick7/distinfo Mon Dec 5 00:01:46 2016 (r427820) @@ -1,3 +1,3 @@ -TIMESTAMP = 1471809277 -SHA256 (ImageMagick-7.0.2-9.tar.xz) = 22df4f197985f36f77b7b0d44de92ff44415885045f0191b3319540bdc82ff53 -SIZE (ImageMagick-7.0.2-9.tar.xz) = 8291004 +TIMESTAMP = 1479675593 +SHA256 (ImageMagick-7.0.3-7.tar.xz) = 140b99f33a3326aed92132a7cd054ee962a6e2562064c68495640411aa4571d7 +SIZE (ImageMagick-7.0.3-7.tar.xz) = 8290176 From owner-svn-ports-branches@freebsd.org Mon Dec 5 00:08:24 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D48C8C6757E; Mon, 5 Dec 2016 00:08:24 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 96ED214E4; Mon, 5 Dec 2016 00:08:24 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB508No8076637; Mon, 5 Dec 2016 00:08:23 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB508NjT076634; Mon, 5 Dec 2016 00:08:23 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201612050008.uB508NjT076634@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 5 Dec 2016 00:08:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r427822 - branches/2016Q4/graphics/ImageMagick 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.23 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, 05 Dec 2016 00:08:24 -0000 Author: feld Date: Mon Dec 5 00:08:23 2016 New Revision: 427822 URL: https://svnweb.freebsd.org/changeset/ports/427822 Log: MFH: r427821 graphics/ImageMagick: Update to 6.9.6-4 Summarized changelog since 6.9.5-10: * Off by one memory allocation (reference https://github.com/ImageMagick/ImageMagick/issues/296). * Prevent fault in MSL interpreter (reference https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=30797). * Added layer ZIP compression to the PSD encoder. * Unit test pass again after small SUN image patch. * Fixed incorrect RLE decoding when reading a DCM image that contains multiple segments. * Fixed incorrect RLE decoding when reading an SGI image (reference https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=30514) PR: 214517 Security: CVE-2016-9298 Approved by: ports-secteam (with hat) Modified: branches/2016Q4/graphics/ImageMagick/Makefile branches/2016Q4/graphics/ImageMagick/distinfo branches/2016Q4/graphics/ImageMagick/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/graphics/ImageMagick/Makefile ============================================================================== --- branches/2016Q4/graphics/ImageMagick/Makefile Mon Dec 5 00:07:33 2016 (r427821) +++ branches/2016Q4/graphics/ImageMagick/Makefile Mon Dec 5 00:08:23 2016 (r427822) @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= ImageMagick -DISTVERSION= 6.9.5-10 +DISTVERSION= 6.9.6-4 +PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= graphics perl5 MASTER_SITES= http://www.imagemagick.org/download/ \ Modified: branches/2016Q4/graphics/ImageMagick/distinfo ============================================================================== --- branches/2016Q4/graphics/ImageMagick/distinfo Mon Dec 5 00:07:33 2016 (r427821) +++ branches/2016Q4/graphics/ImageMagick/distinfo Mon Dec 5 00:08:23 2016 (r427822) @@ -1,3 +1,3 @@ -TIMESTAMP = 1476236004 -SHA256 (ImageMagick-6.9.5-10.tar.xz) = 2805ab7945ca92251172335da992df800bcc09fee993eeb4711b20c53efeb233 -SIZE (ImageMagick-6.9.5-10.tar.xz) = 8794440 +TIMESTAMP = 1479160028 +SHA256 (ImageMagick-6.9.6-4.tar.xz) = d523c2c45dc2ff55f1bc27aa0cfa6e00e6f80dc182e8d6c27fcac99461c462d7 +SIZE (ImageMagick-6.9.6-4.tar.xz) = 8767920 Modified: branches/2016Q4/graphics/ImageMagick/pkg-plist ============================================================================== --- branches/2016Q4/graphics/ImageMagick/pkg-plist Mon Dec 5 00:07:33 2016 (r427821) +++ branches/2016Q4/graphics/ImageMagick/pkg-plist Mon Dec 5 00:08:23 2016 (r427822) @@ -1439,8 +1439,10 @@ man/man1/stream.1.gz %%PORTDOCS%%%%DOCSDIR%%-6/www/js/magick.js %%PORTDOCS%%%%DOCSDIR%%-6/www/license.html %%PORTDOCS%%%%DOCSDIR%%-6/www/links.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/magick.html %%PORTDOCS%%%%DOCSDIR%%-6/www/magick++.html %%PORTDOCS%%%%DOCSDIR%%-6/www/magick-core.html +%%PORTDOCS%%%%DOCSDIR%%-6/www/magick-script.html %%PORTDOCS%%%%DOCSDIR%%-6/www/magick-vector-graphics.html %%PORTDOCS%%%%DOCSDIR%%-6/www/magick-wand.html %%PORTDOCS%%%%DOCSDIR%%-6/www/miff.html From owner-svn-ports-branches@freebsd.org Mon Dec 5 00:14:59 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C6A65C6784E; Mon, 5 Dec 2016 00:14:59 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 7C7E5193F; Mon, 5 Dec 2016 00:14:59 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB50Ewqi080612; Mon, 5 Dec 2016 00:14:58 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB50EwHo080610; Mon, 5 Dec 2016 00:14:58 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201612050014.uB50EwHo080610@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Mon, 5 Dec 2016 00:14:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r427823 - branches/2016Q4/devel/py-pygit2 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.23 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, 05 Dec 2016 00:14:59 -0000 Author: feld Date: Mon Dec 5 00:14:58 2016 New Revision: 427823 URL: https://svnweb.freebsd.org/changeset/ports/427823 Log: MFH: r424760 devel/py-pygit2: update to 0.24.1 PR: 213821 Submitted by: jbeich Approved by: ports-secteam (with hat) Modified: branches/2016Q4/devel/py-pygit2/Makefile branches/2016Q4/devel/py-pygit2/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/devel/py-pygit2/Makefile ============================================================================== --- branches/2016Q4/devel/py-pygit2/Makefile Mon Dec 5 00:08:23 2016 (r427822) +++ branches/2016Q4/devel/py-pygit2/Makefile Mon Dec 5 00:14:58 2016 (r427823) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pygit2 -PORTVERSION= 0.24.0 +PORTVERSION= 0.24.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,14 +15,16 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>0:devel/py-cffi LIB_DEPENDS= libgit2.so:devel/libgit2 -RUN_DEPENDS:= ${BUILD_DEPENDS} +RUN_DEPENDS:= ${BUILD_DEPENDS} \ + ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six USES= python USE_PYTHON= autoplist distutils MAKE_ENV= LIBGIT2=${LOCALBASE} +PYDISTUTILS_TEST_TARGET?= test -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test +do-test: + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_TEST_TARGET} ${PYDISTUTILS_TESTARGS}) post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_pygit2.so ${STAGEDIR}${PYTHON_SITELIBDIR}/pygit2/_libgit2.so Modified: branches/2016Q4/devel/py-pygit2/distinfo ============================================================================== --- branches/2016Q4/devel/py-pygit2/distinfo Mon Dec 5 00:08:23 2016 (r427822) +++ branches/2016Q4/devel/py-pygit2/distinfo Mon Dec 5 00:14:58 2016 (r427823) @@ -1,2 +1,3 @@ -SHA256 (pygit2-0.24.0.tar.gz) = ba76d97e90713584c8cb9d33c81cf9156aa69d6914cd3cdbddb740a069298105 -SIZE (pygit2-0.24.0.tar.gz) = 468391 +TIMESTAMP = 1477478547 +SHA256 (pygit2-0.24.1.tar.gz) = 4d1d0196b38d6012faf0a7c45e235c208315672b6035da504566c605ba494064 +SIZE (pygit2-0.24.1.tar.gz) = 468951 From owner-svn-ports-branches@freebsd.org Mon Dec 5 12:21:57 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 46FE8C68F7F; Mon, 5 Dec 2016 12:21:57 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 21705A27; Mon, 5 Dec 2016 12:21:57 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB5CLu8q076286; Mon, 5 Dec 2016 12:21:56 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB5CLuSa076283; Mon, 5 Dec 2016 12:21:56 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201612051221.uB5CLuSa076283@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Mon, 5 Dec 2016 12:21:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r427878 - in branches/2016Q4/multimedia: mencoder mplayer mplayer/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.23 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, 05 Dec 2016 12:21:57 -0000 Author: riggs Date: Mon Dec 5 12:21:55 2016 New Revision: 427878 URL: https://svnweb.freebsd.org/changeset/ports/427878 Log: MFH: r427637 Port rtsp fixes from multimedia/ffmpeg changeset r427233 Approved by: ports-secteam (junovitch) Added: branches/2016Q4/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c - copied unchanged from r427637, head/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c Modified: branches/2016Q4/multimedia/mencoder/Makefile branches/2016Q4/multimedia/mplayer/Makefile.common Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/multimedia/mencoder/Makefile ============================================================================== --- branches/2016Q4/multimedia/mencoder/Makefile Mon Dec 5 11:19:45 2016 (r427877) +++ branches/2016Q4/multimedia/mencoder/Makefile Mon Dec 5 12:21:55 2016 (r427878) @@ -3,7 +3,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org Modified: branches/2016Q4/multimedia/mplayer/Makefile.common ============================================================================== --- branches/2016Q4/multimedia/mplayer/Makefile.common Mon Dec 5 11:19:45 2016 (r427877) +++ branches/2016Q4/multimedia/mplayer/Makefile.common Mon Dec 5 12:21:55 2016 (r427878) @@ -6,7 +6,7 @@ MPLAYER_PORT_VERSION= 1.3.0 MPLAYER_SNAPSHOT_DATE= 2016-09-12 -PORTREVISION?= 1 +PORTREVISION?= 3 MASTER_SITES= LOCAL/riggs/mplayer DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE} Copied: branches/2016Q4/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c (from r427637, head/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c Mon Dec 5 12:21:55 2016 (r427878, copy of r427637, head/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c) @@ -0,0 +1,45 @@ +--- ffmpeg/libavformat/rtsp.c.orig 2016-08-05 16:20:04 UTC ++++ ffmpeg/libavformat/rtsp.c +@@ -1613,7 +1613,12 @@ int ff_rtsp_make_setup_request(AVFormatC + } + if (ttl > 0) + snprintf(optbuf, sizeof(optbuf), "?ttl=%d", ttl); +- getnameinfo((struct sockaddr*) &addr, sizeof(addr), ++ getnameinfo((struct sockaddr*) &addr, ++#if HAVE_STRUCT_SOCKADDR_SA_LEN ++ ((struct sockaddr*) &addr)->sa_len, ++#else ++ sizeof(addr), ++#endif + namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST); + ff_url_join(url, sizeof(url), "rtp", NULL, namebuf, + port, "%s", optbuf); +@@ -1829,8 +1834,13 @@ redirect: + goto fail; + } + if (!getpeername(tcp_fd, (struct sockaddr*) &peer, &peer_len)) { +- getnameinfo((struct sockaddr*) &peer, peer_len, host, sizeof(host), +- NULL, 0, NI_NUMERICHOST); ++ getnameinfo((struct sockaddr*) &peer, ++#if HAVE_STRUCT_SOCKADDR_SA_LEN ++ ((struct sockaddr*) &peer)->sa_len, ++#else ++ peer_len, ++#endif ++ host, sizeof(host), NULL, 0, NI_NUMERICHOST); + } + + /* request options supported by the server; this also detects server +@@ -2309,7 +2319,11 @@ static int sdp_read_header(AVFormatConte + AVDictionary *opts = map_to_opts(rt); + + err = getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip, +- sizeof(rtsp_st->sdp_ip), ++#if HAVE_STRUCT_SOCKADDR_SA_LEN ++ ((struct sockaddr*) &rtsp_st->sdp_ip)->sa_len, ++#else ++ sizeof(rtsp_st->sdp_ip), ++#endif + namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST); + if (err) { + av_log(s, AV_LOG_ERROR, "getnameinfo: %s\n", gai_strerror(err)); From owner-svn-ports-branches@freebsd.org Tue Dec 6 04:57:13 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E5259C69E21; Tue, 6 Dec 2016 04:57:13 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 A7ACA1B5; Tue, 6 Dec 2016 04:57:13 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB64vCWC080221; Tue, 6 Dec 2016 04:57:12 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB64vC1Q080219; Tue, 6 Dec 2016 04:57:12 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201612060457.uB64vC1Q080219@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Tue, 6 Dec 2016 04:57:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r427931 - branches/2016Q4/www/py-django-mezzanine-filebrowser 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.23 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, 06 Dec 2016 04:57:14 -0000 Author: koobs Date: Tue Dec 6 04:57:12 2016 New Revision: 427931 URL: https://svnweb.freebsd.org/changeset/ports/427931 Log: MFH: r427770 www/py-django-mezzanine-filebrowser: Update to 0.4.6 - Update PORTVERSION and distinfo checksum (0.4.6) - Add NO_ARCH - Enable concurrent installation This update is 1 of 2 that are required to update www/py-django-mezzanine to a version that supports Django 1.8. This is required so that the port can be marked Un'BROKEN on head [1] and fixed in quarterly. The conflict caused by a change made in r423024 [2][3] that updated a dependency (contrib-comments) to use Django 1.8 which caused a CONFLICT (Django 1.6 / Django 1.8): pkg-static: py27-django18-1.8.16 conflicts with py27-django16-1.6.11 (installs files into the same place). Problematic file: /usr/local/man/man1/django-admin.1.gz Failed to install the following 1 package(s): /packages/All/py27-django-contrib-comments-1.7.3.txz [1] https://svnweb.freebsd.org/changeset/ports/424630 [2] https://svnweb.freebsd.org/changeset/ports/423024 PR: 213009 [3] Approved by: ports-secteam (junovich, feld) Modified: branches/2016Q4/www/py-django-mezzanine-filebrowser/Makefile branches/2016Q4/www/py-django-mezzanine-filebrowser/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/www/py-django-mezzanine-filebrowser/Makefile ============================================================================== --- branches/2016Q4/www/py-django-mezzanine-filebrowser/Makefile Tue Dec 6 03:45:06 2016 (r427930) +++ branches/2016Q4/www/py-django-mezzanine-filebrowser/Makefile Tue Dec 6 04:57:12 2016 (r427931) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django-mezzanine-filebrowser -PORTVERSION= 0.3.5 +PORTVERSION= 0.4.6 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +14,9 @@ COMMENT= Fork of django-filebrowser for LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +NO_ARCH= yes + USES= gettext python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist concurrent distutils .include Modified: branches/2016Q4/www/py-django-mezzanine-filebrowser/distinfo ============================================================================== --- branches/2016Q4/www/py-django-mezzanine-filebrowser/distinfo Tue Dec 6 03:45:06 2016 (r427930) +++ branches/2016Q4/www/py-django-mezzanine-filebrowser/distinfo Tue Dec 6 04:57:12 2016 (r427931) @@ -1,2 +1,3 @@ -SHA256 (filebrowser_safe-0.3.5.tar.gz) = b87a3ab3fed9b3eb118145339e79cf5ad6562f148f5bb98e45807d717c4a19d5 -SIZE (filebrowser_safe-0.3.5.tar.gz) = 162091 +TIMESTAMP = 1477384714 +SHA256 (filebrowser_safe-0.4.6.tar.gz) = 80ce1b8b66d442d1a78f1ff4404a3f706ccd81bcb00bf1831e291cb17db8aa7c +SIZE (filebrowser_safe-0.4.6.tar.gz) = 68398 From owner-svn-ports-branches@freebsd.org Tue Dec 6 04:58:45 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 92E98C69EE5; Tue, 6 Dec 2016 04:58:45 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 54811309; Tue, 6 Dec 2016 04:58:45 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB64wiks080432; Tue, 6 Dec 2016 04:58:44 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB64wiix080430; Tue, 6 Dec 2016 04:58:44 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201612060458.uB64wiix080430@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Tue, 6 Dec 2016 04:58:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r427932 - branches/2016Q4/www/py-django-mezzanine-grappelli 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.23 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, 06 Dec 2016 04:58:45 -0000 Author: koobs Date: Tue Dec 6 04:58:44 2016 New Revision: 427932 URL: https://svnweb.freebsd.org/changeset/ports/427932 Log: MFH: r427772 www/py-django-mezzanine-grappelli: Update to 0.4.5 - Update PORTVERSION and distinfo checksum (0.4.5) - Add NO_ARCH - Enable concurrent installation This update is 2 of 2 that are required to update www/py-django-mezzanine to a version that supports Django 1.8. This is required so that the port can be marked Un'BROKEN on head [1] and fixed in quarterly. The conflict caused by a change made in r423024 [2][3] that updated a dependency (contrib-comments) to use Django 1.8 which caused a CONFLICT (Django 1.6 / Django 1.8): pkg-static: py27-django18-1.8.16 conflicts with py27-django16-1.6.11 (installs files into the same place). Problematic file: /usr/local/man/man1/django-admin.1.gz Failed to install the following 1 package(s): /packages/All/py27-django-contrib-comments-1.7.3.txz [1] https://svnweb.freebsd.org/changeset/ports/424630 [2] https://svnweb.freebsd.org/changeset/ports/423024 PR: 213009 [3] Approved by: ports-secteam (junovich, feld) Modified: branches/2016Q4/www/py-django-mezzanine-grappelli/Makefile branches/2016Q4/www/py-django-mezzanine-grappelli/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/www/py-django-mezzanine-grappelli/Makefile ============================================================================== --- branches/2016Q4/www/py-django-mezzanine-grappelli/Makefile Tue Dec 6 04:57:12 2016 (r427931) +++ branches/2016Q4/www/py-django-mezzanine-grappelli/Makefile Tue Dec 6 04:58:44 2016 (r427932) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= django-mezzanine-grappelli -PORTVERSION= 0.3.13 +PORTVERSION= 0.4.5 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,7 +14,9 @@ COMMENT= Fork of django-grappelli for Me LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +NO_ARCH= yes + USES= gettext python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist concurrent distutils .include Modified: branches/2016Q4/www/py-django-mezzanine-grappelli/distinfo ============================================================================== --- branches/2016Q4/www/py-django-mezzanine-grappelli/distinfo Tue Dec 6 04:57:12 2016 (r427931) +++ branches/2016Q4/www/py-django-mezzanine-grappelli/distinfo Tue Dec 6 04:58:44 2016 (r427932) @@ -1,2 +1,3 @@ -SHA256 (grappelli_safe-0.3.13.tar.gz) = 8b21b4724bce449cc4f22dc74ed0be9b3e841d968f3271850bf4836864304eb6 -SIZE (grappelli_safe-0.3.13.tar.gz) = 663285 +TIMESTAMP = 1477384910 +SHA256 (grappelli_safe-0.4.5.tar.gz) = 3515d59f9e048a703df8a3e47d73b58ec36f3007b0cd6b8c53c2eecc16fa70de +SIZE (grappelli_safe-0.4.5.tar.gz) = 77915 From owner-svn-ports-branches@freebsd.org Tue Dec 6 05:02:26 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 14359C69222; Tue, 6 Dec 2016 05:02:26 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 E2A92A0D; Tue, 6 Dec 2016 05:02:25 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB652PpO084251; Tue, 6 Dec 2016 05:02:25 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB652OOS084249; Tue, 6 Dec 2016 05:02:24 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201612060502.uB652OOS084249@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Tue, 6 Dec 2016 05:02:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r427933 - in branches/2016Q4/www/py-django-mezzanine: . 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.23 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, 06 Dec 2016 05:02:26 -0000 Author: koobs Date: Tue Dec 6 05:02:24 2016 New Revision: 427933 URL: https://svnweb.freebsd.org/changeset/ports/427933 Log: MFH: r427775 (w/ r424630) www/py-django-mezzanine: Update to 4.2.2, Mark Un'BROKEN - Update PORTVERSION and distinfo checksum (4.2.2) - Update RUN_DEPENDS. In particular, switch to Django 1.8 and mark un'BROKEN accordingly - Remove setup.py patch. No longer necessary. - Enable concurrent Python installation X-MFH-With: 424630 Approved by: ports-secteam (junovich) Deleted: branches/2016Q4/www/py-django-mezzanine/files/ Modified: branches/2016Q4/www/py-django-mezzanine/Makefile branches/2016Q4/www/py-django-mezzanine/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/www/py-django-mezzanine/Makefile ============================================================================== --- branches/2016Q4/www/py-django-mezzanine/Makefile Tue Dec 6 04:58:44 2016 (r427932) +++ branches/2016Q4/www/py-django-mezzanine/Makefile Tue Dec 6 05:02:24 2016 (r427933) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= django-mezzanine -PORTVERSION= 3.1.10 -PORTREVISION= 2 +PORTVERSION= 4.2.2 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,24 +14,23 @@ COMMENT= Content management platform bui LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django16 \ - ${PYTHON_PKGNAMEPREFIX}django-mezzanine-filebrowser>=0.3.4:www/py-django-mezzanine-filebrowser \ - ${PYTHON_PKGNAMEPREFIX}django-mezzanine-grappelli>=0.3.12:www/py-django-mezzanine-grappelli \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18 \ + ${PYTHON_PKGNAMEPREFIX}django-contrib-comments>0:www/py-django-contrib-comments \ + ${PYTHON_PKGNAMEPREFIX}django-mezzanine-filebrowser>=0.4.6:www/py-django-mezzanine-filebrowser \ + ${PYTHON_PKGNAMEPREFIX}django-mezzanine-grappelli>=0.4.5:www/py-django-mezzanine-grappelli \ ${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal \ ${PYTHON_PKGNAMEPREFIX}bleach>=1.4:www/py-bleach \ ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.1.3:www/py-beautifulsoup \ ${PYTHON_PKGNAMEPREFIX}requests>=2.1.0:www/py-requests \ ${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0.4:www/py-requests-oauthlib \ ${PYTHON_PKGNAMEPREFIX}future>=0.9.0:devel/py-future \ - ${PYTHON_PKGNAMEPREFIX}pillow>=1.3.1:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}django-contrib-comments>0:www/py-django-contrib-comments \ - ${PYTHON_PKGNAMEPREFIX}south>=0.7.3:databases/py-south \ - + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ + ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pep8>=1.4.1:devel/pep8 \ ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.6.1:devel/py-pyflakes USES= gettext python -USE_PYTHON= autoplist distutils +USE_PYTHON= autoplist concurrent distutils do-test: @cd ${WRKSRC} && ${SETENV} TZ=UTC LC_ALL=en_US.UTF-8 ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test Modified: branches/2016Q4/www/py-django-mezzanine/distinfo ============================================================================== --- branches/2016Q4/www/py-django-mezzanine/distinfo Tue Dec 6 04:58:44 2016 (r427932) +++ branches/2016Q4/www/py-django-mezzanine/distinfo Tue Dec 6 05:02:24 2016 (r427933) @@ -1,2 +1,3 @@ -SHA256 (Mezzanine-3.1.10.tar.gz) = cd33d3dce112ae24fbb23ab2632334d124d3c35556fd2a3d87ec5916293a1705 -SIZE (Mezzanine-3.1.10.tar.gz) = 7430509 +TIMESTAMP = 1477385624 +SHA256 (Mezzanine-4.2.2.tar.gz) = 890298ec6e3281cce0b318a7956222480aa3be38bf25e8f841d9f5e33b7fba9b +SIZE (Mezzanine-4.2.2.tar.gz) = 6229423 From owner-svn-ports-branches@freebsd.org Tue Dec 6 12:52:29 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3431CC692AC; Tue, 6 Dec 2016 12:52:29 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 EAAEA1070; Tue, 6 Dec 2016 12:52:28 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB6CqRWo073718; Tue, 6 Dec 2016 12:52:27 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB6CqRpj073716; Tue, 6 Dec 2016 12:52:27 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201612061252.uB6CqRpj073716@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Tue, 6 Dec 2016 12:52:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r427954 - in branches/2016Q4/www/apache24: . 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.23 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, 06 Dec 2016 12:52:29 -0000 Author: brnrd Date: Tue Dec 6 12:52:27 2016 New Revision: 427954 URL: https://svnweb.freebsd.org/changeset/ports/427954 Log: MFH: r427953 www/apache24: Fix HTTP/2 DoS vulnerability - Add patch from upstream security advisory - Bump PORTREVISION PR: 215096 Security: cb0bf1ec-bb92-11e6-a9a5-b499baebfeaf Security: CVE-2016-8740 Approved by: ports-secteam (implicit, "Backport of security and reliability fixes") Added: branches/2016Q4/www/apache24/files/patch-CVE-2016-8740 - copied unchanged from r427953, head/www/apache24/files/patch-CVE-2016-8740 Modified: branches/2016Q4/www/apache24/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/www/apache24/Makefile ============================================================================== --- branches/2016Q4/www/apache24/Makefile Tue Dec 6 12:43:36 2016 (r427953) +++ branches/2016Q4/www/apache24/Makefile Tue Dec 6 12:52:27 2016 (r427954) @@ -2,7 +2,7 @@ PORTNAME= apache24 PORTVERSION= 2.4.23 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www ipv6 MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} Copied: branches/2016Q4/www/apache24/files/patch-CVE-2016-8740 (from r427953, head/www/apache24/files/patch-CVE-2016-8740) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/www/apache24/files/patch-CVE-2016-8740 Tue Dec 6 12:52:27 2016 (r427954, copy of r427953, head/www/apache24/files/patch-CVE-2016-8740) @@ -0,0 +1,116 @@ + Security Advisory - Apache Software Foundation + Apache HTTPD WebServer / httpd.apache.org + + Server memory can be exhausted and service denied when HTTP/2 is used + + CVE-2016-8740 + +The Apache HTTPD web server (from 2.4.17-2.4.23) did not apply limitations +on request headers correctly when experimental module for the HTTP/2 +protocol is used to access a resource. + +The net result is that a the server allocates too much memory instead of denying +the request. This can lead to memory exhaustion of the server by a properly +crafted request. + +Background: +- ----------- + +Apache has limits on the number and length of request header fields. which +limits the amount of memory a client can allocate on the server for a request. + +Version 2.4.17 of the Apache HTTP Server introduced an experimental feature: +mod_http2 for the HTTP/2 protocol (RFC7540, previous versions were known as +Google SPDY). + +This module is NOT compiled in by default -and- is not enabled by default, +although some distribution may have chosen to do so. + +It is generally needs to be enabled in the 'Protocols' line in httpd by +adding 'h2' and/or 'h2c' to the 'http/1.1' only default. + +The default distributions of the Apache Software Foundation do not include +this experimental feature. + +Details: +- -------- + +- From version 2.4.17, upto and including version 2.4.23 the server failed +to take the limitations on request memory use into account when providing +access to a resource over HTTP/2. This issue has been fixed +in version 2.4.23 (r1772576). + +As a result - with a request using the HTTP/2 protocol a specially crafted +request can allocate memory on the server until it reaches its limit. This can +lead to denial of service for all requests against the server. + +Impact: +- ------- + +This can lead to denial of service for all server resources. +Versions affected: +- ------------------ +All versions from 2.4.17 to 2.4.23. + +Resolution: +- ----------- + +For a 2.4.23 version a patch is supplied. This will be included in the +next release. + +Mitigations and work arounds: +- ----------------------------- + +As a temporary workaround - HTTP/2 can be disabled by changing +the configuration by removing h2 and h2c from the Protocols +line(s) in the configuration file. + +The resulting line should read: + + Protocols http/1.1 + +Credits and timeline +- -------------------- + +The flaw was found and reported by Naveen Tiwari +and CDF/SEFCOM at Arizona State University on 2016-11-22. The issue was +resolved by Stefan Eissing and incorporated in the Apache repository, +ready for inclusion in the next release. + +Apache would like to thank all involved for their help with this. + +Index: modules/http2/h2_stream.c +=================================================================== +--- modules/http2/h2_stream.c (revision 1771866) ++++ modules/http2/h2_stream.c (working copy) +@@ -322,18 +322,18 @@ + HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE); + } + } +- } +- +- if (h2_stream_is_scheduled(stream)) { +- return h2_request_add_trailer(stream->request, stream->pool, +- name, nlen, value, vlen); +- } +- else { +- if (!input_open(stream)) { +- return APR_ECONNRESET; ++ ++ if (h2_stream_is_scheduled(stream)) { ++ return h2_request_add_trailer(stream->request, stream->pool, ++ name, nlen, value, vlen); + } +- return h2_request_add_header(stream->request, stream->pool, +- name, nlen, value, vlen); ++ else { ++ if (!input_open(stream)) { ++ return APR_ECONNRESET; ++ } ++ return h2_request_add_header(stream->request, stream->pool, ++ name, nlen, value, vlen); ++ } + } + } + + From owner-svn-ports-branches@freebsd.org Wed Dec 7 02:52:14 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C2058C6AB5F; Wed, 7 Dec 2016 02:52:14 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 7D58B1364; Wed, 7 Dec 2016 02:52:14 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB72qDIJ018488; Wed, 7 Dec 2016 02:52:13 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB72qD39018486; Wed, 7 Dec 2016 02:52:13 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201612070252.uB72qD39018486@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Wed, 7 Dec 2016 02:52:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r428028 - in branches/2016Q4/devel/binutils: . 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.23 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, 07 Dec 2016 02:52:14 -0000 Author: junovitch Date: Wed Dec 7 02:52:13 2016 New Revision: 428028 URL: https://svnweb.freebsd.org/changeset/ports/428028 Log: MFH: r427378 Fix booting the arm64 kernel when built with clang 3.9.0 Clang 3.9.0 changes how weak extern is handled. They now use the got to handle them. This is a problem as ld.bfd doesn't fill out any default value in the got so pointers become NULL. This caused the kernel to fail to boot as we use this in linker sets. This fixes the issue by setting a default value in the got. The kernel still loads data through it, but because we always load it at a fixed virtual address the address it finds is valid. Requested by: andrew Approved by: ports-secteam (with hat), bapt Differential Revision: https://reviews.freebsd.org/D8622 Added: branches/2016Q4/devel/binutils/files/patch-bfd_elfnn-aarch64.c - copied unchanged from r427378, head/devel/binutils/files/patch-bfd_elfnn-aarch64.c Modified: branches/2016Q4/devel/binutils/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/devel/binutils/Makefile ============================================================================== --- branches/2016Q4/devel/binutils/Makefile Wed Dec 7 02:35:13 2016 (r428027) +++ branches/2016Q4/devel/binutils/Makefile Wed Dec 7 02:52:13 2016 (r428028) @@ -3,7 +3,7 @@ PORTNAME= binutils PORTVERSION= 2.27 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH?= 1 CATEGORIES?= devel MASTER_SITES= SOURCEWARE/binutils/releases Copied: branches/2016Q4/devel/binutils/files/patch-bfd_elfnn-aarch64.c (from r427378, head/devel/binutils/files/patch-bfd_elfnn-aarch64.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/devel/binutils/files/patch-bfd_elfnn-aarch64.c Wed Dec 7 02:52:13 2016 (r428028, copy of r427378, head/devel/binutils/files/patch-bfd_elfnn-aarch64.c) @@ -0,0 +1,28 @@ +--- bfd/elfnn-aarch64.c.orig 2016-11-20 12:04:44.613621000 +0000 ++++ bfd/elfnn-aarch64.c 2016-11-20 12:05:01.143334000 +0000 +@@ -4369,7 +4369,9 @@ + off = h->got.offset; + BFD_ASSERT (off != (bfd_vma) - 1); + if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, bfd_link_pic (info), h) +- || (bfd_link_pic (info) ++ || ((bfd_link_pic (info) ++ || (!bfd_link_relocatable (info) ++ && (info->export_dynamic || info->dynamic))) + && SYMBOL_REFERENCES_LOCAL (info, h)) + || (ELF_ST_VISIBILITY (h->other) + && h->root.type == bfd_link_hash_undefweak)) +@@ -8891,6 +8893,14 @@ + + h->root.u.def.section->output_section->vma + + h->root.u.def.section->output_offset); + } ++ else if (!bfd_link_relocatable (info) ++ && (info->export_dynamic || info->dynamic) ++ && SYMBOL_REFERENCES_LOCAL (info, h)) ++ { ++ BFD_ASSERT ((h->got.offset & 1) != 0); ++ rela.r_info = ELFNN_R_INFO (h->dynindx, AARCH64_R (GLOB_DAT)); ++ rela.r_addend = 0; ++ } + else + { + do_glob_dat: From owner-svn-ports-branches@freebsd.org Wed Dec 7 03:07:27 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 31A0DC670D7; Wed, 7 Dec 2016 03:07:27 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 010221FED; Wed, 7 Dec 2016 03:07:26 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB737QS6023944; Wed, 7 Dec 2016 03:07:26 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB737QAX023942; Wed, 7 Dec 2016 03:07:26 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201612070307.uB737QAX023942@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 7 Dec 2016 03:07:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r428030 - branches/2016Q4/security/nss 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.23 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, 07 Dec 2016 03:07:27 -0000 Author: jbeich Date: Wed Dec 7 03:07:25 2016 New Revision: 428030 URL: https://svnweb.freebsd.org/changeset/ports/428030 Log: MFH: r427830 security/nss: update to 3.27.2 Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.27.2_release_notes Approved by: ports-secteam (junovitch) Modified: branches/2016Q4/security/nss/Makefile branches/2016Q4/security/nss/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/security/nss/Makefile ============================================================================== --- branches/2016Q4/security/nss/Makefile Wed Dec 7 03:03:53 2016 (r428029) +++ branches/2016Q4/security/nss/Makefile Wed Dec 7 03:07:25 2016 (r428030) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.27.1 +PORTVERSION= 3.27.2 #DISTVERSIONSUFFIX= -with-ckbi-1.98 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src Modified: branches/2016Q4/security/nss/distinfo ============================================================================== --- branches/2016Q4/security/nss/distinfo Wed Dec 7 03:03:53 2016 (r428029) +++ branches/2016Q4/security/nss/distinfo Wed Dec 7 03:07:25 2016 (r428030) @@ -1,3 +1,3 @@ -TIMESTAMP = 1475952210 -SHA256 (nss-3.27.1.tar.gz) = fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b -SIZE (nss-3.27.1.tar.gz) = 7397737 +TIMESTAMP = 1480381418 +SHA256 (nss-3.27.2.tar.gz) = dc8ac8524469d0230274fd13a53fdcd74efe4aa67205dde1a4a92be87dc28524 +SIZE (nss-3.27.2.tar.gz) = 7397599 From owner-svn-ports-branches@freebsd.org Wed Dec 7 07:44:42 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6C2A5C6B0C3; Wed, 7 Dec 2016 07:44:42 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 46BDBCB2; Wed, 7 Dec 2016 07:44:42 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB77ifLn036888; Wed, 7 Dec 2016 07:44:41 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB77ifWY036884; Wed, 7 Dec 2016 07:44:41 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201612070744.uB77ifWY036884@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Wed, 7 Dec 2016 07:44:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r428038 - branches/2016Q4/ports-mgmt/distilator 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.23 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, 07 Dec 2016 07:44:42 -0000 Author: ehaupt Date: Wed Dec 7 07:44:40 2016 New Revision: 428038 URL: https://svnweb.freebsd.org/changeset/ports/428038 Log: MFH: r427950 r427951 Update to 0.3. Switch from perl threads to Parallel::ForkManager. With perl 5.24, threads used in distilator produce a many random warnings hinting at the fact that the modules used to check the links are not (and never were) thread safe. Remove WWW. There is no public website available. Adjust description as perl threads are no longer used. Approved by: ports-secteam (junovitch) Modified: branches/2016Q4/ports-mgmt/distilator/Makefile branches/2016Q4/ports-mgmt/distilator/distinfo branches/2016Q4/ports-mgmt/distilator/pkg-descr branches/2016Q4/ports-mgmt/distilator/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/ports-mgmt/distilator/Makefile ============================================================================== --- branches/2016Q4/ports-mgmt/distilator/Makefile Wed Dec 7 07:37:10 2016 (r428037) +++ branches/2016Q4/ports-mgmt/distilator/Makefile Wed Dec 7 07:44:40 2016 (r428038) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= distilator -PORTVERSION= 0.2 -PORTREVISION= 2 +PORTVERSION= 0.3 CATEGORIES= ports-mgmt perl5 MASTER_SITES= LOCAL/ehaupt @@ -14,7 +13,8 @@ LICENSE= ART10 GPLv1 LICENSE_COMB= dual RUN_DEPENDS= p5-URI>=1.56:net/p5-URI \ - p5-libwww>=0:www/p5-libwww + p5-libwww>=0:www/p5-libwww \ + p5-Parallel-ForkManager>=0:devel/p5-Parallel-ForkManager BUILD_DEPENDS:= ${RUN_DEPENDS} USES= perl5 Modified: branches/2016Q4/ports-mgmt/distilator/distinfo ============================================================================== --- branches/2016Q4/ports-mgmt/distilator/distinfo Wed Dec 7 07:37:10 2016 (r428037) +++ branches/2016Q4/ports-mgmt/distilator/distinfo Wed Dec 7 07:44:40 2016 (r428038) @@ -1,2 +1,3 @@ -SHA256 (distilator-0.2.tar.gz) = d5e78849bab1b0cdf452cc0d654adeab51916ef855664ad7b5be68c9d14c9291 -SIZE (distilator-0.2.tar.gz) = 3916 +TIMESTAMP = 1481022611 +SHA256 (distilator-0.3.tar.gz) = 19d299036d55eb25812aec3740015397097432a541d25983322d85fdbaab9030 +SIZE (distilator-0.3.tar.gz) = 3736 Modified: branches/2016Q4/ports-mgmt/distilator/pkg-descr ============================================================================== --- branches/2016Q4/ports-mgmt/distilator/pkg-descr Wed Dec 7 07:37:10 2016 (r428037) +++ branches/2016Q4/ports-mgmt/distilator/pkg-descr Wed Dec 7 07:44:40 2016 (r428038) @@ -1,4 +1 @@ -A command-line script to check the availability of a ports distfiles. This -script can take advantage of perl threads if available. - -WWW: http://people.freebsd.org/~ehaupt/distilator/ +A command-line script to check the availability of a ports distfiles. Modified: branches/2016Q4/ports-mgmt/distilator/pkg-plist ============================================================================== --- branches/2016Q4/ports-mgmt/distilator/pkg-plist Wed Dec 7 07:37:10 2016 (r428037) +++ branches/2016Q4/ports-mgmt/distilator/pkg-plist Wed Dec 7 07:44:40 2016 (r428038) @@ -1,5 +1,2 @@ bin/distilator %%SITE_PERL%%/FreeBSD/Ports/Distilator.pm -%%SITE_PERL%%/FreeBSD/Ports/DistilatorCommon.pm -%%SITE_PERL%%/FreeBSD/Ports/DistilatorSingle.pm -%%SITE_PERL%%/FreeBSD/Ports/DistilatorThreaded.pm From owner-svn-ports-branches@freebsd.org Wed Dec 7 08:26:02 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 260E8C6BC06; Wed, 7 Dec 2016 08:26:02 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 CF84E1E0C; Wed, 7 Dec 2016 08:26:01 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB78Q1bQ053140; Wed, 7 Dec 2016 08:26:01 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB78Q031053138; Wed, 7 Dec 2016 08:26:00 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201612070826.uB78Q031053138@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Wed, 7 Dec 2016 08:26:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r428040 - branches/2016Q4/www/mod_http2-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.23 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, 07 Dec 2016 08:26:02 -0000 Author: brnrd Date: Wed Dec 7 08:26:00 2016 New Revision: 428040 URL: https://svnweb.freebsd.org/changeset/ports/428040 Log: MFH: r423287 r423464 r423646 r424149 r425124 r425201 r426130 r427159 r427944 www/mod_http2-devel: Update to 1.7.1 - Regular update www/mod_http2-devel: Update to 1.7.2 - Bugfix update www/mod_http2-devel: Update to 1.7.3 - Regular bug-fix update www/mod_http2-devel: Update to 1.7.5 - Regular update www/mod_http2-devel: Update to 1.7.8 www/mod_http2-devel: Update to 1.7.9 - Bugfix update www/mod_http2-devel: Update to 1.8.0 - Update to 1.8.0 - Feature addition update - Bump shlib version www/mod_http2-devel: Update to 1.8.2 www/mod_http2-devel: Update to 1.8.3 - Update to 1.8.3 - Fix DoS vulnerability Security: cb0bf1ec-bb92-11e6-a9a5-b499baebfeaf Security: CVE-2016-8740 Approved by: ports-secteam (junovitch) Modified: branches/2016Q4/www/mod_http2-devel/Makefile branches/2016Q4/www/mod_http2-devel/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/www/mod_http2-devel/Makefile ============================================================================== --- branches/2016Q4/www/mod_http2-devel/Makefile Wed Dec 7 07:57:51 2016 (r428039) +++ branches/2016Q4/www/mod_http2-devel/Makefile Wed Dec 7 08:26:00 2016 (r428040) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mod_http2-devel -PORTVERSION= 1.6.2 +PORTVERSION= 1.8.3 DISTVERSIONPREFIX= v CATEGORIES= www Modified: branches/2016Q4/www/mod_http2-devel/distinfo ============================================================================== --- branches/2016Q4/www/mod_http2-devel/distinfo Wed Dec 7 07:57:51 2016 (r428039) +++ branches/2016Q4/www/mod_http2-devel/distinfo Wed Dec 7 08:26:00 2016 (r428040) @@ -1,3 +1,3 @@ -TIMESTAMP = 1474357159 -SHA256 (icing-mod_h2-v1.6.2_GH0.tar.gz) = b0e680f3a07b1bdb22f0e1c8a8d5c794aa6340f3427c20d5e6b2cc90ce8d104a -SIZE (icing-mod_h2-v1.6.2_GH0.tar.gz) = 185808 +TIMESTAMP = 1481014584 +SHA256 (icing-mod_h2-v1.8.3_GH0.tar.gz) = 5c22fd4944bdb756aefd6bf21464824f3ec774fd3148213a6a15903a8ac43822 +SIZE (icing-mod_h2-v1.8.3_GH0.tar.gz) = 194091 From owner-svn-ports-branches@freebsd.org Wed Dec 7 09:51:29 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F178C69EB5; Wed, 7 Dec 2016 09:51:29 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 EBD481266; Wed, 7 Dec 2016 09:51:28 +0000 (UTC) (envelope-from jhale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB79pSSs088573; Wed, 7 Dec 2016 09:51:28 GMT (envelope-from jhale@FreeBSD.org) Received: (from jhale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB79pR5h088562; Wed, 7 Dec 2016 09:51:27 GMT (envelope-from jhale@FreeBSD.org) Message-Id: <201612070951.uB79pR5h088562@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhale set sender to jhale@FreeBSD.org using -f From: "Jason E. Hale" Date: Wed, 7 Dec 2016 09:51:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r428043 - in branches/2016Q4: audio/clementine-player deskutils/cdcat multimedia/kvazaar net-p2p/amule net-p2p/amule-devel security/cryptopp security/cryptopp/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.23 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, 07 Dec 2016 09:51:29 -0000 Author: jhale Date: Wed Dec 7 09:51:26 2016 New Revision: 428043 URL: https://svnweb.freebsd.org/changeset/ports/428043 Log: MFH: r425256 r427282 r427478 r428022 Now builds on sparc64. Approved by: portmgr (tier-2 blanket) Release this back to pool. Set library SONAME, this makes pkg correctly detect provided package functionality and fixes pkg check -d. PR: 214857 Submitted by: myself Approved by: delphij no longer maintainer - Update security/cryptopp to 5.6.5 - Add LICENSE (BSL) - Add CPE data - Remove STATIC option and always install the shared library; no reason not to. - Remove GCC option and use USES=compiler framework - Add FULL_DEBUG option to address CVE-2016-7420 and add a warning if trying to use it. It will allow the asserts to be enabled which could be a security risk. The standard DEBUG option is now safe to use. - Add SIMD option for i386 and amd64 - requires a recent clang or gcc - Don't install the cryptest binary; it is really only used for regression testing, so only build it for the TEST_TARGET. It is useless without the data files anyways. - Take maintainership - Bump PORTREVISON on dependent ports due to shared library bump PR: 215015 Reported by: Security: eab68cff-bc0c-11e6-b2ca-001b3856973b Approved by: ports-secteam (junovitch) Deleted: branches/2016Q4/security/cryptopp/files/patch-nbtheory.cpp branches/2016Q4/security/cryptopp/files/patch-wake.cpp Modified: branches/2016Q4/audio/clementine-player/Makefile branches/2016Q4/deskutils/cdcat/Makefile branches/2016Q4/multimedia/kvazaar/Makefile branches/2016Q4/net-p2p/amule-devel/Makefile branches/2016Q4/net-p2p/amule/Makefile branches/2016Q4/security/cryptopp/Makefile branches/2016Q4/security/cryptopp/distinfo branches/2016Q4/security/cryptopp/files/patch-GNUmakefile branches/2016Q4/security/cryptopp/files/patch-config.h branches/2016Q4/security/cryptopp/files/patch-misc.h branches/2016Q4/security/cryptopp/pkg-plist Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/audio/clementine-player/Makefile ============================================================================== --- branches/2016Q4/audio/clementine-player/Makefile Wed Dec 7 09:48:39 2016 (r428042) +++ branches/2016Q4/audio/clementine-player/Makefile Wed Dec 7 09:51:26 2016 (r428043) @@ -3,6 +3,7 @@ PORTNAME= clementine PORTVERSION= 1.3.1 +PORTREVISION= 1 CATEGORIES= audio PKGNAMESUFFIX= -player Modified: branches/2016Q4/deskutils/cdcat/Makefile ============================================================================== --- branches/2016Q4/deskutils/cdcat/Makefile Wed Dec 7 09:48:39 2016 (r428042) +++ branches/2016Q4/deskutils/cdcat/Makefile Wed Dec 7 09:51:26 2016 (r428043) @@ -3,7 +3,7 @@ PORTNAME= cdcat PORTVERSION= 2.3.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} Modified: branches/2016Q4/multimedia/kvazaar/Makefile ============================================================================== --- branches/2016Q4/multimedia/kvazaar/Makefile Wed Dec 7 09:48:39 2016 (r428042) +++ branches/2016Q4/multimedia/kvazaar/Makefile Wed Dec 7 09:51:26 2016 (r428043) @@ -3,7 +3,7 @@ PORTNAME= kvazaar DISTVERSIONPREFIX= v DISTVERSION?= 1.0.0 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org Modified: branches/2016Q4/net-p2p/amule-devel/Makefile ============================================================================== --- branches/2016Q4/net-p2p/amule-devel/Makefile Wed Dec 7 09:48:39 2016 (r428042) +++ branches/2016Q4/net-p2p/amule-devel/Makefile Wed Dec 7 09:51:26 2016 (r428043) @@ -3,7 +3,7 @@ PORTNAME= amule PORTVERSION= 10964 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-p2p MASTER_SITES= http://amule.sourceforge.net/tarballs/ PKGNAMESUFFIX= -devel Modified: branches/2016Q4/net-p2p/amule/Makefile ============================================================================== --- branches/2016Q4/net-p2p/amule/Makefile Wed Dec 7 09:48:39 2016 (r428042) +++ branches/2016Q4/net-p2p/amule/Makefile Wed Dec 7 09:51:26 2016 (r428043) @@ -3,6 +3,7 @@ PORTNAME= amule PORTVERSION= 2.3.2 +PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= SF/${PORTNAME}/aMule/${PORTVERSION} DISTNAME= aMule-${PORTVERSION} Modified: branches/2016Q4/security/cryptopp/Makefile ============================================================================== --- branches/2016Q4/security/cryptopp/Makefile Wed Dec 7 09:48:39 2016 (r428042) +++ branches/2016Q4/security/cryptopp/Makefile Wed Dec 7 09:51:26 2016 (r428043) @@ -1,73 +1,112 @@ # Created by: George Reid # $FreeBSD$ +# Minor version bumps may not be ABI compatible and deskutils/cdcat +# links to the static library, so bump PORTREVISION of dependent +# ports when appropriate. + PORTNAME= cryptopp -PORTVERSION= 5.6.2 -PORTREVISION= 2 +PORTVERSION= 5.6.5 CATEGORIES= security -MASTER_SITES= SF \ - http://www.cryptopp.com/ +MASTER_SITES= http://www.cryptopp.com/ DISTNAME= cryptopp${PORTVERSION:S/.//g} -MAINTAINER= delphij@FreeBSD.org +MAINTAINER= jhale@FreeBSD.org COMMENT= Free C++ class library of Cryptographic Primitives -OPTIONS_DEFINE= DEBUG DOCS GCC STATIC THREADS -OPTIONS_DEFAULT= THREADS -STATIC_DESC= Build static version only (no shared libs) +LICENSE= BSL +LICENSE_FILE= ${WRKSRC}/License.txt -.include +USES= cpe gmake zip:infozip +USE_LDCONFIG= yes + +CPE_PRODUCT= crypto++ +CPE_VENDOR= cryptopp + +BROKEN_powerpc= does not compile; unrecognized C++ options -NO_WRKSUBDIR= yes EXTRACT_BEFORE_ARGS= -aq -USES= gmake zip:infozip +NO_WRKSUBDIR= yes + +CXXFLAGS+= -Wno-deprecated-declarations -fPIC MAKEFILE= GNUmakefile +ALL_TARGET= static shared +TEST_TARGET= test -LIBVERSION= 0 -PLIST_SUB+= LIBVERSION=${LIBVERSION} -PLIST_SUB+= PORTVERSION=${PORTVERSION} +LIBVERSION= ${PORTVERSION:R:R} +PLIST_SUB+= LIBVERSION=${LIBVERSION} \ + PORTVERSION=${PORTVERSION} + +OPTIONS_DEFINE= DEBUG DOCS FULL_DEBUG THREADS +OPTIONS_DEFINE_amd64= SIMD +OPTIONS_DEFINE_i386= SIMD +OPTIONS_DEFAULT= THREADS +OPTIONS_SUB= yes -.if !${PORT_OPTIONS:MDEBUG} -CXXFLAGS+= -DNDEBUG -.endif +# Always compile with -DNDEBUG for release. Otherwise, sensitive +# information could be accessed if an assert triggers. +# See ${WRKSRC}/Readme.txt for more details. +FULL_DEBUG_DESC= Build with full debugging support (SECURITY RISK!!!) +FULL_DEBUG_CXXFLAGS= -DCRYPTOPP_DEBUG +FULL_DEBUG_CXXFLAGS_OFF=-DNDEBUG +FULL_DEBUG_IMPLIES= DEBUG -.if ${PORT_OPTIONS:MGCC} -USE_GCC= yes -.endif +THREADS_LDFLAGS= -lpthread -.if ${PORT_OPTIONS:MSTATIC} -PLIST_SUB+= DYNAMIC_ENABLED="@comment " +.include + +.if ${PORT_OPTIONS:MSIMD} +. if ${MACHINE_CPU:Msse2} +USES+= compiler:c++14-lang +CXXFLAGS+= -msse2 +. else +CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM -DCRYPTOPP_DISABLE_SSE2 +. endif +. if ${MACHINE_CPU:Msse3} && ${MACHINE_CPU:Mssse3} +CXXFLAGS+= -msse3 -mssse3 +. else +CXXFLAGS+= -DCRYPTOPP_DISABLE_SSE3 +. endif +. if ${MACHINE_CPU:Msse41} && ${MACHINE_CPU:Msse42} +CXXFLAGS+= -msse4.1 -msse4.2 +. else +CXXFLAGS+= -DCRYPTOPP_DISABLE_SSE4 +. endif .else -PLIST_SUB+= DYNAMIC_ENABLED="" -MAKE_ARGS= all libcryptopp.so -CXXFLAGS+= -fPIC -USE_LDCONFIG= yes +CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM .endif -.if ${PORT_OPTIONS:MTHREADS} -LDFLAGS+= -lpthread +.include + +.if ${PORT_OPTIONS:MSIMD} && ${MACHINE_CPU:Msse2} && ${CHOSEN_COMPILER_TYPE} == gcc +USE_GCC= yes .endif +pre-configure-FULL_DEBUG-on: + @${ECHO_CMD} + @${ECHO_CMD} "----------------------------- WARNING!!! ----------------------------" + @${ECHO_CMD} "You have chosen to compile with full debugging support. If an assert" + @${ECHO_CMD} "triggers, sensitive information could possibly be egressed to the" + @${ECHO_CMD} "filesystem via a core dump. If this is not your intention, hit CTRL-C" + @${ECHO_CMD} "now and run 'make config clean' and disable the FULL_DEBUG option." + @${ECHO_CMD} "---------------------------------------------------------------------" + @${ECHO_CMD} + @sleep 10 + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/cryptest.exe ${STAGEDIR}${PREFIX}/bin/cryptest ${INSTALL_DATA} ${WRKSRC}/libcryptopp.a ${STAGEDIR}${PREFIX}/lib - ${MKDIR} ${STAGEDIR}${PREFIX}/include/cryptopp + ${INSTALL_LIB} ${WRKSRC}/libcryptopp.so ${STAGEDIR}${PREFIX}/lib/libcryptopp.so.${PORTVERSION} + ${LN} -fs libcryptopp.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libcryptopp.so.${LIBVERSION} + ${LN} -fs libcryptopp.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libcryptopp.so + @${MKDIR} ${STAGEDIR}${PREFIX}/include/cryptopp (for i in `${FIND} ${WRKSRC}/ -name '*.h' \ -and -not -name 'dll.h' \ -and -not -name 'resource.h'`; do \ ${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/include/cryptopp; \ done) -.if !${PORT_OPTIONS:MSTATIC} - ${INSTALL_LIB} ${WRKSRC}/libcryptopp.so ${STAGEDIR}${PREFIX}/lib/libcryptopp.so.${PORTVERSION} - ${LN} -fs libcryptopp.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libcryptopp.so.${LIBVERSION} - ${LN} -fs libcryptopp.so.${LIBVERSION} ${STAGEDIR}${PREFIX}/lib/libcryptopp.so -.endif - ${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/cryptopp - ${CP} ${WRKSRC}/Readme.txt ${STAGEDIR}${PREFIX}/share/doc/cryptopp/README - ${CP} ${WRKSRC}/License.txt ${STAGEDIR}${PREFIX}/share/doc/cryptopp/License -.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64: unrecognized C++ options -.endif +do-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/Readme.txt ${STAGEDIR}${DOCSDIR}/README -.include +.include Modified: branches/2016Q4/security/cryptopp/distinfo ============================================================================== --- branches/2016Q4/security/cryptopp/distinfo Wed Dec 7 09:48:39 2016 (r428042) +++ branches/2016Q4/security/cryptopp/distinfo Wed Dec 7 09:51:26 2016 (r428043) @@ -1,2 +1,3 @@ -SHA256 (cryptopp562.zip) = 5cbfd2fcb4a6b3aab35902e2e0f3b59d9171fee12b3fc2b363e1801dfec53574 -SIZE (cryptopp562.zip) = 1137964 +TIMESTAMP = 1480818667 +SHA256 (cryptopp565.zip) = a75ef486fe3128008bbb201efee3dcdcffbe791120952910883b26337ec32c34 +SIZE (cryptopp565.zip) = 4220843 Modified: branches/2016Q4/security/cryptopp/files/patch-GNUmakefile ============================================================================== --- branches/2016Q4/security/cryptopp/files/patch-GNUmakefile Wed Dec 7 09:48:39 2016 (r428042) +++ branches/2016Q4/security/cryptopp/files/patch-GNUmakefile Wed Dec 7 09:51:26 2016 (r428043) @@ -1,26 +1,40 @@ ---- ./GNUmakefile.orig 2013-02-20 15:30:52.000000000 -0500 -+++ ./GNUmakefile 2014-02-05 14:26:22.994957010 -0500 -@@ -1,4 +1,4 @@ --CXXFLAGS = -DNDEBUG -g -O2 -+#CXXFLAGS = -DNDEBUG -g -O2 - # -O3 fails to link on Cygwin GCC version 4.5.3 - # -fPIC is supported. Please report any breakage of -fPIC as a bug. - # CXXFLAGS += -fPIC -@@ -38,8 +38,6 @@ - ifneq ($(GCC42_OR_LATER),0) - ifeq ($(UNAME),Darwin) - CXXFLAGS += -arch x86_64 -arch i386 --else --CXXFLAGS += -march=native - endif +--- GNUmakefile.orig 2016-10-10 23:49:54 UTC ++++ GNUmakefile +@@ -41,7 +41,7 @@ SUNCC_511_OR_LATER := $(shell $(CXX) -V + SUNCC_512_OR_LATER := $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: (Sun|Studio) .* (5\.1[2-9]|5\.[2-9]|6\.)") + SUNCC_513_OR_LATER := $(shell $(CXX) -V 2>&1 | $(EGREP) -c "CC: (Sun|Studio) .* (5\.1[3-9]|5\.[2-9]|6\.)") + +-HAS_SOLIB_VERSION := $(IS_LINUX) ++HAS_SOLIB_VERSION := 1 + + # Fixup SunOS + ifeq ($(IS_SUN),1) +@@ -126,11 +126,6 @@ ifeq ($(IS_X86)$(IS_X32)$(IS_CYGWIN)$(IS endif -@@ -165,7 +163,7 @@ - $(RANLIB) $@ + # Guard use of -march=native +-ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10) +- CXXFLAGS += -march=native +-else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00) +- CXXFLAGS += -march=native +-else + # GCC 3.3 and "unknown option -march=" + # Ubuntu GCC 4.1 compiler crash with -march=native + # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch" +@@ -140,7 +135,6 @@ else + else ifeq ($(SUN_COMPILER)$(IS_X86),01) + CXXFLAGS += -m32 + endif # X86/X32/X64 +-endif - libcryptopp.so: $(LIBOBJS) -- $(CXX) -shared -o $@ $(LIBOBJS) -+ $(CXX) -shared -o $@ $(CXXFLAGS) $(LDFLAGS) $(LIBOBJS) + # Aligned access required for -O3 and above due to vectorization + UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h) +@@ -404,7 +398,7 @@ ifeq ($(HAS_SOLIB_VERSION),1) + # Full version suffix for shared library + SOLIB_VERSION_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR).$(LIB_PATCH) + # Different patchlevels are compatible, minor versions are not +-SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR).$(LIB_MINOR) ++SOLIB_COMPAT_SUFFIX=.$(LIB_MAJOR) + SOLIB_FLAGS=-Wl,-soname,libcryptopp.so$(SOLIB_COMPAT_SUFFIX) + endif # HAS_SOLIB_VERSION - cryptest.exe: libcryptopp.a $(TESTOBJS) - $(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) ./libcryptopp.a $(LDFLAGS) $(LDLIBS) Modified: branches/2016Q4/security/cryptopp/files/patch-config.h ============================================================================== --- branches/2016Q4/security/cryptopp/files/patch-config.h Wed Dec 7 09:48:39 2016 (r428042) +++ branches/2016Q4/security/cryptopp/files/patch-config.h Wed Dec 7 09:51:26 2016 (r428043) @@ -1,29 +1,33 @@ ---- config.h.orig 2013-02-20 14:30:54.000000000 +0000 +The definition of CRYPTOPP_BOOL_ALIGN16_ENABLED was incorrect for i386. +For NetBSD, this resulted in the inability to build cryptopp on i386. +On FreeBSD, it built, but deskutils/cdcat choked on it while building on +FreeBSD 10/i386 and FreeBSD 11/i386. (PR: 192199) + +--- config.h.orig 2016-10-10 23:49:54 UTC +++ config.h -@@ -290,12 +290,6 @@ NAMESPACE_END - #define CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE 0 +@@ -534,12 +534,6 @@ NAMESPACE_END + # endif #endif --#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) -- #define CRYPTOPP_BOOL_ALIGN16_ENABLED 1 +-#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) +- #define CRYPTOPP_BOOL_ALIGN16 1 -#else -- #define CRYPTOPP_BOOL_ALIGN16_ENABLED 0 +- #define CRYPTOPP_BOOL_ALIGN16 0 -#endif - // how to allocate 16-byte aligned memory (for SSE2) #if defined(CRYPTOPP_MSVC6PP_OR_LATER) #define CRYPTOPP_MM_MALLOC_AVAILABLE -@@ -307,6 +301,13 @@ NAMESPACE_END +@@ -553,6 +547,12 @@ NAMESPACE_END #define CRYPTOPP_NO_ALIGNED_ALLOC #endif -+#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) || !defined(CPRYPTO_NO_ALIGNED_ALLOC) -+ #define CRYPTOPP_BOOL_ALIGN16_ENABLED 1 ++#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE || CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE || CRYPTOPP_BOOL_NEON_INTRINSICS_AVAILABLE || defined(CRYPTOPP_X64_MASM_AVAILABLE) || !defined(CPRYPTO_NO_ALIGNED_ALLOC) ++ #define CRYPTOPP_BOOL_ALIGN16 1 +#else -+ #define CRYPTOPP_BOOL_ALIGN16_ENABLED 0 ++ #define CRYPTOPP_BOOL_ALIGN16 0 +#endif + -+ - // how to disable inlining - #if defined(_MSC_VER) && _MSC_VER >= 1300 - # define CRYPTOPP_NOINLINE_DOTDOTDOT + // Apple always provides 16-byte aligned, and tells us to use calloc + // http://developer.apple.com/library/mac/documentation/Performance/Conceptual/ManagingMemory/Articles/MemoryAlloc.html + Modified: branches/2016Q4/security/cryptopp/files/patch-misc.h ============================================================================== --- branches/2016Q4/security/cryptopp/files/patch-misc.h Wed Dec 7 09:48:39 2016 (r428042) +++ branches/2016Q4/security/cryptopp/files/patch-misc.h Wed Dec 7 09:51:26 2016 (r428043) @@ -1,54 +1,62 @@ ---- misc.h.orig 2010-08-06 18:46:18.000000000 +0000 -+++ misc.h 2013-05-22 08:43:01.949194748 +0000 -@@ -405,17 +405,13 @@ - return order == GetNativeByteOrder(); - } - +This fixes a warning triggered by testing an unsigned parameter +against 0. The patch solves this by creating a different template +for signed case. (PR: 178827) + +--- misc.h.orig 2016-10-10 23:49:54 UTC ++++ misc.h +@@ -529,8 +529,10 @@ inline bool SafeConvert(T1 from, T2 &to) + //! \param value the value to convert + //! \param base the base to use during the conversion + //! \returns the string representation of value in base. +template struct IsUnsigned {}; + template --std::string IntToString(T a, unsigned int base = 10) -+std::string IntToStringImpl(T a, unsigned int base, IsUnsigned) +-std::string IntToString(T value, unsigned int base = 10) ++std::string IntToStringImpl(T value, unsigned int base, IsUnsigned) { - if (a == 0) + // Hack... set the high bit for uppercase. + static const unsigned int HIGH_BIT = (1U << 31); +@@ -541,12 +543,6 @@ std::string IntToString(T value, unsigne + if (value == 0) return "0"; + - bool negate = false; -- if (a < 0) +- if (value < 0) - { - negate = true; -- a = 0-a; // VC .NET does not like -a +- value = 0-value; // VC .NET does not like -a - } std::string result; - while (a > 0) + while (value > 0) { -@@ -423,11 +419,30 @@ - result = char((digit < 10 ? '0' : ('a' - 10)) + digit) + result; - a /= base; +@@ -554,11 +550,30 @@ std::string IntToString(T value, unsigne + result = char((digit < 10 ? '0' : (CH - 10)) + digit) + result; + value /= base; } + return result; +} + +template -+std::string IntToStringImpl(T a, unsigned int base, IsUnsigned) ++std::string IntToStringImpl(T value, unsigned int base, IsUnsigned) +{ + bool negate = false; -+ if (a < 0) ++ if (value < 0) + { + negate = true; -+ a = 0-a; // VC .NET does not like -a ++ value = 0-value; // VC .NET does not like -a + } -+ std::string result = IntToStringImpl(a, base, IsUnsigned()); ++ std::string result = IntToStringImpl(value, base, IsUnsigned()); if (negate) result = "-" + result; return result; } +template -+std::string IntToString(T a, unsigned int base = 10) ++std::string IntToString(T value, unsigned int base = 10) +{ -+ return IntToStringImpl(a, base, IsUnsigned<(static_cast(-1) > 0)>()); ++ return IntToStringImpl(value, base, IsUnsigned<(static_cast(-1) > 0)>()); +} + - template - inline T1 SaturatingSubtract(const T1 &a, const T2 &b) - { + //! \brief Converts an unsigned value to a string + //! \param value the value to convert + //! \param base the base to use during the conversion Modified: branches/2016Q4/security/cryptopp/pkg-plist ============================================================================== --- branches/2016Q4/security/cryptopp/pkg-plist Wed Dec 7 09:48:39 2016 (r428042) +++ branches/2016Q4/security/cryptopp/pkg-plist Wed Dec 7 09:51:26 2016 (r428043) @@ -1,4 +1,3 @@ -bin/cryptest include/cryptopp/3way.h include/cryptopp/adler32.h include/cryptopp/aes.h @@ -12,12 +11,14 @@ include/cryptopp/base32.h include/cryptopp/base64.h include/cryptopp/basecode.h include/cryptopp/bench.h +include/cryptopp/blake2.h include/cryptopp/blowfish.h include/cryptopp/blumshub.h include/cryptopp/camellia.h include/cryptopp/cast.h include/cryptopp/cbcmac.h include/cryptopp/ccm.h +include/cryptopp/chacha.h include/cryptopp/channels.h include/cryptopp/cmac.h include/cryptopp/config.h @@ -39,6 +40,7 @@ include/cryptopp/emsa2.h include/cryptopp/eprecomp.h include/cryptopp/esign.h include/cryptopp/factory.h +include/cryptopp/fhmqv.h include/cryptopp/files.h include/cryptopp/filters.h include/cryptopp/fips140.h @@ -51,12 +53,15 @@ include/cryptopp/gfpcrypt.h include/cryptopp/gost.h include/cryptopp/gzip.h include/cryptopp/hex.h +include/cryptopp/hkdf.h include/cryptopp/hmac.h +include/cryptopp/hmqv.h include/cryptopp/hrtimer.h include/cryptopp/ida.h include/cryptopp/idea.h include/cryptopp/integer.h include/cryptopp/iterhash.h +include/cryptopp/keccak.h include/cryptopp/lubyrack.h include/cryptopp/luc.h include/cryptopp/mars.h @@ -64,6 +69,7 @@ include/cryptopp/md2.h include/cryptopp/md4.h include/cryptopp/md5.h include/cryptopp/mdc.h +include/cryptopp/mersenne.h include/cryptopp/misc.h include/cryptopp/modarith.h include/cryptopp/modes.h @@ -76,6 +82,7 @@ include/cryptopp/nr.h include/cryptopp/oaep.h include/cryptopp/oids.h include/cryptopp/osrng.h +include/cryptopp/ossig.h include/cryptopp/panama.h include/cryptopp/pch.h include/cryptopp/pkcspad.h @@ -89,6 +96,7 @@ include/cryptopp/randpool.h include/cryptopp/rc2.h include/cryptopp/rc5.h include/cryptopp/rc6.h +include/cryptopp/rdrand.h include/cryptopp/rijndael.h include/cryptopp/ripemd.h include/cryptopp/rng.h @@ -116,6 +124,7 @@ include/cryptopp/stdcpp.h include/cryptopp/strciphr.h include/cryptopp/tea.h include/cryptopp/tiger.h +include/cryptopp/trap.h include/cryptopp/trdlocal.h include/cryptopp/trunhash.h include/cryptopp/ttmac.h @@ -133,8 +142,7 @@ include/cryptopp/zdeflate.h include/cryptopp/zinflate.h include/cryptopp/zlib.h lib/libcryptopp.a -%%DYNAMIC_ENABLED%%lib/libcryptopp.so -%%DYNAMIC_ENABLED%%lib/libcryptopp.so.%%LIBVERSION%% -%%DYNAMIC_ENABLED%%lib/libcryptopp.so.%%PORTVERSION%% +lib/libcryptopp.so +lib/libcryptopp.so.%%LIBVERSION%% +lib/libcryptopp.so.%%PORTVERSION%% %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/License From owner-svn-ports-branches@freebsd.org Wed Dec 7 16:43:53 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0C735C6C98D; Wed, 7 Dec 2016 16:43:53 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 DB4C9628; Wed, 7 Dec 2016 16:43:52 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB7Ghqhu061706; Wed, 7 Dec 2016 16:43:52 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB7Ghqc6061705; Wed, 7 Dec 2016 16:43:52 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201612071643.uB7Ghqc6061705@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Wed, 7 Dec 2016 16:43:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r428077 - branches/2016Q4/audio/amarok-kde4 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.23 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, 07 Dec 2016 16:43:53 -0000 Author: rakuco Date: Wed Dec 7 16:43:51 2016 New Revision: 428077 URL: https://svnweb.freebsd.org/changeset/ports/428077 Log: MFH: r427906 r427909 Switch to USES=mysql:embedded PR: 214184 Submitted by: matthew@reztek.cz Add several missing dependencies to the port. `make stage-qa' was complaining about a lot of missing dependencies: - Amarok actually links against MySQL, so we need USES=mysql, not USES=mysql:embedded. - Add USE_KDE=soprano and USE_GL=gl. - Add several missing X11 dependencies that were being pulled indirectly. - The IPOD option causes the iPod plugin to link against a few other libraries via libgpod-1.0.pc, so add them. - The MP3TUNES option needs either libgcrypt or OpenSSL; explicitly disable libgcrypt and add USES=ssl as required. - Fix a capitalization typo in MP3TUNES_CMAKE_OFF that was preventing the MP3Tunes code from being properly disabled in CMake. Based on an initial patch sent by Matthey Rezny . PR: 214184 Approved by: ports-secteam (junovitch) Modified: branches/2016Q4/audio/amarok-kde4/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/audio/amarok-kde4/Makefile ============================================================================== --- branches/2016Q4/audio/amarok-kde4/Makefile Wed Dec 7 16:25:44 2016 (r428076) +++ branches/2016Q4/audio/amarok-kde4/Makefile Wed Dec 7 16:43:51 2016 (r428077) @@ -3,7 +3,7 @@ PORTNAME= amarok PORTVERSION= 2.8.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src @@ -22,14 +22,15 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/qt4/plug RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:devel/qtscriptgenerator \ ${KDE_PREFIX}/lib/kde4/kio_upnp_ms.so:net/kio-upnp-ms -USES= cmake kde:4 pkgconfig shared-mime-info shebangfix tar:bzip2 -USE_KDE= kdelibs libkcddb libkcompactdisc \ - nepomuk-core runtime automoc4 strigi -USE_MYSQL= embedded +USES= cmake kde:4 mysql pkgconfig \ + shared-mime-info shebangfix tar:bzip2 +USE_GL= gl +USE_KDE= automoc4 kdelibs libkcddb libkcompactdisc \ + nepomuk-core runtime soprano strigi USE_QT4= corelib dbus designer gui network opengl \ phonon script sql svg webkit xml \ qmake_build moc_build rcc_build uic_build -USE_XORG= x11 +USE_XORG= ice sm x11 xau xdmcp xext xft xpm SHEBANG_FILES= src/kconf_update/amarok-2.4.1-tokens_syntax_update.pl USE_LDCONFIG= yes @@ -43,7 +44,9 @@ AMAZON_DESC= Amazon MP3 store support v AMAZON_RUN_DEPENDS= clamz:net/clamz IPOD_DESC= Apple iPod support -IPOD_LIB_DEPENDS= libgpod.so:audio/libgpod +IPOD_LIB_DEPENDS= libgpod.so:audio/libgpod \ + libimobiledevice.so:comms/libimobiledevice \ + libplist.so:devel/libplist IPOD_USE= GNOME=gdkpixbuf2,glib20 IPOD_CMAKE_OFF= -DWITH_IPOD:BOOL=Off @@ -51,7 +54,10 @@ MP3TUNES_DESC= MP3tunes support MP3TUNES_LIB_DEPENDS= libloudmouth-1.so:net-im/loudmouth \ libcurl.so:ftp/curl MP3TUNES_USE= GNOME=glib20,libxml2 -MP3TUNES_CMAKE_OFF= -DWITH_MP3tunes:BOOL=Off +MP3TUNES_USES= ssl +MP3TUNES_CMAKE_ON= -DWITH_MP3Tunes:BOOL=ON \ + -DWITH_Libgcrypt:BOOL=OFF +MP3TUNES_CMAKE_OFF= -DWITH_MP3Tunes:BOOL=Off MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp MTP_CMAKE_OFF= -DWITH_Mtp:BOOL=Off From owner-svn-ports-branches@freebsd.org Wed Dec 7 17:59:40 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA558C6BEED; Wed, 7 Dec 2016 17:59:40 +0000 (UTC) (envelope-from olivierd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 898E7B27; Wed, 7 Dec 2016 17:59:40 +0000 (UTC) (envelope-from olivierd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB7HxdtM090189; Wed, 7 Dec 2016 17:59:39 GMT (envelope-from olivierd@FreeBSD.org) Received: (from olivierd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB7HxdcG090188; Wed, 7 Dec 2016 17:59:39 GMT (envelope-from olivierd@FreeBSD.org) Message-Id: <201612071759.uB7HxdcG090188@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olivierd set sender to olivierd@FreeBSD.org using -f From: Olivier Duchateau Date: Wed, 7 Dec 2016 17:59:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r428080 - branches/2016Q4/sysutils/xfburn 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.23 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, 07 Dec 2016 17:59:40 -0000 Author: olivierd Date: Wed Dec 7 17:59:39 2016 New Revision: 428080 URL: https://svnweb.freebsd.org/changeset/ports/428080 Log: MFH: r427981 - Fix run dependencies (see error message below) - Bump PORTREVISION Shared object "libburn.so.4" not found, required by "xfburn" Shared object "libisofs.so.6" not found, required by "xfburn" PR: 214170 Reported by: , (freebsd-xfce list) Approved by: ports-secteam (junovitch@) Modified: branches/2016Q4/sysutils/xfburn/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/sysutils/xfburn/Makefile ============================================================================== --- branches/2016Q4/sysutils/xfburn/Makefile Wed Dec 7 16:50:25 2016 (r428079) +++ branches/2016Q4/sysutils/xfburn/Makefile Wed Dec 7 17:59:39 2016 (r428080) @@ -3,7 +3,7 @@ PORTNAME= xfburn PORTVERSION= 0.5.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 @@ -15,7 +15,9 @@ LICENSE= GPLv2 LIB_DEPENDS= libburn.so:devel/libburn \ libisofs.so:devel/libisofs -RUN_DEPENDS= cdrdao:sysutils/cdrdao +RUN_DEPENDS= cdrdao:sysutils/cdrdao \ + ${LOCALBASE}/include/libburn/libburn.h:devel/libburn \ + ${LOCALBASE}/include/libisofs/libisofs.h:devel/libisofs GNU_CONFIGURE= yes USE_GNOME= intltool intlhack glib20 gtk20 From owner-svn-ports-branches@freebsd.org Thu Dec 8 16:12:27 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1DFB9C6D42E; Thu, 8 Dec 2016 16:12:27 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 C7B3BCBA; Thu, 8 Dec 2016 16:12:26 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB8GCPnG036586; Thu, 8 Dec 2016 16:12:25 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB8GCPrO036583; Thu, 8 Dec 2016 16:12:25 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201612081612.uB8GCPrO036583@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Thu, 8 Dec 2016 16:12:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r428134 - branches/2016Q4/devel/p4 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 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, 08 Dec 2016 16:12:27 -0000 Author: gordon Date: Thu Dec 8 16:12:25 2016 New Revision: 428134 URL: https://svnweb.freebsd.org/changeset/ports/428134 Log: MFH: r428133 Update devel/p4 due to micropatching. Reported by: avg@ Approved by: ports-secteam (blanket) Modified: branches/2016Q4/devel/p4/Makefile branches/2016Q4/devel/p4/distinfo.freebsd100x86 branches/2016Q4/devel/p4/distinfo.freebsd100x86_64 Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/devel/p4/Makefile ============================================================================== --- branches/2016Q4/devel/p4/Makefile Thu Dec 8 16:10:48 2016 (r428133) +++ branches/2016Q4/devel/p4/Makefile Thu Dec 8 16:12:25 2016 (r428134) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4 -PORTVERSION= 2016.1.1461251 +PORTVERSION= 2016.1.1470074 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ Modified: branches/2016Q4/devel/p4/distinfo.freebsd100x86 ============================================================================== --- branches/2016Q4/devel/p4/distinfo.freebsd100x86 Thu Dec 8 16:10:48 2016 (r428133) +++ branches/2016Q4/devel/p4/distinfo.freebsd100x86 Thu Dec 8 16:12:25 2016 (r428134) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479250046 -SHA256 (perforce/2016.1.1461251/bin.freebsd100x86/p4) = 5b9c3bd8df39a5e474b0b49eccdea8690dc6c4386983e64c06888323672df48c -SIZE (perforce/2016.1.1461251/bin.freebsd100x86/p4) = 3075176 +TIMESTAMP = 1481212435 +SHA256 (perforce/2016.1.1470074/bin.freebsd100x86/p4) = 1c482d09814ffa5ee8e302f51a930a40d153607ecd3f8515bca96e6a86015985 +SIZE (perforce/2016.1.1470074/bin.freebsd100x86/p4) = 3075624 Modified: branches/2016Q4/devel/p4/distinfo.freebsd100x86_64 ============================================================================== --- branches/2016Q4/devel/p4/distinfo.freebsd100x86_64 Thu Dec 8 16:10:48 2016 (r428133) +++ branches/2016Q4/devel/p4/distinfo.freebsd100x86_64 Thu Dec 8 16:12:25 2016 (r428134) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479250113 -SHA256 (perforce/2016.1.1461251/bin.freebsd100x86_64/p4) = 392630d8ebc136642df140a6105c61ff63dfa8bfeab222346076d48c6aca059d -SIZE (perforce/2016.1.1461251/bin.freebsd100x86_64/p4) = 3335848 +TIMESTAMP = 1481212432 +SHA256 (perforce/2016.1.1470074/bin.freebsd100x86_64/p4) = ff24c9802a5b3485b31029a6844ed686b388480cd317dfd8612c4d13cd77d58e +SIZE (perforce/2016.1.1470074/bin.freebsd100x86_64/p4) = 3339096 From owner-svn-ports-branches@freebsd.org Thu Dec 8 17:08:56 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AE03EC6DD98; Thu, 8 Dec 2016 17:08:56 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 7D64E1569; Thu, 8 Dec 2016 17:08:56 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB8H8tOR059148; Thu, 8 Dec 2016 17:08:55 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB8H8tlP059147; Thu, 8 Dec 2016 17:08:55 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201612081708.uB8H8tlP059147@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Thu, 8 Dec 2016 17:08:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r428139 - branches/2016Q4/security/py-cryptography 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.23 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, 08 Dec 2016 17:08:56 -0000 Author: feld Date: Thu Dec 8 17:08:55 2016 New Revision: 428139 URL: https://svnweb.freebsd.org/changeset/ports/428139 Log: MFH: r428138 security/py-pycryptography: Fix build on FreeBSD 9.3 Modern py-cryptography requires a more modern OpenSSL. This switch to requiring OpenSSL from ports is a disruptive change, but it will protect these users from the recently patched vulnerabilites. Support for OpenSSL 0.9.8 was removed in pycryptography as of version 1.4. The last release to support OpenSSL 0.9.8 was 1.3.4 which is still vulnerable to the HDKF key generation bug. It appears that version 1.4 did build successfully on FreeBSD 9.3, but upstream had abandoned support for OpenSSL 0.9.8 at that point so it is unclear if it was fully functional. PR: 214915 Approved by: ports-secteam (with hat) Modified: branches/2016Q4/security/py-cryptography/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/security/py-cryptography/Makefile ============================================================================== --- branches/2016Q4/security/py-cryptography/Makefile Thu Dec 8 17:07:22 2016 (r428138) +++ branches/2016Q4/security/py-cryptography/Makefile Thu Dec 8 17:08:55 2016 (r428139) @@ -27,6 +27,11 @@ USE_PYTHON= autoplist distutils CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} +# Modern py-cyptography requires newer OpenSSL +.if ${OSVERSION} < 1000000 +WITH_OPENSSL_PORT= yes +.endif + .include .if ${PYTHON_REL} < 3300 From owner-svn-ports-branches@freebsd.org Thu Dec 8 17:16:09 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BAE13C6E16B; Thu, 8 Dec 2016 17:16:09 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 8A39B1BD8; Thu, 8 Dec 2016 17:16:09 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB8HG8IN063400; Thu, 8 Dec 2016 17:16:08 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB8HG8XQ063399; Thu, 8 Dec 2016 17:16:08 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201612081716.uB8HG8XQ063399@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 8 Dec 2016 17:16:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r428141 - branches/2016Q4/security/py-cryptography 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.23 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, 08 Dec 2016 17:16:09 -0000 Author: antoine Date: Thu Dec 8 17:16:08 2016 New Revision: 428141 URL: https://svnweb.freebsd.org/changeset/ports/428141 Log: MFH: r428140 Unbreak With hat: portmgr Modified: branches/2016Q4/security/py-cryptography/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/security/py-cryptography/Makefile ============================================================================== --- branches/2016Q4/security/py-cryptography/Makefile Thu Dec 8 17:15:30 2016 (r428140) +++ branches/2016Q4/security/py-cryptography/Makefile Thu Dec 8 17:16:08 2016 (r428141) @@ -27,11 +27,6 @@ USE_PYTHON= autoplist distutils CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} -# Modern py-cyptography requires newer OpenSSL -.if ${OSVERSION} < 1000000 -WITH_OPENSSL_PORT= yes -.endif - .include .if ${PYTHON_REL} < 3300 From owner-svn-ports-branches@freebsd.org Fri Dec 9 07:42:45 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A0AF3C6E241; Fri, 9 Dec 2016 07:42:45 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 612F31584; Fri, 9 Dec 2016 07:42:45 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB97giNa033952; Fri, 9 Dec 2016 07:42:44 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB97giGK033946; Fri, 9 Dec 2016 07:42:44 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201612090742.uB97giGK033946@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Fri, 9 Dec 2016 07:42:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r428169 - in branches/2016Q4/sysutils/logstalgia: . 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.23 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, 09 Dec 2016 07:42:45 -0000 Author: ehaupt Date: Fri Dec 9 07:42:43 2016 New Revision: 428169 URL: https://svnweb.freebsd.org/changeset/ports/428169 Log: MFH: r428064 - Unbreak by updating to 1.0.7 - Move master site and WWW from SF to GitHub Approved by: ports-secteam (junovitch) Added: branches/2016Q4/sysutils/logstalgia/files/patch-src_core_display.h - copied unchanged from r428064, head/sysutils/logstalgia/files/patch-src_core_display.h branches/2016Q4/sysutils/logstalgia/files/patch-src_logentry.h - copied unchanged from r428064, head/sysutils/logstalgia/files/patch-src_logentry.h Deleted: branches/2016Q4/sysutils/logstalgia/files/patch-src__logentry.h branches/2016Q4/sysutils/logstalgia/files/patch-src__logstalgia.cpp Modified: branches/2016Q4/sysutils/logstalgia/Makefile branches/2016Q4/sysutils/logstalgia/distinfo branches/2016Q4/sysutils/logstalgia/pkg-descr Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/sysutils/logstalgia/Makefile ============================================================================== --- branches/2016Q4/sysutils/logstalgia/Makefile Fri Dec 9 07:10:40 2016 (r428168) +++ branches/2016Q4/sysutils/logstalgia/Makefile Fri Dec 9 07:42:43 2016 (r428169) @@ -2,27 +2,37 @@ # $FreeBSD$ PORTNAME= logstalgia -PORTVERSION= 1.0.3 -PORTREVISION= 9 +PORTVERSION= 1.0.7 CATEGORIES= sysutils www -MASTER_SITES= GOOGLE_CODE LOCAL/ehaupt MAINTAINER= ehaupt@FreeBSD.org COMMENT= Website access log visualization tool LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= Unfetchable (google code has gone away) - -LIB_DEPENDS= libftgl.so:graphics/ftgl \ +BUILD_DEPENDS= ${LOCALBASE}/include/glm/glm.hpp:math/glm +LIB_DEPENDS= libboost_regex.so:devel/boost-libs \ + libfreetype.so:print/freetype2 \ + libpcre.so:devel/pcre \ libpng.so:graphics/png \ - libpcre.so:devel/pcre + libftgl.so:graphics/ftgl -GNU_CONFIGURE= yes -USES= jpeg pkgconfig -USE_GL= gl glu -USE_SDL= image sdl +USE_GITHUB= yes +GH_ACCOUNT= acaudwell +GH_PROJECT= Logstalgia:DEFAULT Core:core +GH_TAGNAME= d99bdb2:DEFAULT 83eba3a:core -CFLAGS+= -L${LOCALBASE}/lib +GNU_CONFIGURE= yes +USES= autoreconf compiler:c++0x gmake jpeg localbase:ldflags pkgconfig +USE_GL= gl glu glew +USE_SDL= image2 sdl2 + +post-extract: + @${MV} ${WRKDIR}/Core-83eba3a/* ${WRKSRC}/src/core/ + +post-patch: + @${REINPLACE_CMD} -e 's| -Wno-unused-but-set-variable||' \ + ${WRKSRC}/Makefile.am .include Modified: branches/2016Q4/sysutils/logstalgia/distinfo ============================================================================== --- branches/2016Q4/sysutils/logstalgia/distinfo Fri Dec 9 07:10:40 2016 (r428168) +++ branches/2016Q4/sysutils/logstalgia/distinfo Fri Dec 9 07:42:43 2016 (r428169) @@ -1,2 +1,5 @@ -SHA256 (logstalgia-1.0.3.tar.gz) = d3338a9fffb9b60ecb90986c81f27a09a18fa8627b5b884a79c70fee7f6461eb -SIZE (logstalgia-1.0.3.tar.gz) = 841822 +TIMESTAMP = 1481103077 +SHA256 (acaudwell-Logstalgia-1.0.7-d99bdb2_GH0.tar.gz) = 401ddfa4ef9ab72ceed3ee6ddddd0d0b19880542928258c5c325f50010219e80 +SIZE (acaudwell-Logstalgia-1.0.7-d99bdb2_GH0.tar.gz) = 883062 +SHA256 (acaudwell-Core-83eba3a_GH0.tar.gz) = 4c722981d096a1615f9d1b74c10d884ae0174a6e669d1bc6257e4ff07dd2352f +SIZE (acaudwell-Core-83eba3a_GH0.tar.gz) = 86122 Copied: branches/2016Q4/sysutils/logstalgia/files/patch-src_core_display.h (from r428064, head/sysutils/logstalgia/files/patch-src_core_display.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/sysutils/logstalgia/files/patch-src_core_display.h Fri Dec 9 07:42:43 2016 (r428169, copy of r428064, head/sysutils/logstalgia/files/patch-src_core_display.h) @@ -0,0 +1,18 @@ +--- src/core/display.h.orig 2016-12-07 11:54:56 UTC ++++ src/core/display.h +@@ -59,7 +59,6 @@ class SDLAppDisplay { + + bool enable_alpha; + bool resizable; +- bool fullscreen; + bool frameless; + bool vsync; + +@@ -71,6 +70,7 @@ class SDLAppDisplay { + void setupExtensions(); + public: + int width, height; ++ bool fullscreen; + int desktop_width, desktop_height; + int windowed_width, windowed_height; + Copied: branches/2016Q4/sysutils/logstalgia/files/patch-src_logentry.h (from r428064, head/sysutils/logstalgia/files/patch-src_logentry.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/sysutils/logstalgia/files/patch-src_logentry.h Fri Dec 9 07:42:43 2016 (r428169, copy of r428064, head/sysutils/logstalgia/files/patch-src_logentry.h) @@ -0,0 +1,10 @@ +--- src/logentry.h.orig 2015-10-19 22:33:12 UTC ++++ src/logentry.h +@@ -21,6 +21,7 @@ + #include "core/vectors.h" + + #include ++#include + + class LogEntry { + Modified: branches/2016Q4/sysutils/logstalgia/pkg-descr ============================================================================== --- branches/2016Q4/sysutils/logstalgia/pkg-descr Fri Dec 9 07:10:40 2016 (r428168) +++ branches/2016Q4/sysutils/logstalgia/pkg-descr Fri Dec 9 07:42:43 2016 (r428169) @@ -6,4 +6,4 @@ Requests appear as colored balls which t requested location. Successful requests are hit by the paddle while unsuccessful ones (eg. 404 - File Not Found) are missed and pass through. -WWW: http://code.google.com/p/logstalgia/ +WWW: http://logstalgia.io/ From owner-svn-ports-branches@freebsd.org Fri Dec 9 13:40:38 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1DAA8C6E68C; Fri, 9 Dec 2016 13:40:38 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 C6B1A6D6; Fri, 9 Dec 2016 13:40:37 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB9DeajT079597; Fri, 9 Dec 2016 13:40:36 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB9DeacJ079595; Fri, 9 Dec 2016 13:40:36 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201612091340.uB9DeacJ079595@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Fri, 9 Dec 2016 13:40:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r428205 - branches/2016Q4/lang/php70 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.23 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, 09 Dec 2016 13:40:38 -0000 Author: tz Date: Fri Dec 9 13:40:36 2016 New Revision: 428205 URL: https://svnweb.freebsd.org/changeset/ports/428205 Log: MFH: r427496 r428078 r428120 lang/php70: enabled DTRACE option by default where possible Approved by: tz (maintainer) lang/php70: DTRACE option is not valid on DragonFly Note that following the OPTIONS_EXCLUDE+= line appears to redundant and could be removed, and the OPTIONS_EXCLUDE_FreeBSD_9 line should be "=" operator, not "+=", from what I can tell. Approved by: DF support blanket Update PHP 7 from 7.0.13 to 7.0.14 Changelog: http://www.php.net/ChangeLog-7.php#7.0.14 Approved by: mentors (implicit) Approved by: ports-secteam (junovitch) Modified: branches/2016Q4/lang/php70/Makefile branches/2016Q4/lang/php70/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/lang/php70/Makefile ============================================================================== --- branches/2016Q4/lang/php70/Makefile Fri Dec 9 13:32:15 2016 (r428204) +++ branches/2016Q4/lang/php70/Makefile Fri Dec 9 13:40:36 2016 (r428205) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php70 -PORTVERSION= 7.0.13 +PORTVERSION= 7.0.14 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions @@ -37,12 +37,16 @@ CONFIGURE_ARGS+=--with-layout=GNU \ USE_GNOME= libxml2 OPTIONS_DEFINE+=CLI CGI FPM EMBED PHPDBG DEBUG DTRACE IPV6 LINKTHR ZTS -OPTIONS_DEFAULT=CLI CGI FPM LINKTHR +OPTIONS_DEFAULT=CLI CGI FPM LINKTHR DTRACE # Bug 197128: No ASM code for MIPS/MIPS64, disable FPM OPTIONS_EXCLUDE_mips=FPM OPTIONS_EXCLUDE_mips64=FPM OPTIONS_SUB= yes +OPTIONS_EXCLUDE_DragonFly= DTRACE +OPTIONS_EXCLUDE_FreeBSD_9+= DTRACE +OPTIONS_EXCLUDE+= ${OPTIONS_EXCLUDE_${OPSYS}_${OSREL:R}} + CLI_DESC= Build CLI version CGI_DESC= Build CGI version FPM_DESC= Build FPM version Modified: branches/2016Q4/lang/php70/distinfo ============================================================================== --- branches/2016Q4/lang/php70/distinfo Fri Dec 9 13:32:15 2016 (r428204) +++ branches/2016Q4/lang/php70/distinfo Fri Dec 9 13:40:36 2016 (r428205) @@ -1,3 +1,3 @@ -TIMESTAMP = 1479305486 -SHA256 (php-7.0.13.tar.xz) = 357ba7f93975d7d836abed0852dc3ed96a988af539e87750613294cbee82f1bf -SIZE (php-7.0.13.tar.xz) = 12528816 +TIMESTAMP = 1481099651 +SHA256 (php-7.0.14.tar.xz) = 0f1dff6392a1cc2ed126b9695f580a2ed77eb09d2c23b41cabfb41e6f27a8c89 +SIZE (php-7.0.14.tar.xz) = 12534712 From owner-svn-ports-branches@freebsd.org Fri Dec 9 14:41:59 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0426C68DD3; Fri, 9 Dec 2016 14:41:59 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 8ACDA106B; Fri, 9 Dec 2016 14:41:59 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB9EfwiL008162; Fri, 9 Dec 2016 14:41:58 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB9EfwCW008160; Fri, 9 Dec 2016 14:41:58 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201612091441.uB9EfwCW008160@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Fri, 9 Dec 2016 14:41:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r428209 - branches/2016Q4/devel/libc++/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.23 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, 09 Dec 2016 14:41:59 -0000 Author: cpm Date: Fri Dec 9 14:41:58 2016 New Revision: 428209 URL: https://svnweb.freebsd.org/changeset/ports/428209 Log: MFH: r428042 devel/libc++: Fix std::is_function failed In file included from /usr/include/c++/v1/string:439: In file included from /usr/include/c++/v1/algorithm:624: /usr/include/c++/v1/type_traits:433:76: error: no matching function for call to '__source' : public integral_constant(__is_function_imp::__source<_Tp>())) == 1> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/c++/v1/type_traits:438:14: note: in instantiation of template class 'std::__1::__libcpp_is_function' requested here : public __libcpp_is_function<_Tp> {}; ^ /usr/include/c++/v1/type_traits:443:97: note: in instantiation of template class 'std::__1::is_function' requested here template struct __libcpp_is_member_function_pointer<_Tp _Up::*> : public is_function<_Tp> {}; ^ /usr/include/c++/v1/type_traits:446:14: note: in instantiation of template class 'std::__1::__libcpp_is_member_function_pointer' requested here : public __libcpp_is_member_function_pointer::type> {}; ^ PR: 215016 Submitted by: cpm Reviewed by: dim (maintainer) Approved by: dim (maintainer), feld (mentor, implicit) Obtained from: https://reviews.llvm.org/D7573 Approved by: ports-secteam (junovitch) Added: branches/2016Q4/devel/libc++/files/patch-include_type__traits - copied unchanged from r428042, head/devel/libc++/files/patch-include_type__traits branches/2016Q4/devel/libc++/files/patch-test_utilities_meta_meta.unary_meta.unary.cat_function.pass.cpp - copied unchanged from r428042, head/devel/libc++/files/patch-test_utilities_meta_meta.unary_meta.unary.cat_function.pass.cpp Modified: Directory Properties: branches/2016Q4/ (props changed) Copied: branches/2016Q4/devel/libc++/files/patch-include_type__traits (from r428042, head/devel/libc++/files/patch-include_type__traits) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/devel/libc++/files/patch-include_type__traits Fri Dec 9 14:41:58 2016 (r428209, copy of r428042, head/devel/libc++/files/patch-include_type__traits) @@ -0,0 +1,25 @@ +--- include/type_traits.orig 2016-11-30 20:55:20 UTC ++++ include/type_traits +@@ -424,9 +424,12 @@ template struct _ + + namespace __libcpp_is_function_imp + { ++struct __dummy_type {}; + template char __test(_Tp*); ++template char __test(__dummy_type); + template __two __test(...); +-template _Tp& __source(); ++template _Tp& __source(int); ++template __dummy_type __source(long); + } + + template ::value || +@@ -435,7 +438,7 @@ template ::value || + __is_nullptr_t<_Tp>::value > + struct __libcpp_is_function +- : public integral_constant(__libcpp_is_function_imp::__source<_Tp>())) == 1> ++ : public integral_constant(__libcpp_is_function_imp::__source<_Tp>(0))) == 1> + {}; + template struct __libcpp_is_function<_Tp, true> : public false_type {}; + Copied: branches/2016Q4/devel/libc++/files/patch-test_utilities_meta_meta.unary_meta.unary.cat_function.pass.cpp (from r428042, head/devel/libc++/files/patch-test_utilities_meta_meta.unary_meta.unary.cat_function.pass.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/devel/libc++/files/patch-test_utilities_meta_meta.unary_meta.unary.cat_function.pass.cpp Fri Dec 9 14:41:58 2016 (r428209, copy of r428042, head/devel/libc++/files/patch-test_utilities_meta_meta.unary_meta.unary.cat_function.pass.cpp) @@ -0,0 +1,58 @@ +--- test/utilities/meta/meta.unary/meta.unary.cat/function.pass.cpp.orig 2013-10-05 21:21:17 UTC ++++ test/utilities/meta/meta.unary/meta.unary.cat/function.pass.cpp +@@ -14,7 +14,7 @@ + #include + + template +-void test_function_imp() ++void test() + { + static_assert(!std::is_void::value, ""); + #if _LIBCPP_STD_VER > 11 +@@ -34,19 +34,34 @@ void test_function_imp() + static_assert( std::is_function::value, ""); + } + +-template +-void test_function() +-{ +- test_function_imp(); +- test_function_imp(); +- test_function_imp(); +- test_function_imp(); +-} ++// Since we can't actually add the const volatile and ref qualifiers once ++// later let's use a macro to do it. ++#define TEST_REGULAR(...) \ ++ test<__VA_ARGS__>(); \ ++ test<__VA_ARGS__ const>(); \ ++ test<__VA_ARGS__ volatile>(); \ ++ test<__VA_ARGS__ cons volatile>() ++ ++#define TEST_REF_QUALIFIED(...) \ ++ test<__VA_ARGS__ &>(); \ ++ test<__VA_ARGS__ const &>(); \ ++ test<__VA_ARGS__ volatile &>(); \ ++ test<__VA_ARGS__ const volatile &>(); \ ++ test<__VA_ARGS__ &&>(); \ ++ test<__VA_ARGS__ const &&>(); \ ++ test<__VA_ARGS__ volatile &&>(); \ ++ test<__VA_ARGS__ const volatile &&>() + + int main() + { +- test_function(); +- test_function(); +- test_function(); +- test_function(); ++ TEST_REGULAR( void () ); ++ TEST_REGULAR( void (int) ); ++ TEST_REGULAR( int (double) ); ++ TEST_REGULAR( int (double, char) ); ++#if __cplusplus >= 201103L ++ TEST_REF_QUALIFIED( void () ); ++ TEST_REF_QUALIFIED( void (int) ); ++ TEST_REF_QUALIFIED( int (double) ); ++ TEST_REF_QUALIFIED( int (double, char) ); ++#endif + } From owner-svn-ports-branches@freebsd.org Fri Dec 9 14:44:47 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E7684C68FC1; Fri, 9 Dec 2016 14:44:47 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 9DFC813DE; Fri, 9 Dec 2016 14:44:47 +0000 (UTC) (envelope-from cpm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB9Eikk9008581; Fri, 9 Dec 2016 14:44:46 GMT (envelope-from cpm@FreeBSD.org) Received: (from cpm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB9EikV4008579; Fri, 9 Dec 2016 14:44:46 GMT (envelope-from cpm@FreeBSD.org) Message-Id: <201612091444.uB9EikV4008579@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cpm set sender to cpm@FreeBSD.org using -f From: "Carlos J. Puga Medina" Date: Fri, 9 Dec 2016 14:44:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r428211 - in branches/2016Q4/www/chromium: . 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.23 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, 09 Dec 2016 14:44:48 -0000 Author: cpm Date: Fri Dec 9 14:44:46 2016 New Revision: 428211 URL: https://svnweb.freebsd.org/changeset/ports/428211 Log: MFH: r428044 www/chromium: Fix build on 10.1-RELEASE Unbreak build on 10.1-RELEASE after r426855 Submitted by: cpm Reviewed by: chromium (rene) Approved by: chromium (rene), feld (mentor, explicit) Differential Revision: D8699 Approved by: ports-secteam (junovitch) Modified: branches/2016Q4/www/chromium/Makefile branches/2016Q4/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/www/chromium/Makefile ============================================================================== --- branches/2016Q4/www/chromium/Makefile Fri Dec 9 14:43:45 2016 (r428210) +++ branches/2016Q4/www/chromium/Makefile Fri Dec 9 14:44:46 2016 (r428211) @@ -190,7 +190,8 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1002000 BUILD_DEPENDS+= ${LOCALBASE}/lib/c++/libstdc++.so:devel/libc++ -CXXFLAGS+= -stdlib=libc++ -isystem ${LOCALBASE}/include/c++/v1 +GN_ARGS+= extra_cxxflags="-stdlib=libc++ -isystem ${LOCALBASE}/include/c++/v1" \ + extra_ldflags="-L${LOCALBASE}/lib" .endif .if ${OSVERSION} < 1100000 Modified: branches/2016Q4/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni ============================================================================== --- branches/2016Q4/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni Fri Dec 9 14:43:45 2016 (r428210) +++ branches/2016Q4/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni Fri Dec 9 14:44:46 2016 (r428211) @@ -1,6 +1,18 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2016-10-06 04:02:08.000000000 +0300 -+++ build/toolchain/gcc_toolchain.gni 2016-10-13 10:28:11.777849000 +0300 -@@ -453,14 +453,28 @@ +--- build/toolchain/gcc_toolchain.gni.orig 2016-11-10 20:02:09 UTC ++++ build/toolchain/gcc_toolchain.gni +@@ -10,6 +10,11 @@ import("//build/toolchain/cc_wrapper.gni + import("//build/toolchain/goma.gni") + import("//build/toolchain/toolchain.gni") + ++declare_args() { ++ extra_cxxflags = "" ++ extra_ldflags = "" ++} ++ + # This template defines a toolchain for something that works like gcc + # (including clang). + # +@@ -453,14 +458,28 @@ template("clang_toolchain") { } gcc_toolchain(target_name) {