* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7b6d2972e358f7042abd3b282a2226670549119d
@ 2019-05-28 12:09 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2019-05-28 12:09 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 8126 bytes --]
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 7b6d2972e358f7042abd3b282a2226670549119d (commit)
via 3c8aa8d75bc63c5958c758756546f9413be47676 (commit)
from 4e54a8e2d6d4286f85a38a492d34452092404b24 (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 7b6d2972e358f7042abd3b282a2226670549119d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue May 28 13:05:50 2019 +0100
strongswan: Update to 5.8.0
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3c8aa8d75bc63c5958c758756546f9413be47676
Author: Erik Kapfer <ummeegge(a)ipfire.org>
Date: Tue May 28 11:38:59 2019 +0200
tshark: Update to 3.0.2
Incl. one vulnerability and several bug fixes. For full overview --> https://www.wireshark.org/docs/relnotes/wireshark-3.0.2.html .
- Disabled geoip support since libmaxminddb is not presant.
- Added dictionary in ROOTFILE to prevent "radius: Could not open file: '/usr/share/wireshark/radius/dictionary' " .
- Added CMAKE build type
- Removed profile examples and htmls completly from ROOTFILE.
Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/strongswan | 1 +
.../{oldcore/106 => core/133}/filelists/strongswan | 0
config/rootfiles/core/133/update.sh | 2 ++
config/rootfiles/packages/tshark | 20 ++++++++++----------
lfs/strongswan | 4 ++--
lfs/tshark | 10 ++++++----
6 files changed, 21 insertions(+), 16 deletions(-)
copy config/rootfiles/{oldcore/106 => core/133}/filelists/strongswan (100%)
Difference in files:
diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index 6981a7ca8..cc6a59e7f 100644
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -168,6 +168,7 @@ usr/libexec/ipsec/charon
usr/libexec/ipsec/scepclient
usr/libexec/ipsec/starter
usr/libexec/ipsec/stroke
+usr/libexec/ipsec/xfrmi
usr/sbin/ipsec
usr/sbin/swanctl
#usr/share/man/man1/pki---acert.1
diff --git a/config/rootfiles/core/133/filelists/strongswan b/config/rootfiles/core/133/filelists/strongswan
new file mode 120000
index 000000000..90c727e26
--- /dev/null
+++ b/config/rootfiles/core/133/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/133/update.sh b/config/rootfiles/core/133/update.sh
index cc9772c35..3b769f42e 100644
--- a/config/rootfiles/core/133/update.sh
+++ b/config/rootfiles/core/133/update.sh
@@ -40,6 +40,7 @@ done
# Stop services
/etc/init.d/squid stop
+/usr/local/bin/ipsecctrl D
# Extract files
extract_files
@@ -59,6 +60,7 @@ telinit u
/usr/local/bin/update-lang-cache
# Start services
+/usr/local/bin/ipsecctrl S
/etc/init.d/suricata restart
/etc/init.d/squid start
diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark
index fde4030a4..816ab920b 100644
--- a/config/rootfiles/packages/tshark
+++ b/config/rootfiles/packages/tshark
@@ -608,10 +608,10 @@ usr/bin/tshark
#usr/include/wireshark/wsutil/xtea.h
#usr/lib/libwireshark.so
usr/lib/libwireshark.so.12
-usr/lib/libwireshark.so.12.0.1
+usr/lib/libwireshark.so.12.0.2
#usr/lib/libwiretap.so
usr/lib/libwiretap.so.9
-usr/lib/libwiretap.so.9.0.1
+usr/lib/libwiretap.so.9.0.2
#usr/lib/libwscodecs.so
usr/lib/libwscodecs.so.2
usr/lib/libwscodecs.so.2.0.0
@@ -628,7 +628,7 @@ usr/lib/libwsutil.so.10.0.0
#usr/lib/wireshark/cmake/UseMakePluginReg.cmake
#usr/lib/wireshark/cmake/WiresharkConfig.cmake
#usr/lib/wireshark/cmake/WiresharkConfigVersion.cmake
-#usr/lib/wireshark/cmake/WiresharkTargets-relwithdebinfo.cmake
+#usr/lib/wireshark/cmake/WiresharkTargets-release.cmake
#usr/lib/wireshark/cmake/WiresharkTargets.cmake
#usr/lib/wireshark/extcap
usr/lib/wireshark/extcap/androiddump
@@ -652,7 +652,7 @@ usr/lib/wireshark/plugins/3.0/epan/unistim.so
usr/lib/wireshark/plugins/3.0/epan/wimax.so
usr/lib/wireshark/plugins/3.0/epan/wimaxasncp.so
usr/lib/wireshark/plugins/3.0/epan/wimaxmacphy.so
-usr/lib/wireshark/plugins/3.0/wiretap
+#usr/lib/wireshark/plugins/3.0/wiretap
usr/lib/wireshark/plugins/3.0/wiretap/usbdump.so
#usr/share/doc/wireshark
#usr/share/doc/wireshark/androiddump.html
@@ -765,10 +765,10 @@ usr/share/wireshark/dtds/xcap-error.dtd
#usr/share/wireshark/pdml2html.xsl
#usr/share/wireshark/profiles
#usr/share/wireshark/profiles/Bluetooth
-usr/share/wireshark/profiles/Bluetooth/colorfilters
-usr/share/wireshark/profiles/Bluetooth/preferences
+#usr/share/wireshark/profiles/Bluetooth/colorfilters
+#usr/share/wireshark/profiles/Bluetooth/preferences
#usr/share/wireshark/profiles/Classic
-usr/share/wireshark/profiles/Classic/colorfilters
+#usr/share/wireshark/profiles/Classic/colorfilters
#usr/share/wireshark/profiles/No
#Reassembly
#usr/share/wireshark/profiles/No
@@ -776,7 +776,7 @@ usr/share/wireshark/profiles/Classic/colorfilters
#usr/share/wireshark/radius
#usr/share/wireshark/radius/README.radius_dictionary
usr/share/wireshark/radius/custom.includes
-#usr/share/wireshark/radius/dictionary
+usr/share/wireshark/radius/dictionary
usr/share/wireshark/radius/dictionary.3com
usr/share/wireshark/radius/dictionary.3gpp
usr/share/wireshark/radius/dictionary.3gpp2
@@ -994,7 +994,7 @@ usr/share/wireshark/tpncp/tpncp.dat
#usr/share/wireshark/wimaxasncp
usr/share/wireshark/wimaxasncp/dictionary.dtd
usr/share/wireshark/wimaxasncp/dictionary.xml
-usr/share/wireshark/wireshark-filter.html
-usr/share/wireshark/wireshark.html
+#usr/share/wireshark/wireshark-filter.html
+#usr/share/wireshark/wireshark.html
usr/share/wireshark/wka
usr/share/wireshark/ws.css
diff --git a/lfs/strongswan b/lfs/strongswan
index 714537e36..e326886cf 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
include Config
-VER = 5.7.2
+VER = 5.8.0
THISAPP = strongswan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 618de96dc2a506f82a162a5abf9263d4
+$(DL_FILE)_MD5 = e05f2d16a7479a2a9591609c256d523a
install : $(TARGET)
diff --git a/lfs/tshark b/lfs/tshark
index a978cf73c..58c276e25 100644
--- a/lfs/tshark
+++ b/lfs/tshark
@@ -24,7 +24,7 @@
include Config
-VER = 3.0.1
+VER = 3.0.2
THISAPP = wireshark-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tshark
DEPS = "krb5"
-PAK_VER = 1
+PAK_VER = 2
###############################################################################
# Top-level Rules
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 370a113e1c8ec240c4621cfb5abb0c52
+$(DL_FILE)_MD5 = e344675283d6329a4bc213b621d7f46a
install : $(TARGET)
@@ -80,7 +80,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && mkdir build
cd $(DIR_APP)/build && cmake .. \
-DBUILD_wireshark=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_mmdbresolve=OFF
cd $(DIR_APP)/build && make $(PARALELLISMFLAGS)
cd $(DIR_APP)/build && make install
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-05-28 12:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-28 12:09 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7b6d2972e358f7042abd3b282a2226670549119d Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox