Merge pull request #2614 from sebix/pkg-contrib

pkg: package complete contrib dir in new separate package

Author: sebix

CHANGELOG.md

@@ -46,6 +46,7 @@ Please refer to the [NEWS](NEWS.md) for a list of changes which have an affect o
 
 ### Packaging
 - Replace `/opt/intelmq` example paths in bots with variable `VAR_STATE_PATH` for correct paths in LSB-path setups like with packages (PR#2587 by Sebastian Wagner).
+- New deb-package `intelmq-contrib` with all `contrib/` scripts and documentation (PR#2614 by Sebastian Wagner).
 
 ### Tests
 - `intelmq.tests.lib.test_pipeline.TestAmqp.test_acknowledge`: Skip on all Python versions when running on CI (PR#2602 by Sebastian Wagner).

debian/control

@@ -49,6 +49,7 @@ Depends: bash-completion,
          ${misc:Depends},
          ${sphinxdoc:Depends},
          ${python3:Depends}
+Recommends: intelmq-contrib
 Suggests: python3-geoip2 (>= 2.2.0),
           python3-imbox (>= 0.8),
           python3-psycopg2 (>= 2.5.5),
@@ -73,3 +74,20 @@ Description: Solution for IT security teams for collecting and processing securi
  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
+
+Package: intelmq-contrib
+Architecture: all
+Depends: intelmq,
+         ${misc:Depends},
+         ${python3:Depends}
+Suggests:
+Description: Contributed scripts for IntelMQ
+ Extensions, scripts, additional programs and examples
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.

debian/intelmq-contrib.install

@@ -0,0 +1,9 @@
+contrib/eventdb/ /usr/share/intelmq/contrib/
+contrib/example-extension-package/ /usr/share/intelmq/contrib/
+contrib/feeds-config-generator/ /usr/share/intelmq/contrib/
+contrib/logcheck/ /usr/share/intelmq/contrib/
+contrib/logrotate/ /usr/share/intelmq/contrib/
+contrib/malware_name_mapping/ /usr/share/intelmq/contrib/
+contrib/prettyprint/ /usr/share/intelmq/contrib/
+contrib/systemd/ /usr/share/intelmq/contrib/
+contrib/tmpfiles.d/ /usr/share/intelmq/contrib/

debian/rules

@@ -27,6 +27,8 @@ build:
 	# These tests frequently fail on Ubuntu and Debian systems.
 	# On some systems this command will be executed twice, so -f
 	rm -rf intelmq/tests/bots/collectors/tcp/
+	# remove program not needed for packages
+	rm -f intelmq/bin/intelmqsetup
 
 override_dh_auto_build:
 	dh_auto_build
@@ -48,16 +50,14 @@ override_dh_auto_install: $(BOTDOCS)
 		mkdir -p $(DOCS_DIR)/bots/$$(dirname $$readme); \
 		cp intelmq/bots/$$readme $(DOCS_DIR)/bots/$$(dirname $$readme); \
 	done
-	# remove program not needed for packages
-	rm debian/intelmq/usr/bin/intelmqsetup
 	# create directory layout and empty state file
 	ROOT_DIR=debian/intelmq/ PYTHONPATH=. python3 intelmq/bin/intelmqsetup.py --skip-ownership --state-file debian/intelmq/var/lib/intelmq/state.json --skip-api --skip-manager
 
 override_dh_install:
 	dh_install
-	install -Dm 644 contrib/logcheck/ignore debian/intelmq/etc/logcheck/ignore.d.server/intelmq
-	install -Dm 644 contrib/logcheck/violations debian/intelmq/etc/logcheck/violations.d/intelmq
-	install -Dm 644 contrib/logcheck/logcheck.logfiles debian/intelmq/etc/logcheck/logcheck.logfiles.d/intelmq
+	install -Dm 644 contrib/logcheck/ignore debian/intelmq-contrib/etc/logcheck/ignore.d.server/intelmq
+	install -Dm 644 contrib/logcheck/violations debian/intelmq-contrib/etc/logcheck/violations.d/intelmq
+	install -Dm 644 contrib/logcheck/logcheck.logfiles debian/intelmq-contrib/etc/logcheck/logcheck.logfiles.d/intelmq
 
 override_dh_systemd_start:
 	dh_systemd_start --restart-after-upgrade