Date: Tue, 26 Jun 2007 12:30:09 GMT From: Nikolay Pavlov <quetzal@zone3000.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/114034: Update port: net-im/openfire update to new version - openfire 3.3.2 Message-ID: <200706261230.l5QCU9p6032348@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/114034; it has been noted by GNATS. From: Nikolay Pavlov <quetzal@zone3000.net> To: bug-followup@FreeBSD.org, quetzal@zone3000.net Cc: Subject: Re: ports/114034: Update port: net-im/openfire update to new version - openfire 3.3.2 Date: Tue, 26 Jun 2007 15:24:06 +0300 --YZ5djTAD1cGYuMQK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Please do not use the first patch. Use the second one. Sorry for that noise. -- ====================================================================== - Best regards, Nikolay Pavlov. <<<----------------------------------- ====================================================================== --YZ5djTAD1cGYuMQK Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="openfire.diff" diff -urd openfire/Makefile openfire.new/Makefile --- openfire/Makefile Tue Jun 12 18:10:08 2007 +++ openfire.new/Makefile Tue Jun 26 14:54:39 2007 @@ -6,8 +6,7 @@ # PORTNAME= openfire -PORTVERSION= 3.3.1 -PORTREVISION= 1 +PORTVERSION= 3.3.2 CATEGORIES= net-im java MASTER_SITES= http://www.igniterealtime.org/downloadServlet?filename=openfire/ DISTNAME= ${PORTNAME}_src_${PORTVERSION:S/./_/g} @@ -38,7 +37,8 @@ MLINKS= ${VARLOG} ${DATADIR}/logs \ ${VARDB} ${DATADIR}/embedded-db \ - ${ETCDIR} ${DATADIR}/conf + ${ETCDIR} ${DATADIR}/conf \ + ${ETCDIR} ${DATADIR}/resources/security do-install: @@ -49,7 +49,7 @@ ${MKDIR} ${VARLOG}; ${MKDIR} ${VARDB}; - (cd ${INSTALL_WRKSRC}/resources && ${FIND} . \ + (cd ${INSTALL_WRKSRC}/resources && ${FIND} . \! -path ./security\* \ | ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/resources) (cd ${INSTALL_WRKSRC}/plugins && ${FIND} . \ @@ -67,9 +67,21 @@ post-install: ${MKDIR} ${EXAMPLESDIR}; ${CP} -p ${INSTALL_WRKSRC}/conf/openfire.xml ${EXAMPLESDIR}/openfire.xml + ${CP} -p ${INSTALL_WRKSRC}/resources/security/truststore \ + ${EXAMPLESDIR}/truststore + ${CP} -p ${INSTALL_WRKSRC}/resources/security/keystore \ + ${EXAMPLESDIR}/keystore @if [ ! -f ${ETCDIR}/openfire.xml ]; then \ ${MKDIR} ${ETCDIR}; \ ${CP} -p ${INSTALL_WRKSRC}/conf/openfire.xml ${ETCDIR}/openfire.xml; \ + fi + @if [ ! -f ${ETCDIR}/keystore ]; then \ + ${CP} -p ${INSTALL_WRKSRC}/resources/security/keystore \ + ${ETCDIR}/keystore; \ + fi + @if [ ! -f ${ETCDIR}/truststore ]; then \ + ${CP} -p ${INSTALL_WRKSRC}/resources/security/truststore \ + ${ETCDIR}/truststore; \ fi @PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL ${CHOWN} -R ${PUSER}:${PGROUP} ${ETCDIR} diff -urd openfire/distinfo openfire.new/distinfo --- openfire/distinfo Sun Jun 10 15:05:59 2007 +++ openfire.new/distinfo Tue Jun 26 12:12:30 2007 @@ -1,3 +1,3 @@ -MD5 (openfire_src_3_3_1.tar.gz) = a3f7d8bc58f85c7f6a93764ccaa94bd9 -SHA256 (openfire_src_3_3_1.tar.gz) = ace1324862e3906c457b8a20e918d2ac2af3ef328c8259081103de0e1b16ba95 -SIZE (openfire_src_3_3_1.tar.gz) = 48723953 +MD5 (openfire_src_3_3_2.tar.gz) = e156e12e098ee9a4f97ba7be84563233 +SHA256 (openfire_src_3_3_2.tar.gz) = bf8d3a7561d5a569c8fd5e22f384f56c6d6fcabd0a5167240590d873fa0a8377 +SIZE (openfire_src_3_3_2.tar.gz) = 48712324 diff -urd openfire/pkg-plist openfire.new/pkg-plist --- openfire/pkg-plist Sun Jun 10 15:05:59 2007 +++ openfire.new/pkg-plist Tue Jun 26 15:05:27 2007 @@ -1,7 +1,11 @@ @unexec %D/etc/rc.d/openfire stop > /dev/null 2>&1 || true @unexec if cmp -s %D/etc/openfire/openfire.xml %D/%%EXAMPLESDIR%%/openfire.xml; then rm -f %D/etc/openfire/openfire.xml; else echo If permanently deleting this package, %%PREFIX%%/etc/openfire/openfire.xml must be removed manually; fi +@unexec if cmp -s %D/etc/openfire/keystore %D/%%EXAMPLESDIR%%/keystore; then rm -f %D/etc/openfire/keystore; else echo If permanently deleting this package, %%PREFIX%%/etc/openfire/keystore must be removed manually; fi +@unexec if cmp -s %D/etc/openfire/truststore %D/%%EXAMPLESDIR%%/truststore; then rm -f %D/etc/openfire/truststore; else echo If permanently deleting this package, %%PREFIX%%/etc/openfire/truststore must be removed manually; fi @unexec [ -d %D/share/doc/openfire/javadoc ] && rm -rf %D/share/doc/openfire/javadoc %%EXAMPLESDIR%%/openfire.xml +%%EXAMPLESDIR%%/keystore +%%EXAMPLESDIR%%/truststore @exec [ -d /var/log/openfire ] || mkdir -p /var/log/openfire && chown openfire:openfire /var/log/openfire @exec [ -d /var/db/openfire ] || mkdir -p /var/db/openfire && chown openfire:openfire /var/db/openfire @exec [ -d %D/etc/openfire ] || mkdir -p %D/etc/openfire && chown openfire:openfire %D/etc/openfire @@ -265,23 +269,14 @@ share/java/openfire/resources/nativeAuth/osx-ppc/libshaj.jnilib share/java/openfire/resources/nativeAuth/solaris-sparc/libshaj.so share/java/openfire/resources/nativeAuth/win32-x86/shaj.dll -share/java/openfire/resources/security/keystore -share/java/openfire/resources/security/truststore -share/java/openfire/resources/spank/scripts/prototype.js -share/java/openfire/resources/spank/scripts/flash.js share/java/openfire/resources/spank/WEB-INF/web.xml -share/java/openfire/resources/spank/crossdomain_version6.swf share/java/openfire/resources/spank/index.html -share/java/openfire/resources/spank/crossdomain_version8.swf -share/java/openfire/resources/spank/flash6_gateway.swf @exec [ -d %%PREFIX%%/%%DATADIR%% ] && chown -R openfire:openfire %%PREFIX%%/%%DATADIR%% share/nls/POSIX share/nls/en_US.US-ASCII @dirrm share/java/openfire/resources/spank/WEB-INF -@dirrm share/java/openfire/resources/spank/scripts @dirrm share/java/openfire/resources/spank -@dirrm share/java/openfire/resources/security @dirrm share/java/openfire/resources/nativeAuth/win32-x86 @dirrm share/java/openfire/resources/nativeAuth/solaris-sparc @dirrm share/java/openfire/resources/nativeAuth/osx-ppc --YZ5djTAD1cGYuMQK--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706261230.l5QCU9p6032348>