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 0a0738618f3a87046a026c0ad5d193e8e25eff70 (commit) via 3b887740e8fccd554dda86279e93d8664835a26b (commit) via aadd7678b55ade8325d4d243fd5e159ddfd62360 (commit) via f84b8d7aae8ef17e844f4922263af40e29e70ee9 (commit) via 224adebdc44dece1e21193dd7ab4090e102349e8 (commit) via a5a0c8a530aba6b234bf941c1fe927475524c894 (commit) via 736c3b182d9b223c8794cf27a7b215b62b6ac122 (commit) via 82db9e594563749d244a1cd658ca9ea5d18999b3 (commit) via 9909ac8e808041f2d37650623cd3185477bc9d4c (commit) via b2742aebf117da24053d81dbc669faf5a18c9006 (commit) via 8365bd1aaac900fe409461b3b85c3becf0348605 (commit) via 38736148c72b9c46ef4426138d99c46fde5495ec (commit) via d289d6fb5c196b6c04510b83546babfb3bf9a928 (commit) via 8b245523e5253b6bc0a9e0002869e7ebe8eac780 (commit) via aee4a61ad37bcba5e754d1dc9e36de2a1cfc319d (commit) via b11b4842c224b6196016d48e286b2b4dfe57c285 (commit) via a5427e456cb73b50ebeac0ed33b49c52efbf8144 (commit) via 2944c59ea9f672d7f58bca64d6dc6a91570b52bd (commit) via acef0b81d3cc259f5d428e24bc163c274bed50c4 (commit) via 32e4819b777f1d3ec36fcc2193821daf1fbbc044 (commit) via 63eacedabc44cd0b6d2a702f8f2da6fcb17f440c (commit) via 44d2f538e18ac1e24d06a8d00bbe191a41d2a8ae (commit) via c9f49bc69300d585bb6bfec6e26c969b36b7cd9c (commit) via ea791f45b47a09f5765b1576ea3378b77faba40f (commit) via 73c084b6a7bfc49b821c2998f00bb4d2b3a2d359 (commit) via 3a40d335830946fcaac286b58abdfaae15ed2cad (commit) via 47686b1b6ee72893fcb649af269f60478759fa65 (commit) via 9bdf5e71af93a54a3b88bdcd42e090cacf5ebd9c (commit) via bf1ae6aa6a6f0424e266fadd9459e7135bc3550e (commit) via 68e060cb227fe7e0a2d16eb4340a5d3ddabadde9 (commit) via 46b0f9ab44754069f89a66bcd8e253c021ab5f26 (commit) via e7978f5671c8266759b325ee8036b8394191489f (commit) via 4e58ab4bbf984b559a5f787628a86377d056fca9 (commit) via b6a5888105085a9142a9066614975fa138fea91a (commit) via 45a2dcd09a9da9671c6f18f6c83375c3e414adb2 (commit) via 89b10e709552901e82f00af4c77072efcd6c7a01 (commit) via 86c645987374ac09e54027c252c308492205290f (commit) from 46bccfc21946f027ff81349cf9af33c9564f9b0c (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 0a0738618f3a87046a026c0ad5d193e8e25eff70 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jun 19 12:44:14 2020 +0000
core174: Ship updated files from gcloud branch
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3b887740e8fccd554dda86279e93d8664835a26b Author: Adolf Belka ahb.ipfire@gmail.com Date: Tue Jun 16 20:43:52 2020 +0200
bacula: Update to 9.6.5
- Update bacula from version 9.0.6 to 9.6.5 Version 9.0.6 is over two and a half years old. - Update config options in lfs to include bacula recommended smartalloc option. "This enables the inclusion of the Smartalloc orphaned buffer detection code. This option is highly recommended. Because we never build without this option, you may experience problems if it is not enabled. In this case, simply re-enable the option. We strongly recommend keeping this option enabled as it helps detect memory leaks. This configuration parameter is used while building Bacula" - Add install, uninstall and update files in src/paks/bacula - Updated backup/includes to backup the config file and the File Daemon state file.
Signed-off-by: Adolf Belka ahb.ipfire@gmail.com Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit aadd7678b55ade8325d4d243fd5e159ddfd62360 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Jun 18 10:39:03 2020 +0000
core147: Ship dhcpcd
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f84b8d7aae8ef17e844f4922263af40e29e70ee9 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Tue Jun 16 19:48:35 2020 +0200
dhcpcd: Update to 9.1.2
For details see: https://roy.marples.name/blog/dhcpcd-9-1-2-released.html
"Fix installing dhcpcd-definitions.conf rather than embedding it NetBSD: free ARP state once IPv4LL address announced Linux: fix compile for older distros udev: disable plugin for non Linux OS's BSD: Mark RA dervied addresses as AUTOCONF on NetBSD-current BSD: Only mark static routes from dhcpcd.conf as static DHCP6: Ensure requested addresses are requested DHCP6: Fix prefix length calculation when no prefix specified privsep: Implement a resource limited sandbox [1] privsep: Remove inet and dns pledges from master process privsep: call getifaddrs when the BSD lacks SIOCGIFALIAS privsep: free getifaddrs the right way if from privsep or not
[1] You will see a control proxy process now. This is for the resource limited sandbox so that we can isolate requests over the control socket. For NetBSD, FreeBSD and derivatives such as DragonFlyBSD this is a massive win as these OS now enjoy a similar level of protection as Capsicum or Pledge, but without the syscall filtering."
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 224adebdc44dece1e21193dd7ab4090e102349e8 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 16 15:42:33 2020 +0000
sysctl: Load nf_log_ipv4 as default logging module for TRACE target
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a5a0c8a530aba6b234bf941c1fe927475524c894 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 16 15:40:44 2020 +0000
firewall: Always enable connection tracking for GRE
If this module is not being loaded, the kernel will mark any GRE connection as INVALID in connection tracking, which will be then silently dropped by a firewall rule.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 736c3b182d9b223c8794cf27a7b215b62b6ac122 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 16 15:40:20 2020 +0000
squidGuard: Update to 1.6.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 82db9e594563749d244a1cd658ca9ea5d18999b3 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 16 10:35:26 2020 +0000
squidGuard: Update to 1.6.0
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9909ac8e808041f2d37650623cd3185477bc9d4c Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 16 09:01:24 2020 +0000
core147: Ship squidguard
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b2742aebf117da24053d81dbc669faf5a18c9006 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sat Dec 31 16:59:19 2016 +0100
squidguard: Update to 1.5-beta
Changelog:
"Release 1.5
2010-09-09 Fixed inconsistent blocking (bug 59). Replaced defined routine in sgDB.c
2010-09-08 Added Russian translation from Vladimir Ipatov to squidGuard.cgi.in.
2009-10-19 Fixed two bypass problems with URLs which length is close to the limit defined by MAX_BUF. The resulting proxy line exceeds this limit and causes either squid or squidGuard to properly block a site.
2009-10-15 Fixed a problem with very long URLs. SquidGuard will go into emergency mode when a overlong URLs are encountered. The emergency mode causes an entire stop of blocking. This is not appropriate in this situation.
2009-09-30 Added patch by beber and gentoo (thank you!) to fix a problem when cross compiling (bug 56).
2009-09-27 Added patch by gentoo to fix alocal warnings (bug 57).
2009-09-15 Added a feature to send log messages to syslog based on the patch from Jun Jiang (thank you). (bug 42) In order to use syslog you have to run configure with the new option "--with-syslog". In the configuration file you need to add a line "syslog enable". If any other value but "enable" is used syslog is disabled and logging to squidGuard.log takes place as usual. The following log level are used: DEBUG, NOTICE, WARN, ERROR and EMERG. The local4 syslog facility is used by default. If you want to change this, use the configure option "--with-syslog-facility=<facility>".
2009-09-12 Anonymized passwords (for connecting to the ldap or mysql server) written to logfiles when squidGuard is starting. Added two configure options for choosing different location for the LDAP include and library files.
2009-08-25 Added patch to check IP addresses against LDAP. Patch by Denis Bonnenfant (bug 41) - thank you.
2009-08-23 Added patch to allow quoted strings in the configuration file (bug 53). For more information see README.QuotedStrings. Thanks to Iain Fothergill for providing the patch. Removed the fix for usernames starting with a number because it breaks the time declarations.
2009-05-08 Added patch by INL to enable blocking against DNS based blacklists (bug 55). Fixed re-opened bug 12: a problem with regular expressions. An entry like "www.google.de" did not block www.google.de which it was supposed to do. Solving this issue solved bug 46 as well.
2009-03-08 Fixed bug 52: Sometimes squidGuard crashes with an overflow error message for vsprintf. Thanks to Dirk Schoebel for suggesting the proper fix. Fixed bug 49: Using numeric username made squidGuard goes into emergency mode. This has been fixed. Usernames can now start with a number, be numeric and can additionally contain the following characters: @,à ,é,è,ñ,á,ì,Ã,ò,ó,ù,ú."
Signed-off-by: Matthias Fischer <matthias.fischer at ipfire.org> Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8365bd1aaac900fe409461b3b85c3becf0348605 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Jun 10 08:19:51 2020 +0000
strace: This package now links against elfutils
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 38736148c72b9c46ef4426138d99c46fde5495ec Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 16 08:49:36 2020 +0000
core147: Ship iproute2
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d289d6fb5c196b6c04510b83546babfb3bf9a928 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Jun 14 08:50:13 2020 +0200
iproute2: Update to 5.7.0
For details see: https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/log/?h=v5.7.0
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8b245523e5253b6bc0a9e0002869e7ebe8eac780 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Jun 14 00:13:30 2020 +0200
joe: Update to 4.6
For details see: https://joe-editor.sourceforge.io/NEWS.html
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit aee4a61ad37bcba5e754d1dc9e36de2a1cfc319d Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 16 08:46:51 2020 +0000
core147: Ship updated crypto libraries
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b11b4842c224b6196016d48e286b2b4dfe57c285 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Jun 11 19:20:08 2020 +0200
gmp 6.2.0: Fixed rootfile for i586
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit a5427e456cb73b50ebeac0ed33b49c52efbf8144 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Jun 11 18:07:29 2020 +0200
libgpg-error: Update to 1.38
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2944c59ea9f672d7f58bca64d6dc6a91570b52bd Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Jun 11 18:06:27 2020 +0200
libassuan: Update to 2.5.3
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit acef0b81d3cc259f5d428e24bc163c274bed50c4 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Jun 11 18:05:05 2020 +0200
libgcrypt: Update to 1.8.5
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 32e4819b777f1d3ec36fcc2193821daf1fbbc044 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Jun 11 12:02:45 2020 +0200
gmp 6.2.0: Fixed lfs for i586
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 63eacedabc44cd0b6d2a702f8f2da6fcb17f440c Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Jun 11 00:08:13 2020 +0200
gmp: Update to 6.2.0
Needed for gnutls 3.6.14
For details see: https://gmplib.org/gmp6.2
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 44d2f538e18ac1e24d06a8d00bbe191a41d2a8ae Author: Matthias Fischer matthias.fischer@ipfire.org Date: Thu Jun 11 00:08:12 2020 +0200
gnutls: Update to 3.6.14
For details see: https://lists.gnupg.org/pipermail/gnutls-help/2020-June/004648.html
"** libgnutls: Fixed insecure session ticket key construction, since 3.6.4. The TLS server would not bind the session ticket encryption key with a value supplied by the application until the initial key rotation, allowing attacker to bypass authentication in TLS 1.3 and recover previous conversations in TLS 1.2 (#1011). [GNUTLS-SA-2020-06-03, CVSS: high]
** libgnutls: Fixed handling of certificate chain with cross-signed intermediate CA certificates (#1008).
** libgnutls: Fixed reception of empty session ticket under TLS 1.2 (#997).
** libgnutls: gnutls_x509_crt_print() is enhanced to recognizes commonName (2.5.4.3), decodes certificate policy OIDs (!1245), and prints Authority Key Identifier (AKI) properly (#989, #991).
** certtool: PKCS #7 attributes are now printed with symbolic names (!1246).
** libgnutls: Added several improvements on Windows Vista and later releases (!1257, !1254, !1256). Most notably the system random number generator now uses Windows BCrypt* API if available (!1255).
** libgnutls: Use accelerated AES-XTS implementation if possible (!1244). Also both accelerated and non-accelerated implementations check key block according to FIPS-140-2 IG A.9 (!1233).
** libgnutls: Added support for AES-SIV ciphers (#463).
** libgnutls: Added support for 192-bit AES-GCM cipher (!1267).
** libgnutls: No longer use internal symbols exported from Nettle (!1235)
** API and ABI modifications: GNUTLS_CIPHER_AES_128_SIV: Added GNUTLS_CIPHER_AES_256_SIV: Added GNUTLS_CIPHER_AES_192_GCM: Added gnutls_pkcs7_print_signature_info: Added"
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit c9f49bc69300d585bb6bfec6e26c969b36b7cd9c Author: Matthias Fischer matthias.fischer@ipfire.org Date: Wed Jun 10 23:51:21 2020 +0200
borgbackup: Update to 1.1.13
For details see: https://borgbackup.readthedocs.io/en/stable/changes.html#changelog
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ea791f45b47a09f5765b1576ea3378b77faba40f Author: Matthias Fischer matthias.fischer@ipfire.org Date: Wed Jun 10 23:46:15 2020 +0200
haproxy: Update to 2.1.7
For details see: http://www.haproxy.org/download/2.1/src/CHANGELOG
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 73c084b6a7bfc49b821c2998f00bb4d2b3a2d359 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 16 08:37:48 2020 +0000
core147: Ship squid
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 3a40d335830946fcaac286b58abdfaae15ed2cad Author: Matthias Fischer matthias.fischer@ipfire.org Date: Wed Jun 10 23:38:52 2020 +0200
squid: Update to 4.12
For details see: http://www.squid-cache.org/Versions/v4/changesets/
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Reviewed-by: Michael Tremer michael.tremer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 47686b1b6ee72893fcb649af269f60478759fa65 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jun 16 08:35:09 2020 +0000
Start Core Update 147
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 9bdf5e71af93a54a3b88bdcd42e090cacf5ebd9c Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 15 15:32:41 2020 +0000
networking: Set configured MTU to all network zones
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit bf1ae6aa6a6f0424e266fadd9459e7135bc3550e Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 15 15:22:00 2020 +0000
gcp: Google Cloud only supports an MTU of 1460
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 68e060cb227fe7e0a2d16eb4340a5d3ddabadde9 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 15 15:20:49 2020 +0000
aws: Configure MTU to maximum of 9001 on GREEN/ORANGE
AWS supports jumbo-frames which IPFire can take advantage of to increase network throughput internally.
The MTU for RED was left as 1500 to avoid packet fragmentation in the cloud network and have IPFire do that job.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 46b0f9ab44754069f89a66bcd8e253c021ab5f26 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 15 15:07:35 2020 +0000
web: Hide certain menu items when running in cloud environments
This used to be only hidden on AWS.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e7978f5671c8266759b325ee8036b8394191489f Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 15 15:07:15 2020 +0000
gcloud: Add function to detect whether we are running on GCP
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 4e58ab4bbf984b559a5f787628a86377d056fca9 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 15 15:01:42 2020 +0000
aws-functions.pl: Drop file and move functions to general-functions.pl
There is not enough stuff that it is justified to have an own file.
This patch therefore merges everything into general-functions.pl.
There are no functional changes.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b6a5888105085a9142a9066614975fa138fea91a Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jun 12 16:05:00 2020 +0000
gcp: Add host route for gateway during initialisation
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 45a2dcd09a9da9671c6f18f6c83375c3e414adb2 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jun 12 10:43:26 2020 +0000
gcp: Always automatically enable serial console
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 89b10e709552901e82f00af4c77072efcd6c7a01 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jun 12 10:40:56 2020 +0000
gcp: Add initscript to import configuration
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 86c645987374ac09e54027c252c308492205290f Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Aug 28 11:51:22 2019 +0000
cloud-init: Launch custom script when detecting Google Cloud
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/backup/includes/bacula | 3 +- config/cfgroot/aws-functions.pl | 34 --------- config/cfgroot/general-functions.pl | 22 ++++++ config/cfgroot/header.pl | 6 +- config/etc/sysctl.conf | 3 + config/rootfiles/common/aarch64/gmp | 4 +- config/rootfiles/common/aarch64/initscripts | 1 + config/rootfiles/common/armv5tel/gmp | 4 +- config/rootfiles/common/armv5tel/initscripts | 1 + config/rootfiles/common/configroot | 1 - config/rootfiles/common/gnutls | 25 ++++++- config/rootfiles/common/i586/gmp | 8 ++- config/rootfiles/common/i586/initscripts | 1 + config/rootfiles/common/iproute2 | 3 + config/rootfiles/common/libgcrypt | 3 +- config/rootfiles/common/libgpg-error | 9 ++- config/rootfiles/common/x86_64/gmp | 6 +- config/rootfiles/common/x86_64/initscripts | 1 + config/rootfiles/core/{146 => 147}/exclude | 0 config/rootfiles/core/147/filelists/aarch64/gmp | 1 + .../101 => core/147}/filelists/armv5tel/gmp | 0 .../{oldcore/125 => core/147}/filelists/dhcpcd | 0 config/rootfiles/core/147/filelists/files | 15 ++++ .../{oldcore/110 => core/147}/filelists/gnutls | 0 .../{oldcore/101 => core/147}/filelists/i586/gmp | 0 .../{oldcore/106 => core/147}/filelists/iproute2 | 0 .../{oldcore/105 => core/147}/filelists/libgcrypt | 0 .../106 => core/147}/filelists/libgpg-error | 0 .../{oldcore/100 => core/147}/filelists/squid | 0 config/rootfiles/core/147/filelists/squidguard | 1 + .../{oldcore/101 => core/147}/filelists/x86_64/gmp | 0 .../rootfiles/{oldcore/113 => core/147}/update.sh | 18 ++--- config/rootfiles/{core => oldcore}/146/exclude | 0 .../{core => oldcore}/146/filelists/aarch64/linux | 0 .../146/filelists/aarch64/linux-initrd | 0 .../146/filelists/armv5tel/linux-initrd-multi | 0 .../146/filelists/armv5tel/linux-multi | 0 .../{core => oldcore}/146/filelists/files | 0 .../146/filelists/i586/intel-microcode | 0 .../{core => oldcore}/146/filelists/i586/linux | 0 .../146/filelists/i586/linux-initrd | 0 .../146/filelists/x86_64/intel-microcode | 0 .../{core => oldcore}/146/filelists/x86_64/linux | 0 .../146/filelists/x86_64/linux-initrd | 0 config/rootfiles/{core => oldcore}/146/update.sh | 0 config/rootfiles/packages/armv5tel/borgbackup | 16 ++--- config/rootfiles/packages/bacula | 17 ++--- config/rootfiles/packages/borgbackup | 16 ++--- config/rootfiles/packages/i586/borgbackup | 16 ++--- config/rootfiles/packages/joe | 69 +++++++++++++++--- config/rootfiles/packages/libassuan | 3 +- lfs/bacula | 9 +-- lfs/borgbackup | 6 +- lfs/configroot | 1 - lfs/dhcpcd | 4 +- lfs/gmp | 8 +-- lfs/gnutls | 9 ++- lfs/haproxy | 8 +-- lfs/iproute2 | 4 +- lfs/joe | 8 +-- lfs/libassuan | 8 +-- lfs/libgcrypt | 6 +- lfs/libgpg-error | 6 +- lfs/squid | 4 +- lfs/squidguard | 29 +++++--- lfs/strace | 4 +- make.sh | 2 +- src/initscripts/helper/aws-setup | 6 ++ src/initscripts/helper/{aws-setup => gcp-setup} | 82 ++++++++++------------ src/initscripts/networking/any | 11 +++ src/initscripts/networking/red | 11 ++- src/initscripts/system/cloud-init | 7 ++ src/initscripts/system/firewall | 3 + src/initscripts/system/functions | 12 ++++ src/initscripts/system/partresize | 4 +- src/paks/{amazon-ssm-agent => bacula}/install.sh | 15 ++-- src/paks/{mdns-repeater => bacula}/uninstall.sh | 6 +- src/paks/{perl-DBI => bacula}/update.sh | 0 src/patches/squidGuard-1.4-db5.patch | 12 ---- .../squidguard-1.4-squid-helper-protocol.patch | 75 -------------------- 80 files changed, 367 insertions(+), 300 deletions(-) delete mode 100644 config/cfgroot/aws-functions.pl copy config/rootfiles/core/{146 => 147}/exclude (100%) create mode 120000 config/rootfiles/core/147/filelists/aarch64/gmp copy config/rootfiles/{oldcore/101 => core/147}/filelists/armv5tel/gmp (100%) copy config/rootfiles/{oldcore/125 => core/147}/filelists/dhcpcd (100%) create mode 100644 config/rootfiles/core/147/filelists/files copy config/rootfiles/{oldcore/110 => core/147}/filelists/gnutls (100%) copy config/rootfiles/{oldcore/101 => core/147}/filelists/i586/gmp (100%) copy config/rootfiles/{oldcore/106 => core/147}/filelists/iproute2 (100%) copy config/rootfiles/{oldcore/105 => core/147}/filelists/libgcrypt (100%) copy config/rootfiles/{oldcore/106 => core/147}/filelists/libgpg-error (100%) copy config/rootfiles/{oldcore/100 => core/147}/filelists/squid (100%) create mode 120000 config/rootfiles/core/147/filelists/squidguard copy config/rootfiles/{oldcore/101 => core/147}/filelists/x86_64/gmp (100%) copy config/rootfiles/{oldcore/113 => core/147}/update.sh (90%) rename config/rootfiles/{core => oldcore}/146/exclude (100%) rename config/rootfiles/{core => oldcore}/146/filelists/aarch64/linux (100%) rename config/rootfiles/{core => oldcore}/146/filelists/aarch64/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/146/filelists/armv5tel/linux-initrd-multi (100%) rename config/rootfiles/{core => oldcore}/146/filelists/armv5tel/linux-multi (100%) rename config/rootfiles/{core => oldcore}/146/filelists/files (100%) rename config/rootfiles/{core => oldcore}/146/filelists/i586/intel-microcode (100%) rename config/rootfiles/{core => oldcore}/146/filelists/i586/linux (100%) rename config/rootfiles/{core => oldcore}/146/filelists/i586/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/146/filelists/x86_64/intel-microcode (100%) rename config/rootfiles/{core => oldcore}/146/filelists/x86_64/linux (100%) rename config/rootfiles/{core => oldcore}/146/filelists/x86_64/linux-initrd (100%) rename config/rootfiles/{core => oldcore}/146/update.sh (100%) copy src/initscripts/helper/{aws-setup => gcp-setup} (75%) copy src/paks/{amazon-ssm-agent => bacula}/install.sh (87%) copy src/paks/{mdns-repeater => bacula}/uninstall.sh (95%) copy src/paks/{perl-DBI => bacula}/update.sh (100%) delete mode 100644 src/patches/squidGuard-1.4-db5.patch delete mode 100644 src/patches/squidguard-1.4-squid-helper-protocol.patch
Difference in files: diff --git a/config/backup/includes/bacula b/config/backup/includes/bacula index 8d5c119f9..92bce0eba 100644 --- a/config/backup/includes/bacula +++ b/config/backup/includes/bacula @@ -1 +1,2 @@ -/etc/bacula/ +/etc/bacula/bacula-fd.conf +/var/bacula/working/bacula-fd.9102.state diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 4c7cf09a8..8ee5eaa5d 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -1286,4 +1286,26 @@ sub formatBytes { return sprintf("%.2f %s", $bytes, $unit); }
+# Cloud Stuff + +sub running_in_cloud() { + return &running_on_ec2() || &running_on_gcp(); +} + +sub running_on_ec2() { + if (-e "/var/run/aws-instance-id") { + return 1; + } + + return 0; +} + +sub running_on_gcp() { + if (-e "/var/run/gcp-instance-id") { + return 1; + } + + return 0; +} + 1; diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index e8d9d377c..1046f5992 100644 --- a/config/cfgroot/header.pl +++ b/config/cfgroot/header.pl @@ -19,8 +19,6 @@ use Time::Local;
$|=1; # line buffering
-require "/var/ipfire/aws-functions.pl"; - $Header::revision = 'final'; $Header::swroot = '/var/ipfire'; $Header::graphdir='/srv/web/ipfire/html/graphs'; @@ -172,8 +170,8 @@ sub genmenu { $menu->{'02.status'}{'subMenu'}->{'74.modem-status'}{'enabled'} = 1; }
- # Disbale unusable things on EC2 - if (&AWS::running_on_ec2()) { + # Disbale unusable things in cloud environments + if (&General::running_in_cloud()) { $menu->{'03.network'}{'subMenu'}->{'30.dhcp'}{'enabled'} = 0; $menu->{'03.network'}{'subMenu'}->{'80.macadressmenu'}{'enabled'} = 0; $menu->{'03.network'}{'subMenu'}->{'90.wakeonlan'}{'enabled'} = 0; diff --git a/config/etc/sysctl.conf b/config/etc/sysctl.conf index 7e7ebee44..98a0dbe63 100644 --- a/config/etc/sysctl.conf +++ b/config/etc/sysctl.conf @@ -34,6 +34,9 @@ net.ipv6.conf.default.disable_ipv6 = 1 # Enable netfilter accounting net.netfilter.nf_conntrack_acct=1
+# Enable TRACE logging to syslog +net.netfilter.nf_log.2=nf_log_ipv4 + # Disable netfilter on bridges. net.bridge.bridge-nf-call-ip6tables = 0 net.bridge.bridge-nf-call-iptables = 0 diff --git a/config/rootfiles/common/aarch64/gmp b/config/rootfiles/common/aarch64/gmp index 919b0845a..8a95add05 100644 --- a/config/rootfiles/common/aarch64/gmp +++ b/config/rootfiles/common/aarch64/gmp @@ -4,12 +4,12 @@ #usr/lib/libgmp.la #usr/lib/libgmp.so usr/lib/libgmp.so.10 -usr/lib/libgmp.so.10.3.2 +usr/lib/libgmp.so.10.4.0 #usr/lib/libgmpxx.a #usr/lib/libgmpxx.la #usr/lib/libgmpxx.so usr/lib/libgmpxx.so.4 -usr/lib/libgmpxx.so.4.5.2 +usr/lib/libgmpxx.so.4.6.0 #usr/share/info/gmp.info #usr/share/info/gmp.info-1 #usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index 8d945f7a5..330bb532e 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -3,6 +3,7 @@ etc/init.d #etc/rc.d/helper etc/rc.d/helper/aws-setup etc/rc.d/helper/azure-setup +etc/rc.d/helper/gcp-setup etc/rc.d/helper/getdnsfromdhcpc.pl #etc/rc.d/init.d etc/rc.d/init.d/acpid diff --git a/config/rootfiles/common/armv5tel/gmp b/config/rootfiles/common/armv5tel/gmp index 919b0845a..8a95add05 100644 --- a/config/rootfiles/common/armv5tel/gmp +++ b/config/rootfiles/common/armv5tel/gmp @@ -4,12 +4,12 @@ #usr/lib/libgmp.la #usr/lib/libgmp.so usr/lib/libgmp.so.10 -usr/lib/libgmp.so.10.3.2 +usr/lib/libgmp.so.10.4.0 #usr/lib/libgmpxx.a #usr/lib/libgmpxx.la #usr/lib/libgmpxx.so usr/lib/libgmpxx.so.4 -usr/lib/libgmpxx.so.4.5.2 +usr/lib/libgmpxx.so.4.6.0 #usr/share/info/gmp.info #usr/share/info/gmp.info-1 #usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 8d945f7a5..330bb532e 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -3,6 +3,7 @@ etc/init.d #etc/rc.d/helper etc/rc.d/helper/aws-setup etc/rc.d/helper/azure-setup +etc/rc.d/helper/gcp-setup etc/rc.d/helper/getdnsfromdhcpc.pl #etc/rc.d/init.d etc/rc.d/init.d/acpid diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot index 67c4abc75..664247b12 100644 --- a/config/rootfiles/common/configroot +++ b/config/rootfiles/common/configroot @@ -9,7 +9,6 @@ usr/sbin/firewall-policy var/ipfire/addon-lang var/ipfire/auth #var/ipfire/auth/users -var/ipfire/aws-functions.pl #var/ipfire/backup var/ipfire/backup/exclude.user var/ipfire/backup/include.user diff --git a/config/rootfiles/common/gnutls b/config/rootfiles/common/gnutls index b8adaa9d9..cb7ecf8e5 100644 --- a/config/rootfiles/common/gnutls +++ b/config/rootfiles/common/gnutls @@ -33,7 +33,7 @@ usr/lib/libgnutls-dane.so.0.4.1 #usr/lib/libgnutls.la #usr/lib/libgnutls.so usr/lib/libgnutls.so.30 -usr/lib/libgnutls.so.30.23.2 +usr/lib/libgnutls.so.30.28.0 #usr/lib/libgnutlsxx.la #usr/lib/libgnutlsxx.so usr/lib/libgnutlsxx.so.28 @@ -113,9 +113,11 @@ usr/lib/libgnutlsxx.so.28.1.0 #usr/share/man/man3/dane_verify_crt_raw.3 #usr/share/man/man3/dane_verify_session_crt.3 #usr/share/man/man3/gnutls_aead_cipher_decrypt.3 +#usr/share/man/man3/gnutls_aead_cipher_decryptv2.3 #usr/share/man/man3/gnutls_aead_cipher_deinit.3 #usr/share/man/man3/gnutls_aead_cipher_encrypt.3 #usr/share/man/man3/gnutls_aead_cipher_encryptv.3 +#usr/share/man/man3/gnutls_aead_cipher_encryptv2.3 #usr/share/man/man3/gnutls_aead_cipher_init.3 #usr/share/man/man3/gnutls_alert_get.3 #usr/share/man/man3/gnutls_alert_get_name.3 @@ -206,6 +208,8 @@ usr/lib/libgnutlsxx.so.28.1.0 #usr/share/man/man3/gnutls_certificate_type_get_id.3 #usr/share/man/man3/gnutls_certificate_type_get_name.3 #usr/share/man/man3/gnutls_certificate_type_list.3 +#usr/share/man/man3/gnutls_certificate_verification_profile_get_id.3 +#usr/share/man/man3/gnutls_certificate_verification_profile_get_name.3 #usr/share/man/man3/gnutls_certificate_verification_status_print.3 #usr/share/man/man3/gnutls_certificate_verify_peers.3 #usr/share/man/man3/gnutls_certificate_verify_peers2.3 @@ -271,6 +275,7 @@ usr/lib/libgnutlsxx.so.28.1.0 #usr/share/man/man3/gnutls_dh_params_import_pkcs3.3 #usr/share/man/man3/gnutls_dh_params_import_raw.3 #usr/share/man/man3/gnutls_dh_params_import_raw2.3 +#usr/share/man/man3/gnutls_dh_params_import_raw3.3 #usr/share/man/man3/gnutls_dh_params_init.3 #usr/share/man/man3/gnutls_dh_set_prime_bits.3 #usr/share/man/man3/gnutls_digest_get_id.3 @@ -302,12 +307,14 @@ usr/lib/libgnutlsxx.so.28.1.0 #usr/share/man/man3/gnutls_ext_get_current_msg.3 #usr/share/man/man3/gnutls_ext_get_data.3 #usr/share/man/man3/gnutls_ext_get_name.3 +#usr/share/man/man3/gnutls_ext_get_name2.3 #usr/share/man/man3/gnutls_ext_raw_parse.3 #usr/share/man/man3/gnutls_ext_register.3 #usr/share/man/man3/gnutls_ext_set_data.3 #usr/share/man/man3/gnutls_fingerprint.3 #usr/share/man/man3/gnutls_fips140_mode_enabled.3 #usr/share/man/man3/gnutls_fips140_set_mode.3 +#usr/share/man/man3/gnutls_get_system_config_file.3 #usr/share/man/man3/gnutls_global_deinit.3 #usr/share/man/man3/gnutls_global_init.3 #usr/share/man/man3/gnutls_global_set_audit_log_function.3 @@ -333,6 +340,7 @@ usr/lib/libgnutlsxx.so.28.1.0 #usr/share/man/man3/gnutls_handshake_set_random.3 #usr/share/man/man3/gnutls_handshake_set_timeout.3 #usr/share/man/man3/gnutls_hash.3 +#usr/share/man/man3/gnutls_hash_copy.3 #usr/share/man/man3/gnutls_hash_deinit.3 #usr/share/man/man3/gnutls_hash_fast.3 #usr/share/man/man3/gnutls_hash_get_len.3 @@ -349,9 +357,13 @@ usr/lib/libgnutlsxx.so.28.1.0 #usr/share/man/man3/gnutls_hex_decode2.3 #usr/share/man/man3/gnutls_hex_encode.3 #usr/share/man/man3/gnutls_hex_encode2.3 +#usr/share/man/man3/gnutls_hkdf_expand.3 +#usr/share/man/man3/gnutls_hkdf_extract.3 #usr/share/man/man3/gnutls_hmac.3 +#usr/share/man/man3/gnutls_hmac_copy.3 #usr/share/man/man3/gnutls_hmac_deinit.3 #usr/share/man/man3/gnutls_hmac_fast.3 +#usr/share/man/man3/gnutls_hmac_get_key_size.3 #usr/share/man/man3/gnutls_hmac_get_len.3 #usr/share/man/man3/gnutls_hmac_init.3 #usr/share/man/man3/gnutls_hmac_output.3 @@ -425,6 +437,7 @@ usr/lib/libgnutlsxx.so.28.1.0 #usr/share/man/man3/gnutls_openpgp_send_cert.3 #usr/share/man/man3/gnutls_packet_deinit.3 #usr/share/man/man3/gnutls_packet_get.3 +#usr/share/man/man3/gnutls_pbkdf2.3 #usr/share/man/man3/gnutls_pcert_deinit.3 #usr/share/man/man3/gnutls_pcert_export_openpgp.3 #usr/share/man/man3/gnutls_pcert_export_x509.3 @@ -557,6 +570,7 @@ usr/lib/libgnutlsxx.so.28.1.0 #usr/share/man/man3/gnutls_pkcs7_import.3 #usr/share/man/man3/gnutls_pkcs7_init.3 #usr/share/man/man3/gnutls_pkcs7_print.3 +#usr/share/man/man3/gnutls_pkcs7_print_signature_info.3 #usr/share/man/man3/gnutls_pkcs7_set_crl.3 #usr/share/man/man3/gnutls_pkcs7_set_crl_raw.3 #usr/share/man/man3/gnutls_pkcs7_set_crt.3 @@ -569,6 +583,8 @@ usr/lib/libgnutlsxx.so.28.1.0 #usr/share/man/man3/gnutls_pkcs_schema_get_name.3 #usr/share/man/man3/gnutls_pkcs_schema_get_oid.3 #usr/share/man/man3/gnutls_prf.3 +#usr/share/man/man3/gnutls_prf_early.3 +#usr/share/man/man3/gnutls_prf_hash_get.3 #usr/share/man/man3/gnutls_prf_raw.3 #usr/share/man/man3/gnutls_prf_rfc5705.3 #usr/share/man/man3/gnutls_priority_certificate_type_list.3 @@ -645,11 +661,15 @@ usr/lib/libgnutlsxx.so.28.1.0 #usr/share/man/man3/gnutls_psk_free_client_credentials.3 #usr/share/man/man3/gnutls_psk_free_server_credentials.3 #usr/share/man/man3/gnutls_psk_server_get_username.3 +#usr/share/man/man3/gnutls_psk_server_get_username2.3 #usr/share/man/man3/gnutls_psk_set_client_credentials.3 +#usr/share/man/man3/gnutls_psk_set_client_credentials2.3 #usr/share/man/man3/gnutls_psk_set_client_credentials_function.3 +#usr/share/man/man3/gnutls_psk_set_client_credentials_function2.3 #usr/share/man/man3/gnutls_psk_set_params_function.3 #usr/share/man/man3/gnutls_psk_set_server_credentials_file.3 #usr/share/man/man3/gnutls_psk_set_server_credentials_function.3 +#usr/share/man/man3/gnutls_psk_set_server_credentials_function2.3 #usr/share/man/man3/gnutls_psk_set_server_credentials_hint.3 #usr/share/man/man3/gnutls_psk_set_server_dh_params.3 #usr/share/man/man3/gnutls_psk_set_server_known_dh_params.3 @@ -720,6 +740,7 @@ usr/lib/libgnutlsxx.so.28.1.0 #usr/share/man/man3/gnutls_record_send_early_data.3 #usr/share/man/man3/gnutls_record_send_range.3 #usr/share/man/man3/gnutls_record_set_max_early_data_size.3 +#usr/share/man/man3/gnutls_record_set_max_recv_size.3 #usr/share/man/man3/gnutls_record_set_max_size.3 #usr/share/man/man3/gnutls_record_set_state.3 #usr/share/man/man3/gnutls_record_set_timeout.3 @@ -746,6 +767,7 @@ usr/lib/libgnutlsxx.so.28.1.0 #usr/share/man/man3/gnutls_session_get_flags.3 #usr/share/man/man3/gnutls_session_get_id.3 #usr/share/man/man3/gnutls_session_get_id2.3 +#usr/share/man/man3/gnutls_session_get_keylog_function.3 #usr/share/man/man3/gnutls_session_get_master_secret.3 #usr/share/man/man3/gnutls_session_get_ptr.3 #usr/share/man/man3/gnutls_session_get_random.3 @@ -755,6 +777,7 @@ usr/lib/libgnutlsxx.so.28.1.0 #usr/share/man/man3/gnutls_session_resumption_requested.3 #usr/share/man/man3/gnutls_session_set_data.3 #usr/share/man/man3/gnutls_session_set_id.3 +#usr/share/man/man3/gnutls_session_set_keylog_function.3 #usr/share/man/man3/gnutls_session_set_premaster.3 #usr/share/man/man3/gnutls_session_set_ptr.3 #usr/share/man/man3/gnutls_session_set_verify_cert.3 diff --git a/config/rootfiles/common/i586/gmp b/config/rootfiles/common/i586/gmp index 636dc5c45..c0ec9a9b6 100644 --- a/config/rootfiles/common/i586/gmp +++ b/config/rootfiles/common/i586/gmp @@ -4,14 +4,16 @@ #usr/lib/libgmp.la #usr/lib/libgmp.so usr/lib/libgmp.so.10 -usr/lib/libgmp.so.10.3.2 +usr/lib/libgmp.so.10.4.0 #usr/lib/libgmpxx.a #usr/lib/libgmpxx.la #usr/lib/libgmpxx.so usr/lib/libgmpxx.so.4 -usr/lib/libgmpxx.so.4.5.2 +usr/lib/libgmpxx.so.4.6.0 +#usr/lib/pkgconfig/gmp.pc +#usr/lib/pkgconfig/gmpxx.pc usr/lib/sse2/libgmp.so.10 -usr/lib/sse2/libgmp.so.10.3.2 +usr/lib/sse2/libgmp.so.10.4.0 #usr/share/info/gmp.info #usr/share/info/gmp.info-1 #usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 996925b7a..c0fc18705 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -3,6 +3,7 @@ etc/init.d #etc/rc.d/helper etc/rc.d/helper/aws-setup etc/rc.d/helper/azure-setup +etc/rc.d/helper/gcp-setup etc/rc.d/helper/getdnsfromdhcpc.pl #etc/rc.d/init.d etc/rc.d/init.d/acpid diff --git a/config/rootfiles/common/iproute2 b/config/rootfiles/common/iproute2 index eaa159ac7..e22f1649c 100644 --- a/config/rootfiles/common/iproute2 +++ b/config/rootfiles/common/iproute2 @@ -34,6 +34,7 @@ sbin/tc #usr/sbin/arpd #usr/share/bash-completion #usr/share/bash-completion/completions +#usr/share/bash-completion/completions/devlink usr/share/bash-completion/completions/tc #usr/share/man/man3/libnetlink.3 #usr/share/man/man7/tc-hfsc.7 @@ -41,6 +42,7 @@ usr/share/bash-completion/completions/tc #usr/share/man/man8/bridge.8 #usr/share/man/man8/ctstat.8 #usr/share/man/man8/devlink-dev.8 +#usr/share/man/man8/devlink-dpipe.8 #usr/share/man/man8/devlink-health.8 #usr/share/man/man8/devlink-monitor.8 #usr/share/man/man8/devlink-port.8 @@ -104,6 +106,7 @@ usr/share/bash-completion/completions/tc #usr/share/man/man8/tc-codel.8 #usr/share/man/man8/tc-connmark.8 #usr/share/man/man8/tc-csum.8 +#usr/share/man/man8/tc-ct.8 #usr/share/man/man8/tc-ctinfo.8 #usr/share/man/man8/tc-drr.8 #usr/share/man/man8/tc-ematch.8 diff --git a/config/rootfiles/common/libgcrypt b/config/rootfiles/common/libgcrypt index efd9ac46a..50aa47867 100644 --- a/config/rootfiles/common/libgcrypt +++ b/config/rootfiles/common/libgcrypt @@ -6,7 +6,8 @@ #usr/lib/libgcrypt.la #usr/lib/libgcrypt.so usr/lib/libgcrypt.so.20 -usr/lib/libgcrypt.so.20.2.4 +usr/lib/libgcrypt.so.20.2.5 +#usr/lib/pkgconfig/libgcrypt.pc #usr/share/aclocal/libgcrypt.m4 #usr/share/info/gcrypt.info #usr/share/info/gcrypt.info-1 diff --git a/config/rootfiles/common/libgpg-error b/config/rootfiles/common/libgpg-error index 6945f3495..1b5b127b2 100644 --- a/config/rootfiles/common/libgpg-error +++ b/config/rootfiles/common/libgpg-error @@ -1,12 +1,16 @@ usr/bin/gpg-error #usr/bin/gpg-error-config +#usr/bin/gpgrt-config +#usr/bin/yat2m #usr/include/gpg-error.h #usr/include/gpgrt.h #usr/lib/libgpg-error.la #usr/lib/libgpg-error.so usr/lib/libgpg-error.so.0 -usr/lib/libgpg-error.so.0.22.0 +usr/lib/libgpg-error.so.0.29.0 +#usr/lib/pkgconfig/gpg-error.pc #usr/share/aclocal/gpg-error.m4 +#usr/share/aclocal/gpgrt.m4 #usr/share/common-lisp #usr/share/common-lisp/source #usr/share/common-lisp/source/gpg-error @@ -21,6 +25,7 @@ usr/lib/libgpg-error.so.0.22.0 #usr/share/locale/da/LC_MESSAGES/libgpg-error.mo #usr/share/locale/de/LC_MESSAGES/libgpg-error.mo #usr/share/locale/eo/LC_MESSAGES/libgpg-error.mo +#usr/share/locale/es/LC_MESSAGES/libgpg-error.mo #usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo #usr/share/locale/hu/LC_MESSAGES/libgpg-error.mo #usr/share/locale/it/LC_MESSAGES/libgpg-error.mo @@ -36,4 +41,4 @@ usr/lib/libgpg-error.so.0.22.0 #usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo #usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo #usr/share/locale/zh_TW/LC_MESSAGES/libgpg-error.mo -#usr/share/man/man1/gpg-error-config.1 +#usr/share/man/man1/gpgrt-config.1 diff --git a/config/rootfiles/common/x86_64/gmp b/config/rootfiles/common/x86_64/gmp index 919b0845a..c1d6a7d9d 100644 --- a/config/rootfiles/common/x86_64/gmp +++ b/config/rootfiles/common/x86_64/gmp @@ -4,12 +4,14 @@ #usr/lib/libgmp.la #usr/lib/libgmp.so usr/lib/libgmp.so.10 -usr/lib/libgmp.so.10.3.2 +usr/lib/libgmp.so.10.4.0 #usr/lib/libgmpxx.a #usr/lib/libgmpxx.la #usr/lib/libgmpxx.so usr/lib/libgmpxx.so.4 -usr/lib/libgmpxx.so.4.5.2 +usr/lib/libgmpxx.so.4.6.0 +#usr/lib/pkgconfig/gmp.pc +#usr/lib/pkgconfig/gmpxx.pc #usr/share/info/gmp.info #usr/share/info/gmp.info-1 #usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 996925b7a..c0fc18705 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -3,6 +3,7 @@ etc/init.d #etc/rc.d/helper etc/rc.d/helper/aws-setup etc/rc.d/helper/azure-setup +etc/rc.d/helper/gcp-setup etc/rc.d/helper/getdnsfromdhcpc.pl #etc/rc.d/init.d etc/rc.d/init.d/acpid diff --git a/config/rootfiles/core/146/exclude b/config/rootfiles/core/147/exclude similarity index 100% rename from config/rootfiles/core/146/exclude rename to config/rootfiles/core/147/exclude diff --git a/config/rootfiles/core/147/filelists/aarch64/gmp b/config/rootfiles/core/147/filelists/aarch64/gmp new file mode 120000 index 000000000..418f2f98b --- /dev/null +++ b/config/rootfiles/core/147/filelists/aarch64/gmp @@ -0,0 +1 @@ +../../../../common/aarch64/gmp \ No newline at end of file diff --git a/config/rootfiles/core/147/filelists/armv5tel/gmp b/config/rootfiles/core/147/filelists/armv5tel/gmp new file mode 120000 index 000000000..2bdf30dac --- /dev/null +++ b/config/rootfiles/core/147/filelists/armv5tel/gmp @@ -0,0 +1 @@ +../../../../common/armv5tel/gmp \ No newline at end of file diff --git a/config/rootfiles/core/147/filelists/dhcpcd b/config/rootfiles/core/147/filelists/dhcpcd new file mode 120000 index 000000000..1e799dabb --- /dev/null +++ b/config/rootfiles/core/147/filelists/dhcpcd @@ -0,0 +1 @@ +../../../common/dhcpcd \ No newline at end of file diff --git a/config/rootfiles/core/147/filelists/files b/config/rootfiles/core/147/filelists/files new file mode 100644 index 000000000..fe33d7d71 --- /dev/null +++ b/config/rootfiles/core/147/filelists/files @@ -0,0 +1,15 @@ +etc/system-release +etc/issue +srv/web/ipfire/cgi-bin/credits.cgi +var/ipfire/langs +etc/rc.d/helper/aws-setup +etc/rc.d/helper/gcp-setup +etc/rc.d/init.d/cloud-init +etc/rc.d/init.d/firewall +etc/rc.d/init.d/functions +etc/rc.d/init.d/networking/any +etc/rc.d/init.d/networking/red +etc/rc.d/init.d/partresize +etc/sysctl.conf +var/ipfire/header.pl +var/ipfire/general-functions.pl diff --git a/config/rootfiles/core/147/filelists/gnutls b/config/rootfiles/core/147/filelists/gnutls new file mode 120000 index 000000000..8dbe60bc3 --- /dev/null +++ b/config/rootfiles/core/147/filelists/gnutls @@ -0,0 +1 @@ +../../../common/gnutls \ No newline at end of file diff --git a/config/rootfiles/core/147/filelists/i586/gmp b/config/rootfiles/core/147/filelists/i586/gmp new file mode 120000 index 000000000..52a09cd0b --- /dev/null +++ b/config/rootfiles/core/147/filelists/i586/gmp @@ -0,0 +1 @@ +../../../../common/i586/gmp \ No newline at end of file diff --git a/config/rootfiles/core/147/filelists/iproute2 b/config/rootfiles/core/147/filelists/iproute2 new file mode 120000 index 000000000..05f0f71fb --- /dev/null +++ b/config/rootfiles/core/147/filelists/iproute2 @@ -0,0 +1 @@ +../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/147/filelists/libgcrypt b/config/rootfiles/core/147/filelists/libgcrypt new file mode 120000 index 000000000..2df12a20e --- /dev/null +++ b/config/rootfiles/core/147/filelists/libgcrypt @@ -0,0 +1 @@ +../../../common/libgcrypt \ No newline at end of file diff --git a/config/rootfiles/core/147/filelists/libgpg-error b/config/rootfiles/core/147/filelists/libgpg-error new file mode 120000 index 000000000..cad431339 --- /dev/null +++ b/config/rootfiles/core/147/filelists/libgpg-error @@ -0,0 +1 @@ +../../../common/libgpg-error \ No newline at end of file diff --git a/config/rootfiles/core/147/filelists/squid b/config/rootfiles/core/147/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/147/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/147/filelists/squidguard b/config/rootfiles/core/147/filelists/squidguard new file mode 120000 index 000000000..f87a5b0c6 --- /dev/null +++ b/config/rootfiles/core/147/filelists/squidguard @@ -0,0 +1 @@ +../../../common/squidguard \ No newline at end of file diff --git a/config/rootfiles/core/147/filelists/x86_64/gmp b/config/rootfiles/core/147/filelists/x86_64/gmp new file mode 120000 index 000000000..7c59c60c6 --- /dev/null +++ b/config/rootfiles/core/147/filelists/x86_64/gmp @@ -0,0 +1 @@ +../../../../common/x86_64/gmp \ No newline at end of file diff --git a/config/rootfiles/core/147/update.sh b/config/rootfiles/core/147/update.sh new file mode 100644 index 000000000..8d8c04048 --- /dev/null +++ b/config/rootfiles/core/147/update.sh @@ -0,0 +1,71 @@ +#!/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) 2020 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=147 + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )); do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# Remove files +rm -vf \ + /var/ipfire/aws-functions.pl + +# Stop services +/etc/init.d/squid stop + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +/usr/local/bin/update-lang-cache + +# Filesytem cleanup +/usr/local/bin/filesystem-cleanup + +# Start services +/etc/init.d/squid start + +# This update needs a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi + +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/146/exclude b/config/rootfiles/oldcore/146/exclude new file mode 100644 index 000000000..b22159878 --- /dev/null +++ b/config/rootfiles/oldcore/146/exclude @@ -0,0 +1,28 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/log/dhcpcd.log +var/log/messages +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/146/filelists/aarch64/linux b/config/rootfiles/oldcore/146/filelists/aarch64/linux similarity index 100% rename from config/rootfiles/core/146/filelists/aarch64/linux rename to config/rootfiles/oldcore/146/filelists/aarch64/linux diff --git a/config/rootfiles/core/146/filelists/aarch64/linux-initrd b/config/rootfiles/oldcore/146/filelists/aarch64/linux-initrd similarity index 100% rename from config/rootfiles/core/146/filelists/aarch64/linux-initrd rename to config/rootfiles/oldcore/146/filelists/aarch64/linux-initrd diff --git a/config/rootfiles/core/146/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/oldcore/146/filelists/armv5tel/linux-initrd-multi similarity index 100% rename from config/rootfiles/core/146/filelists/armv5tel/linux-initrd-multi rename to config/rootfiles/oldcore/146/filelists/armv5tel/linux-initrd-multi diff --git a/config/rootfiles/core/146/filelists/armv5tel/linux-multi b/config/rootfiles/oldcore/146/filelists/armv5tel/linux-multi similarity index 100% rename from config/rootfiles/core/146/filelists/armv5tel/linux-multi rename to config/rootfiles/oldcore/146/filelists/armv5tel/linux-multi diff --git a/config/rootfiles/core/146/filelists/files b/config/rootfiles/oldcore/146/filelists/files similarity index 100% rename from config/rootfiles/core/146/filelists/files rename to config/rootfiles/oldcore/146/filelists/files diff --git a/config/rootfiles/core/146/filelists/i586/intel-microcode b/config/rootfiles/oldcore/146/filelists/i586/intel-microcode similarity index 100% rename from config/rootfiles/core/146/filelists/i586/intel-microcode rename to config/rootfiles/oldcore/146/filelists/i586/intel-microcode diff --git a/config/rootfiles/core/146/filelists/i586/linux b/config/rootfiles/oldcore/146/filelists/i586/linux similarity index 100% rename from config/rootfiles/core/146/filelists/i586/linux rename to config/rootfiles/oldcore/146/filelists/i586/linux diff --git a/config/rootfiles/core/146/filelists/i586/linux-initrd b/config/rootfiles/oldcore/146/filelists/i586/linux-initrd similarity index 100% rename from config/rootfiles/core/146/filelists/i586/linux-initrd rename to config/rootfiles/oldcore/146/filelists/i586/linux-initrd diff --git a/config/rootfiles/core/146/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/146/filelists/x86_64/intel-microcode similarity index 100% rename from config/rootfiles/core/146/filelists/x86_64/intel-microcode rename to config/rootfiles/oldcore/146/filelists/x86_64/intel-microcode diff --git a/config/rootfiles/core/146/filelists/x86_64/linux b/config/rootfiles/oldcore/146/filelists/x86_64/linux similarity index 100% rename from config/rootfiles/core/146/filelists/x86_64/linux rename to config/rootfiles/oldcore/146/filelists/x86_64/linux diff --git a/config/rootfiles/core/146/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/146/filelists/x86_64/linux-initrd similarity index 100% rename from config/rootfiles/core/146/filelists/x86_64/linux-initrd rename to config/rootfiles/oldcore/146/filelists/x86_64/linux-initrd diff --git a/config/rootfiles/core/146/update.sh b/config/rootfiles/oldcore/146/update.sh similarity index 100% rename from config/rootfiles/core/146/update.sh rename to config/rootfiles/oldcore/146/update.sh diff --git a/config/rootfiles/packages/armv5tel/borgbackup b/config/rootfiles/packages/armv5tel/borgbackup index 245e54a19..276c9ea98 100644 --- a/config/rootfiles/packages/armv5tel/borgbackup +++ b/config/rootfiles/packages/armv5tel/borgbackup @@ -81,11 +81,11 @@ usr/lib/python3.8/site-packages/borg/shellpattern.py usr/lib/python3.8/site-packages/borg/upgrader.py usr/lib/python3.8/site-packages/borg/version.py usr/lib/python3.8/site-packages/borg/xattr.py -#usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/PKG-INFO -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/SOURCES.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/dependency_links.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/entry_points.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/not-zip-safe -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/requires.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/top_level.txt +#usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/PKG-INFO +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/SOURCES.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/dependency_links.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/entry_points.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/not-zip-safe +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/requires.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/top_level.txt diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula index 64fb0d2ca..4ee408fc4 100644 --- a/config/rootfiles/packages/bacula +++ b/config/rootfiles/packages/bacula @@ -13,22 +13,23 @@ etc/bacula/bacula-fd.conf #etc/bacula/btraceback.gdb #etc/bacula/btraceback.mdb #etc/bacula/disk-changer +#etc/bacula/isworm #etc/bacula/mtx-changer #etc/bacula/mtx-changer.conf #etc/bacula/tapealert etc/rc.d/init.d/bacula #opt/bacula #opt/bacula/log -usr/lib/bpipe-fd.so -usr/lib/libbac-9.0.6.so +#usr/lib/bpipe-fd.so +usr/lib/libbac-9.6.5.so #usr/lib/libbac.la -#usr/lib/libbac.so -usr/lib/libbaccfg-9.0.6.so +usr/lib/libbac.so +usr/lib/libbaccfg-9.6.5.so #usr/lib/libbaccfg.la -#usr/lib/libbaccfg.so -usr/lib/libbacfind-9.0.6.so +usr/lib/libbaccfg.so +usr/lib/libbacfind-9.6.5.so #usr/lib/libbacfind.la -#usr/lib/libbacfind.so +usr/lib/libbacfind.so #usr/sbin/bacula usr/sbin/bacula-fd #usr/sbin/bbconsjson @@ -61,4 +62,4 @@ usr/sbin/bacula-fd #usr/share/man/man8/bwild.8.gz #usr/share/man/man8/dbcheck.8.gz #var/bacula -var/bacula/working +#var/bacula/working diff --git a/config/rootfiles/packages/borgbackup b/config/rootfiles/packages/borgbackup index cdfe569b5..6fbe61429 100644 --- a/config/rootfiles/packages/borgbackup +++ b/config/rootfiles/packages/borgbackup @@ -81,11 +81,11 @@ usr/lib/python3.8/site-packages/borg/shellpattern.py usr/lib/python3.8/site-packages/borg/upgrader.py usr/lib/python3.8/site-packages/borg/version.py usr/lib/python3.8/site-packages/borg/xattr.py -#usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/PKG-INFO -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/SOURCES.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/dependency_links.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/entry_points.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/not-zip-safe -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/requires.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/top_level.txt +#usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/PKG-INFO +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/SOURCES.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/dependency_links.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/entry_points.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/not-zip-safe +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/requires.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/top_level.txt diff --git a/config/rootfiles/packages/i586/borgbackup b/config/rootfiles/packages/i586/borgbackup index 786d185bc..6865d7d20 100644 --- a/config/rootfiles/packages/i586/borgbackup +++ b/config/rootfiles/packages/i586/borgbackup @@ -81,11 +81,11 @@ usr/lib/python3.8/site-packages/borg/shellpattern.py usr/lib/python3.8/site-packages/borg/upgrader.py usr/lib/python3.8/site-packages/borg/version.py usr/lib/python3.8/site-packages/borg/xattr.py -#usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/PKG-INFO -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/SOURCES.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/dependency_links.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/entry_points.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/not-zip-safe -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/requires.txt -usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/top_level.txt +#usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/PKG-INFO +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/SOURCES.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/dependency_links.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/entry_points.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/not-zip-safe +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/requires.txt +usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/top_level.txt diff --git a/config/rootfiles/packages/joe b/config/rootfiles/packages/joe index 164ec79d9..5cc7a8d60 100644 --- a/config/rootfiles/packages/joe +++ b/config/rootfiles/packages/joe @@ -3,75 +3,128 @@ usr/bin/joe #usr/bin/jpico #usr/bin/jstar usr/bin/rjoe -#usr/bin/termidx #usr/etc/joe usr/etc/joe/ftyperc usr/etc/joe/jicerc.ru usr/etc/joe/jmacsrc usr/etc/joe/joerc +usr/etc/joe/joerc.zh_TW usr/etc/joe/jpicorc usr/etc/joe/jstarrc usr/etc/joe/rjoerc +usr/etc/joe/shell.csh +usr/etc/joe/shell.sh +#usr/share/applications/jmacs.desktop +#usr/share/applications/joe.desktop +#usr/share/applications/jpico.desktop +#usr/share/applications/jstar.desktop #usr/share/doc/joe #usr/share/doc/joe/ChangeLog -#usr/share/doc/joe/HACKING -#usr/share/doc/joe/HINTS -#usr/share/doc/joe/LIST -#usr/share/doc/joe/NEWS -#usr/share/doc/joe/README +#usr/share/doc/joe/NEWS.md +#usr/share/doc/joe/README.md +#usr/share/doc/joe/README.old +#usr/share/doc/joe/hacking.md +#usr/share/doc/joe/man.md #usr/share/joe #usr/share/joe/charmaps usr/share/joe/charmaps/klingon +usr/share/joe/colors +usr/share/joe/colors/default.jcf +usr/share/joe/colors/gruvbox.jcf +usr/share/joe/colors/ir_black.jcf +usr/share/joe/colors/molokai.jcf +usr/share/joe/colors/solarized.jcf +usr/share/joe/colors/wombat.jcf +usr/share/joe/colors/xoria.jcf +usr/share/joe/colors/zenburn-hc.jcf +usr/share/joe/colors/zenburn.jcf #usr/share/joe/lang usr/share/joe/lang/de.po #usr/share/joe/lang/fr.po #usr/share/joe/lang/ru.po usr/share/joe/lang/uk.po +usr/share/joe/lang/zh_TW.po #usr/share/joe/syntax usr/share/joe/syntax/4gl.jsf usr/share/joe/syntax/ada.jsf +usr/share/joe/syntax/ant.jsf usr/share/joe/syntax/asm.jsf +usr/share/joe/syntax/avr.jsf usr/share/joe/syntax/awk.jsf +usr/share/joe/syntax/batch.jsf usr/share/joe/syntax/c.jsf +usr/share/joe/syntax/clojure.jsf usr/share/joe/syntax/cobol.jsf +usr/share/joe/syntax/coffee.jsf +usr/share/joe/syntax/comment_todo.jsf usr/share/joe/syntax/conf.jsf +usr/share/joe/syntax/context.jsf usr/share/joe/syntax/csh.jsf +usr/share/joe/syntax/csharp.jsf usr/share/joe/syntax/css.jsf +usr/share/joe/syntax/d.jsf +usr/share/joe/syntax/debian.jsf usr/share/joe/syntax/diff.jsf +usr/share/joe/syntax/dockerfile.jsf +usr/share/joe/syntax/elixir.jsf +usr/share/joe/syntax/erb.jsf +usr/share/joe/syntax/erlang.jsf +usr/share/joe/syntax/filename.jsf usr/share/joe/syntax/fortran.jsf +usr/share/joe/syntax/git-commit.jsf +usr/share/joe/syntax/go.jsf +usr/share/joe/syntax/groovy.jsf +usr/share/joe/syntax/haml.jsf usr/share/joe/syntax/haskell.jsf usr/share/joe/syntax/html.jsf +usr/share/joe/syntax/htmlerb.jsf +usr/share/joe/syntax/ini.jsf +usr/share/joe/syntax/iptables.jsf usr/share/joe/syntax/java.jsf +usr/share/joe/syntax/jcf.jsf usr/share/joe/syntax/joerc.jsf +usr/share/joe/syntax/js.jsf usr/share/joe/syntax/jsf.jsf usr/share/joe/syntax/jsf_check.jsf +usr/share/joe/syntax/json.jsf usr/share/joe/syntax/lisp.jsf usr/share/joe/syntax/lua.jsf usr/share/joe/syntax/m4.jsf usr/share/joe/syntax/mail.jsf usr/share/joe/syntax/mason.jsf usr/share/joe/syntax/matlab.jsf +usr/share/joe/syntax/md.jsf usr/share/joe/syntax/ocaml.jsf usr/share/joe/syntax/pascal.jsf usr/share/joe/syntax/perl.jsf usr/share/joe/syntax/php.jsf +usr/share/joe/syntax/powershell.jsf +usr/share/joe/syntax/prolog.jsf +usr/share/joe/syntax/properties.jsf usr/share/joe/syntax/ps.jsf +usr/share/joe/syntax/puppet.jsf usr/share/joe/syntax/python.jsf +usr/share/joe/syntax/r.jsf usr/share/joe/syntax/rexx.jsf usr/share/joe/syntax/ruby.jsf +usr/share/joe/syntax/rust.jsf +usr/share/joe/syntax/scala.jsf usr/share/joe/syntax/sed.jsf usr/share/joe/syntax/sh.jsf +usr/share/joe/syntax/sieve.jsf usr/share/joe/syntax/skill.jsf usr/share/joe/syntax/sml.jsf usr/share/joe/syntax/spec.jsf usr/share/joe/syntax/sql.jsf +usr/share/joe/syntax/swift.jsf usr/share/joe/syntax/tcl.jsf usr/share/joe/syntax/tex.jsf usr/share/joe/syntax/troff.jsf +usr/share/joe/syntax/typescript.jsf usr/share/joe/syntax/verilog.jsf usr/share/joe/syntax/vhdl.jsf +usr/share/joe/syntax/whitespace.jsf usr/share/joe/syntax/xml.jsf +usr/share/joe/syntax/yaml.jsf usr/share/man/man1/joe.1 -#usr/share/man/ru -#usr/share/man/ru/man1 #usr/share/man/ru/man1/joe.1 diff --git a/config/rootfiles/packages/libassuan b/config/rootfiles/packages/libassuan index 8670ee704..d8e471773 100644 --- a/config/rootfiles/packages/libassuan +++ b/config/rootfiles/packages/libassuan @@ -3,6 +3,7 @@ usr/bin/libassuan-config #usr/lib/libassuan.la usr/lib/libassuan.so usr/lib/libassuan.so.0 -usr/lib/libassuan.so.0.7.3 +usr/lib/libassuan.so.0.8.3 +#usr/lib/pkgconfig/libassuan.pc #usr/share/aclocal/libassuan.m4 #usr/share/info/assuan.info diff --git a/lfs/bacula b/lfs/bacula index 8c96c7ba1..1e4db011b 100644 --- a/lfs/bacula +++ b/lfs/bacula @@ -24,7 +24,7 @@
include Config
-VER = 9.0.6 +VER = 9.6.5
THISAPP = bacula-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = bacula -PAK_VER = 4 +PAK_VER = 5
DEPS =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9168e398808c42bf290515f60892f643 +$(DL_FILE)_MD5 = e58eb531483de98d0410b33e3ec3d96a
install : $(TARGET)
@@ -80,12 +80,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) $(UPDATE_AUTOMAKE) cd $(DIR_APP) && ./configure \ --prefix=/usr \ + --enable-smartalloc \ --sysconfdir=/etc/bacula \ --with-working-dir=/var/bacula/working \ --enable-client-only cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - ln -s /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula + ln -sf /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula rm -f /root/.rnd @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/borgbackup b/lfs/borgbackup index bc1cfa2dd..ea87cf5ce 100644 --- a/lfs/borgbackup +++ b/lfs/borgbackup @@ -24,7 +24,7 @@
include Config
-VER = 1.1.11 +VER = 1.1.13
THISAPP = borgbackup-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = borgbackup -PAK_VER = 5 +PAK_VER = 6
DEPS = python3-llfuse python3-msgpack
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ab9721f10c2500e0ca872545c64b6e2f +$(DL_FILE)_MD5 = a82d2bdf61bfaeebb90ac8ab1347657a
install : $(TARGET)
diff --git a/lfs/configroot b/lfs/configroot index 2c9dbe0e3..ee320d8cf 100644 --- a/lfs/configroot +++ b/lfs/configroot @@ -79,7 +79,6 @@ $(TARGET) : cp $(DIR_SRC)/config/cfgroot/general-functions.pl $(CONFIG_ROOT)/ cp $(DIR_SRC)/config/cfgroot/network-functions.pl $(CONFIG_ROOT)/ cp $(DIR_SRC)/config/cfgroot/geoip-functions.pl $(CONFIG_ROOT)/ - cp $(DIR_SRC)/config/cfgroot/aws-functions.pl $(CONFIG_ROOT)/ cp $(DIR_SRC)/config/cfgroot/ids-functions.pl $(CONFIG_ROOT)/ cp $(DIR_SRC)/config/cfgroot/lang.pl $(CONFIG_ROOT)/ cp $(DIR_SRC)/config/cfgroot/countries.pl $(CONFIG_ROOT)/ diff --git a/lfs/dhcpcd b/lfs/dhcpcd index bc55e9705..c5a2c1a25 100644 --- a/lfs/dhcpcd +++ b/lfs/dhcpcd @@ -24,7 +24,7 @@
include Config
-VER = 9.0.2 +VER = 9.1.2
THISAPP = dhcpcd-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f62118a576b01f5d0adf0c5ce617fbe7 +$(DL_FILE)_MD5 = 96fc03f0b57e85a2dca2854bf2ff762d
install : $(TARGET)
diff --git a/lfs/gmp b/lfs/gmp index 98671b594..d09100981 100644 --- a/lfs/gmp +++ b/lfs/gmp @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 IPFire Team info@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 = 6.1.2 +VER = 6.2.0
THISAPP = gmp-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -49,7 +49,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f58fa8001d60c4c77595fbbb62b63c1d +$(DL_FILE)_MD5 = a325e3f09e6d91e62101e59f9bda3ec1
install : $(TARGET)
@@ -100,7 +100,7 @@ ifeq "$(BUILD_ARCH)" "i586" cd $(DIR_APP) && make $(MAKETUNING)
-mkdir -pv /usr/lib/sse2 - cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.3.2 /usr/lib/sse2 + cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.4.0 /usr/lib/sse2 endif
@rm -rf $(DIR_APP) diff --git a/lfs/gnutls b/lfs/gnutls index 6d24800b8..07344a8c4 100644 --- a/lfs/gnutls +++ b/lfs/gnutls @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 IPFire Team info@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,11 +24,10 @@
include Config
-VER = 3.6.7 -SUBVER = .1 +VER = 3.6.14
THISAPP = gnutls-$(VER) -DL_FILE = $(THISAPP)$(SUBVER).tar.xz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -41,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 92a8049e618afa60e2c852da1884c457 +$(DL_FILE)_MD5 = bf70632d420e421baff482247f01dbfe
install : $(TARGET)
diff --git a/lfs/haproxy b/lfs/haproxy index 62a1c4d10..bc5ef8021 100644 --- a/lfs/haproxy +++ b/lfs/haproxy @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 2.1.4 +VER = 2.1.7
THISAPP = haproxy-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = haproxy -PAK_VER = 14 +PAK_VER = 15
DEPS =
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 100cccf98aaf3ba80b5fd070866ad115 +$(DL_FILE)_MD5 = f0ddf67e2be18cfe1b996f9914cfa67e
install : $(TARGET)
diff --git a/lfs/iproute2 b/lfs/iproute2 index 2e8822902..f07a125cf 100644 --- a/lfs/iproute2 +++ b/lfs/iproute2 @@ -24,7 +24,7 @@
include Config
-VER = 5.6.0 +VER = 5.7.0
THISAPP = iproute2-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9da0c352707c34b8b1fec3bf42fcfd09 +$(DL_FILE)_MD5 = da22ab8562eda56ae232872fa72e4870
install : $(TARGET)
diff --git a/lfs/joe b/lfs/joe index 70e8d735b..d89b44790 100644 --- a/lfs/joe +++ b/lfs/joe @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 IPFire Team info@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 = 3.7 +VER = 4.6
THISAPP = joe-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = joe -PAK_VER = 2 +PAK_VER = 3
DEPS =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 66de1b073e869ba12abbfcde3885c577 +$(DL_FILE)_MD5 = 9017484e6116830d846678b625ea5c43
install : $(TARGET)
diff --git a/lfs/libassuan b/lfs/libassuan index 78703e383..16619ae63 100644 --- a/lfs/libassuan +++ b/lfs/libassuan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 2.4.3 +VER = 2.5.3
THISAPP = libassuan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = libassuan -PAK_VER = 4 +PAK_VER = 5
DEPS =
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8e01a7c72d3e5d154481230668e6eb5a +$(DL_FILE)_MD5 = 226c504ea78a232224bf3b6846b3adb9
install : $(TARGET)
diff --git a/lfs/libgcrypt b/lfs/libgcrypt index 5beefbf12..57a456e7b 100644 --- a/lfs/libgcrypt +++ b/lfs/libgcrypt @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2019 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 IPFire Team info@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 = 1.8.4 +VER = 1.8.5
THISAPP = libgcrypt-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fbfdaebbbc6d7e5fbbf6ffdb3e139573 +$(DL_FILE)_MD5 = 348cc4601ca34307fc6cd6c945467743
install : $(TARGET)
diff --git a/lfs/libgpg-error b/lfs/libgpg-error index 6445c8d10..c8d85c3a7 100644 --- a/lfs/libgpg-error +++ b/lfs/libgpg-error @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2020 IPFire Team info@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 = 1.27 +VER = 1.38
THISAPP = libgpg-error-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5217ef3e76a7275a2a3b569a12ddc989 +$(DL_FILE)_MD5 = f164ce3400c820907965fdc53e43acfc
install : $(TARGET)
diff --git a/lfs/squid b/lfs/squid index 9c913b928..ebd25e42e 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@
include Config
-VER = 4.11 +VER = 4.12
THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 10f34e852153a9996aa4614670e2bda1 +$(DL_FILE)_MD5 = ad7a4a8a0031cae3435717a759173829
install : $(TARGET)
diff --git a/lfs/squidguard b/lfs/squidguard index 38efab0ee..0aea8dbb6 100644 --- a/lfs/squidguard +++ b/lfs/squidguard @@ -24,9 +24,9 @@
include Config
-VER = 1.4.1 +VER = 1.6.0
-THISAPP = squidGuard-$(VER) +THISAPP = squidguard-$(VER) DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9ae7b62a63631bb2dd1f474cf2bbe4dc +$(DL_FILE)_MD5 = ebf207accc6da4ad07de2db6e71ce8dc
install : $(TARGET)
@@ -70,13 +70,22 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squidguard-1.4-squid-helper-protocol.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squidGuard-1.4-db5.patch - cd $(DIR_APP) && ./configure --prefix=/usr --datadir=/usr/share \ - --sysconfdir=/etc --localstatedir=/var --infodir=/usr/info --mandir=/usr/man \ + cd $(DIR_APP) && ./autogen.sh + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --datadir=/usr/share \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --infodir=/usr/info \ + --mandir=/usr/man \ --with-sg-config=/var/ipfire/urlfilter/squidGuard.conf \ - --with-sg-logdir=/var/log/squidGuard --with-sg-dbhome=/var/lib/squidguard \ - --with-db=/usr --with-db-inc=/usr/include --with-db-lib=/usr/lib + --with-sg-logdir=/var/log/squidGuard \ + --with-syslog=yes \ + --with-sg-dbhome=/var/lib/squidguard \ + --with-db=/usr \ + --with-db-inc=/usr/include \ + --with-db-lib=/usr/lib + cd $(DIR_APP) && make cd $(DIR_APP) && make install
@@ -92,7 +101,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chmod 755 /var/ipfire/urlfilter/bin/prebuild.pl cp -f $(DIR_CONF)/urlfilter/autoupdate.pl /var/ipfire/urlfilter/bin/autoupdate.pl chmod 755 /var/ipfire/urlfilter/bin/autoupdate.pl - echo "1.7.1" > /var/ipfire/urlfilter/version + echo "1.5-beta" > /var/ipfire/urlfilter/version # Wrapper cp -f $(DIR_CONF)/urlfilter/redirect_wrapper /usr/sbin diff --git a/lfs/strace b/lfs/strace index 53e93b1ec..ec26bd299 100644 --- a/lfs/strace +++ b/lfs/strace @@ -33,9 +33,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = strace -PAK_VER = 2 +PAK_VER = 3
-DEPS = "" +DEPS = elfutils
############################################################################### # Top-level Rules diff --git a/make.sh b/make.sh index 5ed15a0f5..2e54cec28 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name # If you update the version don't forget to update backupiso and add it to core update VERSION="2.25" # Version number -CORE="146" # Core Level (Filename) +CORE="147" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup index 884319822..9b67019d6 100644 --- a/src/initscripts/helper/aws-setup +++ b/src/initscripts/helper/aws-setup @@ -6,6 +6,9 @@ # Set PATH to find our own executables export PATH=/usr/local/sbin:/usr/local/bin:${PATH}
+# AWS supports an MTU of up to 9001 bytes +DEFAULT_MTU=9001 + get() { local file="${1}"
@@ -167,6 +170,7 @@ import_aws_configuration() { echo "RED_NETMASK=${netmask}" echo "RED_NETADDRESS=${netaddress}" echo "RED_BROADCAST=${broadcast}" + echo "RED_MTU=1500" echo "DEFAULT_GATEWAY=${gateway}" ) >> /var/ipfire/ethernet/settings
@@ -188,6 +192,7 @@ import_aws_configuration() { echo "GREEN_NETMASK=${netmask}" echo "GREEN_NETADDRESS=${netaddress}" echo "GREEN_BROADCAST=${broadcast}" + echo "GREEN_MTU=${DEFAULT_MTU}" ) >> /var/ipfire/ethernet/settings ;;
@@ -204,6 +209,7 @@ import_aws_configuration() { echo "ORANGE_NETMASK=${netmask}" echo "ORANGE_NETADDRESS=${netaddress}" echo "ORANGE_BROADCAST=${broadcast}" + echo "ORANGE_MTU=${DEFAULT_MTU}" ) >> /var/ipfire/ethernet/settings ;; esac diff --git a/src/initscripts/helper/gcp-setup b/src/initscripts/helper/gcp-setup new file mode 100644 index 000000000..eab09eb2c --- /dev/null +++ b/src/initscripts/helper/gcp-setup @@ -0,0 +1,292 @@ +#!/bin/bash + +. /etc/sysconfig/rc +. ${rc_functions} + +# Set PATH to find our own executables +export PATH=/usr/local/sbin:/usr/local/bin:${PATH} + +# GCP only supports an MTU of 1460 +DEFAULT_MTU=1460 + +get() { + local file="${1}" + + wget --header="Metadata-Flavor: Google" -qO - "http://169.254.169.254/computeMetadata/v1/$%7Bfile%7D" +} + +to_address() { + local n="${1}" + + local o1=$(( (n & 0xff000000) >> 24 )) + local o2=$(( (n & 0xff0000) >> 16 )) + local o3=$(( (n & 0xff00) >> 8 )) + local o4=$(( (n & 0xff) )) + + printf "%d.%d.%d.%d\n" "${o1}" "${o2}" "${o3}" "${o4}" +} + +to_integer() { + local address="${1}" + + local integer=0 + + local i + for i in ${address//./ }; do + integer=$(( (integer << 8) + i )) + done + + printf "%d\n" "${integer}" +} + +prefix2netmask() { + local prefix=${1} + + local zeros=$(( 32 - prefix )) + local netmask=0 + + local i + for (( i=0; i<${zeros}; i++ )); do + netmask=$(( (netmask << 1) ^ 1 )) + done + + to_address "$(( netmask ^ 0xffffffff ))" +} + +import_gcp_configuration() { + local instance_id="$(get instance/id)" + + boot_mesg "Importing Google Compute Platform configuration for instance ${instance_id}..." + + # Store instance ID + echo "${instance_id}" > /var/run/gcp-instance-id + + # Initialise system settings + local hostname=$(get instance/hostname) + + # Set hostname + if ! grep -q "^HOSTNAME=" /var/ipfire/main/settings; then + echo "HOSTNAME=${hostname%%.*}" >> /var/ipfire/main/settings + fi + + # Set domainname + if ! grep -q "^DOMAINNAME=" /var/ipfire/main/settings; then + echo "DOMAINNAME=${hostname#*.}" >> /var/ipfire/main/settings + fi + + # Create setup user + if ! getent passwd setup &>/dev/null; then + useradd setup -s /usr/bin/run-setup -g nobody -m + + # Unlock the account + usermod -p "x" setup + fi + + # Import SSH keys for setup user + local line + while read -r line; do + # Strip the username part from the key + local key="${line#*:}" + + if [ -n "${key}" ] && ! grep -q "^${key}$" "/home/setup/.ssh/authorized_keys" 2>/dev/null; then + mkdir -p "/home/setup/.ssh" + chmod 700 "/home/setup/.ssh" + chown setup.nobody "/home/setup/.ssh" + + echo "${key}" >> "/home/setup/.ssh/authorized_keys" + chmod 600 "/home/setup/.ssh/authorized_keys" + chown setup.nobody "/home/setup/.ssh/authorized_keys" + fi + done <<<"$(get instance/attributes/ssh-keys)" + + # Download the user-data script only on the first boot + if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then + # Download a startup script + local script="$(get instance/attributes/startup-script)" + + # Execute the script + if [ "${script:0:2}" = "#!" ]; then + echo "${script}" > /tmp/gcp-startup.script + chmod 700 /tmp/gcp-startup.script + + # Run the script + local now="$(date -u +"%s")" + /tmp/gcp-startup.script &>/var/log/startup-script.log.${now} + + # Delete the script right away + rm /tmp/gcp-startup.script + fi + fi + + # Import network configuration + # After this, no network connectivity will be available from this script due to the + # renaming of the network interfaces for which they have to be shut down + local config_type=1 + : > /var/ipfire/ethernet/settings + + local device_number + for device_number in $(get instance/network-interfaces/); do + # Remove trailing slash + device_number="${device_number////}" + + local mac="$(get "instance/network-interfaces/${device_number}/mac")" + + # XXX TODO read the MTU because Google seems to only support 1460 + + # First IPv4 address + local ipv4_address="$(get "instance/network-interfaces/${device_number}/ip")" + local ipv4_address_num="$(to_integer "${ipv4_address}")" + + local netmask="$(get "instance/network-interfaces/${device_number}/subnetmask")" + local netmask_num="$(to_integer "${netmask}")" + + # Calculate the network and broadcast addresses + local netaddress="$(to_address $(( ipv4_address_num & netmask_num )))" + local broadcast="$(to_address $(( ipv4_address_num | (0xffffffff ^ netmask_num) )))" + + case "${device_number}" in + # RED + 0) + local interface_name="red0" + local gateway="$(get instance/network-interfaces/${device_number}/gateway)" + + ( + echo "RED_TYPE=STATIC" + echo "RED_DEV=${interface_name}" + echo "RED_MACADDR=${mac}" + echo "RED_DESCRIPTION='${interface_id}'" + echo "RED_ADDRESS=${ipv4_address}" + echo "RED_NETMASK=${netmask}" + echo "RED_NETADDRESS=${netaddress}" + echo "RED_BROADCAST=${broadcast}" + echo "RED_MTU=${DEFAULT_MTU}" + echo "DEFAULT_GATEWAY=${gateway}" + ) >> /var/ipfire/ethernet/settings + + # Import aliases for RED + for alias in $(get "instance/network-interfaces/${device_number}/ip-aliases"); do + echo "${alias},on," + done > /var/ipfire/ethernet/aliases + ;; + + # GREEN + 1) + local interface_name="green0" + + ( + echo "GREEN_DEV=${interface_name}" + echo "GREEN_MACADDR=${mac}" + echo "GREEN_DESCRIPTION='${interface_id}'" + echo "GREEN_ADDRESS=${ipv4_address}" + echo "GREEN_NETMASK=${netmask}" + echo "GREEN_NETADDRESS=${netaddress}" + echo "GREEN_BROADCAST=${broadcast}" + echo "GREEN_MTU=${DEFAULT_MTU}" + ) >> /var/ipfire/ethernet/settings + ;; + + # ORANGE + 2) + local interface_name="orange0" + config_type=2 + + ( + echo "ORANGE_DEV=${interface_name}" + echo "ORANGE_MACADDR=${mac}" + echo "ORANGE_DESCRIPTION='${interface_id}'" + echo "ORANGE_ADDRESS=${ipv4_address}" + echo "ORANGE_NETMASK=${netmask}" + echo "ORANGE_NETADDRESS=${netaddress}" + echo "ORANGE_BROADCAST=${broadcast}" + echo "ORANGE_MTU=${DEFAULT_MTU}" + ) >> /var/ipfire/ethernet/settings + ;; + esac + done + + # Save CONFIG_TYPE + echo "CONFIG_TYPE=${config_type}" >> /var/ipfire/ethernet/settings + + # Actions performed only on the very first start + if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then + # Disable using ISP nameservers + sed -e "s/^USE_ISP_NAMESERVERS=.*/USE_ISP_NAMESERVERS=off/" -i /var/ipfire/dns/settings + + # Enable SSH + sed -e "s/ENABLE_SSH=.*/ENABLE_SSH=on/g" -i /var/ipfire/remote/settings + + # Disable SSH password authentication + sed -e "s/^ENABLE_SSH_PASSWORDS=.*/ENABLE_SSH_PASSWORDS=off/" -i /var/ipfire/remote/settings + + # Enable SSH key authentication + sed -e "s/^ENABLE_SSH_KEYS=.*/ENABLE_SSH_KEYS=on/" -i /var/ipfire/remote/settings + + # Apply SSH settings + /usr/local/bin/sshctrl + + # Mark SSH to start immediately (but not right now) + touch /var/ipfire/remote/enablessh + chown nobody:nobody /var/ipfire/remote/enablessh + + # Firewall rules for SSH and WEBIF + ( + echo "1,ACCEPT,INPUTFW,ON,std_net_src,ALL,ipfire,RED1,,TCP,,,ON,,,cust_srv,SSH,,,,,,,,,,,00:00,00:00,,AUTO,,dnat,,,,,second" + echo "2,ACCEPT,INPUTFW,ON,std_net_src,ALL,ipfire,RED1,,TCP,,,ON,,,TGT_PORT,444,,,,,,,,,,,00:00,00:00,,AUTO,,dnat,,,,,second" + ) >> /var/ipfire/firewall/input + + # This script has now completed the first steps of setup + touch /var/ipfire/main/firstsetup_ok + fi + + # All done + echo_ok +} + +case "${reason}" in + PREINIT) + # Bring up the interface + ip link set "${interface}" up + ;; + + BOUND|RENEW|REBIND|REBOOT) + # Remove any previous IP addresses + ip addr flush dev "${interface}" + + # Add (or re-add) the new IP address + ip addr add "${new_ip_address}/${new_subnet_mask}" dev "${interface}" + + # Add the default route + ip route add "${new_routers}" dev "${interface}" + ip route add default via "${new_routers}" + + # Setup DNS + for domain_name_server in ${new_domain_name_servers}; do + echo "nameserver ${domain_name_server}" + done > /etc/resolv.conf + + # The system is online now + touch /var/ipfire/red/active + + # Import GCP configuration + import_gcp_configuration + ;; + + EXPIRE|FAIL|RELEASE|STOP) + # The system is no longer online + rm -f /var/ipfire/red/active + + # Remove all IP addresses + ip addr flush dev "${interface}" + + # Shut down the interface + ip link set "${interface}" down + ;; + + *) + echo "Unhandled reason: ${reason}" >&2 + exit 2 + ;; +esac + +# Terminate +exit 0 diff --git a/src/initscripts/networking/any b/src/initscripts/networking/any index 5609a9efe..8d2300950 100644 --- a/src/initscripts/networking/any +++ b/src/initscripts/networking/any @@ -26,6 +26,7 @@ if [ "$(basename $0)" == "green" ]; then NETADDRESS="${GREEN_NETADDRESS}" NETMASK="${GREEN_NETMASK}" DEVICE="${GREEN_DEV}" + MTU="${GREEN_MTU}" elif [ "$(basename $0)" == "blue" ]; then DEVICE="${BLUE_DEV}" ADDRESS="${BLUE_ADDRESS}" @@ -33,6 +34,7 @@ elif [ "$(basename $0)" == "blue" ]; then NETADDRESS="${BLUE_NETADDRESS}" NETMASK="${BLUE_NETMASK}" DEVICE="${BLUE_DEV}" + MTU="${GREEN_MTU}" elif [ "$(basename $0)" == "orange" ]; then DEVICE="${ORANGE_DEV}" ADDRESS="${ORANGE_ADDRESS}" @@ -40,6 +42,7 @@ elif [ "$(basename $0)" == "orange" ]; then NETADDRESS="${ORANGE_NETADDRESS}" NETMASK="${ORANGE_NETMASK}" DEVICE="${ORANGE_DEV}" + MTU="${ORANGE_MTU}" fi
if [ -z "${BROADCAST}" ]; then @@ -77,6 +80,14 @@ case "${1}" in exit 1 fi
+ # Set the MTU + if [ -n "${MTU}" ]; then + if ! ip link set dev "${DEVICE}" mtu "${MTU}" &>/dev/null; then + boot_mesg "Could not set MTU of ${MTU} to ${DEVICE}..." + echo_warning + fi + fi + # Create & Enable vnstat data collection /usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1 diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red index db4209b44..44e0daa68 100644 --- a/src/initscripts/networking/red +++ b/src/initscripts/networking/red @@ -54,11 +54,13 @@ if [ "${TYPE}" == "STATIC" ]; then BROADCAST="${RED_BROADCAST}" NETADDRESS="${RED_NETADDRESS}" NETMASK="${RED_NETMASK}" + MTU="${RED_MTU}" else ADDRESS="${GREEN_ADDRESS}" BROADCAST="${GREEN_BROADCAST}" NETADDRESS="${GREEN_NETADDRESS}" NETMASK="${GREEN_NETMASK}" + MTU="${GREEN_MTU}" fi GATEWAY="${DEFAULT_GATEWAY}" # DNS1 @@ -108,7 +110,14 @@ case "${1}" in /usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1 if [ "${TYPE}" == "STATIC" ]; then - + # Set the MTU + if [ -n "${MTU}" ]; then + if ! ip link set dev "${DEVICE}" mtu "${MTU}" &>/dev/null; then + boot_mesg "Could not set MTU of ${MTU} to ${DEVICE}..." + echo_warning + fi + fi + if [ "$DEVICE" != "${GREEN_DEV}" ]; then boot_mesg "Adding IPv4 address ${ADDRESS} to the ${DEVICE} interface..." ip addr add ${args} dev ${DEVICE} diff --git a/src/initscripts/system/cloud-init b/src/initscripts/system/cloud-init index 79a762b2d..284e24d7b 100644 --- a/src/initscripts/system/cloud-init +++ b/src/initscripts/system/cloud-init @@ -13,6 +13,8 @@ case "${1}" in scriptname="/etc/rc.d/helper/aws-setup" elif running_on_azure; then scriptname="/etc/rc.d/helper/azure-setup" + elif running_on_gcp; then + scriptname="/etc/rc.d/helper/gcp-setup" else # This system is not running in the cloud exit 0 @@ -63,6 +65,11 @@ case "${1}" in echo "This system is running on Microsoft Azure" exit 0
+ # Check Google + elif running_on_gcp; then + echo "This system is running on Google Cloud" + exit 0 + # The rest else echo "This system is NOT running in the cloud" diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall index 00512d9fa..b0890c717 100644 --- a/src/initscripts/system/firewall +++ b/src/initscripts/system/firewall @@ -96,6 +96,9 @@ iptables_init() {
# Conntrack helpers (https://home.regit.org/netfilter-en/secure-use-of-helpers/)
+ # GRE (always enabled) + modprobe nf_conntrack_proto_gre + # SIP if [ "${CONNTRACK_SIP}" = "on" ]; then modprobe nf_nat_sip diff --git a/src/initscripts/system/functions b/src/initscripts/system/functions index 2127a5899..b6e6507d6 100644 --- a/src/initscripts/system/functions +++ b/src/initscripts/system/functions @@ -822,4 +822,16 @@ running_on_azure() { return 1 }
+running_on_gcp() { + # Check if the BIOS vendor is "Google" + if [ -r "/sys/devices/virtual/dmi/id/bios_vendor" ]; then + local bios_vendor="$(</sys/devices/virtual/dmi/id/bios_vendor)" + + [ "${bios_vendor}" = "Google" ] && return 0 + fi + + # We are not running on GCP + return 1 +} + # End $rc_base/init.d/functions diff --git a/src/initscripts/system/partresize b/src/initscripts/system/partresize index e7e3bf40b..20044b083 100644 --- a/src/initscripts/system/partresize +++ b/src/initscripts/system/partresize @@ -45,8 +45,8 @@ case "${1}" in esac fi
- # Enable the serial console on all systems on Azure - if running_on_azure; then + # Enable the serial console on all systems on Azure and Google Compute Platform + if running_on_azure || running_on_gcp; then scon="on" fi
diff --git a/src/paks/bacula/install.sh b/src/paks/bacula/install.sh new file mode 100644 index 000000000..8bcd38032 --- /dev/null +++ b/src/paks/bacula/install.sh @@ -0,0 +1,35 @@ +#!/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@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +if [ ! -d /var/bacula/working ]; then + mkdir -p /var/bacula/working +fi +restore_backup ${NAME} +# create startlinks +ln -sf ../init.d/bacula /etc/rc.d/rc0.d/K35bacula +ln -sf ../init.d/bacula /etc/rc.d/rc3.d/S65bacula +ln -sf ../init.d/bacula /etc/rc.d/rc6.d/K35bacula +start_service ${NAME} +exit 0 diff --git a/src/paks/bacula/uninstall.sh b/src/paks/bacula/uninstall.sh new file mode 100644 index 000000000..1a0a167a3 --- /dev/null +++ b/src/paks/bacula/uninstall.sh @@ -0,0 +1,32 @@ +#!/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@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +make_backup ${NAME} +# Remove /var/bacula/ directory +rm -r /var/bacula +remove_files +# Remove all start links. +rm -rf /etc/rc.d/rc*.d/*bacula +exit 0 diff --git a/config/cfgroot/aws-functions.pl b/src/paks/bacula/update.sh similarity index 88% rename from config/cfgroot/aws-functions.pl rename to src/paks/bacula/update.sh index 5fd97125c..89c40d0d7 100644 --- a/config/cfgroot/aws-functions.pl +++ b/src/paks/bacula/update.sh @@ -1,4 +1,4 @@ -#!/usr/bin/perl -w +#!/bin/bash ############################################################################ # # # This file is part of the IPFire Firewall. # @@ -17,18 +17,10 @@ # 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@ipfire.org. # +# Copyright (C) 2007 IPFire-Team info@ipfire.org. # # # ############################################################################ - -package AWS; - -sub running_on_ec2() { - if (-e "/var/run/aws-instance-id") { - return 1; - } - - return 0; -} - -1; +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh diff --git a/src/patches/squidGuard-1.4-db5.patch b/src/patches/squidGuard-1.4-db5.patch deleted file mode 100644 index 733fbad2e..000000000 --- a/src/patches/squidGuard-1.4-db5.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN squidGuard-1.4-vanilla/src/sgDb.c squidGuard-1.4/src/sgDb.c ---- squidGuard-1.4-vanilla/src/sgDb.c 2008-07-15 04:29:41.000000000 +1000 -+++ squidGuard-1.4/src/sgDb.c 2013-01-21 12:47:41.049325756 +1100 -@@ -114,7 +114,7 @@ - } - } - #endif --#if DB_VERSION_MAJOR == 4 -+#if DB_VERSION_MAJOR >= 4 - if(globalUpdate || createdb || (dbfile != NULL && stat(dbfile,&st))){ - flag = DB_CREATE; - if(createdb) \ No newline at end of file diff --git a/src/patches/squidguard-1.4-squid-helper-protocol.patch b/src/patches/squidguard-1.4-squid-helper-protocol.patch deleted file mode 100644 index 98069465a..000000000 --- a/src/patches/squidguard-1.4-squid-helper-protocol.patch +++ /dev/null @@ -1,75 +0,0 @@ -http://bugs.squid-cache.org/show_bug.cgi?id=3978 - ---- squidGuard-1.4.orig/src/main.c 2013-12-11 17:42:15.000000000 +1300 -+++ squidGuard-1.4.orig/src/main.c 2013-12-11 19:04:09.000000000 +1300 -@@ -175,7 +175,7 @@ - sgReloadConfig(); - } - if(failsafe_mode) { -- puts(""); -+ puts("ERR message="squidGuard failsafe mode""); - fflush(stdout); - if(sig_hup){ - sgReloadConfig(); -@@ -184,7 +184,7 @@ - } - if(parseLine(buf,&squidInfo) != 1){ - sgLogError("Error parsing squid line: %s",buf); -- puts(""); -+ puts("BH message="squidGuard error parsing squid line""); - } - else { - src = Source; -@@ -196,14 +196,14 @@ - acl = sgAclCheckSource(src); - if((redirect = sgAclAccess(src,acl,&squidInfo)) == NULL){ - if(src == NULL || src->cont_search == 0){ -- puts(""); -+ puts("ERR"); - break; - } else - if(src->next != NULL){ - src = src->next; - continue; - } else { -- puts(""); -+ puts("ERR"); - break; - } - } else { -@@ -215,9 +215,10 @@ - squidInfo.ident[0] = '-'; - squidInfo.ident[1] = '\0'; - } -- fprintf(stdout,"%s %s/%s %s %s\n",redirect,squidInfo.src, -- squidInfo.srcDomain,squidInfo.ident, -- squidInfo.method); -+ if (isdigit(redirect[0]) && isdigit(redirect[1]) && isdigit(redirect[2]) && redirect[3]==':') { -+ fprintf(stdout,"OK status=%c%c%c url="%s"\n", redirect[0], redirect[1], redirect[2], &redirect[4]); -+ } else -+ fprintf(stdout,"OK rewrite-url="%s"\n",redirect); - /* sgLogError("%s %s/%s %s %s\n",redirect,squidInfo.src,squidInfo.srcDomain,squidInfo.ident,squidInfo.method); */ - break; - } ---- squidGuard-1.4.orig/src/sgDiv.c 2013-12-11 17:42:15.000000000 +1300 -+++ squidGuard-1.4.orig/src/sgDiv.c 2013-12-11 18:58:33.000000000 +1300 -@@ -771,7 +771,7 @@ - } - sgLogError("Going into emergency mode"); - while(fgets(buf, MAX_BUF, stdin) != NULL){ -- puts(""); -+ puts("ERR"); - fflush(stdout); - } - sgLogError("ending emergency mode, stdin empty"); ---- squidGuard-1.4.orig/src/sgDiv.c.in 2013-12-11 17:42:15.000000000 +1300 -+++ squidGuard-1.4.orig/src/sgDiv.c.in 2013-12-11 18:58:40.000000000 +1300 -@@ -782,7 +782,7 @@ - } - sgLogError("Going into emergency mode"); - while(fgets(buf, MAX_BUF, stdin) != NULL){ -- puts(""); -+ puts("ERR"); - fflush(stdout); - } - sgLogError("ending emergency mode, stdin empty");
hooks/post-receive -- IPFire 2.x development tree