diff options
Diffstat (limited to 'debian/patches')
22 files changed, 97 insertions, 85 deletions
diff --git a/debian/patches/external.patch b/debian/patches/external.patch index 9cc2f088..0b933712 100644 --- a/debian/patches/external.patch +++ b/debian/patches/external.patch @@ -59,7 +59,7 @@ Index: hurd-debian/procfs/Makefile -TARGET = procfs -OBJS = procfs.o netfs.o procfs_dir.o \ - process.o proclist.o rootdir.o dircat.o main.o --LIBS = -lnetfs -lps -lfshelp +-LIBS = -lnetfs -lps -lfshelp -lpthread +# Makefile - for procfs +# +# Copyright (C) 2008 Free Software Foundation, Inc. @@ -99,7 +99,7 @@ Index: hurd-debian/procfs/Makefile -CFLAGS= -g -pg -CPPFLAGS= -DPROFILE -LDFLAGS= -static --LIBS= -lnetfs -lfshelp -liohelp -lps -lports -lthreads -lihash -lshouldbeinlibc +-LIBS= -lnetfs -lfshelp -liohelp -lps -lports -lpthread -lihash -lshouldbeinlibc -endif - -CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 diff --git a/debian/patches/libdde_addr_fix.patch b/debian/patches/libdde_addr_fix.patch index 7d6af794..8ea9a7de 100644 --- a/debian/patches/libdde_addr_fix.patch +++ b/debian/patches/libdde_addr_fix.patch @@ -22,8 +22,8 @@ Date: Mon Jun 8 03:49:24 2009 +0000 diff --git a/net/core/dev.c b/net/core/dev.c index 4913089..81b392e 100644 ---- a/libdde_linux26/lib/src/net/core/dev.c -+++ b/libdde_linux26/lib/src/net/core/dev.c +--- a/libdde-linux26/lib/src/net/core/dev.c ++++ b/libdde-linux26/lib/src/net/core/dev.c @@ -3577,8 +3577,8 @@ static int dev_addr_init(struct net_device *dev) /* rtnl_mutex must be held here */ diff --git a/debian/patches/libdde_addr_list.patch b/debian/patches/libdde_addr_list.patch index c1b4d96d..ccca7a1a 100644 --- a/debian/patches/libdde_addr_list.patch +++ b/debian/patches/libdde_addr_list.patch @@ -39,10 +39,10 @@ Date: Tue May 5 02:48:28 2009 +0000 Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> -Index: hurd-debian/libdde_linux26/contrib/include/linux/etherdevice.h +Index: hurd-debian/libdde-linux26/contrib/include/linux/etherdevice.h =================================================================== ---- hurd-debian.orig/libdde_linux26/contrib/include/linux/etherdevice.h 2012-04-16 00:26:43.000000000 +0000 -+++ hurd-debian/libdde_linux26/contrib/include/linux/etherdevice.h 2012-04-16 00:34:43.000000000 +0000 +--- hurd-debian.orig/libdde-linux26/contrib/include/linux/etherdevice.h 2012-04-16 00:26:43.000000000 +0000 ++++ hurd-debian/libdde-linux26/contrib/include/linux/etherdevice.h 2012-04-16 00:34:43.000000000 +0000 @@ -182,6 +182,33 @@ return compare_ether_addr(addr1, addr2); #endif @@ -77,10 +77,10 @@ Index: hurd-debian/libdde_linux26/contrib/include/linux/etherdevice.h #endif /* __KERNEL__ */ #endif /* _LINUX_ETHERDEVICE_H */ -Index: hurd-debian/libdde_linux26/contrib/include/linux/netdevice.h +Index: hurd-debian/libdde-linux26/contrib/include/linux/netdevice.h =================================================================== ---- hurd-debian.orig/libdde_linux26/contrib/include/linux/netdevice.h 2012-04-16 00:33:34.000000000 +0000 -+++ hurd-debian/libdde_linux26/contrib/include/linux/netdevice.h 2012-04-16 00:34:43.000000000 +0000 +--- hurd-debian.orig/libdde-linux26/contrib/include/linux/netdevice.h 2012-04-16 00:33:34.000000000 +0000 ++++ hurd-debian/libdde-linux26/contrib/include/linux/netdevice.h 2012-04-16 00:34:43.000000000 +0000 @@ -211,6 +211,16 @@ #define dmi_users da_users #define dmi_gusers da_gusers @@ -146,10 +146,10 @@ Index: hurd-debian/libdde_linux26/contrib/include/linux/netdevice.h /* Functions used for secondary unicast and multicast support */ extern void dev_set_rx_mode(struct net_device *dev); extern void __dev_set_rx_mode(struct net_device *dev); -Index: hurd-debian/libdde_linux26/lib/src/net/core/dev.c +Index: hurd-debian/libdde-linux26/lib/src/net/core/dev.c =================================================================== ---- hurd-debian.orig/libdde_linux26/lib/src/net/core/dev.c 2012-04-16 00:26:43.000000000 +0000 -+++ hurd-debian/libdde_linux26/lib/src/net/core/dev.c 2012-04-16 00:34:43.000000000 +0000 +--- hurd-debian.orig/libdde-linux26/lib/src/net/core/dev.c 2012-04-16 00:26:43.000000000 +0000 ++++ hurd-debian/libdde-linux26/lib/src/net/core/dev.c 2012-04-16 00:34:43.000000000 +0000 @@ -3397,6 +3397,252 @@ netif_addr_unlock_bh(dev); } diff --git a/debian/patches/libdde_devres.patch b/debian/patches/libdde_devres.patch index 6c41cea1..697fdbe8 100644 --- a/debian/patches/libdde_devres.patch +++ b/debian/patches/libdde_devres.patch @@ -1,5 +1,5 @@ --- /dev/null 2011-08-03 18:03:30.000000000 +0000 -+++ b/libdde_linux26/contrib/lib/devres.c 2012-04-15 23:14:01.000000000 +0000 ++++ b/libdde-linux26/contrib/lib/devres.c 2012-04-15 23:14:01.000000000 +0000 @@ -0,0 +1,351 @@ +#include <linux/pci.h> +#include <linux/io.h> @@ -352,11 +352,11 @@ +EXPORT_SYMBOL(pcim_iounmap_regions); +#endif +#endif -diff --git a/libdde_linux26/lib/src/Makefile b/libdde_linux26/lib/src/Makefile +diff --git a/libdde-linux26/lib/src/Makefile b/libdde-linux26/lib/src/Makefile index 358196b..f7a64da 100644 ---- a/libdde_linux26/lib/src/Makefile -+++ b/libdde_linux26/lib/src/Makefile -@@ -103,6 +103,7 @@ SRC_C_libdde_linux26.o.a += \ +--- a/libdde-linux26/lib/src/Makefile ++++ b/libdde-linux26/lib/src/Makefile +@@ -103,6 +103,7 @@ SRC_C_libdde-linux26.o.a += \ lib/crc32.c \ lib/ctype.c \ lib/cpumask.c \ diff --git a/debian/patches/libdde_dma_head.patch b/debian/patches/libdde_dma_head.patch index 1a1c75fd..d3bf0a6c 100644 --- a/debian/patches/libdde_dma_head.patch +++ b/debian/patches/libdde_dma_head.patch @@ -18,10 +18,10 @@ Date: Fri Jun 5 04:04:16 2009 +0000 Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> -Index: hurd-debian/libdde_linux26/contrib/include/linux/skbuff.h +Index: hurd-debian/libdde-linux26/contrib/include/linux/skbuff.h =================================================================== ---- hurd-debian.orig/libdde_linux26/contrib/include/linux/skbuff.h 2012-04-16 00:26:40.000000000 +0000 -+++ hurd-debian/libdde_linux26/contrib/include/linux/skbuff.h 2012-04-16 00:34:56.000000000 +0000 +--- hurd-debian.orig/libdde-linux26/contrib/include/linux/skbuff.h 2012-04-16 00:26:40.000000000 +0000 ++++ hurd-debian/libdde-linux26/contrib/include/linux/skbuff.h 2012-04-16 00:34:56.000000000 +0000 @@ -142,6 +142,9 @@ atomic_t dataref; unsigned short nr_frags; @@ -41,10 +41,10 @@ Index: hurd-debian/libdde_linux26/contrib/include/linux/skbuff.h #endif }; -Index: hurd-debian/libdde_linux26/contrib/net/core/skb_dma_map.c +Index: hurd-debian/libdde-linux26/contrib/net/core/skb_dma_map.c =================================================================== ---- hurd-debian.orig/libdde_linux26/contrib/net/core/skb_dma_map.c 2012-04-16 00:26:40.000000000 +0000 -+++ hurd-debian/libdde_linux26/contrib/net/core/skb_dma_map.c 2012-04-16 00:34:56.000000000 +0000 +--- hurd-debian.orig/libdde-linux26/contrib/net/core/skb_dma_map.c 2012-04-16 00:26:40.000000000 +0000 ++++ hurd-debian/libdde-linux26/contrib/net/core/skb_dma_map.c 2012-04-16 00:34:56.000000000 +0000 @@ -20,7 +20,7 @@ if (dma_mapping_error(dev, map)) goto out_err; diff --git a/debian/patches/libdde_ethoc.patch b/debian/patches/libdde_ethoc.patch index eba5cdf5..aff12ad2 100644 --- a/debian/patches/libdde_ethoc.patch +++ b/debian/patches/libdde_ethoc.patch @@ -1,5 +1,5 @@ --- /dev/null 2011-08-03 18:03:30.000000000 +0000 -+++ b/libdde_linux26/contrib/include/net/ethoc.h 2012-04-15 22:19:57.000000000 +0000 ++++ b/libdde-linux26/contrib/include/net/ethoc.h 2012-04-15 22:19:57.000000000 +0000 @@ -0,0 +1,22 @@ +/* + * linux/include/net/ethoc.h diff --git a/debian/patches/libdde_ethtool.patch b/debian/patches/libdde_ethtool.patch index 9e52d1b5..d6c232e0 100644 --- a/debian/patches/libdde_ethtool.patch +++ b/debian/patches/libdde_ethtool.patch @@ -1,7 +1,7 @@ -diff --git a/libdde_linux26/contrib/include/linux/ethtool.h b/libdde_linux26/contrib/include/linux/ethtool.h +diff --git a/libdde-linux26/contrib/include/linux/ethtool.h b/libdde-linux26/contrib/include/linux/ethtool.h index 27c67a5..45f34dc 100644 ---- a/libdde_linux26/contrib/include/linux/ethtool.h -+++ b/libdde_linux26/contrib/include/linux/ethtool.h +--- a/libdde-linux26/contrib/include/linux/ethtool.h ++++ b/libdde-linux26/contrib/include/linux/ethtool.h @@ -25,11 +25,14 @@ struct ethtool_cmd { __u8 phy_address; __u8 transceiver; /* Which transceiver to use */ diff --git a/debian/patches/libdde_group_addr.patch b/debian/patches/libdde_group_addr.patch index 2ea72715..dee2723a 100644 --- a/debian/patches/libdde_group_addr.patch +++ b/debian/patches/libdde_group_addr.patch @@ -26,10 +26,10 @@ Date: Wed Jun 17 01:12:19 2009 +0000 9 files changed, 89 insertions(+), 90 deletions(-) Signed-off-by: David S. Miller <davem@davemloft.net> -Index: hurd-debian/libdde_linux26/contrib/include/linux/netdevice.h +Index: hurd-debian/libdde-linux26/contrib/include/linux/netdevice.h =================================================================== ---- hurd-debian.orig/libdde_linux26/contrib/include/linux/netdevice.h 2012-04-16 00:34:46.000000000 +0000 -+++ hurd-debian/libdde_linux26/contrib/include/linux/netdevice.h 2012-04-16 00:34:51.000000000 +0000 +--- hurd-debian.orig/libdde-linux26/contrib/include/linux/netdevice.h 2012-04-16 00:34:46.000000000 +0000 ++++ hurd-debian/libdde-linux26/contrib/include/linux/netdevice.h 2012-04-16 00:34:51.000000000 +0000 @@ -224,6 +224,11 @@ struct rcu_head rcu_head; }; @@ -78,10 +78,10 @@ Index: hurd-debian/libdde_linux26/contrib/include/linux/netdevice.h /* These functions live elsewhere (drivers/net/net_init.c, but related) */ -Index: hurd-debian/libdde_linux26/lib/src/net/core/dev.c +Index: hurd-debian/libdde-linux26/lib/src/net/core/dev.c =================================================================== ---- hurd-debian.orig/libdde_linux26/lib/src/net/core/dev.c 2012-04-16 00:34:49.000000000 +0000 -+++ hurd-debian/libdde_linux26/lib/src/net/core/dev.c 2012-04-16 00:34:51.000000000 +0000 +--- hurd-debian.orig/libdde-linux26/lib/src/net/core/dev.c 2012-04-16 00:34:49.000000000 +0000 ++++ hurd-debian/libdde-linux26/lib/src/net/core/dev.c 2012-04-16 00:34:51.000000000 +0000 @@ -3377,10 +3377,10 @@ /* Unicast addresses changes may only happen under the rtnl, * therefore calling __dev_set_promiscuity here is safe. diff --git a/debian/patches/libdde_mdio.patch b/debian/patches/libdde_mdio.patch index 6c9b0c29..cf00e47a 100644 --- a/debian/patches/libdde_mdio.patch +++ b/debian/patches/libdde_mdio.patch @@ -1,5 +1,5 @@ --- /dev/null 2011-08-03 18:03:30.000000000 +0000 -+++ b/libdde_linux26/contrib/include/linux/mdio.h 2012-04-15 22:16:31.000000000 +0000 ++++ b/libdde-linux26/contrib/include/linux/mdio.h 2012-04-15 22:16:31.000000000 +0000 @@ -0,0 +1,356 @@ +/* + * linux/mdio.h: definitions for MDIO (clause 45) transceivers diff --git a/debian/patches/libdde_netdev_tx_t.patch b/debian/patches/libdde_netdev_tx_t.patch index 73ff710c..897f899f 100644 --- a/debian/patches/libdde_netdev_tx_t.patch +++ b/debian/patches/libdde_netdev_tx_t.patch @@ -13,8 +13,8 @@ Date: Mon Aug 31 19:50:40 2009 +0000 diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 60d3aac..376a2e1 100644 ---- a/libdde_linux26/contrib/include/linux/netdevice.h -+++ b/libdde_linux26/contrib/include/linux/netdevice.h +--- a/libdde-linux26/contrib/include/linux/netdevice.h ++++ b/libdde-linux26/contrib/include/linux/netdevice.h @@ -79,17 +79,19 @@ struct wireless_dev; #define net_xmit_eval(e) ((e) == NET_XMIT_CN? 0 : (e)) #define net_xmit_errno(e) ((e) != NET_XMIT_CN ? -ENOBUFS : 0) diff --git a/debian/patches/libdde_pci-needs_freset.patch b/debian/patches/libdde_pci-needs_freset.patch index cc1f6aed..b3029fcb 100644 --- a/debian/patches/libdde_pci-needs_freset.patch +++ b/debian/patches/libdde_pci-needs_freset.patch @@ -25,10 +25,10 @@ Date: Thu Jul 30 15:33:21 2009 -0700 Signed-off-by: Richard Lary <rlary@us.ibm.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> -Index: hurd-debian/libdde_linux26/contrib/include/linux/pci.h +Index: hurd-debian/libdde-linux26/contrib/include/linux/pci.h =================================================================== ---- hurd-debian.orig/libdde_linux26/contrib/include/linux/pci.h 2012-04-16 00:26:44.000000000 +0000 -+++ hurd-debian/libdde_linux26/contrib/include/linux/pci.h 2012-04-16 00:34:37.000000000 +0000 +--- hurd-debian.orig/libdde-linux26/contrib/include/linux/pci.h 2012-04-16 00:26:44.000000000 +0000 ++++ hurd-debian/libdde-linux26/contrib/include/linux/pci.h 2012-04-16 00:34:37.000000000 +0000 @@ -256,6 +256,7 @@ unsigned int ari_enabled:1; /* ARI forwarding */ unsigned int is_managed:1; diff --git a/debian/patches/libdde_pci_ids.h.patch b/debian/patches/libdde_pci_ids.h.patch index df63d98d..801c38be 100644 --- a/debian/patches/libdde_pci_ids.h.patch +++ b/debian/patches/libdde_pci_ids.h.patch @@ -1,5 +1,5 @@ ---- a/libdde_linux26/contrib/include/linux/pci_ids.h 2012-04-15 20:31:32.000000000 +0000 -+++ b/libdde_linux26/contrib/include/linux/pci_ids.h 2012-03-17 10:14:52.000000000 +0000 +--- a/libdde-linux26/contrib/include/linux/pci_ids.h 2012-04-15 20:31:32.000000000 +0000 ++++ b/libdde-linux26/contrib/include/linux/pci_ids.h 2012-03-17 10:14:52.000000000 +0000 @@ -2,6 +2,9 @@ * PCI Class, Vendor and Device IDs * diff --git a/debian/patches/libdde_phy.patch b/debian/patches/libdde_phy.patch index b7385122..5d992c09 100644 --- a/debian/patches/libdde_phy.patch +++ b/debian/patches/libdde_phy.patch @@ -1,5 +1,5 @@ ---- a/libdde_linux26/contrib/include/linux/phy.h 2012-04-15 20:31:32.000000000 +0000 -+++ b/libdde_linux26/contrib/include/linux/phy.h 2012-03-17 10:14:52.000000000 +0000 +--- a/libdde-linux26/contrib/include/linux/phy.h 2012-04-15 20:31:32.000000000 +0000 ++++ b/libdde-linux26/contrib/include/linux/phy.h 2012-03-17 10:14:52.000000000 +0000 @@ -79,7 +79,7 @@ * Need to be a little smaller than phydev->dev.bus_id to leave room * for the ":%02x" diff --git a/debian/patches/libdde_pr_cont.patch b/debian/patches/libdde_pr_cont.patch index 74b88a2a..90c5ed81 100644 --- a/debian/patches/libdde_pr_cont.patch +++ b/debian/patches/libdde_pr_cont.patch @@ -1,7 +1,7 @@ -diff --git a/libdde_linux26/include/linux/kernel.h b/libdde_linux26/include/linux/kernel.h +diff --git a/libdde-linux26/include/linux/kernel.h b/libdde-linux26/include/linux/kernel.h index 573ed07..6354939 100644 ---- a/libdde_linux26/include/linux/kernel.h -+++ b/libdde_linux26/include/linux/kernel.h +--- a/libdde-linux26/include/linux/kernel.h ++++ b/libdde-linux26/include/linux/kernel.h @@ -363,6 +363,8 @@ static inline char *pack_hex_byte(char *buf, u8 byte) printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__) #define pr_info(fmt, ...) \ @@ -11,10 +11,10 @@ index 573ed07..6354939 100644 #if defined(DEBUG) #ifndef DDE_LINUX -diff --git a/libdde_linux26/contrib/include/linux/kernel.h b/libdde_linux26/contrib/include/linux/kernel.h +diff --git a/libdde-linux26/contrib/include/linux/kernel.h b/libdde-linux26/contrib/include/linux/kernel.h index 7fa3718..0bded10 100644 ---- a/libdde_linux26/contrib/include/linux/kernel.h -+++ b/libdde_linux26/contrib/include/linux/kernel.h +--- a/libdde-linux26/contrib/include/linux/kernel.h ++++ b/libdde-linux26/contrib/include/linux/kernel.h @@ -353,6 +353,8 @@ static inline char *pack_hex_byte(char *buf, u8 byte) printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__) #define pr_info(fmt, ...) \ diff --git a/debian/patches/libdde_rcu.patch b/debian/patches/libdde_rcu.patch index 25f8a395..03245335 100644 --- a/debian/patches/libdde_rcu.patch +++ b/debian/patches/libdde_rcu.patch @@ -1,5 +1,5 @@ --- /dev/null 2011-08-03 18:03:30.000000000 +0000 -+++ b/libdde_linux26/contrib/kernel/rcuclassic.c 2012-04-15 23:40:54.000000000 +0000 ++++ b/libdde-linux26/contrib/kernel/rcuclassic.c 2012-04-15 23:40:54.000000000 +0000 @@ -0,0 +1,788 @@ +/* + * Read-Copy Update mechanism for mutual exclusion @@ -789,10 +789,10 @@ +module_param(blimit, int, 0); +module_param(qhimark, int, 0); +module_param(qlowmark, int, 0); -diff --git a/libdde_linux26/contrib/kernel/rcupdate.c b/libdde_linux26/contrib/kernel/rcupdate.c +diff --git a/libdde-linux26/contrib/kernel/rcupdate.c b/libdde-linux26/contrib/kernel/rcupdate.c index cae8a05..c6bfa1a 100644 ---- a/libdde_linux26/contrib/kernel/rcupdate.c -+++ b/libdde_linux26/contrib/kernel/rcupdate.c +--- a/libdde-linux26/contrib/kernel/rcupdate.c ++++ b/libdde-linux26/contrib/kernel/rcupdate.c @@ -180,6 +180,7 @@ void __init rcu_init(void) { __rcu_init(); @@ -801,11 +801,11 @@ index cae8a05..c6bfa1a 100644 void rcu_scheduler_starting(void) { -diff --git a/libdde_linux26/lib/src/Makefile b/libdde_linux26/lib/src/Makefile +diff --git a/libdde-linux26/lib/src/Makefile b/libdde-linux26/lib/src/Makefile index 358196b..450c4e6 100644 ---- a/libdde_linux26/lib/src/Makefile -+++ b/libdde_linux26/lib/src/Makefile -@@ -89,6 +89,8 @@ SRC_C_libdde_linux26.o.a += \ +--- a/libdde-linux26/lib/src/Makefile ++++ b/libdde-linux26/lib/src/Makefile +@@ -89,6 +89,8 @@ SRC_C_libdde-linux26.o.a += \ kernel/kthread.c \ kernel/mutex.c \ kernel/notifier.c \ diff --git a/debian/patches/libdde_rculist.patch b/debian/patches/libdde_rculist.patch index 19e512a6..3c273a18 100644 --- a/debian/patches/libdde_rculist.patch +++ b/debian/patches/libdde_rculist.patch @@ -1,7 +1,7 @@ -diff --git a/libdde_linux26/contrib/include/linux/netdevice.h b/libdde_linux26/contrib/include/linux/netdevice.h +diff --git a/libdde-linux26/contrib/include/linux/netdevice.h b/libdde-linux26/contrib/include/linux/netdevice.h index 6593667..bb4fca1 100644 ---- a/libdde_linux26/contrib/include/linux/netdevice.h -+++ b/libdde_linux26/contrib/include/linux/netdevice.h +--- a/libdde-linux26/contrib/include/linux/netdevice.h ++++ b/libdde-linux26/contrib/include/linux/netdevice.h @@ -37,6 +37,7 @@ #include <asm/byteorder.h> diff --git a/debian/patches/libdde_rx_queue.patch b/debian/patches/libdde_rx_queue.patch index 0d962647..6d880232 100644 --- a/debian/patches/libdde_rx_queue.patch +++ b/debian/patches/libdde_rx_queue.patch @@ -16,10 +16,10 @@ Date: Tue Jan 27 16:22:11 2009 -0800 Signed-off-by: David S. Miller <davem@davemloft.net> -Index: hurd-debian/libdde_linux26/contrib/include/linux/skbuff.h +Index: hurd-debian/libdde-linux26/contrib/include/linux/skbuff.h =================================================================== ---- hurd-debian.orig/libdde_linux26/contrib/include/linux/skbuff.h 2012-04-16 00:34:56.000000000 +0000 -+++ hurd-debian/libdde_linux26/contrib/include/linux/skbuff.h 2012-04-16 00:35:11.000000000 +0000 +--- hurd-debian.orig/libdde-linux26/contrib/include/linux/skbuff.h 2012-04-16 00:34:56.000000000 +0000 ++++ hurd-debian/libdde-linux26/contrib/include/linux/skbuff.h 2012-04-16 00:35:11.000000000 +0000 @@ -1903,6 +1903,21 @@ to->queue_mapping = from->queue_mapping; } @@ -42,10 +42,10 @@ Index: hurd-debian/libdde_linux26/contrib/include/linux/skbuff.h #ifdef CONFIG_XFRM static inline struct sec_path *skb_sec_path(struct sk_buff *skb) { -Index: hurd-debian/libdde_linux26/lib/src/net/core/dev.c +Index: hurd-debian/libdde-linux26/lib/src/net/core/dev.c =================================================================== ---- hurd-debian.orig/libdde_linux26/lib/src/net/core/dev.c 2012-04-16 00:34:51.000000000 +0000 -+++ hurd-debian/libdde_linux26/lib/src/net/core/dev.c 2012-04-16 00:35:11.000000000 +0000 +--- hurd-debian.orig/libdde-linux26/lib/src/net/core/dev.c 2012-04-16 00:34:51.000000000 +0000 ++++ hurd-debian/libdde-linux26/lib/src/net/core/dev.c 2012-04-16 00:35:11.000000000 +0000 @@ -1731,6 +1731,13 @@ simple_tx_hashrnd_initialized = 1; } diff --git a/debian/patches/libdde_trans_start.patch b/debian/patches/libdde_trans_start.patch index 07acc6dd..9b0330a7 100644 --- a/debian/patches/libdde_trans_start.patch +++ b/debian/patches/libdde_trans_start.patch @@ -23,10 +23,10 @@ Date: Sun May 17 20:55:16 2009 -0700 Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> Signed-off-by: David S. Miller <davem@davemloft.net> -Index: hurd-debian/libdde_linux26/contrib/include/linux/netdevice.h +Index: hurd-debian/libdde-linux26/contrib/include/linux/netdevice.h =================================================================== ---- hurd-debian.orig/libdde_linux26/contrib/include/linux/netdevice.h 2012-04-16 00:34:54.000000000 +0000 -+++ hurd-debian/libdde_linux26/contrib/include/linux/netdevice.h 2012-04-16 00:35:04.000000000 +0000 +--- hurd-debian.orig/libdde-linux26/contrib/include/linux/netdevice.h 2012-04-16 00:34:54.000000000 +0000 ++++ hurd-debian/libdde-linux26/contrib/include/linux/netdevice.h 2012-04-16 00:35:04.000000000 +0000 @@ -462,6 +462,10 @@ spinlock_t _xmit_lock; int xmit_lock_owner; @@ -59,10 +59,10 @@ Index: hurd-debian/libdde_linux26/contrib/include/linux/netdevice.h extern void __netdev_watchdog_up(struct net_device *dev); extern void netif_carrier_on(struct net_device *dev); -Index: hurd-debian/libdde_linux26/lib/src/net/sched/sch_generic.c +Index: hurd-debian/libdde-linux26/lib/src/net/sched/sch_generic.c =================================================================== ---- hurd-debian.orig/libdde_linux26/lib/src/net/sched/sch_generic.c 2012-04-16 00:26:38.000000000 +0000 -+++ hurd-debian/libdde_linux26/lib/src/net/sched/sch_generic.c 2012-04-16 00:35:04.000000000 +0000 +--- hurd-debian.orig/libdde-linux26/lib/src/net/sched/sch_generic.c 2012-04-16 00:26:38.000000000 +0000 ++++ hurd-debian/libdde-linux26/lib/src/net/sched/sch_generic.c 2012-04-16 00:35:04.000000000 +0000 @@ -200,6 +200,21 @@ clear_bit(__QDISC_STATE_RUNNING, &q->state); } diff --git a/debian/patches/libdde_ucast_list.patch b/debian/patches/libdde_ucast_list.patch index 5abd3443..85a30735 100644 --- a/debian/patches/libdde_ucast_list.patch +++ b/debian/patches/libdde_ucast_list.patch @@ -39,10 +39,10 @@ Date: Fri May 22 23:22:17 2009 +0000 18 files changed, 227 insertions(+), 137 deletions(-) Signed-off-by: David S. Miller <davem@davemloft.net> -Index: hurd-debian/libdde_linux26/contrib/include/linux/netdevice.h +Index: hurd-debian/libdde-linux26/contrib/include/linux/netdevice.h =================================================================== ---- hurd-debian.orig/libdde_linux26/contrib/include/linux/netdevice.h 2012-04-16 00:34:43.000000000 +0000 -+++ hurd-debian/libdde_linux26/contrib/include/linux/netdevice.h 2012-04-16 00:34:46.000000000 +0000 +--- hurd-debian.orig/libdde-linux26/contrib/include/linux/netdevice.h 2012-04-16 00:34:43.000000000 +0000 ++++ hurd-debian/libdde-linux26/contrib/include/linux/netdevice.h 2012-04-16 00:34:46.000000000 +0000 @@ -215,9 +215,12 @@ struct list_head list; unsigned char addr[MAX_ADDR_LEN]; @@ -84,10 +84,10 @@ Index: hurd-debian/libdde_linux26/contrib/include/linux/netdevice.h extern int dev_unicast_sync(struct net_device *to, struct net_device *from); extern void dev_unicast_unsync(struct net_device *to, struct net_device *from); extern int dev_mc_delete(struct net_device *dev, void *addr, int alen, int all); -Index: hurd-debian/libdde_linux26/lib/src/net/core/dev.c +Index: hurd-debian/libdde-linux26/lib/src/net/core/dev.c =================================================================== ---- hurd-debian.orig/libdde_linux26/lib/src/net/core/dev.c 2012-04-16 00:34:43.000000000 +0000 -+++ hurd-debian/libdde_linux26/lib/src/net/core/dev.c 2012-04-16 00:34:46.000000000 +0000 +--- hurd-debian.orig/libdde-linux26/lib/src/net/core/dev.c 2012-04-16 00:34:43.000000000 +0000 ++++ hurd-debian/libdde-linux26/lib/src/net/core/dev.c 2012-04-16 00:34:46.000000000 +0000 @@ -3399,8 +3399,9 @@ /* hw addresses list handling functions */ diff --git a/debian/patches/libdde_workqueue.patch b/debian/patches/libdde_workqueue.patch index 5ea9b612..35082e45 100644 --- a/debian/patches/libdde_workqueue.patch +++ b/debian/patches/libdde_workqueue.patch @@ -1,7 +1,7 @@ -diff --git a/libdde_linux26/contrib/include/linux/workqueue.h b/libdde_linux26/contrib/include/linux/workqueue.h +diff --git a/libdde-linux26/contrib/include/linux/workqueue.h b/libdde-linux26/contrib/include/linux/workqueue.h index 3cd51e5..cf24c20 100644 ---- a/libdde_linux26/contrib/include/linux/workqueue.h -+++ b/libdde_linux26/contrib/include/linux/workqueue.h +--- a/libdde-linux26/contrib/include/linux/workqueue.h ++++ b/libdde-linux26/contrib/include/linux/workqueue.h @@ -41,6 +41,11 @@ struct delayed_work { struct timer_list timer; }; diff --git a/debian/patches/procfs-default.patch b/debian/patches/procfs-default.patch index 62cd7b95..023ab9d5 100644 --- a/debian/patches/procfs-default.patch +++ b/debian/patches/procfs-default.patch @@ -12,8 +12,8 @@ index ba74e87..3e53307 100644 --- a/procfs/main.c +++ b/procfs/main.c @@ -37,6 +37,13 @@ pid_t opt_fake_self; - pid_t opt_kernel_pid; - uid_t opt_anon_owner; + #define NOEXEC_KEY -2 /* Likewise. */ + #define NOSUID_KEY -3 /* Likewise. */ +/* Default values */ +#define OPT_CLK_TCK sysconf(_SC_CLK_TCK) diff --git a/debian/patches/procfs-update.patch b/debian/patches/procfs-update.patch index fc5cb4a7..67b415ca 100644 --- a/debian/patches/procfs-update.patch +++ b/debian/patches/procfs-update.patch @@ -14,7 +14,7 @@ diff --git a/procfs/main.c b/procfs/main.c index 1b19c01..ba74e87 100644 --- a/procfs/main.c +++ b/procfs/main.c -@@ -109,45 +109,82 @@ argp_parser (int key, char *arg, struct argp_state *state) +@@ -109,51 +109,88 @@ argp_parser (int key, char *arg, struct argp_state *state) return 0; } @@ -44,6 +44,12 @@ index 1b19c01..ba74e87 100644 + "Be aware that USER will be granted access to the environment and " + "other sensitive information about the processes in question. " + "(default: use uid 0)" }, ++ { "nodev", NODEV_KEY, NULL, 0, ++ "Ignored for compatibility with Linux' procfs." }, ++ { "noexec", NOEXEC_KEY, NULL, 0, ++ "Ignored for compatibility with Linux' procfs." }, ++ { "nosuid", NOSUID_KEY, NULL, 0, ++ "Ignored for compatibility with Linux' procfs." }, + {} +}; + @@ -74,6 +80,12 @@ index 1b19c01..ba74e87 100644 - "Be aware that USER will be granted access to the environment and " - "other sensitive information about the processes in question. " - "(default: use uid 0)" }, +- { "nodev", NODEV_KEY, NULL, 0, +- "Ignored for compatibility with Linux' procfs." }, +- { "noexec", NOEXEC_KEY, NULL, 0, +- "Ignored for compatibility with Linux' procfs." }, +- { "nosuid", NOSUID_KEY, NULL, 0, +- "Ignored for compatibility with Linux' procfs." }, + .options = common_options, + .parser = argp_parser, + .doc = "A virtual filesystem emulating the Linux procfs.", |