IPFire-SCM May 2015

ipfire-scm@lists.ipfire.org

1 participants
55 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9acda8fa69b22f410b2b3787b7fad5cff899488d
by git＠ipfire.org 06 May '15

06 May '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 9acda8fa69b22f410b2b3787b7fad5cff899488d (commit) via 1d47c971e6bd4490fb54c6dd333f307d89f9cfee (commit) from 0ed7b61325996686b956ba398ccb830b53253253 (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 9acda8fa69b22f410b2b3787b7fad5cff899488d Merge: 0ed7b61 1d47c97 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 6 16:57:55 2015 +0200 Merge remote-tracking branch 'amarx/BUG10834' into next commit 1d47c971e6bd4490fb54c6dd333f307d89f9cfee Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Wed May 6 16:18:00 2015 +0200 BUG10834: fixes ovpn-ccd-convert When restoring an old backup, all OpenVPN RW's get the dynamic network. ----------------------------------------------------------------------- Summary of changes: src/scripts/ovpn-ccd-convert | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/src/scripts/ovpn-ccd-convert b/src/scripts/ovpn-ccd-convert index 7aa8cf1..f496706 100644 --- a/src/scripts/ovpn-ccd-convert +++ b/src/scripts/ovpn-ccd-convert @@ -42,7 +42,7 @@ foreach my $key (keys %ovpnconfig){ }else{ print "Client $ovpnconfig{$key}[2] NOT converted!\n"; } - $ovpnconfig{$key}[32] = 'dynamic'; + $ovpnconfig{$key}[32] = 'dynamic' if ($ovpnconfig{$key}[32] eq ''); } &General::writehasharray("/var/ipfire/ovpn/ovpnconfig", \%ovpnconfig); if ($running eq 'on') hooks/post-receive -- IPFire 2.x development tree

1 0

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

06 May '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 0ed7b61325996686b956ba398ccb830b53253253 (commit) via dcca805182bef76740752aa90542362806eaa47f (commit) from 5ea73f56601411d842456243fc88bdde8834742c (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 0ed7b61325996686b956ba398ccb830b53253253 Merge: dcca805 5ea73f5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 6 09:44:03 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit dcca805182bef76740752aa90542362806eaa47f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 6 09:43:53 2015 +0200 Rootfile update ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/web-user-interface | 358 +++++++++++++++++++++++++++++ 1 file changed, 358 insertions(+) create mode 100644 config/rootfiles/common/web-user-interface Difference in files: diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface new file mode 100644 index 0000000..5da892b --- /dev/null +++ b/config/rootfiles/common/web-user-interface @@ -0,0 +1,358 @@ +srv/web/ipfire/cgi-bin/aliases.cgi +#srv/web/ipfire/cgi-bin/asterisk +#srv/web/ipfire/cgi-bin/asterisk/calls.cgi +#srv/web/ipfire/cgi-bin/asterisk/conf +#srv/web/ipfire/cgi-bin/asterisk/conf.cgi +#srv/web/ipfire/cgi-bin/asterisk/conf/telbook.conf +#srv/web/ipfire/cgi-bin/asterisk/status.cgi +srv/web/ipfire/cgi-bin/atm-status.cgi +srv/web/ipfire/cgi-bin/backup.cgi +srv/web/ipfire/cgi-bin/bluetooth.cgi +srv/web/ipfire/cgi-bin/chpasswd.cgi +srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/connscheduler.cgi +srv/web/ipfire/cgi-bin/country.cgi +srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/ddns.cgi +srv/web/ipfire/cgi-bin/dhcp.cgi +srv/web/ipfire/cgi-bin/dns.cgi +srv/web/ipfire/cgi-bin/dnsforward.cgi +srv/web/ipfire/cgi-bin/entropy.cgi +srv/web/ipfire/cgi-bin/extrahd.cgi +srv/web/ipfire/cgi-bin/fireinfo.cgi +srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/fwhosts.cgi +srv/web/ipfire/cgi-bin/geoip-block.cgi +srv/web/ipfire/cgi-bin/gpl.cgi +srv/web/ipfire/cgi-bin/gui.cgi +srv/web/ipfire/cgi-bin/hardwaregraphs.cgi +srv/web/ipfire/cgi-bin/hosts.cgi +srv/web/ipfire/cgi-bin/ids.cgi +#srv/web/ipfire/cgi-bin/imspector.cgi +srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/ipinfo.cgi +srv/web/ipfire/cgi-bin/iptables.cgi +srv/web/ipfire/cgi-bin/logs.cgi +srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat +srv/web/ipfire/cgi-bin/logs.cgi/config.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogport.dat +srv/web/ipfire/cgi-bin/logs.cgi/ids.dat +srv/web/ipfire/cgi-bin/logs.cgi/log.dat +srv/web/ipfire/cgi-bin/logs.cgi/proxylog.dat +srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromip.dat +srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromport.dat +srv/web/ipfire/cgi-bin/logs.cgi/summary.dat +srv/web/ipfire/cgi-bin/logs.cgi/urlfilter.dat +srv/web/ipfire/cgi-bin/mac.cgi +srv/web/ipfire/cgi-bin/mdstat.cgi +srv/web/ipfire/cgi-bin/media.cgi +srv/web/ipfire/cgi-bin/memory.cgi +srv/web/ipfire/cgi-bin/modem-status.cgi +srv/web/ipfire/cgi-bin/modem.cgi +#srv/web/ipfire/cgi-bin/mpfire.cgi +srv/web/ipfire/cgi-bin/netexternal.cgi +srv/web/ipfire/cgi-bin/netinternal.cgi +srv/web/ipfire/cgi-bin/netother.cgi +srv/web/ipfire/cgi-bin/netovpnrw.cgi +srv/web/ipfire/cgi-bin/netovpnsrv.cgi +srv/web/ipfire/cgi-bin/optionsfw.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi +srv/web/ipfire/cgi-bin/p2p-block.cgi +srv/web/ipfire/cgi-bin/pakfire.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/qos.cgi +srv/web/ipfire/cgi-bin/remote.cgi +srv/web/ipfire/cgi-bin/routing.cgi +#srv/web/ipfire/cgi-bin/samba.cgi +#srv/web/ipfire/cgi-bin/sambahlp.cgi +srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/shutdown.cgi +srv/web/ipfire/cgi-bin/speed.cgi +srv/web/ipfire/cgi-bin/system.cgi +srv/web/ipfire/cgi-bin/time.cgi +#srv/web/ipfire/cgi-bin/tor.cgi +srv/web/ipfire/cgi-bin/traffic.cgi +#srv/web/ipfire/cgi-bin/tripwire.cgi +srv/web/ipfire/cgi-bin/updatexlrator.cgi +#srv/web/ipfire/cgi-bin/upnp.cgi +srv/web/ipfire/cgi-bin/urlfilter.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/cgi-bin/wakeonlan.cgi +srv/web/ipfire/cgi-bin/webaccess.cgi +srv/web/ipfire/cgi-bin/wireless.cgi +srv/web/ipfire/cgi-bin/wirelessclient.cgi +srv/web/ipfire/cgi-bin/wlanap.cgi +#srv/web/ipfire/html +srv/web/ipfire/html/blob.gif +srv/web/ipfire/html/clwarn.cgi +srv/web/ipfire/html/dial.cgi +srv/web/ipfire/html/favicon.ico +#srv/web/ipfire/html/images +srv/web/ipfire/html/images/IPFire.png +srv/web/ipfire/html/images/add.gif +srv/web/ipfire/html/images/addblue.gif +srv/web/ipfire/html/images/addgreen.gif +srv/web/ipfire/html/images/address-book-new.png +srv/web/ipfire/html/images/application-certificate.png +srv/web/ipfire/html/images/application-x-executable.png +srv/web/ipfire/html/images/applications-accessories.png +srv/web/ipfire/html/images/applications-development.png +srv/web/ipfire/html/images/applications-games.png +srv/web/ipfire/html/images/applications-graphics.png +srv/web/ipfire/html/images/applications-internet.png +srv/web/ipfire/html/images/applications-multimedia.png +srv/web/ipfire/html/images/applications-office.png +srv/web/ipfire/html/images/applications-other.png +srv/web/ipfire/html/images/applications-system.png +srv/web/ipfire/html/images/appointment-new.png +srv/web/ipfire/html/images/audio-volume-high-red.png +srv/web/ipfire/html/images/audio-volume-high.png +srv/web/ipfire/html/images/audio-volume-low-red.png +srv/web/ipfire/html/images/audio-volume-low.png +srv/web/ipfire/html/images/audio-x-generic-red.png +srv/web/ipfire/html/images/audio-x-generic.png +srv/web/ipfire/html/images/background.gif +srv/web/ipfire/html/images/bookmark-new.png +srv/web/ipfire/html/images/clock.gif +srv/web/ipfire/html/images/computer.png +srv/web/ipfire/html/images/delete.gif +srv/web/ipfire/html/images/dialog-error.png +srv/web/ipfire/html/images/dialog-information.png +srv/web/ipfire/html/images/dialog-warning.png +srv/web/ipfire/html/images/dns_link.png +srv/web/ipfire/html/images/document-new.png +srv/web/ipfire/html/images/document-open.png +srv/web/ipfire/html/images/document-print-preview.png +srv/web/ipfire/html/images/document-print.png +srv/web/ipfire/html/images/document-properties.png +srv/web/ipfire/html/images/document-save-as.png +srv/web/ipfire/html/images/document-save.png +srv/web/ipfire/html/images/down.gif +srv/web/ipfire/html/images/drive-harddisk.png +srv/web/ipfire/html/images/drive-optical.png +srv/web/ipfire/html/images/drive-removable-media.png +srv/web/ipfire/html/images/edit-find.png +srv/web/ipfire/html/images/edit-redo.png +srv/web/ipfire/html/images/edit.gif +srv/web/ipfire/html/images/floppy.gif +srv/web/ipfire/html/images/folder-drag-accept.png +srv/web/ipfire/html/images/folder-new.png +srv/web/ipfire/html/images/folder-open.png +srv/web/ipfire/html/images/folder-remote.png +srv/web/ipfire/html/images/folder-saved-search.png +srv/web/ipfire/html/images/folder-visiting.png +srv/web/ipfire/html/images/folder.png +srv/web/ipfire/html/images/format-indent-less.png +srv/web/ipfire/html/images/format-indent-more.png +srv/web/ipfire/html/images/format-justify-center.png +srv/web/ipfire/html/images/format-justify-fill.png +srv/web/ipfire/html/images/format-justify-left.png +srv/web/ipfire/html/images/format-justify-right.png +srv/web/ipfire/html/images/forward.gif +srv/web/ipfire/html/images/go-bottom.png +srv/web/ipfire/html/images/go-down.png +srv/web/ipfire/html/images/go-first.png +srv/web/ipfire/html/images/go-home.png +srv/web/ipfire/html/images/go-jump.png +srv/web/ipfire/html/images/go-last.png +srv/web/ipfire/html/images/go-next.png +srv/web/ipfire/html/images/go-previous.png +srv/web/ipfire/html/images/go-top.png +srv/web/ipfire/html/images/go-up.png +srv/web/ipfire/html/images/help-browser.png +srv/web/ipfire/html/images/help.gif +srv/web/ipfire/html/images/image-loading.png +srv/web/ipfire/html/images/image-missing.png +srv/web/ipfire/html/images/image-x-generic.png +srv/web/ipfire/html/images/indicator.gif +srv/web/ipfire/html/images/info.gif +srv/web/ipfire/html/images/input-gaming.png +srv/web/ipfire/html/images/input-keyboard.png +srv/web/ipfire/html/images/input-mouse.png +srv/web/ipfire/html/images/internet-group-chat.png +srv/web/ipfire/html/images/internet-mail.png +srv/web/ipfire/html/images/internet-news-reader.png +srv/web/ipfire/html/images/internet-web-browser.png +srv/web/ipfire/html/images/list-add.png +srv/web/ipfire/html/images/list-remove.png +srv/web/ipfire/html/images/mail-attachment.png +srv/web/ipfire/html/images/mail-forward.png +srv/web/ipfire/html/images/mail-mark-junk.png +srv/web/ipfire/html/images/mail-mark-not-junk.png +srv/web/ipfire/html/images/mail-message-new.png +srv/web/ipfire/html/images/mail-reply-all.png +srv/web/ipfire/html/images/mail-reply-sender.png +srv/web/ipfire/html/images/mail-send-receive.png +srv/web/ipfire/html/images/media-flash.png +srv/web/ipfire/html/images/media-floppy.png +srv/web/ipfire/html/images/media-optical.png +srv/web/ipfire/html/images/media-playback-start-all.png +srv/web/ipfire/html/images/media-playback-start.png +srv/web/ipfire/html/images/media-playback-stop.png +srv/web/ipfire/html/images/media-repeat.png +srv/web/ipfire/html/images/media-resume.png +srv/web/ipfire/html/images/media-shuffle.png +srv/web/ipfire/html/images/media-skip-backward.png +srv/web/ipfire/html/images/media-skip-forward.png +srv/web/ipfire/html/images/mpfire +srv/web/ipfire/html/images/mpfire/box.png +srv/web/ipfire/html/images/network-error.png +srv/web/ipfire/html/images/network-idle.png +srv/web/ipfire/html/images/network-offline.png +srv/web/ipfire/html/images/network-receive.png +srv/web/ipfire/html/images/network-server.png +srv/web/ipfire/html/images/network-transmit-receive.png +srv/web/ipfire/html/images/network-transmit.png +srv/web/ipfire/html/images/network-wired.png +srv/web/ipfire/html/images/network-wireless-encrypted.png +srv/web/ipfire/html/images/network-wireless.png +srv/web/ipfire/html/images/network-workgroup.png +srv/web/ipfire/html/images/network.png +srv/web/ipfire/html/images/null.gif +srv/web/ipfire/html/images/off.gif +srv/web/ipfire/html/images/on.gif +srv/web/ipfire/html/images/openvpn.gif +srv/web/ipfire/html/images/openvpn.png +srv/web/ipfire/html/images/package-x-generic.png +srv/web/ipfire/html/images/printer-error.png +srv/web/ipfire/html/images/printer.png +srv/web/ipfire/html/images/process-stop.png +srv/web/ipfire/html/images/process-working.png +srv/web/ipfire/html/images/reload.gif +srv/web/ipfire/html/images/start-here.png +srv/web/ipfire/html/images/stock_down-16.png +srv/web/ipfire/html/images/stock_ok.png +srv/web/ipfire/html/images/stock_stop.png +srv/web/ipfire/html/images/stock_up-16.png +srv/web/ipfire/html/images/system-file-manager.png +srv/web/ipfire/html/images/system-installer.png +srv/web/ipfire/html/images/system-lock-screen.png +srv/web/ipfire/html/images/system-log-out.png +srv/web/ipfire/html/images/system-search.png +srv/web/ipfire/html/images/system-shutdown.png +srv/web/ipfire/html/images/system-software-update.png +srv/web/ipfire/html/images/system-users.png +srv/web/ipfire/html/images/tab-new.png +srv/web/ipfire/html/images/table-header.gif +srv/web/ipfire/html/images/text-html.png +srv/web/ipfire/html/images/text-x-generic-template.png +srv/web/ipfire/html/images/text-x-generic.png +srv/web/ipfire/html/images/text-x-script.png +srv/web/ipfire/html/images/tux.png +srv/web/ipfire/html/images/up.gif +srv/web/ipfire/html/images/updbooster +srv/web/ipfire/html/images/updbooster/updxl-globe.gif +srv/web/ipfire/html/images/updbooster/updxl-gr.gif +srv/web/ipfire/html/images/updbooster/updxl-led-blue.gif +srv/web/ipfire/html/images/updbooster/updxl-led-gray.gif +srv/web/ipfire/html/images/updbooster/updxl-led-green.gif +srv/web/ipfire/html/images/updbooster/updxl-led-red.gif +srv/web/ipfire/html/images/updbooster/updxl-led-yellow.gif +srv/web/ipfire/html/images/updbooster/updxl-rd.gif +srv/web/ipfire/html/images/updbooster/updxl-src-adobe.gif +srv/web/ipfire/html/images/updbooster/updxl-src-apple.gif +srv/web/ipfire/html/images/updbooster/updxl-src-avast.gif +srv/web/ipfire/html/images/updbooster/updxl-src-avg.gif +srv/web/ipfire/html/images/updbooster/updxl-src-avira.gif +srv/web/ipfire/html/images/updbooster/updxl-src-kaspersky.gif +srv/web/ipfire/html/images/updbooster/updxl-src-linux.gif +srv/web/ipfire/html/images/updbooster/updxl-src-microsoft.gif +srv/web/ipfire/html/images/updbooster/updxl-src-symantec.gif +srv/web/ipfire/html/images/updbooster/updxl-src-trendmicro.gif +srv/web/ipfire/html/images/updbooster/updxl-src-unknown.gif +srv/web/ipfire/html/images/updbooster/updxl-src-windows.gif +srv/web/ipfire/html/images/updbooster/updxl-yl.gif +srv/web/ipfire/html/images/urlfilter +srv/web/ipfire/html/images/urlfilter/1x1.gif +srv/web/ipfire/html/images/urlfilter/bg_cool_tux.jpg +srv/web/ipfire/html/images/urlfilter/bgcool.gif +srv/web/ipfire/html/images/urlfilter/copy.gif +srv/web/ipfire/html/images/urlfilter/gmg_tux_ip_fire.gif +srv/web/ipfire/html/images/urlfilter/led-green.gif +srv/web/ipfire/html/images/urlfilter/led-red.gif +srv/web/ipfire/html/images/user-home.png +srv/web/ipfire/html/images/user-multiple.png +srv/web/ipfire/html/images/user-option-add.png +srv/web/ipfire/html/images/user-option-remove.png +srv/web/ipfire/html/images/user-trash-full.png +srv/web/ipfire/html/images/user-trash.png +srv/web/ipfire/html/images/utilities-system-monitor.png +srv/web/ipfire/html/images/utilities-terminal.png +srv/web/ipfire/html/images/view-fullscreen.png +srv/web/ipfire/html/images/view-refresh.png +srv/web/ipfire/html/images/wakeup.gif +srv/web/ipfire/html/images/window-new.png +srv/web/ipfire/html/include +srv/web/ipfire/html/include/snortupdateutility.js +srv/web/ipfire/html/index.cgi +srv/web/ipfire/html/redirect-templates +srv/web/ipfire/html/redirect-templates/legacy +srv/web/ipfire/html/redirect-templates/legacy/template.html +srv/web/ipfire/html/redirect.cgi +srv/web/ipfire/html/themes +srv/web/ipfire/html/themes/darkdos +srv/web/ipfire/html/themes/darkdos/images +srv/web/ipfire/html/themes/darkdos/images/IPFire.png +srv/web/ipfire/html/themes/darkdos/images/b1.gif +srv/web/ipfire/html/themes/darkdos/images/b2.gif +srv/web/ipfire/html/themes/darkdos/images/b3.gif +srv/web/ipfire/html/themes/darkdos/images/b4.gif +srv/web/ipfire/html/themes/darkdos/images/b5.gif +srv/web/ipfire/html/themes/darkdos/images/b6.gif +srv/web/ipfire/html/themes/darkdos/images/spacer.gif +srv/web/ipfire/html/themes/darkdos/include +srv/web/ipfire/html/themes/darkdos/include/colors.txt +srv/web/ipfire/html/themes/darkdos/include/functions.pl +srv/web/ipfire/html/themes/darkdos/include/style.css +srv/web/ipfire/html/themes/ipfire +srv/web/ipfire/html/themes/ipfire-legacy +srv/web/ipfire/html/themes/ipfire-legacy/images +srv/web/ipfire/html/themes/ipfire-legacy/images/n1.gif +srv/web/ipfire/html/themes/ipfire-legacy/images/n2.gif +srv/web/ipfire/html/themes/ipfire-legacy/images/n3.gif +srv/web/ipfire/html/themes/ipfire-legacy/images/n4.gif +srv/web/ipfire/html/themes/ipfire-legacy/images/n5.gif +srv/web/ipfire/html/themes/ipfire-legacy/images/n6.gif +srv/web/ipfire/html/themes/ipfire-legacy/images/spacer.gif +srv/web/ipfire/html/themes/ipfire-legacy/include +srv/web/ipfire/html/themes/ipfire-legacy/include/colors.txt +srv/web/ipfire/html/themes/ipfire-legacy/include/functions.pl +srv/web/ipfire/html/themes/ipfire-legacy/include/style.css +srv/web/ipfire/html/themes/ipfire-rounded +srv/web/ipfire/html/themes/ipfire/images +srv/web/ipfire/html/themes/ipfire/images/n2.gif +srv/web/ipfire/html/themes/ipfire/images/n3.gif +srv/web/ipfire/html/themes/ipfire/images/n5.gif +srv/web/ipfire/html/themes/ipfire/images/n6.gif +srv/web/ipfire/html/themes/ipfire/images/tux2.png +srv/web/ipfire/html/themes/ipfire/include +srv/web/ipfire/html/themes/ipfire/include/colors.txt +srv/web/ipfire/html/themes/ipfire/include/css +srv/web/ipfire/html/themes/ipfire/include/css/style-rounded.css +srv/web/ipfire/html/themes/ipfire/include/css/style.css +srv/web/ipfire/html/themes/ipfire/include/functions.pl +srv/web/ipfire/html/themes/ipfire/include/js +srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js +srv/web/ipfire/html/themes/maniac +srv/web/ipfire/html/themes/maniac/images +srv/web/ipfire/html/themes/maniac/images/IPFire.png +srv/web/ipfire/html/themes/maniac/images/Thumbs.db +srv/web/ipfire/html/themes/maniac/images/b1.gif +srv/web/ipfire/html/themes/maniac/images/b2.gif +srv/web/ipfire/html/themes/maniac/images/b3.gif +srv/web/ipfire/html/themes/maniac/images/b4.gif +srv/web/ipfire/html/themes/maniac/images/b5.gif +srv/web/ipfire/html/themes/maniac/images/b6.gif +srv/web/ipfire/html/themes/maniac/images/spacer.gif +srv/web/ipfire/html/themes/maniac/include +srv/web/ipfire/html/themes/maniac/include/colors.txt +srv/web/ipfire/html/themes/maniac/include/functions.pl +srv/web/ipfire/html/themes/maniac/include/style.css +var/updatecache +var/updatecache/download +var/updatecache/metadata hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5ea73f56601411d842456243fc88bdde8834742c
by git＠ipfire.org 05 May '15

05 May '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 5ea73f56601411d842456243fc88bdde8834742c (commit) from 39889f8a0b4cc0e8494acc6ddaec8fa42f1baa93 (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 5ea73f56601411d842456243fc88bdde8834742c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue May 5 22:34:30 2015 +0200 dracut: add sdhci-pci module to initrd. fixes #10792 ----------------------------------------------------------------------- Summary of changes: lfs/dracut | 1 + src/patches/dracut-038_add_sdhci-pci.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 src/patches/dracut-038_add_sdhci-pci.patch Difference in files: diff --git a/lfs/dracut b/lfs/dracut index fef3ad7..97d12f3 100644 --- a/lfs/dracut +++ b/lfs/dracut @@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dracut-038-always-enable-mdraid.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dracut-038_add_sdhci-pci.patch cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install sbindir=/sbin sysconfdir=/etc diff --git a/src/patches/dracut-038_add_sdhci-pci.patch b/src/patches/dracut-038_add_sdhci-pci.patch new file mode 100644 index 0000000..b002246 --- /dev/null +++ b/src/patches/dracut-038_add_sdhci-pci.patch @@ -0,0 +1,12 @@ +diff -Naur dracut-038.org/modules.d/90kernel-modules/module-setup.sh dracut-038/modules.d/90kernel-modules/module-setup.sh +--- dracut-038.org/modules.d/90kernel-modules/module-setup.sh 2014-06-30 12:03:12.000000000 +0200 ++++ dracut-038/modules.d/90kernel-modules/module-setup.sh 2015-05-05 14:58:56.820197839 +0200 +@@ -47,7 +47,7 @@ + atkbd i8042 usbhid hid-apple hid-sunplus hid-cherry hid-logitech \ + hid-logitech-dj hid-microsoft firewire-ohci \ + pcmcia usb_storage nvme hid-hyperv hv-vmbus \ +- sdhci_acpi ++ sdhci_acpi sdhci_pci + + if [[ "$(uname -p)" == arm* ]]; then + # arm specific modules hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 39889f8a0b4cc0e8494acc6ddaec8fa42f1baa93
by git＠ipfire.org 05 May '15

05 May '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 39889f8a0b4cc0e8494acc6ddaec8fa42f1baa93 (commit) via e1c540b08eb637ee26fd18696920a603a085ccbd (commit) via b33e050763f5c752aadedc62c4da75f3392aca25 (commit) via f63cb53f4aa6b049e01aad78a724c9b5dca1a42a (commit) via 359efc4bfd201a2972387b30c93372541d56feab (commit) from afdf1483887e7c31567ed4469b3b9922d213e295 (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 39889f8a0b4cc0e8494acc6ddaec8fa42f1baa93 Merge: afdf148 e1c540b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 5 20:20:29 2015 +0200 Merge remote-tracking branch 'stevee/next' into next commit e1c540b08eb637ee26fd18696920a603a085ccbd Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon May 4 20:19:19 2015 +0200 Core 90: Add modified cgi files for firewall log statistics. commit b33e050763f5c752aadedc62c4da75f3392aca25 Merge: f63cb53 dfbee17 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon May 4 20:16:24 2015 +0200 Merge remote-tracking branch 'stevee/next-cgi-geoip' into next commit f63cb53f4aa6b049e01aad78a724c9b5dca1a42a Merge: 359efc4 b59da37 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon May 4 20:15:24 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 359efc4bfd201a2972387b30c93372541d56feab Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon May 4 20:10:46 2015 +0200 Core90: Drop old and add new flag-icons. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/90/filelists/flag-icons | 1 + config/rootfiles/core/90/update.sh | 3 +++ 2 files changed, 4 insertions(+) create mode 120000 config/rootfiles/core/90/filelists/flag-icons Difference in files: diff --git a/config/rootfiles/core/90/filelists/flag-icons b/config/rootfiles/core/90/filelists/flag-icons new file mode 120000 index 0000000..8776b6b --- /dev/null +++ b/config/rootfiles/core/90/filelists/flag-icons @@ -0,0 +1 @@ +../../../common/flag-icons \ No newline at end of file diff --git a/config/rootfiles/core/90/update.sh b/config/rootfiles/core/90/update.sh index 68798cb..1e0a548 100644 --- a/config/rootfiles/core/90/update.sh +++ b/config/rootfiles/core/90/update.sh @@ -132,6 +132,9 @@ esac /etc/init.d/ipsec stop /etc/init.d/apache stop +# Drop old flag icons, before extracting the new ones. +rm /srv/web/ipfire/html/images/flags/* + # #Extract files tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. afdf1483887e7c31567ed4469b3b9922d213e295
by git＠ipfire.org 05 May '15

05 May '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via afdf1483887e7c31567ed4469b3b9922d213e295 (commit) via 6e609c0d20716604eabd84361845d72d17b139dc (commit) via 242694089f1a666b5cfcabbeb17440a2d8e54409 (commit) via a8440dab51dc24fb990cbdde82472018b76a13ba (commit) via dfbee171cc3ee4d05958a5a35bacaa68b7a4445d (commit) via f28a284c33a77cbbe06fa63480eb559877906c26 (commit) via 97a5baac82620e31e3446a276e3eb94b43418ff8 (commit) via 3ea01fe042cfb1619415aed3e69bc700dd48ad53 (commit) from b59da37ee2e5755c93645271ff810d284a014d35 (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 afdf1483887e7c31567ed4469b3b9922d213e295 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 5 14:00:20 2015 +0200 Split web-user-interface from apache2 LFS file It is completely unnecssary to have this in one file and using options for the LFS is more of a hack than a solution. commit 6e609c0d20716604eabd84361845d72d17b139dc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 5 12:19:11 2015 +0200 core90: Ship updated CGI files commit 242694089f1a666b5cfcabbeb17440a2d8e54409 Merge: a8440da dfbee17 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 5 12:16:58 2015 +0200 Merge remote-tracking branch 'stevee/next-cgi-geoip' into next commit a8440dab51dc24fb990cbdde82472018b76a13ba Merge: b59da37 f28a284 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 5 12:15:55 2015 +0200 Merge remote-tracking branch 'stevee/next-flag-icons' into next commit dfbee171cc3ee4d05958a5a35bacaa68b7a4445d Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Mon May 4 20:13:52 2015 +0200 geoip-functions: Adjust for new flag-icons and usage of "unknown" icon. commit f28a284c33a77cbbe06fa63480eb559877906c26 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun May 3 21:53:03 2015 +0200 Drop old flag icons. commit 97a5baac82620e31e3446a276e3eb94b43418ff8 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun May 3 21:51:04 2015 +0200 Update flag icon-set. Move the flag icon-set into an own lfs file and replace the current used one by a more recent version. commit 3ea01fe042cfb1619415aed3e69bc700dd48ad53 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sat May 2 13:45:50 2015 +0200 Multiple CGI's: Use &GeoIP::get_flag_icon for getting country flags. ----------------------------------------------------------------------- Summary of changes: config/cfgroot/geoip-functions.pl | 19 ++- config/httpd/httpd.conf | 3 +- config/rootfiles/common/apache2 | 90 ++-------- config/rootfiles/common/flag-icons | 243 +++++++++++++++++++++++++++ config/rootfiles/core/90/filelists/files | 3 + html/cgi-bin/country.cgi | 9 +- html/cgi-bin/logs.cgi/firewalllog.dat | 14 +- html/cgi-bin/logs.cgi/firewalllogcountry.dat | 15 +- html/cgi-bin/logs.cgi/firewalllogip.dat | 21 ++- html/html/images/flags/ad.png | Bin 570 -> 0 bytes html/html/images/flags/ae.png | Bin 411 -> 0 bytes html/html/images/flags/af.png | Bin 594 -> 0 bytes html/html/images/flags/ag.png | Bin 670 -> 0 bytes html/html/images/flags/ai.png | Bin 670 -> 0 bytes html/html/images/flags/al.png | Bin 572 -> 0 bytes html/html/images/flags/am.png | Bin 574 -> 0 bytes html/html/images/flags/an.png | Bin 578 -> 0 bytes html/html/images/flags/ao.png | Bin 588 -> 0 bytes html/html/images/flags/aq.png | Bin 610 -> 0 bytes html/html/images/flags/ar.png | Bin 578 -> 0 bytes html/html/images/flags/as.png | Bin 653 -> 0 bytes html/html/images/flags/at.png | Bin 551 -> 0 bytes html/html/images/flags/au.png | Bin 634 -> 0 bytes html/html/images/flags/aw.png | Bin 573 -> 0 bytes html/html/images/flags/az.png | Bin 603 -> 0 bytes html/html/images/flags/ba.png | Bin 619 -> 0 bytes html/html/images/flags/bb.png | Bin 574 -> 0 bytes html/html/images/flags/bd.png | Bin 572 -> 0 bytes html/html/images/flags/be.png | Bin 534 -> 0 bytes html/html/images/flags/bf.png | Bin 568 -> 0 bytes html/html/images/flags/bg.png | Bin 555 -> 0 bytes html/html/images/flags/bh.png | Bin 514 -> 0 bytes html/html/images/flags/bi.png | Bin 668 -> 0 bytes html/html/images/flags/bj.png | Bin 544 -> 0 bytes html/html/images/flags/bm.png | Bin 615 -> 0 bytes html/html/images/flags/bn.png | Bin 633 -> 0 bytes html/html/images/flags/bo.png | Bin 583 -> 0 bytes html/html/images/flags/br.png | Bin 665 -> 0 bytes html/html/images/flags/bs.png | Bin 606 -> 0 bytes html/html/images/flags/bt.png | Bin 614 -> 0 bytes html/html/images/flags/bv.png | Bin 604 -> 0 bytes html/html/images/flags/bw.png | Bin 566 -> 0 bytes html/html/images/flags/by.png | Bin 556 -> 0 bytes html/html/images/flags/bz.png | Bin 618 -> 0 bytes html/html/images/flags/ca.png | Bin 606 -> 0 bytes html/html/images/flags/cc.png | Bin 668 -> 0 bytes html/html/images/flags/cd.png | Bin 608 -> 0 bytes html/html/images/flags/cf.png | Bin 611 -> 0 bytes html/html/images/flags/cg.png | Bin 558 -> 0 bytes html/html/images/flags/ch.png | Bin 581 -> 0 bytes html/html/images/flags/ci.png | Bin 533 -> 0 bytes html/html/images/flags/ck.png | Bin 606 -> 0 bytes html/html/images/flags/cl.png | Bin 481 -> 0 bytes html/html/images/flags/cm.png | Bin 548 -> 0 bytes html/html/images/flags/cn.png | Bin 482 -> 0 bytes html/html/images/flags/co.png | Bin 573 -> 0 bytes html/html/images/flags/cr.png | Bin 593 -> 0 bytes html/html/images/flags/cs.png | Bin 442 -> 0 bytes html/html/images/flags/cu.png | Bin 624 -> 0 bytes html/html/images/flags/cv.png | Bin 603 -> 0 bytes html/html/images/flags/cx.png | Bin 627 -> 0 bytes html/html/images/flags/cy.png | Bin 564 -> 0 bytes html/html/images/flags/cz.png | Bin 582 -> 0 bytes html/html/images/flags/de.png | Bin 540 -> 0 bytes html/html/images/flags/dj.png | Bin 509 -> 0 bytes html/html/images/flags/dk.png | Bin 562 -> 0 bytes html/html/images/flags/dm.png | Bin 681 -> 0 bytes html/html/images/flags/do.png | Bin 607 -> 0 bytes html/html/images/flags/dz.png | Bin 568 -> 0 bytes html/html/images/flags/ec.png | Bin 607 -> 0 bytes html/html/images/flags/ee.png | Bin 543 -> 0 bytes html/html/images/flags/eg.png | Bin 559 -> 0 bytes html/html/images/flags/eh.png | Bin 552 -> 0 bytes html/html/images/flags/er.png | Bin 606 -> 0 bytes html/html/images/flags/es.png | Bin 589 -> 0 bytes html/html/images/flags/et.png | Bin 607 -> 0 bytes html/html/images/flags/eu.png | Bin 632 -> 0 bytes html/html/images/flags/fi.png | Bin 569 -> 0 bytes html/html/images/flags/fj.png | Bin 612 -> 0 bytes html/html/images/flags/fk.png | Bin 684 -> 0 bytes html/html/images/flags/fm.png | Bin 572 -> 0 bytes html/html/images/flags/fo.png | Bin 583 -> 0 bytes html/html/images/flags/fr.png | Bin 522 -> 0 bytes html/html/images/flags/ga.png | Bin 580 -> 0 bytes html/html/images/flags/gb.png | Bin 679 -> 0 bytes html/html/images/flags/gd.png | Bin 599 -> 0 bytes html/html/images/flags/ge.png | Bin 495 -> 0 bytes html/html/images/flags/gf.png | Bin 514 -> 0 bytes html/html/images/flags/gh.png | Bin 456 -> 0 bytes html/html/images/flags/gi.png | Bin 561 -> 0 bytes html/html/images/flags/gl.png | Bin 574 -> 0 bytes html/html/images/flags/gm.png | Bin 457 -> 0 bytes html/html/images/flags/gn.png | Bin 543 -> 0 bytes html/html/images/flags/gp.png | Bin 577 -> 0 bytes html/html/images/flags/gq.png | Bin 585 -> 0 bytes html/html/images/flags/gr.png | Bin 585 -> 0 bytes html/html/images/flags/gs.png | Bin 661 -> 0 bytes html/html/images/flags/gt.png | Bin 595 -> 0 bytes html/html/images/flags/gu.png | Bin 579 -> 0 bytes html/html/images/flags/gw.png | Bin 461 -> 0 bytes html/html/images/flags/gy.png | Bin 535 -> 0 bytes html/html/images/flags/hk.png | Bin 609 -> 0 bytes html/html/images/flags/hm.png | Bin 651 -> 0 bytes html/html/images/flags/hn.png | Bin 578 -> 0 bytes html/html/images/flags/hr.png | Bin 604 -> 0 bytes html/html/images/flags/ht.png | Bin 587 -> 0 bytes html/html/images/flags/hu.png | Bin 552 -> 0 bytes html/html/images/flags/id.png | Bin 535 -> 0 bytes html/html/images/flags/ie.png | Bin 518 -> 0 bytes html/html/images/flags/il.png | Bin 590 -> 0 bytes html/html/images/flags/in.png | Bin 578 -> 0 bytes html/html/images/flags/io.png | Bin 760 -> 0 bytes html/html/images/flags/iq.png | Bin 583 -> 0 bytes html/html/images/flags/ir.png | Bin 573 -> 0 bytes html/html/images/flags/is.png | Bin 608 -> 0 bytes html/html/images/flags/it.png | Bin 504 -> 0 bytes html/html/images/flags/jm.png | Bin 663 -> 0 bytes html/html/images/flags/jo.png | Bin 597 -> 0 bytes html/html/images/flags/jp.png | Bin 556 -> 0 bytes html/html/images/flags/ke.png | Bin 614 -> 0 bytes html/html/images/flags/kg.png | Bin 563 -> 0 bytes html/html/images/flags/kh.png | Bin 606 -> 0 bytes html/html/images/flags/ki.png | Bin 608 -> 0 bytes html/html/images/flags/km.png | Bin 562 -> 0 bytes html/html/images/flags/kn.png | Bin 611 -> 0 bytes html/html/images/flags/kp.png | Bin 624 -> 0 bytes html/html/images/flags/kr.png | Bin 611 -> 0 bytes html/html/images/flags/kw.png | Bin 456 -> 0 bytes html/html/images/flags/ky.png | Bin 605 -> 0 bytes html/html/images/flags/kz.png | Bin 603 -> 0 bytes html/html/images/flags/la.png | Bin 528 -> 0 bytes html/html/images/flags/lb.png | Bin 594 -> 0 bytes html/html/images/flags/lc.png | Bin 613 -> 0 bytes html/html/images/flags/li.png | Bin 481 -> 0 bytes html/html/images/flags/lk.png | Bin 599 -> 0 bytes html/html/images/flags/lr.png | Bin 567 -> 0 bytes html/html/images/flags/ls.png | Bin 668 -> 0 bytes html/html/images/flags/lt.png | Bin 531 -> 0 bytes html/html/images/flags/lu.png | Bin 554 -> 0 bytes html/html/images/flags/lv.png | Bin 565 -> 0 bytes html/html/images/flags/ly.png | Bin 463 -> 0 bytes html/html/images/flags/ma.png | Bin 527 -> 0 bytes html/html/images/flags/mc.png | Bin 519 -> 0 bytes html/html/images/flags/md.png | Bin 577 -> 0 bytes html/html/images/flags/mg.png | Bin 548 -> 0 bytes html/html/images/flags/mh.png | Bin 680 -> 0 bytes html/html/images/flags/mk.png | Bin 657 -> 0 bytes html/html/images/flags/ml.png | Bin 436 -> 0 bytes html/html/images/flags/mm.png | Bin 528 -> 0 bytes html/html/images/flags/mn.png | Bin 560 -> 0 bytes html/html/images/flags/mo.png | Bin 590 -> 0 bytes html/html/images/flags/mp.png | Bin 623 -> 0 bytes html/html/images/flags/mq.png | Bin 514 -> 0 bytes html/html/images/flags/mr.png | Bin 510 -> 0 bytes html/html/images/flags/ms.png | Bin 617 -> 0 bytes html/html/images/flags/mt.png | Bin 497 -> 0 bytes html/html/images/flags/mu.png | Bin 419 -> 0 bytes html/html/images/flags/mv.png | Bin 591 -> 0 bytes html/html/images/flags/mw.png | Bin 463 -> 0 bytes html/html/images/flags/mx.png | Bin 606 -> 0 bytes html/html/images/flags/my.png | Bin 597 -> 0 bytes html/html/images/flags/mz.png | Bin 602 -> 0 bytes html/html/images/flags/na.png | Bin 653 -> 0 bytes html/html/images/flags/nc.png | Bin 621 -> 0 bytes html/html/images/flags/ne.png | Bin 527 -> 0 bytes html/html/images/flags/nf.png | Bin 583 -> 0 bytes html/html/images/flags/ng.png | Bin 513 -> 0 bytes html/html/images/flags/ni.png | Bin 524 -> 0 bytes html/html/images/flags/nl.png | Bin 554 -> 0 bytes html/html/images/flags/no.png | Bin 615 -> 0 bytes html/html/images/flags/np.png | Bin 531 -> 0 bytes html/html/images/flags/nr.png | Bin 578 -> 0 bytes html/html/images/flags/nu.png | Bin 531 -> 0 bytes html/html/images/flags/nz.png | Bin 606 -> 0 bytes html/html/images/flags/om.png | Bin 551 -> 0 bytes html/html/images/flags/pa.png | Bin 587 -> 0 bytes html/html/images/flags/pe.png | Bin 583 -> 0 bytes html/html/images/flags/pf.png | Bin 606 -> 0 bytes html/html/images/flags/pg.png | Bin 557 -> 0 bytes html/html/images/flags/ph.png | Bin 606 -> 0 bytes html/html/images/flags/pk.png | Bin 616 -> 0 bytes html/html/images/flags/pl.png | Bin 514 -> 0 bytes html/html/images/flags/pm.png | Bin 653 -> 0 bytes html/html/images/flags/pn.png | Bin 693 -> 0 bytes html/html/images/flags/pr.png | Bin 607 -> 0 bytes html/html/images/flags/ps.png | Bin 481 -> 0 bytes html/html/images/flags/pt.png | Bin 573 -> 0 bytes html/html/images/flags/pw.png | Bin 571 -> 0 bytes html/html/images/flags/py.png | Bin 579 -> 0 bytes html/html/images/flags/qa.png | Bin 520 -> 0 bytes html/html/images/flags/re.png | Bin 514 -> 0 bytes html/html/images/flags/ro.png | Bin 542 -> 0 bytes html/html/images/flags/ru.png | Bin 550 -> 0 bytes html/html/images/flags/rw.png | Bin 471 -> 0 bytes html/html/images/flags/sa.png | Bin 558 -> 0 bytes html/html/images/flags/sb.png | Bin 637 -> 0 bytes html/html/images/flags/sc.png | Bin 646 -> 0 bytes html/html/images/flags/sd.png | Bin 579 -> 0 bytes html/html/images/flags/se.png | Bin 608 -> 0 bytes html/html/images/flags/sg.png | Bin 557 -> 0 bytes html/html/images/flags/sh.png | Bin 632 -> 0 bytes html/html/images/flags/si.png | Bin 576 -> 0 bytes html/html/images/flags/sj.png | Bin 604 -> 0 bytes html/html/images/flags/sk.png | Bin 596 -> 0 bytes html/html/images/flags/sl.png | Bin 560 -> 0 bytes html/html/images/flags/sm.png | Bin 591 -> 0 bytes html/html/images/flags/sn.png | Bin 494 -> 0 bytes html/html/images/flags/so.png | Bin 558 -> 0 bytes html/html/images/flags/sr.png | Bin 525 -> 0 bytes html/html/images/flags/st.png | Bin 526 -> 0 bytes html/html/images/flags/sv.png | Bin 543 -> 0 bytes html/html/images/flags/sy.png | Bin 448 -> 0 bytes html/html/images/flags/sz.png | Bin 723 -> 0 bytes html/html/images/flags/tc.png | Bin 609 -> 0 bytes html/html/images/flags/td.png | Bin 560 -> 0 bytes html/html/images/flags/tf.png | Bin 548 -> 0 bytes html/html/images/flags/tg.png | Bin 596 -> 0 bytes html/html/images/flags/th.png | Bin 574 -> 0 bytes html/html/images/flags/tj.png | Bin 524 -> 0 bytes html/html/images/flags/tk.png | Bin 685 -> 0 bytes html/html/images/flags/tl.png | Bin 520 -> 0 bytes html/html/images/flags/tm.png | Bin 548 -> 0 bytes html/html/images/flags/tn.png | Bin 601 -> 0 bytes html/html/images/flags/to.png | Bin 543 -> 0 bytes html/html/images/flags/tp.png | Bin 582 -> 0 bytes html/html/images/flags/tr.png | Bin 551 -> 0 bytes html/html/images/flags/tt.png | Bin 664 -> 0 bytes html/html/images/flags/tv.png | Bin 606 -> 0 bytes html/html/images/flags/tw.png | Bin 525 -> 0 bytes html/html/images/flags/tz.png | Bin 621 -> 0 bytes html/html/images/flags/ua.png | Bin 551 -> 0 bytes html/html/images/flags/ug.png | Bin 607 -> 0 bytes html/html/images/flags/um.png | Bin 599 -> 0 bytes html/html/images/flags/us.png | Bin 570 -> 0 bytes html/html/images/flags/uy.png | Bin 560 -> 0 bytes html/html/images/flags/uz.png | Bin 536 -> 0 bytes html/html/images/flags/va.png | Bin 574 -> 0 bytes html/html/images/flags/vc.png | Bin 548 -> 0 bytes html/html/images/flags/ve.png | Bin 579 -> 0 bytes html/html/images/flags/vg.png | Bin 613 -> 0 bytes html/html/images/flags/vi.png | Bin 646 -> 0 bytes html/html/images/flags/vn.png | Bin 566 -> 0 bytes html/html/images/flags/vu.png | Bin 572 -> 0 bytes html/html/images/flags/wf.png | Bin 514 -> 0 bytes html/html/images/flags/ws.png | Bin 537 -> 0 bytes html/html/images/flags/ye.png | Bin 543 -> 0 bytes html/html/images/flags/yt.png | Bin 514 -> 0 bytes html/html/images/flags/yu.png | Bin 567 -> 0 bytes html/html/images/flags/za.png | Bin 662 -> 0 bytes html/html/images/flags/zm.png | Bin 525 -> 0 bytes html/html/images/flags/zw.png | Bin 618 -> 0 bytes lfs/apache2 | 39 +---- lfs/{fuse => flag-icons} | 32 ++-- lfs/{guardian => web-user-interface} | 51 +++--- make.sh | 3 +- 255 files changed, 379 insertions(+), 163 deletions(-) create mode 100644 config/rootfiles/common/flag-icons delete mode 100644 html/html/images/flags/ad.png delete mode 100644 html/html/images/flags/ae.png delete mode 100644 html/html/images/flags/af.png delete mode 100644 html/html/images/flags/ag.png delete mode 100644 html/html/images/flags/ai.png delete mode 100644 html/html/images/flags/al.png delete mode 100644 html/html/images/flags/am.png delete mode 100644 html/html/images/flags/an.png delete mode 100644 html/html/images/flags/ao.png delete mode 100644 html/html/images/flags/aq.png delete mode 100644 html/html/images/flags/ar.png delete mode 100644 html/html/images/flags/as.png delete mode 100644 html/html/images/flags/at.png delete mode 100644 html/html/images/flags/au.png delete mode 100644 html/html/images/flags/aw.png delete mode 100644 html/html/images/flags/az.png delete mode 100644 html/html/images/flags/ba.png delete mode 100644 html/html/images/flags/bb.png delete mode 100644 html/html/images/flags/bd.png delete mode 100644 html/html/images/flags/be.png delete mode 100644 html/html/images/flags/bf.png delete mode 100644 html/html/images/flags/bg.png delete mode 100644 html/html/images/flags/bh.png delete mode 100644 html/html/images/flags/bi.png delete mode 100644 html/html/images/flags/bj.png delete mode 100644 html/html/images/flags/bm.png delete mode 100644 html/html/images/flags/bn.png delete mode 100644 html/html/images/flags/bo.png delete mode 100644 html/html/images/flags/br.png delete mode 100644 html/html/images/flags/bs.png delete mode 100644 html/html/images/flags/bt.png delete mode 100644 html/html/images/flags/bv.png delete mode 100644 html/html/images/flags/bw.png delete mode 100644 html/html/images/flags/by.png delete mode 100644 html/html/images/flags/bz.png delete mode 100644 html/html/images/flags/ca.png delete mode 100644 html/html/images/flags/cc.png delete mode 100644 html/html/images/flags/cd.png delete mode 100644 html/html/images/flags/cf.png delete mode 100644 html/html/images/flags/cg.png delete mode 100644 html/html/images/flags/ch.png delete mode 100644 html/html/images/flags/ci.png delete mode 100644 html/html/images/flags/ck.png delete mode 100644 html/html/images/flags/cl.png delete mode 100644 html/html/images/flags/cm.png delete mode 100644 html/html/images/flags/cn.png delete mode 100644 html/html/images/flags/co.png delete mode 100644 html/html/images/flags/cr.png delete mode 100644 html/html/images/flags/cs.png delete mode 100644 html/html/images/flags/cu.png delete mode 100644 html/html/images/flags/cv.png delete mode 100644 html/html/images/flags/cx.png delete mode 100644 html/html/images/flags/cy.png delete mode 100644 html/html/images/flags/cz.png delete mode 100644 html/html/images/flags/de.png delete mode 100644 html/html/images/flags/dj.png delete mode 100644 html/html/images/flags/dk.png delete mode 100644 html/html/images/flags/dm.png delete mode 100644 html/html/images/flags/do.png delete mode 100644 html/html/images/flags/dz.png delete mode 100644 html/html/images/flags/ec.png delete mode 100644 html/html/images/flags/ee.png delete mode 100644 html/html/images/flags/eg.png delete mode 100644 html/html/images/flags/eh.png delete mode 100644 html/html/images/flags/er.png delete mode 100644 html/html/images/flags/es.png delete mode 100644 html/html/images/flags/et.png delete mode 100644 html/html/images/flags/eu.png delete mode 100644 html/html/images/flags/fi.png delete mode 100644 html/html/images/flags/fj.png delete mode 100644 html/html/images/flags/fk.png delete mode 100644 html/html/images/flags/fm.png delete mode 100644 html/html/images/flags/fo.png delete mode 100644 html/html/images/flags/fr.png delete mode 100644 html/html/images/flags/ga.png delete mode 100644 html/html/images/flags/gb.png delete mode 100644 html/html/images/flags/gd.png delete mode 100644 html/html/images/flags/ge.png delete mode 100644 html/html/images/flags/gf.png delete mode 100644 html/html/images/flags/gh.png delete mode 100644 html/html/images/flags/gi.png delete mode 100644 html/html/images/flags/gl.png delete mode 100644 html/html/images/flags/gm.png delete mode 100644 html/html/images/flags/gn.png delete mode 100644 html/html/images/flags/gp.png delete mode 100644 html/html/images/flags/gq.png delete mode 100644 html/html/images/flags/gr.png delete mode 100644 html/html/images/flags/gs.png delete mode 100644 html/html/images/flags/gt.png delete mode 100644 html/html/images/flags/gu.png delete mode 100644 html/html/images/flags/gw.png delete mode 100644 html/html/images/flags/gy.png delete mode 100644 html/html/images/flags/hk.png delete mode 100644 html/html/images/flags/hm.png delete mode 100644 html/html/images/flags/hn.png delete mode 100644 html/html/images/flags/hr.png delete mode 100644 html/html/images/flags/ht.png delete mode 100644 html/html/images/flags/hu.png delete mode 100644 html/html/images/flags/id.png delete mode 100644 html/html/images/flags/ie.png delete mode 100644 html/html/images/flags/il.png delete mode 100644 html/html/images/flags/in.png delete mode 100644 html/html/images/flags/io.png delete mode 100644 html/html/images/flags/iq.png delete mode 100644 html/html/images/flags/ir.png delete mode 100644 html/html/images/flags/is.png delete mode 100644 html/html/images/flags/it.png delete mode 100644 html/html/images/flags/jm.png delete mode 100644 html/html/images/flags/jo.png delete mode 100644 html/html/images/flags/jp.png delete mode 100644 html/html/images/flags/ke.png delete mode 100644 html/html/images/flags/kg.png delete mode 100644 html/html/images/flags/kh.png delete mode 100644 html/html/images/flags/ki.png delete mode 100644 html/html/images/flags/km.png delete mode 100644 html/html/images/flags/kn.png delete mode 100644 html/html/images/flags/kp.png delete mode 100644 html/html/images/flags/kr.png delete mode 100644 html/html/images/flags/kw.png delete mode 100644 html/html/images/flags/ky.png delete mode 100644 html/html/images/flags/kz.png delete mode 100644 html/html/images/flags/la.png delete mode 100644 html/html/images/flags/lb.png delete mode 100644 html/html/images/flags/lc.png delete mode 100644 html/html/images/flags/li.png delete mode 100644 html/html/images/flags/lk.png delete mode 100644 html/html/images/flags/lr.png delete mode 100644 html/html/images/flags/ls.png delete mode 100644 html/html/images/flags/lt.png delete mode 100644 html/html/images/flags/lu.png delete mode 100644 html/html/images/flags/lv.png delete mode 100644 html/html/images/flags/ly.png delete mode 100644 html/html/images/flags/ma.png delete mode 100644 html/html/images/flags/mc.png delete mode 100644 html/html/images/flags/md.png delete mode 100644 html/html/images/flags/mg.png delete mode 100644 html/html/images/flags/mh.png delete mode 100644 html/html/images/flags/mk.png delete mode 100644 html/html/images/flags/ml.png delete mode 100644 html/html/images/flags/mm.png delete mode 100644 html/html/images/flags/mn.png delete mode 100644 html/html/images/flags/mo.png delete mode 100644 html/html/images/flags/mp.png delete mode 100644 html/html/images/flags/mq.png delete mode 100644 html/html/images/flags/mr.png delete mode 100644 html/html/images/flags/ms.png delete mode 100644 html/html/images/flags/mt.png delete mode 100644 html/html/images/flags/mu.png delete mode 100644 html/html/images/flags/mv.png delete mode 100644 html/html/images/flags/mw.png delete mode 100644 html/html/images/flags/mx.png delete mode 100644 html/html/images/flags/my.png delete mode 100644 html/html/images/flags/mz.png delete mode 100644 html/html/images/flags/na.png delete mode 100644 html/html/images/flags/nc.png delete mode 100644 html/html/images/flags/ne.png delete mode 100644 html/html/images/flags/nf.png delete mode 100644 html/html/images/flags/ng.png delete mode 100644 html/html/images/flags/ni.png delete mode 100644 html/html/images/flags/nl.png delete mode 100644 html/html/images/flags/no.png delete mode 100644 html/html/images/flags/np.png delete mode 100644 html/html/images/flags/nr.png delete mode 100644 html/html/images/flags/nu.png delete mode 100644 html/html/images/flags/nz.png delete mode 100644 html/html/images/flags/om.png delete mode 100644 html/html/images/flags/pa.png delete mode 100644 html/html/images/flags/pe.png delete mode 100644 html/html/images/flags/pf.png delete mode 100644 html/html/images/flags/pg.png delete mode 100644 html/html/images/flags/ph.png delete mode 100644 html/html/images/flags/pk.png delete mode 100644 html/html/images/flags/pl.png delete mode 100644 html/html/images/flags/pm.png delete mode 100644 html/html/images/flags/pn.png delete mode 100644 html/html/images/flags/pr.png delete mode 100644 html/html/images/flags/ps.png delete mode 100644 html/html/images/flags/pt.png delete mode 100644 html/html/images/flags/pw.png delete mode 100644 html/html/images/flags/py.png delete mode 100644 html/html/images/flags/qa.png delete mode 100644 html/html/images/flags/re.png delete mode 100644 html/html/images/flags/ro.png delete mode 100644 html/html/images/flags/ru.png delete mode 100644 html/html/images/flags/rw.png delete mode 100644 html/html/images/flags/sa.png delete mode 100644 html/html/images/flags/sb.png delete mode 100644 html/html/images/flags/sc.png delete mode 100644 html/html/images/flags/sd.png delete mode 100644 html/html/images/flags/se.png delete mode 100644 html/html/images/flags/sg.png delete mode 100644 html/html/images/flags/sh.png delete mode 100644 html/html/images/flags/si.png delete mode 100644 html/html/images/flags/sj.png delete mode 100644 html/html/images/flags/sk.png delete mode 100644 html/html/images/flags/sl.png delete mode 100644 html/html/images/flags/sm.png delete mode 100644 html/html/images/flags/sn.png delete mode 100644 html/html/images/flags/so.png delete mode 100644 html/html/images/flags/sr.png delete mode 100644 html/html/images/flags/st.png delete mode 100644 html/html/images/flags/sv.png delete mode 100644 html/html/images/flags/sy.png delete mode 100644 html/html/images/flags/sz.png delete mode 100644 html/html/images/flags/tc.png delete mode 100644 html/html/images/flags/td.png delete mode 100644 html/html/images/flags/tf.png delete mode 100644 html/html/images/flags/tg.png delete mode 100644 html/html/images/flags/th.png delete mode 100644 html/html/images/flags/tj.png delete mode 100644 html/html/images/flags/tk.png delete mode 100644 html/html/images/flags/tl.png delete mode 100644 html/html/images/flags/tm.png delete mode 100644 html/html/images/flags/tn.png delete mode 100644 html/html/images/flags/to.png delete mode 100644 html/html/images/flags/tp.png delete mode 100644 html/html/images/flags/tr.png delete mode 100644 html/html/images/flags/tt.png delete mode 100644 html/html/images/flags/tv.png delete mode 100644 html/html/images/flags/tw.png delete mode 100644 html/html/images/flags/tz.png delete mode 100644 html/html/images/flags/ua.png delete mode 100644 html/html/images/flags/ug.png delete mode 100644 html/html/images/flags/um.png delete mode 100644 html/html/images/flags/us.png delete mode 100644 html/html/images/flags/uy.png delete mode 100644 html/html/images/flags/uz.png delete mode 100644 html/html/images/flags/va.png delete mode 100644 html/html/images/flags/vc.png delete mode 100644 html/html/images/flags/ve.png delete mode 100644 html/html/images/flags/vg.png delete mode 100644 html/html/images/flags/vi.png delete mode 100644 html/html/images/flags/vn.png delete mode 100644 html/html/images/flags/vu.png delete mode 100644 html/html/images/flags/wf.png delete mode 100644 html/html/images/flags/ws.png delete mode 100644 html/html/images/flags/ye.png delete mode 100644 html/html/images/flags/yt.png delete mode 100644 html/html/images/flags/yu.png delete mode 100644 html/html/images/flags/za.png delete mode 100644 html/html/images/flags/zm.png delete mode 100644 html/html/images/flags/zw.png copy lfs/{fuse => flag-icons} (79%) copy lfs/{guardian => web-user-interface} (69%) Difference in files: diff --git a/config/cfgroot/geoip-functions.pl b/config/cfgroot/geoip-functions.pl index 85a8dc8..fc2dfdd 100644 --- a/config/cfgroot/geoip-functions.pl +++ b/config/cfgroot/geoip-functions.pl @@ -41,8 +41,8 @@ sub get_flag_icon($) { # Remove whitespaces. chomp($input); - # Convert given country code to lower case. - my $ccode = lc($input); + # Convert given country code to upper case. + my $ccode = uc($input); # Generate filename, based on the contry code in lower case # and the defined file extension. @@ -58,6 +58,21 @@ sub get_flag_icon($) { if (-e "$absolute_path") { # Return content of flag_icon. return $flag_icon; + } else { + # If no icon for the specified country exists, try to use + # the icon for "unknown". + my $ccode = "unknown"; + + # Redoing all the stuff from abouve for the "unknown" icon. + my $file = join('.', $ccode,$ext); + my $flag_icon = join('/', $flagdir,$file); + my $absolute_path = join('', $webroot,$flag_icon); + + # Check if the icon is present. + if (-e "$absolute_path") { + # Return "unknown" icon. + return $flag_icon; + } } } diff --git a/config/httpd/httpd.conf b/config/httpd/httpd.conf index 7e00b88..9c1fb2b 100644 --- a/config/httpd/httpd.conf +++ b/config/httpd/httpd.conf @@ -117,4 +117,5 @@ Include /etc/httpd/conf/default-server.conf # Include /etc/httpd/conf/vhosts.d/*.conf - +# Dummy LoadModule directive to aid module installations +#LoadModule dummy_module /usr/lib/apache2/modules/mod_dummy.so diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 8033a87..68c99ea 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1,5 +1,8 @@ #etc/httpd #etc/httpd/conf +#etc/httpd/conf/conf.d +#etc/httpd/conf/conf.d/php5.conf +#etc/httpd/conf/default-server.conf #etc/httpd/conf/extra #etc/httpd/conf/extra/httpd-autoindex.conf #etc/httpd/conf/extra/httpd-dav.conf @@ -12,9 +15,14 @@ #etc/httpd/conf/extra/httpd-ssl.conf #etc/httpd/conf/extra/httpd-userdir.conf #etc/httpd/conf/extra/httpd-vhosts.conf +etc/httpd/conf/global.conf +etc/httpd/conf/hostname.conf etc/httpd/conf/httpd.conf +etc/httpd/conf/listen.conf +etc/httpd/conf/loadmodule.conf etc/httpd/conf/magic etc/httpd/conf/mime.types +etc/httpd/conf/mod_log_config.conf #etc/httpd/conf/original #etc/httpd/conf/original/extra #etc/httpd/conf/original/extra/httpd-autoindex.conf @@ -29,6 +37,14 @@ etc/httpd/conf/mime.types #etc/httpd/conf/original/extra/httpd-userdir.conf #etc/httpd/conf/original/extra/httpd-vhosts.conf #etc/httpd/conf/original/httpd.conf +etc/httpd/conf/server-tuning.conf +etc/httpd/conf/ssl-global.conf +etc/httpd/conf/uid.conf +#etc/httpd/conf/vhosts.d +etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf +etc/httpd/conf/vhosts.d/ipfire-interface.conf +#etc/httpd/conf/vhosts.d/nagios.conf +#etc/httpd/conf/vhosts.d/openmailadmin.conf #srv/web #srv/web/ipfire #srv/web/ipfire/cgi-bin @@ -1373,77 +1389,3 @@ usr/sbin/httpd #usr/share/man/man8/rotatelogs.8 #usr/share/man/man8/suexec.8 var/log/httpd -etc/httpd/conf/conf.d -etc/httpd/conf/default-server.conf -etc/httpd/conf/global.conf -etc/httpd/conf/hostname.conf -etc/httpd/conf/listen.conf -etc/httpd/conf/loadmodule.conf -etc/httpd/conf/mod_log_config.conf -etc/httpd/conf/server-tuning.conf -etc/httpd/conf/ssl-global.conf -etc/httpd/conf/uid.conf -etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf -etc/httpd/conf/vhosts.d/ipfire-interface.conf -srv/web/ipfire/cgi-bin/aliases.cgi -srv/web/ipfire/cgi-bin/atm-status.cgi -srv/web/ipfire/cgi-bin/backup.cgi -srv/web/ipfire/cgi-bin/chpasswd.cgi -srv/web/ipfire/cgi-bin/connections.cgi -srv/web/ipfire/cgi-bin/connscheduler.cgi -srv/web/ipfire/cgi-bin/country.cgi -srv/web/ipfire/cgi-bin/credits.cgi -srv/web/ipfire/cgi-bin/dns.cgi -srv/web/ipfire/cgi-bin/dnsforward.cgi -srv/web/ipfire/cgi-bin/ddns.cgi -srv/web/ipfire/cgi-bin/dhcp.cgi -srv/web/ipfire/cgi-bin/entropy.cgi -srv/web/ipfire/cgi-bin/extrahd.cgi -srv/web/ipfire/cgi-bin/fireinfo.cgi -srv/web/ipfire/cgi-bin/firewall.cgi -srv/web/ipfire/cgi-bin/fwhosts.cgi -srv/web/ipfire/cgi-bin/geoip-block.cgi -srv/web/ipfire/cgi-bin/gpl.cgi -srv/web/ipfire/cgi-bin/gui.cgi -srv/web/ipfire/cgi-bin/hardwaregraphs.cgi -srv/web/ipfire/cgi-bin/hosts.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/index.cgi -srv/web/ipfire/cgi-bin/ipinfo.cgi -srv/web/ipfire/cgi-bin/iptables.cgi -srv/web/ipfire/cgi-bin/logs.cgi -srv/web/ipfire/cgi-bin/mac.cgi -srv/web/ipfire/cgi-bin/media.cgi -srv/web/ipfire/cgi-bin/memory.cgi -srv/web/ipfire/cgi-bin/modem.cgi -srv/web/ipfire/cgi-bin/modem-status.cgi -srv/web/ipfire/cgi-bin/netexternal.cgi -srv/web/ipfire/cgi-bin/netinternal.cgi -srv/web/ipfire/cgi-bin/netother.cgi -srv/web/ipfire/cgi-bin/netovpnrw.cgi -srv/web/ipfire/cgi-bin/netovpnsrv.cgi -srv/web/ipfire/cgi-bin/optionsfw.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/p2p-block.cgi -srv/web/ipfire/cgi-bin/pakfire.cgi -srv/web/ipfire/cgi-bin/pppsetup.cgi -srv/web/ipfire/cgi-bin/proxy.cgi -srv/web/ipfire/cgi-bin/qos.cgi -srv/web/ipfire/cgi-bin/remote.cgi -srv/web/ipfire/cgi-bin/routing.cgi -srv/web/ipfire/cgi-bin/services.cgi -srv/web/ipfire/cgi-bin/shutdown.cgi -srv/web/ipfire/cgi-bin/speed.cgi -srv/web/ipfire/cgi-bin/system.cgi -srv/web/ipfire/cgi-bin/time.cgi -srv/web/ipfire/cgi-bin/traffic.cgi -srv/web/ipfire/cgi-bin/updatexlrator.cgi -srv/web/ipfire/cgi-bin/upnp.cgi -srv/web/ipfire/cgi-bin/urlfilter.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -srv/web/ipfire/cgi-bin/wakeonlan.cgi -srv/web/ipfire/cgi-bin/webaccess.cgi -srv/web/ipfire/cgi-bin/wireless.cgi -srv/web/ipfire/cgi-bin/wirelessclient.cgi -srv/web/ipfire/html -var/updatecache diff --git a/config/rootfiles/common/flag-icons b/config/rootfiles/common/flag-icons new file mode 100644 index 0000000..eee2c0c --- /dev/null +++ b/config/rootfiles/common/flag-icons @@ -0,0 +1,243 @@ +srv/web/ipfire/html/images/flags +#srv/web/ipfire/html/images/flags/AD.png +#srv/web/ipfire/html/images/flags/AE.png +#srv/web/ipfire/html/images/flags/AF.png +#srv/web/ipfire/html/images/flags/AG.png +#srv/web/ipfire/html/images/flags/AI.png +#srv/web/ipfire/html/images/flags/AL.png +#srv/web/ipfire/html/images/flags/AM.png +#srv/web/ipfire/html/images/flags/AN.png +#srv/web/ipfire/html/images/flags/AO.png +#srv/web/ipfire/html/images/flags/AQ.png +#srv/web/ipfire/html/images/flags/AR.png +#srv/web/ipfire/html/images/flags/AS.png +#srv/web/ipfire/html/images/flags/AT.png +#srv/web/ipfire/html/images/flags/AU.png +#srv/web/ipfire/html/images/flags/AW.png +#srv/web/ipfire/html/images/flags/AX.png +#srv/web/ipfire/html/images/flags/AZ.png +#srv/web/ipfire/html/images/flags/BA.png +#srv/web/ipfire/html/images/flags/BB.png +#srv/web/ipfire/html/images/flags/BD.png +#srv/web/ipfire/html/images/flags/BE.png +#srv/web/ipfire/html/images/flags/BF.png +#srv/web/ipfire/html/images/flags/BG.png +#srv/web/ipfire/html/images/flags/BH.png +#srv/web/ipfire/html/images/flags/BI.png +#srv/web/ipfire/html/images/flags/BJ.png +#srv/web/ipfire/html/images/flags/BL.png +#srv/web/ipfire/html/images/flags/BM.png +#srv/web/ipfire/html/images/flags/BN.png +#srv/web/ipfire/html/images/flags/BO.png +#srv/web/ipfire/html/images/flags/BR.png +#srv/web/ipfire/html/images/flags/BS.png +#srv/web/ipfire/html/images/flags/BT.png +#srv/web/ipfire/html/images/flags/BW.png +#srv/web/ipfire/html/images/flags/BY.png +#srv/web/ipfire/html/images/flags/BZ.png +#srv/web/ipfire/html/images/flags/CA.png +#srv/web/ipfire/html/images/flags/CC.png +#srv/web/ipfire/html/images/flags/CD.png +#srv/web/ipfire/html/images/flags/CF.png +#srv/web/ipfire/html/images/flags/CG.png +#srv/web/ipfire/html/images/flags/CH.png +#srv/web/ipfire/html/images/flags/CI.png +#srv/web/ipfire/html/images/flags/CK.png +#srv/web/ipfire/html/images/flags/CL.png +#srv/web/ipfire/html/images/flags/CM.png +#srv/web/ipfire/html/images/flags/CN.png +#srv/web/ipfire/html/images/flags/CO.png +#srv/web/ipfire/html/images/flags/CR.png +#srv/web/ipfire/html/images/flags/CU.png +#srv/web/ipfire/html/images/flags/CV.png +#srv/web/ipfire/html/images/flags/CW.png +#srv/web/ipfire/html/images/flags/CX.png +#srv/web/ipfire/html/images/flags/CY.png +#srv/web/ipfire/html/images/flags/CZ.png +#srv/web/ipfire/html/images/flags/DE.png +#srv/web/ipfire/html/images/flags/DJ.png +#srv/web/ipfire/html/images/flags/DK.png +#srv/web/ipfire/html/images/flags/DM.png +#srv/web/ipfire/html/images/flags/DO.png +#srv/web/ipfire/html/images/flags/DZ.png +#srv/web/ipfire/html/images/flags/EC.png +#srv/web/ipfire/html/images/flags/EE.png +#srv/web/ipfire/html/images/flags/EG.png +#srv/web/ipfire/html/images/flags/EH.png +#srv/web/ipfire/html/images/flags/ER.png +#srv/web/ipfire/html/images/flags/ES.png +#srv/web/ipfire/html/images/flags/ET.png +#srv/web/ipfire/html/images/flags/EU.png +#srv/web/ipfire/html/images/flags/FI.png +#srv/web/ipfire/html/images/flags/FJ.png +#srv/web/ipfire/html/images/flags/FK.png +#srv/web/ipfire/html/images/flags/FM.png +#srv/web/ipfire/html/images/flags/FO.png +#srv/web/ipfire/html/images/flags/FR.png +#srv/web/ipfire/html/images/flags/GA.png +#srv/web/ipfire/html/images/flags/GB.png +#srv/web/ipfire/html/images/flags/GD.png +#srv/web/ipfire/html/images/flags/GE.png +#srv/web/ipfire/html/images/flags/GG.png +#srv/web/ipfire/html/images/flags/GH.png +#srv/web/ipfire/html/images/flags/GI.png +#srv/web/ipfire/html/images/flags/GL.png +#srv/web/ipfire/html/images/flags/GM.png +#srv/web/ipfire/html/images/flags/GN.png +#srv/web/ipfire/html/images/flags/GQ.png +#srv/web/ipfire/html/images/flags/GR.png +#srv/web/ipfire/html/images/flags/GS.png +#srv/web/ipfire/html/images/flags/GT.png +#srv/web/ipfire/html/images/flags/GU.png +#srv/web/ipfire/html/images/flags/GW.png +#srv/web/ipfire/html/images/flags/GY.png +#srv/web/ipfire/html/images/flags/HK.png +#srv/web/ipfire/html/images/flags/HN.png +#srv/web/ipfire/html/images/flags/HR.png +#srv/web/ipfire/html/images/flags/HT.png +#srv/web/ipfire/html/images/flags/HU.png +#srv/web/ipfire/html/images/flags/IC.png +#srv/web/ipfire/html/images/flags/ID.png +#srv/web/ipfire/html/images/flags/IE.png +#srv/web/ipfire/html/images/flags/IL.png +#srv/web/ipfire/html/images/flags/IM.png +#srv/web/ipfire/html/images/flags/IN.png +#srv/web/ipfire/html/images/flags/IQ.png +#srv/web/ipfire/html/images/flags/IR.png +#srv/web/ipfire/html/images/flags/IS.png +#srv/web/ipfire/html/images/flags/IT.png +#srv/web/ipfire/html/images/flags/JE.png +#srv/web/ipfire/html/images/flags/JM.png +#srv/web/ipfire/html/images/flags/JO.png +#srv/web/ipfire/html/images/flags/JP.png +#srv/web/ipfire/html/images/flags/KE.png +#srv/web/ipfire/html/images/flags/KG.png +#srv/web/ipfire/html/images/flags/KH.png +#srv/web/ipfire/html/images/flags/KI.png +#srv/web/ipfire/html/images/flags/KM.png +#srv/web/ipfire/html/images/flags/KN.png +#srv/web/ipfire/html/images/flags/KP.png +#srv/web/ipfire/html/images/flags/KR.png +#srv/web/ipfire/html/images/flags/KW.png +#srv/web/ipfire/html/images/flags/KY.png +#srv/web/ipfire/html/images/flags/KZ.png +#srv/web/ipfire/html/images/flags/LA.png +#srv/web/ipfire/html/images/flags/LB.png +#srv/web/ipfire/html/images/flags/LC.png +#srv/web/ipfire/html/images/flags/LI.png +#srv/web/ipfire/html/images/flags/LK.png +#srv/web/ipfire/html/images/flags/LR.png +#srv/web/ipfire/html/images/flags/LS.png +#srv/web/ipfire/html/images/flags/LT.png +#srv/web/ipfire/html/images/flags/LU.png +#srv/web/ipfire/html/images/flags/LV.png +#srv/web/ipfire/html/images/flags/LY.png +#srv/web/ipfire/html/images/flags/MA.png +#srv/web/ipfire/html/images/flags/MC.png +#srv/web/ipfire/html/images/flags/MD.png +#srv/web/ipfire/html/images/flags/ME.png +#srv/web/ipfire/html/images/flags/MF.png +#srv/web/ipfire/html/images/flags/MG.png +#srv/web/ipfire/html/images/flags/MH.png +#srv/web/ipfire/html/images/flags/MK.png +#srv/web/ipfire/html/images/flags/ML.png +#srv/web/ipfire/html/images/flags/MM.png +#srv/web/ipfire/html/images/flags/MN.png +#srv/web/ipfire/html/images/flags/MO.png +#srv/web/ipfire/html/images/flags/MP.png +#srv/web/ipfire/html/images/flags/MQ.png +#srv/web/ipfire/html/images/flags/MR.png +#srv/web/ipfire/html/images/flags/MS.png +#srv/web/ipfire/html/images/flags/MT.png +#srv/web/ipfire/html/images/flags/MU.png +#srv/web/ipfire/html/images/flags/MV.png +#srv/web/ipfire/html/images/flags/MW.png +#srv/web/ipfire/html/images/flags/MX.png +#srv/web/ipfire/html/images/flags/MY.png +#srv/web/ipfire/html/images/flags/MZ.png +#srv/web/ipfire/html/images/flags/NA.png +#srv/web/ipfire/html/images/flags/NC.png +#srv/web/ipfire/html/images/flags/NE.png +#srv/web/ipfire/html/images/flags/NF.png +#srv/web/ipfire/html/images/flags/NG.png +#srv/web/ipfire/html/images/flags/NI.png +#srv/web/ipfire/html/images/flags/NL.png +#srv/web/ipfire/html/images/flags/NO.png +#srv/web/ipfire/html/images/flags/NP.png +#srv/web/ipfire/html/images/flags/NR.png +#srv/web/ipfire/html/images/flags/NU.png +#srv/web/ipfire/html/images/flags/NZ.png +#srv/web/ipfire/html/images/flags/OM.png +#srv/web/ipfire/html/images/flags/PA.png +#srv/web/ipfire/html/images/flags/PE.png +#srv/web/ipfire/html/images/flags/PF.png +#srv/web/ipfire/html/images/flags/PG.png +#srv/web/ipfire/html/images/flags/PH.png +#srv/web/ipfire/html/images/flags/PK.png +#srv/web/ipfire/html/images/flags/PL.png +#srv/web/ipfire/html/images/flags/PN.png +#srv/web/ipfire/html/images/flags/PR.png +#srv/web/ipfire/html/images/flags/PS.png +#srv/web/ipfire/html/images/flags/PT.png +#srv/web/ipfire/html/images/flags/PW.png +#srv/web/ipfire/html/images/flags/PY.png +#srv/web/ipfire/html/images/flags/QA.png +#srv/web/ipfire/html/images/flags/RO.png +#srv/web/ipfire/html/images/flags/RS.png +#srv/web/ipfire/html/images/flags/RU.png +#srv/web/ipfire/html/images/flags/RW.png +#srv/web/ipfire/html/images/flags/SA.png +#srv/web/ipfire/html/images/flags/SB.png +#srv/web/ipfire/html/images/flags/SC.png +#srv/web/ipfire/html/images/flags/SD.png +#srv/web/ipfire/html/images/flags/SE.png +#srv/web/ipfire/html/images/flags/SG.png +#srv/web/ipfire/html/images/flags/SH.png +#srv/web/ipfire/html/images/flags/SI.png +#srv/web/ipfire/html/images/flags/SK.png +#srv/web/ipfire/html/images/flags/SL.png +#srv/web/ipfire/html/images/flags/SM.png +#srv/web/ipfire/html/images/flags/SN.png +#srv/web/ipfire/html/images/flags/SO.png +#srv/web/ipfire/html/images/flags/SR.png +#srv/web/ipfire/html/images/flags/SS.png +#srv/web/ipfire/html/images/flags/ST.png +#srv/web/ipfire/html/images/flags/SV.png +#srv/web/ipfire/html/images/flags/SY.png +#srv/web/ipfire/html/images/flags/SZ.png +#srv/web/ipfire/html/images/flags/TC.png +#srv/web/ipfire/html/images/flags/TD.png +#srv/web/ipfire/html/images/flags/TF.png +#srv/web/ipfire/html/images/flags/TG.png +#srv/web/ipfire/html/images/flags/TH.png +#srv/web/ipfire/html/images/flags/TJ.png +#srv/web/ipfire/html/images/flags/TK.png +#srv/web/ipfire/html/images/flags/TL.png +#srv/web/ipfire/html/images/flags/TM.png +#srv/web/ipfire/html/images/flags/TN.png +#srv/web/ipfire/html/images/flags/TO.png +#srv/web/ipfire/html/images/flags/TR.png +#srv/web/ipfire/html/images/flags/TT.png +#srv/web/ipfire/html/images/flags/TV.png +#srv/web/ipfire/html/images/flags/TW.png +#srv/web/ipfire/html/images/flags/TZ.png +#srv/web/ipfire/html/images/flags/UA.png +#srv/web/ipfire/html/images/flags/UG.png +#srv/web/ipfire/html/images/flags/US.png +#srv/web/ipfire/html/images/flags/UY.png +#srv/web/ipfire/html/images/flags/UZ.png +#srv/web/ipfire/html/images/flags/VA.png +#srv/web/ipfire/html/images/flags/VC.png +#srv/web/ipfire/html/images/flags/VE.png +#srv/web/ipfire/html/images/flags/VG.png +#srv/web/ipfire/html/images/flags/VI.png +#srv/web/ipfire/html/images/flags/VN.png +#srv/web/ipfire/html/images/flags/VU.png +#srv/web/ipfire/html/images/flags/WF.png +#srv/web/ipfire/html/images/flags/WS.png +#srv/web/ipfire/html/images/flags/YE.png +#srv/web/ipfire/html/images/flags/YT.png +#srv/web/ipfire/html/images/flags/ZA.png +#srv/web/ipfire/html/images/flags/ZM.png +#srv/web/ipfire/html/images/flags/ZW.png +#srv/web/ipfire/html/images/flags/unknown.png diff --git a/config/rootfiles/core/90/filelists/files b/config/rootfiles/core/90/filelists/files index d4dcfae..d36ece0 100644 --- a/config/rootfiles/core/90/filelists/files +++ b/config/rootfiles/core/90/filelists/files @@ -11,6 +11,9 @@ srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/fwhosts.cgi srv/web/ipfire/cgi-bin/geoip-block.cgi srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat +srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat srv/web/ipfire/cgi-bin/netovpnsrv.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi index 65ce154..60c2e58 100644 --- a/html/cgi-bin/country.cgi +++ b/html/cgi-bin/country.cgi @@ -31,6 +31,7 @@ my @flaglistfiles=(); my $flag = ''; require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/geoip-functions.pl"; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; @@ -64,12 +65,16 @@ foreach $flag (@flaglistfiles) my $flagcode = uc(substr($flag, 0, 2)); my $fcode = lc($flagcode); + + # Get flag icon for of the country. + my $flag_icon = &GeoIP::get_flag_icon($fcode); + my $country = Locale::Country::code2country($fcode); if($fcode eq 'eu') { $country = 'Europe'; } if($fcode eq 'tp') { $country = 'East Timor'; } if($fcode eq 'yu') { $country = 'Yugoslavia'; } if ($lines % 2) { - print "<td $col><a id='$fcode'><img src='/images/flags/$fcode.png' alt='$flagcode' title='$flagcode'/></a></td>"; + print "<td $col><a id='$fcode'><img src='$flag_icon' alt='$flagcode' title='$flagcode'/></a></td>"; print "<td $col>$flagcode</td>"; print "<td $col>$country</td></tr>\n"; } @@ -81,7 +86,7 @@ foreach $flag (@flaglistfiles) $col="style='background-color:${Header::table1colour};'"; } print "<tr>"; - print "<td $col><a id='$fcode'><img src='/images/flags/$fcode.png' alt='$flagcode' title='$flagcode'/></a></td>"; + print "<td $col><a id='$fcode'><img src='$flag_icon' alt='$flagcode' title='$flagcode'/></a></td>"; print "<td $col>$flagcode</td>"; print "<td $col>$country</td>"; print "<td $col> </td>"; diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat index 7525626..5a584d6 100644 --- a/html/cgi-bin/logs.cgi/firewalllog.dat +++ b/html/cgi-bin/logs.cgi/firewalllog.dat @@ -21,6 +21,7 @@ use Getopt::Std; #use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/geoip-functions.pl"; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; @@ -372,10 +373,15 @@ foreach $_ (@log) <td align='center' $col>$srcport<br/>$dstport</td> END ; - if ( $fcode ne "" ){ - print "<td align='center' $col><a href='../country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode'></a></td>";} - else { - print "<td align='center' $col></td>";} + # Get flag icon for of the country. + my $flag_icon = &GeoIP::get_flag_icon($fcode); + + if ( $flag_icon) { + print "<td align='center' $col><a href='../country.cgi#$fcode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode'></a></td>"; + } else { + print "<td align='center' $col></td>"; + } + print <<END <td align='center' $col>$macaddr</td> </tr> diff --git a/html/cgi-bin/logs.cgi/firewalllogcountry.dat b/html/cgi-bin/logs.cgi/firewalllogcountry.dat index 3a774f9..29c0842 100644 --- a/html/cgi-bin/logs.cgi/firewalllogcountry.dat +++ b/html/cgi-bin/logs.cgi/firewalllogcountry.dat @@ -19,6 +19,7 @@ use Getopt::Std; #use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/geoip-functions.pl"; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; @@ -460,11 +461,15 @@ for($s=0;$s<$lines;$s++) print "<td align='center' $col>$key[$s]</td>"; } else { - if($key[$s] ne 'unknown' ) { - my $fcode = lc($key[$s]); - print "<td align='center' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$key[$s]' title='$key[$s]'></a></td>";} - else { - print "<td align='center' $col>$key[$s]</td>"; + my $fcode = lc($key[$s]); + + # Get flag icon for of the country. + my $flag_icon = &GeoIP::get_flag_icon($fcode); + + if($flag_icon) { + print "<td align='center' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='$flag_icon' border='0' align='absmiddle' alt='$key[$s]' title='$key[$s]'></a></td>"; + } else { + print "<td align='center' $col>$key[$s]</td>"; } } print "<td align='center' $col>$value[$s]</td>"; diff --git a/html/cgi-bin/logs.cgi/firewalllogip.dat b/html/cgi-bin/logs.cgi/firewalllogip.dat index 07bcc77..7d82d20 100644 --- a/html/cgi-bin/logs.cgi/firewalllogip.dat +++ b/html/cgi-bin/logs.cgi/firewalllogip.dat @@ -19,6 +19,7 @@ use Getopt::Std; #use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; +require "${General::swroot}/geoip-functions.pl"; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; @@ -441,13 +442,19 @@ for($s=0;$s<$lines;$s++) $color++; print "<td align='center' $col><form method='post' action='showrequestfromip.dat'><input type='hidden' name='MONTH' value='$cgiparams{'MONTH'}'> <input type='hidden' name='DAY' value='$cgiparams{'DAY'}'> <input type='hidden' name='ip' value='$key[$s]'> <input type='submit' value='$Lang::tr{'details'}'></form></td>"; print "<td align='center' $col><a href='/cgi-bin/ipinfo.cgi?ip=$key[$s]'>$key[$s]</a></td>"; - if ( $fcode ne "" ){ - print "<td align='center' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='/images/flags/$fcode.png' border='0' align='absmiddle' alt='$ccode' title='$ccode'></a></td>";} - else { - print "<td align='center' $col></td>";} - print "<td align='center' $col>$value[$s]</td>"; - print "<td align='center' $col>$percent</td>"; - print "</tr>"; + + # Get flag icon for of the country. + my $flag_icon = &GeoIP::get_flag_icon($ccode); + + if ( $flag_icon ) { + print "<td align='center' $col><a href='/cgi-bin/country.cgi#$fcode'><img src='$flag_icon' border='0' align='absmiddle' alt='$ccode' title='$ccode'></a></td>"; + } else { + print "<td align='center' $col></td>"; + } + + print "<td align='center' $col>$value[$s]</td>"; + print "<td align='center' $col>$percent</td>"; + print "</tr>"; } if($cgiparams{'otherspie'} == 2 ){} diff --git a/html/html/images/flags/ad.png b/html/html/images/flags/ad.png deleted file mode 100644 index ffbe26a..0000000 Binary files a/html/html/images/flags/ad.png and /dev/null differ diff --git a/html/html/images/flags/ae.png b/html/html/images/flags/ae.png deleted file mode 100644 index 0ee169b..0000000 Binary files a/html/html/images/flags/ae.png and /dev/null differ diff --git a/html/html/images/flags/af.png b/html/html/images/flags/af.png deleted file mode 100644 index f6d8f25..0000000 Binary files a/html/html/images/flags/af.png and /dev/null differ diff --git a/html/html/images/flags/ag.png b/html/html/images/flags/ag.png deleted file mode 100644 index 1c731ba..0000000 Binary files a/html/html/images/flags/ag.png and /dev/null differ diff --git a/html/html/images/flags/ai.png b/html/html/images/flags/ai.png deleted file mode 100644 index afc38d9..0000000 Binary files a/html/html/images/flags/ai.png and /dev/null differ diff --git a/html/html/images/flags/al.png b/html/html/images/flags/al.png deleted file mode 100644 index 79d6bac..0000000 Binary files a/html/html/images/flags/al.png and /dev/null differ diff --git a/html/html/images/flags/am.png b/html/html/images/flags/am.png deleted file mode 100644 index 7d57f50..0000000 Binary files a/html/html/images/flags/am.png and /dev/null differ diff --git a/html/html/images/flags/an.png b/html/html/images/flags/an.png deleted file mode 100644 index bf9d233..0000000 Binary files a/html/html/images/flags/an.png and /dev/null differ diff --git a/html/html/images/flags/ao.png b/html/html/images/flags/ao.png deleted file mode 100644 index c971840..0000000 Binary files a/html/html/images/flags/ao.png and /dev/null differ diff --git a/html/html/images/flags/aq.png b/html/html/images/flags/aq.png deleted file mode 100644 index a4f9700..0000000 Binary files a/html/html/images/flags/aq.png and /dev/null differ diff --git a/html/html/images/flags/ar.png b/html/html/images/flags/ar.png deleted file mode 100644 index d3a0d9d..0000000 Binary files a/html/html/images/flags/ar.png and /dev/null differ diff --git a/html/html/images/flags/as.png b/html/html/images/flags/as.png deleted file mode 100644 index d881283..0000000 Binary files a/html/html/images/flags/as.png and /dev/null differ diff --git a/html/html/images/flags/at.png b/html/html/images/flags/at.png deleted file mode 100644 index bd0cbe1..0000000 Binary files a/html/html/images/flags/at.png and /dev/null differ diff --git a/html/html/images/flags/au.png b/html/html/images/flags/au.png deleted file mode 100644 index 65fd911..0000000 Binary files a/html/html/images/flags/au.png and /dev/null differ diff --git a/html/html/images/flags/aw.png b/html/html/images/flags/aw.png deleted file mode 100644 index 1e5aff9..0000000 Binary files a/html/html/images/flags/aw.png and /dev/null differ diff --git a/html/html/images/flags/az.png b/html/html/images/flags/az.png deleted file mode 100644 index f2137c2..0000000 Binary files a/html/html/images/flags/az.png and /dev/null differ diff --git a/html/html/images/flags/ba.png b/html/html/images/flags/ba.png deleted file mode 100644 index 39dbca8..0000000 Binary files a/html/html/images/flags/ba.png and /dev/null differ diff --git a/html/html/images/flags/bb.png b/html/html/images/flags/bb.png deleted file mode 100644 index 726ab5a..0000000 Binary files a/html/html/images/flags/bb.png and /dev/null differ diff --git a/html/html/images/flags/bd.png b/html/html/images/flags/bd.png deleted file mode 100644 index e68816f..0000000 Binary files a/html/html/images/flags/bd.png and /dev/null differ diff --git a/html/html/images/flags/be.png b/html/html/images/flags/be.png deleted file mode 100644 index 2f92d5f..0000000 Binary files a/html/html/images/flags/be.png and /dev/null differ diff --git a/html/html/images/flags/bf.png b/html/html/images/flags/bf.png deleted file mode 100644 index 618fd04..0000000 Binary files a/html/html/images/flags/bf.png and /dev/null differ diff --git a/html/html/images/flags/bg.png b/html/html/images/flags/bg.png deleted file mode 100644 index 70d4b20..0000000 Binary files a/html/html/images/flags/bg.png and /dev/null differ diff --git a/html/html/images/flags/bh.png b/html/html/images/flags/bh.png deleted file mode 100644 index e92bd20..0000000 Binary files a/html/html/images/flags/bh.png and /dev/null differ diff --git a/html/html/images/flags/bi.png b/html/html/images/flags/bi.png deleted file mode 100644 index 3b4ebca..0000000 Binary files a/html/html/images/flags/bi.png and /dev/null differ diff --git a/html/html/images/flags/bj.png b/html/html/images/flags/bj.png deleted file mode 100644 index f6b89d9..0000000 Binary files a/html/html/images/flags/bj.png and /dev/null differ diff --git a/html/html/images/flags/bm.png b/html/html/images/flags/bm.png deleted file mode 100644 index 092852d..0000000 Binary files a/html/html/images/flags/bm.png and /dev/null differ diff --git a/html/html/images/flags/bn.png b/html/html/images/flags/bn.png deleted file mode 100644 index 2cf8b8e..0000000 Binary files a/html/html/images/flags/bn.png and /dev/null differ diff --git a/html/html/images/flags/bo.png b/html/html/images/flags/bo.png deleted file mode 100644 index bcf7986..0000000 Binary files a/html/html/images/flags/bo.png and /dev/null differ diff --git a/html/html/images/flags/br.png b/html/html/images/flags/br.png deleted file mode 100644 index 73e9370..0000000 Binary files a/html/html/images/flags/br.png and /dev/null differ diff --git a/html/html/images/flags/bs.png b/html/html/images/flags/bs.png deleted file mode 100644 index 799df4d..0000000 Binary files a/html/html/images/flags/bs.png and /dev/null differ diff --git a/html/html/images/flags/bt.png b/html/html/images/flags/bt.png deleted file mode 100644 index 796a073..0000000 Binary files a/html/html/images/flags/bt.png and /dev/null differ diff --git a/html/html/images/flags/bv.png b/html/html/images/flags/bv.png deleted file mode 100644 index 90661b4..0000000 Binary files a/html/html/images/flags/bv.png and /dev/null differ diff --git a/html/html/images/flags/bw.png b/html/html/images/flags/bw.png deleted file mode 100644 index 913580d..0000000 Binary files a/html/html/images/flags/bw.png and /dev/null differ diff --git a/html/html/images/flags/by.png b/html/html/images/flags/by.png deleted file mode 100644 index 80cd890..0000000 Binary files a/html/html/images/flags/by.png and /dev/null differ diff --git a/html/html/images/flags/bz.png b/html/html/images/flags/bz.png deleted file mode 100644 index bcfd37e..0000000 Binary files a/html/html/images/flags/bz.png and /dev/null differ diff --git a/html/html/images/flags/ca.png b/html/html/images/flags/ca.png deleted file mode 100644 index 0a50034..0000000 Binary files a/html/html/images/flags/ca.png and /dev/null differ diff --git a/html/html/images/flags/cc.png b/html/html/images/flags/cc.png deleted file mode 100644 index 6e29f45..0000000 Binary files a/html/html/images/flags/cc.png and /dev/null differ diff --git a/html/html/images/flags/cd.png b/html/html/images/flags/cd.png deleted file mode 100644 index daa30a3..0000000 Binary files a/html/html/images/flags/cd.png and /dev/null differ diff --git a/html/html/images/flags/cf.png b/html/html/images/flags/cf.png deleted file mode 100644 index d31de15..0000000 Binary files a/html/html/images/flags/cf.png and /dev/null differ diff --git a/html/html/images/flags/cg.png b/html/html/images/flags/cg.png deleted file mode 100644 index 1d712ff..0000000 Binary files a/html/html/images/flags/cg.png and /dev/null differ diff --git a/html/html/images/flags/ch.png b/html/html/images/flags/ch.png deleted file mode 100644 index b5b5902..0000000 Binary files a/html/html/images/flags/ch.png and /dev/null differ diff --git a/html/html/images/flags/ci.png b/html/html/images/flags/ci.png deleted file mode 100644 index 3f34f51..0000000 Binary files a/html/html/images/flags/ci.png and /dev/null differ diff --git a/html/html/images/flags/ck.png b/html/html/images/flags/ck.png deleted file mode 100644 index c86af2c..0000000 Binary files a/html/html/images/flags/ck.png and /dev/null differ diff --git a/html/html/images/flags/cl.png b/html/html/images/flags/cl.png deleted file mode 100644 index 194fd91..0000000 Binary files a/html/html/images/flags/cl.png and /dev/null differ diff --git a/html/html/images/flags/cm.png b/html/html/images/flags/cm.png deleted file mode 100644 index 00fc991..0000000 Binary files a/html/html/images/flags/cm.png and /dev/null differ diff --git a/html/html/images/flags/cn.png b/html/html/images/flags/cn.png deleted file mode 100644 index e9e8261..0000000 Binary files a/html/html/images/flags/cn.png and /dev/null differ diff --git a/html/html/images/flags/co.png b/html/html/images/flags/co.png deleted file mode 100644 index cba9e49..0000000 Binary files a/html/html/images/flags/co.png and /dev/null differ diff --git a/html/html/images/flags/cr.png b/html/html/images/flags/cr.png deleted file mode 100644 index 9088a35..0000000 Binary files a/html/html/images/flags/cr.png and /dev/null differ diff --git a/html/html/images/flags/cs.png b/html/html/images/flags/cs.png deleted file mode 100644 index bbd5aca..0000000 Binary files a/html/html/images/flags/cs.png and /dev/null differ diff --git a/html/html/images/flags/cu.png b/html/html/images/flags/cu.png deleted file mode 100644 index ff1b7ea..0000000 Binary files a/html/html/images/flags/cu.png and /dev/null differ diff --git a/html/html/images/flags/cv.png b/html/html/images/flags/cv.png deleted file mode 100644 index 49e7738..0000000 Binary files a/html/html/images/flags/cv.png and /dev/null differ diff --git a/html/html/images/flags/cx.png b/html/html/images/flags/cx.png deleted file mode 100644 index a64c13f..0000000 Binary files a/html/html/images/flags/cx.png and /dev/null differ diff --git a/html/html/images/flags/cy.png b/html/html/images/flags/cy.png deleted file mode 100644 index c3a559c..0000000 Binary files a/html/html/images/flags/cy.png and /dev/null differ diff --git a/html/html/images/flags/cz.png b/html/html/images/flags/cz.png deleted file mode 100644 index 5caf0ec..0000000 Binary files a/html/html/images/flags/cz.png and /dev/null differ diff --git a/html/html/images/flags/de.png b/html/html/images/flags/de.png deleted file mode 100644 index b142f7b..0000000 Binary files a/html/html/images/flags/de.png and /dev/null differ diff --git a/html/html/images/flags/dj.png b/html/html/images/flags/dj.png deleted file mode 100644 index c71b38f..0000000 Binary files a/html/html/images/flags/dj.png and /dev/null differ diff --git a/html/html/images/flags/dk.png b/html/html/images/flags/dk.png deleted file mode 100644 index b2b9b12..0000000 Binary files a/html/html/images/flags/dk.png and /dev/null differ diff --git a/html/html/images/flags/dm.png b/html/html/images/flags/dm.png deleted file mode 100644 index 0b1aab6..0000000 Binary files a/html/html/images/flags/dm.png and /dev/null differ diff --git a/html/html/images/flags/do.png b/html/html/images/flags/do.png deleted file mode 100644 index 5afc6d0..0000000 Binary files a/html/html/images/flags/do.png and /dev/null differ diff --git a/html/html/images/flags/dz.png b/html/html/images/flags/dz.png deleted file mode 100644 index 9132046..0000000 Binary files a/html/html/images/flags/dz.png and /dev/null differ diff --git a/html/html/images/flags/ec.png b/html/html/images/flags/ec.png deleted file mode 100644 index bdae8d2..0000000 Binary files a/html/html/images/flags/ec.png and /dev/null differ diff --git a/html/html/images/flags/ee.png b/html/html/images/flags/ee.png deleted file mode 100644 index 516e5a3..0000000 Binary files a/html/html/images/flags/ee.png and /dev/null differ diff --git a/html/html/images/flags/eg.png b/html/html/images/flags/eg.png deleted file mode 100644 index 0f47afc..0000000 Binary files a/html/html/images/flags/eg.png and /dev/null differ diff --git a/html/html/images/flags/eh.png b/html/html/images/flags/eh.png deleted file mode 100644 index 927b3cb..0000000 Binary files a/html/html/images/flags/eh.png and /dev/null differ diff --git a/html/html/images/flags/er.png b/html/html/images/flags/er.png deleted file mode 100644 index 10ded53..0000000 Binary files a/html/html/images/flags/er.png and /dev/null differ diff --git a/html/html/images/flags/es.png b/html/html/images/flags/es.png deleted file mode 100644 index 40cbfa6..0000000 Binary files a/html/html/images/flags/es.png and /dev/null differ diff --git a/html/html/images/flags/et.png b/html/html/images/flags/et.png deleted file mode 100644 index 17a252e..0000000 Binary files a/html/html/images/flags/et.png and /dev/null differ diff --git a/html/html/images/flags/eu.png b/html/html/images/flags/eu.png deleted file mode 100644 index 4c09a5a..0000000 Binary files a/html/html/images/flags/eu.png and /dev/null differ diff --git a/html/html/images/flags/fi.png b/html/html/images/flags/fi.png deleted file mode 100644 index 78b9ab6..0000000 Binary files a/html/html/images/flags/fi.png and /dev/null differ diff --git a/html/html/images/flags/fj.png b/html/html/images/flags/fj.png deleted file mode 100644 index a02aaa3..0000000 Binary files a/html/html/images/flags/fj.png and /dev/null differ diff --git a/html/html/images/flags/fk.png b/html/html/images/flags/fk.png deleted file mode 100644 index b6189f9..0000000 Binary files a/html/html/images/flags/fk.png and /dev/null differ diff --git a/html/html/images/flags/fm.png b/html/html/images/flags/fm.png deleted file mode 100644 index 7302d22..0000000 Binary files a/html/html/images/flags/fm.png and /dev/null differ diff --git a/html/html/images/flags/fo.png b/html/html/images/flags/fo.png deleted file mode 100644 index 6bb5557..0000000 Binary files a/html/html/images/flags/fo.png and /dev/null differ diff --git a/html/html/images/flags/fr.png b/html/html/images/flags/fr.png deleted file mode 100644 index bfd4a21..0000000 Binary files a/html/html/images/flags/fr.png and /dev/null differ diff --git a/html/html/images/flags/ga.png b/html/html/images/flags/ga.png deleted file mode 100644 index 18eed1a..0000000 Binary files a/html/html/images/flags/ga.png and /dev/null differ diff --git a/html/html/images/flags/gb.png b/html/html/images/flags/gb.png deleted file mode 100644 index db134f1..0000000 Binary files a/html/html/images/flags/gb.png and /dev/null differ diff --git a/html/html/images/flags/gd.png b/html/html/images/flags/gd.png deleted file mode 100644 index bde8e2e..0000000 Binary files a/html/html/images/flags/gd.png and /dev/null differ diff --git a/html/html/images/flags/ge.png b/html/html/images/flags/ge.png deleted file mode 100644 index cf5a612..0000000 Binary files a/html/html/images/flags/ge.png and /dev/null differ diff --git a/html/html/images/flags/gf.png b/html/html/images/flags/gf.png deleted file mode 100644 index df12fb4..0000000 Binary files a/html/html/images/flags/gf.png and /dev/null differ diff --git a/html/html/images/flags/gh.png b/html/html/images/flags/gh.png deleted file mode 100644 index e47b266..0000000 Binary files a/html/html/images/flags/gh.png and /dev/null differ diff --git a/html/html/images/flags/gi.png b/html/html/images/flags/gi.png deleted file mode 100644 index d3f23b3..0000000 Binary files a/html/html/images/flags/gi.png and /dev/null differ diff --git a/html/html/images/flags/gl.png b/html/html/images/flags/gl.png deleted file mode 100644 index 565c7a1..0000000 Binary files a/html/html/images/flags/gl.png and /dev/null differ diff --git a/html/html/images/flags/gm.png b/html/html/images/flags/gm.png deleted file mode 100644 index cdecab3..0000000 Binary files a/html/html/images/flags/gm.png and /dev/null differ diff --git a/html/html/images/flags/gn.png b/html/html/images/flags/gn.png deleted file mode 100644 index 56db38e..0000000 Binary files a/html/html/images/flags/gn.png and /dev/null differ diff --git a/html/html/images/flags/gp.png b/html/html/images/flags/gp.png deleted file mode 100644 index d7fbdfc..0000000 Binary files a/html/html/images/flags/gp.png and /dev/null differ diff --git a/html/html/images/flags/gq.png b/html/html/images/flags/gq.png deleted file mode 100644 index 71496cd..0000000 Binary files a/html/html/images/flags/gq.png and /dev/null differ diff --git a/html/html/images/flags/gr.png b/html/html/images/flags/gr.png deleted file mode 100644 index cf10a25..0000000 Binary files a/html/html/images/flags/gr.png and /dev/null differ diff --git a/html/html/images/flags/gs.png b/html/html/images/flags/gs.png deleted file mode 100644 index 6fd7edf..0000000 Binary files a/html/html/images/flags/gs.png and /dev/null differ diff --git a/html/html/images/flags/gt.png b/html/html/images/flags/gt.png deleted file mode 100644 index 2be4460..0000000 Binary files a/html/html/images/flags/gt.png and /dev/null differ diff --git a/html/html/images/flags/gu.png b/html/html/images/flags/gu.png deleted file mode 100644 index 2e6f0e0..0000000 Binary files a/html/html/images/flags/gu.png and /dev/null differ diff --git a/html/html/images/flags/gw.png b/html/html/images/flags/gw.png deleted file mode 100644 index ae52ec3..0000000 Binary files a/html/html/images/flags/gw.png and /dev/null differ diff --git a/html/html/images/flags/gy.png b/html/html/images/flags/gy.png deleted file mode 100644 index 1b20de4..0000000 Binary files a/html/html/images/flags/gy.png and /dev/null differ diff --git a/html/html/images/flags/hk.png b/html/html/images/flags/hk.png deleted file mode 100644 index d5435b6..0000000 Binary files a/html/html/images/flags/hk.png and /dev/null differ diff --git a/html/html/images/flags/hm.png b/html/html/images/flags/hm.png deleted file mode 100644 index ec0d223..0000000 Binary files a/html/html/images/flags/hm.png and /dev/null differ diff --git a/html/html/images/flags/hn.png b/html/html/images/flags/hn.png deleted file mode 100644 index 56e0b02..0000000 Binary files a/html/html/images/flags/hn.png and /dev/null differ diff --git a/html/html/images/flags/hr.png b/html/html/images/flags/hr.png deleted file mode 100644 index bd133ba..0000000 Binary files a/html/html/images/flags/hr.png and /dev/null differ diff --git a/html/html/images/flags/ht.png b/html/html/images/flags/ht.png deleted file mode 100644 index a982940..0000000 Binary files a/html/html/images/flags/ht.png and /dev/null differ diff --git a/html/html/images/flags/hu.png b/html/html/images/flags/hu.png deleted file mode 100644 index fd76de3..0000000 Binary files a/html/html/images/flags/hu.png and /dev/null differ diff --git a/html/html/images/flags/id.png b/html/html/images/flags/id.png deleted file mode 100644 index cf72330..0000000 Binary files a/html/html/images/flags/id.png and /dev/null differ diff --git a/html/html/images/flags/ie.png b/html/html/images/flags/ie.png deleted file mode 100644 index ddbbc74..0000000 Binary files a/html/html/images/flags/ie.png and /dev/null differ diff --git a/html/html/images/flags/il.png b/html/html/images/flags/il.png deleted file mode 100644 index 52dc8d3..0000000 Binary files a/html/html/images/flags/il.png and /dev/null differ diff --git a/html/html/images/flags/in.png b/html/html/images/flags/in.png deleted file mode 100644 index 771f217..0000000 Binary files a/html/html/images/flags/in.png and /dev/null differ diff --git a/html/html/images/flags/io.png b/html/html/images/flags/io.png deleted file mode 100644 index 96bc118..0000000 Binary files a/html/html/images/flags/io.png and /dev/null differ diff --git a/html/html/images/flags/iq.png b/html/html/images/flags/iq.png deleted file mode 100644 index 3097303..0000000 Binary files a/html/html/images/flags/iq.png and /dev/null differ diff --git a/html/html/images/flags/ir.png b/html/html/images/flags/ir.png deleted file mode 100644 index 395b28a..0000000 Binary files a/html/html/images/flags/ir.png and /dev/null differ diff --git a/html/html/images/flags/is.png b/html/html/images/flags/is.png deleted file mode 100644 index ea1c493..0000000 Binary files a/html/html/images/flags/is.png and /dev/null differ diff --git a/html/html/images/flags/it.png b/html/html/images/flags/it.png deleted file mode 100644 index de7427b..0000000 Binary files a/html/html/images/flags/it.png and /dev/null differ diff --git a/html/html/images/flags/jm.png b/html/html/images/flags/jm.png deleted file mode 100644 index 2a8a899..0000000 Binary files a/html/html/images/flags/jm.png and /dev/null differ diff --git a/html/html/images/flags/jo.png b/html/html/images/flags/jo.png deleted file mode 100644 index dbdca50..0000000 Binary files a/html/html/images/flags/jo.png and /dev/null differ diff --git a/html/html/images/flags/jp.png b/html/html/images/flags/jp.png deleted file mode 100644 index 5e342fd..0000000 Binary files a/html/html/images/flags/jp.png and /dev/null differ diff --git a/html/html/images/flags/ke.png b/html/html/images/flags/ke.png deleted file mode 100644 index d55331a..0000000 Binary files a/html/html/images/flags/ke.png and /dev/null differ diff --git a/html/html/images/flags/kg.png b/html/html/images/flags/kg.png deleted file mode 100644 index 230b1f6..0000000 Binary files a/html/html/images/flags/kg.png and /dev/null differ diff --git a/html/html/images/flags/kh.png b/html/html/images/flags/kh.png deleted file mode 100644 index 2ad8e35..0000000 Binary files a/html/html/images/flags/kh.png and /dev/null differ diff --git a/html/html/images/flags/ki.png b/html/html/images/flags/ki.png deleted file mode 100644 index 244104a..0000000 Binary files a/html/html/images/flags/ki.png and /dev/null differ diff --git a/html/html/images/flags/km.png b/html/html/images/flags/km.png deleted file mode 100644 index eb69544..0000000 Binary files a/html/html/images/flags/km.png and /dev/null differ diff --git a/html/html/images/flags/kn.png b/html/html/images/flags/kn.png deleted file mode 100644 index 3ce4018..0000000 Binary files a/html/html/images/flags/kn.png and /dev/null differ diff --git a/html/html/images/flags/kp.png b/html/html/images/flags/kp.png deleted file mode 100644 index f53c71a..0000000 Binary files a/html/html/images/flags/kp.png and /dev/null differ diff --git a/html/html/images/flags/kr.png b/html/html/images/flags/kr.png deleted file mode 100644 index 2b4e7b9..0000000 Binary files a/html/html/images/flags/kr.png and /dev/null differ diff --git a/html/html/images/flags/kw.png b/html/html/images/flags/kw.png deleted file mode 100644 index 19c8dc2..0000000 Binary files a/html/html/images/flags/kw.png and /dev/null differ diff --git a/html/html/images/flags/ky.png b/html/html/images/flags/ky.png deleted file mode 100644 index fa5ba07..0000000 Binary files a/html/html/images/flags/ky.png and /dev/null differ diff --git a/html/html/images/flags/kz.png b/html/html/images/flags/kz.png deleted file mode 100644 index f90f0ef..0000000 Binary files a/html/html/images/flags/kz.png and /dev/null differ diff --git a/html/html/images/flags/la.png b/html/html/images/flags/la.png deleted file mode 100644 index c3e9154..0000000 Binary files a/html/html/images/flags/la.png and /dev/null differ diff --git a/html/html/images/flags/lb.png b/html/html/images/flags/lb.png deleted file mode 100644 index e18a577..0000000 Binary files a/html/html/images/flags/lb.png and /dev/null differ diff --git a/html/html/images/flags/lc.png b/html/html/images/flags/lc.png deleted file mode 100644 index 78c606f..0000000 Binary files a/html/html/images/flags/lc.png and /dev/null differ diff --git a/html/html/images/flags/li.png b/html/html/images/flags/li.png deleted file mode 100644 index e991d1f..0000000 Binary files a/html/html/images/flags/li.png and /dev/null differ diff --git a/html/html/images/flags/lk.png b/html/html/images/flags/lk.png deleted file mode 100644 index f9e227f..0000000 Binary files a/html/html/images/flags/lk.png and /dev/null differ diff --git a/html/html/images/flags/lr.png b/html/html/images/flags/lr.png deleted file mode 100644 index 1c826c8..0000000 Binary files a/html/html/images/flags/lr.png and /dev/null differ diff --git a/html/html/images/flags/ls.png b/html/html/images/flags/ls.png deleted file mode 100644 index bd78c5b..0000000 Binary files a/html/html/images/flags/ls.png and /dev/null differ diff --git a/html/html/images/flags/lt.png b/html/html/images/flags/lt.png deleted file mode 100644 index 212d16b..0000000 Binary files a/html/html/images/flags/lt.png and /dev/null differ diff --git a/html/html/images/flags/lu.png b/html/html/images/flags/lu.png deleted file mode 100644 index 7182373..0000000 Binary files a/html/html/images/flags/lu.png and /dev/null differ diff --git a/html/html/images/flags/lv.png b/html/html/images/flags/lv.png deleted file mode 100644 index fa94bb2..0000000 Binary files a/html/html/images/flags/lv.png and /dev/null differ diff --git a/html/html/images/flags/ly.png b/html/html/images/flags/ly.png deleted file mode 100644 index 7afd8a6..0000000 Binary files a/html/html/images/flags/ly.png and /dev/null differ diff --git a/html/html/images/flags/ma.png b/html/html/images/flags/ma.png deleted file mode 100644 index 05448bf..0000000 Binary files a/html/html/images/flags/ma.png and /dev/null differ diff --git a/html/html/images/flags/mc.png b/html/html/images/flags/mc.png deleted file mode 100644 index c6f5809..0000000 Binary files a/html/html/images/flags/mc.png and /dev/null differ diff --git a/html/html/images/flags/md.png b/html/html/images/flags/md.png deleted file mode 100644 index e100650..0000000 Binary files a/html/html/images/flags/md.png and /dev/null differ diff --git a/html/html/images/flags/mg.png b/html/html/images/flags/mg.png deleted file mode 100644 index 080b0d4..0000000 Binary files a/html/html/images/flags/mg.png and /dev/null differ diff --git a/html/html/images/flags/mh.png b/html/html/images/flags/mh.png deleted file mode 100644 index 132ad60..0000000 Binary files a/html/html/images/flags/mh.png and /dev/null differ diff --git a/html/html/images/flags/mk.png b/html/html/images/flags/mk.png deleted file mode 100644 index acf5e44..0000000 Binary files a/html/html/images/flags/mk.png and /dev/null differ diff --git a/html/html/images/flags/ml.png b/html/html/images/flags/ml.png deleted file mode 100644 index cf0412f..0000000 Binary files a/html/html/images/flags/ml.png and /dev/null differ diff --git a/html/html/images/flags/mm.png b/html/html/images/flags/mm.png deleted file mode 100644 index 6467831..0000000 Binary files a/html/html/images/flags/mm.png and /dev/null differ diff --git a/html/html/images/flags/mn.png b/html/html/images/flags/mn.png deleted file mode 100644 index 81f355b..0000000 Binary files a/html/html/images/flags/mn.png and /dev/null differ diff --git a/html/html/images/flags/mo.png b/html/html/images/flags/mo.png deleted file mode 100644 index 8a033f3..0000000 Binary files a/html/html/images/flags/mo.png and /dev/null differ diff --git a/html/html/images/flags/mp.png b/html/html/images/flags/mp.png deleted file mode 100644 index 1bf8975..0000000 Binary files a/html/html/images/flags/mp.png and /dev/null differ diff --git a/html/html/images/flags/mq.png b/html/html/images/flags/mq.png deleted file mode 100644 index 00a8cc4..0000000 Binary files a/html/html/images/flags/mq.png and /dev/null differ diff --git a/html/html/images/flags/mr.png b/html/html/images/flags/mr.png deleted file mode 100644 index 5c40c89..0000000 Binary files a/html/html/images/flags/mr.png and /dev/null differ diff --git a/html/html/images/flags/ms.png b/html/html/images/flags/ms.png deleted file mode 100644 index 82dfd87..0000000 Binary files a/html/html/images/flags/ms.png and /dev/null differ diff --git a/html/html/images/flags/mt.png b/html/html/images/flags/mt.png deleted file mode 100644 index df86154..0000000 Binary files a/html/html/images/flags/mt.png and /dev/null differ diff --git a/html/html/images/flags/mu.png b/html/html/images/flags/mu.png deleted file mode 100644 index b146f38..0000000 Binary files a/html/html/images/flags/mu.png and /dev/null differ diff --git a/html/html/images/flags/mv.png b/html/html/images/flags/mv.png deleted file mode 100644 index 9d8704b..0000000 Binary files a/html/html/images/flags/mv.png and /dev/null differ diff --git a/html/html/images/flags/mw.png b/html/html/images/flags/mw.png deleted file mode 100644 index ddbe257..0000000 Binary files a/html/html/images/flags/mw.png and /dev/null differ diff --git a/html/html/images/flags/mx.png b/html/html/images/flags/mx.png deleted file mode 100644 index d69e87f..0000000 Binary files a/html/html/images/flags/mx.png and /dev/null differ diff --git a/html/html/images/flags/my.png b/html/html/images/flags/my.png deleted file mode 100644 index 54534e9..0000000 Binary files a/html/html/images/flags/my.png and /dev/null differ diff --git a/html/html/images/flags/mz.png b/html/html/images/flags/mz.png deleted file mode 100644 index bc3cf9b..0000000 Binary files a/html/html/images/flags/mz.png and /dev/null differ diff --git a/html/html/images/flags/na.png b/html/html/images/flags/na.png deleted file mode 100644 index f44ed28..0000000 Binary files a/html/html/images/flags/na.png and /dev/null differ diff --git a/html/html/images/flags/nc.png b/html/html/images/flags/nc.png deleted file mode 100644 index ee025d7..0000000 Binary files a/html/html/images/flags/nc.png and /dev/null differ diff --git a/html/html/images/flags/ne.png b/html/html/images/flags/ne.png deleted file mode 100644 index aeb771d..0000000 Binary files a/html/html/images/flags/ne.png and /dev/null differ diff --git a/html/html/images/flags/nf.png b/html/html/images/flags/nf.png deleted file mode 100644 index 2f9ae94..0000000 Binary files a/html/html/images/flags/nf.png and /dev/null differ diff --git a/html/html/images/flags/ng.png b/html/html/images/flags/ng.png deleted file mode 100644 index cc4dcd1..0000000 Binary files a/html/html/images/flags/ng.png and /dev/null differ diff --git a/html/html/images/flags/ni.png b/html/html/images/flags/ni.png deleted file mode 100644 index f679bf2..0000000 Binary files a/html/html/images/flags/ni.png and /dev/null differ diff --git a/html/html/images/flags/nl.png b/html/html/images/flags/nl.png deleted file mode 100644 index b0e12c2..0000000 Binary files a/html/html/images/flags/nl.png and /dev/null differ diff --git a/html/html/images/flags/no.png b/html/html/images/flags/no.png deleted file mode 100644 index de11ab7..0000000 Binary files a/html/html/images/flags/no.png and /dev/null differ diff --git a/html/html/images/flags/np.png b/html/html/images/flags/np.png deleted file mode 100644 index eb365c9..0000000 Binary files a/html/html/images/flags/np.png and /dev/null differ diff --git a/html/html/images/flags/nr.png b/html/html/images/flags/nr.png deleted file mode 100644 index 12f0cfe..0000000 Binary files a/html/html/images/flags/nr.png and /dev/null differ diff --git a/html/html/images/flags/nu.png b/html/html/images/flags/nu.png deleted file mode 100644 index 99ce198..0000000 Binary files a/html/html/images/flags/nu.png and /dev/null differ diff --git a/html/html/images/flags/nz.png b/html/html/images/flags/nz.png deleted file mode 100644 index c50ae5f..0000000 Binary files a/html/html/images/flags/nz.png and /dev/null differ diff --git a/html/html/images/flags/om.png b/html/html/images/flags/om.png deleted file mode 100644 index 0076b11..0000000 Binary files a/html/html/images/flags/om.png and /dev/null differ diff --git a/html/html/images/flags/pa.png b/html/html/images/flags/pa.png deleted file mode 100644 index ea4adb2..0000000 Binary files a/html/html/images/flags/pa.png and /dev/null differ diff --git a/html/html/images/flags/pe.png b/html/html/images/flags/pe.png deleted file mode 100644 index 38563b8..0000000 Binary files a/html/html/images/flags/pe.png and /dev/null differ diff --git a/html/html/images/flags/pf.png b/html/html/images/flags/pf.png deleted file mode 100644 index 832a5da..0000000 Binary files a/html/html/images/flags/pf.png and /dev/null differ diff --git a/html/html/images/flags/pg.png b/html/html/images/flags/pg.png deleted file mode 100644 index 96da94f..0000000 Binary files a/html/html/images/flags/pg.png and /dev/null differ diff --git a/html/html/images/flags/ph.png b/html/html/images/flags/ph.png deleted file mode 100644 index c8868b6..0000000 Binary files a/html/html/images/flags/ph.png and /dev/null differ diff --git a/html/html/images/flags/pk.png b/html/html/images/flags/pk.png deleted file mode 100644 index d86edf1..0000000 Binary files a/html/html/images/flags/pk.png and /dev/null differ diff --git a/html/html/images/flags/pl.png b/html/html/images/flags/pl.png deleted file mode 100644 index 251ee0a..0000000 Binary files a/html/html/images/flags/pl.png and /dev/null differ diff --git a/html/html/images/flags/pm.png b/html/html/images/flags/pm.png deleted file mode 100644 index 3d23d0e..0000000 Binary files a/html/html/images/flags/pm.png and /dev/null differ diff --git a/html/html/images/flags/pn.png b/html/html/images/flags/pn.png deleted file mode 100644 index b39911c..0000000 Binary files a/html/html/images/flags/pn.png and /dev/null differ diff --git a/html/html/images/flags/pr.png b/html/html/images/flags/pr.png deleted file mode 100644 index 2877e34..0000000 Binary files a/html/html/images/flags/pr.png and /dev/null differ diff --git a/html/html/images/flags/ps.png b/html/html/images/flags/ps.png deleted file mode 100644 index 7080b85..0000000 Binary files a/html/html/images/flags/ps.png and /dev/null differ diff --git a/html/html/images/flags/pt.png b/html/html/images/flags/pt.png deleted file mode 100644 index c61d7ca..0000000 Binary files a/html/html/images/flags/pt.png and /dev/null differ diff --git a/html/html/images/flags/pw.png b/html/html/images/flags/pw.png deleted file mode 100644 index 063d17f..0000000 Binary files a/html/html/images/flags/pw.png and /dev/null differ diff --git a/html/html/images/flags/py.png b/html/html/images/flags/py.png deleted file mode 100644 index 7bc1c87..0000000 Binary files a/html/html/images/flags/py.png and /dev/null differ diff --git a/html/html/images/flags/qa.png b/html/html/images/flags/qa.png deleted file mode 100644 index 9619da6..0000000 Binary files a/html/html/images/flags/qa.png and /dev/null differ diff --git a/html/html/images/flags/re.png b/html/html/images/flags/re.png deleted file mode 100644 index 422ee9d..0000000 Binary files a/html/html/images/flags/re.png and /dev/null differ diff --git a/html/html/images/flags/ro.png b/html/html/images/flags/ro.png deleted file mode 100644 index 7f72dd8..0000000 Binary files a/html/html/images/flags/ro.png and /dev/null differ diff --git a/html/html/images/flags/ru.png b/html/html/images/flags/ru.png deleted file mode 100644 index c76f646..0000000 Binary files a/html/html/images/flags/ru.png and /dev/null differ diff --git a/html/html/images/flags/rw.png b/html/html/images/flags/rw.png deleted file mode 100644 index b05833b..0000000 Binary files a/html/html/images/flags/rw.png and /dev/null differ diff --git a/html/html/images/flags/sa.png b/html/html/images/flags/sa.png deleted file mode 100644 index 1771430..0000000 Binary files a/html/html/images/flags/sa.png and /dev/null differ diff --git a/html/html/images/flags/sb.png b/html/html/images/flags/sb.png deleted file mode 100644 index e1ca39b..0000000 Binary files a/html/html/images/flags/sb.png and /dev/null differ diff --git a/html/html/images/flags/sc.png b/html/html/images/flags/sc.png deleted file mode 100644 index 0d42691..0000000 Binary files a/html/html/images/flags/sc.png and /dev/null differ diff --git a/html/html/images/flags/sd.png b/html/html/images/flags/sd.png deleted file mode 100644 index d9a8e94..0000000 Binary files a/html/html/images/flags/sd.png and /dev/null differ diff --git a/html/html/images/flags/se.png b/html/html/images/flags/se.png deleted file mode 100644 index 56f8579..0000000 Binary files a/html/html/images/flags/se.png and /dev/null differ diff --git a/html/html/images/flags/sg.png b/html/html/images/flags/sg.png deleted file mode 100644 index debeda7..0000000 Binary files a/html/html/images/flags/sg.png and /dev/null differ diff --git a/html/html/images/flags/sh.png b/html/html/images/flags/sh.png deleted file mode 100644 index 070cd3b..0000000 Binary files a/html/html/images/flags/sh.png and /dev/null differ diff --git a/html/html/images/flags/si.png b/html/html/images/flags/si.png deleted file mode 100644 index a8525d4..0000000 Binary files a/html/html/images/flags/si.png and /dev/null differ diff --git a/html/html/images/flags/sj.png b/html/html/images/flags/sj.png deleted file mode 100644 index 2b44b90..0000000 Binary files a/html/html/images/flags/sj.png and /dev/null differ diff --git a/html/html/images/flags/sk.png b/html/html/images/flags/sk.png deleted file mode 100644 index 9477a58..0000000 Binary files a/html/html/images/flags/sk.png and /dev/null differ diff --git a/html/html/images/flags/sl.png b/html/html/images/flags/sl.png deleted file mode 100644 index 9178f63..0000000 Binary files a/html/html/images/flags/sl.png and /dev/null differ diff --git a/html/html/images/flags/sm.png b/html/html/images/flags/sm.png deleted file mode 100644 index 9dc99fa..0000000 Binary files a/html/html/images/flags/sm.png and /dev/null differ diff --git a/html/html/images/flags/sn.png b/html/html/images/flags/sn.png deleted file mode 100644 index 0f0e66c..0000000 Binary files a/html/html/images/flags/sn.png and /dev/null differ diff --git a/html/html/images/flags/so.png b/html/html/images/flags/so.png deleted file mode 100644 index 680bfc2..0000000 Binary files a/html/html/images/flags/so.png and /dev/null differ diff --git a/html/html/images/flags/sr.png b/html/html/images/flags/sr.png deleted file mode 100644 index 339bbb6..0000000 Binary files a/html/html/images/flags/sr.png and /dev/null differ diff --git a/html/html/images/flags/st.png b/html/html/images/flags/st.png deleted file mode 100644 index 3b6db16..0000000 Binary files a/html/html/images/flags/st.png and /dev/null differ diff --git a/html/html/images/flags/sv.png b/html/html/images/flags/sv.png deleted file mode 100644 index d71be3e..0000000 Binary files a/html/html/images/flags/sv.png and /dev/null differ diff --git a/html/html/images/flags/sy.png b/html/html/images/flags/sy.png deleted file mode 100644 index 5b350b7..0000000 Binary files a/html/html/images/flags/sy.png and /dev/null differ diff --git a/html/html/images/flags/sz.png b/html/html/images/flags/sz.png deleted file mode 100644 index 48deaaf..0000000 Binary files a/html/html/images/flags/sz.png and /dev/null differ diff --git a/html/html/images/flags/tc.png b/html/html/images/flags/tc.png deleted file mode 100644 index 6e164c3..0000000 Binary files a/html/html/images/flags/tc.png and /dev/null differ diff --git a/html/html/images/flags/td.png b/html/html/images/flags/td.png deleted file mode 100644 index 0fb0e32..0000000 Binary files a/html/html/images/flags/td.png and /dev/null differ diff --git a/html/html/images/flags/tf.png b/html/html/images/flags/tf.png deleted file mode 100644 index d986c06..0000000 Binary files a/html/html/images/flags/tf.png and /dev/null differ diff --git a/html/html/images/flags/tg.png b/html/html/images/flags/tg.png deleted file mode 100644 index 354772f..0000000 Binary files a/html/html/images/flags/tg.png and /dev/null differ diff --git a/html/html/images/flags/th.png b/html/html/images/flags/th.png deleted file mode 100644 index 88e94a0..0000000 Binary files a/html/html/images/flags/th.png and /dev/null differ diff --git a/html/html/images/flags/tj.png b/html/html/images/flags/tj.png deleted file mode 100644 index dd802f0..0000000 Binary files a/html/html/images/flags/tj.png and /dev/null differ diff --git a/html/html/images/flags/tk.png b/html/html/images/flags/tk.png deleted file mode 100644 index 233a7af..0000000 Binary files a/html/html/images/flags/tk.png and /dev/null differ diff --git a/html/html/images/flags/tl.png b/html/html/images/flags/tl.png deleted file mode 100644 index 2216921..0000000 Binary files a/html/html/images/flags/tl.png and /dev/null differ diff --git a/html/html/images/flags/tm.png b/html/html/images/flags/tm.png deleted file mode 100644 index efc4867..0000000 Binary files a/html/html/images/flags/tm.png and /dev/null differ diff --git a/html/html/images/flags/tn.png b/html/html/images/flags/tn.png deleted file mode 100644 index 7dc6df9..0000000 Binary files a/html/html/images/flags/tn.png and /dev/null differ diff --git a/html/html/images/flags/to.png b/html/html/images/flags/to.png deleted file mode 100644 index 27df6fd..0000000 Binary files a/html/html/images/flags/to.png and /dev/null differ diff --git a/html/html/images/flags/tp.png b/html/html/images/flags/tp.png deleted file mode 100644 index f612ed8..0000000 Binary files a/html/html/images/flags/tp.png and /dev/null differ diff --git a/html/html/images/flags/tr.png b/html/html/images/flags/tr.png deleted file mode 100644 index ca88f97..0000000 Binary files a/html/html/images/flags/tr.png and /dev/null differ diff --git a/html/html/images/flags/tt.png b/html/html/images/flags/tt.png deleted file mode 100644 index 37d38fe..0000000 Binary files a/html/html/images/flags/tt.png and /dev/null differ diff --git a/html/html/images/flags/tv.png b/html/html/images/flags/tv.png deleted file mode 100644 index b86f1bc..0000000 Binary files a/html/html/images/flags/tv.png and /dev/null differ diff --git a/html/html/images/flags/tw.png b/html/html/images/flags/tw.png deleted file mode 100644 index 85eb1ff..0000000 Binary files a/html/html/images/flags/tw.png and /dev/null differ diff --git a/html/html/images/flags/tz.png b/html/html/images/flags/tz.png deleted file mode 100644 index 2b0880a..0000000 Binary files a/html/html/images/flags/tz.png and /dev/null differ diff --git a/html/html/images/flags/ua.png b/html/html/images/flags/ua.png deleted file mode 100644 index 46b0aaf..0000000 Binary files a/html/html/images/flags/ua.png and /dev/null differ diff --git a/html/html/images/flags/ug.png b/html/html/images/flags/ug.png deleted file mode 100644 index 22dd07f..0000000 Binary files a/html/html/images/flags/ug.png and /dev/null differ diff --git a/html/html/images/flags/um.png b/html/html/images/flags/um.png deleted file mode 100644 index e959d31..0000000 Binary files a/html/html/images/flags/um.png and /dev/null differ diff --git a/html/html/images/flags/us.png b/html/html/images/flags/us.png deleted file mode 100644 index cebf562..0000000 Binary files a/html/html/images/flags/us.png and /dev/null differ diff --git a/html/html/images/flags/uy.png b/html/html/images/flags/uy.png deleted file mode 100644 index 3aed8f7..0000000 Binary files a/html/html/images/flags/uy.png and /dev/null differ diff --git a/html/html/images/flags/uz.png b/html/html/images/flags/uz.png deleted file mode 100644 index 1c9ca15..0000000 Binary files a/html/html/images/flags/uz.png and /dev/null differ diff --git a/html/html/images/flags/va.png b/html/html/images/flags/va.png deleted file mode 100644 index fd3984b..0000000 Binary files a/html/html/images/flags/va.png and /dev/null differ diff --git a/html/html/images/flags/vc.png b/html/html/images/flags/vc.png deleted file mode 100644 index 230ef4c..0000000 Binary files a/html/html/images/flags/vc.png and /dev/null differ diff --git a/html/html/images/flags/ve.png b/html/html/images/flags/ve.png deleted file mode 100644 index 292db90..0000000 Binary files a/html/html/images/flags/ve.png and /dev/null differ diff --git a/html/html/images/flags/vg.png b/html/html/images/flags/vg.png deleted file mode 100644 index 5c0acd3..0000000 Binary files a/html/html/images/flags/vg.png and /dev/null differ diff --git a/html/html/images/flags/vi.png b/html/html/images/flags/vi.png deleted file mode 100644 index a9a9c6b..0000000 Binary files a/html/html/images/flags/vi.png and /dev/null differ diff --git a/html/html/images/flags/vn.png b/html/html/images/flags/vn.png deleted file mode 100644 index 20ef1c2..0000000 Binary files a/html/html/images/flags/vn.png and /dev/null differ diff --git a/html/html/images/flags/vu.png b/html/html/images/flags/vu.png deleted file mode 100644 index 0ce47d0..0000000 Binary files a/html/html/images/flags/vu.png and /dev/null differ diff --git a/html/html/images/flags/wf.png b/html/html/images/flags/wf.png deleted file mode 100644 index 98cf4f5..0000000 Binary files a/html/html/images/flags/wf.png and /dev/null differ diff --git a/html/html/images/flags/ws.png b/html/html/images/flags/ws.png deleted file mode 100644 index 9d8cc2c..0000000 Binary files a/html/html/images/flags/ws.png and /dev/null differ diff --git a/html/html/images/flags/ye.png b/html/html/images/flags/ye.png deleted file mode 100644 index 09199ca..0000000 Binary files a/html/html/images/flags/ye.png and /dev/null differ diff --git a/html/html/images/flags/yt.png b/html/html/images/flags/yt.png deleted file mode 100644 index 2fdd8d4..0000000 Binary files a/html/html/images/flags/yt.png and /dev/null differ diff --git a/html/html/images/flags/yu.png b/html/html/images/flags/yu.png deleted file mode 100644 index 0560483..0000000 Binary files a/html/html/images/flags/yu.png and /dev/null differ diff --git a/html/html/images/flags/za.png b/html/html/images/flags/za.png deleted file mode 100644 index 77f4aa5..0000000 Binary files a/html/html/images/flags/za.png and /dev/null differ diff --git a/html/html/images/flags/zm.png b/html/html/images/flags/zm.png deleted file mode 100644 index b053a8d..0000000 Binary files a/html/html/images/flags/zm.png and /dev/null differ diff --git a/html/html/images/flags/zw.png b/html/html/images/flags/zw.png deleted file mode 100644 index 98095df..0000000 Binary files a/html/html/images/flags/zw.png and /dev/null differ diff --git a/lfs/apache2 b/lfs/apache2 index 0d7b11e..57c3447 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -31,11 +31,8 @@ THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) -ifeq "$(PASS)" "C" - TARGET = $(DIR_INFO)/$(THISAPP)-config -else - TARGET = $(DIR_INFO)/$(THISAPP) -endif + +TARGET = $(DIR_INFO)/$(THISAPP) ############################################################################### # Top-level Rules @@ -77,32 +74,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) -ifeq "$(PASS)" "C" - # DO THIS IN AN EXTRA STEP BECAUSE PHP AND SUBVERSION WILL FAIL. - - cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf - ln -sf $(CONFIG_ROOT)/main/hostname.conf /etc/httpd/conf/ - - # Copy all html/cgi-bin files - mkdir -p /srv/web/ipfire/{cgi-bin,html} - mkdir -p /var/updatecache/{download,metadata} - cp -aR $(DIR_SRC)/html/* /srv/web/ipfire - - # Change CONFIG_ROOT in cgi-scripts - for i in /srv/web/ipfire/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \ - if [ -f $$i ]; then \ - sed -i "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" $$i; \ - fi; \ - done - chown -R root:root /srv/web/ipfire - chmod -R 755 /srv/web/ipfire/cgi-bin - chmod -R 644 /srv/web/ipfire/html - chmod 755 /srv/web/ipfire/html /srv/web/ipfire/html/{index.cgi,redirect.cgi,dial.cgi,images,include,themes,themes/*,themes/*/*} - ln -svf ipfire /srv/web/ipfire/html/themes/ipfire-rounded - - # Reset permissions of redirect templates and theme directories - find /srv/web/ipfire/html/{redirect-templates,themes} -type d | xargs chmod -v 755 -else @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_DL)/httpd-2.2.2-config-1.patch @@ -140,6 +111,10 @@ else /usr/share/man/man1/{dbmmanage,ht{dbm,digest,passwd,txt2dbm}}.1 \ /usr/share/man/man8/{ab,apachectl,apxs,htcacheclean,httpd}.8 \ /usr/share/man/man8/{logresolve,rotatelogs,suexec}.8 + + # Install apache config + cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf + ln -sf $(CONFIG_ROOT)/main/hostname.conf /etc/httpd/conf/ + @rm -rf $(DIR_APP) -endif @$(POSTBUILD) diff --git a/lfs/flag-icons b/lfs/flag-icons new file mode 100644 index 0000000..8f3364c --- /dev/null +++ b/lfs/flag-icons @@ -0,0 +1,90 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2015 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 2.6 + +THISAPP = flag-icons-$(VER) +DL_FILE = $(THISAPP).zip +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 992db1bc950dfdd436699b7d2ad33c2d + +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) + # Create DIR_APP and move the source tarball to its location. + @rm -rf $(DIR_APP) && mkdir -pv $(DIR_APP) && cd $(DIR_SRC) && cp -avf $(DIR_DL)/$(DL_FILE) $(DIR_APP) + + # Extract the source tarball. + cd $(DIR_APP) && unzip $(DL_FILE) + + # Create flage image folder. + cd $(DIR_APP) && mkdir -pv /srv/web/ipfire/html/images/flags/ + + # Only copy the country flags. + cd $(DIR_APP) && cp -avf flags-iso/shiny/16/??.png \ + /srv/web/ipfire/html/images/flags/ + + # Copy flag icon for unknown countries. + cd $(DIR_APP) && cp -avf flags-iso/shiny/16/_unknown.png \ + /srv/web/ipfire/html/images/flags/unknown.png + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/web-user-interface b/lfs/web-user-interface new file mode 100644 index 0000000..919acbe --- /dev/null +++ b/lfs/web-user-interface @@ -0,0 +1,72 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# 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 = ipfire + +THISAPP = web-user-interface-$(VER) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +install: $(TARGET) + +check: + +download: + +md5: + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + + # Copy all html/cgi-bin files + mkdir -p /srv/web/ipfire/{cgi-bin,html} + mkdir -p /var/updatecache/{download,metadata} + cp -aR $(DIR_SRC)/html/* /srv/web/ipfire + + # Change CONFIG_ROOT in cgi-scripts + for i in /srv/web/ipfire/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \ + if [ -f $$i ]; then \ + sed -i "s+CONFIG_ROOT+$(CONFIG_ROOT)+g" $$i; \ + fi; \ + done + chown -R root:root /srv/web/ipfire + chmod -R 755 /srv/web/ipfire/cgi-bin + chmod -R 644 /srv/web/ipfire/html + chmod 755 /srv/web/ipfire/html /srv/web/ipfire/html/{index.cgi,redirect.cgi,dial.cgi,images,include,themes,themes/*,themes/*/*} + ln -svf ipfire /srv/web/ipfire/html/themes/ipfire-rounded + + # Reset permissions of redirect templates and theme directories + find /srv/web/ipfire/html/{redirect-templates,themes} -type d | xargs chmod -v 755 + @$(POSTBUILD) diff --git a/make.sh b/make.sh index cd78bf7..1d28746 100755 --- a/make.sh +++ b/make.sh @@ -507,7 +507,8 @@ buildipfire() { ipfiremake openldap ipfiremake apache2 ipfiremake php - ipfiremake apache2 PASS=C + ipfiremake web-user-interface + ipfiremake flag-icons ipfiremake jquery ipfiremake arping ipfiremake beep hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b59da37ee2e5755c93645271ff810d284a014d35
by git＠ipfire.org 04 May '15

04 May '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via b59da37ee2e5755c93645271ff810d284a014d35 (commit) from afa91a4df5755569b91c87a6b3b6fae095529ed1 (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 b59da37ee2e5755c93645271ff810d284a014d35 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 4 16:18:24 2015 +0200 core90: Ship updated fireinfo ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/87 => core/90}/filelists/fireinfo | 0 1 file changed, 0 insertions(+), 0 deletions(-) copy config/rootfiles/{oldcore/87 => core/90}/filelists/fireinfo (100%) Difference in files: diff --git a/config/rootfiles/core/90/filelists/fireinfo b/config/rootfiles/core/90/filelists/fireinfo new file mode 120000 index 0000000..c461155 --- /dev/null +++ b/config/rootfiles/core/90/filelists/fireinfo @@ -0,0 +1 @@ +../../../common/fireinfo \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. afa91a4df5755569b91c87a6b3b6fae095529ed1
by git＠ipfire.org 04 May '15

04 May '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via afa91a4df5755569b91c87a6b3b6fae095529ed1 (commit) from 11e2e672e8cb351ca79418a518e726a83e30b15d (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 afa91a4df5755569b91c87a6b3b6fae095529ed1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 4 16:02:39 2015 +0200 fireinfo: Fix SEGV on QEMU without KVM ----------------------------------------------------------------------- Summary of changes: lfs/fireinfo | 1 + ...-for-hypervisor-name-when-the-CPU-string-.patch | 34 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 src/patches/fireinfo-Skip-search-for-hypervisor-name-when-the-CPU-string-.patch Difference in files: diff --git a/lfs/fireinfo b/lfs/fireinfo index e63bdc8..9d65765 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-Add-an-other-forbidden-string-Serial.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-Skip-search-for-hypervisor-name-when-the-CPU-string-.patch cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure --prefix=/usr diff --git a/src/patches/fireinfo-Skip-search-for-hypervisor-name-when-the-CPU-string-.patch b/src/patches/fireinfo-Skip-search-for-hypervisor-name-when-the-CPU-string-.patch new file mode 100644 index 0000000..24a8ca1 --- /dev/null +++ b/src/patches/fireinfo-Skip-search-for-hypervisor-name-when-the-CPU-string-.patch @@ -0,0 +1,34 @@ +From c667589410912ca980a78f417e86dd6585d58f9a Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Mon, 4 May 2015 16:00:31 +0200 +Subject: [PATCH] Skip search for hypervisor name when the CPU string is empty + +--- + src/_fireinfo/fireinfo.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/src/_fireinfo/fireinfo.c b/src/_fireinfo/fireinfo.c +index fc639d9d4cd9..6601c21a733f 100644 +--- a/src/_fireinfo/fireinfo.c ++++ b/src/_fireinfo/fireinfo.c +@@ -156,11 +156,12 @@ int detect_hypervisor(int *hypervisor) { + + *hypervisor = HYPER_OTHER; + +- int id; +- for (id = HYPER_NONE + 1; id < HYPER_LAST; id++) { +- if (strcmp(hypervisor_ids[id], sig.text) == 0) { +- *hypervisor = id; +- break; ++ if (*sig.text) { ++ for (int id = HYPER_NONE + 1; id < HYPER_LAST; id++) { ++ if (strcmp(hypervisor_ids[id], sig.text) == 0) { ++ *hypervisor = id; ++ break; ++ } + } + } + +-- +2.1.0 + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 4d0d549d199cb14ab7075638f41bf3643a610115
by git＠ipfire.org 04 May '15

04 May '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 4d0d549d199cb14ab7075638f41bf3643a610115 (commit) via ca33e8561aef4c5dd9a156c0fd3bc6bbbdd894bc (commit) via f9c04e86781afdbd5e6e53f2875dc5e52a5d000e (commit) from 62fcf3c330b9d9eb6b8d0f5c74717e836954e704 (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 4d0d549d199cb14ab7075638f41bf3643a610115 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 4 09:53:47 2015 +0200 gawk: Update to version 4.1.2 commit ca33e8561aef4c5dd9a156c0fd3bc6bbbdd894bc Merge: f9c04e8 62fcf3c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun May 3 19:36:27 2015 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit f9c04e86781afdbd5e6e53f2875dc5e52a5d000e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 28 18:02:30 2015 +0200 Rebuild for strlcpy removed from glibc Our glibc used to bring an implementation of strlcpy that has been used by tmux and tcpdump. We do not add the patch since glibc 2.19 any more, so these need to be rebuilt in order to function. ----------------------------------------------------------------------- Summary of changes: gawk/gawk.nm | 2 +- tcpdump/tcpdump.nm | 2 +- tmux/tmux.nm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/gawk/gawk.nm b/gawk/gawk.nm index 8c335f3..8c170d4 100644 --- a/gawk/gawk.nm +++ b/gawk/gawk.nm @@ -4,7 +4,7 @@ ############################################################################### name = gawk -version = 4.1.0 +version = 4.1.2 release = 1 groups = System/Tools diff --git a/tcpdump/tcpdump.nm b/tcpdump/tcpdump.nm index 201426e..40a5cd7 100644 --- a/tcpdump/tcpdump.nm +++ b/tcpdump/tcpdump.nm @@ -5,7 +5,7 @@ name = tcpdump version = 4.3.0 -release = 1 +release = 2 groups = Networking/Sniffer url = http://www.tcpdump.org/ diff --git a/tmux/tmux.nm b/tmux/tmux.nm index 7048eeb..6f574f9 100644 --- a/tmux/tmux.nm +++ b/tmux/tmux.nm @@ -5,7 +5,7 @@ name = tmux version = 1.9a -release = 1 +release = 2 groups = Application/System url = http://sourceforge.net/projects/tmux hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 11e2e672e8cb351ca79418a518e726a83e30b15d
by git＠ipfire.org 04 May '15

04 May '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 11e2e672e8cb351ca79418a518e726a83e30b15d (commit) from 2c97e773002a5d63c2bfda7cc904082a06652c28 (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 11e2e672e8cb351ca79418a518e726a83e30b15d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon May 4 07:40:30 2015 +0200 squid: rootfile update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/squid | 1 - 1 file changed, 1 deletion(-) Difference in files: diff --git a/config/rootfiles/common/squid b/config/rootfiles/common/squid index 76abbe8..1b78c8e 100644 --- a/config/rootfiles/common/squid +++ b/config/rootfiles/common/squid @@ -34,7 +34,6 @@ usr/lib/squid/basic_smb_auth usr/lib/squid/basic_smb_auth.sh #usr/lib/squid/cachemgr.cgi usr/lib/squid/cert_tool -usr/lib/squid/cert_valid.pl usr/lib/squid/digest_file_auth usr/lib/squid/digest_ldap_auth usr/lib/squid/diskd hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2c97e773002a5d63c2bfda7cc904082a06652c28
by git＠ipfire.org 03 May '15

03 May '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 2c97e773002a5d63c2bfda7cc904082a06652c28 (commit) via 9666a34d0e20328bc43ba90904382176b7844796 (commit) from a8e3b15d77512134c29d86ec0489d25f8a801fec (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 2c97e773002a5d63c2bfda7cc904082a06652c28 Merge: 9666a34 a8e3b15 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun May 3 13:03:25 2015 +0200 Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next commit 9666a34d0e20328bc43ba90904382176b7844796 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun May 3 13:02:30 2015 +0200 toolchain: set version to 9. ----------------------------------------------------------------------- Summary of changes: make.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/make.sh b/make.sh index 26f9d42..cd78bf7 100755 --- a/make.sh +++ b/make.sh @@ -36,7 +36,7 @@ BUILD_IMAGES=1 # Flash and Xen Downloader KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'` GIT_TAG=$(git tag | tail -1) # Git Tag GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit -TOOLCHAINVER=8 +TOOLCHAINVER=9 # New architecture variables BUILD_ARCH="$(uname -m)" hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM May 2015