From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d08045eaa69a0bab6cb273c1836d34a433f60a37
Date: Sat, 01 Aug 2015 21:24:30 +0200 [thread overview]
Message-ID: <20150801192430.A427422391@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 6999 bytes --]
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 d08045eaa69a0bab6cb273c1836d34a433f60a37 (commit)
via a862fbc0ce8960d2434243b7466404559259adfd (commit)
via fcd2b9299c39388328c3d4fb89f098f32b39d400 (commit)
from 6b6b876b8d26485e6d916fdd8e08c621d863068a (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 d08045eaa69a0bab6cb273c1836d34a433f60a37
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Aug 1 20:23:34 2015 +0100
dnsmasq: Update to 2.75
Rather severe regression in handling DNSSEC with CNAMEs.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a862fbc0ce8960d2434243b7466404559259adfd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Aug 1 20:10:34 2015 +0100
core93: Add bind update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fcd2b9299c39388328c3d4fb89f098f32b39d400
Author: Matthias Fischer <fischerm42(a)t-online.de>
Date: Sat Aug 1 12:41:23 2015 +0200
bind: Update to 9.10.2-P3
Signed-off-by: Matthias Fischer <fischerm42(a)t-online.de>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
.../{oldcore/80 => core/93}/filelists/bind | 0
.../{oldcore/92 => core/93}/filelists/dnsmasq | 0
lfs/bind | 4 +--
lfs/dnsmasq | 4 +--
...q-Add-support-to-read-ISC-DHCP-lease-file.patch | 32 +++++++++++-----------
5 files changed, 20 insertions(+), 20 deletions(-)
copy config/rootfiles/{oldcore/80 => core/93}/filelists/bind (100%)
copy config/rootfiles/{oldcore/92 => core/93}/filelists/dnsmasq (100%)
Difference in files:
diff --git a/config/rootfiles/core/93/filelists/bind b/config/rootfiles/core/93/filelists/bind
new file mode 120000
index 0000000..48a0eba
--- /dev/null
+++ b/config/rootfiles/core/93/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/93/filelists/dnsmasq b/config/rootfiles/core/93/filelists/dnsmasq
new file mode 120000
index 0000000..d469c74
--- /dev/null
+++ b/config/rootfiles/core/93/filelists/dnsmasq
@@ -0,0 +1 @@
+../../../common/dnsmasq
\ No newline at end of file
diff --git a/lfs/bind b/lfs/bind
index 5dd098d..f6190a5 100644
--- a/lfs/bind
+++ b/lfs/bind
@@ -25,7 +25,7 @@
include Config
-VER = 9.10.2-P2
+VER = 9.10.2-P3
THISAPP = bind-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 55d8f094bc10baae0e23e5e9100ba320
+$(DL_FILE)_MD5 = a810d5d65fbdcf28dcda80d646913c3a
install : $(TARGET)
diff --git a/lfs/dnsmasq b/lfs/dnsmasq
index e4410cc..f327967 100644
--- a/lfs/dnsmasq
+++ b/lfs/dnsmasq
@@ -24,7 +24,7 @@
include Config
-VER = 2.73
+VER = 2.75
THISAPP = dnsmasq-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b8bfe96d22945c8cf4466826ba9b21bd
+$(DL_FILE)_MD5 = 887236f1ddde6eb57cdb9d01916c9f72
install : $(TARGET)
diff --git a/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch b/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch
index 1a89b36..0482c4b 100644
--- a/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch
+++ b/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch
@@ -1,18 +1,19 @@
diff --git a/Makefile b/Makefile
-index 2910320b6452..0a76ce3c5154 100644
+index 4c87ea9..4e0ea10 100644
--- a/Makefile
+++ b/Makefile
-@@ -73,7 +73,7 @@ objs = cache.o rfc1035.o util.o option.o forward.o network.o \
+@@ -73,7 +73,8 @@ objs = cache.o rfc1035.o util.o option.o forward.o network.o \
dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \
helper.o tftp.o log.o conntrack.o dhcp6.o rfc3315.o \
dhcp-common.o outpacket.o radv.o slaac.o auth.o ipset.o \
-- domain.o dnssec.o blockdata.o tables.o loop.o inotify.o
-+ domain.o dnssec.o blockdata.o tables.o loop.o inotify.o isc.o
+- domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o
++ domain.o dnssec.o blockdata.o tables.o loop.o inotify.o poll.o \
++ isc.o
hdrs = dnsmasq.h config.h dhcp-protocol.h dhcp6-protocol.h \
dns-protocol.h radv-protocol.h ip6addr.h
diff --git a/src/cache.c b/src/cache.c
-index 117ae279fd4e..6ee7ee362e6c 100644
+index 178d654..6d0b131 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -17,7 +17,7 @@
@@ -65,10 +66,10 @@ index 117ae279fd4e..6ee7ee362e6c 100644
cache_hash(crec);
diff --git a/src/dnsmasq.c b/src/dnsmasq.c
-index e903a24c8105..eefc7f939933 100644
+index 81254f6..ce2d1a7 100644
--- a/src/dnsmasq.c
+++ b/src/dnsmasq.c
-@@ -970,6 +970,11 @@ int main (int argc, char **argv)
+@@ -982,6 +982,11 @@ int main (int argc, char **argv)
poll_resolv(0, daemon->last_resolv != 0, now);
daemon->last_resolv = now;
@@ -81,21 +82,20 @@ index e903a24c8105..eefc7f939933 100644
#endif
diff --git a/src/dnsmasq.h b/src/dnsmasq.h
-index 89e758b56a0a..c5edd6fdf7f5 100644
+index cf1a782..30437aa 100644
--- a/src/dnsmasq.h
+++ b/src/dnsmasq.h
-@@ -1502,3 +1502,8 @@ void inotify_dnsmasq_init();
- int inotify_check(time_t now);
- void set_dynamic_inotify(int flag, int total_size, struct crec **rhash, int revhashsz);
- #endif
-+
+@@ -1519,3 +1519,7 @@ int poll_check(int fd, short event);
+ void poll_listen(int fd, short event);
+ int do_poll(int timeout);
+
+/* isc.c */
+#ifdef HAVE_ISC_READER
+void load_dhcp(time_t now);
+#endif
diff --git a/src/isc.c b/src/isc.c
new file mode 100644
-index 000000000000..51064426f17f
+index 0000000..5106442
--- /dev/null
+++ b/src/isc.c
@@ -0,0 +1,251 @@
@@ -351,10 +351,10 @@ index 000000000000..51064426f17f
+
+#endif
diff --git a/src/option.c b/src/option.c
-index cb4e76ba0aa2..f6420fcbb7ab 100644
+index ecc2619..527c5aa 100644
--- a/src/option.c
+++ b/src/option.c
-@@ -1693,7 +1693,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
+@@ -1699,7 +1699,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
ret_err(_("bad MX target"));
break;
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2015-08-01 19:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150801192430.A427422391@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox