March 2008 - openSUSE Commits - openSUSE Mailing Lists

commit tar
by root＠Hilbert.suse.de 28 Mar '08

28 Mar '08

Hello community, here is the log from the commit of package tar checked in at Fri Mar 28 18:54:22 CET 2008. -------- --- tar/tar.changes 2007-11-14 18:13:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/tar/tar.changes 2008-03-28 17:01:11.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 28 17:00:19 CET 2008 - mkoenig(a)suse.de + +- apply upstream patch to avoid error message when updating + an archive that does not exist [bnc#347525] + +------------------------------------------------------------------- New: ---- tar-1.19-update_flag.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tar.spec ++++++ --- /var/tmp/diff_new_pack.T17218/_old 2008-03-28 18:54:03.000000000 +0100 +++ /var/tmp/diff_new_pack.T17218/_new 2008-03-28 18:54:03.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package tar (Version 1.19) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 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. # @@ -10,6 +10,7 @@ # norootforbuild + Name: tar BuildRequires: help2man Url: http://www.gnu.org/software/tar/ @@ -19,13 +20,14 @@ PreReq: %install_info_prereq AutoReqProv: on Version: 1.19 -Release: 1 +Release: 24 Summary: GNU implementation of tar ((t)ape (ar)chiver) Source0: %name-%version.tar.bz2 Patch0: tar-disable_languages.patch Patch1: tar-disable-listed02-test.diff Patch2: tar-manpage.patch -Patch6: tar-gcc43.patch +Patch3: tar-gcc43.patch +Patch4: tar-1.19-update_flag.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _bindir /bin @@ -64,7 +66,8 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch6 +%patch3 +%patch4 %build rm -f po/no.* po/ky.* @@ -103,8 +106,12 @@ %clean rm -rf $RPM_BUILD_ROOT + %changelog -* Wed Nov 14 2007 - mkoenig(a)suse.de +* Fri Mar 28 2008 mkoenig(a)suse.de +- apply upstream patch to avoid error message when updating + an archive that does not exist [bnc#347525] +* Wed Nov 14 2007 mkoenig(a)suse.de - update to version 1.19 * New option --exclude-vcs * --exclude-tag and --exclude-cache options now work under @@ -115,22 +122,22 @@ - merged patches: tar-1.15.1-CVE-2001-1267.patch tar-1.17-paxlib-owl-alloca.patch -* Fri Oct 05 2007 - mkoenig(a)suse.de +* Fri Oct 05 2007 mkoenig(a)suse.de - update to version 1.18 Licensed under the GPLv3 - merged patches: tar-1.17-testsuite12.patch -* Mon Oct 01 2007 - mkoenig(a)suse.de +* Mon Oct 01 2007 mkoenig(a)suse.de - fix build with gcc-4.3 -* Fri Aug 31 2007 - mkoenig(a)suse.de +* Fri Aug 31 2007 mkoenig(a)suse.de - fixed another directory traversal vulnerability, CVE-2001-1267, CVE-2002-0399, [#29973] -* Mon Aug 20 2007 - mkoenig(a)suse.de +* Mon Aug 20 2007 mkoenig(a)suse.de - use correct patch for paxlib stack overflow [#301416] -* Fri Aug 17 2007 - lmichnovic(a)suse.cz +* Fri Aug 17 2007 lmichnovic(a)suse.cz - upstream fix: use of alloca can cause stack overflow (paxlib-owl-alloca.patch) -* Thu Jun 21 2007 - mkoenig(a)suse.de +* Thu Jun 21 2007 mkoenig(a)suse.de - update to version 1.17: * Fix archivation of sparse files in posix mode * Fix operation of --verify --listed-incremental @@ -141,11 +148,11 @@ tar-1.6.1-futimens.patch - fix test 12 tar-1.17-testsuite12.patch -* Tue May 22 2007 - mkoenig(a)suse.de +* Tue May 22 2007 mkoenig(a)suse.de - fix build -* Tue May 15 2007 - coolo(a)suse.de +* Tue May 15 2007 coolo(a)suse.de - use %%find_lang -* Wed Jan 24 2007 - mkoenig(a)suse.de +* Wed Jan 24 2007 mkoenig(a)suse.de - update to version 1.16.1: * tar-1.16-CVE-2006-6097.patch merged upstream * tar-1.16-xheader_unused.patch merged upstream @@ -155,7 +162,7 @@ * Race conditions have been fixed that in some cases briefly allowed files extracted by 'tar -x --same-owner' to be accessed by users that they shouldn't have been. -* Tue Dec 05 2006 - mkoenig(a)suse.de +* Tue Dec 05 2006 mkoenig(a)suse.de - update to version 1.16: Bugfixes: * Avoid running off file descriptors when using multiple -C options. @@ -202,30 +209,30 @@ - create man page via help2man - remove support for mangled names, due to security reasons CVE-2006-6097 [#223185] -* Mon Jul 24 2006 - rguenther(a)suse.de +* Mon Jul 24 2006 rguenther(a)suse.de - Do not build-depend on rsh, but provide the RSH environment. -* Mon Feb 27 2006 - kssingvo(a)suse.de +* Mon Feb 27 2006 kssingvo(a)suse.de - fixed buffer overflow issue CVE-2006-0300 (bugzilla#151516) - not affected: traversal bug CVE-2005-1918 (bugzilla#145081) -* Sat Feb 18 2006 - aj(a)suse.de +* Sat Feb 18 2006 aj(a)suse.de - Fix build. -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Thu Sep 01 2005 - mmj(a)suse.de +* Thu Sep 01 2005 mmj(a)suse.de - Add patch from upstream for fixing sparse files > 4GB [#114540] -* Fri Jun 24 2005 - schwab(a)suse.de +* Fri Jun 24 2005 schwab(a)suse.de - Fix broken test. -* Fri Apr 08 2005 - uli(a)suse.de +* Fri Apr 08 2005 uli(a)suse.de - ignore test suite fails on ARM -* Wed Mar 09 2005 - mmj(a)suse.de +* Wed Mar 09 2005 mmj(a)suse.de - Make gcc4 happy -* Tue Feb 01 2005 - mmj(a)suse.de +* Tue Feb 01 2005 mmj(a)suse.de - Disable test that breaks on reiserfs due to that filesystems limitations. Tar works fine on reiserfs. -* Tue Dec 21 2004 - mmj(a)suse.de +* Tue Dec 21 2004 mmj(a)suse.de - Update to 1.15.1 which fixes a bug introduced in 1.15 which caused tar to refuse to extract files from standard input. -* Tue Dec 21 2004 - mmj(a)suse.de +* Tue Dec 21 2004 mmj(a)suse.de - Update to tar-1.15 including: - Features: o Compressed archives are recognised automatically, it is no @@ -277,43 +284,43 @@ o When attempting to delete a non-existing member from the archive, previous versions of tar used to overwrite last archive block with zeroes. -* Mon Aug 09 2004 - mmj(a)suse.de +* Tue Aug 10 2004 mmj(a)suse.de - Add patch from snwint with long filename fix [#43538] -* Sun May 30 2004 - mmj(a)suse.de +* Sun May 30 2004 mmj(a)suse.de - Update to 1.14 which is the first stable release of tar since 1999. -* Thu Apr 15 2004 - mmj(a)suse.de +* Thu Apr 15 2004 mmj(a)suse.de - Fix detection of remote paths [#38709]. Thanks J�rgen! -* Tue Apr 13 2004 - mmj(a)suse.de +* Tue Apr 13 2004 mmj(a)suse.de - Update to 1.13.94 including fix for [#16531] -* Sat Jan 10 2004 - adrian(a)suse.de +* Sat Jan 10 2004 adrian(a)suse.de - build as user -* Fri Jun 20 2003 - ro(a)suse.de +* Fri Jun 20 2003 ro(a)suse.de - build with current gettext -* Thu May 15 2003 - pthomas(a)suse.de +* Thu May 15 2003 pthomas(a)suse.de - Remove unneeded files from build root. - Add autoconf tests to properly guard K&R prototypes - Clean up signed/unsigned compares. -* Thu Apr 24 2003 - ro(a)suse.de +* Thu Apr 24 2003 ro(a)suse.de - fix install_info --delete call and move from preun to postun -* Fri Feb 07 2003 - ro(a)suse.de +* Fri Feb 07 2003 ro(a)suse.de - added install_info macros -* Mon Nov 18 2002 - ro(a)suse.de +* Mon Nov 18 2002 ro(a)suse.de - add AM_GNU_GETTEXT_VERSION to configure.ac -* Thu Aug 01 2002 - ro(a)suse.de +* Thu Aug 01 2002 ro(a)suse.de - add acinclude.m4 with missing macros -* Tue Jun 04 2002 - pthomas(a)suse.de +* Tue Jun 04 2002 pthomas(a)suse.de - Make tar a package of its own. - Update to tar-1.13.25. - Make tar man page a seperate file instead of part of the patch. - Patch de.po to reflect the addition of the --bunzip2 parameter - Use AC_LIBOBJ instead of LIBOBJS -* Wed May 22 2002 - olh(a)suse.de +* Wed May 22 2002 olh(a)suse.de - allow build as user, use buildroot -* Fri Feb 08 2002 - werner(a)suse.de +* Fri Feb 08 2002 werner(a)suse.de - Fix bug #12797: back to builtin behaviour, the widly used -I for bunzip2 can be reenabled with the environment var TAROLDOPT4BZIP2 -* Mon Dec 17 2001 - werner(a)suse.de +* Mon Dec 17 2001 werner(a)suse.de - draht(a)suse.de: package rsh is needed for build of tar(1) to enable rsh remote command execution. two successive execl() calls to /usr/bin/rsh with different @@ -321,18 +328,18 @@ successful if /usr/bin/rsh exists. Check for existence of /etc/rmt on the remote side and execute it, else exec /sbin/rmt . (#12605) - Use one contstant string for command line -* Tue Nov 20 2001 - werner(a)suse.de +* Tue Nov 20 2001 werner(a)suse.de - Add rsh to needeforbuild to be sure that remote shell for remote backup will be found. -* Wed Aug 01 2001 - werner(a)suse.de +* Wed Aug 01 2001 werner(a)suse.de - Make /etc/rmt versus /sbin/rmt switch dynamic. -* Tue Mar 27 2001 - werner(a)suse.de +* Tue Mar 27 2001 werner(a)suse.de - Fix man page of tar (#6741) -* Thu Dec 14 2000 - werner(a)suse.de +* Thu Dec 14 2000 werner(a)suse.de - Update to tar 1.13.18 * should avoid some crashes * avoid exclude file list problem -* Fri Nov 26 1999 - kukuk(a)suse.de +* Fri Nov 26 1999 kukuk(a)suse.de - Add tar.1 to file list - Remove obsolete entries from file list - Build tar with locale support ++++++ tar-1.19-update_flag.patch ++++++ Index: src/buffer.c =================================================================== RCS file: /cvsroot/tar/tar/src/buffer.c,v retrieving revision 1.115 diff -p -u -r1.115 buffer.c --- src/buffer.c 31 Oct 2007 13:10:55 -0000 1.115 +++ src/buffer.c 5 Dec 2007 09:43:00 -0000 @@ -229,19 +229,21 @@ static struct zip_magic const magic[] = /* Check if the file ARCHIVE is a compressed archive. */ enum compress_type -check_compressed_archive () +check_compressed_archive (bool *pshort) { struct zip_magic const *p; bool sfr; - bool short_file = false; + bool temp; + + if (!pshort) + pshort = &temp; /* Prepare global data needed for find_next_block: */ record_end = record_start; /* set up for 1st record = # 0 */ sfr = read_full_records; read_full_records = true; /* Suppress fatal error on reading a partial record */ - if (find_next_block () == 0) - short_file = true; + *pshort = find_next_block () == 0; /* Restore global values */ read_full_records = sfr; @@ -254,9 +256,6 @@ check_compressed_archive () if (memcmp (record_start->buffer, p->magic, p->length) == 0) return p->type; - if (short_file) - ERROR ((0, 0, _("This does not look like a tar archive"))); - return ct_none; } @@ -273,11 +272,16 @@ open_compressed_archive () if (!multi_volume_option) { - enum compress_type type = check_compressed_archive (); + bool shortfile; + enum compress_type type = check_compressed_archive (&shortfile); if (type == ct_none) - return archive; - + { + if (shortfile) + ERROR ((0, 0, _("This does not look like a tar archive"))); + return archive; + } + /* FD is not needed any more */ rmtclose (archive); @@ -502,15 +506,18 @@ _open_archive (enum access_mode wanted_a { case ACCESS_READ: { + bool shortfile; enum compress_type type; archive = STDIN_FILENO; - type = check_compressed_archive (); + type = check_compressed_archive (&shortfile); if (type != ct_none) FATAL_ERROR ((0, 0, _("Archive is compressed. Use %s option"), compress_option (type))); + if (shortfile) + ERROR ((0, 0, _("This does not look like a tar archive"))); } break; @@ -554,7 +561,7 @@ _open_archive (enum access_mode wanted_a O_RDWR | O_CREAT | O_BINARY, MODE_RW, rsh_command_option); - if (check_compressed_archive () != ct_none) + if (check_compressed_archive (NULL) != ct_none) FATAL_ERROR ((0, 0, _("Cannot update compressed archives"))); break; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 gv
by root＠Hilbert.suse.de 28 Mar '08

28 Mar '08

Hello community, here is the log from the commit of package gv checked in at Fri Mar 28 17:21:37 CET 2008. -------- --- gv/gv.changes 2008-01-13 17:51:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/gv/gv.changes 2008-03-28 11:49:25.242843000 +0100 @@ -1,0 +2,49 @@ +Thu Mar 27 19:01:38 CET 2008 - werner(a)suse.de + +- Update to gv 3.6.3 + * gv is now able to work with latest ghostscript: gs 8.57 + * The bug causing the version not to figure in the manual has been + fixed. + * The SIGINT signal is now masked (ignored) by gv. + * gv no more segfaults when reading a configuration file as produced by + State -> Setup Options -> Save + * gv should compile in non-GNU system that doesnt have glib2. The + `getopt' gnulib module has been imported to fix this. + * gv now correctly adjust the page index window after PAGE-UP and + PAGE-DOWN events. + * gv is now able to open files with minus character beginning + filenames. + * X resources related bugs has been fixed. gv is now able to get + resources from the display database, user file, gv system database + and command line doing the Right Thing (TM). + * gv is now able to correctly understand DocumentMedia and other DSC + directives that uses postscript strings. It was not possible with + previous versions due to a bug in the postscript names scanning + routine. + * New set of command line arguments. This solves the horrid bug on + gv 3.6.0 that made such release nearly unusable. See the + documentation for details about the new argument list. + * The "Reopen" entry on the File menu has been renamed to "Reload" in + order to be coherent with the "Reload" button. + * The distributed package structure have been fixed, now conforming a + legal GNU source package. + * The delete key now work as expected, that is, it deletes the next + character rather the last character when typed on text entries. + * Dot files are not shown by default on file selection forms. + * If you try to open an empty file you get a coherent error + message. + * New manual page + * The gs command used for PDF to PostScript conversion has been fixed to allow + document saving. + * New configuration/compilation/installation using GNU Autotools + * Documentation is now distributed in texinfo format. + * "Redisplay" button has been renamed to "Reload". + * Some GNU standard command line arguments are supported now: + --help, --usage and --version. + * Antialiasing is now used by default. + * Solved bug #11014: gv is capable to open files with spaces (or other + harm character) in the filename. +- Use Debain patch +- Port our patches to this version + +------------------------------------------------------------------- Old: ---- gv-3.5.8-bzip2.patch gv-3.5.8-deb.patch gv-3.5.8.dif gv-3.5.8-gcc4.patch gv-3.5.8-I18N-mb.patch gv-3.5.8-sec2.patch gv-3.5.8-security.patch gv-3.5.8.tar.bz2 gv.test intptr_t.patch settitle.patch New: ---- gv-3.6.3-bzip2.patch gv-3.6.3-deb.patch gv-3.6.3.dif gv-3.6.3-I18N-mb.patch gv-3.6.3-intptr_t.patch gv-3.6.3-security.patch gv-3.6.3-settitle.patch gv-3.6.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gv.spec ++++++ --- /var/tmp/diff_new_pack.J21956/_old 2008-03-28 17:20:40.000000000 +0100 +++ /var/tmp/diff_new_pack.J21956/_new 2008-03-28 17:20:40.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gv (Version 3.5.8) +# spec file for package gv (Version 3.6.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,45 +10,57 @@ # norootforbuild + Name: gv -BuildRequires: update-desktop-files xaw3d-devel xorg-x11 xorg-x11-devel +BuildRequires: update-desktop-files xorg-x11 xorg-x11-devel +%if %suse_version > 1020 +BuildRequires: xaw3d-devel +%else +BuildRequires: xaw3d +%endif +%if %suse_version < 1100 +BuildRequires: desktop-data-SuSE +%endif License: GPL v2 or later Group: Productivity/Publishing/PS +PreReq: %install_info_prereq Requires: ghostscript_x11 Conflicts: gs_serv gs_vga # NOTE: We don't want this dependency and desktop-data-SuSE is in all # desktop selections. #Requires: desktop-data-SuSE AutoReqProv: on -Url: http://wwwthep.physik.uni-mainz.de/~plass/gv/ +Url: http://www.gnu.org/software/gv/ Summary: A Program to View PostScript Files -Version: 3.5.8 -Release: 1300 -Source0: gv-3.5.8.tar.bz2 +Version: 3.6.3 +Release: 1 +Source0: gv-3.6.3.tar.bz2 Source1: gv.desktop Source2: gv.png -Patch0: gv-3.5.8-deb.patch -Patch1: gv-3.5.8.dif -Patch2: gv-3.5.8-security.patch -Patch3: gv-3.5.8-bzip2.patch +Patch0: gv-3.6.3-deb.patch +Patch1: gv-3.6.3.dif +Patch2: gv-3.6.3-security.patch +Patch3: gv-3.6.3-bzip2.patch # I18N patch originally from: # http://www.on.cs.keio.ac.jp/~yasu/jp_xaw.html # http://www.on.cs.keio.ac.jp/~yasu/linux/Xaw/gv-3.5.8-I18N-mb.patch # changed a little bit for SuSE: -Patch4: gv-3.5.8-I18N-mb.patch -Patch5: intptr_t.patch -Patch6: settitle.patch -Patch7: gv-3.5.8-gcc4.patch -Patch8: gv-3.5.8-sec2.patch +Patch4: gv-3.6.3-I18N-mb.patch +Patch5: gv-3.6.3-intptr_t.patch +Patch6: gv-3.6.3-settitle.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} %if "%_exec_prefix" == "/usr/X11R6" %global _mandir %{_exec_prefix}/man +%define _x11lib %{_exec_prefix}/%{_lib} %define _x11data %{_exec_prefix}/lib/X11 %define _appdefdir %{_x11data}/app-defaults +%define _x11inc %{_x11_prefix}/include %else +%define _x11lib %{_libdir} %define _x11data %{_datadir}/X11 %define _appdefdir %{_x11data}/app-defaults +%define _x11inc %{_includedir} %endif %description @@ -61,119 +73,194 @@ -------- Tim Theisen <tim(a)cs.wisc.edu> Johannes Plass <plass(a)dipmza.physik.uni-mainz.de> + Jos� E. Marchesi <jemarch(a)gnu.org> %prep -%setup -n gv-3.5.8 -%patch0 -p 1 -b .deb -%patch1 -%patch2 -p1 -b .sec -%patch3 -p0 -b .bzip2 -%patch4 -p1 -b .I18N-mb -%patch5 -p1 -b .intptr_t -%patch6 -p1 -b .settitle -%patch7 -p0 -b .gcc4 -%patch8 -p0 -b .sec2 +%setup +echo >> src/Makefile.am +%patch0 -p1 -b .deb +%patch1 -p0 +%patch2 -p0 -b .sec +# fzopen from libzio does not work due ftell() +#patch3 -p0 -b .bzip2 +# +%patch4 -p0 -b .I18N-mb +%patch5 -p0 -b .intptr_t +%patch6 -p0 -b .settitle %build -xmkmf -a -make CCOPTIONS="$RPM_OPT_FLAGS" +autoreconf -fis +sed -ri 's@[[:blank:]]*-(R|rpath)[[:blank:]]*\$[[:alpha:]_]+@@g' configure +chmod 755 configure +CC=gcc +CFLAGS="$RPM_OPT_FLAGS" +LDFLAGS="-Wl,-z,defs" +cflags () +{ + local flag=$1; shift + case "${RPM_OPT_FLAGS}" in + *${flag}*) return + esac + if test -n "$1" && gcc -Werror $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then + local var=$1; shift + eval $var=\${$var:+\$$var\ }$flag + fi + if test -n "$1" && g++ -Werror $flag -S -o /dev/null -xc++ /dev/null > /dev/null 2>&1 ; then + local var=$1; shift + eval $var=\${$var:+\$$var\ }$flag + fi +} +cflags -std=gnu89 CFLAGS +cflags -fno-strict-aliasing CFLAGS +cflags -Wno-unused CFLAGS +cflags -Wno-unprototyped-calls CFLAGS +cflags -pipe CFLAGS +export CC CFLAGS LDFLAGS +./configure --prefix=%{_prefix} \ + --mandir=%{_mandir} \ + --infodir=%{_infodir} \ + --with-x \ + --x-includes=%{_x11inc} \ + --x-libraries=%{_x11lib}\ + --enable-backing-pixmap \ + --disable-memmove-code \ + --disable-setenv-code \ + --with-default-papersize=a4 +make pkglibdir='%{_x11data}/gv' %install rm -rf %{buildroot} -make DESTDIR=%{buildroot} install -make DESTDIR=%{buildroot} install.man -make DESTDIR=%{buildroot} install.doc +mkdir %{buildroot} +make DESTDIR=%{buildroot} pkglibdir='%{_x11data}/gv' install +make DESTDIR=%{buildroot} pkglibdir='%{_x11data}/gv' install-info +make DESTDIR=%{buildroot} pkglibdir='%{_x11data}/gv' install-man +make -C src DESTDIR=%{buildroot} pkglibdir='%{_x11data}/gv' install-nls +mkdir -p %{buildroot}/%{_defaultdocdir}/gv install -m 0444 NOTE %{buildroot}/%{_defaultdocdir}/gv/Copyright # add font settings to app-defaults: for i in $(find %{buildroot}%{_x11data} -type f -name "GV") do - cat source/gv_font_res-I18N_mb.dat >> ${i} + cat src/gv_font_res-I18N_mb.dat >> ${i} + chmod 0644 ${i} done # japanese app-defaults: -mkdir -p %{buildroot}%{_x11data}/{ja,ja_JP.SJIS,ja_JP.UTF-8}/app-defaults -mv %{buildroot}%{_x11data}/ja_JP.eucJP/app-defaults/GV \ - %{buildroot}%{_x11data}/ja/app-defaults/GV -iconv -f EUC-JP -t SJIS < %{buildroot}%{_x11data}/ja/app-defaults/GV \ +mkdir -p %{buildroot}%{_x11data}/{ja_JP.SJIS,ja_JP.EUC-JP}/app-defaults +iconv -f UTF-8 -t SJIS < %{buildroot}%{_x11data}/ja_JP.UTF-8/app-defaults/GV \ > %{buildroot}%{_x11data}/ja_JP.SJIS/app-defaults/GV -iconv -f EUC-JP -t UTF-8 < %{buildroot}%{_x11data}/ja/app-defaults/GV \ - > %{buildroot}%{_x11data}/ja_JP.UTF-8/app-defaults/GV +iconv -f UTF-8 -t EUC-JP < %{buildroot}%{_x11data}/ja_JP.UTF-8/app-defaults/GV \ + > %{buildroot}%{_x11data}/ja_JP.EUC-JP/app-defaults/GV +mkdir -p %{buildroot}%{_x11data}/ko_KR.EUC-KR/app-defaults +iconv -f UTF-8 -t EUC-KR < %{buildroot}%{_x11data}/ko_KR.UTF-8/app-defaults/GV \ + > %{buildroot}%{_x11data}/ko_KR.EUC-KR/app-defaults/GV %suse_update_desktop_file -i gv Office Viewer +%post +%install_info --info-dir=.%{_infodir} .%{_infodir}/gv.info.gz + +%postun +%install_info_delete --info-dir=.%{_infodir} .%{_infodir}/gv.info.gz + %files %defattr(-,root,root) -/usr/share/applications/gv.desktop -/usr/share/pixmaps/gv.png +%{_datadir}/applications/gv.desktop +%{_datadir}/pixmaps/gv.png %dir %{_x11data}/gv/ -%config %{_x11data}/gv/gv_system.ad -%config %{_x11data}/gv/gv_user.ad -%config %{_x11data}/gv/gv_class.ad +%config %{_x11data}/gv/*.ad +%config %{_x11data}/gv/*.dat %config %{_appdefdir}/GV %dir %{_x11data}/?? %dir %{_x11data}/??_* %dir %{_x11data}/*/app-defaults -%config %{_x11data}/ja*/app-defaults/GV +%config %{_x11data}/*/app-defaults/GV %{_bindir}/gv -%doc %{_mandir}/man1/gv.1x.gz -%docdir %{_defaultdocdir}/gv/ +%doc %{_mandir}/man1/gv.1.gz +%doc %{_infodir}/gv.info.gz +%dir %{_defaultdocdir}/gv +%docdir %{_defaultdocdir}/gv %{_defaultdocdir}/gv/Copyright -%doc %{_defaultdocdir}/gv/gs.interface.gz -%doc %{_defaultdocdir}/gv/gv-faq.txt.gz -%doc %{_defaultdocdir}/gv/key-bindings.txt.gz -%doc %{_defaultdocdir}/gv/comments.doc.gz -%doc %{_defaultdocdir}/gv/gv.ps.gz -%doc %{_defaultdocdir}/gv/gv-1.html -%doc %{_defaultdocdir}/gv/gv-10.html -%doc %{_defaultdocdir}/gv/gv-11.html -%doc %{_defaultdocdir}/gv/gv-12.html -%doc %{_defaultdocdir}/gv/gv-13.html -%doc %{_defaultdocdir}/gv/gv-2.html -%doc %{_defaultdocdir}/gv/gv-3.html -%doc %{_defaultdocdir}/gv/gv-4.html -%doc %{_defaultdocdir}/gv/gv-5.html -%doc %{_defaultdocdir}/gv/gv-6.html -%doc %{_defaultdocdir}/gv/gv-7.html -%doc %{_defaultdocdir}/gv/gv-8.html -%doc %{_defaultdocdir}/gv/gv-9.html -%doc %{_defaultdocdir}/gv/gv-faq.html -%doc %{_defaultdocdir}/gv/gv.html -%dir %{_defaultdocdir}/gv/ %changelog -* Sun Jan 13 2008 - coolo(a)suse.de +* Thu Mar 27 2008 werner(a)suse.de +- Update to gv 3.6.3 + * gv is now able to work with latest ghostscript: gs 8.57 + * The bug causing the version not to figure in the manual has been + fixed. + * The SIGINT signal is now masked (ignored) by gv. + * gv no more segfaults when reading a configuration file as produced by + State -> Setup Options -> Save + * gv should compile in non-GNU system that doesnt have glib2. The + `getopt' gnulib module has been imported to fix this. + * gv now correctly adjust the page index window after PAGE-UP and + PAGE-DOWN events. + * gv is now able to open files with minus character beginning + filenames. + * X resources related bugs has been fixed. gv is now able to get + resources from the display database, user file, gv system database + and command line doing the Right Thing (TM). + * gv is now able to correctly understand DocumentMedia and other DSC + directives that uses postscript strings. It was not possible with + previous versions due to a bug in the postscript names scanning + routine. + * New set of command line arguments. This solves the horrid bug on + gv 3.6.0 that made such release nearly unusable. See the + documentation for details about the new argument list. + * The "Reopen" entry on the File menu has been renamed to "Reload" in + order to be coherent with the "Reload" button. + * The distributed package structure have been fixed, now conforming a + legal GNU source package. + * The delete key now work as expected, that is, it deletes the next + character rather the last character when typed on text entries. + * Dot files are not shown by default on file selection forms. + * If you try to open an empty file you get a coherent error + message. + * New manual page + * The gs command used for PDF to PostScript conversion has been fixed to allow + document saving. + * New configuration/compilation/installation using GNU Autotools + * Documentation is now distributed in texinfo format. + * "Redisplay" button has been renamed to "Reload". + * Some GNU standard command line arguments are supported now: + --help, --usage and --version. + * Antialiasing is now used by default. + * Solved bug #11014: gv is capable to open files with spaces (or other + harm character) in the filename. +- Use Debain patch +- Port our patches to this version +* Sun Jan 13 2008 coolo(a)suse.de - remove desktop-data from buildrequires -* Thu Jul 05 2007 - coolo(a)suse.de +* Thu Jul 05 2007 coolo(a)suse.de - put desktop file and icon into the package -* Fri Jun 01 2007 - dmueller(a)suse.de +* Fri Jun 01 2007 dmueller(a)suse.de - fix buildrequires -* Fri Nov 17 2006 - werner(a)suse.de +* Fri Nov 17 2006 werner(a)suse.de - Corrected version of last fix (bug #219454) -* Thu Nov 09 2006 - werner(a)suse.de +* Thu Nov 09 2006 werner(a)suse.de - Avoid buffer overflow in gv gettext() (bug #219454) -* Thu Aug 24 2006 - werner(a)suse.de +* Thu Aug 24 2006 werner(a)suse.de - Check for existence of gv.png -* Wed Aug 02 2006 - werner(a)suse.de +* Wed Aug 02 2006 werner(a)suse.de - Make it build with X11R7 -* Tue Feb 28 2006 - werner(a)suse.de +* Tue Feb 28 2006 werner(a)suse.de - Fix range of array subscript (bug #154109) -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Tue Nov 29 2005 - sbrabec(a)suse.cz +* Tue Nov 29 2005 sbrabec(a)suse.cz - Don't package icon already present in desktop-data-SuSE. Cleans rpm -V output. -* Tue Jun 07 2005 - meissner(a)suse.de +* Tue Jun 07 2005 meissner(a)suse.de - Use RPM_OPT_FLAGS. -* Mon May 23 2005 - mfabian(a)suse.de +* Mon May 23 2005 mfabian(a)suse.de - Bugzilla #85410: improve default fontsets to make it work better with the recent changes in the XLC_LOCALE files in Xorg. Japanese should look nicer now and warning messages should usually disappear. -* Mon Apr 18 2005 - werner(a)suse.de +* Mon Apr 18 2005 werner(a)suse.de - Set DELAYSAFER for dsc file of the pdf within a pipe (bug #78322) -* Wed Apr 13 2005 - werner(a)suse.de +* Wed Apr 13 2005 werner(a)suse.de - Add a return after label even for void functions for stupid gcc4 -* Wed Nov 17 2004 - werner(a)suse.de +* Wed Nov 17 2004 werner(a)suse.de - Add gv.png pixmap to file list -* Mon Jun 28 2004 - mfabian(a)suse.de +* Mon Jun 28 2004 mfabian(a)suse.de - add "-*-*-Medium-R-*--16-*-*-*-*-*-*-*" to all fontsets as a fallback to suppress useless warnings if "-*-*-Medium-R-*--14-*-*-*-*-*-*-*" or other sizes are not @@ -184,9 +271,9 @@ In 16 pixel, there are fonts for all common encodings already in the basic X11 packages, therefore 16 pixel should always work as a fallback. -* Fri May 28 2004 - adrian(a)suse.de +* Fri May 28 2004 adrian(a)suse.de - add "Office" to Categories to match the menu definition (#41338) -* Fri Apr 30 2004 - mfabian(a)suse.de +* Fri Apr 30 2004 mfabian(a)suse.de - Bugzilla #39594: add gv-3.5.8-I18N-mb.patch to support the display of multibyte file names. - intptr_t.patch: fix compiler warnings @@ -194,48 +281,48 @@ - fix display of file names in the window title and icons by setting _NET_WM_NAME and _NET_WM_ICON_NAME properties (thanks a lot to Marcus Schaefer <ms(a)suse.de> for help). -* Thu Apr 29 2004 - werner(a)suse.de +* Thu Apr 29 2004 werner(a)suse.de - correct category for desktop file: "PostScript Viewer" -> "Viewer". -* Tue Apr 06 2004 - werner(a)suse.de +* Tue Apr 06 2004 werner(a)suse.de - Add desktop entry -* Sat Jan 10 2004 - adrian(a)suse.de +* Sat Jan 10 2004 adrian(a)suse.de - add %%defattr -* Mon Aug 25 2003 - werner(a)suse.de +* Mon Aug 25 2003 werner(a)suse.de - Fix menu entry for bunzip2 label -* Fri Aug 22 2003 - werner(a)suse.de +* Fri Aug 22 2003 werner(a)suse.de - Uncompress bzip2 files on the fly, patch based on Volker Kuhlmann's patch (bug #29260) -* Tue Apr 15 2003 - coolo(a)suse.de +* Tue Apr 15 2003 coolo(a)suse.de - use BuildRoot -* Mon Mar 10 2003 - werner(a)suse.de +* Mon Mar 10 2003 werner(a)suse.de - Fix sigsegv in case of unkown paper size. -* Fri Nov 08 2002 - werner(a)suse.de +* Fri Nov 08 2002 werner(a)suse.de - Remove XCOMM definition to make new cpp happy -* Fri Sep 20 2002 - okir(a)suse.de +* Fri Sep 20 2002 okir(a)suse.de - added security patch to address buffer overflows -* Tue Sep 17 2002 - ro(a)suse.de +* Tue Sep 17 2002 ro(a)suse.de - removed bogus self-provides -* Mon Jan 14 2002 - schwab(a)suse.de +* Mon Jan 14 2002 schwab(a)suse.de - Fix use of token concatenation. -* Fri Jun 22 2001 - ro(a)suse.de +* Fri Jun 22 2001 ro(a)suse.de - use ComplexProgramTargetNoMan -* Fri Oct 06 2000 - kukuk(a)suse.de +* Fri Oct 06 2000 kukuk(a)suse.de - change group tag - Remove bogus xshared requires, rpm will handle this correct -* Wed May 24 2000 - kukuk(a)suse.de +* Wed May 24 2000 kukuk(a)suse.de - Use /usr/share/doc/packages -* Mon Jan 24 2000 - werner(a)suse.de +* Mon Jan 24 2000 werner(a)suse.de - Add Debian patch 15 for gv 3.5.8 - Use RPM_OPT_FLAGS -* Mon Sep 20 1999 - ro(a)suse.de +* Mon Sep 20 1999 ro(a)suse.de - added Requires ghostscript_x11 -* Mon Sep 13 1999 - bs(a)suse.de +* Mon Sep 13 1999 bs(a)suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. -* Wed Oct 15 1997 - werner(a)suse.de +* Wed Oct 15 1997 werner(a)suse.de - New version: 3.5.8 - This version is usable only with Xaw3d -* Thu Feb 13 1997 - werner(a)suse.de +* Fri Feb 14 1997 werner(a)suse.de - New package with gv version 2_7_6 - Remove call of Xaw/Xaw3d private function ... now we can use Xaw or Xaw3d or Xaw95. ++++++ gv-3.5.8-bzip2.patch -> gv-3.6.3-bzip2.patch ++++++ --- gv/gv-3.5.8-bzip2.patch 2003-08-25 14:49:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/gv/gv-3.6.3-bzip2.patch 2008-03-27 15:34:18.104583000 +0100 @@ -1,305 +1,103 @@ -gv (the successor to Tim Theisen's ghostview) by default can uncompress gziped -files on the fly. This patch allows to also uncompress bzip2-compressed files -on the fly. - -Compressed input can't be read from a pipe, the input must be seekable. The -name of the compressed file is irrelevant, detection is by magic file ID. gv -can't read from stdin. - -gv only allows to specify one program to handle the decompression, it might -make more sense to extend this to two, but it's also possible to use a short -shell script to handle both bzip2 and gzip decompression, which is what -gv_uncompress does. - -Volker Kuhlmann <VolkerKuhlmann(a)gmx.de>, 22 Aug 2003 - -// Just extended to use bzip2 after the detection of bzip2 magic -// without the usage of an extern script. -// <werner(a)suse.de> - ---- source/Imakefile -+++ source/Imakefile Fri Aug 22 16:13:35 2003 -@@ -320,7 +320,8 @@ - @echo "GV.gsSafer: True" >> $(GV_INTERN_RES_DAT) - @echo "GV.gsQuiet: True" >> $(GV_INTERN_RES_DAT) - @echo "GV.gsArguments:" >> $(GV_INTERN_RES_DAT) -- @echo "GV.uncompressCommand: gzip -d -c %s > %s" >> $(GV_INTERN_RES_DAT) -+ @echo "GV.uncompressCommand: gzip -d -c %s > %s" >> $(GV_INTERN_RES_DAT) -+ @echo "GV.bunzip2Command: bzip2 -d -c %s > %s" >> $(GV_INTERN_RES_DAT) - @echo "GV.printCommand: $(PRINT_COMMAND)" >> $(GV_INTERN_RES_DAT) - - clean:: ---- source/callbacks.c -+++ source/callbacks.c Fri Aug 22 15:49:25 2003 -@@ -1271,6 +1271,7 @@ - GV_XtFree(gv_miscmenu_entries_res); - GV_XtFree(gv_print_command); - GV_XtFree(gv_uncompress_command); -+ GV_XtFree(gv_bunzip2_command); - GV_XtFree(gv_gs_interpreter); - GV_XtFree(gv_gs_cmd_scan_pdf); - GV_XtFree(gv_gs_cmd_conv_pdf); ---- source/doc_misc.c -+++ source/doc_misc.c Fri Aug 22 16:04:43 2003 -@@ -49,7 +49,7 @@ - /*##################################################################*/ - - int --doc_scanFile(fPP,docP,filename,filename_raw,filename_dscP,cmd_scan_pdf,filename_uncP,cmd_uncompress,scanstyle) -+doc_scanFile(fPP,docP,filename,filename_raw,filename_dscP,cmd_scan_pdf,filename_uncP,cmd_uncompress,cmd_bunzip2,scanstyle) - FILE ** fPP; - Document *docP; - String filename; -@@ -58,6 +58,7 @@ - String cmd_scan_pdf; - String *filename_uncP; - String cmd_uncompress; -+ String cmd_bunzip2; - int scanstyle; - { - Document d; -@@ -67,7 +68,7 @@ - d = (Document)NULL; - ret = 0; - if (*fPP && filename) -- d = psscan(fPP,filename,filename_raw,filename_dscP,cmd_scan_pdf,filename_uncP,cmd_uncompress,scanstyle); -+ d = psscan(fPP,filename,filename_raw,filename_dscP,cmd_scan_pdf,filename_uncP,cmd_uncompress,cmd_bunzip2,scanstyle); - if (d) { - d->labels_useful=0; - d->structured =0; ---- source/doc_misc.h -+++ source/doc_misc.h Fri Aug 22 15:51:37 2003 -@@ -38,6 +38,7 @@ - String, - String*, - String, -+ String, - int /* scanstyle */ +--- configure.ac ++++ configure.ac 2008-03-27 14:41:36.332982541 +0100 +@@ -49,6 +49,25 @@ dnl Search for libraries + AC_CHECK_LIB(m, sqrt) + AC_CHECK_LIB(fl, yywrap) + ++# ++# Check for zlib and libbz2 libraries to use this together ++# with SuSE's libzio to open compressed info files. ++# ++AC_CHECK_HEADER(zlib.h,[ ++ for lib in z gz ++ do ++ AC_CHECK_LIB($lib, gzopen, [LIBS="$LIBS -l$lib" ; break]) ++ done]) ++AC_CHECK_HEADER(bzlib.h,[ ++ for lib in bz2 bzip2 ++ do ++ AC_CHECK_LIB($lib, BZ2_bzopen, [LIBS="$LIBS -l$lib" ; break]) ++ done]) ++AC_CHECK_HEADER(zio.h,[ ++ AC_CHECK_LIB(zio, fzopen, [LIBS="$LIBS -lzio" ; AC_DEFINE(HAVE_ZIO)]) ++ ]) ++ ++ + AC_PATH_XTRA() + AC_CHECK_LIB(X11, XOpenDisplay, , , $X_LIBS) + AC_CHECK_LIB(ICE, main, , , $X_LIBS) +@@ -229,4 +248,4 @@ AM_CONDITIONAL(USE_MEMDEBUG_CODE, test x + + + dnl Generate output files +-AC_OUTPUT(Makefile doc/version.texi lib/Makefile src/Makefile doc/Makefile) +\ No newline at end of file ++AC_OUTPUT(Makefile doc/version.texi lib/Makefile src/Makefile doc/Makefile) +--- src/ac_config.h.in ++++ src/ac_config.h.in 2008-03-27 14:43:32.755968935 +0100 +@@ -142,3 +142,6 @@ + /* Define to rpl_ if the getopt replacement functions and variables should be + used. */ + #undef __GETOPT_PREFIX ++ ++/* Define to 1 if you have libzio for opening compressed info files */ ++#undef HAVE_ZIO +--- src/ps.c ++++ src/ps.c 2008-03-27 15:33:19.813097964 +0100 +@@ -65,8 +65,15 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <sys/types.h> ++#include <sys/stat.h> + + #include <string.h> ++#include <ac_config.h> ++ ++#ifdef HAVE_ZIO ++# include <zio.h> ++#endif + + #ifndef SEEK_SET + #define SEEK_SET 0 +@@ -93,7 +100,7 @@ extern Media *gv_medias; + #define memset(a,b,c) bzero(a,c) #endif - ); ---- source/file.c -+++ source/file.c Fri Aug 22 15:49:25 2003 -@@ -376,6 +376,7 @@ - while (*ext) { *ext = tolower(*ext); ext++; } - if (!strncmp(mext,".gz",3)) ext = ""; - else if (!strncmp(mext,".z",2)) ext = ""; -+ else if (!strncmp(mext,".bz2",4)) ext = ""; - else if (!strncmp(mext,".ps",3)) ext = ".ps"; - else if (!strncmp(mext,".pdf",4)) ext = ".pdf"; - else ext = e; ---- source/main.c -+++ source/main.c Fri Aug 22 15:49:25 2003 -@@ -348,6 +348,7 @@ - main_setGhostscriptResources(gv_database); - main_setInternResource(gv_database,&gv_print_command,"printCommand"); - main_setInternResource(gv_database,&gv_uncompress_command,"uncompressCommand"); -+ main_setInternResource(gv_database,&gv_bunzip2_command,"bunzip2Command"); - - gv_user_defaults_file = resource_userDefaultsFile(); - gv_screen = XtScreen(toplevel); ---- source/main_globals.h -+++ source/main_globals.h Fri Aug 22 15:49:25 2003 -@@ -128,6 +128,7 @@ - EXTERN String gv_user_defaults_file; - EXTERN String gv_print_command; /* command used to print doc, usually "lpr" */ - EXTERN String gv_uncompress_command; /* command used to uncompress a file */ -+EXTERN String gv_bunzip2_command; /* command used to bunzip2 a file */ - EXTERN int gv_print_kills_file; /* whether the print symbiont removes the file after printing */ - EXTERN int gv_exiting; /* flag set when exiting gv */ - EXTERN String gv_dirs; ---- source/main_resources.h -+++ source/main_resources.h Fri Aug 22 15:58:27 2003 -@@ -89,6 +89,7 @@ - DECLARE_STRING(scales) - DECLARE_STRING(printCommand) - DECLARE_STRING(uncompressCommand) -+DECLARE_STRING(bunzip2Command) - - DECLARE_STRING(gsInterpreter) - DECLARE_STRING(gsCmdScanPDF) ---- source/misc.c -+++ source/misc.c Fri Aug 22 15:49:25 2003 -@@ -952,7 +952,7 @@ - gv_filename, - gv_filename_raw, - &gv_filename_dsc,gv_gs_cmd_scan_pdf, -- &gv_filename_unc,gv_uncompress_command, -+ &gv_filename_unc,gv_uncompress_command,gv_bunzip2_command, - gv_scanstyle); - { - int m; ---- source/options_setup.c -+++ source/options_setup.c Fri Aug 22 15:49:25 2003 -@@ -71,7 +71,7 @@ - static Widget eyeGuideToggle,reverseScrollingToggle,confirmPrintToggle,autoCenterToggle; - static Widget pixmapToggle,miscLabel; - static Widget confirmLabel,confirmButton,confirmMenu,showTitleToggle; --static Widget print_command,scales,uncompress,screenSize,medias,magmenu,miscmenu; -+static Widget print_command,scales,uncompress,bunzip2,screenSize,medias,magmenu,miscmenu; - - static String confirm_quit_styles[4] = { "Never","When processing","Always", NULL }; - -@@ -117,6 +117,8 @@ - widgets_setText(print_command, gv_print_command); - SMESSAGE(gv_uncompress_command) - widgets_setText(uncompress,gv_uncompress_command); -+ SMESSAGE(gv_bunzip2_command) -+ widgets_setText(bunzip2,gv_bunzip2_command); - SMESSAGE(gv_scales_res) - s = options_squeezeMultiline(gv_scales_res); - widgets_setText(scales,s); -@@ -178,6 +180,7 @@ - } - - options_textApply(uncompress,NULL,&gv_uncompress_command); -+ options_textApply(bunzip2,NULL,&gv_bunzip2_command); - options_textApply(print_command,NULL,&gv_print_command); - options_textApply(magmenu,NULL,&gv_magmenu_entries_res); - magmenu_freeMagMenuEntries(gv_magmenu_entries); -@@ -312,6 +315,8 @@ - ++argn; - options_setArg(&(argi[argn]),&(argv[argn]),s_uncompressCommand ,gv_class,widgets_getText(uncompress)); - ++argn; -+ options_setArg(&(argi[argn]),&(argv[argn]),s_bunzip2Command ,gv_class,widgets_getText(bunzip2)); -+ ++argn; - options_setArg(&(argi[argn]),&(argv[argn]),s_confirmPrint ,gv_class ,SwitchIsSet(confirmPrintToggle) ? t : f); - ++argn; - options_setArg(&(argi[argn]),&(argv[argn]),s_reverseScrolling ,gv_class ,SwitchIsSet(reverseScrollingToggle) ? t : f); -@@ -405,6 +410,7 @@ - magmenu = widgets_createLabeledTextField("magmenu", optionControl); - medias = widgets_createLabeledTextField("medias", optionControl); - uncompress = widgets_createLabeledLineTextField("uncompress", optionControl); -+ bunzip2 = widgets_createLabeledLineTextField("bunzip2", optionControl); - print_command = widgets_createLabeledLineTextField("printCommand", optionControl); - scales = widgets_createLabeledTextField("scales", optionControl); - screenSize = widgets_createLabeledLineTextField("screenSize", optionControl); ---- source/ps.c -+++ source/ps.c Fri Aug 22 16:11:14 2003 -@@ -353,7 +353,7 @@ - /*###########################################################*/ - struct document * --psscan(fileP,filename,filename_raw,filename_dscP,cmd_scan_pdf,filename_uncP,cmd_uncompress,scanstyle) -+psscan(fileP,filename,filename_raw,filename_dscP,cmd_scan_pdf,filename_uncP,cmd_uncompress,cmd_bunzip2,scanstyle) - FILE **fileP; - char *filename; - char *filename_raw; -@@ -361,6 +361,7 @@ - char *cmd_scan_pdf; - char **filename_uncP; - char *cmd_uncompress; -+ char *cmd_bunzip2; - int scanstyle; - { - FILE *file; -@@ -404,18 +405,27 @@ - int ignore_dsc; /* Derived from scanstyle. - If set the document structure will be ignored. - */ -+ char *run_uncompress = NULL; +-extern int sec_scanf(const char *, const char *, ...); ++extern int sec_sscanf(const char *, const char *, ...); - BEGINMESSAGE(psscan) - - if (cmd_uncompress) { -- char b[2]; -- if (!(fread(b, sizeof(char),2, *fileP) == 2) -- || b[0] != '\037' || (b[1] != '\235' && b[1] != '\213')) { -+ char b[4]; -+ /* 0x1F9D, 0x1F8B = gzip */ -+ #define is_gzip (b[0] == '\037' && (b[1] == '\235' || b[1] == '\213')) -+ /* "BZ" = bzip2; should we skip the test in b[3]? */ -+ #define is_bzip2 (b[0] == 'B' && b[1] == 'Z' \ -+ && (b[3] >= 48) && (b[3] <=57) ) -+ if (fread(b, sizeof(char),4, *fileP) != 4) { /* I/O error */ - rewind(*fileP); -- cmd_uncompress=NULL; -+ } else { -+ if (is_gzip) -+ run_uncompress=cmd_uncompress; -+ if (is_bzip2) -+ run_uncompress=cmd_bunzip2; + /* We use this helper function for providing proper */ + /* case and colon :-) insensitive DSC matching */ +@@ -388,6 +395,7 @@ psscan(fileP,filename,filename_raw,filen + cmd_uncompress=NULL; } } -- if (cmd_uncompress) { -+ if (run_uncompress) { ++#ifndef HAVE_ZIO + if (cmd_uncompress) { struct document *retval = NULL; FILE *tmpfile = (FILE*)NULL; - char *filename_unc; -@@ -425,7 +435,7 @@ - filename_unc=file_getTmpFilename(NULL,filename_raw); - quoted_filename = quote_filename(filename); - quoted_filename_unc = quote_filename(filename_unc); -- sprintf(cmd,cmd_uncompress,quoted_filename,quoted_filename_unc); -+ sprintf(cmd,run_uncompress,quoted_filename,quoted_filename_unc); - GV_XtFree(quoted_filename); - GV_XtFree(quoted_filename_unc); - INFMESSAGE(is compressed) -@@ -449,7 +459,7 @@ - if (!tmpfile) goto unc_exec_failed; - fclose(*fileP); - *fileP = tmpfile; -- retval = psscan(fileP,filename_unc,filename_raw,filename_dscP,cmd_scan_pdf,NULL,NULL,scanstyle); -+ retval = psscan(fileP,filename_unc,filename_raw,filename_dscP,cmd_scan_pdf,NULL,NULL,NULL,scanstyle); - #if 0 - if (!retval) { - sprintf(s,"333 Scanning\n%s\nfailed.",filename_unc); -@@ -548,7 +558,7 @@ - if (!tmpfile) goto scan_exec_failed; - fclose(*fileP); - *fileP = tmpfile; -- retval = psscan(fileP,filename_dsc,filename_raw,filename_dscP,cmd_scan_pdf,NULL,NULL,scanstyle); -+ retval = psscan(fileP,filename_dsc,filename_raw,filename_dscP,cmd_scan_pdf,NULL,NULL,NULL,scanstyle); - if (!retval) { - sprintf(s,"Scanning\n%s\nfailed.",filename_dsc); - goto scan_failed; ---- source/ps.h -+++ source/ps.h Fri Aug 22 16:10:21 2003 -@@ -116,6 +116,7 @@ - char *, - char **, - char *, -+ char *, - int /* scanstyle */ - #endif - ); ---- source/save.c -+++ source/save.c Fri Aug 22 16:00:03 2003 -@@ -270,7 +270,7 @@ - String s = GV_XtNewString(src_filename); - s = file_getUsefulName(s); - INFMESSAGE(scanning document) -- doc_scanFile(&src_file,&src_doc,src_filename,s,NULL,NULL,NULL,NULL,scanstyle); -+ doc_scanFile(&src_file,&src_doc,src_filename,s,NULL,NULL,NULL,NULL,NULL,scanstyle); - if (src_doc) { - INFMESSAGE(calling pscopydoc) - pscopydoc(save_file,src_filename,src_doc,pagelist); ---- source/gv_misc_res.dat -+++ source/gv_misc_res.dat 2003-08-25 12:35:43.000000000 +0000 -@@ -349,6 +349,7 @@ - GV*eyeGuide.label: Scrolling Eye Guide - GV*confirmPrint.label: Confirm Printing - GV*uncompressLabel.label: Uncompress -+GV*bunzip2Label.label: Bunzip2 - GV*autoCenter.label: Auto Center - GV*printCommandLabel.label: Print Command - GV*scratchDirLabel.label: Scratch Directory ---- source/gv_layout_res.dat -+++ source/gv_layout_res.dat 2003-08-25 12:46:04.000000000 +0000 -@@ -283,6 +283,8 @@ - printCommandLabel<+[1]*>\ - $bs\ - uncompressLabel<+[1]*>\ -+ $bs\ -+ bunzip2Label<+[1]*>\ - }\ - $s\ - |v{\ -@@ -291,6 +293,8 @@ - printCommandFrame<+[2]-100%*>\ - $s\ - uncompressFrame<+[2]-100%*>\ -+ $s\ -+ bunzip2Frame<+[2]-100%*>\ - }\ - }\ - }\ +@@ -441,6 +449,23 @@ unc_ok: + *filename_uncP = (char*)GV_XtNewString(filename_unc); + goto unc_ok; + } ++#else ++ if (cmd_uncompress) { ++ FILE *zfile = fzopen(filename, "r"); ++ INFMESSAGE(is compressed) ++ if (!zfile) { ++ char s[512]; ++ sprintf(s,"Uncompressing of\n%s\nfailed.",filename); ++ NotePopupShowMessage(s); ++ ENDMESSAGE(psscan) ++ return(NULL); ++ } ++ fclose(*fileP); ++ *fileP = zfile; ++ cmd_uncompress = NULL; ++ *filename_uncP = NULL; ++ } ++#endif + + respect_eof = (scanstyle & SCANSTYLE_IGNORE_EOF) ? 0 : 1; + ignore_dsc = (scanstyle & SCANSTYLE_IGNORE_DSC) ? 1 : 0; ++++++ gv-3.5.8-deb.patch -> gv-3.6.3-deb.patch ++++++ ++++ 3987 lines (skipped) ++++ between gv/gv-3.5.8-deb.patch ++++ and /mounts/work_src_done/STABLE/gv/gv-3.6.3-deb.patch ++++++ gv-3.5.8.dif -> gv-3.6.3.dif ++++++ --- gv/gv-3.5.8.dif 2006-08-02 14:56:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/gv/gv-3.6.3.dif 2008-03-27 18:28:40.914322000 +0100 @@ -1,24 +1,14 @@ --- .pkgextract +++ .pkgextract 2006-02-28 15:49:27.000000000 +0100 -@@ -0,0 +1,2 @@ -+patch -p1 -s --suffix=".debian" < ../gv-3.5.8-deb.patch -+patch -p1 -s --suffix=".secure" < ../gv-3.5.8-security.patch ---- Imakefile -+++ Imakefile 2006-02-28 15:49:27.000000000 +0100 -@@ -1,7 +1,3 @@ --#ifndef XCOMM --#define XCOMM # --#endif -- - XCOMM - XCOMM Imakefile - XCOMM +@@ -0,0 +1 @@ ++patch -p1 -b -s --suffix=".debian" < ../gv-3.6.3-deb.patch --- NOTE -+++ NOTE 2006-02-28 15:49:27.000000000 +0100 -@@ -0,0 +1,48 @@ ++++ NOTE 2008-03-27 13:49:41.452894000 +0100 +@@ -0,0 +1,52 @@ + +** +** Copyright (C) 1995, 1996, 1997 Johannes Plass ++** Copyright (C) 2004 Jose E. Marchesi +** +** This program is free software; you can redistribute it and/or modify +** it under the terms of the GNU General Public License as published by @@ -39,6 +29,9 @@ +** Johannes Gutenberg-University +** Mainz, Germany +** ++** Jose E. Marchesi (jemarch(a)gnu.org) ++** GNU Project ++** + +GV is real based on ghostview 1.5 by Tim Theisen: + @@ -64,94 +57,65 @@ + * UUCP: uwvax!tim University of Wisconsin-Madison + * Phone: (608)262-0438 1210 West Dayton Street + * FAX: (608)262-9777 Madison, WI 53706 ---- config.Unix -+++ config.Unix 2006-02-28 15:49:27.000000000 +0100 -@@ -32,16 +32,22 @@ - XCOMM -------------------------------------------------------------------- - XCOMM Destination directories. - XCOMM -------------------------------------------------------------------- -- GV_BINDIR = /usr/local/bin/ -- GV_DOCDIR = /usr/local/doc/gv/ -- GV_LIBDIR = /usr/local/lib/gv/ -- GV_MANDIR = /usr/local/man/man1/ -+ SHAREDIR ?= $(LIBDIR) -+ GV_BINDIR = $(BINDIR)/ -+ GV_DOCDIR = /usr/share/doc/packages/gv/ -+ GV_LIBDIR = $(SHAREDIR)/gv/ -+ GV_MANDIR = $(MANPATH)/man1/ -+ -+XCOMM -------------------------------------------------------------------- -+XCOMM --- Don not use private functions of Xaw or Xaw3d -+XCOMM -------------------------------------------------------------------- -+XCOMM #define USE_STANDARD_XAW - - XCOMM -------------------------------------------------------------------- - XCOMM --- The name of the Xaw3d library. - XCOMM -------------------------------------------------------------------- - XCOMM XAWLIB = -lXaw -- XAWLIB = -lXaw3d -+XAWLIB = -lXaw3d - - XCOMM -------------------------------------------------------------------- - XCOMM As far as the Xaw3d header files are concerned it is by -@@ -57,6 +63,7 @@ - XCOMM ln -s /home/aaa/Xaw3d Xaw3d - XCOMM -------------------------------------------------------------------- - XCOMM XAW3D_HEADERS = -I/home/aaa/Xaw3d -+XAW3D_HEADERS = -I/usr/include - - XCOMM -------------------------------------------------------------------- - XCOMM Print Command -@@ -100,7 +107,7 @@ - XCOMM -------------------------------------------------------------------- - XCOMM --- Use gv's own Motif like scrollbar. - XCOMM -------------------------------------------------------------------- --#define USE_SCROLLBAR_CODE -+XCOMM #define USE_SCROLLBAR_CODE - - XCOMM -------------------------------------------------------------------- - XCOMM --- Compile style files into the executable. -@@ -121,6 +128,7 @@ - XCOMM CCOPTIONS = -ansi -pedantic -Wall - XCOMM CDEBUGFLAGS = - XCOMM LDPOSTLIB = -+CCOPTIONS = -O2 -pipe - - XCOMM #################################################################### - XCOMM ##### Architecture specific settings ---- source/Ghostview.c -+++ source/Ghostview.c 2006-02-28 15:49:27.000000000 +0100 -@@ -1325,7 +1325,15 @@ - } - argv[argc++] = "-dNOPAUSE"; - if (gvw->ghostview.quiet) argv[argc++] = "-dQUIET"; -- if (gvw->ghostview.safer) argv[argc++] = "-dSAFER"; -+ if (gvw->ghostview.safer) { -+ argv[argc++] = "-dSAFER"; +--- src/Ghostview.c ++++ src/Ghostview.c 2008-03-27 13:50:57.606662000 +0100 +@@ -1419,6 +1419,12 @@ StartInterpreter(w) + if (gvw->ghostview.safer) + { + argv[argc++] = "-dSAFER"; +# ifdef ALLOW_PDF + /* The file created by pdf2dsc opens the original + pdf file with the read operator. */ + if (gv_filename_dsc && (!gvw->ghostview.filename || !strcmp(gvw->ghostview.filename,"-"))) -+ argv[argc++] = "-dDELAYSAFER"; -+ } ++ argv[argc++] = "-dDELAYSAFER"; +# endif + } + if (gvw->ghostview.arguments) { - cptr = arguments = GV_XtNewString(gvw->ghostview.arguments); - while (isspace(*cptr)) cptr++; ---- source/Imakefile -+++ source/Imakefile 2006-02-28 15:49:27.000000000 +0100 -@@ -213,7 +213,7 @@ - #endif /* InstallProgram */ - - MANDIR=$(GV_MANDIR) --ComplexProgramTarget(gv) -+ComplexProgramTargetNoMan(gv) - InstallNonExec($(GV_SYSTEM_AD),$(GV_LIBDIR)) - InstallNonExec($(GV_USER_AD),$(GV_LIBDIR)) - InstallNonExec($(GV_CLASS_AD),$(GV_LIBDIR)) ---- source/gv_misc_res.dat -+++ source/gv_misc_res.dat 2006-02-28 15:49:27.000000000 +0100 -@@ -50,7 +50,7 @@ +--- src/Makefile.am ++++ src/Makefile.am 2008-03-27 17:36:23.280458747 +0100 +@@ -6,9 +6,9 @@ + + # File distribution + bin_PROGRAMS = gv +-dist_pkglib_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat ++dist_pkglib_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat gv_widgetless.dat + +-appdefaultsdir = $(pkglibdir) ++appdefaultsdir = $(datadir)/X11/app-defaults + + appdefaults_DATA = GV + +@@ -172,7 +172,7 @@ $(srcdir)/gv_user.ad : $(srcdir)/gv_user + @echo "! gv_user.ad" >> $(srcdir)/gv_user.ad + @echo "! User specific application defaults for gv" >> $(srcdir)/gv_user.ad + @echo "! Copyright (C) 1995, 1996, 1997 Johannes Plass" >> $(srcdir)/gv_user.ad +- @echo "! Copyright (C) 2004,2005,2006,2007 Jos� E. Marchesi" >> $(srcdir)/gv_user.ad ++ @echo "! Copyright (C) 2004,2005,2006,2007 Jose E. Marchesi" >> $(srcdir)/gv_user.ad + @echo "!" >> $(srcdir)/gv_user.ad + @cat $(srcdir)/gv_user_res.dat >> $(srcdir)/gv_user.ad + @cat $(srcdir)/gv_intern_res_unix.dat >> $(srcdir)/gv_user.ad +@@ -215,7 +215,7 @@ $(srcdir)/gv_class.ad : $(srcdir)/gv_fon + @echo "! gv_class.ad" >> $(srcdir)/gv_class.ad + @echo "! Application class defaults for gv" >> $(srcdir)/gv_class.ad + @echo "! Copyright (C) 1995, 1996, 1997 Johannes Plass" >> $(srcdir)/gv_class.ad +- @echo "! Copyright (C) 2004,2005,2006,2007 Jos� E. Marchesi" >> $(srcdir)/gv_class.ad ++ @echo "! Copyright (C) 2004,2005,2006,2007 Jose E. Marchesi" >> $(srcdir)/gv_class.ad + @echo "!" >> $(srcdir)/gv_class.ad + @echo "" >> $(srcdir)/gv_class.ad + @cat $(srcdir)/gv_user_res.dat >> $(srcdir)/gv_class.ad +@@ -236,7 +236,7 @@ $(srcdir)/gv_make_res.dat : + @echo "GV.useBackingPixmap: $(USE_BACKING_PIXMAP)" >> $(srcdir)/gv_make_res.dat + @echo "GV*dirs: Home\n\\" >> $(srcdir)/gv_make_res.dat + @echo " Tmp\n\\" >> $(srcdir)/gv_make_res.dat +- @echo " /usr/doc\n\\" >> $(srcdir)/gv_make_res.dat ++ @echo " /usr/share/doc\n\\" >> $(srcdir)/gv_make_res.dat + @echo " /usr/local/doc" >> $(srcdir)/gv_make_res.dat + @echo "GV*filter: no .*" >> $(srcdir)/gv_make_res.dat + @echo "GV*filters: None\n\\" >> $(srcdir)/gv_make_res.dat +--- src/gv_misc_res.dat ++++ src/gv_misc_res.dat 2006-02-28 15:49:27.000000000 +0100 +@@ -50,7 +50,7 @@ GV*Scrollbar.background: gray78 GV*Scrollbar.pointerColor: black GV*Scrollbar.pointerColorBackground: White GV*Scrollbar.scrollbarBackground: gray71 @@ -160,9 +124,9 @@ GV*optionsetupPopup*Text*Scrollbar.background:gray71 GV*optionfsPopup*Text*Scrollbar.background:gray71 ---- source/misc.c -+++ source/misc.c 2006-02-28 15:49:27.000000000 +0100 -@@ -1435,7 +1435,8 @@ +--- src/misc.c ++++ src/misc.c 2006-02-28 15:49:27.000000000 +0100 +@@ -1337,7 +1337,8 @@ set_new_orientation(pagenumber) else if ( no == O_LANDSCAPE) w = landscapeEntry; else if ( no == O_UPSIDEDOWN) w = upsidedownEntry; else w = seascapeEntry; @@ -172,7 +136,7 @@ if (gv_swap_landscape != gv_swap_landscape_old) widgets_setSelectedBitmap(swapEntry,gv_swap_landscape); -@@ -1467,12 +1468,15 @@ +@@ -1369,13 +1370,17 @@ set_pagemediaButton_label(media_id) Widget w; if (pagemediaEntry[media_id]) w = pagemediaEntry[media_id]; else w = pagemediaEntry[media_id-1]; @@ -186,9 +150,11 @@ XtSetValues(pagemediaButton, args, ONE); +out: ENDMESSAGE(set_pagemediaButton_label) ++ return; } -@@ -1541,7 +1545,8 @@ + /*------------------------------------------------------------*/ +@@ -1443,7 +1448,8 @@ set_new_pagemedia(pagenumber) else bitmap = app_res.selected_bitmap; if (pagemediaEntry[gv_pagemedia]) w = pagemediaEntry[gv_pagemedia]; else w = pagemediaEntry[gv_pagemedia-1]; @@ -198,29 +164,14 @@ } if (gv_pagemedia_auto != gv_pagemedia_auto_old) widgets_setSelectedBitmap(autoMediaEntry,gv_pagemedia_auto); ---- source/paths.h -+++ source/paths.h 2006-02-28 15:49:27.000000000 +0100 -@@ -34,9 +34,9 @@ - # define INC_XMU(aaa) <XMU_DIRECTORY/aaa> - # define INC_XAW(aaa) <XAW_DIRECTORY/aaa> - #else --# define INC_X11(aaa) <X11/##aaa##> --# define INC_XMU(aaa) <X11/Xmu/##aaa##> --# define INC_XAW(aaa) <X11/Xaw3d/##aaa##> -+# define INC_X11(aaa) <X11/aaa> -+# define INC_XMU(aaa) <X11/Xmu/aaa> -+# define INC_XAW(aaa) <X11/Xaw3d/aaa> +--- src/ps.c ++++ src/ps.c 2008-03-27 18:28:32.973306228 +0100 +@@ -75,6 +75,8 @@ + #define BUFSIZ 1024 #endif + #include <ctype.h> ++#include <sys/types.h> ++#include <sys/stat.h> - #endif /* _PATHS_H_ */ ---- source/process.c -+++ source/process.c 2006-02-28 15:50:00.000000000 +0100 -@@ -272,7 +272,7 @@ - pid = fork(); - - if (pid == 0) { /* child */ -- char *argv[3]; -+ char *argv[4]; - char *c; - - INFMESSAGE(child process) + #include "paths.h" + #include INC_X11(Intrinsic.h) ++++++ gv-3.5.8-I18N-mb.patch -> gv-3.6.3-I18N-mb.patch ++++++ ++++ 1142 lines (skipped) ++++ between gv/gv-3.5.8-I18N-mb.patch ++++ and /mounts/work_src_done/STABLE/gv/gv-3.6.3-I18N-mb.patch ++++++ gv-3.6.3-intptr_t.patch ++++++ --- src/FileSel.c +++ src/FileSel.c 2008-03-27 17:10:04.806005718 +0100 @@ -40,6 +40,7 @@ #include <stdlib.h> /* for malloc etc.*/ #include <ctype.h> /* for toupper */ #include <stdio.h> +#include <stdint.h> #include <sys/types.h> #include <sys/stat.h> @@ -1045,9 +1046,9 @@ static void FS_listAction(w, event, para if (!scrolling) { int entry = VlistEntryOfPosition(list,(int)event->xbutton.y); if (entry >=0 && entry < VlistEntries(list)) { - if (list == FS_CURLIST) CurDirSelectionProc(list,NULL,(XtPointer)entry); - else if (list == FS_SUBLIST) SubDirSelectionProc(list,NULL,(XtPointer)entry); - else if (list == FS_TOPLIST) TopDirSelectionProc(list,NULL,(XtPointer)entry); + if (list == FS_CURLIST) CurDirSelectionProc(list,NULL,(XtPointer)(intptr_t)entry); + else if (list == FS_SUBLIST) SubDirSelectionProc(list,NULL,(XtPointer)(intptr_t)entry); + else if (list == FS_TOPLIST) TopDirSelectionProc(list,NULL,(XtPointer)(intptr_t)entry); } } } @@ -1660,7 +1661,7 @@ TopDirSelectionProc(w, client_data, call XtPointer client_data, call_data; { FS_WIDGET XtParent(XtParent(XtParent(XtParent(w)))); - int item = (int) call_data; + intptr_t item = (intptr_t) call_data; char newpath[FS_MAXNAMLEN]; BEGINMESSAGE(TopDirSelectionProc) @@ -1706,7 +1707,7 @@ CurDirSelectionProc(w, client_data, call { FS_WIDGET XtParent(XtParent(XtParent(XtParent(w)))); char name[10]; - int item = (int) call_data; + intptr_t item = (intptr_t) call_data; BEGINMESSAGE(CurDirSelectionProc) @@ -1748,7 +1749,7 @@ SubDirSelectionProc(w, client_data, call Widget w; XtPointer client_data, call_data; { - int item = (int)call_data; + intptr_t item = (intptr_t)call_data; FS_WIDGET XtParent(XtParent(XtParent(XtParent(w)))); char newpath[FS_MAXNAMLEN]; @@ -1845,14 +1846,14 @@ SMESSAGE(XtName(p)) { Widget clip=NULL,aaa=NULL,scroll=NULL; FS_WIDGET p; - int style = (int)client_data; + intptr_t style = (intptr_t)client_data; if (s[0] == 'c') { clip = FS_CURCLIP; aaa = FS_CURAAA; scroll = FS_CURSCROLL; } else if (s[0] == 's') { clip = FS_SUBCLIP; aaa = FS_SUBAAA; scroll = FS_SUBSCROLL; } else style=0; if (style == SCROLL_SCROLLPROC || style == SCROLL_JUMPPROC) { int x,y; x = (int) aaa->core.x; - if (((int)client_data)==1) y = (int) aaa->core.y - (int)call_data; + if (((intptr_t)client_data)==1) y = (int) aaa->core.y - (intptr_t)call_data; else y = (int)(-*((float*)call_data) * aaa->core.height); ClipWidgetSetCoordinates(clip, x, y); } else if (style == SCROLL_CLIPREPORT) { --- src/actions.c +++ src/actions.c 2004-04-30 16:35:07.000000000 +0200 @@ -40,6 +40,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> +#include <stdint.h> #include "paths.h" #include INC_X11(Intrinsic.h) @@ -897,7 +898,7 @@ action_setPageMark(w, event, params, num else if (!strcmp(params[1],mark)) spm=spm|SPM_MARK; else spm=spm|SPM_UNMARK; - cb_setPageMark((Widget)NULL,(XtPointer)spm,NULL); + cb_setPageMark((Widget)NULL,(XtPointer)(intptr_t)spm,NULL); ENDMESSAGE(action_setPageMark) } @@ -945,7 +946,7 @@ action_setScale(w, event, params, num_pa if (i<0) i = (-i)|SCALE_MIN; i |= SCALE_REL; } - cb_setScale(w, (XtPointer)i, NULL); + cb_setScale(w, (XtPointer)(intptr_t)i, NULL); ENDMESSAGE(action_setScale) } @@ -971,7 +972,7 @@ action_setOrientation(w, event, params, return; } o = doc_convStringToDocOrient(params[0]); - if (o != O_UNSPECIFIED) cb_setOrientation(w, (XtPointer)o, NULL); + if (o != O_UNSPECIFIED) cb_setOrientation(w, (XtPointer)(intptr_t)o, NULL); ENDMESSAGE(action_setOrientation) } @@ -999,7 +1000,7 @@ action_setPagemedia(w, event, params, nu } m = doc_convStringToPageMedia(doc,params[0]); - if (m!= MEDIA_ID_INVALID) cb_setPagemedia(w, (XtPointer)m, NULL); + if (m!= MEDIA_ID_INVALID) cb_setPagemedia(w, (XtPointer)(intptr_t)m, NULL); ENDMESSAGE(action_setPagemedia) } --- src/callbacks.c +++ src/callbacks.c 2008-03-27 17:13:48.466712393 +0100 @@ -40,6 +40,7 @@ #include <stdlib.h> #include <time.h> #include <ctype.h> +#include <stdint.h> #ifndef BUFSIZ # define BUFSIZ 1024 @@ -152,9 +153,9 @@ cb_newtocScrollbar(w, client_data, call_ BEGINMESSAGE(cb_newtocScrollbar) x = (int) newtocControl->core.x; - if (((int)client_data)==1) { - int dy = (int)call_data; - y = (int) newtocControl->core.y - dy; + if (((intptr_t)client_data)==1) { + intptr_t dy = (intptr_t)call_data; + y = (int)((intptr_t) newtocControl->core.y - dy); } else { float *percent = (float *) call_data; y = (int)(-*percent * newtocControl->core.height); @@ -262,7 +263,7 @@ void cb_useBackingPixmap(w, client_data, Widget w; XtPointer client_data, call_data; { - int i = (int)client_data; + intptr_t i = (intptr_t)client_data; BEGINMESSAGE(cb_useBackingPixmap) if (i&1) { @@ -366,7 +367,7 @@ cb_checkFile(w, client_data, call_data) int changed; BEGINMESSAGE(cb_checkFile) - changed = check_file(((int)client_data)); + changed = check_file(((intptr_t)client_data)); if (changed==1) { cb_stopInterpreter(page,NULL,NULL); @@ -392,7 +393,7 @@ static void watch_file (client_data, idp BEGINMESSAGE(watch_file) /* notification after timeout */ - if ((int)client_data && app_res.watch_file) { + if ((intptr_t)client_data && app_res.watch_file) { if (!file_fileIsNotUseful(gv_filename)) { int error; String s; @@ -509,7 +510,7 @@ cb_print(w, client_data, call_data) return; } - gv_print_mode = (int)client_data; + gv_print_mode = (intptr_t)client_data; pagelist=get_pagelist(&gv_print_mode); if (pagelist) GV_XtFree(pagelist); if (gv_print_mode==PAGE_MODE_INVALID) { @@ -627,7 +628,7 @@ cb_save(w, client_data, call_data) BEGINMESSAGE(cb_save) - gv_save_mode = (int)client_data; + gv_save_mode = (intptr_t)client_data; pagelist=get_pagelist(&gv_save_mode); if (pagelist) GV_XtFree(pagelist); if (gv_save_mode==PAGE_MODE_INVALID) { @@ -708,10 +709,10 @@ cb_doSave(w, client_data, call_data) String name; String error=NULL; char *pagelist; - int type; + intptr_t type; BEGINMESSAGE(cb_doSave) - if (client_data) type = (int)client_data; + if (client_data) type = (intptr_t)client_data; else type = FILE_TYPE_PS; name = XawFileSelectionGetPath(FileSel); @@ -932,7 +933,7 @@ cb_positionPage(w, client_data, call_dat cow = (int)control->core.width; coh = (int)control->core.height; - if ((int)client_data) center = True; + if ((intptr_t)client_data) center = True; if (!center) have_pagepos=misc_restorePagePosition(&px,&py); if (app_res.auto_center == True) center = True; @@ -973,7 +974,7 @@ cb_setPageMark(w, client_data, call_data Widget w; XtPointer client_data, call_data; { - int r=(int)client_data; + intptr_t r = (intptr_t)client_data; int entry=XawVlistInvalid,change=XawVlistInvalid; BEGINMESSAGE(cb_setPageMark) @@ -1026,10 +1027,10 @@ cb_setScale(w, client_data, call_data) Widget w; XtPointer client_data, call_data; { - int i=(int)client_data; + intptr_t i=(intptr_t)client_data; BEGINMESSAGE(cb_setScale) - i = scale_checkScaleNum(gv_scales,i); + i = scale_checkScaleNum(gv_scales, (int)i); if (i>=0) { if (i&SCALE_BAS) gv_scale_base = i&SCALE_VAL; else gv_scale = i&SCALE_VAL; @@ -1051,7 +1052,7 @@ cb_setOrientation(w, client_data, call_d Widget w; XtPointer client_data, call_data; { - int o = (int) client_data; + intptr_t o = (intptr_t) client_data; int changed = 1; BEGINMESSAGE(cb_setOrientation) @@ -1097,7 +1098,7 @@ cb_setPagemedia(w, client_data, call_dat Widget w; XtPointer client_data, call_data; { - int media = (int)client_data; + intptr_t media = (intptr_t)client_data; int media_bbox = doc ? doc->nummedia : 0; BEGINMESSAGE(cb_setPagemedia) --- src/main.c +++ src/main.c 2004-04-30 16:36:16.000000000 +0200 @@ -72,6 +72,8 @@ #include <sys/stat.h> #include <unistd.h> +#include <stdint.h> + #include "types.h" #include "actions.h" #include "callbacks.h" @@ -1349,8 +1351,8 @@ void main_createScaleMenu() have_line=True; } scaleEntry[i] = XtCreateManagedWidget(gv_scales[i]->name, smeBSBObjectClass,scaleMenu,args,n); - if (gv_scales[i]->is_base) XtAddCallback(scaleEntry[i], XtNcallback,cb_setScale,(XtPointer)(i|SCALE_BAS)); - else XtAddCallback(scaleEntry[i], XtNcallback,cb_setScale,(XtPointer)(i|SCALE_ABS)); + if (gv_scales[i]->is_base) XtAddCallback(scaleEntry[i], XtNcallback,cb_setScale,(XtPointer)(intptr_t)(i|SCALE_BAS)); + else XtAddCallback(scaleEntry[i], XtNcallback,cb_setScale,(XtPointer)(intptr_t)(i|SCALE_ABS)); } ENDMESSAGE(main_createScaleMenu) } --- src/misc.c +++ src/misc.c 2004-04-30 16:35:07.000000000 +0200 @@ -65,6 +65,7 @@ #include <stdio.h> #include <stdlib.h> #include <ctype.h> +#include <stdint.h> #ifndef SEEK_SET # define SEEK_SET 0 @@ -1555,7 +1556,7 @@ void misc_buildPagemediaMenu() if (doc && doc->nummedia) { for (i = 0; i < doc->nummedia; i++) { pagemediaEntry[i] = XtCreateManagedWidget(doc->media[i].name,smeBSBObjectClass, pagemediaMenu,NULL,(Cardinal)0); - XtAddCallback(pagemediaEntry[i], XtNcallback,cb_setPagemedia, (XtPointer)i); + XtAddCallback(pagemediaEntry[i], XtNcallback,cb_setPagemedia, (XtPointer)(intptr_t)i); } w = XtCreateManagedWidget("line", smeLineObjectClass, pagemediaMenu,NULL,(Cardinal)0); } @@ -1565,7 +1566,7 @@ void misc_buildPagemediaMenu() if (!(gv_medias[i]->used)) continue; pagemediaEntry[i+num_doc_media] = XtCreateManagedWidget(gv_medias[i]->name,smeBSBObjectClass, pagemediaMenu,NULL,(Cardinal)0); - XtAddCallback(pagemediaEntry[i+num_doc_media], XtNcallback,cb_setPagemedia, (XtPointer)(i+num_doc_media)); + XtAddCallback(pagemediaEntry[i+num_doc_media], XtNcallback,cb_setPagemedia, (XtPointer)(intptr_t)(i+num_doc_media)); } { Boolean b = (doc_mediaIsOk(doc,current_page,num_doc_media) ? True : False); --- src/options_gv.c +++ src/options_gv.c 2004-04-30 16:35:07.000000000 +0200 @@ -40,6 +40,7 @@ #include <stdio.h> #include <stdlib.h> #include <ctype.h> +#include <stdint.h> #include "paths.h" #include INC_X11(Intrinsic.h) @@ -252,7 +253,7 @@ static void options_gv_cb_apply(w, clien k = gv_pagemedia; gv_pagemedia_auto = 0; i = doc_convStringToPageMedia(doc,app_res.default_pagemedia); - cb_setPagemedia(NULL,(XtPointer)i,(XtPointer)1); + cb_setPagemedia(NULL,(XtPointer)(intptr_t)i,(XtPointer)(intptr_t)1); if ((j != gv_pagemedia_auto) || (k != gv_pagemedia)) redisplay = True; } s_media = True; @@ -277,7 +278,7 @@ static void options_gv_cb_apply(w, clien j = gv_orientation_auto; k = gv_orientation; gv_orientation_auto = 0; - cb_setOrientation(NULL,(XtPointer)i,(XtPointer)1); + cb_setOrientation(NULL,(XtPointer)(intptr_t)i,(XtPointer)(intptr_t)1); if ((j != gv_orientation_auto) || (k != gv_orientation)) redisplay = True; } s_orient = True; ++++++ gv-3.5.8-security.patch -> gv-3.6.3-security.patch ++++++ --- gv/gv-3.5.8-security.patch 2002-11-08 12:09:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/gv/gv-3.6.3-security.patch 2008-03-27 17:37:42.338602000 +0100 @@ -1,159 +1,402 @@ ---- gv-3.5.8/source/Imakefile.security Fri Sep 20 13:54:53 2002 -+++ gv-3.5.8/source/Imakefile Fri Sep 20 13:55:18 2002 -@@ -63,6 +63,7 @@ - resource.c\ - save.c\ - scale.c\ -+ secscanf.c\ - signal.c\ - version.c\ - widgets_misc.c\ -@@ -106,6 +107,7 @@ - resource.o\ - save.o\ - scale.o\ -+ secscanf.o\ - signal.o\ - version.o\ - widgets_misc.o\ ---- gv-3.5.8/source/ps.c.security Fri Sep 20 13:54:53 2002 -+++ gv-3.5.8/source/ps.c Fri Sep 20 13:54:53 2002 -@@ -93,6 +93,8 @@ +--- src/Makefile.am ++++ src/Makefile.am 2008-03-27 14:10:24.644359171 +0100 +@@ -123,6 +123,7 @@ gv_SOURCES = Aaa.c \ + save.h \ + scale.c \ + scale.h \ ++ secscanf.c \ + gv_signal.c \ + gv_signal.h \ + version.c \ +--- src/Makefile.in ++++ src/Makefile.in 2008-03-27 14:18:31.898867989 +0100 +@@ -79,13 +79,13 @@ am__gv_SOURCES_DIST = Aaa.c Aaa_bison.c + options_gs.c options_gs.h options_gv.c options_gv.h \ + options_setup.c options_setup.h paths.h process.c process.h \ + popup.c popup.h ps.c ps.h resource.c resource.h save.c save.h \ +- scale.c scale.h gv_signal.c gv_signal.h version.c version.h \ +- versionp.h widgets_misc.c widgets_misc.h zoom.c zoom.h stdc.h \ +- Aaa_intern.h Aaa.h AaaP.h d_memdebug.h d_aaa_xtmem.h \ +- d_fs_xtmem.h d_gv_mem.h d_gv_xtmem.h d_proc_xtmem.h d_ps_mem.h \ +- d_ps_xtmem.h gv_message.h types.h Scrollbar.c Scrollbar.h \ +- ScrollbarP.h setenv.c setenv.h getenv.c d_mem.c d_mem.h \ +- d_xtmem.c d_xtmem.h ++ scale.c scale.h secscanf.c gv_signal.c gv_signal.h version.c \ ++ version.h versionp.h widgets_misc.c widgets_misc.h zoom.c \ ++ zoom.h stdc.h Aaa_intern.h Aaa.h AaaP.h d_memdebug.h \ ++ d_aaa_xtmem.h d_fs_xtmem.h d_gv_mem.h d_gv_xtmem.h \ ++ d_proc_xtmem.h d_ps_mem.h d_ps_xtmem.h gv_message.h types.h \ ++ Scrollbar.c Scrollbar.h ScrollbarP.h setenv.c setenv.h \ ++ getenv.c d_mem.c d_mem.h d_xtmem.c d_xtmem.h + @USE_SCROLLBAR_CODE_TRUE@am__objects_1 = Scrollbar.$(OBJEXT) + @USE_SETENV_CODE_TRUE@am__objects_2 = setenv.$(OBJEXT) \ + @USE_SETENV_CODE_TRUE@ getenv.$(OBJEXT) +@@ -103,9 +103,9 @@ am_gv_OBJECTS = Aaa.$(OBJEXT) Aaa_bison. + options_fs.$(OBJEXT) options_gs.$(OBJEXT) options_gv.$(OBJEXT) \ + options_setup.$(OBJEXT) process.$(OBJEXT) popup.$(OBJEXT) \ + ps.$(OBJEXT) resource.$(OBJEXT) save.$(OBJEXT) scale.$(OBJEXT) \ +- gv_signal.$(OBJEXT) version.$(OBJEXT) widgets_misc.$(OBJEXT) \ +- zoom.$(OBJEXT) $(am__objects_1) $(am__objects_2) \ +- $(am__objects_3) ++ secscanf.$(OBJEXT) gv_signal.$(OBJEXT) version.$(OBJEXT) \ ++ widgets_misc.$(OBJEXT) zoom.$(OBJEXT) $(am__objects_1) \ ++ $(am__objects_2) $(am__objects_3) + gv_OBJECTS = $(am_gv_OBJECTS) + gv_LDADD = $(LDADD) + gv_DEPENDENCIES = $(top_srcdir)/lib/libgnu.a +@@ -261,8 +261,8 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-dist_pkglib_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat gv_widgetless.dat +-appdefaultsdir = /etc/X11/app-defaults ++dist_pkglib_DATA = gv_system.ad gv_user.ad gv_class.ad gv_spartan.dat gv_user_res.dat gv_copyright.dat ++appdefaultsdir = $(pkglibdir) + appdefaults_DATA = GV + EXTRA_DIST = ad2c gv_font_res.dat gv_layout_res.dat gv_misc_res.dat Aaa_bison.yacc \ + gv_current.xbm gv_doc.xbm gv_empty.xbm gv_even.xbm gv_icon.xbm gv_odd.xbm \ +@@ -303,9 +303,9 @@ gv_SOURCES = Aaa.c Aaa_bison.c Aaa_bison + options_gs.c options_gs.h options_gv.c options_gv.h \ + options_setup.c options_setup.h paths.h process.c process.h \ + popup.c popup.h ps.c ps.h resource.c resource.h save.c save.h \ +- scale.c scale.h gv_signal.c gv_signal.h version.c version.h \ +- versionp.h widgets_misc.c widgets_misc.h zoom.c zoom.h \ +- message.h stdc.h Aaa_intern.h Aaa.h AaaP.h d_memdebug.h \ ++ scale.c scale.h secscanf.c gv_signal.c gv_signal.h version.c \ ++ version.h versionp.h widgets_misc.c widgets_misc.h zoom.c \ ++ zoom.h message.h stdc.h Aaa_intern.h Aaa.h AaaP.h d_memdebug.h \ + d_aaa_xtmem.h d_fs_xtmem.h d_gv_mem.h d_gv_xtmem.h \ + d_proc_xtmem.h d_ps_mem.h d_ps_xtmem.h gv_message.h types.h \ + $(am__append_1) $(am__append_2) $(am__append_3) +@@ -436,6 +436,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resource.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scale.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/secscanf.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/setenv.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/widgets_misc.Po@am__quote@ +@@ -746,7 +747,7 @@ $(srcdir)/gv_make_res.dat : + @echo "GV.useBackingPixmap: $(USE_BACKING_PIXMAP)" >> $(srcdir)/gv_make_res.dat + @echo "GV*dirs: Home\n\\" >> $(srcdir)/gv_make_res.dat + @echo " Tmp\n\\" >> $(srcdir)/gv_make_res.dat +- @echo " /usr/share/doc\n\\" >> $(srcdir)/gv_make_res.dat ++ @echo " /usr/doc\n\\" >> $(srcdir)/gv_make_res.dat + @echo " /usr/local/doc" >> $(srcdir)/gv_make_res.dat + @echo "GV*filter: no .*" >> $(srcdir)/gv_make_res.dat + @echo "GV*filters: None\n\\" >> $(srcdir)/gv_make_res.dat +--- src/ps.c ++++ src/ps.c 2008-03-27 14:20:04.186703895 +0100 +@@ -93,6 +93,10 @@ extern Media *gv_medias; #define memset(a,b,c) bzero(a,c) #endif -+extern int sec_scanf(const char *, const char *, ...); ++extern int sec_sscanf(const char *, const char *, ...); + - /* length calculates string length at compile time */ - /* can only be used with character constants */ - #define length(a) (sizeof((a))-1) -@@ -483,7 +485,7 @@ ++ ++ + /* We use this helper function for providing proper */ + /* case and colon :-) insensitive DSC matching */ + static int dsc_strncmp(s1, s2, n) +@@ -464,7 +468,7 @@ unc_ok: doc = (struct document *) PS_malloc(sizeof(struct document)); CHECK_MALLOCED(doc); memset(doc, 0, sizeof(struct document)); -- sscanf(line, "%*s %s", text); -+ sec_sscanf(line, "%*s %s", text, sizeof(text)); +- sscanf(line, "%*s %256s", text); ++ sec_sscanf(line, "%*s %256s", text); /*###jp###*/ /*doc->epsf = iscomment(text, "EPSF-");*/ doc->epsf = iscomment(text, "EPSF"); -@@ -576,7 +578,7 @@ +@@ -560,11 +564,11 @@ scan_ok: } else if (doc->date == NULL && iscomment(line+2, "CreationDate:")) { doc->date = gettextline(line+length("%%CreationDate:")); } else if (bb_set == NONE && iscomment(line+2, "BoundingBox:")) { -- sscanf(line+length("%%BoundingBox:"), "%s", text); -+ sec_sscanf(line+length("%%BoundingBox:"), "%s", text, sizeof(text)); +- sscanf(line+length("%%BoundingBox:"), "%256s", text); ++ sec_sscanf(line+length("%%BoundingBox:"), "%256s", text); if (strcmp(text, "(atend)") == 0) { bb_set = ATEND; } else { -@@ -608,7 +610,7 @@ +- if (sscanf(line+length("%%BoundingBox:"), "%d %d %d %d", ++ if (sec_sscanf(line+length("%%BoundingBox:"), "%d %d %d %d", + &(doc->boundingbox[LLX]), + &(doc->boundingbox[LLY]), + &(doc->boundingbox[URX]), +@@ -572,7 +576,7 @@ scan_ok: + bb_set = 1; + else { + float fllx, flly, furx, fury; +- if (sscanf(line+length("%%BoundingBox:"), "%f %f %f %f", ++ if (sec_sscanf(line+length("%%BoundingBox:"), "%f %f %f %f", + &fllx, &flly, &furx, &fury) == 4) { + bb_set = 1; + doc->boundingbox[LLX] = fllx; +@@ -592,7 +596,7 @@ scan_ok: } } else if (orientation_set == NONE && iscomment(line+2, "Orientation:")) { -- sscanf(line+length("%%Orientation:"), "%s", text); -+ sec_sscanf(line+length("%%Orientation:"), "%s", text, sizeof(text)); +- sscanf(line+length("%%Orientation:"), "%256s", text); ++ sec_sscanf(line+length("%%Orientation:"), "%256s", text); if (strcmp(text, "(atend)") == 0) { orientation_set = ATEND; } else if (strcmp(text, "Portrait") == 0) { -@@ -619,7 +621,7 @@ +@@ -603,7 +607,7 @@ scan_ok: orientation_set = 1; } } else if (page_order_set == NONE && iscomment(line+2, "PageOrder:")) { -- sscanf(line+length("%%PageOrder:"), "%s", text); -+ sec_sscanf(line+length("%%PageOrder:"), "%s", text, sizeof(text)); +- sscanf(line+length("%%PageOrder:"), "%256s", text); ++ sec_sscanf(line+length("%%PageOrder:"), "%256s", text); if (strcmp(text, "(atend)") == 0) { page_order_set = ATEND; } else if (strcmp(text, "Ascend") == 0) { -@@ -633,7 +635,7 @@ +@@ -617,11 +621,11 @@ scan_ok: page_order_set = 1; } } else if (pages_set == NONE && iscomment(line+2, "Pages:")) { -- sscanf(line+length("%%Pages:"), "%s", text); -+ sec_sscanf(line+length("%%Pages:"), "%s", text, sizeof(text)); +- sscanf(line+length("%%Pages:"), "%256s", text); ++ sec_sscanf(line+length("%%Pages:"), "%256s", text); if (strcmp(text, "(atend)") == 0) { pages_set = ATEND; } else { -@@ -853,7 +855,7 @@ +- switch (sscanf(line+length("%%Pages:"), "%d %d", ++ switch (sec_sscanf(line+length("%%Pages:"), "%d %d", + &maxpages, &i)) { + case 2: + if (page_order_set == NONE) { +@@ -653,7 +657,7 @@ scan_ok: + doc->media[0].name = ps_gettext(line+length("%%DocumentMedia:"), + &next_char); + if (doc->media[0].name != NULL) { +- if (sscanf(next_char, "%f %f", &w, &h) == 2) { ++ if (sec_sscanf(next_char, "%f %f", &w, &h) == 2) { + doc->media[0].width = w + 0.5; + doc->media[0].height = h + 0.5; + } +@@ -674,7 +678,7 @@ scan_ok: + doc->media[doc->nummedia].name = ps_gettext(line+length("%%+"), + &next_char); + if (doc->media[doc->nummedia].name != NULL) { +- if (sscanf(next_char, "%f %f", &w, &h) == 2) { ++ if (sec_sscanf(next_char, "%f %f", &w, &h) == 2) { + doc->media[doc->nummedia].width = w + 0.5; + doc->media[doc->nummedia].height = h + 0.5; + } +@@ -837,7 +841,7 @@ scan_ok: /* Do nothing */ } else if (doc->default_page_orientation == NONE && iscomment(line+2, "PageOrientation:")) { -- sscanf(line+length("%%PageOrientation:"), "%s", text); -+ sec_sscanf(line+length("%%PageOrientation:"), "%s", text, sizeof(text)); +- sscanf(line+length("%%PageOrientation:"), "%256s", text); ++ sec_sscanf(line+length("%%PageOrientation:"), "%256s", text); if (strcmp(text, "Portrait") == 0) { doc->default_page_orientation = PORTRAIT; } else if (strcmp(text, "Landscape") == 0) { -@@ -975,7 +977,7 @@ +@@ -856,7 +860,7 @@ scan_ok: + PS_free(cp); + } else if (page_bb_set == NONE && + iscomment(line+2, "PageBoundingBox:")) { +- if (sscanf(line+length("%%PageBoundingBox:"), "%d %d %d %d", ++ if (sec_sscanf(line+length("%%PageBoundingBox:"), "%d %d %d %d", + &(doc->default_page_boundingbox[LLX]), + &(doc->default_page_boundingbox[LLY]), + &(doc->default_page_boundingbox[URX]), +@@ -864,7 +868,7 @@ scan_ok: + page_bb_set = 1; + else { + float fllx, flly, furx, fury; +- if (sscanf(line+length("%%PageBoundingBox:"), "%f %f %f %f", ++ if (sec_sscanf(line+length("%%PageBoundingBox:"), "%f %f %f %f", + &fllx, &flly, &furx, &fury) == 4) { + page_bb_set = 1; + doc->default_page_boundingbox[LLX] = fllx; +@@ -959,7 +963,7 @@ scan_ok: /* Do nothing */ } else if (doc->default_page_orientation == NONE && iscomment(line+2, "PageOrientation:")) { -- sscanf(line+length("%%PageOrientation:"), "%s", text); -+ sec_sscanf(line+length("%%PageOrientation:"), "%s", text, sizeof(text)); +- sscanf(line+length("%%PageOrientation:"), "%256s", text); ++ sec_sscanf(line+length("%%PageOrientation:"), "%256s", text); if (strcmp(text, "Portrait") == 0) { doc->default_page_orientation = PORTRAIT; } else if (strcmp(text, "Landscape") == 0) { -@@ -1112,7 +1114,7 @@ +@@ -982,7 +986,7 @@ scan_ok: + PS_free(cp); + } else if (page_bb_set == NONE && + iscomment(line+2, "PageBoundingBox:")) { +- if (sscanf(line+length("%%PageBoundingBox:"), "%d %d %d %d", ++ if (sec_sscanf(line+length("%%PageBoundingBox:"), "%d %d %d %d", + &(doc->default_page_boundingbox[LLX]), + &(doc->default_page_boundingbox[LLY]), + &(doc->default_page_boundingbox[URX]), +@@ -990,7 +994,7 @@ scan_ok: + page_bb_set = 1; + else { + float fllx, flly, furx, fury; +- if (sscanf(line+length("%%PageBoundingBox:"), "%f %f %f %f", ++ if (sec_sscanf(line+length("%%PageBoundingBox:"), "%f %f %f %f", + &fllx, &flly, &furx, &fury) == 4) { + page_bb_set = 1; + doc->default_page_boundingbox[LLX] = fllx; +@@ -1058,7 +1062,7 @@ newpage: + CHECK_MALLOCED(doc->pages); + } + label = ps_gettext(line+length("%%Page:"), &next_char); +- if (sscanf(next_char, "%d", &thispage) != 1) thispage = 0; ++ if (sec_sscanf(next_char, "%d", &thispage) != 1) thispage = 0; + if (nextpage == 1) { + ignore = thispage != 1; + } +@@ -1096,7 +1100,7 @@ continuepage: /* Do nothing */ } else if (doc->pages[doc->numpages].orientation == NONE && iscomment(line+2, "PageOrientation:")) { -- sscanf(line+length("%%PageOrientation:"), "%s", text); -+ sec_sscanf(line+length("%%PageOrientation:"), "%s", text, sizeof(text)); +- sscanf(line+length("%%PageOrientation:"), "%256s", text); ++ sec_sscanf(line+length("%%PageOrientation:"), "%256s", text); if (strcmp(text, "Portrait") == 0) { doc->pages[doc->numpages].orientation = PORTRAIT; } else if (strcmp(text, "Landscape") == 0) { -@@ -1144,7 +1146,7 @@ +@@ -1128,11 +1132,11 @@ continuepage: PS_free(cp); } else if ((page_bb_set == NONE || page_bb_set == ATEND) && iscomment(line+2, "PageBoundingBox:")) { -- sscanf(line+length("%%PageBoundingBox:"), "%s", text); -+ sec_sscanf(line+length("%%PageBoundingBox:"), "%s", text, sizeof(text)); +- sscanf(line+length("%%PageBoundingBox:"), "%256s", text); ++ sec_sscanf(line+length("%%PageBoundingBox:"), "%256s", text); if (strcmp(text, "(atend)") == 0) { page_bb_set = ATEND; } else { -@@ -1258,14 +1260,14 @@ +- if (sscanf(line+length("%%PageBoundingBox:"), "%d %d %d %d", ++ if (sec_sscanf(line+length("%%PageBoundingBox:"), "%d %d %d %d", + &(doc->pages[doc->numpages].boundingbox[LLX]), + &(doc->pages[doc->numpages].boundingbox[LLY]), + &(doc->pages[doc->numpages].boundingbox[URX]), +@@ -1142,7 +1146,7 @@ continuepage: + } + else { + float fllx, flly, furx, fury; +- if (sscanf(line+length("%%PageBoundingBox:"), ++ if (sec_sscanf(line+length("%%PageBoundingBox:"), + "%f %f %f %f", + &fllx, &flly, &furx, &fury) == 4) { + if (page_bb_set == NONE) page_bb_set = 1; +@@ -1193,7 +1197,7 @@ continuepage: + /* Do nothing */ + } else if (iscomment(line+2, "Page:")) { + PS_free(ps_gettext(line+length("%%Page:"), &next_char)); +- if (sscanf(next_char, "%d", &thispage) != 1) thispage = 0; ++ if (sec_sscanf(next_char, "%d", &thispage) != 1) thispage = 0; + if (!ignore && thispage == nextpage) { + if (doc->numpages > 0) { + doc->pages[doc->numpages-1].end = position; +@@ -1220,13 +1224,13 @@ continuepage: + doc->begintrailer = position; + section_len = line_len; + } else if (bb_set == ATEND && iscomment(line+2, "BoundingBox:")) { +- if (sscanf(line+length("%%BoundingBox:"), "%d %d %d %d", ++ if (sec_sscanf(line+length("%%BoundingBox:"), "%d %d %d %d", + &(doc->boundingbox[LLX]), + &(doc->boundingbox[LLY]), + &(doc->boundingbox[URX]), + &(doc->boundingbox[URY])) != 4) { + float fllx, flly, furx, fury; +- if (sscanf(line+length("%%BoundingBox:"), "%f %f %f %f", ++ if (sec_sscanf(line+length("%%BoundingBox:"), "%f %f %f %f", + &fllx, &flly, &furx, &fury) == 4) { + doc->boundingbox[LLX] = fllx; + doc->boundingbox[LLY] = flly; +@@ -1244,14 +1248,14 @@ continuepage: } } else if (orientation_set == ATEND && iscomment(line+2, "Orientation:")) { -- sscanf(line+length("%%Orientation:"), "%s", text); -+ sec_sscanf(line+length("%%Orientation:"), "%s", text, sizeof(text)); +- sscanf(line+length("%%Orientation:"), "%256s", text); ++ sec_sscanf(line+length("%%Orientation:"), "%256s", text); if (strcmp(text, "Portrait") == 0) { doc->orientation = PORTRAIT; } else if (strcmp(text, "Landscape") == 0) { doc->orientation = LANDSCAPE; } } else if (page_order_set == ATEND && iscomment(line+2, "PageOrder:")) { -- sscanf(line+length("%%PageOrder:"), "%s", text); -+ sec_sscanf(line+length("%%PageOrder:"), "%s", text, sizeof(text)); +- sscanf(line+length("%%PageOrder:"), "%256s", text); ++ sec_sscanf(line+length("%%PageOrder:"), "%256s", text); if (strcmp(text, "Ascend") == 0) { doc->pageorder = ASCEND; } else if (strcmp(text, "Descend") == 0) { -@@ -1819,7 +1821,7 @@ +@@ -1260,7 +1264,7 @@ continuepage: + doc->pageorder = SPECIAL; + } + } else if (pages_set == ATEND && iscomment(line+2, "Pages:")) { +- if (sscanf(line+length("%%Pages:"), "%*u %d", &i) == 1) { ++ if (sec_sscanf(line+length("%%Pages:"), "%*u %d", &i) == 1) { + if (page_order_set == NONE) { + if (i == -1) doc->pageorder = DESCEND; + else if (i == 0) doc->pageorder = SPECIAL; +@@ -1286,7 +1290,7 @@ continuepage: + preread = 0; + if (DSCcomment(line) && iscomment(line+2, "Page:")) { + PS_free(ps_gettext(line+length("%%Page:"), &next_char)); +- if (sscanf(next_char, "%d", &thispage) != 1) thispage = 0; ++ if (sec_sscanf(next_char, "%d", &thispage) != 1) thispage = 0; + if (!ignore && thispage == nextpage) { + if (doc->numpages > 0) { + doc->pages[doc->numpages-1].end = position; +@@ -1825,7 +1829,7 @@ static char * readline (fd, lineP, posit INFMESSAGE(encountered "BeginData:") if (FD_LINE_LEN > 100) FD_BUF[100] = '\0'; text[0] = '\0'; -- if (sscanf(line+length("%%BeginData:"), "%d %*s %s", &num, text) >= 1) { -+ if (sec_sscanf(line+length("%%BeginData:"), "%d %*s %s", &num, text, sizeof(text)) >= 1) { +- if (sscanf(line+length("%%BeginData:"), "%d %*s %100s", &num, text) >= 1) { ++ if (sec_sscanf(line+length("%%BeginData:"), "%d %*s %100s", &num, text) >= 1) { if (strcmp(text, "Lines") == 0) { INFIMESSAGE(number of lines to skip:,num) while (num) { -@@ -1918,7 +1920,7 @@ +@@ -1849,7 +1853,7 @@ static char * readline (fd, lineP, posit + else if IS_BEGIN("Binary:") { + int num; + INFMESSAGE(encountered "BeginBinary:") +- if (sscanf(line+length("%%BeginBinary:"), "%d", &num) == 1) { ++ if (sec_sscanf(line+length("%%BeginBinary:"), "%d", &num) == 1) { + int read_chunk_size = LINE_CHUNK_SIZE; + INFIMESSAGE(number of chars to skip:,num) + while (num>0) { +@@ -1924,7 +1928,7 @@ pscopyuntil(fd, to, begin, end, comment) INFMESSAGE(encountered "BeginData:") if (FD_LINE_LEN > 100) FD_BUF[100] = '\0'; text[0] = '\0'; -- if (sscanf(line+length("%%BeginData:"), "%d %*s %s", &num, text) >= 1) { -+ if (sec_sscanf(line+length("%%BeginData:"), "%d %*s %s", &num, text, sizeof(text)) >= 1) { +- if (sscanf(line+length("%%BeginData:"), "%d %*s %100s", &num, text) >= 1) { ++ if (sec_sscanf(line+length("%%BeginData:"), "%d %*s %100s", &num, text) >= 1) { if (strcmp(text, "Lines") == 0) { INFIMESSAGE(number of lines:,num) while (num) { -@@ -2015,7 +2017,7 @@ +@@ -1947,7 +1951,7 @@ pscopyuntil(fd, to, begin, end, comment) + else if IS_BEGIN("Binary:") { + int num; + INFMESSAGE(encountered "BeginBinary:") +- if (sscanf(line+length("%%BeginBinary:"), "%d", &num) == 1) { ++ if (sec_sscanf(line+length("%%BeginBinary:"), "%d", &num) == 1) { + int read_chunk_size = LINE_CHUNK_SIZE; + INFIMESSAGE(number of chars:,num) + while (num>0) { +@@ -2021,12 +2025,12 @@ pscopydoc(dest_file,src_filename,d,pagel PS_free(comment); continue; } -- sscanf(comment+length("%%Pages:"), "%s", text); -+ sec_sscanf(comment+length("%%Pages:"), "%s", text, sizeof(text)); +- sscanf(comment+length("%%Pages:"), "%256s", text); ++ sec_sscanf(comment+length("%%Pages:"), "%256s", text); if (strcmp(text, "(atend)") == 0) { fputs(comment, dest_file); pages_atend = True; ---- gv-3.5.8/source/secscanf.c.security Fri Sep 20 13:54:53 2002 -+++ gv-3.5.8/source/secscanf.c Fri Sep 20 13:54:53 2002 + } else { +- switch (sscanf(comment+length("%%Pages:"), "%*d %d", &i)) { ++ switch (sec_sscanf(comment+length("%%Pages:"), "%*d %d", &i)) { + case 1: + fprintf(dest_file, "%%%%Pages: %d %d\n", pages, i); + break; +@@ -2061,7 +2065,7 @@ pscopydoc(dest_file,src_filename,d,pagel + PS_free(comment); + continue; + } +- switch (sscanf(comment+length("%%Pages:"), "%*d %d", &i)) { ++ switch (sec_sscanf(comment+length("%%Pages:"), "%*d %d", &i)) { + case 1: + fprintf(dest_file, "%%%%Pages: %d %d\n", pages, i); + break; +--- src/secscanf.c ++++ src/secscanf.c 2002-09-20 13:54:53.000000000 +0200 @@ -0,0 +1,540 @@ +/* + * Secure sscanf - sscanf with an additional size argument for string ++++++ gv-3.6.3-settitle.patch ++++++ --- src/callbacks.c +++ src/callbacks.c 2004-04-30 22:59:01.000000000 +0200 @@ -62,6 +62,11 @@ #include <sys/stat.h> #include <unistd.h> +#include <locale.h> +#include <langinfo.h> +#include <iconv.h> +#include INC_X11(Xatom.h) + #include "types.h" #include "actions.h" #include "callbacks.h" @@ -95,6 +100,82 @@ static char* open_directory = NULL; /* cb_showTitle */ /*############################################################*/ +void setTitle ( Display* dpy, Window w, char* title, int icon); +XTextProperty* char_to_xtp ( Display* dpy, char* s ); + +void setTitle ( Display* dpy, Window w, char* title, int icon) { + char* from; + iconv_t cd; + char* inptr; + size_t insize; + char utf8title [4096]; + char* outptr; + size_t outsize; + Atom net_wm_name; + Atom net_wm_icon_name; + Atom utf8_string; + + net_wm_name = XInternAtom (dpy, "_NET_WM_NAME", False); + net_wm_icon_name = XInternAtom (dpy, "_NET_WM_ICON_NAME", False); + utf8_string = XInternAtom (dpy, "UTF8_STRING" ,False); + + from = nl_langinfo (CODESET); + cd = iconv_open ("UTF-8",from); + inptr = title; + outptr = utf8title; + insize = strlen(title); + outsize = sizeof (utf8title); + memset (&utf8title, 0, sizeof(utf8title)); + iconv (cd, &inptr, &insize, &outptr, &outsize); + + if (icon) { + XSetWMIconName ( + dpy, w, char_to_xtp (dpy,utf8title) + ); + XChangeProperty ( + dpy, w, net_wm_icon_name, utf8_string, 8, + PropModeReplace, (unsigned char *)utf8title, + strlen (utf8title) + ); + } else { + XSetWMName ( + dpy, w, char_to_xtp (dpy,utf8title) + ); + XChangeProperty ( + dpy, w, net_wm_name, utf8_string, 8, + PropModeReplace, (unsigned char *)utf8title, + strlen (utf8title) + ); + } +} + +XTextProperty* char_to_xtp ( Display* dpy, char* s ) { + static XTextProperty tp = { 0, 0, 0, 0 }; + static int free_prop = True; + int errCode = 0; + char* tl[2]; + if ( tp.value ) { + if ( free_prop ) { + XFree( tp.value ); + } + tp.value = 0; + free_prop = True; + } + tl[0] = s; + tl[1] = 0; + errCode = XmbTextListToTextProperty ( + dpy,tl, 1, XStdICCTextStyle, &tp + ); + if ( errCode < 0 ) { + tp.value = (unsigned char*)s; + tp.encoding = XA_STRING; + tp.format = 8; + tp.nitems = strlen (s); + free_prop = False; + } + return &tp; +} + void cb_showTitle(w, client_data, call_data) Widget w; @@ -124,6 +205,8 @@ cb_showTitle(w, client_data, call_data) } else { t = s = GV_XtNewString(versionIdentification[0]); } + if (w && XtWindow(w)) setTitle(gv_display, XtWindow(w), s, 0); + if (w && XtWindow(w)) setTitle(gv_display, XtWindow(w), t, 1); n=0; XtSetArg(args[n], XtNtitle, s); n++; XtSetArg(args[n], XtNiconName, t); n++; --- src/main.c +++ src/main.c 2004-04-30 22:50:21.000000000 +0200 @@ -1226,6 +1226,7 @@ int main(argc, argv) INFMESSAGE(mapping toplevel) XtMapWidget(toplevel); + cb_showTitle(toplevel, NULL, NULL); } INFMESSAGE(waiting for events now) --- src/misc.c +++ src/misc.c 2008-03-27 17:16:44.877346759 +0100 @@ -932,7 +932,7 @@ setup_ghostview() gv_pagemedia = m; } } - cb_showTitle(NULL,NULL,NULL); + cb_showTitle(toplevel,NULL,NULL); if (show_date) { if (doc && doc->date) { ++++++ gv-3.5.8.tar.bz2 -> gv-3.6.3.tar.bz2 ++++++ ++++ 114046 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 texlive
by root＠Hilbert.suse.de 28 Mar '08

28 Mar '08

Hello community, here is the log from the commit of package texlive checked in at Fri Mar 28 17:20:14 CET 2008. -------- --- texlive/texlive-bin.changes 2008-03-27 11:31:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/texlive/texlive-bin.changes 2008-03-28 12:46:47.821019000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 28 12:46:26 CET 2008 - werner(a)suse.de + +- Do not break patchrpm with last change + +------------------------------------------------------------------- texlive.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-bin.spec ++++++ --- /var/tmp/diff_new_pack.C13714/_old 2008-03-28 17:18:22.000000000 +0100 +++ /var/tmp/diff_new_pack.C13714/_new 2008-03-28 17:18:22.000000000 +0100 @@ -33,7 +33,7 @@ Summary: The Base System of TeXLive Group: Productivity/Publishing/TeX/Base Version: 2007 -Release: 150 +Release: 151 # Remark: Due license problems ./texk/dvi2tty and ./libs/libgsw32 are removed from Source0: source.tar.bz2 Source1: texmf-doc.tar.bz2 @@ -244,6 +244,7 @@ Sebastian Rahtz %package -n texlive-bin-devel +License: GPL v2 or later; TeX-License PreReq: /bin/uname /usr/bin/tr Obsoletes: te_kpath te_web Conflicts: tetex @@ -279,6 +280,7 @@ Pavel Curtis %package -n texlive-bin-cjk +License: GPL v2 or later; TeX-License PreReq: /bin/uname /usr/bin/tr Requires: texlive texlive-latex Obsoletes: te_ptex cjk-latex @@ -299,6 +301,7 @@ Werner Lemberg <wl(a)gnu.org> %package -n texlive-bin-metapost +License: GPL v2 or later; TeX-License PreReq: /bin/uname /usr/bin/tr Requires: texlive texlive-latex Obsoletes: te_mpost @@ -325,6 +328,7 @@ Taco Hoekwater %package -n texlive-bin-omega +License: GPL v2 or later; TeX-License PreReq: /bin/uname /usr/bin/tr Requires: texlive texlive-latex ghostscript_x11 Obsoletes: te_omega @@ -349,6 +353,7 @@ Yannis Haralambous <yannis(a)fluxus-virus.com> %package -n texlive-bin-xetex +License: GPL v2 or later; TeX-License PreReq: /bin/uname /usr/bin/tr Requires: texlive texlive-latex texlive-context Conflicts: tetex @@ -370,6 +375,7 @@ Various <nrsi(a)sil.org> %package -n texlive-bin-dvilj +License: GPL v2 or later; TeX-License PreReq: /bin/uname /usr/bin/tr Requires: texlive Obsoletes: te_dvilj @@ -393,6 +399,7 @@ Karl Berry <kb(a)cs.umb.edu> %package -n texlive-bin-latex +License: GPL v2 or later; TeX-License PreReq: /bin/uname /usr/bin/tr PreReq: %install_info_prereq Requires: texlive @@ -422,6 +429,7 @@ Members of the LaTeX3 project %package -n texlive-bin-tools +License: GPL v2 or later; TeX-License PreReq: /bin/uname /usr/bin/tr Requires: texlive Group: Productivity/Publishing/TeX/Base @@ -479,6 +487,7 @@ %endif %package -n texlive-bin-tex4ht +License: GPL v2 or later; TeX-License PreReq: /bin/uname /usr/bin/tr Requires: texlive Summary: Convert (La)TeX to HTML/XML @@ -498,6 +507,7 @@ Eitan M. Gurari <gurari(a)cse.ohio-state.edu> %package -n texlive-bin-xmltex +License: GPL v2 or later; TeX-License PreReq: /bin/uname /usr/bin/tr Requires: texlive texlive-latex Summary: Typesetting XML with TeX @@ -526,6 +536,7 @@ Sebastian Rahtz %package -n texlive-bin-jadetex +License: GPL v2 or later; TeX-License PreReq: /bin/uname /usr/bin/tr Requires: texlive texlive-latex Summary: TeX Processor for OpenJade @@ -546,6 +557,7 @@ Ian Castle %package -n texlive-bin-musictex +License: GPL v2 or later; TeX-License PreReq: /bin/uname /usr/bin/tr Requires: texlive Summary: MusiXTeX and MusicTeX @@ -1605,6 +1617,8 @@ %files -n texlive-bin-musictex -f lists/texlive-bin-musictex %changelog +* Fri Mar 28 2008 werner(a)suse.de +- Do not break patchrpm with last change * Thu Mar 27 2008 werner(a)suse.de - Remove directories on update which become a symlink (bnc#373168) * Wed Mar 26 2008 werner(a)suse.de ++++++ texlive.spec ++++++ --- /var/tmp/diff_new_pack.C13714/_old 2008-03-28 17:18:22.000000000 +0100 +++ /var/tmp/diff_new_pack.C13714/_new 2008-03-28 17:18:22.000000000 +0100 @@ -35,7 +35,7 @@ Summary: The Base System of TeXLive Group: Productivity/Publishing/TeX/Base Version: 2007 -Release: 151 +Release: 152 # Remark: Due license problems ./texk/dvi2tty and ./libs/libgsw32 are removed from Source0: source.tar.bz2 Source1: texmf-doc.tar.bz2 @@ -198,6 +198,7 @@ Sebastian Rahtz %package -n texlive-doc +License: GPL v2 or later; TeX-License Summary: The documentation of the TeXLive Base System Group: Productivity/Publishing/TeX/Base AutoReqProv: on @@ -219,6 +220,7 @@ Sebastian Rahtz %package -n texlive-devel +License: GPL v2 or later; TeX-License PreReq: texlive-bin-devel Provides: WEB Kpathsea Obsoletes: te_kpath te_web @@ -255,6 +257,7 @@ Pavel Curtis %package -n texlive-cjk +License: GPL v2 or later; TeX-License PreReq: texlive-bin-cjk Requires: texlive texlive-latex Obsoletes: te_ptex cjk-latex @@ -275,6 +278,7 @@ Werner Lemberg <wl(a)gnu.org> %package -n texlive-arab +License: GPL v2 or later; TeX-License Provides: ArabTeX Requires: texlive texlive-latex Summary: (La)TeX Macro Package for Arab and Hebrew @@ -295,6 +299,7 @@ Youssef Jabri %package -n texlive-metapost +License: GPL v2 or later; TeX-License PreReq: texlive-bin-metapost Provides: MetaPost Requires: texlive texlive-latex @@ -322,6 +327,7 @@ Taco Hoekwater %package -n texlive-context +License: GPL v2 or later; TeX-License Provides: CONTeXT ConTeXt Requires: texlive texlive-latex /usr/bin/env /usr/bin/perl /usr/bin/ruby Obsoletes: te_cont @@ -342,6 +348,7 @@ Ton Otten <pragma(a)pi.net> %package -n texlive-omega +License: GPL v2 or later; TeX-License PreReq: texlive-bin-omega Provides: Omega Lambda Antomega Aleph Lamed Requires: texlive texlive-latex ghostscript_x11 @@ -367,6 +374,7 @@ Yannis Haralambous <yannis(a)fluxus-virus.com> %package -n texlive-xetex +License: GPL v2 or later; TeX-License PreReq: texlive-bin-xetex Provides: XeTeX XeLaTeX Requires: texlive texlive-latex texlive-context @@ -389,6 +397,7 @@ Various <nrsi(a)sil.org> %package -n texlive-dvilj +License: GPL v2 or later; TeX-License PreReq: texlive-bin-dvilj Requires: texlive Obsoletes: te_dvilj @@ -412,6 +421,7 @@ Karl Berry <kb(a)cs.umb.edu> %package -n texlive-latex +License: GPL v2 or later; TeX-License PreReq: texlive-bin-latex Provides: LaTeX PreReq: %install_info_prereq @@ -443,6 +453,7 @@ Members of the LaTeX3 project %package -n texlive-latex-doc +License: GPL v2 or later; TeX-License Summary: All documentation about LaTeX Group: Productivity/Publishing/TeX/Base AutoReqProv: on @@ -465,6 +476,7 @@ Members of the LaTeX3 project %package -n texlive-tools +License: GPL v2 or later; TeX-License PreReq: texlive-bin-tools Provides: TeX-Tools detex dviutils lacheck %{?with_psutils:psutils} Requires: texlive @@ -524,6 +536,7 @@ %endif %package -n texlive-tex4ht +License: GPL v2 or later; TeX-License PreReq: texlive-bin-tex4ht Provides: TeX4ht Requires: texlive @@ -544,6 +557,7 @@ Eitan M. Gurari <gurari(a)cse.ohio-state.edu> %package -n texlive-ppower4 +License: GPL v2 or later; TeX-License Provides: PPower4 Requires: texlive texlive-latex Summary: Post Process presentations in PDF @@ -563,6 +577,7 @@ Klaus Guntermann <guntermann(a)iti.informatik.tu-darmstadt.de> %package -n texlive-xmltex +License: GPL v2 or later; TeX-License PreReq: texlive-bin-xmltex Provides: XmlTeX xmltex PassiveTeX passivetex Requires: texlive texlive-latex @@ -593,6 +608,7 @@ Sebastian Rahtz %package -n texlive-jadetex +License: GPL v2 or later; TeX-License PreReq: texlive-bin-jadetex Provides: JadeTeX jadetex Requires: texlive texlive-latex @@ -615,6 +631,7 @@ Ian Castle %package -n texlive-musictex +License: GPL v2 or later; TeX-License PreReq: texlive-bin-musictex Provides: MusiXTeX MusicTeX musictex Requires: texlive @@ -638,6 +655,7 @@ Andreas Egler <Andreas_Egler(a)wob.maus.de> %package -n texlive-nfs +License: GPL v2 or later; TeX-License Obsoletes: te_nfs Conflicts: texlive Conflicts: texlive-devel @@ -1679,7 +1697,7 @@ for x in g v x do x=usr/share/texmf/texconfig/$x - if test -d $x ; then + if test -d $x -a ! -L $x ; then rm -rf $x fi done @@ -1776,6 +1794,8 @@ %files -n texlive-nfs -f lists/texlive-nfs %changelog +* Fri Mar 28 2008 werner(a)suse.de +- Do not break patchrpm with last change * Thu Mar 27 2008 werner(a)suse.de - Remove directories on update which become a symlink (bnc#373168) * Wed Mar 26 2008 werner(a)suse.de ++++++ texlive.spec.in ++++++ --- texlive/texlive.spec.in 2008-03-27 11:30:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/texlive/texlive.spec.in 2008-03-28 12:45:47.565256000 +0100 @@ -1815,7 +1815,7 @@ for x in g v x do x=usr/share/texmf/texconfig/$x - if test -d $x ; then + if test -d $x -a ! -L $x ; then rm -rf $x fi done ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-ldap-server
by root＠Hilbert.suse.de 28 Mar '08

28 Mar '08

Hello community, here is the log from the commit of package yast2-ldap-server checked in at Fri Mar 28 17:19:26 CET 2008. -------- --- yast2-ldap-server/yast2-ldap-server.changes 2007-04-11 10:54:22.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-ldap-server/yast2-ldap-server.changes 2008-03-28 09:26:07.000000000 +0100 @@ -1,0 +2,17 @@ +Wed Mar 26 17:04:46 CET 2008 - rhafer(a)suse.de + +- Version 2.16.0 +- Add _() where missing and appropriate. +- Require acl package (bnc#338952) + +------------------------------------------------------------------- +Mon Mar 17 12:43:32 CET 2008 - jsrain(a)suse.cz + +- added 'StartupNotify=true' to the desktop file (bnc#304964) + +------------------------------------------------------------------- +Fri May 25 13:30:04 CEST 2007 - jsrain(a)suse.cz + +- removed outdated translations from .desktop-files (bnc#271209) + +------------------------------------------------------------------- Old: ---- yast2-ldap-server-2.15.5.tar.bz2 New: ---- yast2-ldap-server-2.16.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-server.spec ++++++ --- /var/tmp/diff_new_pack.b14827/_old 2008-03-28 17:18:52.000000000 +0100 +++ /var/tmp/diff_new_pack.b14827/_new 2008-03-28 17:18:52.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-ldap-server (Version 2.15.5) +# spec file for package yast2-ldap-server (Version 2.16.0) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 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. # @@ -10,18 +10,19 @@ # norootforbuild + Name: yast2-ldap-server -Version: 2.15.5 +Version: 2.16.0 Release: 1 -License: GNU General Public License (GPL), X11/MIT +License: GPL v2 or later; X11/MIT Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-server-2.15.5.tar.bz2 -prefix: /usr +Source0: yast2-ldap-server-2.16.0.tar.bz2 +Prefix: /usr BuildRequires: perl-XML-Writer pkg-config update-desktop-files yast2 yast2-core yast2-devtools -Requires: yast2 yast2-users yast2-ldap-client yast2-network perl perl-gettext yast2-perl-bindings yast2-ca-management perl-X500-DN perl-Digest-SHA1 net-tools -BuildArchitectures: noarch -Summary: YaST2-Module for the configuration of an OpenLDAP Server +Requires: acl yast2 yast2-users yast2-ldap-client yast2-network perl perl-gettext yast2-perl-bindings yast2-ca-management perl-X500-DN perl-Digest-SHA1 net-tools +BuildArch: noarch +Summary: YaST2 - OpenLDAP Server Configuration %description Provides basic configuration of an OpenLDAP Server over YaST2 Control @@ -34,7 +35,7 @@ Andreas Bauer <abauer(a)suse.de> %prep -%setup -n yast2-ldap-server-2.15.5 +%setup -n yast2-ldap-server-2.16.0 %build %{prefix}/bin/y2tool y2autoconf @@ -72,134 +73,141 @@ /usr/share/YaST2/scrconf/* /usr/lib/YaST2/servers_non_y2/* %doc %{prefix}/share/doc/packages/yast2-ldap-server - %changelog -* Wed Apr 11 2007 - rhafer(a)suse.de +* Wed Mar 26 2008 rhafer(a)suse.de +- Version 2.16.0 +- Add _() where missing and appropriate. +- Require acl package (bnc#338952) +* Mon Mar 17 2008 jsrain(a)suse.cz +- added 'StartupNotify=true' to the desktop file (bnc#304964) +* Fri May 25 2007 jsrain(a)suse.cz +- removed outdated translations from .desktop-files (bnc#271209) +* Wed Apr 11 2007 rhafer(a)suse.de - Version 2.15.5 - Keep Firewall-Settings when switching to configuration Dialog (Bug [#259798]) - Display status of TLS configuration correctly (Bug #259806) -* Thu Mar 15 2007 - rhafer(a)suse.de +* Thu Mar 15 2007 rhafer(a)suse.de - Fixed RPM dependencies (Bug #253525) - Version 2.15.4 -* Fri Mar 02 2007 - rhafer(a)suse.de +* Fri Mar 02 2007 rhafer(a)suse.de - Fixes for Bug #250228: * Don't write duplicate Database sections into AutoYaST profiles * Leave out default Server Certificate Settings as long as CA-Management does not export its settings - Version 2.15.3 -* Tue Feb 20 2007 - mc(a)suse.de +* Tue Feb 20 2007 mc(a)suse.de - version 2.15.2 - add krb5ACLHack -* Tue Feb 06 2007 - rhafer(a)suse.de +* Tue Feb 06 2007 rhafer(a)suse.de - Added AutoYaST Schema file (Bug #242571) -* Mon Feb 05 2007 - rhafer(a)suse.de +* Mon Feb 05 2007 rhafer(a)suse.de - Fixed Export() for AutoYaST to also export newly created Databases (Bug #241101) -* Thu Feb 01 2007 - rhafer(a)suse.de +* Thu Feb 01 2007 rhafer(a)suse.de - Close window did not work in autoyast UI (Bug #241009) -* Thu Jan 25 2007 - mc(a)suse.de +* Thu Jan 25 2007 mc(a)suse.de - add commandline interface [Feature #120062] -* Wed Jan 17 2007 - rhafer(a)suse.de +* Wed Jan 17 2007 rhafer(a)suse.de - The Overlay subsection should aways be the last part of a database section (Bug #235385) - Do not create TreeDialog multiple times. Breaks AutoYaST (Bug #232838) - Version 2.15.0 -* Fri Jan 12 2007 - rhafer(a)suse.de +* Fri Jan 12 2007 rhafer(a)suse.de - Added support of LDAP Password Policy overlay (ppolicy). Fate #301179. - Version 2.14.1 -* Mon Nov 20 2006 - jsrain(a)suse.cz +* Mon Nov 20 2006 jsrain(a)suse.cz - 2.14.0 -* Wed May 31 2006 - rhafer(a)suse.de +* Wed May 31 2006 rhafer(a)suse.de - Fix Import/Export functions for AutoYaST (Bugzilla #179750) - Fixed call to Package Module to detect if openldap2 package is installed (Bug #180142) - Version 2.13.15 -* Wed May 24 2006 - rhafer(a)suse.de +* Wed May 24 2006 rhafer(a)suse.de - Don't try to Read() config when openldap2 is not installed, e.g. during autoyast cloning. (Bugzilla #178159) - Version 2.13.14 -* Fri May 19 2006 - ug(a)suse.de +* Fri May 19 2006 ug(a)suse.de - fixed desktop file for autoyast cloning (#177082) - Version 2.13.13 -* Wed May 03 2006 - rhafer(a)suse.de +* Wed May 03 2006 rhafer(a)suse.de - Improved error message when root password is not available in proposal (Bugzilla #171413) - Version 2.13.12 -* Wed Apr 05 2006 - rhafer(a)suse.de +* Wed Apr 05 2006 rhafer(a)suse.de - Allow to open the LDAP/LDAPS ports on the firewall (Bugzilla #163275) -* Mon Apr 03 2006 - rhafer(a)suse.de +* Mon Apr 03 2006 rhafer(a)suse.de - Remove TLS settings if TLS is disabled (Bugzilla #162476) - 2.13.10 -* Thu Mar 09 2006 - rhafer(a)suse.de +* Thu Mar 09 2006 rhafer(a)suse.de - Better validation of rootdn and suffix in proposal (Bugzilla #114359) -* Mon Feb 20 2006 - rhafer(a)suse.de +* Mon Feb 20 2006 rhafer(a)suse.de - removed yast2-devel-packages macro BuildRequires -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Thu Jan 19 2006 - rhafer(a)suse.de +* Thu Jan 19 2006 rhafer(a)suse.de - Better checks of suffix and rootdn (Bugzilla #56638) - 2.13.7 -* Tue Jan 17 2006 - rhafer(a)suse.de +* Tue Jan 17 2006 rhafer(a)suse.de - Don't overwrite database configuration when viewing it (Bugzilla #143039) - 2.13.6 -* Fri Jan 13 2006 - rhafer(a)suse.de +* Fri Jan 13 2006 rhafer(a)suse.de - create first database in /var/lib/ldap - 2.13.5 -* Tue Jan 10 2006 - visnov(a)suse.cz +* Tue Jan 10 2006 visnov(a)suse.cz - fix syntax error in proposal - 2.13.4 -* Mon Jan 09 2006 - visnov(a)suse.cz +* Mon Jan 09 2006 visnov(a)suse.cz - use Package - 2.13.3 -* Mon Dec 19 2005 - jsuchome(a)suse.cz +* Mon Dec 19 2005 jsuchome(a)suse.cz - merged proofread texts - 2.13.2 -* Fri Dec 09 2005 - rhafer(a)suse.de +* Fri Dec 09 2005 rhafer(a)suse.de - version 2.13.1 - suggest and create directory for new databases -* Wed Oct 19 2005 - rhafer(a)suse.de +* Wed Oct 19 2005 rhafer(a)suse.de - version 2.13.0 - merged fixes from 9.1 branch -* Thu Aug 18 2005 - locilka(a)suse.cz +* Thu Aug 18 2005 locilka(a)suse.cz - merged proofread texts -* Thu Mar 31 2005 - mc(a)suse.de +* Thu Mar 31 2005 mc(a)suse.de - add requires yast2-ca-management to spec file -* Tue Nov 30 2004 - schubi(a)suse.de +* Tue Nov 30 2004 schubi(a)suse.de - changes for new yast intepreter -* Wed Jun 16 2004 - abauer(a)suse.de +* Wed Jun 16 2004 abauer(a)suse.de - version 2.10.0 - merged from 9.1 branch -* Tue Jun 15 2004 - abauer(a)suse.de +* Tue Jun 15 2004 abauer(a)suse.de - version 2.9.11 - #41638 - Misconfigured ldap server cannot be fixed in installation Append Base DN checkbox in proposal dialog defaults to true values are now autogenerated even if the service is disabled -* Mon Jun 14 2004 - mc(a)suse.de +* Mon Jun 14 2004 mc(a)suse.de - #41643, slapd loglevel fills up /var/log/messages set default loglevel to 0 -* Thu May 27 2004 - schubi(a)suse.de +* Thu May 27 2004 schubi(a)suse.de - #41292 fixed; LDAP server module Samba hack writes multiple ACLs - modify the indices (#41165) -* Tue May 25 2004 - schubi(a)suse.de +* Tue May 25 2004 schubi(a)suse.de - Bug 40664 - Beta5: YaST2 ldap proposal, but no openldap2 installed -* Mon May 24 2004 - schubi(a)suse.de +* Mon May 24 2004 schubi(a)suse.de - Bug 41069 - yast2-ldap-server does not check for openldap2.rpm -* Mon May 24 2004 - schubi(a)suse.de +* Mon May 24 2004 schubi(a)suse.de - Bug 40839 - Installation - Service Configuration - Illogical workflow -* Thu May 13 2004 - abauer(a)suse.de +* Thu May 13 2004 abauer(a)suse.de - version 2.9.5 - fixed wrong insert position of schema includes (#40331) - changed _() to __() (#40160) - proper close of all dialogs (#40061) - added ldap client default "create_ldap" (#40484) - changed hostname passed to ldap-client to 'localhost' -* Fri May 07 2004 - abauer(a)suse.de +* Fri May 07 2004 abauer(a)suse.de - version 2.9.4 - added net-tools to Requires, removed openldap2 (#39578) - openldap sysconfig agent taken from yast2-openteam-server (#39865) @@ -209,19 +217,19 @@ - bugfix: changing tree items in ncurses ui now opens the corresponding dialog (#39990) - design changes (#39879, #39944) - more defaults set for ldap client module (#39901, #39937) -* Fri Apr 30 2004 - abauer(a)suse.de +* Fri Apr 30 2004 abauer(a)suse.de - version 2.9.3 - changed initially displayed tree item to 'databases' (#39660) - removed 'Reload Configuration' button from global item (#39659) - workaround for umlaut problems (#39661): database item keys in widget_map changed to md5sum of suffix - design changes in tls dialogs -* Thu Apr 29 2004 - mc(a)suse.de +* Thu Apr 29 2004 mc(a)suse.de - version 2.9.2 - first working version - add main UI - improve the API -* Fri Apr 23 2004 - mc(a)suse.de +* Fri Apr 23 2004 mc(a)suse.de - version 2.9.1 - working proposal -* Thu Mar 18 2004 - abauer(a)suse.de +* Thu Mar 18 2004 abauer(a)suse.de - initial version ++++++ yast2-ldap-server-2.15.5.tar.bz2 -> yast2-ldap-server-2.16.0.tar.bz2 ++++++ ++++ 10143 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.15.5/configure.in new/yast2-ldap-server-2.16.0/configure.in --- old/yast2-ldap-server-2.15.5/configure.in 2007-04-11 10:52:46.000000000 +0200 +++ new/yast2-ldap-server-2.16.0/configure.in 2008-03-26 18:09:30.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-ldap-server dnl -dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ldap-server, 2.15.5, http://bugs.opensuse.org/, yast2-ldap-server) +AC_INIT(yast2-ldap-server, 2.16.0, http://bugs.opensuse.org/, yast2-ldap-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -14,10 +14,11 @@ AC_PREFIX_DEFAULT(/usr) -AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs +dnl long filenames; we use GNU Make extensions and that's ok +AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.15.5" +VERSION="2.16.0" RPMNAME="yast2-ldap-server" MAINTAINER="Ralf Haferkamp <rhafer(a)suse.de>" @@ -107,9 +108,11 @@ dnl no need for AC_ARG_VAR AC_PATH_PROG(XGETTEXT, xgettext) if test -z "$XGETTEXT" ; then - AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) + AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` +AC_SUBST(Y2DEVTOOLS_PREFIX) devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -142,6 +145,9 @@ if test "$YCPC" = "false"; then AC_MSG_ERROR([ycpc is not installed]) fi +AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [ + AC_MSG_WARN([yast2-testsuite.rpm is not installed]) +]) AC_CONFIG_FILES(Makefile agents/Makefile diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.15.5/COPYRIGHT.english new/yast2-ldap-server-2.16.0/COPYRIGHT.english --- old/yast2-ldap-server-2.15.5/COPYRIGHT.english 2007-04-11 10:53:40.000000000 +0200 +++ new/yast2-ldap-server-2.16.0/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100 @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.15.5/Makefile.am new/yast2-ldap-server-2.16.0/Makefile.am --- old/yast2-ldap-server-2.15.5/Makefile.am 2007-04-11 10:52:47.000000000 +0200 +++ new/yast2-ldap-server-2.16.0/Makefile.am 2008-03-26 18:09:31.000000000 +0100 @@ -7,8 +7,7 @@ # #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) @@ -20,21 +19,22 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) -DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools) +DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) -COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english +COPYRIGHT_files_gpl = README COPYING COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -AUTOMAKE_OPTIONS = foreign dist-bzip2 +# less strict; prefer bzip2 +AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally -#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal +#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common @@ -67,7 +67,7 @@ # because the prerequisite is made here (not anymore!) # and we don't want any paths in y2autoconf # info '(autoconf)config.status Invocation' -$(RPMNAME).pc: $(RPMNAME).pc.in +$(RPMNAME).pc: $(RPMNAME).pc.in config.status ./config.status --file=$@:$< if CREATE_PKGCONFIG_NOARCH @@ -211,8 +211,7 @@ # For po/ modules checkpo: - test ! -d $(srcdir)/po || $(MAKE) -C po checkpo -# test ! -d $(srcdir)/po \ -# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } + test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo +# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am SUBDIRS = agents doc src diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.15.5/Makefile.am.common new/yast2-ldap-server-2.16.0/Makefile.am.common --- old/yast2-ldap-server-2.15.5/Makefile.am.common 2007-04-11 10:52:46.000000000 +0200 +++ new/yast2-ldap-server-2.16.0/Makefile.am.common 2008-03-26 18:09:31.000000000 +0100 @@ -29,7 +29,19 @@ dist-hook: check-syntax +CHECK_SYNTAX = true check-syntax: $(client_DATA) $(ycpchook) - if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi + @if test "$(client_DATA)"; then \ + if $(CHECK_SYNTAX); then \ + TO_CHECK="$(filter %.ycp,$^)"; \ + echo "Checking syntax of $${TO_CHECK}"; \ + if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \ + echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \ + exit 1; \ + fi; \ + else \ + echo "Syntax check disabled"; \ + fi; \ + fi -include .dep diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.15.5/missing new/yast2-ldap-server-2.16.0/missing --- old/yast2-ldap-server-2.15.5/missing 2007-04-11 10:52:57.000000000 +0200 +++ new/yast2-ldap-server-2.16.0/missing 2008-03-26 18:09:43.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.15.5/README new/yast2-ldap-server-2.16.0/README --- old/yast2-ldap-server-2.15.5/README 2007-04-11 10:53:40.000000000 +0200 +++ new/yast2-ldap-server-2.16.0/README 2008-03-26 18:12:44.000000000 +0100 @@ -1,2 +1,2 @@ This program/library is part of YaST2 -See the file COPYRIGHT.english for license terms +See the file COPYING for license terms diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.15.5/src/ldap-server.desktop new/yast2-ldap-server-2.16.0/src/ldap-server.desktop --- old/yast2-ldap-server-2.15.5/src/ldap-server.desktop 2007-02-06 13:30:32.000000000 +0100 +++ new/yast2-ldap-server-2.16.0/src/ldap-server.desktop 2008-03-26 17:14:13.000000000 +0100 @@ -24,6 +24,5 @@ Name=LDAP Server GenericName=Configure an LDAP Server -Name[de]=LDAP-Server -GenericName[de]=LDAP-Server konfigurieren X-KDE-SubstituteUID=true +StartupNotify=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.15.5/src/tree_structure.ycp new/yast2-ldap-server-2.16.0/src/tree_structure.ycp --- old/yast2-ldap-server-2.15.5/src/tree_structure.ycp 2007-04-11 10:34:56.000000000 +0200 +++ new/yast2-ldap-server-2.16.0/src/tree_structure.ycp 2008-03-26 17:16:12.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Widget Tree structure * Authors: Andreas Bauer <abauer(a)suse.de> * - * $Id: tree_structure.ycp 37381 2007-04-11 08:34:54Z rhafer $ + * $Id: tree_structure.ycp 44396 2008-02-12 15:52:28Z msvec $ */ { textdomain "ldap-server"; @@ -461,7 +461,7 @@ { UI::CloseDialog(); dlg_name = "import"; - UI::OpenDialog( (term)widget_map["g_tls","dialogs","import"]:`Label( "dialog not found" ) ); + UI::OpenDialog( (term)widget_map["g_tls","dialogs","import"]:`Label(_("dialog not found"))); //fill textentries UI::ChangeWidget( `te_cert_file, `Value, importPaths["ServerCertificateFile"]:"" ); @@ -568,7 +568,7 @@ list<string> dblist = LdapServer::ReadDbList(); integer numDbs = size(dblist); - UI::OpenDialog( (term)widget_map["databases","dialogs","adddb"]:`Label( "dialog not found" ) ); + UI::OpenDialog( (term)widget_map["databases","dialogs","adddb"]:`Label(_("dialog not found"))); UI::ChangeWidget( `te_rootdn, `Value, "cn=Administrator" ); UI::ChangeWidget( `te_directory, `Value, "/var/lib/ldap/" ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-server-2.15.5/VERSION new/yast2-ldap-server-2.16.0/VERSION --- old/yast2-ldap-server-2.15.5/VERSION 2007-04-11 10:35:54.000000000 +0200 +++ new/yast2-ldap-server-2.16.0/VERSION 2008-03-26 17:03:41.000000000 +0100 @@ -1 +1 @@ -2.15.5 +2.16.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-samba-client
by root＠Hilbert.suse.de 28 Mar '08

28 Mar '08

Hello community, here is the log from the commit of package yast2-samba-client checked in at Fri Mar 28 17:18:15 CET 2008. -------- --- yast2-samba-client/yast2-samba-client.changes 2008-01-21 11:01:20.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-samba-client/yast2-samba-client.changes 2008-03-28 12:58:43.791225000 +0100 @@ -1,0 +2,12 @@ +Fri Mar 28 12:52:34 CET 2008 - jsuchome(a)suse.cz + +- do not check for required packages during Read (bnc#374703) +- SambaConfig: do not create the hash by referencing inside +- 2.16.3 + +------------------------------------------------------------------- +Mon Mar 17 12:43:32 CET 2008 - jsrain(a)suse.cz + +- added 'StartupNotify=true' to the desktop file (bnc #304964) + +------------------------------------------------------------------- Old: ---- yast2-samba-client-2.16.2.tar.bz2 New: ---- yast2-samba-client-2.16.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-client.spec ++++++ --- /var/tmp/diff_new_pack.j10435/_old 2008-03-28 17:17:25.000000000 +0100 +++ /var/tmp/diff_new_pack.j10435/_new 2008-03-28 17:17:25.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-samba-client (Version 2.16.2) +# spec file for package yast2-samba-client (Version 2.16.3) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -10,13 +10,14 @@ # norootforbuild + Name: yast2-samba-client -Version: 2.16.2 +Version: 2.16.3 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-samba-client-2.16.2.tar.bz2 +Source0: yast2-samba-client-2.16.3.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pam yast2-perl-bindings yast2-testsuite Requires: yast2 yast2-kerberos-client @@ -36,7 +37,7 @@ Stanislav Visnovsky <visnov(a)suse.cz> %prep -%setup -n yast2-samba-client-2.16.2 +%setup -n yast2-samba-client-2.16.3 %build %{prefix}/bin/y2tool y2autoconf @@ -73,6 +74,12 @@ /usr/share/YaST2/schema/autoyast/rnc/samba-client.rnc %doc %{prefix}/share/doc/packages/yast2-samba-client %changelog +* Fri Mar 28 2008 jsuchome(a)suse.cz +- do not check for required packages during Read (bnc#374703) +- SambaConfig: do not create the hash by referencing inside +- 2.16.3 +* Mon Mar 17 2008 jsrain(a)suse.cz +- added 'StartupNotify=true' to the desktop file (bnc #304964) * Mon Jan 21 2008 jsuchome(a)suse.cz - if nmbstatus output is not available, do a nmblookup query to check if we are dealing with a workgroup or domain (#251909) ++++++ yast2-samba-client-2.16.2.tar.bz2 -> yast2-samba-client-2.16.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.16.2/src/complex.ycp new/yast2-samba-client-2.16.3/src/complex.ycp --- old/yast2-samba-client-2.16.2/src/complex.ycp 2006-08-24 15:45:07.000000000 +0200 +++ new/yast2-samba-client-2.16.3/src/complex.ycp 2008-03-28 10:47:17.000000000 +0100 @@ -11,9 +11,10 @@ textdomain "samba-client"; +import "PackageSystem"; +import "Samba"; import "Wizard"; -import "Samba"; include "samba-client/helps.ycp"; include "samba-client/routines.ycp"; @@ -32,6 +33,15 @@ */ symbol ReadDialog() { Wizard::RestoreHelp(HELPS["read"]:""); + + // check installed packages + if (!PackageSystem::CheckAndInstallPackagesInteractive( + Samba::UpdatedArchPackages (["samba-client"]))) + { + y2warning("package samba-client not installed"); + return `abort; + } + boolean ret = Samba::Read(); return ret ? `next : `abort; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.16.2/src/routines.ycp new/yast2-samba-client-2.16.3/src/routines.ycp --- old/yast2-samba-client-2.16.2/src/routines.ycp 2008-01-21 10:47:04.000000000 +0100 +++ new/yast2-samba-client-2.16.3/src/routines.ycp 2008-01-21 11:01:32.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Miscelanous functions for configuration of samba-client. * Authors: Stanislav Visnovsky <visnov(a)suse.cz> * - * $Id: routines.ycp 38218 2007-05-31 08:32:55Z jsuchome $ + * $Id: routines.ycp 43761 2008-01-21 10:01:31Z jsuchome $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.16.2/src/samba-client.desktop new/yast2-samba-client-2.16.3/src/samba-client.desktop --- old/yast2-samba-client-2.16.2/src/samba-client.desktop 2007-01-16 14:42:38.000000000 +0100 +++ new/yast2-samba-client-2.16.3/src/samba-client.desktop 2008-03-19 08:53:15.000000000 +0100 @@ -25,3 +25,4 @@ Name=Windows Domain Membership GenericName=Configure the Windows Domain Membership X-KDE-SubstituteUID=true +StartupNotify=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.16.2/src/SambaConfig.pm new/yast2-samba-client-2.16.3/src/SambaConfig.pm --- old/yast2-samba-client-2.16.2/src/SambaConfig.pm 2007-05-17 13:51:13.000000000 +0200 +++ new/yast2-samba-client-2.16.3/src/SambaConfig.pm 2008-03-28 12:50:10.000000000 +0100 @@ -23,8 +23,10 @@ textdomain "samba-client"; our %TYPEINFO; -YaST::YCP::Import("SCR"); +YaST::YCP::Import("FileUtils"); YaST::YCP::Import("Mode"); +YaST::YCP::Import("SCR"); +YaST::YCP::Import("PackageSystem"); ########################################################################### @@ -159,6 +161,11 @@ sub Read { my ($self, $forceReRead) = @_; + if (!PackageSystem->Installed("samba-client")) { + y2error("package samba-client not installed"); + return 0; + } + # configuraton already read return 1 if not $forceReRead and %Config; @@ -202,7 +209,10 @@ %WinbindConfig = (); # read the complete global section - $AllAtOnce = SCR->Read(".etc.security_winbind.all"); + $AllAtOnce = {}; + if (FileUtils->Exists ("/etc/security/winbind.conf")) { + $AllAtOnce = SCR->Read(".etc.security_winbind.all"); + } # convert .ini agent all-at-once map to %WinbindConfig foreach my $section (@{$AllAtOnce->{value}}) { @@ -318,7 +328,7 @@ # commit the changes if (!SCR->Write(".etc.security_winbind", undef)) { - y2error("Cannot write settings to /etc/samba/smb.conf"); + y2error("Cannot write settings to /etc/security/winbind.conf"); return 0; } return 1; @@ -553,7 +563,7 @@ $val = toboolean($val); return defined $val ? ($val ? "No" : "Yes") : $default; } - if (defined $Config{$share}{$key}) { + if (defined $Config{$share} && $Config{$share}{$key}) { if (ref $Config{$share}{$key} eq "ARRAY") { return $Config{$share}{$key}[0]; } @@ -586,7 +596,7 @@ return [$val]; } } - if (defined $Config{$share}{$key}) { + if (defined $Config{$share} && $Config{$share}{$key}) { if (ref $Config{$share}{$key} eq "ARRAY") { return $Config{$share}{$key}; } @@ -1031,7 +1041,8 @@ } $key = lc($key); $key = $Synonyms{$key} if exists $Synonyms{$key}; - if (defined $WinbindConfig{$share}{$key}) { + if (defined $WinbindConfig{$share} && defined $WinbindConfig{$share}{$key}) + { if (ref $WinbindConfig{$share}{$key} eq "ARRAY") { return $WinbindConfig{$share}{$key}[0]; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.16.2/src/SambaNmbLookup.pm new/yast2-samba-client-2.16.3/src/SambaNmbLookup.pm --- old/yast2-samba-client-2.16.2/src/SambaNmbLookup.pm 2008-01-21 10:47:04.000000000 +0100 +++ new/yast2-samba-client-2.16.3/src/SambaNmbLookup.pm 2008-01-21 11:01:32.000000000 +0100 @@ -4,7 +4,7 @@ # Authors: Stanislav Visnovsky <visnov(a)suse.cz> # Martin Lazar <mlazar(a)suse.cz> # -# $Id: SambaNmbLookup.pm 38218 2007-05-31 08:32:55Z jsuchome $ +# $Id: SambaNmbLookup.pm 43761 2008-01-21 10:01:31Z jsuchome $ # # Representation of the configuration of samba-client. # Input and output routines. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.16.2/src/Samba.ycp new/yast2-samba-client-2.16.3/src/Samba.ycp --- old/yast2-samba-client-2.16.2/src/Samba.ycp 2007-07-20 07:46:38.000000000 +0200 +++ new/yast2-samba-client-2.16.3/src/Samba.ycp 2008-03-28 11:25:08.000000000 +0100 @@ -21,7 +21,6 @@ import "NetworkConfig"; import "Mode"; import "Package"; -import "PackageSystem"; import "Pam"; import "Progress"; import "Report"; @@ -243,7 +242,7 @@ global define boolean ReadSharesSetting () { shares_dir = SambaConfig::GlobalGetStr ("usershare path", shares_dir); - if (FileUtils::Exists (shares_dir)) + if (shares_dir != nil && FileUtils::Exists (shares_dir)) { map stat = (map) SCR::Read (.target.stat, shares_dir); map out = (map) SCR::Execute (.target.bash_output, sformat ("getent group | grep \":%1:\" | /usr/bin/cut -f 1 -d :", stat["gid"]:100)); @@ -425,14 +424,6 @@ // read global settings Progress::NextStage(); - // check installed packages - if (!PackageSystem::CheckAndInstallPackagesInteractive( - UpdatedArchPackages (["samba-client"]))) - { - y2warning("package samba-client not installed"); - return false; - } - SambaConfig::Read(false); // read winbind status diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-samba-client-2.16.2/VERSION new/yast2-samba-client-2.16.3/VERSION --- old/yast2-samba-client-2.16.2/VERSION 2008-01-21 10:51:19.000000000 +0100 +++ new/yast2-samba-client-2.16.3/VERSION 2008-03-19 08:53:18.000000000 +0100 @@ -1 +1 @@ -2.16.2 +2.16.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-product-creator
by root＠Hilbert.suse.de 28 Mar '08

28 Mar '08

Hello community, here is the log from the commit of package yast2-product-creator checked in at Fri Mar 28 17:17:17 CET 2008. -------- --- yast2-product-creator/yast2-product-creator.changes 2008-03-25 08:57:55.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-product-creator/yast2-product-creator.changes 2008-03-28 16:25:34.254920000 +0100 @@ -1,0 +2,19 @@ +Fri Mar 28 16:12:34 CET 2008 - jsuchome(a)suse.cz + +- use new ag_anyxml to read parts of config.xml (WIP) +- show package lists in different kiwi profiles +- neutralize package and pattern selection before opening package + selector +- do not return patterns selected by dependencies from package + selector (requires transact_by in Pkg:ResolvableProperties) +- 2.16.11 + +------------------------------------------------------------------- +Tue Mar 25 09:05:06 CET 2008 - jsuchome(a)suse.cz + +- fixes for bnc#364838: +- save modification of target image type +- set the default value of format attribute for vmx image +- check for kiwi-desc-* packages after selecting image type + +------------------------------------------------------------------- Old: ---- yast2-product-creator-2.16.10.tar.bz2 New: ---- yast2-product-creator-2.16.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-product-creator.spec ++++++ --- /var/tmp/diff_new_pack.hL9599/_old 2008-03-28 17:16:48.000000000 +0100 +++ /var/tmp/diff_new_pack.hL9599/_new 2008-03-28 17:16:48.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-product-creator (Version 2.16.10) +# spec file for package yast2-product-creator (Version 2.16.11) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,21 +12,21 @@ Name: yast2-product-creator -Version: 2.16.10 +Version: 2.16.11 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-product-creator-2.16.10.tar.bz2 +Source0: yast2-product-creator-2.16.11.tar.bz2 Prefix: /usr BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-security yast2-testsuite PreReq: %fillup_prereq Requires: autoyast2-installation yast2-security perl-XML-LibXML # SourceDialogs::IsPlainDir() Requires: yast2-packager >= 2.16.20 -# GPG.ycp and GPGWidgets.ycp -Requires: yast2 >= 2.15.2 -BuildRequires: yast2 >= 2.15.2 +# ag_anyxml with perl-XML-Simple +Requires: yast2 >= 2.16.40 +BuildRequires: yast2 >= 2.16.40 # New API of StorageDevices.ycp Conflicts: yast2-storage < 2.16.1 BuildArch: noarch @@ -39,7 +39,7 @@ %prep -%setup -n yast2-product-creator-2.16.10 +%setup -n yast2-product-creator-2.16.11 %build %{prefix}/bin/y2tool y2autoconf @@ -86,6 +86,19 @@ /usr/lib/YaST2/servers_non_y2/ag_* /var/adm/fillup-templates/sysconfig.product-creator %changelog +* Fri Mar 28 2008 jsuchome(a)suse.cz +- use new ag_anyxml to read parts of config.xml (WIP) +- show package lists in different kiwi profiles +- neutralize package and pattern selection before opening package + selector +- do not return patterns selected by dependencies from package + selector (requires transact_by in Pkg:ResolvableProperties) +- 2.16.11 +* Tue Mar 25 2008 jsuchome(a)suse.cz +- fixes for bnc#364838: +- save modification of target image type +- set the default value of format attribute for vmx image +- check for kiwi-desc-* packages after selecting image type * Tue Mar 25 2008 lslezak(a)suse.cz - always update metadata in content files (bnc#368146) - 2.16.10 ++++++ yast2-product-creator-2.16.10.tar.bz2 -> yast2-product-creator-2.16.11.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.10/agent-kiwi/ag_kiwi new/yast2-product-creator-2.16.11/agent-kiwi/ag_kiwi --- old/yast2-product-creator-2.16.10/agent-kiwi/ag_kiwi 2008-02-15 15:11:27.000000000 +0100 +++ new/yast2-product-creator-2.16.11/agent-kiwi/ag_kiwi 2008-02-15 16:22:12.000000000 +0100 @@ -114,10 +114,12 @@ my $name = $element -> getAttribute ("name"); my $pwd = $element -> getAttribute ("pwd"); my $home = $element -> getAttribute ("home"); + my $realname = $element -> getAttribute ("realname"); if (defined $name) { $retmap{"users"}{$name}{group} = $group if (defined $group); $retmap{"users"}{$name}{home} = $home if (defined $home); $retmap{"users"}{$name}{pwd} = $pwd if (defined $pwd); + $retmap{"users"}{$name}{realname} = $realname if (defined $realname); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.10/configure new/yast2-product-creator-2.16.11/configure --- old/yast2-product-creator-2.16.10/configure 2008-03-25 08:56:14.000000000 +0100 +++ new/yast2-product-creator-2.16.11/configure 2007-10-25 15:23:08.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-product-creator 2.16.10. +# Generated by GNU Autoconf 2.61 for yast2-product-creator 2.16.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-product-creator' PACKAGE_TARNAME='yast2-product-creator' -PACKAGE_VERSION='2.16.10' -PACKAGE_STRING='yast2-product-creator 2.16.10' +PACKAGE_VERSION='2.16.0' +PACKAGE_STRING='yast2-product-creator 2.16.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,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 yast2-product-creator 2.16.10 to adapt to many kinds of systems. +\`configure' configures yast2-product-creator 2.16.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-product-creator 2.16.10:";; + short | recursive ) echo "Configuration of yast2-product-creator 2.16.0:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-product-creator configure 2.16.10 +yast2-product-creator configure 2.16.0 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-product-creator $as_me 2.16.10, which was +It was created by yast2-product-creator $as_me 2.16.0, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-product-creator' - VERSION='2.16.10' + VERSION='2.16.0' cat >>confdefs.h <<_ACEOF @@ -2408,8 +2408,7 @@ - -VERSION="2.16.10" +VERSION="2.16.0" RPMNAME="yast2-product-creator" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -2651,8 +2650,8 @@ if test -z "$XGETTEXT" ; then - { { echo "$as_me:$LINENO: error: xgettext is missing; please install gettext-tools." >&5 -echo "$as_me: error: xgettext is missing; please install gettext-tools." >&2;} + { { echo "$as_me:$LINENO: error: xgettext is missing; please install gettext-devel." >&5 +echo "$as_me: error: xgettext is missing; please install gettext-devel." >&2;} { (exit 1); exit 1; }; } fi @@ -3304,7 +3303,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-product-creator $as_me 2.16.10, which was +This file was extended by yast2-product-creator $as_me 2.16.0, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3346,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-product-creator config.status 2.16.10 +yast2-product-creator config.status 2.16.0 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.10/configure.in new/yast2-product-creator-2.16.11/configure.in --- old/yast2-product-creator-2.16.10/configure.in 2008-03-25 08:56:09.000000000 +0100 +++ new/yast2-product-creator-2.16.11/configure.in 2007-10-25 15:23:04.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-product-creator dnl -dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-product-creator, 2.16.10, http://bugs.opensuse.org/, yast2-product-creator) +AC_INIT(yast2-product-creator, 2.16.0, http://bugs.opensuse.org/, yast2-product-creator) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -14,11 +14,10 @@ AC_PREFIX_DEFAULT(/usr) -dnl long filenames; we use GNU Make extensions and that's ok -AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) +AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.16.10" +VERSION="2.16.0" RPMNAME="yast2-product-creator" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -108,7 +107,7 @@ dnl no need for AC_ARG_VAR AC_PATH_PROG(XGETTEXT, xgettext) if test -z "$XGETTEXT" ; then - AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) + AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.10/COPYRIGHT.english new/yast2-product-creator-2.16.11/COPYRIGHT.english --- old/yast2-product-creator-2.16.10/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-product-creator-2.16.11/COPYRIGHT.english 2008-03-28 16:18:06.000000000 +0100 @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.10/Makefile.am new/yast2-product-creator-2.16.11/Makefile.am --- old/yast2-product-creator-2.16.10/Makefile.am 2008-03-25 08:56:09.000000000 +0100 +++ new/yast2-product-creator-2.16.11/Makefile.am 2007-10-25 15:23:04.000000000 +0200 @@ -23,14 +23,13 @@ ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) -COPYRIGHT_files_gpl = README COPYING +COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -# less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.10/Makefile.in new/yast2-product-creator-2.16.11/Makefile.in --- old/yast2-product-creator-2.16.10/Makefile.in 2008-03-25 08:56:16.000000000 +0100 +++ new/yast2-product-creator-2.16.11/Makefile.in 2007-10-25 15:23:11.000000000 +0200 @@ -44,8 +44,8 @@ @CREATE_PKGCONFIG_TRUE@am__append_1 = $(RPMNAME).pc.in subdir = . DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure TODO \ - config.guess config.sub install-sh missing + $(srcdir)/Makefile.in $(top_srcdir)/configure config.guess \ + config.sub install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -217,13 +217,11 @@ DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) -COPYRIGHT_files_gpl = README COPYING +COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) - -# less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.10/README new/yast2-product-creator-2.16.11/README --- old/yast2-product-creator-2.16.10/README 2008-03-25 08:57:07.000000000 +0100 +++ new/yast2-product-creator-2.16.11/README 2008-03-28 16:18:06.000000000 +0100 @@ -1,2 +1,2 @@ This program/library is part of YaST2 -See the file COPYING for license terms +See the file COPYRIGHT.english for license terms diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.10/src/complex.ycp new/yast2-product-creator-2.16.11/src/complex.ycp --- old/yast2-product-creator-2.16.10/src/complex.ycp 2008-03-25 08:56:00.000000000 +0100 +++ new/yast2-product-creator-2.16.11/src/complex.ycp 2008-03-25 09:04:35.000000000 +0100 @@ -698,17 +698,6 @@ ProductCreator::Config = Configurations[current]:$[]; string task = ProductCreator::Config["current_task"]:""; list<string> to_install = [ "kiwi" ]; - if (contains ([ "iso", "xen", "vmx", "usb" ], task)) - { - string bootdir = ProductCreator::Config["type",task,"boot"]:""; - if (bootdir == "" || - (!FileUtils::Exists ("/usr/share/kiwi/image/" + bootdir) && - !FileUtils::Exists (bootdir)) - ) - { - to_install = add (to_install, sformat("kiwi-desc-%1boot", task)); - } - } if (Package::InstallAll (to_install)) { string dir = diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.10/src/dialogs.ycp new/yast2-product-creator-2.16.11/src/dialogs.ycp --- old/yast2-product-creator-2.16.10/src/dialogs.ycp 2008-03-12 14:51:57.000000000 +0100 +++ new/yast2-product-creator-2.16.11/src/dialogs.ycp 2008-03-28 16:10:31.000000000 +0100 @@ -953,6 +953,9 @@ any ret = nil; + Pkg::ResolvableNeutral ("", `package, true); + Pkg::ResolvableNeutral ("", `pattern, true); + // set a mount point - there is no use to display DU of the current system Pkg::TargetInitDU([ $[ "name" : "/", "free" : ProductCreator::max_size_mb * 1024, @@ -1215,7 +1218,17 @@ } else { - seladd = Pkg::GetPatterns(`selected, ""); + // do not return patterns selected by dependencies + foreach (map pat, Pkg::ResolvableProperties ("", `pattern, ""), + { + if (pat["status"]:`none == `selected) + { + y2milestone ("pat %1 selected by %2" , pat["name"]:"", + pat["transact_by"]:nil); + if (pat["transact_by"]:nil != `solver) + seladd = add (seladd, pat["name"]:""); + } + }); selbase = Pkg::GetPatterns(`selected, "base"); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.10/src/kiwi_dialogs.ycp new/yast2-product-creator-2.16.11/src/kiwi_dialogs.ycp --- old/yast2-product-creator-2.16.10/src/kiwi_dialogs.ycp 2008-02-18 10:56:49.000000000 +0100 +++ new/yast2-product-creator-2.16.11/src/kiwi_dialogs.ycp 2008-03-28 16:12:09.000000000 +0100 @@ -12,12 +12,13 @@ import "CWM"; import "CWMTab"; import "Directory"; - import "ProductCreator"; import "FileUtils"; import "Label"; import "Kiwi"; + import "Package"; import "PackageSystem"; import "Popup"; + import "ProductCreator"; import "SourceDialogs"; import "SourceManager"; import "Summary"; @@ -55,9 +56,9 @@ return ret; } - /******************************************************************************************** + /***************************************************************************** * widget handlers - *******************************************************************************************/ + ****************************************************************************/ /** * Initialize the widget with ignored packages @@ -103,27 +104,26 @@ */ define void InitSWRichText (string id) { - string sw_selection = KiwiConfig["sw_selection"]:"image"; - string pattern_key = sw_selection == "image" ? "addons" : (sw_selection + "_patterns"); + integer package_set = KiwiConfig["package_set"]:0; string rt = ""; - if (KiwiConfig[pattern_key]:[] != []) - { + + list packages = KiwiConfig["packages"]:[]; + string pat = ""; + string pac = ""; + + if (size (packages[package_set,"opensusePattern"]:[]) > 0) // richtext header - rt = Summary::AddHeader ("", _("Patterns")); - foreach (string pattern, (list<string>) KiwiConfig[pattern_key]:[], { - rt = Summary::AddListItem (rt, pattern); - }); - } - string package_key = sw_selection == "image" ? "packages" : (sw_selection + "_packages"); - if (KiwiConfig[package_key]:[] != []) - { + pat = Summary::AddHeader ("", _("Patterns")); + foreach (map patmap, packages[package_set,"opensusePattern"]:[], { + pat = Summary::AddListItem (pat, patmap["name"]:""); + }); + if (size (packages[package_set,"package"]:[]) > 0) // richtext header - rt = Summary::AddHeader (rt, _("Packages")); - foreach (string package, (list<string>) KiwiConfig[package_key]:[], { - rt = Summary::AddListItem (rt, package); - }); - } - UI::ChangeWidget (`id (id), `Value, rt); + pac = Summary::AddHeader ("", _("Packages")); + foreach (map pacmap, packages[package_set,"package"]:[], { + pac = Summary::AddListItem (pac, pacmap["name"]:""); + }); + UI::ChangeWidget (`id (id), `Value, pat + pac); } /** @@ -132,42 +132,34 @@ define symbol HandleSWSelection (string key, map event) { if (event["ID"]:nil == key) { - string sw_selection = KiwiConfig["sw_selection"]:"image"; + integer package_set = KiwiConfig["package_set"]:0; + map sw_contents = KiwiConfig["packages",package_set]:$[]; integer mbytes = (integer) UI::QueryWidget (`id ("size"), `Value); if (UI::QueryWidget (`id ("sizeunit"), `Value) == "G") mbytes = mbytes * 1024; ProductCreator::max_size_mb = mbytes; - if (sw_selection == "image" && packageSelector () != `cancel) - { - KiwiConfig["addons"] = ProductCreator::Config["addons"]:[]; - KiwiConfig["packages"] = ProductCreator::Config["packages"]:[]; - InitSWRichText ("rt_sw"); - if (ProductCreator::Config["taboo"]:[] != nil) - { - //FIXME do not replace current 'ignored' tags... - KiwiConfig["ignore"] = union (KiwiConfig["ignore"]:[], - ProductCreator::Config["taboo"]:[]); - InitSWIgnore ("ignore"); - } - } - else if (sw_selection != "image") - { - map<string,any> selected = runPackageSelector ("", - KiwiConfig[sw_selection + "_patterns"]:[], - KiwiConfig[sw_selection + "_packages"]:[], - KiwiConfig[sw_selection + "_ignore"]:[], - `packages - ); - KiwiConfig[sw_selection + "_patterns"] = selected["addons"]:[]; - KiwiConfig[sw_selection + "_packages"] = selected["packages"]:[]; - InitSWRichText ("rt_sw"); - if (ProductCreator::Config["taboo"]:[] != nil) - { - KiwiConfig["ignore"] = ProductCreator::Config["taboo"]:[]; - InitSWIgnore ("ignore"); - } - } + + map<string,any> ret_map = runPackageSelector ("", + maplist (map pat, sw_contents["opensusePattern"]:[], + ``(pat["name"]:"")), + maplist (map pat, sw_contents["package"]:[], + ``(pat["name"]:"")), + maplist (map pat, sw_contents["ignore"]:[], + ``(pat["name"]:"")), + `packages + ); + if (ret_map["ui"]:nil == `cancel) + return nil; + sw_contents["opensusePattern"] = maplist (string patname, + ret_map["addons"]:[], ``($[ "name" : patname])); + sw_contents["package"] = maplist (string patname, + ret_map["packages"]:[], ``($[ "name" : patname])); + sw_contents["ignore"] = maplist (string patname, + ret_map["taboo"]:[], ``($[ "name" : patname])); + KiwiConfig["packages",package_set] = sw_contents; + InitSWRichText ("rt_sw"); +// InitSWIgnore ("ignore"); FIXME } return nil; } @@ -176,21 +168,34 @@ * initialize the combo box with package selection groups */ define void InitSWSelectionCombo (string id) { - string sw_selection = KiwiConfig["sw_selection"]:"image"; - list items = [ - `item (`id ("image"), _("Image"), sw_selection == "image"), - ]; - if (kiwi_task == "xen") - items = add (items, `item (`id ("xen"), _("Xen Specific"), sw_selection == "xen")); + integer package_set = KiwiConfig["package_set"]:0; + list items = []; + integer i = 0; + foreach (map pmap, KiwiConfig["packages"]:[], { + string type = pmap["type"]:""; + // combo box label + string label = _("Image"); + if (type == "bootstrap") + // combo box label + label = _("Bootstrap"); + if (type == "xen") + // combo box label + label = _("Xen Specific"); // FIXME labels... + if (pmap["profiles"]:"" != "") + // combo box label, %1 is profile name + label = sformat (_("Image, profile %1"), pmap["profiles"]:""); + items = add (items, `item (`id (i), label, package_set == i)); + i = i + 1; + }); UI::ChangeWidget (`id (id), `Items, items); } define void StoreSWSelectionCombo (string key, map event) { - KiwiConfig[key] = (string) UI::QueryWidget(`id(key), `Value); + KiwiConfig["package_set"] = (integer) UI::QueryWidget(`id(key), `Value); } /** - * handler for combo box with isoboot items + * handler for combo box with package sets items */ define symbol HandleSWSelectionCombo (string key, map event) { any id = event["ID"]:nil; @@ -198,13 +203,13 @@ if (id == `next) StoreSWSelectionCombo (key, event); else if (event["ID"]:nil == key) { - string selected = (string) UI::QueryWidget(`id(key), `Value); - if (selected != KiwiConfig["sw_selection"]:"image") + integer selected = (integer) UI::QueryWidget(`id(key), `Value); + if (selected != KiwiConfig["package_set"]:0) { - StoreSWIgnore ("ignore", event); +// StoreSWIgnore ("ignore", event); FIXME StoreSWSelectionCombo (key, event); InitSWRichText ("rt_sw"); - InitSWIgnore ("ignore"); +// InitSWIgnore ("ignore"); FIXME } } return nil; @@ -838,9 +843,10 @@ map label2boot = $[ "openSUSE 10.2" : "suse-10.2", "openSUSE 10.3" : "suse-10.3", + "openSUSE 11.0" : "suse-11.0", "SUSE Linux 10.1" : "suse-10.1", "SUSE Linux Enterprise Server 10" : "suse-SLES10", - "SUSE Linux Enterprise Desktop 10" : "suse-SLED10" + "SUSE Linux Enterprise Desktop 10" : "suse-SLED10", ]; map distproduct2boot = $[ "openSUSE-10.2-CD-download" : "suse-10.2", @@ -884,9 +890,9 @@ } - /******************************************************************************************** + /**************************************************************************** * widget descriptions - *******************************************************************************************/ + ****************************************************************************/ // return map with description of tabs // it is a function, to be able to adapt to actual state (e.g. boot_image_widget ()) @@ -901,23 +907,39 @@ `VSpacing (0.2), `HBox ( `HWeight (1, "version"), - `HWeight (1, `HBox ("size", "sizeunit")) + `HWeight (1, `HBox ("size", "sizeunit")), + `VBox ( + `Label (""), "compressed" + ) ), + /* "sw_selection", `HBox ( `HWeight (1, `VBox ( - `Left (`Label (_("Installed Software"))), "rt_sw", `Right ("configure_sw") + `Left (`Label (_("Installed Software"))), + "rt_sw", `Right ("configure_sw") + )) +// `HWeight (1, `VBox ("ignore", "delete_sw")) + ), + */ + `HBox ( + `HWeight (2, `VBox ( + "sw_selection", + `Left (`Label (_("Installed Software"))), + "rt_sw", + `Right ("configure_sw") )), - `HWeight (1, `VBox ("ignore", "delete_sw")) + `HWeight (1, "delete_sw") ), `VSpacing (0.2) ), `HSpacing(1)), "widget_names" : [ "version", - "size", "sizeunit", + "size", "sizeunit", "compressed", "sw_selection", "rt_sw", "configure_sw", - "ignore", "delete_sw" + "delete_sw", +// "ignore", "delete_sw" ], ], "description" : $[ @@ -1006,79 +1028,6 @@ "no_help" : true, ], // widgets for config.xml tab - /* - "isoboot" : $[ - "widget" : `combobox, - "opt" : [ `hstretch, `notify ], - // combo box label - "label" : _("C&D Boot Image"), - // help text for "C&D Boot Image", %1/%2 is path (on extra line) - "help" : sformat (_("Choose one CD Boot Image from the -<tt>%1/%2</tt> -directory. -"), - Kiwi::kiwi_dir, boot_image_widget ()), - "items" : [], - "init" : InitBootCombo, - "store" : StoreBootCombo, - "handle" : HandleBootCombo, - ], - "xenboot" : $[ - "widget" : `combobox, - "opt" : [ `hstretch, `notify ], - // combo box label - "label" : _("&Xen Boot Image"), - // help text for "XEN Boot Image" - "help" : sformat (_("Choose one Xen Boot Image from the -<tt>%1/%2</tt> -directory. -"), - Kiwi::kiwi_dir, boot_image_widget ()), - "items" : [], - "init" : InitBootCombo, - "store" : StoreBootCombo, - "handle" : HandleBootCombo, - ], - "usbboot" : $[ - "widget" : `combobox, - "opt" : [ `hstretch, `notify ], - // combo box label - "label" : _("&USB Stick Boot Image"), - // help text for "XEN Boot Image" - "help" : sformat (_("Choose one USB Stick Boot Image from the -<tt>%1/%2</tt> -directory. -"), - Kiwi::kiwi_dir, boot_image_widget ()), - "items" : [], - "init" : InitBootCombo, - "store" : StoreBootCombo, - "handle" : HandleBootCombo, - ], - "vmxboot" : $[ - "widget" : `combobox, - "opt" : [ `hstretch, `notify ], - // combo box label - "label" : _("&Virtual Disk Boot Image"), - // help text for "XEN Boot Image" - "help" : sformat (_("Choose one Virtual Disk Boot Image from the -<tt>%1/%2</tt> -directory. -"), - Kiwi::kiwi_dir, boot_image_widget ()), - "items" : [], - "init" : InitBootCombo, - "store" : StoreBootCombo, - "handle" : HandleBootCombo, - ], - */ - "configure_boot" : $[ - "widget" : `push_button, - // pusbutton label - "label" : _("C&onfigure..."), - "help" : _("Create a new boot image with Configure."), - "handle" : NotImplementedHandler - ], "compressed" : $[ "widget" : `checkbox, // textentry label @@ -1088,6 +1037,7 @@ "store" : StoreCompressCheckBox, "handle" : HandleCompressCheckBox, ], + /* "sw_selection" : kiwi_task == "xen" ? $[ "widget" : `combobox, "opt" : [ `hstretch, `notify ], @@ -1103,6 +1053,19 @@ "widget" : `empty, "no_help" : true, ], + */ + "sw_selection" : $[ + "widget" : `combobox, + "opt" : [ `hstretch, `notify ], + // combo box label + "label" : _("So&ftware Selection"), + // help text for "So&ftware selection" + "help" : "", + "items" : [], + "init" : InitSWSelectionCombo, + "store" : StoreSWSelectionCombo, + "handle" : HandleSWSelectionCombo, + ], "rt_sw" : $[ "widget" : `richtext, "init" : InitSWRichText, @@ -1725,7 +1688,7 @@ if (template_items != []) UI::ChangeWidget (`id (`template), `Enabled, false); UI::ChangeWidget (`id (`import), `Enabled, false); - UI::ChangeWidget (`id (`config), `ValidChars, String::CAlnum () + "-_"); + UI::ChangeWidget (`id (`config), `ValidChars, String::CAlnum ()+".-_"); } any ret = nil; while (true) @@ -1924,6 +1887,7 @@ kiwi_task = (string) UI::QueryWidget (`id (`type), `Value); list<string> failed_repositories = []; + map<string,map> new_repositories = $[]; if (size (repositories) > 0) { map<string,integer> current_sources = $[]; @@ -1935,7 +1899,7 @@ current_sources[url] = srcid; }); // initialize new repos now - repositories = filter (string url, map repo, repositories, { + new_repositories = filter (string url, map repo, repositories, { if (substring (url, 0, 1) == "/") url = "dir://" + url; if (haskey (current_sources, url)) @@ -1968,7 +1932,26 @@ Continue anyway?"), mergestring (failed_repositories, "\n")))) { - update_repo_table (); + continue; + } + else + { + repositories = new_repositories; + } + } + string to_install = ""; + if (contains ([ "iso", "xen", "vmx", "usb" ], kiwi_task)) + { + string bootdir = Config["type",kiwi_task,"boot"]:""; + if (bootdir == "" || + (!FileUtils::Exists ("/usr/share/kiwi/image/" + bootdir) && + !FileUtils::Exists (bootdir)) + ) + { + to_install = sformat("kiwi-desc-%1boot", kiwi_task); + } + if (to_install != "" && !Package::Install (to_install)) + { continue; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.10/src/Kiwi.ycp new/yast2-product-creator-2.16.11/src/Kiwi.ycp --- old/yast2-product-creator-2.16.10/src/Kiwi.ycp 2008-02-15 15:11:27.000000000 +0100 +++ new/yast2-product-creator-2.16.11/src/Kiwi.ycp 2008-03-28 16:15:02.000000000 +0100 @@ -178,6 +178,8 @@ ret["flags"] = typemap["flags"]:""; if (typemap["format"]:"" != "") ret["format"] = typemap["format"]:""; + if (type == "vmx" && ret["format"]:"" == "") + ret["format"] = "vmdk"; if (type == task) ret["primary"] = "true"; return ret; @@ -192,6 +194,8 @@ ]; if (task != "iso") ret["filesystem"] = "ext3"; + if (task == "vmx") + ret["format"] = "vmdk"; retlist = [ ret ]; } return retlist; @@ -199,6 +203,7 @@ /** * generate the list of packages/patterns for image + * FIXME generate from new map... */ map get_image_packages (map config, list packages, list patterns,list ignored) { @@ -222,6 +227,7 @@ "user" : true, "source" : true, "file" : true, // for drivers section + "profile" : true, ]; /** @@ -235,7 +241,8 @@ integer i = 0; while (i < level) { i = i + 1; - tab = tab + "\t"; +// tab = tab + "\t"; + tab = tab + " "; } string key = descr["__key"]:""; if (key == "") return ""; @@ -279,36 +286,13 @@ if (config == nil) return ret; map<string,map> packages = config["packages"]:$[]; - // rest parts of "packages" are saved in product-creator map - ret["ignore"] = maplist (map p, - (list<map>)packages["image","ignore"]:[], ``(p["name"]:"")); - // value of "arch" is currently ignored... - foreach (string section, [ "boot", "xen" ], { - ret[section + "_packages"] = maplist (map p, - (list<map>)packages[section, "package"]:[], ``(p["name"]:"")); - ret[section + "_patterns"] = maplist (map p, - (list<map>)packages[section,"opensusePattern"]:[],``(p["name"]:"")); - ret[section + "_ignore"] = maplist (map p, - (list<map>)packages[section, "ignore"]:[], ``(p["name"]:"")); - }); - // list of packages and patterns is needed for import, not for new image - ret["addons"] = maplist (map p, - (list<map>)packages["image","opensusePattern"]:[], ``(p["name"]:"")); - ret["packages"] = maplist (map p, - (list<map>)packages["image","package"]:[], ``(p["name"]:"")); - if (haskey (packages, "delete")) - { - ret["delete_packages"] = maplist (map p, - (list<map>)packages["delete", "package"]:[], ``(p["name"]:"")); - } - - if (packages["image","patternType"]:"" != "") - ret["image_patternType"] = packages["image","patternType"]:""; + // FIXME these should be part of "packages" already... if (packages["xen","disk"]:"" != "") ret["xen_disk"] = packages["xen","disk"]:""; if (packages["xen","memory"]:"" != "") ret["xen_memory"] = tointeger (packages["xen","memory"]:"512"); + foreach (string key, [ "author", "contact", "image_type", "specification", "packagemanager", "version", "rpm-check-signatures", "rpm-force", "sizeunit", "type", "name", "repository", "defaultdestination", @@ -334,7 +318,16 @@ "group" : usermap["group"]:"", "username" : user, ]; + //FIXME save this, show in UI... + if (usermap["realname"]:"" != "") + ret["users",user,"realname"] = usermap["realname"]:""; }); + + map anyxml = (map) SCR::Read (.anyxml, base_path + "/config.xml"); + map image = anyxml["image",0]:$[]; + ret["packages"] = image["packages"]:[]; + ret["profiles"] = image["profiles"]:[]; + ret["split"] = image["split"]:[]; return ret; } @@ -355,51 +348,10 @@ KiwiConfig["defaultroot"] = chroot_dir; } - list packages_list = []; - list patterns_list = []; - list ignored_list = []; - list packages_boot_list = []; - list patterns_boot_list = []; - list ignored_boot_list = []; - list packages_xen_list = []; list patterns_xen_list = []; list ignored_xen_list = []; - foreach (string package, (list<string>) KiwiConfig["packages"]:[], { - packages_list = add (packages_list, $[ - "__key" : "package", - "name" : package, - ]); - }); - foreach (string pattern, (list<string>) KiwiConfig["addons"]:[], { - patterns_list = add (patterns_list, $[ - "__key" : "opensusePattern", - "name" : pattern, - ]); - }); - foreach (string package, (list<string>) KiwiConfig["ignore"]:[], { - ignored_list = add (ignored_list, $[ - "__key" : "ignore", - "name" : package, - ]); - }); - list<string> boot_packages = - KiwiConfig["boot_packages"]:["filesystem", "glibc-locale", "kernel-default", "devs" ]; - foreach (string package, boot_packages, { - packages_boot_list = add (packages_boot_list, $[ - "__key" : "package", - "name" : package, - ]); - }); - foreach (string ignore, KiwiConfig["boot_ignore"]:[], { - ignored_boot_list = add (ignored_boot_list, $[ - "__key" : "ignore", - "name" : ignore, - ]); - }); - - foreach (string package, KiwiConfig["xen_packages"]:[], { packages_xen_list = add (packages_xen_list, $[ "__key" : "package", @@ -451,10 +403,6 @@ "__key" : "rpm-force", "__value" : KiwiConfig["rpm-force"]:"True", ], - $[ - "__key" : "defaultdestination", - "__value" : KiwiConfig["iso-directory"]:"", - ], ], ]; // "type" goes to the first place @@ -476,8 +424,6 @@ } }); - - list write_list = [ $[ "__key" : "image", "name" : KiwiConfig["name"]:"", @@ -506,6 +452,16 @@ ]]; if (KiwiConfig["inherit"]:"" != "") write_list[0,"inherit"] = KiwiConfig["inherit"]:""; + if (haskey (KiwiConfig, "profiles")) + { + write_list[0,"__children"] = add (write_list[0,"__children"]:[], $[ + "__key" : "profiles", + "__children" : maplist ( + map profile, KiwiConfig["profiles",0,"profile"]:[], { + return union ($[ "__key" : "profile"], profile); + }) + ]); + } if (haskey (KiwiConfig, "users")) { map<string,list> groups2users = $[]; @@ -521,14 +477,17 @@ write_list[0,"__children"] = add (write_list[0,"__children"]:[], $[ "__key" : "users", "group" : group, - "__children" : maplist (map usermap, (list<map>) userlist, ``( - $[ + "__children" : maplist (map usermap, (list<map>) userlist, { + map u = $[ "__key" : "user", "name" : usermap["username"]:"", "pwd" : (usermap["encrypted"]:false) ? usermap["pwd"]:"" : crypt_password (usermap["pwd"]:""), "home" : usermap["home"]:"", - ] - )) + ]; + if (usermap["realname"]:"" != "") + u["realname"] = usermap["realname"]:""; + return u; + }) ]); }); } @@ -537,15 +496,64 @@ ``(get_source_value (source, KiwiConfig)) ) ); - write_list[0,"__children"] = union (write_list[0,"__children"]:[], [ - get_image_packages ( - KiwiConfig, packages_list, patterns_list, ignored_list), + map image_packages = $[]; + list<map> profiles_packages = []; // + FIXME XEN + delete are here? + map bootstrap_packages = $[]; + foreach (map packagemap, KiwiConfig["packages"]:[], { + /* example of packagemap: $[ - "__key" : "packages", - "type" : "boot", - "__children": union (union (packages_boot_list, patterns_boot_list), ignored_boot_list) - ], - ]); + "opensusePattern" : [ + $[ "name":"base" ], + $[ "name":"x11" ] + ], + "package" : [ $[ "name":"zypper" ] ], + "type" : "image", + "profiles" : "KDE" + ]*/ + map pmap = union (packagemap, $[ + "__key" : "packages", + ]); + string type = pmap["type"]:""; + pmap["__children"] = maplist (map p, pmap["package"]:[], ``( + union (p, $[ "__key" : "package"])) + ); + if (haskey (pmap, "package")) + pmap = remove (pmap,"package"); + if (haskey (pmap, "ignore")) + { + pmap["__children"] = union (pmap["__children"]:[], + maplist (map p, pmap["ignore"]:[], ``( + union (p, $[ "__key" : "ignore"])) + ) + ); + pmap = remove (pmap, "ignore"); + } + if (haskey (pmap, "opensusePattern")) + { + pmap["__children"] = union (pmap["__children"]:[], + maplist (map p, pmap["opensusePattern"]:[], ``( + union (p, $[ "__key" : "opensusePattern"])) + ) + ); + pmap = remove (pmap,"opensusePattern"); + } + if (type == "bootstrap") + bootstrap_packages = pmap; + else if (type == "image" && pmap["profiles"]:"" == "") + image_packages = pmap; + else + profiles_packages = add (profiles_packages, pmap); + }); + if (image_packages != $[]) + write_list[0,"__children"] = + add (write_list[0,"__children"]:[], image_packages); + if (profiles_packages != []) + write_list[0,"__children"] = + union (write_list[0,"__children"]:[], profiles_packages); + if (bootstrap_packages != $[]) + write_list[0,"__children"] = + add (write_list[0,"__children"]:[], bootstrap_packages); + /* if (task == "xen") { write_list[0,"__children"] = add (write_list[0,"__children"]:[], $[ @@ -566,8 +574,24 @@ "__children": packages_delete_list ]); } + */ + if (haskey (KiwiConfig, "split")) + write_list[0,"__children"] = add (write_list[0,"__children"]:[], $[ + "__key" : "split", + /* FIXME + "__children": maplist (map what, KiwiConfig["split"]:[], { + map ret = $[]; + foreach (string k, list val, what, { + ret["__key"] = k; + ret + }); + return ret; + }); + */ + ]); - string write_string = Map2XML (write_list[0]:$[], 0); + string write_string = "<?xml version=\"1.0\"?>\n" + + Map2XML (write_list[0]:$[], 0); config_dir = tmp_dir + "/" + KiwiConfig["name"]:""; SCR::Execute (.target.mkdir, config_dir); SCR::Write (.target.string, config_dir + "/config.xml", write_string); @@ -693,6 +717,7 @@ UI::ChangeWidget (`id(`log), `LastLine, "\n"); cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --nocolor --create %1 -d %2 --logfile terminal", chroot_dir, out_dir); y2milestone ("calling '%1'", cmd); +// FIXME ask for profiles, than call with --add-profile <profile-name> // label UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image")))); SCR::Execute (.background.run_output_err, cmd); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.10/src/routines.ycp new/yast2-product-creator-2.16.11/src/routines.ycp --- old/yast2-product-creator-2.16.10/src/routines.ycp 2007-07-16 15:53:26.000000000 +0200 +++ new/yast2-product-creator-2.16.11/src/routines.ycp 2007-09-13 09:36:17.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Miscelanous functions for configuration of product-creator. * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: routines.ycp 37838 2007-05-04 13:18:14Z lslezak $ + * $Id: routines.ycp 38945 2007-06-21 12:19:17Z jsuchome $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.10/TODO new/yast2-product-creator-2.16.11/TODO --- old/yast2-product-creator-2.16.10/TODO 2007-11-09 16:26:08.000000000 +0100 +++ new/yast2-product-creator-2.16.11/TODO 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -Do the same for s390 and s390x: - -+ // ppc64 has /boot/ppc -+ string boot_architecture = (arch == "ppc64") ? "ppc" : arch; -+ -+ if (bootable_product && Config["code10"]:false) - { -- Exec(sformat("/bin/mkdir -p '%1/boot/%2'", String::Quote(skel_root), String::Quote(arch))); -+ Exec(sformat("/bin/mkdir -p '%1/boot/%2'", String::Quote(skel_root), String::Quote(boot_architecture))); - } - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.16.10/VERSION new/yast2-product-creator-2.16.11/VERSION --- old/yast2-product-creator-2.16.10/VERSION 2008-03-25 08:49:09.000000000 +0100 +++ new/yast2-product-creator-2.16.11/VERSION 2008-03-28 16:14:47.000000000 +0100 @@ -1 +1 @@ -2.16.10 +2.16.11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 minicom
by root＠Hilbert.suse.de 28 Mar '08

28 Mar '08

Hello community, here is the log from the commit of package minicom checked in at Fri Mar 28 17:17:03 CET 2008. -------- --- minicom/minicom.changes 2007-03-30 01:43:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/minicom/minicom.changes 2008-03-28 16:51:42.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Mar 28 15:40:10 CET 2008 - mmarek(a)suse.cz + +- updated to 2.3 + * New version of the dial format to be little and big endian as + well as 32/64 bit safe + * Support more baud rates + * Handle device disappearances (e.g. serial-USB device unplug) + * Various build and other fixes +- specfile cleanup + +------------------------------------------------------------------- Old: ---- minicom-2.2-array.diff minicom-2.2-getline.diff minicom-2.2.tar.bz2 minicom-2.2-wprintf.diff New: ---- minicom-2.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ minicom.spec ++++++ --- /var/tmp/diff_new_pack.rU8277/_old 2008-03-28 17:16:11.000000000 +0100 +++ /var/tmp/diff_new_pack.rU8277/_new 2008-03-28 17:16:11.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package minicom (Version 2.2) +# spec file for package minicom (Version 2.3) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 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. # @@ -10,22 +10,18 @@ # norootforbuild + Name: minicom -BuildRequires: gettext-devel ncurses-devel resmgr -URL: http://alioth.debian.org/projects/minicom/ -License: GNU General Public License (GPL) +BuildRequires: gettext-devel ncurses-devel +Url: http://alioth.debian.org/projects/minicom/ +License: GPL v2 or later Group: Hardware/Modem -Provides: comms Requires: rzsz -Autoreqprov: on -Version: 2.2 -Release: 22 +Version: 2.3 +Release: 1 Summary: A Terminal Program Source: %{name}-%{version}.tar.bz2 -Patch0: %{name}-%{version}-defaults.diff -Patch1: %{name}-%{version}-array.diff -Patch2: %{name}-%{version}-getline.diff -Patch3: %{name}-%{version}-wprintf.diff +Patch0: minicom-2.2-defaults.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,37 +42,20 @@ %prep %setup -q %patch0 -%patch1 -%patch2 -%patch3 %build -gettextize --force --copy autoreconf --force --install -mv po/Makevars.template po/Makevars -mv po/no.po po/nb.po -mv po/no.gmo po/nb.gmo -CFLAGS="$RPM_OPT_FLAGS -Wall" \ +CFLAGS="$RPM_OPT_FLAGS" \ ./configure \ --prefix=%{_prefix} \ --mandir=%{_mandir} \ --enable-music \ --enable-dfl-baud=57600 \ - --enable-resmgr \ --enable-cfg-dir=%{_sysconfdir} make %install -rm -rf $RPM_BUILD_ROOT -# mkdir -p /usr/share/doc/packages/minicom -# make install -C src MANDIR=%{_mandir}/man1 -# install -d /var/lib/minicom -# ln -sf mc.iso /usr/share/doc/packages/minicom/tables/dot.mciso -# ln -sf mc.noconv /usr/share/doc/packages/minicom/tables/dot.mcnoconv -# ln -sf mc.pc8 /usr/share/doc/packages/minicom/tables/dot.mcpc8 -# ln -sf mc.sf7 /usr/share/doc/packages/minicom/tables/dot.mcsf7 -# the gettext setup is busted -make DESTDIR=$RPM_BUILD_ROOT gnulocaledir=$RPM_BUILD_ROOT/usr/share/locale install +make DESTDIR=$RPM_BUILD_ROOT install %find_lang %name %clean @@ -84,7 +63,7 @@ %files -f %name.lang %defattr(644,root,root,755) -%doc doc/* ABOUT-NLS AUTHORS COPYING ChangeLog FILE_ID.DIZ INSTALL NEWS README +%doc doc/minicom.FAQ AUTHORS COPYING NEWS README %attr(0755,root,root) /usr/bin/ascii-xfr %attr(0755,root,uucp) /usr/bin/minicom %attr(0755,root,root) /usr/bin/runscript @@ -95,9 +74,17 @@ %{_mandir}/man1/runscript.1.gz %changelog -* Fri Mar 30 2007 - ro(a)suse.de +* Fri Mar 28 2008 mmarek(a)suse.cz +- updated to 2.3 + * New version of the dial format to be little and big endian as + well as 32/64 bit safe + * Support more baud rates + * Handle device disappearances (e.g. serial-USB device unplug) + * Various build and other fixes +- specfile cleanup +* Fri Mar 30 2007 ro(a)suse.de - added ncurses-devel to buildreq -* Thu Oct 19 2006 - mjancar(a)suse.cz +* Thu Oct 19 2006 mjancar(a)suse.cz - update to 2.2 * Vietnamese translation added * Norwegian translation added @@ -107,71 +94,71 @@ * default to 8bit mode if LANG or LC_ALL are set * default baud rate set to 115200 * Various code cleanups and fixes -* Thu Aug 24 2006 - mkoenig(a)suse.de +* Thu Aug 24 2006 mkoenig(a)suse.de - reverted last change (moving scripts from aux/) - changed gettext issues to fix build -* Tue Aug 22 2006 - mkoenig(a)suse.de +* Tue Aug 22 2006 mkoenig(a)suse.de - fixed getline name collision - moved autotools scripts out of aux/ -* Mon Feb 27 2006 - anicka(a)suse.cz +* Mon Feb 27 2006 anicka(a)suse.cz - fix subscript out of range (#151489) -* Wed Jan 25 2006 - mls(a)suse.de +* Wed Jan 25 2006 mls(a)suse.de - converted neededforbuild to BuildRequires -* Mon Apr 18 2005 - mcihar(a)suse.cz +* Mon Apr 18 2005 mcihar(a)suse.cz - fix for current gcc -* Fri Feb 04 2005 - mcihar(a)suse.cz +* Fri Feb 04 2005 mcihar(a)suse.cz - fixed permissions (bug #50438) -* Mon Jan 12 2004 - adrian(a)suse.de +* Mon Jan 12 2004 adrian(a)suse.de - add missing %%attr -* Sat Jan 10 2004 - adrian(a)suse.de +* Sat Jan 10 2004 adrian(a)suse.de - add %%defattr -* Wed Jul 23 2003 - coolo(a)suse.de +* Wed Jul 23 2003 coolo(a)suse.de - use BuildRoot and %%find_lang - package xminicom man page -* Mon May 26 2003 - stepan(a)suse.de +* Mon May 26 2003 stepan(a)suse.de - update to 2.1 -* Tue Dec 24 2002 - mfabian(a)suse.de +* Tue Dec 24 2002 mfabian(a)suse.de - fix charset headers in Japanese .po files (messages in ja_JP.UTF-8 were garbled because of this) - remove backslashes in the SJIS encoded Japanese .po file which were only needed as a workaround for deficiencies in older versions of gettext. These extra backslashes cause trouble with newer gettext versions. -* Fri Nov 29 2002 - okir(a)suse.de +* Fri Nov 29 2002 okir(a)suse.de - add support for resmgr -* Mon Nov 18 2002 - schwab(a)suse.de +* Mon Nov 18 2002 schwab(a)suse.de - Add AM_GNU_GETTEXT_VERSION. -* Tue Oct 01 2002 - uli(a)suse.de +* Tue Oct 01 2002 uli(a)suse.de - turned off HW flow control in default setup (bug #20390) -* Wed Sep 18 2002 - ro(a)suse.de +* Wed Sep 18 2002 ro(a)suse.de - removed bogus self-provides -* Thu Apr 04 2002 - ro(a)suse.de +* Thu Apr 04 2002 ro(a)suse.de - build with current automake/autoconf/gettext -* Thu Dec 06 2001 - uli(a)suse.de +* Thu Dec 06 2001 uli(a)suse.de - update -> 2.00.0 (fixes, mainly) -* Thu Apr 19 2001 - mfabian(a)suse.de +* Thu Apr 19 2001 mfabian(a)suse.de - fix invalid multibyte characters in ko.po just to make it build -* Wed Feb 07 2001 - uli(a)suse.de +* Wed Feb 07 2001 uli(a)suse.de - fixed for glibc 2.2.1 -* Thu Dec 21 2000 - uli(a)suse.de +* Thu Dec 21 2000 uli(a)suse.de - replaced call of "sx" with "sz -X" -* Thu Nov 30 2000 - uli(a)suse.de +* Thu Nov 30 2000 uli(a)suse.de - fixed some links -* Wed Nov 29 2000 - uli(a)suse.de +* Wed Nov 29 2000 uli(a)suse.de - update -> 1.83.1 -* Wed May 24 2000 - uli(a)suse.de +* Wed May 24 2000 uli(a)suse.de - moved docs to /usr/share -* Thu Mar 02 2000 - kukuk(a)suse.de +* Thu Mar 02 2000 kukuk(a)suse.de - Use _mandir macro -* Mon Sep 13 1999 - bs(a)suse.de +* Mon Sep 13 1999 bs(a)suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. -* Thu May 06 1999 - kukuk(a)suse.de +* Thu May 06 1999 kukuk(a)suse.de - Don't link against libintl.a -* Thu Jul 30 1998 - bs(a)suse.de +* Thu Jul 30 1998 bs(a)suse.de - don't start rz with "-E" by default - our rz does not know it. -* Tue Jul 28 1998 - bs(a)suse.de +* Tue Jul 28 1998 bs(a)suse.de - marked minicom.users as %%config again. -* Mon Jul 27 1998 - werner(a)suse.de +* Mon Jul 27 1998 werner(a)suse.de - new version 1.81.1 - applied red hat security patches - DONT set sguid uucp (you can't be saver :) ). User have to be in ++++++ minicom-2.2.tar.bz2 -> minicom-2.3.tar.bz2 ++++++ ++++ 75123 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-installation
by root＠Hilbert.suse.de 28 Mar '08

28 Mar '08

Hello community, here is the log from the commit of package yast2-installation checked in at Fri Mar 28 17:16:37 CET 2008. -------- --- yast2-installation/yast2-installation.changes 2008-03-19 15:03:03.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2008-03-28 14:14:41.000000000 +0100 @@ -1,0 +2,47 @@ +Fri Mar 28 13:33:31 CET 2008 - locilka(a)suse.cz + +- Automatic configuration has been moved from the end of the first + stage to the second stage. It's non-interactive (FATE #303396). +- Fixed installation from images (FATE #303554). +- ImageInstallation can newly handle .lzma images. +- 2.16.27 + +------------------------------------------------------------------- +Thu Mar 27 13:37:02 CET 2008 - locilka(a)suse.cz + +- Fixed ZMD service handling, the correct name is novell-zmd + (bnc #356655). + +------------------------------------------------------------------- +Wed Mar 26 11:21:18 CET 2008 - locilka(a)suse.cz + +- Added new entry to control file root_password_as_first_user to + make it configurable (bnc #359115 comment #14). +- Control file modified to call installation-from-images clients. + +------------------------------------------------------------------- +Tue Mar 25 13:12:39 CET 2008 - locilka(a)suse.cz + +- Using Image-Installation clients (done by jsrain). +- Store/Restore resolvable-state functions added into + ImageInstallation module. + +------------------------------------------------------------------- +Fri Mar 21 10:48:20 CET 2008 - locilka(a)suse.cz + +- Dropping keep_installed_patches support from control file as it + is currently handled by libzypp itself (bnc #349533). + +------------------------------------------------------------------- +Thu Mar 20 10:27:09 CET 2008 - locilka(a)suse.cz + +- Added system_settings_finish call to the inst_finish + (bnc #340733). + +------------------------------------------------------------------- +Wed Mar 19 17:27:30 CET 2008 - locilka(a)suse.cz + +- Agent anyxml has been renamed to barexml as it can't really read + all possible XML files (bnc #366867) + +------------------------------------------------------------------- Old: ---- yast2-installation-2.16.26.tar.bz2 New: ---- yast2-installation-2.16.27.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.zr7709/_old 2008-03-28 17:15:54.000000000 +0100 +++ /var/tmp/diff_new_pack.zr7709/_new 2008-03-28 17:15:54.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.16.26) +# spec file for package yast2-installation (Version 2.16.27) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,16 +12,16 @@ Name: yast2-installation -Version: 2.16.26 +Version: 2.16.27 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.16.26.tar.bz2 +Source0: yast2-installation-2.16.27.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite -# URL::MakeParamsFromMap and URL::MakeMapFromParams -BuildRequires: yast2 >= 2.16.25 +# anyxml -> barexml (bnc #366867) +BuildRequires: yast2 >= 2.16.39 Requires: autoyast2-installation # Installation::run_update_file Requires: yast2 >= 2.16.36 @@ -72,6 +72,7 @@ Summary: YaST2 - Installation Parts %package devel-doc +License: GPL v2 or later Group: Documentation/HTML Requires: yast2-installation >= 2.15.34 PreReq: %fillup_prereq @@ -104,7 +105,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-installation-2.16.26 +%setup -n yast2-installation-2.16.27 %build %{prefix}/bin/y2tool y2autoconf @@ -170,6 +171,32 @@ %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/README %changelog +* Fri Mar 28 2008 locilka(a)suse.cz +- Automatic configuration has been moved from the end of the first + stage to the second stage. It's non-interactive (FATE #303396). +- Fixed installation from images (FATE #303554). +- ImageInstallation can newly handle .lzma images. +- 2.16.27 +* Thu Mar 27 2008 locilka(a)suse.cz +- Fixed ZMD service handling, the correct name is novell-zmd + (bnc #356655). +* Wed Mar 26 2008 locilka(a)suse.cz +- Added new entry to control file root_password_as_first_user to + make it configurable (bnc #359115 comment #14). +- Control file modified to call installation-from-images clients. +* Tue Mar 25 2008 locilka(a)suse.cz +- Using Image-Installation clients (done by jsrain). +- Store/Restore resolvable-state functions added into + ImageInstallation module. +* Fri Mar 21 2008 locilka(a)suse.cz +- Dropping keep_installed_patches support from control file as it + is currently handled by libzypp itself (bnc #349533). +* Thu Mar 20 2008 locilka(a)suse.cz +- Added system_settings_finish call to the inst_finish + (bnc #340733). +* Wed Mar 19 2008 locilka(a)suse.cz +- Agent anyxml has been renamed to barexml as it can't really read + all possible XML files (bnc #366867) * Wed Mar 19 2008 locilka(a)suse.cz - When checking whether to run the second stage, considering also autoinstallation, not only installation (bnc #372322). ++++++ yast2-installation-2.16.26.tar.bz2 -> yast2-installation-2.16.27.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.26/control/docs/control-section.xml new/yast2-installation-2.16.27/control/docs/control-section.xml --- old/yast2-installation-2.16.26/control/docs/control-section.xml 2008-01-10 14:48:19.000000000 +0100 +++ new/yast2-installation-2.16.27/control/docs/control-section.xml 2008-03-26 11:20:36.000000000 +0100 @@ -364,6 +364,11 @@ dialog might be skipped (if language already selected).</para></listitem> <listitem><para>(boolean) <emphasis>show_online_repositories</emphasis> - either shows or hides the "online repositories" feature check-box.</para></listitem> +  + <listitem><para>(boolean) <emphasis>root_password_as_first_user</emphasis> - automatically + selects or deselects the checkbox that makes Users configuration to set the password + entered for a first user also for the user root. If not defined, default is + <emphasis>false</emphasis></para></listitem> </itemizedlist> </section> @@ -514,32 +519,6 @@ </listitem> <listitem> - <para><emphasis>keep_installed_patches</emphasis></para> - <para>Sets the default how installed patches should be handled during upgrade. - If true, patches are kept.</para> - </listitem> - -  - <listitem> - <para><emphasis>keep_installed_patches_reverse_list</emphasis></para> - <para>Inverts the <emphasis>keep_installed_patches</emphasis> rule - for products defined as list of regular expressions matching installed - product name (SuSE-release).</para> - - <programlisting> - -  - <software> - <keep_installed_patches config:type="boolean">true</keep_installed_patches> - <keep_installed_patches_reverse_list config:type="list"> - <regexp_item>^SUSE (LINUX|Linux) Enterprise Server 10.*$</regexp_item> - </keep_installed_patches_reverse_list> - </software> - - </programlisting> - </listitem> - - <listitem> <para><emphasis>only_update_selected</emphasis></para> <para>One can update (only update packages already installed) or upgrade (also install new packages with new functionality). For diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.26/src/clients/automatic_configuration_finish.ycp new/yast2-installation-2.16.27/src/clients/automatic_configuration_finish.ycp --- old/yast2-installation-2.16.26/src/clients/automatic_configuration_finish.ycp 2008-03-15 03:03:15.000000000 +0100 +++ new/yast2-installation-2.16.27/src/clients/automatic_configuration_finish.ycp 2008-03-28 14:45:54.000000000 +0100 @@ -1,7 +1,8 @@ /** * File: clients/automatic_configuration_finish.ycp * Package: installation - * Summary: Automatic configuration instead of the second stage (Preview) + * Summary: Automatic configuration instead of the second stage. + * DO NOT USE THIS CLIENT ANYMORE. * Authors: Lukas Ocilka <locilka(a)suse.cz> * ThanksTo: Martin Vidner <mvidner(a)suse.cz> * Ladislav Slezak <lslezak(a)suse.cz> @@ -16,9 +17,13 @@ import "FileUtils"; import "Installation"; import "ProductControl"; + import "GetInstArgs"; textdomain "installation"; + y2error ("DO NOT USE THIS CLIENT ANYMORE!"); + return nil; + any ret = nil; string func = ""; map param = $[]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.26/src/clients/inst_automatic_configuration.ycp new/yast2-installation-2.16.27/src/clients/inst_automatic_configuration.ycp --- old/yast2-installation-2.16.26/src/clients/inst_automatic_configuration.ycp 2008-03-13 18:39:38.000000000 +0100 +++ new/yast2-installation-2.16.27/src/clients/inst_automatic_configuration.ycp 2008-03-28 14:47:07.000000000 +0100 @@ -1,7 +1,7 @@ /** * File: clients/inst_automatic_configuration.ycp * Package: installation - * Summary: Automatic configuration instead of the second stage (Preview) + * Summary: Automatic configuration instead of the second stage * Authors: Lukas Ocilka <locilka(a)suse.cz> * * $Id:$ @@ -14,30 +14,38 @@ import "Stage"; import "FileUtils"; import "Directory"; + import "GetInstArgs"; textdomain "installation"; + if (GetInstArgs::going_back()) { + y2milestone ("Going back, nothing to do here..."); + return `auto; + } + y2milestone ("automatic_configuration started"); Mode::SetMode ("installation"); Stage::Set ("continue"); +// TODO: read this from control file +// (at least the list of modules in proposals) list <map <string, any> > proposal_scripts_to_call = [ // probably needed - $[ "type":"scripts", "items":["netprobe"] ], + $[ "type":"scripts", "items":["initialization", "netprobe", "rpmcopy_secondstage"] ], // network proposal $[ "type":"proposals", "items":["lan", "general", "dsl", "isdn", "modem", "remote", "firewall"] ], // hardware proposal $[ "type":"proposals", "items":["x11", "printer", "sound", "tv"] ], // probably needed - $[ "type":"scripts", "items":["suseconfig", "save_hardware_status"] ], + $[ "type":"scripts", "items":["addon_update_sources", "inst_extrasources", "suseconfig", "save_hardware_status"] ], ]; - // weird exception for users - if (FileUtils::Exists (Directory::vardir + "/users_first_stage.ycp")) { - y2milestone ("Users will be called"); - proposal_scripts_to_call = add (proposal_scripts_to_call, $[ "type":"scripts", "items":["user"] ]); - } +// users will be called if there is anything to write +// if (FileUtils::Exists (Directory::vardir + "/users_first_stage.ycp")) { +// y2milestone ("Users will be called"); +// proposal_scripts_to_call = add (proposal_scripts_to_call, $[ "type":"scripts", "items":["user"] ]); +// } /** * Prepares the list of installation scripts to be executed. @@ -101,13 +109,20 @@ foreach (string one_proposal, proposals_to_call, { y2milestone ("Calling script %1 MakeProposal", one_proposal); - any result = WFM::CallFunction (one_proposal, ["MakeProposal", $[ "WriteOnly":true, "AutomaticConfiguration":true ]]); + any result = WFM::CallFunction (one_proposal, ["MakeProposal", $[ "AutomaticConfiguration":true ]]); y2milestone ("Script %1 returned %2", one_proposal, result); }); + // TODO: handle errors, warnings ... + // foreach (string one_proposal, proposals_to_call, { + // y2milestone ("Calling script %1 MakeProposal", one_proposal); + // any result = WFM::CallFunction (one_proposal, ["Description", $[ "AutomaticConfiguration":true ]]); + // y2milestone ("Script %1 returned %2", one_proposal, result); + //}); + foreach (string one_proposal, proposals_to_call, { y2milestone ("Calling script %1 Write", one_proposal); - any result = WFM::CallFunction (one_proposal, ["Write", $[ "WriteOnly":true, "AutomaticConfiguration":true ]]); + any result = WFM::CallFunction (one_proposal, ["Write", $[ "AutomaticConfiguration":true ]]); y2milestone ("Script %1 returned %2", one_proposal, result); }); } @@ -127,4 +142,6 @@ }); y2milestone ("automatic_configuration finished"); + + return `auto; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.26/src/clients/inst_congratulate.ycp new/yast2-installation-2.16.27/src/clients/inst_congratulate.ycp --- old/yast2-installation-2.16.26/src/clients/inst_congratulate.ycp 2008-01-30 12:22:28.000000000 +0100 +++ new/yast2-installation-2.16.27/src/clients/inst_congratulate.ycp 2008-03-27 13:38:39.000000000 +0100 @@ -6,7 +6,7 @@ * * Display a congratulation message for the user. * - * $Id: inst_congratulate.ycp 44000 2008-01-30 11:22:27Z locilka $ + * $Id: inst_congratulate.ycp 45790 2008-03-27 12:38:38Z locilka $ */ { @@ -50,7 +50,7 @@ // #302495: Switching ZMD off // by default, the checkbox is not visible - string zmd_service_name = "novell_zmd"; + string zmd_service_name = "novell-zmd"; string zmd_package_name = "zmd"; term check_box_turnoff_zmd = `Empty(); string turnoff_zmd_help= ""; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.26/src/clients/inst_deploy_image.ycp new/yast2-installation-2.16.27/src/clients/inst_deploy_image.ycp --- old/yast2-installation-2.16.26/src/clients/inst_deploy_image.ycp 2008-02-18 09:35:49.000000000 +0100 +++ new/yast2-installation-2.16.27/src/clients/inst_deploy_image.ycp 2008-03-28 14:40:46.000000000 +0100 @@ -6,6 +6,12 @@ textdomain "installation"; +// There is nothing to do +if (! Installation::image_installation) { + y2milestone ("No images have been selected"); + return `auto; +} + y2milestone ("Deploying image"); list<string> images = ImageInstallation::ImageOrder (); @@ -24,44 +30,45 @@ { last_image = image; if (image < size (images)) - Progress::Title (sformat (_("Deploying Image \"%1\""), images[image]:"")); + Progress::Title (sformat (_("Deploying Image (%1/%2)..."), (image + 1), size (images))); } Progress::Step (image); } -if (! Installation::image_installation) - return `auto; - Wizard::SetContents (_("Deploying Installation Images"), `Empty (), "", false, false); Wizard::SetTitleIcon ("yast-inst-mode"); -// TODO help -Progress::Simple (_("Deploying Installation Images"), _("Deploying Installation Images"), size (images), "help"); +ImageInstallation::StoreAllChanges(); -// finish target if it was initialized -if (! Installation::image_only) -{ -// TODO save the status of all packages - Pkg::TargetFinish (); -} +Pkg::TargetFinish (); -/* -// FIXME the images usually do not fit in RAMDISK +// TODO: help (if needed) +Progress::Simple (_("Deploying Installation Images"), _("Deploying Installation Images"), size (images), "help"); + +// Images usually do not fit into RAMDISK // move download area to hard disk (for HTTP/FTP media) // TODO select according to partitioning -string download_dir = "/img_tmp"; -download_dir = Installation::destdir + download_dir; +/* +string download_dir = Installation::destdir + "/img_tmp"; SCR::Execute (.target.bash, sformat ("test -d %1 || mkdir -p %1", download_dir)); Pkg::SourceMoveDownloadArea (download_dir); -// don't know why it didn't work :-( */ ImageInstallation::DeployImages (images, Installation::destdir, SetProgress); -//SCR::Execute (.target.bash, sformat ("rmdir %1", download_dir)); +/* +SCR::Execute (.target.bash, sformat ("rmdir '%1'", download_dir)); +*/ y2milestone ("Target image for package selector prepared"); +Progress::Finish(); + +Pkg::TargetInitialize (Installation::destdir); +Pkg::TargetLoad (); + +ImageInstallation::RestoreAllChanges(); + return `next; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.26/src/clients/inst_finish.ycp new/yast2-installation-2.16.27/src/clients/inst_finish.ycp --- old/yast2-installation-2.16.26/src/clients/inst_finish.ycp 2008-03-19 14:24:59.000000000 +0100 +++ new/yast2-installation-2.16.27/src/clients/inst_finish.ycp 2008-03-28 13:37:21.000000000 +0100 @@ -6,7 +6,7 @@ * Arvin Schnell <arvin(a)suse.de> * Jiri Srain <jsrain(a)suse.de> * - * $Id: inst_finish.ycp 45605 2008-03-19 13:24:59Z locilka $ + * $Id: inst_finish.ycp 45831 2008-03-28 12:37:20Z locilka $ * * Writes: * [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot @@ -65,6 +65,8 @@ "pkg", "driver_update1", "yast_inf", + // bnc #340733 + "system_settings", ], ], $[ @@ -98,8 +100,6 @@ // copy logs just before 'umount' // keeps maximum logs available after reboot "copy_logs", - // runs a separate process in SCR (chrooted) - "automatic_configuration", "umount", ], ], diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.26/src/clients/inst_prepare_image.ycp new/yast2-installation-2.16.27/src/clients/inst_prepare_image.ycp --- old/yast2-installation-2.16.26/src/clients/inst_prepare_image.ycp 2008-02-18 09:35:49.000000000 +0100 +++ new/yast2-installation-2.16.27/src/clients/inst_prepare_image.ycp 2008-03-27 15:41:10.000000000 +0100 @@ -1,7 +1,7 @@ /** * File: clients/inst_prepare_images.ycp * Package: Installation - * Summary: Installation done from image + * Summary: Installation done (also) from image * Authors: Jiri Srain <jsrain(a)suse.cz> * */ @@ -20,35 +20,36 @@ y2milestone ("Preparing image for package selector"); -// TODO help +// FIXME: help (but is it needed?) Wizard::SetContents (_("Analyzing Installation Images"), `Empty (), "", false, false); Wizard::SetTitleIcon ("yast-inst-mode"); // set repo to get images from ImageInstallation::SetRepo (Packages::theSources[0]:0); -// list images for currently selected patterns -// TODO: Pass selected pattern(s) -ImageInstallation::FindImageSet ([]); - -// also set an RPM database -if (! Installation::image_only) -{ - string sw_db_root = (string)SCR::Read (.target.tmpdir) + "/sw_db_root"; - ImageInstallation::DeployImageTemporarily (ImageInstallation::SwMgmtImage (), sw_db_root); +list <map <string, any> > all_patterns = Pkg::ResolvableProperties ("", `pattern, ""); - // TODO: redefine pkg callbacks for RPM database reading, which is the most time-consuming part - Pkg::TargetInitialize (sw_db_root); - Pkg::TargetLoad (); +list <string> patterns_to_install = maplist (map <string, any> one_patern, all_patterns, { + if (one_patern["status"]:`unknown == `selected || one_patern["status"]:`unknown == `installed) { + return one_patern["name"]:""; + } else { + return ""; + } +}); + +patterns_to_install = filter (string one_pattern, patterns_to_install, { + return (one_pattern != "" && one_pattern != nil); +}); - ImageInstallation::CleanTemporaryImage (ImageInstallation::SwMgmtImage (), sw_db_root); +// list images for currently selected patterns +y2milestone ("Currently selected patterns: %1", patterns_to_install); - y2milestone ("Target image for package selector prepared"); -} -else -{ - y2milestone ("Skipping preparing image for package selector"); +// avoid useles calls +if (size (patterns_to_install) > 0) { + ImageInstallation::FindImageSet (patterns_to_install); } -return `next; +y2milestone ("Images for installation ready"); + +return `auto; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.26/src/clients/inst_software_selection.ycp new/yast2-installation-2.16.27/src/clients/inst_software_selection.ycp --- old/yast2-installation-2.16.26/src/clients/inst_software_selection.ycp 2008-01-29 20:03:35.000000000 +0100 +++ new/yast2-installation-2.16.27/src/clients/inst_software_selection.ycp 2008-03-27 16:34:20.000000000 +0100 @@ -115,7 +115,8 @@ term contents = `HBox ( `HStretch(), `HSquash ( - `MinWidth (38, `VBox ( + `VBox ( + `HSpacing (50), `VWeight (5, `VStretch()), // TRANSLATORS: Label (of a Radio button group) `Left (`Label (`opt(`boldFont), _("Select a System Type"))), @@ -128,13 +129,13 @@ `VSpacing (1), `VSquash (`Frame ( _("Description"), - `MinHeight (5, `RichText ( + `MinHeight (7, `RichText ( `id ("desktop_description"), "" )) )), `VWeight (5, `VStretch()) - )) + ) ), `HStretch() ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.26/src/clients/inst_upgrade_urls.ycp new/yast2-installation-2.16.27/src/clients/inst_upgrade_urls.ycp --- old/yast2-installation-2.16.26/src/clients/inst_upgrade_urls.ycp 2008-03-03 17:01:00.000000000 +0100 +++ new/yast2-installation-2.16.27/src/clients/inst_upgrade_urls.ycp 2008-03-19 17:26:58.000000000 +0100 @@ -57,7 +57,7 @@ return; } - map xmlcontent = (map) SCR::Read (.anyxml, one_source_file); + map xmlcontent = (map) SCR::Read (.barexml, one_source_file); counter = counter + 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.26/src/include/inst_inc_first.ycp new/yast2-installation-2.16.27/src/include/inst_inc_first.ycp --- old/yast2-installation-2.16.26/src/include/inst_inc_first.ycp 2008-03-19 13:52:51.000000000 +0100 +++ new/yast2-installation-2.16.27/src/include/inst_inc_first.ycp 2008-03-28 10:02:19.000000000 +0100 @@ -41,7 +41,10 @@ } ProductControl::DisableModule ("add-on"); - ProductControl::DisableModule ("productsources"); + ProductControl::DisableModule ("productsources"); + + // Enabled only when AC is selected + ProductControl::DisableModule ("automatic_configuration"); // First-stage users module will enable them again only if needed ProductControl::DisableModule ("root"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.26/src/include/misc.ycp new/yast2-installation-2.16.27/src/include/misc.ycp --- old/yast2-installation-2.16.26/src/include/misc.ycp 2008-03-14 15:09:22.000000000 +0100 +++ new/yast2-installation-2.16.27/src/include/misc.ycp 2008-03-28 13:37:21.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: misc.ycp 45467 2008-03-14 14:09:21Z locilka $ + * $Id: misc.ycp 45831 2008-03-28 12:37:20Z locilka $ * */ @@ -211,8 +211,10 @@ void AdjustStepsAccordingToInstallationSettings () { if (ProductControl::GetUseAutomaticConfiguration()) { ProductControl::DisableAllModulesAndProposals ("installation", "continue"); + ProductControl::EnableModule ("automatic_configuration"); } else { ProductControl::UnDisableAllModulesAndProposals ("installation", "continue"); + ProductControl::DisableModule ("automatic_configuration"); } if (Installation::add_on_selected == true) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.26/src/modules/ImageInstallation.ycp new/yast2-installation-2.16.27/src/modules/ImageInstallation.ycp --- old/yast2-installation-2.16.26/src/modules/ImageInstallation.ycp 2008-02-18 09:35:49.000000000 +0100 +++ new/yast2-installation-2.16.27/src/modules/ImageInstallation.ycp 2008-03-28 14:22:11.000000000 +0100 @@ -20,6 +20,7 @@ import "XML"; import "Progress"; import "Report"; +import "String"; textdomain "installation"; @@ -78,15 +79,33 @@ } /** + * Returns list of currently selected images. + * + * @return map <string,map <string,any> > images + * @see AddImage + * + * @struct $[ + * "image_id":$[ + * "file":filename, + * "type":type + * ], ... + * ] + */ +map <string,map <string,any> > GetCurrentImages () { + return _images; +} + +/** * Add information about new image - * @param id string the id of the image + * @param name string the name/id of the image * @param file string the file name of the image * @param type string the type of the image, one of "tar" and "fs" */ -void AddImage (string id, string file, string type) { - _images[id] = $[ +void AddImage (string name, string file, string type) { + _images[file] = $[ "file" : file, "type" : type, + "name" : name, ]; } @@ -113,9 +132,21 @@ y2milestone ("Executing %1 returned %2", cmd, out); y2milestone ("Untarring the image"); - cmd = sformat ("tar -xf %1 -C %2", image, target); + + // TODO: Progress `tar --checkpoint` + + // lzma + if (regexpmatch (image, "\.lzma$")) { + cmd = sformat ("lzmadec < '%1' | tar --totals -C '%2' -xf -", String::Quote (image), String::Quote (target)); + // bzip2, gzip + } else { + cmd = sformat ("tar --totals -xf '%1' -C -xf '%2'", String::Quote (image), String::Quote (target)); + } + y2milestone ("Calling: %1", cmd); + out = (map)SCR::Execute (.target.bash_output, cmd); - y2milestone ("Executing %1 returned %2", cmd, out); + y2milestone ("Returned %1", out); + return out["exit"]:-1 == 0; } @@ -158,7 +189,7 @@ y2milestone ("Executing %1 returned %2", cmd, out); y2milestone ("Unmounting image from temporary directory"); - cmd = sformat ("umount %1", tmpdir); + cmd = sformat ("umount -d -f -l %1", tmpdir); out = (map)SCR::Execute (.target.bash_output, cmd); y2milestone ("Executing %1 returned %2", cmd, out); return out["exit"]:-1 == 0; @@ -206,16 +237,18 @@ { y2error ("Image %1 does not exist", id); } + string type = img["type"]:""; + if (type == "fs") return temporary ? MountFsImage (id, target) : DeployFsImage (id, target); else if (type == "tar") return DeployTarImage (id, target); + y2error ("Unknown type of image: %1", type); return false; - } /** @@ -225,7 +258,7 @@ * @return boolean true on success */ global boolean DeployImage (string id, string target) { - y2milestone ("Delploying image %1 to %2", id, target); + y2milestone ("Deploying image %1 to %2", id, target); return _DeployImage (id, target, false); } @@ -267,6 +300,7 @@ */ global boolean DeployImages (list<string> images, string target, void(integer,integer) progress) { integer num = -1; + foreach (string img, images, { num = num + 1; progress (num, 0); @@ -274,8 +308,6 @@ }); progress (num, 100); - Pkg::TargetInitialize (target); - Pkg::TargetLoad (); return true; // TODO error checking } @@ -299,6 +331,7 @@ y2milestone ("Image list for installation not found"); return true; } + map<string,any> image_descr = XML::XMLToYCPFile (filename); if (image_descr == nil) { @@ -307,16 +340,21 @@ Report::Error (_("Failed to read information about installation images")); return false; } + list<map<string,any> > image_sets = image_descr["image_sets"]:[]; y2milestone ("Image set descriptions: %1", image_sets); map<string,any> result = $[]; + foreach (map<string,any> image, image_sets, { string pattern = image["pattern"]:""; - if (pattern == "" && result == $[]) + + if (pattern == "" && result == $[]) { result = image; - else if (contains (patterns, pattern)) + } else if (contains (patterns, pattern)) { result = image; + } }); + if (result == $[]) { Installation::image_installation = false; @@ -324,20 +362,33 @@ y2milestone ("No image for installation found"); return true; } + Installation::image_installation = true; - if (haskey (result, "pkg_image")) + + if (haskey (result, "pkg_image")) { _metadata_image = result["pkg_image"]:""; - else + } else { Installation::image_only= true; + } + foreach (map<string,string> img, result["images"]:[], { - _image_order = add (_image_order, img["name"]:""); + // image must have unique <name>...</name> defined + if (img["file"]:"" == "") { + y2error ("No file defined for %1", img); + return; + } + + _image_order = add (_image_order, img["file"]:""); AddImage (img["name"]:"", img["file"]:"", img["type"]:""); }); + y2milestone ("Image-only installation: %1", Installation::image_only); y2milestone ("Images: %1", _images); y2milestone ("Image installation order: %1", _image_order); + if (! Installation::image_only) y2milestone ("Image with software management metadata: %1", _metadata_image); + return true; } @@ -428,5 +479,172 @@ return out["exit"]:-1 == 0; } + // --> Storing and restoring states -} + /** + * List of all handled types. + */ + // list <symbol> all_supported_types = [`product, `pattern, `selection, `language, `package, `patch]; + // Zypp currently counts [ `product, `pattern, `selection, `language ] + list <symbol> all_supported_types = [`package, `patch]; + + /** + * Map that stores all the requested states of all handled/supported types. + */ + map <symbol, map <string, list <map> > > objects_state = $[]; + + /** + * Function stores all new/requested states of all handled/supported types. + * + * @see all_supported_types + * @see objects_state + */ + global void StoreAllChanges () { + Progress::Simple ( + _("Installation Magic"), + _("Storing magic values..."), + 4 * size (all_supported_types), + _("MOOOooo...") + ); + + // Query for changed state of all knwon types + // 'changed' means that they were 'installed' and 'not locked' before + foreach (symbol one_type, all_supported_types, { + // list of $[ "name":string, "version":string, "arch":string, "source":integer, "status":symbol, "locked":boolean ] + // status is `installed, `removed, `selected or `available, source is source ID or -1 if the resolvable is installed in the target + // if status is `available and locked is true then the object is set to taboo + // if status is `installed and locked is true then the object locked + list <map <string, any> > resolvable_properties = Pkg::ResolvableProperties ("", one_type, ""); + + objects_state[one_type] = $[]; + + list <map <string, any> > remove_resolvables = filter (map <string, any> one_object, resolvable_properties, { + return (one_object["status"]:`unknown == `removed); + }); + objects_state[one_type, "remove"] = remove_resolvables; + Progress::NextStep(); + + list <map <string, any> > install_resolvables = filter (map <string, any> one_object, resolvable_properties, { + return (one_object["status"]:`unknown == `selected); + }); + objects_state[one_type, "install"] = install_resolvables; + Progress::NextStep(); + + list <map <string, any> > taboo_resolvables = filter (map <string, any> one_object, resolvable_properties, { + return (one_object["status"]:`unknown == `available && one_object["locked"]:false == true); + }); + objects_state[one_type, "taboo"] = taboo_resolvables; + Progress::NextStep(); + + list <map <string, any> > lock_resolvables = filter (map <string, any> one_object, resolvable_properties, { + return (one_object["status"]:`unknown == `installed && one_object["locked"]:false == true); + }); + objects_state[one_type, "lock"] = lock_resolvables; + Progress::NextStep(); + }); + + Progress::Finish(); + } + + /** + * @return boolean whether the package should be additionally installed + */ + boolean ProceedWithSelected (map <string, any> & one_object, symbol & one_type) { + // This package has been selected to be installed + + string arch = one_object["arch"]:""; + // Query for all packages of the same version + list <map <string, any> > resolvable_properties = Pkg::ResolvableProperties ( + one_object["name"]:"-x-", one_type, one_object["version"]:"-x-" + ); + + // Leave only already installed (and matching the same architecture) + resolvable_properties = filter (map <string, any> one_resolvable, resolvable_properties, { + return (one_resolvable["status"]:`unknown == `installed && one_resolvable["arch"]:"" == arch); + }); + + boolean ret = nil; + + // There are some installed + if (size (resolvable_properties) > 0) { + y2milestone ("Resolvable type: %1, name: %2 already installed", one_type, one_object["name"]:"-x-"); + // Let's keep the installed version + Pkg::ResolvableNeutral (one_object["name"]:"-x-", one_type, true); + // is already installed + ret = false; + // They are not installed + } else { + y2milestone ("Installing type: %1, details: %2,%3,%4", + one_type, one_object["name"]:"", one_object["arch"]:"", one_object["version"]:""); + // Confirm we want to install them (they might have been added as dependencies) + Pkg::ResolvableInstallArchVersion (one_object["name"]:"", one_type, one_object["arch"]:"", one_object["version"]:""); + // should be installed + ret = true; + } + + return ret; + } + + global void RestoreAllChanges () { + Progress::Simple ( + _("Installation Magic"), + _("Restoring magic values..."), + 4 * size (all_supported_types), + _("MOOOooo...") + ); + + foreach (symbol one_type, all_supported_types, { + list <map <string, any> > resolvable_properties = Pkg::ResolvableProperties ("", one_type, ""); + + // All packages selected for installation + // both `to-install and `to-upgrade (already) installed + list <map <string, any> > to_install = filter (map <string, any> one_resolvable, resolvable_properties, { + return (one_resolvable["status"]:`unknown == `selected); + }); + + Progress::NextStep(); + + // All packages selected to be installed + // [ $[ "arch" : ... , "name" : ... , "version" : ... ], ... ] + list <map <string, string> > selected_for_installation = maplist (map one_resolvable, objects_state[one_type, "install"]:[], { + return $[ "arch":one_resolvable["arch"]:"", "name":one_resolvable["name"]:"", "version":one_resolvable["version"]:"" ]; + }); + + Progress::NextStep(); + + // Delete all packages that are installed but should not be + map <string, string> one_already_installed_resolvable = $[]; + foreach (map <string, any> one_resolvable, resolvable_properties, { + // We are interested in the already installed resolvables only + if (one_resolvable["status"]:`unknown != `installed && one_resolvable["status"]:`unknown != `selected) { + return; + } + + one_already_installed_resolvable = $[ + "arch":one_resolvable["arch"]:"", "name":one_resolvable["name"]:"", "version":one_resolvable["version"]:"" + ]; + + // Already installed resolvable but not in list of resolvables to be installed + if (! contains (selected_for_installation, one_already_installed_resolvable)) { + y2milestone ("Removing type: %1, name: %2 version: %3", + one_type, one_resolvable["name"]:"-x-", one_resolvable["version"]:"-x-"); + Pkg::ResolvableRemove (one_resolvable["name"]:"-x-", one_type); + } + }); + + Progress::NextStep(); + + // Install all packages that aren't yet + foreach (map <string, any> one_to_install, to_install, { + ProceedWithSelected (one_to_install, one_type); + }); + + Progress::NextStep(); + }); + + Progress::Finish(); + } + + // <-- Storing and restoring states + +} \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.26/VERSION new/yast2-installation-2.16.27/VERSION --- old/yast2-installation-2.16.26/VERSION 2008-03-19 15:02:56.000000000 +0100 +++ new/yast2-installation-2.16.27/VERSION 2008-03-28 14:30:31.000000000 +0100 @@ -1 +1 @@ -2.16.26 +2.16.27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 SuSEfirewall2
by root＠Hilbert.suse.de 28 Mar '08

28 Mar '08

Hello community, here is the log from the commit of package SuSEfirewall2 checked in at Fri Mar 28 17:15:44 CET 2008. -------- --- SuSEfirewall2/SuSEfirewall2.changes 2007-11-28 12:13:52.000000000 +0100 +++ /mounts/work_src_done/NOARCH/SuSEfirewall2/SuSEfirewall2.changes 2008-03-28 14:42:32.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Mar 28 14:39:59 CET 2008 - lnussel(a)suse.de + +- fix typo in comment (bnc#350651) +- don't check for /proc/net/stat/nf_conntrack when checking for ipv6 support +- allow to ignore certain broadcasts even if broadcasts in general + are allowed which is the expected behavior +- change handling of RELATED packages and make that configurable + (fate#300970) + +------------------------------------------------------------------- Old: ---- SuSEfirewall2-3.6_SVNr184.tar.bz2 New: ---- SuSEfirewall2-3.6_SVNr189.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SuSEfirewall2.spec ++++++ --- /var/tmp/diff_new_pack.xD5158/_old 2008-03-28 17:15:00.000000000 +0100 +++ /var/tmp/diff_new_pack.xD5158/_new 2008-03-28 17:15:00.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package SuSEfirewall2 (Version 3.6_SVNr184) +# spec file for package SuSEfirewall2 (Version 3.6_SVNr189) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 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. # @@ -11,8 +11,9 @@ # norootforbuild # icecream 0 + Name: SuSEfirewall2 -Version: 3.6_SVNr184 +Version: 3.6_SVNr189 Release: 1 License: GPL v2 or later Group: Productivity/Networking/Security @@ -46,7 +47,8 @@ Authors: -------- - Marc Heuse <marc(a)suse.de> + Ludwig Nussel <ludwig.nussel(a)suse.de> + Marc Heuse %prep %setup ++++++ SuSEfirewall2-3.6_SVNr184.tar.bz2 -> SuSEfirewall2-3.6_SVNr189.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/SuSEfirewall2-3.6_SVNr184/SuSEfirewall2 new/SuSEfirewall2-3.6_SVNr189/SuSEfirewall2 --- old/SuSEfirewall2-3.6_SVNr184/SuSEfirewall2 2007-08-07 14:53:37.000000000 +0200 +++ new/SuSEfirewall2-3.6_SVNr189/SuSEfirewall2 2008-03-28 14:39:20.000000000 +0100 @@ -3,7 +3,7 @@ # SuSEfirewall2 - stateful packetfilter rules generator # Copyright (C) 2000-2002 Marc Heuse <marc(a)suse.de> # Copyright (C) 2003,2004 SUSE Linux AG -# Copyright (C) 2005 SUSE LINUX Products GmbH +# Copyright (C) 2005-2008 SUSE LINUX Products GmbH # # Author: Marc Heuse # Maintainer: Ludwig Nussel @@ -308,7 +308,7 @@ if [ "$IP6TABLES" != ':' ]; then # Do we have a kernel with IPv6 enabled? $IP6TABLES -nvL >/dev/null 2>&1 || IP6TABLES=: - if ! [ -e /proc/net/stat/nf_conntrack ] || ! $IP6TABLES -m state --help >/dev/null 2>&1 || \ + if ! $IP6TABLES -m state --help >/dev/null 2>&1 || \ ( ! $modinfo ip6t_state >/dev/null 2>&1 && ! $modinfo xt_state >/dev/null 2>&1); then warning "ip6tables does not support state matching. Extended IPv6 support disabled." IP6TABLES_HAVE_STATE=0 @@ -550,13 +550,13 @@ } -function allow_basic_related() +function allow_basic_established() { # needed for dhcp and dns replies local iptables for iptables in "$IPTABLES" "$IP6TABLES"; do - $LAA $iptables -A INPUT ${LOG}"-IN-ACC-RELATED " -m state --state ESTABLISHED,RELATED - $iptables -A INPUT -j "$ACCEPT" -m state --state ESTABLISHED,RELATED + $LAA $iptables -A INPUT ${LOG}"-IN-ACC-EST " -m state --state ESTABLISHED + $iptables -A INPUT -j "$ACCEPT" -m state --state ESTABLISHED # if two hosts have a tcp connection on fixed ports and # one of the hosts crashes it will send a SYN to the @@ -674,7 +674,7 @@ IP6TABLES=":" # disable further rules fi - allow_basic_related + allow_basic_established # make sure basic rules get committed even if there are errors later [ -n "$USE_IPTABLES_BATCH" ] && iptables_batch_commitpoint @@ -1085,12 +1085,10 @@ eval allow="\$FW_ALLOW_FW_BROADCAST_`cibiz $zone`" eval ignore="\$FW_IGNORE_FW_BROADCAST_`cibiz $zone`" - [ "$allow" = yes ] && continue - local match="-A input_$zone -m pkttype --pkt-type broadcast" for port in $allow; do - [ $port = no ] && continue + [ $port = no -o $port = yes ] && continue $LAA $IPTABLES $match -p udp --dport $port ${LOG}"-ACC-BCAST${zone:0:1} " $IPTABLES $match -p udp --dport $port -j "$ACCEPT" done @@ -1101,10 +1099,14 @@ $IPTABLES $match -p udp --dport $port -j DROP done - $LDA $IPTABLES $match ${LOG}"-DROP-BCAST${zone:0:1} " + if [ "$allow" != 'yes' ]; then + $LDA $IPTABLES $match ${LOG}"-DROP-BCAST${zone:0:1} " + fi fi - $IPTABLES $match -j DROP # no need to send icmp for broadcasts + if [ "$allow" != 'yes' ]; then + $IPTABLES $match -j DROP # no need to send icmp for broadcasts + fi done } @@ -1284,6 +1286,47 @@ fi } +allow_related() +{ + local var + local services target service proto net + local iptables zone chain + + for zone in $input_zones; do + chain=input_$zone + var="FW_SERVICES_ACCEPT_RELATED_`cibiz $zone`" + eval services="\"\$$var\"" + + for service in $services; do + IFS=, eval set -- \$service + if [ "$#" -lt 3 ]; then + error "too few parameters in $var -> $service" + continue + fi + + net="${1:-0/0}" + proto="$2" + port="$3" + sport="$4" + shift 4 + [ "$#" -gt 0 ] && shift + + iptables="$IPTABLES $IP6TABLES" + case "$net" in + *:*) iptables="$IP6TABLES" ;; + [0-9]*.*.*.*) iptables="$IPTABLES" ;; + esac + + if check_proto_port "$proto" "$port" "$sport" "$var"; then + for iptables in $iptables; do + $LAA $iptables -A $chain -s $net $proto $rport $rsport -m state --state RELATED ${LOG}"-`rulelog $chain`-REL " + $iptables -A $chain -s $net $proto $rport $rsport -j ACCEPT -m state --state RELATED + done + fi + done + done +} + # ICMP stuff allow_icmp() { @@ -2140,6 +2183,8 @@ process_trusted_nets +allow_related + allow_ip_services allow_tcp_services diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/SuSEfirewall2-3.6_SVNr184/SuSEfirewall2.sysconfig new/SuSEfirewall2-3.6_SVNr189/SuSEfirewall2.sysconfig --- old/SuSEfirewall2-3.6_SVNr184/SuSEfirewall2.sysconfig 2007-11-28 12:10:50.000000000 +0100 +++ new/SuSEfirewall2-3.6_SVNr189/SuSEfirewall2.sysconfig 2008-03-28 14:39:20.000000000 +0100 @@ -296,10 +296,10 @@ ## Type: string # -# Which UDP services _on the firewall_ should be accessible from +# Which IP services _on the firewall_ should be accessible from # untrusted networks? # -# Usually for VPN/Routing which END at the firewall +# Usually for VPN/Routing that END at the firewall # # Example: "esp" # @@ -437,6 +437,30 @@ # FW_SERVICES_ACCEPT_EXT="" +## Type: string +## Default: +# +# Services to allow that are considered RELATED by the connection tracking +# engine. +# +# Format: space separated list of net,protocol[,sport[,dport]] +# Example: +# Allow samba broadcast replies marked as related by +# nf_conntrack_netbios_ns from a certain network: +# "192.168.1.0/24,udp,137" +# +FW_SERVICES_ACCEPT_RELATED_EXT="" + +## Type: string +# +# see FW_SERVICES_ACCEPT_RELATED_EXT +FW_SERVICES_ACCEPT_RELATED_DMZ="" + +## Type: string +# +# see FW_SERVICES_ACCEPT_RELATED_EXT +FW_SERVICES_ACCEPT_RELATED_INT="" + ## Type: string # # 10.) @@ -490,6 +514,11 @@ # report your use case at # http://forge.novell.com/modules/xfmod/project/?susefirewall2 # +# If you use this variable to enable browsing samba/windows shares +# you most likely have misconfigured your firewall. You should +# either put the utilized interface into the internal zone or use +# e.g. FW_SERVICES_ACCEPT_RELATED_EXT +# FW_ALLOW_INCOMING_HIGHPORTS_UDP="" ## Type: string ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yast2-firewall
by root＠Hilbert.suse.de 28 Mar '08

28 Mar '08

Hello community, here is the log from the commit of package yast2-firewall checked in at Fri Mar 28 17:15:36 CET 2008. -------- --- yast2-firewall/yast2-firewall.changes 2007-09-17 17:53:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-firewall/yast2-firewall.changes 2008-03-28 12:42:50.957698000 +0100 @@ -1,0 +2,23 @@ +Fri Mar 28 12:22:32 CET 2008 - ug(a)suse.de + +- rnc file fixed +- 2.16.0 + +------------------------------------------------------------------- +Mon Mar 17 12:43:32 CET 2008 - jsrain(a)suse.cz + +- added 'StartupNotify=true' to the desktop file (bnc #304964) + +------------------------------------------------------------------- +Mon Jan 21 15:20:33 CET 2008 - locilka(a)suse.cz + +- UI adjusted to be possible to proceed with more services defined + by package with the same name / translation. +- Requires yast2 >= 2.16.22 + +------------------------------------------------------------------- +Tue Dec 4 15:30:30 CET 2007 - locilka(a)suse.cz + +- Merged proofread texts. + +------------------------------------------------------------------- Old: ---- yast2-firewall-2.15.8.tar.bz2 New: ---- yast2-firewall-2.16.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firewall.spec ++++++ --- /var/tmp/diff_new_pack.tH5572/_old 2008-03-28 17:15:06.000000000 +0100 +++ /var/tmp/diff_new_pack.tH5572/_new 2008-03-28 17:15:06.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-firewall (Version 2.15.8) +# spec file for package yast2-firewall (Version 2.16.0) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 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. # @@ -10,18 +10,18 @@ # norootforbuild + Name: yast2-firewall -Version: 2.15.8 +Version: 2.16.0 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-firewall-2.15.8.tar.bz2 +Source0: yast2-firewall-2.16.0.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite -# SuSEFirewallExpertRules::DeleteRuleID() -# SuSEFirewall::SuSEFirewallIsInstalled() -Requires: yast2 >= 2.15.15 +# SuSEFirewallServices::GetFilenameFromServiceDefinedByPackage() +Requires: yast2 >= 2.16.22 Provides: yast2-config-firewall Obsoletes: yast2-config-firewall Provides: yast2-trans-firewall @@ -41,7 +41,7 @@ Lukas Ocilka <locilka(a)suse.de> %prep -%setup -n yast2-firewall-2.15.8 +%setup -n yast2-firewall-2.16.0 %build %{prefix}/bin/y2tool y2autoconf @@ -73,4 +73,3 @@ %{prefix}/share/applications/YaST2/firewall.desktop /usr/share/YaST2/schema/autoyast/rnc/firewall.rnc %doc %{prefix}/share/doc/packages/yast2-firewall - ++++++ yast2-firewall-2.15.8.tar.bz2 -> yast2-firewall-2.16.0.tar.bz2 ++++++ ++++ 3403 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.15.8/config/firewall.rnc new/yast2-firewall-2.16.0/config/firewall.rnc --- old/yast2-firewall-2.15.8/config/firewall.rnc 2007-09-17 17:41:46.000000000 +0200 +++ new/yast2-firewall-2.16.0/config/firewall.rnc 2008-03-28 12:21:33.000000000 +0100 @@ -48,6 +48,7 @@ | FW_CONFIGURATIONS_EXT | FW_CONFIGURATIONS_INT | FW_LOAD_MODULES + | FW_ALLOW_PING_FW firewall = element firewall { y2_firewall* } FW_CONFIGURATIONS_DMZ = element FW_CONFIGURATIONS_DMZ { text } @@ -96,3 +97,4 @@ FW_SERVICES_INT_RPC = element FW_SERVICES_INT_RPC { text } FW_SERVICES_INT_TCP = element FW_SERVICES_INT_TCP { text } FW_SERVICES_INT_UDP = element FW_SERVICES_INT_UDP { text } +FW_ALLOW_PING_FW = element FW_ALLOW_PING_FW { text } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.15.8/configure.in new/yast2-firewall-2.16.0/configure.in --- old/yast2-firewall-2.15.8/configure.in 2007-09-17 17:42:21.000000000 +0200 +++ new/yast2-firewall-2.16.0/configure.in 2008-03-28 12:42:35.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-firewall dnl -dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-firewall, 2.15.8, http://bugs.opensuse.org/, yast2-firewall) +AC_INIT(yast2-firewall, 2.16.0, http://bugs.opensuse.org/, yast2-firewall) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.15.8" +VERSION="2.16.0" RPMNAME="yast2-firewall" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.15.8/Makefile.am new/yast2-firewall-2.16.0/Makefile.am --- old/yast2-firewall-2.15.8/Makefile.am 2007-09-17 17:42:22.000000000 +0200 +++ new/yast2-firewall-2.16.0/Makefile.am 2008-03-28 12:42:35.000000000 +0100 @@ -30,7 +30,7 @@ extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -AUTOMAKE_OPTIONS = foreign dist-bzip2 +AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal @@ -210,8 +210,7 @@ # For po/ modules checkpo: - test ! -d $(srcdir)/po || $(MAKE) -C po checkpo -# test ! -d $(srcdir)/po \ -# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; } + test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo +# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox # No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am SUBDIRS = config doc src testsuite diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.15.8/missing new/yast2-firewall-2.16.0/missing --- old/yast2-firewall-2.15.8/missing 2007-09-17 17:42:28.000000000 +0200 +++ new/yast2-firewall-2.16.0/missing 2008-03-28 12:42:39.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -33,6 +33,8 @@ fi run=: +sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p' +sed_minuso='s/.* -o $[^ ]*$.*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* $[^ ]*$ *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.15.8/src/dialogs.ycp new/yast2-firewall-2.16.0/src/dialogs.ycp --- old/yast2-firewall-2.15.8/src/dialogs.ycp 2007-05-21 12:31:55.000000000 +0200 +++ new/yast2-firewall-2.16.0/src/dialogs.ycp 2008-03-28 12:22:05.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Configuration dialogs and workflow * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: dialogs.ycp 37865 2007-05-09 09:03:28Z locilka $ + * $Id: dialogs.ycp 44175 2008-02-05 17:00:52Z aschnell $ * * Configuration dialogs and workflow. * Both Expert and Simple. @@ -34,11 +34,11 @@ // or // disabled + stop (after Write()) "set_service_auto_start" : SetEnableFirewall, - + // TRANSLATORS: Radio selection - "start_auto_button" : _("&Enable firewall automatic starting"), + "start_auto_button" : _("&Enable Firewall Automatic Starting"), // TRANSLATORS: Radio selection - "start_manual_button" : _("&Disable firewall automatic starting"), + "start_manual_button" : _("&Disable Firewall Automatic Starting"), "help" : sformat(CWMServiceStart::AutoStartHelpTemplate (), // TRANSLATORS: part of help text - radio button label, NO SHORTCUT!!! _("Enable firewall"), @@ -70,7 +70,7 @@ _("Save Settings and Restart Firewall Now") ) ]), - // hack function for disabling BackButon + // hack function for disabling BackButton "DisableBackButton" : $[ "widget" : `custom, "custom_widget" : `Empty(), @@ -297,7 +297,7 @@ ret = `abort; break; } - + if (ret == "show_details") { SuSEFirewallUI::SetShowSummaryDetails ( (boolean) UI::QueryWidget (`id ("show_details"), `Value) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.15.8/src/firewall.desktop new/yast2-firewall-2.16.0/src/firewall.desktop --- old/yast2-firewall-2.15.8/src/firewall.desktop 2007-09-07 16:11:56.000000000 +0200 +++ new/yast2-firewall-2.16.0/src/firewall.desktop 2008-03-28 12:22:05.000000000 +0100 @@ -24,3 +24,4 @@ Name=Firewall GenericName=Configure a firewall X-KDE-SubstituteUID=true +StartupNotify=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.15.8/src/firewall_proposal.ycp new/yast2-firewall-2.16.0/src/firewall_proposal.ycp --- old/yast2-firewall-2.15.8/src/firewall_proposal.ycp 2007-05-21 12:31:55.000000000 +0200 +++ new/yast2-firewall-2.16.0/src/firewall_proposal.ycp 2008-01-29 13:37:54.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Firewall configuration proposal * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: firewall_proposal.ycp 38039 2007-05-18 11:33:13Z locilka $ + * $Id: firewall_proposal.ycp 42664 2007-12-04 14:31:51Z locilka $ */ { @@ -103,7 +103,7 @@ if (! SuSEFirewall::SuSEFirewallIsInstalled()) { // TRANSLATORS: message popup Report::Message (_("Firewall configuration cannot be changed. -SuSEfirewall2 package is not installed.")); +The SuSEfirewall2 package is not installed.")); ret = $[ "workflow_sequence" : `next ]; // Enable firewall diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.15.8/src/summary.ycp new/yast2-firewall-2.16.0/src/summary.ycp --- old/yast2-firewall-2.15.8/src/summary.ycp 2007-05-21 12:31:55.000000000 +0200 +++ new/yast2-firewall-2.16.0/src/summary.ycp 2008-01-29 13:37:54.000000000 +0100 @@ -6,7 +6,7 @@ * Summary: Firewall configuration summary * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: summary.ycp 37297 2007-04-04 08:31:07Z locilka $ + * $Id: summary.ycp 42664 2007-12-04 14:31:51Z locilka $ * * Summary functions. */ @@ -285,11 +285,11 @@ // Is running and will be running again if (SuSEFirewall::IsStarted()) { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall will be running after the configuration gets written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall starts after the configuration gets written") + li_end + "\n"; // Is stopped and will be running } else { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall will be started after the configuration gets written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall starts after the configuration gets written") + li_end + "\n"; } } else { // Is running and will be stopped @@ -299,7 +299,7 @@ // Is not running and will not be running } else { // TRANSLATORS: Summary text item - ret_message = ret_message + li_start + _("Firewall will not be running after the configuration gets written") + li_end + "\n"; + ret_message = ret_message + li_start + _("Firewall will not start after the configuration gets written") + li_end + "\n"; } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.15.8/src/uifunctions.ycp new/yast2-firewall-2.16.0/src/uifunctions.ycp --- old/yast2-firewall-2.15.8/src/uifunctions.ycp 2007-05-21 12:31:55.000000000 +0200 +++ new/yast2-firewall-2.16.0/src/uifunctions.ycp 2008-01-29 13:37:54.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Configuration dialogs handling functions * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: uifunctions.ycp 37297 2007-04-04 08:31:07Z locilka $ + * $Id: uifunctions.ycp 43794 2008-01-21 14:21:47Z locilka $ * * Configuration dialogs handling. * Both Expert and Simple. @@ -656,6 +656,21 @@ map <string, string> translations_to_service_ids = $[]; foreach (string service_id, string service_name, SuSEFirewallServices::GetSupportedServices(), { + // a service with the very same name (translation) already defined + if (translations_to_service_ids[service_name]:nil != nil) { + // service:apache2 -> apache2 + if (SuSEFirewallServices::ServiceDefinedByPackage (service_id)) { + service_name = sformat ( + "%1 (%2)", + service_name, SuSEFirewallServices::GetFilenameFromServiceDefinedByPackage (service_id) + ); + } else { + service_name = sformat ( + "%1 (%2)", + service_name, service_id + ); + } + } translations_to_service_ids[service_name] = service_id; }); @@ -1165,10 +1180,10 @@ // disabling firewall if (new_state == false && curr_running == true) { // TRANSLATORS: popup question - if (Popup::YesNo (_("Firewall automatic starting has been just set to be disabled + if (Popup::YesNo (_("Firewall automatic starting has been disabled but firewall is currently running. -Would you like to stop the firewall after the new configuration is written?"))) { +Stop the firewall after the new configuration is written?"))) { y2milestone ("User decided to stop the firewall after it is disabled"); new_running = false; } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-firewall-2.15.8/VERSION new/yast2-firewall-2.16.0/VERSION --- old/yast2-firewall-2.15.8/VERSION 2007-09-17 17:41:00.000000000 +0200 +++ new/yast2-firewall-2.16.0/VERSION 2008-03-28 12:39:18.000000000 +0100 @@ -1 +1 @@ -2.15.8 +2.16.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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