- Update to 1.4.11.

  It fixes XML-RPC security issue.

PR:		ports/85020
Submitted by:	maintainer
Approved by:	portmgr (clement)

3 files changed, 37 insertions, 31 deletions

diff --git a/www/phpmyfaq/Makefile b/www/phpmyfaq/Makefile
index 7447afbc50f..4c0811cea07 100644
--- a/www/phpmyfaq/Makefile
+++ b/www/phpmyfaq/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	phpmyfaq
-PORTVERSION=	1.4.9
+PORTVERSION=	1.4.11
 CATEGORIES=	www
 MASTER_SITES=	http://www.phpmyfaq.de/download/
 DISTNAME=	${PORTNAME}.${PORTVERSION}.full
@@ -15,8 +15,6 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	A multilingual, completely database-driven FAQ-system
 
-FORBIDDEN=	http://vuxml.FreeBSD.org/e65ad1bf-0d8b-11da-90d0-00304823c0d3.html
-
 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}
 USE_ZIP=	YES
 
@@ -26,51 +24,59 @@ NO_BUILD=	YES
 WANT_PHP_WEB=	YES
 
 pre-fetch:
-.if !defined(PHPMYFAQ_DIR)
+.if !defined(PHPMYFAQ_URL)
 	 @${ECHO_MSG} ""
-	 @${ECHO_MSG} "Define PHPMYFAQ_DIR to override default of '${PHPMYFAQ_DIR}'."
+	 @${ECHO_MSG} "Define PHPMYFAQ_URL to override default of ${PREFIX}/${WWWDOCROOT}/'${PHPMYFAQ_URL}'."
 	 @${ECHO_MSG} ""
 .endif
 
+
+# Get HOSTNAME
+.if exists(/sbin/sysctl)
+HOSTNAME!=	/sbin/sysctl -n kern.hostname
+.else
+HOSTNAME!=	/usr/sbin/sysctl -n kern.hostname
+.endif
+
 WWWDOCROOT?=	www/data
 PHPMYFAQ_URL?=	faq
 WWWOWN?=	www
 WWWGRP?=	www
-PHPMYFAQ_DIR?=	${WWWDOCROOT}/${PHPMYFAQ_URL}
+PHPMYFAQ_URL?=	${WWWDOCROOT}/${PHPMYFAQ_URL}
 PLIST=		${WRKDIR}/pkg-plist
 
 .include <bsd.port.pre.mk>
 
 pre-install:
 	cd ${WRKSRC} && ${FIND} -s . -type f | \
-		${SED} -e 's|^./||;s|^|${PHPMYFAQ_DIR}/|' > ${PLIST} \
+		${SED} -e 's|^./||;s|^|${PHPMYFAQ_URL}/|' > ${PLIST} \
 		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm ${PHPMYFAQ_DIR}/|' >> ${PLIST} \
-		&& ${ECHO_CMD} @dirrm ${PHPMYFAQ_DIR}/attachments/ >> ${PLIST} \
-		&& ${ECHO_CMD} @dirrm ${PHPMYFAQ_DIR}/data/ >> ${PLIST} \
-		&& ${ECHO_CMD} @dirrm ${PHPMYFAQ_DIR}/pdf/ >> ${PLIST} \
-		&& ${ECHO_CMD} @dirrm ${PHPMYFAQ_DIR} >> ${PLIST}
+		${SED} -e 's|^|@dirrm ${PHPMYFAQ_URL}/|' >> ${PLIST} \
+		&& ${ECHO_CMD} @dirrm ${PHPMYFAQ_URL}/attachments/ >> ${PLIST} \
+		&& ${ECHO_CMD} @dirrm ${PHPMYFAQ_URL}/data/ >> ${PLIST} \
+		&& ${ECHO_CMD} @dirrm ${PHPMYFAQ_URL}/pdf/ >> ${PLIST} \
+		&& ${ECHO_CMD} @dirrm ${PHPMYFAQ_URL} >> ${PLIST}
 
 do-install:
 	# Data files
