corrected init file; removed dodoc entry; stable x86; security bug 159580

Package-Manager: portage-2.1.2-r9

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index 1d21a9b17106369d3fa0edac097ff33a9bbb7cba..f9ceb0ebfe31669258f6b97602368df381220653 100644 (file)
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/ejabberd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.13 2007/02/27 20:26:12 dercorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.14 2007/02/28 07:51:35 opfer Exp $
+
+  28 Feb 2007; Christian Faulhammer <opfer@gentoo.org>
+  files/ejabberd-1.1.1-r1.initd, ejabberd-1.1.3.ebuild:
+  corrected init file; removed dodoc entry; stable x86; security bug 159580
 
 *ejabberd-1.1.3 (27 Feb 2007)
 

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 89225b1d4a9705b5c694b876e88045380ca2f7fe..3574281f836da093224bfb9ca3a8a5e166b289b9 100644 (file)
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ejabberd 355 RMD160 bf400cf3a84169a79797db9228ad102d93c9147b SHA1 83bae90f0e211f6e59c96dd6ce419a4c0bcdd3d9 SHA256 1f2254ce2835a986eb75adaf5602d1cb74ced989c2360331822a2c5e11c9837b
 MD5 e34f266ad55b2db038375cb6962721cd files/ejabberd 355
 RMD160 bf400cf3a84169a79797db9228ad102d93c9147b files/ejabberd 355
@@ -10,10 +13,10 @@ AUX ejabberd-0.7.5.initd 1374 RMD160 83da8ee22eb26505c8266d1f36d8138323a60ebb SH
 MD5 fa69896efdf335059d0545edf83cd359 files/ejabberd-0.7.5.initd 1374
 RMD160 83da8ee22eb26505c8266d1f36d8138323a60ebb files/ejabberd-0.7.5.initd 1374
 SHA256 ab7301036561238dc6d43bc2cd39609d355cbe617a84c860f68bc5cecfafe036 files/ejabberd-0.7.5.initd 1374
-AUX ejabberd-1.1.1-r1.initd 1426 RMD160 024e4e14b74b43176568c3f19577a38ddf4a42a5 SHA1 99f24e3ac3529715c64ba0a46b3bce707d55e51c SHA256 da3ec5de1fabcd58f4dcc709d99ed199cb1f28ed918e54e79310fa4345ff5eda
-MD5 2b335439feff5ddcc26036a4baa67fd1 files/ejabberd-1.1.1-r1.initd 1426
-RMD160 024e4e14b74b43176568c3f19577a38ddf4a42a5 files/ejabberd-1.1.1-r1.initd 1426
-SHA256 da3ec5de1fabcd58f4dcc709d99ed199cb1f28ed918e54e79310fa4345ff5eda files/ejabberd-1.1.1-r1.initd 1426
+AUX ejabberd-1.1.1-r1.initd 1403 RMD160 b105dc7f56dad187d7cecacb21916bc192e98b4a SHA1 5dfb1a1130accd5ecb28e18a59196099f69bb0e7 SHA256 1dfad908c830488d29fed60b8a679362396a5e13cae61b5bd9b0e2fc83ea6e2f
+MD5 64e8af933fd5f758b496a0e443f9407a files/ejabberd-1.1.1-r1.initd 1403
+RMD160 b105dc7f56dad187d7cecacb21916bc192e98b4a files/ejabberd-1.1.1-r1.initd 1403
+SHA256 1dfad908c830488d29fed60b8a679362396a5e13cae61b5bd9b0e2fc83ea6e2f files/ejabberd-1.1.1-r1.initd 1403
 AUX ejabberd-1.1.1.confd 777 RMD160 701d81cbc4e4166f94b74557b4e4f463661c7e9c SHA1 6808e2a92673e0a3d524ba958df537b578ef1838 SHA256 e7c521a12c79d38f1a04415dc7205785e81d02d4f4bf7d999fdff22d456d3bd6
 MD5 be6080d28fad9a23512f93986373a64f files/ejabberd-1.1.1.confd 777
 RMD160 701d81cbc4e4166f94b74557b4e4f463661c7e9c files/ejabberd-1.1.1.confd 777
