This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 416fafcc0a1ed3d87480ed709f226b17d79b2cc4 (commit) via ef44efcca246b247fe5d54a7424c7046d80357cd (commit) via 59627d2c6f7d6d99a75b03518df80d4a9b79b50e (commit) via bca42baa68dea66d87e069c2842f748a8213d080 (commit) via 764f5877fbe259ac507036d53cf0938ecd40f6d9 (commit) via 7a1e1a9a988c821ed8d68a52c127ff29f125d9d9 (commit) via a06f8b21c11f046dea333748b7920ff4704c47ce (commit) via d8f72415eb761a50640928d5eaded9c6e63b86fc (commit) via c9c0fb515baeea77c41092a1969e6a34a6b44e10 (commit) from fec5f0286b8ebad2a9fa719a3458caf25cf2ade3 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 416fafcc0a1ed3d87480ed709f226b17d79b2cc4 Merge: ef44efc 764f587 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Aug 5 14:20:23 2012 +0200
Merge remote-tracking branch 'stevee/coreutils-update'
commit ef44efcca246b247fe5d54a7424c7046d80357cd Merge: 59627d2 7a1e1a9 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Aug 5 14:19:41 2012 +0200
Merge remote-tracking branch 'stevee/pciutils'
commit 59627d2c6f7d6d99a75b03518df80d4a9b79b50e Merge: bca42ba d8f7241 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Aug 5 14:19:24 2012 +0200
Merge remote-tracking branch 'stevee/gzip-update'
commit bca42baa68dea66d87e069c2842f748a8213d080 Merge: a06f8b2 c9c0fb5 Author: Michael Tremer michael.tremer@ipfire.org Date: Sun Aug 5 14:19:05 2012 +0200
Merge remote-tracking branch 'stevee/grep-update'
commit 764f5877fbe259ac507036d53cf0938ecd40f6d9 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Aug 5 13:11:51 2012 +0200
coreutils: Update to 8.17.
Fixes #10130.
commit 7a1e1a9a988c821ed8d68a52c127ff29f125d9d9 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Aug 5 12:51:59 2012 +0200
pciutils: Update to 3.1.10.
Fixes #10170.
commit a06f8b21c11f046dea333748b7920ff4704c47ce Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Aug 5 12:46:30 2012 +0200
pcre: Update to 8.31.
Fixes #10181.
commit d8f72415eb761a50640928d5eaded9c6e63b86fc Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Aug 5 12:38:20 2012 +0200
gzip: Update to 1.5.
* Update patchset and remove old patches. * Add less and more as build dependencies for proper work of the testsuite. * Add download URL for source code.
Fixes #10169.
commit c9c0fb515baeea77c41092a1969e6a34a6b44e10 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sun Aug 5 12:27:40 2012 +0200
grep: Update to 2.13.
Fixes #10182.
-----------------------------------------------------------------------
Summary of changes: coreutils/coreutils.nm | 4 +- .../coreutils-8.17-ls-rootdir-symlink.patch | 21 ++ coreutils/patches/coreutils-i18n.patch | 21 +- coreutils/patches/coreutils-selinux.patch | 24 +- grep/grep.nm | 6 +- gzip/gzip.nm | 13 +- gzip/patches/gzip-1.3.10-zgreppipe.patch | 12 + ...tmp.patch => gzip-1.3.12-openbsd-owl-tmp.patch} | 2 - gzip/patches/gzip-1.3.13-cve-2006-4337.patch | 118 ++++++++ gzip/patches/gzip-1.3.13-cve-2006-4337_len.patch | 15 - gzip/patches/gzip-1.3.13-cve-2006-4338.patch | 33 --- gzip/patches/gzip-1.3.13-rsync.patch | 286 ++++++++++++++++++++ gzip/patches/gzip-1.3.5-cve-2006-4337_len.patch | 11 + gzip/patches/gzip-1.3.5-cve-2006-4338.patch | 29 ++ gzip/patches/gzip-1.3.5-zforce.patch | 12 + gzip/patches/gzip-1.3.9-addsuffix.patch | 19 ++ pciutils/pciutils.nm | 2 +- pcre/pcre.nm | 4 +- 18 files changed, 548 insertions(+), 84 deletions(-) create mode 100644 coreutils/patches/coreutils-8.17-ls-rootdir-symlink.patch create mode 100644 gzip/patches/gzip-1.3.10-zgreppipe.patch rename gzip/patches/{gzip-1.3.13-openbsd-owl-tmp.patch => gzip-1.3.12-openbsd-owl-tmp.patch} (94%) create mode 100644 gzip/patches/gzip-1.3.13-cve-2006-4337.patch delete mode 100644 gzip/patches/gzip-1.3.13-cve-2006-4337_len.patch delete mode 100644 gzip/patches/gzip-1.3.13-cve-2006-4338.patch create mode 100644 gzip/patches/gzip-1.3.13-rsync.patch create mode 100644 gzip/patches/gzip-1.3.5-cve-2006-4337_len.patch create mode 100644 gzip/patches/gzip-1.3.5-cve-2006-4338.patch create mode 100644 gzip/patches/gzip-1.3.5-zforce.patch create mode 100644 gzip/patches/gzip-1.3.9-addsuffix.patch
Difference in files: diff --git a/coreutils/coreutils.nm b/coreutils/coreutils.nm index df4ca91..9cdc445 100644 --- a/coreutils/coreutils.nm +++ b/coreutils/coreutils.nm @@ -4,8 +4,8 @@ ###############################################################################
name = coreutils -version = 8.16 -release = 4 +version = 8.17 +release = 1
groups = System/Base url = http://www.gnu.org/software/coreutils/ diff --git a/coreutils/patches/coreutils-8.17-ls-rootdir-symlink.patch b/coreutils/patches/coreutils-8.17-ls-rootdir-symlink.patch new file mode 100644 index 0000000..7227afe --- /dev/null +++ b/coreutils/patches/coreutils-8.17-ls-rootdir-symlink.patch @@ -0,0 +1,21 @@ +diff -urNp coreutils-8.17-orig/src/ls.c coreutils-8.17/src/ls.c +--- coreutils-8.17-orig/src/ls.c 2012-05-11 20:59:01.467946060 +0200 ++++ coreutils-8.17/src/ls.c 2012-05-11 21:00:38.276821883 +0200 +@@ -3206,14 +3206,9 @@ make_link_name (char const *name, char const *linkname) + if (IS_ABSOLUTE_FILE_NAME (linkname)) + return xstrdup (linkname); + +- /* The link is to a relative name. Prepend any leading directory +- in 'name' to the link name. */ +- size_t prefix_len = dir_len (name); +- if (prefix_len == 0) +- return xstrdup (linkname); +- +- char *p = xmalloc (prefix_len + 1 + strlen (linkname) + 1); +- stpcpy (stpncpy (p, name, prefix_len + 1), linkname); ++ char *d = dir_name (name); ++ char *p = file_name_concat (d, linkname, NULL); ++ free (d); + return p; + } + diff --git a/coreutils/patches/coreutils-i18n.patch b/coreutils/patches/coreutils-i18n.patch index ee2cf73..5b0d3b8 100644 --- a/coreutils/patches/coreutils-i18n.patch +++ b/coreutils/patches/coreutils-i18n.patch @@ -2003,13 +2003,13 @@ diff -urNp coreutils-8.16-orig/src/pr.c coreutils-8.16/src/pr.c } /* It's rather pointless to define a TAB separator with column @@ -1279,11 +1410,11 @@ init_parameters (int number_of_files) - TAB_WIDTH (chars_per_input_tab, chars_per_number); */ + + TAB_WIDTH (chars_per_input_tab, chars_per_number); */
/* Estimate chars_per_text without any margin and keep it constant. */ - if (number_separator == '\t') + if (number_separator[0] == '\t') - number_width = chars_per_number + - TAB_WIDTH (chars_per_default_tab, chars_per_number); + number_width = (chars_per_number + + TAB_WIDTH (chars_per_default_tab, chars_per_number)); else - number_width = chars_per_number + 1; + number_width = chars_per_number + number_separator_width; @@ -2019,9 +2019,9 @@ diff -urNp coreutils-8.16-orig/src/pr.c coreutils-8.16/src/pr.c @@ -1298,7 +1429,7 @@ init_parameters (int number_of_files) }
- chars_per_column = (chars_per_line - chars_used_by_number - -- (columns - 1) * col_sep_length) / columns; -+ (columns - 1) * col_sep_width) / columns; + chars_per_column = (chars_per_line - chars_used_by_number +- - (columns - 1) * col_sep_length) / columns; ++ - (columns - 1) * col_sep_width) / columns;
if (chars_per_column < 1) error (EXIT_FAILURE, 0, _("page width too narrow")); @@ -2447,16 +2447,17 @@ diff -urNp coreutils-8.16-orig/src/pr.c coreutils-8.16/src/pr.c /* We've just printed some files and need to clean up things before looking for more options and printing the next batch of files.
-diff -urNp coreutils-8.16-orig/src/sort.c coreutils-8.16/src/sort.c ---- coreutils-8.16-orig/src/sort.c 2012-03-24 21:26:51.000000000 +0100 -+++ coreutils-8.16/src/sort.c 2012-03-26 17:35:09.000000000 +0200 -@@ -22,11 +22,20 @@ +diff -urNp coreutils-8.17-orig/src/sort.c coreutils-8.17/src/sort.c +--- coreutils-8.17-orig/src/sort.c ++++ coreutils-8.17/src/sort.c +@@ -22,12 +22,21 @@
#include <config.h>
+#include <assert.h> #include <getopt.h> #include <pthread.h> + #include <sys/resource.h> #include <sys/types.h> #include <sys/wait.h> #include <signal.h> diff --git a/coreutils/patches/coreutils-selinux.patch b/coreutils/patches/coreutils-selinux.patch index 0db3acb..501b33e 100644 --- a/coreutils/patches/coreutils-selinux.patch +++ b/coreutils/patches/coreutils-selinux.patch @@ -416,8 +416,8 @@ diff -urNp coreutils-8.13-orig/src/ls.c coreutils-8.13/src/ls.c + && (format == long_format || format == security_format + || check_symlink_color)) { - char *linkname; struct stat linkstats; + @@ -2931,6 +2959,7 @@ gobble_file (char const *name, enum file command line are automatically traced if not being listed as files. */ @@ -628,29 +628,29 @@ diff -urNp coreutils-8.13-orig/src/runcon.c coreutils-8.13/src/runcon.c With neither CONTEXT nor COMMAND, print the current security context.\n\ \n\ CONTEXT Complete security context\n\ -diff -urNp coreutils-8.13-orig/tests/init.cfg coreutils-8.13/tests/init.cfg ---- coreutils-8.13-orig/tests/init.cfg 2011-09-07 18:00:55.000000000 +0200 -+++ coreutils-8.13/tests/init.cfg 2011-09-09 10:32:17.031688699 +0200 +diff -urNp coreutils-8.17-orig/tests/init.cfg coreutils-8.17/tests/init.cfg +--- coreutils-8.17-orig/tests/init.cfg ++++ coreutils-8.17/tests/init.cfg @@ -253,8 +253,8 @@ require_selinux_()
# Independent of whether SELinux is enabled system-wide, # the current file system may lack SELinux support. -- case `ls -Zd .` in +- case $(ls -Zd .) in - '? .'|'unlabeled .') -+ case `ls -Zd . | cut -f4 -d" "` in ++ case $(ls -Zd . | cut -f4 -d" ") in + '?'|'unlabeled') skip_ "this system (or maybe just" \ "the current file system) lacks SELinux support" ;; -diff -urNp coreutils-8.13-orig/tests/misc/selinux coreutils-8.13/tests/misc/selinux ---- coreutils-8.13-orig/tests/misc/selinux 2011-08-08 09:42:16.000000000 +0200 -+++ coreutils-8.13/tests/misc/selinux 2011-09-09 10:30:39.586563144 +0200 +diff -urNp coreutils-8.17-orig/tests/misc/selinux coreutils-8.17/tests/misc/selinux +--- coreutils-8.17-orig/tests/misc/selinux ++++ coreutils-8.17/tests/misc/selinux @@ -37,7 +37,7 @@ chcon $ctx f d p ||
# inspect that context with both ls -Z and stat. for i in d f p; do -- c=`ls -dogZ $i|cut -d' ' -f3`; test x$c = x$ctx || fail=1 -+ c=`ls -dogZ $i|cut -d' ' -f4`; test x$c = x$ctx || fail=1 - c=`stat --printf %C $i`; test x$c = x$ctx || fail=1 +- c=$(ls -dogZ $i|cut -d' ' -f3); test x$c = x$ctx || fail=1 ++ c=$(ls -dogZ $i|cut -d' ' -f4); test x$c = x$ctx || fail=1 + c=$(stat --printf %C $i); test x$c = x$ctx || fail=1 done
diff --git a/grep/grep.nm b/grep/grep.nm index 8e7e25f..a41eaf7 100644 --- a/grep/grep.nm +++ b/grep/grep.nm @@ -4,7 +4,7 @@ ###############################################################################
name = grep -version = 2.12 +version = 2.13 release = 1
groups = Applications/Text @@ -13,8 +13,8 @@ license = GPLv3+ summary = A pattern matching utilities.
description - The GNU versions of commonly used grep utilities. Grep searches through \ - textual input for lines which contain a match to a specified pattern and then \ + The GNU versions of commonly used grep utilities. Grep searches through + textual input for lines which contain a match to a specified pattern and then prints the matching lines. GNU's grep utilities include grep, egrep and fgrep. end
diff --git a/gzip/gzip.nm b/gzip/gzip.nm index 6c7a169..020e9d7 100644 --- a/gzip/gzip.nm +++ b/gzip/gzip.nm @@ -4,8 +4,8 @@ ###############################################################################
name = gzip -version = 1.4 -release = 3 +version = 1.5 +release = 1
groups = Applications/Compression url = http://www.gzip.org/ @@ -13,13 +13,18 @@ license = GPLv2 summary = The GNU data compression program.
description - The gzip package contains the popular GNU gzip data compression \ + The gzip package contains the popular GNU gzip data compression program. Gzipped files have a .gz extension. end
-source_dl = +source_dl = ftp://ftp.gnu.org/gnu/%{name}/
build + requires + coreutils + less + end + # NO_ASM is for textrels. configure_options += \ DEFS=NO_ASM \ diff --git a/gzip/patches/gzip-1.3.10-zgreppipe.patch b/gzip/patches/gzip-1.3.10-zgreppipe.patch new file mode 100644 index 0000000..7797eef --- /dev/null +++ b/gzip/patches/gzip-1.3.10-zgreppipe.patch @@ -0,0 +1,12 @@ +--- gzip-1.3.10/zgrep.in.pom 2006-12-30 04:01:51.000000000 +0100 ++++ gzip-1.3.10/zgrep.in 2007-02-06 10:54:33.000000000 +0100 + +@@ -190,5 +190,8 @@ + r=$? + test "$gzip_status" -eq 0 || test "$gzip_status" -eq 2 || r=2 + test $res -lt $r && res=$r ++ # SIGPIPE + 128 ++ test "$r" -eq 141 && exit $res + done ++trap - SIGPIPE + exit $res diff --git a/gzip/patches/gzip-1.3.12-openbsd-owl-tmp.patch b/gzip/patches/gzip-1.3.12-openbsd-owl-tmp.patch new file mode 100644 index 0000000..423c667 --- /dev/null +++ b/gzip/patches/gzip-1.3.12-openbsd-owl-tmp.patch @@ -0,0 +1,45 @@ +--- gzip-1.3.12/znew.in.owl-tmp 2007-06-04 09:15:11.000000000 +0200 ++++ gzip-1.3.12/znew.in 2007-06-04 09:23:18.000000000 +0200 +@@ -55,28 +55,27 @@ + # block is the disk block size (best guess, need not be exact) + + warn="(does not preserve modes and timestamp)" +-tmp=${TMPDIR-/tmp}/zfoo.$$ +-set -C +-echo hi > $tmp || exit +-if test -z "`(${CPMOD-cpmod} $tmp $tmp) 2>&1`"; then +- cpmod=${CPMOD-cpmod} ++cpmod= ++cpmodarg= ++if type ${CPMOD:-cpmod} 2>/dev/null; then ++ cpmod=${CPMOD:-cpmod} + warn="" + fi + +-if test -z "$cpmod" && ${TOUCH-touch} -r $tmp $tmp 2>/dev/null; then +- cpmod="${TOUCH-touch}" ++if test -z "$cpmod"; then ++ cpmod=touch + cpmodarg="-r" + warn="(does not preserve file modes)" + fi + +-# check if GZIP env. variable uses -S or --suffix +-gzip -q $tmp +-ext=`echo $tmp* | sed "s|$tmp||"` +-rm -f $tmp* +-if test -z "$ext"; then +- echo znew: error determining gzip extension +- exit 1 +-fi ++case "$GZIP" in ++ *-S*) ext=`echo "$GZIP" | sed 's/^.*-S[[:space:]]*([^[:space:]]*).*$/\1/'` ++ ;; ++ *-suffix*) ext=`echo "$GZIP" | sed 's/^.*--suffix=([^[:space:]]*).*$/\1/'` ++ ;; ++ *) ext='.gz' ++ ;; ++esac + if test "$ext" = ".Z"; then + echo znew: cannot use .Z as gzip extension. + exit 1 diff --git a/gzip/patches/gzip-1.3.13-cve-2006-4337.patch b/gzip/patches/gzip-1.3.13-cve-2006-4337.patch new file mode 100644 index 0000000..5855d2b --- /dev/null +++ b/gzip/patches/gzip-1.3.13-cve-2006-4337.patch @@ -0,0 +1,118 @@ +--- gzip-1.3.9/unlzh.c.4337 2007-01-15 16:31:53.000000000 +0100 ++++ gzip-1.3.9/unlzh.c 2007-01-15 16:38:08.000000000 +0100 +@@ -146,8 +146,8 @@ + start[1] = 0; + for (i = 1; i <= 16; i++) + start[i + 1] = start[i] + (count[i] << (16 - i)); +- if ((start[17] & 0xffff) != 0) +- gzip_error ("Bad table\n"); ++ if ((start[17] & 0xffff) != 0 || tablebits > 16) /* 16 for weight below */ ++ gzip_error ("Bad table (case b)\n"); + + jutbits = 16 - tablebits; + for (i = 1; i <= (unsigned)tablebits; i++) { +@@ -161,15 +162,15 @@ + + i = start[tablebits + 1] >> jutbits; + if (i != 0) { +- k = 1 << tablebits; +- while (i != k) table[i++] = 0; ++ k = MIN(1 << tablebits, DIST_BUFSIZE); ++ while (i < k) table[i++] = 0; + } + + avail = nchar; + mask = (unsigned) 1 << (15 - tablebits); + for (ch = 0; ch < (unsigned)nchar; ch++) { + if ((len = bitlen[ch]) == 0) continue; +- nextcode = start[len] + weight[len]; ++ nextcode = MIN(start[len] + weight[len], DIST_BUFSIZE); + if (len <= (unsigned)tablebits) { + if ((unsigned) 1 << tablebits < nextcode) + gzip_error ("Bad table\n"); +@@ -212,7 +213,7 @@ + for (i = 0; i < 256; i++) pt_table[i] = c; + } else { + i = 0; +- while (i < n) { ++ while (i < MIN(n,NPT)) { + c = bitbuf >> (BITBUFSIZ - 3); + if (c == 7) { + mask = (unsigned) 1 << (BITBUFSIZ - 1 - 3); +@@ -224,7 +225,7 @@ + pt_len[i++] = c; + if (i == i_special) { + c = getbits(2); +- while (--c >= 0) pt_len[i++] = 0; ++ while (--c >= 0 && i < NPT) pt_len[i++] = 0; + } + } + while (i < nn) pt_len[i++] = 0; +@@ -244,7 +245,7 @@ + for (i = 0; i < 4096; i++) c_table[i] = c; + } else { + i = 0; +- while (i < n) { ++ while (i < MIN(n,NC)) { + c = pt_table[bitbuf >> (BITBUFSIZ - 8)]; + if (c >= NT) { + mask = (unsigned) 1 << (BITBUFSIZ - 1 - 8); +@@ -259,7 +260,7 @@ + if (c == 0) c = 1; + else if (c == 1) c = getbits(4) + 3; + else c = getbits(CBIT) + 20; +- while (--c >= 0) c_len[i++] = 0; ++ while (--c >= 0 && i < NC) c_len[i++] = 0; + } else c_len[i++] = c - 2; + } + while (i < NC) c_len[i++] = 0; +@@ -352,7 +353,7 @@ + while (--j >= 0) { + buffer[r] = buffer[i]; + i = (i + 1) & (DICSIZ - 1); +- if (++r == count) return r; ++ if (++r >= count) return r; + } + for ( ; ; ) { + c = decode_c(); +@@ -362,14 +363,14 @@ + } + if (c <= UCHAR_MAX) { + buffer[r] = c; +- if (++r == count) return r; ++ if (++r >= count) return r; + } else { + j = c - (UCHAR_MAX + 1 - THRESHOLD); + i = (r - decode_p() - 1) & (DICSIZ - 1); + while (--j >= 0) { + buffer[r] = buffer[i]; + i = (i + 1) & (DICSIZ - 1); +- if (++r == count) return r; ++ if (++r >= count) return r; + } + } + } +--- gzip-1.3.9/gzip.h.4337 2007-01-15 16:31:53.000000000 +0100 ++++ gzip-1.3.9/gzip.h 2007-01-15 16:38:52.000000000 +0100 +@@ -224,6 +224,8 @@ + #define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(0)) + #define try_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(1)) + ++#define MIN(a,b) ((a) <= (b) ? (a) : (b)) ++ + /* put_byte is used for the compressed output, put_ubyte for the + * uncompressed output. However unlzw() uses window for its + * suffix table instead of its output buffer, so it does not use put_ubyte +--- gzip-1.3.9/unpack.c.4337 2007-01-15 16:31:53.000000000 +0100 ++++ gzip-1.3.9/unpack.c 2007-01-15 16:39:12.000000000 +0100 +@@ -21,9 +21,6 @@ + #include "tailor.h" + #include "gzip.h" + +-#define MIN(a,b) ((a) <= (b) ? (a) : (b)) +-/* The arguments must not have side effects. */ +- + #define MAX_BITLEN 25 + /* Maximum length of Huffman codes. (Minor modifications to the code + * would be needed to support 32 bits codes, but pack never generates + diff --git a/gzip/patches/gzip-1.3.13-cve-2006-4337_len.patch b/gzip/patches/gzip-1.3.13-cve-2006-4337_len.patch deleted file mode 100644 index db9f981..0000000 --- a/gzip/patches/gzip-1.3.13-cve-2006-4337_len.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://cvs.fedoraproject.org/viewvc/devel/gzip/gzip-1.3.5-cve-2006-4337_len.... - -http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-4337 - ---- gzip-1.3.5/unlzh.c.len 2006-11-22 09:35:10.000000000 +0100 -+++ gzip-1.3.5/unlzh.c 2006-11-22 09:38:52.000000000 +0100 -@@ -199,7 +199,7 @@ - } - *p = ch; - } -- start[len] = nextcode; -+ start[len] = start[len] + weight[len]; - } - } - diff --git a/gzip/patches/gzip-1.3.13-cve-2006-4338.patch b/gzip/patches/gzip-1.3.13-cve-2006-4338.patch deleted file mode 100644 index 2442ab1..0000000 --- a/gzip/patches/gzip-1.3.13-cve-2006-4338.patch +++ /dev/null @@ -1,33 +0,0 @@ -http://cvs.fedoraproject.org/viewvc/devel/gzip/gzip-1.3.5-cve-2006-4338.patc... - -http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-4338 - ---- gzip-1.3.3/unlzh.c.4338 2006-09-07 10:49:31.000000000 +0200 -+++ gzip-1.3.3/unlzh.c 2006-09-07 11:37:53.000000000 +0200 -@@ -260,7 +260,7 @@ - if (bitbuf & mask) c = right[c]; - else c = left [c]; - mask >>= 1; -- } while (c >= NT); -+ } while (c >= NT && (mask || c != left[c])); - } - fillbuf((int) pt_len[c]); - if (c <= 2) { -@@ -296,7 +296,7 @@ - if (bitbuf & mask) j = right[j]; - else j = left [j]; - mask >>= 1; -- } while (j >= NC); -+ } while (j >= NC && (mask || j != left[j])); - } - fillbuf((int) c_len[j]); - return j; -@@ -313,7 +313,7 @@ - if (bitbuf & mask) j = right[j]; - else j = left [j]; - mask >>= 1; -- } while (j >= NP); -+ } while (j >= NP && (mask || j != left[j])); - } - fillbuf((int) pt_len[j]); - if (j != 0) j = ((unsigned) 1 << (j - 1)) + getbits((int) (j - 1)); diff --git a/gzip/patches/gzip-1.3.13-openbsd-owl-tmp.patch b/gzip/patches/gzip-1.3.13-openbsd-owl-tmp.patch deleted file mode 100644 index 8028df3..0000000 --- a/gzip/patches/gzip-1.3.13-openbsd-owl-tmp.patch +++ /dev/null @@ -1,47 +0,0 @@ -http://cvs.fedoraproject.org/viewvc/devel/gzip/gzip-1.3.12-openbsd-owl-tmp.p... - ---- gzip-1.3.12/znew.in.owl-tmp 2007-06-04 09:15:11.000000000 +0200 -+++ gzip-1.3.12/znew.in 2007-06-04 09:23:18.000000000 +0200 -@@ -55,28 +55,27 @@ - # block is the disk block size (best guess, need not be exact) - - warn="(does not preserve modes and timestamp)" --tmp=${TMPDIR-/tmp}/zfoo.$$ --set -C --echo hi > $tmp || exit --if test -z "`(${CPMOD-cpmod} $tmp $tmp) 2>&1`"; then -- cpmod=${CPMOD-cpmod} -+cpmod= -+cpmodarg= -+if type ${CPMOD:-cpmod} 2>/dev/null; then -+ cpmod=${CPMOD:-cpmod} - warn="" - fi - --if test -z "$cpmod" && ${TOUCH-touch} -r $tmp $tmp 2>/dev/null; then -- cpmod="${TOUCH-touch}" -+if test -z "$cpmod"; then -+ cpmod=touch - cpmodarg="-r" - warn="(does not preserve file modes)" - fi - --# check if GZIP env. variable uses -S or --suffix --gzip -q $tmp --ext=`echo $tmp* | sed "s|$tmp||"` --rm -f $tmp* --if test -z "$ext"; then -- echo znew: error determining gzip extension -- exit 1 --fi -+case "$GZIP" in -+ *-S*) ext=`echo "$GZIP" | sed 's/^.*-S[[:space:]]*([^[:space:]]*).*$/\1/'` -+ ;; -+ *-suffix*) ext=`echo "$GZIP" | sed 's/^.*--suffix=([^[:space:]]*).*$/\1/'` -+ ;; -+ *) ext='.gz' -+ ;; -+esac - if test "$ext" = ".Z"; then - echo znew: cannot use .Z as gzip extension. - exit 1 diff --git a/gzip/patches/gzip-1.3.13-rsync.patch b/gzip/patches/gzip-1.3.13-rsync.patch new file mode 100644 index 0000000..30a83a4 --- /dev/null +++ b/gzip/patches/gzip-1.3.13-rsync.patch @@ -0,0 +1,286 @@ +diff -up gzip-1.3.13/deflate.c.rsync gzip-1.3.13/deflate.c +--- gzip-1.3.13/deflate.c.rsync 2009-09-26 20:43:28.000000000 +0200 ++++ gzip-1.3.13/deflate.c 2009-12-01 16:14:24.656387546 +0100 +@@ -131,6 +131,14 @@ + #endif + /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ + ++#ifndef RSYNC_WIN ++# define RSYNC_WIN 4096 ++#endif ++/* Size of rsync window, must be < MAX_DIST */ ++ ++#define RSYNC_SUM_MATCH(sum) ((sum) % RSYNC_WIN == 0) ++/* Whether window sum matches magic value */ ++ + /* =========================================================================== + * Local data used by the "longest match" routines. + */ +@@ -212,6 +220,8 @@ local int compr_level; + unsigned good_match; + /* Use a faster search when the previous match is longer than this */ + ++local ulg rsync_sum; /* rolling sum of rsync window */ ++local ulg rsync_chunk_end; /* next rsync sequence point */ + + /* Values for max_lazy_match, good_match and max_chain_length, depending on + * the desired pack level (0..9). The values given below have been tuned to +@@ -310,6 +320,10 @@ void lm_init (pack_level, flags) + #endif + /* prev will be initialized on the fly */ + ++ /* rsync params */ ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ rsync_sum = 0; ++ + /* Set the default configuration parameters: + */ + max_lazy_match = configuration_table[pack_level].max_lazy; +@@ -546,6 +560,8 @@ local void fill_window() + memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE); + match_start -= WSIZE; + strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */ ++ if (rsync_chunk_end != 0xFFFFFFFFUL) ++ rsync_chunk_end -= WSIZE; + + block_start -= (long) WSIZE; + +@@ -573,13 +589,46 @@ local void fill_window() + } + } + ++local void rsync_roll(start, num) ++ unsigned start; ++ unsigned num; ++{ ++ unsigned i; ++ ++ if (start < RSYNC_WIN) { ++ /* before window fills. */ ++ for (i = start; i < RSYNC_WIN; i++) { ++ if (i == start + num) return; ++ rsync_sum += (ulg)window[i]; ++ } ++ num -= (RSYNC_WIN - start); ++ start = RSYNC_WIN; ++ } ++ ++ /* buffer after window full */ ++ for (i = start; i < start+num; i++) { ++ /* New character in */ ++ rsync_sum += (ulg)window[i]; ++ /* Old character out */ ++ rsync_sum -= (ulg)window[i - RSYNC_WIN]; ++ if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum)) ++ rsync_chunk_end = i; ++ } ++} ++ ++/* =========================================================================== ++ * Set rsync_chunk_end if window sum matches magic value. ++ */ ++#define RSYNC_ROLL(s, n) \ ++ do { if (rsync) rsync_roll((s), (n)); } while(0) ++ + /* =========================================================================== + * Flush the current block, with given end-of-file flag. + * IN assertion: strstart is set to the end of the current match. + */ + #define FLUSH_BLOCK(eof) \ + flush_block(block_start >= 0L ? (char*)&window[(unsigned)block_start] : \ +- (char*)NULL, (long)strstart - block_start, (eof)) ++ (char*)NULL, (long)strstart - block_start, flush-1, (eof)) + + /* =========================================================================== + * Processes a new input file and return its compressed length. This +@@ -590,7 +639,7 @@ local void fill_window() + local off_t deflate_fast() + { + IPos hash_head; /* head of the hash chain */ +- int flush; /* set if current block must be flushed */ ++ int flush; /* set if current block must be flushed, 2=>and padded */ + unsigned match_length = 0; /* length of best match */ + + prev_length = MIN_MATCH-1; +@@ -674,7 +674,8 @@ + flush = ct_tally(strstart-match_start, match_length - MIN_MATCH); + + lookahead -= match_length; +- ++ ++ RSYNC_ROLL(strstart, match_length); + /* Insert new strings in the hash table only if the match length + * is not too large. This saves time but degrades compression. + */ +@@ -703,9 +704,14 @@ + /* No match, output a literal byte */ + Tracevv((stderr,"%c",window[strstart])); + flush = ct_tally (0, window[strstart]); ++ RSYNC_ROLL(strstart, 1); + lookahead--; + strstart++; + } ++ if (rsync && strstart > rsync_chunk_end) { ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ flush = 2; ++ } + if (flush) FLUSH_BLOCK(0), block_start = strstart; + + /* Make sure that we always have enough lookahead, except +@@ -724,6 +779,7 @@ off_t deflate() + */ + lookahead -= prev_length-1; + prev_length -= 2; ++ RSYNC_ROLL(strstart, prev_length+1); + do { + strstart++; + INSERT_STRING(strstart, hash_head); +@@ -736,24 +792,40 @@ off_t deflate() + match_available = 0; + match_length = MIN_MATCH-1; + strstart++; +- if (flush) FLUSH_BLOCK(0), block_start = strstart; + ++ if (rsync && strstart > rsync_chunk_end) { ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ flush = 2; ++ } ++ if (flush) FLUSH_BLOCK(0), block_start = strstart; + } else if (match_available) { + /* If there was no match at the previous position, output a + * single literal. If there was a match but the current match + * is longer, truncate the previous match to a single literal. + */ + Tracevv((stderr,"%c",window[strstart-1])); +- if (ct_tally (0, window[strstart-1])) { +- FLUSH_BLOCK(0), block_start = strstart; ++ flush = ct_tally (0, window[strstart-1]); ++ if (rsync && strstart > rsync_chunk_end) { ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ flush = 2; + } ++ if (flush) FLUSH_BLOCK(0), block_start = strstart; ++ RSYNC_ROLL(strstart, 1); + strstart++; + lookahead--; + } else { + /* There is no previous match to compare with, wait for + * the next step to decide. + */ ++ if (rsync && strstart > rsync_chunk_end) { ++ /* Reset huffman tree */ ++ rsync_chunk_end = 0xFFFFFFFFUL; ++ flush = 2; ++ FLUSH_BLOCK(0), block_start = strstart; ++ } ++ + match_available = 1; ++ RSYNC_ROLL(strstart, 1); + strstart++; + lookahead--; + } +diff -up gzip-1.3.13/doc/gzip.texi.rsync gzip-1.3.13/doc/gzip.texi +--- gzip-1.3.13/doc/gzip.texi.rsync 2009-09-28 11:08:16.000000000 +0200 ++++ gzip-1.3.13/doc/gzip.texi 2009-12-01 16:14:24.664394713 +0100 +@@ -353,6 +353,14 @@ specified on the command line are direct + into the directory and compress all the files it finds there (or + decompress them in the case of @command{gunzip}). + ++@item --rsyncable ++While compressing, synchronize the output occasionally based on the ++input. This reduces compression by about 1 percent most cases, but ++means that the @code{rsync} program can take advantage of similarities ++in the uncompressed input when syncronizing two files compressed with ++this flag. @code{gunzip} cannot tell the difference between a ++compressed file created with this option, and one created without it. ++ + @item --suffix @var{suf} + @itemx -S @var{suf} + Use suffix @var{suf} instead of @samp{.gz}. Any suffix can be +diff -up gzip-1.3.13/gzip.c.rsync gzip-1.3.13/gzip.c +--- gzip-1.3.13/gzip.c.rsync 2009-09-26 20:56:02.000000000 +0200 ++++ gzip-1.3.13/gzip.c 2009-12-01 16:18:17.121387126 +0100 +@@ -229,6 +229,7 @@ int ofd; /* output fil + unsigned insize; /* valid bytes in inbuf */ + unsigned inptr; /* index of next byte to be processed in inbuf */ + unsigned outcnt; /* bytes in output buffer */ ++int rsync = 0; /* make ryncable chunks */ + + static int handled_sig[] = + { +@@ -271,7 +271,7 @@ static const struct option longopts[] = + {"best", 0, 0, '9'}, /* compress better */ + {"lzw", 0, 0, 'Z'}, /* make output compatible with old compress */ + {"bits", 1, 0, 'b'}, /* max number of bits per code (implies -Z) */ +- ++ {"rsyncable", 0, 0, 'R'}, /* make rsync-friendly archive */ + { 0, 0, 0, 0 } + }; + + +@@ -363,6 +365,7 @@ local void help() + " -Z, --lzw produce output compatible with old compress", + " -b, --bits=BITS max number of bits per code (implies -Z)", + #endif ++ " --rsyncable Make rsync-friendly archive", + "", + "With no FILE, or when FILE is -, read standard input.", + "", +@@ -484,6 +484,9 @@ int main (int argc, char **argv) + recursive = 1; + #endif + break; ++ ++ case 'R': ++ rsync = 1; break; + case 'S': + #ifdef NO_MULTIPLE_DOTS + if (*optarg == '.') optarg++; + +diff -up gzip-1.3.13/gzip.h.rsync gzip-1.3.13/gzip.h +--- gzip-1.3.13/gzip.h.rsync 2009-09-26 20:43:28.000000000 +0200 ++++ gzip-1.3.13/gzip.h 2009-12-01 16:14:24.664394713 +0100 +@@ -158,6 +158,7 @@ EXTERN(uch, window); /* Sliding + extern unsigned insize; /* valid bytes in inbuf */ + extern unsigned inptr; /* index of next byte to be processed in inbuf */ + extern unsigned outcnt; /* bytes in output buffer */ ++extern int rsync; /* deflate into rsyncable chunks */ + + extern off_t bytes_in; /* number of input bytes */ + extern off_t bytes_out; /* number of output bytes */ +@@ -288,7 +288,7 @@ extern off_t deflate (void); + /* in trees.c */ + extern void ct_init (ush *attr, int *method); + extern int ct_tally (int dist, int lc); +-extern off_t flush_block (char *buf, ulg stored_len, int eof); ++extern off_t flush_block (char *buf, ulg stored_len, int pad, int eof); + + /* in bits.c */ + extern void bi_init (file_t zipfile); + +diff -up gzip-1.3.13/trees.c.rsync gzip-1.3.13/trees.c +--- gzip-1.3.13/trees.c.rsync 2009-09-26 20:43:28.000000000 +0200 ++++ gzip-1.3.13/trees.c 2009-12-01 16:14:24.655388257 +0100 +@@ -856,9 +856,10 @@ local void send_all_trees(lcodes, dcodes + * trees or store, and output the encoded block to the zip file. This function + * returns the total compressed length for the file so far. + */ +-off_t flush_block(buf, stored_len, eof) ++off_t flush_block(buf, stored_len, pad, eof) + char *buf; /* input block, or NULL if too old */ + ulg stored_len; /* length of input block */ ++ int pad; /* pad output to byte boundary */ + int eof; /* true if this is the last block for a file */ + { + ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ +@@ -951,6 +952,10 @@ off_t flush_block(buf, stored_len, eof) + Assert (input_len == bytes_in, "bad input size"); + bi_windup(); + compressed_len += 7; /* align on byte boundary */ ++ } else if (pad && (compressed_len % 8) != 0) { ++ send_bits((STORED_BLOCK<<1)+eof, 3); /* send block type */ ++ compressed_len = (compressed_len + 3 + 7) & ~7L; ++ copy_block(buf, 0, 1); /* with header */ + } + + return compressed_len >> 3; diff --git a/gzip/patches/gzip-1.3.5-cve-2006-4337_len.patch b/gzip/patches/gzip-1.3.5-cve-2006-4337_len.patch new file mode 100644 index 0000000..29fe598 --- /dev/null +++ b/gzip/patches/gzip-1.3.5-cve-2006-4337_len.patch @@ -0,0 +1,11 @@ +--- gzip-1.3.5/unlzh.c.len 2006-11-22 09:35:10.000000000 +0100 ++++ gzip-1.3.5/unlzh.c 2006-11-22 09:38:52.000000000 +0100 +@@ -189,7 +189,7 @@ + } + *p = ch; + } +- start[len] = nextcode; ++ start[len] = start[len] + weight[len]; + } + } + diff --git a/gzip/patches/gzip-1.3.5-cve-2006-4338.patch b/gzip/patches/gzip-1.3.5-cve-2006-4338.patch new file mode 100644 index 0000000..82ea61f --- /dev/null +++ b/gzip/patches/gzip-1.3.5-cve-2006-4338.patch @@ -0,0 +1,29 @@ +--- gzip-1.3.3/unlzh.c.4338 2006-09-07 10:49:31.000000000 +0200 ++++ gzip-1.3.3/unlzh.c 2006-09-07 11:37:53.000000000 +0200 +@@ -252,7 +252,7 @@ local void read_c_len() + if (bitbuf & mask) c = right[c]; + else c = left [c]; + mask >>= 1; +- } while (c >= NT); ++ } while (c >= NT && (mask || c != left[c])); + } + fillbuf((int) pt_len[c]); + if (c <= 2) { +@@ -288,7 +288,7 @@ local unsigned decode_c() + if (bitbuf & mask) j = right[j]; + else j = left [j]; + mask >>= 1; +- } while (j >= NC); ++ } while (j >= NC && (mask || j != left[j])); + } + fillbuf((int) c_len[j]); + return j; +@@ -305,7 +305,7 @@ local unsigned decode_p() + if (bitbuf & mask) j = right[j]; + else j = left [j]; + mask >>= 1; +- } while (j >= NP); ++ } while (j >= NP && (mask || j != left[j])); + } + fillbuf((int) pt_len[j]); + if (j != 0) j = ((unsigned) 1 << (j - 1)) + getbits((int) (j - 1)); diff --git a/gzip/patches/gzip-1.3.5-zforce.patch b/gzip/patches/gzip-1.3.5-zforce.patch new file mode 100644 index 0000000..5a9beca --- /dev/null +++ b/gzip/patches/gzip-1.3.5-zforce.patch @@ -0,0 +1,12 @@ +diff -up gzip-1.3.12/zforce.in.zforce gzip-1.3.12/zforce.in +--- gzip-1.3.12/zforce.in.zforce 2007-02-05 21:54:26.000000000 +0100 ++++ gzip-1.3.12/zforce.in 2008-09-01 14:17:26.000000000 +0200 +@@ -58,7 +58,7 @@ for i do + continue + fi + +- if gzip -lv < "$i" 2>/dev/null | grep '^defl' > /dev/null; then ++ if gzip -l < "$i" 2>/dev/null | grep '^compressed' > /dev/null; then + + new="$i.gz" + if mv "$i" "$new"; then diff --git a/gzip/patches/gzip-1.3.9-addsuffix.patch b/gzip/patches/gzip-1.3.9-addsuffix.patch new file mode 100644 index 0000000..80a823d --- /dev/null +++ b/gzip/patches/gzip-1.3.9-addsuffix.patch @@ -0,0 +1,19 @@ +--- gzip-1.3.9/zmore.in.pom 2007-01-15 15:31:26.000000000 +0100 ++++ gzip-1.3.9/zmore.in 2007-01-15 15:34:06.000000000 +0100 +@@ -70,7 +70,7 @@ + --v*) exec echo "$version";; + esac + +- < "$FILE" || continue ++ if test -e $FILE || test -e $FILE.gz; then + if test $FIRST -eq 0; then + echo $n1 "--More--(Next file: $FILE)$n2" + stty $cb -echo 2>/dev/null +@@ -88,5 +88,7 @@ + if test -t 1; then + FIRST=0 + fi ++ else < $FILE ++ fi + done + fi diff --git a/pciutils/pciutils.nm b/pciutils/pciutils.nm index e67831e..edf0fc4 100644 --- a/pciutils/pciutils.nm +++ b/pciutils/pciutils.nm @@ -4,7 +4,7 @@ ###############################################################################
name = pciutils -version = 3.1.9 +version = 3.1.10 release = 1
groups = System/Base diff --git a/pcre/pcre.nm b/pcre/pcre.nm index 3493b61..3b6fc93 100644 --- a/pcre/pcre.nm +++ b/pcre/pcre.nm @@ -4,8 +4,8 @@ ###############################################################################
name = pcre -version = 8.30 -release = 2 +version = 8.31 +release = 1
compat_version = 8.21
hooks/post-receive -- IPFire 3.x development tree