-	-${MKDIR} ${PREFIX}/${PHPMYFAQ_DIR}
-	@${CHMOD} 755 ${PREFIX}/${PHPMYFAQ_DIR}
-	@${CP} -R ${WRKSRC}/ ${PREFIX}/${PHPMYFAQ_DIR}
-	@${MKDIR} ${PREFIX}/${PHPMYFAQ_DIR}/attachments/
-	@${MKDIR} ${PREFIX}/${PHPMYFAQ_DIR}/data/
-	@${MKDIR} ${PREFIX}/${PHPMYFAQ_DIR}/pdf/
+	-${MKDIR} ${PREFIX}/${PHPMYFAQ_URL}
+	@${CHMOD} 755 ${PREFIX}/${PHPMYFAQ_URL}
+	@${CP} -R ${WRKSRC}/ ${PREFIX}/${PHPMYFAQ_URL}
+	@${MKDIR} ${PREFIX}/${PHPMYFAQ_URL}/attachments/
+	@${MKDIR} ${PREFIX}/${PHPMYFAQ_URL}/data/
+	@${MKDIR} ${PREFIX}/${PHPMYFAQ_URL}/pdf/
 	# set the correct permissions
-	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQ_DIR}/inc/
-	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQ_DIR}/attachments/
-	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQ_DIR}/data/
-	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQ_DIR}/images/
-	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQ_DIR}/pdf/
-	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQ_DIR}/xml/
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${PHPMYFAQ_DIR}
+	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQ_URL}/inc/
+	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQ_URL}/attachments/
+	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQ_URL}/data/
+	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQ_URL}/images/
+	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQ_URL}/pdf/
+	@${CHMOD} 777 ${PREFIX}/${PHPMYFAQ_URL}/xml/
+	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${PHPMYFAQ_URL}
 
 post-install:
 	@${SED} \
-	 -e 's|%%PHPMYFAQ_URL%%|${PHPMYFAQ_URL}|' \
-	 -e 's|%%PHPMYFAQ_DIR%%|${PREFIX}/${PHPMYFAQ_DIR}|' ${PKGMESSAGE}
+	 -e 's|%%HOSTNAME%%|${HOSTNAME}|' \
+	 -e 's|%%PHPMYFAQ_URL%%|${PREFIX}/${PHPMYFAQ_URL}|' ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/www/phpmyfaq/distinfo b/www/phpmyfaq/distinfo
index 12e743c07c1..3a499219b63 100644
--- a/www/phpmyfaq/distinfo
+++ b/www/phpmyfaq/distinfo
@@ -1,2 +1,2 @@
-MD5 (phpmyfaq.1.4.9.full.zip) = 1d383a35f2df8b9d7edd2359ca738694
-SIZE (phpmyfaq.1.4.9.full.zip) = 730758
+MD5 (phpmyfaq.1.4.11.full.zip) = 7ffd3a088e072df812cdd4f904d4b32a
+SIZE (phpmyfaq.1.4.11.full.zip) = 727145
diff --git a/www/phpmyfaq/pkg-message b/www/phpmyfaq/pkg-message
index b94ecaada5d..2317fce5b7a 100644
--- a/www/phpmyfaq/pkg-message
+++ b/www/phpmyfaq/pkg-message
@@ -7,8 +7,8 @@
   database access method.
 
   To configure phpMyFAQ point your browser to
-	http://localhost/%%PHPMYFAQ_URL%%/install/installer.php
-	http://localhost/%%PHPMYFAQ_URL%%/admin/index.php
+	http://%%HOSTNAME%%/%%PHPMYFAQ_URL%%/install/installer.php
+	http://%%HOSTNAME%%/%%PHPMYFAQ_URL%%/admin/index.php
 
   Use the username admin and your selected password 
   for your first login into the admin section.