SF.net SVN: gar:[24982] csw/mgar/pkg

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Sat May 16 17:53:32 CEST 2015


Revision: 24982
          http://sourceforge.net/p/gar/code/24982
Author:   dmichelsen
Date:     2015-05-16 15:53:32 +0000 (Sat, 16 May 2015)
Log Message:
-----------
logstash-forwarder: Initial commit

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

Added Paths:
-----------
    csw/mgar/pkg/logstash-forwarder/
    csw/mgar/pkg/logstash-forwarder/trunk/files/logstash-forwarder.xml

Removed Paths:
-------------
    csw/mgar/pkg/logstash-forwarder/trunk/files/0001-Use-correct-grep.patch
    csw/mgar/pkg/logstash-forwarder/trunk/files/logstash

Modified: csw/mgar/pkg/logstash-forwarder/trunk/Makefile
===================================================================
--- csw/mgar/pkg/logstash/trunk/Makefile	2015-05-15 19:06:43 UTC (rev 24978)
+++ csw/mgar/pkg/logstash-forwarder/trunk/Makefile	2015-05-16 15:53:32 UTC (rev 24982)
@@ -1,48 +1,52 @@
 # $Id$
 # TODO (release-critical prefixed with !, non release-critical with *)
 #
-NAME = logstash
-VERSION = 1.4.2
+NAME = logstash-forwarder
+VERSION = 0.4.0
 GARTYPE = v2
 
-DESCRIPTION = A tool for managing events and logs
+DESCRIPTION = Forward Logs for Logstash
 
-MASTER_SITES = https://download.elasticsearch.org/logstash/logstash/
+MASTER_SITES = https://github.com/elastic/logstash-forwarder/
 DISTFILES += $(DISTNAME).tar.gz
-DISTFILES += logstash
+DISTFILES += logstash-forwarder.xml
 
-PATCHFILES += 0001-Use-correct-grep.patch
+VENDOR_URL = https://github.com/elastic/logstash-forwarder
 
-NOGITPATCH = 1
-
-VENDOR_URL = http://www.logstash.net
-
-PACKAGES += CSWlogstash
-SPKG_DESC_CSWlogstash = A tool for managing events and logs
+PACKAGES += CSWlogstash-forwarder
+SPKG_DESC_CSWlogstash-forwarder = Forward Logs for Logstash
 # PKGFILES is catchall
-ARCHALL_CSWlogstash = 1
-RUNTIME_DEP_PKGS_CSWlogstash += CSWjre8
+RUNTIME_DEP_PKGS_CSWlogstash-forwarder += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlogstash-forwarder += CSWlibgo5
 
-# Reorganizing is difficult, delay for now
-CHECKPKG_OVERRIDES_CSWlogstash += discouraged-path-in-pkgmap
+# Due to the way the headers work only 64 bits is supported
+CHECKPKG_OVERRIDES_CSWlogstash-forwarder += binary-architecture-does-not-match-placement|file=opt/csw/bin/logstash-forwarder|arch_id=43|arch_name=sparcv9
 
-# We use JRuby, so this is ok
-CHECKPKG_OVERRIDES_CSWlogstash += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191
+# This is the DTD for SMF
+CHECKPKG_OVERRIDES_CSWlogstash-forwarder += file-with-bad-content|/usr/share|root/var/opt/csw/svc/manifest/logstash-forwarder.xml
 
-# This can not be tracked with checkpkg
-CHECKPKG_OVERRIDES_CSWlogstash += surplus-dependency|CSWjre8
-
 LICENSE = LICENSE
 
 CONFIGURE_SCRIPTS =
-BUILD_SCRIPTS =
+BUILD_SCRIPTS = custom
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
+PRESERVECONF += $(sysconfdir)/logstash-forwarder/logstash-forwarder.conf
+
+PROTOTYPE_MODIFIERS += smf
+PROTOTYPE_FILES_smf += /var/opt/csw/svc/manifest/logstash-forwarder.xml
+PROTOTYPE_CLASS_smf = manifest
+
 include gar/category.mk
 
