Gentoo Archives: gentoo-commits

From: "Jonathan Callen (abcd)" <abcd@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in mail-mta/ssmtp/files: ssmtp-2.62-darwin-crypto.patch ssmtp-2.62-solaris-basename-conflict.patch ssmtp-2.61-darwin7.patch
Date: Sun, 25 Apr 2010 23:28:47
Message-Id: 20100425232842.8928B2C04B@corvid.gentoo.org
1 abcd 10/04/25 23:28:42
2
3 Added: ssmtp-2.62-darwin-crypto.patch
4 ssmtp-2.62-solaris-basename-conflict.patch
5 ssmtp-2.61-darwin7.patch
6 Log:
7 Revbump, add patches for Darwin/Solaris, bump to EAPI-3, add prefix support & keywords, die on failure, cleanup
8 (Portage version: v2.2_rc67-80-ge064530/cvs/Linux i686)
9
10 Revision Changes Path
11 1.1 mail-mta/ssmtp/files/ssmtp-2.62-darwin-crypto.patch
12
13 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/ssmtp/files/ssmtp-2.62-darwin-crypto.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/ssmtp/files/ssmtp-2.62-darwin-crypto.patch?rev=1.1&content-type=text/plain
15
16 Index: ssmtp-2.62-darwin-crypto.patch
17 ===================================================================
18 Fix linking error:
19
20 Undefined symbols:
21 "_X509_free", referenced from:
22 _smtp_open in ssmtp.o
23 ld: symbol(s) not found
24
25
26 --- configure.in
27 +++ configure.in
28 @@ -53,6 +53,7 @@
29 if test x$enableval = xyes ; then
30 AC_DEFINE(HAVE_SSL)
31 LIBS="$LIBS -lssl"
32 + AC_SEARCH_LIBS([X509_free], [crypto])
33 fi
34 enableval=""
35
36
37
38
39 1.1 mail-mta/ssmtp/files/ssmtp-2.62-solaris-basename-conflict.patch
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/ssmtp/files/ssmtp-2.62-solaris-basename-conflict.patch?rev=1.1&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/ssmtp/files/ssmtp-2.62-solaris-basename-conflict.patch?rev=1.1&content-type=text/plain
43
44 Index: ssmtp-2.62-solaris-basename-conflict.patch
45 ===================================================================
46 This function overshadows the one from libc on Solaris, and guess what,
47 is hence never called. Since the original one has an entirely different
48 contract, it results in unconditional segfaults lateron, so always use
49 the internal copy as it's small enough not to care.
50
51 --- ssmtp.c
52 +++ ssmtp.c
53 @@ -223,11 +223,10 @@
54 exit(1);
55 }
56
57 -#ifndef _GNU_SOURCE
58 /*
59 -basename() -- Return last element of path
60 +xbasename() -- Return last element of path
61 */
62 -char *basename(char *str)
63 +char *xbasename(char *str)
64 {
65 char *p;
66
67 @@ -238,7 +237,6 @@
68
69 return(strdup(p));
70 }
71 -#endif /* _GNU_SOURCE */
72
73 /*
74 strip_pre_ws() -- Return pointer to first non-whitespace character
75 @@ -2058,7 +2056,7 @@
76 (void)signal(SIGTTOU, SIG_IGN);
77
78 /* Set the globals */
79 - prog = basename(argv[0]);
80 + prog = xbasename(argv[0]);
81
82 hostname = xgethostname();
83
84
85
86
87 1.1 mail-mta/ssmtp/files/ssmtp-2.61-darwin7.patch
88
89 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/ssmtp/files/ssmtp-2.61-darwin7.patch?rev=1.1&view=markup
90 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/ssmtp/files/ssmtp-2.61-darwin7.patch?rev=1.1&content-type=text/plain
91
92 Index: ssmtp-2.61-darwin7.patch
93 ===================================================================
94 --- ssmtp-2.61/ssmtp.c
95 +++ ssmtp-2.61/ssmtp.c
96 @@ -14,6 +14,7 @@
97 */
98 #define VERSION "2.60.4"
99
100 +#include <sys/types.h>
101 #include <sys/socket.h>
102 #include <netinet/in.h>
103 #include <sys/param.h>