Package: release.debian.org Severity: normal Tags: wheezy User: release.debian....@packages.debian.org Usertags: pu
In order to address the current FTBFS of c-icap-modules here is an update for c-icap which resolves the problem. With this patch I was able to build c-icap-modules again. Mathieu, I will be happy to perform the upload unless you want to do this yourself. Sebastian
diff -Nru c-icap-0.1.6/debian/changelog c-icap-0.1.6/debian/changelog --- c-icap-0.1.6/debian/changelog 2014-12-10 17:38:58.000000000 +0100 +++ c-icap-0.1.6/debian/changelog 2016-02-26 15:35:32.000000000 +0100 @@ -1,3 +1,12 @@ +c-icap (1:0.1.6-1.1+deb7u2) oldstable; urgency=medium + + * Non-maintainer upload. + * Add 0008-Rename-CONF-to-C_ICAP_CONF.patch + Rename the CONF symbol which is also declared by openssl in order to + fix FTBFS of c-icap-modules (Closes: #768684). + + -- Sebastian Andrzej Siewior <sebast...@breakpoint.cc> Fri, 26 Feb 2016 15:30:44 +0100 + c-icap (1:0.1.6-1.1+deb7u1) wheezy-security; urgency=high * Non-maintainer upload by the Security Team. diff -Nru c-icap-0.1.6/debian/patches/0008-Rename-CONF-to-C_ICAP_CONF.patch c-icap-0.1.6/debian/patches/0008-Rename-CONF-to-C_ICAP_CONF.patch --- c-icap-0.1.6/debian/patches/0008-Rename-CONF-to-C_ICAP_CONF.patch 1970-01-01 01:00:00.000000000 +0100 +++ c-icap-0.1.6/debian/patches/0008-Rename-CONF-to-C_ICAP_CONF.patch 2016-02-26 15:27:13.000000000 +0100 @@ -0,0 +1,477 @@ +From 6673de8b3b04c6ed43bb6f2ed582b5775a066ed3 Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior <sebast...@breakpoint.cc> +Date: Fri, 26 Feb 2016 15:21:11 +0100 +Subject: [PATCH] Rename CONF to C_ICAP_CONF + +Based on a patch by Mathieu Parent <math.par...@gmail.com> done by sed: + + sed -i 's@\<CONF\>@C_ICAP_CONF@g' *.c include/*.h + +In order to address FTBFS of c-icap-modules in Wheezy (openssl and +c-icap define CONF in a public header). + +See also: https://bugs.debian.org/768684 +Signed-off-by: Sebastian Andrzej Siewior <sebast...@breakpoint.cc> +--- + aserver.c | 14 +++++------ + cfg_param.c | 66 +++++++++++++++++++++++++-------------------------- + include/cfg_param.h | 2 +- + module.c | 32 ++++++++++++------------- + mpmt_server.c | 8 +++---- + service.c | 6 ++--- + 6 files changed, 64 insertions(+), 64 deletions(-) + +diff --git a/aserver.c b/aserver.c +index 4602f10..249497c 100644 +--- a/aserver.c ++++ b/aserver.c +@@ -100,9 +100,9 @@ int main(int argc, char **argv) + ci_txt_template_init(); + ci_txt_template_set_dir(DATADIR"templates"); + +- if (!(CONF.MAGIC_DB = ci_magic_db_load(CONF.magics_file))) { ++ if (!(C_ICAP_CONF.MAGIC_DB = ci_magic_db_load(C_ICAP_CONF.magics_file))) { + ci_debug_printf(1, "Can not load magic file %s!!!\n", +- CONF.magics_file); ++ C_ICAP_CONF.magics_file); + } + init_conf_tables(); + request_stats_init(); +@@ -113,26 +113,26 @@ int main(int argc, char **argv) + ci_debug_printf(2, "My hostname is:%s\n", MY_HOSTNAME); + + #if ! defined(_WIN32) +- if (is_icap_running(CONF.PIDFILE)) { ++ if (is_icap_running(C_ICAP_CONF.PIDFILE)) { + ci_debug_printf(1, "c-icap server already running!\n"); + exit(-1); + } + if (DAEMON_MODE) + run_as_daemon(); +- if (!set_running_permissions(CONF.RUN_USER, CONF.RUN_GROUP)) ++ if (!set_running_permissions(C_ICAP_CONF.RUN_USER, C_ICAP_CONF.RUN_GROUP)) + exit(-1); +- store_pid(CONF.PIDFILE); ++ store_pid(C_ICAP_CONF.PIDFILE); + #endif + + if (!log_open()) { + ci_debug_printf(1, "Can not init loggers. Exiting.....\n"); + exit(-1); + } +- if (!init_server(CONF.ADDRESS, CONF.PORT, &(CONF.PROTOCOL_FAMILY))) ++ if (!init_server(C_ICAP_CONF.ADDRESS, C_ICAP_CONF.PORT, &(C_ICAP_CONF.PROTOCOL_FAMILY))) + return -1; + post_init_modules(); + post_init_services(); + start_server(); +- clear_pid(CONF.PIDFILE); ++ clear_pid(C_ICAP_CONF.PIDFILE); + return 0; + } +diff --git a/cfg_param.c b/cfg_param.c +index 5b8f5ba..0a2039d 100644 +--- a/cfg_param.c ++++ b/cfg_param.c +@@ -37,7 +37,7 @@ + int ARGC; + char **ARGV; + +-struct ci_server_conf CONF = { ++struct ci_server_conf C_ICAP_CONF = { + NULL, /* LISTEN ADDRESS */ 1344, /*PORT*/ AF_INET, /*SOCK_FAMILY */ + #ifdef _WIN32 + "c:\\TEMP", /*TMPDIR*/ "c:\\TEMP\\c-icap.pid", /*PIDFILE*/ "\\\\.\\pipe\\c-icap", /*COMMANDS_SOCKET; */ +@@ -128,9 +128,9 @@ struct sub_table { + }; + + static struct ci_conf_entry conf_variables[] = { +- {"ListenAddress", &CONF.ADDRESS, intl_cfg_set_str, NULL}, +- {"PidFile", &CONF.PIDFILE, intl_cfg_set_str, NULL}, +- {"CommandsSocket", &CONF.COMMANDS_SOCKET, intl_cfg_set_str, NULL}, ++ {"ListenAddress", &C_ICAP_CONF.ADDRESS, intl_cfg_set_str, NULL}, ++ {"PidFile", &C_ICAP_CONF.PIDFILE, intl_cfg_set_str, NULL}, ++ {"CommandsSocket", &C_ICAP_CONF.COMMANDS_SOCKET, intl_cfg_set_str, NULL}, + {"Timeout", (void *) (&TIMEOUT), intl_cfg_set_int, NULL}, + {"KeepAlive", NULL, NULL, NULL}, + {"MaxKeepAliveRequests", &MAX_KEEPALIVE_REQUESTS, intl_cfg_set_int, NULL}, +@@ -143,19 +143,19 @@ static struct ci_conf_entry conf_variables[] = { + {"MaxRequestsPerChild", &MAX_REQUESTS_PER_CHILD, intl_cfg_set_int, NULL}, + {"MaxRequestsReallocateMem", &MAX_REQUESTS_BEFORE_REALLOCATE_MEM, + intl_cfg_set_int, NULL}, +- {"Port", &CONF.PORT, intl_cfg_set_int, NULL}, +- {"User", &CONF.RUN_USER, intl_cfg_set_str, NULL}, +- {"Group", &CONF.RUN_GROUP, intl_cfg_set_str, NULL}, +- {"ServerAdmin", &CONF.SERVER_ADMIN, intl_cfg_set_str, NULL}, +- {"ServerName", &CONF.SERVER_NAME, intl_cfg_set_str, NULL}, ++ {"Port", &C_ICAP_CONF.PORT, intl_cfg_set_int, NULL}, ++ {"User", &C_ICAP_CONF.RUN_USER, intl_cfg_set_str, NULL}, ++ {"Group", &C_ICAP_CONF.RUN_GROUP, intl_cfg_set_str, NULL}, ++ {"ServerAdmin", &C_ICAP_CONF.SERVER_ADMIN, intl_cfg_set_str, NULL}, ++ {"ServerName", &C_ICAP_CONF.SERVER_NAME, intl_cfg_set_str, NULL}, + {"LoadMagicFile", NULL, cfg_load_magicfile, NULL}, + {"Logger", &default_logger, cfg_set_logger, NULL}, + {"ServerLog", &SERVER_LOG_FILE, intl_cfg_set_str, NULL}, + {"AccessLog", NULL, cfg_set_accesslog, NULL}, + {"LogFormat", NULL, cfg_set_logformat, NULL}, + {"DebugLevel", NULL, cfg_set_debug_level, NULL}, /*Set library's debug level */ +- {"ServicesDir", &CONF.SERVICES_DIR, intl_cfg_set_str, NULL}, +- {"ModulesDir", &CONF.MODULES_DIR, intl_cfg_set_str, NULL}, ++ {"ServicesDir", &C_ICAP_CONF.SERVICES_DIR, intl_cfg_set_str, NULL}, ++ {"ModulesDir", &C_ICAP_CONF.MODULES_DIR, intl_cfg_set_str, NULL}, + {"Service", NULL, cfg_load_service, NULL}, + {"ServiceAlias", NULL, cfg_service_alias, NULL}, + {"Module", NULL, cfg_load_module, NULL}, +@@ -442,7 +442,7 @@ int cfg_load_magicfile(char *directive, char **argv, void *setdata) + } + + db_file = argv[0]; +- if (strcmp(CONF.magics_file, db_file) == 0) { ++ if (strcmp(C_ICAP_CONF.magics_file, db_file) == 0) { + ci_debug_printf(2, "The db file %d is the same as default. Ignoring...\n", db_file); + return 1; + } +@@ -452,8 +452,8 @@ int cfg_load_magicfile(char *directive, char **argv, void *setdata) + ci_debug_printf(1, "Can not load magic file %s!!!\n", db_file); + return 0; + } +- if (!CONF.MAGIC_DB) +- CONF.MAGIC_DB = ndb; ++ if (!C_ICAP_CONF.MAGIC_DB) ++ C_ICAP_CONF.MAGIC_DB = ndb; + + return 1; + } +@@ -508,24 +508,24 @@ int cfg_set_tmp_dir(char *directive, char **argv, void *setdata) + return 0; + } + +- cfg_default_value_store(&CONF.TMPDIR, &CONF.TMPDIR, sizeof(char *)); ++ cfg_default_value_store(&C_ICAP_CONF.TMPDIR, &C_ICAP_CONF.TMPDIR, sizeof(char *)); + len = strlen(argv[0]); + +- CONF.TMPDIR = ci_cfg_alloc_mem((len + 2) * sizeof(char)); +- strcpy(CONF.TMPDIR, argv[0]); ++ C_ICAP_CONF.TMPDIR = ci_cfg_alloc_mem((len + 2) * sizeof(char)); ++ strcpy(C_ICAP_CONF.TMPDIR, argv[0]); + #ifdef _WIN32 +- if (CONF.TMPDIR[len] != '\\') { +- CONF.TMPDIR[len] = '\\'; +- CONF.TMPDIR[len + 1] = '\0'; ++ if (C_ICAP_CONF.TMPDIR[len] != '\\') { ++ C_ICAP_CONF.TMPDIR[len] = '\\'; ++ C_ICAP_CONF.TMPDIR[len + 1] = '\0'; + } + #else +- if (CONF.TMPDIR[len] != '/') { +- CONF.TMPDIR[len] = '/'; +- CONF.TMPDIR[len + 1] = '\0'; ++ if (C_ICAP_CONF.TMPDIR[len] != '/') { ++ C_ICAP_CONF.TMPDIR[len] = '/'; ++ C_ICAP_CONF.TMPDIR[len + 1] = '\0'; + } + #endif + /*Check if tmpdir exists. If no try to build it , report an error and uses the default... */ +- CI_TMPDIR = CONF.TMPDIR; /*Sets the library's temporary dir to .... */ ++ CI_TMPDIR = C_ICAP_CONF.TMPDIR; /*Sets the library's temporary dir to .... */ + ci_debug_printf(2, "Setting parameter :%s=%s\n", directive, argv[0]); + return 1; + } +@@ -801,7 +801,7 @@ int parse_file(char *conf_file) + /* #endif */ + + static struct ci_options_entry options[] = { +- {opt_pre "f", "filename", &CONF.cfg_file, ci_cfg_set_str, ++ {opt_pre "f", "filename", &C_ICAP_CONF.cfg_file, ci_cfg_set_str, + "Specify the configuration file"}, + {opt_pre "N", NULL, &DAEMON_MODE, ci_cfg_disable, "Do not run as daemon"}, + {opt_pre "d", "level", NULL, cfg_set_debug_level_cmd, +@@ -823,7 +823,7 @@ int config(int argc, char **argv) + ci_args_usage(argv[0], options); + exit(-1); + } +- if (!parse_file(CONF.cfg_file)) { ++ if (!parse_file(C_ICAP_CONF.cfg_file)) { + ci_debug_printf(1, "Error opening/parsing config file\n"); + exit(0); + } +@@ -842,7 +842,7 @@ int reconfig() + "Error in command line options, while reconfiguring!\n"); + return 0; + } +- if (!parse_file(CONF.cfg_file)) { ++ if (!parse_file(C_ICAP_CONF.cfg_file)) { + ci_debug_printf(1, + "Error opening/parsing config file, while reconfiguring!\n"); + return 0; +@@ -876,7 +876,7 @@ void system_shutdown() + Release other subsystems + */ + ci_magic_db_free(); +- CONF.MAGIC_DB = NULL; ++ C_ICAP_CONF.MAGIC_DB = NULL; + ci_txt_template_close(); + } + +@@ -892,9 +892,9 @@ int system_reconfigure() + + ci_debug_printf(1, "All resources released. Going to reload!\n"); + ci_txt_template_init(); +- if (!(CONF.MAGIC_DB = ci_magic_db_load(CONF.magics_file))) { ++ if (!(C_ICAP_CONF.MAGIC_DB = ci_magic_db_load(C_ICAP_CONF.magics_file))) { + ci_debug_printf(1, "Can not load magic file %s!!!\n", +- CONF.magics_file); ++ C_ICAP_CONF.magics_file); + } + init_modules(); + init_services(); +@@ -903,15 +903,15 @@ int system_reconfigure() + - Freeing all memory and resources used by configuration parameters (is it possible???) + - reopen and read config file. Now the monitor process has now the new config parameters. + */ +- old_port = CONF.PORT; ++ old_port = C_ICAP_CONF.PORT; + if (!reconfig()) + return 0; + + /* + - reinit listen socket if needed + */ +- if (old_port != CONF.PORT) { +- init_server(CONF.ADDRESS, CONF.PORT, &(CONF.PROTOCOL_FAMILY)); ++ if (old_port != C_ICAP_CONF.PORT) { ++ init_server(C_ICAP_CONF.ADDRESS, C_ICAP_CONF.PORT, &(C_ICAP_CONF.PROTOCOL_FAMILY)); + } + + log_open(); +diff --git a/include/cfg_param.h b/include/cfg_param.h +index b089013..fd2ccb5 100644 +--- a/include/cfg_param.h ++++ b/include/cfg_param.h +@@ -116,7 +116,7 @@ struct cfg_default_value{ + #define ALIAS_TABLE 2 + + #ifndef CI_BUILD_LIB +-extern struct ci_server_conf CONF; ++extern struct ci_server_conf C_ICAP_CONF; + + struct cfg_default_value * cfg_default_value_store(void *param, void *value,int size); + struct cfg_default_value * cfg_default_value_replace(void *param, void *value); +diff --git a/module.c b/module.c +index 1cff97b..034e94c 100644 +--- a/module.c ++++ b/module.c +@@ -71,7 +71,7 @@ void *load_module(char *module_file) + void *module = NULL; + CI_DLIB_HANDLE module_handle; + +- module_handle = ci_module_load(module_file, CONF.MODULES_DIR); ++ module_handle = ci_module_load(module_file, C_ICAP_CONF.MODULES_DIR); + if (!module_handle) + return NULL; + module = ci_module_sym(module_handle, "module"); +@@ -147,7 +147,7 @@ static int init_module(void *module, enum module_type type) + if (((service_handler_module_t *) module)->init_service_handler) + ret = + ((service_handler_module_t *) module)-> +- init_service_handler(&CONF); ++ init_service_handler(&C_ICAP_CONF); + if (((service_handler_module_t *) module)->conf_table) + register_conf_table(((service_handler_module_t *) module)->name, + ((service_handler_module_t *) module)-> +@@ -155,7 +155,7 @@ static int init_module(void *module, enum module_type type) + break; + case LOGGER: + if (((logger_module_t *) module)->init_logger) +- ret = ((logger_module_t *) module)->init_logger(&CONF); ++ ret = ((logger_module_t *) module)->init_logger(&C_ICAP_CONF); + if (((logger_module_t *) module)->conf_table) + register_conf_table(((logger_module_t *) module)->name, + ((logger_module_t *) module)->conf_table, +@@ -166,7 +166,7 @@ static int init_module(void *module, enum module_type type) + if (((access_control_module_t *) module)->init_access_controller) + ret = + ((access_control_module_t *) module)-> +- init_access_controller(&CONF); ++ init_access_controller(&C_ICAP_CONF); + if (((access_control_module_t *) module)->conf_table) + register_conf_table(((access_control_module_t *) module)->name, + ((access_control_module_t *) module)-> +@@ -174,7 +174,7 @@ static int init_module(void *module, enum module_type type) + break; + case AUTH_METHOD: + if (((http_auth_method_t *) module)->init_auth_method) +- ret = ((http_auth_method_t *) module)->init_auth_method(&CONF); ++ ret = ((http_auth_method_t *) module)->init_auth_method(&C_ICAP_CONF); + if (((http_auth_method_t *) module)->conf_table) + register_conf_table(((http_auth_method_t *) module)->name, + ((http_auth_method_t *) module)->conf_table, +@@ -185,7 +185,7 @@ static int init_module(void *module, enum module_type type) + if (((authenticator_module_t *) module)->init_authenticator) + ret = + ((authenticator_module_t *) module)-> +- init_authenticator(&CONF); ++ init_authenticator(&C_ICAP_CONF); + if (((authenticator_module_t *) module)->conf_table) + register_conf_table(((authenticator_module_t *) module)->name, + ((authenticator_module_t *) module)-> +@@ -193,7 +193,7 @@ static int init_module(void *module, enum module_type type) + break; + case COMMON: + if (((common_module_t *) module)->init_module) +- ret = ((common_module_t *) module)->init_module(&CONF); ++ ret = ((common_module_t *) module)->init_module(&C_ICAP_CONF); + if (((common_module_t *) module)->conf_table) + register_conf_table(((common_module_t *) module)->name, + ((common_module_t *) module)->conf_table, +@@ -608,7 +608,7 @@ int post_init_modules() + if (((common_module_t *) common_modules.modules[i])-> + post_init_module != NULL) + ((common_module_t *) common_modules.modules[i])-> +- post_init_module(&CONF); ++ post_init_module(&C_ICAP_CONF); + } + + /* service_handlers */ +@@ -616,7 +616,7 @@ int post_init_modules() + if (((service_handler_module_t *) service_handlers.modules[i])-> + post_init_service_handler != NULL) + ((service_handler_module_t *) service_handlers.modules[i])-> +- post_init_service_handler(&CONF); ++ post_init_service_handler(&C_ICAP_CONF); + } + + /* loggers? loggers do not have post init handlers .... */ +@@ -627,7 +627,7 @@ int post_init_modules() + if (((access_control_module_t *) access_controllers.modules[i])-> + post_init_access_controller != NULL) + ((access_control_module_t *) access_controllers.modules[i])-> +- post_init_access_controller(&CONF); ++ post_init_access_controller(&C_ICAP_CONF); + } + + +@@ -637,7 +637,7 @@ int post_init_modules() + if (((http_auth_method_t *) auth_methods.modules[i])-> + post_init_auth_method != NULL) + ((http_auth_method_t *) auth_methods.modules[i])-> +- post_init_auth_method(&CONF); ++ post_init_auth_method(&C_ICAP_CONF); + } + + /* authenticators */ +@@ -645,7 +645,7 @@ int post_init_modules() + if (((authenticator_module_t *) authenticators.modules[i])-> + post_init_authenticator != NULL) + ((authenticator_module_t *) authenticators.modules[i])-> +- post_init_authenticator(&CONF); ++ post_init_authenticator(&C_ICAP_CONF); + } + + return 1; +@@ -682,7 +682,7 @@ int release_modules() + if (((access_control_module_t *) access_controllers.modules[i])-> + release_access_controller != NULL) + ((access_control_module_t *) access_controllers.modules[i])-> +- release_access_controller(&CONF); ++ release_access_controller(&C_ICAP_CONF); + } + access_controllers.modules_num = 0; + +@@ -691,7 +691,7 @@ int release_modules() + if (((http_auth_method_t *) auth_methods.modules[i])-> + close_auth_method != NULL) + ((http_auth_method_t *) auth_methods.modules[i])-> +- close_auth_method(&CONF); ++ close_auth_method(&C_ICAP_CONF); + } + auth_methods.modules_num = 0; + +@@ -700,7 +700,7 @@ int release_modules() + if (((authenticator_module_t *) authenticators.modules[i])-> + close_authenticator != NULL) + ((authenticator_module_t *) authenticators.modules[i])-> +- close_authenticator(&CONF); ++ close_authenticator(&C_ICAP_CONF); + } + authenticators.modules_num = 0; + +@@ -709,7 +709,7 @@ int release_modules() + if (((common_module_t *) common_modules.modules[i])-> + close_module != NULL) + ((common_module_t *) common_modules.modules[i])-> +- close_module(&CONF); ++ close_module(&C_ICAP_CONF); + } + common_modules.modules_num = 0; + +diff --git a/mpmt_server.c b/mpmt_server.c +index 1f9537c..c043dc3 100644 +--- a/mpmt_server.c ++++ b/mpmt_server.c +@@ -51,7 +51,7 @@ extern int MIN_FREE_SERVERS; + extern int MAX_FREE_SERVERS; + extern int MAX_REQUESTS_BEFORE_REALLOCATE_MEM; + extern int MAX_REQUESTS_PER_CHILD; +-extern struct ci_server_conf CONF; ++extern struct ci_server_conf C_ICAP_CONF; + + typedef struct server_decl { + int srv_id; +@@ -965,11 +965,11 @@ int start_server() + char command_buffer[COMMANDS_BUFFER_SIZE]; + int user_informed = 0; + +- ctl_socket = ci_named_pipe_create(CONF.COMMANDS_SOCKET); ++ ctl_socket = ci_named_pipe_create(C_ICAP_CONF.COMMANDS_SOCKET); + if (ctl_socket < 0) { + ci_debug_printf(1, + "Error opening control socket %s. Fatal error, exiting!\n", +- CONF.COMMANDS_SOCKET); ++ C_ICAP_CONF.COMMANDS_SOCKET); + exit(0); + } + +@@ -1002,7 +1002,7 @@ int start_server() + } + if (ret == 0) { /*Eof received on pipe. Going to reopen ... */ + ci_named_pipe_close(ctl_socket); +- ctl_socket = ci_named_pipe_open(CONF.COMMANDS_SOCKET); ++ ctl_socket = ci_named_pipe_open(C_ICAP_CONF.COMMANDS_SOCKET); + if (ctl_socket < 0) { + ci_debug_printf(1, + "Error opening control socket. We are unstable and going down!"); +diff --git a/service.c b/service.c +index 6e29421..b9dfb4c 100644 +--- a/service.c ++++ b/service.c +@@ -288,7 +288,7 @@ ci_service_module_t *add_service(ci_service_module_t *service) + xdata = &service_extra_data_list[services_num]; + init_extra_data(xdata, service->mod_name); + if (service->mod_init_service) +- service->mod_init_service(xdata, &CONF); ++ service->mod_init_service(xdata, &C_ICAP_CONF); + + service_list[services_num++] = service; + +@@ -359,7 +359,7 @@ int post_init_services() + for (i = 0; i < services_num; i++) { + if (service_list[i]->mod_post_init_service != NULL) { + service_list[i]-> +- mod_post_init_service(&service_extra_data_list[i], &CONF); ++ mod_post_init_service(&service_extra_data_list[i], &C_ICAP_CONF); + } + } + return 1; +@@ -507,7 +507,7 @@ ci_service_module_t *load_c_service(char *service_file) + ci_service_module_t *service = NULL; + CI_DLIB_HANDLE service_handle; + +- service_handle = ci_module_load(service_file, CONF.SERVICES_DIR); ++ service_handle = ci_module_load(service_file, C_ICAP_CONF.SERVICES_DIR); + if (!service_handle) + return NULL; + service = ci_module_sym(service_handle, "service"); +-- +1.7.10.4 + diff -Nru c-icap-0.1.6/debian/patches/series c-icap-0.1.6/debian/patches/series --- c-icap-0.1.6/debian/patches/series 2014-12-10 17:38:58.000000000 +0100 +++ c-icap-0.1.6/debian/patches/series 2016-02-26 15:27:55.000000000 +0100 @@ -5,3 +5,4 @@ 0005-additional-manpage-fix.patch 0006-CVE-2013-7401_CVE-2013-7402.patch 0007-The-c-icap-respond-with-400-error-on-all-OPTIONS-req.patch +0008-Rename-CONF-to-C_ICAP_CONF.patch
