Univention Bugzilla – Bug 33780
Migrate patches for next UCC version
Last modified: 2014-06-12 09:19:54 CEST
All existing patches for UCC 1.0 need to be migrated to UCC 1.1. When merging patches into a new upstream release it should be checked whether alternative means exist; if we patch a central Ubuntu patch we need to re-patch it whenever we synchronise the mirror.
It should also be checked whether some patches are of generic interest to UCS as well. In that case bugs should be filed for UCS.
The following patches have been merged/updated for UCC 2.0: ./univention-debug/3.1-0-0-ucs/6.0.0-1-ucc/010_python_2.6_2.7.patch ./univention-lib/3.1-0-0-ucs/1.0.80-4-ucc/020_fix-ucr-invoke.patch (combined with 021_fix-ucr-invoke.patch) ./univention-lib/3.1-0-0-ucs/1.0.80-4-ucc/010_python_2.6_2.7.patch ./univention-python-heimdal/3.1-0-0-ucs/4.0.3-2.1-ucc/10_python2.7.patch ./univention-policy/3.1-0-0-ucs/5.0.9-4-ucc/012_dso_link_update.patch ./univention-policy/3.1-0-0-ucs/5.0.9-4-ucc/010_python_2.6_2.7.patch ./univention-directory-policy/3.1-0-0-ucs/5.0.5-1-ucc/40-remove-init-script.patch ./ucslint/3.1-0-0-ucs/2.0.23-2-ucc/010_python_2.6_2.7.patch ./univention-config-registry/3.1-0-0-ucs/7.0.33-2-ucc/010_python_2.6_2.7.patch ./univention-directory-listener/3.1-0-0-ucs/7.0.4-2-ucc/01_python2.7.patch ./univention-directory-listener/3.1-0-0-ucs/7.0.4-2-ucc/02_gcc_errors.patch ./univention-directory-listener/3.1-0-0-ucs/7.0.4-2-ucc/03_replace_runit_with_upstart.patch ./univention-base-files/3.1-0-0-ucs/1.0.51-1-ucc/010_python_2.6_2.7.patch ./univention-base-files/3.1-0-0-ucs/1.0.51-1-ucc/015_ucc_dependencies.patch ./univention-base-files/3.1-0-0-ucs/1.0.51-1-ucc/017_ucc_cleanup.patch ./univention-base-files/3.1-0-0-ucs/1.0.51-1-ucc/020_add-support-for-freerdp-mappings.patch ./univention-base-files/3.1-0-0-ucs/1.0.51-1-ucc/025_add-ucr-support-for-ClientAliveInterval-in-sshd-config.patch ./univention-base-files/3.1-0-0-ucs/1.0.51-1-ucc/025_ucc_lsb-release-template-cleanup.patch ./univention-base-files/3.1-0-0-ucs/1.0.51-1-ucc/030_etc-issue-fix-for-ucc.patch ./univention-base-files/3.1-0-0-ucs/1.0.51-1-ucc/035-drop-rdate.patch ./univention-base-files/3.1-0-0-ucs/1.0.51-1-ucc/040-drop-registration-of-domainname-in-resolvconf.patch ./db3/3.1-0-0-ucs/3.2.9+dfsg-0.1-ucc/10_build_depends.patch The following patches are no longer needed: ./univention-directory-policy/3.1-0-0-ucs/5.0.5-1-ucc/30-move-to-join-script-lib.patch -> This was merged in 5.0.6-1 (Bug #28993) ./univention-python/3.1-0-0-ucs/6.0.21-2-ucc/100_bug_30434.patch -> This was merged in 7.0.1-1 (Bug #30436) ./univention-config-registry/3.1-0-0-ucs/7.0.33-2-ucc/030-fix-path.patch -> This was merged in 8.0.4-2 (Bug #28298) ./univention-config-registry/3.1-0-0-ucs/7.0.33-2-ucc/020_add-dep-on-ipaddr.patch -> This was merged in 8.0.7-1 (Bug #28851) ./tre/3.1-0-0-ucs/0.8.0-3-ucc/001_enable_python_bindings.patch -> The only package which needs it is ucslint and the module is for a rather unimportant test, so I've dropped the patch from ucslint which allows us to drop this patch. ./univention-directory-listener/3.1-0-0-ucs/7.0.4-2-ucc/05_join_script.patch -> This was merged in 7.0.5-1 (#28993)
The following patches have been merged/updated for UCC 2.0: ./ntp/3.1-0-0-ucs/1:4.2.6.p3+dfsg-1ubuntu3.1-ucc/010-disable-ifup-script.patch The following patches are no longer needed: ./parted/3.1-0-0-ucs/2.3-8ubuntu5.1-ucc/fix-handling-of-bootable-flags.patch This patch has been included in the Debian upstream package, also see Bug #30706 ./lightdm-gtk-greeter/3.1-0-0-ucs/1.1.5-0ubuntu1.1-ucc/10_bug_28987_set_last_session.patch ./lightdm-gtk-greeter/3.1-0-0-ucs/1.1.5-0ubuntu1.1-ucc/20_bug_29906_change_svg_icons.patch These were temporary patches in early UCC 1.0 development releases, the GTK greeter isn't used in UCC. ./cups/3.1-0-0-ucs/1.5.3-0ubuntu8-ucc-errata/200_disabled-test.patch ./cups/3.1-0-0-ucs/1.5.3-0ubuntu8-ucc-errata/000_rules_control.patch ./cups/3.1-0-0-ucs/1.5.3-0ubuntu8-ucc-errata/100_bug30911-client-reconnect.patch The patch 100_bug30911-client-reconnect.patch in UCC 1.0 was taken from http://www.cups.org/str.php?L4187. This bug has been fixed upstream in 1.7 and UCC 2.0 uses 1.7.1. The other two patches are just build fixes which we don't need as we don't modify cups any longer.
The patches for the Unity greeter are tracked via Bug #34475 The patch for univention-xrdp is tracked via Bug #29893 The following patches are no longer needed: ./kde-workspace/3.1-0-0-ucs/4:4.8.5-0ubuntu0.3-ucc-errata/010_bug31035.patch ./grub2/3.1-0-0-ucs/1.99-21ubuntu3.14-ucc-errata/01_always_noninteractive_postinst_bug31035.patch ./initramfs-tools/3.1-0-0-ucs/0.99ubuntu13.4-ucc-errata/100_bug31015.patch ./lightdm/3.1-0-0-ucs/1.2.3-0ubuntu2.4-ucc-errata/010_bug31035.patch -> These patches were used as additional sideband checks. The actual updater was fixed in an UCC 1.0 erratum, so we don't need these patches any longer ./grub2/3.1-0-0-ucs/1.99-21ubuntu3.14-ucc-errata/05_absolute_path_for_mkfsmsdos_bug31035.patch -> This was a build fix for the change above. Since the change isn't needed any longer, we can drop the build fix as well. ./lxde-common/3.1-0-0-ucs/0.5.0-4ubuntu3-ucc/001_lxde-common-remove-lxterminal.patch -> In UCC 1.0 / Ubuntu Precise lxterminal lacked window decorations and was removed in favour of xterm. Since lxterminal is working fine in Trusty, we don't need to patch it any longer
(In reply to Moritz Muehlenhoff from comment #4) > ./lxde-common/3.1-0-0-ucs/0.5.0-4ubuntu3-ucc/001_lxde-common-remove- > lxterminal.patch > -> In UCC 1.0 / Ubuntu Precise lxterminal lacked window decorations and was > removed in favour of xterm. Since lxterminal is working fine in Trusty, we > don't need to patch it any longer I could still reproduce the bug with an older KVM, so I've reapplied the patch: lxde-common/3.2-0-0-ucs/0.5.0-4ubuntu4-ucc/001_lxde-common-remove-lxterminal.patch
(In reply to Moritz Muehlenhoff from comment #2) > The following patches have been merged/updated for UCC 2.0: > ... > The following patches are no longer needed: > ... QA has been done at Bug 33760 (In reply to Moritz Muehlenhoff from comment #3) > The following patches have been merged/updated for UCC 2.0: OK: ./ntp/3.1-0-0-ucs/1:4.2.6.p3+dfsg-1ubuntu3.1-ucc/010-disable-ifup-script.patch > The following patches are no longer needed: OK: ./parted/3.1-0-0-ucs/2.3-8ubuntu5.1-ucc/fix-handling-of-bootable-flags.patch OK: ./lightdm-gtk-greeter/3.1-0-0-ucs/1.1.5-0ubuntu1.1-ucc/10_bug_28987_set_last_session.patch OK: ./lightdm-gtk-greeter/3.1-0-0-ucs/1.1.5-0ubuntu1.1-ucc/20_bug_29906_change_svg_icons.patch Yes: These were temporary patches in early UCC 1.0 development releases, the GTK greeter isn't used in UCC. OK: ./cups/3.1-0-0-ucs/1.5.3-0ubuntu8-ucc-errata/200_disabled-test.patch OK: ./cups/3.1-0-0-ucs/1.5.3-0ubuntu8-ucc-errata/000_rules_control.patch OK: ./cups/3.1-0-0-ucs/1.5.3-0ubuntu8-ucc-errata/100_bug30911-client-reconnect.patch (In reply to Moritz Muehlenhoff from comment #4) > The following patches are no longer needed: OK: ./kde-workspace/3.1-0-0-ucs/4:4.8.5-0ubuntu0.3-ucc-errata/010_bug31035.patch OK: ./grub2/3.1-0-0-ucs/1.99-21ubuntu3.14-ucc-errata/01_always_noninteractive_postinst_bug31035.patch OK: ./initramfs-tools/3.1-0-0-ucs/0.99ubuntu13.4-ucc-errata/100_bug31015.patch OK: ./lightdm/3.1-0-0-ucs/1.2.3-0ubuntu2.4-ucc-errata/010_bug31035.patch OK: ./grub2/3.1-0-0-ucs/1.99-21ubuntu3.14-ucc-errata/05_absolute_path_for_mkfsmsdos_bug31035.patch (In reply to Moritz Muehlenhoff from comment #5) > (In reply to Moritz Muehlenhoff from comment #4) OK: I could still reproduce the bug with an older KVM, so I've reapplied the patch Verified
UCC 2.0 has been released: http://docs.univention.de/release-notes-ucc-2.0.html If this error occurs again, please use "Clone This Bug".