Skip to contentSkip to conversation

socat: fix build failure due to ext2_fs.h header, bump version

PATCH New Thomas Petazzoni 2 participants 4 messages May 17, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 socat: fix build failure due to ext2_fs.h header, bump version

In kernel >= 3.3, the ext2_fs.h can no longer be imported from userspace. This has been fixed for internal toolchains by adding a patch to kernel headers, but this doesn't work with toolchains generated by Crosstool-NG, or potentially upcoming external toolchains.

socat in fact has a test in its configure.in, but the configure was generated too long ago, and the generated test relies on the preprocessor result and not the compiler result (but warns that in the future, the compiler result will be used instead of the preprocessor result).

So, by running autoconf on this package, we fix the problem: it properly checks whether ext2_fs is usable or not, and acts accordingly. Of course, it means that with recent versions of the kernel, ext2-specific features of socat are unavailable, and we'll have to wait for the socat developers to adapt their code so that they use the e2fsprogs headers.

We also bump the version, since a new minor version fixing a security problem has been released.

---
 package/socat/socat.mk |   15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
package/socat/socat.mk +14 -1
index 5f7feac..bd435cf 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-SOCAT_VERSION = 2.0.0-b4
+SOCAT_VERSION = 2.0.0-b5
 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2
 SOCAT_SITE = http://www.dest-unreach.org/socat/download/
 SOCAT_CONF_ENV = sc_cv_termios_ispeed=no \
@@ -12,4 +12,17 @@ SOCAT_CONF_ENV = sc_cv_termios_ispeed=no \
 		 sc_cv_sys_tabdly_shift=11 \
 		 sc_cv_sys_csize_shift=4
 
+# We need to run autoconf to regenerate the configure script, in order
+# to ensure that the test checking linux/ext2_fs.h works
+# properly. However, the package only uses autoconf and not automake,
+# so we can't use the normal autoreconf logic.
+
+SOCAT_DEPENDENCIES = host-autoconf
+
+define SOCAT_RUN_AUTOCONF
+	(cd $(@D); $(HOST_DIR)/usr/bin/autoconf)
+endef
+
+SOCAT_PRE_CONFIGURE_HOOKS += SOCAT_RUN_AUTOCONF
+
 $(eval $(call AUTOTARGETS))
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/2 socat: fix build failure due to ext2_fs.h header, bump version

Le Thu, 17 May 2012 13:15:57 +0200,
Thomas Petazzoni <[email protected]> a ?crit :

Quoted 12 lines

In kernel >= 3.3, the ext2_fs.h can no longer be imported from userspace. This has been fixed for internal toolchains by adding a patch to kernel headers, but this doesn't work with toolchains generated by Crosstool-NG, or potentially upcoming external toolchains.

socat in fact has a test in its configure.in, but the configure was generated too long ago, and the generated test relies on the preprocessor result and not the compiler result (but warns that in the future, the compiler result will be used instead of the preprocessor result).

Quoted 6 lines

So, by running autoconf on this package, we fix the problem: it properly checks whether ext2_fs is usable or not, and acts accordingly. Of course, it means that with recent versions of the kernel, ext2-specific features of socat are unavailable, and we'll have to wait for the socat developers to adapt their code so that they use the e2fsprogs headers.

Forgot to say so in the commit log, but this fixes:
http://autobuild.buildroot.org/results/fb8f118d0051d01f41cdc50a90df05f9d648e433/build-end.log

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#2 lore raw

PATCH 2/2 socat: disable documentation build/installation

In reply to Thomas Petazzoni

The documentation generation process requires a special yold2man program, for which we don't have a package in Buildroot. Since we generally don't care much about documentation of packages, just adjust the package Makefile.in to not build/install its documentation.

---
 package/socat/socat-no-documentation.patch |   37 ++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/socat/socat-no-documentation.patch
package/socat/socat-no-documentation.patch new file +37 -0
new file mode 100644
index 0000000..ce088df
@@ -0,0 +1,37 @@
+socat: disable documentation build/installation
+
+The documentation generation process requires a special yold2man
+program, for which we don't have a package in Buildroot. Since we
+generally don't care much about documentation of packages, just adjust
+the package Makefile.in to not build/install its documentation.
+
+Signed-off-by: Thomas Petazzoni <[email protected]>
+
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -93,7 +93,7 @@
+ 	Config/Makefile.Cygwin-1-5-25 Config/config.Cygwin-1-5-25.h \
+ 	Config/Makefile.MacOSX-10-5 Config/config.MacOSX-10-5.h
+ 
+-all: progs doc
++all: progs
+ 
+ scmclean: gitclean
+ 
+@@ -136,13 +136,11 @@
+ strip: progs
+ 	strip $(PROGS)
+ 
+-install: progs $(srcdir)/doc/socat.1
++install: progs
+ 	mkdir -p $(DESTDIR)$(BINDEST)
+ 	$(INSTALL) -m 755 socat $(DESTDIR)$(BINDEST)
+ 	$(INSTALL) -m 755 procan $(DESTDIR)$(BINDEST)
+ 	$(INSTALL) -m 755 filan $(DESTDIR)$(BINDEST)
+-	mkdir -p $(DESTDIR)$(MANDEST)/man1
+-	$(INSTALL) -m 644 $(srcdir)/doc/socat.1 $(DESTDIR)$(MANDEST)/man1/
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(BINDEST)/socat
Signature · 1 line
1.7.9.5
#3 lore raw

PATCH 1/2 socat: fix build failure due to ext2_fs.h header, bump version

In reply to Thomas Petazzoni
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Thomas> In kernel >= 3.3, the ext2_fs.h can no longer be imported from Thomas> userspace. This has been fixed for internal toolchains by adding a Thomas> patch to kernel headers, but this doesn't work with toolchains Thomas> generated by Crosstool-NG, or potentially upcoming external Thomas> toolchains.

Thomas> socat in fact has a test in its configure.in, but the configure was Thomas> generated too long ago, and the generated test relies on the Thomas> preprocessor result and not the compiler result (but warns that in the Thomas> future, the compiler result will be used instead of the preprocessor Thomas> result).

Thomas> So, by running autoconf on this package, we fix the problem: it Thomas> properly checks whether ext2_fs is usable or not, and acts Thomas> accordingly. Of course, it means that with recent versions of the Thomas> kernel, ext2-specific features of socat are unavailable, and we'll Thomas> have to wait for the socat developers to adapt their code so that they Thomas> use the e2fsprogs headers.

Thomas> We also bump the version, since a new minor version fixing a security Thomas> problem has been released.

Committed both, thanks.

Signature · 1 line
Bye, Peter Korsgaard