From 857a92991db30f538ea8858a2dfda0fe606353e3 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Tue, 21 May 2024 06:59:33 +0200
Subject: Merging upstream version 1.47.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 util/android_config.h | 3 +++
 util/gen-tarball.in   | 7 ++++---
 util/get-ver          | 2 +-
 util/subst.conf.in    | 2 +-
 util/symlinks.c       | 8 --------
 5 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'util')

diff --git a/util/android_config.h b/util/android_config.h
index 90b8f8a..c228860 100644
--- a/util/android_config.h
+++ b/util/android_config.h
@@ -54,6 +54,9 @@
 # define HAVE_SYS_SELECT_H 1
 # define HAVE_SYS_WAIT_H 1
 #endif
+#ifdef __APPLE__
+# define HAVE_GETMNTINFO 1
+#endif
 #if defined(__linux__)
 # define HAVE_EXT2_IOCTLS 1
 # define HAVE_FALLOCATE 1
diff --git a/util/gen-tarball.in b/util/gen-tarball.in
index 997bd93..650d3b5 100644
--- a/util/gen-tarball.in
+++ b/util/gen-tarball.in
@@ -5,7 +5,8 @@
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 top_dir=`cd $top_srcdir; pwd`
-base_ver=`echo @E2FSPROGS_VERSION@ | sed -e 's/-WIP//' -e 's/pre-//' -e 's/-PLUS//'`
+base_ver=`echo @E2FSPROGS_PKGVER@`
+base_rel=`echo @E2FSPROGS_PKGREL@`
 base_e2fsprogs=`basename $top_dir`
 exclude=/tmp/exclude$$
 GZIP=gzip
@@ -16,12 +17,12 @@ GZIP=gzip
 # using a non-standard directory name for WIP releases.  dpkg-source
 # complains, but life goes on.
 #
-deb_pkgver=`echo @E2FSPROGS_PKGVER@ | sed -e 's/~/-/g'`
+deb_pkgver="$base_ver${base_rel:+-$base_rel}"
     
 case $1 in
     debian|ubuntu)
 	SRCROOT="e2fsprogs-$deb_pkgver"
-	tarout="e2fsprogs_@E2FSPROGS_PKGVER@.orig.tar.gz"
+	tarout="e2fsprogs_$deb_pkgver.orig.tar.gz"
 	;;
    all|*)
 	SRCROOT="e2fsprogs-$base_ver"
diff --git a/util/get-ver b/util/get-ver
index ade7d22..7d03e56 100755
--- a/util/get-ver
+++ b/util/get-ver
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-ver=$(git describe --always --dirty); echo "e2fsprogs	$ver ($(git log -1 --pretty=%cD))"
+ver=$(git describe --always --dirty --match 'v*'); echo "e2fsprogs	$ver ($(git log -1 --pretty=%cD))"
 
diff --git a/util/subst.conf.in b/util/subst.conf.in
index 0da4554..5af5e35 100644
--- a/util/subst.conf.in
+++ b/util/subst.conf.in
@@ -23,4 +23,4 @@ root_sbindir		@root_sbindir@
 root_bindir		@root_bindir@
 libdir			@libdir@
 $exec_prefix		@exec_prefix@
-pkglibdir		@libdir@/e2fsprogs
+pkglibexecdir		@libexecdir@/e2fsprogs
diff --git a/util/symlinks.c b/util/symlinks.c
index e9d2b01..4c72156 100644
--- a/util/symlinks.c
+++ b/util/symlinks.c
@@ -1,11 +1,3 @@
-#define _FILE_OFFSET_BITS 64
-#ifndef _LARGEFILE_SOURCE
-#define _LARGEFILE_SOURCE
-#endif
-#ifndef _LARGEFILE64_SOURCE
-#define _LARGEFILE64_SOURCE
-#endif
-
 #include <unistd.h>
 #ifndef _POSIX_SOURCE
 #define _POSIX_SOURCE
-- 
cgit v1.2.3