The process (as I see it)
The first goal of this sub-project is to determine how to merge the contribs.org packages changes with the Mitel devel packages changes.
Package fork identification and resolution
- DONE: Identify packages which differ between Mitel 6.0 unsupported and contribs.org 6.0.1
- DONE: Determine patch set from 6.0 -> 6.0.1
- Remove white-space noise from patches
- Separate patches into bugs and branding, splitting patches as required
- Work out how to apply branding changes without forking packages
Going forward
- DONE: Identify packages which differ between Mitel 6.0 unsupported and current Mitel devel package set
- DONE: Identify packages which differ between Mitel 6.0 unsupported and the latest Mitel updates (6.0 update 6)
- Identify packages modified due to reports in contribs.org bug tracker
- Determine whether bug patches have been picked up in Mitel devel packages
- Apply any missing contribs.org bug patches to Mitel devel packages, naming resulting package with 'contribs' release tag.
- Identify other bug-fix packages not released by Mitel or tracked by contribs.org bug tracker
Packages which differ between Mitel 6.0 unsupported and contribs.org 6.0.1
These are the contribs.org package numbers:
anaconda-7.3-7es116.src.rpm e-smith-base-4.14.1-16.src.rpm e-smith-email-4.14.0-07.src.rpm e-smith-formmagick-1.2.2-02.src.rpm e-smith-horde-1.10.0-02.src.rpm e-smith-hosts-1.12.0-02.src.rpm e-smith-ldap-4.10.0-03.src.rpm e-smith-lib-1.14.0-09.src.rpm e-smith-lilo-1.12.0-04.src.rpm e-smith-LPRng-1.11.0-06ewf.src.rpm e-smith-manager-1.10.0-02.src.rpm e-smith-mysql-1.10.0-02.src.rpm e-smith-release-6.0.1-01.src.rpm e-smith-support-1.4.4-04.src.rpm initscripts-6.67-1es25.src.rpm samba-2.2.8a-2cb.src.rpm
File differences in those packages
The SRPMS, package version lists and patches are here:
http://www.contribs.org/contribs/gordonr/contribs.org/6.0to6.0.1/
anaconda-7.3-7es116.contribs_patch e-smith-base-4.14.1-12.contribs_patch e-smith-base-4.14.1-13.contribs_patch e-smith-base-4.14.1-14.contribs_patch e-smith-base-4.14.1-15.contribs_patch e-smith-base-4.14.1-16.contribs_patch e-smith-email-4.14.0-07.contribs_patch e-smith-horde-1.10.0-02.mitel_patch e-smith-hosts-1.12.0-02.contribs_patch e-smith-ldap-4.10.0-03.contribs_patch e-smith-lib-1.14.0-08.contribs_patch e-smith-lib-1.14.0-09.contribs_patch e-smith-lilo-1.12.0-02.contribs_patch e-smith-lilo-1.12.0-03.contribs_patch e-smith-lilo-1.12.0-04.contribs_patch e-smith-LPRng-1.11.0-06.ewf_patch e-smith-manager-1.10.0-02.contribs_patch e-smith-mysql-1.10.0-02.mitel_patch e-smith-release.spec_contribs_patch e-smith-support-1.4.4-02.contribs_patch e-smith-support-1.4.4-03.contribs_patch e-smith-support-1.4.4-04.hpe_patch initscripts-6.67-1es25.contribs_patch samba-2.2.8a-deletebug.patch
e-smith-formmagick had its tarball rebuilt to pick up new icons, which are also in the PATCHES directory:
[gordonr@banana]$ diff -rNu e-smith-formmagick-1.2.2-0{1,2}
Binary files e-smith-formmagick-1.2.2-01/root/etc/e-smith/web/common/checkmark.jpg and e-smith-formmagick-1.2.2-02/root/etc/e-smith/web/common/checkmark.jpg differ
Binary files e-smith-formmagick-1.2.2-01/root/etc/e-smith/web/common/tickmark.jpg and e-smith-formmagick-1.2.2-02/root/etc/e-smith/web/common/tickmark.jpg differ
Packages updated in 6.0update6
SMEServer-6.0_Update6-11.src.rpm dovecot-0.99.10-01es2.src.rpm e-smith-LPRng-1.12.0-04.src.rpm e-smith-apache-1.0.1-01.src.rpm e-smith-apache-proxy-1.0.0-02.src.rpm e-smith-backup-1.12.1-02.src.rpm e-smith-base-4.14.1-15.src.rpm e-smith-daemontools-1.6.1-02.src.rpm e-smith-domains-1.2.0-01.src.rpm e-smith-email-4.14.0-11.src.rpm e-smith-formmagick-1.2.2-02.src.rpm e-smith-horde-1.10.0-02.src.rpm e-smith-ibays-1.0.3-06.src.rpm e-smith-imap-1.2.0-03.src.rpm e-smith-imp-1.10.0-02.src.rpm e-smith-ldap-4.10.0-02.src.rpm e-smith-lib-1.14.0-07.src.rpm e-smith-mailfront-1.4.0-01.src.rpm e-smith-mysql-1.10.0-02.src.rpm e-smith-netatalk-1.12.0-03.src.rpm e-smith-openssh-1.10.1-01.src.rpm e-smith-packetfilter-1.14.0-03.src.rpm e-smith-portforwarding-0.2.0-02.src.rpm e-smith-pptpd-1.10.0-02.src.rpm e-smith-proftpd-1.10.0-04.src.rpm e-smith-proxy-4.12.0-02.src.rpm e-smith-qmail-1.8.0-04.src.rpm e-smith-qmailanalog-1.10.0-01.src.rpm e-smith-quota-1.8.0-01.src.rpm e-smith-regedit-1.4.0-01.src.rpm e-smith-release-6.0-11.src.rpm e-smith-samba-1.12.0-02.src.rpm e-smith-spamassassin-1.0.0-01.src.rpm e-smith-starterwebsite-0.2.0-01.src.rpm e-smith-telnet-1.6.0-02.src.rpm e-smith-turba-1.4.0-01.src.rpm e-smith-viewlogfiles-1.6.0-02.src.rpm iptraf-2.5.0-3.src.rpm mod_ssl-2.8.12-3.src.rpm openssh-3.7.1p1-1es4.src.rpm openssl-0.9.6b-35.7es1.src.rpm perl-CGI-3.00-3.src.rpm perl-CGI-FormMagick-0.89-09.src.rpm php-4.1.2-7.3.6es1.src.rpm pine-4.44-19.73.0.src.rpm proftpd-1.2.9-es3.src.rpm unzip-5.50-11.src.rpm
Packages updated by both contribs.org 6.0.1 and mitel devel releases
Merges/fork resolution will be required in these packages:
[gordonr@banana]$ diff -u contribs devel --- contribs Sat Jul 3 06:26:33 2004 +++ devel Sat Jul 3 06:29:18 2004 @@ -1,15 +1,10 @@ -e-smith-base-4.14.1-16.src.rpm -e-smith-email-4.14.0-07.src.rpm -e-smith-formmagick-1.2.2-02.src.rpm -e-smith-horde-1.10.0-02.src.rpm -e-smith-hosts-1.12.0-02.src.rpm -e-smith-ldap-4.10.0-03.src.rpm -e-smith-lib-1.14.0-09.src.rpm -e-smith-lilo-1.12.0-04.src.rpm -e-smith-LPRng-1.11.0-06ewf.src.rpm -e-smith-manager-1.10.0-02.src.rpm -e-smith-mysql-1.10.0-02.src.rpm -e-smith-release-6.0.1-01.src.rpm -e-smith-support-1.4.4-04.src.rpm -initscripts-6.67-1es25.src.rpm -samba-2.2.8a-2cb.src.rpm +e-smith-base-4.15.1-02.src.rpm +e-smith-email-4.15.1-06.src.rpm +e-smith-formmagick-1.3.0-03.src.rpm +e-smith-horde-1.11.0-01.src.rpm +e-smith-hosts-1.13.0-02.src.rpm +e-smith-ldap-4.11.1-01.src.rpm +e-smith-lib-1.15.1-01.src.rpm +e-smith-LPRng-1.13.0-01.src.rpm +e-smith-mysql-1.11.0-09.src.rpm +initscripts-6.67-1es26.src.rpm