cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to samba 3.6.3; various bugfixes. From maintainer Ian McWilliam,

Browse Source 
also tested by nigel@.

This rolls in the DoS fix which we previously handled via a patch.
This commit is contained in:
sthen 2012-02-16 21:36:08 +00:00
parent 024e246367
commit c3bc9562f0
5 changed files with 11 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/samba/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.154 2012/01/31 09:12:58 sthen Exp $
# $OpenBSD: Makefile,v 1.155 2012/02/16 21:36:08 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= SMB and CIFS client and server for UNIX
COMMENT-docs= additional documentation and examples for Samba
DISTNAME= samba-3.6.1
REVISION-main= 1
DISTNAME= samba-3.6.3
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}
FULLPKGPATH-docs= net/samba,-docs

10
net/samba/distinfo
View File

@ -1,5 +1,5 @@
MD5 (samba-3.6.1.tar.gz) = UpFxe+BzTgfcB7YRDhYuhw==
RMD160 (samba-3.6.1.tar.gz) = btROZrIs7wAWiDH6ftE1cf1eRe0=
SHA1 (samba-3.6.1.tar.gz) = /tgv2SlY8yCe2zxxMh1LSKvunEs=
SHA256 (samba-3.6.1.tar.gz) = xbDyqwL+LGQbHOUqFBwo8bP7wJOtqKYu7KcMJeFb1WQ=
SIZE (samba-3.6.1.tar.gz) = 28984820
MD5 (samba-3.6.3.tar.gz) = mKydufS26/w/ATqhk/+w0Q==
RMD160 (samba-3.6.3.tar.gz) = /QT9WJfw808lfFBN6RHhqzT/PiU=
SHA1 (samba-3.6.3.tar.gz) = QwoeE/4gwX4oCANchj6153aFyJs=
SHA256 (samba-3.6.3.tar.gz) = Z+JAny1eTVy5R8lfWDSYEFA4hXuEzHPAjazU4svGYHQ=
SIZE (samba-3.6.3.tar.gz) = 28993737

8
net/samba/patches/patch-Makefile_in
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-Makefile_in,v 1.17 2011/09/26 09:32:12 sthen Exp $
--- Makefile.in.orig Tue Aug 9 13:17:47 2011
+++ Makefile.in Mon Sep 12 17:40:48 2011
$OpenBSD: patch-Makefile_in,v 1.18 2012/02/16 21:36:08 sthen Exp $
--- Makefile.in.orig Thu Jan 26 05:26:48 2012
+++ Makefile.in Thu Jan 26 08:46:44 2012
@@ -28,7 +28,7 @@ SHLD=@SHLD@
LIB_PATH_VAR=@LIB_PATH_VAR@
## Dynamic shared libraries build settings
-DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@\(.[0-9]\{1,\}\)\{0,1\}$$/@SYMSEXT@/'`
-DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's:\.@SHLIBEXT@[\.0-9]*$$:.@SYMSEXT@:'`
+DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@\(.[0-9]\{1,\}\)\{0,1\}\(.[0-9]\{1,\}\)\{0,1\}$$/@SYMSEXT@/'`
DSO_EXPORTS=@DSO_EXPORTS@
SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@

36
net/samba/patches/patch-lib_substitute_c
View File

@ -1,36 +0,0 @@
$OpenBSD: patch-lib_substitute_c,v 1.1 2012/01/31 09:12:59 sthen Exp $
http://ftp.samba.org/pub/samba/patches/security/samba-3.6.2-CVE-2012-0817.patch
--- lib/substitute.c.orig Tue Oct 18 19:48:48 2011
+++ lib/substitute.c Tue Jan 31 08:45:43 2012
@@ -195,7 +195,7 @@ void sub_set_smb_name(const char *name)
}
static char sub_peeraddr[INET6_ADDRSTRLEN];
-static const char *sub_peername = "";
+static const char *sub_peername = NULL;
static char sub_sockaddr[INET6_ADDRSTRLEN];
void sub_set_socket_ids(const char *peeraddr, const char *peername,
@@ -208,6 +208,11 @@ void sub_set_socket_ids(const char *peeraddr, const ch
}
strlcpy(sub_peeraddr, addr, sizeof(sub_peeraddr));
+ if (sub_peername != NULL &&
+ sub_peername != sub_peeraddr) {
+ free(discard_const_p(char,sub_peername));
+ sub_peername = NULL;
+ }
sub_peername = SMB_STRDUP(peername);
if (sub_peername == NULL) {
sub_peername = sub_peeraddr;
@@ -646,7 +651,7 @@ static char *alloc_sub_basic(const char *smb_name, con
break;
case 'M' :
a_string = realloc_string_sub(a_string, "%M",
- sub_peername);
+ sub_peername ? sub_peername : "");
break;
case 'R' :
a_string = realloc_string_sub(a_string, "%R", remote_proto);

19
net/samba/patches/patch-smbd_server_c
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-smbd_server_c,v 1.1 2012/01/31 09:12:59 sthen Exp $
http://ftp.samba.org/pub/samba/patches/security/samba-3.6.2-CVE-2012-0817.patch
--- smbd/server.c.orig Tue Oct 18 19:48:48 2011
+++ smbd/server.c Tue Jan 31 08:45:43 2012
@@ -64,6 +64,12 @@ static void smbd_set_server_fd(int fd)
* name, default to its address.
*/
+ if (sconn->client_id.name != NULL &&
+ sconn->client_id.name != sconn->client_id.addr) {
+ talloc_free(discard_const_p(char, sconn->client_id.name));
+ sconn->client_id.name = NULL;
+ }
+
client_addr(fd, sconn->client_id.addr, sizeof(sconn->client_id.addr));
name = client_name(sconn->sock);