From owner-svn-ports-all@freebsd.org Tue May 30 13:20:15 2017 Return-Path: Delivered-To: svn-ports-all@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 204E2B7CBC1; Tue, 30 May 2017 13:20:15 +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 E3224C73; Tue, 30 May 2017 13:20:14 +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 v4UDKDg8009025; Tue, 30 May 2017 13:20:13 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4UDKDti009023; Tue, 30 May 2017 13:20:13 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201705301320.v4UDKDti009023@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 30 May 2017 13:20:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r442061 - in branches/2017Q2/net: samba42 samba43 X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 May 2017 13:20:15 -0000 Author: feld Date: Tue May 30 13:20:13 2017 New Revision: 442061 URL: https://svnweb.freebsd.org/changeset/ports/442061 Log: MFH: r441680 net/samba43: Mark 4.2 and 4.3 deprecated - Add deprecation date and message - Update/simplify conflicts PR: 219514 Approved by: timur (maintainer) Security: 6f4d96c0-4062-11e7-b291-b499baebfeaf Approved by: ports-secteam (with hat) Modified: branches/2017Q2/net/samba42/Makefile branches/2017Q2/net/samba43/Makefile Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/net/samba42/Makefile ============================================================================== --- branches/2017Q2/net/samba42/Makefile Tue May 30 13:18:37 2017 (r442060) +++ branches/2017Q2/net/samba42/Makefile Tue May 30 13:20:13 2017 (r442061) @@ -13,7 +13,10 @@ COMMENT?= Free SMB/CIFS and AD/DC server and client f LICENSE= GPLv3 -CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba43-4.3.* samba44-4.4.* +CONFLICTS?= samba4[3-9]-4.* + +DEPRECATED= not supported upstream https://wiki.samba.org/index.php/Samba_Release_Planning +EXPIRATION_DATE= 2016-09-07 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-progress:-p1 Modified: branches/2017Q2/net/samba43/Makefile ============================================================================== --- branches/2017Q2/net/samba43/Makefile Tue May 30 13:18:37 2017 (r442060) +++ branches/2017Q2/net/samba43/Makefile Tue May 30 13:20:13 2017 (r442061) @@ -13,7 +13,10 @@ COMMENT?= Free SMB/CIFS and AD/DC server and client f LICENSE= GPLv3 -CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba42-4.2.* samba44-4.4.* +CONFLICTS?= samba4[24-9]-4.* + +DEPRECATED= not supported upstream https://wiki.samba.org/index.php/Samba_Release_Planning +EXPIRATION_DATE= 2017-03-07 #EXTRA_PATCHES= ${PATCHDIR}/extra-patch-progress:-p1