IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7877 discussions

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. fffc646e743adb4aebdf75972bb2c9fb12e0675e
by git＠ipfire.org 24 Jul '14

24 Jul '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via fffc646e743adb4aebdf75972bb2c9fb12e0675e (commit) from 7535861c50af78230d509e0440e00abacf3057cb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fffc646e743adb4aebdf75972bb2c9fb12e0675e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 24 13:32:05 2014 +0200 logs: Add dynamic DNS logging section. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/80/filelists/files | 1 + html/cgi-bin/logs.cgi/log.dat | 2 ++ lfs/ddns | 2 ++ ...3-Add-a-program-prefix-to-syslog-messages.patch | 25 ++++++++++++++++++++++ 4 files changed, 30 insertions(+) create mode 100644 src/patches/ddns-003-Add-a-program-prefix-to-syslog-messages.patch Difference in files: diff --git a/config/rootfiles/core/80/filelists/files b/config/rootfiles/core/80/filelists/files index 822baa2..d5973f7 100644 --- a/config/rootfiles/core/80/filelists/files +++ b/config/rootfiles/core/80/filelists/files @@ -7,6 +7,7 @@ etc/rc.d/init.d/dnsmasq etc/rc.d/init.d/networking/red.up/30-ddns srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/netexternal.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/proxy.cgi diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index dacd518..1813862 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -51,6 +51,7 @@ $cgiparams{'SECTION'} = 'ipfire'; my %sections = ( 'ipfire' => '(ipfire: )', 'red' => '(red:|pppd\[.*\]: |chat\[.*\]|pppoe\[.*\]|pptp\[.*\]|pppoa\[.*\]|pppoa3\[.*\]|pppoeci\[.*\]|ipppd|ipppd\[.*\]|kernel: ippp\d|kernel: isdn.*|ibod\[.*\]|dhcpcd\[.*\]|modem_run\[.*\])', + 'ddns' => '(ddns\[\d+\]:)', 'dns' => '(dnsmasq\[.*\]: )', 'dhcp' => '(dhcpd: )', 'clamav' => '(clamd\[.*\]: |freshclam\[.*\]: )', @@ -70,6 +71,7 @@ my %sections = ( my %trsections = ( 'ipfire' => 'IPFire', 'red' => 'RED', + 'ddns' => $Lang::tr{'dynamic dns'}, 'dns' => 'DNS', 'dhcp' => "$Lang::tr{'dhcp server'}", 'cron' => 'Cron', diff --git a/lfs/ddns b/lfs/ddns index c8348ce..975c8c3 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -71,6 +71,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ddns-003-Add-a-program-prefix-to-syslog-messages.patch + cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire cd $(DIR_APP) && make $(MAKETUNING) diff --git a/src/patches/ddns-003-Add-a-program-prefix-to-syslog-messages.patch b/src/patches/ddns-003-Add-a-program-prefix-to-syslog-messages.patch new file mode 100644 index 0000000..978db85 --- /dev/null +++ b/src/patches/ddns-003-Add-a-program-prefix-to-syslog-messages.patch @@ -0,0 +1,25 @@ +From 21fd4b8d26d01d622185ab8de971a9ee934220a3 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Thu, 24 Jul 2014 13:23:36 +0200 +Subject: [PATCH] Add a program prefix to syslog messages. + +--- + src/ddns/__init__.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/ddns/__init__.py b/src/ddns/__init__.py +index 22764e6..6fe3a33 100644 +--- a/src/ddns/__init__.py ++++ b/src/ddns/__init__.py +@@ -42,6 +42,8 @@ def setup_logging(): + handler = logging.handlers.SysLogHandler(address="/dev/log", + facility=logging.handlers.SysLogHandler.LOG_DAEMON + ) ++ formatter = logging.Formatter("ddns[%(process)d]: %(message)s") ++ handler.setFormatter(formatter) + handler.setLevel(logging.INFO) + rootlogger.addHandler(handler) + +-- +1.9.3 + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c5000130ec32c7fb07b54f41ca1d8af9a0b3209d
by git＠ipfire.org 23 Jul '14

23 Jul '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via c5000130ec32c7fb07b54f41ca1d8af9a0b3209d (commit) via ce12ce8cd7ebb3e190b84b9fc79c3d626f0c83d6 (commit) from 9d9c825b4e2a58bbd9c7636d7eeb37a52f21d9c6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c5000130ec32c7fb07b54f41ca1d8af9a0b3209d Merge: 9d9c825 ce12ce8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jul 23 20:57:22 2014 +0200 Merge branch 'check_mk' of https://github.com/morlix/ipfire-2.x into next commit ce12ce8cd7ebb3e190b84b9fc79c3d626f0c83d6 Author: Timo Eissler <timo(a)eissler.pro> Date: Wed Jul 23 20:20:53 2014 +0200 check_mk: add backup config file ----------------------------------------------------------------------- Summary of changes: config/backup/includes/check_mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 config/backup/includes/check_mk Difference in files: diff --git a/config/backup/includes/check_mk b/config/backup/includes/check_mk new file mode 100644 index 0000000..ca71046 --- /dev/null +++ b/config/backup/includes/check_mk @@ -0,0 +1 @@ +/etc/check_mk/ hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9d9c825b4e2a58bbd9c7636d7eeb37a52f21d9c6
by git＠ipfire.org 19 Jul '14

19 Jul '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 9d9c825b4e2a58bbd9c7636d7eeb37a52f21d9c6 (commit) via fed3de5b75bae6cfbda910d0084c2d27556efa2b (commit) via e6461027b010b3a3fc80f89dc6266ba2001ada2e (commit) via 13eef3ba74c47e8beabd87c006b597c6c46e9e46 (commit) via 89066697c4c257896feaf017ecc72814d01f3682 (commit) via 94abd48b1c666f7ec1009515ffb651f522f9f89b (commit) via b8cee3bb81787328e3bb2c6d9edb31ac0015a717 (commit) via da3dbb2a428127f345c4881a757cce8f60df767f (commit) via 0f860889ab02872ede525a78de9e22d29b54277d (commit) via 5b71042c5426855ee58a56d16d11a4cc5d0f5253 (commit) via e055b1105a1251dc3862b599e86a691c20141728 (commit) via 261624fb991083f07246e2d3d7a24b2d1ff18c35 (commit) via 3a99677dd6d6251dbe1cc8b70f7e55957230ac29 (commit) via ed94927d20eecaa83df3f71df5a0d937647965ef (commit) via e3c3a6ba5bae10987336ce8170f1d0359c6e8efb (commit) via d88845890c02924a3a7cd108451e763e52790749 (commit) via a945fa225d9d128f889021c99f35a96809e33d27 (commit) via b21618696d28c672ddd11f8943bf27d38d5996dc (commit) via 903c6825aa0f1753b0d49786aba6fc3e7f195292 (commit) via dfabfbedcaedab44714bfc9cbd7d464482c1e5ad (commit) via 9c6be5543e82bd2f0a87d6c40e23b7b18f712806 (commit) via 960e969ca105d3c9089658f3323121156c11da90 (commit) via 4fb763ff6e70f9a1820fd5ef4479640403013209 (commit) via a78470dc17d2f3bfb563ff58ebec1299f5a408cb (commit) via ff5e4ef87194735870012f73ff998a7b4d8da4a9 (commit) via 5b942f7f3b3fd5277ca990c22530ea5f0aa33876 (commit) via e351c1e0905deea4fc65646952b7c621ebdb1c14 (commit) via e611222f41922419819e9cbe3e2f1e66d5000543 (commit) via 44dcf6349809c2e5c77d4cb4cdfe465620dce737 (commit) via c8b51e28bff7d3a5196a22e52de9e245d249807b (commit) via c7220d6e5a39c76c010b44a40408b6408987c9cb (commit) via 6ace85e360be46de39c6e14e1858d76bd9454f82 (commit) via 66298ef2deb05ab9b0227027d60f1edc44f839b9 (commit) from d7636b6fa3462eb3437fd2d18e88916962a04056 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9d9c825b4e2a58bbd9c7636d7eeb37a52f21d9c6 Merge: fed3de5 66298ef Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jul 19 11:34:50 2014 +0200 Merge branch 'cr_fix' of https://github.com/hadfl/ipfire-2.x into next commit fed3de5b75bae6cfbda910d0084c2d27556efa2b Merge: e646102 6ace85e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jul 19 11:34:10 2014 +0200 Merge branch 'subnets_as_grps' of https://github.com/hadfl/ipfire-2.x into next commit e6461027b010b3a3fc80f89dc6266ba2001ada2e Merge: 13eef3b c7220d6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jul 19 11:32:18 2014 +0200 Merge branch 'ovpn_colour' of https://github.com/hadfl/ipfire-2.x into next commit c7220d6e5a39c76c010b44a40408b6408987c9cb Author: Dominik Hassler <hadfl.oss(a)gmail.com> Date: Wed Jul 9 23:53:37 2014 +0200 - connections.cgi: static ip address pools colour commit 6ace85e360be46de39c6e14e1858d76bd9454f82 Author: Dominik Hassler <hadfl.oss(a)gmail.com> Date: Wed Jul 9 23:51:01 2014 +0200 - bugfix: allow subnets of green/blue/orange/red as network group commit 66298ef2deb05ab9b0227027d60f1edc44f839b9 Author: Dominik Hassler <hadfl.oss(a)gmail.com> Date: Wed Jul 9 23:32:58 2014 +0200 - remove cr for n2n server and client config ----------------------------------------------------------------------- Summary of changes: config/cfgroot/header.pl | 3 + config/rootfiles/common/{ => armv5tel}/gmp | 0 config/rootfiles/common/{ => i586}/gmp | 4 + config/rootfiles/common/stage2 | 1 + config/rootfiles/core/80/filelists/ddns | 1 + config/rootfiles/core/80/filelists/files | 6 ++ config/rootfiles/core/80/filelists/i586/gmp | 1 + config/rootfiles/core/80/update.sh | 18 +++- config/rootfiles/packages/asterisk | 2 +- config/rootfiles/packages/clamav | 2 +- config/rootfiles/packages/cups | 4 +- config/rootfiles/packages/dbus | 2 +- config/rootfiles/packages/mysql | 2 +- config/rootfiles/packages/vdradmin | 2 +- doc/language_issues.es | 5 + doc/language_issues.fr | 5 + doc/language_issues.nl | 5 + doc/language_issues.pl | 5 + doc/language_issues.ru | 5 + doc/language_issues.tr | 5 + doc/language_missings | 20 ++++ html/cgi-bin/connections.cgi | 17 ++++ html/cgi-bin/ddns.cgi | 24 ++--- html/cgi-bin/fwhosts.cgi | 8 +- html/cgi-bin/netexternal.cgi | 111 ++++++++++++++++++++++- html/cgi-bin/ovpnmain.cgi | 56 ++++++++---- langs/de/cgi-bin/de.pl | 5 + langs/en/cgi-bin/en.pl | 5 + lfs/check_mk_agent | 8 +- lfs/ddns | 4 +- lfs/gmp | 34 ++++++- lfs/gmp-compat | 3 +- lfs/stage2 | 2 +- src/initscripts/init.d/cleanfs | 7 ++ src/initscripts/init.d/networking/red.up/30-ddns | 2 +- tools/checkwronginitlinks | 7 ++ tools/make-functions | 2 +- 37 files changed, 331 insertions(+), 62 deletions(-) copy config/rootfiles/common/{ => armv5tel}/gmp (100%) rename config/rootfiles/common/{ => i586}/gmp (80%) create mode 120000 config/rootfiles/core/80/filelists/ddns create mode 120000 config/rootfiles/core/80/filelists/i586/gmp Difference in files: diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index d90086d..acccfc8 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -142,6 +142,8 @@ sub genmenu { my %sublogshash = (); my $sublogs = \%sublogshash; + if ( -e "/var/ipfire/main/gpl_accepted") { + eval `/bin/cat /var/ipfire/menu.d/*.menu`; eval `/bin/cat /var/ipfire/menu.d/*.main`; @@ -159,6 +161,7 @@ sub genmenu { if ( $ethsettings{'RED_TYPE'} eq "PPPOE" && $pppsettings{'MONPORT'} ne "" ) { $menu->{'02.status'}{'subMenu'}->{'74.modem-status'}{'enabled'} = 1; } + } } sub showhttpheaders diff --git a/config/rootfiles/common/armv5tel/gmp b/config/rootfiles/common/armv5tel/gmp new file mode 100644 index 0000000..67f557f --- /dev/null +++ b/config/rootfiles/common/armv5tel/gmp @@ -0,0 +1,21 @@ +#usr/include/gmp.h +#usr/include/gmpxx.h +#usr/include/mp.h +#usr/lib/libgmp.a +#usr/lib/libgmp.la +#usr/lib/libgmp.so +usr/lib/libgmp.so.10 +usr/lib/libgmp.so.10.0.5 +#usr/lib/libgmpxx.a +#usr/lib/libgmpxx.la +#usr/lib/libgmpxx.so +usr/lib/libgmpxx.so.4 +usr/lib/libgmpxx.so.4.2.5 +#usr/lib/libmp.a +#usr/lib/libmp.la +#usr/lib/libmp.so +usr/lib/libmp.so.3 +usr/lib/libmp.so.3.1.25 +#usr/share/info/gmp.info +#usr/share/info/gmp.info-1 +#usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/gmp b/config/rootfiles/common/gmp deleted file mode 100644 index 67f557f..0000000 --- a/config/rootfiles/common/gmp +++ /dev/null @@ -1,21 +0,0 @@ -#usr/include/gmp.h -#usr/include/gmpxx.h -#usr/include/mp.h -#usr/lib/libgmp.a -#usr/lib/libgmp.la -#usr/lib/libgmp.so -usr/lib/libgmp.so.10 -usr/lib/libgmp.so.10.0.5 -#usr/lib/libgmpxx.a -#usr/lib/libgmpxx.la -#usr/lib/libgmpxx.so -usr/lib/libgmpxx.so.4 -usr/lib/libgmpxx.so.4.2.5 -#usr/lib/libmp.a -#usr/lib/libmp.la -#usr/lib/libmp.so -usr/lib/libmp.so.3 -usr/lib/libmp.so.3.1.25 -#usr/share/info/gmp.info -#usr/share/info/gmp.info-1 -#usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/i586/gmp b/config/rootfiles/common/i586/gmp new file mode 100644 index 0000000..db6a000 --- /dev/null +++ b/config/rootfiles/common/i586/gmp @@ -0,0 +1,25 @@ +#usr/include/gmp.h +#usr/include/gmpxx.h +#usr/include/mp.h +#usr/lib/libgmp.a +#usr/lib/libgmp.la +#usr/lib/libgmp.so +usr/lib/libgmp.so.10 +usr/lib/libgmp.so.10.0.5 +#usr/lib/libgmpxx.a +#usr/lib/libgmpxx.la +#usr/lib/libgmpxx.so +usr/lib/libgmpxx.so.4 +usr/lib/libgmpxx.so.4.2.5 +#usr/lib/libmp.a +#usr/lib/libmp.la +#usr/lib/libmp.so +usr/lib/libmp.so.3 +usr/lib/libmp.so.3.1.25 +usr/lib/sse2/libgmp.so.10 +usr/lib/sse2/libgmp.so.10.0.5 +usr/lib/sse2/libmp.so.3 +usr/lib/sse2/libmp.so.3.1.25 +#usr/share/info/gmp.info +#usr/share/info/gmp.info-1 +#usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 085092d..39bf555 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -74,6 +74,7 @@ usr/lib/libgcc_s.so.1 #usr/lib/libstdc++.la #usr/lib/libstdc++.so usr/lib/libstdc++.so.6 +#usr/lib/sse2 #usr/local #usr/local/bin #usr/local/bin/archive.files diff --git a/config/rootfiles/core/80/filelists/ddns b/config/rootfiles/core/80/filelists/ddns new file mode 120000 index 0000000..7395164 --- /dev/null +++ b/config/rootfiles/core/80/filelists/ddns @@ -0,0 +1 @@ +../../../common/ddns \ No newline at end of file diff --git a/config/rootfiles/core/80/filelists/files b/config/rootfiles/core/80/filelists/files index e59252b..822baa2 100644 --- a/config/rootfiles/core/80/filelists/files +++ b/config/rootfiles/core/80/filelists/files @@ -1,11 +1,17 @@ etc/system-release etc/issue etc/logrotate.conf +etc/rc.d/init.d/cleanfs etc/rc.d/init.d/dhcrelay etc/rc.d/init.d/dnsmasq +etc/rc.d/init.d/networking/red.up/30-ddns +srv/web/ipfire/cgi-bin/ddns.cgi srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat +srv/web/ipfire/cgi-bin/netexternal.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/routing.cgi usr/sbin/dhcrelay var/ipfire/general-functions.pl +var/ipfire/header.pl var/ipfire/langs diff --git a/config/rootfiles/core/80/filelists/i586/gmp b/config/rootfiles/core/80/filelists/i586/gmp new file mode 120000 index 0000000..52a09cd --- /dev/null +++ b/config/rootfiles/core/80/filelists/i586/gmp @@ -0,0 +1 @@ +../../../../common/i586/gmp \ No newline at end of file diff --git a/config/rootfiles/core/80/update.sh b/config/rootfiles/core/80/update.sh index 27e5bde..b8b5b58 100644 --- a/config/rootfiles/core/80/update.sh +++ b/config/rootfiles/core/80/update.sh @@ -40,6 +40,8 @@ rm -f \ /usr/lib/ipsec/plugins/libstrongswan-unity.so \ /usr/share/strongswan/templates/config/plugins/unity.conf +rm -f /usr/local/bin/setddns.pl + # Extract files extract_files @@ -59,13 +61,19 @@ rm -f \ /opt/pakfire/db/rootfiles/libgpg-error # Regenerate squid configuration file -/srv/web/ipfire/cgi-bin/proxy.cgi +sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi -# Generate ddns configuration file -/srv/web/ipfire/cgi-bin/ddns.cgi +# Fix broken proxy configuration permissions +chown -R nobody.nobody \ + /var/ipfire/proxy/advanced \ + /var/ipfire/proxy/acl-1.4 \ + /var/ipfire/proxy/enable \ + /var/ipfire/proxy/settings \ + /var/ipfire/proxy/squid.conf \ + /var/ipfire/proxy/transparent -touch /var/ipfire/ddns/ddns.conf -chown nobody.nobody /var/ipfire/ddns/ddns.conf +# Generate ddns configuration file +sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi # Update crontab sed -i /var/spool/cron/root.orig -e "/setddns.pl/d" diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk index f7b6cde..1b0eb9d 100644 --- a/config/rootfiles/packages/asterisk +++ b/config/rootfiles/packages/asterisk @@ -2706,7 +2706,7 @@ var/lib/asterisk/static-http/prototype.js var/log/asterisk/cdr-csv var/log/asterisk/cdr-custom var/log/asterisk/cel-custom -var/run/asterisk +#var/run/asterisk #var/spool/asterisk var/spool/asterisk/dictate var/spool/asterisk/meetme diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index c2aee7c..f3afd6b 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -41,6 +41,6 @@ var/ipfire/clamav/clamd.conf var/ipfire/clamav/clamd.conf.sample var/ipfire/clamav/freshclam.conf var/ipfire/clamav/freshclam.conf.sample -var/run/clamav +#var/run/clamav etc/rc.d/init.d/clamav usr/local/bin/clamavctrl diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups index 3acbcac..56ee1f2 100644 --- a/config/rootfiles/packages/cups +++ b/config/rootfiles/packages/cups @@ -936,7 +936,7 @@ var/ipfire/cups/ppd var/ipfire/cups/snmp.conf var/ipfire/cups/ssl var/log/cups -var/run/cups -var/run/cups/certs +#var/run/cups +#var/run/cups/certs var/spool/cups var/spool/cups/tmp diff --git a/config/rootfiles/packages/dbus b/config/rootfiles/packages/dbus index 2d31a13..b252653 100644 --- a/config/rootfiles/packages/dbus +++ b/config/rootfiles/packages/dbus @@ -50,4 +50,4 @@ usr/share/dbus-1/services #usr/share/man/man1/dbus-send.1 #usr/share/man/man1/dbus-uuidgen.1 var/lib/dbus -var/run/dbus +#var/run/dbus diff --git a/config/rootfiles/packages/mysql b/config/rootfiles/packages/mysql index 0beaca8..8f1414a 100644 --- a/config/rootfiles/packages/mysql +++ b/config/rootfiles/packages/mysql @@ -300,4 +300,4 @@ usr/share/mysql #usr/share/mysql/ukrainian #usr/share/mysql/ukrainian/errmsg.sys var/ipfire/backup/addons/includes/mysql -var/run/mysql +#var/run/mysql diff --git a/config/rootfiles/packages/vdradmin b/config/rootfiles/packages/vdradmin index 20ea7d5..3dba2a0 100644 --- a/config/rootfiles/packages/vdradmin +++ b/config/rootfiles/packages/vdradmin @@ -182,4 +182,4 @@ etc/rc.d/rc3.d/S99vdradmin #usr/share/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo var/cache/vdradmin var/log/vdradmin -var/run/vdradmin +#var/run/vdradmin diff --git a/doc/language_issues.es b/doc/language_issues.es index 11e11d1..1176883 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -663,6 +663,10 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: dnssec aware +WARNING: untranslated string: dnssec information +WARNING: untranslated string: dnssec not supported +WARNING: untranslated string: dnssec validating WARNING: untranslated string: downlink WARNING: untranslated string: download tls-auth key WARNING: untranslated string: dpd delay @@ -874,6 +878,7 @@ WARNING: untranslated string: modem sim information WARNING: untranslated string: modem status WARNING: untranslated string: monitor interface WARNING: untranslated string: most preferred +WARNING: untranslated string: nameserver WARNING: untranslated string: no hardware random number generator WARNING: untranslated string: not a valid dh key WARNING: untranslated string: notice diff --git a/doc/language_issues.fr b/doc/language_issues.fr index e93eeb0..beca008 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -674,6 +674,10 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: dnssec aware +WARNING: untranslated string: dnssec information +WARNING: untranslated string: dnssec not supported +WARNING: untranslated string: dnssec validating WARNING: untranslated string: downlink WARNING: untranslated string: download tls-auth key WARNING: untranslated string: dpd delay @@ -885,6 +889,7 @@ WARNING: untranslated string: modem sim information WARNING: untranslated string: modem status WARNING: untranslated string: monitor interface WARNING: untranslated string: most preferred +WARNING: untranslated string: nameserver WARNING: untranslated string: no hardware random number generator WARNING: untranslated string: not a valid dh key WARNING: untranslated string: notice diff --git a/doc/language_issues.nl b/doc/language_issues.nl index ce44d14..6162636 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -671,6 +671,10 @@ WARNING: untranslated string: dh key warn WARNING: untranslated string: dh key warn1 WARNING: untranslated string: dh parameter WARNING: untranslated string: dns servers +WARNING: untranslated string: dnssec aware +WARNING: untranslated string: dnssec information +WARNING: untranslated string: dnssec not supported +WARNING: untranslated string: dnssec validating WARNING: untranslated string: download tls-auth key WARNING: untranslated string: drop outgoing WARNING: untranslated string: firewall logs country @@ -693,6 +697,7 @@ WARNING: untranslated string: modem no connection message WARNING: untranslated string: modem sim information WARNING: untranslated string: modem status WARNING: untranslated string: monitor interface +WARNING: untranslated string: nameserver WARNING: untranslated string: not a valid dh key WARNING: untranslated string: ovpn crypt options WARNING: untranslated string: ovpn dh diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 11e11d1..1176883 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -663,6 +663,10 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: dnssec aware +WARNING: untranslated string: dnssec information +WARNING: untranslated string: dnssec not supported +WARNING: untranslated string: dnssec validating WARNING: untranslated string: downlink WARNING: untranslated string: download tls-auth key WARNING: untranslated string: dpd delay @@ -874,6 +878,7 @@ WARNING: untranslated string: modem sim information WARNING: untranslated string: modem status WARNING: untranslated string: monitor interface WARNING: untranslated string: most preferred +WARNING: untranslated string: nameserver WARNING: untranslated string: no hardware random number generator WARNING: untranslated string: not a valid dh key WARNING: untranslated string: notice diff --git a/doc/language_issues.ru b/doc/language_issues.ru index 1cea7f3..547e1d4 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -668,6 +668,10 @@ WARNING: untranslated string: dnsforward edit an entry WARNING: untranslated string: dnsforward entries WARNING: untranslated string: dnsforward forward_server WARNING: untranslated string: dnsforward zone +WARNING: untranslated string: dnssec aware +WARNING: untranslated string: dnssec information +WARNING: untranslated string: dnssec not supported +WARNING: untranslated string: dnssec validating WARNING: untranslated string: downlink WARNING: untranslated string: download tls-auth key WARNING: untranslated string: dpd delay @@ -870,6 +874,7 @@ WARNING: untranslated string: modem sim information WARNING: untranslated string: modem status WARNING: untranslated string: monitor interface WARNING: untranslated string: most preferred +WARNING: untranslated string: nameserver WARNING: untranslated string: no hardware random number generator WARNING: untranslated string: not a valid dh key WARNING: untranslated string: notice diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 2843d53..cc40178 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -672,6 +672,10 @@ WARNING: untranslated string: dh key move failed WARNING: untranslated string: dh key warn WARNING: untranslated string: dh key warn1 WARNING: untranslated string: dh parameter +WARNING: untranslated string: dnssec aware +WARNING: untranslated string: dnssec information +WARNING: untranslated string: dnssec not supported +WARNING: untranslated string: dnssec validating WARNING: untranslated string: download tls-auth key WARNING: untranslated string: firewall logs country WARNING: untranslated string: fwhost err hostip @@ -693,6 +697,7 @@ WARNING: untranslated string: modem no connection message WARNING: untranslated string: modem sim information WARNING: untranslated string: modem status WARNING: untranslated string: monitor interface +WARNING: untranslated string: nameserver WARNING: untranslated string: not a valid dh key WARNING: untranslated string: ovpn crypt options WARNING: untranslated string: ovpn dh diff --git a/doc/language_missings b/doc/language_missings index 69cd218..4699f12 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -94,6 +94,10 @@ < dnsforward entries < dnsforward forward_server < dnsforward zone +< dnssec aware +< dnssec information +< dnssec not supported +< dnssec validating < dns servers < downlink < download dh parameter @@ -351,6 +355,7 @@ < monitor interface < most preferred < MTU settings +< nameserver < never < no hardware random number generator < not a valid dh key @@ -620,6 +625,10 @@ < dnsforward entries < dnsforward forward_server < dnsforward zone +< dnssec aware +< dnssec information +< dnssec not supported +< dnssec validating < dns servers < downlink < download dh parameter @@ -877,6 +886,7 @@ < monitor interface < most preferred < MTU settings +< nameserver < never < no hardware random number generator < not a valid dh key @@ -1138,6 +1148,10 @@ < dnsforward entries < dnsforward forward_server < dnsforward zone +< dnssec aware +< dnssec information +< dnssec not supported +< dnssec validating < dns servers < downlink < download dh parameter @@ -1387,6 +1401,7 @@ < monitor interface < most preferred < MTU settings +< nameserver < never < no hardware random number generator < not a valid dh key @@ -1635,6 +1650,10 @@ < dnsforward entries < dnsforward forward_server < dnsforward zone +< dnssec aware +< dnssec information +< dnssec not supported +< dnssec validating < dns servers < downlink < download dh parameter @@ -1889,6 +1908,7 @@ < month-graph < most preferred < MTU settings +< nameserver < never < no hardware random number generator < not a valid dh key diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi index c7220f6..f1ed212 100644 --- a/html/cgi-bin/connections.cgi +++ b/html/cgi-bin/connections.cgi @@ -238,6 +238,23 @@ if (-e "${General::swroot}/ovpn/settings") { } } +# Add OpenVPN net for custom OVPNs +if (-e "${General::swroot}/ovpn/ccd.conf") { + open(OVPNSUB, "${General::swroot}/ovpn/ccd.conf"); + my @ovpnsub = <OVPNSUB>; + close(OVPNSUB); + + foreach (@ovpnsub) { + my ($network, $mask) = split '/', (split ',', $_)[2]; + + $mask = ipv4_cidr2msk($mask) unless &General::validip($mask); + + push(@network, $network); + push(@masklen, $mask); + push(@colour, ${Header::colourovpn}); + } +} + open(IPSEC, "${General::swroot}/vpn/config"); my @ipsec = <IPSEC>; close(IPSEC); diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi index 738e6ec..7be9a50 100644 --- a/html/cgi-bin/ddns.cgi +++ b/html/cgi-bin/ddns.cgi @@ -29,12 +29,6 @@ require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; -# Hook to regenerate the configuration files, if cgi got called from command line. -if ($ENV{"REMOTE_ADDR"} eq "") { - &GenerateDDNSConfigFile(); - exit(0); -} - #workaround to suppress a warning when a variable is used only once my @dummy = ( ${Header::table2colour}, ${Header::colouryellow} ); undef (@dummy); @@ -53,7 +47,7 @@ my $datafile = "${General::swroot}/ddns/config"; # Dynamic ddns programm call. my @ddnsprog = ("/usr/bin/ddns", "--config", "/var/ipfire/ddns/ddns.conf", - "update-all", "--force" ); + "update-all"); my %settings=(); my $errormessage = ''; @@ -72,6 +66,15 @@ $settings{'SERVICE'} = ''; $settings{'ACTION'} = ''; +# Get supported ddns providers. +my @providers = &GetProviders(); + +# Hook to regenerate the configuration files, if cgi got called from command line. +if ($ENV{"REMOTE_ADDR"} eq "") { + &GenerateDDNSConfigFile(); + exit(0); +} + &Header::showhttpheaders(); #Get GUI values @@ -82,9 +85,6 @@ open(FILE, "$datafile") or die "Unable to open $datafile."; my @current = <FILE>; close (FILE); -# Get supported ddns providers. -my @providers = &GetProviders(); - # # Save General Settings. # @@ -647,7 +647,7 @@ sub GenerateDDNSConfigFile { my $use_token = 0; # Handle token based auth for various providers. - if ($provider ~~ ["dns.lightningwirelabs.com", "regfish.com"] && $username eq "token") { + if ($provider ~~ ["dns.lightningwirelabs.com", "entrydns.net", "regfish.com"] && $username eq "token") { $use_token = 1; # Handle token auth for freedns.afraid.org. @@ -680,7 +680,7 @@ sub GenerateDDNSConfigFile { } # These providers need to be set to only use IPv4. - if ($provider ~~ ["freedns.afraid.org", "nsupdate.info", "variomedia.de", "zoneedit.com"]) { + if ($provider ~~ ["freedns.afraid.org", "nsupdate.info", "opendns.com", "variomedia.de", "zoneedit.com"]) { print FILE "proto = ipv4\n"; } diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index eeb83ac..1f96336 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -292,25 +292,25 @@ if ($fwhostsettings{'ACTION'} eq 'savenet' ) } if($fwhostsettings{'error'} ne 'on'){ #check if we use one of ipfire's networks (green,orange,blue) - if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($fwhostsettings{'IP'},$ownnet{'GREEN_NETADDRESS'},$ownnet{'GREEN_NETMASK'})) + if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && ($fwhostsettings{'IP'} eq $ownnet{'GREEN_NETADDRESS'} && $fwhostsettings{'SUBNET'} eq $ownnet{'GREEN_NETMASK'})) { $errormessage=$errormessage.$Lang::tr{'ccd err green'}."<br>"; $fwhostsettings{'HOSTNAME'} = $fwhostsettings{'orgname'}; if ($fwhostsettings{'update'} eq 'on'){$fwhostsettings{'ACTION'}='editnet';} } - if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($fwhostsettings{'IP'},$ownnet{'ORANGE_NETADDRESS'},$ownnet{'ORANGE_NETMASK'})) + if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && ($fwhostsettings{'IP'} eq $ownnet{'ORANGE_NETADDRESS'} && $fwhostsettings{'SUBNET'} eq $ownnet{'ORANGE_NETMASK'})) { $errormessage=$errormessage.$Lang::tr{'ccd err orange'}."<br>"; $fwhostsettings{'HOSTNAME'} = $fwhostsettings{'orgname'}; if ($fwhostsettings{'update'} eq 'on'){$fwhostsettings{'ACTION'}='editnet';} } - if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($fwhostsettings{'IP'},$ownnet{'BLUE_NETADDRESS'},$ownnet{'BLUE_NETMASK'})) + if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && ($fwhostsettings{'IP'} eq $ownnet{'BLUE_NETADDRESS'} && $fwhostsettings{'SUBNET'} eq $ownnet{'BLUE_NETMASK'})) { $errormessage=$errormessage.$Lang::tr{'ccd err blue'}."<br>"; $fwhostsettings{'HOSTNAME'} = $fwhostsettings{'orgname'}; if ($fwhostsettings{'update'} eq 'on'){$fwhostsettings{'ACTION'}='editnet';} } - if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &General::IpInSubnet($fwhostsettings{'IP'},$ownnet{'RED_NETADDRESS'},$ownnet{'RED_NETMASK'})) + if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && ($fwhostsettings{'IP'} eq $ownnet{'RED_NETADDRESS'} && $fwhostsettings{'SUBNET'} eq $ownnet{'RED_NETMASK'})) { $errormessage=$errormessage.$Lang::tr{'ccd err red'}."<br>"; $fwhostsettings{'HOSTNAME'} = $fwhostsettings{'orgname'}; diff --git a/html/cgi-bin/netexternal.cgi b/html/cgi-bin/netexternal.cgi index 156ef24..299612d 100644 --- a/html/cgi-bin/netexternal.cgi +++ b/html/cgi-bin/netexternal.cgi @@ -76,6 +76,86 @@ if ( $querry[0] ne~ ""){ &Header::closebox(); } + ## DNSSEC + my @nameservers = (); + foreach my $f ("${General::swroot}/red/dns1", "${General::swroot}/red/dns2") { + open(DNS, "<$f"); + my $nameserver = <DNS>; + close(DNS); + + chomp($nameserver); + if ($nameserver) { + push(@nameservers, $nameserver); + } + } + + &Header::openbox('100%', 'center', $Lang::tr{'dnssec information'}); + + print <<END; + <table class="tbl" width='66%'> + <thead> + <tr> + <th align="center"> + <strong>$Lang::tr{'nameserver'}</strong> + </th> + <th align="center"> + <strong>$Lang::tr{'status'}</strong> + </th> + </tr> + </thead> + <tbody> +END + + my $id = 0; + for my $nameserver (@nameservers) { + my $status = &check_dnssec($nameserver, "ping.ipfire.org"); + + my $colour = ""; + my $bgcolour = ""; + my $message = ""; + + # DNSSEC Not supported + if ($status == 0) { + $message = $Lang::tr{'dnssec not supported'}; + $colour = "white"; + $bgcolour = ${Header::colourred}; + + # DNSSEC Aware + } elsif ($status == 1) { + $message = $Lang::tr{'dnssec aware'}; + $colour = "black"; + $bgcolour = ${Header::colouryellow}; + + # DNSSEC Validating + } elsif ($status == 2) { + $message = $Lang::tr{'dnssec validating'}; + $colour = "white"; + $bgcolour = ${Header::colourgreen}; + + # Error + } else { + $colour = ${Header::colourred}; + } + + my $table_colour = ($id++ % 2) ? $color{'color22'} : $color{'color20'}; + + print <<END; + <tr bgcolor="$table_colour"> + <td>$nameserver</td> + <td bgcolor="$bgcolour" align="center"> + <font color="$colour"><strong>$message</strong></font> + </td> + </tr> +END + } + + print <<END; + </tbody> + </table> +END + + &Header::closebox(); + if ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && $netsettings{'RED_TYPE'} eq "DHCP"){ &Header::openbox('100%', 'left', "RED $Lang::tr{'dhcp configuration'}"); @@ -161,4 +241,33 @@ END &Header::closebigbox(); &Header::closepage(); -} +} + +sub check_dnssec($$) { + my $nameserver = shift; + my $record = shift; + + my @command = ("dig", "+dnssec", $record, "\@$nameserver"); + + my @output = qx(@command); + my $output = join("", @output); + + my $status = 0; + if ($output =~ m/status: (\w+)/) { + $status = ($1 eq "NOERROR"); + + if (!$status) { + return -1; + } + } + + my @flags = (); + if ($output =~ m/flags: (.*);/) { + @flags = split(/ /, $1); + } + + my $aware = ($output =~ m/RRSIG/); + my $validating = ("ad" ~~ @flags); + + return $aware + $validating; +} diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 0cb4169..331151f 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -908,7 +908,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General } if ($cgiparams{'COMPLZO'} eq 'on') { print SERVERCONF "# Enable Compression\n"; - print SERVERCONF "comp-lzo\r\n"; + print SERVERCONF "comp-lzo\n"; } print SERVERCONF "# Debug Level\n"; print SERVERCONF "verb 3\n"; @@ -1003,7 +1003,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General } if ($cgiparams{'COMPLZO'} eq 'on') { print CLIENTCONF "# Enable Compression\n"; - print CLIENTCONF "comp-lzo\r\n"; + print CLIENTCONF "comp-lzo\n"; } print CLIENTCONF "# Debug Level\n"; print CLIENTCONF "verb 3\n"; @@ -2103,7 +2103,7 @@ if ($confighash{$cgiparams{'KEY'}}[3] eq 'net'){ } if ($confighash{$cgiparams{'KEY'}}[30] eq 'on') { print CLIENTCONF "# Enable Compression\n"; - print CLIENTCONF "comp-lzo\r\n"; + print CLIENTCONF "comp-lzo\n"; } print CLIENTCONF "# Debug Level\n"; print CLIENTCONF "verb 3\n"; @@ -5024,24 +5024,41 @@ END ### &Header::openbox('100%', 'LEFT', $Lang::tr{'connection status and controlc' }); - print <<END; - - - <table width='100%' cellspacing='1' cellpadding='0' class='tbl'> -<tr> - <th width='10%' class='boldbase' align='center'><b>$Lang::tr{'name'}</b></th> - <th width='15%' class='boldbase' align='center'><b>$Lang::tr{'type'}</b></th> - <th width='22%' class='boldbase' align='center'><b>$Lang::tr{'network'}</b></th> - <th width='20%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></th> - <th width='10%' class='boldbase' align='center'><b>$Lang::tr{'status'}</b></th> - <th width='5%' class='boldbase' colspan='6' align='center'><b>$Lang::tr{'action'}</b></th> -</tr> -END ; my $id = 0; my $gif; my $col1=""; - foreach my $key (sort { ncmp ($confighash{$a}[3],$confighash{$b}[3]) } sort { ncmp ($confighash{$a}[1],$confighash{$b}[1]) } keys %confighash) { + my $lastnet; + foreach my $key (sort { ncmp ($confighash{$a}[32],$confighash{$b}[32]) } sort { ncmp ($confighash{$a}[1],$confighash{$b}[1]) } keys %confighash) { + if ($confighash{$key}[32] eq "" && $confighash{$key}[3] eq 'net' ){$confighash{$key}[32]=$Lang::tr{'fwhost OpenVPN N-2-N'};} + if ($confighash{$key}[32] eq "dynamic"){$confighash{$key}[32]=$Lang::tr{'ccd dynrange'};} + if($id == 0){ + print"<b>$confighash{$key}[32]</b>"; + print <<END; + <table width='100%' cellspacing='1' cellpadding='0' class='tbl'> +<tr> + <th width='10%' class='boldbase' align='center'><b>$Lang::tr{'name'}</b></th> + <th width='15%' class='boldbase' align='center'><b>$Lang::tr{'type'}</b></th> + <th width='20%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></th> + <th width='10%' class='boldbase' align='center'><b>$Lang::tr{'status'}</b></th> + <th width='5%' class='boldbase' colspan='6' align='center'><b>$Lang::tr{'action'}</b></th> +</tr> +END + } + if ($id > 0 && $lastnet ne $confighash{$key}[32]){ + print "</table><br>"; + print"<b>$confighash{$key}[32]</b>"; + print <<END; + <table width='100%' cellspacing='1' cellpadding='0' class='tbl'> +<tr> + <th width='10%' class='boldbase' align='center'><b>$Lang::tr{'name'}</b></th> + <th width='15%' class='boldbase' align='center'><b>$Lang::tr{'type'}</b></th> + <th width='20%' class='boldbase' align='center'><b>$Lang::tr{'remark'}</b></th> + <th width='10%' class='boldbase' align='center'><b>$Lang::tr{'status'}</b></th> + <th width='5%' class='boldbase' colspan='6' align='center'><b>$Lang::tr{'action'}</b></th> +</tr> +END + } if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; } if ($id % 2) { print "<tr>"; @@ -5060,9 +5077,6 @@ END my $cavalid = `/usr/bin/openssl x509 -text -in ${General::swroot}/ovpn/certs/$confighash{$key}[1]cert.pem`; $cavalid =~ /Not After : (.*)[\n]/; $cavalid = $1; - if ($confighash{$key}[32] eq "" && $confighash{$key}[3] eq 'net' ){$confighash{$key}[32]="net-2-net";} - if ($confighash{$key}[32] eq "" && $confighash{$key}[3] eq 'host' ){$confighash{$key}[32]="dynamic";} - print "<td align='center' $col>$confighash{$key}[32]</td>"; print "<td align='center' $col>$confighash{$key}[25]</td>"; $col1="bgcolor='${Header::colourred}'"; my $active = "<b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b>"; @@ -5191,7 +5205,9 @@ END END ; $id++; + $lastnet = $confighash{$key}[32]; } + print"</table>"; ; # If the config file contains entries, print Key to action icons diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 86d365f..556e65c 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -750,6 +750,10 @@ 'dnsforward entries' => 'Aktuelle Einträge', 'dnsforward forward_server' => 'DNS-Server', 'dnsforward zone' => 'Zone', +'dnssec aware' => 'DNSSEC-aware', +'dnssec information' => 'DNSSEC-Informationen', +'dnssec not supported' => 'DNSSEC wird nicht unterstützt', +'dnssec validating' => 'DNSSEC-validierend', 'do not log this port list' => 'Verwerfe diese Port-Liste kurz bevor sie protokolliert werden (reduziert Protokollgröße)', 'dod' => 'Dial-on-Demand-Modus', 'dod for dns' => 'Dial-on-Demand für DNS:', @@ -1523,6 +1527,7 @@ 'name is invalid' => 'Name ist ungültig', 'name must only contain characters' => 'Name darf nur Buchstaben enthalten.', 'name too long' => 'Der volle Benutzername oder der System Hostname ist zu lang', +'nameserver' => 'Nameserver', 'nat-traversal' => 'Nat Traversal:', 'needreboot' => 'Ein Update benötigt einen Neustart', 'net' => 'Netz', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 085dd3f..f4fafca 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -775,6 +775,10 @@ 'dnsforward entries' => 'Current entries', 'dnsforward forward_server' => 'Nameserver', 'dnsforward zone' => 'Zone', +'dnssec aware' => 'DNSSEC Aware', +'dnssec information' => 'DNSSEC Information', +'dnssec not supported' => 'DNSSEC Not supported', +'dnssec validating' => 'DNSSEC Validating', 'do not log this port list' => 'Drop this port list just before they are logged (reduces log size)', 'dod' => 'Dial on Demand', 'dod for dns' => 'Dial on Demand for DNS:', @@ -1553,6 +1557,7 @@ 'name is invalid' => 'Name is invalid', 'name must only contain characters' => 'Name must only contain characters.', 'name too long' => 'User\'s full name or system hostname is too long', +'nameserver' => 'Nameserver', 'nat-traversal' => 'Nat Traversal:', 'needreboot' => 'An update requires a restart', 'net' => 'Net', diff --git a/lfs/check_mk_agent b/lfs/check_mk_agent index 6e6d557..541d7d6 100644 --- a/lfs/check_mk_agent +++ b/lfs/check_mk_agent @@ -24,15 +24,15 @@ include Config -VER = 1.2.2p2 +VER = 1.2.4p5 THISAPP = check_mk_agent-$(VER) DL_FILE = check_mk-${VER}.tar.gz -DL_FROM = http://mathias-kettner.de/download +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/check_mk-${VER} TARGET = $(DIR_INFO)/$(THISAPP) PROG = check_mk_agent -PAK_VER = 2 +PAK_VER = 3 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = caa0f7662b4d170b2b6db2516bd41a89 +$(DL_FILE)_MD5 = ef3055d191bd38295d1716b3f7824115 install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) diff --git a/lfs/ddns b/lfs/ddns index a14f3c2..c8348ce 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -24,7 +24,7 @@ include Config -VER = 002 +VER = 003 THISAPP = ddns-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 307f36e6dadf537470a6b682b1536724 +$(DL_FILE)_MD5 = 9ff8ab5fa716859b51f63b0a241f1337 install : $(TARGET) diff --git a/lfs/gmp b/lfs/gmp index cf52276..1e518a2 100644 --- a/lfs/gmp +++ b/lfs/gmp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# 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 # @@ -34,8 +34,15 @@ TARGET = $(DIR_INFO)/$(THISAPP) ifeq "$(MACHINE)" "i586" CONFIGURE_ARGS = ABI=32 + BUILDTARGET_PENTIUM4 = $(patsubst $(MACHINE)-%,pentium4-%,$(BUILDTARGET)) endif +CONFIGURE_OPTIONS = \ + --prefix=/usr \ + --enable-cxx \ + --enable-mpbsd \ + --disable-nls + ############################################################################### # Top-level Rules ############################################################################### @@ -74,9 +81,30 @@ $(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_ARGS) ./configure --prefix=/usr \ - --enable-cxx --enable-mpbsd --disable-nls + cd $(DIR_APP) && \ + $(CONFIGURE_ARGS) \ + ./configure \ + --build=$(BUILDTARGET) \ + $(CONFIGURE_OPTIONS) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + +ifeq "$(MACHINE)" "i586" + # Build SSE/SSE2 optimised version for x86 + cd $(DIR_APP) && make clean + cd $(DIR_APP) && \ + $(CONFIGURE_ARGS) \ + ./configure \ + --build=$(BUILDTARGET_PENTIUM4) \ + $(CONFIGURE_OPTIONS) \ + CFLAGS="$(CFLAGS) -march=pentium4" \ + CXXFLAGS="$(CXXFLAGS) -march=pentium4" + cd $(DIR_APP) && make $(MAKETUNING) + + -mkdir -pv /usr/lib/sse2 + cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.0.5 /usr/lib/sse2 + cd $(DIR_APP) && install -v -m 755 .libs/libmp.so.3.1.25 /usr/lib/sse2 +endif + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/gmp-compat b/lfs/gmp-compat index 3d20e88..438e957 100644 --- a/lfs/gmp-compat +++ b/lfs/gmp-compat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# 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 # @@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \ + --build=$(BUILDTARGET) \ --enable-cxx --enable-mpbsd --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && install -m 644 .libs/libgmp.so.3.5.2 /usr/lib diff --git a/lfs/stage2 b/lfs/stage2 index 956f589..a084816 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -53,7 +53,7 @@ $(TARGET) : -mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var} -install -dv -m 0750 /root -install -dv -m 1777 /tmp /var/tmp - -mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src} + -mkdir -pv /usr/{,local/}{bin,include,lib{,/sse2},sbin,src} -mkdir -pv /usr/{,local/}share/{doc,info,locale,man} -mkdir -v /usr/{,local/}share/{misc,terminfo,zoneinfo} -mkdir -pv /usr/{,local/}share/man/man{1..8} diff --git a/src/initscripts/init.d/cleanfs b/src/initscripts/init.d/cleanfs index d526c35..e8c8c8b 100644 --- a/src/initscripts/init.d/cleanfs +++ b/src/initscripts/init.d/cleanfs @@ -71,6 +71,13 @@ create_files() { case "${1}" in start) + if [[ ! -L "/var/run" ]]; then + boot_mesg "Repair /var/run symlink to /run..." + mv -u /var/run/* /run/ 2>&1 > /dev/null + rm -rf /var/run + ln -s ../run /var/run + fi + boot_mesg -n "Cleaning file systems:" ${INFO} boot_mesg -n " /tmp" ${NORMAL} diff --git a/src/initscripts/init.d/networking/red.up/30-ddns b/src/initscripts/init.d/networking/red.up/30-ddns index 6eba04b..591dd0f 100644 --- a/src/initscripts/init.d/networking/red.up/30-ddns +++ b/src/initscripts/init.d/networking/red.up/30-ddns @@ -1,3 +1,3 @@ #!/bin/bash -exec /usr/bin/ddns update-all --force +exec /usr/bin/ddns update-all diff --git a/tools/checkwronginitlinks b/tools/checkwronginitlinks index 6f001c0..65fc946 100755 --- a/tools/checkwronginitlinks +++ b/tools/checkwronginitlinks @@ -25,3 +25,10 @@ if [ "${?}" == "0" ]; then grep -r "^etc/init.d//*" ./config/rootfiles/ echo "Change this to 'etc/rc.d/init.d/...' !" fi + +grep -r "^var/run//*" ./config/rootfiles/ >/dev/null 2>&1 +if [ "${?}" == "0" ]; then + echo "Error! 'var/run/...' in rootfiles files found!" + grep -r "^var/run//*" ./config/rootfiles/ + echo "Comment this and create it at initskript if needed !" +fi diff --git a/tools/make-functions b/tools/make-functions index ba66547..5a557a6 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -71,7 +71,7 @@ configure_target() { i586) BUILDTARGET="${target_arch}-pc-linux-gnu" CROSSTARGET="${BUILD_ARCH}-cross-linux-gnu" - CFLAGS_ARCH="-march=i586 -fomit-frame-pointer" + CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer" ;; armv5tel) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core80, updated. 7535861c50af78230d509e0440e00abacf3057cb
by git＠ipfire.org 18 Jul '14

18 Jul '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core80 has been updated via 7535861c50af78230d509e0440e00abacf3057cb (commit) from 13eef3ba74c47e8beabd87c006b597c6c46e9e46 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7535861c50af78230d509e0440e00abacf3057cb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jul 18 22:32:41 2014 +0200 stage2: rootfile update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/stage2 | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 39bf555..eb97040 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -98,6 +98,7 @@ usr/local/bin/timezone-transition usr/local/bin/update-lang-cache #usr/local/include #usr/local/lib +#usr/local/lib/sse2 #usr/local/sbin #usr/local/share #usr/local/share/doc hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7535861c50af78230d509e0440e00abacf3057cb
by git＠ipfire.org 18 Jul '14

18 Jul '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 7535861c50af78230d509e0440e00abacf3057cb (commit) from 13eef3ba74c47e8beabd87c006b597c6c46e9e46 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7535861c50af78230d509e0440e00abacf3057cb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jul 18 22:32:41 2014 +0200 stage2: rootfile update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/stage2 | 1 + 1 file changed, 1 insertion(+) Difference in files: diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 39bf555..eb97040 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -98,6 +98,7 @@ usr/local/bin/timezone-transition usr/local/bin/update-lang-cache #usr/local/include #usr/local/lib +#usr/local/lib/sse2 #usr/local/sbin #usr/local/share #usr/local/share/doc hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core80, updated. 13eef3ba74c47e8beabd87c006b597c6c46e9e46
by git＠ipfire.org 18 Jul '14

18 Jul '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, core80 has been updated via 13eef3ba74c47e8beabd87c006b597c6c46e9e46 (commit) via 89066697c4c257896feaf017ecc72814d01f3682 (commit) via 94abd48b1c666f7ec1009515ffb651f522f9f89b (commit) via b8cee3bb81787328e3bb2c6d9edb31ac0015a717 (commit) via da3dbb2a428127f345c4881a757cce8f60df767f (commit) via 0f860889ab02872ede525a78de9e22d29b54277d (commit) from 5b71042c5426855ee58a56d16d11a4cc5d0f5253 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 13eef3ba74c47e8beabd87c006b597c6c46e9e46 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 18 15:31:15 2014 +0200 ddns: Update to version 003. commit 89066697c4c257896feaf017ecc72814d01f3682 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 18 15:20:13 2014 +0200 gmp: Ship MMX/SSE/SSE2 enabled version. commit 94abd48b1c666f7ec1009515ffb651f522f9f89b Merge: da3dbb2 b8cee3b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 18 14:55:47 2014 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x commit b8cee3bb81787328e3bb2c6d9edb31ac0015a717 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jul 18 12:52:20 2014 +0200 gmp: fix build on Intel buildmachines. on newer Intel buildsystems the gmp configure script enables some sse2 optimizations that not work on old cpu's (ALIX, K6 ...) commit da3dbb2a428127f345c4881a757cce8f60df767f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 18 10:20:41 2014 +0200 buildsystem: Explicitely compile with -mtune=generic commit 0f860889ab02872ede525a78de9e22d29b54277d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 17 21:03:53 2014 +0200 core80: Fix configuration update and resurrect permissions. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/{ => armv5tel}/gmp | 0 config/rootfiles/common/{ => i586}/gmp | 4 ++++ config/rootfiles/common/stage2 | 1 + config/rootfiles/core/80/filelists/i586/gmp | 1 + config/rootfiles/core/80/update.sh | 16 +++++++++----- lfs/ddns | 4 ++-- lfs/gmp | 34 ++++++++++++++++++++++++++--- lfs/gmp-compat | 3 ++- lfs/stage2 | 2 +- tools/make-functions | 2 +- 10 files changed, 54 insertions(+), 13 deletions(-) copy config/rootfiles/common/{ => armv5tel}/gmp (100%) rename config/rootfiles/common/{ => i586}/gmp (80%) create mode 120000 config/rootfiles/core/80/filelists/i586/gmp Difference in files: diff --git a/config/rootfiles/common/armv5tel/gmp b/config/rootfiles/common/armv5tel/gmp new file mode 100644 index 0000000..67f557f --- /dev/null +++ b/config/rootfiles/common/armv5tel/gmp @@ -0,0 +1,21 @@ +#usr/include/gmp.h +#usr/include/gmpxx.h +#usr/include/mp.h +#usr/lib/libgmp.a +#usr/lib/libgmp.la +#usr/lib/libgmp.so +usr/lib/libgmp.so.10 +usr/lib/libgmp.so.10.0.5 +#usr/lib/libgmpxx.a +#usr/lib/libgmpxx.la +#usr/lib/libgmpxx.so +usr/lib/libgmpxx.so.4 +usr/lib/libgmpxx.so.4.2.5 +#usr/lib/libmp.a +#usr/lib/libmp.la +#usr/lib/libmp.so +usr/lib/libmp.so.3 +usr/lib/libmp.so.3.1.25 +#usr/share/info/gmp.info +#usr/share/info/gmp.info-1 +#usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/gmp b/config/rootfiles/common/gmp deleted file mode 100644 index 67f557f..0000000 --- a/config/rootfiles/common/gmp +++ /dev/null @@ -1,21 +0,0 @@ -#usr/include/gmp.h -#usr/include/gmpxx.h -#usr/include/mp.h -#usr/lib/libgmp.a -#usr/lib/libgmp.la -#usr/lib/libgmp.so -usr/lib/libgmp.so.10 -usr/lib/libgmp.so.10.0.5 -#usr/lib/libgmpxx.a -#usr/lib/libgmpxx.la -#usr/lib/libgmpxx.so -usr/lib/libgmpxx.so.4 -usr/lib/libgmpxx.so.4.2.5 -#usr/lib/libmp.a -#usr/lib/libmp.la -#usr/lib/libmp.so -usr/lib/libmp.so.3 -usr/lib/libmp.so.3.1.25 -#usr/share/info/gmp.info -#usr/share/info/gmp.info-1 -#usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/i586/gmp b/config/rootfiles/common/i586/gmp new file mode 100644 index 0000000..db6a000 --- /dev/null +++ b/config/rootfiles/common/i586/gmp @@ -0,0 +1,25 @@ +#usr/include/gmp.h +#usr/include/gmpxx.h +#usr/include/mp.h +#usr/lib/libgmp.a +#usr/lib/libgmp.la +#usr/lib/libgmp.so +usr/lib/libgmp.so.10 +usr/lib/libgmp.so.10.0.5 +#usr/lib/libgmpxx.a +#usr/lib/libgmpxx.la +#usr/lib/libgmpxx.so +usr/lib/libgmpxx.so.4 +usr/lib/libgmpxx.so.4.2.5 +#usr/lib/libmp.a +#usr/lib/libmp.la +#usr/lib/libmp.so +usr/lib/libmp.so.3 +usr/lib/libmp.so.3.1.25 +usr/lib/sse2/libgmp.so.10 +usr/lib/sse2/libgmp.so.10.0.5 +usr/lib/sse2/libmp.so.3 +usr/lib/sse2/libmp.so.3.1.25 +#usr/share/info/gmp.info +#usr/share/info/gmp.info-1 +#usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 085092d..39bf555 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -74,6 +74,7 @@ usr/lib/libgcc_s.so.1 #usr/lib/libstdc++.la #usr/lib/libstdc++.so usr/lib/libstdc++.so.6 +#usr/lib/sse2 #usr/local #usr/local/bin #usr/local/bin/archive.files diff --git a/config/rootfiles/core/80/filelists/i586/gmp b/config/rootfiles/core/80/filelists/i586/gmp new file mode 120000 index 0000000..52a09cd --- /dev/null +++ b/config/rootfiles/core/80/filelists/i586/gmp @@ -0,0 +1 @@ +../../../../common/i586/gmp \ No newline at end of file diff --git a/config/rootfiles/core/80/update.sh b/config/rootfiles/core/80/update.sh index baba3e2..b8b5b58 100644 --- a/config/rootfiles/core/80/update.sh +++ b/config/rootfiles/core/80/update.sh @@ -61,13 +61,19 @@ rm -f \ /opt/pakfire/db/rootfiles/libgpg-error # Regenerate squid configuration file -/srv/web/ipfire/cgi-bin/proxy.cgi +sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi -# Generate ddns configuration file -/srv/web/ipfire/cgi-bin/ddns.cgi +# Fix broken proxy configuration permissions +chown -R nobody.nobody \ + /var/ipfire/proxy/advanced \ + /var/ipfire/proxy/acl-1.4 \ + /var/ipfire/proxy/enable \ + /var/ipfire/proxy/settings \ + /var/ipfire/proxy/squid.conf \ + /var/ipfire/proxy/transparent -touch /var/ipfire/ddns/ddns.conf -chown nobody.nobody /var/ipfire/ddns/ddns.conf +# Generate ddns configuration file +sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi # Update crontab sed -i /var/spool/cron/root.orig -e "/setddns.pl/d" diff --git a/lfs/ddns b/lfs/ddns index a14f3c2..c8348ce 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -24,7 +24,7 @@ include Config -VER = 002 +VER = 003 THISAPP = ddns-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 307f36e6dadf537470a6b682b1536724 +$(DL_FILE)_MD5 = 9ff8ab5fa716859b51f63b0a241f1337 install : $(TARGET) diff --git a/lfs/gmp b/lfs/gmp index cf52276..1e518a2 100644 --- a/lfs/gmp +++ b/lfs/gmp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# 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 # @@ -34,8 +34,15 @@ TARGET = $(DIR_INFO)/$(THISAPP) ifeq "$(MACHINE)" "i586" CONFIGURE_ARGS = ABI=32 + BUILDTARGET_PENTIUM4 = $(patsubst $(MACHINE)-%,pentium4-%,$(BUILDTARGET)) endif +CONFIGURE_OPTIONS = \ + --prefix=/usr \ + --enable-cxx \ + --enable-mpbsd \ + --disable-nls + ############################################################################### # Top-level Rules ############################################################################### @@ -74,9 +81,30 @@ $(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_ARGS) ./configure --prefix=/usr \ - --enable-cxx --enable-mpbsd --disable-nls + cd $(DIR_APP) && \ + $(CONFIGURE_ARGS) \ + ./configure \ + --build=$(BUILDTARGET) \ + $(CONFIGURE_OPTIONS) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + +ifeq "$(MACHINE)" "i586" + # Build SSE/SSE2 optimised version for x86 + cd $(DIR_APP) && make clean + cd $(DIR_APP) && \ + $(CONFIGURE_ARGS) \ + ./configure \ + --build=$(BUILDTARGET_PENTIUM4) \ + $(CONFIGURE_OPTIONS) \ + CFLAGS="$(CFLAGS) -march=pentium4" \ + CXXFLAGS="$(CXXFLAGS) -march=pentium4" + cd $(DIR_APP) && make $(MAKETUNING) + + -mkdir -pv /usr/lib/sse2 + cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.0.5 /usr/lib/sse2 + cd $(DIR_APP) && install -v -m 755 .libs/libmp.so.3.1.25 /usr/lib/sse2 +endif + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/gmp-compat b/lfs/gmp-compat index 3d20e88..438e957 100644 --- a/lfs/gmp-compat +++ b/lfs/gmp-compat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# 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 # @@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \ + --build=$(BUILDTARGET) \ --enable-cxx --enable-mpbsd --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && install -m 644 .libs/libgmp.so.3.5.2 /usr/lib diff --git a/lfs/stage2 b/lfs/stage2 index 956f589..a084816 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -53,7 +53,7 @@ $(TARGET) : -mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var} -install -dv -m 0750 /root -install -dv -m 1777 /tmp /var/tmp - -mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src} + -mkdir -pv /usr/{,local/}{bin,include,lib{,/sse2},sbin,src} -mkdir -pv /usr/{,local/}share/{doc,info,locale,man} -mkdir -v /usr/{,local/}share/{misc,terminfo,zoneinfo} -mkdir -pv /usr/{,local/}share/man/man{1..8} diff --git a/tools/make-functions b/tools/make-functions index ba66547..5a557a6 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -71,7 +71,7 @@ configure_target() { i586) BUILDTARGET="${target_arch}-pc-linux-gnu" CROSSTARGET="${BUILD_ARCH}-cross-linux-gnu" - CFLAGS_ARCH="-march=i586 -fomit-frame-pointer" + CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer" ;; armv5tel) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 13eef3ba74c47e8beabd87c006b597c6c46e9e46
by git＠ipfire.org 18 Jul '14

18 Jul '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 13eef3ba74c47e8beabd87c006b597c6c46e9e46 (commit) from 89066697c4c257896feaf017ecc72814d01f3682 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 13eef3ba74c47e8beabd87c006b597c6c46e9e46 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 18 15:31:15 2014 +0200 ddns: Update to version 003. ----------------------------------------------------------------------- Summary of changes: lfs/ddns | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/ddns b/lfs/ddns index a14f3c2..c8348ce 100644 --- a/lfs/ddns +++ b/lfs/ddns @@ -24,7 +24,7 @@ include Config -VER = 002 +VER = 003 THISAPP = ddns-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 307f36e6dadf537470a6b682b1536724 +$(DL_FILE)_MD5 = 9ff8ab5fa716859b51f63b0a241f1337 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 89066697c4c257896feaf017ecc72814d01f3682
by git＠ipfire.org 18 Jul '14

18 Jul '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 89066697c4c257896feaf017ecc72814d01f3682 (commit) via 94abd48b1c666f7ec1009515ffb651f522f9f89b (commit) via da3dbb2a428127f345c4881a757cce8f60df767f (commit) from b8cee3bb81787328e3bb2c6d9edb31ac0015a717 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 89066697c4c257896feaf017ecc72814d01f3682 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 18 15:20:13 2014 +0200 gmp: Ship MMX/SSE/SSE2 enabled version. commit 94abd48b1c666f7ec1009515ffb651f522f9f89b Merge: da3dbb2 b8cee3b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 18 14:55:47 2014 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x commit da3dbb2a428127f345c4881a757cce8f60df767f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Jul 18 10:20:41 2014 +0200 buildsystem: Explicitely compile with -mtune=generic ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/{ => armv5tel}/gmp | 0 config/rootfiles/common/{ => i586}/gmp | 4 ++++ config/rootfiles/common/stage2 | 1 + config/rootfiles/core/80/filelists/i586/gmp | 1 + lfs/gmp | 33 ++++++++++++++++++++++++++--- lfs/stage2 | 2 +- tools/make-functions | 2 +- 7 files changed, 38 insertions(+), 5 deletions(-) copy config/rootfiles/common/{ => armv5tel}/gmp (100%) rename config/rootfiles/common/{ => i586}/gmp (80%) create mode 120000 config/rootfiles/core/80/filelists/i586/gmp Difference in files: diff --git a/config/rootfiles/common/armv5tel/gmp b/config/rootfiles/common/armv5tel/gmp new file mode 100644 index 0000000..67f557f --- /dev/null +++ b/config/rootfiles/common/armv5tel/gmp @@ -0,0 +1,21 @@ +#usr/include/gmp.h +#usr/include/gmpxx.h +#usr/include/mp.h +#usr/lib/libgmp.a +#usr/lib/libgmp.la +#usr/lib/libgmp.so +usr/lib/libgmp.so.10 +usr/lib/libgmp.so.10.0.5 +#usr/lib/libgmpxx.a +#usr/lib/libgmpxx.la +#usr/lib/libgmpxx.so +usr/lib/libgmpxx.so.4 +usr/lib/libgmpxx.so.4.2.5 +#usr/lib/libmp.a +#usr/lib/libmp.la +#usr/lib/libmp.so +usr/lib/libmp.so.3 +usr/lib/libmp.so.3.1.25 +#usr/share/info/gmp.info +#usr/share/info/gmp.info-1 +#usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/gmp b/config/rootfiles/common/gmp deleted file mode 100644 index 67f557f..0000000 --- a/config/rootfiles/common/gmp +++ /dev/null @@ -1,21 +0,0 @@ -#usr/include/gmp.h -#usr/include/gmpxx.h -#usr/include/mp.h -#usr/lib/libgmp.a -#usr/lib/libgmp.la -#usr/lib/libgmp.so -usr/lib/libgmp.so.10 -usr/lib/libgmp.so.10.0.5 -#usr/lib/libgmpxx.a -#usr/lib/libgmpxx.la -#usr/lib/libgmpxx.so -usr/lib/libgmpxx.so.4 -usr/lib/libgmpxx.so.4.2.5 -#usr/lib/libmp.a -#usr/lib/libmp.la -#usr/lib/libmp.so -usr/lib/libmp.so.3 -usr/lib/libmp.so.3.1.25 -#usr/share/info/gmp.info -#usr/share/info/gmp.info-1 -#usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/i586/gmp b/config/rootfiles/common/i586/gmp new file mode 100644 index 0000000..db6a000 --- /dev/null +++ b/config/rootfiles/common/i586/gmp @@ -0,0 +1,25 @@ +#usr/include/gmp.h +#usr/include/gmpxx.h +#usr/include/mp.h +#usr/lib/libgmp.a +#usr/lib/libgmp.la +#usr/lib/libgmp.so +usr/lib/libgmp.so.10 +usr/lib/libgmp.so.10.0.5 +#usr/lib/libgmpxx.a +#usr/lib/libgmpxx.la +#usr/lib/libgmpxx.so +usr/lib/libgmpxx.so.4 +usr/lib/libgmpxx.so.4.2.5 +#usr/lib/libmp.a +#usr/lib/libmp.la +#usr/lib/libmp.so +usr/lib/libmp.so.3 +usr/lib/libmp.so.3.1.25 +usr/lib/sse2/libgmp.so.10 +usr/lib/sse2/libgmp.so.10.0.5 +usr/lib/sse2/libmp.so.3 +usr/lib/sse2/libmp.so.3.1.25 +#usr/share/info/gmp.info +#usr/share/info/gmp.info-1 +#usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 085092d..39bf555 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -74,6 +74,7 @@ usr/lib/libgcc_s.so.1 #usr/lib/libstdc++.la #usr/lib/libstdc++.so usr/lib/libstdc++.so.6 +#usr/lib/sse2 #usr/local #usr/local/bin #usr/local/bin/archive.files diff --git a/config/rootfiles/core/80/filelists/i586/gmp b/config/rootfiles/core/80/filelists/i586/gmp new file mode 120000 index 0000000..52a09cd --- /dev/null +++ b/config/rootfiles/core/80/filelists/i586/gmp @@ -0,0 +1 @@ +../../../../common/i586/gmp \ No newline at end of file diff --git a/lfs/gmp b/lfs/gmp index 55603a5..1e518a2 100644 --- a/lfs/gmp +++ b/lfs/gmp @@ -34,8 +34,15 @@ TARGET = $(DIR_INFO)/$(THISAPP) ifeq "$(MACHINE)" "i586" CONFIGURE_ARGS = ABI=32 + BUILDTARGET_PENTIUM4 = $(patsubst $(MACHINE)-%,pentium4-%,$(BUILDTARGET)) endif +CONFIGURE_OPTIONS = \ + --prefix=/usr \ + --enable-cxx \ + --enable-mpbsd \ + --disable-nls + ############################################################################### # Top-level Rules ############################################################################### @@ -74,10 +81,30 @@ $(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_ARGS) ./configure --prefix=/usr \ - --build=$(BUILDTARGET) \ - --enable-cxx --enable-mpbsd --disable-nls + cd $(DIR_APP) && \ + $(CONFIGURE_ARGS) \ + ./configure \ + --build=$(BUILDTARGET) \ + $(CONFIGURE_OPTIONS) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + +ifeq "$(MACHINE)" "i586" + # Build SSE/SSE2 optimised version for x86 + cd $(DIR_APP) && make clean + cd $(DIR_APP) && \ + $(CONFIGURE_ARGS) \ + ./configure \ + --build=$(BUILDTARGET_PENTIUM4) \ + $(CONFIGURE_OPTIONS) \ + CFLAGS="$(CFLAGS) -march=pentium4" \ + CXXFLAGS="$(CXXFLAGS) -march=pentium4" + cd $(DIR_APP) && make $(MAKETUNING) + + -mkdir -pv /usr/lib/sse2 + cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.0.5 /usr/lib/sse2 + cd $(DIR_APP) && install -v -m 755 .libs/libmp.so.3.1.25 /usr/lib/sse2 +endif + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/stage2 b/lfs/stage2 index 956f589..a084816 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -53,7 +53,7 @@ $(TARGET) : -mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var} -install -dv -m 0750 /root -install -dv -m 1777 /tmp /var/tmp - -mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src} + -mkdir -pv /usr/{,local/}{bin,include,lib{,/sse2},sbin,src} -mkdir -pv /usr/{,local/}share/{doc,info,locale,man} -mkdir -v /usr/{,local/}share/{misc,terminfo,zoneinfo} -mkdir -pv /usr/{,local/}share/man/man{1..8} diff --git a/tools/make-functions b/tools/make-functions index ba66547..5a557a6 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -71,7 +71,7 @@ configure_target() { i586) BUILDTARGET="${target_arch}-pc-linux-gnu" CROSSTARGET="${BUILD_ARCH}-cross-linux-gnu" - CFLAGS_ARCH="-march=i586 -fomit-frame-pointer" + CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer" ;; armv5tel) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. b8cee3bb81787328e3bb2c6d9edb31ac0015a717
by git＠ipfire.org 18 Jul '14

18 Jul '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via b8cee3bb81787328e3bb2c6d9edb31ac0015a717 (commit) from 0f860889ab02872ede525a78de9e22d29b54277d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b8cee3bb81787328e3bb2c6d9edb31ac0015a717 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jul 18 12:52:20 2014 +0200 gmp: fix build on Intel buildmachines. on newer Intel buildsystems the gmp configure script enables some sse2 optimizations that not work on old cpu's (ALIX, K6 ...) ----------------------------------------------------------------------- Summary of changes: lfs/gmp | 3 ++- lfs/gmp-compat | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/gmp b/lfs/gmp index cf52276..55603a5 100644 --- a/lfs/gmp +++ b/lfs/gmp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# 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 # @@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \ + --build=$(BUILDTARGET) \ --enable-cxx --enable-mpbsd --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/gmp-compat b/lfs/gmp-compat index 3d20e88..438e957 100644 --- a/lfs/gmp-compat +++ b/lfs/gmp-compat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# 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 # @@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \ + --build=$(BUILDTARGET) \ --enable-cxx --enable-mpbsd --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && install -m 644 .libs/libgmp.so.3.5.2 /usr/lib hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 0f860889ab02872ede525a78de9e22d29b54277d
by git＠ipfire.org 17 Jul '14

17 Jul '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 0f860889ab02872ede525a78de9e22d29b54277d (commit) from 5b71042c5426855ee58a56d16d11a4cc5d0f5253 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0f860889ab02872ede525a78de9e22d29b54277d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 17 21:03:53 2014 +0200 core80: Fix configuration update and resurrect permissions. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/80/update.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/rootfiles/core/80/update.sh b/config/rootfiles/core/80/update.sh index baba3e2..b8b5b58 100644 --- a/config/rootfiles/core/80/update.sh +++ b/config/rootfiles/core/80/update.sh @@ -61,13 +61,19 @@ rm -f \ /opt/pakfire/db/rootfiles/libgpg-error # Regenerate squid configuration file -/srv/web/ipfire/cgi-bin/proxy.cgi +sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi -# Generate ddns configuration file -/srv/web/ipfire/cgi-bin/ddns.cgi +# Fix broken proxy configuration permissions +chown -R nobody.nobody \ + /var/ipfire/proxy/advanced \ + /var/ipfire/proxy/acl-1.4 \ + /var/ipfire/proxy/enable \ + /var/ipfire/proxy/settings \ + /var/ipfire/proxy/squid.conf \ + /var/ipfire/proxy/transparent -touch /var/ipfire/ddns/ddns.conf -chown nobody.nobody /var/ipfire/ddns/ddns.conf +# Generate ddns configuration file +sudo -u nobody /srv/web/ipfire/cgi-bin/ddns.cgi # Update crontab sed -i /var/spool/cron/root.orig -e "/setddns.pl/d" hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM