April 2011 - openSUSE Commits - openSUSE Mailing Lists

commit wireless-tools for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '11

22 Apr '11

Hello community, here is the log from the commit of package wireless-tools for openSUSE:Factory checked in at Fri Apr 22 22:50:00 CEST 2011. -------- --- wireless-tools/wireless-tools.changes 2010-12-01 16:40:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/wireless-tools/wireless-tools.changes 2011-02-08 13:48:49.000000000 +0100 @@ -2 +2,6 @@ -Wed Dec 1 16:31:59 CET 2010 - vlado(a)suse.cz +Tue Feb 8 13:46:48 CET 2011 - vbotka(a)suse.de + +- fixed typo in specfile; shall be /etc/modprobe.d/50-iwlagn.conf + +------------------------------------------------------------------- +Wed Dec 1 16:31:59 CET 2010 - vbotka(a)suse.cz @@ -8 +13 @@ -Fri Feb 5 20:22:05 CET 2010 - vlado(a)suse.cz +Fri Feb 5 20:22:05 CET 2010 - vbotka(a)suse.cz calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wireless-tools.spec ++++++ --- /var/tmp/diff_new_pack.8iwgSj/_old 2011-04-22 22:48:38.000000000 +0200 +++ /var/tmp/diff_new_pack.8iwgSj/_new 2011-04-22 22:48:38.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package wireless-tools (Version 30.pre8) +# spec file for package wireless-tools # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ Summary: Tools for a wireless LAN %define major_version 30 Version: %{major_version}.pre8 -Release: 14 +Release: 19 Group: Hardware/Wifi License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -116,7 +116,7 @@ mkdir -p %{buildroot}/etc/modprobe.d install -m644 %{SOURCE4} %{buildroot}/etc/modprobe.d/50-ipw2200.conf install -m644 %{SOURCE10} %{buildroot}/etc/modprobe.d/50-iwl3945.conf -install -m644 %{SOURCE11} %{buildroot}/etc/modprobe.d/50-iwagn.conf +install -m644 %{SOURCE11} %{buildroot}/etc/modprobe.d/50-iwlagn.conf %ifarch %ix86 x86_64 install -m644 %{SOURCE5} %{buildroot}/etc/modprobe.d/50-prism54.conf %endif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 docbook-xsl-stylesheets for openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '11

22 Apr '11

Hello community, here is the log from the commit of package docbook-xsl-stylesheets for openSUSE:Factory checked in at Fri Apr 22 22:49:55 CEST 2011. -------- --- docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes 2009-12-24 12:02:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes 2011-04-12 13:32:29.000000000 +0200 @@ -1,0 +2,15 @@ +Tue Apr 12 06:30:39 UTC 2011 - toms(a)suse.de + +- Update to 1.76.1; for news, see + http://lists.oasis-open.org/archives/docbook-apps/201011/msg00007.html +- Moved pdf2index and dbtoepub to /usr/bin +- Cleaned up Spec file to avoid rpmlint warnings +- Removed now obsolete chunktoc-fix.patch + +------------------------------------------------------------------- +Wed Apr 14 12:28:37 CEST 2010 - mmarek(a)suse.cz + +- chunktoc.xsl: Added missing namespace declarations. Closes + bug #2890069. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- docbook-xsl-1.75.2.tar.bz2 docbook-xsl-doc-1.75.2.tar.bz2 New: ---- docbook-xsl-1.76.1.tar.bz2 docbook-xsl-doc-1.76.1.tar.bz2 docbook-xsl-stylesheets-dbtoepub.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docbook-xsl-stylesheets.spec ++++++ --- /var/tmp/diff_new_pack.0A0b0T/_old 2011-04-22 22:48:35.000000000 +0200 +++ /var/tmp/diff_new_pack.0A0b0T/_new 2011-04-22 22:48:35.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package docbook-xsl-stylesheets (Version 1.75.2) +# spec file for package docbook-xsl-stylesheets # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,23 +17,25 @@ # norootforbuild +%define pack_vers 1.76.1 +%define regcat /usr/bin/sgml-register-catalog Name: docbook-xsl-stylesheets +Summary: XSL Stylesheets for DocBook 4 BuildRequires: fdupes sgml-skel unzip +BuildRequires: ruby License: MPL and X11 Group: Productivity/Publishing/DocBook AutoReqProv: on BuildArch: noarch Requires: xmlcharent docbook_4 -%define regcat /usr/bin/sgml-register-catalog +Requires: ruby PreReq: sgml-skel %{regcat} /usr/bin/xmlcatalog -Summary: XSL Stylesheets for DocBook 4 -Version: 1.75.2 -Release: 3 -Source0: http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{version}… +Version: 1.76.1 +Release: 1 +Source0: http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{pack_ver… Source1: http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-doc-%{vers… -# %define pack_vers snapshot -%define pack_vers %{version} +Patch0: %{name}-dbtoepub.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://sourceforge.net/projects/docbook/ @@ -59,7 +61,7 @@ %define INSTALL install -m755 -s %define INSTALL_DIR install -d -m755 %define INSTALL_DATA install -m644 -%define INSTALL_SCRIPT install -m755 -o root -g root +%define INSTALL_SCRIPT install -m755 %define sgml_dir %{_datadir}/sgml %define sgml_var_dir /var/lib/sgml %define sgml_mod_dir %{sgml_dir}/docbook @@ -78,16 +80,19 @@ %define xml_sysconf_dir %{_sysconfdir}/xml %prep -# %setup -q -n docbook-xsl-%{pack_vers} -b 10 +# %%setup -q -n docbook-xsl-%%{pack_vers} -b 10 %setup -q -n docbook-xsl-%{pack_vers} -b 1 -### snap -#unzip -a %{S:100} -#cp -a docbook-xsl-snapshot/* . -### snap end -# cp -p %{SOURCE1} README.SuSE -# cp %{S:2} fo +%patch0 -p1 + +# mv epub/bin/dbtoepub epub/bin/dbtoepub.tmp +sed -i 's=@@EPUBDIR@@=%{xml_mod_style_prod_dir}/current//epub/bin=' epub/bin/dbtoepub + +# We don't need these scripts: +rm -rf install.sh tools/bin/docbook-xsl-update + +find -type f -exec chmod -x {} \; chmod -R a+rX,g-w,o-w . -chmod -x images/*.{svg,png,gif,tif} images/callouts/*.{svg,png,gif} +chmod -x images/*.{svg,png,gif,tif} images/callouts/*.{svg,png,gif} extensions/docbook.py # Start cleanup (to avoid warnings for rpmlint [ -f ./extensions/saxon65/dist/saxon65.jar ] && rm -rf ./extensions/saxon65/dist/saxon65.jar [ -f ./extensions/xalan27/dist/xalan27.jar ] && rm -rf ./extensions/xalan27/dist/xalan27.jar @@ -105,8 +110,8 @@ %build xmlcatbin=/usr/bin/xmlcatalog CATALOG=%{name}.xml -# file:///usr/share/sgml/docbook/ = %{sgml_mod_dir} map it to -# %{xml_mod_style_prod_dir}/%{version} +# file:///usr/share/sgml/docbook/ = %%{sgml_mod_dir} map it to +# %%{xml_mod_style_prod_dir}/%%{version} $xmlcatbin --noout --create $CATALOG /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/%{version}" \ @@ -129,7 +134,7 @@ "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp # $xmlcatbin --noout --add "delegatePublic" \ # "-//OASIS//xxx" \ -# "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp +# "file:///$CATALOG" %%{FOR_ROOT_CAT}.tmp # Create tag sed '/<catalog/a\ <group id="%{name}-%{version}"> @@ -140,6 +145,13 @@ %install # FIXME: Danger!? export NO_BRP_CHECK_BYTECODE_VERSION=true + +# Install scripts +%{INSTALL_DIR} %{buildroot}%{_bindir} +%{INSTALL_SCRIPT} fo/pdf2index %{buildroot}%{_bindir} +%{INSTALL_SCRIPT} epub/bin/dbtoepub %{buildroot}%{_bindir} +rm fo/pdf2index epub/bin/dbtoepub + doc_dir=$RPM_BUILD_ROOT%{_defaultdocdir}/%{name} %{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_mod_style_prod_dir}/%{version} cp -a [[:lower:]]* $RPM_BUILD_ROOT%{xml_mod_style_prod_dir}/%{version} @@ -150,7 +162,7 @@ { pushd $RPM_BUILD_ROOT%{xml_mod_style_prod_dir} >/dev/null # do not create the current link for snapshots -# if ! echo %{S:0} | grep -q snapshot; then +# if ! echo %%{S:0} | grep -q snapshot; then ln -sf %{version} current echo %{xml_mod_style_prod_dir}/current # fi @@ -176,13 +188,13 @@ -not -path '%{buildroot}%{xml_mod_style_prod_dir}/%{version}/latex*' \ | sed 's|%{buildroot}||' } >> %{_builddir}/%{buildsubdir}/%{name}_list -# pushd %{buildroot}%{xml_mod_style_prod_dir} +# pushd %%{buildroot}%%{xml_mod_style_prod_dir} # rm -f docbook-xsl -# ln -sf docbook-xsl-stylesheets-%{version} docbook-xsl +# ln -sf docbook-xsl-stylesheets-%%{version} docbook-xsl # rm -f xsl-stylesheets -# ln -sf docbook-xsl-stylesheets-%{version} xsl-stylesheets -# rm -f %{name} -# ln -sf docbook-xsl-stylesheets-%{version} %{name} +# ln -sf docbook-xsl-stylesheets-%%{version} xsl-stylesheets +# rm -f %%{name} +# ln -sf docbook-xsl-stylesheets-%%{version} %%{name} # popd cat_dir=%{buildroot}/etc/xml %{INSTALL_DIR} $cat_dir @@ -195,8 +207,8 @@ chmod +x \ %{buildroot}%{xml_mod_style_prod_dir}/%{version}/extensions/docbook.py \ %{buildroot}%{xml_mod_style_prod_dir}/%{version}/extensions/xslt.py -# %{buildroot}%{xml_mod_style_prod_dir}/%{version}/epub/bin/lib/docbook.rb -# %{buildroot}%{xml_mod_style_prod_dir}/%{version}/epub/bin/spec/spec_helper.rb +# %%{buildroot}%%{xml_mod_style_prod_dir}/%%{version}/epub/bin/lib/docbook.rb +# %%{buildroot}%%{xml_mod_style_prod_dir}/%%{version}/epub/bin/spec/spec_helper.rb %post # remove empty dir if present (from ghost) @@ -227,6 +239,7 @@ %dir %{xml_mod_style_dir} %dir %{xml_mod_style_prod_dir} # it is now in the list: -# %{xml_mod_style_prod_dir}/current +# %%{xml_mod_style_prod_dir}/current +%{_bindir}/* %changelog ++++++ docbook-xsl-1.75.2.tar.bz2 -> docbook-xsl-1.76.1.tar.bz2 ++++++ ++++ 122968 lines of diff (skipped) ++++++ docbook-xsl-doc-1.75.2.tar.bz2 -> docbook-xsl-doc-1.76.1.tar.bz2 ++++++ ++++ 20230 lines of diff (skipped) ++++++ docbook-xsl-stylesheets-dbtoepub.patch ++++++ diff -ur docbook-xsl-1.76.1.orig/epub/bin/dbtoepub docbook-xsl-1.76.1/epub/bin/dbtoepub --- docbook-xsl-1.76.1.orig/epub/bin/dbtoepub 2010-09-13 23:59:41.000000000 +0200 +++ docbook-xsl-1.76.1/epub/bin/dbtoepub 2011-04-12 09:43:49.000000000 +0200 @@ -17,7 +17,7 @@ # layer (imports epub/docbook.xsl). # -v, --verbose Make output verbose. -lib = File.expand_path(File.join(File.dirname(__FILE__), 'lib')) +lib= '@@EPUBDIR@@/lib' $LOAD_PATH.unshift(lib) if File.exist?(lib) require 'fileutils' Nur in docbook-xsl-1.76.1/epub/bin: dbtoepub~. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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

drop perl-Class-MOP from openSUSE:Factory
by root＠hilbert.suse.de 22 Apr '11

22 Apr '11

Hello community, FYI: Package perl-Class-MOP was dropped from openSUSE:Factory at Fri Apr 22 22:47:35 CEST 2011. You can find the latest sources of the package in the openSUSE:Dropped repository: https://build.opensuse.org/package/show?project=openSUSE:Dropped&package=pe… 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 wpa_supplicant for openSUSE:Factory
by root＠hilbert.suse.de 21 Apr '11

21 Apr '11

Hello community, here is the log from the commit of package wpa_supplicant for openSUSE:Factory checked in at Thu Apr 21 16:20:09 CEST 2011. -------- --- wpa_supplicant/wpa_supplicant.changes 2010-09-07 23:10:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/wpa_supplicant/wpa_supplicant.changes 2011-03-20 13:55:23.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Mar 16 21:22:58 UTC 2011 - dimstar(a)opensuse.org + +- Add wpa_supplicant-dbus-events.patch: Emit property changed + events when adding/removing BSSes. Required by NetworkManager + 0.9 beta1 and later. +- Also install fi.w1.wpa_supplicant1.service, which was added as + source5, sourced from the wpa_supplicant source code, with + modified exec line pointing to /usr/sbin instead of /sbin. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- fi.w1.wpa_supplicant1.service wpa_supplicant-dbus-events.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wpa_supplicant.spec ++++++ --- /var/tmp/diff_new_pack.LUggK1/_old 2011-04-21 16:15:19.000000000 +0200 +++ /var/tmp/diff_new_pack.LUggK1/_new 2011-04-21 16:15:19.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package wpa_supplicant (Version 0.7.3) +# spec file for package wpa_supplicant # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ BuildRequires: dbus-1-devel libnl-devel libqt4 libqt4-devel openssl-devel pkg-config readline-devel Url: http://hostap.epitest.fi/wpa_supplicant/ Version: 0.7.3 -Release: 1 +Release: 5 License: BSD3c(or similar) ; GPLv2+ Group: Productivity/Networking/Other Summary: WPA supplicant implementation @@ -31,6 +31,7 @@ Source2: %{name}.conf Source3: fi.epitest.hostap.WPASupplicant.service Source4: logrotate.wpa_supplicant +Source5: fi.w1.wpa_supplicant1.service Patch0: wpa_supplicant-driver-wext-debug.patch # wpa_supplicant-flush-debug-output.patch won't go upstream as it might # change timings @@ -39,6 +40,8 @@ # is not portable Patch2: wpa_supplicant-sigusr1-changes-debuglevel.patch Patch4: wpa_supplicant-errormsg.patch +# PATCH-FIX-UPSTREAM wpa_supplicant-dbus-events.patch dimstar(a)opensuse.org -- dbus: Emit property changed events when adding/removing BSSes, taken from git. +Patch5: wpa_supplicant-dbus-events.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: logrotate @@ -76,6 +79,7 @@ %patch1 -p0 %patch2 -p0 %patch4 -p0 +%patch5 -p1 %build cd wpa_supplicant @@ -95,6 +99,7 @@ install -m 0600 %{SOURCE2} %{buildroot}/%{_sysconfdir}/%{name} install -d %{buildroot}/%{_datadir}/dbus-1/system-services install -m 0644 %{SOURCE3} %{buildroot}/%{_datadir}/dbus-1/system-services +install -m 0644 %{SOURCE5} %{buildroot}/%{_datadir}/dbus-1/system-services install -d %{buildroot}/%{_sysconfdir}/logrotate.d/ install -m 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/logrotate.d/wpa_supplicant install -d %{buildroot}/%{_localstatedir}/run/%{name} ++++++ fi.w1.wpa_supplicant1.service ++++++ [D-BUS Service] Name=fi.w1.wpa_supplicant1 Exec=/usr/sbin/wpa_supplicant -u User=root ++++++ wpa_supplicant-dbus-events.patch ++++++ >From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001 From: Dan Williams <dcbw(a)redhat.com> Date: Fri, 17 Dec 2010 15:56:01 +0200 Subject: [PATCH 1/1] dbus: Emit property changed events when adding/removing BSSes The supplicant was not emitting property changed events when the BSSs property changed. Signed-off-by: Dan Williams <dcbw(a)redhat.com> (cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72) --- wpa_supplicant/dbus/dbus_new.c | 6 ++++++ wpa_supplicant/dbus/dbus_new.h | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c index bdfbbac..c66640a 100644 --- a/wpa_supplicant/dbus/dbus_new.c +++ b/wpa_supplicant/dbus/dbus_new.c @@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s, wpas_dbus_getter_current_network; prop = "CurrentNetwork"; break; + case WPAS_DBUS_PROP_BSSS: + getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss; + prop = "BSSs"; + break; default: wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d", __func__, property); @@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s, } wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path); + wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS); return 0; } @@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s, } wpas_dbus_signal_bss_added(wpa_s, bss_obj_path); + wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS); return 0; diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h index 80ea98c..9cdefcb 100644 --- a/wpa_supplicant/dbus/dbus_new.h +++ b/wpa_supplicant/dbus/dbus_new.h @@ -30,6 +30,7 @@ enum wpas_dbus_prop { WPAS_DBUS_PROP_STATE, WPAS_DBUS_PROP_CURRENT_BSS, WPAS_DBUS_PROP_CURRENT_NETWORK, + WPAS_DBUS_PROP_BSSS, }; enum wpas_dbus_bss_prop { -- 1.7.4-rc1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rpmlint-mini for openSUSE:Factory
by root＠hilbert.suse.de 21 Apr '11

21 Apr '11

Hello community, here is the log from the commit of package rpmlint-mini for openSUSE:Factory checked in at Thu Apr 21 16:15:01 CEST 2011. -------- --- rpmlint-mini/rpmlint-mini.changes 2011-04-18 14:31:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpmlint-mini/rpmlint-mini.changes 2011-04-19 10:47:09.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 19 08:46:32 UTC 2011 - lnussel(a)suse.de + +- allow adding configs via RPMLINT_MINI_CONFIG + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint-mini.spec ++++++ --- /var/tmp/diff_new_pack.wiWjSG/_old 2011-04-21 16:14:23.000000000 +0200 +++ /var/tmp/diff_new_pack.wiWjSG/_new 2011-04-21 16:14:23.000000000 +0200 @@ -27,7 +27,7 @@ BuildRequires: checkbashisms dash libtool Summary: Rpm correctness checker Version: 1.1 -Release: 1 +Release: 3 Url: http://rpmlint.zarb.org/ License: GPLv2+ Group: System/Packages ++++++ rpmlint-mini.config ++++++ --- /var/tmp/diff_new_pack.wiWjSG/_old 2011-04-21 16:14:23.000000000 +0200 +++ /var/tmp/diff_new_pack.wiWjSG/_new 2011-04-21 16:14:23.000000000 +0200 @@ -1,7 +1,10 @@ #!/usr/bin/python configs = [ '/opt/testing/share/rpmlint/config' ] -configs += glob.glob("/usr/src/packages/SOURCES/*rpmlintrc") +if os.environ.get("RPMLINT_MINI_CONFIG", None): + configs += os.environ.get("RPMLINT_MINI_CONFIG", '').split(' ') +else: + configs += glob.glob("/usr/src/packages/SOURCES/*rpmlintrc") configs += glob.glob('/opt/testing/share/rpmlint/mini/*.config') for f in configs: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 rpmlint for openSUSE:Factory
by root＠hilbert.suse.de 21 Apr '11

21 Apr '11

Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at Thu Apr 21 16:14:13 CEST 2011. -------- --- rpmlint/rpmlint.changes 2011-04-20 17:31:56.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpmlint/rpmlint.changes 2011-04-21 15:01:05.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 21 13:00:43 UTC 2011 - lnussel(a)suse.de + +- fix sysv5-init-check.diff to not throw exception + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.pqXmR9/_old 2011-04-21 16:13:59.000000000 +0200 +++ /var/tmp/diff_new_pack.pqXmR9/_new 2011-04-21 16:13:59.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: rpm-python Summary: Rpm correctness checker Version: 1.1 -Release: 1 +Release: 27 Source0: %{name}-%{version}.tar.bz2 Source1: config Source1001: config.in ++++++ sysv5-init-checks.diff ++++++ --- /var/tmp/diff_new_pack.pqXmR9/_old 2011-04-21 16:13:59.000000000 +0200 +++ /var/tmp/diff_new_pack.pqXmR9/_new 2011-04-21 16:13:59.000000000 +0200 @@ -1,17 +1,19 @@ ---- InitScriptCheck.py +Index: InitScriptCheck.py +=================================================================== +--- InitScriptCheck.py.orig +++ InitScriptCheck.py -@@ -29,6 +29,10 @@ +@@ -29,6 +29,10 @@ dot_in_name_regex = re.compile('.*\..*') use_deflevels = Config.getOption('UseDefaultRunlevels', True) lsb_tags_regex = re.compile('^# ([\w-]+):\s*(.*?)\s*$') lsb_cont_regex = re.compile('^#(?:\t| )(.*?)\s*$') +insserv_regex=re.compile('^\s*sbin/insserv', re.MULTILINE) -+preun_regex=re.compile('^\s*%stop_on_removal\s+\S+', re.MULTILINE) -+restart_on_update_regex=re.compile('^\s*%restart_on_update \S+', re.MULTILINE) ++stop_on_removal_regex=re.compile('^\s*%stop_on_removal\s+\S+', re.MULTILINE) ++restart_on_update_regex=re.compile('^\s*%restart_on_update\s\S+', re.MULTILINE) +insserv_cleanup_regex=re.compile('^\s*%insserv_cleanup', re.MULTILINE) LSB_KEYWORDS = ('Provides', 'Required-Start', 'Required-Stop', 'Should-Start', 'Should-Stop', 'Default-Start', 'Default-Stop', -@@ -47,6 +51,13 @@ +@@ -47,6 +51,13 @@ class InitScriptCheck(AbstractCheck.Abst return initscript_list = [] @@ -25,7 +27,7 @@ for fname, pkgfile in pkg.files().items(): if not fname.startswith('/etc/init.d/') and \ -@@ -60,18 +71,19 @@ +@@ -60,18 +71,19 @@ class InitScriptCheck(AbstractCheck.Abst if dot_in_name_regex.match(basename): printError(pkg, 'init-script-name-with-dot', fname) @@ -43,7 +45,7 @@ - printError(pkg, 'preun-without-chkconfig', fname) + printError(pkg, 'init-script-without-%stop_on_removal-preun', fname) + elif not stop_on_removal_regex.search(postin): -+ printError(pkg, 'preun-without-%%stop_on_removal-preun', fname) ++ printError(pkg, 'preun-without-%stop_on_removal-preun', fname) + + if not postun: + printError(pkg, 'init-script-without-%restart_on_update-postun', fname) @@ -55,7 +57,7 @@ status_found = False reload_found = False -@@ -202,10 +214,18 @@ +@@ -202,10 +214,18 @@ a call to chkconfig.''', '''The package contains an init script but doesn't call chkconfig in its %post script.''', @@ -75,7 +77,7 @@ 'preun-without-chkconfig', '''The package contains an init script but doesn't call chkconfig in its %preun script.''', -@@ -264,6 +284,24 @@ +@@ -264,6 +284,24 @@ of chkconfig don't work as expected with 'init-script-non-executable', '''The init script should have at least the execution bit set for root in order for it to run at boot time.''', ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 kiwi for openSUSE:Factory
by root＠hilbert.suse.de 21 Apr '11

21 Apr '11

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Thu Apr 21 14:23:35 CEST 2011. -------- --- kiwi/kiwi.changes 2011-04-15 14:28:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-04-21 14:01:56.000000000 +0200 @@ -1,0 +2,87 @@ +Thu Apr 21 13:55:55 CEST 2011 - ms(a)suse.de + +- v4.87 released + +------------------------------------------------------------------- +Thu Apr 21 11:32:48 CEST 2011 - ms(a)suse.de + +- fixed initial variable setup for haveDASD|ZFCP + +------------------------------------------------------------------- +Thu Apr 21 11:09:59 CEST 2011 - ms(a)suse.de + +- changed searchBusIDBootDevice() for the s390 architecture. + All required information is now obtained from /sys/firmware/ipl + According to this no additional kernel parameters are + required to set the boot device online (bnc #689004) + +------------------------------------------------------------------- +Thu Apr 21 09:05:49 CEST 2011 - ms(a)suse.de + +- added alternative location for kiwi hooks scripts which + is FHS compliant: /lib/kiwi/hooks/ (bnc #688792) + +------------------------------------------------------------------- +Wed Apr 20 16:59:23 CEST 2011 - ms(a)suse.de + +- added URL mapping table for the opensuse:// url type. When + resolving this the regular expression based mapping table is + used to create a valid location from the specified URI data. + It's possible to extend the existing KIWIURL.txt table + according to the needs of the user or service. + +------------------------------------------------------------------- +Wed Apr 20 10:45:52 CEST 2011 - ms(a)suse.de + +- changed xsl 51 to 52 conversion. The obsolete usb image type + is removed from the XML input. this image type can be either + replaced by an iso hybrid type or by an oem type. As there is + a choice for the user the stylesheet will not make a decision + here. + +------------------------------------------------------------------- +Wed Apr 20 10:15:28 CEST 2011 - ms(a)suse.de + +- netboot: added preLoadConfiguration hook: + preLoadConfiguration: is called before the client.<MAC> is + loaded by kiwi and thus can be used to inject alternative code + for loading the client configuration. + +- netboot: added postLoadConfiguration hook: + postLoadConfiguration: is called after the client configuration + has been loaded and imported and can be used for any action + after the client configuration has exported its variables into + the boot environment + +- netboot: renamed the default register file which is put on + the pxe boot server if there is client configuration found. + kiwi now put a file called: upload/client.$DHCPCHADDR + which doesn't conflict with the files SLEPOS uses for + registration + +- netboot: removed SLEPOS related code, posbios calls and + the evaluation of the WORKSTATION_LDAP_IP variable. All + this will be part of product specific hook scripts + +------------------------------------------------------------------- +Wed Apr 20 10:14:28 CEST 2011 - ms(a)suse.de + +- allow parameters to be passed to hook scripts + +------------------------------------------------------------------- +Tue Apr 19 12:55:56 CEST 2011 - ms(a)suse.de + +- added setupBootLoaderTheme() function which is called + after the bootloader configuration has been written. The + function adapts/sets the THEME variable in the + /etc/sysconfig/bootsplash file according to the boot + theme set in the kiwi XML configuration + +------------------------------------------------------------------- +Mon Apr 18 11:08:54 CEST 2011 - ms(a)suse.de + +- fixed suseStripFirmware to match in subdirectories below + /lib/firmware/ too. firmware installed by the kernel packages + for example were removed + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.VtyvQa/_old 2011-04-21 14:23:01.000000000 +0200 +++ /var/tmp/diff_new_pack.VtyvQa/_new 2011-04-21 14:23:01.000000000 +0200 @@ -65,7 +65,7 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.86 +Version: 4.87 Release: 1 Group: System/Management License: GPLv2 ++++++ kiwi-docu.tar.bz2 ++++++ kiwi/kiwi-docu.tar.bz2 /mounts/work_src_done/STABLE/kiwi/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-04-15 14:23:59.000000000 +0200 +++ new/kiwi/.revision 2011-04-21 13:57:55.000000000 +0200 @@ -1 +1 @@ -80f0d67a9a84dc59f34307e2f2879b1f6618d102 +dec521fd69f73299badd58ccf92098e59cfb1f71 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2011-04-15 14:23:59.000000000 +0200 +++ new/kiwi/kiwi.pl 2011-04-21 13:57:55.000000000 +0200 @@ -50,11 +50,9 @@ #============================================ # Globals (Version) #-------------------------------------------- -our $Version = "4.86"; +our $Version = "4.87"; our $Publisher = "SUSE LINUX Products GmbH"; our $Preparer = "KIWI - http://kiwi.berlios.de"; -our $openSUSE = "http://download.opensuse.org"; -our @openSUSE = ("distribution","repositories"); our $ConfigFile = "$ENV{'HOME'}/.kiwirc"; our $ConfigName = "config.xml"; our $Partitioner = "parted"; @@ -105,6 +103,7 @@ our $KRegion = $BasePath."/modules/KIWIEC2Region.txt"; our $KMigraCSS= $BasePath."/modules/KIWIMigrate.tgz"; our $KSplit = $BasePath."/modules/KIWISplit.txt"; +our $repoURI = $BasePath."/modules/KIWIURL.txt"; our $Revision = $BasePath."/.revision"; our $TestBase = $BasePath."/tests"; our $SchemaCVT= $BasePath."/xsl/master.xsl"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2011-04-14 17:14:27.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2011-04-21 12:02:24.000000000 +0200 @@ -3441,21 +3441,6 @@ print FD "$this->{mbrid}"; close FD; $kiwi -> done(); - my %ccwid; - #========================================== - # Create disk Bus-ID for online call - #------------------------------------------ - if ($main::targetDevice) { - $kiwi -> info ("Saving disk Bus-ID..."); - %ccwid = $this -> __getCCWID ($main::targetDevice); - if ((! $ccwid{busid}) && (! $ccwid{ccwid})) { - $kiwi -> failed (); - $kiwi -> error ("Can't find Bus-ID for $main::targetDevice"); - $kiwi -> failed (); - return undef; - } - $kiwi -> done(); - } #========================================== # Create zipl.conf #------------------------------------------ @@ -3528,14 +3513,7 @@ print FD "\t"."ramdisk = boot/initrd,0x2000000"."\n"; } print FD "\t"."parameters = \"loader=$bloader"; - if ($ccwid{busid}) { - print FD " busid=$ccwid{busid} $cmdline\""."\n"; - } elsif ($ccwid{ccwid}) { - print FD " ccwid=$ccwid{ccwid} wwpn=$ccwid{wwpn} lun=$ccwid{lun}"; - print FD " $cmdline\""."\n"; - } else { - print FD " $cmdline\""."\n"; - } + print FD " $cmdline\""."\n"; #========================================== # Failsafe boot #------------------------------------------ @@ -3555,14 +3533,7 @@ print FD "\t"."ramdisk = boot/initrd,0x2000000"."\n"; } print FD "\t"."parameters = \"x11failsafe loader=$bloader"; - if ($ccwid{busid}) { - print FD " busid=$ccwid{busid} $cmdline\""."\n"; - } elsif ($ccwid{ccwid}) { - print FD " ccwid=$ccwid{ccwid} wwpn=$ccwid{wwpn} lun=$ccwid{lun}"; - print FD " $cmdline\""."\n"; - } else { - print FD " $cmdline\""."\n"; - } + print FD " $cmdline\""."\n"; close FD; $kiwi -> done(); } @@ -5183,57 +5154,4 @@ return $this; } -#========================================== -# __getCCWID -#------------------------------------------ -sub __getCCWID { - # ... - # find the ccwid and wwpn + lun if a zfcp device - # is specified. The function will turn the device node - # name into a by-path name if necessary and matches - # the values from the by-path device naming convention - # for s390 DASD and ZFCP devices. The function will - # return an empty hash if no such device exists - # ---- - my $this = shift; - my $kiwi = $this->{kiwi}; - my $device = shift; - my $bypath = '\/dev\/disk\/by-path'; - my %result = (); - #========================================== - # check if device exists - #------------------------------------------ - if (! -e $device) { - $kiwi -> loginfo ("getCCWID: Device $device doesn't exist\n"); - return %result; - } - #========================================== - # turn device name into by-path name - #------------------------------------------ - if ($device !~ /$bypath\/.*/) { - my @paths = glob ("/dev/disk/by-path/*"); - foreach my $path (@paths) { - my $ndev = readlink ($path); - $ndev = "/dev/".basename $ndev; - if ($ndev eq $device) { - $device = $path; last; - } - } - } - #========================================== - # match values - #------------------------------------------ - if ($device =~ /$bypath\/ccw-([^-]+)$/) { - $result{busid}=$1; - } elsif ($device =~ /$bypath\/ccw-(.*)-zfcp-(.*):([^-]+)$/) { - $result{ccwid} = $1; - $result{wwpn} = $2; - $result{lun} = $3; - } else { - $kiwi -> loginfo ("Invalid disk device specified: $device\n"); - return %result; - } - return %result; -} - 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh --- old/kiwi/modules/KIWIConfig.sh 2011-04-08 14:27:57.000000000 +0200 +++ new/kiwi/modules/KIWIConfig.sh 2011-04-21 12:02:24.000000000 +0200 @@ -1333,11 +1333,17 @@ for i in $(find $base -name "*.ko" | xargs modinfo | grep ^firmware);do IFS=$ifs name=$(echo $(echo $i | cut -f2 -d:)) - if [ -e /lib/firmware/$name ];then - bmdir=$(dirname $name) - mkdir -p /lib/firmware-required/$bmdir - mv /lib/firmware/$name /lib/firmware-required/$bmdir + if [ -z "$name" ];then + continue fi + for match in /lib/firmware/$name /lib/firmware/*/$name;do + if [ -e $match ];then + match=$(echo $match | sed -e 's@\/lib\/firmware\/@@') + bmdir=$(dirname $match) + mkdir -p /lib/firmware-required/$bmdir + mv /lib/firmware/$match /lib/firmware-required/$bmdir + fi + done done rm -rf /lib/firmware mv /lib/firmware-required /lib/firmware diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2011-04-14 17:14:27.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-04-21 12:02:25.000000000 +0200 @@ -32,6 +32,8 @@ #====================================== # Exports (General) #-------------------------------------- +test -z "$haveDASD" && export haveDASD=0 +test -z "$haveZFCP" && export haveZFCP=0 test -z "$ELOG_CONSOLE" && export ELOG_CONSOLE=/dev/tty3 test -z "$ELOG_BOOTSHELL" && export ELOG_BOOTSHELL=/dev/tty2 test -z "$ELOG_EXCEPTION" && export ELOG_EXCEPTION=/dev/tty1 @@ -977,6 +979,44 @@ "*** boot loader setup for $arch-$loader not implemented ***" \ "reboot" esac + setupBootLoaderTheme "/config" +} +#====================================== +# setupBootLoaderTheme +#-------------------------------------- +function setupBootLoaderTheme { + local destprefix=$1 + local srcprefix=$2 + if [ -z "$srcprefix" ];then + srcprefix=/mnt + fi + #====================================== + # no boot theme set, return + #-------------------------------------- + if [ -z "$kiwi_boottheme" ];then + return + fi + #====================================== + # prepare paths + #-------------------------------------- + local sysimg_bootsplash=$srcprefix/etc/sysconfig/bootsplash + local sysbootsplash=$destprefix/etc/sysconfig/bootsplash + mkdir -p $destprefix/etc/sysconfig + touch $sysbootsplash + #====================================== + # check for bootsplash config in sysimg + #-------------------------------------- + if [ -f $sysimg_bootsplash ];then + cp $sysimg_bootsplash $sysbootsplash + fi + #====================================== + # change/create bootsplash config + #-------------------------------------- + if cat $sysbootsplash | grep -q -E "^THEME"; then + sed -i "s/^THEME=.*/THEME=\"$kiwi_boottheme\"/" $sysbootsplash + else + echo "THEME=\"$kiwi_boottheme\"" >> $sysbootsplash + fi } #====================================== # setupBootLoaderRecovery @@ -3162,21 +3202,33 @@ # device is set online and the biosBootDevice variable # is set to this device for further processing # ---- - local haveDASD=0 - local haveZFCP=0 local deviceID=0 local dpath=/dev/disk/by-path + local ipl_type=$(cat /sys/firmware/ipl/ipl_type) + local wwpn + local slun #====================================== - # distinguish between dasd and zfcp + # determine device type: dasd or zfcp #-------------------------------------- - if [ ! -z "$ccwid" ] ;then - deviceID=$ccwid + if [ -z "$ipl_type" ];then + systemException \ + "Can't find IPL type" \ + "reboot" + fi + if [ "$ipl_type" = "fcp" ];then haveZFCP=1 - elif [ ! -z "$busid" ];then - deviceID=$busid + elif [ "$ipl_type" = "ccw" ];then haveDASD=1 + else + systemException \ + "Unknown IPL type: $ipl_type" \ + "reboot" fi #====================================== + # store device bus / host id + #-------------------------------------- + deviceID=$(cat /sys/firmware/ipl/device) + #====================================== # check if we can find the device #-------------------------------------- if [ ! -e /sys/bus/ccw/devices/$deviceID ];then @@ -3195,9 +3247,11 @@ # ZFCP #-------------------------------------- if [ $haveZFCP -eq 1 ];then + wwpn=$(cat /sys/firmware/ipl/wwpn) + slun=$(cat /sys/firmware/ipl/lun) zfcp_host_configure $deviceID 1 - zfcp_disk_configure $deviceID $wwpn $lun 1 - biosBootDevice="$dpath/ccw-$deviceID-zfcp-$wwpn:$lun" + zfcp_disk_configure $deviceID $wwpn $slun 1 + biosBootDevice="$dpath/ccw-$deviceID-zfcp-$wwpn:$slun" fi #====================================== # setup boot device variable @@ -4681,8 +4735,11 @@ #-------------------------------------- function runHook { HOOK="/kiwi-hooks/$1.sh" + if [ ! -e $HOOK ];then + HOOK="/lib/kiwi/hooks/$1.sh" + fi if [ -e $HOOK ]; then - . $HOOK + . $HOOK $@ fi } #====================================== @@ -6554,24 +6611,14 @@ function pxeSetupSystemHWTypeFile { # /.../ # collects information about the alias name the - # architecture the BIOS version and more and stores - # that into a file suffixed by the hardware address of the - # network card. Obtaining the BIOS information requires - # the posbios tool to be installed in the initrd + # architecture and more and stores that into a + # file suffixed by the hardware address of the + # network card. # ---- echo "NCNAME=$SYSALIAS" >> hwtype.$DHCPCHADDR echo "CRNAME=$SYSALIAS" >> hwtype.$DHCPCHADDR echo "IPADDR=$IPADDR" >> hwtype.$DHCPCHADDR echo "ARCHITECTURE=$ARCH" >> hwtype.$DHCPCHADDR - #======================================== - # Try to get BIOS data if tools are there - #---------------------------------------- - if [ -f /sbin/posbios ];then - HWBIOS=`/sbin/posbios -b` - echo "HWBIOS=$HWBIOS" >> hwtype.$DHCPCHADDR - HWTYPE=`/sbin/posbios -ms` - echo "HWTYPE=$HWTYPE" >> hwtype.$DHCPCHADDR - fi } #====================================== # pxeSizeToMB @@ -6963,7 +7010,7 @@ # isVirtioDevice #-------------------------------------- function isVirtioDevice { - if echo $imageDiskDevice | grep -q vda;then + if [ $haveDASD -eq 0 ] && [ $haveZFCP -eq 0 ];then return 0 fi return 1 @@ -6972,7 +7019,16 @@ # isDASDDevice #-------------------------------------- function isDASDDevice { - if echo $imageDiskDevice | grep -q dasd;then + if [ $haveDASD -eq 1 ];then + return 0 + fi + return 1 +} +#====================================== +# isZFCPDevice +#-------------------------------------- +function isZFCPDevice { + if [ $haveZFCP -eq 1 ];then return 0 fi return 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIURL.pm new/kiwi/modules/KIWIURL.pm --- old/kiwi/modules/KIWIURL.pm 2011-04-01 14:35:59.000000000 +0200 +++ new/kiwi/modules/KIWIURL.pm 2011-04-21 12:02:25.000000000 +0200 @@ -523,12 +523,12 @@ my $this = shift; my $module = shift; my $quiet = shift; - my $browser = LWP::UserAgent->new; - my $location = $main::openSUSE; - my @dists = qw (standard); - my @urllist = (); my $kiwi = $this->{kiwi}; + my $browser = LWP::UserAgent->new; + my $uriTable = $main::repoURI; my $origurl = $module; + my %matches = (); + my $FD; #========================================== # allow proxy server from environment #------------------------------------------ @@ -546,23 +546,29 @@ return undef; } #========================================== - # Create urllist for later testing + # Create URL list from URI table #------------------------------------------ - foreach my $dist (@dists) { - foreach my $subdir (@main::openSUSE) { - my $url1 = $location."/".$subdir."/".$module."/"; - push @urllist,$url1; - if ($url1 !~ /\/$dist/) { - my $url2 = $location."/".$subdir."/".$module."/".$dist."/"; - push @urllist,$url2; - } - } + if (! open $FD, $uriTable) { + return undef; } + while (my $match =<$FD>) { + chomp $match; + my @list = split (/\|/,$match); + my $repo = $module; + my $match= '$repo =~ '.$list[1]; + eval $match; + $matches{$repo} = $list[0]; + } + close $FD; #========================================== - # Check url entries in urllist + # Check URL entries #------------------------------------------ my @responses = (); - foreach my $url (@urllist) { + foreach my $url (keys %matches) { + my $type = $matches{$url}; + if ($type ne "opensuse") { + next; + } my $response = $this -> urlResponse ( $browser,$url ); if (! $response) { next; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIURL.txt new/kiwi/modules/KIWIURL.txt --- old/kiwi/modules/KIWIURL.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/modules/KIWIURL.txt 2011-04-21 12:02:25.000000000 +0200 @@ -0,0 +1,5 @@ +opensuse|s/^/http:\/\/download.opensuse.org\// +opensuse|s/^/http:\/\/download.opensuse.org\/repositories\// +opensuse|s/^/http:\/\/download.opensuse.org\/distribution\// +opensuse|s/build.opensuse.org/http:\/\/download.opensuse.org\/distribution/ +opensuse|s/build.opensuse.org/http:\/\/download.opensuse.org\/repositories/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-linuxrc new/kiwi/system/boot/ix86/netboot/suse-linuxrc --- old/kiwi/system/boot/ix86/netboot/suse-linuxrc 2011-04-13 18:18:10.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2011-04-21 12:02:25.000000000 +0200 @@ -145,11 +145,17 @@ if [ ! -z "$NBDROOT" ];then KLIST[0]="NBDROOT=$NBDROOT"; fi + Echo "Checking for config file..." #====================================== - # Connection/access check for SERVER + # hook: preLoadConfiguration #-------------------------------------- - Echo "Checking for config file: config.$DHCPCHADDR" - fetchFile KIWI/config.$DHCPCHADDR $CONFIG + runHook preLoadConfiguration + #====================================== + # Load config.<MAC> + #-------------------------------------- + if [ ! -s $CONFIG ] ; then + fetchFile KIWI/config.$DHCPCHADDR $CONFIG + fi #====================================== # Check alternative config names #-------------------------------------- @@ -174,17 +180,6 @@ searchHardwareMapConfig IMPORTED=1 fi - #======================================== - # Compare current IP and IP from config - #---------------------------------------- - NEWIP=0 - if [ ! -z "$WORKSTATION_LDAP_IP" ]; then - WSNR=`echo $WORKSTATION_LDAP_IP | sed -r -e 's/(^|\.)0*/\1/g'` - IPNR=`echo $IPADDR | sed -r -e 's/(^|\.)0*/\1/g'` - if [ "$WSNR" != "$IPNR" ];then - NEWIP=1 - fi - fi #====================================== # No config found register new client #-------------------------------------- @@ -199,8 +194,7 @@ #====================================== # Put files on the boot server #-------------------------------------- - putFile hwtype.$DHCPCHADDR upload/hwtype.$DHCPCHADDR - putFile hwinfo.$DHCPCHADDR upload/hwinfo.$DHCPCHADDR + putFile hwtype.$DHCPCHADDR upload/client.$DHCPCHADDR echo Echo "Registered as: $DHCPCHADDR" Echo "Waiting for configuration..." @@ -227,17 +221,6 @@ done fi #====================================== - # Config found but DHCP IP setup change - #-------------------------------------- - if [ $NEWIP -eq 1 ];then - Echo "Outdated IP address, notify new client setup..." - pxeSetupSystemAliasName - pxeSetupSystemHWTypeFile - putFile hwtype.$DHCPCHADDR upload/hwtype.$DHCPCHADDR - echo - Echo "Notified: $DHCPCHADDR" - fi - #====================================== # import latest configuration #-------------------------------------- if [ $IMPORTED -eq 0 ];then @@ -256,6 +239,10 @@ eval export \"$i\" done fi + #====================================== + # hook: postLoadConfiguration + #-------------------------------------- + runHook postLoadConfiguration fi #====================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-preinit new/kiwi/system/boot/s390/oemboot/suse-preinit --- old/kiwi/system/boot/s390/oemboot/suse-preinit 2011-03-11 15:36:06.000000000 +0100 +++ new/kiwi/system/boot/s390/oemboot/suse-preinit 2011-04-21 12:02:25.000000000 +0200 @@ -57,6 +57,9 @@ if isDASDDevice;then runPreinitServices dasd fi +if isZFCPDevice;then + runPreinitServices zfcp +fi #====================================== # 7) create initrd on diskful diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-preinit new/kiwi/system/boot/s390/vmxboot/suse-preinit --- old/kiwi/system/boot/s390/vmxboot/suse-preinit 2011-04-11 17:15:55.000000000 +0200 +++ new/kiwi/system/boot/s390/vmxboot/suse-preinit 2011-04-21 12:02:25.000000000 +0200 @@ -57,6 +57,9 @@ if isDASDDevice;then runPreinitServices dasd fi +if isZFCPDevice;then + runPreinitServices zfcp +fi #====================================== # 7) create /etc/ImagePackages diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/zfcp/01-network.sh new/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/zfcp/01-network.sh --- old/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/zfcp/01-network.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/template/s390/suse-SLE11-JeOS/root/etc/init.d/kiwi/zfcp/01-network.sh 2011-04-21 12:02:25.000000000 +0200 @@ -0,0 +1,24 @@ +#!/bin/bash +# s390 network hardware setup +# ---- +#====================================== +# Functions... +#-------------------------------------- +. /include + +qeth_port=VSWL2 +qeth_read=0.0.0800 +qeth_write=0.0.0801 +qeth_ctrl=0.0.0802 +qeth_up=1 + +#====================================== +# Include kernel parameters +#-------------------------------------- +includeKernelParameters + +#====================================== +# Bring the device online +#-------------------------------------- +qeth_configure -p $qeth_port -l $qeth_read $qeth_write $qeth_ctrl $qeth_up + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/xsl/convert51to52.xsl new/kiwi/xsl/convert51to52.xsl --- old/kiwi/xsl/convert51to52.xsl 2010-12-03 16:08:52.000000000 +0100 +++ new/kiwi/xsl/convert51to52.xsl 2011-04-21 12:02:25.000000000 +0200 @@ -25,4 +25,16 @@ </image> </xsl:template> + +<xsl:template match="type" mode="conv51to52"> + <xsl:choose> + <xsl:when test="@image!='usb'"> + <type> + <xsl:copy-of select="@*"/> + <xsl:apply-templates mode="conv51to52"/> + </type> + </xsl:when> + </xsl:choose> +</xsl:template> + </xsl:stylesheet> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 openssl for openSUSE:Factory
by root＠hilbert.suse.de 21 Apr '11

21 Apr '11

Hello community, here is the log from the commit of package openssl for openSUSE:Factory checked in at Thu Apr 21 13:51:13 CEST 2011. -------- --- openssl/openssl.changes 2011-04-13 05:21:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/openssl/openssl.changes 2011-02-10 08:45:42.000000000 +0100 @@ -2,19 +1,0 @@ -Wed Apr 13 02:03:02 UTC 2011 - crrodriguez(a)opensuse.org - -- Fix engine loading issues [bnc#660452] -- Update AES-NI patch to upstream version 4 -- Drop CVE-2011-0014.patch and replace it with pristine tarball - of 1.0.0d which only fixes this vulnerability. - -------------------------------------------------------------------- -Sat Apr 9 18:18:42 UTC 2011 - crrodriguez(a)opensuse.org - -- Correct last change - -------------------------------------------------------------------- -Sat Apr 9 15:00:33 UTC 2011 - crrodriguez(a)opensuse.org - -- Disable SSLv2 support permanently,it must not be used. -- No longer requires -fno-strict-aliasing - -------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- _service _service:download_url:openssl-1.0.0d.tar.gz openssl-1.0.0-aesni-v4.patch openssl-padlock-x86_64-head.patch New: ---- CVE-2011-0014.patch openssl-1.0.0b-aesni.patch openssl-1.0.0c.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssl.spec ++++++ --- /var/tmp/diff_new_pack.wNQ9BK/_old 2011-04-21 13:50:46.000000000 +0200 +++ /var/tmp/diff_new_pack.wNQ9BK/_new 2011-04-21 13:50:46.000000000 +0200 @@ -32,11 +32,11 @@ %endif # #Version: 1.0.0 -Version: 1.0.0d -Release: 1 +Version: 1.0.0c +Release: 21 Summary: Secure Sockets and Transport Layer Security Url: http://www.openssl.org/ -Source: http://www.%{name}.org/source/%{name}-%{version}.tar.gz +Source: http://www.%{name}.org/source/%{name}-%{version}.tar.bz2 # to get mtime of file: Source1: openssl.changes Source2: baselibs.conf @@ -48,9 +48,8 @@ #Patch4: patchset-19727.diff #Patch5: CVE-2010-2939.patch #Patch6: CVE-2010-3864.patch -Patch7: openssl-1.0.0-aesni-v4.patch -#PATCH_FIX-UPSTREAM Fix padlock engine in x86_64 hosts -Patch8: openssl-padlock-x86_64-head.patch +Patch7: openssl-1.0.0b-aesni.patch +Patch8: CVE-2011-0014.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -179,12 +178,12 @@ %setup -q %patch0 -p1 %patch1 -p1 -%patch2 +%patch2 -p1 #%patch3 -p1 #%patch4 -p1 #%patch5 -p1 #%patch6 -p1 -%patch7 +%patch7 -p1 %patch8 -p1 cp -p %{S:10} . echo "adding/overwriting some entries in the 'table' hash in Configure" @@ -225,9 +224,6 @@ ./config --test-sanity # config_flags="threads shared no-rc5 no-idea \ -%if 0%{suse_version} > 1140 -no-ssl2 \ -%endif enable-camellia \ zlib \ --prefix=%{_prefix} \ @@ -236,6 +232,7 @@ $RPM_OPT_FLAGS \ -Wa,--noexecstack \ -fomit-frame-pointer \ +-fno-strict-aliasing \ -DTERMIO \ -DPURIFY \ %ifnarch hppa @@ -340,7 +337,7 @@ SSL_CTX *ctx; SSL *ssl; SSL_METHOD *meth; - meth = SSLv23_client_method(); + meth = SSLv2_client_method(); SSLeay_add_ssl_algorithms(); ctx = SSL_CTX_new(meth); if (ctx == NULL) return 0; @@ -373,36 +370,14 @@ ln -sf /%{_lib}/libssl.so.%{num_version} ./libssl.so ln -sf /%{_lib}/libcrypto.so.%{num_version} ./libcrypto.so -#ugly artifact to delete engines that are disabled/unusable in LINUX -#that for some reason the build system insist on creating. - -# CAPI, Windows specific -rm %{buildroot}/%_lib/engines/libcapi.so -# GMP, has been always non-functional -rm %{buildroot}/%_lib/engines/libgmp.so -# Requires propietary Broadcom library, not available -rm %{buildroot}/%_lib/engines/libubsec.so -#Requires library called libnfhwcrhk.so which is not available -rm %{buildroot}/%_lib/engines/libchil.so -#requires library named "SureWareHook" which is not available -rm %{buildroot}/%_lib/engines/libsureware.so -#requires DSO "libswift.so",propietary and not available -rm %{buildroot}/%_lib/engines/libcswift.so -#requires DSO "nuronssl.so", propietary and not available -rm %{buildroot}/%_lib/engines/libnuron.so -#only supported in AIX and Windows... -rm %{buildroot}/%_lib/engines/lib4758cca.so -# deprecated in favor of http://sourceforge.net/projects/opencryptoki/files/ (??) -rm %{buildroot}/%_lib/engines/libaep.so -# HP Atalla AXL600L SSL Accelerator Card, EOL, linux 2.4/SLE8, useless nowdays -rm %{buildroot}/%_lib/engines/libatalla.so - %clean if ! test -f /.buildenv; then rm -rf $RPM_BUILD_ROOT; fi -%post -n libopenssl1_0_0 -p /sbin/ldconfig +%post -n libopenssl1_0_0 +/sbin/ldconfig -%postun -n libopenssl1_0_0 -p /sbin/ldconfig +%postun -n libopenssl1_0_0 +/sbin/ldconfig %files -n libopenssl1_0_0 %defattr(-, root, root) ++++++ CVE-2011-0014.patch ++++++ Index: openssl-1.0.0c/ssl/t1_lib.c =================================================================== --- openssl-1.0.0c.orig/ssl/t1_lib.c +++ openssl-1.0.0c/ssl/t1_lib.c @@ -917,6 +917,7 @@ int ssl_parse_clienthello_tlsext(SSL *s, } n2s(data, idsize); dsize -= 2 + idsize; + size -= 2 + idsize; if (dsize < 0) { *al = SSL_AD_DECODE_ERROR; @@ -955,9 +956,14 @@ int ssl_parse_clienthello_tlsext(SSL *s, } /* Read in request_extensions */ + if (size < 2) + { + *al = SSL_AD_DECODE_ERROR; + return 0; + } n2s(data,dsize); size -= 2; - if (dsize > size) + if (dsize != size) { *al = SSL_AD_DECODE_ERROR; return 0; ++++++ bug610223.patch ++++++ --- /var/tmp/diff_new_pack.wNQ9BK/_old 2011-04-21 13:50:46.000000000 +0200 +++ /var/tmp/diff_new_pack.wNQ9BK/_new 2011-04-21 13:50:46.000000000 +0200 @@ -1,6 +1,8 @@ ---- Configure.orig -+++ Configure -@@ -1688,7 +1688,8 @@ while (<IN>) +Index: openssl-1.0.0/Configure +=================================================================== +--- openssl-1.0.0.orig/Configure ++++ openssl-1.0.0/Configure +@@ -1673,7 +1673,8 @@ while (<IN>) } elsif (/^#define\s+ENGINESDIR/) { ++++++ openssl-1.0.0b-aesni.patch ++++++ ++++ 2388 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 webalizer for openSUSE:Factory
by root＠hilbert.suse.de 21 Apr '11

21 Apr '11

Hello community, here is the log from the commit of package webalizer for openSUSE:Factory checked in at Thu Apr 21 13:50:01 CEST 2011. -------- --- webalizer/webalizer.changes 2011-03-19 19:20:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/webalizer/webalizer.changes 2011-03-20 22:31:49.000000000 +0100 @@ -1,0 +2,11 @@ +Sun Mar 20 21:28:14 UTC 2011 - chris(a)computersalat.de + +- add world flags (sub-pkg) + o add missing link for uk.png + o add missing su.png + o add license file (CC BY-SA 3.0) + http://creativecommons.org/licenses/by-sa/3.0/legalcode +- rework configuration patch > conf patch + o fix path to GeoIP.dat + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- webalizer-2.21-02-configuration.diff New: ---- flags.license.html flags.tar.bz2 webalizer-2.23-04-conf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webalizer.spec ++++++ --- /var/tmp/diff_new_pack.Gt86cb/_old 2011-04-21 13:49:42.000000000 +0200 +++ /var/tmp/diff_new_pack.Gt86cb/_new 2011-04-21 13:49:42.000000000 +0200 @@ -22,11 +22,13 @@ Name: webalizer Summary: A Web Server Log File Analysis Program Version: 2.23 -Release: 1 +Release: 2 License: GPLv2+ Group: Productivity/Networking/Web/Utilities Url: http://www.mrunix.net/webalizer/ -Source: %{name}-%{version}-%{editlvl}-src.tar.bz2 +Source0: %{name}-%{version}-%{editlvl}-src.tar.bz2 +Source1: flags.tar.bz2 +Source2: flags.license.html # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch0: %{name}-2.21-02.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches @@ -34,7 +36,7 @@ # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch3: %{name}-2.21-02-maxagent.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches -Patch4: %{name}-2.21-02-configuration.diff +Patch4: %{name}-2.23-04-conf.patch # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch5: %{name}-2.21-02-fclose.diff # FIX-DATADIR - fix for datadir and mandir @@ -68,14 +70,29 @@ Combined log formats as defined by NCSA and others, and variations of these which it attempts to handle intelligently. +%package flags +Summary: Flags of the World +License: CC BY-SA 3.0 +Group: Productivity/Networking/Web/Utilities +Url: http://flags.blogpotato.de/ +Requires: %{name} + +%description flags +Images for those who want to visualize the data returned by an +IP-to-Country database (e.g. the one provided by Directi) with +corresponding flags. Flags provided are based on the iso3166 +countrycode, that means there are currently 243 flags offered in the +world set. + %prep -%setup -q -n %{name}-%{version}-%{editlvl} +%setup -q -n %{name}-%{version}-%{editlvl} -a 1 %patch0 %patch1 %patch3 -%patch4 +%patch4 -p1 %patch5 %patch6 -p1 +%{__cp} -a %{S:2} . %build %{suse_update_config -f} @@ -96,12 +113,15 @@ install -d -m 755 %{buildroot}/etc install -d -m 755 %{buildroot}/%{_mandir}/man1 make "DESTDIR=%{buildroot}" install -install -d -m 755 %{buildroot}%{apache_serverroot}/htdocs/webalizer -install -d -m 755 %{buildroot}%{_localstatedir}/lib/webalizer -mv %{buildroot}/%{_sysconfdir}/webalizer.conf.sample %{buildroot}/%{_sysconfdir}/webalizer.conf +install -d -m 755 %{buildroot}%{apache_serverroot}/htdocs/%{name} +install -d -m 755 %{buildroot}%{_localstatedir}/lib/%{name} +mv %{buildroot}/%{_sysconfdir}/%{name}.conf.sample %{buildroot}/%{_sysconfdir}/%{name}.conf + +#install flags +%{__cp} -a flags %{buildroot}%{apache_serverroot}/htdocs/%{name}/ %preun -#rm -f var/lib/webalizer/* +#rm -f var/lib/%{name}/* %clean rm -rf %{buildroot} @@ -110,9 +130,15 @@ %defattr(-,root,root) %doc CHANGES COPYING Copyright README README.FIRST country-codes.txt %doc %{_mandir}/man?/* -%config(noreplace) %{_sysconfdir}/webalizer.conf -%dir %{apache_serverroot}/htdocs/webalizer +%config(noreplace) %{_sysconfdir}/%{name}.conf +%dir %{apache_serverroot}/htdocs/%{name} +%exclude %{apache_serverroot}/htdocs/%{name}/flags %{_bindir}/* -%{_localstatedir}/lib/webalizer +%{_localstatedir}/lib/%{name} + +%files flags +%defattr(-,root,root) +%doc flags.license.html +%dir %{apache_serverroot}/htdocs/%{name}/flags %changelog ++++++ flags.license.html ++++++ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta name="generator" content= "HTML Tidy for Linux/x86 (vers 1 September 2005), see www.w3.org" /> <title>Creative Commons Legal Code</title> <meta http-equiv="content-type" content= "text/html; charset=utf-8" /> <link rel="stylesheet" type="text/css" href= "http://creativecommons.org/includes/deed3.css" media="screen" /> <link rel="stylesheet" type="text/css" href= "http://creativecommons.org/includes/deed3-print.css" media= "print" />  <script type="text/javascript" src= "http://creativecommons.org/includes/errata.js"> </script> </head> <body> <p align="center" id="header"><a href= "http://creativecommons.org/">Creative Commons</a></p> <div id="deed" class="green"> <div id="deed-head"> <div id="cc-logo"> <img src= "http://creativecommons.org/images/deed/cc-logo.jpg" alt= "" /> </div> <h1><span>Creative Commons Legal Code</span></h1> <div id="deed-license"> <h2>Attribution-ShareAlike 3.0 Unported</h2> </div> </div> <div id="deed-main"> <div id="deed-main-content"> <img src= "http://creativecommons.org/images/international/unported.png" alt="" /> <blockquote> CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. </blockquote> <h3><em>License</em></h3> <p>THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.</p> <p>BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.</p> <p><strong>1. Definitions</strong></p> <ol type="a"> <li><strong>"Adaptation"</strong> means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.</li> <li><strong>"Collection"</strong> means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.</li> <li><strong>"Creative Commons Compatible License"</strong> means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.</li> <li><strong>"Distribute"</strong> means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.</li> <li><strong>"License Elements"</strong> means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.</li> <li><strong>"Licensor"</strong> means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.</li> <li><strong>"Original Author"</strong> means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.</li> <li><strong>"Work"</strong> means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.</li> <li><strong>"You"</strong> means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.</li> <li><strong>"Publicly Perform"</strong> means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.</li> <li><strong>"Reproduce"</strong> means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.</li> </ol> <p><strong>2. Fair Dealing Rights.</strong> Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.</p> <p><strong>3. License Grant.</strong> Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:</p> <ol type="a"> <li>to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;</li> <li>to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";</li> <li>to Distribute and Publicly Perform the Work including as incorporated in Collections; and,</li> <li>to Distribute and Publicly Perform Adaptations.</li> <li> <p>For the avoidance of doubt:</p> <ol type="i"> <li><strong>Non-waivable Compulsory License Schemes</strong>. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;</li> <li><strong>Waivable Compulsory License Schemes</strong>. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,</li> <li><strong>Voluntary License Schemes</strong>. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.</li> </ol> </li> </ol> <p>The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.</p> <p><strong>4. Restrictions.</strong> The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:</p> <ol type="a"> <li>You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.</li> <li>You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.</li> <li>If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.</li> <li>Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.</li> </ol> <p><strong>5. Representations, Warranties and Disclaimer</strong></p> <p>UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.</p> <p><strong>6. Limitation on Liability.</strong> EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p> <p><strong>7. Termination</strong></p> <ol type="a"> <li>This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.</li> <li>Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.</li> </ol> <p><strong>8. Miscellaneous</strong></p> <ol type="a"> <li>Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.</li> <li>Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.</li> <li>If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.</li> <li>No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.</li> <li>This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.</li> <li>The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.</li> </ol>  <blockquote> <h3>Creative Commons Notice</h3> <p>Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor.</p> <p>Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of the License.</p> <p>Creative Commons may be contacted at <a href= "http://creativecommons.org/">http://creativecommons.org/</a>.</p> </blockquote> </div> </div> <div id="deed-foot"> <p id="footer"><a href="./">« Back to Commons Deed</a></p> </div> </div> </body> </html> ++++++ webalizer-2.23-04-conf.patch ++++++ diff -ruN webalizer-2.23-04-orig/sample.conf webalizer-2.23-04/sample.conf --- webalizer-2.23-04-orig/sample.conf 2011-01-03 05:53:33.000000000 +0100 +++ webalizer-2.23-04/sample.conf 2011-03-20 22:26:49.000000000 +0100 @@ -26,7 +26,7 @@ # (bzip2 compressed file), it will be decompressed on the fly as it # is being read. -#LogFile /var/lib/httpd/logs/access_log +LogFile /var/log/apache2/access_log # LogType defines the log type being processed. Normally, the Webalizer # expects a CLF or Combined web server log as input. Using this option, @@ -40,7 +40,7 @@ # should be a full path name, however relative ones might work as well. # If no output directory is specified, the current directory will be used. -#OutputDir /var/lib/httpd/htdocs/usage +OutputDir /srv/www/htdocs/webalizer # HistoryName allows you to specify the name of the history file produced # by the Webalizer. The history file keeps the data for previous months, @@ -168,7 +168,7 @@ # relative to the default output directory. See the DNS.README file for # additional information. -#DNSCache dns_cache.db +DNSCache dns_cache.db # DNSChildren allows you to specify how many "children" processes are # run to perform DNS lookups to create or update the DNS cache file. @@ -182,7 +182,7 @@ # normal system operations. Reasonable values should be between 5 and # 20. See the DNS.README file for additional information. -#DNSChildren 0 +DNSChildren 10 # CacheIPs allows unresolved IP addresses to be cached in the DNS # database. Normally, only resolved addresses are saved. At some @@ -214,7 +214,7 @@ # to the output directory being used unless an absolute name # (ie: starts with a leading '/') is specified. -#GeoDBDatabase /usr/share/GeoDB/GeoDB.dat +#GeoDBDatabase /var/lib/GeoDB/GeoDB.dat # The GeoIP option enables or disables the use of geolocation # services provided by the GeoIP library (http://www.maxmind.com) @@ -229,7 +229,7 @@ # (ie: starts with a leading '/'), then the name is relative to the # default output directory. This option should not normally be needed. -#GeoIPDatabase /usr/share/GeoIP/GeoIP.dat +#GeoIPDatabase /var/lib/GeoIP/GeoIP.dat # HTMLPre defines HTML code to insert at the very beginning of the # file. Default is the DOCTYPE line shown below. Max line length ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 vm-install for openSUSE:Factory
by root＠hilbert.suse.de 21 Apr '11

21 Apr '11

Hello community, here is the log from the commit of package vm-install for openSUSE:Factory checked in at Thu Apr 21 13:49:42 CEST 2011. -------- --- vm-install/vm-install.changes 2011-02-14 22:46:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/vm-install/vm-install.changes 2011-03-04 16:48:44.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Mar 4 08:40:51 MST 2011 - carnold(a)novell.com + +- bnc#631680 - OpenSUSE 11.3 KVM install of windows xp fails on + first reboot during installation. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vm-install.spec ++++++ --- /var/tmp/diff_new_pack.W6RvRd/_old 2011-04-21 13:49:23.000000000 +0200 +++ /var/tmp/diff_new_pack.W6RvRd/_new 2011-04-21 13:49:23.000000000 +0200 @@ -27,7 +27,7 @@ Group: System/Emulators/PC AutoReqProv: yes Version: 0.4.28 -Release: 4 +Release: 14 Summary: Tool to Define a Virtual Machine and Install Its Operating System Source0: %{name}-0.4.28.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ vm-install-0.4.28.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vm-install-0.4.28/src/vmdisks/disks.py new/vm-install-0.4.28/src/vmdisks/disks.py --- old/vm-install-0.4.28/src/vmdisks/disks.py 2011-02-10 00:13:27.000000000 +0100 +++ new/vm-install-0.4.28/src/vmdisks/disks.py 2011-03-04 16:45:19.000000000 +0100 @@ -83,7 +83,10 @@ sparse = 1 log.debug("Creating raw file '%s', %d bytes (sparse=%d)." % (filename, bytes, sparse)) fd = os.open(filename, os.O_WRONLY | os.O_CREAT | os.O_TRUNC) - os.chmod(filename, 0600) + if os.geteuid() == 0: + os.chmod(filename, 0600) + else: + os.chmod(filename, 0644) if sparse: offset = bytes - 1 os.lseek(fd, offset, 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