Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aports
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
651
Issues
651
List
Boards
Labels
Service Desk
Milestones
Merge Requests
184
Merge Requests
184
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alpine
aports
Commits
f619fd11
Commit
f619fd11
authored
Apr 27, 2015
by
Natanael Copa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
main/logrotate: upgrade to 3.8.9
parent
5a391f02
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
41 deletions
+13
-41
main/logrotate/APKBUILD
main/logrotate/APKBUILD
+13
-9
main/logrotate/qsort.patch
main/logrotate/qsort.patch
+0
-32
No files found.
main/logrotate/APKBUILD
View file @
f619fd11
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname
=
logrotate
pkgver
=
3.8.
8
pkgver
=
3.8.
9
pkgrel
=
0
pkgdesc
=
"Tool to rotate logfiles"
url
=
"https://fedorahosted.org/logrotate/"
arch
=
"all"
license
=
"GPL"
depends
=
makedepends
=
"popt-dev"
makedepends
=
"popt-dev
autoconf automake libtool
"
subpackages
=
"
$pkgname
-doc"
source
=
"https://fedorahosted.org/releases/l/o/logrotate/logrotate-
$pkgver
.tar.gz
qsort.patch
logrotate.cron
logrotate.conf
logrotate.confd"
...
...
@@ -24,10 +23,18 @@ prepare() {
*
.patch
)
msg
$i
;
patch
-p1
-i
"
$srcdir
"
/
$i
||
return
1
;;
esac
done
./autogen.sh
}
build
()
{
cd
"
$_builddir
"
./configure
\
--build
=
$CBUILD
\
--host
=
$CHOST
\
--prefix
=
/usr
\
--sysconfdir
=
/etc
\
--localstatedir
=
/var
\
||
return
1
make
||
return
1
}
...
...
@@ -43,18 +50,15 @@ package() {
"
$pkgdir
"
/etc/conf.d/logrotate
}
md5sums
=
"49846e873dddea15964cd0355b9943ca logrotate-3.8.8.tar.gz
7db9ae27e3589ee2c42a58546c7bd819 qsort.patch
md5sums
=
"2660f30742da79870d15d042b07829f6 logrotate-3.8.9.tar.gz
7e9fad2c9b382a2370c11ef0c89f61c7 logrotate.cron
fef6415a79a6fede8cf9b9b6b8410090 logrotate.conf
e7e4b67d5c4bda49ff3c041834180c1e logrotate.confd"
sha256sums
=
"46a1510ef4a1f4359edd5f361112cfd1523942e85ff28e6cbb0c81bad1829d0f logrotate-3.8.8.tar.gz
03293a5dd559e8b828b25bee2f0cde5766967a9b6238bc4bcd2b421fe53405f5 qsort.patch
sha256sums
=
"700ed7ce9072a1cca324779a74797dfaefdae37ac50a817134b947c4ded1dfa7 logrotate-3.8.9.tar.gz
ccbcf1785c754ce07a55b81223ae5b0c2caec1ccf9cdf865debb140052f9b363 logrotate.cron
c8fbf89e4f3afee4fc59ed5dff246eda9d1ea1cbce38bf9dbabfc3af2f01e951 logrotate.conf
814bea9082cfa3a9446e25f4f4fe4fe205130cea6ba15dc8286409c3d01a3973 logrotate.confd"
sha512sums
=
"2b7b5fe587b3a5cbe98b8035a541b5e272e6e4c40669f65ff6c43d1524b686eca9abc0b93bc00c8eb6da4d189f14a9b79905fcc0fadb914276d884ad7493bb4b logrotate-3.8.8.tar.gz
83af35130bac93e18c1117080903879eaa466dd0a52001c8f32f4815bcb900472728880b367cbf35f94bf47abdf1561f218988be88b6ba732caad01935488b7a qsort.patch
sha512sums
=
"342533f321a1d77c0ca389fd0a393377ba73f10654aae163cbd35f8d5df25673f1aa6e44d0af42be5419d152a7dae11024d9005076bce0a3b3dad1f0e12b9c0d logrotate-3.8.9.tar.gz
f4d708594fb2b240cfc2928f38a180d27c2cecb9867e048dc29a32c0147244db4d2f6d92e7bff27e1f2623537587db87b2f8fc9bb988f98eff0c98f79f5a5bf2 logrotate.cron
8d49880f2477c8e18b8ea4f6c17410635e761a819b0463c3e73447ee06d3f3649ae9ad16f239451ef5d8e308e74102ef8cf2da6a4c5890e8968dd4ecbf6d1e3b logrotate.conf
be9f0043b594d26b4f64e07a2188d19c3c43af75ef726305e4d98f744fc16cee9f280227116858e2f5b781c0a7b58e0209d7e9ab1285dfa7ba55a9dfda700229 logrotate.confd"
main/logrotate/qsort.patch
deleted
100644 → 0
View file @
5a391f02
--- ./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) {
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment