summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrand Jacquin <bertrand@jacquin.bzh>2016-09-12 22:22:37 +0100
committerPatrice Clement <monsieurp@gentoo.org>2016-10-28 00:12:06 +0200
commitf677a8aa7e37536c3403068ef406788455ed133b (patch)
tree77b5c5ed0d1b4efb9eab57c804898643be65bc6b /net-analyzer/mk-livestatus/files
parentsys-apps/systemd: Raise libseccomp min. version dependency. (diff)
downloadgentoo-f677a8aa7e37536c3403068ef406788455ed133b.tar.gz
gentoo-f677a8aa7e37536c3403068ef406788455ed133b.tar.bz2
gentoo-f677a8aa7e37536c3403068ef406788455ed133b.zip
net-analyzer/mk-livestatus: version bump, move to EAPI 6 and a
bunch of improvements. This commit: * drops unneeded Perl variables. * adds nagios4 USE flag. * blocks sys-apps/ucspi-unix * refreshes patches set with proper git patches. * uses standard emake install. * adds perl README. * installs python README in the right place. * sets Bertrand Jacquin <betrand@jacquin.bzh> as the de-facto maintainer. Gentoo-Bug: https://bugs.gentoo.org/574700 Gentoo-Bug: https://bugs.gentoo.org/574716 Package-Manager: portage-2.2.28 Closes: https://github.com/gentoo/gentoo/pull/2315 Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'net-analyzer/mk-livestatus/files')
-rw-r--r--net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch24
-rw-r--r--net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch34
-rw-r--r--net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p3-no-strip.diff23
-rw-r--r--net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p3-test-RequireRcsKeywords.diff18
4 files changed, 58 insertions, 41 deletions
diff --git a/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch b/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch
new file mode 100644
index 000000000000..5b5009bfaa01
--- /dev/null
+++ b/net-analyzer/mk-livestatus/files/1.2.8_p10-MEDIUM-Drop-default-strip.patch
@@ -0,0 +1,24 @@
+From 1798492a27a1ac3819cb366e1a3e789d663f55a0 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Wed, 21 Aug 2013 23:00:21 +0200
+Subject: [PATCH 1/2] MEDIUM: Drop default strip
+
+See: https://bugs.gentoo.org/show_bug.cgi?id=482026
+
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index deab289..126b503 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -55,7 +55,7 @@ livestatus_so_CFLAGS = -fPIC
+
+ livestatus.o: $(livestatus_so_OBJECTS) $(livestatus_so_DEPENDENCIES)
+ -rm -f plugin.so
+- $(CXX) $(LDFLAGS) -s -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -static-libstdc++
++ $(CXX) $(LDFLAGS) -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -static-libstdc++
+
+ all-local: livestatus.o
+
diff --git a/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch b/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch
new file mode 100644
index 000000000000..264d9bb899b6
--- /dev/null
+++ b/net-analyzer/mk-livestatus/files/1.2.8_p10-MINOR-test-Remove-the-usage-of-Perl-Critic-Policy-Mo.patch
@@ -0,0 +1,34 @@
+From 39cc57667a93f1cf18f935fdfda4d602667c89c8 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Wed, 21 Aug 2013 23:00:21 +0200
+Subject: [PATCH 2/2] MINOR: test: Remove the usage of
+ Perl::Critic::Policy::Modules::ProhibitAutomaticExportation
+
+This does not exist since
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-perl/Perl-Critic/metadata.xml?r1=1.3&r2=1.4
+
+See: https://bugs.gentoo.org/show_bug.cgi?id=482026
+---
+ api/perl/t/perlcriticrc | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/api/perl/t/perlcriticrc b/api/perl/t/perlcriticrc
+index f7e4721..f686dca 100644
+--- a/api/perl/t/perlcriticrc
++++ b/api/perl/t/perlcriticrc
+@@ -133,8 +133,6 @@ severity = 3
+ [Perl::Critic::Policy::Miscellanea::ProhibitTies]
+ severity = 4
+
+-[-Perl::Critic::Policy::Miscellanea::RequireRcsKeywords]
+-
+ [Perl::Critic::Policy::Modules::ProhibitAutomaticExportation]
+ severity = 4
+
+@@ -283,4 +281,4 @@ severity = 5
+ severity = 5
+
+ [Perl::Critic::Policy::Variables::RequireNegativeIndices]
+-severity = 4
+\ No newline at end of file
++severity = 4
diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p3-no-strip.diff b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p3-no-strip.diff
deleted file mode 100644
index a3f81a5054cb..000000000000
--- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p3-no-strip.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/Makefile.am 2013-08-20 14:24:46.000000000 +0200
-+++ src/Makefile.am 2013-08-20 14:25:20.000000000 +0200
-@@ -54,9 +54,9 @@
-
- livecheck$(EXEEXT): livecheck.c strutil.c check_icmp.c
- if HAVE_DIET
-- diet -v $(CC) -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^
-+ diet -v $(CC) -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -o $@ $^
- else
-- $(CC) -x c -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -s -o $@ $^
-+ $(CC) -x c -Wno-deprecated-declarations $(CFLAGS) $(LDFLAGS) -I.. -o $@ $^
- endif
-
- livestatus_so_CXXFLAGS = -I$(top_srcdir)/nagios -fPIC
-@@ -64,7 +64,7 @@
-
- livestatus.o: $(livestatus_so_OBJECTS) $(livestatus_so_DEPENDENCIES)
- -rm -f plugin.so
-- $(CXX) $(LDFLAGS) -s -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -lstdc++
-+ $(CXX) $(LDFLAGS) -fPIC -shared $(livestatus_so_OBJECTS) -o $@ -lpthread -lstdc++
-
- all-local: livestatus.o
-
diff --git a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p3-test-RequireRcsKeywords.diff b/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p3-test-RequireRcsKeywords.diff
deleted file mode 100644
index 95b2830feccf..000000000000
--- a/net-analyzer/mk-livestatus/files/mk-livestatus-1.2.2_p3-test-RequireRcsKeywords.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./api/perl/t/perlcriticrc 2013-08-21 22:37:57.791099241 +0200
-+++ ./api/perl/t/perlcriticrc 2013-08-21 22:38:02.943210061 +0200
-@@ -133,8 +133,6 @@ severity = 3
- [Perl::Critic::Policy::Miscellanea::ProhibitTies]
- severity = 4
-
--[-Perl::Critic::Policy::Miscellanea::RequireRcsKeywords]
--
- [Perl::Critic::Policy::Modules::ProhibitAutomaticExportation]
- severity = 4
-
-@@ -283,4 +281,4 @@ severity = 5
- severity = 5
-
- [Perl::Critic::Policy::Variables::RequireNegativeIndices]
--severity = 4
-\ No newline at end of file
-+severity = 4