Changes

Jump to navigation Jump to search
4,905 bytes added ,  07:22, 23 December 2018
Line 30: Line 30:     
====Initscript packages.====
 
====Initscript packages.====
This is a special case up to SME9 (including). Rebuild by SME every time upstream release a higher version to what we built. We import the new package in CVS and apply our patches. For SME the patch to apply are:
+
This is a special case up to SME9 (including). Rebuild by SME every time upstream release a higher version to what we built. We import the new package in CVS and apply our patches.  
 +
 
 +
so first import new srpm<syntaxhighlight lang="bash">
 +
cd smeserver/rpms/initscripts/sme9
 +
wget http://vault.centos.org/
 +
../../common/cvs-import.sh  -b sme9 -m "import initscript from centOS" initscripts-.....el6.centos.src.rpm
 +
</syntaxhighlight>
 +
 
 +
second restore needed patches<syntaxhighlight lang="bash">
 +
rm -f initscripts-9.03.31-runlevel7.patch initscripts-9.03.40-dmesg.patch initscripts-9.03.40-slapd_alias_ldap.patch initscripts-9.03.46-dont_run_plymouth_if_disabled.patch
 +
cvs update -dPA
 +
 
 +
cvs update -p -r 1.2 initscripts-9.03.31-runlevel7.patch > initscripts-9.03.31-runlevel7.patch
 +
cvs add initscripts-9.03.31-runlevel7.patch
 +
 
 +
cvs update -p -r 1.1  initscripts-9.03.40-dmesg.patch > initscripts-9.03.40-dmesg.patch
 +
cvs add  initscripts-9.03.40-dmesg.patch
 +
 
 +
cvs update -p -r 1.1 initscripts-9.03.40-slapd_alias_ldap.patch > initscripts-9.03.40-slapd_alias_ldap.patch
 +
cvs add  initscripts-9.03.40-slapd_alias_ldap.patch
 +
 
 +
cvs update -p -r 1.1  initscripts-9.03.46-dont_run_plymouth_if_disabled.patch >  initscripts-9.03.46-dont_run_plymouth_if_disabled.patch
 +
cvs add  initscripts-9.03.46-dont_run_plymouth_if_disabled.patch
 +
 
 +
</syntaxhighlight>
 +
 
 +
For SME the patch to add in spec file:
 
  Patch2000: initscripts-9.03.31-runlevel7.patch
 
  Patch2000: initscripts-9.03.31-runlevel7.patch
 
  Patch2001: initscripts-9.03.40-dmesg.patch
 
  Patch2001: initscripts-9.03.40-dmesg.patch
Line 40: Line 66:  
  %patch2002 -p1
 
  %patch2002 -p1
 
  %patch2003 -p1
 
  %patch2003 -p1
then update the changelog, the release version is the same as upstream and we add trailing release number :
+
then update the changelog, <syntaxhighlight>
 +
%changelog
 +
* date your name <email> - version release
 +
- Rebase on upstream ...'''version'''... [SME '''...''']
 +
- Don't try to run plymouth if disabled [SME: 8375]
 +
  Code from Charlie Brady
 +
- Make slapd service an alias for ldap [SME: 8635]
 +
- Add -n 1 to the dmesg line in rc.sysinit to prevent unwanted
 +
  messages appearing on the console [SME: 8277]
 +
- Add hack for running rc7.d script during runlevel 4 [SME: 7217]
 +
</syntaxhighlight>
 +
the release version is the same as upstream and we add trailing release number :
 
  Release: 1%{?dist}.1
 
  Release: 1%{?dist}.1
    
If you are lucky the previous patches will still work, otherwise you will need to manually modify and create new patches.
 
If you are lucky the previous patches will still work, otherwise you will need to manually modify and create new patches.
 +
 +
==== Samba ====
 +
As per SME 10 we build our own version of Samba from upstream in order to enable few functions to allow Samba AD usage. All modifications are done in the spec file.
 +
 +
the changes are the following :<syntaxhighlight lang="bash">
 +
--- samba.spec.original 2016-10-02 16:23:04.356835288 -0700
 +
+++ samba.spec  2016-10-02 16:31:38.311833030 -0700
 +
@@ -38,1 +38,1 @@
 +
-%global with_internal_ldb 0
 +
+%global with_internal_ldb 1
 +
@@ -59,8 +59,8 @@
 +
%global libwbc_alternatives_suffix -64
 +
%endif
 +
 +
-%global with_mitkrb5 1
 +
-%global with_dc 0
 +
+%global with_mitkrb5 0
 +
