February 2011 - openSUSE Commits - openSUSE Mailing Lists

commit xen for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package xen for openSUSE:11.4 checked in at Sun Feb 27 13:17:46 CET 2011. -------- --- old-versions/11.4/all/xen/xen.changes 2011-02-14 22:34:49.000000000 +0100 +++ 11.4/xen/xen.changes 2011-02-24 19:24:37.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 24 10:17:03 CET 2011 - ohering(a)suse.de + +- bnc#674063 - drop xenpaging.autostart_delay.patch + avoid python excpetions due to intermediate xenstore and .sxp + state caused by change of xenpaging variable from int to str + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- xenpaging.autostart_delay.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xen.spec ++++++ --- /var/tmp/diff_new_pack.IiAEuL/_old 2011-02-27 13:17:30.000000000 +0100 +++ /var/tmp/diff_new_pack.IiAEuL/_new 2011-02-27 13:17:30.000000000 +0100 @@ -73,7 +73,7 @@ BuildRequires: kernel-source kernel-syms module-init-tools xorg-x11 %endif Version: 4.0.2_02 -Release: 1 +Release: 4.<RELEASE2> License: GPLv2+ Group: System/Kernel AutoReqProv: on @@ -302,7 +302,6 @@ Patch10020: xenpaging.guest_remove_page.patch Patch10021: xenpaging.mem_event_check_ring-free_requests.patch Patch10022: xenpaging.blacklist.patch -Patch10023: xenpaging.autostart_delay.patch Patch10024: xenpaging.page_already_populated.patch Patch10025: xenpaging.notify_policy_only_once.patch Patch10026: xenpaging.num_pages_equal_max_pages.patch @@ -827,7 +826,6 @@ %patch10020 -p1 %patch10021 -p1 %patch10022 -p1 -%patch10023 -p1 %patch10024 -p1 %patch10025 -p1 %patch10026 -p1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 samba for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package samba for openSUSE:11.4 checked in at Sun Feb 27 13:16:46 CET 2011. -------- --- old-versions/11.4/all/samba/samba.changes 2011-02-17 17:24:02.000000000 +0100 +++ 11.4/samba/samba.changes 2011-02-23 17:10:21.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 23 11:20:14 UTC 2011 - lmuelle(a)suse.de + +- Disable separate build of samba-doc for post-11.1 systems. + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ samba-doc.spec ++++++ --- /var/tmp/diff_new_pack.sVf4VO/_old 2011-02-27 13:16:12.000000000 +0100 +++ /var/tmp/diff_new_pack.sVf4VO/_new 2011-02-27 13:16:12.000000000 +0100 @@ -77,7 +77,7 @@ %endif Url: http://www.samba.org/ Version: 3.5.6 -Release: 6.<RELEASE2> +Release: 6.<RELEASE3> License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -296,6 +296,8 @@ ./script/mkversion.sh %install +# samba-doc nowadays is part the main samba spec file +%if 0%{?suse_version} && 0%{?suse_version} < 1111 mkdir -p \ ${RPM_BUILD_ROOT}/%{DOCDIR} \ ${RPM_BUILD_ROOT}/%{DOCBOOKDIR} \ @@ -372,6 +374,7 @@ ${RPM_BUILD_ROOT}/%{_mandir}/man1/log2pcap.1* \ ${RPM_BUILD_ROOT}/%{_mandir}/man1/vfstest.1* %endif +%endif %pre # Remove all directories and files from usr/share/samba/swat/help expect welcome-*.html @@ -389,6 +392,9 @@ %clean [ x"${RPM_BUILD_ROOT}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "${RPM_BUILD_ROOT}" +# samba-doc nowadays is part the main samba spec file +%if 0%{?suse_version} && 0%{?suse_version} < 1111 + %files -f filelist-samba-doc %defattr(-,root,root) %dir %{DOCDIR} @@ -396,6 +402,7 @@ %dir %{SWATDIR} %dir %{SWATDIR}/help %doc %{_datadir}/susehelp +%endif %description This package contains all the Samba documentation as it is not part of @@ -407,7 +414,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %changelog ++++++ samba.spec ++++++ --- /var/tmp/diff_new_pack.sVf4VO/_old 2011-02-27 13:16:12.000000000 +0100 +++ /var/tmp/diff_new_pack.sVf4VO/_new 2011-02-27 13:16:12.000000000 +0100 @@ -82,7 +82,7 @@ Url: http://www.samba.org/ AutoReqProv: on Version: 3.5.6 -Release: 6.<RELEASE2> +Release: 6.<RELEASE3> Provides: samba-gplv3 = %{version}-%{release} Obsoletes: samba-gplv3 < %{version} %ifarch ppc64 @@ -184,7 +184,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %package client @@ -230,7 +230,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -257,7 +257,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %endif @@ -287,7 +287,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %endif @@ -314,7 +314,7 @@ -------- Jeremy Allison <jra at samba dot org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %if %{make_utils} @@ -365,7 +365,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -390,7 +390,7 @@ %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbclient -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %else @@ -435,7 +435,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %package -n libnetapi0 @@ -454,7 +454,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %package -n libnetapi-devel @@ -474,7 +474,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -494,7 +494,7 @@ %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbsharemodes -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %else @@ -530,7 +530,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %package -n libtalloc2 @@ -539,7 +539,7 @@ Group: System/Libraries AutoReqProv: on Version: %{libtalloc_ver} -Release: 2.<RELEASE2> +Release: 2.<RELEASE3> PreReq: /sbin/ldconfig %description -n libtalloc2 @@ -551,7 +551,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %package -n libtalloc-devel @@ -560,7 +560,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtalloc_ver} -Release: 2.<RELEASE2> +Release: 2.<RELEASE3> Requires: libtalloc2 %description -n libtalloc-devel @@ -573,7 +573,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %package -n libtdb1 @@ -582,7 +582,7 @@ Group: System/Libraries AutoReqProv: on Version: %{libtdb_ver} -Release: 2.<RELEASE2> +Release: 2.<RELEASE3> PreReq: /sbin/ldconfig %description -n libtdb1 @@ -594,7 +594,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %package -n libtdb-devel @@ -603,7 +603,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtdb_ver} -Release: 2.<RELEASE2> +Release: 2.<RELEASE3> Requires: libtdb1 %description -n libtdb-devel @@ -616,7 +616,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %package -n libwbclient0 @@ -635,7 +635,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %package -n libwbclient-devel @@ -655,7 +655,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %package -n libtevent0 @@ -664,7 +664,7 @@ Group: System/Libraries AutoReqProv: on Version: %{libtevent_ver} -Release: 2.<RELEASE2> +Release: 2.<RELEASE3> PreReq: /sbin/ldconfig %description -n libtevent0 @@ -676,7 +676,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %package -n libtevent-devel @@ -685,7 +685,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtevent_ver} -Release: 2.<RELEASE2> +Release: 2.<RELEASE3> Requires: libtevent0 %description -n libtevent-devel @@ -699,7 +699,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %package -n libldb0 @@ -708,7 +708,7 @@ Group: System/Libraries AutoReqProv: on Version: %{libldb_ver} -Release: 2.<RELEASE2> +Release: 2.<RELEASE3> PreReq: /sbin/ldconfig %description -n libldb0 @@ -721,7 +721,7 @@ The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %package -n libldb-devel @@ -730,7 +730,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libldb_ver} -Release: 2.<RELEASE2> +Release: 2.<RELEASE3> Requires: libldb0 %description -n libldb-devel @@ -743,7 +743,7 @@ -------- The Samba Team <samba(a)samba.org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %if %{make_ldapsmb} @@ -754,7 +754,7 @@ Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 298.<RELEASE2> +Release: 298.<RELEASE3> Requires: perl-ldap %description -n ldapsmb @@ -767,7 +767,7 @@ -------- Guenther Deschner <guenther at deschner dot de> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %endif @@ -790,7 +790,7 @@ -------- Steve French <sfrench at Samba dot org> -Source Timestamp: 2497 +Source Timestamp: 2501 Branch : 3.5.6 %endif ++++++ build-source-timestamp ++++++ --- /var/tmp/diff_new_pack.sVf4VO/_old 2011-02-27 13:16:12.000000000 +0100 +++ /var/tmp/diff_new_pack.sVf4VO/_new 2011-02-27 13:16:12.000000000 +0100 @@ -1,2 +1,2 @@ -2497 +2501 Branch : 3.5.6 ++++++ patches.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/async_printcap_svc_update.diff new/patches/suse/async_printcap_svc_update.diff --- old/patches/suse/async_printcap_svc_update.diff 2011-01-14 15:18:41.000000000 +0100 +++ new/patches/suse/async_printcap_svc_update.diff 2011-02-21 23:34:24.000000000 +0100 @@ -138,7 +138,7 @@ =================================================================== --- source3/smbd/server.c.orig +++ source3/smbd/server.c -@@ -734,9 +734,9 @@ static void smbd_parent_loop(struct smbd +@@ -735,9 +735,9 @@ static void smbd_parent_loop(struct smbd /* NOTREACHED return True; */ } @@ -151,7 +151,7 @@ void reload_printers(void) { int snum; -@@ -744,9 +744,9 @@ void reload_printers(void) +@@ -745,9 +745,9 @@ void reload_printers(void) int pnum = lp_servicenumber(PRINTERS_NAME); const char *pname; @@ -163,7 +163,7 @@ for (snum = 0; snum < n_services; snum++) { /* avoid removing PRINTERS_NAME or non-autoloaded printers */ if (snum == pnum || !(lp_snum_ok(snum) && lp_print_ok(snum) && -@@ -793,7 +793,7 @@ bool reload_services(bool test) +@@ -794,7 +794,7 @@ bool reload_services(bool test) ret = lp_load(get_dyn_CONFIGFILE(), False, False, True, True); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/printcap_cache_time_abide.diff new/patches/suse/printcap_cache_time_abide.diff --- old/patches/suse/printcap_cache_time_abide.diff 2011-01-14 15:18:41.000000000 +0100 +++ new/patches/suse/printcap_cache_time_abide.diff 2011-02-21 23:34:28.000000000 +0100 @@ -20,7 +20,7 @@ =================================================================== --- source3/smbd/server.c.orig +++ source3/smbd/server.c -@@ -541,6 +541,14 @@ static bool smbd_open_one_socket(struct +@@ -542,6 +542,14 @@ static bool smbd_open_one_socket(struct return true; } @@ -35,7 +35,7 @@ /**************************************************************************** Open the socket communication. ****************************************************************************/ -@@ -668,6 +676,14 @@ static bool open_sockets_smbd(struct smb +@@ -669,6 +677,14 @@ static bool open_sockets_smbd(struct smb claim_connection(NULL,"", FLAG_MSG_GENERAL|FLAG_MSG_SMBD|FLAG_MSG_DBWRAP); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/patches/suse/remove_pcap_cache_loaded_asserts.diff new/patches/suse/remove_pcap_cache_loaded_asserts.diff --- old/patches/suse/remove_pcap_cache_loaded_asserts.diff 2011-01-18 15:40:33.000000000 +0100 +++ new/patches/suse/remove_pcap_cache_loaded_asserts.diff 2011-02-21 23:34:33.000000000 +0100 @@ -15,7 +15,7 @@ =================================================================== --- source3/smbd/server.c.orig +++ source3/smbd/server.c -@@ -760,8 +760,6 @@ void reload_printers(void) +@@ -761,8 +761,6 @@ void reload_printers(void) int pnum = lp_servicenumber(PRINTERS_NAME); const char *pname; ++++++ vendor-files.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vendor-files/tools/package-data new/vendor-files/tools/package-data --- old/vendor-files/tools/package-data 2011-02-17 17:17:54.000000000 +0100 +++ new/vendor-files/tools/package-data 2011-02-23 16:53:24.000000000 +0100 @@ -1,2 +1,2 @@ # This is an autogenrated file. -SAMBA_PACKAGE_SVN_VERSION="2497" +SAMBA_PACKAGE_SVN_VERSION="2501M" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 php5 for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package php5 for openSUSE:11.4 checked in at Sun Feb 27 13:15:31 CET 2011. -------- --- old-versions/11.4/all/php5/php5.changes 2011-02-22 16:01:00.000000000 +0100 +++ 11.4/php5/php5.changes 2011-02-25 10:51:25.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 25 09:50:17 UTC 2011 - chris(a)computersalat.de + +- fix for macros.php + o devel pkg must have Obsoletes/Provides: php-macros + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.33D3kU/_old 2011-02-27 13:14:15.000000000 +0100 +++ /var/tmp/diff_new_pack.33D3kU/_new 2011-02-27 13:14:15.000000000 +0100 @@ -77,14 +77,12 @@ ### ### Version: 5.3.5 -Release: 5.<RELEASE3> +Release: 5.<RELEASE4> License: The PHP License, version 3.01 Group: Development/Languages/Other Provides: php zend php-xml php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter Provides: php-api = %{apiver}, php-zend-abi = %{zendver} Provides: php(api) = %{apiver}, php(zend-abi) = %{zendver} -Provides: php-macros = 2.0 -Obsoletes: php-macros < 2.0 AutoReqProv: on PreReq: update-alternatives #extensions that are no longer here @@ -157,6 +155,8 @@ %endif Conflicts: php4-devel PreReq: update-alternatives +Provides: php-macros = 2.0 +Obsoletes: php-macros < 2.0 %description devel PHP is a server-side, cross-platform, HTML embedded scripting language. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 perl for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package perl for openSUSE:11.4 checked in at Sun Feb 27 13:13:09 CET 2011. -------- --- old-versions/11.4/all/perl/perl.changes 2011-02-14 16:31:43.000000000 +0100 +++ 11.4/perl/perl.changes 2011-02-23 13:54:36.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 23 13:54:05 CET 2011 - mls(a)suse.de + +- versionify perl-Test-Simple provides/obsoletes + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl.spec ++++++ --- /var/tmp/diff_new_pack.vvOeBU/_old 2011-02-27 13:13:02.000000000 +0100 +++ /var/tmp/diff_new_pack.vvOeBU/_new 2011-02-27 13:13:02.000000000 +0100 @@ -21,7 +21,7 @@ Name: perl Summary: The Perl interpreter Version: 5.12.3 -Release: 3 +Release: 11.<RELEASE2> %define pversion 5.12.3 License: Artistic License .. ; GPLv2+ Group: Development/Languages/Perl @@ -55,8 +55,10 @@ Provides: perl-500 Provides: perl-macros Obsoletes: perl-macros -Provides: perl-Filter-Simple perl-I18N-LangTags perl-MIME-Base64 perl-Storable perl-Test-Simple -Obsoletes: perl-Filter-Simple perl-I18N-LangTags perl-MIME-Base64 perl-Storable perl-Test-Simple +Provides: perl-Filter-Simple perl-I18N-LangTags perl-MIME-Base64 perl-Storable +Provides: perl-Test-Simple = 0.94-%{release} +Obsoletes: perl-Filter-Simple perl-I18N-LangTags perl-MIME-Base64 perl-Storable +Obsoletes: perl-Test-Simple < 0.94 Provides: perl-Text-Balanced perl-Time-HiRes perl-libnet Obsoletes: perl-Text-Balanced perl-Time-HiRes perl-libnet Provides: perl-Compress-Zlib perl-Compress-Raw-Zlib ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 pam for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package pam for openSUSE:11.4 checked in at Sun Feb 27 13:11:32 CET 2011. -------- --- old-versions/11.4/all/pam/pam.changes 2010-10-28 16:27:30.000000000 +0200 +++ 11.4/pam/pam.changes 2011-02-23 13:46:27.000000000 +0100 @@ -1,0 +2,17 @@ +Wed Feb 23 12:45:03 UTC 2011 - vcizek(a)novell.com + +- bnc#673826 rework + * manpage is left intact, as it was + * correct parsing of "quiet" option + +------------------------------------------------------------------- + +Wed Feb 23 10:00:22 UTC 2011 - vcizek(a)novell.com + +- fix for bnc#673826 (pam_listfile) + * removed unnecessary logging when listfile is missing and quiet +option is specified + * manpage is also updated, to reflect that all option +require values + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- pam_listfile-quiet.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pam.spec ++++++ --- /var/tmp/diff_new_pack.y0EiLV/_old 2011-02-27 13:10:50.000000000 +0100 +++ /var/tmp/diff_new_pack.y0EiLV/_new 2011-02-27 13:10:50.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package pam (Version 1.1.3) +# spec file for package pam # -# 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 @@ -38,7 +38,7 @@ %endif # Version: 1.1.3 -Release: 1 +Release: 4.<RELEASE2> Summary: A Security Tool that Provides Authentication for Applications Source: Linux-PAM-%{version}.tar.bz2 Source1: Linux-PAM-%{version}-docs.tar.bz2 @@ -50,7 +50,9 @@ Source7: common-session.pamd Source8: etc.environment Source9: baselibs.conf -Patch: pam_tally-deprecated.diff +Patch0: pam_tally-deprecated.diff +# fix for bnc#673826 (pam_listfile logging) +Patch1: pam_listfile-quiet.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -99,7 +101,8 @@ %prep %setup -q -n Linux-PAM-%{version} -b 1 -%patch -p0 +%patch0 -p0 +%patch1 -p1 %build CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" \ ++++++ pam_listfile-quiet.patch ++++++ diff -u -r Linux-PAM-1.1.3.orig/modules/pam_listfile/pam_listfile.c Linux-PAM-1.1.3/modules/pam_listfile/pam_listfile.c --- Linux-PAM-1.1.3.orig/modules/pam_listfile/pam_listfile.c 2009-12-08 15:41:41.000000000 +0100 +++ Linux-PAM-1.1.3/modules/pam_listfile/pam_listfile.c 2011-02-23 13:27:04.356265509 +0100 @@ -78,8 +78,14 @@ { const char *junk; + /* option quiet has no value */ + if(!strcmp(argv[i],"quiet")) { + quiet = 1; + continue; + } + memset(mybuf,'\0',sizeof(mybuf)); - memset(myval,'\0',sizeof(mybuf)); + memset(myval,'\0',sizeof(myval)); junk = strchr(argv[i], '='); if((junk == NULL) || (junk - argv[i]) >= (int) sizeof(mybuf)) { pam_syslog(pamh,LOG_ERR, "Bad option: \"%s\"", @@ -142,8 +148,6 @@ apply_type=APPLY_TYPE_USER; strncpy(apply_val,myval,sizeof(apply_val)-1); } - } else if (!strcmp(mybuf,"quiet")) { - quiet = 1; } else { free(ifname); pam_syslog(pamh,LOG_ERR, "Unknown option: %s",mybuf); @@ -283,7 +287,8 @@ ifname, citem, citemp, sense); #endif if(lstat(ifname,&fileinfo)) { - pam_syslog(pamh,LOG_ERR, "Couldn't open %s",ifname); + if(!quiet) + pam_syslog(pamh,LOG_ERR, "Couldn't open %s",ifname); free(ifname); return onerr; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 nbd for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package nbd for openSUSE:11.4 checked in at Sun Feb 27 13:10:13 CET 2011. -------- --- old-versions/11.4/all/nbd/nbd.changes 2009-08-05 12:02:50.000000000 +0200 +++ 11.4/nbd/nbd.changes 2011-02-25 12:41:13.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Feb 25 12:40:16 CET 2011 - ms(a)suse.de + +- Update to nbd-2.9.20: + * Documentation update + * Fix buffer size checking (bnc #674281) + * Extend test suite and fix named exports + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- nbd-2.9.13-close.diff nbd-2.9.13-doc.diff nbd-2.9.13-warn.diff nbd-2.9.13.tar.bz2 New: ---- nbd-2.9.20-close.diff nbd-2.9.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nbd.spec ++++++ --- /var/tmp/diff_new_pack.i07VYf/_old 2011-02-27 13:08:55.000000000 +0100 +++ /var/tmp/diff_new_pack.i07VYf/_new 2011-02-27 13:08:55.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package nbd (Version 2.9.13) +# spec file for package nbd # -# Copyright (c) 2009 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 @@ -21,16 +21,14 @@ Name: nbd BuildRequires: doxygen glib2-devel PreReq: %insserv_prereq coreutils -Version: 2.9.13 -Release: 2 -License: GPL v2 or later +Version: 2.9.20 +Release: 1.<RELEASE2> +License: GPLv2+ Group: Productivity/Networking/Other AutoReqProv: on Source: %{name}-%{version}.tar.bz2 Source2: init.nbd-server -Patch2: nbd-2.9.13-warn.diff -Patch3: nbd-2.9.13-doc.diff -Patch4: nbd-2.9.13-close.diff +Patch2: nbd-2.9.20-close.diff Summary: Network Block Device Server and Client Utilities Url: http://nbd.sourceforge.net/ Prefix: /usr @@ -65,7 +63,7 @@ Paul Clements <Paul.Clements(a)steeleye.com> %package doc -License: GPL v2 or later +License: GPLv2+ Summary: Network Block Device Server and Client Utilities Group: Productivity/Networking/Other Requires: nbd = %{version} @@ -97,14 +95,9 @@ %prep %setup %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -touch nbd-client.8 %build -autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -fstack-protector" -#export CFLAGS="$RPM_OPT_FLAGS" ./configure --with-gnu-ld --prefix=/usr --mandir=%{_mandir} \ --infodir=%{_infodir} --libdir=%{_libdir} --libexecdir=%{_libdir} \ --program-prefix="" --sysconfdir=/etc --build=%{_target_cpu}-suse-linux ++++++ nbd-2.9.13-close.diff -> nbd-2.9.20-close.diff ++++++ --- old-versions/11.4/all/nbd/nbd-2.9.13-close.diff 2009-08-05 12:02:48.000000000 +0200 +++ 11.4/nbd/nbd-2.9.20-close.diff 2011-02-25 12:41:12.000000000 +0100 @@ -1,5 +1,5 @@ ---- nbd-2.9.13/nbd-client.c 2009-08-05 11:52:04.000000000 +0200 -+++ nbd-2.9.13/nbd-client.c 2009-08-05 11:54:20.000000000 +0200 +--- nbd-2.9.20/nbd-client.c 2009-08-05 11:52:04.000000000 +0200 ++++ nbd-2.9.20/nbd-client.c 2009-08-05 11:54:20.000000000 +0200 @@ -62,6 +62,7 @@ len=read(fd, buf, 256); buf[len-1]='\0'; ++++++ nbd-2.9.13.tar.bz2 -> nbd-2.9.20.tar.bz2 ++++++ ++++ 20760 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 mozilla-xulrunner20 for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package mozilla-xulrunner20 for openSUSE:11.4 checked in at Sun Feb 27 13:08:42 CET 2011. -------- --- old-versions/11.4/all/mozilla-xulrunner20/mozilla-xulrunner20.changes 2011-02-17 20:13:51.000000000 +0100 +++ 11.4/mozilla-xulrunner20/mozilla-xulrunner20.changes 2011-02-23 10:07:39.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 23 07:51:12 UTC 2011 - wr(a)rosenauer.org + +- update to 2.0b12 +- update supported locale provides + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- l10n-2.0b11.tar.bz2 xulrunner-source-2.0b11.tar.bz2 New: ---- l10n-2.0b12.tar.bz2 xulrunner-source-2.0b12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner20.spec ++++++ --- /var/tmp/diff_new_pack.F8BjFy/_old 2011-02-27 13:02:43.000000000 +0100 +++ /var/tmp/diff_new_pack.F8BjFy/_new 2011-02-27 13:02:43.000000000 +0100 @@ -30,10 +30,10 @@ BuildRequires: wireless-tools %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 2.0b11 -Release: 4.<RELEASE3> -%define releasedate 2011020300 -%define version_internal 2.0b11 +Version: 2.0b12 +Release: 1.<RELEASE2> +%define releasedate 2011022200 +%define version_internal 2.0b12 %define apiversion 2.0 %define uaweight 199900 Summary: Mozilla Runtime Environment 2.0 @@ -163,7 +163,7 @@ Summary: Extra translations for XULRunner 2.0 Group: System/Localization Requires: %{name} = %{version} -Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;ku;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi) +Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;zu) Obsoletes: %{name}-translations < %{version}-%{release} %description translations-other @@ -358,7 +358,7 @@ touch %{_tmppath}/translations.{common,other} for locale in $(awk '{ print $1; }' ../mozilla/browser/locales/shipped-locales); do case $locale in - ja-JP-mac|en-US) + ja-JP-mac|en-US|bn-IN) ;; *) pushd $RPM_BUILD_DIR/compare-locales ++++++ compare-locales.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compare-locales/lib/Mozilla/Checks.py new/compare-locales/lib/Mozilla/Checks.py --- old/compare-locales/lib/Mozilla/Checks.py 2011-02-04 10:10:07.000000000 +0100 +++ new/compare-locales/lib/Mozilla/Checks.py 2011-02-23 09:14:08.000000000 +0100 @@ -37,6 +37,7 @@ import re import itertools +import codecs from difflib import SequenceMatcher from xml import sax try: @@ -52,7 +53,7 @@ pattern = None def use(self, file): - return self.pattern.match(file) + return self.pattern.match(file.file) def check(self, refEnt, l10nEnt): '''Given the reference and localized Entities, performs checks. @@ -187,30 +188,40 @@ class DTDChecker(Checker): - '''Tests to run on DTD files. + """Tests to run on DTD files. Uses xml.sax for the heavy lifting of xml parsing. The code tries to parse until it doesn't find any unresolved entities anymore. If it finds one, it tries to grab the key, and adds an empty <!ENTITY key ""> definition to the header. - ''' + """ pattern = re.compile('.*\.dtd$') eref = re.compile('&(%s);' % DTDParser.Name) tmpl = '''<!DOCTYPE elem [%s]> -<elem> -%s -</elem> +<elem>%s</elem> ''' xmllist = set(('amp', 'lt', 'gt', 'apos', 'quot')) + # Setup for XML parser, with default and text-only content handler + parser = sax.make_parser() + class TextContent(sax.handler.ContentHandler): + textcontent = '' + def characters(self, content): + self.textcontent += content + + defaulthandler = sax.handler.ContentHandler() + texthandler = TextContent() + + processContent = None + def check(self, refEnt, l10nEnt): - '''Try to parse the refvalue inside a dummy element, and keep + """Try to parse the refvalue inside a dummy element, and keep track of entities that we need to define to make that work. Return a checker that offers just those entities. - ''' + """ refValue, l10nValue = refEnt.val, l10nEnt.val # find entities the refValue references, # reusing markup from DTDParser. @@ -218,9 +229,13 @@ for m in self.eref.finditer(refValue)) \ - self.xmllist entities = ''.join('<!ENTITY %s "">' % s for s in sorted(reflist)) - parser = sax.make_parser() + if self.processContent is None: + self.parser.setContentHandler(self.defaulthandler) + else: + self.texthandler.textcontent = '' + self.parser.setContentHandler(self.texthandler) try: - parser.parse(StringIO(self.tmpl % (entities, refValue.encode('utf-8')))) + self.parser.parse(StringIO(self.tmpl % (entities, refValue.encode('utf-8')))) except sax.SAXParseException, e: yield ('warning', (0,0), @@ -237,29 +252,106 @@ if reflist: warntmpl += ' (%s known)' % ', '.join(sorted(reflist)) try: - parser.parse(StringIO(self.tmpl % (_entities, l10nValue.encode('utf-8')))) + if self.processContent is not None: + self.texthandler.textcontent = '' + self.parser.parse(StringIO(self.tmpl % (_entities, l10nValue.encode('utf-8')))) except sax.SAXParseException, e: # xml parse error, yield error # sometimes, the error is reported on our fake closing # element, make that the end of the last line - lnr = e.getLineNumber() - 2 + lnr = e.getLineNumber() - 1 lines = l10nValue.splitlines() if lnr > len(lines): lnr = len(lines) col = len(lines[lnr-1]) else: col = e.getColumnNumber() + if lnr == 1: + col -= len("<elem>") # first line starts with <elem>, substract yield ('error', (lnr, col), ' '.join(e.args)) for key in missing: yield ('warning', (0,0), warntmpl % key) + if self.processContent is not None: + for t in self.processContent(self.texthandler.textcontent): + yield t -__checks = [DTDChecker(), PropertiesChecker()] + +class PrincessAndroid(DTDChecker): + """Checker for the string values that Android puts into an XML container. + + http://developer.android.com/guide/topics/resources/string-resource.html#Fo… + has more info. Check for unescaped apostrophes and bad unicode escapes. + """ + quoted = re.compile("(?P<q>[\"']).*(?P=q)$") + def unicode_escape(self, str): + """Helper method to try to decode all unicode escapes in a string. + + This code uses the standard python decode for unicode-escape, but that's + somewhat tricky, as its input needs to be ascii. To get to ascii, the + unicode string gets converted to ascii with backslashreplace, i.e., + all non-ascii unicode chars get unicode escaped. And then we try to roll + all of that back. + Now, when that hits an error, that's from the original string, and we need + to search for the actual error position in the original string, as the + backslashreplace code changes string positions quite badly. See also the + last check in TestAndroid.test_android_dtd, with a lengthy chinese string. + """ + val = str.encode('ascii', 'backslashreplace') + try: + val.decode('unicode-escape') + except UnicodeDecodeError, e: + args = list(e.args) + badstring = args[1][args[2]:args[3]] + i = str.rindex(badstring, 0, args[3]) + args[2] = i + args[3] = i + len(badstring) + raise UnicodeDecodeError(*args) + def use(self, file): + """Use this Checker only for DTD files in embedding/android.""" + return (file.module == "embedding/android") and DTDChecker.pattern.match(file.file) + def processContent(self, val): + """Actual check code. + Check for unicode escapes and unescaped quotes and apostrophes, if string's not quoted. + """ + # first, try to decode unicode escapes + try: + self.unicode_escape(val) + except UnicodeDecodeError, e: + yield ('error', e.args[2], e.args[4]) + # check for unescaped single or double quotes. + # first, see if the complete string is single or double quoted, that changes the rules + m = self.quoted.match(val) + if m: + q = m.group('q') + offset = 0 + val = val[1:-1] # strip quotes + else: + q = "[\"']" + offset = -1 + stray_quot = re.compile(r"[\\\\]*(%s)" % q) + + for m in stray_quot.finditer(val): + if len(m.group(0)) % 2: + # found an unescaped single or double quote, which message? + msg = m.group(1) == '"' and u"Quotes in Android DTDs need escaping with \\\" or \\u0022, or put string in apostrophes." \ + or u"Apostrophes in Android DTDs need escaping with \\' or \\u0027, or use \u2019, or put string in quotes." + yield ('error', m.end(0)+offset, msg) + + +class __checks: + props = PropertiesChecker() + android_dtd = PrincessAndroid() + dtd = DTDChecker() def getChecks(file): - checks = map(lambda c: c.check, filter(lambda c: c.use(file), __checks)) - def _checks(refEnt, l10nEnt): - return itertools.chain(*[c(refEnt, l10nEnt) for c in checks]) - return _checks + check = None + if __checks.props.use(file): + check = __checks.props.check + elif __checks.android_dtd.use(file): + check = __checks.android_dtd.check + elif __checks.dtd.use(file): + check = __checks.dtd.check + return check diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compare-locales/lib/Mozilla/CompareLocales.py new/compare-locales/lib/Mozilla/CompareLocales.py --- old/compare-locales/lib/Mozilla/CompareLocales.py 2011-02-04 10:10:07.000000000 +0100 +++ new/compare-locales/lib/Mozilla/CompareLocales.py 2011-02-23 09:14:08.000000000 +0100 @@ -425,9 +425,9 @@ f.write(''.join(map(ensureNewline,trailing))) f.close() def notify(self, category, file, data): - '''Check filterObserver for the found data, and if it's + """Check filterObserver for the found data, and if it's not to ignore, notify observers. - ''' + """ rv = self.filterObserver.notify(category, file, data) if rv == 'ignore': return rv @@ -441,7 +441,7 @@ def compare(self, ref_file, l10n): try: p = Parser.getParser(ref_file.file) - checks = Checks.getChecks(ref_file.file) + checks = Checks.getChecks(ref_file) except UserWarning: # no comparison, XXX report? return @@ -575,7 +575,7 @@ # overload this if needed pass -def compareApp(app, otherObserver = None, merge_stage = None): +def compareApp(app, otherObserver = None, merge_stage = None, clobber = False): '''Compare locales set in app. Optional arguments are: @@ -584,6 +584,8 @@ The return values of that callback are ignored. - merge_stage. A directory to be used for staging the output of l10n-merge. + - clobber. Clobber the module subdirectories of the merge dir as we go. + Use wisely, as it might cause data loss. ''' o = Observer() cc = ContentComparer(o) @@ -592,6 +594,12 @@ cc.set_merge_stage(merge_stage) o.filter = app.filter for module, reference, locales in app: + if merge_stage is not None and clobber: + # if clobber and merge is on, remove the stage for the module if it exists + clobberdir = os.path.join(merge_stage, module) + if os.path.exists(clobberdir): + shutil.rmtree(clobberdir) + print "clobbered " + clobberdir dc = DirectoryCompare(reference) dc.setWatcher(cc) for locale, localization in locales: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compare-locales/lib/Mozilla/tests/unitChecks.py new/compare-locales/lib/Mozilla/tests/unitChecks.py --- old/compare-locales/lib/Mozilla/tests/unitChecks.py 2011-02-04 10:10:07.000000000 +0100 +++ new/compare-locales/lib/Mozilla/tests/unitChecks.py 2011-02-23 09:14:08.000000000 +0100 @@ -1,29 +1,30 @@ import unittest from Mozilla.Checks import getChecks -from Mozilla.Parser import getParser +from Mozilla.Parser import getParser, Entity +from Mozilla.Paths import File class BaseHelper(unittest.TestCase): - filename = None + file = None refContent = None def setUp(self): - p = getParser(self.filename) + p = getParser(self.file.file) p.readContents(self.refContent) self.refs = [e for e in p] def _test(self, content, refWarnOrErrors): - p = getParser(self.filename) + p = getParser(self.file.file) p.readContents(content) l10n = [e for e in p] - checks = getChecks(self.filename) + checks = getChecks(self.file) found = tuple(checks(self.refs[0], l10n[0])) self.assertEqual(found, refWarnOrErrors) class TestPlurals(BaseHelper): - filename = 'foo.properties' + file = File('foo.properties', 'foo.properties') refContent = '''# LOCALIZATION NOTE (downloadsTitleFiles): Semi-colon list of plural forms. # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals # #1 number of files @@ -60,18 +61,147 @@ class TestDTDs(BaseHelper): - filename = 'foo.dtd' + file = File('foo.dtd', 'foo.dtd') refContent = '''<!ENTITY foo "This is 'good'"> ''' def testWarning(self): self._test('''<!ENTITY foo "This is ¬ good"> ''', (('warning',(0,0),'Referencing unknown entity `not`'),)) + def testErrorFirstLine(self): + self._test('''<!ENTITY foo "This is </bad> stuff"> +''', + (('error',(1,10),'mismatched tag'),)) + def testErrorSecondLine(self): + self._test('''<!ENTITY foo "This is + </bad> +stuff"> +''', + (('error',(2,4),'mismatched tag'),)) def testXMLEntity(self): self._test('''<!ENTITY foo "This is "good""> ''', tuple()) +class TestAndroid(unittest.TestCase): + """Test Android checker + + Make sure we're hitting our extra rules only if + we're passing in a DTD file in the embedding/android module. + """ + apos_msg = u"Apostrophes in Android DTDs need escaping with \\' or \\u0027, " + \ + u"or use \u2019, or put string in quotes." + quot_msg = u"Quotes in Android DTDs need escaping with \\\" or \\u0022, " + \ + u"or put string in apostrophes." + def getEntity(self, v): + return Entity(v, lambda s: s, (0, len(v)), (), (0, 0), (), (), (0, len(v)), ()) + def test_android_dtd(self): + """Testing the actual android checks. The logic is involved, so this is a lot + of nitty gritty detail tests. + """ + f = File("embedding/android/strings.dtd", "strings.dtd", "embedding/android") + checks = getChecks(f) + # good string + ref = self.getEntity("plain string") + l10n = self.getEntity("plain localized string") + self.assertEqual(tuple(checks(ref, l10n)), + ()) + # dtd warning + l10n = self.getEntity("plain localized string &ref;") + self.assertEqual(tuple(checks(ref, l10n)), + (('warning', (0, 0), 'Referencing unknown entity `ref`'),)) + # no report on stray ampersand or quote, if not completely quoted + for i in xrange(3): + # make sure we're catching unescaped apostrophes, try 0..5 backticks + l10n = self.getEntity("\\"*(2*i) + "'") + self.assertEqual(tuple(checks(ref, l10n)), + (('error', 2*i, self.apos_msg),)) + l10n = self.getEntity("\\"*(2*i + 1) + "'") + self.assertEqual(tuple(checks(ref, l10n)), + ()) + # make sure we don't report if apos string is quoted + l10n = self.getEntity('"' + "\\"*(2*i) + "'\"") + tpl = tuple(checks(ref, l10n)) + self.assertEqual(tpl, (), "`%s` shouldn't fail but got %s" % (l10n.val, str(tpl))) + l10n = self.getEntity('"' + "\\"*(2*i+1) + "'\"") + tpl = tuple(checks(ref, l10n)) + self.assertEqual(tpl, (), "`%s` shouldn't fail but got %s" % (l10n.val, str(tpl))) + # make sure we're catching unescaped quotes, try 0..5 backticks + l10n = self.getEntity("\\"*(2*i) + "\"") + self.assertEqual(tuple(checks(ref, l10n)), + (('error', 2*i, self.quot_msg),)) + l10n = self.getEntity("\\"*(2*i + 1) + "'") + self.assertEqual(tuple(checks(ref, l10n)), + ()) + # make sure we don't report if quote string is single quoted + l10n = self.getEntity("'" + "\\"*(2*i) + "\"'") + tpl = tuple(checks(ref, l10n)) + self.assertEqual(tpl, (), "`%s` shouldn't fail but got %s" % (l10n.val, str(tpl))) + l10n = self.getEntity('"' + "\\"*(2*i+1) + "'\"") + tpl = tuple(checks(ref, l10n)) + self.assertEqual(tpl, (), "`%s` shouldn't fail but got %s" % (l10n.val, str(tpl))) + # check for mixed quotes and ampersands + l10n = self.getEntity("'\"") + self.assertEqual(tuple(checks(ref, l10n)), + (('error', 0, self.apos_msg), + ('error', 1, self.quot_msg))) + l10n = self.getEntity("''\"'") + self.assertEqual(tuple(checks(ref, l10n)), + (('error', 1, self.apos_msg),)) + l10n = self.getEntity('"\'""') + self.assertEqual(tuple(checks(ref, l10n)), + (('error', 2, self.quot_msg),)) + + # broken unicode escape + l10n = self.getEntity("Some broken \u098 unicode") + self.assertEqual(tuple(checks(ref, l10n)), + (('error', 12, 'truncated \\uXXXX escape'),)) + # broken unicode escape, try to set the error off + l10n = self.getEntity(u"\u9690"*14+"\u006"+" "+"\u0064") + self.assertEqual(tuple(checks(ref, l10n)), + (('error', 14, 'truncated \\uXXXX escape'),)) + def test_android_prop(self): + f = File("embedding/android/strings.properties", "strings.properties", "embedding/android") + checks = getChecks(f) + # good plain string + ref = self.getEntity("plain string") + l10n = self.getEntity("plain localized string") + self.assertEqual(tuple(checks(ref, l10n)), + ()) + # no dtd warning + ref = self.getEntity("plain string") + l10n = self.getEntity("plain localized string &ref;") + self.assertEqual(tuple(checks(ref, l10n)), + ()) + # no report on stray ampersand + ref = self.getEntity("plain string") + l10n = self.getEntity("plain localized string with apos: '") + self.assertEqual(tuple(checks(ref, l10n)), + ()) + # report on bad printf + ref = self.getEntity("string with %s") + l10n = self.getEntity("string with %S") + self.assertEqual(tuple(checks(ref, l10n)), + (('error', 0, 'argument 1 `S` should be `s`'),)) + def test_non_android_dtd(self): + f = File("browser/strings.dtd", "strings.dtd", "browser") + checks = getChecks(f) + # good string + ref = self.getEntity("plain string") + l10n = self.getEntity("plain localized string") + self.assertEqual(tuple(checks(ref, l10n)), + ()) + # dtd warning + ref = self.getEntity("plain string") + l10n = self.getEntity("plain localized string &ref;") + self.assertEqual(tuple(checks(ref, l10n)), + (('warning', (0, 0), 'Referencing unknown entity `ref`'),)) + # no report on stray ampersand + ref = self.getEntity("plain string") + l10n = self.getEntity("plain localized string with apos: '") + self.assertEqual(tuple(checks(ref, l10n)), + ()) + if __name__ == '__main__': unittest.main() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compare-locales/scripts/compare-locales new/compare-locales/scripts/compare-locales --- old/compare-locales/scripts/compare-locales 2011-02-04 10:10:07.000000000 +0100 +++ new/compare-locales/scripts/compare-locales 2011-02-23 09:14:08.000000000 +0100 @@ -57,6 +57,12 @@ 'localization. [default: en-US]') parser.add_option('-m', '--merge', help='Use this directory to stage merged files') +parser.add_option('--clobber-merge', action="store_true", default=False, dest='clobber', + help="""WARNING: DATALOSS. +Use this option with care. If specified, the merge directory will +be clobbered for each module. That means, the subdirectory will +be completely removed, any files that were there are lost. +Be careful to specify the right merge directory when using this option.""") parser.add_option('--json', action='store_true', dest='json', help='Dump just summary as exhibit JSON') @@ -73,7 +79,11 @@ app = EnumerateApp(inipath, l10nbase, locales) app.reference = options.reference -o = compareApp(app, merge_stage = options.merge) +try: + o = compareApp(app, merge_stage = options.merge, clobber = options.clobber) +except (OSError, IOError), e: + print "FAIL: " + str(e) + parser.exit(2) so = {} if options.json: so['type']='application/json' ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.F8BjFy/_old 2011-02-27 13:02:43.000000000 +0100 +++ /var/tmp/diff_new_pack.F8BjFy/_new 2011-02-27 13:02:43.000000000 +0100 @@ -1,8 +1,8 @@ #!/bin/bash BRANCH="mozilla-central" -RELEASE_TAG="FIREFOX_4_0b11_RELEASE" -VERSION="2.0b11" +RELEASE_TAG="FIREFOX_4_0b12_RELEASE" +VERSION="2.0b12" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla ++++++ l10n-2.0b11.tar.bz2 -> l10n-2.0b12.tar.bz2 ++++++ old-versions/11.4/all/mozilla-xulrunner20/l10n-2.0b11.tar.bz2 11.4/mozilla-xulrunner20/l10n-2.0b12.tar.bz2 differ: char 11, line 1 ++++++ mozilla-gio-launch-uri.patch ++++++ --- /var/tmp/diff_new_pack.F8BjFy/_old 2011-02-27 13:02:43.000000000 +0100 +++ /var/tmp/diff_new_pack.F8BjFy/_new 2011-02-27 13:02:43.000000000 +0100 @@ -1,13 +1,13 @@ # HG changeset patch -# Parent f81b405b9adebc56c3af5cfbf2f74cf01c22956b +# Parent 7d47a19639db505e19282ac69c305c636d0fec18 diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -@@ -51,16 +51,18 @@ - #include <contentaction/contentaction.h> +@@ -53,16 +53,18 @@ #include "nsContentHandlerApp.h" #endif + #endif #include "nsMIMEInfoUnix.h" #include "nsCommonRegistry.h" @@ -23,7 +23,7 @@ #include "nsKDEUtils.h" #endif -@@ -170,38 +172,47 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns +@@ -172,38 +174,47 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns } if (!mDefaultApplication) return NS_ERROR_FILE_NOT_FOUND; ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.F8BjFy/_old 2011-02-27 13:02:43.000000000 +0100 +++ /var/tmp/diff_new_pack.F8BjFy/_new 2011-02-27 13:02:43.000000000 +0100 @@ -89,7 +89,7 @@ } //---------------------------------------------------------------------------------------- -@@ -826,28 +845,40 @@ static nsresult pref_InitDefaults() +@@ -890,24 +909,36 @@ static nsresult pref_InitInitialObjects( /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ static const char* specialFiles[] = { #if defined(XP_MAC) || defined(XP_MACOSX) @@ -99,22 +99,18 @@ #elif defined(XP_UNIX) "unix.js" + , "" // placeholder for KDE (empty is otherwise harmless) - #if defined(VMS) - , "openvms.js" - #elif defined(_AIX) + #if defined(_AIX) , "aix.js" #endif #elif defined(XP_OS2) "os2pref.js" - #elif defined(XP_BEOS) - "beos.js" #endif }; + if(nsKDEUtils::kdeSession()) { // TODO what if some setup actually requires the helper? + for( int i = 0; -+ i < NS_ARRAY_LENGTH(specialFiles); -+ ++i ) { ++ i < NS_ARRAY_LENGTH(specialFiles); ++ ++i ) { + if( *specialFiles[ i ] == '\0' ) { + specialFiles[ i ] = "kde.js"; + break; @@ -127,8 +123,8 @@ NS_WARNING("Error parsing application default preferences."); } - return NS_OK; - } + rv = pref_LoadPrefsInDirList(NS_APP_PREFS_DEFAULTS_DIR_LIST); + NS_ENSURE_SUCCESS(rv, rv); diff --git a/toolkit/components/downloads/src/Makefile.in b/toolkit/components/downloads/src/Makefile.in --- a/toolkit/components/downloads/src/Makefile.in @@ -2155,9 +2151,9 @@ CPPSRCS += nsNativeAppSupportQt.cpp CPPSRCS += nsQAppInstance.cpp EXPORTS += nsQAppInstance.h - ifdef MOZ_ENABLE_MEEGOTOUCH - MOCSRCS += moc_MozMeegoAppService.cpp - CPPSRCS += moc_MozMeegoAppService.cpp + else + CPPSRCS += nsNativeAppSupportDefault.cpp + endif diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp new file mode 100644 --- /dev/null @@ -2949,13 +2945,13 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -@@ -48,28 +48,31 @@ - #include <QDesktopServices> - #include <QUrl> +@@ -50,28 +50,31 @@ #include <QString> + #if (MOZ_ENABLE_CONTENTACTION) #include <contentaction/contentaction.h> #include "nsContentHandlerApp.h" #endif + #endif #include "nsMIMEInfoUnix.h" -#include "nsGNOMERegistry.h" @@ -2983,7 +2979,7 @@ nsCAutoString spec; aURI->GetAsciiSpec(spec); if (hildon_uri_open(spec.get(), action, nsnull)) -@@ -91,22 +94,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * +@@ -93,22 +96,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * return rv; } @@ -3008,7 +3004,7 @@ if (*_retval) return NS_OK; -@@ -149,32 +152,49 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns +@@ -151,32 +154,49 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get())); if (action.isValid()) { action.trigger(); @@ -3063,7 +3059,7 @@ --- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp +++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp @@ -44,17 +44,17 @@ - #if (MOZ_PLATFORM_MAEMO == 6) + #if defined(MOZ_ENABLE_CONTENTACTION) #include <contentaction/contentaction.h> #include <QString> #endif @@ -3665,11 +3661,11 @@ endif ifdef MOZ_PLATFORM_MAEMO - CFLAGS += $(MOZ_PLATFORM_MAEMO_CFLAGS) + CFLAGS += $(MOZ_PLATFORM_MAEMO_CFLAGS) $(MOZ_QT_CFLAGS) diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp --- a/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp -@@ -91,16 +91,17 @@ +@@ -93,16 +93,17 @@ #include "prproces.h" #include "nsIDirectoryEnumerator.h" #include "nsISimpleEnumerator.h" @@ -3687,7 +3683,7 @@ #include "prmem.h" #include "plbase64.h" -@@ -1820,44 +1821,50 @@ nsLocalFile::Launch() +@@ -1822,44 +1823,50 @@ nsLocalFile::Launch() return NS_OK; } @@ -3752,7 +3748,7 @@ return rv; } return NS_ERROR_FAILURE; -@@ -1883,16 +1890,23 @@ nsLocalFile::Launch() +@@ -1885,16 +1892,23 @@ nsLocalFile::Launch() if (nsnull == connection) return NS_ERROR_FAILURE; ++++++ mozilla-language.patch ++++++ --- /var/tmp/diff_new_pack.F8BjFy/_old 2011-02-27 13:02:43.000000000 +0100 +++ /var/tmp/diff_new_pack.F8BjFy/_new 2011-02-27 13:02:43.000000000 +0100 @@ -1,37 +1,30 @@ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> -# Parent 4a8194d5971401441da4f4f3bbd2730e506da4bc +# Parent 05766406681babf9a5a433649b5ba2b9741b9962 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp --- a/intl/locale/src/nsLocaleService.cpp +++ b/intl/locale/src/nsLocaleService.cpp -@@ -192,22 +192,24 @@ nsLocaleService::nsLocaleService(void) - return; +@@ -181,16 +181,17 @@ nsLocaleService::nsLocaleService(void) } - #ifdef MOZ_ENABLE_MEEGOTOUCH - // Create a snapshot of the gconf locale values into the - // corresponding environment variables to obey system settings - // as accurately as possible. - CopyGConfToEnv("/meegotouch/i18n/language", "LANG"); -+ CopyGConfToEnv("/meegotouch/i18n/language", "LANGUAGE"); - CopyGConfToEnv("/meegotouch/i18n/lc_collate", NSILOCALE_COLLATE); - CopyGConfToEnv("/meegotouch/i18n/lc_monetary", NSILOCALE_MONETARY); - CopyGConfToEnv("/meegotouch/i18n/lc_numeric", NSILOCALE_NUMERIC); - CopyGConfToEnv("/meegotouch/i18n/lc_time", NSILOCALE_TIME); - #endif + + #ifdef MOZ_WIDGET_QT + const char* lang = QLocale::languageToString(QLocale::system().language()).toAscii(); + #else // Get system configuration -+ const char* language = getenv("LANGUAGE"); const char* lang = getenv("LANG"); ++ const char* language = getenv("LANGUAGE"); + #endif + for( i = 0; i < LocaleListLength; i++ ) { nsresult result; // setlocale( , "") evaluates LC_* and LANG char* lc_temp = setlocale(posix_locale_category[i], ""); CopyASCIItoUTF16(LocaleList[i], category); category_platform = category; - category_platform.AppendLiteral("##PLATFORM"); -@@ -222,16 +224,21 @@ nsLocaleService::nsLocaleService(void) +@@ -206,16 +207,21 @@ nsLocaleService::nsLocaleService(void) else { CopyASCIItoUTF16(lang, platformLocale); result = posixConverter->GetXPLocale(lang, xpLocale); ++++++ xulrunner-source-2.0b11.tar.bz2 -> xulrunner-source-2.0b12.tar.bz2 ++++++ old-versions/11.4/all/mozilla-xulrunner20/xulrunner-source-2.0b11.tar.bz2 11.4/mozilla-xulrunner20/xulrunner-source-2.0b12.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mailman for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package mailman for openSUSE:11.4 checked in at Sun Feb 27 12:56:39 CET 2011. -------- --- old-versions/11.4/all/mailman/mailman.changes 2010-11-15 10:49:19.000000000 +0100 +++ 11.4/mailman/mailman.changes 2011-02-23 19:43:22.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 23 19:42:27 CET 2011 - matejcik(a)suse.cz + +- fixed a XSS vulnerability in confirm.py (CVE-2011-0707, bnc#671745) + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- minmem New: ---- mailman-2.1.14-CVE-2011-0707.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailman.spec ++++++ --- /var/tmp/diff_new_pack.a9V76A/_old 2011-02-27 12:55:41.000000000 +0100 +++ /var/tmp/diff_new_pack.a9V76A/_new 2011-02-27 12:55:41.000000000 +0100 @@ -31,7 +31,7 @@ PreReq: permissions Summary: The GNU Mailing List Manager Version: 2.1.14 -Release: 1 +Release: 4.<RELEASE2> Source: %{name}-%{version}.tgz Source1: README.SuSE Source2: mailman-2.1-manpages.tgz @@ -65,6 +65,7 @@ %else Patch20: mailman-SuSE2.patch %endif +Patch21: mailman-2.1.14-CVE-2011-0707.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define m_uid 72 %define m_gid 67 @@ -104,6 +105,7 @@ %else %patch20 %endif +%patch21 cp -av %{S:1} . # ---------------------------------------------------------------------------- ++++++ mailman-2.1.14-CVE-2011-0707.patch ++++++ === modified file 'Mailman/Cgi/confirm.py' --- Mailman/Cgi/confirm.py 2010-03-29 20:48:11 +0000 +++ Mailman/Cgi/confirm.py 2011-02-12 02:24:47 +0000 @@ -471,7 +471,7 @@ if fullname is None: fullname = _('Not available') else: - fullname = Utils.uncanonstr(fullname, lang) + fullname = Utils.websafe(Utils.uncanonstr(fullname, lang)) table.AddRow([_("""Your confirmation is required in order to complete the unsubscription request from the mailing list %(listname)s. You are currently subscribed with @@ -573,7 +573,7 @@ if fullname is None: fullname = _('Not available') else: - fullname = Utils.uncanonstr(fullname, lang) + fullname = Utils.websafe(Utils.uncanonstr(fullname, lang)) if globally: globallys = _('globally') else: @@ -814,7 +814,7 @@ if username is None: username = _('not available') else: - username = Utils.uncanonstr(username, lang) + username = Utils.websafe(Utils.uncanonstr(username, lang)) table.AddRow([_("""Your membership in the %(realname)s mailing list is currently disabled due to excessive bounces. Your confirmation is ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 logwatch for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package logwatch for openSUSE:11.4 checked in at Sun Feb 27 12:55:27 CET 2011. -------- --- old-versions/11.4/all/logwatch/logwatch.changes 2011-02-01 12:26:52.000000000 +0100 +++ 11.4/logwatch/logwatch.changes 2011-02-25 12:51:22.000000000 +0100 @@ -1,0 +2,8 @@ +Fri Feb 25 12:36:14 CET 2011 - pth(a)suse.de + +- Add patch to fix the handling of special characters in log files + (CVE-2011-1018, bnc#674984). +- Make files in Logwatch_Dmeventd_Setup_Files tarball 644 and + repack with bzip2. + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- Logwatch_Dmeventd_Setup_Files.tgz New: ---- Logwatch_Dmeventd_Setup_Files.tar.bz2 logwatch-CVE-2011-1018.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ logwatch.spec ++++++ --- /var/tmp/diff_new_pack.Bv8cFV/_old 2011-02-27 12:53:29.000000000 +0100 +++ /var/tmp/diff_new_pack.Bv8cFV/_new 2011-02-27 12:53:29.000000000 +0100 @@ -27,18 +27,19 @@ Name: logwatch Summary: Analyzes and Reports on system logs Version: 7.3.6 -Release: 75 +Release: 78.<RELEASE2> License: MIT License (or similar) Group: System/Monitoring Url: http://www.logwatch.org BuildArch: noarch Source0: logwatch-%{version}.tar.bz2 Source1: %{name}-rpmlintrc -Source2: Logwatch_Dmeventd_Setup_Files.tgz +Source2: Logwatch_Dmeventd_Setup_Files.tar.bz2 Patch0: logwatch-firewall.patch Patch1: logwatch-full_path_to_sendmail.patch Patch2: logwatch-timestamp_in_var.patch Patch3: logwatch-make_save_work.patch +Patch4: logwatch-CVE-2011-1018.patch Requires: perl textutils sh-utils grep mailx cron %date_manip_pkg BuildRequires: dos2unix BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -62,6 +63,7 @@ %patch1 %patch2 %patch3 +%patch4 dos2unix scripts/services/courier %build ++++++ logwatch-CVE-2011-1018.patch ++++++ Index: scripts/logwatch.pl =================================================================== --- scripts/logwatch.pl.orig 2011-02-25 12:30:40.934525836 +0100 +++ scripts/logwatch.pl 2011-02-25 12:34:45.979948361 +0100 @@ -845,6 +845,10 @@ foreach $LogFile (@LogFileList) { my $DestFile = $TempDir . $LogFile . "-archive"; my $Archive; foreach $Archive (@{$LogFileData{$LogFile}{'archives'}}) { + if ($Archive =~ /'/) { + print "File $Archive has invalid embedded quotes. File ignored.\n"; + next; + } my $CheckTime; # We need to find out what's the earliest log we need my @time_t = TimeBuild(); @@ -872,18 +876,18 @@ foreach $LogFile (@LogFileList) { #These system calls are not secure but we are getting closer #What needs to go is all the pipes and instead we need a command loop #For each filter to apply -mgt - my $arguments = "$Archive >> $DestFile"; + my $arguments = "'${Archive}' >> $DestFile"; system("$Config{'pathtozcat'} $arguments") == 0 or die "system $Config{'pathtozcat'} failed: $?" } elsif (($Archive =~ m/bz2$/) && (-f "$Archive")) { #These system calls are not secure but we are getting closer #What needs to go is all the pipes and instead we need a command loop #For each filter to apply -mgt - my $arguments = "$Archive 2>/dev/null >> $DestFile"; + my $arguments = "'${Archive}' 2>/dev/null >> $DestFile"; system("$Config{'pathtobzcat'} $arguments") == 0 or die "system $Config{'pathtobzcat'} failed: $?" - } elsif (-f "$Archive") { - my $arguments = "$Archive >> $DestFile"; + } elsif (-f "$Archive") && (-s "$Archive")) { + my $arguments = "'${Archive}' >> $DestFile"; system("$Config{'pathtocat'} $arguments") == 0 or die "system $Config{'pathtocat'} failed: $?" } #End if/elsif existence @@ -895,6 +899,10 @@ foreach $LogFile (@LogFileList) { foreach my $ThisFile (@FileList) { #Existence check for files -mgt next unless (-f $ThisFile); + if ($ThisFile =~ /'/) { + print "File $ThisFile has invalid embedded quotes. File ignored.\n"; + next; + } if (! -r $ThisFile) { print "File $ThisFile is not readable. Check permissions."; if ($> != 0) { @@ -903,7 +911,7 @@ foreach $LogFile (@LogFileList) { print "\n"; next; } - $FileText .= ($ThisFile . " "); + $FileText .= ("'" . $ThisFile . "' "); } #End foreach ThisFile # remove the ENV entries set by previous service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 linuxrc for openSUSE:11.4
by root＠hilbert.suse.de 27 Feb '11

