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 c8453e87599fe66f4d18d901bc9dc431306afa2d (commit) via 5852ad2db76bd25107280d6b0b04f4eee797bd9b (commit) via 2eba1dc954ad479231ebeb51d4f32c52597407f7 (commit) via 0054a52bd818fc1ef33684b8b8a8decd60fe4cee (commit) via b302b9a695e391477eab0cb2343f3ba1b1ba1989 (commit) via 27267889aa791b5c4683f62fe823ab96fb42fe8a (commit) via 0d7a6f03d43994265a5c3a1d58be69ceecec9275 (commit) via 814a7d126b461cf2a71dddb1a0e78e306e544233 (commit) via e50f08ae3bdb548bfa5c83ec6926e0096277e89b (commit) via eb1ff23333e91b0ef6fc2c4dca69853b9d109f59 (commit) via bea1884bd79cd91c4b31c2bd20c6f06d029c1e22 (commit) from b7a46724970feeb1edd11bc779db1ca53da0ccdb (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 c8453e87599fe66f4d18d901bc9dc431306afa2d Author: Michael Tremer michael.tremer@ipfire.org Date: Mon May 21 20:58:36 2018 +0100
make.sh: Use all processor cores for compression
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 5852ad2db76bd25107280d6b0b04f4eee797bd9b Author: Michael Tremer michael.tremer@ipfire.org Date: Mon May 21 20:56:58 2018 +0100
make.sh: Use exiterror to end script safely
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 2eba1dc954ad479231ebeb51d4f32c52597407f7 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon May 21 20:56:08 2018 +0100
make.sh: Remove some empty lines
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0054a52bd818fc1ef33684b8b8a8decd60fe4cee Author: Michael Tremer michael.tremer@ipfire.org Date: Mon May 21 20:54:09 2018 +0100
tar seems to ignore the XZ_OPT variable sometimes
This caused that the xz command was called without any extra arguments. This will now create the tar archive first and then pass the archive through xz with our command line switches.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit b302b9a695e391477eab0cb2343f3ba1b1ba1989 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon May 21 20:53:49 2018 +0100
Compress flash-images as XZ as well
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 27267889aa791b5c4683f62fe823ab96fb42fe8a Author: Matthias Fischer matthias.fischer@ipfire.org Date: Mon May 21 16:19:48 2018 +0200
xz: Performance and compression tuning (V2) - fine tuning
Changes since V1:
- Tuned some more 'tar'-command lines - Included 'lfs/core-updates' - Some fine-tuning
Hi,
Current results with V2 (clean builds):
'next': 'packages' => 255 MB 'ipfire-2.19.2gb-ext4.i586-full-core121.img.gz => 319 MB 'ipfire-2.19.i586-full-core121.iso' => 218 MB Total => 792 MB
'xz-tuning': 'packages' => 228 MB 'ipfire-2.19.2gb-ext4.i586-full-core121.img.gz' => 318 MB 'ipfire-2.19.i586-full-core121.iso' => 207 MB
Total => 753 MB (-39 MB)
It would be nice if someone could review and test these. ;-)
If necessary, I can upload a complete patch.
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 0d7a6f03d43994265a5c3a1d58be69ceecec9275 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun May 20 09:30:23 2018 +0200
xz: Performance and compression tuning (V1)
Hi,
as mentioned in the "list", we're trying to make the archives as small as possible using 'xz'-compression.
In order to achieve this, this patch tests the size of the memory available on the host system.
It sets the xz-memory-limit (--memory=[N]Mib) to 70% of the available working memory, a maximum of four xz-'worker threads' (-T4) and a compression rate of '-8' (-8).
These options are written to the 'XZ_OPT=' environment.
For details see: https://linux.die.net/man/1/xz
I have set the number of available xz-'worker threads' (-T) to four (-T4), because during the final tests the '-T0' parameter led to error messages snd stopped: 'cannot allocate memory'. It wouldn't even run with 90%.
Furthermore, testing with '-T0' led to countless messages filling up '_build.packages.log'.
E.g.: ... xz: Adjusted the number of threads from 8 to 2 to not exceed the memory usage limit of 1557 MiB ...
Tests took place on a 32bit-Ubuntu 16.04.4-system with 8 GB RAM and an Intel I7-2600. Build time was about 04:30 hrs. Perhaps a 64bit-system would perform better (higher values), but my goal was to make this run on as many systems as possible, so I choosed these averages.
If minimum requirements (1024 MB RAM) are not met, building stops.
Current results:
'next', untuned: ipfire-2.19.2gb-ext4.i586-full-core121.img.gz => 332951687 Bytes ipfire-2.19.i586-full-core121.iso => 228589568 Bytes
'next', XZ_OPT: -T4 -8, 70% RAM: ipfire-2.19.2gb-ext4.i586-full-core121.img.gz => 329725723 Bytes ipfire-2.19.i586-full-core121.iso => 217055232 Bytes
These two resulting archives are 14760300 Bytes smaller than before.
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 814a7d126b461cf2a71dddb1a0e78e306e544233 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sat May 19 13:53:33 2018 +0200
nano: Update to 2.9.7
For details see: https://www.nano-editor.org/news.php
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit e50f08ae3bdb548bfa5c83ec6926e0096277e89b Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun May 20 17:59:29 2018 +0200
cmake: Update to 3.11.2
For details see: https://cmake.org/cmake/help/v3.11/release/3.11.html#id2
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit eb1ff23333e91b0ef6fc2c4dca69853b9d109f59 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun May 20 17:40:36 2018 +0200
nmap: Update to 7.70
For details see: https://nmap.org/changelog.html
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit bea1884bd79cd91c4b31c2bd20c6f06d029c1e22 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri May 18 17:14:15 2018 +0100
installer: Increase size of /boot to 128M
Fixes #11736
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/packages/nmap | 50 +++++++++++++++++++++++++++++++++++++++--- lfs/Config | 6 +++-- lfs/cdrom | 11 +--------- lfs/cmake | 4 ++-- lfs/core-updates | 9 ++++---- lfs/flash-images | 4 ++-- lfs/nano | 6 ++--- lfs/nmap | 14 +++++++----- make.sh | 14 ++++++++++-- src/installer/hw.c | 2 +- 10 files changed, 86 insertions(+), 34 deletions(-)
Difference in files: diff --git a/config/rootfiles/packages/nmap b/config/rootfiles/packages/nmap index 111610a62..211a8e758 100644 --- a/config/rootfiles/packages/nmap +++ b/config/rootfiles/packages/nmap @@ -14,8 +14,6 @@ usr/lib/python2.7/site-packages/ndiff.pyc #usr/share/man/hu/man1 #usr/share/man/hu/man1/nmap.1 #usr/share/man/it/man1/nmap.1 -#usr/share/man/ja -#usr/share/man/ja/man1 #usr/share/man/ja/man1/nmap.1 #usr/share/man/man1/ndiff.1 #usr/share/man/man1/nmap.1 @@ -85,6 +83,7 @@ usr/share/nmap/nselib/data/http-fingerprints.lua usr/share/nmap/nselib/data/http-folders.txt usr/share/nmap/nselib/data/http-sql-errors.lst usr/share/nmap/nselib/data/http-web-files-extensions.lst +usr/share/nmap/nselib/data/idnaMappings.lua usr/share/nmap/nselib/data/ike-fingerprints.lua #usr/share/nmap/nselib/data/jdwp-class #usr/share/nmap/nselib/data/jdwp-class/JDWPExecCmd.class @@ -110,6 +109,7 @@ usr/share/nmap/nselib/data/psexec/network.lua usr/share/nmap/nselib/data/psexec/nmap_service.c usr/share/nmap/nselib/data/psexec/nmap_service.vcproj usr/share/nmap/nselib/data/psexec/pwdump.lua +usr/share/nmap/nselib/data/publickeydb usr/share/nmap/nselib/data/rtsp-urls.txt usr/share/nmap/nselib/data/snmpcommunities.lst usr/share/nmap/nselib/data/ssl-fingerprints @@ -138,18 +138,22 @@ usr/share/nmap/nselib/gps.lua usr/share/nmap/nselib/http.lua usr/share/nmap/nselib/httpspider.lua usr/share/nmap/nselib/iax2.lua +usr/share/nmap/nselib/idna.lua usr/share/nmap/nselib/ike.lua usr/share/nmap/nselib/imap.lua usr/share/nmap/nselib/informix.lua usr/share/nmap/nselib/ipOps.lua usr/share/nmap/nselib/ipmi.lua usr/share/nmap/nselib/ipp.lua +usr/share/nmap/nselib/irc.lua usr/share/nmap/nselib/iscsi.lua usr/share/nmap/nselib/isns.lua usr/share/nmap/nselib/jdwp.lua usr/share/nmap/nselib/json.lua usr/share/nmap/nselib/ldap.lua usr/share/nmap/nselib/lfs.luadoc +usr/share/nmap/nselib/libssh2-utility.lua +usr/share/nmap/nselib/libssh2.luadoc usr/share/nmap/nselib/listop.lua usr/share/nmap/nselib/lpeg-utility.lua usr/share/nmap/nselib/lpeg.luadoc @@ -166,6 +170,7 @@ usr/share/nmap/nselib/mssql.lua usr/share/nmap/nselib/multicast.lua usr/share/nmap/nselib/mysql.lua usr/share/nmap/nselib/natpmp.lua +usr/share/nmap/nselib/nbd.lua usr/share/nmap/nselib/ncp.lua usr/share/nmap/nselib/ndmp.lua usr/share/nmap/nselib/netbios.lua @@ -181,6 +186,7 @@ usr/share/nmap/nselib/pgsql.lua usr/share/nmap/nselib/pop3.lua usr/share/nmap/nselib/pppoe.lua usr/share/nmap/nselib/proxy.lua +usr/share/nmap/nselib/punycode.lua usr/share/nmap/nselib/rdp.lua usr/share/nmap/nselib/re.lua usr/share/nmap/nselib/redis.lua @@ -194,6 +200,7 @@ usr/share/nmap/nselib/shortport.lua usr/share/nmap/nselib/sip.lua usr/share/nmap/nselib/slaxml.lua usr/share/nmap/nselib/smb.lua +usr/share/nmap/nselib/smb2.lua usr/share/nmap/nselib/smbauth.lua usr/share/nmap/nselib/smtp.lua usr/share/nmap/nselib/snmp.lua @@ -225,6 +232,7 @@ usr/share/nmap/nselib/vuzedht.lua usr/share/nmap/nselib/wsdd.lua usr/share/nmap/nselib/xdmcp.lua usr/share/nmap/nselib/xmpp.lua +usr/share/nmap/nselib/zlib.luadoc #usr/share/nmap/scripts usr/share/nmap/scripts/acarsd-info.nse usr/share/nmap/scripts/address-info.nse @@ -267,6 +275,7 @@ usr/share/nmap/scripts/broadcast-ms-sql-discover.nse usr/share/nmap/scripts/broadcast-netbios-master-browser.nse usr/share/nmap/scripts/broadcast-networker-discover.nse usr/share/nmap/scripts/broadcast-novell-locate.nse +usr/share/nmap/scripts/broadcast-ospf2-discover.nse usr/share/nmap/scripts/broadcast-pc-anywhere.nse usr/share/nmap/scripts/broadcast-pc-duo.nse usr/share/nmap/scripts/broadcast-pim-discovery.nse @@ -287,6 +296,8 @@ usr/share/nmap/scripts/cassandra-brute.nse usr/share/nmap/scripts/cassandra-info.nse usr/share/nmap/scripts/cccam-version.nse usr/share/nmap/scripts/cics-enum.nse +usr/share/nmap/scripts/cics-info.nse +usr/share/nmap/scripts/cics-user-brute.nse usr/share/nmap/scripts/cics-user-enum.nse usr/share/nmap/scripts/citrix-brute-xml.nse usr/share/nmap/scripts/citrix-enum-apps-xml.nse @@ -306,6 +317,7 @@ usr/share/nmap/scripts/cvs-brute.nse usr/share/nmap/scripts/daap-get-library.nse usr/share/nmap/scripts/daytime.nse usr/share/nmap/scripts/db2-das-info.nse +usr/share/nmap/scripts/deluge-rpc-brute.nse usr/share/nmap/scripts/dhcp-discover.nse usr/share/nmap/scripts/dict-info.nse usr/share/nmap/scripts/distcc-cve2004-2687.nse @@ -352,6 +364,7 @@ usr/share/nmap/scripts/ftp-bounce.nse usr/share/nmap/scripts/ftp-brute.nse usr/share/nmap/scripts/ftp-libopie.nse usr/share/nmap/scripts/ftp-proftpd-backdoor.nse +usr/share/nmap/scripts/ftp-syst.nse usr/share/nmap/scripts/ftp-vsftpd-backdoor.nse usr/share/nmap/scripts/ftp-vuln-cve2010-4221.nse usr/share/nmap/scripts/ganglia-info.nse @@ -369,6 +382,7 @@ usr/share/nmap/scripts/hbase-region-info.nse usr/share/nmap/scripts/hddtemp-info.nse usr/share/nmap/scripts/hnap-info.nse usr/share/nmap/scripts/hostmap-bfk.nse +usr/share/nmap/scripts/hostmap-crtsh.nse usr/share/nmap/scripts/hostmap-ip2hosts.nse usr/share/nmap/scripts/hostmap-robtex.nse usr/share/nmap/scripts/http-adobe-coldfusion-apsa1301.nse @@ -383,6 +397,7 @@ usr/share/nmap/scripts/http-awstatstotals-exec.nse usr/share/nmap/scripts/http-axis2-dir-traversal.nse usr/share/nmap/scripts/http-backup-finder.nse usr/share/nmap/scripts/http-barracuda-dir-traversal.nse +usr/share/nmap/scripts/http-bigip-cookie.nse usr/share/nmap/scripts/http-brute.nse usr/share/nmap/scripts/http-cakephp-version.nse usr/share/nmap/scripts/http-chrono.nse @@ -390,6 +405,7 @@ usr/share/nmap/scripts/http-cisco-anyconnect.nse usr/share/nmap/scripts/http-coldfusion-subzero.nse usr/share/nmap/scripts/http-comments-displayer.nse usr/share/nmap/scripts/http-config-backup.nse +usr/share/nmap/scripts/http-cookie-flags.nse usr/share/nmap/scripts/http-cors.nse usr/share/nmap/scripts/http-cross-domain-policy.nse usr/share/nmap/scripts/http-csrf.nse @@ -424,6 +440,7 @@ usr/share/nmap/scripts/http-iis-short-name-brute.nse usr/share/nmap/scripts/http-iis-webdav-vuln.nse usr/share/nmap/scripts/http-internal-ip-disclosure.nse usr/share/nmap/scripts/http-joomla-brute.nse +usr/share/nmap/scripts/http-jsonp-detection.nse usr/share/nmap/scripts/http-litespeed-sourcecode-download.nse usr/share/nmap/scripts/http-ls.nse usr/share/nmap/scripts/http-majordomo2-dir-traversal.nse @@ -447,6 +464,7 @@ usr/share/nmap/scripts/http-rfi-spider.nse usr/share/nmap/scripts/http-robots.txt.nse usr/share/nmap/scripts/http-robtex-reverse-ip.nse usr/share/nmap/scripts/http-robtex-shared-ns.nse +usr/share/nmap/scripts/http-security-headers.nse usr/share/nmap/scripts/http-server-header.nse usr/share/nmap/scripts/http-shellshock.nse usr/share/nmap/scripts/http-sitemap-generator.nse @@ -460,6 +478,7 @@ usr/share/nmap/scripts/http-title.nse usr/share/nmap/scripts/http-tplink-dir-traversal.nse usr/share/nmap/scripts/http-trace.nse usr/share/nmap/scripts/http-traceroute.nse +usr/share/nmap/scripts/http-trane-info.nse usr/share/nmap/scripts/http-unsafe-output-escaping.nse usr/share/nmap/scripts/http-useragent-tester.nse usr/share/nmap/scripts/http-userdir-enum.nse @@ -485,6 +504,10 @@ usr/share/nmap/scripts/http-vuln-cve2014-3704.nse usr/share/nmap/scripts/http-vuln-cve2014-8877.nse usr/share/nmap/scripts/http-vuln-cve2015-1427.nse usr/share/nmap/scripts/http-vuln-cve2015-1635.nse +usr/share/nmap/scripts/http-vuln-cve2017-1001000.nse +usr/share/nmap/scripts/http-vuln-cve2017-5638.nse +usr/share/nmap/scripts/http-vuln-cve2017-5689.nse +usr/share/nmap/scripts/http-vuln-cve2017-8917.nse usr/share/nmap/scripts/http-vuln-misfortune-cookie.nse usr/share/nmap/scripts/http-vuln-wnr1000-creds.nse usr/share/nmap/scripts/http-waf-detect.nse @@ -497,10 +520,12 @@ usr/share/nmap/scripts/http-xssed.nse usr/share/nmap/scripts/iax2-brute.nse usr/share/nmap/scripts/iax2-version.nse usr/share/nmap/scripts/icap-info.nse +usr/share/nmap/scripts/iec-identify.nse usr/share/nmap/scripts/ike-version.nse usr/share/nmap/scripts/imap-brute.nse usr/share/nmap/scripts/imap-capabilities.nse usr/share/nmap/scripts/imap-ntlm-info.nse +usr/share/nmap/scripts/impress-remote-discover.nse usr/share/nmap/scripts/informix-brute.nse usr/share/nmap/scripts/informix-query.nse usr/share/nmap/scripts/informix-tables.nse @@ -585,6 +610,7 @@ usr/share/nmap/scripts/mysql-variables.nse usr/share/nmap/scripts/mysql-vuln-cve2012-2122.nse usr/share/nmap/scripts/nat-pmp-info.nse usr/share/nmap/scripts/nat-pmp-mapport.nse +usr/share/nmap/scripts/nbd-info.nse usr/share/nmap/scripts/nbstat.nse usr/share/nmap/scripts/ncp-enum-users.nse usr/share/nmap/scripts/ncp-serverinfo.nse @@ -612,6 +638,7 @@ usr/share/nmap/scripts/omp2-enum-targets.nse usr/share/nmap/scripts/omron-info.nse usr/share/nmap/scripts/openlookup-info.nse usr/share/nmap/scripts/openvas-otp-brute.nse +usr/share/nmap/scripts/openwebnet-discovery.nse usr/share/nmap/scripts/oracle-brute-stealth.nse usr/share/nmap/scripts/oracle-brute.nse usr/share/nmap/scripts/oracle-enum-users.nse @@ -628,6 +655,7 @@ usr/share/nmap/scripts/pop3-brute.nse usr/share/nmap/scripts/pop3-capabilities.nse usr/share/nmap/scripts/pop3-ntlm-info.nse usr/share/nmap/scripts/pptp-version.nse +usr/share/nmap/scripts/puppet-naivesigning.nse usr/share/nmap/scripts/qconn-exec.nse usr/share/nmap/scripts/qscan.nse usr/share/nmap/scripts/quake1-info.nse @@ -650,6 +678,7 @@ usr/share/nmap/scripts/rpc-grind.nse usr/share/nmap/scripts/rpcap-brute.nse usr/share/nmap/scripts/rpcap-info.nse usr/share/nmap/scripts/rpcinfo.nse +usr/share/nmap/scripts/rsa-vuln-roca.nse usr/share/nmap/scripts/rsync-brute.nse usr/share/nmap/scripts/rsync-list-modules.nse usr/share/nmap/scripts/rtsp-methods.nse @@ -666,9 +695,11 @@ usr/share/nmap/scripts/sip-enum-users.nse usr/share/nmap/scripts/sip-methods.nse usr/share/nmap/scripts/skypev2-version.nse usr/share/nmap/scripts/smb-brute.nse +usr/share/nmap/scripts/smb-double-pulsar-backdoor.nse usr/share/nmap/scripts/smb-enum-domains.nse usr/share/nmap/scripts/smb-enum-groups.nse usr/share/nmap/scripts/smb-enum-processes.nse +usr/share/nmap/scripts/smb-enum-services.nse usr/share/nmap/scripts/smb-enum-sessions.nse usr/share/nmap/scripts/smb-enum-shares.nse usr/share/nmap/scripts/smb-enum-users.nse @@ -677,19 +708,25 @@ usr/share/nmap/scripts/smb-ls.nse usr/share/nmap/scripts/smb-mbenum.nse usr/share/nmap/scripts/smb-os-discovery.nse usr/share/nmap/scripts/smb-print-text.nse +usr/share/nmap/scripts/smb-protocols.nse usr/share/nmap/scripts/smb-psexec.nse usr/share/nmap/scripts/smb-security-mode.nse usr/share/nmap/scripts/smb-server-stats.nse usr/share/nmap/scripts/smb-system-info.nse usr/share/nmap/scripts/smb-vuln-conficker.nse +usr/share/nmap/scripts/smb-vuln-cve-2017-7494.nse usr/share/nmap/scripts/smb-vuln-cve2009-3103.nse usr/share/nmap/scripts/smb-vuln-ms06-025.nse usr/share/nmap/scripts/smb-vuln-ms07-029.nse usr/share/nmap/scripts/smb-vuln-ms08-067.nse usr/share/nmap/scripts/smb-vuln-ms10-054.nse usr/share/nmap/scripts/smb-vuln-ms10-061.nse +usr/share/nmap/scripts/smb-vuln-ms17-010.nse usr/share/nmap/scripts/smb-vuln-regsvc-dos.nse -usr/share/nmap/scripts/smbv2-enabled.nse +usr/share/nmap/scripts/smb2-capabilities.nse +usr/share/nmap/scripts/smb2-security-mode.nse +usr/share/nmap/scripts/smb2-time.nse +usr/share/nmap/scripts/smb2-vuln-uptime.nse usr/share/nmap/scripts/smtp-brute.nse usr/share/nmap/scripts/smtp-commands.nse usr/share/nmap/scripts/smtp-enum-users.nse @@ -715,7 +752,11 @@ usr/share/nmap/scripts/snmp-win32-users.nse usr/share/nmap/scripts/socks-auth-info.nse usr/share/nmap/scripts/socks-brute.nse usr/share/nmap/scripts/socks-open-proxy.nse +usr/share/nmap/scripts/ssh-auth-methods.nse +usr/share/nmap/scripts/ssh-brute.nse usr/share/nmap/scripts/ssh-hostkey.nse +usr/share/nmap/scripts/ssh-publickey-acceptance.nse +usr/share/nmap/scripts/ssh-run.nse usr/share/nmap/scripts/ssh2-enum-algos.nse usr/share/nmap/scripts/sshv1.nse usr/share/nmap/scripts/ssl-ccs-injection.nse @@ -750,7 +791,9 @@ usr/share/nmap/scripts/telnet-brute.nse usr/share/nmap/scripts/telnet-encryption.nse usr/share/nmap/scripts/telnet-ntlm-info.nse usr/share/nmap/scripts/tftp-enum.nse +usr/share/nmap/scripts/tls-alpn.nse usr/share/nmap/scripts/tls-nextprotoneg.nse +usr/share/nmap/scripts/tls-ticketbleed.nse usr/share/nmap/scripts/tn3270-screen.nse usr/share/nmap/scripts/tor-consensus-checker.nse usr/share/nmap/scripts/traceroute-geolocation.nse @@ -763,6 +806,7 @@ usr/share/nmap/scripts/url-snarf.nse usr/share/nmap/scripts/ventrilo-info.nse usr/share/nmap/scripts/versant-info.nse usr/share/nmap/scripts/vmauthd-brute.nse +usr/share/nmap/scripts/vmware-version.nse usr/share/nmap/scripts/vnc-brute.nse usr/share/nmap/scripts/vnc-info.nse usr/share/nmap/scripts/vnc-title.nse diff --git a/lfs/Config b/lfs/Config index d63a1dc9a..5cd32da06 100644 --- a/lfs/Config +++ b/lfs/Config @@ -47,6 +47,8 @@ else PREFIX = /usr endif
+TAR_OPTIONS = --xz + # URLs that are common sources of downloads. If you're having trouble with # a site you should change its URL to that of a suitable mirror site. # @@ -209,11 +211,11 @@ define PAK tar xf /install/packages/package/files.tmp -C /install/packages/package/tmp/ \ -p --numeric-owner rm -f /install/packages/package/files.tmp - cd /install/packages/package/tmp/ && XZ_OPT=-T0 tar -c -p --numeric-owner -J -f /install/packages/package/files.tar.xz * + cd /install/packages/package/tmp/ && tar cf - -p --numeric-owner -J * | xz $(XZ_OPT) > /install/packages/package/files.tar.xz rm -r /install/packages/package/tmp -cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES - cd /install/packages/package && tar cf ../$(PROG)-$(VER)-$(PAK_VER).ipfire --files-from=/usr/src/src/paks/files + cd /install/packages/package && tar cf - --files-from=/usr/src/src/paks/files | xz $(XZ_OPT) > ../$(PROG)-$(VER)-$(PAK_VER).ipfire rm -rf /install/packages/package sed -e s/NAME/$(PROG)/g \ -e s/VER/$(VER)/g \ diff --git a/lfs/cdrom b/lfs/cdrom index 7a7fff166..00f185d81 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -29,15 +29,6 @@ VER = ipfire THISAPP = cdrom TARGET = $(DIR_INFO)/$(THISAPP)
-ifeq "$(BUILD_PLATFORM)" "arm" - TAR_OPTIONS = -else - TAR_OPTIONS = --xz -endif - -# Enable multi-threaded compression for LZMA -export XZ_OPT = --threads=0 - ############################################################################### # Top-level Rules ############################################################################### @@ -81,7 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) tar -x -C /tmp -f /$(SNAME).tar rm -f /$(SNAME).tar @mkdir /tmp/sys - cd /tmp && tar cf /install/cdrom/distro.img $(TAR_OPTIONS) * && rm -rf * + cd /tmp && tar cf - * | xz $(XZ_OPT) > /install/cdrom/distro.img && rm -rf *
# Other files touch /install/cdrom/$(SNAME)-$(VERSION)-core$(CORE).media diff --git a/lfs/cmake b/lfs/cmake index e5977b971..dd0f626a9 100644 --- a/lfs/cmake +++ b/lfs/cmake @@ -24,7 +24,7 @@
include Config
-VER = 3.11.1 +VER = 3.11.2
THISAPP = cmake-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 12a3177477e4e2c7bc514193d421dafe +$(DL_FILE)_MD5 = d2d554c05fc07cfae7846d2aa205f12a
install : $(TARGET)
diff --git a/lfs/core-updates b/lfs/core-updates index 3c847daf2..d34926967 100644 --- a/lfs/core-updates +++ b/lfs/core-updates @@ -26,8 +26,9 @@ include Config
VER = ipfire
-THISAPP = core-updates -TARGET = $(DIR_INFO)/$(THISAPP) +THISAPP = core-updates +TARGET = $(DIR_INFO)/$(THISAPP) +TAR_OPTIONS = --xz
############################################################################### # Top-level Rules @@ -78,7 +79,7 @@ core/%: mv -f /tmp/ROOTFILES /install/packages/package/ROOTFILES tar -p --numeric-owner -x -C /tmp -f /$(SNAME).tar rm -f /$(SNAME).tar - cd /tmp && tar cJf /install/packages/package/files.tar.xz * && rm -rf * + cd /tmp && XZ_OPT="$(XZ_OPT)" tar cJf /install/packages/package/files.tar.xz $(TAR_OPTIONS) * && rm -rf * cat /install/packages/package/ROOTFILES | grep -v "#" > /install/packages/package/ROOTFILES.tmp rm /install/packages/package/ROOTFILES mv /install/packages/package/ROOTFILES.tmp /install/packages/package/ROOTFILES @@ -89,7 +90,7 @@ core/%: #Change xxxKVERxxx to Kernelversion sed -e "s/xxxKVERxxx/$(KVER)/g" -i /install/packages/package/update.sh
- cd /install/packages/package && tar cf ../core-upgrade-$(VERSION)-$$(basename $@).ipfire \ + cd /install/packages/package && XZ_OPT="$(XZ_OPT)" tar cf ../core-upgrade-$(VERSION)-$$(basename $@).ipfire $(TAR_OPTIONS) \ update.sh files.tar.xz ROOTFILES rm -rf /install/packages/package sed -e "s/NAME/core-upgrade/g" \ diff --git a/lfs/flash-images b/lfs/flash-images index 57d600cf0..a5a3c29ce 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -33,7 +33,7 @@ DEVICE = $(shell losetup -f) PART_BOOT = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p1 PART_ROOT = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p3
-IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.gz +IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).2gb-ext4.$(BUILD_ARCH)-full-core$(CORE).img.xz
FSTAB_FMT = UUID=%s %-8s %-4s %-10s %d %d\n
@@ -214,5 +214,5 @@ ifeq "$(BUILD_PLATFORM)" "arm" endif
# Compress Image - pigz -f9 < $(IMG) > $(IMAGE_FILE) + xz $(XZ_OPT) < $(IMG) > $(IMAGE_FILE) rm -rf $(IMG) $(MNThdd) diff --git a/lfs/nano b/lfs/nano index 68759ed05..98dec8897 100644 --- a/lfs/nano +++ b/lfs/nano @@ -24,7 +24,7 @@
include Config
-VER = 2.9.6 +VER = 2.9.7
THISAPP = nano-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 21 +PAK_VER = 22
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8b12ca2e4d33794a9c1794c4c7d84623 +$(DL_FILE)_MD5 = 804a0e91cb11f2e8884aee7bfac2d18d
install : $(TARGET)
diff --git a/lfs/nmap b/lfs/nmap index 1daeb89b0..1d9b33f21 100644 --- a/lfs/nmap +++ b/lfs/nmap @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2017 IPFire Team info@ipfire.org # +# Copyright (C) 2018 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 = 7.40 +VER = 7.70
THISAPP = nmap-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nmap -PAK_VER = 9 +PAK_VER = 10
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9c5a28bfb46228bade82b238408c065e +$(DL_FILE)_MD5 = 84eb6fbe788e0d4918c2b1e39421bf79
install : $(TARGET)
@@ -77,7 +77,11 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --without-nmapfe --without-zenmap --without-ncat + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --without-nmapfe \ + --without-zenmap \ + --without-ncat cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/make.sh b/make.sh index 419f9fa95..d7f56f293 100755 --- a/make.sh +++ b/make.sh @@ -526,6 +526,7 @@ enterchroot() { CCACHE_COMPRESS="${CCACHE_COMPRESS}" \ CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \ KVER="${KVER}" \ + XZ_OPT="${XZ_OPT}" \ $(fake_environ) \ $(qemu_environ) \ "$@" @@ -860,6 +861,15 @@ fi # Get the amount of memory in this build system HOST_MEM=$(system_memory)
+# Checking host memory, tuning XZ_OPT +if [ ${HOST_MEM} -lt 1024 ]; then + exiterror "You will need more than 1GB or host memory to run the build" +fi + +# We compress archives with "xz -8", using all cores and up to 70% of memory +XZ_MEM="$(( HOST_MEM * 7 / 10 ))MiB" +XZ_OPT="-T$(system_processors) -8 --memory=${XZ_MEM}" + if [ -n "${BUILD_ARCH}" ]; then configure_build "${BUILD_ARCH}" else @@ -1557,7 +1567,7 @@ buildpackages() { lfsmake2 flash-images fi
- mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1 + mv $LFS/install/images/{*.iso,*.tgz,*.img.xz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
ipfirepackages
@@ -1760,7 +1770,7 @@ toolchain) buildtoolchain echo "`date -u '+%b %e %T'`: Create toolchain image for ${BUILD_ARCH}" | tee -a $LOGFILE test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains - cd $BASEDIR && XZ_OPT="-T0 -8" tar -Jc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz \ + cd $BASEDIR && XZ_OPT="$(XZ_OPT)" tar -Jc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz --xz \ build/${TOOLS_DIR} build/bin/sh log >> $LOGFILE md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz \ > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.md5 diff --git a/src/installer/hw.c b/src/installer/hw.c index 06bf42b67..add36c8f4 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -436,7 +436,7 @@ static unsigned long long hw_root_size(struct hw_destination* dest) { }
static unsigned long long hw_boot_size(struct hw_destination* dest) { - return MB2BYTES(64); + return MB2BYTES(128); }
static int hw_device_has_p_suffix(const struct hw_destination* dest) {
hooks/post-receive -- IPFire 2.x development tree