Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

This commit is contained in:
Matthias Fischer
2015-04-30 18:44:01 +02:00
123 changed files with 1087 additions and 219 deletions

View File

@@ -1,2 +1 @@
usr/lib/sse2/libcrypto.so.10
usr/lib/sse2/libssl.so.10

View File

@@ -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

View File

@@ -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

View File

@@ -0,0 +1 @@
../../../../common/armv5tel/glibc

View File

@@ -0,0 +1 @@
../../../common/ddns

View File

@@ -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

View File

@@ -0,0 +1 @@
../../../../common/i586/glibc

View File

@@ -0,0 +1 @@
../../../common/tzdata

View File

@@ -0,0 +1 @@
../../../common/xz

View File

@@ -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"

View File

@@ -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

View File

@@ -37,4 +37,5 @@
#usr/include/srtp/ut_sim.h
#usr/include/srtp/xfm.h
usr/lib/libsrtp.so
usr/lib/libsrtp.so.1
#usr/lib/pkgconfig/libsrtp.pc

View File

@@ -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 = '';

View File

@@ -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;
}
@@ -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");
}

View File

@@ -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)

View File

@@ -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 \

View File

@@ -151,6 +151,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0076-Fix-srk-induced-crash-in-new-tftp_no_fail-code.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0077-Note-CVE-2015-3294.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0078-Log-domain-when-reporting-DNSSEC-validation-failure.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0079-Check-IP-address-command-line-arg-in-dhcp_release.c.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0080-Revert-61b838dd574c51d96fef100285a0d225824534f9-and-.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0081-Handle-domain-names-with-.-or-000-within-labels.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0082-Tweaks-to-previous-DNS-label-charset-commit.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0083-Logs-in-DHCPv6-not-suppressed-by-dhcp6-quiet.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0084-Make-get-version-work-when-repo-is-a-git-submodule.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0085-Fix-argument-order-botch-which-broke-DNSSEC-for-TCP-.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0086-Don-t-remove-RRSIG-RR-from-answers-to-ANY-queries-wh.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/0087-Constify-some-DHCP-lease-management-functions.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-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' \

View File

@@ -283,6 +283,8 @@ endif
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1154563.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1170121.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1183533.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1207995.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh1209375.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-resolv-stack_chk_fail.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-remove-ctors-dtors-output-sections.patch

View File

@@ -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)

View File

@@ -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,12 @@ $(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
# 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
cd $(DIR_APP) && sed -i Configure \
-e "s/-O3 -fomit-frame-pointer/$(CFLAGS)/g"
@@ -123,7 +138,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
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

View File

@@ -78,6 +78,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-ipfire.patch
cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh

View File

@@ -24,7 +24,7 @@
include Config
VER = 2015a
VER = 2015d
TZDATA_VER = $(VER)
TZCODE_VER = $(VER)
@@ -45,8 +45,8 @@ objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz
tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz
tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz
tzdata$(TZDATA_VER).tar.gz_MD5 = 4ed11c894a74a5ea64201b1c6dbb8831
tzcode$(TZCODE_VER).tar.gz_MD5 = 8f375ede46ae137fbac047ac431bda37
tzdata$(TZDATA_VER).tar.gz_MD5 = b595bdc4474b8fc1a15cffc67c66025b
tzcode$(TZCODE_VER).tar.gz_MD5 = 4008a3abc025a398697b2587c48258b9
install : $(TARGET)

4
lfs/xz
View File

@@ -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)

View File

@@ -978,7 +978,7 @@ build)
cd $BASEDIR
tools/checknewlog.pl
tools/checkwronginitlinks
tools/checkrootfiles
cd $PWD
beautify build_end

View File

@@ -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))

37
src/misc-progs/ddnsctrl.c Normal file
View File

@@ -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;
}

View File

@@ -0,0 +1,89 @@
commit 63e16feedea3639ef1f21fecbff9ed2ae256728b
Author: Michael Tremer <michael.tremer@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())

View File

