From 7ffe9932e911f2414037f5ff7f063001d642a7d3 Mon Sep 17 00:00:00 2001 From: Joey Schulze Date: Thu, 15 May 2008 06:50:09 +0000 Subject: [PATCH] Adjust config parser data type for _Port to int Thanks to Lehel Bernadt --- debian/changelog | 2 ++ debian/patches/009-port-int.dpatch | 38 ++++++++++++++++++++++++++++++ debian/patches/00list | 1 + 3 files changed, 41 insertions(+) create mode 100644 debian/patches/009-port-int.dpatch diff --git a/debian/changelog b/debian/changelog index 0671155..52b609a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ mod-auth-mysql (4.3.9-8) unstable; urgency=low * Unify AuthMySQL_ and Auth_MySQL_ namespace [007-unify_namespace.dpatch] * Adjust the buffer size used by make_scrambled_password() [008-make_scrambled_password.dpatch] (closes: Bug#356064) + * Adjust config parser data type for _Port to int, thanks to Lehel + Bernadt [009-port-int.dpatch] (closes: Bug#356147) -- diff --git a/debian/patches/009-port-int.dpatch b/debian/patches/009-port-int.dpatch new file mode 100644 index 0000000..3f75969 --- /dev/null +++ b/debian/patches/009-port-int.dpatch @@ -0,0 +1,38 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 009-port-int.dpatch by Lehel Bernadt +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adjust port to int + +@DPATCH@ +diff -urNad mod-auth-mysql~/mod_auth_mysql.c mod-auth-mysql/mod_auth_mysql.c +--- mod-auth-mysql~/mod_auth_mysql.c 2008-05-15 08:44:54.000000000 +0200 ++++ mod-auth-mysql/mod_auth_mysql.c 2008-05-15 08:45:35.000000000 +0200 +@@ -753,11 +753,11 @@ + (void*)APR_OFFSETOF(mysql_auth_config_rec, db_socket), + OR_AUTHCFG, "database host socket" ), + +- AP_INIT_TAKE1( "Auth_MySQL_Port", ap_set_string_slot, ++ AP_INIT_TAKE1( "Auth_MySQL_Port", ap_set_int_slot, + (void*)APR_OFFSETOF(mysql_auth_config_rec, db_port), + OR_AUTHCFG, "database host port" ), + +- AP_INIT_TAKE1( "AuthMySQL_Port", ap_set_string_slot, ++ AP_INIT_TAKE1( "AuthMySQL_Port", ap_set_int_slot, + (void*)APR_OFFSETOF(mysql_auth_config_rec, db_port), + OR_AUTHCFG, "database host port" ), + +@@ -1021,11 +1021,11 @@ + (void *) XtOffsetOf(mysql_auth_config_rec, db_socket), + OR_AUTHCFG, TAKE1, "database host socket" }, + +- { "Auth_MySQL_Port", ap_set_string_slot, ++ { "Auth_MySQL_Port", ap_set_int_slot, + (void *) XtOffsetOf(mysql_auth_config_rec, db_port), + OR_AUTHCFG, TAKE1, "database host socket" }, + +- { "AuthMySQL_Port", ap_set_string_slot, ++ { "AuthMySQL_Port", ap_set_int_slot, + (void *) XtOffsetOf(mysql_auth_config_rec, db_port), + OR_AUTHCFG, TAKE1, "database host socket" }, + diff --git a/debian/patches/00list b/debian/patches/00list index fdd431d..fec947d 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -5,3 +5,4 @@ 006-options 007-unify_namespace 008-make_scrambled_password +009-port-int -- 2.20.1