Attachment 622292 Details for Bug 862194 – Spec patch versus latest RHEL6-compatible (140.rc1) package release.

[patch] Spec patch versus latest RHEL6-compatible (140.rc1) package release.

samba4-140.patch (text/plain), 10.05 KB, created by Giuseppe Ragusa on 2012-10-05 16:19:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Giuseppe Ragusa

Created: 2012-10-05 16:19:24 UTC

Size: 10.05 KB

patch

obsolete

>--- samba4.spec.orig	2012-10-05 18:14:49.000000000 +0200
>+++ samba4.spec	2012-10-05 18:17:08.000000000 +0200
>@@ -1,4 +1,4 @@
>-%define main_release 140
>+%define main_release 140.3
> 
> %define samba_version 4.0.0
> %define talloc_version 2.0.7
>@@ -6,7 +6,7 @@
> %define tdb_version 1.2.10
> %define tevent_version 0.9.17
> %define ldb_version 1.1.12
>-%define pre_release rc1
>+%define pre_release rc2
> 
> %define samba_release %{main_release}%{?dist}.%{pre_release}
> 
>@@ -22,9 +22,21 @@
> 
> %global with_usrmove 0
> 
>+%global with_runmove 0
>+
>+%global with_tmpfiles 0
>+
> %global with_mitkrb5 1
> %global with_dc 0
> 
>+%global with_clustering_support 1
>+
>+%if %with_dc
>+%global with_mitkrb5 0
>+%global with_libsmbclient 1
>+%global with_libwbclient 1
>+%endif
>+
> %if 0%{?rhel} == 6
> %global with_talloc 0
> %global with_tevent 0
>@@ -38,6 +50,11 @@
> %global with_ldb 0
> %endif
> 
>+%if 0%{?fedora} > 14 || 0%{?rhel} > 6
>+%global with_tmpfiles 1
>+%global with_runmove 1
>+%endif
>+
> %if 0%{?fedora} > 16 || 0%{?rhel} > 6
> %global with_usrmove 1
> %endif
>@@ -48,6 +65,12 @@
> %global smb_lib %{_lib}
> %endif
> 
>+%if %with_runmove
>+%global real_run /run
>+%else
>+%global real_run /var/run
>+%endif
>+
> %{!?python_libdir: %define python_libdir %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1,1)")}
> %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
> 
>@@ -85,21 +108,16 @@
> Source6: samba.pamd
> Source7: samba.conf.tmp
> 
>+Source90: smbprint
>+
> Source100: nmb.init
> Source101: smb.init
> Source102: winbind.init
>+Source103: samba.init
> 
> Source200: README.dc
> Source201: README.downgrade
> 
>-Patch1: samba-4.0.0rc2-build_idmap_manpages.patch
>-Patch2: samba-4.0.0rc2-create_smbldaphelper.patch
>-Patch3: samba-4.0.0rc2-make_smbldaphelper_lib.patch
>-Patch4: samba-4.0.0rc2-fix_smbldaphelper_without_ldap.patch
>-Patch5: samba-4.0.0rc2-fix_smb.conf_manpage_build.patch
>-Patch6: samba-4.0.0rc2-use_smb_man_style.patch
>-Patch7: samba-4.0.0rc2-fix_panic_action.patch
>-
> BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
> 
> Requires(pre): /usr/sbin/groupadd
>@@ -121,7 +139,9 @@
> Provides: samba = %{samba_depver}
> 
> BuildRequires: autoconf
>+%if %with_clustering_support
> BuildRequires: ctdb-devel
>+%endif
> BuildRequires: cups-devel
> BuildRequires: docbook-style-xsl
> BuildRequires: e2fsprogs-devel
>@@ -180,6 +200,7 @@
> %if ! %with_libsmbclient && ! %with_libwbclient
> %{?filter_setup:
> %filter_from_provides /libsmbclient.so.0()/d; /libwbclient.so.0()/d
>+%filter_from_requires /libsmbclient.so.0()/d; /libwbclient.so.0()/d
> %filter_setup
> }
> %endif
>@@ -205,7 +226,7 @@
> Summary: Samba libraries
> Group: Applications/System
> %if %with_libwbclient
>-Requires: libwbclient
>+Requires: libwbclient = %{samba_depver}
> %endif
> 
> %description libs
>@@ -284,6 +305,11 @@
> Summary: Samba winbind krb5 locator
> Requires: %{name}-winbind-clients = %{samba_depver}
> Group: Applications/System
>+%if %with_libwbclient
>+Requires: libwbclient = %{samba_depver}
>+%else
>+Requires: %{name}-libs = %{samba_depver}
>+%endif
> 
> Conflicts: samba-winbind-krb5-locator < %{samba_depver}
> Provides: samba-winbind-krb5-locator = %{samba_depver}
>@@ -296,7 +322,7 @@
> Summary: Samba winbind clients
> Group: Applications/System
> %if %with_libwbclient
>-Requires: libwbclient
>+Requires: libwbclient = %{samba_depver}
> %endif
> 
> Conflicts: samba-winbind-clients < %{samba_depver}
>@@ -383,14 +409,6 @@
> %prep
> %setup -q -n samba-%{version}%{pre_release}
> 
>-%patch1 -p1 -b .build_idmap_manpages
>-%patch2 -p1 -b .create_smbldaphelper
>-%patch3 -p1 -b .smbldaphelper_lib
>-%patch4 -p1 -b .smbldaphed_without_ldap
>-%patch5 -p1 -b .smb.conf_manpage
>-%patch6 -p1 -b .smb_man_style
>-%patch7 -p1 -b .fix_panic_action
>-
> %build
> %global _talloc_lib ,talloc,pytalloc,pytalloc-util
> %global _tevent_lib ,tevent,pytevent
>@@ -447,8 +465,8 @@
> 
> %configure \
>         --enable-fhs \
>-        --with-piddir=/run \
>-        --with-sockets-dir=/run/samba \
>+        --with-piddir=%{real_run} \
>+        --with-sockets-dir=%{real_run}/samba \
>         --with-modulesdir=%{_libdir}/samba \
>         --with-pammodulesdir=/%{smb_lib}/security \
>         --with-lockdir=/var/lib/samba \
>@@ -457,6 +475,7 @@
>         --with-shared-modules=%{_samba4_modules} \
>         --builtin-libraries=ccan \
>         --bundled-libraries=%{_samba4_libraries} \
>+        --with-pam \
>         --disable-ntdb \
> %if (! %with_libsmbclient) || (! %with_libwbclient)
>         --private-libraries=%{_samba4_private_libraries} \
>@@ -467,6 +486,9 @@
> %if ! %with_dc
>         --without-ad-dc \
> %endif
>+%if %with_clustering_support
>+        --with-cluster-support \
>+%endif
> %if ! %with_pam_smbpass
>         --without-pam_smbpass
> %endif
>@@ -524,6 +546,8 @@
> install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/security/pam_winbind.conf
> install -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/samba
> 
>+install -m 0744 %{SOURCE90} %{buildroot}%{_bindir}/smbprint
>+
> echo 127.0.0.1 localhost > %{buildroot}%{_sysconfdir}/samba/lmhosts
> 
> install -d -m 0755 %{buildroot}%{_sysconfdir}/openldap/schema
>@@ -532,8 +556,10 @@
> install -d -m 0755 %{buildroot}%{_sysconfdir}/xinetd.d
> install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/swat
> 
>+%if %with_tmpfiles
> install -d -m 0755 %{buildroot}%{_sysconfdir}/tmpfiles.d/
> install -m644 %{SOURCE7} %{buildroot}%{_sysconfdir}/tmpfiles.d/samba.conf
>+%endif
> 
> install -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig
> install -m 0644 packaging/systemd/samba.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/samba
>@@ -548,7 +574,7 @@
> 
> %if 0%{?fedora} > 15 || 0%{?rhel} > 6
> install -d -m 0755 %{buildroot}%{_unitdir}
>-for i in nmb smb winbind ; do
>+for i in nmb smb winbind samba ; do
>     cat packaging/systemd/$i.service | sed -e 's@Type=forking@Type=forking\nEnvironment=KRB5CCNAME=/run/samba/krb5cc_samba@g' >tmp$i.service
>     install -m 0644 tmp$i.service %{buildroot}%{_unitdir}/$i.service
> done
>@@ -556,9 +582,10 @@
> 
> %if 0%{?rhel} == 6
> install -d -m 0755 %{buildroot}%{_initrddir}
>-install -m 0644 %{SOURCE100} %{buildroot}%{_initrddir}/nmb
>-install -m 0644 %{SOURCE101} %{buildroot}%{_initrddir}/smb
>-install -m 0644 %{SOURCE102} %{buildroot}%{_initrddir}/winbind
>+install -m 0755 %{SOURCE100} %{buildroot}%{_initrddir}/nmb
>+install -m 0755 %{SOURCE101} %{buildroot}%{_initrddir}/smb
>+install -m 0755 %{SOURCE102} %{buildroot}%{_initrddir}/winbind
>+install -m 0755 %{SOURCE103} %{buildroot}%{_initrddir}/samba
> %endif
> 
> # winbind krb5 locator
>@@ -665,6 +692,61 @@
> %post dc-libs -p /sbin/ldconfig
> 
> %postun dc-libs -p /sbin/ldconfig
>+
>+%post dc
>+%if 0%{?rhel} == 6
>+/sbin/chkconfig --add samba
>+if [ "$1" -ge "1" ]; then
>+    /sbin/service samba condrestart >/dev/null 2>&1 || :
>+fi
>+exit 0
>+%endif
>+
>+%if 0%{?fedora} == 17
>+if [ $1 -eq 1 ] ; then
>+    # Initial installation
>+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
>+fi
>+%endif
>+
>+%if 0%{?fedora} > 17 || 0%{?rhel} > 6
>+%systemd_post samba.service
>+%endif
>+
>+%preun dc
>+%if 0%{?rhel} == 6
>+if [ $1 = 0 ] ; then
>+    /sbin/service samba stop >/dev/null 2>&1 || :
>+    /sbin/chkconfig --del samba
>+fi
>+exit 0
>+%endif
>+
>+%if 0%{?fedora} == 17
>+if [ $1 -eq 0 ] ; then
>+    # Package removal, not upgrade
>+    /bin/systemctl --no-reload disable samba.service > /dev/null 2>&1 || :
>+    /bin/systemctl stop samba.service > /dev/null 2>&1 || :
>+fi
>+%endif
>+
>+%if 0%{?fedora} > 17 || 0%{?rhel} > 6
>+%systemd_preun samba.service
>+%endif
>+
>+%postun dc
>+%if 0%{?fedora} == 17
>+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
>+if [ $1 -ge 1 ] ; then
>+    # Package upgrade, not uninstall
>+    /bin/systemctl try-restart samba.service >/dev/null 2>&1 || :
>+fi
>+%endif
>+
>+%if 0%{?fedora} > 17 || 0%{?rhel} > 6
>+%systemd_postun_with_restart samba.service
>+%endif
>+
> %endif # with_dc
> 
> %post test -p /sbin/ldconfig
>@@ -942,7 +1024,9 @@
> %files common
> %defattr(-,root,root)
> #%{_libdir}/samba/charset ???
>+%if %with_tmpfiles
> %{_sysconfdir}/tmpfiles.d/samba.conf
>+%endif
> %{_bindir}/net
> %{_bindir}/pdbedit
> %{_bindir}/profiles
>@@ -951,8 +1035,13 @@
> %{_libdir}/libnetapi.so.*
> %{_libdir}/samba/libprinting_migrate.so
> %{_datadir}/samba/codepages
>+%if %{with_runmove}
> %ghost %dir /var/run/samba
> %ghost %dir /var/run/winbindd
>+%else
>+%dir /var/run/samba
>+%dir /var/run/winbindd
>+%endif
> %attr(700,root,root) %dir /var/lib/samba/private
> %attr(755,root,root) %dir %{_sysconfdir}/samba
> %config(noreplace) %{_sysconfdir}/samba/smb.conf
>@@ -985,6 +1074,12 @@
> %{_libdir}/samba/libdsdb-module.so
> 
> %if %with_dc
>+%if 0%{?fedora} > 15 || 0%{?rhel} > 6
>+%{_unitdir}/samba.service
>+%endif
>+%if 0%{?rhel} == 6
>+%{_initrddir}/samba
>+%endif
> %{_bindir}/samba-tool
> %{_sbindir}/samba
> %{_sbindir}/samba_kcc
>@@ -1085,6 +1180,7 @@
> %{_bindir}/smbget
> #%{_bindir}/smbiconv
> %{_bindir}/smbpasswd
>+%{_bindir}/smbprint
> %{_bindir}/smbspool
> %{_bindir}/smbta-util
> %{_bindir}/smbtree
>@@ -1347,7 +1443,6 @@
> %endif # ! with_libsmbclient
> 
> %if ! %with_libwbclient
>-%{_libdir}/samba/libwbclient.so
> %{_includedir}/samba-4.0/wbclient.h
> %endif # ! with_libwbclient
> 
>@@ -1401,6 +1496,27 @@
> %endif # with_libwbclient
> 
> %changelog
>+* Fri Oct 05 2012 Giuseppe Ragusa <giuseppe.ragusa@hotmail.com>- 2:4.0.0-140.3.rc2
>+- Add tweaks from latest (151.rc2) Rawhide samba package:
>+-  Update to 4.0.0rc2.
>+-  Remove upstreamed patches.
>+-  Add pam configure option.
>+-  Fix lib{wb,smb}client support.
>+
>+* Mon Oct 01 2012 Giuseppe Ragusa <giuseppe.ragusa@hotmail.com>- 2:4.0.0-140.2.rc1
>+- Add tweaks from latest (150.rc1) Rawhide samba package:
>+-  Change lib{wb,smb}client as separate packages default to on when building DC.
>+-  Add conditional lib{wb,smb}client dependency for winbind-krb5-locator.
>+-  Package smbprint again.
>+-  Make clustering support explicit and default to on.
>+
>+* Mon Sep 24 2012 Giuseppe Ragusa <giuseppe.ragusa@hotmail.com>- 2:4.0.0-140.1.rc1
>+- Make tmpfiles.d support conditional.
>+- Fix runmove paths.
>+- Fix permissions of SysVinit control scripts
>+- Disable MIT Kerberos when enabling full DC functionalities.
>+- Add initscript/unit and post/preun/postun for full DC functionalities.
>+
> * Tue Sep 18 2012 - Andreas Schneider <asn@redhat.com> - 2:4.0.0-140.rc1
> - Fixed building the manpages.
> - Fixed building passdb and smbldaphelper

Actions: View | Diff

Attachments on bug 862194: 620195 | 620197 | 620198 | 622292 | 629223