Commit 8d5ebf9d authored by Christoph Biedl's avatar Christoph Biedl Committed by Tobias Frost

Import Debian changes 3.11.0-0.1

logrotate (3.11.0-0.1) unstable; urgency=low

  * Non-maintainer upload
  * New upstream version 3.11.0  Closes: #734688
  * Refresh patch queue, and fix several regressions
  * Update watch file. Closes: #844578, also Homepage information
  * Specify bsd-mailx as default mailx provider. Closes: #849743
parent 7b932b6b
logrotate (3.11.0-0.1~exp2) experimental; urgency=medium
logrotate (3.11.0-0.1) unstable; urgency=low
* Non-maintainer upload to experimental
* Add build depency on automake, appearently needed on some buildds
* Non-maintainer upload
* New upstream version 3.11.0 Closes: #734688
* Refresh patch queue, and fix several regressions
* Update watch file. Closes: #844578, also Homepage information
* Specify bsd-mailx as default mailx provider. Closes: #849743
-- Christoph Biedl <debian.axhn@manchmal.in-ulm.de> Thu, 05 Jan 2017 21:48:11 +0100
logrotate (3.11.0-0.1~exp1) experimental; urgency=medium
* Non-maintainer upload to experimental
* New upstream version 3.11.0 Closes: #734688
* Refresh patch queue
- Now upstream:
+ datehack.patch
+ mktime-718332.patch
+ man-su-explanation-729315.patch
- deb-config-h.patch: New way to enforce status file location
* Update watch file. Closes: #844578
* Update Homepage: information
* Allow failure in the clean target
* Fix broken test suite runner
-- Christoph Biedl <debian.axhn@manchmal.in-ulm.de> Thu, 29 Dec 2016 20:51:10 +0100
-- Christoph Biedl <debian.axhn@manchmal.in-ulm.de> Sat, 07 Jan 2017 19:54:50 +0100
logrotate (3.8.7-2) unstable; urgency=low
......
Subject: Make expect value in test 62 depend on page size
Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
Bug:
https://buildd.debian.org/status/fetch.php?pkg=logrotate&arch=powerpc&ver=3.11.0-0.1~exp2&stamp=1483609625
https://buildd.debian.org/status/fetch.php?pkg=logrotate&arch=ppc64el&ver=3.11.0-0.1~exp2&stamp=1483609707
The Debian buildds, at least those running ppc64el (they also build
for powerpc) put the source tree into a tmpfs. A tmpfs allocates
memory per page, and with an unusually huge page size of 64Ki, the
two pages needed for a sparse file with some content as created in
test 62, 128Ki are actually allocated - which is more than the limit
of 100 in the test.
So get the actual pagesize and raise the limits if it's 32Ki or
more. The second limit is wild-guessed, in the failing test the
value was 10304 (= 131 pages).
On a 4Ki-page system (amd64), the observed values were 8 (= two
pages), and 12 (= three pages).
Reproducer:
printf zero > test.log ; truncate -s 10M test.log ; echo x >> test.log ; du test.log
--- a/test/test
+++ b/test/test
@@ -1597,7 +1597,15 @@
exit 3
fi
-if [ $SIZE_SPARSE_OLD -gt 100 ] || [ $SIZE_SPARSE_NEW -gt 100 ]; then
+PAGESIZE="$(getconf PAGESIZE)"
+if [ -z "$PAGESIZE" ] || [ "$PAGESIZE" -lt 32768 ] ; then
+ LIMIT1=100
+ LIMIT2=100
+else
+ LIMIT1=200
+ LIMIT2=20000
+fi
+if [ $SIZE_SPARSE_OLD -gt $LIMIT1 ] || [ $SIZE_SPARSE_NEW -gt $LIMIT2 ]; then
echo "Bad size of sparse logs"
echo "test.log: $SIZE_SPARSE_OLD"
echo "test.log.1: $SIZE_SPARSE_NEW"
......@@ -4,3 +4,4 @@ cpp-crossbuild.patch
chown-484762.patch
taboo-716649.patch
fix-test-breakage.patch
fix-test-pagesize.patch
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment