- crux-commits - lists.crux.nu

r979 - crux-2.2/ports/opt/faad2
by crux＠crux.nu 21 Mar '06

21 Mar '06

Author: sten Date: 2006-03-21 14:02:07 +0100 (Tue, 21 Mar 2006) New Revision: 979 Added: crux-2.2/ports/opt/faad2/faad2-2.0-gcc4.patch Modified: crux-2.2/ports/opt/faad2/.md5sum crux-2.2/ports/opt/faad2/Pkgfile Log: faad2: add gcc4 patch Modified: crux-2.2/ports/opt/faad2/.md5sum =================================================================== --- crux-2.2/ports/opt/faad2/.md5sum 2006-03-20 18:42:41 UTC (rev 978) +++ crux-2.2/ports/opt/faad2/.md5sum 2006-03-21 13:02:07 UTC (rev 979) @@ -1 +1,2 @@ +adf81610f76c28b4006c7b0930eb21af faad2-2.0-gcc4.patch 1a6f79365f2934a4888b210ef47a3a07 faad2-2.0.tar.gz Modified: crux-2.2/ports/opt/faad2/Pkgfile =================================================================== --- crux-2.2/ports/opt/faad2/Pkgfile 2006-03-20 18:42:41 UTC (rev 978) +++ crux-2.2/ports/opt/faad2/Pkgfile 2006-03-21 13:02:07 UTC (rev 979) @@ -1,19 +1,21 @@ # Description: ISO AAC audio decoder # URL: http://www.audiocoding.com # Maintainer: sten, nick dot steeves at shaw dot ca -# Packager: Matt Housh, jaeger at morpheus dot net +# Packager: # Depends on: libsndfile, id3lib name=faad2 version=2.0 -release=1 -source=(http://dl.sourceforge.net/sourceforge/faac/${name}-${version}.tar.gz) +release=2 +source=(http://dl.sourceforge.net/sourceforge/faac/${name}-${version}.tar.gz \ + faad2-2.0-gcc4.patch) build() { - cd $name - touch INSTALL - chmod +x bootstrap && ./bootstrap - ./configure --prefix=/usr - cd libfaad && make DESTDIR=$PKG install && cd .. - cd common && make DESTDIR=$PKG install && cd .. + cd $name + patch -p1 -i $SRC/faad2-$version-gcc4.patch + touch INSTALL + chmod +x bootstrap && ./bootstrap + ./configure --prefix=/usr + cd libfaad && make DESTDIR=$PKG install && cd .. + cd common && make DESTDIR=$PKG install && cd .. } Added: crux-2.2/ports/opt/faad2/faad2-2.0-gcc4.patch =================================================================== --- crux-2.2/ports/opt/faad2/faad2-2.0-gcc4.patch 2006-03-20 18:42:41 UTC (rev 978) +++ crux-2.2/ports/opt/faad2/faad2-2.0-gcc4.patch 2006-03-21 13:02:07 UTC (rev 979) @@ -0,0 +1,387 @@ +# Looks a lot like Gentoo's 021_all_gcc4.patch, imho --Sten +diff -ru faad2.orig/common/mp4ff/mp4atom.c faad2/common/mp4ff/mp4atom.c +--- faad2.orig/common/mp4ff/mp4atom.c 2004-01-11 16:52:18.000000000 +0100 ++++ faad2/common/mp4ff/mp4atom.c 2006-03-05 11:48:17.000000000 +0100 +@@ -31,15 +31,15 @@ + #include "drms.h" + + /* parse atom header size */ +-static int32_t mp4ff_atom_get_size(const int8_t *data) ++static int32_t mp4ff_atom_get_size(const uint8_t *data) + { + uint32_t result; + uint32_t a, b, c, d; + +- a = (uint8_t)data[0]; +- b = (uint8_t)data[1]; +- c = (uint8_t)data[2]; +- d = (uint8_t)data[3]; ++ a = data[0]; ++ b = data[1]; ++ c = data[2]; ++ d = data[3]; + + result = (a<<24) | (b<<16) | (c<<8) | d; + //if (result > 0 && result < 8) result = 8; +@@ -182,7 +182,7 @@ + { + uint64_t size; + int32_t ret; +- int8_t atom_header[8]; ++ uint8_t atom_header[8]; + + ret = mp4ff_read_data(f, atom_header, 8); + if (ret != 8) +diff -ru faad2.orig/common/mp4ff/mp4ff.h faad2/common/mp4ff/mp4ff.h +--- faad2.orig/common/mp4ff/mp4ff.h 2004-01-11 16:52:18.000000000 +0100 ++++ faad2/common/mp4ff/mp4ff.h 2006-03-05 11:48:17.000000000 +0100 +@@ -125,4 +125,4 @@ + } + #endif /* __cplusplus */ + +-#endif +\ No newline at end of file ++#endif +diff -ru faad2.orig/common/mp4ff/mp4ff_int_types.h faad2/common/mp4ff/mp4ff_int_types.h +--- faad2.orig/common/mp4ff/mp4ff_int_types.h 2003-12-13 23:26:56.000000000 +0100 ++++ faad2/common/mp4ff/mp4ff_int_types.h 2006-03-05 11:48:18.000000000 +0100 +@@ -20,4 +20,4 @@ + #endif + + +-#endif +\ No newline at end of file ++#endif +diff -ru faad2.orig/common/mp4ff/mp4ffint.h faad2/common/mp4ff/mp4ffint.h +--- faad2.orig/common/mp4ff/mp4ffint.h 2004-01-14 21:50:22.000000000 +0100 ++++ faad2/common/mp4ff/mp4ffint.h 2006-03-05 11:48:18.000000000 +0100 +@@ -226,8 +226,8 @@ + + + /* mp4util.c */ +-int32_t mp4ff_read_data(mp4ff_t *f, int8_t *data, uint32_t size); +-int32_t mp4ff_write_data(mp4ff_t *f, int8_t *data, uint32_t size); ++int32_t mp4ff_read_data(mp4ff_t *f, uint8_t *data, uint32_t size); ++int32_t mp4ff_write_data(mp4ff_t *f, uint8_t *data, uint32_t size); + uint64_t mp4ff_read_int64(mp4ff_t *f); + uint32_t mp4ff_read_int32(mp4ff_t *f); + uint32_t mp4ff_read_int24(mp4ff_t *f); +@@ -241,7 +241,7 @@ + char * mp4ff_read_string(mp4ff_t * f,uint32_t length); + + /* mp4atom.c */ +-static int32_t mp4ff_atom_get_size(const int8_t *data); ++static int32_t mp4ff_atom_get_size(const uint8_t *data); + static int32_t mp4ff_atom_compare(const int8_t a1, const int8_t b1, const int8_t c1, const int8_t d1, + const int8_t a2, const int8_t b2, const int8_t c2, const int8_t d2); + static uint8_t mp4ff_atom_name_to_type(const int8_t a, const int8_t b, const int8_t c, const int8_t d); +@@ -301,7 +301,6 @@ + mp4ff_t *mp4ff_open_edit(mp4ff_callback_t *f); + #endif + void mp4ff_close(mp4ff_t *ff); +-void mp4ff_track_add(mp4ff_t *f); + int32_t parse_sub_atoms(mp4ff_t *f, const uint64_t total_size); + int32_t parse_atoms(mp4ff_t *f); + +@@ -326,4 +325,4 @@ + } + #endif /* __cplusplus */ + +-#endif +\ No newline at end of file ++#endif +diff -ru faad2.orig/common/mp4ff/mp4meta.c faad2/common/mp4ff/mp4meta.c +--- faad2.orig/common/mp4ff/mp4meta.c 2004-01-11 16:52:18.000000000 +0100 ++++ faad2/common/mp4ff/mp4meta.c 2006-03-05 11:48:18.000000000 +0100 +@@ -411,4 +411,4 @@ + return mp4ff_meta_find_by_name(f, "cover", value); + } + +-#endif +\ No newline at end of file ++#endif +diff -ru faad2.orig/common/mp4ff/mp4tagupdate.c faad2/common/mp4ff/mp4tagupdate.c +--- faad2.orig/common/mp4ff/mp4tagupdate.c 2004-01-06 12:59:47.000000000 +0100 ++++ faad2/common/mp4ff/mp4tagupdate.c 2006-03-05 11:48:18.000000000 +0100 +@@ -143,7 +143,7 @@ + bufptr = membuffer_get_ptr(buf); + if (bufptr==0) return 0; + +- if ((unsigned)mp4ff_read_data(src,(char*)bufptr + oldsize,bytes)!=bytes) ++ if ((unsigned)mp4ff_read_data(src,(uint8_t*)bufptr + oldsize,bytes)!=bytes) + { + membuffer_set_error(buf); + return 0; +@@ -398,7 +398,7 @@ + uint64_t atom_offset = base; + for(;;) + { +- char atom_name[4]; ++ uint8_t atom_name[4]; + uint32_t atom_size; + + mp4ff_set_position(f,atom_offset); +@@ -618,7 +618,7 @@ + /* copy moov atom to end of the file */ + if (ff->last_atom != ATOM_MOOV) + { +- char *free_data = "free"; ++ uint8_t *free_data = (uint8_t*)"free"; + + /* rename old moov to free */ + mp4ff_set_position(ff, ff->moov_offset + 4); +@@ -626,14 +626,14 @@ + + mp4ff_set_position(ff, ff->file_size); + mp4ff_write_int32(ff,new_moov_size + 8); +- mp4ff_write_data(ff,"moov",4); ++ mp4ff_write_data(ff,(uint8_t*)"moov",4); + mp4ff_write_data(ff, new_moov_data, new_moov_size); + } + else + { + mp4ff_set_position(ff, ff->moov_offset); + mp4ff_write_int32(ff,new_moov_size + 8); +- mp4ff_write_data(ff,"moov",4); ++ mp4ff_write_data(ff,(uint8_t*)"moov",4); + mp4ff_write_data(ff, new_moov_data, new_moov_size); + } + +diff -ru faad2.orig/common/mp4ff/mp4util.c faad2/common/mp4ff/mp4util.c +--- faad2.orig/common/mp4ff/mp4util.c 2004-01-11 16:52:19.000000000 +0100 ++++ faad2/common/mp4ff/mp4util.c 2006-03-05 11:48:18.000000000 +0100 +@@ -28,7 +28,7 @@ + #include "mp4ffint.h" + #include <stdlib.h> + +-int32_t mp4ff_read_data(mp4ff_t *f, int8_t *data, uint32_t size) ++int32_t mp4ff_read_data(mp4ff_t *f, uint8_t *data, uint32_t size) + { + int32_t result = 1; + +@@ -44,7 +44,7 @@ + return f->stream->truncate(f->stream->user_data); + } + +-int32_t mp4ff_write_data(mp4ff_t *f, int8_t *data, uint32_t size) ++int32_t mp4ff_write_data(mp4ff_t *f, uint8_t *data, uint32_t size) + { + int32_t result = 1; + +@@ -105,13 +105,13 @@ + { + uint32_t result; + uint32_t a, b, c, d; +- int8_t data[4]; ++ uint8_t data[4]; + + mp4ff_read_data(f, data, 4); +- a = (uint8_t)data[0]; +- b = (uint8_t)data[1]; +- c = (uint8_t)data[2]; +- d = (uint8_t)data[3]; ++ a = data[0]; ++ b = data[1]; ++ c = data[2]; ++ d = data[3]; + + result = (a<<24) | (b<<16) | (c<<8) | d; + return (uint32_t)result; +@@ -121,12 +121,12 @@ + { + uint32_t result; + uint32_t a, b, c; +- int8_t data[4]; ++ uint8_t data[4]; + + mp4ff_read_data(f, data, 3); +- a = (uint8_t)data[0]; +- b = (uint8_t)data[1]; +- c = (uint8_t)data[2]; ++ a = data[0]; ++ b = data[1]; ++ c = data[2]; + + result = (a<<16) | (b<<8) | c; + return (uint32_t)result; +@@ -136,11 +136,11 @@ + { + uint32_t result; + uint32_t a, b; +- int8_t data[2]; ++ uint8_t data[2]; + + mp4ff_read_data(f, data, 2); +- a = (uint8_t)data[0]; +- b = (uint8_t)data[1]; ++ a = data[0]; ++ b = data[1]; + + result = (a<<8) | b; + return (uint16_t)result; +@@ -151,7 +151,7 @@ + char * str = (char*)malloc(length + 1); + if (str!=0) + { +- if ((uint32_t)mp4ff_read_data(f,str,length)!=length) ++ if ((uint32_t)mp4ff_read_data(f,(uint8_t*)str,length)!=length) + { + free(str); + str = 0; +diff -ru faad2.orig/common/mp4v2/mp4meta.cpp faad2/common/mp4v2/mp4meta.cpp +--- faad2.orig/common/mp4v2/mp4meta.cpp 2003-08-03 14:17:20.000000000 +0200 ++++ faad2/common/mp4v2/mp4meta.cpp 2006-03-05 11:48:18.000000000 +0100 +@@ -830,7 +830,6 @@ + MP4BytesProperty *pMetadataProperty = NULL; + char s[256]; + int i = 0; +- bool nameExists = false; + + while (1) + { +diff -ru faad2.orig/common/mp4v2/rtphint.h faad2/common/mp4v2/rtphint.h +--- faad2.orig/common/mp4v2/rtphint.h 2003-06-29 23:41:00.000000000 +0200 ++++ faad2/common/mp4v2/rtphint.h 2006-03-05 11:48:18.000000000 +0100 +@@ -35,8 +35,8 @@ + return m_pPacket; + } + +- virtual u_int16_t GetDataSize() = NULL; +- virtual void GetData(u_int8_t* pDest) = NULL; ++ virtual u_int16_t GetDataSize() = 0; ++ virtual void GetData(u_int8_t* pDest) = 0; + + MP4Track* FindTrackFromRefIndex(u_int8_t refIndex); + +@@ -210,7 +210,7 @@ + + MP4RtpPacket* GetCurrentPacket() { + if (m_rtpPackets.Size() == 0) { +- return NULL; ++ return 0; + } + return m_rtpPackets[m_rtpPackets.Size() - 1]; + } +@@ -250,10 +250,10 @@ + } + + void GetPayload( +- char** ppPayloadName = NULL, +- u_int8_t* pPayloadNumber = NULL, +- u_int16_t* pMaxPayloadSize = NULL, +- char **ppEncodingParams = NULL); ++ char** ppPayloadName = 0, ++ u_int8_t* pPayloadNumber = 0, ++ u_int16_t* pMaxPayloadSize = 0, ++ char **ppEncodingParams = 0); + + void SetPayload( + const char* payloadName, +@@ -265,7 +265,7 @@ + + void ReadHint( + MP4SampleId hintSampleId, +- u_int16_t* pNumPackets = NULL); ++ u_int16_t* pNumPackets = 0); + + u_int16_t GetHintNumberOfPackets(); + +diff -ru faad2.orig/frontend/main.c faad2/frontend/main.c +--- faad2.orig/frontend/main.c 2004-01-06 12:59:47.000000000 +0100 ++++ faad2/frontend/main.c 2006-03-05 11:48:18.000000000 +0100 +@@ -36,6 +36,7 @@ + #include <fcntl.h> + #include <stdio.h> + #include <stdlib.h> ++#include <string.h> + #include <getopt.h> + + #include <faad.h> +@@ -377,8 +378,8 @@ + float *song_length) + { + int tagsize; +- unsigned long samplerate; +- unsigned char channels; ++ uint32_t samplerate; ++ uint8_t channels; + void *sample_buffer; + + audio_file *aufile; +@@ -656,7 +657,7 @@ + for (i = 0; i < numTracks; i++) + { + unsigned char *buff = NULL; +- int buff_size = 0; ++ uint32_t buff_size = 0; + mp4AudioSpecificConfig mp4ASC; + + mp4ff_get_decoder_config(infile, i, &buff, &buff_size); +@@ -687,8 +688,8 @@ + int infoOnly, int adts_out, float *song_length) + { + int track; +- unsigned long samplerate; +- unsigned char channels; ++ uint32_t samplerate; ++ uint8_t channels; + void *sample_buffer; + + mp4ff_t *infile; +@@ -707,7 +708,7 @@ + mp4AudioSpecificConfig mp4ASC; + + unsigned char *buffer; +- int buffer_size; ++ uint32_t buffer_size; + + char percents[200]; + int percent, old_percent = -1; +diff -ru faad2.orig/libfaad/decoder.c faad2/libfaad/decoder.c +--- faad2.orig/libfaad/decoder.c 2004-02-04 21:07:24.000000000 +0100 ++++ faad2/libfaad/decoder.c 2006-03-05 11:48:18.000000000 +0100 +@@ -50,7 +50,7 @@ + uint16_t dbg_count; + #endif + +-int8_t* FAADAPI faacDecGetErrorMessage(uint8_t errcode) ++char* FAADAPI faacDecGetErrorMessage(uint8_t errcode) + { + if (errcode >= NUM_ERROR_MESSAGES) + return NULL; +diff -ru faad2.orig/libfaad/decoder.h faad2/libfaad/decoder.h +--- faad2.orig/libfaad/decoder.h 2004-01-05 15:05:11.000000000 +0100 ++++ faad2/libfaad/decoder.h 2006-03-05 11:48:18.000000000 +0100 +@@ -76,7 +76,7 @@ + #define LFE_CHANNEL (9) + #define UNKNOWN_CHANNEL (0) + +-int8_t* FAADAPI faacDecGetErrorMessage(uint8_t errcode); ++char* FAADAPI faacDecGetErrorMessage(uint8_t errcode); + + uint32_t FAADAPI faacDecGetCapabilities(void); + +diff -ru faad2.orig/libfaad/error.c faad2/libfaad/error.c +--- faad2.orig/libfaad/error.c 2004-01-28 20:17:25.000000000 +0100 ++++ faad2/libfaad/error.c 2006-03-05 11:48:18.000000000 +0100 +@@ -28,7 +28,7 @@ + #include "common.h" + #include "error.h" + +-int8_t *err_msg[] = { ++char *err_msg[] = { + "No error", + "Gain control not yet implemented", + "Pulse coding not allowed in short blocks", +diff -ru faad2.orig/libfaad/error.h faad2/libfaad/error.h +--- faad2.orig/libfaad/error.h 2004-01-28 20:17:25.000000000 +0100 ++++ faad2/libfaad/error.h 2006-03-05 11:48:18.000000000 +0100 +@@ -33,7 +33,7 @@ + #endif + + #define NUM_ERROR_MESSAGES 26 +-extern int8_t *err_msg[]; ++extern char *err_msg[]; + + #ifdef __cplusplus + }

1 0

r978 - crux-2.2/ports/opt/x11
by crux＠crux.nu 20 Mar '06

20 Mar '06

Author: tilman Date: 2006-03-20 19:42:41 +0100 (Mon, 20 Mar 2006) New Revision: 978 Modified: crux-2.2/ports/opt/x11/Pkgfile Log: [security] x11 (2.2): applied the patch for CVE-2006-0745 Modified: crux-2.2/ports/opt/x11/Pkgfile =================================================================== --- crux-2.2/ports/opt/x11/Pkgfile 2006-03-20 17:23:22 UTC (rev 977) +++ crux-2.2/ports/opt/x11/Pkgfile 2006-03-20 18:42:41 UTC (rev 978) @@ -8,12 +8,13 @@ version=6.9.0 release=2 source=(http://ftp.x.org/pub/X11R${version}/src-single/X11R${version}-src.t… \ - $name-$version-xterm256.patch $name-$version-linux_config.patch xdm host.def) + $name-$version-xterm256.patch $name-$version-linux_config.patch xdm host.def http://xorg.freedesktop.org/releases/X11R${version}/patches/${name}r${versi…) build() { cd xc patch -p1 < $SRC/$name-$version-xterm256.patch patch -p1 < $SRC/$name-$version-linux_config.patch + patch -p0 < $SRC/${name}r${version}-geteuid.diff sed "s/#CFLAGS#/$CFLAGS/" $SRC/host.def > config/cf/host.def make World

1 0

r977 - crux-2.2/ports/opt/imlib2
by crux＠crux.nu 20 Mar '06

20 Mar '06

Author: viper Date: 2006-03-20 18:23:22 +0100 (Mon, 20 Mar 2006) New Revision: 977 Added: crux-2.2/ports/opt/imlib2/imlib2-1.2.1.011.patch Removed: crux-2.2/ports/opt/imlib2/imlib2-1.2.1.010.patch Modified: crux-2.2/ports/opt/imlib2/.md5sum crux-2.2/ports/opt/imlib2/Pkgfile Log: imlib2: updated to version 1.2.1.011 Modified: crux-2.2/ports/opt/imlib2/.md5sum =================================================================== --- crux-2.2/ports/opt/imlib2/.md5sum 2006-03-20 17:21:45 UTC (rev 976) +++ crux-2.2/ports/opt/imlib2/.md5sum 2006-03-20 17:23:22 UTC (rev 977) @@ -1,2 +1,2 @@ -e477d50cc98df7c59cce5eb24573a35e imlib2-1.2.1.010.patch -db9c43cddcbcb5962efb5a0f582ea738 imlib2-1.2.1.010.tar.gz +da6a3c7c480226a21c0a0b3d4e63c3ff imlib2-1.2.1.011.patch +d4c373504c255bc730b6b76fef90bb39 imlib2-1.2.1.011.tar.gz Modified: crux-2.2/ports/opt/imlib2/Pkgfile =================================================================== --- crux-2.2/ports/opt/imlib2/Pkgfile 2006-03-20 17:21:45 UTC (rev 976) +++ crux-2.2/ports/opt/imlib2/Pkgfile 2006-03-20 17:23:22 UTC (rev 977) @@ -5,7 +5,7 @@ # Depends on: freetype, libid3tag name=imlib2 -version=1.2.1.010 +version=1.2.1.011 release=1 source=(http://enlightenment.freedesktop.org/files/$name-$version.tar.gz \ $name-$version.patch) Deleted: crux-2.2/ports/opt/imlib2/imlib2-1.2.1.010.patch =================================================================== --- crux-2.2/ports/opt/imlib2/imlib2-1.2.1.010.patch 2006-03-20 17:21:45 UTC (rev 976) +++ crux-2.2/ports/opt/imlib2/imlib2-1.2.1.010.patch 2006-03-20 17:23:22 UTC (rev 977) @@ -1,20 +0,0 @@ ---- imlib2-1.2.1.010/configure 2006-01-13 13:11:13.000000000 +0100 -+++ imlib2-1.2.1.010/configure 2006-01-13 13:11:57.000000000 +0100 -@@ -21490,7 +21490,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lungif $LIBS" -+LIBS="-lungif �L/usr/X11R6/lib -lX11 -lSM -lICE $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -21548,7 +21548,7 @@ - echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_DGifOpenFileName" >&5 - echo "${ECHO_T}$ac_cv_lib_ungif_DGifOpenFileName" >&6 - if test $ac_cv_lib_ungif_DGifOpenFileName = yes; then -- gif_libs="-lungif" -+ gif_libs="-lungif -L/usr/X11R6/lib -X11 -lSM -lICE" - gif_ok=yes - else - gif_ok=no Added: crux-2.2/ports/opt/imlib2/imlib2-1.2.1.011.patch =================================================================== --- crux-2.2/ports/opt/imlib2/imlib2-1.2.1.011.patch 2006-03-20 17:21:45 UTC (rev 976) +++ crux-2.2/ports/opt/imlib2/imlib2-1.2.1.011.patch 2006-03-20 17:23:22 UTC (rev 977) @@ -0,0 +1,20 @@ +--- imlib2-1.2.1.011/configure 2006-03-17 10:16:09.000000000 +0100 ++++ imlib2-1.2.1.011/configure 2006-03-20 18:16:48.000000000 +0100 +@@ -20451,7 +20451,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lungif $LIBS" ++LIBS="-lungif �L/usr/X11R6/lib -lX11 -lSM -lICE $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -20509,7 +20509,7 @@ + echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_DGifOpenFileName" >&5 + echo "${ECHO_T}$ac_cv_lib_ungif_DGifOpenFileName" >&6 + if test $ac_cv_lib_ungif_DGifOpenFileName = yes; then +- gif_libs="-lungif" ++ gif_libs="-lungif -L/usr/X11R6/lib -X11 -lSM -lICE" + gif_ok=yes + else + gif_ok=no

1 0

r976 - crux-2.1/ports/opt/imlib2
by crux＠crux.nu 20 Mar '06

20 Mar '06

Author: viper Date: 2006-03-20 18:21:45 +0100 (Mon, 20 Mar 2006) New Revision: 976 Added: crux-2.1/ports/opt/imlib2/imlib2-1.2.1.011.patch Removed: crux-2.1/ports/opt/imlib2/imlib2-1.2.1.010.patch Modified: crux-2.1/ports/opt/imlib2/.md5sum crux-2.1/ports/opt/imlib2/Pkgfile Log: imlib2: updated to version 1.2.1.011 Modified: crux-2.1/ports/opt/imlib2/.md5sum =================================================================== --- crux-2.1/ports/opt/imlib2/.md5sum 2006-03-20 14:31:55 UTC (rev 975) +++ crux-2.1/ports/opt/imlib2/.md5sum 2006-03-20 17:21:45 UTC (rev 976) @@ -1,2 +1,2 @@ -e477d50cc98df7c59cce5eb24573a35e imlib2-1.2.1.010.patch -db9c43cddcbcb5962efb5a0f582ea738 imlib2-1.2.1.010.tar.gz +da6a3c7c480226a21c0a0b3d4e63c3ff imlib2-1.2.1.011.patch +d4c373504c255bc730b6b76fef90bb39 imlib2-1.2.1.011.tar.gz Modified: crux-2.1/ports/opt/imlib2/Pkgfile =================================================================== --- crux-2.1/ports/opt/imlib2/Pkgfile 2006-03-20 14:31:55 UTC (rev 975) +++ crux-2.1/ports/opt/imlib2/Pkgfile 2006-03-20 17:21:45 UTC (rev 976) @@ -5,7 +5,7 @@ # Depends on: freetype, libid3tag name=imlib2 -version=1.2.1.010 +version=1.2.1.011 release=1 source=(http://enlightenment.freedesktop.org/files/$name-$version.tar.gz \ $name-$version.patch) Deleted: crux-2.1/ports/opt/imlib2/imlib2-1.2.1.010.patch =================================================================== --- crux-2.1/ports/opt/imlib2/imlib2-1.2.1.010.patch 2006-03-20 14:31:55 UTC (rev 975) +++ crux-2.1/ports/opt/imlib2/imlib2-1.2.1.010.patch 2006-03-20 17:21:45 UTC (rev 976) @@ -1,20 +0,0 @@ ---- imlib2-1.2.1.010/configure 2006-01-13 13:11:13.000000000 +0100 -+++ imlib2-1.2.1.010/configure 2006-01-13 13:11:57.000000000 +0100 -@@ -21490,7 +21490,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lungif $LIBS" -+LIBS="-lungif �L/usr/X11R6/lib -lX11 -lSM -lICE $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -21548,7 +21548,7 @@ - echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_DGifOpenFileName" >&5 - echo "${ECHO_T}$ac_cv_lib_ungif_DGifOpenFileName" >&6 - if test $ac_cv_lib_ungif_DGifOpenFileName = yes; then -- gif_libs="-lungif" -+ gif_libs="-lungif -L/usr/X11R6/lib -X11 -lSM -lICE" - gif_ok=yes - else - gif_ok=no Added: crux-2.1/ports/opt/imlib2/imlib2-1.2.1.011.patch =================================================================== --- crux-2.1/ports/opt/imlib2/imlib2-1.2.1.011.patch 2006-03-20 14:31:55 UTC (rev 975) +++ crux-2.1/ports/opt/imlib2/imlib2-1.2.1.011.patch 2006-03-20 17:21:45 UTC (rev 976) @@ -0,0 +1,20 @@ +--- imlib2-1.2.1.011/configure 2006-03-17 10:16:09.000000000 +0100 ++++ imlib2-1.2.1.011/configure 2006-03-20 18:16:48.000000000 +0100 +@@ -20451,7 +20451,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lungif $LIBS" ++LIBS="-lungif �L/usr/X11R6/lib -lX11 -lSM -lICE $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -20509,7 +20509,7 @@ + echo "$as_me:$LINENO: result: $ac_cv_lib_ungif_DGifOpenFileName" >&5 + echo "${ECHO_T}$ac_cv_lib_ungif_DGifOpenFileName" >&6 + if test $ac_cv_lib_ungif_DGifOpenFileName = yes; then +- gif_libs="-lungif" ++ gif_libs="-lungif -L/usr/X11R6/lib -X11 -lSM -lICE" + gif_ok=yes + else + gif_ok=no

1 0

r975 - crux-2.2/ports/opt/cryptsetup-luks
by crux＠crux.nu 20 Mar '06

20 Mar '06

Author: viper Date: 2006-03-20 15:31:55 +0100 (Mon, 20 Mar 2006) New Revision: 975 Modified: crux-2.2/ports/opt/cryptsetup-luks/.md5sum crux-2.2/ports/opt/cryptsetup-luks/Pkgfile Log: cryptsetup-luks: updated to version 1.03-rc1 Modified: crux-2.2/ports/opt/cryptsetup-luks/.md5sum =================================================================== --- crux-2.2/ports/opt/cryptsetup-luks/.md5sum 2006-03-20 14:27:53 UTC (rev 974) +++ crux-2.2/ports/opt/cryptsetup-luks/.md5sum 2006-03-20 14:31:55 UTC (rev 975) @@ -1 +1 @@ -cd6899ecf517c3414386476bd97f97d3 cryptsetup-luks-1.0.2.tar.bz2 +601572b6e57bb5a56413a9b69c3286a0 cryptsetup-luks-1.0.3-rc1.tar.bz2 Modified: crux-2.2/ports/opt/cryptsetup-luks/Pkgfile =================================================================== --- crux-2.2/ports/opt/cryptsetup-luks/Pkgfile 2006-03-20 14:27:53 UTC (rev 974) +++ crux-2.2/ports/opt/cryptsetup-luks/Pkgfile 2006-03-20 14:31:55 UTC (rev 975) @@ -4,7 +4,7 @@ # Depends on: libdevmapper, libgcrypt, popt name=cryptsetup-luks -version=1.0.2 +version=1.0.3-rc1 release=1 source=(http://luks.endorphin.org/source/$name-$version.tar.bz2)

1 0

r974 - crux-2.2/ports/opt/cyrus-sasl
by crux＠crux.nu 20 Mar '06

20 Mar '06

Author: viper Date: 2006-03-20 15:27:53 +0100 (Mon, 20 Mar 2006) New Revision: 974 Added: crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21-crypt.patch crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21-gcc4.patch crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21-plugin_path.patch Removed: crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21.patch Modified: crux-2.2/ports/opt/cyrus-sasl/.md5sum crux-2.2/ports/opt/cyrus-sasl/Pkgfile Log: Added a necessary patch to compile cyrus-sasl with gcc4. Splitted the big patch into two small ones. Modified: crux-2.2/ports/opt/cyrus-sasl/.md5sum =================================================================== --- crux-2.2/ports/opt/cyrus-sasl/.md5sum 2006-03-20 09:03:05 UTC (rev 973) +++ crux-2.2/ports/opt/cyrus-sasl/.md5sum 2006-03-20 14:27:53 UTC (rev 974) @@ -1,3 +1,5 @@ -24340f304b900460fb5f815d9d2e040c cyrus-sasl-2.1.21.patch +4ecd4363f41acc640bec4eedbd3b76c9 cyrus-sasl-2.1.21-crypt.patch +d5d1c592c1581ec4bd02bb96e299bd9e cyrus-sasl-2.1.21-gcc4.patch +88896aa3a87ca1a56ba126a398b1ebb1 cyrus-sasl-2.1.21-plugin_path.patch dde02db234dea892bee298390890502e cyrus-sasl-2.1.21.tar.gz ec81c1d452216c3da110d7b9a6f8fa8f saslauthd Modified: crux-2.2/ports/opt/cyrus-sasl/Pkgfile =================================================================== --- crux-2.2/ports/opt/cyrus-sasl/Pkgfile 2006-03-20 09:03:05 UTC (rev 973) +++ crux-2.2/ports/opt/cyrus-sasl/Pkgfile 2006-03-20 14:27:53 UTC (rev 974) @@ -6,15 +6,22 @@ name=cyrus-sasl version=2.1.21 -release=2 +release=3 source=(http://ftp.andrew.cmu.edu/pub/cyrus-mail/$name-$version.tar.gz \ - $name-$version.patch \ + $name-$version-crypt.patch \ + $name-$version-gcc4.patch \ + $name-$version-plugin_path.patch \ saslauthd) build(){ cd $name-$version - patch -p0 < $SRC/$name-$version.patch + # fix the crypt function + patch -p0 < $SRC/$name-$version-crypt.patch + # set the plugin path to '/etc/sasl/apps' + patch -p0 < $SRC/$name-$version-plugin_path.patch + # necessary to compile cyrus-sasl with gcc4 + patch -p0 < $SRC/$name-$version-gcc4.patch ./configure \ --prefix=/usr \ Added: crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21-crypt.patch =================================================================== --- crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21-crypt.patch 2006-03-20 09:03:05 UTC (rev 973) +++ crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21-crypt.patch 2006-03-20 14:27:53 UTC (rev 974) @@ -0,0 +1,12 @@ +Index: saslauthd/auth_shadow.c +--- saslauthd/auth_shadow.c 2005-11-30 21:49:20.000000000 +0100 ++++ saslauthd/auth_shadow.c 2005-11-30 21:49:41.000000000 +0100 +@@ -45,6 +45,7 @@ + # include <time.h> + # include <pwd.h> + # include <syslog.h> ++# include <crypt.h> + # ifndef HAVE_GETSPNAM + + # ifdef WITH_DES + Added: crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21-gcc4.patch =================================================================== --- crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21-gcc4.patch 2006-03-20 09:03:05 UTC (rev 973) +++ crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21-gcc4.patch 2006-03-20 14:27:53 UTC (rev 974) @@ -0,0 +1,11 @@ +--- lib/client.c 2006-03-16 15:57:00.000000000 +0100 ++++ lib/client.c 2006-03-16 15:57:18.000000000 +0100 +@@ -61,7 +61,7 @@ + + static cmech_list_t *cmechlist; /* global var which holds the list */ + +-static sasl_global_callbacks_t global_callbacks; ++sasl_global_callbacks_t global_callbacks; + + static int _sasl_client_active = 0; + Added: crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21-plugin_path.patch =================================================================== --- crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21-plugin_path.patch 2006-03-20 09:03:05 UTC (rev 973) +++ crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21-plugin_path.patch 2006-03-20 14:27:53 UTC (rev 974) @@ -0,0 +1,22 @@ +Index: lib/server.c +--- lib/server.c 2004-11-17 15:19:30 +0100 ++++ lib/server.c 2005-05-26 20:54:36 +0200 +@@ -473,16 +473,8 @@ + return SASL_CONTINUE; + } + +- /* get the path to the plugins; for now the config file will reside there */ +- getpath_cb=_sasl_find_getpath_callback( global_callbacks.callbacks ); +- if (getpath_cb==NULL) return SASL_BADPARAM; +- +- /* getpath_cb->proc MUST be a sasl_getpath_t; if only c had a type +- system */ +- result = ((sasl_getpath_t *)(getpath_cb->proc))(getpath_cb->context, +- &path_to_config); +- if (result!=SASL_OK) goto done; +- if (path_to_config == NULL) path_to_config = ""; ++ result = SASL_OK; ++ path_to_config = "/etc/sasl/apps"; + + c = strchr(path_to_config, PATHS_DELIMITER); + Deleted: crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21.patch =================================================================== --- crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21.patch 2006-03-20 09:03:05 UTC (rev 973) +++ crux-2.2/ports/opt/cyrus-sasl/cyrus-sasl-2.1.21.patch 2006-03-20 14:27:53 UTC (rev 974) @@ -1,34 +0,0 @@ -Index: saslauthd/auth_shadow.c ---- saslauthd/auth_shadow.c 2005-11-30 21:49:20.000000000 +0100 -+++ saslauthd/auth_shadow.c 2005-11-30 21:49:41.000000000 +0100 -@@ -45,6 +45,7 @@ - # include <time.h> - # include <pwd.h> - # include <syslog.h> -+# include <crypt.h> - # ifndef HAVE_GETSPNAM - - # ifdef WITH_DES - -Index: lib/server.c ---- lib/server.c 2004-11-17 15:19:30 +0100 -+++ lib/server.c 2005-05-26 20:54:36 +0200 -@@ -473,16 +473,8 @@ - return SASL_CONTINUE; - } - -- /* get the path to the plugins; for now the config file will reside there */ -- getpath_cb=_sasl_find_getpath_callback( global_callbacks.callbacks ); -- if (getpath_cb==NULL) return SASL_BADPARAM; -- -- /* getpath_cb->proc MUST be a sasl_getpath_t; if only c had a type -- system */ -- result = ((sasl_getpath_t *)(getpath_cb->proc))(getpath_cb->context, -- &path_to_config); -- if (result!=SASL_OK) goto done; -- if (path_to_config == NULL) path_to_config = ""; -+ result = SASL_OK; -+ path_to_config = "/etc/sasl/apps"; - - c = strchr(path_to_config, PATHS_DELIMITER); -

1 0

r973 - crux-2.2/ports/core/curl
by crux＠crux.nu 20 Mar '06

20 Mar '06

Author: jw Date: 2006-03-20 10:03:05 +0100 (Mon, 20 Mar 2006) New Revision: 973 Modified: crux-2.2/ports/core/curl/.md5sum crux-2.2/ports/core/curl/Pkgfile Log: curl (2.2): update to 7.15.3 Modified: crux-2.2/ports/core/curl/.md5sum =================================================================== --- crux-2.2/ports/core/curl/.md5sum 2006-03-20 08:57:51 UTC (rev 972) +++ crux-2.2/ports/core/curl/.md5sum 2006-03-20 09:03:05 UTC (rev 973) @@ -1 +1 @@ -6c08e7891fe0db49af65fd10abfd69b1 curl-7.15.2.tar.bz2 +d71b2ee8febfde2c7dc30a43638ec0d9 curl-7.15.3.tar.bz2 Modified: crux-2.2/ports/core/curl/Pkgfile =================================================================== --- crux-2.2/ports/core/curl/Pkgfile 2006-03-20 08:57:51 UTC (rev 972) +++ crux-2.2/ports/core/curl/Pkgfile 2006-03-20 09:03:05 UTC (rev 973) @@ -4,7 +4,7 @@ # Depends: openssl name=curl -version=7.15.2 +version=7.15.3 release=1 source=(http://curl.haxx.se/download/$name-$version.tar.bz2)

1 0

r972 - crux-2.1/ports/core/curl
by crux＠crux.nu 20 Mar '06

20 Mar '06

Author: jw Date: 2006-03-20 09:57:51 +0100 (Mon, 20 Mar 2006) New Revision: 972 Modified: crux-2.1/ports/core/curl/.md5sum crux-2.1/ports/core/curl/Pkgfile Log: [SECURITY] libcurl TFTP Packet Buffer Overflow Vulnerability, http://curl.haxx.se/mail/lib-2006-03/0117.html Modified: crux-2.1/ports/core/curl/.md5sum =================================================================== --- crux-2.1/ports/core/curl/.md5sum 2006-03-20 07:37:28 UTC (rev 971) +++ crux-2.1/ports/core/curl/.md5sum 2006-03-20 08:57:51 UTC (rev 972) @@ -1 +1 @@ -6c08e7891fe0db49af65fd10abfd69b1 curl-7.15.2.tar.bz2 +d71b2ee8febfde2c7dc30a43638ec0d9 curl-7.15.3.tar.bz2 Modified: crux-2.1/ports/core/curl/Pkgfile =================================================================== --- crux-2.1/ports/core/curl/Pkgfile 2006-03-20 07:37:28 UTC (rev 971) +++ crux-2.1/ports/core/curl/Pkgfile 2006-03-20 08:57:51 UTC (rev 972) @@ -4,7 +4,7 @@ # Depends: openssl name=curl -version=7.15.2 +version=7.15.3 release=1 source=(http://curl.haxx.se/download/$name-$version.tar.bz2)

1 0

r971 - crux-2.1/ports/opt/fakeroot crux-2.2/ports/opt/fakeroot
by crux＠crux.nu 20 Mar '06

20 Mar '06

Author: jue Date: 2006-03-20 08:37:28 +0100 (Mon, 20 Mar 2006) New Revision: 971 Modified: crux-2.1/ports/opt/fakeroot/.md5sum crux-2.1/ports/opt/fakeroot/Pkgfile crux-2.2/ports/opt/fakeroot/.md5sum crux-2.2/ports/opt/fakeroot/Pkgfile Log: fakeroot: update to 1.5.8 Modified: crux-2.1/ports/opt/fakeroot/.md5sum =================================================================== --- crux-2.1/ports/opt/fakeroot/.md5sum 2006-03-20 07:36:06 UTC (rev 970) +++ crux-2.1/ports/opt/fakeroot/.md5sum 2006-03-20 07:37:28 UTC (rev 971) @@ -1 +1 @@ -506a6ba21d134694b7e94d1c3a52062b fakeroot_1.5.7.tar.gz +02a410fade33f08d2556fdb60edaaf62 fakeroot_1.5.8.tar.gz Modified: crux-2.1/ports/opt/fakeroot/Pkgfile =================================================================== --- crux-2.1/ports/opt/fakeroot/Pkgfile 2006-03-20 07:36:06 UTC (rev 970) +++ crux-2.1/ports/opt/fakeroot/Pkgfile 2006-03-20 07:37:28 UTC (rev 971) @@ -3,7 +3,7 @@ # Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de name=fakeroot -version=1.5.7 +version=1.5.8 release=1 source=(http://ftp.debian.org/debian/pool/main/f/$name/${name}_$version.tar… Modified: crux-2.2/ports/opt/fakeroot/.md5sum =================================================================== --- crux-2.2/ports/opt/fakeroot/.md5sum 2006-03-20 07:36:06 UTC (rev 970) +++ crux-2.2/ports/opt/fakeroot/.md5sum 2006-03-20 07:37:28 UTC (rev 971) @@ -1 +1 @@ -506a6ba21d134694b7e94d1c3a52062b fakeroot_1.5.7.tar.gz +02a410fade33f08d2556fdb60edaaf62 fakeroot_1.5.8.tar.gz Modified: crux-2.2/ports/opt/fakeroot/Pkgfile =================================================================== --- crux-2.2/ports/opt/fakeroot/Pkgfile 2006-03-20 07:36:06 UTC (rev 970) +++ crux-2.2/ports/opt/fakeroot/Pkgfile 2006-03-20 07:37:28 UTC (rev 971) @@ -3,7 +3,7 @@ # Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de name=fakeroot -version=1.5.7 +version=1.5.8 release=1 source=(http://ftp.debian.org/debian/pool/main/f/$name/${name}_$version.tar…

1 0

r970 - crux-2.1/ports/opt/samhain crux-2.2/ports/opt/samhain
by crux＠crux.nu 20 Mar '06

20 Mar '06

Author: jue Date: 2006-03-20 08:36:06 +0100 (Mon, 20 Mar 2006) New Revision: 970 Removed: crux-2.1/ports/opt/samhain/samhain_hide.patch crux-2.2/ports/opt/samhain/samhain_hide.patch Modified: crux-2.1/ports/opt/samhain/.md5sum crux-2.1/ports/opt/samhain/Pkgfile crux-2.2/ports/opt/samhain/.md5sum crux-2.2/ports/opt/samhain/Pkgfile Log: samhain: update to 2.1.3 Modified: crux-2.1/ports/opt/samhain/.md5sum =================================================================== --- crux-2.1/ports/opt/samhain/.md5sum 2006-03-19 16:35:20 UTC (rev 969) +++ crux-2.1/ports/opt/samhain/.md5sum 2006-03-20 07:36:06 UTC (rev 970) @@ -1,2 +1 @@ -1324b8b519587d9abfebf469c4deaa11 samhain_hide.patch -9e009035d7a04a6203a6b0ce404c385c samhain_signed-2.1.2.tar.gz +bc85d4ce0d92cea47eab3e355bb0341f samhain_signed-2.1.3.tar.gz Modified: crux-2.1/ports/opt/samhain/Pkgfile =================================================================== --- crux-2.1/ports/opt/samhain/Pkgfile 2006-03-19 16:35:20 UTC (rev 969) +++ crux-2.1/ports/opt/samhain/Pkgfile 2006-03-20 07:36:06 UTC (rev 970) @@ -3,15 +3,13 @@ # Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de name=samhain -version=2.1.2 +version=2.1.3 release=1 -source=(http://la-samhna.de/$name/${name}_signed-$version.tar.gz - samhain_hide.patch) +source=(http://la-samhna.de/$name/${name}_signed-$version.tar.gz) build () { tar xfz $name-$version.tar.gz cd $name-$version - patch -p1 < $SRC/samhain_hide.patch ./configure --prefix=/usr \ --mandir=/usr/man \ --localstatedir=/var \ Deleted: crux-2.1/ports/opt/samhain/samhain_hide.patch =================================================================== --- crux-2.1/ports/opt/samhain/samhain_hide.patch 2006-03-19 16:35:20 UTC (rev 969) +++ crux-2.1/ports/opt/samhain/samhain_hide.patch 2006-03-20 07:36:06 UTC (rev 970) @@ -1,71 +0,0 @@ -Index: trunk/src/samhain_hide.c -=================================================================== ---- trunk/src/samhain_hide.c (revision 1) -+++ trunk/src/samhain_hide.c (revision 6) -@@ -318,4 +318,5 @@ - int status = 0; /* Return value from original getdents */ - struct inode * dir_inode; -+ struct file * fd_file; - int dir_is_proc = 0; - -@@ -337,5 +338,5 @@ - printk("STATUS %d\n", status); - #endif -- -+ - /* 0: end of directory. - * -1: some error -@@ -346,11 +347,22 @@ - return (status); - } -- -+ - /* Handle directory caching. dir_inode is the inode of the directory. - */ -+#if defined(files_fdtable) -+ { -+ struct fdtable *fdt = files_fdtable(current->files); -+ fd_file = rcu_dereference(fdt->fd[fd]); -+ } -+#else -+ { -+ fd_file = current->files->fd[fd]; -+ } -+#endif -+ - #if defined(__LINUX_DCACHE_H) -- dir_inode = current->files->fd[fd]->f_dentry->d_inode; -+ dir_inode = fd_file->f_dentry->d_inode; - #else -- dir_inode = current->files->fd[fd]->f_inode; -+ dir_inode = fd_file->f_inode; - #endif - -@@ -499,4 +511,5 @@ - long status = 0; /* Return value from original getdents */ - struct inode * dir_inode; -+ struct file * fd_file; - int dir_is_proc = 0; - -@@ -530,8 +543,19 @@ - /* Handle directory caching. dir_inode is the inode of the directory. - */ -+#if defined(files_fdtable) -+ { -+ struct fdtable *fdt = files_fdtable(current->files); -+ fd_file = rcu_dereference(fdt->fd[fd]); -+ } -+#else -+ { -+ fd_file = current->files->fd[fd]; -+ } -+#endif -+ - #if defined(__LINUX_DCACHE_H) -- dir_inode = current->files->fd[fd]->f_dentry->d_inode; -+ dir_inode = fd_file->f_dentry->d_inode; - #else -- dir_inode = current->files->fd[fd]->f_inode; -+ dir_inode = fd_file->f_inode; - #endif - Modified: crux-2.2/ports/opt/samhain/.md5sum =================================================================== --- crux-2.2/ports/opt/samhain/.md5sum 2006-03-19 16:35:20 UTC (rev 969) +++ crux-2.2/ports/opt/samhain/.md5sum 2006-03-20 07:36:06 UTC (rev 970) @@ -1,2 +1 @@ -1324b8b519587d9abfebf469c4deaa11 samhain_hide.patch -9e009035d7a04a6203a6b0ce404c385c samhain_signed-2.1.2.tar.gz +bc85d4ce0d92cea47eab3e355bb0341f samhain_signed-2.1.3.tar.gz Modified: crux-2.2/ports/opt/samhain/Pkgfile =================================================================== --- crux-2.2/ports/opt/samhain/Pkgfile 2006-03-19 16:35:20 UTC (rev 969) +++ crux-2.2/ports/opt/samhain/Pkgfile 2006-03-20 07:36:06 UTC (rev 970) @@ -3,15 +3,13 @@ # Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de name=samhain -version=2.1.2 +version=2.1.3 release=1 -source=(http://la-samhna.de/$name/${name}_signed-$version.tar.gz - samhain_hide.patch) +source=(http://la-samhna.de/$name/${name}_signed-$version.tar.gz) build () { tar xfz $name-$version.tar.gz cd $name-$version - patch -p1 < $SRC/samhain_hide.patch ./configure --prefix=/usr \ --mandir=/usr/man \ --localstatedir=/var \ Deleted: crux-2.2/ports/opt/samhain/samhain_hide.patch =================================================================== --- crux-2.2/ports/opt/samhain/samhain_hide.patch 2006-03-19 16:35:20 UTC (rev 969) +++ crux-2.2/ports/opt/samhain/samhain_hide.patch 2006-03-20 07:36:06 UTC (rev 970) @@ -1,71 +0,0 @@ -Index: trunk/src/samhain_hide.c -=================================================================== ---- trunk/src/samhain_hide.c (revision 1) -+++ trunk/src/samhain_hide.c (revision 6) -@@ -318,4 +318,5 @@ - int status = 0; /* Return value from original getdents */ - struct inode * dir_inode; -+ struct file * fd_file; - int dir_is_proc = 0; - -@@ -337,5 +338,5 @@ - printk("STATUS %d\n", status); - #endif -- -+ - /* 0: end of directory. - * -1: some error -@@ -346,11 +347,22 @@ - return (status); - } -- -+ - /* Handle directory caching. dir_inode is the inode of the directory. - */ -+#if defined(files_fdtable) -+ { -+ struct fdtable *fdt = files_fdtable(current->files); -+ fd_file = rcu_dereference(fdt->fd[fd]); -+ } -+#else -+ { -+ fd_file = current->files->fd[fd]; -+ } -+#endif -+ - #if defined(__LINUX_DCACHE_H) -- dir_inode = current->files->fd[fd]->f_dentry->d_inode; -+ dir_inode = fd_file->f_dentry->d_inode; - #else -- dir_inode = current->files->fd[fd]->f_inode; -+ dir_inode = fd_file->f_inode; - #endif - -@@ -499,4 +511,5 @@ - long status = 0; /* Return value from original getdents */ - struct inode * dir_inode; -+ struct file * fd_file; - int dir_is_proc = 0; - -@@ -530,8 +543,19 @@ - /* Handle directory caching. dir_inode is the inode of the directory. - */ -+#if defined(files_fdtable) -+ { -+ struct fdtable *fdt = files_fdtable(current->files); -+ fd_file = rcu_dereference(fdt->fd[fd]); -+ } -+#else -+ { -+ fd_file = current->files->fd[fd]; -+ } -+#endif -+ - #if defined(__LINUX_DCACHE_H) -- dir_inode = current->files->fd[fd]->f_dentry->d_inode; -+ dir_inode = fd_file->f_dentry->d_inode; - #else -- dir_inode = current->files->fd[fd]->f_inode; -+ dir_inode = fd_file->f_inode; - #endif -

1 0