August 2012 - openSUSE Commits - openSUSE Mailing Lists

commit MozillaThunderbird for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '12

31 Aug '12

Hello community, here is the log from the commit of package MozillaThunderbird for openSUSE:Factory checked in at 2012-08-31 09:45:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaThunderbird (Old) and /work/SRC/openSUSE:Factory/.MozillaThunderbird.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaThunderbird", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaThunderbird/MozillaThunderbird.changes 2012-07-30 11:40:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/MozillaThunderbird.changes 2012-08-31 09:45:38.000000000 +0200 @@ -1,0 +2,31 @@ +Sun Aug 26 14:59:20 UTC 2012 - wr(a)rosenauer.org + +- update to Thunderbird 15.0 (bnc#777588) + * MFSA 2012-57/CVE-2012-1970 + Miscellaneous memory safety hazards + * MFSA 2012-58/CVE-2012-1972/CVE-2012-1973/CVE-2012-1974/CVE-2012-1975 + CVE-2012-1976/CVE-2012-3956/CVE-2012-3957/CVE-2012-3958/CVE-2012-3959 + CVE-2012-3960/CVE-2012-3961/CVE-2012-3962/CVE-2012-3963/CVE-2012-3964 + Use-after-free issues found using Address Sanitizer + * MFSA 2012-59/CVE-2012-1956 (bmo#756719) + Location object can be shadowed using Object.defineProperty + * MFSA 2012-61/CVE-2012-3966 (bmo#775794, bmo#775793) + Memory corruption with bitmap format images with negative height + * MFSA 2012-62/CVE-2012-3967/CVE-2012-3968 + WebGL use-after-free and memory corruption + * MFSA 2012-63/CVE-2012-3969/CVE-2012-3970 + SVG buffer overflow and use-after-free issues + * MFSA 2012-64/CVE-2012-3971 + Graphite 2 memory corruption + * MFSA 2012-65/CVE-2012-3972 (bmo#746855) + Out-of-bounds read in format-number in XSLT + * MFSA 2012-68/CVE-2012-3975 (bmo#770684) + DOMParser loads linked resources in extensions when parsing + text/html + * MFSA 2012-70/CVE-2012-3978 (bmo#770429) + Location object security checks bypassed by chrome code + * MFSA 2012-72/CVE-2012-3980 (bmo#771859) + Web console eval capable of executing chrome-privileged code +- update Enigmail to 1.4.4 + +------------------------------------------------------------------- Old: ---- enigmail-1.4.3.tar.gz l10n-14.0.tar.bz2 mozilla-disable-neon-option.patch mozilla-dump_syms-static.patch mozilla-gcc47.patch thunderbird-14.0-source.tar.bz2 New: ---- enigmail-1.4.4.tar.gz l10n-15.0.tar.bz2 mozilla-arm-disable-edsp.patch mozilla-crashreporter-restart-args.patch mozilla-ppc.patch thunderbird-15.0-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaThunderbird.spec ++++++ --- /var/tmp/diff_new_pack.iw95y4/_old 2012-08-31 09:45:59.000000000 +0200 +++ /var/tmp/diff_new_pack.iw95y4/_new 2012-08-31 09:45:59.000000000 +0200 @@ -30,8 +30,8 @@ BuildRequires: libgnomeui-devel BuildRequires: libidl-devel BuildRequires: libnotify-devel -BuildRequires: mozilla-nspr-devel >= 4.9.0 -BuildRequires: mozilla-nss-devel >= 3.13.5 +BuildRequires: mozilla-nspr-devel >= 4.9.1 +BuildRequires: mozilla-nss-devel >= 3.13.6 BuildRequires: nss-shared-helper-devel BuildRequires: python BuildRequires: startup-notification-devel @@ -40,11 +40,11 @@ BuildRequires: xorg-x11-libXt-devel BuildRequires: yasm BuildRequires: zip -%define mainversion 14.0 +%define mainversion 15.0 %define update_channel release Version: %{mainversion} Release: 0 -%define releasedate 2012071300 +%define releasedate 2012082500 Provides: thunderbird = %{version} %if %{with_kde} # this is needed to match this package with the kde4 helper package without the main package @@ -65,18 +65,18 @@ Source6: suse-default-prefs.js Source7: find-external-requires.sh Source8: thunderbird-rpmlintrc -Source9: enigmail-1.4.3.tar.gz +Source9: enigmail-1.4.4.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-dump_syms-static.patch -Patch4: mozilla-disable-neon-option.patch -Patch5: mozilla-nongnome-proxies.patch -Patch6: mozilla-kde.patch -Patch7: mozilla-gcc47.patch +Patch3: mozilla-nongnome-proxies.patch +Patch4: mozilla-kde.patch +Patch5: mozilla-arm-disable-edsp.patch +Patch6: mozilla-crashreporter-restart-args.patch +Patch7: mozilla-ppc.patch # Thunderbird/mail Patch20: tb-ssldap.patch Patch21: tb-develdirs.patch @@ -170,7 +170,7 @@ %if %build_enigmail %package -n enigmail -Version: 1.4.3+%{mainversion} +Version: 1.4.4+%{mainversion} Release: 0 Summary: OpenPGP addon for Thunderbird and SeaMonkey License: MPL-1.1 or GPL-2.0+ @@ -199,11 +199,11 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 -#%patch4 -p1 -%patch5 -p1 %if %{with_kde} -%patch6 -p1 +%patch4 -p1 %endif +%patch5 -p1 +%patch6 -p1 %patch7 -p1 popd # comm-central patches @@ -534,7 +534,6 @@ %{progdir}/chrome/icons/ %dir %{progdir}/dictionaries/ %{progdir}/defaults/ -%{progdir}/jssubloader/ %dir %{progdir}/extensions/ %{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} %{progdir}/isp/ @@ -556,6 +555,7 @@ %defattr(-,root,root) %{_libdir}/%{progname}/*.a %{_libdir}/%{progname}/*.py +%{_libdir}/%{progname}/*.pyc %{_libdir}/%{progname}/ply/ %{_libdir}/%{progname}/xpcshell #%{_libdir}/pkgconfig/*.pc ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.iw95y4/_old 2012-08-31 09:46:00.000000000 +0200 +++ /var/tmp/diff_new_pack.iw95y4/_new 2012-08-31 09:46:00.000000000 +0200 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/comm-$CHANNEL" -RELEASE_TAG="THUNDERBIRD_14_0_RELEASE" -VERSION="14.0" +RELEASE_TAG="THUNDERBIRD_15_0_RELEASE" +VERSION="15.0" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH thunderbird ++++++ enigmail-1.4.3.tar.gz -> enigmail-1.4.4.tar.gz ++++++ ++++ 9598 lines of diff (skipped) ++++++ l10n-14.0.tar.bz2 -> l10n-15.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaThunderbird/l10n-14.0.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/l10n-15.0.tar.bz2 differ: char 11, line 1 ++++++ 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-crashreporter-restart-args.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> # Parent 07bb4ecfd6d6cc16360e7a32ee10b885d523f20d Bug 762780 - crashreporter restart command should support MOZ_APP_LAUNCHER diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp --- a/toolkit/crashreporter/nsExceptionHandler.cpp +++ b/toolkit/crashreporter/nsExceptionHandler.cpp @@ -1360,32 +1360,25 @@ nsresult SetRestartArgs(int argc, char** argv) { if (!gExceptionHandler) return NS_OK; int i; nsCAutoString envVar; char *env; + char *argv1 = getenv("MOZ_APP_LAUNCHER"); for (i = 0; i < argc; i++) { envVar = "MOZ_CRASHREPORTER_RESTART_ARG_"; envVar.AppendInt(i); envVar += "="; -#if defined(XP_UNIX) && !defined(XP_MACOSX) - // we'd like to run the script around the binary - // instead of the binary itself, so remove the -bin - // if it exists on the first argument - int arg_len = 0; - if (i == 0 && - (arg_len = strlen(argv[i])) > 4 && - strcmp(argv[i] + arg_len - 4, "-bin") == 0) { - envVar.Append(argv[i], arg_len - 4); - } else -#endif - { + if (argv1 && i == 0) { + // Is there a request to suppress default binary launcher? + envVar += argv1; + } else { envVar += argv[i]; } // PR_SetEnv() wants the string to be available for the lifetime // of the app, so dup it here env = ToNewCString(envVar); if (!env) return NS_ERROR_OUT_OF_MEMORY; ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.iw95y4/_old 2012-08-31 09:46:00.000000000 +0200 +++ /var/tmp/diff_new_pack.iw95y4/_new 2012-08-31 09:46:00.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in --- a/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in -@@ -77,14 +77,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas +@@ -45,14 +45,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas # Optimizer bug with GCC 3.2.2 on OS/2 ifeq ($(OS_ARCH), OS2) nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp @@ -27,7 +27,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp --- a/modules/libpref/src/Preferences.cpp +++ b/modules/libpref/src/Preferences.cpp -@@ -57,16 +57,17 @@ +@@ -23,16 +23,17 @@ #include "nsIStringEnumerator.h" #include "nsIZipReader.h" #include "nsPrefBranch.h" @@ -45,7 +45,7 @@ #include "prefapi.h" #include "prefread.h" #include "prefapi_private_data.h" -@@ -941,16 +942,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -907,16 +908,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char static nsresult pref_LoadPrefsInDirList(const char *listId) { @@ -80,7 +80,7 @@ return NS_OK; bool hasMore; -@@ -966,17 +985,17 @@ static nsresult pref_LoadPrefsInDirList( +@@ -932,17 +951,17 @@ static nsresult pref_LoadPrefsInDirList( nsCAutoString leaf; path->GetNativeLeafName(leaf); @@ -99,7 +99,7 @@ { nsZipItemPtr<char> manifest(jarReader, name, true); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); -@@ -1070,28 +1089,40 @@ static nsresult pref_InitInitialObjects( +@@ -1036,28 +1055,40 @@ static nsresult pref_InitInitialObjects( /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ static const char* specialFiles[] = { #if defined(XP_MACOSX) @@ -143,8 +143,7 @@ diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in --- a/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/Makefile.in -@@ -73,8 +73,11 @@ EXTRA_COMPONENTS = \ - nsDownloadManagerUI.js \ +@@ -41,9 +41,12 @@ EXTRA_COMPONENTS = \ nsDownloadManagerUI.manifest \ $(NULL) endif @@ -152,13 +151,15 @@ TEST_DIRS += test include $(topsrcdir)/config/rules.mk -+ + +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre + ++ + CXXFLAGS += $(TK_CFLAGS) diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp --- a/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp -@@ -74,16 +74,20 @@ +@@ -35,16 +35,20 @@ #ifdef XP_WIN #include <shlobj.h> @@ -179,7 +180,7 @@ #include "AndroidBridge.h" #endif -@@ -2259,16 +2263,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2236,16 +2240,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -205,7 +206,7 @@ PRInt64 goat = PR_Now() - mStartTime; showTaskbarAlert = goat > alertIntervalUSec; -@@ -2292,19 +2305,20 @@ nsDownload::SetState(DownloadState aStat +@@ -2269,19 +2282,20 @@ nsDownload::SetState(DownloadState aStat // If downloads are automatically removed per the user's // retention policy, there's no reason to make the text clickable // because if it is, they'll click open the download manager and @@ -220,7 +221,7 @@ } + } - #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) + #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GTK2) nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget); nsCOMPtr<nsIFile> file; nsAutoString path; @@ -230,7 +231,7 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -44,29 +44,33 @@ toolkit.jar: +@@ -45,29 +45,33 @@ toolkit.jar: *+ content/global/viewZoomOverlay.js (viewZoomOverlay.js) *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) *+ content/global/bindings/browser.xml (widgets/browser.xml) @@ -268,8 +269,12 @@ new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/dialog-kde.xml -@@ -0,0 +1,447 @@ +@@ -0,0 +1,451 @@ +<?xml version="1.0"?> ++ ++ + +<bindings id="dialogBindings" + xmlns="http://www.mozilla.org/xbl" @@ -300,7 +305,7 @@ + pack="end"> + <xul:button dlgtype="help" class="dialog-button" hidden="true"/> + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> -+ <xul:spacer anonid="spacer" flex="1" hidden="true"/> ++ <xul:spacer anonid="spacer" flex="1"/> + <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/> + <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> + <xul:button dlgtype="cancel" class="dialog-button"/> @@ -720,7 +725,7 @@ new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/preferences-kde.xml -@@ -0,0 +1,1373 @@ +@@ -0,0 +1,1339 @@ +<?xml version="1.0"?> + +<!DOCTYPE bindings [ @@ -1307,8 +1312,8 @@ + <xul:button dlgtype="accept" class="dialog-button" icon="accept"/> +#elif XP_UNIX + pack="end"> -+ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/> -+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> ++ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/> ++ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> + <xul:spacer anonid="spacer" flex="1"/> + <xul:button dlgtype="accept" class="dialog-button" icon="accept"/> + <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> @@ -1985,9 +1990,9 @@ + <handlers> + <handler event="command"> + // This "command" event handler tracks changes made to preferences by -+ // the user in this window. -+ if (event.sourceEvent) -+ event = event.sourceEvent; ++ // the user in this window. ++ if (event.sourceEvent) ++ event = event.sourceEvent; + this.userChangedValue(event.target); + </handler> + <handler event="select"> @@ -2046,43 +2051,9 @@ +</bindings> + +# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -+# ***** 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 the Preferences System. -+# -+# The Initial Developer of the Original Code is -+# Ben Goodger. -+# Portions created by the Initial Developer are Copyright (C) 2005 -+# the Initial Developer. All Rights Reserved. -+# -+# Contributor(s): -+# Ben Goodger <ben(a)mozilla.org> -+# Josh Aas <josh(a)mozilla.com> -+# -+# 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 ***** ++# 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/. + +# +# This is PrefWindow 6. The Code Could Well Be Ready, Are You? @@ -2097,7 +2068,7 @@ 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 -@@ -46,16 +46,18 @@ +@@ -12,16 +12,18 @@ #include "nsArrayUtils.h" #include "prnetdb.h" #include "prenv.h" @@ -2116,7 +2087,7 @@ nsUnixSystemProxySettings() {} nsresult Init(); -@@ -67,16 +69,17 @@ private: +@@ -33,16 +35,17 @@ private: nsCOMPtr<nsIGSettingsService> mGSettings; nsCOMPtr<nsIGSettingsCollection> mProxySettings; nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings; @@ -2134,7 +2105,7 @@ nsUnixSystemProxySettings::Init() { // If this is a GNOME session, load gconf and try to use its preferences. -@@ -529,16 +532,19 @@ nsUnixSystemProxySettings::GetProxyForUR +@@ -495,16 +498,19 @@ nsUnixSystemProxySettings::GetProxyForUR nsCAutoString host; rv = aURI->GetHost(host); NS_ENSURE_SUCCESS(rv, rv); @@ -2154,7 +2125,7 @@ if (mGConf) return GetProxyFromGConf(scheme, host, port, aResult); -@@ -564,8 +570,34 @@ static const mozilla::Module::ContractID +@@ -530,8 +536,34 @@ static const mozilla::Module::ContractID static const mozilla::Module kUnixProxyModule = { mozilla::Module::kVersion, @@ -2192,7 +2163,7 @@ diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in -@@ -100,17 +100,18 @@ else +@@ -69,17 +69,18 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CMMSRCS = nsNativeAppSupportCocoa.mm EXPORTS += MacQuirks.h @@ -2679,7 +2650,7 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in -@@ -90,18 +90,19 @@ LOCAL_INCLUDES = -I$(srcdir) +@@ -58,18 +58,19 @@ LOCAL_INCLUDES = -I$(srcdir) LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ipc \ -I$(topsrcdir)/content/base/src \ @@ -3047,7 +3018,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -@@ -50,30 +50,33 @@ +@@ -16,30 +16,33 @@ #include <QString> #if (MOZ_ENABLE_CONTENTACTION) #include <contentaction/contentaction.h> @@ -3083,7 +3054,7 @@ nsCAutoString spec; aURI->GetAsciiSpec(spec); if (hildon_uri_open(spec.get(), action, nsnull)) -@@ -95,22 +98,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * +@@ -61,22 +64,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * return rv; } @@ -3108,7 +3079,7 @@ if (*_retval) return NS_OK; -@@ -153,16 +156,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns +@@ -119,16 +122,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get())); if (action.isValid()) { action.trigger(); @@ -3142,7 +3113,7 @@ nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr<nsIURI> uri; -@@ -180,17 +200,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns +@@ -146,17 +166,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns /* Fallback to GnomeVFS */ nsCOMPtr<nsIGnomeVFSMimeApp> app; if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app) @@ -3164,7 +3135,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp --- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp +++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp -@@ -44,17 +44,17 @@ +@@ -10,17 +10,17 @@ #if defined(MOZ_ENABLE_CONTENTACTION) #include <contentaction/contentaction.h> #include <QString> @@ -3183,7 +3154,7 @@ #include "nsXPIDLString.h" #include "nsIURL.h" #include "nsIFileStreams.h" -@@ -1191,29 +1191,29 @@ nsresult nsOSHelperAppService::OSProtoco +@@ -1157,29 +1157,29 @@ nsresult nsOSHelperAppService::OSProtoco ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':'); if (action.isValid()) @@ -3215,7 +3186,7 @@ nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile) { -@@ -1299,17 +1299,17 @@ nsOSHelperAppService::GetFromExtension(c +@@ -1265,17 +1265,17 @@ nsOSHelperAppService::GetFromExtension(c minorType, mime_types_description, true); @@ -3234,7 +3205,7 @@ rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, -@@ -1425,17 +1425,17 @@ nsOSHelperAppService::GetFromType(const +@@ -1391,17 +1391,17 @@ nsOSHelperAppService::GetFromType(const #ifdef MOZ_WIDGET_GTK2 nsMIMEInfoBase *gnomeInfo = nsnull; if (handler.IsEmpty()) { @@ -3256,7 +3227,7 @@ diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in --- a/widget/gtk2/Makefile.in +++ b/widget/gtk2/Makefile.in -@@ -135,11 +135,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' +@@ -104,11 +104,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' INCLUDES += \ -I$(srcdir)/../xpwidgets \ @@ -3274,11 +3245,11 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp --- a/widget/gtk2/nsFilePicker.cpp +++ b/widget/gtk2/nsFilePicker.cpp -@@ -33,16 +33,17 @@ - * 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 ***** */ +@@ -1,16 +1,17 @@ + /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ + /* 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/. */ #include "mozilla/Util.h" @@ -3292,7 +3263,7 @@ #include "nsIStringBundle.h" #include "nsArrayEnumerator.h" -@@ -51,16 +52,17 @@ +@@ -19,16 +20,17 @@ #include "nsNetUtil.h" #include "nsReadableUtils.h" #include "mozcontainer.h" @@ -3310,7 +3281,7 @@ using namespace mozilla; #define MAX_PREVIEW_SIZE 180 -@@ -285,17 +287,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil +@@ -253,17 +255,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil return nsBaseFilePicker::AppendFilters(aFilterMask); } @@ -3331,7 +3302,7 @@ mFilters.AppendElement(filter); mFilterNames.AppendElement(name); -@@ -390,16 +394,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat +@@ -358,16 +362,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat return NS_ERROR_FAILURE; } @@ -3351,7 +3322,7 @@ GtkFileChooserAction action = GetGtkFileChooserAction(mMode); const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE) ? GTK_STOCK_SAVE : GTK_STOCK_OPEN; -@@ -538,8 +545,234 @@ nsFilePicker::Show(PRInt16 *aReturn) +@@ -506,8 +513,234 @@ nsFilePicker::Show(PRInt16 *aReturn) *aReturn = nsIFilePicker::returnCancel; break; } @@ -3589,7 +3560,7 @@ diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h --- a/widget/gtk2/nsFilePicker.h +++ b/widget/gtk2/nsFilePicker.h -@@ -89,11 +89,17 @@ protected: +@@ -57,11 +57,17 @@ protected: nsString mDefault; nsString mDefaultExtension; @@ -3610,7 +3581,7 @@ diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in --- a/xpcom/components/Makefile.in +++ b/xpcom/components/Makefile.in -@@ -91,10 +91,11 @@ LOCAL_INCLUDES = \ +@@ -59,10 +59,11 @@ LOCAL_INCLUDES = \ # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 @@ -3625,7 +3596,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp --- a/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp -@@ -63,16 +63,17 @@ +@@ -30,16 +30,17 @@ #include "nsTextFormatter.h" #include "nsVersionComparator.h" #include "nsXPCOMCIDInternal.h" @@ -3643,7 +3614,7 @@ const char* directive; int argc; -@@ -430,16 +431,17 @@ ParseManifest(NSLocationType type, FileL +@@ -397,16 +398,17 @@ ParseManifest(NSLocationType type, FileL NS_NAMED_LITERAL_STRING(kPlatform, "platform"); NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible"); NS_NAMED_LITERAL_STRING(kApplication, "application"); @@ -3661,7 +3632,7 @@ NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers"); nsAutoString appID; -@@ -477,41 +479,46 @@ ParseManifest(NSLocationType type, FileL +@@ -444,41 +446,46 @@ ParseManifest(NSLocationType type, FileL CopyUTF8toUTF16(s, abi); abi.Insert(PRUnichar('_'), 0); abi.Insert(osTarget, 0); @@ -3708,7 +3679,7 @@ char *token; char *newline = buf; -@@ -593,24 +600,26 @@ ParseManifest(NSLocationType type, FileL +@@ -560,24 +567,26 @@ ParseManifest(NSLocationType type, FileL TriState stOsVersion = eUnspecified; TriState stOs = eUnspecified; TriState stABI = eUnspecified; @@ -3735,7 +3706,7 @@ #if defined(MOZ_WIDGET_ANDROID) bool tablet = false; if (CheckFlag(kTablet, wtoken, tablet)) { -@@ -639,16 +648,17 @@ ParseManifest(NSLocationType type, FileL +@@ -606,16 +615,17 @@ ParseManifest(NSLocationType type, FileL } if (!ok || @@ -3756,7 +3727,7 @@ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in -@@ -189,17 +189,17 @@ include $(topsrcdir)/ipc/chromium/chromi +@@ -157,17 +157,17 @@ include $(topsrcdir)/ipc/chromium/chromi DEFINES += -D_IMPL_NS_COM ifeq ($(OS_ARCH),Linux) @@ -3778,7 +3749,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp --- a/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp -@@ -90,16 +90,17 @@ +@@ -48,16 +48,17 @@ #include "prproces.h" #include "nsIDirectoryEnumerator.h" #include "nsISimpleEnumerator.h" @@ -3796,7 +3767,7 @@ #include "prmem.h" #include "plbase64.h" -@@ -1798,44 +1799,51 @@ nsLocalFile::SetPersistentDescriptor(con +@@ -1763,44 +1764,51 @@ nsLocalFile::SetPersistentDescriptor(con return InitWithNativePath(aPersistentDescriptor); #endif } @@ -3862,7 +3833,7 @@ return rv; } return NS_ERROR_FAILURE; -@@ -1861,16 +1869,23 @@ nsLocalFile::Launch() +@@ -1826,16 +1834,23 @@ nsLocalFile::Launch() if (nsnull == connection) return NS_ERROR_FAILURE; ++++++ mozilla-ppc.patch ++++++ # HG changeset patch # Parent 0f6722dd9d75458124795d22e9240887c9b4aeca # 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 @@ -166,17 +166,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/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c --- a/memory/jemalloc/jemalloc.c +++ b/memory/jemalloc/jemalloc.c @@ -1086,17 +1086,19 @@ 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(__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. */ #define pagesize_2pow ((size_t) 12) 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 ++++++ --- /var/tmp/diff_new_pack.iw95y4/_old 2012-08-31 09:46:00.000000000 +0200 +++ /var/tmp/diff_new_pack.iw95y4/_new 2012-08-31 09:46:00.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -590,16 +590,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO +@@ -573,16 +573,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ @@ -31,7 +31,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8180,16 +8180,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8270,16 +8270,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -66,7 +66,7 @@ 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 -@@ -119,12 +119,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS) +@@ -86,12 +86,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS) DEFINES += \ -DNSS_ENABLE_ECC \ -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ @@ -85,14 +85,12 @@ 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 -@@ -39,16 +39,23 @@ - * 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. +@@ -1,14 +1,21 @@ + /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- * - * ***** END LICENSE BLOCK ***** */ + * 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_ENABLE_NSSHELPER +#pragma GCC visibility push(default) @@ -109,7 +107,7 @@ #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" #include "nsDirectoryService.h" -@@ -1776,18 +1783,34 @@ nsNSSComponent::InitializeNSS(bool showW +@@ -1738,18 +1745,34 @@ nsNSSComponent::InitializeNSS(bool showW ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs @@ -149,7 +147,7 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -439,17 +439,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO +@@ -446,17 +446,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO endif endif endif ++++++ tb-develdirs.patch ++++++ --- /var/tmp/diff_new_pack.iw95y4/_old 2012-08-31 09:46:00.000000000 +0200 +++ /var/tmp/diff_new_pack.iw95y4/_new 2012-08-31 09:46:00.000000000 +0200 @@ -1,9 +1,9 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -56,21 +56,21 @@ MOZ_APP_VERSION = @MOZ_APP_VERSION@ - MOZ_APP_MAXVERSION = @MOZ_APP_MAXVERSION@ - MOZ_MACBUNDLE_NAME= @MOZ_MACBUNDLE_NAME@ +@@ -25,21 +25,21 @@ MOZ_MACBUNDLE_NAME= @MOZ_MACBUNDLE_NAME@ + MAR_CHANNEL_ID = @MAR_CHANNEL_ID@ + ACCEPTED_MAR_CHANNEL_IDS = @ACCEPTED_MAR_CHANNEL_IDS@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ ++++++ thunderbird-14.0-source.tar.bz2 -> thunderbird-15.0-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaThunderbird/thunderbird-14.0-source.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaThunderbird.new/thunderbird-15.0-source.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit MozillaFirefox for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '12

31 Aug '12

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2012-08-31 09:44:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox", Maintainer is "bnc-team-mozilla(a)forge.provo.novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2012-07-30 11:36:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2012-08-31 09:45:03.000000000 +0200 @@ -1,0 +2,41 @@ +Sun Aug 26 13:47:43 UTC 2012 - wr(a)rosenauer.org + +- update to Firefox 15.0 (bnc#777588) + * MFSA 2012-57/CVE-2012-1970 + Miscellaneous memory safety hazards + * MFSA 2012-58/CVE-2012-1972/CVE-2012-1973/CVE-2012-1974/CVE-2012-1975 + CVE-2012-1976/CVE-2012-3956/CVE-2012-3957/CVE-2012-3958/CVE-2012-3959 + CVE-2012-3960/CVE-2012-3961/CVE-2012-3962/CVE-2012-3963/CVE-2012-3964 + Use-after-free issues found using Address Sanitizer + * MFSA 2012-59/CVE-2012-1956 (bmo#756719) + Location object can be shadowed using Object.defineProperty + * MFSA 2012-60/CVE-2012-3965 (bmo#769108) + Escalation of privilege through about:newtab + * MFSA 2012-61/CVE-2012-3966 (bmo#775794, bmo#775793) + Memory corruption with bitmap format images with negative height + * MFSA 2012-62/CVE-2012-3967/CVE-2012-3968 + WebGL use-after-free and memory corruption + * MFSA 2012-63/CVE-2012-3969/CVE-2012-3970 + SVG buffer overflow and use-after-free issues + * MFSA 2012-64/CVE-2012-3971 + Graphite 2 memory corruption + * MFSA 2012-65/CVE-2012-3972 (bmo#746855) + Out-of-bounds read in format-number in XSLT + * MFSA 2012-66/CVE-2012-3973 (bmo#757128) + HTTPMonitor extension allows for remote debugging without explicit + activation + * MFSA 2012-68/CVE-2012-3975 (bmo#770684) + DOMParser loads linked resources in extensions when parsing + text/html + * MFSA 2012-69/CVE-2012-3976 (bmo#768568) + Incorrect site SSL certificate data display + * MFSA 2012-70/CVE-2012-3978 (bmo#770429) + Location object security checks bypassed by chrome code + * MFSA 2012-72/CVE-2012-3980 (bmo#771859) + Web console eval capable of executing chrome-privileged code +- fix HTML5 video crash with GStreamer enabled (bmo#761030) +- GStreamer is only used for MP4 (no WebM, OGG) +- updated filelist +- moved browser specific preferences to correct location + +------------------------------------------------------------------- Old: ---- firefox-14.0.1-source.tar.bz2 l10n-14.0.1.tar.bz2 mozilla-dump_syms-static.patch mozilla-gcc47.patch mozilla-yarr-pcre.patch New: ---- firefox-15.0-source.tar.bz2 l10n-15.0.tar.bz2 mozilla-gstreamer.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -17,8 +17,8 @@ # -%define major 14 -%define mainver %major.0.1 +%define major 15 +%define mainver %major.0 %define update_channel release Name: MozillaFirefox @@ -44,8 +44,8 @@ %else BuildRequires: wireless-tools %endif -BuildRequires: mozilla-nspr-devel >= 4.9.0 -BuildRequires: mozilla-nss-devel >= 3.13.5 +BuildRequires: mozilla-nspr-devel >= 4.9.1 +BuildRequires: mozilla-nss-devel >= 3.13.6 BuildRequires: nss-shared-helper-devel %if %suse_version > 1140 BuildRequires: pkgconfig(gstreamer-0.10) @@ -54,7 +54,7 @@ %endif Version: %{mainver} Release: 0 -%define releasedate 2012071300 +%define releasedate 2012082500 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -91,14 +91,12 @@ Patch7: mozilla-language.patch Patch8: mozilla-ntlm-full-path.patch Patch9: mozilla-repo.patch -Patch10: mozilla-dump_syms-static.patch -Patch11: mozilla-sle11.patch -Patch12: mozilla-disable-neon-option.patch -Patch13: mozilla-yarr-pcre.patch -Patch14: mozilla-gcc47.patch -Patch15: mozilla-arm-disable-edsp.patch -Patch16: mozilla-crashreporter-restart-args.patch -Patch17: mozilla-ppc.patch +Patch10: mozilla-sle11.patch +Patch11: mozilla-disable-neon-option.patch +Patch13: mozilla-arm-disable-edsp.patch +Patch14: mozilla-crashreporter-restart-args.patch +Patch15: mozilla-gstreamer.patch +Patch16: mozilla-ppc.patch # Firefox/browser Patch30: firefox-browser-css.patch Patch31: firefox-kde.patch @@ -220,16 +218,14 @@ %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 %if %suse_version < 1120 -%patch11 -p1 +%patch10 -p1 %endif -#%patch12 -p1 +#%patch11 -p1 %patch13 -p1 %patch14 -p1 %patch15 -p1 %patch16 -p1 -%patch17 -p1 # %patch30 -p1 %if %suse_version >= 1110 @@ -340,12 +336,10 @@ cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* $RPM_BUILD_ROOT%{progdir} mkdir -p $RPM_BUILD_ROOT/%{progdir}/distribution/extensions mkdir -p $RPM_BUILD_ROOT%{progdir}/searchplugins +mkdir -p $RPM_BUILD_ROOT%{progdir}/defaults/preferences/ # install kde.js %if %suse_version >= 1110 -install -m 644 %{SOURCE6} $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/firefox.js +install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/defaults/preferences/kde.js %endif # install add-plugins.sh sed "s:%%PROGDIR:%{progdir}:g" \ @@ -369,6 +363,7 @@ make -C browser/locales langpack-$locale cp -rL dist/xpi-stage/locale-$locale \ $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale(a)firefox.mozilla.org + rm $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale(a)firefox.mozilla.org/chrome/.mkdir.done # remove prefs, profile defaults, and hyphenation from langpack rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale(a)firefox.mozilla.org/defaults rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale(a)firefox.mozilla.org/hyphenation @@ -543,7 +538,6 @@ %{progdir}/distribution/extensions/ %{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} %{progdir}/icons/ -%{progdir}/jssubloader/ %{progdir}/searchplugins/ %attr(755,root,root) %{progdir}/%{progname}.sh %{progdir}/firefox ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_14_0_1_RELEASE" -VERSION="14.0.1" +RELEASE_TAG="FIREFOX_15_0_RELEASE" +VERSION="15.0" # mozilla echo "cloning $BRANCH..." ++++++ firefox-14.0.1-source.tar.bz2 -> firefox-15.0-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-14.0.1-source.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-15.0-source.tar.bz2 differ: char 11, line 1 ++++++ firefox-branded-icons.patch ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent 7f0b0738f036cd9d2e51c51c3552dc608ac598f9 +# Parent 7272ee3a4df832b885fec122f02d32f23dcc9cdb diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -160,16 +160,21 @@ endif +@@ -127,16 +127,21 @@ endif endif #} LIBXUL_SDK ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) @@ -29,7 +29,7 @@ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in --- a/browser/branding/official/Makefile.in +++ b/browser/branding/official/Makefile.in -@@ -65,18 +65,21 @@ OSX_BRANDING_FILES = \ +@@ -35,18 +35,21 @@ OSX_BRANDING_FILES = \ firefox.icns \ disk.icns \ document.icns \ @@ -54,8 +54,8 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -476,18 +476,21 @@ - @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png +@@ -496,18 +496,21 @@ + @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png #ifdef SHIP_FEEDBACK @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi #endif ++++++ firefox-kde-114.patch ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -1,27 +1,25 @@ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> -# Parent 51bf77cf40165f6567ca7d9a5ff90286739e525a +# Parent 0db25ab919ad61d91a46d7700d3f06e2b66f9feb With openSUSE 11.4 the desktop file name changed from MozillaFirefox to firefox diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js --- a/browser/components/preferences/advanced.js +++ b/browser/components/preferences/advanced.js -@@ -705,17 +705,17 @@ var gAdvancedPane = { - shellSvc.setDefaultBrowser(true, false); - if (kde_session == 1) { - var shellObj = Components.classes["@mozilla.org/file/local;1"] - .createInstance(Components.interfaces.nsILocalFile); - shellObj.initWithPath("/usr/bin/kwriteconfig"); - var process = Components.classes["@mozilla.org/process/util;1"] - .createInstance(Components.interfaces.nsIProcess); - process.init(shellObj); -- var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "MozillaFirefox"]; -+ var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "firefox"]; - process.run(false, args, args.length); - } - } +@@ -719,15 +719,15 @@ var gAdvancedPane = { + if (kde_session == 1) { + var shellObj = Components.classes["@mozilla.org/file/local;1"] + .createInstance(Components.interfaces.nsILocalFile); + shellObj.initWithPath("/usr/bin/kwriteconfig"); + var process = Components.classes["@mozilla.org/process/util;1"] + .createInstance(Components.interfaces.nsIProcess); + process.init(shellObj); + var args = ["--file", "kdeglobals", "--group", "General", "--key", +- "BrowserApplication", "MozillaFirefox"]; ++ "BrowserApplication", "firefox"]; + process.run(false, args, args.length); } - else { - promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser", - [brandShortName]); - psvc.alert(window, promptTitle, promptMessage); + document.getElementById("setDefaultPane").selectedIndex = 1; + } + #endif + }; ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -2,62 +2,14 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1122 @@ +@@ -0,0 +1,1126 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- +# -+# ***** 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 Communicator client code, released -+# March 31, 1998. -+# -+# The Initial Developer of the Original Code is -+# Netscape Communications Corporation. -+# Portions created by the Initial Developer are Copyright (C) 1998-2000 -+# the Initial Developer. All Rights Reserved. -+# -+# Contributor(s): -+# Blake Ross <blake(a)cs.stanford.edu> -+# David Hyatt <hyatt(a)mozilla.org> -+# Joe Hewitt <hewitt(a)netscape.com> -+# Pierre Chanial <chanial(a)noos.fr> -+# Dean Tessman <dean_tessman(a)hotmail.com> -+# Johnathan Nightingale <johnath(a)mozilla.com> -+# Dão Gottwald <dao(a)mozilla.com> -+# Ehsan Akhgari <ehsan.akhgari(a)gmail.com> -+# Robert Strong <robert.bugzilla(a)gmail.com> -+# Rob Campbell <rcampbell(a)mozilla.com> -+# Patrick Walton <pcwalton(a)mozilla.com> -+# David Dahl <ddahl(a)mozilla.com> -+# Frank Yan <fyan(a)mozilla.com> -+# Victor Porof <vporof(a)mozilla.com> -+# Paul Rouget <paul(a)mozilla.com> -+# -+# 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 ***** ++# 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/. + +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?> +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?> @@ -257,7 +209,6 @@ + type="checkbox" + label="&viewTabsOnTop.label;" + accesskey="&viewTabsOnTop.accesskey;"/> -+ <menuseparator/> + <menuitem command="cmd_CustomizeToolbars" + label="&viewCustomizeToolbar.label;" + accesskey="&viewCustomizeToolbar.accesskey;"/> @@ -414,7 +365,7 @@ + <label class="tooltip-label" value="&backForwardButtonMenu.tooltip;"/> +#endif + </tooltip> -+ ++ + <tooltip id="forward-button-tooltip"> + <label class="tooltip-label" value="&forwardButton.tooltip;"/> +#ifdef XP_MACOSX @@ -994,9 +945,22 @@ + + <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> + <hbox style="width: 100%;" pack="center">  -+ <hbox id="full-screen-warning-message"> -+ <description id="full-screen-warning-text" value="&domFullScreenWarning.label;"></description> -+ </hbox> ++ <vbox id="full-screen-warning-message" align="center"> ++ <description id="full-screen-domain-text"/> ++ <description class="full-screen-description" value="&fullscreenExitHint.value;"/> ++ <vbox id="full-screen-approval-pane" align="center"> ++ <description class="full-screen-description" value="&fullscreenApproval.value;"/> ++ <hbox> ++ <button label="&fullscreenAllowButton.label;" ++ oncommand="FullScreen.setFullscreenAllowed(true);" ++ class="full-screen-approval-button"/> ++ <button label="&fullscreenExitButton.label;" ++ oncommand="FullScreen.setFullscreenAllowed(false);" ++ class="full-screen-approval-button"/> ++ </hbox> ++ <checkbox id="full-screen-remember-decision"/> ++ </vbox> ++ </vbox> + </hbox> + </hbox> + @@ -1007,9 +971,28 @@ + hidden="true"> +#ifdef XP_MACOSX + <toolbarbutton id="highlighter-closebutton" ++ class="devtools-closebutton" + oncommand="InspectorUI.closeInspectorUI(false);" + tooltiptext="&inspectCloseButton.tooltiptext;"/> +#endif ++ <toolbarbutton id="inspector-option-toolbarbutton" ++ type="menu" ++ tabindex="0" ++ tooltiptext="&inspectOptionButton.tooltiptext;"> ++ <menupopup id="inspector-option-popup" ++ position="before_start"> ++ <menuitem id="inspectorToggleVeil" ++ type="checkbox" ++ label="&inspectorToggleVeil.label;" ++ accesskey="&inspectorToggleVeil.accesskey;" ++ command="Inspector:ToggleVeil"/> ++ <menuitem id="inspectorToggleInfobar" ++ type="checkbox" ++ label="&inspectorToggleInfobar.label;" ++ accesskey="&inspectorToggleInfobar.accesskey;" ++ command="Inspector:ToggleInfobar"/> ++ </menupopup> ++ </toolbarbutton> + <toolbarbutton id="inspector-inspect-toolbutton" + class="devtools-toolbarbutton" + command="Inspector:Inspect"/> @@ -1040,10 +1023,55 @@ + </hbox> +#ifndef XP_MACOSX + <toolbarbutton id="highlighter-closebutton" ++ class="devtools-closebutton" + oncommand="InspectorUI.closeInspectorUI(false);" + tooltiptext="&inspectCloseButton.tooltiptext;"/> +#endif + </toolbar> ++ ++ <toolbar id="developer-toolbar" ++ class="devtools-toolbar" ++ hidden="true"> ++#ifdef XP_MACOSX ++ <toolbarbutton id="developer-toolbar-closebutton" ++ class="devtools-closebutton" ++ oncommand="DeveloperToolbar.hide();" ++ tooltiptext="&devToolbarCloseButton.tooltiptext;"/> ++#endif ++ <stack class="gclitoolbar-stack-node" flex="1"> ++ <hbox class="gclitoolbar-prompt"> ++ <label class="gclitoolbar-prompt-label">»</label> ++ </hbox> ++ <hbox class="gclitoolbar-complete-node"/> ++ <textbox class="gclitoolbar-input-node" rows="1"/> ++ </stack> ++ <toolbarbutton id="developer-toolbar-webconsole" ++ label="&webConsoleButton.label;" ++ class="devtools-toolbarbutton" ++ command="Tools:WebConsole"/> ++ <toolbarbutton id="developer-toolbar-inspector" ++ label="&inspectorButton.label;" ++ class="devtools-toolbarbutton" ++ hidden="true" ++ command="Tools:Inspect"/> ++ <toolbarbutton id="developer-toolbar-responsiveui" ++ label="&responsiveDesignTool.label;" ++ class="devtools-toolbarbutton" ++ hidden="true" ++ command="Tools:ResponsiveUI"/> ++ <toolbarbutton id="developer-toolbar-debugger" ++ label="&scriptsButton.label;" ++ class="devtools-toolbarbutton" ++ hidden="true" ++ command="Tools:Debugger"/> ++#ifndef XP_MACOSX ++ <toolbarbutton id="developer-toolbar-closebutton" ++ class="devtools-closebutton" ++ oncommand="DeveloperToolbar.hide();" ++ tooltiptext="&devToolbarCloseButton.tooltiptext;"/> ++#endif ++ </toolbar> ++ + <toolbar id="addon-bar" + toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;" + collapsed="true" @@ -1063,58 +1091,34 @@ + +#ifndef XP_UNIX + <svg:svg height="0"> -+ <svg:mask id="winstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox"> -+ <svg:rect x="0" y="0" width="1" height="1" fill="white"/> -+ <svg:circle cx="-0.34" cy="0.5" r="0.61"/> -+ </svg:mask> -+ <svg:mask id="winstripe-urlbar-back-button-mask" maskContentUnits="userSpaceOnUse"> -+ <svg:rect x="0" y="0" width="10000" height="50" fill="white"/> -+ <svg:circle cx="-11" cy="18" r="15"/> -+ </svg:mask> ++ <svg:clipPath id="winstripe-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox"> ++ <svg:path d="M 0,0 C 0.16,0.11 0.28,0.29 0.28,0.5 0.28,0.71 0.16,0.89 0,1 L 1,1 1,0 0,0 z"/> ++ </svg:clipPath> ++ <svg:clipPath id="winstripe-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse"> ++ <svg:path d="M 0,0 0,7.8 C 2.5,11 4,14 4,18 4,22 2.5,25 0,28 l 0,22 10000,0 0,-50 L 0,0 z"/> ++ </svg:clipPath> + </svg:svg> +#endif +#ifdef XP_MACOSX + <svg:svg height="0"> -+ <svg:mask id="pinstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox"> -+ <svg:rect x="0" y="0" width="1" height="1" fill="white"/> -+ <svg:circle cx="-0.41" cy="0.5" r="0.65"/> -+ </svg:mask> -+ <svg:mask id="pinstripe-urlbar-back-button-mask" maskContentUnits="userSpaceOnUse"> -+ <svg:rect x="0" y="-5" width="10000" height="55" fill="white"/> -+ <svg:circle cx="-9" cy="11" r="15"/> -+ </svg:mask> -+ <svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse"> -+ <svg:circle cx="9" cy="3" r="3" fill="white"/> -+ <svg:rect x="9" y="0" width="3" height="3" fill="white"/> -+ <svg:rect x="6" y="3" width="6" height="19" fill="white"/> -+ <svg:rect x="1" y="17" width="5" height="5" fill="white"/> -+ <svg:circle cx="1" cy="17" r="5"/> -+ <svg:rect x="0" y="22" width="12" height="1" fill="white"/> -+ </svg:mask> -+ <svg:mask id="pinstripe-tab-ontop-right-curve-mask" maskContentUnits="userSpaceOnUse"> -+ <svg:circle cx="3" cy="3" r="3" fill="white"/> -+ <svg:rect x="0" y="0" width="3" height="3" fill="white"/> -+ <svg:rect x="0" y="3" width="6" height="19" fill="white"/> -+ <svg:rect x="6" y="17" width="5" height="5" fill="white"/> -+ <svg:circle cx="11" cy="17" r="5"/> -+ <svg:rect x="0" y="22" width="12" height="1" fill="white"/> -+ </svg:mask> -+ <svg:mask id="pinstripe-tab-onbottom-left-curve-mask" maskContentUnits="userSpaceOnUse"> -+ <svg:circle cx="9" cy="20" r="3" fill="white"/> -+ <svg:rect x="9" y="20" width="3" height="3" fill="white"/> -+ <svg:rect x="6" y="1" width="6" height="19" fill="white"/> -+ <svg:rect x="1" y="1" width="5" height="5" fill="white"/> -+ <svg:circle cx="1" cy="6" r="5"/> -+ <svg:rect x="0" y="0" width="12" height="1" fill="white"/> -+ </svg:mask> -+ <svg:mask id="pinstripe-tab-onbottom-right-curve-mask" maskContentUnits="userSpaceOnUse"> -+ <svg:circle cx="3" cy="20" r="3" fill="white"/> -+ <svg:rect x="0" y="20" width="3" height="3" fill="white"/> -+ <svg:rect x="0" y="1" width="6" height="19" fill="white"/> -+ <svg:rect x="6" y="1" width="5" height="5" fill="white"/> -+ <svg:circle cx="11" cy="6" r="5"/> -+ <svg:rect x="0" y="0" width="12" height="1" fill="white"/> -+ </svg:mask> ++ <svg:clipPath id="pinstripe-keyhole-forward-clip-path" clipPathUnits="objectBoundingBox"> ++ <svg:path d="M 0,0 C 0.15,0.12 0.25,0.3 0.25,0.5 0.25,0.7 0.15,0.88 0,1 L 1,1 1,0 0,0 z"/> ++ </svg:clipPath> ++ <svg:clipPath id="pinstripe-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse"> ++ <svg:path d="m 0,-5 0,4.03 C 3.6,1.8 6,6.1 6,11 6,16 3.6,20 0,23 l 0,27 10000,0 0,-55 L 0,-5 z"/> ++ </svg:clipPath> ++ <svg:clipPath id="pinstripe-tab-ontop-left-curve-clip-path" clipPathUnits="userSpaceOnUse"> ++ <svg:path d="M 9,0 C 7.3,0 6,1.3 6,3 l 0,14 c 0,3 -2.2,5 -5,5 l -1,0 0,1 12,0 0,-1 0,-19 0,-3 -3,0 z"/> ++ </svg:clipPath> ++ <svg:clipPath id="pinstripe-tab-ontop-right-curve-clip-path" clipPathUnits="userSpaceOnUse"> ++ <svg:path d="m 0,0 0,3 0,19 0,1 12,0 0,-1 -1,0 C 8.2,22 6,20 6,17 L 6,3 C 6,1.3 4.7,0 3,0 L 0,0 z"/> ++ </svg:clipPath> ++ <svg:clipPath id="pinstripe-tab-onbottom-left-curve-clip-path" clipPathUnits="userSpaceOnUse"> ++ <svg:path d="m 0,0 0,1 1,0 c 2.8,0 5,2.2 5,5 l 0,14 c 0,2 1.3,3 3,3 l 3,0 0,-3 L 12,1 12,0 0,0 z"/> ++ </svg:clipPath> ++ <svg:clipPath id="pinstripe-tab-onbottom-right-curve-clip-path" clipPathUnits="userSpaceOnUse"> ++ <svg:path d="m 0,0 0,1 0,19 0,3 3,0 c 1.7,0 3,-1 3,-3 L 6,6 C 6,3.2 8.2,1 11,1 L 12,1 12,0 0,0 z"/> ++ </svg:clipPath> + </svg:svg> +#endif + @@ -1128,7 +1132,7 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -32,16 +32,18 @@ browser.jar: +@@ -35,16 +35,18 @@ browser.jar: content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png) content/browser/abouthome/mozilla.png (content/abouthome/mozilla.png) content/browser/abouthome/noise.png (content/abouthome/noise.png) @@ -1150,7 +1154,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp --- a/browser/components/build/nsModule.cpp +++ b/browser/components/build/nsModule.cpp -@@ -41,17 +41,17 @@ +@@ -8,17 +8,17 @@ #include "nsBrowserCompsCID.h" #include "DirectoryProvider.h" @@ -1169,7 +1173,7 @@ #include "rdf.h" #include "nsFeedSniffer.h" -@@ -65,18 +65,16 @@ using namespace mozilla::browser; +@@ -32,18 +32,16 @@ using namespace mozilla::browser; ///////////////////////////////////////////////////////////////////////////// @@ -1188,7 +1192,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) -@@ -97,17 +95,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID) +@@ -64,17 +62,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID) #endif NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); @@ -1210,54 +1214,57 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js --- a/browser/components/preferences/advanced.js +++ b/browser/components/preferences/advanced.js -@@ -716,24 +716,42 @@ var gAdvancedPane = { - var brandBundle = document.getElementById("bundleBrand"); - var shellBundle = document.getElementById("bundleShell"); - var brandShortName = brandBundle.getString("brandShortName"); - var promptTitle = shellBundle.getString("setDefaultBrowserTitle"); - var promptMessage; - const IPS = Components.interfaces.nsIPromptService; - var psvc = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] - .getService(IPS); -+ +@@ -23,16 +23,22 @@ var gAdvancedPane = { + if (extraArgs && extraArgs["advancedTab"]){ + advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]); + } else { + var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex"); + if (preference.value !== null) + advancedPrefs.selectedIndex = preference.value; + } + + var env = Components.classes["@mozilla.org/process/environment;1"] + .getService(Components.interfaces.nsIEnvironment); + var kde_session = 0; + if (env.get('KDE_FULL_SESSION') == "true") + kde_session = 1; + - if (!shellSvc.isDefaultBrowser(false)) { - promptMessage = shellBundle.getFormattedString("setDefaultBrowserMessage", - [brandShortName]); - var rv = psvc.confirmEx(window, promptTitle, promptMessage, - IPS.STD_YES_NO_BUTTONS, - null, null, null, null, { }); -- if (rv == 0) -+ if (rv == 0) { - shellSvc.setDefaultBrowser(true, false); -+ if (kde_session == 1) { -+ var shellObj = Components.classes["@mozilla.org/file/local;1"] -+ .createInstance(Components.interfaces.nsILocalFile); -+ shellObj.initWithPath("/usr/bin/kwriteconfig"); -+ var process = Components.classes["@mozilla.org/process/util;1"] -+ .createInstance(Components.interfaces.nsIProcess); -+ process.init(shellObj); -+ var args = ["--file", "kdeglobals", "--group", "General", "--key", "BrowserApplication", "MozillaFirefox"]; -+ process.run(false, args, args.length); -+ } -+ } - } - else { - promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser", - [brandShortName]); - psvc.alert(window, promptTitle, promptMessage); - } + #ifdef HAVE_SHELL_SERVICE + this.updateSetDefaultBrowser(); + #endif + #ifdef MOZ_UPDATER + this.updateReadPrefs(); + #endif + this.updateOfflineApps(); + #ifdef MOZ_CRASHREPORTER +@@ -715,12 +721,23 @@ var gAdvancedPane = { + * Set browser as the operating system default browser. + */ + setDefaultBrowser: function() + { + let shellSvc = getShellService(); + if (!shellSvc) + return; + shellSvc.setDefaultBrowser(true, false); ++ if (kde_session == 1) { ++ var shellObj = Components.classes["@mozilla.org/file/local;1"] ++ .createInstance(Components.interfaces.nsILocalFile); ++ shellObj.initWithPath("/usr/bin/kwriteconfig"); ++ var process = Components.classes["@mozilla.org/process/util;1"] ++ .createInstance(Components.interfaces.nsIProcess); ++ process.init(shellObj); ++ var args = ["--file", "kdeglobals", "--group", "General", "--key", ++ "BrowserApplication", "MozillaFirefox"]; ++ process.run(false, args, args.length); ++ } + document.getElementById("setDefaultPane").selectedIndex = 1; } #endif + }; diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in --- a/browser/components/shell/src/Makefile.in +++ b/browser/components/shell/src/Makefile.in -@@ -51,17 +51,18 @@ endif +@@ -17,17 +17,18 @@ USE_STATIC_LIBS = 1 ifeq ($(OS_ARCH),WINNT) CPPSRCS = nsWindowsShellService.cpp @@ -1720,8 +1727,8 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -501,18 +501,20 @@ - @BINPATH@/@PREF_DIR@/services-sync.js +@@ -520,18 +520,20 @@ + @BINPATH@/@PREF_DIR@/services-aitc.js #endif @BINPATH@/greprefs.js @BINPATH@/defaults/autoconfig/platform.js ++++++ firefox-multilocale-chrome.patch ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -1,12 +1,12 @@ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> -# Parent dd43958a61127a39cb7e59ba6118a57b685255e2 +# Parent 2f0c475e3ea9ba2309ab4ff7debb8bd0d6850a14 Add searchplugins to chrome packaging for proper localization diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -356,16 +356,20 @@ pref("browser.download.useToolkitUI", tr +@@ -332,16 +332,20 @@ pref("browser.download.useToolkitUI", tr pref("browser.download.panel.removeFinishedDownloads", false); // search engines URL @@ -30,7 +30,7 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in -@@ -153,39 +153,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr +@@ -121,39 +121,48 @@ libs:: $(call MERGE_FILES,$(addprefix pr install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ; install:: $(addprefix generic/profile/,$(PROFILE_FILES)) @@ -95,7 +95,7 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -103,16 +103,17 @@ +@@ -108,16 +108,17 @@ locale/browser-region/region.properties (%chrome/browser-region/region.properties) # the following files are browser-specific overrides * locale/browser/netError.dtd (%chrome/overrides/netError.dtd) @@ -108,8 +108,8 @@ % locale testpilot @AB_CD@ %locale/feedback/ locale/feedback/main.dtd (%feedback/main.dtd) locale/feedback/main.properties (%feedback/main.properties) + % locale pdf.js @AB_CD@ %locale/pdfviewer/ + locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) + locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties) #ifdef MOZ_WEBAPP_RUNTIME % locale webapprt @AB_CD@ %locale/webapprt/ - locale/webapprt/webapp.dtd (%webapprt/webapp.dtd) - locale/webapprt/webapp.properties (%webapprt/webapp.properties) - #endif ++++++ l10n-14.0.1.tar.bz2 -> l10n-15.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-14.0.1.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-15.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-crashreporter-restart-args.patch ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -1,12 +1,12 @@ # HG changeset patch # User Wolfgang Rosenauer <wr(a)rosenauer.org> -# Parent 0373328cfcb6ad3995f53598e974d61252ddebf4 +# Parent 07bb4ecfd6d6cc16360e7a32ee10b885d523f20d Bug 762780 - crashreporter restart command should support MOZ_APP_LAUNCHER diff --git a/toolkit/crashreporter/nsExceptionHandler.cpp b/toolkit/crashreporter/nsExceptionHandler.cpp --- a/toolkit/crashreporter/nsExceptionHandler.cpp +++ b/toolkit/crashreporter/nsExceptionHandler.cpp -@@ -1353,32 +1353,25 @@ nsresult +@@ -1360,32 +1360,25 @@ nsresult SetRestartArgs(int argc, char** argv) { if (!gExceptionHandler) ++++++ mozilla-gstreamer.patch ++++++ # HG changeset patch # Parent a9a49c20c491011f981b6c110aadfa6a01a1431e # User Wolfgang Rosenauer <wr(a)rosenauer.org> Bug 761030 - Crash with HTML 5 video with gstreamer enabled (TM: 16) No Bug - use GStreamer _only_ for MP4 (not WebM/OGG) diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp --- a/content/html/content/src/nsHTMLMediaElement.cpp +++ b/content/html/content/src/nsHTMLMediaElement.cpp @@ -2278,21 +2278,17 @@ nsHTMLMediaElement::CreateDecoder(const nsRefPtr<nsRawDecoder> decoder = new nsRawDecoder(); if (decoder->Init(this)) { return decoder.forget(); } } #endif #ifdef MOZ_OGG if (IsOggType(aType)) { -#ifdef MOZ_GSTREAMER - nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); -#else nsRefPtr<nsOggDecoder> decoder = new nsOggDecoder(); -#endif if (decoder->Init(this)) { return decoder.forget(); } } #endif #ifdef MOZ_WAVE if (IsWaveType(aType)) { nsRefPtr<nsWaveDecoder> decoder = new nsWaveDecoder(); @@ -2306,21 +2302,17 @@ nsHTMLMediaElement::CreateDecoder(const nsRefPtr<nsMediaPluginDecoder> decoder = new nsMediaPluginDecoder(aType); if (decoder->Init(this)) { return decoder.forget(); } } #endif #ifdef MOZ_WEBM if (IsWebMType(aType)) { -#ifdef MOZ_GSTREAMER - nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); -#else nsRefPtr<nsWebMDecoder> decoder = new nsWebMDecoder(); -#endif if (decoder->Init(this)) { return decoder.forget(); } } #endif #ifdef MOZ_GSTREAMER if (IsH264Type(aType)) { diff --git a/content/media/gstreamer/nsGStreamerReader.cpp b/content/media/gstreamer/nsGStreamerReader.cpp --- a/content/media/gstreamer/nsGStreamerReader.cpp +++ b/content/media/gstreamer/nsGStreamerReader.cpp @@ -447,16 +447,18 @@ bool nsGStreamerReader::DecodeVideoFrame for(int i = 0; i < 3; i++) { b.mPlanes[i].mData = data + gst_video_format_get_component_offset(format, i, width, height); b.mPlanes[i].mStride = gst_video_format_get_row_stride(format, i, width); b.mPlanes[i].mHeight = gst_video_format_get_component_height(format, i, height); b.mPlanes[i].mWidth = gst_video_format_get_component_width(format, i, width); + b.mPlanes[i].mOffset = 0; + b.mPlanes[i].mSkip = 0; } bool isKeyframe = !GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT); /* XXX ? */ PRInt64 offset = 0; VideoData *video = VideoData::Create(mInfo, mDecoder->GetImageContainer(), ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in --- a/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in -@@ -77,14 +77,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas +@@ -45,14 +45,16 @@ GREPREF_FILES = $(topsrcdir)/netwerk/bas # Optimizer bug with GCC 3.2.2 on OS/2 ifeq ($(OS_ARCH), OS2) nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp @@ -27,7 +27,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp --- a/modules/libpref/src/Preferences.cpp +++ b/modules/libpref/src/Preferences.cpp -@@ -57,16 +57,17 @@ +@@ -23,16 +23,17 @@ #include "nsIStringEnumerator.h" #include "nsIZipReader.h" #include "nsPrefBranch.h" @@ -45,7 +45,7 @@ #include "prefapi.h" #include "prefread.h" #include "prefapi_private_data.h" -@@ -941,16 +942,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -907,16 +908,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char static nsresult pref_LoadPrefsInDirList(const char *listId) { @@ -80,7 +80,7 @@ return NS_OK; bool hasMore; -@@ -966,17 +985,17 @@ static nsresult pref_LoadPrefsInDirList( +@@ -932,17 +951,17 @@ static nsresult pref_LoadPrefsInDirList( nsCAutoString leaf; path->GetNativeLeafName(leaf); @@ -99,7 +99,7 @@ { nsZipItemPtr<char> manifest(jarReader, name, true); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); -@@ -1070,28 +1089,40 @@ static nsresult pref_InitInitialObjects( +@@ -1036,28 +1055,40 @@ static nsresult pref_InitInitialObjects( /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ static const char* specialFiles[] = { #if defined(XP_MACOSX) @@ -143,8 +143,7 @@ diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in --- a/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/Makefile.in -@@ -73,8 +73,11 @@ EXTRA_COMPONENTS = \ - nsDownloadManagerUI.js \ +@@ -41,9 +41,12 @@ EXTRA_COMPONENTS = \ nsDownloadManagerUI.manifest \ $(NULL) endif @@ -152,13 +151,15 @@ TEST_DIRS += test include $(topsrcdir)/config/rules.mk -+ + +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre + ++ + CXXFLAGS += $(TK_CFLAGS) diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp --- a/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp -@@ -74,16 +74,20 @@ +@@ -35,16 +35,20 @@ #ifdef XP_WIN #include <shlobj.h> @@ -179,7 +180,7 @@ #include "AndroidBridge.h" #endif -@@ -2259,16 +2263,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2236,16 +2240,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -205,7 +206,7 @@ PRInt64 goat = PR_Now() - mStartTime; showTaskbarAlert = goat > alertIntervalUSec; -@@ -2292,19 +2305,20 @@ nsDownload::SetState(DownloadState aStat +@@ -2269,19 +2282,20 @@ nsDownload::SetState(DownloadState aStat // If downloads are automatically removed per the user's // retention policy, there's no reason to make the text clickable // because if it is, they'll click open the download manager and @@ -220,7 +221,7 @@ } + } - #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) + #if defined(XP_WIN) || defined(XP_MACOSX) || defined(MOZ_WIDGET_ANDROID) || defined(MOZ_WIDGET_GTK2) nsCOMPtr<nsIFileURL> fileURL = do_QueryInterface(mTarget); nsCOMPtr<nsIFile> file; nsAutoString path; @@ -230,7 +231,7 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -44,29 +44,33 @@ toolkit.jar: +@@ -45,29 +45,33 @@ toolkit.jar: *+ content/global/viewZoomOverlay.js (viewZoomOverlay.js) *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) *+ content/global/bindings/browser.xml (widgets/browser.xml) @@ -268,8 +269,12 @@ new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/dialog-kde.xml -@@ -0,0 +1,447 @@ +@@ -0,0 +1,451 @@ +<?xml version="1.0"?> ++ ++ + +<bindings id="dialogBindings" + xmlns="http://www.mozilla.org/xbl" @@ -300,7 +305,7 @@ + pack="end"> + <xul:button dlgtype="help" class="dialog-button" hidden="true"/> + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> -+ <xul:spacer anonid="spacer" flex="1" hidden="true"/> ++ <xul:spacer anonid="spacer" flex="1"/> + <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/> + <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> + <xul:button dlgtype="cancel" class="dialog-button"/> @@ -720,7 +725,7 @@ new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/preferences-kde.xml -@@ -0,0 +1,1373 @@ +@@ -0,0 +1,1339 @@ +<?xml version="1.0"?> + +<!DOCTYPE bindings [ @@ -1307,8 +1312,8 @@ + <xul:button dlgtype="accept" class="dialog-button" icon="accept"/> +#elif XP_UNIX + pack="end"> -+ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/> -+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> ++ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/> ++ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> + <xul:spacer anonid="spacer" flex="1"/> + <xul:button dlgtype="accept" class="dialog-button" icon="accept"/> + <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> @@ -1985,9 +1990,9 @@ + <handlers> + <handler event="command"> + // This "command" event handler tracks changes made to preferences by -+ // the user in this window. -+ if (event.sourceEvent) -+ event = event.sourceEvent; ++ // the user in this window. ++ if (event.sourceEvent) ++ event = event.sourceEvent; + this.userChangedValue(event.target); + </handler> + <handler event="select"> @@ -2046,43 +2051,9 @@ +</bindings> + +# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -+# ***** 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 the Preferences System. -+# -+# The Initial Developer of the Original Code is -+# Ben Goodger. -+# Portions created by the Initial Developer are Copyright (C) 2005 -+# the Initial Developer. All Rights Reserved. -+# -+# Contributor(s): -+# Ben Goodger <ben(a)mozilla.org> -+# Josh Aas <josh(a)mozilla.com> -+# -+# 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 ***** ++# 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/. + +# +# This is PrefWindow 6. The Code Could Well Be Ready, Are You? @@ -2097,7 +2068,7 @@ 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 -@@ -46,16 +46,18 @@ +@@ -12,16 +12,18 @@ #include "nsArrayUtils.h" #include "prnetdb.h" #include "prenv.h" @@ -2116,7 +2087,7 @@ nsUnixSystemProxySettings() {} nsresult Init(); -@@ -67,16 +69,17 @@ private: +@@ -33,16 +35,17 @@ private: nsCOMPtr<nsIGSettingsService> mGSettings; nsCOMPtr<nsIGSettingsCollection> mProxySettings; nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings; @@ -2134,7 +2105,7 @@ nsUnixSystemProxySettings::Init() { // If this is a GNOME session, load gconf and try to use its preferences. -@@ -529,16 +532,19 @@ nsUnixSystemProxySettings::GetProxyForUR +@@ -495,16 +498,19 @@ nsUnixSystemProxySettings::GetProxyForUR nsCAutoString host; rv = aURI->GetHost(host); NS_ENSURE_SUCCESS(rv, rv); @@ -2154,7 +2125,7 @@ if (mGConf) return GetProxyFromGConf(scheme, host, port, aResult); -@@ -564,8 +570,34 @@ static const mozilla::Module::ContractID +@@ -530,8 +536,34 @@ static const mozilla::Module::ContractID static const mozilla::Module kUnixProxyModule = { mozilla::Module::kVersion, @@ -2192,7 +2163,7 @@ diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in -@@ -100,17 +100,18 @@ else +@@ -69,17 +69,18 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CMMSRCS = nsNativeAppSupportCocoa.mm EXPORTS += MacQuirks.h @@ -2679,7 +2650,7 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in -@@ -90,18 +90,19 @@ LOCAL_INCLUDES = -I$(srcdir) +@@ -58,18 +58,19 @@ LOCAL_INCLUDES = -I$(srcdir) LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ipc \ -I$(topsrcdir)/content/base/src \ @@ -3047,7 +3018,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp -@@ -50,30 +50,33 @@ +@@ -16,30 +16,33 @@ #include <QString> #if (MOZ_ENABLE_CONTENTACTION) #include <contentaction/contentaction.h> @@ -3083,7 +3054,7 @@ nsCAutoString spec; aURI->GetAsciiSpec(spec); if (hildon_uri_open(spec.get(), action, nsnull)) -@@ -95,22 +98,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * +@@ -61,22 +64,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * return rv; } @@ -3108,7 +3079,7 @@ if (*_retval) return NS_OK; -@@ -153,16 +156,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns +@@ -119,16 +122,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get())); if (action.isValid()) { action.trigger(); @@ -3142,7 +3113,7 @@ nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr<nsIURI> uri; -@@ -180,17 +200,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns +@@ -146,17 +166,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns /* Fallback to GnomeVFS */ nsCOMPtr<nsIGnomeVFSMimeApp> app; if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app) @@ -3164,7 +3135,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp --- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp +++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp -@@ -44,17 +44,17 @@ +@@ -10,17 +10,17 @@ #if defined(MOZ_ENABLE_CONTENTACTION) #include <contentaction/contentaction.h> #include <QString> @@ -3183,7 +3154,7 @@ #include "nsXPIDLString.h" #include "nsIURL.h" #include "nsIFileStreams.h" -@@ -1191,29 +1191,29 @@ nsresult nsOSHelperAppService::OSProtoco +@@ -1157,29 +1157,29 @@ nsresult nsOSHelperAppService::OSProtoco ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':'); if (action.isValid()) @@ -3215,7 +3186,7 @@ nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile) { -@@ -1299,17 +1299,17 @@ nsOSHelperAppService::GetFromExtension(c +@@ -1265,17 +1265,17 @@ nsOSHelperAppService::GetFromExtension(c minorType, mime_types_description, true); @@ -3234,7 +3205,7 @@ rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), majorType, -@@ -1425,17 +1425,17 @@ nsOSHelperAppService::GetFromType(const +@@ -1391,17 +1391,17 @@ nsOSHelperAppService::GetFromType(const #ifdef MOZ_WIDGET_GTK2 nsMIMEInfoBase *gnomeInfo = nsnull; if (handler.IsEmpty()) { @@ -3256,7 +3227,7 @@ diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in --- a/widget/gtk2/Makefile.in +++ b/widget/gtk2/Makefile.in -@@ -135,11 +135,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' +@@ -104,11 +104,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' INCLUDES += \ -I$(srcdir)/../xpwidgets \ @@ -3274,11 +3245,11 @@ diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp --- a/widget/gtk2/nsFilePicker.cpp +++ b/widget/gtk2/nsFilePicker.cpp -@@ -33,16 +33,17 @@ - * 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 ***** */ +@@ -1,16 +1,17 @@ + /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ + /* 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/. */ #include "mozilla/Util.h" @@ -3292,7 +3263,7 @@ #include "nsIStringBundle.h" #include "nsArrayEnumerator.h" -@@ -51,16 +52,17 @@ +@@ -19,16 +20,17 @@ #include "nsNetUtil.h" #include "nsReadableUtils.h" #include "mozcontainer.h" @@ -3310,7 +3281,7 @@ using namespace mozilla; #define MAX_PREVIEW_SIZE 180 -@@ -285,17 +287,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil +@@ -253,17 +255,19 @@ nsFilePicker::AppendFilters(PRInt32 aFil return nsBaseFilePicker::AppendFilters(aFilterMask); } @@ -3331,7 +3302,7 @@ mFilters.AppendElement(filter); mFilterNames.AppendElement(name); -@@ -390,16 +394,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat +@@ -358,16 +362,19 @@ nsFilePicker::GetFiles(nsISimpleEnumerat return NS_ERROR_FAILURE; } @@ -3351,7 +3322,7 @@ GtkFileChooserAction action = GetGtkFileChooserAction(mMode); const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE) ? GTK_STOCK_SAVE : GTK_STOCK_OPEN; -@@ -538,8 +545,234 @@ nsFilePicker::Show(PRInt16 *aReturn) +@@ -506,8 +513,234 @@ nsFilePicker::Show(PRInt16 *aReturn) *aReturn = nsIFilePicker::returnCancel; break; } @@ -3589,7 +3560,7 @@ diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h --- a/widget/gtk2/nsFilePicker.h +++ b/widget/gtk2/nsFilePicker.h -@@ -89,11 +89,17 @@ protected: +@@ -57,11 +57,17 @@ protected: nsString mDefault; nsString mDefaultExtension; @@ -3610,7 +3581,7 @@ diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in --- a/xpcom/components/Makefile.in +++ b/xpcom/components/Makefile.in -@@ -91,10 +91,11 @@ LOCAL_INCLUDES = \ +@@ -59,10 +59,11 @@ LOCAL_INCLUDES = \ # we don't want the shared lib, but we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 @@ -3625,7 +3596,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp --- a/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp -@@ -63,16 +63,17 @@ +@@ -30,16 +30,17 @@ #include "nsTextFormatter.h" #include "nsVersionComparator.h" #include "nsXPCOMCIDInternal.h" @@ -3643,7 +3614,7 @@ const char* directive; int argc; -@@ -430,16 +431,17 @@ ParseManifest(NSLocationType type, FileL +@@ -397,16 +398,17 @@ ParseManifest(NSLocationType type, FileL NS_NAMED_LITERAL_STRING(kPlatform, "platform"); NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible"); NS_NAMED_LITERAL_STRING(kApplication, "application"); @@ -3661,7 +3632,7 @@ NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers"); nsAutoString appID; -@@ -477,41 +479,46 @@ ParseManifest(NSLocationType type, FileL +@@ -444,41 +446,46 @@ ParseManifest(NSLocationType type, FileL CopyUTF8toUTF16(s, abi); abi.Insert(PRUnichar('_'), 0); abi.Insert(osTarget, 0); @@ -3708,7 +3679,7 @@ char *token; char *newline = buf; -@@ -593,24 +600,26 @@ ParseManifest(NSLocationType type, FileL +@@ -560,24 +567,26 @@ ParseManifest(NSLocationType type, FileL TriState stOsVersion = eUnspecified; TriState stOs = eUnspecified; TriState stABI = eUnspecified; @@ -3735,7 +3706,7 @@ #if defined(MOZ_WIDGET_ANDROID) bool tablet = false; if (CheckFlag(kTablet, wtoken, tablet)) { -@@ -639,16 +648,17 @@ ParseManifest(NSLocationType type, FileL +@@ -606,16 +615,17 @@ ParseManifest(NSLocationType type, FileL } if (!ok || @@ -3756,7 +3727,7 @@ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in -@@ -189,17 +189,17 @@ include $(topsrcdir)/ipc/chromium/chromi +@@ -157,17 +157,17 @@ include $(topsrcdir)/ipc/chromium/chromi DEFINES += -D_IMPL_NS_COM ifeq ($(OS_ARCH),Linux) @@ -3778,7 +3749,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp --- a/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp -@@ -90,16 +90,17 @@ +@@ -48,16 +48,17 @@ #include "prproces.h" #include "nsIDirectoryEnumerator.h" #include "nsISimpleEnumerator.h" @@ -3796,7 +3767,7 @@ #include "prmem.h" #include "plbase64.h" -@@ -1798,44 +1799,51 @@ nsLocalFile::SetPersistentDescriptor(con +@@ -1763,44 +1764,51 @@ nsLocalFile::SetPersistentDescriptor(con return InitWithNativePath(aPersistentDescriptor); #endif } @@ -3862,7 +3833,7 @@ return rv; } return NS_ERROR_FAILURE; -@@ -1861,16 +1869,23 @@ nsLocalFile::Launch() +@@ -1826,16 +1834,23 @@ nsLocalFile::Launch() if (nsnull == connection) return NS_ERROR_FAILURE; ++++++ mozilla-ppc.patch ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 67e6f1e1d06ca3d54cea1d26877c2a68f0c096e5 +# Parent 0f6722dd9d75458124795d22e9240887c9b4aeca # 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 @@ -93,23 +93,22 @@ 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 -@@ -49,17 +49,18 @@ - // evaluate: 89255.0/1e22. If the floating-point stack is 64 bits wide then +@@ -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(_MIPS_ARCH_MIPS32R2) -+ defined(_MIPS_ARCH_MIPS32R2) || \ -+ defined(__powerpc__) || defined(__powerpc64__) + 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__) + #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 - #else - #undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS - #endif // _WIN32 ++++++ mozilla-repo.patch ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent d50497c25f208e4868a386f081edc790a505795c +# Parent c9af3b8022c3f92070c1bd205553d799887cd1b8 diff --git a/build/Makefile.in b/build/Makefile.in --- a/build/Makefile.in +++ b/build/Makefile.in -@@ -95,17 +95,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ +@@ -62,17 +62,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ APP_INI_DEPS += $(DEPTH)/config/autoconf.mk MOZ_SOURCE_STAMP := $(firstword $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg parent --template="{node|short}\n" 2>/dev/null)) @@ -26,7 +26,7 @@ diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in --- a/toolkit/content/Makefile.in +++ b/toolkit/content/Makefile.in -@@ -67,17 +67,17 @@ endif +@@ -35,17 +35,17 @@ endif ifeq (Android,$(OS_TARGET)) DEFINES += -DANDROID_PACKAGE_NAME=$(ANDROID_PACKAGE_NAME) endif @@ -48,7 +48,7 @@ diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk -@@ -162,20 +162,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME +@@ -128,20 +128,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME TEST_PACKAGE = $(PKG_BASENAME).tests.zip ifneq (,$(wildcard $(DIST)/bin/application.ini)) @@ -74,7 +74,7 @@ diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in -@@ -240,20 +240,20 @@ endif +@@ -220,20 +220,20 @@ endif MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) ifdef MOZ_SOURCE_STAMP @@ -91,11 +91,11 @@ + SOURCE_REPO ?= $(strip $(SOURCE_REPO)) + SOURCE_REPO ?= $(patsubst ssh://%,http://%,$(SOURCE_REPO)) + SOURCE_REPO ?= $(patsubst %/,%,$(SOURCE_REPO)) - $(call errorIfEmpty,SOURCE_REPO) + + # command set should change based on revision control use. + # warn for now in case (git, bzr, ...) is in use. + $(call warnIfEmpty,SOURCE_REPO) # extra sanity check for old versions of hg, no showconfig support ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) INIARGS += --sourcerepo=$(SOURCE_REPO) - endif - - endif # MOZ_SOURCE_STAMP ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -590,16 +590,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO +@@ -573,16 +573,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ @@ -31,7 +31,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8180,16 +8180,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8270,16 +8270,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -66,7 +66,7 @@ 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 -@@ -119,12 +119,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS) +@@ -86,12 +86,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS) DEFINES += \ -DNSS_ENABLE_ECC \ -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ @@ -85,14 +85,12 @@ 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 -@@ -39,16 +39,23 @@ - * 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. +@@ -1,14 +1,21 @@ + /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- * - * ***** END LICENSE BLOCK ***** */ + * 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_ENABLE_NSSHELPER +#pragma GCC visibility push(default) @@ -109,7 +107,7 @@ #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" #include "nsDirectoryService.h" -@@ -1776,18 +1783,34 @@ nsNSSComponent::InitializeNSS(bool showW +@@ -1738,18 +1745,34 @@ nsNSSComponent::InitializeNSS(bool showW ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs @@ -149,7 +147,7 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -439,17 +439,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO +@@ -446,17 +446,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO endif endif endif ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.PQRZoj/_old 2012-08-31 09:45:31.000000000 +0200 +++ /var/tmp/diff_new_pack.PQRZoj/_new 2012-08-31 09:45:31.000000000 +0200 @@ -1,2 +1,2 @@ -REV=e5728a4e106c +REV=450143d2d810 REPO=http://hg.mozilla.org/releases/mozilla-release -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit moneyplex for openSUSE:Factory:NonFree
by root＠hilbert.suse.de 31 Aug '12

31 Aug '12

Hello community, here is the log from the commit of package moneyplex for openSUSE:Factory:NonFree checked in at 2012-08-31 09:44:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory:NonFree/moneyplex (Old) and /work/SRC/openSUSE:Factory:NonFree/.moneyplex.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "moneyplex", Maintainer is "coolo(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory:NonFree/moneyplex/moneyplex.changes 2012-08-28 20:50:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory:NonFree/.moneyplex.new/moneyplex.changes 2012-08-31 09:44:17.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Aug 28 13:48:08 UTC 2012 - cfarrell(a)suse.com + +- license update: SUSE-NonFree + Use a license from the spreadsheet linked at license.opensuse.org + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ moneyplex.spec ++++++ --- /var/tmp/diff_new_pack.xKcXMR/_old 2012-08-31 09:44:19.000000000 +0200 +++ /var/tmp/diff_new_pack.xKcXMR/_new 2012-08-31 09:44:19.000000000 +0200 @@ -20,7 +20,7 @@ Version: 12.0.20869 Release: 0 Summary: moneyplex openSUSE Edition -License: NON-OSI-COMPLIANT(royalties) +License: SUSE-NonFree Group: Productivity/Office/Finance ExclusiveArch: %ix86 x86_64 BuildRequires: update-desktop-files -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit man-pages for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '12

31 Aug '12

Hello community, here is the log from the commit of package man-pages for openSUSE:Factory checked in at 2012-08-31 09:43:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/man-pages (Old) and /work/SRC/openSUSE:Factory/.man-pages.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "man-pages", Maintainer is "PGajdos(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/man-pages/man-pages.changes 2012-05-31 17:07:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.man-pages.new/man-pages.changes 2012-08-31 09:44:00.000000000 +0200 @@ -1,0 +2,279 @@ +Mon Aug 27 09:10:27 CEST 2012 - pgajdos(a)suse.cz + +- update to version 3.42 + * Global changes + * Various pages + Global fix: use UR macro where applicable + The syntax .UR http://example.com paired with .UE will create + links which one can interact, if the pager allows that. One + way to see the effect is ask the man(1) command to use browser + display, e.g.: + man -H man7/uri.7 + ("\:" is optional groff syntax to permit hyphenless line breaks.) + * Changes to individual pages + ldd.1 + Add security note on untrusted executables + See also http://www.catonmat.net/blog/ldd-arbitrary-code-execution/ + and + http://tldp.org/HOWTO/Program-Library-HOWTO/shared-libraries.html + clone.2 + Rewrite discussion of sys_clone + futex.2 + Consolidate error descriptions to ERRORS + Various wording fix-ups + Fix description of EINVAL error + The current text seems incorrect. Replace with a more general + description. + getdents.2 + select_tut.2 + atof.3 + atoi.3 + pthread_create.3 + pthread_sigmask.3 + rtime.3 + setbuf.3 + tsearch.3 + netlink.7 + Remove unneeded casts + get_robust_list.2 + get_thread_area.2 + getcpu.2 + getdents.2 + gettid.2 + io_cancel.2 + io_destroy.2 + io_getevents.2 + io_setup.2 + io_submit.2 + ioprio_set.2 + kexec_load.2 + llseek.2 + modify_ldt.2 + mq_getsetattr.2 + pivot_root.2 + readdir.2 + rt_sigqueueinfo.2 + set_thread_area.2 + sgetmask.2 + spu_create.2 + spu_run.2 + subpage_prot.2 + sysctl.2 + tkill.2 + Add note to SYNOPSIS that there is no glibc wrapper for system call + Reduce the chance that the reader may be misled into thinking + that there is a wrapper function for this system call by noting + explicitly in the SYNOPSIS that there is no glibc wrapper and + pointing the reader to NOTES for further details. + ioprio_set.2 + Clarify the multithreaded behavior of ioprio_set(2) + Document who==0 for IOPRIO_WHO_PROCESS and IOPRIO_WHO_PGRP + For IOPRIO_WHO_PROCESS, who==0 means operate on the caller. + For IOPRIO_WHO_PGRP, who==0 means operate on the caller's + process group. + See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=652443 + migrate_pages.2 + Fix description of return value + mount.2 + For MS_REMOUNT, source is ignored + mprotect.2 + 'addr' argument is not const + As reported by Rasmus: + Both my system's man-pages (3.22) and the latest online + (3.41) show: + int mprotect(const void *addr, size_t len, int prot); + as the prototype for mprotect(2). However, POSIX [1] and the + actual sys/mman.h (on all the systems I checked) do not have + the const qualifier on the first argument. + msgctl.2 + semctl.2 + shmctl.2 + svipc.7 + Don't mention that ipc_perm is defined in <sys/ipc.h> + There's no need to mention that the 'ipc_perm' structure + is defined in <sys/ipc.h>. That's an implementation detail, + and furthermore <sys/ipc.h> is itself included by the other + System V IPC header files. The current text might lead the + reader to conclude that they must include <sys/ipc.h>, which + is not the case (it is required neither on Linux, nor by the + standards). + msgctl.2 + msgget.2 + msgop.2 + semctl.2 + semget.2 + semop.2 + shmctl.2 + shmget.2 + NOTES: <sys/types.h> and <sys/ipc.h> aren't strictly needed + Add text to NOTES to say that the <sys/types.h> and <sys/ipc.h> + header files aren't required by Linux or the standards, but may + be needed for portability to old systems. + ptrace.2 + Explain WNOHANG behavior and EINTR bug + I didn't like ithe "SIGKILL operates similarly, with exceptions" + phrase (if it's different, then it's not "similar", right?), + and now I got around to changing it. Now it says simply: + "SIGKILL does not generate signal-delivery-stop and therefore + the tracer can't suppress it." + Replaced "why WNOHANG is not reliable" example with a more + realistic one (the one which actually inspired to add this + information to man page in the first place): we got + ESRCH - process is gone! - but waitpid(WNOHANG) can still + confusingly return 0 "no processes to wait for". + Replaced "This means that unneeded trailing arguments may + be omitted" part with a much better recommendation + to never do that and to supply zero arguments instead. + (The part about "undocumentedness" of gcc behavior was bogus, + btw - deleted). + Expanded BUGS section with the explanation and an example + of visible strace behavior on the buggy syscalls which + exit with EINTR on ptrace attach. I hope this will lead + to people submitting better bug reports to lkml about + such syscalls. + seteuid.2 + Note glibc version where setegid() implementation changed + In glibc 2.2/2.3, setegid() switched from setregid() to setresgid(). + set_tid_address.2 + Rename 'ctid' argument for consistency with clone(2) page + Some rewordings and minor clarifications + sigwaitinfo.2 + Some wording clarifications + Mainly rewording things like "is delivered" to "becomes pending", + which is more accurate terminology. + syscall.2 + Add some more details to the description of syscall(2) + And add another example of using syscall() to the program example. + syscalls.2 + Add kcmp(2) + Move discussion of set_zone_reclaim(2) out of main table + This system call was never visible to user space, so it makes + sense to move it out of the main table of system calls into + the notes below the table. + getifaddrs.3 + Note that ifa_addr and ifa_netmask can be NULL + readdir.3 + Handle -1 error from pathconf() in example code snippet + Improve the example demonstrating allocation of a buffer + for readdir_r() to handle -1 error return from pathconf(). + Otherwise, naive readers may think that pathconf() return + value can be used without checking. + realpath.3 + Use past tense with ancient history (libc4, libc5) + regex.3 + Correct SEE ALSO reference to glibc manual "regex" section + rtime.3 + Fix broken pointer cast in example code + sem_close.3 + sem_destroy.3 + sem_getvalue.3 + sem_init.3 + sem_open.3 + sem_post.3 + sem_unlink.3 + sem_wait.3 + sem_overview.7 + Note that "cc -pthread" is required; "-lrt" no longer works + See https://bugs.launchpad.net/ubuntu/+source/manpages/+bug/874418 + sigwait.3 + Reword "is delivered" to "becomes pending" + strcat.3 + Add some text to emphasize the dangers of buffer overruns + NOTES: Add discussion of strlcat() + strcpy.3 + Note that info is lost when strncpy() doesn't null terminate + Add some text to emphasize possibility of buffer runs with strcpy() + NOTES: Add a discussion of strlcpy() + Inspired by https://lwn.net/Articles/506530/ + Fix description of the null-byte padding performed by strncpy() + tsearch.3 + NOTES: remove redundant discussion of unorthodox use of term "postorder" + This point is already covered at greater length in the main + text of the page (See the piece "More commonly, ..."). + Clarify use for first argument to the twalk() 'action' function + There's a number of details in POSIX that are omitted in + the current version of this page. + Some wording fixes + core.5 ++++ 82 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/man-pages/man-pages.changes ++++ and /work/SRC/openSUSE:Factory/.man-pages.new/man-pages.changes Old: ---- man-pages-3.41.tar.bz2 New: ---- man-pages-3.42.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man-pages.spec ++++++ --- /var/tmp/diff_new_pack.5fHWRg/_old 2012-08-31 09:44:02.000000000 +0200 +++ /var/tmp/diff_new_pack.5fHWRg/_new 2012-08-31 09:44:02.000000000 +0200 @@ -16,11 +16,10 @@ # - Name: man-pages BuildRequires: fdupes Url: http://www.kernel.org/doc/man-pages/download.html -Version: 3.41 +Version: 3.42 Release: 0 Summary: Linux Manual Pages License: BSD-3-Clause and GPL-2.0+ and MIT ++++++ man-pages-3.41.tar.bz2 -> man-pages-3.42.tar.bz2 ++++++ ++++ 17264 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit make for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '12

31 Aug '12

Hello community, here is the log from the commit of package make for openSUSE:Factory checked in at 2012-08-31 09:42:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/make (Old) and /work/SRC/openSUSE:Factory/.make.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "make", Maintainer is "MHopf(a)novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/make/make.changes 2012-04-17 22:00:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.make.new/make.changes 2012-08-31 09:42:15.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Aug 8 13:33:19 UTC 2012 - dimstar(a)opensuse.org + +- Add make-arglength.patch: fix the argument list limit of GNU make +- Add make-parallel-build.patch: Fix parallel build issues present + in GNU make 3.82 +- Both patches taken from http://trac.webkit.org/browser/trunk/Tools/gtk/patches/ + are known by upstream and are mandatory to be able to build + libwebkit 1.9.6+. + +------------------------------------------------------------------- New: ---- make-arglength.patch make-parallel-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ make.spec ++++++ --- /var/tmp/diff_new_pack.SV17Zh/_old 2012-08-31 09:42:17.000000000 +0200 +++ /var/tmp/diff_new_pack.SV17Zh/_new 2012-08-31 09:42:17.000000000 +0200 @@ -32,6 +32,10 @@ Patch5: make-savannah-bug30612-handling_of_archives.diff Patch6: make-fix_whitespace_tokenization.diff Patch7: make-glob-faster.patch +# PATCH-FIX-UPSTREAM make-arglength.patch dimstar(a)opensuse.org -- http://article.gmane.org/gmane.comp.gnu.make.bugs/4219 +Patch8: make-arglength.patch +# PATCH-FIX-UPSTREAM make-parallel-build.patch dmistar(a)opensuse.org -- http://savannah.gnu.org/bugs/?30653 +Patch9: make-parallel-build.patch Patch64: make-library-search-path.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,6 +50,8 @@ %patch5 %patch6 -p1 %patch7 -p0 +%patch8 -p1 +%patch9 -p1 if [ %_lib == lib64 ]; then %patch64 fi ++++++ make-arglength.patch ++++++ diff -u make-3.82-orig/configure.in make-3.82/configure.in --- make-3.82-orig/configure.in 2010-07-28 07:39:50.000000000 +0200 +++ make-3.82/configure.in 2012-03-21 12:34:20.000000000 +0100 @@ -64,7 +64,8 @@ AC_HEADER_STAT AC_HEADER_TIME AC_CHECK_HEADERS(stdlib.h locale.h unistd.h limits.h fcntl.h string.h \ - memory.h sys/param.h sys/resource.h sys/time.h sys/timeb.h) + memory.h sys/param.h sys/resource.h sys/time.h sys/timeb.h \ + sys/user.h linux/binfmts.h) # Set a flag if we have an ANSI C compiler if test "$ac_cv_prog_cc_stdc" != no; then Subdirectorios comunes: make-3.82-orig/doc y make-3.82/doc Subdirectorios comunes: make-3.82-orig/glob y make-3.82/glob diff -u make-3.82-orig/job.c make-3.82/job.c --- make-3.82-orig/job.c 2010-07-24 10:27:50.000000000 +0200 +++ make-3.82/job.c 2012-03-21 12:34:20.000000000 +0100 @@ -29,6 +29,11 @@ #include <string.h> +#if defined (HAVE_LINUX_BINFMTS_H) && defined (HAVE_SYS_USER_H) +#include <sys/user.h> +#include <linux/binfmts.h> +#endif + /* Default shell to use. */ #ifdef WINDOWS32 #include <windows.h> @@ -2795,6 +2800,7 @@ unsigned int sflags_len = strlen (shellflags); char *command_ptr = NULL; /* used for batch_mode_shell mode */ char *new_line; + char *args_ptr; # ifdef __EMX__ /* is this necessary? */ if (!unixy_shell) @@ -2865,8 +2871,17 @@ return new_argv; } +#ifdef MAX_ARG_STRLEN + static char eval_line[] = "eval\\ \\\"set\\ x\\;\\ shift\\;\\ "; +#define ARG_NUMBER_DIGITS 5 +#define EVAL_LEN (sizeof(eval_line)-1 + shell_len + 4 \ + + (7 + ARG_NUMBER_DIGITS) * 2 * line_len / (MAX_ARG_STRLEN - 2)) +#else +#define EVAL_LEN 0 +#endif + new_line = alloca (shell_len + 1 + sflags_len + 1 - + (line_len*2) + 1); + + (line_len*2) + 1 + EVAL_LEN); ap = new_line; memcpy (ap, shell, shell_len); ap += shell_len; @@ -2875,6 +2890,30 @@ ap += sflags_len; *(ap++) = ' '; command_ptr = ap; + +#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN) + if (unixy_shell && line_len > MAX_ARG_STRLEN) + { + unsigned j; + memcpy (ap, eval_line, sizeof (eval_line) - 1); + ap += sizeof (eval_line) - 1; + for (j = 1; j <= 2 * line_len / (MAX_ARG_STRLEN - 2); j++) + ap += sprintf (ap, "\\$\\{%u\\}", j); + *ap++ = '\\'; + *ap++ = '"'; + *ap++ = ' '; + /* Copy only the first word of SHELL to $0. */ + for (p = shell; *p != '\0'; ++p) + { + if (isspace ((unsigned char)*p)) + break; + *ap++ = *p; + } + *ap++ = ' '; + } +#endif + args_ptr = ap; + for (p = line; *p != '\0'; ++p) { if (restp != NULL && *p == '\n') @@ -2922,6 +2961,14 @@ } #endif *ap++ = *p; + +#if !defined (WINDOWS32) && defined (MAX_ARG_STRLEN) + if (unixy_shell && line_len > MAX_ARG_STRLEN && (ap - args_ptr > MAX_ARG_STRLEN - 2)) + { + *ap++ = ' '; + args_ptr = ap; + } +#endif } if (ap == new_line + shell_len + sflags_len + 2) /* Line was empty. */ ++++++ make-parallel-build.patch ++++++ diff -u make-3.82-orig/remake.c make-3.82/remake.c --- make-3.82-orig/remake.c 2010-07-13 03:20:42.000000000 +0200 +++ make-3.82/remake.c 2012-03-21 12:47:52.000000000 +0100 @@ -301,7 +301,7 @@ /* Check for the case where a target has been tried and failed but the diagnostics hasn't been issued. If we need the diagnostics then we will have to continue. */ - if (!(f->updated && f->update_status > 0 && !f->dontcare && f->no_diag)) + if (!(f->updated && f->update_status > 0 && !f->dontcare && f->no_diag) && f->command_state!=cs_not_started ) { DBF (DB_VERBOSE, _("Pruning file `%s'.\n")); return f->command_state == cs_finished ? f->update_status : 0; @@ -614,6 +614,12 @@ d->file->dontcare = file->dontcare; } + /* We may have already encountered this file earlier in the same + * pass before we knew we'd be updating this target. In that + * case calling update_file now would result in the file being + * inappropriately pruned so we toggle the considered bit back + * off first. */ + d->file->considered = !considered; dep_status |= update_file (d->file, depth); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lilv for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '12

31 Aug '12

Hello community, here is the log from the commit of package lilv for openSUSE:Factory checked in at 2012-08-31 09:40:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lilv (Old) and /work/SRC/openSUSE:Factory/.lilv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lilv", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/lilv/lilv.changes 2012-08-26 11:32:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lilv.new/lilv.changes 2012-08-31 09:40:46.000000000 +0200 @@ -1,0 +2,21 @@ +Sun Aug 26 23:11:36 UTC 2012 - reddwarf(a)opensuse.org + +- Update to 0.14.4 + * Deprecate old flawed Lilv::Instance constructors + * Fix documentation for ui_type parameter of lilv_ui_is_supported() + * Fix crash when lv2info is run with an invalid URI argument + * Gracefully handle failure to save plugin state and print error message + * Reduce memory usage (per node) + * Simpler node implementation always backed by a SordNode + * Make all 'zix' symbols private to avoid symbol clashes in static builds + * Add lv2bench utility + * Fix various hyper-strict warnings + * Do not require a C++ compiler to build + * Add option to build utilities as static binaries + * Upgrade to waf 1.7.2 + * lilvmm.hpp: Make Lilv::Instance handle features and failed instantiations + * lilvmm.hpp: Add Lilv::Instance::get_handle() + * lilvmm.hpp: Add Lilv::Instance::get_extension_data() +- Add lilv-0.14.4-build_compare.patch to make build reproducible + +------------------------------------------------------------------- Old: ---- lilv-0.14.2.tar.bz2 New: ---- lilv-0.14.4-build_compare.patch lilv-0.14.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lilv.spec ++++++ --- /var/tmp/diff_new_pack.I1nmbH/_old 2012-08-31 09:40:47.000000000 +0200 +++ /var/tmp/diff_new_pack.I1nmbH/_new 2012-08-31 09:40:47.000000000 +0200 @@ -19,13 +19,14 @@ %define soname 0 Name: lilv -Version: 0.14.2 +Version: 0.14.4 Release: 0 Summary: A C library to make the use of LV2 plugins as simple as possible License: ISC Group: System/Libraries Url: http://drobilla.net/software/lilv/ -Source0: http://download.drobilla.net/lilv-0.14.2.tar.bz2 +Source0: http://download.drobilla.net/lilv-%{version}.tar.bz2 +Patch0: lilv-0.14.4-build_compare.patch BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: graphviz @@ -64,6 +65,7 @@ %prep %setup -q +%patch0 %build export CFLAGS='%{optflags}' @@ -91,6 +93,7 @@ %files %defattr(0644,root,root,0755) %attr(0755,-,-) %{_bindir}/lilv-bench +%attr(0755,-,-) %{_bindir}/lv2bench %attr(0755,-,-) %{_bindir}/lv2info %attr(0755,-,-) %{_bindir}/lv2ls %{_mandir}/man1/lv2info.1* ++++++ lilv-0.14.4-build_compare.patch ++++++ Index: doc/reference.doxygen.in =================================================================== --- doc/reference.doxygen.in.orig +++ doc/reference.doxygen.in @@ -939,7 +939,7 @@ HTML_COLORSTYLE_GAMMA = 80 # page will contain the date and time when the page was generated. Setting # this to NO can help when comparing the output of multiple runs. -HTML_TIMESTAMP = YES +HTML_TIMESTAMP = NO # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the ++++++ lilv-0.14.2.tar.bz2 -> lilv-0.14.4.tar.bz2 ++++++ ++++ 3869 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libyui-bindings for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '12

31 Aug '12

Hello community, here is the log from the commit of package libyui-bindings for openSUSE:Factory checked in at 2012-08-31 09:39:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-bindings (Old) and /work/SRC/openSUSE:Factory/.libyui-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-bindings", Maintainer is "kkaempf(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-bindings/libyui-bindings.changes 2011-11-21 15:48:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-bindings.new/libyui-bindings.changes 2012-08-31 09:39:21.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Aug 13 07:33:17 UTC 2012 - cfarrell(a)suse.com + +- license update: GPL-2.0 + SPDX format (http://www.spdx.org/licenses) should be used for spec file + license field + +------------------------------------------------------------------- +Fri Aug 10 10:04:45 UTC 2012 - kkaempf(a)suse.com + +- Update to 1.0.0 for stand-alone libyui + +------------------------------------------------------------------- +Tue Jun 12 11:05:20 UTC 2012 - kkaempf(a)suse.com + +- Build stand-alone (without YaST) + +------------------------------------------------------------------- Old: ---- libyui-bindings-0.1.0.tar.bz2 New: ---- libyui-bindings-1.0.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-bindings.spec ++++++ --- /var/tmp/diff_new_pack.Y2vhW2/_old 2012-08-31 09:39:23.000000000 +0200 +++ /var/tmp/diff_new_pack.Y2vhW2/_new 2012-08-31 09:39:23.000000000 +0200 @@ -1,7 +1,11 @@ # -# spec file for package libyui-bindings (Version 0.1.0) +# spec file for package libyui-bindings +# generates: +# libyui-ruby +# libyui-python +# perl-libyui (Perl naming convention) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -14,34 +18,36 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - # nodebuginfo - Name: libyui-bindings -Version: 0.1.0 -Release: 5 -License: GPL-2.0+ -Summary: Ruby bindings for yast2-libyui -Group: Development/Libraries/Ruby +Version: 1.0.0 +Release: 0 +License: GPL-2.0 +Summary: Bindings for libyui +Group: Development/Sources +URL: https://github.com/libyui/libyui-bindings BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: cmake gcc-c++ perl python-devel ruby-devel swig -BuildRequires: yast2-libyui-devel >= 2.16 +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: libyui-devel >= 2.21.5 +BuildRequires: perl +BuildRequires: python-devel +BuildRequires: ruby-devel +BuildRequires: swig Source: %{name}-%{version}.tar.bz2 Prefix: /usr %description This package provides Ruby language bindings to access functions of -yast2-libyui - the YaST User Interface engine that provides the +libyui - An User Interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses). - - Authors: --------- - kkaempf(a)suse.de - dmacvicar(a)suse.de +--------- +- kkaempf(a)suse.de +- dmacvicar(a)suse.de %prep %setup -q @@ -57,6 +63,7 @@ -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=1 \ + -DBUILD_RUBY_GEM=no \ .. make %{?jobs:-j %jobs} @@ -68,65 +75,58 @@ %{__rm} -rf %{buildroot} %package -n ruby-yui -License: GPL-2.0+ -Summary: Ruby bindings for yast2-libyui -Group: Development/Libraries/Ruby +Summary: Ruby bindings for libyui +Group: Development/Languages/Ruby %description -n ruby-yui This package provides Ruby language bindings to access functions of -yast2-libyui - the YaST User Interface engine that provides the +libyui - An User Interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses). - - Authors: --------- - kkaempf(a)suse.de - dmacvicar(a)suse.de +--------- +- kkaempf(a)suse.de +- dmacvicar(a)suse.de %package -n python-yui -License: GPL-2.0+ %py_requires -Summary: Python bindings for yast2-libyui -Group: Development/Libraries/Python +Summary: Python bindings for libyui +Group: Development/Languages/Python %description -n python-yui This package provides Python language bindings to access functions of -yast2-libyui - the YaST User Interface engine that provides the +yast2-libyui - An User Interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses). - - Authors: --------- - kkaempf(a)suse.de - dmacvicar(a)suse.de +--------- +- kkaempf(a)suse.de +- dmacvicar(a)suse.de + %package -n perl-yui -License: GPL-2.0+ %{perl_requires} -Summary: Perl bindings for yast2-libyui -Group: Development/Libraries/Perl +Summary: Perl bindings for libyui +Group: Development/Languages/Perl %description -n perl-yui This package provides Perl language bindings to access functions of -yast2-libyui - the YaST User Interface engine that provides the +yast2-libyui - An User Interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses). - - Authors: --------- - kkaempf(a)suse.de - dmacvicar(a)suse.de +--------- +- kkaempf(a)suse.de +- dmacvicar(a)suse.de + %files -n ruby-yui %defattr(-,root,root,-) %doc swig/ruby/examples/*.rb -%{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/yui.so +%{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/_yui.so %files -n python-yui %defattr(-,root,root,-) ++++++ libyui-bindings-0.1.0.tar.bz2 -> libyui-bindings-1.0.0.tar.bz2 ++++++ ++++ 3118 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libplist for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '12

31 Aug '12

Hello community, here is the log from the commit of package libplist for openSUSE:Factory checked in at 2012-08-31 09:37:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libplist (Old) and /work/SRC/openSUSE:Factory/.libplist.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libplist", Maintainer is "StShaw(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libplist/libplist.changes 2012-04-18 16:29:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libplist.new/libplist.changes 2012-08-31 09:37:56.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Aug 28 15:52:14 UTC 2012 - cfarrell(a)suse.com + +- license update: LGPL-2.1+ + LGPL-2.1 can be relicensed to GPL without further permission. No need to + explicitly call out the GPL as a license option. Fedora has been using + LGPL-2.1+ for awhile so gain compatibility there too + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libplist.spec ++++++ --- /var/tmp/diff_new_pack.lTbjXj/_old 2012-08-31 09:37:57.000000000 +0200 +++ /var/tmp/diff_new_pack.lTbjXj/_new 2012-08-31 09:37:57.000000000 +0200 @@ -20,7 +20,7 @@ Version: 1.8 Release: 0 Summary: Library for handling Apple Binary and XML Property Lists -License: LGPL-2.1 or GPL-2.0 +License: LGPL-2.1+ Group: System/Libraries Url: http://cgit.sukimashita.com/libplist.git Source: %{name}-%{version}.tar.bz2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libpcap for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '12

31 Aug '12

Hello community, here is the log from the commit of package libpcap for openSUSE:Factory checked in at 2012-08-31 09:37:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libpcap (Old) and /work/SRC/openSUSE:Factory/.libpcap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libpcap", Maintainer is "VCizek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libpcap/libpcap.changes 2012-03-02 13:48:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libpcap.new/libpcap.changes 2012-08-31 09:37:22.000000000 +0200 @@ -1,0 +2,45 @@ +Mon Aug 27 01:52:32 UTC 2012 - crrodriguez(a)opensuse.org + +- BuildRequire libusb-devel for "usb sniffing" + +------------------------------------------------------------------- +Mon Aug 27 00:11:52 UTC 2012 - crrodriguez(a)opensuse.org + +- Added libpcap-ocloexec.patch: + Use O_CLOEXEC in all internal fds so they do not + leak on fork()..execve() + +------------------------------------------------------------------- +Fri Jun 15 15:24:46 CEST 2012 - jslaby(a)suse.de + +- remove some patches + - libpcap-1.0.0-fcode.patch -- not needed, if this emitted a warning, + it was a compiler bug + - libpcap-1.0.0-mac_syntax.patch -- already handled by MAC rule + - libpcap-1.0.0-man.patch -- tcpdump is man 1, not 8 + - libpcap-1.1.1-scanif.patch -- misapplied, this was fixed upstream + already + - libpcap-1.2.1-netfilter-dont-fail-on-EPROTONOSUPPORT.patch + +------------------------------------------------------------------- +Thu Jun 14 23:21:10 CEST 2012 - jslaby(a)suse.de + +- update to 1.3.0 + - Handle DLT_PFSYNC in {FreeBSD, other *BSD+Mac OS X, other}. + - Linux: Don't fail if netfilter isn't enabled in the kernel. + - Add new link-layer type for NFC Forum LLCP. + - Put the CANUSB stuff into EXTRA_DIST, so it shows up in the release tarball. + - Add LINKTYPE_NG40/DLT_NG40. + - Add DLT_MPEG_2_TS/LINKTYPE_MPEG_2_TS for MPEG-2 transport streams. + - [PATCH] Fix AIX-3.5 crash with read failure during stress + - AIX fixes. + - Introduce --disable-shared configure option. + - Added initial support for canusb devices. + - Include the pcap(3PCAP) additions as 1.2.1 changes. + - many updates to documentation: pcap.3pcap.in + - Improve 'inbound'/'outbound' capture filters under Linux. + - Note the cleanup of handling of new DLT_/LINKTYPE_ values. + - On Lion, don't build for PPC. + - For mac80211 devices we need to clean up monitor mode on exit. + +------------------------------------------------------------------- Old: ---- libpcap-1.0.0-fcode.patch libpcap-1.0.0-mac_syntax.patch libpcap-1.0.0-man.patch libpcap-1.1.1-scanif.patch libpcap-1.2.1-netfilter-dont-fail-on-EPROTONOSUPPORT.patch libpcap-1.2.1.tar.gz New: ---- libpcap-1.3.0.tar.gz libpcap-ocloexec.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libpcap.spec ++++++ --- /var/tmp/diff_new_pack.YoGIqu/_old 2012-08-31 09:37:30.000000000 +0200 +++ /var/tmp/diff_new_pack.YoGIqu/_new 2012-08-31 09:37:30.000000000 +0200 @@ -17,7 +17,7 @@ Name: libpcap -Version: 1.2.1 +Version: 1.3.0 Release: 0 Summary: A Library for Network Sniffers License: BSD-3-Clause @@ -26,17 +26,15 @@ Source: http://www.tcpdump.org/release/%{name}-%{version}.tar.gz Source2: baselibs.conf Patch0: libpcap-1.0.0-filter-fix.patch -Patch1: libpcap-1.0.0-fcode.patch -Patch2: libpcap-1.0.0-pcap-bpf.patch -Patch3: libpcap-1.0.0-ppp.patch -Patch4: libpcap-1.0.0-s390.patch -Patch5: libpcap-1.0.0-man.patch -Patch6: libpcap-1.0.0-mac_syntax.patch -Patch7: libpcap-1.1.1-scanif.patch -Patch8: libpcap-1.2.1-netfilter-dont-fail-on-EPROTONOSUPPORT.patch +Patch1: libpcap-1.0.0-pcap-bpf.patch +Patch2: libpcap-1.0.0-ppp.patch +Patch3: libpcap-1.0.0-s390.patch +Patch4: libpcap-ocloexec.patch +BuildRequires: automake BuildRequires: bison BuildRequires: bluez-devel BuildRequires: flex +BuildRequires: libusb-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -82,17 +80,13 @@ %patch2 %patch3 %patch4 -%patch5 -%patch6 -%patch7 -%patch8 -p1 - %build %ifarch %sparc pic="PIC" %else pic="pic" %endif +autoreconf -fiv export CFLAGS="%{optflags} -f$pic" CXXFLAGS="%{optflags} -f$pic" %configure \ --enable-ipv6 ++++++ libpcap-1.2.1.tar.gz -> libpcap-1.3.0.tar.gz ++++++ ++++ 15239 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libpcap-1.2.1/CHANGES new/libpcap-1.3.0/CHANGES --- old/libpcap-1.2.1/CHANGES 2012-01-02 01:47:37.000000000 +0100 +++ new/libpcap-1.3.0/CHANGES 2012-03-29 15:42:47.000000000 +0200 @@ -1,3 +1,22 @@ +Friday March 30, 2012. mcr(a)sandelman.ca +Summary for 1.3.0 libpcap release + Handle DLT_PFSYNC in {FreeBSD, other *BSD+Mac OS X, other}. + Linux: Don't fail if netfilter isn't enabled in the kernel. + Add new link-layer type for NFC Forum LLCP. + Put the CANUSB stuff into EXTRA_DIST, so it shows up in the release tarball. + Add LINKTYPE_NG40/DLT_NG40. + Add DLT_MPEG_2_TS/LINKTYPE_MPEG_2_TS for MPEG-2 transport streams. + [PATCH] Fix AIX-3.5 crash with read failure during stress + AIX fixes. + Introduce --disable-shared configure option. + Added initial support for canusb devices. + Include the pcap(3PCAP) additions as 1.2.1 changes. + many updates to documentation: pcap.3pcap.in + Improve 'inbound'/'outbound' capture filters under Linux. + Note the cleanup of handling of new DLT_/LINKTYPE_ values. + On Lion, don't build for PPC. + For mac80211 devices we need to clean up monitor mode on exit. + Friday December 9, 2011. guy(a)alum.mit.edu. Summary for 1.2.1 libpcap release Update README file. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libpcap-1.2.1/CREDITS new/libpcap-1.3.0/CREDITS --- old/libpcap-1.2.1/CREDITS 2011-07-24 22:50:10.000000000 +0200 +++ new/libpcap-1.3.0/CREDITS 2012-03-29 14:57:32.000000000 +0200 @@ -34,6 +34,7 @@ David Kaelbling <drk at sgi dot com> David Young <dyoung at ojctech dot com> Dean Gaudet <dean at arctic dot org> + dhruv <rsrivat at sourceforge dot net> Don Ebright <Don dot Ebright at compuware dot com> Dug Song <dugsong at monkey dot org> Dustin Spicuzza <dustin at virtualroadside dot com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libpcap-1.2.1/VERSION new/libpcap-1.3.0/VERSION --- old/libpcap-1.2.1/VERSION 2012-01-02 01:50:04.000000000 +0100 +++ new/libpcap-1.3.0/VERSION 2012-06-12 19:00:45.000000000 +0200 @@ -1 +1 @@ -1.2.1 +1.3.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libpcap-1.2.1/config.h.in new/libpcap-1.3.0/config.h.in --- old/libpcap-1.2.1/config.h.in 2011-07-24 22:50:10.000000000 +0200 +++ new/libpcap-1.3.0/config.h.in 2012-03-29 14:57:32.000000000 +0200 @@ -232,6 +232,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -244,6 +247,9 @@ /* target host supports CAN sniffing */ #undef PCAP_SUPPORT_CAN +/* target host supports canusb */ +#undef PCAP_SUPPORT_CANUSB + /* target host supports netfilter sniffing */ #undef PCAP_SUPPORT_NETFILTER diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libpcap-1.2.1/configure.in new/libpcap-1.3.0/configure.in --- old/libpcap-1.2.1/configure.in 2012-01-02 01:47:37.000000000 +0100 +++ new/libpcap-1.3.0/configure.in 2012-03-29 15:42:04.000000000 +0200 @@ -1224,6 +1224,10 @@ ;; esac +AC_ARG_ENABLE(shared, +AC_HELP_STRING([--enable-shared],[build shared libraries @<:@default=yes, if support available@:>@])) +test "x$enable_shared" = "xno" && DYEXT="none" + AC_PROG_RANLIB AC_CHECK_TOOL([AR], [ar]) @@ -1390,6 +1394,32 @@ AC_SUBST(BT_SRC) fi +AC_ARG_ENABLE([canusb], +[AC_HELP_STRING([--enable-canusb],[enable canusb support @<:@default=yes, if support available@:>@])] +,enable_canusb=yes) + +if test "x$enable_canusb" != "xno" ; then + dnl check for canusb support + case "$host_os" in + linux*) + AC_CHECK_HEADER(libusb-1.0/libusb.h, + [ + AC_DEFINE(PCAP_SUPPORT_CANUSB, 1, [target host supports canusb]) + CANUSB_SRC=pcap-canusb-linux.c + LIBS="-lusb-1.0 $LIBS" + AC_MSG_NOTICE(canusb sniffing is supported) + ], + AC_MSG_NOTICE(canusb sniffing is not supported; install libusb1.0 lib devel to enable it) + ) + ;; + *) + AC_MSG_NOTICE(no canusb support implemented for $host_os) + ;; + esac + AC_SUBST(PCAP_SUPPORT_CANUSB) + AC_SUBST(CANUSB_SRC) +fi + AC_ARG_ENABLE([can], [AC_HELP_STRING([--enable-can],[enable CAN support @<:@default=yes, if support available@:>@])], ,enable_can=yes) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libpcap-1.2.1/gencode.c new/libpcap-1.3.0/gencode.c --- old/libpcap-1.2.1/gencode.c 2012-01-02 01:47:37.000000000 +0100 +++ new/libpcap-1.3.0/gencode.c 2012-06-12 18:55:36.000000000 +0200 @@ -84,6 +84,11 @@ #include "pcap/sll.h" #include "pcap/ipnet.h" #include "arcnet.h" +#if defined(PF_PACKET) && defined(SO_ATTACH_FILTER) +#include <linux/types.h> +#include <linux/if_packet.h> +#include <linux/filter.h> +#endif #ifdef HAVE_NET_PFVAR_H #include <sys/socket.h> #include <net/if.h> @@ -418,7 +423,7 @@ { extern int n_errors; const char * volatile xbuf = buf; - int len; + u_int len; no_optimize = 0; n_errors = 0; @@ -1393,14 +1398,12 @@ off_nl_nosnap = -1; return; -#ifdef DLT_PFSYNC case DLT_PFSYNC: off_linktype = -1; off_macpl = 4; off_nl = 0; off_nl_nosnap = 0; return; -#endif case DLT_AX25_KISS: /* @@ -3356,10 +3359,8 @@ case DLT_ERF: bpf_error("ERF link-layer type filtering not implemented"); -#ifdef DLT_PFSYNC case DLT_PFSYNC: bpf_error("PFSYNC link-layer type filtering not implemented"); -#endif case DLT_LINUX_LAPD: bpf_error("LAPD link-layer type filtering not implemented"); @@ -5819,6 +5820,11 @@ int dir; { struct block *b0, *b1; +#ifdef INET6 +#ifndef CHASE_CHAIN + struct block *b2; +#endif +#endif if (dir != Q_DEFAULT) bpf_error("direction applied to 'proto'"); @@ -5987,7 +5993,15 @@ case Q_IPV6: b0 = gen_linktype(ETHERTYPE_IPV6); #ifndef CHASE_CHAIN - b1 = gen_cmp(OR_NET, 6, BPF_B, (bpf_int32)v); + /* + * Also check for a fragment header before the final + * header. + */ + b2 = gen_cmp(OR_NET, 6, BPF_B, IPPROTO_FRAGMENT); + b1 = gen_cmp(OR_NET, 40, BPF_B, (bpf_int32)v); + gen_and(b2, b1); + b2 = gen_cmp(OR_NET, 6, BPF_B, (bpf_int32)v); + gen_or(b2, b1); #else b1 = gen_protochain(v, Q_IPV6); #endif @@ -7468,9 +7482,13 @@ } /* - * generate command for inbound/outbound. It's here so we can - * make it link-type specific. 'dir' = 0 implies "inbound", - * = 1 implies "outbound". + * Filter on inbound (dir == 0) or outbound (dir == 1) traffic. + * Outbound traffic is sent by this machine, while inbound traffic is + * sent by a remote machine (and may include packets destined for a + * unicast or multicast link-layer address we are not subscribing to). + * These are the same definitions implemented by pcap_setdirection(). + * Capturing only unicast traffic destined for this host is probably + * better accomplished using a higher-layer filter. */ struct block * gen_inbound(dir) @@ -7500,23 +7518,11 @@ break; case DLT_LINUX_SLL: - if (dir) { - /* - * Match packets sent by this machine. - */ - b0 = gen_cmp(OR_LINK, 0, BPF_H, LINUX_SLL_OUTGOING); - } else { - /* - * Match packets sent to this machine. - * (No broadcast or multicast packets, or - * packets sent to some other machine and - * received promiscuously.) - * - * XXX - packets sent to other machines probably - * shouldn't be matched, but what about broadcast - * or multicast packets we received? - */ - b0 = gen_cmp(OR_LINK, 0, BPF_H, LINUX_SLL_HOST); + /* match outgoing packets */ + b0 = gen_cmp(OR_LINK, 0, BPF_H, LINUX_SLL_OUTGOING); + if (!dir) { + /* to filter on inbound traffic, invert the match */ + gen_not(b0); } break; @@ -7572,10 +7578,38 @@ break; default: + /* + * If we have packet meta-data indicating a direction, + * check it, otherwise give up as this link-layer type + * has nothing in the packet data. + */ +#if defined(PF_PACKET) && defined(SO_ATTACH_FILTER) + /* + * We infer that this is Linux with PF_PACKET support. + * If this is a *live* capture, we can look at + * special meta-data in the filter expression; + * if it's a savefile, we can't. + */ + if (bpf_pcap->sf.rfile != NULL) { + /* We have a FILE *, so this is a savefile */ + bpf_error("inbound/outbound not supported on linktype %d when reading savefiles", + linktype); + b0 = NULL; + /* NOTREACHED */ + } + /* match outgoing packets */ + b0 = gen_cmp(OR_LINK, SKF_AD_OFF + SKF_AD_PKTTYPE, BPF_H, + PACKET_OUTGOING); + if (!dir) { + /* to filter on inbound traffic, invert the match */ + gen_not(b0); + } +#else /* defined(PF_PACKET) && defined(SO_ATTACH_FILTER) */ bpf_error("inbound/outbound not supported on linktype %d", linktype); b0 = NULL; /* NOTREACHED */ +#endif /* defined(PF_PACKET) && defined(SO_ATTACH_FILTER) */ } return (b0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libpcap-1.2.1/gencode.h new/libpcap-1.3.0/gencode.h --- old/libpcap-1.2.1/gencode.h 2012-01-02 01:47:37.000000000 +0100 +++ new/libpcap-1.3.0/gencode.h 2012-03-29 14:57:32.000000000 +0200 @@ -240,8 +240,8 @@ struct slist *stmts; /* side effect stmts */ struct stmt s; /* branch stmt */ int mark; - int longjt; /* jt branch requires long jump */ - int longjf; /* jf branch requires long jump */ + u_int longjt; /* jt branch requires long jump */ + u_int longjf; /* jf branch requires long jump */ int level; int offset; int sense; @@ -330,7 +330,7 @@ void finish_parse(struct block *); char *sdup(const char *); -struct bpf_insn *icode_to_fcode(struct block *, int *); +struct bpf_insn *icode_to_fcode(struct block *, u_int *); int pcap_parse(void); void lex_init(const char *); void lex_cleanup(void); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libpcap-1.2.1/optimize.c new/libpcap-1.3.0/optimize.c --- old/libpcap-1.2.1/optimize.c 2011-03-28 22:37:56.000000000 +0200 +++ new/libpcap-1.3.0/optimize.c 2012-03-29 14:57:32.000000000 +0200 @@ -152,10 +152,10 @@ static void opt_deadstores(struct block *); static struct block *fold_edge(struct block *, struct edge *); static inline int eq_blk(struct block *, struct block *); -static int slength(struct slist *); +static u_int slength(struct slist *); static int count_blocks(struct block *); static void number_blks_r(struct block *); -static int count_stmts(struct block *); +static u_int count_stmts(struct block *); static int convert_code_r(struct block *); #ifdef BDEBUG static void opt_dump(struct block *); @@ -1904,11 +1904,11 @@ /* * Return the number of stmts in 's'. */ -static int +static u_int slength(s) struct slist *s; { - int n = 0; + u_int n = 0; for (; s; s = s->next) if (s->s.code != NOP) @@ -1970,11 +1970,11 @@ * * an extra long jump if the false branch requires it (p->longjf). */ -static int +static u_int count_stmts(p) struct block *p; { - int n; + u_int n; if (p == 0 || isMarked(p)) return 0; @@ -2263,9 +2263,9 @@ struct bpf_insn * icode_to_fcode(root, lenp) struct block *root; - int *lenp; + u_int *lenp; { - int n; + u_int n; struct bpf_insn *fp; /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libpcap-1.2.1/packaging/pcap.spec.in new/libpcap-1.3.0/packaging/pcap.spec.in --- old/libpcap-1.2.1/packaging/pcap.spec.in 2011-07-24 22:50:10.000000000 +0200 +++ new/libpcap-1.3.0/packaging/pcap.spec.in 2012-06-12 18:55:36.000000000 +0200 @@ -66,8 +66,10 @@ %files devel %defattr(-,root,root) %{_bindir}/pcap-config -%{_includedir}/pcap*.h +%{_includedir}/pcap/*.h %{_includedir}/pcap.h +%{_includedir}/pcap-bpf.h +%{_includedir}/pcap-namedb.h %{_libdir}/libpcap.so %{_libdir}/libpcap.a %{_mandir}/man1/pcap-config.1* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libpcap-1.2.1/pcap/bpf.h new/libpcap-1.3.0/pcap/bpf.h --- old/libpcap-1.2.1/pcap/bpf.h 2012-01-02 01:47:37.000000000 +0100 +++ new/libpcap-1.3.0/pcap/bpf.h 2012-06-12 18:55:36.000000000 +0200 @@ -177,11 +177,37 @@ #endif /* - * 17 is used for DLT_OLD_PFLOG in OpenBSD; - * OBSOLETE: DLT_PFLOG is 117 in OpenBSD now as well. See below. - * 18 is used for DLT_PFSYNC in OpenBSD; don't use it for anything else. + * 17 was used for DLT_PFLOG in OpenBSD; it no longer is. + * + * It was DLT_LANE8023 in SuSE 6.3, so we defined LINKTYPE_PFLOG + * as 117 so that pflog captures would use a link-layer header type + * value that didn't collide with any other values. On all + * platforms other than OpenBSD, we defined DLT_PFLOG as 117, + * and we mapped between LINKTYPE_PFLOG and DLT_PFLOG. + * + * OpenBSD eventually switched to using 117 for DLT_PFLOG as well. + * + * Don't use 17 for anything else. */ +/* + * 18 is used for DLT_PFSYNC in OpenBSD, NetBSD, DragonFly BSD and + * Mac OS X; don't use it for anything else. (FreeBSD uses 121, + * which collides with DLT_HHDLC, even though it doesn't use 18 + * for anything and doesn't appear to have ever used it for anything.) + * + * We define it as 18 on those platforms; it is, unfortunately, used + * for DLT_CIP in Suse 6.3, so we don't define it as DLT_PFSYNC + * in general. As the packet format for it, like that for + * DLT_PFLOG, is not only OS-dependent but OS-version-dependent, + * we don't support printing it in tcpdump except on OSes that + * have the relevant header files, so it's not that useful on + * other platforms. + */ +#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__APPLE__) +#define DLT_PFSYNC 18 +#endif + #define DLT_ATM_CLIP 19 /* Linux Classical-IP over ATM */ /* @@ -312,15 +338,8 @@ #define DLT_IPFILTER 116 /* - * OpenBSD DLT_PFLOG; DLT_PFLOG is 17 in OpenBSD, but that's DLT_LANE8023 - * in SuSE 6.3, so we can't use 17 for it in capture-file headers. - * - * XXX: is there a conflict with DLT_PFSYNC 18 as well? + * OpenBSD DLT_PFLOG. */ -#ifdef __OpenBSD__ -#define DLT_OLD_PFLOG 17 -#define DLT_PFSYNC 18 -#endif #define DLT_PFLOG 117 /* @@ -342,9 +361,48 @@ #define DLT_AIRONET_HEADER 120 /* - * Reserved for Siemens HiPath HDLC. + * Sigh. + * + * This was reserved for Siemens HiPath HDLC on 2002-01-25, as + * requested by Tomas Kukosa. + * + * On 2004-02-25, a FreeBSD checkin to sys/net/bpf.h was made that + * assigned 121 as DLT_PFSYNC. Its libpcap does DLT_ <-> LINKTYPE_ + * mapping, so it probably supports capturing on the pfsync device + * but not saving the captured data to a pcap file. + * + * OpenBSD, from which pf came, however, uses 18 for DLT_PFSYNC; + * their libpcap does no DLT_ <-> LINKTYPE_ mapping, so it would + * use 18 in pcap files as well. + * + * NetBSD and DragonFly BSD also use 18 for DLT_PFSYNC; their + * libpcaps do DLT_ <-> LINKTYPE_ mapping, and neither has an entry + * for DLT_PFSYNC, so it might not be able to write out dump files + * with 18 as the link-layer header type. (Earlier versions might + * not have done mapping, in which case they'd work the same way + * OpenBSD does.) + * + * Mac OS X defines it as 18, but doesn't appear to use it as of + * Mac OS X 10.7.3. Its libpcap does DLT_ <-> LINKTYPE_ mapping. + * + * We'll define DLT_PFSYNC as 121 on FreeBSD and define it as 18 on + * all other platforms. We'll define DLT_HHDLC as 121 on everything + * except for FreeBSD; anybody who wants to compile, on FreeBSD, code + * that uses DLT_HHDLC is out of luck. + * + * We'll define LINKTYPE_PFSYNC as 18, *even on FreeBSD*, and map + * it, so that savefiles won't use 121 for PFSYNC - they'll all + * use 18. Code that uses pcap_datalink() to determine the link-layer + * header type of a savefile won't, when built and run on FreeBSD, + * be able to distinguish between LINKTYPE_PFSYNC and LINKTYPE_HHDLC + * capture files; code that doesn't, such as the code in Wireshark, + * will be able to distinguish between them. */ +#ifdef __FreeBSD__ +#define DLT_PFSYNC 121 +#else #define DLT_HHDLC 121 +#endif /* * This is for RFC 2625 IP-over-Fibre Channel. @@ -542,7 +600,7 @@ #define DLT_JUNIPER_MONITOR 164 /* - * Reserved for BACnet MS/TP. + * BACnet MS/TP frames. */ #define DLT_BACNET_MS_TP 165 @@ -1081,7 +1139,43 @@ */ #define DLT_IPOIB 242 -#define DLT_MATCHING_MAX 242 /* highest value in the "matching" range */ +/* + * MPEG-2 transport stream (ISO 13818-1/ITU-T H.222.0). + * + * Requested by Guy Martin <gmsoft(a)tuxicoman.be>. + */ +#define DLT_MPEG_2_TS 243 + +/* + * ng4T GmbH's UMTS Iub/Iur-over-ATM and Iub/Iur-over-IP format as + * used by their ng40 protocol tester. + * + * Requested by Jens Grimmer <jens.grimmer(a)ng4t.com>. + */ +#define DLT_NG40 244 + +/* + * Pseudo-header giving adapter number and flags, followed by an NFC + * (Near-Field Communications) Logical Link Control Protocol (LLCP) PDU, + * as specified by NFC Forum Logical Link Control Protocol Technical + * Specification LLCP 1.1. + * + * Requested by Mike Wakerly <mikey(a)google.com>. + */ +#define DLT_NFC_LLCP 245 + +/* + * 245 is used as LINKTYPE_PFSYNC; do not use it for any other purpose. + * + * DLT_PFSYNC has different values on different platforms, and all of + * them collide with something used elsewhere. On platforms that + * don't already define it, define it as 245. + */ +#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__) && !defined(__APPLE__) +#define DLT_PFSYNC 246 +#endif + +#define DLT_MATCHING_MAX 246 /* highest value in the "matching" range */ /* * DLT and savefile link type values are split into a class and diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libpcap-1.2.1/pcap-bpf.c new/libpcap-1.3.0/pcap-bpf.c --- old/libpcap-1.2.1/pcap-bpf.c 2011-07-24 22:50:10.000000000 +0200 +++ new/libpcap-1.3.0/pcap-bpf.c 2012-06-12 18:55:36.000000000 +0200 @@ -155,6 +155,10 @@ #endif /* BIOCGDLTLIST */ +#if defined(sun) && defined(LIFNAMSIZ) && defined(lifr_zoneid) +#include <zone.h> +#endif + /* * We include the OS's <net/bpf.h>, not our "pcap/bpf.h", so we probably * don't get DLT_DOCSIS defined. @@ -1451,8 +1455,16 @@ * Default capture buffer size. * 32K isn't very much for modern machines with fast networks; we * pick .5M, as that's the maximum on at least some systems with BPF. + * + * However, on AIX 3.5, the larger buffer sized caused unrecoverable + * read failures under stress, so we leave it as 32K; yet another + * place where AIX's BPF is broken. */ +#ifdef _AIX +#define DEFAULT_BUFSIZE 32768 +#else #define DEFAULT_BUFSIZE 524288 +#endif static int pcap_activate_bpf(pcap_t *p) @@ -1460,6 +1472,7 @@ int status = 0; int fd; #ifdef LIFNAMSIZ + char *zonesep; struct lifreq ifr; char *ifrname = ifr.lifr_name; const size_t ifnamsiz = sizeof(ifr.lifr_name); @@ -1514,6 +1527,29 @@ goto bad; } +#if defined(LIFNAMSIZ) && defined(ZONENAME_MAX) && defined(lifr_zoneid) + /* + * Check if the given source network device has a '/' separated + * zonename prefix string. The zonename prefixed source device + * can be used by libpcap consumers to capture network traffic + * in non-global zones from the global zone on Solaris 11 and + * above. If the zonename prefix is present then we strip the + * prefix and pass the zone ID as part of lifr_zoneid. + */ + if ((zonesep = strchr(p->opt.source, '/')) != NULL) { + char zonename[ZONENAME_MAX]; + int znamelen; + char *lnamep; + + znamelen = zonesep - p->opt.source; + (void) strlcpy(zonename, p->opt.source, znamelen + 1); + lnamep = strdup(zonesep + 1); + ifr.lifr_zoneid = getzoneidbyname(zonename); + free(p->opt.source); + p->opt.source = lnamep; + } +#endif + p->md.device = strdup(p->opt.source); if (p->md.device == NULL) { snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "strdup: %s", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libpcap-1.2.1/pcap-canusb-linux.c new/libpcap-1.3.0/pcap-canusb-linux.c --- old/libpcap-1.2.1/pcap-canusb-linux.c 1970-01-01 01:00:00.000000000 +0100 +++ new/libpcap-1.3.0/pcap-canusb-linux.c 2012-03-29 14:57:32.000000000 +0200 @@ -0,0 +1,428 @@ +/* + * Copyright (c) 2009 Felix Obenhuber + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Sockettrace sniffing API implementation for Linux platform + * By Felix Obenhuber <felix(a)obenhuber.de> + * + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <libusb-1.0/libusb.h> + +#include "pcap-int.h" +#include <stdlib.h> +#include <unistd.h> +#include <fcntl.h> +#include <string.h> + + +#define CANUSB_IFACE "canusb" + +#define CANUSB_VID 0x0403 +#define CANUSB_PID 0x8990 + +#define USE_THREAD 1 + +#if USE_THREAD == 0 +#include <signal.h> +#endif + + +/* forward declaration */ +static int canusb_activate(pcap_t *); +static int canusb_read_linux(pcap_t *, int , pcap_handler , u_char *); +static int canusb_inject_linux(pcap_t *, const void *, size_t); +static int canusb_setfilter_linux(pcap_t *, struct bpf_program *); +static int canusb_setdirection_linux(pcap_t *, pcap_direction_t); +static int canusb_stats_linux(pcap_t *, struct pcap_stat *); + +struct CAN_Msg +{ + uint32_t timestamp; + uint32_t id; + uint32_t length; + uint8_t data[8]; +}; + +struct canusb_t +{ + libusb_context *ctx; + libusb_device_handle *dev; + char* src; + pthread_t worker; + int rdpipe, wrpipe; + volatile int* loop; +}; + +static struct canusb_t canusb; +static volatile int loop; + + + +int canusb_platform_finddevs(pcap_if_t **alldevsp, char *err_str) +{ + libusb_context *fdctx; + libusb_device** devs; + unsigned char sernum[65]; + unsigned char buf[96]; + int cnt, i; + + libusb_init(&fdctx); + + cnt = libusb_get_device_list(fdctx,&devs); + + for(i=0;i<cnt;i++) + { + int ret; + // Check if this device is interesting. + struct libusb_device_descriptor desc; + libusb_get_device_descriptor(devs[i],&desc); + + if ((desc.idVendor != CANUSB_VID) || (desc.idProduct != CANUSB_PID)) + continue; //It is not, check next device + + //It is! + libusb_device_handle *dh = NULL; + + if (ret = libusb_open(devs[i],&dh) == 0) + { + char dev_name[30]; + char dev_descr[50]; + int n = libusb_get_string_descriptor_ascii(dh,desc.iSerialNumber,sernum,64); + sernum[n] = 0; + + snprintf(dev_name, 30, CANUSB_IFACE"%s", sernum); + snprintf(dev_descr, 50, "CanUSB [%s]", sernum); + + libusb_close(dh); + + if (pcap_add_if(alldevsp, dev_name, 0, dev_descr, err_str) < 0) + { + libusb_free_device_list(devs,1); + return -1; + } + } + } + + libusb_free_device_list(devs,1); + libusb_exit(fdctx); + return 0; +} + +static libusb_device_handle* canusb_opendevice(struct libusb_context *ctx, char* devserial) +{ + libusb_device_handle* dh; + libusb_device** devs; + unsigned char serial[65]; + int cnt,i,n; + + cnt = libusb_get_device_list(ctx,&devs); + + for(i=0;i<cnt;i++) + { + // Check if this device is interesting. + struct libusb_device_descriptor desc; + libusb_get_device_descriptor(devs[i],&desc); + + if ((desc.idVendor != CANUSB_VID) || (desc.idProduct != CANUSB_PID)) + continue; + + //Found one! + libusb_device_handle *dh = NULL; + + if (libusb_open(devs[i],&dh) != 0) continue; + + n = libusb_get_string_descriptor_ascii(dh,desc.iSerialNumber,serial,64); + serial[n] = 0; + + if ((devserial) && (strcmp(serial,devserial) != 0)) + { + libusb_close(dh); + continue; + } + + if ((libusb_kernel_driver_active(dh,0)) && (libusb_detach_kernel_driver(dh,0) != 0)) + { + libusb_close(dh); + continue; + } + + if (libusb_set_configuration(dh,1) != 0) + { + libusb_close(dh); + continue; + } + + if (libusb_claim_interface(dh,0) != 0) + { + libusb_close(dh); + continue; + } + + //Fount it! + libusb_free_device_list(devs,1); + return dh; + } + + libusb_free_device_list(devs,1); + return NULL; +} + + +pcap_t * +canusb_create(const char *device, char *ebuf) +{ + pcap_t* p; + + libusb_init(&canusb.ctx); + + p = pcap_create_common(device, ebuf); + if (p == NULL) + return (NULL); + + memset(&canusb, 0x00, sizeof(canusb)); + + + p->activate_op = canusb_activate; + + canusb.src = strdup(p->opt.source); + return (p); +} + + +static void* canusb_capture_thread(struct canusb_t *canusb) +{ + struct libusb_context *ctx; + libusb_device_handle *dev; + + int i, n; + struct + { + uint8_t rxsz, txsz; + } status; + + libusb_init(&ctx); + + char *serial = canusb->src + strlen(CANUSB_IFACE); + dev = canusb_opendevice(ctx, serial); + + fcntl(canusb->wrpipe, F_SETFL, O_NONBLOCK); + + while(*canusb->loop) + { + int sz, ret; + struct CAN_Msg msg; + + libusb_interrupt_transfer(dev, 0x81, (unsigned char*)&status, sizeof(status), &sz, 100); + //HACK!!!!! -> drop buffered data, read new one by reading twice. + ret = libusb_interrupt_transfer(dev, 0x81, (unsigned char*)&status, sizeof(status), &sz, 100); + + for(i = 0; i<status.rxsz; i++) + { + libusb_bulk_transfer(dev, 0x85, (unsigned char*)&msg, sizeof(msg), &sz, 100); + n = write(canusb->wrpipe, &msg, sizeof(msg)); + } + + } + + libusb_close(dev); + libusb_exit(ctx); + + return NULL; +} + +static int canusb_startcapture(struct canusb_t* this) +{ + int pipefd[2]; + + if (pipe(pipefd) == -1) return -1; + + canusb.rdpipe = pipefd[0]; + canusb.wrpipe = pipefd[1]; + canusb.loop = &loop; + + loop = 1; + pthread_create(&this->worker, NULL, canusb_capture_thread, &canusb); + + return canusb.rdpipe; +} + +static void canusb_clearbufs(struct canusb_t* this) +{ + unsigned char cmd[16]; + int al; + + cmd[0] = 1; //Empty incoming buffer + cmd[1] = 1; //Empty outgoing buffer + cmd[3] = 0; //Not a write to serial number + memset(&cmd[4],0,16-4); + + libusb_interrupt_transfer(this->dev, 0x1,cmd,16,&al,100); +} + + +static void canusb_close(pcap_t* handle) +{ + loop = 0; + pthread_join(canusb.worker, NULL); + + if (canusb.dev) + { + libusb_close(canusb.dev); + canusb.dev = NULL; + } +} + + + +static int canusb_activate(pcap_t* handle) +{ + handle->read_op = canusb_read_linux; + + handle->inject_op = canusb_inject_linux; + handle->setfilter_op = canusb_setfilter_linux; + handle->setdirection_op = canusb_setdirection_linux; + handle->getnonblock_op = pcap_getnonblock_fd; + handle->setnonblock_op = pcap_setnonblock_fd; + handle->stats_op = canusb_stats_linux; + handle->cleanup_op = canusb_close; + + /* Initialize some components of the pcap structure. */ + handle->bufsize = 32; + handle->offset = 8; + handle->linktype = DLT_CAN_SOCKETCAN; + handle->set_datalink_op = NULL; + + char* serial = handle->opt.source + strlen("canusb"); + + canusb.dev = canusb_opendevice(canusb.ctx,serial); + if (!canusb.dev) + { + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't open USB Device:"); + return PCAP_ERROR; + } + + canusb_clearbufs(&canusb); + + handle->fd = canusb_startcapture(&canusb); + handle->selectable_fd = handle->fd; + + return 0; +} + + + + +static int +canusb_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_char *user) +{ + static struct timeval firstpacket = { -1, -1}; + + int msgsent = 0; + int i = 0; + struct CAN_Msg msg; + struct pcap_pkthdr pkth; + + while(i < max_packets) + { + usleep(10 * 1000); + int n = read(handle->fd, &msg, sizeof(msg)); + if (n <= 0) break; + pkth.caplen = pkth.len = n; + pkth.caplen -= 4; + pkth.caplen -= 8 - msg.length; + + if ((firstpacket.tv_sec == -1) && (firstpacket.tv_usec == -1)) + gettimeofday(&firstpacket, NULL); + + pkth.ts.tv_usec = firstpacket.tv_usec + (msg.timestamp % 100) * 10000; + pkth.ts.tv_sec = firstpacket.tv_usec + (msg.timestamp / 100); + if (pkth.ts.tv_usec > 1000000) + { + pkth.ts.tv_usec -= 1000000; + pkth.ts.tv_sec++; + } + + callback(user, &pkth, (void*)&msg.id); + i++; + } + + return i; +} + + +static int +canusb_inject_linux(pcap_t *handle, const void *buf, size_t size) +{ + /* not yet implemented */ + snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "inject not supported on canusb devices"); + return (-1); +} + + +static int +canusb_stats_linux(pcap_t *handle, struct pcap_stat *stats) +{ + /* not yet implemented */ + stats->ps_recv = 0; /* number of packets received */ + stats->ps_drop = 0; /* number of packets dropped */ + stats->ps_ifdrop = 0; /* drops by interface -- only supported on some platforms */ + return 0; +} + + +static int +canusb_setfilter_linux(pcap_t *p, struct bpf_program *fp) +{ + /* not yet implemented */ + return 0; +} + + +static int +canusb_setdirection_linux(pcap_t *p, pcap_direction_t d) +{ + /* no support for PCAP_D_OUT */ + if (d == PCAP_D_OUT) + { + snprintf(p->errbuf, sizeof(p->errbuf), + "Setting direction to PCAP_D_OUT is not supported on this interface"); + return -1; + } + + p->direction = d; + + return 0; +} + + +/* eof */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libpcap-1.2.1/pcap-canusb-linux.h new/libpcap-1.3.0/pcap-canusb-linux.h --- old/libpcap-1.2.1/pcap-canusb-linux.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libpcap-1.3.0/pcap-canusb-linux.h 2012-03-29 14:57:32.000000000 +0200 @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2009 Felix Obenhuber + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +/* + * Prototypes for SocketCAN related functions + */ +pcap_t* canusb_create(const char *device, char *ebuf); +int canusb_listdevices(pcap_if_t **pdevlist, char* errbuf); + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libpcap-1.2.1/pcap-common.c new/libpcap-1.3.0/pcap-common.c --- old/libpcap-1.2.1/pcap-common.c 2012-01-02 01:47:37.000000000 +0100 +++ new/libpcap-1.3.0/pcap-common.c 2012-06-12 18:55:36.000000000 +0200 @@ -118,7 +118,7 @@ #define LINKTYPE_AX25 DLT_AX25 #define LINKTYPE_PRONET DLT_PRONET #define LINKTYPE_CHAOS DLT_CHAOS -#define LINKTYPE_TOKEN_RING DLT_IEEE802 /* DLT_IEEE802 is used for Token Ring */ +#define LINKTYPE_IEEE802_5 DLT_IEEE802 /* DLT_IEEE802 is used for 802.5 Token Ring */ #define LINKTYPE_ARCNET_BSD DLT_ARCNET /* BSD-style headers */ #define LINKTYPE_SLIP DLT_SLIP #define LINKTYPE_PPP DLT_PPP @@ -193,8 +193,8 @@ #define LINKTYPE_PFLOG 117 /* OpenBSD DLT_PFLOG */ #define LINKTYPE_CISCO_IOS 118 /* For Cisco-internal use */ -#define LINKTYPE_PRISM_HEADER 119 /* 802.11+Prism II monitor mode */ -#define LINKTYPE_AIRONET_HEADER 120 /* FreeBSD Aironet driver stuff */ +#define LINKTYPE_IEEE802_11_PRISM 119 /* 802.11 plus Prism II monitor mode radio metadata header */ +#define LINKTYPE_IEEE802_11_AIRONET 120 /* 802.11 plus FreeBSD Aironet driver radio metadata header */ /* * Reserved for Siemens HiPath HDLC. @@ -212,7 +212,7 @@ #define LINKTYPE_PCI_EXP 125 /* PCI Express */ #define LINKTYPE_AURORA 126 /* Xilinx Aurora link layer */ -#define LINKTYPE_IEEE802_11_RADIO 127 /* 802.11 plus BSD radio header */ +#define LINKTYPE_IEEE802_11_RADIOTAP 127 /* 802.11 plus radiotap radio metadata header */ /* * Reserved for the TZSP encapsulation, as per request from @@ -307,11 +307,8 @@ * including radio information: * * http://www.shaftnet.org/~pizza/software/capturefrm.txt - * - * but could and arguably should also be used by non-AVS Linux - * 802.11 drivers; that may happen in the future. */ -#define LINKTYPE_IEEE802_11_RADIO_AVS 163 /* 802.11 plus AVS radio header */ +#define LINKTYPE_IEEE802_11_AVS 163 /* 802.11 plus AVS radio metadata header */ /* * Juniper-private data link type, as per request from @@ -322,7 +319,7 @@ #define LINKTYPE_JUNIPER_MONITOR 164 /* - * Reserved for BACnet MS/TP. + * BACnet MS/TP frames. */ #define LINKTYPE_BACNET_MS_TP 165 @@ -850,7 +847,43 @@ */ #define LINKTYPE_IPOIB 242 -#define LINKTYPE_MATCHING_MAX 242 /* highest value in the "matching" range */ +/* + * MPEG-2 transport stream (ISO 13818-1/ITU-T H.222.0). + * + * Requested by Guy Martin <gmsoft(a)tuxicoman.be>. + */ +#define LINKTYPE_MPEG_2_TS 243 + +/* + * ng4T GmbH's UMTS Iub/Iur-over-ATM and Iub/Iur-over-IP format as + * used by their ng40 protocol tester. + * + * Requested by Jens Grimmer <jens.grimmer(a)ng4t.com>. + */ +#define LINKTYPE_NG40 244 + +/* + * Pseudo-header giving adapter number and flags, followed by an NFC + * (Near-Field Communications) Logical Link Control Protocol (LLCP) PDU, + * as specified by NFC Forum Logical Link Control Protocol Technical + * Specification LLCP 1.1. + * + * Requested by Mike Wakerly <mikey(a)google.com>. + */ +#define LINKTYPE_NFC_LLCP 245 + +/* + * pfsync output; DLT_PFSYNC is 18, which collides with DLT_CIP in + * SuSE 6.3, on OpenBSD, NetBSD, DragonFly BSD, and Mac OS X, and + * is 121, which collides with DLT_HHDLC, in FreeBSD. We pick a + * shiny new link-layer header type value that doesn't collide with + * anything, in the hopes that future pfsync savefiles, if any, + * won't require special hacks to distinguish from other savefiles. + * + */ +#define LINKTYPE_PFSYNC 246 + +#define LINKTYPE_MATCHING_MAX 246 /* highest value in the "matching" range */ static struct linktype_map { int dlt; @@ -866,11 +899,12 @@ { DLT_AX25, LINKTYPE_AX25 }, { DLT_PRONET, LINKTYPE_PRONET }, { DLT_CHAOS, LINKTYPE_CHAOS }, - { DLT_IEEE802, LINKTYPE_TOKEN_RING }, + { DLT_IEEE802, LINKTYPE_IEEE802_5 }, { DLT_ARCNET, LINKTYPE_ARCNET_BSD }, { DLT_SLIP, LINKTYPE_SLIP }, { DLT_PPP, LINKTYPE_PPP }, { DLT_FDDI, LINKTYPE_FDDI }, + { DLT_SYMANTEC_FIREWALL, LINKTYPE_SYMANTEC_FIREWALL }, /* * These DLT_* codes have different values on different @@ -883,7 +917,6 @@ { DLT_FR, LINKTYPE_FRELAY }, #endif - { DLT_SYMANTEC_FIREWALL, LINKTYPE_SYMANTEC_FIREWALL }, { DLT_ATM_RFC1483, LINKTYPE_ATM_RFC1483 }, { DLT_RAW, LINKTYPE_RAW }, { DLT_SLIP_BSDOS, LINKTYPE_SLIP_BSDOS }, @@ -923,6 +956,12 @@ int i; /* + * Map DLT_PFSYNC, whatever it might be, to LINKTYPE_PFSYNC. + */ + if (dlt == DLT_PFSYNC) + return (LINKTYPE_PFSYNC); + + /* * Map the values in the matching range. */ if (dlt >= DLT_MATCHING_MIN && dlt <= DLT_MATCHING_MAX) @@ -950,6 +989,15 @@ int i; /* + * Map LINKTYPE_PFSYNC to DLT_PFSYNC, whatever it might be. + * LINKTYPE_PFSYNC is in the matching range, to make sure + * it's as safe from reuse as we can arrange, so we do + * this test first. + */ + if (linktype == LINKTYPE_PFSYNC) + return (DLT_PFSYNC); + + /* * Map the values in the matching range. */ if (linktype >= LINKTYPE_MATCHING_MIN && diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libpcap-1.2.1/pcap-linux.c new/libpcap-1.3.0/pcap-linux.c --- old/libpcap-1.2.1/pcap-linux.c 2012-01-02 01:47:37.000000000 +0100 +++ new/libpcap-1.3.0/pcap-linux.c 2012-06-12 18:55:36.000000000 +0200 @@ -166,6 +166,10 @@ #include "pcap-can-linux.h" #endif +#if PCAP_SUPPORT_CANUSB +#include "pcap-canusb-linux.h" +#endif + #ifdef PCAP_SUPPORT_NETFILTER #include "pcap-netfilter-linux.h" #endif @@ -418,8 +422,15 @@ } #endif +#if PCAP_SUPPORT_CANUSB + if (strstr(device, "canusb")) { + return canusb_create(device, ebuf); + } +#endif + #ifdef PCAP_SUPPORT_CAN - if (strstr(device, "can") || strstr(device, "vcan")) { + if ((strncmp(device, "can", 3) == 0 && isdigit(device[3])) || + (strncmp(device, "vcan", 4) == 0 && isdigit(device[4]))) { return can_create(device, ebuf); } #endif @@ -2299,6 +2310,11 @@ return (-1); #endif +#if PCAP_SUPPORT_CANUSB + if (canusb_platform_finddevs(alldevsp, errbuf) < 0) + return (-1); +#endif + return (0); } @@ -5403,13 +5419,19 @@ * header. */ p->k -= SLL_HDR_LEN; + } else if (p->k == 0) { + /* + * It's the packet type field; map it to the special magic + * kernel offset for that field. + */ + p->k = SKF_AD_OFF + SKF_AD_PKTTYPE; } else if (p->k == 14) { /* * It's the protocol field; map it to the special magic * kernel offset for that field. */ p->k = SKF_AD_OFF + SKF_AD_PROTOCOL; - } else { + } else if ((bpf_int32)(p->k) > 0) { /* * It's within the header, but it's not one of those * fields; we can't do that in the kernel, so punt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libpcap-1.2.1/pcap-netfilter-linux.c new/libpcap-1.3.0/pcap-netfilter-linux.c --- old/libpcap-1.2.1/pcap-netfilter-linux.c 2012-01-02 01:47:37.000000000 +0100 +++ new/libpcap-1.3.0/pcap-netfilter-linux.c 2012-03-29 14:57:32.000000000 +0200 @@ -452,8 +452,8 @@ sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER); if (sock < 0) { - /* if netlink is not supported this this is not fatal */ - if (errno == EAFNOSUPPORT) + /* if netlink is not supported this is not fatal */ + if (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT) return 0; snprintf(err_str, PCAP_ERRBUF_SIZE, "Can't open netlink socket %d:%s", errno, pcap_strerror(errno)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libpcap-1.2.1/pcap.c new/libpcap-1.3.0/pcap.c --- old/libpcap-1.2.1/pcap.c 2012-01-02 01:47:37.000000000 +0100 +++ new/libpcap-1.3.0/pcap.c 2012-03-29 14:57:32.000000000 +0200 @@ -786,6 +786,7 @@ DLT_CHOICE(DLT_LINUX_SLL, "Linux cooked"), DLT_CHOICE(DLT_LTALK, "Localtalk"), DLT_CHOICE(DLT_PFLOG, "OpenBSD pflog file"), + DLT_CHOICE(DLT_PFSYNC, "Packet filter state syncing"), DLT_CHOICE(DLT_PRISM_HEADER, "802.11 plus Prism header"), DLT_CHOICE(DLT_IP_OVER_FC, "RFC 2625 IP-over-Fibre Channel"), DLT_CHOICE(DLT_SUNATM, "Sun raw ATM"), ++++++ libpcap-ocloexec.patch ++++++ --- sf-pcap.c.orig +++ sf-pcap.c @@ -550,7 +550,7 @@ pcap_dump_open(pcap_t *p, const char *fn fname = "standard output"; } else { #if !defined(WIN32) && !defined(MSDOS) - f = fopen(fname, "w"); + f = fopen(fname, "we"); #else f = fopen(fname, "wb"); #endif --- pcap-linux.c.orig +++ pcap-linux.c @@ -980,7 +980,7 @@ pcap_can_set_rfmon_linux(pcap_t *handle) * (We assume that if we have Wireless Extensions support * we also have PF_PACKET support.) */ - sock_fd = socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); + sock_fd = socket(PF_PACKET, SOCK_RAW|SOCK_CLOEXEC, htons(ETH_P_ALL)); if (sock_fd == -1) { (void)snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); @@ -1508,7 +1508,7 @@ pcap_read_packet(pcap_t *handle, pcap_ha } #if defined(HAVE_PACKET_AUXDATA) && defined(HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI) - packet_len = recvmsg(handle->fd, &msg, MSG_TRUNC); + packet_len = recvmsg(handle->fd, &msg, MSG_TRUNC|MSG_CMSG_CLOEXEC); #else /* defined(HAVE_PACKET_AUXDATA) && defined(HAVE_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI) */ fromlen = sizeof(from); packet_len = recvfrom( @@ -1976,7 +1976,7 @@ scan_sys_class_net(pcap_if_t **devlistp, /* * Create a socket from which to fetch interface information. */ - fd = socket(AF_INET, SOCK_DGRAM, 0); + fd = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC, 0); if (fd < 0) { (void)snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); @@ -2122,7 +2122,7 @@ scan_proc_net_dev(pcap_if_t **devlistp, /* * Create a socket from which to fetch interface information. */ - fd = socket(AF_INET, SOCK_DGRAM, 0); + fd = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC, 0); if (fd < 0) { (void)snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); @@ -2919,8 +2919,8 @@ activate_new(pcap_t *handle) * try a SOCK_RAW socket for the raw interface. */ sock_fd = is_any_device ? - socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_ALL)) : - socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); + socket(PF_PACKET, SOCK_DGRAM|SOCK_CLOEXEC, htons(ETH_P_ALL)) : + socket(PF_PACKET, SOCK_RAW|SOCK_CLOEXEC, htons(ETH_P_ALL)); if (sock_fd == -1) { if (errno == EINVAL || errno == EAFNOSUPPORT) { @@ -3036,7 +3036,7 @@ activate_new(pcap_t *handle) "close: %s", pcap_strerror(errno)); return PCAP_ERROR; } - sock_fd = socket(PF_PACKET, SOCK_DGRAM, + sock_fd = socket(PF_PACKET, SOCK_DGRAM|SOCK_CLOEXEC, htons(ETH_P_ALL)); if (sock_fd == -1) { snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, @@ -5065,7 +5065,7 @@ activate_old(pcap_t *handle) /* Open the socket */ - handle->fd = socket(PF_INET, SOCK_PACKET, htons(ETH_P_ALL)); + handle->fd = socket(PF_INET, SOCK_PACKET|SOCK_CLOEXEC, htons(ETH_P_ALL)); if (handle->fd == -1) { snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); --- configure.in.orig +++ configure.in @@ -22,7 +22,9 @@ AC_INIT(pcap.c) AC_CANONICAL_SYSTEM AC_LBL_C_INIT_BEFORE_CC(V_CCOPT, V_INCLS) -AC_PROG_CC +AC_PROG_CC_STDC +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE AC_LBL_C_INIT(V_CCOPT, V_INCLS) AC_LBL_SHLIBS_INIT AC_LBL_C_INLINE --- pcap-canusb-linux.c.orig +++ pcap-canusb-linux.c @@ -36,6 +36,7 @@ #include "config.h" #endif +#include <pthread.h> #include <libusb-1.0/libusb.h> #include "pcap-int.h" @@ -264,7 +265,7 @@ static int canusb_startcapture(struct ca { int pipefd[2]; - if (pipe(pipefd) == -1) return -1; + if (pipe2(pipefd, O_CLOEXEC) == -1) return -1; canusb.rdpipe = pipefd[0]; canusb.wrpipe = pipefd[1]; --- inet.c.orig +++ inet.c @@ -430,7 +430,7 @@ add_addr_to_iflist(pcap_if_t **alldevs, */ memset(&ifrdesc, 0, sizeof ifrdesc); strlcpy(ifrdesc.ifr_name, name, sizeof ifrdesc.ifr_name); - s = socket(AF_INET, SOCK_DGRAM, 0); + s = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC, 0); if (s >= 0) { #ifdef __FreeBSD__ /* @@ -745,7 +745,7 @@ pcap_lookupnet(device, netp, maskp, errb return 0; } - fd = socket(AF_INET, SOCK_DGRAM, 0); + fd = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC, 0); if (fd < 0) { (void)snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); --- pcap-netfilter-linux.c.orig +++ pcap-netfilter-linux.c @@ -363,7 +363,7 @@ nflog_activate(pcap_t* handle) handle->stats_op = netfilter_stats_linux; /* Create netlink socket */ - handle->fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER); + handle->fd = socket(AF_NETLINK, SOCK_RAW|SOCK_CLOEXEC, NETLINK_NETFILTER); if (handle->fd < 0) { snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't create raw socket %d:%s", errno, pcap_strerror(errno)); return PCAP_ERROR; @@ -450,7 +450,7 @@ netfilter_platform_finddevs(pcap_if_t ** pcap_if_t *found_dev = *alldevsp; int sock; - sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER); + sock = socket(AF_NETLINK, SOCK_RAW|SOCK_CLOEXEC, NETLINK_NETFILTER); if (sock < 0) { /* if netlink is not supported this is not fatal */ if (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT) --- savefile.c.orig +++ savefile.c @@ -189,7 +189,7 @@ pcap_open_offline(const char *fname, cha } else { #if !defined(WIN32) && !defined(MSDOS) - fp = fopen(fname, "r"); + fp = fopen(fname, "re"); #else fp = fopen(fname, "rb"); #endif --- pcap-snit.c.orig +++ pcap-snit.c @@ -297,9 +297,9 @@ pcap_activate_snit(pcap_t *p) * the device in question) can be indicated at open * time. */ - p->fd = fd = open(dev, O_RDWR); + p->fd = fd = open(dev, O_RDWR|O_CLOEXEC); if (fd < 0 && errno == EACCES) - p->fd = fd = open(dev, O_RDONLY); + p->fd = fd = open(dev, O_RDONLY|O_CLOEXEC); if (fd < 0) { snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "%s: %s", dev, pcap_strerror(errno)); --- fad-glifc.c.orig +++ fad-glifc.c @@ -100,7 +100,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c * Create a socket from which to fetch the list of interfaces, * and from which to fetch IPv4 information. */ - fd4 = socket(AF_INET, SOCK_DGRAM, 0); + fd4 = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC, 0); if (fd4 < 0) { (void)snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); @@ -110,7 +110,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c /* * Create a socket from which to fetch IPv6 information. */ - fd6 = socket(AF_INET6, SOCK_DGRAM, 0); + fd6 = socket(AF_INET6, SOCK_DGRAM|SOCK_CLOEXEC, 0); if (fd6 < 0) { (void)snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); --- pcap-nit.c.orig +++ pcap-nit.c @@ -259,7 +259,7 @@ pcap_activate_nit(pcap_t *p) p->snapshot = 96; memset(p, 0, sizeof(*p)); - p->fd = fd = socket(AF_NIT, SOCK_RAW, NITPROTO_RAW); + p->fd = fd = socket(AF_NIT, SOCK_RAW|SOCK_CLOEXEC, NITPROTO_RAW); if (fd < 0) { snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); --- pcap-sita.c.orig +++ pcap-sita.c @@ -318,7 +318,7 @@ static int open_with_IOP(unit_t *u, int u->serv_addr->sin_addr.s_addr = inet_addr(ip); u->serv_addr->sin_port = htons(IOP_SNIFFER_PORT); - if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) { + if ((sockfd = socket(AF_INET, SOCK_STREAM|SOCK_CLOEXEC, 0)) < 0) { fprintf(stderr, "pcap can't open a socket for connecting to IOP at %s\n", ip); return 0; } --- pcap-can-linux.c.orig +++ pcap-can-linux.c @@ -106,7 +106,7 @@ can_activate(pcap_t* handle) handle->stats_op = can_stats_linux; /* Create socket */ - handle->fd = socket(PF_CAN, SOCK_RAW, CAN_RAW); + handle->fd = socket(PF_CAN, SOCK_RAW|SOCK_CLOEXEC, CAN_RAW); if (handle->fd < 0) { snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't create raw socket %d:%s", @@ -180,7 +180,7 @@ can_read_linux(pcap_t *handle, int max_p do { - pkth.caplen = recvmsg(handle->fd, &msg, 0); + pkth.caplen = recvmsg(handle->fd, &msg, MSG_CMSG_CLOEXEC); if (handle->break_loop) { handle->break_loop = 0; --- fad-gifc.c.orig +++ fad-gifc.c @@ -156,7 +156,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c /* * Create a socket from which to fetch the list of interfaces. */ - fd = socket(AF_INET, SOCK_DGRAM, 0); + fd = socket(AF_INET, SOCK_DGRAM|SOCK_CLOEXEC, 0); if (fd < 0) { (void)snprintf(errbuf, PCAP_ERRBUF_SIZE, "socket: %s", pcap_strerror(errno)); --- nametoaddr.c.orig +++ nametoaddr.c @@ -440,7 +440,7 @@ pcap_ether_hostton(const char *name) static int init = 0; if (!init) { - fp = fopen(PCAP_ETHERS_FILE, "r"); + fp = fopen(PCAP_ETHERS_FILE, "re"); ++init; if (fp == NULL) return (NULL); --- pcap-usb-linux.c.orig +++ pcap-usb-linux.c @@ -252,7 +252,7 @@ probe_devices(int bus) snprintf(buf, sizeof(buf), "/dev/bus/usb/%03d/%s", bus, data->d_name); - fd = open(buf, O_RDWR); + fd = open(buf, O_RDWR|O_CLOEXEC); if (fd == -1) continue; @@ -323,7 +323,7 @@ usb_activate(pcap_t* handle) /*now select the read method: try to open binary interface */ snprintf(full_path, USB_LINE_LEN, LINUX_USB_MON_DEV"%d", handle->md.ifindex); - handle->fd = open(full_path, O_RDONLY, 0); + handle->fd = open(full_path, O_RDONLY|O_CLOEXEC, 0); if (handle->fd >= 0) { if (handle->opt.rfmon) { @@ -358,7 +358,7 @@ usb_activate(pcap_t* handle) else { /*Binary interface not available, try open text interface */ snprintf(full_path, USB_LINE_LEN, USB_TEXT_DIR"/%dt", handle->md.ifindex); - handle->fd = open(full_path, O_RDONLY, 0); + handle->fd = open(full_path, O_RDONLY|O_CLOEXEC, 0); if (handle->fd < 0) { if (errno == ENOENT) @@ -368,7 +368,7 @@ usb_activate(pcap_t* handle) * the old location. */ snprintf(full_path, USB_LINE_LEN, USB_TEXT_DIR_OLD"/%dt", handle->md.ifindex); - handle->fd = open(full_path, O_RDONLY, 0); + handle->fd = open(full_path, O_RDONLY|O_CLOEXEC, 0); } if (handle->fd < 0) { /* no more fallback, give it up*/ @@ -634,7 +634,7 @@ usb_stats_linux(pcap_t *handle, struct p int fd; snprintf(string, USB_LINE_LEN, USB_TEXT_DIR"/%ds", handle->md.ifindex); - fd = open(string, O_RDONLY, 0); + fd = open(string, O_RDONLY|O_CLOEXEC, 0); if (fd < 0) { if (errno == ENOENT) @@ -644,7 +644,7 @@ usb_stats_linux(pcap_t *handle, struct p * location. */ snprintf(string, USB_LINE_LEN, USB_TEXT_DIR_OLD"/%ds", handle->md.ifindex); - fd = open(string, O_RDONLY, 0); + fd = open(string, O_RDONLY|O_CLOEXEC, 0); } if (fd < 0) { snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, --- pcap-snoop.c.orig +++ pcap-snoop.c @@ -205,7 +205,7 @@ pcap_activate_snoop(pcap_t *p) int snooplen; struct ifreq ifr; - fd = socket(PF_RAW, SOCK_RAW, RAWPROTO_SNOOP); + fd = socket(PF_RAW, SOCK_RAW|SOCK_CLOEXEC, RAWPROTO_SNOOP); if (fd < 0) { snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "snoop socket: %s", pcap_strerror(errno)); --- pcap-bt-linux.c.orig +++ pcap-bt-linux.c @@ -79,7 +79,7 @@ bt_platform_finddevs(pcap_if_t **alldevs int i, sock; int ret = 0; - sock = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI); + sock = socket(AF_BLUETOOTH, SOCK_RAW|SOCK_CLOEXEC, BTPROTO_HCI); if (sock < 0) { /* if bluetooth is not supported this this is not fatal*/ @@ -181,7 +181,7 @@ bt_activate(pcap_t* handle) handle->md.ifindex = dev_id; /* Create HCI socket */ - handle->fd = socket(AF_BLUETOOTH, SOCK_RAW, BTPROTO_HCI); + handle->fd = socket(AF_BLUETOOTH, SOCK_RAW|SOCK_CLOEXEC, BTPROTO_HCI); if (handle->fd < 0) { snprintf(handle->errbuf, PCAP_ERRBUF_SIZE, "Can't create raw socket: %s", strerror(errno)); @@ -282,7 +282,7 @@ bt_read_linux(pcap_t *handle, int max_pa /* ignore interrupt system call error */ do { - ret = recvmsg(handle->fd, &msg, 0); + ret = recvmsg(handle->fd, &msg, MSG_CMSG_CLOEXEC); if (handle->break_loop) { handle->break_loop = 0; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kile for openSUSE:Factory
by root＠hilbert.suse.de 31 Aug '12

31 Aug '12

Hello community, here is the log from the commit of package kile for openSUSE:Factory checked in at 2012-08-31 09:36:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kile (Old) and /work/SRC/openSUSE:Factory/.kile.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kile", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kile/kile.changes 2012-08-28 20:47:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kile.new/kile.changes 2012-08-31 09:36:49.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Aug 26 18:58:23 UTC 2012 - reddwarf(a)opensuse.org + +- Change okular from Requires to Recommends (bnc#777423) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kile.spec ++++++ --- /var/tmp/diff_new_pack.z7TFao/_old 2012-08-31 09:36:50.000000000 +0200 +++ /var/tmp/diff_new_pack.z7TFao/_new 2012-08-31 09:36:50.000000000 +0200 @@ -33,7 +33,6 @@ %endif Requires: konsole Requires: libktexteditor -Requires: okular Requires: texlive-context Requires: texlive-latex Requires: texlive-xetex @@ -45,6 +44,7 @@ Recommends: konqueror Recommends: latex2html Recommends: lilypond +Recommends: okular Recommends: psutils Recommends: texlive-dvips Recommends: texlive-dvipdfmx -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0