save the real configured interface name in the 'device' variable when running scan_in...

[openwrt.git] / package / zlib / patches / zlib.patch

diff --git a/package/zlib/patches/zlib.patch b/package/zlib/patches/zlib.patch
index 8f5a9b5..1325462 100644 (file)
--- a/package/zlib/patches/zlib.patch
+++ b/package/zlib/patches/zlib.patch
@@ -1,6 +1,6 @@
-diff -ruN zlib-1.2.2-orig/Makefile.in zlib-1.2.2-2/Makefile.in
---- zlib-1.2.2-orig/Makefile.in        2004-09-15 16:27:20.000000000 +0200
-+++ zlib-1.2.2-2/Makefile.in   2004-11-13 13:38:12.000000000 +0100
+diff -ruN zlib-1.2.3-orig/Makefile.in zlib-1.2.3-2/Makefile.in
+--- zlib-1.2.3-orig/Makefile.in        2004-09-15 16:27:20.000000000 +0200
++++ zlib-1.2.3-2/Makefile.in   2004-11-13 13:38:12.000000000 +0100
 @@ -25,20 +25,23 @@
  #           -Wstrict-prototypes -Wmissing-prototypes
  
@@ -13,7 +13,7 @@ diff -ruN zlib-1.2.2-orig/Makefile.in zlib-1.2.2-2/Makefile.in
 +LIBS=
 +STATICLIB=libz.a
  SHAREDLIB=libz.so
- SHAREDLIBV=libz.so.1.2.2
+ SHAREDLIBV=libz.so.1.2.3
  SHAREDLIBM=libz.so.1
  
 -AR=ar rc
@@ -87,9 +87,9 @@ diff -ruN zlib-1.2.2-orig/Makefile.in zlib-1.2.2-2/Makefile.in
  # The ranlib in install is needed on NeXTSTEP which checks file times
  # ldconfig is for Linux
  
-diff -ruN zlib-1.2.2-orig/configure zlib-1.2.2-2/configure
---- zlib-1.2.2-orig/configure  2004-09-07 07:50:06.000000000 +0200
-+++ zlib-1.2.2-2/configure     2004-11-13 12:37:43.000000000 +0100
+diff -ruN zlib-1.2.3-orig/configure zlib-1.2.3-2/configure
+--- zlib-1.2.3-orig/configure  2004-09-07 07:50:06.000000000 +0200
++++ zlib-1.2.3-2/configure     2004-11-13 12:37:43.000000000 +0100
 @@ -23,7 +23,7 @@
  VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
  VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
@@ -176,9 +176,9 @@ diff -ruN zlib-1.2.2-orig/configure zlib-1.2.2-2/configure
 +/^mandir *=/s%=.*%= $mandir%
 +/^LDFLAGS *=/s%=.*%= $LDFLAGS%
  " > Makefile
-diff -ruN zlib-1.2.2-orig/contrib/minizip/Makefile zlib-1.2.2-2/contrib/minizip/Makefile
---- zlib-1.2.2-orig/contrib/minizip/Makefile   2003-09-10 20:00:16.000000000 +0200
-+++ zlib-1.2.2-2/contrib/minizip/Makefile      2004-11-13 12:37:43.000000000 +0100
+diff -ruN zlib-1.2.3-orig/contrib/minizip/Makefile zlib-1.2.3-2/contrib/minizip/Makefile
+--- zlib-1.2.3-orig/contrib/minizip/Makefile   2003-09-10 20:00:16.000000000 +0200
++++ zlib-1.2.3-2/contrib/minizip/Makefile      2004-11-13 12:37:43.000000000 +0100
 @@ -1,8 +1,8 @@
  CC=cc
 -CFLAGS=-O -I../..