[arch-commits] Commit in os-prober/trunk (PKGBUILD os-prober-util-linux-2.24.patch)

[Timothy Redaelli]

    Date: Wednesday, October 1, 2014 @ 11:16:46
  Author: tredaelli
Revision: 119939

upgpkg: os-prober 1.58-3

FS#38487

Add a patch taken from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735169

Added:
  os-prober/trunk/os-prober-util-linux-2.24.patch
Modified:
  os-prober/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   24 +++++++++++----
 os-prober-util-linux-2.24.patch |   58 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-10-01 09:16:21 UTC (rev 119938)
+++ PKGBUILD	2014-10-01 09:16:46 UTC (rev 119939)
@@ -4,28 +4,38 @@
 
 pkgname=os-prober
 pkgver=1.58
-pkgrel=1
+pkgrel=3
 pkgdesc="Utility to detect other OSes on a set of drives"
 url="http://joey.kitenet.net/code/os-prober/"
 arch=('i686' 'x86_64')
 license=('GPL3')
 depends=('sh')
-source=(ftp://ftp.debian.org/debian/pool/main/o/${pkgname}/${pkgname}_${pkgver}.tar.gz)
-md5sums=('11406f47d9536bccb655456d6d92d111')
-sha256sums=('db1d936c0356e7a7c2dab5e9aebdf4132e745fd2972ba5016ed6690a0445ea93')
+source=(ftp://ftp.debian.org/debian/pool/main/o/${pkgname}/${pkgname}_${pkgver}.tar.gz
+	os-prober-util-linux-2.24.patch)
+md5sums=('11406f47d9536bccb655456d6d92d111'
+         'ce6218a8a0f791b617a79d29d097d7d8')
+sha256sums=('db1d936c0356e7a7c2dab5e9aebdf4132e745fd2972ba5016ed6690a0445ea93'
+            '5271a50ebeaea23b5f1e02a5d61b9a68c3b8f978f48cd8511cbec78773200e8e')
 
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
+prepare() {
+  cd "$pkgname-$pkgver"
 
+  patch -p1 -i "$srcdir"/os-prober-util-linux-2.24.patch
+
   # adjust lib dir to allow detection of 64-bit distros
   sed -i -e "s:/lib/ld\*\.so\*:/lib*/ld*.so*:g" os-probes/mounted/common/90linux-distro
 
   rm -f Makefile
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+
   make newns
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
   install -Dm755 linux-boot-prober "$pkgdir"/usr/bin/linux-boot-prober
   install -Dm755 os-prober "$pkgdir"/usr/bin/os-prober

Added: os-prober-util-linux-2.24.patch
===================================================================
--- os-prober-util-linux-2.24.patch	                        (rev 0)
+++ os-prober-util-linux-2.24.patch	2014-10-01 09:16:46 UTC (rev 119939)
@@ -0,0 +1,58 @@
+--- a/common.sh
++++ b/common.sh
+@@ -116,6 +116,29 @@ fs_type () {
+ 	fi
+ }
+ 
++is_dos_extended_partition() {
++	if type blkid >/dev/null 2>&1; then
++		local output
++
++		output="$(blkid -o export $1)"
++
++		# old blkid (util-linux << 2.24) errors out on extended p.
++		if [ "$?" = "2" ]; then
++			return 0
++		fi
++
++		# dos partition type and no filesystem type?...
++		if echo $output | grep -q ' PTTYPE=dos ' &&
++				! echo $output | grep -q ' TYPE='; then
++			return 0
++		else
++			return 1
++		fi
++	fi
++
++	return 1
++}
++
+ parse_proc_mounts () {
+ 	while read -r line; do
+ 		set -f
+--- a/linux-boot-probes/common/50mounted-tests
++++ b/linux-boot-probes/common/50mounted-tests
+@@ -20,6 +20,10 @@ elif [ "$types" = ntfs ]; then
+ 		types='ntfs-3g ntfs'
+ 	fi
+ elif [ -z "$types" ]; then
++	if is_dos_extended_partition "$partition"; then
++		debug "$1 looks like an extended dos partition; skipping"
++		exit 0
++	fi
+ 	if type cryptsetup >/dev/null 2>&1 && \
+ 	   cryptsetup luksDump "$partition" >/dev/null 2>&1; then
+ 		debug "$1 is a LUKS partition; skipping"
+--- a/os-probes/common/50mounted-tests
++++ b/os-probes/common/50mounted-tests
+@@ -20,6 +20,10 @@ elif [ "$types" = ntfs ]; then
+ 		types='ntfs-3g ntfs'
+ 	fi
+ elif [ -z "$types" ]; then
++	if is_dos_extended_partition "$partition"; then
++		debug "$1 looks like an extended dos partition; skipping"
++		exit 0
++	fi
+ 	if type cryptsetup >/dev/null 2>&1 && \
+ 	   cryptsetup luksDump "$partition" >/dev/null 2>&1; then
+ 		debug "$1 is a LUKS partition; skipping"