December 2006 - crux-commits

ports/opt (2.2): ruby: update to 1.8.5-p12
by crux＠crux.nu 28 Dec '06

28 Dec '06

commit 48a137af8fb1a4e9e2cf65e7cdda7728b27d7e6f Author: Juergen Daubert <jue(a)jue.li> Date: Thu Dec 28 16:40:11 2006 +0100 ruby: update to 1.8.5-p12 diff --git a/ruby/.md5sum b/ruby/.md5sum index 03d0b9f..edb5976 100644 --- a/ruby/.md5sum +++ b/ruby/.md5sum @@ -1,2 +1,2 @@ -a3517a224716f79b14196adda3e88057 ruby-1.8.5-p2.tar.gz -c29d1494e946c08c4731c3e4cdabb2cb ruby-1.8.5.patch +d7d12dd9124c9b7d55cdbbee313e3931 ruby-1.8.5-p12.tar.gz +2d04e0d8fe3b2efdf42832deeb6f58b7 ruby-1.8.5.patch diff --git a/ruby/Pkgfile b/ruby/Pkgfile index 3347d0b..01cc7f5 100644 --- a/ruby/Pkgfile +++ b/ruby/Pkgfile @@ -4,7 +4,7 @@ # Depends on: db, gdbm, ncurses, openssl, readline, zlib name=ruby -version=1.8.5-p2 +version=1.8.5-p12 release=1 source=(ftp://ftp.ruby-lang.org/pub/$name/1.8/$name-$version.tar.gz \ $name-1.8.5.patch) diff --git a/ruby/ruby-1.8.5.patch b/ruby/ruby-1.8.5.patch index 3ff258d..31e5679 100644 --- a/ruby/ruby-1.8.5.patch +++ b/ruby/ruby-1.8.5.patch @@ -1,7 +1,7 @@ -diff -Nru ruby-1.8.5.orig/configure ruby-1.8.5/configure ---- ruby-1.8.5.orig/configure 2006-08-26 15:03:23.000000000 +0200 -+++ ruby-1.8.5/configure 2006-08-26 15:03:53.000000000 +0200 -@@ -19254,7 +19254,7 @@ +diff -Nru ruby-1.8.5-p12.orig/configure ruby-1.8.5-p12/configure +--- ruby-1.8.5-p12.orig/configure 2006-12-27 19:03:43.539393663 +0100 ++++ ruby-1.8.5-p12/configure 2006-12-27 19:03:56.889006998 +0100 +@@ -19402,7 +19402,7 @@ _ACEOF else @@ -10,15 +10,3 @@ diff -Nru ruby-1.8.5.orig/configure ruby-1.8.5/configure cat >>confdefs.h <<_ACEOF #define RUBY_PLATFORM "${arch}" _ACEOF -diff -Nru ruby-1.8.5.orig/ext/dbm/extconf.rb ruby-1.8.5/ext/dbm/extconf.rb ---- ruby-1.8.5.orig/ext/dbm/extconf.rb 2006-08-26 15:03:23.000000000 +0200 -+++ ruby-1.8.5/ext/dbm/extconf.rb 2006-08-26 15:04:19.000000000 +0200 -@@ -55,7 +55,7 @@ - - have_header("cdefs.h") - have_header("sys/cdefs.h") --if /DBM_HDR/ =~ $CFLAGS and have_func(db_prefix("dbm_open")) -+if have_func(db_prefix("dbm_open")) - have_func(db_prefix("dbm_clearerr")) unless $dbm_conf_have_gdbm - create_makefile("dbm") - end

1 0

ports/opt (2.2): mesa3d: removed broken mach64 driver
by crux＠crux.nu 28 Dec '06

28 Dec '06

commit 2beeac64837f74452e4d52db01352d0f41ed47a9 Author: Juergen Daubert <jue(a)jue.li> Date: Thu Dec 28 16:38:36 2006 +0100 mesa3d: removed broken mach64 driver diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile index 75a7b3b..3b57993 100644 --- a/mesa3d/Pkgfile +++ b/mesa3d/Pkgfile @@ -6,11 +6,12 @@ name=mesa3d version=6.4.2 -release=2 +release=3 source=(http://dl.sourceforge.net/$name/MesaLib-$version.tar.bz2 libGL.la) build() { cd Mesa-$version + sed -i '/^DRI_DIRS/s/mach64//' configs/linux-dri make linux-dri-x86 mkdir -p $PKG/usr/{lib,include} bin/installmesa $PKG/usr

1 0

ports/xorg (2.2): mesa3d: build the mach64 DRI driver again
by crux＠crux.nu 27 Dec '06

27 Dec '06

commit 3fc98503944cc6be13866b2c4525f227950a9931 Author: Tilman Sauerbeck <tilman(a)crux.nu> Date: Wed Dec 27 22:21:58 2006 +0100 mesa3d: build the mach64 DRI driver again diff --git a/mesa3d/.footprint b/mesa3d/.footprint index ad44909..01fcbda 100644 --- a/mesa3d/.footprint +++ b/mesa3d/.footprint @@ -39,6 +39,7 @@ drwxr-xr-x root/root usr/lib/dri/ -rwxr-xr-x root/root usr/lib/dri/i915_dri.so -rwxr-xr-x root/root usr/lib/dri/i915tex_dri.so -rwxr-xr-x root/root usr/lib/dri/i965_dri.so +-rwxr-xr-x root/root usr/lib/dri/mach64_dri.so -rwxr-xr-x root/root usr/lib/dri/mga_dri.so -rwxr-xr-x root/root usr/lib/dri/r128_dri.so -rwxr-xr-x root/root usr/lib/dri/r200_dri.so diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile index 75d5eea..b83f0bd 100644 --- a/mesa3d/Pkgfile +++ b/mesa3d/Pkgfile @@ -5,7 +5,7 @@ name=mesa3d version=6.5.2 -release=1 +release=2 source=(http://dl.sourceforge.net/$name/Mesa{Lib,Demos}-$version.tar.bz2) build() { @@ -19,10 +19,6 @@ OPT_FLAGS = $CFLAGS GLUT_LIB = m EOF - # mach64 is broken w/ libdrm 2.2.0 - sed -i -e 's/^$DRI_DIRS = .*$ mach64 $.*$/\1 \2/' \ - configs/linux-dri - make linux-dri-x86 pushd progs/xdemos

1 0

ports/opt (2.3): apr: update to 1.2.8
by crux＠crux.nu 27 Dec '06

27 Dec '06

commit 6df7d96983849b0c5d3e5a09beeb38f21125aed1 Author: Juergen Daubert <jue(a)jue.li> Date: Wed Dec 27 12:37:37 2006 +0100 apr: update to 1.2.8 diff --git a/apr/.footprint b/apr/.footprint index 1a3543f..d110f56 100644 --- a/apr/.footprint +++ b/apr/.footprint @@ -71,14 +71,14 @@ drwxr-xr-x root/root usr/include/apr-1/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libapr-1.a -rwxr-xr-x root/root usr/lib/libapr-1.la -lrwxrwxrwx root/root usr/lib/libapr-1.so -> libapr-1.so.0.2.7 -lrwxrwxrwx root/root usr/lib/libapr-1.so.0 -> libapr-1.so.0.2.7 --rwxr-xr-x root/root usr/lib/libapr-1.so.0.2.7 +lrwxrwxrwx root/root usr/lib/libapr-1.so -> libapr-1.so.0.2.8 +lrwxrwxrwx root/root usr/lib/libapr-1.so.0 -> libapr-1.so.0.2.8 +-rwxr-xr-x root/root usr/lib/libapr-1.so.0.2.8 -rw-r--r-- root/root usr/lib/libaprutil-1.a -rwxr-xr-x root/root usr/lib/libaprutil-1.la -lrwxrwxrwx root/root usr/lib/libaprutil-1.so -> libaprutil-1.so.0.2.7 -lrwxrwxrwx root/root usr/lib/libaprutil-1.so.0 -> libaprutil-1.so.0.2.7 --rwxr-xr-x root/root usr/lib/libaprutil-1.so.0.2.7 +lrwxrwxrwx root/root usr/lib/libaprutil-1.so -> libaprutil-1.so.0.2.8 +lrwxrwxrwx root/root usr/lib/libaprutil-1.so.0 -> libaprutil-1.so.0.2.8 +-rwxr-xr-x root/root usr/lib/libaprutil-1.so.0.2.8 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/apr-1.pc -rw-r--r-- root/root usr/lib/pkgconfig/apr-util-1.pc diff --git a/apr/.md5sum b/apr/.md5sum index 1451e32..4eca289 100644 --- a/apr/.md5sum +++ b/apr/.md5sum @@ -1,2 +1,2 @@ -e77887dbafc515c63feac84686bcb3bc apr-1.2.7.tar.bz2 -a4c527f08ae2298e62a88472291bf066 apr-util-1.2.7.tar.bz2 +c573f1b3046991a2624002398b078ad5 apr-1.2.8.tar.bz2 +b122f35ee6883a216cd2e7d44504521e apr-util-1.2.8.tar.bz2 diff --git a/apr/Pkgfile b/apr/Pkgfile index 8fe2e3e..9de8793 100644 --- a/apr/Pkgfile +++ b/apr/Pkgfile @@ -4,7 +4,7 @@ # Depends on: expat, db, gdbm name=apr -version=1.2.7 +version=1.2.8 release=1 source=(http://www.apache.org/dist/$name/$name-$version.tar.bz2 \ http://www.apache.org/dist/$name/$name-util-$version.tar.bz2)

1 0

ports/core (2.3): Merge branch '2.2' into 2.3
by crux＠crux.nu 27 Dec '06

27 Dec '06

commit d7da607fb9c4ae6aa8d5fa5d481e337b502722dd Merge: 56152c3... 97eb3e9... Author: Juergen Daubert <jue(a)jue.li> Date: Tue Dec 26 20:30:19 2006 +0100 Merge branch '2.2' into 2.3

1 0

ports/core (2.3): zip/unzip: changed source url (finally)
by crux＠crux.nu 27 Dec '06

27 Dec '06

commit 97eb3e96bfba6a1b54bbd39aab28f339c40564b4 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Dec 26 20:29:05 2006 +0100 zip/unzip: changed source url (finally) the sources are no longer available from tug.org. We are using the reliable and fast software-archive server from t-systems. diff --git a/unzip/Pkgfile b/unzip/Pkgfile index 73a65b3..ba13e95 100644 --- a/unzip/Pkgfile +++ b/unzip/Pkgfile @@ -1,11 +1,11 @@ # Description: Decompress utility for zipfiles -# URL: http://www.info-zip.org/ +# URL: http://infozip.sourceforge.net/UnZip.html # Maintainer: Per Lidén, core-ports at crux dot nu name=unzip version=5.52 release=2 -source=(http://www.tug.org/ftp/dist/unzip552.tar.gz) +source=(http://fresh.t-systems-sfr.com/unix/src/misc/unzip552.tar.gz) build() { cd $name-$version diff --git a/zip/Pkgfile b/zip/Pkgfile index caf22fe..08dab0e 100644 --- a/zip/Pkgfile +++ b/zip/Pkgfile @@ -1,11 +1,11 @@ # Description: Compression and file packaging/archive utility -# URL: http://www.info-zip.org/Zip.html +# URL: http://infozip.sourceforge.net/Zip.html # Maintainer: Per Lidén, core-ports at crux dot nu name=zip version=2.32 release=1 -source=(http://www.tug.org/ftp/dist/${name}232.tar.gz) +source=(http://fresh.t-systems-sfr.com/unix/src/misc/zip232.tar.gz) build() { cd $name-$version

1 0

ports/core (2.2): zip/unzip: changed source url (finally)
by crux＠crux.nu 26 Dec '06

26 Dec '06

commit 97eb3e96bfba6a1b54bbd39aab28f339c40564b4 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Dec 26 20:29:05 2006 +0100 zip/unzip: changed source url (finally) the sources are no longer available from tug.org. We are using the reliable and fast software-archive server from t-systems. diff --git a/unzip/Pkgfile b/unzip/Pkgfile index 73a65b3..ba13e95 100644 --- a/unzip/Pkgfile +++ b/unzip/Pkgfile @@ -1,11 +1,11 @@ # Description: Decompress utility for zipfiles -# URL: http://www.info-zip.org/ +# URL: http://infozip.sourceforge.net/UnZip.html # Maintainer: Per Lidén, core-ports at crux dot nu name=unzip version=5.52 release=2 -source=(http://www.tug.org/ftp/dist/unzip552.tar.gz) +source=(http://fresh.t-systems-sfr.com/unix/src/misc/unzip552.tar.gz) build() { cd $name-$version diff --git a/zip/Pkgfile b/zip/Pkgfile index caf22fe..08dab0e 100644 --- a/zip/Pkgfile +++ b/zip/Pkgfile @@ -1,11 +1,11 @@ # Description: Compression and file packaging/archive utility -# URL: http://www.info-zip.org/Zip.html +# URL: http://infozip.sourceforge.net/Zip.html # Maintainer: Per Lidén, core-ports at crux dot nu name=zip version=2.32 release=1 -source=(http://www.tug.org/ftp/dist/${name}232.tar.gz) +source=(http://fresh.t-systems-sfr.com/unix/src/misc/zip232.tar.gz) build() { cd $name-$version

1 0

ports/core (2.3): filesystem: added groups used in our udev-rules
by crux＠crux.nu 25 Dec '06

25 Dec '06

commit 56152c360017b20ac36e3bfcfd316afc9dd66f2b Author: Juergen Daubert <jue(a)jue.li> Date: Mon Dec 25 18:13:53 2006 +0100 filesystem: added groups used in our udev-rules diff --git a/filesystem/.md5sum b/filesystem/.md5sum index b575234..115c045 100644 --- a/filesystem/.md5sum +++ b/filesystem/.md5sum @@ -1,5 +1,5 @@ 0ddfec662cbd2cc3b53f61cb9a5a72a0 fstab -3f2325551b8eb5d7a55a54b08fe967db group +44e974c22c0102ae05d1e386e792340f group 6cef6f5ab23244460cdf13c98e68b010 issue 346ede8d637940e2898cd29c56a37d30 mime.types d41d8cd98f00b204e9800998ecf8427e motd diff --git a/filesystem/Pkgfile b/filesystem/Pkgfile index b77237b..eaf5c7b 100644 --- a/filesystem/Pkgfile +++ b/filesystem/Pkgfile @@ -4,7 +4,7 @@ name=filesystem version=2.3 -release=1 +release=2 source=(issue motd shells group passwd shadow securetty fstab mime.types) build() { diff --git a/filesystem/group b/filesystem/group index 10dcc2e..48c7076 100644 --- a/filesystem/group +++ b/filesystem/group @@ -12,6 +12,12 @@ wheel::10:root ftp::11: mail::12: slocate::13: +dialout::14: www::15: +audio::16: +video::17: +floppy::18: +tape::19: +scanner::20: nobody::99: users::100:

1 0

ports/core (2.3): bash: update to 3.2.9
by crux＠crux.nu 25 Dec '06

25 Dec '06

commit 27f517997452a7fe7004f502e946e90e7eb2ad38 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Dec 25 17:28:46 2006 +0100 bash: update to 3.2.9 diff --git a/bash/.md5sum b/bash/.md5sum index 69050a9..d45fc28 100644 --- a/bash/.md5sum +++ b/bash/.md5sum @@ -1,4 +1,4 @@ -ce83c3dbfbd4945851b0e4ff398e4df5 bash-3.2-001-005.patch +4a6af4465a686bec169fb1fa887736ac bash-3.2-001-009.patch 46d32222ea0ee4b92d9cad3130498e30 bash-3.2-doc.patch 00bfa16d58e034e3c2aa27f390390d30 bash-3.2.tar.gz 7b57ddfc0866bfe6ee5eb714723d69b7 profile diff --git a/bash/Pkgfile b/bash/Pkgfile index 9a56984..5095b21 100644 --- a/bash/Pkgfile +++ b/bash/Pkgfile @@ -4,16 +4,16 @@ # Depends on: ncurses name=bash -version=3.2.5 +version=3.2.9 release=1 source=(http://ftp.gnu.org/gnu/$name/$name-3.2.tar.gz \ - $name-3.2-001-005.patch \ + $name-3.2-001-009.patch \ $name-3.2-doc.patch \ profile) build() { cd $name-3.2 - patch -p0 < $SRC/$name-3.2-001-005.patch + patch -p0 < $SRC/$name-3.2-001-009.patch patch -p1 < $SRC/$name-3.2-doc.patch ./configure --prefix=/usr \ --exec-prefix= \ @@ -21,7 +21,7 @@ build() { make make DESTDIR=$PKG install rm -rf $PKG/usr/info $PKG/bin/bashbug $PKG/usr/man/man1/bashbug.1 - install -D -m 644 ../profile $PKG/etc/profile + install -D -m 644 $SRC/profile $PKG/etc/profile ln -sf bash $PKG/bin/sh ln -sf bash.1 $PKG/usr/man/man1/sh.1 } diff --git a/bash/bash-3.2-001-005.patch b/bash/bash-3.2-001-005.patch deleted file mode 100644 index 3eb0951..0000000 --- a/bash/bash-3.2-001-005.patch +++ /dev/null @@ -1,561 +0,0 @@ - BASH PATCH REPORT - ================= - -Bash-Release: 3.2 -Patch-ID: bash32-001 - -Bug-Reported-by: Greg Schafer <gschafer(a)zip.com.au> -Bug-Reference-ID: <20061012084940.GA15768(a)tigers.local> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-10/msg00046.html - -Bug-Description: - -When using historical ``-style command substitution, bash incorrectly attempts -to interpret shell comments while scanning for the closing backquote. - -Patch: - -*** ../bash-3.2/parse.y Tue Sep 19 16:37:21 2006 ---- parse.y Thu Oct 12 10:30:57 2006 -*************** -*** 2736,2740 **** - count = 1; - pass_next_character = backq_backslash = was_dollar = in_comment = 0; -! check_comment = (flags & P_COMMAND) && qc != '\'' && qc != '"' && (flags & P_DQUOTE) == 0; - - /* RFLAGS is the set of flags we want to pass to recursive calls. */ ---- 2736,2740 ---- - count = 1; - pass_next_character = backq_backslash = was_dollar = in_comment = 0; -! check_comment = (flags & P_COMMAND) && qc != '`' && qc != '\'' && qc != '"' && (flags & P_DQUOTE) == 0; - - /* RFLAGS is the set of flags we want to pass to recursive calls. */ -*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006 ---- patchlevel.h Mon Oct 16 14:22:54 2006 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 0 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ - BASH PATCH REPORT - ================= - -Bash-Release: 3.2 -Patch-ID: bash32-002 - -Bug-Reported-by: Jim Gifford <jim(a)jg555.com> -Bug-Reference-ID: <12j2pc3aq35mb04(a)corp.supernews.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-10/msg00082.html - -Bug-Description: - -An incorrect encoding specification in the Content-Type header causes msgfmt -to fail, which causes `make install' to fail. - -Patch: - -*** ../bash-3.2/po/ru.po Tue Jan 10 17:51:03 2006 ---- po/ru.po Mon Oct 16 15:13:23 2006 -*************** -*** 13,17 **** - "Language-Team: Russian <ru(a)li.org>\n" - "MIME-Version: 1.0\n" -! "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" ---- 13,17 ---- - "Language-Team: Russian <ru(a)li.org>\n" - "MIME-Version: 1.0\n" -! "Content-Type: text/plain; charset=KOI8-R\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006 ---- patchlevel.h Mon Oct 16 14:22:54 2006 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ - BASH PATCH REPORT - ================= - -Bash-Release: 3.2 -Patch-ID: bash32-003 - -Bug-Reported-by: John Gatewood Ham <zappaman(a)buraphalinux.org> -Bug-Reference-ID: <Pine.LNX.4.64.0610121334140.15558(a)www.buraphalinux.org> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-10/msg00045.html - -Bug-Description: - -When using the conditional command's `=~' operator to match regular -expressions, the parser did not skip over shell metacharacters in the -regular expression, leading to syntax errors. - -Patch: - -*** ../bash-3.2-patched/parse.y Tue Oct 17 11:45:20 2006 ---- parse.y Sat Oct 14 14:56:16 2006 -*************** -*** 1029,1034 **** ---- 1029,1035 ---- - #define PST_CMDTOKEN 0x1000 /* command token OK - unused */ - #define PST_COMPASSIGN 0x2000 /* parsing x=(...) compound assignment */ - #define PST_ASSIGNOK 0x4000 /* assignment statement ok in this context */ -+ #define PST_REGEXP 0x8000 /* parsing an ERE/BRE as a single word */ - - /* Initial size to allocate for tokens, and the - amount to grow them by. */ -*************** -*** 2591,2596 **** ---- 2592,2600 ---- - return (character); - } - -+ if (parser_state & PST_REGEXP) -+ goto tokword; -+ - /* Shell meta-characters. */ - if MBTEST(shellmeta (character) && ((parser_state & PST_DBLPAREN) == 0)) - { -*************** -*** 2698,2703 **** ---- 2702,2708 ---- - if MBTEST(character == '-' && (last_read_token == LESS_AND || last_read_token == GREATER_AND)) - return (character); - -+ tokword: - /* Okay, if we got this far, we have to read a word. Read one, - and then check it against the known ones. */ - result = read_token_word (character); -*************** -*** 3202,3209 **** - if (tok == WORD && test_binop (yylval.word->word)) - op = yylval.word; - #if defined (COND_REGEXP) -! else if (tok == WORD && STREQ (yylval.word->word,"=~")) -! op = yylval.word; - #endif - else if (tok == '<' || tok == '>') - op = make_word_from_token (tok); /* ( */ ---- 3207,3217 ---- - if (tok == WORD && test_binop (yylval.word->word)) - op = yylval.word; - #if defined (COND_REGEXP) -! else if (tok == WORD && STREQ (yylval.word->word, "=~")) -! { -! op = yylval.word; -! parser_state |= PST_REGEXP; -! } - #endif - else if (tok == '<' || tok == '>') - op = make_word_from_token (tok); /* ( */ -*************** -*** 3234,3239 **** ---- 3242,3248 ---- - - /* rhs */ - tok = read_token (READ); -+ parser_state &= ~PST_REGEXP; - if (tok == WORD) - { - tright = make_cond_node (COND_TERM, yylval.word, (COND_COM *)NULL, (COND_COM *)NULL); -*************** -*** 3419,3427 **** - goto next_character; - } - - #ifdef EXTENDED_GLOB - /* Parse a ksh-style extended pattern matching specification. */ -! if (extended_glob && PATTERN_CHAR (character)) - { - peek_char = shell_getc (1); - if MBTEST(peek_char == '(') /* ) */ ---- 3428,3461 ---- - goto next_character; - } - -+ #ifdef COND_REGEXP -+ /* When parsing a regexp as a single word inside a conditional command, -+ we need to special-case characters special to both the shell and -+ regular expressions. Right now, that is only '(' and '|'. */ /*)*/ -+ if MBTEST((parser_state & PST_REGEXP) && (character == '(' || character == '|')) /*)*/ -+ { -+ if (character == '|') -+ goto got_character; -+ -+ push_delimiter (dstack, character); -+ ttok = parse_matched_pair (cd, '(', ')', &ttoklen, 0); -+ pop_delimiter (dstack); -+ if (ttok == &matched_pair_error) -+ return -1; /* Bail immediately. */ -+ RESIZE_MALLOCED_BUFFER (token, token_index, ttoklen + 2, -+ token_buffer_size, TOKEN_DEFAULT_GROW_SIZE); -+ token[token_index++] = character; -+ strcpy (token + token_index, ttok); -+ token_index += ttoklen; -+ FREE (ttok); -+ dollar_present = all_digit_token = 0; -+ goto next_character; -+ } -+ #endif /* COND_REGEXP */ -+ - #ifdef EXTENDED_GLOB - /* Parse a ksh-style extended pattern matching specification. */ -! if MBTEST(extended_glob && PATTERN_CHAR (character)) - { - peek_char = shell_getc (1); - if MBTEST(peek_char == '(') /* ) */ - -*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006 ---- patchlevel.h Mon Oct 16 14:22:54 2006 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ - - BASH PATCH REPORT - ================= - -Bash-Release: 3.2 -Patch-ID: bash32-004 - -Bug-Reported-by: Stuart Shelton <srcshelton(a)gmail.com> -Bug-Reference-ID: <619141e40610261203y6cda5aa6i23cb24c7aeba996e(a)mail.gmail.com> -Bug-Reference-URL: - -Bug-Description: - -A bug in the parameter pattern substitution implementation treated a pattern -whose first character was `/' (after expansion) as specifying global -replacement. - -Patch: - -*** ../bash-3.2/subst.c Tue Sep 19 08:35:09 2006 ---- subst.c Thu Oct 26 09:17:50 2006 -*************** -*** 5707,5712 **** ---- 5707,5717 ---- - vtype &= ~VT_STARSUB; - - mflags = 0; -+ if (patsub && *patsub == '/') -+ { -+ mflags |= MATCH_GLOBREP; -+ patsub++; -+ } - - /* Malloc this because expand_string_if_necessary or one of the expansion - functions in its call chain may free it on a substitution error. */ -*************** -*** 5741,5753 **** - } - - /* ksh93 doesn't allow the match specifier to be a part of the expanded -! pattern. This is an extension. */ - p = pat; -! if (pat && pat[0] == '/') -! { -! mflags |= MATCH_GLOBREP|MATCH_ANY; -! p++; -! } - else if (pat && pat[0] == '#') - { - mflags |= MATCH_BEG; ---- 5746,5757 ---- - } - - /* ksh93 doesn't allow the match specifier to be a part of the expanded -! pattern. This is an extension. Make sure we don't anchor the pattern -! at the beginning or end of the string if we're doing global replacement, -! though. */ - p = pat; -! if (mflags & MATCH_GLOBREP) -! mflags |= MATCH_ANY; - else if (pat && pat[0] == '#') - { - mflags |= MATCH_BEG; -*** ../bash-3.2/tests/new-exp.right Thu Aug 10 12:00:00 2006 ---- tests/new-exp.right Sun Oct 29 16:03:36 2006 -*************** -*** 430,436 **** - Case06---1---A B C::--- - Case07---3---A:B:C--- - Case08---3---A:B:C--- -! ./new-exp.tests: line 506: /${$(($#-1))}: bad substitution - argv[1] = <a> - argv[2] = <b> - argv[3] = <c> ---- 430,436 ---- - Case06---1---A B C::--- - Case07---3---A:B:C--- - Case08---3---A:B:C--- -! ./new-exp.tests: line 506: ${$(($#-1))}: bad substitution - argv[1] = <a> - argv[2] = <b> - argv[3] = <c> -*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006 ---- patchlevel.h Mon Oct 16 14:22:54 2006 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ - BASH PATCH REPORT - ================= - -Bash-Release: 3.2 -Patch-ID: bash32-005 - -Bug-Reported-by: Stuart Shelton <stuart(a)openobjects.com> -Bug-Reference-ID: <453F7CC8.6030907(a)openobjects.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-10/msg00127.html - -Bug-Description: - -A missing extern declaration for `asprintf' caused `double' arguments to be -passed as `0', leading to incorrect results. Additionally, a bug in the -replacement asprintf/snprintf function caused an infinite loop when passed -0 arguments to the floating point conversions under some circumstances. - -Patch: - -*** ../bash-3.2/builtins/printf.def Mon Sep 18 08:48:42 2006 ---- builtins/printf.def Tue Oct 31 08:19:44 2006 -*************** -*** 49,54 **** ---- 49,60 ---- - # define INT_MIN (-2147483647-1) - #endif - -+ #if defined (PREFER_STDARG) -+ # include <stdarg.h> -+ #else -+ # include <varargs.h> -+ #endif -+ - #include <stdio.h> - #include <chartypes.h> - -*************** -*** 151,156 **** ---- 157,166 ---- - #define SKIP1 "#'-+ 0" - #define LENMODS "hjlLtz" - -+ #ifndef HAVE_ASPRINTF -+ extern int asprintf __P((char **, const char *, ...)) __attribute__((__format__ (printf, 2, 3))); -+ #endif -+ - static void printf_erange __P((char *)); - static int printstr __P((char *, char *, int, int, int)); - static int tescape __P((char *, char *, int *)); - - -*** ../bash-3.2/lib/sh/snprintf.c Thu Apr 6 09:48:40 2006 ---- lib/sh/snprintf.c Sat Oct 28 00:00:13 2006 -*************** -*** 471,476 **** ---- 476,483 ---- - 10^x ~= r - * log_10(200) = 2; - * log_10(250) = 2; -+ * -+ * NOTE: do not call this with r == 0 -- an infinite loop results. - */ - static int - log_10(r) -*************** -*** 576,583 **** - { - integral_part[0] = '0'; - integral_part[1] = '\0'; -! fraction_part[0] = '0'; -! fraction_part[1] = '\0'; - if (fract) - *fract = fraction_part; - return integral_part; ---- 583,593 ---- - { - integral_part[0] = '0'; - integral_part[1] = '\0'; -! /* The fractional part has to take the precision into account */ -! for (ch = 0; ch < precision-1; ch++) -! fraction_part[ch] = '0'; -! fraction_part[ch] = '0'; -! fraction_part[ch+1] = '\0'; - if (fract) - *fract = fraction_part; - return integral_part; -*************** -*** 805,810 **** ---- 815,821 ---- - PUT_CHAR(*tmp, p); - tmp++; - } -+ - PAD_LEFT(p); - } - -*************** -*** 972,982 **** - if ((p->flags & PF_THOUSANDS) && grouping && (t = groupnum (tmp))) - tmp = t; - - /* calculate the padding. 1 for the dot */ - p->width = p->width - - ((d > 0. && p->justify == RIGHT) ? 1:0) - - ((p->flags & PF_SPACE) ? 1:0) - -! strlen(tmp) - p->precision - 1; - PAD_RIGHT(p); - PUT_PLUS(d, p, 0.); - PUT_SPACE(d, p, 0.); ---- 983,1003 ---- - if ((p->flags & PF_THOUSANDS) && grouping && (t = groupnum (tmp))) - tmp = t; - -+ if ((*p->pf == 'g' || *p->pf == 'G') && (p->flags & PF_ALTFORM) == 0) -+ { -+ /* smash the trailing zeros unless altform */ -+ for (i = strlen(tmp2) - 1; i >= 0 && tmp2[i] == '0'; i--) -+ tmp2[i] = '\0'; -+ if (tmp2[0] == '\0') -+ p->precision = 0; -+ } -+ - /* calculate the padding. 1 for the dot */ - p->width = p->width - - ((d > 0. && p->justify == RIGHT) ? 1:0) - - ((p->flags & PF_SPACE) ? 1:0) - -! strlen(tmp) - p->precision - -! ((p->precision != 0 || (p->flags & PF_ALTFORM)) ? 1 : 0); /* radix char */ - PAD_RIGHT(p); - PUT_PLUS(d, p, 0.); - PUT_SPACE(d, p, 0.); -*************** -*** 991,1001 **** - if (p->precision != 0 || (p->flags & PF_ALTFORM)) - PUT_CHAR(decpoint, p); /* put the '.' */ - -- if ((*p->pf == 'g' || *p->pf == 'G') && (p->flags & PF_ALTFORM) == 0) -- /* smash the trailing zeros unless altform */ -- for (i = strlen(tmp2) - 1; i >= 0 && tmp2[i] == '0'; i--) -- tmp2[i] = '\0'; -- - for (; *tmp2; tmp2++) - PUT_CHAR(*tmp2, p); /* the fraction */ - ---- 1012,1017 ---- -*************** -*** 1011,1024 **** - char *tmp, *tmp2; - int j, i; - -! if (chkinfnan(p, d, 1) || chkinfnan(p, d, 2)) - return; /* already printed nan or inf */ - - GETLOCALEDATA(decpoint, thoussep, grouping); - DEF_PREC(p); -! j = log_10(d); -! d = d / pow_10(j); /* get the Mantissa */ -! d = ROUND(d, p); - tmp = dtoa(d, p->precision, &tmp2); - - /* 1 for unit, 1 for the '.', 1 for 'e|E', ---- 1027,1045 ---- - char *tmp, *tmp2; - int j, i; - -! if (d != 0 && (chkinfnan(p, d, 1) || chkinfnan(p, d, 2))) - return; /* already printed nan or inf */ - - GETLOCALEDATA(decpoint, thoussep, grouping); - DEF_PREC(p); -! if (d == 0.) -! j = 0; -! else -! { -! j = log_10(d); -! d = d / pow_10(j); /* get the Mantissa */ -! d = ROUND(d, p); -! } - tmp = dtoa(d, p->precision, &tmp2); - - /* 1 for unit, 1 for the '.', 1 for 'e|E', -*************** -*** 1076,1081 **** ---- 1097,1103 ---- - PUT_CHAR(*tmp, p); - tmp++; - } -+ - PAD_LEFT(p); - } - #endif -*************** -*** 1358,1364 **** - STAR_ARGS(data); - DEF_PREC(data); - d = GETDOUBLE(data); -! i = log_10(d); - /* - * for '%g|%G' ANSI: use f if exponent - * is in the range or [-4,p] exclusively ---- 1380,1386 ---- - STAR_ARGS(data); - DEF_PREC(data); - d = GETDOUBLE(data); -! i = (d != 0.) ? log_10(d) : -1; - /* - * for '%g|%G' ANSI: use f if exponent - * is in the range or [-4,p] exclusively -*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006 ---- patchlevel.h Mon Oct 16 14:22:54 2006 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 5 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/bash/bash-3.2-001-009.patch b/bash/bash-3.2-001-009.patch new file mode 100644 index 0000000..29bf247 --- /dev/null +++ b/bash/bash-3.2-001-009.patch @@ -0,0 +1,778 @@ + BASH PATCH REPORT + ================= + +Bash-Release: 3.2 +Patch-ID: bash32-001 + +Bug-Reported-by: Greg Schafer <gschafer(a)zip.com.au> +Bug-Reference-ID: <20061012084940.GA15768(a)tigers.local> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-10/msg00046.html + +Bug-Description: + +When using historical ``-style command substitution, bash incorrectly attempts +to interpret shell comments while scanning for the closing backquote. + +Patch: + +*** ../bash-3.2/parse.y Tue Sep 19 16:37:21 2006 +--- parse.y Thu Oct 12 10:30:57 2006 +*************** +*** 2736,2740 **** + count = 1; + pass_next_character = backq_backslash = was_dollar = in_comment = 0; +! check_comment = (flags & P_COMMAND) && qc != '\'' && qc != '"' && (flags & P_DQUOTE) == 0; + + /* RFLAGS is the set of flags we want to pass to recursive calls. */ +--- 2736,2740 ---- + count = 1; + pass_next_character = backq_backslash = was_dollar = in_comment = 0; +! check_comment = (flags & P_COMMAND) && qc != '`' && qc != '\'' && qc != '"' && (flags & P_DQUOTE) == 0; + + /* RFLAGS is the set of flags we want to pass to recursive calls. */ +*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006 +--- patchlevel.h Mon Oct 16 14:22:54 2006 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 0 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 1 + + #endif /* _PATCHLEVEL_H_ */ + + BASH PATCH REPORT + ================= + +Bash-Release: 3.2 +Patch-ID: bash32-002 + +Bug-Reported-by: Jim Gifford <jim(a)jg555.com> +Bug-Reference-ID: <12j2pc3aq35mb04(a)corp.supernews.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-10/msg00082.html + +Bug-Description: + +An incorrect encoding specification in the Content-Type header causes msgfmt +to fail, which causes `make install' to fail. + +Patch: + +*** ../bash-3.2/po/ru.po Tue Jan 10 17:51:03 2006 +--- po/ru.po Mon Oct 16 15:13:23 2006 +*************** +*** 13,17 **** + "Language-Team: Russian <ru(a)li.org>\n" + "MIME-Version: 1.0\n" +! "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +--- 13,17 ---- + "Language-Team: Russian <ru(a)li.org>\n" + "MIME-Version: 1.0\n" +! "Content-Type: text/plain; charset=KOI8-R\n" + "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006 +--- patchlevel.h Mon Oct 16 14:22:54 2006 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 1 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 2 + + #endif /* _PATCHLEVEL_H_ */ + + BASH PATCH REPORT + ================= + +Bash-Release: 3.2 +Patch-ID: bash32-003 + +Bug-Reported-by: John Gatewood Ham <zappaman(a)buraphalinux.org> +Bug-Reference-ID: <Pine.LNX.4.64.0610121334140.15558(a)www.buraphalinux.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-10/msg00045.html + +Bug-Description: + +When using the conditional command's `=~' operator to match regular +expressions, the parser did not skip over shell metacharacters in the +regular expression, leading to syntax errors. + +Patch: + +*** ../bash-3.2-patched/parse.y Tue Oct 17 11:45:20 2006 +--- parse.y Sat Oct 14 14:56:16 2006 +*************** +*** 1029,1034 **** +--- 1029,1035 ---- + #define PST_CMDTOKEN 0x1000 /* command token OK - unused */ + #define PST_COMPASSIGN 0x2000 /* parsing x=(...) compound assignment */ + #define PST_ASSIGNOK 0x4000 /* assignment statement ok in this context */ ++ #define PST_REGEXP 0x8000 /* parsing an ERE/BRE as a single word */ + + /* Initial size to allocate for tokens, and the + amount to grow them by. */ +*************** +*** 2591,2596 **** +--- 2592,2600 ---- + return (character); + } + ++ if (parser_state & PST_REGEXP) ++ goto tokword; ++ + /* Shell meta-characters. */ + if MBTEST(shellmeta (character) && ((parser_state & PST_DBLPAREN) == 0)) + { +*************** +*** 2698,2703 **** +--- 2702,2708 ---- + if MBTEST(character == '-' && (last_read_token == LESS_AND || last_read_token == GREATER_AND)) + return (character); + ++ tokword: + /* Okay, if we got this far, we have to read a word. Read one, + and then check it against the known ones. */ + result = read_token_word (character); +*************** +*** 3202,3209 **** + if (tok == WORD && test_binop (yylval.word->word)) + op = yylval.word; + #if defined (COND_REGEXP) +! else if (tok == WORD && STREQ (yylval.word->word,"=~")) +! op = yylval.word; + #endif + else if (tok == '<' || tok == '>') + op = make_word_from_token (tok); /* ( */ +--- 3207,3217 ---- + if (tok == WORD && test_binop (yylval.word->word)) + op = yylval.word; + #if defined (COND_REGEXP) +! else if (tok == WORD && STREQ (yylval.word->word, "=~")) +! { +! op = yylval.word; +! parser_state |= PST_REGEXP; +! } + #endif + else if (tok == '<' || tok == '>') + op = make_word_from_token (tok); /* ( */ +*************** +*** 3234,3239 **** +--- 3242,3248 ---- + + /* rhs */ + tok = read_token (READ); ++ parser_state &= ~PST_REGEXP; + if (tok == WORD) + { + tright = make_cond_node (COND_TERM, yylval.word, (COND_COM *)NULL, (COND_COM *)NULL); +*************** +*** 3419,3427 **** + goto next_character; + } + + #ifdef EXTENDED_GLOB + /* Parse a ksh-style extended pattern matching specification. */ +! if (extended_glob && PATTERN_CHAR (character)) + { + peek_char = shell_getc (1); + if MBTEST(peek_char == '(') /* ) */ +--- 3428,3461 ---- + goto next_character; + } + ++ #ifdef COND_REGEXP ++ /* When parsing a regexp as a single word inside a conditional command, ++ we need to special-case characters special to both the shell and ++ regular expressions. Right now, that is only '(' and '|'. */ /*)*/ ++ if MBTEST((parser_state & PST_REGEXP) && (character == '(' || character == '|')) /*)*/ ++ { ++ if (character == '|') ++ goto got_character; ++ ++ push_delimiter (dstack, character); ++ ttok = parse_matched_pair (cd, '(', ')', &ttoklen, 0); ++ pop_delimiter (dstack); ++ if (ttok == &matched_pair_error) ++ return -1; /* Bail immediately. */ ++ RESIZE_MALLOCED_BUFFER (token, token_index, ttoklen + 2, ++ token_buffer_size, TOKEN_DEFAULT_GROW_SIZE); ++ token[token_index++] = character; ++ strcpy (token + token_index, ttok); ++ token_index += ttoklen; ++ FREE (ttok); ++ dollar_present = all_digit_token = 0; ++ goto next_character; ++ } ++ #endif /* COND_REGEXP */ ++ + #ifdef EXTENDED_GLOB + /* Parse a ksh-style extended pattern matching specification. */ +! if MBTEST(extended_glob && PATTERN_CHAR (character)) + { + peek_char = shell_getc (1); + if MBTEST(peek_char == '(') /* ) */ + +*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006 +--- patchlevel.h Mon Oct 16 14:22:54 2006 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 2 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 3 + + #endif /* _PATCHLEVEL_H_ */ + + + BASH PATCH REPORT + ================= + +Bash-Release: 3.2 +Patch-ID: bash32-004 + +Bug-Reported-by: Stuart Shelton <srcshelton(a)gmail.com> +Bug-Reference-ID: <619141e40610261203y6cda5aa6i23cb24c7aeba996e(a)mail.gmail.com> +Bug-Reference-URL: + +Bug-Description: + +A bug in the parameter pattern substitution implementation treated a pattern +whose first character was `/' (after expansion) as specifying global +replacement. + +Patch: + +*** ../bash-3.2/subst.c Tue Sep 19 08:35:09 2006 +--- subst.c Thu Oct 26 09:17:50 2006 +*************** +*** 5707,5712 **** +--- 5707,5717 ---- + vtype &= ~VT_STARSUB; + + mflags = 0; ++ if (patsub && *patsub == '/') ++ { ++ mflags |= MATCH_GLOBREP; ++ patsub++; ++ } + + /* Malloc this because expand_string_if_necessary or one of the expansion + functions in its call chain may free it on a substitution error. */ +*************** +*** 5741,5753 **** + } + + /* ksh93 doesn't allow the match specifier to be a part of the expanded +! pattern. This is an extension. */ + p = pat; +! if (pat && pat[0] == '/') +! { +! mflags |= MATCH_GLOBREP|MATCH_ANY; +! p++; +! } + else if (pat && pat[0] == '#') + { + mflags |= MATCH_BEG; +--- 5746,5757 ---- + } + + /* ksh93 doesn't allow the match specifier to be a part of the expanded +! pattern. This is an extension. Make sure we don't anchor the pattern +! at the beginning or end of the string if we're doing global replacement, +! though. */ + p = pat; +! if (mflags & MATCH_GLOBREP) +! mflags |= MATCH_ANY; + else if (pat && pat[0] == '#') + { + mflags |= MATCH_BEG; +*** ../bash-3.2/tests/new-exp.right Thu Aug 10 12:00:00 2006 +--- tests/new-exp.right Sun Oct 29 16:03:36 2006 +*************** +*** 430,436 **** + Case06---1---A B C::--- + Case07---3---A:B:C--- + Case08---3---A:B:C--- +! ./new-exp.tests: line 506: /${$(($#-1))}: bad substitution + argv[1] = <a> + argv[2] = <b> + argv[3] = <c> +--- 430,436 ---- + Case06---1---A B C::--- + Case07---3---A:B:C--- + Case08---3---A:B:C--- +! ./new-exp.tests: line 506: ${$(($#-1))}: bad substitution + argv[1] = <a> + argv[2] = <b> + argv[3] = <c> +*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006 +--- patchlevel.h Mon Oct 16 14:22:54 2006 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 3 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 4 + + #endif /* _PATCHLEVEL_H_ */ + + BASH PATCH REPORT + ================= + +Bash-Release: 3.2 +Patch-ID: bash32-005 + +Bug-Reported-by: Stuart Shelton <stuart(a)openobjects.com> +Bug-Reference-ID: <453F7CC8.6030907(a)openobjects.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-10/msg00127.html + +Bug-Description: + +A missing extern declaration for `asprintf' caused `double' arguments to be +passed as `0', leading to incorrect results. Additionally, a bug in the +replacement asprintf/snprintf function caused an infinite loop when passed +0 arguments to the floating point conversions under some circumstances. + +Patch: + +*** ../bash-3.2/builtins/printf.def Mon Sep 18 08:48:42 2006 +--- builtins/printf.def Tue Oct 31 08:19:44 2006 +*************** +*** 49,54 **** +--- 49,60 ---- + # define INT_MIN (-2147483647-1) + #endif + ++ #if defined (PREFER_STDARG) ++ # include <stdarg.h> ++ #else ++ # include <varargs.h> ++ #endif ++ + #include <stdio.h> + #include <chartypes.h> + +*************** +*** 151,156 **** +--- 157,166 ---- + #define SKIP1 "#'-+ 0" + #define LENMODS "hjlLtz" + ++ #ifndef HAVE_ASPRINTF ++ extern int asprintf __P((char **, const char *, ...)) __attribute__((__format__ (printf, 2, 3))); ++ #endif ++ + static void printf_erange __P((char *)); + static int printstr __P((char *, char *, int, int, int)); + static int tescape __P((char *, char *, int *)); + + +*** ../bash-3.2/lib/sh/snprintf.c Thu Apr 6 09:48:40 2006 +--- lib/sh/snprintf.c Sat Oct 28 00:00:13 2006 +*************** +*** 471,476 **** +--- 476,483 ---- + 10^x ~= r + * log_10(200) = 2; + * log_10(250) = 2; ++ * ++ * NOTE: do not call this with r == 0 -- an infinite loop results. + */ + static int + log_10(r) +*************** +*** 576,583 **** + { + integral_part[0] = '0'; + integral_part[1] = '\0'; +! fraction_part[0] = '0'; +! fraction_part[1] = '\0'; + if (fract) + *fract = fraction_part; + return integral_part; +--- 583,593 ---- + { + integral_part[0] = '0'; + integral_part[1] = '\0'; +! /* The fractional part has to take the precision into account */ +! for (ch = 0; ch < precision-1; ch++) +! fraction_part[ch] = '0'; +! fraction_part[ch] = '0'; +! fraction_part[ch+1] = '\0'; + if (fract) + *fract = fraction_part; + return integral_part; +*************** +*** 805,810 **** +--- 815,821 ---- + PUT_CHAR(*tmp, p); + tmp++; + } ++ + PAD_LEFT(p); + } + +*************** +*** 972,982 **** + if ((p->flags & PF_THOUSANDS) && grouping && (t = groupnum (tmp))) + tmp = t; + + /* calculate the padding. 1 for the dot */ + p->width = p->width - + ((d > 0. && p->justify == RIGHT) ? 1:0) - + ((p->flags & PF_SPACE) ? 1:0) - +! strlen(tmp) - p->precision - 1; + PAD_RIGHT(p); + PUT_PLUS(d, p, 0.); + PUT_SPACE(d, p, 0.); +--- 983,1003 ---- + if ((p->flags & PF_THOUSANDS) && grouping && (t = groupnum (tmp))) + tmp = t; + ++ if ((*p->pf == 'g' || *p->pf == 'G') && (p->flags & PF_ALTFORM) == 0) ++ { ++ /* smash the trailing zeros unless altform */ ++ for (i = strlen(tmp2) - 1; i >= 0 && tmp2[i] == '0'; i--) ++ tmp2[i] = '\0'; ++ if (tmp2[0] == '\0') ++ p->precision = 0; ++ } ++ + /* calculate the padding. 1 for the dot */ + p->width = p->width - + ((d > 0. && p->justify == RIGHT) ? 1:0) - + ((p->flags & PF_SPACE) ? 1:0) - +! strlen(tmp) - p->precision - +! ((p->precision != 0 || (p->flags & PF_ALTFORM)) ? 1 : 0); /* radix char */ + PAD_RIGHT(p); + PUT_PLUS(d, p, 0.); + PUT_SPACE(d, p, 0.); +*************** +*** 991,1001 **** + if (p->precision != 0 || (p->flags & PF_ALTFORM)) + PUT_CHAR(decpoint, p); /* put the '.' */ + +- if ((*p->pf == 'g' || *p->pf == 'G') && (p->flags & PF_ALTFORM) == 0) +- /* smash the trailing zeros unless altform */ +- for (i = strlen(tmp2) - 1; i >= 0 && tmp2[i] == '0'; i--) +- tmp2[i] = '\0'; +- + for (; *tmp2; tmp2++) + PUT_CHAR(*tmp2, p); /* the fraction */ + +--- 1012,1017 ---- +*************** +*** 1011,1024 **** + char *tmp, *tmp2; + int j, i; + +! if (chkinfnan(p, d, 1) || chkinfnan(p, d, 2)) + return; /* already printed nan or inf */ + + GETLOCALEDATA(decpoint, thoussep, grouping); + DEF_PREC(p); +! j = log_10(d); +! d = d / pow_10(j); /* get the Mantissa */ +! d = ROUND(d, p); + tmp = dtoa(d, p->precision, &tmp2); + + /* 1 for unit, 1 for the '.', 1 for 'e|E', +--- 1027,1045 ---- + char *tmp, *tmp2; + int j, i; + +! if (d != 0 && (chkinfnan(p, d, 1) || chkinfnan(p, d, 2))) + return; /* already printed nan or inf */ + + GETLOCALEDATA(decpoint, thoussep, grouping); + DEF_PREC(p); +! if (d == 0.) +! j = 0; +! else +! { +! j = log_10(d); +! d = d / pow_10(j); /* get the Mantissa */ +! d = ROUND(d, p); +! } + tmp = dtoa(d, p->precision, &tmp2); + + /* 1 for unit, 1 for the '.', 1 for 'e|E', +*************** +*** 1076,1081 **** +--- 1097,1103 ---- + PUT_CHAR(*tmp, p); + tmp++; + } ++ + PAD_LEFT(p); + } + #endif +*************** +*** 1358,1364 **** + STAR_ARGS(data); + DEF_PREC(data); + d = GETDOUBLE(data); +! i = log_10(d); + /* + * for '%g|%G' ANSI: use f if exponent + * is in the range or [-4,p] exclusively +--- 1380,1386 ---- + STAR_ARGS(data); + DEF_PREC(data); + d = GETDOUBLE(data); +! i = (d != 0.) ? log_10(d) : -1; + /* + * for '%g|%G' ANSI: use f if exponent + * is in the range or [-4,p] exclusively +*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006 +--- patchlevel.h Mon Oct 16 14:22:54 2006 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 4 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 5 + + #endif /* _PATCHLEVEL_H_ */ + + BASH PATCH REPORT + ================= + +Bash-Release: 3.2 +Patch-ID: bash32-006 + +Bug-Reported-by: ebb9(a)byu.net +Bug-Reference-ID: <45540862.9030900(a)byu.net> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00017.html + http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00016.html + +Bug-Description: + +In some cases, code that is intended to be used in the presence of multibyte +characters is called when no such characters are present, leading to incorrect +display position calculations and incorrect redisplay. + +Patch: + +*** ../bash-3.2-patched/lib/readline/display.c Thu Sep 14 14:20:12 2006 +--- lib/readline/display.c Mon Nov 13 17:55:57 2006 +*************** +*** 2381,2384 **** +--- 2409,2414 ---- + if (end <= start) + return 0; ++ if (MB_CUR_MAX == 1 || rl_byte_oriented) ++ return (end - start); + + memset (&ps, 0, sizeof (mbstate_t)); +*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006 +--- patchlevel.h Mon Oct 16 14:22:54 2006 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 5 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 6 + + #endif /* _PATCHLEVEL_H_ */ + + BASH PATCH REPORT + ================= + +Bash-Release: 3.2 +Patch-ID: bash32-007 + +Bug-Reported-by: jidanni(a)jidanni.org +Bug-Reference-ID: <E1Gkg12-00017D-Fm(a)jidanni.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00039.html + +Bug-Description: + +When removing the current or previous job from the jobs list, bash incorrectly +resets the current job under some circumstances. + +Patch: + +*** ../bash-3.2-patched/jobs.c Sat Jul 29 16:40:48 2006 +--- jobs.c Fri Nov 24 14:50:01 2006 +*************** +*** 985,990 **** + if (temp == 0) + return; +- if (job_index == js.j_current || job_index == js.j_previous) +- reset_current (); + + if ((dflags & DEL_NOBGPID) == 0) +--- 985,988 ---- +*************** +*** 1029,1032 **** +--- 1027,1033 ---- + else if (jobs[js.j_firstj] == 0 || jobs[js.j_lastj] == 0) + reset_job_indices (); ++ ++ if (job_index == js.j_current || job_index == js.j_previous) ++ reset_current (); + } + +*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006 +--- patchlevel.h Mon Oct 16 14:22:54 2006 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 6 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 7 + + #endif /* _PATCHLEVEL_H_ */ + + + + BASH PATCH REPORT + ================= + +Bash-Release: 3.2 +Patch-ID: bash32-008 + +Bug-Reported-by: Linda Walsh <bash(a)tlinx.org> +Bug-Reference-ID: <456041FD.8000605(a)tlinx.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-11/msg00040.html + +Bug-Description: + +When checking pathnames from the command hash table (e.g., when the `checkhash' +shell option is enabled), a bug causes bash to delete and re-lookup each +command. + +Patch: + +*** ../bash-3.2-patched/findcmd.c Wed Aug 17 16:49:54 2005 +--- findcmd.c Fri Nov 24 10:48:37 2006 +*************** +*** 309,313 **** + { + st = file_status (hashed_file); +! if ((st ^ (FS_EXISTS | FS_EXECABLE)) != 0) + { + phash_remove (pathname); +--- 309,313 ---- + { + st = file_status (hashed_file); +! if ((st & (FS_EXISTS|FS_EXECABLE)) != (FS_EXISTS|FS_EXECABLE)) + { + phash_remove (pathname); +*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006 +--- patchlevel.h Mon Oct 16 14:22:54 2006 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 7 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 8 + + #endif /* _PATCHLEVEL_H_ */ + + BASH PATCH REPORT + ================= + +Bash-Release: 3.2 +Patch-ID: bash32-009 + +Bug-Reported-by: James.M.Botte(a)lowes.com +Bug-Reference-ID: <BA9FF90F7E5B424998F98EDA9F1F94BE01FA9853(a)msexchdb01.lowes.com> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2006-12/msg00000.html + +Bug-Description: + +When using its built-in replacement for snprintf/asprintf, bash does not +treat the %x, %X, and %o format specifiers as unsigned numbers. + +Patch: + +*** ../bash-3.2-patched/lib/sh/snprintf.c Mon Nov 13 08:58:52 2006 +--- lib/sh/snprintf.c Wed Dec 6 11:15:04 2006 +*************** +*** 669,673 **** + + sd = d; /* signed for ' ' padding in base 10 */ +! flags = (*p->pf == 'u' || *p->pf == 'U') ? FL_UNSIGNED : 0; + if (*p->pf == 'X') + flags |= FL_HEXUPPER; +--- 674,679 ---- + + sd = d; /* signed for ' ' padding in base 10 */ +! flags = 0; +! flags = (*p->pf == 'x' || *p->pf == 'X' || *p->pf == 'o' || *p->pf == 'u' || *p->pf == 'U') ? FL_UNSIGNED : 0; + if (*p->pf == 'X') + flags |= FL_HEXUPPER; +*************** +*** 739,743 **** + + sd = d; /* signed for ' ' padding in base 10 */ +! flags = (*p->pf == 'u' || *p->pf == 'U') ? FL_UNSIGNED : 0; + if (*p->pf == 'X') + flags |= FL_HEXUPPER; +--- 745,749 ---- + + sd = d; /* signed for ' ' padding in base 10 */ +! flags = (*p->pf == 'x' || *p->pf == 'X' || *p->pf == 'o' || *p->pf == 'u' || *p->pf == 'U') ? FL_UNSIGNED : 0; + if (*p->pf == 'X') + flags |= FL_HEXUPPER; +*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006 +--- patchlevel.h Mon Oct 16 14:22:54 2006 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 8 + + #endif /* _PATCHLEVEL_H_ */ +--- 26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 9 + + #endif /* _PATCHLEVEL_H_ */

1 0

ports/opt (2.2): pinentry: imported a dependency of gnupg
by crux＠crux.nu 25 Dec '06

25 Dec '06

commit 6167f972a17a22868403d3503570a3afbb182435 Author: Simon Gloßner <viper(a)hometux.de> Date: Mon Dec 25 14:28:47 2006 +0100 pinentry: imported a dependency of gnupg diff --git a/gnupg/Pkgfile b/gnupg/Pkgfile index bed0597..4e13eca 100644 --- a/gnupg/Pkgfile +++ b/gnupg/Pkgfile @@ -2,7 +2,7 @@ # URL: http://www.gnupg.org # Maintainer: Simon Gloßner, viper at hometux dot de # Packager: Daniel Mueller, daniel at danm dot de -# Depends on: libgcrypt, libassuan, libksba +# Depends on: libgcrypt, libassuan, libksba, pinentry name=gnupg version=2.0.1 diff --git a/pinentry/.footprint b/pinentry/.footprint new file mode 100644 index 0000000..db3cdb7 --- /dev/null +++ b/pinentry/.footprint @@ -0,0 +1,6 @@ +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +lrwxrwxrwx root/root usr/bin/pinentry -> pinentry-gtk-2 +-rwxr-xr-x root/root usr/bin/pinentry-curses +-rwxr-xr-x root/root usr/bin/pinentry-gtk-2 +-rwxr-xr-x root/root usr/bin/pinentry-qt diff --git a/pinentry/.md5sum b/pinentry/.md5sum new file mode 100644 index 0000000..cc352d1 --- /dev/null +++ b/pinentry/.md5sum @@ -0,0 +1 @@ +55626ce13ed76d82ec5330d19bdf3ab4 pinentry-0.7.2.tar.gz diff --git a/pinentry/Pkgfile b/pinentry/Pkgfile new file mode 100644 index 0000000..cc1e385 --- /dev/null +++ b/pinentry/Pkgfile @@ -0,0 +1,25 @@ +# Description: Secure PinEntry Dialog +# URL: http://www.gnupg.org +# Maintainer: Simon Gloßner, viper at hometux dot de +# Packager: Alan Mizrahi, alan at mizrahi dot com dot ve +# Depends on: ncurses +# Nice to have: gtk, qt3 + +name=pinentry +version=0.7.2 +release=1 +source=(http://ftp.gnupg.org/gcrypt/$name/$name-$version.tar.gz) + +build() { + cd $name-$version + + ./configure \ + --prefix=/usr \ + --with-qt-dir=/usr/share/qt \ + --enable-fallback-curses \ + --disable-pinentry-gtk + make + make DESTDIR=$PKG install + + rm -rf $PKG/usr/info +}

1 0