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

Update Samba to version 3.0.28 and add two patches from FreeBSD to allow

Browse Source 
for non FFS filesystems (e.g. CD-ROMs) to be shared with Samba again.

This fixes CVE-2007-6015 and several other security problems.

ok winiger
This commit is contained in:
mbalmer 2007-12-14 08:53:27 +00:00
parent 5220f7222d
commit 891aaf69f6
5 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/samba/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.87 2007/10/25 09:46:44 wilfried Exp $
# $OpenBSD: Makefile,v 1.88 2007/12/14 08:53:27 mbalmer Exp $
COMMENT-main= SMB and CIFS client and server for UNIX
COMMENT-docs= documentation and examples for samba
DISTNAME= samba-3.0.25b
PKGNAME-main= ${DISTNAME}p0
FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}p0
DISTNAME= samba-3.0.28
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}
SHARED_LIBS= smbclient 1.0 \
msrpc 1.0

10
net/samba/distinfo
View File

@ -1,5 +1,5 @@
MD5 (samba-3.0.25b.tar.gz) = 5Jeaaqbxjw42uswlyrewLQ==
RMD160 (samba-3.0.25b.tar.gz) = p9HZs4/NwNXC/V3auWJKGOVU/4E=
SHA1 (samba-3.0.25b.tar.gz) = lsFqEQakJpX6cnFo2L61n36G9yY=
SHA256 (samba-3.0.25b.tar.gz) = 3FB02crWaebFH3yMDUDPmx/hLhodtSvReT7XY6cOh6I=
SIZE (samba-3.0.25b.tar.gz) = 18160223
MD5 (samba-3.0.28.tar.gz) = h2HNfAKDPZWfvr1PaYlQdQ==
RMD160 (samba-3.0.28.tar.gz) = gWtXv/MKloxWvgxoZObqnxiYFzc=
SHA1 (samba-3.0.28.tar.gz) = T8rYE0+JoSOiVBON4KzkoTmTsAc=
SHA256 (samba-3.0.28.tar.gz) = 3K+SE7n3x0mzRiFK4hgIzTNpR8cWk7Tsoa9vA3cl2Y4=
SIZE (samba-3.0.28.tar.gz) = 18159912

12
net/samba/patches/patch-lib_iconv.c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-lib_iconv.c,v 1.1 2007/12/14 08:53:27 mbalmer Exp $
--- lib/iconv.c.orig Tue Jun 5 01:45:05 2007
+++ lib/iconv.c Tue Jun 5 01:46:09 2007
@@ -137,7 +137,7 @@
char **outbuf, size_t *outbytesleft)
{
size_t ret = iconv((iconv_t)cd,
- (char **)inbuf, inbytesleft,
+ inbuf, inbytesleft,
outbuf, outbytesleft);
if (ret == (size_t)-1) {
int saved_errno = errno;

15
net/samba/patches/patch-lib_replace_repdir_getdirentries_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-lib_replace_repdir_getdirentries_c,v 1.1 2007/12/14 08:53:27 mbalmer Exp $
--- lib/replace/repdir_getdirentries.c.orig Thu Mar 1 05:54:23 2007
+++ lib/replace/repdir_getdirentries.c Thu Dec 13 22:17:06 2007
@@ -129,11 +129,6 @@ long telldir(DIR *dir)
d->ofs = 0;
d->nbytes = 0;
}
- /* this relies on seekpos always being a multiple of
- DIR_BUF_SIZE. Is that always true on BSD systems? */
- if (d->seekpos & (DIR_BUF_SIZE-1)) {
- abort();
- }
return d->seekpos + d->ofs;
}

4
net/samba/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.5 2007/10/25 09:46:44 wilfried Exp $
@comment $OpenBSD: PLIST-main,v 1.6 2007/12/14 08:53:27 mbalmer Exp $
@pkgpath ${BASE_PKGPATH}
bin/eventlogadm
bin/findsmb
@ -108,6 +108,8 @@ libexec/swat
@man man/man8/winbindd.8
share/examples/samba/
@sample ${SYSCONFDIR}/samba/
share/examples/samba/VFS/config.guess
share/examples/samba/VFS/config.sub
share/examples/samba/smb.conf.default
@sample ${SYSCONFDIR}/samba/smb.conf
share/swat/