Attachment 125230 Details for Bug 168821 – inspircd-2.0.5_1.patch

[patch] inspircd-2.0.5_1.patch

inspircd-2.0.5_1.patch (text/plain), 4.13 KB, created by Jason Helfman on 2012-06-07 20:20:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Helfman

Created: 2012-06-07 20:20:11 UTC

Size: 4.13 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/irc/inspircd/Makefile,v
>retrieving revision 1.22
>diff -u -r1.22 Makefile
>--- Makefile	7 Jun 2012 01:12:50 -0000	1.22
>+++ Makefile	7 Jun 2012 19:16:08 -0000
>@@ -21,22 +21,15 @@
> USE_RC_SUBR=	${PORTNAME}
> MAKEFILE=	BSDmakefile
> 
>-USERS=		${INSPIRCD_USR}
>-GROUPS=		${INSPIRCD_GRP}
>+USERS=	ircd
>+GROUPS=	ircd
>+INSPIRCD_UID=	72
> 
>-INSPIRCD_USR?=	ircd
>-INSPIRCD_UID?=	72
>-INSPIRCD_GRP?=	ircd
>-INSPIRCD_GID?=	72
> INSPIRCD_RUN?=	/var/run/${PORTNAME}
> INSPIRCD_LOG?=	/var/log/${PORTNAME}/ircd.log
>-SUB_LIST+=	PORTNAME=${PORTNAME}         \
>-		INSPIRCD_USR=${INSPIRCD_USR} \
>-		INSPIRCD_GRP=${INSPIRCD_GRP} \
>+SUB_LIST+=	PORTNAME=${PORTNAME} \
> 		INSPIRCD_LOG=${INSPIRCD_LOG} \
> 		INSPIRCD_RUN=${INSPIRCD_RUN}
>-PLIST_SUB+=	INSPIRCD_GRP=${INSPIRCD_GRP}
>-SUB_FILES+=	pkg-deinstall
> 
> # Configure script is written in perl
> USE_PERL5_BUILD=yes
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/irc/inspircd/pkg-plist,v
>retrieving revision 1.8
>diff -u -r1.8 pkg-plist
>--- pkg-plist	7 Jun 2012 01:12:50 -0000	1.8
>+++ pkg-plist	7 Jun 2012 19:16:08 -0000
>@@ -206,8 +206,6 @@
> @dirrm lib/inspircd/logs
> @dirrm lib/inspircd/data
> @dirrm lib/inspircd
>-@mode 640
>-@group %%INSPIRCD_GRP%%
> @unexec if cmp -s %D/%%ETCDIR%%/inspircd.censor.example %D/%%ETCDIR%%/inspircd.censor; then rm -f %D/%%ETCDIR%%/inspircd.censor; fi
> %%ETCDIR%%/inspircd.censor.example
> @exec if [ ! -f %B/inspircd.censor ] ; then cp -p %D/%F %B/inspircd.censor; fi
>@@ -241,6 +239,5 @@
> @unexec if cmp -s %D/%%ETCDIR%%/opers.conf.example %D/%%ETCDIR%%/opers.conf; then rm -f %D/%%ETCDIR%%/opers.conf; fi
> %%ETCDIR%%/opers.conf.example
> @exec if [ ! -f %B/opers.conf.example ] ; then cp -p %D/%F %B/opers.conf.example; fi
>+@unexec echo "If permanently removing software, you may wish to remove the configuration directory by running \"rm -rf %%LOCALBASE%%/%%ETCDIR%%\""
> @dirrmtry %%ETCDIR%%
>-@mode
>-@group
>Index: files/inspircd.in
>===================================================================
>RCS file: /home/pcvs/ports/irc/inspircd/files/inspircd.in,v
>retrieving revision 1.2
>diff -u -r1.2 inspircd.in
>--- files/inspircd.in	14 Jan 2012 08:55:47 -0000	1.2
>+++ files/inspircd.in	7 Jun 2012 19:16:08 -0000
>@@ -20,10 +20,6 @@
> # %%PORTNAME%%_pidfile="%%INSPIRCD_RUN%%/%%PORTNAME%%.pid"
> #                          -- location of pidfile: must match setting
> #                             in ${%%PORTNAME%%_conffile}
>-# %%PORTNAME%%_user="%%INSPIRCD_USR%%"
>-#                          -- user to run %%PORTNAME%% as
>-# %%PORTNAME%%_group="%%INSPIRCD_GRP%%"
>-#                          -- group to run %%PORTNAME%% as
> # %%PORTNAME%%_logfile="%%INSPIRCD_LOG%%"
> #                          -- file %%PORTNAME%% writes logs to
> #
>@@ -37,8 +33,8 @@
> : ${%%PORTNAME%%_enable="NO"}
> : ${%%PORTNAME%%_config="%%ETCDIR%%/%%PORTNAME%%.conf"}
> : ${%%PORTNAME%%_pidfile="%%INSPIRCD_RUN%%/%%PORTNAME%%.pid"}
>-: ${%%PORTNAME%%_user="%%INSPIRCD_USR%%"}
>-: ${%%PORTNAME%%_group="%%INSPIRCD_GRP%%"}
>+: ${%%PORTNAME%%_user=ircd}
>+: ${%%PORTNAME%%_group=ircd}
> : ${%%PORTNAME%%_logfile="%%INSPIRCD_LOG%%"}
> 
> command=%%PREFIX%%/bin/%%PORTNAME%%
>Index: files/pkg-deinstall.in
>===================================================================
>RCS file: files/pkg-deinstall.in
>diff -N files/pkg-deinstall.in
>--- files/pkg-deinstall.in	19 May 2008 07:01:38 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,32 +0,0 @@
>-#!/bin/sh
>-#
>-# $FreeBSD: ports/irc/inspircd/files/pkg-deinstall.in,v 1.1 2008/05/19 07:01:38 beech Exp $
>-#
>-
>-inspircd_usr=%%INSPIRCD_USR%%
>-inspircd_grp=%%INSPIRCD_GRP%%
>-etcdir=%%ETCDIR%%
>-inspircd_name=%%PORTNAME%%
>-
>-case $2 in
>-    POST-DEINSTALL)
>-
>-    cat <<EOMSG
>-
>-The $inspircd_name port has been deleted.  If you are not
>-upgrading and don't intend to use $inspircd_name any more
>-then you may wish to delete the $inspircd_usr account,
>-and the $inspircd_grp group together with the configuration
>-directory ${etcdir}; which can be done with the
>-following commands:
>-
>-    # pw userdel -n $inspircd_usr
>-    # rm -rf $etcdir
>-EOMSG
>-    echo
>-    ;;
>-esac
>-
>-#
>-# That's All Folks!
>-#

Actions: View | Diff

Attachments on bug 168821: 125230