IPFire-SCM

ipfire-scm@lists.ipfire.org

7876 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 40baf261430f9398b4dd0bbbbeadf8562731e9b0
by git＠ipfire.org 16 Sep '15

16 Sep '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 40baf261430f9398b4dd0bbbbeadf8562731e9b0 (commit) via c97dda34dececca3cc6bf1f15b5f63d027043072 (commit) from 744a04ea798ca3718adb45206444c8a51e2a9680 (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 40baf261430f9398b4dd0bbbbeadf8562731e9b0 Merge: c97dda3 744a04e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Sep 16 20:28:53 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit c97dda34dececca3cc6bf1f15b5f63d027043072 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Sep 16 20:27:52 2015 +0200 qemu: enabled x86_64 for build and as target. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/qemu/qemu | 10 ++++++++-- config/rootfiles/packages/qemu | 3 +++ lfs/qemu | 8 ++++---- 3 files changed, 15 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/qemu/qemu b/config/qemu/qemu index 64b458a..834eb9c 100644 --- a/config/qemu/qemu +++ b/config/qemu/qemu @@ -2,9 +2,15 @@ # # QEMU wrapper to enable kvm as default like old qemu-kvm... # +if [ $(uname -m) = "x86_64" ]; then +QEMU_SYSTEM=qemu-system-x86_64 +else +QEMU_SYSTEM=qemu-system-i386 +fi + if [[ $* == *" -no-kvm"* ]]; then - qemu-system-i386 $* + $QEMU_SYSTEM $* else - qemu-system-i386 -enable-kvm $* + $QEMU_SYSTEM -enable-kvm $* fi exit ${?} diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index 9896139..a554b36 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -1,6 +1,7 @@ #etc/qemu etc/qemu/target-x86_64.conf usr/bin/qemu +usr/bin/qemu-arm usr/bin/qemu-ga usr/bin/qemu-i386 usr/bin/qemu-img @@ -8,6 +9,8 @@ usr/bin/qemu-io usr/bin/qemu-nbd usr/bin/qemu-system-arm usr/bin/qemu-system-i386 +usr/bin/qemu-system-x86_64 +usr/bin/qemu-x86_64 usr/libexec/qemu-bridge-helper #usr/share/doc/qemu #usr/share/doc/qemu/qemu-doc.html diff --git a/lfs/qemu b/lfs/qemu index 8512568..f07e927 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -31,9 +31,9 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -SUP_ARCH = i586 +SUP_ARCH = i586 x86_64 PROG = qemu -PAK_VER = 15 +PAK_VER = 16 DEPS = "sdl" @@ -80,7 +80,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \ --enable-kvm --disable-attr \ - --target-list="i386-linux-user i386-softmmu arm-softmmu" \ + --target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \ --extra-cflags="$(CFLAGS)" cd $(DIR_APP) && make $(MAKETUNING) 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. 744a04ea798ca3718adb45206444c8a51e2a9680
by git＠ipfire.org 16 Sep '15

16 Sep '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 744a04ea798ca3718adb45206444c8a51e2a9680 (commit) from 0d77b70188a5b0423ae70d9093d8daee864fb8e4 (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 744a04ea798ca3718adb45206444c8a51e2a9680 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Sep 16 11:18:21 2015 +0200 make.sh: remove only temporary needed iso on arm build. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: make.sh | 4 ++++ 1 file changed, 4 insertions(+) Difference in files: diff --git a/make.sh b/make.sh index fb417d5..4a8c50b 100755 --- a/make.sh +++ b/make.sh @@ -906,6 +906,10 @@ buildpackages() { mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1 cd $BASEDIR + + # remove not useable iso on armv5tel (needed to build flash images) + [ "${TARGET_ARCH}" = "armv5tel" ] && rm -rf *.iso + for i in `ls *.bz2 *.img.gz *.iso`; do md5sum $i > $i.md5 done hooks/post-receive -- IPFire 2.x development tree

1 0

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

