kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to vpopmail-5.3.30, fixing a critical update_rules bug.

Browse source 
Revamp a bit the creation of the MySQL credentials file.

PR:		59605
Submitted by:	Alex Dupre <sysadmin@alexdupre.com> (mostly)
Approved by:	portmgr (will)
This commit is contained in:
Peter Pentchev 2003-11-27 21:59:00 +00:00
parent 12831d9a03
commit a860f902fb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=94811
8 changed files with 92 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mail/vpopmail-devel/Makefile
View file

@ -6,8 +6,8 @@
#
PORTNAME= vpopmail
PORTVERSION= 5.3.29
PORTREVISION= 1
PORTVERSION= 5.3.30
PORTREVISION= 0
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -309,15 +309,12 @@ post-install:
${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp; \
fi; \
fi
if [ ! -e "${PREFIX}/vpopmail/etc/vlimits.default" ]; then \
${TOUCH} ${PREFIX}/vpopmail/etc/vlimits.default; \
fi
.if defined(DEFAULT_DOMAIN)
${ECHO_CMD} ${DEFAULT_DOMAIN} > ${PREFIX}/vpopmail/etc/defaultdomain
.endif
.if defined(WITH_MYSQL)
${ECHO_CMD} "${WITH_MYSQL_READ_SERVER}|0|${WITH_MYSQL_READ_USER}|${WITH_MYSQL_READ_PASSWD}|${WITH_MYSQL_DB}" \
> ${PREFIX}/vpopmail/etc/vpopmail.mysql
>> ${PREFIX}/vpopmail/etc/vpopmail.mysql
${ECHO_CMD} "${WITH_MYSQL_UPDATE_SERVER}|0|${WITH_MYSQL_UPDATE_USER}|${WITH_MYSQL_UPDATE_PASSWD}|${WITH_MYSQL_DB}" \
>> ${PREFIX}/vpopmail/etc/vpopmail.mysql
.endif

2
mail/vpopmail-devel/distinfo
View file

@ -1 +1 @@
MD5 (vpopmail-5.3.29.tar.gz) = 42904ce91d4b0398ae8f964d692f88af
MD5 (vpopmail-5.3.30.tar.gz) = 45a87b772bb158468c1c1039f8765965

47
mail/vpopmail-devel/files/patch-Makefile.in
View file

@ -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 @@
--- Makefile.in.old Thu Nov 27 11:26:31 2003
+++ Makefile.in Thu Nov 27 11:28:06 2003
@@ -43,10 +43,10 @@
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); \
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) ; \

5
mail/vpopmail-devel/pkg-plist
View file

@ -3,6 +3,7 @@ vpopmail/bin/vaddaliasdomain
vpopmail/bin/vadddomain
vpopmail/bin/vadduser
vpopmail/bin/valias
vpopmail/bin/vchangepw
vpopmail/bin/vchkpw
vpopmail/bin/vconvert
vpopmail/bin/vdeldomain
@ -40,6 +41,8 @@ vpopmail/doc/man_html/vsetuserquota.html
vpopmail/etc/inc_deps
vpopmail/etc/lib_deps
@unexec if [ -f %D/vpopmail/etc/tcp.smtp -a ! -s %D/vpopmail/etc/tcp.smtp ]; then rm -f %D/vpopmail/etc/tcp.smtp; fi
@unexec if cmp -s %D/vpopmail/etc/vlimits.default %D/vpopmail/etc/vlimits.default-dist; then rm -f %D/vpopmail/etc/vlimits.default; fi
vpopmail/etc/vlimits.default-dist
@unexec if [ -f %D/vpopmail/etc/vpopmail.mysql ]; then rm -f %D/vpopmail/etc/vpopmail.mysql; fi
vpopmail/include/config.h
vpopmail/include/vauth.h
@ -49,7 +52,7 @@ vpopmail/include/vpopmail_config.h
vpopmail/lib/libvpopmail.a
@dirrm vpopmail/lib
@dirrm vpopmail/include
@dirrm vpopmail/etc
@unexec rmdir %D/vpopmail/etc 2>/dev/null || true
@unexec rmdir %D/vpopmail/domains 2>/dev/null || true
@dirrm vpopmail/doc/man_html
@dirrm vpopmail/doc/doc_html

