diff options
| author |   Tiziano Müller <dev-zero@gentoo.org> | 2007-11-02 22:09:43 +0000 |
|---|---|---|
| committer | Tiziano Müller <dev-zero@gentoo.org> | 2007-11-02 22:09:43 +0000 |
| commit | 22ad9cffa693409f3cf0159ffa23d2187cd48eac (patch) | |
| tree | b7ff7368f27179b11347464d9d8a1dfbb1904188 /net-fs | |
| parent | stable ppc, bug #197665 (diff) | |
| download | gentoo-2-22ad9cffa693409f3cf0159ffa23d2187cd48eac.tar.gz gentoo-2-22ad9cffa693409f3cf0159ffa23d2187cd48eac.tar.bz2 gentoo-2-22ad9cffa693409f3cf0159ffa23d2187cd48eac.zip | |
Added patch for bug #196015 (thanks to Evgeniy Dushistov)
(Portage version: 2.1.3.16)
Diffstat (limited to 'net-fs')
| -rw-r--r-- | net-fs/samba/ChangeLog | 9 | ||||
| -rw-r--r-- | net-fs/samba/files/3.0.26a-invalid-free-fix.patch | 17 | ||||
| -rw-r--r-- | net-fs/samba/files/digest-samba-3.0.26a-r1 (renamed from net-fs/samba/files/digest-samba-3.0.26a) | 0 | ||||
| -rw-r--r-- | net-fs/samba/samba-3.0.26a-r1.ebuild (renamed from net-fs/samba/samba-3.0.26a.ebuild) | 4 |
4 files changed, 28 insertions, 2 deletions
diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog index 665b352e0f40..12e67e8492cc 100644 --- a/net-fs/samba/ChangeLog +++ b/net-fs/samba/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-fs/samba # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.306 2007/10/31 20:35:40 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.307 2007/11/02 22:09:42 dev-zero Exp $ + +*samba-3.0.26a-r1 (02 Nov 2007) + + 02 Nov 2007; Tiziano Müller <dev-zero@gentoo.org> + +files/3.0.26a-invalid-free-fix.patch, -samba-3.0.26a.ebuild, + +samba-3.0.26a-r1.ebuild: + Added patch for bug #196015 (thanks to Evgeniy Dushistov) 31 Oct 2007; Tiziano Müller <dev-zero@gentoo.org> samba-3.0.26a.ebuild: Removed some useless files from the dodoc-call, quoted some more vars. diff --git a/net-fs/samba/files/3.0.26a-invalid-free-fix.patch b/net-fs/samba/files/3.0.26a-invalid-free-fix.patch new file mode 100644 index 000000000000..5a4eeb5cf2f6 --- /dev/null +++ b/net-fs/samba/files/3.0.26a-invalid-free-fix.patch @@ -0,0 +1,17 @@ +diff --git a/source/libsmb/libsmbclient.c b/source/libsmb/libsmbclient.c +index 80b09fa..374a86a 100644 +--- a/source/libsmb/libsmbclient.c ++++ b/source/libsmb/libsmbclient.c +@@ -2644,7 +2644,11 @@ smbc_opendir_ctx(SMBCCTX *context, + return NULL; + } + +- ip_list = &server_addr; ++ ip_list = memdup(&server_addr, sizeof(server_addr)); ++ if (ip_list == NULL) { ++ errno = ENOMEM; ++ return NULL; ++ } + count = 1; + } + diff --git a/net-fs/samba/files/digest-samba-3.0.26a b/net-fs/samba/files/digest-samba-3.0.26a-r1 index 7056d3102e2e..7056d3102e2e 100644 --- a/net-fs/samba/files/digest-samba-3.0.26a +++ b/net-fs/samba/files/digest-samba-3.0.26a-r1 diff --git a/net-fs/samba/samba-3.0.26a.ebuild b/net-fs/samba/samba-3.0.26a-r1.ebuild index 10eaf5d2cda2..3a4576f322ff 100644 --- a/net-fs/samba/samba-3.0.26a.ebuild +++ b/net-fs/samba/samba-3.0.26a-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.26a.ebuild,v 1.3 2007/10/31 20:35:40 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.26a-r1.ebuild,v 1.1 2007/11/02 22:09:42 dev-zero Exp $ inherit eutils pam python multilib versionator confutils @@ -49,6 +49,8 @@ src_unpack() { # This patch adds "-Wl,-z,now" to smb{mnt,umount} # Please read ... for further informations epatch "${FILESDIR}/${PV}-lazyldflags.patch" + # Bug #196015 (upstream: #5021) + epatch "${FILESDIR}/${PV}-invalid-free-fix.patch" # Ok, agreed, this is ugly. But it avoids a patch we # need for every samba version and we don't need autotools |