April 2014 - openSUSE Commits - openSUSE Mailing Lists

commit MozillaThunderbird for openSUSE:12.3:Update
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:12.3:Update checked in at 2014-04-30 08:17:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/MozillaThunderbird (Old) and /work/SRC/openSUSE:12.3:Update/.MozillaThunderbird.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaThunderbird" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.fYAJrd/_old 2014-04-30 08:17:56.000000000 +0200 +++ /var/tmp/diff_new_pack.fYAJrd/_new 2014-04-30 08:17:56.000000000 +0200 @@ -1 +1 @@ -<link package='MozillaThunderbird.2538' cicount='copy' /> +<link package='MozillaThunderbird.2691' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaThunderbird.2691 for openSUSE:12.3:Update
by root＠hilbert.suse.de 30 Apr '14

30 Apr '14

Hello community, here is the log from the commit of package MozillaThunderbird.2691 for openSUSE:12.3:Update checked in at 2014-04-30 08:17:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/MozillaThunderbird.2691 (Old) and /work/SRC/openSUSE:12.3:Update/.MozillaThunderbird.2691.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaThunderbird.2691" Changes: -------- New Changes file: --- /dev/null 2014-04-28 00:21:37.460033756 +0200 +++ /work/SRC/openSUSE:12.3:Update/.MozillaThunderbird.2691.new/MozillaThunderbird.changes 2014-04-30 08:17:51.000000000 +0200 @@ -0,0 +1,1944 @@ +------------------------------------------------------------------- +Tue Mar 18 21:45:43 UTC 2014 - wr(a)rosenauer.org + +- update to Thunderbird 24.4.0 (bnc#868603) + * MFSA 2014-15/CVE-2014-1493/CVE-2014-1494 + Miscellaneous memory safety hazards + * MFSA 2014-17/CVE-2014-1497 (bmo#966311) + Out of bounds read during WAV file decoding + * MFSA 2014-26/CVE-2014-1508 (bmo#963198) + Information disclosure through polygon rendering in MathML + * MFSA 2014-27/CVE-2014-1509 (bmo#966021) + Memory corruption in Cairo during PDF font rendering + * MFSA 2014-28/CVE-2014-1505 (bmo#941887) + SVG filters information disclosure through feDisplacementMap + * MFSA 2014-29/CVE-2014-1510/CVE-2014-1511 (bmo#982906, bmo#982909) + Privilege escalation using WebIDL-implemented APIs + * MFSA 2014-30/CVE-2014-1512 (bmo#982957) + Use-after-free in TypeObject + * MFSA 2014-31/CVE-2014-1513 (bmo#982974) + Out-of-bounds read/write through neutering ArrayBuffer objects + * MFSA 2014-32/CVE-2014-1514 (bmo#983344) + Out-of-bounds write through TypedArrayObject after neutering + +------------------------------------------------------------------- +Mon Feb 3 16:07:28 UTC 2014 - wr(a)rosenauer.org + +- update to Thunderbird 24.3.0 (bnc#861847) + * MFSA 2014-01/CVE-2014-1477/CVE-2014-1478 + Miscellaneous memory safety hazards (rv:27.0 / rv:24.3) + * MFSA 2014-02/CVE-2014-1479 (bmo#911864) + Clone protected content with XBL scopes + * MFSA 2014-04/CVE-2014-1482 (bmo#943803) + Incorrect use of discarded images by RasterImage + * MFSA 2014-08/CVE-2014-1486 (bmo#942164) + Use-after-free with imgRequestProxy and image proccessing + * MFSA 2014-09/CVE-2014-1487 (bmo#947592) + Cross-origin information leak through web workers + * MFSA 2014-12/CVE-2014-1490/CVE-2014-1491 + (bmo#934545, bmo#930874, bmo#930857) + NSS ticket handling issues + * MFSA 2014-13/CVE-2014-1481(bmo#936056) + Inconsistent JavaScript handling of access to Window objects +- requires NSS 3.15.4 +- renamed ppc64le patches to streamline with Firefox package + +------------------------------------------------------------------- +Fri Dec 13 21:29:16 UTC 2013 - uweigand(a)de.ibm.com + +- Add support for powerpc64le-linux. + * ppc64le-support.patch: general support + * libffi-ppc64le.patch: libffi backport + * xpcom-ppc64le.patch: port xpcom + +------------------------------------------------------------------- +Sun Dec 8 10:18:03 UTC 2013 - wr(a)rosenauer.org + +- update to Thunderbird 24.2.0 (bnc#854370) + * requires NSS 3.15.3.1 or higher + * MFSA 2013-104/CVE-2013-5609/CVE-2013-5610 + Miscellaneous memory safety hazards + * MFSA 2013-108/CVE-2013-5616 (bmo#938341) + Use-after-free in event listeners + * MFSA 2013-109/CVE-2013-5618 (bmo#926361) + Use-after-free during Table Editing + * MFSA 2013-111/CVE-2013-6671 (bmo#930281) + Segmentation violation when replacing ordered list elements + * MFSA 2013-113/CVE-2013-6673 (bmo#970380) + Trust settings for built-in roots ignored during EV certificate + validation + * MFSA 2013-114/CVE-2013-5613 (bmo#930381, bmo#932449) + Use-after-free in synthetic mouse movement + * MFSA 2013-115/CVE-2013-5615 (bmo#929261) + GetElementIC typed array stubs can be generated outside observed + typesets + * MFSA 2013-116/CVE-2013-6629/CVE-2013-6630 (bmo#891693) + JPEG information leak + * MFSA 2013-117 (bmo#946351) + Mis-issued ANSSI/DCSSI certificate + (fixed via NSS 3.15.3.1) + +------------------------------------------------------------------- +Tue Nov 19 08:08:00 UTC 2013 - wr(a)rosenauer.org + +- update to Thunderbird 24.1.1 + * requires NSPR 4.10.2 and NSS 3.15.3 for security reasons + * fix binary compatibility issues for patch level updates + (bmo#927073) + +------------------------------------------------------------------- +Thu Oct 24 17:18:23 UTC 2013 - wr(a)rosenauer.org + +- update to Thunderbird 24.1.0 (bnc#847708) + * requires NSS 3.15.2 or above + * MFSA 2013-93/CVE-2013-5590/CVE-2013-5591/CVE-2013-5592 + Miscellaneous memory safety hazards + * MFSA 2013-94/CVE-2013-5593 (bmo#868327) + Spoofing addressbar through SELECT element + * MFSA 2013-95/CVE-2013-5604 (bmo#914017) + Access violation with XSLT and uninitialized data + * MFSA 2013-96/CVE-2013-5595 (bmo#916580) + Improperly initialized memory and overflows in some JavaScript + functions + * MFSA 2013-97/CVE-2013-5596 (bmo#910881) + Writing to cycle collected object during image decoding + * MFSA 2013-98/CVE-2013-5597 (bmo#918864) + Use-after-free when updating offline cache + * MFSA 2013-100/CVE-2013-5599/CVE-2013-5600/CVE-2013-5601 + (bmo#915210, bmo#915576, bmo#916685) + Miscellaneous use-after-free issues found through ASAN fuzzing + * MFSA 2013-101/CVE-2013-5602 (bmo#897678) + Memory corruption in workers + * MFSA 2013-102/CVE-2013-5603 (bmo#916404) + Use-after-free in HTML document templates + +------------------------------------------------------------------- +Thu Oct 10 14:43:22 UTC 2013 - wr(a)rosenauer.org + +- update to Thunderbird 24.0.1 + * fqdn for smtp server name was not accepted (bmo#913785) + * fixed crash in PL_strncasecmp (bmo#917955) +- update Enigmail to 1.6 + * The passphrase timeout configuration in Enigmail is now read and + written from/to gpg-agent. + * New dialog to change the expiry date of keys + * New function to search for the OpenPGP keys of all Address Book + entries on a keyserver + * removed obsolete enigmail-build.patch + +------------------------------------------------------------------- +Sat Sep 14 20:32:28 UTC 2013 - wr(a)rosenauer.org + +- update to Thunderbird 24.0 (bnc#840485) + * MFSA 2013-76/CVE-2013-1718/CVE-2013-1719 + Miscellaneous memory safety hazards + * MFSA 2013-77/CVE-2013-1720 (bmo#888820) + Improper state in HTML5 Tree Builder with templates + * MFSA 2013-79/CVE-2013-1722 (bmo#893308) + Use-after-free in Animation Manager during stylesheet cloning + * MFSA 2013-80/CVE-2013-1723 (bmo#891292) + NativeKey continues handling key messages after widget is destroyed + * MFSA 2013-81/CVE-2013-1724 (bmo#894137) + Use-after-free with select element + * MFSA 2013-82/CVE-2013-1725 (bmo#876762) + Calling scope for new Javascript objects can lead to memory corruption + * MFSA 2013-85/CVE-2013-1728 (bmo#883686) + Uninitialized data in IonMonkey + * MFSA 2013-88/CVE-2013-1730 (bmo#851353) + Compartment mismatch re-attaching XBL-backed nodes + * MFSA 2013-89/CVE-2013-1732 (bmo#883514) + Buffer overflow with multi-column, lists, and floats + * MFSA 2013-90/CVE-2013-1735/CVE-2013-1736 (bmo#898871, bmo#906301) + Memory corruption involving scrolling + * MFSA 2013-91/CVE-2013-1737 (bmo#907727) + User-defined properties on DOM proxies get the wrong "this" object + * MFSA 2013-92/CVE-2013-1738 (bmo#887334, bmo#882897) + GC hazard with default compartments and frame chain restoration +- moved greek to common translation package +- require NSPR 4.10 and NSS 3.15.1 +- add GStreamer build requirements for Gecko +- added enigmail-build.patch to fix TB packaging (bmo#886095) +- removed obsolete patches: + * enigmail-old-gcc.patch + * mozilla-gcc43-enums.patch + * mozilla-gcc43-template_hacks.patch + * mozilla-gcc43-templates_instantiation.patch + * ppc-xpcshell.patch + +------------------------------------------------------------------- +Fri Aug 2 06:01:03 UTC 2013 - wr(a)rosenauer.org + +- update to Thunderbird 17.0.8 (bnc#833389) + * MFSA 2013-63/CVE-2013-1701 + Miscellaneous memory safety hazards + * MFSA 2013-68/CVE-2013-1709 (bmo#838253) + Document URI misrepresentation and masquerading + * MFSA 2013-69/CVE-2013-1710 (bmo#871368) + CRMF requests allow for code execution and XSS attacks + * MFSA 2013-72/CVE-2013-1713 (bmo#887098) + Wrong principal used for validating URI for some Javascript + components + * MFSA 2013-73/CVE-2013-1714 (bmo#879787) + Same-origin bypass with web workers and XMLHttpRequest + * MFSA 2013-75/CVE-2013-1717 (bmo#406541, bmo#738397) + Local Java applets may read contents of local file system + +------------------------------------------------------------------- +Wed Jul 17 17:28:39 UTC 2013 - wr(a)rosenauer.org + +- update Enigmail to 1.5.2 + * bugfix release + +------------------------------------------------------------------- +Mon Jun 24 10:17:22 UTC 2013 - wr(a)rosenauer.org + +- update to Thunderbird 17.0.7 (bnc#825935) + * MFSA 2013-49/CVE-2013-1682 + Miscellaneous memory safety hazards ++++ 1747 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.3:Update/.MozillaThunderbird.2691.new/MozillaThunderbird.changes New: ---- MozillaThunderbird.changes MozillaThunderbird.spec _constraints add-plugins.sh.in compare-locales.tar.bz2 create-tar.sh enigmail-1.6.tar.gz find-external-requires.sh kde.js l10n-24.4.0.tar.bz2 libffi-ppc64le.patch mozilla-arm-disable-edsp.patch mozilla-kde.patch mozilla-language.patch mozilla-nongnome-proxies.patch mozilla-ppc.patch mozilla-shared-nss-db.patch mozilla.sh.in ppc64le-support.patch suse-default-prefs.js tb-develdirs.patch tb-ssldap.patch thunderbird-24.4.0-source.tar.bz2 thunderbird-rpmlintrc thunderbird-shared-nss-db.patch thunderbird.desktop xpcom-ppc64le.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaThunderbird.spec ++++++ # # spec file for package MozillaThunderbird # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2014 Wolfgang Rosenauer <wr(a)rosenauer.org> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define mainversion 24.4.0 %define update_channel release %define gstreamer_ver 0.10 %define with_kde 1 Name: MozillaThunderbird BuildRequires: Mesa-devel BuildRequires: autoconf213 BuildRequires: dbus-1-glib-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: hunspell-devel BuildRequires: libcurl-devel BuildRequires: libgnomeui-devel BuildRequires: libidl-devel BuildRequires: libnotify-devel BuildRequires: mozilla-nspr-devel >= 4.10.2 BuildRequires: mozilla-nss-devel >= 3.15.4 BuildRequires: nss-shared-helper-devel BuildRequires: python BuildRequires: startup-notification-devel BuildRequires: unzip BuildRequires: update-desktop-files BuildRequires: xorg-x11-libXt-devel BuildRequires: yasm BuildRequires: zip %if %suse_version > 1210 BuildRequires: pkgconfig(gstreamer-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-app-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver) %endif Version: %{mainversion} Release: 0 %define releasedate 2014031500 Provides: thunderbird = %{version} %if %{with_kde} # this is needed to match this package with the kde4 helper package without the main package # having a hard requirement on the kde4 package %define kde_helper_version 6 Provides: mozilla-kde4-version = %{kde_helper_version} %endif Summary: The Stand-Alone Mozilla Mail Component License: MPL-2.0 Group: Productivity/Networking/Email/Clients Url: http://www.mozilla.org/products/thunderbird/ Source: thunderbird-%{version}-source.tar.bz2 Source1: thunderbird.desktop Source2: add-plugins.sh.in Source3: mozilla.sh.in Source4: l10n-%{version}.tar.bz2 #Source5: shipped-locales Source6: suse-default-prefs.js Source7: find-external-requires.sh Source8: thunderbird-rpmlintrc Source9: enigmail-1.6.tar.gz Source10: create-tar.sh Source11: compare-locales.tar.bz2 Source12: kde.js # Gecko/Toolkit Patch1: mozilla-shared-nss-db.patch Patch2: mozilla-language.patch Patch3: mozilla-nongnome-proxies.patch Patch4: mozilla-kde.patch Patch5: mozilla-arm-disable-edsp.patch Patch7: mozilla-ppc.patch Patch8: libffi-ppc64le.patch Patch9: xpcom-ppc64le.patch Patch10: ppc64le-support.patch # Thunderbird/mail Patch20: tb-ssldap.patch Patch21: tb-develdirs.patch Patch22: thunderbird-shared-nss-db.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils fileutils textutils /bin/sh Recommends: libcanberra0 ### build options %define build_enigmail 1 %ifnarch ppc ppc64 ppc64le %arm %define crashreporter 1 %else %define crashreporter 0 %endif %define has_system_cairo 0 %define localize 1 ### build options end %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE7} %global provfind sh -c "grep -v '.so' | %__find_provides" %global __find_provides %provfind Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) Conflicts: thunderbird-esr %define progname thunderbird %define progdir %{_prefix}/%_lib/thunderbird %define libgssapi libgssapi_krb5.so.2 %if %suse_version > 1130 %define desktop_file_name thunderbird %else %define desktop_file_name %{name} %endif %description Mozilla Thunderbird is a redesign of the Mozilla Mail component. It is written using the XUL user interface language and designed to be cross-platform. It is a stand-alone application instead of part of the Mozilla application suite. %if %localize %package translations-common Summary: Common translations for MozillaThunderbird License: MPL-2.0 Group: System/Localization Provides: locale(%{name}:ar;ca;cs;da;de;el;en_GB;es_AR;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW) PreReq: %{name} = %{mainversion} Obsoletes: %{name}-translations < %{version}-%{release} %description translations-common This package contains several optional languages for the user interface of MozillaThunderbird. %package translations-other Summary: Extra translations for MozillaThunderbird License: MPL-2.0 Group: System/Localization Provides: locale(%{name}:ast;be;bg;bn_BD;br;et;eu;fy_NL;ga_IE;gd;gl;he;hr;hy_AM;id;is;lt;nn_NO;pa_IN;rm;ro;si;sk;sl;sq;sr;ta_LK;tr;uk;vi) PreReq: %{name} = %{mainversion} Obsoletes: %{name}-translations < %{version}-%{release} %description translations-other This package contains several optional languages for the user interface of MozillaThunderbird. %endif %package devel Summary: Mozilla Thunderbird SDK License: MPL-2.0 Group: Development/Libraries/Other Requires: mozilla-nspr-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel) PreReq: mozilla-nss-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss-devel) PreReq: %{name} = %{mainversion} %description devel Software Development Kit to build plugins/extensions against Thunderbird. %if %crashreporter %package buildsymbols Summary: Breakpad buildsymbols for %{name} License: MPL-2.0 Group: Development/Debug %description buildsymbols This subpackage contains the Breakpad created and compatible debugging symbols meant for upload to Mozilla's crash collector database. %endif %if %build_enigmail %package -n enigmail Version: 1.6.0+%{mainversion} Release: 0 Summary: OpenPGP addon for Thunderbird and SeaMonkey License: MPL-1.1 or GPL-2.0+ Group: Productivity/Networking/Email/Clients Url: http://www.enigmail.net/ Requires: /usr/bin/gpg %if %suse_version > 1110 Requires: pinentry-gui %else Requires: pinentry-dialog %endif Conflicts: thunderbird-esr %description -n enigmail This package contains the Enigmail OpenPGP Addon for Thunderbird and SeaMonkey. %endif %prep %if %build_enigmail %setup -n thunderbird -q -b 4 -b 11 -b 9 %else %setup -n thunderbird -q -b 4 -b 11 %endif # xulrunner patches pushd mozilla %patch1 -p1 %patch2 -p1 %patch3 -p1 %if %{with_kde} %patch4 -p1 %endif %patch5 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 %patch10 -p1 popd # comm-central patches %patch20 -p1 %patch21 -p1 %patch22 -p1 %build # no need to add build time to binaries modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{_sourcedir}/%{name}.changes")" DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\"" TIME="\"$(date -d "${modified}" "+%%R")\"" find . -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} + # %if %{with_kde} kdehelperversion=$(cat mozilla/toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3) if test "$kdehelperversion" != %{kde_helper_version}; then echo fix kde helper version in the .spec file exit 1 fi %endif export SUSE_ASNEEDED=0 export MOZ_BUILD_DATE=%{releasedate} export MOZILLA_OFFICIAL=1 export BUILD_OFFICIAL=1 %if %{update_channel} == "esr" export MOZ_ESR=1 %endif export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing" %ifarch ppc64 ppc64le export CFLAGS="$CFLAGS -mminimal-toc" %endif export CXXFLAGS="$CFLAGS" export MOZCONFIG=$RPM_BUILD_DIR/mozconfig # cat << EOF > $MOZCONFIG mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 mk_add_options MOZ_MILESTONE_RELEASE=1 mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs} mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj ac_add_options --enable-application=mail ac_add_options --prefix=%{_prefix} ac_add_options --libdir=%{progdir} ac_add_options --includedir=%{_includedir} ac_add_options --disable-tests ac_add_options --disable-debug ac_add_options --enable-optimize ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-system-jpeg ac_add_options --with-system-zlib ac_add_options --with-l10n-base=$RPM_BUILD_DIR/l10n ac_add_options --disable-updater #ac_add_options --with-system-png # no apng support ac_add_options --enable-system-hunspell ac_add_options --disable-installer ac_add_options --disable-mochitest ac_add_options --enable-startup-notification ac_add_options --enable-official-branding ac_add_options --disable-necko-wifi ac_add_options --enable-update-channel=%{update_channel} EOF %if %suse_version > 1130 cat << EOF >> $MOZCONFIG ac_add_options --disable-gnomevfs ac_add_options --enable-gio EOF %endif %if %suse_version < 1220 cat << EOF >> $MOZCONFIG ac_add_options --disable-gstreamer EOF %endif %if %has_system_cairo cat << EOF >> $MOZCONFIG ac_add_options --enable-system-cairo EOF %endif %if ! %crashreporter cat << EOF >> $MOZCONFIG ac_add_options --disable-crashreporter EOF %endif # Disable neon for arm as it does not build correctly %ifarch %arm cat << EOF >> $MOZCONFIG ac_add_options --disable-neon EOF %endif make -f client.mk build # ### enigmail build %if %build_enigmail cp -r $RPM_BUILD_DIR/enigmail $RPM_BUILD_DIR/thunderbird/mailnews/extensions/ pushd $RPM_BUILD_DIR/thunderbird/mailnews/extensions/enigmail ./makemake -r -o '../../../../obj' popd pushd $RPM_BUILD_DIR/obj/mailnews/extensions/enigmail make make xpi popd %endif %install cd ../obj make -C mail/installer STRIP=/bin/true MOZ_PKG_FATAL_WARNINGS=0 # copy tree into RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{progdir} cp -rf $RPM_BUILD_DIR/obj/mozilla/dist/thunderbird/* \ $RPM_BUILD_ROOT%{progdir} %if %{with_kde} # install kde.js install -m 644 %{SOURCE12} $RPM_BUILD_ROOT%{progdir}/defaults/pref/kde.js # make sure that instantApply is true by default # (TODO: mozilla-kde.patch needs to be improved to really not load kde.js in non-KDE envs) echo 'pref("browser.preferences.instantApply", true);' > $RPM_BUILD_ROOT%{progdir}/defaults/pref/all-thunderbird.js %endif # build additional locales %if %localize %if 0%{?SOURCE5:1} cp %SOURCE5 ../thunderbird/mail/locales/shipped-locales %endif rm -f %{_tmppath}/translations.* touch %{_tmppath}/translations.{common,other} for locale in $(awk '{ print $1; }' ../thunderbird/mail/locales/all-locales); do case $locale in ja-JP-mac|en-US) # locales not to be included in translations package ;; *) pushd $RPM_BUILD_DIR/compare-locales PYTHONPATH=lib \ scripts/compare-locales -m ../l10n-merged/$locale \ ../thunderbird/mail/locales/l10n.ini ../l10n $locale popd LOCALE_MERGEDIR=$RPM_BUILD_DIR/l10n-merged/$locale \ make -C mail/locales langpack-$locale || continue cp -rL mozilla/dist/xpi-stage/locale-$locale \ $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale(a)thunderbird.mozilla.org # remove prefs and profile defaults from langpack rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale(a)thunderbird.mozilla.org/defaults # check against the fixed common list and sort into the right filelist _matched=0 for _match in ar ca cs da de el en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do [ "$_match" = "$locale" ] && _matched=1 done [ $_matched -eq 1 ] && _l10ntarget=common || _l10ntarget=other echo %{progdir}/extensions/langpack-$locale(a)thunderbird.mozilla.org \ >> %{_tmppath}/translations.$_l10ntarget esac done %endif # overwrite the mozilla start-script and link it to /usr/bin mkdir --parents $RPM_BUILD_ROOT%{_bindir}/ sed "s:%%PREFIX:%{_prefix}:g s:%%PROGDIR:%{progdir}:g s:%%APPNAME:thunderbird:g s:%%PROFILE:.thunderbird:g" \ %{SOURCE3} > $RPM_BUILD_ROOT%{progdir}/%{progname}.sh chmod 755 $RPM_BUILD_ROOT%{progdir}/%{progname}.sh ln -sf ../..%{progdir}/%{progname}.sh $RPM_BUILD_ROOT%{_bindir}/%{progname} # freedesktop definition mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications install -m 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_datadir}/applications/%{desktop_file_name}.desktop # install add-plugins.sh sed "s:%%PROGDIR:%{progdir}:g" \ %{SOURCE2} > $RPM_BUILD_ROOT%{progdir}/add-plugins.sh chmod 755 $RPM_BUILD_ROOT%{progdir}/add-plugins.sh # apply SUSE defaults sed -e 's,RPM_VERSION,%{mainversion},g s,GSSAPI,%{libgssapi},g' \ %{SOURCE6} > suse-default-prefs cp suse-default-prefs $RPM_BUILD_ROOT%{progdir}/defaults/pref/all-opensuse.js rm suse-default-prefs # use correct locale for useragent cat > $RPM_BUILD_ROOT%{progdir}/defaults/pref/all-l10n.js << EOF pref("general.useragent.locale", "chrome://global/locale/intl.properties"); EOF ########## # DEVEL # mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{progname} chmod a+x mozilla/dist/sdk/bin/*.py cp -rL mozilla/dist/sdk/bin/* $RPM_BUILD_ROOT%{_libdir}/%{progname}/ cp -rL mozilla/dist/sdk/lib/*.a $RPM_BUILD_ROOT%{_libdir}/%{progname}/ cp -rL mozilla/dist/idl/* $RPM_BUILD_ROOT%{_includedir}/%{progname}/ cp -rL mozilla/dist/include/* $RPM_BUILD_ROOT%{_includedir}/%{progname}/ #mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ #install -m 755 $RPM_BUILD_DIR/thunderbird/mozilla/build/unix/thunderbird-*.pc \ # $RPM_BUILD_ROOT%{_libdir}/pkgconfig/ #rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/thunderbird-nss.pc #ln -sf nss.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig/thunderbird-nss.pc ########## # ADDONS # # install enigmail to extension dir %if %build_enigmail cp -L mozilla/dist/bin/enigmail-*.xpi $RPM_BUILD_ROOT%{progdir} # Thunderbird location _enig_dir=$RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/\{847b3a00-7ab1-11d4-8f02-006008948af5\} mkdir -p $_enig_dir (cd $_enig_dir; unzip $RPM_BUILD_ROOT%{progdir}/enigmail-*.xpi) # SeaMonkey location mkdir -p $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/\{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a\} (cd $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/\{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a\}; \ ln -s ../\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/\{847b3a00-7ab1-11d4-8f02-006008948af5\} ) # remove unwanted build artifacts rm -f $RPM_BUILD_ROOT%{progdir}/chrome/enigmail.jar rm -f $RPM_BUILD_ROOT%{progdir}/chrome/enigmail-locale.jar rm -f $RPM_BUILD_ROOT%{progdir}/chrome/enigmail-en-US.jar rm -f $RPM_BUILD_ROOT%{progdir}/chrome/enigmail-skin.jar rm -f $RPM_BUILD_ROOT%{progdir}/chrome/installed-chrome.txt rm -f $RPM_BUILD_ROOT%{progdir}/chrome/enigmime.jar rm -f $RPM_BUILD_ROOT%{progdir}/components/libenigmime.so rm -f $RPM_BUILD_ROOT%{progdir}/components/ipc.xpt rm -f $RPM_BUILD_ROOT%{progdir}/components/enig* rm -f $RPM_BUILD_ROOT%{progdir}/components/libenigmime.so rm -f $RPM_BUILD_ROOT%{progdir}/components/ipc.xpt rm -rf $RPM_BUILD_ROOT%{progdir}/defaults/preferences/ rm -rf $RPM_BUILD_ROOT%{progdir}/platform/ rm -rf $RPM_BUILD_ROOT%{progdir}/wrappers/ rm -f $RPM_BUILD_ROOT%{progdir}/enigmail*.xpi %endif # # remove spurious executable bits find $RPM_BUILD_ROOT/usr/include/%{progname} -type f -exec chmod a-x {} \; find $RPM_BUILD_ROOT%{_libdir}/%{progname} \ -name "*.js" -o \ -name "*.jsm" -o \ -name "*.rdf" -o \ -name "*.properties" -o \ -name "*.dtd" -o \ -name "*.css" | xargs chmod a-x # remove mkdir.done files from installed base find $RPM_BUILD_ROOT%{progdir} -name ".mkdir.done" | xargs rm # for size in 16 22 24 32 48 256; do mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/ ln -sf %{progdir}/chrome/icons/default/default$size.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/%{progname}.png done %suse_update_desktop_file %{desktop_file_name} Network Email GTK # excluded files rm -f $RPM_BUILD_ROOT%{progdir}/thunderbird rm -f $RPM_BUILD_ROOT%{progdir}/removed-files rm -f $RPM_BUILD_ROOT%{progdir}/precomplete rm -f $RPM_BUILD_ROOT%{progdir}/updater rm -f $RPM_BUILD_ROOT%{progdir}/updater.ini rm -f $RPM_BUILD_ROOT%{progdir}/update.locale rm -f $RPM_BUILD_ROOT%{progdir}/dictionaries/en-US* rm -f $RPM_BUILD_ROOT%{progdir}/nspr-config # Some sites use different partitions for /usr/(lib|lib64) and /usr/share. Since you # can't create hardlinks across partitions, we'll do this more than once. %fdupes $RPM_BUILD_ROOT%{progdir} %fdupes $RPM_BUILD_ROOT%{_libdir}/mozilla %fdupes $RPM_BUILD_ROOT%{_datadir} %fdupes $RPM_BUILD_ROOT%{_includedir} %if %crashreporter SYMBOLS_NAME="thunderbird-%{mainversion}-%{release}.%{_arch}-%{suse_version}-symbols" make buildsymbols \ SYMBOL_INDEX_NAME="$SYMBOLS_NAME.txt" \ SYMBOL_ARCHIVE_BASENAME="$SYMBOLS_NAME" if [ -e mozilla/dist/*symbols.zip ]; then mkdir -p $RPM_BUILD_ROOT%{_datadir}/mozilla/ cp mozilla/dist/*symbols.zip $RPM_BUILD_ROOT%{_datadir}/mozilla/ fi %endif %clean rm -rf $RPM_BUILD_ROOT %if %localize rm -rf %{_tmppath}/translations.* %endif %triggerin -- myspell-dictionary %progdir/add-plugins.sh > /dev/null 2>&1 exit 0 %triggerpostun -- myspell-dictionary %progdir/add-plugins.sh > /dev/null 2>&1 exit 0 %post %progdir/add-plugins.sh > /dev/null 2>&1 %if %suse_version > 1130 %icon_theme_cache_post %endif # remove enigmail on updates if [ -e %progdir/extensions/\{847b3a00-7ab1-11d4-8f02-006008948af5\} ]; then rm -rf %progdir/extensions/\{847b3a00-7ab1-11d4-8f02-006008948af5\} fi exit 0 %posttrans if [ -e %progdir/add-plugins.sh ]; then %progdir/add-plugins.sh > /dev/null 2>&1 fi exit 0 %preun if [ "$1" = "0" ]; then # deinstallation rm -f %{progdir}/dictionaries/* fi exit 0 %postun %if %suse_version > 1130 %icon_theme_cache_postun %endif exit 0 %files %defattr(-,root,root) %attr(755,root,root) %{progdir}/%{progname}.sh %attr(755,root,root) %{progdir}/add-plugins.sh %dir %{progdir} %{progdir}/application.ini %{progdir}/blocklist.xml %{progdir}/chrome.manifest %{progdir}/dependentlibs.list %{progdir}/*.so %{progdir}/mozilla-xremote-client %{progdir}/omni.ja %{progdir}/platform.ini %{progdir}/plugin-container %{progdir}/run-mozilla.sh %{progdir}/thunderbird-bin # crashreporter files %if %crashreporter %{progdir}/crashreporter %{progdir}/crashreporter.ini %{progdir}/Throbber-small.gif %endif %{progdir}/components/ %dir %{progdir}/chrome/ %{progdir}/chrome/icons/ %dir %{progdir}/dictionaries/ %{progdir}/defaults/ %dir %{progdir}/extensions/ %{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} %{progdir}/isp/ %{progdir}/searchplugins/ %{_datadir}/applications/%{desktop_file_name}.desktop %{_datadir}/icons/hicolor/*/apps/%{progname}.png %{_bindir}/%{progname} %if %localize %files translations-common -f %{_tmppath}/translations.common %defattr(-,root,root) %files translations-other -f %{_tmppath}/translations.other %defattr(-,root,root) %endif %files devel %defattr(-,root,root) %{_libdir}/%{progname}/*.a %{_libdir}/%{progname}/*.py %{_libdir}/%{progname}/*.pyc %{_libdir}/%{progname}/ply/ %{_libdir}/%{progname}/xpcshell #%{_libdir}/pkgconfig/*.pc %{_includedir}/%{progname}/ %if %build_enigmail %files -n enigmail %defattr(-,root,root) %dir %{_libdir}/mozilla %{_libdir}/mozilla/extensions/ %endif %if %crashreporter %files buildsymbols %defattr(-,root,root) %{_datadir}/mozilla/ %endif %changelog ++++++ add-plugins.sh.in ++++++ #! /bin/sh # Copyright (c) 2008 Wolfgang Rosenauer. All rights reserved. # # check if we are started as root # only one of UID and USER must be set correctly if test "$UID" != 0 -a "$USER" != root; then echo "You must be root to start $0." exit 1 fi PREFIX="%PROGDIR" # dictionaries MYSPELL=/usr/share/myspell MOZ_SPELL=$PREFIX/dictionaries if [ -d $MOZ_SPELL ] ; then if [ -d $MYSPELL ] ; then for dict in $MYSPELL/??[-_]??.aff ; do # check is it is really the file or it is a string which contain '??_??' if ! [ -e $dict ] ; then continue fi # the dict file name dict_file=`echo ${dict##*/}` # the dict file has a valid name lang=`echo ${dict_file:0:2}` country=`echo ${dict_file:3:2}` # check for .dic file if [ ! -r $MYSPELL/${lang}[-_]${country}.dic ] ; then continue fi # create links if [ ! -r $MOZ_SPELL/${lang}[-_]${country}.aff ] ; then ln -sf $MYSPELL/${lang}[-_]${country}.aff \ $MOZ_SPELL/${lang}-${country}.aff fi if [ ! -r $MOZ_SPELL/${lang}[-_]${country}.dic ] ; then ln -sf $MYSPELL/${lang}[-_]${country}.dic \ $MOZ_SPELL/${lang}-${country}.dic fi done echo "-> added myspell dictionaries" fi # remove broken links for dict in $MOZ_SPELL/*.{aff,dic} ; do if ! [ -r $dict ] ; then rm -f $dict fi done fi ++++++ create-tar.sh ++++++ #!/bin/bash CHANNEL="esr24" BRANCH="releases/comm-$CHANNEL" RELEASE_TAG="THUNDERBIRD_24_4_0_RELEASE" VERSION="24.4.0" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH thunderbird pushd thunderbird hg update -r $RELEASE_TAG echo "running client.py..." [ "$RELEASE_TAG" == "default" ] || _extra="--comm-rev=$RELEASE_TAG --mozilla-rev=$RELEASE_TAG" # temporary! _extra="--mozilla-repo=http://hg.mozilla.org/releases/mozilla-$CHANNEL $_extra" python client.py checkout --skip-chatzilla --skip-venkman $_extra popd echo "creating archive..." tar cjf thunderbird-$VERSION-source.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS thunderbird # l10n # http://l10n.mozilla.org/dashboard/?tree=tb30x -> shipped-locales echo "fetching locales..." if [ -e shipped-locales ]; then SHIPPED_LOCALES=shipped-locales else SHIPPED_LOCALES=thunderbird/mail/locales/all-locales fi test ! -d l10n && mkdir l10n for locale in $(awk '{ print $1; }' $SHIPPED_LOCALES); do case $locale in ja-JP-mac|en-US) ;; *) echo "fetching $locale ..." hg clone http://hg.mozilla.org/releases/l10n/mozilla-release/$locale l10n/$locale hg -R l10n/$locale up -C -r $RELEASE_TAG ;; esac done echo "creating l10n archive..." tar cjf l10n-$VERSION.tar.bz2 \ --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=browser --exclude=calendar \ --exclude=suite \ l10n # compare-locales hg clone http://hg.mozilla.org/build/compare-locales tar cjf compare-locales.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg compare-locales ++++++ find-external-requires.sh ++++++ #!/bin/sh # Finds requirements provided outside of the current file set filelist=$( sed "s/[]['\"*?{}]/\\\\\&/g" ) provides=$( echo "$filelist" | /usr/lib/rpm/find-provides ) echo "$filelist" \ | /usr/lib/rpm/find-requires \ | grep -F -v "$provides" \ | sort -u ++++++ kde.js ++++++ pref("browser.preferences.instantApply", false); ++++++ libffi-ppc64le.patch ++++++ ++++ 3750 lines (skipped) ++++++ mozilla-arm-disable-edsp.patch ++++++ # HG changeset patch # User Adrian Schröter <adrian(a)suse.de> # Parent 5b26dbfe65bd4986ea3792f02bc025fec293b51f disable ESDP support (no BNC or BMO reference yet :-() diff --git a/xpcom/glue/arm.h b/xpcom/glue/arm.h --- a/xpcom/glue/arm.h +++ b/xpcom/glue/arm.h @@ -143,17 +143,17 @@ namespace mozilla { extern bool NS_COM_GLUE neon_enabled; #endif #endif } #if defined(MOZILLA_PRESUME_EDSP) # define MOZILLA_MAY_SUPPORT_EDSP 1 inline bool supports_edsp() { return true; } -#elif defined(MOZILLA_MAY_SUPPORT_EDSP) \ +#elif 0 \ && defined(MOZILLA_ARM_HAVE_CPUID_DETECTION) inline bool supports_edsp() { return arm_private::edsp_enabled; } #else inline bool supports_edsp() { return false; } #endif #if defined(MOZILLA_PRESUME_ARMV6) # define MOZILLA_MAY_SUPPORT_ARMV6 1 ++++++ mozilla-kde.patch ++++++ ++++ 3726 lines (skipped) ++++++ mozilla-language.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> # Parent df748bfc0eaca6dedf086cfd7167392416bfae27 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 @@ -127,16 +127,17 @@ nsLocaleService::nsLocaleService(void) nsRefPtr<nsLocale> resultLocale(new nsLocale()); NS_ENSURE_TRUE_VOID(resultLocale); #ifdef MOZ_WIDGET_QT const char* lang = QLocale::system().name().toUtf8(); #else // Get system configuration const char* lang = getenv("LANG"); + const char* language = getenv("LANGUAGE"); #endif nsAutoString xpLocale, platformLocale; nsAutoString category, category_platform; int i; for( i = 0; i < LocaleListLength; i++ ) { nsresult result; @@ -155,16 +156,21 @@ nsLocaleService::nsLocaleService(void) } else { CopyASCIItoUTF16(lang, platformLocale); result = nsPosixLocale::GetXPLocale(lang, xpLocale); } } if (NS_FAILED(result)) { return; } + // LANGUAGE is overriding LC_MESSAGES + if (i == LC_MESSAGES && language && *language) { + CopyASCIItoUTF16(language, platformLocale); + result = nsPosixLocale::GetXPLocale(language, xpLocale); + } resultLocale->AddCategory(category, xpLocale); resultLocale->AddCategory(category_platform, platformLocale); } mSystemLocale = do_QueryInterface(resultLocale); mApplicationLocale = do_QueryInterface(resultLocale); #endif // XP_UNIX #ifdef XP_OS2 ++++++ mozilla-nongnome-proxies.patch ++++++ From: Wolfgang Rosenauer Subject: Do not use gconf for proxy settings if not running within Gnome Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp =================================================================== RCS file: /cvsroot/mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp,v retrieving revision 1.1 diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp @@ -50,24 +50,28 @@ nsUnixSystemProxySettings::GetMainThread // dbus prevents us from being threadsafe, but this routine should not block anyhow *aMainThreadOnly = true; return NS_OK; } nsresult nsUnixSystemProxySettings::Init() { - mSchemeProxySettings.Init(5); - mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); - if (mGSettings) { - mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"), - getter_AddRefs(mProxySettings)); - } - if (!mProxySettings) { - mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); + // only use GSettings if that is a GNOME session + const char* sessionType = PR_GetEnv("DESKTOP_SESSION"); + if (sessionType && !strcmp(sessionType, "gnome")) { + mSchemeProxySettings.Init(5); + mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); + if (mGSettings) { + mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"), + getter_AddRefs(mProxySettings)); + } + if (!mProxySettings) { + mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); + } } return NS_OK; } bool nsUnixSystemProxySettings::IsProxyMode(const char* aMode) { ++++++ mozilla-ppc.patch ++++++ # HG changeset patch # Parent 21d0e194954e451f0f1935d0ed68ee9eae432ddf # User Wolfgang Rosenauer <wr(a)rosenauer.org> Bug 746112 - RegExp hang on ppc64 in execute. Bug 750620 - Make double-conversion portable to exotic architectures. TM: mozilla15 diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h --- a/js/src/yarr/YarrInterpreter.h +++ b/js/src/yarr/YarrInterpreter.h @@ -162,17 +162,17 @@ struct ByteTerm { , m_invert(invert) { atom.characterClass = characterClass; atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; inputPosition = inputPos; } - ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos) + ByteTerm(Type type, unsigned subpatternId, ByteDisjunction* parenthesesInfo, bool capture, int inputPos) __attribute__((noinline)) : type(type) , m_capture(capture) , m_invert(false) { atom.subpatternId = subpatternId; atom.parenthesesDisjunction = parenthesesInfo; atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; @@ -183,17 +183,17 @@ struct ByteTerm { : type(type) , m_capture(false) , m_invert(invert) { atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; } - ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos) + ByteTerm(Type type, unsigned subpatternId, bool capture, bool invert, int inputPos) __attribute__((noinline)) : type(type) , m_capture(capture) , m_invert(invert) { atom.subpatternId = subpatternId; atom.quantityType = QuantifierFixedCount; atom.quantityCount = 1; inputPosition = inputPos; diff --git a/js/src/yarr/YarrPattern.h b/js/src/yarr/YarrPattern.h --- a/js/src/yarr/YarrPattern.h +++ b/js/src/yarr/YarrPattern.h @@ -180,17 +180,17 @@ struct PatternTerm { , m_capture(false) , m_invert(invert) { characterClass = charClass; quantityType = QuantifierFixedCount; quantityCount = 1; } - PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false) + PatternTerm(Type type, unsigned subpatternId, PatternDisjunction* disjunction, bool capture = false, bool invert = false) __attribute__((noinline)) : type(type) , m_capture(capture) , m_invert(invert) { parentheses.disjunction = disjunction; parentheses.subpatternId = subpatternId; parentheses.isCopy = false; parentheses.isTerminal = false; diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c --- a/memory/mozjemalloc/jemalloc.c +++ b/memory/mozjemalloc/jemalloc.c @@ -1099,17 +1099,17 @@ struct arena_s { static unsigned ncpus; #endif /* * When MALLOC_STATIC_SIZES is defined most of the parameters * controlling the malloc behavior are defined as compile-time constants * for best performance and cannot be altered at runtime. */ -#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) +#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !(defined(__powerpc__)) #define MALLOC_STATIC_SIZES 1 #endif #ifdef MALLOC_STATIC_SIZES /* * VM page size. It must divide the runtime CPU page size or the code * will abort. diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h --- a/mfbt/double-conversion/utils.h +++ b/mfbt/double-conversion/utils.h @@ -50,17 +50,17 @@ // the result is equal to 89255e-22. // The best way to test this, is to create a division-function and to compare // the output of the division with the expected result. (Inlining must be // disabled.) // On Linux,x86 89255e-22 != Div_double(89255.0/1e22) #if defined(_M_X64) || defined(__x86_64__) || \ defined(__ARMEL__) || defined(__avr32__) || \ defined(__hppa__) || defined(__ia64__) || \ - defined(__mips__) || defined(__powerpc__) || \ + defined(__mips__) || defined(__powerpc__) || defined(__powerpc64__) || \ defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ defined(__SH4__) || defined(__alpha__) || \ defined(_MIPS_ARCH_MIPS32R2) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) #if defined(_WIN32) // Windows uses a 64bit wide floating point stack. #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 ++++++ mozilla-shared-nss-db.patch ++++++ From: Hans Petter Jansson <hpj(a)copyleft.no> Wolfgang Rosenauer <wr(a)rosenauer.org> Subject: use libnsssharedhelper if available at compile time (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) References: diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -8330,16 +8330,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz dnl ======================================================== MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' AC_SUBST(MOZ_HARFBUZZ_LIBS) dnl ======================================================== +dnl Check for nss-shared-helper +dnl ======================================================== + + PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper, + [MOZ_ENABLE_NSSHELPER=1], + [MOZ_ENABLE_NSSHELPER=]) + +if test "$MOZ_ENABLE_NSSHELPER"; then + AC_DEFINE(MOZ_ENABLE_NSSHELPER) +fi +AC_SUBST(MOZ_ENABLE_NSSHELPER) +AC_SUBST(NSSHELPER_CFLAGS) +AC_SUBST(NSSHELPER_LIBS) + +dnl ======================================================== dnl SIL Graphite dnl ======================================================== MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)' AC_SUBST(MOZ_GRAPHITE_LIBS) dnl ======================================================== dnl OTS dnl ======================================================== diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in @@ -18,10 +18,13 @@ LIBXUL_LIBRARY = 1 CSRCS += md4.c DEFINES += \ -DNSS_ENABLE_ECC \ -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ $(NULL) +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) + include $(topsrcdir)/config/rules.mk diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp @@ -3,16 +3,23 @@ * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #ifdef MOZ_LOGGING #define FORCE_PR_LOG 1 #endif +#ifdef MOZ_ENABLE_NSSHELPER +#pragma GCC visibility push(default) +#include <nss-shared-helper.h> +#pragma GCC visibility pop +#include "prenv.h" +#endif + #include "nsNSSComponent.h" #include "CertVerifier.h" #include "nsCertVerificationThread.h" #include "nsAppDirectoryServiceDefs.h" #include "nsComponentManagerUtils.h" #include "nsDirectoryServiceDefs.h" #include "nsICertOverrideService.h" @@ -1132,18 +1139,34 @@ nsNSSComponent::InitializeNSS(bool showW ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs // module by NSS_Initialize because we will load it in InstallLoadableRoots // later. It also allows us to work around a bug in the system NSS in // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as // "/usr/lib/nss/libnssckbi.so". uint32_t init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; - SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "", - SECMOD_DB, init_flags); + SECStatus init_rv = SECFailure; +#ifdef MOZ_ENABLE_NSSHELPER + if (PR_GetEnv("MOZ_TB_NO_NSSHELPER")) { + init_rv = ::NSS_Initialize(profileStr.get(), "", "", + SECMOD_DB, init_flags); + } else { + init_rv = ::nsshelp_open_db ("Thunderbird", profileStr.get(), init_flags); + + if (init_rv != SECSuccess) { + PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get())); + init_rv = ::NSS_Initialize(profileStr.get(), "", "", + SECMOD_DB, init_flags); + } + } +#else + init_rv = ::NSS_Initialize(profileStr.get(), "", "", + SECMOD_DB, init_flags); +#endif if (init_rv != SECSuccess) { PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get())); if (supress_warning_preference) { which_nss_problem = problem_none; } else { diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -490,17 +490,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO endif endif endif EXTRA_DSO_LDOPTS += $(LIBS_DIR) DEFINES += -DIMPL_XREAPI -EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS) ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CXXFLAGS += $(TK_CFLAGS) OS_LIBS += \ -framework SystemConfiguration \ -framework QTKit \ -framework IOKit \ -F/System/Library/PrivateFrameworks -framework CoreUI \ ++++++ mozilla.sh.in ++++++ #!/bin/sh # # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 # # The contents of this file are subject to the Mozilla Public License Version # 1.1 (the "License"); you may not use this file except in compliance with # the License. You may obtain a copy of the License at # http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS IS" basis, # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License # for the specific language governing rights and limitations under the # License. # # The Original Code is mozilla.org Code. # # The Initial Developer of the Original Code is # Netscape Communications Corporation. # Portions created by the Initial Developer are Copyright (C) 1998 # the Initial Developer. All Rights Reserved. # # Contributor(s): # Wolfgang Rosenauer <wolfgang.rosenauer(a)suse.de> # <wr(a)rosenauer.org> # # Alternatively, the contents of this file may be used under the terms of # either the GNU General Public License Version 2 or later (the "GPL"), or # the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), # in which case the provisions of the GPL or the LGPL are applicable instead # of those above. If you wish to allow use of your version of this file only # under the terms of either the GPL or the LGPL, and not to allow others to # use your version of this file under the terms of the MPL, indicate your # decision by deleting the provisions above and replace them with the notice # and other provisions required by the GPL or the LGPL. If you do not delete # the provisions above, a recipient may use your version of this file under # the terms of any one of the MPL, the GPL or the LGPL. # # ***** END LICENSE BLOCK ***** ## ## Usage: ## ## $ mozilla [args] ## ## This script is meant to run a mozilla program from the mozilla ## rpm installation. ## ## The script will setup all the environment voodoo needed to make ## mozilla work. cmdname=`basename $0` ## ## Variables ## MOZ_DIST_BIN="%PREFIX" MOZ_DIST_LIB="%PROGDIR" MOZ_APPNAME="%APPNAME" MOZ_PROGRAM="$MOZ_DIST_LIB/$MOZ_APPNAME-bin" MOZ_APP_LAUNCHER="$MOZ_DIST_LIB/$MOZ_APPNAME.sh" if [ "$0" = "$MOZ_APP_LAUNCHER" ]; then [ -h "/usr/bin/$MOZ_APPNAME" ] && \ _link=$(readlink -f "/usr/bin/$MOZ_APPNAME") if [ "$_link" = "$MOZ_APP_LAUNCHER" ]; then export MOZ_APP_LAUNCHER="/usr/bin/$MOZ_APPNAME" fi else export MOZ_APP_LAUNCHER="/usr/bin/$MOZ_APPNAME" fi mozilla_lib=`file $MOZ_PROGRAM` LIB=lib echo $mozilla_lib | grep -q -E 'ELF.64-bit.*(x86-64|S/390|PowerPC)' && LIB=lib64 BROWSER_PLUGIN_DIR=/usr/$LIB/browser-plugins if [ ! -d $BROWSER_PLUGIN_DIR ]; then BROWSER_PLUGIN_DIR=/opt/netscape/plugins fi MOZILLA_FIVE_HOME="$MOZ_DIST_LIB" export MOZILLA_FIVE_HOME LD_LIBRARY_PATH=$MOZ_DIST_LIB${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} export LD_LIBRARY_PATH # needed for SUN Java under Xorg >= 7.2 export LIBXCB_ALLOW_SLOPPY_LOCK=1 ## if [ -z "$MOZ_PLUGIN_PATH" ]; then export MOZ_PLUGIN_PATH=$BROWSER_PLUGIN_DIR else # make sure that BROWSER_PLUGIN_DIR is in MOZ_PLUGIN_PATH echo "$MOZ_PLUGIN_PATH" | grep "$BROWSER_PLUGIN_DIR" 2>&1 >/dev/null _retval=$? if [ ${_retval} -ne 0 ]; then export MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$BROWSER_PLUGIN_DIR fi fi # disable Gnome crash dialog (doesn't make sense anyway) export GNOME_DISABLE_CRASH_DIALOG=1 moz_debug=0 script_args="" pass_arg_count=0 while [ $# -gt $pass_arg_count ] do case "$1" in -d | --debugger) moz_debugger=$2; if [ "${moz_debugger}" != "" ]; then shift 2 moz_debug=1 else echo "-d requires an argument" exit 1 fi ;; *) # Move the unrecognized argument to the end of the list. arg="$1" shift set -- "$@" "$arg" pass_arg_count=`expr $pass_arg_count + 1` ;; esac done if [ $moz_debug -eq 1 ]; then tmpfile=`mktemp /tmp/mozargs.XXXXXX` || { echo "Cannot create temporary file" >&2; exit 1; } trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15 echo -e "set args ${1+"$@"}\nrun" > $tmpfile echo "$moz_debugger $MOZ_PROGRAM -x $tmpfile" exec $moz_debugger "$MOZ_PROGRAM" -x $tmpfile else exec $MOZ_PROGRAM "$@" fi ++++++ ppc64le-support.patch ++++++ Index: mozilla/configure.in =================================================================== --- mozilla.orig/configure.in +++ mozilla/configure.in @@ -1084,7 +1084,7 @@ case "$OS_TEST" in CPU_ARCH=x86 ;; -powerpc64 | ppc64) +powerpc64 | ppc64 | powerpc64le | ppc64le) CPU_ARCH=ppc64 ;; Index: mozilla/js/src/configure.in =================================================================== --- mozilla.orig/js/src/configure.in +++ mozilla/js/src/configure.in @@ -915,7 +915,7 @@ case "$OS_TEST" in CPU_ARCH=x86 ;; -powerpc64 | ppc64) +powerpc64 | ppc64 | powerpc64le | ppc64le) CPU_ARCH=ppc64 ;; Index: mozilla/mfbt/Endian.h =================================================================== --- mozilla.orig/mfbt/Endian.h +++ mozilla/mfbt/Endian.h @@ -91,7 +91,7 @@ # else # error "CPU type is unknown" # endif -#elif defined(__APPLE__) +#elif defined(__APPLE__) || defined(__powerpc__) || defined(__ppc__) # if __LITTLE_ENDIAN__ # define MOZ_LITTLE_ENDIAN 1 # elif __BIG_ENDIAN__ @@ -119,8 +119,7 @@ * cases. */ #elif defined(__sparc) || defined(__sparc__) || \ - defined(_POWER) || defined(__powerpc__) || \ - defined(__ppc__) || defined(__hppa) || \ + defined(_POWER) || defined(__hppa) || \ defined(_MIPSEB) || defined(__ARMEB__) || \ defined(__s390__) || \ (defined(__sh__) && defined(__LITTLE_ENDIAN__)) || \ Index: mozilla/js/src/jscpucfg.h =================================================================== --- mozilla.orig/js/src/jscpucfg.h +++ mozilla/js/src/jscpucfg.h @@ -31,7 +31,7 @@ # define JS_BYTES_PER_WORD 4 # define JS_BITS_PER_WORD_LOG2 5 -#elif defined(__APPLE__) +#elif defined(__APPLE__) || defined(__powerpc__) || defined(__ppc__) # if __LITTLE_ENDIAN__ # define IS_LITTLE_ENDIAN 1 # undef IS_BIG_ENDIAN @@ -93,8 +93,7 @@ # endif #elif defined(__sparc) || defined(__sparc__) || \ - defined(_POWER) || defined(__powerpc__) || \ - defined(__ppc__) || defined(__hppa) || \ + defined(_POWER) || defined(__hppa) || \ defined(_MIPSEB) || defined(_BIG_ENDIAN) /* IA64 running HP-UX will have _BIG_ENDIAN defined. * IA64 running Linux will have endian.h and be handled above. Index: mozilla/js/src/assembler/wtf/Platform.h =================================================================== --- mozilla.orig/js/src/assembler/wtf/Platform.h +++ mozilla/js/src/assembler/wtf/Platform.h @@ -165,16 +165,22 @@ || defined(__POWERPC__) \ || defined(_M_PPC) \ || defined(__PPC) +#if !defined(__ppc64__) && !defined(__PPC64__) #define WTF_CPU_PPC 1 +#endif +#if !defined(__LITTLE_ENDIAN__) #define WTF_CPU_BIG_ENDIAN 1 #endif +#endif /* WTF_CPU_PPC64 - PowerPC 64-bit */ #if defined(__ppc64__) \ || defined(__PPC64__) #define WTF_CPU_PPC64 1 +#if !defined(__LITTLE_ENDIAN__) #define WTF_CPU_BIG_ENDIAN 1 #endif +#endif /* WTF_CPU_SH4 - SuperH SH-4 */ #if defined(__SH4__) Index: mozilla/nsprpub/pr/include/md/_linux.cfg =================================================================== --- mozilla.orig/nsprpub/pr/include/md/_linux.cfg +++ mozilla/nsprpub/pr/include/md/_linux.cfg @@ -29,8 +29,13 @@ #ifdef __powerpc64__ +#ifdef __LITTLE_ENDIAN__ +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN +#else #undef IS_LITTLE_ENDIAN #define IS_BIG_ENDIAN 1 +#endif #define IS_64 #define PR_BYTES_PER_BYTE 1 @@ -75,8 +80,13 @@ #elif defined(__powerpc__) +#ifdef __LITTLE_ENDIAN__ +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN +#else #undef IS_LITTLE_ENDIAN #define IS_BIG_ENDIAN 1 +#endif #define PR_BYTES_PER_BYTE 1 #define PR_BYTES_PER_SHORT 2 Index: mozilla/media/webrtc/trunk/webrtc/typedefs.h =================================================================== --- mozilla.orig/media/webrtc/trunk/webrtc/typedefs.h +++ mozilla/media/webrtc/trunk/webrtc/typedefs.h @@ -52,13 +52,23 @@ #elif defined(__powerpc64__) #define WEBRTC_ARCH_PPC64 1 #define WEBRTC_ARCH_64_BITS 1 +#ifdef __LITTLE_ENDIAN__ +#define WEBRTC_ARCH_LITTLE_ENDIAN +#define WEBRTC_LITTLE_ENDIAN +#else #define WEBRTC_ARCH_BIG_ENDIAN #define WEBRTC_BIG_ENDIAN +#endif #elif defined(__ppc__) || defined(__powerpc__) #define WEBRTC_ARCH_PPC 1 #define WEBRTC_ARCH_32_BITS 1 +#ifdef __LITTLE_ENDIAN__ +#define WEBRTC_ARCH_LITTLE_ENDIAN +#define WEBRTC_LITTLE_ENDIAN +#else #define WEBRTC_ARCH_BIG_ENDIAN #define WEBRTC_BIG_ENDIAN +#endif #elif defined(__sparc64__) #define WEBRTC_ARCH_SPARC 1 #define WEBRTC_ARCH_64_BITS 1 ++++++ suse-default-prefs.js ++++++ pref("general.useragent.vendor", "SUSE"); pref("general.useragent.vendorSub", "RPM_VERSION"); pref("font.default", "sans-serif"); pref("font.default.x-western", "sans-serif"); pref("font.name.monospace.x-western", "monospace"); pref("font.name.monospace.x-unicode", "monospace"); pref("network.negotiate-auth.gsslib", "GSSAPI"); pref("print.print_edge_top", 14); // 1/100 of an inch pref("print.print_edge_left", 16); // 1/100 of an inch pref("print.print_edge_right", 16); // 1/100 of an inch pref("print.print_edge_bottom", 14); // 1/100 of an inch pref("intl.locale.matchOS", true); // do not disable system-global or app-global extensions pref("extensions.autoDisableScopes", 3); pref("extensions.shownSelectionUI", true); ++++++ tb-develdirs.patch ++++++ diff --git a/config/baseconfig.mk b/config/baseconfig.mk index 636b9aa..b350c75 100644 --- a/config/baseconfig.mk +++ b/config/baseconfig.mk @@ -1,7 +1,7 @@ INCLUDED_AUTOCONF_MK = 1 -includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +includedir := $(includedir)/$(MOZ_APP_NAME) +idldir = $(datadir)/idl/$(MOZ_APP_NAME) installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) MOZILLA_SRCDIR = $(topsrcdir)/mozilla ++++++ tb-ssldap.patch ++++++ diff --git a/mail/installer/package-manifest.in b/mail/installer/package-manifest.in --- a/mail/installer/package-manifest.in +++ b/mail/installer/package-manifest.in @@ -268,16 +268,17 @@ #ifdef XP_WIN32 @BINPATH@/nsldap32v60@DLL_SUFFIX@ @BINPATH@/nsldappr32v60@DLL_SUFFIX@ @BINPATH@/nsldif32v60@DLL_SUFFIX@ #else @BINPATH@/@DLL_PREFIX@ldap60@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@ldif60@DLL_SUFFIX@ @BINPATH@/@DLL_PREFIX@prldap60@DLL_SUFFIX@ +@BINPATH@/@DLL_PREFIX@ssldap60@DLL_SUFFIX@ #endif ; login manager @BINPATH@/components/loginmgr.xpt @BINPATH@/components/nsLoginInfo.js @BINPATH@/components/nsLoginManager.js @BINPATH@/components/nsLoginManagerPrompter.js @BINPATH@/components/passwordmgr.manifest ++++++ thunderbird-rpmlintrc ++++++ addFilter("no-jar-manifest") ++++++ thunderbird-shared-nss-db.patch ++++++ From: Hans Petter Jansson <hpj(a)copyleft.no> Wolfgang Rosenauer <wr(a)rosenauer.org> Subject: use libnsssharedhelper if available at compile time (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) References: diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in --- a/mail/app/Makefile.in +++ b/mail/app/Makefile.in @@ -61,16 +61,17 @@ LOCAL_INCLUDES += \ $(NULL) DEFINES += -DXPCOM_GLUE STL_FLAGS= LIBS += \ $(EXTRA_DSO_LIBS) \ $(XPCOM_STANDALONE_GLUE_LDOPTS) \ + $(NSSHELPER_LIBS) \ $(NULL) ifdef MOZ_LINKER LIBS += $(MOZ_ZLIB_LIBS) endif ifndef MOZ_WINCONSOLE ifdef MOZ_DEBUG ++++++ thunderbird.desktop ++++++ [Desktop Entry] Encoding=UTF-8 Name=Thunderbird GenericName=Mail/News Client Comment=Mail/News Client TryExec=thunderbird Exec=thunderbird %u Icon=thunderbird Terminal=false Type=Application StartupNotify=true MimeType=x-scheme-handler/mailto; ++++++ xpcom-ppc64le.patch ++++++ Index: mozilla/xpcom/reflect/xptcall/src/md/unix/moz.build =================================================================== --- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/moz.build +++ mozilla/xpcom/reflect/xptcall/src/md/unix/moz.build @@ -198,6 +198,13 @@ if CONFIG['OS_TEST'] == 'powerpc64': 'xptcstubs_ppc64_linux.cpp', ] +if CONFIG['OS_TEST'] == 'powerpc64le': + if CONFIG['OS_ARCH'] == 'Linux': + CPP_SOURCES += [ + 'xptcinvoke_ppc64_linux.cpp', + 'xptcstubs_ppc64_linux.cpp', + ] + if CONFIG['OS_TEST'] in ('macppc', 'bebox', 'ofppc', 'prep', 'amigappc'): if CONFIG['OS_ARCH'] == 'NetBSD': CPP_SOURCES += [ Index: mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in =================================================================== --- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/Makefile.in +++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in @@ -166,7 +166,7 @@ endif # # Linux/PPC64 # -ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) +ifneq (,$(filter Linuxpowerpc64 Linuxpowerpc64le FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s AS := $(CC) -c -x assembler-with-cpp endif Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s =================================================================== --- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.s @@ -17,12 +17,29 @@ .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29 .set f30,30; .set f31,31 +#if _CALL_ELF == 2 +#define STACK_TOC 28 +#define STACK_PARAMS 96 +#else +#define STACK_TOC 40 +#define STACK_PARAMS 112 +#endif # # NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex, # uint32_t paramCount, nsXPTCVariant* params) # +#if _CALL_ELF == 2 + .section ".text" + .type NS_InvokeByIndex,@function + .globl NS_InvokeByIndex + .align 2 +NS_InvokeByIndex: +0: addis 2,12,(.TOC.-0b)@ha + addi 2,2,(.TOC.-0b)@l + .localentry NS_InvokeByIndex,.-NS_InvokeByIndex +#else .section ".toc","aw" .section ".text" .align 2 @@ -34,6 +51,7 @@ NS_InvokeByIndex: .previous .type NS_InvokeByIndex,@function .NS_InvokeByIndex: +#endif mflr 0 std 0,16(r1) @@ -56,7 +74,7 @@ NS_InvokeByIndex: # (-23*8).(-16*8).(-3*8)..(r31) # +stack frame, -unused stack params, +regs storage, +1 for alignment - addi r7,r5,((112/8)-7+7+13+3+1) + addi r7,r5,((STACK_PARAMS/8)-7+7+13+3+1) rldicr r7,r7,3,59 # multiply by 8 and mask with ~15 neg r7,r7 stdux r1,r1,r7 @@ -72,7 +90,7 @@ NS_InvokeByIndex: subi r3,r31,(23*8) # r3 --> GPRS subi r4,r31,(16*8) # r4 --> FPRS - addi r7,r1,112 # r7 --> params + addi r7,r1,STACK_PARAMS # r7 --> params bl invoke_copy_to_stack nop @@ -83,14 +101,18 @@ NS_InvokeByIndex: sldi r30,r30,3 # Find function descriptor add r9,r9,r30 - ld r9,0(r9) + ld r12,0(r9) - ld r0,0(r9) # Actual address from fd. - std r2,40(r1) # Save r2 (TOC pointer) + std r2,STACK_TOC(r1) # Save r2 (TOC pointer) +#if _CALL_ELF == 2 + mtctr r12 +#else + ld r0,0(r12) # Actual address from fd. mtctr 0 - ld r11,16(r9) # Environment pointer from fd. - ld r2,8(r9) # TOC pointer from fd. + ld r11,16(r12) # Environment pointer from fd. + ld r2,8(r12) # TOC pointer from fd. +#endif # Load FP and GP registers as required ld r4, -(23*8)(r31) @@ -117,7 +139,7 @@ NS_InvokeByIndex: bctrl # Do it - ld r2,40(r1) # Load our own TOC pointer + ld r2,STACK_TOC(r1) # Load our own TOC pointer ld r1,0(r1) # Revert stack frame ld 0,16(r1) # Reload lr ld 29,-24(r1) # Restore NVGPRS @@ -126,7 +148,11 @@ NS_InvokeByIndex: mtlr 0 blr +#if _CALL_ELF == 2 + .size NS_InvokeByIndex,.-NS_InvokeByIndex +#else .size NS_InvokeByIndex,.-.NS_InvokeByIndex +#endif # Magic indicating no need for an executable stack .section .note.GNU-stack, "", @progbits ; .previous Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp =================================================================== --- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp @@ -74,7 +74,9 @@ invoke_copy_to_stack(uint64_t* gpregs, fpregs[i] = s->val.f; // if passed in registers, floats are promoted to doubles } else { float *p = (float *)d; +#ifndef __LITTLE_ENDIAN__ p++; +#endif *p = s->val.f; } } Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s =================================================================== --- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.s @@ -17,6 +17,27 @@ .set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29 .set f30,30; .set f31,31 +#if _CALL_ELF == 2 +#define STACK_PARAMS 96 +#else +#define STACK_PARAMS 112 +#endif + +#if _CALL_ELF == 2 + .section ".text" + .type SharedStub,@function + .globl SharedStub + # Make the symbol hidden so that the branch from the stub does + # not go via a PLT. This is not only better for performance, + # but may be necessary to avoid linker errors since there is + # no place to restore the TOC register in a sibling call. + .hidden SharedStub + .align 2 +SharedStub: +0: addis 2,12,(.TOC.-0b)@ha + addi 2,2,(.TOC.-0b)@l + .localentry SharedStub,.-SharedStub +#else .section ".text" .align 2 .globl SharedStub @@ -29,6 +50,7 @@ SharedStub: .type SharedStub,@function .SharedStub: +#endif mflr r0 std r4, -56(r1) # Save all GPRS @@ -55,7 +77,7 @@ SharedStub: subi r6,r1,56 # r6 --> gprData subi r7,r1,160 # r7 --> fprData - addi r5,r1,112 # r5 --> extra stack args + addi r5,r1,STACK_PARAMS # r5 --> extra stack args std r0, 16(r1) @@ -75,7 +97,11 @@ SharedStub: mtlr r0 blr +#if _CALL_ELF == 2 + .size SharedStub,.-SharedStub +#else .size SharedStub,.-.SharedStub +#endif # Magic indicating no need for an executable stack .section .note.GNU-stack, "", @progbits ; .previous Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp =================================================================== --- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp @@ -83,7 +83,9 @@ PrepareAndDispatch(nsXPTCStubBase* self, dp->val.f = (float) fprData[i]; // in registers floats are passed as doubles else { float *p = (float *)ap; +#ifndef __LITTLE_ENDIAN__ p++; +#endif dp->val.f = *p; } } else { /* integer type or pointer */ @@ -153,6 +155,43 @@ PrepareAndDispatch(nsXPTCStubBase* self, // etc. // Use assembler directives to get the names right... +#if _CALL_ELF == 2 +# define STUB_ENTRY(n) \ +__asm__ ( \ + ".section \".text\" \n\t" \ + ".align 2 \n\t" \ + ".if "#n" < 10 \n\t" \ + ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \ + ".type _ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n" \ +"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t" \ + "0: addis 2,12,.TOC.-0b@ha \n\t" \ + "addi 2,2,.TOC.-0b@l \n\t" \ + ".localentry _ZN14nsXPTCStubBase5Stub"#n"Ev,.-_ZN14nsXPTCStubBase5Stub"#n"Ev \n\t" \ + \ + ".elseif "#n" < 100 \n\t" \ + ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \ + ".type _ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n" \ +"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t" \ + "0: addis 2,12,.TOC.-0b@ha \n\t" \ + "addi 2,2,.TOC.-0b@l \n\t" \ + ".localentry _ZN14nsXPTCStubBase6Stub"#n"Ev,.-_ZN14nsXPTCStubBase6Stub"#n"Ev \n\t" \ + \ + ".elseif "#n" < 1000 \n\t" \ + ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \ + ".type _ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n" \ +"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t" \ + "0: addis 2,12,.TOC.-0b@ha \n\t" \ + "addi 2,2,.TOC.-0b@l \n\t" \ + ".localentry _ZN14nsXPTCStubBase7Stub"#n"Ev,.-_ZN14nsXPTCStubBase7Stub"#n"Ev \n\t" \ + \ + ".else \n\t" \ + ".err \"stub number "#n" >= 1000 not yet supported\"\n" \ + ".endif \n\t" \ + \ + "li 11,"#n" \n\t" \ + "b SharedStub \n" \ +); +#else # define STUB_ENTRY(n) \ __asm__ ( \ ".section \".toc\",\"aw\" \n\t" \ @@ -195,6 +234,7 @@ __asm__ ( "li 11,"#n" \n\t" \ "b SharedStub \n" \ ); +#endif #define SENTINEL_ENTRY(n) \ nsresult nsXPTCStubBase::Sentinel##n() \ -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wine for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '14

29 Apr '14

Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2014-04-29 17:36:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wine" Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2014-02-26 06:59:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.wine.new/wine.changes 2014-04-29 17:36:32.000000000 +0200 @@ -1,0 +2,39 @@ +Fri Apr 18 19:08:23 UTC 2014 - meissner(a)suse.com + +- Updated to 1.7.17 development snapshot + - More implementations for the Task Scheduler. + - C runtime made more compatible by sharing source files. + - Fixes in the Mac OS X joystick support. + - Various bug fixes. +- updated winetricks + +------------------------------------------------------------------- +Fri Apr 4 21:15:06 UTC 2014 - meissner(a)suse.com + +- Updated to 1.7.16 development snapshot + - More regression test fixes. + - String arrays better supported in the IDL compiler. + - Initial stubs for DirectX Video Acceleration. + - Various bug fixes. + +------------------------------------------------------------------- +Fri Mar 21 22:56:05 UTC 2014 - meissner(a)suse.com + +- Updated to 1.7.15 development snapshot + - New Task Scheduler service. + - Many regression test fixes. + - Support for exception unwinding in VBScript. + - Various bug fixes. + +------------------------------------------------------------------- +Fri Mar 7 21:41:41 UTC 2014 - meissner(a)suse.com + +- Updated to 1.7.14 development snapshot + - More Task Scheduler support. + - Improvements for AVI encoding support. + - More VisualBasic interfaces in MSXML. + - Support for deflate content encoding in Wininet. + - Some fixes for monochrome printers. + - Various bug fixes. + +------------------------------------------------------------------- Old: ---- wine-1.7.13.tar.bz2 wine-1.7.13.tar.bz2.sign New: ---- wine-1.7.17.tar.bz2 wine-1.7.17.tar.bz2.sign ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.6SiJ85/_old 2014-04-29 17:36:34.000000000 +0200 +++ /var/tmp/diff_new_pack.6SiJ85/_new 2014-04-29 17:36:34.000000000 +0200 @@ -55,7 +55,7 @@ BuildRequires: update-desktop-files BuildRequires: valgrind-devel BuildRequires: xorg-x11-devel -Version: 1.7.13 +Version: 1.7.17 Release: 0 Summary: An MS Windows Emulator License: LGPL-2.1+ ++++++ wine-1.7.13.tar.bz2 -> wine-1.7.17.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/wine/wine-1.7.13.tar.bz2 /work/SRC/openSUSE:Factory/.wine.new/wine-1.7.17.tar.bz2 differ: char 11, line 1 ++++++ winetricks ++++++ ++++ 1789 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/wine/winetricks ++++ and /work/SRC/openSUSE:Factory/.wine.new/winetricks -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ponysay for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '14

