+++ /dev/null
-diff -Nur exim-4.63/exim-texinfo-4.63/doc/filter.texinfo n.exim-4.63/exim-texinfo-4.63/doc/filter.texinfo
---- exim-4.63/exim-texinfo-4.63/doc/filter.texinfo 2006-07-31 16:21:20.000000000 +0200
-+++ n.exim-4.63/exim-texinfo-4.63/doc/filter.texinfo 2006-12-02 22:50:25.000000000 +0100
-@@ -2,9 +2,8 @@
- @setfilename exim_filtering.info
- @documentencoding us-ascii
- @settitle Exim's interfaces to mail filtering
- @direntry
--* Exim's interfaces to mail filtering: (exim_filtering).
-- [MISSING TEXT]
-+* Exim's filtering: (exim_filtering). Exim's interfaces to mail filtering
- @end direntry
-
- @node Top, Forwarding and filtering in Exim, , (dir)
-diff -Nur exim-4.63/exim-texinfo-4.63/doc/spec.texinfo n.exim-4.63/exim-texinfo-4.63/doc/spec.texinfo
---- exim-4.63/exim-texinfo-4.63/doc/spec.texinfo 2006-07-31 16:21:20.000000000 +0200
-+++ n.exim-4.63/exim-texinfo-4.63/doc/spec.texinfo 2006-12-02 22:50:25.000000000 +0100
-@@ -1,10 +1,9 @@
- \input texinfo
--@setfilename the_exim_mta.info
-+@setfilename exim.info
- @documentencoding us-ascii
- @settitle Specification of the Exim Mail Transfer Agent
- @direntry
--* Specification of the Exim Mail Transfer Agent: (the_exim_mta).
-- [MISSING TEXT]
-+* Exim: (exim). Specification of the Exim Mail Transfer Agent
- @end direntry
-
- @node Top, Introduction, , (dir)
+++ /dev/null
-diff -urN exim-4.62.org/src/malware.c exim-4.62/src/malware.c
---- exim-4.62.org/src/malware.c 2006-04-28 12:32:22.000000000 +0200
-+++ exim-4.62/src/malware.c 2006-06-13 18:41:29.000000000 +0200
-@@ -20,6 +20,8 @@
- #define SHUT_WR 1
- #endif
-
-+#define MALWARE_TIMEOUT 120
-+
- #define DRWEBD_SCAN_CMD (1) /* scan file, buffer or diskfile */
- #define DRWEBD_RETURN_VIRUSES (1<<0) /* ask daemon return to us viruses names from report */
- #define DRWEBD_IS_MAIL (1<<19) /* say to daemon that format is "archive MAIL" */
-@@ -557,7 +559,7 @@
- return DEFER;
- };
-
-- bread = read(sock, av_buffer, sizeof(av_buffer));
-+ bread = ip_recv(sock, av_buffer, sizeof(av_buffer), MALWARE_TIMEOUT);
- if (bread >0) av_buffer[bread]='\0';
- if (bread < 0) {
- (void)close(sock);
-@@ -591,7 +593,7 @@
- i = 0;
- memset(av_buffer, 0, sizeof(av_buffer));
- do {
-- bread=read(sock, &av_buffer[i], 1);
-+ bread=ip_recv(sock, &av_buffer[i], 1, MALWARE_TIMEOUT);
- if (bread < 0) {
- (void)close(sock);
- log_write(0, LOG_MAIN|LOG_PANIC,
-@@ -976,7 +978,7 @@
-
- /* wait for result */
- memset(av_buffer, 0, sizeof(av_buffer));
-- if ((!(bread = read(sock, av_buffer, sizeof(av_buffer))) > 0)) {
-+ if ((!(bread = ip_recv(sock, av_buffer, sizeof(av_buffer), MALWARE_TIMEOUT)) > 0)) {
- (void)close(sock);
- log_write(0, LOG_MAIN|LOG_PANIC,
- "malware acl condition: unable to read from sophie UNIX socket (%s)", sophie_options);
-@@ -1098,7 +1100,7 @@
- return DEFER;
- }
- memset(av_buffer2, 0, sizeof(av_buffer2));
-- bread = read(sock, av_buffer2, sizeof(av_buffer2));
-+ bread = ip_recv(sock, av_buffer2, sizeof(av_buffer2), MALWARE_TIMEOUT);
-
- if (bread < 0) {
- log_write(0, LOG_MAIN|LOG_PANIC,
-@@ -1238,7 +1240,7 @@
-
- /* Read the result */
- memset(av_buffer, 0, sizeof(av_buffer));
-- bread = read(sock, av_buffer, sizeof(av_buffer));
-+ bread = ip_recv(sock, av_buffer, sizeof(av_buffer), MALWARE_TIMEOUT);
- (void)close(sock);
-
- if (!(bread > 0)) {
+++ /dev/null
-diff -urN exim-texinfo-4.00.org/doc/filter.texinfo exim-texinfo-4.00/doc/filter.texinfo
---- exim-texinfo-4.50.org/doc/filter.texinfo Sat Jun 30 01:12:24 2001
-+++ exim-texinfo-4.50/doc/filter.texinfo Sat Jun 30 01:12:53 2001
-@@ -4,10 +4,19 @@
- @set{wmAuthor_email} <ph10@@cus.cam.ac.uk>
- @set{COPYRIGHT1} Copyright @copyright{} @value{wmYear} University of Cambridge
- @c %**start of header
--@setfilename filter.info
-+@setfilename exim_filter.info
- @settitle Exim Filter Specification
- @paragraphindent 0
- @c %**end of header
-+
-+@ifinfo
-+@format
-+@dircategory Net utilities:
-+@direntry
-+* Exim Filters: (exim_filter). Message Transfer Agent
-+@end direntry
-+@end format
-+@end ifinfo
-
- @titlepage
- @title The Exim Mail Transfer Agent
-diff -urN exim-texinfo-4.00.org/doc/spec.texinfo exim-texinfo-4.00/doc/spec.texinfo
---- exim-texinfo-4.50.org/doc/spec.texinfo Sat Jun 30 01:12:24 2001
-+++ exim-texinfo-4.50/doc/spec.texinfo Sat Jun 30 01:12:54 2001
-@@ -4,10 +4,19 @@
- @set{wmAuthor_email} <ph10@@cus.cam.ac.uk>
- @set{COPYRIGHT1} Copyright @copyright{} @value{wmYear} University of Cambridge
- @c %**start of header
--@setfilename spec.info
-+@setfilename exim.info
- @settitle Exim Specification
- @paragraphindent 0
- @c %**end of header
-+
-+@ifinfo
-+@format
-+@dircategory Net utilities:
-+@direntry
-+* Exim: (exim). Message Transfer Agent
-+@end direntry
-+@end format
-+@end ifinfo
-
- @titlepage
- @title The Exim Mail Transfer Agent