diff options
| author | Peter Pentchev <roam@FreeBSD.org> | 2003-11-27 21:59:00 +0000 |
|---|---|---|
| committer | Peter Pentchev <roam@FreeBSD.org> | 2003-11-27 21:59:00 +0000 |
| commit | a860f902fba494095629f726d86b423886b69b2b (patch) | |
| tree | 167a19fadc91946e2151017885ce94643ca27b14 /mail/vpopmail/files | |
| parent | 12831d9a039e21065ced6a27ae6c49fef641cdd2 (diff) | |
Update to vpopmail-5.3.30, fixing a critical update_rules bug.
Revamp a bit the creation of the MySQL credentials file.
PR: 59605
Submitted by: Alex Dupre <sysadmin@alexdupre.com> (mostly)
Approved by: portmgr (will)
Notes
Notes:
svn path=/head/; revision=94811
Diffstat (limited to 'mail/vpopmail/files')
| -rw-r--r-- | mail/vpopmail/files/patch-Makefile.in | 49 |
1 files changed, 39 insertions, 10 deletions
diff --git a/mail/vpopmail/files/patch-Makefile.in b/mail/vpopmail/files/patch-Makefile.in index 52cd7794c969..05603c4b036b 100644 --- a/mail/vpopmail/files/patch-Makefile.in +++ b/mail/vpopmail/files/patch-Makefile.in @@ -1,14 +1,43 @@ ---- Makefile.in.orig Thu Sep 4 23:45:08 2003 -+++ Makefile.in Thu Sep 4 23:46:17 2003 -@@ -705,10 +705,7 @@ - - if test "@USE_MYSQL@" = "1"; then \ - if test ! -r $(MYSQLCONF); then \ -- echo "# MySQL settings, line 1 is config for read-only," > $(MYSQLCONF); \ -- echo "# line 2 is config for update. Settings for each" >> $(MYSQLCONF); \ -- echo "# line: server|port|user|password|database" >> $(MYSQLCONF); \ +--- Makefile.in.old Thu Nov 27 11:26:31 2003 ++++ Makefile.in Thu Nov 27 11:28:06 2003 +@@ -43,10 +43,10 @@ + + top_builddir = . + +-ACLOCAL = @ACLOCAL@ +-AUTOCONF = @AUTOCONF@ +-AUTOMAKE = @AUTOMAKE@ +-AUTOHEADER = @AUTOHEADER@ ++ACLOCAL = /usr/bin/true ++AUTOCONF = /usr/bin/true ++AUTOMAKE = /usr/bin/true ++AUTOHEADER = /usr/bin/true + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +@@ -723,6 +723,8 @@ + echo "-I@vpopmaildir@/include" > @vpopmaildir@/etc/inc_deps + echo "-L@vpopmaildir@/lib -lvpopmail @auth_libs@ @LIBS@" > @vpopmaildir@/etc/lib_deps + ++ $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \ ++ vlimits.default $(VLIMITS)-dist; \ + if test ! -r $(VLIMITS); then \ + $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \ + vlimits.default $(VLIMITS); \ +@@ -740,12 +742,15 @@ + echo "# settings for each line:" >> $(MYSQLCONF); \ + echo "# host|port|user|password|database" >> $(MYSQLCONF); \ + echo "#" >> $(MYSQLCONF); \ - echo "localhost|0|root|secret|vpopmail" >> $(MYSQLCONF); \ -+ touch $(MYSQLCONF); \ + echo "#" >> $(MYSQLCONF); \ + echo "# Note:" >> $(MYSQLCONF); \ + echo "# The value of host may be either a hostname or an IP address." >> $(MYSQLCONF); \ + echo "# If host is 'localhost', then sockets (Unix) or named pipes (Windows)" >> $(MYSQLCONF); \ + echo "# will be used instead of TCP/IP to connect to the server." >> $(MYSQLCONF); \ ++ fi ; \ ++ chown @vpopuser@ $(MYSQLCONF) ; \ ++ chgrp @vpopgroup@ $(MYSQLCONF) ; \ ++ chmod 0600 $(MYSQLCONF) ; \ fi ; \ chown @vpopuser@ $(MYSQLCONF) ; \ chgrp @vpopgroup@ $(MYSQLCONF) ; \ |