Added patches to fix bugs #210527 and #210662 and the broken-readdir detection.

Package-Manager: portage-2.1.4.4

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index 44108ed3102abd4aa966183e3b7099cd9e0fba9e..078703e39aa55855208af49f9806c9c4101fdbbf 100644 (file)
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,12 @@
 # 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.327 2007/12/18 18:57:34 dev-zero Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.328 2008/02/20 20:02:53 dev-zero Exp $
+
+  20 Feb 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/3.0.28-fix_broken_readdir_detection.patch,
+  +files/3.0.28-inotify_include.patch, +files/3.0.28-libcap_detection.patch,
+  samba-3.0.28.ebuild:
+  Added patches to fix bugs #210527 and #210662 and the broken-readdir detection.
 
   18 Dec 2007; Tiziano Müller <dev-zero@gentoo.org>
   -files/3.0.25c-CVE-2007-4138.patch, -files/3.0.25c-lazyldflags.patch,

diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 78ab3c36986e75e427a38f4dbed39279d39ea52e..09fa91874303ac98f268a82740414203299de672 100644 (file)
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -4,6 +4,9 @@ AUX 3.0.24-sid2name_elevation_v2.patch 4776 RMD160 8a0e4c444fbe12a4487d02953026c
 AUX 3.0.26a-CVE-2007-5398.patch 1232 RMD160 b547196a44437d6336495ea727f9abfcfd41e79c SHA1 e2b7d91446e07bf1be5930187417f26841995743 SHA256 37a0181aa647de7feb888d675ea726e135bbe53bc3099076eaf0682fc1b11b05
 AUX 3.0.26a-invalid-free-fix.patch 541 RMD160 13e1b0420ae9c06a2e6d4f9a8a0a3af8c32318b9 SHA1 0457c901f55b86b9b3751dc67b86a26cb19ec4e7 SHA256 4a727b9a02cbc7e2efc00190d5068c82e12a0b9fdad2a50869a2f10bc39a06f2
 AUX 3.0.26a-lazyldflags.patch 1466 RMD160 12a3d97c8b84af5dea7c70173e4613bc663d4e8d SHA1 35742557c810ae4bfbbfecc3a6c3549c392fd313 SHA256 07eb35a567540bc88657f75881c8daf10de3697b64ec9bd7167f1df80cfb0d55
+AUX 3.0.28-fix_broken_readdir_detection.patch 430 RMD160 f881e5a61ee2de714b9409a5a4f4c87d7a9a6dc0 SHA1 092b1ed0abce1eaf90aece7f637e72c3d4a902ff SHA256 7756d512df664d6f55851566d050797a6fc33f13ded4b1df5e2484a578ffd3f4
+AUX 3.0.28-inotify_include.patch 1675 RMD160 056cde16ad2b1e2e84a184b8c07002bd25a832b2 SHA1 ab989d0d4f102ed574f34af9292f5109368e749b SHA256 bcc4e5f4853d40ad66246c540ff3a7f2299185e5729aaaffa06230de9fbc3c14
+AUX 3.0.28-libcap_detection.patch 1676 RMD160 72cb751432db3911aedb32cf21a822bf9fceb278 SHA1 0348cc988150169b42a420a52fbf418aaf90e9e6 SHA256 73540a245115288f43dfd6abe6983a015886c93a14d906f38d59732e390cd070
 AUX README.gentoo 3208 RMD160 858aee78e07bdc0ebee7bc6c2212d4c528325633 SHA1 819ae809566e967cdc03024adae4443c5833dfc5 SHA256 9e87efa3fcea73becdfad4adb0fe677e1969c2951f03c47d1b0f4aeb00999578
 AUX config/lmhosts 130 RMD160 b2acc34f95a4f926528ae67861c3597204be0c41 SHA1 be21644d6b4645d0685b954071b4618faa1c6da2 SHA256 c1c0a520c6d4b4ce7df9bd30f835dd912942b05004fc24e3cc495fc1622d5d8c
 AUX config/nsswitch.conf-winbind 410 RMD160 02722819dfba2fb1425eadd0f63f96f598ecda69 SHA1 ede68472b5eae7d2efb805e138bd7f9ca8f7fefb SHA256 d1e61b5a152d05a3d8a9f8d18d574596acc1a594b311278d3ad9ea1b2c273a40
@@ -24,6 +27,6 @@ DIST samba-3.0.28.tar.gz 18159912 RMD160 816b57bff30a968c56be0c6864e6ea9f1898173
 DIST samba-vscan-0.3.6b.tar.bz2 164471 RMD160 5cd81345b06f44b2febf3f24e62325322b1c6a3b SHA1 b11e8303380ee8d271a916a17a16cbab9d0d36f8 SHA256 14f78b624b047b90ddf4965998e7115d3b3ac97b3229154a302637d8e49adcd4
 EBUILD samba-3.0.24-r3.ebuild 8558 RMD160 8639eaba80f753d5da2bbfa7c2b451c954b563f3 SHA1 c4724b60f864312b33497f14dc44c05dcea8ca5a SHA256 b7179360d8560f2d28d1404bf64cb45d01af910668f4b017f2c0e127202ead4f
 EBUILD samba-3.0.27.ebuild 8773 RMD160 a3a889c643267c254309f36d2bd08447186bb6b5 SHA1 aa91fab445d3e3f94c4cbbd35cddf0df84f0c956 SHA256 e3d330432891f3f3b6ef441587f283e3c72b6364207e7eaea0d1346b1e72fb2b
