December 2006 - openSUSE Commits - openSUSE Mailing Lists

commit hatari
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package hatari checked in at Tue Dec 12 23:16:09 CET 2006. -------- --- hatari/hatari.changes 2006-10-29 20:54:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/hatari/hatari.changes 2006-12-12 22:04:03.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 12 22:03:37 CET 2006 - wengel(a)suse.de + +- binaries moved from /usr/X11R6/bin/ to /usr/bin/ + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hatari.spec ++++++ --- /var/tmp/diff_new_pack.SjPWEN/_old 2006-12-12 23:16:02.000000000 +0100 +++ /var/tmp/diff_new_pack.SjPWEN/_new 2006-12-12 23:16:02.000000000 +0100 @@ -13,11 +13,11 @@ Name: hatari BuildRequires: SDL-devel xorg-x11 URL: http://hatari.sourceforge.net/ -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/Emulators/Other Autoreqprov: on Version: 0.50 -Release: 31 +Release: 42 Summary: An Atari ST Emulator Suitable for Playing Games Source: %{name}-%{version}.tar.bz2 Source1: emutos-0.7.tar.bz2 @@ -44,7 +44,7 @@ unzip %SOURCE2 %build -./configure --prefix=/usr --bindir=/usr/X11R6/bin +./configure --prefix=/usr make HOSTCC="gcc $RPM_OPT_FLAGS" CC="gcc $RPM_OPT_FLAGS" %install @@ -61,11 +61,13 @@ %files %defattr(-,root,root) %doc *.txt doc/*.txt doc/*.html -/usr/X11R6/bin/hatari +/usr/bin/hatari /usr/share/hatari %doc %_mandir/man1/hatari.1* %changelog -n hatari +* Tue Dec 12 2006 - wengel(a)suse.de +- binaries moved from /usr/X11R6/bin/ to /usr/bin/ * Sun Oct 29 2006 - meissner(a)suse.de - also build HOSTCC things with RPM_OPT_FLAGS * Wed Jan 25 2006 - mls(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit clamav
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package clamav checked in at Tue Dec 12 23:15:55 CET 2006. -------- --- clamav/clamav.changes 2006-11-07 16:00:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/clamav/clamav.changes 2006-12-12 12:22:43.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Dec 12 12:20:34 CET 2006 - max(a)suse.de + +- Security update: 0.88.7 (#227827, CVE-2006-5874) + - handle consecutive errors in base64 decoding + - honour recursion limit when scanning email messages + - clamscan: new option --mail-max-recursion + - libclamav/untar.c: honour archive limits + +------------------------------------------------------------------- Old: ---- clamav-0.88.6.tar.bz2 New: ---- clamav-0.88.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clamav.spec ++++++ --- /var/tmp/diff_new_pack.ZSrJZa/_old 2006-12-12 23:12:23.000000000 +0100 +++ /var/tmp/diff_new_pack.ZSrJZa/_new 2006-12-12 23:12:23.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package clamav (Version 0.88.6) +# spec file for package clamav (Version 0.88.7) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,9 +15,9 @@ BuildRequires: bc curl-devel gmp-devel pkgconfig tcpd-devel %endif Summary: Antivirus Toolkit -Version: 0.88.6 -Release: 3 -License: GNU General Public License (GPL) - all versions +Version: 0.88.7 +Release: 1 +License: GNU General Public License (GPL) Group: Productivity/Security URL: http://www.clamav.net Requires: latex2html-pngicons @@ -173,6 +173,12 @@ done %changelog -n clamav +* Tue Dec 12 2006 - max(a)suse.de +- Security update: 0.88.7 (#227827, CVE-2006-5874) + - handle consecutive errors in base64 decoding + - honour recursion limit when scanning email messages + - clamscan: new option --mail-max-recursion + - libclamav/untar.c: honour archive limits * Tue Nov 07 2006 - max(a)suse.de - Add homedir of user vscan to the package (FATE300731). * Mon Nov 06 2006 - max(a)suse.de ++++++ clamav-0.88.6.tar.bz2 -> clamav-0.88.7.tar.bz2 ++++++ clamav/clamav-0.88.6.tar.bz2 /mounts/work_src_done/STABLE/clamav/clamav-0.88.7.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cups
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package cups checked in at Tue Dec 12 23:11:47 CET 2006. -------- --- cups/cups.changes 2006-11-16 16:28:13.000000000 +0100 +++ /mounts/work_src_done/STABLE/cups/cups.changes 2006-12-12 11:40:25.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 12 11:40:20 CET 2006 - kssingvo(a)suse.de + +- removed broken locale patch: PS generation fails (bugzilla#227205) + +------------------------------------------------------------------- Old: ---- cups-1.2.4-locale.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups.spec ++++++ --- /var/tmp/diff_new_pack.Sk2k4s/_old 2006-12-12 23:11:29.000000000 +0100 +++ /var/tmp/diff_new_pack.Sk2k4s/_new 2006-12-12 23:11:29.000000000 +0100 @@ -17,7 +17,7 @@ Group: Hardware/Printing Summary: The Common UNIX Printing System Version: 1.2.7 -Release: 1 +Release: 4 Requires: cups-libs = %{version}, cups-client = %{version} Requires: ghostscript_any, ghostscript-fonts-std, foomatic-filters Requires: util-linux, /usr/bin/ionice @@ -43,7 +43,6 @@ Patch4: cups-1.2rc3-libwrap.patch Patch5: cups-pam.diff Patch6: cups-1.2b2-access_conf.patch -Patch7: cups-1.2.4-locale.patch Patch9: cups-1.1.21rc2-preauth_security.patch Patch10: cups-1.1.21rc2-usermode.patch Patch12: cups-1.2rc3-pswrite.patch @@ -136,7 +135,6 @@ %patch4 -p1 %patch5 %patch6 -p1 -%patch7 -p1 #tbd: %patch9 -p1 #tbd: %patch10 -p1 %patch12 -p1 @@ -372,6 +370,8 @@ %{_datadir}/locale/*/cups_* %changelog -n cups +* Tue Dec 12 2006 - kssingvo(a)suse.de +- removed broken locale patch: PS generation fails (bugzilla#227205) * Thu Nov 16 2006 - kssingvo(a)suse.de - Upgrade to 1.2.7 (another bugfix version): * Documentation updates ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit Source-Navigator
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package Source-Navigator checked in at Tue Dec 12 23:10:50 CET 2006. -------- --- Source-Navigator/Source-Navigator.changes 2006-01-25 21:33:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/Source-Navigator/Source-Navigator.changes 2006-12-12 15:20:27.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Dec 12 15:15:33 CET 2006 - lmichnovic(a)suse.cz + +- rewritten *2much_elements.patch [#134534] renamed to *cache.patch + +------------------------------------------------------------------- +Tue Dec 12 14:31:32 CET 2006 - lmichnovic(a)suse.cz + +- fixed non deterministic evaluation of code (increment.patch) +- building with flex, flex-old is not needed any more + +------------------------------------------------------------------- Old: ---- sourcenav-5.1.4-2much_elements.patch New: ---- sourcenav-5.1.4-cache.patch sourcenav-5.1.4-increment.patch zaloha.spe ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Source-Navigator.spec ++++++ --- /var/tmp/diff_new_pack.AUuCih/_old 2006-12-12 23:09:59.000000000 +0100 +++ /var/tmp/diff_new_pack.AUuCih/_new 2006-12-12 23:09:59.000000000 +0100 @@ -1,24 +1,23 @@ # # spec file for package Source-Navigator (Version 5.1.4) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: Source-Navigator -#!BuildIgnore: flex -BuildRequires: flex-old xorg-x11-devel -License: GPL, LGPL +BuildRequires: flex xorg-x11-devel +License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Tools/IDE Provides: SN snavig Autoreqprov: on Version: 5.1.4 -Release: 186 +Release: 219 Source: sourcenav-%{version}.tar.bz2 Source1: snavigator Patch: returnval.patch @@ -27,9 +26,10 @@ Patch3: sourcenav-%{version}-gcc.patch Patch4: sourcenav-%{version}-uninitialized.patch Patch5: sourcenav-%{version}-includes.patch -Patch6: sourcenav-%{version}-2much_elements.patch +Patch6: sourcenav-%{version}-cache.patch Patch7: sourcenav-%{version}-always_false_if.patch Patch8: sourcenav-%{version}-tcl_config.patch +Patch9: sourcenav-%{version}-increment.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://sourcenav.sourceforge.net/ Summary: Cygnus Source-Navigator @@ -60,6 +60,7 @@ %patch6 %patch7 %patch8 +%patch9 %build %{?suse_update_config:%{suse_update_config -f}} @@ -129,6 +130,11 @@ /usr/bin/snavigator %changelog -n Source-Navigator +* Tue Dec 12 2006 - lmichnovic(a)suse.cz +- rewritten *2much_elements.patch [#134534] renamed to *cache.patch +* Tue Dec 12 2006 - lmichnovic(a)suse.cz +- fixed non deterministic evaluation of code (increment.patch) +- building with flex, flex-old is not needed any more * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Fri Dec 23 2005 - ro(a)suse.de ++++++ sourcenav-5.1.4-cache.patch ++++++ --- snavigator/hyper/tkTreeTable.h +++ snavigator/hyper/tkTreeTable.h @@ -135,7 +135,7 @@ #define USE_PARENT_CACHE #define USE_CACHE -#define MAX_CACHED 5 +#define MAX_CACHED 8 #undef USE_BITMAP_COLORS #define USE_PATHFINDER ++++++ sourcenav-5.1.4-increment.patch ++++++ --- libgui/src/tkTableCmds.c +++ libgui/src/tkTableCmds.c @@ -108,7 +108,8 @@ /* no error checking because GetIndex did it for us */ p++; x = strtol(p, &p, 0) - x - tablePtr->activeX; - y = strtol(++p, &p, 0) - y - tablePtr->activeY; + p++; + y = strtol(p, &p, 0) - y - tablePtr->activeY; textLayout = Tk_ComputeTextLayout(tagPtr->tkfont, tablePtr->activeBuf, -1, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bmp
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package bmp checked in at Tue Dec 12 23:09:41 CET 2006. -------- --- GNOME/bmp/bmp.changes 2006-09-05 09:15:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/bmp/bmp.changes 2006-12-12 11:01:55.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 12 11:01:28 CET 2006 - meissner(a)suse.de + +- mark up assembler as using noexec. +- fixed bugs. + +------------------------------------------------------------------- New: ---- bmp-fixes.patch bmp-noexec.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bmp.spec ++++++ --- /var/tmp/diff_new_pack.KmdPec/_old 2006-12-12 23:09:25.000000000 +0100 +++ /var/tmp/diff_new_pack.KmdPec/_new 2006-12-12 23:09:25.000000000 +0100 @@ -14,10 +14,10 @@ BuildRequires: esound-devel gconf2-devel gnome-vfs2-devel gtk2-devel id3lib-devel libglade2-devel libstdc++-devel libvorbis-devel mDNSResponder-devel update-desktop-files %define splitmad 1 Version: 0.9.7.1 -Release: 19 +Release: 44 URL: http://bmp.beep-media-player.org/ Group: Productivity/Multimedia/Sound/Players -License: GPL +License: GNU General Public License (GPL) Summary: Beep Media Player Source: %{name}-%{version}.tar.bz2 Source1: xmmsuse-1.0-1.tar.bz2 @@ -26,7 +26,9 @@ Source4: bmp_enqueue.desktop Source5: bmp_audio_cd.desktop Patch0: %name-desktop.patch +Patch1: bmp-noexec.patch Patch2: bmp-cdaudio-path-fix.diff +Patch3: bmp-fixes.patch Autoreqprov: on BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %splitmad @@ -147,7 +149,9 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %patch2 +%patch3 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -230,6 +234,9 @@ %_includedir/* %changelog -n bmp +* Tue Dec 12 2006 - meissner(a)suse.de +- mark up assembler as using noexec. +- fixed bugs. * Tue Sep 05 2006 - aj(a)suse.de - Cleanup BuildRequires. * Wed Jan 25 2006 - mls(a)suse.de ++++++ bmp-fixes.patch ++++++ --- bmp-0.9.7.1/beep/playlist_list.c.xx 2006-12-12 10:51:16.000000000 +0100 +++ bmp-0.9.7.1/beep/playlist_list.c 2006-12-12 10:51:30.000000000 +0100 @@ -478,7 +478,7 @@ guint tail_width; guint tail_len; - strncat(tail, length, sizeof(tail)); + strncat(tail, length, sizeof(tail)-strlen(tail)-1); tail_len = strlen(tail); max_time_len = MAX(max_time_len, tail_len); --- bmp-0.9.7.1/Input/vorbis/vorbis.c.xx 2006-12-12 10:51:50.000000000 +0100 +++ bmp-0.9.7.1/Input/vorbis/vorbis.c 2006-12-12 10:52:12.000000000 +0100 @@ -474,7 +474,7 @@ last_section = current_section; } - if (!(vi->bitrate_upper == vi->bitrate_lower == vi->bitrate_nominal) + if (!((vi->bitrate_upper == vi->bitrate_lower) && (vi->bitrate_lower == vi->bitrate_nominal)) && (vorbis_ip.output->output_time() > timercount + 1000 || vorbis_ip.output->output_time() < timercount)) { /* ++++++ bmp-noexec.patch ++++++ --- bmp-0.9.7.1/Input/mpg123/decode_i586.s.xx 2006-12-11 21:09:55.000000000 +0100 +++ bmp-0.9.7.1/Input/mpg123/decode_i586.s 2006-12-11 21:10:44.000000000 +0100 @@ -23,6 +23,8 @@ / / $Id: decode_i586.s,v 1.1.1.1 2003/11/19 16:03:18 mderezynski Exp $ / +.section .note.GNU-stack,"",@progbits +.previous .bss .comm buffs,4352,4 .data --- bmp-0.9.7.1/Visualization/blur_scope/blur_8.s.xx 2006-12-11 21:11:09.000000000 +0100 +++ bmp-0.9.7.1/Visualization/blur_scope/blur_8.s 2006-12-11 21:11:39.000000000 +0100 @@ -1,3 +1,5 @@ +.section .note.GNU-stack,"",@progbits +.previous .globl bscope_blur_8 .type bscope_blur_8,@function bscope_blur_8: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit util-linux
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package util-linux checked in at Tue Dec 12 23:09:18 CET 2006. -------- --- util-linux/util-linux.changes 2006-12-11 12:37:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/util-linux/util-linux.changes 2006-12-12 16:01:38.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 12 11:04:07 CET 2006 - mkoenig(a)suse.de + +- provide different return codes for losetup with encryption + for empty and too short passwords. [#197493] + +------------------------------------------------------------------- New: ---- util-linux-2.12r-losetup_password.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.JwmLnK/_old 2006-12-12 23:08:39.000000000 +0100 +++ /var/tmp/diff_new_pack.JwmLnK/_new 2006-12-12 23:08:39.000000000 +0100 @@ -20,7 +20,7 @@ Group: System/Base Autoreqprov: on Version: 2.12r -Release: 62 +Release: 64 Summary: A collection of basic system utilities Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-%version.tar.bz2 Source2: nologin.c @@ -107,6 +107,7 @@ Patch106: util-linux-2.12r-partx.patch Patch107: util-linux-2.12r-mkswap_fix.patch Patch108: util-linux-2.12r-nfs_remount_options.patch +Patch109: util-linux-2.12r-losetup_password.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq %fillup_prereq /bin/sed @@ -179,6 +180,7 @@ %patch106 -p1 %patch107 -p1 %patch108 -p1 +%patch109 -p1 # setctsid cp %{S:22} %{S:23} . # nologin and guessfstype @@ -612,6 +614,9 @@ %endif %changelog -n util-linux +* Tue Dec 12 2006 - mkoenig(a)suse.de +- provide different return codes for losetup with encryption + for empty and too short passwords. [#197493] * Tue Dec 05 2006 - mkoenig(a)suse.de - default swap to V1 in any case [#205956] patch: util-linux-2.12r-mkswap_fix.patch ++++++ util-linux-2.12r-losetup_password.patch ++++++ Index: util-linux-2.12r/mount/lomount.c =================================================================== --- util-linux-2.12r.orig/mount/lomount.c +++ util-linux-2.12r/mount/lomount.c @@ -46,24 +46,24 @@ #include "rmd160.h" #include "aes.h" +#define LO_PASS_OK EXIT_SUCCESS +#define LO_PASS_ERR EXIT_FAILURE +#define LO_PASS_EMPTY 5 +#define LO_PASS_SHORT 6 + extern int verbose; extern char *xstrdup (const char *s); /* not: #include "sundries.h" */ extern void error (const char *fmt, ...); /* idem */ extern void show_all_loops(void); extern int read_options_from_fstab(char *, char **); +volatile int timeout=0; int passphrase_timeout=0; struct sigaction alrmact; static void alrmhandler() { - /* let the SIGINT handler do the work: */ - kill(getpid(),SIGINT); - usleep(1000000); - kill(getpid(),SIGTERM); - usleep(1000000); - /* stubborn... */ - exit(0); + timeout = 1; } @@ -473,11 +473,14 @@ static char *do_GPG_pipe(char *pass) return multiKeyPass[0]; } -static char *sGetPass(int minLen, int warnLen) +static int sGetPass(char **pass, int minLen, int warnLen) { char *p, *s, *seed; int i, ask2; + *pass = NULL; + timeout = 0; + if(!passFDnumber) { if(passphrase_timeout) { @@ -489,6 +492,9 @@ static char *sGetPass(int minLen, int wa } p = getpass(_("Password: ")); + alarm(0); + if (timeout) + return LO_PASS_EMPTY; ask2 = passAskTwice ? 1 : 0; } else { i = atoi(passFDnumber); @@ -504,11 +510,13 @@ static char *sGetPass(int minLen, int wa } if(x == 65) { multiKeyMode = 65; - return multiKeyPass[0]; + *pass = multiKeyPass[0]; + return LO_PASS_OK; } if(x == 64) { multiKeyMode = 64; - return multiKeyPass[0]; + *pass = multiKeyPass[0]; + return LO_PASS_OK; } p = multiKeyPass[0]; } @@ -531,6 +539,9 @@ static char *sGetPass(int minLen, int wa } p = getpass(_("Retype password: ")); + alarm(0); + if (timeout) + return LO_PASS_EMPTY; if(!p) goto nomem; if(strcmp(s, p)) goto compareErr; memset(s, 0, i); @@ -538,17 +549,25 @@ static char *sGetPass(int minLen, int wa ask2 = 0; } p = do_GPG_pipe(p); - if(!p) return(NULL); + if(!p) + return LO_PASS_ERR; if(!p[0]) { fprintf(stderr, _("Error: gpg key file decryption failed\n")); - return(NULL); + return LO_PASS_ERR; + } + if(multiKeyMode) { + *pass = p; + return LO_PASS_OK; } - if(multiKeyMode) return(p); } i = strlen(p); + if(i == 0) { + fprintf(stderr, _("Error: Empty password\n")); + return LO_PASS_EMPTY; + } if(i < minLen) { fprintf(stderr, _("Error: Password must be at least %d characters.\n"), minLen); - return(NULL); + return LO_PASS_SHORT; } seed = passSeedString; if(!seed) seed = ""; @@ -556,7 +575,7 @@ static char *sGetPass(int minLen, int wa if(!s) { nomem: fprintf(stderr, _("Error: Unable to allocate memory\n")); - return(NULL); + return LO_PASS_ERR; } strcpy(s, p); memset(p, 0, i); @@ -571,11 +590,14 @@ static char *sGetPass(int minLen, int wa } p = getpass(_("Retype password: ")); + alarm(0); + if (timeout) + return LO_PASS_EMPTY; if(!p) goto nomem; if(strcmp(s, p)) { compareErr: fprintf(stderr, _("Error: Passwords are not identical\n")); - return(NULL); + return LO_PASS_ERR; } memset(p, 0, i); } @@ -583,7 +605,8 @@ static char *sGetPass(int minLen, int wa fprintf(stderr, _("WARNING - Please use longer password (%d or more characters)\n"), SUSE_PASSWORD_MIN_LENGTH); } strcat(s, seed); - return(s); + *pass = s; + return LO_PASS_OK; } /* this is for compatibility with historic loop-AES version */ @@ -788,6 +811,7 @@ set_loop(const char *device, const char unsigned char multiKeyBits[65][32]; int minPassLen = SUSE_PASSWORD_MIN_LENGTH; int run_mkfs_command = 0; + int ret; loopFileName = (char *)file; multiKeyMode = 0; @@ -848,8 +872,8 @@ set_loop(const char *device, const char loopinfo.lo_encrypt_key_size = 0; break; case LO_CRYPT_XOR: - pass = sGetPass (1, 0); - if(!pass) goto close_fd_ffd_return1; + ret = sGetPass (&pass, 1, 0); + if(ret) goto close_fd_ffd_return1; xstrncpy (loopinfo.lo_encrypt_key, pass, LO_KEY_SIZE); loopinfo.lo_encrypt_key_size = strlen(loopinfo.lo_encrypt_key); break; @@ -886,6 +910,7 @@ set_loop(const char *device, const char /* This is not compatible with gpgkey= mount option */ if(rd_wr_retry(atoi(passFDnumber), (char *)&loopinfo.lo_encrypt_key[0], LO_KEY_SIZE, 0) < 1) { fprintf(stderr, _("Error: couldn't read binary key\n")); + ret = 1; goto close_fd_ffd_return1; } break; /* out of switch(loopinfo.lo_encrypt_type) */ @@ -894,6 +919,7 @@ set_loop(const char *device, const char /* WARNING! DO NOT USE RANDOM HASH TYPE ON PARTITION WITH EXISTING */ /* IMPORTANT DATA ON IT. RANDOM HASH TYPE WILL DESTROY YOUR DATA. */ if(loop_create_random_keys((char*)file, *loopro, &multiKeyBits[0][0])) { + ret = 1; goto close_fd_ffd_return1; } memcpy(&loopinfo.lo_encrypt_key[0], &multiKeyBits[0][0], sizeof(loopinfo.lo_encrypt_key)); @@ -901,8 +927,8 @@ set_loop(const char *device, const char break; /* out of switch(loopinfo.lo_encrypt_type) */ } } - pass = sGetPass (minPassLen, SUSE_PASSWORD_MIN_LENGTH); - if(!pass) goto close_fd_ffd_return1; + ret = sGetPass (&pass, minPassLen, SUSE_PASSWORD_MIN_LENGTH); + if(ret) goto close_fd_ffd_return1; i = strlen(pass); if(hashFunc == unhashed1_key_setup) { /* this is for compatibility with historic loop-AES version */ @@ -966,6 +992,7 @@ set_loop(const char *device, const char break; default: fprintf (stderr, _("Error: don't know how to get key for encryption system %d\n"), loopinfo.lo_encrypt_type); + ret = 1; goto close_fd_ffd_return1; } @@ -985,7 +1012,7 @@ close_fd_ffd_return1: close (fd); close_ffd_return1: close (ffd); - return 1; + return ret; } /* type 18 == LO_CRYPT_CRYPTOAPI */ Index: util-linux-2.12r/mount/losetup.8 =================================================================== --- util-linux-2.12r.orig/mount/losetup.8 +++ util-linux-2.12r/mount/losetup.8 @@ -143,6 +143,10 @@ displays the status of a loop device, it is not configured and 2 if an error occurred which prevented .B losetup from determining the status of the device. +When using encryption +.B losetup +returns 5 if the passphrase is empty or a timeout occurred and 6 if +the passphrase is too short. .SH FILES .nf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit FA_clxclient
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package FA_clxclient checked in at Tue Dec 12 23:07:40 CET 2006. -------- --- FA_clxclient/FA_clxclient.changes 2006-09-18 16:37:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/FA_clxclient/FA_clxclient.changes 2006-12-12 18:52:18.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 12 18:51:53 CET 2006 - mkoenig(a)suse.de + +- update to version 3.3.1: + * minor fixes + +------------------------------------------------------------------- Old: ---- clxclient-3.3.0-1.tar.bz2 New: ---- clxclient-3.3.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FA_clxclient.spec ++++++ --- /var/tmp/diff_new_pack.c6SKF3/_old 2006-12-12 23:07:32.000000000 +0100 +++ /var/tmp/diff_new_pack.c6SKF3/_new 2006-12-12 23:07:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package FA_clxclient (Version 3.3.0) +# spec file for package FA_clxclient (Version 3.3.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,14 +13,14 @@ Name: FA_clxclient BuildRequires: FA_clthreads >= 2.2.0 alsa-devel gcc-c++ xorg-x11-devel Requires: FA_clthreads >= 2.2.0 -URL: http://users.skynet.be/solaris/linuxaudio -License: GPL +URL: http://www.kokkinizita.net/linuxaudio +License: GNU General Public License (GPL) Group: Development/Libraries/Other Autoreqprov: on -Version: 3.3.0 +Version: 3.3.1 Release: 1 Summary: Library Required for AEOLUS and JAAA -Source: clxclient-%{version}-1.tar.bz2 +Source: clxclient-%{version}.tar.bz2 Patch0: FA_clxclient-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -64,9 +64,12 @@ # %doc %{_docdir}/%{name} %changelog -n FA_clxclient +* Tue Dec 12 2006 - mkoenig(a)suse.de +- update to version 3.3.1: + * minor fixes * Mon Sep 18 2006 - mkoenig(a)suse.de - update to version 3.3.0-1 -- removed X_browse, mouse handling reworked + - removed X_browse, mouse handling reworked * Wed Jan 25 2006 - mls(a)suse.de - converted neededforbuild to BuildRequires * Wed Oct 12 2005 - meissner(a)suse.de ++++++ clxclient-3.3.0-1.tar.bz2 -> clxclient-3.3.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/clxclient-3.3.0/Makefile new/clxclient-3.3.1/Makefile --- old/clxclient-3.3.0/Makefile 2006-05-15 19:03:42.000000000 +0200 +++ new/clxclient-3.3.1/Makefile 2006-10-08 16:59:35.000000000 +0200 @@ -23,7 +23,7 @@ MAJVERS = 3 -MINVERS = 3.0 +MINVERS = 3.1 VERSION = $(MAJVERS).$(MINVERS) DISTDIR = clxclient-$(VERSION) @@ -47,6 +47,7 @@ install: $(CLXCLIENT_MIN) + /usr/bin/install -d $(PREFIX)/$(LIBDIR) /usr/bin/install -m 644 $(CLXCLIENT_H) $(PREFIX)/include /usr/bin/install -m 755 $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR) /sbin/ldconfig -n $(PREFIX)/$(LIBDIR) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/clxclient-3.3.0/button.cc new/clxclient-3.3.1/button.cc --- old/clxclient-3.3.0/button.cc 2006-05-05 21:24:32.000000000 +0200 +++ new/clxclient-3.3.1/button.cc 2006-10-08 16:55:13.000000000 +0200 @@ -241,7 +241,7 @@ XSetState (dpy (), dgc (), f, b, GXcopy, ~0); XSetWindowBackground (dpy (), win (), b); XClearWindow (dpy (), win ()); - XPutImage (dpy (), win (), dgc (), _image, 0, 0, (_xs - _image->width) / 2, (_ys - _image->height) / 2, _xs, _ys); + if (_image) XPutImage (dpy (), win (), dgc (), _image, 0, 0, (_xs - _image->width) / 2, (_ys - _image->height) / 2, _xs, _ys); if ((_style->type & 255) == X_button_style::BORDER) { XSetLineAttributes (dpy (), dgc (), 1, LineSolid, CapButt, JoinBevel); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/clxclient-3.3.0/clxclient.h new/clxclient-3.3.1/clxclient.h --- old/clxclient-3.3.0/clxclient.h 2006-05-07 13:23:11.000000000 +0200 +++ new/clxclient-3.3.1/clxclient.h 2006-10-08 16:55:13.000000000 +0200 @@ -58,6 +58,7 @@ unsigned long alloc_color (const char *name, unsigned long d); XftColor *alloc_xftcolor (const char *name, XftColor *D); + XftColor *alloc_xftcolor (float r, float g, float b, float a); void free_xftcolor (XftColor *C); XFontStruct *alloc_font (const char *name); @@ -573,6 +574,7 @@ float offs (void) const { return _offs; } float frac (void) const { return _frac; } void geom (float offs, float frac, int size = 0); + void move (float drel); private: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/clxclient-3.3.0/scroll.cc new/clxclient-3.3.1/scroll.cc --- old/clxclient-3.3.0/scroll.cc 2006-05-05 21:24:32.000000000 +0200 +++ new/clxclient-3.3.1/scroll.cc 2006-10-08 16:55:13.000000000 +0200 @@ -151,8 +151,8 @@ k = (_xs > _ys) ? E->x - 1 : E->y - 1; if (! _callb || (k < 0) || (k >= _km)) return; k -= _k0; - if (k >= _dk) _callb->handle_callb (X_callback::SCROLL | ((E->button == Button3) ? C3LU : C1LU), this, 0); - else if (k < 0) _callb->handle_callb (X_callback::SCROLL | ((E->button == Button3) ? C3RD : C1RD), this, 0); + if (k >= _dk) _callb->handle_callb (X_callback::SCROLL | ((E->button == Button3) ? C3RD : C1RD), this, 0); + else if (k < 0) _callb->handle_callb (X_callback::SCROLL | ((E->button == Button3) ? C3LU : C1LU), this, 0); else _zz = k + _k0; } @@ -225,6 +225,15 @@ } +void X_scroll::move (float drel) +{ + _offs += drel * _frac; + if (_offs < 0.0f) _offs = 0.0f; + if (_offs > 1.0f) _offs = 1.0f; + redraw (); +} + + void X_scroll::redraw (void) { _dk = (int)(_frac * _km + 0.5f); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/clxclient-3.3.0/textip.cc new/clxclient-3.3.1/textip.cc --- old/clxclient-3.3.0/textip.cc 2006-05-05 21:24:32.000000000 +0200 +++ new/clxclient-3.3.1/textip.cc 2006-08-04 23:29:02.000000000 +0200 @@ -557,7 +557,7 @@ _xc = _x0 + textwidth (0, _ic); _x1 = _xc + textwidth (_ic, _i1 - _ic); - + if (_flags & RIGHT) { d = _x1 - _xs + DX; @@ -581,6 +581,7 @@ XftDraw *D = xft (); XftColor *C; + XSetWindowBackground (dpy (), win (), (_flags & FOCUS) ? _style->color.focus.bgnd : _bg); XClearWindow (dpy (), win ()); if (_i1) { @@ -602,7 +603,7 @@ XDrawPoint (dpy (), win (), gc, 0, _ys - 1); XDrawPoint (dpy (), win (), gc, _xs - 1, 0); } - if (_flags & FOCUS) xorcursor (); + xorcursor (); } @@ -612,7 +613,6 @@ { _flags ^= FOCUS; x_add_events (KeyPressMask); - XSetWindowBackground (dpy (), win (), _style->color.focus.bgnd); XSetICValues (_xic, XNFocusWindow, win (), NULL); redraw (); } @@ -625,7 +625,6 @@ { _flags ^= FOCUS; x_rem_events (KeyPressMask); - XSetWindowBackground (dpy (), win (), _bg); redraw (); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/clxclient-3.3.0/xdisplay.cc new/clxclient-3.3.1/xdisplay.cc --- old/clxclient-3.3.0/xdisplay.cc 2006-05-05 21:24:32.000000000 +0200 +++ new/clxclient-3.3.1/xdisplay.cc 2006-06-19 00:23:15.000000000 +0200 @@ -23,21 +23,26 @@ X_display::X_display (const char *name) : _dsn (0), _dcm (0), _dgc (0), _dvi (0), _xft (0) { - int i; + int i; + XImage *I; _dpy = XOpenDisplay (name); - if (_dpy) + if (! _dpy) return; + + _dsn = DefaultScreen (_dpy); + _dcm = DefaultColormap (_dpy, _dsn); + _dgc = DefaultGC (_dpy, _dsn); + _dvi = DefaultVisual (_dpy, _dsn); + _xim = XOpenIM (_dpy, 0, 0, 0); + + for (i = 0; i < N_IMG1515; i++) { - _dsn = DefaultScreen (_dpy); - _dcm = DefaultColormap (_dpy, _dsn); - _dgc = DefaultGC (_dpy, _dsn); - _dvi = DefaultVisual (_dpy, _dsn); - _xim = XOpenIM (_dpy, 0, 0, 0); - - for (i = 0; i < N_IMG1515; i++) - { - _imgptr1515 [i] = XCreateImage (_dpy, _dvi, 1, XYBitmap, 0, _imgdef1515 + 30 * i, 15, 15, 8, 2); - } + I = XCreateImage (_dpy, _dvi, 1, XYBitmap, 0, _imgdef1515 + 30 * i, 15, 15, 8, 2); + I->bitmap_unit = 8; + I->bitmap_pad = 8; + I->bitmap_bit_order = LSBFirst; + XInitImage (I); + _imgptr1515 [i] = I; } } @@ -88,6 +93,21 @@ } +XftColor *X_display::alloc_xftcolor (float r, float g, float b, float a) +{ + XftColor *C = new XftColor; + XRenderColor R; + + R.red = (int)(65535 * r); + R.green = (int)(65535 * g); + R.blue = (int)(65535 * b); + R.alpha = (int)(65535 * a); + + XftColorAllocValue (_dpy, _dvi, _dcm, &R, C); + return C; +} + + void X_display::free_xftcolor (XftColor *C) { XftColorFree (_dpy, _dvi, _dcm, C); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit FA_clthreads
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package FA_clthreads checked in at Tue Dec 12 23:07:25 CET 2006. -------- --- FA_clthreads/FA_clthreads.changes 2006-09-18 16:32:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/FA_clthreads/FA_clthreads.changes 2006-12-12 18:48:29.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 12 18:47:34 CET 2006 - mkoenig(a)suse.de + +- update to version 2.2.1: + * minor fixes + +------------------------------------------------------------------- Old: ---- clthreads-2.2.0-1.tar.bz2 New: ---- clthreads-2.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ FA_clthreads.spec ++++++ --- /var/tmp/diff_new_pack.M3nQFQ/_old 2006-12-12 23:07:02.000000000 +0100 +++ /var/tmp/diff_new_pack.M3nQFQ/_new 2006-12-12 23:07:02.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package FA_clthreads (Version 2.2.0) +# spec file for package FA_clthreads (Version 2.2.1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,14 +12,14 @@ Name: FA_clthreads BuildRequires: gcc-c++ -URL: http://users.skynet.be/solaris/linuxaudio -License: GPL +URL: http://www.kokkinizita.net/linuxaudio +License: GNU General Public License (GPL) Group: Development/Libraries/Other Autoreqprov: on -Version: 2.2.0 +Version: 2.2.1 Release: 1 Summary: Library Required for AEOLUS and JAAA -Source: clthreads-%{version}-1.tar.bz2 +Source: clthreads-%{version}.tar.bz2 Patch: %{name}-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -60,6 +60,9 @@ # %doc %{_docdir}/%{name} %changelog -n FA_clthreads +* Tue Dec 12 2006 - mkoenig(a)suse.de +- update to version 2.2.1: + * minor fixes * Thu Sep 14 2006 - mkoenig(a)suse.de - update to version 2.2.0-1 cleanup release ++++++ clthreads-2.2.0-1.tar.bz2 -> clthreads-2.2.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/clthreads-2.2.0/Makefile new/clthreads-2.2.1/Makefile --- old/clthreads-2.2.0/Makefile 2006-05-15 19:00:01.000000000 +0200 +++ new/clthreads-2.2.1/Makefile 2006-11-23 19:01:20.000000000 +0100 @@ -23,7 +23,7 @@ MAJVERS = 2 -MINVERS = 2.0 +MINVERS = 2.1 VERSION = $(MAJVERS).$(MINVERS) DISTDIR = clthreads-$(VERSION) @@ -46,6 +46,7 @@ install: $(CLTHREADS_MIN) + /usr/bin/install -d $(PREFIX)/$(LIBDIR) /usr/bin/install -m 644 $(CLTHREADS_H) $(PREFIX)/include /usr/bin/install -m 755 $(CLTHREADS_MIN) $(PREFIX)/$(LIBDIR) /sbin/ldconfig -n $(PREFIX)/$(LIBDIR) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/clthreads-2.2.0/clthreads.h new/clthreads-2.2.1/clthreads.h --- old/clthreads-2.2.0/clthreads.h 2006-05-09 19:31:00.000000000 +0200 +++ new/clthreads-2.2.1/clthreads.h 2006-11-23 19:01:20.000000000 +0100 @@ -147,6 +147,7 @@ _event = EV_ERROR; _emask = m; + do { if (t) r = pthread_cond_timedwait (&_cond, &_mutex, t); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/clthreads-2.2.0/itc_ctrl.cc new/clthreads-2.2.1/itc_ctrl.cc --- old/clthreads-2.2.0/itc_ctrl.cc 2006-05-05 21:23:06.000000000 +0200 +++ new/clthreads-2.2.1/itc_ctrl.cc 2006-11-23 19:01:20.000000000 +0100 @@ -48,7 +48,7 @@ else { timespec t; - clock_gettime (0, &t); + clock_gettime (CLOCK_REALTIME, &t); _time.tv_sec = t.tv_sec; _time.tv_nsec = t.tv_nsec; } @@ -63,7 +63,7 @@ m = micros % 1000000; _time.tv_nsec += 1000 * m; - if (_time.tv_nsec > 1000000000) + if (_time.tv_nsec >= 1000000000) { _time.tv_nsec -= 1000000000; s += 1; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gzip
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package gzip checked in at Tue Dec 12 23:06:57 CET 2006. -------- --- gzip/gzip.changes 2006-12-07 11:19:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/gzip/gzip.changes 2006-12-12 10:11:12.000000000 +0100 @@ -1,0 +2,9 @@ +Tue Dec 12 10:10:38 CET 2006 - schwab(a)suse.de + +- Update to gzip 1.3.8. + * Fix some gzip problems: + - A security fix from Debian 1.3.5-5 was inadvertently omitted. + - The assembler is now invoked with --noexecstack if supported, + so that gzip can better resist stack-smashing attacks. + +------------------------------------------------------------------- Old: ---- gzip-1.3.7.tar.gz New: ---- gzip-1.3.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gzip.spec ++++++ --- /var/tmp/diff_new_pack.j4qmlT/_old 2006-12-12 23:06:42.000000000 +0100 +++ /var/tmp/diff_new_pack.j4qmlT/_new 2006-12-12 23:06:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gzip (Version 1.3.7) +# spec file for package gzip (Version 1.3.8) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -17,7 +17,7 @@ Group: Productivity/Archiving/Compression Autoreqprov: on PreReq: %{install_info_prereq} -Version: 1.3.7 +Version: 1.3.8 Release: 1 Summary: GNU Zip Compression Utilities Source: %{name}-%{version}.tar.gz @@ -111,6 +111,12 @@ %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %changelog -n gzip +* Tue Dec 12 2006 - schwab(a)suse.de +- Update to gzip 1.3.8. + * Fix some gzip problems: + - A security fix from Debian 1.3.5-5 was inadvertently omitted. + - The assembler is now invoked with --noexecstack if supported, + so that gzip can better resist stack-smashing attacks. * Thu Dec 07 2006 - schwab(a)suse.de - Update to gzip 1.3.7. * Fix some gzip problems: ++++++ gzip-1.3.7.tar.gz -> gzip-1.3.8.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/ChangeLog new/gzip-1.3.8/ChangeLog --- old/gzip-1.3.7/ChangeLog 2006-12-07 08:51:55.000000000 +0100 +++ new/gzip-1.3.8/ChangeLog 2006-12-09 08:19:57.000000000 +0100 @@ -1,3 +1,63 @@ +2006-12-08 Paul Eggert <eggert(a)cs.ucla.edu> + + * NEWS, configure.ac (AC_INIT): + Version 1.3.8 released. + + * gzexe.in (mktemp_status): New var, used to see whether + mktemp is a known command. Use this instead of confounding + mktemp's existence with its success. + + * zdiff.in: Remove first line containing ":". This follows + up on the SEDCMD fix of 2006-12-01. + * zforce.in: Likewise. + * zgrep.in: Likewise. + * zless.in: Likewise. + * zmore.in: Likewise. + * znew.in: Likewise. + + Fix problems in porting to NSK reported by Matthew Woehlke in + <http://lists.gnu.org/archive/html/bug-gzip/2006-12/msg00025.html> and + <http://lists.gnu.org/archive/html/bug-gzip/2006-12/msg00027.html>. + * gzip.h: Include <limits.h>, for SSIZE_MAX. + (INBUFSIZE): Don't make it any larger than SSIZE_MAX. + Problem reported by Matthew Woehlke in + <http://lists.gnu.org/archive/html/bug-gzip/2006-11/msg00013.html>. + * gzip.c: Don't include <limits.h>, as gzip.h now does this. + * util.c: Likewise. + * gzip.c (main): Set exiting_signal before installing signal handlers. + (install_signal_handlers): Don't set exiting_signal here. This + fixes a C99ism. + * zip.c: Include timespec.h, for time_stamp type. + +2006-12-08 Ralf Wildenhues <Ralf.Wildenhues(a)gmx.de> (tiny change) + + * gzexe.in: Work around FreeBSD shell trap bug. + * gzip.1: Fix typo. + * doc/gzip.texi: Likewise. + +2006-12-08 Paul Eggert <eggert(a)cs.ucla.edu> + + * .cvsignore: Add .deps, gzexe, gzip, zdiff, zforce, zgrep, + zless, zmore, znew. + * doc/.cvsignore: Add Makefile. + * lib/.cvsignore: Add .deps, Makefile, alloca.h, config.h, fcntl.h, + stamp-h1, stdint.h, sys. + + * configure.ac (for assembler): Set ASFLAGS_config to + -Wa,--noexecstack if this seems advisable on this platform. + Problem reported by Mike Frysinger in + <http://lists.gnu.org/archive/html/bug-gzip/2006-12/msg00018.html>. + * lib/Makefile.am (match.$(OBJEXT)): Use ASFLAGS_config. + +2006-12-07 Paul Eggert <eggert(a)cs.ucla.edu> + + * Makefile.am (install-exec-hook): Fix bug when installing + symbolic links as aliases. Problem reported by Mike Frysinger. + + * deflate.c (deflate_fast, deflate): Avoid core dump. Problem + originally reported by Jochen Friedrich and trivial patch supplied + by Anthony Towns; see <http://bugs.debian.org/184057>. + 2006-12-06 Paul Eggert <eggert(a)cs.ucla.edu> * NEWS, configure.ac (AC_INIT): diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/Makefile.am new/gzip-1.3.8/Makefile.am --- old/gzip-1.3.7/Makefile.am 2006-12-07 08:23:35.000000000 +0100 +++ new/gzip-1.3.8/Makefile.am 2006-12-08 01:08:54.000000000 +0100 @@ -79,16 +79,16 @@ transform='$(transform)'; \ test "X$$prog" = "X$$prog_ext" || \ transform="$$transform"';s/$$/$(EXEEXT)/'; \ - source=$(DESTDIR)$(bindir)/`echo "$$prog"|sed "$$transform"`; \ + destbindir=$(DESTDIR)$(bindir); \ + source=`echo "$$prog"|sed "$$transform"`; \ for alias in $$aliases; do \ - dest=$(DESTDIR)$(bindir)/`echo "$$alias"|sed "$$transform"`; \ + dest=`echo "$$alias"|sed "$$transform"`; \ (set -x; \ + cd "$$destbindir" && \ rm -f "$$dest" && \ case $@ in \ install-exec-hook) \ - for ln in ln "$(LN_S)"; do \ - $$ln "$$source" "$$dest" && break; \ - done;; \ + ln "$$source" "$$dest" || $(LN_S) "$$source" "$$dest";; \ esac \ ) || exit; \ done; \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/Makefile.in new/gzip-1.3.8/Makefile.in --- old/gzip-1.3.7/Makefile.in 2006-12-07 08:56:09.000000000 +0100 +++ new/gzip-1.3.8/Makefile.in 2006-12-09 08:22:50.000000000 +0100 @@ -140,6 +140,7 @@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ ASCPP = @ASCPP@ +ASFLAGS_config = @ASFLAGS_config@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -916,16 +917,16 @@ transform='$(transform)'; \ test "X$$prog" = "X$$prog_ext" || \ transform="$$transform"';s/$$/$(EXEEXT)/'; \ - source=$(DESTDIR)$(bindir)/`echo "$$prog"|sed "$$transform"`; \ + destbindir=$(DESTDIR)$(bindir); \ + source=`echo "$$prog"|sed "$$transform"`; \ for alias in $$aliases; do \ - dest=$(DESTDIR)$(bindir)/`echo "$$alias"|sed "$$transform"`; \ + dest=`echo "$$alias"|sed "$$transform"`; \ (set -x; \ + cd "$$destbindir" && \ rm -f "$$dest" && \ case $@ in \ install-exec-hook) \ - for ln in ln "$(LN_S)"; do \ - $$ln "$$source" "$$dest" && break; \ - done;; \ + ln "$$source" "$$dest" || $(LN_S) "$$source" "$$dest";; \ esac \ ) || exit; \ done; \ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/NEWS new/gzip-1.3.8/NEWS --- old/gzip-1.3.7/NEWS 2006-12-07 08:51:55.000000000 +0100 +++ new/gzip-1.3.8/NEWS 2006-12-09 08:19:57.000000000 +0100 @@ -1,3 +1,10 @@ +Major changes in Gzip 1.3.8 (2006-12-08) + +* Fix some gzip problems: + - A security fix from Debian 1.3.5-5 was inadvertently omitted. + - The assembler is now invoked with --noexecstack if supported, + so that gzip can better resist stack-smashing attacks. + Major changes in Gzip 1.3.7 (2006-12-06) * Fix some gzip problems: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/configure new/gzip-1.3.8/configure --- old/gzip-1.3.7/configure 2006-12-07 08:56:04.000000000 +0100 +++ new/gzip-1.3.8/configure 2006-12-09 08:22:46.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for gzip 1.3.7. +# Generated by GNU Autoconf 2.61 for gzip 1.3.8. # # Report bugs to <bug-gzip(a)gnu.org>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='gzip' PACKAGE_TARNAME='gzip' -PACKAGE_VERSION='1.3.7' -PACKAGE_STRING='gzip 1.3.7' +PACKAGE_VERSION='1.3.8' +PACKAGE_STRING='gzip 1.3.8' PACKAGE_BUGREPORT='bug-gzip(a)gnu.org' ac_unique_file="gzip.c" @@ -735,6 +735,7 @@ LIBGZIP_LIBDEPS LIBGZIP_LTLIBDEPS LIBOBJS +ASFLAGS_config ac_prefix_program ASCPP LTLIBOBJS @@ -1252,7 +1253,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gzip 1.3.7 to adapt to many kinds of systems. +\`configure' configures gzip 1.3.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1318,7 +1319,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gzip 1.3.7:";; + short | recursive ) echo "Configuration of gzip 1.3.8:";; esac cat <<\_ACEOF @@ -1411,7 +1412,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gzip configure 1.3.7 +gzip configure 1.3.8 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1425,7 +1426,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gzip $as_me 1.3.7, which was +It was created by gzip $as_me 1.3.8, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2144,7 +2145,7 @@ # Define the identity of the package. PACKAGE='gzip' - VERSION='1.3.7' + VERSION='1.3.8' cat >>confdefs.h <<_ACEOF @@ -12765,7 +12766,7 @@ # Try to assemble match.S. -# "gcc -E match.s" ignores -E, so we must use match.S. +# "gcc -E match.s" ignores -E, so we must use match_.s. { echo "$as_me:$LINENO: checking for assembler" >&5 echo $ECHO_N "checking for assembler... $ECHO_C" >&6; } if test "${gzip_cv_assembler+set}" = set; then @@ -12781,15 +12782,23 @@ : elif eval "$CC -c match_.s >/dev/null 2>&1" && test -f match_.$OBJEXT; then + rm -f match_.$OBJEXT gzip_cv_assembler=yes + if echo 'void foo (void) {}' > conftest.c && + eval "$CC -S conftest.c >/dev/null 2>&1" && + grep '\.note\.GNU-stack' conftest.s >/dev/null 2>&1 && + eval "$CC -c -Wa,--noexecstack match_.s >/dev/null 2>&1" && + test -f match_.$OBJEXT; then + gzip_cv_assembler='yes, with -Wa,--noexecstack' + fi fi fi - rm -f _match.S match_.s match_.$OBJEXT;; + rm -f conftest* _match.S match_.s match_.$OBJEXT;; esac fi { echo "$as_me:$LINENO: result: $gzip_cv_assembler" >&5 echo "${ECHO_T}$gzip_cv_assembler" >&6; } -if test $gzip_cv_assembler = yes; then +if test "$gzip_cv_assembler" != no; then cat >>confdefs.h <<\_ACEOF #define ASMV @@ -12802,6 +12811,12 @@ esac fi +if test "$gzip_cv_assembler" = 'yes, with -Wa,--noexecstack'; then + ASFLAGS_config='-Wa,--noexecstack' +else + ASFLAGS_config= +fi + { echo "$as_me:$LINENO: checking for library containing strerror" >&5 echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; } @@ -14159,7 +14174,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gzip $as_me 1.3.7, which was +This file was extended by gzip $as_me 1.3.8, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14212,7 +14227,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -gzip config.status 1.3.7 +gzip config.status 1.3.8 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -14552,6 +14567,7 @@ LIBGZIP_LIBDEPS!$LIBGZIP_LIBDEPS$ac_delim LIBGZIP_LTLIBDEPS!$LIBGZIP_LTLIBDEPS$ac_delim LIBOBJS!$LIBOBJS$ac_delim +ASFLAGS_config!$ASFLAGS_config$ac_delim ac_prefix_program!$ac_prefix_program$ac_delim ASCPP!$ASCPP$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim @@ -14559,7 +14575,7 @@ gl_LTLIBOBJS!$gl_LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 26; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 27; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/configure.ac new/gzip-1.3.8/configure.ac --- old/gzip-1.3.7/configure.ac 2006-12-07 08:51:55.000000000 +0100 +++ new/gzip-1.3.8/configure.ac 2006-12-09 08:19:57.000000000 +0100 @@ -19,7 +19,7 @@ # 02111-1307, USA. AC_PREREQ([2.60]) -AC_INIT([gzip], [1.3.7], [bug-gzip(a)gnu.org] +AC_INIT([gzip], [1.3.8], [bug-gzip(a)gnu.org] AC_CONFIG_SRCDIR(gzip.c) AC_CONFIG_AUX_DIR(build-aux) AC_CONFIG_HEADERS([lib/config.h:lib/config.hin]) @@ -52,7 +52,7 @@ AC_OBJEXT # Try to assemble match.S. -# "gcc -E match.s" ignores -E, so we must use match.S. +# "gcc -E match.s" ignores -E, so we must use match_.s. AC_CACHE_CHECK([for assembler], [gzip_cv_assembler], [gzip_cv_assembler=no case " $DEFS " in @@ -64,16 +64,30 @@ : elif eval "$CC -c match_.s >/dev/null 2>&1" && test -f match_.$OBJEXT; then + rm -f match_.$OBJEXT gzip_cv_assembler=yes + if echo 'void foo (void) {}' > conftest.c && + eval "$CC -S conftest.c >/dev/null 2>&1" && + grep '\.note\.GNU-stack' conftest.s >/dev/null 2>&1 && + eval "$CC -c -Wa,--noexecstack match_.s >/dev/null 2>&1" && + test -f match_.$OBJEXT; then + gzip_cv_assembler='yes, with -Wa,--noexecstack' + fi fi fi - rm -f _match.S match_.s match_.$OBJEXT;; + rm -f conftest* _match.S match_.s match_.$OBJEXT;; esac]) -if test $gzip_cv_assembler = yes; then +if test "$gzip_cv_assembler" != no; then AC_DEFINE(ASMV, , [Define if an assembler version of longest_match is available.]) AC_LIBOBJ(match) fi +if test "$gzip_cv_assembler" = 'yes, with -Wa,--noexecstack'; then + ASFLAGS_config='-Wa,--noexecstack' +else + ASFLAGS_config= +fi +AC_SUBST([ASFLAGS_config]) AC_ISC_POSIX AC_C_CONST diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/deflate.c new/gzip-1.3.8/deflate.c --- old/gzip-1.3.7/deflate.c 2006-11-20 09:40:33.000000000 +0100 +++ new/gzip-1.3.8/deflate.c 2006-12-08 00:53:00.000000000 +0100 @@ -82,7 +82,7 @@ #include "lzw.h" /* just for consistency checking */ #ifdef RCSID -static char rcsid[] = "$Id: deflate.c,v 1.4 2006/11/20 08:40:33 eggert Exp $"; +static char rcsid[] = "$Id: deflate.c,v 1.5 2006/12/07 23:53:00 eggert Exp $"; #endif /* =========================================================================== @@ -607,7 +607,8 @@ /* Find the longest match, discarding those <= prev_length. * At this point we have always match_length < MIN_MATCH */ - if (hash_head != NIL && strstart - hash_head <= MAX_DIST) { + if (hash_head != NIL && strstart - hash_head <= MAX_DIST + && strstart <= window_size - MIN_LOOKAHEAD) { /* To simplify the code, we prevent matches with the string * of window index 0 (in particular we have to avoid a match * of the string with itself at the start of the input file). @@ -695,7 +696,8 @@ match_length = MIN_MATCH-1; if (hash_head != NIL && prev_length < max_lazy_match && - strstart - hash_head <= MAX_DIST) { + strstart - hash_head <= MAX_DIST && + strstart <= window_size - MIN_LOOKAHEAD) { /* To simplify the code, we prevent matches with the string * of window index 0 (in particular we have to avoid a match * of the string with itself at the start of the input file). diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/doc/Makefile.in new/gzip-1.3.8/doc/Makefile.in --- old/gzip-1.3.7/doc/Makefile.in 2006-12-07 08:56:09.000000000 +0100 +++ new/gzip-1.3.8/doc/Makefile.in 2006-12-09 08:22:50.000000000 +0100 @@ -110,6 +110,7 @@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ ASCPP = @ASCPP@ +ASFLAGS_config = @ASFLAGS_config@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/doc/gzip.info new/gzip-1.3.8/doc/gzip.info --- old/gzip-1.3.7/doc/gzip.info 2006-12-07 08:56:34.000000000 +0100 +++ new/gzip-1.3.8/doc/gzip.info 2006-12-09 08:23:22.000000000 +0100 @@ -1,6 +1,6 @@ This is gzip.info, produced by makeinfo version 4.8 from gzip.texi. - This manual is for Gzip (version 1.3.7, 1 December 2006), and + This manual is for Gzip (version 1.3.8, 8 December 2006), and documents commands for compressing and decompressing data. Copyright (C) 1998, 1999, 2001, 2002, 2006 Free Software Foundation, @@ -31,7 +31,7 @@ Compressing Files ***************** -This manual is for Gzip (version 1.3.7, 1 December 2006), and documents +This manual is for Gzip (version 1.3.8, 8 December 2006), and documents commands for compressing and decompressing data. Copyright (C) 1998, 1999, 2001, 2002, 2006 Free Software Foundation, @@ -262,11 +262,11 @@ files is also displayed, unless some sizes are unknown. With `--quiet', the title and totals lines are not displayed. - The `gzip' format represents the the input size modulo 2^32, so - the uncompressed size and compression ratio are listed incorrectly - for uncompressed files 4 GB and larger. To work around this - problem, you can use the following command to discover a large - uncompressed file's true size: + The `gzip' format represents the input size modulo 2^32, so the + uncompressed size and compression ratio are listed incorrectly for + uncompressed files 4 GB and larger. To work around this problem, + you can use the following command to discover a large uncompressed + file's true size: zcat file.gz | wc -c @@ -912,12 +912,12 @@ Node: Overview2133 Node: Sample7309 Node: Invoking gzip8964 -Node: Advanced usage13946 -Node: Environment15536 -Node: Tapes16105 -Node: Problems17120 -Node: Copying This Manual17579 -Node: GNU Free Documentation License17817 -Node: Concept Index40213 +Node: Advanced usage13942 +Node: Environment15532 +Node: Tapes16101 +Node: Problems17116 +Node: Copying This Manual17575 +Node: GNU Free Documentation License17813 +Node: Concept Index40209 End Tag Table diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/doc/gzip.texi new/gzip-1.3.8/doc/gzip.texi --- old/gzip-1.3.7/doc/gzip.texi 2006-12-02 07:13:03.000000000 +0100 +++ new/gzip-1.3.8/doc/gzip.texi 2006-12-08 19:45:37.000000000 +0100 @@ -291,7 +291,7 @@ is also displayed, unless some sizes are unknown. With @samp{--quiet}, the title and totals lines are not displayed. -The @code{gzip} format represents the the input size modulo +The @code{gzip} format represents the input size modulo @math{2^32}, so the uncompressed size and compression ratio are listed incorrectly for uncompressed files 4 GB and larger. To work around this problem, you can use the following command to discover a large diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/doc/stamp-vti new/gzip-1.3.8/doc/stamp-vti --- old/gzip-1.3.7/doc/stamp-vti 2006-12-07 08:56:34.000000000 +0100 +++ new/gzip-1.3.8/doc/stamp-vti 2006-12-09 08:23:22.000000000 +0100 @@ -1,4 +1,4 @@ -@set UPDATED 1 December 2006 +@set UPDATED 8 December 2006 @set UPDATED-MONTH December 2006 -@set EDITION 1.3.7 -@set VERSION 1.3.7 +@set EDITION 1.3.8 +@set VERSION 1.3.8 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/doc/version.texi new/gzip-1.3.8/doc/version.texi --- old/gzip-1.3.7/doc/version.texi 2006-12-07 08:56:34.000000000 +0100 +++ new/gzip-1.3.8/doc/version.texi 2006-12-09 08:23:22.000000000 +0100 @@ -1,4 +1,4 @@ -@set UPDATED 1 December 2006 +@set UPDATED 8 December 2006 @set UPDATED-MONTH December 2006 -@set EDITION 1.3.7 -@set VERSION 1.3.7 +@set EDITION 1.3.8 +@set VERSION 1.3.8 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/gzexe.in new/gzip-1.3.8/gzexe.in --- old/gzip-1.3.7/gzexe.in 2006-12-01 21:52:52.000000000 +0100 +++ new/gzip-1.3.8/gzexe.in 2006-12-09 07:58:27.000000000 +0100 @@ -74,12 +74,13 @@ fi tmp= -trap ' - res=$? +trap 'res=$? test -n "$tmp" && rm -f "$tmp" (exit $res); exit $res ' 0 1 2 3 5 10 13 15 +mktemp_status= + for i do case $i in -*) file=./$i;; @@ -115,8 +116,15 @@ dir=`dirname "$file"` || dir=$TMPDIR test -d "$dir" && test -w "$dir" && test -x "$dir" || dir=/tmp test -n "$tmp" && rm -f "$tmp" - tmp=`TMPDIR=$dir mktemp -t gzexeXXXXXX` || tmp=$dir/gzexe$$ - cp -p "$file" "$tmp" 2>/dev/null || cp "$file" "$tmp" || { + if test -z "$mktemp_status"; then + type mktemp >/dev/null 2>&1 + mktemp_status=$? + fi + if test $mktemp_status -eq 0; then + tmp=`TMPDIR=$dir mktemp -t gzexeXXXXXX` + else + tmp=$dir/gzexe$$ + fi && { cp -p "$file" "$tmp" 2>/dev/null || cp "$file" "$tmp"; } || { res=$? echo >&2 "$0: cannot copy $file" continue @@ -134,7 +142,7 @@ if test $decomp -eq 0; then (cat <<'EOF' && #!/bin/sh -skip=43 +skip=44 tab=' ' nl=' @@ -145,15 +153,16 @@ umask 77 gztmpdir= -trap ' - res=$? +trap 'res=$? test -n "$gztmpdir" && rm -fr "$gztmpdir" (exit $res); exit $res ' 0 1 2 3 5 10 13 15 -gztmpdir=`(mktemp -dt) 2>/dev/null` || - { gztmpdir=/tmp/gztmp$$; mkdir $gztmpdir; } || - { (exit 127); exit 127; } +if type mktemp >/dev/null 2>&1; then + gztmpdir=`mktemp -dt` +else + gztmpdir=/tmp/gztmp$$; mkdir $gztmpdir +fi || { (exit 127); exit 127; } gztmp=$gztmpdir/$0 case $0 in @@ -184,7 +193,7 @@ else # decompression - skip=43 + skip=44 skip_line=`sed -e 1d -e 2q "$file"` case $skip_line in skip=[0-9] | skip=[0-9][0-9] | skip=[0-9][0-9][0-9]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/gzip.1 new/gzip-1.3.8/gzip.1 --- old/gzip-1.3.7/gzip.1 2006-11-26 07:23:40.000000000 +0100 +++ new/gzip-1.3.8/gzip.1 2006-12-08 19:45:37.000000000 +0100 @@ -473,7 +473,7 @@ for reading and writing compressed data on tapes. (This example assumes you are using the GNU version of tar.) .SH BUGS -The gzip format represents the the input size modulo 2^32, so the +The gzip format represents the input size modulo 2^32, so the --list option reports incorrect uncompressed sizes and compression ratios for uncompressed files 4 GB and larger. To work around this problem, you can use the following command to discover a large diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/gzip.c new/gzip-1.3.8/gzip.c --- old/gzip-1.3.7/gzip.c 2006-12-07 07:58:13.000000000 +0100 +++ new/gzip-1.3.8/gzip.c 2006-12-09 02:19:52.000000000 +0100 @@ -54,7 +54,7 @@ */ #ifdef RCSID -static char rcsid[] = "$Id: gzip.c,v 1.8 2006/12/07 06:58:13 eggert Exp $"; +static char rcsid[] = "$Id: gzip.c,v 1.9 2006/12/09 01:19:52 eggert Exp $"; #endif #include <config.h> @@ -85,10 +85,6 @@ # include <fcntl.h> #endif -#ifdef HAVE_LIMITS_H -# include <limits.h> -#endif - #ifdef HAVE_UNISTD_H # include <unistd.h> #endif @@ -539,6 +535,7 @@ ALLOC(ush, tab_prefix1, 1L<<(BITS-1)); #endif + exiting_signal = quiet ? SIGPIPE : 0; install_signal_handlers (); /* And get to work */ @@ -1780,8 +1777,6 @@ int nsigs = sizeof sig / sizeof sig[0]; int i; - exiting_signal = quiet ? SIGPIPE : 0; - #if SA_NOCLDSTOP struct sigaction act; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/gzip.doc new/gzip-1.3.8/gzip.doc --- old/gzip-1.3.7/gzip.doc 2006-12-07 08:56:44.000000000 +0100 +++ new/gzip-1.3.8/gzip.doc 2006-12-09 08:23:32.000000000 +0100 @@ -336,11 +336,11 @@ assumes you are using the GNU version of tar.) BUGS - The gzip format represents the the input size modulo 2^32, so the - --list option reports incorrect uncompressed sizes and compression - ratios for uncompressed files 4 GB and larger. To work around this - problem, you can use the following command to discover a large uncom- - pressed file's true size: + The gzip format represents the input size modulo 2^32, so the --list + option reports incorrect uncompressed sizes and compression ratios for + uncompressed files 4 GB and larger. To work around this problem, you + can use the following command to discover a large uncompressed file's + true size: zcat file.gz | wc -c diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/gzip.h new/gzip-1.3.8/gzip.h --- old/gzip-1.3.7/gzip.h 2006-11-20 09:40:33.000000000 +0100 +++ new/gzip-1.3.8/gzip.h 2006-12-09 02:19:52.000000000 +0100 @@ -59,6 +59,10 @@ # define memzero(s, n) bzero((s), (n)) #endif +#ifdef HAVE_LIMITS_H +# include <limits.h> +#endif + #ifndef RETSIGTYPE # define RETSIGTYPE void #endif @@ -101,6 +105,10 @@ # else # define INBUFSIZ 0x8000 /* input buffer size */ # endif +# if defined SSIZE_MAX && SSIZE_MAX < INBUFSIZ +# undef INBUFSIZ +# define INBUFSIZ SSIZE_MAX +# endif #endif #define INBUF_EXTRA 64 /* required by unlzw() */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/lib/Makefile.am new/gzip-1.3.8/lib/Makefile.am --- old/gzip-1.3.7/lib/Makefile.am 2006-12-07 08:23:35.000000000 +0100 +++ new/gzip-1.3.8/lib/Makefile.am 2006-12-08 10:30:30.000000000 +0100 @@ -28,7 +28,7 @@ match.$(OBJEXT): match.c cp $(srcdir)/match.c _match.S $(ASCPP) _match.S > match_.s - $(CC) -c $(CFLAGS) match_.s + $(CC) -c $(CFLAGS) $(ASFLAGS_config) match_.s mv match_.$(OBJEXT) $@ rm -f _match.S match_.s diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/lib/Makefile.in new/gzip-1.3.8/lib/Makefile.in --- old/gzip-1.3.7/lib/Makefile.in 2006-12-07 08:56:09.000000000 +0100 +++ new/gzip-1.3.8/lib/Makefile.in 2006-12-09 08:22:50.000000000 +0100 @@ -121,6 +121,7 @@ ALLOCA_H = @ALLOCA_H@ AMTAR = @AMTAR@ ASCPP = @ASCPP@ +ASFLAGS_config = @ASFLAGS_config@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -667,7 +668,7 @@ match.$(OBJEXT): match.c cp $(srcdir)/match.c _match.S $(ASCPP) _match.S > match_.s - $(CC) -c $(CFLAGS) match_.s + $(CC) -c $(CFLAGS) $(ASFLAGS_config) match_.s mv match_.$(OBJEXT) $@ rm -f _match.S match_.s # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/util.c new/gzip-1.3.8/util.c --- old/gzip-1.3.7/util.c 2006-11-20 09:40:34.000000000 +0100 +++ new/gzip-1.3.8/util.c 2006-12-09 02:19:53.000000000 +0100 @@ -1,6 +1,7 @@ /* util.c -- utility functions for gzip support - Copyright (C) 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2001, 2002, 2006 Free Software + Foundation, Inc. Copyright (C) 1992-1993 Jean-loup Gailly This program is free software; you can redistribute it and/or modify @@ -18,7 +19,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifdef RCSID -static char rcsid[] = "$Id: util.c,v 1.4 2006/11/20 08:40:34 eggert Exp $"; +static char rcsid[] = "$Id: util.c,v 1.5 2006/12/09 01:19:53 eggert Exp $"; #endif #include <config.h> @@ -27,9 +28,6 @@ #include "tailor.h" -#ifdef HAVE_LIMITS_H -# include <limits.h> -#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/zdiff.in new/gzip-1.3.8/zdiff.in --- old/gzip-1.3.7/zdiff.in 2006-11-20 09:40:34.000000000 +0100 +++ new/gzip-1.3.8/zdiff.in 2006-12-09 05:25:56.000000000 +0100 @@ -1,4 +1,3 @@ -: #!/bin/sh # sh is buggy on RS/6000 AIX 3.2. Replace above line with #!/bin/ksh diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/zforce.in new/gzip-1.3.8/zforce.in --- old/gzip-1.3.7/zforce.in 2006-11-20 09:40:34.000000000 +0100 +++ new/gzip-1.3.8/zforce.in 2006-12-09 05:25:56.000000000 +0100 @@ -1,4 +1,3 @@ -: #!/bin/sh # zforce: force a gz extension on all gzip files so that gzip will not # compress them twice. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/zgrep.in new/gzip-1.3.8/zgrep.in --- old/gzip-1.3.7/zgrep.in 2006-11-26 21:48:29.000000000 +0100 +++ new/gzip-1.3.8/zgrep.in 2006-12-09 05:25:56.000000000 +0100 @@ -1,4 +1,3 @@ -: #!/bin/sh # zgrep -- a wrapper around a grep program that decompresses files as needed diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/zip.c new/gzip-1.3.8/zip.c --- old/gzip-1.3.7/zip.c 2006-11-20 09:40:34.000000000 +0100 +++ new/gzip-1.3.8/zip.c 2006-12-09 02:19:53.000000000 +0100 @@ -18,7 +18,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifdef RCSID -static char rcsid[] = "$Id: zip.c,v 1.4 2006/11/20 08:40:34 eggert Exp $"; +static char rcsid[] = "$Id: zip.c,v 1.5 2006/12/09 01:19:53 eggert Exp $"; #endif #include <config.h> @@ -28,6 +28,8 @@ #include "gzip.h" #include "crypt.h" +#include "timespec.h" + #ifdef HAVE_UNISTD_H # include <unistd.h> #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/zless.in new/gzip-1.3.8/zless.in --- old/gzip-1.3.7/zless.in 2006-11-20 09:40:34.000000000 +0100 +++ new/gzip-1.3.8/zless.in 2006-12-09 05:25:56.000000000 +0100 @@ -1,4 +1,3 @@ -: #!/bin/sh # Copyright (C) 1998, 2002, 2006 Free Software Foundation diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/zmore.in new/gzip-1.3.8/zmore.in --- old/gzip-1.3.7/zmore.in 2006-11-20 09:40:34.000000000 +0100 +++ new/gzip-1.3.8/zmore.in 2006-12-09 05:25:56.000000000 +0100 @@ -1,4 +1,3 @@ -: #!/bin/sh # Copyright (C) 2001, 2002 Free Software Foundation diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/gzip-1.3.7/znew.in new/gzip-1.3.8/znew.in --- old/gzip-1.3.7/znew.in 2006-11-20 09:40:34.000000000 +0100 +++ new/gzip-1.3.8/znew.in 2006-12-09 05:25:56.000000000 +0100 @@ -1,4 +1,3 @@ -: #!/bin/sh # Copyright (C) 1998, 2002, 2004 Free Software Foundation ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit loki_setup
by root＠suse.de 12 Dec '06

12 Dec '06

Hello community, here is the log from the commit of package loki_setup checked in at Tue Dec 12 23:06:36 CET 2006. -------- --- loki_setup/loki_setup.changes 2006-11-07 13:38:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/loki_setup/loki_setup.changes 2006-12-12 11:45:20.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 12 11:45:10 CET 2006 - lnussel(a)suse.de + +- fix some wrong uses of strncat() + +------------------------------------------------------------------- New: ---- loki_setupdb-strncat.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ loki_setup.spec ++++++ --- /var/tmp/diff_new_pack.T4uUwG/_old 2006-12-12 23:06:08.000000000 +0100 +++ /var/tmp/diff_new_pack.T4uUwG/_new 2006-12-12 23:06:08.000000000 +0100 @@ -13,11 +13,11 @@ Name: loki_setup BuildRequires: gpm gtk1-compat-devel gtk2-devel libglade2-devel pkgconfig python python-xml update-desktop-files xdelta %define do_brandelf 1 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) URL: http://icculus.org/loki_setup/ Group: Development/Tools/Other Version: 1.6.5_20060530 -Release: 20 +Release: 27 Summary: Installer Program Mainly for Games BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: loki_setup-current.tar.bz2 @@ -46,6 +46,7 @@ # setupdb Patch20: loki_setupdb-signed-char.diff Patch21: loki_setupdb-Makefile.diff +Patch22: loki_setupdb-strncat.diff # update Patch41: loki_update-adig.diff Patch42: loki_update-snarf.diff @@ -69,7 +70,7 @@ %package -n loki_uninstall Version: 1.0.3_20051201 -Release: 33 +Release: 40 Summary: Uninstall program for games Group: Amusements/Games/Other @@ -86,7 +87,7 @@ %package -n loki_update Version: 1.0.13_20040208 -Release: 68 +Release: 75 Summary: Updater program for games Group: Amusements/Games/Other @@ -106,7 +107,7 @@ { test -d patches || mkdir patches patch=$1; shift; - quilt import "$@" -n ${patch##*/} "$patch" + quilt import "$@" -P ${patch##*/} "$patch" } qpush() { @@ -146,6 +147,7 @@ cd loki_setupdb qpatch %{PATCH20} qpatch %{PATCH21} +qpatch %{PATCH22} qpush cd .. # @@ -401,6 +403,8 @@ %{_datadir}/loki_patch %changelog -n loki_setup +* Tue Dec 12 2006 - lnussel(a)suse.de +- fix some wrong uses of strncat() * Tue Nov 07 2006 - ro(a)suse.de - fix text file permissions (products.txt) * Thu Jun 08 2006 - lnussel(a)suse.de ++++++ loki_setupdb-strncat.diff ++++++ Index: loki_setupdb/convert.c =================================================================== --- loki_setupdb.orig/convert.c +++ loki_setupdb/convert.c @@ -36,8 +36,8 @@ const char *get_path(const char *path) strncpy(buf, path, sizeof(buf)); } else { getcwd(buf, sizeof(buf)); - strncat(buf, "/", sizeof(buf)); - strncat(buf, path, sizeof(buf)); + strncat(buf, "/", sizeof(buf)-strlen(buf)-1); + strncat(buf, path, sizeof(buf)-strlen(buf)-1); } ptr = strrchr(buf, '/'); if ( ptr ) { Index: loki_setupdb/setupdb.c =================================================================== --- loki_setupdb.orig/setupdb.c +++ loki_setupdb/setupdb.c @@ -646,11 +646,11 @@ product_t *loki_create_product(const cha snprintf(homefile, sizeof(homefile), "%s/" LOKI_DIRNAME, detect_home()); mkdir(homefile, 0700); - strncat(homefile, "/installed", sizeof(homefile)-strlen(homefile)); + strncat(homefile, "/installed", sizeof(homefile)-strlen(homefile)-1); mkdir(homefile, 0700); - strncat(homefile, "/", sizeof(homefile)-strlen(homefile)); - strncat(homefile, get_xml_base(), sizeof(homefile)-strlen(homefile)); + strncat(homefile, "/", sizeof(homefile)-strlen(homefile)-1); + strncat(homefile, get_xml_base(), sizeof(homefile)-strlen(homefile)-1); mkdir(homefile, 0700); /* Clean up the root - it can't have a trailing slash */ @@ -667,13 +667,13 @@ product_t *loki_create_product(const cha return NULL; } - strncat(homefile, "/", sizeof(homefile)-strlen(homefile)); - strncat(homefile, name, sizeof(homefile)-strlen(homefile)); - strncat(homefile, ".xml", sizeof(homefile)-strlen(homefile)); - - strncat(manifest, "/", sizeof(manifest)-strlen(manifest)); - strncat(manifest, name, sizeof(manifest)-strlen(manifest)); - strncat(manifest, ".xml", sizeof(manifest)-strlen(manifest)); + strncat(homefile, "/", sizeof(homefile)-strlen(homefile)-1); + strncat(homefile, name, sizeof(homefile)-strlen(homefile)-1); + strncat(homefile, ".xml", sizeof(homefile)-strlen(homefile)-1); + + strncat(manifest, "/", sizeof(manifest)-strlen(manifest)-1); + strncat(manifest, name, sizeof(manifest)-strlen(manifest)-1); + strncat(manifest, ".xml", sizeof(manifest)-strlen(manifest)-1); /* Symlink the file in the 'installed' per-user directory */ @@ -2258,15 +2258,15 @@ int loki_upgrade_uninstall(product_t *pr snprintf(binpath, sizeof(binpath), "%s/" LOKI_DIRNAME "/installed/bin", detect_home()); mkdir(binpath, 0755); - strncat(binpath, "/", sizeof(binpath)); - strncat(binpath, os_name, sizeof(binpath)); + strncat(binpath, "/", sizeof(binpath)-strlen(binpath)-1); + strncat(binpath, os_name, sizeof(binpath)-strlen(binpath)-1); mkdir(binpath, 0755); - strncat(binpath, "/", sizeof(binpath)); - strncat(binpath, detect_arch(), sizeof(binpath)); + strncat(binpath, "/", sizeof(binpath)-strlen(binpath)-1); + strncat(binpath, detect_arch(), sizeof(binpath)-strlen(binpath)-1); mkdir(binpath, 0755); - strncat(binpath, "/uninstall", sizeof(binpath)); + strncat(binpath, "/uninstall", sizeof(binpath)-strlen(binpath)-1); if ( !access(binpath, X_OK) && !access(src_bins, R_OK) ) { char cmd[PATH_MAX]; @@ -2369,7 +2369,7 @@ int loki_upgrade_uninstall(product_t *pr lang); mkdir(binpath, 0755); - strncat(binpath, "/LC_MESSAGES", sizeof(binpath)); + strncat(binpath, "/LC_MESSAGES", sizeof(binpath)-strlen(binpath)-1); mkdir(binpath, 0755); snprintf(binpath, sizeof(binpath), ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0