← Back to branch summary

~ubuntu-branches/ubuntu/trusty/iproute/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/tc_sample_fix

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Wirt, Andreas Henriksson, Justin B Rye, Alexander Wirt
  • Date: 2008-05-11 11:18:29 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20080511111829-rfewew7s6kiev0bh
Tags: 20080417-1
http://bugs.debian.org/467557
http://bugs.debian.org/480173
http://bugs.debian.org/464521
[ Andreas Henriksson ]
* New upstream release, v2.6.25 a.k.a. snapshot 20080417.
  - Initial documentation for xfrm (Partially fixes #451337)
  - Fixes manpage error caught by lintian!
* Fix typos (syntax error) in ip(8) manpage.
  - Introduced by upstream, caught by lintian yet again!
* Don't ship useless headers in iproute-dev (Closes: #467557)
* Cherry-pick "Fix bad hash calculation because of signed address" from
  upstream. (Closes: #480173)

[ Justin B Rye ]
* Update package description (Closes: #464521)

[ Alexander Wirt ]
* Fix typo in short package description.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/tc_sample_fix
1
 
#! /bin/sh -e
2
 
## 
3
 
## All lines beginning with `## DP:' are a description of the patch.
4
 
## DP: Fixes #347699 
5
 
 
6
 
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
7
 
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
8
 
 
9
 
if [ $# -ne 1 ]; then
10
 
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
11
 
    exit 1
12
 
fi
13
 
case "$1" in
14
 
       -patch) patch $patch_opts -p1 < $0;;
15
 
       -unpatch) patch $patch_opts -p1 -R < $0;;
16
 
        *)
17
 
                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
18
 
                exit 1;;
19
 
esac
20
 
 
21
 
exit 0
22
 
@DPATCH@
23
 
diff -Nur iproute-20051007.keep/tc/f_u32.c iproute-20051007/tc/f_u32.c
24
 
--- iproute-20051007.keep/tc/f_u32.c    2005-01-19 08:11:58.000000000 +1000
25
 
+++ iproute-20051007/tc/f_u32.c 2006-01-12 17:12:43.000000000 +1000
26
 
@@ -878,6 +878,7 @@
27
 
                                struct tc_u32_sel sel;
28
 
                                struct tc_u32_key keys[4];
29
 
                        } sel2;
30
 
+                       memset(&sel2, 0, sizeof(sel2));
31
 
                        NEXT_ARG();
32
 
                        if (parse_selector(&argc, &argv, &sel2.sel, n)) {
33
 
                                fprintf(stderr, "Illegal \"sample\"\n");