From b7e567a9b1ccd55efe49e0ee07c76b86f5ca82fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Tue, 26 Jun 2012 15:49:00 +0200 Subject: [PATCH] Update to 3.6.6. Guenther --- .gitignore | 1 + samba-3.6.5-iniparser.patch | 47 ------------------------------------- samba.spec | 9 +++---- sources | 2 +- 4 files changed, 7 insertions(+), 52 deletions(-) delete mode 100644 samba-3.6.5-iniparser.patch diff --git a/.gitignore b/.gitignore index c7b6858..c58ecaa 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ samba-3.6.0pre1.tar.gz /samba-3.6.3.tar.gz /samba-3.6.4.tar.gz /samba-3.6.5.tar.gz +/samba-3.6.6.tar.gz diff --git a/samba-3.6.5-iniparser.patch b/samba-3.6.5-iniparser.patch deleted file mode 100644 index 9e54834..0000000 --- a/samba-3.6.5-iniparser.patch +++ /dev/null @@ -1,47 +0,0 @@ -From adbace20a24b6ae4fbd6d17b7153833f4ac8c88d Mon Sep 17 00:00:00 2001 -From: Simo Sorce -Date: Mon, 23 Apr 2012 17:23:35 -0400 -Subject: [PATCH] Fix pam_winbind build against newer iniparser library - -iniparser_getstr is deprecated and has been removed in newer libraries -available in Fedora. Use iniparse_getstring instead. - -Autobuild-User: Simo Sorce -Autobuild-Date: Tue Apr 24 02:56:10 CEST 2012 on sn-devel-104 ---- - nsswitch/pam_winbind.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c -index 831fa84..e3e9af1 100644 ---- a/nsswitch/pam_winbind.c -+++ b/nsswitch/pam_winbind.c -@@ -437,13 +437,13 @@ static int _pam_parse(const pam_handle_t *pamh, - ctrl |= WINBIND_SILENT; - } - -- if (iniparser_getstr(d, CONST_DISCARD(char *, "global:krb5_ccache_type")) != NULL) { -+ if (iniparser_getstring(d, CONST_DISCARD(char *, "global:krb5_ccache_type"), NULL) != NULL) { - ctrl |= WINBIND_KRB5_CCACHE_TYPE; - } - -- if ((iniparser_getstr(d, CONST_DISCARD(char *, "global:require-membership-of")) -+ if ((iniparser_getstring(d, CONST_DISCARD(char *, "global:require-membership-of"), NULL) - != NULL) || -- (iniparser_getstr(d, CONST_DISCARD(char *, "global:require_membership_of")) -+ (iniparser_getstring(d, CONST_DISCARD(char *, "global:require_membership_of"), NULL) - != NULL)) { - ctrl |= WINBIND_REQUIRED_MEMBERSHIP; - } -@@ -2278,7 +2278,7 @@ static const char *get_conf_item_string(struct pwb_context *ctx, - goto out; - } - -- parm_opt = iniparser_getstr(ctx->dict, key); -+ parm_opt = iniparser_getstring(ctx->dict, key, NULL); - TALLOC_FREE(key); - - _pam_log_debug(ctx, LOG_INFO, "CONFIG file: %s '%s'\n", --- -1.7.7.6 - diff --git a/samba.spec b/samba.spec index b5e380d..6a5a3f8 100644 --- a/samba.spec +++ b/samba.spec @@ -1,5 +1,5 @@ -%define main_release 90 -%define samba_version 3.6.5 +%define main_release 91 +%define samba_version 3.6.6 %define tdb_version 1.2.9 %define talloc_version 2.0.5 #%define pre_release rc3 @@ -47,7 +47,6 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch Patch107: samba-3.2.0pre1-grouppwd.patch Patch200: samba-3.2.5-inotify.patch Patch201: samba-3.6.4-krb5_locate_kdc.patch -Patch202: samba-3.6.5-iniparser.patch Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release} Requires: pam >= 0:0.64 @@ -234,7 +233,6 @@ cp %{SOURCE11} packaging/Fedora/ %patch107 -p1 -b .grouppwd %patch200 -p0 -b .inotify %patch201 -p1 -b .krb5_locate_kdc -%patch202 -p1 -b .iniparser mv %samba_source/VERSION %samba_source/VERSION.orig sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION @@ -700,6 +698,9 @@ fi %{_datadir}/pixmaps/samba/logo-small.png %changelog +* Tue Jun 26 2012 Guenther Deschner - 2:3.6.6-91 +- Update to 3.6.6 + * Thu Jun 21 2012 Andreas Schneider - 2:3.6.5-90 - Fix ldonfig. - Require systemd for samba-common package. diff --git a/sources b/sources index 9ad719d..87147f5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f0c14547333c1b48fd4728b031e7040 samba-3.6.5.tar.gz +0bea52842d172231c0c0e23ee570d7af samba-3.6.6.tar.gz