[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5fe21ff7e1237d03d96c5adaa954963fcc935c64
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 5fe21ff7e1237d03d96c5adaa954963fcc935c64 (commit) via 1a01c170110374afcc6b7cfe26e63623e4f3aabb (commit) via 17f0593aed127cbe72e28e3b788fc275f2004472 (commit) via 0e331dd73b89f397f893c51447a5237935459fbb (commit) via c0ce138ad29387a8e89ecef81c3ef6db6b047c85 (commit) via 9eb8db8046745c252395ddb9fdbbe755b8e39aae (commit) via a895c5cfc4cb81aff7677b42b689bdb0da4d9c5c (commit) via 99ba4e9224c409630b95b7a16d77a74a028f8690 (commit) via 10d3ead45647d59ff0d76fe901d52315af5ef0df (commit) via b3e35d47800ee193ec373befa117c7c5baf6ff41 (commit) via 9254d56de167329a51d98ad3a1e40b1d9074738f (commit) via bf9a16a4212fb179b3026e5b8eb90a56fda53cd8 (commit) via 7edd993d2573535d24f39dcfcd2977b355ffe4d3 (commit) via e8b2566ebfa9b4e87c6ee76849be626a6ecf7bcc (commit) via 2c7c9996c4c67a7c005b61e09400c1eb2e3252af (commit) via b8df63aeabbd2c54305bc255ae9abf7d67251d7c (commit) via da34ac1f812efc7bf5cd0e7b76fef4aefed4f246 (commit) via 9a3d6f5ad10c81768337f3a8c11dd0c128f908fd (commit) via 3f7d9a96138656d2fd54b1ea74c58adcee5056b3 (commit) via 3fd3d535556fc6a92d73682b379c8440bb569de7 (commit) via 345124fb3dee5d1a1e929227512e1708ff637cd5 (commit) via ceb64d792d9c0b64488e344282a7628ce4b951e5 (commit) via cb60c22534e466715768e441c3cf7b1ead80dc44 (commit) via 191e9a0c964df070d3e63dd49d88dbe3664056f9 (commit) via 8c80423c129f632712cc9a43c7be2e9c0d75b698 (commit) via 898f08edf49116bb95b8bb05f50b00593ca7acbf (commit) via 61c29b32d1be54756f63bf7697fc08bde7dae93d (commit) via ba85a1beb487854a14cbb288b436d6a88265a126 (commit) via 1f8ea39aca5468191ebb05ad23576f2d1bf43f1c (commit) via b1ad1b744f845e8d574af8bcd03f4590f6bd9ccc (commit) via 6deed5addbf2ecc899fc4420469372fc98194aee (commit) via 9d1da799fa7f2b07c742f1bcb7a7970c70050b25 (commit) via bc3dd1e975d420cc54d2d2dce831d13e2a9ccad3 (commit) via 6c96e0499b95151afe0f72f628a3c9b2bfbec25c (commit) via 0c1b7071ec5fc4ada96998dce0b1141a39b874be (commit) via 14c33f6393464991e38a6428a1361f1c9360a066 (commit) via dc1d8fe731abec4a99be141e08054cc6647de745 (commit) via 8d29504c4dff83e31beb0791d5a9654499ae5ac8 (commit) via 4d88659446676f9034b04828062cd8303cb2a4b3 (commit) via 4db4bc1b1b57dd1f28b6d37d20fe851cbcdfbeb0 (commit) via 4091a94508e8d4485c98dd64c5a3fe1c7282986c (commit) from aa1c6e9fa84c10120491f92254a59d70f8efeaa5 (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 5fe21ff7e1237d03d96c5adaa954963fcc935c64 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 3 00:05:53 2014 +0100
Add daq update to Core Update 87
commit 1a01c170110374afcc6b7cfe26e63623e4f3aabb Merge: 17f0593 4db4bc1 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 3 00:05:26 2014 +0100
Merge remote-tracking branch 'mfischer/daq' into next
commit 17f0593aed127cbe72e28e3b788fc275f2004472 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 3 00:04:42 2014 +0100
Add snort update to Core Update 87
commit 0e331dd73b89f397f893c51447a5237935459fbb Merge: c0ce138 8d29504 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 3 00:04:05 2014 +0100
Merge remote-tracking branch 'mfischer/snort' into next
commit c0ce138ad29387a8e89ecef81c3ef6db6b047c85 Merge: 9eb8db8 dc1d8fe Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 3 00:02:49 2014 +0100
Merge remote-tracking branch 'mfischer/mc' into next
commit 9eb8db8046745c252395ddb9fdbbe755b8e39aae Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 3 00:01:31 2014 +0100
Add pcre update to Core Update 87
commit a895c5cfc4cb81aff7677b42b689bdb0da4d9c5c Merge: 99ba4e9 898f08e Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 3 00:01:17 2014 +0100
Merge remote-tracking branch 'mfischer/pcre' into next
commit 99ba4e9224c409630b95b7a16d77a74a028f8690 Merge: 10d3ead 0c1b707 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Dec 3 00:00:32 2014 +0100
Merge remote-tracking branch 'mfischer/tcpdump' into next
commit 10d3ead45647d59ff0d76fe901d52315af5ef0df Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 2 23:59:38 2014 +0100
Add zlib update to Core Update 87
commit b3e35d47800ee193ec373befa117c7c5baf6ff41 Merge: 9254d56 6c96e04 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 2 23:59:26 2014 +0100
Merge remote-tracking branch 'mfischer/zlib' into next
commit 9254d56de167329a51d98ad3a1e40b1d9074738f Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 2 23:58:35 2014 +0100
Add squid update to Core Update 87
commit bf9a16a4212fb179b3026e5b8eb90a56fda53cd8 Merge: 7edd993 bc3dd1e Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 2 23:57:35 2014 +0100
Merge remote-tracking branch 'mfischer/squid' into next
commit 7edd993d2573535d24f39dcfcd2977b355ffe4d3 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 2 23:56:52 2014 +0100
Add smartmontools update to Core Update 87
commit e8b2566ebfa9b4e87c6ee76849be626a6ecf7bcc Merge: 2c7c999 6deed5a Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 2 23:56:36 2014 +0100
Merge remote-tracking branch 'mfischer/smartmontools' into next
commit 2c7c9996c4c67a7c005b61e09400c1eb2e3252af Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 2 23:53:47 2014 +0100
Add libpcap update to Core Update 87
commit b8df63aeabbd2c54305bc255ae9abf7d67251d7c Merge: da34ac1 61c29b3 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 2 23:52:36 2014 +0100
Merge remote-tracking branch 'mfischer/libpcap' into next
commit da34ac1f812efc7bf5cd0e7b76fef4aefed4f246 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 2 23:52:06 2014 +0100
Add wget update to Core Update 87
commit 9a3d6f5ad10c81768337f3a8c11dd0c128f908fd Merge: 3f7d9a9 1f8ea39 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 2 23:51:49 2014 +0100
Merge remote-tracking branch 'mfischer/wget' into next
Conflicts: make.sh
commit 3f7d9a96138656d2fd54b1ea74c58adcee5056b3 Merge: 3fd3d53 ba85a1b Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 2 23:50:17 2014 +0100
Merge remote-tracking branch 'mfischer/htop' into next
commit 3fd3d535556fc6a92d73682b379c8440bb569de7 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 2 23:39:57 2014 +0100
Add ethtool update to Core Update 87
commit 345124fb3dee5d1a1e929227512e1708ff637cd5 Merge: ceb64d7 191e9a0 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 2 23:38:46 2014 +0100
Merge remote-tracking branch 'mfischer/ethtool' into next
commit ceb64d792d9c0b64488e344282a7628ce4b951e5 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 2 23:36:24 2014 +0100
Add tar update to Core Update 87
commit cb60c22534e466715768e441c3cf7b1ead80dc44 Merge: aa1c6e9 8c80423 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Dec 2 23:36:04 2014 +0100
Merge remote-tracking branch 'mfischer/tar' into next
commit 191e9a0c964df070d3e63dd49d88dbe3664056f9 Author: Matthias Fischer fischerm@ipfire.org Date: Sun Nov 23 14:30:47 2014 +0100
ethtool: Update to 3.16
commit 8c80423c129f632712cc9a43c7be2e9c0d75b698 Author: Matthias Fischer fischerm@ipfire.org Date: Sat Nov 22 23:43:46 2014 +0100
tar: Update to 1.28
commit 898f08edf49116bb95b8bb05f50b00593ca7acbf Author: Matthias Fischer fischerm@ipfire.org Date: Sat Nov 22 18:43:11 2014 +0100
Changed configure-option: '--enable-jit' => '--disable-jit'
Reason: The latest version of pcre comes with a JIT compiler for regular expressions. The implementation of that requires that memory is writable and executable at the same time which is not allowed by grsecurity.
commit 61c29b32d1be54756f63bf7697fc08bde7dae93d Author: Matthias Fischer fischerm@ipfire.org Date: Wed Nov 19 18:29:24 2014 +0100
libpcap: rootfile update (1.6.2)
commit ba85a1beb487854a14cbb288b436d6a88265a126 Author: Matthias Fischer fischerm@ipfire.org Date: Tue Nov 11 20:41:10 2014 +0100
htop: Update to 1.0.3
commit 1f8ea39aca5468191ebb05ad23576f2d1bf43f1c Author: Matthias Fischer fischerm@ipfire.org Date: Tue Nov 11 18:40:52 2014 +0100
wget: deleted obsolete patch-file
commit b1ad1b744f845e8d574af8bcd03f4590f6bd9ccc Author: Matthias Fischer fischerm@ipfire.org Date: Sun Nov 9 12:11:21 2014 +0100
libpcap: Update to 1.6.2, added --enable-bluetooth=no
commit 6deed5addbf2ecc899fc4420469372fc98194aee Author: Matthias Fischer fischerm@ipfire.org Date: Fri Nov 7 12:47:08 2014 +0100
smartmontools: Update to 6.3
commit 9d1da799fa7f2b07c742f1bcb7a7970c70050b25 Author: Matthias Fischer fischerm@ipfire.org Date: Thu Nov 6 23:53:01 2014 +0100
wget: Update to 1.16
commit bc3dd1e975d420cc54d2d2dce831d13e2a9ccad3 Author: Matthias Fischer fischerm@ipfire.org Date: Thu Nov 6 07:33:45 2014 +0100
Update: squid to 3.4.9
commit 6c96e0499b95151afe0f72f628a3c9b2bfbec25c Author: Matthias Fischer fischerm@ipfire.org Date: Wed Nov 5 21:48:57 2014 +0100
Update: zlib to 1.2.8
commit 0c1b7071ec5fc4ada96998dce0b1141a39b874be Author: Matthias Fischer fischerm@ipfire.org Date: Wed Nov 5 21:46:16 2014 +0100
Update: tcpdump to 4.6.2
commit 14c33f6393464991e38a6428a1361f1c9360a066 Author: Matthias Fischer fischerm@ipfire.org Date: Wed Nov 5 21:41:43 2014 +0100
Update: pcre to 8.36
commit dc1d8fe731abec4a99be141e08054cc6647de745 Author: Matthias Fischer fischerm@ipfire.org Date: Wed Nov 5 21:23:44 2014 +0100
Update: Midnight Commander to 4.8.13
commit 8d29504c4dff83e31beb0791d5a9654499ae5ac8 Author: Matthias Fischer fischerm@ipfire.org Date: Wed Nov 5 19:20:59 2014 +0100
snort: Update urls for rules download (2.9.7.0) in 'ids.cgi'
commit 4d88659446676f9034b04828062cd8303cb2a4b3 Author: Matthias Fischer fischerm@ipfire.org Date: Wed Nov 5 19:17:53 2014 +0100
snort: Update to 2.9.7.0
commit 4db4bc1b1b57dd1f28b6d37d20fe851cbcdfbeb0 Author: Matthias Fischer fischerm@ipfire.org Date: Wed Nov 5 19:02:32 2014 +0100
daq: Update to 2.0.4
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/daq | 2 +- config/rootfiles/common/libpcap | 15 +++++--- config/rootfiles/common/pcre | 42 ++++++++++++++++++++-- config/rootfiles/common/tar | 4 +++ config/rootfiles/common/zlib | 3 +- .../{oldcore/44 => core/87}/filelists/daq | 0 .../{oldcore/52 => core/87}/filelists/ethtool | 0 .../{oldcore/28 => core/87}/filelists/libpcap | 0 .../{oldcore/38 => core/87}/filelists/pcre | 0 .../34 => core/87}/filelists/smartmontools | 0 .../{oldcore/28 => core/87}/filelists/snort | 0 .../{oldcore/32 => core/87}/filelists/squid | 0 .../{oldcore/28 => core/87}/filelists/tar | 0 .../{oldcore/66 => core/87}/filelists/wget | 0 .../{oldcore/38 => core/87}/filelists/zlib | 0 html/cgi-bin/ids.cgi | 6 ++-- lfs/daq | 4 +-- lfs/ethtool | 8 ++--- lfs/htop | 8 ++--- lfs/libpcap | 11 +++--- lfs/mc | 6 ++-- lfs/pcre | 6 ++-- lfs/smartmontools | 6 ++-- lfs/snort | 4 +-- lfs/squid | 4 +-- lfs/tar | 6 ++-- lfs/tcpdump | 6 ++-- lfs/wget | 8 ++--- lfs/zlib | 4 +-- src/patches/wget-1.14-texi2pod-1.patch | 32 ----------------- 30 files changed, 100 insertions(+), 85 deletions(-) copy config/rootfiles/{oldcore/44 => core/87}/filelists/daq (100%) copy config/rootfiles/{oldcore/52 => core/87}/filelists/ethtool (100%) copy config/rootfiles/{oldcore/28 => core/87}/filelists/libpcap (100%) copy config/rootfiles/{oldcore/38 => core/87}/filelists/pcre (100%) copy config/rootfiles/{oldcore/34 => core/87}/filelists/smartmontools (100%) copy config/rootfiles/{oldcore/28 => core/87}/filelists/snort (100%) copy config/rootfiles/{oldcore/32 => core/87}/filelists/squid (100%) copy config/rootfiles/{oldcore/28 => core/87}/filelists/tar (100%) copy config/rootfiles/{oldcore/66 => core/87}/filelists/wget (100%) copy config/rootfiles/{oldcore/38 => core/87}/filelists/zlib (100%) delete mode 100644 src/patches/wget-1.14-texi2pod-1.patch
Difference in files: diff --git a/config/rootfiles/common/daq b/config/rootfiles/common/daq index b8a9fd4..6c156e3 100644 --- a/config/rootfiles/common/daq +++ b/config/rootfiles/common/daq @@ -21,7 +21,7 @@ usr/lib/daq #usr/lib/libdaq.la #usr/lib/libdaq.so usr/lib/libdaq.so.2 -usr/lib/libdaq.so.2.0.2 +usr/lib/libdaq.so.2.0.4 #usr/lib/libdaq_static.a #usr/lib/libdaq_static.la #usr/lib/libdaq_static_modules.a diff --git a/config/rootfiles/common/libpcap b/config/rootfiles/common/libpcap index 52169a7..b8e9648 100644 --- a/config/rootfiles/common/libpcap +++ b/config/rootfiles/common/libpcap @@ -1,13 +1,13 @@ #usr/bin/pcap-config #usr/include/pcap -#usr/include/pcap/bluetooth.h #usr/include/pcap-bpf.h -#usr/include/pcap-int.h -#usr/include/pcap/ipnet.h #usr/include/pcap-namedb.h #usr/include/pcap.h +#usr/include/pcap/bluetooth.h #usr/include/pcap/bpf.h +#usr/include/pcap/ipnet.h #usr/include/pcap/namedb.h +#usr/include/pcap/nflog.h #usr/include/pcap/pcap.h #usr/include/pcap/sll.h #usr/include/pcap/usb.h @@ -15,7 +15,7 @@ #usr/lib/libpcap.a usr/lib/libpcap.so usr/lib/libpcap.so.1 -usr/lib/libpcap.so.1.4.0 +usr/lib/libpcap.so.1.6.2 #usr/share/man/man1/pcap-config.1 #usr/share/man/man3/pcap.3pcap #usr/share/man/man3/pcap_activate.3pcap @@ -40,11 +40,13 @@ usr/lib/libpcap.so.1.4.0 #usr/share/man/man3/pcap_fileno.3pcap #usr/share/man/man3/pcap_findalldevs.3pcap #usr/share/man/man3/pcap_fopen_offline.3pcap +#usr/share/man/man3/pcap_fopen_offline_with_tstamp_precision.3pcap #usr/share/man/man3/pcap_free_datalinks.3pcap #usr/share/man/man3/pcap_free_tstamp_types.3pcap #usr/share/man/man3/pcap_freealldevs.3pcap #usr/share/man/man3/pcap_freecode.3pcap #usr/share/man/man3/pcap_get_selectable_fd.3pcap +#usr/share/man/man3/pcap_get_tstamp_precision.3pcap #usr/share/man/man3/pcap_geterr.3pcap #usr/share/man/man3/pcap_getnonblock.3pcap #usr/share/man/man3/pcap_inject.3pcap @@ -61,16 +63,20 @@ usr/lib/libpcap.so.1.4.0 #usr/share/man/man3/pcap_next_ex.3pcap #usr/share/man/man3/pcap_offline_filter.3pcap #usr/share/man/man3/pcap_open_dead.3pcap +#usr/share/man/man3/pcap_open_dead_with_tstamp_precision.3pcap #usr/share/man/man3/pcap_open_live.3pcap #usr/share/man/man3/pcap_open_offline.3pcap +#usr/share/man/man3/pcap_open_offline_with_tstamp_precision.3pcap #usr/share/man/man3/pcap_perror.3pcap #usr/share/man/man3/pcap_sendpacket.3pcap #usr/share/man/man3/pcap_set_buffer_size.3pcap #usr/share/man/man3/pcap_set_datalink.3pcap +#usr/share/man/man3/pcap_set_immediate_mode.3pcap #usr/share/man/man3/pcap_set_promisc.3pcap #usr/share/man/man3/pcap_set_rfmon.3pcap #usr/share/man/man3/pcap_set_snaplen.3pcap #usr/share/man/man3/pcap_set_timeout.3pcap +#usr/share/man/man3/pcap_set_tstamp_precision.3pcap #usr/share/man/man3/pcap_set_tstamp_type.3pcap #usr/share/man/man3/pcap_setdirection.3pcap #usr/share/man/man3/pcap_setfilter.3pcap @@ -80,6 +86,7 @@ usr/lib/libpcap.so.1.4.0 #usr/share/man/man3/pcap_statustostr.3pcap #usr/share/man/man3/pcap_strerror.3pcap #usr/share/man/man3/pcap_tstamp_type_name_to_val.3pcap +#usr/share/man/man3/pcap_tstamp_type_val_to_description.3pcap #usr/share/man/man3/pcap_tstamp_type_val_to_name.3pcap #usr/share/man/man5/pcap-savefile.5 #usr/share/man/man7/pcap-filter.7 diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre index 5c29270..78ac2a2 100644 --- a/config/rootfiles/common/pcre +++ b/config/rootfiles/common/pcre @@ -10,15 +10,15 @@ #usr/lib/libpcre.la usr/lib/libpcre.so usr/lib/libpcre.so.1 -usr/lib/libpcre.so.1.0.1 +usr/lib/libpcre.so.1.2.4 #usr/lib/libpcrecpp.la usr/lib/libpcrecpp.so usr/lib/libpcrecpp.so.0 -usr/lib/libpcrecpp.so.0.0.0 +usr/lib/libpcrecpp.so.0.0.1 #usr/lib/libpcreposix.la usr/lib/libpcreposix.so usr/lib/libpcreposix.so.0 -usr/lib/libpcreposix.so.0.0.1 +usr/lib/libpcreposix.so.0.0.3 #usr/lib/pkgconfig/libpcre.pc #usr/lib/pkgconfig/libpcrecpp.pc #usr/lib/pkgconfig/libpcreposix.pc @@ -30,10 +30,13 @@ usr/lib/libpcreposix.so.0.0.1 #usr/share/doc/pcre/NEWS #usr/share/doc/pcre/README #usr/share/doc/pcre/html +#usr/share/doc/pcre/html/NON-AUTOTOOLS-BUILD.txt +#usr/share/doc/pcre/html/README.txt #usr/share/doc/pcre/html/index.html #usr/share/doc/pcre/html/pcre-config.html #usr/share/doc/pcre/html/pcre.html #usr/share/doc/pcre/html/pcre16.html +#usr/share/doc/pcre/html/pcre32.html #usr/share/doc/pcre/html/pcre_assign_jit_stack.html #usr/share/doc/pcre/html/pcre_compile.html #usr/share/doc/pcre/html/pcre_compile2.html @@ -51,6 +54,7 @@ usr/lib/libpcreposix.so.0.0.1 #usr/share/doc/pcre/html/pcre_get_stringtable_entries.html #usr/share/doc/pcre/html/pcre_get_substring.html #usr/share/doc/pcre/html/pcre_get_substring_list.html +#usr/share/doc/pcre/html/pcre_jit_exec.html #usr/share/doc/pcre/html/pcre_jit_stack_alloc.html #usr/share/doc/pcre/html/pcre_jit_stack_free.html #usr/share/doc/pcre/html/pcre_maketables.html @@ -58,6 +62,7 @@ usr/lib/libpcreposix.so.0.0.1 #usr/share/doc/pcre/html/pcre_refcount.html #usr/share/doc/pcre/html/pcre_study.html #usr/share/doc/pcre/html/pcre_utf16_to_host_byte_order.html +#usr/share/doc/pcre/html/pcre_utf32_to_host_byte_order.html #usr/share/doc/pcre/html/pcre_version.html #usr/share/doc/pcre/html/pcreapi.html #usr/share/doc/pcre/html/pcrebuild.html @@ -105,6 +110,7 @@ usr/lib/libpcreposix.so.0.0.1 #usr/share/man/man3/pcre16_get_stringtable_entries.3 #usr/share/man/man3/pcre16_get_substring.3 #usr/share/man/man3/pcre16_get_substring_list.3 +#usr/share/man/man3/pcre16_jit_exec.3 #usr/share/man/man3/pcre16_jit_stack_alloc.3 #usr/share/man/man3/pcre16_jit_stack_free.3 #usr/share/man/man3/pcre16_maketables.3 @@ -113,6 +119,33 @@ usr/lib/libpcreposix.so.0.0.1 #usr/share/man/man3/pcre16_study.3 #usr/share/man/man3/pcre16_utf16_to_host_byte_order.3 #usr/share/man/man3/pcre16_version.3 +#usr/share/man/man3/pcre32.3 +#usr/share/man/man3/pcre32_assign_jit_stack.3 +#usr/share/man/man3/pcre32_compile.3 +#usr/share/man/man3/pcre32_compile2.3 +#usr/share/man/man3/pcre32_config.3 +#usr/share/man/man3/pcre32_copy_named_substring.3 +#usr/share/man/man3/pcre32_copy_substring.3 +#usr/share/man/man3/pcre32_dfa_exec.3 +#usr/share/man/man3/pcre32_exec.3 +#usr/share/man/man3/pcre32_free_study.3 +#usr/share/man/man3/pcre32_free_substring.3 +#usr/share/man/man3/pcre32_free_substring_list.3 +#usr/share/man/man3/pcre32_fullinfo.3 +#usr/share/man/man3/pcre32_get_named_substring.3 +#usr/share/man/man3/pcre32_get_stringnumber.3 +#usr/share/man/man3/pcre32_get_stringtable_entries.3 +#usr/share/man/man3/pcre32_get_substring.3 +#usr/share/man/man3/pcre32_get_substring_list.3 +#usr/share/man/man3/pcre32_jit_exec.3 +#usr/share/man/man3/pcre32_jit_stack_alloc.3 +#usr/share/man/man3/pcre32_jit_stack_free.3 +#usr/share/man/man3/pcre32_maketables.3 +#usr/share/man/man3/pcre32_pattern_to_host_byte_order.3 +#usr/share/man/man3/pcre32_refcount.3 +#usr/share/man/man3/pcre32_study.3 +#usr/share/man/man3/pcre32_utf32_to_host_byte_order.3 +#usr/share/man/man3/pcre32_version.3 #usr/share/man/man3/pcre_assign_jit_stack.3 #usr/share/man/man3/pcre_compile.3 #usr/share/man/man3/pcre_compile2.3 @@ -130,6 +163,7 @@ usr/lib/libpcreposix.so.0.0.1 #usr/share/man/man3/pcre_get_stringtable_entries.3 #usr/share/man/man3/pcre_get_substring.3 #usr/share/man/man3/pcre_get_substring_list.3 +#usr/share/man/man3/pcre_jit_exec.3 #usr/share/man/man3/pcre_jit_stack_alloc.3 #usr/share/man/man3/pcre_jit_stack_free.3 #usr/share/man/man3/pcre_maketables.3 @@ -137,12 +171,14 @@ usr/lib/libpcreposix.so.0.0.1 #usr/share/man/man3/pcre_refcount.3 #usr/share/man/man3/pcre_study.3 #usr/share/man/man3/pcre_utf16_to_host_byte_order.3 +#usr/share/man/man3/pcre_utf32_to_host_byte_order.3 #usr/share/man/man3/pcre_version.3 #usr/share/man/man3/pcreapi.3 #usr/share/man/man3/pcrebuild.3 #usr/share/man/man3/pcrecallout.3 #usr/share/man/man3/pcrecompat.3 #usr/share/man/man3/pcrecpp.3 +#usr/share/man/man3/pcredemo.3 #usr/share/man/man3/pcrejit.3 #usr/share/man/man3/pcrelimits.3 #usr/share/man/man3/pcrematching.3 diff --git a/config/rootfiles/common/tar b/config/rootfiles/common/tar index 9e31cc0..6dbb6ee 100644 --- a/config/rootfiles/common/tar +++ b/config/rootfiles/common/tar @@ -2,4 +2,8 @@ bin/tar #usr/share/info/tar.info #usr/share/info/tar.info-1 #usr/share/info/tar.info-2 +#usr/share/info/tar.info-3 +#usr/share/man/man1/tar.1 +#usr/share/man/man8/rmt.8 #usr/sbin/rmt + diff --git a/config/rootfiles/common/zlib b/config/rootfiles/common/zlib index 13cf704..43c5ac9 100644 --- a/config/rootfiles/common/zlib +++ b/config/rootfiles/common/zlib @@ -1,10 +1,9 @@ lib/libz.so lib/libz.so.1 -lib/libz.so.1.2.7 +lib/libz.so.1.2.8 #usr/include/zconf.h #usr/include/zlib.h #usr/lib/libz.a -#usr/lib/libz.so #usr/lib/pkgconfig #usr/lib/pkgconfig/zlib.pc #usr/share/man/man3/zlib.3 diff --git a/config/rootfiles/core/87/filelists/daq b/config/rootfiles/core/87/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/core/87/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/ethtool b/config/rootfiles/core/87/filelists/ethtool new file mode 120000 index 0000000..494a53e --- /dev/null +++ b/config/rootfiles/core/87/filelists/ethtool @@ -0,0 +1 @@ +../../../common/ethtool \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/libpcap b/config/rootfiles/core/87/filelists/libpcap new file mode 120000 index 0000000..c7f9f52 --- /dev/null +++ b/config/rootfiles/core/87/filelists/libpcap @@ -0,0 +1 @@ +../../../common/libpcap \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/pcre b/config/rootfiles/core/87/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/core/87/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/smartmontools b/config/rootfiles/core/87/filelists/smartmontools new file mode 120000 index 0000000..fb66daf --- /dev/null +++ b/config/rootfiles/core/87/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/snort b/config/rootfiles/core/87/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/core/87/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/squid b/config/rootfiles/core/87/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/87/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/tar b/config/rootfiles/core/87/filelists/tar new file mode 120000 index 0000000..3e585d2 --- /dev/null +++ b/config/rootfiles/core/87/filelists/tar @@ -0,0 +1 @@ +../../../common/tar \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/wget b/config/rootfiles/core/87/filelists/wget new file mode 120000 index 0000000..fcb57df --- /dev/null +++ b/config/rootfiles/core/87/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/87/filelists/zlib b/config/rootfiles/core/87/filelists/zlib new file mode 120000 index 0000000..e345663 --- /dev/null +++ b/config/rootfiles/core/87/filelists/zlib @@ -0,0 +1 @@ +../../../common/zlib \ No newline at end of file diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index ff72b78..5ada911 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -263,9 +263,9 @@ if (-e "/etc/snort/snort.conf") { ####################### End added for snort rules control #################################
if ($snortsettings{'RULES'} eq 'subscripted') { - $url=" https://www.snort.org/rules/snortrules-snapshot-2961.tar.gz?oinkcode=$snorts..."; + $url=" https://www.snort.org/rules/snortrules-snapshot-2970.tar.gz?oinkcode=$snorts..."; } elsif ($snortsettings{'RULES'} eq 'registered') { - $url=" https://www.snort.org/rules/snortrules-snapshot-2961.tar.gz?oinkcode=$snorts..."; + $url=" https://www.snort.org/rules/snortrules-snapshot-2970.tar.gz?oinkcode=$snorts..."; } elsif ($snortsettings{'RULES'} eq 'community') { $url=" https://www.snort.org/rules/community"; } else { @@ -528,7 +528,7 @@ print <<END </tr> <tr> <td><br /> - $Lang::tr{'ids rules license'} <a href='https://www.snort.org/signup' target='_blank'>www.snort.org</a>$Lang::tr{'ids rules license1'}<br /><br /> + $Lang::tr{'ids rules license'} <a href='https://www.snort.org/subscribe' target='_blank'>www.snort.org</a>$Lang::tr{'ids rules license1'}<br /><br /> $Lang::tr{'ids rules license2'} <a href='https://www.snort.org/account/oinkcode' target='_blank'>Get an Oinkcode</a>, $Lang::tr{'ids rules license3'} </td> </tr> diff --git a/lfs/daq b/lfs/daq index fa8f2a8..c58995d 100644 --- a/lfs/daq +++ b/lfs/daq @@ -24,7 +24,7 @@
include Config
-VER = 2.0.2 +VER = 2.0.4
THISAPP = daq-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 865bf9b750a2a2ca632591a3c70b0ea0 +$(DL_FILE)_MD5 = 65e51d72e9d5d8b397e192e4e5857eff
install : $(TARGET)
diff --git a/lfs/ethtool b/lfs/ethtool index 15f0419..16527b6 100644 --- a/lfs/ethtool +++ b/lfs/ethtool @@ -24,10 +24,10 @@
include Config
-VER = 3.0 +VER = 3.16
THISAPP = ethtool-$(VER) -DL_FILE = $(THISAPP).tar.bz2 +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = cb129398cbbf39859901b55ecac101da +$(DL_FILE)_MD5 = 7eee202accb86104adc8463a36a1a468
install : $(TARGET)
@@ -69,7 +69,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/htop b/lfs/htop index c334a91..3e5b532 100644 --- a/lfs/htop +++ b/lfs/htop @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2014 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.0.2 +VER = 1.0.3
THISAPP = htop-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = htop -PAK_VER = 6 +PAK_VER = 7
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0d01cca8df3349c74569cefebbd9919e +$(DL_FILE)_MD5 = e768b9b55c033d9c1dffda72db3a6ac7
install : $(TARGET)
diff --git a/lfs/libpcap b/lfs/libpcap index 0f118a4..07e65cd 100644 --- a/lfs/libpcap +++ b/lfs/libpcap @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2014 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 1.4.0 +VER = 1.6.2
THISAPP = libpcap-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 56e88a5aabdd1e04414985ac24f7e76c +$(DL_FILE)_MD5 = 5f14191c1a684a75532c739c2c4059fa
install : $(TARGET)
@@ -72,7 +72,10 @@ $(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) && ./configure --prefix=/usr + cd $(DIR_APP) && ./configure \ + --prefix=/usr \ + --enable-bluetooth=no + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install @rm -rf $(DIR_APP) diff --git a/lfs/mc b/lfs/mc index ed799be..4dc937c 100644 --- a/lfs/mc +++ b/lfs/mc @@ -24,7 +24,7 @@
include Config
-VER = 4.8.12 +VER = 4.8.13
THISAPP = mc-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = mc -PAK_VER = 9 +PAK_VER = 10
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 7ecccc03df060cd0ca1414a5a14e6649 +$(DL_FILE)_MD5 = d967caa12765eb86e52a6a63ca202500
install : $(TARGET)
diff --git a/lfs/pcre b/lfs/pcre index 5aa40bd..f5c771c 100644 --- a/lfs/pcre +++ b/lfs/pcre @@ -24,7 +24,7 @@
include Config
-VER = 8.31 +VER = 8.36
THISAPP = pcre-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fab1bb3b91a4c35398263a5c1e0858c1 +$(DL_FILE)_MD5 = ff7b4bb14e355f04885cf18ff4125c98
install : $(TARGET)
@@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --prefix=/usr \ --disable-static \ --enable-utf8 \ - --enable-jit \ + --disable-jit \ --enable-unicode-properties cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/smartmontools b/lfs/smartmontools index 196b466..c3ba635 100644 --- a/lfs/smartmontools +++ b/lfs/smartmontools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2014 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 +VER = 6.3
THISAPP = smartmontools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 83a3a681f8183ed858392d550ae1cca6 +$(DL_FILE)_MD5 = 2ea0c62206e110192a97b59291b17f54
install : $(TARGET)
diff --git a/lfs/snort b/lfs/snort index 45c17a8..77d3b0d 100644 --- a/lfs/snort +++ b/lfs/snort @@ -24,7 +24,7 @@
include Config
-VER = 2.9.6.1 +VER = 2.9.7.0
THISAPP = snort-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d7c0f1ddb2e70b70acdaa4664abb5fb0 +$(DL_FILE)_MD5 = c2a45bc56441ee9456478f219dd8d1e2
install : $(TARGET)
diff --git a/lfs/squid b/lfs/squid index 548abd9..67e4a7d 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@
include Config
-VER = 3.4.8 +VER = 3.4.9
THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b0c4335447248810169f58ea4d8b204a +$(DL_FILE)_MD5 = 497e5be7b3430d12667628296760beca
install : $(TARGET)
diff --git a/lfs/tar b/lfs/tar index b1ef2fc..5919b04 100644 --- a/lfs/tar +++ b/lfs/tar @@ -24,7 +24,7 @@
include Config
-VER = 1.22 +VER = 1.28
THISAPP = tar-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -36,7 +36,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) EXTRA_CONFIG = --prefix=/usr --bindir=/bin \ - --libexecdir=/usr/sbin --disable-nls + --libexecdir=/usr/sbin --disable-nls FORCE_UNSAFE_CONFIGURE=1 EXTRA_MAKE = EXTRA_INSTALL = else @@ -54,7 +54,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 07fa517027f426bb80f5f5ff91b63585 +$(DL_FILE)_MD5 = 8f32b2bc1ed7ddf4cf4e4a39711341b0
install : $(TARGET)
diff --git a/lfs/tcpdump b/lfs/tcpdump index 934e851..6fe6f98 100644 --- a/lfs/tcpdump +++ b/lfs/tcpdump @@ -24,7 +24,7 @@
include Config
-VER = 4.4.0 +VER = 4.6.2
THISAPP = tcpdump-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tcpdump -PAK_VER = 3 +PAK_VER = 4
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6f75aabcffd012f73bd7c331bb5d8232 +$(DL_FILE)_MD5 = 74d0d3728b3cdc60db872d842e7f1598
install : $(TARGET)
diff --git a/lfs/wget b/lfs/wget index fd4c947..eef2a25 100644 --- a/lfs/wget +++ b/lfs/wget @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2014 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.14 +VER = 1.16
THISAPP = wget-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 316f6f59292c9098ad81fd54f658c579 +$(DL_FILE)_MD5 = fe102975ab3a6c049777883f1bb9ad07
install : $(TARGET)
@@ -71,8 +71,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/wget-1.14-texi2pod-1.patch - cd $(DIR_APP) && ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/lfs/zlib b/lfs/zlib index 0a2977d..6520a23 100644 --- a/lfs/zlib +++ b/lfs/zlib @@ -24,7 +24,7 @@
include Config
-VER = 1.2.7 +VER = 1.2.8
THISAPP = zlib-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 60df6a37c56e7c1366cca812414f7b85 +$(DL_FILE)_MD5 = 44d667c142d7cda120332623eab69f40
install : $(TARGET)
diff --git a/src/patches/wget-1.14-texi2pod-1.patch b/src/patches/wget-1.14-texi2pod-1.patch deleted file mode 100644 index 700242b..0000000 --- a/src/patches/wget-1.14-texi2pod-1.patch +++ /dev/null @@ -1,32 +0,0 @@ -Submitted By: Ken Moffat <ken at linuxfromscratch dot org> -Date: 2013-06-18 -Initial Package Version: 1.14 -Upstream Status: Submitted -Origin: Arch -Description: Build with perl-5.18. - -http://lists.gnu.org/archive/html/bug-wget/2013-06/msg00046.html - -From 2ed1707b5d8be66feb80cccfe8e11e719b52b99a Mon Sep 17 00:00:00 2001 -From: Dave Reisner dreisner@archlinux.org -Date: Mon, 17 Jun 2013 23:31:46 +0530 -Subject: [PATCH] Fix error in texi2pod intriduced with Perl 5.18 - ---- - -diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl -index 86c4b18..9db6de1 100755 ---- a/doc/texi2pod.pl -+++ b/doc/texi2pod.pl -@@ -291,7 +291,7 @@ while(<$inf>) { - if (defined $1) { - my $thing = $1; - if ($ic =~ /@asis/) { -- $_ = "\n=item $thing\n"; -+ $_ = "\n=item C<$thing>\n"; - } else { - # Entity escapes prevent munging by the <> processing below. - $_ = "\n=item $ic<$thing>\n"; --- -1.8.3.1 -
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org