15 Sep '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 0d77b70188a5b0423ae70d9093d8daee864fb8e4 (commit) via bfc3e1f34030d7a3970281a60035aa07078db38d (commit) from 1ca232eb4c2655de8ca2adacb41fdc4c8e8f60ca (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 0d77b70188a5b0423ae70d9093d8daee864fb8e4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 15 20:46:51 2015 +0200 memtest: use precompiled memtest binary on x86_64 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit bfc3e1f34030d7a3970281a60035aa07078db38d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Sep 15 20:46:37 2015 +0200 Revert "cdrom: Disable memtest on x86_64" This reverts commit 5d1c3aca0ab582ed3bca4d28e148a336e2a50b08. ----------------------------------------------------------------------- Summary of changes: lfs/cdrom | 2 -- lfs/memtest | 12 ++++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) Difference in files: diff --git a/lfs/cdrom b/lfs/cdrom index 3a95911..79920b8 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -93,9 +93,7 @@ ifneq "$(MACHINE_TYPE)" "arm" cp /boot/vmlinuz-$(KVER)-ipfire /install/cdrom/boot/isolinux/vmlinuz dracut --force -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire cp $(DIR_SRC)/config/syslinux/boot.png /install/cdrom/boot/isolinux/boot.png -ifeq "$(MACHINE)" "i586" cp /usr/lib/memtest86+/memtest.bin /install/cdrom/boot/isolinux/memtest -endif cp /usr/share/ipfire-netboot/ipxe.lkrn /install/cdrom/boot/isolinux/netboot cp /usr/share/syslinux/isolinux.bin /install/cdrom/boot/isolinux/isolinux.bin cp /usr/share/hwdata/pci.ids /install/cdrom/boot/isolinux/pci.ids diff --git a/lfs/memtest b/lfs/memtest index d98ea87..cef29d6 100644 --- a/lfs/memtest +++ b/lfs/memtest @@ -31,7 +31,7 @@ DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -SUP_ARCH = i586 +SUP_ARCH = i586 x86_64 ############################################################################### # Top-level Rules @@ -71,11 +71,19 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + -mkdir -p /usr/lib/memtest86+ + +ifeq "$(MACHINE)" "i586" # Enable SMP as default cd $(DIR_APP) && sed -i -e "s|CONSERVATIVE_SMP 1|CONSERVATIVE_SMP 0|g" config.h cd $(DIR_APP) && sed -i -e "s|scp |echo |g" Makefile cd $(DIR_APP) && make $(EXTRA_MAKE) - -mkdir -p /usr/lib/memtest86+ cd $(DIR_APP) && cp -f memtest.bin /usr/lib/memtest86+ +else + # 64bit only systems cannot link mentest without 32bit gcc libs + # so we use the precompiled binary from memtest author + cd $(DIR_APP) && cp -f precomp.bin /usr/lib/memtest86+/memtest.bin +endif + @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1ca232eb4c2655de8ca2adacb41fdc4c8e8f60ca
by git＠ipfire.org 14 Sep '15