9
mail/vpopmail/Makefile
View file

@ -6,8 +6,8 @@
#
PORTNAME= vpopmail
PORTVERSION= 5.3.29
PORTREVISION= 1
PORTVERSION= 5.3.30
PORTREVISION= 0
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -309,15 +309,12 @@ post-install:
${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp; \
fi; \
fi
if [ ! -e "${PREFIX}/vpopmail/etc/vlimits.default" ]; then \
${TOUCH} ${PREFIX}/vpopmail/etc/vlimits.default; \
fi
.if defined(DEFAULT_DOMAIN)
${ECHO_CMD} ${DEFAULT_DOMAIN} > ${PREFIX}/vpopmail/etc/defaultdomain
.endif
.if defined(WITH_MYSQL)
${ECHO_CMD} "${WITH_MYSQL_READ_SERVER}|0|${WITH_MYSQL_READ_USER}|${WITH_MYSQL_READ_PASSWD}|${WITH_MYSQL_DB}" \
> ${PREFIX}/vpopmail/etc/vpopmail.mysql
>> ${PREFIX}/vpopmail/etc/vpopmail.mysql
${ECHO_CMD} "${WITH_MYSQL_UPDATE_SERVER}|0|${WITH_MYSQL_UPDATE_USER}|${WITH_MYSQL_UPDATE_PASSWD}|${WITH_MYSQL_DB}" \
>> ${PREFIX}/vpopmail/etc/vpopmail.mysql
.endif

2
mail/vpopmail/distinfo
View file

@ -1 +1 @@
MD5 (vpopmail-5.3.29.tar.gz) = 42904ce91d4b0398ae8f964d692f88af
MD5 (vpopmail-5.3.30.tar.gz) = 45a87b772bb158468c1c1039f8765965

47
mail/vpopmail/files/patch-Makefile.in
View file

@ -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 @@
--- Makefile.in.old Thu Nov 27 11:26:31 2003
+++ Makefile.in Thu Nov 27 11:28:06 2003
@@ -43,10 +43,10 @@
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); \
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) ; \

5
mail/vpopmail/pkg-plist
View file

@ -3,6 +3,7 @@ vpopmail/bin/vaddaliasdomain
vpopmail/bin/vadddomain
vpopmail/bin/vadduser
vpopmail/bin/valias
vpopmail/bin/vchangepw
vpopmail/bin/vchkpw
vpopmail/bin/vconvert
vpopmail/bin/vdeldomain
@ -40,6 +41,8 @@ vpopmail/doc/man_html/vsetuserquota.html
vpopmail/etc/inc_deps
vpopmail/etc/lib_deps
@unexec if [ -f %D/vpopmail/etc/tcp.smtp -a ! -s %D/vpopmail/etc/tcp.smtp ]; then rm -f %D/vpopmail/etc/tcp.smtp; fi
@unexec if cmp -s %D/vpopmail/etc/vlimits.default %D/vpopmail/etc/vlimits.default-dist; then rm -f %D/vpopmail/etc/vlimits.default; fi
vpopmail/etc/vlimits.default-dist
@unexec if [ -f %D/vpopmail/etc/vpopmail.mysql ]; then rm -f %D/vpopmail/etc/vpopmail.mysql; fi
vpopmail/include/config.h
vpopmail/include/vauth.h
@ -49,7 +52,7 @@ vpopmail/include/vpopmail_config.h
vpopmail/lib/libvpopmail.a
@dirrm vpopmail/lib
@dirrm vpopmail/include
@dirrm vpopmail/etc
@unexec rmdir %D/vpopmail/etc 2>/dev/null || true
@unexec rmdir %D/vpopmail/domains 2>/dev/null || true
@dirrm vpopmail/doc/man_html
@dirrm vpopmail/doc/doc_html