Module: check_mk
Branch: master
Commit: 035a5ac08ab749f2fc59698fdf10b2419f95baff
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=035a5ac08ab749…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Fri May 25 14:53:02 2018 +0200
Updated snap7 from 1.3.0 to 1.4.2.
Change-Id: Ia530c951e28e73d6fae3fd3b27983cae9245a94c
---
Makefile | 3 ++-
omd/packages/snap7/.gitignore | 2 +-
omd/packages/snap7/Makefile | 6 +++---
omd/packages/snap7/snap7-full-1.3.0.tar.gz | Bin 39622121 -> 0 bytes
omd/packages/snap7/snap7-full-1.4.2.7z | Bin 0 -> 20591252 bytes
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index b5adbba..3746ffb 100644
--- a/Makefile
+++ b/Makefile
@@ -417,7 +417,8 @@ setup:
direnv \
python-pip \
chrpath \
- enchant
+ enchant \
+ p7zip-full
sudo pip install -U pipenv
$(MAKE) -C omd setup
ifeq ($(ENTERPRISE),yes)
diff --git a/omd/packages/snap7/.gitignore b/omd/packages/snap7/.gitignore
index e5683f0..b13cce2 100644
--- a/omd/packages/snap7/.gitignore
+++ b/omd/packages/snap7/.gitignore
@@ -1 +1 @@
-snap7-full-1.3.0/
+snap7-full-[0-9].[0-9].[0-9]/
diff --git a/omd/packages/snap7/Makefile b/omd/packages/snap7/Makefile
index afb3679..854caaa 100644
--- a/omd/packages/snap7/Makefile
+++ b/omd/packages/snap7/Makefile
@@ -2,8 +2,8 @@ include ../../Makefile.omd
# This package contains the SNAP 7 library (
http://snap7.sourceforge.net/)
NAME = snap7
-VERSION = 1.3.0
-DIR = snap7-full-$(VERSION)
+VERSION = 1.4.2
+DIR = $(NAME)-full-$(VERSION)
ARCH = $(shell uname -m)
ifeq ($(ARCH),i686)
@@ -13,7 +13,7 @@ endif
.PHONY: build install skel clean
build: check-python
- tar xzf $(DIR).tar.gz
+ 7z x $(DIR).7z
cd $(DIR)/build/unix && $(MAKE) -f $(ARCH)_linux.mk
install:
diff --git a/omd/packages/snap7/snap7-full-1.3.0.tar.gz
b/omd/packages/snap7/snap7-full-1.3.0.tar.gz
deleted file mode 100644
index f5fd48a..0000000
Binary files a/omd/packages/snap7/snap7-full-1.3.0.tar.gz and /dev/null differ
diff --git a/omd/packages/snap7/snap7-full-1.4.2.7z
b/omd/packages/snap7/snap7-full-1.4.2.7z
new file mode 100644
index 0000000..96d4565
Binary files /dev/null and b/omd/packages/snap7/snap7-full-1.4.2.7z differ