aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/samba45/Makefile4
-rw-r--r--net/samba45/distinfo6
2 files changed, 5 insertions, 5 deletions
diff --git a/net/samba45/Makefile b/net/samba45/Makefile
index 1ff7a08125a2..c7dce1d3838d 100644
--- a/net/samba45/Makefile
+++ b/net/samba45/Makefile
@@ -13,13 +13,13 @@ COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix
LICENSE= GPLv3
-CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-46-9]-4.* p5-Parse-Pidl-4.*
+CONFLICTS?= samba4-4.0.* samba4[1-46-9]-4.* p5-Parse-Pidl-4.*
#EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1
SAMBA4_BASENAME= samba
SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4
-SAMBA4_VERSION= 4.5.14
+SAMBA4_VERSION= 4.5.15
SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
WRKSRC?= ${WRKDIR}/${DISTNAME}
diff --git a/net/samba45/distinfo b/net/samba45/distinfo
index d0113d38d4db..664f8953ad9c 100644
--- a/net/samba45/distinfo
+++ b/net/samba45/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1505945221
-SHA256 (samba-4.5.14.tar.gz) = 15dc04fd2b19081daf1118318f43f88ef7260b3fc6e4f86ee7c7913bb7c92ed9
-SIZE (samba-4.5.14.tar.gz) = 21016317
+TIMESTAMP = 1511311588
+SHA256 (samba-4.5.15.tar.gz) = 811bf727892a1e1e3d170eb72eb39c43d06ed8ff557e5e036a41aabc19008e94
+SIZE (samba-4.5.15.tar.gz) = 21020181