X-Original-To: alpine-devel@lists.alpinelinux.org Delivered-To: alpine-devel@mail.alpinelinux.org Received: from smtp-2.adminflex.de (smtp-2.adminflex.de [84.38.79.76]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 0AF5DDC0108 for ; Thu, 31 Oct 2013 15:59:45 +0000 (UTC) Received: from 91-66-231-240-dynip.superkabel.de ([91.66.231.240] helo=[192.168.178.35]) by smtp-2.adminflex.de with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1Vbuet-0006kW-Br for alpine-devel@lists.alpinelinux.org; Thu, 31 Oct 2013 15:59:43 +0000 Message-ID: <52727E6B.5020706@port-zero.com> Date: Thu, 31 Oct 2013 16:59:39 +0100 From: "Leslie P. Polzer | PORT ZERO" User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.0.1 X-Mailinglist: alpine-devel Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 To: alpine-devel@lists.alpinelinux.org Subject: [alpine-devel] main/phpmyadmin: fix deps and permissions Content-Type: multipart/mixed; boundary="------------020605010706060100000009" This is a multi-part message in MIME format. --------------020605010706060100000009 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Patch attached. Leslie --=20 Dipl.Ing.(BA) Leslie P. Polzer | CTO - PORT ZERO UG (haftungsbeschr=E4nkt) Softwareentwicklung & IT Engineering Adalbertstra=DFe 7/8 10999 Berlin Tel.: +49 (0)30 - 69 200 907 - 0 Fax: +49 (0)30 - 69 200 907 - 9 http://www.port-zero.com --------------020605010706060100000009 Content-Type: text/x-patch; name="0001-main-phpmyadmin-fix-permissions-and-runtime-dependen.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-main-phpmyadmin-fix-permissions-and-runtime-dependen.pa"; filename*1="tch" >From adf22a1bfdb1bafc85a7bbb718082f559411db25 Mon Sep 17 00:00:00 2001 From: "Leslie P. Polzer" Date: Thu, 31 Oct 2013 16:58:04 +0100 Subject: [PATCH] main/phpmyadmin: fix permissions and runtime dependencies. --- main/phpmyadmin/APKBUILD | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/main/phpmyadmin/APKBUILD b/main/phpmyadmin/APKBUILD index a3a7cbd..5c3c327 100644 --- a/main/phpmyadmin/APKBUILD +++ b/main/phpmyadmin/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: Matt Smith pkgname=phpmyadmin pkgver=4.0.8 -pkgrel=1 +pkgrel=2 pkgdesc="A Web-based PHP tool for administering MySQL" url="http://www.phpmyadmin.net/" arch="noarch" license="GPL" -depends="php php-mysql php-zip php-zlib php-bz2 php-ctype php-gd php-mcrypt" +depends="php php-mysqli php-zip php-zlib php-bz2 php-ctype php-gd php-mcrypt php-json" depends_dev= makedepends="$depends_dev" install="$pkgname.post-install" @@ -39,7 +39,7 @@ package() { || return 1 # copy phpmyadmin - cp -ra "$_builddir"/* "$pkgdir"/usr/share/webapps/$pkgname/ \ + cp -r "$_builddir"/* "$pkgdir"/usr/share/webapps/$pkgname/ \ || return 1 # install the sample config @@ -47,7 +47,7 @@ package() { "$pkgdir"/usr/share/webapps/$pkgname/config.sample.inc.php \ "$pkgdir"/etc/$pkgname/config.inc.php \ || return 1 - ln -fs /etc/$pkgname/config.inc.php \ + ln -sf /etc/$pkgname/config.inc.php \ "$pkgdir"/usr/share/webapps/$pkgname/config.inc.php \ || return 1 @@ -59,6 +59,8 @@ package() { mkdir -p "$pkgdir"/usr/share/$pkgname/ || return 1 mv "$pkgdir"/usr/share/webapps/$pkgname/config.sample.inc.php \ "$pkgdir"/usr/share/$pkgname/ || return 1 + + chown -R 0:0 "$pkgdir" } doc() { -- 1.8.4.2 --------------020605010706060100000009-- --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---