udisk depent

sys/apps/gptfdisk/popt-1.19-follow-up.patch

@@ -0,0 +1,37 @@
+From f5de3401b974ce103ffd93af8f9d43505a04aaf9 Mon Sep 17 00:00:00 2001
+From: Damian Kurek <starfire24680@gmail.com>
+Date: Thu, 7 Jul 2022 03:39:16 +0000
+Subject: [PATCH] Fix NULL dereference when duplicating string argument
+
+poptGetArg can return NULL if there are no additional arguments, which
+makes strdup dereference NULL on strlen
+---
+ gptcl.cc | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/gptcl.cc b/gptcl.cc
+index 0d578eb..ab95239 100644
+--- a/gptcl.cc
++++ b/gptcl.cc
+@@ -155,10 +155,11 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) {
+    } // while
+ 
+    // Assume first non-option argument is the device filename....
+-   device = strdup((char*) poptGetArg(poptCon));
+-   poptResetContext(poptCon);
++   device = (char*) poptGetArg(poptCon);
+ 
+    if (device != NULL) {
++      device = strdup(device);
++      poptResetContext(poptCon);
+       JustLooking(); // reset as necessary
+       BeQuiet(); // Tell called functions to be less verbose & interactive
+       if (LoadPartitions((string) device)) {
+@@ -498,6 +499,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) {
+          cerr << "Error encountered; not saving changes.\n";
+          retval = 4;
+       } // if
++      free(device);
+    } // if (device != NULL)
+    poptFreeContext(poptCon);
+    return retval;

sys/apps/gptfdisk/popt-1.19.patch

@@ -0,0 +1,37 @@
+From 5d5e76d369a412bfb3d2cebb5fc0a7509cef878d Mon Sep 17 00:00:00 2001
+From: Rod Smith <rodsmith@rodsbooks.com>
+Date: Fri, 15 Apr 2022 18:10:14 -0400
+Subject: [PATCH] Fix failure & crash of sgdisk when compiled with latest popt
+ (commit 740; presumably eventually release 1.19)
+
+---
+ gptcl.cc  | 2 +-
+ support.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gptcl.cc b/gptcl.cc
+index 34c9421..0d578eb 100644
+--- a/gptcl.cc
++++ b/gptcl.cc
+@@ -155,7 +155,7 @@ int GPTDataCL::DoOptions(int argc, char* argv[]) {
+    } // while
+ 
+    // Assume first non-option argument is the device filename....
+-   device = (char*) poptGetArg(poptCon);
++   device = strdup((char*) poptGetArg(poptCon));
+    poptResetContext(poptCon);
+ 
+    if (device != NULL) {
+diff --git a/support.h b/support.h
+index 8ba9ad1..f91f1bc 100644
+--- a/support.h
++++ b/support.h
+@@ -8,7 +8,7 @@
+ #include <stdlib.h>
+ #include <string>
+ 
+-#define GPTFDISK_VERSION "1.0.9"
++#define GPTFDISK_VERSION "1.0.9.1"
+ 
+ #if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__)
+ // Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64

sys/apps/gptfdisk/util-linux-2.38.patch

@@ -0,0 +1,22 @@
+From 6a8416cbd12d55f882bb751993b94f72d338d96f Mon Sep 17 00:00:00 2001
+From: Rod Smith <rodsmith@rodsbooks.com>
+Date: Sat, 16 Apr 2022 09:32:04 -0400
+Subject: [PATCH] Updated guid.cc to deal with minor change in libuuid
+
+---
+ guid.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/guid.cc b/guid.cc
+index 1e73ab7..d3e4fd5 100644
+--- a/guid.cc
++++ b/guid.cc
+@@ -141,7 +141,7 @@ void GUIDData::Zero(void) {
+ void GUIDData::Randomize(void) {
+    int i, uuidGenerated = 0;
+ 
+-#ifdef _UUID_UUID_H
++#if defined (_UUID_UUID_H) || defined (_UL_LIBUUID_UUID_H)
+    uuid_generate(uuidData);
+    ReverseBytes(&uuidData[0], 4);
+    ReverseBytes(&uuidData[4], 2);

sys/apps/gptfdisk/ympbuild

@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+name='gptfdisk'
+release='1'
+version='1.0.9'
+url='https://www.rodsbooks.com/gdisk/'
+description='GPT partition table manipulator for Linux'
+email='bayramk@gmail.com'
+maintainer='bk'
+license=('GPLv3')
+source=("https://www.rodsbooks.com/gdisk/gptfdisk-$version.tar.gz"
+	"popt-1.19.patch"
+        "popt-1.19-follow-up.patch"
+        "util-linux-2.38.patch"
+)
+depends=(popt)
+makedepends=()
+md5sums=('01c11ecfa454096543562e3068530e01'
+'SKIP'
+'SKIP'
+'SKIP'
+)
+group=(sys.apps)
+uses=()
+arch=('x86_64')
+
+cd $name-$version
+prepare() {
+  patch -Np1 -i ../popt-1.19.patch
+  patch -Np1 -i ../util-linux-2.38.patch
+  # https://sourceforge.net/p/gptfdisk/code/merge-requests/28/
+  patch -Np1 -i ../popt-1.19-follow-up.patch
+  # https://sourceforge.net/p/gptfdisk/discussion/939590/thread/bc29ca06f8/
+  sed -i '/^#include /s:ncursesw/::' gptcurses.cc
+}
+
+
+setup(){
+	#./autogen.sh
+	#./configure --prefix=/usr \
+        #--libdir=/usr/lib64/ 
+        echo ""
+}
+
+build(){
+    make $jobs
+}
+
+package(){
+   # make install $jobs
+  #install -d "$pkgdir"/usr/{bin,share/{doc/gdisk,man/man8}}
+  #install -t "$DESTDIR/usr/bin" {,c,s}gdisk fixparts
+  #install -m644 -t "$pkgdir/usr/share/man/man8" {{,c,s}gdisk,fixparts}.8
+  #install -m644 -t "$pkgdir/usr/share/doc/gdisk" README NEWS
+  echo ""
+
+}
+

sys/apps/keyutils/ympbuild

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+name='keyutils'
+release='1'
+version='1.6.3'
+url='https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git'
+description='Linux Key Management Utilities'
+email='bayramk@gmail.com'
+maintainer='bk'
+license=('GPLv3')
+source=("https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-$version.tar.gz")
+depends=()
+makedepends=()
+md5sums=('6b70b2b381c1b6d9adfaf66d5d3e7c00')
+group=(sys.apps)
+uses=()
+arch=('x86_64')
+
+cd $name-$version
+setup(){
+	
+	#./configure --prefix=/usr \
+       #--libdir=/usr/lib64/
+       echo ""
+}
+
+build(){
+    make $jobs
+}
+
+package(){
+    make install $jobs
+}
+