# ChangeLog for net-nntp/slrn
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/slrn/ChangeLog,v 1.14 2008/03/10 11:15:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/slrn/ChangeLog,v 1.15 2008/03/10 14:02:31 drac Exp $
+
+ 10 Mar 2008; Samuli Suominen <drac@gentoo.org>
+ -files/0.9.8.1/slrn-0.9.8.1-lastchar2.diff, -files/0.9.8.1-utf8.patch,
+ -files/0.9.8.1/slrn-0.9.8.1-fetch.diff, -slrn-0.9.8.1.ebuild,
+ slrn-0.9.8.1_p1.ebuild:
+ amd64 stable wrt #212787
10 Mar 2008; Raúl Porcel <armin76@gentoo.org> slrn-0.9.8.1_p1.ebuild:
alpha/ia64/sparc stable wrt #212787
-AUX 0.9.8.1-utf8.patch 322 RMD160 ce891579017fff464529f7239f81d5cf2a5f2925 SHA1 5f7135d5ba1c24c2e88148a32ac96c07ebe44969 SHA256 6fed2bbb083d03c35228666c824232b5f05c193bc75b3ad6390c9c49d28d0bda
-AUX 0.9.8.1/slrn-0.9.8.1-fetch.diff 920 RMD160 e767178f943f934d61bc3bb49189d5856f54e6af SHA1 5591332ce28c3083ae64850b6d4f371c3cf77773 SHA256 0ae228075f15977f0d063cd60ef89be3c984692eed75ea7aa3ebb3bb59d7e243
-AUX 0.9.8.1/slrn-0.9.8.1-lastchar2.diff 4732 RMD160 dcf2fcb9f3d531e11e78c9a26e76cb62bdf067c5 SHA1 27aa2da4bc5fec5405e3c80446d1a3bd0349e0aa SHA256 940e6a10cfb2ee97a6d0ae1b7af8d0744a40fd627db86bf44e8e1a9f2f20f3b8
-DIST slrn-0.9.8.1.tar.bz2 1034332 RMD160 67f49dd88a8c9d4bbcf5646a1cfa9a998a3c4cbe SHA1 d8c3755403c9bb19b83123614cda05f94731027f SHA256 46968e442ece567b7928faefa0774f675761b474be80e9487235c20f50a9fd05
DIST slrn-0.9.8.1pl1.tar.gz 1516954 RMD160 8b866ab14596ff9a04e72f98cf29a973718ae672 SHA1 889343e550a7a068e2147d18d291a9c3eed59fc9 SHA256 65ac984828e1a33772a7c95c010956424c00fe44344b0a0be996b88e0e8024bc
-EBUILD slrn-0.9.8.1.ebuild 1511 RMD160 969419b033aa793e2e45977fb0362b08686efdf1 SHA1 87aaa7ba68973578f57b398b34ef21c038c95ed5 SHA256 d4bf5e9945a9ddbe72ecb0e86e13691189c6a40dde11234692df29a04ed02dd6
-EBUILD slrn-0.9.8.1_p1.ebuild 930 RMD160 c27728c8b879b5a805bafdfb2dddb20b55efdded SHA1 8532012fc5e02468f2bd372277637592cb0ee9d6 SHA256 0e59b64cdc4d3616a049a86ea5d46a1f5f279abdc9616b2af65e6cb992eb55ee
-MISC ChangeLog 7557 RMD160 ebeb466daee1ced529670881006e08250fcb859d SHA1 6de99c5077faf34970cab9eeadb588cb3a54ed23 SHA256 3cc6a518c2d19ff831fb2d0584c0fbb47fe07f8bae370bea4a9aa8222711b0d6
+EBUILD slrn-0.9.8.1_p1.ebuild 926 RMD160 992b8c0d0c079144422e2815539f42577b76fa96 SHA1 720b53399443c2e6e4e21a20743e4b05f4461bee SHA256 a143e0caa605ed245f07acf03ae9be6730ed9557dccc518186c6b1887599d100
+MISC ChangeLog 7794 RMD160 b173c8de9c6008c331204a1f4d4fe6ce4a1c4fdb SHA1 2e06f0da3e566440b7a1166a0be109e780bc7ba0 SHA256 4ea8e19aafbd6a8dd1b5e17a86789eafb92b5d51233d34c08c789bd1788c50c9
MISC metadata.xml 161 RMD160 f1947f39ceb22269275e1b59023c4eadcdbc1a15 SHA1 5d3eb0725c80eb73d935d7dfbd653a7c1a2103e7 SHA256 8031b551b7913d7c088a55811814db35dad801454d369d05ff365d33cd722153
+++ /dev/null
---- src/misc.c
-+++ src/misc.c
-@@ -458,7 +458,7 @@
-
- while (s1 < smax)
- {
-- if ((*s1 & 0x80) && (eight_bit > (unsigned int) *s1))
-+ if ((*s1 & 0x80) && ((eight_bit > (unsigned int) *s1) || (SLsmg_Is_Unicode)))
- {
- if (s != (char *) s1)
- SLsmg_write_nchars (s, (unsigned int) ((char *)s1 - s));
+++ /dev/null
---- slrn-0.9.8.1/src/slrnpull.c 2004-02-28 23:08:17.000000000 +0100
-+++ slrn/src/slrnpull.c 2004-10-10 01:42:31.000000000 +0200
-@@ -1647,7 +1647,7 @@
- || (((unsigned int)server_max <= gmax) && (gmin <= gmax)))
- {
- log_message (_("%s: no new articles available."), g->name);
-- return 0;
-+ goto fetch_marked_bodies;
- }
-
- Num_Duplicates = 0;
-@@ -1667,7 +1667,7 @@
- g->max = g->server_max;
- log_message (_("%s: No new articles available."), g->name);
- slrn_free ((char *) numbers);
-- return 0;
-+ goto fetch_marked_bodies;
- }
-
- log_message (_("%s: %u articles available."), g->name, num_numbers - i);
-@@ -1716,7 +1716,8 @@
- }
-
- /* Now, fetch marked article bodies. */
--
-+
-+ fetch_marked_bodies:
- /* Don't request bodies that are no longer there. */
- if (server_min > 1)
- g->requests = slrn_ranges_remove (g->requests, 1, server_min-1);
+++ /dev/null
-diff -ru slrn-0.9.8.1.orig/src/group.c slrn-0.9.8.1/src/group.c
---- slrn-0.9.8.1.orig/src/group.c 2004-08-15 23:09:31.000000000 +0200
-+++ slrn-0.9.8.1/src/group.c 2004-11-05 23:01:51.391610936 +0100
-@@ -3,7 +3,7 @@
- This file is part of SLRN.
-
- Copyright (c) 1994, 1999 John E. Davis <davis@space.mit.edu>
-- Copyright (c) 2001-2003 Thomas Schultz <tststs@gmx.de>
-+ Copyright (c) 2001-2004 Thomas Schultz <tststs@gmx.de>
-
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the Free
-@@ -2605,7 +2605,10 @@
- if ((p == pmax) || (p == vline))
- continue;
-
-- vline[vlen-1] = 0; /* kill \n and NULL terminate */
-+ if (vline[vlen-1] == '\n')
-+ vline[vlen-1] = 0;
-+ else
-+ vline[vlen] = 0;
-
- if (-1 == add_group (vline, (unsigned int) (p - vline),
- ((ch == '!') ? GROUP_UNSUBSCRIBED : 0), 0, 0))
-diff -ru slrn-0.9.8.1.orig/src/misc.c slrn-0.9.8.1/src/misc.c
---- slrn-0.9.8.1.orig/src/misc.c 2004-09-27 23:30:35.000000000 +0200
-+++ slrn-0.9.8.1/src/misc.c 2004-11-05 23:02:09.519855024 +0100
-@@ -1165,8 +1165,11 @@
- if (vlen == 0) continue;
-
- line = slrn_safe_malloc (vlen+512); /* add some for MIME overhead */
-- slrn_strncpy (line, vline, vlen);
-- line[vlen-1] = 0; /* kill \n and NULL terminate */
-+ strncpy (line, vline, vlen);
-+ if (line[vlen-1] == '\n')
-+ line[vlen-1] = 0;
-+ else
-+ line[vlen] = 0;
-
- if (header)
- {
-diff -ru slrn-0.9.8.1.orig/src/post.c slrn-0.9.8.1/src/post.c
---- slrn-0.9.8.1.orig/src/post.c 2004-09-28 11:05:54.000000000 +0200
-+++ slrn-0.9.8.1/src/post.c 2004-11-05 23:02:53.936102728 +0100
-@@ -467,7 +467,10 @@
- linenum = 0;
- while ((NULL != (vline = vgets (vp, &vlen))) && (*vline != '\n'))
- {
-- vline[vlen-1] = 0;
-+ if (vline[vlen-1] == '\n')
-+ vline[vlen-1] = 0;
-+ else
-+ vline[vlen] = 0;
- linenum++;
- if (0 == slrn_case_strncmp ((unsigned char *)vline,
- (unsigned char *) "Cc: ", 4))
-@@ -540,7 +543,10 @@
-
- while ((NULL != (vline = vgets (vp, &vlen))) && (*vline != '\n'))
- {
-- vline[vlen-1] = 0;
-+ if (vline[vlen-1] == '\n')
-+ vline[vlen-1] = 0;
-+ else
-+ vline[vlen] = 0;
- linenum++;
- if (linenum == cc_line) continue;
- if (is_empty_header (vline)) continue;
-@@ -593,7 +599,10 @@
-
- while (NULL != (vline = vgets (vp, &vlen)))
- {
-- vline[vlen-1] = 0;
-+ if (vline[vlen-1] == '\n')
-+ vline[vlen-1] = 0;
-+ else
-+ vline[vlen] = 0;
- fputs (vline, pp);
- fputs ("\n", pp);
- }
-@@ -1411,8 +1420,11 @@
- if (vlen == 0) continue;
-
- linep = slrn_safe_malloc (vlen+512); /* add some for MIME overhead */
-- slrn_strncpy (linep, vline, vlen);
-- linep[vlen-1] = 0; /* kill \n and NULL terminate */
-+ strncpy (linep, vline, vlen);
-+ if (linep[vlen-1] == '\n')
-+ linep[vlen-1] = 0; /* kill \n and NULL terminate */
-+ else
-+ linep[vlen] = 0;
-
- if (header)
- {
-diff -ru slrn-0.9.8.1.orig/src/slrnpull.c slrn-0.9.8.1/src/slrnpull.c
---- slrn-0.9.8.1.orig/src/slrnpull.c 2004-02-28 23:08:17.000000000 +0100
-+++ slrn-0.9.8.1/src/slrnpull.c 2004-11-05 23:03:18.859313824 +0100
-@@ -3273,7 +3273,10 @@
-
- if (NULL != (vline = vgets (vp, &vlen)))
- {
-- vline[vlen] = 0; /* make sure line is NULL terminated */
-+ if (vline[vlen-1] == '\n')
-+ vline[vlen-1] = 0; /* make sure line is NULL terminated */
-+ else
-+ vline[vlen] = 0;
- group->headers = slrn_ranges_from_newsrc_line (vline);
- }
-
-@@ -3382,7 +3385,10 @@
- if (NULL == (group = find_group_type (vline)))
- continue;
-
-- vline[vlen-1] = 0; /* kill \n and NULL terminate */
-+ if (vline[vlen-1] == '\n')
-+ vline[vlen-1] = 0;
-+ else
-+ vline[vlen] = 0;
-
- r = slrn_ranges_from_newsrc_line (p+1);
- group->requests = slrn_ranges_merge (group->requests, r);
-diff -ru slrn-0.9.8.1.orig/src/spool.c slrn-0.9.8.1/src/spool.c
---- slrn-0.9.8.1.orig/src/spool.c 2004-08-15 22:48:13.000000000 +0200
-+++ slrn-0.9.8.1/src/spool.c 2004-11-05 23:04:17.628379568 +0100
-@@ -1757,7 +1757,10 @@
-
- if (NULL != (vline = vgets (vp, &vlen)))
- {
-- vline[vlen] = 0; /* make sure line is NULL terminated */
-+ if (vline[vlen-1] == '\n')
-+ vline[vlen-1] = 0; /* make sure line is NULL terminated */
-+ else
-+ vline[vlen] = 0;
- retval = slrn_ranges_from_newsrc_line (vline);
- }
-
-@@ -1787,8 +1790,11 @@
- if ((p == pmax) || (p == vline) ||
- (strncmp(vline, group, (p-vline))))
- continue;
--
-- vline[vlen-1] = 0; /* kill \n and NULL terminate */
-+
-+ if (vline[vlen-1] == '\n')
-+ vline[vlen-1] = 0;
-+ else
-+ vline[vlen] = 0;
-
- retval = slrn_ranges_from_newsrc_line (p+1);
- break;
+++ /dev/null
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/slrn/slrn-0.9.8.1.ebuild,v 1.8 2007/03/11 17:57:59 swegener Exp $
-
-inherit eutils
-
-# Upstream patches from http://slrn.sourceforge.net/patches/
-# ${FILESDIR}/${PV}/${P}-<name>.diff
-SLRN_PATCHES="fetch lastchar2"
-
-DESCRIPTION="s-lang Newsreader"
-HOMEPAGE="http://slrn.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
-IUSE="ssl nls unicode uudeview"
-
-RDEPEND="virtual/mta
- >=app-arch/sharutils-4.2.1
- =sys-libs/slang-1.4*
- ssl? ( >=dev-libs/openssl-0.9.6 )"
-DEPEND="${RDEPEND}
- uudeview? ( dev-libs/uulib )
- nls? ( sys-devel/gettext )"
-
-pkg_setup() {
- if use unicode && ! built_with_use sys-libs/slang unicode
- then
- eerror "For USE=\"unicode\" support you need to have your sys-libs/slang also compiled"
- eerror "with USE=\"unicode\" support."
- die "sys-libs/slang with USE=\"unicode\" support needed"
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- for i in ${SLRN_PATCHES}
- do
- epatch "${FILESDIR}"/${PV}/${P}-${i}.diff
- done
-
- use unicode && epatch "${FILESDIR}"/${PV}-utf8.patch
-}
-
-src_compile() {
- econf \
- --with-docdir=/usr/share/doc/${PF} \
- --with-slrnpull \
- $(use_enable nls) \
- $(use_with ssl) \
- $(use_with uudeview) \
- || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install () {
- make DESTDIR="${D}" install || die "make install failed"
-}
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nntp/slrn/slrn-0.9.8.1_p1.ebuild,v 1.5 2008/03/10 11:15:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nntp/slrn/slrn-0.9.8.1_p1.ebuild,v 1.6 2008/03/10 14:02:31 drac Exp $
MY_P=${P/_p/pl}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ppc sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
IUSE="nls ssl uudeview"
RDEPEND="virtual/mta