Changeset 2951


Ignore:
Timestamp:
2006-01-13T16:36:09+01:00 (12 years ago)
Author:
olli
Message:

security update

Location:
trunk/openwrt/package/zlib
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/package/zlib/Makefile

    r2230 r2951  
    44 
    55PKG_NAME:=zlib 
    6 PKG_VERSION:=1.2.2 
    7 PKG_RELEASE:=2 
    8 PKG_MD5SUM:=1b8aab042d40979e456194c468fd72c5 
     6PKG_VERSION:=1.2.3 
     7PKG_RELEASE:=3 
     8PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6 
    99 
    10 PKG_SOURCE_URL:=@SF/zlib 
     10PKG_SOURCE_URL:=http://www.zlib.net \ 
     11        @SF/zlib 
    1112PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    1213PKG_CAT:=bzcat 
  • trunk/openwrt/package/zlib/patches/zlib.patch

    r666 r2951  
    1 diff -ruN zlib-1.2.2-orig/Makefile.in zlib-1.2.2-2/Makefile.in 
    2 --- zlib-1.2.2-orig/Makefile.in 2004-09-15 16:27:20.000000000 +0200 
    3 +++ zlib-1.2.2-2/Makefile.in    2004-11-13 13:38:12.000000000 +0100 
     1--- zlib-1.2.3-orig/Makefile.in 2005-07-18 04:25:21.000000000 +0200 
     2+++ zlib-1.2.3/Makefile.in      2006-01-13 15:31:04.000000000 +0100 
    43@@ -25,20 +25,23 @@ 
    54 #           -Wstrict-prototypes -Wmissing-prototypes 
     
    1413+STATICLIB=libz.a 
    1514 SHAREDLIB=libz.so 
    16  SHAREDLIBV=libz.so.1.2.2 
     15 SHAREDLIBV=libz.so.1.2.3 
    1716 SHAREDLIBM=libz.so.1 
    1817  
    1918-AR=ar rc 
    20 +AR=ar  
     19+AR=ar 
    2120 RANLIB=ranlib 
    2221 TAR=tar 
     
    8887 # ldconfig is for Linux 
    8988  
    90 diff -ruN zlib-1.2.2-orig/configure zlib-1.2.2-2/configure 
    91 --- zlib-1.2.2-orig/configure   2004-09-07 07:50:06.000000000 +0200 
    92 +++ zlib-1.2.2-2/configure      2004-11-13 12:37:43.000000000 +0100 
    93 @@ -23,7 +23,7 @@ 
    94  VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h` 
    95  VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h` 
    96  VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h` 
    97 -AR=${AR-"ar rc"} 
    98 +AR=${AR-"ar"} 
    99  RANLIB=${RANLIB-"ranlib"} 
    100  prefix=${prefix-/usr/local} 
    101  exec_prefix=${exec_prefix-'${prefix}'} 
    102 @@ -73,7 +73,7 @@ 
    103   
    104  if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then 
    105    CC="$cc" 
    106 -  SFLAGS=${CFLAGS-"-fPIC -O3"} 
    107 +  SFLAGS=${CFLAGS-"-D_REENTRANT -fPIC -O3"} 
    108    CFLAGS="$cflags" 
    109    case `(uname -s || echo unknown) 2>/dev/null` in 
    110    Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};; 
    111 @@ -408,6 +408,29 @@ 
    112    echo Checking for mmap support... No. 
    113  fi 
    114   
    115 +cat > $test.c <<EOF 
    116 +#include <stdio.h> 
    117 +int main() { char buf[10]; snprintf(buf, sizeof(buf), "%s", "F"); return 0; } 
    118 +EOF 
    119 +if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then 
    120 +  echo "Checking for snprintf...        Yes." 
    121 +  CFLAGS="$CFLAGS -DHAS_snprintf" 
    122 +else 
    123 +  echo "Checking for snprintf..         No." 
    124 +fi 
    125 + 
    126 +cat > $test.c <<EOF 
    127 +#include <stdio.h> 
    128 +#include <stdarg.h> 
    129 +int main(void) { va_list a; vsnprintf(0, 0, "", a); return 0; } 
    130 +EOF 
    131 +if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then 
    132 +  echo "Checking for vsnprintf...       Yes." 
    133 +  CFLAGS="$CFLAGS -DHAS_vsnprintf" 
    134 +else 
    135 +  echo "Checking for vsnprintf..        No." 
    136 +fi 
    137 + 
    138  CPP=${CPP-"$CC -E"} 
    139  case $CFLAGS in 
    140    *ASMV*) 
    141 @@ -424,20 +447,21 @@ 
    142  # udpate Makefile 
    143  sed < Makefile.in " 
    144  /^CC *=/s#=.*#=$CC# 
    145 -/^CFLAGS *=/s#=.*#=$CFLAGS# 
    146 -/^CPP *=/s#=.*#=$CPP# 
    147 -/^LDSHARED *=/s#=.*#=$LDSHARED# 
    148 -/^LIBS *=/s#=.*#=$LIBS# 
    149 -/^SHAREDLIB *=/s#=.*#=$SHAREDLIB# 
    150 -/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV# 
    151 -/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM# 
    152 -/^AR *=/s#=.*#=$AR# 
    153 -/^RANLIB *=/s#=.*#=$RANLIB# 
    154 -/^EXE *=/s#=.*#=$EXE# 
    155 -/^prefix *=/s#=.*#=$prefix# 
    156 -/^exec_prefix *=/s#=.*#=$exec_prefix# 
    157 -/^libdir *=/s#=.*#=$libdir# 
    158 -/^includedir *=/s#=.*#=$includedir# 
    159 -/^mandir *=/s#=.*#=$mandir# 
    160 -/^LDFLAGS *=/s#=.*#=$LDFLAGS# 
    161 +/^CC *=/s%=.*%= $CC% 
    162 +/^CFLAGS *=/s%=.*%= $CFLAGS% 
    163 +/^CPP *=/s%=.*%= $CPP% 
    164 +/^LDSHARED *=/s%=.*%= $LDSHARED% 
    165 +/^LIBS *=/s%=.*%= $LIBS% 
    166 +/^SHAREDLIB *=/s%=.*%= $SHAREDLIB% 
    167 +/^SHAREDLIBV *=/s%=.*%= $SHAREDLIBV% 
    168 +/^SHAREDLIBM *=/s%=.*%= $SHAREDLIBM% 
    169 +/^AR *=/s%=.*%= $AR% 
    170 +/^RANLIB *=/s%=.*%= $RANLIB% 
    171 +/^EXE *=/s%=.*%= $EXE% 
    172 +/^prefix *=/s%=.*%= $prefix% 
    173 +/^exec_prefix *=/s%=.*%= $exec_prefix% 
    174 +/^libdir *=/s%=.*%= $libdir% 
    175 +/^includedir *=/s%=.*%= $includedir% 
    176 +/^mandir *=/s%=.*%= $mandir% 
    177 +/^LDFLAGS *=/s%=.*%= $LDFLAGS% 
    178  " > Makefile 
    179 diff -ruN zlib-1.2.2-orig/contrib/minizip/Makefile zlib-1.2.2-2/contrib/minizip/Makefile 
    180 --- zlib-1.2.2-orig/contrib/minizip/Makefile    2003-09-10 20:00:16.000000000 +0200 
    181 +++ zlib-1.2.2-2/contrib/minizip/Makefile       2004-11-13 12:37:43.000000000 +0100 
    182 @@ -1,8 +1,8 @@ 
    183  CC=cc 
    184 -CFLAGS=-O -I../.. 
    185 +CFLAGS=-O2 -g -I../.. -Dunix 
    186   
    187 -UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a 
    188 -ZIP_OBJS = minizip.o zip.o   ioapi.o ../../libz.a 
    189 +UNZ_OBJS = miniunz.o unzip.o ioapi.o 
    190 +ZIP_OBJS = minizip.o zip.o   ioapi.o 
    191   
    192  .c.o: 
    193         $(CC) -c $(CFLAGS) $*.c 
    194 @@ -10,10 +10,10 @@ 
    195  all: miniunz minizip 
    196   
    197  miniunz:  $(UNZ_OBJS) 
    198 -       $(CC) $(CFLAGS) -o $@ $(UNZ_OBJS) 
    199 +       $(CC) $(CFLAGS) -o $@ $(UNZ_OBJS) -L ../.. -lz 
    200   
    201  minizip:  $(ZIP_OBJS) 
    202 -       $(CC) $(CFLAGS) -o $@ $(ZIP_OBJS) 
    203 +       $(CC) $(CFLAGS) -o $@ $(ZIP_OBJS) -L ../.. -lz 
    204   
    205  test:  miniunz minizip 
    206         ./minizip test readme.txt 
Note: See TracChangeset for help on using the changeset viewer.