diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-12 14:59:03 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-12 14:59:39 +0000 |
| commit | a5c3b3dd229e6da62441f75bf5e242b7a96b2197 (patch) | |
| tree | 95c21d0eb53d66d8c4014acdf71074c597e24915 /main/logrotate/qsort.patch | |
| parent | dff80071c6a2a87336d889afda52d138564576db (diff) | |
| download | aports-a5c3b3dd229e6da62441f75bf5e242b7a96b2197.tar.bz2 aports-a5c3b3dd229e6da62441f75bf5e242b7a96b2197.tar.xz | |
main/logrotate: upgrade to 3.8.8
Diffstat (limited to 'main/logrotate/qsort.patch')
| -rw-r--r-- | main/logrotate/qsort.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/main/logrotate/qsort.patch b/main/logrotate/qsort.patch new file mode 100644 index 0000000000..1e932be192 --- /dev/null +++ b/main/logrotate/qsort.patch @@ -0,0 +1,32 @@ +--- ./logrotate.c.orig ++++ ./logrotate.c +@@ -117,11 +117,12 @@ + return 1; + } + +-#if defined(HAVE_STRPTIME) && defined(HAVE_QSORT_R) +-static int compGlobResult(const void *result1, const void *result2, void *data) { ++#if defined(HAVE_STRPTIME) ++static struct compData qsort_data; ++static int compGlobResult(const void *result1, const void *result2) { + struct tm time; + time_t t1, t2; +- struct compData *d = (struct compData *) data; ++ struct compData *d = &qsort_data; + const char *r1 = *(const char **)(result1); + const char *r2 = *(const char **)(result2); + +@@ -139,10 +140,9 @@ + } + + static void sortGlobResult(glob_t *result, int prefix_len, const char *dformat) { +- struct compData d; +- d.prefix_len = prefix_len; +- d.dformat = dformat; +- qsort_r(result->gl_pathv, result->gl_pathc, sizeof(char *), compGlobResult, &d); ++ qsort_data.prefix_len = prefix_len; ++ qsort_data.dformat = dformat; ++ qsort(result->gl_pathv, result->gl_pathc, sizeof(char *), compGlobResult); + } + #else + static void sortGlobResult(glob_t *result, int prefix_len, const char *dformat) { |