14 Sep '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 1ca232eb4c2655de8ca2adacb41fdc4c8e8f60ca (commit) via f62ac3224c89a42f2d4dcff5e83b6731820a9b4d (commit) via c97b3aa372ac888208043834204c9387c0fa3946 (commit) via 6ee104aeb793aad605e6978708e88059274ea143 (commit) from 253983268e74482b0e032daf398625544c3a370e (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 1ca232eb4c2655de8ca2adacb41fdc4c8e8f60ca Merge: f62ac32 2539832 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 14 23:32:51 2015 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit f62ac3224c89a42f2d4dcff5e83b6731820a9b4d Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Sep 13 21:03:38 2015 +0200 dnsmasq: latest upstream patches dnsmasq: latest upstream patches Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c97b3aa372ac888208043834204c9387c0fa3946 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 14 23:21:32 2015 +0100 core94: Add changed snort initscript Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6ee104aeb793aad605e6978708e88059274ea143 Author: Douglas Duckworth <planningbfun(a)gmail.com> Date: Sat Sep 12 11:27:17 2015 -0500 snort: Remove trailing slash in pid path Fixes: https://bugzilla.ipfire.org/show_bug.cgi?id=10924 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/94/filelists/files | 1 + lfs/dnsmasq | 6 +++ src/initscripts/init.d/snort | 2 +- .../004-fix_behaviour_of_empty_dhcp-option.patch | 38 ++++++++++++++++ ...ution_to_ENOMEM_error_with_IPv6_multicast.patch | 50 ++++++++++++++++++++++ ...page_on_RDNSS_set_in_router_advertisement.patch | 35 +++++++++++++++ ...gned_dangling_CNAME_replies_to_DS_queries.patch | 30 +++++++++++++ ...6_option_56_does_not_hold_an_address_list.patch | 25 +++++++++++ ...pect_the_--no_resolv_flag_in_inotify_code.patch | 47 ++++++++++++++++++++ 9 files changed, 233 insertions(+), 1 deletion(-) create mode 100644 src/patches/dnsmasq/004-fix_behaviour_of_empty_dhcp-option.patch create mode 100644 src/patches/dnsmasq/005-suggest_solution_to_ENOMEM_error_with_IPv6_multicast.patch create mode 100644 src/patches/dnsmasq/006-clarify_man_page_on_RDNSS_set_in_router_advertisement.patch create mode 100644 src/patches/dnsmasq/007-handle_signed_dangling_CNAME_replies_to_DS_queries.patch create mode 100644 src/patches/dnsmasq/008-DHCPv6_option_56_does_not_hold_an_address_list.patch create mode 100644 src/patches/dnsmasq/009-Respect_the_--no_resolv_flag_in_inotify_code.patch Difference in files: diff --git a/config/rootfiles/core/94/filelists/files b/config/rootfiles/core/94/filelists/files index 9b08114..8ea8582 100644 --- a/config/rootfiles/core/94/filelists/files +++ b/config/rootfiles/core/94/filelists/files @@ -1,5 +1,6 @@ etc/system-release etc/issue +etc/rc.d/init.d/snort etc/rc.d/init.d/sshd srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/mail.cgi diff --git a/lfs/dnsmasq b/lfs/dnsmasq index f16c761..db56091 100644 --- a/lfs/dnsmasq +++ b/lfs/dnsmasq @@ -76,6 +76,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/001-include_0_0_0_0_8_in_DNS_rebind_checks.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/002-enhance_add_subnet_to_allow_arbitary_subnet_addresses.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/003-dont_answer_non_auth_queries_for_auth_zones_locally_when_localise_queries_set.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/004-fix_behaviour_of_empty_dhcp-option.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/005-suggest_solution_to_ENOMEM_error_with_IPv6_multicast.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/006-clarify_man_page_on_RDNSS_set_in_router_advertisement.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/007-handle_signed_dangling_CNAME_replies_to_DS_queries.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/008-DHCPv6_option_56_does_not_hold_an_address_list.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/009-Respect_the_--no_resolv_flag_in_inotify_code.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 \ diff --git a/src/initscripts/init.d/snort b/src/initscripts/init.d/snort index 42968d8..e03c80f 100644 --- a/src/initscripts/init.d/snort +++ b/src/initscripts/init.d/snort @@ -74,7 +74,7 @@ case "$1" in for DEVICE in $DEVICES; do boot_mesg "Starting Intrusion Detection System on $DEVICE..." - /usr/sbin/snort -c /etc/snort/snort.conf -i $DEVICE -D -l /var/log/snort --create-pidfile --nolock-pidfile --pid-path /var/run/ + /usr/sbin/snort -c /etc/snort/snort.conf -i $DEVICE -D -l /var/log/snort --create-pidfile --nolock-pidfile --pid-path /var/run evaluate_retval sleep 1 chmod 644 /var/run/snort_$DEVICE.pid diff --git a/src/patches/dnsmasq/004-fix_behaviour_of_empty_dhcp-option.patch b/src/patches/dnsmasq/004-fix_behaviour_of_empty_dhcp-option.patch new file mode 100644 index 0000000..492ada9 --- /dev/null +++ b/src/patches/dnsmasq/004-fix_behaviour_of_empty_dhcp-option.patch @@ -0,0 +1,38 @@ +From 5e3e464ac4022ee0b3794513abe510817e2cf3ca Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Tue, 25 Aug 2015 23:08:39 +0100 +Subject: [PATCH] Fix behaviour of empty dhcp-option=option6:dns-server, which + should inhibit sending option. + +--- + src/rfc3315.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/rfc3315.c b/src/rfc3315.c +index 2665d0d..3f1f9ee 100644 +--- a/src/rfc3315.c ++++ b/src/rfc3315.c +@@ -1320,15 +1320,16 @@ static struct dhcp_netid *add_options(struct state *state, int do_refresh) + + if (opt_cfg->opt == OPTION6_REFRESH_TIME) + done_refresh = 1; ++ ++ if (opt_cfg->opt == OPTION6_DNS_SERVER) ++ done_dns = 1; + +- if (opt_cfg->flags & DHOPT_ADDR6) ++ /* Empty DNS_SERVER option will not set DHOPT_ADDR6 */ ++ if ((opt_cfg->flags & DHOPT_ADDR6) || opt_cfg->opt == OPTION6_DNS_SERVER) + { + int len, j; + struct in6_addr *a; + +- if (opt_cfg->opt == OPTION6_DNS_SERVER) +- done_dns = 1; +- + for (a = (struct in6_addr *)opt_cfg->val, len = opt_cfg->len, j = 0; + j < opt_cfg->len; j += IN6ADDRSZ, a++) + if ((IN6_IS_ADDR_ULA_ZERO(a) && IN6_IS_ADDR_UNSPECIFIED(state->ula_addr)) || +-- +1.7.10.4 + diff --git a/src/patches/dnsmasq/005-suggest_solution_to_ENOMEM_error_with_IPv6_multicast.patch b/src/patches/dnsmasq/005-suggest_solution_to_ENOMEM_error_with_IPv6_multicast.patch new file mode 100644 index 0000000..c7cee60 --- /dev/null +++ b/src/patches/dnsmasq/005-suggest_solution_to_ENOMEM_error_with_IPv6_multicast.patch @@ -0,0 +1,50 @@ +From 9cdcfe9f19ffd45bac4e5b459879bf7c50a287ed Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Wed, 26 Aug 2015 22:38:08 +0100 +Subject: [PATCH] Suggest solution to ENOMEM error with IPv6 multicast. + +--- + src/network.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/src/network.c b/src/network.c +index a1d90c8..819302f 100644 +--- a/src/network.c ++++ b/src/network.c +@@ -1076,23 +1076,30 @@ void join_multicast(int dienow) + + if ((daemon->doing_dhcp6 || daemon->relay6) && + setsockopt(daemon->dhcp6fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq, sizeof(mreq)) == -1) +- err = 1; ++ err = errno; + + inet_pton(AF_INET6, ALL_SERVERS, &mreq.ipv6mr_multiaddr); + + if (daemon->doing_dhcp6 && + setsockopt(daemon->dhcp6fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq, sizeof(mreq)) == -1) +- err = 1; ++ err = errno; + + inet_pton(AF_INET6, ALL_ROUTERS, &mreq.ipv6mr_multiaddr); + + if (daemon->doing_ra && + setsockopt(daemon->icmp6fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq, sizeof(mreq)) == -1) +- err = 1; ++ err = errno; + + if (err) + { + char *s = _("interface %s failed to join DHCPv6 multicast group: %s"); ++ errno = err; ++ ++#ifdef HAVE_LINUX_NETWORK ++ if (errno == ENOMEM) ++ my_syslog(LOG_ERR, _("try increasing /proc/sys/net/core/optmem_max")); ++#endif ++ + if (dienow) + die(s, iface->name, EC_BADNET); + else +-- +1.7.10.4 + diff --git a/src/patches/dnsmasq/006-clarify_man_page_on_RDNSS_set_in_router_advertisement.patch b/src/patches/dnsmasq/006-clarify_man_page_on_RDNSS_set_in_router_advertisement.patch new file mode 100644 index 0000000..19c76e6 --- /dev/null +++ b/src/patches/dnsmasq/006-clarify_man_page_on_RDNSS_set_in_router_advertisement.patch @@ -0,0 +1,35 @@ +From 20fd11e11a9d09edcea94de135396ae1541fbbab Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Wed, 26 Aug 2015 22:48:13 +0100 +Subject: [PATCH] Clarify man page on RDNSS set in router advertisement. + +--- + man/dnsmasq.8 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 +index a23c898..d51b10f 100644 +--- a/man/dnsmasq.8 ++++ b/man/dnsmasq.8 +@@ -1687,15 +1687,15 @@ creation are handled by a different protocol. When DHCP is in use, + only a subset of this is needed, and dnsmasq can handle it, using + existing DHCP configuration to provide most data. When RA is enabled, + dnsmasq will advertise a prefix for each dhcp-range, with default +-router and recursive DNS server as the relevant link-local address on +-the machine running dnsmasq. By default, he "managed address" bits are set, and ++router as the relevant link-local address on ++the machine running dnsmasq. By default, the "managed address" bits are set, and + the "use SLAAC" bit is reset. This can be changed for individual + subnets with the mode keywords described in + .B --dhcp-range. + RFC6106 DNS parameters are included in the advertisements. By default, + the relevant link-local address of the machine running dnsmasq is sent + as recursive DNS server. If provided, the DHCPv6 options dns-server and +-domain-search are used for RDNSS and DNSSL. ++domain-search are used for the DNS server (RDNSS) and the domain serach list (DNSSL). + .TP + .B --ra-param=<interface>,[high|low],[[<ra-interval>],<router lifetime>] + Set non-default values for router advertisements sent via an +-- +1.7.10.4 + diff --git a/src/patches/dnsmasq/007-handle_signed_dangling_CNAME_replies_to_DS_queries.patch b/src/patches/dnsmasq/007-handle_signed_dangling_CNAME_replies_to_DS_queries.patch new file mode 100644 index 0000000..832a22e --- /dev/null +++ b/src/patches/dnsmasq/007-handle_signed_dangling_CNAME_replies_to_DS_queries.patch @@ -0,0 +1,30 @@ +From 6de81f1250fd323c9155de065d5a9dc200a6f20b Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Wed, 9 Sep 2015 22:51:13 +0100 +Subject: [PATCH] Handle signed dangling CNAME replies to DS queries. + +--- + src/dnssec.c | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/src/dnssec.c b/src/dnssec.c +index 4deda24..67ce486 100644 +--- a/src/dnssec.c ++++ b/src/dnssec.c +@@ -1232,11 +1232,8 @@ int dnssec_validate_ds(time_t now, struct dns_header *header, size_t plen, char + + /* If we return STAT_NO_SIG, name contains the name of the DS query */ + if (val == STAT_NO_SIG) +- { +- *keyname = 0; +- return val; +- } +- ++ return val; ++ + /* If the key needed to validate the DS is on the same domain as the DS, we'll + loop getting nowhere. Stop that now. This can happen of the DS answer comes + from the DS's zone, and not the parent zone. */ +-- +1.7.10.4 + diff --git a/src/patches/dnsmasq/008-DHCPv6_option_56_does_not_hold_an_address_list.patch b/src/patches/dnsmasq/008-DHCPv6_option_56_does_not_hold_an_address_list.patch new file mode 100644 index 0000000..fdccd0e --- /dev/null +++ b/src/patches/dnsmasq/008-DHCPv6_option_56_does_not_hold_an_address_list.patch @@ -0,0 +1,25 @@ +From 102208df695e886a3086754d32bf7f8c541fbe46 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Thu, 10 Sep 2015 21:50:00 +0100 +Subject: [PATCH] DHCPv6 option 56 does not hold an address list. (RFC 5908). + +--- + src/dhcp-common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dhcp-common.c b/src/dhcp-common.c +index bc48f41..8fc171a 100644 +--- a/src/dhcp-common.c ++++ b/src/dhcp-common.c +@@ -599,7 +599,7 @@ static const struct opttab_t opttab6[] = { + { "sntp-server", 31, OT_ADDR_LIST }, + { "information-refresh-time", 32, OT_TIME }, + { "FQDN", 39, OT_INTERNAL | OT_RFC1035_NAME }, +- { "ntp-server", 56, OT_ADDR_LIST }, ++ { "ntp-server", 56, 0 }, + { "bootfile-url", 59, OT_NAME }, + { "bootfile-param", 60, OT_CSTRING }, + { NULL, 0, 0 } +-- +1.7.10.4 + diff --git a/src/patches/dnsmasq/009-Respect_the_--no_resolv_flag_in_inotify_code.patch b/src/patches/dnsmasq/009-Respect_the_--no_resolv_flag_in_inotify_code.patch new file mode 100644 index 0000000..2014fdb --- /dev/null +++ b/src/patches/dnsmasq/009-Respect_the_--no_resolv_flag_in_inotify_code.patch @@ -0,0 +1,47 @@ +From 77607cbea0ad0f876dfb79c8b2c121ee400d57d0 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Thu, 10 Sep 2015 23:08:43 +0100 +Subject: [PATCH] Respect the --no-resolv flag in inotify code. + +--- + CHANGELOG | 7 ++++++- + debian/changelog | 6 ++++++ + src/inotify.c | 3 +++ + 3 files changed, 15 insertions(+), 1 deletion(-) + +diff --git a/CHANGELOG b/CHANGELOG +index bbc2834..d6e309f 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -7,8 +7,13 @@ version 2.76 + + Enhance --add-subnet to allow arbitrary subnet addresses. + Thanks to Ed Barsley for the patch. ++ ++ Respect the --no-resolv flag in inotify code. Fixes bug ++ which caused dnsmasq to fail to start if a resolv-file ++ was a dangling symbolic link, even of --no-resolv set. ++ Thanks to Alexander Kurtz for spotting the problem. ++ + +- + version 2.75 + Fix reversion on 2.74 which caused 100% CPU use when a + dhcp-script is configured. Thanks to Adrian Davey for +diff --git a/src/inotify.c b/src/inotify.c +index 52d412f..ef05c58 100644 +--- a/src/inotify.c ++++ b/src/inotify.c +@@ -90,6 +90,9 @@ void inotify_dnsmasq_init() + + if (daemon->inotifyfd == -1) + die(_("failed to create inotify: %s"), NULL, EC_MISC); ++ ++ if (option_bool(OPT_NO_RESOLV)) ++ return; + + for (res = daemon->resolv_files; res; res = res->next) + { +-- +1.7.10.4 + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 253983268e74482b0e032daf398625544c3a370e
by git＠ipfire.org 14 Sep '15

