Attachment 82323 Details for Bug 117767 – openfire.diff

[patch] openfire.diff

openfire.diff (text/x-diff; charset="utf-8"), 7.73 KB, created by Nikolay Pavlov on 2007-12-13 18:16:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolay Pavlov

Created: 2007-12-13 18:16:13 UTC

Size: 7.73 KB

patch

obsolete

>diff -urd openfire/Makefile openfire.new/Makefile
>--- openfire/Makefile	Thu Dec 13 13:09:16 2007
>+++ openfire.new/Makefile	Thu Dec 13 08:19:53 2007
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	openfire
>-PORTVERSION=	3.3.3
>+PORTVERSION=	3.4.2
> CATEGORIES=	net-im java
> MASTER_SITES=	http://www.igniterealtime.org/downloadServlet?filename=openfire/
> DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/./_/g}
>diff -urd openfire/distinfo openfire.new/distinfo
>--- openfire/distinfo	Thu Dec 13 13:09:16 2007
>+++ openfire.new/distinfo	Thu Dec 13 08:23:01 2007
>@@ -1,3 +1,3 @@
>-MD5 (openfire_src_3_3_3.tar.gz) = e9b01da5dab0eea51f46399857322109
>-SHA256 (openfire_src_3_3_3.tar.gz) = e52a60f8d9042a9e58b81701d4dead5889caa999d40f6e20bca7eb1c5fef5338
>-SIZE (openfire_src_3_3_3.tar.gz) = 54051765
>+MD5 (openfire_src_3_4_2.tar.gz) = a36b52d2d959fd355b5c545535f10acb
>+SHA256 (openfire_src_3_4_2.tar.gz) = 97190be43f372aed72e08b58bd5089cc375d203d87e07571a8d084bd023162cf
>+SIZE (openfire_src_3_4_2.tar.gz) = 48920834
>diff -urd openfire/files/pkg-message.in openfire.new/files/pkg-message.in
>--- openfire/files/pkg-message.in	Thu Dec 13 13:09:16 2007
>+++ openfire.new/files/pkg-message.in	Thu Nov  1 06:39:54 2007
>@@ -1,45 +1,4 @@
>-NOTE: 
>-Due to the name change the product releases will work as follows:
>-
>-o  3.2.x series: these releases will continue to use the Wildfire name so
>-   that critical bug fixes can be delivered with minimal hassle to existing
>-   users. 
>-   (net-im/wildfire)
>-
>-o  3.3.x series: starting with 3.3.0, the server is called Openfire. 
>-   There will be a small amount of upgrade pain associated with this release
>-   since configuration files like wildfire.xml will now be openfire.xml, etc.
>-   (net-im/openfire)
>-
>-WARNING:
>-===========================================================================
>-This is an upgrade procedure from wildfire 3.2.4 to openfire 3.3.0:
>-
>-1) Stop the wildfire server if it still running.
>-2) Back up setup.
>-3) Go to %%ETCDIR%% and copy configuration from old setup
>-   a) Copy wildfire.xml and rename it to openfire.xml.
>-   b) Search for org.jivesoftware.wildfire. and replace with
>-      org.jivesoftware.openfire. in openfire.xml
>-   c) Change owner for configurations files:
>-      chown -R openfire:openfire %%ETCDIR%%
>-4) If using embedded database:
>-   a) Copy and rename files:
>-      /var/db/wildfire/wildfire* files to /var/db/openfire/openfire*
>-   b) Change owner for the database files:
>-      chown -R openfire:openfire /var/db/openfire
>-5) Copy old certificates from resources/security directory to same 
>-   location in openfire. If you are using self-signed certificates then 
>-   regenerate them after start up.
>-6) Start up the server using new rc script:
>-   a) Add openfire_enable="YES" into rc.conf file.
>-   b) %%PREFIX%%/etc/rc.d/openfire start
>-7) Reinstall the plugins.
>-8) If at that point you want to downgrade to wildfire 3.2.4 for some
>-   reason please be sure to reinstall the wildfire port.
>-===========================================================================
>-
>-You can find the documentation files for this package in the 
>-directory %%DOCSDIR%%.
>-To enable openfire startup script please add openfire_enable="YES" 
>-in your rc.conf
>+You can find the documentation files for this package in
>+%%DOCSDIR%%.
>+To enable openfire startup script please add openfire_enable="YES" in 
>+your rc.conf file.
>diff -urd openfire/pkg-plist openfire.new/pkg-plist
>--- openfire/pkg-plist	Thu Dec 13 13:09:16 2007
>+++ openfire.new/pkg-plist	Thu Nov  1 06:40:47 2007
>@@ -37,6 +37,8 @@
> %%PORTDOCS%%%%DOCSDIR%%/style.css
> %%PORTDOCS%%%%DOCSDIR%%/translator-guide.html
> %%PORTDOCS%%%%DOCSDIR%%/upgrade-guide.html
>+%%PORTDOCS%%%%DOCSDIR%%/wildfire-ent-3_2_0-upgrade.html
>+%%PORTDOCS%%%%DOCSDIR%%/wildfire-openfire-upgrade.html
> %%JAVAJARDIR%%/activation.jar
> %%JAVAJARDIR%%/bouncycastle.jar
> %%JAVAJARDIR%%/commons-el.jar
>@@ -57,11 +59,10 @@
> %%DATADIR%%/plugins/admin/webapp/WEB-INF/dwr.xml
> %%DATADIR%%/plugins/admin/webapp/WEB-INF/lib/admin-jsp.jar
> %%DATADIR%%/plugins/admin/webapp/WEB-INF/lib/dwr.jar
>+%%DATADIR%%/plugins/admin/webapp/WEB-INF/lib/commons-io.jar
>+%%DATADIR%%/plugins/admin/webapp/WEB-INF/lib/commons-fileupload.jar
> %%DATADIR%%/plugins/admin/webapp/WEB-INF/sitemesh.xml
> %%DATADIR%%/plugins/admin/webapp/WEB-INF/web.xml
>-%%DATADIR%%/plugins/admin/webapp/images/clearspace.gif
>-%%DATADIR%%/plugins/admin/webapp/images/certificate_warning-16x16.png
>-%%DATADIR%%/plugins/admin/webapp/images/certificate_ok-16x16.png
> %%DATADIR%%/plugins/admin/webapp/images/add-16x16.gif
> %%DATADIR%%/plugins/admin/webapp/images/aim.gif
> %%DATADIR%%/plugins/admin/webapp/images/arrow_right_blue.gif
>@@ -72,7 +73,11 @@
> %%DATADIR%%/plugins/admin/webapp/images/bullet-yellow-14x14.gif
> %%DATADIR%%/plugins/admin/webapp/images/bullet.gif
> %%DATADIR%%/plugins/admin/webapp/images/cache-16x16.gif
>+%%DATADIR%%/plugins/admin/webapp/images/certificate_warning-16x16.png
>+%%DATADIR%%/plugins/admin/webapp/images/certificate_ok-16x16.png
> %%DATADIR%%/plugins/admin/webapp/images/check.gif
>+%%DATADIR%%/plugins/admin/webapp/images/check-16x16.gif
>+%%DATADIR%%/plugins/admin/webapp/images/clearspace.gif
> %%DATADIR%%/plugins/admin/webapp/images/connection-manager_16x16.gif
> %%DATADIR%%/plugins/admin/webapp/images/delete-16x16.gif
> %%DATADIR%%/plugins/admin/webapp/images/doc-changelog-16x16.gif
>@@ -80,6 +85,7 @@
> %%DATADIR%%/plugins/admin/webapp/images/doc-readme-16x16.gif
> %%DATADIR%%/plugins/admin/webapp/images/edit-16x16.gif
> %%DATADIR%%/plugins/admin/webapp/images/error-16x16.gif
>+%%DATADIR%%/plugins/admin/webapp/images/feed-icon-16x16.gif
> %%DATADIR%%/plugins/admin/webapp/images/forbidden-16x16.gif
> %%DATADIR%%/plugins/admin/webapp/images/greenlight-24x24.gif
> %%DATADIR%%/plugins/admin/webapp/images/header-background_new.gif
>@@ -111,6 +117,7 @@
> %%DATADIR%%/plugins/admin/webapp/images/redlight-24x24.gif
> %%DATADIR%%/plugins/admin/webapp/images/refresh-16x16.gif
> %%DATADIR%%/plugins/admin/webapp/images/server_16x16.gif
>+%%DATADIR%%/plugins/admin/webapp/images/server-network-24x24.gif
> %%DATADIR%%/plugins/admin/webapp/images/setup-header.png
> %%DATADIR%%/plugins/admin/webapp/images/setup-sidebar-bottom.gif
> %%DATADIR%%/plugins/admin/webapp/images/setup-sidebar-top.gif
>@@ -210,6 +217,20 @@
> %%DATADIR%%/resources/database/upgrade/11/openfire_hsqldb.sql
> %%DATADIR%%/resources/database/upgrade/11/openfire_oracle.sql
> %%DATADIR%%/resources/database/upgrade/11/openfire_sqlserver.sql
>+%%DATADIR%%/resources/database/upgrade/12/openfire_db2.sql
>+%%DATADIR%%/resources/database/upgrade/12/openfire_sybase.sql
>+%%DATADIR%%/resources/database/upgrade/12/openfire_sqlserver.sql
>+%%DATADIR%%/resources/database/upgrade/12/openfire_postgresql.sql
>+%%DATADIR%%/resources/database/upgrade/12/openfire_hsqldb.sql
>+%%DATADIR%%/resources/database/upgrade/12/openfire_mysql.sql
>+%%DATADIR%%/resources/database/upgrade/12/openfire_oracle.sql
>+%%DATADIR%%/resources/database/upgrade/13/openfire_db2.sql
>+%%DATADIR%%/resources/database/upgrade/13/openfire_sqlserver.sql
>+%%DATADIR%%/resources/database/upgrade/13/openfire_postgresql.sql
>+%%DATADIR%%/resources/database/upgrade/13/openfire_hsqldb.sql
>+%%DATADIR%%/resources/database/upgrade/13/openfire_oracle.sql
>+%%DATADIR%%/resources/database/upgrade/13/openfire_mysql.sql
>+%%DATADIR%%/resources/database/upgrade/13/openfire_sybase.sql
> %%DATADIR%%/resources/database/upgrade/2/openfire_db2.sql
> %%DATADIR%%/resources/database/upgrade/2/openfire_hsqldb.sql
> %%DATADIR%%/resources/database/upgrade/2/openfire_mysql.sql
>@@ -293,6 +314,8 @@
> @dirrm %%DATADIR%%/resources/database/upgrade/2
> @dirrm %%DATADIR%%/resources/database/upgrade/10
> @dirrm %%DATADIR%%/resources/database/upgrade/11
>+@dirrm %%DATADIR%%/resources/database/upgrade/12
>+@dirrm %%DATADIR%%/resources/database/upgrade/13
> @dirrm %%DATADIR%%/resources/database/upgrade/1
> @dirrm %%DATADIR%%/resources/database/upgrade
> @dirrm %%DATADIR%%/resources/database

Actions: View | Diff

Attachments on bug 117767: 82322 | 82323