[hurd] 01/03: Fix build against glibc 2.21

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository hurd.

commit 44d6ced769ee31587d9d43b64c44f910ce6ad569
Author: Samuel Thibault <address@hidden>
Date:   Sun Aug 30 23:49:59 2015 +0000

    Fix build against glibc 2.21
---
 debian/patches/format           | 78 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/glibc_2.21.patch | 27 ++++++++++++++
 debian/patches/series           |  2 ++
 3 files changed, 107 insertions(+)

diff --git a/debian/patches/format b/debian/patches/format
new file mode 100644
index 0000000..97322d6
--- /dev/null
+++ b/debian/patches/format
@@ -0,0 +1,78 @@
+Index: hurd-debian/libdde-linux26/contrib/lib/kobject.c
+===================================================================
+--- hurd-debian.orig/libdde-linux26/contrib/lib/kobject.c
++++ hurd-debian/libdde-linux26/contrib/lib/kobject.c
+@@ -794,7 +794,7 @@ static struct kset *kset_create(const ch
+       kset = kzalloc(sizeof(*kset), GFP_KERNEL);
+       if (!kset)
+               return NULL;
+-      kobject_set_name(&kset->kobj, name);
++      kobject_set_name(&kset->kobj, "%s", name);
+       kset->uevent_ops = uevent_ops;
+       kset->kobj.parent = parent_kobj;
+ 
+Index: hurd-debian/libdde-linux26/contrib/drivers/base/attribute_container.c
+===================================================================
+--- hurd-debian.orig/libdde-linux26/contrib/drivers/base/attribute_container.c
++++ hurd-debian/libdde-linux26/contrib/drivers/base/attribute_container.c
+@@ -167,7 +167,7 @@ attribute_container_add_device(struct de
+               ic->classdev.parent = get_device(dev);
+               ic->classdev.class = cont->class;
+               cont->class->dev_release = attribute_container_release;
+-              dev_set_name(&ic->classdev, dev_name(dev));
++              dev_set_name(&ic->classdev, "%s", dev_name(dev));
+               if (fn)
+                       fn(cont, dev, &ic->classdev);
+               else
+Index: hurd-debian/libdde-linux26/contrib/drivers/base/platform.c
+===================================================================
+--- hurd-debian.orig/libdde-linux26/contrib/drivers/base/platform.c
++++ hurd-debian/libdde-linux26/contrib/drivers/base/platform.c
+@@ -244,7 +244,7 @@ int platform_device_add(struct platform_
+       if (pdev->id != -1)
+               dev_set_name(&pdev->dev, "%s.%d", pdev->name,  pdev->id);
+       else
+-              dev_set_name(&pdev->dev, pdev->name);
++              dev_set_name(&pdev->dev, "%s", pdev->name);
+ 
+       for (i = 0; i < pdev->num_resources; i++) {
+               struct resource *p, *r = &pdev->resource[i];
+Index: hurd-debian/libdde-linux26/contrib/net/core/net-sysfs.c
+===================================================================
+--- hurd-debian.orig/libdde-linux26/contrib/net/core/net-sysfs.c
++++ hurd-debian/libdde-linux26/contrib/net/core/net-sysfs.c
+@@ -498,7 +498,7 @@ int netdev_register_kobject(struct net_d
+       dev->groups = groups;
+ 
+       BUILD_BUG_ON(BUS_ID_SIZE < IFNAMSIZ);
+-      dev_set_name(dev, net->name);
++      dev_set_name(dev, "%s", net->name);
+ 
+ #ifdef CONFIG_SYSFS
+       *groups++ = &netstat_group;
+Index: hurd-debian/libdde-linux26/lib/src/drivers/base/core.c
+===================================================================
+--- hurd-debian.orig/libdde-linux26/lib/src/drivers/base/core.c
++++ hurd-debian/libdde-linux26/lib/src/drivers/base/core.c
+@@ -1253,7 +1253,7 @@ struct device *__root_device_register(co
+       if (!root)
+               return ERR_PTR(err);
+ 
+-      err = dev_set_name(&root->dev, name);
++      err = dev_set_name(&root->dev, "%s", name);
+       if (err) {
+               kfree(root);
+               return ERR_PTR(err);
+Index: hurd-debian/libdde-linux26/contrib/drivers/base/sys.c
+===================================================================
+--- hurd-debian.orig/libdde-linux26/contrib/drivers/base/sys.c
++++ hurd-debian/libdde-linux26/contrib/drivers/base/sys.c
+@@ -137,7 +137,7 @@ int sysdev_class_register(struct sysdev_
+       cls->kset.kobj.parent = &system_kset->kobj;
+       cls->kset.kobj.ktype = &ktype_sysdev_class;
+       cls->kset.kobj.kset = system_kset;
+-      kobject_set_name(&cls->kset.kobj, cls->name);
++      kobject_set_name(&cls->kset.kobj, "%s", cls->name);
+       return kset_register(&cls->kset);
+ }
+ 
diff --git a/debian/patches/glibc_2.21.patch b/debian/patches/glibc_2.21.patch
new file mode 100644
index 0000000..09cc856
--- /dev/null
+++ b/debian/patches/glibc_2.21.patch
@@ -0,0 +1,27 @@
+Index: hurd-debian/Makeconf
+===================================================================
+--- hurd-debian.orig/Makeconf
++++ hurd-debian/Makeconf
+@@ -77,7 +77,7 @@ INCLUDES += -I.. $(top_srcdirinc)
+ endif
+ INCLUDES += -I$(..)include -I$(top_srcdir)/include
+ CPPFLAGS += $(INCLUDES) \
+-           -D_GNU_SOURCE -D_IO_MTSAFE_IO -D_FILE_OFFSET_BITS=64 \
++           -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
+           $($*-CPPFLAGS)
+ CFLAGS += -std=gnu99 $(gnu89-inline-CFLAGS) -Wall -g -O3 \
+           $($*-CFLAGS)
+Index: hurd-debian/libthreads/lockfile.c
+===================================================================
+--- hurd-debian.orig/libthreads/lockfile.c
++++ hurd-debian/libthreads/lockfile.c
+@@ -17,6 +17,9 @@
+    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+    Boston, MA 02111-1307, USA.  */
+ 
++#define _IO_MTSAFE_IO
++#define IS_IN(lib) 0
++
+ #include <cthreads.h>         /* Must come before <stdio.h>! */
+ #include <stdio.h>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3836288..9cf73a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,3 +43,5 @@ newRPC.patch
 dl_origin.patch
 fix-payload-pflocal.patch
 fakeroot-access.patch
+glibc_2.21.patch
+format

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git