Cleanup, version bump.
authorLuca Longinotti <chtekk@gentoo.org>
Sun, 8 Apr 2007 14:10:55 +0000 (14:10 +0000)
committerLuca Longinotti <chtekk@gentoo.org>
Sun, 8 Apr 2007 14:10:55 +0000 (14:10 +0000)
Package-Manager: portage-2.1.2.3

13 files changed:
net-libs/courier-authlib/ChangeLog
net-libs/courier-authlib/Manifest
net-libs/courier-authlib/courier-authlib-0.58-r1.ebuild [deleted file]
net-libs/courier-authlib/courier-authlib-0.58.ebuild
net-libs/courier-authlib/courier-authlib-0.59.2.ebuild [moved from net-libs/courier-authlib/courier-authlib-0.59.1.ebuild with 66% similarity]
net-libs/courier-authlib/files/0.59.2-configure-db4.patch [moved from net-libs/courier-authlib/files/0.59.1-configure-db4.patch with 52% similarity]
net-libs/courier-authlib/files/0.59.2-remove-obsolete-macro.patch [moved from net-libs/courier-authlib/files/0.59.1-remove-obsolete-macro.patch with 100% similarity]
net-libs/courier-authlib/files/courier-authlib
net-libs/courier-authlib/files/digest-courier-authlib-0.58-r1 [deleted file]
net-libs/courier-authlib/files/digest-courier-authlib-0.59.1 [deleted file]
net-libs/courier-authlib/files/digest-courier-authlib-0.59.2 [new file with mode: 0644]
net-libs/courier-authlib/files/initd/courier-authlib [deleted file]
net-libs/courier-authlib/metadata.xml

index 4990a07b3fe8019690c968c7cae396eda4a6cd1f..d9beb90d56502b077fbd83be7f932fc2c819e74f 100644 (file)
@@ -1,6 +1,18 @@
 # ChangeLog for net-libs/courier-authlib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.63 2007/03/30 16:52:03 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/ChangeLog,v 1.64 2007/04/08 14:10:55 chtekk Exp $
+
+*courier-authlib-0.59.2 (08 Apr 2007)
+
+  08 Apr 2007; Luca Longinotti <chtekk@gentoo.org>
+  -files/0.59.1-configure-db4.patch,
+  -files/0.59.1-remove-obsolete-macro.patch,
+  +files/0.59.2-configure-db4.patch,
+  +files/0.59.2-remove-obsolete-macro.patch, files/courier-authlib,
+  -files/initd/courier-authlib, metadata.xml, courier-authlib-0.58.ebuild,
+  -courier-authlib-0.58-r1.ebuild, -courier-authlib-0.59.1.ebuild,
+  +courier-authlib-0.59.2.ebuild:
+  Ebuild cleanup, version bump to 0.59.2.
 
   30 Mar 2007; Timothy Redaelli <drizzt@gentoo.org>
   courier-authlib-0.59.1.ebuild:
index c7133986ac7d1abbc8cedee9d8ec9c2ca58df9a7..5919051d30ba14c22388c5030510a714c9d31475 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.58-configure-db4.patch 2616 RMD160 a65654c28537fc797eb0d7633d1b0b38f97af6f7 SHA1 9e66d0f69dc5ae157868c63d48009ef2a27a3d46 SHA256 629888b8363b0debcc592b4bed7390dfb01d9fc0ee15712d7c5a56575e25efe0
 MD5 1a6bae153910f87b5327c5d573503eb5 files/0.58-configure-db4.patch 2616
 RMD160 a65654c28537fc797eb0d7633d1b0b38f97af6f7 files/0.58-configure-db4.patch 2616
@@ -9,57 +6,39 @@ AUX 0.58-remove-obsolete-macro.patch 252 RMD160 f7bffc4956e078c5700394cfa6641df0
 MD5 ad8c997c0b176c6eab39dd38db000d5e files/0.58-remove-obsolete-macro.patch 252
 RMD160 f7bffc4956e078c5700394cfa6641df0c04ba050 files/0.58-remove-obsolete-macro.patch 252
 SHA256 ea6753f82c2b267ff373286f0c0a9e379e30f5d68bfe1df1c375d0a547d12a62 files/0.58-remove-obsolete-macro.patch 252
-AUX 0.59.1-configure-db4.patch 1362 RMD160 3b666b864138d510205154b6c76e37c1df63ab1d SHA1 c8957e4541c83656111e4296b1ca2230ae1b2ebe SHA256 a5d2be1aa015353981b3bb80c1f8b6fbeb3695e340e614b99ddbc879b21b78a8
-MD5 0cfe55c314eaa290f5b7dcf93bace252 files/0.59.1-configure-db4.patch 1362
-RMD160 3b666b864138d510205154b6c76e37c1df63ab1d files/0.59.1-configure-db4.patch 1362
-SHA256 a5d2be1aa015353981b3bb80c1f8b6fbeb3695e340e614b99ddbc879b21b78a8 files/0.59.1-configure-db4.patch 1362
-AUX 0.59.1-remove-obsolete-macro.patch 254 RMD160 268c175e0e75893661c9d17a36265a008469d49d SHA1 1afe4d21d480ab71d58a60cfca03d0a5abef2a3b SHA256 1e9d8df4d8a29c91384891a389da090a9c0a16e963936e21d2f999e13cfdbc1f
-MD5 45da1ba571c0aaff60577e1079052aa4 files/0.59.1-remove-obsolete-macro.patch 254
-RMD160 268c175e0e75893661c9d17a36265a008469d49d files/0.59.1-remove-obsolete-macro.patch 254
-SHA256 1e9d8df4d8a29c91384891a389da090a9c0a16e963936e21d2f999e13cfdbc1f files/0.59.1-remove-obsolete-macro.patch 254
-AUX courier-authlib 1108 RMD160 38044239f8790f56a7ef2d76019b27ec3d626000 SHA1 1f5947fa72560ec7b16cbab9221303a201c281fc SHA256 172dde34bf6fa36b29318bf9f6ed9304fd89f549ba0f9a051831183f06d326c0
-MD5 3bb31318f6e3f50060ccf1735e8ceb55 files/courier-authlib 1108
-RMD160 38044239f8790f56a7ef2d76019b27ec3d626000 files/courier-authlib 1108
-SHA256 172dde34bf6fa36b29318bf9f6ed9304fd89f549ba0f9a051831183f06d326c0 files/courier-authlib 1108
-AUX initd/courier-authlib 1114 RMD160 2649ba0e1f8cf6afcf167f56cb47bb392a1f953d SHA1 5c31259b4965aee4df6a289df2e2d08a5602b10d SHA256 1d27f54ab2566ce8fed9501cc603120048c4d2981f1dbed73b53ce2f00325f27
-MD5 cfad3388d2325ef441ef30237c0dffde files/initd/courier-authlib 1114
-RMD160 2649ba0e1f8cf6afcf167f56cb47bb392a1f953d files/initd/courier-authlib 1114
-SHA256 1d27f54ab2566ce8fed9501cc603120048c4d2981f1dbed73b53ce2f00325f27 files/initd/courier-authlib 1114
+AUX 0.59.2-configure-db4.patch 2618 RMD160 33691117802c3a9fe75c75c69594a4f63f4d2575 SHA1 47fc3ba36441c79fa4d8188530a4a2e1a9c8dcd2 SHA256 a60e2f5d26673be2ae107d9fcec024f41c522663d28f4741000fb1885ce067bc
+MD5 c59ebb33cb5a00d35f61c2a6cead0c1a files/0.59.2-configure-db4.patch 2618
+RMD160 33691117802c3a9fe75c75c69594a4f63f4d2575 files/0.59.2-configure-db4.patch 2618
+SHA256 a60e2f5d26673be2ae107d9fcec024f41c522663d28f4741000fb1885ce067bc files/0.59.2-configure-db4.patch 2618
+AUX 0.59.2-remove-obsolete-macro.patch 254 RMD160 268c175e0e75893661c9d17a36265a008469d49d SHA1 1afe4d21d480ab71d58a60cfca03d0a5abef2a3b SHA256 1e9d8df4d8a29c91384891a389da090a9c0a16e963936e21d2f999e13cfdbc1f
+MD5 45da1ba571c0aaff60577e1079052aa4 files/0.59.2-remove-obsolete-macro.patch 254
+RMD160 268c175e0e75893661c9d17a36265a008469d49d files/0.59.2-remove-obsolete-macro.patch 254
+SHA256 1e9d8df4d8a29c91384891a389da090a9c0a16e963936e21d2f999e13cfdbc1f files/0.59.2-remove-obsolete-macro.patch 254
+AUX courier-authlib 1112 RMD160 a0d5bf781ed1792677d83efd5034c83f689f7f2f SHA1 e755e781157787c921ef4884c1aca27e0ec68e87 SHA256 c946e42e5ed31a210da99af4d83cb739e2008ad2ea524955cdb141f4c7289dc9
+MD5 2e89cdbc8df5cbf676efdcca08b80cc7 files/courier-authlib 1112
+RMD160 a0d5bf781ed1792677d83efd5034c83f689f7f2f files/courier-authlib 1112
+SHA256 c946e42e5ed31a210da99af4d83cb739e2008ad2ea524955cdb141f4c7289dc9 files/courier-authlib 1112
 DIST courier-authlib-0.58.tar.bz2 2006735 RMD160 6474612496cd287f294c7f52239ea853c44e4aa1 SHA1 8bdab3c2e734cc8f47230924ec638ba3609a92a1 SHA256 d877cc6c65e90471ec9410c5ce7af467ba5beb3922b9cfbf2bf6aa24f6bdc7ad
-DIST courier-authlib-0.59.1.tar.bz2 2101729 RMD160 3ccd24004411155b5b5bfe959c557a29e58b9826 SHA1 fdf2f254922bf6213b987f37485c0fdd30121db6 SHA256 72d9faf01b9e211142ee25f414b19e6de06de1f040a5338ab19c2770b9289724
-EBUILD courier-authlib-0.58-r1.ebuild 5901 RMD160 ff41574ad3e314cca65bf2b6ce0436d00329962b SHA1 413466fd3bccad20ca14840f16ca327e37ac2ccd SHA256 cd0ab6b293cc9ffb69733b377387e2227f2adb334083f33317daafb442d7f220
-MD5 e7efdf59f424203b7144228f1a47b92e courier-authlib-0.58-r1.ebuild 5901
-RMD160 ff41574ad3e314cca65bf2b6ce0436d00329962b courier-authlib-0.58-r1.ebuild 5901
-SHA256 cd0ab6b293cc9ffb69733b377387e2227f2adb334083f33317daafb442d7f220 courier-authlib-0.58-r1.ebuild 5901
-EBUILD courier-authlib-0.58.ebuild 5919 RMD160 b063068d09da20627fb7894d12045adc88f33c22 SHA1 98a6a6928c92d87fe5fff8d4dd391840e2eb30e7 SHA256 0294478810b48f30de6c3b46f0c698c308b0d8340b40bac21022ad2a443fe943
-MD5 23965a5bd299f94e2d7d5bc298bd70cb courier-authlib-0.58.ebuild 5919
-RMD160 b063068d09da20627fb7894d12045adc88f33c22 courier-authlib-0.58.ebuild 5919
-SHA256 0294478810b48f30de6c3b46f0c698c308b0d8340b40bac21022ad2a443fe943 courier-authlib-0.58.ebuild 5919
-EBUILD courier-authlib-0.59.1.ebuild 5737 RMD160 d5d0b4c41cae483fa3a5c4b79442c06ba4443d7d SHA1 91d4d7566b597cb6987fc0cca7e0ee582f80ce05 SHA256 24ea735d19301a46c189be754660ad19a668f7cc3b48852c552df1c59f4c37de
-MD5 2e00c9b37650a6144acb16d9099dabca courier-authlib-0.59.1.ebuild 5737
-RMD160 d5d0b4c41cae483fa3a5c4b79442c06ba4443d7d courier-authlib-0.59.1.ebuild 5737
-SHA256 24ea735d19301a46c189be754660ad19a668f7cc3b48852c552df1c59f4c37de courier-authlib-0.59.1.ebuild 5737
-MISC ChangeLog 11008 RMD160 0ac16665fb39731d76a19125b706be9777d94a43 SHA1 4f87de095718934da781fd560934b09f52d4804e SHA256 bf71bb5d12c47a1b2f7dddb72efcc78caf86151a0ca98bc298a52d77877bc432
-MD5 671618e332d1681dcd823b7b6bf7d076 ChangeLog 11008
-RMD160 0ac16665fb39731d76a19125b706be9777d94a43 ChangeLog 11008
-SHA256 bf71bb5d12c47a1b2f7dddb72efcc78caf86151a0ca98bc298a52d77877bc432 ChangeLog 11008
-MISC metadata.xml 264 RMD160 d6222b0f467d8eba60d21e6aca39f286597beaef SHA1 0801b3c7ed8a52bc3a43092b58ad87a0357b2691 SHA256 712f8d9c0fb0a7cd5ce2c2c4367cc1c7a6d518f1cf2520cde278efcb32240367
-MD5 0364b9fe218debf0191624f65e03edd0 metadata.xml 264
-RMD160 d6222b0f467d8eba60d21e6aca39f286597beaef metadata.xml 264
-SHA256 712f8d9c0fb0a7cd5ce2c2c4367cc1c7a6d518f1cf2520cde278efcb32240367 metadata.xml 264
+DIST courier-authlib-0.59.2.tar.bz2 2109549 RMD160 499da7ec09fbe46be5ea9450c6ecb9c3d648244b SHA1 84dfd3175b2fcbbb18a1ea87f3cb803daff827df SHA256 326f4a2e0c2a6259083f521ae838984eca051483dadfdcda4b0a535d7472f396
+EBUILD courier-authlib-0.58.ebuild 5865 RMD160 f596576e6eb26fdea9d7b18db15e10fe989efa59 SHA1 251c72e3734c41b422bd4c16f0b70daca0f84df1 SHA256 b6fa1cfc671e28e87fb1b69248c9a494fa35b715e510a9fb69f2ac1bc48de6d9
+MD5 3ef8f6ef2cf49680f9c3855664486b69 courier-authlib-0.58.ebuild 5865
+RMD160 f596576e6eb26fdea9d7b18db15e10fe989efa59 courier-authlib-0.58.ebuild 5865
+SHA256 b6fa1cfc671e28e87fb1b69248c9a494fa35b715e510a9fb69f2ac1bc48de6d9 courier-authlib-0.58.ebuild 5865
+EBUILD courier-authlib-0.59.2.ebuild 5939 RMD160 83f8c7625f05ccb8d73a337b45b2f12d07e82922 SHA1 a95fd6338448f7dafbe540d074f95d58f9ea036e SHA256 05547a06c6b0f6067bdc981eaa63591512493ca35f5c9cf32095ce4591860593
+MD5 aca5fb5dd14495ed2bc42bdae972b9f5 courier-authlib-0.59.2.ebuild 5939
+RMD160 83f8c7625f05ccb8d73a337b45b2f12d07e82922 courier-authlib-0.59.2.ebuild 5939
+SHA256 05547a06c6b0f6067bdc981eaa63591512493ca35f5c9cf32095ce4591860593 courier-authlib-0.59.2.ebuild 5939
+MISC ChangeLog 11504 RMD160 7e122b05b2fbdfb89dfe99df8c1f70cb6c4a528e SHA1 4d90a5d56347b1d92af99ee62a16172044188aeb SHA256 d08c57a8ef152c2a89999609bb5d6246671a6b6ff1e8bf84fa7711f9869b9a0e
+MD5 000a21d58deb7dfbeeffa55e1297e968 ChangeLog 11504
+RMD160 7e122b05b2fbdfb89dfe99df8c1f70cb6c4a528e ChangeLog 11504
+SHA256 d08c57a8ef152c2a89999609bb5d6246671a6b6ff1e8bf84fa7711f9869b9a0e ChangeLog 11504
+MISC metadata.xml 161 RMD160 29c4fec0a58914d1d34dd6bac0d88e573c4de9db SHA1 a8687e0eba56fc3e972c85401678dd93359f24ca SHA256 7ef60d41d37cc5bba44b508e73f4455136aed43abe2d7fc6bbb0e15ff870f3b2
+MD5 21daf36958be9f716caff94e896c4453 metadata.xml 161
+RMD160 29c4fec0a58914d1d34dd6bac0d88e573c4de9db metadata.xml 161
+SHA256 7ef60d41d37cc5bba44b508e73f4455136aed43abe2d7fc6bbb0e15ff870f3b2 metadata.xml 161
 MD5 4cc2f8a9b13e49b3df351d0fc139b5d1 files/digest-courier-authlib-0.58 268
 RMD160 13974bb3b0b57b205e5da3c9a2f43086590afe30 files/digest-courier-authlib-0.58 268
 SHA256 24d46d530a68dccb1d51628593632dfcf6ed86bd6fe6547660656f6511e818ed files/digest-courier-authlib-0.58 268
-MD5 4cc2f8a9b13e49b3df351d0fc139b5d1 files/digest-courier-authlib-0.58-r1 268
-RMD160 13974bb3b0b57b205e5da3c9a2f43086590afe30 files/digest-courier-authlib-0.58-r1 268
-SHA256 24d46d530a68dccb1d51628593632dfcf6ed86bd6fe6547660656f6511e818ed files/digest-courier-authlib-0.58-r1 268
-MD5 41a7edca78fa98ac950446906142d105 files/digest-courier-authlib-0.59.1 274
-RMD160 a35094f7fc746e1424936364c978a2a02386a89b files/digest-courier-authlib-0.59.1 274
-SHA256 82d232201778268912fb7901957fbc158c29df197069d0621271474f3d0cc2c9 files/digest-courier-authlib-0.59.1 274
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGDUA5GDyatLGpTbYRAuQ8AJoDRLWo7fH7wmIi8JuoayAghrvnjACeLfOd
-a2UODl+44zgQm1qHOovWS0g=
-=A52f
------END PGP SIGNATURE-----
+MD5 ae50970585691f1d9665820b06be271b files/digest-courier-authlib-0.59.2 274
+RMD160 c1aeacb1c47e605109dae2a7502c8ac40341fe6c files/digest-courier-authlib-0.59.2 274
+SHA256 2003354b100a8a0cde42b0e8d58f5e5c3e8eb620e9131d3b23930f6a5aa80c21 files/digest-courier-authlib-0.59.2 274
diff --git a/net-libs/courier-authlib/courier-authlib-0.58-r1.ebuild b/net-libs/courier-authlib/courier-authlib-0.58-r1.ebuild
deleted file mode 100644 (file)
index b1338e9..0000000
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.58-r1.ebuild,v 1.2 2007/01/17 11:15:22 masterdriverz Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-inherit eutils flag-o-matic autotools
-
-DESCRIPTION="courier authentication library"
-[ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "$SRC_URI" ] && SRC_URI="http://www.courier-mta.org/beta/courier-authlib/${P%%_pre}.tar.bz2"
-HOMEPAGE="http://www.courier-mta.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="postgres ldap mysql berkdb gdbm pam crypt debug"
-
-RESTRICT="nouserpriv"
-
-DEPEND="gdbm? ( sys-libs/gdbm )
-               !gdbm? ( >=sys-devel/autoconf-2.5 sys-libs/db )
-               >=dev-libs/openssl-0.9.6
-               pam? ( >=sys-libs/pam-0.75 )
-               mysql? ( virtual/mysql )
-               ldap? ( >=net-nds/openldap-1.2.11 )
-               postgres? ( >=dev-db/postgresql-7.2 )"
-
-RDEPEND="gdbm? ( sys-libs/gdbm )
-               !gdbm? ( sys-libs/db )"
-
-S="${WORKDIR}/${P%%_pre}"
-
-pkg_setup() {
-       if ! has_version 'dev-tcltk/expect' ; then
-               ewarn 'The dev-tcltk/expect package is not installed.'
-               einfo 'Without it, you will not be able to change system login passwords.'
-               einfo 'However non-system authentication modules (LDAP, MySQL, PostgreSQL,'
-               einfo 'and others) will work just fine.'
-       fi
-}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       sed -e "s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
-       use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-       if ! use gdbm ; then
-               epatch "${FILESDIR}/${PV}-configure-db4.patch"
-       else
-               epatch "${FILESDIR}/${PV}-remove-obsolete-macro.patch"
-       fi
-       sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' ${S}/authmigrate.in
-       sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' ${S}/authmigrate.in
-       sed -i -e"s|@@INDENT@@|         |g" ${S}/authmigrate.in
-       sed -i -e"s|\$sbindir/makeuserdb||g" ${S}/authmigrate.in
-
-       eautoreconf
-}
-
-src_compile() {
-       filter-flags -fomit-frame-pointer
-
-       local myconf
-       myconf="$(use_with pam authpam) $(use_with ldap authldap)"
-
-       if use berkdb; then
-               if use gdbm; then
-                       ewarn "Both gdbm and berkdb selected. Using gdbm."
-               else
-                       myconf="${myconf} --with-db=db"
-               fi
-       fi
-       use gdbm && myconf="${myconf} --with-db=gdbm"
-
-       if has_version 'net-mail/vpopmail' ; then
-               myconf="${myconf} --with-authvchkpw --without-authmysql --without-authpgsql"
-               use mysql && ewarn "vpopmail found. authmysql will not be built."
-               use postgres && ewarn "vpopmail found. authpgsql will not be built."
-       else
-               myconf="${myconf} --without-authvchkpw $(use_with mysql authmysql) $(use_with postgres authpgsql)"
-       fi
-
-       use debug && myconf="${myconf} debug=true"
-
-       einfo "Configuring courier-authlib: ${myconf}"
-
-       econf \
-               --sysconfdir=/etc/courier \
-               --datadir=/usr/share/courier \
-               --libexecdir=/usr/$(get_libdir)/courier \
-               --localstatedir=/var/lib/courier \
-               --sharedstatedir=/var/lib/courier/com \
-               --with-authdaemonvar=/var/lib/courier/authdaemon \
-               --with-authshadow \
-               --without-redhat \
-               --with-mailuser=mail \
-               --with-mailgroup=mail \
-               --cache-file="${S}/configuring.cache" \
-               ${myconf} || die "econf failed"
-       emake || die "emake failed"
-}
-
-orderfirst() {
-       file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-       if [ -e "${file}" ] ; then
-               orig="$(grep \"^${option}=\" ${file} | cut -d'\"' -f 2)"
-               new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-               sed -i -e"s/^${option}=.*$/${new}/" ${file}
-       fi
-}
-
-finduserdb() {
-       for dir in \
-               /etc/courier/authlib /etc/courier /etc/courier-imap \
-               /usr/lib/courier/etc /usr/lib/courier-imap/etc \
-               /usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
-               /usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
-               /usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-               if [ -e "$dir/userdb" ]; then
-                       einfo "found $dir/userdb"
-                       cp -v $dir/userdb ${D}/etc/courier/authlib/
-                       chmod go-rwx ${D}/etc/courier/authlib/userdb
-                       continue
-               fi
-       done
-}
-
-src_install() {
-       diropts -o mail -g mail
-       dodir /etc/courier
-       keepdir /var/lib/courier/authdaemon
-       keepdir /etc/courier/authlib
-       emake install DESTDIR="${D}" || die "install failed"
-       emake install-migrate DESTDIR="${D}" || die "migrate failed"
-       [ ! -e "${D}/etc/courier/authlib/userdb" ] && finduserdb
-       emake install-configure DESTDIR="${D}" || die "install-configure failed"
-       rm -vf ${D}/etc/courier/authlib/*.bak
-       chown mail:mail ${D}/etc/courier/authlib/*
-       for y in ${D}/etc/courier/authlib/*.dist ; do
-               [ ! -e "${y%%.dist}" ] && cp -v ${y} ${y%%.dist}
-       done
-       use pam && orderfirst authdaemonrc authmodulelist authpam
-       use ldap && orderfirst authdaemonrc authmodulelist authldap
-       use postgres && orderfirst authdaemonrc authmodulelist authpgsql
-       use mysql && orderfirst authdaemonrc authmodulelist authmysql
-       dodoc AUTHORS COPYING ChangeLog* INSTALL NEWS README
-       dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-       if use mysql; then
-               dodoc README.authmysql.myownquery
-               dohtml README.authmysql.html
-       fi
-       use postgres && dohtml README.authpostgres.html README.authmysql.html
-       if use ldap; then
-               dodoc README.ldap
-               dodir /etc/openldap/schema
-               cp authldap.schema "${D}/etc/openldap/schema/"
-       fi
-       doinitd "${FILESDIR}/initd/courier-authlib" || die "init.d failed"
-}
-
-pkg_postinst() {
-       if [ -e /etc/courier/authlib/userdb ]; then
-               einfo "running makeuserdb"
-               chmod go-rwx /etc/courier/authlib/userdb
-               makeuserdb
-       fi
-
-       # Suggest cleaning out the following old files
-       list="$(find /etc/courier -type f -maxdepth 1 | grep \"^/etc/courier/auth\")"
-       if [ ! -z "${list}" ] ; then
-               ewarn "Courier authentication files are now in /etc/courier/authlib/"
-               einfo "The following files are no longer needed and can likely be removed:"
-               einfo " rm $(echo \"${list}\")"
-       fi
-}
index 23a3665e0e518214b75ee6d55540faafefd7421d..47ccbcd53d89c8f9ea018eea7c368e6887b9120f 100644 (file)
@@ -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-libs/courier-authlib/courier-authlib-0.58.ebuild,v 1.13 2007/01/17 11:15:22 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.58.ebuild,v 1.14 2007/04/08 14:10:55 chtekk Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
@@ -157,8 +157,7 @@ src_install() {
                dodir /etc/openldap/schema
                cp authldap.schema "${D}/etc/openldap/schema/"
        fi
-       # Note: different init.d file to -r1
-       doinitd "${FILESDIR}/courier-authlib" || die "init.d failed"
+       doinitd "${FILESDIR}/${PN}" || die "doinitd failed"
 }
 
 pkg_postinst() {
similarity index 66%
rename from net-libs/courier-authlib/courier-authlib-0.59.1.ebuild
rename to net-libs/courier-authlib/courier-authlib-0.59.2.ebuild
index 99b33c1d7a5d07db93efe8c02e910fc1efcc5c77..4fe4b8fc6a84d5d672a920ce025633679f2c7339 100644 (file)
@@ -1,37 +1,36 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.59.1.ebuild,v 1.2 2007/03/30 16:52:03 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/courier-authlib-0.59.2.ebuild,v 1.1 2007/04/08 14:10:55 chtekk Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="latest"
 
 inherit eutils flag-o-matic autotools
 
-DESCRIPTION="courier authentication library"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="Courier authentication library."
 SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
 HOMEPAGE="http://www.courier-mta.org/"
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="berkdb crypt debug gdbm ldap mysql pam postgres vpopmail"
 
 RESTRICT="userpriv"
 
 RDEPEND="gdbm? ( sys-libs/gdbm )
-       !gdbm? ( sys-libs/db )"
+               !gdbm? ( sys-libs/db )"
 
 DEPEND="${RDEPEND}
                >=dev-libs/openssl-0.9.6
-               pam? ( virtual/pam )
-               mysql? ( virtual/mysql )
                ldap? ( >=net-nds/openldap-1.2.11 )
+               mysql? ( virtual/mysql )
+               pam? ( virtual/pam )
                postgres? ( >=dev-db/postgresql-7.2 )"
 
-S="${WORKDIR}/${P%%_pre}"
-
 pkg_setup() {
        enewuser mail -1 -1 /var/spool/mail
+
        if ! has_version 'dev-tcltk/expect' ; then
                ewarn 'The dev-tcltk/expect package is not installed.'
                einfo 'Without it, you will not be able to change system login passwords.'
@@ -43,18 +42,23 @@ pkg_setup() {
 src_unpack() {
        unpack ${A}
        cd "${S}"
-       sed -e "s|^chk_file .* |&\${DESTDIR}|g" -i.orig authmigrate.in
-       use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
-       if ! use gdbm; then
+
+       sed -i -e "s|^chk_file .* |&\${DESTDIR}|g" authmigrate.in || die "sed failed"
+
+       if use elibc_uclibc ; then
+               sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub || die "sed failed"
+       fi
+
+       if ! use gdbm ; then
                epatch "${FILESDIR}/${PV}-configure-db4.patch"
        else
                epatch "${FILESDIR}/${PV}-remove-obsolete-macro.patch"
        fi
 
-       sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' ${S}/authmigrate.in
-       sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' ${S}/authmigrate.in
-       sed -i -e"s|@@INDENT@@|         |g" ${S}/authmigrate.in
-       sed -i -e"s|\$sbindir/makeuserdb||g" ${S}/authmigrate.in
+       sed -i -e'/for dir in/a@@INDENT@@/etc/courier-imap \\' authmigrate.in || die "sed failed"
+       sed -i -e'/for dir in/a@@INDENT@@/etc/courier/authlib \\' authmigrate.in || die "sed failed"
+       sed -i -e"s|@@INDENT@@|         |g" authmigrate.in || die "sed failed"
+       sed -i -e"s|\$sbindir/makeuserdb||g" authmigrate.in || die "sed failed"
 
        eautoreconf
 }
@@ -62,11 +66,13 @@ src_unpack() {
 src_compile() {
        filter-flags -fomit-frame-pointer
 
-       local myconf
-       myconf="$(use_with pam authpam) $(use_with ldap authldap)"
+       local myconf=""
 
-       if use berkdb; then
-               if use gdbm; then
+       myconf="${myconf} `use_with pam authpam`"
+       myconf="${myconf} `use_with ldap authldap`"
+
+       if use berkdb ; then
+               if use gdbm ; then
                        ewarn "Both gdbm and berkdb selected. Using gdbm."
                else
                        myconf="${myconf} --with-db=db"
@@ -74,12 +80,12 @@ src_compile() {
        fi
        use gdbm && myconf="${myconf} --with-db=gdbm"
 
-       if use vpopmail; then
+       if use vpopmail ; then
                myconf="${myconf} --with-authvchkpw --without-authmysql --without-authpgsql"
                use mysql && ewarn "Building vpopmail support instead of authmysql"
                use postgres && ewarn "Building vpopmail support instead of authpgsql"
        else
-               myconf="${myconf} --without-authvchkpw $(use_with mysql authmysql) $(use_with postgres authpgsql)"
+               myconf="${myconf} --without-authvchkpw `use_with mysql authmysql` `use_with postgres authpgsql`"
        fi
 
        use debug && myconf="${myconf} debug=true"
@@ -104,10 +110,10 @@ src_compile() {
 
 orderfirst() {
        file="${D}/etc/courier/authlib/${1}" ; option="${2}" ; param="${3}"
-       if [ -e "${file}" ] ; then
+       if [[ -e "${file}" ]] ; then
                orig="$(grep \"^${option}=\" ${file} | cut -d'\"' -f 2)"
                new="${option}=\"${param} `echo ${orig} | sed -e\"s/${param}//g\" -e\"s/  / /g\"`\""
-               sed -i -e"s/^${option}=.*$/${new}/" ${file}
+               sed -i -e "s/^${option}=.*$/${new}/" "${file}"
        fi
 }
 
@@ -118,10 +124,10 @@ finduserdb() {
                /usr/local/etc /usr/local/etc/courier /usr/local/courier/etc \
                /usr/local/lib/courier/etc /usr/local/lib/courier-imap/etc \
                /usr/local/share/sqwebmail /usr/local/etc/courier-imap ; do
-               if [ -e "$dir/userdb" ]; then
-                       einfo "found $dir/userdb"
-                       cp -v $dir/userdb ${D}/etc/courier/authlib/
-                       chmod go-rwx ${D}/etc/courier/authlib/userdb
+               if [[ -e "${dir}/userdb" ]] ; then
+                       einfo "Found userdb at: ${dir}/userdb"
+                       cp -f "${dir}/userdb" "${D}/etc/courier/authlib/"
+                       chmod go-rwx "${D}/etc/courier/authlib/userdb"
                        continue
                fi
        done
@@ -132,14 +138,14 @@ src_install() {
        dodir /etc/courier
        keepdir /var/lib/courier/authdaemon
        keepdir /etc/courier/authlib
-       emake install DESTDIR="${D}" || die "install failed"
-       emake install-migrate DESTDIR="${D}" || die "migrate failed"
-       [ ! -e "${D}/etc/courier/authlib/userdb" ] && finduserdb
-       emake install-configure DESTDIR="${D}" || die "install-configure failed"
-       rm -vf ${D}/etc/courier/authlib/*.bak
-       chown mail:mail ${D}/etc/courier/authlib/*
-       for y in ${D}/etc/courier/authlib/*.dist ; do
-               [ ! -e "${y%%.dist}" ] && cp -v ${y} ${y%%.dist}
+       emake DESTDIR="${D}" install || die "emake install failed"
+       emake DESTDIR="${D}" install-migrate|| die "emake install-migrate failed"
+       [[ ! -e "${D}/etc/courier/authlib/userdb" ]] && finduserdb
+       emake DESTDIR="${D}" install-configure || die "emake install-configure failed"
+       rm -f "${D}"/etc/courier/authlib/*.bak
+       chown mail:mail "${D}"/etc/courier/authlib/*
+       for y in "${D}"/etc/courier/authlib/*.dist ; do
+               [[ ! -e "${y%%.dist}" ]] && cp -f "${y}" "${y%%.dist}"
        done
        use pam && orderfirst authdaemonrc authmodulelist authpam
        use ldap && orderfirst authdaemonrc authmodulelist authldap
@@ -147,29 +153,31 @@ src_install() {
        use mysql && orderfirst authdaemonrc authmodulelist authmysql
        dodoc AUTHORS COPYING ChangeLog* INSTALL NEWS README
        dohtml README.html README_authlib.html NEWS.html INSTALL.html README.authdebug.html
-       if use mysql; then
+       if use mysql ; then
                dodoc README.authmysql.myownquery
                dohtml README.authmysql.html
        fi
-       use postgres && dohtml README.authpostgres.html README.authmysql.html
-       if use ldap; then
+       if use postgres ; then
+               dohtml README.authpostgres.html README.authmysql.html
+       fi
+       if use ldap ; then
                dodoc README.ldap
                dodir /etc/openldap/schema
-               cp authldap.schema "${D}/etc/openldap/schema/"
+               cp -f authldap.schema "${D}/etc/openldap/schema/"
        fi
-       doinitd "${FILESDIR}/initd/courier-authlib" || die "init.d failed"
+       doinitd "${FILESDIR}/${PN}" || die "doinitd failed"
 }
 
 pkg_postinst() {
-       if [ -e /etc/courier/authlib/userdb ]; then
-               einfo "running makeuserdb"
+       if [[ -e /etc/courier/authlib/userdb ]] ; then
+               einfo "Running makeuserdb ..."
                chmod go-rwx /etc/courier/authlib/userdb
                makeuserdb
        fi
 
        # Suggest cleaning out the following old files
        list="$(find /etc/courier -maxdepth 1 -type f | grep \"^/etc/courier/auth\")"
-       if [ ! -z "${list}" ] ; then
+       if [[ ! -z "${list}" ]] ; then
                ewarn "Courier authentication files are now in /etc/courier/authlib/"
                einfo "The following files are no longer needed and can likely be removed:"
                einfo " rm $(echo \"${list}\")"
similarity index 52%
rename from net-libs/courier-authlib/files/0.59.1-configure-db4.patch
rename to net-libs/courier-authlib/files/0.59.2-configure-db4.patch
index a784107543e4d6e330abaf344dbc4a0c6167a1ae..be12d843c47c766578159cd6695e2c32895e1286 100644 (file)
  fi
  
  LIBS="$saveLIBS"
+--- bdbobj/configure.in        2001-09-18 18:26:28.000000000 -0700
++++ bdbobj/configure.in        2004-08-14 16:15:08.469316646 -0700
+@@ -21,15 +21,19 @@
+ dnl Checks for libraries.
+ saveLIBS="$LIBS"
+-AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
+-      AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
+-      AC_CHECK_LIB(db, db_env_create, [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
+-      ))
+-
+-FOUND_DB=0
+-AC_CHECK_FUNC(dbopen, FOUND_DB=1)
+-AC_CHECK_FUNC(db_open, FOUND_DB=1)
+-AC_CHECK_FUNC(db_env_create, FOUND_DB=1)
++for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
++  do
++        AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++          AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++            AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++              AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))
++
++  done
++FOUND_DB=0
++AC_CHECK_FUNC(db_create_4002, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4001, FOUND_DB=1)
++AC_CHECK_FUNC(db_create_4000, FOUND_DB=1)
++AC_CHECK_FUNC(db_create, FOUND_DB=1)
+ LIBS="$saveLIBS"
index d0071fafe1fa8d74fcd571375b8ada7e7b42a16b..88417a8ac65ba30cb376332fe7c8eb3424020fbf 100644 (file)
@@ -1,14 +1,15 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/files/courier-authlib,v 1.1 2007/01/16 23:04:09 masterdriverz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/files/courier-authlib,v 1.2 2007/04/08 14:10:55 chtekk Exp $
+
 depend() {
        need net
        provide authdaemond
 }
 
 checkconfig() {
-       if [ ! -e /etc/courier/authlib/authdaemonrc ] ; then
+       if [[ ! -e /etc/courier/authlib/authdaemonrc ]] ; then
                eerror "You need an /etc/courier/authlib/authdaemonrc file to run authdaemon"
                return 1
        fi
@@ -27,14 +28,14 @@ start() {
        checkconfig || return 1
        setauth
        ebegin "Starting courier-authlib: ${AUTHDAEMOND}"
-       start-stop-daemon --quiet --start --pidfile "$pidfile" --exec \
-               /usr/bin/env $logger -- ${LOGGEROPTS} -pid="$pidfile" -start "${AUTHLIB}/${AUTHDAEMOND}" 
+       start-stop-daemon --quiet --start --pidfile "${pidfile}" --exec \
+               /usr/bin/env ${logger} -- ${LOGGEROPTS} -pid="${pidfile}" -start "${AUTHLIB}/${AUTHDAEMOND}" 
        eend $?
 }
 
 stop() {
        setauth
        ebegin "Stopping courier-authlib: ${AUTHDAEMOND}"
-       start-stop-daemon --quiet --stop --pidfile "$pidfile"
+       start-stop-daemon --quiet --stop --pidfile "${pidfile}"
        eend $?
 }
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.58-r1 b/net-libs/courier-authlib/files/digest-courier-authlib-0.58-r1
deleted file mode 100644 (file)
index ccddca8..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fb691558d611cb191ae6a83002f0195b courier-authlib-0.58.tar.bz2 2006735
-RMD160 6474612496cd287f294c7f52239ea853c44e4aa1 courier-authlib-0.58.tar.bz2 2006735
-SHA256 d877cc6c65e90471ec9410c5ce7af467ba5beb3922b9cfbf2bf6aa24f6bdc7ad courier-authlib-0.58.tar.bz2 2006735
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.59.1 b/net-libs/courier-authlib/files/digest-courier-authlib-0.59.1
deleted file mode 100644 (file)
index ce8150e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4e7327980724c4c327aace23facd5d59 courier-authlib-0.59.1.tar.bz2 2101729
-RMD160 3ccd24004411155b5b5bfe959c557a29e58b9826 courier-authlib-0.59.1.tar.bz2 2101729
-SHA256 72d9faf01b9e211142ee25f414b19e6de06de1f040a5338ab19c2770b9289724 courier-authlib-0.59.1.tar.bz2 2101729
diff --git a/net-libs/courier-authlib/files/digest-courier-authlib-0.59.2 b/net-libs/courier-authlib/files/digest-courier-authlib-0.59.2
new file mode 100644 (file)
index 0000000..fd0bae8
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 b3022de4f9f2977da1dc6d2ae424277d courier-authlib-0.59.2.tar.bz2 2109549
+RMD160 499da7ec09fbe46be5ea9450c6ecb9c3d648244b courier-authlib-0.59.2.tar.bz2 2109549
+SHA256 326f4a2e0c2a6259083f521ae838984eca051483dadfdcda4b0a535d7472f396 courier-authlib-0.59.2.tar.bz2 2109549
diff --git a/net-libs/courier-authlib/files/initd/courier-authlib b/net-libs/courier-authlib/files/initd/courier-authlib
deleted file mode 100644 (file)
index a3c03cc..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/courier-authlib/files/initd/courier-authlib,v 1.1 2007/01/16 23:04:09 masterdriverz Exp $
-depend() {
-       need net
-       provide authdaemond
-}
-
-checkconfig() {
-       if [ ! -e /etc/courier/authlib/authdaemonrc ] ; then
-               eerror "You need an /etc/courier/authlib/authdaemonrc file to run authdaemon"
-               return 1
-       fi
-}
-
-setauth() {
-       source /etc/courier/authlib/authdaemonrc
-       AUTHLIB="/usr/lib/courier/courier-authlib"
-       AUTHDAEMOND="authdaemond"
-       pidfile="/var/run/authdaemon.pid"
-       logger="/usr/sbin/courierlogger"
-       export DEBUG_LOGIN DEFAULTOPTIONS LOGGEROPTS
-}
-
-start() {
-       checkconfig || return 1
-       setauth
-       ebegin "Starting courier-authlib: ${AUTHDAEMOND}"
-       start-stop-daemon --quiet --start --pidfile "$pidfile" --exec \
-               /usr/bin/env $logger -- ${LOGGEROPTS} -pid="$pidfile" -start "${AUTHLIB}/${AUTHDAEMOND}" 
-       eend $?
-}
-
-stop() {
-       setauth
-       ebegin "Stopping courier-authlib: ${AUTHDAEMOND}"
-       start-stop-daemon --quiet --stop --pidfile "$pidfile"
-       eend $?
-}
index 41f33d1cde777a3ac3f66673899ced9ad8349f38..9fe616d38dec0c42b6342b916b667623b46c934c 100644 (file)
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-  <herd>no-herd</herd>
-  <longdescription>
-      authentication library common to all courier packages
-  </longdescription>
+       <herd>no-herd</herd>
 </pkgmetadata>