~ubuntu-branches/ubuntu/hardy/iproute/hardy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/netbug_fix

  • Committer: Bazaar Package Importer
  • Author(s): Scott James Remnant
  • Date: 2006-07-06 10:23:46 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20060706102346-tyd1mfjvay0nmz90
Tags: 20051007-4ubuntu1
* Merge from debian unstable, remaining changes:
  - versioned dependency on linux-kernel-headers,
  - MAX_ROUNDS patch to ip/ipaddress.c

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
#! /bin/sh -e
 
2
## 
 
3
## All lines beginning with `## DP:' are a description of the patch.
 
4
## DP: Fix syntax errors in netbug 
 
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 -p0 < $0;;
 
15
       -unpatch) patch $patch_opts -p0 -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
--- misc/netbug.orig    2005-11-02 09:55:12.000000000 +0100
 
24
+++ misc/netbug 2005-11-02 09:56:07.000000000 +0100
 
25
@@ -6,8 +6,8 @@
 
26
 IFS="" read mail || exit 1
 
27
 [ -z "$mail" ] && mail=kuznet@ms2.inr.ac.ru
 
28
 
 
29
-netbug=`mktemp -d -t netbug.XXXXXX` || {echo "$0: Cannot create temporary directory" >&2; exit 1;  }
 
30
-netbugtar=`tempfile -d $netbug --suffix=tar.gz` || {echo "$0: Cannot create temporary file" >&2; exit 1;  }
 
31
+netbug=`mktemp -d -t netbug.XXXXXX` || (echo "$0: Cannot create temporary directory" >&2; exit 1;  )
 
32
+netbugtar=`tempfile -d $netbug --suffix=tar.gz` || (echo "$0: Cannot create temporary file" >&2; exit 1;  )
 
33
 tmppath=$netbug
 
34
 trap "/bin/rm -rf $netbug $netbugtar" 0 1 2 3 13 15
 
35