Development August 2015

development@lists.ipfire.org

15 participants
32 discussions

copying ipfire settings to new computer
by robert 25 Aug '15

25 Aug '15

Hi there, we have ipfire running on a box I want to replace. I allready did set up a new computer. Now I would like to copy all the settings from the old box to the new one. I am especially interested in copying the vpn keys, as a number of external devices use them and can not easily be changed. What should I copy to the new box. thanks for your time robert

3 2

[PATCH] Add ability for filesystem check and restart network through GUI
by Osmar Gonzalez 20 Aug '15

20 Aug '15

Just on the side note I added the function of restarting the network stack through the GUI only because I find useful at times when the DNS might be stall or when in DHCP mode the IP address wasn't renewed, simply restarting the network stack helps in fixing minor problems here in there without the need to login through SSH or CLI to restart diff --git a/html/cgi-bin/shutdown.cgi b/html/cgi-bin/shutdown.cgi index 998f9f8..fa66962 100644 --- a/html/cgi-bin/shutdown.cgi +++ b/html/cgi-bin/shutdown.cgi @@ -34,6 +34,13 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'}) { $rebirth = 1; &General::log($Lang::tr{'rebooting ipfire'}); system '/usr/local/bin/ipfirereboot boot'; +} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'reboot_net'}) { + &General::log($Lang::tr{'rebooting network'}); + system '/usr/local/bin/ipfirereboot network &> /dev/null'; +} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'reboot_fs'}) { + $rebirth = 1; + &General::log($Lang::tr{'rebooting fs'}); + system '/usr/local/bin/ipfirereboot bootfs'; } if ($death == 0 && $rebirth == 0) { @@ -51,6 +58,12 @@ if ($death == 0 && $rebirth == 0) { <td width='50%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown'}' /></td> </tr> </table> +<table width='100%'> +<tr> + <td width='50%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot_net'}' /></td> + <td width='50%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot_fs'}' /></td> +</tr> +</table> END ; &Header::closebox(); @@ -85,4 +98,3 @@ END &Header::closebigbox(); &Header::closepage(); - diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index af7fda9..a2ba697 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1917,8 +1917,12 @@ 'reboot question' => 'Extra query for restart and shutdown', 'reboot schedule' => 'Schedule IPFire reboots', 'reboot sure' => 'Are you sure that you want to reboot?', +'reboot_fs' => 'File Systemcheck', +'reboot_net' => 'Reboot Network', 'rebooting' => 'Rebooting', +'rebooting fs' => 'Rebooting with filesystem check.', 'rebooting ipfire' => 'Rebooting IPFire', +'rebooting network' => 'Rebooting Network', 'reconnect' => 'Reconnect', 'reconnection' => 'Reconnection', 'red' => 'Internet', diff --git a/src/misc-progs/ipfirereboot.c b/src/misc-progs/ipfirereboot.c index 5e75879..5f11ba3 100644 --- a/src/misc-progs/ipfirereboot.c +++ b/src/misc-progs/ipfirereboot.c @@ -29,7 +29,8 @@ /* define operations */ #define OP_REBOOT "boot" -#define OP_REBOOT_FS "bootfs" // add filesystem check option (not yet in GUI) +#define OP_REBOOT_FS "bootfs" +#define OP_REBOOT_NETWORK "network" #define OP_SHUTDOWN "down" #define OP_SCHEDULE_ADD "cron+" #define OP_SCHEDULE_REM "cron-" @@ -66,6 +67,13 @@ int main(int argc, char**argv) return 0; } + if (argc==2 && strcmp(argv[1], OP_REBOOT_NETWORK)==0) + { + safe_system("/etc/rc.d/init.d/network stop"); + safe_system("/etc/rc.d/init.d/network start"); + return 0; + } + // output schedule to stdout if (argc==2 && strcmp(argv[1], OP_SCHEDULE_GET)==0) {

2 1

pcre 8.37 with latest patches won't build
by Matthias Fischer 20 Aug '15

20 Aug '15

Hi, yesterday I tried to build the latest 'next', but it failed. It couldn't apply 'pcre-8.37-Fix-another-buffer-overflow.patch': ***SNIP*** Aug 18 19:03:54: Building pcre pcre-8.37.tar.gz checksum OK + cd /usr/src/lfs + make -f pcre LFS_BASEDIR=/usr/src install ====================================== Installing pcre-8.37 ... Install started; saving file list to /usr/src/lsalr ... cd /usr/src/pcre-8.37 && patch -Np1 < /usr/src/src/patches/pcre-8.37-Fix-buffer-overflow-for-named-recursive-back-referen.patch patching file pcre_compile.c patching file testdata/testinput2 patching file testdata/testoutput2 cd /usr/src/pcre-8.37 && patch -Np1 < /usr/src/src/patches/pcre-8.37-Fix-buffer-overflow-for-forward-reference-within-bac.patch patching file pcre_compile.c patching file testdata/testinput2 patching file testdata/testoutput2 cd /usr/src/pcre-8.37 && patch -Np1 < /usr/src/src/patches/pcre-8.37-Fix-another-buffer-overflow.patch patching file pcre_compile.c Hunk #1 FAILED at 7210. 1 out of 1 hunk FAILED -- saving rejects to file pcre_compile.c.rej patching file testdata/testinput2 patching file testdata/testoutput11-16 patching file testdata/testoutput11-32 patching file testdata/testoutput11-8 patching file testdata/testoutput2 make: *** [/usr/src/log/pcre-8.37] Error 1 ***SNAP*** 'pcre_compile.c.rej' says: ***SNIP*** --- pcre_compile.c +++ pcre_compile.c @@ -7210,7 +7210,12 @@ real compile this will be picked up and the reference wrapped with OP_ONCE to make it atomic, so we must space in case this occurs. */ - if (recno == 0) *lengthptr += 2 + 2*LINK_SIZE; + /* In fact, this can happen for a non-forward reference because + another group with the same number might be created later. This + issue is fixed "properly" in PCRE2. As PCRE1 is now in maintenance + only mode, we finesse the bug by allowing more memory always. */ + + /* if (recno == 0) */ *lengthptr += 2 + 2*LINK_SIZE; } /* In the real compile, search the name table. We check the name ***SNAP*** Deleting this section didn't help. Anyone else or my fault? Regards Matthias

2 2

[PATCH] igb: Update to 5.3.2.2
by Matthias Fischer 17 Aug '15

17 Aug '15

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/igb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/igb b/lfs/igb index fa762e0..3e2d7c6 100644 --- a/lfs/igb +++ b/lfs/igb @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -27,7 +27,7 @@ include Config VERSUFIX = ipfire$(KCFG) MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/igb/ -VER = 5.2.9.3 +VER = 5.3.2.2 THISAPP = igb-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 814395d3b76090f378002bddecfd2dfc +$(DL_FILE)_MD5 = 933653f90be9826e756e12248f0d4acd install : $(TARGET) -- 2.5.0

3 4

[PATCH] hdparm: Update to 9.48
by Matthias Fischer 15 Aug '15

15 Aug '15

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/hdparm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/hdparm b/lfs/hdparm index e4e2e53..e4e9ac1 100644 --- a/lfs/hdparm +++ b/lfs/hdparm @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -24,7 +24,7 @@ include Config -VER = 9.45 +VER = 9.48 THISAPP = hdparm-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1c75d0751a44928b6c4bc81fb16d7fe8 +$(DL_FILE)_MD5 = 213efdbe7471fad3408198918e164354 install : $(TARGET) -- 2.5.0

1 0

[PATCH] file: Update to 5.24
by Matthias Fischer 15 Aug '15

15 Aug '15

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/file | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/file b/lfs/file index bfd7552..49829d0 100644 --- a/lfs/file +++ b/lfs/file @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 Michael Tremer & Christian Schmidt # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 5.20 +VER = 5.24 THISAPP = file-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5d5e13eb3e0e13839da869a31790faf2 +$(DL_FILE)_MD5 = ec161b5a0d2aef147fb046e5630b1408 install : $(TARGET) -- 2.5.0

1 0

[PATCH] coreutils: Update to 8.24
by Matthias Fischer 15 Aug '15

15 Aug '15

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/coreutils | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/coreutils b/lfs/coreutils index cd2440d..ede0493 100644 --- a/lfs/coreutils +++ b/lfs/coreutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# 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 # @@ -24,7 +24,7 @@ include Config -VER = 8.23 +VER = 8.24 THISAPP = coreutils-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -60,7 +60,7 @@ objects =$(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = abed135279f87ad6762ce57ff6d89c41 +$(DL_FILE)_MD5 = 40efdbce865d2458d8da0a9dcee7c16c install : $(TARGET) -- 2.5.0

1 0

[PATCH] dnsmasq: latest upstream patches
by matthias.fischer＠ipfire.org 15 Aug '15

15 Aug '15

From: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/dnsmasq | 4 + ...01-include_0_0_0_0_8_in_DNS_rebind_checks.patch | 41 ++++ ...subnet_to_allow_arbitary_subnet_addresses.patch | 271 +++++++++++++++++++++ ...h_zones_locally_when_localise_queries_set.patch | 34 +++ 4 files changed, 350 insertions(+) create mode 100644 src/patches/dnsmasq/001-include_0_0_0_0_8_in_DNS_rebind_checks.patch create mode 100644 src/patches/dnsmasq/002-enhance_add_subnet_to_allow_arbitary_subnet_addresses.patch create mode 100644 src/patches/dnsmasq/003-dont_answer_non_auth_queries_for_auth_zones_locally_when_localise_queries_set.patch diff --git a/lfs/dnsmasq b/lfs/dnsmasq index f327967..f16c761 100644 --- a/lfs/dnsmasq +++ b/lfs/dnsmasq @@ -73,7 +73,11 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/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-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' \ -e 's|/\* #define HAVE_DNSSEC \*/|#define HAVE_DNSSEC|g' \ diff --git a/src/patches/dnsmasq/001-include_0_0_0_0_8_in_DNS_rebind_checks.patch b/src/patches/dnsmasq/001-include_0_0_0_0_8_in_DNS_rebind_checks.patch new file mode 100644 index 0000000..8a2557a --- /dev/null +++ b/src/patches/dnsmasq/001-include_0_0_0_0_8_in_DNS_rebind_checks.patch @@ -0,0 +1,41 @@ +From d2aa7dfbb6d1088dcbea9fecc61b9293b320eb95 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Mon, 3 Aug 2015 21:52:12 +0100 +Subject: [PATCH] Include 0.0.0.0/8 in DNS rebind checks. + +--- + CHANGELOG | 7 +++++++ + src/rfc1035.c | 3 ++- + 2 files changed, 9 insertions(+), 1 deletion(-) + +diff --git a/CHANGELOG b/CHANGELOG +index 901da47..3f4026d 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,10 @@ ++version 2.76 ++ Include 0.0.0.0/8 in DNS rebind checks. This range ++ translates to hosts on the local network, or, at ++ least, 0.0.0.0 accesses the local host, so could ++ be targets for DNS rebinding. See RFC 5735 section 3 ++ for details. Thanks to Stephen RÃ¶ttger for the bug report. ++ + 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/rfc1035.c b/src/rfc1035.c +index 56647b0..29e9e65 100644 +--- a/src/rfc1035.c ++++ b/src/rfc1035.c +@@ -728,7 +728,8 @@ int private_net(struct in_addr addr, int ban_localhost) + in_addr_t ip_addr = ntohl(addr.s_addr); + + return +- (((ip_addr & 0xFF000000) == 0x7F000000) && ban_localhost) /* 127.0.0.0/8 (loopback) */ || ++ (((ip_addr & 0xFF000000) == 0x7F000000) && ban_localhost) /* 127.0.0.0/8 (loopback) */ || ++ ((ip_addr & 0xFF000000) == 0x00000000) /* RFC 5735 section 3. "here" network */ || + ((ip_addr & 0xFFFF0000) == 0xC0A80000) /* 192.168.0.0/16 (private) */ || + ((ip_addr & 0xFF000000) == 0x0A000000) /* 10.0.0.0/8 (private) */ || + ((ip_addr & 0xFFF00000) == 0xAC100000) /* 172.16.0.0/12 (private) */ || +-- +1.7.10.4 diff --git a/src/patches/dnsmasq/002-enhance_add_subnet_to_allow_arbitary_subnet_addresses.patch b/src/patches/dnsmasq/002-enhance_add_subnet_to_allow_arbitary_subnet_addresses.patch new file mode 100644 index 0000000..2d3d6e4 --- /dev/null +++ b/src/patches/dnsmasq/002-enhance_add_subnet_to_allow_arbitary_subnet_addresses.patch @@ -0,0 +1,271 @@ +From a7369bef8abd241c3d85633fa9c870943f091e76 Mon Sep 17 00:00:00 2001 +From: Ed Bardsley <ebardsley(a)google.com> +Date: Wed, 5 Aug 2015 21:17:18 +0100 +Subject: [PATCH] Enhance --add-subnet to allow arbitary subnet addresses. + +--- + CHANGELOG | 4 ++++ + man/dnsmasq.8 | 32 ++++++++++++++++++++----------- + src/dnsmasq.h | 13 ++++++++++--- + src/option.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- + src/rfc1035.c | 39 +++++++++++++++++++++++++++++++------- + 5 files changed, 121 insertions(+), 26 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index 3f4026d..bbc2834 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -4,6 +4,10 @@ version 2.76 + least, 0.0.0.0 accesses the local host, so could + be targets for DNS rebinding. See RFC 5735 section 3 + for details. Thanks to Stephen RÃ¶ttger for the bug report. ++ ++ Enhance --add-subnet to allow arbitrary subnet addresses. ++ Thanks to Ed Barsley for the patch. ++ + + version 2.75 + Fix reversion on 2.74 which caused 100% CPU use when a +diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 +index c8913b5..a23c898 100644 +--- a/man/dnsmasq.8 ++++ b/man/dnsmasq.8 +@@ -604,17 +604,27 @@ experimental. Also note that exposing MAC addresses in this way may + have security and privacy implications. The warning about caching + given for --add-subnet applies to --add-mac too. + .TP +-.B --add-subnet[[=<IPv4 prefix length>],<IPv6 prefix length>] +-Add the subnet address of the requestor to the DNS queries which are +-forwarded upstream. The amount of the address forwarded depends on the +-prefix length parameter: 32 (128 for IPv6) forwards the whole address, +-zero forwards none of it but still marks the request so that no +-upstream nameserver will add client address information either. The +-default is zero for both IPv4 and IPv6. Note that upstream nameservers +-may be configured to return different results based on this +-information, but the dnsmasq cache does not take account. If a dnsmasq +-instance is configured such that different results may be encountered, +-caching should be disabled. ++.B --add-subnet[[=[<IPv4 address>/]<IPv4 prefix length>][,[<IPv6 address>/]<IPv6 prefix length>]] ++Add a subnet address to the DNS queries which are forwarded ++upstream. If an address is specified in the flag, it will be used, ++otherwise, the address of the requestor will be used. The amount of ++the address forwarded depends on the prefix length parameter: 32 (128 ++for IPv6) forwards the whole address, zero forwards none of it but ++still marks the request so that no upstream nameserver will add client ++address information either. The default is zero for both IPv4 and ++IPv6. Note that upstream nameservers may be configured to return ++different results based on this information, but the dnsmasq cache ++does not take account. If a dnsmasq instance is configured such that ++different results may be encountered, caching should be disabled. ++ ++For example, ++.B --add-subnet=24,96 ++will add the /24 and /96 subnets of the requestor for IPv4 and IPv6 requestors, respectively. ++.B --add-subnet=1.2.3.4/24 ++will add 1.2.3.0/24 for IPv4 requestors and ::/0 for IPv6 requestors. ++.B --add-subnet=1.2.3.4/24,1.2.3.4/24 ++will add 1.2.3.0/24 for both IPv4 and IPv6 requestors. ++ + .TP + .B \-c, --cache-size=<cachesize> + Set the size of dnsmasq's cache. The default is 150 names. Setting the cache size to zero disables caching. +diff --git a/src/dnsmasq.h b/src/dnsmasq.h +index cf1a782..f42acdb 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -541,6 +541,13 @@ struct iname { + struct iname *next; + }; + ++/* subnet parameters from command line */ ++struct mysubnet { ++ union mysockaddr addr; ++ int addr_used; ++ int mask; ++}; ++ + /* resolv-file parms from command-line */ + struct resolvc { + struct resolvc *next; +@@ -935,9 +942,9 @@ extern struct daemon { + struct auth_zone *auth_zones; + struct interface_name *int_names; + char *mxtarget; +- int addr4_netmask; +- int addr6_netmask; +- char *lease_file; ++ struct mysubnet *add_subnet4; ++ struct mysubnet *add_subnet6; ++ char *lease_file; + char *username, *groupname, *scriptuser; + char *luascript; + char *authserver, *hostmaster; +diff --git a/src/option.c b/src/option.c +index ecc2619..746cd11 100644 +--- a/src/option.c ++++ b/src/option.c +@@ -445,7 +445,7 @@ static struct { + { LOPT_PXE_SERV, ARG_DUP, "<service>", gettext_noop("Boot service for PXE menu."), NULL }, + { LOPT_TEST, 0, NULL, gettext_noop("Check configuration syntax."), NULL }, + { LOPT_ADD_MAC, OPT_ADD_MAC, NULL, gettext_noop("Add requestor's MAC address to forwarded DNS queries."), NULL }, +- { LOPT_ADD_SBNET, ARG_ONE, "<v4 pref>[,<v6 pref>]", gettext_noop("Add requestor's IP subnet to forwarded DNS queries."), NULL }, ++ { LOPT_ADD_SBNET, ARG_ONE, "<v4 pref>[,<v6 pref>]", gettext_noop("Add specified IP subnet to forwarded DNS queries."), NULL }, + { LOPT_DNSSEC, OPT_DNSSEC_PROXY, NULL, gettext_noop("Proxy DNSSEC validation results from upstream nameservers."), NULL }, + { LOPT_INCR_ADDR, OPT_CONSEC_ADDR, NULL, gettext_noop("Attempt to allocate sequential IP addresses to DHCP clients."), NULL }, + { LOPT_CONNTRACK, OPT_CONNTRACK, NULL, gettext_noop("Copy connection-track mark from queries to upstream connections."), NULL }, +@@ -722,6 +722,20 @@ static void do_usage(void) + + #define ret_err(x) do { strcpy(errstr, (x)); return 0; } while (0) + ++static char *parse_mysockaddr(char *arg, union mysockaddr *addr) ++{ ++ if (inet_pton(AF_INET, arg, &addr->in.sin_addr) > 0) ++ addr->sa.sa_family = AF_INET; ++#ifdef HAVE_IPV6 ++ else if (inet_pton(AF_INET6, arg, &addr->in6.sin6_addr) > 0) ++ addr->sa.sa_family = AF_INET6; ++#endif ++ else ++ return _("bad address"); ++ ++ return NULL; ++} ++ + char *parse_server(char *arg, union mysockaddr *addr, union mysockaddr *source_addr, char *interface, int *flags) + { + int source_port = 0, serv_port = NAMESERVER_PORT; +@@ -1585,7 +1599,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + li = match_suffix->next; + free(match_suffix->suffix); + free(match_suffix); +- } ++ } + break; + } + +@@ -1593,10 +1607,45 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma + set_option_bool(OPT_CLIENT_SUBNET); + if (arg) + { ++ char *err, *end; + comma = split(arg); +- if (!atoi_check(arg, &daemon->addr4_netmask) || +- (comma && !atoi_check(comma, &daemon->addr6_netmask))) +- ret_err(gen_err); ++ ++ struct mysubnet* new = opt_malloc(sizeof(struct mysubnet)); ++ if ((end = split_chr(arg, '/'))) ++ { ++ /* has subnet+len */ ++ err = parse_mysockaddr(arg, &new->addr); ++ if (err) ++ ret_err(err); ++ if (!atoi_check(end, &new->mask)) ++ ret_err(gen_err); ++ new->addr_used = 1; ++ } ++ else if (!atoi_check(arg, &new->mask)) ++ ret_err(gen_err); ++ ++ daemon->add_subnet4 = new; ++ ++ new = opt_malloc(sizeof(struct mysubnet)); ++ if (comma) ++ { ++ if ((end = split_chr(comma, '/'))) ++ { ++ /* has subnet+len */ ++ err = parse_mysockaddr(comma, &new->addr); ++ if (err) ++ ret_err(err); ++ if (!atoi_check(end, &new->mask)) ++ ret_err(gen_err); ++ new->addr_used = 1; ++ } ++ else ++ { ++ if (!atoi_check(comma, &new->mask)) ++ ret_err(gen_err); ++ } ++ } ++ daemon->add_subnet6 = new; + } + break; + +diff --git a/src/rfc1035.c b/src/rfc1035.c +index 29e9e65..6a51b30 100644 +--- a/src/rfc1035.c ++++ b/src/rfc1035.c +@@ -629,26 +629,47 @@ struct subnet_opt { + #endif + }; + ++static void *get_addrp(union mysockaddr *addr, const short family) ++{ ++#ifdef HAVE_IPV6 ++ if (family == AF_INET6) ++ return &addr->in6.sin6_addr; ++#endif ++ ++ return &addr->in.sin_addr; ++} ++ + static size_t calc_subnet_opt(struct subnet_opt *opt, union mysockaddr *source) + { + /* http://tools.ietf.org/html/draft-vandergaast-edns-client-subnet-02 */ + + int len; + void *addrp; ++ int sa_family = source->sa.sa_family; + + #ifdef HAVE_IPV6 + if (source->sa.sa_family == AF_INET6) + { +- opt->family = htons(2); +- opt->source_netmask = daemon->addr6_netmask; +- addrp = &source->in6.sin6_addr; ++ opt->source_netmask = daemon->add_subnet6->mask; ++ if (daemon->add_subnet6->addr_used) ++ { ++ sa_family = daemon->add_subnet6->addr.sa.sa_family; ++ addrp = get_addrp(&daemon->add_subnet6->addr, sa_family); ++ } ++ else ++ addrp = &source->in6.sin6_addr; + } + else + #endif + { +- opt->family = htons(1); +- opt->source_netmask = daemon->addr4_netmask; +- addrp = &source->in.sin_addr; ++ opt->source_netmask = daemon->add_subnet4->mask; ++ if (daemon->add_subnet4->addr_used) ++ { ++ sa_family = daemon->add_subnet4->addr.sa.sa_family; ++ addrp = get_addrp(&daemon->add_subnet4->addr, sa_family); ++ } ++ else ++ addrp = &source->in.sin_addr; + } + + opt->scope_netmask = 0; +@@ -656,6 +677,11 @@ static size_t calc_subnet_opt(struct subnet_opt *opt, union mysockaddr *source) + + if (opt->source_netmask != 0) + { ++#ifdef HAVE_IPV6 ++ opt->family = htons(sa_family == AF_INET6 ? 2 : 1); ++#else ++ opt->family = htons(1); ++#endif + len = ((opt->source_netmask - 1) >> 3) + 1; + memcpy(opt->addr, addrp, len); + if (opt->source_netmask & 7) +@@ -2335,4 +2361,3 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen, + + return len; + } +- +-- +1.7.10.4 diff --git a/src/patches/dnsmasq/003-dont_answer_non_auth_queries_for_auth_zones_locally_when_localise_queries_set.patch b/src/patches/dnsmasq/003-dont_answer_non_auth_queries_for_auth_zones_locally_when_localise_queries_set.patch new file mode 100644 index 0000000..cfbcdfb --- /dev/null +++ b/src/patches/dnsmasq/003-dont_answer_non_auth_queries_for_auth_zones_locally_when_localise_queries_set.patch @@ -0,0 +1,34 @@ +From 3a3965ac21b1b759eab8799b6edb09195b671306 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Sun, 9 Aug 2015 17:45:06 +0100 +Subject: [PATCH] Don't answer non-auth queries for auth zones locally when + --localise-queries set. + +--- + src/forward.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/forward.c b/src/forward.c +index 2731b90..b76a974 100644 +--- a/src/forward.c ++++ b/src/forward.c +@@ -1365,7 +1365,7 @@ void receive_query(struct listener *listen, time_t now) + + #ifdef HAVE_AUTH + /* find queries for zones we're authoritative for, and answer them directly */ +- if (!auth_dns) ++ if (!auth_dns && !option_bool(OPT_LOCALISE)) + for (zone = daemon->auth_zones; zone; zone = zone->next) + if (in_zone(zone, daemon->namebuff, NULL)) + { +@@ -1904,7 +1904,7 @@ unsigned char *tcp_request(int confd, time_t now, + + #ifdef HAVE_AUTH + /* find queries for zones we're authoritative for, and answer them directly */ +- if (!auth_dns) ++ if (!auth_dns && !option_bool(OPT_LOCALISE)) + for (zone = daemon->auth_zones; zone; zone = zone->next) + if (in_zone(zone, daemon->namebuff, NULL)) + { +-- +1.7.10.4 -- 2.5.0

1 0

[PATCH] actual system time and timezone info-bar to ipfire theme
by Xaver4all 13 Aug '15

13 Aug '15

Hi all, this is my first time using this mailing-list thing, so hopefully I do everything according to your CoC. [PATCH] add actual system time and timezone info-bar to ipfire theme. position can be configured in GUI user-settings, default is off. future reference, German discussion in forum: http://forum.ipfire.org/viewtopic.php?f=17&t=12177 attached is a patch against the actual next branch br, Kim

4 4

[PATCH] rrdtool: Update to 1.5.4
by matthias.fischer＠ipfire.org 13 Aug '15

13 Aug '15

From: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/rrdtool | 185 ++++++++++++++++++++-------------------- lfs/rrdtool | 4 +- 2 files changed, 95 insertions(+), 94 deletions(-) diff --git a/config/rootfiles/common/rrdtool b/config/rootfiles/common/rrdtool index 738fe37..6a79679 100644 --- a/config/rootfiles/common/rrdtool +++ b/config/rootfiles/common/rrdtool @@ -26,98 +26,98 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/RRDs.pm #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.bs usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.so #usr/lib/pkgconfig/librrd.pc -#usr/share/doc/rrdtool-1.5.3 -#usr/share/doc/rrdtool-1.5.3/html -#usr/share/doc/rrdtool-1.5.3/html/RRDp.html -#usr/share/doc/rrdtool-1.5.3/html/RRDs.html -#usr/share/doc/rrdtool-1.5.3/html/bin_dec_hex.html -#usr/share/doc/rrdtool-1.5.3/html/cdeftutorial.html -#usr/share/doc/rrdtool-1.5.3/html/index.html -#usr/share/doc/rrdtool-1.5.3/html/librrd.html -#usr/share/doc/rrdtool-1.5.3/html/rpntutorial.html -#usr/share/doc/rrdtool-1.5.3/html/rrd-beginners.html -#usr/share/doc/rrdtool-1.5.3/html/rrdbuild.html -#usr/share/doc/rrdtool-1.5.3/html/rrdcached.html -#usr/share/doc/rrdtool-1.5.3/html/rrdcgi.html -#usr/share/doc/rrdtool-1.5.3/html/rrdcreate.html -#usr/share/doc/rrdtool-1.5.3/html/rrddump.html -#usr/share/doc/rrdtool-1.5.3/html/rrdfetch.html -#usr/share/doc/rrdtool-1.5.3/html/rrdfirst.html -#usr/share/doc/rrdtool-1.5.3/html/rrdflushcached.html -#usr/share/doc/rrdtool-1.5.3/html/rrdgraph.html -#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_data.html -#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_examples.html -#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_graph.html -#usr/share/doc/rrdtool-1.5.3/html/rrdgraph_rpn.html -#usr/share/doc/rrdtool-1.5.3/html/rrdinfo.html -#usr/share/doc/rrdtool-1.5.3/html/rrdlast.html -#usr/share/doc/rrdtool-1.5.3/html/rrdlastupdate.html -#usr/share/doc/rrdtool-1.5.3/html/rrdresize.html -#usr/share/doc/rrdtool-1.5.3/html/rrdrestore.html -#usr/share/doc/rrdtool-1.5.3/html/rrdthreads.html -#usr/share/doc/rrdtool-1.5.3/html/rrdtool.html -#usr/share/doc/rrdtool-1.5.3/html/rrdtune.html -#usr/share/doc/rrdtool-1.5.3/html/rrdtutorial.html -#usr/share/doc/rrdtool-1.5.3/html/rrdupdate.html -#usr/share/doc/rrdtool-1.5.3/html/rrdxport.html -#usr/share/doc/rrdtool-1.5.3/txt -#usr/share/doc/rrdtool-1.5.3/txt/bin_dec_hex.pod -#usr/share/doc/rrdtool-1.5.3/txt/bin_dec_hex.txt -#usr/share/doc/rrdtool-1.5.3/txt/cdeftutorial.pod -#usr/share/doc/rrdtool-1.5.3/txt/cdeftutorial.txt -#usr/share/doc/rrdtool-1.5.3/txt/librrd.txt -#usr/share/doc/rrdtool-1.5.3/txt/rpntutorial.pod -#usr/share/doc/rrdtool-1.5.3/txt/rpntutorial.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrd-beginners.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrd-beginners.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdbuild.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdbuild.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdcached.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdcached.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdcgi.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdcgi.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdcreate.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdcreate.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrddump.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrddump.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdfetch.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdfetch.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdfirst.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdfirst.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdflushcached.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdflushcached.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_data.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_data.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_examples.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_examples.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_graph.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_graph.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_rpn.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdgraph_rpn.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdinfo.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdinfo.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdlast.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdlast.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdlastupdate.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdlastupdate.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdresize.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdresize.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdrestore.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdrestore.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdthreads.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdthreads.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdtool.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdtool.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdtune.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdtune.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdtutorial.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdtutorial.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdupdate.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdupdate.txt -#usr/share/doc/rrdtool-1.5.3/txt/rrdxport.pod -#usr/share/doc/rrdtool-1.5.3/txt/rrdxport.txt +#usr/share/doc/rrdtool-1.5.4 +#usr/share/doc/rrdtool-1.5.4/html +#usr/share/doc/rrdtool-1.5.4/html/RRDp.html +#usr/share/doc/rrdtool-1.5.4/html/RRDs.html +#usr/share/doc/rrdtool-1.5.4/html/bin_dec_hex.html +#usr/share/doc/rrdtool-1.5.4/html/cdeftutorial.html +#usr/share/doc/rrdtool-1.5.4/html/index.html +#usr/share/doc/rrdtool-1.5.4/html/librrd.html +#usr/share/doc/rrdtool-1.5.4/html/rpntutorial.html +#usr/share/doc/rrdtool-1.5.4/html/rrd-beginners.html +#usr/share/doc/rrdtool-1.5.4/html/rrdbuild.html +#usr/share/doc/rrdtool-1.5.4/html/rrdcached.html +#usr/share/doc/rrdtool-1.5.4/html/rrdcgi.html +#usr/share/doc/rrdtool-1.5.4/html/rrdcreate.html +#usr/share/doc/rrdtool-1.5.4/html/rrddump.html +#usr/share/doc/rrdtool-1.5.4/html/rrdfetch.html +#usr/share/doc/rrdtool-1.5.4/html/rrdfirst.html +#usr/share/doc/rrdtool-1.5.4/html/rrdflushcached.html +#usr/share/doc/rrdtool-1.5.4/html/rrdgraph.html +#usr/share/doc/rrdtool-1.5.4/html/rrdgraph_data.html +#usr/share/doc/rrdtool-1.5.4/html/rrdgraph_examples.html +#usr/share/doc/rrdtool-1.5.4/html/rrdgraph_graph.html +#usr/share/doc/rrdtool-1.5.4/html/rrdgraph_rpn.html +#usr/share/doc/rrdtool-1.5.4/html/rrdinfo.html +#usr/share/doc/rrdtool-1.5.4/html/rrdlast.html +#usr/share/doc/rrdtool-1.5.4/html/rrdlastupdate.html +#usr/share/doc/rrdtool-1.5.4/html/rrdresize.html +#usr/share/doc/rrdtool-1.5.4/html/rrdrestore.html +#usr/share/doc/rrdtool-1.5.4/html/rrdthreads.html +#usr/share/doc/rrdtool-1.5.4/html/rrdtool.html +#usr/share/doc/rrdtool-1.5.4/html/rrdtune.html +#usr/share/doc/rrdtool-1.5.4/html/rrdtutorial.html +#usr/share/doc/rrdtool-1.5.4/html/rrdupdate.html +#usr/share/doc/rrdtool-1.5.4/html/rrdxport.html +#usr/share/doc/rrdtool-1.5.4/txt +#usr/share/doc/rrdtool-1.5.4/txt/bin_dec_hex.pod +#usr/share/doc/rrdtool-1.5.4/txt/bin_dec_hex.txt +#usr/share/doc/rrdtool-1.5.4/txt/cdeftutorial.pod +#usr/share/doc/rrdtool-1.5.4/txt/cdeftutorial.txt +#usr/share/doc/rrdtool-1.5.4/txt/librrd.txt +#usr/share/doc/rrdtool-1.5.4/txt/rpntutorial.pod +#usr/share/doc/rrdtool-1.5.4/txt/rpntutorial.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrd-beginners.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrd-beginners.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdbuild.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdbuild.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdcached.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdcached.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdcgi.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdcgi.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdcreate.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdcreate.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrddump.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrddump.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdfetch.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdfetch.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdfirst.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdfirst.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdflushcached.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdflushcached.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_data.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_data.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_examples.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_examples.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_graph.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_graph.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_rpn.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdgraph_rpn.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdinfo.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdinfo.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdlast.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdlast.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdlastupdate.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdlastupdate.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdresize.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdresize.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdrestore.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdrestore.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdthreads.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdthreads.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdtool.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdtool.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdtune.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdtune.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdtutorial.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdtutorial.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdupdate.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdupdate.txt +#usr/share/doc/rrdtool-1.5.4/txt/rrdxport.pod +#usr/share/doc/rrdtool-1.5.4/txt/rrdxport.txt #usr/share/man/man1/bin_dec_hex.1 #usr/share/man/man1/cdeftutorial.1 #usr/share/man/man1/rpntutorial.1 @@ -162,4 +162,5 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.so #usr/share/rrdtool/examples/rrdcached/rrdcached-size.pl #usr/share/rrdtool/examples/shared-demo.pl #usr/share/rrdtool/examples/stripes.pl +#usr/share/rrdtool/examples/stripes.py var/log/rrd diff --git a/lfs/rrdtool b/lfs/rrdtool index d0a1181..f156400 100644 --- a/lfs/rrdtool +++ b/lfs/rrdtool @@ -24,7 +24,7 @@ include Config -VER = 1.5.3 +VER = 1.5.4 THISAPP = rrdtool-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 868a828cc6b10654c440a85054240ae2 +$(DL_FILE)_MD5 = 4daea1e628e1c70d91800d6a06427dc1 install : $(TARGET) -- 2.5.0

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development August 2015