1.1.4 was using the 1.1.3 conf file, so create a 1.1.4 conf file and update the ebuilds to use it

Package-Manager: portage-2.1.4.4

5 files changed, 32 insertions, 9 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index 1c067cf75af0..430e8b2305fa 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/ejabberd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.31 2008/02/22 14:55:58 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.32 2008/02/22 14:58:22 caleb Exp $
+
+  22 Feb 2008; Caleb Tennis <caleb@gentoo.org> +files/ejabberd-1.1.4.confd,
+  ejabberd-1.1.4.ebuild, ejabberd-1.1.4-r1.ebuild:
+  1.1.4 was using the 1.1.3 conf file, so create a 1.1.4 conf file and update
+  the ebuilds to use it
 
 *ejabberd-2.0.0 (22 Feb 2008)
 
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 43eddd96be89..20dbd9f6c0ab 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -4,6 +4,7 @@ AUX ejabberd 355 RMD160 bf400cf3a84169a79797db9228ad102d93c9147b SHA1 83bae90f0e
 AUX ejabberd-1.1.1-r1.initd 1401 RMD160 7513d6b71200591a3266e9355505f0b715879ca8 SHA1 14624338a1520291cd08bf0044d3a8845fefd796 SHA256 a69e65d6ec26ed2af1e8cda83493e0a2a652b165560317bf6679fbc97d83db49
 AUX ejabberd-1.1.1.confd 772 RMD160 e250deb4895d02637043877b5f17db447488da0d SHA1 4a716be46619efb4ee40810cbcc11ab191a583de SHA256 61e329a57da720527101a0db42d0ac3ec31d908039b445a1d9e90df5b1195135
 AUX ejabberd-1.1.4-erlang-12.patch 3746 RMD160 17e6dc9ded6f598c27cf2cda098d2804e3c93957 SHA1 85e03ffd4e85b792759f23353d8e278f85276311 SHA256 bb96a790b948cd5c7359a7bdd2f2486d83dd7430b3556307c22188183be1f3aa
+AUX ejabberd-1.1.4.confd 736 RMD160 100b2b7957766380b0267d6fc91b3fe8a0f827fc SHA1 7c7283615eddafe24f7d331b76b598ad3f10699c SHA256 8c3f96ebaa0bf200ef145dbc6ebea82451cfaceec9ff7802fdc0ef48bf507715
 AUX ejabberd-1.1.4.initd 1437 RMD160 96d9d35de36585a9e735f124b7be1618949541aa SHA1 623713cfb28a247f16a14f6b2ca6a8555609bd35 SHA256 59f983e32f7b530b66b5242ac6f06405b7440a112b2f980abe602508459d923e
 AUX ejabberd-2.0.0.initd 1434 RMD160 dcaf0056eb0f9d903fd550139d4c218e00b7c791 SHA1 eb99a7a8154ad094313451ada9cacb065f240590 SHA256 72f151da8193bafec7c578d1a74e5a3da52f0376e5786d620329fe7a20dfa201
 AUX ejabberdctl 199 RMD160 1f4be5dcd018f0936baaeb41e2fd1c4a6a59bc62 SHA1 347200e8dd5790282cedb6a70c71fd4a6db9a0f5 SHA256 b88de8e8e5e8730ac7fe04b49ae3cf131c49a4e1ba451b35f1305d1c24a2dda0
@@ -13,8 +14,8 @@ AUX self-cert.sh 491 RMD160 89bb577975eef172fa3c6e07b08d323162d1278b SHA1 61a4c8
 AUX ssl.cnf 1042 RMD160 47d2542942fb21f4be1e827d47eb4e0468e73910 SHA1 7347bae5a195ad158881fe5313f55ee41e85cb81 SHA256 ed066f7720fd9f4c2d57ffb2ebcbc4b2810d2b7ca22b67ec8c1dc1227baaa635
 DIST ejabberd-1.1.4.tar.gz 846059 RMD160 4c72548129b0196ff0096bd85936e0750fc4d7be SHA1 db6f521d45dece200de4eb6fc967c64728e8f6a3 SHA256 dcd61b72c522eee77ab56227b16d75fd5741efe2b9b9a8a1d3ed7eefc2a7e4f6
 DIST ejabberd-2.0.0.tar.gz 1387404 RMD160 9e7bb30825f2d480d75516136fcc62a49d871255 SHA1 d70257c1e75f59b7284d52c038431664cfd53e08 SHA256 086e105cb402ef868e3187277db1486807e1b34a2e3e3679f0ee6de1e5fd2e54
