diff options
Diffstat (limited to 'package/libnet/patches/patch-mkinstalldirs')
| -rw-r--r-- | package/libnet/patches/patch-mkinstalldirs | 73 |
1 files changed, 56 insertions, 17 deletions
diff --git a/package/libnet/patches/patch-mkinstalldirs b/package/libnet/patches/patch-mkinstalldirs index e100ac125..791486796 100644 --- a/package/libnet/patches/patch-mkinstalldirs +++ b/package/libnet/patches/patch-mkinstalldirs @@ -1,23 +1,35 @@ --- Libnet-1.0.2a.orig/mkinstalldirs 1970-01-01 00:00:00.000000000 +0100 -+++ Libnet-1.0.2a/mkinstalldirs 2009-06-12 21:48:27.000000000 +0200 -@@ -0,0 +1,111 @@ ++++ Libnet-1.0.2a/mkinstalldirs 2009-08-23 00:39:59.149675166 +0200 +@@ -0,0 +1,150 @@ +#! /bin/sh +# mkinstalldirs --- make directory hierarchy -+# Author: Noah Friedman <friedman@prep.ai.mit.edu> ++ ++scriptversion=2004-02-15.20 ++ ++# Original author: Noah Friedman <friedman@prep.ai.mit.edu> +# Created: 1993-05-16 -+# Public domain ++# Public domain. ++# ++# This file is maintained in Automake, please report ++# bugs to <bug-automake@gnu.org> or send patches to ++# <automake-patches@gnu.org>. + +errstatus=0 +dirmode="" + +usage="\ -+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." ++Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... ++ ++Create each directory DIR (with mode MODE, if specified), including all ++leading file name components. ++ ++Report bugs to <bug-automake@gnu.org>." + +# process command line arguments +while test $# -gt 0 ; do + case $1 in + -h | --help | --h*) # -h for help -+ echo "$usage" 1>&2 ++ echo "$usage" + exit 0 + ;; + -m) # -m PERM arg @@ -26,6 +38,10 @@ + dirmode=$1 + shift + ;; ++ --version) ++ echo "$0 $scriptversion" ++ exit 0 ++ ;; + --) # stop option processing + shift + break @@ -53,17 +69,37 @@ + 0) exit 0 ;; +esac + ++# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and ++# mkdir -p a/c at the same time, both will detect that a is missing, ++# one will create a, then the other will try to create a and die with ++# a "File exists" error. This is a problem when calling mkinstalldirs ++# from a parallel make. We use --version in the probe to restrict ++# ourselves to GNU mkdir, which is thread-safe. +case $dirmode in + '') -+ if mkdir -p -- . 2>/dev/null; then ++ if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "mkdir -p -- $*" + exec mkdir -p -- "$@" ++ else ++ # On NextStep and OpenStep, the `mkdir' command does not ++ # recognize any option. It will interpret all options as ++ # directories to create, and then abort because `.' already ++ # exists. ++ test -d ./-p && rmdir ./-p ++ test -d ./--version && rmdir ./--version + fi + ;; + *) -+ if mkdir -m "$dirmode" -p -- . 2>/dev/null; then ++ if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && ++ test ! -d ./--version; then + echo "mkdir -m $dirmode -p -- $*" + exec mkdir -m "$dirmode" -p -- "$@" ++ else ++ # Clean up after NextStep and OpenStep mkdir. ++ for d in ./-m ./-p ./--version "./$dirmode"; ++ do ++ test -d $d && rmdir $d ++ done + fi + ;; +esac @@ -87,17 +123,17 @@ + mkdir "$pathcomp" || lasterr=$? + + if test ! -d "$pathcomp"; then -+ errstatus=$lasterr ++ errstatus=$lasterr + else -+ if test ! -z "$dirmode"; then ++ if test ! -z "$dirmode"; then + echo "chmod $dirmode $pathcomp" -+ lasterr="" -+ chmod "$dirmode" "$pathcomp" || lasterr=$? ++ lasterr="" ++ chmod "$dirmode" "$pathcomp" || lasterr=$? + -+ if test ! -z "$lasterr"; then -+ errstatus=$lasterr -+ fi -+ fi ++ if test ! -z "$lasterr"; then ++ errstatus=$lasterr ++ fi ++ fi + fi + fi + @@ -110,5 +146,8 @@ +# Local Variables: +# mode: shell-script +# sh-indentation: 2 ++# eval: (add-hook 'write-file-hooks 'time-stamp) ++# time-stamp-start: "scriptversion=" ++# time-stamp-format: "%:y-%02m-%02d.%02H" ++# time-stamp-end: "$" +# End: -+# mkinstalldirs ends here |