SF.net SVN: gar:[25104] csw/mgar/pkg/logstash/trunk

[dmichelsen at users.sourceforge.net]

Revision: 25104
          http://sourceforge.net/p/gar/code/25104
Author:   dmichelsen
Date:     2015-06-22 07:12:39 +0000 (Mon, 22 Jun 2015)
Log Message:
-----------
logstash/trunk: Update to 1.5.1

Modified Paths:
--------------
    csw/mgar/pkg/logstash/trunk/Makefile
    csw/mgar/pkg/logstash/trunk/checksums

Modified: csw/mgar/pkg/logstash/trunk/Makefile
===================================================================
--- csw/mgar/pkg/logstash/trunk/Makefile	2015-06-22 07:11:19 UTC (rev 25103)
+++ csw/mgar/pkg/logstash/trunk/Makefile	2015-06-22 07:12:39 UTC (rev 25104)
@@ -2,7 +2,7 @@
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
 NAME = logstash
-VERSION = 1.4.2
+VERSION = 1.5.1
 GARTYPE = v2
 
 DESCRIPTION = A tool for managing events and logs
@@ -21,17 +21,19 @@
 PACKAGES += CSWlogstash
 SPKG_DESC_CSWlogstash = A tool for managing events and logs
 # PKGFILES is catchall
-ARCHALL_CSWlogstash = 1
 RUNTIME_DEP_PKGS_CSWlogstash += CSWjre8
+# This can not be tracked with checkpkg
+CHECKPKG_OVERRIDES_CSWlogstash += surplus-dependency|CSWjre8
 
 # Reorganizing is difficult, delay for now
 CHECKPKG_OVERRIDES_CSWlogstash += discouraged-path-in-pkgmap
+CHECKPKG_OVERRIDES_CSWlogstash += binary-architecture-does-not-match-placement
 
 # We use JRuby, so this is ok
 CHECKPKG_OVERRIDES_CSWlogstash += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191
 
-# This can not be tracked with checkpkg
-CHECKPKG_OVERRIDES_CSWlogstash += surplus-dependency|CSWjre8
+# We don't control the binaries
+CHECKPKG_OVERRIDES_CSWlogstash += bad-rpath-entry
 
 # This is the DTD for SMF
 CHECKPKG_OVERRIDES_CSWlogstash += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/cswlogstash.xml
@@ -47,12 +49,26 @@
 PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/cswlogstash.xml
 PROTOTYPE_CLASS_smf = manifest
 
+REMOVE_FILES-sparc += i386-SunOS
+REMOVE_FILES-sparc += x86_64-SunOS
+REMOVE_FILES-i386 += sparcv9-SunOS
+
+CHECKPKG_OVERRIDES_CSWlogstash += binary-wrong-architecture|file=opt/csw/share/logstash/vendor/jruby/lib/jni/x86_64-SunOS/libjffi-1.2.so|pkginfo-says=sparc|actual-binary=i386
+
+
 include gar/category.mk
 
 install-custom:
 	ginstall -D -m 0755 $(WORKDIR)/logstash $(DESTDIR)$(bindir)/logstash
 	ginstall -d -m 0755 $(DESTDIR)$(sharedstatedir)/logstash
 	cd $(WORKSRC) && tar cf - . | (cd $(DESTDIR)$(sharedstatedir)/logstash; tar xf -)
+	@# Having PPC code in the package confuses checkpkg
+	rm -rf $(DESTDIR)$(sharedstatedir)/logstash/vendor/jruby/lib/jni/Darwin
+	rm -rf $(DESTDIR)$(sharedstatedir)/logstash/vendor/jruby/lib/jni/*-Linux
+	rm -rf $(DESTDIR)$(sharedstatedir)/logstash/vendor/jruby/lib/jni/*-Windows
+	rm -rf $(DESTDIR)$(sharedstatedir)/logstash/vendor/jruby/lib/jni/*-AIX
+	rm -rf $(DESTDIR)$(sharedstatedir)/logstash/vendor/jruby/lib/jni/*-FreeBSD
+	rm -rf $(foreach F,$(REMOVE_FILES-$(GARCH)),$(DESTDIR)$(sharedstatedir)/logstash/vendor/jruby/lib/jni/$$F)
 	ginstall -d -m 0755 $(DESTDIR)$(sysconfdir)/logstash/conf.d
 	ginstall -D -m 0644 $(WORKDIR)/cswlogstash.xml $(DESTDIR)/var/opt/csw/svc/manifest/cswlogstash.xml
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/logstash/trunk/checksums
===================================================================
--- csw/mgar/pkg/logstash/trunk/checksums	2015-06-22 07:11:19 UTC (rev 25103)
+++ csw/mgar/pkg/logstash/trunk/checksums	2015-06-22 07:12:39 UTC (rev 25104)
@@ -1 +1 @@
-6e6be734392e8c7d6d55e23d0bd8d2b3  logstash-1.4.2.tar.gz
+43ec8edb6b0f3defc5337d045ebd8d4c  logstash-1.5.1.tar.gz

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.