From: hackbard Date: Sun, 3 Jul 2005 23:33:54 +0000 (+0000) Subject: fixes + develpment updates X-Git-Url: https://hackdaworld.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55ace212378b8935daa5cd7042ad3394a5421649;p=hdw-linux%2Fhdw-linux.git fixes + develpment updates --- diff --git a/doc/CHANGELOG b/doc/CHANGELOG index d0fab00..afda068 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,7 @@ +*) 2005-07-04 + +- fixes, updated development packages (tcl/tk not yet) + *) 2005-07-02 - updated all base packages diff --git a/packages/base/bdb/bdb b/packages/base/bdb/bdb index b482bc7..4d80e95 100644 --- a/packages/base/bdb/bdb +++ b/packages/base/bdb/bdb @@ -4,7 +4,7 @@ # # [V] 4.3.28 # [S] 2-7 -# [D] http://downloads.sleepycat.com/ +# [D] db-4.3.28.tar.gz ftp://ftp.sleepycat.com/releases/ srcdir="db-$ver" make_conf="LIBSO_LIBS=-lpthread LIBXSO_LIBS=-lpthread" diff --git a/packages/base/bdb/lock.patch b/packages/base/bdb/lock.patch deleted file mode 100644 index 2a06fec..0000000 --- a/packages/base/bdb/lock.patch +++ /dev/null @@ -1,45 +0,0 @@ -*** ./lock/lock.c.save 2004-01-30 10:48:33.000000000 -0800 ---- ./lock/lock.c 2004-01-30 10:55:58.000000000 -0800 -*************** -*** 2216,2226 **** - dp = (u_int8_t *)dp + \ - sizeof(db_pgno_t); \ - } while (0) -! #define COPY_OBJ(dp, obj) do { \ -! memcpy(dp, obj->data, obj->size); \ -! dp = (u_int8_t *)dp + \ -! ALIGN(obj->size, \ -! sizeof(u_int32_t)); \ - } while (0) - - #define GET_COUNT(dp, count) do { \ ---- 2216,2227 ---- - dp = (u_int8_t *)dp + \ - sizeof(db_pgno_t); \ - } while (0) -! #define COPY_OBJ(dp, obj) do { \ -! memcpy(dp, \ -! (obj)->data, (obj)->size); \ -! dp = (u_int8_t *)dp + \ -! ALIGN((obj)->size, \ -! sizeof(u_int32_t)); \ - } while (0) - - #define GET_COUNT(dp, count) do { \ -*************** -*** 2339,2345 **** - for (i = 0; i < nlocks; i = j) { - PUT_PCOUNT(dp, obj[i].ulen); - PUT_SIZE(dp, obj[i].size); -! COPY_OBJ(dp, obj); - lock = (DB_LOCK_ILOCK *)obj[i].data; - for (j = i + 1; j <= i + obj[i].ulen; j++) { - lock = (DB_LOCK_ILOCK *)obj[j].data; ---- 2340,2346 ---- - for (i = 0; i < nlocks; i = j) { - PUT_PCOUNT(dp, obj[i].ulen); - PUT_SIZE(dp, obj[i].size); -! COPY_OBJ(dp, &obj[i]); - lock = (DB_LOCK_ILOCK *)obj[i].data; - for (j = i + 1; j <= i + obj[i].ulen; j++) { - lock = (DB_LOCK_ILOCK *)obj[j].data; diff --git a/packages/base/bdb/mp.patch b/packages/base/bdb/mp.patch deleted file mode 100644 index 7bb09ab..0000000 --- a/packages/base/bdb/mp.patch +++ /dev/null @@ -1,36 +0,0 @@ -*** ./mp/mp_fget.c.orig 25 Sep 2003 02:15:16 -0000 11.81 ---- ./mp/mp_fget.c 9 Dec 2003 19:06:28 -0000 11.82 -*************** -*** 440,446 **** - c_mp->stat.st_pages--; - alloc_bhp = NULL; - R_UNLOCK(dbenv, &dbmp->reginfo[n_cache]); -- MUTEX_LOCK(dbenv, &hp->hash_mutex); - - /* - * We can't use the page we found in the pool if DB_MPOOL_NEW ---- 440,445 ---- -*************** -*** 455,460 **** ---- 454,462 ---- - b_incr = 0; - goto alloc; - } -+ -+ /* We can use the page -- get the bucket lock. */ -+ MUTEX_LOCK(dbenv, &hp->hash_mutex); - break; - case SECOND_MISS: - /* -*** ./mp/mp_fput.c.orig 30 Sep 2003 17:12:00 -0000 11.48 ---- ./mp/mp_fput.c 13 Dec 2003 00:08:29 -0000 11.49 -*************** -*** 285,290 **** ---- 285,291 ---- - bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh)) - if (bhp->priority != UINT32_T_MAX && - bhp->priority > MPOOL_BASE_DECREMENT) -+ bhp->priority -= MPOOL_BASE_DECREMENT; - MUTEX_UNLOCK(dbenv, &hp->hash_mutex); - } - } diff --git a/packages/base/flex/flex b/packages/base/flex/flex index 8ec1f52..a58fe84 100644 --- a/packages/base/flex/flex +++ b/packages/base/flex/flex @@ -4,7 +4,7 @@ # # [V] 2.5.31 # [S] 1-8 2-9 -# [D] flex-2.5.31.tar.bz2 http://belnet.dl.sourceforge.net/sourceforge/lex/ +# [D] flex-2.5.31.tar.bz2 http://surfnet.dl.sourceforge.net/sourceforge/lex/ pre_install() { touch doc/flex.1 diff --git a/packages/base/glibc/glibc b/packages/base/glibc/glibc index fd676f8..71d194e 100644 --- a/packages/base/glibc/glibc +++ b/packages/base/glibc/glibc @@ -7,8 +7,8 @@ # [D] glibc-2.3.5.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/ # [D] glibc-linuxthreads-2.3.5.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/ -srcdir=libc kernver=`grep '^#\ \[V\]' $confdir/../linux/linux | awk '{ print $3 }'` +kernver=`echo $kernver | awk -F. '{ print $1 "." $2 }'` extraver="-${ver}" [ "$ver" = "cvs" ] && extraver="" @@ -30,7 +30,7 @@ build_main() { cd ../glibc-build # configure and prepare Makefile - ../${srcdir}${extraver}/configure $confopt + ../glibc${extraver}/configure $confopt # build and install make && make install && make localedata/install-locales diff --git a/packages/base/perl/perl b/packages/base/perl/perl index d9794f4..9757ca2 100644 --- a/packages/base/perl/perl +++ b/packages/base/perl/perl @@ -2,9 +2,9 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 5.9.2 +# [V] 5.8.7 # [S] 1-9 2-10 -# [D] perl-5.9.2.tar.gz ftp://ftp.cpan.org/pub/CPAN/src/ +# [D] perl-5.8.7.tar.gz ftp://ftp.cpan.org/pub/CPAN/src/ e_ver=`echo $ver | awk -F. '{ print $1 }'` confopt="--prefix=$prefix -Dstatic_ext='IO Fcntl POSIX'" diff --git a/packages/base/sed/permissions.patch.2 b/packages/base/sed/permissions.patch.2 deleted file mode 100644 index 222c15c..0000000 --- a/packages/base/sed/permissions.patch.2 +++ /dev/null @@ -1,10 +0,0 @@ ---- sed-4.1.orig/sed/execute.c 2004-03-13 09:30:39.000000000 +0000 -+++ sed-4.1/sed/execute.c 2004-06-17 20:05:20.000000000 +0000 -@@ -668,6 +668,7 @@ - - input->in_file_name = name; - output_file.fp = ck_mkstemp (&input->out_file_name, tmpdir, "sed"); -+ output_fd = fileno(output_file.fp); - free (tmpdir); - - fstat (fileno (input->fp), &st); diff --git a/packages/base/wget/wget b/packages/base/wget/wget index da44ba4..b474b6f 100644 --- a/packages/base/wget/wget +++ b/packages/base/wget/wget @@ -4,5 +4,11 @@ # [V] 1.9.1 -# [S] 2-7 +# [S] 1-9 2-7 # [D] wget-1.9.1.tar.gz ftp://ftp.gnu.org/pub/gnu/wget/ + +if [ "$hdw_status" = "1" ] ; then + post_install() { + [ -f /etc/resolv.conf ] && cp /etc/resolv.conf $root/etc + } +fi diff --git a/packages/devel/emacs/emacs b/packages/devel/emacs/emacs index 1ff6455..63a322e 100644 --- a/packages/devel/emacs/emacs +++ b/packages/devel/emacs/emacs @@ -2,6 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 21.3 +# [V] 21.4a # [S] 3-11 -# [D] emacs-21.3.tar.gz http://ftp.gnu.org/pub/gnu/emacs/ +# [D] emacs-21.4a.tar.gz http://ftp.gnu.org/pub/gnu/emacs/ diff --git a/packages/devel/gdb/gdb b/packages/devel/gdb/gdb index 7764281..2aefdce 100644 --- a/packages/devel/gdb/gdb +++ b/packages/devel/gdb/gdb @@ -2,6 +2,6 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 6.1.1 +# [V] 6.3 # [S] 3-4 -# [D] gdb-6.1.1.tar.bz2 ftp://ftp.gnu.org/gnu/gdb/ +# [D] gdb-6.3.tar.bz2 ftp://ftp.gnu.org/gnu/gdb/ diff --git a/packages/devel/python/python b/packages/devel/python/python index 9079f74..b97a172 100644 --- a/packages/devel/python/python +++ b/packages/devel/python/python @@ -2,8 +2,8 @@ # # author: hackbard@hackdaworld.dyndns.org # -# [V] 2.4a1 +# [V] 2.4.1 # [S] 3-2 -# [D] Python-2.4a1.tar.bz2 ftp://ftp.python.org/pub/python/2.4/ +# [D] Python-2.4.1.tar.bz2 ftp://ftp.python.org/pub/python/2.4.1/ srcdir="Python-$ver" diff --git a/packages/devel/tcltk/tcltk b/packages/devel/tcltk/tcltk index eb18a6e..073b721 100644 --- a/packages/devel/tcltk/tcltk +++ b/packages/devel/tcltk/tcltk @@ -17,6 +17,11 @@ custmain() { tar --use-compress-program=gzip -xvf \ $hdw_home_dir/download/devel/tcltk/${i}${ver}-src.tar.gz done && + + # prepare environment + export VERSION=$ver + export V=`echo $ver | awk -F. '{ print $1 "." $2 }'` + export DIR=$PWD # tcl cd tcl$ver/unix && autoconf && cd dltest && autoconf && cd .. diff --git a/packages/x11/xaw3d/xaw3d b/packages/x11/xaw3d/xaw3d index 3f47c1e..eb3444b 100644 --- a/packages/x11/xaw3d/xaw3d +++ b/packages/x11/xaw3d/xaw3d @@ -4,7 +4,7 @@ # [V] 1.5E # [S] 3-6 -# [D] Xaw3d-1.5E.tar.gz http://www.visi.com/cgi-bin/cgiwrap/~hawkeyd/dnldcount.cgi?/ftp/users/hawkeyd/X/ +# [D] Xaw3d-1.5E.tar.gz ftp://ftp.visi.com/users/hawkeyd/X/ srcdir="xc/lib/Xaw3d"