summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorTimur I. Bakeyev <timur@FreeBSD.org>2009-08-17 01:49:08 +0000
committerTimur I. Bakeyev <timur@FreeBSD.org>2009-08-17 01:49:08 +0000
commitb8fbc9db591ba8b977494c75447636044d31172c (patch)
tree869c869cccc811cbbd1b002702a992db907105bb /net
parentBump port version to Samba 3.2.14 (diff)
Bump port version to Samba 3.0.36
Please note, that the 3.0 series will be DISCONTINUED after this release! Major enhancements included in Samba 3.0.36 are: o Fix Winbind crash on 'getent group' (bug #5906). o Excel save operation corrupts file ACLs (bug #4308). o Prevent segmentation fault on joining a very long domain name.
Notes
Notes: svn path=/head/; revision=239697
Diffstat (limited to 'net')
-rw-r--r--net/samba3/Makefile4
-rw-r--r--net/samba3/distinfo6
-rw-r--r--net/samba3/files/patch-include_includes.h16
3 files changed, 5 insertions, 21 deletions
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index a504ddb22e7f..234cc7c3a860 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= samba
-PORTVERSION?= 3.0.35
+PORTVERSION?= 3.0.36
PORTEPOCH?= 1
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SAMBA}
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/:S/.r/rc/}
MAINTAINER?= timur@FreeBSD.org
COMMENT?= A free SMB and CIFS client and server for UNIX
-CONFLICTS?= *samba-3.[1-9]* samba4-* tdb-1.*
+CONFLICTS?= *samba-3.[1-9]* samba4-* tdb-1.* talloc-1.*
USE_ICONV= yes
GNU_CONFIGURE= yes
diff --git a/net/samba3/distinfo b/net/samba3/distinfo
index aa956ffd0bfd..b5db570cd0a0 100644
--- a/net/samba3/distinfo
+++ b/net/samba3/distinfo
@@ -1,3 +1,3 @@
-MD5 (samba-3.0.35.tar.gz) = 2f46d24fe52e51fd7925a173e74fc13c
-SHA256 (samba-3.0.35.tar.gz) = 87b81c0cea653305e796013148d3c0c68d7f38cbd7ed3b5255ddace14fd37748
-SIZE (samba-3.0.35.tar.gz) = 24839204
+MD5 (samba-3.0.36.tar.gz) = 0c4d8b197b9de1a87c3e9d042c7f3f83
+SHA256 (samba-3.0.36.tar.gz) = 08833af913937bdeeca118cff404d0f07b835501a4ab0e26f3aefd55e50c4d86
+SIZE (samba-3.0.36.tar.gz) = 23416298
diff --git a/net/samba3/files/patch-include_includes.h b/net/samba3/files/patch-include_includes.h
deleted file mode 100644
index b0267c0755cb..000000000000
--- a/net/samba3/files/patch-include_includes.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./include/includes.h.orig Mon Apr 9 19:30:59 2007
-+++ ./include/includes.h Tue Apr 17 02:06:59 2007
-@@ -209,10 +209,10 @@
- #undef HAVE_LDAP
- #endif
-
--#if HAVE_GSSAPI_H
--#include <gssapi.h>
--#elif HAVE_GSSAPI_GSSAPI_H
-+#if HAVE_GSSAPI_GSSAPI_H
- #include <gssapi/gssapi.h>
-+#elif HAVE_GSSAPI_H
-+#include <gssapi.h>
- #elif HAVE_GSSAPI_GSSAPI_GENERIC_H
- #include <gssapi/gssapi_generic.h>
- #endif