From e92cb1eeffb4691ae7f1e93ee66adb2204b719c5 Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Fri, 3 Feb 2012 09:34:20 -0600 Subject: [PATCH] correcciones a Dbmail que se habian quedado --- net-mail/dbmail/Manifest | 5 +- net-mail/dbmail/dbmail-1.2.12.1-r1.ebuild | 2 +- net-mail/dbmail/dbmail-2.0.11.ebuild | 139 ++++++++++++++++++ .../dbmail/files/dbmail-2.0.11-lcrypt.patch | 13 ++ 4 files changed, 157 insertions(+), 2 deletions(-) create mode 100644 net-mail/dbmail/dbmail-2.0.11.ebuild create mode 100644 net-mail/dbmail/files/dbmail-2.0.11-lcrypt.patch diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest index 3bfe21a..73ab8d9 100644 --- a/net-mail/dbmail/Manifest +++ b/net-mail/dbmail/Manifest @@ -1,3 +1,4 @@ +AUX dbmail-2.0.11-lcrypt.patch 642 RMD160 5bd13d6afb6f0ee3de9ce883d55fae91a8000c9e SHA1 e8b65aa89706ab0bdb3e6b96b8ac1633146b5802 SHA256 9f36e404eac0ba733f2386db27b05fe55693148ee04ca296824cecfaf41f5737 AUX dbmail-2.0.4-01_quota.patch 5108 RMD160 1d66f58f09f2367955d000def9ec792a2247da5d SHA1 e7c146a8687c2e6033884a345f887f0ab85dd120 SHA256 84c977684a26bd0a77a81c66e63e889d2d2acf9e9bac51b8b9d3aeb71f4ebc77 AUX dbmail-2.0.4-fPIC.patch 2871 RMD160 e3a1080a9cbc61d042b9111b896ff7582f553aa9 SHA1 d108f3652e07a9583c4236868157e0f5a051f632 SHA256 2afd521204639963903b5148c1db8b062ce5731f12ca6c5da63b2ca2cadd8e3e AUX dbmail-imapd.rc 540 RMD160 215c9c81462c6aa1fecc96acf2ff9087a3213258 SHA1 97294a9b9522cb5e903624bc2a0495a74c79da5d SHA256 cf602849145b3aae2ecbd416ecea3d55bb9d46e53b07d5932de913b4f16011dc @@ -5,12 +6,14 @@ AUX dbmail-pop3d.rc 540 RMD160 906afb1688f7fc52a85317e1c644695d92592a71 SHA1 998 AUX dbmail-startup-gentoo.patch 10704 RMD160 b6eff3d2181d28dfc21e7bfe358387d5b75499d7 SHA1 ae22d9558c28ff8283448e60544a9119215d31e2 SHA256 533756d346fbe32999f4fee6c6cdc3a00c7a639d43450447320f48a7a30ce4f3 DIST dbmail-1.2.11.tgz 248256 RMD160 605864ca651f89f9a5a2d85635569db68d3cf1db SHA1 078e13180ec41a3635937418ce1c2bb356f77ae9 SHA256 4fcdf66fb8f6ab97fad014a5c54284f6ae815ae48708692c29c5dd5edc45c17b DIST dbmail-1.2.12.1.tgz 253497 RMD160 ea27c26f422676495d200644c0fd3212c69f50aa SHA1 9a761ee917164a90b7adce82fe655381cd64a6a0 SHA256 a49fb9a66717d85025f787f23c4f61aca75cf1a00a7e422bc342538e135abea1 +DIST dbmail-2.0.11.tgz 649830 RMD160 74a7dbb06a53b42d3afc37bfebfbb36d3db014ac SHA1 fc7c4a2f800f77cca95df99a46265daa5b1935ec SHA256 6271c79c85fc686013339e8583782721a77cd41b8bf67b584693c44efdbecc82 DIST dbmail-2.0.4.tgz 589603 RMD160 fdf3d9489ff14f910b138c4af4bfcfd66366c58a SHA1 81c60c5c25f3d0b8acac3fc8f1c426551e878198 SHA256 a212a122bc7184ebc80393ded289abfbfe068beec7e7f02487f8b140d86a9daa DIST dbmail-2.0.5.tar.gz 583899 RMD160 49b0d34b18b26d837eb3ab17fa4053d2ed438fd4 SHA1 fea56160380bf95e9235086faa9f0ebcffc51ecf SHA256 787186abcfec648d34505a30783607659b67c5ffb88b2a8e026a4577fb83538c DIST dbmail-2.0.6.tar.gz 582932 RMD160 c4d4e26eec9934dd638816833830591db9f4a3b4 SHA1 d7704aa23d381b5bad7f05339119f461d20dac8c SHA256 cd1de68b603db90fb6e4c404832b01054e6c8e66e28d5e3fa7077ace113eb7bb DIST dbmail-2.0.7.tar.gz 584457 RMD160 f23d83c5adeb47f84d366ea147a4ce7f654f0508 SHA1 36736997c259900e060dd48c6972ff2cb1dd6590 SHA256 ef678002a0f6eed3ae8babc17760e36a76e678852c50d70d8dee1fe693f54026 EBUILD dbmail-1.2.11.ebuild 3622 RMD160 916d9424afc3d63ae95f4b290edf2bfe0590088a SHA1 25ffebd190e026af1fa4925e6d64d3837285d272 SHA256 83c2e98c14797ae3d489cb59cce1359836a4014ca02a2903c272d60ef01629f5 -EBUILD dbmail-1.2.12.1-r1.ebuild 3016 RMD160 8f83c245a9c1aa0c890f914f07666299189af3aa SHA1 cefbf4d070815fb837f46594a68535f1fa6d8717 SHA256 78438e6c0fdbfa7055d550e8445df60d496be8fa93c546f5dac1be68758ee4d9 +EBUILD dbmail-1.2.12.1-r1.ebuild 3021 RMD160 eca0c50ffc741feeadefc9280da28e6e2030450c SHA1 852e903637dbd95c88f037c13354eda04be5569c SHA256 af8f43cdd41d43398fc3ce86024e5c2ac66cfb3730f4876b7f0c3ae52c6b77a4 +EBUILD dbmail-2.0.11.ebuild 4306 RMD160 46e8aafc96701f735d371cb9664ac4f8bf389f6d SHA1 c9f3514048e2a7f6317293706f0c612385be791d SHA256 6549d7dd33ea08ab111073793300c8a8e8801e2e8ec77dc52686729025849a2d EBUILD dbmail-2.0.4.ebuild 4236 RMD160 82566918240a355ccc95efe120cf49d60cfa23c2 SHA1 b146884ce9bf6def81aa12f63e9948d880cbe602 SHA256 e1552f141aacb262bb90dc049dd1389053e879b4bfd4591bda09d3a94c0f743f EBUILD dbmail-2.0.5.ebuild 4191 RMD160 947191ccf070c1e6671c1ead3080ce3c73a124af SHA1 0e57733a37b76d5fe61f49eb55b331fa743118d9 SHA256 1788b95d2cc82cce7fa29949b02a36b2de47acc560f25977da8210c6e0d1e003 EBUILD dbmail-2.0.6-r1.ebuild 4275 RMD160 af446e23cf6664fd759d3cfb345c5c0f7518c182 SHA1 9c4b90b5df146bf11f8f4b24df18cc4450a61fbf SHA256 60b23851cbe2d5ccb81e5d2da14b717da4b93e1f5b7a7336b92fb7214dbd986d diff --git a/net-mail/dbmail/dbmail-1.2.12.1-r1.ebuild b/net-mail/dbmail/dbmail-1.2.12.1-r1.ebuild index 1d25596..b911304 100644 --- a/net-mail/dbmail/dbmail-1.2.12.1-r1.ebuild +++ b/net-mail/dbmail/dbmail-1.2.12.1-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="http://www.dbmail.org/download/1.2/${P}.tgz" DEPEND="ssl? ( dev-libs/openssl ) postgres? ( >=dev-db/postgresql-base-7.4 )" -RDEPEND=" postgres? ( dev-db/postgresql-base )" +RDEPEND=" postgres? ( =sys-apps/portage-2.0.50" && ( + einfo "You can add:" + einfo "net-mail/dbmail [use flags]" + einfo "to the file:" + einfo "/etc/portage/package.use" + einfo "to permamently set this package's USE flags" + ) + + exit 1 + fi + + local myconf + + use mysql && myconf="$myconf --with-mysql" + use postgres && myconf="$myconf --with-pgsql" + if [ use ssl ] ; then + myconf="$myconf --with-openssl" + else + myconf="$myconf --without-openssl" + fi + + cd ${S} + autoconf + ./configure --prefix=/usr \ + $myconf || die + + emake || die "compile problem" + +} + +src_install() { + cd ${S} + make DESTDIR=${D} install || die "Install Problem" + + dodoc AUTHORS BUGS INSTALL EXTRAS ChangeLog COPYING \ + INSTALL.exim INSTALL.postfix INSTALL.qmail UPGRADING \ + VERSION NEWS README THANKS TODO + insinto /etc + doins dbmail.conf + + newinitd contrib/startup-scripts/gentoo/dbmail-imapd dbmail-imapd + newinitd contrib/startup-scripts/gentoo/dbmail-lmtpd dbmail-lmtpd + newinitd contrib/startup-scripts/gentoo/dbmail-pop3d dbmail-pop3d + dosed "s:/usr/local/sbin:/usr/sbin:" /etc/init.d/dbmail-imapd + dosed "s:/usr/local/sbin:/usr/sbin:" /etc/init.d/dbmail-lmtpd + dosed "s:/usr/local/sbin:/usr/sbin:" /etc/init.d/dbmail-pop3d + + dobin contrib/mailbox2dbmail/mailbox2dbmail + doman contrib/mailbox2dbmail/mailbox2dbmail.1 + + mkdir -p ${D}/home/dbmail/sql + cp -a sql ${D}/home/dbmail/ + +} + +pkg_postinst() { + install -d -m0755 -o dbmail -g dbmail ${ROOT}/var/run/dbmail + + einfo ">>> Execute the following command" + einfo ">>> ebuild /var/db/pkg/net-mail/${PF}/${PF}.ebuild config" + einfo ">>> to setup the initial database environment and " + einfo ">>> for more setup instructions." + einfo ">>> Database schemes can be found in /home/dbmail/sql" + einfo ">>> --- For maintenance ---" + einfo ">>> add this to crontab: 0 3 * * * /usr/bin/dbmail-util -cpdy >> /dev/null 2>&1 " +} + +pkg_config() { + + einfo ">>> Initializing the database user, databse, and tables ..." + if [ -n "`use postgres`" ]; then + einfo ">>> Creating postgres user dbmail. " + einfo "You may want to add a password for dbmail: " + einfo "`psql -c "ALTER USER dbmail WITH PASSWORD 'secret';"`" + createuser -U postgres -a -d dbmail + einfo ">>> Creating postgres database dbmail. " + createdb dbmail + psql -U dbmail dbmail < /home/dbmail/sql/postgresql/create_tables.pgsql + else + einfo ">>> Creating mysql database dbmail. " + mysqladmin create dbmail + mysql dbmail < /home/dbmail/sql/mysql/create_tables_innoDB.mysql + einfo "You may want to add a user for dbmail database " + einfo "GRANT ALL ON dbmail.* to dbmail@localhost identified by '' " + fi + einfo "Please read /usr/share/doc/${P}/INSTALL.gz" + einfo "for remaining instructions on setting up dbmail users and " + einfo "for finishing configuration to connect to your MTA and " + einfo "to connect to your db." + einfo "" + einfo "The next step is to add users to the db. Example: " + einfo " ./dbmail-users -a john -w secret -g 0 -m 25M " + einfo " -s john@dude.org john@dude.net @net.com" + einfo "You will also want to follow the installation instructions " + einfo "on setting up the maintenance program to delete old messages." + einfo "Don't forget to edit /etc/dbmail.conf as well. :)" +} diff --git a/net-mail/dbmail/files/dbmail-2.0.11-lcrypt.patch b/net-mail/dbmail/files/dbmail-2.0.11-lcrypt.patch new file mode 100644 index 0000000..3cfa761 --- /dev/null +++ b/net-mail/dbmail/files/dbmail-2.0.11-lcrypt.patch @@ -0,0 +1,13 @@ +Binary files dbmail-2.0.11.orig//.acinclude.m4.swp and dbmail-2.0.11/.acinclude.m4.swp differ +diff -uriN dbmail-2.0.11.orig//acinclude.m4 dbmail-2.0.11/acinclude.m4 +--- dbmail-2.0.11.orig//acinclude.m4 2005-12-22 02:50:07.000000000 -0600 ++++ dbmail-2.0.11/acinclude.m4 2012-01-15 15:05:08.000000000 -0600 +@@ -92,7 +92,7 @@ + AC_MSG_RESULT([$PGSQLINC]) + AC_MSG_CHECKING([PostgreSQL libraries]) + PGLIBDIR=`${pgsqlconfig} --libdir` +- SQLLIB="-L$PGLIBDIR -lpq" ++ SQLLIB="-L$PGLIBDIR -lpq -lcrypt" + SQLALIB="pgsql/.libs/libpgsqldbmail.a" + SQLLTLIB="pgsql/libpgsqldbmail.la" + AC_MSG_RESULT([$SQLLIB])