-EBUILD samba-3.0.28.ebuild 9091 RMD160 9a0ae834ff55420924b8975f37e874419f3ffc9d SHA1 6f69b96e782d81c9a0b9ce5bea13f028459c6e60 SHA256 4d0b92c1d69bbfdf3af3d7f202e82d05dbadecdb4de0b35938a02846ac5c88d6
-MISC ChangeLog 55360 RMD160 d3ffe62de5a90df636390fa5c614718fe7a63e61 SHA1 2844160832c3137d026405850c9761b56d09aee0 SHA256 1476b733083550f6ed8252c6496daef8b47e770ca3a53bdc3b1b021231a2a44b
+EBUILD samba-3.0.28.ebuild 9291 RMD160 190e9fe6a308218dab725e05f458705688f78ca5 SHA1 9a3dc9258a53bf606762a40cbcc1c7613cb3a40b SHA256 01938570ae214f9b2c7b4638b7529556a3d8c40327a943c097a27220d906785d
+MISC ChangeLog 55648 RMD160 871a58b190c6bd7deea8ac4cc6e027d3fcd9634e SHA1 9c60fffdb9e4e96d7628661fb481dcee8177a7a9 SHA256 a5f230841b0520f352c3a4a3ee4d846de1628e88b270895a10e7da305cd46be4
 MISC metadata.xml 489 RMD160 36eed0edca609c521314ae415efd57ca9acfecb4 SHA1 317e61704a10a3bd888d32c6834721f5d40d00ff SHA256 6f35f13dd39bb51d304fd59b5352c92bc35a957c9c9412c5c1f3f58e98519792

diff --git a/net-fs/samba/files/3.0.28-fix_broken_readdir_detection.patch b/net-fs/samba/files/3.0.28-fix_broken_readdir_detection.patch
new file mode 100644 (file)
index 0000000..47f33d7
--- /dev/null
+++ b/net-fs/samba/files/3.0.28-fix_broken_readdir_detection.patch
@@ -0,0 +1,18 @@
+diff -Naur samba-3.0.28.orig/source/tests/os2_delete.c samba-3.0.28/source/tests/os2_delete.c
+--- samba-3.0.28.orig/source/tests/os2_delete.c        2007-11-15 04:15:04.000000000 +0100
++++ samba-3.0.28/source/tests/os2_delete.c     2008-02-20 20:47:53.878055947 +0100
+@@ -105,6 +105,9 @@
+ 
+       return 0;
+ }
++
++#if 0
++
+ /*
+   test readdir/unlink pattern that OS/2 uses
+   tridge@samba.org July 2005
+@@ -212,3 +215,4 @@
+ 
+       return 0;
+ }
++#endif

diff --git a/net-fs/samba/files/3.0.28-inotify_include.patch b/net-fs/samba/files/3.0.28-inotify_include.patch
new file mode 100644 (file)
index 0000000..7ce8078
--- /dev/null
+++ b/net-fs/samba/files/3.0.28-inotify_include.patch
@@ -0,0 +1,53 @@
+diff -Naur samba-3.0.28.orig/source/configure.in samba-3.0.28/source/configure.in
+--- samba-3.0.28.orig/source/configure.in      2007-11-21 04:58:01.000000000 +0100
++++ samba-3.0.28/source/configure.in   2008-02-19 17:56:52.383852151 +0100
+@@ -2541,7 +2541,7 @@
+ 
+ AC_CACHE_CHECK([for inotify support],samba_cv_HAVE_INOTIFY,[
+ AC_CHECK_HEADERS(linux/inotify.h asm/unistd.h)
+-AC_CHECK_FUNC(inotify_init)
++AC_CHECK_FUNCS([inotify_init])
+ AC_HAVE_DECL(__NR_inotify_init, [#include <asm/unistd.h>])
+ ],
+ samba_cv_HAVE_INOTIFY=yes,
+diff -Naur samba-3.0.28.orig/source/include/config.h.in samba-3.0.28/source/include/config.h.in
+--- samba-3.0.28.orig/source/include/config.h.in       2007-12-10 17:04:29.000000000 +0100
++++ samba-3.0.28/source/include/config.h.in    2008-02-19 17:58:05.092981395 +0100
+@@ -685,6 +685,9 @@
+ /* Whether kernel has inotify support */
+ #undef HAVE_INOTIFY
+ 
++/* Whether system libc defines the inotify_init function */
++#undef HAVE_INOTIFY_INIT
++
+ /* Whether int16 typedef is included by rpc/rpc.h */
+ #undef HAVE_INT16_FROM_RPC_RPC_H
+ 
+diff -Naur samba-3.0.28.orig/source/smbd/notify_inotify.c samba-3.0.28/source/smbd/notify_inotify.c
+--- samba-3.0.28.orig/source/smbd/notify_inotify.c     2007-11-15 04:15:04.000000000 +0100
++++ samba-3.0.28/source/smbd/notify_inotify.c  2008-02-19 17:56:52.387155138 +0100
+@@ -30,10 +30,12 @@
+ #include <asm/types.h>
+ #endif
+ 
++#ifndef HAVE_INOTIFY_INIT
++
+ #include <linux/inotify.h>
+ #include <asm/unistd.h>
+ 
+-#ifndef HAVE_INOTIFY_INIT
++
+ /*
+   glibc doesn't define these functions yet (as of March 2006)
+ */
+@@ -51,6 +53,10 @@
+ {
+       return syscall(__NR_inotify_rm_watch, fd, wd);
+ }
++#else
++
++#include <sys/inotify.h>
++
+ #endif
+ 
+ 

