Attachment 123566 Details for Bug 166931 – ircd-ratbox-repocopy.diff

[patch] ircd-ratbox-repocopy.diff

ircd-ratbox-repocopy.diff (text/plain), 8.41 KB, created by moggie on 2012-04-14 00:50:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: moggie

Created: 2012-04-14 00:50:11 UTC

Size: 8.41 KB

patch

obsolete

>diff -ruN ircd-ratbox.orig/Makefile ircd-ratbox/Makefile
>--- ircd-ratbox.orig/Makefile	2012-04-13 18:09:37.000000000 +0100
>+++ ircd-ratbox/Makefile	2012-04-13 23:47:14.000000000 +0100
>@@ -12,20 +12,18 @@
> MASTER_SITES=	http://www.ratbox.org/download/				\
> 		ftp://ftp.parodius.com/pub/ircd-ratbox/			\
> 		http://www.ratbox.org/download/old/
>-PKGNAMESUFFIX=	-devel
> 
> MAINTAINER=	moggie@elasticmind.net
>-COMMENT=	Advanced, stable IRC daemon, used widely on EFnet ('testing' release)
>+COMMENT=	Advanced, stable IRC daemon, used widely on EFnet
> 
> LICENSE=	GPLv2
> 
>-CONFLICTS=	ircd-ratbox-[0-9]*
>+CONFLICTS=	ircd-ratbox-devel-[0-9]*
> 
> USE_BZIP2=	yes
> #MAN8=		ircd.8
> USE_RC_SUBR=	ircd-ratbox.sh
> USE_SQLITE=	3
>-USE_PERL5_BUILD=	yes
> USE_LDCONFIG=	${PREFIX}/lib/ircd-ratbox
> 
> USERS=		ircd
>@@ -58,7 +56,8 @@
> 		SHARED_MODULES	"Enable shared modules support"			on  \
> 		ASSERT		"Enable debugging code"				off \
> 		SMALL_NET	"Tune server for small networks"		off \
>-		SERVICES	"Enable ratbox-services compatibility code"	off
>+		SERVICES	"Enable ratbox-services compatibility code"	off \
>+		SHORTCUTS	"Build with ircd-shortcut commands"		off
> 
> #----------------------------------------------------------------------
> 
>@@ -95,6 +94,16 @@
> 
> .if defined(WITH_SERVICES)
> CONFIGURE_ARGS+=	--enable-services
>+PLIST_SUB+=		SERVICES=""
>+.else
>+PLIST_SUB+=		SERVICES="@comment "
>+.endif
>+
>+.if defined(WITH_SHORTCUTS)
>+USE_PERL5_BUILD=	yes
>+PLIST_SUB+=		SHORTCUTS=""
>+.else
>+PLIST_SUB+=		SHORTCUTS="@comment "
> .endif
> 
> #-- User Configuration -------------------------------------------------
>@@ -126,14 +135,14 @@
> pre-build:
> 	@${REINPLACE_CMD} -e "s#-O2##" ${WRKSRC}/configure
> 	@${REINPLACE_CMD} -e "s#%%PREFIX%%#${PREFIX}#g"		\
>-			  ${WRKSRC}/doc/example.conf		\
>-			  ${WRKSRC}/doc/example.efnet.conf
>+			${WRKSRC}/doc/example.conf		\
>+			${WRKSRC}/doc/example.efnet.conf
> 	@${REINPLACE_CMD} -e "s#%%LOGDIR%%#${LOGDIR}#g"		\
>-				${WRKSRC}/doc/example.conf	\
>-				${WRKSRC}/doc/example.efnet.conf
>+			${WRKSRC}/doc/example.conf		\
>+			${WRKSRC}/doc/example.efnet.conf
> 	@${REINPLACE_CMD} -e "s#%%DBDIR%%#${DBDIR}#g"		\
>-				${WRKSRC}/doc/example.conf	\
>-				${WRKSRC}/doc/example.efnet.conf
>+			${WRKSRC}/doc/example.conf		\
>+			${WRKSRC}/doc/example.efnet.conf
> 	@${REINPLACE_CMD} -e "s#%%RUNDIR%%#${RUNDIR}#g" ${WRKSRC}/include/config.h
> 	@${REINPLACE_CMD} -e "s#%%DBDIR%%#${DBDIR}#g" ${WRKSRC}/include/config.h
> 	@${REINPLACE_CMD} -e "s#%%WRKSRC%%#${WRKSRC}#g" ${WRKSRC}/contrib/ircd-shortcut.pl
>@@ -177,18 +186,22 @@
> 	${WRKSRC}/contrib/ircd-shortcut.pl
> .endif
> 
>-#------ Execute ircd-shortcut perl script to generate the .c file. -----
>+# ----- Execute ircd-shortcut perl script to generate the .c file. -----
>+.if defined(WITH_SHORTCUTS)
> 	@${ECHO_MSG} "Executing ircd-shortcut.pl for ircd-shortcuts generation."
> 	${PERL} ${WRKSRC}/contrib/ircd-shortcut.pl
>+.endif
> 
> post-build:
> 	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \
> 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS}
> 
> # ----- Need to build the m_rsshortcut.so module for ircd-shortcut.pl ----
>+.if defined(WITH_SHORTCUTS)
> 	@${ECHO_MSG} "Building m_rsshortcut.la for ircd-shortcuts."
> 	@cd ${INSTALL_WRKSRC}/contrib && ${SETENV} ${MAKE_ENV} ${MAKE} \
> 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} m_rsshortcut.la
>+.endif
> 
> pre-su-install:
> 	${MKDIR} ${PREFIX}/etc/${PORTNAME}
>@@ -208,9 +221,11 @@
> 	${INSTALL_DATA} ${WRKSRC}/doc/genssl.sh ${PREFIX}/etc/${PORTNAME}/genssl.sh
> 
> # ----- We need to install the shortcut.pl module ----
>+.if defined(WITH_SHORTCUTS)
> 	@${ECHO_MSG} "Executing install-mod.sh for ircd-shortcuts module installation."
> 	${SH} ${WRKSRC}/install-mod.sh ${WRKSRC}/contrib/m_rsshortcut.la \
> 		${PREFIX}/lib/${PORTNAME}/modules/contrib
>+.endif
> 
> 	@if [ ! -f ${PREFIX}/etc/${PORTNAME}/ircd.conf ]; then \
> 		${ECHO} "Installing default configuration file."; \
>diff -ruN ircd-ratbox.orig/files/pkg-install.in ircd-ratbox/files/pkg-install.in
>--- ircd-ratbox.orig/files/pkg-install.in	2012-04-13 18:09:37.000000000 +0100
>+++ ircd-ratbox/files/pkg-install.in	2012-04-14 00:05:39.000000000 +0100
>@@ -29,12 +29,12 @@
> conffile="%%PREFIX%%/etc/ircd-ratbox/ircd.conf"
> samplefile="%%PREFIX%%/etc/ircd-ratbox/ircd.conf.sample"
> if cmp -s $conffile $samplefile; then
>-	echo "Setting permissions for config dir and files."
>+	echo "Setting default permissions for config dir and files."
> 	chown -R root:ircd %%PREFIX%%/etc/ircd-ratbox/
> 	chmod 750 %%PREFIX%%/etc/ircd-ratbox/
> 	chmod 640 %%PREFIX%%/etc/ircd-ratbox/*
> else
>-	echo "Modified ircd.conf file found, skipping perms setting."
>+	echo "Modified ircd.conf file found, permissions unchanged."
> fi
> 
> #-----------------------------------------------------------------------
>diff -ruN ircd-ratbox.orig/files/pkg-message.in ircd-ratbox/files/pkg-message.in
>--- ircd-ratbox.orig/files/pkg-message.in	2012-04-13 18:09:37.000000000 +0100
>+++ ircd-ratbox/files/pkg-message.in	2012-04-14 00:10:37.000000000 +0100
>@@ -1,5 +1,5 @@
> ------------------------------------------------------------------------
>-ircd-ratbox-devel has been successfully installed.
>+ircd-ratbox has been successfully installed.
> 
> Sample 'ircd.conf' and 'ircd.motd' files have been created in the
> ircd-ratbox configuration directory. A sample configuration file is
>@@ -17,15 +17,20 @@
> 
> 	%%PREFIX%%/etc/rc.d/ircd-ratbox conftest
> 
>-The ban.db database can be checked and updated using 'bantool -u'.
>-For safety, updates should be done while no ircd is running and before
>-starting the new version.
>+The ban.db database should be checked and updated using 'bantool -u'.
>+For safety, bantool updates must be done while no ircd is running and
>+before starting the new version.
> 
> 	%%PREFIX%%/bin/bantool -u
> 
>-Note that the ssl_only_channel compile option has been removed, and
>-should be added as a configuration setting (use_sslonly) in the
>-ircd.conf file in order to activate the +S channel mode. 
>+Notice: ircd-ratbox has been updated to follow the current stable
>+release branch (3.0.x). All previous branches are no longer supported
>+by the ratbox team. Users of ircd-ratbox are advised to create new ircd
>+configuration files based on the examples provided.
>+
>+For more information on upgrading, see:
>+
>+	http://svn.ratbox.org/svnroot/ircd-ratbox/trunk/INSTALL
> 
> Be sure to check out 'ratbox-services' if you need a services package.
> ------------------------------------------------------------------------
>diff -ruN ircd-ratbox.orig/pkg-descr ircd-ratbox/pkg-descr
>--- ircd-ratbox.orig/pkg-descr	2012-04-13 20:05:31.000000000 +0100
>+++ ircd-ratbox/pkg-descr	2012-04-13 18:16:50.000000000 +0100
>@@ -1,10 +1,5 @@
> This is a port of the ircd-ratbox IRC daemon.
> 
>-This version is the 'testing' branch; it usually contains more features,
>-but may contain as of yet unidentified bugs. Admins wishing to try out new
>-features or test the development release may prefer to use it over the
>-standard production release.
>-
> ircd-ratbox is the primary ircd used on EFnet; it combines the stability
> of an ircd required for a large production network together with a rich
> set of features, making it also suitable for use on smaller networks.
>diff -ruN ircd-ratbox.orig/pkg-plist ircd-ratbox/pkg-plist
>--- ircd-ratbox.orig/pkg-plist	2012-04-13 18:09:37.000000000 +0100
>+++ ircd-ratbox/pkg-plist	2012-04-13 23:51:44.000000000 +0100
>@@ -142,8 +142,8 @@
> lib/ircd-ratbox/libcore.so
> lib/ircd-ratbox/libratbox.la
> lib/ircd-ratbox/libratbox.so
>-@unexec f="%D/lib/ircd-ratbox/modules/autoload/m_services.so"; if [ -f "$f" ]; then rm -f "$f"; fi
>-@unexec f="%D/lib/ircd-ratbox/modules/autoload/m_services.la"; if [ -f "$f" ]; then rm -f "$f"; fi
>+%%SERVICES%%/lib/ircd-ratbox/modules/autoload/m_services.so
>+%%SERVICES%%/lib/ircd-ratbox/modules/autoload/m_services.la
> lib/ircd-ratbox/modules/autoload/m_accept.so
> lib/ircd-ratbox/modules/autoload/m_admin.so
> lib/ircd-ratbox/modules/autoload/m_adminwall.so
>@@ -198,6 +198,7 @@
> lib/ircd-ratbox/modules/autoload/m_whois.so
> lib/ircd-ratbox/modules/autoload/m_whowas.so
> lib/ircd-ratbox/modules/autoload/m_xline.so
>+%%SHORTCUTS%%lib/ircd-ratbox/modules/contrib/m_rsshortcut.so
> lib/ircd-ratbox/modules/contrib/example_module.so
> lib/ircd-ratbox/modules/contrib/m_42.so
> lib/ircd-ratbox/modules/contrib/m_clearchan.so
>@@ -216,7 +217,6 @@
> lib/ircd-ratbox/modules/contrib/spy_stats_p_notice.so
> lib/ircd-ratbox/modules/contrib/spy_whois_notice.so
> lib/ircd-ratbox/modules/contrib/spy_whois_notice_global.so
>-lib/ircd-ratbox/modules/contrib/m_rsshortcut.so
> lib/ircd-ratbox/modules/m_die.so
> lib/ircd-ratbox/modules/m_error.so
> lib/ircd-ratbox/modules/m_join.so

Actions: View | Diff

Attachments on bug 166931: 123566