--- Begin Message ---
Source: tablix2
Version: 0.3.5-2
Severity: important
Tags: patch
User: debian-hurd@lists.debian.org
Usertags: hurd
Hello,
tablix2 currently FTBFS on hurd-i386 due to naming of some local
variables the unfortunate name time. On GNU/Hurd inclusion of standard
header files, like stdlib.h indirectly includes /usr/include/time.h,
which defines time(2) creating a variable name conflict. The attached
patch renames these variables to avoid this problem.
diff -ur tablix2-0.3.5/modules/available.c tablix2-0.3.5.new//modules/available.c
--- tablix2-0.3.5/modules/available.c 2006-05-15 21:57:11.000000000 +0200
+++ tablix2-0.3.5.new//modules/available.c 2011-08-23 15:48:58.000000000 +0200
@@ -60,7 +60,7 @@
#include "module.h"
-static resourcetype *time;
+static resourcetype *rtime;
int not_available(char *restriction, char *cont, resource *res)
{
@@ -88,12 +88,12 @@
return -1;
}
- time_resnum=time->resnum;
+ time_resnum=rtime->resnum;
res_typeid=res->restype->typeid;
res_id=res->resid;
- timeslot_resid=res_findid(time, cont);
+ timeslot_resid=res_findid(rtime, cont);
if(timeslot_resid<0) {
error(_("Can't find resource '%s', resource type '%s'"), cont,
"time");
@@ -116,7 +116,7 @@
for(tupleid=0;tupleid<dat_tuplenum;tupleid++) {
if(dat_tuplemap[tupleid].resid[res_typeid]==res_id) {
- domain_and(dat_tuplemap[tupleid].dom[time->typeid],
+ domain_and(dat_tuplemap[tupleid].dom[rtime->typeid],
list, listnum);
}
}
@@ -128,8 +128,8 @@
int module_init(moduleoption *opt)
{
- time=restype_find("time");
- if(time==NULL) return -1;
+ rtime=restype_find("time");
+ if(rtime==NULL) return -1;
handler_res_new(NULL, "not-available", not_available);
diff -ur tablix2-0.3.5/modules/consecutive.c tablix2-0.3.5.new//modules/consecutive.c
--- tablix2-0.3.5/modules/consecutive.c 2006-08-29 16:32:24.000000000 +0200
+++ tablix2-0.3.5.new//modules/consecutive.c 2011-08-23 15:46:17.000000000 +0200
@@ -129,7 +129,7 @@
/* Linked list describing all consecutive blocks */
static struct cons_t *cons=NULL;
-static int time;
+static int rtime;
static int periods, days;
@@ -251,7 +251,7 @@
* scheduled one period later than the independent event. */
int updater(int src, int dst, int typeid, int resid)
{
- assert(typeid==time);
+ assert(typeid==rtime);
return(resid+1);
}
@@ -292,7 +292,7 @@
/* We have to check if this event is already dependent.
* If it is, we report an error. */
- if(updater_check(tupleid, time)) {
+ if(updater_check(tupleid, rtime)) {
error(_("Event '%s' already depends on another"
" event"), dat_tuplemap[tupleid].name);
free(residlist);
@@ -304,7 +304,7 @@
* second event depends on the first. The third event
* depends on the second and so on. */
- updater_new(cur->tupleid[n-1], tupleid, time, updater);
+ updater_new(cur->tupleid[n-1], tupleid, rtime, updater);
}
/* Now we have to make sure that the first event in the group
@@ -323,7 +323,7 @@
}
tupleid=cur->tupleid[0];
- domain_and(dat_tuplemap[tupleid].dom[time],residlist,residnum);
+ domain_and(dat_tuplemap[tupleid].dom[rtime],residlist,residnum);
cur=cur->next;
}
@@ -338,8 +338,8 @@
int c;
/* We store some info about the time resources in global variables. */
- time=restype_findid("time");
- if(time<0) {
+ rtime=restype_findid("time");
+ if(rtime<0) {
error(_("Resource type '%s' not found"), "time");
return -1;
}
diff -ur tablix2-0.3.5/modules/recurrence.c tablix2-0.3.5.new//modules/recurrence.c
--- tablix2-0.3.5/modules/recurrence.c 2006-08-29 16:32:24.000000000 +0200
+++ tablix2-0.3.5.new//modules/recurrence.c 2011-08-23 15:45:45.000000000 +0200
@@ -104,7 +104,7 @@
/* Linked list describing all blocks */
static struct block_t *cons=NULL;
-static int time;
+static int rtime;
/* Number of periods in a day, number of all defined days and number of weeks */
static int periods, days, weeks;
@@ -250,7 +250,7 @@
/* It is possible that this is the last week and it does not
* contain all days. */
- if(resid>=dat_restype[time].resnum) break;
+ if(resid>=dat_restype[rtime].resnum) break;
residlist[n]=resid;
}
@@ -293,7 +293,7 @@
tupleid=cur->tupleid[n];
- domain_and(dat_tuplemap[tupleid].dom[time],
+ domain_and(dat_tuplemap[tupleid].dom[rtime],
residlist, residnum);
if((n+1)%cur->r_perweek==0) {
@@ -314,8 +314,8 @@
int c;
/* We store some info about the time resources in global variables. */
- time=restype_findid("time");
- if(time<0) {
+ rtime=restype_findid("time");
+ if(rtime<0) {
error(_("Resource type '%s' not found"), "time");
return -1;
}
diff -ur tablix2-0.3.5/modules/sametimeas.c tablix2-0.3.5.new//modules/sametimeas.c
--- tablix2-0.3.5/modules/sametimeas.c 2006-08-29 16:32:24.000000000 +0200
+++ tablix2-0.3.5.new//modules/sametimeas.c 2011-08-23 17:58:47.000000000 +0200
@@ -71,7 +71,7 @@
static struct sametime *sa;
static int numsa;
-static int time;
+static int rtime;
static int event_used(int tupleid2) {
int n;
@@ -143,11 +143,11 @@
int c;
for(c=0;c<numsa;c++) {
- if(updater_check(sa[c].tupleid2, time)) {
+ if(updater_check(sa[c].tupleid2, rtime)) {
error(_("Event '%s' already depends on another "
"event"), dat_tuplemap[sa[c].tupleid2].name);
}
- updater_new(sa[c].tupleid1, sa[c].tupleid2, time, updater);
+ updater_new(sa[c].tupleid1, sa[c].tupleid2, rtime, updater);
}
return(0);
}
@@ -163,8 +163,8 @@
}
numsa=0;
- time=restype_findid("time");
- if(time<0) {
+ rtime=restype_findid("time");
+ if(rtime<0) {
error(_("Resource type '%s' not found"), "time");
return -1;
}
--- End Message ---
--- Begin Message ---
Source: hurd
Source-Version: 20111106-1
We believe that the bug you reported is fixed in the latest version of
hurd, which is due to be installed in the Debian FTP archive:
hurd-dbg_20111106-1_hurd-i386.deb
to main/h/hurd/hurd-dbg_20111106-1_hurd-i386.deb
hurd-dev_20111106-1_hurd-i386.deb
to main/h/hurd/hurd-dev_20111106-1_hurd-i386.deb
hurd-doc_20111106-1_all.deb
to main/h/hurd/hurd-doc_20111106-1_all.deb
hurd-udeb_20111106-1_hurd-i386.udeb
to main/h/hurd/hurd-udeb_20111106-1_hurd-i386.udeb
hurd_20111106-1.debian.tar.bz2
to main/h/hurd/hurd_20111106-1.debian.tar.bz2
hurd_20111106-1.dsc
to main/h/hurd/hurd_20111106-1.dsc
hurd_20111106-1_hurd-i386.deb
to main/h/hurd/hurd_20111106-1_hurd-i386.deb
hurd_20111106.orig.tar.gz
to main/h/hurd/hurd_20111106.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 639010@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Samuel Thibault <sthibault@debian.org> (supplier of updated hurd package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Thu, 18 Aug 2011 01:15:04 +0000
Source: hurd
Binary: hurd hurd-dev hurd-dbg hurd-doc hurd-udeb
Architecture: source all hurd-i386
Version: 20111106-1
Distribution: unstable
Urgency: low
Maintainer: GNU Hurd Maintainers <debian-hurd@lists.debian.org>
Changed-By: Samuel Thibault <sthibault@debian.org>
Description:
hurd - GNU Hurd
hurd-dbg - GNU Hurd (debugging files)
hurd-dev - GNU Hurd (development files)
hurd-doc - GNU Hurd manual
hurd-udeb - GNU Hurd - udeb (udeb)
Closes: 637231 639010
Changes:
hurd (20111106-1) unstable; urgency=low
.
* New upstream snapshot.
- Drop debian/patches/ttys.patch.patch, applied upstream.
- Drop debian/patches/auth-intr-cure.patch, applied upstream.
- Drop debian/patches/libpthread_tls.patch, applied upstream.
- debian/patches/libpthread_procfs.patch: Refresh.
- Closes: #639010.
* local/setup-translators:
- Restore /dev/shm creation.
- create /run/shm and /run/lock, to fix locking until we properly start
rcS.d scripts.
- Add cd[01] SCSI CD-ROMs.
* patches/libdiskfs_sync.patch: New patch to fix sync at shutdown.
* patches/libpthread_procfs.patch: Add random server.
* local/setup-translators: Use random server, set up its entropy pool in
/var/spool.
* debian/control, debian/local/setup-translators: Use native random server
set on /dev/u?random-hurd instead of random-egd on /dev/u?random.
(Closes: bug#637231)
* debian/hurd.{postinst,prerm}: Handle alternative for /dev/u?random,
default to u?random-hurd, generate an initial pseudo-random seed.
* debian/hurd.lintian-overrides: Override warnings about the /dev/u?random
mangling.
* debian/local/cdrom.h: Add header for basic CD-ROM ioctl support.
* debian/patches/libpthread_globsigdisp.patch,posix-sigcodes.patch: New
patches from Jeremie Koenig to enable global signal support.
* debian/patches/libpthread_sigmask.patch: Update to global signal support.
* debian/copyright: Fix copyright notice.
* debian/control:
- Drop article from synopsis.
- Tighten hurd-dev dependency on hurd to the same version.
* debian/hurd-udeb.install: Only include the necessary console drivers.
* debian/patches/random-default-fast.patch: Set default randomness to fast,
until we set up a daemon to feed /dev/random with entropy.
Checksums-Sha1:
0b91a7793dd30aed926bcbf2c00c7233047407ef 1752 hurd_20111106-1.dsc
64c3c2abf855ff7eae95a2ed357949a8ebc57c77 2716558 hurd_20111106.orig.tar.gz
dd8085aaf5d65acf33522b1cec8532439b620bdc 84123 hurd_20111106-1.debian.tar.bz2
6b431e9c81e68c5ffb67cd7ee3a35e4c4935a295 197844 hurd-doc_20111106-1_all.deb
28c754f1a939656294615c0db27443e43e792983 3617794 hurd_20111106-1_hurd-i386.deb
4ffd29e2c9bc9b7b0d177e3dae14ec9d60d5c1cb 590050 hurd-dev_20111106-1_hurd-i386.deb
baad24d219d30b52208539293abc10859159ad5e 6505862 hurd-dbg_20111106-1_hurd-i386.deb
42dd2d2cb3ea0545f42ae4d47249361c6b5f4e14 2046868 hurd-udeb_20111106-1_hurd-i386.udeb
Checksums-Sha256:
4a70e9476b6102ef8b0ec6b9f457cb5392c4558b96fcc5719fc3b0736e902bcf 1752 hurd_20111106-1.dsc
8a375827c10719418df82f2e769375831974d915fff1b9cc46aae9fbe59d86e7 2716558 hurd_20111106.orig.tar.gz
8be5499f32dd6af5aa142a2e10f1797960e250ace7dd574109e967e3b23bf8fc 84123 hurd_20111106-1.debian.tar.bz2
6484b08abd9ef329be9a651c2ab71854b429bfb0a5a7049d9b627b774f79f88e 197844 hurd-doc_20111106-1_all.deb
f0d18858263ade6be4a961fec9a808ee705b3a266116fc339d3d6461dcb4a488 3617794 hurd_20111106-1_hurd-i386.deb
a0bb95749dcbb82736eea4c448f2a66404af7f5745644bb67c0b1d1b72356b07 590050 hurd-dev_20111106-1_hurd-i386.deb
9614d3d2b64e94ffd6214b7930aeb4b888736955d60a6bb4d67fcd2ba8760b99 6505862 hurd-dbg_20111106-1_hurd-i386.deb
869f9e8b851b57efb3125575021a472293d5972808fd223bca95e2982bbd6645 2046868 hurd-udeb_20111106-1_hurd-i386.udeb
Files:
1bdb4251ba58980257b00dee0b101bcc 1752 admin required hurd_20111106-1.dsc
25b17d7eb15bb9673271ea1667ce679f 2716558 admin required hurd_20111106.orig.tar.gz
34a58656b31e518ebd631729c12261bb 84123 admin required hurd_20111106-1.debian.tar.bz2
fcc67c390cecd5e6247fc27537c16535 197844 doc optional hurd-doc_20111106-1_all.deb
07990ee279d979afb59d845a376eddbf 3617794 admin required hurd_20111106-1_hurd-i386.deb
81d556dc1557360f98301ccd516f98ef 590050 libdevel standard hurd-dev_20111106-1_hurd-i386.deb
1919a3e61bc7d5c7edf75cac324f03d9 6505862 debug extra hurd-dbg_20111106-1_hurd-i386.deb
68465abec60c09ddaa37e53ebc95b1a8 2046868 debian-installer optional hurd-udeb_20111106-1_hurd-i386.udeb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iF4EAREKAAYFAk62sREACgkQa6Lp0s/HjrMtFQD/XGA/KrHbgUtKPfOoE4fk31nf
+U6VXkthwmwv2sW320sA/ijP+x54eICNUOEAeViw59jGGW3Smjb9Wc5b0WOxLatf
=gOxa
-----END PGP SIGNATURE-----
--- End Message ---