-EBUILD ejabberd-1.1.4-r1.ebuild 3454 RMD160 b5d68a4304ed7eaa3634cce61f5ea9ab950e5321 SHA1 e090e7a05d4c8fb639dc11a5409bee1999bc5134 SHA256 f88196beb2d1eeb7cd8d699f05c8578f6e303224d36450307dccda02794ac086
-EBUILD ejabberd-1.1.4.ebuild 3398 RMD160 27a04ce2f5b4b1ab0242c31b8e43d05d5fc17993 SHA1 1e06c37bde6bf4cb5cfa0218a14939bb394567cf SHA256 5ed0d6bfc3a034670a5821fbfcaf1e3c0d15ea3b89d888e997602f4dc62c640f
+EBUILD ejabberd-1.1.4-r1.ebuild 3454 RMD160 b6f24b03584ad7ef7ea4e02961acbd29d3064a97 SHA1 38254b06eeb5eb87306718b39cde50e1c7990cca SHA256 4fb8f36dbca8d5f422e7b6a8a049af86c5d1c262f753453eeccd65a178ff109b
+EBUILD ejabberd-1.1.4.ebuild 3395 RMD160 1c283f5b60c0ee8b31d279737769f2d7228469a6 SHA1 847dababa185b3fdc74035ecf24096576b71ba0a SHA256 177ecebf528b074651803eb88655123c4b33d1214179b00daba7a8245a5493a1
 EBUILD ejabberd-2.0.0.ebuild 3450 RMD160 16dcf0a34066b9962d09cd06a0fa15c5ece61f01 SHA1 0cc3ff09d050ec3bee2de28ecd997681220cc0cd SHA256 de8913a00636433dddad7192183703b19ce76962c31bd34526e30b7b68b034bd
-MISC ChangeLog 6923 RMD160 3af6d01b2cacf6b49ed7287007a8185c19b9d106 SHA1 4946d7d9aed9205205c348f4e780401b74ce875e SHA256 31cab20a6922cfdcda71944741861a07c6149f2aef328355278f20a94a0ee617
+MISC ChangeLog 7153 RMD160 1046cf82985df8c077963948450edbdf4f4dc508 SHA1 d820f50d52d2c72fe514bd1a96db4557c2254e0a SHA256 a104fd8f7ff97a975259d8500f1ea903dd241696b7c8e46332a48284c2d7b727
 MISC metadata.xml 383 RMD160 dcf83a193e8c65bca36c368d8b4b70759bf1a7ee SHA1 2e1a9e8406a47ceb62f0d9edcabd27668b412634 SHA256 c1afbca95c1be1d2095a4dcd6ba39c8d1dd1974993b0f800264add3c18428a55
diff --git a/net-im/ejabberd/ejabberd-1.1.4-r1.ebuild b/net-im/ejabberd/ejabberd-1.1.4-r1.ebuild
index 02bdab29fa18..8936eb07c183 100644
--- a/net-im/ejabberd/ejabberd-1.1.4-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-1.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.4-r1.ebuild,v 1.3 2008/01/31 07:10:01 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.4-r1.ebuild,v 1.4 2008/02/22 14:58:22 caleb Exp $
 
 inherit eutils multilib
 
@@ -110,7 +110,7 @@ EOF
 	dobin "${T}/ejabberd"
 
 	newinitd "${FILESDIR}/${P}.initd" ${PN}
-	newconfd "${FILESDIR}/ejabberd-1.1.3.confd" ${PN}
+	newconfd "${FILESDIR}/ejabberd-1.1.4.confd" ${PN}
 
 	insinto ${JABBER_ETC}
 	doins "${FILESDIR}/inetrc"
diff --git a/net-im/ejabberd/ejabberd-1.1.4.ebuild b/net-im/ejabberd/ejabberd-1.1.4.ebuild
index eb7025f67ca4..c2dab16add1f 100644
--- a/net-im/ejabberd/ejabberd-1.1.4.ebuild
+++ b/net-im/ejabberd/ejabberd-1.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.4.ebuild,v 1.1 2007/09/14 11:38:28 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.4.ebuild,v 1.2 2008/02/22 14:58:22 caleb Exp $
 
 inherit eutils multilib
 
@@ -108,7 +108,7 @@ EOF
 	dobin "${T}/ejabberd"
 
 	newinitd "${FILESDIR}/${P}.initd" ${PN}
-	newconfd "${FILESDIR}/ejabberd-1.1.3.confd" ${PN}
+	newconfd "${FILESDIR}/ejabberd-1.1.4.confd" ${PN}
 
 	insinto ${JABBER_ETC}
 	doins "${FILESDIR}/inetrc"
diff --git a/net-im/ejabberd/files/ejabberd-1.1.4.confd b/net-im/ejabberd/files/ejabberd-1.1.4.confd
new file mode 100644
index 000000000000..a17197aaaf1a
--- /dev/null
+++ b/net-im/ejabberd/files/ejabberd-1.1.4.confd
@@ -0,0 +1,17 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-1.1.4.confd,v 1.1 2008/02/22 14:58:22 caleb Exp $
+
+# Name of your ejabberd node. Used by ejabberdctl to determine which
+# node to communicate with.
+EJABBERD_NODE="ejabberd@`hostname -s`"
+
+# Max number of open network connections. Default is 1024. Increasing
+# this will slightly increase memory usage.
+#ERL_MAX_PORTS=1024
+
+# Return memory to the system after using it, instead of keeping it
+# allocated for future use. Decreases the memory required by ejabberd,
+# but makes it run slower.  Default is unset, set to any value to
+# activate.
+#ERL_FULLSWEEP_AFTER=0