IPFire-SCM January 2019

ipfire-scm@lists.ipfire.org

1 participants
57 discussions

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 903052ddea715c66d15b18c9be4631bea8ab4bd5
by Michael Tremer 23 Jan '19

23 Jan '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 903052ddea715c66d15b18c9be4631bea8ab4bd5 (commit) via 480e3014429820c687ceeb17a3ad0b46d2b6f2ed (commit) from f29ff21cd61fab2e7ed3ea443568c7c71bcb3f30 (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 903052ddea715c66d15b18c9be4631bea8ab4bd5 Author: Peter Müller <peter.mueller(a)link38.eu> Date: Mon Jan 21 21:40:50 2019 +0100 use HTTPS for downloading GeoIP database files Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 480e3014429820c687ceeb17a3ad0b46d2b6f2ed Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 23 04:10:23 2019 +0000 xtables-addons: Fix generating GeoIP database Perl seems to have a very funny feature where you cannot rely on how it formats IP addresses into a binary string. This seems to be 16 bytes long for IPv4 addresses when we (and the kernel) only expect 4. This patch changes this so that the last 12 bytes are just being dropped. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/xtables-addons | 2 ++ .../xtables-addons-3.2-fix-database-generation.patch | 18 ++++++++++++++++++ src/scripts/xt_geoip_update | 4 ++-- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 src/patches/xtables-addons-3.2-fix-database-generation.patch Difference in files: diff --git a/lfs/xtables-addons b/lfs/xtables-addons index 260820955..4cf220c4e 100644 --- a/lfs/xtables-addons +++ b/lfs/xtables-addons @@ -82,6 +82,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/xtables-addons-3.2-fix-database-generation.patch + # Only build the specified modules. cp -avf $(DIR_SRC)/config/xtables-addons/mconfig \ $(DIR_APP)/mconfig diff --git a/src/patches/xtables-addons-3.2-fix-database-generation.patch b/src/patches/xtables-addons-3.2-fix-database-generation.patch new file mode 100644 index 000000000..5574e200d --- /dev/null +++ b/src/patches/xtables-addons-3.2-fix-database-generation.patch @@ -0,0 +1,18 @@ +diff --git a/geoip/xt_geoip_build b/geoip/xt_geoip_build +index 3b15875..7bc42f3 100755 +--- a/geoip/xt_geoip_build ++++ b/geoip/xt_geoip_build +@@ -259,7 +259,12 @@ sub writeCountry + my ($start, $end) = split('-', $range); + $start = inet_pton($family, $start); + $end = inet_pton($family, $end); +- print $fh $start, $end; ++ ++ if ($family == AF_INET) { ++ print $fh substr($start, 0, 4), substr($end, 0, 4); ++ } else { ++ print $fh $start, $end; ++ } + } + close $fh; + } diff --git a/src/scripts/xt_geoip_update b/src/scripts/xt_geoip_update index b45c5b343..93884dcf5 100644 --- a/src/scripts/xt_geoip_update +++ b/src/scripts/xt_geoip_update @@ -26,7 +26,7 @@ SCRIPT_PATH=/usr/local/bin DEST_PATH=/usr/share/xt_geoip DB_PATH=/var/lib/GeoIP -DL_URL=http://geolite.maxmind.com/download/geoip/database +DL_URL=https://geolite.maxmind.com/download/geoip/database DL_FILE=GeoLite2-Country-CSV.zip eval $(/usr/local/bin/readhash /var/ipfire/proxy/settings) @@ -40,7 +40,7 @@ function download() { # Proxy settings. # Check if a proxy should be used. if [[ $UPSTREAM_PROXY ]]; then - PROXYSETTINGS="-e http_proxy=http://" + PROXYSETTINGS="-e https_proxy=http://" # Check if authentication against the proxy is configured. if [[ $UPSTREAM_USER && $UPSTREAM_PASSWORD ]]; then hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 26d07ee5da961c7ac8a062b6e8386800cd5f21f7
by Michael Tremer 23 Jan '19

23 Jan '19

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 26d07ee5da961c7ac8a062b6e8386800cd5f21f7 (commit) via 0661be620bb3119ea5cd2191ae6028c99f50d4b9 (commit) from b7ddf23b7238e469a19e09acaa5cfeb63fac9c78 (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 26d07ee5da961c7ac8a062b6e8386800cd5f21f7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jan 23 03:06:07 2019 +0000 core128: Ship updated tzdata Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0661be620bb3119ea5cd2191ae6028c99f50d4b9 Author: Peter Müller <peter.mueller(a)link38.eu> Date: Wed Jan 23 16:00:57 2019 +0100 tzdata: update to 2018i Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/tzdata | 262 ++++++++++----------- .../{oldcore/100 => core/128}/filelists/tzdata | 0 lfs/tzdata | 8 +- 3 files changed, 135 insertions(+), 135 deletions(-) copy config/rootfiles/{oldcore/100 => core/128}/filelists/tzdata (100%) Difference in files: diff --git a/config/rootfiles/common/tzdata b/config/rootfiles/common/tzdata index fb118efea..f560ca5e6 100644 --- a/config/rootfiles/common/tzdata +++ b/config/rootfiles/common/tzdata @@ -114,9 +114,9 @@ usr/share/zoneinfo #usr/share/zoneinfo/America/Eirunepe #usr/share/zoneinfo/America/El_Salvador #usr/share/zoneinfo/America/Ensenada -#usr/share/zoneinfo/America/Fortaleza #usr/share/zoneinfo/America/Fort_Nelson #usr/share/zoneinfo/America/Fort_Wayne +#usr/share/zoneinfo/America/Fortaleza #usr/share/zoneinfo/America/Glace_Bay #usr/share/zoneinfo/America/Godthab #usr/share/zoneinfo/America/Goose_Bay @@ -134,11 +134,11 @@ usr/share/zoneinfo #usr/share/zoneinfo/America/Indiana/Knox #usr/share/zoneinfo/America/Indiana/Marengo #usr/share/zoneinfo/America/Indiana/Petersburg -#usr/share/zoneinfo/America/Indianapolis #usr/share/zoneinfo/America/Indiana/Tell_City #usr/share/zoneinfo/America/Indiana/Vevay #usr/share/zoneinfo/America/Indiana/Vincennes #usr/share/zoneinfo/America/Indiana/Winamac +#usr/share/zoneinfo/America/Indianapolis #usr/share/zoneinfo/America/Inuvik #usr/share/zoneinfo/America/Iqaluit #usr/share/zoneinfo/America/Jamaica @@ -187,8 +187,8 @@ usr/share/zoneinfo #usr/share/zoneinfo/America/Paramaribo #usr/share/zoneinfo/America/Phoenix #usr/share/zoneinfo/America/Port-au-Prince -#usr/share/zoneinfo/America/Porto_Acre #usr/share/zoneinfo/America/Port_of_Spain +#usr/share/zoneinfo/America/Porto_Acre #usr/share/zoneinfo/America/Porto_Velho #usr/share/zoneinfo/America/Puerto_Rico #usr/share/zoneinfo/America/Punta_Arenas @@ -310,6 +310,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/Asia/Pontianak #usr/share/zoneinfo/Asia/Pyongyang #usr/share/zoneinfo/Asia/Qatar +#usr/share/zoneinfo/Asia/Qostanay #usr/share/zoneinfo/Asia/Qyzylorda #usr/share/zoneinfo/Asia/Rangoon #usr/share/zoneinfo/Asia/Riyadh @@ -351,8 +352,8 @@ usr/share/zoneinfo #usr/share/zoneinfo/Atlantic/Madeira #usr/share/zoneinfo/Atlantic/Reykjavik #usr/share/zoneinfo/Atlantic/South_Georgia -#usr/share/zoneinfo/Atlantic/Stanley #usr/share/zoneinfo/Atlantic/St_Helena +#usr/share/zoneinfo/Atlantic/Stanley #usr/share/zoneinfo/Australia #usr/share/zoneinfo/Australia/ACT #usr/share/zoneinfo/Australia/Adelaide @@ -367,8 +368,8 @@ usr/share/zoneinfo #usr/share/zoneinfo/Australia/Lindeman #usr/share/zoneinfo/Australia/Lord_Howe #usr/share/zoneinfo/Australia/Melbourne -#usr/share/zoneinfo/Australia/North #usr/share/zoneinfo/Australia/NSW +#usr/share/zoneinfo/Australia/North #usr/share/zoneinfo/Australia/Perth #usr/share/zoneinfo/Australia/Queensland #usr/share/zoneinfo/Australia/South @@ -382,62 +383,61 @@ usr/share/zoneinfo #usr/share/zoneinfo/Brazil/DeNoronha #usr/share/zoneinfo/Brazil/East #usr/share/zoneinfo/Brazil/West +#usr/share/zoneinfo/CET +#usr/share/zoneinfo/CST6CDT #usr/share/zoneinfo/Canada #usr/share/zoneinfo/Canada/Atlantic #usr/share/zoneinfo/Canada/Central #usr/share/zoneinfo/Canada/Eastern -#usr/share/zoneinfo/Canada/East-Saskatchewan #usr/share/zoneinfo/Canada/Mountain #usr/share/zoneinfo/Canada/Newfoundland #usr/share/zoneinfo/Canada/Pacific #usr/share/zoneinfo/Canada/Saskatchewan #usr/share/zoneinfo/Canada/Yukon -#usr/share/zoneinfo/CET #usr/share/zoneinfo/Chile #usr/share/zoneinfo/Chile/Continental #usr/share/zoneinfo/Chile/EasterIsland -#usr/share/zoneinfo/CST6CDT #usr/share/zoneinfo/Cuba #usr/share/zoneinfo/EET -#usr/share/zoneinfo/Egypt -#usr/share/zoneinfo/Eire #usr/share/zoneinfo/EST #usr/share/zoneinfo/EST5EDT +#usr/share/zoneinfo/Egypt +#usr/share/zoneinfo/Eire #usr/share/zoneinfo/Etc #usr/share/zoneinfo/Etc/GMT -#usr/share/zoneinfo/Etc/GMT0 -#usr/share/zoneinfo/Etc/GMT-0 #usr/share/zoneinfo/Etc/GMT+0 -#usr/share/zoneinfo/Etc/GMT-1 #usr/share/zoneinfo/Etc/GMT+1 -#usr/share/zoneinfo/Etc/GMT-10 #usr/share/zoneinfo/Etc/GMT+10 -#usr/share/zoneinfo/Etc/GMT-11 #usr/share/zoneinfo/Etc/GMT+11 -#usr/share/zoneinfo/Etc/GMT-12 #usr/share/zoneinfo/Etc/GMT+12 +#usr/share/zoneinfo/Etc/GMT+2 +#usr/share/zoneinfo/Etc/GMT+3 +#usr/share/zoneinfo/Etc/GMT+4 +#usr/share/zoneinfo/Etc/GMT+5 +#usr/share/zoneinfo/Etc/GMT+6 +#usr/share/zoneinfo/Etc/GMT+7 +#usr/share/zoneinfo/Etc/GMT+8 +#usr/share/zoneinfo/Etc/GMT+9 +#usr/share/zoneinfo/Etc/GMT-0 +#usr/share/zoneinfo/Etc/GMT-1 +#usr/share/zoneinfo/Etc/GMT-10 +#usr/share/zoneinfo/Etc/GMT-11 +#usr/share/zoneinfo/Etc/GMT-12 #usr/share/zoneinfo/Etc/GMT-13 #usr/share/zoneinfo/Etc/GMT-14 #usr/share/zoneinfo/Etc/GMT-2 -#usr/share/zoneinfo/Etc/GMT+2 #usr/share/zoneinfo/Etc/GMT-3 -#usr/share/zoneinfo/Etc/GMT+3 #usr/share/zoneinfo/Etc/GMT-4 -#usr/share/zoneinfo/Etc/GMT+4 #usr/share/zoneinfo/Etc/GMT-5 -#usr/share/zoneinfo/Etc/GMT+5 #usr/share/zoneinfo/Etc/GMT-6 -#usr/share/zoneinfo/Etc/GMT+6 #usr/share/zoneinfo/Etc/GMT-7 -#usr/share/zoneinfo/Etc/GMT+7 #usr/share/zoneinfo/Etc/GMT-8 -#usr/share/zoneinfo/Etc/GMT+8 #usr/share/zoneinfo/Etc/GMT-9 -#usr/share/zoneinfo/Etc/GMT+9 +#usr/share/zoneinfo/Etc/GMT0 #usr/share/zoneinfo/Etc/Greenwich #usr/share/zoneinfo/Etc/UCT -#usr/share/zoneinfo/Etc/Universal #usr/share/zoneinfo/Etc/UTC +#usr/share/zoneinfo/Etc/Universal #usr/share/zoneinfo/Etc/Zulu #usr/share/zoneinfo/Europe #usr/share/zoneinfo/Europe/Amsterdam @@ -506,12 +506,12 @@ usr/share/zoneinfo #usr/share/zoneinfo/GB #usr/share/zoneinfo/GB-Eire #usr/share/zoneinfo/GMT -#usr/share/zoneinfo/GMT0 -#usr/share/zoneinfo/GMT-0 #usr/share/zoneinfo/GMT+0 +#usr/share/zoneinfo/GMT-0 +#usr/share/zoneinfo/GMT0 #usr/share/zoneinfo/Greenwich -#usr/share/zoneinfo/Hongkong #usr/share/zoneinfo/HST +#usr/share/zoneinfo/Hongkong #usr/share/zoneinfo/Iceland #usr/share/zoneinfo/Indian #usr/share/zoneinfo/Indian/Antananarivo @@ -526,22 +526,23 @@ usr/share/zoneinfo #usr/share/zoneinfo/Indian/Mayotte #usr/share/zoneinfo/Indian/Reunion #usr/share/zoneinfo/Iran -#usr/share/zoneinfo/iso3166.tab #usr/share/zoneinfo/Israel #usr/share/zoneinfo/Jamaica #usr/share/zoneinfo/Japan #usr/share/zoneinfo/Kwajalein #usr/share/zoneinfo/Libya #usr/share/zoneinfo/MET +#usr/share/zoneinfo/MST +#usr/share/zoneinfo/MST7MDT #usr/share/zoneinfo/Mexico #usr/share/zoneinfo/Mexico/BajaNorte #usr/share/zoneinfo/Mexico/BajaSur #usr/share/zoneinfo/Mexico/General -#usr/share/zoneinfo/MST -#usr/share/zoneinfo/MST7MDT -#usr/share/zoneinfo/Navajo #usr/share/zoneinfo/NZ #usr/share/zoneinfo/NZ-CHAT +#usr/share/zoneinfo/Navajo +#usr/share/zoneinfo/PRC +#usr/share/zoneinfo/PST8PDT #usr/share/zoneinfo/Pacific #usr/share/zoneinfo/Pacific/Apia #usr/share/zoneinfo/Pacific/Auckland @@ -588,6 +589,31 @@ usr/share/zoneinfo #usr/share/zoneinfo/Pacific/Yap #usr/share/zoneinfo/Poland #usr/share/zoneinfo/Portugal +#usr/share/zoneinfo/ROC +#usr/share/zoneinfo/ROK +#usr/share/zoneinfo/Singapore +#usr/share/zoneinfo/Turkey +#usr/share/zoneinfo/UCT +#usr/share/zoneinfo/US +#usr/share/zoneinfo/US/Alaska +#usr/share/zoneinfo/US/Aleutian +#usr/share/zoneinfo/US/Arizona +#usr/share/zoneinfo/US/Central +#usr/share/zoneinfo/US/East-Indiana +#usr/share/zoneinfo/US/Eastern +#usr/share/zoneinfo/US/Hawaii +#usr/share/zoneinfo/US/Indiana-Starke +#usr/share/zoneinfo/US/Michigan +#usr/share/zoneinfo/US/Mountain +#usr/share/zoneinfo/US/Pacific +#usr/share/zoneinfo/US/Pacific-New +#usr/share/zoneinfo/US/Samoa +#usr/share/zoneinfo/UTC +#usr/share/zoneinfo/Universal +#usr/share/zoneinfo/W-SU +#usr/share/zoneinfo/WET +#usr/share/zoneinfo/Zulu +#usr/share/zoneinfo/iso3166.tab #usr/share/zoneinfo/posix #usr/share/zoneinfo/posix/Africa #usr/share/zoneinfo/posix/Africa/Abidjan @@ -703,9 +729,9 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/America/Eirunepe #usr/share/zoneinfo/posix/America/El_Salvador #usr/share/zoneinfo/posix/America/Ensenada -#usr/share/zoneinfo/posix/America/Fortaleza #usr/share/zoneinfo/posix/America/Fort_Nelson #usr/share/zoneinfo/posix/America/Fort_Wayne +#usr/share/zoneinfo/posix/America/Fortaleza #usr/share/zoneinfo/posix/America/Glace_Bay #usr/share/zoneinfo/posix/America/Godthab #usr/share/zoneinfo/posix/America/Goose_Bay @@ -723,11 +749,11 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/America/Indiana/Knox #usr/share/zoneinfo/posix/America/Indiana/Marengo #usr/share/zoneinfo/posix/America/Indiana/Petersburg -#usr/share/zoneinfo/posix/America/Indianapolis #usr/share/zoneinfo/posix/America/Indiana/Tell_City #usr/share/zoneinfo/posix/America/Indiana/Vevay #usr/share/zoneinfo/posix/America/Indiana/Vincennes #usr/share/zoneinfo/posix/America/Indiana/Winamac +#usr/share/zoneinfo/posix/America/Indianapolis #usr/share/zoneinfo/posix/America/Inuvik #usr/share/zoneinfo/posix/America/Iqaluit #usr/share/zoneinfo/posix/America/Jamaica @@ -776,8 +802,8 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/America/Paramaribo #usr/share/zoneinfo/posix/America/Phoenix #usr/share/zoneinfo/posix/America/Port-au-Prince -#usr/share/zoneinfo/posix/America/Porto_Acre #usr/share/zoneinfo/posix/America/Port_of_Spain +#usr/share/zoneinfo/posix/America/Porto_Acre #usr/share/zoneinfo/posix/America/Porto_Velho #usr/share/zoneinfo/posix/America/Puerto_Rico #usr/share/zoneinfo/posix/America/Punta_Arenas @@ -899,6 +925,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Asia/Pontianak #usr/share/zoneinfo/posix/Asia/Pyongyang #usr/share/zoneinfo/posix/Asia/Qatar +#usr/share/zoneinfo/posix/Asia/Qostanay #usr/share/zoneinfo/posix/Asia/Qyzylorda #usr/share/zoneinfo/posix/Asia/Rangoon #usr/share/zoneinfo/posix/Asia/Riyadh @@ -940,8 +967,8 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Atlantic/Madeira #usr/share/zoneinfo/posix/Atlantic/Reykjavik #usr/share/zoneinfo/posix/Atlantic/South_Georgia -#usr/share/zoneinfo/posix/Atlantic/Stanley #usr/share/zoneinfo/posix/Atlantic/St_Helena +#usr/share/zoneinfo/posix/Atlantic/Stanley #usr/share/zoneinfo/posix/Australia #usr/share/zoneinfo/posix/Australia/ACT #usr/share/zoneinfo/posix/Australia/Adelaide @@ -956,8 +983,8 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Australia/Lindeman #usr/share/zoneinfo/posix/Australia/Lord_Howe #usr/share/zoneinfo/posix/Australia/Melbourne -#usr/share/zoneinfo/posix/Australia/North #usr/share/zoneinfo/posix/Australia/NSW +#usr/share/zoneinfo/posix/Australia/North #usr/share/zoneinfo/posix/Australia/Perth #usr/share/zoneinfo/posix/Australia/Queensland #usr/share/zoneinfo/posix/Australia/South @@ -971,62 +998,61 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Brazil/DeNoronha #usr/share/zoneinfo/posix/Brazil/East #usr/share/zoneinfo/posix/Brazil/West +#usr/share/zoneinfo/posix/CET +#usr/share/zoneinfo/posix/CST6CDT #usr/share/zoneinfo/posix/Canada #usr/share/zoneinfo/posix/Canada/Atlantic #usr/share/zoneinfo/posix/Canada/Central #usr/share/zoneinfo/posix/Canada/Eastern -#usr/share/zoneinfo/posix/Canada/East-Saskatchewan #usr/share/zoneinfo/posix/Canada/Mountain #usr/share/zoneinfo/posix/Canada/Newfoundland #usr/share/zoneinfo/posix/Canada/Pacific #usr/share/zoneinfo/posix/Canada/Saskatchewan #usr/share/zoneinfo/posix/Canada/Yukon -#usr/share/zoneinfo/posix/CET #usr/share/zoneinfo/posix/Chile #usr/share/zoneinfo/posix/Chile/Continental #usr/share/zoneinfo/posix/Chile/EasterIsland -#usr/share/zoneinfo/posix/CST6CDT #usr/share/zoneinfo/posix/Cuba #usr/share/zoneinfo/posix/EET -#usr/share/zoneinfo/posix/Egypt -#usr/share/zoneinfo/posix/Eire #usr/share/zoneinfo/posix/EST #usr/share/zoneinfo/posix/EST5EDT +#usr/share/zoneinfo/posix/Egypt +#usr/share/zoneinfo/posix/Eire #usr/share/zoneinfo/posix/Etc #usr/share/zoneinfo/posix/Etc/GMT -#usr/share/zoneinfo/posix/Etc/GMT0 -#usr/share/zoneinfo/posix/Etc/GMT-0 #usr/share/zoneinfo/posix/Etc/GMT+0 -#usr/share/zoneinfo/posix/Etc/GMT-1 #usr/share/zoneinfo/posix/Etc/GMT+1 -#usr/share/zoneinfo/posix/Etc/GMT-10 #usr/share/zoneinfo/posix/Etc/GMT+10 -#usr/share/zoneinfo/posix/Etc/GMT-11 #usr/share/zoneinfo/posix/Etc/GMT+11 -#usr/share/zoneinfo/posix/Etc/GMT-12 #usr/share/zoneinfo/posix/Etc/GMT+12 +#usr/share/zoneinfo/posix/Etc/GMT+2 +#usr/share/zoneinfo/posix/Etc/GMT+3 +#usr/share/zoneinfo/posix/Etc/GMT+4 +#usr/share/zoneinfo/posix/Etc/GMT+5 +#usr/share/zoneinfo/posix/Etc/GMT+6 +#usr/share/zoneinfo/posix/Etc/GMT+7 +#usr/share/zoneinfo/posix/Etc/GMT+8 +#usr/share/zoneinfo/posix/Etc/GMT+9 +#usr/share/zoneinfo/posix/Etc/GMT-0 +#usr/share/zoneinfo/posix/Etc/GMT-1 +#usr/share/zoneinfo/posix/Etc/GMT-10 +#usr/share/zoneinfo/posix/Etc/GMT-11 +#usr/share/zoneinfo/posix/Etc/GMT-12 #usr/share/zoneinfo/posix/Etc/GMT-13 #usr/share/zoneinfo/posix/Etc/GMT-14 #usr/share/zoneinfo/posix/Etc/GMT-2 -#usr/share/zoneinfo/posix/Etc/GMT+2 #usr/share/zoneinfo/posix/Etc/GMT-3 -#usr/share/zoneinfo/posix/Etc/GMT+3 #usr/share/zoneinfo/posix/Etc/GMT-4 -#usr/share/zoneinfo/posix/Etc/GMT+4 #usr/share/zoneinfo/posix/Etc/GMT-5 -#usr/share/zoneinfo/posix/Etc/GMT+5 #usr/share/zoneinfo/posix/Etc/GMT-6 -#usr/share/zoneinfo/posix/Etc/GMT+6 #usr/share/zoneinfo/posix/Etc/GMT-7 -#usr/share/zoneinfo/posix/Etc/GMT+7 #usr/share/zoneinfo/posix/Etc/GMT-8 -#usr/share/zoneinfo/posix/Etc/GMT+8 #usr/share/zoneinfo/posix/Etc/GMT-9 -#usr/share/zoneinfo/posix/Etc/GMT+9 +#usr/share/zoneinfo/posix/Etc/GMT0 #usr/share/zoneinfo/posix/Etc/Greenwich #usr/share/zoneinfo/posix/Etc/UCT -#usr/share/zoneinfo/posix/Etc/Universal #usr/share/zoneinfo/posix/Etc/UTC +#usr/share/zoneinfo/posix/Etc/Universal #usr/share/zoneinfo/posix/Etc/Zulu #usr/share/zoneinfo/posix/Europe #usr/share/zoneinfo/posix/Europe/Amsterdam @@ -1095,12 +1121,12 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/GB #usr/share/zoneinfo/posix/GB-Eire #usr/share/zoneinfo/posix/GMT -#usr/share/zoneinfo/posix/GMT0 -#usr/share/zoneinfo/posix/GMT-0 #usr/share/zoneinfo/posix/GMT+0 +#usr/share/zoneinfo/posix/GMT-0 +#usr/share/zoneinfo/posix/GMT0 #usr/share/zoneinfo/posix/Greenwich -#usr/share/zoneinfo/posix/Hongkong #usr/share/zoneinfo/posix/HST +#usr/share/zoneinfo/posix/Hongkong #usr/share/zoneinfo/posix/Iceland #usr/share/zoneinfo/posix/Indian #usr/share/zoneinfo/posix/Indian/Antananarivo @@ -1121,15 +1147,17 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Kwajalein #usr/share/zoneinfo/posix/Libya #usr/share/zoneinfo/posix/MET +#usr/share/zoneinfo/posix/MST +#usr/share/zoneinfo/posix/MST7MDT #usr/share/zoneinfo/posix/Mexico #usr/share/zoneinfo/posix/Mexico/BajaNorte #usr/share/zoneinfo/posix/Mexico/BajaSur #usr/share/zoneinfo/posix/Mexico/General -#usr/share/zoneinfo/posix/MST -#usr/share/zoneinfo/posix/MST7MDT -#usr/share/zoneinfo/posix/Navajo #usr/share/zoneinfo/posix/NZ #usr/share/zoneinfo/posix/NZ-CHAT +#usr/share/zoneinfo/posix/Navajo +#usr/share/zoneinfo/posix/PRC +#usr/share/zoneinfo/posix/PST8PDT #usr/share/zoneinfo/posix/Pacific #usr/share/zoneinfo/posix/Pacific/Apia #usr/share/zoneinfo/posix/Pacific/Auckland @@ -1176,22 +1204,18 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/Pacific/Yap #usr/share/zoneinfo/posix/Poland #usr/share/zoneinfo/posix/Portugal -#usr/share/zoneinfo/posix/PRC -#usr/share/zoneinfo/posix/PST8PDT #usr/share/zoneinfo/posix/ROC #usr/share/zoneinfo/posix/ROK -#usr/share/zoneinfo/posixrules #usr/share/zoneinfo/posix/Singapore #usr/share/zoneinfo/posix/Turkey #usr/share/zoneinfo/posix/UCT -#usr/share/zoneinfo/posix/Universal #usr/share/zoneinfo/posix/US #usr/share/zoneinfo/posix/US/Alaska #usr/share/zoneinfo/posix/US/Aleutian #usr/share/zoneinfo/posix/US/Arizona #usr/share/zoneinfo/posix/US/Central -#usr/share/zoneinfo/posix/US/Eastern #usr/share/zoneinfo/posix/US/East-Indiana +#usr/share/zoneinfo/posix/US/Eastern #usr/share/zoneinfo/posix/US/Hawaii #usr/share/zoneinfo/posix/US/Indiana-Starke #usr/share/zoneinfo/posix/US/Michigan @@ -1200,11 +1224,11 @@ usr/share/zoneinfo #usr/share/zoneinfo/posix/US/Pacific-New #usr/share/zoneinfo/posix/US/Samoa #usr/share/zoneinfo/posix/UTC -#usr/share/zoneinfo/posix/WET +#usr/share/zoneinfo/posix/Universal #usr/share/zoneinfo/posix/W-SU +#usr/share/zoneinfo/posix/WET #usr/share/zoneinfo/posix/Zulu -#usr/share/zoneinfo/PRC -#usr/share/zoneinfo/PST8PDT +#usr/share/zoneinfo/posixrules #usr/share/zoneinfo/right #usr/share/zoneinfo/right/Africa #usr/share/zoneinfo/right/Africa/Abidjan @@ -1320,9 +1344,9 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/America/Eirunepe #usr/share/zoneinfo/right/America/El_Salvador #usr/share/zoneinfo/right/America/Ensenada -#usr/share/zoneinfo/right/America/Fortaleza #usr/share/zoneinfo/right/America/Fort_Nelson #usr/share/zoneinfo/right/America/Fort_Wayne +#usr/share/zoneinfo/right/America/Fortaleza #usr/share/zoneinfo/right/America/Glace_Bay #usr/share/zoneinfo/right/America/Godthab #usr/share/zoneinfo/right/America/Goose_Bay @@ -1340,11 +1364,11 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/America/Indiana/Knox #usr/share/zoneinfo/right/America/Indiana/Marengo #usr/share/zoneinfo/right/America/Indiana/Petersburg -#usr/share/zoneinfo/right/America/Indianapolis #usr/share/zoneinfo/right/America/Indiana/Tell_City #usr/share/zoneinfo/right/America/Indiana/Vevay #usr/share/zoneinfo/right/America/Indiana/Vincennes #usr/share/zoneinfo/right/America/Indiana/Winamac +#usr/share/zoneinfo/right/America/Indianapolis #usr/share/zoneinfo/right/America/Inuvik #usr/share/zoneinfo/right/America/Iqaluit #usr/share/zoneinfo/right/America/Jamaica @@ -1393,8 +1417,8 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/America/Paramaribo #usr/share/zoneinfo/right/America/Phoenix #usr/share/zoneinfo/right/America/Port-au-Prince -#usr/share/zoneinfo/right/America/Porto_Acre #usr/share/zoneinfo/right/America/Port_of_Spain +#usr/share/zoneinfo/right/America/Porto_Acre #usr/share/zoneinfo/right/America/Porto_Velho #usr/share/zoneinfo/right/America/Puerto_Rico #usr/share/zoneinfo/right/America/Punta_Arenas @@ -1516,6 +1540,7 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Asia/Pontianak #usr/share/zoneinfo/right/Asia/Pyongyang #usr/share/zoneinfo/right/Asia/Qatar +#usr/share/zoneinfo/right/Asia/Qostanay #usr/share/zoneinfo/right/Asia/Qyzylorda #usr/share/zoneinfo/right/Asia/Rangoon #usr/share/zoneinfo/right/Asia/Riyadh @@ -1557,8 +1582,8 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Atlantic/Madeira #usr/share/zoneinfo/right/Atlantic/Reykjavik #usr/share/zoneinfo/right/Atlantic/South_Georgia -#usr/share/zoneinfo/right/Atlantic/Stanley #usr/share/zoneinfo/right/Atlantic/St_Helena +#usr/share/zoneinfo/right/Atlantic/Stanley #usr/share/zoneinfo/right/Australia #usr/share/zoneinfo/right/Australia/ACT #usr/share/zoneinfo/right/Australia/Adelaide @@ -1573,8 +1598,8 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Australia/Lindeman #usr/share/zoneinfo/right/Australia/Lord_Howe #usr/share/zoneinfo/right/Australia/Melbourne -#usr/share/zoneinfo/right/Australia/North #usr/share/zoneinfo/right/Australia/NSW +#usr/share/zoneinfo/right/Australia/North #usr/share/zoneinfo/right/Australia/Perth #usr/share/zoneinfo/right/Australia/Queensland #usr/share/zoneinfo/right/Australia/South @@ -1588,62 +1613,61 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Brazil/DeNoronha #usr/share/zoneinfo/right/Brazil/East #usr/share/zoneinfo/right/Brazil/West +#usr/share/zoneinfo/right/CET +#usr/share/zoneinfo/right/CST6CDT #usr/share/zoneinfo/right/Canada #usr/share/zoneinfo/right/Canada/Atlantic #usr/share/zoneinfo/right/Canada/Central #usr/share/zoneinfo/right/Canada/Eastern -#usr/share/zoneinfo/right/Canada/East-Saskatchewan #usr/share/zoneinfo/right/Canada/Mountain #usr/share/zoneinfo/right/Canada/Newfoundland #usr/share/zoneinfo/right/Canada/Pacific #usr/share/zoneinfo/right/Canada/Saskatchewan #usr/share/zoneinfo/right/Canada/Yukon -#usr/share/zoneinfo/right/CET #usr/share/zoneinfo/right/Chile #usr/share/zoneinfo/right/Chile/Continental #usr/share/zoneinfo/right/Chile/EasterIsland -#usr/share/zoneinfo/right/CST6CDT #usr/share/zoneinfo/right/Cuba #usr/share/zoneinfo/right/EET -#usr/share/zoneinfo/right/Egypt -#usr/share/zoneinfo/right/Eire #usr/share/zoneinfo/right/EST #usr/share/zoneinfo/right/EST5EDT +#usr/share/zoneinfo/right/Egypt +#usr/share/zoneinfo/right/Eire #usr/share/zoneinfo/right/Etc #usr/share/zoneinfo/right/Etc/GMT -#usr/share/zoneinfo/right/Etc/GMT0 -#usr/share/zoneinfo/right/Etc/GMT-0 #usr/share/zoneinfo/right/Etc/GMT+0 -#usr/share/zoneinfo/right/Etc/GMT-1 #usr/share/zoneinfo/right/Etc/GMT+1 -#usr/share/zoneinfo/right/Etc/GMT-10 #usr/share/zoneinfo/right/Etc/GMT+10 -#usr/share/zoneinfo/right/Etc/GMT-11 #usr/share/zoneinfo/right/Etc/GMT+11 -#usr/share/zoneinfo/right/Etc/GMT-12 #usr/share/zoneinfo/right/Etc/GMT+12 +#usr/share/zoneinfo/right/Etc/GMT+2 +#usr/share/zoneinfo/right/Etc/GMT+3 +#usr/share/zoneinfo/right/Etc/GMT+4 +#usr/share/zoneinfo/right/Etc/GMT+5 +#usr/share/zoneinfo/right/Etc/GMT+6 +#usr/share/zoneinfo/right/Etc/GMT+7 +#usr/share/zoneinfo/right/Etc/GMT+8 +#usr/share/zoneinfo/right/Etc/GMT+9 +#usr/share/zoneinfo/right/Etc/GMT-0 +#usr/share/zoneinfo/right/Etc/GMT-1 +#usr/share/zoneinfo/right/Etc/GMT-10 +#usr/share/zoneinfo/right/Etc/GMT-11 +#usr/share/zoneinfo/right/Etc/GMT-12 #usr/share/zoneinfo/right/Etc/GMT-13 #usr/share/zoneinfo/right/Etc/GMT-14 #usr/share/zoneinfo/right/Etc/GMT-2 -#usr/share/zoneinfo/right/Etc/GMT+2 #usr/share/zoneinfo/right/Etc/GMT-3 -#usr/share/zoneinfo/right/Etc/GMT+3 #usr/share/zoneinfo/right/Etc/GMT-4 -#usr/share/zoneinfo/right/Etc/GMT+4 #usr/share/zoneinfo/right/Etc/GMT-5 -#usr/share/zoneinfo/right/Etc/GMT+5 #usr/share/zoneinfo/right/Etc/GMT-6 -#usr/share/zoneinfo/right/Etc/GMT+6 #usr/share/zoneinfo/right/Etc/GMT-7 -#usr/share/zoneinfo/right/Etc/GMT+7 #usr/share/zoneinfo/right/Etc/GMT-8 -#usr/share/zoneinfo/right/Etc/GMT+8 #usr/share/zoneinfo/right/Etc/GMT-9 -#usr/share/zoneinfo/right/Etc/GMT+9 +#usr/share/zoneinfo/right/Etc/GMT0 #usr/share/zoneinfo/right/Etc/Greenwich #usr/share/zoneinfo/right/Etc/UCT -#usr/share/zoneinfo/right/Etc/Universal #usr/share/zoneinfo/right/Etc/UTC +#usr/share/zoneinfo/right/Etc/Universal #usr/share/zoneinfo/right/Etc/Zulu #usr/share/zoneinfo/right/Europe #usr/share/zoneinfo/right/Europe/Amsterdam @@ -1712,12 +1736,12 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/GB #usr/share/zoneinfo/right/GB-Eire #usr/share/zoneinfo/right/GMT -#usr/share/zoneinfo/right/GMT0 -#usr/share/zoneinfo/right/GMT-0 #usr/share/zoneinfo/right/GMT+0 +#usr/share/zoneinfo/right/GMT-0 +#usr/share/zoneinfo/right/GMT0 #usr/share/zoneinfo/right/Greenwich -#usr/share/zoneinfo/right/Hongkong #usr/share/zoneinfo/right/HST +#usr/share/zoneinfo/right/Hongkong #usr/share/zoneinfo/right/Iceland #usr/share/zoneinfo/right/Indian #usr/share/zoneinfo/right/Indian/Antananarivo @@ -1738,15 +1762,17 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Kwajalein #usr/share/zoneinfo/right/Libya #usr/share/zoneinfo/right/MET +#usr/share/zoneinfo/right/MST +#usr/share/zoneinfo/right/MST7MDT #usr/share/zoneinfo/right/Mexico #usr/share/zoneinfo/right/Mexico/BajaNorte #usr/share/zoneinfo/right/Mexico/BajaSur #usr/share/zoneinfo/right/Mexico/General -#usr/share/zoneinfo/right/MST -#usr/share/zoneinfo/right/MST7MDT -#usr/share/zoneinfo/right/Navajo #usr/share/zoneinfo/right/NZ #usr/share/zoneinfo/right/NZ-CHAT +#usr/share/zoneinfo/right/Navajo +#usr/share/zoneinfo/right/PRC +#usr/share/zoneinfo/right/PST8PDT #usr/share/zoneinfo/right/Pacific #usr/share/zoneinfo/right/Pacific/Apia #usr/share/zoneinfo/right/Pacific/Auckland @@ -1793,21 +1819,18 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/Pacific/Yap #usr/share/zoneinfo/right/Poland #usr/share/zoneinfo/right/Portugal -#usr/share/zoneinfo/right/PRC -#usr/share/zoneinfo/right/PST8PDT #usr/share/zoneinfo/right/ROC #usr/share/zoneinfo/right/ROK #usr/share/zoneinfo/right/Singapore #usr/share/zoneinfo/right/Turkey #usr/share/zoneinfo/right/UCT -#usr/share/zoneinfo/right/Universal #usr/share/zoneinfo/right/US #usr/share/zoneinfo/right/US/Alaska #usr/share/zoneinfo/right/US/Aleutian #usr/share/zoneinfo/right/US/Arizona #usr/share/zoneinfo/right/US/Central -#usr/share/zoneinfo/right/US/Eastern #usr/share/zoneinfo/right/US/East-Indiana +#usr/share/zoneinfo/right/US/Eastern #usr/share/zoneinfo/right/US/Hawaii #usr/share/zoneinfo/right/US/Indiana-Starke #usr/share/zoneinfo/right/US/Michigan @@ -1816,31 +1839,8 @@ usr/share/zoneinfo #usr/share/zoneinfo/right/US/Pacific-New #usr/share/zoneinfo/right/US/Samoa #usr/share/zoneinfo/right/UTC -#usr/share/zoneinfo/right/WET +#usr/share/zoneinfo/right/Universal #usr/share/zoneinfo/right/W-SU +#usr/share/zoneinfo/right/WET #usr/share/zoneinfo/right/Zulu -#usr/share/zoneinfo/ROC -#usr/share/zoneinfo/ROK -#usr/share/zoneinfo/Singapore -#usr/share/zoneinfo/Turkey -#usr/share/zoneinfo/UCT -#usr/share/zoneinfo/Universal -#usr/share/zoneinfo/US -#usr/share/zoneinfo/US/Alaska -#usr/share/zoneinfo/US/Aleutian -#usr/share/zoneinfo/US/Arizona -#usr/share/zoneinfo/US/Central -#usr/share/zoneinfo/US/Eastern -#usr/share/zoneinfo/US/East-Indiana -#usr/share/zoneinfo/US/Hawaii -#usr/share/zoneinfo/US/Indiana-Starke -#usr/share/zoneinfo/US/Michigan -#usr/share/zoneinfo/US/Mountain -#usr/share/zoneinfo/US/Pacific -#usr/share/zoneinfo/US/Pacific-New -#usr/share/zoneinfo/US/Samoa -#usr/share/zoneinfo/UTC -#usr/share/zoneinfo/WET -#usr/share/zoneinfo/W-SU #usr/share/zoneinfo/zone.tab -#usr/share/zoneinfo/Zulu diff --git a/config/rootfiles/core/128/filelists/tzdata b/config/rootfiles/core/128/filelists/tzdata new file mode 120000 index 000000000..5a6e3252f --- /dev/null +++ b/config/rootfiles/core/128/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/lfs/tzdata b/lfs/tzdata index 5ed32d8d4..39f262608 100644 --- a/lfs/tzdata +++ b/lfs/tzdata @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 2018g +VER = 2018i TZDATA_VER = $(VER) TZCODE_VER = $(VER) @@ -45,8 +45,8 @@ objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz -tzdata$(TZDATA_VER).tar.gz_MD5 = e71cb1f9d8d53c43904d79d7aeeedc1b -tzcode$(TZCODE_VER).tar.gz_MD5 = b48f0282b80bb7dbe16e35626f446ae9 +tzdata$(TZDATA_VER).tar.gz_MD5 = b3f0a1a789480a036e58466cd0702477 +tzcode$(TZCODE_VER).tar.gz_MD5 = 6a6d98be8fa2fa3485e25343e79188b4 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b7ddf23b7238e469a19e09acaa5cfeb63fac9c78
by Michael Tremer 22 Jan '19

22 Jan '19

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 b7ddf23b7238e469a19e09acaa5cfeb63fac9c78 (commit) from ec7d630b622e40c558479cda2b5a64516d1be7a4 (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 b7ddf23b7238e469a19e09acaa5cfeb63fac9c78 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jan 22 05:31:21 2019 +0000 strongswan: Update to 5.7.2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/106 => core/128}/filelists/strongswan | 0 config/rootfiles/core/128/update.sh | 3 +++ lfs/strongswan | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) copy config/rootfiles/{oldcore/106 => core/128}/filelists/strongswan (100%) Difference in files: diff --git a/config/rootfiles/core/128/filelists/strongswan b/config/rootfiles/core/128/filelists/strongswan new file mode 120000 index 000000000..90c727e26 --- /dev/null +++ b/config/rootfiles/core/128/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/128/update.sh b/config/rootfiles/core/128/update.sh index 8f54d8041..343abc1ce 100644 --- a/config/rootfiles/core/128/update.sh +++ b/config/rootfiles/core/128/update.sh @@ -51,6 +51,9 @@ ldconfig sysctl -p # Start services +if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then + /etc/init.d/ipsec restart +fi # Finish /etc/init.d/fireinfo start diff --git a/lfs/strongswan b/lfs/strongswan index fd0b91a25..99261ce93 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ include Config -VER = 5.7.1 +VER = 5.7.2 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 86b7e9321cde075cf382268fd282e0b0 +$(DL_FILE)_MD5 = 618de96dc2a506f82a162a5abf9263d4 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 69b2f2ab8e05bb1b4af5e97a62b4038cb764e795
by Michael Tremer 22 Jan '19

22 Jan '19

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ec7d630b622e40c558479cda2b5a64516d1be7a4
by Arne Fitzenreiter 22 Jan '19

22 Jan '19

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 ec7d630b622e40c558479cda2b5a64516d1be7a4 (commit) via 503a6f155b218d9a991b98d9cc8b31dada77ca55 (commit) from eacf8dc4b7d028d7fd53707c9db84373a26b8a30 (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 ec7d630b622e40c558479cda2b5a64516d1be7a4 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jan 22 07:46:08 2019 +0100 kernel: x86_64 encrease NR_CPUS to 64 fixes #11963 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 503a6f155b218d9a991b98d9cc8b31dada77ca55 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jan 22 07:41:18 2019 +0100 kernel: update to 4.14.94 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 8 ++++++-- config/kernel/kernel.config.armv5tel-ipfire-kirkwood | 3 +-- config/kernel/kernel.config.armv5tel-ipfire-multi | 3 +-- config/kernel/kernel.config.i586-ipfire | 3 +-- config/kernel/kernel.config.i586-ipfire-pae | 3 +-- config/kernel/kernel.config.x86_64-ipfire | 5 ++--- lfs/linux | 12 ++++++------ 7 files changed, 18 insertions(+), 19 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 14f4be3a5..53cb1f8b5 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.81-ipfire Kernel Configuration +# Linux/arm64 4.14.94-ipfire Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -3389,6 +3389,11 @@ CONFIG_ARMADA_THERMAL=m # # ACPI INT340X thermal drivers # + +# +# Broadcom thermal drivers +# +CONFIG_BCM2835_THERMAL=y CONFIG_GENERIC_ADC_THERMAL=m CONFIG_WATCHDOG=y CONFIG_WATCHDOG_CORE=y @@ -6290,7 +6295,6 @@ CONFIG_CIFS_STATS=y # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_UPCALL is not set CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y CONFIG_CIFS_ACL=y # CONFIG_CIFS_DEBUG is not set CONFIG_CIFS_DFS_UPCALL=y diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood index bec2a45a5..e31a5d3fe 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood +++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.81-ipfire-kirkwood Kernel Configuration +# Linux/arm 4.14.94-ipfire-kirkwood Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -5722,7 +5722,6 @@ CONFIG_CIFS_STATS=y # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_UPCALL is not set CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y CONFIG_CIFS_ACL=y # CONFIG_CIFS_DEBUG is not set CONFIG_CIFS_DFS_UPCALL=y diff --git a/config/kernel/kernel.config.armv5tel-ipfire-multi b/config/kernel/kernel.config.armv5tel-ipfire-multi index b823c858d..688479238 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-multi +++ b/config/kernel/kernel.config.armv5tel-ipfire-multi @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 4.14.81-ipfire-multi Kernel Configuration +# Linux/arm 4.14.94-ipfire-multi Kernel Configuration # CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y @@ -6785,7 +6785,6 @@ CONFIG_CIFS_STATS=y # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_UPCALL is not set CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y CONFIG_CIFS_ACL=y # CONFIG_CIFS_DEBUG is not set CONFIG_CIFS_DFS_UPCALL=y diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index cfeb664a2..a2df25628 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.81-ipfire-pae Kernel Configuration +# Linux/x86 4.14.94-ipfire-pae Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -6414,7 +6414,6 @@ CONFIG_CIFS_STATS=y # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_UPCALL is not set CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y CONFIG_CIFS_ACL=y # CONFIG_CIFS_DEBUG is not set CONFIG_CIFS_DFS_UPCALL=y diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index f1b61bda9..459d3a258 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.81-ipfire-pae Kernel Configuration +# Linux/x86 4.14.94-ipfire-pae Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -6420,7 +6420,6 @@ CONFIG_CIFS_STATS=y # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_UPCALL is not set CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y CONFIG_CIFS_ACL=y # CONFIG_CIFS_DEBUG is not set CONFIG_CIFS_DFS_UPCALL=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 4eb93f85e..8875d70b1 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.81-ipfire Kernel Configuration +# Linux/x86 4.14.94-ipfire Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -499,7 +499,7 @@ CONFIG_DMI=y CONFIG_SWIOTLB=y CONFIG_IOMMU_HELPER=y # CONFIG_MAXSMP is not set -CONFIG_NR_CPUS=32 +CONFIG_NR_CPUS=64 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y CONFIG_SCHED_MC_PRIO=y @@ -6274,7 +6274,6 @@ CONFIG_CIFS_STATS=y # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_UPCALL is not set CONFIG_CIFS_XATTR=y -CONFIG_CIFS_POSIX=y CONFIG_CIFS_ACL=y # CONFIG_CIFS_DEBUG is not set CONFIG_CIFS_DFS_UPCALL=y diff --git a/lfs/linux b/lfs/linux index 7aac547f9..dac7e5516 100644 --- a/lfs/linux +++ b/lfs/linux @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,8 +24,8 @@ include Config -VER = 4.14.86 -ARM_PATCHES = 4.14.86-ipfire0 +VER = 4.14.94 +ARM_PATCHES = 4.14.94-ipfire0 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -34,7 +34,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 80 +PAK_VER = 81 DEPS = "" HEADERS_ARCH = $(BUILD_PLATFORM) @@ -82,8 +82,8 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = 9ffeff88ca630a6e0ef0257b0a05b8c4 -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 36b8a9adb8915cbccd18069e2f5af159 +$(DL_FILE)_MD5 = 2b06ce0be8f5dcdf0db0d4c63270aab8 +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = d8b93abb38fcea15bed335fef46f745d install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. eacf8dc4b7d028d7fd53707c9db84373a26b8a30
by Michael Tremer 21 Jan '19

21 Jan '19

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 eacf8dc4b7d028d7fd53707c9db84373a26b8a30 (commit) via d38e7e256d43069e49c557e947d4b940aae8a566 (commit) from f6326e4f777519e857d740cc525bb1ae3ea57ee3 (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 eacf8dc4b7d028d7fd53707c9db84373a26b8a30 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 21 21:04:10 2019 +0000 core128: Ship updated xt_geoip_update script Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d38e7e256d43069e49c557e947d4b940aae8a566 Author: Peter Müller <peter.mueller(a)link38.eu> Date: Mon Jan 21 21:40:50 2019 +0100 use HTTPS for downloading GeoIP database files Signed-off-by: Peter Müller <peter.mueller(a)link38.eu> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/128/filelists/files | 1 + src/scripts/xt_geoip_update | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/core/128/filelists/files b/config/rootfiles/core/128/filelists/files index ea80e29c8..0be9432b5 100644 --- a/config/rootfiles/core/128/filelists/files +++ b/config/rootfiles/core/128/filelists/files @@ -3,3 +3,4 @@ etc/issue srv/web/ipfire/cgi-bin/credits.cgi var/ipfire/langs etc/sysctl.conf +usr/local/bin/xt_geoip_update diff --git a/src/scripts/xt_geoip_update b/src/scripts/xt_geoip_update index b45c5b343..93884dcf5 100644 --- a/src/scripts/xt_geoip_update +++ b/src/scripts/xt_geoip_update @@ -26,7 +26,7 @@ SCRIPT_PATH=/usr/local/bin DEST_PATH=/usr/share/xt_geoip DB_PATH=/var/lib/GeoIP -DL_URL=http://geolite.maxmind.com/download/geoip/database +DL_URL=https://geolite.maxmind.com/download/geoip/database DL_FILE=GeoLite2-Country-CSV.zip eval $(/usr/local/bin/readhash /var/ipfire/proxy/settings) @@ -40,7 +40,7 @@ function download() { # Proxy settings. # Check if a proxy should be used. if [[ $UPSTREAM_PROXY ]]; then - PROXYSETTINGS="-e http_proxy=http://" + PROXYSETTINGS="-e https_proxy=http://" # Check if authentication against the proxy is configured. if [[ $UPSTREAM_USER && $UPSTREAM_PASSWORD ]]; then hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 7403755a939d9315b9b0185229c9cd0110df9fb6
by Michael Tremer 21 Jan '19

21 Jan '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 7403755a939d9315b9b0185229c9cd0110df9fb6 (commit) from 8ef817a80a1faa7bf6fb3e53d50a76cd9b847f91 (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 7403755a939d9315b9b0185229c9cd0110df9fb6 Author: Peter Müller <peter.mueller(a)link38.eu> Date: Mon Jan 21 21:43:26 2019 +0100 hide kernel addresses in /proc against privileged users In order to make local privilege escalation more harder, hide kernel addresses in various /proc files against users with root (or similar) permissions, too. Common system hardening tools such as lynis recommend this. Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: setup/setup.nm | 2 +- setup/sysctl/kernel-hardening.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/setup/setup.nm b/setup/setup.nm index e79fff10d..0bb936ccb 100644 --- a/setup/setup.nm +++ b/setup/setup.nm @@ -5,7 +5,7 @@ name = setup version = 3.0 -release = 11 +release = 12 arch = noarch groups = Base Build System/Base diff --git a/setup/sysctl/kernel-hardening.conf b/setup/sysctl/kernel-hardening.conf index 6751bbef6..9bb6e9f45 100644 --- a/setup/sysctl/kernel-hardening.conf +++ b/setup/sysctl/kernel-hardening.conf @@ -1,5 +1,5 @@ # Try to keep kernel address exposures out of various /proc files (kallsyms, modules, etc). -kernel.kptr_restrict = 1 +kernel.kptr_restrict = 2 # Avoid kernel memory address exposures via dmesg. kernel.dmesg_restrict = 1 hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f6326e4f777519e857d740cc525bb1ae3ea57ee3
by Michael Tremer 21 Jan '19

21 Jan '19

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 f6326e4f777519e857d740cc525bb1ae3ea57ee3 (commit) via 6f1aa31f01ed3e4a6cf59823f40405f5437c8c21 (commit) from 9b86a7ec28bd2a2049e771b59dff817c0569e106 (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 f6326e4f777519e857d740cc525bb1ae3ea57ee3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Jan 21 10:20:29 2019 +0000 core128: Ship updated logrotate Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6f1aa31f01ed3e4a6cf59823f40405f5437c8c21 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun Jan 20 18:07:47 2019 +0100 logrotate: Update to 3.15 For details see: https://github.com/logrotate/logrotate/releases - timer unit: change trigger fuzz from 12h to 1h (#230) - service unit: only run if /var/log is mounted (#230) - preserve fractional part of timestamps when compressing (#226) - re-indent source code using spaces only (#188) - minage: avoid rounding issue while comparing the amount of seconds (#36) - never remove old log files if rotate -1 is specified (#202) - return non-zero exit status if a config file contains an error (#199) - make copytruncate work with rotate 0 (#191) - warn user if both size and the time interval options are used (#192) - pass rotated log file name as the 2nd argument of the postrotate script when sharedscript is not enabled (#193) - rename logrotate-default to logrotate.conf (#187) Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/{oldcore/111 => core/128}/filelists/logrotate | 0 lfs/logrotate | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) copy config/rootfiles/{oldcore/111 => core/128}/filelists/logrotate (100%) Difference in files: diff --git a/config/rootfiles/core/128/filelists/logrotate b/config/rootfiles/core/128/filelists/logrotate new file mode 120000 index 000000000..bc192c05d --- /dev/null +++ b/config/rootfiles/core/128/filelists/logrotate @@ -0,0 +1 @@ +../../../common/logrotate \ No newline at end of file diff --git a/lfs/logrotate b/lfs/logrotate index a6b735443..143d09531 100644 --- a/lfs/logrotate +++ b/lfs/logrotate @@ -24,7 +24,7 @@ include Config -VER = 3.14.0 +VER = 3.15.0 THISAPP = logrotate-$(VER) DL_FILE = logrotate-$(VER).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9d9cf1d0a0b0433f56e152c5117f7b31 +$(DL_FILE)_MD5 = 240105d3288657d0ad7782c6a34c9a85 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9b86a7ec28bd2a2049e771b59dff817c0569e106
by Arne Fitzenreiter 19 Jan '19

19 Jan '19

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 9b86a7ec28bd2a2049e771b59dff817c0569e106 (commit) via f29ff21cd61fab2e7ed3ea443568c7c71bcb3f30 (commit) via 2092280a3a0cd749fc2869ae29ce8a25d7c1a055 (commit) via 271bac39a0b2999c843a5ec580438230d5398c74 (commit) via 4cba04ce288de78f8382fd88cd5538bb4e435724 (commit) via 3d476ab017763b44deff9206c97b7cfb548ffa7e (commit) via a58c5ca1f240132605ec86a9db58ae2e0e24d783 (commit) via a6c298b540787fa0feffbe5191855a54f6c8a178 (commit) via 99549950fa26674ec1807aeee0904f35cb930cd8 (commit) via ad62fda0addbd10573a30ce7a0ab6921b761f670 (commit) via 9918b6f40dd4201a5962ad7d5ea0c4479e28fec3 (commit) from 93d516bd7065e4a30a1a04bd3f1045b2b56864ad (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 9b86a7ec28bd2a2049e771b59dff817c0569e106 Merge: 93d516bd7 f29ff21cd Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 19 19:58:48 2019 +0100 Merge remote-tracking branch 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/oldcore/127/filelists/aarch64/files | 9 --------- .../oldcore/{124 => 127}/filelists/aarch64/files-aarch64 | 0 .../127/filelists/armv5tel/{files => files-armvtel} | 0 config/rootfiles/oldcore/{100 => 127}/filelists/bind | 0 config/rootfiles/oldcore/127/filelists/files | 2 ++ config/rootfiles/oldcore/127/update.sh | 16 +++++++++++++++- src/scripts/xt_geoip_update | 4 ++-- 7 files changed, 19 insertions(+), 12 deletions(-) delete mode 100644 config/rootfiles/oldcore/127/filelists/aarch64/files copy config/rootfiles/oldcore/{124 => 127}/filelists/aarch64/files-aarch64 (100%) rename config/rootfiles/oldcore/127/filelists/armv5tel/{files => files-armvtel} (100%) copy config/rootfiles/oldcore/{100 => 127}/filelists/bind (100%) Difference in files: diff --git a/config/rootfiles/oldcore/127/filelists/aarch64/files b/config/rootfiles/oldcore/127/filelists/aarch64/files deleted file mode 100644 index d76f3915c..000000000 --- a/config/rootfiles/oldcore/127/filelists/aarch64/files +++ /dev/null @@ -1,9 +0,0 @@ -boot/boot.cmd -boot/boot.scr -etc/system-release -etc/issue -srv/web/ipfire/cgi-bin/credits.cgi -var/ipfire/langs -etc/rc.d/init.d/aws -etc/rc.d/init.d/unbound -srv/web/ipfire/cgi-bin/dnsforward.cgi diff --git a/config/rootfiles/oldcore/127/filelists/armv5tel/files b/config/rootfiles/oldcore/127/filelists/aarch64/files-aarch64 similarity index 100% rename from config/rootfiles/oldcore/127/filelists/armv5tel/files rename to config/rootfiles/oldcore/127/filelists/aarch64/files-aarch64 diff --git a/config/rootfiles/oldcore/127/filelists/armv5tel/files-armvtel b/config/rootfiles/oldcore/127/filelists/armv5tel/files-armvtel new file mode 100644 index 000000000..6a00446f4 --- /dev/null +++ b/config/rootfiles/oldcore/127/filelists/armv5tel/files-armvtel @@ -0,0 +1,2 @@ +boot/boot.cmd +boot/boot.scr diff --git a/config/rootfiles/oldcore/127/filelists/bind b/config/rootfiles/oldcore/127/filelists/bind new file mode 120000 index 000000000..48a0ebaef --- /dev/null +++ b/config/rootfiles/oldcore/127/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/oldcore/127/filelists/files b/config/rootfiles/oldcore/127/filelists/files index 4b001af63..e28d42006 100644 --- a/config/rootfiles/oldcore/127/filelists/files +++ b/config/rootfiles/oldcore/127/filelists/files @@ -16,5 +16,7 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/lib/firewall/firewall-lib.pl +usr/local/bin/xt_geoip_update var/ipfire/backup/include +var/ipfire/general-functions.pl var/ipfire/geoip-functions.pl diff --git a/config/rootfiles/oldcore/127/update.sh b/config/rootfiles/oldcore/127/update.sh index 4fe045ec9..e276e7e68 100644 --- a/config/rootfiles/oldcore/127/update.sh +++ b/config/rootfiles/oldcore/127/update.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2018 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2019 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # @@ -48,6 +48,14 @@ ldconfig # Regenerate squid configuration file sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi +# If not exist create ovpn ca index.txt(.attr) and fix rights +touch /var/ipfire/ovpn/ca/index.txt.attr +chmod 644 /var/ipfire/ovpn/ca/index.txt.attr +chown nobody:nobody /var/ipfire/ovpn/ca/index.txt.attr +touch /var/ipfire/ovpn/ca/index.txt +chmod 644 /var/ipfire/ovpn/ca/index.txt +chown nobody:nobody /var/ipfire/ovpn/ca/index.txt + # Start services /etc/init.d/unbound restart /etc/init.d/squid start @@ -58,6 +66,12 @@ sysctl -p # Re-run depmod depmod -a +# Update xt_geoip +/usr/local/bin/xt_geoip_update + +# This update needs a reboot... +touch /var/run/need_reboot + # Finish /etc/init.d/fireinfo start sendprofile diff --git a/src/scripts/xt_geoip_update b/src/scripts/xt_geoip_update index 73484c7a0..b45c5b343 100644 --- a/src/scripts/xt_geoip_update +++ b/src/scripts/xt_geoip_update @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 IPFire Development Team <info(a)ipfire.org> # +# Copyright (C) 2019 IPFire Development Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -26,7 +26,7 @@ SCRIPT_PATH=/usr/local/bin DEST_PATH=/usr/share/xt_geoip DB_PATH=/var/lib/GeoIP -DL_URL=http://geolite.maxmind.com/download/geoip/database/ +DL_URL=http://geolite.maxmind.com/download/geoip/database DL_FILE=GeoLite2-Country-CSV.zip eval $(/usr/local/bin/readhash /var/ipfire/proxy/settings) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. f29ff21cd61fab2e7ed3ea443568c7c71bcb3f30
by Arne Fitzenreiter 19 Jan '19

19 Jan '19

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via f29ff21cd61fab2e7ed3ea443568c7c71bcb3f30 (commit) via 2092280a3a0cd749fc2869ae29ce8a25d7c1a055 (commit) via 271bac39a0b2999c843a5ec580438230d5398c74 (commit) via 4cba04ce288de78f8382fd88cd5538bb4e435724 (commit) via 3d476ab017763b44deff9206c97b7cfb548ffa7e (commit) via a58c5ca1f240132605ec86a9db58ae2e0e24d783 (commit) via a6c298b540787fa0feffbe5191855a54f6c8a178 (commit) via 99549950fa26674ec1807aeee0904f35cb930cd8 (commit) via ad62fda0addbd10573a30ce7a0ab6921b761f670 (commit) via 9918b6f40dd4201a5962ad7d5ea0c4479e28fec3 (commit) from 06ac824331726523e90607f472b822a9b50d156b (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 f29ff21cd61fab2e7ed3ea443568c7c71bcb3f30 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 19 17:24:47 2019 +0100 core127: run xt_geoip_update Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 2092280a3a0cd749fc2869ae29ce8a25d7c1a055 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 19 17:20:51 2019 +0100 core127: ovpn ca index.txt is also missing on some installations Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 271bac39a0b2999c843a5ec580438230d5398c74 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 19 15:16:43 2019 +0100 xt_geoip_updte: fix download url the maxmind server delivers an old version if there are two slashes before the database filename. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 4cba04ce288de78f8382fd88cd5538bb4e435724 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 19 12:08:07 2019 +0100 core127: fix typo Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 3d476ab017763b44deff9206c97b7cfb548ffa7e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 19 10:02:17 2019 +0100 core127: add ovpn ca changes to update Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit a58c5ca1f240132605ec86a9db58ae2e0e24d783 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 19 10:01:40 2019 +0100 core127: add xt_geoip_update to update Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit a6c298b540787fa0feffbe5191855a54f6c8a178 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 19 10:00:54 2019 +0100 core127: add bind to update Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 99549950fa26674ec1807aeee0904f35cb930cd8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 18 13:53:39 2019 +0100 core127: set reboot needed flag Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit ad62fda0addbd10573a30ce7a0ab6921b761f670 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 18 13:53:06 2019 +0100 core127: add general-functions.pl to updater Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 9918b6f40dd4201a5962ad7d5ea0c4479e28fec3 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 18 07:52:17 2019 +0100 core127: fix updater for aarch64 and armv5tel if a arch specific filelist has the same name as the common the common filelist was ignored Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/127/filelists/aarch64/files | 9 --------- .../filelists/{armv5tel/files => aarch64/files-aarch64} | 0 .../core/127/filelists/armv5tel/{files => files-armvtel} | 0 .../rootfiles/{oldcore/100 => core/127}/filelists/bind | 0 config/rootfiles/core/127/filelists/files | 2 ++ config/rootfiles/core/127/update.sh | 16 +++++++++++++++- src/scripts/xt_geoip_update | 4 ++-- 7 files changed, 19 insertions(+), 12 deletions(-) delete mode 100644 config/rootfiles/core/127/filelists/aarch64/files copy config/rootfiles/core/127/filelists/{armv5tel/files => aarch64/files-aarch64} (100%) rename config/rootfiles/core/127/filelists/armv5tel/{files => files-armvtel} (100%) copy config/rootfiles/{oldcore/100 => core/127}/filelists/bind (100%) Difference in files: diff --git a/config/rootfiles/core/127/filelists/aarch64/files b/config/rootfiles/core/127/filelists/aarch64/files deleted file mode 100644 index d76f3915c..000000000 --- a/config/rootfiles/core/127/filelists/aarch64/files +++ /dev/null @@ -1,9 +0,0 @@ -boot/boot.cmd -boot/boot.scr -etc/system-release -etc/issue -srv/web/ipfire/cgi-bin/credits.cgi -var/ipfire/langs -etc/rc.d/init.d/aws -etc/rc.d/init.d/unbound -srv/web/ipfire/cgi-bin/dnsforward.cgi diff --git a/config/rootfiles/core/127/filelists/armv5tel/files b/config/rootfiles/core/127/filelists/aarch64/files-aarch64 similarity index 100% rename from config/rootfiles/core/127/filelists/armv5tel/files rename to config/rootfiles/core/127/filelists/aarch64/files-aarch64 diff --git a/config/rootfiles/core/127/filelists/armv5tel/files-armvtel b/config/rootfiles/core/127/filelists/armv5tel/files-armvtel new file mode 100644 index 000000000..6a00446f4 --- /dev/null +++ b/config/rootfiles/core/127/filelists/armv5tel/files-armvtel @@ -0,0 +1,2 @@ +boot/boot.cmd +boot/boot.scr diff --git a/config/rootfiles/core/127/filelists/bind b/config/rootfiles/core/127/filelists/bind new file mode 120000 index 000000000..48a0ebaef --- /dev/null +++ b/config/rootfiles/core/127/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/127/filelists/files b/config/rootfiles/core/127/filelists/files index 4b001af63..e28d42006 100644 --- a/config/rootfiles/core/127/filelists/files +++ b/config/rootfiles/core/127/filelists/files @@ -16,5 +16,7 @@ srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/lib/firewall/firewall-lib.pl +usr/local/bin/xt_geoip_update var/ipfire/backup/include +var/ipfire/general-functions.pl var/ipfire/geoip-functions.pl diff --git a/config/rootfiles/core/127/update.sh b/config/rootfiles/core/127/update.sh index 4fe045ec9..e276e7e68 100644 --- a/config/rootfiles/core/127/update.sh +++ b/config/rootfiles/core/127/update.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2018 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2019 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # @@ -48,6 +48,14 @@ ldconfig # Regenerate squid configuration file sudo -u nobody /srv/web/ipfire/cgi-bin/proxy.cgi +# If not exist create ovpn ca index.txt(.attr) and fix rights +touch /var/ipfire/ovpn/ca/index.txt.attr +chmod 644 /var/ipfire/ovpn/ca/index.txt.attr +chown nobody:nobody /var/ipfire/ovpn/ca/index.txt.attr +touch /var/ipfire/ovpn/ca/index.txt +chmod 644 /var/ipfire/ovpn/ca/index.txt +chown nobody:nobody /var/ipfire/ovpn/ca/index.txt + # Start services /etc/init.d/unbound restart /etc/init.d/squid start @@ -58,6 +66,12 @@ sysctl -p # Re-run depmod depmod -a +# Update xt_geoip +/usr/local/bin/xt_geoip_update + +# This update needs a reboot... +touch /var/run/need_reboot + # Finish /etc/init.d/fireinfo start sendprofile diff --git a/src/scripts/xt_geoip_update b/src/scripts/xt_geoip_update index 73484c7a0..b45c5b343 100644 --- a/src/scripts/xt_geoip_update +++ b/src/scripts/xt_geoip_update @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2014 IPFire Development Team <info(a)ipfire.org> # +# Copyright (C) 2019 IPFire Development Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -26,7 +26,7 @@ SCRIPT_PATH=/usr/local/bin DEST_PATH=/usr/share/xt_geoip DB_PATH=/var/lib/GeoIP -DL_URL=http://geolite.maxmind.com/download/geoip/database/ +DL_URL=http://geolite.maxmind.com/download/geoip/database DL_FILE=GeoLite2-Country-CSV.zip eval $(/usr/local/bin/readhash /var/ipfire/proxy/settings) hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM January 2019