Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 13 Apr 2024 10:51:28 GMT
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 900c09002f23 - main - sysutils/msyslog: Remove expired port
Message-ID:  <202404131051.43DApS8Y068863@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=900c09002f2363475ee9e84c9d46a2f1586ba8ee

commit 900c09002f2363475ee9e84c9d46a2f1586ba8ee
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2024-04-13 10:51:21 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2024-04-13 10:51:21 +0000

    sysutils/msyslog: Remove expired port
    
    2024-04-13 sysutils/msyslog: Unmaintained and last upstream release in 2003
---
 MOVED                                              |  1 +
 sysutils/Makefile                                  |  1 -
 sysutils/msyslog/Makefile                          | 57 ------------------
 sysutils/msyslog/distinfo                          |  2 -
 sysutils/msyslog/files/msyslogd.in                 | 48 ---------------
 sysutils/msyslog/files/patch-configure             | 63 -------------------
 sysutils/msyslog/files/patch-src-Makefile.in       | 12 ----
 .../msyslog/files/patch-src-modules-Makefile.in    | 11 ----
 .../msyslog/files/patch-src_modules_om__classic.c  | 70 ----------------------
 sysutils/msyslog/files/pkg-message.in              | 24 --------
 sysutils/msyslog/pkg-descr                         |  7 ---
 sysutils/msyslog/pkg-plist                         | 25 --------
 12 files changed, 1 insertion(+), 320 deletions(-)

diff --git a/MOVED b/MOVED
index 01f028af1c2d..eaba1e3ce4de 100644
--- a/MOVED
+++ b/MOVED
@@ -3178,3 +3178,4 @@ textproc/libparsifal||2024-04-13|Has expired: Upsrteam no longer available inclu
 www/p5-Catalyst-Plugin-FormBuilder||2024-04-13|Has expired: Deprecated by upstream
 security/sancp||2024-04-13|Has expired: Upstream unmaintained and last release in 2007
 x11-toolkits/p5-Glade2||2024-04-13|Has expired: Deprecated by upstream
+sysutils/msyslog||2024-04-13|Has expired: Unmaintained and last upstream release in 2003
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 55fb020bf9e5..1dedd649d436 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -802,7 +802,6 @@
     SUBDIR += msiklm
     SUBDIR += msktutil
     SUBDIR += mstflint
-    SUBDIR += msyslog
     SUBDIR += mtm
     SUBDIR += mtpfs
     SUBDIR += mtxorbd