+build-custom:
+	cd $(WORKSRC) && LD_OPTIONS="$(LD_OPTIONS)" gccgo -o logstash-forwarder -m64 \
+		version.go syslog.go config.go prospector.go harvester.go filestate_linux.go filecompare.go \
+		event.go spooler.go publisher1.go registrar.go fileinfo_linux.go registrar_other.go logstash-forwarder.go
+
 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 -)
+	ginstall -D -m 0755 $(WORKSRC)/logstash-forwarder $(DESTDIR)$(bindir)/logstash-forwarder
+	ginstall -D -m 0644 $(WORKSRC)/logstash-forwarder.conf.example $(DESTDIR)$(sysconfdir)/logstash-forwarder/logstash-forwarder.conf
+	ginstall -D -m 0644 $(WORKDIR)/logstash-forwarder.xml $(DESTDIR)/var/opt/csw/svc/manifest/logstash-forwarder.xml
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/logstash-forwarder/trunk/checksums
===================================================================
--- csw/mgar/pkg/logstash/trunk/checksums	2015-05-15 19:06:43 UTC (rev 24978)
+++ csw/mgar/pkg/logstash-forwarder/trunk/checksums	2015-05-16 15:53:32 UTC (rev 24982)
@@ -1 +1 @@
-6e6be734392e8c7d6d55e23d0bd8d2b3  logstash-1.4.2.tar.gz
+0831817d12bf3a8cdf86b9a303b964ea  logstash-forwarder-0.4.0.tar.gz

Deleted: csw/mgar/pkg/logstash-forwarder/trunk/files/0001-Use-correct-grep.patch
===================================================================
--- csw/mgar/pkg/logstash/trunk/files/0001-Use-correct-grep.patch	2015-05-15 19:06:43 UTC (rev 24978)
+++ csw/mgar/pkg/logstash-forwarder/trunk/files/0001-Use-correct-grep.patch	2015-05-16 15:53:32 UTC (rev 24982)
@@ -1,32 +0,0 @@
-From 1fbc72d8acbe47f7958470cc5e70a319f5b2b821 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Mon, 4 May 2015 11:46:02 +0200
-Subject: [PATCH] Use correct grep
-
----
- bin/logstash | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/bin/logstash b/bin/logstash
-index b4b2801..89b450f 100755
---- a/bin/logstash
-+++ b/bin/logstash
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- # Run logstash from source
- #
- # This is most useful when done from a git checkout.
-@@ -18,6 +18,9 @@
- # Defaults you can override with environment variables
- LS_HEAP_SIZE="${LS_HEAP_SIZE:=500m}"
- 
-+# We need GNU grep as 'grep'
-+PATH=/opt/csw/gnu:$PATH
-+
- unset CDPATH
- basedir=$(cd `dirname $0`/..; pwd)
- . "${basedir}/bin/logstash.lib.sh"
--- 
-2.3.3
-

Deleted: csw/mgar/pkg/logstash-forwarder/trunk/files/logstash
===================================================================
--- csw/mgar/pkg/logstash/trunk/files/logstash	2015-05-15 19:06:43 UTC (rev 24978)
+++ csw/mgar/pkg/logstash-forwarder/trunk/files/logstash	2015-05-16 15:53:32 UTC (rev 24982)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-JAVA_HOME=/opt/csw/java/jre/jre8
-export JAVA_HOME
-
-cd /opt/csw/share/logstash
-exec bin/logstash "$@"

Copied: csw/mgar/pkg/logstash-forwarder/trunk/files/logstash-forwarder.xml (from rev 24979, csw/mgar/pkg/elasticsearch/trunk/files/cswelasticsearch.xml)
===================================================================
(Binary files differ)

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



More information about the devel mailing list