pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Remove rsyslog7, version 8 is being kept and maintained in sysutils.
Module Name: pkgsrc-wip
Committed By: Filip Hajny <filip%joyent.com@localhost>
Pushed By: fhajny
Date: Thu Jan 28 13:45:55 2016 +0000
Changeset: 917e118b10b8186d8606fc6eeab3ce4cd8c8b02e
Removed Files:
rsyslog7/DESCR
rsyslog7/MESSAGE.NetBSD
rsyslog7/MESSAGE.SunOS
rsyslog7/Makefile
rsyslog7/PLIST
rsyslog7/distinfo
rsyslog7/files/rsyslogd.sh
rsyslog7/files/smf/manifest.xml
rsyslog7/options.mk
rsyslog7/patches/patch-configure
rsyslog7/patches/patch-grammar_lexer.l
rsyslog7/patches/patch-plugins_imuxsock_imuxsock.c
rsyslog7/patches/patch-plugins_mmjsonparse_mmjsonparse.c
rsyslog7/patches/patch-runtime_typedefs.h
Log Message:
Remove rsyslog7, version 8 is being kept and maintained in sysutils.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=917e118b10b8186d8606fc6eeab3ce4cd8c8b02e
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rsyslog7/DESCR | 6 --
rsyslog7/MESSAGE.NetBSD | 11 --
rsyslog7/MESSAGE.SunOS | 9 --
rsyslog7/Makefile | 59 -----------
rsyslog7/PLIST | 49 ---------
rsyslog7/distinfo | 10 --
rsyslog7/files/rsyslogd.sh | 23 -----
rsyslog7/files/smf/manifest.xml | 33 ------
rsyslog7/options.mk | 111 ---------------------
rsyslog7/patches/patch-configure | 14 ---
rsyslog7/patches/patch-grammar_lexer.l | 14 ---
rsyslog7/patches/patch-plugins_imuxsock_imuxsock.c | 16 ---
.../patch-plugins_mmjsonparse_mmjsonparse.c | 14 ---
rsyslog7/patches/patch-runtime_typedefs.h | 15 ---
14 files changed, 384 deletions(-)
diffs:
diff --git a/rsyslog7/DESCR b/rsyslog7/DESCR
deleted file mode 100644
index df353b4..0000000
--- a/rsyslog7/DESCR
+++ /dev/null
@@ -1,6 +0,0 @@
-Rsyslog is an enhanced syslogd supporting, among others, MySQL,
-PostgreSQL, failover log destinations, syslog/tcp, fine grain
-output format control, high precision timestamps, queued operations
-and the ability to filter on any message part. It is quite
-compatible to stock sysklogd and can be used as a drop-in
-replacement.
diff --git a/rsyslog7/MESSAGE.NetBSD b/rsyslog7/MESSAGE.NetBSD
deleted file mode 100644
index bb92a20..0000000
--- a/rsyslog7/MESSAGE.NetBSD
+++ /dev/null
@@ -1,11 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.1 2013/09/11 10:01:56 fhajny Exp $
-
-For simple replacement for syslogd(8), you may put the following lines
-into your /etc/rc.conf:
-
- syslogd=NO
- rsyslogd=YES
- rsyslogd_flags="-c 3 -f /etc/syslog.conf"
-
-===========================================================================
diff --git a/rsyslog7/MESSAGE.SunOS b/rsyslog7/MESSAGE.SunOS
deleted file mode 100644
index 90d917b..0000000
--- a/rsyslog7/MESSAGE.SunOS
+++ /dev/null
@@ -1,9 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.SunOS,v 1.1 2013/09/11 10:01:56 fhajny Exp $
-
-To use rsyslogd on Solaris, you'll need to stop the default syslogd first
-via SMF:
-
- svcadm disable system/system-log
-
-===========================================================================
diff --git a/rsyslog7/Makefile b/rsyslog7/Makefile
deleted file mode 100644
index 4976c17..0000000
--- a/rsyslog7/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2014/09/09 11:32:56 fhajny Exp $
-#
-
-DISTNAME= rsyslog-7.6.3
-PKGREVISION= 2
-CATEGORIES= sysutils
-MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
-
-MAINTAINER= filip%joyent.com@localhost
-HOMEPAGE= http://www.rsyslog.com/
-COMMENT= The enhanced syslogd for Unix
-LICENSE= gnu-gpl-v3
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-testbench
-CONFIGURE_ARGS+= --enable-mmjsonparse --enable-mmnormalize
-CONFIGURE_ARGS+= --enable-cached-man-pages
-CONFIGURE_ARGS+= --enable-imdiag --enable-impstats --enable-omstdout
-CONFIGURE_ARGS+= --enable-diagtools --enable-usertools
-CONFIGURE_ENV+= RST2MAN=touch
-
-USE_LIBTOOL= yes
-USE_TOOLS+= flex pkg-config
-
-SUBST_CLASSES+= paths
-SUBST_STAGE.paths= pre-configure
-SUBST_FILES.paths= tools/rsyslog.conf.5 tools/rsyslogd.8 tools/syslogd.c
-SUBST_SED.paths= -e "s|/etc/rsyslog.conf|${PKG_SYSCONFDIR}/rsyslog.conf|g"
-SUBST_SED.paths+= -e "s|/etc/rsyslogd.conf|${PKG_SYSCONFDIR}/rsyslog.conf|g"
-SUBST_MESSAGE.paths= Fixing paths.
-
-EGDIR= ${PREFIX}/share/examples/rsyslog
-RCD_SCRIPTS= rsyslogd
-
-.include "../../mk/bsd.prefs.mk"
-
-.include "options.mk"
-
-post-install:
- ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${DESTDIR}${EGDIR}/rsyslog.conf
-.if !empty(PKG_OPTIONS:Mmysql)
- ${INSTALL_DATA} ${WRKSRC}/plugins/ommysql/createDB.sql \
- ${DESTDIR}${EGDIR}/createDB-mysql.sql
-.endif
-.if !empty(PKG_OPTIONS:Mpgsql)
- ${INSTALL_DATA} ${WRKSRC}/plugins/ompgsql/createDB.sql \
- ${DESTDIR}${EGDIR}/createDB-pgsql.sql
-.endif
-
-.include "../../wip/libee/buildlink3.mk"
-BUILDLINK_ABI_DEPENDS.libestr+= libestr>=0.1.9
-.include "../../devel/libestr/buildlink3.mk"
-.include "../../sysutils/liblogging/buildlink3.mk"
-.include "../../sysutils/liblognorm/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../textproc/json-c/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/rsyslog7/PLIST b/rsyslog7/PLIST
deleted file mode 100644
index 45409fa..0000000
--- a/rsyslog7/PLIST
+++ /dev/null
@@ -1,49 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2014/08/08 08:03:08 fhajny Exp $
-${PLIST.libgcrypt}bin/rscryutil
-${PLIST.guardtime}bin/rsgtutil
-lib/rsyslog/imdiag.la
-${PLIST.file}lib/rsyslog/imfile.la
-${PLIST.gssapi}lib/rsyslog/imgssapi.la
-${PLIST.klog}lib/rsyslog/imklog.la
-lib/rsyslog/immark.la
-lib/rsyslog/impstats.la
-${PLIST.solaris}lib/rsyslog/imsolaris.la
-lib/rsyslog/imtcp.la
-lib/rsyslog/imudp.la
-lib/rsyslog/imuxsock.la
-${PLIST.libgcrypt}lib/rsyslog/lmcry_gcry.la
-${PLIST.gssapi}lib/rsyslog/lmgssutil.la
-lib/rsyslog/lmnet.la
-lib/rsyslog/lmnetstrms.la
-${PLIST.gnutls}lib/rsyslog/lmnsd_gtls.la
-lib/rsyslog/lmnsd_ptcp.la
-lib/rsyslog/lmregexp.la
-${PLIST.guardtime}lib/rsyslog/lmsig_gt.la
-lib/rsyslog/lmstrmsrv.la
-lib/rsyslog/lmtcpclt.la
-lib/rsyslog/lmtcpsrv.la
-lib/rsyslog/lmzlibw.la
-lib/rsyslog/mmjsonparse.la
-lib/rsyslog/mmnormalize.la
-${PLIST.gssapi}lib/rsyslog/omgssapi.la
-${PLIST.dbi}lib/rsyslog/omlibdbi.la
-${PLIST.mail}lib/rsyslog/ommail.la
-${PLIST.mysql}lib/rsyslog/ommysql.la
-${PLIST.rabbitmq}lib/rsyslog/omrabbitmq.la
-${PLIST.pgsql}lib/rsyslog/ompgsql.la
-lib/rsyslog/omruleset.la
-${PLIST.snmp}lib/rsyslog/omsnmp.la
-lib/rsyslog/omstdout.la
-lib/rsyslog/omtesting.la
-${PLIST.libgcrypt}man/man1/rscryutil.1
-${PLIST.guardtime}man/man1/rsgtutil.1
-man/man5/rsyslog.conf.5
-man/man8/rsyslogd.8
-sbin/msggen
-sbin/rsyslog_diag_hostname
-sbin/rsyslogd
-sbin/zpipe
-share/examples/rc.d/rsyslogd
-${PLIST.mysql}share/examples/rsyslog/createDB-mysql.sql
-${PLIST.pgsql}share/examples/rsyslog/createDB-pgsql.sql
-share/examples/rsyslog/rsyslog.conf
diff --git a/rsyslog7/distinfo b/rsyslog7/distinfo
deleted file mode 100644
index 41de9c5..0000000
--- a/rsyslog7/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.6 2014/08/08 08:03:08 fhajny Exp $
-
-SHA1 (rsyslog-7.6.3.tar.gz) = 1f6ab5eec635adff84361a376663ca7bd7473f5b
-RMD160 (rsyslog-7.6.3.tar.gz) = da63088ae39ff06255ead4411b6534b149ae7937
-Size (rsyslog-7.6.3.tar.gz) = 3052448 bytes
-SHA1 (patch-configure) = a7c1f01b63459d262a0245b814923583ce42c5e2
-SHA1 (patch-grammar_lexer.l) = 73bb9f7f7c8130f2845cdba49f6c2985c08ef80b
-SHA1 (patch-plugins_imuxsock_imuxsock.c) = 924598664fc31993d7fa12a7ed3db92c8c34429d
-SHA1 (patch-plugins_mmjsonparse_mmjsonparse.c) = cc5a4f4a6be9cf2c6aedcaed61600f268235afd4
-SHA1 (patch-runtime_typedefs.h) = 13079505900405bd0db58a5aaaad93df19d0aba8
diff --git a/rsyslog7/files/rsyslogd.sh b/rsyslog7/files/rsyslogd.sh
deleted file mode 100644
index 0adfbfc..0000000
--- a/rsyslog7/files/rsyslogd.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: rsyslogd.sh,v 1.1 2013/09/11 10:01:57 fhajny Exp $
-# NetBSD: syslogd,v 1.15 2004/10/11 13:29:52 lukem Exp
-#
-
-# PROVIDE: rsyslogd
-# REQUIRE: mountcritremote sysdb wscons
-# BEFORE: SERVERS
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="rsyslogd"
-rcvar=$name
-command="@PREFIX@/sbin/${name}"
-pidfile="/var/run/${name}.pid"
-required_files="@PKG_SYSCONFDIR@/rsyslog.conf"
-extra_commands="reload"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/rsyslog7/files/smf/manifest.xml b/rsyslog7/files/smf/manifest.xml
deleted file mode 100644
index c4d1540..0000000
--- a/rsyslog7/files/smf/manifest.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="rsyslog">
- <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
- <create_default_instance enabled="false" />
- <single_instance />
- <dependency name="network" grouping="require_all" restart_on="error" type="service">
- <service_fmri value="svc:/milestone/network:default" />
- </dependency>
- <dependency name="filesystem" grouping="require_all" restart_on="error" type="service">
- <service_fmri value="svc:/system/filesystem/local" />
- </dependency>
- <dependency name="system_log" grouping="exclude_all" restart_on="refresh" type="service">
- <service_fmri value="svc:/system/system-log:default" />
- </dependency>
- <exec_method type="method" name="start" exec="@PREFIX@/sbin/rsyslogd" timeout_seconds="60" />
- <exec_method type="method" name="refresh" exec=":kill -HUP" timeout_seconds="60" />
- <exec_method type="method" name="stop" exec=":kill" timeout_seconds="60" />
- <property_group name="startd" type="framework">
- <propval name="duration" type="astring" value="contract" />
- <propval name="ignore_error" type="astring" value="core,signal" />
- </property_group>
- <property_group name="application" type="application">
- <propval name="config_file" type="astring" value="@PKG_SYSCONFDIR@/rsyslog.conf" />
- </property_group>
- <stability value="Evolving" />
- <template>
- <common_name>
- <loctext xml:lang="C">rsyslog daemon</loctext>
- </common_name>
- </template>
- </service>
-</service_bundle>
diff --git a/rsyslog7/options.mk b/rsyslog7/options.mk
deleted file mode 100644
index 86c43c9..0000000
--- a/rsyslog7/options.mk
+++ /dev/null
@@ -1,111 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2014/08/08 08:03:08 fhajny Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.rsyslog
-PKG_SUPPORTED_OPTIONS= dbi file gnutls gssapi guardtime libgcrypt \
- mail mysql pgsql rabbitmq snmp uuid
-PKG_SUGGESTED_OPTIONS+= libgcrypt uuid
-
-.if ${OPSYS} == "SunOS"
-PKG_SUGGESTED_OPTIONS+= solaris
-.else
-PKG_SUGGESTED_OPTIONS+= klog
-.endif
-
-PKG_OPTIONS_REQUIRED_GROUPS= sysmod
-PKG_OPTIONS_GROUP.sysmod= klog solaris
-
-PLIST_VARS+= dbi file gnutls gssapi guardtime klog libgcrypt \
- mail mysql pgsql rabbitmq snmp solaris
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgnutls)
-.include "../../security/gnutls/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-gnutls
-PLIST.gnutls= yes
-.endif
-
-.if !empty(PKG_OPTIONS:Mgssapi)
-.include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+= --enable-gssapi-krb5
-PLIST.gssapi= yes
-.endif
-
-.if !empty(PKG_OPTIONS:Mmail)
-CONFIGURE_ARGS+= --enable-mail
-PLIST.mail= yes
-.endif
-
-.if !empty(PKG_OPTIONS:Mmysql)
-.include "../../mk/mysql.buildlink3.mk"
-CONFIGURE_ARGS+= --enable-mysql
-PLIST.mysql= yes
-.endif
-
-.if !empty(PKG_OPTIONS:Mpgsql)
-.include "../../mk/pgsql.buildlink3.mk"
-CONFIGURE_ARGS+= --enable-pgsql
-PLIST.pgsql= yes
-.endif
-
-.if !empty(PKG_OPTIONS:Msnmp)
-.include "../../net/net-snmp/buildlink3.mk"
-CONFIGURE_ARGS+= --enable-snmp
-PLIST.snmp= yes
-.endif
-
-.if !empty(PKG_OPTIONS:Mklog)
-CONFIGURE_ARGS+= --enable-klog
-PLIST.klog= yes
-RSYSLOG_SYSMOD= klog
-.else
-CONFIGURE_ARGS+= --disable-klog
-.endif
-
-.if !empty(PKG_OPTIONS:Msolaris)
-CONFIGURE_ARGS+= --enable-imsolaris
-PLIST.solaris= yes
-RSYSLOG_SYSMOD= solaris
-.endif
-
-.if !empty(PKG_OPTIONS:Mfile)
-CONFIGURE_ARGS+= --enable-imfile
-PLIST.file= yes
-.endif
-
-.if !empty(PKG_OPTIONS:Mdbi)
-CONFIGURE_ARGS+= --enable-libdbi
-PLIST.dbi= yes
-.include "../../databases/libdbi/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mguardtime)
-CONFIGURE_ARGS+= --enable-guardtime
-CONFIGURE_ENV+= GUARDTIME_CFLAGS=-I/opt/local/include
-CONFIGURE_ENV+= GUARDTIME_LIBS='-L${BUILDLINK_PREFIX.libguardtime}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libguardtime}/lib -lgthttp -lgtbase -lcurl -lcrypto -lrt'
-PLIST.guardtime= yes
-.include "../../security/libguardtime/buildlink3.mk"
-.endif
-
-.if !empty(PKG_OPTIONS:Mlibgcrypt)
-CONFIGURE_ARGS+= --enable-libgcrypt
-PLIST.libgcrypt= yes
-.include "../../security/libgcrypt/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-libgcrypt
-.endif
-
-.if !empty(PKG_OPTIONS:Muuid)
-CONFIGURE_ARGS+= --enable-uuid
-.include "../../devel/libuuid/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-uuid
-.endif
-
-.if !empty(PKG_OPTIONS:Mrabbitmq)
-CONFIGURE_ARGS+= --enable-omrabbitmq
-PLIST.rabbitmq= yes
-.include "../../net/rabbitmq-c/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --disable-omrabbitmq
-.endif
diff --git a/rsyslog7/patches/patch-configure b/rsyslog7/patches/patch-configure
deleted file mode 100644
index 7173bb7..0000000
--- a/rsyslog7/patches/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-configure,v 1.2 2014/07/22 07:44:55 fhajny Exp $
-
-Portability.
---- configure.orig 2014-03-25 20:39:50.000000000 +0000
-+++ configure
-@@ -19002,7 +19002,7 @@ $as_echo "no" >&6; }
- fi
-
-
-- if test "x${RST2MAN}" == "x"; then
-+ if test "x${RST2MAN}" = "x"; then
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- as_fn_error $? "rst2man not found in PATH
diff --git a/rsyslog7/patches/patch-grammar_lexer.l b/rsyslog7/patches/patch-grammar_lexer.l
deleted file mode 100644
index 521125a..0000000
--- a/rsyslog7/patches/patch-grammar_lexer.l
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-grammar_lexer.l,v 1.2 2014/07/22 07:44:55 fhajny Exp $
-
-Fix build on other BSDs.
---- grammar/lexer.l.orig 2014-02-12 13:17:50.000000000 +0000
-+++ grammar/lexer.l
-@@ -88,7 +88,7 @@ extern int yydebug;
- /* somehow, I need these prototype even though the headers are
- * included. I guess that's some autotools magic I don't understand...
- */
--#if !defined(__FreeBSD__)
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__DragonflyBSD__)
- int fileno(FILE *stream);
- #endif
-
diff --git a/rsyslog7/patches/patch-plugins_imuxsock_imuxsock.c b/rsyslog7/patches/patch-plugins_imuxsock_imuxsock.c
deleted file mode 100644
index 9e641bb..0000000
--- a/rsyslog7/patches/patch-plugins_imuxsock_imuxsock.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-plugins_imuxsock_imuxsock.c,v 1.1 2014/07/28 10:50:44 fhajny Exp $
-
-Define _XPG4_2 on SunOS to pick up CMSG_* macros.
-
---- plugins/imuxsock/imuxsock.c.orig 2013-09-03 10:31:42.000000000 +0000
-+++ plugins/imuxsock/imuxsock.c
-@@ -25,6 +25,9 @@
- *
- * A copy of the GPL can be found in the file "COPYING" in this distribution.
- */
-+#ifdef __sun
-+#define _XPG4_2
-+#endif
- #include "config.h"
- #include "rsyslog.h"
- #include <stdlib.h>
diff --git a/rsyslog7/patches/patch-plugins_mmjsonparse_mmjsonparse.c b/rsyslog7/patches/patch-plugins_mmjsonparse_mmjsonparse.c
deleted file mode 100644
index 926eee6..0000000
--- a/rsyslog7/patches/patch-plugins_mmjsonparse_mmjsonparse.c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-plugins_mmjsonparse_mmjsonparse.c,v 1.1 2014/08/08 08:03:08 fhajny Exp $
-
-Fix for json-c>0.11.
---- plugins/mmjsonparse/mmjsonparse.c.orig 2014-03-25 20:37:43.000000000 +0000
-+++ plugins/mmjsonparse/mmjsonparse.c
-@@ -146,7 +146,7 @@ processJSON(instanceData *pData, msg_t *
-
- err = pData->tokener->err;
- if(err != json_tokener_continue)
-- errMsg = json_tokener_errors[err];
-+ errMsg = json_tokener_error_desc(err);
- else
- errMsg = "Unterminated input";
- } else if((size_t)pData->tokener->char_offset < lenBuf)
diff --git a/rsyslog7/patches/patch-runtime_typedefs.h b/rsyslog7/patches/patch-runtime_typedefs.h
deleted file mode 100644
index 0db68cf..0000000
--- a/rsyslog7/patches/patch-runtime_typedefs.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-runtime_typedefs.h,v 1.2 2014/07/22 07:44:55 fhajny Exp $
-
-SunOS has off64_t defined.
---- runtime/typedefs.h.orig 2014-03-25 20:37:44.000000000 +0000
-+++ runtime/typedefs.h
-@@ -157,7 +157,9 @@ typedef enum {
- } fiop_t;
-
- #ifndef HAVE_LSEEK64
-+# ifndef __sun
- typedef off_t off64_t;
-+# endif
- #endif
-
-
Home |
Main Index |
Thread Index |
Old Index