29 Apr '14

Hello community, here is the log from the commit of package ponysay for openSUSE:Factory checked in at 2014-04-29 17:35:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ponysay (Old) and /work/SRC/openSUSE:Factory/.ponysay.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ponysay" Changes: -------- New Changes file: --- /dev/null 2014-04-28 00:21:37.460033756 +0200 +++ /work/SRC/openSUSE:Factory/.ponysay.new/ponysay.changes 2014-04-29 17:35:48.000000000 +0200 @@ -0,0 +1,11 @@ +------------------------------------------------------------------- +Sat Apr 26 15:47:56 UTC 2014 - andreas.stieger(a)gmx.de + +- spec cleanup +- add source URLs + +------------------------------------------------------------------- + +Sat Apr 6 12:34:23 UTC 2014 - sor.alexei(a)meowr.ru + +- Initial package. New: ---- info-direntry.patch ponysay-3.0.1.tar.gz ponysay.changes ponysay.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ponysay.spec ++++++ # # spec file for package ponysay # # Copyright (c) 2014 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: ponysay Version: 3.0.1 Release: 0 Summary: Cowsay reimplemention for ponies License: GPL-3.0+ Group: Amusements/Toys/Other Url: https://github.com/erkin/ponysay Source: https://github.com/erkin/%{name}/archive/%{version}.tar.gz#/%{name}-%{versi… # PATCH-FIX-OPENSUSE info-direntry.patch sor.alexei(a)meowr.ru -- Adds @direntry to ponysay.info. Patch0: info-direntry.patch BuildRequires: fdupes BuildRequires: python3-devel BuildRequires: texinfo Requires: python3 Requires(post): info Requires(preun): info BuildArch: noarch %description ponysay as an awesome terminal application to display ponies speaking messages in your terminal. It has many features; you can use its info manual to explore them. %prep %setup -q %patch0 -p1 %build # Nothing to build. %install python3 setup.py --prefix=%{_prefix} --dest-dir=%{buildroot} --freedom=partial --with-everything --with-pdf=%{_docdir}/%{name}/ install rm -rf %{buildroot}%{_infodir}/dir %{buildroot}%{_datadir}/licenses/ %fdupes %{buildroot}/%{_datadir}/%{name} %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} %install_info --info-dir=%{_infodir} %{_infodir}/%{name}-tool.info%{ext_info} %install_info --info-dir=%{_infodir} %{_infodir}/ponythink.info%{ext_info} %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}-tool.info%{ext_info} %install_info_delete --info-dir=%{_infodir} %{_infodir}/ponythink.info%{ext_info} %files %defattr(-,root,root) %doc CHANGELOG CONTRIBUTING COPYING CREDITS LICENSE README.md %{_bindir}/pony* %{_datadir}/%{name}/ %{_infodir}/*.gz %{_mandir}/man6/* %{_mandir}/*/man6/* %{_datadir}/bash-completion/ %{_datadir}/zsh/ %{_datadir}/fish/ %changelog ++++++ info-direntry.patch ++++++ --- a/manuals/ponysay.texinfo +++ b/manuals/ponysay.texinfo @@ -14,6 +14,10 @@ @synindex op vr @synindex cp pg +@dircategory Miscellaneous +@direntry +* ponysay: (ponysay). Ponies for your terminal +@end direntry @copying This manual is for ponysay -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libeXosip2 for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '14

