mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] e2fsprog: Version bump + fixes. 1.46.6 -> 1.47.0
@ 2023-02-09 11:15 Christian Melki
  2023-02-10 14:17 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2023-02-09 11:15 UTC (permalink / raw)
  To: ptxdist

https://github.com/tytso/e2fsprogs/blob/master/doc/RelNotes/v1.47.0.txt
The biggest change is default backwards incompatibility
with kernels < 4.4. 4.4 LTS was EOL a year ago.

* Add patch to disable doc building and installing.
Was in need of several tools and the result is pretty much unused.
* Add patch to fix LDCONFIG permission mishap.
Choosen solution is to disable the LDCONFIG call through this patch.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 .../0001-e2fsprogs-Disable-docs.patch         | 37 +++++++++++++++++++
 .../0002-e2fsprogs-Disable-ldconfig.patch     | 29 +++++++++++++++
 patches/e2fsprogs-1.47.0/series               |  5 +++
 rules/e2fsprogs.make                          |  4 +-
 4 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 patches/e2fsprogs-1.47.0/0001-e2fsprogs-Disable-docs.patch
 create mode 100644 patches/e2fsprogs-1.47.0/0002-e2fsprogs-Disable-ldconfig.patch
 create mode 100644 patches/e2fsprogs-1.47.0/series

diff --git a/patches/e2fsprogs-1.47.0/0001-e2fsprogs-Disable-docs.patch b/patches/e2fsprogs-1.47.0/0001-e2fsprogs-Disable-docs.patch
new file mode 100644
index 000000000..38a8cc8eb
--- /dev/null
+++ b/patches/e2fsprogs-1.47.0/0001-e2fsprogs-Disable-docs.patch
@@ -0,0 +1,37 @@
+From: Christian Melki <christian.melki@t2data.com>
+Date: Thu, 9 Feb 2023 09:41:43 +0100
+Subject: [PATCH] e2fsprogs: Disable docs.
+
+Disable doc building and installing.
+
+Signed-off-by: Christian Melki <christian.melki@t2data.com>
+---
+ Makefile.in | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 79b71165002d..0b80c20d4858 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -35,7 +35,6 @@ TAR=tar
+ all:: subs
+ 	$(MAKE) libs
+ @ALL_CMT@	$(MAKE) progs
+-@ALL_CMT@	$(MAKE) docs
+ 
+ all-static::
+ 	$(MAKE) libs
+@@ -72,11 +71,11 @@ distclean-doc:
+ 	-test -d doc && cd doc && $(MAKE) distclean
+ 
+ install: subs all-libs-recursive install-progs-recursive \
+-  install-shlibs-libs-recursive install-doc-libs
++  install-shlibs-libs-recursive
+ @SUBSET_CMT@	$(MAKE) install-libs
+ 
+ install-strip: subs all-libs-recursive install-strip-progs-recursive \
+-  install-shlibs-strip-libs-recursive install-doc-libs
++  install-shlibs-strip-libs-recursive
+ 
+ uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs
+ 
diff --git a/patches/e2fsprogs-1.47.0/0002-e2fsprogs-Disable-ldconfig.patch b/patches/e2fsprogs-1.47.0/0002-e2fsprogs-Disable-ldconfig.patch
new file mode 100644
index 000000000..100d5bc5e
--- /dev/null
+++ b/patches/e2fsprogs-1.47.0/0002-e2fsprogs-Disable-ldconfig.patch
@@ -0,0 +1,29 @@
+From: Christian Melki <christian.melki@t2data.com>
+Date: Thu, 9 Feb 2023 09:42:26 +0100
+Subject: [PATCH] e2fsprogs: Disable ldconfig.
+
+ldconfig on shlibs pokes files which are normally not
+accessible for non-root users.
+There are two ways to deal with this.
+1. Patch it, disabling the call.
+2. point ldconfig to something like ac_cv_path_LDCONFIG=true
+This patch inplements the former.
+
+Signed-off-by: Christian Melki <christian.melki@t2data.com>
+---
+ lib/Makefile.elf-lib | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/lib/Makefile.elf-lib b/lib/Makefile.elf-lib
+index f850f3ddb795..ea0bbde82b2f 100644
+--- a/lib/Makefile.elf-lib
++++ b/lib/Makefile.elf-lib
+@@ -50,8 +50,6 @@ install-shlibs install:: $(ELF_LIB) installdirs-elf-lib $(DEP_INSTALL_SYMLINK)
+ 	$(E) "	SYMLINK $(libdir)/$(ELF_IMAGE).so"
+ 	$(Q) $(INSTALL_SYMLINK) $(ELF_INSTALL_DIR)/$(ELF_SONAME) \
+ 		$(libdir)/$(ELF_IMAGE).so $(DESTDIR)
+-	$(E) "	LDCONFIG"
+-	$(Q) -$(LDCONFIG)
+ 
+ install-strip: install
+ 	$(E) "	STRIP-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
diff --git a/patches/e2fsprogs-1.47.0/series b/patches/e2fsprogs-1.47.0/series
new file mode 100644
index 000000000..8c305fa95
--- /dev/null
+++ b/patches/e2fsprogs-1.47.0/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-e2fsprogs-Disable-docs.patch
+0002-e2fsprogs-Disable-ldconfig.patch
+# f58965e369e408e8446728c89acd0147  - git-ptx-patches magic
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make
index 12e632423..87f1004f3 100644
--- a/rules/e2fsprogs.make
+++ b/rules/e2fsprogs.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_E2FSPROGS) += e2fsprogs
 #
 # Paths and names
 #
-E2FSPROGS_VERSION	:= 1.46.6
-E2FSPROGS_MD5		:= ffcc9cbcc9fac7efe3e52d41e36099f3
+E2FSPROGS_VERSION	:= 1.47.0
+E2FSPROGS_MD5		:= 6b4f18a33873623041857b4963641ee9
 E2FSPROGS		:= e2fsprogs-$(E2FSPROGS_VERSION)
 E2FSPROGS_SUFFIX	:= tar.gz
 E2FSPROGS_URL		:= $(call ptx/mirror, SF, e2fsprogs/e2fsprogs/v$(E2FSPROGS_VERSION)/$(E2FSPROGS).$(E2FSPROGS_SUFFIX))
-- 
2.34.1




^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-02-10 14:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-09 11:15 [ptxdist] [PATCH] e2fsprog: Version bump + fixes. 1.46.6 -> 1.47.0 Christian Melki
2023-02-10 14:17 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox