IPFire-SCM April 2015

ipfire-scm@lists.ipfire.org

1 participants
88 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8d1e36cca59e68d3061d2c53a535bfadebe4edf1
by git＠ipfire.org 30 Apr '15

30 Apr '15

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 8d1e36cca59e68d3061d2c53a535bfadebe4edf1 (commit) from f0dba37096d2e7dcf59e75b42cdff8b3ba613bac (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 8d1e36cca59e68d3061d2c53a535bfadebe4edf1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Apr 30 06:50:15 2015 +0200 clamav: update to 0.98.7 ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/clamav | 6 +++--- lfs/clamav | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index 7353313..d79f6e6 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -11,15 +11,15 @@ usr/bin/sigtool #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.1.25 +usr/lib/libclamav.so.6.1.26 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.1.25 +usr/lib/libclamunrar.so.6.1.26 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.1.25 +usr/lib/libclamunrar_iface.so.6.1.26 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav diff --git a/lfs/clamav b/lfs/clamav index 2e07ed0..5fd8426 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -24,7 +24,7 @@ include Config -VER = 0.98.6 +VER = 0.98.7 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 28 +PAK_VER = 29 DEPS = "" @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7f4f7e82a09e42c4ebf153d6d452d9d8 +$(DL_FILE)_MD5 = 157c601161da1c2d5a0e48ea1b49e067 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f0dba37096d2e7dcf59e75b42cdff8b3ba613bac
by git＠ipfire.org 29 Apr '15

29 Apr '15

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 f0dba37096d2e7dcf59e75b42cdff8b3ba613bac (commit) from 57e527c84a4e3952c7842637e2e4b6f252394de2 (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 f0dba37096d2e7dcf59e75b42cdff8b3ba613bac Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Apr 29 19:47:44 2015 +0200 xz: update to 5.2.1 ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/xz | 6 ++++-- config/rootfiles/{oldcore/77 => core/90}/filelists/xz | 0 lfs/xz | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) copy config/rootfiles/{oldcore/77 => core/90}/filelists/xz (100%) Difference in files: diff --git a/config/rootfiles/common/xz b/config/rootfiles/common/xz index 7c83de7..b4053d9 100644 --- a/config/rootfiles/common/xz +++ b/config/rootfiles/common/xz @@ -33,7 +33,7 @@ usr/bin/xzmore #usr/include/lzma/hardware.h #usr/include/lzma/index.h #usr/include/lzma/index_hash.h -#usr/include/lzma/lzma.h +#usr/include/lzma/lzma12.h #usr/include/lzma/stream_flags.h #usr/include/lzma/version.h #usr/include/lzma/vli.h @@ -41,7 +41,7 @@ usr/bin/xzmore #usr/lib/liblzma.la usr/lib/liblzma.so usr/lib/liblzma.so.5 -usr/lib/liblzma.so.5.0.5 +usr/lib/liblzma.so.5.2.1 #usr/lib/pkgconfig/liblzma.pc #usr/share/doc/xz #usr/share/doc/xz/AUTHORS @@ -56,6 +56,7 @@ usr/lib/liblzma.so.5.0.5 #usr/share/doc/xz/examples/01_compress_easy.c #usr/share/doc/xz/examples/02_decompress.c #usr/share/doc/xz/examples/03_compress_custom.c +#usr/share/doc/xz/examples/04_compress_easy_mt.c #usr/share/doc/xz/examples/Makefile #usr/share/doc/xz/examples_old #usr/share/doc/xz/examples_old/xz_pipe_comp.c @@ -69,6 +70,7 @@ usr/lib/liblzma.so.5.0.5 #usr/share/locale/fr/LC_MESSAGES/xz.mo #usr/share/locale/it/LC_MESSAGES/xz.mo #usr/share/locale/pl/LC_MESSAGES/xz.mo +#usr/share/locale/vi/LC_MESSAGES/xz.mo #usr/share/man/man1/lzcat.1 #usr/share/man/man1/lzcmp.1 #usr/share/man/man1/lzdiff.1 diff --git a/config/rootfiles/core/90/filelists/xz b/config/rootfiles/core/90/filelists/xz new file mode 120000 index 0000000..734e926 --- /dev/null +++ b/config/rootfiles/core/90/filelists/xz @@ -0,0 +1 @@ +../../../common/xz \ No newline at end of file diff --git a/lfs/xz b/lfs/xz index fce7159..c1d3ef7 100644 --- a/lfs/xz +++ b/lfs/xz @@ -24,7 +24,7 @@ include Config -VER = 5.0.5 +VER = 5.2.1 THISAPP = xz-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = aa17280f4521dbeebed0fbd11cd7fa30 +$(DL_FILE)_MD5 = b5e2dd95dc8498cea5354377ed89aa65 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 57e527c84a4e3952c7842637e2e4b6f252394de2
by git＠ipfire.org 29 Apr '15

29 Apr '15

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 57e527c84a4e3952c7842637e2e4b6f252394de2 (commit) from 6caea1086d15a0f6d797da31a67d132a298c5d14 (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 57e527c84a4e3952c7842637e2e4b6f252394de2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Apr 29 19:42:06 2015 +0200 kernel: update to 3.14.40 ----------------------------------------------------------------------- Summary of changes: lfs/linux | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) Difference in files: diff --git a/lfs/linux b/lfs/linux index 8b4f941..a68dda7 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,11 +24,11 @@ include Config -VER = 3.14.39 +VER = 3.14.40 -RPI_PATCHES = 3.14.39-grsec-ipfire1 -A7M_PATCHES = 3.14.39-grsec-ipfire1 -GRS_PATCHES = grsecurity-3.1-3.14.39-201504190814.patch.xz +RPI_PATCHES = 3.14.40-grsec-ipfire1 +A7M_PATCHES = 3.14.40-grsec-ipfire1 +GRS_PATCHES = grsecurity-3.1-3.14.40-201504290821.patch.xz THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -77,10 +77,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES). arm7-multi-patches-$(A7M_PATCHES).patch.xz = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) -$(DL_FILE)_MD5 = 3581855d0dbfcbe1140dfcd1406d0a91 -rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 5056304af0a199194abd0bcb00015f28 +$(DL_FILE)_MD5 = 8a66901cdcce5b2650672af41ad4a9fd +rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 375dc501711ff3ffeffdfc9848675d26 arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = a4a4103255e93bfcb02652212b0ae3fc -$(GRS_PATCHES)_MD5 = 2121d0bf825da9ff6321e2940f247c5e +$(GRS_PATCHES)_MD5 = 52d5d8dae26f4c1fd1c8d67268260bdd install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6caea1086d15a0f6d797da31a67d132a298c5d14
by git＠ipfire.org 29 Apr '15

29 Apr '15

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 6caea1086d15a0f6d797da31a67d132a298c5d14 (commit) via 85a6f39c39385d3867a95b037adfd601718735c5 (commit) via 5f206778640a463babeb4640304b94283eabe34f (commit) via e798fee78d9164b20f4b9ef14be4743c83a44676 (commit) via 2bcd81934d900845fa178bf11d138c95715f11c9 (commit) via 0596fb2d1dc21f47811322b0ca6c8fb5f0458665 (commit) via 1b1401b9df9288b9b877e38dccbdc53accfeb6e0 (commit) via b0b8729a32a4c43a76184432a7c624c58874d155 (commit) via 942299ebeb641e985ee055fde61c6576c1f1f284 (commit) via 023919034a6bcc31cd4032192862894b695fd94e (commit) via 1a8999b3d61d23094485c9d43385be35676d0a26 (commit) from 0e2f9b011b8945dbfdfd3cac9fe1a486c48732e1 (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 6caea1086d15a0f6d797da31a67d132a298c5d14 Merge: 85a6f39 0e2f9b0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 29 11:26:35 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 85a6f39c39385d3867a95b037adfd601718735c5 Merge: 5f20677 e798fee Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 29 11:26:20 2015 +0200 Merge remote-tracking branch 'stevee/core-90-ddnsctrl' into next commit 5f206778640a463babeb4640304b94283eabe34f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 29 11:24:23 2015 +0200 dnsmasq: Import more upstream fixes Fixes: #10786 Fixes DNSSEC validation when falling back to TCP. commit e798fee78d9164b20f4b9ef14be4743c83a44676 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Apr 28 21:16:54 2015 +0200 Core90: Regenerate ddns config file. commit 2bcd81934d900845fa178bf11d138c95715f11c9 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Tue Apr 28 21:06:19 2015 +0200 ddns: Add more upstream patches. commit 0596fb2d1dc21f47811322b0ca6c8fb5f0458665 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Apr 26 17:17:36 2015 +0200 Add patched ddns to core 90. commit 1b1401b9df9288b9b877e38dccbdc53accfeb6e0 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Apr 26 17:14:36 2015 +0200 Drop obsolete ddns patches. commit b0b8729a32a4c43a76184432a7c624c58874d155 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Apr 26 17:12:55 2015 +0200 ddns: Add upstream patch for fixing bug 10815. commit 942299ebeb641e985ee055fde61c6576c1f1f284 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Apr 26 16:56:24 2015 +0200 Add ddns related files to core 90. commit 023919034a6bcc31cd4032192862894b695fd94e Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Apr 26 16:52:52 2015 +0200 ddns.cgi: Use ddnsctrl for instant update. commit 1a8999b3d61d23094485c9d43385be35676d0a26 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Apr 26 16:48:45 2015 +0200 ddnsctrl: New binary. This helper binary is used to grand the ddns update client super user rights, when launched out of the webinterface. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/misc-progs | 1 + .../{oldcore/81 => core/90}/filelists/ddns | 0 config/rootfiles/core/90/filelists/files | 2 + config/rootfiles/core/90/update.sh | 2 + html/cgi-bin/ddns.cgi | 6 +- lfs/ddns | 3 + lfs/dnsmasq | 3 + src/misc-progs/Makefile | 2 +- src/misc-progs/ddnsctrl.c | 37 +++++++++ .../001-ddns-007-perform-lazy-database-init.patch | 89 ++++++++++++++++++++++ ...-also-open-database-for-search-operations.patch | 40 ++++++++++ src/patches/ddns/ddns-005-Add-changeip-com.patch | 85 --------------------- src/patches/ddns/ddns-005-SPDNS-fix-auth.patch | 23 ------ ...newline-at-the-end-of-example-config-file.patch | 2 +- ...artup-when-an-empty-suffix-is-supplied-to.patch | 2 +- .../0003-Debian-build-fixes-for-kFreeBSD.patch | 2 +- ...04-Set-conntrack-mark-before-connect-call.patch | 2 +- .../dnsmasq/0005-Fix-typo-in-new-Dbus-code.patch | 2 +- .../dnsmasq/0006-Fit-example-conf-file-typo.patch | 2 +- ...-compliance-when-unable-to-supply-address.patch | 2 +- .../0008-Fix-conntrack-with-bind-interfaces.patch | 2 +- ...9-Use-inotify-instead-of-polling-on-Linux.patch | 2 +- ...Teach-the-new-inotify-code-about-symlinks.patch | 2 +- ...ve-floor-on-EDNS0-packet-size-with-DNSSEC.patch | 2 +- .../dnsmasq/0012-CHANGELOG-re.-inotify.patch | 2 +- ...ix-breakage-of-domain-domain-subnet-local.patch | 2 +- ...ve-redundant-IN6_IS_ADDR_ULA-a-macro-defn.patch | 2 +- ...Pv6-privacy-addresses-from-interface-name.patch | 2 +- ...-width-in-cache-dump-to-avoid-truncating-.patch | 2 +- ...n-DNSSEC-code-when-attempting-to-verify-l.patch | 2 +- ...g-work-for-CNAMEs-pointing-to-A-AAAA-reco.patch | 2 +- ...x-problems-validating-NSEC3-and-wildcards.patch | 2 +- .../dnsmasq/0020-Initialise-return-value.patch | 2 +- .../dnsmasq/0021-Add-ignore-address-option.patch | 2 +- .../dnsmasq/0022-Bad-packet-protection.patch | 2 +- ...-build-failure-in-new-inotify-code-on-BSD.patch | 2 +- ...t-makefile-dependencies-on-COPTS-variable.patch | 2 +- ...0025-Fix-race-condition-issue-in-makefile.patch | 2 +- ...op-down-search-for-limit-of-secure-delega.patch | 2 +- ...ries-extra-option-for-more-complete-loggi.patch | 2 +- .../dnsmasq/0028-Add-min-cache-ttl-option.patch | 2 +- ...ort-of-requestor-when-doing-extra-logging.patch | 2 +- ...r-from-cache-RRsets-from-wildcards-as-we-.patch | 2 +- .../0031-Logs-for-DS-records-consistent.patch | 2 +- ...ultiple-interfaces-with-the-same-LL-addre.patch | 2 +- ...n-t-treat-SERVFAIL-as-a-recoverable-error.patch | 2 +- .../0034-Add-dhcp-hostsdir-config-option.patch | 2 +- .../dnsmasq/0035-Update-German-translation.patch | 2 +- ...-to-DHCPv6-SOLICIT-messages-when-not-conf.patch | 2 +- ...fy-to-be-disabled-at-compile-time-on-Linu.patch | 2 +- ...ify-code-to-dhcp-hostsdir-dhcp-optsdir-an.patch | 2 +- .../0039-Update-copyrights-for-dawn-of-2015.patch | 2 +- .../0040-inotify-documentation-updates.patch | 2 +- .../0041-Fix-broken-ECDSA-DNSSEC-signatures.patch | 2 +- src/patches/dnsmasq/0042-BSD-make-support.patch | 2 +- .../0043-Fix-build-failure-on-openBSD.patch | 2 +- src/patches/dnsmasq/0044-Manpage-typo-fix.patch | 2 +- ...configs-after-reading-extra-hostfiles-wit.patch | 2 +- .../0046-Extra-logging-for-inotify-code.patch | 2 +- src/patches/dnsmasq/0047-man-page-typo.patch | 2 +- ...sion-script-which-returned-wrong-tag-in-s.patch | 2 +- src/patches/dnsmasq/0049-Typos.patch | 2 +- ...ynamic-hosts-files-work-when-no-hosts-set.patch | 2 +- ...-trivial-memory-leaks-to-quieten-valgrind.patch | 2 +- ...ninitialized-value-used-in-get_client_mac.patch | 2 +- ...-Log-parsing-utils-in-contrib-reverse-dns.patch | 2 +- ...-Add-dnssec-timestamp-option-and-facility.patch | 2 +- ...mmit-to-not-crash-if-uid-changing-not-con.patch | 2 +- .../0056-New-version-of-contrib-reverse-dns.patch | 2 +- ...C-timestamp-code-to-create-file-later-rem.patch | 2 +- ...late-code-for-re-running-system-calls-on-.patch | 2 +- ...s-example.com-equivalent-to-server-exampl.patch | 2 +- ...tbound-interface-via-cmsg-in-unicast-repl.patch | 2 +- ...DNSSEC-when-a-signed-CNAME-dangles-into-a.patch | 2 +- ...Return-SERVFAIL-when-validation-abandoned.patch | 2 +- ...3-Protect-against-broken-DNSSEC-upstreams.patch | 2 +- ...EC-fix-for-non-ascii-characters-in-labels.patch | 2 +- ...ol-characters-in-names-in-the-cache-handl.patch | 2 +- .../dnsmasq/0066-Fix-crash-in-last-commit.patch | 2 +- .../dnsmasq/0067-Merge-message-translations.patch | 2 +- ...-tftp-no-fail-to-ignore-missing-tftp-root.patch | 2 +- src/patches/dnsmasq/0069-Whitespace-fixes.patch | 2 +- ...CURE-rather-than-BOGUS-when-DS-proved-not.patch | 2 +- ...ompiler-warning-when-not-including-DNSSEC.patch | 2 +- ...aused-by-looking-up-servers.bind-when-man.patch | 2 +- ...n-receipt-of-certain-malformed-DNS-reques.patch | 2 +- ...crash-in-auth-code-with-odd-configuration.patch | 2 +- ...rect-replies-to-NS-and-SOA-in-.arpa-zones.patch | 2 +- ...rk-induced-crash-in-new-tftp_no_fail-code.patch | 2 +- src/patches/dnsmasq/0077-Note-CVE-2015-3294.patch | 2 +- ...-when-reporting-DNSSEC-validation-failure.patch | 2 +- ...ddress-command-line-arg-in-dhcp_release.c.patch | 2 +- ...38dd574c51d96fef100285a0d225824534f9-and-.patch | 2 +- ...-domain-names-with-.-or-000-within-labels.patch | 2 +- ...eaks-to-previous-DNS-label-charset-commit.patch | 2 +- ...s-in-DHCPv6-not-suppressed-by-dhcp6-quiet.patch | 2 +- ...version-work-when-repo-is-a-git-submodule.patch | 2 +- ...t-order-botch-which-broke-DNSSEC-for-TCP-.patch | 40 ++++++++++ ...e-RRSIG-RR-from-answers-to-ANY-queries-wh.patch | 29 +++++++ ...tify-some-DHCP-lease-management-functions.patch | 57 ++++++++++++++ 100 files changed, 390 insertions(+), 197 deletions(-) copy config/rootfiles/{oldcore/81 => core/90}/filelists/ddns (100%) create mode 100644 src/misc-progs/ddnsctrl.c create mode 100644 src/patches/ddns/001-ddns-007-perform-lazy-database-init.patch create mode 100644 src/patches/ddns/002-ddns-007-also-open-database-for-search-operations.patch delete mode 100644 src/patches/ddns/ddns-005-Add-changeip-com.patch delete mode 100644 src/patches/ddns/ddns-005-SPDNS-fix-auth.patch create mode 100644 src/patches/dnsmasq/0085-Fix-argument-order-botch-which-broke-DNSSEC-for-TCP-.patch create mode 100644 src/patches/dnsmasq/0086-Don-t-remove-RRSIG-RR-from-answers-to-ANY-queries-wh.patch create mode 100644 src/patches/dnsmasq/0087-Constify-some-DHCP-lease-management-functions.patch Difference in files: diff --git a/config/rootfiles/common/misc-progs b/config/rootfiles/common/misc-progs index f33d08c..349aac7 100644 --- a/config/rootfiles/common/misc-progs +++ b/config/rootfiles/common/misc-progs @@ -3,6 +3,7 @@ usr/local/bin/addonctrl usr/local/bin/backupctrl #usr/local/bin/clamavctrl usr/local/bin/collectdctrl +usr/local/bin/ddnsctrl usr/local/bin/dhcpctrl usr/local/bin/dnsmasqctrl usr/local/bin/extrahdctrl diff --git a/config/rootfiles/core/90/filelists/ddns b/config/rootfiles/core/90/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/core/90/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files index 69d7421..35f0798 100644 --- a/config/rootfiles/core/90/filelists/files +++ b/config/rootfiles/core/90/filelists/files @@ -6,6 +6,7 @@ etc/rc.d/init.d/networking/functions.network etc/rc.d/init.d/networking/red.up/99-geoip-database etc/rc.d/rcsysinit.d/S90network-trigger srv/web/ipfire/cgi-bin/country.cgi +srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/fwhosts.cgi srv/web/ipfire/cgi-bin/geoip-block.cgi @@ -19,6 +20,7 @@ srv/web/ipfire/html/themes/maniac/include/style.css usr/lib/firewall/firewall-lib.pl usr/lib/firewall/rules.pl usr/local/bin/backupiso +usr/local/bin/ddnsctrl usr/local/bin/xt_geoip_build usr/local/bin/xt_geoip_update var/ipfire/general-functions.pl diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh index 573d5a7..2a69278 100644 --- a/config/rootfiles/core/90/update.sh +++ b/config/rootfiles/core/90/update.sh @@ -192,6 +192,8 @@ EOF fcrontab -z &>/dev/null +# Generate ddns configuration file +sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi # Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index 3e6f72f..73a41d9 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -44,10 +44,8 @@ my $settingsfile = "${General::swroot}/ddns/settings"; # Config file to store the configured ddns providers. my $datafile = "${General::swroot}/ddns/config"; -# Dynamic ddns programm call. -my @ddnsprog = ("/usr/bin/ddns", "--config", - "/var/ipfire/ddns/ddns.conf", - "update-all"); +# Call the ddnsctrl helper binary to perform the update. +my @ddnsprog = ("/usr/local/bin/ddnsctrl", "update-all"); my %settings=(); my $errormessage = ''; diff --git a/lfs/ddns b/lfs/ddns index e736e10..463ae28 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -71,6 +71,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns/001-ddns-007-perform-lazy-database-init.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns/002-ddns-007-also-open-database-for-search-operations.patch + cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure \ --prefix=/usr \ diff --git a/lfs/dnsmasq b/lfs/dnsmasq index c4b2463..b98e662 100644 --- a/lfs/dnsmasq +++ b/lfs/dnsmasq @@ -157,6 +157,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) 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-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/src/misc-progs/Makefile b/src/misc-progs/Makefile index 43e6a90..e4bf049 100644 --- a/src/misc-progs/Makefile +++ b/src/misc-progs/Makefile @@ -31,7 +31,7 @@ SUID_PROGS = squidctrl sshctrl ipfirereboot \ redctrl syslogdctrl extrahdctrl sambactrl upnpctrl tripwirectrl \ smartctrl clamavctrl addonctrl pakfire mpfirectrl wlanapctrl \ setaliases urlfilterctrl updxlratorctrl fireinfoctrl rebuildroutes \ - getconntracktable wirelessclient dnsmasqctrl torctrl + getconntracktable wirelessclient dnsmasqctrl torctrl ddnsctrl SUID_UPDX = updxsetperms OBJS = $(patsubst %,%.o,$(PROGS) $(SUID_PROGS)) diff --git a/src/misc-progs/ddnsctrl.c b/src/misc-progs/ddnsctrl.c new file mode 100644 index 0000000..7c41033 --- /dev/null +++ b/src/misc-progs/ddnsctrl.c @@ -0,0 +1,37 @@ +/* This file is part of the IPFire Firewall. +* +* This program is distributed under the terms of the GNU General Public +* Licence. See the file COPYING for details. +* +*/ + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <unistd.h> + +#include "setuid.h" + +const char *conffile = "/var/ipfire/ddns/ddns.conf"; + +int main(int argc, char *argv[]) { + char cmd[STRING_SIZE]; + + if (!(initsetuid())) + exit(1); + + if (argc < 2) { + fprintf(stderr, "\nNo argument given.\n\nddnsctrl (update-all)\n\n"); + exit(1); + } + + if (strcmp(argv[1], "update-all") == 0) { + snprintf(cmd, sizeof(cmd), "/usr/bin/ddns --config %s update-all >/dev/null 2>&1", conffile); + safe_system(cmd); + } else { + fprintf(stderr, "\nBad argument given.\n\nddnsctrl (update-all)\n\n"); + exit(1); + } + + return 0; +} diff --git a/src/patches/ddns/001-ddns-007-perform-lazy-database-init.patch b/src/patches/ddns/001-ddns-007-perform-lazy-database-init.patch new file mode 100644 index 0000000..c9b893e --- /dev/null +++ b/src/patches/ddns/001-ddns-007-perform-lazy-database-init.patch @@ -0,0 +1,89 @@ +commit 63e16feedea3639ef1f21fecbff9ed2ae256728b +Author: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Sat Apr 25 13:18:07 2015 +0200 + + Perform lazy initialization of the database + + The database will only be initialized when it is actually + needed. That makes starting up ddns a bit faster and allows + us to execute it as non-root for simple commands like + "list-providers". + + If the database path is not writable at all, the database + feature is disable and an error message is logged. This + will hopefully help us to perform the DNS update even when + there is a local misconfiguration. + +diff --git a/src/ddns/database.py b/src/ddns/database.py +index 5d4ffc9..42c3433 100644 +--- a/src/ddns/database.py ++++ b/src/ddns/database.py +@@ -20,7 +20,7 @@ + ############################################################################### + + import datetime +-import os.path ++import os + import sqlite3 + + # Initialize the logger. +@@ -31,9 +31,11 @@ logger.propagate = 1 + class DDNSDatabase(object): + def __init__(self, core, path): + self.core = core ++ self.path = path + +- # Open the database file +- self._db = self._open_database(path) ++ # We won't open the connection to the database directly ++ # so that we do not do it unnecessarily. ++ self._db = None + + def __del__(self): + self._close_database() +@@ -46,7 +48,7 @@ class DDNSDatabase(object): + conn = sqlite3.connect(path, detect_types=sqlite3.PARSE_DECLTYPES|sqlite3.PARSE_COLNAMES) + conn.isolation_level = None + +- if not exists: ++ if not exists and self.is_writable(): + logger.debug("Initialising database layout") + c = conn.cursor() + c.executescript(""" +@@ -68,12 +70,25 @@ class DDNSDatabase(object): + + return conn + ++ def is_writable(self): ++ # Check if the database file exists and is writable. ++ ret = os.access(self.path, os.W_OK) ++ if ret: ++ return True ++ ++ # If not, we check if we are able to write to the directory. ++ # In that case the database file will be created in _open_database(). ++ return os.access(os.path.dirname(self.path), os.W_OK) ++ + def _close_database(self): + if self._db: + self._db_close() + self._db = None + + def _execute(self, query, *parameters): ++ if self._db is None: ++ self._db = self._open_database(self.path) ++ + c = self._db.cursor() + try: + c.execute(query, parameters) +@@ -81,6 +96,10 @@ class DDNSDatabase(object): + c.close() + + def add_update(self, hostname, status, message=None): ++ if not self.is_writable(): ++ logger.warning("Could not log any updates because the database is not writable") ++ return ++ + self._execute("INSERT INTO updates(hostname, status, message, timestamp) \ + VALUES(?, ?, ?, ?)", hostname, status, message, datetime.datetime.utcnow()) + diff --git a/src/patches/ddns/002-ddns-007-also-open-database-for-search-operations.patch b/src/patches/ddns/002-ddns-007-also-open-database-for-search-operations.patch new file mode 100644 index 0000000..19534f3 --- /dev/null +++ b/src/patches/ddns/002-ddns-007-also-open-database-for-search-operations.patch @@ -0,0 +1,40 @@ +commit f62fa5baffe2d225604460ecd03b8159b987df8f +Author: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Sun Apr 26 20:15:33 2015 +0200 + + database: Open database for the search operations, too + +diff --git a/src/ddns/database.py b/src/ddns/database.py +index 42c3433..70a7363 100644 +--- a/src/ddns/database.py ++++ b/src/ddns/database.py +@@ -122,6 +122,9 @@ class DDNSDatabase(object): + """ + Returns the timestamp of the last update (with the given status code). + """ ++ if self._db is None: ++ self._db = self._open_database(self.path) ++ + c = self._db.cursor() + + try: +@@ -141,6 +144,9 @@ class DDNSDatabase(object): + """ + Returns the update status of the last update. + """ ++ if self._db is None: ++ self._db = self._open_database(self.path) ++ + c = self._db.cursor() + + try: +@@ -156,6 +162,9 @@ class DDNSDatabase(object): + """ + Returns the reason string for the last failed update (if any). + """ ++ if self._db is None: ++ self._db = self._open_database(self.path) ++ + c = self._db.cursor() + + try: diff --git a/src/patches/ddns/ddns-005-Add-changeip-com.patch b/src/patches/ddns/ddns-005-Add-changeip-com.patch deleted file mode 100644 index 15bcd46..0000000 --- a/src/patches/ddns/ddns-005-Add-changeip-com.patch +++ /dev/null @@ -1,85 +0,0 @@ -commit 78046ffe2187d91c61d6c2f910249b8a5be71b08 -Author: Stefan Schantl <stefan.schantl(a)ipfire.org> -Date: Wed Oct 22 21:39:09 2014 +0200 - - Add changeip.com as new provider. - - Fixes #10639. - -diff --git a/README b/README -index 5944102..6a06f4b 100644 ---- a/README -+++ b/README -@@ -49,6 +49,7 @@ INSTALLATION: - - SUPPORTED PROVIDERS: - all-inkl.com -+ changeip.com - dhs.org - dns.lightningwirelabs.com - dnspark.com -diff --git a/ddns.conf.sample b/ddns.conf.sample -index d3ac53f..0048a46 100644 ---- a/ddns.conf.sample -+++ b/ddns.conf.sample -@@ -30,6 +30,11 @@ - # secret = XYZ - # ttl = 60 - -+# [test.changeip.com] -+# provider = changeip.com -+# username = user -+# password = pass -+ - # [test.dhs.org] - # provider = dhs.org - # username = user -diff --git a/src/ddns/providers.py b/src/ddns/providers.py -index 1e88995..587d5ff 100644 ---- a/src/ddns/providers.py -+++ b/src/ddns/providers.py -@@ -539,6 +539,44 @@ class DDNSProviderBindNsupdate(DDNSProvider): - return "\n".join(scriptlet) - - -+class DDNSProviderChangeIP(DDNSProvider): -+ handle = "changeip.com" -+ name = "ChangeIP.com" -+ website = "https://changeip.com" -+ protocols = ("ipv4",) -+ -+ # Detailed information about the update api can be found here. -+ # http://www.changeip.com/accounts/knowledgebase.php?action=displayarticle&id… -+ -+ url = "https://nic.changeip.com/nic/update" -+ can_remove_records = False -+ -+ def update_protocol(self, proto): -+ data = { -+ "hostname" : self.hostname, -+ "myip" : self.get_address(proto), -+ } -+ -+ # Send update to the server. -+ try: -+ response = self.send_request(self.url, username=self.username, password=self.password, -+ data=data) -+ -+ # Handle error codes. -+ except urllib2.HTTPError, e: -+ if e.code == 422: -+ raise DDNSRequestError(_("Domain not found.")) -+ -+ raise -+ -+ # Handle success message. -+ if response.code == 200: -+ return -+ -+ # If we got here, some other update error happened. -+ raise DDNSUpdateError(_("Server response: %s") % output) -+ -+ - class DDNSProviderDHS(DDNSProvider): - handle = "dhs.org" - name = "DHS International" diff --git a/src/patches/ddns/ddns-005-SPDNS-fix-auth.patch b/src/patches/ddns/ddns-005-SPDNS-fix-auth.patch deleted file mode 100644 index 1d91baa..0000000 --- a/src/patches/ddns/ddns-005-SPDNS-fix-auth.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 25f39b4e437627bd1a49393280271d59ad28b86e -Author: Stefan Schantl <stefan.schantl(a)ipfire.org> -Date: Mon Jan 5 21:37:55 2015 +0100 - - spdns.de: Fix authentication. - - There was a simple copy and paste issue which prevents a - correct authentication with username and password against the - providers API. - -diff --git a/src/ddns/providers.py b/src/ddns/providers.py -index 587d5ff..bcfb088 100644 ---- a/src/ddns/providers.py -+++ b/src/ddns/providers.py -@@ -1271,7 +1271,7 @@ class DDNSProviderSPDNS(DDNSProtocolDynDNS2, DDNSProvider): - - @property - def password(self): -- return self.get("username") or self.token -+ return self.get("password") or self.token - - - class DDNSProviderStrato(DDNSProtocolDynDNS2, DDNSProvider): diff --git a/src/patches/dnsmasq/0001-Add-newline-at-the-end-of-example-config-file.patch b/src/patches/dnsmasq/0001-Add-newline-at-the-end-of-example-config-file.patch index a9d5a92..1d6a657 100644 --- a/src/patches/dnsmasq/0001-Add-newline-at-the-end-of-example-config-file.patch +++ b/src/patches/dnsmasq/0001-Add-newline-at-the-end-of-example-config-file.patch @@ -1,7 +1,7 @@ From f2658275b25ebfe691cdcb9fede85a3088cca168 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Thu, 25 Sep 2014 21:51:25 +0100 -Subject: [PATCH 01/78] Add newline at the end of example config file. +Subject: [PATCH 01/87] Add newline at the end of example config file. --- dnsmasq.conf.example | 2 +- diff --git a/src/patches/dnsmasq/0002-crash-at-startup-when-an-empty-suffix-is-supplied-to.patch b/src/patches/dnsmasq/0002-crash-at-startup-when-an-empty-suffix-is-supplied-to.patch index a4041ea..54a36a7 100644 --- a/src/patches/dnsmasq/0002-crash-at-startup-when-an-empty-suffix-is-supplied-to.patch +++ b/src/patches/dnsmasq/0002-crash-at-startup-when-an-empty-suffix-is-supplied-to.patch @@ -1,7 +1,7 @@ From 00cd9d551998307225312fd21f761cfa8868bd2c Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Thu, 2 Oct 2014 21:44:21 +0100 -Subject: [PATCH 02/78] crash at startup when an empty suffix is supplied to +Subject: [PATCH 02/87] crash at startup when an empty suffix is supplied to --conf-dir --- diff --git a/src/patches/dnsmasq/0003-Debian-build-fixes-for-kFreeBSD.patch b/src/patches/dnsmasq/0003-Debian-build-fixes-for-kFreeBSD.patch index ca62340..eda9685 100644 --- a/src/patches/dnsmasq/0003-Debian-build-fixes-for-kFreeBSD.patch +++ b/src/patches/dnsmasq/0003-Debian-build-fixes-for-kFreeBSD.patch @@ -1,7 +1,7 @@ From 6ac3bc0452a74e16e3d620a0757b0f8caab182ec Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Fri, 3 Oct 2014 08:48:11 +0100 -Subject: [PATCH 03/78] Debian build fixes for kFreeBSD +Subject: [PATCH 03/87] Debian build fixes for kFreeBSD --- src/tables.c | 6 +++++- diff --git a/src/patches/dnsmasq/0004-Set-conntrack-mark-before-connect-call.patch b/src/patches/dnsmasq/0004-Set-conntrack-mark-before-connect-call.patch index 2504e62..6374fef 100644 --- a/src/patches/dnsmasq/0004-Set-conntrack-mark-before-connect-call.patch +++ b/src/patches/dnsmasq/0004-Set-conntrack-mark-before-connect-call.patch @@ -1,7 +1,7 @@ From e9828b6f66b22ce8873f8d30a773137d1aef1b92 Mon Sep 17 00:00:00 2001 From: Karl Vogel <karl.vogel(a)gmail.com> Date: Fri, 3 Oct 2014 21:45:15 +0100 -Subject: [PATCH 04/78] Set conntrack mark before connect() call. +Subject: [PATCH 04/87] Set conntrack mark before connect() call. SO_MARK has to be done before issuing the connect() call on the TCP socket. diff --git a/src/patches/dnsmasq/0005-Fix-typo-in-new-Dbus-code.patch b/src/patches/dnsmasq/0005-Fix-typo-in-new-Dbus-code.patch index bec87bc..6052d45 100644 --- a/src/patches/dnsmasq/0005-Fix-typo-in-new-Dbus-code.patch +++ b/src/patches/dnsmasq/0005-Fix-typo-in-new-Dbus-code.patch @@ -1,7 +1,7 @@ From 17b475912f6a4e72797a543dad59d4d5dde6bb1b Mon Sep 17 00:00:00 2001 From: Daniel Collins <daniel.collins(a)smoothwall.net> Date: Fri, 3 Oct 2014 21:58:43 +0100 -Subject: [PATCH 05/78] Fix typo in new Dbus code. +Subject: [PATCH 05/87] Fix typo in new Dbus code. Simon's fault. --- diff --git a/src/patches/dnsmasq/0006-Fit-example-conf-file-typo.patch b/src/patches/dnsmasq/0006-Fit-example-conf-file-typo.patch index 6b5345f..d7a0207 100644 --- a/src/patches/dnsmasq/0006-Fit-example-conf-file-typo.patch +++ b/src/patches/dnsmasq/0006-Fit-example-conf-file-typo.patch @@ -1,7 +1,7 @@ From 3d9d2dd0018603a2ae4b9cd65ac6ff959f4fd8c7 Mon Sep 17 00:00:00 2001 From: Tomas Hozza <thozza(a)redhat.com> Date: Mon, 6 Oct 2014 10:46:48 +0100 -Subject: [PATCH 06/78] Fit example conf file typo. +Subject: [PATCH 06/87] Fit example conf file typo. --- dnsmasq.conf.example | 2 +- diff --git a/src/patches/dnsmasq/0007-Improve-RFC-compliance-when-unable-to-supply-address.patch b/src/patches/dnsmasq/0007-Improve-RFC-compliance-when-unable-to-supply-address.patch index ffad3b2..81e67b1 100644 --- a/src/patches/dnsmasq/0007-Improve-RFC-compliance-when-unable-to-supply-address.patch +++ b/src/patches/dnsmasq/0007-Improve-RFC-compliance-when-unable-to-supply-address.patch @@ -1,7 +1,7 @@ From b9ff5c8f435173cfa616e3c398bdc089ef690a07 Mon Sep 17 00:00:00 2001 From: Vladislav Grishenko <themiron(a)mail.ru> Date: Mon, 6 Oct 2014 14:34:24 +0100 -Subject: [PATCH 07/78] Improve RFC-compliance when unable to supply addresses +Subject: [PATCH 07/87] Improve RFC-compliance when unable to supply addresses in DHCPv6 While testing https://github.com/sbyx/odhcp6c client I have noticed it diff --git a/src/patches/dnsmasq/0008-Fix-conntrack-with-bind-interfaces.patch b/src/patches/dnsmasq/0008-Fix-conntrack-with-bind-interfaces.patch index 671a70e..a0706ba 100644 --- a/src/patches/dnsmasq/0008-Fix-conntrack-with-bind-interfaces.patch +++ b/src/patches/dnsmasq/0008-Fix-conntrack-with-bind-interfaces.patch @@ -1,7 +1,7 @@ From 98906275a02ae260fe3f82133bd79054f8315f06 Mon Sep 17 00:00:00 2001 From: Hans Dedecker <dedeckeh(a)gmail.com> Date: Tue, 9 Dec 2014 22:22:53 +0000 -Subject: [PATCH 08/78] Fix conntrack with --bind-interfaces +Subject: [PATCH 08/87] Fix conntrack with --bind-interfaces Make sure dst_addr is assigned the correct address in receive_query when OPTNOWILD is enabled so the assigned mark can be correctly retrieved and set in forward_query when diff --git a/src/patches/dnsmasq/0009-Use-inotify-instead-of-polling-on-Linux.patch b/src/patches/dnsmasq/0009-Use-inotify-instead-of-polling-on-Linux.patch index e9c51f8..28dae8c 100644 --- a/src/patches/dnsmasq/0009-Use-inotify-instead-of-polling-on-Linux.patch +++ b/src/patches/dnsmasq/0009-Use-inotify-instead-of-polling-on-Linux.patch @@ -1,7 +1,7 @@ From 193de4abf59e49c6b70d54cfe9720fcb95ca2f71 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Wed, 10 Dec 2014 17:32:16 +0000 -Subject: [PATCH 09/78] Use inotify instead of polling on Linux. +Subject: [PATCH 09/87] Use inotify instead of polling on Linux. This should solve problems people are seeing when a file changes twice within a second and thus is missed for polling. diff --git a/src/patches/dnsmasq/0010-Teach-the-new-inotify-code-about-symlinks.patch b/src/patches/dnsmasq/0010-Teach-the-new-inotify-code-about-symlinks.patch index 2f8574e..34dbf3a 100644 --- a/src/patches/dnsmasq/0010-Teach-the-new-inotify-code-about-symlinks.patch +++ b/src/patches/dnsmasq/0010-Teach-the-new-inotify-code-about-symlinks.patch @@ -1,7 +1,7 @@ From 857973e6f7e0a3d03535a9df7f9373fd7a0b65cc Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 15 Dec 2014 15:58:13 +0000 -Subject: [PATCH 10/78] Teach the new inotify code about symlinks. +Subject: [PATCH 10/87] Teach the new inotify code about symlinks. --- src/inotify.c | 43 +++++++++++++++++++++++++++---------------- diff --git a/src/patches/dnsmasq/0011-Remove-floor-on-EDNS0-packet-size-with-DNSSEC.patch b/src/patches/dnsmasq/0011-Remove-floor-on-EDNS0-packet-size-with-DNSSEC.patch index 66b6331..b7c670f 100644 --- a/src/patches/dnsmasq/0011-Remove-floor-on-EDNS0-packet-size-with-DNSSEC.patch +++ b/src/patches/dnsmasq/0011-Remove-floor-on-EDNS0-packet-size-with-DNSSEC.patch @@ -1,7 +1,7 @@ From 800c5cc1e7438818fd80f08c2d472df249a6942d Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 15 Dec 2014 17:50:15 +0000 -Subject: [PATCH 11/78] Remove floor on EDNS0 packet size with DNSSEC. +Subject: [PATCH 11/87] Remove floor on EDNS0 packet size with DNSSEC. --- CHANGELOG | 6 +++++- diff --git a/src/patches/dnsmasq/0012-CHANGELOG-re.-inotify.patch b/src/patches/dnsmasq/0012-CHANGELOG-re.-inotify.patch index 3df5076..8dbf7bd 100644 --- a/src/patches/dnsmasq/0012-CHANGELOG-re.-inotify.patch +++ b/src/patches/dnsmasq/0012-CHANGELOG-re.-inotify.patch @@ -1,7 +1,7 @@ From ad946d555dce44eb690c7699933b6ff40ab85bb6 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 15 Dec 2014 17:52:22 +0000 -Subject: [PATCH 12/78] CHANGELOG re. inotify. +Subject: [PATCH 12/87] CHANGELOG re. inotify. --- CHANGELOG | 4 ++++ diff --git a/src/patches/dnsmasq/0013-Fix-breakage-of-domain-domain-subnet-local.patch b/src/patches/dnsmasq/0013-Fix-breakage-of-domain-domain-subnet-local.patch index c80a3a2..c102b72 100644 --- a/src/patches/dnsmasq/0013-Fix-breakage-of-domain-domain-subnet-local.patch +++ b/src/patches/dnsmasq/0013-Fix-breakage-of-domain-domain-subnet-local.patch @@ -1,7 +1,7 @@ From 3ad3f3bbd4ee716a7d2fb1e115cf89bd1b1a5de9 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Tue, 16 Dec 2014 18:25:17 +0000 -Subject: [PATCH 13/78] Fix breakage of --domain=<domain>,<subnet>,local +Subject: [PATCH 13/87] Fix breakage of --domain=<domain>,<subnet>,local --- CHANGELOG | 4 ++++ diff --git a/src/patches/dnsmasq/0014-Remove-redundant-IN6_IS_ADDR_ULA-a-macro-defn.patch b/src/patches/dnsmasq/0014-Remove-redundant-IN6_IS_ADDR_ULA-a-macro-defn.patch index e322168..8d81825 100644 --- a/src/patches/dnsmasq/0014-Remove-redundant-IN6_IS_ADDR_ULA-a-macro-defn.patch +++ b/src/patches/dnsmasq/0014-Remove-redundant-IN6_IS_ADDR_ULA-a-macro-defn.patch @@ -1,7 +1,7 @@ From bd9520b7ade7098ee423acc38965376aa57feb07 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Tue, 16 Dec 2014 20:41:29 +0000 -Subject: [PATCH 14/78] Remove redundant IN6_IS_ADDR_ULA(a) macro defn. +Subject: [PATCH 14/87] Remove redundant IN6_IS_ADDR_ULA(a) macro defn. --- src/network.c | 4 ---- diff --git a/src/patches/dnsmasq/0015-Eliminate-IPv6-privacy-addresses-from-interface-name.patch b/src/patches/dnsmasq/0015-Eliminate-IPv6-privacy-addresses-from-interface-name.patch index afa5f0f..9544a16 100644 --- a/src/patches/dnsmasq/0015-Eliminate-IPv6-privacy-addresses-from-interface-name.patch +++ b/src/patches/dnsmasq/0015-Eliminate-IPv6-privacy-addresses-from-interface-name.patch @@ -1,7 +1,7 @@ From 476693678e778886b64d0b56e27eb7695cbcca99 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Wed, 17 Dec 2014 12:41:56 +0000 -Subject: [PATCH 15/78] Eliminate IPv6 privacy addresses from --interface-name +Subject: [PATCH 15/87] Eliminate IPv6 privacy addresses from --interface-name answers. --- diff --git a/src/patches/dnsmasq/0016-Tweak-field-width-in-cache-dump-to-avoid-truncating-.patch b/src/patches/dnsmasq/0016-Tweak-field-width-in-cache-dump-to-avoid-truncating-.patch index e669a50..9fb6efb 100644 --- a/src/patches/dnsmasq/0016-Tweak-field-width-in-cache-dump-to-avoid-truncating-.patch +++ b/src/patches/dnsmasq/0016-Tweak-field-width-in-cache-dump-to-avoid-truncating-.patch @@ -1,7 +1,7 @@ From 3267804598047bd1781cab91508d1bc516e5ddbb Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Wed, 17 Dec 2014 20:38:20 +0000 -Subject: [PATCH 16/78] Tweak field width in cache dump to avoid truncating +Subject: [PATCH 16/87] Tweak field width in cache dump to avoid truncating IPv6 addresses. --- diff --git a/src/patches/dnsmasq/0017-Fix-crash-in-DNSSEC-code-when-attempting-to-verify-l.patch b/src/patches/dnsmasq/0017-Fix-crash-in-DNSSEC-code-when-attempting-to-verify-l.patch index 2fe233d..45370a6 100644 --- a/src/patches/dnsmasq/0017-Fix-crash-in-DNSSEC-code-when-attempting-to-verify-l.patch +++ b/src/patches/dnsmasq/0017-Fix-crash-in-DNSSEC-code-when-attempting-to-verify-l.patch @@ -1,7 +1,7 @@ From 094b5c3d904bae9aeb3206d9f3b8348926b84975 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 21 Dec 2014 16:11:52 +0000 -Subject: [PATCH 17/78] Fix crash in DNSSEC code when attempting to verify +Subject: [PATCH 17/87] Fix crash in DNSSEC code when attempting to verify large RRs. --- diff --git a/src/patches/dnsmasq/0018-Make-caching-work-for-CNAMEs-pointing-to-A-AAAA-reco.patch b/src/patches/dnsmasq/0018-Make-caching-work-for-CNAMEs-pointing-to-A-AAAA-reco.patch index 2ec47e6..11e5178 100644 --- a/src/patches/dnsmasq/0018-Make-caching-work-for-CNAMEs-pointing-to-A-AAAA-reco.patch +++ b/src/patches/dnsmasq/0018-Make-caching-work-for-CNAMEs-pointing-to-A-AAAA-reco.patch @@ -1,7 +1,7 @@ From cbc652423403e3cef00e00240f6beef713142246 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 21 Dec 2014 21:21:53 +0000 -Subject: [PATCH 18/78] Make caching work for CNAMEs pointing to A/AAAA records +Subject: [PATCH 18/87] Make caching work for CNAMEs pointing to A/AAAA records shadowed in /etc/hosts If the answer to an upstream query is a CNAME which points to an diff --git a/src/patches/dnsmasq/0019-Fix-problems-validating-NSEC3-and-wildcards.patch b/src/patches/dnsmasq/0019-Fix-problems-validating-NSEC3-and-wildcards.patch index 7e6f821..4fe15f0 100644 --- a/src/patches/dnsmasq/0019-Fix-problems-validating-NSEC3-and-wildcards.patch +++ b/src/patches/dnsmasq/0019-Fix-problems-validating-NSEC3-and-wildcards.patch @@ -1,7 +1,7 @@ From fbc5205702c7f6f431d9f1043c553d7fb62ddfdb Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Tue, 23 Dec 2014 15:46:08 +0000 -Subject: [PATCH 19/78] Fix problems validating NSEC3 and wildcards. +Subject: [PATCH 19/87] Fix problems validating NSEC3 and wildcards. --- src/dnssec.c | 253 ++++++++++++++++++++++++++++++----------------------------- diff --git a/src/patches/dnsmasq/0020-Initialise-return-value.patch b/src/patches/dnsmasq/0020-Initialise-return-value.patch index 362c596..cfa39ce 100644 --- a/src/patches/dnsmasq/0020-Initialise-return-value.patch +++ b/src/patches/dnsmasq/0020-Initialise-return-value.patch @@ -1,7 +1,7 @@ From 83d2ed09fc0216b567d7fb2197e4ff3eae150b0d Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Tue, 23 Dec 2014 18:42:38 +0000 -Subject: [PATCH 20/78] Initialise return value. +Subject: [PATCH 20/87] Initialise return value. --- src/dnssec.c | 7 +++++-- diff --git a/src/patches/dnsmasq/0021-Add-ignore-address-option.patch b/src/patches/dnsmasq/0021-Add-ignore-address-option.patch index b8ef47d..d3fda4b 100644 --- a/src/patches/dnsmasq/0021-Add-ignore-address-option.patch +++ b/src/patches/dnsmasq/0021-Add-ignore-address-option.patch @@ -1,7 +1,7 @@ From 32fc6dbe03569d70dd394420ceb73532cf303c33 Mon Sep 17 00:00:00 2001 From: Glen Huang <curvedmark(a)gmail.com> Date: Sat, 27 Dec 2014 15:28:12 +0000 -Subject: [PATCH 21/78] Add --ignore-address option. +Subject: [PATCH 21/87] Add --ignore-address option. --- CHANGELOG | 8 ++++++++ diff --git a/src/patches/dnsmasq/0022-Bad-packet-protection.patch b/src/patches/dnsmasq/0022-Bad-packet-protection.patch index 749195f..58ac5eb 100644 --- a/src/patches/dnsmasq/0022-Bad-packet-protection.patch +++ b/src/patches/dnsmasq/0022-Bad-packet-protection.patch @@ -1,7 +1,7 @@ From 0b1008d367d44e77352134a4c5178f896f0db3e7 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 27 Dec 2014 15:33:32 +0000 -Subject: [PATCH 22/78] Bad packet protection. +Subject: [PATCH 22/87] Bad packet protection. --- src/dnssec.c | 2 +- diff --git a/src/patches/dnsmasq/0023-Fix-build-failure-in-new-inotify-code-on-BSD.patch b/src/patches/dnsmasq/0023-Fix-build-failure-in-new-inotify-code-on-BSD.patch index 28fe61a..ebfa6b1 100644 --- a/src/patches/dnsmasq/0023-Fix-build-failure-in-new-inotify-code-on-BSD.patch +++ b/src/patches/dnsmasq/0023-Fix-build-failure-in-new-inotify-code-on-BSD.patch @@ -1,7 +1,7 @@ From d310ab7ecbffce79d3d90debba621e0222f9bced Mon Sep 17 00:00:00 2001 From: Matthias Andree <matthias.andree(a)gmx.de> Date: Sat, 27 Dec 2014 15:36:38 +0000 -Subject: [PATCH 23/78] Fix build failure in new inotify code on BSD. +Subject: [PATCH 23/87] Fix build failure in new inotify code on BSD. --- src/inotify.c | 4 ++-- diff --git a/src/patches/dnsmasq/0024-Implement-makefile-dependencies-on-COPTS-variable.patch b/src/patches/dnsmasq/0024-Implement-makefile-dependencies-on-COPTS-variable.patch index 31535dc..64219ff 100644 --- a/src/patches/dnsmasq/0024-Implement-makefile-dependencies-on-COPTS-variable.patch +++ b/src/patches/dnsmasq/0024-Implement-makefile-dependencies-on-COPTS-variable.patch @@ -1,7 +1,7 @@ From 81c538efcebfce2ce4a1d3a420b6c885b8f08df9 Mon Sep 17 00:00:00 2001 From: Yousong Zhou <yszhou4tech(a)gmail.com> Date: Sat, 3 Jan 2015 16:36:14 +0000 -Subject: [PATCH 24/78] Implement makefile dependencies on COPTS variable. +Subject: [PATCH 24/87] Implement makefile dependencies on COPTS variable. --- .gitignore | 2 +- diff --git a/src/patches/dnsmasq/0025-Fix-race-condition-issue-in-makefile.patch b/src/patches/dnsmasq/0025-Fix-race-condition-issue-in-makefile.patch index a99656d..2297e6f 100644 --- a/src/patches/dnsmasq/0025-Fix-race-condition-issue-in-makefile.patch +++ b/src/patches/dnsmasq/0025-Fix-race-condition-issue-in-makefile.patch @@ -1,7 +1,7 @@ From d8dbd903d024f84a149dac2f8a674a68dfed47a3 Mon Sep 17 00:00:00 2001 From: Yousong Zhou <yszhou4tech(a)gmail.com> Date: Mon, 5 Jan 2015 17:03:35 +0000 -Subject: [PATCH 25/78] Fix race condition issue in makefile. +Subject: [PATCH 25/87] Fix race condition issue in makefile. --- Makefile | 4 +++- diff --git a/src/patches/dnsmasq/0026-DNSSEC-do-top-down-search-for-limit-of-secure-delega.patch b/src/patches/dnsmasq/0026-DNSSEC-do-top-down-search-for-limit-of-secure-delega.patch index e0c8374..6fb5db1 100644 --- a/src/patches/dnsmasq/0026-DNSSEC-do-top-down-search-for-limit-of-secure-delega.patch +++ b/src/patches/dnsmasq/0026-DNSSEC-do-top-down-search-for-limit-of-secure-delega.patch @@ -1,7 +1,7 @@ From 97e618a0e3f29465acc689d87288596b006f197e Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Wed, 7 Jan 2015 21:55:43 +0000 -Subject: [PATCH 26/78] DNSSEC: do top-down search for limit of secure +Subject: [PATCH 26/87] DNSSEC: do top-down search for limit of secure delegation. --- diff --git a/src/patches/dnsmasq/0027-Add-log-queries-extra-option-for-more-complete-loggi.patch b/src/patches/dnsmasq/0027-Add-log-queries-extra-option-for-more-complete-loggi.patch index 8812bba..41e3649 100644 --- a/src/patches/dnsmasq/0027-Add-log-queries-extra-option-for-more-complete-loggi.patch +++ b/src/patches/dnsmasq/0027-Add-log-queries-extra-option-for-more-complete-loggi.patch @@ -1,7 +1,7 @@ From 25cf5e373eb41c088d4ee5e625209c4cf6a5659e Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Fri, 9 Jan 2015 15:53:03 +0000 -Subject: [PATCH 27/78] Add --log-queries=extra option for more complete +Subject: [PATCH 27/87] Add --log-queries=extra option for more complete logging. --- diff --git a/src/patches/dnsmasq/0028-Add-min-cache-ttl-option.patch b/src/patches/dnsmasq/0028-Add-min-cache-ttl-option.patch index 2f60995..85de912 100644 --- a/src/patches/dnsmasq/0028-Add-min-cache-ttl-option.patch +++ b/src/patches/dnsmasq/0028-Add-min-cache-ttl-option.patch @@ -1,7 +1,7 @@ From 28de38768e2c7d763b9aa5b7a4d251d5e56bab0b Mon Sep 17 00:00:00 2001 From: RinSatsuki <aa65535(a)live.com> Date: Sat, 10 Jan 2015 15:22:21 +0000 -Subject: [PATCH 28/78] Add --min-cache-ttl option. +Subject: [PATCH 28/87] Add --min-cache-ttl option. --- CHANGELOG | 7 +++++++ diff --git a/src/patches/dnsmasq/0029-Log-port-of-requestor-when-doing-extra-logging.patch b/src/patches/dnsmasq/0029-Log-port-of-requestor-when-doing-extra-logging.patch index 3288ce8..afbece3 100644 --- a/src/patches/dnsmasq/0029-Log-port-of-requestor-when-doing-extra-logging.patch +++ b/src/patches/dnsmasq/0029-Log-port-of-requestor-when-doing-extra-logging.patch @@ -1,7 +1,7 @@ From 9f79ee4ae34886c0319f06d8f162b81ef79d62fb Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 12 Jan 2015 20:18:18 +0000 -Subject: [PATCH 29/78] Log port of requestor when doing extra logging. +Subject: [PATCH 29/87] Log port of requestor when doing extra logging. --- src/cache.c | 6 +++--- diff --git a/src/patches/dnsmasq/0030-Don-t-answer-from-cache-RRsets-from-wildcards-as-we-.patch b/src/patches/dnsmasq/0030-Don-t-answer-from-cache-RRsets-from-wildcards-as-we-.patch index 81b5eb2..ac206e3 100644 --- a/src/patches/dnsmasq/0030-Don-t-answer-from-cache-RRsets-from-wildcards-as-we-.patch +++ b/src/patches/dnsmasq/0030-Don-t-answer-from-cache-RRsets-from-wildcards-as-we-.patch @@ -1,7 +1,7 @@ From 5e321739db381a1d7b5964d76e9c81471d2564c9 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 12 Jan 2015 23:16:56 +0000 -Subject: [PATCH 30/78] Don't answer from cache RRsets from wildcards, as we +Subject: [PATCH 30/87] Don't answer from cache RRsets from wildcards, as we don't have NSECs. --- diff --git a/src/patches/dnsmasq/0031-Logs-for-DS-records-consistent.patch b/src/patches/dnsmasq/0031-Logs-for-DS-records-consistent.patch index ead984e..20a0e4b 100644 --- a/src/patches/dnsmasq/0031-Logs-for-DS-records-consistent.patch +++ b/src/patches/dnsmasq/0031-Logs-for-DS-records-consistent.patch @@ -1,7 +1,7 @@ From ae4624bf46b5e37ff1a9a2ba3c927e0dede95adb Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 12 Jan 2015 23:22:08 +0000 -Subject: [PATCH 31/78] Logs for DS records consistent. +Subject: [PATCH 31/87] Logs for DS records consistent. --- src/rfc1035.c | 2 +- diff --git a/src/patches/dnsmasq/0032-Cope-with-multiple-interfaces-with-the-same-LL-addre.patch b/src/patches/dnsmasq/0032-Cope-with-multiple-interfaces-with-the-same-LL-addre.patch index f571501..5b5fc07 100644 --- a/src/patches/dnsmasq/0032-Cope-with-multiple-interfaces-with-the-same-LL-addre.patch +++ b/src/patches/dnsmasq/0032-Cope-with-multiple-interfaces-with-the-same-LL-addre.patch @@ -1,7 +1,7 @@ From 393415597c8b5b09558b789ab9ac238dbe3db65d Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 18 Jan 2015 22:11:10 +0000 -Subject: [PATCH 32/78] Cope with multiple interfaces with the same LL address. +Subject: [PATCH 32/87] Cope with multiple interfaces with the same LL address. --- CHANGELOG | 4 ++++ diff --git a/src/patches/dnsmasq/0033-Don-t-treat-SERVFAIL-as-a-recoverable-error.patch b/src/patches/dnsmasq/0033-Don-t-treat-SERVFAIL-as-a-recoverable-error.patch index f381635..926885f 100644 --- a/src/patches/dnsmasq/0033-Don-t-treat-SERVFAIL-as-a-recoverable-error.patch +++ b/src/patches/dnsmasq/0033-Don-t-treat-SERVFAIL-as-a-recoverable-error.patch @@ -1,7 +1,7 @@ From 2ae195f5a71f7c5a75717845de1bd72fc7dd67f3 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 18 Jan 2015 22:20:48 +0000 -Subject: [PATCH 33/78] Don't treat SERVFAIL as a recoverable error..... +Subject: [PATCH 33/87] Don't treat SERVFAIL as a recoverable error..... --- src/forward.c | 2 +- diff --git a/src/patches/dnsmasq/0034-Add-dhcp-hostsdir-config-option.patch b/src/patches/dnsmasq/0034-Add-dhcp-hostsdir-config-option.patch index 86401c9..4ca8cc5 100644 --- a/src/patches/dnsmasq/0034-Add-dhcp-hostsdir-config-option.patch +++ b/src/patches/dnsmasq/0034-Add-dhcp-hostsdir-config-option.patch @@ -1,7 +1,7 @@ From 5f4dc5c6ca50655ab14f572c7e30815ed74cd51a Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Tue, 20 Jan 2015 20:51:02 +0000 -Subject: [PATCH 34/78] Add --dhcp-hostsdir config option. +Subject: [PATCH 34/87] Add --dhcp-hostsdir config option. --- CHANGELOG | 5 +++ diff --git a/src/patches/dnsmasq/0035-Update-German-translation.patch b/src/patches/dnsmasq/0035-Update-German-translation.patch index cd9ec56..23f1a5f 100644 --- a/src/patches/dnsmasq/0035-Update-German-translation.patch +++ b/src/patches/dnsmasq/0035-Update-German-translation.patch @@ -1,7 +1,7 @@ From fbf01f7046e75f9aa73fd4aab2a94e43386d9052 Mon Sep 17 00:00:00 2001 From: Conrad Kostecki <ck(a)conrad-kostecki.de> Date: Tue, 20 Jan 2015 21:07:56 +0000 -Subject: [PATCH 35/78] Update German translation. +Subject: [PATCH 35/87] Update German translation. --- po/de.po | 101 +++++++++++++++++++++++++++++---------------------------------- diff --git a/src/patches/dnsmasq/0036-Don-t-reply-to-DHCPv6-SOLICIT-messages-when-not-conf.patch b/src/patches/dnsmasq/0036-Don-t-reply-to-DHCPv6-SOLICIT-messages-when-not-conf.patch index 144a254..c89b678 100644 --- a/src/patches/dnsmasq/0036-Don-t-reply-to-DHCPv6-SOLICIT-messages-when-not-conf.patch +++ b/src/patches/dnsmasq/0036-Don-t-reply-to-DHCPv6-SOLICIT-messages-when-not-conf.patch @@ -1,7 +1,7 @@ From 61b838dd574c51d96fef100285a0d225824534f9 Mon Sep 17 00:00:00 2001 From: Win King Wan <pinwing+dnsmasq(a)gmail.com> Date: Wed, 21 Jan 2015 20:41:48 +0000 -Subject: [PATCH 36/78] Don't reply to DHCPv6 SOLICIT messages when not +Subject: [PATCH 36/87] Don't reply to DHCPv6 SOLICIT messages when not configured for statefull DHCPv6. --- diff --git a/src/patches/dnsmasq/0037-Allow-inotify-to-be-disabled-at-compile-time-on-Linu.patch b/src/patches/dnsmasq/0037-Allow-inotify-to-be-disabled-at-compile-time-on-Linu.patch index 99606cc..1617095 100644 --- a/src/patches/dnsmasq/0037-Allow-inotify-to-be-disabled-at-compile-time-on-Linu.patch +++ b/src/patches/dnsmasq/0037-Allow-inotify-to-be-disabled-at-compile-time-on-Linu.patch @@ -1,7 +1,7 @@ From 0491805d2ff6e7727f0272c94fd97d9897d1e22c Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 26 Jan 2015 11:23:43 +0000 -Subject: [PATCH 37/78] Allow inotify to be disabled at compile time on Linux. +Subject: [PATCH 37/87] Allow inotify to be disabled at compile time on Linux. --- CHANGELOG | 4 +++- diff --git a/src/patches/dnsmasq/0038-Expand-inotify-code-to-dhcp-hostsdir-dhcp-optsdir-an.patch b/src/patches/dnsmasq/0038-Expand-inotify-code-to-dhcp-hostsdir-dhcp-optsdir-an.patch index db0d4fc..fee3aae 100644 --- a/src/patches/dnsmasq/0038-Expand-inotify-code-to-dhcp-hostsdir-dhcp-optsdir-an.patch +++ b/src/patches/dnsmasq/0038-Expand-inotify-code-to-dhcp-hostsdir-dhcp-optsdir-an.patch @@ -1,7 +1,7 @@ From 70d1873dd9e70041ed4bb88c69d5b886b7cc634c Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 31 Jan 2015 19:59:29 +0000 -Subject: [PATCH 38/78] Expand inotify code to dhcp-hostsdir, dhcp-optsdir and +Subject: [PATCH 38/87] Expand inotify code to dhcp-hostsdir, dhcp-optsdir and hostsdir. --- diff --git a/src/patches/dnsmasq/0039-Update-copyrights-for-dawn-of-2015.patch b/src/patches/dnsmasq/0039-Update-copyrights-for-dawn-of-2015.patch index 28282c2..58a4ce6 100644 --- a/src/patches/dnsmasq/0039-Update-copyrights-for-dawn-of-2015.patch +++ b/src/patches/dnsmasq/0039-Update-copyrights-for-dawn-of-2015.patch @@ -1,7 +1,7 @@ From aff3396280e944833f0e23d834aa6acd5fe2605a Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 31 Jan 2015 20:13:40 +0000 -Subject: [PATCH 39/78] Update copyrights for dawn of 2015. +Subject: [PATCH 39/87] Update copyrights for dawn of 2015. --- Makefile | 2 +- diff --git a/src/patches/dnsmasq/0040-inotify-documentation-updates.patch b/src/patches/dnsmasq/0040-inotify-documentation-updates.patch index 2fb831c..bd0ce4d 100644 --- a/src/patches/dnsmasq/0040-inotify-documentation-updates.patch +++ b/src/patches/dnsmasq/0040-inotify-documentation-updates.patch @@ -1,7 +1,7 @@ From 3d04f46334d0e345f589eda1372e638b946fe637 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 31 Jan 2015 21:59:13 +0000 -Subject: [PATCH 40/78] inotify documentation updates. +Subject: [PATCH 40/87] inotify documentation updates. --- man/dnsmasq.8 | 11 +++++++++-- diff --git a/src/patches/dnsmasq/0041-Fix-broken-ECDSA-DNSSEC-signatures.patch b/src/patches/dnsmasq/0041-Fix-broken-ECDSA-DNSSEC-signatures.patch index 68e1ca6..be9122c 100644 --- a/src/patches/dnsmasq/0041-Fix-broken-ECDSA-DNSSEC-signatures.patch +++ b/src/patches/dnsmasq/0041-Fix-broken-ECDSA-DNSSEC-signatures.patch @@ -1,7 +1,7 @@ From 6ef15b34ca83c62a939f69356d5c3f7a6bfef3d0 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 31 Jan 2015 22:44:26 +0000 -Subject: [PATCH 41/78] Fix broken ECDSA DNSSEC signatures. +Subject: [PATCH 41/87] Fix broken ECDSA DNSSEC signatures. --- CHANGELOG | 2 ++ diff --git a/src/patches/dnsmasq/0042-BSD-make-support.patch b/src/patches/dnsmasq/0042-BSD-make-support.patch index ced5868..a60c1bd 100644 --- a/src/patches/dnsmasq/0042-BSD-make-support.patch +++ b/src/patches/dnsmasq/0042-BSD-make-support.patch @@ -1,7 +1,7 @@ From 106266761828a0acb006346ae47bf031dee46a5d Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 1 Feb 2015 00:15:16 +0000 -Subject: [PATCH 42/78] BSD make support +Subject: [PATCH 42/87] BSD make support --- Makefile | 6 ++++-- diff --git a/src/patches/dnsmasq/0043-Fix-build-failure-on-openBSD.patch b/src/patches/dnsmasq/0043-Fix-build-failure-on-openBSD.patch index 2aa543d..0fcc8cd 100644 --- a/src/patches/dnsmasq/0043-Fix-build-failure-on-openBSD.patch +++ b/src/patches/dnsmasq/0043-Fix-build-failure-on-openBSD.patch @@ -1,7 +1,7 @@ From 8d8a54ec79d9f96979fabbd97b1dd2ddebc7d78f Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 1 Feb 2015 21:48:46 +0000 -Subject: [PATCH 43/78] Fix build failure on openBSD. +Subject: [PATCH 43/87] Fix build failure on openBSD. --- src/tables.c | 2 +- diff --git a/src/patches/dnsmasq/0044-Manpage-typo-fix.patch b/src/patches/dnsmasq/0044-Manpage-typo-fix.patch index ef606e8..dd45634 100644 --- a/src/patches/dnsmasq/0044-Manpage-typo-fix.patch +++ b/src/patches/dnsmasq/0044-Manpage-typo-fix.patch @@ -1,7 +1,7 @@ From d36b732c4cfa91ea09af64b5dc0f3a85a075e5bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thi=C3=A9baud=20Weksteen?= <thiebaud(a)weksteen.fr> Date: Mon, 2 Feb 2015 21:37:27 +0000 -Subject: [PATCH 44/78] Manpage typo fix. +Subject: [PATCH 44/87] Manpage typo fix. --- man/dnsmasq.8 | 2 +- diff --git a/src/patches/dnsmasq/0045-Fixup-dhcp-configs-after-reading-extra-hostfiles-wit.patch b/src/patches/dnsmasq/0045-Fixup-dhcp-configs-after-reading-extra-hostfiles-wit.patch index 1f87a9e..7a719f8 100644 --- a/src/patches/dnsmasq/0045-Fixup-dhcp-configs-after-reading-extra-hostfiles-wit.patch +++ b/src/patches/dnsmasq/0045-Fixup-dhcp-configs-after-reading-extra-hostfiles-wit.patch @@ -1,7 +1,7 @@ From 2941d3ac898cf84b544e47c9735c5e4111711db1 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 2 Feb 2015 22:36:42 +0000 -Subject: [PATCH 45/78] Fixup dhcp-configs after reading extra hostfiles with +Subject: [PATCH 45/87] Fixup dhcp-configs after reading extra hostfiles with inotify. --- diff --git a/src/patches/dnsmasq/0046-Extra-logging-for-inotify-code.patch b/src/patches/dnsmasq/0046-Extra-logging-for-inotify-code.patch index 754d0a8..3db945d 100644 --- a/src/patches/dnsmasq/0046-Extra-logging-for-inotify-code.patch +++ b/src/patches/dnsmasq/0046-Extra-logging-for-inotify-code.patch @@ -1,7 +1,7 @@ From f9c863708c6b0aea31ff7a466647685dc739de50 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Tue, 3 Feb 2015 21:52:48 +0000 -Subject: [PATCH 46/78] Extra logging for inotify code. +Subject: [PATCH 46/87] Extra logging for inotify code. --- src/cache.c | 9 ++++----- diff --git a/src/patches/dnsmasq/0047-man-page-typo.patch b/src/patches/dnsmasq/0047-man-page-typo.patch index 9fdd87e..5a81152 100644 --- a/src/patches/dnsmasq/0047-man-page-typo.patch +++ b/src/patches/dnsmasq/0047-man-page-typo.patch @@ -1,7 +1,7 @@ From efb8b5566aafc1f3ce18514a2df93af5a2e4998c Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 7 Feb 2015 22:36:34 +0000 -Subject: [PATCH 47/78] man page typo. +Subject: [PATCH 47/87] man page typo. --- man/dnsmasq.8 | 1 + diff --git a/src/patches/dnsmasq/0048-Fix-get-version-script-which-returned-wrong-tag-in-s.patch b/src/patches/dnsmasq/0048-Fix-get-version-script-which-returned-wrong-tag-in-s.patch index fd0da9b..e69e0a6 100644 --- a/src/patches/dnsmasq/0048-Fix-get-version-script-which-returned-wrong-tag-in-s.patch +++ b/src/patches/dnsmasq/0048-Fix-get-version-script-which-returned-wrong-tag-in-s.patch @@ -1,7 +1,7 @@ From f4f400776b3c1aa303d1a0fcd500f0ab5bc970f2 Mon Sep 17 00:00:00 2001 From: Shantanu Gadgil <shantanugadgil(a)yahoo.com> Date: Wed, 11 Feb 2015 20:16:59 +0000 -Subject: [PATCH 48/78] Fix get-version script which returned wrong tag in some +Subject: [PATCH 48/87] Fix get-version script which returned wrong tag in some situations. --- diff --git a/src/patches/dnsmasq/0049-Typos.patch b/src/patches/dnsmasq/0049-Typos.patch index ab57c77..e78f185 100644 --- a/src/patches/dnsmasq/0049-Typos.patch +++ b/src/patches/dnsmasq/0049-Typos.patch @@ -1,7 +1,7 @@ From 8ff70de618eb7de9147dbfbd4deca4a2dd62f0cb Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 14 Feb 2015 20:02:37 +0000 -Subject: [PATCH 49/78] Typos. +Subject: [PATCH 49/87] Typos. --- src/inotify.c | 3 ++- diff --git a/src/patches/dnsmasq/0050-Make-dynamic-hosts-files-work-when-no-hosts-set.patch b/src/patches/dnsmasq/0050-Make-dynamic-hosts-files-work-when-no-hosts-set.patch index df3bf18..7b5a92d 100644 --- a/src/patches/dnsmasq/0050-Make-dynamic-hosts-files-work-when-no-hosts-set.patch +++ b/src/patches/dnsmasq/0050-Make-dynamic-hosts-files-work-when-no-hosts-set.patch @@ -1,7 +1,7 @@ From caeea190f12efd20139f694aac4942d1ac00019f Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 14 Feb 2015 20:08:56 +0000 -Subject: [PATCH 50/78] Make dynamic hosts files work when --no-hosts set. +Subject: [PATCH 50/87] Make dynamic hosts files work when --no-hosts set. --- src/cache.c | 21 +++++++++++---------- diff --git a/src/patches/dnsmasq/0051-Fix-trivial-memory-leaks-to-quieten-valgrind.patch b/src/patches/dnsmasq/0051-Fix-trivial-memory-leaks-to-quieten-valgrind.patch index ad7ecd7..cfc7b00 100644 --- a/src/patches/dnsmasq/0051-Fix-trivial-memory-leaks-to-quieten-valgrind.patch +++ b/src/patches/dnsmasq/0051-Fix-trivial-memory-leaks-to-quieten-valgrind.patch @@ -1,7 +1,7 @@ From 28b879ac47b872af6e8c5e86d76806c69338434d Mon Sep 17 00:00:00 2001 From: Chen Wei <weichen302(a)icloud.com> Date: Tue, 17 Feb 2015 22:07:35 +0000 -Subject: [PATCH 51/78] Fix trivial memory leaks to quieten valgrind. +Subject: [PATCH 51/87] Fix trivial memory leaks to quieten valgrind. --- src/dnsmasq.c | 2 ++ diff --git a/src/patches/dnsmasq/0052-Fix-uninitialized-value-used-in-get_client_mac.patch b/src/patches/dnsmasq/0052-Fix-uninitialized-value-used-in-get_client_mac.patch index 9556f3b..0a50689 100644 --- a/src/patches/dnsmasq/0052-Fix-uninitialized-value-used-in-get_client_mac.patch +++ b/src/patches/dnsmasq/0052-Fix-uninitialized-value-used-in-get_client_mac.patch @@ -1,7 +1,7 @@ From 0705a7e2d57654b27c7e14f35ca77241c1821f4d Mon Sep 17 00:00:00 2001 From: Tomas Hozza <thozza(a)redhat.com> Date: Mon, 23 Feb 2015 21:26:26 +0000 -Subject: [PATCH 52/78] Fix uninitialized value used in get_client_mac() +Subject: [PATCH 52/87] Fix uninitialized value used in get_client_mac() --- src/dhcp6.c | 4 +++- diff --git a/src/patches/dnsmasq/0053-Log-parsing-utils-in-contrib-reverse-dns.patch b/src/patches/dnsmasq/0053-Log-parsing-utils-in-contrib-reverse-dns.patch index 03d20f6..854771a 100644 --- a/src/patches/dnsmasq/0053-Log-parsing-utils-in-contrib-reverse-dns.patch +++ b/src/patches/dnsmasq/0053-Log-parsing-utils-in-contrib-reverse-dns.patch @@ -1,7 +1,7 @@ From 47b9ac59c715827252ae6e6732903c3dabb697fb Mon Sep 17 00:00:00 2001 From: Joachim Zobel <jz-2014(a)heute-morgen.de> Date: Mon, 23 Feb 2015 21:38:11 +0000 -Subject: [PATCH 53/78] Log parsing utils in contrib/reverse-dns +Subject: [PATCH 53/87] Log parsing utils in contrib/reverse-dns --- contrib/reverse-dns/README | 18 ++++++++++++++++++ diff --git a/src/patches/dnsmasq/0054-Add-dnssec-timestamp-option-and-facility.patch b/src/patches/dnsmasq/0054-Add-dnssec-timestamp-option-and-facility.patch index 2d47566..cb9e86f 100644 --- a/src/patches/dnsmasq/0054-Add-dnssec-timestamp-option-and-facility.patch +++ b/src/patches/dnsmasq/0054-Add-dnssec-timestamp-option-and-facility.patch @@ -1,7 +1,7 @@ From f6e62e2af96f5fa0d1e3d93167a93a8f09bf6e61 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 1 Mar 2015 18:17:54 +0000 -Subject: [PATCH 54/78] Add --dnssec-timestamp option and facility. +Subject: [PATCH 54/87] Add --dnssec-timestamp option and facility. --- CHANGELOG | 6 +++++ diff --git a/src/patches/dnsmasq/0055-Fix-last-commit-to-not-crash-if-uid-changing-not-con.patch b/src/patches/dnsmasq/0055-Fix-last-commit-to-not-crash-if-uid-changing-not-con.patch index ba48df3..40b6607 100644 --- a/src/patches/dnsmasq/0055-Fix-last-commit-to-not-crash-if-uid-changing-not-con.patch +++ b/src/patches/dnsmasq/0055-Fix-last-commit-to-not-crash-if-uid-changing-not-con.patch @@ -1,7 +1,7 @@ From 9003b50b13da624ca45f3e0cf99abb623b8d026b Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 2 Mar 2015 22:47:23 +0000 -Subject: [PATCH 55/78] Fix last commit to not crash if uid changing not +Subject: [PATCH 55/87] Fix last commit to not crash if uid changing not configured. --- diff --git a/src/patches/dnsmasq/0056-New-version-of-contrib-reverse-dns.patch b/src/patches/dnsmasq/0056-New-version-of-contrib-reverse-dns.patch index dc52d90..f6f7873 100644 --- a/src/patches/dnsmasq/0056-New-version-of-contrib-reverse-dns.patch +++ b/src/patches/dnsmasq/0056-New-version-of-contrib-reverse-dns.patch @@ -1,7 +1,7 @@ From 4c960fa90a975d20f75a1ecabd217247f1922c8f Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Wed, 4 Mar 2015 20:32:26 +0000 -Subject: [PATCH 56/78] New version of contrib/reverse-dns +Subject: [PATCH 56/87] New version of contrib/reverse-dns --- contrib/reverse-dns/README | 22 +++--- diff --git a/src/patches/dnsmasq/0057-Tweak-DNSSEC-timestamp-code-to-create-file-later-rem.patch b/src/patches/dnsmasq/0057-Tweak-DNSSEC-timestamp-code-to-create-file-later-rem.patch index d17d23f..924e3dc 100644 --- a/src/patches/dnsmasq/0057-Tweak-DNSSEC-timestamp-code-to-create-file-later-rem.patch +++ b/src/patches/dnsmasq/0057-Tweak-DNSSEC-timestamp-code-to-create-file-later-rem.patch @@ -1,7 +1,7 @@ From 360f2513ab12a9bf1e262d388dd2ea8a566590a3 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 7 Mar 2015 18:28:06 +0000 -Subject: [PATCH 57/78] Tweak DNSSEC timestamp code to create file later, +Subject: [PATCH 57/87] Tweak DNSSEC timestamp code to create file later, removing need to chown it. --- diff --git a/src/patches/dnsmasq/0058-Fix-boilerplate-code-for-re-running-system-calls-on-.patch b/src/patches/dnsmasq/0058-Fix-boilerplate-code-for-re-running-system-calls-on-.patch index 4dd9568..ded0984 100644 --- a/src/patches/dnsmasq/0058-Fix-boilerplate-code-for-re-running-system-calls-on-.patch +++ b/src/patches/dnsmasq/0058-Fix-boilerplate-code-for-re-running-system-calls-on-.patch @@ -1,7 +1,7 @@ From ff841ebf5a5d6864ff48571f607c32ce80dbb75a Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Wed, 11 Mar 2015 21:36:30 +0000 -Subject: [PATCH 58/78] Fix boilerplate code for re-running system calls on +Subject: [PATCH 58/87] Fix boilerplate code for re-running system calls on EINTR and EAGAIN etc. The nasty code with static variable in retry_send() which diff --git a/src/patches/dnsmasq/0059-Make-address-example.com-equivalent-to-server-exampl.patch b/src/patches/dnsmasq/0059-Make-address-example.com-equivalent-to-server-exampl.patch index a072474..f8091d4 100644 --- a/src/patches/dnsmasq/0059-Make-address-example.com-equivalent-to-server-exampl.patch +++ b/src/patches/dnsmasq/0059-Make-address-example.com-equivalent-to-server-exampl.patch @@ -1,7 +1,7 @@ From 979fe86bc8693f660eddea232ae39cbbb50b294c Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Thu, 19 Mar 2015 22:50:22 +0000 -Subject: [PATCH 59/78] Make --address=/example.com/ equivalent to +Subject: [PATCH 59/87] Make --address=/example.com/ equivalent to --server=/example.com/ --- diff --git a/src/patches/dnsmasq/0060-dhcp-set-outbound-interface-via-cmsg-in-unicast-repl.patch b/src/patches/dnsmasq/0060-dhcp-set-outbound-interface-via-cmsg-in-unicast-repl.patch index 429f56a..dcf1a3c 100644 --- a/src/patches/dnsmasq/0060-dhcp-set-outbound-interface-via-cmsg-in-unicast-repl.patch +++ b/src/patches/dnsmasq/0060-dhcp-set-outbound-interface-via-cmsg-in-unicast-repl.patch @@ -1,7 +1,7 @@ From 65c721200023ef0023114459a8d12f8b0a24cfd8 Mon Sep 17 00:00:00 2001 From: Lung-Pin Chang <changlp(a)cs.nctu.edu.tw> Date: Thu, 19 Mar 2015 23:22:21 +0000 -Subject: [PATCH 60/78] dhcp: set outbound interface via cmsg in unicast reply +Subject: [PATCH 60/87] dhcp: set outbound interface via cmsg in unicast reply If multiple routes to the same network exist, Linux blindly picks the first interface (route) based on destination address, which might not be diff --git a/src/patches/dnsmasq/0061-Don-t-fail-DNSSEC-when-a-signed-CNAME-dangles-into-a.patch b/src/patches/dnsmasq/0061-Don-t-fail-DNSSEC-when-a-signed-CNAME-dangles-into-a.patch index aece6fa..7f2b1b0 100644 --- a/src/patches/dnsmasq/0061-Don-t-fail-DNSSEC-when-a-signed-CNAME-dangles-into-a.patch +++ b/src/patches/dnsmasq/0061-Don-t-fail-DNSSEC-when-a-signed-CNAME-dangles-into-a.patch @@ -1,7 +1,7 @@ From 8805283088d670baecb92569252c01cf754cda51 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Thu, 26 Mar 2015 21:15:43 +0000 -Subject: [PATCH 61/78] Don't fail DNSSEC when a signed CNAME dangles into an +Subject: [PATCH 61/87] Don't fail DNSSEC when a signed CNAME dangles into an unsigned zone. --- diff --git a/src/patches/dnsmasq/0062-Return-SERVFAIL-when-validation-abandoned.patch b/src/patches/dnsmasq/0062-Return-SERVFAIL-when-validation-abandoned.patch index 81280dc..496776d 100644 --- a/src/patches/dnsmasq/0062-Return-SERVFAIL-when-validation-abandoned.patch +++ b/src/patches/dnsmasq/0062-Return-SERVFAIL-when-validation-abandoned.patch @@ -1,7 +1,7 @@ From 150162bc37170a6edae9d488435e836b1e4e3a4e Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Fri, 27 Mar 2015 09:58:26 +0000 -Subject: [PATCH 62/78] Return SERVFAIL when validation abandoned. +Subject: [PATCH 62/87] Return SERVFAIL when validation abandoned. --- src/forward.c | 11 +++++++++-- diff --git a/src/patches/dnsmasq/0063-Protect-against-broken-DNSSEC-upstreams.patch b/src/patches/dnsmasq/0063-Protect-against-broken-DNSSEC-upstreams.patch index bd79a1a..25ae12e 100644 --- a/src/patches/dnsmasq/0063-Protect-against-broken-DNSSEC-upstreams.patch +++ b/src/patches/dnsmasq/0063-Protect-against-broken-DNSSEC-upstreams.patch @@ -1,7 +1,7 @@ From 0b8a5a30a77331974ba24a04e43e720585dfbc61 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Fri, 27 Mar 2015 11:44:55 +0000 -Subject: [PATCH 63/78] Protect against broken DNSSEC upstreams. +Subject: [PATCH 63/87] Protect against broken DNSSEC upstreams. --- src/dnssec.c | 7 +++++-- diff --git a/src/patches/dnsmasq/0064-DNSSEC-fix-for-non-ascii-characters-in-labels.patch b/src/patches/dnsmasq/0064-DNSSEC-fix-for-non-ascii-characters-in-labels.patch index c020af5..41730b8 100644 --- a/src/patches/dnsmasq/0064-DNSSEC-fix-for-non-ascii-characters-in-labels.patch +++ b/src/patches/dnsmasq/0064-DNSSEC-fix-for-non-ascii-characters-in-labels.patch @@ -1,7 +1,7 @@ From 1e153945def3c50d1e59ceea6a768db0ac770f98 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 28 Mar 2015 21:34:07 +0000 -Subject: [PATCH 64/78] DNSSEC fix for non-ascii characters in labels. +Subject: [PATCH 64/87] DNSSEC fix for non-ascii characters in labels. --- src/dnssec.c | 34 +++++++++++++++++----------------- diff --git a/src/patches/dnsmasq/0065-Allow-control-characters-in-names-in-the-cache-handl.patch b/src/patches/dnsmasq/0065-Allow-control-characters-in-names-in-the-cache-handl.patch index a9b6f40..212fe30 100644 --- a/src/patches/dnsmasq/0065-Allow-control-characters-in-names-in-the-cache-handl.patch +++ b/src/patches/dnsmasq/0065-Allow-control-characters-in-names-in-the-cache-handl.patch @@ -1,7 +1,7 @@ From 394ff492da6af5da7e7d356be9586683bc5fc011 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 29 Mar 2015 22:17:14 +0100 -Subject: [PATCH 65/78] Allow control characters in names in the cache, handle +Subject: [PATCH 65/87] Allow control characters in names in the cache, handle when logging. --- diff --git a/src/patches/dnsmasq/0066-Fix-crash-in-last-commit.patch b/src/patches/dnsmasq/0066-Fix-crash-in-last-commit.patch index 8a496b0..dbc4deb 100644 --- a/src/patches/dnsmasq/0066-Fix-crash-in-last-commit.patch +++ b/src/patches/dnsmasq/0066-Fix-crash-in-last-commit.patch @@ -1,7 +1,7 @@ From 794fccca7ffebfba4468bfffc6276b68bbf6afd9 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 29 Mar 2015 22:35:44 +0100 -Subject: [PATCH 66/78] Fix crash in last commit. +Subject: [PATCH 66/87] Fix crash in last commit. --- src/cache.c | 7 ++++--- diff --git a/src/patches/dnsmasq/0067-Merge-message-translations.patch b/src/patches/dnsmasq/0067-Merge-message-translations.patch index f6c5225..ac735bd 100644 --- a/src/patches/dnsmasq/0067-Merge-message-translations.patch +++ b/src/patches/dnsmasq/0067-Merge-message-translations.patch @@ -1,7 +1,7 @@ From fd6ad9e481ab7c812a6b1515244908818cbb0442 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 30 Mar 2015 07:52:21 +0100 -Subject: [PATCH 67/78] Merge message translations. +Subject: [PATCH 67/87] Merge message translations. --- po/de.po | 803 +++++++++++++++++++++++++++++++++-------------------------- diff --git a/src/patches/dnsmasq/0068-add-tftp-no-fail-to-ignore-missing-tftp-root.patch b/src/patches/dnsmasq/0068-add-tftp-no-fail-to-ignore-missing-tftp-root.patch index cf1f2af..b61ad0a 100644 --- a/src/patches/dnsmasq/0068-add-tftp-no-fail-to-ignore-missing-tftp-root.patch +++ b/src/patches/dnsmasq/0068-add-tftp-no-fail-to-ignore-missing-tftp-root.patch @@ -1,7 +1,7 @@ From 30d0879ed55cb67b1b735beab3d93f3bb3ef1dd2 Mon Sep 17 00:00:00 2001 From: Stefan Tomanek <stefan.tomanek+dnsmasq(a)wertarbyte.de> Date: Tue, 31 Mar 2015 22:32:11 +0100 -Subject: [PATCH 68/78] add --tftp-no-fail to ignore missing tftp root +Subject: [PATCH 68/87] add --tftp-no-fail to ignore missing tftp root --- CHANGELOG | 3 +++ diff --git a/src/patches/dnsmasq/0069-Whitespace-fixes.patch b/src/patches/dnsmasq/0069-Whitespace-fixes.patch index a18c6be..865e9a9 100644 --- a/src/patches/dnsmasq/0069-Whitespace-fixes.patch +++ b/src/patches/dnsmasq/0069-Whitespace-fixes.patch @@ -1,7 +1,7 @@ From 7aa970e2c7043201663d86a4b5d8cd5c592cef39 Mon Sep 17 00:00:00 2001 From: Stefan Tomanek <stefan.tomanek+dnsmasq(a)wertarbyte.de> Date: Wed, 1 Apr 2015 17:55:07 +0100 -Subject: [PATCH 69/78] Whitespace fixes. +Subject: [PATCH 69/87] Whitespace fixes. --- src/dnsmasq.c | 14 +++++++------- diff --git a/src/patches/dnsmasq/0070-Return-INSECURE-rather-than-BOGUS-when-DS-proved-not.patch b/src/patches/dnsmasq/0070-Return-INSECURE-rather-than-BOGUS-when-DS-proved-not.patch index b021aab..a2f9638 100644 --- a/src/patches/dnsmasq/0070-Return-INSECURE-rather-than-BOGUS-when-DS-proved-not.patch +++ b/src/patches/dnsmasq/0070-Return-INSECURE-rather-than-BOGUS-when-DS-proved-not.patch @@ -1,7 +1,7 @@ From fe3992f9fa69fa975ea31919c53933b5f6a63527 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Fri, 3 Apr 2015 21:25:05 +0100 -Subject: [PATCH 70/78] Return INSECURE, rather than BOGUS when DS proved not +Subject: [PATCH 70/87] Return INSECURE, rather than BOGUS when DS proved not to exist. Return INSECURE when validating DNS replies which have RRSIGs, but diff --git a/src/patches/dnsmasq/0071-Fix-compiler-warning-when-not-including-DNSSEC.patch b/src/patches/dnsmasq/0071-Fix-compiler-warning-when-not-including-DNSSEC.patch index b8e5cf8..723c492 100644 --- a/src/patches/dnsmasq/0071-Fix-compiler-warning-when-not-including-DNSSEC.patch +++ b/src/patches/dnsmasq/0071-Fix-compiler-warning-when-not-including-DNSSEC.patch @@ -1,7 +1,7 @@ From 982faf402487e265ed11ac03524531d42b03c966 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Fri, 3 Apr 2015 21:42:30 +0100 -Subject: [PATCH 71/78] Fix compiler warning when not including DNSSEC. +Subject: [PATCH 71/87] Fix compiler warning when not including DNSSEC. --- src/forward.c | 3 ++- diff --git a/src/patches/dnsmasq/0072-Fix-crash-caused-by-looking-up-servers.bind-when-man.patch b/src/patches/dnsmasq/0072-Fix-crash-caused-by-looking-up-servers.bind-when-man.patch index e03606c..3f579bd 100644 --- a/src/patches/dnsmasq/0072-Fix-crash-caused-by-looking-up-servers.bind-when-man.patch +++ b/src/patches/dnsmasq/0072-Fix-crash-caused-by-looking-up-servers.bind-when-man.patch @@ -1,7 +1,7 @@ From 04b0ac05377936d121a36873bb63d492cde292c9 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 6 Apr 2015 17:19:13 +0100 -Subject: [PATCH 72/78] Fix crash caused by looking up servers.bind when many +Subject: [PATCH 72/87] Fix crash caused by looking up servers.bind when many servers defined. --- diff --git a/src/patches/dnsmasq/0073-Fix-crash-on-receipt-of-certain-malformed-DNS-reques.patch b/src/patches/dnsmasq/0073-Fix-crash-on-receipt-of-certain-malformed-DNS-reques.patch index c333e66..27e4cde 100644 --- a/src/patches/dnsmasq/0073-Fix-crash-on-receipt-of-certain-malformed-DNS-reques.patch +++ b/src/patches/dnsmasq/0073-Fix-crash-on-receipt-of-certain-malformed-DNS-reques.patch @@ -1,7 +1,7 @@ From ad4a8ff7d9097008d7623df8543df435bfddeac8 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Thu, 9 Apr 2015 21:48:00 +0100 -Subject: [PATCH 73/78] Fix crash on receipt of certain malformed DNS requests. +Subject: [PATCH 73/87] Fix crash on receipt of certain malformed DNS requests. --- CHANGELOG | 3 +++ diff --git a/src/patches/dnsmasq/0074-Fix-crash-in-auth-code-with-odd-configuration.patch b/src/patches/dnsmasq/0074-Fix-crash-in-auth-code-with-odd-configuration.patch index 4a9cee0..2435371 100644 --- a/src/patches/dnsmasq/0074-Fix-crash-in-auth-code-with-odd-configuration.patch +++ b/src/patches/dnsmasq/0074-Fix-crash-in-auth-code-with-odd-configuration.patch @@ -1,7 +1,7 @@ From 38440b204db65f9be16c4c3daa7e991e4356f6ed Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sun, 12 Apr 2015 21:52:47 +0100 -Subject: [PATCH 74/78] Fix crash in auth code with odd configuration. +Subject: [PATCH 74/87] Fix crash in auth code with odd configuration. --- CHANGELOG | 32 +++++++++++++++++++++----------- diff --git a/src/patches/dnsmasq/0075-Auth-correct-replies-to-NS-and-SOA-in-.arpa-zones.patch b/src/patches/dnsmasq/0075-Auth-correct-replies-to-NS-and-SOA-in-.arpa-zones.patch index 705229f..fbc3802 100644 --- a/src/patches/dnsmasq/0075-Auth-correct-replies-to-NS-and-SOA-in-.arpa-zones.patch +++ b/src/patches/dnsmasq/0075-Auth-correct-replies-to-NS-and-SOA-in-.arpa-zones.patch @@ -1,7 +1,7 @@ From 78c6184752dce27849e36cce4360abc27b8d76d2 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Thu, 16 Apr 2015 15:05:30 +0100 -Subject: [PATCH 75/78] Auth: correct replies to NS and SOA in .arpa zones. +Subject: [PATCH 75/87] Auth: correct replies to NS and SOA in .arpa zones. --- CHANGELOG | 8 ++++++++ diff --git a/src/patches/dnsmasq/0076-Fix-srk-induced-crash-in-new-tftp_no_fail-code.patch b/src/patches/dnsmasq/0076-Fix-srk-induced-crash-in-new-tftp_no_fail-code.patch index e42dfb0..1598460 100644 --- a/src/patches/dnsmasq/0076-Fix-srk-induced-crash-in-new-tftp_no_fail-code.patch +++ b/src/patches/dnsmasq/0076-Fix-srk-induced-crash-in-new-tftp_no_fail-code.patch @@ -1,7 +1,7 @@ From b4c0f092d8ce63ea4763c0ac17aa8d24318ad301 Mon Sep 17 00:00:00 2001 From: Stefan Tomanek <stefan.tomanek+dnsmasq(a)wertarbyte.de> Date: Thu, 16 Apr 2015 15:20:59 +0100 -Subject: [PATCH 76/78] Fix (srk induced) crash in new tftp_no_fail code. +Subject: [PATCH 76/87] Fix (srk induced) crash in new tftp_no_fail code. --- src/dnsmasq.c | 6 ++++-- diff --git a/src/patches/dnsmasq/0077-Note-CVE-2015-3294.patch b/src/patches/dnsmasq/0077-Note-CVE-2015-3294.patch index 15f3a4d..a68ac4c 100644 --- a/src/patches/dnsmasq/0077-Note-CVE-2015-3294.patch +++ b/src/patches/dnsmasq/0077-Note-CVE-2015-3294.patch @@ -1,7 +1,7 @@ From 0df29f5e23fd2f16181847db1fcf3a8b392d869a Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Thu, 16 Apr 2015 15:24:52 +0100 -Subject: [PATCH 77/78] Note CVE-2015-3294 +Subject: [PATCH 77/87] Note CVE-2015-3294 --- CHANGELOG | 3 +++ diff --git a/src/patches/dnsmasq/0078-Log-domain-when-reporting-DNSSEC-validation-failure.patch b/src/patches/dnsmasq/0078-Log-domain-when-reporting-DNSSEC-validation-failure.patch index 2f7fa0a..2e040e3 100644 --- a/src/patches/dnsmasq/0078-Log-domain-when-reporting-DNSSEC-validation-failure.patch +++ b/src/patches/dnsmasq/0078-Log-domain-when-reporting-DNSSEC-validation-failure.patch @@ -1,7 +1,7 @@ From 554b580e970275d5a869cb4fbfb2716f92b2f664 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Fri, 17 Apr 2015 22:50:20 +0100 -Subject: [PATCH 78/78] Log domain when reporting DNSSEC validation failure. +Subject: [PATCH 78/87] Log domain when reporting DNSSEC validation failure. --- src/forward.c | 15 ++++++++++----- diff --git a/src/patches/dnsmasq/0079-Check-IP-address-command-line-arg-in-dhcp_release.c.patch b/src/patches/dnsmasq/0079-Check-IP-address-command-line-arg-in-dhcp_release.c.patch index 7209bcf..6b0453e 100644 --- a/src/patches/dnsmasq/0079-Check-IP-address-command-line-arg-in-dhcp_release.c.patch +++ b/src/patches/dnsmasq/0079-Check-IP-address-command-line-arg-in-dhcp_release.c.patch @@ -1,7 +1,7 @@ From a006eb7e1486023480ea40244720ef7aab51de71 Mon Sep 17 00:00:00 2001 From: Moshe Levi <moshele(a)mellanox.com> Date: Sun, 19 Apr 2015 22:10:40 +0100 -Subject: [PATCH 79/84] Check IP address command line arg in dhcp_release.c +Subject: [PATCH 79/87] Check IP address command line arg in dhcp_release.c --- contrib/wrt/dhcp_release.c | 5 +++++ diff --git a/src/patches/dnsmasq/0080-Revert-61b838dd574c51d96fef100285a0d225824534f9-and-.patch b/src/patches/dnsmasq/0080-Revert-61b838dd574c51d96fef100285a0d225824534f9-and-.patch index 8a6afc6..8aa5c5c 100644 --- a/src/patches/dnsmasq/0080-Revert-61b838dd574c51d96fef100285a0d225824534f9-and-.patch +++ b/src/patches/dnsmasq/0080-Revert-61b838dd574c51d96fef100285a0d225824534f9-and-.patch @@ -1,7 +1,7 @@ From 338b340be9e7198f5c0f68133d070d6598a0814c Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Mon, 20 Apr 2015 21:34:05 +0100 -Subject: [PATCH 80/84] Revert 61b838dd574c51d96fef100285a0d225824534f9 and +Subject: [PATCH 80/87] Revert 61b838dd574c51d96fef100285a0d225824534f9 and just quieten log instead. --- diff --git a/src/patches/dnsmasq/0081-Handle-domain-names-with-.-or-000-within-labels.patch b/src/patches/dnsmasq/0081-Handle-domain-names-with-.-or-000-within-labels.patch index 56c6196..4fb78d4 100644 --- a/src/patches/dnsmasq/0081-Handle-domain-names-with-.-or-000-within-labels.patch +++ b/src/patches/dnsmasq/0081-Handle-domain-names-with-.-or-000-within-labels.patch @@ -1,7 +1,7 @@ From cbe379ad6b52a538a4416a7cd992817e5637ccf9 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Tue, 21 Apr 2015 22:57:06 +0100 -Subject: [PATCH 81/84] Handle domain names with '.' or /000 within labels. +Subject: [PATCH 81/87] Handle domain names with '.' or /000 within labels. Only in DNSSEC mode, where we might need to validate or store such names. In none-DNSSEC mode, simply don't cache these, as before. diff --git a/src/patches/dnsmasq/0082-Tweaks-to-previous-DNS-label-charset-commit.patch b/src/patches/dnsmasq/0082-Tweaks-to-previous-DNS-label-charset-commit.patch index 5f6fc4a..ea6f08d 100644 --- a/src/patches/dnsmasq/0082-Tweaks-to-previous-DNS-label-charset-commit.patch +++ b/src/patches/dnsmasq/0082-Tweaks-to-previous-DNS-label-charset-commit.patch @@ -1,7 +1,7 @@ From b8f16556d36924cd8dc7663cb4129d7b1f3fc2be Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Wed, 22 Apr 2015 21:14:31 +0100 -Subject: [PATCH 82/84] Tweaks to previous, DNS label charset commit. +Subject: [PATCH 82/87] Tweaks to previous, DNS label charset commit. --- src/dns-protocol.h | 6 +++++- diff --git a/src/patches/dnsmasq/0083-Logs-in-DHCPv6-not-suppressed-by-dhcp6-quiet.patch b/src/patches/dnsmasq/0083-Logs-in-DHCPv6-not-suppressed-by-dhcp6-quiet.patch index b39848f..96dc14b 100644 --- a/src/patches/dnsmasq/0083-Logs-in-DHCPv6-not-suppressed-by-dhcp6-quiet.patch +++ b/src/patches/dnsmasq/0083-Logs-in-DHCPv6-not-suppressed-by-dhcp6-quiet.patch @@ -1,7 +1,7 @@ From a5ae1f85873829efe473075ad77806cc02792622 Mon Sep 17 00:00:00 2001 From: Simon Kelley <simon(a)thekelleys.org.uk> Date: Sat, 25 Apr 2015 21:46:10 +0100 -Subject: [PATCH 83/84] Logs in DHCPv6 not suppressed by dhcp6-quiet. +Subject: [PATCH 83/87] Logs in DHCPv6 not suppressed by dhcp6-quiet. --- CHANGELOG | 6 +++++- diff --git a/src/patches/dnsmasq/0084-Make-get-version-work-when-repo-is-a-git-submodule.patch b/src/patches/dnsmasq/0084-Make-get-version-work-when-repo-is-a-git-submodule.patch index 2bb8a43..38670a8 100644 --- a/src/patches/dnsmasq/0084-Make-get-version-work-when-repo-is-a-git-submodule.patch +++ b/src/patches/dnsmasq/0084-Make-get-version-work-when-repo-is-a-git-submodule.patch @@ -1,7 +1,7 @@ From 8efd731cc4ed2baa42aa69d0a9d336392e9987cb Mon Sep 17 00:00:00 2001 From: "Johnny S. Lee" <_(a)jsl.io> Date: Sun, 26 Apr 2015 22:23:57 +0100 -Subject: [PATCH 84/84] Make get-version work when repo is a git submodule. +Subject: [PATCH 84/87] Make get-version work when repo is a git submodule. --- bld/get-version | 5 +++-- diff --git a/src/patches/dnsmasq/0085-Fix-argument-order-botch-which-broke-DNSSEC-for-TCP-.patch b/src/patches/dnsmasq/0085-Fix-argument-order-botch-which-broke-DNSSEC-for-TCP-.patch new file mode 100644 index 0000000..04bee99 --- /dev/null +++ b/src/patches/dnsmasq/0085-Fix-argument-order-botch-which-broke-DNSSEC-for-TCP-.patch @@ -0,0 +1,40 @@ +From e66b4dff3c562c7836d5be4c26972d665ad783f1 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Tue, 28 Apr 2015 20:45:57 +0100 +Subject: [PATCH 85/87] Fix argument-order botch which broke DNSSEC for TCP + queries. + +--- + src/forward.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/forward.c b/src/forward.c +index 1c7da3f5655c..a8e403c4b25e 100644 +--- a/src/forward.c ++++ b/src/forward.c +@@ -1996,8 +1996,9 @@ unsigned char *tcp_request(int confd, time_t now, + } + else + result = (status == STAT_SECURE ? "SECURE" : (status == STAT_INSECURE ? "INSECURE" : "BOGUS")); +- if (status == STAT_BOGUS && extract_request(header, m, daemon->namebuff, NULL)) +- domain = daemon->namebuff; ++ ++ if (status == STAT_BOGUS && extract_request(header, m, daemon->namebuff, NULL)) ++ domain = daemon->namebuff; + + log_query(F_KEYTAG | F_SECSTAT, domain, NULL, result); + +@@ -2040,8 +2041,8 @@ unsigned char *tcp_request(int confd, time_t now, + #endif + + m = process_reply(header, now, last_server, (unsigned int)m, +- option_bool(OPT_NO_REBIND) && !norebind, no_cache_dnssec, bogusanswer, +- cache_secure, ad_question, do_bit, added_pheader, check_subnet, &peer_addr); ++ option_bool(OPT_NO_REBIND) && !norebind, no_cache_dnssec, cache_secure, bogusanswer, ++ ad_question, do_bit, added_pheader, check_subnet, &peer_addr); + + break; + } +-- +2.1.0 + diff --git a/src/patches/dnsmasq/0086-Don-t-remove-RRSIG-RR-from-answers-to-ANY-queries-wh.patch b/src/patches/dnsmasq/0086-Don-t-remove-RRSIG-RR-from-answers-to-ANY-queries-wh.patch new file mode 100644 index 0000000..1fa5c7a --- /dev/null +++ b/src/patches/dnsmasq/0086-Don-t-remove-RRSIG-RR-from-answers-to-ANY-queries-wh.patch @@ -0,0 +1,29 @@ +From 2ed162ac204f3609fe4d9f9a0430baeaa352d88f Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Tue, 28 Apr 2015 21:26:35 +0100 +Subject: [PATCH 86/87] Don't remove RRSIG RR from answers to ANY queries when + the do bit is not set. + +--- + src/rfc1035.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/rfc1035.c b/src/rfc1035.c +index 32df31ad603c..5828055caa5d 100644 +--- a/src/rfc1035.c ++++ b/src/rfc1035.c +@@ -1608,6 +1608,11 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen, + GETSHORT(qtype, p); + GETSHORT(qclass, p); + ++ /* Don't filter RRSIGS from answers to ANY queries, even if do-bit ++ not set. */ ++ if (qtype == T_ANY) ++ *do_bit = 1; ++ + ans = 0; /* have we answered this question */ + + if (qtype == T_TXT || qtype == T_ANY) +-- +2.1.0 + diff --git a/src/patches/dnsmasq/0087-Constify-some-DHCP-lease-management-functions.patch b/src/patches/dnsmasq/0087-Constify-some-DHCP-lease-management-functions.patch new file mode 100644 index 0000000..8d1ca9e --- /dev/null +++ b/src/patches/dnsmasq/0087-Constify-some-DHCP-lease-management-functions.patch @@ -0,0 +1,57 @@ +From 64bcff1c7c72eecda8750bc2dca8b4c5dc38a837 Mon Sep 17 00:00:00 2001 +From: Nicolas Cavallari <nicolas.cavallari(a)green-communications.fr> +Date: Tue, 28 Apr 2015 21:55:18 +0100 +Subject: [PATCH 87/87] Constify some DHCP lease management functions. + +--- + src/dnsmasq.h | 7 ++++--- + src/lease.c | 8 ++++---- + 2 files changed, 8 insertions(+), 7 deletions(-) + +diff --git a/src/dnsmasq.h b/src/dnsmasq.h +index 6fe4a4189188..824a86009439 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -1304,9 +1304,10 @@ void lease_update_slaac(time_t now); + void lease_set_iaid(struct dhcp_lease *lease, int iaid); + void lease_make_duid(time_t now); + #endif +-void lease_set_hwaddr(struct dhcp_lease *lease, unsigned char *hwaddr, +- unsigned char *clid, int hw_len, int hw_type, int clid_len, time_t now, int force); +-void lease_set_hostname(struct dhcp_lease *lease, char *name, int auth, char *domain, char *config_domain); ++void lease_set_hwaddr(struct dhcp_lease *lease, const unsigned char *hwaddr, ++ const unsigned char *clid, int hw_len, int hw_type, ++ int clid_len, time_t now, int force); ++void lease_set_hostname(struct dhcp_lease *lease, const char *name, int auth, char *domain, char *config_domain); + void lease_set_expires(struct dhcp_lease *lease, unsigned int len, time_t now); + void lease_set_interface(struct dhcp_lease *lease, int interface, time_t now); + struct dhcp_lease *lease_find_by_client(unsigned char *hwaddr, int hw_len, int hw_type, +diff --git a/src/lease.c b/src/lease.c +index 545bbb7fd09c..8adb60588671 100644 +--- a/src/lease.c ++++ b/src/lease.c +@@ -813,9 +813,9 @@ void lease_set_iaid(struct dhcp_lease *lease, int iaid) + } + #endif + +-void lease_set_hwaddr(struct dhcp_lease *lease, unsigned char *hwaddr, +- unsigned char *clid, int hw_len, int hw_type, int clid_len, +- time_t now, int force) ++void lease_set_hwaddr(struct dhcp_lease *lease, const unsigned char *hwaddr, ++ const unsigned char *clid, int hw_len, int hw_type, ++ int clid_len, time_t now, int force) + { + #ifdef HAVE_DHCP6 + int change = force; +@@ -897,7 +897,7 @@ static void kill_name(struct dhcp_lease *lease) + lease->hostname = lease->fqdn = NULL; + } + +-void lease_set_hostname(struct dhcp_lease *lease, char *name, int auth, char *domain, char *config_domain) ++void lease_set_hostname(struct dhcp_lease *lease, const char *name, int auth, char *domain, char *config_domain) + { + struct dhcp_lease *lease_tmp; + char *new_name = NULL, *new_fqdn = NULL; +-- +2.1.0 + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0e2f9b011b8945dbfdfd3cac9fe1a486c48732e1
by git＠ipfire.org 28 Apr '15

28 Apr '15

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 0e2f9b011b8945dbfdfd3cac9fe1a486c48732e1 (commit) from 3bcb59ab211cec80576e8e0c1202364e3001defc (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 0e2f9b011b8945dbfdfd3cac9fe1a486c48732e1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 28 20:51:03 2015 +0200 openssl: disable ssse3 on amd cpu's amd with ssse3 (bulldozer and fusion) has serious performance problems with the vpaes code. (-evp is 40% slower) ----------------------------------------------------------------------- Summary of changes: lfs/openssl | 3 ++- src/patches/openssl-1.0.2a_disable_ssse3_for_amd.patch | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 src/patches/openssl-1.0.2a_disable_ssse3_for_amd.patch Difference in files: diff --git a/lfs/openssl b/lfs/openssl index d8925d7..455dcf1 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -117,9 +117,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1m-weak-ciphers.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-disable-sslv2-sslv3.patch - # Enable Padlock in i586 + # i586 specific patches ifeq "$(MACHINE)" "i586" cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2a_auto_enable_padlock.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2a_disable_ssse3_for_amd.patch endif # Apply our CFLAGS diff --git a/src/patches/openssl-1.0.2a_disable_ssse3_for_amd.patch b/src/patches/openssl-1.0.2a_disable_ssse3_for_amd.patch new file mode 100644 index 0000000..097cc80 --- /dev/null +++ b/src/patches/openssl-1.0.2a_disable_ssse3_for_amd.patch @@ -0,0 +1,11 @@ +diff -Naur openssl-1.0.2a.org/crypto/x86cpuid.pl openssl-1.0.2a/crypto/x86cpuid.pl +--- openssl-1.0.2a.org/crypto/x86cpuid.pl 2015-03-19 14:30:36.000000000 +0100 ++++ openssl-1.0.2a/crypto/x86cpuid.pl 2015-04-28 13:47:57.853521020 +0200 +@@ -71,6 +71,7 @@ + &mov ("eax",1); + &xor ("ecx","ecx"); + &cpuid (); ++ &and ("ecx",0xfffffdff); # clear SSSE3 because it is incredible slow on AMD's + &bt ("edx",28); + &jnc (&label("generic")); + &shr ("ebx",16); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3bcb59ab211cec80576e8e0c1202364e3001defc
by git＠ipfire.org 28 Apr '15

28 Apr '15

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 3bcb59ab211cec80576e8e0c1202364e3001defc (commit) from a24062d12bf6e8623f2316d6fbb0551ce553f0b5 (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 3bcb59ab211cec80576e8e0c1202364e3001defc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 28 13:22:00 2015 +0200 vpnmain.cgi: Fix prefix for elliptic curve algorithms ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/vpnmain.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 3819749..1d75356 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -3030,8 +3030,8 @@ sub make_algos($$$$$) { push(@algo, $int); } - if ($grp =~ m/^e\d+/) { - push(@algo, $grp); + if ($grp =~ m/^e(\d+)/) { + push(@algo, "ecp$1"); } else { push(@algo, "modp$grp"); } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a24062d12bf6e8623f2316d6fbb0551ce553f0b5
by git＠ipfire.org 28 Apr '15

28 Apr '15

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 a24062d12bf6e8623f2316d6fbb0551ce553f0b5 (commit) from cbdee67e068441c10284e1ab290ca4db226dd37f (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 a24062d12bf6e8623f2316d6fbb0551ce553f0b5 Author: Jochen Kauz <jochen.kauz(a)gmail.com> Date: Tue Apr 28 11:30:05 2015 +0200 vpnmain.cgi: dpd_delay/dpd_timeout wrong entry in ipsec.conf Fixes #10636 ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/vpnmain.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 0d23d0d..3819749 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -363,12 +363,12 @@ sub writeipsecfiles { print CONF "\tdpddelay=0\n"; } } else { - my $dpddelay = $lconfighash{$key}[30]; + my $dpddelay = $lconfighash{$key}[31]; if (!$dpddelay) { $dpddelay = 30; } print CONF "\tdpddelay=$dpddelay\n"; - my $dpdtimeout = $lconfighash{$key}[31]; + my $dpdtimeout = $lconfighash{$key}[30]; if (!$dpdtimeout) { $dpdtimeout = 120; } hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cbdee67e068441c10284e1ab290ca4db226dd37f
by git＠ipfire.org 28 Apr '15

28 Apr '15

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 cbdee67e068441c10284e1ab290ca4db226dd37f (commit) from 1cbc5ca0a4e0827ae5073ddf19c515e4492baa16 (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 cbdee67e068441c10284e1ab290ca4db226dd37f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 28 11:15:38 2015 +0200 openssl: Don't ship an SSE-optimised version of libssl This one does not benefit at all from any optimisations of this kind. Only libcrypto.so.10 which holds the implementation of ciphers and hashes gains better performance by using SSE2. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/i586/openssl-sse2 | 1 - lfs/openssl | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/common/i586/openssl-sse2 b/config/rootfiles/common/i586/openssl-sse2 index 59bfce3..7f6ddd6 100644 --- a/config/rootfiles/common/i586/openssl-sse2 +++ b/config/rootfiles/common/i586/openssl-sse2 @@ -1,2 +1 @@ usr/lib/sse2/libcrypto.so.10 -usr/lib/sse2/libssl.so.10 diff --git a/lfs/openssl b/lfs/openssl index a1f4fbe..d8925d7 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -137,7 +137,7 @@ endif ifeq "$(KCFG)" "-sse2" -mkdir -pv /usr/lib/sse2 cd $(DIR_APP) && install -m 755 \ - libcrypto.so.10 libssl.so.10 /usr/lib/sse2 + libcrypto.so.10 /usr/lib/sse2 else # Install everything. cd $(DIR_APP) && make install hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1cbc5ca0a4e0827ae5073ddf19c515e4492baa16
by git＠ipfire.org 28 Apr '15

28 Apr '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f68ae02d39eb10fa949f07b1c4cfc68b224a1ee0
by git＠ipfire.org 27 Apr '15

27 Apr '15

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 f68ae02d39eb10fa949f07b1c4cfc68b224a1ee0 (commit) via 7fe566950277075323b28aa1be202a9d7402edc9 (commit) from e0c923f424c0d4a8a8a873ee3f84a065ecce58f7 (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 f68ae02d39eb10fa949f07b1c4cfc68b224a1ee0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Apr 27 22:15:20 2015 +0200 openssl: auto enable padlock engine. commit 7fe566950277075323b28aa1be202a9d7402edc9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Apr 27 21:19:46 2015 +0200 openssl: change sse2 optimization to i686. ----------------------------------------------------------------------- Summary of changes: lfs/openssl | 14 +++++++++ .../openssl-1.0.2a_auto_enable_padlock.patch | 34 ++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 src/patches/openssl-1.0.2a_auto_enable_padlock.patch Difference in files: diff --git a/lfs/openssl b/lfs/openssl index 9cc1b4b..a1f4fbe 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -33,7 +33,16 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)$(KCFG) +ifneq "$(KCFG)" "-sse2" CFLAGS += -DPURIFY +else +CFLAGS =-O2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fPIC +CFLAGS+= -fstack-protector-all --param=ssp-buffer-size=4 +CFLAGS+= -march=i686 -mmmx -msse -msse2 -mfpmath=sse +CFLAGS+= -fomit-frame-pointer -DPURIFY +CXXFLAGS="${CFLAGS}" +endif + export RPM_OPT_FLAGS = $(CFLAGS) CONFIGURE_OPTIONS = \ @@ -108,6 +117,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.1m-weak-ciphers.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-disable-sslv2-sslv3.patch + # Enable Padlock in i586 +ifeq "$(MACHINE)" "i586" + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/openssl-1.0.2a_auto_enable_padlock.patch +endif + # Apply our CFLAGS cd $(DIR_APP) && sed -i Configure \ -e "s/-O3 -fomit-frame-pointer/$(CFLAGS)/g" diff --git a/src/patches/openssl-1.0.2a_auto_enable_padlock.patch b/src/patches/openssl-1.0.2a_auto_enable_padlock.patch new file mode 100644 index 0000000..b5c0e95 --- /dev/null +++ b/src/patches/openssl-1.0.2a_auto_enable_padlock.patch @@ -0,0 +1,34 @@ +diff -Naur openssl-1.0.2a.org/crypto/engine/eng_all.c openssl-1.0.2a/crypto/engine/eng_all.c +--- openssl-1.0.2a.org/crypto/engine/eng_all.c 2015-03-19 14:30:36.000000000 +0100 ++++ openssl-1.0.2a/crypto/engine/eng_all.c 2015-04-27 12:27:05.063569969 +0200 +@@ -120,6 +120,14 @@ + ENGINE_load_capi(); + # endif + #endif ++#ifdef OPENSSL_NO_STATIC_ENGINE ++ ENGINE *e; ++ e = ENGINE_by_id("padlock"); ++ if (e != NULL) { ++ ENGINE_add(e); ++ ENGINE_free(e); ++ } ++#endif + ENGINE_register_all_complete(); + } + +diff -Naur openssl-1.0.2a.org/ssl/ssl_algs.c openssl-1.0.2a/ssl/ssl_algs.c +--- openssl-1.0.2a.org/ssl/ssl_algs.c 2015-03-19 14:30:36.000000000 +0100 ++++ openssl-1.0.2a/ssl/ssl_algs.c 2015-04-27 11:04:27.893399695 +0200 +@@ -151,5 +151,12 @@ + #endif + /* initialize cipher/digest methods table */ + ssl_load_ciphers(); ++ ++ /* Init available hardware crypto engines */ ++ ENGINE_load_builtin_engines(); ++ ENGINE_register_all_complete(); ++ ENGINE * padlock = ENGINE_by_id("padlock"); ++ if (padlock) ENGINE_set_default_ciphers(padlock); ++ + return (1); + } hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM April 2015