pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Remove obsolete rsyslog6.
Module Name: pkgsrc-wip
Committed By: Bartosz Kuzma <bartosz.kuzma%gmail.com@localhost>
Pushed By: bartosz.kuzma
Date: Sun Jul 3 20:33:12 2016 +0200
Changeset: 8576744c04f538e412b949da47da4e5405769c3c
Modified Files:
Makefile
Removed Files:
rsyslog6/DESCR
rsyslog6/MESSAGE
rsyslog6/Makefile
rsyslog6/PLIST
rsyslog6/TODO
rsyslog6/distinfo
rsyslog6/files/rsyslogd.sh
rsyslog6/options.mk
rsyslog6/patches/patch-configure
rsyslog6/patches/patch-plugins_imsolaris_imsolaris.c
rsyslog6/patches/patch-rsyslog.conf
Log Message:
Remove obsolete rsyslog6.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8576744c04f538e412b949da47da4e5405769c3c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
rsyslog6/DESCR | 9 ---
rsyslog6/MESSAGE | 11 ----
rsyslog6/Makefile | 63 -------------------
rsyslog6/PLIST | 34 -----------
rsyslog6/TODO | 3 -
rsyslog6/distinfo | 8 ---
rsyslog6/files/rsyslogd.sh | 23 -------
rsyslog6/options.mk | 71 ----------------------
rsyslog6/patches/patch-configure | 13 ----
.../patches/patch-plugins_imsolaris_imsolaris.c | 17 ------
rsyslog6/patches/patch-rsyslog.conf | 15 -----
12 files changed, 268 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index 833cea3..6e9a41f 100644
--- a/Makefile
+++ b/Makefile
@@ -3653,7 +3653,6 @@ SUBDIR+= rsound
SUBDIR+= rsstail
SUBDIR+= rst-mode
SUBDIR+= rstudio
-SUBDIR+= rsyslog6
SUBDIR+= rte
SUBDIR+= rthread
SUBDIR+= rtl-sdr-git
diff --git a/rsyslog6/DESCR b/rsyslog6/DESCR
deleted file mode 100644
index c3703ee..0000000
--- a/rsyslog6/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-Rsyslog is an enhanced multi-threaded syslogd supporting, among
-others, MySQL, PgSQL, syslog/tcp, RFC 3195, permitted sender lists,
-filtering on any message part, and fine grain output format control.
-It is quite compatible to stock sysklogd and can be used as a
-drop-in replacement. Its advanced features make it suitable for
-enterprise-class, encryption protected syslog relay chains while
-at the same time being very easy to setup for the novice user. An
-optional web interface - phpLogCon - can be used to visualize all
-data online.
diff --git a/rsyslog6/MESSAGE b/rsyslog6/MESSAGE
deleted file mode 100644
index 58be864..0000000
--- a/rsyslog6/MESSAGE
+++ /dev/null
@@ -1,11 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2012/02/12 20:03:44 bartoszkuzma 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/rsyslog6/Makefile b/rsyslog6/Makefile
deleted file mode 100644
index 5ef565a..0000000
--- a/rsyslog6/Makefile
+++ /dev/null
@@ -1,63 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2012/10/07 14:53:44 asau Exp $
-#
-
-DISTNAME= rsyslog-6.2.0
-CATEGORIES= sysutils
-MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/
-
-MAINTAINER= bartosz.kuzma%gmail.com@localhost
-HOMEPAGE= http://www.rsyslog.com/
-COMMENT= The enhanced syslogd for Unix
-LICENSE= gnu-gpl-v3
-
-CONFLICTS= rsyslog-[0-9]*
-
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --disable-testbench
-CONFIGURE_ARGS+= --enable-mmnormalize
-
-USE_TOOLS+= 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.
-
-DOCDIR= ${PREFIX}/share/doc/rsyslog
-
-EGDIR= ${PREFIX}/share/examples/rsyslog
-CONF_FILES= ${EGDIR}/rsyslog.conf ${PKG_SYSCONFDIR}/rsyslog.conf
-RCD_SCRIPTS= rsyslogd
-
-.include "../../mk/bsd.prefs.mk"
-
-.include "options.mk"
-
-SUBST_CLASSES+= sysmod
-SUBST_STAGE.sysmod= post-patch
-SUBST_MESSAGE.sysmod= Setting system/kernel logging module
-SUBST_FILES.sysmod= rsyslog.conf
-SUBST_SED.sysmod= -e 's,@RSYSLOG_SYSMOD@,im${RSYSLOG_SYSMOD},'
-
-post-install:
- # ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
- # cd ${WRKSRC}/doc && pax -rw *.html ${DESTDIR}${DOCDIR}
- ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/rsyslog.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"
-.include "../../devel/libestr/buildlink3.mk"
-.include "../../sysutils/liblognorm/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/rsyslog6/PLIST b/rsyslog6/PLIST
deleted file mode 100644
index da984f2..0000000
--- a/rsyslog6/PLIST
+++ /dev/null
@@ -1,34 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2012/03/05 13:19:08 fhajny Exp $
-${PLIST.file}lib/rsyslog/imfile.la
-${PLIST.gssapi}lib/rsyslog/imgssapi.la
-${PLIST.klog}lib/rsyslog/imklog.la
-lib/rsyslog/immark.la
-${PLIST.solaris}lib/rsyslog/imsolaris.la
-lib/rsyslog/imtcp.la
-lib/rsyslog/imudp.la
-lib/rsyslog/imuxsock.la
-${PLIST.gnutls}lib/rsyslog/lmnsd_gtls.la
-${PLIST.gssapi}lib/rsyslog/lmgssutil.la
-lib/rsyslog/lmnet.la
-lib/rsyslog/lmnetstrms.la
-lib/rsyslog/lmnsd_ptcp.la
-lib/rsyslog/lmregexp.la
-lib/rsyslog/lmstrmsrv.la
-lib/rsyslog/lmtcpclt.la
-lib/rsyslog/lmtcpsrv.la
-lib/rsyslog/lmzlibw.la
-lib/rsyslog/mmnormalize.la
-${PLIST.gssapi}lib/rsyslog/omgssapi.la
-${PLIST.mail}lib/rsyslog/ommail.la
-${PLIST.mysql}lib/rsyslog/ommysql.la
-${PLIST.pgsql}lib/rsyslog/ompgsql.la
-${PLIST.snmp}lib/rsyslog/omsnmp.la
-lib/rsyslog/omruleset.la
-lib/rsyslog/omtesting.la
-man/man5/rsyslog.conf.5
-man/man8/rsyslogd.8
-sbin/rsyslogd
-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/rsyslog6/TODO b/rsyslog6/TODO
deleted file mode 100644
index 76d1138..0000000
--- a/rsyslog6/TODO
+++ /dev/null
@@ -1,3 +0,0 @@
-- Improve rc.d script
-- Add better description in MESSAGE file
-- Install or not HTML documentation?
diff --git a/rsyslog6/distinfo b/rsyslog6/distinfo
deleted file mode 100644
index 7b33a4e..0000000
--- a/rsyslog6/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.5 2012/03/05 13:19:08 fhajny Exp $
-
-SHA1 (rsyslog-6.2.0.tar.gz) = caa20926efe0ff7291fc85c3242fb41c85f2949a
-RMD160 (rsyslog-6.2.0.tar.gz) = c0cd552cb4b1caf2d7dc43c40808469c66d901e1
-Size (rsyslog-6.2.0.tar.gz) = 2411196 bytes
-SHA1 (patch-configure) = 72cacf67241f86ff6ff799761e735d9db423aab2
-SHA1 (patch-plugins_imsolaris_imsolaris.c) = 2e11ba13223345ee03a1a387ef8ec27d021a1c53
-SHA1 (patch-rsyslog.conf) = 7b9583631c42c4bfb646fd7ecf0070ffbf219530
diff --git a/rsyslog6/files/rsyslogd.sh b/rsyslog6/files/rsyslogd.sh
deleted file mode 100644
index 0ce18a7..0000000
--- a/rsyslog6/files/rsyslogd.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: rsyslogd.sh,v 1.2 2012/02/12 20:03:44 bartoszkuzma 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/rsyslog6/options.mk b/rsyslog6/options.mk
deleted file mode 100644
index 33ccec1..0000000
--- a/rsyslog6/options.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2012/03/05 13:19:08 fhajny Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.rsyslog
-PKG_SUPPORTED_OPTIONS= gnutls gssapi mail mysql pgsql snmp file
-
-.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+= gnutls gssapi mail mysql pgsql snmp klog solaris file
-
-.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
diff --git a/rsyslog6/patches/patch-configure b/rsyslog6/patches/patch-configure
deleted file mode 100644
index 7e848b4..0000000
--- a/rsyslog6/patches/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2012/02/28 22:57:32 bartoszkuzma Exp $
-
---- configure.orig 2012-02-28 22:38:13.000000000 +0000
-+++ configure
-@@ -12337,7 +12337,7 @@ case "${host}" in
- *-*-linux*)
- os_type="linux"
- ;;
-- *-*-*darwin*|*-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
-+ *-*-*darwin*|*-*-dragonfly*|*-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
-
- $as_echo "#define OS_BSD 1" >>confdefs.h
-
diff --git a/rsyslog6/patches/patch-plugins_imsolaris_imsolaris.c b/rsyslog6/patches/patch-plugins_imsolaris_imsolaris.c
deleted file mode 100644
index 3acdf00..0000000
--- a/rsyslog6/patches/patch-plugins_imsolaris_imsolaris.c
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-plugins_imsolaris_imsolaris.c,v 1.1 2012/03/05 13:19:09 fhajny Exp $
-
-Patch from http://lists.adiscon.net/pipermail/rsyslog/2011-October/013850.html
---- plugins/imsolaris/imsolaris.c.orig 2012-01-09 14:05:17.000000000 +0000
-+++ plugins/imsolaris/imsolaris.c
-@@ -392,9 +392,9 @@ CODEmodInit_QueryRegCFSLineHdlr
-
- /* register config file handlers */
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"resetconfigvariables", 1, eCmdHdlrCustomHandler,
-- resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID));
-+ resetConfigVariables, NULL, STD_LOADABLE_MODULE_ID, eConfObjAction));
- CHKiRet(omsdRegCFSLineHdlr((uchar *)"imsolarislogsocketname", 0, eCmdHdlrGetWord,
-- NULL, &LogName, STD_LOADABLE_MODULE_ID));
-+ NULL, &LogName, STD_LOADABLE_MODULE_ID, eConfObjAction));
- ENDmodInit
- /* vim:set ai:
- */
diff --git a/rsyslog6/patches/patch-rsyslog.conf b/rsyslog6/patches/patch-rsyslog.conf
deleted file mode 100644
index 6c92bc3..0000000
--- a/rsyslog6/patches/patch-rsyslog.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-rsyslog.conf,v 1.1 2012/03/05 13:19:09 fhajny Exp $
-
-Automatically use the proper kernel logging module.
---- rsyslog.conf.orig 2011-04-18 13:36:33.000000000 +0000
-+++ rsyslog.conf
-@@ -7,7 +7,8 @@
-
- $ModLoad immark # provides --MARK-- message capability
- $ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
--$ModLoad imklog # kernel logging (formerly provided by rklogd)
-+$ModLoad @RSYSLOG_SYSMOD@ # kernel logging (imklog or imsolaris)
-+#$ModLoad imfile
-
- # Log all kernel messages to the console.
- # Logging much else clutters up the screen.
Home |
Main Index |
Thread Index |
Old Index