[Bug 197955] lang/php5 2015Q1 branch still unpatched

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197955

--- Comment #2 from Fabiano Sidler <fabianosidler at swissonline.ch> ---
Well, this would be the diff. Can anyone patch, now that it is even in the
vuln.xml file?

Index: distinfo
===================================================================
--- distinfo    (.../branches/2015Q1/lang/php5)    (revision 380152)
+++ distinfo    (.../head/lang/php5)    (revision 380152)
@@ -1,4 +1,4 @@
-SHA256 (php-5.4.36.tar.bz2) =
b0951608c3e8afb978a624c7f79a889980210f5258f666c1d997bd6491e13241
-SIZE (php-5.4.36.tar.bz2) = 11892431
+SHA256 (php-5.4.38.tar.bz2) =
abf37db0cfadc9bb814f9df35f6aa966ad63f4f4c4475e432ec625568a5d3e88
+SIZE (php-5.4.38.tar.bz2) = 12273298
 SHA256 (php-5.4.x-mail-header.patch) =
005ae1cd8ed17c72d7b09dee9c4466e8b16d4ecba7fe11276731ed6ff9fbb344
 SIZE (php-5.4.x-mail-header.patch) = 3379
Index: Makefile.ext
===================================================================
--- Makefile.ext    (.../branches/2015Q1/lang/php5)    (revision 380152)
+++ Makefile.ext    (.../head/lang/php5)    (revision 380152)
@@ -132,17 +132,16 @@
 .endif

 .if ${PHP_MODNAME} == "imap"
-LIB_DEPENDS+=    libc-client4.so:${PORTSDIR}/mail/cclient
+OPTIONS_DEFINE=    PANDA
+PANDA_DESC=    Uses the forked panda-cclient instead of the original cclient

 CONFIGURE_ARGS+=--with-imap=${LOCALBASE} \
-        --with-pcre-dir=${LOCALBASE}
-.if !defined(WITHOUT_SSL)
-CONFIGURE_ARGS+=--with-imap-ssl=${OPENSSLBASE}
+        --with-pcre-dir=${LOCALBASE} \
+        --with-imap-ssl=${OPENSSLBASE}

 LDFLAGS+=    -L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=    yes
 .endif
-.endif

 .if ${PHP_MODNAME} == "interbase"
 CONFIGURE_ARGS+=--with-interbase=${LOCALBASE}
@@ -524,6 +523,14 @@
 .    endif
 .endif

+.if ${PHP_MODNAME} == "imap"
+.    if ${PORT_OPTIONS:MPANDA}
+LIB_DEPENDS+=    libc-client4.so.10:${PORTSDIR}/mail/panda-cclient
+.    else
+LIB_DEPENDS+=    libc-client4.so.9:${PORTSDIR}/mail/cclient
+.    endif
+.endif
+
 .if ${PHP_MODNAME} == "mbstring"
 .    if ${PORT_OPTIONS:MREGEX}
 LIB_DEPENDS+=    libonig.so:${PORTSDIR}/devel/oniguruma4
Index: Makefile
===================================================================
--- Makefile    (.../branches/2015Q1/lang/php5)    (revision 380152)
+++ Makefile    (.../head/lang/php5)    (revision 380152)
@@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=    php5
-PORTVERSION=    5.4.36
+PORTVERSION=    5.4.38
 PORTREVISION?=    0
 CATEGORIES?=    lang devel www
 MASTER_SITES=    ${MASTER_SITE_PHP}

-- 
You are receiving this mail because:
You are the assignee for the bug.