IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7857 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1e0419c8da24544cbadf03f7eadb320cec41e675
by git＠ipfire.org 26 Nov '12

26 Nov '12

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 1e0419c8da24544cbadf03f7eadb320cec41e675 (commit) via 35c343da7a91824cb48b069a57594e533a2003b7 (commit) via d22cf0887658f2e0de04c24ec33f9afaa0e9f4ab (commit) from 1d8c30387e0637ac0f471e9c09d196e1d74a5de7 (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 1e0419c8da24544cbadf03f7eadb320cec41e675 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Nov 26 22:27:43 2012 +0100 Add daq library to core update 65. commit 35c343da7a91824cb48b069a57594e533a2003b7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Nov 8 23:30:06 2012 +0100 daq: fix rootfile (part2). commit d22cf0887658f2e0de04c24ec33f9afaa0e9f4ab Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Nov 8 19:16:33 2012 +0100 daq: fix rootfile. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/daq | 10 ++++------ config/rootfiles/core/{64 => 65}/filelists/daq | 0 2 files changed, 4 insertions(+), 6 deletions(-) copy config/rootfiles/core/{64 => 65}/filelists/daq (100%) Difference in files: diff --git a/config/rootfiles/common/daq b/config/rootfiles/common/daq index e68cee4..b23fd19 100644 --- a/config/rootfiles/common/daq +++ b/config/rootfiles/common/daq @@ -20,8 +20,8 @@ usr/lib/daq #usr/lib/libdaq.a #usr/lib/libdaq.la #usr/lib/libdaq.so -#usr/lib/libdaq.so.1 -#usr/lib/libdaq.so.1.0.0 +usr/lib/libdaq.so.1 +usr/lib/libdaq.so.1.0.0 #usr/lib/libdaq_static.a #usr/lib/libdaq_static.la #usr/lib/libdaq_static_modules.a @@ -29,7 +29,5 @@ usr/lib/daq #usr/lib/libsfbpf.a #usr/lib/libsfbpf.la #usr/lib/libsfbpf.so -#usr/lib/libsfbpf.so.0 -#usr/lib/libsfbpf.so.0.0.1 -#usr/lib/libdaq.so.0 -#usr/lib/libdaq.so.0.0.1 +usr/lib/libsfbpf.so.0 +usr/lib/libsfbpf.so.0.0.1 diff --git a/config/rootfiles/core/65/filelists/daq b/config/rootfiles/core/65/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/core/65/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ 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, thirteen, updated. 95c26b24859ac1537c5df79cbfaf3ae732be301d
by git＠ipfire.org 26 Nov '12

26 Nov '12

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1d8c30387e0637ac0f471e9c09d196e1d74a5de7
by git＠ipfire.org 26 Nov '12

26 Nov '12

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 1d8c30387e0637ac0f471e9c09d196e1d74a5de7 (commit) via 3fc50622e05bc50d9efbb72585b9e357553213da (commit) via 1870e7c50f29cae327d2db5f594a30f7b9e25d95 (commit) via 3ef99ad95a20b6cd3b99036a5f8c42dc25f763f4 (commit) via f87161948c0caad91720b4057201cf47143c6140 (commit) via 3aa175f78165640be41746b970802b5ea820ef7c (commit) via a000249ff98debdc5cd0c9a18a51beede1712d88 (commit) via fb6e700b40c070f32c68c65de5daff1c72888b8b (commit) from d46bec52993235a8b185a2f040846e9059c3f4e7 (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 1d8c30387e0637ac0f471e9c09d196e1d74a5de7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Nov 26 17:28:25 2012 +0100 sarg: Don't build user agent report. This is not very beautiful and does not contain any valuable information. commit 3fc50622e05bc50d9efbb72585b9e357553213da Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Nov 26 16:58:19 2012 +0100 sarg: Create initial report right after sarg has been installed. commit 1870e7c50f29cae327d2db5f594a30f7b9e25d95 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Nov 26 12:19:22 2012 +0100 Update translations. commit 3ef99ad95a20b6cd3b99036a5f8c42dc25f763f4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Nov 26 12:18:54 2012 +0100 Add links to sarg reports on the proxy reports page. commit f87161948c0caad91720b4057201cf47143c6140 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Nov 26 11:19:51 2012 +0100 apache: Allow accessing sarg reports for admins. commit 3aa175f78165640be41746b970802b5ea820ef7c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Nov 26 11:05:49 2012 +0100 sarg: Remove all previously created reports of "today". commit a000249ff98debdc5cd0c9a18a51beede1712d88 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Nov 26 11:02:28 2012 +0100 fcron: Run weekly tasks on Monday. commit fb6e700b40c070f32c68c65de5daff1c72888b8b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Aug 2 17:57:08 2012 +0200 sarg: New addon. ----------------------------------------------------------------------- Summary of changes: config/cron/crontab | 2 +- config/httpd/vhosts.d/ipfire-interface-ssl.conf | 10 + config/rootfiles/core/65/filelists/files | 2 + config/rootfiles/core/65/update.sh | 6 + config/rootfiles/packages/sarg | 48 ++ config/sarg/cron.daily | 5 + config/sarg/cron.hourly | 5 + config/sarg/cron.monthly | 5 + config/sarg/cron.weekly | 5 + config/sarg/sarg.conf | 696 ++++++++++++++++++++++++ config/sarg/update-sarg-reports | 188 +++++++ doc/language_issues.es | 13 + doc/language_issues.fr | 13 + doc/language_issues.pl | 13 + doc/language_issues.ru | 13 + doc/language_missings | 52 ++ html/cgi-bin/logs.cgi/calamaris.dat | 81 +++ langs/de/cgi-bin/de.pl | 9 +- langs/en/cgi-bin/en.pl | 9 +- lfs/{mediatomb => sarg} | 41 +- make.sh | 1 + src/paks/{motion => sarg}/install.sh | 9 +- src/paks/{motion => sarg}/uninstall.sh | 0 src/paks/{apcupsd => sarg}/update.sh | 0 24 files changed, 1204 insertions(+), 22 deletions(-) create mode 100644 config/rootfiles/packages/sarg create mode 100644 config/sarg/cron.daily create mode 100644 config/sarg/cron.hourly create mode 100644 config/sarg/cron.monthly create mode 100644 config/sarg/cron.weekly create mode 100644 config/sarg/sarg.conf create mode 100644 config/sarg/update-sarg-reports copy lfs/{mediatomb => sarg} (78%) copy src/paks/{motion => sarg}/install.sh (91%) copy src/paks/{motion => sarg}/uninstall.sh (100%) copy src/paks/{apcupsd => sarg}/update.sh (100%) Difference in files: diff --git a/config/cron/crontab b/config/cron/crontab index 5cca1fa..ad90b07 100644 --- a/config/cron/crontab +++ b/config/cron/crontab @@ -11,7 +11,7 @@ HOME=/ */5 * * * * test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.cyclic 01 * * * * test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.hourly &nice(10),bootrun 25 1 * * * test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.daily -&nice(10),bootrun 47 2 * * 0 test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.weekly +&nice(10),bootrun 47 2 * * 1 test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.weekly &nice(10),bootrun 52 3 1 * * test -x /usr/local/bin/run-parts && /usr/local/bin/run-parts /etc/fcron.monthly # Log rotation diff --git a/config/httpd/vhosts.d/ipfire-interface-ssl.conf b/config/httpd/vhosts.d/ipfire-interface-ssl.conf index 7b10832..cc3cb1d 100644 --- a/config/httpd/vhosts.d/ipfire-interface-ssl.conf +++ b/config/httpd/vhosts.d/ipfire-interface-ssl.conf @@ -85,4 +85,14 @@ Order deny,allow Allow from all </Directory> + + Alias /proxy-reports/ /var/log/sarg/ + <Directory /var/log/sarg> + AllowOverride None + Options None + AuthName "IPFire - Restricted" + AuthType Basic + AuthUserFile /var/ipfire/auth/users + Require user admin + </Directory> </VirtualHost> diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files index f481777..297f276 100644 --- a/config/rootfiles/core/65/filelists/files +++ b/config/rootfiles/core/65/filelists/files @@ -1,3 +1,4 @@ +etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf etc/system-release etc/issue srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat @@ -5,3 +6,4 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi usr/sbin/ovpn-ccd-convert var/ipfire/general-functions.pl var/ipfire/langs +var/spool/cron/root.orig diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh index 85ab2e9..fca7211 100644 --- a/config/rootfiles/core/65/update.sh +++ b/config/rootfiles/core/65/update.sh @@ -49,6 +49,12 @@ perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" # Convert OpenVPN RW connections. /usr/sbin/ovpn-ccd-convert +# Re-read crontab. +fcrontab -z &>/dev/null + +# Reload apache configuration. +/etc/init.d/apache reload &>/dev/null + #Rebuild module dep's #arch=`uname -m` #if [ ${arch::3} == "arm" ]; then diff --git a/config/rootfiles/packages/sarg b/config/rootfiles/packages/sarg new file mode 100644 index 0000000..9a0672c --- /dev/null +++ b/config/rootfiles/packages/sarg @@ -0,0 +1,48 @@ +etc/fcron.daily/sarg-reports +etc/fcron.hourly/sarg-reports +etc/fcron.monthly/sarg-reports +etc/fcron.weekly/sarg-reports +etc/sarg +etc/sarg/css.tpl +etc/sarg/exclude_codes +etc/sarg/sarg.conf +#etc/sarg/sarg.conf.default +etc/sarg/user_limit_block +usr/bin/sarg +usr/sbin/update-sarg-reports +usr/share/locale/bg/LC_MESSAGES/sarg.mo +usr/share/locale/ca/LC_MESSAGES/sarg.mo +usr/share/locale/cs/LC_MESSAGES/sarg.mo +usr/share/locale/da/LC_MESSAGES/sarg.mo +usr/share/locale/de/LC_MESSAGES/sarg.mo +usr/share/locale/el/LC_MESSAGES/sarg.mo +usr/share/locale/es/LC_MESSAGES/sarg.mo +usr/share/locale/fr/LC_MESSAGES/sarg.mo +usr/share/locale/hu/LC_MESSAGES/sarg.mo +usr/share/locale/id/LC_MESSAGES/sarg.mo +usr/share/locale/it/LC_MESSAGES/sarg.mo +usr/share/locale/ja/LC_MESSAGES/sarg.mo +usr/share/locale/lv/LC_MESSAGES/sarg.mo +usr/share/locale/nl/LC_MESSAGES/sarg.mo +usr/share/locale/pl/LC_MESSAGES/sarg.mo +usr/share/locale/pt/LC_MESSAGES/sarg.mo +usr/share/locale/pt_BR/LC_MESSAGES/sarg.mo +usr/share/locale/ro/LC_MESSAGES/sarg.mo +usr/share/locale/ru/LC_MESSAGES/sarg.mo +usr/share/locale/sk/LC_MESSAGES/sarg.mo +usr/share/locale/sr/LC_MESSAGES/sarg.mo +usr/share/locale/tr/LC_MESSAGES/sarg.mo +usr/share/locale/uk/LC_MESSAGES/sarg.mo +usr/share/locale/zh_CN/LC_MESSAGES/sarg.mo +#usr/share/man/man1/sarg.1 +usr/share/sarg +usr/share/sarg/fonts +usr/share/sarg/fonts/DejaVuSans.ttf +usr/share/sarg/fonts/FreeSans.ttf +usr/share/sarg/fonts/README +usr/share/sarg/fonts/license +usr/share/sarg/images +usr/share/sarg/images/datetime.png +usr/share/sarg/images/graph.png +usr/share/sarg/images/sarg-squidguard-block.png +usr/share/sarg/images/sarg.png diff --git a/config/sarg/cron.daily b/config/sarg/cron.daily new file mode 100644 index 0000000..8ae1b1b --- /dev/null +++ b/config/sarg/cron.daily @@ -0,0 +1,5 @@ +#!/bin/bash + +/usr/sbin/update-sarg-reports daily >/dev/null 2>&1 + +exit 0 diff --git a/config/sarg/cron.hourly b/config/sarg/cron.hourly new file mode 100644 index 0000000..1e7b5ff --- /dev/null +++ b/config/sarg/cron.hourly @@ -0,0 +1,5 @@ +#!/bin/bash + +/usr/sbin/update-sarg-reports today >/dev/null 2>&1 + +exit 0 diff --git a/config/sarg/cron.monthly b/config/sarg/cron.monthly new file mode 100644 index 0000000..07b9efc --- /dev/null +++ b/config/sarg/cron.monthly @@ -0,0 +1,5 @@ +#!/bin/bash + +/usr/sbin/update-sarg-reports monthly >/dev/null 2>&1 + +exit 0 diff --git a/config/sarg/cron.weekly b/config/sarg/cron.weekly new file mode 100644 index 0000000..1f8287c --- /dev/null +++ b/config/sarg/cron.weekly @@ -0,0 +1,5 @@ +#!/bin/bash + +/usr/sbin/update-sarg-reports weekly >/dev/null 2>&1 + +exit 0 diff --git a/config/sarg/sarg.conf b/config/sarg/sarg.conf new file mode 100644 index 0000000..6331aaf --- /dev/null +++ b/config/sarg/sarg.conf @@ -0,0 +1,696 @@ +# sarg.conf +# +# TAG: access_log file +# Where is the access.log file +# sarg -l file +# +access_log /var/log/squid/access.log + +# TAG: graphs yes|no +# Use graphics where is possible. +# graph_days_bytes_bar_color blue|green|yellow|orange|brown|red +# +graphs yes +graph_days_bytes_bar_color orange + +# TAG: graph_font +# The full path to the TTF font file to use to create the graphs. It is required +# if graphs is set to yes. +# +graph_font /usr/share/sarg/fonts/DejaVuSans.ttf + +# TAG: title +# Especify the title for html page. +# +title "Squid User Access Reports" + +# TAG: font_face +# Especify the font for html page. +# +font_face Tahoma,Verdana,Arial + +# TAG: header_color +# Especify the header color +# +header_color darkblue + +# TAG: header_bgcolor +# Especify the header bgcolor +# +header_bgcolor blanchedalmond + +# TAG: font_size +# Especify the text font size +# +font_size 12px + +# TAG: header_font_size +# Especify the header font size +# +header_font_size 12px + +# TAG: title_font_size +# Especify the title font size +# +title_font_size 12px + +# TAG: background_color +# TAG: background_color +# Html page background color +# +# background_color white + +# TAG: text_color +# Html page text color +# +text_color #000000 + +# TAG: text_bgcolor +# Html page text background color +# +text_bgcolor lavender + +# TAG: title_color +# Html page title color +# +#title_color green + +# TAG: logo_image +# Html page logo. +# +#logo_image none + +# TAG: logo_text +# Html page logo text. +# +#logo_text "" + +# TAG: logo_text_color +# Html page logo texti color. +# +#logo_text_color #000000 + +# TAG: logo_image_size +# Html page logo image size. +# width height +# +#image_size 80 45 + +# TAG: background_image +# Html page background image +# +#background_image none + +# TAG: password +# User password file used by Squid authentication scheme +# If used, generate reports just for that users. +# +#password none + +# TAG: temporary_dir +# Temporary directory name for work files +# sarg -w dir +# +#temporary_dir /tmp + +# TAG: output_dir +# The reports will be saved in that directory +# sarg -o dir +# +output_dir /srv/web/ipfire/html/sarg + +# TAG: output_email +# Email address to send the reports. If you use this tag, no html reports will be generated. +# sarg -e email +# +#output_email none + +# TAG: resolve_ip yes/no +# Convert ip address to dns name +# sarg -n +resolve_ip no + +# TAG: user_ip yes/no +# Use Ip Address instead userid in reports. +# sarg -p +#user_ip no + +# TAG: topuser_sort_field field normal/reverse +# Sort field for the Topuser Report. +# Allowed fields: USER CONNECT BYTES TIME +# +#topuser_sort_field BYTES reverse + +# TAG: user_sort_field field normal/reverse +# Sort field for the User Report. +# Allowed fields: SITE CONNECT BYTES TIME +# +#user_sort_field BYTES reverse + +# TAG: exclude_users file +# users within the file will be excluded from reports. +# you can use indexonly to have only index.html file. +# +#exclude_users none + +# TAG: exclude_hosts file +# Hosts, domains or subnets will be excluded from reports. +# +# Eg.: 192.168.10.10 - exclude ip address only +# 192.168.10.0/24 - exclude full C class +# s1.acme.foo - exclude hostname only +# *.acme.foo - exclude full domain name +# +#exclude_hosts none + +# TAG: useragent_log file +# useragent.log file patch to generate useragent report. +# +#useragent_log /var/log/squid/user_agent.log + +# TAG: date_format +# Date format in reports: e (European=dd/mm/yy), u (American=mm/dd/yy), w (Weekly=yy.ww) +# +date_format e + +# TAG: per_user_limit file MB +# Saves userid on file if download exceed n MB. +# This option allow you to disable user access if user exceed a download limit. +# +#per_user_limit none + +# TAG: lastlog n +# How many reports files must be keept in reports directory. +# The oldest report file will be automatically removed. +# 0 - no limit. +# +#lastlog 0 + +# TAG: remove_temp_files yes +# Remove temporary files: geral, usuarios, top, periodo from root report directory. +# +#remove_temp_files yes + +# TAG: index yes|no|only +# Generate the main index.html. +# only - generate only the main index.html +# +#index yes + +# TAG: index_tree date|file +# How to generate the index. +# +#index_tree file + +# TAG: overwrite_report yes|no +# yes - if report date already exist then will be overwrited. +# no - if report date already exist then will be renamed to filename.n, filename.n+1 +# +overwrite_report yes + +# TAG: records_without_userid ignore|ip|everybody +# What can I do with records without user id (no authentication) in access.log file ? +# +# ignore - This record will be ignored. +# ip - Use ip address instead. (default) +# everybody - Use "everybody" instead. +# +#records_without_userid ip + +# TAG: use_comma no|yes +# Use comma instead point in reports. +# Eg.: use_comma yes => 23,450,110 +# use_comma no => 23.450.110 +# +#use_comma no + +# TAG: mail_utility +# Mail command to use to send reports via SMTP. Sarg calls it like this: +# mail_utility -s "SARG report, date" "output_email" <"mail_content" +# +# Therefore, it is possible to add more arguments to the command by specifying them +# here. +# +# If you need too, you can use a shell script to process the content of /dev/stdin +# (/dev/stdin is the mail_content passed by sarg to the script) and call whatever +# command you like. It is not limited to mailing the report via SMTP. +# +# Don't forget to quote the command if necessary (i.e. if the path contains +# characters that must be quoted). +# +#mail_utility mailx + +# TAG: topsites_num n +# How many sites in topsites report. +# +#topsites_num 100 + +# TAG: topsites_sort_order CONNECT|BYTES A|D +# Sort for topsites report, where A=Ascendent, D=Descendent +# +#topsites_sort_order CONNECT D + +# TAG: index_sort_order A/D +# Sort for index.html, where A=Ascendent, D=Descendent +# +#index_sort_order D + +# TAG: exclude_codes file +# Ignore records with these codes. Eg.: NONE/400 +# Write one code per line. Lines starting with a # are ignored. +# Only codes matching exactly one of the line is rejected. The +# comparison is not case sensitive. +# +#exclude_codes /usr/local/sarg/exclude_codes + +# TAG: replace_index string +# Replace "index.html" in the main index file with this string +# If null "index.html" is used +# +#replace_index <?php echo str_replace(".", "_", $REMOTE_ADDR); echo ".html"; ?> + +# TAG: max_elapsed milliseconds +# If elapsed time is recorded in log is greater than max_elapsed use 0 for elapsed time. +# Use 0 for no checking +# +#max_elapsed 28800000 +# 8 Hours + +# TAG: report_type type +# What kind of reports to generate. +# topusers - users, sites, times, bytes, connects, links to accessed sites, etc +# topsites - site, connect and bytes report +# sites_users - users and sites report +# users_sites - accessed sites by the user report +# date_time - bytes used per day and hour report +# denied - denied sites with full URL report +# auth_failures - autentication failures report +# site_user_time_date - sites, dates, times and bytes report +# downloads - downloads per user report +# +# Eg.: report_type topsites denied +# +report_type topusers topsites sites_users users_sites date_time denied auth_failures site_user_time_date downloads + +# TAG: usertab filename +# You can change the "userid" or the "ip address" to be a real user name on the reports. +# If resolve_ip is active, the ip address is resolved before being looked up into this +# file. That is, if you want to map the ip address, be sure to set resolv_ip to no or +# the resolved name will be looked into the file instead of the ip address. Note that +# it can be used to resolve any ip address known to the dns and then map the unresolved +# ip addresses to a name found in the usertab file. +# Table syntax: +# userid name or ip address name +# Eg: +# SirIsaac Isaac Newton +# vinci Leonardo da Vinci +# 192.168.10.1 Karol Wojtyla +# +# Each line must be terminated with '\n' +# If usertab have value "ldap" (case ignoring), user names +# will be taken from LDAP server. This method as approaches for reception +# of usernames from Active Didectory +# +#usertab none + +# TAG: LDAPHost hostname +# FQDN or IP address of host with LDAP service or AD DC +# default is '127.0.0.1' +#LDAPHost 127.0.0.1 + +# TAG: LDAPPort port +# LDAP service port number +# default is '389' +#LDAPPort 389 + +# TAG: LDAPBindDN CN=username,OU=group,DC=mydomain,DC=com +# DN of LDAP user, who is authorized to read user's names from LDAP base +# default is empty line +#LDAPBindDN cn=proxy,dc=mydomain,dc=local + +# TAG: LDAPBindPW secret +# Password of DN, who is authorized to read user's names from LDAP base +# default is empty line +#LDAPBindPW secret + +# TAG: LDAPBaseSearch OU=users,DC=mydomain,DC=com +# LDAP search base +# default is empty line +#LDAPBaseSearch ou=users,dc=mydomain,dc=local + +# TAG: LDAPFilterSearch (uid=%s) +# User search filter by user's logins in LDAP +# First founded record will be used +# %s - will be changed to userlogins from access.log file +# filter string can have up to 5 '%s' tags +# default value is '(uid=%s)' +#LDAPFilterSearch (uid=%s) + +# TAG: LDAPTargetAttr attributename +# Name of the attribute containing a name of the user +# default value is 'cn' +#LDAPTargetAttr cn + +# TAG: long_url yes|no +# If yes, the full url is showed in report. +# If no, only the site will be showed +# +# YES option generate very big sort files and reports. +# +#long_url no + +# TAG: date_time_by bytes|elap +# Date/Time reports show the downloaded volume or the elapsed time or both. +# +#date_time_by bytes + +# TAG: charset name +# ISO 8859 is a full series of 10 standardized multilingual single-byte coded (8bit) +# graphic character sets for writing in alphabetic languages +# You can use the following charsets: +# Latin1 - West European +# Latin2 - East European +# Latin3 - South European +# Latin4 - North European +# Cyrillic +# Arabic +# Greek +# Hebrew +# Latin5 - Turkish +# Latin6 +# Windows-1251 +# Japan +# Koi8-r +# UTF-8 +# +#charset Latin1 + +# TAG: user_invalid_char "&/" +# Records that contain invalid characters in userid will be ignored by Sarg. +# +#user_invalid_char "&/" + +# TAG: privacy yes|no +# privacy_string "***.***.***.***" +# privacy_string_color blue +# In some countries the sysadm cannot see the visited sites by a restrictive law. +# Using privacy yes the visited url will be changes by privacy_string and the link +# will be removed from reports. +# +#privacy no +#privacy_string "***.***.***.***" +#privacy_string_color blue + +# TAG: include_users "user1:user2:...:usern" +# Reports will be generated only for listed users. +# +#include_users none + +# TAG: exclude_string "string1:string2:...:stringn" +# Records from access.log file that contain one of listed strings will be ignored. +# +#exclude_string none + +# TAG: show_successful_message yes|no +# Shows "Successful report generated on dir" at end of process. +# +#show_successful_message yes + +# TAG: show_read_statistics yes|no +# Shows some reading statistics. +# +show_read_statistics yes + +# TAG: topuser_fields +# Which fields must be in Topuser report. +# +#topuser_fields NUM DATE_TIME USERID CONNECT BYTES %BYTES IN-CACHE-OUT USED_TIME MILISEC %TIME TOTAL AVERAGE + +# TAG: user_report_fields +# Which fields must be in User report. +# +#user_report_fields CONNECT BYTES %BYTES IN-CACHE-OUT USED_TIME MILISEC %TIME TOTAL AVERAGE + +# TAG: bytes_in_sites_users_report yes|no +# Bytes field must be in Site & Users Report ? +# +#bytes_in_sites_users_report no + +# TAG: topuser_num n +# How many users in topsites report. 0 = no limit +# +#topuser_num 0 + +# TAG: datafile file +# Save the report results in a file to populate some database +# +#datafile none + +# TAG: datafile_delimiter ";" +# ascii character to use as a field separator in datafile +# +#datafile_delimiter ";" + +# TAG: datafile_fields all +# Which data fields must be in datafile +# user;date;time;url;connect;bytes;in_cache;out_cache;elapsed +# +#datafile_fields user;date;time;url;connect;bytes;in_cache;out_cache;elapsed + +# TAG: datafile_url ip|name +# Saves the URL as ip or name in datafile +# +#datafile_url ip + +# TAG: weekdays +# The weekdays to take into account ( Sunday->0, Saturday->6 ) +# Example: +#weekdays 1-3,5 +# Default: +#weekdays 0-6 + +# TAG: hours +# The hours to take into account +# Example: +#hours 7-12,14,16,18-20 +# Default: +#hours 0-23 + +# TAG: dansguardian_conf file +# DansGuardian.conf file path +# Generate reports from DansGuardian logs. +# Use 'none' to disable it. +# dansguardian_conf /usr/dansguardian/dansguardian.conf +# +#dansguardian_conf none + +# TAG: dansguardian_filter_out_date on|off +# This option replaces dansguardian_ignore_date whose name was not appropriate with respect to its action. +# Note the change of parameter value compared with the old option. +# 'off' use the record even if its date is outside of the range found in the input log file. +# 'on' use the record only if its date is in the range found in the input log file. +# +#dansguardian_filter_out_date on + +# TAG: squidguard_conf file +# path to squidGuard.conf file +# Generate reports from SquidGuard logs. +# Use 'none' to disable. +# You can use sarg -L filename to use an alternate squidGuard log. +# squidguard_conf /usr/local/squidGuard/squidGuard.conf +# +#squidguard_conf none + +# TAG: redirector_log file +# the location of the web proxy redirector log such as one created by squidGuard or Rejik. The option +# may be repeated up to 64 times to read multiple files. +# If this option is specified, it takes precedence over squidguard_conf. +# The command line option -L override this option. +# +#redirector_log /usr/local/squidGuard/var/logs/urls.log + +# TAG: redirector_filter_out_date on|off +# This option replaces squidguard_ignore_date and redirector_ignore_date whose names were not +# appropriate with respect to their action. +# Note the change of parameter value compared with the old options. +# 'off' use the record even if its date is outside of the range found in the input log file. +# 'on' use the record only if its date is in the range found in the input log file. +# +#redirector_filter_out_date on + +# TAG: redirector_log_format +# Format string for web proxy redirector logs. +# This option was named squidguard_log_format before sarg 2.3. +# REJIK #year#-#mon#-#day# #hour# #list#:#tmp# #ip# #user# #tmp#/#tmp#/#url#/#end# +# SQUIDGUARD #year#-#mon#-#day# #hour# #tmp#/#list#/#tmp#/#tmp#/#url#/#tmp# #ip#/#tmp# #user# #end# +#redirector_log_format #year#-#mon#-#day# #hour# #tmp#/#list#/#tmp#/#tmp#/#url#/#tmp# #ip#/#tmp# #user# #end# + +# TAG: show_sarg_info yes|no +# shows sarg information and site path on each report bottom +# +#show_sarg_info yes + +# TAG: show_sarg_logo yes|no +# shows sarg logo +# +#show_sarg_logo yes + +# TAG: parsed_output_log directory +# Saves the processed log in a sarg format after parsing the squid log file. +# This is a way to dump all of the data structures out, after parsing from +# the logs (presumably this data will be much smaller than the log files themselves), +# and pull them back in for later processing and merging with data from previous logs. +# +#parsed_output_log none + +# TAG: parsed_output_log_compress /bin/gzip|/usr/bin/bzip2|nocompress +# Command to run to compress sarg parsed output log. It may contain +# options (such as -f to overwrite existing target file). The name of +# the file to compresse is provided at the end of this +# command line. Don't forget to quote things appropriately. +# +#parsed_output_log_compress /bin/gzip + +# TAG: displayed_values bytes|abbreviation +# how the values will be displayed in reports. +# eg. bytes - 209.526 +# abbreviation - 210K +# +#displayed_values bytes + +# Report limits +# TAG: authfail_report_limit n +# TAG: denied_report_limit n +# TAG: siteusers_report_limit n +# TAG: squidguard_report_limit n +# TAG: user_report_limit n +# TAG: dansguardian_report_limit n +# TAG: download_report_limit n +# report limits (lines). +# '0' no limit +# +#authfail_report_limit 10 +#denied_report_limit 10 +#siteusers_report_limit 0 +#squidguard_report_limit 10 +#dansguardian_report_limit 10 +#user_report_limit 10 +#user_report_limit 50 + +# TAG: www_document_root dir +# Where is your Web DocumentRoot +# Sarg will create sarg-php directory with some PHP modules: +# - sarg-squidguard-block.php - add urls from user reports to squidGuard DB +# +#www_document_root /var/www/html + +# TAG: block_it module_url +# This tag allow you to pass urls from user reports to a cgi or php module, +# to be blocked by some Squid acl +# +# Eg.: block_it /sarg-php/sarg-block-it.php +# sarg-block-it is a php that will append a url to a flat file. +# You must change /var/www/html/sarg-php/sarg-block-it to point to your file +# in $filename variable, and chown to a httpd owner. +# +# sarg will pass http://module_url?url=url +# +#block_it none + +# TAG: external_css_file path +# Provide the path to an external css file to link into the HTML reports instead of +# the inline css written by sarg when this option is not set. +# +# In versions prior to 2.3, this used to be an absolute file name to +# a file to include verbatim in each HTML page but, as it takes a lot of +# space, version 2.3 switched to a link to an external css file. +# Therefore, this option must contain the HTTP server path on which a client +# browser may find the css file. +# +# Sarg use theses style classes: +# .logo logo class +# .info sarg information class, align=center +# .title_c title class, align=center +# .header_c header class, align:center +# .header_l header class, align:left +# .header_r header class, align:right +# .text text class, align:right +# .data table text class, align:right +# .data2 table text class, align:left +# .data3 table text class, align:center +# .link link class +# +# Sarg can be instructed to output the internal css it inline +# into the reports with this command: +# +# sarg --css +# +# You can redirect the output to a file of your choice and edit +# it to your liking. +# +#external_css_file none + +# TAG: user_authentication yes|no +# Allow user authentication in User Reports using .htaccess +# Parameters: +# AuthUserTemplateFile - The template to use to create the +# .htaccess file. In the template, %u is replaced by the +# user's ID for which the report is generated. The path of the +# template is relative to the directory containing sarg +# configuration file. +# +# user_authentication no +# AuthUserTemplateFile sarg_htaccess + +# TAG: download_suffix "suffix,suffix,...,suffix" +# file suffix to be considered as "download" in Download report. +# Use 'none' to disable. +# +download_suffix "zip,arj,bzip,gz,ace,doc,iso,adt,bin,cab,com,dot,drv$,lha,lzh,mdb,mso,ppt,rtf,src,shs,sys,exe,dll,mp3,avi,mpg,mpeg" + +# TAG: ulimit n +# The maximum number of open file descriptors to avoid "Too many open files" error message. +# You need to run sarg as root to use ulimit tag. +# If you run sarg with a low privilege user, set to 'none' to disable ulimit +# +#ulimit 20000 + +# TAG: ntlm_user_format username|domainname+username +# NTLM users format. +# +#ntlm_user_format domainname+username + +# TAG: realtime_refresh_time num sec +# How many time to auto refresh the realtime report +# 0 = disable +# +# realtime_refresh_time 3 + +# TAG: realtime_access_log_lines num +# How many last lines to get from access.log file +# +# realtime_access_log_lines 1000 + +# TAG: realtime_types: GET,PUT,CONNECT,ICP_QUERY,POST +# Which records must be in realtime report. +# +# realtime_types GET,PUT,CONNECT + +# TAG: realtime_unauthenticated_records: ignore|show +# What to do with unauthenticated records in realtime report. +# +# realtime_unauthenticated_records: show + +# TAG: byte_cost value no_cost_limit +# Cost per byte. +# Eg. byte_cost 0.01 100000000 +# per byte cost = 0.01 +# bytes with no cost = 100 Mb +# 0 = disable +# +# byte_cost 0.01 50000000 + +# TAG: squid24 on|off +# Compatilibity with squid version <= 2.4 when using emulate_http_log on +# +# squid24 off diff --git a/config/sarg/update-sarg-reports b/config/sarg/update-sarg-reports new file mode 100644 index 0000000..9f2ab4c --- /dev/null +++ b/config/sarg/update-sarg-reports @@ -0,0 +1,188 @@ +#!/bin/bash +############################################################################### +# # +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) 2012 Michael Tremer # +# # +# 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/>. # +# # +############################################################################### + +export LC_ALL=C + +SARG_CONFIG="/etc/sarg/sarg.conf" +SQUID_LOG="/var/log/squid/access.log" +REPORTS_PATH="/var/log/sarg" + +function date_calc() { + local when + local range="false" + + case "${1}" in + month) + when="1 month ago" + range="true" + ;; + week) + when="1 week ago" + ;; + yesterday) + when="1 day ago" + ;; + today) + when="today" + ;; + *) + return 1 + ;; + esac + + if [ "${range}" = "true" ]; then + echo "$(date --date "${when}" +01/%m/%Y)-$(date --date "${when}" +31/%m/%Y)" + else + date --date "${when}" +%d/%m/%Y + fi + + return 0 +} + +function compile_report() { + local interval=${1} + + local date + case "${interval}" in + today) + date=$(date_calc today) + ;; + daily) + date=$(date_calc yesterday) + ;; + weekly) + date="$(date_calc week)-$(date_calc yesterday)" + ;; + monthly) + date="$(date_calc month)" + ;; + esac + [ -n "${date}" ] || return 1 + + # Determine max. number of archived log files to search. + local max_logs + case "${interval}" in + today|daily) + max_logs=3 + ;; + weekly) + max_logs=14 + ;; + monthly) + max_logs=40 + ;; + esac + + # Create reports_path, if not exists. + local reports_path="${REPORTS_PATH}/${interval}" + mkdir -p ${reports_path} + + # Remove already existant data on today's reports. + case "${interval}" in + today) + rm -rf ${reports_path}/* + ;; + esac + + # Run SARG. + get_logs ${max_logs} | sarg -f ${SARG_CONFIG} -l - -d ${date} -o ${reports_path} +} + +function get_logs() { + local max=${1} + + if [ -z "${max}" ]; then + max=10000 + fi + + local idx=0 + while [ ${idx} -le ${max} ]; do + file=$(search_log_file ${idx}) + + # If no log file could be opened, we are done. + [ -z "${file}" ] && break + + case "${file}" in + # Logs in plain text. + *.log) + cat ${file} + ;; + + # GZip compressed log files. + *.gz) + gzip -d < ${file} + ;; + + # XZ compressed log files. + *.xz) + xz -d < ${file} + ;; + + # Unhandled stuff. + *) + echo "Unhandled file type: ${file}" >&2 + ;; + esac + + idx=$(( ${idx} + 1 )) + done + + return 0 +} + +function search_log_file() { + local idx=${1} + + if [ "${idx}" = "0" ] && [ -e "${SQUID_LOG}" ]; then + echo "${SQUID_LOG}" + return 0 + fi + + local algo + for algo in gz xz; do + file="${SQUID_LOG}.${idx}.${algo}" + + if [ -e "${file}" ]; then + echo "${file}" + return 0 + fi + done + + return 1 +} + +# Main. + +case "${1}" in + today|daily|weekly|monthly) + compile_report ${1} + ;; + *) + echo "${0} - Squid proxy reports creation tool" + echo + echo "Usage: ${0} [interval]" + echo " interval: today, daily, weekly, monthly" + echo + exit 0 + ;; +esac + +exit 0 diff --git a/doc/language_issues.es b/doc/language_issues.es index 968e321..3cd95a8 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -531,6 +531,7 @@ WARNING: untranslated string: ccd iroutehint WARNING: untranslated string: ccd modify WARNING: untranslated string: ccd name WARNING: untranslated string: ccd net +WARNING: untranslated string: ccd noaddnet WARNING: untranslated string: ccd none WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet @@ -582,9 +583,21 @@ WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: outgoing firewall view group WARNING: untranslated string: ovpn errmsg green already pushed WARNING: untranslated string: ovpn errmsg invalid ip or mask +WARNING: untranslated string: ovpn mtu-disc +WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 +WARNING: untranslated string: ovpn mtu-disc maybe +WARNING: untranslated string: ovpn mtu-disc no +WARNING: untranslated string: ovpn mtu-disc off +WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment +WARNING: untranslated string: ovpn mtu-disc yes WARNING: untranslated string: ovpn routes push WARNING: untranslated string: ovpn routes push options WARNING: untranslated string: pakfire ago +WARNING: untranslated string: proxy reports +WARNING: untranslated string: proxy reports daily +WARNING: untranslated string: proxy reports monthly +WARNING: untranslated string: proxy reports today +WARNING: untranslated string: proxy reports weekly WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 1c37b17..406c422 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -530,6 +530,7 @@ WARNING: untranslated string: ccd iroutehint WARNING: untranslated string: ccd modify WARNING: untranslated string: ccd name WARNING: untranslated string: ccd net +WARNING: untranslated string: ccd noaddnet WARNING: untranslated string: ccd none WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet @@ -568,7 +569,19 @@ WARNING: untranslated string: openvpn subnet is used WARNING: untranslated string: other WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall reserved groupname +WARNING: untranslated string: ovpn mtu-disc +WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 +WARNING: untranslated string: ovpn mtu-disc maybe +WARNING: untranslated string: ovpn mtu-disc no +WARNING: untranslated string: ovpn mtu-disc off +WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment +WARNING: untranslated string: ovpn mtu-disc yes WARNING: untranslated string: pakfire ago +WARNING: untranslated string: proxy reports +WARNING: untranslated string: proxy reports daily +WARNING: untranslated string: proxy reports monthly +WARNING: untranslated string: proxy reports today +WARNING: untranslated string: proxy reports weekly WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 968e321..3cd95a8 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -531,6 +531,7 @@ WARNING: untranslated string: ccd iroutehint WARNING: untranslated string: ccd modify WARNING: untranslated string: ccd name WARNING: untranslated string: ccd net +WARNING: untranslated string: ccd noaddnet WARNING: untranslated string: ccd none WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet @@ -582,9 +583,21 @@ WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: outgoing firewall view group WARNING: untranslated string: ovpn errmsg green already pushed WARNING: untranslated string: ovpn errmsg invalid ip or mask +WARNING: untranslated string: ovpn mtu-disc +WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 +WARNING: untranslated string: ovpn mtu-disc maybe +WARNING: untranslated string: ovpn mtu-disc no +WARNING: untranslated string: ovpn mtu-disc off +WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment +WARNING: untranslated string: ovpn mtu-disc yes WARNING: untranslated string: ovpn routes push WARNING: untranslated string: ovpn routes push options WARNING: untranslated string: pakfire ago +WARNING: untranslated string: proxy reports +WARNING: untranslated string: proxy reports daily +WARNING: untranslated string: proxy reports monthly +WARNING: untranslated string: proxy reports today +WARNING: untranslated string: proxy reports weekly WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_issues.ru b/doc/language_issues.ru index c1c87ee..a6efe4d 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -522,6 +522,7 @@ WARNING: untranslated string: ccd iroutehint WARNING: untranslated string: ccd modify WARNING: untranslated string: ccd name WARNING: untranslated string: ccd net +WARNING: untranslated string: ccd noaddnet WARNING: untranslated string: ccd none WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet @@ -550,6 +551,18 @@ WARNING: untranslated string: other WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: outgoing traffic in bytes per second +WARNING: untranslated string: ovpn mtu-disc +WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 +WARNING: untranslated string: ovpn mtu-disc maybe +WARNING: untranslated string: ovpn mtu-disc no +WARNING: untranslated string: ovpn mtu-disc off +WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment +WARNING: untranslated string: ovpn mtu-disc yes +WARNING: untranslated string: proxy reports +WARNING: untranslated string: proxy reports daily +WARNING: untranslated string: proxy reports monthly +WARNING: untranslated string: proxy reports today +WARNING: untranslated string: proxy reports weekly WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --git a/doc/language_missings b/doc/language_missings index a6a29fb..9b7400e 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -45,6 +45,7 @@ < ccd modify < ccd name < ccd net +< ccd noaddnet < ccd none < ccd routes < ccd subnet @@ -83,6 +84,18 @@ < openvpn subnet is used < other < our donors +< ovpn mtu-disc +< ovpn mtu-disc and mtu not 1500 +< ovpn mtu-disc maybe +< ovpn mtu-disc no +< ovpn mtu-disc off +< ovpn mtu-disc with mssfix or fragment +< ovpn mtu-disc yes +< proxy reports +< proxy reports daily +< proxy reports monthly +< proxy reports today +< proxy reports weekly < server restart < snort working < static routes @@ -153,6 +166,7 @@ < ccd modify < ccd name < ccd net +< ccd noaddnet < ccd none < ccd routes < ccd subnet @@ -204,8 +218,20 @@ < outgoing firewall view group < ovpn errmsg green already pushed < ovpn errmsg invalid ip or mask +< ovpn mtu-disc +< ovpn mtu-disc and mtu not 1500 +< ovpn mtu-disc maybe +< ovpn mtu-disc no +< ovpn mtu-disc off +< ovpn mtu-disc with mssfix or fragment +< ovpn mtu-disc yes < ovpn routes push < ovpn routes push options +< proxy reports +< proxy reports daily +< proxy reports monthly +< proxy reports today +< proxy reports weekly < server restart < Set time on boot < static routes @@ -252,6 +278,7 @@ < ccd modify < ccd name < ccd net +< ccd noaddnet < ccd none < ccd routes < ccd subnet @@ -281,8 +308,20 @@ < our donors < ovpn errmsg green already pushed < ovpn errmsg invalid ip or mask +< ovpn mtu-disc +< ovpn mtu-disc and mtu not 1500 +< ovpn mtu-disc maybe +< ovpn mtu-disc no +< ovpn mtu-disc off +< ovpn mtu-disc with mssfix or fragment +< ovpn mtu-disc yes < ovpn routes push < ovpn routes push options +< proxy reports +< proxy reports daily +< proxy reports monthly +< proxy reports today +< proxy reports weekly < server restart < static routes < visit us at @@ -328,6 +367,7 @@ < ccd modify < ccd name < ccd net +< ccd noaddnet < ccd none < ccd routes < ccd subnet @@ -363,6 +403,18 @@ < other < our donors < outgoing traffic in bytes per second +< ovpn mtu-disc +< ovpn mtu-disc and mtu not 1500 +< ovpn mtu-disc maybe +< ovpn mtu-disc no +< ovpn mtu-disc off +< ovpn mtu-disc with mssfix or fragment +< ovpn mtu-disc yes +< proxy reports +< proxy reports daily +< proxy reports monthly +< proxy reports today +< proxy reports weekly < server restart < static routes < visit us at diff --git a/html/cgi-bin/logs.cgi/calamaris.dat b/html/cgi-bin/logs.cgi/calamaris.dat index 4ee60c2..07fdf8a 100644 --- a/html/cgi-bin/logs.cgi/calamaris.dat +++ b/html/cgi-bin/logs.cgi/calamaris.dat @@ -24,6 +24,7 @@ my $unique=time; my $squidlogdir = "/var/log/squid"; my $reportdir = "${General::swroot}/proxy/calamaris/reports"; +my $sargdir = "/var/log/sarg"; unless (-e $reportdir) { mkdir($reportdir) } @@ -241,6 +242,86 @@ if ($errormessage) { &Header::closebox(); } +# Link sarg reports. +if (-e $sargdir) { + &Header::openbox('100%', 'left', "$Lang::tr{'proxy reports'}:"); + + print <<END; + <table width="100%"> + <tr> +END + + # Today. + if (-e "$sargdir/today") { + print <<END; + <td width="25%" align="center"> + <a href="/proxy-reports/today" target="_blank">$Lang::tr{'proxy reports today'}</a> + </td> +END + } else { + print <<END; + <td width="25%" align="center"> + $Lang::tr{'proxy reports today'} + </td> +END + } + + # Daily. + if (-e "$sargdir/daily") { + print <<END; + <td width="25%" align="center"> + <a href="/proxy-reports/daily" target="_blank">$Lang::tr{'proxy reports daily'}</a> + </td> +END + } else { + print <<END; + <td width="25%" align="center"> + $Lang::tr{'proxy reports daily'} + </td> +END + } + + # Weekly. + if (-e "$sargdir/weekly") { + print <<END; + <td width="25%" align="center"> + <a href="/proxy-reports/weekly" target="_blank">$Lang::tr{'proxy reports weekly'}</a> + </td> +END + } else { + print <<END; + <td width="25%" align="center"> + $Lang::tr{'proxy reports weekly'} + </td> +END + } + + # Monthly. + if (-e "$sargdir/monthly") { + print <<END; + <td width="25%" align="center"> + <a href="/proxy-reports/monthly" target="_blank">$Lang::tr{'proxy reports monthly'}</a> + </td> +END + } else { + print <<END; + <td width="25%" align="center"> + $Lang::tr{'proxy reports monthly'} + </td> +END + } + + print <<END; + </tr> + </table> + + <br><br> +END + + &Header::closebox(); +} + + &Header::openbox('100%', 'left', "$Lang::tr{'settings'}:"); print <<END diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 1c32fb6..f7ab1ea 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1389,12 +1389,12 @@ 'ovpn errmsg invalid ip or mask' => 'Ungültige Netzwerk-Adresse oder Subnetzmaske', 'ovpn log' => 'OVPN-Log', 'ovpn mtu-disc' => 'Path MTU Discovery', +'ovpn mtu-disc and mtu not 1500' => 'Path MTU Discovery benötigt eine MTU von 1500.', 'ovpn mtu-disc maybe' => 'Optional', 'ovpn mtu-disc no' => 'Niemals', 'ovpn mtu-disc off' => 'Deaktiviert', -'ovpn mtu-disc yes' => 'Forciert', -'ovpn mtu-disc and mtu not 1500' => 'Path MTU Discovery benötigt eine MTU von 1500.', 'ovpn mtu-disc with mssfix or fragment' => 'Path MTU Discovery kann nicht gemeinsam mit mssfix oder fragment verwendet werden.', +'ovpn mtu-disc yes' => 'Forciert', 'ovpn on blue' => 'OpenVPN auf BLAU', 'ovpn on orange' => 'OpenVPN auf ORANGE', 'ovpn on red' => 'OpenVPN auf ROT', @@ -1513,6 +1513,11 @@ 'proxy no proxy local' => 'Lokalen Proxy auf blauen/grünen Netzwerken verhindern', 'proxy port' => 'Proxy-Port', 'proxy reconfigure' => 'Speichern und Laden', +'proxy reports' => 'Proxyberichte', +'proxy reports daily' => 'Tägliche Berichte', +'proxy reports monthly' => 'Monatliche Berichte', +'proxy reports today' => 'Heute', +'proxy reports weekly' => 'Wöchentliche Berichte', 'psk' => 'PSK', 'pulse' => 'Puls', 'pulse dial' => 'Pulswahl:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 0a38750..5080559 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1416,12 +1416,12 @@ 'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', 'ovpn log' => 'OVPN-Log', 'ovpn mtu-disc' => 'Path MTU Discovery', +'ovpn mtu-disc and mtu not 1500' => 'Path MTU Discovery requires a MTU of 1500.', 'ovpn mtu-disc maybe' => 'Optionally', 'ovpn mtu-disc no' => 'Never', 'ovpn mtu-disc off' => 'Disabled', -'ovpn mtu-disc yes' => 'Forced', -'ovpn mtu-disc and mtu not 1500' => 'Path MTU Discovery requires a MTU of 1500.', 'ovpn mtu-disc with mssfix or fragment' => 'Path MTU Discovery cannot be used with mssfix or fragment.', +'ovpn mtu-disc yes' => 'Forced', 'ovpn on blue' => 'OpenVPN on BLUE', 'ovpn on orange' => 'OpenVPN on ORANGE', 'ovpn on red' => 'OpenVPN on RED', @@ -1540,6 +1540,11 @@ 'proxy no proxy local' => 'Disallow local proxying on BLUE/GREEN networks', 'proxy port' => 'Proxy Port', 'proxy reconfigure' => 'Save and Reload', +'proxy reports' => 'Proxy Reports', +'proxy reports daily' => 'Daily reports', +'proxy reports monthly' => 'Monthly reports', +'proxy reports today' => 'Today', +'proxy reports weekly' => 'Weekly reports', 'psk' => 'PSK', 'pulse' => 'Pulse', 'pulse dial' => 'Pulse dial:', diff --git a/lfs/sarg b/lfs/sarg new file mode 100644 index 0000000..c8794fe --- /dev/null +++ b/lfs/sarg @@ -0,0 +1,100 @@ +############################################################################### +# # +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) 2012 Michael Tremer # +# # +# 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.3.3 + +THISAPP = sarg-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = sarg +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 09dba9a960d500acd7f17802de62512c + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/sarg + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make $(EXTRA_INSTALL) install + + # Install configuration file. + cp -v $(DIR_SRC)/config/sarg/sarg.conf /etc/sarg/sarg.conf + + # Install helper script. + install -m 755 $(DIR_SRC)/config/sarg/update-sarg-reports \ + /usr/sbin/update-sarg-reports + + # Install cron job. + for i in hourly daily weekly monthly; do \ + install -m 754 -v $(DIR_SRC)/config/sarg/cron.$${i} \ + /etc/fcron.$${i}/sarg-reports; \ + done + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 5d142ef..1165c09 100755 --- a/make.sh +++ b/make.sh @@ -774,6 +774,7 @@ buildipfire() { ipfiremake telnet ipfiremake stress ipfiremake libstatgrab + ipfiremake sarg echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild diff --git a/src/paks/sarg/install.sh b/src/paks/sarg/install.sh new file mode 100644 index 0000000..d3b17a9 --- /dev/null +++ b/src/paks/sarg/install.sh @@ -0,0 +1,34 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} + +# Create data directory. +[ -d "/var/log/sarg" ] || mkdir /var/log/sarg + +# Create initial report. +/usr/sbin/update-sarg-reports today >/dev/null 2>&1 + +exit 0 diff --git a/src/paks/sarg/uninstall.sh b/src/paks/sarg/uninstall.sh new file mode 100644 index 0000000..66f4344 --- /dev/null +++ b/src/paks/sarg/uninstall.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +make_backup ${NAME} +remove_files diff --git a/src/paks/sarg/update.sh b/src/paks/sarg/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/sarg/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 6bd5e3144c62df819fbb9d790d0348a64065d179
by git＠ipfire.org 26 Nov '12

26 Nov '12

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, thirteen has been updated via 6bd5e3144c62df819fbb9d790d0348a64065d179 (commit) via 01e5e86e1a9f6c158d3f928da0c1340ea877d914 (commit) from 44967a84023ffa884ab4c4b484bdc6982ded66d3 (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 6bd5e3144c62df819fbb9d790d0348a64065d179 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 26 17:46:49 2012 +0100 misc-progs: setportfw: fix unintialised strings. commit 01e5e86e1a9f6c158d3f928da0c1340ea877d914 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 26 17:30:40 2012 +0100 Revert "libsmooth: findkey: Empty target string if key could not be found." This reverts commit 0add8f90ae1d5a15000147df2a86d060a2a89917. ----------------------------------------------------------------------- Summary of changes: src/install+setup/libsmooth/varval.c | 3 --- src/misc-progs/setportfw.c | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) Difference in files: diff --git a/src/install+setup/libsmooth/varval.c b/src/install+setup/libsmooth/varval.c index d127890..9a64365 100644 --- a/src/install+setup/libsmooth/varval.c +++ b/src/install+setup/libsmooth/varval.c @@ -151,9 +151,6 @@ int findkey(struct keyvalue *head, char *key, char *value) cur = cur->next; } - // Empty value if we could not find key. - value[0] = '\0'; - return 0; } diff --git a/src/misc-progs/setportfw.c b/src/misc-progs/setportfw.c index ca79218..a65aebd 100644 --- a/src/misc-progs/setportfw.c +++ b/src/misc-progs/setportfw.c @@ -45,11 +45,11 @@ int main(void) { FILE *ipfile = NULL, *ifacefile = NULL; int count; - char iface[STRING_SIZE]; - char locip[STRING_SIZE]; - char greenip[STRING_SIZE], greenmask[STRING_SIZE]; - char bluedev[STRING_SIZE], blueip[STRING_SIZE], bluemask[STRING_SIZE]; - char orangedev[STRING_SIZE], orangeip[STRING_SIZE], orangemask[STRING_SIZE]; + char iface[STRING_SIZE] =""; + char locip[STRING_SIZE] =""; + char greenip[STRING_SIZE] ="", greenmask[STRING_SIZE] =""; + char bluedev[STRING_SIZE] ="", blueip[STRING_SIZE] ="", bluemask[STRING_SIZE] =""; + char orangedev[STRING_SIZE] ="", orangeip[STRING_SIZE] ="", orangemask[STRING_SIZE] =""; char *protocol; char *srcip; char *locport; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 44967a84023ffa884ab4c4b484bdc6982ded66d3
by git＠ipfire.org 26 Nov '12

26 Nov '12

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. d46bec52993235a8b185a2f040846e9059c3f4e7
by git＠ipfire.org 26 Nov '12

26 Nov '12

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 d46bec52993235a8b185a2f040846e9059c3f4e7 (commit) via c4e04122359ee5de775bb0f69a678b7ce28f5707 (commit) via d41f9e6ee88320b8a5e0433326053e21b4b0ca49 (commit) from 5068ac3822ac9afbee841ac417963b2c1343d809 (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 d46bec52993235a8b185a2f040846e9059c3f4e7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Nov 26 10:55:32 2012 +0100 calamaris: Fix viewing reports. Fixes that only the last created report could be viewed (#10259). commit c4e04122359ee5de775bb0f69a678b7ce28f5707 Merge: 5068ac3 d41f9e6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Nov 26 10:55:01 2012 +0100 Merge branch 'create-core-65' into next commit d41f9e6ee88320b8a5e0433326053e21b4b0ca49 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Nov 23 14:32:25 2012 +0100 Create core update 65. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{63 => 65}/exclude | 0 config/rootfiles/{oldcore/59 => core/65}/filelists/files | 4 ++-- config/rootfiles/core/{60 => 65}/meta | 0 config/rootfiles/core/{64 => 65}/update.sh | 7 ++++--- html/cgi-bin/logs.cgi/calamaris.dat | 4 ++-- make.sh | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) copy config/rootfiles/core/{63 => 65}/exclude (100%) copy config/rootfiles/{oldcore/59 => core/65}/filelists/files (61%) copy config/rootfiles/core/{60 => 65}/meta (100%) copy config/rootfiles/core/{64 => 65}/update.sh (97%) Difference in files: diff --git a/config/rootfiles/core/65/exclude b/config/rootfiles/core/65/exclude new file mode 100644 index 0000000..b6a8d1d --- /dev/null +++ b/config/rootfiles/core/65/exclude @@ -0,0 +1,13 @@ +srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files new file mode 100644 index 0000000..f481777 --- /dev/null +++ b/config/rootfiles/core/65/filelists/files @@ -0,0 +1,7 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/logs.cgi/calamaris.dat +srv/web/ipfire/cgi-bin/ovpnmain.cgi +usr/sbin/ovpn-ccd-convert +var/ipfire/general-functions.pl +var/ipfire/langs diff --git a/config/rootfiles/core/65/meta b/config/rootfiles/core/65/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/65/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh new file mode 100644 index 0000000..85ab2e9 --- /dev/null +++ b/config/rootfiles/core/65/update.sh @@ -0,0 +1,83 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=65 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# Convert OpenVPN RW connections. +/usr/sbin/ovpn-ccd-convert + +#Rebuild module dep's +#arch=`uname -m` +#if [ ${arch::3} == "arm" ]; then +# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 +#else +# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 +# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 +#fi + + +#Rebuild initrd's because some compat-wireless modules are inside +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire +#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae +#fi +#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then +#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen +#fi + +sync + +# This update need a reboot... +#touch /var/run/need_reboot + +# +#Finish +/etc/init.d/fireinfo start +sendprofile +#Don't report the exitcode last command +exit 0 diff --git a/html/cgi-bin/logs.cgi/calamaris.dat b/html/cgi-bin/logs.cgi/calamaris.dat index 19a3693..4ee60c2 100644 --- a/html/cgi-bin/logs.cgi/calamaris.dat +++ b/html/cgi-bin/logs.cgi/calamaris.dat @@ -98,6 +98,7 @@ if ($reportsettings{'ACTION'} eq $Lang::tr{'calamaris create report'}) delete $reportsettings{'DAY_END'}; delete $reportsettings{'MONTH_END'}; delete $reportsettings{'YEAR_END'}; + delete $reportsettings{'REPORT'}; &General::writehash("${General::swroot}/proxy/calamaris/settings", \%reportsettings); @@ -493,12 +494,11 @@ END if (@reports) { print "<td><select name='REPORT' size='5'>\n"; - my $n=0; foreach (@reports) { @reportdata=split(/#/); print "\t<option "; - if ($n eq '0') { print "selected "; $reportsettings{'REPORT'}=$reportdata[1]; $n++} + if ($reportsettings{'REPORT'} eq $reportdata[1]) { print "selected ";} print "value='$reportdata[1]'>$reportdata[2]  -  $reportdata[3]</option>\n"; } print "</select></td>\n"; diff --git a/make.sh b/make.sh index 0675d8e..5d142ef 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.11" # Version number -CORE="64" # Core Level (Filename) +CORE="65" # Core Level (Filename) PAKFIRE_CORE="64" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5068ac3822ac9afbee841ac417963b2c1343d809
by git＠ipfire.org 26 Nov '12

26 Nov '12

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 5068ac3822ac9afbee841ac417963b2c1343d809 (commit) from b368a2f84d7a99c37cf19194ffa167d30363a63d (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 5068ac3822ac9afbee841ac417963b2c1343d809 Author: Alexander Marx <amarx(a)ipfire.org> Date: Mon Nov 26 05:45:07 2012 +0100 OpenVPN ccd: try to adapt changes to latest next branch. ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/ovpnmain.cgi | 40 +++++++++++++++++++++++++++++++--------- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 3 files changed, 33 insertions(+), 9 deletions(-) Difference in files: diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 9dd9011..3c090b0 100755 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2579,6 +2579,8 @@ END if ($cgiparams{'ACTION'} eq 'editsave'){ my ($a,$b) =split (/\|/,$cgiparams{'ccdname'}); if ( $a ne $b){ &modccdnet($a,$b);} + $cgiparams{'ccdname'}=''; + $cgiparams{'ccdsubnet'}=''; } if ($cgiparams{'ACTION'} eq $Lang::tr{'ccd add'}) { @@ -2633,6 +2635,11 @@ END &Header::closebox(); } &Header::openbox('100%', 'LEFT',$Lang::tr{'ccd net'} ); + if ( -e "/var/run/openvpn.pid"){ + print "<b>$Lang::tr{'attention'}:</b><br>"; + print "$Lang::tr{'ccd noaddnet'}<br><hr>"; + } + print <<END <table width='100%' border='0' cellpadding='0' cellspacing='1'> <tr> @@ -3303,6 +3310,8 @@ if ($cgiparams{'TYPE'} eq 'host') { my @temp=(); my %ccdroutehash=(); my $keypoint=0; + my $ip; + my $cidr; if ($cgiparams{'IR'} ne ''){ @temp = split("\n",$cgiparams{'IR'}); &General::readhasharray("${General::swroot}/ovpn/ccdroute", \%ccdroutehash); @@ -3321,19 +3330,32 @@ if ($cgiparams{'TYPE'} eq 'host') { foreach $val (@temp){ chomp($val); $val=~s/\s*$//g; - my($ip,$cidr) = split(/\//,$val); - $ip=&General::getnetworkip($ip,&General::iporsubtocidr($cidr)); - $cidr=&General::iporsubtodec($cidr); - - #check if iroute exists in ccdroute + #check if iroute exists in ccdroute or if new iroute is part of an existing one foreach my $key (keys %ccdroutehash) { foreach my $oldiroute ( 1 .. $#{$ccdroutehash{$key}}){ - if ($ccdroutehash{$key}[$oldiroute] eq "$ip/$cidr") { - $errormessage=$Lang::tr{'ccd err irouteexist'}; - goto VPNCONF_ERROR; - } + if ($ccdroutehash{$key}[$oldiroute] eq "$val") { + $errormessage=$errormessage.$Lang::tr{'ccd err irouteexist'}; + goto VPNCONF_ERROR; + } + my ($ip1,$cidr1) = split (/\//, $val); + my ($ip2,$cidr2) = split (/\//, $ccdroutehash{$key}[$oldiroute]); + if (&General::IpInSubnet ($ip1,$ip2,$cidr2)){ + $errormessage=$errormessage.$Lang::tr{'ccd err irouteexist'}; + goto VPNCONF_ERROR; + } + } } + if (!&General::validipandmask($val)){ + $errormessage=$errormessage."Route ".$Lang::tr{'ccd invalid'}." ($val)"; + goto VPNCONF_ERROR; + }else{ + ($ip,$cidr) = split(/\//,$val); + $ip=&General::getnetworkip($ip,&General::iporsubtocidr($cidr)); + $cidr=&General::iporsubtodec($cidr); + $ccdroutehash{$keypoint}[$i] = $ip."/".$cidr; + + } #check for existing network IP's if (&General::IpInSubnet ($ip,$netsettings{GREEN_NETADDRESS},$netsettings{GREEN_NETMASK}) && $netsettings{GREEN_NETADDRESS} ne '0.0.0.0') diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 7fe336c..1c32fb6 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -488,6 +488,7 @@ 'ccd modify' => 'Netzwerk ändern', 'ccd name' => 'Name', 'ccd net' => 'Statische IP-Adressen-Pools', +'ccd noaddnet' => 'Neue statische Netze können erst erstellt werden, wenn der openVPN Server gestoppt wurde.', 'ccd none' => 'Keine', 'ccd routes' => 'Routen:', 'ccd subnet' => 'Subnetz', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 4a2f73e..0a38750 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -506,6 +506,7 @@ 'ccd modify' => 'Change network', 'ccd name' => 'Name', 'ccd net' => 'Static IP address pools', +'ccd noaddnet' => 'You can only add new static networks when OpenVPN server is stopped.', 'ccd none' => 'None', 'ccd routes' => 'Routing:', 'ccd subnet' => 'Subnet', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 0add8f90ae1d5a15000147df2a86d060a2a89917
by git＠ipfire.org 25 Nov '12

25 Nov '12

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 83601a06bc8036b21e9b6c6911c8096e35bd443d
by git＠ipfire.org 25 Nov '12

25 Nov '12

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 0eb9a71a7b5dfce4425b9ca6e1e9dfb47dac6dac
by git＠ipfire.org 25 Nov '12

25 Nov '12

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, thirteen has been updated via 0eb9a71a7b5dfce4425b9ca6e1e9dfb47dac6dac (commit) from e5713a7e2109cd38a64a2d752495a735a8ac4453 (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 0eb9a71a7b5dfce4425b9ca6e1e9dfb47dac6dac Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Nov 25 13:04:37 2012 +0100 updater: change 2.13 updater to core66. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{65 => 66}/exclude | 0 config/rootfiles/core/{65 => 66}/filelists/armv5tel/binutils | 0 config/rootfiles/core/{65 => 66}/filelists/armv5tel/dracut | 0 config/rootfiles/core/{65 => 66}/filelists/armv5tel/gcc | 0 config/rootfiles/core/{65 => 66}/filelists/armv5tel/glibc | 0 .../core/{65 => 66}/filelists/armv5tel/linux-kirkwood | 0 config/rootfiles/core/{65 => 66}/filelists/armv5tel/linux-omap | 0 config/rootfiles/core/{65 => 66}/filelists/armv5tel/linux-rpi | 0 .../rootfiles/core/{65 => 66}/filelists/armv5tel/rpi-firmware | 0 config/rootfiles/core/{65 => 66}/filelists/armv5tel/u-boot | 0 config/rootfiles/core/{65 => 66}/filelists/armv5tel/util-linux | 0 config/rootfiles/core/{65 => 66}/filelists/autoconf | 0 config/rootfiles/core/{65 => 66}/filelists/automake | 0 config/rootfiles/core/{65 => 66}/filelists/bash | 0 config/rootfiles/core/{65 => 66}/filelists/bridge-utils | 0 config/rootfiles/core/{65 => 66}/filelists/cairo | 0 config/rootfiles/core/{65 => 66}/filelists/capi4k-utils | 0 config/rootfiles/core/{65 => 66}/filelists/cmake | 0 config/rootfiles/core/{65 => 66}/filelists/collectd | 0 config/rootfiles/core/{65 => 66}/filelists/compat-wireless | 0 config/rootfiles/core/{65 => 66}/filelists/coreutils | 0 config/rootfiles/core/{65 => 66}/filelists/curl | 0 config/rootfiles/core/{65 => 66}/filelists/cyrus-sasl | 0 config/rootfiles/core/{65 => 66}/filelists/daq | 0 config/rootfiles/core/{65 => 66}/filelists/dejavu-fonts-ttf | 0 config/rootfiles/core/{65 => 66}/filelists/dhcp | 0 config/rootfiles/core/{65 => 66}/filelists/dvb-firmwares | 0 config/rootfiles/core/{65 => 66}/filelists/e2fsprogs | 0 config/rootfiles/core/{65 => 66}/filelists/file | 0 config/rootfiles/core/{65 => 66}/filelists/files | 0 config/rootfiles/core/{65 => 66}/filelists/fontconfig | 0 config/rootfiles/core/{65 => 66}/filelists/gawk | 0 config/rootfiles/core/{65 => 66}/filelists/gettext | 0 config/rootfiles/core/{65 => 66}/filelists/glib | 0 config/rootfiles/core/{65 => 66}/filelists/gmp | 0 config/rootfiles/core/{65 => 66}/filelists/gmp-compat | 0 config/rootfiles/core/{65 => 66}/filelists/gnupg | 0 config/rootfiles/core/{65 => 66}/filelists/grep | 0 config/rootfiles/core/{65 => 66}/filelists/hdparm | 0 config/rootfiles/core/{65 => 66}/filelists/i586/acpi-init | 0 config/rootfiles/core/{65 => 66}/filelists/i586/acpid | 0 config/rootfiles/core/{65 => 66}/filelists/i586/binutils | 0 config/rootfiles/core/{65 => 66}/filelists/i586/dracut | 0 config/rootfiles/core/{65 => 66}/filelists/i586/gcc | 0 config/rootfiles/core/{65 => 66}/filelists/i586/glibc | 0 config/rootfiles/core/{65 => 66}/filelists/i586/grub | 0 config/rootfiles/core/{65 => 66}/filelists/i586/linux | 0 .../core/{65 => 66}/filelists/i586/strongswan-padlock | 0 config/rootfiles/core/{65 => 66}/filelists/i586/util-linux | 0 config/rootfiles/core/{65 => 66}/filelists/inetutils | 0 config/rootfiles/core/{65 => 66}/filelists/iproute2 | 0 config/rootfiles/core/{65 => 66}/filelists/iptables | 0 config/rootfiles/core/{65 => 66}/filelists/kbd | 0 config/rootfiles/core/{65 => 66}/filelists/less | 0 config/rootfiles/core/{65 => 66}/filelists/libffi | 0 config/rootfiles/core/{65 => 66}/filelists/libnl | 0 config/rootfiles/core/{65 => 66}/filelists/libsigc++ | 0 config/rootfiles/core/{65 => 66}/filelists/libtool | 0 config/rootfiles/core/{65 => 66}/filelists/linux-atm | 0 config/rootfiles/core/{65 => 66}/filelists/linux-firmware | 0 config/rootfiles/core/{65 => 66}/filelists/m4 | 0 config/rootfiles/core/{65 => 66}/filelists/mISDNuser | 0 config/rootfiles/core/{65 => 66}/filelists/man | 0 config/rootfiles/core/{65 => 66}/filelists/misc-progs | 0 config/rootfiles/core/{65 => 66}/filelists/mpfr | 0 config/rootfiles/core/{65 => 66}/filelists/ncurses | 0 config/rootfiles/core/{65 => 66}/filelists/newt | 0 config/rootfiles/core/{65 => 66}/filelists/openldap | 0 config/rootfiles/core/{65 => 66}/filelists/openssl | 0 config/rootfiles/core/{65 => 66}/filelists/pam | 0 config/rootfiles/core/{65 => 66}/filelists/pango | 0 config/rootfiles/core/{65 => 66}/filelists/pciutils | 0 config/rootfiles/core/{65 => 66}/filelists/pcmciautils | 0 config/rootfiles/core/{65 => 66}/filelists/pcre | 0 config/rootfiles/core/{65 => 66}/filelists/pcre-compat | 0 config/rootfiles/core/{65 => 66}/filelists/pixman | 0 config/rootfiles/core/{65 => 66}/filelists/popt | 0 config/rootfiles/core/{65 => 66}/filelists/pptp | 0 config/rootfiles/core/{65 => 66}/filelists/readline | 0 config/rootfiles/core/{65 => 66}/filelists/readline-compat | 0 config/rootfiles/core/{65 => 66}/filelists/reiserfsprogs | 0 config/rootfiles/core/{65 => 66}/filelists/rrdtool | 0 config/rootfiles/core/{65 => 66}/filelists/screen | 0 config/rootfiles/core/{65 => 66}/filelists/sdparm | 0 config/rootfiles/core/{65 => 66}/filelists/sed | 0 config/rootfiles/core/{65 => 66}/filelists/setup | 0 config/rootfiles/core/{65 => 66}/filelists/shadow | 0 config/rootfiles/core/{65 => 66}/filelists/slang | 0 config/rootfiles/core/{65 => 66}/filelists/smartmontools | 0 config/rootfiles/core/{65 => 66}/filelists/snort | 0 config/rootfiles/core/{65 => 66}/filelists/stage2-partial | 0 config/rootfiles/core/{65 => 66}/filelists/strongswan | 0 config/rootfiles/core/{65 => 66}/filelists/sysfsutils | 0 config/rootfiles/core/{65 => 66}/filelists/sysvinit | 0 config/rootfiles/core/{65 => 66}/filelists/texinfo | 0 config/rootfiles/core/{65 => 66}/filelists/tzdata | 0 config/rootfiles/core/{65 => 66}/filelists/udev | 0 config/rootfiles/core/{65 => 66}/filelists/usbutils | 0 config/rootfiles/core/{65 => 66}/filelists/vim | 0 config/rootfiles/core/{65 => 66}/filelists/wget | 0 config/rootfiles/core/{65 => 66}/filelists/wpa_supplicant | 0 config/rootfiles/core/{65 => 66}/filelists/xz | 0 config/rootfiles/core/{65 => 66}/filelists/zlib | 0 config/rootfiles/core/{65 => 66}/meta | 0 config/rootfiles/core/{65 => 66}/update.sh | 10 +++++----- 105 files changed, 5 insertions(+), 5 deletions(-) rename config/rootfiles/core/{65 => 66}/exclude (100%) rename config/rootfiles/core/{65 => 66}/filelists/armv5tel/binutils (100%) rename config/rootfiles/core/{65 => 66}/filelists/armv5tel/dracut (100%) rename config/rootfiles/core/{65 => 66}/filelists/armv5tel/gcc (100%) rename config/rootfiles/core/{65 => 66}/filelists/armv5tel/glibc (100%) rename config/rootfiles/core/{65 => 66}/filelists/armv5tel/linux-kirkwood (100%) rename config/rootfiles/core/{65 => 66}/filelists/armv5tel/linux-omap (100%) rename config/rootfiles/core/{65 => 66}/filelists/armv5tel/linux-rpi (100%) rename config/rootfiles/core/{65 => 66}/filelists/armv5tel/rpi-firmware (100%) rename config/rootfiles/core/{65 => 66}/filelists/armv5tel/u-boot (100%) rename config/rootfiles/core/{65 => 66}/filelists/armv5tel/util-linux (100%) rename config/rootfiles/core/{65 => 66}/filelists/autoconf (100%) rename config/rootfiles/core/{65 => 66}/filelists/automake (100%) rename config/rootfiles/core/{65 => 66}/filelists/bash (100%) rename config/rootfiles/core/{65 => 66}/filelists/bridge-utils (100%) rename config/rootfiles/core/{65 => 66}/filelists/cairo (100%) rename config/rootfiles/core/{65 => 66}/filelists/capi4k-utils (100%) rename config/rootfiles/core/{65 => 66}/filelists/cmake (100%) rename config/rootfiles/core/{65 => 66}/filelists/collectd (100%) rename config/rootfiles/core/{65 => 66}/filelists/compat-wireless (100%) rename config/rootfiles/core/{65 => 66}/filelists/coreutils (100%) rename config/rootfiles/core/{65 => 66}/filelists/curl (100%) rename config/rootfiles/core/{65 => 66}/filelists/cyrus-sasl (100%) rename config/rootfiles/core/{65 => 66}/filelists/daq (100%) rename config/rootfiles/core/{65 => 66}/filelists/dejavu-fonts-ttf (100%) rename config/rootfiles/core/{65 => 66}/filelists/dhcp (100%) rename config/rootfiles/core/{65 => 66}/filelists/dvb-firmwares (100%) rename config/rootfiles/core/{65 => 66}/filelists/e2fsprogs (100%) rename config/rootfiles/core/{65 => 66}/filelists/file (100%) rename config/rootfiles/core/{65 => 66}/filelists/files (100%) rename config/rootfiles/core/{65 => 66}/filelists/fontconfig (100%) rename config/rootfiles/core/{65 => 66}/filelists/gawk (100%) rename config/rootfiles/core/{65 => 66}/filelists/gettext (100%) rename config/rootfiles/core/{65 => 66}/filelists/glib (100%) rename config/rootfiles/core/{65 => 66}/filelists/gmp (100%) rename config/rootfiles/core/{65 => 66}/filelists/gmp-compat (100%) rename config/rootfiles/core/{65 => 66}/filelists/gnupg (100%) rename config/rootfiles/core/{65 => 66}/filelists/grep (100%) rename config/rootfiles/core/{65 => 66}/filelists/hdparm (100%) rename config/rootfiles/core/{65 => 66}/filelists/i586/acpi-init (100%) rename config/rootfiles/core/{65 => 66}/filelists/i586/acpid (100%) rename config/rootfiles/core/{65 => 66}/filelists/i586/binutils (100%) rename config/rootfiles/core/{65 => 66}/filelists/i586/dracut (100%) rename config/rootfiles/core/{65 => 66}/filelists/i586/gcc (100%) rename config/rootfiles/core/{65 => 66}/filelists/i586/glibc (100%) rename config/rootfiles/core/{65 => 66}/filelists/i586/grub (100%) rename config/rootfiles/core/{65 => 66}/filelists/i586/linux (100%) rename config/rootfiles/core/{65 => 66}/filelists/i586/strongswan-padlock (100%) rename config/rootfiles/core/{65 => 66}/filelists/i586/util-linux (100%) rename config/rootfiles/core/{65 => 66}/filelists/inetutils (100%) rename config/rootfiles/core/{65 => 66}/filelists/iproute2 (100%) rename config/rootfiles/core/{65 => 66}/filelists/iptables (100%) rename config/rootfiles/core/{65 => 66}/filelists/kbd (100%) rename config/rootfiles/core/{65 => 66}/filelists/less (100%) rename config/rootfiles/core/{65 => 66}/filelists/libffi (100%) rename config/rootfiles/core/{65 => 66}/filelists/libnl (100%) rename config/rootfiles/core/{65 => 66}/filelists/libsigc++ (100%) rename config/rootfiles/core/{65 => 66}/filelists/libtool (100%) rename config/rootfiles/core/{65 => 66}/filelists/linux-atm (100%) rename config/rootfiles/core/{65 => 66}/filelists/linux-firmware (100%) rename config/rootfiles/core/{65 => 66}/filelists/m4 (100%) rename config/rootfiles/core/{65 => 66}/filelists/mISDNuser (100%) rename config/rootfiles/core/{65 => 66}/filelists/man (100%) rename config/rootfiles/core/{65 => 66}/filelists/misc-progs (100%) rename config/rootfiles/core/{65 => 66}/filelists/mpfr (100%) rename config/rootfiles/core/{65 => 66}/filelists/ncurses (100%) rename config/rootfiles/core/{65 => 66}/filelists/newt (100%) rename config/rootfiles/core/{65 => 66}/filelists/openldap (100%) rename config/rootfiles/core/{65 => 66}/filelists/openssl (100%) rename config/rootfiles/core/{65 => 66}/filelists/pam (100%) rename config/rootfiles/core/{65 => 66}/filelists/pango (100%) rename config/rootfiles/core/{65 => 66}/filelists/pciutils (100%) rename config/rootfiles/core/{65 => 66}/filelists/pcmciautils (100%) rename config/rootfiles/core/{65 => 66}/filelists/pcre (100%) rename config/rootfiles/core/{65 => 66}/filelists/pcre-compat (100%) rename config/rootfiles/core/{65 => 66}/filelists/pixman (100%) rename config/rootfiles/core/{65 => 66}/filelists/popt (100%) rename config/rootfiles/core/{65 => 66}/filelists/pptp (100%) rename config/rootfiles/core/{65 => 66}/filelists/readline (100%) rename config/rootfiles/core/{65 => 66}/filelists/readline-compat (100%) rename config/rootfiles/core/{65 => 66}/filelists/reiserfsprogs (100%) rename config/rootfiles/core/{65 => 66}/filelists/rrdtool (100%) rename config/rootfiles/core/{65 => 66}/filelists/screen (100%) rename config/rootfiles/core/{65 => 66}/filelists/sdparm (100%) rename config/rootfiles/core/{65 => 66}/filelists/sed (100%) rename config/rootfiles/core/{65 => 66}/filelists/setup (100%) rename config/rootfiles/core/{65 => 66}/filelists/shadow (100%) rename config/rootfiles/core/{65 => 66}/filelists/slang (100%) rename config/rootfiles/core/{65 => 66}/filelists/smartmontools (100%) rename config/rootfiles/core/{65 => 66}/filelists/snort (100%) rename config/rootfiles/core/{65 => 66}/filelists/stage2-partial (100%) rename config/rootfiles/core/{65 => 66}/filelists/strongswan (100%) rename config/rootfiles/core/{65 => 66}/filelists/sysfsutils (100%) rename config/rootfiles/core/{65 => 66}/filelists/sysvinit (100%) rename config/rootfiles/core/{65 => 66}/filelists/texinfo (100%) rename config/rootfiles/core/{65 => 66}/filelists/tzdata (100%) rename config/rootfiles/core/{65 => 66}/filelists/udev (100%) rename config/rootfiles/core/{65 => 66}/filelists/usbutils (100%) rename config/rootfiles/core/{65 => 66}/filelists/vim (100%) rename config/rootfiles/core/{65 => 66}/filelists/wget (100%) rename config/rootfiles/core/{65 => 66}/filelists/wpa_supplicant (100%) rename config/rootfiles/core/{65 => 66}/filelists/xz (100%) rename config/rootfiles/core/{65 => 66}/filelists/zlib (100%) rename config/rootfiles/core/{65 => 66}/meta (100%) rename config/rootfiles/core/{65 => 66}/update.sh (97%) Difference in files: diff --git a/config/rootfiles/core/65/exclude b/config/rootfiles/core/65/exclude deleted file mode 100644 index 0b54d05..0000000 --- a/config/rootfiles/core/65/exclude +++ /dev/null @@ -1,15 +0,0 @@ -srv/web/ipfire/html/proxy.pac -etc/udev/rules.d/30-persistent-network.rules -etc/collectd.custom -etc/shadow -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -var/updatecache -etc/localtime -var/ipfire/ovpn -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/65/filelists/armv5tel/binutils b/config/rootfiles/core/65/filelists/armv5tel/binutils deleted file mode 120000 index ac971f9..0000000 --- a/config/rootfiles/core/65/filelists/armv5tel/binutils +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/binutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/dracut b/config/rootfiles/core/65/filelists/armv5tel/dracut deleted file mode 120000 index 861df3f..0000000 --- a/config/rootfiles/core/65/filelists/armv5tel/dracut +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/dracut \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/gcc b/config/rootfiles/core/65/filelists/armv5tel/gcc deleted file mode 120000 index 84f7b93..0000000 --- a/config/rootfiles/core/65/filelists/armv5tel/gcc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/gcc \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/glibc b/config/rootfiles/core/65/filelists/armv5tel/glibc deleted file mode 120000 index 4c70d72..0000000 --- a/config/rootfiles/core/65/filelists/armv5tel/glibc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/65/filelists/armv5tel/linux-kirkwood deleted file mode 120000 index 7217107..0000000 --- a/config/rootfiles/core/65/filelists/armv5tel/linux-kirkwood +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/linux-omap b/config/rootfiles/core/65/filelists/armv5tel/linux-omap deleted file mode 120000 index 50bf786..0000000 --- a/config/rootfiles/core/65/filelists/armv5tel/linux-omap +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-omap \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/linux-rpi b/config/rootfiles/core/65/filelists/armv5tel/linux-rpi deleted file mode 120000 index a651a49..0000000 --- a/config/rootfiles/core/65/filelists/armv5tel/linux-rpi +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/rpi-firmware b/config/rootfiles/core/65/filelists/armv5tel/rpi-firmware deleted file mode 120000 index 428fdf8..0000000 --- a/config/rootfiles/core/65/filelists/armv5tel/rpi-firmware +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/rpi-firmware \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/u-boot b/config/rootfiles/core/65/filelists/armv5tel/u-boot deleted file mode 120000 index 3df31a8..0000000 --- a/config/rootfiles/core/65/filelists/armv5tel/u-boot +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/u-boot \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/util-linux b/config/rootfiles/core/65/filelists/armv5tel/util-linux deleted file mode 120000 index 2596908..0000000 --- a/config/rootfiles/core/65/filelists/armv5tel/util-linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/armv5tel/util-linux \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/autoconf b/config/rootfiles/core/65/filelists/autoconf deleted file mode 120000 index aa39ce6..0000000 --- a/config/rootfiles/core/65/filelists/autoconf +++ /dev/null @@ -1 +0,0 @@ -../../../common/autoconf \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/automake b/config/rootfiles/core/65/filelists/automake deleted file mode 120000 index df3ee42..0000000 --- a/config/rootfiles/core/65/filelists/automake +++ /dev/null @@ -1 +0,0 @@ -../../../common/automake \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/bash b/config/rootfiles/core/65/filelists/bash deleted file mode 120000 index de970cb..0000000 --- a/config/rootfiles/core/65/filelists/bash +++ /dev/null @@ -1 +0,0 @@ -../../../common/bash \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/bridge-utils b/config/rootfiles/core/65/filelists/bridge-utils deleted file mode 120000 index 3dee211..0000000 --- a/config/rootfiles/core/65/filelists/bridge-utils +++ /dev/null @@ -1 +0,0 @@ -../../../common/bridge-utils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/cairo b/config/rootfiles/core/65/filelists/cairo deleted file mode 120000 index bf48d25..0000000 --- a/config/rootfiles/core/65/filelists/cairo +++ /dev/null @@ -1 +0,0 @@ -../../../common/cairo \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/capi4k-utils b/config/rootfiles/core/65/filelists/capi4k-utils deleted file mode 120000 index 82982c4..0000000 --- a/config/rootfiles/core/65/filelists/capi4k-utils +++ /dev/null @@ -1 +0,0 @@ -../../../common/capi4k-utils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/cmake b/config/rootfiles/core/65/filelists/cmake deleted file mode 120000 index 491d25f..0000000 --- a/config/rootfiles/core/65/filelists/cmake +++ /dev/null @@ -1 +0,0 @@ -../../../common/cmake \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/collectd b/config/rootfiles/core/65/filelists/collectd deleted file mode 120000 index 871b32f..0000000 --- a/config/rootfiles/core/65/filelists/collectd +++ /dev/null @@ -1 +0,0 @@ -../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/compat-wireless b/config/rootfiles/core/65/filelists/compat-wireless deleted file mode 120000 index 5b5ac9e..0000000 --- a/config/rootfiles/core/65/filelists/compat-wireless +++ /dev/null @@ -1 +0,0 @@ -../../../common/compat-wireless \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/coreutils b/config/rootfiles/core/65/filelists/coreutils deleted file mode 120000 index 7351ed2..0000000 --- a/config/rootfiles/core/65/filelists/coreutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/curl b/config/rootfiles/core/65/filelists/curl deleted file mode 120000 index 4b84bef..0000000 --- a/config/rootfiles/core/65/filelists/curl +++ /dev/null @@ -1 +0,0 @@ -../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/cyrus-sasl b/config/rootfiles/core/65/filelists/cyrus-sasl deleted file mode 120000 index bb51b4c..0000000 --- a/config/rootfiles/core/65/filelists/cyrus-sasl +++ /dev/null @@ -1 +0,0 @@ -../../../common/cyrus-sasl \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/daq b/config/rootfiles/core/65/filelists/daq deleted file mode 120000 index d0e0956..0000000 --- a/config/rootfiles/core/65/filelists/daq +++ /dev/null @@ -1 +0,0 @@ -../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/dejavu-fonts-ttf b/config/rootfiles/core/65/filelists/dejavu-fonts-ttf deleted file mode 120000 index 0007a8b..0000000 --- a/config/rootfiles/core/65/filelists/dejavu-fonts-ttf +++ /dev/null @@ -1 +0,0 @@ -../../../common/dejavu-fonts-ttf \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/dhcp b/config/rootfiles/core/65/filelists/dhcp deleted file mode 120000 index 32d8da4..0000000 --- a/config/rootfiles/core/65/filelists/dhcp +++ /dev/null @@ -1 +0,0 @@ -../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/dvb-firmwares b/config/rootfiles/core/65/filelists/dvb-firmwares deleted file mode 120000 index 69d0cdc..0000000 --- a/config/rootfiles/core/65/filelists/dvb-firmwares +++ /dev/null @@ -1 +0,0 @@ -../../../common/dvb-firmwares \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/e2fsprogs b/config/rootfiles/core/65/filelists/e2fsprogs deleted file mode 120000 index 37b55de..0000000 --- a/config/rootfiles/core/65/filelists/e2fsprogs +++ /dev/null @@ -1 +0,0 @@ -../../../common/e2fsprogs \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/file b/config/rootfiles/core/65/filelists/file deleted file mode 120000 index 0c60e43..0000000 --- a/config/rootfiles/core/65/filelists/file +++ /dev/null @@ -1 +0,0 @@ -../../../common/file \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files deleted file mode 100644 index 8e7ba71..0000000 --- a/config/rootfiles/core/65/filelists/files +++ /dev/null @@ -1,33 +0,0 @@ -etc/system-release -etc/issue -etc/sysctl.conf -etc/securetty -opt/pakfire/etc/pakfire.conf -etc/rc.d/init.d/firewall -etc/rc.d/init.d/fsresize -etc/rc.d/init.d/halt -etc/rc.d/init.d/mountfs -etc/rc.d/init.d/network -etc/rc.d/init.d/partresize -etc/rc.d/init.d/reboot -etc/rc.d/init.d/sendsignals -etc/rc.d/init.d/setclock -etc/rc.d/init.d/tmpfs -etc/rc.d/init.d/udev -etc/rc.d/init.d/udev_retry -etc/rc.d/rc0.d/K47setclock -etc/rc.d/rc6.d/K47setclock -opt/pakfire/db/core/mine -opt/pakfire/lib/functions.sh -srv/web/ipfire/cgi-bin/credits.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/qos.cgi -srv/web/ipfire/cgi-bin/services.cgi -srv/web/ipfire/cgi-bin/updatexlrator.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -usr/bin/watch -var/ipfire/langs -var/ipfire/outgoing/bin/outgoingfw.pl -var/ipfire/qos/bin/makeqosscripts.pl -usr/local/bin/readhash -usr/local/bin/scanhd diff --git a/config/rootfiles/core/65/filelists/fontconfig b/config/rootfiles/core/65/filelists/fontconfig deleted file mode 120000 index 6daeffd..0000000 --- a/config/rootfiles/core/65/filelists/fontconfig +++ /dev/null @@ -1 +0,0 @@ -../../../common/fontconfig \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/gawk b/config/rootfiles/core/65/filelists/gawk deleted file mode 120000 index a3bbe32..0000000 --- a/config/rootfiles/core/65/filelists/gawk +++ /dev/null @@ -1 +0,0 @@ -../../../common/gawk \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/gettext b/config/rootfiles/core/65/filelists/gettext deleted file mode 120000 index b6c6c6f..0000000 --- a/config/rootfiles/core/65/filelists/gettext +++ /dev/null @@ -1 +0,0 @@ -../../../common/gettext \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/glib b/config/rootfiles/core/65/filelists/glib deleted file mode 120000 index 4466574..0000000 --- a/config/rootfiles/core/65/filelists/glib +++ /dev/null @@ -1 +0,0 @@ -../../../common/glib \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/gmp b/config/rootfiles/core/65/filelists/gmp deleted file mode 120000 index 8662a89..0000000 --- a/config/rootfiles/core/65/filelists/gmp +++ /dev/null @@ -1 +0,0 @@ -../../../common/gmp \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/gmp-compat b/config/rootfiles/core/65/filelists/gmp-compat deleted file mode 120000 index 10093cd..0000000 --- a/config/rootfiles/core/65/filelists/gmp-compat +++ /dev/null @@ -1 +0,0 @@ -../../../common/gmp-compat \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/gnupg b/config/rootfiles/core/65/filelists/gnupg deleted file mode 120000 index a1a1564..0000000 --- a/config/rootfiles/core/65/filelists/gnupg +++ /dev/null @@ -1 +0,0 @@ -../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/grep b/config/rootfiles/core/65/filelists/grep deleted file mode 120000 index ab5ef8b..0000000 --- a/config/rootfiles/core/65/filelists/grep +++ /dev/null @@ -1 +0,0 @@ -../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/hdparm b/config/rootfiles/core/65/filelists/hdparm deleted file mode 120000 index b644751..0000000 --- a/config/rootfiles/core/65/filelists/hdparm +++ /dev/null @@ -1 +0,0 @@ -../../../common/hdparm \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/acpi-init b/config/rootfiles/core/65/filelists/i586/acpi-init deleted file mode 100644 index 982638a..0000000 --- a/config/rootfiles/core/65/filelists/i586/acpi-init +++ /dev/null @@ -1,4 +0,0 @@ -etc/rc.d/init.d/acpid -etc/rc.d/rc0.d/K87acpid -etc/rc.d/rc3.d/S12acpid -etc/rc.d/rc6.d/K87acpid diff --git a/config/rootfiles/core/65/filelists/i586/acpid b/config/rootfiles/core/65/filelists/i586/acpid deleted file mode 120000 index 21d36ee..0000000 --- a/config/rootfiles/core/65/filelists/i586/acpid +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/acpid \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/binutils b/config/rootfiles/core/65/filelists/i586/binutils deleted file mode 120000 index 78695d7..0000000 --- a/config/rootfiles/core/65/filelists/i586/binutils +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/binutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/dracut b/config/rootfiles/core/65/filelists/i586/dracut deleted file mode 120000 index 9a09010..0000000 --- a/config/rootfiles/core/65/filelists/i586/dracut +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/dracut \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/gcc b/config/rootfiles/core/65/filelists/i586/gcc deleted file mode 120000 index ba328e3..0000000 --- a/config/rootfiles/core/65/filelists/i586/gcc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/gcc \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/glibc b/config/rootfiles/core/65/filelists/i586/glibc deleted file mode 120000 index 943021f..0000000 --- a/config/rootfiles/core/65/filelists/i586/glibc +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/grub b/config/rootfiles/core/65/filelists/i586/grub deleted file mode 120000 index feb236a..0000000 --- a/config/rootfiles/core/65/filelists/i586/grub +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/linux b/config/rootfiles/core/65/filelists/i586/linux deleted file mode 120000 index 693ec4b..0000000 --- a/config/rootfiles/core/65/filelists/i586/linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/strongswan-padlock b/config/rootfiles/core/65/filelists/i586/strongswan-padlock deleted file mode 120000 index 2412824..0000000 --- a/config/rootfiles/core/65/filelists/i586/strongswan-padlock +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/util-linux b/config/rootfiles/core/65/filelists/i586/util-linux deleted file mode 120000 index c973106..0000000 --- a/config/rootfiles/core/65/filelists/i586/util-linux +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/util-linux \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/inetutils b/config/rootfiles/core/65/filelists/inetutils deleted file mode 120000 index bcd329b..0000000 --- a/config/rootfiles/core/65/filelists/inetutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/inetutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/iproute2 b/config/rootfiles/core/65/filelists/iproute2 deleted file mode 120000 index 05f0f71..0000000 --- a/config/rootfiles/core/65/filelists/iproute2 +++ /dev/null @@ -1 +0,0 @@ -../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/iptables b/config/rootfiles/core/65/filelists/iptables deleted file mode 120000 index 8caf12b..0000000 --- a/config/rootfiles/core/65/filelists/iptables +++ /dev/null @@ -1 +0,0 @@ -../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/kbd b/config/rootfiles/core/65/filelists/kbd deleted file mode 120000 index 9b85839..0000000 --- a/config/rootfiles/core/65/filelists/kbd +++ /dev/null @@ -1 +0,0 @@ -../../../common/kbd \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/less b/config/rootfiles/core/65/filelists/less deleted file mode 120000 index 65c0e07..0000000 --- a/config/rootfiles/core/65/filelists/less +++ /dev/null @@ -1 +0,0 @@ -../../../common/less \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/libffi b/config/rootfiles/core/65/filelists/libffi deleted file mode 120000 index c391acd..0000000 --- a/config/rootfiles/core/65/filelists/libffi +++ /dev/null @@ -1 +0,0 @@ -../../../common/libffi \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/libnl b/config/rootfiles/core/65/filelists/libnl deleted file mode 120000 index 7181849..0000000 --- a/config/rootfiles/core/65/filelists/libnl +++ /dev/null @@ -1 +0,0 @@ -../../../common/libnl \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/libsigc++ b/config/rootfiles/core/65/filelists/libsigc++ deleted file mode 120000 index 51f4c75..0000000 --- a/config/rootfiles/core/65/filelists/libsigc++ +++ /dev/null @@ -1 +0,0 @@ -../../../common/libsigc++ \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/libtool b/config/rootfiles/core/65/filelists/libtool deleted file mode 120000 index 54f5666..0000000 --- a/config/rootfiles/core/65/filelists/libtool +++ /dev/null @@ -1 +0,0 @@ -../../../common/libtool \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/linux-atm b/config/rootfiles/core/65/filelists/linux-atm deleted file mode 120000 index 8adccaf..0000000 --- a/config/rootfiles/core/65/filelists/linux-atm +++ /dev/null @@ -1 +0,0 @@ -../../../common/linux-atm \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/linux-firmware b/config/rootfiles/core/65/filelists/linux-firmware deleted file mode 120000 index 4bf91bc..0000000 --- a/config/rootfiles/core/65/filelists/linux-firmware +++ /dev/null @@ -1 +0,0 @@ -../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/m4 b/config/rootfiles/core/65/filelists/m4 deleted file mode 120000 index 3f009cc..0000000 --- a/config/rootfiles/core/65/filelists/m4 +++ /dev/null @@ -1 +0,0 @@ -../../../common/m4 \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/mISDNuser b/config/rootfiles/core/65/filelists/mISDNuser deleted file mode 120000 index 78537d4..0000000 --- a/config/rootfiles/core/65/filelists/mISDNuser +++ /dev/null @@ -1 +0,0 @@ -../../../common/mISDNuser \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/man b/config/rootfiles/core/65/filelists/man deleted file mode 120000 index b04d65c..0000000 --- a/config/rootfiles/core/65/filelists/man +++ /dev/null @@ -1 +0,0 @@ -../../../common/man \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/misc-progs b/config/rootfiles/core/65/filelists/misc-progs deleted file mode 120000 index 7223cad..0000000 --- a/config/rootfiles/core/65/filelists/misc-progs +++ /dev/null @@ -1 +0,0 @@ -../../../common/misc-progs \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/mpfr b/config/rootfiles/core/65/filelists/mpfr deleted file mode 120000 index c8468bf..0000000 --- a/config/rootfiles/core/65/filelists/mpfr +++ /dev/null @@ -1 +0,0 @@ -../../../common/mpfr \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/ncurses b/config/rootfiles/core/65/filelists/ncurses deleted file mode 120000 index 512faef..0000000 --- a/config/rootfiles/core/65/filelists/ncurses +++ /dev/null @@ -1 +0,0 @@ -../../../common/ncurses \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/newt b/config/rootfiles/core/65/filelists/newt deleted file mode 120000 index fb3eb20..0000000 --- a/config/rootfiles/core/65/filelists/newt +++ /dev/null @@ -1 +0,0 @@ -../../../common/newt \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/openldap b/config/rootfiles/core/65/filelists/openldap deleted file mode 120000 index 80c324f..0000000 --- a/config/rootfiles/core/65/filelists/openldap +++ /dev/null @@ -1 +0,0 @@ -../../../common/openldap \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/openssl b/config/rootfiles/core/65/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/65/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pam b/config/rootfiles/core/65/filelists/pam deleted file mode 120000 index 660a1d8..0000000 --- a/config/rootfiles/core/65/filelists/pam +++ /dev/null @@ -1 +0,0 @@ -../../../common/pam \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pango b/config/rootfiles/core/65/filelists/pango deleted file mode 120000 index 6c37231..0000000 --- a/config/rootfiles/core/65/filelists/pango +++ /dev/null @@ -1 +0,0 @@ -../../../common/pango \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pciutils b/config/rootfiles/core/65/filelists/pciutils deleted file mode 120000 index aeb45e7..0000000 --- a/config/rootfiles/core/65/filelists/pciutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/pciutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pcmciautils b/config/rootfiles/core/65/filelists/pcmciautils deleted file mode 120000 index 7cbf821..0000000 --- a/config/rootfiles/core/65/filelists/pcmciautils +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcmciautils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pcre b/config/rootfiles/core/65/filelists/pcre deleted file mode 120000 index b390d9a..0000000 --- a/config/rootfiles/core/65/filelists/pcre +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pcre-compat b/config/rootfiles/core/65/filelists/pcre-compat deleted file mode 120000 index eff8a7d..0000000 --- a/config/rootfiles/core/65/filelists/pcre-compat +++ /dev/null @@ -1 +0,0 @@ -../../../common/pcre-compat \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pixman b/config/rootfiles/core/65/filelists/pixman deleted file mode 120000 index fdb6346..0000000 --- a/config/rootfiles/core/65/filelists/pixman +++ /dev/null @@ -1 +0,0 @@ -../../../common/pixman \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/popt b/config/rootfiles/core/65/filelists/popt deleted file mode 120000 index d71a9ab..0000000 --- a/config/rootfiles/core/65/filelists/popt +++ /dev/null @@ -1 +0,0 @@ -../../../common/popt \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pptp b/config/rootfiles/core/65/filelists/pptp deleted file mode 120000 index 2b3dfad..0000000 --- a/config/rootfiles/core/65/filelists/pptp +++ /dev/null @@ -1 +0,0 @@ -../../../common/pptp \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/readline b/config/rootfiles/core/65/filelists/readline deleted file mode 120000 index 84209f1..0000000 --- a/config/rootfiles/core/65/filelists/readline +++ /dev/null @@ -1 +0,0 @@ -../../../common/readline \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/readline-compat b/config/rootfiles/core/65/filelists/readline-compat deleted file mode 120000 index f96bc80..0000000 --- a/config/rootfiles/core/65/filelists/readline-compat +++ /dev/null @@ -1 +0,0 @@ -../../../common/readline-compat \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/reiserfsprogs b/config/rootfiles/core/65/filelists/reiserfsprogs deleted file mode 120000 index 008c3e8..0000000 --- a/config/rootfiles/core/65/filelists/reiserfsprogs +++ /dev/null @@ -1 +0,0 @@ -../../../common/reiserfsprogs \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/rrdtool b/config/rootfiles/core/65/filelists/rrdtool deleted file mode 120000 index 7a82e41..0000000 --- a/config/rootfiles/core/65/filelists/rrdtool +++ /dev/null @@ -1 +0,0 @@ -../../../common/rrdtool \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/screen b/config/rootfiles/core/65/filelists/screen deleted file mode 120000 index 81008f4..0000000 --- a/config/rootfiles/core/65/filelists/screen +++ /dev/null @@ -1 +0,0 @@ -../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/sdparm b/config/rootfiles/core/65/filelists/sdparm deleted file mode 120000 index 86d9c24..0000000 --- a/config/rootfiles/core/65/filelists/sdparm +++ /dev/null @@ -1 +0,0 @@ -../../../common/sdparm \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/sed b/config/rootfiles/core/65/filelists/sed deleted file mode 120000 index fc5f5c6..0000000 --- a/config/rootfiles/core/65/filelists/sed +++ /dev/null @@ -1 +0,0 @@ -../../../common/sed \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/setup b/config/rootfiles/core/65/filelists/setup deleted file mode 120000 index 209374b..0000000 --- a/config/rootfiles/core/65/filelists/setup +++ /dev/null @@ -1 +0,0 @@ -../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/shadow b/config/rootfiles/core/65/filelists/shadow deleted file mode 120000 index c0824b7..0000000 --- a/config/rootfiles/core/65/filelists/shadow +++ /dev/null @@ -1 +0,0 @@ -../../../common/shadow \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/slang b/config/rootfiles/core/65/filelists/slang deleted file mode 120000 index 228e45e..0000000 --- a/config/rootfiles/core/65/filelists/slang +++ /dev/null @@ -1 +0,0 @@ -../../../common/slang \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/smartmontools b/config/rootfiles/core/65/filelists/smartmontools deleted file mode 120000 index fb66daf..0000000 --- a/config/rootfiles/core/65/filelists/smartmontools +++ /dev/null @@ -1 +0,0 @@ -../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/snort b/config/rootfiles/core/65/filelists/snort deleted file mode 120000 index 9406ce0..0000000 --- a/config/rootfiles/core/65/filelists/snort +++ /dev/null @@ -1 +0,0 @@ -../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/stage2-partial b/config/rootfiles/core/65/filelists/stage2-partial deleted file mode 100644 index df9ad8f..0000000 --- a/config/rootfiles/core/65/filelists/stage2-partial +++ /dev/null @@ -1,17 +0,0 @@ -etc/bashrc -etc/profile -etc/profile.d/colorls.sh -etc/profile.d/extrapaths.sh -etc/profile.d/glib2-locale.sh -etc/profile.d/i18n.sh -etc/profile.d/lang.sh -etc/profile.d/readline.sh -etc/profile.d/term256.sh -etc/profile.d/umask.sh -etc/securetty -etc/sysctl.conf -root/.bash_logout -root/.bash_profile -root/.bashrc -usr/lib/libgcc_s.so.1 -usr/lib/libstdc++.so.6 diff --git a/config/rootfiles/core/65/filelists/strongswan b/config/rootfiles/core/65/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/65/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/sysfsutils b/config/rootfiles/core/65/filelists/sysfsutils deleted file mode 120000 index 8f3ee3e..0000000 --- a/config/rootfiles/core/65/filelists/sysfsutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/sysfsutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/sysvinit b/config/rootfiles/core/65/filelists/sysvinit deleted file mode 120000 index f3fb330..0000000 --- a/config/rootfiles/core/65/filelists/sysvinit +++ /dev/null @@ -1 +0,0 @@ -../../../common/sysvinit \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/texinfo b/config/rootfiles/core/65/filelists/texinfo deleted file mode 120000 index fa9df02..0000000 --- a/config/rootfiles/core/65/filelists/texinfo +++ /dev/null @@ -1 +0,0 @@ -../../../common/texinfo \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/tzdata b/config/rootfiles/core/65/filelists/tzdata deleted file mode 120000 index 5a6e325..0000000 --- a/config/rootfiles/core/65/filelists/tzdata +++ /dev/null @@ -1 +0,0 @@ -../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/udev b/config/rootfiles/core/65/filelists/udev deleted file mode 120000 index e967a1c..0000000 --- a/config/rootfiles/core/65/filelists/udev +++ /dev/null @@ -1 +0,0 @@ -../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/usbutils b/config/rootfiles/core/65/filelists/usbutils deleted file mode 120000 index 31db5a7..0000000 --- a/config/rootfiles/core/65/filelists/usbutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/usbutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/vim b/config/rootfiles/core/65/filelists/vim deleted file mode 120000 index 9861317..0000000 --- a/config/rootfiles/core/65/filelists/vim +++ /dev/null @@ -1 +0,0 @@ -../../../common/vim \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/wget b/config/rootfiles/core/65/filelists/wget deleted file mode 120000 index fcb57df..0000000 --- a/config/rootfiles/core/65/filelists/wget +++ /dev/null @@ -1 +0,0 @@ -../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/wpa_supplicant b/config/rootfiles/core/65/filelists/wpa_supplicant deleted file mode 120000 index 1d04c03..0000000 --- a/config/rootfiles/core/65/filelists/wpa_supplicant +++ /dev/null @@ -1 +0,0 @@ -../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/xz b/config/rootfiles/core/65/filelists/xz deleted file mode 120000 index 734e926..0000000 --- a/config/rootfiles/core/65/filelists/xz +++ /dev/null @@ -1 +0,0 @@ -../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/zlib b/config/rootfiles/core/65/filelists/zlib deleted file mode 120000 index e345663..0000000 --- a/config/rootfiles/core/65/filelists/zlib +++ /dev/null @@ -1 +0,0 @@ -../../../common/zlib \ No newline at end of file diff --git a/config/rootfiles/core/65/meta b/config/rootfiles/core/65/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/65/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh deleted file mode 100644 index 45fc68f..0000000 --- a/config/rootfiles/core/65/update.sh +++ /dev/null @@ -1,287 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire 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. # -# # -# IPFire 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 IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -function add_to_backup () -{ - # Add path to ROOTFILES but remove old entries to prevent double - # files in the tar - grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp - mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES - echo $1 >> /opt/pakfire/tmp/ROOTFILES -} - -# -# Remove old core updates from pakfire cache to save space... -# -# TODO: need to be corrected before release -core=64 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -# Do some sanity checks. -if [ ! "$(mount | grep " reiser4 (")" == "" ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-$core: ERROR cannot update because there is a reiser4 fs mounted." - exit 1 -fi - -# -# -KVER="3.2.34" -MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` -# Nur den letzten Parameter verwenden -echo $MOUNT > /dev/null -MOUNT=$_ -if [ ! $MOUNT == "rw" ]; then - MOUNT="ro" -fi - -# -# check if we the backup file already exist -if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.xz ]; then - echo Moving backup to backup-old ... - mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.xz \ - /var/ipfire/backup/core-upgrade_$KVER-old.tar.xz -fi -echo First we made a backup of all files that was inside of the -echo update archive. This may take a while ... -# Add some files that are not in the package to backup -add_to_backup lib/modules -add_to_backup etc/udev -add_to_backup lib/udev -add_to_backup boot -add_to_backup etc/snort -add_to_backup usr/lib/snort_* -add_to_backup usr/share/zoneinfo -add_to_backup lib/libncurses* -add_to_backup etc/dircolors -add_to_backup etc/profile.d -add_to_backup usr/share/terminfo -add_to_backup etc/sysconfig/lm_sensors -add_to_backup etc/sysconfig/rc.local -add_to_backup usr/local/bin/vpn-watch -add_to_backup usr/libexec/ipsec - -# Backup the files -tar cJvf /var/ipfire/backup/core-upgrade_$KVER.tar.xz \ - -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1 - -# Check diskspace on root -ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` - -if [ $ROOTSPACE -lt 70000 ]; then - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-$core: ERROR cannot update because not enough free space on root." - exit 2 -fi - -echo -echo Update Kernel to $KVER ... -# -# Remove old kernel, configs, initrd, modules ... -# -rm -rf /boot/System.map-* -rm -rf /boot/config-* -rm -rf /boot/ipfirerd-* -rm -rf /boot/vmlinuz-* -rm -rf /boot/uImage-ipfire-* -rm -rf /boot/uInit-ipfire-* -rm -rf /lib/modules -rm -rf /etc/dircolors -rm -rf /etc/profile.d -rm -rf /usr/share/terminfo - -# -# Remove old udev rules. -# -if [ -e /etc/udev/rules.d/29-ct-server-network.rules ]; then - cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/ -fi -cp /etc/udev/rules.d/30-persistent-network.rules /tmp/ -rm -rf /etc/udev -rm -rf /lib/udev -mkdir -p /etc/udev/rules.d -if [ -e /tmp/rules.d/29-ct-server-network.rules ]; then - mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/ -fi -mv /tmp/30-persistent-network.rules /etc/udev/rules.d/ - -# -# Backup grub.conf -# -cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org - -# -#Stop services -/etc/init.d/snort stop -/etc/init.d/squid stop -/etc/init.d/ipsec stop - -#Remove old snort, zoneinfo and ncurses-libs(wrong path). -rm -rf /etc/snort -rm -rf /usr/lib/snort_* -rm -rf /usr/share/zoneinfo -rm -rf /lib/libncurses* - -# Remove old pluto binaries. -rm -f /usr/libexec/ipsec/{pluto,_pluto_adns,whack} -rm -f /usr/local/bin/vpn-watch - -# -#Extract files -tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / - -# Regenerate ipsec configuration files. -/srv/web/ipfire/cgi-bin/vpnmain.cgi - -# -# Start services -# -/etc/init.d/squid start -/etc/init.d/snort start -if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then - /etc/init.d/ipsec start -fi - -# -# Rebuild qosscript if enabled -# -if [ -e /var/ipfire/qos/enable ]; then - /usr/local/bin/qosctrl stop - /usr/local/bin/qosctrl generate - /usr/local/bin/qosctrl start -fi - -# Remove preloading libsafe. -rm -f /etc/ld.so.preload - -# -# Modify grub.conf -# -echo -echo Update grub configuration ... -ROOT=`mount | grep " / " | cut -d" " -f1` - -if [ ! -z $ROOT ]; then - ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` -fi - -if [ ! -z $ROOTUUID ]; then - sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf -else - sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf -fi -sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf -sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf - -if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then - echo "grub use default console ..." -else - echo "grub use serial console ..." - sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf - sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf - sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf - sed -i -e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g" /boot/grub/grub.conf -fi - -# -# ReInstall grub -# -grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck - -# -# Delete old lm-sensor modullist to force search at next boot -# -rm -rf /etc/sysconfig/lm_sensors - -# -# Remove powerbutton loop from rc local. -# -sed -i "/# power button shutdown/,+3d" /etc/sysconfig/rc.local - -# -#Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -# -# Remove meta's of packages that are now common... -# -rm -rf /opt/pakfire/db/*/meta-fontconfig -rm -rf /opt/pakfire/db/*/meta-glib - -# Force (re)install pae kernel if pae is supported -rm -rf /opt/pakfire/db/*/meta-linux-pae -if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then - echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae - echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae -fi - -# Force reinstall xen kernel if it was installed -if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then - echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen - echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen - echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-xen -fi - -# -# After pakfire has ended run it again and update the lists and do upgrade -# -echo '#!/bin/bash' > /tmp/pak_update -echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update -echo ' sleep 1' >> /tmp/pak_update -echo 'done' >> /tmp/pak_update -echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update -echo 'touch /var/run/need_reboot ' >> /tmp/pak_update -# -chmod +x /tmp/pak_update -/tmp/pak_update & - -sync - -# -#Finish -/etc/init.d/fireinfo start -sendprofile - -echo -echo Please wait until pakfire has ended... -echo -#Don't report the exitcode last command -exit 0 - diff --git a/config/rootfiles/core/66/exclude b/config/rootfiles/core/66/exclude new file mode 100644 index 0000000..0b54d05 --- /dev/null +++ b/config/rootfiles/core/66/exclude @@ -0,0 +1,15 @@ +srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/collectd.custom +etc/shadow +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/66/filelists/armv5tel/binutils b/config/rootfiles/core/66/filelists/armv5tel/binutils new file mode 120000 index 0000000..ac971f9 --- /dev/null +++ b/config/rootfiles/core/66/filelists/armv5tel/binutils @@ -0,0 +1 @@ +../../../../common/armv5tel/binutils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/armv5tel/dracut b/config/rootfiles/core/66/filelists/armv5tel/dracut new file mode 120000 index 0000000..861df3f --- /dev/null +++ b/config/rootfiles/core/66/filelists/armv5tel/dracut @@ -0,0 +1 @@ +../../../../common/armv5tel/dracut \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/armv5tel/gcc b/config/rootfiles/core/66/filelists/armv5tel/gcc new file mode 120000 index 0000000..84f7b93 --- /dev/null +++ b/config/rootfiles/core/66/filelists/armv5tel/gcc @@ -0,0 +1 @@ +../../../../common/armv5tel/gcc \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/armv5tel/glibc b/config/rootfiles/core/66/filelists/armv5tel/glibc new file mode 120000 index 0000000..4c70d72 --- /dev/null +++ b/config/rootfiles/core/66/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/66/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/core/66/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/armv5tel/linux-omap b/config/rootfiles/core/66/filelists/armv5tel/linux-omap new file mode 120000 index 0000000..50bf786 --- /dev/null +++ b/config/rootfiles/core/66/filelists/armv5tel/linux-omap @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-omap \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/armv5tel/linux-rpi b/config/rootfiles/core/66/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/core/66/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/armv5tel/rpi-firmware b/config/rootfiles/core/66/filelists/armv5tel/rpi-firmware new file mode 120000 index 0000000..428fdf8 --- /dev/null +++ b/config/rootfiles/core/66/filelists/armv5tel/rpi-firmware @@ -0,0 +1 @@ +../../../../common/armv5tel/rpi-firmware \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/armv5tel/u-boot b/config/rootfiles/core/66/filelists/armv5tel/u-boot new file mode 120000 index 0000000..3df31a8 --- /dev/null +++ b/config/rootfiles/core/66/filelists/armv5tel/u-boot @@ -0,0 +1 @@ +../../../../common/armv5tel/u-boot \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/armv5tel/util-linux b/config/rootfiles/core/66/filelists/armv5tel/util-linux new file mode 120000 index 0000000..2596908 --- /dev/null +++ b/config/rootfiles/core/66/filelists/armv5tel/util-linux @@ -0,0 +1 @@ +../../../../common/armv5tel/util-linux \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/autoconf b/config/rootfiles/core/66/filelists/autoconf new file mode 120000 index 0000000..aa39ce6 --- /dev/null +++ b/config/rootfiles/core/66/filelists/autoconf @@ -0,0 +1 @@ +../../../common/autoconf \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/automake b/config/rootfiles/core/66/filelists/automake new file mode 120000 index 0000000..df3ee42 --- /dev/null +++ b/config/rootfiles/core/66/filelists/automake @@ -0,0 +1 @@ +../../../common/automake \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/bash b/config/rootfiles/core/66/filelists/bash new file mode 120000 index 0000000..de970cb --- /dev/null +++ b/config/rootfiles/core/66/filelists/bash @@ -0,0 +1 @@ +../../../common/bash \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/bridge-utils b/config/rootfiles/core/66/filelists/bridge-utils new file mode 120000 index 0000000..3dee211 --- /dev/null +++ b/config/rootfiles/core/66/filelists/bridge-utils @@ -0,0 +1 @@ +../../../common/bridge-utils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/cairo b/config/rootfiles/core/66/filelists/cairo new file mode 120000 index 0000000..bf48d25 --- /dev/null +++ b/config/rootfiles/core/66/filelists/cairo @@ -0,0 +1 @@ +../../../common/cairo \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/capi4k-utils b/config/rootfiles/core/66/filelists/capi4k-utils new file mode 120000 index 0000000..82982c4 --- /dev/null +++ b/config/rootfiles/core/66/filelists/capi4k-utils @@ -0,0 +1 @@ +../../../common/capi4k-utils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/cmake b/config/rootfiles/core/66/filelists/cmake new file mode 120000 index 0000000..491d25f --- /dev/null +++ b/config/rootfiles/core/66/filelists/cmake @@ -0,0 +1 @@ +../../../common/cmake \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/collectd b/config/rootfiles/core/66/filelists/collectd new file mode 120000 index 0000000..871b32f --- /dev/null +++ b/config/rootfiles/core/66/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/compat-wireless b/config/rootfiles/core/66/filelists/compat-wireless new file mode 120000 index 0000000..5b5ac9e --- /dev/null +++ b/config/rootfiles/core/66/filelists/compat-wireless @@ -0,0 +1 @@ +../../../common/compat-wireless \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/coreutils b/config/rootfiles/core/66/filelists/coreutils new file mode 120000 index 0000000..7351ed2 --- /dev/null +++ b/config/rootfiles/core/66/filelists/coreutils @@ -0,0 +1 @@ +../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/curl b/config/rootfiles/core/66/filelists/curl new file mode 120000 index 0000000..4b84bef --- /dev/null +++ b/config/rootfiles/core/66/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/cyrus-sasl b/config/rootfiles/core/66/filelists/cyrus-sasl new file mode 120000 index 0000000..bb51b4c --- /dev/null +++ b/config/rootfiles/core/66/filelists/cyrus-sasl @@ -0,0 +1 @@ +../../../common/cyrus-sasl \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/daq b/config/rootfiles/core/66/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/core/66/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/dejavu-fonts-ttf b/config/rootfiles/core/66/filelists/dejavu-fonts-ttf new file mode 120000 index 0000000..0007a8b --- /dev/null +++ b/config/rootfiles/core/66/filelists/dejavu-fonts-ttf @@ -0,0 +1 @@ +../../../common/dejavu-fonts-ttf \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/dhcp b/config/rootfiles/core/66/filelists/dhcp new file mode 120000 index 0000000..32d8da4 --- /dev/null +++ b/config/rootfiles/core/66/filelists/dhcp @@ -0,0 +1 @@ +../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/dvb-firmwares b/config/rootfiles/core/66/filelists/dvb-firmwares new file mode 120000 index 0000000..69d0cdc --- /dev/null +++ b/config/rootfiles/core/66/filelists/dvb-firmwares @@ -0,0 +1 @@ +../../../common/dvb-firmwares \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/e2fsprogs b/config/rootfiles/core/66/filelists/e2fsprogs new file mode 120000 index 0000000..37b55de --- /dev/null +++ b/config/rootfiles/core/66/filelists/e2fsprogs @@ -0,0 +1 @@ +../../../common/e2fsprogs \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/file b/config/rootfiles/core/66/filelists/file new file mode 120000 index 0000000..0c60e43 --- /dev/null +++ b/config/rootfiles/core/66/filelists/file @@ -0,0 +1 @@ +../../../common/file \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/files b/config/rootfiles/core/66/filelists/files new file mode 100644 index 0000000..8e7ba71 --- /dev/null +++ b/config/rootfiles/core/66/filelists/files @@ -0,0 +1,33 @@ +etc/system-release +etc/issue +etc/sysctl.conf +etc/securetty +opt/pakfire/etc/pakfire.conf +etc/rc.d/init.d/firewall +etc/rc.d/init.d/fsresize +etc/rc.d/init.d/halt +etc/rc.d/init.d/mountfs +etc/rc.d/init.d/network +etc/rc.d/init.d/partresize +etc/rc.d/init.d/reboot +etc/rc.d/init.d/sendsignals +etc/rc.d/init.d/setclock +etc/rc.d/init.d/tmpfs +etc/rc.d/init.d/udev +etc/rc.d/init.d/udev_retry +etc/rc.d/rc0.d/K47setclock +etc/rc.d/rc6.d/K47setclock +opt/pakfire/db/core/mine +opt/pakfire/lib/functions.sh +srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/qos.cgi +srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/updatexlrator.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +usr/bin/watch +var/ipfire/langs +var/ipfire/outgoing/bin/outgoingfw.pl +var/ipfire/qos/bin/makeqosscripts.pl +usr/local/bin/readhash +usr/local/bin/scanhd diff --git a/config/rootfiles/core/66/filelists/fontconfig b/config/rootfiles/core/66/filelists/fontconfig new file mode 120000 index 0000000..6daeffd --- /dev/null +++ b/config/rootfiles/core/66/filelists/fontconfig @@ -0,0 +1 @@ +../../../common/fontconfig \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/gawk b/config/rootfiles/core/66/filelists/gawk new file mode 120000 index 0000000..a3bbe32 --- /dev/null +++ b/config/rootfiles/core/66/filelists/gawk @@ -0,0 +1 @@ +../../../common/gawk \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/gettext b/config/rootfiles/core/66/filelists/gettext new file mode 120000 index 0000000..b6c6c6f --- /dev/null +++ b/config/rootfiles/core/66/filelists/gettext @@ -0,0 +1 @@ +../../../common/gettext \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/glib b/config/rootfiles/core/66/filelists/glib new file mode 120000 index 0000000..4466574 --- /dev/null +++ b/config/rootfiles/core/66/filelists/glib @@ -0,0 +1 @@ +../../../common/glib \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/gmp b/config/rootfiles/core/66/filelists/gmp new file mode 120000 index 0000000..8662a89 --- /dev/null +++ b/config/rootfiles/core/66/filelists/gmp @@ -0,0 +1 @@ +../../../common/gmp \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/gmp-compat b/config/rootfiles/core/66/filelists/gmp-compat new file mode 120000 index 0000000..10093cd --- /dev/null +++ b/config/rootfiles/core/66/filelists/gmp-compat @@ -0,0 +1 @@ +../../../common/gmp-compat \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/gnupg b/config/rootfiles/core/66/filelists/gnupg new file mode 120000 index 0000000..a1a1564 --- /dev/null +++ b/config/rootfiles/core/66/filelists/gnupg @@ -0,0 +1 @@ +../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/grep b/config/rootfiles/core/66/filelists/grep new file mode 120000 index 0000000..ab5ef8b --- /dev/null +++ b/config/rootfiles/core/66/filelists/grep @@ -0,0 +1 @@ +../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/hdparm b/config/rootfiles/core/66/filelists/hdparm new file mode 120000 index 0000000..b644751 --- /dev/null +++ b/config/rootfiles/core/66/filelists/hdparm @@ -0,0 +1 @@ +../../../common/hdparm \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/i586/acpi-init b/config/rootfiles/core/66/filelists/i586/acpi-init new file mode 100644 index 0000000..982638a --- /dev/null +++ b/config/rootfiles/core/66/filelists/i586/acpi-init @@ -0,0 +1,4 @@ +etc/rc.d/init.d/acpid +etc/rc.d/rc0.d/K87acpid +etc/rc.d/rc3.d/S12acpid +etc/rc.d/rc6.d/K87acpid diff --git a/config/rootfiles/core/66/filelists/i586/acpid b/config/rootfiles/core/66/filelists/i586/acpid new file mode 120000 index 0000000..21d36ee --- /dev/null +++ b/config/rootfiles/core/66/filelists/i586/acpid @@ -0,0 +1 @@ +../../../../common/i586/acpid \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/i586/binutils b/config/rootfiles/core/66/filelists/i586/binutils new file mode 120000 index 0000000..78695d7 --- /dev/null +++ b/config/rootfiles/core/66/filelists/i586/binutils @@ -0,0 +1 @@ +../../../../common/i586/binutils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/i586/dracut b/config/rootfiles/core/66/filelists/i586/dracut new file mode 120000 index 0000000..9a09010 --- /dev/null +++ b/config/rootfiles/core/66/filelists/i586/dracut @@ -0,0 +1 @@ +../../../../common/i586/dracut \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/i586/gcc b/config/rootfiles/core/66/filelists/i586/gcc new file mode 120000 index 0000000..ba328e3 --- /dev/null +++ b/config/rootfiles/core/66/filelists/i586/gcc @@ -0,0 +1 @@ +../../../../common/i586/gcc \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/i586/glibc b/config/rootfiles/core/66/filelists/i586/glibc new file mode 120000 index 0000000..943021f --- /dev/null +++ b/config/rootfiles/core/66/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/i586/grub b/config/rootfiles/core/66/filelists/i586/grub new file mode 120000 index 0000000..feb236a --- /dev/null +++ b/config/rootfiles/core/66/filelists/i586/grub @@ -0,0 +1 @@ +../../../../common/i586/grub \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/i586/linux b/config/rootfiles/core/66/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/core/66/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/i586/strongswan-padlock b/config/rootfiles/core/66/filelists/i586/strongswan-padlock new file mode 120000 index 0000000..2412824 --- /dev/null +++ b/config/rootfiles/core/66/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/i586/util-linux b/config/rootfiles/core/66/filelists/i586/util-linux new file mode 120000 index 0000000..c973106 --- /dev/null +++ b/config/rootfiles/core/66/filelists/i586/util-linux @@ -0,0 +1 @@ +../../../../common/i586/util-linux \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/inetutils b/config/rootfiles/core/66/filelists/inetutils new file mode 120000 index 0000000..bcd329b --- /dev/null +++ b/config/rootfiles/core/66/filelists/inetutils @@ -0,0 +1 @@ +../../../common/inetutils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/iproute2 b/config/rootfiles/core/66/filelists/iproute2 new file mode 120000 index 0000000..05f0f71 --- /dev/null +++ b/config/rootfiles/core/66/filelists/iproute2 @@ -0,0 +1 @@ +../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/iptables b/config/rootfiles/core/66/filelists/iptables new file mode 120000 index 0000000..8caf12b --- /dev/null +++ b/config/rootfiles/core/66/filelists/iptables @@ -0,0 +1 @@ +../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/kbd b/config/rootfiles/core/66/filelists/kbd new file mode 120000 index 0000000..9b85839 --- /dev/null +++ b/config/rootfiles/core/66/filelists/kbd @@ -0,0 +1 @@ +../../../common/kbd \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/less b/config/rootfiles/core/66/filelists/less new file mode 120000 index 0000000..65c0e07 --- /dev/null +++ b/config/rootfiles/core/66/filelists/less @@ -0,0 +1 @@ +../../../common/less \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/libffi b/config/rootfiles/core/66/filelists/libffi new file mode 120000 index 0000000..c391acd --- /dev/null +++ b/config/rootfiles/core/66/filelists/libffi @@ -0,0 +1 @@ +../../../common/libffi \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/libnl b/config/rootfiles/core/66/filelists/libnl new file mode 120000 index 0000000..7181849 --- /dev/null +++ b/config/rootfiles/core/66/filelists/libnl @@ -0,0 +1 @@ +../../../common/libnl \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/libsigc++ b/config/rootfiles/core/66/filelists/libsigc++ new file mode 120000 index 0000000..51f4c75 --- /dev/null +++ b/config/rootfiles/core/66/filelists/libsigc++ @@ -0,0 +1 @@ +../../../common/libsigc++ \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/libtool b/config/rootfiles/core/66/filelists/libtool new file mode 120000 index 0000000..54f5666 --- /dev/null +++ b/config/rootfiles/core/66/filelists/libtool @@ -0,0 +1 @@ +../../../common/libtool \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/linux-atm b/config/rootfiles/core/66/filelists/linux-atm new file mode 120000 index 0000000..8adccaf --- /dev/null +++ b/config/rootfiles/core/66/filelists/linux-atm @@ -0,0 +1 @@ +../../../common/linux-atm \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/linux-firmware b/config/rootfiles/core/66/filelists/linux-firmware new file mode 120000 index 0000000..4bf91bc --- /dev/null +++ b/config/rootfiles/core/66/filelists/linux-firmware @@ -0,0 +1 @@ +../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/m4 b/config/rootfiles/core/66/filelists/m4 new file mode 120000 index 0000000..3f009cc --- /dev/null +++ b/config/rootfiles/core/66/filelists/m4 @@ -0,0 +1 @@ +../../../common/m4 \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/mISDNuser b/config/rootfiles/core/66/filelists/mISDNuser new file mode 120000 index 0000000..78537d4 --- /dev/null +++ b/config/rootfiles/core/66/filelists/mISDNuser @@ -0,0 +1 @@ +../../../common/mISDNuser \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/man b/config/rootfiles/core/66/filelists/man new file mode 120000 index 0000000..b04d65c --- /dev/null +++ b/config/rootfiles/core/66/filelists/man @@ -0,0 +1 @@ +../../../common/man \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/misc-progs b/config/rootfiles/core/66/filelists/misc-progs new file mode 120000 index 0000000..7223cad --- /dev/null +++ b/config/rootfiles/core/66/filelists/misc-progs @@ -0,0 +1 @@ +../../../common/misc-progs \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/mpfr b/config/rootfiles/core/66/filelists/mpfr new file mode 120000 index 0000000..c8468bf --- /dev/null +++ b/config/rootfiles/core/66/filelists/mpfr @@ -0,0 +1 @@ +../../../common/mpfr \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/ncurses b/config/rootfiles/core/66/filelists/ncurses new file mode 120000 index 0000000..512faef --- /dev/null +++ b/config/rootfiles/core/66/filelists/ncurses @@ -0,0 +1 @@ +../../../common/ncurses \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/newt b/config/rootfiles/core/66/filelists/newt new file mode 120000 index 0000000..fb3eb20 --- /dev/null +++ b/config/rootfiles/core/66/filelists/newt @@ -0,0 +1 @@ +../../../common/newt \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/openldap b/config/rootfiles/core/66/filelists/openldap new file mode 120000 index 0000000..80c324f --- /dev/null +++ b/config/rootfiles/core/66/filelists/openldap @@ -0,0 +1 @@ +../../../common/openldap \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/openssl b/config/rootfiles/core/66/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/66/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/pam b/config/rootfiles/core/66/filelists/pam new file mode 120000 index 0000000..660a1d8 --- /dev/null +++ b/config/rootfiles/core/66/filelists/pam @@ -0,0 +1 @@ +../../../common/pam \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/pango b/config/rootfiles/core/66/filelists/pango new file mode 120000 index 0000000..6c37231 --- /dev/null +++ b/config/rootfiles/core/66/filelists/pango @@ -0,0 +1 @@ +../../../common/pango \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/pciutils b/config/rootfiles/core/66/filelists/pciutils new file mode 120000 index 0000000..aeb45e7 --- /dev/null +++ b/config/rootfiles/core/66/filelists/pciutils @@ -0,0 +1 @@ +../../../common/pciutils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/pcmciautils b/config/rootfiles/core/66/filelists/pcmciautils new file mode 120000 index 0000000..7cbf821 --- /dev/null +++ b/config/rootfiles/core/66/filelists/pcmciautils @@ -0,0 +1 @@ +../../../common/pcmciautils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/pcre b/config/rootfiles/core/66/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/core/66/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/pcre-compat b/config/rootfiles/core/66/filelists/pcre-compat new file mode 120000 index 0000000..eff8a7d --- /dev/null +++ b/config/rootfiles/core/66/filelists/pcre-compat @@ -0,0 +1 @@ +../../../common/pcre-compat \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/pixman b/config/rootfiles/core/66/filelists/pixman new file mode 120000 index 0000000..fdb6346 --- /dev/null +++ b/config/rootfiles/core/66/filelists/pixman @@ -0,0 +1 @@ +../../../common/pixman \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/popt b/config/rootfiles/core/66/filelists/popt new file mode 120000 index 0000000..d71a9ab --- /dev/null +++ b/config/rootfiles/core/66/filelists/popt @@ -0,0 +1 @@ +../../../common/popt \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/pptp b/config/rootfiles/core/66/filelists/pptp new file mode 120000 index 0000000..2b3dfad --- /dev/null +++ b/config/rootfiles/core/66/filelists/pptp @@ -0,0 +1 @@ +../../../common/pptp \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/readline b/config/rootfiles/core/66/filelists/readline new file mode 120000 index 0000000..84209f1 --- /dev/null +++ b/config/rootfiles/core/66/filelists/readline @@ -0,0 +1 @@ +../../../common/readline \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/readline-compat b/config/rootfiles/core/66/filelists/readline-compat new file mode 120000 index 0000000..f96bc80 --- /dev/null +++ b/config/rootfiles/core/66/filelists/readline-compat @@ -0,0 +1 @@ +../../../common/readline-compat \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/reiserfsprogs b/config/rootfiles/core/66/filelists/reiserfsprogs new file mode 120000 index 0000000..008c3e8 --- /dev/null +++ b/config/rootfiles/core/66/filelists/reiserfsprogs @@ -0,0 +1 @@ +../../../common/reiserfsprogs \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/rrdtool b/config/rootfiles/core/66/filelists/rrdtool new file mode 120000 index 0000000..7a82e41 --- /dev/null +++ b/config/rootfiles/core/66/filelists/rrdtool @@ -0,0 +1 @@ +../../../common/rrdtool \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/screen b/config/rootfiles/core/66/filelists/screen new file mode 120000 index 0000000..81008f4 --- /dev/null +++ b/config/rootfiles/core/66/filelists/screen @@ -0,0 +1 @@ +../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/sdparm b/config/rootfiles/core/66/filelists/sdparm new file mode 120000 index 0000000..86d9c24 --- /dev/null +++ b/config/rootfiles/core/66/filelists/sdparm @@ -0,0 +1 @@ +../../../common/sdparm \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/sed b/config/rootfiles/core/66/filelists/sed new file mode 120000 index 0000000..fc5f5c6 --- /dev/null +++ b/config/rootfiles/core/66/filelists/sed @@ -0,0 +1 @@ +../../../common/sed \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/setup b/config/rootfiles/core/66/filelists/setup new file mode 120000 index 0000000..209374b --- /dev/null +++ b/config/rootfiles/core/66/filelists/setup @@ -0,0 +1 @@ +../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/shadow b/config/rootfiles/core/66/filelists/shadow new file mode 120000 index 0000000..c0824b7 --- /dev/null +++ b/config/rootfiles/core/66/filelists/shadow @@ -0,0 +1 @@ +../../../common/shadow \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/slang b/config/rootfiles/core/66/filelists/slang new file mode 120000 index 0000000..228e45e --- /dev/null +++ b/config/rootfiles/core/66/filelists/slang @@ -0,0 +1 @@ +../../../common/slang \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/smartmontools b/config/rootfiles/core/66/filelists/smartmontools new file mode 120000 index 0000000..fb66daf --- /dev/null +++ b/config/rootfiles/core/66/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/snort b/config/rootfiles/core/66/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/core/66/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/stage2-partial b/config/rootfiles/core/66/filelists/stage2-partial new file mode 100644 index 0000000..df9ad8f --- /dev/null +++ b/config/rootfiles/core/66/filelists/stage2-partial @@ -0,0 +1,17 @@ +etc/bashrc +etc/profile +etc/profile.d/colorls.sh +etc/profile.d/extrapaths.sh +etc/profile.d/glib2-locale.sh +etc/profile.d/i18n.sh +etc/profile.d/lang.sh +etc/profile.d/readline.sh +etc/profile.d/term256.sh +etc/profile.d/umask.sh +etc/securetty +etc/sysctl.conf +root/.bash_logout +root/.bash_profile +root/.bashrc +usr/lib/libgcc_s.so.1 +usr/lib/libstdc++.so.6 diff --git a/config/rootfiles/core/66/filelists/strongswan b/config/rootfiles/core/66/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/66/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/sysfsutils b/config/rootfiles/core/66/filelists/sysfsutils new file mode 120000 index 0000000..8f3ee3e --- /dev/null +++ b/config/rootfiles/core/66/filelists/sysfsutils @@ -0,0 +1 @@ +../../../common/sysfsutils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/sysvinit b/config/rootfiles/core/66/filelists/sysvinit new file mode 120000 index 0000000..f3fb330 --- /dev/null +++ b/config/rootfiles/core/66/filelists/sysvinit @@ -0,0 +1 @@ +../../../common/sysvinit \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/texinfo b/config/rootfiles/core/66/filelists/texinfo new file mode 120000 index 0000000..fa9df02 --- /dev/null +++ b/config/rootfiles/core/66/filelists/texinfo @@ -0,0 +1 @@ +../../../common/texinfo \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/tzdata b/config/rootfiles/core/66/filelists/tzdata new file mode 120000 index 0000000..5a6e325 --- /dev/null +++ b/config/rootfiles/core/66/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/udev b/config/rootfiles/core/66/filelists/udev new file mode 120000 index 0000000..e967a1c --- /dev/null +++ b/config/rootfiles/core/66/filelists/udev @@ -0,0 +1 @@ +../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/usbutils b/config/rootfiles/core/66/filelists/usbutils new file mode 120000 index 0000000..31db5a7 --- /dev/null +++ b/config/rootfiles/core/66/filelists/usbutils @@ -0,0 +1 @@ +../../../common/usbutils \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/vim b/config/rootfiles/core/66/filelists/vim new file mode 120000 index 0000000..9861317 --- /dev/null +++ b/config/rootfiles/core/66/filelists/vim @@ -0,0 +1 @@ +../../../common/vim \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/wget b/config/rootfiles/core/66/filelists/wget new file mode 120000 index 0000000..fcb57df --- /dev/null +++ b/config/rootfiles/core/66/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/wpa_supplicant b/config/rootfiles/core/66/filelists/wpa_supplicant new file mode 120000 index 0000000..1d04c03 --- /dev/null +++ b/config/rootfiles/core/66/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/xz b/config/rootfiles/core/66/filelists/xz new file mode 120000 index 0000000..734e926 --- /dev/null +++ b/config/rootfiles/core/66/filelists/xz @@ -0,0 +1 @@ +../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/core/66/filelists/zlib b/config/rootfiles/core/66/filelists/zlib new file mode 120000 index 0000000..e345663 --- /dev/null +++ b/config/rootfiles/core/66/filelists/zlib @@ -0,0 +1 @@ +../../../common/zlib \ No newline at end of file diff --git a/config/rootfiles/core/66/meta b/config/rootfiles/core/66/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/66/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/66/update.sh b/config/rootfiles/core/66/update.sh new file mode 100644 index 0000000..144d48c --- /dev/null +++ b/config/rootfiles/core/66/update.sh @@ -0,0 +1,287 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +function add_to_backup () +{ + # Add path to ROOTFILES but remove old entries to prevent double + # files in the tar + grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp + mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES + echo $1 >> /opt/pakfire/tmp/ROOTFILES +} + +# +# Remove old core updates from pakfire cache to save space... +# +core=66 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +# Do some sanity checks. +if [ ! "$(mount | grep " reiser4 (")" == "" ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-$core: ERROR cannot update because there is a reiser4 fs mounted." + exit 1 +fi + +# +# +KVER="3.2.34" +MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` +# Nur den letzten Parameter verwenden +echo $MOUNT > /dev/null +MOUNT=$_ +if [ ! $MOUNT == "rw" ]; then + MOUNT="ro" +fi + +# +# check if we the backup file already exist +if [ -e /var/ipfire/backup/core-upgrade$core_$KVER.tar.xz ]; then + echo Moving backup to backup-old ... + mv -f /var/ipfire/backup/core-upgrade$core_$KVER.tar.xz \ + /var/ipfire/backup/core-upgrade$core_$KVER-old.tar.xz +fi +echo First we made a backup of all files that was inside of the +echo update archive. This may take a while ... +# Add some files that are not in the package to backup +add_to_backup lib/modules +add_to_backup etc/udev +add_to_backup lib/udev +add_to_backup boot +add_to_backup etc/snort +add_to_backup usr/lib/snort_* +add_to_backup usr/share/zoneinfo +add_to_backup lib/libncurses* +add_to_backup etc/dircolors +add_to_backup etc/profile.d +add_to_backup usr/share/terminfo +add_to_backup etc/sysconfig/lm_sensors +add_to_backup etc/sysconfig/rc.local +add_to_backup usr/local/bin/vpn-watch +add_to_backup usr/libexec/ipsec + +# Backup the files +tar cJvf /var/ipfire/backup/core-upgrade_$KVER.tar.xz \ + -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1 + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 70000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-$core: ERROR cannot update because not enough free space on root." + exit 2 +fi + +echo +echo Update Kernel to $KVER ... +# +# Remove old kernel, configs, initrd, modules ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /lib/modules +rm -rf /etc/dircolors +rm -rf /etc/profile.d +rm -rf /usr/share/terminfo +rm -rf /bin/[ + +# +# Remove old udev rules. +# +if [ -e /etc/udev/rules.d/29-ct-server-network.rules ]; then + cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/ +fi +cp /etc/udev/rules.d/30-persistent-network.rules /tmp/ +rm -rf /etc/udev +rm -rf /lib/udev +mkdir -p /etc/udev/rules.d +if [ -e /tmp/rules.d/29-ct-server-network.rules ]; then + mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/ +fi +mv /tmp/30-persistent-network.rules /etc/udev/rules.d/ + +# +# Backup grub.conf +# +cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org + +# +#Stop services +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/ipsec stop + +#Remove old snort, zoneinfo and ncurses-libs(wrong path). +rm -rf /etc/snort +rm -rf /usr/lib/snort_* +rm -rf /usr/share/zoneinfo +rm -rf /lib/libncurses* + +# Remove old pluto binaries. +rm -f /usr/libexec/ipsec/{pluto,_pluto_adns,whack} +rm -f /usr/local/bin/vpn-watch + +# +#Extract files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + +# Regenerate ipsec configuration files. +/srv/web/ipfire/cgi-bin/vpnmain.cgi + +# +# Start services +# +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# +# Rebuild qosscript if enabled +# +if [ -e /var/ipfire/qos/enable ]; then + /usr/local/bin/qosctrl stop + /usr/local/bin/qosctrl generate + /usr/local/bin/qosctrl start +fi + +# Remove preloading libsafe. +rm -f /etc/ld.so.preload + +# +# Modify grub.conf +# +echo +echo Update grub configuration ... +ROOT=`mount | grep " / " | cut -d" " -f1` + +if [ ! -z $ROOT ]; then + ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` +fi + +if [ ! -z $ROOTUUID ]; then + sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf +else + sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf +fi +sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf +sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf + +if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then + echo "grub use default console ..." +else + echo "grub use serial console ..." + sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf + sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf + sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf + sed -i -e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g" /boot/grub/grub.conf +fi + +# +# ReInstall grub +# +grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck + +# +# Delete old lm-sensor modullist to force search at next boot +# +rm -rf /etc/sysconfig/lm_sensors + +# +# Remove powerbutton loop from rc local. +# +sed -i "/# power button shutdown/,+3d" /etc/sysconfig/rc.local + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# +# Remove meta's of packages that are now common... +# +rm -rf /opt/pakfire/db/*/meta-fontconfig +rm -rf /opt/pakfire/db/*/meta-glib + +# Force (re)install pae kernel if pae is supported +rm -rf /opt/pakfire/db/*/meta-linux-pae +if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae +fi + +# Force reinstall xen kernel if it was installed +if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then + echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-xen +fi + +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +chmod +x /tmp/pak_update +/tmp/pak_update & + +sync + +# +#Finish +/etc/init.d/fireinfo start +sendprofile + +echo +echo Please wait until pakfire has ended... +echo +#Don't report the exitcode last command +exit 0 + hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM