Development April 2017

development@lists.ipfire.org

11 participants
59 discussions

[PATCH 1/2] apr and aprutil: Added as requirement for Apache 2.4
by Wolfgang Apolinarski 18 May '17

18 May '17

- APR is a requirement for building Apache httpd 2.4 - APR-Util is a requirement for building Apache httpd 2.4 --- config/rootfiles/common/apache2 | 8 ++-- config/rootfiles/common/apr | 53 ++++++++++++++++++++++++++ config/rootfiles/common/aprutil | 50 ++++++++++++++++++++++++ lfs/apr | 84 +++++++++++++++++++++++++++++++++++++++++ lfs/aprutil | 84 +++++++++++++++++++++++++++++++++++++++++ make.sh | 2 + 6 files changed, 277 insertions(+), 4 deletions(-) create mode 100644 config/rootfiles/common/apr create mode 100644 config/rootfiles/common/aprutil create mode 100644 lfs/apr create mode 100644 lfs/aprutil diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 7e33a15..360f5ae 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1342,22 +1342,22 @@ usr/lib/apache/mod_usertrack.so usr/lib/apache/mod_version.so usr/lib/apache/mod_vhost_alias.so #usr/lib/apr-util-1 -usr/lib/apr-util-1/apr_dbd_sqlite3-1.so +#usr/lib/apr-util-1/apr_dbd_sqlite3-1.so #usr/lib/apr-util-1/apr_dbd_sqlite3.a #usr/lib/apr-util-1/apr_dbd_sqlite3.la -usr/lib/apr-util-1/apr_dbd_sqlite3.so +#usr/lib/apr-util-1/apr_dbd_sqlite3.so #usr/lib/apr.exp #usr/lib/aprutil.exp #usr/lib/libapr-1.a #usr/lib/libapr-1.la usr/lib/libapr-1.so usr/lib/libapr-1.so.0 -usr/lib/libapr-1.so.0.5.1 +#usr/lib/libapr-1.so.0.5.1 #usr/lib/libaprutil-1.a #usr/lib/libaprutil-1.la usr/lib/libaprutil-1.so usr/lib/libaprutil-1.so.0 -usr/lib/libaprutil-1.so.0.5.3 +#usr/lib/libaprutil-1.so.0.5.3 #usr/lib/pkgconfig/apr-1.pc #usr/lib/pkgconfig/apr-util-1.pc #usr/sbin/ab diff --git a/config/rootfiles/common/apr b/config/rootfiles/common/apr new file mode 100644 index 0000000..c0b574a --- /dev/null +++ b/config/rootfiles/common/apr @@ -0,0 +1,53 @@ +usr/bin/apr-1-config +#usr/include/apr-1 +#usr/include/apr-1/apr.h +#usr/include/apr-1/apr_allocator.h +#usr/include/apr-1/apr_atomic.h +#usr/include/apr-1/apr_dso.h +#usr/include/apr-1/apr_env.h +#usr/include/apr-1/apr_errno.h +#usr/include/apr-1/apr_escape.h +#usr/include/apr-1/apr_file_info.h +#usr/include/apr-1/apr_file_io.h +#usr/include/apr-1/apr_fnmatch.h +#usr/include/apr-1/apr_general.h +#usr/include/apr-1/apr_getopt.h +#usr/include/apr-1/apr_global_mutex.h +#usr/include/apr-1/apr_hash.h +#usr/include/apr-1/apr_inherit.h +#usr/include/apr-1/apr_lib.h +#usr/include/apr-1/apr_mmap.h +#usr/include/apr-1/apr_network_io.h +#usr/include/apr-1/apr_poll.h +#usr/include/apr-1/apr_pools.h +#usr/include/apr-1/apr_portable.h +#usr/include/apr-1/apr_proc_mutex.h +#usr/include/apr-1/apr_random.h +#usr/include/apr-1/apr_ring.h +#usr/include/apr-1/apr_shm.h +#usr/include/apr-1/apr_signal.h +#usr/include/apr-1/apr_skiplist.h +#usr/include/apr-1/apr_strings.h +#usr/include/apr-1/apr_support.h +#usr/include/apr-1/apr_tables.h +#usr/include/apr-1/apr_thread_cond.h +#usr/include/apr-1/apr_thread_mutex.h +#usr/include/apr-1/apr_thread_proc.h +#usr/include/apr-1/apr_thread_rwlock.h +#usr/include/apr-1/apr_time.h +#usr/include/apr-1/apr_user.h +#usr/include/apr-1/apr_version.h +#usr/include/apr-1/apr_want.h +usr/lib/apr.exp +usr/lib/libapr-1.la +usr/lib/libapr-1.so +usr/lib/libapr-1.so.0 +usr/lib/libapr-1.so.0.5.2 +#usr/lib/pkgconfig/apr-1.pc +#usr/share/apr-1 +#usr/share/apr-1/build +#usr/share/apr-1/build/apr_rules.mk +#usr/share/apr-1/build/libtool +#usr/share/apr-1/build/make_exports.awk +#usr/share/apr-1/build/make_var_export.awk +#usr/share/apr-1/build/mkdir.sh diff --git a/config/rootfiles/common/aprutil b/config/rootfiles/common/aprutil new file mode 100644 index 0000000..c764d88 --- /dev/null +++ b/config/rootfiles/common/aprutil @@ -0,0 +1,50 @@ +usr/bin/apu-1-config +#usr/include/apr-1/apr_anylock.h +#usr/include/apr-1/apr_base64.h +#usr/include/apr-1/apr_buckets.h +#usr/include/apr-1/apr_crypto.h +#usr/include/apr-1/apr_date.h +#usr/include/apr-1/apr_dbd.h +#usr/include/apr-1/apr_dbm.h +#usr/include/apr-1/apr_hooks.h +#usr/include/apr-1/apr_ldap.h +#usr/include/apr-1/apr_ldap_init.h +#usr/include/apr-1/apr_ldap_option.h +#usr/include/apr-1/apr_ldap_rebind.h +#usr/include/apr-1/apr_ldap_url.h +#usr/include/apr-1/apr_md4.h +#usr/include/apr-1/apr_md5.h +#usr/include/apr-1/apr_memcache.h +#usr/include/apr-1/apr_optional.h +#usr/include/apr-1/apr_optional_hooks.h +#usr/include/apr-1/apr_queue.h +#usr/include/apr-1/apr_reslist.h +#usr/include/apr-1/apr_rmm.h +#usr/include/apr-1/apr_sdbm.h +#usr/include/apr-1/apr_sha1.h +#usr/include/apr-1/apr_strmatch.h +#usr/include/apr-1/apr_thread_pool.h +#usr/include/apr-1/apr_uri.h +#usr/include/apr-1/apr_uuid.h +#usr/include/apr-1/apr_xlate.h +#usr/include/apr-1/apr_xml.h +#usr/include/apr-1/apu.h +#usr/include/apr-1/apu_errno.h +#usr/include/apr-1/apu_version.h +#usr/include/apr-1/apu_want.h +#usr/include/apr-1/expat.h +usr/lib/apr-util-1 +usr/lib/apr-util-1/apr_crypto_openssl-1.so +usr/lib/apr-util-1/apr_crypto_openssl.la +usr/lib/apr-util-1/apr_crypto_openssl.so +usr/lib/aprutil.exp +usr/lib/libaprutil-1.la +usr/lib/libaprutil-1.so +usr/lib/libaprutil-1.so.0 +usr/lib/libaprutil-1.so.0.5.4 +#usr/lib/libexpat.a +#usr/lib/libexpat.la +#usr/lib/libexpat.so +#usr/lib/libexpat.so.0 +#usr/lib/libexpat.so.0.5.0 +#usr/lib/pkgconfig/apr-util-1.pc diff --git a/lfs/apr b/lfs/apr new file mode 100644 index 0000000..330354a --- /dev/null +++ b/lfs/apr @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2014 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 # +# 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.5.2 + +THISAPP = apr-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = http://archive.apache.org/dist/apr +DIR_APP = $(DIR_SRC)/$(THISAPP) + +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 4e9769f3349fe11fc0a5e1b224c236aa + +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 jxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && sed -i "/seems to be moved/s/^/#/" build/ltmain.sh + + cd $(DIR_APP) && ./configure --prefix=/usr \ + --disable-static --with-installbuilddir=/usr/share/apr-1/build + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/aprutil b/lfs/aprutil new file mode 100644 index 0000000..6b133ad --- /dev/null +++ b/lfs/aprutil @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2014 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 # +# 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.5.4 + +THISAPP = apr-util-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = http://archive.apache.org/dist/apr +DIR_APP = $(DIR_SRC)/$(THISAPP) + +TARGET = $(DIR_INFO)/$(THISAPP) + +DEPS = "apr" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 2202b18f269ad606d70e1864857ed93c + +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 jxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && ./configure --prefix=/usr \ + --with-apr=/usr --with-gdbm=/usr --with-openssl=/usr --with-crypto + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 61483eb..15dd4b9 100755 --- a/make.sh +++ b/make.sh @@ -354,6 +354,7 @@ buildbase() { lfsmake2 bzip2 lfsmake2 pcre lfsmake2 pcre-compat + lfsmake2 apr lfsmake2 bash lfsmake2 diffutils lfsmake2 e2fsprogs @@ -492,6 +493,7 @@ buildipfire() { ipfiremake libevent ipfiremake libevent2 ipfiremake expat + ipfiremake aprutil ipfiremake unbound ipfiremake gnutls ipfiremake bind -- 2.7.3

2 5

[PATCH] GUI: Some simple FW-Log cosmetics - Step 2 (revised, too many typos)
by Matthias Fischer 30 Apr '17

30 Apr '17

Please note: This commit supersedes two commits: http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=2d45c1c7… and http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=d786d148… First: I altered 'showrequestfromcountry.dat', 'showrequestfromip.dat' and 'showrequestfromport.dat' in the same manner as the 'Loggraphs'-Pages in commit http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=f6a95642… Each 'Details'-page got a unique title. Second: Furthermore, I added a 'Back'-Button to go back to the previous page. For this, I used 'back.png' from 'wio' (thanks Stephan! ;-) ) since I found no other appropriate image. Third: 'ipinfo.cgi' got a centered 'Back'-Button, too. Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/ipinfo.cgi | 2 +- html/cgi-bin/logs.cgi/showrequestfromcountry.dat | 6 ++++-- html/cgi-bin/logs.cgi/showrequestfromip.dat | 6 ++++-- html/cgi-bin/logs.cgi/showrequestfromport.dat | 6 ++++-- html/html/images/back.png | Bin 0 -> 315 bytes 5 files changed, 13 insertions(+), 7 deletions(-) create mode 100644 html/html/images/back.png diff --git a/html/cgi-bin/ipinfo.cgi b/html/cgi-bin/ipinfo.cgi index 8cefe6e85..16541f126 100644 --- a/html/cgi-bin/ipinfo.cgi +++ b/html/cgi-bin/ipinfo.cgi @@ -102,7 +102,7 @@ print <<END <div align='center'> <table width='80%'> <tr> - <td align='center'><a href='$ENV{'HTTP_REFERER'}'>$Lang::tr{'back'}</a></td> + <td align='center'><a href='$ENV{'HTTP_REFERER'}'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td> </tr> </table> </div> diff --git a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat index cd97f8780..b6383ed59 100644 --- a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat +++ b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat @@ -233,7 +233,7 @@ if ($multifile) { } &Header::showhttpheaders(); -&Header::openpage($Lang::tr{'firewall log'}, 1, ''); +&Header::openpage($Lang::tr{'firewall log country'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); if ($errormessage) { @@ -292,7 +292,7 @@ END &Header::closebox(); -&Header::openbox('100%', 'left', $Lang::tr{'firewall log'}); +&Header::openbox('100%', 'left', $Lang::tr{'firewall log country'}); print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>"; if ($start == -1) { @@ -415,6 +415,8 @@ END &oldernewer(); + print"<table width='100%'><tr><td align='center'><a href='/cgi-bin/logs.cgi/firewalllogcountry.dat'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td></tr></table>"; + &Header::closebox(); &Header::closebigbox(); diff --git a/html/cgi-bin/logs.cgi/showrequestfromip.dat b/html/cgi-bin/logs.cgi/showrequestfromip.dat index 154fa4030..31cd42c33 100644 --- a/html/cgi-bin/logs.cgi/showrequestfromip.dat +++ b/html/cgi-bin/logs.cgi/showrequestfromip.dat @@ -194,7 +194,7 @@ if ($multifile) { } &Header::showhttpheaders(); -&Header::openpage($Lang::tr{'firewall log'}, 1, ''); +&Header::openpage($Lang::tr{'firewall log ip'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); if ($errormessage) { @@ -252,7 +252,7 @@ END &Header::closebox(); -&Header::openbox('100%', 'left', $Lang::tr{'firewall log'}); +&Header::openbox('100%', 'left', $Lang::tr{'firewall log ip'}); print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>"; if ($start == -1) { @@ -357,6 +357,8 @@ END &oldernewer(); + print"<table width='100%'><tr><td align='center'><a href='/cgi-bin/logs.cgi/firewalllogip.dat'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td></tr></table>"; + &Header::closebox(); &Header::closebigbox(); diff --git a/html/cgi-bin/logs.cgi/showrequestfromport.dat b/html/cgi-bin/logs.cgi/showrequestfromport.dat index e1f00aed8..004a00e6a 100644 --- a/html/cgi-bin/logs.cgi/showrequestfromport.dat +++ b/html/cgi-bin/logs.cgi/showrequestfromport.dat @@ -202,7 +202,7 @@ if ($multifile) { } &Header::showhttpheaders(); -&Header::openpage($Lang::tr{'firewall log'}, 1, ''); +&Header::openpage($Lang::tr{'firewall log port'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); if ($errormessage) { @@ -260,7 +260,7 @@ END &Header::closebox(); -&Header::openbox('100%', 'left', $Lang::tr{'firewall log'}); +&Header::openbox('100%', 'left', $Lang::tr{'firewall log port'}); print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>"; if ($start == -1) { @@ -367,6 +367,8 @@ END &oldernewer(); + print"<table width='100%'><tr><td align='center'><a href='/cgi-bin/logs.cgi/firewalllogport.dat'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td></tr></table>"; + &Header::closebox(); &Header::closebigbox(); diff --git a/html/html/images/back.png b/html/html/images/back.png new file mode 100644 index 0000000000000000000000000000000000000000..66921afb2ab5d73312b3498d0b5a2a2a28a6a657 GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj>?NMQuI%?&_&NCG=N~`J4;11o z@Q5sCU|>xIVMfLqwI6|kEa{HEjtmSN`?>!lvI6<1JY5_^DsH`<V#w8EAmU;h%;J2B zW1a(x;ym9C7Y^N%UgF2a&HunR?V?jm@9y{;Dbn39@11FO5kC7_=4a3KkM0lL4S1NR z1xSASV9^&Cdws<!uBhx70}G@0_T`yQmrYK5mgzBEl368Glcd+)YnX9c%r#J<FS+2H zVvEDH)aaRq=CrNd`eGMfYGj_O=F?fVGY{?Ioc3_v`-M}Yygeu7sD{rxw1(-_hSffa zhdB1g2X64@`!<v9_eG8K2mI%CB~N=a^}x|PVt39e|JeV4HOP6=!~YXmRe`=@@O1Ta JS?83{1ON-SdV2r> literal 0 HcmV?d00001 -- 2.11.0

1 0

[PATCH] Deleted unneccessary empty line
by Matthias Fischer 29 Apr '17

29 Apr '17

Sorry, seen too late... Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/logs.cgi/showrequestfromcountry.dat | 1 - 1 file changed, 1 deletion(-) diff --git a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat index 5a53fa6df..9b02d41c9 100644 --- a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat +++ b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat @@ -417,7 +417,6 @@ END print"<table width='100%'><tr><td><a href='/cgi-bin/logs.cgi/firewalllogcountry.dat'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td></tr></table>"; - &Header::closebox(); &Header::closebigbox(); -- 2.11.0

1 0

[PATCH] GUI: Some simple FW-Log cosmetics - Step 2
by Matthias Fischer 29 Apr '17

29 Apr '17

I altered 'firewalllogcountry.dat', 'firewalllogip.dat', 'firewalllogport.dat' in the same manner as the 'Loggraphs'-Pages in commit http://git.ipfire.org/?p=people/mfischer/ipfire-2.x.git;a=commit;h=f6a95642… Each 'Details'-page got a unique title. Furthermore, I added a 'Back'-Button to go back to the page before. For this, I used 'back.png' from 'wio' (thanks Stephan! ;-) ) since I found no other appropriate image. Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- html/cgi-bin/logs.cgi/showrequestfromcountry.dat | 7 +++++-- html/cgi-bin/logs.cgi/showrequestfromip.dat | 6 ++++-- html/cgi-bin/logs.cgi/showrequestfromport.dat | 6 ++++-- html/html/images/back.png | Bin 0 -> 315 bytes 4 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 html/html/images/back.png diff --git a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat index cd97f8780..5a53fa6df 100644 --- a/html/cgi-bin/logs.cgi/showrequestfromcountry.dat +++ b/html/cgi-bin/logs.cgi/showrequestfromcountry.dat @@ -233,7 +233,7 @@ if ($multifile) { } &Header::showhttpheaders(); -&Header::openpage($Lang::tr{'firewall log'}, 1, ''); +&Header::openpage($Lang::tr{'firewall log country'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); if ($errormessage) { @@ -292,7 +292,7 @@ END &Header::closebox(); -&Header::openbox('100%', 'left', $Lang::tr{'firewall log'}); +&Header::openbox('100%', 'left', $Lang::tr{'firewall log country'}); print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>"; if ($start == -1) { @@ -415,6 +415,9 @@ END &oldernewer(); + print"<table width='100%'><tr><td><a href='/cgi-bin/logs.cgi/firewalllogcountry.dat'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td></tr></table>"; + + &Header::closebox(); &Header::closebigbox(); diff --git a/html/cgi-bin/logs.cgi/showrequestfromip.dat b/html/cgi-bin/logs.cgi/showrequestfromip.dat index 154fa4030..c73724ad5 100644 --- a/html/cgi-bin/logs.cgi/showrequestfromip.dat +++ b/html/cgi-bin/logs.cgi/showrequestfromip.dat @@ -194,7 +194,7 @@ if ($multifile) { } &Header::showhttpheaders(); -&Header::openpage($Lang::tr{'firewall log'}, 1, ''); +&Header::openpage($Lang::tr{'firewall log ip'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); if ($errormessage) { @@ -252,7 +252,7 @@ END &Header::closebox(); -&Header::openbox('100%', 'left', $Lang::tr{'firewall log'}); +&Header::openbox('100%', 'left', $Lang::tr{'firewall log ip'}); print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>"; if ($start == -1) { @@ -357,6 +357,8 @@ END &oldernewer(); + print"<table width='100%'><tr><td><a href='/cgi-bin/logs.cgi/firewalllogip.dat'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td></tr></table>"; + &Header::closebox(); &Header::closebigbox(); diff --git a/html/cgi-bin/logs.cgi/showrequestfromport.dat b/html/cgi-bin/logs.cgi/showrequestfromport.dat index e1f00aed8..777805078 100644 --- a/html/cgi-bin/logs.cgi/showrequestfromport.dat +++ b/html/cgi-bin/logs.cgi/showrequestfromport.dat @@ -202,7 +202,7 @@ if ($multifile) { } &Header::showhttpheaders(); -&Header::openpage($Lang::tr{'firewall log'}, 1, ''); +&Header::openpage($Lang::tr{'firewall log port'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); if ($errormessage) { @@ -260,7 +260,7 @@ END &Header::closebox(); -&Header::openbox('100%', 'left', $Lang::tr{'firewall log'}); +&Header::openbox('100%', 'left', $Lang::tr{'firewall log port'}); print "<p><b>$Lang::tr{'firewall hits'} $longmonthstr $daystr: $lines</b></p>"; if ($start == -1) { @@ -367,6 +367,8 @@ END &oldernewer(); + print"<table width='100%'><tr><td><a href='/cgi-bin/logs.cgi/firewalllogport.dat'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td></tr></table>"; + &Header::closebox(); &Header::closebigbox(); diff --git a/html/html/images/back.png b/html/html/images/back.png new file mode 100644 index 0000000000000000000000000000000000000000..66921afb2ab5d73312b3498d0b5a2a2a28a6a657 GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gj>?NMQuI%?&_&NCG=N~`J4;11o z@Q5sCU|>xIVMfLqwI6|kEa{HEjtmSN`?>!lvI6<1JY5_^DsH`<V#w8EAmU;h%;J2B zW1a(x;ym9C7Y^N%UgF2a&HunR?V?jm@9y{;Dbn39@11FO5kC7_=4a3KkM0lL4S1NR z1xSASV9^&Cdws<!uBhx70}G@0_T`yQmrYK5mgzBEl368Glcd+)YnX9c%r#J<FS+2H zVvEDH)aaRq=CrNd`eGMfYGj_O=F?fVGY{?Ioc3_v`-M}Yygeu7sD{rxw1(-_hSffa zhdB1g2X64@`!<v9_eG8K2mI%CB~N=a^}x|PVt39e|JeV4HOP6=!~YXmRe`=@@O1Ta JS?83{1ON-SdV2r> literal 0 HcmV?d00001 -- 2.11.0

1 0

[PATCH] BUG 11305: Suggested fix for '/var/log/btmp' permissions
by Matthias Fischer 28 Apr '17

28 Apr '17

Fixes BUG 11305, for details see: https://bugzilla.ipfire.org/show_bug.cgi?id=11305 Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/stage2 | 1 + 1 file changed, 1 insertion(+) diff --git a/lfs/stage2 b/lfs/stage2 index 2d2a6459d..1256fd365 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -127,6 +127,7 @@ endif -mkdir -pv /var/log/{counter,calamaris} chown nobody.nobody /var/log/calamaris touch /var/log/{btmp,lastlog,wtmp} + chmod -v 600 /var/log/btmp chgrp -v utmp /var/log/lastlog chmod -v 664 /var/log/lastlog -- 2.11.0

1 0

[PATCH] logrotate: Update to 3.12.1
by Matthias Fischer 28 Apr '17

28 Apr '17

For details see: https://github.com/logrotate/logrotate/blob/master/ChangeLog.md Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/common/logrotate | 4 ++-- lfs/logrotate | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/config/rootfiles/common/logrotate b/config/rootfiles/common/logrotate index 8ef728c94..0583525ea 100644 --- a/config/rootfiles/common/logrotate +++ b/config/rootfiles/common/logrotate @@ -1,6 +1,6 @@ #etc/logrotate.d etc/logrotate.d/.empty -#usr/man/man5/logrotate.conf.5 -#usr/man/man8/logrotate.8 usr/sbin/logrotate +#usr/share/man/man5/logrotate.conf.5 +#usr/share/man/man8/logrotate.8 var/lib/logrotate.status diff --git a/lfs/logrotate b/lfs/logrotate index 0d50103e5..476f146eb 100644 --- a/lfs/logrotate +++ b/lfs/logrotate @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2017 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,10 +24,10 @@ include Config -VER = 3.9.1 +VER = 3.12.1 THISAPP = logrotate-$(VER) -DL_FILE = logrotate_$(VER).orig.tar.gz +DL_FILE = logrotate-$(VER).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4492b145b6d542e4a2f41e77fa199ab0 +$(DL_FILE)_MD5 = 066b49891bad2849d5044c1952613ea6 install : $(TARGET) @@ -70,6 +70,10 @@ $(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) && ./autogen.sh + cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install mkdir -pv /etc/logrotate.d -- 2.11.0

1 0

[PATCH] nano: Update to 2.8.1
by Matthias Fischer 25 Apr '17

25 Apr '17

For details see: https://www.nano-editor.org/news.php Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- config/rootfiles/packages/nano | 3 ++- lfs/nano | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/rootfiles/packages/nano b/config/rootfiles/packages/nano index f8171b4df..0e9341d68 100644 --- a/config/rootfiles/packages/nano +++ b/config/rootfiles/packages/nano @@ -1,11 +1,12 @@ #etc/nano -etc/nano/nanorc.sample +etc/nano/sample.nanorc usr/bin/nano usr/bin/pico usr/bin/rnano #usr/share/doc/nano #usr/share/doc/nano/faq.html #usr/share/doc/nano/nano.1.html +#usr/share/doc/nano/nano.html #usr/share/doc/nano/nanorc.5.html #usr/share/doc/nano/rnano.1.html #usr/share/info/nano.info diff --git a/lfs/nano b/lfs/nano index 2ecb1a5f8..34e8444f9 100644 --- a/lfs/nano +++ b/lfs/nano @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2017 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 = 2.7.3 +VER = 2.8.1 THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 14 +PAK_VER = 15 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 007ba6321212d3ec38f46236465b6ea8 +$(DL_FILE)_MD5 = 0dec96d839657e7f1a8396d7dbb19c07 install : $(TARGET) @@ -87,7 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - cd $(DIR_APP) && install -v -m644 -D doc/nanorc.sample /etc/nano/nanorc.sample + cd $(DIR_APP) && install -v -m644 -D doc/sample.nanorc /etc/nano/sample.nanorc ln -sf /usr/bin/nano /usr/bin/pico @rm -rf $(DIR_APP) @$(POSTBUILD) -- 2.11.0

1 0

[PATCH] bind: Update to 9.11.1
by Matthias Fischer 25 Apr '17

25 Apr '17

For details see: https://ftp.isc.org/isc/bind9/9.11.1/RELEASE-NOTES-bind-9.11.1.html "Security Fixes rndc "" could trigger an assertion failure in named. This flaw is disclosed in (CVE-2017-3138). [RT #44924] Some chaining (i.e., type CNAME or DNAME) responses to upstream queries could trigger assertion failures. This flaw is disclosed in CVE-2017-3137. [RT #44734] dns64 with break-dnssec yes; can result in an assertion failure. This flaw is disclosed in CVE-2017-3136. [RT #44653] If a server is configured with a response policy zone (RPZ) that rewrites an answer with local data, and is also configured for DNS64 address mapping, a NULL pointer can be read triggering a server crash. This flaw is disclosed in CVE-2017-3135. [RT #44434] A coding error in the nxdomain-redirect feature could lead to an assertion failure if the redirection namespace was served from a local authoritative data source such as a local zone or a DLZ instead of via recursive lookup. This flaw is disclosed in CVE-2016-9778. [RT #43837] named could mishandle authority sections with missing RRSIGs, triggering an assertion failure. This flaw is disclosed in CVE-2016-9444. [RT #43632] named mishandled some responses where covering RRSIG records were returned without the requested data, resulting in an assertion failure. This flaw is disclosed in CVE-2016-9147. [RT #43548] named incorrectly tried to cache TKEY records which could trigger an assertion failure when there was a class mismatch. This flaw is disclosed in CVE-2016-9131. [RT #43522] It was possible to trigger assertions when processing responses containing answers of type DNAME. This flaw is disclosed in CVE-2016-8864. [RT #43465] Added the ability to specify the maximum number of records permitted in a zone (max-records #;). This provides a mechanism to block overly large zone transfers, which is a potential risk with slave zones from other parties, as described in CVE-2016-6170. [RT #42143] Bug Fixes A synthesized CNAME record appearing in a response before the associated DNAME could be cached, when it should not have been. This was a regression introduced while addressing CVE-2016-8864. [RT #44318] named could deadlock if multiple changes to NSEC/NSEC3 parameters for the same zone were being processed at the same time. [RT #42770] named could trigger an assertion when sending NOTIFY messages. [RT #44019] Referencing a nonexistent zone in a response-policy statement could cause an assertion failure during configuration. [RT #43787] rndc addzone could cause a crash when attempting to add a zone with a type other than master or slave. Such zones are now rejected. [RT #43665] named could hang when encountering log file names with large apparent gaps in version number (for example, when files exist called "logfile.0", "logfile.1", and "logfile.1482954169"). This is now handled correctly. [RT #38688] If a zone was updated while named was processing a query for nonexistent data, it could return out-of-sync NSEC3 records causing potential DNSSEC validation failure. [RT #43247]" Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- lfs/bind | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/bind b/lfs/bind index ea6fb835b..1269e4155 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ include Config -VER = 9.11.0-P5 +VER = 9.11.1 THISAPP = bind-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3e1e525fc640308316cdf98cd29cfa11 +$(DL_FILE)_MD5 = c384ab071d902bac13487c1268e5a32f install : $(TARGET) -- 2.11.0

1 0

RE: [PATCH 2/2] Update to Apache 2.4.25
by Wolfgang Apolinarski 25 Apr '17

25 Apr '17

Hi! Just a short mail, I rebased the patch on the current "next", it builds and runs successfully. I usually try to keep the Github branch up-to-date with my development branch, so you can see any changes - as soon as I get a response regarding the other question/response, I will send a new version of the patch to the list. Best regards, Wolfgang

1 0

[PATCH] Initscripts: Fixes and updates
by Matthias Fischer 25 Apr '17

25 Apr '17

Fixed: Program paths for function 'killproc' in initscripts for 'dhcp', dhcrelay', 'rngd' and 'snort'. Added: Reload-section for 'snort'-init. 'snortctrl.c' was updated accordingly. 'snort' now can be reloaded through SIGHUP after automatic ruleset-updates, to provide seamless traffic inspection during a configuration change. For details, see official Snort documentation (Chapter 2.9 / Page 174) at https://snort.org/documents/snort-users-manual Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> --- src/initscripts/system/dhcp | 2 +- src/initscripts/system/dhcrelay | 2 +- src/initscripts/system/rngd | 2 +- src/initscripts/system/snort | 127 ++++++++++++++++++++++++---------------- src/misc-progs/snortctrl.c | 6 +- 5 files changed, 84 insertions(+), 55 deletions(-) diff --git a/src/initscripts/system/dhcp b/src/initscripts/system/dhcp index 2ae86db31..0462772b7 100644 --- a/src/initscripts/system/dhcp +++ b/src/initscripts/system/dhcp @@ -51,7 +51,7 @@ case "$1" in flush_chains boot_mesg "Stopping DHCP Server..." - killproc -p /var/run/dhcpd.pid /usr/sbin/dhcpd + killproc -p /var/run/dhcpd.pid /usr/sbin if [ "$(ps -A | grep " dhcpd")" != "" ] ; then # if fail use the hard way ... boot_mesg "Killing DHCP Server..." diff --git a/src/initscripts/system/dhcrelay b/src/initscripts/system/dhcrelay index 327a08465..060b94c45 100644 --- a/src/initscripts/system/dhcrelay +++ b/src/initscripts/system/dhcrelay @@ -31,7 +31,7 @@ case "${1}" in stop) boot_mesg "Stopping DHCP Relay..." - killproc -p /var/run/dhcrelay.pid /usr/sbin/dhcrelay + killproc -p /var/run/dhcrelay.pid /usr/sbin ;; restart) diff --git a/src/initscripts/system/rngd b/src/initscripts/system/rngd index df4aa7da2..886b6a986 100644 --- a/src/initscripts/system/rngd +++ b/src/initscripts/system/rngd @@ -39,7 +39,7 @@ case "${1}" in stop) boot_mesg "Stopping Random Number Generator Daemon..." - killproc -p /var/run/rngd.pid /usr/sbin/rngd + killproc -p /var/run/rngd.pid /usr/sbin ;; restart) diff --git a/src/initscripts/system/snort b/src/initscripts/system/snort index 5c4304247..3037b662d 100644 --- a/src/initscripts/system/snort +++ b/src/initscripts/system/snort @@ -23,7 +23,7 @@ eval $(/usr/local/bin/readhash /var/ipfire/snort/settings) ALIASFILE="/var/ipfire/ethernet/aliases" case "$1" in - start) + start) if [ "$BLUE_NETADDRESS" ]; then BLUE_NET="$BLUE_NETADDRESS/$BLUE_NETMASK," BLUE_IP="$BLUE_ADDRESS," @@ -87,58 +87,85 @@ case "$1" in echo "ipvar DNS_SERVERS $DNS1" >> /etc/snort/vars fi - for DEVICE in $DEVICES; do - boot_mesg "Starting Intrusion Detection System on $DEVICE..." - /usr/sbin/snort -c /etc/snort/snort.conf -i $DEVICE -D -l /var/log/snort --create-pidfile --nolock-pidfile --pid-path /var/run - evaluate_retval + for DEVICE in $DEVICES; do + boot_mesg "Starting Intrusion Detection System on $DEVICE..." + /usr/sbin/snort -c /etc/snort/snort.conf -i $DEVICE -D -l /var/log/snort --create-pidfile --nolock-pidfile --pid-path /var/run + evaluate_retval sleep 1 - chmod 644 /var/run/snort_$DEVICE.pid - done + chmod 644 /var/run/snort_$DEVICE.pid + done ;; - stop) - DEVICES="" - if [ -r /var/run/snort_$BLUE_DEV.pid ]; then - DEVICES+="$BLUE_DEV " - fi - - if [ -r /var/run/snort_$GREEN_DEV.pid ]; then - DEVICES+="$GREEN_DEV " - fi - - if [ -r /var/run/snort_$ORANGE_DEV.pid ]; then - DEVICES+="$ORANGE_DEV " - fi - - RED=`cat /var/ipfire/red/iface 2>/dev/null` - if [ -r /var/run/snort_$RED.pid ]; then - DEVICES+=`cat /var/ipfire/red/iface 2>/dev/null` - fi - - for DEVICE in $DEVICES; do - boot_mesg "Stopping Intrusion Detection System on $DEVICE..." - killproc -p /var/run/snort_$DEVICE.pid /var/run - done - - rm /var/run/snort_* >/dev/null 2>/dev/null - - # Don't report returncode of rm if snort was not started - exit 0 - ;; - - status) - statusproc /usr/sbin/snort - ;; - - restart) - $0 stop - $0 start - ;; - - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; + stop) + DEVICES="" + if [ -r /var/run/snort_$BLUE_DEV.pid ]; then + DEVICES+="$BLUE_DEV " + fi + if [ -r /var/run/snort_$GREEN_DEV.pid ]; then + DEVICES+="$GREEN_DEV " + fi + + if [ -r /var/run/snort_$ORANGE_DEV.pid ]; then + DEVICES+="$ORANGE_DEV " + fi + + RED=`cat /var/ipfire/red/iface 2>/dev/null` + if [ -r /var/run/snort_$RED.pid ]; then + DEVICES+=`cat /var/ipfire/red/iface 2>/dev/null` + fi + + for DEVICE in $DEVICES; do + boot_mesg "Stopping Intrusion Detection System on $DEVICE..." + killproc -p /var/run/snort_$DEVICE.pid /usr/sbin + done + + rm /var/run/snort_* >/dev/null 2>/dev/null + + # Don't report returncode of rm if snort was not started + exit 0 + ;; + + # Reloading snort through SIGHUP can be used after updating rulesets, + # to provide seamless traffic inspection during a configuration change. + reload) + DEVICES="" + if [ -r /var/run/snort_$BLUE_DEV.pid ]; then + DEVICES+="$BLUE_DEV " + fi + + if [ -r /var/run/snort_$GREEN_DEV.pid ]; then + DEVICES+="$GREEN_DEV " + fi + + if [ -r /var/run/snort_$ORANGE_DEV.pid ]; then + DEVICES+="$ORANGE_DEV " + fi + + RED=`cat /var/ipfire/red/iface 2>/dev/null` + if [ -r /var/run/snort_$RED.pid ]; then + DEVICES+=`cat /var/ipfire/red/iface 2>/dev/null` + fi + + for DEVICE in $DEVICES; do + boot_mesg "Reloading Intrusion Detection System on $DEVICE..." + /bin/kill -SIGHUP `cat /var/run/snort_$DEVICE.pid` + evaluate_retval + done + ;; + + restart) + $0 stop + $0 start + ;; + + status) + statusproc /usr/sbin/snort + ;; + + *) + echo "Usage: $0 {start|stop|reload|restart|status}" + exit 1 + ;; esac chmod 644 /var/log/snort/* 2>/dev/null diff --git a/src/misc-progs/snortctrl.c b/src/misc-progs/snortctrl.c index 57025757c..138271dbb 100644 --- a/src/misc-progs/snortctrl.c +++ b/src/misc-progs/snortctrl.c @@ -19,7 +19,7 @@ int main(int argc, char *argv[]) { exit(1); if (argc < 2) { - fprintf(stderr, "\nNo argument given.\n\nsnortctrl (start|stop|restart)\n\n"); + fprintf(stderr, "\nNo argument given.\n\nsnortctrl (start|stop|reload|restart)\n\n"); exit(1); } @@ -27,10 +27,12 @@ int main(int argc, char *argv[]) { safe_system("/etc/rc.d/init.d/snort start"); } else if (strcmp(argv[1], "stop") == 0) { safe_system("/etc/rc.d/init.d/snort stop"); + } else if (strcmp(argv[1], "reload") == 0) { + safe_system("/etc/rc.d/init.d/snort reload"); } else if (strcmp(argv[1], "restart") == 0) { safe_system("/etc/rc.d/init.d/snort restart"); } else { - fprintf(stderr, "\nBad argument given.\n\nsnortctrl (start|stop|restart)\n\n"); + fprintf(stderr, "\nBad argument given.\n\nsnortctrl (start|stop|reload|restart)\n\n"); exit(1); } -- 2.11.0

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

Development April 2017