@@ -63,14 +66,14 @@ EBUILD ejabberd-1.1.2-r1.ebuild 3607 RMD160 b65ba6e38aa8ead16a507deb8bbae861bc8c
 MD5 34e53f55eb9d23fcae23e55a451780b4 ejabberd-1.1.2-r1.ebuild 3607
 RMD160 b65ba6e38aa8ead16a507deb8bbae861bc8ce0b6 ejabberd-1.1.2-r1.ebuild 3607
 SHA256 3fda0f1112490c63683a7d44c5cd215dd10abdb8aa2fbcac27d717fcaaf324cd ejabberd-1.1.2-r1.ebuild 3607
-EBUILD ejabberd-1.1.3.ebuild 3604 RMD160 efbbf20610c1aa376df32ac4d21e12c7a7623df2 SHA1 e4e363dec6cf8f82722848c912dc6ab1ebadc5fd SHA256 b324a81445afaa53089260a42338b2f743f48acd36e7b1818102cfbca04e556b
-MD5 2e68cf40ea32567b7c154df0b8b4152e ejabberd-1.1.3.ebuild 3604
-RMD160 efbbf20610c1aa376df32ac4d21e12c7a7623df2 ejabberd-1.1.3.ebuild 3604
-SHA256 b324a81445afaa53089260a42338b2f743f48acd36e7b1818102cfbca04e556b ejabberd-1.1.3.ebuild 3604
-MISC ChangeLog 2860 RMD160 3701306ba0735deb627747bfd6ebd8108fe67e11 SHA1 d9ff862ddb2f044f2bfa27d1aa7f6eac7f47f01d SHA256 ea9b55dfd6b512056c6a258058efffec6899c7b64a409ff1118edcea86326a67
-MD5 24f9c1e537b20c3f0e2980933f807ba9 ChangeLog 2860
-RMD160 3701306ba0735deb627747bfd6ebd8108fe67e11 ChangeLog 2860
-SHA256 ea9b55dfd6b512056c6a258058efffec6899c7b64a409ff1118edcea86326a67 ChangeLog 2860
+EBUILD ejabberd-1.1.3.ebuild 3358 RMD160 a271c3f73483b2a83453782951df45b4d44d7db8 SHA1 a10b804c11b3b5d84f52c4c85232c3e3fd5c12e2 SHA256 0d115952194ec3b50d6c74cf7bd1e259306b9fd5ee4cb73d8a15342c3e51734b
+MD5 9fd005cde1e98bfa214a3e3e1a7a4f02 ejabberd-1.1.3.ebuild 3358
+RMD160 a271c3f73483b2a83453782951df45b4d44d7db8 ejabberd-1.1.3.ebuild 3358
+SHA256 0d115952194ec3b50d6c74cf7bd1e259306b9fd5ee4cb73d8a15342c3e51734b ejabberd-1.1.3.ebuild 3358
+MISC ChangeLog 3045 RMD160 70a6cc8752cc8f5f712cccb8f0f2dbb1af1b4cd1 SHA1 88078725f20a1f224021c22e1971c973855e6678 SHA256 b1464d964686fa6ed7808c3766210b4671cd3bf1fe6e35eb9565d9ea58b211ba
+MD5 02a98dc6ec7d6eefb66c4e74efb82651 ChangeLog 3045
+RMD160 70a6cc8752cc8f5f712cccb8f0f2dbb1af1b4cd1 ChangeLog 3045
+SHA256 b1464d964686fa6ed7808c3766210b4671cd3bf1fe6e35eb9565d9ea58b211ba ChangeLog 3045
 MISC metadata.xml 383 RMD160 dcf83a193e8c65bca36c368d8b4b70759bf1a7ee SHA1 2e1a9e8406a47ceb62f0d9edcabd27668b412634 SHA256 c1afbca95c1be1d2095a4dcd6ba39c8d1dd1974993b0f800264add3c18428a55
 MD5 2a43b0fd5e7b6404b98548ac55046b3f metadata.xml 383
 RMD160 dcf83a193e8c65bca36c368d8b4b70759bf1a7ee metadata.xml 383
@@ -90,3 +93,10 @@ SHA256 e1ff34ed81425e1b009e60d29d7f6b9bdeff7cdba4407372cfdb8e40ca00efcb files/di
 MD5 9b247a2a345b5d2c9cdf1a1678f4edf9 files/digest-ejabberd-1.1.3 244
 RMD160 59a1985b119be6cf343af1ea13929c233e59f0b4 files/digest-ejabberd-1.1.3 244
 SHA256 5dad3cfcf7b609862a65b6d09c18ed318563573f866e6c19010c7b9ee7836998 files/digest-ejabberd-1.1.3 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFF5TRTNQqtfCuFneMRAiw/AJ9/C+7Dfjiv9vx7WYtC7MFgUwx5FACeL4g5
+ZMnvGTnZtPaTVx48EKiNMJk=
+=g53U
+-----END PGP SIGNATURE-----

diff --git a/net-im/ejabberd/ejabberd-1.1.3.ebuild b/net-im/ejabberd/ejabberd-1.1.3.ebuild
index 590054e897e58d33d51031157dd0af4727638013..20404fe09e50768b2e08caef300057eff6611ca6 100644 (file)
--- a/net-im/ejabberd/ejabberd-1.1.3.ebuild
+++ b/net-im/ejabberd/ejabberd-1.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.3.ebuild,v 1.1 2007/02/27 20:26:12 dercorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.3.ebuild,v 1.2 2007/02/28 07:51:35 opfer Exp $
 
 inherit eutils multilib versionator
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://ejabberd.jabber.ru/"
 SRC_URI="http://process-one.net/en/projects/${PN}/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="mod_irc mod_muc mod_pubsub ldap odbc ssl web"
 
 DEPEND=">=net-im/jabber-base-0.01
@@ -27,34 +27,33 @@ PROVIDE="virtual/jabber-server"
 S=${WORKDIR}/${P}/src
 
 src_compile() {
-       econf ${myconf}                              \
-               $(use_enable mod_irc)                \
-               $(use_enable ldap eldap)             \
-               $(use_enable mod_muc)                \
-               $(use_enable mod_pubsub)             \
-               $(use_enable ssl tls)                \
-               $(use_enable web)                    \
-               $(use_enable odbc)                   \
+       econf ${myconf}                                                          \
+               $(use_enable mod_irc)                            \
+               $(use_enable ldap eldap)                         \
+               $(use_enable mod_muc)                            \
+               $(use_enable mod_pubsub)                         \
+               $(use_enable ssl tls)                            \
+               $(use_enable web)                                        \
+               $(use_enable odbc)                                       \
                || die "econf failed"
 
        emake || die "compiling ejabberd core failed"
 }
 
 src_install() {
-       make                                                       \
-               DESTDIR=${D}                                       \
+       make                                                                                                       \
+               DESTDIR=${D}                                                                       \
                EJABBERDDIR=${D}/usr/$(get_libdir)/erlang/lib/${P} \
-               ETCDIR=${D}${JABBER_ETC}                           \
-               LOGDIR=${D}${JABBER_LOG}                           \
-           install \
-           || die "install failed"
+               ETCDIR=${D}${JABBER_ETC}                                                   \
+               LOGDIR=${D}${JABBER_LOG}                                                   \
+               install \
+               || die "install failed"
 
        chown -R jabber:jabber "${D}${JABBER_ETC}"
        chown -R jabber:jabber "${D}${JABBER_LOG}"
        chown -R jabber:jabber "${D}/usr/$(get_libdir)/erlang/lib/${P}"
 
        insinto /usr/share/doc/${PF}
-       dodoc doc/release_notes_${PV}.txt
        dohtml doc/*.{html,png}
 
        #

diff --git a/net-im/ejabberd/files/ejabberd-1.1.1-r1.initd b/net-im/ejabberd/files/ejabberd-1.1.1-r1.initd
index 3c4770d301be01890b41573c9e04ec49b93eec79..24357a60e4ad6af62acadc15a7b126ab4002a2fa 100644 (file)
--- a/net-im/ejabberd/files/ejabberd-1.1.1-r1.initd
+++ b/net-im/ejabberd/files/ejabberd-1.1.1-r1.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 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.1-r1.initd,v 1.1 2006/10/12 16:26:07 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-1.1.1-r1.initd,v 1.2 2007/02/28 07:51:35 opfer Exp $
 
 opts="${opts} reload"
 
@@ -23,7 +23,7 @@ start() {
        ebegin "Starting eJabberd"
        start-stop-daemon --start --quiet --chuid jabber:jabber \
         --env HOME=/var/run/jabber \
-        --exec /usr/lib/erlang/erts-5.5/bin/beam \
+        --exec /usr/bin/beam \
                --startas /usr/bin/ejabberd -- -noshell -detached
        eend $?
 }