diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-09 20:06:38 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-09 20:06:38 +0200 |
| commit | 095cb79fa6234246a6bea680c255bee6bc2e4b92 (patch) | |
| tree | bac6544b8800f1b3186bfb41b367995c89849a6a | |
| parent | 1838aa2870cf0f876fc724231f31428f0d8b8bd0 (diff) | |
| parent | dca285b52d68a6f44f8abbc5970878282228e1a4 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rwxr-xr-x | package/base-files/src/etc/network/if-pre-up.d/04-wireless | 2 | ||||
| -rw-r--r-- | package/openssl/patches/patch-Makefile_shared | 18 | ||||
| -rw-r--r-- | package/openssl/patches/patch-util_shlib_wrap_sh | 16 |
3 files changed, 35 insertions, 1 deletions
diff --git a/package/base-files/src/etc/network/if-pre-up.d/04-wireless b/package/base-files/src/etc/network/if-pre-up.d/04-wireless index 1ccc4d823..8095c82eb 100755 --- a/package/base-files/src/etc/network/if-pre-up.d/04-wireless +++ b/package/base-files/src/etc/network/if-pre-up.d/04-wireless @@ -1,5 +1,4 @@ #!/bin/sh -#set -x set -e [ "${IFACE%%[0-9]*}" = "wlan" ] || exit 0 @@ -7,6 +6,7 @@ set -e [ "$IF_WIRELESS_SSID" ] || exit 1 [ "$IF_WIRELESS_CHANNEL" ] || exit 1 [ "$IF_WIRELESS_HWMODE" ] || IF_WIRELESS_HWMODE=g +[ "$IF_WIRELESS_EXTENSION" ] || IF_WIRELESS_EXTENSION=0 wpa=0 wpa1=0 diff --git a/package/openssl/patches/patch-Makefile_shared b/package/openssl/patches/patch-Makefile_shared new file mode 100644 index 000000000..76b1cf71a --- /dev/null +++ b/package/openssl/patches/patch-Makefile_shared @@ -0,0 +1,18 @@ +--- openssl-1.0.0a.orig/Makefile.shared 2009-10-16 01:44:11.000000000 +0200 ++++ openssl-1.0.0a/Makefile.shared 2010-07-09 16:19:54.623017943 +0200 +@@ -95,7 +95,6 @@ LINK_APP= \ + LDCMD="$${LDCMD:-$(CC)}"; LDFLAGS="$${LDFLAGS:-$(CFLAGS)}"; \ + LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ + LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ +- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ + $${LDCMD} $${LDFLAGS} -o $${APPNAME:=$(APPNAME)} $(OBJECTS) $${LIBDEPS} ) + + LINK_SO= \ +@@ -105,7 +104,6 @@ LINK_SO= \ + SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ + LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ + LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ +- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ + $${SHAREDCMD} $${SHAREDFLAGS} \ + -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ + $$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \ diff --git a/package/openssl/patches/patch-util_shlib_wrap_sh b/package/openssl/patches/patch-util_shlib_wrap_sh new file mode 100644 index 000000000..1e8a30bf6 --- /dev/null +++ b/package/openssl/patches/patch-util_shlib_wrap_sh @@ -0,0 +1,16 @@ +--- openssl-1.0.0a.orig/util/shlib_wrap.sh 2009-11-15 20:06:21.000000000 +0100 ++++ openssl-1.0.0a/util/shlib_wrap.sh 2010-07-09 16:19:21.211017427 +0200 +@@ -57,11 +57,10 @@ SunOS|IRIX*) + eval $rld_var=\"${THERE}'${'$rld_var':+:$'$rld_var'}'\"; export $rld_var + unset rld_var + ;; +-*) LD_LIBRARY_PATH="${THERE}:$LD_LIBRARY_PATH" # Linux, ELF HP-UX +- DYLD_LIBRARY_PATH="${THERE}:$DYLD_LIBRARY_PATH" # MacOS X ++*) DYLD_LIBRARY_PATH="${THERE}:$DYLD_LIBRARY_PATH" # MacOS X + SHLIB_PATH="${THERE}:$SHLIB_PATH" # legacy HP-UX + LIBPATH="${THERE}:$LIBPATH" # AIX, OS/2 +- export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH ++ export DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH + # Even though $PATH is adjusted [for Windows sake], it doesn't + # necessarily does the trick. Trouble is that with introduction + # of SafeDllSearchMode in XP/2003 it's more appropriate to copy |