29 Apr '14

Hello community, here is the log from the commit of package libeXosip2 for openSUSE:Factory checked in at 2014-04-29 17:35:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libeXosip2 (Old) and /work/SRC/openSUSE:Factory/.libeXosip2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libeXosip2" Changes: -------- --- /work/SRC/openSUSE:Factory/libeXosip2/libeXosip2.changes 2013-07-17 10:25:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libeXosip2.new/libeXosip2.changes 2014-04-29 17:35:30.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Apr 28 08:29:28 UTC 2014 - meissner(a)suse.com + +- libeXosip2-sslverifypaths.patch: set default SSL verify locations (bnc#871099) +- build with -O2 (--disable-debug) + +------------------------------------------------------------------- New: ---- libeXosip2-sslverifypaths.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libeXosip2.spec ++++++ --- /var/tmp/diff_new_pack.DK04Pz/_old 2014-04-29 17:35:31.000000000 +0200 +++ /var/tmp/diff_new_pack.DK04Pz/_new 2014-04-29 17:35:31.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libeXosip2 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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,8 +23,8 @@ Version: 3.5.0 Release: 0 Url: http://savannah.nongnu.org/forum/forum.php?forum_id=3778 - Source: libeXosip2-%{version}.tar.bz2 +Patch0: libeXosip2-sslverifypaths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: glibc-devel BuildRequires: libopenssl-devel @@ -73,10 +73,11 @@ %prep %setup -q -n libeXosip2-%{version} +%patch0 -p1 %build #./autogen.sh -%configure --disable-static +%configure --disable-static --disable-debug make %install ++++++ libeXosip2-sslverifypaths.patch ++++++ Index: libeXosip2-3.5.0/src/eXtl_tls.c =================================================================== --- libeXosip2-3.5.0.orig/src/eXtl_tls.c +++ libeXosip2-3.5.0/src/eXtl_tls.c @@ -977,10 +977,13 @@ SSL_CTX *initialize_client_ctx(const cha /* Load the CAs we trust */ if (! (SSL_CTX_load_verify_locations - (ctx, eXosip_tls_ctx_params.root_ca_cert, 0))) + (ctx, eXosip_tls_ctx_params.root_ca_cert, 0))) { OSIP_TRACE(osip_trace (__FILE__, __LINE__, OSIP_ERROR, NULL, "eXosip: Couldn't read CA list\n")); + /* fallback to whatever the system has */ + SSL_CTX_set_default_verify_paths(ctx); + } { int verify_mode = SSL_VERIFY_NONE; -- 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-config-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '14

29 Apr '14

Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-04-29 17:35:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi-config-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2014-03-25 13:23:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-04-29 17:35:24.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 29 11:23:50 UTC 2014 - coolo(a)suse.com + +- create a PIDFILE for systemd even for live installer (2nd greatest + hack of all times) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdm-liveinstall.patch ++++++ --- /var/tmp/diff_new_pack.m0H1eO/_old 2014-04-29 17:35:25.000000000 +0200 +++ /var/tmp/diff_new_pack.m0H1eO/_new 2014-04-29 17:35:25.000000000 +0200 @@ -20,7 +20,7 @@ - startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed + if cat /proc/cmdline | grep -q liveinstall; then + [ -x /usr/bin/plymouth ] && /usr/bin/plymouth quit -+ /usr/lib/YaST2/startup/YaST2.call live-installer ++ startproc -p $PIDFILE /usr/lib/YaST2/startup/YaST2.call live-installer + else + startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed + fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim4 for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '14

29 Apr '14

Hello community, here is the log from the commit of package kdepim4 for openSUSE:Factory checked in at 2014-04-29 17:34:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim4 (Old) and /work/SRC/openSUSE:Factory/.kdepim4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim4/kdepim4.changes 2014-04-18 12:37:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim4.new/kdepim4.changes 2014-04-29 17:34:14.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 25 10:03:55 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Make sure to depend on libkgapi2 version, against which the + package was built + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4.spec ++++++ --- /var/tmp/diff_new_pack.K7WOXI/_old 2014-04-29 17:34:15.000000000 +0200 +++ /var/tmp/diff_new_pack.K7WOXI/_new 2014-04-29 17:34:15.000000000 +0200 @@ -55,6 +55,7 @@ Suggests: korganizer Suggests: ktimetracker Suggests: libkdepim4 +Requires: libkgapi2-2 >= %( echo `rpm -q --queryformat '%{VERSION}' libkgapi-devel`) BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_akonadi_requires %kde4_pimlibs_requires -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtkwave for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '14

29 Apr '14

