[gnutls] Make it build with new glibc.

Tomáš Mráz tmraz at fedoraproject.org
Mon Jun 18 15:27:01 UTC 2012


commit 500155211ed2d1a0ccb457376b1d24dd38405b20
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Mon Jun 18 17:26:46 2012 +0200

    Make it build with new glibc.

 gnutls-2.12.20-build.patch |   24 ++++++++++++++++++++++++
 gnutls.spec                |    4 ++++
 2 files changed, 28 insertions(+), 0 deletions(-)
---
diff --git a/gnutls-2.12.20-build.patch b/gnutls-2.12.20-build.patch
new file mode 100644
index 0000000..6c20588
--- /dev/null
+++ b/gnutls-2.12.20-build.patch
@@ -0,0 +1,24 @@
+diff -up gnutls-2.12.20/gl/stdio.in.h.build gnutls-2.12.20/gl/stdio.in.h
+--- gnutls-2.12.20/gl/stdio.in.h.build	2012-03-01 16:47:48.000000000 +0100
++++ gnutls-2.12.20/gl/stdio.in.h	2012-06-18 16:50:51.307755234 +0200
+@@ -698,7 +698,7 @@ _GL_WARN_ON_USE (getline, "getline is un
+ # endif
+ #endif
+ 
+-#if @GNULIB_GETS@
++#if 0
+ # if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+ #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+ #   undef gets
+diff -up gnutls-2.12.20/lib/gl/stdio.in.h.build gnutls-2.12.20/lib/gl/stdio.in.h
+--- gnutls-2.12.20/lib/gl/stdio.in.h.build	2012-03-01 16:53:13.000000000 +0100
++++ gnutls-2.12.20/lib/gl/stdio.in.h	2012-06-18 16:50:22.846115787 +0200
+@@ -698,7 +698,7 @@ _GL_WARN_ON_USE (getline, "getline is un
+ # endif
+ #endif
+ 
+-#if @GNULIB_GETS@
++#if 0
+ # if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+ #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+ #   undef gets
diff --git a/gnutls.spec b/gnutls.spec
index d89e0af..3b76405 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -21,6 +21,8 @@ Patch2: gnutls-2.8.6-link-libgcrypt.patch
 Patch3: gnutls-2.12.2-nosrp.patch
 # Skip tests that are expected to fail on libgcrypt build
 Patch4: gnutls-2.12.7-dsa-skiptests.patch
+# Make it build with recent glibc that removed gets
+Patch5: gnutls-2.12.20-build.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libgcrypt >= 1.2.2
@@ -86,10 +88,12 @@ This package contains Guile bindings for the library.
 
 %prep
 %setup -q
+
 %patch1 -p1 -b .rpath
 %patch2 -p1 -b .link
 %patch3 -p1 -b .nosrp
 %patch4 -p1 -b .skiptests
+%patch5 -p1 -b .build
 
 for i in auth_srp_rsa.c auth_srp_sb64.c auth_srp_passwd.c auth_srp.c gnutls_srp.c ext_srp.c; do
     touch lib/$i


More information about the scm-commits mailing list