diff --git a/net-fs/samba/files/3.0.28-libcap_detection.patch b/net-fs/samba/files/3.0.28-libcap_detection.patch
new file mode 100644 (file)
index 0000000..991375c
--- /dev/null
+++ b/net-fs/samba/files/3.0.28-libcap_detection.patch
@@ -0,0 +1,40 @@
+diff -Naurb samba-3.0.28.orig/source/configure.in samba-3.0.28/source/configure.in
+--- samba-3.0.28.orig/source/configure.in      2007-11-21 04:58:01.000000000 +0100
++++ samba-3.0.28/source/configure.in   2008-02-20 14:31:05.167709211 +0100
+@@ -2663,6 +2663,7 @@
+ if test x"$samba_cv_HAVE_POSIX_CAPABILITIES" = x"yes"; then
+     AC_DEFINE(HAVE_POSIX_CAPABILITIES, 1,
+           [Whether POSIX capabilities are available])
++    AC_CHECK_DECLS([capget], , , [#include <sys/capability.h>])
+ else
+     LIBS=$ac_save_LIBS
+ fi
+diff -Naurb samba-3.0.28.orig/source/include/config.h.in samba-3.0.28/source/include/config.h.in
+--- samba-3.0.28.orig/source/include/config.h.in       2007-12-10 17:04:29.000000000 +0100
++++ samba-3.0.28/source/include/config.h.in    2008-02-20 14:32:41.246837408 +0100
+@@ -1211,6 +1211,9 @@
+ /* Whether POSIX capabilities are available */
+ #undef HAVE_POSIX_CAPABILITIES
+ 
++/* Whether the capget (and capset) function is available (libcap-2.x has it) */
++#undef HAVE_DECL_CAPGET
++
+ /* Whether posix_fadvise is available */
+ #undef HAVE_POSIX_FADVISE
+ 
+diff -Naurb samba-3.0.28.orig/source/smbd/oplock_linux.c samba-3.0.28/source/smbd/oplock_linux.c
+--- samba-3.0.28.orig/source/smbd/oplock_linux.c       2007-11-15 04:15:04.000000000 +0100
++++ samba-3.0.28/source/smbd/oplock_linux.c    2008-02-20 14:31:48.327720338 +0100
+@@ -34,10 +34,12 @@
+       uint32 inheritable;
+ } data;
+ 
++#if defined HAVE_DECL_CAPGET && !HAVE_DECL_CAPGET
+ extern int capget(struct cap_user_header * hdrp,
+                 struct cap_user_data * datap);
+ extern int capset(struct cap_user_header * hdrp,
+                 const struct cap_user_data * datap);
++#endif
+ 
+ static SIG_ATOMIC_T signals_received;
+ #define FD_PENDING_SIZE 100

diff --git a/net-fs/samba/samba-3.0.28.ebuild b/net-fs/samba/samba-3.0.28.ebuild
index 1eab0f7f6b29676008d33e0d9559cad6397006b3..d6ce6f04257f6dc78af4858b9612d0802cd1f76b 100644 (file)
--- a/net-fs/samba/samba-3.0.28.ebuild
+++ b/net-fs/samba/samba-3.0.28.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.28.ebuild,v 1.3 2007/12/29 10:27:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.28.ebuild,v 1.4 2008/02/20 20:02:53 dev-zero Exp $
 
-inherit eutils pam python multilib versionator confutils
+inherit autotools eutils pam python multilib versionator confutils
 
 MY_P=${PN}-${PV/_/}
 
@@ -53,6 +53,12 @@ src_unpack() {
        # Bug #196015 (upstream: #5021)
        epatch "${FILESDIR}/3.0.26a-invalid-free-fix.patch"
 
+       epatch "${FILESDIR}/${PV}-libcap_detection.patch" \
+               "${FILESDIR}/${PV}-inotify_include.patch" \
+               "${FILESDIR}/${PV}-fix_broken_readdir_detection.patch"
+
+       eautoconf -I. -Ilib/replace
+
        # Ok, agreed, this is ugly. But it avoids a patch we
        # need for every samba version and we don't need autotools
        sed -i \
@@ -61,6 +67,7 @@ src_unpack() {
                configure || die "sed failed"
 
        rm "${S}/docs/manpages"/{mount,umount}.cifs.8
+
 }
 
 src_compile() {