December 2006 - openSUSE Commits - openSUSE Mailing Lists

commit amarok
by root＠suse.de 14 Dec '06

14 Dec '06

Hello community, here is the log from the commit of package amarok checked in at Thu Dec 14 01:50:38 CET 2006. -------- --- KDE/amarok/amarok.changes 2006-12-07 18:23:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/amarok/amarok.changes 2006-12-12 18:38:59.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 12 18:36:54 CET 2006 - ssommer(a)suse.de + +- added yauap engine from amarok svn + +------------------------------------------------------------------- New: ---- amarok-yauap-engine.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ amarok.spec ++++++ --- /var/tmp/diff_new_pack.u70U5L/_old 2006-12-14 01:48:45.000000000 +0100 +++ /var/tmp/diff_new_pack.u70U5L/_new 2006-12-14 01:48:45.000000000 +0100 @@ -29,7 +29,7 @@ Group: Productivity/Multimedia/Sound/Players Summary: Media Player for KDE Version: 1.4.4 -Release: 28 +Release: 31 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define mversion 0.5 Source0: %name-%version.tar.bz2 @@ -43,6 +43,7 @@ Patch6: lyrics_lyrc.diff Patch7: amarok-collectionscanner.diff Patch10: default-engine.diff +Patch11: amarok-yauap-engine.diff %description Amarok is a media player for all kinds of media. This includes MP3, Ogg @@ -127,6 +128,25 @@ Max Howell <max.howell(a)methylblue.com> Stanislav Karchebny <berk(a)inbox.ru> +%package yauap +Group: Productivity/Multimedia/Sound/Players +Summary: Yauap Output Plugin for amaroK +Requires: amarok = %version yauap +Provides: yauap_engine + +%description yauap +amaroK media player can play via external yauap cmdline player using +this plugin. + + + +Authors: +-------- + Christian Muehlhaeuser <chris(a)chris.de> + Mark Kretschmann <markey(a)web.de> + Max Howell <max.howell(a)methylblue.com> + Stanislav Karchebny <berk(a)inbox.ru> + %prep %setup -q -n %name-%version cd amarok @@ -142,6 +162,7 @@ %patch7 %patch10 cp %{S:10} amarok/src/engine/helix/ +%patch11 . /etc/opt/kde3/common_options update_admin --no-unsermake @@ -160,6 +181,7 @@ %endif --with-gstreamer10 \ --with-xine \ + --with-yauap \ --disable-final make %{?jobs:-j%jobs} @@ -262,7 +284,14 @@ /opt/kde3/bin/amarok_libvisual %endif +%files yauap +%defattr(-,root,root) +/opt/kde3/%_lib/kde3/libamarok_yauap-engine_plugin.* +/opt/kde3/share/services/amarok_yauap-engine_plugin.desktop + %changelog -n amarok +* Tue Dec 12 2006 - ssommer(a)suse.de +- added yauap engine from amarok svn * Thu Dec 07 2006 - dmueller(a)suse.de - fix magnatune shop crash (#226039) * Sun Nov 19 2006 - schwab(a)suse.de ++++++ amarok-yauap-engine.diff ++++++ ++++ 876 lines (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 autoconf
by root＠suse.de 14 Dec '06

14 Dec '06

Hello community, here is the log from the commit of package autoconf checked in at Thu Dec 14 01:50:23 CET 2006. -------- --- autoconf/autoconf-el.changes 2006-12-04 11:14:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/autoconf/autoconf-el.changes 2006-12-13 16:24:54.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 13 16:24:33 CET 2006 - schwab(a)suse.de + +- Handle old style libltdl macros. + +------------------------------------------------------------------- autoconf.changes: same change New: ---- autoreconf-ltdl.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoconf-el.spec ++++++ --- /var/tmp/diff_new_pack.7FFThP/_old 2006-12-14 01:48:57.000000000 +0100 +++ /var/tmp/diff_new_pack.7FFThP/_new 2006-12-14 01:48:57.000000000 +0100 @@ -16,7 +16,7 @@ Group: Productivity/Editors/Emacs Autoreqprov: on Version: 2.61 -Release: 1 +Release: 4 Summary: Emacs mode for editing GNU Autoconf scripts URL: http://www.gnu.org/software/autoconf BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -69,6 +69,8 @@ %{site_lisp}/*.elc %changelog -n autoconf-el +* Wed Dec 13 2006 - schwab(a)suse.de +- Handle old style libltdl macros. * Mon Dec 04 2006 - schwab(a)suse.de - Update to autoconf 2.61. ** New macros AC_C_FLEXIBLE_ARRAY_MEMBER, AC_C_VARARRAYS. ++++++ autoconf.spec ++++++ --- /var/tmp/diff_new_pack.7FFThP/_old 2006-12-14 01:48:57.000000000 +0100 +++ /var/tmp/diff_new_pack.7FFThP/_new 2006-12-14 01:48:57.000000000 +0100 @@ -19,9 +19,10 @@ Requires: m4 = %(rpm -q --qf=%%{VERSION} m4) PreReq: %{install_info_prereq} Version: 2.61 -Release: 1 +Release: 3 Summary: A GNU Tool for Automatically Configuring Source Code Source: autoconf-%{version}.tar.bz2 +Patch: autoreconf-ltdl.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -46,6 +47,7 @@ %prep %setup +%patch %build %{suse_update_config -f config} @@ -75,6 +77,8 @@ %doc %{_mandir}/man1/*.gz %changelog -n autoconf +* Wed Dec 13 2006 - schwab(a)suse.de +- Handle old style libltdl macros. * Mon Dec 04 2006 - schwab(a)suse.de - Update to autoconf 2.61. ** New macros AC_C_FLEXIBLE_ARRAY_MEMBER, AC_C_VARARRAYS. ++++++ autoreconf-ltdl.diff ++++++ --- bin/autoreconf.in +++ bin/autoreconf.in @@ -456,6 +456,8 @@ 'AC_CONFIG_AUX_DIR:AC_CONFIG_AUX_DIR:\$1', 'AC_CONFIG_HEADERS', 'AC_CONFIG_SUBDIRS:AC_CONFIG_SUBDIRS:\$1', + 'AC_LIBLTDL_CONVENIENCE:AC_LIBLTDL_CONVENIENCE:\$1', + 'AC_LIBLTDL_INSTALLABLE:AC_LIBLTDL_INSTALLABLE:\$1', 'AC_INIT', 'AC_PROG_LIBTOOL', 'LT_INIT', @@ -471,6 +473,7 @@ $uses_gettext_via_traces = 1 if /AM_GNU_GETTEXT/; $uses_libtool = 1 if /(AC_PROG_LIBTOOL|LT_INIT)/; $uses_libltdl = 1 if /LT_CONFIG_LTDL_DIR/; + $uses_libltdl = 1 if /AC_LIBLTDL_(CONVENIENCE|INSTALLABLE)/; $uses_autoheader = 1 if /AC_CONFIG_HEADERS/; $uses_automake = 1 if /AM_INIT_AUTOMAKE/; push @subdir, split (' ', $1) if /AC_CONFIG_SUBDIRS:(.*)/ && $recursive; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 NX
by root＠suse.de 14 Dec '06

14 Dec '06

Hello community, here is the log from the commit of package NX checked in at Thu Dec 14 01:48:39 CET 2006. -------- --- NX/NX.changes 2006-11-07 00:52:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/NX/NX.changes 2006-12-13 22:15:54.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 13 22:13:02 CET 2006 - sndirsch(a)suse.de + +- finally added ExcludeArch for ia64, ppc64, s390x and x86_64 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NX.spec ++++++ --- /var/tmp/diff_new_pack.TqBiTc/_old 2006-12-14 01:48:22.000000000 +0100 +++ /var/tmp/diff_new_pack.TqBiTc/_new 2006-12-14 01:48:22.000000000 +0100 @@ -20,11 +20,12 @@ BuildRequires: XFree86-devel gcc-c++ libjpeg-devel libpng-devel openssl-devel %endif %endif +ExcludeArch: ia64 ppc64 s390x x86_64 License: GNU Library General Public License v. 2.0 and 2.1 (LGPL), Other License(s), see package URL: http://www.nomachine.com/sources.php Group: System/X11/Servers/XF86_4 Version: 1.5.0 -Release: 67 +Release: 74 Summary: Proxy System for X11 #Compression Libraries and Proxy Sources Source: nxproxy-%{version}-9.tar.gz @@ -249,6 +250,8 @@ /usr/share/NX/keymaps-windows/ %changelog -n NX +* Wed Dec 13 2006 - sndirsch(a)suse.de +- finally added ExcludeArch for ia64, ppc64, s390x and x86_64 * Tue Nov 07 2006 - ro(a)suse.de - fix perms in docfile keymap-names.txt * Wed Oct 18 2006 - sndirsch(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-country
by root＠suse.de 14 Dec '06

14 Dec '06

Hello community, here is the log from the commit of package yast2-country checked in at Thu Dec 14 01:28:33 CET 2006. -------- --- yast2-country/yast2-country.changes 2006-12-11 10:14:36.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-country/yast2-country.changes 2006-12-13 10:45:46.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Dec 13 10:22:02 CET 2006 - jsuchome(a)suse.cz + +- added missing time zone for Belarus (#228042) +- 2.15.3 + +------------------------------------------------------------------- Old: ---- yast2-country-2.15.2.tar.bz2 New: ---- yast2-country-2.15.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.oRVkMW/_old 2006-12-14 01:28:24.000000000 +0100 +++ /var/tmp/diff_new_pack.oRVkMW/_new 2006-12-14 01:28:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-country (Version 2.15.2) +# spec file for package yast2-country (Version 2.15.3) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-country -Version: 2.15.2 +Version: 2.15.3 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-country-2.15.2.tar.bz2 +Source0: yast2-country-2.15.3.tar.bz2 prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite Requires: yast2-trans-stats yast2-perl-bindings @@ -64,7 +64,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-country-2.15.2 +%setup -n yast2-country-2.15.3 %build %{prefix}/bin/y2tool y2autoconf @@ -111,6 +111,9 @@ %{prefix}/share/applications/YaST2/timezone.desktop %changelog -n yast2-country +* Wed Dec 13 2006 - jsuchome(a)suse.cz +- added missing time zone for Belarus (#228042) +- 2.15.3 * Mon Dec 11 2006 - jsuchome(a)suse.cz - add runlevel 4 to serial line config in inittab (#223983) - reverted change to noarch, so excluding desktop file can work on s390 ++++++ yast2-country-2.15.2.tar.bz2 -> yast2-country-2.15.3.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.15.2/VERSION new/yast2-country-2.15.3/VERSION --- old/yast2-country-2.15.2/VERSION 2006-12-07 16:35:44.000000000 +0100 +++ new/yast2-country-2.15.3/VERSION 2006-12-13 10:22:41.000000000 +0100 @@ -1 +1 @@ -2.15.2 +2.15.3 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.15.2/console/src/Console.ycp new/yast2-country-2.15.3/console/src/Console.ycp --- old/yast2-country-2.15.2/console/src/Console.ycp 2006-12-07 16:29:42.000000000 +0100 +++ new/yast2-country-2.15.3/console/src/Console.ycp 2006-12-11 10:15:14.000000000 +0100 @@ -20,7 +20,7 @@ *<LI> CONSOLE_ENCODING string console encoding</LI> *</UL> * - * $Id: Console.ycp 28383 2006-02-25 21:42:10Z olh $ + * $Id: Console.ycp 34880 2006-12-11 09:15:11Z jsuchome $ * * Author: * Klaus Kaempf <kkaempf(a)suse.de> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.15.2/timezone/data/timezone_raw.ycp new/yast2-country-2.15.3/timezone/data/timezone_raw.ycp --- old/yast2-country-2.15.2/timezone/data/timezone_raw.ycp 2006-06-26 16:22:55.000000000 +0200 +++ new/yast2-country-2.15.3/timezone/data/timezone_raw.ycp 2006-12-13 10:21:49.000000000 +0100 @@ -45,6 +45,8 @@ "Europe/Luxembourg" : _("Luxembourg"), "Europe/Madrid" : _("Spain"), "Europe/Malta" : _("Malta"), + // time zone + "Europe/Minsk" : _("Belarus"), "Europe/Monaco" : _("Monaco"), // time zone "Europe/Moscow" : _("Russia (Moscow)"), ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 yup
by root＠suse.de 14 Dec '06

14 Dec '06

Hello community, here is the log from the commit of package yup checked in at Thu Dec 14 01:27:44 CET 2006. -------- --- yup/yup.changes 2006-11-07 08:27:13.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yup/yup.changes 2006-12-12 23:38:09.000000000 +0100 @@ -1,0 +2,31 @@ +Tue Dec 5 11:50:27 CET 2006 - mge(a)suse.de + +- add /etc/permissions.d/yup + +------------------------------------------------------------------- +Wed Nov 29 13:58:42 CET 2006 - mge(a)suse.de + +- enable use of several configuration files below + /etc/sysconfig/yup.d + (following a proposal of Marcel Ritter) + +------------------------------------------------------------------- +Thu Nov 16 12:04:11 CET 2006 - mge(a)suse.de + +- verify bin and src rpms, + thanks to Andreas Taschner for help + +------------------------------------------------------------------- +Wed Nov 8 13:04:56 CET 2006 - mge(a)suse.de + +- add downloading of src.rpms from you.novell.com + +------------------------------------------------------------------- +Mon Oct 30 10:39:53 CET 2006 - mge(a)suse.de + +- introduce YUP_SRCRPM variable and combine with + patch/idea from Heiko Helmle posted on suse-sles-s + Date: Mon, 30 Oct 2006 09:36:37 +0100 + Subject: New YUP version 47-0.6 + +------------------------------------------------------------------- New: ---- yup.permissions ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yup.spec ++++++ --- /var/tmp/diff_new_pack.dKge1W/_old 2006-12-14 01:27:20.000000000 +0100 +++ /var/tmp/diff_new_pack.dKge1W/_new 2006-12-14 01:27:20.000000000 +0100 @@ -11,22 +11,23 @@ # norootforbuild Name: yup +BuildRequires: libidn-devel openssl-devel perl %if 0%{suse_version} < 1010 %define curl_name curl %define curl_version 7.15.5 -License: GNU General Public License (GPL) - all versions, MOZILLA PUBLIC LICENSE (MPL/NPL) +License: GNU General Public License (GPL), MOZILLA PUBLIC LICENSE (MPL/NPL) %else -License: GNU General Public License (GPL) - all versions, MOZILLA PUBLIC LICENSE (MPL/NPL) +License: GNU General Public License (GPL), MOZILLA PUBLIC LICENSE (MPL/NPL) BuildArch: noarch %endif -BuildRequires: libidn-devel openssl-devel Version: 47 -Release: 6 +Release: 13 Summary: "Yum Update Proxy" for SLE 10 Maintenance Source0: yup.sh Source1: yup.sysconfig Source2: yup.1.pod Source3: COPYING.GPL +Source4: yup.permissions %if 0%{suse_version} < 1010 Source10: %{curl_name}-%{curl_version}.tar.bz2 Patch2: %{curl_name}-%{curl_version}-lfs.patch @@ -74,11 +75,13 @@ %build pod2man --center=" " --release="%{version}-%{release}" --date="$(date)" %{S:2} > yup.$$$$; perl -p -e 's/.if n .na/.\\\".if n .na/;' yup.$$$$ > yup.1; +chmod 644 yup.1 rm -f yup.$$$$ %if 0%{suse_version} < 1010 cd %{curl_name}-%{curl_version} autoreconf -fi -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure \ +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ +./configure \ --prefix=%{_prefix} \ --program-suffix=-yup \ --enable-ipv6 \ @@ -90,9 +93,6 @@ %endif %install -if [ -n "$RPM_BUILD_ROOT" ] ; then - [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -fi %if 0%{suse_version} < 1010 cd %{curl_name}-%{curl_version} make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} @@ -108,17 +108,18 @@ cd .. %endif mkdir -p $RPM_BUILD_ROOT/usr/sbin \ + $RPM_BUILD_ROOT/etc/permissions.d \ $RPM_BUILD_ROOT/usr/share/man/man1 \ $RPM_BUILD_ROOT/var/adm/fillup-templates -install -m 755 %{S:0} $RPM_BUILD_ROOT/usr/sbin/yup -install -m 644 %{S:1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.yup -install -m 644 yup.1 $RPM_BUILD_ROOT/usr/share/man/man1/yup.1 +install -c -m 755 %{S:0} $RPM_BUILD_ROOT/usr/sbin/yup +install -c -m 600 %{S:1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.yup +install -c -m 644 %{S:4} $RPM_BUILD_ROOT/etc/permissions.d/yup +install -c -m 644 yup.1 $RPM_BUILD_ROOT/usr/share/man/man1/yup.1 %if 0%{suse_version} < 1010 sed -i -e "s,/usr/bin/curl,/usr/bin/curl-yup,g" $RPM_BUILD_ROOT/usr/sbin/yup sed -i -e "s,/usr/bin/curl,/usr/bin/curl-yup,g" $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.yup sed -i -e "s,/usr/bin/curl,/usr/bin/curl-yup,g" $RPM_BUILD_ROOT/usr/share/man/man1/yup.1 %endif -gzip -9 $RPM_BUILD_ROOT/usr/share/man/man1/yup.1 cp -a %{S:3} . # # rpm -qa --queryformat='%%{name}/%%{version}/%%{release}/%%{arch}\n'| sort | bzip2 -9 > USEDFORBUILD.bz2 @@ -128,6 +129,8 @@ %defattr(-,root,root) %attr(700, root, root) /usr/sbin/yup /usr/share/man/man1/yup.1.gz +%attr(600, root, root) /etc/permissions.d/yup +%attr(644, root, root)/usr/share/man/man1/yup.1* /var/adm/fillup-templates/sysconfig.yup # %doc USEDFORBUILD.bz2 %doc COPYING.GPL @@ -141,13 +144,27 @@ %{fillup_and_insserv -i -n yup} %clean -if [ -n "$RPM_BUILD_ROOT" ] ; then - [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -fi +rm -rf $RPM_BUILD_ROOT %changelog -n yup +* Tue Dec 05 2006 - mge(a)suse.de +- add /etc/permissions.d/yup +* Wed Nov 29 2006 - mge(a)suse.de +- enable use of several configuration files below + /etc/sysconfig/yup.d + (following a proposal of Marcel Ritter) +* Thu Nov 16 2006 - mge(a)suse.de +- verify bin and src rpms, + thanks to Andreas Taschner for help +* Wed Nov 08 2006 - mge(a)suse.de +- add downloading of src.rpms from you.novell.com * Tue Nov 07 2006 - meissner(a)suse.de - use 644 manpage permissions +* Mon Oct 30 2006 - mge(a)suse.de +- introduce YUP_SRCRPM variable and combine with + patch/idea from Heiko Helmle posted on suse-sles-s + Date: Mon, 30 Oct 2006 09:36:37 +0100 + Subject: New YUP version 47-0.6 * Tue Oct 24 2006 - meissner(a)suse.de - fixed the regular expressions for the sysconfig variable range. [:xdigit:]{32} -> ^[[:xdigit:]]{32}$ ++++++ yup.1.pod ++++++ --- yup/yup.1.pod 2006-10-12 17:49:33.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yup/yup.1.pod 2006-12-12 12:20:08.000000000 +0100 @@ -8,21 +8,18 @@ =head1 SYNOPSIS -yup has no cmd-line paramters; for configuration see B<OPTIONS> below. +Yup does not take command line parameters; for configuration see B<OPTIONS> below. =head1 DESCRIPTION -This packages allows to configure an update-mirror for Novell maintenance packages for SUSE Linux Enterprise 10. - -Please make sure, that the number of systems to serve with the mirrored packages is in compliance with the number of subscriptions you are allowed to exercise according to your contract with Novell. - -yup is delivered without any maintenance, support and warranty. +Yup is a tool to mirror updates for Novell maintenance packages for SUSE Linux +Enterprise 10 products. =head1 OPTIONS =head2 Network Configuration -yup uses the system's proxy settings as configured in F</etc/sysconfig/proxy>. In addition, secrets for proxy-authentication should be stored in F</root/.curlrc>. This is done automatically, if the YaST proxy-module is used. There are only two relevant proxy-settings (besides authentication): +Yup uses the system's proxy settings as configured in F</etc/sysconfig/proxy>. In addition, secrets for proxy-authentication should be stored in F</root/.curlrc>. This is done automatically, if the YaST proxy-module is used. There are only two relevant proxy-settings (besides authentication): =over @@ -36,23 +33,25 @@ =back -=head2 Configuration File +=head2 Configuration File(s) + +Yup needs a configuration file, currently: F</etc/sysconfig/yup>. On SUSE Linux systems, this file can be changed by also using YaST's sysconfig-editor (System/YUP). -yup needs a configuration file, currently: F</etc/sysconfig/yup>. On SUSE Linux systems, this file can be changed by also using YaST's sysconfig-editor (System/YUP). +Alternatively, it is possible to put several configuration files into the (hardcoded) directory F</etc/sysconfig/yup.d>; Yup loops over those files, the single file F</etc/sysconfig/yup> is ignored in this case. =over =item YUP_CURL -Path and name of curl binary, default: F</usr/bin/curl>. This might be useful on systems which need a non-standard curl-binary to make yup work (e.g. SLES 9). +Path and name of curl binary, default: F</usr/bin/curl>. This might be useful on systems which need a non-standard curl-binary to make Yup work (e.g. SLES 9). =item YUP_CURLPARAMS -Standard parameters for curl: --digest is vital for autentication, --verbose and --fail are necessary for correct error handling, default F<--verbose --digest --remote-time --fail> +Standard parameters for curl: --digest is vital for authentication, --verbose and --fail are necessary for correct error handling, default F<--verbose --digest --remote-time --fail> =item YUP_DEST_DIR -Destination path (script will create subdirectories there), default: F</tmp/SLE10-YUP> +Destination path (script will create sub-directories there), default: F</tmp/SLE10-YUP> =item YUP_ID @@ -110,15 +109,72 @@ =back -=head1 ERRORS +Additionally here are some paramters for downloading the SRC-RPMs. +At the moment those packages are located on a different server (F<you.novell.com>), +but in full sync with F<update.novell.com>. + +=over + +=item YUP_SRCRPM + +Include .src.rpms in mirror? Default: F<no> Enable with F<you>, to download from F<you.novell.com>, later in 2007 also downloads from F<update.novell.com> might be possible; enable this with F<yes>. + +=item YOU_NCC_ACCOUNT + +Your NCC account (necessary F<for you.novell.com>) + +=item YOU_NCC_PASSWORD + +Your NCC password (necessary F<for you.novell.com>) + +=item YOU_SERVER + +F<you.novell.com> + +=back + +=head1 ERROR HANDLING + +Yup will exit with an error status if meta data for a catalog (for example, the +list of patches) cannot be downloaded. Yup will continue working when a regular +data file in a catalog, like an RPM package, cannot be downloaded, but will +exit with an error code later on. -yup does not work properly on a standard SLES 9 at the moment; a special curl binary is necessary (curl >= 7.12.0 ) to make yup work here. Use the YUP_CURL variable to work around this limitation. +=head1 BUGS + +Yup does not work properly on a standard SLES 9 at the moment; a special curl binary is necessary (curl >= 7.12.0 ) to make Yup work here. Use the YUP_CURL variable to work around this limitation. =head1 FILES -/etc/sysconfig/proxy -/etc/sysconfig/yup -/root/.curlrc +=over + +=item /etc/sysconfig/yup + +Yup's primary configuration file + +=item /etc/sysconfig/proxy + +Proxy settings for HTTP and HTTPS + +=item /root/.curlrc + +Configuration file for curl. + +=back + +=head1 SEE ALSO + +The Novell knowledge base, L<http://support.novell.com>. + +L<curl(1)> + +=head1 NOTES + +Please make sure, that the number of systems to serve with the mirrored +packages is in compliance with the number of subscriptions you are allowed to +exercise according to your contract with Novell. + +Yup is delivered without any maintenance, support and warranty. =head1 AUTHOR ++++++ yup.sh ++++++ --- yup/yup.sh 2006-10-12 18:25:38.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yup/yup.sh 2006-12-12 12:20:54.000000000 +0100 @@ -32,7 +32,7 @@ # Proxy. The resulting configuration can be found in # /etc/sysconfig/proxy and /root/.curlrc (authentication data). # -# $Id: yup.sh 44 2006-10-12 16:25:37Z mge $ +# $Id: yup.sh 76 2006-11-29 12:59:37Z mge $ # # Fail on errors in simple commands. @@ -43,14 +43,14 @@ # Obtain a temporary file which we will use to capture curl command output CURLTMPFILE=$(mktemp -t yup.XXXXXXXXXX) -if test "x$CURLTMPFILE" = "x" ; then +if test "${CURLTMPFILE}." = "." ; then echo "Failed to create temp file" exit 1 fi # Obtain another temporary file which we will use for loop data LOOPTMPFILE=$(mktemp -t yup.XXXXXXXXXX) -if test "x$LOOPTMPFILE" = "x" ; then +if test "${LOOPTMPFILE}." = "." ; then echo "Failed to create temp file" exit 1 fi @@ -65,7 +65,7 @@ url=$1 localfile=$2 - if test x$localfile = "x"; then + if test "${localfile}." = "."; then localfile=$(basename $url) fi @@ -90,203 +90,306 @@ return 0 } -# import the update parameters -# ( YUP_CURL YUP_CURLPARAMS YUP_DEST_DIR -# YUP_ID YUP_PASS YUP_ID_SLED YUP_PASS_SLED -# YUP_ID_SLES YUP_PASS_SLES YUP_ARCH YUP_PRODUCTS ) -# -. /etc/sysconfig/yup - -# evaluate update parameters -# -echo "YUP_CURL ="${YUP_CURL:="/usr/bin/curl"} -echo "YUP_CURLPARAMS ="${YUP_CURLPARAMS:="--verbose --digest --remote-time --fail"} - # --verbose: we use a wrapper function and only display curl output in - # case of errors; in that case, we want details. - # - # --fail: we want curl to exit with a non-zero exit status when a URL - # could not be retrieved, in particular for things like invalid - # credentials (HTTP 403) - -echo "YUP_SERVER ="${YUP_SERVER:="update.novell.com"} -echo "YUP_DEST_DIR ="${YUP_DEST_DIR:="/tmp/SLE10-YUP"} -echo "YUP_ARCH ="${YUP_ARCH:="i586"} -if [ "$YUP_DEBUGINFO." = "yes." ] ; then - YUP_PRODUCTS="${YUP_PRODUCTS:=SLES10} SLE10-Debug" -else - YUP_PRODUCTS="${YUP_PRODUCTS:=SLES10}" -fi -if [ "$YUP_SDK." = "yes." ] ; then - YUP_PRODUCTS="$YUP_PRODUCTS SDK10" -fi -echo "YUP_PRODUCTS =$YUP_PRODUCTS" - -# -if [ "$YUP_ID." = "." ] || [ "$YUP_PASS." = "." ] ; then - if [ "$YUP_ID_SLED." = "." ] || [ "$YUP_PASS_SLED." = "." ] ; then - if [ "$YUP_ID_SLES." = "." ] || [ "$YUP_PASS_SLES." = "." ] ; then - echo "UpdateMirror not configured properly - please run: " - echo "YaST->System->Sysconfig Editor->System->YUP" - exit 1; +function verify_rpm() { + url=$1 + if [ -x /bin/rpm ] ; then + rpm -qKsp --nosignature $url > /dev/null + rc=$? + if [ $rc -eq 0 ] ; then + echo "" + else + if test -f "$uri"; then + echo " broken file, renaming, ..." + mv $url $url.broken + fi fi fi -fi +} -# import public proxy parameters; proxy-authentication params -# are in /root/.curlrc and automatically evaluated by curl. -# ( PROXY_ENABLED HTTPS_PROXY ) -# -. /etc/sysconfig/proxy +function fetch_repodata() { + bn=$1 + # Always download all the necessary metadata + fetch_url "$bn/repodata/repomd.xml.asc" "repodata/repomd.xml.asc" + fetch_url "$bn/repodata/repomd.xml.key" "repodata/repomd.xml.key" + fetch_url "$bn/repodata/repomd.xml" "repodata/repomd.xml" + fetch_url "$bn/repodata/filelists.xml.gz" "repodata/filelists.xml.gz" + fetch_url "$bn/repodata/primary.xml.gz" "repodata/primary.xml.gz" + fetch_url "$bn/repodata/patches.xml" "repodata/patches.xml" +} -# evaluate proxy parameters -# -if [ "$PROXY_ENABLED" = "yes" ]; then - if ! [ "$HTTPS_PROXY." = "." ]; then - YUP_CURLPARAMS="$YUP_CURLPARAMS --proxy $HTTPS_PROXY" +function fetch_binrpms() { + bn=$1 + # Download all the rpms mentioned in primary.xml.gz for the YUM repo. + if [ "${YUP_SRCRPM}." = "yes." ] ; then + zcat repodata/primary.xml.gz | grep -E "location[[:space:]]*href" > $LOOPTMPFILE + else + zcat repodata/primary.xml.gz | grep -E "location[[:space:]]*href" | grep -v 'rpm/src' > $LOOPTMPFILE fi -fi - -for useARCH in $YUP_ARCH; do - for SLE in $YUP_PRODUCTS; do - useID=$YUP_ID - usePASS=$YUP_PASS - useSERVER=$YUP_SERVER - if [ "$SLE." = "SLES10." ]; then - UPD="SLES10-Updates/sles-10" - if [ "$YUP_ID_SLES." != "." ] && [ "$YUP_PASS_SLES." != "." ] ; then - useID=$YUP_ID_SLES - usePASS=$YUP_PASS_SLES - fi - if [ "$YUP_SERVER_SLES." != "." ] ; then - useSERVER=$YUP_SERVER_SLES - fi - elif [ "$SLE." = "SLE10-Debug." ]; then - UPD="SLE10-Debuginfo-Updates/sles-10" - if [ "$YUP_ID_SLES." != "." ] && [ "$YUP_PASS_SLES." != "." ] ; then - useID=$YUP_ID_SLES - usePASS=$YUP_PASS_SLES - fi - if [ "$YUP_SERVER_SLES." != "." ] ; then - useSERVER=$YUP_SERVER_SLES - fi - elif [ "$SLE." = "SLED10." ]; then - UPD="SLED10-Updates/sled-10" - if [ "$YUP_ID_SLED." != "." ] && [ "$YUP_PASS_SLED." != "." ] ; then - useID=$YUP_ID_SLED - usePASS=$YUP_PASS_SLED - fi - if [ "$YUP_SERVER_SLED." != "." ] ; then - useSERVER=$YUP_SERVER_SLED - fi - elif [ "$SLE." = "SDK10." ]; then - UPD="SLE10-SDK-Updates/sles-10" - if [ "$YUP_ID." = "." ] || [ "$YUP_PASS." = "." ] ; then - if [ "$YUP_ID_SLES." = "." ] || [ "$YUP_PASS_SLES." = "." ] ; then - useID=$YUP_ID_SLED - usePASS=$YUP_PASS_SLED - else - useID=$YUP_ID_SLES - usePASS=$YUP_PASS_SLES + { + while read line ; do + uri=`echo "$line"|sed -e 's/^[^"]*"//;s/".*$//;'` + dn=`dirname $uri` + test -d $dn || mkdir -p $dn + echo -e -n "$uri" + verify_rpm "$uri" + if ! test -f "$uri"; then + if ! fetch_url "$bn/$uri" "$uri" ; then + errorlog="$errorlog $bn/$uri" fi + verify_rpm "$uri" fi - if [ "$YUP_SERVER." = "." ] ; then - if [ "$YUP_SERVER_SLES." = "." ] ; then - useSERVER=$YUP_SERVER_SLED - else - useSERVER=$YUP_SERVER_SLES + done + } < $LOOPTMPFILE + return 0 +} + +function fetch_srcrpms() { + bn=$1 + # Download all the rpms mentioned in primary.xml.gz for the YUM repo. + zcat repodata/primary.xml.gz | grep -E "location[[:space:]]*href" | grep 'rpm/src' > $LOOPTMPFILE + { + while read line ; do + uri=`echo "$line"|sed -e 's/^[^"]*"//;s/".*$//;'` + dn=`dirname $uri` + test -d $dn || mkdir -p $dn + echo -e -n "$uri" + verify_rpm "$uri" + if ! test -f "$uri"; then + if ! fetch_url "$bn/$uri" "$uri" ; then + errorlog="$errorlog $bn/$uri" fi + verify_rpm "$uri" fi - else - echo "Warning: SLE $SLE unknown. Proceeding anyways ..." - # exit 1 - fi - - bn="https://${useID}:${usePASS}@${useSERVER}/repo/\$RCE/${UPD}-${useARCH}" - - echo "Using $bn" - - mkdir -p ${YUP_DEST_DIR}/${SLE}/${useARCH} - cd ${YUP_DEST_DIR}/${SLE}/${useARCH} - - mkdir -p repodata 2>/dev/null - - # Always download all the necessary metadata - - fetch_url "$bn/repodata/repomd.xml.asc" "repodata/repomd.xml.asc" - fetch_url "$bn/repodata/repomd.xml.key" "repodata/repomd.xml.key" - fetch_url "$bn/repodata/repomd.xml" "repodata/repomd.xml" - fetch_url "$bn/repodata/filelists.xml.gz" "repodata/filelists.xml.gz" - fetch_url "$bn/repodata/primary.xml.gz" "repodata/primary.xml.gz" - fetch_url "$bn/repodata/patches.xml" "repodata/patches.xml" + done + } < $LOOPTMPFILE + return 0 +} - # Download all the rpms mentioned in primary.xml.gz for the YUM repo. - zcat repodata/primary.xml.gz|grep location.href > $LOOPTMPFILE - { - while read line ; do +function fetch_repomd() { + bn=$1 + # Download all the repo-md patches, cross check with SHA1 sum for changed ones. + grep -E "(location[[:space:]]*href|checksum[[:space:]]*type..sha)" repodata/patches.xml > $LOOPTMPFILE + { + while read line ; do + echo "$line"|grep "checksum[[:space:]]*type..sha" >/dev/null + res=$? + if [ "$res" == "0" ]; then + sha1=`echo "$line"|sed -e 's/^.*sha">//;s/<.checksum.*$//;'` + else uri=`echo "$line"|sed -e 's/^[^"]*"//;s/".*$//;'` dn=`dirname $uri` test -d $dn || mkdir -p $dn - if ! test -f "$uri"; then - if ! fetch_url "$bn/$uri" "$uri" ; then + nsum=`sha1sum "$uri"|sed -e 's/ .*//;'` + if [ "${nsum}." != "${sha1}." ]; then + echo "$uri is bad ($nsum / $sha1), reloading" + rm -f "$uri" + fi + if ! test -f "$uri" ; then + if ! fetch_url "$bn/$uri" "$uri" ; then errorlog="$errorlog $bn/$uri" fi fi echo $uri - done - } < $LOOPTMPFILE + fi + done || exit $? + } < $LOOPTMPFILE +} - # Download all the repo-md patches, cross check with SHA1 sum for changed ones. - grep -E "(location.href|checksum.type..sha)" repodata/patches.xml > $LOOPTMPFILE - { - while read line ; do - echo "$line"|grep "checksum.type..sha" >/dev/null - res=$? - if [ "$res" == "0" ]; then - sha1=`echo "$line"|sed -e 's/^.*sha">//;s/<.checksum.*$//;'` - else - uri=`echo "$line"|sed -e 's/^[^"]*"//;s/".*$//;'` - dn=`dirname $uri` - test -d $dn || mkdir -p $dn - nsum=`sha1sum "$uri"|sed -e 's/ .*//;'` - if [ "x$nsum" != "x$sha1" ]; then - echo "$uri is bad ($nsum / $sha1), reloading" - rm -f "$uri" +function fetch_patchrpms() { + bn=$1 + # Download all the patch and delta rpms mentioned in the patches. + grep -E "location[[:space:]]*href" repodata/patch-*.xml > $LOOPTMPFILE + { + while read line ; do + uri=`echo "$line"|sed -e 's/^[^"]*"//;s/".*$//;'` + dn=`dirname $uri` + test -d $dn || mkdir -p $dn + if ! test -f "$uri" ; then + if ! fetch_url "$bn/$uri" "$uri" ; then + errorlog="$errorlog $bn/$uri" + fi + fi + echo $uri + done || exit $? + } < $LOOPTMPFILE +} + +# import the update parameters +# ( YUP_CURL YUP_CURLPARAMS YUP_DEST_DIR +# YUP_ID YUP_PASS YUP_ID_SLED YUP_PASS_SLED +# YUP_ID_SLES YUP_PASS_SLES YUP_ARCH YUP_PRODUCTS ) +# +if [ -d /etc/sysconfig/yup.d ] ; then + YUP_CONFIGs=" $( find /etc/sysconfig/yup.d/ -type f ) " +else + YUP_CONFIGs=" /etc/sysconfig/yup " +fi + +for CC in $YUP_CONFIGs; do + if [ -r $CC ]; then + echo "Using config file $CC" + . $CC + # evaluate update parameters + # + echo "YUP_CURL ="${YUP_CURL:="/usr/bin/curl"} + echo "YUP_CURLPARAMS ="${YUP_CURLPARAMS:="--verbose --digest --remote-time --fail"} + # --verbose: we use a wrapper function and only display curl output in + # case of errors; in that case, we want details. + # + # --fail: we want curl to exit with a non-zero exit status when a URL + # could not be retrieved, in particular for things like invalid + # credentials (HTTP 403) + + echo "YUP_SERVER ="${YUP_SERVER:="update.novell.com"} + echo "YOU_SERVER ="${YUP_SERVER:="you.novell.com"} + echo "YUP_DEST_DIR ="${YUP_DEST_DIR:="/tmp/SLE10-YUP"} + echo "YUP_ARCH ="${YUP_ARCH:="i586"} + if [ "${YUP_DEBUGINFO}." = "yes." ] ; then + YUP_PRODUCTS="${YUP_PRODUCTS:=SLES10} SLE10-Debug" + else + YUP_PRODUCTS="${YUP_PRODUCTS:=SLES10}" + fi + if [ "${YUP_SDK}." = "yes." ] ; then + YUP_PRODUCTS="$YUP_PRODUCTS SDK10" + fi + echo "YUP_PRODUCTS =$YUP_PRODUCTS" + + # + if [ "${YUP_ID}." = "." ] || [ "${YUP_PASS}." = "." ] ; then + if [ "${YUP_ID_SLED}." = "." ] || [ "${YUP_PASS_SLED}." = "." ] ; then + if [ "${YUP_ID_SLES}." = "." ] || [ "${YUP_PASS_SLES}." = "." ] ; then + echo "UpdateMirror not configured properly - please run: " + echo "YaST->System->Sysconfig Editor->System->YUP" + exit 1; + fi + fi + fi + + # import public proxy parameters; proxy-authentication params + # are in /root/.curlrc and automatically evaluated by curl. + # ( PROXY_ENABLED HTTPS_PROXY ) + # + . /etc/sysconfig/proxy + + # evaluate proxy parameters + # + if [ "$PROXY_ENABLED" = "yes" ]; then + if ! [ "$HTTPS_PROXY." = "." ]; then + YUP_CURLPARAMS="$YUP_CURLPARAMS --proxy $HTTPS_PROXY" + fi + fi + + # + # get via yup-channel + # + for useARCH in $YUP_ARCH; do + for SLE in $YUP_PRODUCTS; do + useID=$YUP_ID + usePASS=$YUP_PASS + useSERVER=$YUP_SERVER + if [ "${SLE}." = "SLES10." ]; then + UPD="SLES10-Updates/sles-10" + if [ "${YUP_ID_SLES}." != "." ] && [ "${YUP_PASS_SLES}." != "." ] ; then + useID=$YUP_ID_SLES + usePASS=$YUP_PASS_SLES + fi + if [ "${YUP_SERVER_SLES}." != "." ] ; then + useSERVER=$YUP_SERVER_SLES + fi + elif [ "${SLE}." = "SLE10-Debug." ]; then + UPD="SLE10-Debuginfo-Updates/sles-10" + if [ "${YUP_ID_SLES}." != "." ] && [ "${YUP_PASS_SLES}." != "." ] ; then + useID=$YUP_ID_SLES + usePASS=$YUP_PASS_SLES + fi + if [ "${YUP_SERVER_SLES}." != "." ] ; then + useSERVER=$YUP_SERVER_SLES + fi + elif [ "${SLE}." = "SLED10." ]; then + UPD="SLED10-Updates/sled-10" + if [ "${YUP_ID_SLED}." != "." ] && [ "${YUP_PASS_SLED}." != "." ] ; then + useID=$YUP_ID_SLED + usePASS=$YUP_PASS_SLED fi - if ! test -f "$uri" ; then - if ! fetch_url "$bn/$uri" "$uri" ; then - errorlog="$errorlog $bn/$uri" + if [ "${YUP_SERVER_SLED}." != "." ] ; then + useSERVER=$YUP_SERVER_SLED + fi + elif [ "${SLE}." = "SDK10." ]; then + UPD="SLE10-SDK-Updates/sles-10" + if [ "${YUP_ID}." = "." ] || [ "${YUP_PASS}." = "." ] ; then + if [ "${YUP_ID_SLES}." = "." ] || [ "${YUP_PASS_SLES}." = "." ] ; then + useID=$YUP_ID_SLED + usePASS=$YUP_PASS_SLED + else + useID=$YUP_ID_SLES + usePASS=$YUP_PASS_SLES + fi + fi + if [ "${YUP_SERVER}." = "." ] ; then + if [ "${YUP_SERVER_SLES}." = "." ] ; then + useSERVER=$YUP_SERVER_SLED + else + useSERVER=$YUP_SERVER_SLES fi fi - echo $uri + else + echo "Warning: SLE $SLE unknown. Proceeding anyways ..." + # exit 1 fi + bn="https://${useID}:${usePASS}@${useSERVER}/repo/\$RCE/${UPD}-${useARCH}" + echo "Using $bn" + mkdir -p ${YUP_DEST_DIR}/${SLE}/${useARCH} + cd ${YUP_DEST_DIR}/${SLE}/${useARCH} + mkdir -p repodata 2>/dev/null + fetch_repodata $bn + fetch_binrpms $bn + fetch_repomd $bn + fetch_patchrpms $bn done || exit $? - } < $LOOPTMPFILE + done || exit $? - # Download all the patch and delta rpms mentioned in the patches. - grep location.href repodata/patch-*.xml > $LOOPTMPFILE - { - while read line ; do - uri=`echo "$line"|sed -e 's/^[^"]*"//;s/".*$//;'` - dn=`dirname $uri` - test -d $dn || mkdir -p $dn - if ! test -f "$uri" ; then - if ! fetch_url "$bn/$uri" "$uri" ; then - errorlog="$errorlog $bn/$uri" + # + # Get Source RPMs + # + if [ "${YUP_SRCRPM}." = "you." ] ; then + YUP_CURLPARAMS=$( echo $YUP_CURLPARAMS | sed s/--digest//g ); + YUP_CURLPARAMS="$YUP_CURLPARAMS --basic --user $YOU_NCC_ACCOUNT:$YOU_NCC_PASSWORD " + for useARCH in $YUP_ARCH; do + useSERVER=$YOU_SERVER + for SLE in $YUP_PRODUCTS; do + if [ "${SLE}." = "SLES10." ]; then + UPD="SUSE-SLES/10" + elif [ "${SLE}." = "SLED10." ]; then + UPD="SUSE-SLED/10" + elif [ "${SLE}." = "SDK10." ]; then + UPD="SLE-SDK/10" + else + echo "Warning: SLE $SLE unknown. Proceeding anyways ..." + # exit 1 fi - fi - echo $uri + YOU_useARCH=$( echo $useARCH | sed s/i586/i386/g ); + bn="https://${useSERVER}/update/$YOU_useARCH/update/${UPD}" + echo "Using $bn" + mkdir -p ${YUP_DEST_DIR}/${SLE}/${useARCH} + cd ${YUP_DEST_DIR}/${SLE}/${useARCH} + mkdir -p repodata 2>/dev/null + fetch_repodata $bn + fetch_srcrpms $bn + done || exit $? done || exit $? - } < $LOOPTMPFILE - done || exit $? -done || exit $? - -if test "x$errorlog" != "x"; then - echo "Error exit delayed from previous errors" - echo "Problematic URIs were: $errorlog" - exit 1 -fi + fi + # + # Error Report + # + if test "${errorlog}." != "."; then + echo "Error exit delayed from previous errors" + echo "Problematic URIs were: $errorlog" + exit 1 + fi + fi +done # -# Finis Africae +# Finis Africae # ++++++ yup.sysconfig ++++++ --- yup/yup.sysconfig 2006-10-24 10:13:07.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yup/yup.sysconfig 2006-12-12 12:25:08.000000000 +0100 @@ -168,3 +168,31 @@ # YUP_SDK="no" +## Type: list(yes,no,you) +## Default: "no" +# +# Include .src.rpms in mirror? +# +YUP_SRCRPM="no" + +## Type: string +## Default: "" +# +# The NCC account (necessary for you.novell.com) +# +YOU_NCC_ACCOUNT="" + +## Type: string +## Default: "" +# +# The NCC password (necessary for you.novell.com) +# +YOU_NCC_PASSWORD="" + +## Type: string +## Default: "you.novell.com" +# +# The YOU server to use +# +YOU_SERVER="you.novell.com" + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-cd-creator
by root＠suse.de 14 Dec '06

14 Dec '06

Hello community, here is the log from the commit of package yast2-cd-creator checked in at Thu Dec 14 01:27:36 CET 2006. -------- --- yast2-cd-creator/yast2-cd-creator.changes 2006-10-30 14:02:43.000000000 +0100 +++ /mounts/work_src_done/NOARCH/yast2-cd-creator/yast2-cd-creator.changes 2006-12-13 08:20:46.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Dec 13 07:43:06 CET 2006 - lslezak(a)suse.cz + +- display an error message when the selected source doesn't + support architecture of the machine (#197549) +- 2.15.0 + +------------------------------------------------------------------- Old: ---- yast2-cd-creator-2.14.0.tar.bz2 New: ---- yast2-cd-creator-2.15.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-cd-creator.spec ++++++ --- /var/tmp/diff_new_pack.BGOZl6/_old 2006-12-14 01:26:38.000000000 +0100 +++ /var/tmp/diff_new_pack.BGOZl6/_new 2006-12-14 01:26:38.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-cd-creator (Version 2.14.0) +# spec file for package yast2-cd-creator (Version 2.15.0) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-cd-creator URL: http://www.suse.com/ -Version: 2.14.0 +Version: 2.15.0 Release: 1 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-cd-creator-2.14.0.tar.bz2 +Source0: yast2-cd-creator-2.15.0.tar.bz2 prefix: /usr BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-packager yast2-testsuite Requires: yast2 yast2-packager autoyast2-installation @@ -39,7 +39,7 @@ Anas Nashif <nashif(a)suse.de> %prep -%setup -n yast2-cd-creator-2.14.0 +%setup -n yast2-cd-creator-2.15.0 %build %{prefix}/bin/y2tool y2autoconf @@ -78,6 +78,10 @@ #%dir /etc/YaST2/cd-creator %changelog -n yast2-cd-creator +* Wed Dec 13 2006 - lslezak(a)suse.cz +- display an error message when the selected source doesn't + support architecture of the machine (#197549) +- 2.15.0 * Mon Oct 30 2006 - lslezak(a)suse.cz - 'create_package_descr' script has been moved to 'inst-source-utils' package, install the right package (#213872) ++++++ yast2-cd-creator-2.14.0.tar.bz2 -> yast2-cd-creator-2.15.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/Makefile.am new/yast2-cd-creator-2.15.0/Makefile.am --- old/yast2-cd-creator-2.14.0/Makefile.am 2006-10-30 13:59:39.000000000 +0100 +++ new/yast2-cd-creator-2.15.0/Makefile.am 2006-12-13 08:15:30.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,7 +19,7 @@ # 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) @@ -34,7 +33,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # 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 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/Makefile.in new/yast2-cd-creator-2.15.0/Makefile.in --- old/yast2-cd-creator-2.14.0/Makefile.in 2006-10-30 13:59:49.000000000 +0100 +++ new/yast2-cd-creator-2.15.0/Makefile.in 2006-12-13 08:15:38.000000000 +0100 @@ -135,6 +135,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = $(shell cat $(srcdir)/VERSION) XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ @@ -201,15 +202,14 @@ ystartupdir = @ystartupdir@ #where devtools are -PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools) -Y2TOOL = $(PREFIX)/bin/y2tool +Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) HAS_YAST_LICENSE = $(shell test -e $(srcdir)/YAST_LICENSE && echo YAST_LICENSE) # 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 @@ -220,7 +220,7 @@ AUTOMAKE_OPTIONS = foreign dist-bzip2 # 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 CLEANFILES = MAINTAINERCLEANFILES = package/$(RPMNAME)-$(VERSION).tar.bz2 package/$(RPMNAME).spec diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/VERSION new/yast2-cd-creator-2.15.0/VERSION --- old/yast2-cd-creator-2.14.0/VERSION 2006-10-30 13:53:25.000000000 +0100 +++ new/yast2-cd-creator-2.15.0/VERSION 2006-12-13 07:43:02.000000000 +0100 @@ -1 +1 @@ -2.14.0 +2.15.0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/agents/Makefile.in new/yast2-cd-creator-2.15.0/agents/Makefile.in --- old/yast2-cd-creator-2.14.0/agents/Makefile.in 2006-10-30 13:59:47.000000000 +0100 +++ new/yast2-cd-creator-2.15.0/agents/Makefile.in 2006-12-13 08:15:37.000000000 +0100 @@ -108,6 +108,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/configure new/yast2-cd-creator-2.15.0/configure --- old/yast2-cd-creator-2.14.0/configure 2006-10-30 13:59:46.000000000 +0100 +++ new/yast2-cd-creator-2.15.0/configure 2006-12-13 08:15:35.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-cd-creator 2.14.0. +# Generated by GNU Autoconf 2.60 for yast2-cd-creator 2.15.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-cd-creator' PACKAGE_TARNAME='yast2-cd-creator' -PACKAGE_VERSION='2.14.0' -PACKAGE_STRING='yast2-cd-creator 2.14.0' +PACKAGE_VERSION='2.15.0' +PACKAGE_STRING='yast2-cd-creator 2.15.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -659,6 +659,7 @@ LN_S PKG_CONFIG_PATH XGETTEXT +Y2DEVTOOLS_PREFIX CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_FALSE CREATE_PKGCONFIG_NOARCH_TRUE @@ -1180,7 +1181,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-cd-creator 2.14.0 to adapt to many kinds of systems. +\`configure' configures yast2-cd-creator 2.15.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1251,7 +1252,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-cd-creator 2.14.0:";; + short | recursive ) echo "Configuration of yast2-cd-creator 2.15.0:";; esac cat <<\_ACEOF @@ -1329,7 +1330,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-cd-creator configure 2.14.0 +yast2-cd-creator configure 2.15.0 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1343,7 +1344,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-cd-creator $as_me 2.14.0, which was +It was created by yast2-cd-creator $as_me 2.15.0, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2144,7 +2145,7 @@ # Define the identity of the package. PACKAGE='yast2-cd-creator' - VERSION='2.14.0' + VERSION='2.15.0' cat >>confdefs.h <<_ACEOF @@ -2371,7 +2372,7 @@ -VERSION="2.14.0" +VERSION="2.15.0" RPMNAME="yast2-cd-creator" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -2618,6 +2619,8 @@ { (exit 1); exit 1; }; } fi +Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` + devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools` devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools` @@ -2796,6 +2799,34 @@ echo "$as_me: error: ycpc is not installed" >&2;} { (exit 1); exit 1; }; } fi +as_ac_File=`echo "ac_cv_file_$devtools_yast2dir/data/testsuite/Makefile.testsuite" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite" >&5 +echo $ECHO_N "checking for $devtools_yast2dir/data/testsuite/Makefile.testsuite... $ECHO_C" >&6; } +if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +if test -r "$devtools_yast2dir/data/testsuite/Makefile.testsuite"; then + eval "$as_ac_File=yes" +else + eval "$as_ac_File=no" +fi +fi +ac_res=`eval echo '${'$as_ac_File'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_File'}'` = yes; then + : +else + + { echo "$as_me:$LINENO: WARNING: yast2-testsuite.rpm is not installed" >&5 +echo "$as_me: WARNING: yast2-testsuite.rpm is not installed" >&2;} + +fi + ac_config_files="$ac_config_files Makefile agents/Makefile doc/autodocs/Makefile doc/Makefile scripts/Makefile src/data/Makefile src/Makefile testsuite/Makefile" @@ -3227,7 +3258,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-cd-creator $as_me 2.14.0, which was +This file was extended by yast2-cd-creator $as_me 2.15.0, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3270,7 +3301,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-cd-creator config.status 2.14.0 +yast2-cd-creator config.status 2.15.0 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -3531,9 +3562,9 @@ LN_S!$LN_S$ac_delim PKG_CONFIG_PATH!$PKG_CONFIG_PATH$ac_delim XGETTEXT!$XGETTEXT$ac_delim +Y2DEVTOOLS_PREFIX!$Y2DEVTOOLS_PREFIX$ac_delim CREATE_PKGCONFIG_TRUE!$CREATE_PKGCONFIG_TRUE$ac_delim CREATE_PKGCONFIG_FALSE!$CREATE_PKGCONFIG_FALSE$ac_delim -CREATE_PKGCONFIG_NOARCH_TRUE!$CREATE_PKGCONFIG_NOARCH_TRUE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -3575,6 +3606,7 @@ ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +CREATE_PKGCONFIG_NOARCH_TRUE!$CREATE_PKGCONFIG_NOARCH_TRUE$ac_delim CREATE_PKGCONFIG_NOARCH_FALSE!$CREATE_PKGCONFIG_NOARCH_FALSE$ac_delim STYLESHEET_HTML!$STYLESHEET_HTML$ac_delim STYLESHEET_PDF!$STYLESHEET_PDF$ac_delim @@ -3588,7 +3620,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/configure.in new/yast2-cd-creator-2.15.0/configure.in --- old/yast2-cd-creator-2.14.0/configure.in 2006-10-30 13:59:39.000000000 +0100 +++ new/yast2-cd-creator-2.15.0/configure.in 2006-12-13 08:15:29.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-cd-creator dnl -dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-cd-creator, 2.14.0, http://bugs.opensuse.org/, yast2-cd-creator) +AC_INIT(yast2-cd-creator, 2.15.0, http://bugs.opensuse.org/, yast2-cd-creator) 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.14.0" +VERSION="2.15.0" RPMNAME="yast2-cd-creator" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -110,6 +110,8 @@ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) 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 +144,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 old/yast2-cd-creator-2.14.0/doc/Makefile.in new/yast2-cd-creator-2.15.0/doc/Makefile.in --- old/yast2-cd-creator-2.14.0/doc/Makefile.in 2006-10-30 13:59:47.000000000 +0100 +++ new/yast2-cd-creator-2.15.0/doc/Makefile.in 2006-12-13 08:15:37.000000000 +0100 @@ -115,6 +115,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/doc/autodocs/Makefile.in new/yast2-cd-creator-2.15.0/doc/autodocs/Makefile.in --- old/yast2-cd-creator-2.14.0/doc/autodocs/Makefile.in 2006-10-30 13:59:48.000000000 +0100 +++ new/yast2-cd-creator-2.15.0/doc/autodocs/Makefile.in 2006-12-13 08:15:37.000000000 +0100 @@ -105,6 +105,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/scripts/Makefile.in new/yast2-cd-creator-2.15.0/scripts/Makefile.in --- old/yast2-cd-creator-2.14.0/scripts/Makefile.in 2006-10-30 13:59:48.000000000 +0100 +++ new/yast2-cd-creator-2.15.0/scripts/Makefile.in 2006-12-13 08:15:37.000000000 +0100 @@ -99,6 +99,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/src/Makefile.in new/yast2-cd-creator-2.15.0/src/Makefile.in --- old/yast2-cd-creator-2.14.0/src/Makefile.in 2006-10-30 13:59:48.000000000 +0100 +++ new/yast2-cd-creator-2.15.0/src/Makefile.in 2006-12-13 08:15:37.000000000 +0100 @@ -121,6 +121,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/src/data/Makefile.in new/yast2-cd-creator-2.15.0/src/data/Makefile.in --- old/yast2-cd-creator-2.14.0/src/data/Makefile.in 2006-10-30 13:59:48.000000000 +0100 +++ new/yast2-cd-creator-2.15.0/src/data/Makefile.in 2006-12-13 08:15:38.000000000 +0100 @@ -105,6 +105,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/src/dialogs.ycp new/yast2-cd-creator-2.15.0/src/dialogs.ycp --- old/yast2-cd-creator-2.14.0/src/dialogs.ycp 2006-10-12 09:57:27.000000000 +0200 +++ new/yast2-cd-creator-2.15.0/src/dialogs.ycp 2006-12-13 08:08:33.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: dialogs.ycp 33333 2006-10-12 07:57:25Z lslezak $ + * $Id: dialogs.ycp 34926 2006-12-13 07:08:31Z lslezak $ */ { @@ -19,6 +19,7 @@ import "StorageDevices"; import "Arch"; import "Label"; + import "URL"; include "cd-creator/helps.ycp"; @@ -486,12 +487,40 @@ { integer SrcID = (integer)UI::QueryWidget(`id(`table), `CurrentItem); - if (!contains(selected_items, SrcID)) + // Check architecture + map general = Pkg::SourceGeneralData(SrcID); + string source_path = URL::Parse(general["url"]:"")["path"]:""; + y2internal("source_path: %1", source_path); + + map<string,string> read_content = (map<string,string>)SCR::Read(.content_file, source_path + "/content"); + y2internal("Read content files: %1", read_content); + + boolean found_architecture = false; + foreach(string key, string value, read_content, + { + if (key == "ARCH." + Arch::architecture()) + { + found_architecture = true; + break; + } + } + ); + + y2milestone("Architecture %1 is supported: %2", Arch::architecture(), found_architecture); + + if (found_architecture) { - selected_items = add (selected_items, SrcID ); - } + if (!contains(selected_items, SrcID)) + { + selected_items = add (selected_items, SrcID ); + } - UI::ChangeWidget(`id(`table), `Item(SrcID, 0) , _("X")); + UI::ChangeWidget(`id(`table), `Item(SrcID, 0) , _("X")); + } + else + { + Report::Error(sformat(_("The source does not support architecture of this machine (%1).\nSelect another source."), Arch::architecture())); + } } else if (ret == `remove) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-cd-creator-2.14.0/testsuite/Makefile.in new/yast2-cd-creator-2.15.0/testsuite/Makefile.in --- old/yast2-cd-creator-2.14.0/testsuite/Makefile.in 2006-10-30 13:59:48.000000000 +0100 +++ new/yast2-cd-creator-2.15.0/testsuite/Makefile.in 2006-12-13 08:15:38.000000000 +0100 @@ -101,6 +101,7 @@ STYLESHEET_YDOC = @STYLESHEET_YDOC@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ +Y2DEVTOOLS_PREFIX = @Y2DEVTOOLS_PREFIX@ YCPC = @YCPC@ YCPDOC = @YCPDOC@ YCPMAKEDEP = @YCPMAKEDEP@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 freesci
by root＠suse.de 14 Dec '06

14 Dec '06

Hello community, here is the log from the commit of package freesci checked in at Thu Dec 14 01:19:15 CET 2006. -------- --- freesci/freesci.changes 2006-08-08 05:14:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/freesci/freesci.changes 2006-12-13 15:59:26.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Dec 13 15:12:07 CET 2006 - sndirsch(a)suse.de + +- back to stable release 0.3.5 since 0.6.2 is lacking savegame + support and still has many known bugs + +------------------------------------------------------------------- Old: ---- freesci-0.6.2-printf.diff freesci-0.6.2-return.diff freesci-0.6.2.diff freesci-0.6.2.tar.bz2 New: ---- freesci-0.3.5-printf.diff freesci-0.3.5-return.diff freesci-0.3.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freesci.spec ++++++ --- /var/tmp/diff_new_pack.aCvFd7/_old 2006-12-14 01:18:59.000000000 +0100 +++ /var/tmp/diff_new_pack.aCvFd7/_new 2006-12-14 01:18:59.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package freesci (Version 0.6.2) +# spec file for package freesci (Version 0.3.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,14 +13,13 @@ Name: freesci BuildRequires: SDL-devel readline-devel xorg-x11 URL: http://freesci.linuxgames.com/ -License: GPL +License: GNU General Public License (GPL) Group: Amusements/Games/Other Autoreqprov: on -Version: 0.6.2 -Release: 3 +Version: 0.3.5 +Release: 2 Summary: Interpreter for Not-So-Early Sierra Adventure Games Source: %name-%version.tar.bz2 -Patch: %name-%version.diff Patch1: %name-%version-return.diff Patch2: %name-%version-printf.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,7 +57,6 @@ %prep %setup -q -%patch %patch1 -p1 %patch2 -p0 @@ -79,10 +77,9 @@ %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README README.Unix THANKS TODO /usr/share/games/freesci -/usr/bin/bdftofont -/usr/bin/fonttoc /usr/bin/freesci /usr/bin/freesci-setup +/usr/bin/sciconsole /usr/bin/scidisasm /usr/bin/sciunpack /usr/bin/scipack @@ -91,6 +88,9 @@ %_mandir/man6/freesci.6.gz %changelog -n freesci +* Wed Dec 13 2006 - sndirsch(a)suse.de +- back to stable release 0.3.5 since 0.6.2 is lacking savegame + support and still has many known bugs * Tue Aug 08 2006 - sndirsch(a)suse.de - fixed printf arguments (Bug #197500) * Tue Jun 27 2006 - sndirsch(a)suse.de ++++++ freesci-0.6.2-printf.diff -> freesci-0.3.5-printf.diff ++++++ ++++++ freesci-0.6.2-return.diff -> freesci-0.3.5-return.diff ++++++ --- freesci/freesci-0.6.2-return.diff 2006-06-27 12:56:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/freesci/freesci-0.3.5-return.diff 2006-12-13 15:52:31.000000000 +0100 @@ -27,142 +27,13 @@ } static int -diff -u -r freesci-0.6.2.orig/src/engine/kgraphics.c freesci-0.6.2/src/engine/kgraphics.c ---- freesci-0.6.2.orig/src/engine/kgraphics.c 2006-06-05 11:54:54.000000000 +0200 -+++ freesci-0.6.2/src/engine/kgraphics.c 2006-06-05 12:15:26.071223194 +0200 -@@ -285,6 +285,7 @@ - color, s->gfx_state->pic_nr, KERNEL_COLORS_NR); - BREAKPOINT(); - } -+ return NULL; - } - - static gfx_color_t -@@ -1400,6 +1401,7 @@ - SCIkdebug(SCIkWARNING, "Unimplemented subfunction: %d\n", UKPV(0)); - return s->r_acc; - } -+ return s->r_acc; - } - - static void -diff -u -r freesci-0.6.2.orig/src/engine/savegame.c freesci-0.6.2/src/engine/savegame.c ---- freesci-0.6.2.orig/src/engine/savegame.c 2006-06-05 11:54:54.000000000 +0200 -+++ freesci-0.6.2/src/engine/savegame.c 2006-06-05 11:58:39.211506538 +0200 -@@ -69,6 +69,7 @@ - - scanf(lastval, PREG, &segment, &offset); - *foo = make_reg(segment, offset); -+ return 0; - } - - void -diff -u -r freesci-0.6.2.orig/src/engine/scriptdebug.c freesci-0.6.2/src/engine/scriptdebug.c ---- freesci-0.6.2.orig/src/engine/scriptdebug.c 2006-06-05 11:54:54.000000000 +0200 -+++ freesci-0.6.2/src/engine/scriptdebug.c 2006-06-05 12:21:51.731709358 +0200 -@@ -277,6 +277,7 @@ - } - - sci01_song_header_dump(song->data, song->size); -+ return 0; - } - - int c_sfx_01_track(state_t *s) -@@ -294,6 +295,7 @@ - } - - midi_hexdump(song->data + offset, song->size, offset); -+ return 0; - } - - -@@ -685,6 +687,7 @@ - sm_set_lockers(&(s->seg_manager), nr, 0, SEG_ID); - // _sm_deallocate(&(s->seg_manager), nr, 1); - } -+ return 0; - } - - static int -@@ -728,6 +731,7 @@ - _c_single_seg_info(s, s->seg_manager.heap[i]); - sciprintf("\n"); - } -+ return 0; - } - - int -@@ -1820,6 +1824,7 @@ - sleep(1); /* Yield to the scheduler, at least a bit */ - atexit(_codebug_kill_children); +--- freesci-0.3.5/src/sound/pcmout_alsa.c.orig 2006-12-13 15:48:33.927091041 +0100 ++++ freesci-0.3.5/src/sound/pcmout_alsa.c 2006-12-13 15:51:47.761635101 +0100 +@@ -138,6 +138,7 @@ + printf("ALSA: Error setting HW params.\n"); + return -1; } + return 0; } - #endif -@@ -2334,6 +2339,7 @@ - - return 0; - #endif -+ return 0; - } - - -@@ -3180,6 +3186,7 @@ - } - - sciprintf("%s\n", invalid ? " (invalid)" : ""); -+ return 0; - } - - int -@@ -3306,6 +3313,7 @@ - apply_to_reg_t_hash_map(use_map, NULL, print_all_of_them); - - free_reg_t_hash_map (use_map); -+ return 0; - } - - -diff -u -r freesci-0.6.2.orig/src/engine/sys_strings.c freesci-0.6.2/src/engine/sys_strings.c ---- freesci-0.6.2.orig/src/engine/sys_strings.c 2006-06-05 11:54:54.000000000 +0200 -+++ freesci-0.6.2/src/engine/sys_strings.c 2006-06-05 11:56:56.509484299 +0200 -@@ -68,6 +68,7 @@ - - strncpy(str->value, value, str->max_size); - str->value[str->max_size] = 0; /* Make sure to terminate */ -+ return 0; - } - - void -diff -u -r freesci-0.6.2.orig/src/gfx/resource/sci_pic_0.c freesci-0.6.2/src/gfx/resource/sci_pic_0.c -diff -u -r freesci-0.6.2.orig/src/tools/bdftofont.c freesci-0.6.2/src/tools/bdftofont.c ---- freesci-0.6.2.orig/src/tools/bdftofont.c 2006-06-05 11:54:53.000000000 +0200 -+++ freesci-0.6.2/src/tools/bdftofont.c 2006-06-05 12:22:22.772275645 +0200 -@@ -178,4 +178,5 @@ - perror(argv[1]); - - bdf_cleanup(); -+ return 0; - } -diff -u -r freesci-0.6.2.orig/src/tools/fonttoc.c freesci-0.6.2/src/tools/fonttoc.c ---- freesci-0.6.2.orig/src/tools/fonttoc.c 2006-06-05 11:54:53.000000000 +0200 -+++ freesci-0.6.2/src/tools/fonttoc.c 2006-06-05 12:22:46.929046971 +0200 -@@ -260,5 +260,6 @@ - convert_font(f, argv[2], fopen(argv[3], "w")); - else - perror(argv[1]); -+ return 0; - - } ---- freesci-0.6.2/src/sfx/core.c.orig 2006-06-27 12:52:44.712769541 +0200 -+++ freesci-0.6.2/src/sfx/core.c 2006-06-27 12:55:21.064585804 +0200 -@@ -672,7 +672,7 @@ - #endif - if (!it) { - fprintf(stderr, "[SFX] Attempt to add empty song with handle %08lx\n", handle); -- return; -+ return -1; - } - it->init(it); ++++++ freesci-0.6.2.tar.bz2 -> freesci-0.3.5.tar.bz2 ++++++ ++++ 134642 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 libvirt
by root＠suse.de 13 Dec '06

13 Dec '06

Hello community, here is the log from the commit of package libvirt checked in at Wed Dec 13 01:32:23 CET 2006. -------- --- arch/i386/libvirt/libvirt.changes 2006-10-20 21:02:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/libvirt/libvirt.changes 2006-12-13 01:31:04.000000000 +0100 @@ -1,0 +2,26 @@ +Fri Dec 8 16:28:42 MST 2006 - jfehlig(a)novell.com + +- Updated to latest release, version 0.1.9. + - python bindings: release interpeter lock when calling C (Daniel Berrange) + - don't raise HTTP error when looking informations for a domain + - some refactoring to use the driver for all entry points + - better error reporting (Daniel Berrange) + - fix OS reporting when running as non-root + - provide XML parsing errors + - extension of the test framework (Daniel Berrange) + - fix the reconnect regression test + - python bindings: Domain instances now link to the Connect to avoid garbage collection and disconnect + - separate the notion of maximum memory and current use at the XML level + - Fix a memory leak (Daniel Berrange) + - add support for shareable drives + - add support for non-bridge style networking configs for guests(Daniel Berrange) + - python bindings: fix unsigned long marshalling (Daniel Berrange) + - new config APIs virConfNew() and virConfSetValue() to build configs from scratch + - hot plug device support based on Michel Ponceau patch + - added support for inactive domains, new APIs, various associated cleanup (Daniel Berrange) + - special device model for HVM guests (Daniel Berrange) + - add API to dump core of domains (but requires a patched xend) + - pygrub bootloader informations take over <os> informations + - updated the localization strings + +------------------------------------------------------------------- @@ -4,0 +31,13 @@ + - Bug for system with page size != 4k + - vcpu number initialization (Philippe Berthault) + - don't label crashed domains as shut off (Peter Vetere) + - fix virsh man page (Noriko Mizumoto) + - blktapdd support for alternate drivers like blktap (Daniel Berrange) + - memory leak fixes (xend interface and XML parsing) (Daniel Berrange) + - compile fix + - mlock/munlock size fixes (Daniel Berrange) + - improve error reporting +- Updated to latest release, version 0.1.7. + - fix a memory bug on getting vcpu informations from xend (Daniel Berrange) + - fix another problem in the hypercalls change in Xen changeset + 86d26e6ec89b when getting domain informations (Daniel Berrange) Old: ---- libvirt-0.1.8.tar.gz New: ---- libvirt-0.1.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt.spec ++++++ --- /var/tmp/diff_new_pack.PEyi8j/_old 2006-12-13 01:31:36.000000000 +0100 +++ /var/tmp/diff_new_pack.PEyi8j/_new 2006-12-13 01:31:36.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libvirt (Version 0.1.8) +# spec file for package libvirt (Version 0.1.9) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Development/Libraries/C and C++ Autoreqprov: yes -Version: 0.1.8 +Version: 0.1.9 Release: 1 Summary: A C toolkit to interract with the virtualization capabilities of Linux Source0: libvirt-%{version}.tar.gz @@ -103,6 +103,13 @@ cat > $RPM_BUILD_ROOT/etc/permissions.d/libvirt <<EOF %{_libdir}/libvirt_proxy root.root 4755 EOF +rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/as +rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/hy +rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/my +rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/no +rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/or +rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/si +rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/ur %clean %{__rm} -rf $RPM_BUILD_ROOT @@ -121,9 +128,10 @@ %doc %{_datadir}/doc/libvirt-%{version}/html/* %dir %{_datadir}/doc/libvirt-%{version} %dir %{_datadir}/doc/libvirt-%{version}/html +#%dir %{_datadir}/locale/* /etc/permissions.d/libvirt # Localization files -%{_datadir}/locale/en_GB/LC_MESSAGES/* +%{_datadir}/locale/*/LC_MESSAGES/* %files devel %defattr(-, root, root) @@ -157,8 +165,44 @@ %doc docs/examples/python %changelog -n libvirt +* Fri Dec 08 2006 - jfehlig(a)novell.com +- Updated to latest release, version 0.1.9. + - python bindings: release interpeter lock when calling C (Daniel Berrange) + - don't raise HTTP error when looking informations for a domain + - some refactoring to use the driver for all entry points + - better error reporting (Daniel Berrange) + - fix OS reporting when running as non-root + - provide XML parsing errors + - extension of the test framework (Daniel Berrange) + - fix the reconnect regression test + - python bindings: Domain instances now link to the Connect to avoid garbage collection and disconnect + - separate the notion of maximum memory and current use at the XML level + - Fix a memory leak (Daniel Berrange) + - add support for shareable drives + - add support for non-bridge style networking configs for guests(Daniel Berrange) + - python bindings: fix unsigned long marshalling (Daniel Berrange) + - new config APIs virConfNew() and virConfSetValue() to build configs from scratch + - hot plug device support based on Michel Ponceau patch + - added support for inactive domains, new APIs, various associated cleanup (Daniel Berrange) + - special device model for HVM guests (Daniel Berrange) + - add API to dump core of domains (but requires a patched xend) + - pygrub bootloader informations take over <os> informations + - updated the localization strings * Fri Oct 20 2006 - jfehlig(a)novell.com - Updated to latest release, version 0.1.8. + - Bug for system with page size != 4k + - vcpu number initialization (Philippe Berthault) + - don't label crashed domains as shut off (Peter Vetere) + - fix virsh man page (Noriko Mizumoto) + - blktapdd support for alternate drivers like blktap (Daniel Berrange) + - memory leak fixes (xend interface and XML parsing) (Daniel Berrange) + - compile fix + - mlock/munlock size fixes (Daniel Berrange) + - improve error reporting +- Updated to latest release, version 0.1.7. + - fix a memory bug on getting vcpu informations from xend (Daniel Berrange) + - fix another problem in the hypercalls change in Xen changeset + 86d26e6ec89b when getting domain informations (Daniel Berrange) * Tue Sep 26 2006 - jfehlig(a)novell.com - Updated to latest release, version 0.1.6. This release includes fix in hypercall driver so local patch has been removed. ++++++ libvirt-0.1.8.tar.gz -> libvirt-0.1.9.tar.gz ++++++ ++++ 118449 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 openssh
by root＠suse.de 13 Dec '06

13 Dec '06

Hello community, here is the log from the commit of package openssh checked in at Wed Dec 13 01:26:17 CET 2006. -------- --- openssh/openssh-askpass-gnome.changes 2006-10-04 12:58:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/openssh/openssh-askpass-gnome.changes 2006-12-13 01:25:42.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Dec 12 14:44:41 CET 2006 - anicka(a)suse.cz + +- update to 4.5p1 + * Use privsep_pw if we have it, but only require it if we + absolutely need it. + * Correctly check for bad signatures in the monitor, otherwise + the monitor and the unpriv process can get out of sync. + * Clear errno before calling the strtol functions. + * exit instead of doing a blocking tcp send if we detect + a client/server timeout, since the tcp sendqueue might + be already full (of alive requests) + * include signal.h, errno.h, sys/in.h + * some more bugfixes + +------------------------------------------------------------------- --- openssh/openssh.changes 2006-11-22 13:42:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/openssh/openssh.changes 2006-12-12 14:44:00.000000000 +0100 @@ -1,0 +2,15 @@ +Tue Dec 12 14:41:45 CET 2006 - anicka(a)suse.cz + +- update to 4.5p1 + * Use privsep_pw if we have it, but only require it if we + absolutely need it. + * Correctly check for bad signatures in the monitor, otherwise + the monitor and the unpriv process can get out of sync. + * Clear errno before calling the strtol functions. + * exit instead of doing a blocking tcp send if we detect + a client/server timeout, since the tcp sendqueue might + be already full (of alive requests) + * include signal.h, errno.h, sys/in.h + * some more bugfixes + +------------------------------------------------------------------- Old: ---- openssh-4.4p1-addrlist.dif openssh-4.4p1-askpass-fix.diff openssh-4.4p1-blocksigalrm.diff openssh-4.4p1-eal3.diff openssh-4.4p1-engines.diff openssh-4.4p1-gcc-fix.patch openssh-4.4p1-gssapimitm.patch openssh-4.4p1-pam-fix2.diff openssh-4.4p1-pam-fix3.diff openssh-4.4p1-pwname-home.diff openssh-4.4p1-saveargv-fix.diff openssh-4.4p1-secfix4.5.diff openssh-4.4p1-send_locale.diff openssh-4.4p1-strict-aliasing-fix.diff openssh-4.4p1-tmpdir.diff openssh-4.4p1-xauth.diff openssh-4.4p1-xauthlocalhostname.diff openssh-4.4p1.dif openssh-4.4p1.tar.bz2 New: ---- openssh-4.5p1-addrlist.dif openssh-4.5p1-askpass-fix.diff openssh-4.5p1-blocksigalrm.diff openssh-4.5p1-eal3.diff openssh-4.5p1-engines.diff openssh-4.5p1-gcc-fix.patch openssh-4.5p1-gssapimitm.patch openssh-4.5p1-pam-fix2.diff openssh-4.5p1-pam-fix3.diff openssh-4.5p1-pwname-home.diff openssh-4.5p1-saveargv-fix.diff openssh-4.5p1-send_locale.diff openssh-4.5p1-strict-aliasing-fix.diff openssh-4.5p1-tmpdir.diff openssh-4.5p1-xauth.diff openssh-4.5p1-xauthlocalhostname.diff openssh-4.5p1.dif openssh-4.5p1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssh-askpass-gnome.spec ++++++ --- /var/tmp/diff_new_pack.m4HXis/_old 2006-12-13 01:25:58.000000000 +0100 +++ /var/tmp/diff_new_pack.m4HXis/_new 2006-12-13 01:25:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package openssh-askpass-gnome (Version 4.4p1) +# spec file for package openssh-askpass-gnome (Version 4.5p1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -14,8 +14,8 @@ BuildRequires: gtk2-devel krb5-devel opensc-devel openssh openssl-devel pam-devel tcpd-devel update-desktop-files License: Other License(s), see package Group: Productivity/Networking/SSH -Version: 4.4p1 -Release: 23 +Version: 4.5p1 +Release: 1 Requires: openssh = %{version} openssh-askpass = %{version} Autoreqprov: on Summary: A GNOME-Based Passphrase Dialog for OpenSSH @@ -111,6 +111,18 @@ %attr(0755,root,root) /usr/%_lib/ssh/gnome-ssh-askpass %changelog -n openssh-askpass-gnome +* Tue Dec 12 2006 - anicka(a)suse.cz +- update to 4.5p1 + * Use privsep_pw if we have it, but only require it if we + absolutely need it. + * Correctly check for bad signatures in the monitor, otherwise + the monitor and the unpriv process can get out of sync. + * Clear errno before calling the strtol functions. + * exit instead of doing a blocking tcp send if we detect + a client/server timeout, since the tcp sendqueue might + be already full (of alive requests) + * include signal.h, errno.h, sys/in.h + * some more bugfixes * Wed Oct 04 2006 - postadal(a)suse.cz - updated to version 4.4p1 [#208662] * fixed pre-authentication DoS, that would cause sshd(8) to spin ++++++ openssh.spec ++++++ --- /var/tmp/diff_new_pack.m4HXis/_old 2006-12-13 01:25:58.000000000 +0100 +++ /var/tmp/diff_new_pack.m4HXis/_new 2006-12-13 01:25:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package openssh (Version 4.4p1) +# spec file for package openssh (Version 4.5p1) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -27,8 +27,8 @@ PreReq: /usr/sbin/groupadd /usr/sbin/useradd %insserv_prereq %fillup_prereq /bin/mkdir /bin/cat permissions Conflicts: nonfreessh Autoreqprov: on -Version: 4.4p1 -Release: 22 +Version: 4.5p1 +Release: 1 %define xversion 1.2.4.1 Summary: Secure Shell Client and Server (Remote Login Program) URL: http://www.openssh.com/ @@ -59,7 +59,6 @@ Patch40: %{name}-%{version}-xauth.diff Patch41: %{name}-%{version}-gcc-fix.patch Patch42: %{name}-gssapi_krb5-fix.patch -Patch43: %{name}-%{version}-secfix4.5.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %package askpass Summary: A passphrase dialog for OpenSSH and the X Window System @@ -146,7 +145,6 @@ %patch40 %patch41 %patch42 -%patch43 cp -v %{SOURCE4} . cp -v %{SOURCE6} . cd ../x11-ssh-askpass-%{xversion} @@ -284,6 +282,18 @@ %config %_appdefdir/SshAskpass %changelog -n openssh +* Tue Dec 12 2006 - anicka(a)suse.cz +- update to 4.5p1 + * Use privsep_pw if we have it, but only require it if we + absolutely need it. + * Correctly check for bad signatures in the monitor, otherwise + the monitor and the unpriv process can get out of sync. + * Clear errno before calling the strtol functions. + * exit instead of doing a blocking tcp send if we detect + a client/server timeout, since the tcp sendqueue might + be already full (of alive requests) + * include signal.h, errno.h, sys/in.h + * some more bugfixes * Wed Nov 22 2006 - anicka(a)suse.cz - fixed README.SuSE [#223025] * Thu Nov 09 2006 - anicka(a)suse.cz ++++++ openssh-4.4p1-addrlist.dif -> openssh-4.5p1-addrlist.dif ++++++ ++++++ openssh-4.4p1-askpass-fix.diff -> openssh-4.5p1-askpass-fix.diff ++++++ ++++++ openssh-4.4p1-blocksigalrm.diff -> openssh-4.5p1-blocksigalrm.diff ++++++ ++++++ openssh-4.4p1-eal3.diff -> openssh-4.5p1-eal3.diff ++++++ --- openssh/openssh-4.4p1-eal3.diff 2006-11-09 13:57:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/openssh/openssh-4.5p1-eal3.diff 2006-12-12 13:56:43.000000000 +0100 @@ -1,5 +1,5 @@ ---- openssh-4.4p1/sshd.8 -+++ openssh-4.4p1/sshd.8 +--- openssh-4.5p1/sshd.8 ++++ openssh-4.5p1/sshd.8 @@ -739,7 +739,7 @@ The file format is described in .Xr moduli 5 . @@ -28,8 +28,8 @@ .Xr sshd_config 5 , .Xr inetd 8 , .Xr sftp-server 8 ---- openssh-4.4p1/sshd_config.5 -+++ openssh-4.4p1/sshd_config.5 +--- openssh-4.5p1/sshd_config.5 ++++ openssh-4.5p1/sshd_config.5 @@ -169,9 +169,6 @@ By default, no banner is displayed. .It Cm ChallengeResponseAuthentication ++++++ openssh-4.4p1-engines.diff -> openssh-4.5p1-engines.diff ++++++ --- openssh/openssh-4.4p1-engines.diff 2006-11-09 13:57:59.000000000 +0100 +++ /mounts/work_src_done/STABLE/openssh/openssh-4.5p1-engines.diff 2006-12-12 13:56:43.000000000 +0100 @@ -2,8 +2,8 @@ # -- mludvig(a)suse.cz Index: openssh-3.8p1/ssh-add.c ================================================================================ ---- openssh-4.4p1/ssh-add.c -+++ openssh-4.4p1/ssh-add.c +--- openssh-4.5p1/ssh-add.c ++++ openssh-4.5p1/ssh-add.c @@ -42,6 +42,7 @@ #include <sys/param.h> @@ -23,8 +23,8 @@ /* At first, get a connection to the authentication agent. */ ac = ssh_get_authentication_connection(); if (ac == NULL) { ---- openssh-4.4p1/ssh-agent.c -+++ openssh-4.4p1/ssh-agent.c +--- openssh-4.5p1/ssh-agent.c ++++ openssh-4.5p1/ssh-agent.c @@ -51,6 +51,7 @@ #include <openssl/evp.h> @@ -44,8 +44,8 @@ __progname = ssh_get_progname(av[0]); init_rng(); seed_rng(); ---- openssh-4.4p1/ssh-keygen.c -+++ openssh-4.4p1/ssh-keygen.c +--- openssh-4.5p1/ssh-keygen.c ++++ openssh-4.5p1/ssh-keygen.c @@ -21,6 +21,7 @@ #include <openssl/evp.h> @@ -54,7 +54,7 @@ #include <errno.h> #include <fcntl.h> -@@ -1073,6 +1074,11 @@ +@@ -1074,6 +1075,11 @@ __progname = ssh_get_progname(av[0]); SSLeay_add_all_algorithms(); @@ -66,8 +66,8 @@ log_init(av[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1); init_rng(); ---- openssh-4.4p1/ssh-keysign.c -+++ openssh-4.4p1/ssh-keysign.c +--- openssh-4.5p1/ssh-keysign.c ++++ openssh-4.5p1/ssh-keysign.c @@ -38,6 +38,7 @@ #include <openssl/evp.h> #include <openssl/rand.h> @@ -88,8 +88,8 @@ for (i = 0; i < 256; i++) rnd[i] = arc4random(); RAND_seed(rnd, sizeof(rnd)); ---- openssh-4.4p1/ssh.c -+++ openssh-4.4p1/ssh.c +--- openssh-4.5p1/ssh.c ++++ openssh-4.5p1/ssh.c @@ -72,6 +72,7 @@ #include <openssl/evp.h> @@ -109,8 +109,8 @@ /* Initialize the command to execute on remote host. */ buffer_init(&command); ---- openssh-4.4p1/sshd.c -+++ openssh-4.4p1/sshd.c +--- openssh-4.5p1/sshd.c ++++ openssh-4.5p1/sshd.c @@ -75,6 +75,7 @@ #include <openssl/bn.h> #include <openssl/md5.h> ++++++ openssh-4.4p1-gcc-fix.patch -> openssh-4.5p1-gcc-fix.patch ++++++ ++++++ openssh-4.4p1-gssapimitm.patch -> openssh-4.5p1-gssapimitm.patch ++++++ ++++++ openssh-4.4p1-pam-fix2.diff -> openssh-4.5p1-pam-fix2.diff ++++++ ++++++ openssh-4.4p1-pam-fix2.diff -> openssh-4.5p1-pam-fix3.diff ++++++ --- openssh/openssh-4.4p1-pam-fix2.diff 2006-11-09 13:57:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/openssh/openssh-4.5p1-pam-fix3.diff 2006-12-12 13:56:42.000000000 +0100 @@ -1,20 +1,13 @@ ---- sshd_config -+++ sshd_config -@@ -53,7 +53,7 @@ - #IgnoreRhosts yes - - # To disable tunneled clear text passwords, change to no here! --#PasswordAuthentication yes -+PasswordAuthentication no - #PermitEmptyPasswords no - - # Change to no to disable s/key passwords -@@ -78,7 +78,7 @@ - # If you just want the PAM account and session checks to run without - # PAM authentication, then enable this but set PasswordAuthentication - # and ChallengeResponseAuthentication to 'no'. --#UsePAM no -+UsePAM yes - - #AllowTcpForwarding yes - #GatewayPorts no +--- auth-pam.c ++++ auth-pam.c +@@ -785,7 +785,9 @@ + fatal("Internal error: PAM auth " + "succeeded when it should have " + "failed"); +- import_environments(&buffer); ++#ifndef USE_POSIX_THREADS ++ import_environments(&buffer); ++#endif + *num = 0; + **echo_on = 0; + ctxt->pam_done = 1; ++++++ openssh-4.4p1-pwname-home.diff -> openssh-4.5p1-pwname-home.diff ++++++ --- openssh/openssh-4.4p1-pwname-home.diff 2006-11-09 13:58:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/openssh/openssh-4.5p1-pwname-home.diff 2006-12-12 13:56:45.000000000 +0100 @@ -1,5 +1,5 @@ ---- openssh-4.4p1/misc.c -+++ openssh-4.4p1/misc.c +--- openssh-4.5p1/misc.c ++++ openssh-4.5p1/misc.c @@ -186,6 +186,29 @@ return (old); } @@ -39,8 +39,8 @@ fatal("tilde_expand_filename: No such uid %d", uid); if (strlcpy(ret, pw->pw_dir, sizeof(ret)) >= sizeof(ret)) ---- openssh-4.4p1/misc.h -+++ openssh-4.4p1/misc.h +--- openssh-4.5p1/misc.h ++++ openssh-4.5p1/misc.h @@ -34,6 +34,7 @@ char *tohex(const void *, size_t); void sanitise_stdfd(void); @@ -49,8 +49,8 @@ struct passwd *pwcopy(struct passwd *); typedef struct arglist arglist; ---- openssh-4.4p1/ssh.c -+++ openssh-4.4p1/ssh.c +--- openssh-4.5p1/ssh.c ++++ openssh-4.5p1/ssh.c @@ -249,7 +249,7 @@ } #endif ++++++ openssh-4.4p1-saveargv-fix.diff -> openssh-4.5p1-saveargv-fix.diff ++++++ ++++++ openssh-4.4p1-send_locale.diff -> openssh-4.5p1-send_locale.diff ++++++ ++++++ openssh-4.4p1-strict-aliasing-fix.diff -> openssh-4.5p1-strict-aliasing-fix.diff ++++++ ++++++ openssh-4.4p1-tmpdir.diff -> openssh-4.5p1-tmpdir.diff ++++++ ++++++ openssh-4.4p1-xauth.diff -> openssh-4.5p1-xauth.diff ++++++ ++++++ openssh-4.4p1-xauthlocalhostname.diff -> openssh-4.5p1-xauthlocalhostname.diff ++++++ ++++++ openssh-4.4p1-addrlist.dif -> openssh-4.5p1.dif ++++++ --- openssh/openssh-4.4p1-addrlist.dif 2006-11-09 13:57:57.000000000 +0100 +++ /mounts/work_src_done/STABLE/openssh/openssh-4.5p1.dif 2006-12-12 13:56:41.000000000 +0100 @@ -1,87 +1,45 @@ ---- sshd.c -+++ sshd.c -@@ -253,6 +253,62 @@ +--- ssh_config ++++ ssh_config +@@ -17,9 +17,20 @@ + # list of available options, their meanings and defaults, please see the + # ssh_config(5) man page. - static void do_ssh1_kex(void); - static void do_ssh2_kex(void); -+char * isaddr(struct addrinfo *addr, char *name); -+void remove_duplicities(struct addrinfo *addr, char *port); -+ -+/* -+ * returns port if addr equals name -+ */ -+ -+char* -+isaddr(struct addrinfo *addr, char *name) -+{ -+ char ntop[NI_MAXHOST]; -+ char *strport; -+ -+ strport = (char*) malloc(NI_MAXSERV+1); -+ if (getnameinfo(addr->ai_addr, addr->ai_addrlen, -+ ntop, sizeof(ntop), strport, sizeof(strport), -+ NI_NUMERICHOST|NI_NUMERICSERV) != 0) { -+ error("getnameinfo failed"); -+ free(strport); -+ return NULL; -+ } -+ if (!strcmp(ntop,name)) -+ return strport; -+ else{ -+ free(strport); -+ return NULL; -+ } -+ -+} -+ -+/* -+ * it removes all "0.0.0.0" elements with given port -+ * from the list -+ */ -+ -+void -+remove_duplicities(struct addrinfo *ai_start, char *port) -+{ -+ struct addrinfo *ai, *ai1, *aiprev, *ainext; -+ char *port1; -+ -+ aiprev=ai_start; -+ for (ai = ai_start->ai_next; ai; ai = ainext) { -+ ainext = ai->ai_next; -+ port1 = isaddr(ai, "0.0.0.0"); -+ if (port1 && !strcmp(port,port1)){ -+ aiprev->ai_next = ainext; -+ free(ai); -+ free(port1); -+ } else { -+ if (port1) -+ free(port1); -+ aiprev = ai; -+ } -+ } -+} - - /* - * Close all listening sockets -@@ -941,6 +997,7 @@ - int ret, listen_sock, on = 1; - struct addrinfo *ai; - char ntop[NI_MAXHOST], strport[NI_MAXSERV]; -+ char *port; +-# Host * ++Host * + # ForwardAgent no + # ForwardX11 no ++ ++# If you do not trust your remote host (or its administrator), you ++# should not forward X11 connections to your local X11-display for ++# security reasons: Someone stealing the authentification data on the ++# remote side (the "spoofed" X-server by the remote sshd) can read your ++# keystrokes as you type, just like any other X11 client could do. ++# Set this to "no" here for global effect or in your own ~/.ssh/config ++# file if you want to have the remote X11 authentification data to ++# expire after two minutes after remote login. ++ForwardX11Trusted yes ++ + # RhostsRSAAuthentication no + # RSAAuthentication yes + # PasswordAuthentication yes +--- sshd_config ++++ sshd_config +@@ -82,7 +82,7 @@ - for (ai = options.listen_addrs; ai; ai = ai->ai_next) { - if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) -@@ -986,6 +1043,13 @@ - continue; - } - listen_socks[num_listen_socks] = listen_sock; -+ -+ port = isaddr(ai,"::"); -+ if (port) { -+ remove_duplicities(ai, port); -+ free(port); -+ } -+ - num_listen_socks++; + #AllowTcpForwarding yes + #GatewayPorts no +-#X11Forwarding no ++X11Forwarding yes + #X11DisplayOffset 10 + #X11UseLocalhost yes + #PrintMotd yes +--- sshlogin.c ++++ sshlogin.c +@@ -126,6 +126,7 @@ - /* Start listening on the port. */ + li = login_alloc_entry(pid, user, host, tty); + login_set_addr(li, addr, addrlen); ++ li->uid=uid; + login_login(li); + login_free_entry(li); + } ++++++ openssh-4.4p1.tar.bz2 -> openssh-4.5p1.tar.bz2 ++++++ ++++ 7035 lines of diff (skipped) ++++++ openssh-gssapi_krb5-fix.patch ++++++ --- /var/tmp/diff_new_pack.m4HXis/_old 2006-12-13 01:26:00.000000000 +0100 +++ /var/tmp/diff_new_pack.m4HXis/_new 2006-12-13 01:26:00.000000000 +0100 @@ -1,6 +1,6 @@ --- configure.ac +++ configure.ac -@@ -3217,7 +3217,14 @@ +@@ -3220,7 +3220,14 @@ K5LIBS="-lgssapi $K5LIBS" ], [ AC_CHECK_LIB(gssapi_krb5,gss_init_sec_context, [ AC_DEFINE(GSSAPI) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 module-init-tools
by root＠suse.de 13 Dec '06

13 Dec '06

Hello community, here is the log from the commit of package module-init-tools checked in at Wed Dec 13 01:21:49 CET 2006. -------- --- module-init-tools/module-init-tools.changes 2006-11-06 15:52:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/module-init-tools/module-init-tools.changes 2006-12-12 21:12:33.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 12 21:12:13 CET 2006 - mmarek(a)suse.cz + +- fixed options-priority.diff [#226907] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ module-init-tools.spec ++++++ --- /var/tmp/diff_new_pack.zcOTgE/_old 2006-12-13 01:17:17.000000000 +0100 +++ /var/tmp/diff_new_pack.zcOTgE/_new 2006-12-13 01:17:17.000000000 +0100 @@ -13,9 +13,9 @@ Name: module-init-tools BuildRequires: dietlibc dietzlib Version: 3.2.2 -Release: 56 +Release: 63 %define ver 3.2.2 -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/Kernel Provides: modules modutils Obsoletes: modules modutils @@ -59,10 +59,8 @@ Authors: -------- - Bjorn Ekwall <bj0rn(a)blox.se> - Jon Tombs <jon(a)gtex02.us.es> - Bas Laarhoven <bas(a)vimec.nl> - Keith Owens <kaos(a)ocs.com.au> + Rusty Russell <rusty(a)rustcorp.com.au> + Adam J. Richter <adam(a)yggdrasil.com> %prep %setup -q -a10 -n %{name}-%{ver} @@ -152,6 +150,8 @@ /etc/modprobe.d %changelog -n module-init-tools +* Tue Dec 12 2006 - mmarek(a)suse.cz +- fixed options-priority.diff [#226907] * Mon Nov 06 2006 - nadvornik(a)suse.cz - do not remove weak-update symlinks on package update [#216454] * Fri Nov 03 2006 - olh(a)suse.de ++++++ module-init-tools-3.2.2-options-priority.diff ++++++ --- /var/tmp/diff_new_pack.zcOTgE/_old 2006-12-13 01:17:17.000000000 +0100 +++ /var/tmp/diff_new_pack.zcOTgE/_new 2006-12-13 01:17:17.000000000 +0100 @@ -1,26 +1,27 @@ --- modprobe.c +++ modprobe.c -@@ -808,6 +808,19 @@ +@@ -808,6 +808,20 @@ static char *append_option(char *options return options; } -+static char *prepend_option(char *oldoptions, const char *newoption) ++static char *prepend_option(char *options, const char *newoption) +{ -+ char *options; -+ -+ if (strlen(oldoptions)) -+ return oldoptions; -+ -+ options = NOFAIL(malloc(strlen(oldoptions) + 1 + strlen(newoption) + 1)); -+ sprintf(options, "%s %s", newoption, oldoptions); -+ free(oldoptions); ++ size_t l1, l2; ++ l1 = strlen(options); ++ l2 = strlen(newoption); ++ /* the resulting string will look like ++ * newoption + ' ' + options + '\0' */ ++ options = NOFAIL(realloc(options, l2 + 1 + l1 + 1)); ++ memmove(options + l2 + 1, options, l1 + 1); ++ options[l2] = ' '; ++ memcpy(options, newoption, l2); + return options; +} + /* Add to options */ static char *add_extra_options(const char *modname, char *optstring, -@@ -815,7 +828,7 @@ +@@ -815,7 +829,7 @@ static char *add_extra_options(const cha { while (options) { if (strcmp(options->modulename, modname) == 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