diff options
author | Andrej Kacian <ticho@gentoo.org> | 2006-10-22 00:38:30 +0000 |
---|---|---|
committer | Andrej Kacian <ticho@gentoo.org> | 2006-10-22 00:38:30 +0000 |
commit | 7f8011915aa884a6d1dea086c07a281a07934923 (patch) | |
tree | ece8b9c6ec0972db76dfbafda47013c26662416f /mail-mta | |
parent | Modified Makefile to respect LDFLAGS, bug #152197 by Fabian Groffen <grobian ... (diff) | |
download | gentoo-2-7f8011915aa884a6d1dea086c07a281a07934923.tar.gz gentoo-2-7f8011915aa884a6d1dea086c07a281a07934923.tar.bz2 gentoo-2-7f8011915aa884a6d1dea086c07a281a07934923.zip |
Modified Makefile to respect LDFLAGS, bug #152197 by Fabian Groffen <grobian at gentoo.org>. Removed old ebuilds.
(Portage version: 2.1.2_pre3-r2)
(Signed Manifest commit)
Diffstat (limited to 'mail-mta')
-rw-r--r-- | mail-mta/ssmtp/Manifest | 70 | ||||
-rw-r--r-- | mail-mta/ssmtp/files/digest-ssmtp-2.60.7-r1 | 3 | ||||
-rw-r--r-- | mail-mta/ssmtp/files/digest-ssmtp-2.60.9 | 3 | ||||
-rw-r--r-- | mail-mta/ssmtp/files/starttls.diff | 150 | ||||
-rw-r--r-- | mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild | 100 | ||||
-rw-r--r-- | mail-mta/ssmtp/ssmtp-2.60.9.ebuild | 104 |
6 files changed, 30 insertions, 400 deletions
diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest index d3a77784b5d8..0a75ac06b550 100644 --- a/mail-mta/ssmtp/Manifest +++ b/mail-mta/ssmtp/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX mailer.conf 349 RMD160 1cad356faa6ee30e7bed9d70754487cac8f088e5 SHA1 4ab7aeef9fcaa021cff2845ffdac1ccb65dddfa4 SHA256 7b04fc27f8ca41b586ae68cbeffb509c2408afcc592462b617fba78b5d7aa88a MD5 bcf2e5652cff099f6a6fd410a127c900 files/mailer.conf 349 RMD160 1cad356faa6ee30e7bed9d70754487cac8f088e5 files/mailer.conf 349 @@ -14,51 +17,31 @@ AUX ssmtp-2.61-bug127592.patch 385 RMD160 61f877e742bbf23e13056884bccae5a22a17fe MD5 729fac89b4ece07f321ff7271fae69cb files/ssmtp-2.61-bug127592.patch 385 RMD160 61f877e742bbf23e13056884bccae5a22a17fe75 files/ssmtp-2.61-bug127592.patch 385 SHA256 256a783b5e73b9914cb49854b367ce9f5781d8664cd640e6b0b9d0b5f6948edc files/ssmtp-2.61-bug127592.patch 385 -AUX starttls.diff 4277 RMD160 74bfb96aeeb9f27881e5313ab02ae0bbbb04353b SHA1 de58270ebaff70f92d03d562362c0dbcf5f19fbb SHA256 6d118d2574bf8e5b348f1bcc511fb401027a02595131faf433d205f8594e9c92 -MD5 93225fbc5fd7b8e5500c7b1c85b63fdf files/starttls.diff 4277 -RMD160 74bfb96aeeb9f27881e5313ab02ae0bbbb04353b files/starttls.diff 4277 -SHA256 6d118d2574bf8e5b348f1bcc511fb401027a02595131faf433d205f8594e9c92 files/starttls.diff 4277 -DIST ssmtp_2.60.7.tar.gz 60727 RMD160 a43545bbf9b61b47fd12773e25eb7d6e90a9d2df SHA1 c159f42de461b3bba300a0398e696e8b3834d288 SHA256 63dc2cfd8503f734c0722522b7c4bb95c8019584d714a57bac10a55798f4e75e -DIST ssmtp_2.60.9.tar.gz 66041 RMD160 43e07ec1e8774d80fa627a7e613ab178c0c4696e SHA1 a96dbfe23d966de99d89e87274f462724f4519ec SHA256 3737f10b37bfd7e5b352c5d36f9f4b63acfbb3875fd2f787731dbae21b2b8a80 DIST ssmtp_2.61.orig.tar.gz 53341 RMD160 da76ee6dd86fc663e6fd69fcb2fb5f550f716de7 SHA1 bc4b6c20bf8c2c9e66b359e3c24545a2615a1988 SHA256 2151ad18cb73f9a254f796dde2b48be7318b45410b59fedbb258db5a41044fb5 -EBUILD ssmtp-2.60.7-r1.ebuild 2858 RMD160 564b7058a2a85f0f59db6bd588671893cdc04b67 SHA1 7f78b5264f30090a75bb17f09017e86a4664a363 SHA256 15eadaaadacde17cd7e4ca2c0c113bf9e3e718ceaee5b3de5a340cf512a3ee68 -MD5 47980365b817fa32316d65edf07768a1 ssmtp-2.60.7-r1.ebuild 2858 -RMD160 564b7058a2a85f0f59db6bd588671893cdc04b67 ssmtp-2.60.7-r1.ebuild 2858 -SHA256 15eadaaadacde17cd7e4ca2c0c113bf9e3e718ceaee5b3de5a340cf512a3ee68 ssmtp-2.60.7-r1.ebuild 2858 -EBUILD ssmtp-2.60.9.ebuild 3121 RMD160 c9d9e1c2b63840b97a5ab9356b1f0676e480277e SHA1 7c7569d00ed7adb34dd094d5595f86a639a046a4 SHA256 4900cc2eef9e91643c624bd6e14edc691674261ce3034e73f7ce3a333ef713fd -MD5 b60c6edf527e9a09a60c15d88481b74c ssmtp-2.60.9.ebuild 3121 -RMD160 c9d9e1c2b63840b97a5ab9356b1f0676e480277e ssmtp-2.60.9.ebuild 3121 -SHA256 4900cc2eef9e91643c624bd6e14edc691674261ce3034e73f7ce3a333ef713fd ssmtp-2.60.9.ebuild 3121 -EBUILD ssmtp-2.61-r2.ebuild 3340 RMD160 3f4b3bf6e40db5d230e8128ffe43f089d258dd3c SHA1 78cd7805da554c101c0bbc9124b1106f84cb395f SHA256 0ecdd4252e38e2185389b3a1e1c55142e5ff290a960f5d0f2f11e6c27631a248 -MD5 ec6851482b1ee9e01060ea5ac565a5d9 ssmtp-2.61-r2.ebuild 3340 -RMD160 3f4b3bf6e40db5d230e8128ffe43f089d258dd3c ssmtp-2.61-r2.ebuild 3340 -SHA256 0ecdd4252e38e2185389b3a1e1c55142e5ff290a960f5d0f2f11e6c27631a248 ssmtp-2.61-r2.ebuild 3340 -EBUILD ssmtp-2.61-r30.ebuild 1778 RMD160 33dfbaf9857c23d5bd97948750685f46eb21fd0e SHA1 bbeb98e495ffd1921a1252761d0094c2f916b3b6 SHA256 395b399e6968cbcf89d0afd1d7ddd12ff22a4ce5d3abf9faaf0dd8d668c5634c -MD5 359571ecb72c0e053efd989852a83545 ssmtp-2.61-r30.ebuild 1778 -RMD160 33dfbaf9857c23d5bd97948750685f46eb21fd0e ssmtp-2.61-r30.ebuild 1778 -SHA256 395b399e6968cbcf89d0afd1d7ddd12ff22a4ce5d3abf9faaf0dd8d668c5634c ssmtp-2.61-r30.ebuild 1778 -EBUILD ssmtp-2.61-r31.ebuild 1975 RMD160 c1f93190bb158058ecb604c00be0077724a3bdce SHA1 3eb0ab7c6290147af4d04d3f164214a779b01aa3 SHA256 64676edcfb163cc45da82cb147200397446ccfb4eb386b825e652e6418008926 -MD5 f440fdaa691e6c2a24b1c51981845b67 ssmtp-2.61-r31.ebuild 1975 -RMD160 c1f93190bb158058ecb604c00be0077724a3bdce ssmtp-2.61-r31.ebuild 1975 -SHA256 64676edcfb163cc45da82cb147200397446ccfb4eb386b825e652e6418008926 ssmtp-2.61-r31.ebuild 1975 -EBUILD ssmtp-2.61.ebuild 3133 RMD160 48b164235185688041ddf50a241e0039b71246bf SHA1 b97f893ea0583cafcf3570868b4a11c7c7bd5eac SHA256 9f0376e7435eb3d8d0a618e96c224fba834831b62bdfbe4782ecb4b5bec5aeb1 -MD5 151e9660d20f8886ceea81f0b44ec1de ssmtp-2.61.ebuild 3133 -RMD160 48b164235185688041ddf50a241e0039b71246bf ssmtp-2.61.ebuild 3133 -SHA256 9f0376e7435eb3d8d0a618e96c224fba834831b62bdfbe4782ecb4b5bec5aeb1 ssmtp-2.61.ebuild 3133 -MISC ChangeLog 10350 RMD160 5fa3ecae2befb6f786a93dc5a9cb1df0d53cb10a SHA1 776727f815574215812b3e0a8b9d8098842ee09b SHA256 3e64738f12a5f843b9f5fefbf0b2f95616de9faff79b6bbad1e0be62ddeed05b -MD5 a6a7db1cf30439407ed82b83e51ecc07 ChangeLog 10350 -RMD160 5fa3ecae2befb6f786a93dc5a9cb1df0d53cb10a ChangeLog 10350 -SHA256 3e64738f12a5f843b9f5fefbf0b2f95616de9faff79b6bbad1e0be62ddeed05b ChangeLog 10350 +EBUILD ssmtp-2.61-r2.ebuild 3428 RMD160 37b677fe2a5864c1a3b46b79b9a9848c10904a0f SHA1 0eae9f8053505d6d0c92f9dcb3ca6dca79e12d40 SHA256 153f4709bc42188c45f24aeee3038c89dafad477f9267a6ba2f678d2ff6eb244 +MD5 e9567b343ecca4d9083e34fe16d736aa ssmtp-2.61-r2.ebuild 3428 +RMD160 37b677fe2a5864c1a3b46b79b9a9848c10904a0f ssmtp-2.61-r2.ebuild 3428 +SHA256 153f4709bc42188c45f24aeee3038c89dafad477f9267a6ba2f678d2ff6eb244 ssmtp-2.61-r2.ebuild 3428 +EBUILD ssmtp-2.61-r30.ebuild 1865 RMD160 acd00d9eeab71238158e9530bddac6d8183b9000 SHA1 6e0757320544ec047615491cfd152f0dfa936191 SHA256 82eb4aea32ff188f9b67c98074355aea535ff9837c1e4f63e742b07df430a70d +MD5 1f28635d814e81f591995f9f3c2c7bf9 ssmtp-2.61-r30.ebuild 1865 +RMD160 acd00d9eeab71238158e9530bddac6d8183b9000 ssmtp-2.61-r30.ebuild 1865 +SHA256 82eb4aea32ff188f9b67c98074355aea535ff9837c1e4f63e742b07df430a70d ssmtp-2.61-r30.ebuild 1865 +EBUILD ssmtp-2.61-r31.ebuild 2062 RMD160 9c13f57dd10b412040f84cbf3fa67bc87df7f9a9 SHA1 05385ffc6e32ba8338e9de7d29652ae8e9f037f3 SHA256 044b118c7bb1dd9328adf58ee01e1d6edd62411289b54018e2919254975fa657 +MD5 c1ce9abedee6ad3ecdac2837e15d38e5 ssmtp-2.61-r31.ebuild 2062 +RMD160 9c13f57dd10b412040f84cbf3fa67bc87df7f9a9 ssmtp-2.61-r31.ebuild 2062 +SHA256 044b118c7bb1dd9328adf58ee01e1d6edd62411289b54018e2919254975fa657 ssmtp-2.61-r31.ebuild 2062 +EBUILD ssmtp-2.61.ebuild 3219 RMD160 44ca8b19cd96728a541523f6b69ebac7c1fd6355 SHA1 d5ee2a3421ab2cabc3c9c6f86012114cd6dba3b5 SHA256 309c68449883bd3708ca5caeb08e5ed9632fc631f9b2015acf96a5cb6aa5715b +MD5 f5b8ca7cdb4056742e4058feb5ea91e9 ssmtp-2.61.ebuild 3219 +RMD160 44ca8b19cd96728a541523f6b69ebac7c1fd6355 ssmtp-2.61.ebuild 3219 +SHA256 309c68449883bd3708ca5caeb08e5ed9632fc631f9b2015acf96a5cb6aa5715b ssmtp-2.61.ebuild 3219 +MISC ChangeLog 10674 RMD160 234f818b363cfb8bcdf07f97f6394affcb8b025e SHA1 cac3e08dfb47245fa5038bd7ef79045a46fcd561 SHA256 9d1ae1bd5d538550e9dad25651bbb012e0b979e3a90927ff49a89e2faf1ced4d +MD5 64f5adec4ea9ea6d739a144a9e814370 ChangeLog 10674 +RMD160 234f818b363cfb8bcdf07f97f6394affcb8b025e ChangeLog 10674 +SHA256 9d1ae1bd5d538550e9dad25651bbb012e0b979e3a90927ff49a89e2faf1ced4d ChangeLog 10674 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 metadata.xml 161 -MD5 9972bcdf195ff1500cd0c80c1b574d93 files/digest-ssmtp-2.60.7-r1 235 -RMD160 47fea97aaeadb47c5eab40fee81010d0ce154b1d files/digest-ssmtp-2.60.7-r1 235 -SHA256 5a12805d89616046755045204fa824b0520c9ad9a45df84f80e0e78b299024db files/digest-ssmtp-2.60.7-r1 235 -MD5 de877c6a6eb9f8c42026ff464c195bf1 files/digest-ssmtp-2.60.9 235 -RMD160 1b1af81f4a81b18e9a3c16c238fcfb5675d1e8a6 files/digest-ssmtp-2.60.9 235 -SHA256 262639a64591028c2d74a777f5a6b28629a7e819420158a69c6b519a866676b6 files/digest-ssmtp-2.60.9 235 MD5 1962d91c30908169e020f0cd89ea87e0 files/digest-ssmtp-2.61 244 RMD160 53fcce2b126deb0d2b84bf4bfc9fe5c21936454c files/digest-ssmtp-2.61 244 SHA256 52da21c6560550f43ef1a359daf4fb7f8360e4e63ca6a7c4b5df55210b98b3ec files/digest-ssmtp-2.61 244 @@ -71,3 +54,10 @@ SHA256 52da21c6560550f43ef1a359daf4fb7f8360e4e63ca6a7c4b5df55210b98b3ec files/di MD5 1962d91c30908169e020f0cd89ea87e0 files/digest-ssmtp-2.61-r31 244 RMD160 53fcce2b126deb0d2b84bf4bfc9fe5c21936454c files/digest-ssmtp-2.61-r31 244 SHA256 52da21c6560550f43ef1a359daf4fb7f8360e4e63ca6a7c4b5df55210b98b3ec files/digest-ssmtp-2.61-r31 244 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.5 (GNU/Linux) + +iD8DBQFFOr1sQlM6RnzZP+IRAludAKCecJ/1AmmZzcEMSbD7NPbuzcgv9QCbBSjd +UgSxigYDTtjnhqTMEm9AdLo= +=ltOk +-----END PGP SIGNATURE----- diff --git a/mail-mta/ssmtp/files/digest-ssmtp-2.60.7-r1 b/mail-mta/ssmtp/files/digest-ssmtp-2.60.7-r1 deleted file mode 100644 index 1b3bab016ebb..000000000000 --- a/mail-mta/ssmtp/files/digest-ssmtp-2.60.7-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 2e3b3f1403d4ae1a7373f80db2f3923e ssmtp_2.60.7.tar.gz 60727 -RMD160 a43545bbf9b61b47fd12773e25eb7d6e90a9d2df ssmtp_2.60.7.tar.gz 60727 -SHA256 63dc2cfd8503f734c0722522b7c4bb95c8019584d714a57bac10a55798f4e75e ssmtp_2.60.7.tar.gz 60727 diff --git a/mail-mta/ssmtp/files/digest-ssmtp-2.60.9 b/mail-mta/ssmtp/files/digest-ssmtp-2.60.9 deleted file mode 100644 index 94b08ec399e5..000000000000 --- a/mail-mta/ssmtp/files/digest-ssmtp-2.60.9 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 28a47b520f04e055ee6f8ebf6c209234 ssmtp_2.60.9.tar.gz 66041 -RMD160 43e07ec1e8774d80fa627a7e613ab178c0c4696e ssmtp_2.60.9.tar.gz 66041 -SHA256 3737f10b37bfd7e5b352c5d36f9f4b63acfbb3875fd2f787731dbae21b2b8a80 ssmtp_2.60.9.tar.gz 66041 diff --git a/mail-mta/ssmtp/files/starttls.diff b/mail-mta/ssmtp/files/starttls.diff deleted file mode 100644 index 0cd4b7a0d65c..000000000000 --- a/mail-mta/ssmtp/files/starttls.diff +++ /dev/null @@ -1,150 +0,0 @@ -diff -rup ssmtp-2.60/ssmtp.c ssmtp-2.60-starttls/ssmtp.c ---- ssmtp-2.60/ssmtp.c 2002-12-08 19:26:20.000000000 +0200 -+++ ssmtp-2.60-starttls/ssmtp.c 2003-06-09 00:32:24.000000000 +0300 -@@ -48,8 +48,12 @@ bool_t minus_t = False; - bool_t minus_v = False; - bool_t override_from = False; - bool_t rewrite_domain = False; -+#ifdef HAVE_SSL - bool_t use_tls = False; /* Use SSL to transfer mail to HUB */ -+bool_t use_starttls = False; /* Use STARTTLS SMTP command to initiate TLS */ - bool_t use_cert = False; /* Use a certificate to transfer SSL mail */ -+bool_t tls_initialized = False; -+#endif - - #define ARPADATE_LENGTH 32 /* Current date in RFC format */ - char arpadate[ARPADATE_LENGTH]; -@@ -878,11 +882,24 @@ bool_t read_config() - use_tls = False; - } - -- if(log_level > 0) { -+ if(log_level > 0) { - log_event(LOG_INFO, - "Set UseTLS=\"%s\"\n", use_tls ? "True" : "False"); - } - } -+ else if(strcasecmp(p, "UseSTARTTLS") == 0) { -+ if(strcasecmp(q, "YES") == 0) { -+ use_starttls = True; -+ } -+ else { -+ use_starttls = False; -+ } -+ -+ if(log_level > 0) { -+ log_event(LOG_INFO, -+ "Set UseSTARTTLS=\"%s\"\n", use_starttls ? "True" : "False"); -+ } -+ } - else if(strcasecmp(p, "UseTLSCert") == 0) { - if(strcasecmp(q, "YES") == 0) { - use_cert = True; -@@ -920,8 +937,11 @@ bool_t read_config() - /* - smtp_open() -- Open connection to a remote SMTP listener - */ -+void smtp_write(int fd, char *format, ...); -+int smtp_okay(int fd, char *response); - int smtp_open(char *host, int port) - { -+ char buf[(BUF_SZ + 1)]; - #ifdef INET6 - struct addrinfo hints, *ai0, *ai; - char servname[NI_MAXSERV]; -@@ -949,7 +969,7 @@ int smtp_open(char *host, int port) - return(-1); - } - -- if(use_cert == True) { -+ if(use_cert == True) { - if(SSL_CTX_use_certificate_chain_file(ctx, tls_cert) <= 0) { - perror("Use certfile"); - return(-1); -@@ -1028,11 +1048,24 @@ int smtp_open(char *host, int port) - return(-1); - } - #endif -+ if(smtp_okay(s, buf) == False) { -+ log_event(LOG_ERR, "Invalid response SMTP server"); -+ return(-1); -+ } - - #ifdef HAVE_SSL - if(use_tls == True) { - log_event(LOG_INFO, "Creating SSL connection to host"); - -+ if(use_starttls == True) { -+ smtp_write(s, "STARTTLS", hostname); -+ (void)alarm((unsigned) MEDWAIT); -+ if(smtp_okay(s, buf) == False) { -+ log_event(LOG_ERR, "STARTTLS failed: %s", buf); -+ return(-1); -+ } -+ } -+ - ssl = SSL_new(ctx); - if(!ssl) { - log_event(LOG_ERR, "SSL not working"); -@@ -1041,12 +1074,13 @@ int smtp_open(char *host, int port) - SSL_set_fd(ssl, s); - - err = SSL_connect(ssl); -- if(err < 0) { -+ if(err < 0) { - perror("SSL_connect"); - return(-1); - } -+ tls_initialized = True; - -- if(log_level > 0) { -+ if(log_level > 0) { - log_event(LOG_INFO, "SSL connection using %s", - SSL_get_cipher(ssl)); - } -@@ -1070,7 +1104,7 @@ fd_getc() -- Read a character from an fd - ssize_t fd_getc(int fd, void *c) - { - #ifdef HAVE_SSL -- if(use_tls == True) { -+ if(use_tls == True && tls_initialized == True) { - return(SSL_read(ssl, c, 1)); - } - #endif -@@ -1134,10 +1168,10 @@ int smtp_okay(int fd, char *response) - /* - fd_puts() -- Write characters to fd - */ --ssize_t fd_puts(int fd, const void *buf, size_t count) -+ssize_t fd_puts(int fd, const void *buf, size_t count) - { - #ifdef HAVE_SSL -- if(use_tls == True) { -+ if(use_tls == True && tls_initialized == True) { - return(SSL_write(ssl, buf, count)); - } - #endif -@@ -1237,9 +1271,6 @@ int ssmtp(char *argv[]) - if((sock = smtp_open(mailhost, port)) == -1) { - die("Cannot open %s:%d", mailhost, port); - } -- else if(smtp_okay(sock, buf) == False) { -- die("Invalid response SMTP server"); -- } - - /* If user supplied username and password, then try ELHO */ - if(auth_user) { -diff -rup ssmtp-2.60/ssmtp.conf ssmtp-2.60-starttls/ssmtp.conf ---- ssmtp-2.60/ssmtp.conf 2001-05-08 13:22:08.000000000 +0300 -+++ ssmtp-2.60-starttls/ssmtp.conf 2003-06-09 00:35:01.000000000 +0300 -@@ -30,6 +30,10 @@ hostname=_HOSTNAME_ - # Use SSL/TLS to send secure messages to server. - #UseTLS=YES - -+# Use STARTTLS SMTP command to initiate SSL, you should enable UseTLS too -+# for this option to work -+UseSTARTTLS=YES -+ - # Use SSL/TLS certificate to authenticate against smtp host. - #UseTLSCert=YES - diff --git a/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild b/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild deleted file mode 100644 index 7bd485765cf1..000000000000 --- a/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.7-r1.ebuild,v 1.10 2006/02/10 04:50:11 vapier Exp $ - -inherit eutils - -DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub" -HOMEPAGE="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/" -SRC_URI="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/${P/-/_}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86" -IUSE="ssl ipv6 md5sum mailwrapper" - -DEPEND="virtual/libc - ssl? ( dev-libs/openssl )" -RDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 ) - !mailwrapper? ( !virtual/mta ) - net-mail/mailbase - ssl? ( dev-libs/openssl )" -PROVIDE="virtual/mta" - -S=${WORKDIR}/ssmtp-2.60 - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/ssmtp-2.60.7-logfile.patch - use ssl && epatch "${FILESDIR}"/starttls.diff - use md5sum && epatch "${FILESDIR}"/ssmtp-2.60.4-md5.patch -} - -src_compile() { - econf \ - --sysconfdir=/etc/ssmtp \ - $(use_enable ssl) \ - $(use_enable ipv6 inet6) \ - $(use_enable md5sum md5suth) \ - || die - make clean || die - make etcdir=/etc || die -} - -src_install() { - dodir /usr/bin /usr/sbin /usr/lib - dosbin ssmtp || die - fperms 755 /usr/sbin/ssmtp - dosym /usr/sbin/sendmail /usr/bin/mailq - dosym /usr/sbin/sendmail /usr/bin/newaliases - # Removed symlink due to conflict with mailx - # See bug #7448 - #dosym /usr/sbin/ssmtp /usr/bin/mail - #The sendmail symlink is now handled by mailwrapper if used - use mailwrapper || \ - dosym /usr/sbin/ssmtp /usr/sbin/sendmail - dosym /usr/sbin/sendmail /usr/lib/sendmail - doman ssmtp.8 - #removing the sendmail.8 symlink to support multiple installed mtas. - #dosym /usr/share/man/man8/ssmtp.8 /usr/share/man/man8/sendmail.8 - dodoc INSTALL README TLS CHANGELOG_OLD - dodoc debian/{README.debian,changelog} - newdoc ssmtp.lsm DESC - insinto /etc/ssmtp - doins ssmtp.conf revaliases - if use mailwrapper - then - insinto /etc/mail - doins ${FILESDIR}/mailer.conf - fi - - # Set up config file - # See bug #22658 - #local conffile="/etc/ssmtp/ssmtp.conf" - #local hostname=`hostname -f` - #local domainname=`hostname -d` - #mv ${conffile} ${conffile}.orig - #sed -e "s:rewriteDomain=:rewriteDomain=${domainname}:g" \ - # -e "s:_HOSTNAME_:${hostname}:" \ - # -e "s:^mailhub=mail:mailhub=mail.${domainname}:g" \ - # ${conffile}.orig > ${conffile}.pre - #if use ssl; - #then - # sed -e "s:^#UseTLS=YES:UseTLS=YES:g" \ - # ${conffile}.pre > ${conffile} - # mv ${conffile}.pre ${conffile}.orig - #else - # mv ${conffile}.pre ${conffile} - #fi -} - -pkg_postinst() { - if ! use mailwrapper && [[ -e /etc/mailer.conf ]] - then - einfo - einfo "Since you emerged ssmtp w/o mailwrapper in USE," - einfo "you probably want to 'emerge -C mailwrapper' now." - einfo - fi -} diff --git a/mail-mta/ssmtp/ssmtp-2.60.9.ebuild b/mail-mta/ssmtp/ssmtp-2.60.9.ebuild deleted file mode 100644 index 80cfe3d6ce1e..000000000000 --- a/mail-mta/ssmtp/ssmtp-2.60.9.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.60.9.ebuild,v 1.15 2006/02/10 04:50:11 vapier Exp $ - -inherit eutils - -DESCRIPTION="Extremely simple MTA to get mail off the system to a Mailhub" -HOMEPAGE="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/" -SRC_URI="ftp://ftp.debian.org/debian/pool/main/s/ssmtp/${P/-/_}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86" -IUSE="ssl ipv6 md5sum mailwrapper" - -DEPEND="virtual/libc - ssl? ( dev-libs/openssl )" -RDEPEND="mailwrapper? ( >=net-mail/mailwrapper-0.2 ) - !mailwrapper? ( !virtual/mta ) - net-mail/mailbase - ssl? ( dev-libs/openssl )" -PROVIDE="virtual/mta" - -S=${WORKDIR}/ssmtp-2.60 - -src_compile() { - econf \ - --sysconfdir=/etc/ssmtp \ - $(use_enable ssl) \ - $(use_enable ipv6 inet6) \ - $(use_enable md5sum md5suth) \ - || die - make clean || die - make etcdir=/etc || die -} - -src_install() { - dodir /usr/bin /usr/sbin /usr/lib - dosbin ssmtp || die - fperms 755 /usr/sbin/ssmtp - dosym /usr/sbin/sendmail /usr/bin/mailq - dosym /usr/sbin/sendmail /usr/bin/newaliases - # Removed symlink due to conflict with mailx - # See bug #7448 - #dosym /usr/sbin/ssmtp /usr/bin/mail - #The sendmail symlink is now handled by mailwrapper if used - use mailwrapper || \ - dosym /usr/sbin/ssmtp /usr/sbin/sendmail - dosym /usr/sbin/sendmail /usr/lib/sendmail - doman ssmtp.8 - #removing the sendmail.8 symlink to support multiple installed mtas. - #dosym /usr/share/man/man8/ssmtp.8 /usr/share/man/man8/sendmail.8 - dodoc INSTALL README TLS CHANGELOG_OLD - dodoc debian/{README.debian,changelog} - newdoc ssmtp.lsm DESC - insinto /etc/ssmtp - doins ssmtp.conf revaliases - if use mailwrapper - then - insinto /etc/mail - doins ${FILESDIR}/mailer.conf - fi - - # Set up config file - # See bug #22658 - #local conffile="/etc/ssmtp/ssmtp.conf" - #local hostname=`hostname -f` - #local domainname=`hostname -d` - #mv ${conffile} ${conffile}.orig - #sed -e "s:rewriteDomain=:rewriteDomain=${domainname}:g" \ - # -e "s:_HOSTNAME_:${hostname}:" \ - # -e "s:^mailhub=mail:mailhub=mail.${domainname}:g" \ - # ${conffile}.orig > ${conffile}.pre - #if use ssl; - #then - # sed -e "s:^#UseTLS=YES:UseTLS=YES:g" \ - # ${conffile}.pre > ${conffile} - # mv ${conffile}.pre ${conffile}.orig - #else - # mv ${conffile}.pre ${conffile} - #fi - - # set up config file, v2. Bug 47562 - local conffile="${D}/etc/ssmtp/ssmtp.conf" - mv "${conffile}" "${conffile}.orig" - # Sorry about the weird indentation, I couldn't figure out a cleverer way - # to do this without having horribly >80 char lines. - sed -e "s:^hostname=:\n# Gentoo bug #47562\\ -# Commenting the following line will force ssmtp to figure\\ -# out the hostname itself.\n\\ -# hostname=:" \ - "${conffile}.orig" > "${conffile}" \ - || die "sed failed" -} - -pkg_postinst() { - if ! use mailwrapper && [[ -e /etc/mailer.conf ]] - then - einfo - einfo "Since you emerged ssmtp w/o mailwrapper in USE," - einfo "you probably want to 'emerge -C mailwrapper' now." - einfo - fi -} |