diff --git a/sysutils/msyslog/Makefile b/sysutils/msyslog/Makefile
deleted file mode 100644
index 70fe9ed899dc..000000000000
--- a/sysutils/msyslog/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-PORTNAME=	msyslog
-DISTVERSION=	1.08g
-PORTREVISION=	5
-CATEGORIES=	sysutils
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-1.X/${DISTVERSION}
-DISTNAME=	${PORTNAME}-v${DISTVERSION}-src
-
-MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	Flexible and easy to integrate syslog daemon
-WWW=		https://sourceforge.net/projects/msyslog/
-
-LICENSE=	BSD4CLAUSE MIT
-LICENSE_COMB=	dual
-
-DEPRECATED=	Unmaintained and last upstream release in 2003
-EXPIRATION_DATE=2024-04-13
-
-USES=		gmake
-USE_LDCONFIG=	yes
-USE_RC_SUBR=	msyslogd
-
-GNU_CONFIGURE=	yes
-
-PORTSCOUT=	skipv:1.09a,1.09b,1.09c,1.09d
-SUB_FILES=	pkg-message
-
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
-
-OPTIONS_DEFINE=	MYSQL PGSQL EXAMPLES
-OPTIONS_SUB=	yes
-
-MYSQL_USES=	mysql
-MYSQL_CONFIGURE_OFF=	--without-mysql
-PGSQL_USES=	pgsql
-PGSQL_CONFIGURE_OFF=	--without-pgsql
-
-post-patch:
-	@${FIND} ${WRKSRC}/src/modules -name "*.c" | \
-	    ${XARGS} ${REINPLACE_CMD} -e "s|typedef int socklen_t;||g"
-	@${FIND} ${WRKSRC}/src/peo -name "*.h" | \
-	    ${XARGS} ${REINPLACE_CMD} -e 's|"typedefs.h"|<sys/types.h>|g'
-	@${FIND} ${WRKSRC}/src/ -name "*.*" | \
-	    ${XARGS} ${REINPLACE_CMD} -e 's|/dev/log|/var/run/log|g' \
-	    -e "s|/etc/syslog.conf|${PREFIX}/etc/syslog.conf|g"
-	@${FIND} ${WRKSRC}/src/ -name "*.bak" -delete
-	@${REINPLACE_CMD} -e 's|@prefix@|${STAGEDIR}${PREFIX}|g' \
-		${WRKSRC}/src/modules/Makefile.in \
-		${WRKSRC}/src/peo/Makefile.in \
-		${WRKSRC}/src/Makefile.in
-	@${REINPLACE_CMD} -e 's|@mandir@|${STAGEDIR}${PREFIX}/share/man|g' \
-		${WRKSRC}/src/man/GNUmakefile.in
-
-post-install-EXAMPLES-on:
-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/examples/* ${STAGEDIR}${EXAMPLESDIR}
-
-.include <bsd.port.mk>
diff --git a/sysutils/msyslog/distinfo b/sysutils/msyslog/distinfo
deleted file mode 100644
index 84b576d3050a..000000000000
--- a/sysutils/msyslog/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (msyslog-v1.08g-src.tar.gz) = 0a9a2a765fe75e31973f6a0f44490c6ff371988cb3382779a0ddb7b7f28a86d4
-SIZE (msyslog-v1.08g-src.tar.gz) = 131782
diff --git a/sysutils/msyslog/files/msyslogd.in b/sysutils/msyslog/files/msyslogd.in
deleted file mode 100644
index 3abb3d02712b..000000000000
--- a/sysutils/msyslog/files/msyslogd.in
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: syslogd
-# REQUIRE: mountcritremote cleanvar
-# BEFORE:  SERVERS
-#
-# Add the following lines to /etc/rc.conf to enable msyslogd:
-#
-# msyslogd_enable="YES"
-#
-# Yes, here you can pass arguments to daemon
-#
-# msyslogd_flags=
-#
-
-. /etc/rc.subr
-
-name=msyslogd
-rcvar=msyslogd_enable
-
-command=%%PREFIX%%/sbin/syslogd
-pidfile=/var/run/syslog.pid
-required_files=%%PREFIX%%/etc/syslog.conf
-
-start_precmd=start_precmd
-stop_postcmd=stop_postcmd
-
-extra_commands="reload"
-
-start_precmd()
-{
-  case $syslogd_enable in
-  [Yy][Ee][Ss]|1)
-    warn "syslogd_enable should be set to NO"
-    ;;
-    esac
-}
-
-stop_postcmd()
-{
-  rm -f $pidfile
-}
-
-# read settings, set default values
-load_rc_config $name
-: ${msyslogd_enable="NO"}
-
-run_rc_command "$1"
diff --git a/sysutils/msyslog/files/patch-configure b/sysutils/msyslog/files/patch-configure
deleted file mode 100644
index 3767b5f42fee..000000000000
--- a/sysutils/msyslog/files/patch-configure
+++ /dev/null
@@ -1,63 +0,0 @@
---- configure.orig	2003-04-11 19:07:44 UTC
-+++ configure
-@@ -2941,7 +2941,7 @@ fi
- echo "$as_me:2941: result: $ac_cv_lib_dl_dlopen" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
- if test $ac_cv_lib_dl_dlopen = yes; then
--  SYSLOGD_LIBS="$SYSLOGD_LIBS -ldl"
-+  SYSLOGD_LIBS="$SYSLOGD_LIBS"
- fi
- 
- echo "$as_me:2947: checking for connect in -lsocket" >&5
-@@ -3573,9 +3573,9 @@ cat >>confdefs.h <<EOF
- #define MSYSLOG_VERSION_STR "$MSYSLOG_VERSION"
- EOF
- 
--echo msyslog version... $MSYSLOG_VERSION
-+echo msyslog version... 1
- 
--MLIBNAME="libmsyslog.so.$MSYSLOG_VERSION" ;
-+MLIBNAME="libmsyslog.so.1" ;
- cat >>confdefs.h <<EOF
- #define MLIBNAME_STR "$MLIBNAME"
- EOF
-@@ -3587,7 +3587,7 @@ then
- 	prefix=$ac_default_prefix
- fi
- cat >>confdefs.h <<EOF
--#define INSTALL_LIBDIR "$prefix/lib/alat"
-+#define INSTALL_LIBDIR "$prefix/lib"
- EOF
- 
- echo "$as_me:3593: checking wheter optreset is needed" >&5
-@@ -3644,14 +3644,6 @@ cat >>confdefs.h <<EOF
- #define PID_DIR "$dir"
- EOF
- 
--for MANDIR in "/usr/share/man" "/usr/man"
--do
--	if test -d $MANDIR ; then
--		mandir=$MANDIR;
--		break;
--	fi
--done
--
- echo "$as_me:3655: checking wether netdb.h requires _USE_IRS" >&5
- echo $ECHO_N "checking wether netdb.h requires _USE_IRS... $ECHO_C" >&6
- if grep _USE_IRS /usr/include/netdb.h >/dev/null ;then
-@@ -3736,6 +3728,15 @@ EOF
- 
- 	SHARED_PARAMS="-Bshareable"
- 	DCCFLAGS="-fPIC"
-+elif test "$UNAME" = "FreeBSD" ; then
-+	cat >>confdefs.h <<\EOF
-+#define DLOPEN_FLAGS RTLD_LAZY
-+#define SYMBOL_PREFIX ""
-+EOF
-+
-+	SHARED_PARAMS="-Bshareable"
-+	DCCFLAGS="-fPIC"
-+	SYSLOGD_LIBS="$SYSLOGD_LIBS -Wl,-E"
- elif test "$UNAME" = "Linux" ; then
- 	cat >>confdefs.h <<\EOF
- #define DLOPEN_FLAGS RTLD_LAZY | RTLD_GLOBAL
diff --git a/sysutils/msyslog/files/patch-src-Makefile.in b/sysutils/msyslog/files/patch-src-Makefile.in
deleted file mode 100644
index 4fae2b311bab..000000000000
--- a/sysutils/msyslog/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/Makefile.in.orig	2003-04-11 16:36:26 UTC
-+++ src/Makefile.in
-@@ -74,9 +74,3 @@ install-prog:
- 	$(INSTALL) -s $(PROG) $(INSTALL_DIR)/ ;
- 
- install: install-prog
--	@echo -e \
--	" **********************************************************\n"\
--	"**       A new syslog daemon was installed !!           **\n"\
--	"**   Please read the INSTALL and README files           **\n"\
--	"**   to get your syslog configuration ready             **\n"\
--	"**********************************************************\n"
diff --git a/sysutils/msyslog/files/patch-src-modules-Makefile.in b/sysutils/msyslog/files/patch-src-modules-Makefile.in
deleted file mode 100644
index 45d65c5fb5e8..000000000000
--- a/sysutils/msyslog/files/patch-src-modules-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/modules/Makefile.in.orig	2003-04-11 16:36:36 UTC
-+++ src/modules/Makefile.in
-@@ -35,7 +35,7 @@ DCCFLAGS=	@DCCFLAGS@
- CPPFLAGS=	-I.. @CPPFLAGS@
- 
- INSTALL=	@INSTALL@
--INSTALL_LIBDIR=	@prefix@/lib/alat
-+INSTALL_LIBDIR=	@prefix@/lib
- 
- MLIBNAME=	@MLIBNAME@
- MSRCS=		@MSRCS@
diff --git a/sysutils/msyslog/files/patch-src_modules_om__classic.c b/sysutils/msyslog/files/patch-src_modules_om__classic.c
deleted file mode 100644
index 36fedba7a2a9..000000000000
--- a/sysutils/msyslog/files/patch-src_modules_om__classic.c
+++ /dev/null
@@ -1,70 +0,0 @@
---- src/modules/om_classic.c.orig	2010-01-25 16:36:53.000000000 -0800
-+++ src/modules/om_classic.c
-@@ -66,7 +66,7 @@
- #include <string.h>
- #include <syslog.h>
- #include <unistd.h>
--#include <utmp.h>
-+#include <utmpx.h>
- #include <netdb.h>
- /* if _PATH_UTMP isn't defined, define it here... */
- #ifndef _PATH_UTMP
-@@ -100,7 +100,7 @@
- struct om_classic_ctx {
- 	int	fd;
- 	union {
--		char    f_uname[MAXUNAMES][UT_NAMESIZE+1];
-+		char    f_uname[MAXUNAMES][MAXLOGNAME+2];
- 		struct {
- 			char    f_hname[MAXHOSTNAMELEN];
- 			struct sockaddr		f_addr;
-@@ -396,9 +396,9 @@
- 		for (i = 0; i < MAXUNAMES && *p; i++) {
- 			for (q = p; *q && *q != ','; )
- 				q++;
--			(void)strncpy(c->f_un.f_uname[i], p, UT_NAMESIZE);
--			if ((q - p) > UT_NAMESIZE)
--				c->f_un.f_uname[i][UT_NAMESIZE] = '\0';
-+			(void)strncpy(c->f_un.f_uname[i], p, MAXLOGNAME+1);
-+			if ((q - p) > MAXLOGNAME+1)
-+				c->f_un.f_uname[i][MAXLOGNAME+1] = '\0';
- 			else
- 				c->f_un.f_uname[i][q - p] = '\0';
- 			while (*q == ',' || *q == ' ')
-@@ -456,24 +456,19 @@
- {
- 	static int reenter;			/* avoid calling ourselves */
- 	FILE *uf;
--	struct utmp ut;
-+	struct utmpx ut;
- 	int i;
- 	char *p;
- 	char line[sizeof(ut.ut_line) + 1];
- 
- 	if (reenter++)
- 		return;
--	if ( (uf = fopen(_PATH_UTMP, "r")) == NULL) {
--		dprintf(MSYSLOG_SERIOUS, "om_classic: error opening "
--		    "%s\n", _PATH_UTMP);
--		reenter = 0;
--		return;
--	}
-+
- 	/* NOSTRICT */
- 	while (fread(&ut, sizeof(ut), 1, uf) == 1) {
- 
- #ifndef __linux__
--		if (ut.ut_name[0] == '\0')
-+		if (ut.ut_user[0] == '\0')
- #else
- 		if ((ut.ut_type != USER_PROCESS && ut.ut_type != LOGIN_PROCESS) ||
- 		    ut.ut_line[0] == ':' /* linux logs users that are not logged in (?!) */)
-@@ -494,7 +489,7 @@
- 		for (i = 0; i < MAXUNAMES; i++) {
- 			if (!c->f_un.f_uname[i][0])
- 				break;
--			if (!strncmp(c->f_un.f_uname[i], ut.ut_name,
-+			if (!strncmp(c->f_un.f_uname[i], ut.ut_user,
- 			    UT_NAMESIZE)) {
- 				if ((p = ttymsg(iov, 6, line, TTYMSGTIME))
- 								!= NULL) {
diff --git a/sysutils/msyslog/files/pkg-message.in b/sysutils/msyslog/files/pkg-message.in
deleted file mode 100644
index be1fdf32a38c..000000000000
--- a/sysutils/msyslog/files/pkg-message.in
+++ /dev/null
@@ -1,24 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-To replace FreeBSD's standard syslogd with msyslog, do this:
-
-1) Create a configuration in %%PREFIX%%/etc/syslog.conf.
-    See %%PREFIX%%/share/examples/msyslog for examples.
-
-2) Set up a startup script in %%PREFIX%%/etc/rc.d.
-    For your convinience, a msyslog.sh has been provided.
-    put this in /etc/rc.conf
-
-    msyslogd_enable="YES"
-
-3) Pass right values from man pages to /etc/rc.conf for
-    msyslogd_flags=""
-
-4) Stop the standard FreeBSD syslogd from starting automatically by putting this
-    in the end of /etc/rc.conf:
-
-    syslogd_enable="NO"
-EOM
-}
-]
diff --git a/sysutils/msyslog/pkg-descr b/sysutils/msyslog/pkg-descr
deleted file mode 100644
index eaae792fd1a8..000000000000
--- a/sysutils/msyslog/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-This new design of syslog allows for an easy implementation of input and output
-modules. The modules that mantain compatibility with its precursor (Secure
-Syslog) are included in the standard distribution along with four modules:
-om_peo (an implementation of PEO-1 and L-PEO, two algorithmic protocols for
-integrity checking), om_mysql and om_pgsql (modules that sends output to a
-MySQL and PostgreSQL database, respectively) and om_regex (a module that allows
-output redirection using regular expressions).
diff --git a/sysutils/msyslog/pkg-plist b/sysutils/msyslog/pkg-plist
deleted file mode 100644
index 1fb296579309..000000000000
--- a/sysutils/msyslog/pkg-plist
+++ /dev/null
@@ -1,25 +0,0 @@
-sbin/peochk
-sbin/syslogd
-lib/libmsyslog.so.1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/im_mymodule.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/om_mymodule.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/syslog.conf.classic
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/syslog.conf.mysql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/syslog.conf.peo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/syslog.conf.pgsql
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/syslog.conf.regex
-share/man/man5/syslog.conf.5.gz
-share/man/man8/im_bsd.8.gz
-share/man/man8/im_file.8.gz
-share/man/man8/im_tcp.8.gz
-share/man/man8/im_udp.8.gz
-share/man/man8/im_unix.8.gz
-share/man/man8/om_classic.8.gz
-share/man/man8/om_peo.8.gz
-share/man/man8/om_regex.8.gz
-share/man/man8/om_tcp.8.gz
-share/man/man8/om_udp.8.gz
-share/man/man8/peochk.8.gz
-share/man/man8/syslogd.8.gz
-%%MYSQL%%share/man/man8/om_mysql.8.gz
-%%PGSQL%%share/man/man8/om_pgsql.8.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404131051.43DApS8Y068863>