Attachment 210321 Details for Bug 242977 – the patch to fix the issues

[patch] the patch to fix the issues

sasl.patch (text/plain), 5.69 KB, created by Tomoyuki Sakurai on 2019-12-30 05:10:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomoyuki Sakurai

Created: 2019-12-30 05:10:28 UTC

Size: 5.69 KB

patch

obsolete

>diff --git net-mgmt/argus3-clients/Makefile net-mgmt/argus3-clients/Makefile
>index 3499e220ae6e..82792ad5e0b3 100644
>--- net-mgmt/argus3-clients/Makefile
>+++ net-mgmt/argus3-clients/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	argus-clients
> PORTVERSION=	3.0.8.2
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	net-mgmt security
> MASTER_SITES=	http://qosient.com/argus/src/ \
> 		ftp://qosient.com/pub/argus/src/
>@@ -13,6 +13,7 @@ COMMENT=	Client programs for the argus IP network transaction auditing tool
> 
> LICENSE=	GPLv3
> 
>+USES=		bison ncurses perl5 readline dos2unix
> CONFLICTS=	argus-clients-2* argus-clients-sasl-2*
> 
> OPTIONS_DEFINE=	MYSQL SASL DOCS EXAMPLES
>@@ -22,9 +23,11 @@ SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
> SASL_CONFIGURE_ON=	--with-sasl=${LOCALBASE}
> MYSQL_USES=	mysql
> 
>-USES=		bison ncurses perl5 readline
> USE_CSTD=	gnu89
> GNU_CONFIGURE=	yes
>+DOS2UNIX_FILES=	\
>+				examples/rapolicy/rapolicy.c \
>+				include/rapolicy.h
> 
> .include <bsd.port.options.mk>
> 
>@@ -32,6 +35,15 @@ GNU_CONFIGURE=	yes
> PKGNAMESUFFIX+=	-sasl
> .endif
> 
>+pre-configure:
>+	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
>+		${WRKSRC}/clients/radium.c \
>+		${WRKSRC}/common/argus_auth.c \
>+		${WRKSRC}/common/argus_auth.c \
>+		${WRKSRC}/common/argus_util.c \
>+		${WRKSRC}/examples/ramysql/rasql.c \
>+		${WRKSRC}/examples/rapolicy/rapolicy.c
>+
> do-install:
> .for i in radark ragraph rahosts raips raplot raports
> 	@${REINPLACE_CMD} -e 's#/usr/bin/perl#${LOCALBASE}/bin/perl#' ${WRKSRC}/bin/$i
>diff --git net-mgmt/argus3-clients/files/patch-clients_radium.c net-mgmt/argus3-clients/files/patch-clients_radium.c
>new file mode 100644
>index 000000000000..4d7022044b31
>--- /dev/null
>+++ net-mgmt/argus3-clients/files/patch-clients_radium.c
>@@ -0,0 +1,11 @@
>+--- clients/radium.c.orig	2019-12-30 03:56:09 UTC
>++++ clients/radium.c
>+@@ -131,7 +131,7 @@ ArgusClientInit (struct ArgusParserStruct *parser)
>+          RadiumParseResourceFile (parser, parser->ArgusFlowModelFile);
>+       } else {
>+          if (!(parser->Xflag)) {
>+-            RadiumParseResourceFile (parser, "/etc/radium.conf");
>++            RadiumParseResourceFile (parser, "%%PREFIX%%/etc/radium.conf");
>+          }
>+       }
>+ 
>diff --git net-mgmt/argus3-clients/files/patch-common_argus__auth.c net-mgmt/argus3-clients/files/patch-common_argus__auth.c
>new file mode 100644
>index 000000000000..f9a57d60d2b0
>--- /dev/null
>+++ net-mgmt/argus3-clients/files/patch-common_argus__auth.c
>@@ -0,0 +1,11 @@
>+--- common/argus_auth.c.orig	2019-12-29 13:04:50 UTC
>++++ common/argus_auth.c
>+@@ -131,7 +131,7 @@ int RaGetSecret(sasl_conn_t *, void *context, int, sas
>+ int ArgusSaslGetPath(void *context __attribute__((unused)), char **);
>+ int ArgusSaslLog (void *context __attribute__((unused)), int, const char *);
>+ 
>+-#define PLUGINDIR "/usr/lib/sasl2"
>++#define PLUGINDIR "%%PREFIX%%/lib/sasl2"
>+ char *searchpath = NULL;
>+ 
>+ int
>diff --git net-mgmt/argus3-clients/files/patch-common_argus__util.c net-mgmt/argus3-clients/files/patch-common_argus__util.c
>new file mode 100644
>index 000000000000..713002c42637
>--- /dev/null
>+++ net-mgmt/argus3-clients/files/patch-common_argus__util.c
>@@ -0,0 +1,11 @@
>+--- common/argus_util.c.orig	2019-12-30 03:59:04 UTC
>++++ common/argus_util.c
>+@@ -795,7 +795,7 @@ ArgusMainInit (struct ArgusParserStruct *parser, int a
>+          noconf++;
>+ 
>+    if (!(noconf)) {
>+-      snprintf (path, MAXPATHNAMELEN - 1, "/etc/ra.conf");
>++      snprintf (path, MAXPATHNAMELEN - 1, "%%PREFIX%%/etc/ra.conf");
>+ 
>+       if (stat (path, &statbuf) == 0)
>+          ArgusParseResourceFile (parser, path);
>diff --git net-mgmt/argus3-clients/files/patch-examples_ramysql_rasql.c net-mgmt/argus3-clients/files/patch-examples_ramysql_rasql.c
>new file mode 100644
>index 000000000000..81cf9c8cbc18
>--- /dev/null
>+++ net-mgmt/argus3-clients/files/patch-examples_ramysql_rasql.c
>@@ -0,0 +1,14 @@
>+--- examples/ramysql/rasql.c.orig	2019-12-30 04:18:22 UTC
>++++ examples/ramysql/rasql.c
>+@@ -1023,9 +1023,9 @@ RaSQLProcessQueue (struct ArgusQueueStruct *queue)
>+                                  int RaPort = ArgusParser->ArgusPortNum ?  ArgusParser->ArgusPortNum : ARGUS_DEFAULTPORT;
>+ 
>+                                  if (RaRoleString != NULL)
>+-                                    sprintf (command, "/usr/local/bin/ra -nnS %s:%d%s/%s/%s -w %s", RaHost, RaPort, RaArchive, RaRoleString, file, filenamebuf);
>++                                    sprintf (command, "%%PREFIX%%/bin/ra -nnS %s:%d%s/%s/%s -w %s", RaHost, RaPort, RaArchive, RaRoleString, file, filenamebuf);
>+                                  else
>+-                                    sprintf (command, "/usr/local/bin/ra -nnS %s:%d%s/%s -w %s", RaHost, RaPort, RaArchive, file, filenamebuf);
>++                                    sprintf (command, "%%PREFIX%%/bin/ra -nnS %s:%d%s/%s -w %s", RaHost, RaPort, RaArchive, file, filenamebuf);
>+ #ifdef ARGUSDEBUG
>+                                  ArgusDebug (2, "RaSQLProcessQueue: remote file caching command  %s\n", command);
>+ #endif
>diff --git net-mgmt/argus3-clients/files/patch-examples_rapolicy_rapolicy.c net-mgmt/argus3-clients/files/patch-examples_rapolicy_rapolicy.c
>new file mode 100644
>index 000000000000..aad6cfe07f2d
>--- /dev/null
>+++ net-mgmt/argus3-clients/files/patch-examples_rapolicy_rapolicy.c
>@@ -0,0 +1,11 @@
>+--- examples/rapolicy/rapolicy.c.orig	2019-12-30 04:00:06 UTC
>++++ examples/rapolicy/rapolicy.c
>+@@ -88,7 +88,7 @@ ArgusClientInit (struct ArgusParserStruct *parser)
>+          RaPolicyParseResourceFile (parser, parser->ArgusFlowModelFile, &RaPolicy);
>+       } else {
>+          if (!(parser->Xflag)) {
>+-            RaPolicyParseResourceFile (parser, "/etc/rapolicy.conf", &RaPolicy);
>++            RaPolicyParseResourceFile (parser, "%%PREFIX%%/etc/rapolicy.conf", &RaPolicy);
>+          }
>+       }
>+    }

Actions: View | Diff

Attachments on bug 242977: 210321