2008-12-13 [colin] 3.6.1cvs73

* tools/Makefile.am
	* tools/ca-certificates.crt
	* src/common/Makefile.am
	* src/common/ssl.c
		First try to ship SSL certificates in Windows
		build
This commit is contained in:
Colin Leroy 2008-12-13 16:12:48 +00:00
parent 5f1da52ea4
commit 10c95956ea
7 changed files with 2643 additions and 2 deletions

View file

@ -1,3 +1,12 @@
2008-12-13 [colin] 3.6.1cvs73
* tools/Makefile.am
* tools/ca-certificates.crt
* src/common/Makefile.am
* src/common/ssl.c
First try to ship SSL certificates in Windows
build
2008-12-12 [colin] 3.6.1cvs72
* configure.ac

View file

@ -3654,3 +3654,4 @@
( cvs diff -u -r 1.42.2.44 -r 1.42.2.45 po/fr.po; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 manual/fr/advanced.xml; ) > 3.6.1cvs70.patchset
( cvs diff -u -r 1.179.2.237 -r 1.179.2.238 src/imap.c; cvs diff -u -r 1.79.2.66 -r 1.79.2.67 src/mh.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/partial_download.c; cvs diff -u -r 1.96.2.211 -r 1.96.2.212 src/textview.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/common/claws.c; cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/common/prefs.c; cvs diff -u -r 1.36.2.155 -r 1.36.2.156 src/common/utils.c; ) > 3.6.1cvs71.patchset
( cvs diff -u -r 1.654.2.3718 -r 1.654.2.3719 configure.ac; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpinline/claws.def; ) > 3.6.1cvs72.patchset
( cvs diff -u -r 1.25.2.28 -r 1.25.2.29 tools/Makefile.am; diff -u /dev/null tools/ca-certificates.crt; cvs diff -u -r 1.24.2.18 -r 1.24.2.19 src/common/Makefile.am; cvs diff -u -r 1.9.2.37 -r 1.9.2.38 src/common/ssl.c; ) > 3.6.1cvs73.patchset

View file

@ -11,7 +11,7 @@ MINOR_VERSION=6
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=72
EXTRA_VERSION=73
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

View file

@ -77,6 +77,7 @@ AM_CPPFLAGS = \
$(MAEMO_CFLAGS) \
-DLOCALEDIR=\""$(localedir)"\" \
-DPLUGINDIR=\"$(PLUGINDIR)\" \
-DDATAROOTDIR=\""$(datarootdir)"\" \
-DGTK_DISABLE_DEPRECATED
libclawscommon_la_LIBADD = \

View file

@ -120,7 +120,13 @@ const gchar *claws_ssl_get_cert_file(void)
}
return NULL;
#else
return "put_what_s_needed_here";
const gchar *cert_file = NULL;
if (cert_file == NULL)
cert_file = g_strconcat(DATAROOTDIR,
G_DIR_SEPARATOR_S,
"ca-certificates.crt",
NULL);
return cert_file;
#endif
}

View file

@ -36,6 +36,7 @@ EXTRA_TOOLS = \
EXTRA_DIST = \
README \
ca-certificates.crt \
multiwebsearch.conf \
kdeservicemenu/README \
kdeservicemenu/claws-mail-attach-files.desktop.template \
@ -69,3 +70,6 @@ distclean-local:
rmdir --ignore-fail-on-non-empty kdeservicemenu; \
fi; \
fi
install-data-local:
cp ca-certificates.crt ${pkgdatadir}

2620
tools/ca-certificates.crt Normal file

File diff suppressed because it is too large Load diff