Date: Wed, 7 Mar 2007 17:50:09 GMT From: Matthew Seaman <m.seaman@infracaninophile.co.uk> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/109765: [maintainer] databases/phpmyadmin security update to 2.10.0.2 Message-ID: <200703071750.l27Ho9fP011462@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/109765; it has been noted by GNATS.
From: Matthew Seaman <m.seaman@infracaninophile.co.uk>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:
Subject: Re: ports/109765: [maintainer] databases/phpmyadmin security
update to 2.10.0.2
Date: Wed, 7 Mar 2007 17:45:21 +0000
--xHFwDpU9dbj6ez1V
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Tue, Mar 06, 2007 at 09:08:49PM +0100, Thierry Thomas wrote:
>=20
> To fix the problem: if you think that this directory is needed, then
> touch ${PREFIX}/www/phpMyAdmin/libraries/compat/.keepme
> during post-install, else just rmdir it, and adapt the plist
> accordingly.
Yes, I see the problem now. That's rather annoying behaviour from the
pkg tools. Updated patch included:
Cheers,
Matthew
diff -Nur /usr/ports/databases/phpmyadmin/Makefile phpmyadmin/Makefile
--- /usr/ports/databases/phpmyadmin/Makefile Fri Mar 2 19:18:40 2007
+++ phpmyadmin/Makefile Wed Mar 7 17:41:07 2007
@@ -6,8 +6,7 @@
#
=20
PORTNAME=3D phpMyAdmin
-DISTVERSION=3D 2.10.0.1
-PORTREVISION=3D 1
+DISTVERSION=3D 2.10.0.2
CATEGORIES=3D databases www
MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=3D phpmyadmin
@@ -111,7 +110,14 @@
${ECHO_MSG} "databases/phpmyadmin"
${ECHO_MSG} ""
=20
+# When creating a package, empty directories will not be generated
+# from the pkg tarball. Therefore make sure no directories are empty.
+
post-patch:
+ cd ${WRKSRC} ; \
+ for emptydir in $$( ${FIND} . -type d -empty -print ) ; do \
+ ${TOUCH} $${emptydir}/.keep-me ; \
+ done
${CP} ${FILESDIR}/${CFGFILE}.sample ${WRKSRC}/${CFGFILE}.sample
cd ${WRKSRC} ; \
${FIND} . ! -type d ! -name ${CFGFILE}.sample | ${SORT} | \
diff -Nur /usr/ports/databases/phpmyadmin/distinfo phpmyadmin/distinfo
--- /usr/ports/databases/phpmyadmin/distinfo Thu Mar 1 17:34:55 2007
+++ phpmyadmin/distinfo Fri Mar 2 19:28:52 2007
@@ -1,3 +1,3 @@
-MD5 (phpMyAdmin-2.10.0.1-all-languages.tar.bz2) =3D 0f23d25a64ce0547bdfb05=
dee748760b
-SHA256 (phpMyAdmin-2.10.0.1-all-languages.tar.bz2) =3D c5628fff652947811ef=
a91e3d8e13be02a28a9c300a30da112f86ca94ecc5c7f
-SIZE (phpMyAdmin-2.10.0.1-all-languages.tar.bz2) =3D 3019979
+MD5 (phpMyAdmin-2.10.0.2-all-languages.tar.bz2) =3D 2aa1abcdacc93a6ccdea14=
9d8c74aa9c
+SHA256 (phpMyAdmin-2.10.0.2-all-languages.tar.bz2) =3D 4b9949d9a79973de663=
a0ff526b0a567f7d496c31a5371e4f9eeaa97c599e9a6
+SIZE (phpMyAdmin-2.10.0.2-all-languages.tar.bz2) =3D 3020505
--=20
Dr Matthew J Seaman MA, D.Phil. 7 Priory Courtyard
Flat 3
PGP: http://www.infracaninophile.co.uk/pgpkey Ramsgate
Kent, CT11 9PW
--xHFwDpU9dbj6ez1V
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (FreeBSD)
iD8DBQFF7vox8Mjk52CukIwRAiriAKCEp8DGenu6MiHzKbkYJwbvTR5m+wCfX1DP
53qz+yAzDRm8lOFomYD0Ud4=
=cZh8
-----END PGP SIGNATURE-----
--xHFwDpU9dbj6ez1V--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703071750.l27Ho9fP011462>