[gentoo-commits] repo/gentoo:master commit in: sys-fs/progsreiserfs/files/, sys-fs/progsreiserfs/

[gentoo-commits] repo/gentoo:master commit in: sys-fs/progsreiserfs/files/, sys-fs/progsreiserfs/

[Sam James]

commit:     b33711289c1fcb2b12f9bc2ffe77a5ebabee0a71
Author:     Brahmajit Das <brahmajit.xyz <AT> gmail <DOT> com>
AuthorDate: Tue Jun 13 05:30:44 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May  9 01:29:42 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3371128

sys-fs/progsreiserfs: Fix error call to undeclared function _getopt_internal

Closes: https://bugs.gentoo.org/898616
Signed-off-by: Brahmajit Das <brahmajit.xyz <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31410
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...iserfs-0.3.1_rc8-musl-getopt_internal-fix.patch | 36 ++++++++++++
 .../progsreiserfs-0.3.1_rc8-r1.ebuild              | 67 ++++++++++++++++++++++
 2 files changed, 103 insertions(+)

diff --git a/sys-fs/progsreiserfs/files/progsreiserfs-0.3.1_rc8-musl-getopt_internal-fix.patch b/sys-fs/progsreiserfs/files/progsreiserfs-0.3.1_rc8-musl-getopt_internal-fix.patch
new file mode 100644
index 000000000000..06ba7e357a55
--- /dev/null
+++ b/sys-fs/progsreiserfs/files/progsreiserfs-0.3.1_rc8-musl-getopt_internal-fix.patch
@@ -0,0 +1,36 @@
+Bug: https://bugs.gentoo.org/898616
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Tue, 13 Jun 2023 05:23:45 +0000
+Subject: [PATCH] getopt1.c: wrap the getopt_long and getopt_long_only
+ functions around include directive
+
+The header guard HAVE_GETOPT_LONG_ONLY can be used to check if the
+functions are available or not, as the functions getopt_long and
+getopt_long_only defined in getopt1.c uses the function _getopt_internal
+which is glibc specific and cannot be used on other libc systems (for
+example musl).
+Hence we're wrapping those two functions with this include guard.
+
+Bug: https://bugs.gentoo.org/898616
+Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
+--- a/progsreiserfs/libmisc/getopt1.c
++++ b/progsreiserfs/libmisc/getopt1.c
+@@ -63,6 +63,7 @@
+ #define NULL 0
+ #endif
+ 
++#ifndef HAVE_GETOPT_LONG_ONLY
+ int
+ 	getopt_long(argc, argv, options, long_options, opt_index)
+ 	 int argc;
+@@ -89,6 +90,7 @@ int
+ {
+ 	return _getopt_internal(argc, argv, options, long_options, opt_index, 1);
+ }
++#endif
+ 
+ #endif /* Not ELIDE_CODE.  */
+ \f
+-- 
+2.41.0
+

diff --git a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8-r1.ebuild b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8-r1.ebuild
new file mode 100644
index 000000000000..e7fe27e0eefc
--- /dev/null
+++ b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic libtool
+
+MY_P=${PN}-${PV/_/-}
+
+DESCRIPTION="Library for accessing and manipulating reiserfs partitions"
+HOMEPAGE="http://reiserfs.linux.kiev.ua/"
+SRC_URI="http://reiserfs.linux.kiev.ua/snapshots/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug examples nls static-libs"
+
+DEPEND="
+	sys-apps/util-linux
+	nls? (
+		sys-devel/gettext
+		virtual/libintl
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${PN}-0.3.1_rc8-musl-getopt_internal-fix.patch
+)
+
+src_prepare() {
+	default
+
+	elibtoolize
+}
+
+src_configure() {
+	filter-lfs-flags
+
+	econf \
+		$(use_enable static-libs static) \
+		--disable-Werror \
+		$(use_enable nls) \
+		$(use_enable debug)
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docinto examples
+		dodoc demos/*.c
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+
+	rm -r "${ED}"/usr/{sbin,share/man} || die
+}
+
+pkg_postinst() {
+	ewarn "progsreiserfs has been proven dangerous in the past, generating bad"
+	ewarn "partitions and destroying data on resize/cpfs operations."
+	ewarn "Because of this, we do NOT provide their binaries, but only their"
+	ewarn "libraries instead, as these are needed for other applications."
+}

[gentoo-commits] repo/gentoo:master commit in: sys-fs/progsreiserfs/files/, sys-fs/progsreiserfs/

[Sam James]

commit:     123d0c034e6dea5e23dfeedbbaa1751a85793a60
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May  9 01:24:34 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May  9 01:29:43 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=123d0c03

sys-fs/progsreiserfs: fix modern C issues in configure (sort of)

Not autoreconfing because it doesn't work w/ modern autoconf and
the alternative here, rather than spending more time on it, is really
to last-rite.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../progsreiserfs-0.3.1_rc8-c99-configure.patch    | 93 ++++++++++++++++++++++
 .../progsreiserfs-0.3.1_rc8-r1.ebuild              |  3 +-
 2 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/sys-fs/progsreiserfs/files/progsreiserfs-0.3.1_rc8-c99-configure.patch b/sys-fs/progsreiserfs/files/progsreiserfs-0.3.1_rc8-c99-configure.patch
new file mode 100644
index 000000000000..23fec252657b
--- /dev/null
+++ b/sys-fs/progsreiserfs/files/progsreiserfs-0.3.1_rc8-c99-configure.patch
@@ -0,0 +1,93 @@
+configure-only as cannot regenerate with new autotools :(
+--- a/configure
++++ b/configure
+@@ -7486,6 +7486,7 @@ else
+ #line 7486 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
++#include <stdlib.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -9698,6 +9699,7 @@ else
+ #line 9698 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
++#include <stdlib.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+--- a/configure
++++ b/configure
+@@ -2279,6 +2279,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+ #line 2280 "configure"
+ #include "confdefs.h"
++#include <stdlib.h>
+ $ac_declaration
+ int
+ main ()
+@@ -3088,6 +3089,7 @@ else
+ #include "confdefs.h"
+ 
+ 	#include <stdio.h>
++	#include <stdlib.h>
+ 	#include <sys/types.h>
+ 	#include <unistd.h>
+ 
+@@ -6541,6 +6543,7 @@ else
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #ifdef RTLD_GLOBAL
+ #  define LT_DLGLOBAL		RTLD_GLOBAL
+@@ -6638,6 +6641,7 @@ else
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #ifdef RTLD_GLOBAL
+ #  define LT_DLGLOBAL		RTLD_GLOBAL
+@@ -8165,6 +8169,7 @@ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line 8165 "configure"
+ #include "confdefs.h"
++#include <stdlib.h>
+ int
+ find_stack_direction ()
+ {
+@@ -8368,6 +8373,7 @@ $ac_includes_default
+ 
+ #include <fcntl.h>
+ #include <sys/mman.h>
++#include <stdlib.h>
+ 
+ #if !STDC_HEADERS && !HAVE_STDLIB_H
+ char *malloc ();
+@@ -9957,6 +9963,7 @@ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line 9956 "configure"
+ #include "confdefs.h"
++#include <stdlib.h>
+ int
+ main ()
+ {
+@@ -10438,6 +10445,7 @@ else
+   cat >conftest.$ac_ext <<_ACEOF
+ #line 10437 "configure"
+ #include "confdefs.h"
++#include <stdlib.h>
+ int
+ find_stack_direction ()
+ {
+@@ -10745,6 +10753,7 @@ $ac_includes_default
+ 
+ #include <fcntl.h>
+ #include <sys/mman.h>
++#include <stdlib.h>
+ 
+ #if !STDC_HEADERS && !HAVE_STDLIB_H
+ char *malloc ();

diff --git a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8-r1.ebuild b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8-r1.ebuild
index e7fe27e0eefc..7032c07d8a37 100644
--- a/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8-r1.ebuild
+++ b/sys-fs/progsreiserfs/progsreiserfs-0.3.1_rc8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,6 +28,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${P}-autotools.patch
 	"${FILESDIR}"/${PN}-0.3.1_rc8-musl-getopt_internal-fix.patch
+	"${FILESDIR}"/${PN}-0.3.1_rc8-c99-configure.patch
 )
 
 src_prepare() {