14 Sep '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 253983268e74482b0e032daf398625544c3a370e (commit) from 7f69895cb57bc6a41cdcb5b3725dd8f2bd21643f (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 253983268e74482b0e032daf398625544c3a370e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 14 22:33:29 2015 +0200 backports: disabled on x86_64. There is a duplicate kernel modul symbol in compat layer so backports modules will not load. I will debug this at next kernel update. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: make.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index 375f72d..fb417d5 100755 --- a/make.sh +++ b/make.sh @@ -421,10 +421,10 @@ buildipfire() { case "${TARGET_ARCH}" in x86_64) ipfiremake linux KCFG="" - ipfiremake backports KCFG="" +# ipfiremake backports KCFG="" ipfiremake cryptodev KCFG="" ipfiremake e1000e KCFG="" -# ipfiremake igb KCFG="" + ipfiremake igb KCFG="" ipfiremake ixgbe KCFG="" ipfiremake xtables-addons KCFG="" ipfiremake linux-initrd KCFG="" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7f69895cb57bc6a41cdcb5b3725dd8f2bd21643f
by git＠ipfire.org 14 Sep '15

14 Sep '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 7f69895cb57bc6a41cdcb5b3725dd8f2bd21643f (commit) via d9c6f56c2ea171cbc1fa396feb30d2814b9a818d (commit) from 1e4dbfbdf9a06512f52c2d49b77b5c2bc4d2a768 (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 7f69895cb57bc6a41cdcb5b3725dd8f2bd21643f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 14 19:50:58 2015 +0200 make.sh: generate correct SYSTEM_RELEASE string if --target= was used. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit d9c6f56c2ea171cbc1fa396feb30d2814b9a818d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Sep 14 19:50:13 2015 +0200 pakfire: use correct tree on x86_64. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/pakfire | 6 +++--- make.sh | 31 ++++++++++++++++--------------- 2 files changed, 19 insertions(+), 18 deletions(-) Difference in files: diff --git a/lfs/pakfire b/lfs/pakfire index 6f90f89..00d1bb1 100644 --- a/lfs/pakfire +++ b/lfs/pakfire @@ -30,10 +30,10 @@ THISAPP = pakfire DIR_APP = /opt/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -ifeq "$(MACHINE_TYPE)" "arm" - PAKFIRE_VERSION = $(VERSION)-$(MACHINE) -else +ifeq "$(MACHINE)" "i586" PAKFIRE_VERSION = $(VERSION) +else + PAKFIRE_VERSION = $(VERSION)-$(MACHINE) endif ############################################################################### diff --git a/make.sh b/make.sh index da8c17c..375f72d 100755 --- a/make.sh +++ b/make.sh @@ -86,21 +86,6 @@ if [ -z $EDITOR ]; then [ -z $EDITOR ] && exiterror "You should have installed an editor." fi -# Prepare string for /etc/system-release. -SYSTEM_RELEASE="${NAME} ${VERSION} (${MACHINE})" -if [ "$(git status -s | wc -l)" == "0" ]; then - GIT_STATUS="" -else - GIT_STATUS="-dirty" -fi -case "$GIT_BRANCH" in - core*|beta?|rc?) - SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS" - ;; - *) - SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" - ;; -esac prepareenv() { ############################################################################ @@ -240,6 +225,22 @@ prepareenv() { # Remove pre-install list of installed files in case user erase some files before rebuild rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null + + # Prepare string for /etc/system-release. + SYSTEM_RELEASE="${NAME} ${VERSION} (${MACHINE})" + if [ "$(git status -s | wc -l)" == "0" ]; then + GIT_STATUS="" + else + GIT_STATUS="-dirty" + fi + case "$GIT_BRANCH" in + core*|beta?|rc?) + SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS" + ;; + *) + SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" + ;; + esac } buildtoolchain() { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1e4dbfbdf9a06512f52c2d49b77b5c2bc4d2a768
by git＠ipfire.org 14 Sep '15

14 Sep '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5934eb5832d5d6c7768a78ca15b0b21ab2f4576e
by git＠ipfire.org 14 Sep '15

14 Sep '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 5934eb5832d5d6c7768a78ca15b0b21ab2f4576e (commit) from 71ca2447bff63413e2756df445d60dd251ac0ab4 (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 5934eb5832d5d6c7768a78ca15b0b21ab2f4576e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 14 13:37:31 2015 +0100 make.sh: Bump toolchain version Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/make.sh b/make.sh index 8554200..da8c17c 100755 --- a/make.sh +++ b/make.sh @@ -36,7 +36,7 @@ BUILD_IMAGES=1 # Flash and Xen Downloader KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` GIT_TAG=$(git tag | tail -1) # Git Tag GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit -TOOLCHAINVER=9 +TOOLCHAINVER=10 # New architecture variables BUILD_ARCH="$(uname -m)" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 71ca2447bff63413e2756df445d60dd251ac0ab4
by git＠ipfire.org 14 Sep '15

14 Sep '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 71ca2447bff63413e2756df445d60dd251ac0ab4 (commit) from b0ad5600dbc8c059dde746101af48a3bf51b9fae (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 71ca2447bff63413e2756df445d60dd251ac0ab4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 14 13:36:32 2015 +0100 ccache: Update to version 3.2.3 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/ccache | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/lfs/ccache b/lfs/ccache index 44010f9..64b09d1 100644 --- a/lfs/ccache +++ b/lfs/ccache @@ -24,10 +24,10 @@ include Config -VER = 3.1.8 +VER = 3.2.3 THISAPP = ccache-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)-pass$(PASS) @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0e0f25fb342dcb1196d9c2986a7323cf +$(DL_FILE)_MD5 = 608c78632086a4a051514722d6067a7b install : $(TARGET) @@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/tools cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) 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. b0ad5600dbc8c059dde746101af48a3bf51b9fae
by git＠ipfire.org 14 Sep '15

14 Sep '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 b0ad5600dbc8c059dde746101af48a3bf51b9fae (commit) via ef4580b9be728017687792405eeb315d5348eb57 (commit) via 6b3c55d4b4bed74193870a5d1fbf64485864e37f (commit) from 9f3bbb9d30a2b549f78659e3c7b9548d75467aa3 (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 b0ad5600dbc8c059dde746101af48a3bf51b9fae Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 14 13:07:43 2015 +0100 ccache: Include architecture in hashing ccache was configured to neglegt the compiler it is using which causes conflicts when using the same cache for compiling multiple architectures. Hence we include the architecture (and the toolchain version) in the hash so that a different hash will be generated. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit ef4580b9be728017687792405eeb315d5348eb57 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 14 13:07:22 2015 +0100 cyrus-imapd: Fix searching for missing header Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6b3c55d4b4bed74193870a5d1fbf64485864e37f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Sep 14 12:34:35 2015 +0100 cyrus-imapd: Disable build which fails on all architectures Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/cyrus-imapd | 5 ++--- make.sh | 2 +- tools/make-functions | 19 +++++++++++-------- 3 files changed, 14 insertions(+), 12 deletions(-) Difference in files: diff --git a/lfs/cyrus-imapd b/lfs/cyrus-imapd index c358f18..f4c855c 100644 --- a/lfs/cyrus-imapd +++ b/lfs/cyrus-imapd @@ -37,6 +37,8 @@ PAK_VER = 5 DEPS = "" +CFLAGS += -I/usr/include/et + ############################################################################### # Top-level Rules ############################################################################### @@ -80,9 +82,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-autocreate-0.9.4.diff cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/cyrus-imapd-2.2.12-gcc4.patch -# cp -f /usr/include/et/com_err.h /usr/include/com_err.h - cd $(DIR_APP) && cp -vf /usr/share/automake-*/config.{guess,sub} . - cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP) && ./configure --prefix=/usr --with-service-path=/usr/lib/cyrus \ --with-cyrus-prefix=/usr/lib/cyrus --sysconfdir=/var/ipfire/cyrusimap \ --with-auth=unix --with-perl --with-sasl --with-idle=idled \ diff --git a/make.sh b/make.sh index 235964b..8554200 100755 --- a/make.sh +++ b/make.sh @@ -236,7 +236,7 @@ prepareenv() { # Run LFS static binary creation scripts one by one export CCACHE_DIR=$BASEDIR/ccache export CCACHE_COMPRESS=1 - export CCACHE_COMPILERCHECK="none" + export CCACHE_COMPILERCHECK="string:toolchain-${TOOLCHAINVER}:${TARGET_ARCH}" # Remove pre-install list of installed files in case user erase some files before rebuild rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null diff --git a/tools/make-functions b/tools/make-functions index 68ae0a1..a94dbd7 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -456,8 +456,8 @@ entershell() { NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ CCACHE_DIR=/usr/src/ccache \ - CCACHE_COMPRESS=1 \ - CCACHE_COMPILERCHECK="none" \ + CCACHE_COMPRESS="${CCACHE_COMPRESS}" \ + CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \ KVER=$KVER \ BUILDTARGET="$BUILDTARGET" \ CROSSTARGET="${CROSSTARGET}" \ @@ -579,8 +579,9 @@ lfsmake2() { CONFIG_ROOT=$CONFIG_ROOT \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \ - CCACHE_COMPILERCHECK="none" \ + CCACHE_DIR=/usr/src/ccache \ + CCACHE_COMPRESS="${CCACHE_COMPRESS}" \ + CCACHE_COMPILERCHECK="${CCACHE_COMPILERCACHE}" \ KVER=$KVER MAKETUNING=$MAKETUNING \ BUILDTARGET="$BUILDTARGET" \ CROSSTARGET="${CROSSTARGET}" \ @@ -620,8 +621,9 @@ ipfiremake() { NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ SYSTEM_RELEASE="$SYSTEM_RELEASE" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \ - CCACHE_COMPILERCHECK="none" \ + CCACHE_DIR=/usr/src/ccache \ + CCACHE_COMPRESS="${CCACHE_COMPRESS}" \ + CCACHE_COMPILERCHECK="${CCACHE_COMPILERCACHE}" \ KVER=$KVER MAKETUNING=$MAKETUNING \ BUILDTARGET="$BUILDTARGET" \ CROSSTARGET="${CROSSTARGET}" \ @@ -659,8 +661,9 @@ ipfiredist() { CONFIG_ROOT=$CONFIG_ROOT \ NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ - CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \ - CCACHE_COMPILERCHECK="none" \ + CCACHE_DIR=/usr/src/ccache \ + CCACHE_COMPRESS="${CCACHE_COMPRESS}" \ + CCACHE_COMPILERCHECK="${CCACHE_COMPILERCACHE}" \ KVER=$KVER \ BUILDTARGET="$BUILDTARGET" \ CROSSTARGET="${CROSSTARGET}" \ hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM