diff options
| -rw-r--r-- | net-news/inn/ChangeLog | 9 | ||||
| -rw-r--r-- | net-news/inn/Manifest | 14 | ||||
| -rw-r--r-- | net-news/inn/files/2.4.1-berkdb.patch | 4 | ||||
| -rw-r--r-- | net-news/inn/files/digest-inn-2.4.1 | 1 | ||||
| -rw-r--r-- | net-news/inn/inn-2.4.1.ebuild | 33 |
5 files changed, 37 insertions, 24 deletions
diff --git a/net-news/inn/ChangeLog b/net-news/inn/ChangeLog index 86744b4c1262..4c43ecbc1d52 100644 --- a/net-news/inn/ChangeLog +++ b/net-news/inn/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-news/inn # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-news/inn/ChangeLog,v 1.13 2004/09/07 22:29:04 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-news/inn/ChangeLog,v 1.14 2004/09/12 02:03:27 swegener Exp $ + + 12 Sep 2004; Sven Wegener <swegener@gentoo.org> files/2.4.1-berkdb.patch, + inn-2.4.1.ebuild: + Added a patch from Maurice Mueller <maurice_mueller@gmx.de> to make inn + compile with BerkeleyDB 4.x. Modified ebuild to correctly initialize tagged + hash table in pkg_config and install SSL certificates into the right location + to prevent overwriting them when upgrading. 08 Sep 2004; Sven Wegener <swegener@gentoo.org> +files/2.4.1-berkdb.patch, files/innd, inn-2.4.1.ebuild: diff --git a/net-news/inn/Manifest b/net-news/inn/Manifest index a7eec2c4a0d8..9ed2be83f33a 100644 --- a/net-news/inn/Manifest +++ b/net-news/inn/Manifest @@ -1,18 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 65664ec8b14d6dc3eeb7e5cc82df7c9c inn-2.3.5.ebuild 3253 -MD5 1756a991f54b14cfeaa016c105a9ebca inn-2.4.1.ebuild 7571 +MD5 68d3498e25cdaa6701b56263ab3cefc6 inn-2.4.1.ebuild 7607 MD5 d4764f5c17f5e0b416f7ddf271c77d71 metadata.xml 161 MD5 d7310425dc6b77081a01f4b2b28a1239 ChangeLog 1952 MD5 ce3c00651e354a874cc9c60ae4f0255e files/digest-inn-2.3.5 128 -MD5 f31130931b3d55b9a8a2c89560c09199 files/digest-inn-2.4.1 62 +MD5 12b5b155a7df558664f522f72ab5f723 files/digest-inn-2.4.1 118 MD5 9bfea7a0644e2f3adc2738d86bfa2254 files/innd 436 MD5 7c3bcaa98344d126d7b0ba965344a25c files/2.4.1-berkdb.patch 1373 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFBPjZyI1lqEGTUzyQRAq5AAJ4llsUGg6Vs+7rVKK11EhpAD+7EnwCfc6cn -PN+1bNXotiQpLL6vzinmkG8= -=lM8m ------END PGP SIGNATURE----- diff --git a/net-news/inn/files/2.4.1-berkdb.patch b/net-news/inn/files/2.4.1-berkdb.patch index 5982ed04af42..f6ea97f7497a 100644 --- a/net-news/inn/files/2.4.1-berkdb.patch +++ b/net-news/inn/files/2.4.1-berkdb.patch @@ -6,7 +6,7 @@ diff -Nur inn-2.4.1.orig/configure.in inn-2.4.1/configure.in fi if test x"$BERKELEY_DB_DIR" = xyes ; then - for v in db41 db4 db3 db2 ; do -+ for v in 3 2 ; do ++ for v in 4.2 4.1 4 3 2 ; do - if test -d "/usr/local/include/$v" ; then + if test -d "/usr/local/include/db$v" ; then BERKELEY_DB_LDFLAGS="-L/usr/local/lib" @@ -20,7 +20,7 @@ diff -Nur inn-2.4.1.orig/configure.in inn-2.4.1/configure.in done if test x"$BERKELEY_DB_LIB" = x ; then - for v in db41 db4 db3 db2 ; do -+ for v in 3 2 ; do ++ for v in 4.2 4.1 4 3 2 ; do - if test -d "/usr/include/$v" ; then + if test -d "/usr/include/db$v" ; then - BERKELEY_DB_CFLAGS="-I/usr/include/$v" diff --git a/net-news/inn/files/digest-inn-2.4.1 b/net-news/inn/files/digest-inn-2.4.1 index a9d46309a05f..e6fc48c71de1 100644 --- a/net-news/inn/files/digest-inn-2.4.1 +++ b/net-news/inn/files/digest-inn-2.4.1 @@ -1 +1,2 @@ MD5 bec635b6e70188071fdb539cd374f2ba inn-2.4.1.tar.gz 1849845 +MD5 aa35f4496d180e372cfa4ecdb9864f03 inn_db4.tar.gz 644 diff --git a/net-news/inn/inn-2.4.1.ebuild b/net-news/inn/inn-2.4.1.ebuild index 9369586c5810..5d8bca1bde97 100644 --- a/net-news/inn/inn-2.4.1.ebuild +++ b/net-news/inn/inn-2.4.1.ebuild @@ -1,14 +1,15 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-news/inn/inn-2.4.1.ebuild,v 1.4 2004/09/07 22:29:04 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-news/inn/inn-2.4.1.ebuild,v 1.5 2004/09/12 02:03:27 swegener Exp $ inherit fixheadtails ssl-cert eutils DESCRIPTION="The Internet News daemon, fully featured NNTP server" HOMEPAGE="http://www.isc.org/products/INN" -SRC_URI="ftp://ftp.isc.org/isc/inn/${P}.tar.gz" +SRC_URI="ftp://ftp.isc.org/isc/inn/${P}.tar.gz + http://mauricem.com/inn_db4.tar.gz" SLOT="0" -LICENSE="as-is BSD" +LICENSE="as-is BSD GPL-2" KEYWORDS="~x86" IUSE="ipv6 kerberos sasl ssl perl python tcltk berkdb inntaggedhash innkeywords" @@ -19,7 +20,7 @@ RDEPEND="virtual/mta perl? ( dev-lang/perl ) python? ( dev-lang/python ) tcltk? ( dev-lang/tcl ) - berkdb? ( =sys-libs/db-3* ) + berkdb? ( sys-libs/db ) virtual/gzip" DEPEND="${RDEPEND} >=sys-devel/autoconf-2.13 @@ -31,6 +32,8 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/2.4.1-berkdb.patch + epatch ${WORKDIR}/db_patch.patch + ht_fix_file configure.in support/fixscript.in export WANT_AUTOCONF="2.1" @@ -110,8 +113,18 @@ src_install() { exeinto /etc/init.d doexe ${FILESDIR}/innd innd - insinto /usr/lib/news/lib - use ssl && docert cert + if use ssl + then + insinto /etc/news/cert + + docert cert + fowners news:news /etc/news/cert/cert.{crt,csr,key,pem} + + for cert in cert.{crt,csr,key,pem} + do + dosym "/etc/news/cert/${cert}" "/usr/lib/news/lib/${cert}" + done + fi } pkg_postinst() { @@ -183,6 +196,7 @@ pkg_config() { if [ ! -e "${NEWSSPOOL_DIR}/db/history}" ] then if [ ! -f "${NEWSSPOOL_DIR}/db/history.dir" \ + -a ! -f "${NEWSSPOOL_DIR}/db/history.pag" \ -a ! -f "${NEWSSPOOL_DIR}/db/history.hash" \ -a ! -f "${NEWSSPOOL_DIR}/db/history.index" ] then @@ -191,9 +205,10 @@ pkg_config() { chown news:news "${NEWSSPOOL_DIR}/db/history" chmod 644 "${NEWSSPOOL_DIR}/db/history" su - news -c "/usr/lib/news/bin/makedbz -i" - mv "${NEWSSPOOL_DIR}/db/history.n.dir" "${NEWSSPOOL_DIR}/db/history.dir" - mv "${NEWSSPOOL_DIR}/db/history.n.hash" "${NEWSSPOOL_DIR}/db/history.hash" - mv "${NEWSSPOOL_DIR}/db/history.n.index" "${NEWSSPOOL_DIR}/db/history.index" + mv -f "${NEWSSPOOL_DIR}/db/history.n.dir" "${NEWSSPOOL_DIR}/db/history.dir" + [ -f "${NEWSSPOOL_DIR}/db/history.n.pag" ] && mv -f "${NEWSSPOOL_DIR}/db/history.n.pag" "${NEWSSPOOL_DIR}/db/history.pag" + [ -f "${NEWSSPOOL_DIR}/db/history.n.hash" ] && mv -f "${NEWSSPOOL_DIR}/db/history.n.hash" "${NEWSSPOOL_DIR}/db/history.hash" + [ -f "${NEWSSPOOL_DIR}/db/history.n.index" ] && mv -f "${NEWSSPOOL_DIR}/db/history.n.index" "${NEWSSPOOL_DIR}/db/history.index" su - news -c "/usr/lib/news/bin/makehistory" else NEWS_ERRFLAG="1" |