1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
--- asmail-2.1.orig/asmail.c
+++ asmail-2.1/asmail.c
@@ -70,6 +70,10 @@ static void err_printf(char const *tmpl,
* Set up the defaults that cannot be determined at compile time.
*/
void defaults() {
+ if (getenv("HOME") == NULL) {
+ fprintf(stderr, "missing HOME variable\n");
+ exit(1);
+ }
strncpy(config_file_name, (char *) getenv("HOME"), MAX_INPUT_LENGTH);
strncat(config_file_name, "/", MAX_INPUT_LENGTH-strlen(config_file_name));
strncat(config_file_name, RCFILE, MAX_INPUT_LENGTH-strlen(config_file_name));
--- asmail-2.1.orig/asmailrc.sample
+++ asmail-2.1/asmailrc.sample
@@ -38,8 +38,8 @@ x11 {
# animation refresh rate in 1/100 sec
refresh 10
# xpm picture files
- #frame none
- frame /usr/local/share/afterstep/desktop/icons/16bpp/ASBBlockTransparent.xpm
+ frame none
+ #frame /usr/local/share/afterstep/desktop/icons/16bpp/ASBBlockTransparent.xpm
nomail /usr/local/share/asmail/pixmaps/e-no.xpm
old /usr/local/share/asmail/pixmaps/e0.xpm
new /usr/local/share/asmail/pixmaps/e1.xpm
--- asmail-2.1.orig/autoconf/config.h.in
+++ asmail-2.1/autoconf/config.h.in
@@ -13,7 +13,7 @@
#undef HAVE_MACHINE_SOUNDCARD_H
/* Define if you have the <openssl/ssl.h> header file. */
-#undef HAVE_OPENSSL_SSL_H
+//#undef HAVE_OPENSSL_SSL_H
/* Define if you have the <pthread.h> header file. */
#undef HAVE_PTHREAD_H
--- asmail-2.1.orig/configure
+++ asmail-2.1/configure
@@ -2000,7 +2000,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+#LIBS="-lICE $X_EXTRA_LIBS $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2006 "configure"
#include "confdefs.h"
@@ -2028,7 +2028,7 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+# X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
else
echo "$ac_t""no" 1>&6
fi
@@ -2745,7 +2745,7 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- SSL_LIB="-lssl" HAVESSL="-lssl"
+# SSL_LIB="-lssl" HAVESSL="-lssl"
else
echo "$ac_t""no" 1>&6
fi
--- asmail-2.1.orig/gui.c
+++ asmail-2.1/gui.c
@@ -284,7 +284,7 @@ void draw_window(Window win) {
}
if ( x11_set.old && x11_set.new ) {
sprintf(&NumOfMsg.chars[strlen(NumOfMsg.chars)],
- x11_set.delimiter);
+ "%s", x11_set.delimiter);
}
if ( x11_set.old ) {
if ( 0 != o )
@@ -323,7 +323,7 @@ void draw_window(Window win) {
}
if ( x11_set.old && x11_set.new ) {
sprintf(&NumOfMsg.chars[strlen(NumOfMsg.chars)],
- x11_set.delimiter);
+ "%s", x11_set.delimiter);
}
if ( x11_set.old ) {
if ( 0 != mb->ctotal )
|
