From fcc8d912a17c954802cd0e17a8a642ff07c74d6c Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Sun, 15 Jan 2017 18:06:08 -0500 Subject: [PATCH] Remove the vCard module's attempt to create a netconfig file in the obsolete format for the Global Address Book room. Increment version number to 906 for immediate release. --- citadel/citadel.h | 4 ++-- citadel/configure.ac | 2 +- citadel/modules/vcard/serv_vcard.c | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/citadel/citadel.h b/citadel/citadel.h index cb2bafd9d..70e084002 100644 --- a/citadel/citadel.h +++ b/citadel/citadel.h @@ -1,7 +1,7 @@ /* * Main Citadel header file * - * Copyright (c) 1987-2015 by the citadel.org team + * Copyright (c) 1987-2017 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -45,7 +45,7 @@ extern "C" { * usually more strict because you're not really supposed to dump/load and * upgrade at the same time. */ -#define REV_LEVEL 905 /* This version */ +#define REV_LEVEL 906 /* This version */ #define REV_MIN 591 /* Oldest compatible database */ #define EXPORT_REV_MIN 760 /* Oldest compatible export files */ #define LIBCITADEL_MIN 903 /* Minimum required version of libcitadel */ diff --git a/citadel/configure.ac b/citadel/configure.ac index 0caefacec..82482fc56 100644 --- a/citadel/configure.ac +++ b/citadel/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.52) -AC_INIT([Citadel], [905], [http://www.citadel.org/]) +AC_INIT([Citadel], [906], [http://www.citadel.org/]) AC_REVISION([$Revision: 5108 $]) AC_CONFIG_SRCDIR([citserver.c]) AC_CONFIG_HEADER(sysdep.h) diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c index 439a714a8..db2f6114f 100644 --- a/citadel/modules/vcard/serv_vcard.c +++ b/citadel/modules/vcard/serv_vcard.c @@ -2,7 +2,7 @@ * A server-side module for Citadel which supports address book information * using the standard vCard format. * - * Copyright (c) 1999-2016 by the citadel.org team + * Copyright (c) 1999-2017 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -1534,7 +1534,7 @@ CTDL_MODULE_INIT(vcard) CtdlRegisterFixedOutputHook("text/x-vcard", vcard_fixed_output); CtdlRegisterFixedOutputHook("text/vcard", vcard_fixed_output); - /* Create the Global ADdress Book room if necessary */ + /* Create the Global Address Book room if necessary */ CtdlCreateRoom(ADDRESS_BOOK_ROOM, 3, "", 0, 1, 0, VIEW_ADDRESSBOOK); /* Set expiration policy to manual; otherwise objects will be lost! */ @@ -1550,7 +1550,7 @@ CTDL_MODULE_INIT(vcard) * purged. * * FIXME this no longer works - */ + * assoc_file_name(filename, sizeof filename, &qr, ctdl_netcfg_dir); fp = fopen(filename, "a"); if (fp != NULL) { @@ -1568,6 +1568,7 @@ CTDL_MODULE_INIT(vcard) syslog(LOG_ERR, "Cannot create %s: %s", filename, strerror(errno)); } } + */ /* for postfix tcpdict */ CtdlRegisterServiceHook(CtdlGetConfigInt("c_pftcpdict_port"), /* Postfix */ -- 2.30.2