Hello community, here is the log from the commit of package gtkwave for openSUSE:Factory checked in at 2014-04-29 17:33:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtkwave (Old) and /work/SRC/openSUSE:Factory/.gtkwave.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gtkwave" Changes: -------- --- /work/SRC/openSUSE:Factory/gtkwave/gtkwave.changes 2014-03-22 09:07:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gtkwave.new/gtkwave.changes 2014-04-29 17:33:20.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Apr 29 10:17:50 UTC 2014 - dmitry_r(a)opensuse.org + +- Update to version 3.3.59 + * Use Duff's Device for 8 byte -> 1 byte binary value compression + algorithm in FST writer. + * Updated man page for gtkwave.1 indicating that XID is in hex. + * Allow decimal conversions on popcnt filtered vectors that are + greater than 64 bits (they will never overflow). + +------------------------------------------------------------------- Old: ---- gtkwave-3.3.58.tar.gz New: ---- gtkwave-3.3.59.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtkwave.spec ++++++ --- /var/tmp/diff_new_pack.KEvM1z/_old 2014-04-29 17:33:21.000000000 +0200 +++ /var/tmp/diff_new_pack.KEvM1z/_new 2014-04-29 17:33:21.000000000 +0200 @@ -17,7 +17,7 @@ Name: gtkwave -Version: 3.3.58 +Version: 3.3.59 Release: 0 Summary: Waveform viewer for Ditital Signals License: GPL-2.0+ ++++++ gtkwave-3.3.58.tar.gz -> gtkwave-3.3.59.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/ChangeLog new/gtkwave-3.3.59/ChangeLog --- old/gtkwave-3.3.58/ChangeLog 2014-03-16 06:31:40.000000000 +0100 +++ new/gtkwave-3.3.59/ChangeLog 2014-04-26 19:55:01.000000000 +0200 @@ -1461,3 +1461,13 @@ Change [1] at end of struct to C99 [] notation with appropriate allocation size modification. System_profiler speed fix for OSX. +3.3.59 26apr14 Use Duff's Device for 8 byte -> 1 byte binary value compression + algorithm in FST writer. + Warnings fixes from cppcheck. + Moved MinGW for FST to using different windows tempfile + generation instead of tmpfile(). + Removed fflush() in FST for MinGW in places that can cause + crashes with read only files. + Updated man page for gtkwave.1 indicating that XID is in hex. + Allow decimal conversions on popcnt filtered vectors that are + greater than 64 bits (they will never overflow). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/LICENSE.TXT new/gtkwave-3.3.59/LICENSE.TXT --- old/gtkwave-3.3.58/LICENSE.TXT 2014-02-14 21:26:10.000000000 +0100 +++ new/gtkwave-3.3.59/LICENSE.TXT 2014-03-21 19:23:34.000000000 +0100 @@ -1,6 +1,6 @@ ########################################################################## -GTKWave 3.3.58 Wave Viewer is Copyright (C) 1999-2014 Tony Bybell. +GTKWave 3.3.59 Wave Viewer is Copyright (C) 1999-2014 Tony Bybell. Portions of GTKWave are Copyright (C) 1999-2014 Udi Finkelstein. Context support is Copyright (C) 2007-2014 Kermin Elliott Fleming. Trace group support is Copyright (C) 2009-2014 Donald Baltus. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/configure new/gtkwave-3.3.59/configure --- old/gtkwave-3.3.58/configure 2014-02-14 21:26:10.000000000 +0100 +++ new/gtkwave-3.3.59/configure 2014-03-21 19:23:34.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gtkwave 3.3.58. +# Generated by GNU Autoconf 2.69 for gtkwave 3.3.59. # # Report bugs to <bybell(a)rocketmail.com>. # @@ -580,8 +580,8 @@ # Identity of this package. PACKAGE_NAME='gtkwave' PACKAGE_TARNAME='gtkwave' -PACKAGE_VERSION='3.3.58' -PACKAGE_STRING='gtkwave 3.3.58' +PACKAGE_VERSION='3.3.59' +PACKAGE_STRING='gtkwave 3.3.59' PACKAGE_BUGREPORT='bybell(a)rocketmail.com' PACKAGE_URL='' @@ -1382,7 +1382,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gtkwave 3.3.58 to adapt to many kinds of systems. +\`configure' configures gtkwave 3.3.59 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1448,7 +1448,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gtkwave 3.3.58:";; + short | recursive ) echo "Configuration of gtkwave 3.3.59:";; esac cat <<\_ACEOF @@ -1593,7 +1593,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gtkwave configure 3.3.58 +gtkwave configure 3.3.59 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2237,7 +2237,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gtkwave $as_me 3.3.58, which was +It was created by gtkwave $as_me 3.3.59, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3104,7 +3104,7 @@ # Define the identity of the package. PACKAGE='gtkwave' - VERSION='3.3.58' + VERSION='3.3.59' cat >>confdefs.h <<_ACEOF @@ -10959,7 +10959,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gtkwave $as_me 3.3.58, which was +This file was extended by gtkwave $as_me 3.3.59, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -11025,7 +11025,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gtkwave config.status 3.3.58 +gtkwave config.status 3.3.59 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/configure.ac new/gtkwave-3.3.59/configure.ac --- old/gtkwave-3.3.58/configure.ac 2014-02-14 21:26:10.000000000 +0100 +++ new/gtkwave-3.3.59/configure.ac 2014-03-21 19:23:34.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(gtkwave, 3.3.58, bybell(a)rocketmail.com) +AC_INIT(gtkwave, 3.3.59, bybell(a)rocketmail.com) AC_CONFIG_SRCDIR([src/vcd.c]) AM_INIT_AUTOMAKE AC_CONFIG_HEADER([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/contrib/bundle_for_osx/Info-gtkwave.plist new/gtkwave-3.3.59/contrib/bundle_for_osx/Info-gtkwave.plist --- old/gtkwave-3.3.58/contrib/bundle_for_osx/Info-gtkwave.plist 2014-02-14 21:26:10.000000000 +0100 +++ new/gtkwave-3.3.59/contrib/bundle_for_osx/Info-gtkwave.plist 2014-03-21 19:23:34.000000000 +0100 @@ -8,7 +8,7 @@ <key>CFBundleExecutable</key> <string>gtkwave</string> <key>CFBundleGetInfoString</key> - <string>3.3.58, (C) 1999-2014 Tony Bybell http://gtkwave.sourceforge.net</string> + <string>3.3.59, (C) 1999-2014 Tony Bybell http://gtkwave.sourceforge.net</string> <key>CFBundleIconFile</key> <string>gtkwave.icns</string> <key>CFBundleIdentifier</key> @@ -18,11 +18,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>3.3.58</string> + <string>3.3.59</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>3.3.58</string> + <string>3.3.59</string> <key>NSHumanReadableCopyright</key> <string>Copyright 1999 - 2014 Tony Bybell, GNU General Public License.</string> <key>LSMinimumSystemVersion</key> Files old/gtkwave-3.3.58/doc/gtkwave.odt and new/gtkwave-3.3.59/doc/gtkwave.odt differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/man/gtkwave.1 new/gtkwave-3.3.59/man/gtkwave.1 --- old/gtkwave-3.3.58/man/gtkwave.1 2012-03-24 20:47:01.000000000 +0100 +++ new/gtkwave-3.3.59/man/gtkwave.1 2014-04-22 15:05:17.000000000 +0200 @@ -1,4 +1,4 @@ -.TH "GTKWAVE" "1" "3.3.29" "Anthony Bybell" "Simulation Wave Viewer" +.TH "GTKWAVE" "1" "3.3.59" "Anthony Bybell" "Simulation Wave Viewer" .SH "NAME" .LP gtkwave \- Visualization tool for VCD, LXT, LXT2, VZT, FST, and GHW files @@ -94,7 +94,7 @@ Specifies delay in milliseconds between successive executions of the repscript. Default is 500. .TP \fB\-X\fR,\fB\-\-xid\fR <\fIXID\fP> -Specify XID of window for a GtkPlug to connect to. GTKWave does not directly render to a window but instead renders into a +Specify XID (in hexadecimal) of window for a GtkPlug to connect to. GTKWave does not directly render to a window but instead renders into a GtkPlug expecting a GtkSocket at the other end. Note that there are issues with accelerators working properly so menus are disabled in the componentized version of GTKWave when it functions as a plug-in. .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/src/baseconvert.c new/gtkwave-3.3.59/src/baseconvert.c --- old/gtkwave-3.3.58/src/baseconvert.c 2014-02-25 22:36:14.000000000 +0100 +++ new/gtkwave-3.3.59/src/baseconvert.c 2014-04-26 19:55:01.000000000 +0200 @@ -330,7 +330,7 @@ if(GLOBALS->show_base) { *(pnt++)='"'; } *(pnt)=0x00; /* scan build : remove dead increment */ } -else if((flags&TR_HEX)||((flags&(TR_DEC|TR_SIGNED))&&(nbits>64))) +else if((flags&TR_HEX)||((flags&(TR_DEC|TR_SIGNED))&&(nbits>64)&&(!(flags&TR_POPCNT)))) { char *parse; @@ -990,7 +990,7 @@ if(GLOBALS->show_base) { *(pnt++)='"'; } *(pnt)=0x00; /* scan build : remove dead increment */ } -else if((flags&TR_HEX)||((flags&(TR_DEC|TR_SIGNED))&&(nbits>64))) +else if((flags&TR_HEX)||((flags&(TR_DEC|TR_SIGNED))&&(nbits>64)&&(!(flags&TR_POPCNT)))) { char *parse; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/src/file.c new/gtkwave-3.3.59/src/file.c --- old/gtkwave-3.3.58/src/file.c 2013-10-31 03:43:36.000000000 +0100 +++ new/gtkwave-3.3.59/src/file.c 2014-04-11 01:23:04.000000000 +0200 @@ -174,7 +174,7 @@ } else { - sprintf(lpstrFilter, "%s%c%s%c%s%c%s%c", pattn, 0, pattn, 0, "All", 0, "*.*"); + sprintf(lpstrFilter, "%s%c%s%c%s%c%s%c", pattn, 0, pattn, 0, "All", 0, "*.*", 0); /* cppcheck */ ofn.nFilterIndex = 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/src/ghwlib.c new/gtkwave-3.3.59/src/ghwlib.c --- old/gtkwave-3.3.58/src/ghwlib.c 2014-03-02 00:05:21.000000000 +0100 +++ new/gtkwave-3.3.59/src/ghwlib.c 2014-04-11 01:23:04.000000000 +0200 @@ -524,7 +524,10 @@ e->wkt = ghw_wkt_unknown; e->name = ghw_read_strid (h); if (ghw_read_uleb128 (h, (uint32_t *)&e->nbr) != 0) - return -1; + { + free(e); /* cppcheck */ + return -1; + } e->lits = (const char **) calloc (1, e->nbr * sizeof (char *)); if (h->flag_verbose > 1) printf ("enum %s:", e->name); @@ -568,13 +571,20 @@ int ix; if (ghw_read_uleb128 (h, &ph->nbr_units) != 0) - return -1; + { + free(ph); /* cppcheck */ + return -1; + } ph->units = calloc (ph->nbr_units, sizeof (struct ghw_unit)); for (ix = 0; ix < ph->nbr_units; ix++) { ph->units[ix].name = ghw_read_strid (h); if (ghw_read_lsleb128 (h, &ph->units[ix].val) < 0) - return -1; + { + free(ph->units); /* missed by cppcheck */ + free(ph); /* missed by cppcheck */ + return -1; + } } } if (h->flag_verbose > 1) @@ -606,7 +616,10 @@ arr->name = ghw_read_strid (h); arr->el = ghw_read_typeid (h); if (ghw_read_uleb128 (h, (uint32_t *)&arr->nbr_dim) != 0) - return -1; + { + free(arr); /* cppcheck */ + return -1; + } arr->dims = (union ghw_type **) calloc (arr->nbr_dim, sizeof (union ghw_type *)); for (j = 0; j < arr->nbr_dim; j++) @@ -650,7 +663,10 @@ rec->kind = t; rec->name = ghw_read_strid (h); if (ghw_read_uleb128 (h, (uint32_t *)&rec->nbr_fields) != 0) - return -1; + { + free(rec); /* cppcheck */ + return -1; + } rec->el = calloc (rec->nbr_fields, sizeof (struct ghw_record_element)); nbr_el = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/src/helpers/fst/fstapi.c new/gtkwave-3.3.59/src/helpers/fst/fstapi.c --- old/gtkwave-3.3.58/src/helpers/fst/fstapi.c 2014-03-18 23:26:22.000000000 +0100 +++ new/gtkwave-3.3.59/src/helpers/fst/fstapi.c 2014-04-21 08:21:59.000000000 +0200 @@ -26,6 +26,7 @@ * FST_DYNAMIC_ALIAS_DISABLE : dynamic aliases are not processed * FST_DYNAMIC_ALIAS2_DISABLE : new encoding for dynamic aliases is not generated * FST_WRITEX_DISABLE : fast write I/O routines are disabled + * FST_DISABLE_DUFFS_DEVICE : only if indirect branches are incredibly bad on host arch * * possible enables: * @@ -51,6 +52,10 @@ #include <pthread.h> #endif +#ifdef __MINGW32__ +#include <windows.h> +#endif + #if HAVE_ALLOCA_H #include <alloca.h> #elif defined(__GNUC__) @@ -139,8 +144,14 @@ #endif #endif - -/* the recoded "extra" values... */ +/* + * the recoded "extra" values... + * note that FST_RCV_Q is currently unused and is for future expansion. + * its intended use is as another level of escape such that any arbitrary + * value can be stored as the value: { time_delta, 8 bits, FST_RCV_Q }. + * this is currently not implemented so that the branchless decode is: + * uint32_t shcnt = 2 << (vli & 1); tdelta = vli >> shcnt; + */ #define FST_RCV_X (1 | (0<<1)) #define FST_RCV_Z (1 | (1<<1)) #define FST_RCV_H (1 | (2<<1)) @@ -148,6 +159,7 @@ #define FST_RCV_W (1 | (4<<1)) #define FST_RCV_L (1 | (5<<1)) #define FST_RCV_D (1 | (6<<1)) +#define FST_RCV_Q (1 | (7<<1)) #define FST_RCV_STR "xzhuwl-?" /* 01234567 */ @@ -163,6 +175,82 @@ } +/* + * system-specific temp file handling + */ +#ifdef __MINGW32__ + +static FILE* tmpfile_open(char **nam) +{ +char *fname = NULL; +TCHAR szTempFileName[MAX_PATH]; +TCHAR lpTempPathBuffer[MAX_PATH]; +DWORD dwRetVal = 0; +UINT uRetVal = 0; +FILE *fh = NULL; + +dwRetVal = GetTempPath(MAX_PATH, lpTempPathBuffer); +if((dwRetVal > MAX_PATH) || (dwRetVal == 0)) + { + fprintf(stderr, "GetTempPath() failed in "__FILE__" line %d, exiting.\n", __LINE__); + exit(255); + } + else + { + uRetVal = GetTempFileName(lpTempPathBuffer, TEXT("FSTW"), 0, szTempFileName); + if (uRetVal == 0) + { + fprintf(stderr, "GetTempFileName() failed in "__FILE__" line %d, exiting.\n", __LINE__); + exit(255); + } + else + { + fname = strdup(szTempFileName); + } + } + +if(fname) + { + if(nam) { *nam = fname; } + fh = unlink_fopen("fname", "w+b"); + } + +return(fh); +} + +#else + +static FILE* tmpfile_open(char **nam) +{ +FILE *f = tmpfile(); /* replace with mkstemp() + fopen(), etc if this is not good enough */ +if(nam) { *nam = NULL; } +return(f); +} + +#endif + + +static void tmpfile_close(FILE **f, char **nam) +{ +if(f) + { + if(*f) { fclose(*f); *f = NULL; } + } + +if(nam) + { + if(*nam) + { + unlink(*nam); + free(*nam); + *nam = NULL; + } + } +} + +/*****************************************/ + + /* * to remove warn_unused_result compile time messages * (in the future there needs to be results checking) @@ -694,6 +782,11 @@ uint32_t path_array_count; unsigned fseek_failed : 1; + +char *geom_handle_nam; +char *valpos_handle_nam; +char *curval_handle_nam; +char *tchn_handle_nam; }; @@ -1010,7 +1103,8 @@ xc->compress_hier = use_compressed_hier; fstDetermineBreakSize(xc); -if((!nam)||(!(xc->handle=unlink_fopen(nam, "w+b")))) +if((!nam)|| + (!(xc->handle=unlink_fopen(nam, "w+b")))) { free(xc); xc=NULL; @@ -1024,14 +1118,13 @@ strcpy(hf + flen, ".hier"); xc->hier_handle = unlink_fopen(hf, "w+b"); - xc->geom_handle = tmpfile(); /* .geom */ - xc->valpos_handle = tmpfile(); /* .offs */ - xc->curval_handle = tmpfile(); /* .bits */ - xc->tchn_handle = tmpfile(); /* .tchn */ + xc->geom_handle = tmpfile_open(&xc->geom_handle_nam); /* .geom */ + xc->valpos_handle = tmpfile_open(&xc->valpos_handle_nam); /* .offs */ + xc->curval_handle = tmpfile_open(&xc->curval_handle_nam); /* .bits */ + xc->tchn_handle = tmpfile_open(&xc->tchn_handle_nam); /* .tchn */ xc->vchg_alloc_siz = xc->fst_break_size + xc->fst_break_add_size; xc->vchg_mem = malloc(xc->vchg_alloc_siz); - free(hf); if(xc->hier_handle && xc->geom_handle && xc->valpos_handle && xc->curval_handle && xc->vchg_mem && xc->tchn_handle) { xc->filename = strdup(nam); @@ -1047,15 +1140,18 @@ } else { - if(xc->hier_handle) fclose(xc->hier_handle); - if(xc->geom_handle) fclose(xc->geom_handle); - if(xc->valpos_handle) fclose(xc->valpos_handle); - if(xc->curval_handle) fclose(xc->curval_handle); - if(xc->tchn_handle) fclose(xc->tchn_handle); + fclose(xc->handle); + if(xc->hier_handle) { fclose(xc->hier_handle); unlink(hf); } + tmpfile_close(&xc->geom_handle, &xc->geom_handle_nam); + tmpfile_close(&xc->valpos_handle, &xc->valpos_handle_nam); + tmpfile_close(&xc->curval_handle, &xc->curval_handle_nam); + tmpfile_close(&xc->tchn_handle, &xc->tchn_handle_nam); free(xc->vchg_mem); free(xc); xc=NULL; } + + free(hf); } return(xc); @@ -1161,7 +1257,7 @@ #endif #endif -if((!xc)||(xc->vchg_siz <= 1)||(xc->already_in_flush)) return; +if((xc->vchg_siz <= 1)||(xc->already_in_flush)) return; xc->already_in_flush = 1; /* should really do this with a semaphore */ xc->section_header_only = 0; @@ -1291,6 +1387,8 @@ if(is_binary) { unsigned char acc = 0; +#ifdef FST_DISABLE_DUFFS_DEVICE + /* old algorithm */ int shift = 7 - ((vm4ip[1]-1) & 7); for(idx=vm4ip[1]-1;idx>=0;idx--) { @@ -1303,6 +1401,24 @@ acc = 0; } } +#else + /* new algorithm */ + idx = ((vm4ip[1]+7) & ~7); + switch(vm4ip[1] & 7) + { + case 0: do { acc = (pnt[idx+7-8] & 1) << 0; + case 7: acc |= (pnt[idx+6-8] & 1) << 1; + case 6: acc |= (pnt[idx+5-8] & 1) << 2; + case 5: acc |= (pnt[idx+4-8] & 1) << 3; + case 4: acc |= (pnt[idx+3-8] & 1) << 4; + case 3: acc |= (pnt[idx+2-8] & 1) << 5; + case 2: acc |= (pnt[idx+1-8] & 1) << 6; + case 1: acc |= (pnt[idx+0-8] & 1) << 7; + *(--scratchpnt) = acc; + idx -= 8; + } while(idx); + } +#endif scratchpnt = fstCopyVarint32ToLeft(scratchpnt, (time_delta << 1)); } @@ -1660,7 +1776,7 @@ #endif free(xc->valpos_mem); free(xc->vchg_mem); -fclose(xc->tchn_handle); +tmpfile_close(&xc->tchn_handle, &xc->tchn_handle_nam); free(xc); return(NULL); @@ -1703,7 +1819,7 @@ } xc->tchn_cnt = xc->tchn_idx = 0; - xc->tchn_handle = tmpfile(); + xc->tchn_handle = tmpfile_open(&xc->tchn_handle_nam); /* child thread will deallocate file/name */ fstWriterFseeko(xc, xc->tchn_handle, 0, SEEK_SET); fstFtruncate(fileno(xc->tchn_handle), 0); @@ -1975,11 +2091,11 @@ fstWriterUint64(xc->handle, xc->secnum); fflush(xc->handle); - if(xc->tchn_handle) { fclose(xc->tchn_handle); xc->tchn_handle = NULL; } + tmpfile_close(&xc->tchn_handle, &xc->tchn_handle_nam); free(xc->vchg_mem); xc->vchg_mem = NULL; - if(xc->curval_handle) { fclose(xc->curval_handle); xc->curval_handle = NULL; } - if(xc->valpos_handle) { fclose(xc->valpos_handle); xc->valpos_handle = NULL; } - if(xc->geom_handle) { fclose(xc->geom_handle); xc->geom_handle = NULL; } + tmpfile_close(&xc->curval_handle, &xc->curval_handle_nam); + tmpfile_close(&xc->valpos_handle, &xc->valpos_handle_nam); + tmpfile_close(&xc->geom_handle, &xc->geom_handle_nam); if(xc->hier_handle) { fclose(xc->hier_handle); xc->hier_handle = NULL; } if(xc->handle) { @@ -2988,6 +3104,9 @@ int writex_fd; unsigned char writex_buf[FST_WRITEX_MAX]; #endif + +char *f_nam; +char *fh_nam; }; @@ -3465,7 +3584,6 @@ static int fstVcdIDForFwrite(char *buf, unsigned int value) { char *pnt = buf; -unsigned int vmod; /* zero is illegal for a value...it is assumed they start at one */ while (value) @@ -3508,14 +3626,16 @@ sprintf(fnam, "%s.hier_%d_%p", xc->filename, getpid(), (void *)xc); fstReaderFseeko(xc, xc->f, xc->hier_pos, SEEK_SET); uclen = fstReaderUint64(xc->f); +#ifndef __MINGW32__ fflush(xc->f); - +#endif if(htyp == FST_BL_HIER) { fstReaderFseeko(xc, xc->f, xc->hier_pos, SEEK_SET); uclen = fstReaderUint64(xc->f); +#ifndef __MINGW32__ fflush(xc->f); - +#endif zfd = dup(fileno(xc->f)); zhandle = gzdopen(zfd, "rb"); if(!zhandle) @@ -3532,7 +3652,9 @@ fstReaderFseeko(xc, xc->f, xc->hier_pos - 8, SEEK_SET); /* get section len */ clen = fstReaderUint64(xc->f) - 16; uclen = fstReaderUint64(xc->f); +#ifndef __MINGW32__ fflush(xc->f); +#endif } #ifndef __MINGW32__ @@ -3540,10 +3662,11 @@ if(!xc->fh) #endif { - xc->fh = tmpfile(); + xc->fh = tmpfile_open(&xc->fh_nam); free(fnam); fnam = NULL; if(!xc->fh) { + tmpfile_close(&xc->fh, &xc->fh_nam); free(mem); return(0); } @@ -4131,9 +4254,9 @@ fcomp = fopen(hf, "w+b"); if(!fcomp) { - fcomp = tmpfile(); + fcomp = tmpfile_open(&xc->f_nam); free(hf); hf = NULL; - if(!fcomp) return(0); + if(!fcomp) { tmpfile_close(&fcomp, &xc->f_nam); return(0); } } #if defined(FST_MACOSX) @@ -4152,7 +4275,9 @@ #endif fstReaderFseeko(xc, xc->f, 1+8+8, SEEK_SET); +#ifndef __MINGW32__ fflush(xc->f); +#endif zfd = dup(fileno(xc->f)); zhandle = gzdopen(zfd, "rb"); @@ -4501,12 +4626,12 @@ if(xc->fh) { - fclose(xc->fh); xc->fh = NULL; + tmpfile_close(&xc->fh, &xc->fh_nam); } if(xc->f) { - fclose(xc->f); xc->f = NULL; + tmpfile_close(&xc->f, &xc->f_nam); if(xc->filename_unpacked) { unlink(xc->filename_unpacked); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/src/helpers/vcd2fst.c new/gtkwave-3.3.59/src/helpers/vcd2fst.c --- old/gtkwave-3.3.58/src/helpers/vcd2fst.c 2014-02-18 00:46:26.000000000 +0100 +++ new/gtkwave-3.3.59/src/helpers/vcd2fst.c 2014-04-21 08:21:59.000000000 +0200 @@ -55,6 +55,20 @@ static uint32_t var_direction_idx = 0; static unsigned char *var_direction = NULL; + +static void *realloc_2(void *ptr, size_t siz) /* cppcheck */ +{ +void *pnt = realloc(ptr, siz); +if(!pnt) + { + fprintf(stderr, "ERROR: Out of memory in realloc(), exiting!\n"); /* normally free(ptr) here */ + exit(255); + } + +return(pnt); +} + + /*********************************************************/ /*** vvv extload component type name determination vvv ***/ /*********************************************************/ @@ -380,7 +394,7 @@ while(((*wbuf)[*len] != 1) && !feof(f)) { /* fprintf(stderr, "overflow %d\n", (int)(*len)); */ - *wbuf = realloc(*wbuf, (*len) * 2 + 1); + *wbuf = realloc_2(*wbuf, (*len) * 2 + 1); (*wbuf)[(*len) * 2] = 1; fgets_rc = fgets(*wbuf + (*len), (*len) + 1, f); @@ -507,6 +521,7 @@ { printf("Could not open '%s', exiting.\n", vname); free(bin_fixbuff); bin_fixbuff = NULL; + free(vname); free(fstname); exit(255); } @@ -516,6 +531,8 @@ { printf("Could not open '%s', exiting.\n", fstname); free(bin_fixbuff); bin_fixbuff = NULL; + free(vname); free(fstname); + fclose(f); exit(255); } @@ -1350,7 +1367,7 @@ if(node_len >= bin_fixbuff_len) { bin_fixbuff_len = node_len + 1; - bin_fixbuff = realloc(bin_fixbuff, bin_fixbuff_len); + bin_fixbuff = realloc_2(bin_fixbuff, bin_fixbuff_len); } memset(bin_fixbuff, buf[1] != '1' ? buf[1] : '0', delta); @@ -1376,7 +1393,7 @@ if(node_len >= bin_fixbuff_len) { bin_fixbuff_len = node_len + 1; - bin_fixbuff = realloc(bin_fixbuff, bin_fixbuff_len); + bin_fixbuff = realloc_2(bin_fixbuff, bin_fixbuff_len); } memset(bin_fixbuff, buf[1] != '1' ? buf[1] : '0', delta); @@ -1428,7 +1445,7 @@ if(p_len >= bin_fixbuff_len) { bin_fixbuff_len = p_len + 1; - bin_fixbuff = realloc(bin_fixbuff, bin_fixbuff_len); + bin_fixbuff = realloc_2(bin_fixbuff, bin_fixbuff_len); } pnt = bin_fixbuff; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/src/helpers/vzt_read.c new/gtkwave-3.3.59/src/helpers/vzt_read.c --- old/gtkwave-3.3.58/src/helpers/vzt_read.c 2014-03-01 23:50:23.000000000 +0100 +++ new/gtkwave-3.3.59/src/helpers/vzt_read.c 2014-04-11 01:23:04.000000000 +0200 @@ -1436,7 +1436,7 @@ vpa->lt = lt; vpa->b = b; -vzt_rd_pthread_create(lt, &b->pth, &b->pth_attr, vzt_rd_decompress_blk_pth_actual, vpa); +vzt_rd_pthread_create(lt, &b->pth, &b->pth_attr, vzt_rd_decompress_blk_pth_actual, vpa); /* cppcheck misfires thinking vpa is not freed even though vzt_rd_decompress_blk_pth_actual() does it */ } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/src/ptranslate.c new/gtkwave-3.3.59/src/ptranslate.c --- old/gtkwave-3.3.58/src/ptranslate.c 2012-01-05 21:52:20.000000000 +0100 +++ new/gtkwave-3.3.59/src/ptranslate.c 2014-04-11 01:23:04.000000000 +0200 @@ -140,8 +140,8 @@ if((strlen(abs_path) == 0)||(!result)) { status_text("Could not find filter process!\n"); + pclose(stream); /* cppcheck */ return; - } pclose(stream); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.58/src/ttranslate.c new/gtkwave-3.3.59/src/ttranslate.c --- old/gtkwave-3.3.58/src/ttranslate.c 2014-03-04 00:59:31.000000000 +0100 +++ new/gtkwave-3.3.59/src/ttranslate.c 2014-04-11 01:23:04.000000000 +0200 @@ -159,6 +159,7 @@ if((strlen(abs_path) == 0)||(!result)) { status_text("Could not find transaction filter process!\n"); + pclose(stream); /* cppcheck */ return; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cups-filters for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '14

29 Apr '14

Hello community, here is the log from the commit of package cups-filters for openSUSE:Factory checked in at 2014-04-29 17:33:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cups-filters (Old) and /work/SRC/openSUSE:Factory/.cups-filters.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cups-filters" Changes: -------- --- /work/SRC/openSUSE:Factory/cups-filters/cups-filters.changes 2014-04-26 09:59:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cups-filters.new/cups-filters.changes 2014-04-29 17:33:16.000000000 +0200 @@ -1,0 +2,25 @@ +Mon Apr 28 10:49:21 CEST 2014 - jsmeix(a)suse.de + +- Version upgrade to 1.0.53 + Changes in 1.0.53: + * foomatic-rip: Fixed segfault when creating log file, see + https://bugs.linuxfoundation.org/show_bug.cgi?id=1206 + * cups-browsed: SECURITY FIX: Fix on usage of the + "BrowseAllow" directive in cups-browsed.conf. Before, if the + argument of a "BrowseAllow" directive is not understood it + is treated as the directive not having been there, allowing + any host if this was the only "BrowseAllow" directive. Now + we treat this as a directive which no host can fulfill, not + allowing any host if it was the only one. No "BrowseAllow" + directive means access for all, as before, see + https://bugs.linuxfoundation.org/show_bug.cgi?id=1204 + (bnc#871327 therein comment#23 and subsequent comments). + * cups-browsed: SECURITY FIX: Further improvement on the fix + in 1.0.51 as it was insufficient. In addition, some fixes + against OOB access are done + (bnc#871327 therein comment#30 and subsequent comments). +- Removed the "# BrowseAllow cups.example.com" example line in + /etc/cups/cups-browsed.conf because hostnames do not work, see + https://bugs.linuxfoundation.org/show_bug.cgi?id=1205 + +------------------------------------------------------------------- Old: ---- cups-filters-1.0.52.tar.gz New: ---- cups-filters-1.0.53.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cups-filters.spec ++++++ --- /var/tmp/diff_new_pack.xRLVt2/_old 2014-04-29 17:33:17.000000000 +0200 +++ /var/tmp/diff_new_pack.xRLVt2/_new 2014-04-29 17:33:17.000000000 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Summary: OpenPrinting CUPS filters, backends, and cups-browsed License: GPL-2.0 and GPL-2.0+ and GPL-3.0 and MIT Group: Hardware/Printing @@ -35,7 +36,7 @@ # and also run: zypper vcmp 'next version' 'current version' # e.g. zypper vcmp '1.0.49' '1.0.49.20140326' -> 1.0.49 is older than 1.0.49.20140326 # and zypper vcmp '1.0.50' '1.0.49.20140326' -> 1.0.50 is newer than 1.0.49.20140326 -Version: 1.0.52 +Version: 1.0.53 Release: 0 # tarball_version is used below to specify the directory via "setup -n": # Special tarball_version needed for current cups-filters e.g. "define tarball_version 9.10rc1". @@ -60,6 +61,7 @@ # pdftops BuildRequires: poppler-tools # pdftoijs, pdftoopvp, pdftoraster +BuildRequires: ghostscript-mini-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libpoppler-cpp0 @@ -67,7 +69,6 @@ BuildRequires: libpoppler-glib-devel BuildRequires: libtiff-devel BuildRequires: zlib-devel -BuildRequires: ghostscript-mini-devel # libijs BuildRequires: fontconfig-devel BuildRequires: freetype2-devel @@ -85,9 +86,9 @@ # autogen.sh BuildRequires: autoconf BuildRequires: automake -BuildRequires: libtool -BuildRequires: glibc-devel BuildRequires: gcc-c++ +BuildRequires: glibc-devel +BuildRequires: libtool BuildRequires: systemd %systemd_requires # test requires @@ -152,12 +153,16 @@ and software developed independently of Apple, especially filters for the PDF-centric printing workflow introduced by OpenPrinting and a daemon -to browse Bonjour broadcasts of remote CUPS printers +to browse broadcasts of remote CUPS printers and makes these printers available locally. %package ghostscript Summary: OpenPrinting CUPS filters for Ghostscript Group: Hardware/Printing +# Provide the well known generic name "gstoraster" so that it is easier for users +# to find or install the RPM package name "cups-filters-ghostscript" that actually provides it +# e.g. via "zypper search gstoraster" or "zypper install gstoraster": +Provides: gstoraster %description ghostscript Since Ghostscript version 9.10 the CUPS filters @@ -167,10 +172,10 @@ The binary RPM sub-package cups-filters-ghostscript provides only those CUPS filters for Ghostscript. This way cups-filters-ghostscript can be used -with the traditional CUPS up to version 1.5.4 +with the traditional CUPS up to version 1.5 where the other filters, backends, and cups-browsed from cups-filters would cause conflicts because -CUPS <= 1.5.4 already provides them. In contrast +CUPS <= 1.5 already provides them. In contrast for CUPS versions since 1.6 the whole cups-filters is usually needed (but not strictly required). @@ -192,7 +197,8 @@ # and all required packages are provided on the same repository: Requires: cups-filters-ghostscript = %{version}-%{release} # Provide the well known generic name "foomatic-rip" so that it is easier for users -# to find the RPM package name "cups-filters-foomatic-rip" that actually provides it: +# to find or install the RPM package name "cups-filters-foomatic-rip" that actually provides it +# e.g. via "zypper search foomatic-rip" or "zypper install foomatic-rip": Provides: foomatic-rip # Provide foomatic-filters with the exact foomatic_rip_version # see https://bugzilla.novell.com/show_bug.cgi?id=870621 @@ -220,7 +226,8 @@ # the CUPS Browsing functionality is provided by the cupsd # because it can be disabled for the cupsd up to CUPS 1.5.4. # Provide the well known generic name "cups-browsed" so that it is easier for users -# to find the RPM package name "cups-filters-cups-browsed" that actually provides it: +# to find or install the RPM package name "cups-filters-cups-browsed" that actually provides it +# e.g. via "zypper search cups-browsed" or "zypper install cups-browsed": Provides: cups-browsed %description cups-browsed @@ -230,7 +237,7 @@ to provide again basic CUPS Browsing functionality. This way basic CUPS Browsing works on clients with CUPS >= 1.6 when there are remote CUPS servers -of version 1.5 and older in the network. +of CUPS version 1.5 and older in the network. For each reported remote CUPS queue cups-browsed creates a local raw queue pointing to the remote queue so that it appears in local print dialogs and is also available @@ -290,6 +297,13 @@ %install make install DESTDIR=%{buildroot} +# As band-aid for now remove the "# BrowseAllow cups.example.com" example line in cups-browsed.conf +# because currently hostnames do not work, see https://bugs.linuxfoundation.org/show_bug.cgi?id=1205 +if grep -q '^# BrowseAllow cups.example.com' %{buildroot}%{_sysconfdir}/cups/cups-browsed.conf +then sed -i -e '/^# BrowseAllow cups.example.com/d' %{buildroot}%{_sysconfdir}/cups/cups-browsed.conf +else echo "No longer '# BrowseAllow cups.example.com' in cups-browsed.conf - clean up cups-filters.spec" + exit 9 +fi # https://fedoraproject.org/wiki/Packaging_tricks#With_.25doc mkdir __doc mv %{buildroot}%{_datadir}/doc/cups-filters/* __doc ++++++ cups-filters-1.0.52.tar.gz -> cups-filters-1.0.53.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/INSTALL new/cups-filters-1.0.53/INSTALL --- old/cups-filters-1.0.52/INSTALL 2014-04-07 21:56:59.000000000 +0200 +++ new/cups-filters-1.0.53/INSTALL 2014-04-25 15:30:24.000000000 +0200 @@ -1,4 +1,4 @@ -INSTALL - OpenPrinting CUPS Filters v1.0.52 - 2014-04-07 +INSTALL - OpenPrinting CUPS Filters v1.0.53 - 2014-04-25 -------------------------------------------------------- This file describes how to compile and install OpenPrinting CUPS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/Makefile.in new/cups-filters-1.0.53/Makefile.in --- old/cups-filters-1.0.52/Makefile.in 2014-04-07 21:58:39.000000000 +0200 +++ new/cups-filters-1.0.53/Makefile.in 2014-04-25 16:13:35.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -1646,8 +1646,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -2270,14 +2270,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -4345,10 +4345,16 @@ $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -4390,9 +4396,10 @@ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/NEWS new/cups-filters-1.0.53/NEWS --- old/cups-filters-1.0.52/NEWS 2014-04-07 21:56:31.000000000 +0200 +++ new/cups-filters-1.0.53/NEWS 2014-04-25 16:00:57.000000000 +0200 @@ -1,6 +1,23 @@ -NEWS - OpenPrinting CUPS Filters v1.0.52 - 2014-04-07 +NEWS - OpenPrinting CUPS Filters v1.0.53 - 2014-04-25 ----------------------------------------------------- +CHANGES IN V1.0.53 + + - foomatic-rip: Fixed segfault when creating log file (Bug + #1206). + - cups-browsed: SECURITY FIX: Fix on usage of the + "BrowseAllow" directive in cups-browsed.conf. Before, if the + argument of a "BrowseAllow" directive is not understood it + is treated as the directive not having been there, allowing + any host if this was the only "BrowseAllow" directive. Now + we treat this as a directive which no host can fulfill, not + allowing any host if it was the only one. No "BrowseAllow" + directive means access for all, as before (Bug #1204). + - cups-browsed: SECURITY FIX: Further improvement on the fix + in 1.0.51 as it was insufficient. In addition, some fixes + against OOB access are done. Thanks to Sebastian Krahmer for + the patch (SUSE/Novell bug #871327). + CHANGES IN V1.0.52 - texttopdf: Make sure that margin changes for prettyprint diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/README new/cups-filters-1.0.53/README --- old/cups-filters-1.0.52/README 2014-04-07 21:56:44.000000000 +0200 +++ new/cups-filters-1.0.53/README 2014-04-25 15:29:21.000000000 +0200 @@ -1,4 +1,4 @@ -README - OpenPrinting CUPS Filters v1.0.52 - 2014-04-07 +README - OpenPrinting CUPS Filters v1.0.53 - 2014-04-25 ------------------------------------------------------- Looking for compile instructions? Read the file "INSTALL.txt" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/aclocal.m4 new/cups-filters-1.0.53/aclocal.m4 --- old/cups-filters-1.0.52/aclocal.m4 2014-04-07 21:58:37.000000000 +0200 +++ new/cups-filters-1.0.53/aclocal.m4 2014-04-25 16:13:34.000000000 +0200 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.13.3 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -192,10 +192,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.3], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -211,7 +211,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.3])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -578,6 +578,12 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -686,7 +692,48 @@ AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell bug-automake(a)gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -694,7 +741,6 @@ m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -806,38 +852,6 @@ rm -f confinc confmf ]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- # Copyright (C) 1997-2013 Free Software Foundation, Inc. @@ -908,6 +922,70 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/config.h.in new/cups-filters-1.0.53/config.h.in --- old/cups-filters-1.0.52/config.h.in 2014-04-07 21:58:38.000000000 +0200 +++ new/cups-filters-1.0.53/config.h.in 2014-04-25 16:13:50.000000000 +0200 @@ -160,9 +160,6 @@ */ #undef LT_OBJDIR -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/configure new/cups-filters-1.0.53/configure --- old/cups-filters-1.0.52/configure 2014-04-07 21:58:39.000000000 +0200 +++ new/cups-filters-1.0.53/configure 2014-04-25 16:13:36.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for cups-filters 1.0.52. +# Generated by GNU Autoconf 2.69 for cups-filters 1.0.53. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='cups-filters' PACKAGE_TARNAME='cups-filters' -PACKAGE_VERSION='1.0.52' -PACKAGE_STRING='cups-filters 1.0.52' +PACKAGE_VERSION='1.0.53' +PACKAGE_STRING='cups-filters 1.0.53' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1438,7 +1438,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures cups-filters 1.0.52 to adapt to many kinds of systems. +\`configure' configures cups-filters 1.0.53 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1508,7 +1508,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of cups-filters 1.0.52:";; + short | recursive ) echo "Configuration of cups-filters 1.0.53:";; esac cat <<\_ACEOF @@ -1698,7 +1698,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -cups-filters configure 1.0.52 +cups-filters configure 1.0.53 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2305,7 +2305,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by cups-filters $as_me 1.0.52, which was +It was created by cups-filters $as_me 1.0.53, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2741,7 +2741,7 @@ #serial 11 -am__api_version='1.13' +am__api_version='1.14' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -3256,7 +3256,7 @@ # Define the identity of the package. PACKAGE='cups-filters' - VERSION='1.0.52' + VERSION='1.0.53' cat >>confdefs.h <<_ACEOF @@ -3307,6 +3307,47 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell bug-automake(a)gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -4148,6 +4189,65 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -4725,131 +4825,6 @@ fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -7428,7 +7403,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -7453,7 +7428,10 @@ ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -7472,7 +7450,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -17921,7 +17902,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -17967,7 +17948,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -17991,7 +17972,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -18036,7 +18017,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -18060,7 +18041,7 @@ We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -19331,7 +19312,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by cups-filters $as_me 1.0.52, which was +This file was extended by cups-filters $as_me 1.0.53, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19397,7 +19378,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -cups-filters config.status 1.0.52 +cups-filters config.status 1.0.53 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/configure.ac new/cups-filters-1.0.53/configure.ac --- old/cups-filters-1.0.52/configure.ac 2014-04-07 21:57:15.000000000 +0200 +++ new/cups-filters-1.0.53/configure.ac 2014-04-25 15:30:43.000000000 +0200 @@ -7,7 +7,7 @@ # ==================== m4_define([cups_filters_version_major],[1]) m4_define([cups_filters_version_minor],[0]) -m4_define([cups_filters_version_micro],[52]) +m4_define([cups_filters_version_micro],[53]) m4_define([cups_filters_version],[cups_filters_version_major.cups_filters_version_minor.cups_filters_version_micro]) # ============= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/filter/foomatic-rip/foomaticrip.c new/cups-filters-1.0.53/filter/foomatic-rip/foomaticrip.c --- old/cups-filters-1.0.52/filter/foomatic-rip/foomaticrip.c 2014-02-10 23:21:21.000000000 +0100 +++ new/cups-filters-1.0.53/filter/foomatic-rip/foomaticrip.c 2014-04-25 15:57:42.000000000 +0200 @@ -736,7 +736,8 @@ debug = 1; if (debug) { - int fd = mkstemp (LOG_FILE "-XXXXXX.log"); + sprintf(tmp, "%s-XXXXXX.log", LOG_FILE); + int fd = mkstemps (tmp, 4); if (fd != -1) logh = fdopen(fd, "w"); else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/ltmain.sh new/cups-filters-1.0.53/ltmain.sh --- old/cups-filters-1.0.52/ltmain.sh 2014-04-07 21:58:35.000000000 +0200 +++ new/cups-filters-1.0.53/ltmain.sh 2014-04-25 16:13:32.000000000 +0200 @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.3ubuntu1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1.3ubuntu1" +VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1" TIMESTAMP="" package_revision=1.3337 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/m4/libtool.m4 new/cups-filters-1.0.53/m4/libtool.m4 --- old/cups-filters-1.0.52/m4/libtool.m4 2014-04-07 21:58:35.000000000 +0200 +++ new/cups-filters-1.0.53/m4/libtool.m4 2014-04-25 16:13:32.000000000 +0200 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1333,7 +1333,10 @@ ;; esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1352,7 +1355,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/missing new/cups-filters-1.0.53/missing --- old/cups-filters-1.0.52/missing 2014-04-07 21:58:39.000000000 +0200 +++ new/cups-filters-1.0.53/missing 2014-04-25 16:13:35.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC # Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/test-driver new/cups-filters-1.0.53/test-driver --- old/cups-filters-1.0.52/test-driver 2014-04-07 21:58:39.000000000 +0200 +++ new/cups-filters-1.0.53/test-driver 2014-04-25 16:13:35.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2012-06-27.10; # UTC +scriptversion=2013-07-13.22; # UTC # Copyright (C) 2011-2013 Free Software Foundation, Inc. # @@ -44,13 +44,12 @@ Usage: test-driver --test-name=NAME --log-file=PATH --trs-file=PATH [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT + [--enable-hard-errors={yes|no}] [--] + TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] The '--test-name', '--log-file' and '--trs-file' options are mandatory. END } -# TODO: better error handling in option parsing (in particular, ensure -# TODO: $log_file, $trs_file and $test_name are defined). test_name= # Used for reporting. log_file= # Where to save the output of the test script. trs_file= # Where to save the metadata of the test run. @@ -69,10 +68,23 @@ --enable-hard-errors) enable_hard_errors=$2; shift;; --) shift; break;; -*) usage_error "invalid option: '$1'";; + *) break;; esac shift done +missing_opts= +test x"$test_name" = x && missing_opts="$missing_opts --test-name" +test x"$log_file" = x && missing_opts="$missing_opts --log-file" +test x"$trs_file" = x && missing_opts="$missing_opts --trs-file" +if test x"$missing_opts" != x; then + usage_error "the following mandatory options are missing:$missing_opts" +fi + +if test $# -eq 0; then + usage_error "missing argument" +fi + if test $color_tests = yes; then # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. red='[0;31m' # Red. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cups-filters-1.0.52/utils/cups-browsed.c new/cups-filters-1.0.53/utils/cups-browsed.c --- old/cups-filters-1.0.52/utils/cups-browsed.c 2014-04-02 01:27:02.000000000 +0200 +++ new/cups-filters-1.0.53/utils/cups-browsed.c 2014-04-24 22:52:34.000000000 +0200 @@ -95,7 +95,8 @@ /* Data structure for browse allow/deny rules */ typedef enum allow_type_e { ALLOW_IP, - ALLOW_NET + ALLOW_NET, + ALLOW_INVALID } allow_type_t; typedef struct allow_s { allow_type_t type; @@ -420,7 +421,7 @@ p->name, p->uri); goto fail; } - + #if 0 uri_status = httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme, sizeof(scheme), @@ -584,7 +585,7 @@ /* * Remove all illegal characters and replace each group of such characters - * by a single dash + * by a single dash, return a free()-able string. * * mode = 0: Only allow letters, numbers, and dashes, for turning make/model * info into a valid print queue name or inro a string which can @@ -613,6 +614,11 @@ return NULL; str = strdup(str_orig); + + /* for later str[strlen(str)-1] access */ + if (strlen(str) < 1) + return str; + for (i = 0, j = 0; i < strlen(str); i++, j++) { if (((str[i] >= 'A') && (str[i] <= 'Z')) || ((str[i] >= 'a') && (str[i] <= 'z')) || @@ -636,11 +642,14 @@ /* Cut off trailing dashes */ while (str[strlen(str)-1] == '-') str[strlen(str)-1] = '\0'; + /* Cut off leading dashes */ - while (str[0] == '-') - str ++; + i = 0; + while (str[i] == '-') + ++i; - return str; + /* keep a free()-able string. +1 for trailing \0 */ + return memmove(str, str + i, strlen(str) - i + 1); } gboolean handle_cups_queues(gpointer unused) { @@ -737,7 +746,7 @@ } if (default_printer_name) break; - } + } } if (default_printer_name && !strcasecmp(default_printer_name, p->name)) { @@ -955,43 +964,52 @@ void *txt) { char uri[HTTP_MAX_URI]; - char *remote_queue, *remote_host, *pdl = NULL; + char *remote_queue = NULL, *remote_host = NULL, *pdl = NULL; #ifdef HAVE_AVAHI char *fields[] = { "product", "usb_MDL", "ty", NULL }, **f; - AvahiStringList *entry; - char *key, *value; + AvahiStringList *entry = NULL; + char *key = NULL, *value = NULL; #endif /* HAVE_AVAHI */ remote_printer_t *p; - char *backup_queue_name, *local_queue_name = NULL; - cups_dest_t *dests, *dest; + char *backup_queue_name = NULL, *local_queue_name = NULL; + cups_dest_t *dests = NULL, *dest = NULL; int i, num_dests, is_cups_queue; - const char *val; + size_t hl = 0; + const char *val = NULL; is_cups_queue = 0; + memset(uri, 0, sizeof(uri)); + /* Determine the device URI of the remote printer */ - httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), + httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri) - 1, (strcasestr(type, "_ipps") ? "ipps" : "ipp"), NULL, host, port, "/%s", resource); - /* Find the remote host name */ - remote_host = strdup(host); - if (!strcmp(remote_host + strlen(remote_host) - 6, ".local")) - remote_host[strlen(remote_host) - 6] = '\0'; - if (!strcmp(remote_host + strlen(remote_host) - 7, ".local.")) - remote_host[strlen(remote_host) - 7] = '\0'; + /* Find the remote host name. + * Used in constructing backup_queue_name, so need to sanitize. + * strdup() is called inside remove_bad_chars() and result is free()-able. + */ + remote_host = remove_bad_chars(host, 1); + hl = strlen(remote_host); + if (hl > 6 && !strcmp(remote_host + hl - 6, ".local")) + remote_host[hl - 6] = '\0'; + if (hl > 7 && !strcmp(remote_host + hl - 7, ".local.")) + remote_host[hl - 7] = '\0'; /* Check by the resource whether the discovered printer is a CUPS queue */ if (!strncmp(resource, "printers/", 9)) { /* This is a remote CUPS queue, use the remote queue name for the local queue */ is_cups_queue = 1; - remote_queue = resource + 9; + /* Not directly used in script generation input later, but taken from packet, + * so better safe than sorry. (consider second loop with backup_queue_name) */ + remote_queue = remove_bad_chars(resource + 9, 0); debug_printf("cups-browsed: Found CUPS queue: %s on host %s.\n", remote_queue, remote_host); } else { /* This is an IPP-based network printer */ is_cups_queue = 0; /* Determine the queue name by the model */ - remote_queue = "printer"; + remote_queue = strdup("printer"); #ifdef HAVE_AVAHI if (txt) { for (f = fields; *f; f ++) { @@ -1018,7 +1036,7 @@ /* Check if there exists already a CUPS queue with the requested name Try name@host in such a case and if this is also taken, ignore the printer */ - if ((backup_queue_name = malloc((strlen(remote_queue) + + if ((backup_queue_name = malloc((strlen(remote_queue) + strlen(remote_host) + 2) * sizeof(char))) == NULL) { debug_printf("cups-browsed: ERROR: Unable to allocate memory.\n"); @@ -1045,6 +1063,8 @@ uri); free (remote_host); free (backup_queue_name); + free (pdl); + free (remote_queue); cupsFreeDests(num_dests, dests); return; } @@ -1082,6 +1102,8 @@ local_queue_name); free (backup_queue_name); free (remote_host); + free (pdl); + free (remote_queue); cupsFreeDests(num_dests, dests); return; } @@ -1157,6 +1179,8 @@ free (backup_queue_name); free (remote_host); + free (pdl); + free (remote_queue); if (p) debug_printf("cups-browsed: Bonjour IDs: Service name: \"%s\", " @@ -1228,7 +1252,7 @@ } /* Clean up */ - + avahi_free(rp_key); avahi_free(rp_value); avahi_free(adminurl_key); @@ -1422,7 +1446,7 @@ avahi_client_free(client); client = NULL; } - if (glib_poll) { + if (glib_poll) { avahi_glib_poll_free(glib_poll); glib_poll = NULL; } @@ -1551,12 +1575,18 @@ char local_resource[HTTP_MAX_URI]; char *c; + memset(scheme, 0, sizeof(scheme)); + memset(username, 0, sizeof(username)); + memset(host, 0, sizeof(host)); + memset(resource, 0, sizeof(resource)); + memset(local_resource, 0, sizeof(local_resource)); + httpSeparateURI (HTTP_URI_CODING_ALL, uri, - scheme, sizeof(scheme), - username, sizeof(username), - host, sizeof(host), + scheme, sizeof(scheme) - 1, + username, sizeof(username) - 1, + host, sizeof(host) - 1, &port, - resource, sizeof(resource)); + resource, sizeof(resource)- 1); /* Check this isn't one of our own broadcasts */ for (iface = cupsArrayFirst (netifs); @@ -1600,6 +1630,9 @@ allow; allow = cupsArrayNext (browseallow)) { switch (allow->type) { + case ALLOW_INVALID: + break; + case ALLOW_IP: switch (srcaddr->sa_family) { case AF_INET: @@ -1665,7 +1698,12 @@ char remote_host[256]; char uri[1024]; char info[1024]; - char *c; + char *c = NULL, *end = NULL; + + memset(packet, 0, sizeof(packet)); + memset(remote_host, 0, sizeof(remote_host)); + memset(uri, 0, sizeof(uri)); + memset(info, 0, sizeof(info)); srclen = sizeof (srcaddr); got = recvfrom (browsesocket, packet, sizeof (packet) - 1, 0, @@ -1678,7 +1716,7 @@ } packet[got] = '\0'; - httpAddrString (&srcaddr, remote_host, sizeof (remote_host)); + httpAddrString (&srcaddr, remote_host, sizeof (remote_host) - 1); /* Check this packet is allowed */ if (!allowed ((struct sockaddr *) &srcaddr)) { @@ -1696,28 +1734,42 @@ } info[0] = '\0'; + + /* do not read OOB */ + end = packet + sizeof(packet); c = strchr (packet, '\"'); + if (c >= end) + return TRUE; + if (c) { /* Skip location field */ - for (c++; *c != '\"'; c++) + for (c++; c < end && *c != '\"'; c++) ; + if (c >= end) + return TRUE; + if (*c == '\"') { - for (c++; isspace(*c); c++) + for (c++; c < end && isspace(*c); c++) ; } + if (c >= end) + return TRUE; + /* Is there an info field? */ if (*c == '\"') { int i; c++; for (i = 0; - i < sizeof (info) - 1 && *c != '\"'; + i < sizeof (info) - 1 && *c != '\"' && c < end; i++, c++) info[i] = *c; info[i] = '\0'; } } + if (c >= end) + return TRUE; found_cups_printer (remote_host, uri, info); recheck_timer (); @@ -1926,7 +1978,7 @@ while (attr && ippGetGroupTag(attr) == IPP_TAG_PRINTER) { const char *attrname = ippGetName(attr); int value_tag = ippGetValueTag(attr); - + if (!strcmp(attrname, "printer-type") && value_tag == IPP_TAG_ENUM) { type = ippGetInteger(attr, 0); @@ -2424,6 +2476,8 @@ char *p; struct in_addr addr; allow_t *allow = calloc (1, sizeof (allow_t)); + if (value == NULL) + goto fail; p = strchr (value, '/'); if (p) { char *s = strdup (value); @@ -2466,7 +2520,8 @@ return 0; fail: - free (allow); + allow->type = ALLOW_INVALID; + cupsArrayAdd (browseallow, allow); return 1; } @@ -2570,7 +2625,7 @@ BrowsePoll[NumBrowsePoll++] = b; } } - } else if (!strcasecmp(line, "BrowseAllow") && value) { + } else if (!strcasecmp(line, "BrowseAllow")) { if (read_browseallow_value (value)) debug_printf ("cups-browsed: BrowseAllow value \"%s\" not understood\n", value); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alsa-oss for openSUSE:Factory
by root＠hilbert.suse.de 29 Apr '14

29 Apr '14

Hello community, here is the log from the commit of package alsa-oss for openSUSE:Factory checked in at 2014-04-29 17:33:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alsa-oss (Old) and /work/SRC/openSUSE:Factory/.alsa-oss.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "alsa-oss" Changes: -------- --- /work/SRC/openSUSE:Factory/alsa-oss/alsa-oss.changes 2013-05-28 07:24:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alsa-oss.new/alsa-oss.changes 2014-04-29 17:33:10.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Apr 28 17:03:38 CEST 2014 - tiwai(a)suse.de + +- Fix for dmix with unaligned sample rate: + 0003-Fix-the-argument-passed-to-snd_pcm_dump_setup.patch + 0004-Workaround-for-aoss-dmix-with-unaligned-rates.patch + +------------------------------------------------------------------- +Mon Apr 28 12:28:36 CEST 2014 - tiwai(a)suse.de + +- Revert 0001-Fix-path-to-libaoss.so.patch, as this causes + regressions on multi-arch (bnc#874331) + +------------------------------------------------------------------- Old: ---- 0001-Fix-path-to-libaoss.so.patch New: ---- 0003-Fix-the-argument-passed-to-snd_pcm_dump_setup.patch 0004-Workaround-for-aoss-dmix-with-unaligned-rates.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-oss.spec ++++++ --- /var/tmp/diff_new_pack.NhcVgR/_old 2014-04-29 17:33:11.000000000 +0200 +++ /var/tmp/diff_new_pack.NhcVgR/_new 2014-04-29 17:33:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package alsa-oss # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -29,8 +29,9 @@ Source2: baselibs.conf # Patch: alsa-oss-hg-fixes.diff # upstream fixes -Patch1: 0001-Fix-path-to-libaoss.so.patch Patch2: 0002-Add-AM_MAINTAINER_MODE-enable-to-configure.in.patch +Patch3: 0003-Fix-the-argument-passed-to-snd_pcm_dump_setup.patch +Patch4: 0004-Workaround-for-aoss-dmix-with-unaligned-rates.patch Url: http://www.alsa-project.org/ %ifarch s390x Recommends: %{name}-32bit = %{version} @@ -44,8 +45,9 @@ %prep %setup -q -n %{name}-%{package_version} # %patch -p1 -%patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build autoreconf -fi ++++++ 0003-Fix-the-argument-passed-to-snd_pcm_dump_setup.patch ++++++ >From 40357524a04019173d7073b683ebc2465c3db30a Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai(a)suse.de> Date: Mon, 28 Apr 2014 16:54:29 +0200 Subject: [PATCH] Fix the argument passed to snd_pcm_dump_setup() Although it's currently disabled via ifdef, better to fix it so that any other people won't fall into the same hole like me. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- alsa/pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alsa/pcm.c b/alsa/pcm.c index 19b67e0fe8e4..fdf99337997f 100644 --- a/alsa/pcm.c +++ b/alsa/pcm.c @@ -308,8 +308,8 @@ static int oss_dsp_hw_params(oss_dsp_t *dsp) if (err < 0) return err; #if 0 - if (alsa_oss_debug) - snd_pcm_dump_setup(pcm, stderr); + if (alsa_oss_debug && alsa_oss_debug_out) + snd_pcm_dump_setup(pcm, alsa_oss_debug_out); #endif if (err < 0) return err; -- 1.9.2 ++++++ 0004-Workaround-for-aoss-dmix-with-unaligned-rates.patch ++++++ >From 22dc53a906f3550b4ad0ce82684d98228d95713c Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai(a)suse.de> Date: Mon, 28 Apr 2014 16:57:18 +0200 Subject: [PATCH] Workaround for aoss + dmix with unaligned rates When an OSS stream is setup (e.g. two periods) with a rate that doesn't align with the fixed rate of the slave PCM, dmix can't establish the hw_params properly. As a dirty workaround, set either only min or max periods so that they don't conflict with each other. Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=874342 Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- alsa/pcm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/alsa/pcm.c b/alsa/pcm.c index fdf99337997f..c23d0423fc86 100644 --- a/alsa/pcm.c +++ b/alsa/pcm.c @@ -263,10 +263,11 @@ static int oss_dsp_hw_params(oss_dsp_t *dsp) if (err < 0) return err; periods_min = 2; - err = snd_pcm_hw_params_set_periods_min(pcm, hw, &periods_min, 0); - if (err < 0) - return err; - if (dsp->maxfrags > 0) { + if (!dsp->maxfrags) { + err = snd_pcm_hw_params_set_periods_min(pcm, hw, &periods_min, 0); + if (err < 0) + return err; + } else { unsigned int periods_max = periods_min > dsp->maxfrags ? periods_min : dsp->maxfrags; err = snd_pcm_hw_params_set_periods_max(pcm, hw, -- 1.9.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0