Date: Wed, 6 Jan 2016 16:31:47 +0100
From: Roland Kammerer <roland.kammerer@linbit.com>
To: alpine-aports@lists.alpinelinux.org
Subject: Re: [alpine-aports] [PATCH] testing/drbd9-grsec: fix prepare logic
Message-ID: <20160106153146.GQ2985@rck.sh>
References: <1452014736-21355-1-git-send-email-roland.kammerer@linbit.com>
 <20160106140906.6944fe93@ncopa-desktop.alpinelinux.org>
Precedence: list
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="MGYHOYXEY6WxJCY8"
Content-Disposition: inline
In-Reply-To: <20160106140906.6944fe93@ncopa-desktop.alpinelinux.org>
User-Agent: Mutt/1.5.23 (2014-03-12)


--MGYHOYXEY6WxJCY8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Wed, Jan 06, 2016 at 02:09:06PM +0100, Natanael Copa wrote:
> On Tue,  5 Jan 2016 18:25:36 +0100
> Roland Kammerer <roland.kammerer@linbit.com> wrote:
> 
> > - We have to add additional ".." to the path we want to check. $PWD is
> > already $srcdir. This bug was the only reason that it did not trigger
> > futher bugs in the "true" case.
> > - If we don't find an APKBUILD for the kernel flavor, error out
> > - We are in a sub-shell, we do not have to protect $pkgname
> > - We have to add "return 0", otherwise in the positive case where the
> > last check succeeds, it sets the sub-shell return value to 1, which
> > then triggers the failure path.
> > ---
> >  testing/drbd9-grsec/APKBUILD | 9 +++++----
> >  1 file changed, 5 insertions(+), 4 deletions(-)
> > 
> > diff --git a/testing/drbd9-grsec/APKBUILD b/testing/drbd9-grsec/APKBUILD
> > index b9922c0..258163c 100644
> > --- a/testing/drbd9-grsec/APKBUILD
> > +++ b/testing/drbd9-grsec/APKBUILD
> > @@ -33,14 +33,15 @@ _builddir=$srcdir/$_usname-$_usver
> >  prepare() {
> >  	local i
> >  	# verify the kernel version
> > -	(if [ -f ../../main/linux-${_flavor}/APKBUILD ]; then
> > -		_name=$pkgname
> > -		. ../../main/linux-${_flavor}/APKBUILD
> > -		pkgname=$_name
> > +	(if [ -f ../../../main/linux-${_flavor}/APKBUILD ]; then
> > +		. ../../../main/linux-${_flavor}/APKBUILD
> 
> I think we want a "cd $startdir" instead
> 
> >  		[ "$_kver" != "$pkgver" ] \
> >  			&& die "please update _kver to $pkgver"
> >  		[ "$_kpkgrel" != "$pkgrel" ] \
> >  			&& die "please update _kpkgrel to $pkgrel"
> > +		return 0
> > +	else
> > +		die "could not determine kernel flavor: linux-${_flavor}"
> >  	fi) || return 1
> >  
> 
> maybe move the return 0 til right before the closing )?

Both changes makes sense to me, new patch attached.

Regards, rck

--MGYHOYXEY6WxJCY8
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0001-testing-drbd9-grsec-fix-prepare-logic.patch"

>From 8f1a47632d467a7e56c5e270ca9d62157681a587 Mon Sep 17 00:00:00 2001
From: Roland Kammerer <roland.kammerer@linbit.com>
Date: Wed, 6 Jan 2016 16:10:34 +0100
Subject: [PATCH] testing/drbd9-grsec: fix prepare logic

- $PWD is already at $srcdir => first cd to $startdir.
- If we don't find an APKBUILD for the kernel flavor, error out.
- We are in a sub-shell, we do not have to protect $pkgname.
- Return 0 in case we did not "die", otherwise in the positive case
  where the last check succeeds, it sets the sub-shell return value
  to 1, which then triggers the failure path.
---
 testing/drbd9-grsec/APKBUILD | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/testing/drbd9-grsec/APKBUILD b/testing/drbd9-grsec/APKBUILD
index b9922c0..6cf50f9 100644
--- a/testing/drbd9-grsec/APKBUILD
+++ b/testing/drbd9-grsec/APKBUILD
@@ -9,7 +9,7 @@ _kver=4.1.15
 _kpkgrel=2
 
 _usver=9.0.0
-_mypkgrel=0
+_mypkgrel=1
 
 _kernelver=$_kver-r$_kpkgrel
 _abi_release=${_kver}-${_kpkgrel}-${_flavor}
@@ -33,15 +33,17 @@ _builddir=$srcdir/$_usname-$_usver
 prepare() {
 	local i
 	# verify the kernel version
-	(if [ -f ../../main/linux-${_flavor}/APKBUILD ]; then
-		_name=$pkgname
+	(cd $startdir
+	if [ -f ../../main/linux-${_flavor}/APKBUILD ]; then
 		. ../../main/linux-${_flavor}/APKBUILD
-		pkgname=$_name
 		[ "$_kver" != "$pkgver" ] \
 			&& die "please update _kver to $pkgver"
 		[ "$_kpkgrel" != "$pkgrel" ] \
 			&& die "please update _kpkgrel to $pkgrel"
-	fi) || return 1
+	else
+		die "could not determine kernel flavor: linux-${_flavor}"
+	fi
+	return 0) || return 1
 
 
 	cd "$_builddir"
-- 
2.6.4


--MGYHOYXEY6WxJCY8--


---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---