@@ -0,0 +1,40 @@
commit f62fa5baffe2d225604460ecd03b8159b987df8f
Author: Michael Tremer <michael.tremer@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:

View File

@@ -1,85 +0,0 @@
commit 78046ffe2187d91c61d6c2f910249b8a5be71b08
Author: Stefan Schantl <stefan.schantl@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=34
+
+ 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"

View File

@@ -1,23 +0,0 @@
commit 25f39b4e437627bd1a49393280271d59ad28b86e
Author: Stefan Schantl <stefan.schantl@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):

View File

@@ -1,7 +1,7 @@
From f2658275b25ebfe691cdcb9fede85a3088cca168 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +-

View File

@@ -1,7 +1,7 @@
From 00cd9d551998307225312fd21f761cfa8868bd2c Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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
---

View File

@@ -1,7 +1,7 @@
From 6ac3bc0452a74e16e3d620a0757b0f8caab182ec Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +++++-

View File

@@ -1,7 +1,7 @@
From e9828b6f66b22ce8873f8d30a773137d1aef1b92 Mon Sep 17 00:00:00 2001
From: Karl Vogel <karl.vogel@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.

View File

@@ -1,7 +1,7 @@
From 17b475912f6a4e72797a543dad59d4d5dde6bb1b Mon Sep 17 00:00:00 2001
From: Daniel Collins <daniel.collins@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.
---

View File

@@ -1,7 +1,7 @@
From 3d9d2dd0018603a2ae4b9cd65ac6ff959f4fd8c7 Mon Sep 17 00:00:00 2001
From: Tomas Hozza <thozza@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 +-

View File

@@ -1,7 +1,7 @@
From b9ff5c8f435173cfa616e3c398bdc089ef690a07 Mon Sep 17 00:00:00 2001
From: Vladislav Grishenko <themiron@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

View File

@@ -1,7 +1,7 @@
From 98906275a02ae260fe3f82133bd79054f8315f06 Mon Sep 17 00:00:00 2001
From: Hans Dedecker <dedeckeh@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

View File

@@ -1,7 +1,7 @@
From 193de4abf59e49c6b70d54cfe9720fcb95ca2f71 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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.

View File

@@ -1,7 +1,7 @@
From 857973e6f7e0a3d03535a9df7f9373fd7a0b65cc Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +++++++++++++++++++++++++++----------------

View File

@@ -1,7 +1,7 @@
From 800c5cc1e7438818fd80f08c2d472df249a6942d Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +++++-

View File

@@ -1,7 +1,7 @@
From ad946d555dce44eb690c7699933b6ff40ab85bb6 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 ++++

View File

@@ -1,7 +1,7 @@
From 3ad3f3bbd4ee716a7d2fb1e115cf89bd1b1a5de9 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 ++++

View File

@@ -1,7 +1,7 @@
From bd9520b7ade7098ee423acc38965376aa57feb07 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 ----

View File

@@ -1,7 +1,7 @@
From 476693678e778886b64d0b56e27eb7695cbcca99 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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.
---

View File

@@ -1,7 +1,7 @@
From 3267804598047bd1781cab91508d1bc516e5ddbb Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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.
---

View File

@@ -1,7 +1,7 @@
From 094b5c3d904bae9aeb3206d9f3b8348926b84975 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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.
---

View File

@@ -1,7 +1,7 @@
From cbc652423403e3cef00e00240f6beef713142246 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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

View File

@@ -1,7 +1,7 @@
From fbc5205702c7f6f431d9f1043c553d7fb62ddfdb Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 ++++++++++++++++++++++++++++++-----------------------------

View File

@@ -1,7 +1,7 @@
From 83d2ed09fc0216b567d7fb2197e4ff3eae150b0d Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +++++--

View File

@@ -1,7 +1,7 @@
From 32fc6dbe03569d70dd394420ceb73532cf303c33 Mon Sep 17 00:00:00 2001
From: Glen Huang <curvedmark@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 ++++++++

View File

@@ -1,7 +1,7 @@
From 0b1008d367d44e77352134a4c5178f896f0db3e7 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +-

View File

@@ -1,7 +1,7 @@
From d310ab7ecbffce79d3d90debba621e0222f9bced Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@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 ++--

View File

@@ -1,7 +1,7 @@
From 81c538efcebfce2ce4a1d3a420b6c885b8f08df9 Mon Sep 17 00:00:00 2001
From: Yousong Zhou <yszhou4tech@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 +-

View File

@@ -1,7 +1,7 @@
From d8dbd903d024f84a149dac2f8a674a68dfed47a3 Mon Sep 17 00:00:00 2001
From: Yousong Zhou <yszhou4tech@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 +++-

View File

@@ -1,7 +1,7 @@
From 97e618a0e3f29465acc689d87288596b006f197e Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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.
---

View File

@@ -1,7 +1,7 @@
From 25cf5e373eb41c088d4ee5e625209c4cf6a5659e Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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.
---

View File

@@ -1,7 +1,7 @@
From 28de38768e2c7d763b9aa5b7a4d251d5e56bab0b Mon Sep 17 00:00:00 2001
From: RinSatsuki <aa65535@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 +++++++

View File

@@ -1,7 +1,7 @@
From 9f79ee4ae34886c0319f06d8f162b81ef79d62fb Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +++---

View File

@@ -1,7 +1,7 @@
From 5e321739db381a1d7b5964d76e9c81471d2564c9 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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.
---

View File

@@ -1,7 +1,7 @@
From ae4624bf46b5e37ff1a9a2ba3c927e0dede95adb Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +-

View File

@@ -1,7 +1,7 @@
From 393415597c8b5b09558b789ab9ac238dbe3db65d Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 ++++

View File

@@ -1,7 +1,7 @@
From 2ae195f5a71f7c5a75717845de1bd72fc7dd67f3 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +-

View File

@@ -1,7 +1,7 @@
From 5f4dc5c6ca50655ab14f572c7e30815ed74cd51a Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +++

View File

@@ -1,7 +1,7 @@
From fbf01f7046e75f9aa73fd4aab2a94e43386d9052 Mon Sep 17 00:00:00 2001
From: Conrad Kostecki <ck@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 +++++++++++++++++++++++++++++----------------------------------

View File

@@ -1,7 +1,7 @@
From 61b838dd574c51d96fef100285a0d225824534f9 Mon Sep 17 00:00:00 2001
From: Win King Wan <pinwing+dnsmasq@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.
---

View File

@@ -1,7 +1,7 @@
From 0491805d2ff6e7727f0272c94fd97d9897d1e22c Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +++-

View File

@@ -1,7 +1,7 @@
From 70d1873dd9e70041ed4bb88c69d5b886b7cc634c Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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.
---

View File

@@ -1,7 +1,7 @@
From aff3396280e944833f0e23d834aa6acd5fe2605a Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +-

View File

@@ -1,7 +1,7 @@
From 3d04f46334d0e345f589eda1372e638b946fe637 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +++++++++--

View File

@@ -1,7 +1,7 @@
From 6ef15b34ca83c62a939f69356d5c3f7a6bfef3d0 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 ++

View File

@@ -1,7 +1,7 @@
From 106266761828a0acb006346ae47bf031dee46a5d Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 ++++--

View File

@@ -1,7 +1,7 @@
From 8d8a54ec79d9f96979fabbd97b1dd2ddebc7d78f Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +-

View File

@@ -1,7 +1,7 @@
From d36b732c4cfa91ea09af64b5dc0f3a85a075e5bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thi=C3=A9baud=20Weksteen?= <thiebaud@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 +-

View File

@@ -1,7 +1,7 @@
From 2941d3ac898cf84b544e47c9735c5e4111711db1 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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.
---

View File

@@ -1,7 +1,7 @@
From f9c863708c6b0aea31ff7a466647685dc739de50 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 ++++-----

View File

@@ -1,7 +1,7 @@
From efb8b5566aafc1f3ce18514a2df93af5a2e4998c Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +

View File

@@ -1,7 +1,7 @@
From f4f400776b3c1aa303d1a0fcd500f0ab5bc970f2 Mon Sep 17 00:00:00 2001
From: Shantanu Gadgil <shantanugadgil@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.
---

View File

@@ -1,7 +1,7 @@
From 8ff70de618eb7de9147dbfbd4deca4a2dd62f0cb Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 ++-

View File

@@ -1,7 +1,7 @@
From caeea190f12efd20139f694aac4942d1ac00019f Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +++++++++++----------

View File

@@ -1,7 +1,7 @@
From 28b879ac47b872af6e8c5e86d76806c69338434d Mon Sep 17 00:00:00 2001
From: Chen Wei <weichen302@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 ++

View File

@@ -1,7 +1,7 @@
From 0705a7e2d57654b27c7e14f35ca77241c1821f4d Mon Sep 17 00:00:00 2001
From: Tomas Hozza <thozza@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 +++-

View File

@@ -1,7 +1,7 @@
From 47b9ac59c715827252ae6e6732903c3dabb697fb Mon Sep 17 00:00:00 2001
From: Joachim Zobel <jz-2014@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 ++++++++++++++++++

View File

@@ -1,7 +1,7 @@
From f6e62e2af96f5fa0d1e3d93167a93a8f09bf6e61 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +++++

View File

@@ -1,7 +1,7 @@
From 9003b50b13da624ca45f3e0cf99abb623b8d026b Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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.
---

View File

@@ -1,7 +1,7 @@
From 4c960fa90a975d20f75a1ecabd217247f1922c8f Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +++---

View File

@@ -1,7 +1,7 @@
From 360f2513ab12a9bf1e262d388dd2ea8a566590a3 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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.
---

View File

@@ -1,7 +1,7 @@
From ff841ebf5a5d6864ff48571f607c32ce80dbb75a Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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

View File

@@ -1,7 +1,7 @@
From 979fe86bc8693f660eddea232ae39cbbb50b294c Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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/
---

View File

@@ -1,7 +1,7 @@
From 65c721200023ef0023114459a8d12f8b0a24cfd8 Mon Sep 17 00:00:00 2001
From: Lung-Pin Chang <changlp@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

View File

@@ -1,7 +1,7 @@
From 8805283088d670baecb92569252c01cf754cda51 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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.
---

View File

@@ -1,7 +1,7 @@
From 150162bc37170a6edae9d488435e836b1e4e3a4e Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +++++++++--

View File

@@ -1,7 +1,7 @@
From 0b8a5a30a77331974ba24a04e43e720585dfbc61 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +++++--

View File

@@ -1,7 +1,7 @@
From 1e153945def3c50d1e59ceea6a768db0ac770f98 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +++++++++++++++++-----------------

View File

@@ -1,7 +1,7 @@
From 394ff492da6af5da7e7d356be9586683bc5fc011 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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.
---

View File

@@ -1,7 +1,7 @@
From 794fccca7ffebfba4468bfffc6276b68bbf6afd9 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 ++++---

View File

@@ -1,7 +1,7 @@
From fd6ad9e481ab7c812a6b1515244908818cbb0442 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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 +++++++++++++++++++++++++++++++++--------------------------

View File

@@ -1,7 +1,7 @@
From 30d0879ed55cb67b1b735beab3d93f3bb3ef1dd2 Mon Sep 17 00:00:00 2001
From: Stefan Tomanek <stefan.tomanek+dnsmasq@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 +++

View File

@@ -1,7 +1,7 @@
From 7aa970e2c7043201663d86a4b5d8cd5c592cef39 Mon Sep 17 00:00:00 2001
From: Stefan Tomanek <stefan.tomanek+dnsmasq@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 +++++++-------

View File

@@ -1,7 +1,7 @@
From fe3992f9fa69fa975ea31919c53933b5f6a63527 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@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

Some files were not shown because too many files have changed in this diff Show More