summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorDirk Froemberg <dirk@FreeBSD.org>1999-11-27 11:42:44 +0000
committerDirk Froemberg <dirk@FreeBSD.org>1999-11-27 11:42:44 +0000
commit95328a4ca929e626b8095e481d2403708c889d32 (patch)
tree2587915964642e24bf1b3a90b4e4caeca6526173 /databases
parentupgrade to 2.3.5. (diff)
Use stripped hostname via `hostname -s` in various scripts, to make them
consistent with mysqld and other OS. Reported by: Clive Lin <clive@CirX.ORG>
Notes
Notes: svn path=/head/; revision=23449
Diffstat (limited to 'databases')
-rw-r--r--databases/mysql322-server/files/patch-ag11
-rw-r--r--databases/mysql323-server/files/patch-ag11
-rw-r--r--databases/mysql40-server/files/patch-configure11
-rw-r--r--databases/mysql41-server/files/patch-configure11
-rw-r--r--databases/mysql50-server/files/patch-configure11
-rw-r--r--databases/mysql51-server/files/patch-configure11
-rw-r--r--databases/mysql54-server/files/patch-configure11
-rw-r--r--databases/mysql55-server/files/patch-configure11
-rw-r--r--databases/mysql60-server/files/patch-configure11
-rw-r--r--databases/percona55-server/files/patch-configure11
10 files changed, 100 insertions, 10 deletions
diff --git a/databases/mysql322-server/files/patch-ag b/databases/mysql322-server/files/patch-ag
index df2e48cf8abd..35b814b673b8 100644
--- a/databases/mysql322-server/files/patch-ag
+++ b/databases/mysql322-server/files/patch-ag
@@ -1,5 +1,5 @@
--- configure.orig Wed Oct 6 00:10:05 1999
-+++ configure Mon Oct 11 16:35:53 1999
++++ configure Thu Nov 25 21:00:43 1999
@@ -2070,8 +2070,8 @@
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
@@ -20,6 +20,15 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -2737,7 +2737,7 @@
+ ;;
+ esac
+ fi
+-HOSTNAME="$ac_cv_path_HOSTNAME"
++HOSTNAME="$ac_cv_path_HOSTNAME -s"
+ if test -n "$HOSTNAME"; then
+ echo "$ac_t""$HOSTNAME" 1>&6
+ else
@@ -2865,30 +2865,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:2867: checking "how to check if pid exists"" >&5
diff --git a/databases/mysql323-server/files/patch-ag b/databases/mysql323-server/files/patch-ag
index df2e48cf8abd..35b814b673b8 100644
--- a/databases/mysql323-server/files/patch-ag
+++ b/databases/mysql323-server/files/patch-ag
@@ -1,5 +1,5 @@
--- configure.orig Wed Oct 6 00:10:05 1999
-+++ configure Mon Oct 11 16:35:53 1999
++++ configure Thu Nov 25 21:00:43 1999
@@ -2070,8 +2070,8 @@
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
@@ -20,6 +20,15 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -2737,7 +2737,7 @@
+ ;;
+ esac
+ fi
+-HOSTNAME="$ac_cv_path_HOSTNAME"
++HOSTNAME="$ac_cv_path_HOSTNAME -s"
+ if test -n "$HOSTNAME"; then
+ echo "$ac_t""$HOSTNAME" 1>&6
+ else
@@ -2865,30 +2865,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:2867: checking "how to check if pid exists"" >&5
diff --git a/databases/mysql40-server/files/patch-configure b/databases/mysql40-server/files/patch-configure
index df2e48cf8abd..35b814b673b8 100644
--- a/databases/mysql40-server/files/patch-configure
+++ b/databases/mysql40-server/files/patch-configure
@@ -1,5 +1,5 @@
--- configure.orig Wed Oct 6 00:10:05 1999
-+++ configure Mon Oct 11 16:35:53 1999
++++ configure Thu Nov 25 21:00:43 1999
@@ -2070,8 +2070,8 @@
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
@@ -20,6 +20,15 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -2737,7 +2737,7 @@
+ ;;
+ esac
+ fi
+-HOSTNAME="$ac_cv_path_HOSTNAME"
++HOSTNAME="$ac_cv_path_HOSTNAME -s"
+ if test -n "$HOSTNAME"; then
+ echo "$ac_t""$HOSTNAME" 1>&6
+ else
@@ -2865,30 +2865,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:2867: checking "how to check if pid exists"" >&5
diff --git a/databases/mysql41-server/files/patch-configure b/databases/mysql41-server/files/patch-configure
index df2e48cf8abd..35b814b673b8 100644
--- a/databases/mysql41-server/files/patch-configure
+++ b/databases/mysql41-server/files/patch-configure
@@ -1,5 +1,5 @@
--- configure.orig Wed Oct 6 00:10:05 1999
-+++ configure Mon Oct 11 16:35:53 1999
++++ configure Thu Nov 25 21:00:43 1999
@@ -2070,8 +2070,8 @@
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
@@ -20,6 +20,15 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -2737,7 +2737,7 @@
+ ;;
+ esac
+ fi
+-HOSTNAME="$ac_cv_path_HOSTNAME"
++HOSTNAME="$ac_cv_path_HOSTNAME -s"
+ if test -n "$HOSTNAME"; then
+ echo "$ac_t""$HOSTNAME" 1>&6
+ else
@@ -2865,30 +2865,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:2867: checking "how to check if pid exists"" >&5
diff --git a/databases/mysql50-server/files/patch-configure b/databases/mysql50-server/files/patch-configure
index df2e48cf8abd..35b814b673b8 100644
--- a/databases/mysql50-server/files/patch-configure
+++ b/databases/mysql50-server/files/patch-configure
@@ -1,5 +1,5 @@
--- configure.orig Wed Oct 6 00:10:05 1999
-+++ configure Mon Oct 11 16:35:53 1999
++++ configure Thu Nov 25 21:00:43 1999
@@ -2070,8 +2070,8 @@
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
@@ -20,6 +20,15 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -2737,7 +2737,7 @@
+ ;;
+ esac
+ fi
+-HOSTNAME="$ac_cv_path_HOSTNAME"
++HOSTNAME="$ac_cv_path_HOSTNAME -s"
+ if test -n "$HOSTNAME"; then
+ echo "$ac_t""$HOSTNAME" 1>&6
+ else
@@ -2865,30 +2865,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:2867: checking "how to check if pid exists"" >&5
diff --git a/databases/mysql51-server/files/patch-configure b/databases/mysql51-server/files/patch-configure
index df2e48cf8abd..35b814b673b8 100644
--- a/databases/mysql51-server/files/patch-configure
+++ b/databases/mysql51-server/files/patch-configure
@@ -1,5 +1,5 @@
--- configure.orig Wed Oct 6 00:10:05 1999
-+++ configure Mon Oct 11 16:35:53 1999
++++ configure Thu Nov 25 21:00:43 1999
@@ -2070,8 +2070,8 @@
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
@@ -20,6 +20,15 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -2737,7 +2737,7 @@
+ ;;
+ esac
+ fi
+-HOSTNAME="$ac_cv_path_HOSTNAME"
++HOSTNAME="$ac_cv_path_HOSTNAME -s"
+ if test -n "$HOSTNAME"; then
+ echo "$ac_t""$HOSTNAME" 1>&6
+ else
@@ -2865,30 +2865,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:2867: checking "how to check if pid exists"" >&5
diff --git a/databases/mysql54-server/files/patch-configure b/databases/mysql54-server/files/patch-configure
index df2e48cf8abd..35b814b673b8 100644
--- a/databases/mysql54-server/files/patch-configure
+++ b/databases/mysql54-server/files/patch-configure
@@ -1,5 +1,5 @@
--- configure.orig Wed Oct 6 00:10:05 1999
-+++ configure Mon Oct 11 16:35:53 1999
++++ configure Thu Nov 25 21:00:43 1999
@@ -2070,8 +2070,8 @@
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
@@ -20,6 +20,15 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -2737,7 +2737,7 @@
+ ;;
+ esac
+ fi
+-HOSTNAME="$ac_cv_path_HOSTNAME"
++HOSTNAME="$ac_cv_path_HOSTNAME -s"
+ if test -n "$HOSTNAME"; then
+ echo "$ac_t""$HOSTNAME" 1>&6
+ else
@@ -2865,30 +2865,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:2867: checking "how to check if pid exists"" >&5
diff --git a/databases/mysql55-server/files/patch-configure b/databases/mysql55-server/files/patch-configure
index df2e48cf8abd..35b814b673b8 100644
--- a/databases/mysql55-server/files/patch-configure
+++ b/databases/mysql55-server/files/patch-configure
@@ -1,5 +1,5 @@
--- configure.orig Wed Oct 6 00:10:05 1999
-+++ configure Mon Oct 11 16:35:53 1999
++++ configure Thu Nov 25 21:00:43 1999
@@ -2070,8 +2070,8 @@
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
@@ -20,6 +20,15 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -2737,7 +2737,7 @@
+ ;;
+ esac
+ fi
+-HOSTNAME="$ac_cv_path_HOSTNAME"
++HOSTNAME="$ac_cv_path_HOSTNAME -s"
+ if test -n "$HOSTNAME"; then
+ echo "$ac_t""$HOSTNAME" 1>&6
+ else
@@ -2865,30 +2865,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:2867: checking "how to check if pid exists"" >&5
diff --git a/databases/mysql60-server/files/patch-configure b/databases/mysql60-server/files/patch-configure
index df2e48cf8abd..35b814b673b8 100644
--- a/databases/mysql60-server/files/patch-configure
+++ b/databases/mysql60-server/files/patch-configure
@@ -1,5 +1,5 @@
--- configure.orig Wed Oct 6 00:10:05 1999
-+++ configure Mon Oct 11 16:35:53 1999
++++ configure Thu Nov 25 21:00:43 1999
@@ -2070,8 +2070,8 @@
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
@@ -20,6 +20,15 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -2737,7 +2737,7 @@
+ ;;
+ esac
+ fi
+-HOSTNAME="$ac_cv_path_HOSTNAME"
++HOSTNAME="$ac_cv_path_HOSTNAME -s"
+ if test -n "$HOSTNAME"; then
+ echo "$ac_t""$HOSTNAME" 1>&6
+ else
@@ -2865,30 +2865,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:2867: checking "how to check if pid exists"" >&5
diff --git a/databases/percona55-server/files/patch-configure b/databases/percona55-server/files/patch-configure
index df2e48cf8abd..35b814b673b8 100644
--- a/databases/percona55-server/files/patch-configure
+++ b/databases/percona55-server/files/patch-configure
@@ -1,5 +1,5 @@
--- configure.orig Wed Oct 6 00:10:05 1999
-+++ configure Mon Oct 11 16:35:53 1999
++++ configure Thu Nov 25 21:00:43 1999
@@ -2070,8 +2070,8 @@
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
@@ -20,6 +20,15 @@
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -2737,7 +2737,7 @@
+ ;;
+ esac
+ fi
+-HOSTNAME="$ac_cv_path_HOSTNAME"
++HOSTNAME="$ac_cv_path_HOSTNAME -s"
+ if test -n "$HOSTNAME"; then
+ echo "$ac_t""$HOSTNAME" 1>&6
+ else
@@ -2865,30 +2865,7 @@
echo $ac_n "checking "how to check if pid exists"""... $ac_c" 1>&6
echo "configure:2867: checking "how to check if pid exists"" >&5