Attachment 218055 Details for Bug 249433 – various port housekeeping cleanups

[patch] various port housekeeping cleanups

samhain-housekeeping.diff (text/plain), 2.98 KB, created by Greg Veldman on 2020-09-18 14:05:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Veldman

Created: 2020-09-18 14:05:45 UTC

Size: 2.98 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 547563)
>+++ Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	samhain
> PORTVERSION=	4.4.2
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	http://la-samhna.de/archive/
> DISTNAME=	samhain_signed-${PORTVERSION}
>@@ -169,12 +170,12 @@
> 
> post-install:
> .if !defined(WITH_SERVER)
>-	@${CP} ${WRKSRC}/init/samhain.startFreeBSD ${STAGEDIR}${PREFIX}/etc/rc.d/samhain.sh
>+	${INSTALL_SCRIPT} ${WRKSRC}/init/samhain.startFreeBSD ${STAGEDIR}${PREFIX}/etc/rc.d/samhain
> 	@${CP} ${WRKSRC}/samhainrc ${STAGEDIR}${PREFIX}/etc/samhainrc.sample
> 	@${CHGRP} wheel ${STAGEDIR}${PREFIX}/etc/samhainrc.sample
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/samhain
> .else
>-	@${CP} ${WRKSRC}/init/samhain.startFreeBSD ${STAGEDIR}${PREFIX}/etc/rc.d/yule.sh
>+	${INSTALL_SCRIPT} ${WRKSRC}/init/samhain.startFreeBSD ${STAGEDIR}${PREFIX}/etc/rc.d/yule
> 	@${CP} ${WRKSRC}/yulerc ${STAGEDIR}${PREFIX}/etc/yulerc.sample
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yule
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/yulectl
>Index: files/patch-init_samhain.startFreeBSD.in
>===================================================================
>--- files/patch-init_samhain.startFreeBSD.in	(nonexistent)
>+++ files/patch-init_samhain.startFreeBSD.in	(working copy)
>@@ -0,0 +1,11 @@
>+--- init/samhain.startFreeBSD.in.orig	2015-11-01 00:03:11 UTC
>++++ init/samhain.startFreeBSD.in
>+@@ -37,7 +37,7 @@
>+ load_rc_config "$name"
>+ 
>+ if ! is_set ${rcvar}; then 
>+-    eval "${rcvar}=YES"
>++    eval "${rcvar}=NO"
>+ fi
>+ 
>+ run_rc_command "$1"
>
>Property changes on: files/patch-init_samhain.startFreeBSD.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 547563)
>+++ pkg-plist	(working copy)
>@@ -1,3 +1,4 @@
>+@dir /var/lib
> %%PORTDOCS%%%%DOCSDIR%%/BUGS
> %%PORTDOCS%%%%DOCSDIR%%/FAQ.html
> %%PORTDOCS%%%%DOCSDIR%%/HOWTO-client+server-troubleshooting.html
>@@ -10,10 +11,9 @@
> %%PORTDOCS%%%%DOCSDIR%%/sh_mounts.txt
> %%PORTDOCS%%%%DOCSDIR%%/sh_userfiles.txt
> %%PORTDOCS%%@dir %%DOCSDIR%%
>-%%SAMHAIN%%@dir /var/lib
> %%SAMHAIN%%@dir /var/lib/samhain
> %%SAMHAIN%%@sample etc/samhainrc.sample
>-%%SAMHAIN%%etc/rc.d/samhain.sh
>+%%SAMHAIN%%etc/rc.d/samhain
> %%SAMHAIN%%man/man5/samhainrc.5.gz
> %%SAMHAIN%%man/man8/samhain.8.gz
> %%SAMHAIN%%sbin/samhain
>@@ -21,8 +21,8 @@
> %%YULE%%@dir /var/lib/yule
> %%YULE%%@dir /var/log/yule
> %%YULE%%@sample etc/yulerc.sample
>-%%YULE%%@unexec echo "To delete the yule user permanently, use 'pw userdel yule'"
>-%%YULE%%etc/rc.d/yule.sh
>+%%YULE%%@postunexec echo "To delete the yule user permanently, use 'pw userdel yule'"
>+%%YULE%%etc/rc.d/yule
> %%YULE%%man/man5/yulerc.5.gz
> %%YULE%%man/man8/yule.8.gz
> %%YULE%%sbin/yule

Flags:

freebsd: maintainer-approval+

Actions: View | Diff

Attachments on bug 249433: 218055 | 218056