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

[Timothy Redaelli]

    Date: Monday, November 2, 2015 @ 17:20:04
  Author: tredaelli
Revision: 145678

upgpkg: os-prober 1.70-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-02 16:13:01 UTC (rev 145677)
+++ PKGBUILD	2015-11-02 16:20:04 UTC (rev 145678)
@@ -3,7 +3,7 @@
 # Contributor: darkcoder <mario_vazq at hotmail.com>
 
 pkgname=os-prober
-pkgver=1.66
+pkgver=1.70
 pkgrel=1
 pkgdesc="Utility to detect other OSes on a set of drives"
 url="http://joey.kitenet.net/code/os-prober/"
@@ -10,18 +10,13 @@
 arch=('i686' 'x86_64')
 license=('GPL3')
 depends=('sh')
-source=(ftp://ftp.debian.org/debian/pool/main/o/${pkgname}/${pkgname}_${pkgver}.tar.xz
-	os-prober-util-linux-2.24.patch)
-md5sums=('7ac4903d4aa114cd4709152f604dd0ea'
-         'ce6218a8a0f791b617a79d29d097d7d8')
-sha256sums=('ab66eab63223d651cb6f9221ddffc958521b13edee4996c4fd87f08cb1955057'
-            '5271a50ebeaea23b5f1e02a5d61b9a68c3b8f978f48cd8511cbec78773200e8e')
+source=(ftp://ftp.debian.org/debian/pool/main/o/${pkgname}/${pkgname}_${pkgver}.tar.xz)
+md5sums=('c1cfdd90dc958f12b932ccc8d64051e1')
+sha256sums=('f95a8998e106578edf105c42c84809c71e413a01370be9bd0b6d238d5b63bf1d')
 
 prepare() {
-  cd "$pkgname"
+  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
 
@@ -29,13 +24,13 @@
 }
 
 build() {
-  cd "$pkgname"
+  cd "$pkgname-$pkgver"
 
   make newns
 }
 
 package() {
-  cd "$pkgname"
+  cd "$pkgname-$pkgver"
 
   install -Dm755 linux-boot-prober "$pkgdir"/usr/bin/linux-boot-prober
   install -Dm755 os-prober "$pkgdir"/usr/bin/os-prober

Deleted: os-prober-util-linux-2.24.patch
===================================================================
--- os-prober-util-linux-2.24.patch	2015-11-02 16:13:01 UTC (rev 145677)
+++ os-prober-util-linux-2.24.patch	2015-11-02 16:20:04 UTC (rev 145678)
@@ -1,58 +0,0 @@
---- 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"