diff options
Diffstat (limited to 'net-im/openfire/files')
| -rw-r--r-- | net-im/openfire/files/openfire.in | 6 | ||||
| -rw-r--r-- | net-im/openfire/files/patch-build_build.xml | 10 | ||||
| -rw-r--r-- | net-im/openfire/files/patch-pre-xmpp-dialback-fix.diff | 17 |
3 files changed, 3 insertions, 30 deletions
diff --git a/net-im/openfire/files/openfire.in b/net-im/openfire/files/openfire.in index 118bb35fe4b3..463549cadcc0 100644 --- a/net-im/openfire/files/openfire.in +++ b/net-im/openfire/files/openfire.in @@ -14,7 +14,7 @@ # Set it to required username. # openfire_group (group): Set to openfire by default. # Set it to required group. -# openfire_libdir (path): Set to %%JAVAJARDIR%% by default. +# openfire_libdir (path): Set to %%DATADIR%%/lib by default. # Set it to java classes directory. # openfire_home (path): Set to %%DATADIR%% by default. # Set it to java home directory. @@ -31,7 +31,7 @@ load_rc_config $name : ${openfire_enable:=NO} : ${openfire_user:=${name}} : ${openfire_group:=${name}} -: ${openfire_libdir:=%%JAVAJARDIR%%} +: ${openfire_libdir:=%%DATADIR%%/lib} : ${openfire_home:=%%DATADIR%%} : ${openfire_javargs:='-Xmx256M'} @@ -43,7 +43,7 @@ java_options=" -server -jar ${openfire_javargs} \ -DopenfireHome=${openfire_home}" java_command=" %%LOCALBASE%%/bin/java ${java_options} \ - %%JAVAJARDIR%%/startup.jar" + %%DATADIR%%/lib/startup.jar" # Subvert the check_pid_file procname check. if [ -f $pidfile ]; then diff --git a/net-im/openfire/files/patch-build_build.xml b/net-im/openfire/files/patch-build_build.xml deleted file mode 100644 index a35c909f55fd..000000000000 --- a/net-im/openfire/files/patch-build_build.xml +++ /dev/null @@ -1,10 +0,0 @@ ---- build/build.xml.orig 2011-09-19 13:48:53.000000000 +0200 -+++ build/build.xml 2011-09-19 13:49:04.000000000 +0200 -@@ -234,6 +234,7 @@ - <or> - <contains string="${ant.java.version}" substring="1.5"/> - <contains string="${ant.java.version}" substring="1.6"/> -+ <contains string="${ant.java.version}" substring="1.7"/> - </or> - </not> - </condition> diff --git a/net-im/openfire/files/patch-pre-xmpp-dialback-fix.diff b/net-im/openfire/files/patch-pre-xmpp-dialback-fix.diff deleted file mode 100644 index 37ff1faf5c71..000000000000 --- a/net-im/openfire/files/patch-pre-xmpp-dialback-fix.diff +++ /dev/null @@ -1,17 +0,0 @@ -Index: src/java/org/jivesoftware/openfire/session/LocalIncomingServerSession.java -=================================================================== ---- src/java/org/jivesoftware/openfire/session/LocalIncomingServerSession.java (wersja 12902) -+++ src/java/org/jivesoftware/openfire/session/LocalIncomingServerSession.java (kopia robocza) -@@ -122,7 +122,11 @@ - openingStream.append(" xmlns=\"jabber:server\"");
- openingStream.append(" from=\"").append(serverName).append("\"");
- openingStream.append(" id=\"").append(streamID).append("\"");
-- openingStream.append(" version=\"1.0\">");
-+ if (serverVersion[0] >= 1) {
-+ openingStream.append(" version=\"1.0\">");
-+ } else {
-+ openingStream.append(">");
-+ }
- connection.deliverRawText(openingStream.toString());
-
- if (serverVersion[0] >= 1) {
|