summaryrefslogtreecommitdiff
path: root/debian/patches/0005-strerror_r.patch
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2013-03-09 21:33:00 +0000
committerIgor Pashev <pashev.igor@gmail.com>2013-03-09 21:33:00 +0000
commitc4c229578cc9d8da99b84a1781029d67a6a6f83f (patch)
tree761344f08510398ee8989d502e0229551ce8db1e /debian/patches/0005-strerror_r.patch
parentf311f37306ed823fc4bf2fb18429b3f6812e7827 (diff)
downloadaptitude-c4c229578cc9d8da99b84a1781029d67a6a6f83f.tar.gz
aptitude (0.6.9.1-1+dyson2) unstable; urgency=lowdebian
* Fixed typo in patch name * Use GNU strerror_r only if _GNU_SOURCE is defined, do not check for Glibc; build depends on libc1-dev >= 2.10-11
Diffstat (limited to 'debian/patches/0005-strerror_r.patch')
-rw-r--r--debian/patches/0005-strerror_r.patch13
1 files changed, 6 insertions, 7 deletions
diff --git a/debian/patches/0005-strerror_r.patch b/debian/patches/0005-strerror_r.patch
index 8a6ce20c..0aba0d4c 100644
--- a/debian/patches/0005-strerror_r.patch
+++ b/debian/patches/0005-strerror_r.patch
@@ -6,17 +6,16 @@ Subject: strerror_r()
src/generic/util/util.cc | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
-diff --git a/src/generic/util/util.cc b/src/generic/util/util.cc
-index 065d533..eea90a4 100644
---- a/src/generic/util/util.cc
-+++ b/src/generic/util/util.cc
-@@ -208,10 +208,15 @@ string sstrerror(int errnum)
+Index: aptitude/src/generic/util/util.cc
+===================================================================
+--- aptitude.orig/src/generic/util/util.cc 2013-03-09 18:28:30.615140195 +0000
++++ aptitude/src/generic/util/util.cc 2013-03-09 18:35:31.188026320 +0000
+@@ -208,10 +208,14 @@
while(bufsize < 512 * 512)
{
char *buf = new char[bufsize];
-
-+// http://stackoverflow.com/questions/4266354/how-to-tell-if-glibc-is-used
-+#if defined(__GLIBC__) && defined(_GNU_SOURCE)
++#if defined(_GNU_SOURCE)
char *result = strerror_r(errnum, buf, bufsize);
-
- if(result == NULL)