Development July 2016

development@lists.ipfire.org

14 participants
38 discussions

[PATCH] dnsmasq 2.76: latest patches from upstream (004-009)
by Matthias Fischer 12 Jul '16

12 Jul '16

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/dnsmasq | 6 ++ .../004-Fix_editing_error_on_man_page.patch | 40 ++++++++++ src/patches/dnsmasq/005-Manpage_typo.patch | 25 ++++++ ...aviour_with_some_DHCP_option_arrangements.patch | 49 ++++++++++++ ...007-Fix_logic_error_in_Linux_netlink_code.patch | 55 +++++++++++++ .../008-Fix_problem_with_--dnssec-timestamp.patch | 93 ++++++++++++++++++++++ .../009-malloc_memset_calloc_for_efficiency.patch | 46 +++++++++++ 7 files changed, 314 insertions(+) create mode 100644 src/patches/dnsmasq/004-Fix_editing_error_on_man_page.patch create mode 100644 src/patches/dnsmasq/005-Manpage_typo.patch create mode 100644 src/patches/dnsmasq/006-Fix_bad_behaviour_with_some_DHCP_option_arrangements.patch create mode 100644 src/patches/dnsmasq/007-Fix_logic_error_in_Linux_netlink_code.patch create mode 100644 src/patches/dnsmasq/008-Fix_problem_with_--dnssec-timestamp.patch create mode 100644 src/patches/dnsmasq/009-malloc_memset_calloc_for_efficiency.patch diff --git a/lfs/dnsmasq b/lfs/dnsmasq index 5782f77..a0fdc50 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-Calculate_length_of_TFTP_error_reply_correctly.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/002-Zero_newly_malloc_ed_memory.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/003-Check_return_of_expand_always.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/004-Fix_editing_error_on_man_page.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/005-Manpage_typo.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/006-Fix_bad_behaviour_with_some_DHCP_option_arrangements.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/007-Fix_logic_error_in_Linux_netlink_code.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/008-Fix_problem_with_--dnssec-timestamp.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/009-malloc_memset_calloc_for_efficiency.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/patches/dnsmasq/004-Fix_editing_error_on_man_page.patch b/src/patches/dnsmasq/004-Fix_editing_error_on_man_page.patch new file mode 100644 index 0000000..f4d0d20 --- /dev/null +++ b/src/patches/dnsmasq/004-Fix_editing_error_on_man_page.patch @@ -0,0 +1,40 @@ +From 5874f3e9222397d82aabd9884d9bf5ce7e4109b0 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Sun, 10 Jul 2016 22:12:08 +0100 +Subject: [PATCH] Fix editing error on man page. + +Thanks to Eric Westbrook for spotting this. +--- + man/dnsmasq.8 | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) + +diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 +index 0521534..bd8c0b3 100644 +--- a/man/dnsmasq.8 ++++ b/man/dnsmasq.8 +@@ -1037,6 +1037,10 @@ is given, then read all the files contained in that directory. The advantage of + using this option is the same as for --dhcp-hostsfile: the + dhcp-optsfile will be re-read when dnsmasq receives SIGHUP. Note that + it is possible to encode the information in a ++.B --dhcp-boot ++flag as DHCP options, using the options names bootfile-name, ++server-ip-address and tftp-server. This allows these to be included ++in a dhcp-optsfile. + .TP + .B --dhcp-hostsdir=<path> + This is equivalent to dhcp-hostsfile, except for the following. The path MUST be a +@@ -1048,11 +1052,6 @@ is restarted; ie host records are only added dynamically. + .TP + .B --dhcp-optsdir=<path> + This is equivalent to dhcp-optsfile, with the differences noted for --dhcp-hostsdir. +-.TP +-.B --dhcp-boot +-flag as DHCP options, using the options names bootfile-name, +-server-ip-address and tftp-server. This allows these to be included +-in a dhcp-optsfile. + .TP + .B \-Z, --read-ethers + Read /etc/ethers for information about hosts for the DHCP server. The +-- +1.7.10.4 + diff --git a/src/patches/dnsmasq/005-Manpage_typo.patch b/src/patches/dnsmasq/005-Manpage_typo.patch new file mode 100644 index 0000000..52f16de --- /dev/null +++ b/src/patches/dnsmasq/005-Manpage_typo.patch @@ -0,0 +1,25 @@ +From 907efeb2dc712603271093bce8a93c7c3e6fe64d Mon Sep 17 00:00:00 2001 +From: Kristjan Onu <jeixav(a)gmail.com> +Date: Sun, 10 Jul 2016 22:37:57 +0100 +Subject: [PATCH] Manpage typo. + +--- + man/dnsmasq.8 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 +index bd8c0b3..ac8d921 100644 +--- a/man/dnsmasq.8 ++++ b/man/dnsmasq.8 +@@ -242,7 +242,7 @@ addresses associated with the interface. + .B --local-service + Accept DNS queries only from hosts whose address is on a local subnet, + ie a subnet for which an interface exists on the server. This option +-only has effect is there are no --interface --except-interface, ++only has effect if there are no --interface --except-interface, + --listen-address or --auth-server options. It is intended to be set as + a default on installation, to allow unconfigured installations to be + useful but also safe from being used for DNS amplification attacks. +-- +1.7.10.4 + diff --git a/src/patches/dnsmasq/006-Fix_bad_behaviour_with_some_DHCP_option_arrangements.patch b/src/patches/dnsmasq/006-Fix_bad_behaviour_with_some_DHCP_option_arrangements.patch new file mode 100644 index 0000000..ec17115 --- /dev/null +++ b/src/patches/dnsmasq/006-Fix_bad_behaviour_with_some_DHCP_option_arrangements.patch @@ -0,0 +1,49 @@ +From 591ed1e90503817938ccf5f127e677a8dd48b6d8 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Mon, 11 Jul 2016 18:18:42 +0100 +Subject: [PATCH] Fix bad behaviour with some DHCP option arrangements. + +The check that there's enough space to store the DHCP agent-id +at the end of the packet could succeed when it should fail +if the END option is in either of the oprion-overload areas. +That could overwrite legit options in the request and cause +bad behaviour. It's highly unlikely that any sane DHCP client +would trigger this bug, and it's never been seen, but this +fixes the problem. + +Also fix off-by-one in bounds checking of option processing. +Worst case scenario on that is a read one byte beyond the +end off a buffer with a crafted packet, and maybe therefore +a SIGV crash if the memory after the buffer is not mapped. + +Thanks to Timothy Becker for spotting these. +--- + src/rfc2131.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/rfc2131.c b/src/rfc2131.c +index b7c167e..8b99d4b 100644 +--- a/src/rfc2131.c ++++ b/src/rfc2131.c +@@ -186,7 +186,8 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index, + be enough free space at the end of the packet to copy the option. */ + unsigned char *sopt; + unsigned int total = option_len(opt) + 2; +- unsigned char *last_opt = option_find(mess, sz, OPTION_END, 0); ++ unsigned char *last_opt = option_find1(&mess->options[0] + sizeof(u32), ((unsigned char *)mess) + sz, ++ OPTION_END, 0); + if (last_opt && last_opt < end - total) + { + end -= total; +@@ -1606,7 +1607,7 @@ static unsigned char *option_find1(unsigned char *p, unsigned char *end, int opt + { + while (1) + { +- if (p > end) ++ if (p >= end) + return NULL; + else if (*p == OPTION_END) + return opt == OPTION_END ? p : NULL; +-- +1.7.10.4 + diff --git a/src/patches/dnsmasq/007-Fix_logic_error_in_Linux_netlink_code.patch b/src/patches/dnsmasq/007-Fix_logic_error_in_Linux_netlink_code.patch new file mode 100644 index 0000000..6a79eac --- /dev/null +++ b/src/patches/dnsmasq/007-Fix_logic_error_in_Linux_netlink_code.patch @@ -0,0 +1,55 @@ +From 1d07667ac77c55b9de56b1b2c385167e0e0ec27a Mon Sep 17 00:00:00 2001 +From: Ivan Kokshaysky <ink(a)jurassic.park.msu.ru> +Date: Mon, 11 Jul 2016 18:36:05 +0100 +Subject: [PATCH] Fix logic error in Linux netlink code. + +This could cause dnsmasq to enter a tight loop on systems +with a very large number of network interfaces. +--- + CHANGELOG | 6 ++++++ + src/netlink.c | 8 +++++++- + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/CHANGELOG b/CHANGELOG +index 0559a6f..59c9c49 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -11,6 +11,12 @@ version 2.77 + Thanks to Mozilla for funding the security audit + which spotted this bug. + ++ Fix logic error in Linux netlink code. This could ++ cause dnsmasq to enter a tight loop on systems ++ with a very large number of network interfaces. ++ Thanks to Ivan Kokshaysky for the diagnosis and ++ patch. ++ + + version 2.76 + Include 0.0.0.0/8 in DNS rebind checks. This range +diff --git a/src/netlink.c b/src/netlink.c +index 049247b..8cd51af 100644 +--- a/src/netlink.c ++++ b/src/netlink.c +@@ -188,11 +188,17 @@ int iface_enumerate(int family, void *parm, int (*callback)()) + } + + for (h = (struct nlmsghdr *)iov.iov_base; NLMSG_OK(h, (size_t)len); h = NLMSG_NEXT(h, len)) +- if (h->nlmsg_seq != seq || h->nlmsg_pid != netlink_pid || h->nlmsg_type == NLMSG_ERROR) ++ if (h->nlmsg_pid != netlink_pid || h->nlmsg_type == NLMSG_ERROR) + { + /* May be multicast arriving async */ + nl_async(h); + } ++ else if (h->nlmsg_seq != seq) ++ { ++ /* May be part of incomplete response to previous request after ++ ENOBUFS. Drop it. */ ++ continue; ++ } + else if (h->nlmsg_type == NLMSG_DONE) + return callback_ok; + else if (h->nlmsg_type == RTM_NEWADDR && family != AF_UNSPEC && family != AF_LOCAL) +-- +1.7.10.4 + diff --git a/src/patches/dnsmasq/008-Fix_problem_with_--dnssec-timestamp.patch b/src/patches/dnsmasq/008-Fix_problem_with_--dnssec-timestamp.patch new file mode 100644 index 0000000..b32d17a --- /dev/null +++ b/src/patches/dnsmasq/008-Fix_problem_with_--dnssec-timestamp.patch @@ -0,0 +1,93 @@ +From 06093a9a845bb597005d892d5d1bc7859933ada4 Mon Sep 17 00:00:00 2001 +From: Kevin Darbyshire-Bryant <kevin(a)darbyshire-bryant.me.uk> +Date: Mon, 11 Jul 2016 21:03:27 +0100 +Subject: [PATCH] Fix problem with --dnssec-timestamp whereby receipt of + SIGHUP would erroneously engage timestamp checking. + +--- + CHANGELOG | 4 ++++ + src/dnsmasq.c | 7 ++++--- + src/dnsmasq.h | 1 + + src/dnssec.c | 5 +++-- + 4 files changed, 12 insertions(+), 5 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index 59c9c49..9f1e404 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -17,6 +17,10 @@ version 2.77 + Thanks to Ivan Kokshaysky for the diagnosis and + patch. + ++ Fix problem with --dnssec-timestamp whereby receipt ++ of SIGHUP would erroneously engage timestamp checking. ++ Thanks to Kevin Darbyshire-Bryant for this work. ++ + + version 2.76 + Include 0.0.0.0/8 in DNS rebind checks. This range +diff --git a/src/dnsmasq.c b/src/dnsmasq.c +index 045ec53..a47273f 100644 +--- a/src/dnsmasq.c ++++ b/src/dnsmasq.c +@@ -750,7 +750,8 @@ int main (int argc, char **argv) + + my_syslog(LOG_INFO, _("DNSSEC validation enabled")); + +- if (option_bool(OPT_DNSSEC_TIME)) ++ daemon->dnssec_no_time_check = option_bool(OPT_DNSSEC_TIME); ++ if (option_bool(OPT_DNSSEC_TIME) && !daemon->back_to_the_future) + my_syslog(LOG_INFO, _("DNSSEC signature timestamps not checked until first cache reload")); + + if (rc == 1) +@@ -1226,10 +1227,10 @@ static void async_event(int pipe, time_t now) + { + case EVENT_RELOAD: + #ifdef HAVE_DNSSEC +- if (option_bool(OPT_DNSSEC_VALID) && option_bool(OPT_DNSSEC_TIME)) ++ if (daemon->dnssec_no_time_check && option_bool(OPT_DNSSEC_VALID) && option_bool(OPT_DNSSEC_TIME)) + { + my_syslog(LOG_INFO, _("now checking DNSSEC signature timestamps")); +- reset_option_bool(OPT_DNSSEC_TIME); ++ daemon->dnssec_no_time_check = 0; + } + #endif + /* fall through */ +diff --git a/src/dnsmasq.h b/src/dnsmasq.h +index 1896a64..be27ae0 100644 +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -992,6 +992,7 @@ extern struct daemon { + #endif + #ifdef HAVE_DNSSEC + struct ds_config *ds; ++ int dnssec_no_time_check; + int back_to_the_future; + char *timestamp_file; + #endif +diff --git a/src/dnssec.c b/src/dnssec.c +index 3c77c7d..64358fa 100644 +--- a/src/dnssec.c ++++ b/src/dnssec.c +@@ -522,15 +522,16 @@ static int check_date_range(u32 date_start, u32 date_end) + if (utime(daemon->timestamp_file, NULL) != 0) + my_syslog(LOG_ERR, _("failed to update mtime on %s: %s"), daemon->timestamp_file, strerror(errno)); + ++ my_syslog(LOG_INFO, _("system time considered valid, now checking DNSSEC signature timestamps.")); + daemon->back_to_the_future = 1; +- set_option_bool(OPT_DNSSEC_TIME); ++ daemon->dnssec_no_time_check = 0; + queue_event(EVENT_RELOAD); /* purge cache */ + } + + if (daemon->back_to_the_future == 0) + return 1; + } +- else if (option_bool(OPT_DNSSEC_TIME)) ++ else if (daemon->dnssec_no_time_check) + return 1; + + /* We must explicitly check against wanted values, because of SERIAL_UNDEF */ +-- +1.7.10.4 + diff --git a/src/patches/dnsmasq/009-malloc_memset_calloc_for_efficiency.patch b/src/patches/dnsmasq/009-malloc_memset_calloc_for_efficiency.patch new file mode 100644 index 0000000..0300853 --- /dev/null +++ b/src/patches/dnsmasq/009-malloc_memset_calloc_for_efficiency.patch @@ -0,0 +1,46 @@ +From d6dce53e08b3a06be16d43e1bf566c6c1988e4a9 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Mon, 11 Jul 2016 21:34:31 +0100 +Subject: [PATCH] malloc(); memset() -> calloc() for efficiency. + +--- + src/util.c | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/src/util.c b/src/util.c +index 82443c9..211690e 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -244,13 +244,11 @@ unsigned char *do_rfc1035_name(unsigned char *p, char *sval) + /* for use during startup */ + void *safe_malloc(size_t size) + { +- void *ret = malloc(size); ++ void *ret = calloc(1, size); + + if (!ret) + die(_("could not get memory"), NULL, EC_NOMEM); +- else +- memset(ret, 0, size); +- ++ + return ret; + } + +@@ -264,12 +262,10 @@ void safe_pipe(int *fd, int read_noblock) + + void *whine_malloc(size_t size) + { +- void *ret = malloc(size); ++ void *ret = calloc(1, size); + + if (!ret) + my_syslog(LOG_ERR, _("failed to allocate %d bytes"), (int) size); +- else +- memset(ret, 0, size); + + return ret; + } +-- +1.7.10.4 + -- 2.9.1

1 0

[PATCH] Captive-portal: Design changes
by Alexander Marx 12 Jul '16

12 Jul '16

When choosing voucher as authentication type there is no need to display the license agreement textbox Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> --- html/cgi-bin/captive.cgi | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index a8add4d..bdded8b 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -277,10 +277,10 @@ END print<<END <tr> - <td> + <td><br> $Lang::tr{'Captive authentication'} </td> - <td> + <td><br> <select name='AUTH' style='width:8em;'> END ; @@ -298,11 +298,10 @@ END </tr> END ; - - &agbbox(); + if ($settings{'AUTH'} eq 'LICENSE'){ &agbbox(); }; #Logo Upload - print "<tr><td>$Lang::tr{'Captive logo_upload'}<br>$Lang::tr{'Captive logo_upload1'}</td><td><INPUT TYPE='file' NAME='uploaded_file' SIZE=30 MAXLENGTH=80></td></tr><tr>"; + print "<tr><td><br>$Lang::tr{'Captive logo_upload'}<br>$Lang::tr{'Captive logo_upload1'}</td><td><br><INPUT TYPE='file' NAME='uploaded_file' SIZE=30 MAXLENGTH=80></td></tr><tr>"; #Show Logo in webinterface with 1/2 size if set if (-f "$logopath/logo.png"){ print"<td>$Lang::tr{'Captive logo_set'}</td>"; -- 2.7.4

1 0

[PATCH] dnsmasq 2.76: latest patches from upstream (001-003)
by Matthias Fischer 09 Jul '16

09 Jul '16

Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/dnsmasq | 3 + ...late_length_of_TFTP_error_reply_correctly.patch | 65 ++++++++++++++++++++++ .../dnsmasq/002-Zero_newly_malloc_ed_memory.patch | 36 ++++++++++++ .../003-Check_return_of_expand_always.patch | 44 +++++++++++++++ 4 files changed, 148 insertions(+) create mode 100644 src/patches/dnsmasq/001-Calculate_length_of_TFTP_error_reply_correctly.patch create mode 100644 src/patches/dnsmasq/002-Zero_newly_malloc_ed_memory.patch create mode 100644 src/patches/dnsmasq/003-Check_return_of_expand_always.patch diff --git a/lfs/dnsmasq b/lfs/dnsmasq index e425f7d..5782f77 100644 --- a/lfs/dnsmasq +++ b/lfs/dnsmasq @@ -73,6 +73,9 @@ $(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-Calculate_length_of_TFTP_error_reply_correctly.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/002-Zero_newly_malloc_ed_memory.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/003-Check_return_of_expand_always.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/patches/dnsmasq/001-Calculate_length_of_TFTP_error_reply_correctly.patch b/src/patches/dnsmasq/001-Calculate_length_of_TFTP_error_reply_correctly.patch new file mode 100644 index 0000000..43ac068 --- /dev/null +++ b/src/patches/dnsmasq/001-Calculate_length_of_TFTP_error_reply_correctly.patch @@ -0,0 +1,65 @@ +From 294d36df4749e01199ab220d44c170e7db2b0c05 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Wed, 6 Jul 2016 21:30:25 +0100 +Subject: [PATCH] Calculate length of TFTP error reply correctly. + +--- + CHANGELOG | 14 ++++++++++++++ + src/tftp.c | 7 +++++-- + 2 files changed, 19 insertions(+), 2 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index 04ff3f0..0559a6f 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,17 @@ ++version 2.77 ++ Calculate the length of TFTP error reply packet ++ correctly. This fixes a problem when the error ++ message in a TFTP packet exceeds the arbitrary ++ limit of 500 characters. The message was correctly ++ truncated, but not the packet length, so ++ extra data was appended. This is a possible ++ security risk, since the extra data comes from ++ a buffer which is also used for DNS, so that ++ previous DNS queries or replies may be leaked. ++ Thanks to Mozilla for funding the security audit ++ which spotted this bug. ++ ++ + version 2.76 + Include 0.0.0.0/8 in DNS rebind checks. This range + translates to hosts on the local network, or, at +diff --git a/src/tftp.c b/src/tftp.c +index 5e4a32a..3e1b5c5 100644 +--- a/src/tftp.c ++++ b/src/tftp.c +@@ -652,20 +652,23 @@ static void sanitise(char *buf) + + } + ++#define MAXMESSAGE 500 /* limit to make packet < 512 bytes and definitely smaller than buffer */ + static ssize_t tftp_err(int err, char *packet, char *message, char *file) + { + struct errmess { + unsigned short op, err; + char message[]; + } *mess = (struct errmess *)packet; +- ssize_t ret = 4; ++ ssize_t len, ret = 4; + char *errstr = strerror(errno); + + sanitise(file); + + mess->op = htons(OP_ERR); + mess->err = htons(err); +- ret += (snprintf(mess->message, 500, message, file, errstr) + 1); ++ len = snprintf(mess->message, MAXMESSAGE, message, file, errstr); ++ ret += (len < MAXMESSAGE) ? len + 1 : MAXMESSAGE; /* include terminating zero */ ++ + my_syslog(MS_TFTP | LOG_ERR, "%s", mess->message); + + return ret; +-- +1.7.10.4 + diff --git a/src/patches/dnsmasq/002-Zero_newly_malloc_ed_memory.patch b/src/patches/dnsmasq/002-Zero_newly_malloc_ed_memory.patch new file mode 100644 index 0000000..b748db8 --- /dev/null +++ b/src/patches/dnsmasq/002-Zero_newly_malloc_ed_memory.patch @@ -0,0 +1,36 @@ +From d55f81f5fd53b1dfc2c4b3249b542f2d9679e236 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Wed, 6 Jul 2016 21:33:56 +0100 +Subject: [PATCH] Zero newly malloc'ed memory. + +--- + src/util.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/util.c b/src/util.c +index 93b24f5..82443c9 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -248,6 +248,8 @@ void *safe_malloc(size_t size) + + if (!ret) + die(_("could not get memory"), NULL, EC_NOMEM); ++ else ++ memset(ret, 0, size); + + return ret; + } +@@ -266,7 +268,9 @@ void *whine_malloc(size_t size) + + if (!ret) + my_syslog(LOG_ERR, _("failed to allocate %d bytes"), (int) size); +- ++ else ++ memset(ret, 0, size); ++ + return ret; + } + +-- +1.7.10.4 + diff --git a/src/patches/dnsmasq/003-Check_return_of_expand_always.patch b/src/patches/dnsmasq/003-Check_return_of_expand_always.patch new file mode 100644 index 0000000..a69f4ce --- /dev/null +++ b/src/patches/dnsmasq/003-Check_return_of_expand_always.patch @@ -0,0 +1,44 @@ +From ce7845bf5429bd2962c9b2e7d75e2659f3b5c1a8 Mon Sep 17 00:00:00 2001 +From: Simon Kelley <simon(a)thekelleys.org.uk> +Date: Wed, 6 Jul 2016 21:42:27 +0100 +Subject: [PATCH] Check return of expand() always. + +--- + src/radv.c | 4 +++- + src/slaac.c | 5 ++++- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/radv.c b/src/radv.c +index 749b666..faa0f6d 100644 +--- a/src/radv.c ++++ b/src/radv.c +@@ -262,7 +262,9 @@ static void send_ra_alias(time_t now, int iface, char *iface_name, struct in6_ad + parm.prio = calc_prio(ra_param); + + save_counter(0); +- ra = expand(sizeof(struct ra_packet)); ++ ++ if (!(ra = expand(sizeof(struct ra_packet)))) ++ return; + + ra->type = ND_ROUTER_ADVERT; + ra->code = 0; +diff --git a/src/slaac.c b/src/slaac.c +index 8034805..07b8ba4 100644 +--- a/src/slaac.c ++++ b/src/slaac.c +@@ -147,7 +147,10 @@ time_t periodic_slaac(time_t now, struct dhcp_lease *leases) + struct sockaddr_in6 addr; + + save_counter(0); +- ping = expand(sizeof(struct ping_packet)); ++ ++ if (!(ping = expand(sizeof(struct ping_packet)))) ++ continue; ++ + ping->type = ICMP6_ECHO_REQUEST; + ping->code = 0; + ping->identifier = ping_id; +-- +1.7.10.4 + -- 2.9.0

1 0

[PATCH] libjpeg: update to 1.4.2 v2
by Marcel Lorenz 08 Jul '16

08 Jul '16

The old libjpeg is renamed to libjpeg-compat The compat makes the old libs maintainable The new 1.4.2 is build after the old and all IPFire componentes will build with the new libary. The old are renamed while building the new. Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/rootfiles/common/libjpeg | 19 ++++++-- config/rootfiles/common/libjpeg-compat | 33 ++++++++++++++ lfs/libjpeg | 19 +++++--- lfs/libjpeg-compat | 80 ++++++++++++++++++++++++++++++++++ make.sh | 1 + 5 files changed, 143 insertions(+), 9 deletions(-) create mode 100644 config/rootfiles/common/libjpeg-compat create mode 100644 lfs/libjpeg-compat diff --git a/config/rootfiles/common/libjpeg b/config/rootfiles/common/libjpeg index 7ceb697..4df7565 100644 --- a/config/rootfiles/common/libjpeg +++ b/config/rootfiles/common/libjpeg @@ -12,13 +12,13 @@ #usr/lib/libjpeg.a #usr/lib/libjpeg.la #usr/lib/libjpeg.so -usr/lib/libjpeg.so.62 -usr/lib/libjpeg.so.62.1.0 +usr/lib/libjpeg.so.8 +usr/lib/libjpeg.so.8.0.2 #usr/lib/libturbojpeg.a #usr/lib/libturbojpeg.la #usr/lib/libturbojpeg.so usr/lib/libturbojpeg.so.0 -usr/lib/libturbojpeg.so.0.0.0 +usr/lib/libturbojpeg.so.0.1.0 #usr/man/man1/cjpeg.1 #usr/man/man1/djpeg.1 #usr/man/man1/jpegtran.1 @@ -31,3 +31,16 @@ usr/lib/libturbojpeg.so.0.0.0 #usr/share/doc/structure.txt #usr/share/doc/usage.txt #usr/share/doc/wizard.txt +#usr/share/man/man1/cjpeg.1 +#usr/share/man/man1/djpeg.1 +#usr/share/man/man1/jpegtran.1 +#usr/share/man/man1/rdjpgcom.1 +#usr/share/man/man1/wrjpgcom.1 +#usr/share/doc/libjpeg-turbo +#usr/share/doc/libjpeg-turbo/README +#usr/share/doc/libjpeg-turbo/README-turbo.txt +#usr/share/doc/libjpeg-turbo/example.c +#usr/share/doc/libjpeg-turbo/libjpeg.txt +#usr/share/doc/libjpeg-turbo/structure.txt +#usr/share/doc/libjpeg-turbo/usage.txt +#usr/share/doc/libjpeg-turbo/wizard.txt diff --git a/config/rootfiles/common/libjpeg-compat b/config/rootfiles/common/libjpeg-compat new file mode 100644 index 0000000..7ceb697 --- /dev/null +++ b/config/rootfiles/common/libjpeg-compat @@ -0,0 +1,33 @@ +#usr/bin/cjpeg +#usr/bin/djpeg +#usr/bin/jpegtran +#usr/bin/rdjpgcom +#usr/bin/tjbench +#usr/bin/wrjpgcom +#usr/include/jconfig.h +#usr/include/jerror.h +#usr/include/jmorecfg.h +#usr/include/jpeglib.h +#usr/include/turbojpeg.h +#usr/lib/libjpeg.a +#usr/lib/libjpeg.la +#usr/lib/libjpeg.so +usr/lib/libjpeg.so.62 +usr/lib/libjpeg.so.62.1.0 +#usr/lib/libturbojpeg.a +#usr/lib/libturbojpeg.la +#usr/lib/libturbojpeg.so +usr/lib/libturbojpeg.so.0 +usr/lib/libturbojpeg.so.0.0.0 +#usr/man/man1/cjpeg.1 +#usr/man/man1/djpeg.1 +#usr/man/man1/jpegtran.1 +#usr/man/man1/rdjpgcom.1 +#usr/man/man1/wrjpgcom.1 +#usr/share/doc/README +#usr/share/doc/README-turbo.txt +#usr/share/doc/example.c +#usr/share/doc/libjpeg.txt +#usr/share/doc/structure.txt +#usr/share/doc/usage.txt +#usr/share/doc/wizard.txt diff --git a/lfs/libjpeg b/lfs/libjpeg index 8b4c077..a104ba9 100644 --- a/lfs/libjpeg +++ b/lfs/libjpeg @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2016 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,15 +24,13 @@ include Config -VER = 1.3.1 +VER = 1.4.2 THISAPP = libjpeg-turbo-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = libjpeg -PAK_VER = ipfire-beta1 ############################################################################### # Top-level Rules @@ -42,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2c3a68129dac443a72815ff5bb374b05 +$(DL_FILE)_MD5 = 86b0d5f7507c2e6c21c00219162c3c44 install : $(TARGET) @@ -72,9 +70,18 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared + # backup the old libjpeg. The make install removes the old + mv -v /usr/lib/libjpeg.so.62.1.0 /usr/lib/backup-libjpeg.so.62.1.0 + cd $(DIR_APP) && ./configure --prefix=/usr \ + --with-jpeg8 \ + --disable-static\ + --mandir=/usr/share/man cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && rm -f /usr/lib/libjpeg.so* cd $(DIR_APP) && make install + # restore old lib + mv -v /usr/lib/backup-libjpeg.so.62.1.0 /usr/lib/libjpeg.so.62.1.0 @rm -rf $(DIR_APP) @$(POSTBUILD) + diff --git a/lfs/libjpeg-compat b/lfs/libjpeg-compat new file mode 100644 index 0000000..8b4c077 --- /dev/null +++ b/lfs/libjpeg-compat @@ -0,0 +1,80 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.3.1 + +THISAPP = libjpeg-turbo-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libjpeg +PAK_VER = ipfire-beta1 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 2c3a68129dac443a72815ff5bb374b05 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --enable-static --enable-shared + cd $(DIR_APP) && [ -e "libtool" ] || ln -svf /usr/bin/libtool libtool + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 3d5b4a3..a9fac52 100755 --- a/make.sh +++ b/make.sh @@ -506,6 +506,7 @@ buildipfire() { ipfiremake libnl-3 ipfiremake libidn ipfiremake nasm + ipfiremake libjpeg-compat ipfiremake libjpeg ipfiremake libexif ipfiremake libpng -- 1.9.1

1 0

[PATCH] libtiff: update to 4.0.6 v2
by Marcel Lorenz 07 Jul '16

07 Jul '16

http://www.remotesensing.org/libtiff/v4.0.6.html Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/rootfiles/packages/libtiff | 310 ++++++++++++++++++++------------------ lfs/libtiff | 4 +- 2 files changed, 168 insertions(+), 146 deletions(-) diff --git a/config/rootfiles/packages/libtiff b/config/rootfiles/packages/libtiff index 12de791..07e74f6 100644 --- a/config/rootfiles/packages/libtiff +++ b/config/rootfiles/packages/libtiff @@ -29,153 +29,169 @@ usr/bin/tiffsplit #usr/lib/libtiff.a #usr/lib/libtiff.la usr/lib/libtiff.so -usr/lib/libtiff.so.3 -usr/lib/libtiff.so.3.9.4 +usr/lib/libtiff.so.5 +usr/lib/libtiff.so.5.2.4 #usr/lib/libtiffxx.a #usr/lib/libtiffxx.la usr/lib/libtiffxx.so -usr/lib/libtiffxx.so.3 -usr/lib/libtiffxx.so.3.9.4 -#usr/share/doc/tiff-3.9.4 -#usr/share/doc/tiff-3.9.4/COPYRIGHT -#usr/share/doc/tiff-3.9.4/ChangeLog -#usr/share/doc/tiff-3.9.4/README -#usr/share/doc/tiff-3.9.4/README.vms -#usr/share/doc/tiff-3.9.4/RELEASE-DATE -#usr/share/doc/tiff-3.9.4/TODO -#usr/share/doc/tiff-3.9.4/VERSION -#usr/share/doc/tiff-3.9.4/html -#usr/share/doc/tiff-3.9.4/html/TIFFTechNote2.html -#usr/share/doc/tiff-3.9.4/html/addingtags.html -#usr/share/doc/tiff-3.9.4/html/bugs.html -#usr/share/doc/tiff-3.9.4/html/build.html -#usr/share/doc/tiff-3.9.4/html/contrib.html -#usr/share/doc/tiff-3.9.4/html/document.html -#usr/share/doc/tiff-3.9.4/html/images -#usr/share/doc/tiff-3.9.4/html/images.html -#usr/share/doc/tiff-3.9.4/html/images/back.gif -#usr/share/doc/tiff-3.9.4/html/images/bali.jpg -#usr/share/doc/tiff-3.9.4/html/images/cat.gif -#usr/share/doc/tiff-3.9.4/html/images/cover.jpg -#usr/share/doc/tiff-3.9.4/html/images/cramps.gif -#usr/share/doc/tiff-3.9.4/html/images/dave.gif -#usr/share/doc/tiff-3.9.4/html/images/info.gif -#usr/share/doc/tiff-3.9.4/html/images/jello.jpg -#usr/share/doc/tiff-3.9.4/html/images/jim.gif -#usr/share/doc/tiff-3.9.4/html/images/note.gif -#usr/share/doc/tiff-3.9.4/html/images/oxford.gif -#usr/share/doc/tiff-3.9.4/html/images/quad.jpg -#usr/share/doc/tiff-3.9.4/html/images/ring.gif -#usr/share/doc/tiff-3.9.4/html/images/smallliz.jpg -#usr/share/doc/tiff-3.9.4/html/images/strike.gif -#usr/share/doc/tiff-3.9.4/html/images/warning.gif -#usr/share/doc/tiff-3.9.4/html/index.html -#usr/share/doc/tiff-3.9.4/html/internals.html -#usr/share/doc/tiff-3.9.4/html/intro.html -#usr/share/doc/tiff-3.9.4/html/libtiff.html -#usr/share/doc/tiff-3.9.4/html/man -#usr/share/doc/tiff-3.9.4/html/man/TIFFClose.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFDataWidth.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFError.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFFlush.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFGetField.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFOpen.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFPrintDirectory.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFRGBAImage.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFReadDirectory.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFReadEncodedStrip.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFReadEncodedTile.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFReadRGBAImage.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFReadRGBAStrip.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFReadRGBATile.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFReadRawStrip.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFReadRawTile.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFReadScanline.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFReadTile.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFSetDirectory.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFSetField.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFWarning.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteDirectory.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteEncodedStrip.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteEncodedTile.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteRawStrip.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteRawTile.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteScanline.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFWriteTile.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFbuffer.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFcodec.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFcolor.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFmemory.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFquery.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFsize.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFstrip.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFswab.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/TIFFtile.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/fax2ps.1.html -#usr/share/doc/tiff-3.9.4/html/man/fax2tiff.1.html -#usr/share/doc/tiff-3.9.4/html/man/gif2tiff.1.html -#usr/share/doc/tiff-3.9.4/html/man/index.html -#usr/share/doc/tiff-3.9.4/html/man/libtiff.3tiff.html -#usr/share/doc/tiff-3.9.4/html/man/pal2rgb.1.html -#usr/share/doc/tiff-3.9.4/html/man/ppm2tiff.1.html -#usr/share/doc/tiff-3.9.4/html/man/ras2tiff.1.html -#usr/share/doc/tiff-3.9.4/html/man/raw2tiff.1.html -#usr/share/doc/tiff-3.9.4/html/man/rgb2ycbcr.1.html -#usr/share/doc/tiff-3.9.4/html/man/sgi2tiff.1.html -#usr/share/doc/tiff-3.9.4/html/man/thumbnail.1.html -#usr/share/doc/tiff-3.9.4/html/man/tiff2bw.1.html -#usr/share/doc/tiff-3.9.4/html/man/tiff2pdf.1.html -#usr/share/doc/tiff-3.9.4/html/man/tiff2ps.1.html -#usr/share/doc/tiff-3.9.4/html/man/tiff2rgba.1.html -#usr/share/doc/tiff-3.9.4/html/man/tiffcmp.1.html -#usr/share/doc/tiff-3.9.4/html/man/tiffcp.1.html -#usr/share/doc/tiff-3.9.4/html/man/tiffcrop.1.html -#usr/share/doc/tiff-3.9.4/html/man/tiffdither.1.html -#usr/share/doc/tiff-3.9.4/html/man/tiffdump.1.html -#usr/share/doc/tiff-3.9.4/html/man/tiffgt.1.html -#usr/share/doc/tiff-3.9.4/html/man/tiffinfo.1.html -#usr/share/doc/tiff-3.9.4/html/man/tiffmedian.1.html -#usr/share/doc/tiff-3.9.4/html/man/tiffset.1.html -#usr/share/doc/tiff-3.9.4/html/man/tiffsplit.1.html -#usr/share/doc/tiff-3.9.4/html/man/tiffsv.1.html -#usr/share/doc/tiff-3.9.4/html/misc.html -#usr/share/doc/tiff-3.9.4/html/support.html -#usr/share/doc/tiff-3.9.4/html/tools.html -#usr/share/doc/tiff-3.9.4/html/v3.4beta007.html -#usr/share/doc/tiff-3.9.4/html/v3.4beta016.html -#usr/share/doc/tiff-3.9.4/html/v3.4beta018.html -#usr/share/doc/tiff-3.9.4/html/v3.4beta024.html -#usr/share/doc/tiff-3.9.4/html/v3.4beta028.html -#usr/share/doc/tiff-3.9.4/html/v3.4beta029.html -#usr/share/doc/tiff-3.9.4/html/v3.4beta031.html -#usr/share/doc/tiff-3.9.4/html/v3.4beta032.html -#usr/share/doc/tiff-3.9.4/html/v3.4beta033.html -#usr/share/doc/tiff-3.9.4/html/v3.4beta034.html -#usr/share/doc/tiff-3.9.4/html/v3.4beta035.html -#usr/share/doc/tiff-3.9.4/html/v3.4beta036.html -#usr/share/doc/tiff-3.9.4/html/v3.5.1.html -#usr/share/doc/tiff-3.9.4/html/v3.5.2.html -#usr/share/doc/tiff-3.9.4/html/v3.5.3.html -#usr/share/doc/tiff-3.9.4/html/v3.5.4.html -#usr/share/doc/tiff-3.9.4/html/v3.5.5.html -#usr/share/doc/tiff-3.9.4/html/v3.5.6-beta.html -#usr/share/doc/tiff-3.9.4/html/v3.5.7.html -#usr/share/doc/tiff-3.9.4/html/v3.6.0.html -#usr/share/doc/tiff-3.9.4/html/v3.6.1.html -#usr/share/doc/tiff-3.9.4/html/v3.7.0.html -#usr/share/doc/tiff-3.9.4/html/v3.7.0alpha.html -#usr/share/doc/tiff-3.9.4/html/v3.7.0beta.html -#usr/share/doc/tiff-3.9.4/html/v3.7.0beta2.html -#usr/share/doc/tiff-3.9.4/html/v3.7.1.html -#usr/share/doc/tiff-3.9.4/html/v3.7.2.html -#usr/share/doc/tiff-3.9.4/html/v3.7.3.html -#usr/share/doc/tiff-3.9.4/html/v3.7.4.html -#usr/share/doc/tiff-3.9.4/html/v3.8.0.html -#usr/share/doc/tiff-3.9.4/html/v3.8.1.html -#usr/share/doc/tiff-3.9.4/html/v3.8.2.html -#usr/share/doc/tiff-3.9.4/html/v3.9.0beta.html -#usr/share/doc/tiff-3.9.4/html/v3.9.1.html -#usr/share/doc/tiff-3.9.4/html/v3.9.2.html +usr/lib/libtiffxx.so.5 +usr/lib/libtiffxx.so.5.2.4 +#usr/lib/pkgconfig/libtiff-4.pc +#usr/share/doc/tiff-4.0.6 +#usr/share/doc/tiff-4.0.6/COPYRIGHT +#usr/share/doc/tiff-4.0.6/ChangeLog +#usr/share/doc/tiff-4.0.6/README +#usr/share/doc/tiff-4.0.6/README.vms +#usr/share/doc/tiff-4.0.6/RELEASE-DATE +#usr/share/doc/tiff-4.0.6/TODO +#usr/share/doc/tiff-4.0.6/VERSION +#usr/share/doc/tiff-4.0.6/html +#usr/share/doc/tiff-4.0.6/html/TIFFTechNote2.html +#usr/share/doc/tiff-4.0.6/html/addingtags.html +#usr/share/doc/tiff-4.0.6/html/bugs.html +#usr/share/doc/tiff-4.0.6/html/build.html +#usr/share/doc/tiff-4.0.6/html/contrib.html +#usr/share/doc/tiff-4.0.6/html/document.html +#usr/share/doc/tiff-4.0.6/html/images +#usr/share/doc/tiff-4.0.6/html/images.html +#usr/share/doc/tiff-4.0.6/html/images/back.gif +#usr/share/doc/tiff-4.0.6/html/images/bali.jpg +#usr/share/doc/tiff-4.0.6/html/images/cat.gif +#usr/share/doc/tiff-4.0.6/html/images/cover.jpg +#usr/share/doc/tiff-4.0.6/html/images/cramps.gif +#usr/share/doc/tiff-4.0.6/html/images/dave.gif +#usr/share/doc/tiff-4.0.6/html/images/info.gif +#usr/share/doc/tiff-4.0.6/html/images/jello.jpg +#usr/share/doc/tiff-4.0.6/html/images/jim.gif +#usr/share/doc/tiff-4.0.6/html/images/note.gif +#usr/share/doc/tiff-4.0.6/html/images/oxford.gif +#usr/share/doc/tiff-4.0.6/html/images/quad.jpg +#usr/share/doc/tiff-4.0.6/html/images/ring.gif +#usr/share/doc/tiff-4.0.6/html/images/smallliz.jpg +#usr/share/doc/tiff-4.0.6/html/images/strike.gif +#usr/share/doc/tiff-4.0.6/html/images/warning.gif +#usr/share/doc/tiff-4.0.6/html/index.html +#usr/share/doc/tiff-4.0.6/html/internals.html +#usr/share/doc/tiff-4.0.6/html/intro.html +#usr/share/doc/tiff-4.0.6/html/libtiff.html +#usr/share/doc/tiff-4.0.6/html/man +#usr/share/doc/tiff-4.0.6/html/man/TIFFClose.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFDataWidth.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFError.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFFieldDataType.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFFieldName.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFFieldPassCount.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFFieldReadCount.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFFieldTag.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFFieldWriteCount.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFFlush.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFGetField.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFOpen.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFPrintDirectory.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFRGBAImage.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFReadDirectory.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFReadEncodedStrip.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFReadEncodedTile.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFReadRGBAImage.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFReadRGBAStrip.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFReadRGBATile.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFReadRawStrip.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFReadRawTile.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFReadScanline.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFReadTile.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFSetDirectory.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFSetField.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFWarning.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFWriteDirectory.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFWriteEncodedStrip.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFWriteEncodedTile.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFWriteRawStrip.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFWriteRawTile.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFWriteScanline.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFWriteTile.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFbuffer.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFcodec.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFcolor.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFmemory.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFquery.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFsize.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFstrip.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFswab.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/TIFFtile.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/bmp2tiff.1.html +#usr/share/doc/tiff-4.0.6/html/man/fax2ps.1.html +#usr/share/doc/tiff-4.0.6/html/man/fax2tiff.1.html +#usr/share/doc/tiff-4.0.6/html/man/gif2tiff.1.html +#usr/share/doc/tiff-4.0.6/html/man/index.html +#usr/share/doc/tiff-4.0.6/html/man/libtiff.3tiff.html +#usr/share/doc/tiff-4.0.6/html/man/pal2rgb.1.html +#usr/share/doc/tiff-4.0.6/html/man/ppm2tiff.1.html +#usr/share/doc/tiff-4.0.6/html/man/ras2tiff.1.html +#usr/share/doc/tiff-4.0.6/html/man/raw2tiff.1.html +#usr/share/doc/tiff-4.0.6/html/man/rgb2ycbcr.1.html +#usr/share/doc/tiff-4.0.6/html/man/sgi2tiff.1.html +#usr/share/doc/tiff-4.0.6/html/man/thumbnail.1.html +#usr/share/doc/tiff-4.0.6/html/man/tiff2bw.1.html +#usr/share/doc/tiff-4.0.6/html/man/tiff2pdf.1.html +#usr/share/doc/tiff-4.0.6/html/man/tiff2ps.1.html +#usr/share/doc/tiff-4.0.6/html/man/tiff2rgba.1.html +#usr/share/doc/tiff-4.0.6/html/man/tiffcmp.1.html +#usr/share/doc/tiff-4.0.6/html/man/tiffcp.1.html +#usr/share/doc/tiff-4.0.6/html/man/tiffcrop.1.html +#usr/share/doc/tiff-4.0.6/html/man/tiffdither.1.html +#usr/share/doc/tiff-4.0.6/html/man/tiffdump.1.html +#usr/share/doc/tiff-4.0.6/html/man/tiffgt.1.html +#usr/share/doc/tiff-4.0.6/html/man/tiffinfo.1.html +#usr/share/doc/tiff-4.0.6/html/man/tiffmedian.1.html +#usr/share/doc/tiff-4.0.6/html/man/tiffset.1.html +#usr/share/doc/tiff-4.0.6/html/man/tiffsplit.1.html +#usr/share/doc/tiff-4.0.6/html/man/tiffsv.1.html +#usr/share/doc/tiff-4.0.6/html/misc.html +#usr/share/doc/tiff-4.0.6/html/support.html +#usr/share/doc/tiff-4.0.6/html/tools.html +#usr/share/doc/tiff-4.0.6/html/v3.4beta007.html +#usr/share/doc/tiff-4.0.6/html/v3.4beta016.html +#usr/share/doc/tiff-4.0.6/html/v3.4beta018.html +#usr/share/doc/tiff-4.0.6/html/v3.4beta024.html +#usr/share/doc/tiff-4.0.6/html/v3.4beta028.html +#usr/share/doc/tiff-4.0.6/html/v3.4beta029.html +#usr/share/doc/tiff-4.0.6/html/v3.4beta031.html +#usr/share/doc/tiff-4.0.6/html/v3.4beta032.html +#usr/share/doc/tiff-4.0.6/html/v3.4beta033.html +#usr/share/doc/tiff-4.0.6/html/v3.4beta034.html +#usr/share/doc/tiff-4.0.6/html/v3.4beta035.html +#usr/share/doc/tiff-4.0.6/html/v3.4beta036.html +#usr/share/doc/tiff-4.0.6/html/v3.5.1.html +#usr/share/doc/tiff-4.0.6/html/v3.5.2.html +#usr/share/doc/tiff-4.0.6/html/v3.5.3.html +#usr/share/doc/tiff-4.0.6/html/v3.5.4.html +#usr/share/doc/tiff-4.0.6/html/v3.5.5.html +#usr/share/doc/tiff-4.0.6/html/v3.5.6-beta.html +#usr/share/doc/tiff-4.0.6/html/v3.5.7.html +#usr/share/doc/tiff-4.0.6/html/v3.6.0.html +#usr/share/doc/tiff-4.0.6/html/v3.6.1.html +#usr/share/doc/tiff-4.0.6/html/v3.7.0.html +#usr/share/doc/tiff-4.0.6/html/v3.7.0alpha.html +#usr/share/doc/tiff-4.0.6/html/v3.7.0beta.html +#usr/share/doc/tiff-4.0.6/html/v3.7.0beta2.html +#usr/share/doc/tiff-4.0.6/html/v3.7.1.html +#usr/share/doc/tiff-4.0.6/html/v3.7.2.html +#usr/share/doc/tiff-4.0.6/html/v3.7.3.html +#usr/share/doc/tiff-4.0.6/html/v3.7.4.html +#usr/share/doc/tiff-4.0.6/html/v3.8.0.html +#usr/share/doc/tiff-4.0.6/html/v3.8.1.html +#usr/share/doc/tiff-4.0.6/html/v3.8.2.html +#usr/share/doc/tiff-4.0.6/html/v3.9.0beta.html +#usr/share/doc/tiff-4.0.6/html/v3.9.1.html +#usr/share/doc/tiff-4.0.6/html/v3.9.2.html +#usr/share/doc/tiff-4.0.6/html/v4.0.0.html +#usr/share/doc/tiff-4.0.6/html/v4.0.1.html +#usr/share/doc/tiff-4.0.6/html/v4.0.2.html +#usr/share/doc/tiff-4.0.6/html/v4.0.3.html +#usr/share/doc/tiff-4.0.6/html/v4.0.4.html +#usr/share/doc/tiff-4.0.6/html/v4.0.4beta.html +#usr/share/doc/tiff-4.0.6/html/v4.0.5.html +#usr/share/doc/tiff-4.0.6/html/v4.0.6.html #usr/share/man/man1/bmp2tiff.1 #usr/share/man/man1/fax2ps.1 #usr/share/man/man1/fax2tiff.1 @@ -205,6 +221,12 @@ usr/lib/libtiffxx.so.3.9.4 #usr/share/man/man3/TIFFClose.3tiff #usr/share/man/man3/TIFFDataWidth.3tiff #usr/share/man/man3/TIFFError.3tiff +#usr/share/man/man3/TIFFFieldDataType.3tiff +#usr/share/man/man3/TIFFFieldName.3tiff +#usr/share/man/man3/TIFFFieldPassCount.3tiff +#usr/share/man/man3/TIFFFieldReadCount.3tiff +#usr/share/man/man3/TIFFFieldTag.3tiff +#usr/share/man/man3/TIFFFieldWriteCount.3tiff #usr/share/man/man3/TIFFFlush.3tiff #usr/share/man/man3/TIFFGetField.3tiff #usr/share/man/man3/TIFFOpen.3tiff diff --git a/lfs/libtiff b/lfs/libtiff index f5e4d57..f3ced3f 100644 --- a/lfs/libtiff +++ b/lfs/libtiff @@ -24,7 +24,7 @@ include Config -VER = 3.9.4 +VER = 4.0.6 THISAPP = tiff-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2006c1bdd12644dbf02956955175afd6 +$(DL_FILE)_MD5 = d1d2e940dea0b5ad435f21f03d96dd72 install : $(TARGET) -- 1.9.1

2 1

[PATCH] libtirpc: change from package to common
by Marcel Lorenz 07 Jul '16

07 Jul '16

This patch changes the lib from a package to common lsof 4.98 need this lib for working. The lib are moved to /lib. This is the recommendation from: http://www.linuxfromscratch.org/blfs/view/svn/basicnet/libtirpc.html Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> --- config/rootfiles/{packages => common}/libtirpc | 7 +++---- lfs/libtirpc | 21 ++++++++++----------- 2 files changed, 13 insertions(+), 15 deletions(-) rename config/rootfiles/{packages => common}/libtirpc (95%) diff --git a/config/rootfiles/packages/libtirpc b/config/rootfiles/common/libtirpc similarity index 95% rename from config/rootfiles/packages/libtirpc rename to config/rootfiles/common/libtirpc index e197563..02cf846 100644 --- a/config/rootfiles/packages/libtirpc +++ b/config/rootfiles/common/libtirpc @@ -1,4 +1,6 @@ etc/netconfig +lib/libtirpc.so.3 +lib/libtirpc.so.3.0.0 #usr/include/tirpc #usr/include/tirpc/netconfig.h #usr/include/tirpc/rpc @@ -33,11 +35,8 @@ etc/netconfig #usr/include/tirpc/rpcsvc #usr/include/tirpc/rpcsvc/crypt.h #usr/include/tirpc/rpcsvc/crypt.x -#usr/lib/libtirpc.a #usr/lib/libtirpc.la -#usr/lib/libtirpc.so -usr/lib/libtirpc.so.3 -usr/lib/libtirpc.so.3.0.0 +usr/lib/libtirpc.so #usr/lib/pkgconfig/libtirpc.pc #usr/share/man/man3/bindresvport.3t #usr/share/man/man3/des_crypt.3t diff --git a/lfs/libtirpc b/lfs/libtirpc index 382d7e5..65466d0 100644 --- a/lfs/libtirpc +++ b/lfs/libtirpc @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2016 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,10 +31,6 @@ DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = libtirpc -PAK_VER = 1 - -DEPS = "" ############################################################################### # Top-level Rules @@ -54,9 +50,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: - @$(PAK) - ############################################################################### # Downloading, checking, md5sum ############################################################################### @@ -76,9 +69,15 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-gssapi --disable-ipv6 - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --disable-static \ + --disable-gssapi \ + --disable-ipv6 + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + mv -v /usr/lib/libtirpc.so.* /lib + ln -sfv /lib/libtirpc.so.3.0.0 /usr/lib/libtirpc.so @rm -rf $(DIR_APP) @$(POSTBUILD) -- 1.9.1

2 3

[PATCH] BUG11141: Redesign of configuration website
by Alexander Marx 07 Jul '16

07 Jul '16

To improve the user experience, the configuration part of generating new vouchers has been reworked. Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> --- html/cgi-bin/captive.cgi | 187 +++++++++++++++++++++-------------------------- langs/de/cgi-bin/de.pl | 4 +- langs/en/cgi-bin/en.pl | 4 +- 3 files changed, 88 insertions(+), 107 deletions(-) diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index 50f4795..a8add4d 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -58,11 +58,6 @@ unless (-e $voucherout) { system("touch $voucherout"); } #actions if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ - #Check Expiretime - if($cgiparams{'EXP_HOUR'}+$cgiparams{'EXP_DAY'}+$cgiparams{'EXP_WEEK'}+$cgiparams{'EXP_MONTH'} == 0 && $cgiparams{'UNLIMITED'} == ''){ - $errormessage=$Lang::tr{'Captive noexpiretime'}; - } - my $file = $cgiparams{'uploaded_file'}; if ($file){ #Check if extension is png @@ -76,11 +71,6 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ $settings{'ENABLE_GREEN'} = $cgiparams{'ENABLE_GREEN'}; $settings{'ENABLE_BLUE'} = $cgiparams{'ENABLE_BLUE'}; $settings{'AUTH'} = $cgiparams{'AUTH'}; - $settings{'EXPIRE'} = $cgiparams{'EXP_HOUR'}+$cgiparams{'EXP_DAY'}+$cgiparams{'EXP_WEEK'}+$cgiparams{'EXP_MONTH'}; - $settings{'EXP_HOUR'} = $cgiparams{'EXP_HOUR'}; - $settings{'EXP_DAY'} = $cgiparams{'EXP_DAY'}; - $settings{'EXP_WEEK'} = $cgiparams{'EXP_WEEK'}; - $settings{'EXP_MONTH'} = $cgiparams{'EXP_MONTH'}; $settings{'TITLE'} = $cgiparams{'TITLE'}; $settings{'UNLIMITED'} = $cgiparams{'UNLIMITED'}; @@ -108,14 +98,6 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ } } - #saves the Captiveportal settings to disk - if ($cgiparams{'UNLIMITED'} eq 'on'){ - $cgiparams{'EXP_HOUR'} = '0'; - $cgiparams{'EXP_DAY'} = '0'; - $cgiparams{'EXP_WEEK'} = '0'; - $cgiparams{'EXP_MONTH'} = '0'; - } - &General::writehash("$settingsfile", \%settings); #write Licensetext if defined @@ -135,9 +117,22 @@ if ($cgiparams{'ACTION'} eq "$Lang::tr{'save'}"){ } } -if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive voucherout'}"){ +if ($cgiparams{'ACTION'} eq "$Lang::tr{'Captive genvoucher'}"){ #generates a voucher and writes it to /var/ipfire/voucher_out + #calculate expiredate + my $expire; + if ($settings{'UNLIMITED'} eq 'on'){ + $expire = $Lang::tr{'Captive nolimit'}; + }else{ + $settings{'EXPIRE'} = $cgiparams{'EXP_HOUR'}+$cgiparams{'EXP_DAY'}+$cgiparams{'EXP_WEEK'}+$cgiparams{'EXP_MONTH'}; + $expire = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime(time()+$settings{'EXPIRE'})); + } + + #Check Expiretime + if($cgiparams{'EXP_HOUR'}+$cgiparams{'EXP_DAY'}+$cgiparams{'EXP_WEEK'}+$cgiparams{'EXP_MONTH'} == 0 && $cgiparams{'UNLIMITED'} == ''){ + $errormessage=$Lang::tr{'Captive noexpiretime'}; + } #check if we already have a voucher with same code &General::readhasharray("$voucherout", \%voucherhash); foreach my $key (keys %voucherhash) { @@ -316,70 +311,6 @@ END print"<td>$Lang::tr{'Captive logo_set'}</td>"; print"<td><br>$Lang::tr{'no'}</td></tr>"; } - print"<tr><td>$Lang::tr{'Captive vouchervalid'}</td><td>"; - print "<br><table border='0' with=100%>"; - print "<th>$Lang::tr{'hours'}</th><th>$Lang::tr{'days'}</th><th>$Lang::tr{'weeks'}</th><th>$Lang::tr{'months'}</th>"; - - #print hour-dropdownbox - my $hrs=3600; - print "<tr><td><select name='EXP_HOUR' style='width:8em;'>"; - print "<option value='0' "; - print " selected='selected'" if ($settings{'EXP_HOUR'} eq '0'); - print ">--</option>"; - for (my $i = 1; $i<25; $i++){ - my $exp_sec = $i * $hrs; - print "<option value='$exp_sec' "; - print " selected='selected'" if ($settings{'EXP_HOUR'} eq $exp_sec); - print ">$i</option>"; - } - print "</td><td>"; - - #print day-dropdownbox - my $days=3600*24; - print "<select name='EXP_DAY' style='width:8em;'>"; - print "<option value='0' "; - print " selected='selected'" if ($settings{'EXP_DAY'} eq '0'); - print ">--</option>"; - for (my $i = 1; $i<8; $i++){ - my $exp_sec = $i * $days; - print "<option value='$exp_sec' "; - print " selected='selected'" if ($settings{'EXP_DAY'} eq $exp_sec); - print ">$i</option>"; - } - print "</td><td>"; - - #print week-dropdownbox - my $week=3600*24*7; - print "<select name='EXP_WEEK' style='width:8em;'>"; - print "<option value='0' "; - print " selected='selected'" if ($settings{'EXP_WEEK'} eq '0'); - print ">--</option>"; - for (my $i = 1; $i<5; $i++){ - my $exp_sec = $i * $week; - print "<option value='$exp_sec' "; - print " selected='selected'" if ($settings{'EXP_WEEK'} eq $exp_sec); - print ">$i</option>"; - } - print "</td><td>"; - - #print month-dropdownbox - my $month=3600*24*30; - print "<select name='EXP_MONTH' style='width:8em;'>"; - print "<option value='0' "; - print " selected='selected'" if ($settings{'EXP_MONTH'} eq '0'); - print ">--</option>"; - for (my $i = 1; $i<13; $i++){ - my $exp_sec = $i * $month; - print "<option value='$exp_sec' "; - print " selected='selected'" if ($settings{'EXP_MONTH'} eq $exp_sec); - print ">$i</option>"; - } - print "</td>"; - - print "<td>   <input type='checkbox' name='UNLIMITED' $checked{'UNLIMITED'}{'on'} /></td><td> <b>$Lang::tr{'Captive nolimit'}</b></td>"; - - print "</tr></table>"; - print<<END <tr> <td> @@ -431,27 +362,77 @@ sub gencode(){ sub voucher(){ #show voucher part - #calculate expiredate - my $expire; - if ($settings{'UNLIMITED'} eq 'on'){ - $expire = $Lang::tr{'Captive nolimit'}; - }else{ - $expire = sub{sprintf '%02d.%02d.%04d %02d:%02d', $_[3], $_[4]+1, $_[5]+1900, $_[2], $_[1] }->(localtime(time()+$settings{'EXPIRE'})); - } - - &Header::openbox('100%', 'left', $Lang::tr{'Captive voucher'}); -print<<END - <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <table class='tbl' width='100%'> - <tr> - <th align='center' width='20%'>$Lang::tr{'Captive voucher'}</th><th align='center' width='15%'>$Lang::tr{'Captive expire'}</th><th align='center' width='65%'>$Lang::tr{'remark'}</th></tr> -END -; - + &Header::openbox('100%', 'left', $Lang::tr{'Captive genvoucher'}); + print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>"; + print "<table border='0' width='100%'>"; + print "<tr><td width='30%'><br>$Lang::tr{'Captive vouchervalid'}</td><td width='70%'><br>"; + + print "<table class='tbl' border='0' width='100%'>"; + print "<th>$Lang::tr{'hours'}</th><th>$Lang::tr{'days'}</th><th>$Lang::tr{'weeks'}</th><th>$Lang::tr{'months'}</th><th></th><th></th>"; + + #print hour-dropdownbox + my $hrs=3600; + print "<tr height='40px'><td><select name='EXP_HOUR' style='width:8em;'>"; + print "<option value='0' "; + print " selected='selected'" if ($settings{'EXP_HOUR'} eq '0'); + print ">--</option>"; + for (my $i = 1; $i<25; $i++){ + my $exp_sec = $i * $hrs; + print "<option value='$exp_sec' "; + print " selected='selected'" if ($settings{'EXP_HOUR'} eq $exp_sec); + print ">$i</option>"; + } + print "</td><td>"; + + #print day-dropdownbox + my $days=3600*24; + print "<select name='EXP_DAY' style='width:8em;'>"; + print "<option value='0' "; + print " selected='selected'" if ($settings{'EXP_DAY'} eq '0'); + print ">--</option>"; + for (my $i = 1; $i<8; $i++){ + my $exp_sec = $i * $days; + print "<option value='$exp_sec' "; + print " selected='selected'" if ($settings{'EXP_DAY'} eq $exp_sec); + print ">$i</option>"; + } + print "</td><td>"; + + #print week-dropdownbox + my $week=3600*24*7; + print "<select name='EXP_WEEK' style='width:8em;'>"; + print "<option value='0' "; + print " selected='selected'" if ($settings{'EXP_WEEK'} eq '0'); + print ">--</option>"; + for (my $i = 1; $i<5; $i++){ + my $exp_sec = $i * $week; + print "<option value='$exp_sec' "; + print " selected='selected'" if ($settings{'EXP_WEEK'} eq $exp_sec); + print ">$i</option>"; + } + print "</td><td>"; + + #print month-dropdownbox + my $month=3600*24*30; + print "<select name='EXP_MONTH' style='width:8em;'>"; + print "<option value='0' "; + print " selected='selected'" if ($settings{'EXP_MONTH'} eq '0'); + print ">--</option>"; + for (my $i = 1; $i<13; $i++){ + my $exp_sec = $i * $month; + print "<option value='$exp_sec' "; + print " selected='selected'" if ($settings{'EXP_MONTH'} eq $exp_sec); + print ">$i</option>"; + } + print "</td>"; + print "<td>   <input type='checkbox' name='UNLIMITED' $checked{'UNLIMITED'}{'on'} /></td><td> <b>$Lang::tr{'Captive nolimit'}</b></td>"; + print "</tr></table>"; + print "</td></tr>"; + print "<tr><td><br>$Lang::tr{'remark'}</td><td><br><input type='text' style='width: 98%;' name='REMARK' align='left'></td></tr>"; + print "<tr><td>&nbsp</td><td></td></tr></table><br><br>"; $cgiparams{'CODE'} = &gencode(); - print "<tr><td><center><b><font size='5'>$cgiparams{'CODE'}</font></b></center></td><td><center><font size='2'>$expire</font></center></td><td><input type='text' style='width: 96%;' name='REMARK' align='left'></td></tr>"; - print "</table><br>"; - print "<center><input type='submit' name='ACTION' value='$Lang::tr{'Captive voucherout'}'><input type='hidden' name='CODE' value='$cgiparams{'CODE'}'</center></form>"; + print "<div align='right'><input type='submit' name='ACTION' value='$Lang::tr{'Captive genvoucher'}'><input type='hidden' name='CODE' value='$cgiparams{'CODE'}'></form></div>"; + &Header::closebox(); if (! -z $voucherout) { &show_voucher_out();} if (! -z $clients) { &show_voucher_in_use();} diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 3b400f4..def1ae5 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -33,9 +33,9 @@ 'Captive time' => 'Erlaubter Nutzungszeitraum nach Aktivierung (Stunden)', 'Captive title' => 'Titel der Anmeldeseite', 'Captive voactive' => 'Aktive Gutscheine', +'Captive genvoucher' => 'Gutschein generieren', 'Captive voucher' => 'Gutschein', -'Captive voucherout' => 'Gutschein ausgeben', -'Captive vouchervalid' => 'Verbindungszeitraum', +'Captive vouchervalid' => 'Erlaubter Zeitraum für Gutschein', 'Captive vout' => 'Ausgegebene Gutscheine', 'Captive wrong ext' => 'Die hochgeladene Datei hat den falschen Dateityp', 'Choose Rule' => 'Wählen Sie <u>eine</u> der untenstehenden Regeln aus.', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index c23470a..ace3f24 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -33,9 +33,9 @@ 'Captive time' => 'Access time post activation (hours)', 'Captive title' => 'Title of Login Page', 'Captive voactive' => 'Active Vouchers', +'Captive genvoucher' => 'Generate voucher', 'Captive voucher' => 'Voucher', -'Captive voucherout' => 'Ticket Transfer', -'Captive vouchervalid' => 'Connection time range', +'Captive vouchervalid' => 'Allowed time for this voucher', 'Captive vout' => 'Issued Vouchers', 'Captive wrong ext' => 'Uploaded file has wrong filetype', 'Choose Rule' => 'Choose <u>one</u> of the following rules.', -- 2.7.4

1 0

Sources are not availible
by Jonatan Schlag 05 Jul '16

05 Jul '16

Hi, http://source.ipfire.org did not work so it is not possible to download the sources to build IPFire. It seem to be a problem with the webserver because i can browse the directory via ssh. regards Jonatan

2 1

[PATCH] Update qemu to version 2.6
by Jonatan Schlag 05 Jul '16

05 Jul '16

This patch update qemu to version 2.6 For changelogs see: http://wiki.qemu.org/ChangeLog/2.5 http://wiki.qemu.org/ChangeLog/2.6 Qemu try to built with bluez, but before version 2.6 bluez was not used by qemu on IPFire, so I think it is better to disable bluez because nobody needs it before version 2.6 and our bluez is not the latest version so I think this will cause more problems than benefits. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> --- config/rootfiles/packages/qemu | 5 +++-- lfs/qemu | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu index 3b3f361..21b438f 100644 --- a/config/rootfiles/packages/qemu +++ b/config/rootfiles/packages/qemu @@ -85,11 +85,9 @@ usr/share/qemu/pxe-ne2k_pci.rom usr/share/qemu/pxe-pcnet.rom usr/share/qemu/pxe-rtl8139.rom usr/share/qemu/pxe-virtio.rom -usr/share/qemu/q35-acpi-dsdt.aml usr/share/qemu/qemu-icon.bmp usr/share/qemu/qemu_logo_no_text.svg usr/share/qemu/s390-ccw.img -usr/share/qemu/s390-zipl.rom usr/share/qemu/sgabios.bin usr/share/qemu/slof.bin usr/share/qemu/spapr-rtas.bin @@ -102,4 +100,7 @@ usr/share/qemu/vgabios-virtio.bin usr/share/qemu/vgabios-vmware.bin usr/share/qemu/vgabios.bin #usr/var/run +usr/bin/ivshmem-client +usr/bin/ivshmem-server +#usr/share/man/man8/qemu-ga.8 diff --git a/lfs/qemu b/lfs/qemu index c32953c..62010ee 100644 --- a/lfs/qemu +++ b/lfs/qemu @@ -24,7 +24,7 @@ include Config -VER = 2.4.0 +VER = 2.6.0 THISAPP = qemu-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) SUP_ARCH = i586 x86_64 PROG = qemu -PAK_VER = 19 +PAK_VER = 20 DEPS = "sdl spice" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 186ee8194140a484a455f8e3c74589f4 +$(DL_FILE)_MD5 = ca3f70b43f093e33e9e014f144067f13 install : $(TARGET) @@ -79,7 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @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 \ + --enable-kvm --disable-bluez --disable-attr \ --target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \ --extra-cflags="$(CFLAGS)" --enable-spice cd $(DIR_APP) && make $(MAKETUNING) -- 2.1.4

1 0

[PATCH] BUG11140: Captive logo dimensions
by Alexander Marx 05 Jul '16

05 Jul '16

Now the min and max logo dimensions are shown in webinterface. Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> --- html/cgi-bin/captive.cgi | 2 +- langs/de/cgi-bin/de.pl | 3 ++- langs/en/cgi-bin/en.pl | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi index 803c03d..50f4795 100755 --- a/html/cgi-bin/captive.cgi +++ b/html/cgi-bin/captive.cgi @@ -307,7 +307,7 @@ END &agbbox(); #Logo Upload - print "<tr><td>$Lang::tr{'Captive logo_upload'}</td><td><INPUT TYPE='file' NAME='uploaded_file' SIZE=30 MAXLENGTH=80></td></tr><tr>"; + print "<tr><td>$Lang::tr{'Captive logo_upload'}<br>$Lang::tr{'Captive logo_upload1'}</td><td><INPUT TYPE='file' NAME='uploaded_file' SIZE=30 MAXLENGTH=80></td></tr><tr>"; #Show Logo in webinterface with 1/2 size if set if (-f "$logopath/logo.png"){ print"<td>$Lang::tr{'Captive logo_set'}</td>"; diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index bd1b8e7..3b400f4 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -23,7 +23,8 @@ 'Captive invalid_voucher' => 'Dieser Code ist ungültig. Bitte versuchen Sie es erneut', 'Captive ip' => 'IP-Addresse', 'Captive logo_set' => 'Aktuelles Logo', -'Captive logo_upload' => 'Logo hochladen (PNG, max. 1920x800)', +'Captive logo_upload' => 'Logo hochladen', +'Captive logo_upload1' => '(PNG, min. 1280x400, max. 1920x800)', 'Captive mac' => 'MAC-Adresse', 'Captive menu' => 'Captive-Portal', 'Captive noexpiretime' => 'Es wurde kein gültiger Verbindungszeitraum angegeben', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 476d945..c23470a 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -23,7 +23,8 @@ 'Captive invalid_voucher' => 'Invalid code. Please try again', 'Captive ip' => 'IP Address', 'Captive logo_set' => 'Current Logo', -'Captive logo_upload' => 'Upload Logo (PNG, max. 1920x800)', +'Captive logo_upload' => 'Upload Logo', +'Captive logo_upload1' => '(PNG, min. 1280x400, max. 1920x800)', 'Captive mac' => 'MAC Address', 'Captive menu' => 'Captive Portal', 'Captive noexpiretime' => 'No valid connection time range given', -- 2.7.4

1 0

Telco 2016-07-04
by Jonatan Schlag 04 Jul '16

04 Jul '16

Hello, My plan was to attend to the telco, which takes palce this evening but in the moment a lot of ipfire services are down like the website and talk.ipfire.org. So my guess is that the telco does not take place this evening, but is there an alternative date? Regards Jonatan PS.: Good luck to the people who try to fix the issues with the server!

2 1

planet.ipfire.org down
by R. W. Rodolico 03 Jul '16

03 Jul '16

Wasn't sure who to contact. Anyway, going to http://planet.ipfire.org/ returns an "internal server error". ipfire.org appears to be ok, and I think that is likely on the same server? ======================================================================= 500 - Internal Server Error Unfortunately, an unexpected error has occurred during page load. If this is the first occurrence of the error, please wait a little bit and try again. If the error occurres anyway the webmaster would be happy to get a notification about this. Detailed information While processing the request, there was an internal problem of the web server. If there are more information available, they would be appended below. ======================================================================= -- Rod Rodolico Daily Data, Inc. POB 140465 Dallas TX 75214-0465 214.827.2170 http://www.dailydata.net

2 1

IPFire Developer Summit 2016
by Michael Tremer 02 Jul '16

02 Jul '16

Hello, as usual, I would like to invite for this year's IPFire Developer Summit. This is our annual event where we meet up, discuss, plan and socialise. In contrast to the other years, we won't have talks and do more hands-on things instead. Think of it more of a hackaton than anything else. Feel free to bring your own ideas. As everyone's schedule is very tight, we have agreed on the following dates already: Sept 1st-5th 2016 It will be held in London as usual. I have not reached out to arrange a location like the Mozilla office we had last year as I would like to await registrations first. So here is the registration process: Mailing list: http://lists.ipfire.org/mailman/listinfo/ids2016 * Please drop me an email if you are going to attend so that we can estimate the number of people and start searching for a location. * Also drop me an email if you are part of the active development team and not planning to attend. That will help me to know when to close the registration process. * The mailing list is also the place to ask any questions, etc. * I do not have a fixed date yet when I will close the registration process, but I would like to do this sooner than later. So please subscribe and mail soon. There is also the usual wiki page: http://wiki.ipfire.org/ids/2016/start Best, -Michael

5 6

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development July 2016