svn commit: r409704 - branches/2016Q1/net/samba36
Jason Unovitch
junovitch at FreeBSD.org
Sat Feb 27 23:53:16 UTC 2016
Author: junovitch
Date: Sat Feb 27 23:53:14 2016
New Revision: 409704
URL: https://svnweb.freebsd.org/changeset/ports/409704
Log:
MFH: r406862, r409126, r409127, r409703
r406862 (net/samba36 only):
Remove deprecated @dirrm's from pkg-plist of samba ports.
Note that net/samba4 got it's PORTVERSION bumped as stage-qa found
one file not included in pkg-plist.
PR: 205950
Submitted by: myself
Approved by: maintainer timeout
r409126:
net/samba36: Mark DEPRECATED
This Samba port was not yet marked deprecated. It has been EoL since 2015-03-04
r409127:
net/samba36: Extend expiration date
I intended this to align with the next quarterly release.
r409703:
net/samba36: add patches corresponding to 16 Dec 2015 security releases
PR: 206808
Reported by: Marcin Gryszkalis <mg at fork.pl>
Submitted by: takefu at airport.fm (original patch)
Approved by: ports-secteam (with hat)
Security: CVE-2015-5252
Security: CVE-2015-5296
Security: CVE-2015-5299
Security: https://vuxml.FreeBSD.org/freebsd/ef434839-a6a4-11e5-8275-000c292e4fd8.html
Modified:
branches/2016Q1/net/samba36/Makefile
branches/2016Q1/net/samba36/distinfo
branches/2016Q1/net/samba36/pkg-plist.swat
Directory Properties:
branches/2016Q1/ (props changed)
Modified: branches/2016Q1/net/samba36/Makefile
==============================================================================
--- branches/2016Q1/net/samba36/Makefile Sat Feb 27 23:50:54 2016 (r409703)
+++ branches/2016Q1/net/samba36/Makefile Sat Feb 27 23:53:14 2016 (r409704)
@@ -2,10 +2,12 @@
PORTNAME= ${SAMBA_BASENAME}36
PORTVERSION= 3.6.25
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= net
MASTER_SITES= SAMBA/samba SAMBA/samba/stable SAMBA/samba/pre
DISTNAME= ${SAMBA_BASENAME}-${PORTVERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
+PATCH_SITES= https://www.samba.org/samba/ftp/patches/security/
+PATCHFILES= samba-3.6.25-security-2015-12-16.patch:-p1
MAINTAINER?= timur at FreeBSD.org
COMMENT?= Free SMB and CIFS client and server for Unix
@@ -14,6 +16,10 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKDIR}/${DISTNAME}/COPYING
CONFLICTS?= *samba3[2-5]-3.*
+
+DEPRECATED= not supported by the upstream
+EXPIRATION_DATE= 2016-04-01
+
# Additional patches from Sernet.de
PATCH_STRIP= -p1
EXTRA_PATCHES= ${PATCHDIR}/sernet.patch
Modified: branches/2016Q1/net/samba36/distinfo
==============================================================================
--- branches/2016Q1/net/samba36/distinfo Sat Feb 27 23:50:54 2016 (r409703)
+++ branches/2016Q1/net/samba36/distinfo Sat Feb 27 23:53:14 2016 (r409704)
@@ -1,2 +1,4 @@
SHA256 (samba-3.6.25.tar.gz) = 8f2c8a7f2bd89b0dfd228ed917815852f7c625b2bc0936304ac3ed63aaf83751
SIZE (samba-3.6.25.tar.gz) = 34121828
+SHA256 (samba-3.6.25-security-2015-12-16.patch) = abe1ba1a73afe0865f20ac34a207c799cde29d34e736de5c2d029d532c93ac01
+SIZE (samba-3.6.25-security-2015-12-16.patch) = 8023
Modified: branches/2016Q1/net/samba36/pkg-plist.swat
==============================================================================
--- branches/2016Q1/net/samba36/pkg-plist.swat Sat Feb 27 23:50:54 2016 (r409703)
+++ branches/2016Q1/net/samba36/pkg-plist.swat Sat Feb 27 23:53:14 2016 (r409704)
@@ -337,25 +337,9 @@ share/swat/lang/tr/images/samba.gif
share/swat/lang/tr/images/shares.gif
share/swat/lang/tr/images/status.gif
share/swat/lang/tr/images/viewconfig.gif
- at dirrm share/swat/lang/tr/js
- at dirrm share/swat/lang/tr/include
- at dirrm share/swat/lang/tr/images
- at dirrm share/swat/lang/tr/help
- at dirrm share/swat/lang/tr
- at dirrm share/swat/lang/ja/js
- at dirrm share/swat/lang/ja/include
- at dirrm share/swat/lang/ja/images
- at dirrm share/swat/lang/ja/help
- at dirrm share/swat/lang/ja
- at dirrm share/swat/lang
- at dirrm share/swat/js
- at dirrm share/swat/include
- at dirrm share/swat/images
- at dirrm share/swat/help/manpages
- at dirrm share/swat/help/Samba3-HOWTO/images
- at dirrm share/swat/help/Samba3-HOWTO
- at dirrm share/swat/help/Samba3-Developers-Guide
- at dirrm share/swat/help/Samba3-ByExample/images
- at dirrm share/swat/help/Samba3-ByExample
- at dirrm share/swat/help
- at dirrm share/swat
+ at dir share/swat/lang/tr/js
+ at dir share/swat/lang/tr/include
+ at dir share/swat/lang/ja/js
+ at dir share/swat/lang/ja/include
+ at dir share/swat/lang/ja/images
+ at dir share/swat/js
More information about the svn-ports-branches
mailing list