summaryrefslogtreecommitdiff
path: root/mail/courier-imap/files
diff options
context:
space:
mode:
Diffstat (limited to 'mail/courier-imap/files')
-rw-r--r--mail/courier-imap/files/courier-imap-imapd-ssl.in22
-rw-r--r--mail/courier-imap/files/courier-imap-imapd-ssl.sh22
-rw-r--r--mail/courier-imap/files/courier-imap-imapd.in4
-rw-r--r--mail/courier-imap/files/courier-imap-imapd.sh4
-rw-r--r--mail/courier-imap/files/courier-imap-pop3d-ssl.in22
-rw-r--r--mail/courier-imap/files/courier-imap-pop3d-ssl.sh22
-rw-r--r--mail/courier-imap/files/courier-imap-pop3d.in4
-rw-r--r--mail/courier-imap/files/courier-imap-pop3d.sh4
-rw-r--r--mail/courier-imap/files/patch-Makefile.in18
-rw-r--r--mail/courier-imap/files/patch-authlib::Makefile.in11
-rw-r--r--mail/courier-imap/files/patch-ldap13
-rw-r--r--mail/courier-imap/files/patch-mysql182
12 files changed, 65 insertions, 263 deletions
diff --git a/mail/courier-imap/files/courier-imap-imapd-ssl.in b/mail/courier-imap/files/courier-imap-imapd-ssl.in
index dcdd0a4ca6c8..d54c97023180 100644
--- a/mail/courier-imap/files/courier-imap-imapd-ssl.in
+++ b/mail/courier-imap/files/courier-imap-imapd-ssl.in
@@ -2,32 +2,34 @@
#
# An rc.subr-style startup script for Courier-IMAP's IMAP over SSL service.
-# PROVIDE: courier_imap_imapdssl
-# REQUIRE: LOGIN
+# PROVIDE: courier_imap_imapd_ssl
+# REQUIRE: LOGIN courier_authdaemond
# KEYWORD: FreeBSD shutdown
-# Define these courier_imap_imapdssl_* variables in one of these files:
+# Define these courier_imap_imapd_ssl_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
-# /etc/rc.conf.d/courier_imap_imapdssl
+# /etc/rc.conf.d/courier_imap_imapd_ssl
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
-courier_imap_imapdssl_enable=${courier_imap_imapdssl_enable-"NO"}
+courier_imap_imapd_ssl_enable=${courier_imap_imapd_ssl_enable-"NO"}
. %%RC_SUBR%%
-name="courier_imap_imapdssl"
+name="courier_imap_imapd_ssl"
rcvar=`set_rcvar`
command="%%PREFIX%%/libexec/courier-imap/imapd-ssl.rc"
+pidfile="/var/run/imapd-ssl.pid"
+procname="%%PREFIX%%/libexec/courier-imap/couriertcpd"
-start_cmd="imapdssl_cmd start"
-stop_cmd="imapdssl_cmd stop"
-restart_cmd="imapdssl_cmd stop && imapdssl_cmd start"
+start_cmd="imapd_ssl_cmd start"
+stop_cmd="imapd_ssl_cmd stop"
+restart_cmd="imapd_ssl_cmd stop && imapd_ssl_cmd start"
load_rc_config $name
-imapdssl_cmd () {
+imapd_ssl_cmd () {
case $1 in
start)
echo "Starting ${name}."
diff --git a/mail/courier-imap/files/courier-imap-imapd-ssl.sh b/mail/courier-imap/files/courier-imap-imapd-ssl.sh
index dcdd0a4ca6c8..d54c97023180 100644
--- a/mail/courier-imap/files/courier-imap-imapd-ssl.sh
+++ b/mail/courier-imap/files/courier-imap-imapd-ssl.sh
@@ -2,32 +2,34 @@
#
# An rc.subr-style startup script for Courier-IMAP's IMAP over SSL service.
-# PROVIDE: courier_imap_imapdssl
-# REQUIRE: LOGIN
+# PROVIDE: courier_imap_imapd_ssl
+# REQUIRE: LOGIN courier_authdaemond
# KEYWORD: FreeBSD shutdown
-# Define these courier_imap_imapdssl_* variables in one of these files:
+# Define these courier_imap_imapd_ssl_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
-# /etc/rc.conf.d/courier_imap_imapdssl
+# /etc/rc.conf.d/courier_imap_imapd_ssl
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
-courier_imap_imapdssl_enable=${courier_imap_imapdssl_enable-"NO"}
+courier_imap_imapd_ssl_enable=${courier_imap_imapd_ssl_enable-"NO"}
. %%RC_SUBR%%
-name="courier_imap_imapdssl"
+name="courier_imap_imapd_ssl"
rcvar=`set_rcvar`
command="%%PREFIX%%/libexec/courier-imap/imapd-ssl.rc"
+pidfile="/var/run/imapd-ssl.pid"
+procname="%%PREFIX%%/libexec/courier-imap/couriertcpd"
-start_cmd="imapdssl_cmd start"
-stop_cmd="imapdssl_cmd stop"
-restart_cmd="imapdssl_cmd stop && imapdssl_cmd start"
+start_cmd="imapd_ssl_cmd start"
+stop_cmd="imapd_ssl_cmd stop"
+restart_cmd="imapd_ssl_cmd stop && imapd_ssl_cmd start"
load_rc_config $name
-imapdssl_cmd () {
+imapd_ssl_cmd () {
case $1 in
start)
echo "Starting ${name}."
diff --git a/mail/courier-imap/files/courier-imap-imapd.in b/mail/courier-imap/files/courier-imap-imapd.in
index 4985a3fea151..42c776b830ed 100644
--- a/mail/courier-imap/files/courier-imap-imapd.in
+++ b/mail/courier-imap/files/courier-imap-imapd.in
@@ -3,7 +3,7 @@
# An rc.subr-style startup script for Courier-IMAP's IMAP service.
# PROVIDE: courier_imap_imapd
-# REQUIRE: LOGIN
+# REQUIRE: LOGIN courier_authdaemond
# KEYWORD: FreeBSD shutdown
# Define these courier_imap_imapd_* variables in one of these files:
@@ -20,6 +20,8 @@ courier_imap_imapd_enable=${courier_imap_imapd_enable-"NO"}
name="courier_imap_imapd"
rcvar=`set_rcvar`
command="%%PREFIX%%/libexec/courier-imap/imapd.rc"
+pidfile="/var/run/imapd.pid"
+procname="%%PREFIX%%/libexec/courier-imap/couriertcpd"
start_cmd="imapd_cmd start"
stop_cmd="imapd_cmd stop"
diff --git a/mail/courier-imap/files/courier-imap-imapd.sh b/mail/courier-imap/files/courier-imap-imapd.sh
index 4985a3fea151..42c776b830ed 100644
--- a/mail/courier-imap/files/courier-imap-imapd.sh
+++ b/mail/courier-imap/files/courier-imap-imapd.sh
@@ -3,7 +3,7 @@
# An rc.subr-style startup script for Courier-IMAP's IMAP service.
# PROVIDE: courier_imap_imapd
-# REQUIRE: LOGIN
+# REQUIRE: LOGIN courier_authdaemond
# KEYWORD: FreeBSD shutdown
# Define these courier_imap_imapd_* variables in one of these files:
@@ -20,6 +20,8 @@ courier_imap_imapd_enable=${courier_imap_imapd_enable-"NO"}
name="courier_imap_imapd"
rcvar=`set_rcvar`
command="%%PREFIX%%/libexec/courier-imap/imapd.rc"
+pidfile="/var/run/imapd.pid"
+procname="%%PREFIX%%/libexec/courier-imap/couriertcpd"
start_cmd="imapd_cmd start"
stop_cmd="imapd_cmd stop"
diff --git a/mail/courier-imap/files/courier-imap-pop3d-ssl.in b/mail/courier-imap/files/courier-imap-pop3d-ssl.in
index 30636bd73879..b594235905f5 100644
--- a/mail/courier-imap/files/courier-imap-pop3d-ssl.in
+++ b/mail/courier-imap/files/courier-imap-pop3d-ssl.in
@@ -2,32 +2,34 @@
#
# An rc.subr-style startup script for Courier-IMAP's POP3 over SSL service.
-# PROVIDE: courier_imap_pop3dssl
-# REQUIRE: LOGIN
+# PROVIDE: courier_imap_pop3d_ssl
+# REQUIRE: LOGIN courier_authdaemond
# KEYWORD: FreeBSD shutdown
-# Define these courier_imap_pop3dssl_* variables in one of these files:
+# Define these courier_imap_pop3d_ssl_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
-# /etc/rc.conf.d/courier_imap_pop3dssl
+# /etc/rc.conf.d/courier_imap_pop3d_ssl
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
-courier_imap_pop3dssl_enable=${courier_imap_pop3dssl_enable-"NO"}
+courier_imap_pop3d_ssl_enable=${courier_imap_pop3d_ssl_enable-"NO"}
. %%RC_SUBR%%
-name="courier_imap_pop3dssl"
+name="courier_imap_pop3d_ssl"
rcvar=`set_rcvar`
command="%%PREFIX%%/libexec/courier-imap/pop3d-ssl.rc"
+pidfile="/var/run/pop3d-ssl.pid"
+procname="%%PREFIX%%/libexec/courier-imap/couriertcpd"
-start_cmd="pop3dssl_cmd start"
-stop_cmd="pop3dssl_cmd stop"
-restart_cmd="pop3dssl_cmd stop && pop3dssl_cmd start"
+start_cmd="pop3d_ssl_cmd start"
+stop_cmd="pop3d_ssl_cmd stop"
+restart_cmd="pop3d_ssl_cmd stop && pop3d_ssl_cmd start"
load_rc_config $name
-pop3dssl_cmd () {
+pop3d_ssl_cmd () {
case $1 in
start)
echo "Starting ${name}."
diff --git a/mail/courier-imap/files/courier-imap-pop3d-ssl.sh b/mail/courier-imap/files/courier-imap-pop3d-ssl.sh
index 30636bd73879..b594235905f5 100644
--- a/mail/courier-imap/files/courier-imap-pop3d-ssl.sh
+++ b/mail/courier-imap/files/courier-imap-pop3d-ssl.sh
@@ -2,32 +2,34 @@
#
# An rc.subr-style startup script for Courier-IMAP's POP3 over SSL service.
-# PROVIDE: courier_imap_pop3dssl
-# REQUIRE: LOGIN
+# PROVIDE: courier_imap_pop3d_ssl
+# REQUIRE: LOGIN courier_authdaemond
# KEYWORD: FreeBSD shutdown
-# Define these courier_imap_pop3dssl_* variables in one of these files:
+# Define these courier_imap_pop3d_ssl_* variables in one of these files:
# /etc/rc.conf
# /etc/rc.conf.local
-# /etc/rc.conf.d/courier_imap_pop3dssl
+# /etc/rc.conf.d/courier_imap_pop3d_ssl
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
-courier_imap_pop3dssl_enable=${courier_imap_pop3dssl_enable-"NO"}
+courier_imap_pop3d_ssl_enable=${courier_imap_pop3d_ssl_enable-"NO"}
. %%RC_SUBR%%
-name="courier_imap_pop3dssl"
+name="courier_imap_pop3d_ssl"
rcvar=`set_rcvar`
command="%%PREFIX%%/libexec/courier-imap/pop3d-ssl.rc"
+pidfile="/var/run/pop3d-ssl.pid"
+procname="%%PREFIX%%/libexec/courier-imap/couriertcpd"
-start_cmd="pop3dssl_cmd start"
-stop_cmd="pop3dssl_cmd stop"
-restart_cmd="pop3dssl_cmd stop && pop3dssl_cmd start"
+start_cmd="pop3d_ssl_cmd start"
+stop_cmd="pop3d_ssl_cmd stop"
+restart_cmd="pop3d_ssl_cmd stop && pop3d_ssl_cmd start"
load_rc_config $name
-pop3dssl_cmd () {
+pop3d_ssl_cmd () {
case $1 in
start)
echo "Starting ${name}."
diff --git a/mail/courier-imap/files/courier-imap-pop3d.in b/mail/courier-imap/files/courier-imap-pop3d.in
index 29d1762ed665..886d21eaa3e1 100644
--- a/mail/courier-imap/files/courier-imap-pop3d.in
+++ b/mail/courier-imap/files/courier-imap-pop3d.in
@@ -3,7 +3,7 @@
# An rc.subr-style startup script for Courier-IMAP's POP3 service.
# PROVIDE: courier_imap_pop3d
-# REQUIRE: LOGIN
+# REQUIRE: LOGIN courier_authdaemond
# KEYWORD: FreeBSD shutdown
# Define these courier_imap_pop3d_* variables in one of these files:
@@ -20,6 +20,8 @@ courier_imap_pop3d_enable=${courier_imap_pop3d_enable-"NO"}
name="courier_imap_pop3d"
rcvar=`set_rcvar`
command="%%PREFIX%%/libexec/courier-imap/pop3d.rc"
+pidfile="/var/run/pop3d.pid"
+procname="%%PREFIX%%/libexec/courier-imap/couriertcpd"
start_cmd="pop3d_cmd start"
stop_cmd="pop3d_cmd stop"
diff --git a/mail/courier-imap/files/courier-imap-pop3d.sh b/mail/courier-imap/files/courier-imap-pop3d.sh
index 29d1762ed665..886d21eaa3e1 100644
--- a/mail/courier-imap/files/courier-imap-pop3d.sh
+++ b/mail/courier-imap/files/courier-imap-pop3d.sh
@@ -3,7 +3,7 @@
# An rc.subr-style startup script for Courier-IMAP's POP3 service.
# PROVIDE: courier_imap_pop3d
-# REQUIRE: LOGIN
+# REQUIRE: LOGIN courier_authdaemond
# KEYWORD: FreeBSD shutdown
# Define these courier_imap_pop3d_* variables in one of these files:
@@ -20,6 +20,8 @@ courier_imap_pop3d_enable=${courier_imap_pop3d_enable-"NO"}
name="courier_imap_pop3d"
rcvar=`set_rcvar`
command="%%PREFIX%%/libexec/courier-imap/pop3d.rc"
+pidfile="/var/run/pop3d.pid"
+procname="%%PREFIX%%/libexec/courier-imap/couriertcpd"
start_cmd="pop3d_cmd start"
stop_cmd="pop3d_cmd stop"
diff --git a/mail/courier-imap/files/patch-Makefile.in b/mail/courier-imap/files/patch-Makefile.in
index 7ed74c9ea2b1..7bb398f7c107 100644
--- a/mail/courier-imap/files/patch-Makefile.in
+++ b/mail/courier-imap/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig Tue Jul 20 01:54:19 2004
-+++ Makefile.in Tue Jul 20 19:31:37 2004
-@@ -218,7 +218,7 @@
+--- Makefile.in.orig Thu Dec 9 03:07:01 2004
++++ Makefile.in Sun Jan 2 21:17:35 2005
+@@ -248,7 +248,7 @@
COPYING.GPL NEWS.html $(TEMPLFILES)\
sysconftool
sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
@@ -9,7 +9,7 @@
libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
HTML2TXT = `which lynx 2>/dev/null && echo "lynx -dump -nolist" && exit; echo "links -dump"`
-@@ -433,8 +433,8 @@
+@@ -506,8 +506,8 @@
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -20,7 +20,7 @@
done
uninstall-man1:
@$(NORMAL_UNINSTALL)
-@@ -478,8 +478,8 @@
+@@ -551,8 +551,8 @@
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -31,11 +31,3 @@
done
uninstall-man8:
@$(NORMAL_UNINSTALL)
-@@ -1055,6 +1055,7 @@
-
- install-data-local: install-man
- for f in `cat authlib/modulelist ; . authlib/authdaemonrc ; echo $$authmodulelist ` ; do \
-+ continue ; \
- test "$$f" = "authpam" || continue ; \
- test -d $(DESTDIR)/etc/pam.d || continue ; \
- test -w $(DESTDIR)/etc/pam.d || continue ; \
diff --git a/mail/courier-imap/files/patch-authlib::Makefile.in b/mail/courier-imap/files/patch-authlib::Makefile.in
deleted file mode 100644
index ed065c7d873e..000000000000
--- a/mail/courier-imap/files/patch-authlib::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- authlib/Makefile.in.orig Sun Jul 20 12:01:18 2003
-+++ authlib/Makefile.in Sun Jul 20 12:56:12 2003
-@@ -1341,7 +1341,7 @@
- $(mkinstalldirs) $(DESTDIR)$(man7dir) ; \
- for f in $(man_MANS) "" ; do \
- test "$$f" = "" && continue ; \
-- $(INSTALL_DATA) $$f $(DESTDIR)$(man7dir) ; done ; \
-+ %%INSTALL_MAN%% $$f $(DESTDIR)$(man7dir) ; done ; \
- cd $(DESTDIR)$(man7dir) || exit 1 ; \
- for f in $(man_LINKS) "" ; do \
- test "$$f" = "" && continue ; \
diff --git a/mail/courier-imap/files/patch-ldap b/mail/courier-imap/files/patch-ldap
deleted file mode 100644
index df479a4cbbfe..000000000000
--- a/mail/courier-imap/files/patch-ldap
+++ /dev/null
@@ -1,13 +0,0 @@
---- authlib/configure.orig Wed Mar 3 05:54:13 2004
-+++ authlib/configure Tue Mar 16 19:36:40 2004
-@@ -1268,6 +1268,10 @@
- { (exit 1); exit 1; }; }
- fi
-
-+CFLAGS="$CFLAGS -I%%LOCALBASE%%/include"
-+CPPFLAGS="$CPPFLAGS -I%%LOCALBASE%%/include"
-+LDFLAGS="-L%%LOCALBASE%%/lib $LDFLAGS"
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/mail/courier-imap/files/patch-mysql b/mail/courier-imap/files/patch-mysql
deleted file mode 100644
index 029829ef7a5d..000000000000
--- a/mail/courier-imap/files/patch-mysql
+++ /dev/null
@@ -1,182 +0,0 @@
---- authlib/configure.orig Tue Jul 20 19:37:46 2004
-+++ authlib/configure Tue Jul 20 19:37:22 2004
-@@ -7337,9 +7337,9 @@
- if test "$doauthmysql" = ""
- then
- LIBS="$MYSQL_LIBS $LIBS"
-- echo "$as_me:$LINENO: checking for mysql_connect" >&5
--echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
--if test "${ac_cv_func_mysql_connect+set}" = set; then
-+ echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
-+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
-+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7348,12 +7348,12 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
-+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define mysql_connect innocuous_mysql_connect
-+#define mysql_real_connect innocuous_mysql_real_connect
-
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char mysql_connect (); below.
-+ which can conflict with char mysql_real_connect (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-@@ -7363,7 +7363,7 @@
- # include <assert.h>
- #endif
-
--#undef mysql_connect
-+#undef mysql_real_connect
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -7372,14 +7372,14 @@
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char mysql_connect ();
-+char mysql_real_connect ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect)
-+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect)
- choke me
- #else
--char (*f) () = mysql_connect;
-+char (*f) () = mysql_real_connect;
- #endif
- #ifdef __cplusplus
- }
-@@ -7388,7 +7388,7 @@
- int
- main ()
- {
--return f != mysql_connect;
-+return f != mysql_real_connect;
- ;
- return 0;
- }
-@@ -7415,19 +7415,19 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_func_mysql_connect=yes
-+ ac_cv_func_mysql_real_connect=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_mysql_connect=no
-+ac_cv_func_mysql_real_connect=no
- fi
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
--echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
--if test $ac_cv_func_mysql_connect = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6
-+if test $ac_cv_func_mysql_real_connect = yes; then
- doauthmysql="yes"
-
- fi
-@@ -7537,9 +7537,9 @@
- else
- saveLIBS="$LIBS"
- LIBS="$MYSQL_LIBS $LIBS"
-- echo "$as_me:$LINENO: checking for mysql_connect" >&5
--echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
--if test "${ac_cv_func_mysql_connect+set}" = set; then
-+ echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
-+echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
-+if test "${ac_cv_func_mysql_real_connect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7548,12 +7548,12 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
--/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
-+/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define mysql_connect innocuous_mysql_connect
-+#define mysql_real_connect innocuous_mysql_real_connect
-
- /* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char mysql_connect (); below.
-+ which can conflict with char mysql_real_connect (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-@@ -7563,7 +7563,7 @@
- # include <assert.h>
- #endif
-
--#undef mysql_connect
-+#undef mysql_real_connect
-
- /* Override any gcc2 internal prototype to avoid an error. */
- #ifdef __cplusplus
-@@ -7572,14 +7572,14 @@
- #endif
- /* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
--char mysql_connect ();
-+char mysql_real_connect ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_mysql_connect) || defined (__stub___mysql_connect)
-+#if defined (__stub_mysql_real_connect) || defined (__stub___mysql_real_connect)
- choke me
- #else
--char (*f) () = mysql_connect;
-+char (*f) () = mysql_real_connect;
- #endif
- #ifdef __cplusplus
- }
-@@ -7588,7 +7588,7 @@
- int
- main ()
- {
--return f != mysql_connect;
-+return f != mysql_real_connect;
- ;
- return 0;
- }
-@@ -7615,19 +7615,19 @@
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_func_mysql_connect=yes
-+ ac_cv_func_mysql_real_connect=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_mysql_connect=no
-+ac_cv_func_mysql_real_connect=no
- fi
- rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
--echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
--if test $ac_cv_func_mysql_connect = yes; then
-+echo "$as_me:$LINENO: result: $ac_cv_func_mysql_real_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_mysql_real_connect" >&6
-+if test $ac_cv_func_mysql_real_connect = yes; then
- AUTHMYSQL="authmysql${EXEEXT}"
- HAVE_AUTHMYSQL=1
- else
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-05 22:01:09 +0000