[git.ipfire.org] IPFire 2.x development tree branch, core121, created. fd9a531f716312b2bdab35f92c6aad5add21d563
by gitï¼ ipfire.org 06 Jun '18
by gitï¼ ipfire.org 06 Jun '18
06 Jun '18
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, core121 has been created
at fd9a531f716312b2bdab35f92c6aad5add21d563 (commit)
- Log -----------------------------------------------------------------
commit fd9a531f716312b2bdab35f92c6aad5add21d563
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jun 6 14:01:43 2018 +0100
Bump version to 2.21
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 05b2d72588aa0ae8d1a1b521788912f0b1702b47
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jun 6 14:01:18 2018 +0100
core121: Create updater
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c22976907e44d682c916bed600dcd396907c2254
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Jun 1 18:40:07 2018 +0200
tar: Update to 1.30 (V3)
For details see:
https://www.gnu.org/software/tar/
Since new 'tar' has changes in commandline option parsing,
it was necessary to adjust 'lfs/Config, 'lfs/cdrom' and
'lfs/core-updates' (thanks to Marcel for diffs and Michael for
corrections).
I have tried to make only the most necessary changes.
As always, please check.
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 779706b5f8f0025690dec3f8bf32f32deb9f7e05
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Jun 6 14:52:55 2018 +0200
flash-image: increase boot partition to match with iso install
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a4923c7f7534ee5037fad44ca0dad2ef1456194e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Jun 6 11:28:11 2018 +0200
Config: follow symlinks at rootfile check
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit c03e8bd6ef18c138b33b1eeadc95b397054ac76e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Jun 6 07:26:55 2018 +0200
kernel: update to 4.14.48
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 3da7324a721be7bc8f76e8b17068c18aeeae6bdd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Jun 4 20:32:26 2018 +0100
aarch64: Rootfile update for Python 3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5bb288a244156c95a61cdf2f3b416061c867bf26
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Jun 1 19:54:29 2018 +0200
dhcp: Update to 4.4.1
For details see:
https://kb.isc.org/article/AA-01571/82/DHCP-4.4.1-Release-Notes.html
This should close https://bugzilla.ipfire.org/show_bug.cgi?id=11697 and
https://bugzilla.ipfire.org/show_bug.cgi?id=11293.
This update required some changes as described in:
https://bugzilla.ipfire.org/show_bug.cgi?id=11697#c6
Thanks to all testers! ;-)
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d7ce23e5deccf3fbe56c44ff4c29817c03166c76
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Jun 4 12:15:26 2018 +0100
aarch64: Fix rootfile for Python
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit acb41000189b667324ab601f30a97f506c461f72
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu May 31 14:21:19 2018 +0200
cpufrequtils: fix version numbers
I had incremented the VER instead of PAK_VER
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit e91d99c8eb934ba6f657952d9a867e6d5d7b16da
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed May 30 23:55:29 2018 +0100
Import rootfiles for aarch64
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4fa8f6a47d6fd99a67d43f64d1d02b4586c6e3a1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 29 17:21:38 2018 +0000
icinga: FTBFS on aarch64
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 938950626471c909ce2f0b70e24fec2c1b58aa8c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 28 12:59:39 2018 +0000
nagios-plugins: FTBFS on aarch64
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 40a97bf22c5d71d2eea3e58f8591d2d8544a2a3e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 28 12:59:16 2018 +0000
net-snmp: FTBFS on aarch64
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit cb1b213c5ccd2bc957b191a1eea50967ced7f4f7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun May 27 13:10:03 2018 +0000
elinks: FTBFS on aarch64
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ec690829085358a1318e8567214ff8a4fc35568e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed May 24 13:16:57 2017 +0200
sdl: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a649b64547c0415d3ec8b9648458b9f8fa03f52b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 20 11:20:27 2017 +0200
flash-image: Install files for armv5tel only on armv5tel
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7a32f5402912243a1b589164c4b83e4446c47b03
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri May 19 10:46:46 2017 +0200
pcre-compat: Enable package for aarch64
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4c900774dd5dce8d832db9128e9bafce440c0660
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed May 17 23:02:50 2017 +0200
ntfs-3g: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 63db818aa6f27baf80f2b41c837ea3100a28dded
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed May 17 22:58:29 2017 +0200
libmpdclient: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3850e662ef6aecf483199135fe27dbb680e34daf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 6 10:46:54 2017 +0200
freeradius: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9069a2d075927057090c0d82ac1ebbcecbbe8f66
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 6 10:36:02 2017 +0200
bird: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3e290220939cc70bb65e6a6b3c4adf50a5531e4a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 6 10:28:20 2017 +0200
bacula: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 37dee1d94be803796a67a6fff0711cb3145c6362
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 6 10:19:02 2017 +0200
taglib: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 60bd29575add7a31387192b8ec05aa9dbe576793
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 6 10:18:44 2017 +0200
swig: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d4aea34da822ba5856d4fe2ef0164107fb6ed60d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 6 10:18:14 2017 +0200
squidclamav: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 70422bdc41ddc37be293ba2ba737cea590af1be2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 6 10:17:27 2017 +0200
streamripper: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e270efadd5d3495b41479c4ae16a429d8667d985
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 6 10:17:02 2017 +0200
sarg: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9aeb179adf33149cd94486ef6d03f7c92c10eeb7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 6 10:16:41 2017 +0200
wavemon: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0ee3cb9dcd646c20b61a8a69b50398b70c8e704d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 6 10:15:51 2017 +0200
xinetd: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9f91a5543a281070d9cf278ae699419b3a179335
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 6 10:15:10 2017 +0200
minicom: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 68c68589d9d2986e9a885a95bd40f7e612d0fa83
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 6 10:14:44 2017 +0200
strace: Does not support aarch64, yet
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2d28043100aa8fb1397bbfa4cb2b515d78fb2dc5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 6 10:14:16 2017 +0200
ltrace: Does not support aarch64, yet
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3b793cb154441d5d544380e2be79a5715e36d41e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 6 10:12:48 2017 +0200
librstp: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5a4fa0708a13ddeb1d64a01d5aa2a45e052e1772
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 6 10:12:16 2017 +0200
libstatgrab: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c1ebd7faf3dd0bde299d56a6dd37630196389f0a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 6 10:10:35 2017 +0200
lcd4linux: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a6ffbed405b4776a60164b25a450ea7d39d224f9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 6 10:09:57 2017 +0200
joe: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2f6c9d93a3242fd648383c191ccb8d02271e89f7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri May 5 13:31:56 2017 +0200
icegenerator: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c7feec36b76613c857a6359638889f9e3f0897f7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri May 5 13:30:56 2017 +0200
icecast: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 42052c37e5683ee5141c925294a9219dee98d4ea
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri May 5 13:30:36 2017 +0200
gutenprint: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 483ba6a1a2fe5ae31e306693d4026616c2813a36
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri May 5 13:29:28 2017 +0200
bluetooth: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8529be58bd36aab3295b4284250c2b1229e08df3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed May 3 18:32:41 2017 +0200
faad2: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit af7420640af848f363b79f3fdb91b86acb0c057d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 2 13:26:45 2017 +0200
nagios_nrpe: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d15391b0a64bfd9dbf7365f2bb56de10587874b8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 2 13:24:19 2017 +0200
igmpproxy: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1e819b4f8d3986d15316687fc2d949ab64463465
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 1 23:51:16 2017 +0200
liboping: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0ae5ac68813be815f33f18e1b834ee6a6ab57faa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 1 23:20:14 2017 +0200
gnu-netcat: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit af66da9327a17be3ccef3ce071df5244cfe6b520
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 1 23:19:09 2017 +0200
nfs: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2c77896a8939a83b1ca28617ce719000482a3770
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 1 17:23:50 2017 +0200
libmpeg2: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit de4c620c44f60bee5805a2fe96b0656b74c4ff08
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 1 17:22:56 2017 +0200
xvid: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ef5489e4f530f0f5fc1c77847159ed1ab6e33784
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 1 17:22:34 2017 +0200
libshout: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c335a18c30b92a719ab12c31c236bb72d3ececbb
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 1 17:22:18 2017 +0200
sox: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e2512fd858b5d52743b856eba84587d97b5cb7d8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 1 17:20:08 2017 +0200
lame: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f7881486df64d953c3055eb2f9069511ef235825
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 1 16:32:13 2017 +0200
samba: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9eaf776c18b0497116b4504ee80e26ca2663e5ca
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 1 16:31:53 2017 +0200
libvorbis: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 85988f4ef277843e329c65d10bc351b697aa37da
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 1 16:31:33 2017 +0200
libogg: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4d28d719e9c300e8121d0bce23aa887cc5e284b2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 1 16:30:54 2017 +0200
libmad: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 854d84f1d799aedf224ba3e14b20b09d59f2592b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 1 16:30:35 2017 +0200
libid3tag: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7225318466ddbde3729213c07acc4e639afc189a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Apr 30 13:25:52 2017 +0200
hplip: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1efe603a9aea5cd06e0edb5f559ded430a576b1d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Apr 30 13:25:30 2017 +0200
epson-inkjet-printer-escpr: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b6cc31d2f9bb1c178cd88ed5e5098e04dd8b576b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Apr 30 12:58:13 2017 +0200
libdaemon: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ee44ada7a3c0c790482c81e990c0ace92b81a609
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 28 14:36:54 2017 +0200
spandsp: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3d7653facf3addf2333fad37ce78bd46e422b838
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 28 13:53:13 2017 +0200
libdnet: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3c33865a79a92cdfdc256a6e2e1e0d78cec013a6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 28 13:10:08 2017 +0200
glib: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5ad56f16e4acee677f98bf0ec5863e8a5f189233
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 28 13:09:46 2017 +0200
libupnp: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4b72d12b7ccc00f180ca7dc524bd86749e04605e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 28 13:08:20 2017 +0200
sysfsutils: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 98464119bdae3b000e3304dc81fc984c259b635b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Apr 28 13:07:02 2017 +0200
mtools: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e8a0e7149b09115511d1abfeb02a90302aa1412d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 27 12:38:39 2017 +0200
dvdrtools: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fdde9db00d1ebb947e1c419b050901c604262caa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 27 12:12:25 2017 +0200
openldap: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c623cd76269ffa8ed346b52132327c2074e91288
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 27 12:04:39 2017 +0200
cyrus-sasl: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit abb65e20b64bfc0a1a0b6b8c3fa78253fe0f1957
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 26 16:33:00 2017 +0200
libxslt: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c570238547492e61de656ec4fe9b2d92f7560464
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 26 16:23:12 2017 +0200
popt: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit cb8c02413e728376b352839855c8a83153b9c7dc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 26 16:22:26 2017 +0200
gd: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8de264d2be7e6e893b695b26eb30ec368b5682fc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 26 16:17:32 2017 +0200
libtiff: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 82e736d506c4a47eacc1831fbaa42971e989d29b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 26 16:17:14 2017 +0200
libart: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6b1767cf50dd222cd7b37302b365ac0ff08a1199
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 26 16:16:51 2017 +0200
libjpeg-compat: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f059309fdef1235a7194ff92cdea49a8a3633804
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 26 16:16:28 2017 +0200
libexif: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit abd5ca8c263c2686223e14a4215babefcfc1af42
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 26 15:58:14 2017 +0200
libnet: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 72665fb0da4d14221d1aa64a6121a4f53389a132
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 26 12:37:23 2017 +0200
gdbm: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7706891c97516ab81ea276c5e6fef9a14140b763
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Apr 26 12:37:01 2017 +0200
linux-atm: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8e42e20423b6695af46b6437154ed1707a9d8c0e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 25 12:23:18 2017 +0200
libevent: FTBFS on aarch64
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 388d459cb30012d7ae86d9f24100b7de46e24719
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 25 11:43:11 2017 +0200
multipath-tools: Update to 0.7.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2f5b2ec75b6ec5c9e8a2fec6570d7bb24cc1f29f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 25 11:29:49 2017 +0200
lvm2: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 63d8d717f30d88aed6faa712936bfef0a7b7680a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 25 11:07:05 2017 +0200
psmisc: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5928e9f3a0baa074e83266d3a1c7a0315347fb68
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 25 11:06:43 2017 +0200
man: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit aebecaf515fccc32166bf81bffbee5c46c210a75
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 25 11:06:29 2017 +0200
jwhois: FTBFS on aarch64
Needed automake update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8d7014a2e82b1ba3c1d4e1b894cb1389b898ee05
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu May 18 20:26:31 2017 +0200
readline-compat: Enable package to build on aarch64
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7d2b0e1700fe529cedf08e544984bcba1b6a92ef
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 24 16:23:34 2017 +0200
ncurses-compat: FTBFS on aarch64
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit be5a22bf095c5cd2b23694218983fd619a2cdce2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 24 15:57:06 2017 +0200
berkeley: Update automake scripts for build on aarch64
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0d1df90f70d1768ebe54c29fba82df8bfc94bc80
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 24 15:56:12 2017 +0200
Config: Add macro to update automake scripts on aarch64
Some packages ship an older version which does not recognise
aarch64. To overcome this, we just update these scripts when
necessary.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 902159ad8dbd6bc04af650873ad5ba60a25d7da5
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu May 31 07:16:59 2018 +0200
kernel: update to 4.14.47
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d96d00e9e9619d77ac3e7600d3e734f5e98bef11
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu May 31 07:05:37 2018 +0200
intel-microcode: use symlink for i586 rootfile
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2027c75ff34b504aaf220a21f92153261fcfc182
Merge: 6cc7c2a3d 87b5f3711
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu May 31 07:01:55 2018 +0200
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
commit 6cc7c2a3d0f000f37f57bdb76cdd156c08b07c6d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed May 30 11:30:01 2018 +0200
collectd: move cpufreq plugin init because arm has no cpufrequtils
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 87b5f3711ba2e166a61fd521f7819f20e7f9eb14
Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Date: Mon May 28 18:28:15 2018 +0100
Add Intel microcode updates
Fixes: #11590
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5e1f3a9cbca4b09f8713cee8061fcfc98ee07e7d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun May 27 19:37:37 2018 +0200
Revert "tar: Update to 1.30"
new tar has changes in commandline option parsing,
this break cdrom build
This reverts commit e77b4e79a998d48e1fd98630a04e7daca916e3f7.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 5b4f22798c18a8637f3985c01647dc3de0e6b899
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun May 27 19:14:50 2018 +0200
xz: fix rootfile
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 386b0268c0e6b0d60c58b4ce3bba902f5c0ba2df
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun May 27 19:02:47 2018 +0200
xz: update rootfile
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit fc6df72e6ea9b1f93fa05af5029ce9b649624702
Merge: c256f0160 7039d8ae9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun May 27 16:07:07 2018 +0200
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
commit c256f0160822324c20ddb87d82a8bdfe1ec98e50
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun May 27 16:06:25 2018 +0200
kernel: update to 4.14.44
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 7039d8ae91ee7cca211e4a6be8cf9012c97d4a5d
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat May 26 18:18:22 2018 +0200
xz: Update to 5.2.4
For details see:
https://git.tukaani.org/?p=xz.git;a=blob;f=NEWS;hb=HEAD
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e77b4e79a998d48e1fd98630a04e7daca916e3f7
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat May 26 18:15:02 2018 +0200
tar: Update to 1.30
For details see:
https://www.gnu.org/software/tar/
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 65a736981bf12eb235f0286de6c942d6660b5875
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri May 25 18:36:37 2018 +0100
Don't compress packages three times. Once is enough.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b46f951e8a9026bb499334cb99f08beaa948e2b1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri May 25 13:17:20 2018 +0000
make.sh: Compress toolchain in the same way we compress everything else
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6c9651f6208db27d0daad7a822c9a511e509fc9c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu May 24 07:39:36 2018 +0200
kernel: update to 4.14.43
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 04d63eb482dcff767aaefe6d9cffc50d9ab05b87
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed May 23 19:33:12 2018 +0200
gitignore: add img.xz to ignore list
commit 6b4174133a4cad58db3570d1cd1a16b243d4da84
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed May 23 12:09:07 2018 +0100
make.sh: There are no tar.gz images to copy out of the chroot environment
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 92244a40d898f7a885aeeb875786d23cf94175d6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed May 23 12:08:23 2018 +0100
make.sh: Generate checksum files for XZ compressed images
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 212f17c1145bb6978b4797eb9c805f603ecb1f29
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed May 23 12:03:06 2018 +0100
make.sh: Refactor XZ compression parameters again
I completely ruined this now and therefore I had to make
it new again:
* I split the parameters into smaller chunks now and added
comments about why we have chosen those.
* I move it all to configure_build() since we do not need
to check if the host architecture is 64 bit capable, but
the architecture we are building for.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 30a42c6df9e7db23cf5f202d749747967fbcbf55
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 22 21:31:24 2018 +0100
make.sh: Remove check for minimum host memory
This won't build on the ARM builders any more
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f03e254f39ddb7cacea7a39ec6b98dce77018b0d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 22 20:46:25 2018 +0100
make.sh: Let XZ determine how many cores it wants to use
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a92fb74d1aeb9229044c1a9fbc54abafca50da58
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 22 20:46:03 2018 +0100
make.sh: Limit XZ memory to 2GB on 32 bit systems
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f7585bc7ecf81e172ff18c04fece3e4f3227cf2c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 22 20:40:29 2018 +0100
joe: Bump package because of ncurses update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0bd7b7313293c127cf4782d5434273a5f3559566
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 22 20:38:47 2018 +0100
hostapd: Fix detection of wireless devices with kernel 4.14
Fixes #11738
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9b656e7f40a3e0082681a63d2a2c0d4eea885906
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 22 20:31:12 2018 +0100
entropy: Don't show message for HWRNGs any more
We cannot reliably detect this with the new kernel
and therefore cannot show this.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ab91dde24b512f7a6067937803946a10750b1ed6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 22 20:25:03 2018 +0100
rngd: Always start the daemon
We cannot reliably detect in this script any more if the
system has an actual HWRNG (/dev/hwrng always exists).
Therefore we always start the daemon now and let it
deal with what ever comes.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 90940aded5b7e233fadaae8bad8efbdfe383ce6c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 22 20:23:42 2018 +0100
rngd: Update to version 6.2
Fixes #11737
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c577571e2a6b623f7027d97d3ea523db663c68fa
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 22 20:07:59 2018 +0100
installer: Drop /var partition
Fixes #11735
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c8453e87599fe66f4d18d901bc9dc431306afa2d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 21 20:58:36 2018 +0100
make.sh: Use all processor cores for compression
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5852ad2db76bd25107280d6b0b04f4eee797bd9b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 21 20:56:58 2018 +0100
make.sh: Use exiterror to end script safely
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2eba1dc954ad479231ebeb51d4f32c52597407f7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 21 20:56:08 2018 +0100
make.sh: Remove some empty lines
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0054a52bd818fc1ef33684b8b8a8decd60fe4cee
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 21 20:54:09 2018 +0100
tar seems to ignore the XZ_OPT variable sometimes
This caused that the xz command was called without any
extra arguments. This will now create the tar archive
first and then pass the archive through xz with our
command line switches.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b302b9a695e391477eab0cb2343f3ba1b1ba1989
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon May 21 20:53:49 2018 +0100
Compress flash-images as XZ as well
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 27267889aa791b5c4683f62fe823ab96fb42fe8a
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Mon May 21 16:19:48 2018 +0200
xz: Performance and compression tuning (V2) - fine tuning
Changes since V1:
- Tuned some more 'tar'-command lines
- Included 'lfs/core-updates'
- Some fine-tuning
Hi,
Current results with V2 (clean builds):
'next':
'packages' => 255 MB
'ipfire-2.19.2gb-ext4.i586-full-core121.img.gz => 319 MB
'ipfire-2.19.i586-full-core121.iso' => 218 MB
Total => 792 MB
'xz-tuning':
'packages' => 228 MB
'ipfire-2.19.2gb-ext4.i586-full-core121.img.gz' => 318 MB
'ipfire-2.19.i586-full-core121.iso' => 207 MB
Total => 753 MB (-39 MB)
It would be nice if someone could review and test these. ;-)
If necessary, I can upload a complete patch.
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0d7a6f03d43994265a5c3a1d58be69ceecec9275
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun May 20 09:30:23 2018 +0200
xz: Performance and compression tuning (V1)
Hi,
as mentioned in the "list", we're trying to make the archives as small as possible
using 'xz'-compression.
In order to achieve this, this patch tests the size of the memory available on the
host system.
It sets the xz-memory-limit (--memory=[N]Mib) to 70% of the available working memory,
a maximum of four xz-'worker threads' (-T4) and a compression rate of '-8' (-8).
These options are written to the 'XZ_OPT=' environment.
For details see:
https://linux.die.net/man/1/xz
I have set the number of available xz-'worker threads' (-T) to four (-T4), because during
the final tests the '-T0' parameter led to error messages snd stopped: 'cannot allocate memory'.
It wouldn't even run with 90%.
Furthermore, testing with '-T0' led to countless messages filling up '_build.packages.log'.
E.g.:
...
xz: Adjusted the number of threads from 8 to 2 to not exceed the memory usage
limit of 1557 MiB
...
Tests took place on a 32bit-Ubuntu 16.04.4-system with 8 GB RAM and an Intel I7-2600.
Build time was about 04:30 hrs. Perhaps a 64bit-system would perform better (higher
values), but my goal was to make this run on as many systems as possible, so I choosed
these averages.
If minimum requirements (1024 MB RAM) are not met, building stops.
Current results:
'next', untuned:
ipfire-2.19.2gb-ext4.i586-full-core121.img.gz => 332951687 Bytes
ipfire-2.19.i586-full-core121.iso => 228589568 Bytes
'next', XZ_OPT: -T4 -8, 70% RAM:
ipfire-2.19.2gb-ext4.i586-full-core121.img.gz => 329725723 Bytes
ipfire-2.19.i586-full-core121.iso => 217055232 Bytes
These two resulting archives are 14760300 Bytes smaller than before.
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 814a7d126b461cf2a71dddb1a0e78e306e544233
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat May 19 13:53:33 2018 +0200
nano: Update to 2.9.7
For details see:
https://www.nano-editor.org/news.php
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e50f08ae3bdb548bfa5c83ec6926e0096277e89b
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun May 20 17:59:29 2018 +0200
cmake: Update to 3.11.2
For details see:
https://cmake.org/cmake/help/v3.11/release/3.11.html#id2
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit eb1ff23333e91b0ef6fc2c4dca69853b9d109f59
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun May 20 17:40:36 2018 +0200
nmap: Update to 7.70
For details see:
https://nmap.org/changelog.html
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit bea1884bd79cd91c4b31c2bd20c6f06d029c1e22
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri May 18 17:14:15 2018 +0100
installer: Increase size of /boot to 128M
Fixes #11736
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b7a46724970feeb1edd11bc779db1ca53da0ccdb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu May 17 07:45:06 2018 +0200
kernel: update to 4.14.41
Signen-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 4dd7df2f82266d8d7a4474568020a326e9823f40
Merge: 959b404ee 83a618fdc
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed May 16 14:09:42 2018 +0200
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
commit 959b404ee0bccd4222055bf75b91d230dda6f65c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed May 16 10:43:58 2018 +0200
u-boot: add Raspberry Pi 3 Model B+
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 4a2776560115d0dcd2288ee5c246ee6604ffc6a8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed May 16 10:40:36 2018 +0200
swconfig: update switch config script for Lamobo R1
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 83a618fdcc2b278bd788e56ca7db6fdbb4afa3f1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun May 13 08:12:13 2018 +0000
kernel: arm-multi: enable AXP20x power regulator
this is needed for bananapi usb support
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 61bb655fad889dc973e770dea4a1620674cfbf1d
Merge: 39a73adad 732de6575
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun May 13 08:03:52 2018 +0000
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
commit 39a73adadf01740bc2e1be7a4bbacc6b59f3b296
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun May 13 07:59:01 2018 +0000
kernel: kirkwood: fix iConnect leds and modell name
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 732de6575124e6fa091d61c26142b2a568d3591a
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat May 12 14:57:37 2018 +0200
Add NRPE initscript to rootfile
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8080197b129b82c93dffc77b970aa7028c0ba4a0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu May 10 21:34:07 2018 +0200
kernel: update to 4.14.40
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a305ffea8bf2df76d753a63ca93af019413a3d72
Author: Peter Müller <peter.mueller(a)link38.eu>
Date: Wed May 9 21:59:41 2018 +0200
install initscript for NRPE
Install initscript for NRPE addon.
The second version of this patch actually includes the
initscript, which was missing due to lack of coffee the
first time. :-)
Thanks to Michael for catching it.
Resent due to crappy linewrapping in initscript by MUA.
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d8ef6a9537537ed43d7766ced22d3500b965ed1a
Author: Peter Müller <peter.mueller(a)link38.eu>
Date: Mon May 7 17:23:52 2018 +0200
display country data for remote IPs on ovpnmain.cgi
This makes debugging easier, especially when it comes to
GeoIP related firewall rules and database related issues
such as #11482.
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ea566f8485462dee02e9385aa5b5e4d7935d131d
Author: Peter Müller <peter.mueller(a)link38.eu>
Date: Mon May 7 17:01:58 2018 +0200
fix aesthetic issues in remote.cgi and ship them
Fix some minor cosmetic issues on remote.cgi as well as a typo in
the language files ("sesstions" -> "sessions"). The changes are
listed in "filelists" for Core Update 121.
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6d92ee11de904562936921d593332e695e82d9f4
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Wed May 2 13:27:07 2018 +0200
BUG11559: fwhosts
When creating firewallrules or using firewall groups,
it should be possible to select a single IpSec subnet if there is more than one.
This patch adds the changes to the firewall groups.
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Tested-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8b20ca2de4d1b07f2bb2237b97a591cc40deebc4
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Wed May 2 13:27:06 2018 +0200
BUG11559: firewall-lib
When creating firewallrules or using firewall groups,
it should be possible to select a single IpSec subnet if there is more than one.
This patch has neccessary changes for the firewall-lib. While the network name of the IpSec changes
on save (subnet is added to name) we need to split the name or normalise the field before using it.
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Tested-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 93a017cbcffafaa63b64e3ff51e8d6c37dce3d5b
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Wed May 2 13:27:05 2018 +0200
BUG11559: firewall.cgi
When creating firewallrules or using firewall groups,
it should be possible to select a single IpSec subnet if there is more than one.
This patch has the changes for firewall.cgi
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Tested-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c07eea1d38de0334e79f531710e33f656dbd5f8c
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Wed May 2 13:27:04 2018 +0200
BUG11559: Languagefiles
When creating firewallrules or using firewall groups,
it should be possible to select a single IpSec subnet if there is more than one.
This patch adds a new languagefileword "fwdfw all subnets" which is used in firewall.cgi and fwhosts.cgi
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Tested-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e70aa2e0b89e87316a3ea92509c0662c077fb539
Author: Peter Müller <peter.mueller(a)link38.eu>
Date: Sat Jan 20 18:25:47 2018 +0100
update language files
Add new language strings to the language files.
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9159bd4bbe8bf51d7d604daa7c60651a979da90e
Author: Peter Müller <peter.mueller(a)link38.eu>
Date: Sat Jan 20 18:24:31 2018 +0100
display active logins at remote.cgi
Display active user logins (both local and remote) at
the remote.cgi page in the WebUI. This might be useful
for debugging broken SSH sessions or simply checking that
nobody is currently logged in. :-)
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c2e008880c6afdf6d467297d8ce9dc8b32eb1b63
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Mon May 7 01:02:03 2018 +0200
wget: Update to 1.19.5
Hi,
Excerpts from official announcement:
"This version fixes CVE-2018-0494 (Cookie injection vulnerability) found
by Harry Sintonen.
This version fixes several issues, mostly found by OSS-Fuzz.
It also introduces TLS1.3 with OpenSSL, a new option --ciphers and
updates the CSS grammar to version 2.2.
...
Noteworthy changes:
* Fix cookie injection (CVE-2018-0494)
* Enable TLS1.3 with recent OpenSSL environment
* New option --ciphers to set GnuTLS / OpenSSL ciphers directly
* Updated CSS grammar to CSS 2.2
* Fixed several memleaks found by OSS-Fuzz
* Fixed several buffer overflows found by OSS-Fuzz
* Fixed several integer overflows found by OSS-Fuzz
* Several minor bug fixes"
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6f18c08a3d78554e78bb7ee57ce6e22f8fdb0c76
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun May 6 13:34:17 2018 +0200
cmake: Update to 3.11.1
For details see:
https://cmake.org/cmake/help/v3.11/release/3.11.html
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ba5dccd0081de56edc7218239f2266243baf3c51
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun May 6 12:37:31 2018 +0200
unbound: Update to 1.7.1
For details see:
http://www.unbound.net/download.html
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1698eb73c76fd2a7835901bc6cea74d0616f6610
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun May 6 12:33:25 2018 +0200
openssh: Update to 7.7p1
For details see:
http://www.openssh.com/txt/release-7.7
This release fixes:
https://bugzilla.ipfire.org/show_bug.cgi?id=11693
https://bugzilla.ipfire.org/show_bug.cgi?id=11694
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a389a05cd9ab8ae882f2d6d2ebe6515c8c02da8e
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun May 6 11:12:07 2018 +0200
htop: Update to 2.2.0
For details see:
https://hisham.hm/htop/index.php?page=downloads
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 39eb05b2008e43ef666227f53409e038c0074809
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun May 6 10:56:29 2018 +0200
nano: Update to 2.9.6
For details see:
https://www.nano-editor.org/news.php
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7f9b851d363e33681c97cfa9442bc18b51c8f46c
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun May 6 20:14:22 2018 +0200
nagios_nrpe: Update for rootfile
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 339ee7e9f68752885c648b8372a94c8d14f2dd9b
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 5 20:44:52 2018 +0100
core121: Ship updated libidn
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 27279edffcbf6fec56563b052d1ef08f9341185f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat May 5 20:44:20 2018 +0100
core121: Ship updated pcre
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0f458e4df0c6d99b957d6d175cdd241cff176a6b
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat May 5 09:18:04 2018 +0200
libidn: Update to 1.34
For details see:
https://lists.gnu.org/archive/html/info-gnu/2018-04/msg00001.html
"* Version 1.34 (2018-03-31)
** libidn: Fix integer overflow in combine_hangul()
Found by fuzzing.
** libidn: Fix integer overflow in punycode decoder
Found by fuzzing, fix for the fix reported by Christian Weisgerber
** libidn: Fix performance issue in idna_to_unicode_internal()
Found by fuzzing.
** libidn: Fix performance issue in stringprep functions.
Found by fuzzing.
** libidn: Fix NULL pointer dereference in g_utf8_normalize()
Found by fuzzing.
** libidn: Fix NULL pointer dereference in stringprep_ucs4_nfkc_normalize()
Found by fuzzing.
** libidn: Increase performance of stringprep functions
Found by fuzzing.
** testing: Add OSS-fuzz integration and regression testing
** build: Update gnulib files
** build: Modernize GTK-Doc build
** build: Fix parallel builds
** build: Add configure flag --disable-doc
** build: Add configure flag --enable-ubsan (enable UB Sanitizer)
** build: Add configure flag --enable-asan (enable Address Sanitizer)
** build: Fix compiler warnings
** build: Fix build for gcc-7
** i18n: Added Swedish translation.
Thanks to Josef Andersson.
** API and ABI is backwards compatible with the previous version."
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 792bed3716f59d54b05b0c31157f5a9b142ea304
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat May 5 08:33:24 2018 +0200
pcre: Update to 8.42
For details see:
http://www.pcre.org/original/changelog.txt
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3a0695be8f75ced863631401692e333047f9b6cf
Author: Peter Müller <peter.mueller(a)link38.eu>
Date: Sun Apr 29 10:20:17 2018 +0200
update nagios_nrpe to 3.2.1
Update NRPE to 3.2.1, which fixes various security vulnerabilities
and bugs (changelog is available at:
https://github.com/NagiosEnterprises/nrpe/blob/master/CHANGELOG.md).
Due to changes in ./configure, some options such as initsystem (sysV)
need to be specified now. Also, simple "make" does not exist anymore
and must be replaced by "make all".
Rootfile information is now included which was missing in the
first version of this patch.
This fixes #11700 and partly addresses #11551.
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e35c70ac2341eb37dfea8e7bf72fb5430f775876
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 30 11:35:30 2018 +0100
core121: Ship update list of trusted CAs
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3e0bab5e02ab65327cef757d2f0aa3e1e94fb6dc
Author: Peter Müller <peter.mueller(a)link38.eu>
Date: Sun Apr 29 10:09:10 2018 +0200
update ca-certificates CA bundle
Update the CA certificates list to what Mozilla NSS ships currently
(some Turktrust root CAs have been dropped).
The original file can be retrieved from:
https://hg.mozilla.org/mozilla-central/raw-file/tip/security/nss/lib/ckfw/b…
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e990e4273f4f9e493243c839e33328621b722968
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 5 18:01:53 2018 +0200
core121: fix typo fileslist -> filelist
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit f1051b495269db1fb67c6d0e72628d4bfe3a910d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 5 17:49:44 2018 +0200
set pakfire core back to 120
this should set to 121 when the updated is finished to ensure that
testers that has installed a test build install core121 again.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 0d2cbbab855c10643dc4163229e8cff98e4b23de
Merge: 36d9e459c c800cec71
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 5 09:14:42 2018 +0200
Merge branch 'kernel-4.14' into next
commit c800cec71f7c489bdd9c4db21c720a4594c3872a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu May 3 15:37:39 2018 +0200
kernel: update to 4.14.39
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit ea76b08bc3c1151ccd7045379716157c8ce718c2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed May 2 11:39:38 2018 +0200
u-boot: enable HUSH_PARSER for Iomega iConnect
without this if ... then ... else is not supported.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a06f9daf20acece8080c7024e01b39d4b2a21b7b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed May 2 11:38:23 2018 +0200
u-boot: remove useless rootwait double
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit b69338e0e8a8c12f0e1acc919258b1f2f6e658fb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Apr 30 12:26:30 2018 +0200
kernel: update to 4.14.38
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 36d9e459c0e259d6348438ea3594b6b2213d34b8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 30 11:26:10 2018 +0100
core121: Add filelist
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d8d20375b34660e30e755e57e7fc7d42e8a22c2f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Apr 29 23:09:08 2018 +0200
u-boot: update rootfile
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 8718a67ec5cf4df03c4c78d84d841d6da436beff
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Apr 29 09:48:29 2018 +0200
kernel: disable crng unseeded use message spamming
there was a bug until 4.14.36 that this message are not printed at all
now it work and spam the log at boot.
For security it is is a nightmare to use unseeded random but we and the user
cannot do anything. This is work for platform maintainers to get the crng
working earlier.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit bf1e75985f9231932409519f7648c4079d4a4dd5
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Apr 28 10:24:16 2018 +0200
u-boot-kirkwood: add u-boot build for kirkwood
This file build IPFire (dtb, bootz) compatible versions for:
Marvell DreamPlug
Iomega iConnect Wireless
Raidsonic ICY-Box 62x0
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 79dbff45cb15e490713f5afd7900dd480d74a131
Merge: 630040c83 39f4488a6
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Apr 28 09:09:00 2018 +0200
Merge remote-tracking branch 'origin/core120' into kernel-4.14
commit 630040c8300bcc49b84589fa5f09ffecb884621c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Apr 28 09:01:52 2018 +0200
kernel: update to 4.14.37
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit e10049b35713d6c35bf6299706e6592170171741
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Apr 28 08:51:01 2018 +0200
u-boot: update buildscript
enable wandboard
update ident strings
distclean after every target
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 8858180db5715072aefa784809538aa96be90466
Author: Peter Müller <peter.mueller(a)link38.eu>
Date: Thu Apr 26 21:44:56 2018 +0200
remove forgotten Nagios files, if any
When we decided to drop Nagios, some files were not removed on the
installations. Since the package does not exist anymore, "pakfire remove
nagios" does not work so we need to clean them up manually in case they
exist.
The third version of this patch makes sure Apache is restarted
afterwards, and includes some forgotten files [sic] as well as it is
now applying for Core Update 121.
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2a20456f7df329f543800af35e8b19ef41d68663
Author: Peter Müller <peter.mueller(a)link38.eu>
Date: Thu Apr 26 17:06:51 2018 +0200
Start Core Update 121
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 40a930bda59180d3d88affd8bec028ebb375c05d
Author: Peter Müller <peter.mueller(a)link38.eu>
Date: Thu Apr 26 17:31:46 2018 +0200
BUG:11312 Fix renaming GeoIP groups
When renaming a GeoIP Group, the corresponding names in
firewallrules (if any) are not changed accordingly. Now
when changing a GeoIP Group the firewallrules are renamed
correctly.
Slightly improved first version of this patch (contained
a blank line with trailing whitespace). No functionality
changed, patch has been confirmed as working correctly.
Fixes: #11312
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 86fd1947660833f8bff55d7a83259ab749ed60e1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 24 12:34:53 2018 +0100
dma: Apply compile fix
dma segfaulted when built without string.h.
Fixes: #11701
Submitted upstream: https://github.com/corecode/dma/pull/58
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit df7f30a146377d57edfd5442cebad2bff34cbfd4
Author: Peter Müller <peter.mueller(a)link38.eu>
Date: Mon Apr 23 16:17:00 2018 +0200
improve error message if make.sh is executed by non-root user
Fixes #11706.
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f4a91e23d9a4e03ebe7e4c5592fd407145d55875
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 24 11:04:34 2018 +0100
Drop noip updater
This package is unused since we introduced ddns. Dropped.
Fixes: #11708
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a3452c90307aa6fd2b8543c17c15638c2ffda15e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 24 10:47:16 2018 +0100
ipsec: Open ports in outgoing direction
When the firewall policy is blocked, no outgoing IPsec connections
can be established. That is slightly counter-intuitive since we
open ports in the incoming direction automatically.
Fixes: #11704
Reported-by: Oliver Fuhrer <oliver.fuhrer(a)bluewin.ch>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 637eee2607c015947778523be13cce1c1ed938c6
Author: Ersan Yildirim <ersan73(a)gmail.com>
Date: Tue Apr 24 10:46:52 2018 +0100
Fix mistakes in Turkish translation
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f529ad213f52c5dc6d4eb0a8d0988e9f23fde5e5
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Apr 22 13:38:11 2018 +0200
clamav 0.100.0: Add missing update for rootfile
This is missing in https://patchwork.ipfire.org/patch/1722/
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a83b738215156e95dab1551a7838c508de256a1f
Author: Peter Müller <peter.mueller(a)link38.eu>
Date: Sat Apr 21 18:44:45 2018 +0200
update ClamAV to 0.100.0
Update ClamAV to 0.100.0, which brings some new features and bugfixes
(release notes are available here: https://blog.clamav.net/2018/04/clamav-01000-has-been-released.html).
Since the internal LLVM code is now deprecated and disabled by default,
patching clamav/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
does not seem to be necessary anymore.
Further, the --disable-zlib-vcheck option has been removed since it
produces warnings during compilation.
Signed-off-by: Peter Müller <peter.mueller(a)link38.eu>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6077d538650502d40aad152d55f3a99394c10205
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Apr 22 10:24:36 2018 +0200
leds: dreamplug: the blue led has wrong name in dtb
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2b97294c8b8a7dc149a6c323f9a1e0a44339ed36
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Apr 22 10:16:37 2018 +0200
leds: rename dreamplug leds for new kernel
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 7f1b6ea3c2e8e3ee9a10559d1cdcee77fd564bdd
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Apr 20 10:52:30 2018 +0200
kernel: update to 4.14.35
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 5ca5270409c7506e40d41bd635a7484df5592f06
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Apr 19 18:42:27 2018 +0200
iw: update to 4.14
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit da496c8b659c701e0b193bb1e03b27e1ec00e802
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Apr 19 18:42:03 2018 +0200
crda: update to 3.18
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 1c28319e1e1742f444c8447bcbbdcdf30fc5b2b6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 19 15:38:20 2018 +0100
squid-accounting: Do not make menu entry executable
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1d95329925a94b005a4f79ee71daac7ace8bb496
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 19 15:37:58 2018 +0100
squid-accounting: Do not make translations executable
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d0d2e8c4adfd8619e4bf669aaddf3c7f7c4945ac
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 19 15:37:28 2018 +0100
squid-accounting: Install Turkish translation
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4cd51e20ae17ee55e46708650055727cffe3443a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Apr 19 15:36:37 2018 +0100
Revert "IPsec: Try to restart always-on tunnels immediately"
This reverts commit a261cb06c6cdd3ba14ad0163c8c9e714ae94fc5b.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a9203b4f5b686d8d9fde089c78799c5f70f4739b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Apr 18 06:11:15 2018 +0200
kernel: i586 enable cs5535 gpio module
this modul is needed for alix led support
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit bbaa7993bd99d0e31145f84277861fd8dbde3e34
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 17 13:50:02 2018 +0100
wio: Translation files do not need to be executable
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5990b2882b3fcae369bba4b9bc3915b1743415c1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Apr 17 13:49:41 2018 +0100
wio: Actually install Turkish translation
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c4172fad43550157c154150c0589fcdfa1be4790
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Apr 17 12:20:15 2018 +0200
firstsetup: fix disabling tty's on scon mode
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit f8bb9b1578bccf3ae55f3d6f145866157846d248
Author: Ersan Yildirim <ersan73(a)gmail.com>
Date: Tue Apr 17 09:47:48 2018 +0100
Update Turkish translation and add translation for WIO and squid accounting
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 20406699e33f2771eca7650cd760aa8404fb92d0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Apr 17 06:10:06 2018 +0200
grub: update to 2.02
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit cd99c47371a0ca55cd518c69e1ace05543ddbcc7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Apr 16 18:15:12 2018 +0200
u-boot: fix typo in startscript
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit eef0d706e8fc5bc7d808d2bb45c3b33b91b4cd42
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Apr 16 18:12:24 2018 +0200
acpid: start also if kernel has no acpi support.
acpid is also needed for gpio and hid powerbuttons if there is no
real acpi support.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 26d09124b92dac6f9619e053cce7fcf5b0f625dc
Merge: 69acde2ec 0245f3b6e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Apr 14 18:45:02 2018 +0200
Merge branch 'kernel-5.14' of git.ipfire.org:/pub/git/people/arne_f/ipfire-2.x into kernel-4.14
commit 0245f3b6e1c41a91cc3c915a48ea0a3ad4b56deb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Apr 14 18:42:52 2018 +0200
screen: build before elfutils
if it buils after elfutils it links against libelf which is an addon
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 69acde2ecdaee4f407a6534f197176ad43120e25
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Apr 14 18:42:00 2018 +0200
acpid: build also on arm
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2c1a6768d0117095b74089d96741f60771f70398
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Apr 14 16:14:31 2018 +0200
bump packages
the old packages are linked against removed libs
fixes: 11685
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 9a2ac6c3da57170b9e0c2e9830f0a6babdbfc942
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Apr 12 17:17:08 2018 +0200
kernel: update to 4.14.34
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 6b566244453b2e716d0ebdfd817c100662b33d7b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Apr 12 16:21:20 2018 +0200
flash-images: merge normal and scon to one image.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit ff2b65c193321fed8c0d92bd5d46366fefcdd9a0
Author: Wolfgang Apolinarski <wolfgang.apolinarski(a)ipfire.org>
Date: Fri Apr 6 07:11:03 2018 +0200
Updated Apache 2.4
- Updated Apache from 2.4.29 to 2.4.33
- Updated Apr from 1.6.1 to 1.6.3
- Updated Apr-Util from 1.6.0 to 1.6.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 4217b4b6d84501ab437dfc0f2c8e711e8816e643
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Apr 6 13:48:19 2018 +0200
beep 1.3: Fixes for CVE-2018-0492
For details see:
https://src.fedoraproject.org/cgit/rpms/beep.git
https://cve.mitre.org/cgi-bin/cvename.cgi?name=2018-0492
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d1d06e66c0a4213eba9e7a81ce65b91f7722319d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Apr 11 19:39:48 2018 +0200
kernel: update to 4.14.33
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 96a2ff029e74654793e28ff34f130436660de475
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Apr 11 18:36:57 2018 +0200
kernel: update config
disable isdn
disable audit
disable profiling on arm
disable scsi driver on arm
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit f46d604de25eb29f33276773cdf6a310d40a355f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Apr 9 07:52:46 2018 +0000
kernel: fix kirkwood config
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 592896d2f42bf01fd95d62f8682f51b46edc5efa
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Apr 5 09:15:32 2018 +0200
u-boot: update bootscript to boot from other devices than mmc
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 783f6aa36d825ee2da57b3eae714aa4e0f618fc5
Merge: 6703371d2 d6d058a56
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Apr 3 20:15:58 2018 +0200
Merge remote-tracking branch 'origin/master' into kernel-4.14
commit 6703371d2d8dc81ddf1c04601125fc50465957b0
Merge: 0d98de5a4 718119b89
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Apr 2 17:11:45 2018 +0200
Merge remote-tracking branch 'origin/core120' into kernel-4.14
commit 0d98de5a44776a8e5f18e6f1cd82c477e833ff7f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Apr 1 16:15:27 2018 +0200
kernel: update to 4.14.32
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 1b06675c008cf7db57c3310712d07bad3a2ce00e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Mar 31 10:02:01 2018 +0200
openssl: update rootfile
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit e12d216eec92c8c7f832c324cb636a5e8b752665
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Mar 31 09:56:48 2018 +0200
kernel: x86_64 rootfile update
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit b465322d7ccd29e61eb1d7cc2c7084f20baa7ddf
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Mar 30 16:39:02 2018 +0200
kernel: x86_64 enable DEVFREQ modules
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 302dba205bf58b3def6163b85b4decfce4538fac
Merge: 018a19af6 36600cef3
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Mar 30 10:26:01 2018 +0200
Merge remote-tracking branch 'origin/master' into kernel-4.14
commit 018a19af643df4e91dc6a7e3393579afc706b2f1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Mar 30 10:21:49 2018 +0200
kernel: update to 4.14.31
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 50bee0291de0bb7444c27733664bf90a06c9a876
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Mar 26 07:29:51 2018 +0200
xr819-firmware: move rootfile to common
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 66b5b4d12c880e93767ddd58c2d820967779d311
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Mar 25 16:13:35 2018 +0200
kernel: update to 4.14.30
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 37b86fa99bde0c79fe45ffaf90732c9b6025b7b9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Mar 25 13:27:03 2018 +0200
xr819-firmware: add firmware for xradio xr-819 wlan
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 0a21d63f26ca67161b2b09289fd9fefbc7547e00
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Mar 25 11:41:20 2018 +0200
kernel: updated arm config and image build
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit ea9d53c822e835b854010f5e5bb37931f9986f86
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Mar 24 13:26:32 2018 +0100
inittab: change tty1 to console
this reduce the differences between tty and scon installations
and make it easier to switch between.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 5bc33236ca28747683109cd62c94c35338374c68
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Mar 24 12:49:10 2018 +0100
swconfig: remove old swconfig utility
this is not compatible with kernel 4.14
todo: replace swconfig calls in initskript
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 4df5cc2f751cd89a3c1c3ec26eb4f5dcd9f9e20e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Mar 24 12:41:57 2018 +0100
rpi-firmware: update to 2018-03-16
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 151c8dfc0b656db96ec087d18fe9469400f26c40
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Mar 24 11:41:45 2018 +0100
checknewlog: don't report u-boot mkimage rootfile.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2a0947f2e3e991582c62eaa7bd37a21fec533fd5
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Mar 24 11:14:24 2018 +0100
u-boot: update to 2018.03
todo: check wandboard version. there are internal changes to merge
the different wandboard images to one and u-boot.imx is not build
anymore. Which file is needed to boot on wandboard?
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 832770a86886a8b1cc05f0c2acc5b50b5a45b230
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Mar 22 13:16:37 2018 +0100
kernel: update to 4.14.29
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 62777ff40735b6327f497d3250393f3dc49e6cf5
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Mar 16 20:49:22 2018 +0100
kernel: update to 4.14.27
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 1682e5fc69f6ddce667cc0ca920e096b9b80bb13
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Mar 16 20:48:56 2018 +0100
kernel: drop rpi config
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit bf19f5c6a09a5e8f4dbf079b33df487f5b40ece3
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Mar 14 19:39:23 2018 +0100
kernel: drop rpi kernel
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit ce8a4ba6a009363e49edf7c6844c8011d30792da
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Mar 13 11:37:36 2018 +0100
kernel: update to 4.14.26
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 7fab74918dc4734bc0e253b4cb018fa3ede7a2fe
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Mar 9 23:05:06 2018 +0100
kernel: update to 4.14.25
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d5e0428c154610f5a322c4f14eea520f76b0e94c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Feb 28 16:20:17 2018 +0100
kernel: 4.14.23
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 031ea15b00410e95565850f7b34b9209fc325432
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 27 15:25:50 2018 +0100
kernel: update to 4.14.22
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 1a7cfc2f10f0dc143680daaf5da244ef5e186c27
Merge: e5ef944d6 7eb86ee39
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Feb 26 23:06:45 2018 +0100
Merge remote-tracking branch 'origin/core119' into kernel-4.14
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit e5ef944d6e8ce8e7609d5456c348091de726e129
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Feb 23 19:33:15 2018 +0100
kernel: update to 4.14.21
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 854b9b994cd5944eb99be008f5b8dbfed9e57a97
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 17 20:22:39 2018 +0100
kernel: update to 4.14.20
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 4cd8fd3f6d3e63955bd935e4a8683f481b3e9d74
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 13 14:49:32 2018 +0100
kernel: update to 4.14.19
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit be13dd4818e4c6c28ac04ab767a922cb9dc4f102
Merge: e9ea5b51f 6af8fa9e0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 10 09:54:55 2018 +0100
Merge remote-tracking branch 'origin/master' into kernel-4.14
commit e9ea5b51f09e4962a7dc27257503ac1c023b4008
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Feb 9 21:09:31 2018 +0100
kernel: update to 4.14.18
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 7baf717a408ab62fe9e31d0789bf929c3d01668e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Feb 8 11:06:13 2018 +0100
kernel: update to 4.14.17
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit c7a00111e09df030abfd3dd5726562023db44b83
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Feb 1 10:18:08 2018 +0100
kernel: update to 4.14.16
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 97e4adb8fd8c1631ee42af5129a3e07175ff4995
Merge: b1a70cb92 29692af1f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Jan 28 11:24:12 2018 +0100
Merge remote-tracking branch 'origin/next' into kernel-4.14
commit b1a70cb92d8e11685d8433bfb31eb6117d8cd2be
Merge: 9b74c2a80 2d18864ae
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 27 13:49:35 2018 +0100
Merge remote-tracking branch 'arne_f/gcc-7-retpol' into kernel-4.14
commit 2d18864ae7cb1072f5329c5ff9de5e7c567bb119
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 27 13:47:09 2018 +0100
gcc: fix gmp download
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 9b74c2a808c21e8434b09450be4bba1dd153253f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 27 10:36:01 2018 +0100
kernel: update to 4.14.15
commit 09cdb999daaad3488b749abc50dada43adaf9e12
Merge: 2c21c4e52 7520b95a8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jan 27 10:26:11 2018 +0100
Merge remote-tracking branch 'arne_f/gcc-7-retpol' into kernel-4.14
commit 7520b95a8b22e8e77ab229c0c6da592174bfcd28
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 26 20:48:08 2018 +0100
toolchain: update to gcc-7.3.0 and enable retpolines on x86_64 and i586
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 33e3a1bd8487762b1286ddb360fdf855af752871
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 26 12:23:00 2018 +0100
mdadm: fix build with gcc-7
commit 38391953e0395facd59963cbbbb6949f7089340d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 26 12:20:57 2018 +0100
sarg: update to 2.3.11 (needed for gcc-7)
commit 61b8b666673374e1e29d6817b2f32bddbb66edc7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 26 12:18:36 2018 +0100
powertop: update to v2.9 (needed for gcc-7)
commit 8a366449bbb1eccaa214bc6f3a6aca284708ec07
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 26 12:16:37 2018 +0100
bwm-ng: update to 0.6.1-f54b3fa (needed for gcc-7)
commit bb86f0f6787ef037a418705af0699f8a6058fffb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 26 12:15:30 2018 +0100
diffultis: update to 3.1.6 (needed for gcc-7)
commit ef17027ee8cd0fb2c0ef66953847ad260830db31
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 26 11:00:37 2018 +0100
u-boot: link missing header for gcc-7
commit 4be4555fcbc0a43393090d758785fe662e6cd17e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 26 10:58:59 2018 +0100
vdr: disabled because it will not build with gcc-7
commit 2c21c4e522fd5cb280a209544835e87f3c6d022f
Merge: 5901793b6 cb7c10bd2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Jan 15 19:08:23 2018 +0100
Merge remote-tracking branch 'origin/next' into kernel-4.14
commit 5901793b61c899e170acba78d9bc29626d8171ef
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Jan 14 11:33:13 2018 +0100
intel-microcode: ship microcode updates (20180108)
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit b715af20c99d22869fd507069188706e4c7fcae8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Jan 10 22:20:33 2018 +0100
kernel: update to 4.14.13
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 6d295033e1325c0eeac34b000b4ad86c6e91e646
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jan 5 23:31:54 2018 +0100
kernel: update to 4.14.12
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a243edae1a12eae906ca8094c3e566ec56cd628e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Jan 3 09:49:20 2018 +0100
kernel: update to 4.14.11
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 50204360711cac0417e58f4d996af29e738588f4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Dec 31 12:57:29 2017 +0100
kernel: update to 4.14.10
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 54ead8ef24172ee619f6a819645a77b3b4f3e8f1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Dec 29 15:07:49 2017 +0100
kernel: build elfutil before the kernel
kernel 4.14.9 need elfutil to generate unwind tables.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit b480a5d012f0f72cad96b5b80a8d3dc3a62707dd
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Dec 29 00:10:36 2017 +0100
kernel: update to 4.14.9
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 1d4e6e5833eb69abc02a09880014845fb229fab8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Dec 22 17:04:57 2017 +0100
kernel: update to 4.14.8
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a1f42de3b589759ca87eb665268df113749d9717
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Dec 21 11:52:32 2017 +0100
kernel: update to 4.14.7
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d952f7557ea4b1e552bb0f893ad50a99f83d669e
Merge: 547a03301 cbcc13512
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Dec 18 18:22:06 2017 +0100
Merge remote-tracking branch 'origin/next' into kernel-4.14
commit 547a03301dbc923fac1b2cd539af3e94e713cfbd
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Dec 14 19:55:06 2017 +0100
kernel: update to 4.14.6
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 280a17c2394e123dfdbb9444049383fd8ad17957
Merge: b0b9e276c c2bebebc0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Dec 14 19:54:48 2017 +0100
Merge remote-tracking branch 'origin/master' into kernel-4.14
commit b0b9e276c8c774d657e066d2e21a997be1ce95b1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Dec 14 13:09:12 2017 +0100
kernel: update to 4.14.5
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 02c36af4ba4ff282f3fab3ac311af63aa9486501
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Dec 12 09:18:11 2017 +0100
linux-firmare: update to 5d98692
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d096a7b1973708dd6fc6ebfaa1dbbd8315b3df93
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Dec 12 09:17:23 2017 +0100
kernel: update to 4.14.4
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2723ef8721862b9d9565346bae8115773123e53e
Merge: 050479e93 979f8700b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Dec 12 07:53:33 2017 +0100
Merge remote-tracking branch 'origin/next' into kernel-4.14
commit 050479e93e183f4c8ff2aa2069abf4d653be71d3
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Dec 3 07:50:03 2017 +0100
kernel: disable drm by installing /bin/false
Intel i915 is still loaded even when it was blacklisted
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 458c6b40f8d4fa3b014a81d86032af3e33a82d11
Merge: e31045ee1 7da47c3ef
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Dec 2 20:51:23 2017 +0100
Merge remote-tracking branch 'origin/next' into kernel-4.14
commit e31045ee126a71dd34d927bef0d919e4d0d50dd4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Dec 2 10:44:09 2017 +0100
kernel: update generating of fb and drm blacklist
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 75e7ca9fdbd276f848cf044d12dd57f9f5a38025
Merge: 796c5e73c 7b93b62bc
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Dec 1 17:51:46 2017 +0100
Merge remote-tracking branch 'origin/next' into kernel-4.14
commit 796c5e73cb09f9620e283c1cdd7b214c21bcef9d
Merge: 0129f6dcd 14d0e151b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Dec 1 00:58:27 2017 +0100
Merge remote-tracking branch 'origin/next' into kernel-4.14
commit 0129f6dcd453973b018ff26ae9b8d97a6de655ff
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Nov 30 22:00:11 2017 +0100
kernel: update to 4.14.3
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 5b117ef49aaad5f39a81938783b2cfe05fc5d91c
Merge: f95283241 a679c5636
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Nov 29 17:37:51 2017 +0100
Merge remote-tracking branch 'origin/next' into kernel-4.14
commit f952832418bc3e698137bad243c318351b6d15d2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Nov 26 09:32:47 2017 +0100
kernel: updated i586 config and rootfiles
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 23b57c70224e3182481607f4f3593d9ed82aea56
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Nov 25 23:05:00 2017 +0100
kernel: update to 4.14.2
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2e1fe3c816068fa24db47db4798e178abe34d87e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Nov 22 12:29:36 2017 +0100
kernel: update to 4.14.1
only x86_config has updated yet and grsecurity is removed.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 346a3e8fecdd8b3b385fa158744ede1200b74049
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Nov 22 11:24:32 2017 +0100
xtables-addons: disable DNETMAP module
this will not build with kernel 4.14
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 7a192dedb9654d9b55313b3c6f9f63af92fdeb30
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Nov 22 11:23:47 2017 +0100
xtables-addons: update to 2.13
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit bdfbc09f98e89607f1d0346a0b46281c7553545e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Nov 9 16:01:03 2017 +0100
kernel: update to 4.9.61
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2c6e0e8eb3bb8b1fdacacac3e5e18e135c6b0189
Merge: ada37d847 4f248f7a7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Nov 2 23:40:49 2017 +0100
Merge remote-tracking branch 'origin/master' into kernel-4.9
commit ada37d8472cb986011bfd68b781a7209d6458f84
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Nov 2 22:26:44 2017 +0100
kernel: update to 4.9.60
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d23a284f022749459c0e9242c9aa0585ba593f9a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Nov 2 19:20:41 2017 +0100
Revert "kernel: revert an upstream patch that break 8TB Blockdevices on 32bit"
This reverts commit c64e080f3a52be0e60c06220021e97fecad94d34.
commit c64e080f3a52be0e60c06220021e97fecad94d34
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Nov 1 13:38:18 2017 +0100
kernel: revert an upstream patch that break 8TB Blockdevices on 32bit
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 35f59319d8b6787013a3fb1e5bfc010cf679ef0c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Oct 30 18:02:38 2017 +0100
kernel: update to 4.9.59
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d12ad00385f746479f74f75657776640ca0fa5d1
Merge: cb05d78cd 9064ba72f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Oct 22 21:57:17 2017 +0200
Merge remote-tracking branch 'origin/master' into kernel-4.9
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit cb05d78cda17d0aa71c3d4aa75ee0488d68a5e42
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Oct 22 10:30:05 2017 +0200
kernel: update to 4.9.58
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 4ad591338f8309f12545d00860de40fd3c9acba5
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Oct 18 23:54:46 2017 +0200
kernel: update to 4.9.57
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 7cca0a3020ad0751ba8d8ebc66c0ac3b1e9b74f0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Oct 14 07:19:13 2017 +0200
kernel: update to 4.9.56
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 3515db6899ff10af7b323aebe937cef04b7c03ad
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Oct 12 13:44:04 2017 +0200
kernel: update to 4.9.55
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 7ddef58e9ef9f0eb3917419591faac3db204cc96
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Oct 5 23:17:03 2017 +0200
kernel: update to 4.9.53
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 587ff16fd12542005abf9bfa920cc7a3bfd3c57b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Sep 27 19:28:23 2017 +0200
kernel: update to 4.9.52
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit cbaa48e7c1797efec81b63e9bdb1fd4de6177c2d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Sep 21 20:37:16 2017 +0200
kernel: update to 4.9.51
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 15fa4c32328a0c5e17d8c1bbd35a735048a71668
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Sep 14 17:26:44 2017 +0200
kernel: update to 4.9.50
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 7fe43838fd75eaa11dc95b710359dda50bf0ed86
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Sep 10 22:16:49 2017 +0200
kernel: update to 4.9.49
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 0c5f2556d6ce209cb6619e2f7a580d5295d0a8f1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Sep 10 15:06:22 2017 +0200
kernel: update to 4.9.48
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit e79463c233f7d97a61151db8cd17ff9f56c0b0b0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Sep 2 11:26:02 2017 +0200
kernel: update to 4.9.47
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit f2bc2ff2303899beec9b722e9d2e565d3b1ac85b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Aug 31 08:00:57 2017 +0200
kernel: update to 4.9.46
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit dbcac219cee8af683efd1218abec7fa7bcad5b4e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Aug 25 13:44:26 2017 +0200
kernel: update to 4.9.45
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d600ef570d52f0eaca0ea8a1e8d755c4cb31566e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Aug 17 21:24:27 2017 +0200
kernel: update to 4.9.44
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 84b12990b23b607885a8b5274f67609f97c5bd7f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Aug 13 09:45:51 2017 +0200
kernel: update to 4.9.43
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d048f84a9d05d8d5f8d399b096085ce58b845c6a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Aug 11 23:30:06 2017 +0200
kernel: update to 4.9.42
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 829671419d5cee7be2f4b4260f8eea8aad7990c2
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Aug 7 13:00:04 2017 +0200
kernel: update to 4.9.41
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a0a28a0af456862fe62a4c092b650b595c124c21
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jul 28 09:18:19 2017 +0200
kernel: update to 4.9.40
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 0d6e7dc852343d8832ea589a041f693fd314fc40
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Jul 28 09:16:31 2017 +0200
kernel: rootfile update
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 8b6380784c19216c0c04686c5783a847ad323431
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Jul 27 20:11:14 2017 +0200
kernel: enable Mellanox ConnectX-4 ethernet driver on i586 cfg
and disable debug for older Mellanox cards.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit ac617866acb8931d0b22c375a1484fdc2f30940b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Jul 23 22:28:29 2017 +0200
kernel: update to 4.9.39
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit e2263bceb77b633f74a16a80617c9cf07d685652
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Jul 17 17:31:45 2017 +0200
kernel: update to 4.9.38
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 92bd960ac25717fddef0f49d008b552d0a5889ce
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Jul 13 12:23:49 2017 +0200
kernel: update to 4.9.37
Signen-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 212820f64414c18116b8aeaef75e9027b4de92a7
Merge: 11ec6473c b587a27e6
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Jul 11 17:44:42 2017 +0200
Merge branch 'next' into kernel-4.9
commit 11ec6473ce30a661018121bd4ddb6e03e43c290e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Jul 11 07:48:46 2017 +0200
kernel: update to 4.9.36
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit b389d73110b6584ff58ad6db570de046d1ed8fab
Merge: 7c13ae02e 82308f538
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Jul 9 12:47:16 2017 +0200
Merge branch 'master' into kernel-4.9
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 7c13ae02eb75a5819892f2dc125e74ff1d8ce008
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jul 1 14:39:51 2017 +0200
kernel: update to 4.9.35
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 949c20d97f6b348701515049b042eff326ae4017
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Jul 1 13:23:08 2017 +0200
kernel: update to 4.9.34
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d8a72f472939e677b126d14d94298f98de222a9f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Jun 18 08:05:29 2017 +0200
kernel: update to 4.9.33
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 67a02f068f782dff0509af23ff0d5150261ce0df
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Jun 14 23:41:36 2017 +0200
kernel: update to 4.9.32
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d57da316379685e09d294137d7adec05323acb59
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Jun 7 23:07:15 2017 +0200
kernel: update 4.9.31
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 940c9796a500fd02b8a7639eca9e24dfafbf4ceb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat May 27 23:53:45 2017 +0200
kernel: update to 4.9.30
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit b414fe4a51e1769a476878b73bd5f2128325d560
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed May 24 16:54:31 2017 +0200
kernel: update to 4.9.29
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 351d2cc1b6e178cd42c3783890862eb8074709b5
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon May 15 13:09:28 2017 +0200
kernel: update to 4.9.28
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 4089a8f300905471478205c057ce011bad965295
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu May 11 10:43:26 2017 +0200
kernel: update to 4.9.27
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 12a90edc4009ed6295f6d414650afbfb344ec582
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed May 3 19:04:29 2017 +0200
kernel: update to 4.9.26
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit deb67378fd59523fc4466e33bfb1cf227e64985b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Apr 27 22:20:28 2017 +0200
kernel: update to 4.9.25
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit bfa3e3378e2f67b589c960ac7dc398bba8d49b4d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Apr 22 23:55:56 2017 +0200
kernel: update to 4.9.24
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 1c2701f0041045aa6204c472028004d291005d1d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Apr 19 07:39:28 2017 +0200
kernel: update to 4.9.23
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit ce56a8a79ff69567f917c5f4c73cd9542886651a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Apr 13 08:10:35 2017 +0200
kernel: update to 4.9.22
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 9a9cd99bfe2f183b2142f208d3b0a56e70ff14b3
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Apr 11 08:06:55 2017 +0200
kernel: update to 4.9.21
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 27a271b2f4329c28ad4c7eb07fb4c39aef0780d7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Mar 31 21:44:59 2017 +0200
kernel: update to 4.9.20
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit ff9da8b44f789b93eaf9001a13365305d3774bf4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Fri Mar 31 00:18:26 2017 +0200
kernel: update to 4.9.19
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 26dfc243908e19d1aaca44066e2cedf1b0e0a1fa
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Mar 27 06:31:46 2017 +0200
kernel: update to 4.9.18
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit fcffac1340f61923786af8a860c12056a9ef3706
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Mar 27 06:07:47 2017 +0200
kernel: fix e1000e hung at stats update.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d52f116913a0ed5ee6ce22b69cd68e8c5214ac8e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Mar 25 10:43:55 2017 +0100
kernel: fix igb crash if update_stats was often used.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a958faa4b8c52a4058b1b9a958e9fd248d7b9bfd
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Mar 23 16:45:21 2017 +0100
kernel: update to 4.9.17
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 94112e8b69657d2ae8ab5d386430b04daf28b9be
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Mar 18 16:38:14 2017 +0100
kernel: update to 4.9.16
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit df4eb191c1b3b7dc218bd2c90709e7cd842bcc30
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Mar 15 07:15:34 2017 +0100
kernel: update to 4.9.15
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a4f83ed88660ec958117826c63a49f6df07479ea
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Mar 14 14:49:06 2017 +0100
kernel: update layer7 patchset
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 8cbc38830b05bbdc6fa67bee0c6abf0de9a95707
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Mar 12 22:06:35 2017 +0100
kernel: update to 4.9.14
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 4d818afc5ddc6aa16f453e19188cf3ca62d53d2f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Mar 12 14:45:23 2017 +0100
QoS: move layer7 unspec match to PREROUTING
in POSTROUTING it not get the local answerpackets.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 9b677b44c04281cf0765063dd95d836a45cb844b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Mar 12 14:44:03 2017 +0100
kernel: update layer7 patchset
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit c6f78141782df337d28dbf3995e2758cbe731ebf
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Mar 7 06:05:40 2017 +0100
kernel: update grsecurity patch (3.5.2017)
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit ddc7b38cc057784b847498a9df94911b43eb30eb
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Mar 6 13:36:53 2017 +0100
kernel: fix and enable layer7 filter
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 8dd1564e6d9ccb6714378378512dc179a3566693
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Feb 27 19:04:51 2017 +0100
kernel: update to 4.9.13
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 60661dddae258de657d3d135096bd61877da000e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 25 15:08:29 2017 +0100
kernel: update to 4.9.12
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 842d597cb94f2cf019cd9b35ce071e25019d6b30
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 19 10:25:14 2017 +0100
kernel: update to 4.9.11
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 3089fc472325767488f70f3e7effb01ee884093c
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 18 12:53:44 2017 +0100
kernel: updated i586 config and rootfiles
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2524577db810a73e044fbb7acfc7b67108e59915
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Feb 18 12:48:36 2017 +0100
kernel: disable grsecurity for i586 because it fails to build
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit f0c0e04491afe9874af075bf59d816b29abdcbf8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Thu Feb 16 13:27:29 2017 +0100
kernel: update to 4.9.10
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 49146c6c651d5791b13329a28bd69ea0e0f0fdcd
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Feb 14 10:13:17 2017 +0100
kernel: update to 4.9.9
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 91648bd166d892cfdd326900e5a984f74d3e6ce4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 12 19:58:43 2017 +0100
kernel: updated to 4.9.8
at the moment its only for x86_64 and layer7 is disabled because it crashs.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit cfcd1ec5885f2c73428915d04045f2adf430a06f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 12 19:55:49 2017 +0100
xtables-addons: updated to 2.12
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 0eb2a6725564da2b45d3a305b1269d1e1c5c5775
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 12 19:53:34 2017 +0100
dhcpcd: updated to 6.11.5
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit c18f333f9c196c58b5e9b136791005c72b563f37
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 12 19:51:22 2017 +0100
udev: fix build with kernel 4.9 headers
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d93a661b2d59e898ada0aea6a69e30f9f4ff2f42
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 12 19:50:15 2017 +0100
ppp: fix build with kernel 4.9 headers
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 24247159dd2d757690798f93e40499e217fee58a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 12 19:48:53 2017 +0100
postfix: fix build with kernel 4.9 headers
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a58a2e67ec106b33e3de3f68e335492ecbce0bcc
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Feb 12 19:46:24 2017 +0100
net-tools: fix build with kernel 4.9 headers
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. fd9a531f716312b2bdab35f92c6aad5add21d563
by gitï¼ ipfire.org 06 Jun '18
by gitï¼ ipfire.org 06 Jun '18
06 Jun '18
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via fd9a531f716312b2bdab35f92c6aad5add21d563 (commit)
via 05b2d72588aa0ae8d1a1b521788912f0b1702b47 (commit)
via c22976907e44d682c916bed600dcd396907c2254 (commit)
from 779706b5f8f0025690dec3f8bf32f32deb9f7e05 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fd9a531f716312b2bdab35f92c6aad5add21d563
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jun 6 14:01:43 2018 +0100
Bump version to 2.21
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 05b2d72588aa0ae8d1a1b521788912f0b1702b47
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Jun 6 14:01:18 2018 +0100
core121: Create updater
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c22976907e44d682c916bed600dcd396907c2254
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Jun 1 18:40:07 2018 +0200
tar: Update to 1.30 (V3)
For details see:
https://www.gnu.org/software/tar/
Since new 'tar' has changes in commandline option parsing,
it was necessary to adjust 'lfs/Config, 'lfs/cdrom' and
'lfs/core-updates' (thanks to Marcel for diffs and Michael for
corrections).
I have tried to make only the most necessary changes.
As always, please check.
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/121/filelists/acpid | 1 +
.../{oldcore/114 => core/121}/filelists/apache2 | 0
.../{oldcore/114 => core/121}/filelists/apr | 0
.../{oldcore/114 => core/121}/filelists/aprutil | 0
config/rootfiles/core/121/filelists/armv5tel/files | 1 +
.../121/filelists/armv5tel/linux-initrd-kirkwood | 1 +
.../core/121/filelists/armv5tel/linux-initrd-multi | 1 +
.../core/121/filelists/armv5tel/linux-initrd-rpi | 1 +
.../121}/filelists/armv5tel/linux-kirkwood | 0
.../121}/filelists/armv5tel/linux-multi | 0
.../100 => core/121}/filelists/armv5tel/linux-rpi | 0
.../121}/filelists/armv5tel/rpi-firmware | 0
.../66 => core/121}/filelists/armv5tel/u-boot | 0
.../core/121/filelists/armv5tel/u-boot-kirkwood | 1 +
.../core/121/filelists/armv5tel/u-boot-mkimage | 1 +
.../{oldcore/77 => core/121}/filelists/beep | 0
.../92 => core/121}/filelists/ca-certificates | 0
.../{oldcore/112 => core/121}/filelists/cmake | 0
.../{oldcore/46 => core/121}/filelists/crda | 0
.../{oldcore/111 => core/121}/filelists/dhcp | 0
config/rootfiles/core/121/filelists/files | 14 +++++++
.../{oldcore/106 => core/121}/filelists/flex | 0
.../{oldcore/100 => core/121}/filelists/i586/grub | 0
.../core/121/filelists/i586/intel-microcode | 1 +
.../{oldcore/100 => core/121}/filelists/i586/linux | 0
.../100 => core/121}/filelists/i586/linux-initrd | 0
.../{oldcore/28 => core/121}/filelists/iw | 0
.../{oldcore/71 => core/121}/filelists/jwhois | 0
.../28 => core/121}/filelists/linux-firmware | 0
.../87 => core/121}/filelists/multipath-tools | 0
.../{oldcore/100 => core/121}/filelists/openssl | 0
.../{oldcore/77 => core/121}/filelists/rng-tools | 0
.../{oldcore/28 => core/121}/filelists/tar | 0
.../{oldcore/106 => core/121}/filelists/unbound | 0
.../{oldcore/104 => core/121}/filelists/wget | 0
.../100 => core/121}/filelists/x86_64/grub | 0
.../core/121/filelists/x86_64/intel-microcode | 1 +
.../100 => core/121}/filelists/x86_64/linux | 0
.../100 => core/121}/filelists/x86_64/linux-initrd | 0
config/rootfiles/core/121/filelists/xr819-firmware | 1 +
.../90 => core/121}/filelists/xtables-addons | 0
.../{oldcore/100 => core/121}/filelists/xz | 0
config/rootfiles/core/121/update.sh | 45 ++++++++++++++++++++++
lfs/Config | 6 +--
lfs/cdrom | 5 +--
lfs/core-updates | 7 ++--
lfs/tar | 6 +--
make.sh | 2 +-
48 files changed, 80 insertions(+), 15 deletions(-)
create mode 120000 config/rootfiles/core/121/filelists/acpid
copy config/rootfiles/{oldcore/114 => core/121}/filelists/apache2 (100%)
copy config/rootfiles/{oldcore/114 => core/121}/filelists/apr (100%)
copy config/rootfiles/{oldcore/114 => core/121}/filelists/aprutil (100%)
create mode 100644 config/rootfiles/core/121/filelists/armv5tel/files
create mode 120000 config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood
create mode 120000 config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi
create mode 120000 config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi
copy config/rootfiles/{oldcore/100 => core/121}/filelists/armv5tel/linux-kirkwood (100%)
copy config/rootfiles/{oldcore/100 => core/121}/filelists/armv5tel/linux-multi (100%)
copy config/rootfiles/{oldcore/100 => core/121}/filelists/armv5tel/linux-rpi (100%)
copy config/rootfiles/{oldcore/66 => core/121}/filelists/armv5tel/rpi-firmware (100%)
copy config/rootfiles/{oldcore/66 => core/121}/filelists/armv5tel/u-boot (100%)
create mode 120000 config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood
create mode 120000 config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage
copy config/rootfiles/{oldcore/77 => core/121}/filelists/beep (100%)
copy config/rootfiles/{oldcore/92 => core/121}/filelists/ca-certificates (100%)
copy config/rootfiles/{oldcore/112 => core/121}/filelists/cmake (100%)
copy config/rootfiles/{oldcore/46 => core/121}/filelists/crda (100%)
copy config/rootfiles/{oldcore/111 => core/121}/filelists/dhcp (100%)
copy config/rootfiles/{oldcore/106 => core/121}/filelists/flex (100%)
copy config/rootfiles/{oldcore/100 => core/121}/filelists/i586/grub (100%)
create mode 120000 config/rootfiles/core/121/filelists/i586/intel-microcode
copy config/rootfiles/{oldcore/100 => core/121}/filelists/i586/linux (100%)
copy config/rootfiles/{oldcore/100 => core/121}/filelists/i586/linux-initrd (100%)
copy config/rootfiles/{oldcore/28 => core/121}/filelists/iw (100%)
copy config/rootfiles/{oldcore/71 => core/121}/filelists/jwhois (100%)
copy config/rootfiles/{oldcore/28 => core/121}/filelists/linux-firmware (100%)
copy config/rootfiles/{oldcore/87 => core/121}/filelists/multipath-tools (100%)
copy config/rootfiles/{oldcore/100 => core/121}/filelists/openssl (100%)
copy config/rootfiles/{oldcore/77 => core/121}/filelists/rng-tools (100%)
copy config/rootfiles/{oldcore/28 => core/121}/filelists/tar (100%)
copy config/rootfiles/{oldcore/106 => core/121}/filelists/unbound (100%)
copy config/rootfiles/{oldcore/104 => core/121}/filelists/wget (100%)
copy config/rootfiles/{oldcore/100 => core/121}/filelists/x86_64/grub (100%)
create mode 120000 config/rootfiles/core/121/filelists/x86_64/intel-microcode
copy config/rootfiles/{oldcore/100 => core/121}/filelists/x86_64/linux (100%)
copy config/rootfiles/{oldcore/100 => core/121}/filelists/x86_64/linux-initrd (100%)
create mode 120000 config/rootfiles/core/121/filelists/xr819-firmware
copy config/rootfiles/{oldcore/90 => core/121}/filelists/xtables-addons (100%)
copy config/rootfiles/{oldcore/100 => core/121}/filelists/xz (100%)
Difference in files:
diff --git a/config/rootfiles/core/121/filelists/acpid b/config/rootfiles/core/121/filelists/acpid
new file mode 120000
index 000000000..73f1b7b0d
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/acpid
@@ -0,0 +1 @@
+../../../common/acpid
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/apache2 b/config/rootfiles/core/121/filelists/apache2
new file mode 120000
index 000000000..eef95efa7
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/apr b/config/rootfiles/core/121/filelists/apr
new file mode 120000
index 000000000..87dd1974f
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/apr
@@ -0,0 +1 @@
+../../../common/apr
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/aprutil b/config/rootfiles/core/121/filelists/aprutil
new file mode 120000
index 000000000..999f9f84b
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/aprutil
@@ -0,0 +1 @@
+../../../common/aprutil
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/armv5tel/files b/config/rootfiles/core/121/filelists/armv5tel/files
new file mode 100644
index 000000000..d2712ba53
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/armv5tel/files
@@ -0,0 +1 @@
+etc/rc.d/init.d/swconfig
diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood
new file mode 120000
index 000000000..39c5591b7
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-kirkwood
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-initrd-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi
new file mode 120000
index 000000000..0b1b4530a
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-initrd-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi b/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi
new file mode 120000
index 000000000..828106757
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/armv5tel/linux-initrd-rpi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-initrd-rpi
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood
new file mode 120000
index 000000000..72171071e
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/armv5tel/linux-kirkwood
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-multi b/config/rootfiles/core/121/filelists/armv5tel/linux-multi
new file mode 120000
index 000000000..204eb4c43
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/armv5tel/linux-multi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/armv5tel/linux-rpi b/config/rootfiles/core/121/filelists/armv5tel/linux-rpi
new file mode 120000
index 000000000..a651a498f
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/armv5tel/linux-rpi
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-rpi
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/armv5tel/rpi-firmware b/config/rootfiles/core/121/filelists/armv5tel/rpi-firmware
new file mode 120000
index 000000000..428fdf88f
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/armv5tel/rpi-firmware
@@ -0,0 +1 @@
+../../../../common/armv5tel/rpi-firmware
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/armv5tel/u-boot b/config/rootfiles/core/121/filelists/armv5tel/u-boot
new file mode 120000
index 000000000..3df31a883
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/armv5tel/u-boot
@@ -0,0 +1 @@
+../../../../common/armv5tel/u-boot
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood b/config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood
new file mode 120000
index 000000000..eebbdb14a
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/armv5tel/u-boot-kirkwood
@@ -0,0 +1 @@
+../../../../common/armv5tel/u-boot-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage b/config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage
new file mode 120000
index 000000000..65fe960ae
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/armv5tel/u-boot-mkimage
@@ -0,0 +1 @@
+../../../../common/armv5tel/u-boot-mkimage
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/beep b/config/rootfiles/core/121/filelists/beep
new file mode 120000
index 000000000..6db094efa
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/beep
@@ -0,0 +1 @@
+../../../common/beep
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/ca-certificates b/config/rootfiles/core/121/filelists/ca-certificates
new file mode 120000
index 000000000..320fea8f4
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/ca-certificates
@@ -0,0 +1 @@
+../../../common/ca-certificates
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/cmake b/config/rootfiles/core/121/filelists/cmake
new file mode 120000
index 000000000..491d25f72
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/cmake
@@ -0,0 +1 @@
+../../../common/cmake
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/crda b/config/rootfiles/core/121/filelists/crda
new file mode 120000
index 000000000..d68c46e55
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/crda
@@ -0,0 +1 @@
+../../../common/crda
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/dhcp b/config/rootfiles/core/121/filelists/dhcp
new file mode 120000
index 000000000..32d8da443
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/dhcp
@@ -0,0 +1 @@
+../../../common/dhcp
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/files b/config/rootfiles/core/121/filelists/files
index fc07ad7e9..a0bb9423c 100644
--- a/config/rootfiles/core/121/filelists/files
+++ b/config/rootfiles/core/121/filelists/files
@@ -1,6 +1,20 @@
etc/system-release
etc/issue
+etc/rc.d/init.d/acpid
+etc/rc.d/init.d/collectd
+etc/rc.d/init.d/firstsetup
+etc/rc.d/init.d/leds
+etc/rc.d/init.d/partresize
+etc/rc.d/init.d/rngd
+etc/rc.d/rc0.d/K87acpid
+etc/rc.d/rc3.d/S12acpid
+etc/rc.d/rc6.d/K87acpid
etc/ssl/certs/ca-bundle.crt
+srv/web/ipfire/cgi-bin/entropy.cgi
+srv/web/ipfire/cgi-bin/firewall.cgi
+srv/web/ipfire/cgi-bin/fwhosts.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
srv/web/ipfire/cgi-bin/remote.cgi
+usr/lib/firewall/firewall-lib.pl
var/ipfire/langs
+var/ipfire/qos/bin/makeqosscripts.pl
diff --git a/config/rootfiles/core/121/filelists/flex b/config/rootfiles/core/121/filelists/flex
new file mode 120000
index 000000000..feb0390ff
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/flex
@@ -0,0 +1 @@
+../../../common/flex
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/i586/grub b/config/rootfiles/core/121/filelists/i586/grub
new file mode 120000
index 000000000..feb236a22
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/i586/grub
@@ -0,0 +1 @@
+../../../../common/i586/grub
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/i586/intel-microcode b/config/rootfiles/core/121/filelists/i586/intel-microcode
new file mode 120000
index 000000000..f03e84778
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/i586/intel-microcode
@@ -0,0 +1 @@
+../../../../common/i586/intel-microcode
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/i586/linux b/config/rootfiles/core/121/filelists/i586/linux
new file mode 120000
index 000000000..693ec4bbf
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/i586/linux
@@ -0,0 +1 @@
+../../../../common/i586/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/i586/linux-initrd b/config/rootfiles/core/121/filelists/i586/linux-initrd
new file mode 120000
index 000000000..32a03e6a9
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/i586/linux-initrd
@@ -0,0 +1 @@
+../../../../common/i586/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/iw b/config/rootfiles/core/121/filelists/iw
new file mode 120000
index 000000000..7c58a2089
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/iw
@@ -0,0 +1 @@
+../../../common/iw
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/jwhois b/config/rootfiles/core/121/filelists/jwhois
new file mode 120000
index 000000000..b984a7f3f
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/jwhois
@@ -0,0 +1 @@
+../../../common/jwhois
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/linux-firmware b/config/rootfiles/core/121/filelists/linux-firmware
new file mode 120000
index 000000000..4bf91bca9
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/linux-firmware
@@ -0,0 +1 @@
+../../../common/linux-firmware
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/multipath-tools b/config/rootfiles/core/121/filelists/multipath-tools
new file mode 120000
index 000000000..9ff63237c
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/multipath-tools
@@ -0,0 +1 @@
+../../../common/multipath-tools
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/openssl b/config/rootfiles/core/121/filelists/openssl
new file mode 120000
index 000000000..e011a9266
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/rng-tools b/config/rootfiles/core/121/filelists/rng-tools
new file mode 120000
index 000000000..a7853e41b
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/rng-tools
@@ -0,0 +1 @@
+../../../common/rng-tools
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/tar b/config/rootfiles/core/121/filelists/tar
new file mode 120000
index 000000000..3e585d2eb
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/tar
@@ -0,0 +1 @@
+../../../common/tar
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/unbound b/config/rootfiles/core/121/filelists/unbound
new file mode 120000
index 000000000..66adf0924
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/unbound
@@ -0,0 +1 @@
+../../../common/unbound
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/wget b/config/rootfiles/core/121/filelists/wget
new file mode 120000
index 000000000..fcb57dfec
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/wget
@@ -0,0 +1 @@
+../../../common/wget
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/x86_64/grub b/config/rootfiles/core/121/filelists/x86_64/grub
new file mode 120000
index 000000000..78d3bd784
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/x86_64/grub
@@ -0,0 +1 @@
+../../../../common/x86_64/grub
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/x86_64/intel-microcode b/config/rootfiles/core/121/filelists/x86_64/intel-microcode
new file mode 120000
index 000000000..d5ac074e2
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/x86_64/intel-microcode
@@ -0,0 +1 @@
+../../../../common/x86_64/intel-microcode
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/x86_64/linux b/config/rootfiles/core/121/filelists/x86_64/linux
new file mode 120000
index 000000000..0615b5b9a
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/x86_64/linux
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/x86_64/linux-initrd b/config/rootfiles/core/121/filelists/x86_64/linux-initrd
new file mode 120000
index 000000000..1b9fff70f
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/x86_64/linux-initrd
@@ -0,0 +1 @@
+../../../../common/x86_64/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/xr819-firmware b/config/rootfiles/core/121/filelists/xr819-firmware
new file mode 120000
index 000000000..8b746aea4
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/xr819-firmware
@@ -0,0 +1 @@
+../../../common/xr819-firmware
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/xtables-addons b/config/rootfiles/core/121/filelists/xtables-addons
new file mode 120000
index 000000000..2e24c4298
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/xtables-addons
@@ -0,0 +1 @@
+../../../common/xtables-addons
\ No newline at end of file
diff --git a/config/rootfiles/core/121/filelists/xz b/config/rootfiles/core/121/filelists/xz
new file mode 120000
index 000000000..734e926c7
--- /dev/null
+++ b/config/rootfiles/core/121/filelists/xz
@@ -0,0 +1 @@
+../../../common/xz
\ No newline at end of file
diff --git a/config/rootfiles/core/121/update.sh b/config/rootfiles/core/121/update.sh
index 87d5f6ebd..76994d922 100644
--- a/config/rootfiles/core/121/update.sh
+++ b/config/rootfiles/core/121/update.sh
@@ -26,11 +26,56 @@
core=121
+exit_with_error() {
+ # Set last succesfull installed core.
+ echo $(($core-1)) > /opt/pakfire/db/core/mine
+ /usr/bin/logger -p syslog.emerg -t ipfire \
+ "core-update-${core}: $1"
+ exit $2
+}
+
# Remove old core updates from pakfire cache to save space...
for (( i=1; i<=$core; i++ )); do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
done
+# This update cannot be applied on ARM
+case "$(uname -a)" in
+ arm*)
+ exit_with_error "ERROR: Cannot update on ARM. Please re-install." 1
+ ;;
+esac
+
+# Do some sanity checks.
+case $(uname -r) in
+ *-ipfire*)
+ # Ok.
+ ;;
+ *)
+ exit_with_error "ERROR cannot update. No IPFire Kernel." 1
+ ;;
+esac
+
+# Check diskspace on root
+ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $ROOTSPACE -lt 100000 ]; then
+ exit_with_error "ERROR cannot update because not enough free space on root." 2
+ exit 2
+fi
+
+# Remove the old kernel
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/initramfs-*
+rm -rf /boot/vmlinuz-*
+rm -rf /boot/uImage-ipfire-*
+rm -rf /boot/zImage-ipfire-*
+rm -rf /boot/uInit-ipfire-*
+rm -rf /boot/dtb-*-ipfire-*
+rm -rf /lib/modules
+
# Stop services
# Extract files
diff --git a/lfs/Config b/lfs/Config
index 76f732de8..82bdde066 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -205,11 +205,9 @@ define PAK
sed -e 's/BUILDTARGET/$(BUILDTARGET)/g' -e 's/KVER/$(KVER)/g' -e 's/MACHINE/$(BUILD_ARCH)/g' -i /install/packages/package/ROOTFILES
sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh
chmod 755 /install/packages/package/{{,un}install,update}.sh
- cd / && tar cf /install/packages/package/files.tmp --files-from=/install/packages/package/ROOTFILES --exclude='#*' \
- -p --numeric-owner
+ cd / && tar cfp /install/packages/package/files.tmp --numeric-owner --exclude='#*' --files-from=/install/packages/package/ROOTFILES
# Double tar to remove double files
- tar xf /install/packages/package/files.tmp -C /install/packages/package/tmp/ \
- -p --numeric-owner
+ tar xfp /install/packages/package/files.tmp --numeric-owner -C /install/packages/package/tmp/
rm -f /install/packages/package/files.tmp
cd /install/packages/package/tmp/ && tar cf - -p --numeric-owner * | xz $(XZ_OPT) > /install/packages/package/files.tar.xz
rm -r /install/packages/package/tmp
diff --git a/lfs/cdrom b/lfs/cdrom
index 00f185d81..6382034b5 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -65,9 +65,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Compress root filesystem
# Reason for this tar+untar+tar is removing of entries listed two or more in src/ROOTFILES
- tar -c -C / --files-from=/tmp/ROOTFILES \
- -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \
- --exclude='proc/*' --exclude='tmp/ROOTFILES'
+ tar -c --exclude='#*' --exclude='proc/*' --exclude='dev/pts/*' --exclude='tmp/ROOTFILES' \
+ -C / --files-from=/tmp/ROOTFILES -f /$(SNAME).tar
rm -f /tmp/ROOTFILES
tar -x -C /tmp -f /$(SNAME).tar
rm -f /$(SNAME).tar
diff --git a/lfs/core-updates b/lfs/core-updates
index d34926967..3d12d40b1 100644
--- a/lfs/core-updates
+++ b/lfs/core-updates
@@ -72,10 +72,9 @@ core/%:
sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
#Remove doubled files with tar/untar/tar to save space
- tar -c -C / --files-from=/tmp/ROOTFILES \
- -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \
- --exclude='proc/*' --exclude='tmp/ROOTFILES' \
- --exclude-from=$(DIR_SRC)/config/rootfiles/$@/exclude
+ tar -c --exclude='proc/*' --exclude='tmp/ROOTFILES' --exclude='#*' --exclude='dev/pts/*' \
+ --exclude-from=$(DIR_SRC)/config/rootfiles/$@/exclude \
+ -C / --files-from=/tmp/ROOTFILES -f /$(SNAME).tar
mv -f /tmp/ROOTFILES /install/packages/package/ROOTFILES
tar -p --numeric-owner -x -C /tmp -f /$(SNAME).tar
rm -f /$(SNAME).tar
diff --git a/lfs/tar b/lfs/tar
index 6a949a003..4e914b535 100644
--- a/lfs/tar
+++ b/lfs/tar
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2018 Michael Tremer & Christian Schmidt #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 1.28
+VER = 1.30
THISAPP = tar-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8f32b2bc1ed7ddf4cf4e4a39711341b0
+$(DL_FILE)_MD5 = 8404e4c1fc5a3000228ab2b8ad674a65
install : $(TARGET)
diff --git a/make.sh b/make.sh
index aaaeb751e..dbe129745 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
-VERSION="2.19" # Version number
+VERSION="2.21" # Version number
CORE="121" # Core Level (Filename)
PAKFIRE_CORE="120" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 779706b5f8f0025690dec3f8bf32f32deb9f7e05
by gitï¼ ipfire.org 06 Jun '18
by gitï¼ ipfire.org 06 Jun '18
06 Jun '18
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 779706b5f8f0025690dec3f8bf32f32deb9f7e05 (commit)
from a4923c7f7534ee5037fad44ca0dad2ef1456194e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 779706b5f8f0025690dec3f8bf32f32deb9f7e05
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Jun 6 14:52:55 2018 +0200
flash-image: increase boot partition to match with iso install
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/flash-images | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Difference in files:
diff --git a/lfs/flash-images b/lfs/flash-images
index c15ab74cc..f2ac6a34a 100644
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -70,9 +70,9 @@ else
PART_TYPE = L
endif
-# /boot: 100MB - OFFSET
+# /boot: 128MB - OFFSET
# / : 1200 MB
-S_BOOT := $(shell echo $$(( 204800 - $(S_OFFSET) )))
+S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) )))
S_ROOT := 2477600
PADDING = 100 # MB
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a4923c7f7534ee5037fad44ca0dad2ef1456194e
by gitï¼ ipfire.org 06 Jun '18
by gitï¼ ipfire.org 06 Jun '18
06 Jun '18
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via a4923c7f7534ee5037fad44ca0dad2ef1456194e (commit)
from c03e8bd6ef18c138b33b1eeadc95b397054ac76e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a4923c7f7534ee5037fad44ca0dad2ef1456194e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Jun 6 11:28:11 2018 +0200
Config: follow symlinks at rootfile check
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/Config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Difference in files:
diff --git a/lfs/Config b/lfs/Config
index 1cb9e2db4..76f732de8 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -136,7 +136,7 @@ define POSTBUILD
if [ -s "$(TARGET)_diff" ]; then \
LFS_SCRIPT=$(firstword $(MAKEFILE_LIST))$(KCFG); \
echo $(LFS_SCRIPT); \
- ROOTFILE=$$(find $(DIR_SRC)/config/rootfiles/{common,packages}/{$(BUILD_ARCH),} -maxdepth 1 -type f -name $$LFS_SCRIPT 2>/dev/null | head -1); \
+ ROOTFILE=$$(find -L $(DIR_SRC)/config/rootfiles/{common,packages}/{$(BUILD_ARCH),} -maxdepth 1 -type f -name $$LFS_SCRIPT 2>/dev/null | head -1); \
if [ "$$ROOTFILE" = "" ]; then \
touch $(TARGET)_missing_rootfile; \
ROOTFILE=$(TARGET)_missing_rootfile ; \
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c03e8bd6ef18c138b33b1eeadc95b397054ac76e
by gitï¼ ipfire.org 06 Jun '18
by gitï¼ ipfire.org 06 Jun '18
06 Jun '18
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via c03e8bd6ef18c138b33b1eeadc95b397054ac76e (commit)
from 3da7324a721be7bc8f76e8b17068c18aeeae6bdd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c03e8bd6ef18c138b33b1eeadc95b397054ac76e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Jun 6 07:26:55 2018 +0200
kernel: update to 4.14.48
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/linux | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Difference in files:
diff --git a/lfs/linux b/lfs/linux
index 62c43aac0..de1b8285c 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
include Config
-VER = 4.14.47
-ARM_PATCHES = 4.14.47-ipfire0
+VER = 4.14.48
+ARM_PATCHES = 4.14.48-ipfire0
THISAPP = linux-$(VER)
DL_FILE = linux-$(VER).tar.xz
@@ -75,7 +75,7 @@ objects =$(DL_FILE) \
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
-$(DL_FILE)_MD5 = c998ebfbabfdc640060b28839a7a9fca
+$(DL_FILE)_MD5 = 417214059879164ab422fa359af80900
arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 7c6e98b0514945a4e65e0c43b9920035
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3da7324a721be7bc8f76e8b17068c18aeeae6bdd
by gitï¼ ipfire.org 04 Jun '18
by gitï¼ ipfire.org 04 Jun '18
04 Jun '18
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 3da7324a721be7bc8f76e8b17068c18aeeae6bdd (commit)
from 5bb288a244156c95a61cdf2f3b416061c867bf26 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3da7324a721be7bc8f76e8b17068c18aeeae6bdd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Jun 4 20:32:26 2018 +0100
aarch64: Rootfile update for Python 3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/packages/aarch64/python3 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Difference in files:
diff --git a/config/rootfiles/packages/aarch64/python3 b/config/rootfiles/packages/aarch64/python3
index 06be65058..a1b17d942 100644
--- a/config/rootfiles/packages/aarch64/python3
+++ b/config/rootfiles/packages/aarch64/python3
@@ -2714,7 +2714,7 @@ usr/lib/python3.6/lib-dynload/_ctypes_test.cpython-36m-aarch64-linux-gnu.so
usr/lib/python3.6/lib-dynload/_curses.cpython-36m-aarch64-linux-gnu.so
usr/lib/python3.6/lib-dynload/_curses_panel.cpython-36m-aarch64-linux-gnu.so
usr/lib/python3.6/lib-dynload/_datetime.cpython-36m-aarch64-linux-gnu.so
-usr/lib/python3.6/lib-dynload/_dbm.cpython-36m-aarch64-linux-gnu.so
+usr/lib/python3.6/lib-dynload/_dbm.cpython-36m-aarch64-linux-gnu_failed.so
usr/lib/python3.6/lib-dynload/_decimal.cpython-36m-aarch64-linux-gnu.so
usr/lib/python3.6/lib-dynload/_elementtree.cpython-36m-aarch64-linux-gnu.so
usr/lib/python3.6/lib-dynload/_gdbm.cpython-36m-aarch64-linux-gnu.so
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5bb288a244156c95a61cdf2f3b416061c867bf26
by gitï¼ ipfire.org 04 Jun '18
by gitï¼ ipfire.org 04 Jun '18
04 Jun '18
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 5bb288a244156c95a61cdf2f3b416061c867bf26 (commit)
from d7ce23e5deccf3fbe56c44ff4c29817c03166c76 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5bb288a244156c95a61cdf2f3b416061c867bf26
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Jun 1 19:54:29 2018 +0200
dhcp: Update to 4.4.1
For details see:
https://kb.isc.org/article/AA-01571/82/DHCP-4.4.1-Release-Notes.html
This should close https://bugzilla.ipfire.org/show_bug.cgi?id=11697 and
https://bugzilla.ipfire.org/show_bug.cgi?id=11293.
This update required some changes as described in:
https://bugzilla.ipfire.org/show_bug.cgi?id=11697#c6
Thanks to all testers! ;-)
Best,
Matthias
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/dhcp | 4 +-
lfs/dhcp | 39 +-
src/patches/dhcp/dhcp-64_bit_lease_parse.patch | 75 ---
src/patches/dhcp/dhcp-CLOEXEC.patch | 342 ------------
src/patches/dhcp/dhcp-PPP.patch | 150 ------
src/patches/dhcp/dhcp-UseMulticast.patch | 241 ---------
src/patches/dhcp/dhcp-add_timeout_when_NULL.patch | 14 -
src/patches/dhcp/dhcp-capability.patch | 250 ---------
.../dhcp/dhcp-default-requested-options.patch | 44 --
.../dhcp/dhcp-dhclient-decline-backoff.patch | 63 ---
src/patches/dhcp/dhcp-dhclient-options.patch | 509 ------------------
src/patches/dhcp/dhcp-errwarn-message.patch | 22 -
src/patches/dhcp/dhcp-garbage-chars.patch | 12 -
src/patches/dhcp/dhcp-gpxe-cid.patch | 73 ---
src/patches/dhcp/dhcp-honor-expired.patch | 49 --
src/patches/dhcp/dhcp-improved-xid.patch | 138 -----
src/patches/dhcp/dhcp-logpid.patch | 11 -
src/patches/dhcp/dhcp-lpf-ib.patch | 585 ---------------------
src/patches/dhcp/dhcp-manpages.patch | 157 ------
src/patches/dhcp/dhcp-paranoia.patch | 156 ------
src/patches/dhcp/dhcp-paths.patch | 44 --
src/patches/dhcp/dhcp-release-by-ifup.patch | 85 ---
src/patches/dhcp/dhcp-remove-bind.patch | 192 -------
.../dhcp-rfc3442-classless-static-routes.patch | 405 --------------
src/patches/dhcp/dhcp-sendDecline.patch | 231 --------
src/patches/dhcp/dhcp-sharedlib.patch | 107 ----
src/patches/dhcp/dhcp-stateless-DUID-LLT.patch | 48 --
src/patches/dhcp/dhcp-unicast-bootp.patch | 101 ----
src/patches/dhcp/dhcp-xen-checksum.patch | 251 ---------
29 files changed, 7 insertions(+), 4391 deletions(-)
delete mode 100644 src/patches/dhcp/dhcp-64_bit_lease_parse.patch
delete mode 100644 src/patches/dhcp/dhcp-CLOEXEC.patch
delete mode 100644 src/patches/dhcp/dhcp-PPP.patch
delete mode 100644 src/patches/dhcp/dhcp-UseMulticast.patch
delete mode 100644 src/patches/dhcp/dhcp-add_timeout_when_NULL.patch
delete mode 100644 src/patches/dhcp/dhcp-capability.patch
delete mode 100644 src/patches/dhcp/dhcp-default-requested-options.patch
delete mode 100644 src/patches/dhcp/dhcp-dhclient-decline-backoff.patch
delete mode 100644 src/patches/dhcp/dhcp-dhclient-options.patch
delete mode 100644 src/patches/dhcp/dhcp-errwarn-message.patch
delete mode 100644 src/patches/dhcp/dhcp-garbage-chars.patch
delete mode 100644 src/patches/dhcp/dhcp-gpxe-cid.patch
delete mode 100644 src/patches/dhcp/dhcp-honor-expired.patch
delete mode 100644 src/patches/dhcp/dhcp-improved-xid.patch
delete mode 100644 src/patches/dhcp/dhcp-logpid.patch
delete mode 100644 src/patches/dhcp/dhcp-lpf-ib.patch
delete mode 100644 src/patches/dhcp/dhcp-manpages.patch
delete mode 100644 src/patches/dhcp/dhcp-paranoia.patch
delete mode 100644 src/patches/dhcp/dhcp-paths.patch
delete mode 100644 src/patches/dhcp/dhcp-release-by-ifup.patch
delete mode 100644 src/patches/dhcp/dhcp-remove-bind.patch
delete mode 100644 src/patches/dhcp/dhcp-rfc3442-classless-static-routes.patch
delete mode 100644 src/patches/dhcp/dhcp-sendDecline.patch
delete mode 100644 src/patches/dhcp/dhcp-sharedlib.patch
delete mode 100644 src/patches/dhcp/dhcp-stateless-DUID-LLT.patch
delete mode 100644 src/patches/dhcp/dhcp-unicast-bootp.patch
delete mode 100644 src/patches/dhcp/dhcp-xen-checksum.patch
Difference in files:
diff --git a/config/rootfiles/common/dhcp b/config/rootfiles/common/dhcp
index ff225a571..9e6d52e4e 100644
--- a/config/rootfiles/common/dhcp
+++ b/config/rootfiles/common/dhcp
@@ -5,8 +5,6 @@ etc/dhcp/dhcpd.conf
#usr/bin/omshell
#usr/include/dhcpctl
#usr/include/dhcpctl/dhcpctl.h
-#usr/include/isc-dhcp
-#usr/include/isc-dhcp/dst.h
#usr/include/omapip
#usr/include/omapip/alloc.h
#usr/include/omapip/buffer.h
@@ -17,8 +15,8 @@ etc/dhcp/dhcpd.conf
#usr/include/omapip/omapip_p.h
#usr/include/omapip/result.h
#usr/include/omapip/trace.h
+#usr/lib/libdhcp.a
#usr/lib/libdhcpctl.a
-#usr/lib/libdst.a
#usr/lib/libomapi.a
#usr/sbin/dhclient
usr/sbin/dhcpd
diff --git a/lfs/dhcp b/lfs/dhcp
index 262a25129..a055d6081 100644
--- a/lfs/dhcp
+++ b/lfs/dhcp
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 4.3.1
+VER = 4.4.1
THISAPP = dhcp-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b3a42ece3c7f2cd2e74a3e12ca881d20
+$(DL_FILE)_MD5 = 18c7f4dcbb0a63df25098216d47b1ede
install : $(TARGET)
@@ -71,47 +71,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-remove-bind.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-errwarn-message.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-dhclient-options.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-release-by-ifup.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-dhclient-decline-backoff.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-unicast-bootp.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-default-requested-options.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-xen-checksum.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-manpages.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-paths.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-CLOEXEC.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-garbage-chars.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-add_timeout_when_NULL.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-64_bit_lease_parse.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-capability.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-logpid.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-UseMulticast.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-sendDecline.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-rfc3442-classless-static-routes.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-honor-expired.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-sharedlib.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-PPP.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-paranoia.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-lpf-ib.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-improved-xid.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-gpxe-cid.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dhcp/dhcp-stateless-DUID-LLT.patch
-
# Help unpacking bundled BIND
- cd $(DIR_APP) && sed -e "s/gunzip -c/&d/" -i bind/Makefile
+ cd $(DIR_APP) && sed -e "s/gunzip -c/&d/" -i bind/Makefile.in
cd $(DIR_APP) && \
./configure \
--prefix=/usr \
--sysconfdir=/etc/dhcp \
+ --with-srv-conf-file=/etc/dhcp/dhcpd.conf \
--with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
--enable-paranoia \
--enable-early-chroot \
--disable-dhcpv6
- cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make
cd $(DIR_APP) && make install
mkdir -pv /var/state/dhcp
diff --git a/src/patches/dhcp/dhcp-64_bit_lease_parse.patch b/src/patches/dhcp/dhcp-64_bit_lease_parse.patch
deleted file mode 100644
index a07b5b032..000000000
--- a/src/patches/dhcp/dhcp-64_bit_lease_parse.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -up dhcp-4.3.0a1/common/parse.c.64-bit_lease_parse dhcp-4.3.0a1/common/parse.c
---- dhcp-4.3.0a1/common/parse.c.64-bit_lease_parse 2013-12-11 01:25:12.000000000 +0100
-+++ dhcp-4.3.0a1/common/parse.c 2013-12-19 15:45:25.990771814 +0100
-@@ -938,8 +938,8 @@ TIME
- parse_date_core(cfile)
- struct parse *cfile;
- {
-- int guess;
-- int tzoff, year, mon, mday, hour, min, sec;
-+ TIME guess;
-+ long int tzoff, year, mon, mday, hour, min, sec;
- const char *val;
- enum dhcp_token token;
- static int months[11] = { 31, 59, 90, 120, 151, 181,
-@@ -965,7 +965,7 @@ parse_date_core(cfile)
- }
-
- skip_token(&val, NULL, cfile); /* consume number */
-- guess = atoi(val);
-+ guess = atol(val);
-
- return((TIME)guess);
- }
-@@ -993,7 +993,7 @@ parse_date_core(cfile)
- somebody invents a time machine, I think we can safely disregard
- it. This actually works around a stupid Y2K bug that was present
- in a very early beta release of dhcpd. */
-- year = atoi(val);
-+ year = atol(val);
- if (year > 1900)
- year -= 1900;
-
-@@ -1039,7 +1039,7 @@ parse_date_core(cfile)
- return((TIME)0);
- }
- skip_token(&val, NULL, cfile); /* consume day of month */
-- mday = atoi(val);
-+ mday = atol(val);
-
- /* Hour... */
- token = peek_token(&val, NULL, cfile);
-@@ -1050,7 +1050,7 @@ parse_date_core(cfile)
- return((TIME)0);
- }
- skip_token(&val, NULL, cfile); /* consume hour */
-- hour = atoi(val);
-+ hour = atol(val);
-
- /* Colon separating hour from minute... */
- token = peek_token(&val, NULL, cfile);
-@@ -1072,7 +1072,7 @@ parse_date_core(cfile)
- return((TIME)0);
- }
- skip_token(&val, NULL, cfile); /* consume minute */
-- min = atoi(val);
-+ min = atol(val);
-
- /* Colon separating minute from second... */
- token = peek_token(&val, NULL, cfile);
-@@ -1094,13 +1094,13 @@ parse_date_core(cfile)
- return((TIME)0);
- }
- skip_token(&val, NULL, cfile); /* consume second */
-- sec = atoi(val);
-+ sec = atol(val);
-
- tzoff = 0;
- token = peek_token(&val, NULL, cfile);
- if (token == NUMBER) {
- skip_token(&val, NULL, cfile); /* consume tzoff */
-- tzoff = atoi(val);
-+ tzoff = atol(val);
- } else if (token != SEMI) {
- skip_token(&val, NULL, cfile);
- parse_warn(cfile,
diff --git a/src/patches/dhcp/dhcp-CLOEXEC.patch b/src/patches/dhcp/dhcp-CLOEXEC.patch
deleted file mode 100644
index 722865e4f..000000000
--- a/src/patches/dhcp/dhcp-CLOEXEC.patch
+++ /dev/null
@@ -1,342 +0,0 @@
-diff -up dhcp-4.3.0a1/client/clparse.c.cloexec dhcp-4.3.0a1/client/clparse.c
---- dhcp-4.3.0a1/client/clparse.c.cloexec 2013-12-19 15:34:41.638886256 +0100
-+++ dhcp-4.3.0a1/client/clparse.c 2013-12-19 15:34:41.657885985 +0100
-@@ -253,7 +253,7 @@ int read_client_conf_file (const char *n
- int token;
- isc_result_t status;
-
-- if ((file = open (name, O_RDONLY)) < 0)
-+ if ((file = open (name, O_RDONLY | O_CLOEXEC)) < 0)
- return uerr2isc (errno);
-
- cfile = NULL;
-@@ -290,7 +290,7 @@ void read_client_leases ()
-
- /* Open the lease file. If we can't open it, just return -
- we can safely trust the server to remember our state. */
-- if ((file = open (path_dhclient_db, O_RDONLY)) < 0)
-+ if ((file = open (path_dhclient_db, O_RDONLY | O_CLOEXEC)) < 0)
- return;
-
- cfile = NULL;
-diff -up dhcp-4.3.0a1/client/dhclient.c.cloexec dhcp-4.3.0a1/client/dhclient.c
---- dhcp-4.3.0a1/client/dhclient.c.cloexec 2013-12-19 15:34:41.629886384 +0100
-+++ dhcp-4.3.0a1/client/dhclient.c 2013-12-19 15:36:41.608180467 +0100
-@@ -148,11 +148,11 @@ main(int argc, char **argv) {
- /* Make sure that file descriptors 0 (stdin), 1, (stdout), and
- 2 (stderr) are open. To do this, we assume that when we
- open a file the lowest available file descriptor is used. */
-- fd = open("/dev/null", O_RDWR);
-+ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
- if (fd == 0)
-- fd = open("/dev/null", O_RDWR);
-+ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
- if (fd == 1)
-- fd = open("/dev/null", O_RDWR);
-+ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
- if (fd == 2)
- log_perror = 0; /* No sense logging to /dev/null. */
- else if (fd != -1)
-@@ -504,7 +504,7 @@ main(int argc, char **argv) {
- long temp;
- int e;
-
-- if ((pidfd = fopen(path_dhclient_pid, "r")) != NULL) {
-+ if ((pidfd = fopen(path_dhclient_pid, "re")) != NULL) {
- e = fscanf(pidfd, "%ld\n", &temp);
- oldpid = (pid_t)temp;
-
-@@ -554,7 +554,7 @@ main(int argc, char **argv) {
- strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx);
- sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name);
-
-- if ((pidfd = fopen(new_path_dhclient_pid, "r")) != NULL) {
-+ if ((pidfd = fopen(new_path_dhclient_pid, "re")) != NULL) {
- e = fscanf(pidfd, "%ld\n", &temp);
- oldpid = (pid_t)temp;
-
-@@ -579,7 +579,7 @@ main(int argc, char **argv) {
- int dhc_running = 0;
- char procfn[256] = "";
-
-- if ((pidfp = fopen(path_dhclient_pid, "r")) != NULL) {
-+ if ((pidfp = fopen(path_dhclient_pid, "re")) != NULL) {
- if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) {
- snprintf(procfn,256,"/proc/%u",dhcpid);
- dhc_running = (access(procfn, F_OK) == 0);
-@@ -3077,7 +3077,7 @@ void rewrite_client_leases ()
-
- if (leaseFile != NULL)
- fclose (leaseFile);
-- leaseFile = fopen (path_dhclient_db, "w");
-+ leaseFile = fopen (path_dhclient_db, "we");
- if (leaseFile == NULL) {
- log_error ("can't create %s: %m", path_dhclient_db);
- return;
-@@ -3261,7 +3261,7 @@ write_duid(struct data_string *duid)
- return DHCP_R_INVALIDARG;
-
- if (leaseFile == NULL) { /* XXX? */
-- leaseFile = fopen(path_dhclient_db, "w");
-+ leaseFile = fopen(path_dhclient_db, "we");
- if (leaseFile == NULL) {
- log_error("can't create %s: %m", path_dhclient_db);
- return ISC_R_IOERROR;
-@@ -3441,7 +3441,7 @@ int write_client_lease (client, lease, r
- return 1;
-
- if (leaseFile == NULL) { /* XXX */
-- leaseFile = fopen (path_dhclient_db, "w");
-+ leaseFile = fopen (path_dhclient_db, "we");
- if (leaseFile == NULL) {
- log_error ("can't create %s: %m", path_dhclient_db);
- return 0;
-@@ -3952,9 +3952,9 @@ void go_daemon ()
- (void) close(2);
-
- /* Reopen them on /dev/null. */
-- (void) open("/dev/null", O_RDWR);
-- (void) open("/dev/null", O_RDWR);
-- (void) open("/dev/null", O_RDWR);
-+ (void) open("/dev/null", O_RDWR | O_CLOEXEC);
-+ (void) open("/dev/null", O_RDWR | O_CLOEXEC);
-+ (void) open("/dev/null", O_RDWR | O_CLOEXEC);
-
- write_client_pid_file ();
-
-@@ -3971,14 +3971,14 @@ void write_client_pid_file ()
- return;
- }
-
-- pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY, 0644);
-+ pfdesc = open (path_dhclient_pid, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644);
-
- if (pfdesc < 0) {
- log_error ("Can't create %s: %m", path_dhclient_pid);
- return;
- }
-
-- pf = fdopen (pfdesc, "w");
-+ pf = fdopen (pfdesc, "we");
- if (!pf) {
- close(pfdesc);
- log_error ("Can't fdopen %s: %m", path_dhclient_pid);
-diff -up dhcp-4.3.0a1/common/bpf.c.cloexec dhcp-4.3.0a1/common/bpf.c
---- dhcp-4.3.0a1/common/bpf.c.cloexec 2013-12-19 15:34:41.640886227 +0100
-+++ dhcp-4.3.0a1/common/bpf.c 2013-12-19 15:34:41.661885928 +0100
-@@ -95,7 +95,7 @@ int if_register_bpf (info)
- for (b = 0; 1; b++) {
- /* %Audit% 31 bytes max. %2004.06.17,Safe% */
- sprintf(filename, BPF_FORMAT, b);
-- sock = open (filename, O_RDWR, 0);
-+ sock = open (filename, O_RDWR | O_CLOEXEC, 0);
- if (sock < 0) {
- if (errno == EBUSY) {
- continue;
-diff -up dhcp-4.3.0a1/common/dlpi.c.cloexec dhcp-4.3.0a1/common/dlpi.c
---- dhcp-4.3.0a1/common/dlpi.c.cloexec 2013-12-19 15:34:41.641886213 +0100
-+++ dhcp-4.3.0a1/common/dlpi.c 2013-12-19 15:34:41.662885914 +0100
-@@ -804,7 +804,7 @@ dlpiopen(const char *ifname) {
- }
- *dp = '\0';
-
-- return open (devname, O_RDWR, 0);
-+ return open (devname, O_RDWR | O_CLOEXEC, 0);
- }
-
- /*
-diff -up dhcp-4.3.0a1/common/nit.c.cloexec dhcp-4.3.0a1/common/nit.c
---- dhcp-4.3.0a1/common/nit.c.cloexec 2013-12-19 15:34:41.642886199 +0100
-+++ dhcp-4.3.0a1/common/nit.c 2013-12-19 15:34:41.662885914 +0100
-@@ -81,7 +81,7 @@ int if_register_nit (info)
- struct strioctl sio;
-
- /* Open a NIT device */
-- sock = open ("/dev/nit", O_RDWR);
-+ sock = open ("/dev/nit", O_RDWR | O_CLOEXEC);
- if (sock < 0)
- log_fatal ("Can't open NIT device for %s: %m", info -> name);
-
-diff -up dhcp-4.3.0a1/common/resolv.c.cloexec dhcp-4.3.0a1/common/resolv.c
---- dhcp-4.3.0a1/common/resolv.c.cloexec 2013-12-11 01:25:12.000000000 +0100
-+++ dhcp-4.3.0a1/common/resolv.c 2013-12-19 15:34:41.663885900 +0100
-@@ -50,7 +50,7 @@ void read_resolv_conf (parse_time)
- struct domain_search_list *dp, *dl, *nd;
- isc_result_t status;
-
-- if ((file = open (path_resolv_conf, O_RDONLY)) < 0) {
-+ if ((file = open (path_resolv_conf, O_RDONLY | O_CLOEXEC)) < 0) {
- log_error ("Can't open %s: %m", path_resolv_conf);
- return;
- }
-diff -up dhcp-4.3.0a1/common/upf.c.cloexec dhcp-4.3.0a1/common/upf.c
---- dhcp-4.3.0a1/common/upf.c.cloexec 2013-12-19 15:34:41.642886199 +0100
-+++ dhcp-4.3.0a1/common/upf.c 2013-12-19 15:34:41.663885900 +0100
-@@ -77,7 +77,7 @@ int if_register_upf (info)
- /* %Audit% Cannot exceed 36 bytes. %2004.06.17,Safe% */
- sprintf(filename, "/dev/pf/pfilt%d", b);
-
-- sock = open (filename, O_RDWR, 0);
-+ sock = open (filename, O_RDWR | O_CLOEXEC, 0);
- if (sock < 0) {
- if (errno == EBUSY) {
- continue;
-diff -up dhcp-4.3.0a1/omapip/trace.c.cloexec dhcp-4.3.0a1/omapip/trace.c
---- dhcp-4.3.0a1/omapip/trace.c.cloexec 2013-12-11 01:01:03.000000000 +0100
-+++ dhcp-4.3.0a1/omapip/trace.c 2013-12-19 15:34:41.663885900 +0100
-@@ -142,10 +142,10 @@ isc_result_t trace_begin (const char *fi
- return DHCP_R_INVALIDARG;
- }
-
-- traceoutfile = open (filename, O_CREAT | O_WRONLY | O_EXCL, 0600);
-+ traceoutfile = open (filename, O_CREAT | O_WRONLY | O_EXCL | O_CLOEXEC, 0600);
- if (traceoutfile < 0 && errno == EEXIST) {
- log_error ("WARNING: Overwriting trace file \"%s\"", filename);
-- traceoutfile = open (filename, O_WRONLY | O_EXCL | O_TRUNC,
-+ traceoutfile = open (filename, O_WRONLY | O_EXCL | O_TRUNC | O_CLOEXEC,
- 0600);
- }
-
-@@ -433,7 +433,7 @@ void trace_file_replay (const char *file
- isc_result_t result;
- int len;
-
-- traceinfile = fopen (filename, "r");
-+ traceinfile = fopen (filename, "re");
- if (!traceinfile) {
- log_error("Can't open tracefile %s: %m", filename);
- return;
-diff -up dhcp-4.3.0a1/relay/dhcrelay.c.cloexec dhcp-4.3.0a1/relay/dhcrelay.c
---- dhcp-4.3.0a1/relay/dhcrelay.c.cloexec 2013-12-13 22:26:21.000000000 +0100
-+++ dhcp-4.3.0a1/relay/dhcrelay.c 2013-12-19 15:34:41.664885886 +0100
-@@ -193,11 +193,11 @@ main(int argc, char **argv) {
- /* Make sure that file descriptors 0(stdin), 1,(stdout), and
- 2(stderr) are open. To do this, we assume that when we
- open a file the lowest available file descriptor is used. */
-- fd = open("/dev/null", O_RDWR);
-+ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
- if (fd == 0)
-- fd = open("/dev/null", O_RDWR);
-+ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
- if (fd == 1)
-- fd = open("/dev/null", O_RDWR);
-+ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
- if (fd == 2)
- log_perror = 0; /* No sense logging to /dev/null. */
- else if (fd != -1)
-@@ -564,13 +564,13 @@ main(int argc, char **argv) {
-
- if (no_pid_file == ISC_FALSE) {
- pfdesc = open(path_dhcrelay_pid,
-- O_CREAT | O_TRUNC | O_WRONLY, 0644);
-+ O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC, 0644);
-
- if (pfdesc < 0) {
- log_error("Can't create %s: %m",
- path_dhcrelay_pid);
- } else {
-- pf = fdopen(pfdesc, "w");
-+ pf = fdopen(pfdesc, "we");
- if (!pf)
- log_error("Can't fdopen %s: %m",
- path_dhcrelay_pid);
-diff -up dhcp-4.3.0a1/server/confpars.c.cloexec dhcp-4.3.0a1/server/confpars.c
---- dhcp-4.3.0a1/server/confpars.c.cloexec 2013-12-11 01:25:12.000000000 +0100
-+++ dhcp-4.3.0a1/server/confpars.c 2013-12-19 15:34:41.665885871 +0100
-@@ -117,7 +117,7 @@ isc_result_t read_conf_file (const char
- }
- #endif
-
-- if ((file = open (filename, O_RDONLY)) < 0) {
-+ if ((file = open (filename, O_RDONLY | O_CLOEXEC)) < 0) {
- if (leasep) {
- log_error ("Can't open lease database %s: %m --",
- path_dhcpd_db);
-diff -up dhcp-4.3.0a1/server/db.c.cloexec dhcp-4.3.0a1/server/db.c
---- dhcp-4.3.0a1/server/db.c.cloexec 2013-12-11 01:25:12.000000000 +0100
-+++ dhcp-4.3.0a1/server/db.c 2013-12-19 15:34:41.666885857 +0100
-@@ -1081,7 +1081,7 @@ void db_startup (testp)
- }
- #endif
- if (!testp) {
-- db_file = fopen (path_dhcpd_db, "a");
-+ db_file = fopen (path_dhcpd_db, "ae");
- if (!db_file)
- log_fatal ("Can't open %s for append.", path_dhcpd_db);
- expire_all_pools ();
-@@ -1129,12 +1129,12 @@ int new_lease_file ()
- path_dhcpd_db, (int)t) >= sizeof newfname)
- log_fatal("new_lease_file: lease file path too long");
-
-- db_fd = open (newfname, O_WRONLY | O_TRUNC | O_CREAT, 0664);
-+ db_fd = open (newfname, O_WRONLY | O_TRUNC | O_CREAT | O_CLOEXEC, 0664);
- if (db_fd < 0) {
- log_error ("Can't create new lease file: %m");
- return 0;
- }
-- if ((new_db_file = fdopen(db_fd, "w")) == NULL) {
-+ if ((new_db_file = fdopen(db_fd, "we")) == NULL) {
- log_error("Can't fdopen new lease file: %m");
- close(db_fd);
- goto fdfail;
-diff -up dhcp-4.3.0a1/server/dhcpd.c.cloexec dhcp-4.3.0a1/server/dhcpd.c
---- dhcp-4.3.0a1/server/dhcpd.c.cloexec 2013-12-13 22:26:01.000000000 +0100
-+++ dhcp-4.3.0a1/server/dhcpd.c 2013-12-19 15:37:17.258674472 +0100
-@@ -193,11 +193,11 @@ main(int argc, char **argv) {
- /* Make sure that file descriptors 0 (stdin), 1, (stdout), and
- 2 (stderr) are open. To do this, we assume that when we
- open a file the lowest available file descriptor is used. */
-- fd = open("/dev/null", O_RDWR);
-+ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
- if (fd == 0)
-- fd = open("/dev/null", O_RDWR);
-+ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
- if (fd == 1)
-- fd = open("/dev/null", O_RDWR);
-+ fd = open("/dev/null", O_RDWR | O_CLOEXEC);
- if (fd == 2)
- log_perror = 0; /* No sense logging to /dev/null. */
- else if (fd != -1)
-@@ -716,7 +716,7 @@ main(int argc, char **argv) {
- */
- if (no_pid_file == ISC_FALSE) {
- /*Read previous pid file. */
-- if ((i = open (path_dhcpd_pid, O_RDONLY)) >= 0) {
-+ if ((i = open (path_dhcpd_pid, O_RDONLY | O_CLOEXEC)) >= 0) {
- status = read(i, pbuf, (sizeof pbuf) - 1);
- close (i);
- if (status > 0) {
-@@ -735,7 +735,7 @@ main(int argc, char **argv) {
- }
-
- /* Write new pid file. */
-- i = open(path_dhcpd_pid, O_WRONLY|O_CREAT|O_TRUNC, 0644);
-+ i = open(path_dhcpd_pid, O_WRONLY|O_CREAT|O_TRUNC|O_CLOEXEC, 0644);
- if (i >= 0) {
- sprintf(pbuf, "%d\n", (int) getpid());
- IGNORE_RET (write(i, pbuf, strlen(pbuf)));
-@@ -763,9 +763,9 @@ main(int argc, char **argv) {
- (void) close(2);
-
- /* Reopen them on /dev/null. */
-- (void) open("/dev/null", O_RDWR);
-- (void) open("/dev/null", O_RDWR);
-- (void) open("/dev/null", O_RDWR);
-+ (void) open("/dev/null", O_RDWR | O_CLOEXEC);
-+ (void) open("/dev/null", O_RDWR | O_CLOEXEC);
-+ (void) open("/dev/null", O_RDWR | O_CLOEXEC);
- log_perror = 0; /* No sense logging to /dev/null. */
-
- IGNORE_RET (chdir("/"));
-diff -up dhcp-4.3.0a1/server/ldap.c.cloexec dhcp-4.3.0a1/server/ldap.c
---- dhcp-4.3.0a1/server/ldap.c.cloexec 2013-12-11 01:25:12.000000000 +0100
-+++ dhcp-4.3.0a1/server/ldap.c 2013-12-19 15:34:41.667885843 +0100
-@@ -684,7 +684,7 @@ ldap_start (void)
-
- if (ldap_debug_file != NULL && ldap_debug_fd == -1)
- {
-- if ((ldap_debug_fd = open (ldap_debug_file, O_CREAT | O_TRUNC | O_WRONLY,
-+ if ((ldap_debug_fd = open (ldap_debug_file, O_CREAT | O_TRUNC | O_WRONLY | O_CLOEXEC,
- S_IRUSR | S_IWUSR)) < 0)
- log_error ("Error opening debug LDAP log file %s: %s", ldap_debug_file,
- strerror (errno));
diff --git a/src/patches/dhcp/dhcp-PPP.patch b/src/patches/dhcp/dhcp-PPP.patch
deleted file mode 100644
index 5d022e432..000000000
--- a/src/patches/dhcp/dhcp-PPP.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff -up dhcp-4.3.1b1/client/dhc6.c.mRfpsB dhcp-4.3.1b1/client/dhc6.c
---- dhcp-4.3.1b1/client/dhc6.c.mRfpsB 2014-07-10 17:48:03.779424870 +0200
-+++ dhcp-4.3.1b1/client/dhc6.c 2014-07-10 17:48:03.795424644 +0200
-@@ -5088,7 +5088,8 @@ make_client6_options(struct client_state
- */
- if ((oc = lookup_option(&dhcpv6_universe, *op,
- D6O_CLIENTID)) == NULL) {
-- if (!option_cache(&oc, &default_duid, NULL, clientid_option,
-+ if (default_duid.len == 0 ||
-+ !option_cache(&oc, &default_duid, NULL, clientid_option,
- MDL))
- log_fatal("Failure assembling a DUID.");
-
-diff -up dhcp-4.3.1b1/client/dhclient.c.mRfpsB dhcp-4.3.1b1/client/dhclient.c
---- dhcp-4.3.1b1/client/dhclient.c.mRfpsB 2014-07-10 17:39:25.853763858 +0200
-+++ dhcp-4.3.1b1/client/dhclient.c 2014-07-10 17:49:49.882925843 +0200
-@@ -948,8 +948,8 @@ main(int argc, char **argv) {
- if (default_duid.buffer != NULL)
- data_string_forget(&default_duid, MDL);
-
-- form_duid(&default_duid, MDL);
-- write_duid(&default_duid);
-+ if (form_duid(&default_duid, MDL) == ISC_R_SUCCESS)
-+ write_duid(&default_duid);
- }
- }
-
-@@ -3267,7 +3267,7 @@ write_options(struct client_state *clien
- * is not how it is intended. Upcoming rearchitecting the client should
- * address this "one daemon model."
- */
--void
-+isc_result_t
- form_duid(struct data_string *duid, const char *file, int line)
- {
- struct interface_info *ip;
-@@ -3280,6 +3280,15 @@ form_duid(struct data_string *duid, cons
- if (ip == NULL)
- log_fatal("Impossible condition at %s:%d.", MDL);
-
-+ while (ip && ip->hw_address.hbuf[0] == HTYPE_RESERVED) {
-+ /* Try the other interfaces */
-+ log_debug("Cannot form default DUID from interface %s.", ip->name);
-+ ip = ip->next;
-+ }
-+ if (ip == NULL) {
-+ return ISC_R_UNEXPECTED;
-+ }
-+
- if ((ip->hw_address.hlen == 0) ||
- (ip->hw_address.hlen > sizeof(ip->hw_address.hbuf)))
- log_fatal("Impossible hardware address length at %s:%d.", MDL);
-@@ -3323,6 +3332,8 @@ form_duid(struct data_string *duid, cons
- log_info("Created duid %s.", str);
- dfree(str, MDL);
- }
-+
-+ return ISC_R_SUCCESS;
- }
-
- /* Write the default DUID to the lease store. */
-diff -up dhcp-4.3.1b1/common/bpf.c.mRfpsB dhcp-4.3.1b1/common/bpf.c
---- dhcp-4.3.1b1/common/bpf.c.mRfpsB 2014-07-10 17:39:25.797764653 +0200
-+++ dhcp-4.3.1b1/common/bpf.c 2014-07-10 17:48:03.797424616 +0200
-@@ -600,6 +600,22 @@ get_hw_addr(const char *name, struct har
- memcpy(&hw->hbuf[1], LLADDR(sa), sa->sdl_alen);
- break;
- #endif /* IFT_FDDI */
-+#if defined(IFT_PPP)
-+ case IFT_PPP:
-+ if (local_family != AF_INET6)
-+ log_fatal("Unsupported device type %d for \"%s\"",
-+ sa->sdl_type, name);
-+ hw->hlen = 0;
-+ hw->hbuf[0] = HTYPE_RESERVED;
-+ /* 0xdeadbeef should never occur on the wire,
-+ * and is a signature that something went wrong.
-+ */
-+ hw->hbuf[1] = 0xde;
-+ hw->hbuf[2] = 0xad;
-+ hw->hbuf[3] = 0xbe;
-+ hw->hbuf[4] = 0xef;
-+ break;
-+#endif
- default:
- log_fatal("Unsupported device type %d for \"%s\"",
- sa->sdl_type, name);
-diff -up dhcp-4.3.1b1/common/lpf.c.mRfpsB dhcp-4.3.1b1/common/lpf.c
---- dhcp-4.3.1b1/common/lpf.c.mRfpsB 2014-07-10 17:39:25.744765404 +0200
-+++ dhcp-4.3.1b1/common/lpf.c 2014-07-10 17:48:03.797424616 +0200
-@@ -511,6 +511,22 @@ get_hw_addr(const char *name, struct har
- hw->hbuf[0] = HTYPE_FDDI;
- memcpy(&hw->hbuf[1], sa->sa_data, 6);
- break;
-+#if defined(ARPHRD_PPP)
-+ case ARPHRD_PPP:
-+ if (local_family != AF_INET6)
-+ log_fatal("Unsupported device type %d for \"%s\"",
-+ sa->sa_family, name);
-+ hw->hlen = 0;
-+ hw->hbuf[0] = HTYPE_RESERVED;
-+ /* 0xdeadbeef should never occur on the wire,
-+ * and is a signature that something went wrong.
-+ */
-+ hw->hbuf[1] = 0xde;
-+ hw->hbuf[2] = 0xad;
-+ hw->hbuf[3] = 0xbe;
-+ hw->hbuf[4] = 0xef;
-+ break;
-+#endif
- default:
- log_fatal("Unsupported device type %ld for \"%s\"",
- (long int)sa->sa_family, name);
-diff -up dhcp-4.3.1b1/includes/dhcpd.h.mRfpsB dhcp-4.3.1b1/includes/dhcpd.h
---- dhcp-4.3.1b1/includes/dhcpd.h.mRfpsB 2014-07-10 17:48:03.761425124 +0200
-+++ dhcp-4.3.1b1/includes/dhcpd.h 2014-07-10 17:48:03.798424601 +0200
-@@ -2839,7 +2839,7 @@ void client_dns_remove(struct client_sta
-
- void dhcpv4_client_assignments(void);
- void dhcpv6_client_assignments(void);
--void form_duid(struct data_string *duid, const char *file, int line);
-+isc_result_t form_duid(struct data_string *duid, const char *file, int line);
-
- /* dhc6.c */
- void dhc6_lease_destroy(struct dhc6_lease **src, const char *file, int line);
-diff -up dhcp-4.3.1b1/includes/dhcp.h.mRfpsB dhcp-4.3.1b1/includes/dhcp.h
---- dhcp-4.3.1b1/includes/dhcp.h.mRfpsB 2014-07-10 17:48:03.761425124 +0200
-+++ dhcp-4.3.1b1/includes/dhcp.h 2014-07-10 17:48:03.798424601 +0200
-@@ -81,6 +81,8 @@ struct dhcp_packet {
- * is no standard for this so we
- * just steal a type */
-
-+#define HTYPE_RESERVED 0 /* RFC 5494 */
-+
- /* Magic cookie validating dhcp options field (and bootp vendor
- extensions field). */
- #define DHCP_OPTIONS_COOKIE "\143\202\123\143"
-diff -up dhcp-4.3.1b1/server/dhcpv6.c.mRfpsB dhcp-4.3.1b1/server/dhcpv6.c
---- dhcp-4.3.1b1/server/dhcpv6.c.mRfpsB 2014-07-10 17:47:31.464881409 +0200
-+++ dhcp-4.3.1b1/server/dhcpv6.c 2014-07-10 17:48:03.800424573 +0200
-@@ -330,6 +330,9 @@ generate_new_server_duid(void) {
- if (p->hw_address.hlen > 0) {
- break;
- }
-+ if (p->next == NULL && p->hw_address.hbuf[0] == HTYPE_RESERVED) {
-+ log_error("Can not generate DUID from interfaces which do not have hardware addresses, please configure server-duid!");
-+ }
- }
- if (p == NULL) {
- return ISC_R_UNEXPECTED;
diff --git a/src/patches/dhcp/dhcp-UseMulticast.patch b/src/patches/dhcp/dhcp-UseMulticast.patch
deleted file mode 100644
index ee0ea6b9a..000000000
--- a/src/patches/dhcp/dhcp-UseMulticast.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-diff -up dhcp-4.3.1b1/server/dhcpv6.c.UseMulticast dhcp-4.3.1b1/server/dhcpv6.c
---- dhcp-4.3.1b1/server/dhcpv6.c.UseMulticast 2014-07-02 19:58:40.000000000 +0200
-+++ dhcp-4.3.1b1/server/dhcpv6.c 2014-07-10 18:20:03.066256219 +0200
-@@ -376,6 +376,48 @@ generate_new_server_duid(void) {
- }
-
- /*
-+ * Is the D6O_UNICAST option defined in dhcpd.conf ?
-+ */
-+static isc_boolean_t unicast_option_defined;
-+
-+/*
-+ * Did we already search dhcpd.conf for D6O_UNICAST option ?
-+ * We need to store it here to not parse dhcpd.conf repeatedly.
-+ */
-+static isc_boolean_t unicast_option_parsed = ISC_FALSE;
-+
-+
-+/*
-+ * Is the D6O_UNICAST option defined in dhcpd.conf ?
-+ */
-+isc_boolean_t
-+is_unicast_option_defined(void) {
-+ struct option_state *opt_state;
-+ struct option_cache *oc;
-+
-+ /*
-+ * If we are looking for the unicast option for the first time
-+ */
-+ if (unicast_option_parsed == ISC_FALSE) {
-+ unicast_option_parsed = ISC_TRUE;
-+ opt_state = NULL;
-+ if (!option_state_allocate(&opt_state, MDL)) {
-+ log_fatal("No memory for option state.");
-+ }
-+
-+ execute_statements_in_scope(NULL, NULL, NULL, NULL, NULL,
-+ opt_state, &global_scope, root_group, NULL, NULL);
-+
-+ oc = lookup_option(&dhcpv6_universe, opt_state, D6O_UNICAST);
-+ unicast_option_defined = (oc != NULL);
-+
-+ option_state_dereference(&opt_state, MDL);
-+ }
-+
-+ return (unicast_option_defined);
-+}
-+
-+/*
- * Get the client identifier from the packet.
- */
- isc_result_t
-@@ -706,6 +748,12 @@ static const int required_opts[] = {
- D6O_PREFERENCE,
- 0
- };
-+static const int required_opts_NAA[] = {
-+ D6O_CLIENTID,
-+ D6O_SERVERID,
-+ D6O_STATUS_CODE,
-+ 0
-+};
- static const int required_opts_solicit[] = {
- D6O_CLIENTID,
- D6O_SERVERID,
-@@ -1587,6 +1635,56 @@ lease_to_client(struct data_string *repl
- reply.shared->group, NULL);
- }
-
-+ /* reject unicast message, unless we set unicast option */
-+ if ((packet->unicast == ISC_TRUE) && !is_unicast_option_defined())
-+ /*
-+ * RFC3315 section 18.2.1 (Request):
-+ *
-+ * When the server receives a Request message via unicast from a client
-+ * to which the server has not sent a unicast option, the server
-+ * discards the Request message and responds with a Reply message
-+ * containing a Status Code option with the value UseMulticast, a Server
-+ * Identifier option containing the server's DUID, the Client Identifier
-+ * option from the client message, and no other options.
-+ *
-+ * Section 18.2.3 (Renew):
-+ *
-+ * When the server receives a Renew message via unicast from a client to
-+ * which the server has not sent a unicast option, the server discards
-+ * the Renew message and responds with a Reply message containing a
-+ * Status Code option with the value UseMulticast, a Server Identifier
-+ * option containing the server's DUID, the Client Identifier option
-+ * from the client message, and no other options.
-+ */
-+ {
-+ /* Set the UseMulticast status code. */
-+ if (!set_status_code(STATUS_UseMulticast,
-+ "Unicast not allowed by server.",
-+ reply.opt_state)) {
-+ log_error("lease_to_client: Unable to set "
-+ "UseMulticast status code.");
-+ goto exit;
-+ }
-+
-+ /* Rewind the cursor to the start. */
-+ reply.cursor = REPLY_OPTIONS_INDEX;
-+
-+ /*
-+ * Produce an reply that includes only:
-+ *
-+ * Status code.
-+ * Server DUID.
-+ * Client DUID.
-+ */
-+ reply.cursor += store_options6((char *)reply.buf.data +
-+ reply.cursor,
-+ sizeof(reply.buf) -
-+ reply.cursor,
-+ reply.opt_state, reply.packet,
-+ required_opts_NAA,
-+ NULL);
-+ }
-+
- /*
- * RFC3315 section 17.2.2 (Solicit):
- *
-@@ -1619,6 +1717,7 @@ lease_to_client(struct data_string *repl
- * Having stored the client's IA's, store any options that
- * will fit in the remaining space.
- */
-+ else
- reply.cursor += store_options6((char *)reply.buf.data + reply.cursor,
- sizeof(reply.buf) - reply.cursor,
- reply.opt_state, reply.packet,
-@@ -4748,7 +4847,6 @@ dhcpv6_solicit(struct data_string *reply
- * Very similar to Solicit handling, except the server DUID is required.
- */
-
--/* TODO: reject unicast messages, unless we set unicast option */
- static void
- dhcpv6_request(struct data_string *reply_ret, struct packet *packet) {
- struct data_string client_id;
-@@ -5078,7 +5176,6 @@ exit:
- * except for the error code of when addresses don't match.
- */
-
--/* TODO: reject unicast messages, unless we set unicast option */
- static void
- dhcpv6_renew(struct data_string *reply, struct packet *packet) {
- struct data_string client_id;
-@@ -5322,18 +5419,60 @@ iterate_over_ia_na(struct data_string *r
- goto exit;
- }
-
-- snprintf(status_msg, sizeof(status_msg), "%s received.", packet_type);
-- if (!set_status_code(STATUS_Success, status_msg, opt_state)) {
-- goto exit;
-- }
-+ /* reject unicast message, unless we set unicast option */
-+ if ((packet->unicast == ISC_TRUE) && !is_unicast_option_defined()) {
-+ /*
-+ * RFC3315 section 18.2.6 (Release):
-+ *
-+ * When the server receives a Release message via unicast from a client
-+ * to which the server has not sent a unicast option, the server
-+ * discards the Release message and responds with a Reply message
-+ * containing a Status Code option with value UseMulticast, a Server
-+ * Identifier option containing the server's DUID, the Client Identifier
-+ * option from the client message, and no other options.
-+ *
-+ * Section 18.2.7 (Decline):
-+ *
-+ * When the server receives a Decline message via unicast from a client
-+ * to which the server has not sent a unicast option, the server
-+ * discards the Decline message and responds with a Reply message
-+ * containing a Status Code option with the value UseMulticast, a Server
-+ * Identifier option containing the server's DUID, the Client Identifier
-+ * option from the client message, and no other options.
-+ */
-+ snprintf(status_msg, sizeof(status_msg),
-+ "%s received unicast.", packet_type);
-+ if (!set_status_code(STATUS_UseMulticast, status_msg, opt_state)) {
-+ goto exit;
-+ }
-
-- /*
-- * Add our options that are not associated with any IA_NA or IA_TA.
-- */
-- reply_ofs += store_options6(reply_data+reply_ofs,
-- sizeof(reply_data)-reply_ofs,
-+ /*
-+ * Produce an reply that includes only:
-+ *
-+ * Status code.
-+ * Server DUID.
-+ * Client DUID.
-+ */
-+ reply_ofs += store_options6(reply_data+reply_ofs,
-+ sizeof(reply_data)-reply_ofs,
- opt_state, packet,
-- required_opts, NULL);
-+ required_opts_NAA, NULL);
-+
-+ goto return_reply;
-+ } else {
-+ snprintf(status_msg, sizeof(status_msg), "%s received.", packet_type);
-+ if (!set_status_code(STATUS_Success, status_msg, opt_state)) {
-+ goto exit;
-+ }
-+
-+ /*
-+ * Add our options that are not associated with any IA_NA or IA_TA.
-+ */
-+ reply_ofs += store_options6(reply_data+reply_ofs,
-+ sizeof(reply_data)-reply_ofs,
-+ opt_state, packet,
-+ required_opts, NULL);
-+ }
-
- /*
- * Loop through the IA_NA reported by the client, and deal with
-@@ -5471,6 +5610,7 @@ iterate_over_ia_na(struct data_string *r
- /*
- * Return our reply to the caller.
- */
-+return_reply:
- reply_ret->len = reply_ofs;
- reply_ret->buffer = NULL;
- if (!buffer_allocate(&reply_ret->buffer, reply_ofs, MDL)) {
-@@ -5516,7 +5656,6 @@ exit:
- * we still need to be aware of this possibility.
- */
-
--/* TODO: reject unicast messages, unless we set unicast option */
- /* TODO: IA_TA */
- static void
- dhcpv6_decline(struct data_string *reply, struct packet *packet) {
-@@ -5986,7 +6125,6 @@ exit:
- * Release means a client is done with the leases.
- */
-
--/* TODO: reject unicast messages, unless we set unicast option */
- static void
- dhcpv6_release(struct data_string *reply, struct packet *packet) {
- struct data_string client_id;
diff --git a/src/patches/dhcp/dhcp-add_timeout_when_NULL.patch b/src/patches/dhcp/dhcp-add_timeout_when_NULL.patch
deleted file mode 100644
index 103824c38..000000000
--- a/src/patches/dhcp/dhcp-add_timeout_when_NULL.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up dhcp-4.3.0a1/common/dispatch.c.dracut dhcp-4.3.0a1/common/dispatch.c
---- dhcp-4.3.0a1/common/dispatch.c.dracut 2013-12-11 01:25:12.000000000 +0100
-+++ dhcp-4.3.0a1/common/dispatch.c 2013-12-19 15:39:50.350505860 +0100
-@@ -210,6 +210,10 @@ void add_timeout (when, where, what, ref
- isc_interval_t interval;
- isc_time_t expires;
-
-+ if (when == NULL) {
-+ return;
-+ }
-+
- /* See if this timeout supersedes an existing timeout. */
- t = (struct timeout *)0;
- for (q = timeouts; q; q = q->next) {
diff --git a/src/patches/dhcp/dhcp-capability.patch b/src/patches/dhcp/dhcp-capability.patch
deleted file mode 100644
index 91a1baef5..000000000
--- a/src/patches/dhcp/dhcp-capability.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-diff -up dhcp-4.3.1b1/client/dhclient.8.zzftXp dhcp-4.3.1b1/client/dhclient.8
---- dhcp-4.3.1b1/client/dhclient.8.zzftXp 2014-07-10 17:38:26.938599402 +0200
-+++ dhcp-4.3.1b1/client/dhclient.8 2014-07-10 17:39:25.852763873 +0200
-@@ -128,6 +128,9 @@ dhclient - Dynamic Host Configuration Pr
- .B -w
- ]
- [
-+.B -nc
-+]
-+[
- .B -B
- ]
- [
-@@ -304,6 +307,32 @@ has been added or removed, so that the c
- address on that interface.
-
- .TP
-+.BI \-nc
-+Do not drop capabilities.
-+
-+Normally, if
-+.B dhclient
-+was compiled with libcap-ng support,
-+.B dhclient
-+drops most capabilities immediately upon startup. While more secure,
-+this greatly restricts the additional actions that hooks in
-+.B dhclient-script (8)
-+can take. (For example, any daemons that
-+.B dhclient-script (8)
-+starts or restarts will inherit the restricted capabilities as well,
-+which may interfere with their correct operation.) Thus, the
-+.BI \-nc
-+option can be used to prevent
-+.B dhclient
-+from dropping capabilities.
-+
-+The
-+.BI \-nc
-+option is ignored if
-+.B dhclient
-+was not compiled with libcap-ng support.
-+
-+.TP
- .BI \-B
- Set the BOOTP broadcast flag in request packets so servers will always
- broadcast replies.
-diff -up dhcp-4.3.1b1/client/dhclient.c.zzftXp dhcp-4.3.1b1/client/dhclient.c
---- dhcp-4.3.1b1/client/dhclient.c.zzftXp 2014-07-10 17:39:25.797764653 +0200
-+++ dhcp-4.3.1b1/client/dhclient.c 2014-07-10 17:39:25.853763858 +0200
-@@ -39,6 +39,10 @@
- #include <limits.h>
- #include <dns/result.h>
-
-+#ifdef HAVE_LIBCAP_NG
-+#include <cap-ng.h>
-+#endif
-+
- /*
- * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
- * that when building ISC code.
-@@ -143,6 +147,9 @@ main(int argc, char **argv) {
- int timeout_arg = 0;
- char *arg_conf = NULL;
- int arg_conf_len = 0;
-+#ifdef HAVE_LIBCAP_NG
-+ int keep_capabilities = 0;
-+#endif
-
- /* Initialize client globals. */
- memset(&default_duid, 0, sizeof(default_duid));
-@@ -425,6 +432,10 @@ main(int argc, char **argv) {
- }
-
- dhclient_request_options = argv[i];
-+ } else if (!strcmp(argv[i], "-nc")) {
-+#ifdef HAVE_LIBCAP_NG
-+ keep_capabilities = 1;
-+#endif
- } else if (argv[i][0] == '-') {
- usage();
- } else if (interfaces_requested < 0) {
-@@ -473,6 +484,19 @@ main(int argc, char **argv) {
- path_dhclient_script = s;
- }
-
-+#ifdef HAVE_LIBCAP_NG
-+ /* Drop capabilities */
-+ if (!keep_capabilities) {
-+ capng_clear(CAPNG_SELECT_CAPS);
-+ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
-+ CAP_DAC_OVERRIDE); // Drop this someday
-+ capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
-+ CAP_NET_ADMIN, CAP_NET_RAW,
-+ CAP_NET_BIND_SERVICE, CAP_SYS_ADMIN, -1);
-+ capng_apply(CAPNG_SELECT_CAPS);
-+ }
-+#endif
-+
- /* Set up the initial dhcp option universe. */
- initialize_common_option_spaces();
-
-diff -up dhcp-4.3.1b1/client/dhclient-script.8.zzftXp dhcp-4.3.1b1/client/dhclient-script.8
---- dhcp-4.3.1b1/client/dhclient-script.8.zzftXp 2014-07-10 17:39:25.761765163 +0200
-+++ dhcp-4.3.1b1/client/dhclient-script.8 2014-07-10 17:39:25.851763887 +0200
-@@ -243,6 +243,16 @@ repeatedly initialized to the values pro
- the other. Assuming the information provided by both servers is
- valid, this shouldn't cause any real problems, but it could be
- confusing.
-+.PP
-+Normally, if dhclient was compiled with libcap-ng support,
-+dhclient drops most capabilities immediately upon startup.
-+While more secure, this greatly restricts the additional actions that
-+hooks in dhclient-script can take. For example, any daemons that
-+dhclient-script starts or restarts will inherit the restricted
-+capabilities as well, which may interfere with their correct operation.
-+Thus, the
-+.BI \-nc
-+option can be used to prevent dhclient from dropping capabilities.
- .SH SEE ALSO
- dhclient(8), dhcpd(8), dhcrelay(8), dhclient.conf(5) and
- dhclient.leases(5).
-diff -up dhcp-4.3.1b1/client/Makefile.am.zzftXp dhcp-4.3.1b1/client/Makefile.am
---- dhcp-4.3.1b1/client/Makefile.am.zzftXp 2014-07-10 17:38:10.778828583 +0200
-+++ dhcp-4.3.1b1/client/Makefile.am 2014-07-10 17:39:25.851763887 +0200
-@@ -10,7 +10,7 @@ dhclient_SOURCES = clparse.c dhclient.c
- scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
- scripts/netbsd scripts/nextstep scripts/openbsd \
- scripts/solaris scripts/openwrt
--dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
-+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.la $(CAPNG_LDADD) \
- $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
- man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
- EXTRA_DIST = $(man_MANS)
-diff -up dhcp-4.3.1b1/configure.ac.zzftXp dhcp-4.3.1b1/configure.ac
---- dhcp-4.3.1b1/configure.ac.zzftXp 2014-07-10 17:38:10.779828569 +0200
-+++ dhcp-4.3.1b1/configure.ac 2014-07-10 17:39:25.854763844 +0200
-@@ -499,6 +499,41 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
- # Look for optional headers.
- AC_CHECK_HEADERS(sys/socket.h net/if_dl.h net/if6.h regex.h)
-
-+# look for capabilities library
-+AC_ARG_WITH(libcap-ng,
-+ [ --with-libcap-ng=[auto/yes/no] Add Libcap-ng support [default=auto]],,
-+ with_libcap_ng=auto)
-+
-+# Check for Libcap-ng API
-+#
-+# libcap-ng detection
-+if test x$with_libcap_ng = xno ; then
-+ have_libcap_ng=no;
-+else
-+ # Start by checking for header file
-+ AC_CHECK_HEADER(cap-ng.h, capng_headers=yes, capng_headers=no)
-+
-+ # See if we have libcap-ng library
-+ AC_CHECK_LIB(cap-ng, capng_clear,
-+ CAPNG_LDADD=-lcap-ng,)
-+
-+ # Check results are usable
-+ if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then
-+ AC_MSG_ERROR(libcap-ng support was requested and the library was not found)
-+ fi
-+ if test x$CAPNG_LDADD != x -a $capng_headers = no ; then
-+ AC_MSG_ERROR(libcap-ng libraries found but headers are missing)
-+ fi
-+fi
-+AC_SUBST(CAPNG_LDADD)
-+AC_MSG_CHECKING(whether to use libcap-ng)
-+if test x$CAPNG_LDADD != x ; then
-+ AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])
-+ AC_MSG_RESULT(yes)
-+else
-+ AC_MSG_RESULT(no)
-+fi
-+
- # Solaris needs some libraries for functions
- AC_SEARCH_LIBS(socket, [socket])
- AC_SEARCH_LIBS(inet_ntoa, [nsl])
-diff -up dhcp-4.3.1b1/relay/dhcrelay.c.zzftXp dhcp-4.3.1b1/relay/dhcrelay.c
---- dhcp-4.3.1b1/relay/dhcrelay.c.zzftXp 2014-07-10 17:39:25.799764624 +0200
-+++ dhcp-4.3.1b1/relay/dhcrelay.c 2014-07-10 17:40:19.191007421 +0200
-@@ -31,6 +31,11 @@
- #include <signal.h>
- #include <sys/time.h>
-
-+#ifdef HAVE_LIBCAP_NG
-+# include <cap-ng.h>
-+ int keep_capabilities = 0;
-+#endif
-+
- TIME default_lease_time = 43200; /* 12 hours... */
- TIME max_lease_time = 86400; /* 24 hours... */
- struct tree_cache *global_options[256];
-@@ -376,6 +381,10 @@ main(int argc, char **argv) {
- usage();
- dhcrelay_sub_id = argv[i];
- #endif
-+ } else if (!strcmp(argv[i], "-nc")) {
-+#ifdef HAVE_LIBCAP_NG
-+ keep_capabilities = 1;
-+#endif
- } else if (!strcmp(argv[i], "-pf")) {
- if (++i == argc)
- usage();
-@@ -446,6 +455,17 @@ main(int argc, char **argv) {
- #endif
- }
-
-+#ifdef HAVE_LIBCAP_NG
-+ /* Drop capabilities */
-+ if (!keep_capabilities) {
-+ capng_clear(CAPNG_SELECT_BOTH);
-+ capng_updatev(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED,
-+ CAP_NET_RAW, CAP_NET_BIND_SERVICE, -1);
-+ capng_apply(CAPNG_SELECT_BOTH);
-+ log_info ("Dropped all unnecessary capabilities.");
-+ }
-+#endif
-+
- if (!quiet) {
- log_info("%s %s", message, PACKAGE_VERSION);
- log_info(copyright);
-@@ -598,6 +618,15 @@ main(int argc, char **argv) {
- signal(SIGTERM, dhcp_signal_handler); /* kill */
- #endif
-
-+#ifdef HAVE_LIBCAP_NG
-+ /* Drop all capabilities */
-+ if (!keep_capabilities) {
-+ capng_clear(CAPNG_SELECT_BOTH);
-+ capng_apply(CAPNG_SELECT_BOTH);
-+ log_info ("Dropped all capabilities.");
-+ }
-+#endif
-+
- /* Start dispatching packets and timeouts... */
- dispatch();
-
-diff -up dhcp-4.3.1b1/relay/Makefile.am.zzftXp dhcp-4.3.1b1/relay/Makefile.am
---- dhcp-4.3.1b1/relay/Makefile.am.zzftXp 2014-07-10 17:38:10.780828554 +0200
-+++ dhcp-4.3.1b1/relay/Makefile.am 2014-07-10 17:39:25.854763844 +0200
-@@ -2,7 +2,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
-
- sbin_PROGRAMS = dhcrelay
- dhcrelay_SOURCES = dhcrelay.c
--dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
-+dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.la $(CAPNG_LDADD) \
- $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
- man_MANS = dhcrelay.8
- EXTRA_DIST = $(man_MANS)
diff --git a/src/patches/dhcp/dhcp-default-requested-options.patch b/src/patches/dhcp/dhcp-default-requested-options.patch
deleted file mode 100644
index afda222e6..000000000
--- a/src/patches/dhcp/dhcp-default-requested-options.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -up dhcp-4.3.0a1/client/clparse.c.requested dhcp-4.3.0a1/client/clparse.c
---- dhcp-4.3.0a1/client/clparse.c.requested 2013-12-19 15:13:27.276631307 +0100
-+++ dhcp-4.3.0a1/client/clparse.c 2013-12-19 15:13:27.313630789 +0100
-@@ -37,7 +37,7 @@
-
- struct client_config top_level_config;
-
--#define NUM_DEFAULT_REQUESTED_OPTS 9
-+#define NUM_DEFAULT_REQUESTED_OPTS 14
- struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1];
-
- static void parse_client_default_duid(struct parse *cfile);
-@@ -119,6 +119,31 @@ isc_result_t read_client_conf ()
- option_code_hash_lookup(&default_requested_options[8],
- dhcpv6_universe.code_hash, &code, 0, MDL);
-
-+ /* 10 */
-+ code = DHO_NIS_DOMAIN;
-+ option_code_hash_lookup(&default_requested_options[9],
-+ dhcp_universe.code_hash, &code, 0, MDL);
-+
-+ /* 11 */
-+ code = DHO_NIS_SERVERS;
-+ option_code_hash_lookup(&default_requested_options[10],
-+ dhcp_universe.code_hash, &code, 0, MDL);
-+
-+ /* 12 */
-+ code = DHO_NTP_SERVERS;
-+ option_code_hash_lookup(&default_requested_options[11],
-+ dhcp_universe.code_hash, &code, 0, MDL);
-+
-+ /* 13 */
-+ code = DHO_INTERFACE_MTU;
-+ option_code_hash_lookup(&default_requested_options[12],
-+ dhcp_universe.code_hash, &code, 0, MDL);
-+
-+ /* 14 */
-+ code = DHO_DOMAIN_SEARCH;
-+ option_code_hash_lookup(&default_requested_options[13],
-+ dhcp_universe.code_hash, &code, 0, MDL);
-+
- for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
- if (default_requested_options[code] == NULL)
- log_fatal("Unable to find option definition for "
diff --git a/src/patches/dhcp/dhcp-dhclient-decline-backoff.patch b/src/patches/dhcp/dhcp-dhclient-decline-backoff.patch
deleted file mode 100644
index 3e52e6400..000000000
--- a/src/patches/dhcp/dhcp-dhclient-decline-backoff.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -up dhcp-4.3.1b1/client/dhclient.c.JwFUZj dhcp-4.3.1b1/client/dhclient.c
---- dhcp-4.3.1b1/client/dhclient.c.JwFUZj 2014-07-10 17:38:50.511265091 +0200
-+++ dhcp-4.3.1b1/client/dhclient.c 2014-07-10 17:39:16.164901267 +0200
-@@ -1281,6 +1281,8 @@ void state_init (cpp)
- void *cpp;
- {
- struct client_state *client = cpp;
-+ enum dhcp_state init_state = client->state;
-+ struct timeval tv;
-
- ASSERT_STATE(state, S_INIT);
-
-@@ -1293,9 +1295,18 @@ void state_init (cpp)
- client -> first_sending = cur_time;
- client -> interval = client -> config -> initial_interval;
-
-- /* Add an immediate timeout to cause the first DHCPDISCOVER packet
-- to go out. */
-- send_discover (client);
-+ if (init_state != S_DECLINED) {
-+ /* Add an immediate timeout to cause the first DHCPDISCOVER packet
-+ to go out. */
-+ send_discover(client);
-+ } else {
-+ /* We've received an OFFER and it has been DECLINEd by dhclient-script.
-+ * wait for a random time between 1 and backoff_cutoff seconds before
-+ * trying again. */
-+ tv . tv_sec = cur_time + ((1 + (random() >> 2)) % client->config->backoff_cutoff);
-+ tv . tv_usec = 0;
-+ add_timeout(&tv, send_discover, client, 0, 0);
-+ }
- }
-
- /*
-@@ -1592,6 +1603,7 @@ void bind_lease (client)
- "try (declined). Exiting.");
- exit(2);
- } else {
-+ client -> state = S_DECLINED;
- state_init(client);
- return;
- }
-@@ -4059,6 +4071,7 @@ void client_location_changed ()
- case S_INIT:
- case S_REBINDING:
- case S_STOPPED:
-+ case S_DECLINED:
- break;
- }
- client -> state = S_INIT;
-diff -up dhcp-4.3.1b1/includes/dhcpd.h.JwFUZj dhcp-4.3.1b1/includes/dhcpd.h
---- dhcp-4.3.1b1/includes/dhcpd.h.JwFUZj 2014-07-10 17:38:26.941599360 +0200
-+++ dhcp-4.3.1b1/includes/dhcpd.h 2014-07-10 17:38:50.526264878 +0200
-@@ -1087,7 +1087,8 @@ enum dhcp_state {
- S_BOUND = 5,
- S_RENEWING = 6,
- S_REBINDING = 7,
-- S_STOPPED = 8
-+ S_STOPPED = 8,
-+ S_DECLINED = 9
- };
-
- /* Authentication and BOOTP policy possibilities (not all values work
diff --git a/src/patches/dhcp/dhcp-dhclient-options.patch b/src/patches/dhcp/dhcp-dhclient-options.patch
deleted file mode 100644
index 67f144ecb..000000000
--- a/src/patches/dhcp/dhcp-dhclient-options.patch
+++ /dev/null
@@ -1,509 +0,0 @@
-diff -up dhcp-4.3.1b1/client/clparse.c.fLPqYB dhcp-4.3.1b1/client/clparse.c
---- dhcp-4.3.1b1/client/clparse.c.fLPqYB 2014-07-02 19:58:38.000000000 +0200
-+++ dhcp-4.3.1b1/client/clparse.c 2014-07-10 17:38:26.938599402 +0200
-@@ -148,6 +148,7 @@ isc_result_t read_client_conf ()
- /* Requested lease time, used by DHCPv6 (DHCPv4 uses the option cache)
- */
- top_level_config.requested_lease = 7200;
-+ top_level_config.bootp_broadcast_always = 0;
-
- group_allocate (&top_level_config.on_receipt, MDL);
- if (!top_level_config.on_receipt)
-@@ -353,7 +354,8 @@ void read_client_leases ()
- interface-declaration |
- LEASE client-lease-statement |
- ALIAS client-lease-statement |
-- KEY key-definition */
-+ KEY key-definition |
-+ BOOTP_BROADCAST_ALWAYS */
-
- void parse_client_statement (cfile, ip, config)
- struct parse *cfile;
-@@ -771,6 +773,12 @@ void parse_client_statement (cfile, ip,
- parse_reject_statement (cfile, config);
- return;
-
-+ case BOOTP_BROADCAST_ALWAYS:
-+ token = next_token(&val, (unsigned*)0, cfile);
-+ config -> bootp_broadcast_always = 1;
-+ parse_semi (cfile);
-+ return;
-+
- default:
- lose = 0;
- stmt = (struct executable_statement *)0;
-diff -up dhcp-4.3.1b1/client/dhclient.8.fLPqYB dhcp-4.3.1b1/client/dhclient.8
---- dhcp-4.3.1b1/client/dhclient.8.fLPqYB 2014-07-02 19:58:38.000000000 +0200
-+++ dhcp-4.3.1b1/client/dhclient.8 2014-07-10 17:38:26.938599402 +0200
-@@ -128,6 +128,33 @@ dhclient - Dynamic Host Configuration Pr
- .B -w
- ]
- [
-+.B -B
-+]
-+[
-+.B -C
-+.I dhcp-client-identifier
-+]
-+[
-+.B -H
-+.I host-name
-+]
-+[
-+.B -F
-+.I fqdn.fqdn
-+]
-+[
-+.B -V
-+.I vendor-class-identifier
-+]
-+[
-+.B -R
-+.I request-option-list
-+]
-+[
-+.B -timeout
-+.I timeout
-+]
-+[
- .B -v
- ]
- [
-@@ -275,6 +302,69 @@ not to exit when it doesn't find any suc
- program can then be used to notify the client when a network interface
- has been added or removed, so that the client can attempt to configure an IP
- address on that interface.
-+
-+.TP
-+.BI \-B
-+Set the BOOTP broadcast flag in request packets so servers will always
-+broadcast replies.
-+
-+.TP
-+.BI \-C\ <dhcp-client-identifier>
-+Specify the dhcp-client-identifier option to send to the DHCP server.
-+
-+.TP
-+.BI \-H\ <host-name>
-+Specify the host-name option to send to the DHCP server. The host-name
-+string only contains the client's hostname prefix, to which the server will
-+append the ddns-domainname or domain-name options, if any, to derive the
-+fully qualified domain name of the client. The
-+.B -H
-+option cannot be used with the
-+.B -F
-+option.
-+
-+.TP
-+.BI \-F\ <fqdn.fqdn>
-+Specify the fqdn.fqdn option to send to the DHCP server. This option cannot
-+be used with the
-+.B -H
-+option. The fqdn.fqdn option must specify the complete domain name of the
-+client host, which the server may use for dynamic DNS updates.
-+
-+.TP
-+.BI \-V\ <vendor-class-identifier>
-+Specify the vendor-class-identifier option to send to the DHCP server.
-+
-+.TP
-+.BI \-R\ <option>[,<option>...]
-+Specify the list of options the client is to request from the server. The
-+option list must be a single string consisting of option names separated
-+by at least one command and optional space characters. The default option
-+list is:
-+
-+.BR
-+ subnet-mask, broadcast-address, time-offset, routers,
-+.BR
-+ domain-search, domain-name, domain-name-servers, host-name,
-+.BR
-+ nis-domain, nis-servers, ntp-servers, interface-mtu
-+
-+.TP
-+.B -R
-+option does not append options to the default request, it overrides the
-+default request list. Keep this in mind if you want to request an
-+additional option besides the default request list. You will have to
-+specify all option names for the
-+.B -R
-+parameter.
-+
-+.TP
-+.BI \-timeout\ <timeout>
-+Specify the time after which
-+.B dhclient
-+will decide that no DHCP servers can be contacted when no responses have been
-+received.
-+
- .TP
- .BI \-n
- Do not configure any interfaces. This is most likely to be useful in
-diff -up dhcp-4.3.1b1/client/dhclient.c.fLPqYB dhcp-4.3.1b1/client/dhclient.c
---- dhcp-4.3.1b1/client/dhclient.c.fLPqYB 2014-07-02 19:58:38.000000000 +0200
-+++ dhcp-4.3.1b1/client/dhclient.c 2014-07-10 17:38:44.520350055 +0200
-@@ -39,6 +39,12 @@
- #include <limits.h>
- #include <dns/result.h>
-
-+/*
-+ * Defined in stdio.h when _GNU_SOURCE is set, but we don't want to define
-+ * that when building ISC code.
-+ */
-+extern int asprintf(char **strp, const char *fmt, ...);
-+
- TIME default_lease_time = 43200; /* 12 hours... */
- TIME max_lease_time = 86400; /* 24 hours... */
-
-@@ -88,6 +94,9 @@ int wanted_ia_na = -1; /* the absolute
- int wanted_ia_ta = 0;
- int wanted_ia_pd = 0;
- char *mockup_relay = NULL;
-+int bootp_broadcast_always = 0;
-+
-+extern struct option *default_requested_options[];
-
- void run_stateless(int exit_mode);
-
-@@ -125,6 +134,15 @@ main(int argc, char **argv) {
- int local_family_set = 0;
- #endif /* DHCPv6 */
- char *s;
-+ char *dhcp_client_identifier_arg = NULL;
-+ char *dhcp_host_name_arg = NULL;
-+ char *dhcp_fqdn_arg = NULL;
-+ char *dhcp_vendor_class_identifier_arg = NULL;
-+ char *dhclient_request_options = NULL;
-+
-+ int timeout_arg = 0;
-+ char *arg_conf = NULL;
-+ int arg_conf_len = 0;
-
- /* Initialize client globals. */
- memset(&default_duid, 0, sizeof(default_duid));
-@@ -325,6 +343,88 @@ main(int argc, char **argv) {
- strlen(PACKAGE_VERSION)));
- IGNORE_RET(write(STDERR_FILENO, "\n", 1));
- exit(0);
-+ } else if (!strcmp(argv[i], "-C")) {
-+ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
-+ usage();
-+ exit(1);
-+ }
-+
-+ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
-+ log_error("-C option dhcp-client-identifier string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
-+ exit(1);
-+ }
-+
-+ dhcp_client_identifier_arg = argv[i];
-+ } else if (!strcmp(argv[i], "-B")) {
-+ bootp_broadcast_always = 1;
-+ } else if (!strcmp(argv[i], "-H")) {
-+ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
-+ usage();
-+ exit(1);
-+ }
-+
-+ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
-+ log_error("-H option host-name string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
-+ exit(1);
-+ }
-+
-+ if (dhcp_host_name_arg != NULL) {
-+ log_error("The -H <host-name> and -F <fqdn> arguments are mutually exclusive");
-+ exit(1);
-+ }
-+
-+ dhcp_host_name_arg = argv[i];
-+ } else if (!strcmp(argv[i], "-F")) {
-+ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
-+ usage();
-+ exit(1);
-+ }
-+
-+ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
-+ log_error("-F option fqdn.fqdn string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
-+ exit(1);
-+ }
-+
-+ if (dhcp_fqdn_arg != NULL) {
-+ log_error("Only one -F <fqdn> argument can be specified");
-+ exit(1);
-+ }
-+
-+ if (dhcp_host_name_arg != NULL) {
-+ log_error("The -F <fqdn> and -H <host-name> arguments are mutually exclusive");
-+ exit(1);
-+ }
-+
-+ dhcp_fqdn_arg = argv[i];
-+ } else if (!strcmp(argv[i], "-timeout")) {
-+ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
-+ usage();
-+ exit(1);
-+ }
-+
-+ if ((timeout_arg = atoi(argv[i])) <= 0) {
-+ log_error("timeout option must be > 0 - bad value: %s",argv[i]);
-+ exit(1);
-+ }
-+ } else if (!strcmp(argv[i], "-V")) {
-+ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
-+ usage();
-+ exit(1);
-+ }
-+
-+ if (strlen(argv[i]) >= DHCP_MAX_OPTION_LEN) {
-+ log_error("-V option vendor-class-identifier string \"%s\" is too long - maximum length is: %d", argv[i], DHCP_MAX_OPTION_LEN-1);
-+ exit(1);
-+ }
-+
-+ dhcp_vendor_class_identifier_arg = argv[i];
-+ } else if (!strcmp(argv[i], "-R")) {
-+ if ((++i == argc) || (argv[i] == NULL) || (*(argv[i])=='\0')) {
-+ usage();
-+ exit(1);
-+ }
-+
-+ dhclient_request_options = argv[i];
- } else if (argv[i][0] == '-') {
- usage();
- } else if (interfaces_requested < 0) {
-@@ -507,6 +607,156 @@ main(int argc, char **argv) {
- /* Parse the dhclient.conf file. */
- read_client_conf();
-
-+ /* Parse any extra command line configuration arguments: */
-+ if ((dhcp_client_identifier_arg != NULL) && (*dhcp_client_identifier_arg != '\0')) {
-+ arg_conf_len = asprintf(&arg_conf, "send dhcp-client-identifier \"%s\";", dhcp_client_identifier_arg);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to send -C option dhcp-client-identifier");
-+ }
-+
-+ if ((dhcp_host_name_arg != NULL) && (*dhcp_host_name_arg != '\0')) {
-+ if (arg_conf == 0) {
-+ arg_conf_len = asprintf(&arg_conf, "send host-name \"%s\";", dhcp_host_name_arg);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to send -H option host-name");
-+ } else {
-+ char *last_arg_conf = arg_conf;
-+ arg_conf = NULL;
-+ arg_conf_len = asprintf(&arg_conf, "%s\nsend host-name \"%s\";", last_arg_conf, dhcp_host_name_arg);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to send -H option host-name");
-+
-+ free(last_arg_conf);
-+ }
-+ }
-+
-+ if ((dhcp_fqdn_arg != NULL) && (*dhcp_fqdn_arg != '\0')) {
-+ if (arg_conf == 0) {
-+ arg_conf_len = asprintf(&arg_conf, "send fqdn.fqdn \"%s\";", dhcp_fqdn_arg);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to send -F option fqdn.fqdn");
-+ } else {
-+ char *last_arg_conf = arg_conf;
-+ arg_conf = NULL;
-+ arg_conf_len = asprintf(&arg_conf, "%s\nsend fqdn.fqdn \"%s\";", last_arg_conf, dhcp_fqdn_arg);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to send -F option fqdn.fqdn");
-+
-+ free(last_arg_conf);
-+ }
-+ }
-+
-+ if (timeout_arg) {
-+ if (arg_conf == 0) {
-+ arg_conf_len = asprintf(&arg_conf, "timeout %d;", timeout_arg);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to process -timeout timeout argument");
-+ } else {
-+ char *last_arg_conf = arg_conf;
-+ arg_conf = NULL;
-+ arg_conf_len = asprintf(&arg_conf, "%s\ntimeout %d;", last_arg_conf, timeout_arg);
-+
-+ if ((arg_conf == 0) || (arg_conf_len == 0))
-+ log_fatal("Unable to process -timeout timeout argument");
-+
-+ free(last_arg_conf);
-+ }
-+ }
-+
-+ if ((dhcp_vendor_class_identifier_arg != NULL) && (*dhcp_vendor_class_identifier_arg != '\0')) {
-+ if (arg_conf == 0) {
-+ arg_conf_len = asprintf(&arg_conf, "send vendor-class-identifier \"%s\";", dhcp_vendor_class_identifier_arg);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to send -V option vendor-class-identifier");
-+ } else {
-+ char *last_arg_conf = arg_conf;
-+ arg_conf = NULL;
-+ arg_conf_len = asprintf(&arg_conf, "%s\nsend vendor-class-identifier \"%s\";", last_arg_conf, dhcp_vendor_class_identifier_arg);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to send -V option vendor-class-identifier");
-+
-+ free(last_arg_conf);
-+ }
-+ }
-+
-+ if (dhclient_request_options != NULL) {
-+ if (arg_conf == 0) {
-+ arg_conf_len = asprintf(&arg_conf, "request %s;", dhclient_request_options);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to parse -R <request options list> argument");
-+ } else {
-+ char *last_arg_conf = arg_conf;
-+ arg_conf = NULL;
-+ arg_conf_len = asprintf(&arg_conf, "%s\nrequest %s;", last_arg_conf, dhclient_request_options);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to parse -R <request options list> argument");
-+
-+ free(last_arg_conf);
-+ }
-+ }
-+
-+ if (arg_conf) {
-+ if (arg_conf_len == 0)
-+ if ((arg_conf_len = strlen(arg_conf)) == 0)
-+ /* huh ? cannot happen ! */
-+ log_fatal("Unable to process -C/-H/-F/-timeout/-V/-R configuration arguments");
-+
-+ /* parse the extra dhclient.conf configuration arguments
-+ * into top level config: */
-+ struct parse *cfile = (struct parse *)0;
-+ const char *val = NULL;
-+ int token;
-+
-+ status = new_parse(&cfile, -1, arg_conf, arg_conf_len, "extra dhclient -C/-H/-F/-timeout/-V/-R configuration arguments", 0);
-+
-+ if ((status != ISC_R_SUCCESS) || (cfile -> warnings_occurred))
-+ log_fatal("Cannot parse -C/-H/-F/-timeout/-V/-R configuration arguments !");
-+ /* more detailed parse failures will be logged */
-+
-+ do {
-+ token = peek_token(&val, (unsigned *)0, cfile);
-+ if (token == END_OF_FILE)
-+ break;
-+
-+ parse_client_statement(cfile, (struct interface_info *)0, &top_level_config);
-+ } while (1);
-+
-+ if (cfile -> warnings_occurred)
-+ log_fatal("Cannot parse -C/-H/-F/-timeout/-V/-R configuration arguments !");
-+ end_parse(&cfile);
-+
-+ if (timeout_arg) {
-+ /* we just set the toplevel timeout, but per-client
-+ * timeouts may still be at defaults.
-+ */
-+ for (ip=interfaces; ip; ip = ip->next) {
-+ if (ip->client->config->timeout == 60)
-+ ip->client->config->timeout = timeout_arg;
-+ }
-+ }
-+
-+ if ((dhclient_request_options != 0) && (top_level_config.requested_options != default_requested_options)) {
-+ for (ip=interfaces; ip; ip = ip->next) {
-+ if (ip->client->config->requested_options == default_requested_options)
-+ ip->client->config->requested_options = top_level_config.requested_options;
-+ }
-+ }
-+
-+ free(arg_conf);
-+ arg_conf = NULL;
-+ arg_conf_len = 0;
-+ }
-+
- /* Parse the lease database. */
- read_client_leases();
-
-@@ -756,6 +1006,10 @@ static void usage()
- " [-s server-addr] [-cf config-file]\n"
- " [-df duid-file] [-lf lease-file]\n"
- " [-pf pid-file] [--no-pid] [-e VAR=val]\n"
-+ " [-C <dhcp-client-identifier>] [-B]\n"
-+ " [-H <host-name> | -F <fqdn.fqdn>] [-timeout <timeout>]\n"
-+ " [-V <vendor-class-identifier>]\n"
-+ " [-R <request option list>]\n"
- " [-sf script-file] [interface]");
- }
-
-@@ -2531,7 +2785,8 @@ void make_discover (client, lease)
- client -> packet.xid = random ();
- client -> packet.secs = 0; /* filled in by send_discover. */
-
-- if (can_receive_unicast_unconfigured (client -> interface))
-+ if ((!(bootp_broadcast_always || client->config->bootp_broadcast_always))
-+ && can_receive_unicast_unconfigured(client->interface))
- client -> packet.flags = 0;
- else
- client -> packet.flags = htons (BOOTP_BROADCAST);
-@@ -2615,7 +2870,9 @@ void make_request (client, lease)
- } else {
- memset (&client -> packet.ciaddr, 0,
- sizeof client -> packet.ciaddr);
-- if (can_receive_unicast_unconfigured (client -> interface))
-+ if ((!(bootp_broadcast_always ||
-+ client ->config->bootp_broadcast_always)) &&
-+ can_receive_unicast_unconfigured (client -> interface))
- client -> packet.flags = 0;
- else
- client -> packet.flags = htons (BOOTP_BROADCAST);
-@@ -2677,7 +2934,8 @@ void make_decline (client, lease)
- client -> packet.hops = 0;
- client -> packet.xid = client -> xid;
- client -> packet.secs = 0; /* Filled in by send_request. */
-- if (can_receive_unicast_unconfigured (client -> interface))
-+ if ((!(bootp_broadcast_always || client->config-> bootp_broadcast_always))
-+ && can_receive_unicast_unconfigured (client->interface))
- client -> packet.flags = 0;
- else
- client -> packet.flags = htons (BOOTP_BROADCAST);
-diff -up dhcp-4.3.1b1/common/conflex.c.fLPqYB dhcp-4.3.1b1/common/conflex.c
---- dhcp-4.3.1b1/common/conflex.c.fLPqYB 2014-07-02 19:58:38.000000000 +0200
-+++ dhcp-4.3.1b1/common/conflex.c 2014-07-10 17:38:26.940599374 +0200
-@@ -811,6 +811,8 @@ intern(char *atom, enum dhcp_token dfv)
- return BALANCE;
- if (!strcasecmp (atom + 1, "ound"))
- return BOUND;
-+ if (!strcasecmp (atom + 1, "ootp-broadcast-always"))
-+ return BOOTP_BROADCAST_ALWAYS;
- break;
- case 'c':
- if (!strcasecmp(atom + 1, "ase"))
-diff -up dhcp-4.3.1b1/includes/dhcpd.h.fLPqYB dhcp-4.3.1b1/includes/dhcpd.h
---- dhcp-4.3.1b1/includes/dhcpd.h.fLPqYB 2014-07-02 19:58:39.000000000 +0200
-+++ dhcp-4.3.1b1/includes/dhcpd.h 2014-07-10 17:38:26.941599360 +0200
-@@ -1152,6 +1152,9 @@ struct client_config {
- int do_forward_update; /* If nonzero, and if we have the
- information we need, update the
- A record for the address we get. */
-+
-+ int bootp_broadcast_always; /* If nonzero, always set the BOOTP_BROADCAST
-+ flag in requests */
- };
-
- /* Per-interface state used in the dhcp client... */
-diff -up dhcp-4.3.1b1/includes/dhctoken.h.fLPqYB dhcp-4.3.1b1/includes/dhctoken.h
---- dhcp-4.3.1b1/includes/dhctoken.h.fLPqYB 2014-07-02 19:58:39.000000000 +0200
-+++ dhcp-4.3.1b1/includes/dhctoken.h 2014-07-10 17:38:26.942599346 +0200
-@@ -367,7 +367,8 @@ enum dhcp_token {
- TOKEN_INFINIBAND = 668,
- POOL6 = 669,
- V6RELAY = 670,
-- V6RELOPT = 671
-+ V6RELOPT = 671,
-+ BOOTP_BROADCAST_ALWAYS = 672
- };
-
- #define is_identifier(x) ((x) >= FIRST_TOKEN && \
diff --git a/src/patches/dhcp/dhcp-errwarn-message.patch b/src/patches/dhcp/dhcp-errwarn-message.patch
deleted file mode 100644
index a65c2c2ed..000000000
--- a/src/patches/dhcp/dhcp-errwarn-message.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up dhcp-4.3.0b1/omapip/errwarn.c.errwarn dhcp-4.3.0b1/omapip/errwarn.c
---- dhcp-4.3.0b1/omapip/errwarn.c.errwarn 2014-01-21 09:31:47.301334249 +0100
-+++ dhcp-4.3.0b1/omapip/errwarn.c 2014-01-21 09:33:20.569039072 +0100
-@@ -76,11 +76,13 @@ void log_fatal (const char * fmt, ... )
- }
-
- log_error ("%s", "");
-- log_error ("If you think you have received this message due to a bug rather");
-- log_error ("than a configuration issue please read the section on submitting");
-- log_error ("bugs on either our web page at www.isc.org or in the README file");
-- log_error ("before submitting a bug. These pages explain the proper");
-- log_error ("process and the information we find helpful for debugging..");
-+ log_error ("This version of ISC DHCP is based on the release available");
-+ log_error ("on ftp.isc.org. Features have been added and other changes");
-+ log_error ("have been made to the base software release in order to make");
-+ log_error ("it work better with this distribution.");
-+ log_error ("%s", "");
-+ log_error ("Please report for this software via the Red Hat Bugzilla site:");
-+ log_error (" http://bugzilla.redhat.com");
- log_error ("%s", "");
- log_error ("exiting.");
-
diff --git a/src/patches/dhcp/dhcp-garbage-chars.patch b/src/patches/dhcp/dhcp-garbage-chars.patch
deleted file mode 100644
index 131360be6..000000000
--- a/src/patches/dhcp/dhcp-garbage-chars.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up dhcp-4.3.0rc1/common/tables.c.garbage dhcp-4.3.0rc1/common/tables.c
---- dhcp-4.3.0rc1/common/tables.c.garbage 2014-01-29 10:03:52.132624677 +0100
-+++ dhcp-4.3.0rc1/common/tables.c 2014-01-29 10:04:51.413875343 +0100
-@@ -213,7 +213,7 @@ static struct option dhcp_options[] = {
- { "name-service-search", "Sa", &dhcp_universe, 117, 1 },
- #endif
- { "subnet-selection", "I", &dhcp_universe, 118, 1 },
-- { "domain-search", "Dc", &dhcp_universe, 119, 1 },
-+ { "domain-search", "D", &dhcp_universe, 119, 1 },
- { "vivco", "Evendor-class.", &dhcp_universe, 124, 1 },
- { "vivso", "Evendor.", &dhcp_universe, 125, 1 },
- #if 0
diff --git a/src/patches/dhcp/dhcp-gpxe-cid.patch b/src/patches/dhcp/dhcp-gpxe-cid.patch
deleted file mode 100644
index c8c2b84f9..000000000
--- a/src/patches/dhcp/dhcp-gpxe-cid.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -up dhcp-4.3.0a1/client/dhclient.c.gpxe-cid dhcp-4.3.0a1/client/dhclient.c
---- dhcp-4.3.0a1/client/dhclient.c.gpxe-cid 2013-12-20 13:28:45.105048317 +0100
-+++ dhcp-4.3.0a1/client/dhclient.c 2013-12-20 13:28:45.109048261 +0100
-@@ -47,6 +47,14 @@
- const char *path_dhclient_pid = NULL;
- static char path_dhclient_script_array[] = _PATH_DHCLIENT_SCRIPT;
- char *path_dhclient_script = path_dhclient_script_array;
-+
-+/* Default Prefix */
-+static unsigned char default_prefix[12] = {
-+ 0xff, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x02, 0x00,
-+ 0x00, 0x02, 0xc9, 0x00
-+};
-+
- const char *path_dhclient_duid = NULL;
-
- /* False (default) => we write and use a pid file */
-@@ -1253,6 +1260,12 @@ int find_subnet (struct subnet **sp,
- static void setup_ib_interface(struct interface_info *ip)
- {
- struct group *g;
-+ struct hardware *hw = &ip->hw_address;
-+ char client_id[64];
-+ char *arg_conf = NULL;
-+ int arg_conf_len = 0;
-+ isc_result_t status;
-+ struct parse *cfile = (struct parse *)0;
-
- /* Set the broadcast flag */
- ip->client->config->bootp_broadcast_always = 1;
-@@ -1269,8 +1282,39 @@ static void setup_ib_interface(struct in
- }
- }
-
-- /* No client ID specified */
-- log_fatal("dhcp-client-identifier must be specified for InfiniBand");
-+ /*
-+ * No client ID specified, make up one based on a default
-+ * "prefix" and the port GUID.
-+ *
-+ * NOTE: This is compatible with what gpxe does.
-+ */
-+ sprintf(client_id, "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",
-+ default_prefix[0], default_prefix[1], default_prefix[2],
-+ default_prefix[3], default_prefix[4], default_prefix[5],
-+ default_prefix[6], default_prefix[7], default_prefix[8],
-+ default_prefix[9], default_prefix[10], default_prefix[11],
-+ hw->hbuf[1], hw->hbuf[2], hw->hbuf[3], hw->hbuf[4],
-+ hw->hbuf[5], hw->hbuf[6], hw->hbuf[7], hw->hbuf[8]);
-+
-+ arg_conf_len = asprintf(&arg_conf,
-+ "send dhcp-client-identifier %s;",
-+ client_id);
-+
-+ if ((arg_conf == 0) || (arg_conf_len <= 0))
-+ log_fatal("Unable to send option dhcp-client-identifier");
-+
-+ status = new_parse(&cfile, -1, arg_conf, arg_conf_len,
-+ "Automatic Infiniband client identifier", 0);
-+
-+ if ((status != ISC_R_SUCCESS) || (cfile->warnings_occurred))
-+ log_fatal("Failed to parse Infiniband client identifier");
-+
-+ parse_client_statement(cfile, NULL, ip->client->config);
-+
-+ if (cfile->warnings_occurred)
-+ log_fatal("Failed to parse Infiniband client identifier");
-+
-+ end_parse(&cfile);
- }
-
- /* Individual States:
diff --git a/src/patches/dhcp/dhcp-honor-expired.patch b/src/patches/dhcp/dhcp-honor-expired.patch
deleted file mode 100644
index bd892975b..000000000
--- a/src/patches/dhcp/dhcp-honor-expired.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -up dhcp-4.3.0a1/client/dhc6.c.honor-expired dhcp-4.3.0a1/client/dhc6.c
---- dhcp-4.3.0a1/client/dhc6.c.honor-expired 2013-12-19 16:00:28.062183037 +0100
-+++ dhcp-4.3.0a1/client/dhc6.c 2013-12-19 16:00:28.076182842 +0100
-@@ -1351,6 +1351,32 @@ start_info_request6(struct client_state
- go_daemon();
- }
-
-+/* Run through the addresses in lease and return true if there's any unexpired.
-+ * Return false otherwise.
-+ */
-+isc_boolean_t
-+unexpired_address_in_lease(struct dhc6_lease *lease)
-+{
-+ struct dhc6_ia *ia;
-+ struct dhc6_addr *addr;
-+
-+ for (ia = lease->bindings ; ia != NULL ; ia = ia->next) {
-+ for (addr = ia->addrs ; addr != NULL ; addr = addr->next) {
-+ if (addr->flags & DHC6_ADDR_EXPIRED)
-+ continue;
-+
-+ if (addr->starts + addr->max_life > cur_time) {
-+ return ISC_TRUE;
-+ }
-+ }
-+ }
-+
-+ log_info("PRC: Previous lease is devoid of active addresses."
-+ " Re-initializing.");
-+
-+ return ISC_FALSE;
-+}
-+
- /*
- * start_confirm6() kicks off an "init-reboot" version of the process, at
- * startup to find out if old bindings are 'fair' and at runtime whenever
-@@ -1363,8 +1389,10 @@ start_confirm6(struct client_state *clie
-
- /* If there is no active lease, there is nothing to check. */
- if ((client->active_lease == NULL) ||
-- !active_prefix(client) ||
-- client->active_lease->released) {
-+ !active_prefix(client) ||
-+ client->active_lease->released ||
-+ !unexpired_address_in_lease(client->active_lease)) {
-+ dhc6_lease_destroy(&client->active_lease, MDL);
- start_init6(client);
- return;
- }
diff --git a/src/patches/dhcp/dhcp-improved-xid.patch b/src/patches/dhcp/dhcp-improved-xid.patch
deleted file mode 100644
index eccff4987..000000000
--- a/src/patches/dhcp/dhcp-improved-xid.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -up dhcp-4.3.0a1/client/dhclient.c.improved-xid dhcp-4.3.0a1/client/dhclient.c
---- dhcp-4.3.0a1/client/dhclient.c.improved-xid 2013-12-20 13:29:41.836260810 +0100
-+++ dhcp-4.3.0a1/client/dhclient.c 2013-12-20 13:29:41.843260713 +0100
-@@ -894,6 +894,26 @@ main(int argc, char **argv) {
- }
- }
-
-+ /* We create a backup seed before rediscovering interfaces in order to
-+ have a seed built using all of the available interfaces
-+ It's interesting if required interfaces doesn't let us defined
-+ a really unique seed due to a lack of valid HW addr later
-+ (this is the case with DHCP over IB)
-+ We only use the last device as using a sum could broke the
-+ uniqueness of the seed among multiple nodes
-+ */
-+ unsigned backup_seed = 0;
-+ for (ip = interfaces; ip; ip = ip -> next) {
-+ int junk;
-+ if ( ip -> hw_address.hlen <= sizeof seed )
-+ continue;
-+ memcpy (&junk,
-+ &ip -> hw_address.hbuf [ip -> hw_address.hlen -
-+ sizeof seed], sizeof seed);
-+ backup_seed = junk;
-+ }
-+
-+
- /* At this point, all the interfaces that the script thinks
- are relevant should be running, so now we once again call
- discover_interfaces(), and this time ask it to actually set
-@@ -908,14 +928,36 @@ main(int argc, char **argv) {
- Not much entropy, but we're booting, so we're not likely to
- find anything better. */
- seed = 0;
-+ int seed_flag = 0;
- for (ip = interfaces; ip; ip = ip->next) {
- int junk;
-+ if ( ip -> hw_address.hlen <= sizeof seed )
-+ continue;
- memcpy(&junk,
- &ip->hw_address.hbuf[ip->hw_address.hlen -
- sizeof seed], sizeof seed);
- seed += junk;
-+ seed_flag = 1;
- }
-- srandom(seed + cur_time + (unsigned)getpid());
-+ if ( seed_flag == 0 ) {
-+ if ( backup_seed != 0 ) {
-+ seed = backup_seed;
-+ log_info ("xid: rand init seed (0x%x) built using all"
-+ " available interfaces",seed);
-+ }
-+ else {
-+ seed = cur_time^((unsigned) gethostid()) ;
-+ log_info ("xid: warning: no netdev with useable HWADDR found"
-+ " for seed's uniqueness enforcement");
-+ log_info ("xid: rand init seed (0x%x) built using gethostid",
-+ seed);
-+ }
-+ /* we only use seed and no current time as a broadcast reply */
-+ /* will certainly be used by the hwaddrless interface */
-+ srandom(seed);
-+ }
-+ else
-+ srandom(seed + cur_time + (unsigned)getpid());
-
- /* Setup specific Infiniband options */
- for (ip = interfaces; ip; ip = ip->next) {
-@@ -1460,7 +1502,7 @@ void dhcpack (packet)
- return;
- }
-
-- log_info ("DHCPACK from %s", piaddr (packet -> client_addr));
-+ log_info ("DHCPACK from %s (xid=0x%x)", piaddr (packet -> client_addr), client -> xid);
-
- lease = packet_to_lease (packet, client);
- if (!lease) {
-@@ -2171,7 +2213,7 @@ void dhcpnak (packet)
- return;
- }
-
-- log_info ("DHCPNAK from %s", piaddr (packet -> client_addr));
-+ log_info ("DHCPNAK from %s (xid=0x%x)", piaddr (packet -> client_addr), client -> xid);
-
- if (!client -> active) {
- #if defined (DEBUG)
-@@ -2298,10 +2340,10 @@ void send_discover (cpp)
- client -> packet.secs = htons (65535);
- client -> secs = client -> packet.secs;
-
-- log_info ("DHCPDISCOVER on %s to %s port %d interval %ld",
-+ log_info ("DHCPDISCOVER on %s to %s port %d interval %ld (xid=0x%x)",
- client -> name ? client -> name : client -> interface -> name,
- inet_ntoa (sockaddr_broadcast.sin_addr),
-- ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval));
-+ ntohs (sockaddr_broadcast.sin_port), (long)(client -> interval), client -> xid);
-
- /* Send out a packet. */
- result = send_packet(client->interface, NULL, &client->packet,
-@@ -2570,10 +2612,10 @@ void send_request (cpp)
- client -> packet.secs = htons (65535);
- }
-
-- log_info ("DHCPREQUEST on %s to %s port %d",
-+ log_info ("DHCPREQUEST on %s to %s port %d (xid=0x%x)",
- client -> name ? client -> name : client -> interface -> name,
- inet_ntoa (destination.sin_addr),
-- ntohs (destination.sin_port));
-+ ntohs (destination.sin_port), client -> xid);
-
- if (destination.sin_addr.s_addr != INADDR_BROADCAST &&
- fallback_interface) {
-@@ -2613,10 +2655,10 @@ void send_decline (cpp)
-
- int result;
-
-- log_info ("DHCPDECLINE on %s to %s port %d",
-+ log_info ("DHCPDECLINE on %s to %s port %d (xid=0x%x)",
- client->name ? client->name : client->interface->name,
- inet_ntoa(sockaddr_broadcast.sin_addr),
-- ntohs(sockaddr_broadcast.sin_port));
-+ ntohs(sockaddr_broadcast.sin_port), client -> xid);
-
- /* Send out a packet. */
- result = send_packet(client->interface, NULL, &client->packet,
-@@ -2659,10 +2701,10 @@ void send_release (cpp)
- return;
- }
-
-- log_info ("DHCPRELEASE on %s to %s port %d",
-+ log_info ("DHCPRELEASE on %s to %s port %d (xid=0x%x)",
- client -> name ? client -> name : client -> interface -> name,
- inet_ntoa (destination.sin_addr),
-- ntohs (destination.sin_port));
-+ ntohs (destination.sin_port), client -> xid);
-
- if (fallback_interface) {
- result = send_packet(fallback_interface, NULL, &client->packet,
diff --git a/src/patches/dhcp/dhcp-logpid.patch b/src/patches/dhcp/dhcp-logpid.patch
deleted file mode 100644
index e1a6ebdb5..000000000
--- a/src/patches/dhcp/dhcp-logpid.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- expanded_org/client/dhclient.c Wed Aug 06 23:35:00 2014
-+++ expanded_logpid/client/dhclient.c Mon Feb 16 13:35:31 2015
-@@ -142,7 +142,7 @@
- else if (fd != -1)
- close(fd);
-
-- openlog("dhclient", DHCP_LOG_OPTIONS, LOG_DAEMON);
-+ openlog("dhclient", LOG_NDELAY | LOG_PID, LOG_DAEMON);
-
- #if !(defined(DEBUG) || defined(__CYGWIN32__))
- setlogmask(LOG_UPTO(LOG_INFO));
diff --git a/src/patches/dhcp/dhcp-lpf-ib.patch b/src/patches/dhcp/dhcp-lpf-ib.patch
deleted file mode 100644
index 8e094d649..000000000
--- a/src/patches/dhcp/dhcp-lpf-ib.patch
+++ /dev/null
@@ -1,585 +0,0 @@
-diff -up dhcp-4.3.1b1/client/dhclient.c.bmgpWV dhcp-4.3.1b1/client/dhclient.c
---- dhcp-4.3.1b1/client/dhclient.c.bmgpWV 2014-07-10 17:50:26.922402550 +0200
-+++ dhcp-4.3.1b1/client/dhclient.c 2014-07-10 17:53:43.629623477 +0200
-@@ -114,6 +114,8 @@ static int check_domain_name_list(const
- static int check_option_values(struct universe *universe, unsigned int opt,
- const char *ptr, size_t len);
-
-+static void setup_ib_interface(struct interface_info *ip);
-+
- #ifndef UNIT_TEST
- int
- main(int argc, char **argv) {
-@@ -937,6 +939,13 @@ main(int argc, char **argv) {
- }
- srandom(seed + cur_time + (unsigned)getpid());
-
-+ /* Setup specific Infiniband options */
-+ for (ip = interfaces; ip; ip = ip->next) {
-+ if (ip->client &&
-+ (ip->hw_address.hbuf[0] == HTYPE_INFINIBAND)) {
-+ setup_ib_interface(ip);
-+ }
-+ }
-
- /*
- * Establish a default DUID. We always do so for v6 and
-@@ -1230,6 +1239,29 @@ int find_subnet (struct subnet **sp,
- return 0;
- }
-
-+static void setup_ib_interface(struct interface_info *ip)
-+{
-+ struct group *g;
-+
-+ /* Set the broadcast flag */
-+ ip->client->config->bootp_broadcast_always = 1;
-+
-+ /*
-+ * Find out if a dhcp-client-identifier option was specified either
-+ * in the config file or on the command line
-+ */
-+ for (g = ip->client->config->on_transmission; g != NULL; g = g->next) {
-+ if ((g->statements != NULL) &&
-+ (strcmp(g->statements->data.option->option->name,
-+ "dhcp-client-identifier") == 0)) {
-+ return;
-+ }
-+ }
-+
-+ /* No client ID specified */
-+ log_fatal("dhcp-client-identifier must be specified for InfiniBand");
-+}
-+
- /* Individual States:
- *
- * Each routine is called from the dhclient_state_machine() in one of
-diff -up dhcp-4.3.1b1/common/bpf.c.bmgpWV dhcp-4.3.1b1/common/bpf.c
---- dhcp-4.3.1b1/common/bpf.c.bmgpWV 2014-07-10 17:48:03.797424616 +0200
-+++ dhcp-4.3.1b1/common/bpf.c 2014-07-10 17:52:57.705272295 +0200
-@@ -199,11 +199,44 @@ struct bpf_insn dhcp_bpf_filter [] = {
- BPF_STMT(BPF_RET+BPF_K, 0),
- };
-
-+/* Packet filter program for DHCP over Infiniband.
-+ *
-+ * XXX
-+ * Changes to the filter program may require changes to the constant offsets
-+ * used in lpf_gen_filter_setup to patch the port in the BPF program!
-+ * XXX
-+ */
-+struct bpf_insn dhcp_ib_bpf_filter [] = {
-+ /* Packet filter for Infiniband */
-+ /* Make sure it's a UDP packet... */
-+ BPF_STMT(BPF_LD + BPF_B + BPF_ABS, 9),
-+ BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, IPPROTO_UDP, 0, 6),
-+
-+ /* Make sure this isn't a fragment... */
-+ BPF_STMT(BPF_LD + BPF_H + BPF_ABS, 6),
-+ BPF_JUMP(BPF_JMP + BPF_JSET + BPF_K, 0x1fff, 4, 0),
-+
-+ /* Get the IP header length... */
-+ BPF_STMT(BPF_LDX + BPF_B + BPF_MSH, 0),
-+
-+ /* Make sure it's to the right port... */
-+ BPF_STMT(BPF_LD + BPF_H + BPF_IND, 2),
-+ BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, 67, 0, 1),
-+
-+ /* If we passed all the tests, ask for the whole packet. */
-+ BPF_STMT(BPF_RET + BPF_K, (u_int)-1),
-+
-+ /* Otherwise, drop it. */
-+ BPF_STMT(BPF_RET + BPF_K, 0),
-+};
-+
- #if defined (DEC_FDDI)
- struct bpf_insn *bpf_fddi_filter;
- #endif
-
- int dhcp_bpf_filter_len = sizeof dhcp_bpf_filter / sizeof (struct bpf_insn);
-+int dhcp_ib_bpf_filter_len = sizeof dhcp_ib_bpf_filter / sizeof (struct bpf_insn);
-+
- #if defined (HAVE_TR_SUPPORT)
- struct bpf_insn dhcp_bpf_tr_filter [] = {
- /* accept all token ring packets due to variable length header */
-diff -up dhcp-4.3.1b1/common/lpf.c.bmgpWV dhcp-4.3.1b1/common/lpf.c
---- dhcp-4.3.1b1/common/lpf.c.bmgpWV 2014-07-10 17:48:03.797424616 +0200
-+++ dhcp-4.3.1b1/common/lpf.c 2014-07-10 17:52:57.706272281 +0200
-@@ -46,6 +46,17 @@
- #if defined (USE_LPF_RECEIVE) || defined (USE_LPF_HWADDR)
- #include <sys/ioctl.h>
- #include <net/if.h>
-+#include <ifaddrs.h>
-+
-+/* Default broadcast address for IPoIB */
-+static unsigned char default_ib_bcast_addr[20] = {
-+ 0x00, 0xff, 0xff, 0xff,
-+ 0xff, 0x12, 0x40, 0x1b,
-+ 0x00, 0x00, 0x00, 0x00,
-+ 0x00, 0x00, 0x00, 0x00,
-+ 0xff, 0xff, 0xff, 0xff
-+};
-+
- #endif
-
- #if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE)
-@@ -92,10 +103,21 @@ int if_register_lpf (info)
- struct sockaddr common;
- } sa;
- struct ifreq ifr;
-+ int type;
-+ int protocol;
-
- /* Make an LPF socket. */
-- if ((sock = socket(PF_PACKET, SOCK_RAW,
-- htons((short)ETH_P_ALL))) < 0) {
-+ get_hw_addr(info);
-+
-+ if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
-+ type = SOCK_DGRAM;
-+ protocol = ETHERTYPE_IP;
-+ } else {
-+ type = SOCK_RAW;
-+ protocol = ETH_P_ALL;
-+ }
-+
-+ if ((sock = socket(PF_PACKET, type, htons((short)protocol))) < 0) {
- if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
- errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
- errno == EAFNOSUPPORT || errno == EINVAL) {
-@@ -118,6 +140,7 @@ int if_register_lpf (info)
- /* Bind to the interface name */
- memset (&sa, 0, sizeof sa);
- sa.ll.sll_family = AF_PACKET;
-+ sa.ll.sll_protocol = htons(protocol);
- sa.ll.sll_ifindex = ifr.ifr_ifindex;
- if (bind (sock, &sa.common, sizeof sa)) {
- if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
-@@ -133,8 +156,6 @@ int if_register_lpf (info)
- log_fatal ("Bind socket to interface: %m");
- }
-
-- get_hw_addr(info->name, &info->hw_address);
--
- return sock;
- }
- #endif /* USE_LPF_SEND || USE_LPF_RECEIVE */
-@@ -189,6 +210,8 @@ void if_deregister_send (info)
- in bpf includes... */
- extern struct sock_filter dhcp_bpf_filter [];
- extern int dhcp_bpf_filter_len;
-+extern struct sock_filter dhcp_ib_bpf_filter [];
-+extern int dhcp_ib_bpf_filter_len;
-
- #if defined (HAVE_TR_SUPPORT)
- extern struct sock_filter dhcp_bpf_tr_filter [];
-@@ -206,11 +229,13 @@ void if_register_receive (info)
- /* Open a LPF device and hang it on this interface... */
- info -> rfdesc = if_register_lpf (info);
-
-- val = 1;
-- if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val,
-- sizeof val) < 0) {
-- if (errno != ENOPROTOOPT)
-- log_fatal ("Failed to set auxiliary packet data: %m");
-+ if (info->hw_address.hbuf[0] != HTYPE_INFINIBAND) {
-+ val = 1;
-+ if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA,
-+ &val, sizeof val) < 0) {
-+ if (errno != ENOPROTOOPT)
-+ log_fatal ("Failed to set auxiliary packet data: %m");
-+ }
- }
-
- #if defined (HAVE_TR_SUPPORT)
-@@ -256,15 +281,28 @@ static void lpf_gen_filter_setup (info)
-
- memset(&p, 0, sizeof(p));
-
-- /* Set up the bpf filter program structure. This is defined in
-- bpf.c */
-- p.len = dhcp_bpf_filter_len;
-- p.filter = dhcp_bpf_filter;
--
-- /* Patch the server port into the LPF program...
-- XXX changes to filter program may require changes
-- to the insn number(s) used below! XXX */
-- dhcp_bpf_filter [8].k = ntohs ((short)local_port);
-+ if (info->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
-+ /* Set up the bpf filter program structure. */
-+ p.len = dhcp_ib_bpf_filter_len;
-+ p.filter = dhcp_ib_bpf_filter;
-+
-+ /* Patch the server port into the LPF program...
-+ XXX
-+ changes to filter program may require changes
-+ to the insn number(s) used below!
-+ XXX */
-+ dhcp_ib_bpf_filter[6].k = ntohs ((short)local_port);
-+ } else {
-+ /* Set up the bpf filter program structure.
-+ This is defined in bpf.c */
-+ p.len = dhcp_bpf_filter_len;
-+ p.filter = dhcp_bpf_filter;
-+
-+ /* Patch the server port into the LPF program...
-+ XXX changes to filter program may require changes
-+ to the insn number(s) used below! XXX */
-+ dhcp_bpf_filter [8].k = ntohs ((short)local_port);
-+ }
-
- if (setsockopt (info -> rfdesc, SOL_SOCKET, SO_ATTACH_FILTER, &p,
- sizeof p) < 0) {
-@@ -321,6 +359,54 @@ static void lpf_tr_filter_setup (info)
- #endif /* USE_LPF_RECEIVE */
-
- #ifdef USE_LPF_SEND
-+ssize_t send_packet_ib(interface, packet, raw, len, from, to, hto)
-+ struct interface_info *interface;
-+ struct packet *packet;
-+ struct dhcp_packet *raw;
-+ size_t len;
-+ struct in_addr from;
-+ struct sockaddr_in *to;
-+ struct hardware *hto;
-+{
-+ unsigned ibufp = 0;
-+ double ih [1536 / sizeof (double)];
-+ unsigned char *buf = (unsigned char *)ih;
-+ ssize_t result;
-+
-+ union sockunion {
-+ struct sockaddr sa;
-+ struct sockaddr_ll sll;
-+ struct sockaddr_storage ss;
-+ } su;
-+
-+ assemble_udp_ip_header (interface, buf, &ibufp, from.s_addr,
-+ to->sin_addr.s_addr, to->sin_port,
-+ (unsigned char *)raw, len);
-+ memcpy (buf + ibufp, raw, len);
-+
-+ memset(&su, 0, sizeof(su));
-+ su.sll.sll_family = AF_PACKET;
-+ su.sll.sll_protocol = htons(ETHERTYPE_IP);
-+
-+ if (!(su.sll.sll_ifindex = if_nametoindex(interface->name))) {
-+ errno = ENOENT;
-+ log_error ("send_packet_ib: %m - failed to get if index");
-+ return -1;
-+ }
-+
-+ su.sll.sll_hatype = htons(HTYPE_INFINIBAND);
-+ su.sll.sll_halen = sizeof(interface->bcast_addr);
-+ memcpy(&su.sll.sll_addr, interface->bcast_addr, 20);
-+
-+ result = sendto(interface->wfdesc, buf, ibufp + len, 0,
-+ &su.sa, sizeof(su));
-+
-+ if (result < 0)
-+ log_error ("send_packet_ib: %m");
-+
-+ return result;
-+}
-+
- ssize_t send_packet (interface, packet, raw, len, from, to, hto)
- struct interface_info *interface;
- struct packet *packet;
-@@ -341,6 +427,11 @@ ssize_t send_packet (interface, packet,
- return send_fallback (interface, packet, raw,
- len, from, to, hto);
-
-+ if (interface->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
-+ return send_packet_ib(interface, packet, raw, len, from,
-+ to, hto);
-+ }
-+
- if (hto == NULL && interface->anycast_mac_addr.hlen)
- hto = &interface->anycast_mac_addr;
-
-@@ -362,6 +453,42 @@ ssize_t send_packet (interface, packet,
- #endif /* USE_LPF_SEND */
-
- #ifdef USE_LPF_RECEIVE
-+ssize_t receive_packet_ib (interface, buf, len, from, hfrom)
-+ struct interface_info *interface;
-+ unsigned char *buf;
-+ size_t len;
-+ struct sockaddr_in *from;
-+ struct hardware *hfrom;
-+{
-+ int length = 0;
-+ int offset = 0;
-+ unsigned char ibuf [1536];
-+ unsigned bufix = 0;
-+ unsigned paylen;
-+
-+ length = read(interface->rfdesc, ibuf, sizeof(ibuf));
-+
-+ if (length <= 0)
-+ return length;
-+
-+ offset = decode_udp_ip_header(interface, ibuf, bufix, from,
-+ (unsigned)length, &paylen, 0);
-+
-+ if (offset < 0)
-+ return 0;
-+
-+ bufix += offset;
-+ length -= offset;
-+
-+ if (length < paylen)
-+ log_fatal("Internal inconsistency at %s:%d.", MDL);
-+
-+ /* Copy out the data in the packet... */
-+ memcpy(buf, &ibuf[bufix], paylen);
-+
-+ return (ssize_t)paylen;
-+}
-+
- ssize_t receive_packet (interface, buf, len, from, hfrom)
- struct interface_info *interface;
- unsigned char *buf;
-@@ -388,6 +515,10 @@ ssize_t receive_packet (interface, buf,
- };
- struct cmsghdr *cmsg;
-
-+ if (interface->hw_address.hbuf[0] == HTYPE_INFINIBAND) {
-+ return receive_packet_ib(interface, buf, len, from, hfrom);
-+ }
-+
- length = recvmsg (interface -> rfdesc, &msg, 0);
- if (length <= 0)
- return length;
-@@ -469,11 +600,33 @@ void maybe_setup_fallback ()
- #endif
-
- #if defined (USE_LPF_RECEIVE) || defined (USE_LPF_HWADDR)
--void
--get_hw_addr(const char *name, struct hardware *hw) {
-+struct sockaddr_ll *
-+get_ll (struct ifaddrs *ifaddrs, struct ifaddrs **ifa, char *name)
-+{
-+ for (*ifa = ifaddrs; *ifa != NULL; *ifa = (*ifa)->ifa_next) {
-+ if ((*ifa)->ifa_addr == NULL)
-+ continue;
-+
-+ if ((*ifa)->ifa_addr->sa_family != AF_PACKET)
-+ continue;
-+
-+ if ((*ifa)->ifa_flags & IFF_LOOPBACK)
-+ continue;
-+
-+ if (strcmp((*ifa)->ifa_name, name) == 0)
-+ return (struct sockaddr_ll *)(void *)(*ifa)->ifa_addr;
-+ }
-+ *ifa = NULL;
-+ return NULL;
-+}
-+
-+struct sockaddr_ll *
-+ioctl_get_ll(char *name)
-+{
- int sock;
- struct ifreq tmp;
-- struct sockaddr *sa;
-+ struct sockaddr *sa = NULL;
-+ struct sockaddr_ll *sll = NULL;
-
- if (strlen(name) >= sizeof(tmp.ifr_name)) {
- log_fatal("Device name too long: \"%s\"", name);
-@@ -487,16 +640,62 @@ get_hw_addr(const char *name, struct har
- memset(&tmp, 0, sizeof(tmp));
- strcpy(tmp.ifr_name, name);
- if (ioctl(sock, SIOCGIFHWADDR, &tmp) < 0) {
-- log_fatal("Error getting hardware address for \"%s\": %m",
-+ log_fatal("Error getting hardware address for \"%s\": %m",
- name);
- }
-+ close(sock);
-
- sa = &tmp.ifr_hwaddr;
-- switch (sa->sa_family) {
-+ // needs to be freed outside this function
-+ sll = dmalloc (sizeof (struct sockaddr_ll), MDL);
-+ if (!sll)
-+ log_fatal("Unable to allocate memory for link layer address");
-+ memcpy(&sll->sll_hatype, &sa->sa_family, sizeof (sll->sll_hatype));
-+ memcpy(sll->sll_addr, sa->sa_data, sizeof (sll->sll_addr));
-+ switch (sll->sll_hatype) {
-+ case ARPHRD_INFINIBAND:
-+ /* ioctl limits hardware addresses to 8 bytes */
-+ sll->sll_halen = 8;
-+ break;
-+ default:
-+ break;
-+ }
-+ return sll;
-+}
-+
-+void
-+get_hw_addr(struct interface_info *info)
-+{
-+ struct hardware *hw = &info->hw_address;
-+ char *name = info->name;
-+ struct ifaddrs *ifaddrs = NULL;
-+ struct ifaddrs *ifa = NULL;
-+ struct sockaddr_ll *sll = NULL;
-+ int sll_allocated = 0;
-+ char *dup = NULL;
-+ char *colon = NULL;
-+
-+ if (getifaddrs(&ifaddrs) == -1)
-+ log_fatal("Failed to get interfaces");
-+
-+ if ((sll = get_ll(ifaddrs, &ifa, name)) == NULL) {
-+ /*
-+ * We were unable to get link-layer address for name.
-+ * Fall back to ioctl(SIOCGIFHWADDR).
-+ */
-+ sll = ioctl_get_ll(name);
-+ if (sll != NULL)
-+ sll_allocated = 1;
-+ else
-+ // shouldn't happen
-+ log_fatal("Unexpected internal error");
-+ }
-+
-+ switch (sll->sll_hatype) {
- case ARPHRD_ETHER:
- hw->hlen = 7;
- hw->hbuf[0] = HTYPE_ETHER;
-- memcpy(&hw->hbuf[1], sa->sa_data, 6);
-+ memcpy(&hw->hbuf[1], sll->sll_addr, 6);
- break;
- case ARPHRD_IEEE802:
- #ifdef ARPHRD_IEEE802_TR
-@@ -504,18 +703,48 @@ get_hw_addr(const char *name, struct har
- #endif /* ARPHRD_IEEE802_TR */
- hw->hlen = 7;
- hw->hbuf[0] = HTYPE_IEEE802;
-- memcpy(&hw->hbuf[1], sa->sa_data, 6);
-+ memcpy(&hw->hbuf[1], sll->sll_addr, 6);
- break;
- case ARPHRD_FDDI:
- hw->hlen = 7;
- hw->hbuf[0] = HTYPE_FDDI;
-- memcpy(&hw->hbuf[1], sa->sa_data, 6);
-+ memcpy(&hw->hbuf[1], sll->sll_addr, 6);
-+ break;
-+ case ARPHRD_INFINIBAND:
-+ dup = strdup(name);
-+ /* Aliased infiniband interface is special case where
-+ * neither get_ll() nor ioctl_get_ll() get's correct hw
-+ * address, so we have to truncate the :0 and run
-+ * get_ll() again for the rest.
-+ */
-+ if ((colon = strchr(dup, ':')) != NULL) {
-+ *colon = '\0';
-+ if ((sll = get_ll(ifaddrs, &ifa, dup)) == NULL)
-+ log_fatal("Error getting hardware address for \"%s\": %m", name);
-+ }
-+ free (dup);
-+ /* For Infiniband, save the broadcast address and store
-+ * the port GUID into the hardware address.
-+ */
-+ if (ifa && (ifa->ifa_flags & IFF_BROADCAST)) {
-+ struct sockaddr_ll *bll;
-+
-+ bll = (struct sockaddr_ll *)ifa->ifa_broadaddr;
-+ memcpy(&info->bcast_addr, bll->sll_addr, 20);
-+ } else {
-+ memcpy(&info->bcast_addr, default_ib_bcast_addr,
-+ 20);
-+ }
-+
-+ hw->hlen = 1;
-+ hw->hbuf[0] = HTYPE_INFINIBAND;
-+ memcpy(&hw->hbuf[1], &sll->sll_addr[sll->sll_halen - 8], 8);
- break;
- #if defined(ARPHRD_PPP)
- case ARPHRD_PPP:
- if (local_family != AF_INET6)
-- log_fatal("Unsupported device type %d for \"%s\"",
-- sa->sa_family, name);
-+ log_fatal("local_family != AF_INET6 for \"%s\"",
-+ name);
- hw->hlen = 0;
- hw->hbuf[0] = HTYPE_RESERVED;
- /* 0xdeadbeef should never occur on the wire,
-@@ -528,10 +757,13 @@ get_hw_addr(const char *name, struct har
- break;
- #endif
- default:
-- log_fatal("Unsupported device type %ld for \"%s\"",
-- (long int)sa->sa_family, name);
-+ freeifaddrs(ifaddrs);
-+ log_fatal("Unsupported device type %hu for \"%s\"",
-+ sll->sll_hatype, name);
- }
-
-- close(sock);
-+ if (sll_allocated)
-+ dfree(sll, MDL);
-+ freeifaddrs(ifaddrs);
- }
- #endif
-diff -up dhcp-4.3.1b1/common/socket.c.bmgpWV dhcp-4.3.1b1/common/socket.c
---- dhcp-4.3.1b1/common/socket.c.bmgpWV 2014-07-02 19:58:38.000000000 +0200
-+++ dhcp-4.3.1b1/common/socket.c 2014-07-10 17:52:57.706272281 +0200
-@@ -322,7 +322,7 @@ void if_register_send (info)
- info->wfdesc = if_register_socket(info, AF_INET, 0, NULL);
- /* If this is a normal IPv4 address, get the hardware address. */
- if (strcmp(info->name, "fallback") != 0)
-- get_hw_addr(info->name, &info->hw_address);
-+ get_hw_addr(info);
- #if defined (USE_SOCKET_FALLBACK)
- /* Fallback only registers for send, but may need to receive as
- well. */
-@@ -385,7 +385,7 @@ void if_register_receive (info)
- #endif /* IP_PKTINFO... */
- /* If this is a normal IPv4 address, get the hardware address. */
- if (strcmp(info->name, "fallback") != 0)
-- get_hw_addr(info->name, &info->hw_address);
-+ get_hw_addr(info);
-
- if (!quiet_interface_discovery)
- log_info ("Listening on Socket/%s%s%s",
-@@ -499,7 +499,7 @@ if_register6(struct interface_info *info
- if (req_multi)
- if_register_multicast(info);
-
-- get_hw_addr(info->name, &info->hw_address);
-+ get_hw_addr(info);
-
- if (!quiet_interface_discovery) {
- if (info->shared_network != NULL) {
-@@ -555,7 +555,7 @@ if_register_linklocal6(struct interface_
- info->rfdesc = sock;
- info->wfdesc = sock;
-
-- get_hw_addr(info->name, &info->hw_address);
-+ get_hw_addr(info);
-
- if (!quiet_interface_discovery) {
- if (info->shared_network != NULL) {
-diff -up dhcp-4.3.1b1/includes/dhcpd.h.bmgpWV dhcp-4.3.1b1/includes/dhcpd.h
---- dhcp-4.3.1b1/includes/dhcpd.h.bmgpWV 2014-07-10 17:50:26.923402536 +0200
-+++ dhcp-4.3.1b1/includes/dhcpd.h 2014-07-10 17:52:57.707272266 +0200
-@@ -1248,6 +1248,7 @@ struct interface_info {
- struct shared_network *shared_network;
- /* Networks connected to this interface. */
- struct hardware hw_address; /* Its physical address. */
-+ u_int8_t bcast_addr[20]; /* Infiniband broadcast address */
- struct in_addr *addresses; /* Addresses associated with this
- * interface.
- */
-@@ -2439,7 +2440,7 @@ void print_dns_status (int, struct dhcp_
- #endif
- const char *print_time(TIME);
-
--void get_hw_addr(const char *name, struct hardware *hw);
-+void get_hw_addr(struct interface_info *info);
-
- /* socket.c */
- #if defined (USE_SOCKET_SEND) || defined (USE_SOCKET_RECEIVE) \
diff --git a/src/patches/dhcp/dhcp-manpages.patch b/src/patches/dhcp/dhcp-manpages.patch
deleted file mode 100644
index dde16c735..000000000
--- a/src/patches/dhcp/dhcp-manpages.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-diff -up dhcp-4.3.0a1/client/dhclient-script.8.man dhcp-4.3.0a1/client/dhclient-script.8
---- dhcp-4.3.0a1/client/dhclient-script.8.man 2013-12-11 01:01:02.000000000 +0100
-+++ dhcp-4.3.0a1/client/dhclient-script.8 2013-12-19 15:27:17.617118805 +0100
-@@ -48,7 +48,7 @@ customizations are needed, they should b
- exit hooks provided (see HOOKS for details). These hooks will allow the
- user to override the default behaviour of the client in creating a
- .B /etc/resolv.conf
--file.
-+file, and to handle DHCP options not handled by default.
- .PP
- No standard client script exists for some operating systems, even though
- the actual client may work, so a pioneering user may well need to create
-@@ -92,6 +92,26 @@ present. The
- .B ETCDIR/dhclient-exit-hooks
- script can modify the valid of exit_status to change the exit status
- of dhclient-script.
-+.PP
-+Immediately after dhclient brings an interface UP with a new IP address,
-+subnet mask, and routes, in the REBOOT/BOUND states, it will check for the
-+existence of an executable
-+.B ETCDIR/dhclient-up-hooks
-+script, and source it if found. This script can handle DHCP options in
-+the environment that are not handled by default. A per-interface.
-+.B ETCDIR/dhclient-${IF}-up-hooks
-+script will override the generic script and be sourced when interface
-+$IF has been brought up.
-+.PP
-+Immediately before dhclient brings an interface DOWN, removing its IP
-+address, subnet mask, and routes, in the STOP/RELEASE states, it will
-+check for the existence of an executable
-+.B ETCDIR/dhclient-down-hooks
-+script, and source it if found. This script can handle DHCP options in
-+the environment that are not handled by default. A per-interface
-+.B ETCDIR/dhclient-${IF}-down-hooks
-+script will override the generic script and be sourced when interface
-+$IF is about to be brought down.
- .SH OPERATION
- When dhclient needs to invoke the client configuration script, it
- defines a set of variables in the environment, and then invokes
-diff -up dhcp-4.3.0a1/client/dhclient.conf.5.man dhcp-4.3.0a1/client/dhclient.conf.5
---- dhcp-4.3.0a1/client/dhclient.conf.5.man 2013-12-11 01:01:02.000000000 +0100
-+++ dhcp-4.3.0a1/client/dhclient.conf.5 2013-12-19 15:27:17.617118805 +0100
-@@ -202,7 +202,8 @@ responding to the client send the client
- options. Only the option names should be specified in the request
- statement - not option parameters. By default, the DHCPv4 client
- requests the subnet-mask, broadcast-address, time-offset, routers,
--domain-name, domain-name-servers and host-name options while the DHCPv6
-+domain-search, domain-name, domain-name-servers, host-name, nis-domain,
-+nis-servers, ntp-servers and interface-mtu options while the DHCPv6
- client requests the dhcp6 name-servers and domain-search options. Note
- that if you enter a \'request\' statement, you over-ride these defaults
- and these options will not be requested.
-@@ -688,6 +689,17 @@ know the DHCP service(s) anycast MAC add
- client. The \fIlink-type\fR and \fImac-address\fR parameters are configured
- in a similar manner to the \fBhardware\fR statement.
- .PP
-+ \fBbootp-broadcast-always;\fR
-+.PP
-+The
-+.B bootp-broadcast-always
-+statement instructs dhclient to always set the bootp broadcast flag in
-+request packets, so that servers will always broadcast replies.
-+This is equivalent to supplying the dhclient -B argument, and has
-+the same effect as specifying 'always-broadcast' in the server's dhcpd.conf.
-+This option is provided as an extension to enable dhclient to work
-+on IBM s390 Linux guests.
-+.PP
- .SH SAMPLE
- The following configuration file is used on a laptop running NetBSD
- 1.3. The laptop has an IP alias of 192.5.5.213, and has one
-@@ -713,7 +725,7 @@ interface "ep0" {
- supersede domain-search "fugue.com", "rc.vix.com", "home.vix.com";
- prepend domain-name-servers 127.0.0.1;
- request subnet-mask, broadcast-address, time-offset, routers,
-- domain-name, domain-name-servers, host-name;
-+ domain-search, domain-name, domain-name-servers, host-name;
- require subnet-mask, domain-name-servers;
- script "CLIENTBINDIR/dhclient-script";
- media "media 10baseT/UTP", "media 10base2/BNC";
-diff -up dhcp-4.3.0a1/common/dhcp-options.5.man dhcp-4.3.0a1/common/dhcp-options.5
---- dhcp-4.3.0a1/common/dhcp-options.5.man 2013-12-11 01:25:12.000000000 +0100
-+++ dhcp-4.3.0a1/common/dhcp-options.5 2013-12-19 15:27:17.618118791 +0100
-@@ -914,6 +914,21 @@ classless IP routing - it does not inclu
- classless IP routing is now the most widely deployed routing standard,
- this option is virtually useless, and is not implemented by any of the
- popular DHCP clients, for example the Microsoft DHCP client.
-+.PP
-+NOTE to Fedora dhclient users:
-+.br
-+dhclient-script interprets trailing 0 octets of the target as indicating
-+the subnet class of the route, so for the following static-routes value:
-+.br
-+ option static-routes 172.0.0.0 172.16.2.254,
-+.br
-+ 192.168.0.0 192.168.2.254;
-+.br
-+dhclient-script will create routes:
-+.br
-+ 172/8 via 172.16.2.254 dev $interface
-+.br
-+ 192.168/16 via 192.168.2.254 dev $interface
- .RE
- .PP
- .nf
-diff -up dhcp-4.3.0a1/server/dhcpd.conf.5.man dhcp-4.3.0a1/server/dhcpd.conf.5
---- dhcp-4.3.0a1/server/dhcpd.conf.5.man 2013-12-13 21:49:44.000000000 +0100
-+++ dhcp-4.3.0a1/server/dhcpd.conf.5 2013-12-19 15:30:14.266670962 +0100
-@@ -527,6 +527,9 @@ pool {
- };
- .fi
- .PP
-+Dynamic BOOTP leases are not compatible with failover, and, as such,
-+you need to disallow BOOTP in pools that you are using failover for.
-+.PP
- The server currently does very little sanity checking, so if you
- configure it wrong, it will just fail in odd ways. I would recommend
- therefore that you either do failover or don't do failover, but don't
-@@ -541,9 +544,9 @@ primary server might look like this:
- failover peer "foo" {
- primary;
- address anthrax.rc.vix.com;
-- port 519;
-+ port 647;
- peer address trantor.rc.vix.com;
-- peer port 520;
-+ peer port 847;
- max-response-delay 60;
- max-unacked-updates 10;
- mclt 3600;
-@@ -1241,7 +1244,7 @@ the zone containing PTR records - for IS
- .PP
- .nf
- key DHCP_UPDATER {
-- algorithm HMAC-MD5.SIG-ALG.REG.INT;
-+ algorithm hmac-md5;
- secret pRP5FapFoJ95JEL06sv4PQ==;
- };
-
-@@ -1264,7 +1267,7 @@ dhcpd.conf file:
- .PP
- .nf
- key DHCP_UPDATER {
-- algorithm HMAC-MD5.SIG-ALG.REG.INT;
-+ algorithm hmac-md5;
- secret pRP5FapFoJ95JEL06sv4PQ==;
- };
-
-@@ -2539,7 +2542,8 @@ statement
- The \fInext-server\fR statement is used to specify the host address of
- the server from which the initial boot file (specified in the
- \fIfilename\fR statement) is to be loaded. \fIServer-name\fR should
--be a numeric IP address or a domain name.
-+be a numeric IP address or a domain name. If no \fInext-server\fR statement
-+applies to a given client, the address 0.0.0.0 is used.
- .RE
- .PP
- The
diff --git a/src/patches/dhcp/dhcp-paranoia.patch b/src/patches/dhcp/dhcp-paranoia.patch
deleted file mode 100644
index 0f2db8c18..000000000
--- a/src/patches/dhcp/dhcp-paranoia.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff -up dhcp-4.3.1b1/client/dhclient.c.dlTsyN dhcp-4.3.1b1/client/dhclient.c
---- dhcp-4.3.1b1/client/dhclient.c.dlTsyN 2014-07-10 17:49:49.882925843 +0200
-+++ dhcp-4.3.1b1/client/dhclient.c 2014-07-10 17:50:26.922402550 +0200
-@@ -1748,11 +1748,6 @@ int write_host (host)
- return 0;
- }
-
--void db_startup (testp)
-- int testp;
--{
--}
--
- void bootp (packet)
- struct packet *packet;
- {
-diff -up dhcp-4.3.1b1/includes/dhcpd.h.dlTsyN dhcp-4.3.1b1/includes/dhcpd.h
---- dhcp-4.3.1b1/includes/dhcpd.h.dlTsyN 2014-07-10 17:48:03.798424601 +0200
-+++ dhcp-4.3.1b1/includes/dhcpd.h 2014-07-10 17:50:26.923402536 +0200
-@@ -2866,7 +2866,11 @@ void commit_leases_timeout (void *);
- void commit_leases_readerdry(void *);
- int commit_leases (void);
- int commit_leases_timed (void);
-+#if defined (PARANOIA)
-+void db_startup (int, uid_t, gid_t);
-+#else
- void db_startup (int);
-+#endif /* PARANOIA */
- int new_lease_file (void);
- int group_writer (struct group_object *);
- int write_ia(const struct ia_xx *);
-diff -up dhcp-4.3.1b1/server/confpars.c.dlTsyN dhcp-4.3.1b1/server/confpars.c
---- dhcp-4.3.1b1/server/confpars.c.dlTsyN 2014-07-10 17:39:25.801764596 +0200
-+++ dhcp-4.3.1b1/server/confpars.c 2014-07-10 17:50:26.924402522 +0200
-@@ -219,7 +219,11 @@ void trace_conf_input (trace_type_t *tty
- }
-
- if (!leaseconf_initialized && ttype == trace_readleases_type) {
-+#if defined (PARANOIA)
-+ db_startup (0, 0, 0);
-+#else
- db_startup (0);
-+#endif /* PARANOIA */
- leaseconf_initialized = 1;
- postdb_startup ();
- }
-diff -up dhcp-4.3.1b1/server/db.c.dlTsyN dhcp-4.3.1b1/server/db.c
---- dhcp-4.3.1b1/server/db.c.dlTsyN 2014-07-10 17:39:25.801764596 +0200
-+++ dhcp-4.3.1b1/server/db.c 2014-07-10 17:50:26.925402508 +0200
-@@ -42,6 +42,10 @@ static int counting = 0;
- static int count = 0;
- TIME write_time;
- int lease_file_is_corrupt = 0;
-+#if defined (PARANOIA)
-+uid_t global_set_uid = 0;
-+gid_t global_set_gid = 0;
-+#endif /* PARANOIA */
-
- /* Write a single binding scope value in parsable format.
- */
-@@ -1046,8 +1050,11 @@ int commit_leases_timed()
- return (1);
- }
-
--void db_startup (testp)
-- int testp;
-+#if defined (PARANOIA)
-+void db_startup (int testp, uid_t set_uid, gid_t set_gid)
-+#else
-+void db_startup (int testp)
-+#endif /* PARANOIA */
- {
- isc_result_t status;
-
-@@ -1066,6 +1073,11 @@ void db_startup (testp)
- }
- #endif
-
-+#if defined (PARANOIA)
-+ global_set_uid = set_uid;
-+ global_set_gid = set_gid;
-+#endif /* PARANOIA */
-+
- #if defined (TRACING)
- /* If we're playing back, there is no lease file, so we can't
- append it, so we create one immediately (maybe this isn't
-@@ -1128,6 +1140,17 @@ int new_lease_file ()
- log_error ("Can't create new lease file: %m");
- return 0;
- }
-+
-+#if defined (PARANOIA)
-+ if (global_set_uid && !geteuid() &&
-+ global_set_gid && !getegid())
-+ if (fchown(db_fd, global_set_uid, global_set_gid)) {
-+ log_fatal ("Can't chown new lease file: %m");
-+ close(db_fd);
-+ goto fdfail;
-+ }
-+#endif /* PARANOIA */
-+
- if ((new_db_file = fdopen(db_fd, "we")) == NULL) {
- log_error("Can't fdopen new lease file: %m");
- close(db_fd);
-diff -up dhcp-4.3.1b1/server/dhcpd.8.dlTsyN dhcp-4.3.1b1/server/dhcpd.8
---- dhcp-4.3.1b1/server/dhcpd.8.dlTsyN 2014-07-02 19:58:39.000000000 +0200
-+++ dhcp-4.3.1b1/server/dhcpd.8 2014-07-10 17:50:26.925402508 +0200
-@@ -82,6 +82,18 @@ dhcpd - Dynamic Host Configuration Proto
- .I trace-output-file
- ]
- [
-+.B -user
-+.I user
-+]
-+[
-+.B -group
-+.I group
-+]
-+[
-+.B -chroot
-+.I dir
-+]
-+[
- .B -play
- .I trace-playback-file
- ]
-@@ -269,6 +281,15 @@ lease file.
- .TP
- .BI --version
- Print version number and exit.
-+.TP
-+.BI \-user \ user
-+Setuid to user after completing privileged operations, such as creating sockets that listen on privileged ports.
-+.TP
-+.BI \-group \ group
-+Setgid to group after completing privileged operations, such as creating sockets that listen on privileged ports.
-+.TP
-+.BI \-chroot \ dir
-+Chroot to directory after processing the command line arguments, but before reading the configuration file.
- .PP
- .I Modifying default file locations:
- The following options can be used to modify the locations
-diff -up dhcp-4.3.1b1/server/dhcpd.c.dlTsyN dhcp-4.3.1b1/server/dhcpd.c
---- dhcp-4.3.1b1/server/dhcpd.c.dlTsyN 2014-07-10 17:39:25.802764582 +0200
-+++ dhcp-4.3.1b1/server/dhcpd.c 2014-07-10 17:52:35.341588248 +0200
-@@ -628,7 +628,11 @@ main(int argc, char **argv) {
- group_write_hook = group_writer;
-
- /* Start up the database... */
-+#if defined (PARANOIA)
-+ db_startup (lftest, set_uid, set_gid);
-+#else
- db_startup (lftest);
-+#endif /* PARANOIA */
-
- if (lftest)
- exit (0);
diff --git a/src/patches/dhcp/dhcp-paths.patch b/src/patches/dhcp/dhcp-paths.patch
deleted file mode 100644
index 2f43e51fe..000000000
--- a/src/patches/dhcp/dhcp-paths.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- expanded_org/includes/dhcpd.h Wed Aug 06 23:35:02 2014
-+++ expanded_patched_51_4_2_0_paths_patch/includes/dhcpd.h Mon Feb 16 13:22:11 2015
-@@ -1424,15 +1424,15 @@
- #else /* !DEBUG */
-
- #ifndef _PATH_DHCPD_CONF
--#define _PATH_DHCPD_CONF "/etc/dhcpd.conf"
-+#define _PATH_DHCPD_CONF "/etc/dhcp/dhcpd.conf"
- #endif /* DEBUG */
-
- #ifndef _PATH_DHCPD_DB
--#define _PATH_DHCPD_DB LOCALSTATEDIR"/db/dhcpd.leases"
-+#define _PATH_DHCPD_DB LOCALSTATEDIR"/dhcpd/dhcpd.leases"
- #endif
-
- #ifndef _PATH_DHCPD6_DB
--#define _PATH_DHCPD6_DB LOCALSTATEDIR"/db/dhcpd6.leases"
-+#define _PATH_DHCPD6_DB LOCALSTATEDIR"/dhcpd/dhcpd6.leases"
- #endif
-
- #ifndef _PATH_DHCPD_PID
-@@ -1446,7 +1446,7 @@
- #endif /* DEBUG */
-
- #ifndef _PATH_DHCLIENT_CONF
--#define _PATH_DHCLIENT_CONF "/etc/dhclient.conf"
-+#define _PATH_DHCLIENT_CONF "/etc/dhcp/dhclient.conf"
- #endif
-
- #ifndef _PATH_DHCLIENT_SCRIPT
-@@ -1462,11 +1462,11 @@
- #endif
-
- #ifndef _PATH_DHCLIENT_DB
--#define _PATH_DHCLIENT_DB LOCALSTATEDIR"/db/dhclient.leases"
-+#define _PATH_DHCLIENT_DB LOCALSTATEDIR"/dhclient/dhclient.leases"
- #endif
-
- #ifndef _PATH_DHCLIENT6_DB
--#define _PATH_DHCLIENT6_DB LOCALSTATEDIR"/db/dhclient6.leases"
-+#define _PATH_DHCLIENT6_DB LOCALSTATEDIR"/dhclient/dhclient6.leases"
- #endif
-
- #ifndef _PATH_RESOLV_CONF
diff --git a/src/patches/dhcp/dhcp-release-by-ifup.patch b/src/patches/dhcp/dhcp-release-by-ifup.patch
deleted file mode 100644
index 677eb5c75..000000000
--- a/src/patches/dhcp/dhcp-release-by-ifup.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -up dhcp-4.3.0a1/client/dhclient.c.ifup dhcp-4.3.0a1/client/dhclient.c
---- dhcp-4.3.0a1/client/dhclient.c.ifup 2013-12-19 14:53:08.817760677 +0100
-+++ dhcp-4.3.0a1/client/dhclient.c 2013-12-19 15:05:16.290518574 +0100
-@@ -521,9 +521,81 @@ main(int argc, char **argv) {
- }
- }
- fclose(pidfd);
-+ } else {
-+ /* handle release for interfaces requested with Red Hat
-+ * /sbin/ifup - pidfile will be /var/run/dhclient-$interface.pid
-+ */
-+
-+ if ((path_dhclient_pid == NULL) || (*path_dhclient_pid == '\0'))
-+ path_dhclient_pid = "/var/run/dhclient.pid";
-+
-+ char *new_path_dhclient_pid;
-+ struct interface_info *ip;
-+ int pdp_len = strlen(path_dhclient_pid), pfx, dpfx;
-+
-+ /* find append point: beginning of any trailing '.pid'
-+ * or '-$IF.pid' */
-+ for (pfx=pdp_len; (pfx >= 0) && (path_dhclient_pid[pfx] != '.') && (path_dhclient_pid[pfx] != '/'); pfx--);
-+ if (pfx == -1)
-+ pfx = pdp_len;
-+
-+ if (path_dhclient_pid[pfx] == '/')
-+ pfx += 1;
-+
-+ for (dpfx=pfx; (dpfx >= 0) && (path_dhclient_pid[dpfx] != '-') && (path_dhclient_pid[dpfx] != '/'); dpfx--);
-+ if ((dpfx > -1) && (path_dhclient_pid[dpfx] != '/'))
-+ pfx = dpfx;
-+
-+ for (ip = interfaces; ip; ip = ip->next) {
-+ if (interfaces_requested && (ip->flags & (INTERFACE_REQUESTED))) {
-+ int n_len = strlen(ip->name);
-+
-+ new_path_dhclient_pid = (char*) malloc(pfx + n_len + 6);
-+ strncpy(new_path_dhclient_pid, path_dhclient_pid, pfx);
-+ sprintf(new_path_dhclient_pid + pfx, "-%s.pid", ip->name);
-+
-+ if ((pidfd = fopen(new_path_dhclient_pid, "r")) != NULL) {
-+ e = fscanf(pidfd, "%ld\n", &temp);
-+ oldpid = (pid_t)temp;
-+
-+ if (e != 0 && e != EOF) {
-+ if (oldpid) {
-+ if (kill(oldpid, SIGTERM) == 0)
-+ unlink(path_dhclient_pid);
-+ }
-+ }
-+
-+ fclose(pidfd);
-+ }
-+
-+ free(new_path_dhclient_pid);
-+ }
-+ }
-+ }
-+ } else {
-+ FILE *pidfp = NULL;
-+ long temp = 0;
-+ pid_t dhcpid = 0;
-+ int dhc_running = 0;
-+ char procfn[256] = "";
-+
-+ if ((pidfp = fopen(path_dhclient_pid, "r")) != NULL) {
-+ if ((fscanf(pidfp, "%ld", &temp)==1) && ((dhcpid=(pid_t)temp) > 0)) {
-+ snprintf(procfn,256,"/proc/%u",dhcpid);
-+ dhc_running = (access(procfn, F_OK) == 0);
-+ }
-+
-+ fclose(pidfp);
-+ }
-+
-+ if (dhc_running) {
-+ log_fatal("dhclient(%u) is already running - exiting. ", dhcpid);
-+ return(1);
- }
- }
-
-+ write_client_pid_file();
-+
- if (!quiet) {
- log_info("%s %s", message, PACKAGE_VERSION);
- log_info(copyright);
diff --git a/src/patches/dhcp/dhcp-remove-bind.patch b/src/patches/dhcp/dhcp-remove-bind.patch
deleted file mode 100644
index 5ab0338b3..000000000
--- a/src/patches/dhcp/dhcp-remove-bind.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-diff -up dhcp-4.3.1b1/client/Makefile.am.brGmwh dhcp-4.3.1b1/client/Makefile.am
---- dhcp-4.3.1b1/client/Makefile.am.brGmwh 2014-07-02 19:58:38.000000000 +0200
-+++ dhcp-4.3.1b1/client/Makefile.am 2014-07-10 17:36:30.484250976 +0200
-@@ -10,8 +10,8 @@ dhclient_SOURCES = clparse.c dhclient.c
- scripts/bsdos scripts/freebsd scripts/linux scripts/macos \
- scripts/netbsd scripts/nextstep scripts/openbsd \
- scripts/solaris scripts/openwrt
--dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../bind/lib/libirs.a \
-- ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a
-+dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
-+ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
- man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
- EXTRA_DIST = $(man_MANS)
-
-diff -up dhcp-4.3.1b1/common/tests/Makefile.am.brGmwh dhcp-4.3.1b1/common/tests/Makefile.am
---- dhcp-4.3.1b1/common/tests/Makefile.am.brGmwh 2014-07-10 17:36:30.485250962 +0200
-+++ dhcp-4.3.1b1/common/tests/Makefile.am 2014-07-10 17:38:04.010924566 +0200
-@@ -13,21 +13,20 @@ ATF_TESTS += alloc_unittest dns_unittest
- alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
- alloc_unittest_LDADD = $(ATF_LDFLAGS)
- alloc_unittest_LDADD += ../libdhcp.a \
-- ../../omapip/libomapi.a ../../bind/lib/libirs.a \
-- ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a ../../bind/lib/libisc.a
-+ ../../omapip/libomapi.a \
-+ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
-
- dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
- dns_unittest_LDADD = $(ATF_LDFLAGS)
- dns_unittest_LDADD += ../libdhcp.a \
-- ../../omapip/libomapi.a ../../bind/lib/libirs.a \
-- ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a ../../bind/lib/libisc.a
-+ ../../omapip/libomapi.a \
-+ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
-
- misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
- misc_unittest_LDADD = $(ATF_LDFLAGS)
- misc_unittest_LDADD += ../libdhcp.a \
-- ../../omapip/libomapi.a ../../bind/lib/libirs.a \
-- ../../bind/lib/libdns.a ../../bind/lib/libisccfg.a ../../bind/lib/libisc.a
--
-+ ../../omapip/libomapi.a \
-+ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
- check: $(ATF_TESTS)
- atf-run | atf-report
-
-diff -up dhcp-4.3.1b1/configure.ac.brGmwh dhcp-4.3.1b1/configure.ac
---- dhcp-4.3.1b1/configure.ac.brGmwh 2014-07-02 20:01:26.000000000 +0200
-+++ dhcp-4.3.1b1/configure.ac 2014-07-10 17:36:30.485250962 +0200
-@@ -562,20 +562,37 @@ AC_CHECK_MEMBER(struct msghdr.msg_contro
-
- libbind=
- AC_ARG_WITH(libbind,
-- AS_HELP_STRING([--with-libbind=PATH],[bind includes and libraries are in PATH
-- (default is ./bind)]),
-+ AS_HELP_STRING([--with-libbind=PATH],[bind includes are in PATH
-+ (default is ./bind/includes)]),
- use_libbind="$withval", use_libbind="no")
- case "$use_libbind" in
-+yes|no)
-+ libbind="\${top_srcdir}/bind/include"
-+ ;;
-+*)
-+ libbind="$use_libbind"
-+ ;;
-+esac
-+
-+BIND9_LIBDIR='-L$(top_builddir)/bind/lib'
-+AC_ARG_WITH(libbind-libs,
-+ AC_HELP_STRING([--with-libbind-libs=PATH],
-+ [bind9 export libraries are in PATH]),
-+ [libbind_libs="$withval"], [libbind_libs='no'])
-+case "$libbind_libs" in
- yes)
-- libbind="\${top_srcdir}/bind"
-+ AC_MSG_ERROR([Specify path to bind9 libraries])
- ;;
- no)
-- libbind="\${top_srcdir}/bind"
-+ BUNDLED_BIND=yes
- ;;
- *)
-- libbind="$use_libbind"
-+ BIND9_LIBDIR="-L$libbind_libs"
-+ BUNDLED_BIND=no
- ;;
- esac
-+AM_CONDITIONAL([BUNDLED_BIND], [test "$BUNDLED_BIND" = yes])
-+AC_SUBST([BIND9_LIBDIR])
-
- # OpenLDAP support.
- AC_ARG_WITH(ldap,
-@@ -610,7 +627,7 @@ fi
- CFLAGS="$CFLAGS $STD_CWARNINGS"
-
- # Try to add the bind include directory
--CFLAGS="$CFLAGS -I$libbind/include"
-+CFLAGS="$CFLAGS -I$libbind"
-
- case "$host" in
- *-darwin*)
-diff -up dhcp-4.3.1b1/dhcpctl/Makefile.am.brGmwh dhcp-4.3.1b1/dhcpctl/Makefile.am
---- dhcp-4.3.1b1/dhcpctl/Makefile.am.brGmwh 2014-07-02 19:58:38.000000000 +0200
-+++ dhcp-4.3.1b1/dhcpctl/Makefile.am 2014-07-10 17:36:30.485250962 +0200
-@@ -6,12 +6,9 @@ EXTRA_DIST = $(man_MANS)
-
- omshell_SOURCES = omshell.c
- omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
-- ../bind/lib/libirs.a ../bind/lib/libdns.a \
-- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
--
-+ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
- libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
-
- cltest_SOURCES = cltest.c
- cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
-- ../bind/lib/libirs.a ../bind/lib/libdns.a \
-- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
-+ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
-diff -up dhcp-4.3.1b1/Makefile.am.brGmwh dhcp-4.3.1b1/Makefile.am
---- dhcp-4.3.1b1/Makefile.am.brGmwh 2014-07-02 19:58:38.000000000 +0200
-+++ dhcp-4.3.1b1/Makefile.am 2014-07-10 17:36:30.484250976 +0200
-@@ -25,7 +25,13 @@ EXTRA_DIST = RELNOTES LICENSE \
- bind/Makefile bind/bind.tar.gz bind/version.tmp \
- common/tests/Atffile server/tests/Atffile
-
--SUBDIRS = bind includes tests common dst omapip client dhcpctl relay server
-+if BUNDLED_BIND
-+SUBDIRS = bind
-+else
-+SUBDIRS =
-+endif
-+
-+SUBDIRS += includes tests common dst omapip client dhcpctl relay server
-
- nobase_include_HEADERS = dhcpctl/dhcpctl.h
-
-diff -up dhcp-4.3.1b1/omapip/Makefile.am.brGmwh dhcp-4.3.1b1/omapip/Makefile.am
---- dhcp-4.3.1b1/omapip/Makefile.am.brGmwh 2014-07-02 19:58:39.000000000 +0200
-+++ dhcp-4.3.1b1/omapip/Makefile.am 2014-07-10 17:36:30.486250948 +0200
-@@ -10,6 +10,5 @@ man_MANS = omapi.3
- EXTRA_DIST = $(man_MANS)
-
- svtest_SOURCES = test.c
--svtest_LDADD = libomapi.a ../bind/lib/libirs.a ../bind/lib/libdns.a \
-- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
--
-+svtest_LDADD = libomapi.a \
-+ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
-diff -up dhcp-4.3.1b1/relay/Makefile.am.brGmwh dhcp-4.3.1b1/relay/Makefile.am
---- dhcp-4.3.1b1/relay/Makefile.am.brGmwh 2014-07-02 19:58:39.000000000 +0200
-+++ dhcp-4.3.1b1/relay/Makefile.am 2014-07-10 17:36:30.486250948 +0200
-@@ -3,8 +3,7 @@ AM_CPPFLAGS = -DLOCALSTATEDIR='"@localst
- sbin_PROGRAMS = dhcrelay
- dhcrelay_SOURCES = dhcrelay.c
- dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
-- ../bind/lib/libirs.a ../bind/lib/libdns.a \
-- ../bind/lib/libisccfg.a ../bind/lib/libisc.a
-+ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
- man_MANS = dhcrelay.8
- EXTRA_DIST = $(man_MANS)
-
-diff -up dhcp-4.3.1b1/server/Makefile.am.brGmwh dhcp-4.3.1b1/server/Makefile.am
---- dhcp-4.3.1b1/server/Makefile.am.brGmwh 2014-07-02 19:58:39.000000000 +0200
-+++ dhcp-4.3.1b1/server/Makefile.am 2014-07-10 17:36:30.486250948 +0200
-@@ -13,10 +13,8 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
- dhcpv6.c mdb6.c ldap.c ldap_casa.c
-
- dhcpd_CFLAGS = $(LDAP_CFLAGS)
--dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
-- ../dhcpctl/libdhcpctl.a ../bind/lib/libirs.a \
-- ../bind/lib/libdns.a ../bind/lib/libisccfg.a ../bind/lib/libisc.a
--
-+dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dhcpctl/libdhcpctl.a \
-+ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
- man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
- EXTRA_DIST = $(man_MANS)
-
-diff -up dhcp-4.3.1b1/server/tests/Makefile.am.brGmwh dhcp-4.3.1b1/server/tests/Makefile.am
---- dhcp-4.3.1b1/server/tests/Makefile.am.brGmwh 2014-07-02 19:58:40.000000000 +0200
-+++ dhcp-4.3.1b1/server/tests/Makefile.am 2014-07-10 17:36:30.486250948 +0200
-@@ -18,9 +18,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa
- ../ldap.c ../ldap_casa.c ../dhcpd.c
-
- DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \
-- $(top_builddir)/dhcpctl/libdhcpctl.a $(top_builddir)/bind/lib/libirs.a \
-- $(top_builddir)/bind/lib/libdns.a $(top_builddir)/bind/lib/libisccfg.a \
-- $(top_builddir)/bind/lib/libisc.a
-+ $(top_builddir)/dhcpctl/libdhcpctl.a \
-+ $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
-
- ATF_TESTS =
- TESTS =
diff --git a/src/patches/dhcp/dhcp-rfc3442-classless-static-routes.patch b/src/patches/dhcp/dhcp-rfc3442-classless-static-routes.patch
deleted file mode 100644
index 94ed5ba24..000000000
--- a/src/patches/dhcp/dhcp-rfc3442-classless-static-routes.patch
+++ /dev/null
@@ -1,405 +0,0 @@
-diff -up dhcp-4.3.0rc1/client/clparse.c.rfc3442 dhcp-4.3.0rc1/client/clparse.c
---- dhcp-4.3.0rc1/client/clparse.c.rfc3442 2014-01-29 10:05:48.474400352 +0100
-+++ dhcp-4.3.0rc1/client/clparse.c 2014-01-29 10:05:48.517399955 +0100
-@@ -31,7 +31,7 @@
-
- struct client_config top_level_config;
-
--#define NUM_DEFAULT_REQUESTED_OPTS 14
-+#define NUM_DEFAULT_REQUESTED_OPTS 15
- struct option *default_requested_options[NUM_DEFAULT_REQUESTED_OPTS + 1];
-
- static void parse_client_default_duid(struct parse *cfile);
-@@ -84,7 +84,11 @@ isc_result_t read_client_conf ()
- dhcp_universe.code_hash, &code, 0, MDL);
-
- /* 4 */
-- code = DHO_ROUTERS;
-+ /* The Classless Static Routes option code MUST appear in the parameter
-+ * request list prior to both the Router option code and the Static
-+ * Routes option code, if present. (RFC3442)
-+ */
-+ code = DHO_CLASSLESS_STATIC_ROUTES;
- option_code_hash_lookup(&default_requested_options[3],
- dhcp_universe.code_hash, &code, 0, MDL);
-
-@@ -138,6 +142,11 @@ isc_result_t read_client_conf ()
- option_code_hash_lookup(&default_requested_options[13],
- dhcp_universe.code_hash, &code, 0, MDL);
-
-+ /* 15 */
-+ code = DHO_ROUTERS;
-+ option_code_hash_lookup(&default_requested_options[14],
-+ dhcp_universe.code_hash, &code, 0, MDL);
-+
- for (code = 0 ; code < NUM_DEFAULT_REQUESTED_OPTS ; code++) {
- if (default_requested_options[code] == NULL)
- log_fatal("Unable to find option definition for "
-diff -up dhcp-4.3.0rc1/common/dhcp-options.5.rfc3442 dhcp-4.3.0rc1/common/dhcp-options.5
---- dhcp-4.3.0rc1/common/dhcp-options.5.rfc3442 2014-01-29 10:05:48.466400426 +0100
-+++ dhcp-4.3.0rc1/common/dhcp-options.5 2014-01-29 10:05:48.518399945 +0100
-@@ -111,6 +111,26 @@ hexadecimal, separated by colons. For e
- or
- option dhcp-client-identifier 43:4c:49:45:54:2d:46:4f:4f;
- .fi
-+.PP
-+The
-+.B destination-descriptor
-+describe the IP subnet number and subnet mask
-+of a particular destination using a compact encoding. This encoding
-+consists of one octet describing the width of the subnet mask,
-+followed by all the significant octets of the subnet number.
-+The following table contains some examples of how various subnet
-+number/mask combinations can be encoded:
-+.nf
-+.sp 1
-+Subnet number Subnet mask Destination descriptor
-+0 0 0
-+10.0.0.0 255.0.0.0 8.10
-+10.0.0.0 255.255.255.0 24.10.0.0
-+10.17.0.0 255.255.0.0 16.10.17
-+10.27.129.0 255.255.255.0 24.10.27.129
-+10.229.0.128 255.255.255.128 25.10.229.0.128
-+10.198.122.47 255.255.255.255 32.10.198.122.47
-+.fi
- .SH SETTING OPTION VALUES USING EXPRESSIONS
- Sometimes it's helpful to be able to set the value of a DHCP option
- based on some value that the client has sent. To do this, you can
-@@ -972,6 +992,29 @@ dhclient-script will create routes:
- .RE
- .PP
- .nf
-+.B option \fBclassless-static-routes\fR \fIdestination-descriptor ip-address\fR
-+ [\fB,\fR \fIdestination-descriptor ip-address\fR...]\fB;\fR
-+.fi
-+.RS 0.25i
-+.PP
-+This option (see RFC3442) specifies a list of classless static routes
-+that the client should install in its routing cache.
-+.PP
-+This option can contain one or more static routes, each of which
-+consists of a destination descriptor and the IP address of the router
-+that should be used to reach that destination.
-+.PP
-+Many clients may not implement the Classless Static Routes option.
-+DHCP server administrators should therefore configure their DHCP
-+servers to send both a Router option and a Classless Static Routes
-+option, and should specify the default router(s) both in the Router
-+option and in the Classless Static Routes option.
-+.PP
-+If the DHCP server returns both a Classless Static Routes option and
-+a Router option, the DHCP client ignores the Router option.
-+.RE
-+.PP
-+.nf
- .B option \fBstreettalk-directory-assistance-server\fR \fIip-address\fR
- [\fB,\fR \fIip-address\fR...]\fB;\fR
- .fi
-diff -up dhcp-4.3.0rc1/common/inet.c.rfc3442 dhcp-4.3.0rc1/common/inet.c
---- dhcp-4.3.0rc1/common/inet.c.rfc3442 2014-01-26 19:40:44.000000000 +0100
-+++ dhcp-4.3.0rc1/common/inet.c 2014-01-29 10:05:48.519399936 +0100
-@@ -521,6 +521,60 @@ free_iaddrcidrnetlist(struct iaddrcidrne
- return ISC_R_SUCCESS;
- }
-
-+static const char *
-+inet_ntopdd(const unsigned char *src, unsigned srclen, char *dst, size_t size)
-+{
-+ char tmp[sizeof("32.255.255.255.255")];
-+ int len;
-+
-+ switch (srclen) {
-+ case 2:
-+ len = sprintf (tmp, "%u.%u", src[0], src[1]);
-+ break;
-+ case 3:
-+ len = sprintf (tmp, "%u.%u.%u", src[0], src[1], src[2]);
-+ break;
-+ case 4:
-+ len = sprintf (tmp, "%u.%u.%u.%u", src[0], src[1], src[2], src[3]);
-+ break;
-+ case 5:
-+ len = sprintf (tmp, "%u.%u.%u.%u.%u", src[0], src[1], src[2], src[3], src[4]);
-+ break;
-+ default:
-+ return NULL;
-+ }
-+ if (len < 0)
-+ return NULL;
-+
-+ if (len > size) {
-+ errno = ENOSPC;
-+ return NULL;
-+ }
-+
-+ return strcpy (dst, tmp);
-+}
-+
-+/* pdestdesc() turns an iaddr structure into a printable dest. descriptor */
-+const char *
-+pdestdesc(const struct iaddr addr) {
-+ static char pbuf[sizeof("255.255.255.255.255")];
-+
-+ if (addr.len == 0) {
-+ return "<null destination descriptor>";
-+ }
-+ if (addr.len == 1) {
-+ return "0";
-+ }
-+ if ((addr.len >= 2) && (addr.len <= 5)) {
-+ return inet_ntopdd(addr.iabuf, addr.len, pbuf, sizeof(pbuf));
-+ }
-+
-+ log_fatal("pdestdesc():%s:%d: Invalid destination descriptor length %d.",
-+ MDL, addr.len);
-+ /* quell compiler warnings */
-+ return NULL;
-+}
-+
- /* piaddr() turns an iaddr structure into a printable address. */
- /* XXX: should use a const pointer rather than passing the structure */
- const char *
-diff -up dhcp-4.3.0rc1/common/options.c.rfc3442 dhcp-4.3.0rc1/common/options.c
---- dhcp-4.3.0rc1/common/options.c.rfc3442 2014-01-26 19:40:44.000000000 +0100
-+++ dhcp-4.3.0rc1/common/options.c 2014-01-29 10:05:48.520399927 +0100
-@@ -707,7 +707,11 @@ cons_options(struct packet *inpacket, st
- * packet.
- */
- priority_list[priority_len++] = DHO_SUBNET_MASK;
-- priority_list[priority_len++] = DHO_ROUTERS;
-+ if (lookup_option(&dhcp_universe, cfg_options,
-+ DHO_CLASSLESS_STATIC_ROUTES))
-+ priority_list[priority_len++] = DHO_CLASSLESS_STATIC_ROUTES;
-+ else
-+ priority_list[priority_len++] = DHO_ROUTERS;
- priority_list[priority_len++] = DHO_DOMAIN_NAME_SERVERS;
- priority_list[priority_len++] = DHO_HOST_NAME;
- priority_list[priority_len++] = DHO_FQDN;
-@@ -1688,6 +1692,7 @@ const char *pretty_print_option (option,
- unsigned long tval;
- isc_boolean_t a_array = ISC_FALSE;
- int len_used;
-+ unsigned int octets = 0;
-
- if (emit_commas)
- comma = ',';
-@@ -1696,6 +1701,7 @@ const char *pretty_print_option (option,
-
- memset (enumbuf, 0, sizeof enumbuf);
-
-+ if (option->format[0] != 'R') { /* see explanation lower */
- /* Figure out the size of the data. */
- for (l = i = 0; option -> format [i]; i++, l++) {
- if (l >= sizeof(fmtbuf) - 1)
-@@ -1870,6 +1876,33 @@ const char *pretty_print_option (option,
- if (numhunk < 0)
- numhunk = 1;
-
-+ } else { /* option->format[i] == 'R') */
-+ /* R (destination descriptor) has variable length.
-+ * We can find it only in classless static route option,
-+ * so we are for sure parsing classless static route option now.
-+ * We go through whole the option to check whether there are no
-+ * missing/extra bytes.
-+ * I didn't find out how to improve the existing code and that's the
-+ * reason for this separate 'else' where I do my own checkings.
-+ * I know it's little bit unsystematic, but it works.
-+ */
-+ numhunk = 0;
-+ numelem = 2; /* RI */
-+ fmtbuf[0]='R'; fmtbuf[1]='I'; fmtbuf[2]=0;
-+ for (i =0; i < len; i = i + octets + 5) {
-+ if (data[i] > 32) { /* subnet mask width */
-+ log_error ("wrong subnet mask width in destination descriptor");
-+ break;
-+ }
-+ numhunk++;
-+ octets = ((data[i]+7) / 8);
-+ }
-+ if (i != len) {
-+ log_error ("classless static routes option has wrong size or "
-+ "there's some garbage in format");
-+ }
-+ }
-+
- /* Cycle through the array (or hunk) printing the data. */
- for (i = 0; i < numhunk; i++) {
- if ((a_array == ISC_TRUE) && (i != 0) && (numelem > 0)) {
-@@ -2025,6 +2058,20 @@ const char *pretty_print_option (option,
- strcpy(op, piaddr(iaddr));
- dp += 4;
- break;
-+
-+ case 'R':
-+ if (dp[0] <= 32)
-+ iaddr.len = (((dp[0]+7)/8)+1);
-+ else {
-+ log_error ("wrong subnet mask width in destination descriptor");
-+ return "<error>";
-+ }
-+
-+ memcpy(iaddr.iabuf, dp, iaddr.len);
-+ strcpy(op, pdestdesc(iaddr));
-+ dp += iaddr.len;
-+ break;
-+
- case '6':
- iaddr.len = 16;
- memcpy(iaddr.iabuf, dp, 16);
-diff -up dhcp-4.3.0rc1/common/parse.c.rfc3442 dhcp-4.3.0rc1/common/parse.c
---- dhcp-4.3.0rc1/common/parse.c.rfc3442 2014-01-29 10:05:48.491400195 +0100
-+++ dhcp-4.3.0rc1/common/parse.c 2014-01-29 10:05:48.522399908 +0100
-@@ -335,6 +335,39 @@ int parse_ip_addr (cfile, addr)
- }
-
- /*
-+ * destination-descriptor :== NUMBER DOT NUMBER |
-+ * NUMBER DOT NUMBER DOT NUMBER |
-+ * NUMBER DOT NUMBER DOT NUMBER DOT NUMBER |
-+ * NUMBER DOT NUMBER DOT NUMBER DOT NUMBER DOT NUMBER
-+ */
-+
-+int parse_destination_descriptor (cfile, addr)
-+ struct parse *cfile;
-+ struct iaddr *addr;
-+{
-+ unsigned int mask_width, dest_dest_len;
-+ addr -> len = 0;
-+ if (parse_numeric_aggregate (cfile, addr -> iabuf,
-+ &addr -> len, DOT, 10, 8)) {
-+ mask_width = (unsigned int)addr->iabuf[0];
-+ dest_dest_len = (((mask_width+7)/8)+1);
-+ if (mask_width > 32) {
-+ parse_warn (cfile,
-+ "subnet mask width (%u) greater than 32.", mask_width);
-+ }
-+ else if (dest_dest_len != addr->len) {
-+ parse_warn (cfile,
-+ "destination descriptor with subnet mask width %u "
-+ "should have %u octets, but has %u octets.",
-+ mask_width, dest_dest_len, addr->len);
-+ }
-+
-+ return 1;
-+ }
-+ return 0;
-+}
-+
-+/*
- * Return true if every character in the string is hexadecimal.
- */
- static int
-@@ -713,8 +746,10 @@ unsigned char *parse_numeric_aggregate (
- if (count) {
- token = peek_token (&val, (unsigned *)0, cfile);
- if (token != separator) {
-- if (!*max)
-+ if (!*max) {
-+ *max = count;
- break;
-+ }
- if (token != RBRACE && token != LBRACE)
- token = next_token (&val,
- (unsigned *)0,
-@@ -1654,6 +1689,9 @@ int parse_option_code_definition (cfile,
- case IP_ADDRESS:
- type = 'I';
- break;
-+ case DESTINATION_DESCRIPTOR:
-+ type = 'R';
-+ break;
- case IP6_ADDRESS:
- type = '6';
- break;
-@@ -5071,6 +5109,15 @@ int parse_option_token (rv, cfile, fmt,
- }
- break;
-
-+ case 'R': /* destination descriptor */
-+ if (!parse_destination_descriptor (cfile, &addr)) {
-+ return 0;
-+ }
-+ if (!make_const_data (&t, addr.iabuf, addr.len, 0, 1, MDL)) {
-+ return 0;
-+ }
-+ break;
-+
- case '6': /* IPv6 address. */
- if (!parse_ip6_addr(cfile, &addr)) {
- return 0;
-@@ -5348,6 +5395,13 @@ int parse_option_decl (oc, cfile)
- goto exit;
- len = ip_addr.len;
- dp = ip_addr.iabuf;
-+ goto alloc;
-+
-+ case 'R': /* destination descriptor */
-+ if (!parse_destination_descriptor (cfile, &ip_addr))
-+ goto exit;
-+ len = ip_addr.len;
-+ dp = ip_addr.iabuf;
-
- alloc:
- if (hunkix + len > sizeof hunkbuf) {
-diff -up dhcp-4.3.0rc1/common/tables.c.rfc3442 dhcp-4.3.0rc1/common/tables.c
---- dhcp-4.3.0rc1/common/tables.c.rfc3442 2014-01-29 10:05:48.485400250 +0100
-+++ dhcp-4.3.0rc1/common/tables.c 2014-01-29 10:06:25.724038563 +0100
-@@ -46,6 +46,7 @@ HASH_FUNCTIONS (option_code, const unsig
- Format codes:
-
- I - IPv4 address
-+ R - destination descriptor (RFC3442)
- 6 - IPv6 address
- l - 32-bit signed integer
- L - 32-bit unsigned integer
-@@ -214,6 +215,7 @@ static struct option dhcp_options[] = {
- #endif
- { "subnet-selection", "I", &dhcp_universe, 118, 1 },
- { "domain-search", "D", &dhcp_universe, 119, 1 },
-+ { "classless-static-routes", "RIA", &dhcp_universe, 121, 1 },
- { "vivco", "Evendor-class.", &dhcp_universe, 124, 1 },
- { "vivso", "Evendor.", &dhcp_universe, 125, 1 },
- #if 0
-diff -up dhcp-4.3.0rc1/includes/dhcpd.h.rfc3442 dhcp-4.3.0rc1/includes/dhcpd.h
---- dhcp-4.3.0rc1/includes/dhcpd.h.rfc3442 2014-01-29 10:05:48.470400389 +0100
-+++ dhcp-4.3.0rc1/includes/dhcpd.h 2014-01-29 10:05:48.525399881 +0100
-@@ -2725,6 +2725,7 @@ isc_result_t range2cidr(struct iaddrcidr
- const struct iaddr *lo, const struct iaddr *hi);
- isc_result_t free_iaddrcidrnetlist(struct iaddrcidrnetlist **result);
- const char *piaddr (struct iaddr);
-+const char *pdestdesc (struct iaddr);
- char *piaddrmask(struct iaddr *, struct iaddr *);
- char *piaddrcidr(const struct iaddr *, unsigned int);
- u_int16_t validate_port(char *);
-@@ -2934,6 +2935,7 @@ void parse_client_lease_declaration (str
- int parse_option_decl (struct option_cache **, struct parse *);
- void parse_string_list (struct parse *, struct string_list **, int);
- int parse_ip_addr (struct parse *, struct iaddr *);
-+int parse_destination_descriptor (struct parse *, struct iaddr *);
- int parse_ip_addr_with_subnet(struct parse *, struct iaddrmatch *);
- void parse_reject_statement (struct parse *, struct client_config *);
-
-diff -up dhcp-4.3.0rc1/includes/dhcp.h.rfc3442 dhcp-4.3.0rc1/includes/dhcp.h
---- dhcp-4.3.0rc1/includes/dhcp.h.rfc3442 2014-01-26 19:40:44.000000000 +0100
-+++ dhcp-4.3.0rc1/includes/dhcp.h 2014-01-29 10:05:48.524399890 +0100
-@@ -159,6 +159,7 @@ struct dhcp_packet {
- #define DHO_ASSOCIATED_IP 92
- #define DHO_SUBNET_SELECTION 118 /* RFC3011! */
- #define DHO_DOMAIN_SEARCH 119 /* RFC3397 */
-+#define DHO_CLASSLESS_STATIC_ROUTES 121 /* RFC3442 */
- #define DHO_VIVCO_SUBOPTIONS 124
- #define DHO_VIVSO_SUBOPTIONS 125
-
-diff -up dhcp-4.3.0rc1/includes/dhctoken.h.rfc3442 dhcp-4.3.0rc1/includes/dhctoken.h
---- dhcp-4.3.0rc1/includes/dhctoken.h.rfc3442 2014-01-29 10:05:48.435400713 +0100
-+++ dhcp-4.3.0rc1/includes/dhctoken.h 2014-01-29 10:05:48.526399871 +0100
-@@ -368,7 +368,8 @@ enum dhcp_token {
- POOL6 = 669,
- V6RELAY = 670,
- V6RELOPT = 671,
-- BOOTP_BROADCAST_ALWAYS = 672
-+ BOOTP_BROADCAST_ALWAYS = 672,
-+ DESTINATION_DESCRIPTOR = 673
- };
-
- #define is_identifier(x) ((x) >= FIRST_TOKEN && \
diff --git a/src/patches/dhcp/dhcp-sendDecline.patch b/src/patches/dhcp/dhcp-sendDecline.patch
deleted file mode 100644
index e68336634..000000000
--- a/src/patches/dhcp/dhcp-sendDecline.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-diff -up dhcp-4.3.0a1/client/dhc6.c.sendDecline dhcp-4.3.0a1/client/dhc6.c
---- dhcp-4.3.0a1/client/dhc6.c.sendDecline 2013-12-11 01:25:12.000000000 +0100
-+++ dhcp-4.3.0a1/client/dhc6.c 2013-12-19 15:56:18.297660118 +0100
-@@ -96,6 +96,8 @@ void do_select6(void *input);
- void do_refresh6(void *input);
- static void do_release6(void *input);
- static void start_bound(struct client_state *client);
-+static void start_decline6(struct client_state *client);
-+static void do_decline6(void *input);
- static void start_informed(struct client_state *client);
- void informed_handler(struct packet *packet, struct client_state *client);
- void bound_handler(struct packet *packet, struct client_state *client);
-@@ -2017,6 +2019,7 @@ start_release6(struct client_state *clie
- cancel_timeout(do_select6, client);
- cancel_timeout(do_refresh6, client);
- cancel_timeout(do_release6, client);
-+ cancel_timeout(do_decline6, client);
- client->state = S_STOPPED;
-
- /*
-@@ -2650,6 +2653,7 @@ dhc6_check_reply(struct client_state *cl
- break;
-
- case S_STOPPED:
-+ case S_DECLINED:
- action = dhc6_stop_action;
- break;
-
-@@ -2751,6 +2755,7 @@ dhc6_check_reply(struct client_state *cl
- break;
-
- case S_STOPPED:
-+ case S_DECLINED:
- /* Nothing critical to do at this stage. */
- break;
-
-@@ -3741,17 +3746,23 @@ reply_handler(struct packet *packet, str
- cancel_timeout(do_select6, client);
- cancel_timeout(do_refresh6, client);
- cancel_timeout(do_release6, client);
-+ cancel_timeout(do_decline6, client);
-
- /* If this is in response to a Release/Decline, clean up and return. */
-- if (client->state == S_STOPPED) {
-- if (client->active_lease == NULL)
-- return;
-+ if ((client->state == S_STOPPED) ||
-+ (client->state == S_DECLINED)) {
-+
-+ if (client->active_lease != NULL) {
-+ dhc6_lease_destroy(&client->active_lease, MDL);
-+ client->active_lease = NULL;
-+ /* We should never wait for nothing!? */
-+ if (stopping_finished())
-+ exit(0);
-+ }
-+
-+ if (client->state == S_DECLINED)
-+ start_init6(client);
-
-- dhc6_lease_destroy(&client->active_lease, MDL);
-- client->active_lease = NULL;
-- /* We should never wait for nothing!? */
-- if (stopping_finished())
-- exit(0);
- return;
- }
-
-@@ -4279,7 +4290,11 @@ start_bound(struct client_state *client)
- dhc6_marshall_values("new_", client, lease, ia, addr);
- script_write_requested6(client);
-
-- script_go(client);
-+ // when script returns 3, DAD failed
-+ if (script_go(client) == 3) {
-+ start_decline6(client);
-+ return;
-+ }
- }
-
- /* XXX: maybe we should loop on the old values instead? */
-@@ -4327,6 +4342,149 @@ start_bound(struct client_state *client)
- dhc6_check_times(client);
- }
-
-+/*
-+ * Decline addresses.
-+ */
-+void
-+start_decline6(struct client_state *client)
-+{
-+ /* Cancel any pending transmissions */
-+ cancel_timeout(do_confirm6, client);
-+ cancel_timeout(do_select6, client);
-+ cancel_timeout(do_refresh6, client);
-+ cancel_timeout(do_release6, client);
-+ cancel_timeout(do_decline6, client);
-+ client->state = S_DECLINED;
-+
-+ if (client->active_lease == NULL)
-+ return;
-+
-+ /* Set timers per RFC3315 section 18.1.7. */
-+ client->IRT = DEC_TIMEOUT * 100;
-+ client->MRT = 0;
-+ client->MRC = DEC_MAX_RC;
-+ client->MRD = 0;
-+
-+ dhc6_retrans_init(client);
-+ client->v6_handler = reply_handler;
-+
-+ client->refresh_type = DHCPV6_DECLINE;
-+ do_decline6(client);
-+}
-+
-+/*
-+ * do_decline6() creates a Decline packet and transmits it.
-+ */
-+static void
-+do_decline6(void *input)
-+{
-+ struct client_state *client;
-+ struct data_string ds;
-+ int send_ret;
-+ struct timeval elapsed, tv;
-+
-+ client = input;
-+
-+ if ((client->active_lease == NULL) || !active_prefix(client))
-+ return;
-+
-+ if ((client->MRC != 0) && (client->txcount > client->MRC)) {
-+ log_info("Max retransmission count exceeded.");
-+ goto decline_done;
-+ }
-+
-+ /*
-+ * Start_time starts at the first transmission.
-+ */
-+ if (client->txcount == 0) {
-+ client->start_time.tv_sec = cur_tv.tv_sec;
-+ client->start_time.tv_usec = cur_tv.tv_usec;
-+ }
-+
-+ /* elapsed = cur - start */
-+ elapsed.tv_sec = cur_tv.tv_sec - client->start_time.tv_sec;
-+ elapsed.tv_usec = cur_tv.tv_usec - client->start_time.tv_usec;
-+ if (elapsed.tv_usec < 0) {
-+ elapsed.tv_sec -= 1;
-+ elapsed.tv_usec += 1000000;
-+ }
-+
-+ memset(&ds, 0, sizeof(ds));
-+ if (!buffer_allocate(&ds.buffer, 4, MDL)) {
-+ log_error("Unable to allocate memory for Decline.");
-+ goto decline_done;
-+ }
-+
-+ ds.data = ds.buffer->data;
-+ ds.len = 4;
-+ ds.buffer->data[0] = DHCPV6_DECLINE;
-+ memcpy(ds.buffer->data + 1, client->dhcpv6_transaction_id, 3);
-+
-+ /* Form an elapsed option. */
-+ /* Maximum value is 65535 1/100s coded as 0xffff. */
-+ if ((elapsed.tv_sec < 0) || (elapsed.tv_sec > 655) ||
-+ ((elapsed.tv_sec == 655) && (elapsed.tv_usec > 350000))) {
-+ client->elapsed = 0xffff;
-+ } else {
-+ client->elapsed = elapsed.tv_sec * 100;
-+ client->elapsed += elapsed.tv_usec / 10000;
-+ }
-+
-+ client->elapsed = htons(client->elapsed);
-+
-+ log_debug("XMT: Forming Decline.");
-+ make_client6_options(client, &client->sent_options,
-+ client->active_lease, DHCPV6_DECLINE);
-+ dhcpv6_universe.encapsulate(&ds, NULL, NULL, client, NULL,
-+ client->sent_options, &global_scope,
-+ &dhcpv6_universe);
-+
-+ /* Append IA's (but don't release temporary addresses). */
-+ if (wanted_ia_na &&
-+ dhc6_add_ia_na(client, &ds, client->active_lease,
-+ DHCPV6_DECLINE) != ISC_R_SUCCESS) {
-+ data_string_forget(&ds, MDL);
-+ goto decline_done;
-+ }
-+ if (wanted_ia_pd &&
-+ dhc6_add_ia_pd(client, &ds, client->active_lease,
-+ DHCPV6_DECLINE) != ISC_R_SUCCESS) {
-+ data_string_forget(&ds, MDL);
-+ goto decline_done;
-+ }
-+
-+ /* Transmit and wait. */
-+ log_info("XMT: Decline on %s, interval %ld0ms.",
-+ client->name ? client->name : client->interface->name,
-+ (long int)client->RT);
-+
-+ send_ret = send_packet6(client->interface, ds.data, ds.len,
-+ &DHCPv6DestAddr);
-+ if (send_ret != ds.len) {
-+ log_error("dhc6: sendpacket6() sent %d of %d bytes",
-+ send_ret, ds.len);
-+ }
-+
-+ data_string_forget(&ds, MDL);
-+
-+ /* Wait RT */
-+ tv.tv_sec = cur_tv.tv_sec + client->RT / 100;
-+ tv.tv_usec = cur_tv.tv_usec + (client->RT % 100) * 10000;
-+ if (tv.tv_usec >= 1000000) {
-+ tv.tv_sec += 1;
-+ tv.tv_usec -= 1000000;
-+ }
-+ add_timeout(&tv, do_decline6, client, NULL, NULL);
-+ dhc6_retrans_advance(client);
-+ return;
-+
-+decline_done:
-+ dhc6_lease_destroy(&client->active_lease, MDL);
-+ client->active_lease = NULL;
-+ start_init6(client);
-+ return;
-+}
-+
- /* While bound, ignore packets. In the future we'll want to answer
- * Reconfigure-Request messages and the like.
- */
diff --git a/src/patches/dhcp/dhcp-sharedlib.patch b/src/patches/dhcp/dhcp-sharedlib.patch
deleted file mode 100644
index abb2acc19..000000000
--- a/src/patches/dhcp/dhcp-sharedlib.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -up dhcp-4.3.1b1/common/tests/Makefile.am.uCWMBl dhcp-4.3.1b1/common/tests/Makefile.am
---- dhcp-4.3.1b1/common/tests/Makefile.am.uCWMBl 2014-07-10 17:38:10.779828569 +0200
-+++ dhcp-4.3.1b1/common/tests/Makefile.am 2014-07-10 17:38:21.355678580 +0200
-@@ -13,19 +13,19 @@ ATF_TESTS += alloc_unittest dns_unittest
- alloc_unittest_SOURCES = test_alloc.c $(top_srcdir)/tests/t_api_dhcp.c
- alloc_unittest_LDADD = $(ATF_LDFLAGS)
- alloc_unittest_LDADD += ../libdhcp.a \
-- ../../omapip/libomapi.a \
-+ ../../omapip/libomapi.la \
- $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
-
- dns_unittest_SOURCES = dns_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
- dns_unittest_LDADD = $(ATF_LDFLAGS)
--dns_unittest_LDADD += ../libdhcp.a \
-+dns_unittest_LDADD += ../libdhcp.la \
- ../../omapip/libomapi.a \
- $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
-
- misc_unittest_SOURCES = misc_unittest.c $(top_srcdir)/tests/t_api_dhcp.c
- misc_unittest_LDADD = $(ATF_LDFLAGS)
- misc_unittest_LDADD += ../libdhcp.a \
-- ../../omapip/libomapi.a \
-+ ../../omapip/libomapi.la \
- $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
- check: $(ATF_TESTS)
- atf-run | atf-report
-diff -up dhcp-4.3.1b1/configure.ac.uCWMBl dhcp-4.3.1b1/configure.ac
---- dhcp-4.3.1b1/configure.ac.uCWMBl 2014-07-10 17:38:10.766828753 +0200
-+++ dhcp-4.3.1b1/configure.ac 2014-07-10 17:38:10.779828569 +0200
-@@ -39,7 +39,8 @@ fi
- # Use this to define _GNU_SOURCE to pull in the IPv6 Advanced Socket API.
- AC_USE_SYSTEM_EXTENSIONS
-
--AC_PROG_RANLIB
-+# Use libtool to simplify building of shared libraries
-+AC_PROG_LIBTOOL
- AC_CONFIG_HEADERS([includes/config.h])
-
- # we sometimes need to know byte order for building packets
-diff -up dhcp-4.3.1b1/dhcpctl/Makefile.am.uCWMBl dhcp-4.3.1b1/dhcpctl/Makefile.am
---- dhcp-4.3.1b1/dhcpctl/Makefile.am.uCWMBl 2014-07-10 17:36:30.485250962 +0200
-+++ dhcp-4.3.1b1/dhcpctl/Makefile.am 2014-07-10 17:38:10.780828554 +0200
-@@ -1,14 +1,14 @@
- bin_PROGRAMS = omshell
--lib_LIBRARIES = libdhcpctl.a
-+lib_LTLIBRARIES = libdhcpctl.la
- noinst_PROGRAMS = cltest
- man_MANS = omshell.1 dhcpctl.3
- EXTRA_DIST = $(man_MANS)
-
- omshell_SOURCES = omshell.c
--omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
-+omshell_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
- $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
--libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
-+libdhcpctl_la_SOURCES = dhcpctl.c callback.c remote.c
-
- cltest_SOURCES = cltest.c
--cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
-+cltest_LDADD = libdhcpctl.la ../common/libdhcp.a ../omapip/libomapi.la \
- $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
-diff -up dhcp-4.3.1b1/omapip/Makefile.am.uCWMBl dhcp-4.3.1b1/omapip/Makefile.am
---- dhcp-4.3.1b1/omapip/Makefile.am.uCWMBl 2014-07-10 17:36:30.486250948 +0200
-+++ dhcp-4.3.1b1/omapip/Makefile.am 2014-07-10 17:38:10.780828554 +0200
-@@ -1,7 +1,7 @@
--lib_LIBRARIES = libomapi.a
-+lib_LTLIBRARIES = libomapi.la
- noinst_PROGRAMS = svtest
-
--libomapi_a_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
-+libomapi_la_SOURCES = protocol.c buffer.c alloc.c result.c connection.c \
- errwarn.c listener.c dispatch.c generic.c support.c \
- handle.c message.c convert.c hash.c auth.c inet_addr.c \
- array.c trace.c toisc.c iscprint.c isclib.c
-@@ -10,5 +10,5 @@ man_MANS = omapi.3
- EXTRA_DIST = $(man_MANS)
-
- svtest_SOURCES = test.c
--svtest_LDADD = libomapi.a \
-+svtest_LDADD = libomapi.la \
- $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
-diff -up dhcp-4.3.1b1/server/Makefile.am.uCWMBl dhcp-4.3.1b1/server/Makefile.am
---- dhcp-4.3.1b1/server/Makefile.am.uCWMBl 2014-07-10 17:36:30.486250948 +0200
-+++ dhcp-4.3.1b1/server/Makefile.am 2014-07-10 17:38:10.780828554 +0200
-@@ -13,7 +13,7 @@ dhcpd_SOURCES = dhcpd.c dhcp.c bootp.c c
- dhcpv6.c mdb6.c ldap.c ldap_casa.c
-
- dhcpd_CFLAGS = $(LDAP_CFLAGS)
--dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a ../dhcpctl/libdhcpctl.a \
-+dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.la ../dhcpctl/libdhcpctl.la \
- $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
- man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
- EXTRA_DIST = $(man_MANS)
-diff -up dhcp-4.3.1b1/server/tests/Makefile.am.uCWMBl dhcp-4.3.1b1/server/tests/Makefile.am
---- dhcp-4.3.1b1/server/tests/Makefile.am.uCWMBl 2014-07-10 17:36:30.486250948 +0200
-+++ dhcp-4.3.1b1/server/tests/Makefile.am 2014-07-10 17:38:10.780828554 +0200
-@@ -17,8 +17,8 @@ DHCPSRC = ../dhcp.c ../bootp.c ../confpa
- ../ddns.c ../dhcpleasequery.c ../dhcpv6.c ../mdb6.c \
- ../ldap.c ../ldap_casa.c ../dhcpd.c
-
--DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.a \
-- $(top_builddir)/dhcpctl/libdhcpctl.a \
-+DHCPLIBS = $(top_builddir)/common/libdhcp.a $(top_builddir)/omapip/libomapi.la \
-+ $(top_builddir)/dhcpctl/libdhcpctl.la \
- $(BIND9_LIBDIR) -lirs -ldns -lisccfg -lisc
-
- ATF_TESTS =
diff --git a/src/patches/dhcp/dhcp-stateless-DUID-LLT.patch b/src/patches/dhcp/dhcp-stateless-DUID-LLT.patch
deleted file mode 100644
index a7f22b539..000000000
--- a/src/patches/dhcp/dhcp-stateless-DUID-LLT.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 61fa3dd9e789997f66e848c7e3fb2f554ee374e2 Mon Sep 17 00:00:00 2001
-From: Jiri Popelka <jpopelka(a)redhat.com>
-Date: Thu, 18 Dec 2014 11:53:26 +0100
-Subject: [PATCH] Write DUID_LLT even in stateless mode.
-
-By default, DHCPv6 dhclient creates DUID-LL
-if it is running in stateless mode (-6 -S) and
-doesn't write it into leases file, most likely
-because the DUID-LL is always generated the same.
-
-It's however possible to specify DUID to be of type LLT instead of LL
-with '-D LLT'. Rfc 3315 says that:
-'Clients and servers using this type of DUID MUST
-store the DUID-LLT in stable storage.'
-That's not fulfiled in this case (-6 -S -D LLT),
-because it's generated each time again.
-
-It's not a big deal because the server doesn't store any
-info about 'stateless' clients, so it doesn't matter
-that the DUID-LLT is different each time.
-But there's a TAHI test which tests this, i.e. that
-DUID-LLT is still the same even in stateless mode.
-It's a test DHCP_CONF.7.1.9, part B.
-https://www.ipv6ready.org/docs/Phase2_DHCPv6_Conformance_Latest.pdf
-
-Signed-off-by: Jiri Popelka <jpopelka(a)redhat.com>
----
- client/dhclient.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/client/dhclient.c b/client/dhclient.c
-index 5ef59cd..026e3fe 100644
---- a/client/dhclient.c
-+++ b/client/dhclient.c
-@@ -788,7 +788,9 @@ void run_stateless(int exit_mode)
- if (default_duid.buffer != NULL)
- data_string_forget(&default_duid, MDL);
-
-- form_duid(&default_duid, MDL);
-+ if (form_duid(&default_duid, MDL) == ISC_R_SUCCESS &&
-+ duid_type == DUID_LLT)
-+ write_duid(&default_duid);
- }
-
- /* Start a configuration state machine. */
---
-2.1.0
-
diff --git a/src/patches/dhcp/dhcp-unicast-bootp.patch b/src/patches/dhcp/dhcp-unicast-bootp.patch
deleted file mode 100644
index a0db9de69..000000000
--- a/src/patches/dhcp/dhcp-unicast-bootp.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -up dhcp-4.3.0a1/server/bootp.c.unicast dhcp-4.3.0a1/server/bootp.c
---- dhcp-4.3.0a1/server/bootp.c.unicast 2013-12-11 01:25:12.000000000 +0100
-+++ dhcp-4.3.0a1/server/bootp.c 2013-12-19 15:12:12.974671154 +0100
-@@ -59,6 +59,7 @@ void bootp (packet)
- char msgbuf [1024];
- int ignorep;
- int peer_has_leases = 0;
-+ int norelay = 0;
-
- if (packet -> raw -> op != BOOTREQUEST)
- return;
-@@ -74,7 +75,7 @@ void bootp (packet)
- ? inet_ntoa (packet -> raw -> giaddr)
- : packet -> interface -> name);
-
-- if (!locate_network (packet)) {
-+ if ((norelay = locate_network (packet)) == 0) {
- log_info ("%s: network unknown", msgbuf);
- return;
- }
-@@ -396,6 +397,15 @@ void bootp (packet)
-
- goto out;
- }
-+ } else if (norelay == 2) {
-+ to.sin_addr = raw.ciaddr;
-+ to.sin_port = remote_port;
-+ if (fallback_interface) {
-+ result = send_packet (fallback_interface, NULL, &raw,
-+ outgoing.packet_length, from,
-+ &to, &hto);
-+ goto out;
-+ }
-
- /* If it comes from a client that already knows its address
- and is not requesting a broadcast response, and we can
-diff -up dhcp-4.3.0a1/server/dhcp.c.unicast dhcp-4.3.0a1/server/dhcp.c
---- dhcp-4.3.0a1/server/dhcp.c.unicast 2013-12-13 21:50:38.000000000 +0100
-+++ dhcp-4.3.0a1/server/dhcp.c 2013-12-19 15:12:12.975671140 +0100
-@@ -4627,6 +4627,7 @@ int locate_network (packet)
- struct data_string data;
- struct subnet *subnet = (struct subnet *)0;
- struct option_cache *oc;
-+ int norelay = 0;
-
- /* See if there's a Relay Agent Link Selection Option, or a
- * Subnet Selection Option. The Link-Select and Subnet-Select
-@@ -4642,12 +4643,24 @@ int locate_network (packet)
- from the interface, if there is one. If not, fail. */
- if (!oc && !packet -> raw -> giaddr.s_addr) {
- if (packet -> interface -> shared_network) {
-- shared_network_reference
-- (&packet -> shared_network,
-- packet -> interface -> shared_network, MDL);
-- return 1;
-+ struct in_addr any_addr;
-+ any_addr.s_addr = INADDR_ANY;
-+
-+ if (!packet -> packet_type && memcmp(&packet -> raw -> ciaddr, &any_addr, 4)) {
-+ struct iaddr cip;
-+ memcpy(cip.iabuf, &packet -> raw -> ciaddr, 4);
-+ cip.len = 4;
-+ if (!find_grouped_subnet(&subnet, packet->interface->shared_network, cip, MDL))
-+ norelay = 2;
-+ }
-+
-+ if (!norelay) {
-+ shared_network_reference(&packet -> shared_network, packet -> interface -> shared_network, MDL);
-+ return 1;
-+ }
-+ } else {
-+ return 0;
- }
-- return 0;
- }
-
- /* If there's an option indicating link connection, and it's valid,
-@@ -4670,7 +4683,10 @@ int locate_network (packet)
- data_string_forget (&data, MDL);
- } else {
- ia.len = 4;
-- memcpy (ia.iabuf, &packet -> raw -> giaddr, 4);
-+ if (norelay)
-+ memcpy (ia.iabuf, &packet->raw->ciaddr, 4);
-+ else
-+ memcpy (ia.iabuf, &packet->raw->giaddr, 4);
- }
-
- /* If we know the subnet on which the IP address lives, use it. */
-@@ -4678,7 +4694,10 @@ int locate_network (packet)
- shared_network_reference (&packet -> shared_network,
- subnet -> shared_network, MDL);
- subnet_dereference (&subnet, MDL);
-- return 1;
-+ if (norelay)
-+ return norelay;
-+ else
-+ return 1;
- }
-
- /* Otherwise, fail. */
diff --git a/src/patches/dhcp/dhcp-xen-checksum.patch b/src/patches/dhcp/dhcp-xen-checksum.patch
deleted file mode 100644
index eabc3c127..000000000
--- a/src/patches/dhcp/dhcp-xen-checksum.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-diff -up dhcp-4.3.0rc1/common/bpf.c.xen dhcp-4.3.0rc1/common/bpf.c
---- dhcp-4.3.0rc1/common/bpf.c.xen 2014-01-29 10:03:27.503941664 +0100
-+++ dhcp-4.3.0rc1/common/bpf.c 2014-01-29 10:03:37.564812175 +0100
-@@ -481,7 +481,7 @@ ssize_t receive_packet (interface, buf,
- /* Decode the IP and UDP headers... */
- offset = decode_udp_ip_header(interface, interface->rbuf,
- interface->rbuf_offset,
-- from, hdr.bh_caplen, &paylen);
-+ from, hdr.bh_caplen, &paylen, 0);
-
- /* If the IP or UDP checksum was bad, skip the packet... */
- if (offset < 0) {
-diff -up dhcp-4.3.0rc1/common/dlpi.c.xen dhcp-4.3.0rc1/common/dlpi.c
---- dhcp-4.3.0rc1/common/dlpi.c.xen 2014-01-25 05:18:03.000000000 +0100
-+++ dhcp-4.3.0rc1/common/dlpi.c 2014-01-29 10:03:27.503941664 +0100
-@@ -691,7 +691,7 @@ ssize_t receive_packet (interface, buf,
- length -= offset;
- #endif
- offset = decode_udp_ip_header (interface, dbuf, bufix,
-- from, length, &paylen);
-+ from, length, &paylen, 0);
-
- /*
- * If the IP or UDP checksum was bad, skip the packet...
-diff -up dhcp-4.3.0rc1/common/lpf.c.xen dhcp-4.3.0rc1/common/lpf.c
---- dhcp-4.3.0rc1/common/lpf.c.xen 2014-01-25 05:18:03.000000000 +0100
-+++ dhcp-4.3.0rc1/common/lpf.c 2014-01-29 10:03:27.504941651 +0100
-@@ -29,14 +29,15 @@
-
- #include "dhcpd.h"
- #if defined (USE_LPF_SEND) || defined (USE_LPF_RECEIVE)
-+#include <sys/socket.h>
- #include <sys/uio.h>
- #include <errno.h>
-
- #include <asm/types.h>
- #include <linux/filter.h>
- #include <linux/if_ether.h>
-+#include <linux/if_packet.h>
- #include <netinet/in_systm.h>
--#include <net/if_packet.h>
- #include "includes/netinet/ip.h"
- #include "includes/netinet/udp.h"
- #include "includes/netinet/if_ether.h"
-@@ -51,6 +52,19 @@
- /* Reinitializes the specified interface after an address change. This
- is not required for packet-filter APIs. */
-
-+#ifndef PACKET_AUXDATA
-+#define PACKET_AUXDATA 8
-+
-+struct tpacket_auxdata
-+{
-+ __u32 tp_status;
-+ __u32 tp_len;
-+ __u32 tp_snaplen;
-+ __u16 tp_mac;
-+ __u16 tp_net;
-+};
-+#endif
-+
- #ifdef USE_LPF_SEND
- void if_reinitialize_send (info)
- struct interface_info *info;
-@@ -73,10 +87,14 @@ int if_register_lpf (info)
- struct interface_info *info;
- {
- int sock;
-- struct sockaddr sa;
-+ union {
-+ struct sockaddr_ll ll;
-+ struct sockaddr common;
-+ } sa;
-+ struct ifreq ifr;
-
- /* Make an LPF socket. */
-- if ((sock = socket(PF_PACKET, SOCK_PACKET,
-+ if ((sock = socket(PF_PACKET, SOCK_RAW,
- htons((short)ETH_P_ALL))) < 0) {
- if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
- errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
-@@ -91,11 +109,17 @@ int if_register_lpf (info)
- log_fatal ("Open a socket for LPF: %m");
- }
-
-+ memset (&ifr, 0, sizeof ifr);
-+ strncpy (ifr.ifr_name, (const char *)info -> ifp, sizeof ifr.ifr_name);
-+ ifr.ifr_name[IFNAMSIZ-1] = '\0';
-+ if (ioctl (sock, SIOCGIFINDEX, &ifr))
-+ log_fatal ("Failed to get interface index: %m");
-+
- /* Bind to the interface name */
- memset (&sa, 0, sizeof sa);
-- sa.sa_family = AF_PACKET;
-- strncpy (sa.sa_data, (const char *)info -> ifp, sizeof sa.sa_data);
-- if (bind (sock, &sa, sizeof sa)) {
-+ sa.ll.sll_family = AF_PACKET;
-+ sa.ll.sll_ifindex = ifr.ifr_ifindex;
-+ if (bind (sock, &sa.common, sizeof sa)) {
- if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT ||
- errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT ||
- errno == EAFNOSUPPORT || errno == EINVAL) {
-@@ -177,9 +201,18 @@ static void lpf_gen_filter_setup (struct
- void if_register_receive (info)
- struct interface_info *info;
- {
-+ int val;
-+
- /* Open a LPF device and hang it on this interface... */
- info -> rfdesc = if_register_lpf (info);
-
-+ val = 1;
-+ if (setsockopt (info -> rfdesc, SOL_PACKET, PACKET_AUXDATA, &val,
-+ sizeof val) < 0) {
-+ if (errno != ENOPROTOOPT)
-+ log_fatal ("Failed to set auxiliary packet data: %m");
-+ }
-+
- #if defined (HAVE_TR_SUPPORT)
- if (info -> hw_address.hbuf [0] == HTYPE_IEEE802)
- lpf_tr_filter_setup (info);
-@@ -301,7 +334,6 @@ ssize_t send_packet (interface, packet,
- double hh [16];
- double ih [1536 / sizeof (double)];
- unsigned char *buf = (unsigned char *)ih;
-- struct sockaddr_pkt sa;
- int result;
- int fudge;
-
-@@ -322,17 +354,7 @@ ssize_t send_packet (interface, packet,
- (unsigned char *)raw, len);
- memcpy (buf + ibufp, raw, len);
-
-- /* For some reason, SOCK_PACKET sockets can't be connected,
-- so we have to do a sentdo every time. */
-- memset (&sa, 0, sizeof sa);
-- sa.spkt_family = AF_PACKET;
-- strncpy ((char *)sa.spkt_device,
-- (const char *)interface -> ifp, sizeof sa.spkt_device);
-- sa.spkt_protocol = htons(ETH_P_IP);
--
-- result = sendto (interface -> wfdesc,
-- buf + fudge, ibufp + len - fudge, 0,
-- (const struct sockaddr *)&sa, sizeof sa);
-+ result = write (interface -> wfdesc, buf + fudge, ibufp + len - fudge);
- if (result < 0)
- log_error ("send_packet: %m");
- return result;
-@@ -349,14 +371,35 @@ ssize_t receive_packet (interface, buf,
- {
- int length = 0;
- int offset = 0;
-+ int nocsum = 0;
- unsigned char ibuf [1536];
- unsigned bufix = 0;
- unsigned paylen;
-+ unsigned char cmsgbuf[CMSG_LEN(sizeof(struct tpacket_auxdata))];
-+ struct iovec iov = {
-+ .iov_base = ibuf,
-+ .iov_len = sizeof ibuf,
-+ };
-+ struct msghdr msg = {
-+ .msg_iov = &iov,
-+ .msg_iovlen = 1,
-+ .msg_control = cmsgbuf,
-+ .msg_controllen = sizeof(cmsgbuf),
-+ };
-+ struct cmsghdr *cmsg;
-
-- length = read (interface -> rfdesc, ibuf, sizeof ibuf);
-+ length = recvmsg (interface -> rfdesc, &msg, 0);
- if (length <= 0)
- return length;
-
-+ for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) {
-+ if (cmsg->cmsg_level == SOL_PACKET &&
-+ cmsg->cmsg_type == PACKET_AUXDATA) {
-+ struct tpacket_auxdata *aux = (void *)CMSG_DATA(cmsg);
-+ nocsum = aux->tp_status & TP_STATUS_CSUMNOTREADY;
-+ }
-+ }
-+
- bufix = 0;
- /* Decode the physical header... */
- offset = decode_hw_header (interface, ibuf, bufix, hfrom);
-@@ -373,7 +416,7 @@ ssize_t receive_packet (interface, buf,
-
- /* Decode the IP and UDP headers... */
- offset = decode_udp_ip_header (interface, ibuf, bufix, from,
-- (unsigned)length, &paylen);
-+ (unsigned)length, &paylen, nocsum);
-
- /* If the IP or UDP checksum was bad, skip the packet... */
- if (offset < 0)
-diff -up dhcp-4.3.0rc1/common/nit.c.xen dhcp-4.3.0rc1/common/nit.c
---- dhcp-4.3.0rc1/common/nit.c.xen 2014-01-26 19:40:44.000000000 +0100
-+++ dhcp-4.3.0rc1/common/nit.c 2014-01-29 10:03:27.504941651 +0100
-@@ -363,7 +363,7 @@ ssize_t receive_packet (interface, buf,
-
- /* Decode the IP and UDP headers... */
- offset = decode_udp_ip_header (interface, ibuf, bufix,
-- from, length, &paylen);
-+ from, length, &paylen, 0);
-
- /* If the IP or UDP checksum was bad, skip the packet... */
- if (offset < 0)
-diff -up dhcp-4.3.0rc1/common/packet.c.xen dhcp-4.3.0rc1/common/packet.c
---- dhcp-4.3.0rc1/common/packet.c.xen 2013-12-11 01:01:02.000000000 +0100
-+++ dhcp-4.3.0rc1/common/packet.c 2014-01-29 10:03:27.504941651 +0100
-@@ -226,7 +226,7 @@ ssize_t
- decode_udp_ip_header(struct interface_info *interface,
- unsigned char *buf, unsigned bufix,
- struct sockaddr_in *from, unsigned buflen,
-- unsigned *rbuflen)
-+ unsigned *rbuflen, int nocsum)
- {
- unsigned char *data;
- struct ip ip;
-@@ -337,7 +337,7 @@ decode_udp_ip_header(struct interface_in
- 8, IPPROTO_UDP + ulen))));
-
- udp_packets_seen++;
-- if (usum && usum != sum) {
-+ if (!nocsum && usum && usum != sum) {
- udp_packets_bad_checksum++;
- if (udp_packets_seen > 4 &&
- (udp_packets_seen / udp_packets_bad_checksum) < 2) {
-diff -up dhcp-4.3.0rc1/common/upf.c.xen dhcp-4.3.0rc1/common/upf.c
---- dhcp-4.3.0rc1/common/upf.c.xen 2014-01-26 19:40:44.000000000 +0100
-+++ dhcp-4.3.0rc1/common/upf.c 2014-01-29 10:03:27.505941638 +0100
-@@ -314,7 +314,7 @@ ssize_t receive_packet (interface, buf,
-
- /* Decode the IP and UDP headers... */
- offset = decode_udp_ip_header (interface, ibuf, bufix,
-- from, length, &paylen);
-+ from, length, &paylen, 0);
-
- /* If the IP or UDP checksum was bad, skip the packet... */
- if (offset < 0)
-diff -up dhcp-4.3.0rc1/includes/dhcpd.h.xen dhcp-4.3.0rc1/includes/dhcpd.h
---- dhcp-4.3.0rc1/includes/dhcpd.h.xen 2014-01-29 10:03:27.489941844 +0100
-+++ dhcp-4.3.0rc1/includes/dhcpd.h 2014-01-29 10:03:27.506941626 +0100
-@@ -2861,7 +2861,7 @@ ssize_t decode_hw_header (struct interfa
- unsigned, struct hardware *);
- ssize_t decode_udp_ip_header (struct interface_info *, unsigned char *,
- unsigned, struct sockaddr_in *,
-- unsigned, unsigned *);
-+ unsigned, unsigned *, int);
-
- /* ethernet.c */
- void assemble_ethernet_header (struct interface_info *, unsigned char *,
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d7ce23e5deccf3fbe56c44ff4c29817c03166c76
by gitï¼ ipfire.org 04 Jun '18
by gitï¼ ipfire.org 04 Jun '18
04 Jun '18
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via d7ce23e5deccf3fbe56c44ff4c29817c03166c76 (commit)
from acb41000189b667324ab601f30a97f506c461f72 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d7ce23e5deccf3fbe56c44ff4c29817c03166c76
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Jun 4 12:15:26 2018 +0100
aarch64: Fix rootfile for Python
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/aarch64/python | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Difference in files:
diff --git a/config/rootfiles/common/aarch64/python b/config/rootfiles/common/aarch64/python
index 7495c0115..463dfed8f 100644
--- a/config/rootfiles/common/aarch64/python
+++ b/config/rootfiles/common/aarch64/python
@@ -1967,7 +1967,7 @@ usr/lib/python2.7/lib-dynload/cStringIO.so
usr/lib/python2.7/lib-dynload/cmath.so
usr/lib/python2.7/lib-dynload/crypt.so
usr/lib/python2.7/lib-dynload/datetime.so
-usr/lib/python2.7/lib-dynload/dbm.so
+usr/lib/python2.7/lib-dynload/dbm_failed.so
usr/lib/python2.7/lib-dynload/fcntl.so
usr/lib/python2.7/lib-dynload/future_builtins.so
usr/lib/python2.7/lib-dynload/gdbm.so
hooks/post-receive
--
IPFire 2.x development tree
1
0