View | Details | Raw Unified | Return to bug 40289 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/ports/www/horde/Makefile (-17 / +22 lines)
Lines 32-37 Link Here
32
.endif
32
.endif
33
33
34
NO_BUILD=	yes
34
NO_BUILD=	yes
35
USE_REINPLACE=	yes
36
37
REINPLACE_ARGS=	-i.beforeHorde
35
DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/DATABASE \
38
DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/DATABASE \
36
		docs/HELP docs/INSTALL docs/SECURITY
39
		docs/HELP docs/INSTALL docs/SECURITY
37
40
Lines 89-111 Link Here
89
	${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${HORDEDIR}
92
	${CP} -Rp ${WRKSRC}/locale ${WRKSRC}/scripts ${WRKSRC}/templates ${HORDEDIR}
90
	${CP} -p  ${WRKSRC}/phplib/* ${PHPLIBDIR}
93
	${CP} -p  ${WRKSRC}/phplib/* ${PHPLIBDIR}
91
	${CP} -p  ${WRKSRC}/*.php3 ${HORDEDIR}
94
	${CP} -p  ${WRKSRC}/*.php3 ${HORDEDIR}
92
	${CP} -p  ${WRKSRC}/install.sh ${HORDESBIN}/horde_setup.sh
95
	${REINPLACE_CMD} -e "s:-d imp:-d ${HORDEDIR}/imp:g	; \
93
	${CP} -p  ${WRKSRC}/secure.sh  ${HORDESBIN}/horde_secure.sh
96
		s:config/horde:${HORDEDIR}/config/horde:g	; \
94
	${PERL} -pi -e "s:chmod 444 :chmod 444 ${HORDEDIR}/:g" ${HORDESBIN}/horde_secure.sh
97
		s:imp/config:${HORDEDIR}/imp/config:g		; \
95
	${PERL} -pi -e "s:chmod 000 :chmod 000 ${HORDEDIR}/:g" ${HORDESBIN}/horde_secure.sh
98
		s:chmod 444 :chmod 444 ${HORDEDIR}/:g" ${WRKSRC}/install.sh
96
	${PERL} -pi -e "s:-d imp:-d ${HORDEDIR}/imp:g" ${HORDESBIN}/horde_setup.sh
99
	${CP} ${WRKSRC}/install.sh ${HORDESBIN}/horde_setup.sh
97
	${PERL} -pi -e "s:config/horde:${HORDEDIR}/config/horde:g" ${HORDESBIN}/horde_setup.sh
100
	${REINPLACE_CMD} -e "s:%%HORDEDIR%%:${HORDEDIR}:g" ${WRKSRC}/secure.sh
98
	${PERL} -pi -e "s:imp/config:${HORDEDIR}/imp/config:g" ${HORDESBIN}/horde_setup.sh
101
	${CP} ${WRKSRC}/secure.sh  ${HORDESBIN}/horde_secure.sh
99
	${PERL} -pi -e "s:chmod 444 :chmod 444 ${HORDEDIR}/:g" ${HORDESBIN}/horde_setup.sh
100
	${CHMOD} u+x ${HORDESBIN}/horde_secure.sh
102
	${CHMOD} u+x ${HORDESBIN}/horde_secure.sh
101
	${CHMOD} u+x ${HORDESBIN}/horde_setup.sh
103
	${CHMOD} u+x ${HORDESBIN}/horde_setup.sh
102
	${PERL} -pi -e "s:go to the top level directory for your installation and run:run:g"	\
104
	${REINPLACE_CMD} -e "s:go to the top level directory for your installation and run:run:g ; \
103
		${HORDEDIR}/setup.php3
105
		s:sh ./install.sh:${HORDESBIN}/horde_setup.sh:g" ${HORDEDIR}/setup.php3
104
	${PERL} -pi -e "s:sh ./install.sh:${HORDESBIN}/horde_setup.sh:g" ${HORDEDIR}/setup.php3
106
	@${RM} ${HORDEDIR}/setup.php3.beforeHorde
105
	${PERL} -pi -e "s:sh ./install.sh:${HORDESBIN}/horde_setup.sh:g"	\
107
	${REINPLACE_CMD} -e "s:sh ./install.sh:${HORDESBIN}/horde_setup.sh:g"	\
106
		${HORDEDIR}/templates/index/horde_notconfigured.inc
108
		${HORDEDIR}/templates/index/horde_notconfigured.inc
107
	${PERL} -pi -e "s:sh ./secure.sh:${HORDESBIN}/horde_secure.sh:g"	\
109
	@${RM} ${HORDEDIR}/templates/index/horde_notconfigured.inc.beforeHorde
110
	${REINPLACE_CMD} -e "s:sh ./secure.sh:${HORDESBIN}/horde_secure.sh:g"	\
108
		${HORDEDIR}/templates/setup/imp/write_file.inc
111
		${HORDEDIR}/templates/setup/imp/write_file.inc
112
	@${RM} ${HORDEDIR}/templates/setup/imp/write_file.inc.beforeHorde
109
	${CP}     ${HORDEDIR}/config/horde.php3.dist ${HORDEDIR}/config/horde.php3
113
	${CP}     ${HORDEDIR}/config/horde.php3.dist ${HORDEDIR}/config/horde.php3
110
	${CHMOD}  444 ${HORDEDIR}/config/horde.php3
114
	${CHMOD}  444 ${HORDEDIR}/config/horde.php3
111
	${CHMOD}  444 ${HORDEDIR}/setup.php3
115
	${CHMOD}  444 ${HORDEDIR}/setup.php3
Lines 129-136 Link Here
129
	    (if [ ! -f ${APACHE_CONF}.beforeHorde ] ; then \
133
	    (if [ ! -f ${APACHE_CONF}.beforeHorde ] ; then \
130
		${ECHO} "===> Updating httpd.conf..." ; \
134
		${ECHO} "===> Updating httpd.conf..." ; \
131
		${CP} -p ${MASTERDIR}/httpd.conf.phplib ${WRKDIR}/httpd.conf.phplib ; \
135
		${CP} -p ${MASTERDIR}/httpd.conf.phplib ${WRKDIR}/httpd.conf.phplib ; \
132
		${PERL} -pi -e "s:/home/httpd/html/horde:${HORDEDIR}:g" ${WRKDIR}/httpd.conf.phplib ; \
136
		${REINPLACE_CMD} -e "s:/home/httpd/html/horde:${HORDEDIR}:g ; \
133
		${PERL} -pi -e "s:/home/httpd/phplib:${PHPLIBDIR}:g" ${WRKDIR}/httpd.conf.phplib ; \
137
			s:/home/httpd/phplib:${PHPLIBDIR}:g" ${WRKDIR}/httpd.conf.phplib ; \
134
		${CP} -p ${APACHE_CONF} ${APACHE_CONF}.beforeHorde ; \
138
		${CP} -p ${APACHE_CONF} ${APACHE_CONF}.beforeHorde ; \
135
		${GREP} -qw 'phplib' ${APACHE_CONF} || ${CAT} ${WRKDIR}/httpd.conf.phplib >> ${APACHE_CONF} ; \
139
		${GREP} -qw 'phplib' ${APACHE_CONF} || ${CAT} ${WRKDIR}/httpd.conf.phplib >> ${APACHE_CONF} ; \
136
	    fi) ; \
140
	    fi) ; \
Lines 141-148 Link Here
141
	fi
145
	fi
142
	@if ! ${GREP} -q -e '^upload_tmp_dir' ${PHP_INI} ; then \
146
	@if ! ${GREP} -q -e '^upload_tmp_dir' ${PHP_INI} ; then \
143
		${ECHO_MSG} "===> Configuring ${PHP_INI} for imp" ; \
147
		${ECHO_MSG} "===> Configuring ${PHP_INI} for imp" ; \
144
		${CP} -p ${PHP_INI} ${PHP_INI}.beforeHorde1 ; \
148
		${REINPLACE_CMD} -e 's!;upload_tmp_dir =!upload_tmp_dir = /tmp!' \
145
		${PERL} -pi -e 's!;upload_tmp_dir =!upload_tmp_dir = /tmp!' ${PHP_INI} ; \
149
			${PHP_INI} ; \
150
		${MV} ${PHP_INI}.beforeHorde ${PHP_INI}.beforeHorde1 ; \
146
	fi
151
	fi
147
	${CHOWN} -R www:www ${HORDEDIR}
152
	${CHOWN} -R www:www ${HORDEDIR}
148
.if !defined(NOPORTDOCS)
153
.if !defined(NOPORTDOCS)
(-)/usr/ports/www/horde/files/patch-secure.sh (+28 lines)
Line 0 Link Here
1
--- secure.sh.orig	Sun May 28 05:09:52 2000
2
+++ secure.sh	Sun Jul  7 11:37:19 2002
3
@@ -1,17 +1,17 @@
4
 #!/bin/sh
5
 
6
 # Horde Items
7
-chmod 444 config/horde.php3         > /dev/null 2> /dev/null
8
-chmod 444 lib/horde.lib                > /dev/null 2> /dev/null
9
-chmod 444 lib/mime.lib                 > /dev/null 2> /dev/null
10
+chmod 444 %%HORDEDIR%%/config/horde.php3            > /dev/null 2> /dev/null
11
+chmod 444 %%HORDEDIR%%/lib/horde.lib                > /dev/null 2> /dev/null
12
+chmod 444 %%HORDEDIR%%/lib/mime.lib                 > /dev/null 2> /dev/null
13
 
14
 # IMP Items
15
-chmod 444 imp/config/defaults.php3     > /dev/null 2> /dev/null
16
-chmod 444 imp/lib/imp.lib              > /dev/null 2> /dev/null
17
-chmod 444 imp/lib/mimetypes.lib        > /dev/null 2> /dev/null
18
+chmod 444 %%HORDEDIR%%/imp/config/defaults.php3     > /dev/null 2> /dev/null
19
+chmod 444 %%HORDEDIR%%/imp/lib/imp.lib              > /dev/null 2> /dev/null
20
+chmod 444 %%HORDEDIR%%/imp/lib/mimetypes.lib        > /dev/null 2> /dev/null
21
 
22
-chmod 000 setup.php3                   > /dev/null 2> /dev/null
23
-chmod 000 test.php3                    > /dev/null 2> /dev/null
24
+chmod 000 %%HORDEDIR%%/setup.php3                   > /dev/null 2> /dev/null
25
+chmod 000 %%HORDEDIR%%/test.php3                    > /dev/null 2> /dev/null
26
 
27
 echo 
28
 echo I have made your configuration files, and libraries mode 0444

Return to bug 40289