27 Feb '11

Hello community, here is the log from the commit of package linuxrc for openSUSE:11.4 checked in at Sun Feb 27 12:53:06 CET 2011. -------- --- old-versions/11.4/all/linuxrc/linuxrc.changes 2011-02-17 15:50:06.000000000 +0100 +++ 11.4/linuxrc/linuxrc.changes 2011-02-24 11:20:49.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 24 11:20:39 CET 2011 - snwint(a)suse.de + +- fix media check to work with isohybrid images (bnc #674609) + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 Old: ---- linuxrc-3.5.9.tar.bz2 New: ---- linuxrc-3.5.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ linuxrc.spec ++++++ --- /var/tmp/diff_new_pack.GaQYyd/_old 2011-02-27 12:52:34.000000000 +0100 +++ /var/tmp/diff_new_pack.GaQYyd/_new 2011-02-27 12:52:34.000000000 +0100 @@ -24,9 +24,9 @@ Group: System/Boot AutoReqProv: on Summary: SUSE Installation Program -Version: 3.5.9 +Version: 3.5.10 Release: 1.<RELEASE2> -Source: linuxrc-3.5.9.tar.bz2 +Source: linuxrc-3.5.10.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ linuxrc-3.5.9.tar.bz2 -> linuxrc-3.5.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.9/VERSION new/linuxrc-3.5.10/VERSION --- old/linuxrc-3.5.9/VERSION 2011-02-17 15:49:51.000000000 +0100 +++ new/linuxrc-3.5.10/VERSION 2011-02-24 11:20:34.000000000 +0100 @@ -1 +1 @@ -3.5.9 +3.5.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.9/changelog new/linuxrc-3.5.10/changelog --- old/linuxrc-3.5.9/changelog 2011-02-17 15:49:52.000000000 +0100 +++ new/linuxrc-3.5.10/changelog 2011-02-24 11:20:35.000000000 +0100 @@ -1,4 +1,7 @@ -2011-02-17: HEAD +2011-02-24: HEAD + - fix media check to work with isohybrid images (bnc #674609) + +2011-02-17: 3.5.9 - don't mess with mtab (bnc #668149) 2011-01-19: 3.5.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/linuxrc-3.5.9/checkmd5.c new/linuxrc-3.5.10/checkmd5.c --- old/linuxrc-3.5.9/checkmd5.c 2011-02-17 15:49:29.000000000 +0100 +++ new/linuxrc-3.5.10/checkmd5.c 2011-02-24 11:18:49.000000000 +0100 @@ -145,8 +145,9 @@ /* * Calculate md5 sum. * - * Normal md5sum, except we assume the area 0x8373 - 0x8572 to be filled - * with spaces (' '). + * Normal md5sum, except that we assume + * - 0x0000 - 0x01ff is filled with zeros (0) + * - 0x8373 - 0x8572 is filled with spaces (' '). */ void do_md5(char *file) { @@ -182,7 +183,10 @@ md5_process_block(buffer, sizeof buffer, &full_ctx); - if(chunk == 0) memset(buffer + 0x8373, ' ', 0x200); + if(chunk == 0) { + memset(buffer, 0, 0x200); + memset(buffer + 0x8373, ' ', 0x200); + } md5_process_block(buffer, sizeof buffer, &ctx); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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