Attachment 57424 Details for Bug 86659 – openacs-5.1.5.patch

[patch] openacs-5.1.5.patch

openacs-5.1.5.patch (text/plain), 5.92 KB, created by Charlie & on 2005-09-28 03:00:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Charlie &

Created: 2005-09-28 03:00:29 UTC

Size: 5.92 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/ncvs/ports/www/openacs/Makefile,v
>retrieving revision 1.2
>diff -u -r1.2 Makefile
>--- Makefile	9 Sep 2005 04:44:38 -0000	1.2
>+++ Makefile	28 Sep 2005 01:41:26 -0000
>@@ -33,7 +33,12 @@
> PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
> .if defined(WITH_POSTCONFIG)
> POSTCONFIG=	true
>-PKGNAMESUFFIX= -withconfig
>+PKGNAMESUFFIX=	-withconfig
>+.endif
>+
>+.if defined(WITH_DT)
>+DT=		true
>+RUN_DEPENDS+=	${LOCALBASE}/bin/supervise:${PORTSDIR}/sysutils/daemontools
> .endif
> 
> SUB_FILES=	pkg-install pkg-message pkg-deinstall post-config
>@@ -41,7 +46,7 @@
> 		OPENACSBASE=${OPENACSBASE} OPENACS_GROUP=${OPENACS_GROUP} \
> 		OPENACS_USER=${OPENACS_USER} DB=${DB} PGDATA=${PGDATA} \
> 		PG_USER=${PG_USER} PGBASE=${PGBASE} \
>-		DTSERVICEBASE=${DTSERVICEBASE} \
>+		DTSERVICEBASE=${DTSERVICEBASE} DT=${DT} \
> 		AOLSERVERBASE=${AOLSERVERBASE} VIRTUALBASE=${VIRTUALBASE}
> 
> RUN_DEPENDS+=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash \
>@@ -60,8 +65,8 @@
> .endif
> 
> RUN_DEPENDS+=	${LOCALBASE}/lib/tdom0.8.0/libtdom0.8.0.so:${PORTSDIR}/www/tdom \
>-		${LOCALBASE}/tclwebtest-1.0/tclwebtest:${PORTSDIR}/www/tclwebtest \
>-		${LOCALBASE}/bin/supervise:${PORTSDIR}/sysutils/daemontools
>+		${LOCALBASE}/tclwebtest-1.0/tclwebtest:${PORTSDIR}/www/tclwebtest
>+
> USE_LINUX=	YES
> 
> NO_BUILD=	YES
>@@ -83,14 +88,12 @@
> 	@${MKDIR} ${EXAMPLESDIR}
> 	@${MKDIR} ${OPENACSBASE}
> 	@${MKDIR} ${VIRTUALBASE}
>-	@${MKDIR} ${DTSERVICEBASE}
> 
> 	@${ECHO_CMD} "Installing files"
> 	@${CP} -R ${WRKSRC} ${OPENACSBASE}/${OPENACS_USER}
> 
> 	@${TEST} -e ${VIRTUALBASE}/aolserver || ${LN} -s ${OPENACSBASE} ${VIRTUALBASE}/aolserver
> 	@${TEST} -L ${VIRTUALBASE}/aolserver || ${ECHO_MSG} "${VIRTUALBASE}/aolserver is no symbolic link"
>-	@${TEST} -L ${DTSERVICEBASE}/${OPENACS_USER} || ${LN} -s ${OPENACSBASE}/${OPENACS_USER}/etc/daemontools ${DTSERVICEBASE}/${OPENACS_USER}
> 
> 	@${INSTALL_SCRIPT} ${OPENACSBASE}/${OPENACS_USER}/packages/acs-core-docs/www/files/nsd-postgres.txt ${EXAMPLESDIR}/nsd-postgres
> 	@${INSTALL_SCRIPT} ${OPENACSBASE}/${OPENACS_USER}/packages/acs-core-docs/www/files/nsd-oracle.txt ${EXAMPLESDIR}/nsd-oracle
>@@ -116,7 +119,7 @@
> 		" ${OPENACSBASE}/${OPENACS_USER}/etc/daemontools/run
> 
> 	@${ECHO_CMD} "@unexec rm -f ${DATADIR}/log/${OPENACS_USER}* 2>&1 > /dev/null || true" >> ${TMPPLIST}
>-	@${ECHO_CMD} "@unexec rm -f ${DATADIR}/log/error.log 2>&1 > /dev/null || true" >> ${TMPPLIST}
>+	@${ECHO_CMD} "@unexec rm -f ${DATADIR}/log/error.log* 2>&1 > /dev/null || true" >> ${TMPPLIST}
> 	@${ECHO_CMD} "@unexec rm -Rf ${DATADIR}/apm-workspace 2>&1 > /dev/null || true" >> ${TMPPLIST}
> 	@${ECHO_CMD} "@unexec rm -Rf ${DATADIR}/etc/daemontools/supervise 2>&1 > /dev/null || true" >> ${TMPPLIST}
> 	@${FIND} -s ${WRKSRC} -not -type d \
>@@ -124,9 +127,14 @@
> 	@${FIND} -s -d ${WRKSRC} -type d \
> 		| ${SED} -ne 's,^${WRKSRC},@dirrm ${DATADIR:S,^${PREFIX}/,,},p' >> ${TMPPLIST}
> 	@${ECHO_CMD} "@dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
>-	@${ECHO_CMD} "@cd ${DTSERVICEBASE}" >> ${TMPPLIST}
>-	@${ECHO_CMD} "${OPENACS_USER}" >> ${TMPPLIST}
>-	@${ECHO_CMD} "@unexec rmdir ${DTSERVICEBASE} 2>&1 > /dev/null || true" >> ${TMPPLIST}
>+
>+	if [ ${DT} ] ; then \
>+	@${MKDIR} ${DTSERVICEBASE} ; \
>+	@${TEST} -L ${DTSERVICEBASE}/${OPENACS_USER} || ${LN} -s ${OPENACSBASE}/${OPENACS_USER}/etc/daemontools ${DTSERVICEBASE}/${OPENACS_USER} ; \
>+	@${ECHO_CMD} "@cd ${DTSERVICEBASE}" >> ${TMPPLIST} ; \
>+	@${ECHO_CMD} "${OPENACS_USER}" >> ${TMPPLIST} ; \
>+	@${ECHO_CMD} "@unexec rmdir ${DTSERVICEBASE} 2>&1 > /dev/null || true" >> ${TMPPLIST} ; \
>+	fi
> 
> 	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
> 	@${CAT} ${PKGMESSAGE}
>Index: files/pkg-install.in
>===================================================================
>RCS file: /home/ncvs/ports/www/openacs/files/pkg-install.in,v
>retrieving revision 1.2
>diff -u -r1.2 pkg-install.in
>--- files/pkg-install.in	9 Sep 2005 04:44:38 -0000	1.2
>+++ files/pkg-install.in	28 Sep 2005 01:41:26 -0000
>@@ -8,6 +8,7 @@
> OPENACS_GROUP=%%OPENACS_GROUP%%
> OPENACS_USER=%%OPENACS_USER%%
> DB=%%DB%%
>+DT=%%DT%%
> PGDATA=%%PGDATA%%
> PG_USER=%%PG_USER%%
> PGBASE=%%PGBASE%%
>@@ -82,6 +83,13 @@
> 	echo "${RCCONF}: adding entries" && \
> 	echo "# OPENACS-entries in rc.conf:" >> ${RCCONF} && \
> 	echo "ldconfig_paths=\"/usr/lib/compat /usr/X11R6/lib ${LOCALBASE}/lib ${PGBASE}/lib ${AOLSERVERBASE}/lib\" " >> ${RCCONF} && \
>+	echo "postgresql_enable=\"YES\"" >> ${RCCONF} && \
>+	echo "postgresql_data=\"${PGDATA}\"" >> ${RCCONF} && \
>+	echo "postgresql_flags=\" -l ${PGDATA}/server.log\"" >> ${RCCONF} && \
>+	echo "aolserver_enable=\"YES\"" >> ${RCCONF} && \
>+	echo "aolserver_conf=\"${OPENACSBASE}/${OPENACS_USER}/etc/config.tcl\"" >> ${RCCONF} && \
>+	echo "aolserver_flags=\"-u ${OPENACS_USER} -g ${OPENACS_GROUP} -b 0.0.0.0:8000\"" >> ${RCCONF} && \
>+	echo "aolserver_prog=\"${EXAMPLESDIR}/nsd-postgres\"" >> ${RCCONF} && \
> 	echo "# end of OPENACS-entries." >> ${RCCONF}
> fi
> 
>@@ -107,9 +115,10 @@
> 	echo "Set permissions of files"
> 	chmod -R 770 ${OPENACSBASE}/${OPENACS_USER}
> 	chmod -R 770 ${EXAMPLESDIR}
>-	chmod -R 755 ${DTSERVICEBASE}/${OPENACS_USER}
>-     	chmod 1755 ${DTSERVICEBASE}
>- 
>+if [ ${DT} ]  ; then \
>+	chmod -R 755 ${DTSERVICEBASE}/${OPENACS_USER} ; \
>+     	chmod 1755 ${DTSERVICEBASE} ; \
>+fi
> 	chown -R ${OPENACS_USER}:${OPENACS_GROUP} ${OPENACSBASE}/${OPENACS_USER}
> 	chown root:${OPENACS_GROUP} ${EXAMPLESDIR}/nsd-postgres ${EXAMPLESDIR}/nsd-oracle
> 
>Index: files/pkg-message.in
>===================================================================
>RCS file: /home/ncvs/ports/www/openacs/files/pkg-message.in,v
>retrieving revision 1.2
>diff -u -r1.2 pkg-message.in
>--- files/pkg-message.in	9 Sep 2005 04:44:38 -0000	1.2
>+++ files/pkg-message.in	28 Sep 2005 01:41:26 -0000
>@@ -34,7 +34,7 @@
> should work just fine.
> 
> To view your pages at port 80 you will have to change:
>-daemontools/run and config.tcl in
>+%%RCCONF%%, daemontools/run and config.tcl in
> %%VIRTUALBASE%%/aolserver/%%OPENACS_USER%%/etc.
> 
> If you install .LRN as well as openACS the IP address in config.tcl

Actions: View | Diff

Attachments on bug 86659: 57424