+%global with_dc 1
 +
 +
%if %{with testsuite}
 +
# The testsuite only works with a full build right now.
 +
@@ -399,2 +399,3 @@
 +
Summary: Samba libraries
 +
Group: Applications/System
 +
+Requires: libldb
 +
@@ -463,7 +464,7 @@
 +
Requires: %{name}-libs = %{samba_depver}
 +
Requires: python-tevent
 +
Requires: python-tdb
 +
-Requires: pyldb
 +
+#Requires: pyldb
 +
Requires: pytalloc
 +
 +
Provides: samba4-python = %{samba_depver}
 +
@@ -864,8 +865,8 @@
 +
%endif
 +
 +
install -d -m 0755 %{buildroot}%{_unitdir}
 +
-for i in nmb smb winbind ; do
 +
-    cat packaging/systemd/$i.service | sed -e 's@\[Service\]@[Service]\nEnvironment=KRB5CCNAME=FILE:/run/samba/krb5cc_samba@g' >tmp$i.service
 +
+for i in nmb smb winbind samba; do
 +
+    cat packaging/systemd/$i.service | sed -e 's@\[Service\]@[Service]\nEnvironment=KRB5CCNAME=/run/samba/krb5cc_samba@g' >tmp$i.service
 +
    install -m 0644 tmp$i.service %{buildroot}%{_unitdir}/$i.service
 +
done
 +
%if %with_clustering_support
 +
@@ -1481,1 +1481,2 @@
 +
%{_mandir}/man8/samba-tool.8*
 +
+%{_unitdir}/samba.service
 +
%else # with_dc
 +
@@ -1738,6 +1743,7 @@
 +
%{_libdir}/samba/libHDB-SAMBA4-samba4.so
 +
%{_libdir}/samba/libasn1-samba4.so.8
 +
%{_libdir}/samba/libasn1-samba4.so.8.0.0
 +
+#%{_libdir}/samba/libdfs_server_ad.so
 +
%{_libdir}/samba/libgssapi-samba4.so.2
 +
%{_libdir}/samba/libgssapi-samba4.so.2.0.0
 +
%{_libdir}/samba/libhcrypto-samba4.so.5
 +
</syntaxhighlight>
 +
 +
here is how to upgrade the rpm from uptream.
 +
 +
<syntaxhighlight lang="bash">
 +
cd /smeserver/rpms/samba/sme10/
 +
make clean
 +
make prep
 +
cvs update -dPA
 +
# here check the last revision of patch and reuse it
 +
cvs status samba.spec.patch
 +
# check the last version of samba and get its link in the following command
 +
wget https://vault.centos.org/...../samba-4.6.2-12.el7_4.src.rpm
 +
common/cvs-import.sh -b sme10 samba-4.6.2-12.el7_4.src.rpm -m "upgrade to samba-4.6.2-12"
 +
cvs update -dPA
 +
make clean
 +
make prep
 +
#update here the correct version of patch, ie 1.3 to something else
 +
cvs update -p -r 1.3 samba.spec.patch > samba.spec.patch
 +
cvs add samba.spec.patch
 +
patch <samba.spec.patch
 +
</syntaxhighlight>if patch fails, you need to update the patch, see bug https://bugs.contribs.org/show_bug.cgi?id=10429 as reference.
 +
 +
Then edit the spec file to add changelog lines and update release, commit and build. Ideally in the changelog paste the elements from previous spec files of SME related work, so we keep track
 +
 +
Also to note there are some upstream related package that should not be updated  (ie, not pushed to smeupdates or smeos) without rebuilding samba locally first :
 +
* libtevent
 +
* python-tevent
 +
also the following are exclude as they are build locally with samba srpm
 +
* samba,samba-client,samba-client-libs,samba-common,samba-common-libs,samba-common-tools,samba-libs,samba*,libsmbclient,libwbclient
    
====Anaconda packages.====
 
====Anaconda packages.====
Line 566: Line 690:     
=== Current SME Server contribs.org Mirror Tree ===
 
=== Current SME Server contribs.org Mirror Tree ===
[[Image:Smeserver_mirrors.png|Current Mirror Tree|600px| ]]<br />
+
[[Image:Smeserver_mirrors.png|600px| ]]<br />
    
this is the current tree of Mirror for SME Server, so we can see what mirrors are affected by issues or outages.
 
this is the current tree of Mirror for SME Server, so we can see what mirrors are affected by issues or outages.
Super Admin, Wiki & Docs Team, Bureaucrats, Interface administrators, Administrators
3,250

edits

Navigation menu