summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debian/changelog11
-rw-r--r--debian/control4
-rw-r--r--debian/patches/in6_addr.patch52
-rw-r--r--debian/patches/libpthread_mutex_owner.patch135
-rw-r--r--debian/patches/libpthread_rwlock_initializer.patch16
-rw-r--r--debian/patches/series3
-rw-r--r--debian/patches/stat-fix.patch163
7 files changed, 6 insertions, 378 deletions
diff --git a/debian/changelog b/debian/changelog
index dac8cd69..ddf38a35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hurd (20080921-1) UNRELEASED; urgency=low
+hurd (20090404-1) unstable; urgency=low
[ Michael Banck ]
* New snapshot from CVS.
@@ -38,11 +38,6 @@ hurd (20080921-1) UNRELEASED; urgency=low
[ Samuel Thibault ]
* debian/patches/thread-throttle.patch: Remove patch, makes ext2fs hang on
big syncs.
- * debian/patches/libpthread_rwlock_initializer.patch: New patch, add missing
- PTHREAD_RWLOCK_INITIALIZER.
- * debian/patches/stat-fix.patch: New patch, fixes some timestamp issues.
- * debian/patches/in6_addr.patch: New patch to fix compilation under libc
- 2.9.
* debian/control (Build-Depends): Bump libc0.3-dev to (>= 2.9).
* debian/patches/stat_round.patch: New temporary patch, fixes symlink issues
with tar.
@@ -59,11 +54,13 @@ hurd (20080921-1) UNRELEASED; urgency=low
* debian/patches/libpthread_recursive_mutex_initializer.patch: New patch
to fix the recursive mutex initializers usage in libraries not linking
against libpthread.
+ * debian/control: Now using Standards-Version 3.8.2 (no changes needed).
+ * debian/control: Add myself to uploaders.
[ Guillem Jover ]
* Change hurd-dbg section to debug.
- -- Michael Banck <mbanck@debian.org> Sat, 13 Sep 2008 23:43:27 +0200
+ -- Samuel Thibault <sthibault@debian.org> Sun, 28 Jun 2009 22:19:07 +0000
hurd (20080607-6) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 23665a4c..20cb0a76 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: hurd
Section: admin
Priority: required
Maintainer: GNU Hurd Maintainers <debian-hurd@lists.debian.org>
-Standards-Version: 3.7.3
+Standards-Version: 3.8.2
Build-Depends: mig (>= 1.3-2), gnumach-dev (>= 2:1.3.99.dfsg.cvs20070526-1),
libc0.3-dev (>= 2.9), texinfo, texi2html, libncursesw5-dev, cdbs, quilt
debhelper (>= 4.2.0), gcc-4.2
Uploaders: Jeff Bailey <jbailey@raspberryginger.com>,
Marcus Brinkmann <brinkmd@debian.org>, Neal H. Walfield <neal@debian.org>,
- Michael Banck <mbanck@debian.org>
+ Michael Banck <mbanck@debian.org>, Samuel Thibault <sthibault@debian.org>
Homepage: http://www.gnu.org/software/hurd/hurd.html
Vcs-Browser: http://svn.debian.org/wsvn/pkg-hurd/hurd/
Vcs-Svn: svn://svn.debian.org/pkg-hurd/hurd/trunk/
diff --git a/debian/patches/in6_addr.patch b/debian/patches/in6_addr.patch
deleted file mode 100644
index cde4bf3a..00000000
--- a/debian/patches/in6_addr.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- hurd/pfinet/linux-src/net/ipv6/addrconf.c.orig 2009-01-30 22:07:40.725250000 +0000
-+++ hurd/pfinet/linux-src/net/ipv6/addrconf.c 2009-01-30 22:07:44.705616000 +0000
-@@ -192,7 +192,7 @@
-
- if ((addr->s6_addr32[0] | addr->s6_addr32[1]) == 0) {
- if (addr->s6_addr32[2] == 0) {
-- if (addr->in6_u.u6_addr32[3] == 0)
-+ if (addr->__in6_u.__u6_addr32[3] == 0)
- return IPV6_ADDR_ANY;
-
- if (addr->s6_addr32[3] == __constant_htonl(0x00000001))
---- hurd/pfinet/linux-src/net/ipv6/icmpv6.c.orig 2009-01-30 22:15:23.522525000 +0000
-+++ hurd/pfinet/linux-src/net/ipv6/icmpv6.c 2009-01-30 22:15:27.000000000 +0000
-@@ -479,22 +479,22 @@
- if (csum_ipv6_magic(saddr, daddr, len, IPPROTO_ICMPV6,
- skb->csum)) {
- printk(KERN_DEBUG "ICMPv6 checksum failed [%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x > %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]\n",
-- ntohs(saddr->in6_u.u6_addr16[0]),
-- ntohs(saddr->in6_u.u6_addr16[1]),
-- ntohs(saddr->in6_u.u6_addr16[2]),
-- ntohs(saddr->in6_u.u6_addr16[3]),
-- ntohs(saddr->in6_u.u6_addr16[4]),
-- ntohs(saddr->in6_u.u6_addr16[5]),
-- ntohs(saddr->in6_u.u6_addr16[6]),
-- ntohs(saddr->in6_u.u6_addr16[7]),
-- ntohs(daddr->in6_u.u6_addr16[0]),
-- ntohs(daddr->in6_u.u6_addr16[1]),
-- ntohs(daddr->in6_u.u6_addr16[2]),
-- ntohs(daddr->in6_u.u6_addr16[3]),
-- ntohs(daddr->in6_u.u6_addr16[4]),
-- ntohs(daddr->in6_u.u6_addr16[5]),
-- ntohs(daddr->in6_u.u6_addr16[6]),
-- ntohs(daddr->in6_u.u6_addr16[7]));
-+ ntohs(saddr->__in6_u.__u6_addr16[0]),
-+ ntohs(saddr->__in6_u.__u6_addr16[1]),
-+ ntohs(saddr->__in6_u.__u6_addr16[2]),
-+ ntohs(saddr->__in6_u.__u6_addr16[3]),
-+ ntohs(saddr->__in6_u.__u6_addr16[4]),
-+ ntohs(saddr->__in6_u.__u6_addr16[5]),
-+ ntohs(saddr->__in6_u.__u6_addr16[6]),
-+ ntohs(saddr->__in6_u.__u6_addr16[7]),
-+ ntohs(daddr->__in6_u.__u6_addr16[0]),
-+ ntohs(daddr->__in6_u.__u6_addr16[1]),
-+ ntohs(daddr->__in6_u.__u6_addr16[2]),
-+ ntohs(daddr->__in6_u.__u6_addr16[3]),
-+ ntohs(daddr->__in6_u.__u6_addr16[4]),
-+ ntohs(daddr->__in6_u.__u6_addr16[5]),
-+ ntohs(daddr->__in6_u.__u6_addr16[6]),
-+ ntohs(daddr->__in6_u.__u6_addr16[7]));
- goto discard_it;
- }
- default:
diff --git a/debian/patches/libpthread_mutex_owner.patch b/debian/patches/libpthread_mutex_owner.patch
index 470023cc..684a7de5 100644
--- a/debian/patches/libpthread_mutex_owner.patch
+++ b/debian/patches/libpthread_mutex_owner.patch
@@ -1,138 +1,3 @@
-Index: libpthread/sysdeps/generic/pt-mutex-timedlock.c
-===================================================================
-RCS file: /sources/hurd/hurd-l4/libpthread/sysdeps/generic/pt-mutex-timedlock.c,v
-retrieving revision 1.4
-diff -u -p -r1.4 pt-mutex-timedlock.c
---- libpthread/sysdeps/generic/pt-mutex-timedlock.c 22 Jun 2008 08:58:20 -0000 1.4
-+++ libpthread/sysdeps/generic/pt-mutex-timedlock.c 1 Oct 2008 10:37:20 -0000
-@@ -36,6 +36,7 @@ __pthread_mutex_timedlock_internal (stru
- if (__pthread_spin_trylock (&mutex->__held) == 0)
- /* Successfully acquired the lock. */
- {
-+#ifdef ALWAYS_TRACK_OWNER
- #ifndef NDEBUG
- self = _pthread_self ();
- if (self)
-@@ -47,6 +48,7 @@ __pthread_mutex_timedlock_internal (stru
- mutex->owner = _pthread_self ();
- }
- #endif
-+#endif
-
- if (mutex->attr)
- switch (mutex->attr->mutex_type)
-@@ -73,14 +75,16 @@ __pthread_mutex_timedlock_internal (stru
- self = _pthread_self ();
- assert (self);
-
-- if (mutex->attr)
-+ if (! mutex->attr || mutex->attr->mutex_type == PTHREAD_MUTEX_NORMAL)
-+ {
-+#if defined(ALWAYS_TRACK_MUTEX_OWNER)
-+ assert (mutex->owner != self);
-+#endif
-+ }
-+ else
- {
- switch (mutex->attr->mutex_type)
- {
-- case PTHREAD_MUTEX_NORMAL:
-- assert (mutex->owner != self);
-- break;
--
- case PTHREAD_MUTEX_ERRORCHECK:
- if (mutex->owner == self)
- {
-@@ -102,10 +106,11 @@ __pthread_mutex_timedlock_internal (stru
- LOSE;
- }
- }
-- else
-- assert (mutex->owner != self);
-
-- assert (mutex->owner);
-+#if !defined(ALWAYS_TRACK_MUTEX_OWNER)
-+ if (mutex->attr && mutex->attr->mutex_type != PTHREAD_MUTEX_NORMAL)
-+#endif
-+ assert (mutex->owner);
-
- if (abstime && (abstime->tv_nsec < 0 || abstime->tv_nsec >= 1000000000))
- return EINVAL;
-@@ -141,9 +146,12 @@ __pthread_mutex_timedlock_internal (stru
- else
- __pthread_block (self);
-
--#ifndef NDEBUG
-- assert (mutex->owner == self);
-+#if !defined(ALWAYS_TRACK_MUTEX_OWNER)
-+ if (mutex->attr && mutex->attr->mutex_type != PTHREAD_MUTEX_NORMAL)
- #endif
-+ {
-+ assert (mutex->owner == self);
-+ }
-
- if (mutex->attr)
- switch (mutex->attr->mutex_type)
-Index: libpthread/sysdeps/generic/pt-mutex-transfer-np.c
-===================================================================
-RCS file: /sources/hurd/hurd-l4/libpthread/sysdeps/generic/pt-mutex-transfer-np.c,v
-retrieving revision 1.1
-diff -u -p -r1.1 pt-mutex-transfer-np.c
---- libpthread/sysdeps/generic/pt-mutex-transfer-np.c 1 Mar 2008 13:07:22 -0000 1.1
-+++ libpthread/sysdeps/generic/pt-mutex-transfer-np.c 1 Oct 2008 10:37:20 -0000
-@@ -45,7 +45,12 @@ __pthread_mutex_transfer_np (struct __pt
- }
-
- #ifndef NDEBUG
-- mutex->owner = thread;
-+# if !defined(ALWAYS_TRACK_MUTEX_OWNER)
-+ if (mutex->attr && mutex->attr->mutex_type != PTHREAD_MUTEX_NORMAL)
-+# endif
-+ {
-+ mutex->owner = thread;
-+ }
- #endif
-
- return 0;
-Index: libpthread/sysdeps/generic/pt-mutex-unlock.c
-===================================================================
-RCS file: /sources/hurd/hurd-l4/libpthread/sysdeps/generic/pt-mutex-unlock.c,v
-retrieving revision 1.5
-diff -u -p -r1.5 pt-mutex-unlock.c
---- libpthread/sysdeps/generic/pt-mutex-unlock.c 22 Jun 2008 09:16:45 -0000 1.5
-+++ libpthread/sysdeps/generic/pt-mutex-unlock.c 1 Oct 2008 10:37:20 -0000
-@@ -33,7 +33,8 @@ __pthread_mutex_unlock (pthread_mutex_t
-
- if (! mutex->attr || mutex->attr->mutex_type == PTHREAD_MUTEX_NORMAL)
- {
--#ifndef NDEBUG
-+#if defined(ALWAYS_TRACK_MUTEX_OWNER)
-+# ifndef NDEBUG
- if (_pthread_self ())
- {
- assert (mutex->owner);
-@@ -45,6 +46,7 @@ __pthread_mutex_unlock (pthread_mutex_t
- _pthread_self ()->threadid);
- mutex->owner = NULL;
- }
-+# endif
- #endif
- }
- else
-@@ -84,7 +86,12 @@ __pthread_mutex_unlock (pthread_mutex_t
- __pthread_dequeue (wakeup);
-
- #ifndef NDEBUG
-- mutex->owner = wakeup;
-+# if !defined (ALWAYS_TRACK_MUTEX_OWNER)
-+ if (mutex->attr && mutex->attr->mutex_type != PTHREAD_MUTEX_NORMAL)
-+# endif
-+ {
-+ mutex->owner = wakeup;
-+ }
- #endif
-
- /* We do not unlock MUTEX->held: we are transferring the ownership
Index: libpthread/sysdeps/generic/pt-mutex-trylock.c
===================================================================
RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-mutex-trylock.c,v
diff --git a/debian/patches/libpthread_rwlock_initializer.patch b/debian/patches/libpthread_rwlock_initializer.patch
deleted file mode 100644
index f54617ac..00000000
--- a/debian/patches/libpthread_rwlock_initializer.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: libpthread/include/pthread/pthread.h
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/include/pthread/pthread.h,v
-retrieving revision 1.15
-retrieving revision 1.16
-diff -u -p -r1.15 -r1.16
---- libpthread/include/pthread/pthread.h 12 Aug 2008 15:07:49 -0000 1.15
-+++ libpthread/include/pthread/pthread.h 21 Dec 2008 18:41:27 -0000 1.16
-@@ -521,6 +521,7 @@ extern int pthread_rwlockattr_setpshared
-
- #include <bits/rwlock.h>
-
-+#define PTHREAD_RWLOCK_INITIALIZER __PTHREAD_RWLOCK_INITIALIZER
- /* Create a rwlock object with attributes given by ATTR and strore the
- result in *RWLOCK. */
- extern int pthread_rwlock_init (pthread_rwlock_t *__restrict rwlock,
diff --git a/debian/patches/series b/debian/patches/series
index 9365185c..7a11067a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@ init_try_runsystem.gnu.patch -p0
install-msgids.diff -p2
libpager_update_seqno.patch -p0
libpthread_mutex_owner.patch -p0
-libpthread_rwlock_initializer.patch -p0
libpthread_stubs.patch -p0
libpthread_tls.patch -p0
makedev.diff -p0
@@ -19,8 +18,6 @@ startup-usr-support.patch -p0
tmp_exec_startup.patch -p0
ttys.patch -p1
uptime_w_path_fix.patch -p1
-stat-fix.patch -p0
-in6_addr.patch -p1
stat_round.patch -p0
dir_acces_fix.patch -p0
libports_stability.patch -p0
diff --git a/debian/patches/stat-fix.patch b/debian/patches/stat-fix.patch
deleted file mode 100644
index 74a4c131..00000000
--- a/debian/patches/stat-fix.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-Index: libftpconn/unix.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libftpconn/unix.c,v
-retrieving revision 1.12
-diff -u -p -r1.12 unix.c
---- libftpconn/unix.c 19 Oct 2002 20:11:14 -0000 1.12
-+++ libftpconn/unix.c 2 Feb 2009 01:36:56 -0000
-@@ -510,12 +510,13 @@ drwxrwxrwt 7 34 archive 51
- else
- tm.tm_year = PARSE_INT () - 1900;
-
-- stat->st_mtime = mktime (&tm);
-- if (stat->st_mtime == (time_t)-1)
-+ stat->st_mtim.tv_sec = mktime (&tm);
-+ if (stat->st_mtim.tv_sec == (time_t)-1)
- return EGRATUITOUS;
-
- /* atime and ctime are the same as mtime. */
-- stat->st_atime = stat->st_ctime = stat->st_mtime;
-+ stat->st_atim.tv_sec = stat->st_ctim.tv_sec = stat->st_mtim.tv_sec;
-+ stat->st_atim.tv_nsec = stat->st_ctim.tv_nsec = stat->st_mtim.tv_nsec = 0;
-
- /* Update *LINE to point to the filename. */
- SKIP_WS ();
-Index: tmpfs/tmpfs.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/tmpfs/tmpfs.c,v
-retrieving revision 1.16
-diff -u -p -r1.16 tmpfs.c
---- tmpfs/tmpfs.c 20 Mar 2005 02:21:31 -0000 1.16
-+++ tmpfs/tmpfs.c 2 Feb 2009 01:36:56 -0000
-@@ -355,9 +355,9 @@ main (int argc, char **argv)
- diskfs_root_node->dn_stat.st_uid = st.st_uid;
- diskfs_root_node->dn_stat.st_author = st.st_author;
- diskfs_root_node->dn_stat.st_gid = st.st_gid;
-- diskfs_root_node->dn_stat.st_atime = st.st_atime;
-- diskfs_root_node->dn_stat.st_mtime = st.st_mtime;
-- diskfs_root_node->dn_stat.st_ctime = st.st_ctime;
-+ diskfs_root_node->dn_stat.st_atim = st.st_atim;
-+ diskfs_root_node->dn_stat.st_mtim = st.st_mtim;
-+ diskfs_root_node->dn_stat.st_ctim = st.st_ctim;
- diskfs_root_node->dn_stat.st_flags = st.st_flags;
- }
- diskfs_root_node->dn_stat.st_mode &= ~S_ITRANS;
-Index: tmpfs/tmpfs.h
-===================================================================
-RCS file: /cvsroot/hurd/hurd/tmpfs/tmpfs.h,v
-retrieving revision 1.2
-diff -u -p -r1.2 tmpfs.h
---- tmpfs/tmpfs.h 30 Dec 2000 19:11:29 -0000 1.2
-+++ tmpfs/tmpfs.h 2 Feb 2009 01:36:56 -0000
-@@ -35,7 +35,7 @@ struct disknode
- nlink_t nlink;
- uid_t uid, author;
- gid_t gid;
-- time_t atime, mtime, ctime;
-+ struct timespec atime, mtime, ctime;
- unsigned int flags;
-
- char *trans;
-Index: tmpfs/node.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/tmpfs/node.c,v
-retrieving revision 1.12
-diff -u -p -r1.12 node.c
---- tmpfs/node.c 11 Jun 2002 21:40:50 -0000 1.12
-+++ tmpfs/node.c 2 Feb 2009 01:36:56 -0000
-@@ -96,9 +96,9 @@ diskfs_node_norefs (struct node *np)
- np->dn->uid = np->dn_stat.st_uid;
- np->dn->author = np->dn_stat.st_author;
- np->dn->gid = np->dn_stat.st_gid;
-- np->dn->atime = np->dn_stat.st_atime;
-- np->dn->mtime = np->dn_stat.st_mtime;
-- np->dn->ctime = np->dn_stat.st_ctime;
-+ np->dn->atime = np->dn_stat.st_atim;
-+ np->dn->mtime = np->dn_stat.st_mtim;
-+ np->dn->ctime = np->dn_stat.st_ctim;
- np->dn->flags = np->dn_stat.st_flags;
-
- switch (np->dn->type)
-@@ -200,9 +200,9 @@ diskfs_cached_lookup (ino_t inum, struct
- st->st_uid = dn->uid;
- st->st_author = dn->author;
- st->st_gid = dn->gid;
-- st->st_atime = dn->atime;
-- st->st_mtime = dn->mtime;
-- st->st_ctime = dn->ctime;
-+ st->st_atim = dn->atime;
-+ st->st_mtim = dn->mtime;
-+ st->st_ctim = dn->ctime;
- st->st_flags = dn->flags;
-
- st->st_rdev = 0;
-Index: ftpfs/dir.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/ftpfs/dir.c,v
-retrieving revision 1.14
-diff -u -p -r1.14 dir.c
---- ftpfs/dir.c 23 Oct 2002 02:36:53 -0000 1.14
-+++ ftpfs/dir.c 2 Feb 2009 01:36:56 -0000
-@@ -532,7 +532,9 @@ ftpfs_refresh_node (struct node *node)
- }
- }
-
-- if ((entry->stat.st_mtime < node->nn_stat.st_mtime
-+ if ((entry->stat.st_mtim.tv_sec < node->nn_stat.st_mtim.tv_sec
-+ || (entry->stat.st_mtim.tv_sec == node->nn_stat.st_mtim.tv_sec
-+ && entry->stat.st_mtim.tv_nsec < node->nn_stat.st_mtim.tv_nsec)
- || entry->stat.st_size != node->nn_stat.st_size)
- && nn && nn->contents)
- /* The file has changed. */
-Index: login/utmp.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/login/utmp.c,v
-retrieving revision 1.4
-diff -u -p -r1.4 utmp.c
---- login/utmp.c 11 Jul 1999 05:31:04 -0000 1.4
-+++ login/utmp.c 2 Feb 2009 01:36:56 -0000
-@@ -326,12 +326,12 @@ S_login_get_idle_time(file_t utmp, time_
- {
- struct stat stat;
- if (stat(dev, &state) == 0
-- && (stat.st_atime < tv->seconds
-- || (stat.st_atime == tv->seconds
-- && stat.st_atime_usec < tv->microseconds)))
-+ && (stat.st_atim.tv_sec < tv->seconds
-+ || (stat.st_atim.tv_sec == tv->seconds
-+ && stat.st_atim.tv_nsec / 1000 < tv->microseconds)))
- {
-- tv->seconds = stat.st_atime;
-- tv->microseconds = stat.st_atime_usec;
-+ tv->seconds = stat.st_atim.tv_sc;
-+ tv->microseconds = stat.st_atim.tv_nsec / 1000;
- }
- }
- }
-Index: libdiskfs/file-utimes.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libdiskfs/file-utimes.c,v
-retrieving revision 1.8
-diff -u -p -r1.8 file-utimes.c
---- libdiskfs/file-utimes.c 31 Jan 1999 23:49:27 -0000 1.8
-+++ libdiskfs/file-utimes.c 2 Feb 2009 01:36:56 -0000
-@@ -32,7 +32,8 @@ diskfs_S_file_utimes (struct protid *cre
- np->dn_set_atime = 1;
- else
- {
-- np->dn_stat.st_atime = atime.seconds;
-+ np->dn_stat.st_atim.tv_sec = atime.seconds;
-+ np->dn_stat.st_atim.tv_nsec = atime.microseconds * 1000;
- np->dn_set_atime = 0;
- }
-
-@@ -40,7 +41,8 @@ diskfs_S_file_utimes (struct protid *cre
- np->dn_set_mtime = 1;
- else
- {
-- np->dn_stat.st_mtime = mtime.seconds;
-+ np->dn_stat.st_mtim.tv_sec = mtime.seconds;
-+ np->dn_stat.st_mtim.tv_nsec = mtime.microseconds * 1000;
- np->dn_set_mtime = 0;
- }
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-17 08:23:07 +0000