[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bbdc2e4bcf64a96d3ddd3ae42cbe49341c1a4f59
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 bbdc2e4bcf64a96d3ddd3ae42cbe49341c1a4f59 (commit) via 67bc7ab222d9221abed1c538f92f2ad4064f26b1 (commit) via 1ae0db1a7437359da7bbe9527ae7653d4be3146e (commit) via 654f71f1a4a261e57970a57f430e639f23ae26da (commit) via b309fb54554af979118b13770d334968c0925416 (commit) via 77a94be71110f428d42b44321f5c1aa387098339 (commit) via 5d4c1d20d7aef63de51531f1a6eb1a379adf937d (commit) via e9088b9d3e40b75b5192346e3d780804c3f104cc (commit) via 11f26128556730fd61f7ca7d308d5278f85c9361 (commit) via 9f98b05277e7e17c1bc0477017c2b28d3b4edf3e (commit) via f7024a3ac69ab1915815cb51ef3c5298c8e9e099 (commit) via 66ca2ca5c53a2b82340a544bf617e87a0c447f20 (commit) via ff0e684eeef9ebabd78e8b331673151c9976ae57 (commit) via dfa88551aec1cc1d3ede5a156715c3652f11d2d5 (commit) via d8837b032f99895d656d06e647d084b4301671cf (commit) via 26120e5d5d4ef81f61130712db0e30fe6f73c54f (commit) via a52932e1b077ad243e8b6d63c8015f78cb6b6eda (commit) via 4d8688303d35ef3392eaab7c5d3a7dd40e7c7612 (commit) via 7f7d0ae75075cf6329ba17fb7df7634b81360215 (commit) via b6adeb235df18dcd1cef757819c808328ba009e4 (commit) via 81b83eba104cccc91dce7229716c835ffeb04dc8 (commit) via dff6612b02b564c0b0b202bbe33955d1cac7927c (commit) via 508288ab6b369451614dada8837d7883e8bec2c6 (commit) via 348334b6eb85aee6a4af46b907d19d6c45772ee6 (commit) via bbe4537de3ef49c0d584896374876e5a3cdece75 (commit) via 7cbd533265e97b3f7d288f1d287e6a5699ebace8 (commit) via 837a6e01a87e8c9fc88920c84718d9d20ae7d859 (commit) via bdd6ecd3788c244f9d84109d241fd97b2e2e74ed (commit) via a3a0aefba160c9e9e5b16e49d7a5f7843585695d (commit) via 07c09125e1edee75dff5f33fcb07f6feb075111f (commit) via fa0203f78eaac71a83fc102091a40bb613499cc2 (commit) via c8ab87f16b30bbc86d6beedb73e512f8ec4d7d1b (commit) via 7a2b5c6470e8b723868de7a5c994404d0b75d4fb (commit) via 8984f4f0c4a416803d9470b284b718ee97fb4352 (commit) via dbc15d1e62ec7d26c33dea79abb1c5addd9fd9be (commit) via e30d382778d09a324665e402bc7d8676c7360bc7 (commit) via a0026a62962f62ace60de1d7b8c6128194698ad8 (commit) via 4d3dc4bd65d5528a17bc845f169a60df55a42f22 (commit) via 4349d6b3eb3f0156ad052c77bac1e1354171ab82 (commit) via 895e1da27917960895514bdb97c3355a6bc7ae5b (commit) via 4116f912f038663353a04391aed551fba8394093 (commit) via 60e84dfd47d2ae6752c51d67e589f547503297ee (commit) via 6c63e94298f768f21aac407885682eeb411ac4d5 (commit) from 697b4f04bf8a007b289e424cf88bfbba7a2df71a (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 bbdc2e4bcf64a96d3ddd3ae42cbe49341c1a4f59 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 16 17:57:54 2015 +0200
python: Update to 2.7.10
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 67bc7ab222d9221abed1c538f92f2ad4064f26b1 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 16 17:57:53 2015 +0200
python: Build libffi before python and link against it
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1ae0db1a7437359da7bbe9527ae7653d4be3146e Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 16 17:57:52 2015 +0200
Python: Update to 2.7.9
This reverts commit 3d9b9dd30e86b03dce4e31103099a6a0bdc97a98.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 654f71f1a4a261e57970a57f430e639f23ae26da Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 18 21:01:35 2015 +0200
git: Update to version 2.4.4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b309fb54554af979118b13770d334968c0925416 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 18 13:24:37 2015 +0200
core92: Add updated libusb and libusb-compat
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 77a94be71110f428d42b44321f5c1aa387098339 Author: Matthias Fischer fischerm@ipfire.org Date: Fri Apr 3 11:58:01 2015 +0200
libusb-compat: Fixed rootfile (removed file '23-usb.rules')
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5d4c1d20d7aef63de51531f1a6eb1a379adf937d Author: Matthias Fischer fischerm@ipfire.org Date: Tue Mar 24 20:24:46 2015 +0100
libusb: Update to 1.0.19 libusbx: removed, moved to 'libusb-compat 0.1.5' updated: make.sh
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e9088b9d3e40b75b5192346e3d780804c3f104cc Author: Matthias Fischer fischerm@ipfire.org Date: Sat Apr 4 10:38:16 2015 +0200
7zip: Update to 9.38.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 11f26128556730fd61f7ca7d308d5278f85c9361 Author: Matthias Fischer fischerm@ipfire.org Date: Wed Apr 8 21:01:19 2015 +0200
libassuan: Update to 2.2.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9f98b05277e7e17c1bc0477017c2b28d3b4edf3e Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 18 13:19:07 2015 +0200
core92: Add updated libgpg-error
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f7024a3ac69ab1915815cb51ef3c5298c8e9e099 Author: Matthias Fischer fischerm@ipfire.org Date: Wed Apr 8 21:07:17 2015 +0200
libgpg-error: Update to 1.18
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 66ca2ca5c53a2b82340a544bf617e87a0c447f20 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 18 13:18:10 2015 +0200
core92: Add updated libgcrypt
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ff0e684eeef9ebabd78e8b331673151c9976ae57 Author: Matthias Fischer fischerm@ipfire.org Date: Tue Apr 7 00:15:09 2015 +0200
libgcrypt: Update to 1.63
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit dfa88551aec1cc1d3ede5a156715c3652f11d2d5 Author: Matthias Fischer fischerm@ipfire.org Date: Tue Mar 31 17:15:40 2015 +0200
powertop: Update to 2.7
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d8837b032f99895d656d06e647d084b4301671cf Author: Matthias Fischer fischerm@ipfire.org Date: Sun May 17 15:26:34 2015 +0200
nano: Update to 2.4.1
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 26120e5d5d4ef81f61130712db0e30fe6f73c54f Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 18 13:16:32 2015 +0200
core92: Add updated libpcap
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a52932e1b077ad243e8b6d63c8015f78cb6b6eda Author: Matthias Fischer fischerm@ipfire.org Date: Thu May 28 11:07:38 2015 +0200
libpcap: Update to 1.7.3
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4d8688303d35ef3392eaab7c5d3a7dd40e7c7612 Author: Matthias Fischer fischerm@ipfire.org Date: Sun May 17 15:29:55 2015 +0200
tcpdump: Update to 4.7.4
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7f7d0ae75075cf6329ba17fb7df7634b81360215 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 18 13:14:55 2015 +0200
core92: Add rrdtool update
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b6adeb235df18dcd1cef757819c808328ba009e4 Author: Matthias Fischer fischerm@ipfire.org Date: Sun May 17 15:12:16 2015 +0200
graphs.pl: bugfixes regarding rrdtool
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 81b83eba104cccc91dce7229716c835ffeb04dc8 Author: Matthias Fischer fischerm@ipfire.org Date: Fri May 15 12:43:06 2015 +0200
rrdtool: Update to 1.5.3
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit dff6612b02b564c0b0b202bbe33955d1cac7927c Merge: 697b4f0 508288a Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 18 13:12:33 2015 +0200
Merge remote-tracking branch 'mfischer/dnsmasq' into next
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
Conflicts: lfs/dnsmasq
commit 508288ab6b369451614dada8837d7883e8bec2c6 Author: Matthias Fischer fischerm@ipfire.org Date: Wed Jun 17 13:01:53 2015 +0200
dnsmasq: Update to 2.73
commit 348334b6eb85aee6a4af46b907d19d6c45772ee6 Merge: bbe4537 5428eee Author: Matthias Fischer fischerm@ipfire.org Date: Tue Jun 16 21:40:16 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into dnsmasq
commit bbe4537de3ef49c0d584896374876e5a3cdece75 Author: Matthias Fischer fischerm@ipfire.org Date: Sun May 17 00:39:39 2015 +0200
dnsmasq: again - latest upstream patches
commit 7cbd533265e97b3f7d288f1d287e6a5699ebace8 Author: Matthias Fischer fischerm@ipfire.org Date: Sat May 9 21:21:34 2015 +0200
dnsmasq: import latest upstream patches
commit 837a6e01a87e8c9fc88920c84718d9d20ae7d859 Merge: bdd6ecd 16c18d2 Author: Matthias Fischer fischerm@ipfire.org Date: Sat May 9 11:09:11 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit bdd6ecd3788c244f9d84109d241fd97b2e2e74ed Merge: a3a0aef 086eb9b Author: Matthias Fischer fischerm@ipfire.org Date: Wed May 6 20:12:22 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit a3a0aefba160c9e9e5b16e49d7a5f7843585695d Merge: 07c0912 b59da37 Author: Matthias Fischer fischerm@ipfire.org Date: Mon May 4 18:46:27 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 07c09125e1edee75dff5f33fcb07f6feb075111f Merge: fa0203f 0ee35ce Author: Matthias Fischer fischerm@ipfire.org Date: Sat May 2 22:19:21 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit fa0203f78eaac71a83fc102091a40bb613499cc2 Merge: c8ab87f 8d1e36c Author: Matthias Fischer fischerm@ipfire.org Date: Thu Apr 30 18:44:01 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit c8ab87f16b30bbc86d6beedb73e512f8ec4d7d1b Merge: 7a2b5c6 0594323 Author: Matthias Fischer fischerm@ipfire.org Date: Sat Apr 25 00:32:20 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 7a2b5c6470e8b723868de7a5c994404d0b75d4fb Merge: 8984f4f 4d9e31a Author: Matthias Fischer fischerm@ipfire.org Date: Fri Apr 17 19:41:57 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 8984f4f0c4a416803d9470b284b718ee97fb4352 Merge: dbc15d1 30986db Author: Matthias Fischer fischerm@ipfire.org Date: Wed Apr 15 20:46:44 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit dbc15d1e62ec7d26c33dea79abb1c5addd9fd9be Merge: e30d382 040ec36 Author: Matthias Fischer fischerm@ipfire.org Date: Sun Apr 12 00:09:10 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit e30d382778d09a324665e402bc7d8676c7360bc7 Merge: a0026a6 1164cb0 Author: Matthias Fischer fischerm@ipfire.org Date: Fri Apr 10 16:36:57 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit a0026a62962f62ace60de1d7b8c6128194698ad8 Merge: 4d3dc4b d0552ea Author: Matthias Fischer fischerm@ipfire.org Date: Thu Apr 9 21:41:14 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 4d3dc4bd65d5528a17bc845f169a60df55a42f22 Merge: 4349d6b ecb2d6b Author: Matthias Fischer fischerm@ipfire.org Date: Thu Apr 9 00:38:06 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 4349d6b3eb3f0156ad052c77bac1e1354171ab82 Merge: 895e1da 15847a8 Author: Matthias Fischer fischerm@ipfire.org Date: Sun Apr 5 22:08:13 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 895e1da27917960895514bdb97c3355a6bc7ae5b Merge: 4116f91 b0b6105 Author: Matthias Fischer fischerm@ipfire.org Date: Sat Apr 4 23:49:48 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 4116f912f038663353a04391aed551fba8394093 Merge: 60e84df 8f548df Author: Matthias Fischer fischerm@ipfire.org Date: Sat Apr 4 10:38:48 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 60e84dfd47d2ae6752c51d67e589f547503297ee Merge: 6c63e94 0d573e2 Author: Matthias Fischer fischerm@ipfire.org Date: Tue Mar 31 17:27:42 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 6c63e94298f768f21aac407885682eeb411ac4d5 Merge: 0e1fcef e0b9a60 Author: Matthias Fischer fischerm@ipfire.org Date: Sun Mar 29 00:16:55 2015 +0100
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
-----------------------------------------------------------------------
Summary of changes: config/cfgroot/graphs.pl | 8 +- config/rootfiles/common/libgcrypt | 2 +- config/rootfiles/common/libgpg-error | 11 +- config/rootfiles/common/libpcap | 2 +- config/rootfiles/common/libusb | 21 +- config/rootfiles/common/libusb-compat | 7 + config/rootfiles/common/libusbx | 8 - config/rootfiles/common/python | 234 ++++++++++++++++++++- config/rootfiles/common/rrdtool | 190 ++++++++--------- .../{oldcore/59 => core/91}/filelists/python | 0 config/rootfiles/core/92/filelists/files | 1 + .../{oldcore/80 => core/92}/filelists/libgcrypt | 0 .../{oldcore/80 => core/92}/filelists/libgpg-error | 0 .../{oldcore/89 => core/92}/filelists/libpcap | 0 config/rootfiles/core/92/filelists/libusb | 1 + config/rootfiles/core/92/filelists/libusb-compat | 1 + .../{oldcore/66 => core/92}/filelists/rrdtool | 0 config/rootfiles/packages/7zip | 112 +++++----- config/rootfiles/packages/git | 21 +- config/rootfiles/packages/libassuan | 2 +- config/rootfiles/packages/nano | 18 +- config/rootfiles/packages/powertop | 2 +- lfs/7zip | 10 +- lfs/dnsmasq | 119 +---------- lfs/git | 13 +- lfs/libassuan | 8 +- lfs/libgcrypt | 6 +- lfs/libgpg-error | 6 +- lfs/libpcap | 6 +- lfs/libusb | 10 +- lfs/{7zip => libusb-compat} | 21 +- lfs/libusbx | 78 ------- lfs/nano | 8 +- lfs/powertop | 10 +- lfs/python | 10 +- lfs/python-optional-src | 2 +- lfs/rrdtool | 6 +- lfs/tcpdump | 8 +- make.sh | 4 +- ....7.3-gdbm-1.patch => Python-2.7.9-gdbm-1.patch} | 0 ...fragmentation-of-large-packets-is-broken.patch} | 39 ++-- ...-mapped-IPv6-addresses-with--stop-rebind.patch} | 13 +- .../dnsmasq/0090-Tweak-EDNS-timeout-code.patch | 1 - ...-archive-mailing-list-mirror-in-doc-html.patch} | 9 +- ...-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch | 1 - ...ect-DHCP-context-for-PXE-proxy-server-id.patch} | 8 +- ...ix-buffer-overflow-introduced-in-2-73rc6.patch} | 8 +- src/patches/python-2.7rc1-ctypes-noexecmem.patch | 85 ++++++++ 48 files changed, 641 insertions(+), 489 deletions(-) create mode 100644 config/rootfiles/common/libusb-compat delete mode 100644 config/rootfiles/common/libusbx copy config/rootfiles/{oldcore/59 => core/91}/filelists/python (100%) copy config/rootfiles/{oldcore/80 => core/92}/filelists/libgcrypt (100%) copy config/rootfiles/{oldcore/80 => core/92}/filelists/libgpg-error (100%) copy config/rootfiles/{oldcore/89 => core/92}/filelists/libpcap (100%) create mode 120000 config/rootfiles/core/92/filelists/libusb create mode 120000 config/rootfiles/core/92/filelists/libusb-compat copy config/rootfiles/{oldcore/66 => core/92}/filelists/rrdtool (100%) copy lfs/{7zip => libusb-compat} (91%) delete mode 100644 lfs/libusbx copy src/patches/{Python-2.7.3-gdbm-1.patch => Python-2.7.9-gdbm-1.patch} (100%) copy src/patches/dnsmasq/{0088-Handle-UDP-packet-loss-when-fragmentation-of-large-p.patch => 0088-Handle-UDP-packet-loss-when-fragmentation-of-large-packets-is-broken.patch} (94%) copy src/patches/dnsmasq/{0089-Check-IPv4-mapped-IPv6-addresses-with-stop-rebind.patch => 0089-Check-IPv4-mapped-IPv6-addresses-with--stop-rebind.patch} (87%) copy src/patches/dnsmasq/{0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc.h.patch => 0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc-html.patch} (86%) copy src/patches/dnsmasq/{0094-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch => 0093-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch} (89%) copy src/patches/dnsmasq/{0095-Fix-buffer-overflow-introduced-in-2.73rc6.patch => 0094-Fix-buffer-overflow-introduced-in-2-73rc6.patch} (91%) create mode 100644 src/patches/python-2.7rc1-ctypes-noexecmem.patch
Difference in files: diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index 40c1bc8..c3fb43e 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -257,11 +257,11 @@ sub updateloadgraph { "DEF:load1=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:shortterm:AVERAGE", "DEF:load5=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:midterm:AVERAGE", "DEF:load15=".$mainsettings{'RRDLOG'}."/collectd/localhost/load/load.rrd:longterm:AVERAGE", - "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'}.":", + "AREA:load1".$color{"color13"}."A0:1 ".$Lang::tr{'minute'}, "GPRINT:load1:LAST:%5.2lf", - "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'}.":", + "AREA:load5".$color{"color18"}."A0:5 ".$Lang::tr{'minutes'}, "GPRINT:load5:LAST:%5.2lf", - "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'}.":", + "AREA:load15".$color{"color14"}."A0:15 ".$Lang::tr{'minutes'}, "GPRINT:load15:LAST:%5.2lf\j", "LINE1:load5".$color{"color13"}, "LINE1:load1".$color{"color18"}, @@ -519,7 +519,7 @@ sub updatediskgraph { "CDEF:writen=write,-1,*", "DEF:standby=".$mainsettings{'RRDLOG'}."/hddshutdown-".$disk.".rrd:standby:AVERAGE", "CDEF:st=standby,INF,*", - "CDEF:st1=standby,-INF,*", + "CDEF:st1=standby,NEGINF,*", "COMMENT:".sprintf("%-25s",$Lang::tr{'caption'}), "COMMENT:".sprintf("%15s",$Lang::tr{'maximal'}), "COMMENT:".sprintf("%15s",$Lang::tr{'average'}), diff --git a/config/rootfiles/common/libgcrypt b/config/rootfiles/common/libgcrypt index 96e48e1..344a055 100644 --- a/config/rootfiles/common/libgcrypt +++ b/config/rootfiles/common/libgcrypt @@ -6,7 +6,7 @@ #usr/lib/libgcrypt.la #usr/lib/libgcrypt.so usr/lib/libgcrypt.so.20 -usr/lib/libgcrypt.so.20.0.1 +usr/lib/libgcrypt.so.20.0.3 #usr/share/aclocal/libgcrypt.m4 #usr/share/info/gcrypt.info #usr/share/info/gcrypt.info-1 diff --git a/config/rootfiles/common/libgpg-error b/config/rootfiles/common/libgpg-error index cbb7dec..4d6febc 100644 --- a/config/rootfiles/common/libgpg-error +++ b/config/rootfiles/common/libgpg-error @@ -4,7 +4,7 @@ usr/bin/gpg-error #usr/lib/libgpg-error.la #usr/lib/libgpg-error.so usr/lib/libgpg-error.so.0 -usr/lib/libgpg-error.so.0.11.0 +usr/lib/libgpg-error.so.0.14.0 #usr/share/aclocal/gpg-error.m4 #usr/share/common-lisp #usr/share/common-lisp/source @@ -13,19 +13,24 @@ usr/lib/libgpg-error.so.0.11.0 #usr/share/common-lisp/source/gpg-error/gpg-error-package.lisp #usr/share/common-lisp/source/gpg-error/gpg-error.asd #usr/share/common-lisp/source/gpg-error/gpg-error.lisp +#usr/share/info/gpgrt.info #usr/share/locale/cs/LC_MESSAGES/libgpg-error.mo #usr/share/locale/da/LC_MESSAGES/libgpg-error.mo #usr/share/locale/de/LC_MESSAGES/libgpg-error.mo -#usr/share/locale/eo -#usr/share/locale/eo/LC_MESSAGES #usr/share/locale/eo/LC_MESSAGES/libgpg-error.mo #usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo +#usr/share/locale/hu/LC_MESSAGES/libgpg-error.mo #usr/share/locale/it/LC_MESSAGES/libgpg-error.mo #usr/share/locale/ja/LC_MESSAGES/libgpg-error.mo #usr/share/locale/nl/LC_MESSAGES/libgpg-error.mo #usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo +#usr/share/locale/pt/LC_MESSAGES/libgpg-error.mo #usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo +#usr/share/locale/ru/LC_MESSAGES/libgpg-error.mo +#usr/share/locale/sr/LC_MESSAGES/libgpg-error.mo #usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo #usr/share/locale/uk/LC_MESSAGES/libgpg-error.mo #usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo #usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo +#usr/share/locale/zh_TW/LC_MESSAGES/libgpg-error.mo +#usr/share/man/man1/gpg-error-config.1 diff --git a/config/rootfiles/common/libpcap b/config/rootfiles/common/libpcap index b8e9648..9031c6e 100644 --- a/config/rootfiles/common/libpcap +++ b/config/rootfiles/common/libpcap @@ -15,7 +15,7 @@ #usr/lib/libpcap.a usr/lib/libpcap.so usr/lib/libpcap.so.1 -usr/lib/libpcap.so.1.6.2 +usr/lib/libpcap.so.1.7.3 #usr/share/man/man1/pcap-config.1 #usr/share/man/man3/pcap.3pcap #usr/share/man/man3/pcap_activate.3pcap diff --git a/config/rootfiles/common/libusb b/config/rootfiles/common/libusb index 61c2f2a..5be9bdf 100644 --- a/config/rootfiles/common/libusb +++ b/config/rootfiles/common/libusb @@ -1,15 +1,16 @@ etc/udev/rules.d/23-usb.rules #usr/bin/libusb-config +#usr/include/libusb-1.0 +#usr/include/libusb-1.0/libusb.h #usr/include/usb.h -#usr/include/usbpp.h -usr/lib/libusb-0.1.so.4 -usr/lib/libusb-0.1.so.4.4.4 -#usr/lib/libusb.a +#usr/lib/libusb-0.1.so.4 +#usr/lib/libusb-0.1.so.4.4.4 +#usr/lib/libusb-1.0.a +#usr/lib/libusb-1.0.la +#usr/lib/libusb-1.0.so +usr/lib/libusb-1.0.so.0 +usr/lib/libusb-1.0.so.0.1.0 #usr/lib/libusb.la -usr/lib/libusb.so -usr/lib/libusbpp-0.1.so.4 -usr/lib/libusbpp-0.1.so.4.4.4 -#usr/lib/libusbpp.a -#usr/lib/libusbpp.la -usr/lib/libusbpp.so +#usr/lib/libusb.so +#usr/lib/pkgconfig/libusb-1.0.pc #usr/lib/pkgconfig/libusb.pc diff --git a/config/rootfiles/common/libusb-compat b/config/rootfiles/common/libusb-compat new file mode 100644 index 0000000..ca3007e --- /dev/null +++ b/config/rootfiles/common/libusb-compat @@ -0,0 +1,7 @@ +#usr/bin/libusb-config +#usr/include/usb.h +usr/lib/libusb-0.1.so.4 +usr/lib/libusb-0.1.so.4.4.4 +#usr/lib/libusb.la +usr/lib/libusb.so +#usr/lib/pkgconfig/libusb.pc diff --git a/config/rootfiles/common/libusbx b/config/rootfiles/common/libusbx deleted file mode 100644 index 62d6492..0000000 --- a/config/rootfiles/common/libusbx +++ /dev/null @@ -1,8 +0,0 @@ -#usr/include/libusb-1.0 -#usr/include/libusb-1.0/libusb.h -#usr/lib/libusb-1.0.a -#usr/lib/libusb-1.0.la -#usr/lib/libusb-1.0.so -usr/lib/libusb-1.0.so.0 -usr/lib/libusb-1.0.so.0.1.0 -#usr/lib/pkgconfig/libusb-1.0.pc diff --git a/config/rootfiles/common/python b/config/rootfiles/common/python index 3472e25..4f11c56 100644 --- a/config/rootfiles/common/python +++ b/config/rootfiles/common/python @@ -171,12 +171,18 @@ usr/lib/python2.7/__phello__.foo.pyc #usr/lib/python2.7/_abcoll.py usr/lib/python2.7/_abcoll.pyc #usr/lib/python2.7/_abcoll.pyo +#usr/lib/python2.7/_osx_support.py +#usr/lib/python2.7/_osx_support.pyc +#usr/lib/python2.7/_osx_support.pyo #usr/lib/python2.7/_pyio.py usr/lib/python2.7/_pyio.pyc #usr/lib/python2.7/_pyio.pyo #usr/lib/python2.7/_strptime.py usr/lib/python2.7/_strptime.pyc #usr/lib/python2.7/_strptime.pyo +#usr/lib/python2.7/_sysconfigdata.py +#usr/lib/python2.7/_sysconfigdata.pyc +#usr/lib/python2.7/_sysconfigdata.pyo #usr/lib/python2.7/_threading_local.py usr/lib/python2.7/_threading_local.pyc #usr/lib/python2.7/_threading_local.pyo @@ -605,6 +611,9 @@ usr/lib/python2.7/ctypes/macholib/framework.pyc #usr/lib/python2.7/ctypes/test/test_win32.py #usr/lib/python2.7/ctypes/test/test_win32.pyc #usr/lib/python2.7/ctypes/test/test_win32.pyo +#usr/lib/python2.7/ctypes/test/test_wintypes.py +#usr/lib/python2.7/ctypes/test/test_wintypes.pyc +#usr/lib/python2.7/ctypes/test/test_wintypes.pyo #usr/lib/python2.7/ctypes/util.py usr/lib/python2.7/ctypes/util.pyc #usr/lib/python2.7/ctypes/util.pyo @@ -1452,6 +1461,19 @@ usr/lib/python2.7/encodings/uu_codec.pyc #usr/lib/python2.7/encodings/zlib_codec.py usr/lib/python2.7/encodings/zlib_codec.pyc #usr/lib/python2.7/encodings/zlib_codec.pyo +#usr/lib/python2.7/ensurepip +#usr/lib/python2.7/ensurepip/__init__.py +#usr/lib/python2.7/ensurepip/__init__.pyc +#usr/lib/python2.7/ensurepip/__init__.pyo +#usr/lib/python2.7/ensurepip/__main__.py +#usr/lib/python2.7/ensurepip/__main__.pyc +#usr/lib/python2.7/ensurepip/__main__.pyo +#usr/lib/python2.7/ensurepip/_bundled +#usr/lib/python2.7/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl +#usr/lib/python2.7/ensurepip/_uninstall.py +#usr/lib/python2.7/ensurepip/_uninstall.pyc +#usr/lib/python2.7/ensurepip/_uninstall.pyo #usr/lib/python2.7/filecmp.py usr/lib/python2.7/filecmp.pyc #usr/lib/python2.7/filecmp.pyo @@ -1583,6 +1605,13 @@ usr/lib/python2.7/httplib.pyc #usr/lib/python2.7/idlelib/Icons #usr/lib/python2.7/idlelib/Icons/folder.gif #usr/lib/python2.7/idlelib/Icons/idle.icns +#usr/lib/python2.7/idlelib/Icons/idle.ico +#usr/lib/python2.7/idlelib/Icons/idle_16.gif +#usr/lib/python2.7/idlelib/Icons/idle_16.png +#usr/lib/python2.7/idlelib/Icons/idle_32.gif +#usr/lib/python2.7/idlelib/Icons/idle_32.png +#usr/lib/python2.7/idlelib/Icons/idle_48.gif +#usr/lib/python2.7/idlelib/Icons/idle_48.png #usr/lib/python2.7/idlelib/Icons/minusnode.gif #usr/lib/python2.7/idlelib/Icons/openfolder.gif #usr/lib/python2.7/idlelib/Icons/plusnode.gif @@ -1701,6 +1730,77 @@ usr/lib/python2.7/httplib.pyc #usr/lib/python2.7/idlelib/idle.pyc #usr/lib/python2.7/idlelib/idle.pyo #usr/lib/python2.7/idlelib/idle.pyw +#usr/lib/python2.7/idlelib/idle_test +#usr/lib/python2.7/idlelib/idle_test/README.txt +#usr/lib/python2.7/idlelib/idle_test/__init__.py +#usr/lib/python2.7/idlelib/idle_test/__init__.pyc +#usr/lib/python2.7/idlelib/idle_test/__init__.pyo +#usr/lib/python2.7/idlelib/idle_test/htest.py +#usr/lib/python2.7/idlelib/idle_test/htest.pyc +#usr/lib/python2.7/idlelib/idle_test/htest.pyo +#usr/lib/python2.7/idlelib/idle_test/mock_idle.py +#usr/lib/python2.7/idlelib/idle_test/mock_idle.pyc +#usr/lib/python2.7/idlelib/idle_test/mock_idle.pyo +#usr/lib/python2.7/idlelib/idle_test/mock_tk.py +#usr/lib/python2.7/idlelib/idle_test/mock_tk.pyc +#usr/lib/python2.7/idlelib/idle_test/mock_tk.pyo +#usr/lib/python2.7/idlelib/idle_test/test_autocomplete.py +#usr/lib/python2.7/idlelib/idle_test/test_autocomplete.pyc +#usr/lib/python2.7/idlelib/idle_test/test_autocomplete.pyo +#usr/lib/python2.7/idlelib/idle_test/test_autoexpand.py +#usr/lib/python2.7/idlelib/idle_test/test_autoexpand.pyc +#usr/lib/python2.7/idlelib/idle_test/test_autoexpand.pyo +#usr/lib/python2.7/idlelib/idle_test/test_calltips.py +#usr/lib/python2.7/idlelib/idle_test/test_calltips.pyc +#usr/lib/python2.7/idlelib/idle_test/test_calltips.pyo +#usr/lib/python2.7/idlelib/idle_test/test_config_name.py +#usr/lib/python2.7/idlelib/idle_test/test_config_name.pyc +#usr/lib/python2.7/idlelib/idle_test/test_config_name.pyo +#usr/lib/python2.7/idlelib/idle_test/test_configdialog.py +#usr/lib/python2.7/idlelib/idle_test/test_configdialog.pyc +#usr/lib/python2.7/idlelib/idle_test/test_configdialog.pyo +#usr/lib/python2.7/idlelib/idle_test/test_delegator.py +#usr/lib/python2.7/idlelib/idle_test/test_delegator.pyc +#usr/lib/python2.7/idlelib/idle_test/test_delegator.pyo +#usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.py +#usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyc +#usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyo +#usr/lib/python2.7/idlelib/idle_test/test_grep.py +#usr/lib/python2.7/idlelib/idle_test/test_grep.pyc +#usr/lib/python2.7/idlelib/idle_test/test_grep.pyo +#usr/lib/python2.7/idlelib/idle_test/test_hyperparser.py +#usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyc +#usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyo +#usr/lib/python2.7/idlelib/idle_test/test_idlehistory.py +#usr/lib/python2.7/idlelib/idle_test/test_idlehistory.pyc +#usr/lib/python2.7/idlelib/idle_test/test_idlehistory.pyo +#usr/lib/python2.7/idlelib/idle_test/test_parenmatch.py +#usr/lib/python2.7/idlelib/idle_test/test_parenmatch.pyc +#usr/lib/python2.7/idlelib/idle_test/test_parenmatch.pyo +#usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.py +#usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.pyc +#usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.pyo +#usr/lib/python2.7/idlelib/idle_test/test_rstrip.py +#usr/lib/python2.7/idlelib/idle_test/test_rstrip.pyc +#usr/lib/python2.7/idlelib/idle_test/test_rstrip.pyo +#usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.py +#usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.pyc +#usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.pyo +#usr/lib/python2.7/idlelib/idle_test/test_searchengine.py +#usr/lib/python2.7/idlelib/idle_test/test_searchengine.pyc +#usr/lib/python2.7/idlelib/idle_test/test_searchengine.pyo +#usr/lib/python2.7/idlelib/idle_test/test_text.py +#usr/lib/python2.7/idlelib/idle_test/test_text.pyc +#usr/lib/python2.7/idlelib/idle_test/test_text.pyo +#usr/lib/python2.7/idlelib/idle_test/test_textview.py +#usr/lib/python2.7/idlelib/idle_test/test_textview.pyc +#usr/lib/python2.7/idlelib/idle_test/test_textview.pyo +#usr/lib/python2.7/idlelib/idle_test/test_warning.py +#usr/lib/python2.7/idlelib/idle_test/test_warning.pyc +#usr/lib/python2.7/idlelib/idle_test/test_warning.pyo +#usr/lib/python2.7/idlelib/idle_test/test_widgetredir.py +#usr/lib/python2.7/idlelib/idle_test/test_widgetredir.pyc +#usr/lib/python2.7/idlelib/idle_test/test_widgetredir.pyo #usr/lib/python2.7/idlelib/idlever.py #usr/lib/python2.7/idlelib/idlever.pyc #usr/lib/python2.7/idlelib/idlever.pyo @@ -1809,6 +1909,9 @@ usr/lib/python2.7/json/scanner.pyc #usr/lib/python2.7/json/tests/test_speedups.py #usr/lib/python2.7/json/tests/test_speedups.pyc #usr/lib/python2.7/json/tests/test_speedups.pyo +#usr/lib/python2.7/json/tests/test_tool.py +#usr/lib/python2.7/json/tests/test_tool.pyc +#usr/lib/python2.7/json/tests/test_tool.pyo #usr/lib/python2.7/json/tests/test_unicode.py #usr/lib/python2.7/json/tests/test_unicode.pyc #usr/lib/python2.7/json/tests/test_unicode.pyo @@ -1819,7 +1922,7 @@ usr/lib/python2.7/json/tool.pyc usr/lib/python2.7/keyword.pyc #usr/lib/python2.7/keyword.pyo #usr/lib/python2.7/lib-dynload -usr/lib/python2.7/lib-dynload/Python-2.7.3-py2.7.egg-info +usr/lib/python2.7/lib-dynload/Python-2.7.9-py2.7.egg-info usr/lib/python2.7/lib-dynload/_bisect.so usr/lib/python2.7/lib-dynload/_bsddb.so usr/lib/python2.7/lib-dynload/_codecs_cn.so @@ -1860,7 +1963,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/dl.so usr/lib/python2.7/lib-dynload/fcntl.so usr/lib/python2.7/lib-dynload/future_builtins.so @@ -1926,12 +2029,27 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.py #usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.pyo +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.py +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.pyc +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.pyo +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.py +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.pyc +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.pyo +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.py +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.pyc +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.pyo #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.py #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyo #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.py #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyc #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyo +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.py +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.pyc +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.pyo +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.py +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.pyc +#usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.pyo #usr/lib/python2.7/lib-tk/test/test_ttk #usr/lib/python2.7/lib-tk/test/test_ttk/__init__.py #usr/lib/python2.7/lib-tk/test/test_ttk/__init__.pyc @@ -1951,6 +2069,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.py #usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.pyc #usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.pyo +#usr/lib/python2.7/lib-tk/test/widget_tests.py +#usr/lib/python2.7/lib-tk/test/widget_tests.pyc +#usr/lib/python2.7/lib-tk/test/widget_tests.pyo #usr/lib/python2.7/lib-tk/tkColorChooser.py #usr/lib/python2.7/lib-tk/tkColorChooser.pyc #usr/lib/python2.7/lib-tk/tkColorChooser.pyo @@ -1977,9 +2098,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib-tk/turtle.pyo #usr/lib/python2.7/lib2to3 #usr/lib/python2.7/lib2to3/Grammar.txt -#usr/lib/python2.7/lib2to3/Grammar2.7.3.final.0.pickle +#usr/lib/python2.7/lib2to3/Grammar2.7.9.final.0.pickle #usr/lib/python2.7/lib2to3/PatternGrammar.txt -#usr/lib/python2.7/lib2to3/PatternGrammar2.7.3.final.0.pickle +#usr/lib/python2.7/lib2to3/PatternGrammar2.7.9.final.0.pickle #usr/lib/python2.7/lib2to3/__init__.py #usr/lib/python2.7/lib2to3/__init__.pyc #usr/lib/python2.7/lib2to3/__init__.pyo @@ -2005,6 +2126,9 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib2to3/fixes/fix_apply.py #usr/lib/python2.7/lib2to3/fixes/fix_apply.pyc #usr/lib/python2.7/lib2to3/fixes/fix_apply.pyo +#usr/lib/python2.7/lib2to3/fixes/fix_asserts.py +#usr/lib/python2.7/lib2to3/fixes/fix_asserts.pyc +#usr/lib/python2.7/lib2to3/fixes/fix_asserts.pyo #usr/lib/python2.7/lib2to3/fixes/fix_basestring.py #usr/lib/python2.7/lib2to3/fixes/fix_basestring.pyc #usr/lib/python2.7/lib2to3/fixes/fix_basestring.pyo @@ -2207,6 +2331,7 @@ usr/lib/python2.7/lib-dynload/zlib.so #usr/lib/python2.7/lib2to3/tests/data/bom.py #usr/lib/python2.7/lib2to3/tests/data/crlf.py #usr/lib/python2.7/lib2to3/tests/data/different_encoding.py +#usr/lib/python2.7/lib2to3/tests/data/false_encoding.py #usr/lib/python2.7/lib2to3/tests/data/fixers #usr/lib/python2.7/lib2to3/tests/data/fixers/bad_order.py #usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes @@ -2628,12 +2753,33 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/__init__.py #usr/lib/python2.7/test/__init__.pyc #usr/lib/python2.7/test/__init__.pyo +#usr/lib/python2.7/test/_mock_backport.py +#usr/lib/python2.7/test/_mock_backport.pyc +#usr/lib/python2.7/test/_mock_backport.pyo +#usr/lib/python2.7/test/audiodata +#usr/lib/python2.7/test/audiodata/pluck-pcm16.aiff +#usr/lib/python2.7/test/audiodata/pluck-pcm16.au +#usr/lib/python2.7/test/audiodata/pluck-pcm16.wav +#usr/lib/python2.7/test/audiodata/pluck-pcm24.aiff +#usr/lib/python2.7/test/audiodata/pluck-pcm24.wav +#usr/lib/python2.7/test/audiodata/pluck-pcm32.aiff +#usr/lib/python2.7/test/audiodata/pluck-pcm32.au +#usr/lib/python2.7/test/audiodata/pluck-pcm32.wav +#usr/lib/python2.7/test/audiodata/pluck-pcm8.aiff +#usr/lib/python2.7/test/audiodata/pluck-pcm8.au +#usr/lib/python2.7/test/audiodata/pluck-pcm8.wav +#usr/lib/python2.7/test/audiodata/pluck-ulaw.aifc +#usr/lib/python2.7/test/audiodata/pluck-ulaw.au #usr/lib/python2.7/test/audiotest.au +#usr/lib/python2.7/test/audiotests.py +#usr/lib/python2.7/test/audiotests.pyc +#usr/lib/python2.7/test/audiotests.pyo #usr/lib/python2.7/test/autotest.py #usr/lib/python2.7/test/autotest.pyc #usr/lib/python2.7/test/autotest.pyo #usr/lib/python2.7/test/bad_coding.py #usr/lib/python2.7/test/bad_coding2.py +#usr/lib/python2.7/test/bad_coding3.py #usr/lib/python2.7/test/badcert.pem #usr/lib/python2.7/test/badkey.pem #usr/lib/python2.7/test/badsyntax_future3.py @@ -2647,6 +2793,11 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/buffer_tests.py #usr/lib/python2.7/test/buffer_tests.pyc #usr/lib/python2.7/test/buffer_tests.pyo +#usr/lib/python2.7/test/capath +#usr/lib/python2.7/test/capath/4e1295a3.0 +#usr/lib/python2.7/test/capath/5ed36f99.0 +#usr/lib/python2.7/test/capath/6e88d7b8.0 +#usr/lib/python2.7/test/capath/99d0fa06.0 #usr/lib/python2.7/test/cfgparser.1 #usr/lib/python2.7/test/check_soundcard.vbs #usr/lib/python2.7/test/cjkencodings @@ -2830,6 +2981,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/decimaltestdata/tointegral.decTest #usr/lib/python2.7/test/decimaltestdata/tointegralx.decTest #usr/lib/python2.7/test/decimaltestdata/xor.decTest +#usr/lib/python2.7/test/dh512.pem #usr/lib/python2.7/test/doctest_aliases.py #usr/lib/python2.7/test/doctest_aliases.pyc #usr/lib/python2.7/test/doctest_aliases.pyo @@ -2849,6 +3001,18 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/greyrgb.uue #usr/lib/python2.7/test/https_svn_python_org_root.pem #usr/lib/python2.7/test/ieee754.txt +#usr/lib/python2.7/test/imghdrdata +#usr/lib/python2.7/test/imghdrdata/python.bmp +#usr/lib/python2.7/test/imghdrdata/python.gif +#usr/lib/python2.7/test/imghdrdata/python.jpg +#usr/lib/python2.7/test/imghdrdata/python.pbm +#usr/lib/python2.7/test/imghdrdata/python.pgm +#usr/lib/python2.7/test/imghdrdata/python.png +#usr/lib/python2.7/test/imghdrdata/python.ppm +#usr/lib/python2.7/test/imghdrdata/python.ras +#usr/lib/python2.7/test/imghdrdata/python.sgi +#usr/lib/python2.7/test/imghdrdata/python.tiff +#usr/lib/python2.7/test/imghdrdata/python.xbm #usr/lib/python2.7/test/infinite_reload.py #usr/lib/python2.7/test/infinite_reload.pyc #usr/lib/python2.7/test/infinite_reload.pyo @@ -2858,18 +3022,29 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/inspect_fodder2.py #usr/lib/python2.7/test/inspect_fodder2.pyc #usr/lib/python2.7/test/inspect_fodder2.pyo +#usr/lib/python2.7/test/keycert.passwd.pem #usr/lib/python2.7/test/keycert.pem +#usr/lib/python2.7/test/keycert2.pem +#usr/lib/python2.7/test/keycert3.pem +#usr/lib/python2.7/test/keycert4.pem #usr/lib/python2.7/test/list_tests.py #usr/lib/python2.7/test/list_tests.pyc #usr/lib/python2.7/test/list_tests.pyo #usr/lib/python2.7/test/lock_tests.py #usr/lib/python2.7/test/lock_tests.pyc #usr/lib/python2.7/test/lock_tests.pyo +#usr/lib/python2.7/test/make_ssl_certs.py +#usr/lib/python2.7/test/make_ssl_certs.pyc +#usr/lib/python2.7/test/make_ssl_certs.pyo #usr/lib/python2.7/test/mapping_tests.py #usr/lib/python2.7/test/mapping_tests.pyc #usr/lib/python2.7/test/mapping_tests.pyo #usr/lib/python2.7/test/math_testcases.txt +#usr/lib/python2.7/test/mp_fork_bomb.py +#usr/lib/python2.7/test/mp_fork_bomb.pyc +#usr/lib/python2.7/test/mp_fork_bomb.pyo #usr/lib/python2.7/test/nokia.pem +#usr/lib/python2.7/test/nullbytecert.pem #usr/lib/python2.7/test/nullcert.pem #usr/lib/python2.7/test/outstanding_bugs.py #usr/lib/python2.7/test/outstanding_bugs.pyc @@ -2880,6 +3055,7 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/profilee.py #usr/lib/python2.7/test/profilee.pyc #usr/lib/python2.7/test/profilee.pyo +#usr/lib/python2.7/test/pycacert.pem #usr/lib/python2.7/test/pyclbr_input.py #usr/lib/python2.7/test/pyclbr_input.pyc #usr/lib/python2.7/test/pyclbr_input.pyo @@ -2907,12 +3083,20 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/reperf.py #usr/lib/python2.7/test/reperf.pyc #usr/lib/python2.7/test/reperf.pyo +#usr/lib/python2.7/test/revocation.crl #usr/lib/python2.7/test/sample_doctest.py #usr/lib/python2.7/test/sample_doctest.pyc #usr/lib/python2.7/test/sample_doctest.pyo +#usr/lib/python2.7/test/sample_doctest_no_docstrings.py +#usr/lib/python2.7/test/sample_doctest_no_docstrings.pyc +#usr/lib/python2.7/test/sample_doctest_no_docstrings.pyo +#usr/lib/python2.7/test/sample_doctest_no_doctests.py +#usr/lib/python2.7/test/sample_doctest_no_doctests.pyc +#usr/lib/python2.7/test/sample_doctest_no_doctests.pyo #usr/lib/python2.7/test/script_helper.py #usr/lib/python2.7/test/script_helper.pyc #usr/lib/python2.7/test/script_helper.pyo +#usr/lib/python2.7/test/selfsigned_pythontestdotnet.pem #usr/lib/python2.7/test/seq_tests.py #usr/lib/python2.7/test/seq_tests.pyc #usr/lib/python2.7/test/seq_tests.pyo @@ -2922,7 +3106,11 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/sortperf.pyc #usr/lib/python2.7/test/sortperf.pyo #usr/lib/python2.7/test/ssl_cert.pem +#usr/lib/python2.7/test/ssl_key.passwd.pem #usr/lib/python2.7/test/ssl_key.pem +#usr/lib/python2.7/test/ssl_servers.py +#usr/lib/python2.7/test/ssl_servers.pyc +#usr/lib/python2.7/test/ssl_servers.pyo #usr/lib/python2.7/test/string_tests.py #usr/lib/python2.7/test/string_tests.pyc #usr/lib/python2.7/test/string_tests.pyo @@ -2930,6 +3118,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyc #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyo +#usr/lib/python2.7/test/symlink_support.py +#usr/lib/python2.7/test/symlink_support.pyc +#usr/lib/python2.7/test/symlink_support.pyo #usr/lib/python2.7/test/test_MimeWriter.py #usr/lib/python2.7/test/test_MimeWriter.pyc #usr/lib/python2.7/test/test_MimeWriter.pyo @@ -2948,6 +3139,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test__locale.py #usr/lib/python2.7/test/test__locale.pyc #usr/lib/python2.7/test/test__locale.pyo +#usr/lib/python2.7/test/test__osx_support.py +#usr/lib/python2.7/test/test__osx_support.pyc +#usr/lib/python2.7/test/test__osx_support.pyo #usr/lib/python2.7/test/test_abc.py #usr/lib/python2.7/test/test_abc.pyc #usr/lib/python2.7/test/test_abc.pyo @@ -3280,6 +3474,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_email_renamed.py #usr/lib/python2.7/test/test_email_renamed.pyc #usr/lib/python2.7/test/test_email_renamed.pyo +#usr/lib/python2.7/test/test_ensurepip.py +#usr/lib/python2.7/test/test_ensurepip.pyc +#usr/lib/python2.7/test/test_ensurepip.pyo #usr/lib/python2.7/test/test_enumerate.py #usr/lib/python2.7/test/test_enumerate.pyc #usr/lib/python2.7/test/test_enumerate.pyo @@ -3310,6 +3507,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_file2k.py #usr/lib/python2.7/test/test_file2k.pyc #usr/lib/python2.7/test/test_file2k.pyo +#usr/lib/python2.7/test/test_file_eintr.py +#usr/lib/python2.7/test/test_file_eintr.pyc +#usr/lib/python2.7/test/test_file_eintr.pyo #usr/lib/python2.7/test/test_filecmp.py #usr/lib/python2.7/test/test_filecmp.pyc #usr/lib/python2.7/test/test_filecmp.pyo @@ -3445,6 +3645,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_httpservers.py #usr/lib/python2.7/test/test_httpservers.pyc #usr/lib/python2.7/test/test_httpservers.pyo +#usr/lib/python2.7/test/test_idle.py +#usr/lib/python2.7/test/test_idle.pyc +#usr/lib/python2.7/test/test_idle.pyo #usr/lib/python2.7/test/test_imageop.py #usr/lib/python2.7/test/test_imageop.pyc #usr/lib/python2.7/test/test_imageop.pyo @@ -3454,6 +3657,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_imgfile.py #usr/lib/python2.7/test/test_imgfile.pyc #usr/lib/python2.7/test/test_imgfile.pyo +#usr/lib/python2.7/test/test_imghdr.py +#usr/lib/python2.7/test/test_imghdr.pyc +#usr/lib/python2.7/test/test_imghdr.pyo #usr/lib/python2.7/test/test_imp.py #usr/lib/python2.7/test/test_imp.pyc #usr/lib/python2.7/test/test_imp.pyo @@ -3541,6 +3747,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_macpath.py #usr/lib/python2.7/test/test_macpath.pyc #usr/lib/python2.7/test/test_macpath.pyo +#usr/lib/python2.7/test/test_macurl2path.py +#usr/lib/python2.7/test/test_macurl2path.pyc +#usr/lib/python2.7/test/test_macurl2path.pyo #usr/lib/python2.7/test/test_mailbox.py #usr/lib/python2.7/test/test_mailbox.pyc #usr/lib/python2.7/test/test_mailbox.pyo @@ -3610,6 +3819,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_nis.py #usr/lib/python2.7/test/test_nis.pyc #usr/lib/python2.7/test/test_nis.pyo +#usr/lib/python2.7/test/test_nntplib.py +#usr/lib/python2.7/test/test_nntplib.pyc +#usr/lib/python2.7/test/test_nntplib.pyo #usr/lib/python2.7/test/test_normalization.py #usr/lib/python2.7/test/test_normalization.pyc #usr/lib/python2.7/test/test_normalization.pyo @@ -3841,6 +4053,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_sort.py #usr/lib/python2.7/test/test_sort.pyc #usr/lib/python2.7/test/test_sort.pyo +#usr/lib/python2.7/test/test_spwd.py +#usr/lib/python2.7/test/test_spwd.pyc +#usr/lib/python2.7/test/test_spwd.pyo #usr/lib/python2.7/test/test_sqlite.py #usr/lib/python2.7/test/test_sqlite.pyc #usr/lib/python2.7/test/test_sqlite.pyo @@ -3850,6 +4065,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_startfile.py #usr/lib/python2.7/test/test_startfile.pyc #usr/lib/python2.7/test/test_startfile.pyo +#usr/lib/python2.7/test/test_stat.py +#usr/lib/python2.7/test/test_stat.pyc +#usr/lib/python2.7/test/test_stat.pyo #usr/lib/python2.7/test/test_str.py #usr/lib/python2.7/test/test_str.pyc #usr/lib/python2.7/test/test_str.pyo @@ -3883,6 +4101,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_subprocess.py #usr/lib/python2.7/test/test_subprocess.pyc #usr/lib/python2.7/test/test_subprocess.pyo +#usr/lib/python2.7/test/test_sunau.py +#usr/lib/python2.7/test/test_sunau.pyc +#usr/lib/python2.7/test/test_sunau.pyo #usr/lib/python2.7/test/test_sunaudiodev.py #usr/lib/python2.7/test/test_sunaudiodev.pyc #usr/lib/python2.7/test/test_sunaudiodev.pyo @@ -3955,6 +4176,9 @@ usr/lib/python2.7/tempfile.pyc #usr/lib/python2.7/test/test_tokenize.py #usr/lib/python2.7/test/test_tokenize.pyc #usr/lib/python2.7/test/test_tokenize.pyo +#usr/lib/python2.7/test/test_tools.py +#usr/lib/python2.7/test/test_tools.pyc +#usr/lib/python2.7/test/test_tools.pyo #usr/lib/python2.7/test/test_trace.py #usr/lib/python2.7/test/test_trace.pyc #usr/lib/python2.7/test/test_trace.pyo @@ -4400,4 +4624,6 @@ usr/lib/python2.7/xmlrpclib.pyc #usr/lib/python2.7/zipfile.py usr/lib/python2.7/zipfile.pyc #usr/lib/python2.7/zipfile.pyo +#usr/share/man/man1/python.1 +#usr/share/man/man1/python2.1 #usr/share/man/man1/python2.7.1 diff --git a/config/rootfiles/common/rrdtool b/config/rootfiles/common/rrdtool index c957d52..738fe37 100644 --- a/config/rootfiles/common/rrdtool +++ b/config/rootfiles/common/rrdtool @@ -1,5 +1,7 @@ #srv/web/ipfire/html/graphs usr/bin/rrdcached +#usr/bin/rrdcreate +#usr/bin/rrdinfo usr/bin/rrdtool usr/bin/rrdupdate #usr/include/rrd.h @@ -9,12 +11,12 @@ usr/bin/rrdupdate #usr/lib/librrd.la #usr/lib/librrd.so usr/lib/librrd.so.4 -usr/lib/librrd.so.4.2.0 +usr/lib/librrd.so.4.3.0 #usr/lib/librrd_th.a #usr/lib/librrd_th.la #usr/lib/librrd_th.so usr/lib/librrd_th.so.4 -usr/lib/librrd_th.so.4.2.0 +usr/lib/librrd_th.so.4.3.0 usr/lib/perl5/site_perl/5.12.3/RRDp.pm usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/RRDs.pm #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDp @@ -24,98 +26,98 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/RRDs.pm #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.bs usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.so #usr/lib/pkgconfig/librrd.pc -#usr/share/doc/rrdtool-1.4.7 -#usr/share/doc/rrdtool-1.4.7/html -#usr/share/doc/rrdtool-1.4.7/html/RRDp.html -#usr/share/doc/rrdtool-1.4.7/html/RRDs.html -#usr/share/doc/rrdtool-1.4.7/html/bin_dec_hex.html -#usr/share/doc/rrdtool-1.4.7/html/cdeftutorial.html -#usr/share/doc/rrdtool-1.4.7/html/index.html -#usr/share/doc/rrdtool-1.4.7/html/librrd.html -#usr/share/doc/rrdtool-1.4.7/html/rpntutorial.html -#usr/share/doc/rrdtool-1.4.7/html/rrd-beginners.html -#usr/share/doc/rrdtool-1.4.7/html/rrdbuild.html -#usr/share/doc/rrdtool-1.4.7/html/rrdcached.html -#usr/share/doc/rrdtool-1.4.7/html/rrdcgi.html -#usr/share/doc/rrdtool-1.4.7/html/rrdcreate.html -#usr/share/doc/rrdtool-1.4.7/html/rrddump.html -#usr/share/doc/rrdtool-1.4.7/html/rrdfetch.html -#usr/share/doc/rrdtool-1.4.7/html/rrdfirst.html -#usr/share/doc/rrdtool-1.4.7/html/rrdflushcached.html -#usr/share/doc/rrdtool-1.4.7/html/rrdgraph.html -#usr/share/doc/rrdtool-1.4.7/html/rrdgraph_data.html -#usr/share/doc/rrdtool-1.4.7/html/rrdgraph_examples.html -#usr/share/doc/rrdtool-1.4.7/html/rrdgraph_graph.html -#usr/share/doc/rrdtool-1.4.7/html/rrdgraph_rpn.html -#usr/share/doc/rrdtool-1.4.7/html/rrdinfo.html -#usr/share/doc/rrdtool-1.4.7/html/rrdlast.html -#usr/share/doc/rrdtool-1.4.7/html/rrdlastupdate.html -#usr/share/doc/rrdtool-1.4.7/html/rrdresize.html -#usr/share/doc/rrdtool-1.4.7/html/rrdrestore.html -#usr/share/doc/rrdtool-1.4.7/html/rrdthreads.html -#usr/share/doc/rrdtool-1.4.7/html/rrdtool.html -#usr/share/doc/rrdtool-1.4.7/html/rrdtune.html -#usr/share/doc/rrdtool-1.4.7/html/rrdtutorial.html -#usr/share/doc/rrdtool-1.4.7/html/rrdupdate.html -#usr/share/doc/rrdtool-1.4.7/html/rrdxport.html -#usr/share/doc/rrdtool-1.4.7/txt -#usr/share/doc/rrdtool-1.4.7/txt/bin_dec_hex.pod -#usr/share/doc/rrdtool-1.4.7/txt/bin_dec_hex.txt -#usr/share/doc/rrdtool-1.4.7/txt/cdeftutorial.pod -#usr/share/doc/rrdtool-1.4.7/txt/cdeftutorial.txt -#usr/share/doc/rrdtool-1.4.7/txt/librrd.txt -#usr/share/doc/rrdtool-1.4.7/txt/rpntutorial.pod -#usr/share/doc/rrdtool-1.4.7/txt/rpntutorial.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrd-beginners.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrd-beginners.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdbuild.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdbuild.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdcached.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdcached.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdcgi.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdcgi.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdcreate.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdcreate.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrddump.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrddump.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdfetch.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdfetch.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdfirst.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdfirst.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdflushcached.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdflushcached.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_data.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_data.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_examples.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_examples.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_graph.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_graph.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_rpn.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdgraph_rpn.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdinfo.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdinfo.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdlast.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdlast.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdlastupdate.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdlastupdate.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdresize.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdresize.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdrestore.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdrestore.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdthreads.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdthreads.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdtool.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdtool.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdtune.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdtune.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdtutorial.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdtutorial.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdupdate.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdupdate.txt -#usr/share/doc/rrdtool-1.4.7/txt/rrdxport.pod -#usr/share/doc/rrdtool-1.4.7/txt/rrdxport.txt +#usr/share/doc/rrdtool-1.5.3 +#usr/share/doc/rrdtool-1.5.3/html +#usr/share/doc/rrdtool-1.5.3/html/RRDp.html +#usr/share/doc/rrdtool-1.5.3/html/RRDs.html +#usr/share/doc/rrdtool-1.5.3/html/bin_dec_hex.html +#usr/share/doc/rrdtool-1.5.3/html/cdeftutorial.html +#usr/share/doc/rrdtool-1.5.3/html/index.html +#usr/share/doc/rrdtool-1.5.3/html/librrd.html +#usr/share/doc/rrdtool-1.5.3/html/rpntutorial.html +#usr/share/doc/rrdtool-1.5.3/html/rrd-beginners.html +#usr/share/doc/rrdtool-1.5.3/html/rrdbuild.html +#usr/share/doc/rrdtool-1.5.3/html/rrdcached.html +#usr/share/doc/rrdtool-1.5.3/html/rrdcgi.html +#usr/share/doc/rrdtool-1.5.3/html/rrdcreate.html +#usr/share/doc/rrdtool-1.5.3/html/rrddump.html +#usr/share/doc/rrdtool-1.5.3/html/rrdfetch.html +#usr/share/doc/rrdtool-1.5.3/html/rrdfirst.html +#usr/share/doc/rrdtool-1.5.3/html/rrdflushcached.html +#usr/share/doc/rrdtool-1.5.3/html/rrdgraph.html +#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_data.html +#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_examples.html +#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_graph.html +#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_rpn.html +#usr/share/doc/rrdtool-1.5.3/html/rrdinfo.html +#usr/share/doc/rrdtool-1.5.3/html/rrdlast.html +#usr/share/doc/rrdtool-1.5.3/html/rrdlastupdate.html +#usr/share/doc/rrdtool-1.5.3/html/rrdresize.html +#usr/share/doc/rrdtool-1.5.3/html/rrdrestore.html +#usr/share/doc/rrdtool-1.5.3/html/rrdthreads.html +#usr/share/doc/rrdtool-1.5.3/html/rrdtool.html +#usr/share/doc/rrdtool-1.5.3/html/rrdtune.html +#usr/share/doc/rrdtool-1.5.3/html/rrdtutorial.html +#usr/share/doc/rrdtool-1.5.3/html/rrdupdate.html +#usr/share/doc/rrdtool-1.5.3/html/rrdxport.html +#usr/share/doc/rrdtool-1.5.3/txt +#usr/share/doc/rrdtool-1.5.3/txt/bin_dec_hex.pod +#usr/share/doc/rrdtool-1.5.3/txt/bin_dec_hex.txt +#usr/share/doc/rrdtool-1.5.3/txt/cdeftutorial.pod +#usr/share/doc/rrdtool-1.5.3/txt/cdeftutorial.txt +#usr/share/doc/rrdtool-1.5.3/txt/librrd.txt +#usr/share/doc/rrdtool-1.5.3/txt/rpntutorial.pod +#usr/share/doc/rrdtool-1.5.3/txt/rpntutorial.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrd-beginners.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrd-beginners.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdbuild.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdbuild.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdcached.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdcached.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdcgi.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdcgi.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdcreate.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdcreate.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrddump.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrddump.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdfetch.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdfetch.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdfirst.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdfirst.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdflushcached.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdflushcached.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_data.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_data.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_examples.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_examples.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_graph.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_graph.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_rpn.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_rpn.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdinfo.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdinfo.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdlast.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdlast.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdlastupdate.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdlastupdate.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdresize.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdresize.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdrestore.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdrestore.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdthreads.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdthreads.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdtool.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdtool.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdtune.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdtune.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdtutorial.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdtutorial.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdupdate.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdupdate.txt +#usr/share/doc/rrdtool-1.5.3/txt/rrdxport.pod +#usr/share/doc/rrdtool-1.5.3/txt/rrdxport.txt #usr/share/man/man1/bin_dec_hex.1 #usr/share/man/man1/cdeftutorial.1 #usr/share/man/man1/rpntutorial.1 diff --git a/config/rootfiles/core/91/filelists/python b/config/rootfiles/core/91/filelists/python new file mode 120000 index 0000000..ffe6e2c --- /dev/null +++ b/config/rootfiles/core/91/filelists/python @@ -0,0 +1 @@ +../../../common/python \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/files b/config/rootfiles/core/92/filelists/files index fe764db..9c5a302 100644 --- a/config/rootfiles/core/92/filelists/files +++ b/config/rootfiles/core/92/filelists/files @@ -4,6 +4,7 @@ srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/dhcp.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi srv/web/ipfire/cgi-bin/webaccess.cgi +var/ipfire/graphs.pl var/ipfire/network-functions.pl var/ipfire/langs var/ipfire/urlfilter/bin/autoupdate.pl diff --git a/config/rootfiles/core/92/filelists/libgcrypt b/config/rootfiles/core/92/filelists/libgcrypt new file mode 120000 index 0000000..2df12a2 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libgcrypt @@ -0,0 +1 @@ +../../../common/libgcrypt \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/libgpg-error b/config/rootfiles/core/92/filelists/libgpg-error new file mode 120000 index 0000000..cad4313 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libgpg-error @@ -0,0 +1 @@ +../../../common/libgpg-error \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/libpcap b/config/rootfiles/core/92/filelists/libpcap new file mode 120000 index 0000000..c7f9f52 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libpcap @@ -0,0 +1 @@ +../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/libusb b/config/rootfiles/core/92/filelists/libusb new file mode 120000 index 0000000..edbe8c2 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libusb @@ -0,0 +1 @@ +../../../common/libusb \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/libusb-compat b/config/rootfiles/core/92/filelists/libusb-compat new file mode 120000 index 0000000..35c3237 --- /dev/null +++ b/config/rootfiles/core/92/filelists/libusb-compat @@ -0,0 +1 @@ +../../../common/libusb-compat \ No newline at end of file diff --git a/config/rootfiles/core/92/filelists/rrdtool b/config/rootfiles/core/92/filelists/rrdtool new file mode 120000 index 0000000..7a82e41 --- /dev/null +++ b/config/rootfiles/core/92/filelists/rrdtool @@ -0,0 +1 @@ +../../../common/rrdtool \ No newline at end of file diff --git a/config/rootfiles/packages/7zip b/config/rootfiles/packages/7zip index ff0eea8..15d9515 100644 --- a/config/rootfiles/packages/7zip +++ b/config/rootfiles/packages/7zip @@ -9,55 +9,65 @@ usr/local/lib/p7zip #usr/local/man/man1/7zr.1 #usr/local/share/doc/p7zip #usr/local/share/doc/p7zip/ChangeLog -#usr/local/share/doc/p7zip/DOCS -#usr/local/share/doc/p7zip/DOCS/7zC.txt -#usr/local/share/doc/p7zip/DOCS/7zFormat.txt -#usr/local/share/doc/p7zip/DOCS/License.txt -#usr/local/share/doc/p7zip/DOCS/MANUAL -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/add.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/bench.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/delete.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/extract.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/extract_full.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/index.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/list.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/style.css -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/test.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/commands/update.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/exit_codes.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/index.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/style.css -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ar_exclude.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ar_include.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ar_no.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/charset.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/exclude.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/include.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/index.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/list_tech.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/method.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/output_dir.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/overwrite.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/password.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/recurse.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/sfx.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/ssc.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/stdin.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/stdout.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/stop_switch.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/style.css -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/type.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/update.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/volume.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/working_dir.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/switches/yes.htm -#usr/local/share/doc/p7zip/DOCS/MANUAL/syntax.htm -#usr/local/share/doc/p7zip/DOCS/Methods.txt -#usr/local/share/doc/p7zip/DOCS/copying.txt -#usr/local/share/doc/p7zip/DOCS/history.txt -#usr/local/share/doc/p7zip/DOCS/lzma.txt -#usr/local/share/doc/p7zip/DOCS/readme.txt -#usr/local/share/doc/p7zip/DOCS/unRarLicense.txt +#usr/local/share/doc/p7zip/DOC +#usr/local/share/doc/p7zip/DOC/7zC.txt +#usr/local/share/doc/p7zip/DOC/7zFormat.txt +#usr/local/share/doc/p7zip/DOC/License.txt +#usr/local/share/doc/p7zip/DOC/MANUAL +#usr/local/share/doc/p7zip/DOC/MANUAL/commands +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/add.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/bench.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/delete.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/extract.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/extract_full.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/hash.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/index.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/list.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/rename.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/style.css +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/test.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/commands/update.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/exit_codes.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/index.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/style.css +#usr/local/share/doc/p7zip/DOC/MANUAL/switches +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/ar_exclude.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/ar_include.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/ar_no.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/charset.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/exclude.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/include.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/index.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/large_pages.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/list_tech.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/method.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/output_dir.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/overwrite.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/password.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/recurse.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/sa.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/scrc.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/sdel.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/sfx.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/sni.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/sns.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/spf.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/ssc.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/stdin.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/stdout.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/stl.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/stop_switch.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/style.css +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/type.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/update.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/volume.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/working_dir.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/switches/yes.htm +#usr/local/share/doc/p7zip/DOC/MANUAL/syntax.htm +#usr/local/share/doc/p7zip/DOC/Methods.txt +#usr/local/share/doc/p7zip/DOC/copying.txt +#usr/local/share/doc/p7zip/DOC/lzma.txt +#usr/local/share/doc/p7zip/DOC/readme.txt +#usr/local/share/doc/p7zip/DOC/src-history.txt +#usr/local/share/doc/p7zip/DOC/unRarLicense.txt #usr/local/share/doc/p7zip/README diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index 5584c25..e168483 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -95,8 +95,8 @@ usr/libexec/git-core/git-index-pack usr/libexec/git-core/git-init usr/libexec/git-core/git-init-db usr/libexec/git-core/git-instaweb +usr/libexec/git-core/git-interpret-trailers usr/libexec/git-core/git-log -usr/libexec/git-core/git-lost-found usr/libexec/git-core/git-ls-files usr/libexec/git-core/git-ls-remote usr/libexec/git-core/git-ls-tree @@ -126,7 +126,6 @@ usr/libexec/git-core/git-pack-redundant usr/libexec/git-core/git-pack-refs usr/libexec/git-core/git-parse-remote usr/libexec/git-core/git-patch-id -usr/libexec/git-core/git-peek-remote usr/libexec/git-core/git-prune usr/libexec/git-core/git-prune-packed usr/libexec/git-core/git-pull @@ -150,7 +149,6 @@ usr/libexec/git-core/git-remote-https usr/libexec/git-core/git-remote-testsvn usr/libexec/git-core/git-repack usr/libexec/git-core/git-replace -usr/libexec/git-core/git-repo-config usr/libexec/git-core/git-request-pull usr/libexec/git-core/git-rerere usr/libexec/git-core/git-reset @@ -177,7 +175,6 @@ usr/libexec/git-core/git-submodule usr/libexec/git-core/git-svn usr/libexec/git-core/git-symbolic-ref usr/libexec/git-core/git-tag -usr/libexec/git-core/git-tar-tree usr/libexec/git-core/git-unpack-file usr/libexec/git-core/git-unpack-objects usr/libexec/git-core/git-update-index @@ -186,6 +183,7 @@ usr/libexec/git-core/git-update-server-info usr/libexec/git-core/git-upload-archive usr/libexec/git-core/git-upload-pack usr/libexec/git-core/git-var +usr/libexec/git-core/git-verify-commit usr/libexec/git-core/git-verify-pack usr/libexec/git-core/git-verify-tag usr/libexec/git-core/git-web--browse @@ -193,6 +191,7 @@ usr/libexec/git-core/git-whatchanged usr/libexec/git-core/git-write-tree usr/libexec/git-core/mergetools usr/libexec/git-core/mergetools/araxis +usr/libexec/git-core/mergetools/bc usr/libexec/git-core/mergetools/bc3 usr/libexec/git-core/mergetools/codecompare usr/libexec/git-core/mergetools/deltawalker @@ -202,6 +201,7 @@ usr/libexec/git-core/mergetools/ecmerge usr/libexec/git-core/mergetools/emerge usr/libexec/git-core/mergetools/gvimdiff usr/libexec/git-core/mergetools/gvimdiff2 +usr/libexec/git-core/mergetools/gvimdiff3 usr/libexec/git-core/mergetools/kdiff3 usr/libexec/git-core/mergetools/kompare usr/libexec/git-core/mergetools/meld @@ -211,6 +211,7 @@ usr/libexec/git-core/mergetools/tkdiff usr/libexec/git-core/mergetools/tortoisemerge usr/libexec/git-core/mergetools/vimdiff usr/libexec/git-core/mergetools/vimdiff2 +usr/libexec/git-core/mergetools/vimdiff3 usr/libexec/git-core/mergetools/xxdiff usr/share/git-core usr/share/git-core/templates @@ -257,6 +258,7 @@ usr/share/git-core/templates/info/exclude #usr/share/git-gui/lib/merge.tcl #usr/share/git-gui/lib/mergetool.tcl #usr/share/git-gui/lib/msgs +#usr/share/git-gui/lib/msgs/bg.msg #usr/share/git-gui/lib/msgs/de.msg #usr/share/git-gui/lib/msgs/el.msg #usr/share/git-gui/lib/msgs/fr.msg @@ -267,6 +269,7 @@ usr/share/git-core/templates/info/exclude #usr/share/git-gui/lib/msgs/pt_br.msg #usr/share/git-gui/lib/msgs/ru.msg #usr/share/git-gui/lib/msgs/sv.msg +#usr/share/git-gui/lib/msgs/vi.msg #usr/share/git-gui/lib/msgs/zh_cn.msg #usr/share/git-gui/lib/option.tcl #usr/share/git-gui/lib/remote.tcl @@ -287,6 +290,8 @@ usr/share/git-core/templates/info/exclude #usr/share/gitk #usr/share/gitk/lib #usr/share/gitk/lib/msgs +#usr/share/gitk/lib/msgs/bg.msg +#usr/share/gitk/lib/msgs/ca.msg #usr/share/gitk/lib/msgs/de.msg #usr/share/gitk/lib/msgs/es.msg #usr/share/gitk/lib/msgs/fr.msg @@ -296,6 +301,7 @@ usr/share/git-core/templates/info/exclude #usr/share/gitk/lib/msgs/pt_br.msg #usr/share/gitk/lib/msgs/ru.msg #usr/share/gitk/lib/msgs/sv.msg +#usr/share/gitk/lib/msgs/vi.msg #usr/share/gitweb #usr/share/gitweb/gitweb.cgi #usr/share/gitweb/static @@ -303,15 +309,14 @@ usr/share/git-core/templates/info/exclude #usr/share/gitweb/static/git-logo.png #usr/share/gitweb/static/gitweb.css #usr/share/gitweb/static/gitweb.js -#usr/share/locale/da/LC_MESSAGES/git.mo +#usr/share/locale/bg/LC_MESSAGES/git.mo +#usr/share/locale/ca/LC_MESSAGES/git.mo #usr/share/locale/de/LC_MESSAGES/git.mo #usr/share/locale/fr/LC_MESSAGES/git.mo #usr/share/locale/is/LC_MESSAGES/git.mo #usr/share/locale/it/LC_MESSAGES/git.mo -#usr/share/locale/nl/LC_MESSAGES/git.mo -#usr/share/locale/pt_PT -#usr/share/locale/pt_PT/LC_MESSAGES #usr/share/locale/pt_PT/LC_MESSAGES/git.mo +#usr/share/locale/ru/LC_MESSAGES/git.mo #usr/share/locale/sv/LC_MESSAGES/git.mo #usr/share/locale/vi/LC_MESSAGES/git.mo #usr/share/locale/zh_CN/LC_MESSAGES/git.mo diff --git a/config/rootfiles/packages/libassuan b/config/rootfiles/packages/libassuan index 79b74ca..9c7aadb 100644 --- a/config/rootfiles/packages/libassuan +++ b/config/rootfiles/packages/libassuan @@ -3,6 +3,6 @@ usr/bin/libassuan-config #usr/lib/libassuan.la usr/lib/libassuan.so usr/lib/libassuan.so.0 -usr/lib/libassuan.so.0.4.3 +usr/lib/libassuan.so.0.5.0 #usr/share/aclocal/libassuan.m4 #usr/share/info/assuan.info diff --git a/config/rootfiles/packages/nano b/config/rootfiles/packages/nano index 815c3fa..67cf060 100644 --- a/config/rootfiles/packages/nano +++ b/config/rootfiles/packages/nano @@ -3,6 +3,11 @@ etc/nano/nanorc.sample usr/bin/nano usr/bin/pico usr/bin/rnano +#usr/share/doc/nano +#usr/share/doc/nano/faq.html +#usr/share/doc/nano/nano.1.html +#usr/share/doc/nano/nanorc.5.html +#usr/share/doc/nano/rnano.1.html #usr/share/info/nano.info #usr/share/man/man1/nano.1 #usr/share/man/man1/rnano.1 @@ -11,19 +16,21 @@ usr/bin/rnano usr/share/nano/asm.nanorc usr/share/nano/awk.nanorc usr/share/nano/c.nanorc +#usr/share/nano/changelog.nanorc usr/share/nano/cmake.nanorc usr/share/nano/css.nanorc usr/share/nano/debian.nanorc +usr/share/nano/default.nanorc usr/share/nano/fortran.nanorc usr/share/nano/gentoo.nanorc +#usr/share/nano/go.nanorc usr/share/nano/groff.nanorc usr/share/nano/html.nanorc usr/share/nano/java.nanorc +#usr/share/nano/javascript.nanorc +#usr/share/nano/json.nanorc +#usr/share/nano/lua.nanorc usr/share/nano/makefile.nanorc -#usr/share/nano/man-html -#usr/share/nano/man-html/nano.1.html -#usr/share/nano/man-html/nanorc.5.html -#usr/share/nano/man-html/rnano.1.html usr/share/nano/man.nanorc usr/share/nano/mgp.nanorc usr/share/nano/mutt.nanorc @@ -33,10 +40,13 @@ usr/share/nano/ocaml.nanorc usr/share/nano/patch.nanorc usr/share/nano/perl.nanorc usr/share/nano/php.nanorc +usr/share/nano/po.nanorc usr/share/nano/pov.nanorc usr/share/nano/python.nanorc usr/share/nano/ruby.nanorc usr/share/nano/sh.nanorc +usr/share/nano/spec.nanorc usr/share/nano/tcl.nanorc usr/share/nano/tex.nanorc +usr/share/nano/texinfo.nanorc usr/share/nano/xml.nanorc diff --git a/config/rootfiles/packages/powertop b/config/rootfiles/packages/powertop index 1bf6f25..d14bcee 100644 --- a/config/rootfiles/packages/powertop +++ b/config/rootfiles/packages/powertop @@ -1,4 +1,4 @@ -usr/bin/powertop +usr/sbin/powertop #usr/share/locale/de/LC_MESSAGES/powertop.mo #usr/share/locale/es/LC_MESSAGES/powertop.mo #usr/share/locale/fi/LC_MESSAGES/powertop.mo diff --git a/lfs/7zip b/lfs/7zip index c007371..f8ac672 100644 --- a/lfs/7zip +++ b/lfs/7zip @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 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,15 +24,15 @@
include Config
-VER = 4.65 +VER = 9.38.1
THISAPP = p7zip_$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP)_src_all.tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = 7zip -PAK_VER = 3 +PAK_VER = 4
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f78ed232436dc8f8be25a2f95d4e5f9a +$(DL_FILE)_MD5 = 6cba8402ccab2370d3b70c5e28b3d651
install : $(TARGET)
diff --git a/lfs/dnsmasq b/lfs/dnsmasq index a5d86e9..e4410cc 100644 --- a/lfs/dnsmasq +++ b/lfs/dnsmasq @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 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 = 2.72 +VER = 2.73
THISAPP = dnsmasq-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0256e0a71e27c8d8a5c89a0d18f3cfe2 +$(DL_FILE)_MD5 = b8bfe96d22945c8cf4466826ba9b21bd
install : $(TARGET)
@@ -73,119 +73,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0001-Add-newline-at-the-end-of-example-config-file.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0002-crash-at-startup-when-an-empty-suffix-is-supplied-to.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0003-Debian-build-fixes-for-kFreeBSD.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0004-Set-conntrack-mark-before-connect-call.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0005-Fix-typo-in-new-Dbus-code.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0006-Fit-example-conf-file-typo.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0007-Improve-RFC-compliance-when-unable-to-supply-address.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0008-Fix-conntrack-with-bind-interfaces.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0009-Use-inotify-instead-of-polling-on-Linux.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0010-Teach-the-new-inotify-code-about-symlinks.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0011-Remove-floor-on-EDNS0-packet-size-with-DNSSEC.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0012-CHANGELOG-re.-inotify.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0013-Fix-breakage-of-domain-domain-subnet-local.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0014-Remove-redundant-IN6_IS_ADDR_ULA-a-macro-defn.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0015-Eliminate-IPv6-privacy-addresses-from-interface-name.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0016-Tweak-field-width-in-cache-dump-to-avoid-truncating-.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0017-Fix-crash-in-DNSSEC-code-when-attempting-to-verify-l.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0018-Make-caching-work-for-CNAMEs-pointing-to-A-AAAA-reco.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0019-Fix-problems-validating-NSEC3-and-wildcards.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0020-Initialise-return-value.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0021-Add-ignore-address-option.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0022-Bad-packet-protection.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0023-Fix-build-failure-in-new-inotify-code-on-BSD.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0024-Implement-makefile-dependencies-on-COPTS-variable.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0025-Fix-race-condition-issue-in-makefile.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0026-DNSSEC-do-top-down-search-for-limit-of-secure-delega.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0027-Add-log-queries-extra-option-for-more-complete-loggi.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0028-Add-min-cache-ttl-option.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0029-Log-port-of-requestor-when-doing-extra-logging.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0030-Don-t-answer-from-cache-RRsets-from-wildcards-as-we-.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0031-Logs-for-DS-records-consistent.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0032-Cope-with-multiple-interfaces-with-the-same-LL-addre.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0033-Don-t-treat-SERVFAIL-as-a-recoverable-error.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0034-Add-dhcp-hostsdir-config-option.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0035-Update-German-translation.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0036-Don-t-reply-to-DHCPv6-SOLICIT-messages-when-not-conf.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0037-Allow-inotify-to-be-disabled-at-compile-time-on-Linu.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0038-Expand-inotify-code-to-dhcp-hostsdir-dhcp-optsdir-an.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0039-Update-copyrights-for-dawn-of-2015.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0040-inotify-documentation-updates.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0041-Fix-broken-ECDSA-DNSSEC-signatures.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0042-BSD-make-support.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0043-Fix-build-failure-on-openBSD.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0044-Manpage-typo-fix.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0045-Fixup-dhcp-configs-after-reading-extra-hostfiles-wit.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0046-Extra-logging-for-inotify-code.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0047-man-page-typo.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0048-Fix-get-version-script-which-returned-wrong-tag-in-s.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0049-Typos.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0050-Make-dynamic-hosts-files-work-when-no-hosts-set.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0051-Fix-trivial-memory-leaks-to-quieten-valgrind.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0052-Fix-uninitialized-value-used-in-get_client_mac.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0053-Log-parsing-utils-in-contrib-reverse-dns.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0054-Add-dnssec-timestamp-option-and-facility.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0055-Fix-last-commit-to-not-crash-if-uid-changing-not-con.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0056-New-version-of-contrib-reverse-dns.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0057-Tweak-DNSSEC-timestamp-code-to-create-file-later-rem.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0058-Fix-boilerplate-code-for-re-running-system-calls-on-.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0059-Make-address-example.com-equivalent-to-server-exampl.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0060-dhcp-set-outbound-interface-via-cmsg-in-unicast-repl.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0061-Don-t-fail-DNSSEC-when-a-signed-CNAME-dangles-into-a.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0062-Return-SERVFAIL-when-validation-abandoned.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0063-Protect-against-broken-DNSSEC-upstreams.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0064-DNSSEC-fix-for-non-ascii-characters-in-labels.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0065-Allow-control-characters-in-names-in-the-cache-handl.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0066-Fix-crash-in-last-commit.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0067-Merge-message-translations.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0068-add-tftp-no-fail-to-ignore-missing-tftp-root.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0069-Whitespace-fixes.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0070-Return-INSECURE-rather-than-BOGUS-when-DS-proved-not.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0071-Fix-compiler-warning-when-not-including-DNSSEC.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0072-Fix-crash-caused-by-looking-up-servers.bind-when-man.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0073-Fix-crash-on-receipt-of-certain-malformed-DNS-reques.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0074-Fix-crash-in-auth-code-with-odd-configuration.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0075-Auth-correct-replies-to-NS-and-SOA-in-.arpa-zones.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0076-Fix-srk-induced-crash-in-new-tftp_no_fail-code.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0077-Note-CVE-2015-3294.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0078-Log-domain-when-reporting-DNSSEC-validation-failure.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0079-Check-IP-address-command-line-arg-in-dhcp_release.c.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0080-Revert-61b838dd574c51d96fef100285a0d225824534f9-and-.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0081-Handle-domain-names-with-.-or-000-within-labels.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0082-Tweaks-to-previous-DNS-label-charset-commit.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0083-Logs-in-DHCPv6-not-suppressed-by-dhcp6-quiet.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0084-Make-get-version-work-when-repo-is-a-git-submodule.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0085-Fix-argument-order-botch-which-broke-DNSSEC-for-TCP-.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0086-Don-t-remove-RRSIG-RR-from-answers-to-ANY-queries-wh.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0087-Constify-some-DHCP-lease-management-functions.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-p.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0089-Check-IPv4-mapped-IPv6-addresses-with-stop-rebind.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc.h.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0093-Tweak-last-commit.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0094-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0095-Fix-buffer-overflow-introduced-in-2.73rc6.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0096-Remove-support-for-DNS-Extended-Label-Types.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0097-Select-correct-DHCP-context-when-in-PXE-bootserver-m.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0098-Tweak-immediately-previous-patch.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0099-Man-page-typo.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0100-Add-infiniband-to-example-config-file.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0101-Correctly-sanitise-DNS-header-bits-in-answer-when-re.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0102-DHCPv6-DHCPCONFIRM-should-be-OK-for-any-address-on-l.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0103-Handle-corner-cases-in-NSEC-coverage-checks.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0104-Add-Dbus-methods-to-create-and-delete-DHCP-leases.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0105-Add-a-couple-of-missed-logging-strings-to-the-catalo.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0106-Fix-logging-of-unknown-interface-in-bridge-interface.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0107-Extend-bridge-interface-aliasing-to-DHCPv6.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0108-Allow-router-advertisements-to-have-the-off-link-bit.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0109-Upply-bridge-interface-aliasing-to-solicited-router-.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0110-Apply-bridge-interfaces-to-unsolicited-router-advert.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0111-Documenation-updates-for-bridge-interface-and-off-li.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0112-Merge-messages-and-fix-makefile-process-to-do-this.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0113-Handle-CNAMEs-to-DS-records-when-confirming-absence-.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch cd $(DIR_APP) && sed -i src/config.h \ -e 's|/* #define HAVE_IDN */|#define HAVE_IDN|g' \ diff --git a/lfs/git b/lfs/git index 51936ab..bbec140 100644 --- a/lfs/git +++ b/lfs/git @@ -24,15 +24,15 @@
include Config
-VER = 1.8.5.2 +VER = 2.4.4
THISAPP = git-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 11 +PAK_VER = 12
DEPS = "perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = df8519044f9880f3687d863d99245282 +$(DL_FILE)_MD5 = 847787cd0616d38b0e429ea85f558c31
install : $(TARGET)
@@ -78,7 +78,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure \ - --prefix=/usr + --prefix=/usr \ + --with-libpcre \ + --with-curl \ + --with-expat
cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/libassuan b/lfs/libassuan index 9670b7b..0137d14 100644 --- a/lfs/libassuan +++ b/lfs/libassuan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 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 = 2.1.3 +VER = 2.2.0
THISAPP = libassuan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libassuan -PAK_VER = 2 +PAK_VER = 3
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b5373485419a7e2c23457d20811caabe +$(DL_FILE)_MD5 = a104faed3e97b9c302c5d67cc22b1d60
install : $(TARGET)
diff --git a/lfs/libgcrypt b/lfs/libgcrypt index 76ee3d0..0596ebf 100644 --- a/lfs/libgcrypt +++ b/lfs/libgcrypt @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 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.6.1 +VER = 1.6.3
THISAPP = libgcrypt-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a5a5060dc2f80bcac700ab0236ea47dc +$(DL_FILE)_MD5 = 4262c3aadf837500756c2051a5c4ae5e
install : $(TARGET)
diff --git a/lfs/libgpg-error b/lfs/libgpg-error index 7faf289..83c403d 100644 --- a/lfs/libgpg-error +++ b/lfs/libgpg-error @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 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.13 +VER = 1.18
THISAPP = libgpg-error-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fe0cfa7e15262ef8fdeee366109e9ff6 +$(DL_FILE)_MD5 = 12312802d2065774b787cbfc22cc04e9
install : $(TARGET)
diff --git a/lfs/libpcap b/lfs/libpcap index fa2aae8..32b2f36 100644 --- a/lfs/libpcap +++ b/lfs/libpcap @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 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.6.2 +VER = 1.7.3
THISAPP = libpcap-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5f14191c1a684a75532c739c2c4059fa +$(DL_FILE)_MD5 = 9ce284eacc02cb5491e123b875f3f63c
install : $(TARGET)
diff --git a/lfs/libusb b/lfs/libusb index b35c90c..f557bd8 100644 --- a/lfs/libusb +++ b/lfs/libusb @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 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,10 +24,10 @@
include Config
-VER = 0.1.12 +VER = 1.0.19
THISAPP = libusb-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = caf182cbc7565dac0fd72155919672e6 +$(DL_FILE)_MD5 = f9e2bb5879968467e5ca756cb4e1fa7e
install : $(TARGET)
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --disable-build-docs --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/libusb-compat b/lfs/libusb-compat new file mode 100644 index 0000000..6d63843 --- /dev/null +++ b/lfs/libusb-compat @@ -0,0 +1,80 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2015 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.1.5 + +THISAPP = libusb-compat-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 2780b6a758a1e2c2943bdbf7faf740e4 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && ./configure --prefix=/usr --disable-static + cd $(DIR_APP) && make -j $(PARALLELISM) + cd $(DIR_APP) && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/libusbx b/lfs/libusbx deleted file mode 100644 index 167b945..0000000 --- a/lfs/libusbx +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team info@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 # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.0.11 - -THISAPP = libusbx-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 9aaab6aee72f65900cc731ecbffb4cf4 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr \ - --enable-examples-build - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/nano b/lfs/nano index b034677..4eec9c1 100644 --- a/lfs/nano +++ b/lfs/nano @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 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 = 2.2.6 +VER = 2.4.1
THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 3 +PAK_VER = 5
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 03233ae480689a008eb98feb1b599807 +$(DL_FILE)_MD5 = 1c612b478f976abf8ef926480c7a3684
install : $(TARGET)
diff --git a/lfs/powertop b/lfs/powertop index f10dca9..8520f94 100644 --- a/lfs/powertop +++ b/lfs/powertop @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team info@ipfire.org # +# Copyright (C) 2015 IPFire Team info@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 = 1.13 +VER = 2.7
THISAPP = powertop-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = powertop -PAK_VER = 0 +PAK_VER = 1
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 78aa17c8f55178004223bf236654298e +$(DL_FILE)_MD5 = e0d686e47daaf7e9d89031f7763432ef
install : $(TARGET)
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - + cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install
diff --git a/lfs/python b/lfs/python index 6095e5e..22613e6 100644 --- a/lfs/python +++ b/lfs/python @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2015 IPFire Team info@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 = 2.7.3 +VER = 2.7.10
THISAPP = Python-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 62c4c1699170078c469f79ddfed21bc0 +$(DL_FILE)_MD5 = c685ef0b8e9f27b5e3db5db12b268ac6
install : $(TARGET)
@@ -70,8 +70,10 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) + rm -rf $(DIR_APP)/Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx} cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-gdbm-1.patch - cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure --prefix=/usr --enable-shared + cd $(DIR_APP) && OPT="$(CFLAGS)" ./configure \ + --prefix=/usr --enable-shared --with-system-ffi cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/python-optional-src b/lfs/python-optional-src index 3b9f1c5..d09f4a4 100644 --- a/lfs/python-optional-src +++ b/lfs/python-optional-src @@ -24,7 +24,7 @@
include Config
-VER = 2.7.3 +VER = 2.7.9
include python
diff --git a/lfs/rrdtool b/lfs/rrdtool index 0237b89..d0a1181 100644 --- a/lfs/rrdtool +++ b/lfs/rrdtool @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 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.4.7 +VER = 1.5.3
THISAPP = rrdtool-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ffe369d8921b4dfdeaaf43812100c38f +$(DL_FILE)_MD5 = 868a828cc6b10654c440a85054240ae2
install : $(TARGET)
diff --git a/lfs/tcpdump b/lfs/tcpdump index 6fe6f98..646250d 100644 --- a/lfs/tcpdump +++ b/lfs/tcpdump @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 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 = 4.6.2 +VER = 4.7.4
THISAPP = tcpdump-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tcpdump -PAK_VER = 4 +PAK_VER = 6
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 74d0d3728b3cdc60db872d842e7f1598 +$(DL_FILE)_MD5 = 58af728de36f499341918fc4b8e827c3
install : $(TARGET)
diff --git a/make.sh b/make.sh index db16c55..d3c23c6 100755 --- a/make.sh +++ b/make.sh @@ -385,7 +385,7 @@ buildipfire() { ipfiremake backup ipfiremake pkg-config ipfiremake libusb - ipfiremake libusbx + ipfiremake libusb-compat ipfiremake libpcap ipfiremake ppp ipfiremake pptp @@ -476,6 +476,7 @@ buildipfire() { ipfiremake curl ipfiremake tcl ipfiremake sqlite + ipfiremake libffi ipfiremake python ipfiremake fireinfo ipfiremake libnet @@ -579,7 +580,6 @@ buildipfire() { ipfiremake python-mechanize ipfiremake python-feedparser ipfiremake python-rssdler - ipfiremake libffi ipfiremake glib ipfiremake GeoIP ipfiremake fwhits diff --git a/src/patches/Python-2.7.9-gdbm-1.patch b/src/patches/Python-2.7.9-gdbm-1.patch new file mode 100644 index 0000000..c72b452 --- /dev/null +++ b/src/patches/Python-2.7.9-gdbm-1.patch @@ -0,0 +1,21 @@ +diff -Naur Python-2.7-org/setup.py Python-2.7/setup.py +--- Python-2.7-org/setup.py 2010-06-27 14:36:16.000000000 +0200 ++++ Python-2.7/setup.py 2010-07-13 22:23:04.000000000 +0200 +@@ -1125,7 +1125,7 @@ + 'ndbm'): + ndbm_libs = ['ndbm'] + else: +- ndbm_libs = [] ++ ndbm_libs = ['gdbm', 'gdbm_compat' ] + print "building dbm using ndbm" + dbmext = Extension('dbm', ['dbmmodule.c'], + define_macros=[ +@@ -1140,7 +1140,7 @@ + if self.compiler.find_library_file(lib_dirs, + 'gdbm_compat'): + gdbm_libs.append('gdbm_compat') +- if find_file("gdbm/ndbm.h", inc_dirs, []) is not None: ++ if find_file("ndbm.h", inc_dirs, []) is not None: + print "building dbm using gdbm" + dbmext = Extension( + 'dbm', ['dbmmodule.c'], diff --git a/src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-packets-is-broken.patch b/src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-packets-is-broken.patch new file mode 100644 index 0000000..0b12cb8 --- /dev/null +++ b/src/patches/dnsmasq/0088-Handle-UDP-packet-loss-when-fragmentation-of-large-packets-is-broken.patch @@ -0,0 +1,331 @@ +From a77cec8d58231d71cbc26615f0c0f0292c09ef54 Mon Sep 17 00:00:00 2001 +From: Simon Kelley simon@thekelleys.org.uk +Date: Fri, 8 May 2015 16:25:38 +0100 +Subject: [PATCH] Handle UDP packet loss when fragmentation of large packets + is broken. + +--- + CHANGELOG | 6 ++++++ + src/config.h | 1 + + src/dnsmasq.h | 5 +++-- + src/dnssec.c | 11 +++++++++-- + src/forward.c | 37 +++++++++++++++++++++++++++++-------- + src/network.c | 1 + + src/option.c | 18 +++++++++++------- + src/rfc1035.c | 22 ++++++---------------- + 8 files changed, 66 insertions(+), 35 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index af2b22c..d8fc57a 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -109,6 +109,12 @@ version 2.73 + by quiet-dhcp6. Thanks to J. Pablo Abonia for + spotting the problem. + ++ Try and handle net connections with broken fragmentation ++ that lose large UDP packets. If a server times out, ++ reduce the maximum UDP packet size field in the EDNS0 ++ header to 1280 bytes. If it then answers, make that ++ change permanent. ++ + + version 2.72 + Add ra-advrouter mode, for RFC-3775 mobile IPv6 support. +diff --git a/src/config.h b/src/config.h +index 8def6f2..f75fe9d 100644 +--- a/src/config.h ++++ b/src/config.h +@@ -19,6 +19,7 @@ + #define CHILD_LIFETIME 150 /* secs 'till terminated (RFC1035 suggests > 120s) */ + #define TCP_MAX_QUERIES 100 /* Maximum number of queries per incoming TCP connection */ + #define EDNS_PKTSZ 4096 /* default max EDNS.0 UDP packet from RFC5625 */ ++#define SAFE_PKTSZ 1280 /* "go anywhere" UDP packet size */ + #define KEYBLOCK_LEN 40 /* choose to mininise fragmentation when storing DNSSEC keys */ + #define DNSSEC_WORK 50 /* Max number of queries to validate one question */ + #define TIMEOUT 10 /* drop UDP queries after TIMEOUT seconds */ +diff --git a/src/dnsmasq.h b/src/dnsmasq.h +index 824a860..ab16f79 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -504,7 +504,7 @@ struct server { + char interface[IF_NAMESIZE+1]; + struct serverfd *sfd; + char *domain; /* set if this server only handles a domain. */ +- int flags, tcpfd; ++ int flags, tcpfd, edns_pktsz; + unsigned int queries, failed_queries; + #ifdef HAVE_LOOP + u32 uid; +@@ -594,6 +594,7 @@ struct hostsfile { + #define FREC_DO_QUESTION 64 + #define FREC_ADDED_PHEADER 128 + #define FREC_CHECK_NOSIGN 256 ++#define FREC_TEST_PKTSZ 512 + + #ifdef HAVE_DNSSEC + #define HASH_SIZE 20 /* SHA-1 digest size */ +@@ -1148,7 +1149,7 @@ int in_zone(struct auth_zone *zone, char *name, char **cut); + #endif + + /* dnssec.c */ +-size_t dnssec_generate_query(struct dns_header *header, char *end, char *name, int class, int type, union mysockaddr *addr); ++size_t dnssec_generate_query(struct dns_header *header, char *end, char *name, int class, int type, union mysockaddr *addr, int edns_pktsz); + int dnssec_validate_by_ds(time_t now, struct dns_header *header, size_t n, char *name, char *keyname, int class); + int dnssec_validate_ds(time_t now, struct dns_header *header, size_t plen, char *name, char *keyname, int class); + int dnssec_validate_reply(time_t now, struct dns_header *header, size_t plen, char *name, char *keyname, int *class, int *neganswer, int *nons); +diff --git a/src/dnssec.c b/src/dnssec.c +index a9e1215..e91d7c2 100644 +--- a/src/dnssec.c ++++ b/src/dnssec.c +@@ -2162,10 +2162,12 @@ int dnskey_keytag(int alg, int flags, unsigned char *key, int keylen) + } + } + +-size_t dnssec_generate_query(struct dns_header *header, char *end, char *name, int class, int type, union mysockaddr *addr) ++size_t dnssec_generate_query(struct dns_header *header, char *end, char *name, int class, ++ int type, union mysockaddr *addr, int edns_pktsz) + { + unsigned char *p; + char *types = querystr("dnssec-query", type); ++ size_t ret; + + if (addr->sa.sa_family == AF_INET) + log_query(F_NOEXTRA | F_DNSSEC | F_IPV4, name, (struct all_addr *)&addr->in.sin_addr, types); +@@ -2194,7 +2196,12 @@ size_t dnssec_generate_query(struct dns_header *header, char *end, char *name, i + PUTSHORT(type, p); + PUTSHORT(class, p); + +- return add_do_bit(header, p - (unsigned char *)header, end); ++ ret = add_do_bit(header, p - (unsigned char *)header, end); ++ ++ if (find_pseudoheader(header, ret, NULL, &p, NULL)) ++ PUTSHORT(edns_pktsz, p); ++ ++ return ret; + } + + /* Go through a domain name, find "pointers" and fix them up based on how many bytes +diff --git a/src/forward.c b/src/forward.c +index a8e403c..592243f 100644 +--- a/src/forward.c ++++ b/src/forward.c +@@ -253,6 +253,7 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr, + void *hash = &crc; + #endif + unsigned int gotname = extract_request(header, plen, daemon->namebuff, NULL); ++ unsigned char *pheader; + + (void)do_bit; + +@@ -261,19 +262,32 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr, + forward = NULL; + else if (forward || (hash && (forward = lookup_frec_by_sender(ntohs(header->id), udpaddr, hash)))) + { ++ /* If we didn't get an answer advertising a maximal packet in EDNS, ++ fall back to 1280, which should work everywhere on IPv6. ++ If that generates an answer, it will become the new default ++ for this server */ ++ forward->flags |= FREC_TEST_PKTSZ; ++ + #ifdef HAVE_DNSSEC + /* If we've already got an answer to this query, but we're awaiting keys for validation, + there's no point retrying the query, retry the key query instead...... */ + if (forward->blocking_query) + { + int fd; +- ++ ++ forward->flags &= ~FREC_TEST_PKTSZ; ++ + while (forward->blocking_query) + forward = forward->blocking_query; ++ ++ forward->flags |= FREC_TEST_PKTSZ; + + blockdata_retrieve(forward->stash, forward->stash_len, (void *)header); + plen = forward->stash_len; + ++ if (find_pseudoheader(header, plen, NULL, &pheader, NULL)) ++ PUTSHORT((forward->flags & FREC_TEST_PKTSZ) ? SAFE_PKTSZ : forward->sentto->edns_pktsz, pheader); ++ + if (forward->sentto->addr.sa.sa_family == AF_INET) + log_query(F_NOEXTRA | F_DNSSEC | F_IPV4, "retry", (struct all_addr *)&forward->sentto->addr.in.sin_addr, "dnssec"); + #ifdef HAVE_IPV6 +@@ -417,7 +431,7 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr, + plen = new_plen; + } + #endif +- ++ + while (1) + { + /* only send to servers dealing with our domain. +@@ -464,6 +478,9 @@ static int forward_query(int udpfd, union mysockaddr *udpaddr, + } + #endif + } ++ ++ if (find_pseudoheader(header, plen, NULL, &pheader, NULL)) ++ PUTSHORT((forward->flags & FREC_TEST_PKTSZ) ? SAFE_PKTSZ : start->edns_pktsz, pheader); + + if (retry_send(sendto(fd, (char *)header, plen, 0, + &start->addr.sa, +@@ -760,7 +777,6 @@ void reply_query(int fd, int family, time_t now) + } + + server = forward->sentto; +- + if ((forward->sentto->flags & SERV_TYPE) == 0) + { + if (RCODE(header) == REFUSED) +@@ -781,7 +797,12 @@ void reply_query(int fd, int family, time_t now) + if (!option_bool(OPT_ALL_SERVERS)) + daemon->last_server = server; + } +- ++ ++ /* We tried resending to this server with a smaller maximum size and got an answer. ++ Make that permanent. */ ++ if (server && (forward->flags & FREC_TEST_PKTSZ)) ++ server->edns_pktsz = SAFE_PKTSZ; ++ + /* If the answer is an error, keep the forward record in place in case + we get a good reply from another server. Kill it when we've + had replies from all to avoid filling the forwarding table when +@@ -890,7 +911,7 @@ void reply_query(int fd, int family, time_t now) + { + new->flags |= FREC_DNSKEY_QUERY; + nn = dnssec_generate_query(header, ((char *) header) + daemon->packet_buff_sz, +- daemon->keyname, forward->class, T_DNSKEY, &server->addr); ++ daemon->keyname, forward->class, T_DNSKEY, &server->addr, server->edns_pktsz); + } + else + { +@@ -899,7 +920,7 @@ void reply_query(int fd, int family, time_t now) + else + new->flags |= FREC_DS_QUERY; + nn = dnssec_generate_query(header,((char *) header) + daemon->packet_buff_sz, +- daemon->keyname, forward->class, T_DS, &server->addr); ++ daemon->keyname, forward->class, T_DS, &server->addr, server->edns_pktsz); + } + if ((hash = hash_questions(header, nn, daemon->namebuff))) + memcpy(new->hash, hash, HASH_SIZE); +@@ -1526,7 +1547,7 @@ static int tcp_check_for_unsigned_zone(time_t now, struct dns_header *header, s + + /* Can't find it in the cache, have to send a query */ + +- m = dnssec_generate_query(header, ((char *) header) + 65536, name_start, class, T_DS, &server->addr); ++ m = dnssec_generate_query(header, ((char *) header) + 65536, name_start, class, T_DS, &server->addr, server->edns_pktsz); + + *length = htons(m); + +@@ -1638,7 +1659,7 @@ static int tcp_key_recurse(time_t now, int status, struct dns_header *header, si + + another_tcp_key: + m = dnssec_generate_query(new_header, ((char *) new_header) + 65536, keyname, class, +- new_status == STAT_NEED_KEY ? T_DNSKEY : T_DS, &server->addr); ++ new_status == STAT_NEED_KEY ? T_DNSKEY : T_DS, &server->addr, server->edns_pktsz); + + *length = htons(m); + +diff --git a/src/network.c b/src/network.c +index 992f023..a1d90c8 100644 +--- a/src/network.c ++++ b/src/network.c +@@ -1396,6 +1396,7 @@ void add_update_server(int flags, + serv->domain = domain_str; + serv->next = next; + serv->queries = serv->failed_queries = 0; ++ serv->edns_pktsz = daemon->edns_pktsz; + #ifdef HAVE_LOOP + serv->uid = rand32(); + #endif +diff --git a/src/option.c b/src/option.c +index f91cfbb..c7add88 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -4498,15 +4498,19 @@ void read_opts(int argc, char **argv, char *compile_opts) + { + struct server *tmp; + for (tmp = daemon->servers; tmp; tmp = tmp->next) +- if (!(tmp->flags & SERV_HAS_SOURCE)) +- { +- if (tmp->source_addr.sa.sa_family == AF_INET) +- tmp->source_addr.in.sin_port = htons(daemon->query_port); ++ { ++ tmp->edns_pktsz = daemon->edns_pktsz; ++ ++ if (!(tmp->flags & SERV_HAS_SOURCE)) ++ { ++ if (tmp->source_addr.sa.sa_family == AF_INET) ++ tmp->source_addr.in.sin_port = htons(daemon->query_port); + #ifdef HAVE_IPV6 +- else if (tmp->source_addr.sa.sa_family == AF_INET6) +- tmp->source_addr.in6.sin6_port = htons(daemon->query_port); ++ else if (tmp->source_addr.sa.sa_family == AF_INET6) ++ tmp->source_addr.in6.sin6_port = htons(daemon->query_port); + #endif +- } ++ } ++ } + } + + if (daemon->if_addrs) +diff --git a/src/rfc1035.c b/src/rfc1035.c +index 5828055..8b1709d 100644 +--- a/src/rfc1035.c ++++ b/src/rfc1035.c +@@ -552,7 +552,7 @@ static size_t add_pseudoheader(struct dns_header *header, size_t plen, unsigned + return plen; + *p++ = 0; /* empty name */ + PUTSHORT(T_OPT, p); +- PUTSHORT(daemon->edns_pktsz, p); /* max packet length */ ++ PUTSHORT(SAFE_PKTSZ, p); /* max packet length, this will be overwritten */ + PUTSHORT(0, p); /* extended RCODE and version */ + PUTSHORT(set_do ? 0x8000 : 0, p); /* DO flag */ + lenp = p; +@@ -1537,7 +1537,6 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen, + unsigned short flag; + int q, ans, anscount = 0, addncount = 0; + int dryrun = 0, sec_reqd = 0, have_pseudoheader = 0; +- int is_sign; + struct crec *crecp; + int nxdomain = 0, auth = 1, trunc = 0, sec_data = 1; + struct mx_srv_record *rec; +@@ -1557,28 +1556,19 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen, + forward rather than answering from the cache, which doesn't include + security information, unless we're in DNSSEC validation mode. */ + +- if (find_pseudoheader(header, qlen, NULL, &pheader, &is_sign)) ++ if (find_pseudoheader(header, qlen, NULL, &pheader, NULL)) + { +- unsigned short udpsz, flags; +- unsigned char *psave = pheader; +- ++ unsigned short flags; ++ + have_pseudoheader = 1; + +- GETSHORT(udpsz, pheader); +- pheader += 2; /* ext_rcode */ ++ pheader += 4; /* udp size, ext_rcode */ + GETSHORT(flags, pheader); + + if ((sec_reqd = flags & 0x8000)) + *do_bit = 1;/* do bit */ +- *ad_reqd = 1; +- +- /* If our client is advertising a larger UDP packet size +- than we allow, trim it so that we don't get an overlarge +- response from upstream */ +- +- if (!is_sign && (udpsz > daemon->edns_pktsz)) +- PUTSHORT(daemon->edns_pktsz, psave); + ++ *ad_reqd = 1; + dryrun = 1; + } + +-- +1.7.10.4 diff --git a/src/patches/dnsmasq/0089-Check-IPv4-mapped-IPv6-addresses-with--stop-rebind.patch b/src/patches/dnsmasq/0089-Check-IPv4-mapped-IPv6-addresses-with--stop-rebind.patch new file mode 100644 index 0000000..33463b6 --- /dev/null +++ b/src/patches/dnsmasq/0089-Check-IPv4-mapped-IPv6-addresses-with--stop-rebind.patch @@ -0,0 +1,58 @@ +From b059c96dc69dfe3055c5b32b078a05c53b11ebb3 Mon Sep 17 00:00:00 2001 +From: Simon Kelley simon@thekelleys.org.uk +Date: Fri, 8 May 2015 20:25:51 +0100 +Subject: [PATCH] Check IPv4-mapped IPv6 addresses with --stop-rebind. + +--- + CHANGELOG | 3 +++ + src/rfc1035.c | 21 +++++++++++++++++---- + 2 files changed, 20 insertions(+), 4 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index d8fc57a..94a521f 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -115,6 +115,9 @@ version 2.73 + header to 1280 bytes. If it then answers, make that + change permanent. + ++ Check IPv4-mapped IPv6 addresses when --stop-rebind ++ is active. Thanks to Jordan Milne for spotting this. ++ + + version 2.72 + Add ra-advrouter mode, for RFC-3775 mobile IPv6 support. +diff --git a/src/rfc1035.c b/src/rfc1035.c +index 8b1709d..5e3f566 100644 +--- a/src/rfc1035.c ++++ b/src/rfc1035.c +@@ -1117,10 +1117,23 @@ int extract_addresses(struct dns_header *header, size_t qlen, char *name, time_t + memcpy(&addr, p1, addrlen); + + /* check for returned address in private space */ +- if (check_rebind && +- (flags & F_IPV4) && +- private_net(addr.addr.addr4, !option_bool(OPT_LOCAL_REBIND))) +- return 1; ++ if (check_rebind) ++ { ++ if ((flags & F_IPV4) && ++ private_net(addr.addr.addr4, !option_bool(OPT_LOCAL_REBIND))) ++ return 1; ++ ++#ifdef HAVE_IPV6 ++ if ((flags & F_IPV6) && ++ IN6_IS_ADDR_V4MAPPED(&addr.addr.addr6)) ++ { ++ struct in_addr v4; ++ v4.s_addr = ((const uint32_t *) (&addr.addr.addr6))[3]; ++ if (private_net(v4, !option_bool(OPT_LOCAL_REBIND))) ++ return 1; ++ } ++#endif ++ } + + #ifdef HAVE_IPSET + if (ipsets && (flags & (F_IPV4 | F_IPV6))) +-- +1.7.10.4 diff --git a/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch b/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch index d774a23..ab98b44 100644 --- a/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch +++ b/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch @@ -26,4 +26,3 @@ index 592243fd4d35..74e5ab66c423 100644 /* If the answer is an error, keep the forward record in place in case -- 2.1.0 - diff --git a/src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc-html.patch b/src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc-html.patch new file mode 100644 index 0000000..6ebfa81 --- /dev/null +++ b/src/patches/dnsmasq/0091-Pointer-to-mail-archive-mailing-list-mirror-in-doc-html.patch @@ -0,0 +1,27 @@ +From 585840b03365372679907f175b07a01c9d621ae0 Mon Sep 17 00:00:00 2001 +From: Simon Kelley simon@thekelleys.org.uk +Date: Wed, 13 May 2015 12:35:57 +0100 +Subject: [PATCH] Pointer to mail-archive mailing list mirror in doc.html. + +--- + doc.html | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/doc.html b/doc.html +index 92c9d0d..54f59bb 100644 +--- a/doc.html ++++ b/doc.html +@@ -74,7 +74,9 @@ for details. + There is a dnsmasq mailing list at <A + HREF="http://lists.thekelleys.org.uk/mailman/listinfo/dnsmasq-discuss%22%3E + http://lists.thekelleys.org.uk/mailman/listinfo/dnsmasq-discuss</A> which should be the +-first location for queries, bugreports, suggestions etc. ++first location for queries, bugreports, suggestions etc. The list is mirrored, with a ++search facility, at <A HREF="https://www.mail-archive.com/dnsmasq-discuss@lists.thekelleys.org.uk/"> ++https://www.mail-archive.com/dnsmasq-discuss@lists.thekelleys.org.uk/</A>. + You can contact me at <A + HREF="mailto:simon@thekelleys.org.uk">simon@thekelleys.org.uk</A>. + +-- +1.7.10.4 + diff --git a/src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch b/src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch index 6fb21e8..a5178cb 100644 --- a/src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch +++ b/src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch @@ -197,4 +197,3 @@ index 55526443dc84..a10e499ef768 100644 if (optno == OPTION_SNAME && done_server) -- 2.1.0 - diff --git a/src/patches/dnsmasq/0093-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch b/src/patches/dnsmasq/0093-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch new file mode 100644 index 0000000..64efd4f --- /dev/null +++ b/src/patches/dnsmasq/0093-Use-correct-DHCP-context-for-PXE-proxy-server-id.patch @@ -0,0 +1,29 @@ +From 62018e1f720fa11e83879111a4b1b3753b5c25bb Mon Sep 17 00:00:00 2001 +From: Simon Kelley simon@thekelleys.org.uk +Date: Thu, 14 May 2015 21:30:00 +0100 +Subject: [PATCH] Use correct DHCP context for PXE-proxy server-id. + +--- + src/rfc2131.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/rfc2131.c b/src/rfc2131.c +index b95f9be..70d1e59 100644 +--- a/src/rfc2131.c ++++ b/src/rfc2131.c +@@ -888,10 +888,10 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index, + + option_put(mess, end, OPTION_MESSAGE_TYPE, 1, + mess_type == DHCPDISCOVER ? DHCPOFFER : DHCPACK); +- option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(context->local.s_addr)); ++ option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(tmp->local.s_addr)); + pxe_misc(mess, end, uuid); + prune_vendor_opts(tagif_netid); +- do_encap_opts(pxe_opts(pxearch, tagif_netid, context->local, now), OPTION_VENDOR_CLASS_OPT, DHOPT_VENDOR_MATCH, mess, end, 0); ++ do_encap_opts(pxe_opts(pxearch, tagif_netid, tmp->local, now), OPTION_VENDOR_CLASS_OPT, DHOPT_VENDOR_MATCH, mess, end, 0); + + log_packet("PXE", NULL, emac, emac_len, iface_name, ignore ? "proxy-ignored" : "proxy", NULL, mess->xid); + log_tags(tagif_netid, ntohl(mess->xid)); +-- +1.7.10.4 + diff --git a/src/patches/dnsmasq/0094-Fix-buffer-overflow-introduced-in-2-73rc6.patch b/src/patches/dnsmasq/0094-Fix-buffer-overflow-introduced-in-2-73rc6.patch new file mode 100644 index 0000000..cb56c79 --- /dev/null +++ b/src/patches/dnsmasq/0094-Fix-buffer-overflow-introduced-in-2-73rc6.patch @@ -0,0 +1,49 @@ +From 5d07d77e75e0f02bc0a8f6029ffbc8b371fa804e Mon Sep 17 00:00:00 2001 +From: Simon Kelley simon@thekelleys.org.uk +Date: Fri, 15 May 2015 18:13:06 +0100 +Subject: [PATCH] Fix buffer overflow introduced in 2.73rc6. + +Fix off-by-one in code which checks for over-long domain names +in received DNS packets. This enables buffer overflow attacks +which can certainly crash dnsmasq and may allow for arbitrary +code execution. The problem was introduced in commit b8f16556d, +release 2.73rc6, so has not escaped into any stable release. +Note that the off-by-one was in the label length determination, +so the buffer can be overflowed by as many bytes as there are +labels in the name - ie, many. + +Thanks to Ron Bowes, who used lcmatuf's afl-fuzz tool to find +the problem. +--- + src/rfc1035.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/rfc1035.c b/src/rfc1035.c +index 5e3f566..a95241f 100644 +--- a/src/rfc1035.c ++++ b/src/rfc1035.c +@@ -94,8 +94,8 @@ int extract_name(struct dns_header *header, size_t plen, unsigned char **pp, + count = 256; + digs = ((count-1)>>2)+1; + +- /* output is [x<hex>/siz]. which is digs+6/7/8 chars */ +- namelen += digs+6; ++ /* output is [x<hex>/siz]. which is digs+7/8/9 chars */ ++ namelen += digs+7; + if (count > 9) + namelen++; + if (count > 99) +@@ -125,8 +125,8 @@ int extract_name(struct dns_header *header, size_t plen, unsigned char **pp, + } + else + { /* label_type = 0 -> label. */ +- namelen += l; +- if (namelen+1 >= MAXDNAME) ++ namelen += l + 1; /* include period */ ++ if (namelen >= MAXDNAME) + return 0; + if (!CHECK_LEN(header, p, plen, l)) + return 0; +-- +1.7.10.4 + diff --git a/src/patches/python-2.7rc1-ctypes-noexecmem.patch b/src/patches/python-2.7rc1-ctypes-noexecmem.patch new file mode 100644 index 0000000..ccc2e68 --- /dev/null +++ b/src/patches/python-2.7rc1-ctypes-noexecmem.patch @@ -0,0 +1,85 @@ +diff -up Python-2.7rc1/Modules/_ctypes/callbacks.c.selinux Python-2.7rc1/Modules/_ctypes/callbacks.c +--- Python-2.7rc1/Modules/_ctypes/callbacks.c.selinux 2010-05-09 10:46:46.000000000 -0400 ++++ Python-2.7rc1/Modules/_ctypes/callbacks.c 2010-06-08 08:44:18.357366200 -0400 +@@ -21,8 +21,8 @@ CThunkObject_dealloc(PyObject *_self) + Py_XDECREF(self->converters); + Py_XDECREF(self->callable); + Py_XDECREF(self->restype); +- if (self->pcl) +- _ctypes_free_closure(self->pcl); ++ if (self->pcl_write) ++ ffi_closure_free(self->pcl_write); + PyObject_GC_Del(self); + } + +@@ -391,7 +391,8 @@ static CThunkObject* CThunkObject_new(Py + return NULL; + } + +- p->pcl = NULL; ++ p->pcl_exec = NULL; ++ p->pcl_write = NULL; + memset(&p->cif, 0, sizeof(p->cif)); + p->converters = NULL; + p->callable = NULL; +@@ -421,8 +422,9 @@ CThunkObject *_ctypes_alloc_callback(PyO + + assert(CThunk_CheckExact(p)); + +- p->pcl = _ctypes_alloc_closure(); +- if (p->pcl == NULL) { ++ p->pcl_write = ffi_closure_alloc(sizeof(ffi_closure), ++ &p->pcl_exec); ++ if (p->pcl_write == NULL) { + PyErr_NoMemory(); + goto error; + } +@@ -467,7 +469,9 @@ CThunkObject *_ctypes_alloc_callback(PyO + "ffi_prep_cif failed with %d", result); + goto error; + } +- result = ffi_prep_closure(p->pcl, &p->cif, closure_fcn, p); ++ result = ffi_prep_closure_loc(p->pcl_write, &p->cif, closure_fcn, ++ p, ++ p->pcl_exec); + if (result != FFI_OK) { + PyErr_Format(PyExc_RuntimeError, + "ffi_prep_closure failed with %d", result); +diff -up Python-2.7rc1/Modules/_ctypes/_ctypes.c.selinux Python-2.7rc1/Modules/_ctypes/_ctypes.c +--- Python-2.7rc1/Modules/_ctypes/_ctypes.c.selinux 2010-05-09 10:46:46.000000000 -0400 ++++ Python-2.7rc1/Modules/_ctypes/_ctypes.c 2010-06-07 23:19:39.950146038 -0400 +@@ -3463,7 +3463,7 @@ PyCFuncPtr_new(PyTypeObject *type, PyObj + self->callable = callable; + + self->thunk = thunk; +- *(void **)self->b_ptr = (void *)thunk->pcl; ++ *(void **)self->b_ptr = (void *)thunk->pcl_exec; + + Py_INCREF((PyObject *)thunk); /* for KeepRef */ + if (-1 == KeepRef((CDataObject *)self, 0, (PyObject *)thunk)) { +diff -up Python-2.7rc1/Modules/_ctypes/ctypes.h.selinux Python-2.7rc1/Modules/_ctypes/ctypes.h +--- Python-2.7rc1/Modules/_ctypes/ctypes.h.selinux 2010-05-09 10:46:46.000000000 -0400 ++++ Python-2.7rc1/Modules/_ctypes/ctypes.h 2010-06-07 23:19:39.950146038 -0400 +@@ -95,7 +95,8 @@ struct tagCDataObject { + + typedef struct { + PyObject_VAR_HEAD +- ffi_closure *pcl; /* the C callable */ ++ ffi_closure *pcl_write; /* the C callable, writeable */ ++ void *pcl_exec; /* the C callable, executable */ + ffi_cif cif; + int flags; + PyObject *converters; +diff -up Python-2.7rc1/setup.py.selinux Python-2.7rc1/setup.py +--- Python-2.7rc1/setup.py.selinux 2010-06-07 23:19:39.922147795 -0400 ++++ Python-2.7rc1/setup.py 2010-06-07 23:19:39.951145942 -0400 +@@ -1864,8 +1864,7 @@ class PyBuildExt(build_ext): + '_ctypes/callbacks.c', + '_ctypes/callproc.c', + '_ctypes/stgdict.c', +- '_ctypes/cfield.c', +- '_ctypes/malloc_closure.c'] ++ '_ctypes/cfield.c'] + depends = ['_ctypes/ctypes.h'] + + if sys.platform == 'darwin':
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org