Commit c5addb36 authored by Anibal Monsalve Salazar's avatar Anibal Monsalve Salazar Committed by Axel Beckert

Imported Debian patch 1.1-4.1

parent 0f10dc82
since (1.1-5) UNRELEASED; urgency=medium
since (1.1-4.1) unstable; urgency=medium
* Make adequate messages trigger a failure in the adequate autopkgtest
* Output content of .since in case of test failure
* Add patch to fix malfunctioning on mips(el). (Closes: #742940)
Thanks Aleksandar Zlicic!
* Non-maintainer upload.
* For mips/mipsel ABIO32, define int d_dev as unsigned long int.
Add dev_t.patch.
Patch by Aleksandar Zlicic.
Closes: #742940
-- Axel Beckert <abe@debian.org> Mon, 31 Mar 2014 02:35:15 +0200
-- Anibal Monsalve Salazar <anibal@debian.org> Tue, 08 Apr 2014 05:35:53 +0100
since (1.1-4) unstable; urgency=medium
......
Description: Fix malfunctioning on mips and mipsel
The cause of problem is that st_dev member of structure stat,
defined in /usr/include/mipsel-linux-gnu/bits/stat.h,
is expected to be of type dev_t.
But for mips/mipsel ABIO32 it is defined as 'unsigned long int'.
dev_t type is defined as 'unsigned long long int'.
Author: Aleksandar Zlicic <Aleksandar.Zlicic@imgtec.com>
Bug-Debian: https://bugs.debian.org/742940
Forwarded: yes
Date: Mon, 7 Apr 2014 21:00:39 +0200
From: Aleksandar Zlicic <Aleksandar.Zlicic@imgtec.com>
Subject: For mips/mipsel ABIO32, define int d_dev as unsigned long int
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=742940
The cause of this problem is that st_dev member of structure stat,
defined in /usr/include/mipsel-linux-gnu/bits/stat.h,
is expected to be of type dev_t.
But for mips/mipsel ABIO32 it is defined as 'unsigned long int'.
And dev_t type is defined as 'unsigned long long int'.
Same behavior is observed on hurd-i386:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=591386
Attached patch fixes package on mips/mipsel.
Index: since-1.1/since.c
===================================================================
--- since-1.1.orig/since.c 2014-04-03 14:01:50.000000000 +0000
+++ since-1.1/since.c 2014-04-07 15:32:15.000000000 +0000
@@ -52,7 +52,11 @@
--- a/since.c 2014-04-08 01:51:28.000000000 +0100
+++ b/since.c 2014-04-08 01:53:10.615161295 +0100
@@ -52,7 +52,11 @@ struct fmt_map{
struct data_file{
int d_fd;
char *d_name;
......
#!/bin/sh
adequate since >&2
exec adequate since
......@@ -14,23 +14,23 @@ rm -f .since example.txt example.txt
echo TESTING: -z
echo foo > example.txt
echo bar > example2.txt
test -z "`since -z example.txt`" || ( cat .since && exit 2 )
test -z "`since -z example2.txt`" || ( cat .since && exit 3 )
test -z "`since -z example.txt`"
test -z "`since -z example2.txt`"
echo TESTING: default action
echo bar >> example.txt
test "`since example.txt`" = "bar" || ( cat .since && exit 4 )
test "`since example.txt`" = "bar"
echo TESTING: reset
echo fnord > example.txt
test "`since example.txt 2>&1`" = "since: considering example.txt to be truncated, displaying from start
fnord" || ( cat .since && exit 5 )
fnord"
echo TESTING: -z multiple files
echo hurz >> example.txt
echo bla >> example2.txt
test "`since -z example.txt example2.txt`" = "==> example.txt [discarded] <==
==> example2.txt [discarded] <==" || ( cat .since && exit 6 )
==> example2.txt [discarded] <=="
echo TESTING: default action multiple files
echo flarp >> example.txt
......@@ -38,4 +38,4 @@ echo gnarz >> example2.txt
test "`since example.txt example2.txt`" = "==> example.txt <==
flarp
==> example2.txt <==
gnarz" || ( cat .since && exit 7 )
gnarz"
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