[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[glibc] 01/01: Remove old patches not applied for a long time



This is an automated email from the git hooks/post-receive script.

aurel32 pushed a commit to branch glibc-2.23
in repository glibc.

commit 9f2704a7b4b1ae059fce8a574af4f827b6acc7c3
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Sat Mar 12 23:14:21 2016 +0100

    Remove old patches not applied for a long time
---
 .../patches/any/local-disable-gethostbyname4.diff  | 13 -----
 debian/patches/any/local-ipv6-lookup.diff          | 47 ------------------
 .../any/local-localedef-fix-trampoline.diff        | 57 ----------------------
 .../patches/any/submitted-fileops-and-signals.diff | 26 ----------
 debian/patches/series                              |  4 --
 5 files changed, 147 deletions(-)

diff --git a/debian/patches/any/local-disable-gethostbyname4.diff b/debian/patches/any/local-disable-gethostbyname4.diff
deleted file mode 100644
index 83f2af8..0000000
--- a/debian/patches/any/local-disable-gethostbyname4.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugzilla.redhat.com/show_bug.cgi?id=459756
-
---- a/resolv/Versions
-+++ b/resolv/Versions
-@@ -102,7 +102,7 @@
-     _nss_dns_gethostbyname_r; _nss_dns_getnetbyaddr_r;
-     _nss_dns_getnetbyname_r; _nss_dns_getcanonname_r;
-     _nss_dns_gethostbyaddr2_r;
--    _nss_dns_gethostbyname4_r;
-+#    _nss_dns_gethostbyname4_r;
-   }
- }
- 
diff --git a/debian/patches/any/local-ipv6-lookup.diff b/debian/patches/any/local-ipv6-lookup.diff
deleted file mode 100644
index 21f0cb6..0000000
--- a/debian/patches/any/local-ipv6-lookup.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
-index adb3c4f..d12835c 100644
---- a/sysdeps/posix/getaddrinfo.c
-+++ b/sysdeps/posix/getaddrinfo.c
-@@ -263,7 +263,7 @@ extern service_user *__nss_hosts_database attribute_hidden;
- static int
- gaih_inet (const char *name, const struct gaih_service *service,
- 	   const struct addrinfo *req, struct addrinfo **pai,
--	   unsigned int *naddrs)
-+	   unsigned int *naddrs, bool usable_ipv6)
- {
-   const struct gaih_typeproto *tp = gaih_inet_typeproto;
-   struct gaih_servtuple *st = (struct gaih_servtuple *) &nullserv;
-@@ -706,7 +706,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
- 	      if (fct != NULL)
- 		{
- 		  if (req->ai_family == AF_INET6
--		      || req->ai_family == AF_UNSPEC)
-+		      || (req->ai_family == AF_UNSPEC && usable_ipv6))
- 		    {
- 		      gethosts (AF_INET6, struct in6_addr);
- 		      no_inet6_data = no_data;
-@@ -1903,7 +1903,7 @@ getaddrinfo (const char *name, const char *service,
-   if (hints->ai_family == AF_UNSPEC || hints->ai_family == AF_INET
-       || hints->ai_family == AF_INET6)
-     {
--      last_i = gaih_inet (name, pservice, hints, end, &naddrs);
-+      last_i = gaih_inet (name, pservice, hints, end, &naddrs, seen_ipv6);
-       if (last_i != 0)
- 	{
- 	  freeaddrinfo (p);
-diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
-index 46161a8..5287ed0 100644
---- a/sysdeps/unix/sysv/linux/check_pf.c
-+++ b/sysdeps/unix/sysv/linux/check_pf.c
-@@ -146,7 +146,10 @@ make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6,
- 		  *seen_ipv4 = true;
- 		  break;
- 		case AF_INET6:
--		  *seen_ipv6 = true;
-+		  if (ifam->ifa_scope < RT_SCOPE_LINK)
-+		    {
-+		      *seen_ipv6 = true;
-+		    }
- 
- 		  if (ifam->ifa_flags & (IFA_F_DEPRECATED
- 					 | IFA_F_TEMPORARY
diff --git a/debian/patches/any/local-localedef-fix-trampoline.diff b/debian/patches/any/local-localedef-fix-trampoline.diff
deleted file mode 100644
index e218607..0000000
--- a/debian/patches/any/local-localedef-fix-trampoline.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-# DP: Description: Fix localedef segfault when run under exec-shield,
-#        PaX or similar. (#231438, #198099)
-# DP: Dpatch Author: James Troup <james@nocrew.org>
-# DP: Patch Author: (probably) Jakub Jelinek <jakub@redhat.com>
-# DP: Upstream status: Unknown
-# DP: Status Details: Unknown
-# DP: Date: 2004-03-16
-
----
- locale/programs/3level.h |   36 ++++++++++++++++++++++++++++++++++++
- 1 file changed, 36 insertions(+)
-
---- a/locale/programs/3level.h
-+++ b/locale/programs/3level.h
-@@ -200,6 +200,42 @@
- 	}
-     }
- }
-+
-+/* GCC ATM seems to do a poor job with pointers to nested functions passed
-+   to inlined functions.  Help it a little bit with this hack.  */
-+#define wchead_table_iterate(tp, fn) \
-+do									      \
-+  {									      \
-+    struct wchead_table *t = (tp);					      \
-+    uint32_t index1;							      \
-+    for (index1 = 0; index1 < t->level1_size; index1++)			      \
-+      {									      \
-+	uint32_t lookup1 = t->level1[index1];				      \
-+	if (lookup1 != ((uint32_t) ~0))					      \
-+	  {								      \
-+	    uint32_t lookup1_shifted = lookup1 << t->q;			      \
-+	    uint32_t index2;						      \
-+	    for (index2 = 0; index2 < (1 << t->q); index2++)		      \
-+	      {								      \
-+		uint32_t lookup2 = t->level2[index2 + lookup1_shifted];	      \
-+		if (lookup2 != ((uint32_t) ~0))				      \
-+		  {							      \
-+		    uint32_t lookup2_shifted = lookup2 << t->p;		      \
-+		    uint32_t index3;					      \
-+		    for (index3 = 0; index3 < (1 << t->p); index3++)	      \
-+		      {							      \
-+			struct element_t *lookup3			      \
-+			  = t->level3[index3 + lookup2_shifted];	      \
-+			if (lookup3 != NULL)				      \
-+			  fn ((((index1 << t->q) + index2) << t->p) + index3, \
-+			      lookup3);					      \
-+		      }							      \
-+		  }							      \
-+	      }								      \
-+	  }								      \
-+      }									      \
-+  } while (0)
-+
- #endif
- 
- #ifndef NO_ADD_LOCALE
diff --git a/debian/patches/any/submitted-fileops-and-signals.diff b/debian/patches/any/submitted-fileops-and-signals.diff
deleted file mode 100644
index 3dfc1f3..0000000
--- a/debian/patches/any/submitted-fileops-and-signals.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: glibc-2.7/libio/fileops.c
-===================================================================
---- glibc-2.7.orig/libio/fileops.c	2007-10-23 08:46:13.000000000 -0400
-+++ glibc-2.7/libio/fileops.c	2007-10-23 08:50:51.000000000 -0400
-@@ -522,10 +522,19 @@
-     fp->_cur_column = INTUSE(_IO_adjust_column) (fp->_cur_column - 1, data,
- 						 count) + 1;
-   _IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base);
--  fp->_IO_write_base = fp->_IO_write_ptr = fp->_IO_buf_base;
--  fp->_IO_write_end = (fp->_mode <= 0
-+  if (__builtin_expect (count == to_do, 1))
-+    {
-+      fp->_IO_write_base = fp->_IO_write_ptr = fp->_IO_buf_base;
-+      fp->_IO_write_end = (fp->_mode <= 0
- 		       && (fp->_flags & (_IO_LINE_BUF+_IO_UNBUFFERED))
- 		       ? fp->_IO_buf_base : fp->_IO_buf_end);
-+    }
-+  else if (count > 0 && fp->_IO_write_base == data)
-+    {
-+      memmove (data, data+count, 
-+               fp->_IO_write_ptr - fp->_IO_write_base - count);
-+      fp->_IO_write_ptr -= count;
-+    }
-   return count;
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index f85a51e..515eeb2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -175,7 +175,6 @@ any/local-bindresvport_blacklist.diff
 any/local-allocalim-header.diff
 any/local-fhs-linux-paths.diff
 any/local-fhs-nscd.diff
-# any/local-ipv6-lookup.diff -p1               # has issues
 any/local-ld-multiarch.diff
 any/local-ldso-disable-hwcap.diff
 any/local-ldconfig.diff
@@ -183,16 +182,13 @@ any/local-ldconfig-fsync.diff
 any/local-libgcc-compat-main.diff
 any/local-libgcc-compat-ports.diff
 any/local-libgcc-compat-abilists.diff
-# any/local-localedef-fix-trampoline.diff	# trips -Werror=unused-function
 any/local-no-pagesize.diff
 any/local-nss-upgrade.diff
 any/local-stubs_h.diff
 any/local-tcsetaddr.diff
 any/local-tst-mktime2.diff
 any/submitted-longdouble.diff
-#any/submitted-fileops-and-signals.diff		# has issues
 any/local-nss-overflow.diff
-#any/local-disable-gethostbyname4.diff
 any/submitted-missing-etc-hosts.diff
 any/submitted-bits-fcntl_h-at.diff
 any/submitted-nptl-invalid-td.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git


Reply to: