Bug 51340 - Adapt isc-dhcp patches for ucs 5.0
Adapt isc-dhcp patches for ucs 5.0
Status: CLOSED FIXED
Product: UCS
Classification: Unclassified
Component: DHCP
UCS 5.0
Other Linux
: P5 normal (vote)
: UCS 5.0
Assigned To: Sönke Schwardt-Krummrich
Arvid Requate
:
: 51344 (view as bug list)
Depends on:
Blocks: 53172
  Show dependency treegraph
 
Reported: 2020-05-20 11:45 CEST by Florian Best
Modified: 2021-05-25 16:03 CEST (History)
2 users (show)

See Also:
What kind of report is it?: Development Internal
What type of bug is this?: ---
Who will be affected by this bug?: ---
How will those affected feel about the bug?: ---
User Pain:
Enterprise Customer affected?:
School Customer affected?:
ISV affected?:
Waiting Support:
Flags outvoted (downgraded) after PO Review:
Ticket number:
Bug group (optional):
Max CVSS v3 score:


Attachments
isc-release-notes-4.3.5-4.4.1.txt (28.02 KB, text/plain)
2020-05-28 17:23 CEST, Arvid Requate
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Florian Best univentionstaff 2020-05-20 11:45:46 CEST
The patches for isc-dhcp needs to be merged to UCS 5.0
Comment 1 Sönke Schwardt-Krummrich univentionstaff 2020-05-22 12:12:45 CEST

*** This bug has been marked as a duplicate of bug 51344 ***
Comment 2 Sönke Schwardt-Krummrich univentionstaff 2020-05-22 12:20:18 CEST
*** Bug 51344 has been marked as a duplicate of this bug. ***
Comment 3 Sönke Schwardt-Krummrich univentionstaff 2020-05-22 12:21:24 CEST
(In reply to Sönke Schwardt-Krummrich from comment #1)
> *** This bug has been marked as a duplicate of bug 51344 ***

(In reply to Sönke Schwardt-Krummrich from comment #2)
> *** Bug 51344 has been marked as a duplicate of this bug. ***

Florian already made some commits in parallel → REOPEN this bug.
Comment 4 Sönke Schwardt-Krummrich univentionstaff 2020-05-22 13:02:27 CEST
$ svn log svn+ssh://svn.knut.univention.de/var/svn/patches/isc-dhcp/5.0-0-0-ucs/4.4.1-2 | grep ^r
r18879 | sschwardt | 2020-05-22 12:36:07 +0200 (Fr, 22. Mai 2020) | 1 Zeile
r18876 | fbest | 2020-05-20 12:14:58 +0200 (Mi, 20. Mai 2020) | 1 Zeile
r18875 | fbest | 2020-05-20 11:47:49 +0200 (Mi, 20. Mai 2020) | 1 Zeile
Comment 5 Sönke Schwardt-Krummrich univentionstaff 2020-05-26 21:19:57 CEST
r18896 | sschwardt | 2020-05-26 20:57:35 +0200 (Di, 26. Mai 2020) | 4 Zeilen
r18883 | sschwardt | 2020-05-26 16:58:58 +0200 (Di, 26. Mai 2020) | 22 Zeilen

The patch 12_ppc.quilt is not required. See also
https://git.knut.univention.de/univention/ucs/-/commit/7a7bca42f7a186e2c408f32bc2eea189266212ef

The patch 22_scripts_linux.quilt has been renamed and adapted to 
22_scripts_linux.patch since the shell script is now used from the /debian/ directory.
Comment 6 Arvid Requate univentionstaff 2020-05-28 17:21:45 CEST
Verified:

* All existing patches considered: Ok
* Patch adjustments: Ok
* Could have merged 21_dhclient-script-bash.patch & 22_scripts_linux.patch
  but it's ok for me
* Upstream changelog changes don't show severe changes in config options
  https://ftp.isc.org/isc/dhcp/4.4.1/dhcp-4.4.1-RELNOTES

* Package update UCS 4.4-4 -> 5.0-0: Ok
* Basic functional test: Ok:

root@master10:~# /usr/sbin/dhcpd -t
Internet Systems Consortium DHCP Server 4.4.1
Copyright 2004-2018 Internet Systems Consortium.
All rights reserved.
For info, please visit https://www.isc.org/software/dhcp/
Config file: /etc/dhcp/dhcpd.conf
Database file: /var/lib/dhcp/dhcpd.leases
PID file: /var/run/dhcpd.pid

root@master10:~# /usr/sbin/dhcpd -q -f
root@master10:~# ps ax | grep dhcp
 4360 ?        Ss     0:00 runsv univention-dhcp
 5005 ?        S      0:00 /usr/sbin/dhcpd -q -f
 5018 pts/0    S+     0:00 grep dhcp

root@master10:~# cat /var/log/dhcp-ldap-startup.log 
#DHCP Service
 subnet 10.200.8.0 netmask 255.255.255.0 {
option routers 10.200.8.1;
option domain-name "ar41i1.qa";
option domain-name-servers 10.200.8.10;
}

root@master10:~# netstat -tanp | grep dhcpd
tcp        0      0 10.200.8.10:40220       10.200.8.10:7389        VERBUNDEN   5005/dhcpd

syslog shows it's listening:
Mar 12 14:53:07 master10 dhcpd[5005]: DHCPREQUEST for 169.254.25.189 from 52:54:00:f6:b9:eb via eth0: unknown lease 169.254.25.189.
Comment 7 Arvid Requate univentionstaff 2020-05-28 17:23:27 CEST
Created attachment 10376 [details]
isc-release-notes-4.3.5-4.4.1.txt

For reference this is the elevant section of the upstream release notes.
Comment 8 Florian Best univentionstaff 2021-05-25 16:03:32 CEST
UCS 5.0 has been released:
 https://docs.software-univention.de/release-notes-5.0-0-en.html
 https://docs.software-univention.de/release-notes-5.0-0-de.html

If this error occurs again, please use "Clone This Bug".