diff options
| -rw-r--r-- | net-im/jabberd2/ChangeLog | 11 | ||||
| -rw-r--r-- | net-im/jabberd2/files/jabberd2-2.2.0-apr_base64.patch | 28 | ||||
| -rw-r--r-- | net-im/jabberd2/files/jabberd2-2.2.1.init (renamed from net-im/jabberd2/files/jabberd2-2.2.0.init) | 2 | ||||
| -rw-r--r-- | net-im/jabberd2/files/jabberd2-2.2.1.pamd (renamed from net-im/jabberd2/files/jabberd2-2.2.0.pamd) | 0 | ||||
| -rw-r--r-- | net-im/jabberd2/jabberd2-2.2.1.ebuild (renamed from net-im/jabberd2/jabberd2-2.2.0-r2.ebuild) | 8 |
5 files changed, 12 insertions, 37 deletions
diff --git a/net-im/jabberd2/ChangeLog b/net-im/jabberd2/ChangeLog index 7e66d222a6e1..e72001462898 100644 --- a/net-im/jabberd2/ChangeLog +++ b/net-im/jabberd2/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-im/jabberd2 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.20 2008/07/28 14:55:31 gentoofan23 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/ChangeLog,v 1.21 2008/07/30 11:34:36 gentoofan23 Exp $ + +*jabberd2-2.2.1 (30 Jul 2008) + + 30 Jul 2008; Thomas Anderson <gentoofan23@gentoo.org> + -files/jabberd2-2.2.0-apr_base64.patch, -files/jabberd2-2.2.0.init, + -files/jabberd2-2.2.0.pamd, +files/jabberd2-2.2.1.init, + +files/jabberd2-2.2.1.pamd, -jabberd2-2.2.0-r2.ebuild, + +jabberd2-2.2.1.ebuild: + Version bump, bug #232919 28 Jul 2008; Thomas Anderson <gentoofan23@gentoo.org> jabberd2-2.2.0-r2.ebuild: diff --git a/net-im/jabberd2/files/jabberd2-2.2.0-apr_base64.patch b/net-im/jabberd2/files/jabberd2-2.2.0-apr_base64.patch deleted file mode 100644 index 95582713d689..000000000000 --- a/net-im/jabberd2/files/jabberd2-2.2.0-apr_base64.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- util/base64.c -+++ util/base64.c -@@ -167,10 +167,10 @@ - if(len == 0) - len = strlen(buf); - -- elen = ap_base64encode_len(len); -+ elen = apr_base64_encode_len(len); - out = (char *) malloc(sizeof(char) * (elen + 1)); - -- ap_base64encode(out, buf, len); -+ apr_base64_encode(out, buf, len); - - return out; - } -@@ -179,10 +179,10 @@ - int elen; - char *out; - -- elen = ap_base64decode_len(buf, -1); -+ elen = apr_base64_decode_len(buf, -1); - out = (char *) malloc(sizeof(char) * (elen + 1)); - -- ap_base64decode(out, buf, -1); -+ apr_base64_decode(out, buf, -1); - - return out; - } diff --git a/net-im/jabberd2/files/jabberd2-2.2.0.init b/net-im/jabberd2/files/jabberd2-2.2.1.init index 9169e3c7aa24..085e6d0853e2 100644 --- a/net-im/jabberd2/files/jabberd2-2.2.0.init +++ b/net-im/jabberd2/files/jabberd2-2.2.1.init @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.2.0.init,v 1.1 2008/06/23 13:15:41 gentoofan23 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.2.1.init,v 1.1 2008/07/30 11:34:36 gentoofan23 Exp $ depend() { need net diff --git a/net-im/jabberd2/files/jabberd2-2.2.0.pamd b/net-im/jabberd2/files/jabberd2-2.2.1.pamd index 2c5a5347ad6a..2c5a5347ad6a 100644 --- a/net-im/jabberd2/files/jabberd2-2.2.0.pamd +++ b/net-im/jabberd2/files/jabberd2-2.2.1.pamd diff --git a/net-im/jabberd2/jabberd2-2.2.0-r2.ebuild b/net-im/jabberd2/jabberd2-2.2.1.ebuild index 658fe5c55488..2ea32d2ab57f 100644 --- a/net-im/jabberd2/jabberd2-2.2.0-r2.ebuild +++ b/net-im/jabberd2/jabberd2-2.2.1.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/jabberd2/jabberd2-2.2.0-r2.ebuild,v 1.3 2008/07/28 14:55:31 gentoofan23 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/jabberd2-2.2.1.ebuild,v 1.1 2008/07/30 11:34:36 gentoofan23 Exp $ inherit db-use eutils flag-o-matic pam @@ -31,12 +31,6 @@ RDEPEND="${DEPEND} S="${WORKDIR}/jabberd-${PV}" -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-apr_base64.patch -} - src_compile() { # https://bugs.gentoo.org/show_bug.cgi?id=207655#c3 |