From d48a9ca95f46f4207167f6190ba0371909e2fed4 Mon Sep 17 00:00:00 2001 From: Guenther Deschner Date: Jan 19 2010 09:55:10 +0000 Subject: Update to 3.4.5 Guenther --- diff --git a/.cvsignore b/.cvsignore index 36f4a51..f60e85e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -samba-3.4.4.tar.gz +samba-3.4.5.tar.gz diff --git a/samba-3.4.4-libsmbclient.patch b/samba-3.4.4-libsmbclient.patch deleted file mode 100644 index 510c5f1..0000000 --- a/samba-3.4.4-libsmbclient.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 35d55bf0f02fe6496b23e7bf692213421cecad4a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?G=C3=BCnther=20Deschner?= -Date: Thu, 14 Jan 2010 19:34:26 +0100 -Subject: [PATCH] s3-libsmbclient: Fix crash bug in SMBC_parse_path(). - -Patch from Tim Waugh . -This resolves https://bugzilla.redhat.com/show_bug.cgi?id=552658 - -LIBSMBCLIENT-OPENDIR torture test checks this as well. - -Guenther -(cherry picked from commit e635b0074c55e0376495abe940355aa7b04f0b70) ---- - source3/libsmb/libsmb_path.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/source3/libsmb/libsmb_path.c b/source3/libsmb/libsmb_path.c -index 6a59a12..511d54e 100644 ---- a/source3/libsmb/libsmb_path.c -+++ b/source3/libsmb/libsmb_path.c -@@ -308,7 +308,7 @@ SMBC_parse_path(TALLOC_CTX *ctx, - if (!*pp_server) { - return -1; - } -- *pp_server[wl] = '\0'; -+ (*pp_server)[wl] = '\0'; - return 0; - } - --- -1.6.5.2 - diff --git a/samba.spec b/samba.spec index 60e7bd1..8abe97d 100644 --- a/samba.spec +++ b/samba.spec @@ -1,5 +1,5 @@ -%define main_release 52 -%define samba_version 3.4.4 +%define main_release 53 +%define samba_version 3.4.5 %define tdb_version 1.1.3 %define talloc_version 1.3.0 #%define pre_release rc1 @@ -45,7 +45,6 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch # The passwd part has been applied, but not the group part Patch107: samba-3.2.0pre1-grouppwd.patch Patch200: samba-3.2.5-inotify.patch -Patch201: samba-3.4.4-libsmbclient.patch Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release} Requires: pam >= 0:0.64 @@ -203,7 +202,6 @@ cp %{SOURCE11} packaging/Fedora/ #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply %patch107 -p1 -b .grouppwd %patch200 -p0 -b .inotify -%patch201 -p1 -b .libsmbclient mv %samba_source/VERSION %samba_source/VERSION.orig sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION @@ -656,6 +654,9 @@ exit 0 %{_datadir}/pixmaps/samba/logo-small.png %changelog +* Tue Jan 19 2010 Guenther Deschner - 3.4.5-53 +- Update to 3.4.5 + * Thu Jan 14 2010 Guenther Deschner - 3.4.4-52 - Fix crash bug in libsmbclient (SMBC_parse_path) - resolves: #552658 diff --git a/sources b/sources index 176030d..c34da44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -491a1bc9c94ad2f1e6d1c29da271b242 samba-3.4.4.tar.gz +8e8a484782f2b7716b6c6bd9a7d2bf71 samba-3.4.5.tar.gz