openSUSE Commits
Threads by month
- ----- 2024 -----
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
June 2016
- 1 participants
- 1295 discussions
Hello community,
here is the log from the commit of package libreoffice for openSUSE:Factory checked in at 2016-06-30 18:28:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libreoffice (Old)
and /work/SRC/openSUSE:Factory/.libreoffice.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libreoffice"
Changes:
--------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.idO7eX/_old 2016-06-30 18:28:20.000000000 +0200
+++ /var/tmp/diff_new_pack.idO7eX/_new 2016-06-30 18:28:20.000000000 +0200
@@ -25,7 +25,7 @@
<size unit="M">4000</size>
</physicalmemory>
<disk>
- <size unit="G">15</size>
+ <size unit="G">25</size>
</disk>
</hardware>
</overwrite>
1
0
Hello community,
here is the log from the commit of package eaglemode for openSUSE:Factory checked in at 2016-06-29 15:10:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/eaglemode (Old)
and /work/SRC/openSUSE:Factory/.eaglemode.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "eaglemode"
Changes:
--------
--- /work/SRC/openSUSE:Factory/eaglemode/eaglemode.changes 2016-04-28 17:00:55.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.eaglemode.new/eaglemode.changes 2016-06-29 15:10:58.000000000 +0200
@@ -1,0 +2,14 @@
+Sun Jun 26 08:49:45 UTC 2016 - nemysis(a)openSUSE.org
+
+- Update to 0.91.0, announce message:
+
+ * Fixed behavior on virtual desktops with multiple monitors.
+ * Added saving and restoring of window geometry.
+ * On X11, the fullscreen mode now goes via the window manager
+ instead of switching to override-redirect mode.
+ * On Windows, in the virtual cosmos, replaced all the static disk
+ drive items and the home dir item by a single file system
+ item which dynamically lists all available drives.
+ * Minor fixes.
+
+-------------------------------------------------------------------
Old:
----
eaglemode-0.90.0.tar.bz2
New:
----
eaglemode-0.91.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ eaglemode.spec ++++++
--- /var/tmp/diff_new_pack.yZ1WD4/_old 2016-06-29 15:11:00.000000000 +0200
+++ /var/tmp/diff_new_pack.yZ1WD4/_new 2016-06-29 15:11:00.000000000 +0200
@@ -17,7 +17,7 @@
Name: eaglemode
-Version: 0.90.0
+Version: 0.91.0
Release: 0
Summary: Eagle Mode the deep application Cosmos
License: GPL-3.0
++++++ eaglemode-0.90.0.tar.bz2 -> eaglemode-0.91.0.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/eaglemode/eaglemode-0.90.0.tar.bz2 /work/SRC/openSUSE:Factory/.eaglemode.new/eaglemode-0.91.0.tar.bz2 differ: char 11, line 1
1
0
Hello community,
here is the log from the commit of package fwbuilder for openSUSE:Factory checked in at 2016-06-29 15:10:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fwbuilder (Old)
and /work/SRC/openSUSE:Factory/.fwbuilder.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fwbuilder"
Changes:
--------
--- /work/SRC/openSUSE:Factory/fwbuilder/fwbuilder.changes 2015-09-03 18:12:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.fwbuilder.new/fwbuilder.changes 2016-06-29 15:10:56.000000000 +0200
@@ -1,0 +2,15 @@
+Sun Jun 26 10:36:37 UTC 2016 - joop.boonen(a)opensuse.org
+
+- Build version 5.3.6 from the github repo
+ * Several bugfixes for Junos, including rollback on syntax error,
+ correct netmask for host objects and ssh password prompt lock-up
+ * Support for Junos Access lists
+ * Search for objects by port number or ip addres
+ * View graphical diff and autocompile firewall when loading file
+ * Support for Cisco NXOS Access lists
+ * Added support for dummy objects in rules
+ * Port to Qt5
+- Deleted fwbuilder-gcc47.patch as it's not needed any more.
+ The code has been fixed.
+
+-------------------------------------------------------------------
Old:
----
fwbuilder-5.1.0.3599.tar.gz
fwbuilder-gcc47.patch
New:
----
_service
fwbuilder-5.3.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fwbuilder.spec ++++++
--- /var/tmp/diff_new_pack.PVUmAP/_old 2016-06-29 15:10:57.000000000 +0200
+++ /var/tmp/diff_new_pack.PVUmAP/_new 2016-06-29 15:10:57.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package fwbuilder
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,13 @@
Name: fwbuilder
-Version: 5.1.0.3599
+Version: 5.3.6
Release: 0
Summary: Firewall Builder
License: GPL-2.0+
Group: Productivity/Networking/Security
Url: http://www.fwbuilder.org/
-Source: http://sourceforge.net/projects/fwbuilder/files/Current_Packages/5.1.0/%{na…
-# PATCH-FIX-OPENSUSE fwbuilder-gcc47.patch
-Patch0: fwbuilder-gcc47.patch
+Source: %{name}-%{version}.tar.bz2
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
@@ -58,7 +56,6 @@
%prep
%setup -q
-%patch0 -p1
%build
./autogen.sh
++++++ _service ++++++
<services>
<service name="tar_scm" mode="localonly">
<param name="revision">89377704e50e745b5050e783990979d94d6768af</param>
<param name="url">https://github.com/fwbuilder/fwbuilder.git</param>
<param name="version">5.3.6</param>
<param name="scm">git</param>
</service>
<service name="recompress" mode="localonly">
<param name="file">*.tar</param>
<param name="compression">bz2</param>
</service>
<service name="set_version" mode="localonly">
</service>
</services>
++++++ fwbuilder-5.1.0.3599.tar.gz -> fwbuilder-5.3.6.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/fwbuilder/fwbuilder-5.1.0.3599.tar.gz /work/SRC/openSUSE:Factory/.fwbuilder.new/fwbuilder-5.3.6.tar.bz2 differ: char 1, line 1
1
0
Hello community,
here is the log from the commit of package libargtable2 for openSUSE:Factory checked in at 2016-06-29 15:10:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libargtable2 (Old)
and /work/SRC/openSUSE:Factory/.libargtable2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libargtable2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libargtable2/libargtable2.changes 2016-06-19 10:49:08.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libargtable2.new/libargtable2.changes 2016-06-29 15:10:55.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Jun 14 10:15:24 UTC 2016 - jengelh(a)inai.de
+
+- Avoid building static libraries if they will be deleted anyway
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libargtable2.spec ++++++
--- /var/tmp/diff_new_pack.efPZgy/_old 2016-06-29 15:10:56.000000000 +0200
+++ /var/tmp/diff_new_pack.efPZgy/_new 2016-06-29 15:10:56.000000000 +0200
@@ -68,7 +68,7 @@
%patch0
%build
-%configure --docdir=%{_defaultdocdir}/%{name}
+%configure --disable-static --docdir=%{_defaultdocdir}/%{name}
make %{?_smp_mflags}
%install
@@ -78,8 +78,7 @@
install -Dm 0644 doc/%{name1}.3 %{buildroot}%{_mandir}/man3/%{name1}.3
install -Dm 0644 doc/%{name2}.3 %{buildroot}%{_mandir}/man3/%{name2}.3
-# Remove not needed static libraries
-find %{buildroot}%{_libdir} -name '*.la' -print0 -or -name '*.a' -print0 | xargs -0 rm -f
+find %{buildroot}%{_libdir} -type f -name '*.la' -delete
%fdupes -s %{buildroot}%{_prefix}
%fdupes -s %{buildroot}%{_mandir}
1
0
Hello community,
here is the log from the commit of package syncthing-gtk for openSUSE:Factory checked in at 2016-06-29 15:10:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/syncthing-gtk (Old)
and /work/SRC/openSUSE:Factory/.syncthing-gtk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "syncthing-gtk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/syncthing-gtk/syncthing-gtk.changes 2016-05-30 09:56:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.syncthing-gtk.new/syncthing-gtk.changes 2016-06-29 15:10:54.000000000 +0200
@@ -1,0 +2,7 @@
+Sat Jun 25 19:16:12 UTC 2016 - sor.alexei(a)meowr.ru
+
+- Update to version 0.9.0.3:
+ * Better cookie handling when no username nor API key is set.
+ * Update about dialog with link to author's Patreon page.
+
+-------------------------------------------------------------------
Old:
----
syncthing-gtk-0.9.0.2.tar.gz
New:
----
syncthing-gtk-0.9.0.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ syncthing-gtk.spec ++++++
--- /var/tmp/diff_new_pack.aw6a6R/_old 2016-06-29 15:10:55.000000000 +0200
+++ /var/tmp/diff_new_pack.aw6a6R/_new 2016-06-29 15:10:55.000000000 +0200
@@ -19,7 +19,7 @@
%global __requires_exclude typelib\\((Caja|Nautilus|Nemo)\\)
%define _name syncthing_gtk
Name: syncthing-gtk
-Version: 0.9.0.2
+Version: 0.9.0.3
Release: 0
Summary: Syncthing Gtk-based graphical interface
License: GPL-2.0+
++++++ syncthing-gtk-0.9.0.2.tar.gz -> syncthing-gtk-0.9.0.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.9.0.2/README.md new/syncthing-gtk-0.9.0.3/README.md
--- old/syncthing-gtk-0.9.0.2/README.md 2016-05-23 09:58:04.000000000 +0200
+++ new/syncthing-gtk-0.9.0.3/README.md 2016-06-13 13:59:40.000000000 +0200
@@ -5,14 +5,14 @@
[![screenshot1](http://i.imgur.com/N36wmBM.png)](http://i.imgur.com/eX250tQ.png) [![screenshot2](http://i.imgur.com/43mmnC7.png)](http://i.imgur.com/RTRgRdC.png) [![screenshot3](http://i.imgur.com/KDBYekd.png)](http://i.imgur.com/OZ4xEeH.jpg)
-Supported Syncthing features:
+##### Supported Syncthing features
- Everything what WebUI can display
- Adding / editing / deleting nodes
- Adding / editing / deleting repositories
- Restart / shutdown server
- Editing daemon settings
-Additional features:
+##### Additional features
- First run wizard for initial configuration
- Running Syncthing daemon in background
- Half-automatic setup for new nodes and repositories
@@ -20,7 +20,11 @@
- Nautilus (a.k.a. Files), Nemo and Caja integration
- Desktop notifications
-Packages:
+##### Like what I'm doing?
+<a href="https://www.patreon.com/kozec">Help me become filthy rich on <img src="http://kozec.com/patreon-logo.png"></a>
+
+
+##### Packages
- Ubuntu (deb-based distros): in [Web Upd8 PPA](https://launchpad.net/~nilarimogard/+archive/ubuntu/webupd8/) (thanks!) or [DEBs](http://ppa.launchpad.net/nilarimogard/webupd8/ubuntu/pool/main/s/sync…
- Arch Linux: In [[community] repository](https://www.archlinux.org/packages/community/any/syncthing-gtk/)
- Fedora: [in decathorpe's copr repository](https://copr.fedoraproject.org/coprs/decathorpe/syncthing/)
@@ -28,7 +32,7 @@
- Windows: Get [latest installer from here](https://github.com/kozec/syncthing-gui/releases/latest), or use [the Chocolatey package](https://chocolatey.org/packages/syncthing-gtk).
- Or, in worst case scenario, download [latest tarball](https://github.com/kozec/syncthing-gui/releases/latest), extract it and run syncthing-gtk.py.
-Dependencies:
+##### Dependencies
- python 2.7, GTK 3.8 or newer and [PyGObject](https://live.gnome.org/PyGObject)
- [python-gi-cairo](https://packages.debian.org/sid/python-gi-cairo) and [gir1.2-rsvg-2.0](https://packages.debian.org/sid/gir1.2-rsvg-2.0) on debian based distros (included in PyGObject elsewhere)
- [python-dateutil](http://labix.org/python-dateutil) (Python 2 version)
@@ -36,12 +40,12 @@
- [psmisc](http://psmisc.sourceforge.net) (for the `killall` command)
- [Syncthing][syncthing] v0.12 or newer
-Optional Dependencies:
+##### Optional Dependencies
- [pyinotify](https://github.com/seb-m/pyinotify/wiki) for instant synchronization.
- libnotify for desktop notifications.
- nautilus-python, nemo-python or caja-python for filemanager integration
-Windows Building Dependencies _(you don't need to install these just to **run** Syncthing-GTK)_
+##### Windows Building Dependencies _(you don't need to install these just to **run** Syncthing-GTK)_
- Python for Windows 2.7
- [PyGObject for Windows](http://sourceforge.net/projects/pygobjectwin32/) with GTK3 enabled (tested with version 3.14.0)
- [python-dateutil](http://labix.org/python-dateutil) (Python 2 version)
@@ -50,9 +54,7 @@
- [syncthing-inotify](https://github.com/syncthing/syncthing-inotify) (optional)
- [NSIS2](http://nsis.sourceforge.net/NSIS_2) with NSISdl, [ZipDLL](http://nsis.sourceforge.net/ZipDLL_plug-in) and [FindProcDLL](http://forums.winamp.com/showpost.php?p=2777729&postcount=8) plugins (optional, for building installer)
-Related links:
-- http://syncthing.net
+##### Related links
+- https://syncthing.net
- https://forum.syncthing.net/t/syncthing-gtk-gui-for-syncthing-now-with-inot…
- https://forum.syncthing.net/t/lxle-a-respin-of-lubuntu-now-has-syncthing-in…
-
-[syncthing]: https://syncthing.net
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.9.0.2/about.glade new/syncthing-gtk-0.9.0.3/about.glade
--- old/syncthing-gtk-0.9.0.2/about.glade 2016-05-23 09:58:04.000000000 +0200
+++ new/syncthing-gtk-0.9.0.3/about.glade 2016-06-13 13:59:40.000000000 +0200
@@ -1,39 +1,149 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="3.8"/>
- <object class="GtkAboutDialog" id="dialog">
+ <requires lib="gtk+" version="3.10"/>
+ <object class="GtkDialog" id="dialog">
<property name="can_focus">False</property>
+ <property name="title" translatable="yes">About SC-Controller</property>
+ <property name="icon">../images/sc-controller-small.svg</property>
<property name="type_hint">dialog</property>
- <property name="program_name">Syncthing-GTK</property>
- <property name="copyright" translatable="yes">Code&UI © 2014 Kozec</property>
- <property name="comments" translatable="yes">GTK GUI and notification area icon for Syncthing</property>
- <property name="website">https://github.com/kozec/syncthing-gui</property>
- <property name="website_label" translatable="yes">GitHub</property>
- <property name="logo">icons/st-gtk-logo.png</property>
- <property name="license_type">gpl-2-0</property>
<signal name="response" handler="on_dialog_response" swapped="no"/>
<child internal-child="vbox">
- <object class="GtkBox" id="aboutdialog-vbox1">
+ <object class="GtkBox" id="vb1">
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
- <object class="GtkButtonBox" id="aboutdialog-action_area1">
+ <object class="GtkButtonBox" id="vb2">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <placeholder/>
+ <object class="GtkButton" id="btnClose">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="on_dialog_response" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="vb3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">50</property>
+ <property name="margin_right">50</property>
+ <property name="margin_top">10</property>
+ <property name="margin_bottom">10</property>
+ <property name="orientation">vertical</property>
<child>
- <placeholder/>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_bottom">10</property>
+ <property name="pixbuf">icons/st-gtk-logo.png</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"><span size="large"><b>Syncthing-GTK</b></span></property>
+ <property name="use_markup">True</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="lblVersion">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">10</property>
+ <property name="label" translatable="yes">(version)</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_bottom">20</property>
+ <property name="label" translatable="yes">GUI and notification area icon for Syncthing</property>
+ <property name="use_markup">True</property>
+ <property name="justify">center</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="margin_bottom">50</property>
+ <property name="label" translatable="yes">Code&amp;UI © 2016 Kozec
+Source code available on <b><a href="http://github.com/kozec/syncthing-gtk">GitHub</a></b>
+Saying thanks in monetary way available on <b><a href="https://www.patreon.com/kozec">Patreon</a></b></property>
+ <property name="use_markup">True</property>
+ <property name="justify">center</property>
+ <property name="yalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="margin_top">10</property>
+ <property name="label" translatable="yes"><small>This program comes with absolutely no warranty.
+See the <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License, version 2 or later</a> for details.</small></property>
+ <property name="use_markup">True</property>
+ <property name="justify">center</property>
+ <property name="yalign">1</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.9.0.2/scripts/syncthing-gtk-exe.py new/syncthing-gtk-0.9.0.3/scripts/syncthing-gtk-exe.py
--- old/syncthing-gtk-0.9.0.2/scripts/syncthing-gtk-exe.py 2016-05-23 09:58:04.000000000 +0200
+++ new/syncthing-gtk-0.9.0.3/scripts/syncthing-gtk-exe.py 2016-06-13 13:59:40.000000000 +0200
@@ -31,6 +31,8 @@
from syncthing_gtk.tools import get_install_path
path = get_install_path()
os.chdir(path)
+ print os.environ["PATH"]
+ os.environ["PATH"] = path
from syncthing_gtk.tools import init_logging, init_locale
from syncthing_gtk import windows
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.9.0.2/syncthing_gtk/aboutdialog.py new/syncthing-gtk-0.9.0.3/syncthing_gtk/aboutdialog.py
--- old/syncthing-gtk-0.9.0.2/syncthing_gtk/aboutdialog.py 2016-05-23 09:58:04.000000000 +0200
+++ new/syncthing-gtk-0.9.0.3/syncthing_gtk/aboutdialog.py 2016-06-13 13:59:40.000000000 +0200
@@ -58,7 +58,7 @@
# App is None or daemon version is not yet known
pass
# Display versions in UI
- self.dialog.set_version(app_ver)
+ self.builder.get_object("lblVersion").set_label(app_ver)
def on_dialog_response(self, *a):
self.close()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.9.0.2/syncthing_gtk/app.py new/syncthing-gtk-0.9.0.3/syncthing_gtk/app.py
--- old/syncthing-gtk-0.9.0.2/syncthing_gtk/app.py 2016-05-23 09:58:04.000000000 +0200
+++ new/syncthing-gtk-0.9.0.3/syncthing_gtk/app.py 2016-06-13 13:59:40.000000000 +0200
@@ -258,7 +258,8 @@
add_simple_action('show_id', self.cb_menu_show_id)
add_simple_action('daemon_shutdown', self.cb_menu_shutdown)
add_simple_action('daemon_restart', self.cb_menu_restart)
-
+
+
def setup_widgets(self):
self.builder = UIBuilder()
# Set conditions for UIBuilder
@@ -1169,6 +1170,11 @@
if not self["window"].is_visible():
self["window"].show()
if IS_WINDOWS and not self.config["window_position"] is None:
+ scr = Gdk.Screen.get_default()
+ self.config["window_position"] = (
+ min(self.config["window_position"][0], scr.width() - 300),
+ min(self.config["window_position"][1], scr.height() - 100)
+ )
self["window"].move(*self.config["window_position"] )
if self.connect_dialog != None:
self.connect_dialog.show()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.9.0.2/syncthing_gtk/daemon.py new/syncthing-gtk-0.9.0.3/syncthing_gtk/daemon.py
--- old/syncthing-gtk-0.9.0.2/syncthing_gtk/daemon.py 2016-05-23 09:58:04.000000000 +0200
+++ new/syncthing-gtk-0.9.0.3/syncthing_gtk/daemon.py 2016-06-13 13:59:40.000000000 +0200
@@ -419,13 +419,28 @@
# Too late, throw it away
con.close(None)
log.verbose("Discarded old connection for %s", command)
- # Build GET request
- get_str = "\r\n".join([
- "GET /rest/%s HTTP/1.0" % command,
- (("X-API-Key: %s" % self._api_key) if not self._api_key is None else "X-nothing: x"),
- "Connection: close",
- "", ""
- ]).encode("utf-8")
+ if self._CSRFtoken is None and self._api_key is None:
+ # Request CSRF token first
+ log.verbose("Requesting cookie")
+ get_str = "\r\n".join([
+ "GET / HTTP/1.0",
+ "Host: %s" % self._address,
+ (("X-API-Key: %s" % self._api_key) if not self._api_key is None else "X-nothing: x"),
+ "Connection: close",
+ "",
+ "",
+ ]).encode("utf-8")
+ else:
+ # Build GET request
+ get_str = "\r\n".join([
+ "GET /rest/%s HTTP/1.0" % command,
+ "Cookie: %s" % self._CSRFtoken,
+ (("X-%s" % self._CSRFtoken.replace("=", ": ")) if self._CSRFtoken else "X-nothing: x"),
+ (("X-API-Key: %s" % self._api_key) if not self._api_key is None else "X-nothing2: x"),
+
+ "Connection: close",
+ "", ""
+ ]).encode("utf-8")
# Send it out and wait for response
try:
con.get_output_stream().write_all(get_str, None)
@@ -456,6 +471,20 @@
return
con.close(None)
response = "".join(buffer)
+ if self._CSRFtoken is None and self._api_key is None:
+ # I wanna cookie!
+ self._parse_csrf(response.split("\n"))
+ if self._CSRFtoken == None:
+ # This is pretty fatal and likely to fail again,
+ # so request is not repeated automaticaly
+ if error_callback == None:
+ log.error("Request '%s' failed: Error: failed to get CSRF cookie from daemon", command)
+ else:
+ self._rest_error(Exception("Failed to get CSRF cookie"), epoch, command, callback, error_callback, callback_data)
+ return
+ # Repeat request with acqiured cookie
+ self._rest_request(command, callback, error_callback, *callback_data)
+ return
# Split headers from response
try:
headers, response = response.split("\r\n\r\n", 1)
@@ -557,9 +586,9 @@
post_str = "\r\n".join([
"POST /rest/%s HTTP/1.0" % command,
"Connection: close",
- "Cookie: CSRF-Token=%s" % self._CSRFtoken,
- "X-CSRF-Token: %s" % self._CSRFtoken,
- (("X-API-Key: %s" % self._api_key) if not self._api_key is None else "X-nothing: x"),
+ "Cookie: %s" % self._CSRFtoken,
+ (("X-%s" % self._CSRFtoken.replace("=", ": ")) if self._CSRFtoken else "X-nothing: x"),
+ (("X-API-Key: %s" % self._api_key) if not self._api_key is None else "X-nothing2: x"),
"Content-Length: %s" % len(json_str),
"Content-Type: application/json",
"",
@@ -598,16 +627,7 @@
# Parse response
if self._CSRFtoken is None and self._api_key is None:
# I wanna cookie!
- response = response.split("\n")
- for d in response:
- if d.startswith("Set-Cookie:"):
- for c in d.split(":", 1)[1].split(";"):
- if c.strip().startswith("CSRF-Token="):
- self._CSRFtoken = c.split("=", 1)[1].strip(" \r\n")
- log.verbose("Got new cookie: %s", self._CSRFtoken)
- break
- if self._CSRFtoken != None:
- break
+ self._parse_csrf(response.split("\n"))
if self._CSRFtoken == None:
# This is pretty fatal and likely to fail again,
# so request is not repeated automaticaly
@@ -672,6 +692,17 @@
log.error("Post '%s' failed; Repeating...", command)
self.timer(None, 1, self._rest_post, command, data, callback, error_callback, callback_data)
+ def _parse_csrf(self, response):
+ for d in response:
+ if d.startswith("Set-Cookie:"):
+ for c in d.split(":", 1)[1].split(";"):
+ if c.strip().startswith("CSRF-Token-"):
+ self._CSRFtoken = c.strip(" \r\n")
+ log.verbose("Got new cookie: %s", self._CSRFtoken)
+ break
+ if self._CSRFtoken != None:
+ break
+
def _request_config(self, *a):
""" Request settings from syncthing daemon """
self._rest_request("system/config", self._syncthing_cb_config, self._syncthing_cb_config_error)
@@ -984,7 +1015,7 @@
def _syncthing_cb_config_error(self, exception, command):
self.cancel_all()
if isinstance(exception, GLib.GError):
- if exception.code in (0, 39, 34): # Connection Refused / Cannot connect to destination
+ if exception.code in (0, 39, 34, 45): # Connection Refused / Cannot connect to destination
# It usualy means that daemon is not yet fully started or not running at all.
epoch = self._epoch
self.emit("connection-error", Daemon.REFUSED, exception.message, exception)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/syncthing-gtk-0.9.0.2/syncthing_gtk/windows.py new/syncthing-gtk-0.9.0.3/syncthing_gtk/windows.py
--- old/syncthing-gtk-0.9.0.2/syncthing_gtk/windows.py 2016-05-23 09:58:04.000000000 +0200
+++ new/syncthing-gtk-0.9.0.3/syncthing_gtk/windows.py 2016-06-13 13:59:40.000000000 +0200
@@ -15,7 +15,7 @@
log = logging.getLogger("windows.py")
SM_SHUTTINGDOWN = 0x2000
-ST_INOTIFY_EXE = "syncthing-inotify-v0.7.exe"
+ST_INOTIFY_EXE = "syncthing-inotify-v0.8.2.exe"
def fix_localized_system_error_messages():
"""
1
0
Hello community,
here is the log from the commit of package peerunity for openSUSE:Factory checked in at 2016-06-29 15:10:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/peerunity (Old)
and /work/SRC/openSUSE:Factory/.peerunity.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "peerunity"
Changes:
--------
--- /work/SRC/openSUSE:Factory/peerunity/peerunity.changes 2016-06-12 18:55:03.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.peerunity.new/peerunity.changes 2016-06-29 15:10:53.000000000 +0200
@@ -1,0 +2,5 @@
+Sat Jun 25 18:47:30 UTC 2016 - vpereira(a)suse.com
+
+- Fixed gcc6 related errors with gcc6.patch
+
+-------------------------------------------------------------------
New:
----
gcc6.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ peerunity.spec ++++++
--- /var/tmp/diff_new_pack.baiTnY/_old 2016-06-29 15:10:54.000000000 +0200
+++ /var/tmp/diff_new_pack.baiTnY/_new 2016-06-29 15:10:54.000000000 +0200
@@ -39,6 +39,7 @@
Group: Productivity/Networking/Other
Url: https://github.com/%{name}/%{name}/
Source0: %{name}-%{version}.tar.gz
+Patch0: gcc6.patch
BuildRequires: boost-devel
BuildRequires: libqt4-devel
BuildRequires: openssl-devel
@@ -79,6 +80,8 @@
%prep
%setup -q
+%patch0 -p1
+
%build
%if 0%{?fedora} || 0%{?centos_version}
++++++ gcc6.patch ++++++
Index: peerunity-0.2.2/src/net.cpp
===================================================================
--- peerunity-0.2.2.orig/src/net.cpp
+++ peerunity-0.2.2/src/net.cpp
@@ -53,7 +53,7 @@ static bool vfReachable[NET_MAX] = {};
static bool vfLimited[NET_MAX] = {};
static CNode* pnodeLocalHost = NULL;
uint64 nLocalHostNonce = 0;
-array<int, THREAD_MAX> vnThreadsRunning;
+boost::array<int, THREAD_MAX> vnThreadsRunning;
static std::vector<SOCKET> vhListenSocket;
CAddrMan addrman;
1
0
Hello community,
here is the log from the commit of package vim-plugins for openSUSE:Factory checked in at 2016-06-29 15:10:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vim-plugins (Old)
and /work/SRC/openSUSE:Factory/.vim-plugins.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vim-plugins"
Changes:
--------
--- /work/SRC/openSUSE:Factory/vim-plugins/vim-plugins.changes 2016-06-03 16:38:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.vim-plugins.new/vim-plugins.changes 2016-06-29 15:10:51.000000000 +0200
@@ -1,0 +2,5 @@
+Sat Jun 25 13:41:30 UTC 2016 - sebix+novell.com(a)sebix.at
+
+- Update vim-plugin-gnupg to upstream version 2.6
+
+-------------------------------------------------------------------
Old:
----
vimplugin-gnupg-3026.tar.bz2
New:
----
vimplugin-gnupg-2.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vim-plugins.spec ++++++
--- /var/tmp/diff_new_pack.UEt6ch/_old 2016-06-29 15:10:53.000000000 +0200
+++ /var/tmp/diff_new_pack.UEt6ch/_new 2016-06-29 15:10:53.000000000 +0200
@@ -43,7 +43,7 @@
%define latex_version 20120125
%define quilt_version 0.9.7
%define vimwiki_version 2.1
-%define gnupg_version 3026
+%define gnupg_version 2.6
%define gitdiff_version 2
%define snipmate_version 0.83
%define rails_version 4.4
@@ -484,6 +484,7 @@
Summary: Plugin for transparent editing of gpg encrypted files
License: GPL-1.0+
Group: Productivity/Text/Editors
+Url: https://github.com/jamessan/vim-gnupg
Requires: gpg2
%description -n vim-plugin-gnupg
@@ -491,8 +492,8 @@
must have a ".gpg", ".pgp" or ".asc" suffix. When opening such a file the
content is decrypted, when opening a new file the script will ask for the
recipients of the encrypted file. The file content will be encrypted to all
-recipients before it is written. The script turns off viminfo and swapfile to
-increase security.
+recipients before it is written. The script turns off viminfo, swapfile, and
+undofile to increase security.
%package -n vim-plugin-gitdiff
++++++ vimplugin-gnupg-3026.tar.bz2 -> vimplugin-gnupg-2.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/vimplugin-gnupg-3026/plugin/gnupg.vim new/vimplugin-gnupg-2.6/plugin/gnupg.vim
--- old/vimplugin-gnupg-3026/plugin/gnupg.vim 2010-03-31 16:37:48.000000000 +0200
+++ new/vimplugin-gnupg-2.6/plugin/gnupg.vim 2016-04-25 05:27:34.000000000 +0200
@@ -1,10 +1,13 @@
" Name: gnupg.vim
-" Version: $Id: gnupg.vim 3026 2010-01-27 08:18:04Z mbr $
-" Author: Markus Braun <markus.braun(a)krawel.de>
+" Last Change: 2016 Apr 24
+" Maintainer: James McCoy <jamessan(a)jamessan.com>
+" Original Author: Markus Braun <markus.braun(a)krawel.de>
" Summary: Vim plugin for transparent editing of gpg encrypted files.
-" Licence: This program is free software; you can redistribute it and/or
-" modify it under the terms of the GNU General Public License.
-" See http://www.gnu.org/copyleft/gpl.txt
+" License: This program is free software; you can redistribute it and/or
+" modify it under the terms of the GNU General Public License
+" as published by the Free Software Foundation; either version
+" 2 of the License, or (at your option) any later version.
+" See http://www.gnu.org/copyleft/gpl-2.0.txt
"
" Section: Documentation {{{1
"
@@ -15,7 +18,7 @@
" a file the content is decrypted, when opening a new file the script will
" ask for the recipients of the encrypted file. The file content will be
" encrypted to all recipients before it is written. The script turns off
-" viminfo and swapfile to increase security.
+" viminfo, swapfile, and undofile to increase security.
"
" Installation: {{{2
"
@@ -39,6 +42,17 @@
" Most distributions provide software to ease handling of gpg and gpg-agent.
" Examples are keychain or seahorse.
"
+" If there are specific actions that should take place when editing a
+" GnuPG-managed buffer, an autocmd for the User event and GnuPG pattern can
+" be defined. For example, the following will set 'textwidth' to 72 for all
+" GnuPG-encrypted buffers:
+"
+" autocmd User GnuPG setl textwidth=72
+"
+" This will be triggered before any BufRead or BufNewFile autocmds, and
+" therefore will not take precedence over settings specific to any filetype
+" that may get set.
+"
" Commands: {{{2
"
" :GPGEditRecipients
@@ -61,8 +75,9 @@
" Variables: {{{2
"
" g:GPGExecutable
-" If set used as gpg executable, otherwise the system chooses what is run
-" when "gpg" is called. Defaults to "gpg".
+" If set used as gpg executable. If unset, defaults to
+" "gpg --trust-model always" if "gpg" is available, falling back to
+" "gpg2 --trust-model always" if not.
"
" g:GPGUseAgent
" If set to 0 a possible available gpg-agent won't be used. Defaults to 1.
@@ -71,7 +86,8 @@
" If set to 1 symmetric encryption is preferred for new files. Defaults to 0.
"
" g:GPGPreferArmor
-" If set to 1 armored data is preferred for new files. Defaults to 0.
+" If set to 1 armored data is preferred for new files. Defaults to 0
+" unless a "*.asc" file is being edited.
"
" g:GPGPreferSign
" If set to 1 signed data is preferred for new files. Defaults to 0.
@@ -80,9 +96,36 @@
" If set, these recipients are used as defaults when no other recipient is
" defined. This variable is a Vim list. Default is unset.
"
+" g:GPGPossibleRecipients
+" If set, these contents are loaded into the recipients dialog. This
+" allows to add commented lines with possible recipients to the list,
+" which can be uncommented to select the actual recipients. Default is
+" unset. Example:
+"
+" let g:GPGPossibleRecipients=[
+" \"Example User <example(a)example.com>",
+" \"Other User <otherexample(a)example.com>"
+" \]
+"
+"
+" g:GPGUsePipes
+" If set to 1, use pipes instead of temporary files when interacting with
+" gnupg. When set to 1, this can cause terminal-based gpg agents to not
+" display correctly when prompting for passwords. Defaults to 0.
+"
+" g:GPGHomedir
+" If set, specifies the directory that will be used for GPG's homedir.
+" This corresponds to gpg's --homedir option. This variable is a Vim
+" string. Default is unset.
+"
+" g:GPGFilePattern
+" If set, overrides the default set of file patterns that determine
+" whether this plugin will be activated. Defaults to
+" '*.\(gpg\|asc\|pgp\)'.
+"
" Known Issues: {{{2
"
-" In some cases gvim can't decryt files
+" In some cases gvim can't decrypt files
" This is caused by the fact that a running gvim has no TTY and thus gpg is
" not able to ask for the passphrase by itself. This is a problem for Windows
@@ -102,6 +145,13 @@
" you will get a popup window the first time you open a file that
" needs to be decrypted.
"
+" If you're using Vim <7.4.959, after the plugin runs any external command,
+" Vim will no longer be able to yank to/paste from the X clipboard or
+" primary selections. This is caused by a workaround for a different bug
+" where Vim no longer recognizes the key codes for keys such as the arrow
+" keys after running GnuPG. See the discussion at
+" https://github.com/jamessan/vim-gnupg/issues/36 for more details.
+"
" Credits: {{{2
"
" - Mathieu Clabaut for inspirations through his vimspell.vim script.
@@ -109,54 +159,61 @@
" - Erik Remmelzwaal for patch to enable windows support and patient beta
" testing.
" - Lars Becker for patch to make gpg2 working.
-" - Thomas Arendsen Hein for patch to convert encoding of gpg output
+" - Thomas Arendsen Hein for patch to convert encoding of gpg output.
" - Karl-Heinz Ruskowski for patch to fix unknown recipients and trust model
" and patient beta testing.
" - Giel van Schijndel for patch to get GPG_TTY dynamically.
" - Sebastian Luettich for patch to fix issue with symmetric encryption an set
" recipients.
-" - Tim Swast for patch to generate signed files
+" - Tim Swast for patch to generate signed files.
+" - James Vega for patches for better '*.asc' handling, better filename
+" escaping and better handling of multiple keyrings.
"
" Section: Plugin header {{{1
" guard against multiple loads {{{2
-if (exists("g:loaded_gnupg") || &cp || exists("#BufReadPre#*.\(gpg\|asc\|pgp\)"))
+if (exists("g:loaded_gnupg") || &cp || exists("#GnuPG"))
finish
endif
-let g:loaded_gnupg = "$Revision: 3026 $"
+let g:loaded_gnupg = '2.6'
+let s:GPGInitRun = 0
" check for correct vim version {{{2
-if (v:version < 700)
- echohl ErrorMsg | echo 'plugin gnupg.vim requires Vim version >= 7.0' | echohl None
+if (v:version < 702)
+ echohl ErrorMsg | echo 'plugin gnupg.vim requires Vim version >= 7.2' | echohl None
finish
endif
" Section: Autocmd setup {{{1
+if (!exists("g:GPGFilePattern"))
+ let g:GPGFilePattern = '*.\(gpg\|asc\|pgp\)'
+endif
+
augroup GnuPG
autocmd!
- " initialize the internal variables
- autocmd BufNewFile,BufReadPre,FileReadPre *.\(gpg\|asc\|pgp\) call s:GPGInit()
- " force the user to edit the recipient list if he opens a new file and public
- " keys are preferred
- autocmd BufNewFile *.\(gpg\|asc\|pgp\) if (exists("g:GPGPreferSymmetric") && g:GPGPreferSymmetric == 0) | call s:GPGEditRecipients() | endif
" do the decryption
- autocmd BufReadPost,FileReadPost *.\(gpg\|asc\|pgp\) call s:GPGDecrypt()
+ exe "autocmd BufReadCmd " . g:GPGFilePattern . " call s:GPGInit(1) |" .
+ \ " call s:GPGDecrypt(1)"
+ exe "autocmd FileReadCmd " . g:GPGFilePattern . " call s:GPGInit(0) |" .
+ \ " call s:GPGDecrypt(0)"
" convert all text to encrypted text before writing
- autocmd BufWritePre,FileWritePre *.\(gpg\|asc\|pgp\) call s:GPGEncrypt()
- " undo the encryption so we are back in the normal text, directly
- " after the file has been written.
- autocmd BufWritePost,FileWritePost *.\(gpg\|asc\|pgp\) call s:GPGEncryptPost()
+ " We check for GPGCorrespondingTo to avoid triggering on writes in GPG Options/Recipient windows
+ exe "autocmd BufWriteCmd,FileWriteCmd " . g:GPGFilePattern . " if !exists('b:GPGCorrespondingTo') |" .
+ \ " call s:GPGInit(0) |" .
+ \ " call s:GPGEncrypt() |" .
+ \ " endif"
" cleanup on leaving vim
- autocmd VimLeave *.\(gpg\|asc\|pgp\) call s:GPGCleanup()
+ exe "autocmd VimLeave " . g:GPGFilePattern . " call s:GPGCleanup()"
augroup END
" Section: Constants {{{1
let s:GPGMagicString = "\t \t"
+let s:keyPattern = '\%(0x\)\=[[:xdigit:]]\{8,16}'
" Section: Highlight setup {{{1
@@ -166,23 +223,67 @@
" Section: Functions {{{1
-" Function: s:GPGInit() {{{2
+" Function: s:shellescape(s[, special]) {{{2
+"
+" Calls shellescape(), also taking into account 'shellslash'
+" when on Windows and using $COMSPEC as the shell.
+"
+" Returns: shellescaped string
+"
+function s:shellescape(s, ...)
+ let special = a:0 ? a:1 : 0
+ if exists('+shellslash') && &shell == $COMSPEC
+ let ssl = &shellslash
+ set noshellslash
+
+ let escaped = shellescape(a:s, special)
+
+ let &shellslash = ssl
+ else
+ let escaped = shellescape(a:s, special)
+ endif
+
+ return escaped
+endfunction
+
+" Function: s:GPGInit(bufread) {{{2
"
" initialize the plugin
+" The bufread argument specifies whether this was called due to BufReadCmd
"
-function s:GPGInit()
- call s:GPGDebug(3, ">>>>>>>> Entering s:GPGInit()")
+function s:GPGInit(bufread)
+ call s:GPGDebug(3, printf(">>>>>>>> Entering s:GPGInit(%d)", a:bufread))
- " first make sure nothing is written to ~/.viminfo while editing
- " an encrypted file.
- set viminfo=
+ " For FileReadCmd, we're reading the contents into another buffer. If that
+ " buffer is also destined to be encrypted, then these settings will have
+ " already been set, otherwise don't set them since it limits the
+ " functionality of the cleartext buffer.
+ if a:bufread
+ " we don't want a swap file, as it writes unencrypted data to disk
+ setl noswapfile
+
+ " if persistent undo is present, disable it for this buffer
+ if exists('+undofile')
+ setl noundofile
+ endif
- " we don't want a swap file, as it writes unencrypted data to disk
- set noswapfile
+ " first make sure nothing is written to ~/.viminfo while editing
+ " an encrypted file.
+ set viminfo=
+ endif
+
+ " the rest only has to be run once
+ if s:GPGInitRun
+ return
+ endif
" check what gpg command to use
if (!exists("g:GPGExecutable"))
- let g:GPGExecutable = "gpg --trust-model always"
+ if executable("gpg")
+ let g:GPGExecutable = "gpg --trust-model always"
+ else
+ let g:GPGExecutable = "gpg2 --trust-model always"
+ endif
endif
" check if gpg-agent is allowed
@@ -195,11 +296,6 @@
let g:GPGPreferSymmetric = 0
endif
- " check if armored files are preferred
- if (!exists("g:GPGPreferArmor"))
- let g:GPGPreferArmor = 0
- endif
-
" check if signed files are preferred
if (!exists("g:GPGPreferSign"))
let g:GPGPreferSign = 0
@@ -210,42 +306,46 @@
let g:GPGDefaultRecipients = []
endif
+ if (!exists("g:GPGPossibleRecipients"))
+ let g:GPGPossibleRecipients = []
+ endif
+
+
+ " prefer not to use pipes since it can garble gpg agent display
+ if (!exists("g:GPGUsePipes"))
+ let g:GPGUsePipes = 0
+ endif
+
+ " allow alternate gnupg homedir
+ if (!exists('g:GPGHomedir'))
+ let g:GPGHomedir = ''
+ endif
+
" print version
call s:GPGDebug(1, "gnupg.vim ". g:loaded_gnupg)
- " determine if gnupg can use the gpg-agent
- if (exists("$GPG_AGENT_INFO") && g:GPGUseAgent == 1)
- if (!exists("$GPG_TTY") && !has("gui_running"))
- let $GPG_TTY = system("tty")
- if (v:shell_error)
- let $GPG_TTY = ""
- echohl GPGError
- echom "The GPG_TTY is not set and no TTY could be found using the `tty` command!"
- echom "gpg-agent might not work."
- echohl None
- endif
- endif
- let s:GPGCommand = g:GPGExecutable . " --use-agent"
- else
- let s:GPGCommand = g:GPGExecutable . " --no-use-agent"
- endif
+ let s:GPGCommand = g:GPGExecutable
- " don't use tty in gvim
+ " don't use tty in gvim except for windows: we get their a tty for free.
" FIXME find a better way to avoid an error.
" with this solution only --use-agent will work
- if (has("gui_running"))
- let s:GPGCommand = s:GPGCommand . " --no-tty"
+ if (has("gui_running") && !has("gui_win32"))
+ let s:GPGCommand .= " --no-tty"
endif
" setup shell environment for unix and windows
let s:shellredirsave = &shellredir
let s:shellsave = &shell
+ let s:shelltempsave = &shelltemp
+ " noshelltemp isn't currently supported on Windows, but it doesn't cause any
+ " errors and this future proofs us against requiring changes if Windows
+ " gains noshelltemp functionality
+ let s:shelltemp = !g:GPGUsePipes
if (has("unix"))
" unix specific settings
let s:shellredir = ">%s 2>&1"
let s:shell = '/bin/sh'
let s:stderrredirnull = '2>/dev/null'
- let s:GPGCommand = "LANG=C LC_ALL=C " . s:GPGCommand
else
" windows specific settings
let s:shellredir = '>%s'
@@ -255,6 +355,7 @@
call s:GPGDebug(3, "shellredirsave: " . s:shellredirsave)
call s:GPGDebug(3, "shellsave: " . s:shellsave)
+ call s:GPGDebug(3, "shelltempsave: " . s:shelltempsave)
call s:GPGDebug(3, "shell: " . s:shell)
call s:GPGDebug(3, "shellcmdflag: " . &shellcmdflag)
@@ -265,25 +366,51 @@
call s:GPGDebug(3, "shell implementation: " . resolve(s:shell))
" find the supported algorithms
- let commandline = s:GPGCommand . " --version"
- call s:GPGDebug(2, "command: ". commandline)
- let &shellredir = s:shellredir
- let &shell = s:shell
- let output = system(commandline)
- let &shellredir = s:shellredirsave
- let &shell = s:shellsave
- call s:GPGDebug(2, "output: ". output)
+ let output = s:GPGSystem({ 'level': 2, 'args': '--version' })
+ let gpgversion = substitute(output, '^gpg (GnuPG) \([0-9]\+\.\d\+\).*', '\1', '')
let s:GPGPubkey = substitute(output, ".*Pubkey: \\(.\\{-}\\)\n.*", "\\1", "")
let s:GPGCipher = substitute(output, ".*Cipher: \\(.\\{-}\\)\n.*", "\\1", "")
let s:GPGHash = substitute(output, ".*Hash: \\(.\\{-}\\)\n.*", "\\1", "")
let s:GPGCompress = substitute(output, ".*Compress.\\{-}: \\(.\\{-}\\)\n.*", "\\1", "")
+ " determine if gnupg can use the gpg-agent
+ if (str2float(gpgversion) >= 2.1 || (exists("$GPG_AGENT_INFO") && g:GPGUseAgent == 1))
+ if (!exists("$GPG_TTY") && !has("gui_running"))
+ " Need to determine the associated tty by running a command in the
+ " shell. We can't use system() here because that doesn't run in a shell
+ " connected to a tty, so it's rather useless.
+ "
+ " Save/restore &modified so the buffer isn't incorrectly marked as
+ " modified just by detecting the correct tty value.
+ " Do the &undolevels dance so the :read and :delete don't get added into
+ " the undo tree, as the user needn't be aware of these.
+ let [mod, levels] = [&l:modified, &undolevels]
+ set undolevels=-1
+ silent read !tty
+ let $GPG_TTY = getline('.')
+ silent delete
+ let [&l:modified, &undolevels] = [mod, levels]
+ " redraw is needed since we're using silent to run !tty, c.f. :help :!
+ redraw!
+ if (v:shell_error)
+ let $GPG_TTY = ""
+ echohl GPGWarning
+ echom "$GPG_TTY is not set and the `tty` command failed! gpg-agent might not work."
+ echohl None
+ endif
+ endif
+ let s:GPGCommand .= " --use-agent"
+ else
+ let s:GPGCommand .= " --no-use-agent"
+ endif
+
call s:GPGDebug(2, "public key algorithms: " . s:GPGPubkey)
call s:GPGDebug(2, "cipher algorithms: " . s:GPGCipher)
call s:GPGDebug(2, "hashing algorithms: " . s:GPGHash)
call s:GPGDebug(2, "compression algorithms: " . s:GPGCompress)
call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGInit()")
+ let s:GPGInitRun = 1
endfunction
" Function: s:GPGCleanup() {{{2
@@ -300,34 +427,63 @@
call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGCleanup()")
endfunction
-" Function: s:GPGDecrypt() {{{2
+" Function: s:GPGDecrypt(bufread) {{{2
"
" decrypt the buffer and find all recipients of the encrypted file
+" The bufread argument specifies whether this was called due to BufReadCmd
"
-function s:GPGDecrypt()
- call s:GPGDebug(3, ">>>>>>>> Entering s:GPGDecrypt()")
-
- " switch to binary mode to read the encrypted file
- set bin
+function s:GPGDecrypt(bufread)
+ call s:GPGDebug(3, printf(">>>>>>>> Entering s:GPGDecrypt(%d)", a:bufread))
" get the filename of the current buffer
- let filename = escape(expand("%:p"), '\"')
+ let filename = expand("<afile>:p")
- " clear GPGEncrypted, GPGRecipients and GPGOptions
- let b:GPGEncrypted = 0
- let b:GPGRecipients = []
+ " clear GPGRecipients and GPGOptions
+ if type(g:GPGDefaultRecipients) == type([])
+ let b:GPGRecipients = copy(g:GPGDefaultRecipients)
+ else
+ let b:GPGRecipients = []
+ echohl GPGWarning
+ echom "g:GPGDefaultRecipients is not a Vim list, please correct this in your vimrc!"
+ echohl None
+ endif
let b:GPGOptions = []
+ " file name minus extension
+ let autocmd_filename = fnameescape(expand('<afile>:r'))
+
+ " File doesn't exist yet, so nothing to decrypt
+ if !filereadable(filename)
+ " Allow the user to define actions for GnuPG buffers
+ silent doautocmd User GnuPG
+ " call the autocommand for the file minus .gpg$
+ silent execute ':doautocmd BufNewFile ' . autocmd_filename
+ call s:GPGDebug(2, 'called BufNewFile autocommand for ' . autocmd_filename)
+
+ " This is a new file, so force the user to edit the recipient list if
+ " they open a new file and public keys are preferred
+ if (g:GPGPreferSymmetric == 0)
+ call s:GPGEditRecipients()
+ endif
+
+ return
+ endif
+
+ " Only let this if the file actually exists, otherwise GPG functionality
+ " will be disabled when editing a buffer that doesn't yet have a backing
+ " file
+ let b:GPGEncrypted = 0
+
" find the recipients of the file
- let commandline = s:GPGCommand . " --verbose --decrypt --list-only --dry-run --batch --no-use-agent --logger-fd 1 \"" . filename . "\""
- call s:GPGDebug(3, "command: " . commandline)
- let &shellredir = s:shellredir
- let &shell = s:shell
- let output = system(commandline)
- let &shellredir = s:shellredirsave
- let &shell = s:shellsave
- call s:GPGDebug(3, "output: ". output)
+ let cmd = { 'level': 3 }
+ let cmd.args = '--verbose --decrypt --list-only --dry-run --no-use-agent --logger-fd 1 ' . s:shellescape(filename)
+ let output = s:GPGSystem(cmd)
+
+ " Suppress the "N more lines" message when editing a file, not when reading
+ " the contents of a file into a buffer
+ let silent = a:bufread ? 'silent ' : ''
+ let asymmPattern = 'gpg: public key is ' . s:keyPattern
" check if the file is symmetric/asymmetric encrypted
if (match(output, "gpg: encrypted with [[:digit:]]\\+ passphrase") >= 0)
" file is symmetric encrypted
@@ -347,7 +503,7 @@
echo
echohl None
endif
- elseif (match(output, "gpg: public key is [[:xdigit:]]\\{8}") >= 0)
+ elseif (match(output, asymmPattern) >= 0)
" file is asymmetric encrypted
let b:GPGEncrypted = 1
call s:GPGDebug(1, "this file is asymmetric encrypted")
@@ -355,22 +511,32 @@
let b:GPGOptions += ["encrypt"]
" find the used public keys
- let start = match(output, "gpg: public key is [[:xdigit:]]\\{8}")
+ let start = match(output, asymmPattern)
while (start >= 0)
let start = start + strlen("gpg: public key is ")
- let recipient = strpart(output, start, 8)
+ let recipient = matchstr(output, s:keyPattern, start)
call s:GPGDebug(1, "recipient is " . recipient)
- let name = s:GPGNameToID(recipient)
- if (strlen(name) > 0)
- let b:GPGRecipients += [name]
- call s:GPGDebug(1, "name of recipient is " . name)
- else
- let b:GPGRecipients += [recipient]
- echohl GPGWarning
- echom "The recipient \"" . recipient . "\" is not in your public keyring!"
- echohl None
+ " In order to support anonymous communication, GnuPG allows eliding
+ " information in the encryption metadata specifying what keys the file
+ " was encrypted to (c.f., --throw-keyids and --hidden-recipient). In
+ " that case, the recipient(s) will be listed as having used a key of all
+ " zeroes.
+ " Since this will obviously never actually be in a keyring, only try to
+ " convert to an ID or add to the recipients list if it's not a hidden
+ " recipient.
+ if recipient !~? '^0x0\+$'
+ let name = s:GPGNameToID(recipient)
+ if !empty(name)
+ let b:GPGRecipients += [name]
+ call s:GPGDebug(1, "name of recipient is " . name)
+ else
+ let b:GPGRecipients += [recipient]
+ echohl GPGWarning
+ echom "The recipient \"" . recipient . "\" is not in your public keyring!"
+ echohl None
+ end
end
- let start = match(output, "gpg: public key is [[:xdigit:]]\\{8}", start)
+ let start = match(output, asymmPattern, start)
endwhile
else
" file is not encrypted
@@ -379,11 +545,19 @@
echohl GPGWarning
echom "File is not encrypted, all GPG functions disabled!"
echohl None
- set nobin
+ exe printf('%sr %s', silent, fnameescape(filename))
call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGDecrypt()")
return
endif
+ if a:bufread
+ silent execute ':doautocmd BufReadPre ' . autocmd_filename
+ call s:GPGDebug(2, 'called BufReadPre autocommand for ' . autocmd_filename)
+ else
+ silent execute ':doautocmd FileReadPre ' . autocmd_filename
+ call s:GPGDebug(2, 'called FileReadPre autocommand for ' . autocmd_filename)
+ endif
+
" check if the message is armored
if (match(output, "gpg: armor header") >= 0)
call s:GPGDebug(1, "this file is armored")
@@ -394,30 +568,49 @@
" since even with the --quiet option passphrase typos will be reported,
" we must redirect stderr (using shell temporarily)
call s:GPGDebug(1, "decrypting file")
- let commandline = "'[,']!" . s:GPGCommand . " --quiet --decrypt " . s:stderrredirnull
- call s:GPGDebug(1, "command: " . commandline)
- let &shellredir = s:shellredir
- let &shell = s:shell
- execute commandline
- let &shellredir = s:shellredirsave
- let &shell = s:shellsave
+ let cmd = { 'level': 1, 'ex': silent . 'r !' }
+ let cmd.args = '--quiet --decrypt ' . s:shellescape(filename, 1)
+ call s:GPGExecute(cmd)
+
if (v:shell_error) " message could not be decrypted
- silent u
echohl GPGError
let blackhole = input("Message could not be decrypted! (Press ENTER)")
echohl None
- bwipeout
- set nobin
+ " Only wipeout the buffer if we were creating one to start with.
+ " FileReadCmd just reads the content into the existing buffer
+ if a:bufread
+ silent bwipeout!
+ endif
call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGDecrypt()")
return
endif
- " turn off binary mode
- set nobin
+ if a:bufread
+ " In order to make :undo a no-op immediately after the buffer is read,
+ " we need to do this dance with 'undolevels'. Actually discarding the undo
+ " history requires performing a change after setting 'undolevels' to -1 and,
+ " luckily, we have one we need to do (delete the extra line from the :r
+ " command)
+ let levels = &undolevels
+ set undolevels=-1
+ " :lockmarks doesn't actually prevent '[,'] from being overwritten, so we
+ " need to manually set them ourselves instead
+ silent 1delete
+ 1mark [
+ $mark ]
+ let &undolevels = levels
+ let &readonly = filereadable(filename) && filewritable(filename) == 0
+ " call the autocommand for the file minus .gpg$
+ silent execute ':doautocmd BufReadPost ' . autocmd_filename
+ call s:GPGDebug(2, 'called BufReadPost autocommand for ' . autocmd_filename)
+ else
+ " call the autocommand for the file minus .gpg$
+ silent execute ':doautocmd FileReadPost ' . autocmd_filename
+ call s:GPGDebug(2, 'called FileReadPost autocommand for ' . autocmd_filename)
+ endif
- " call the autocommand for the file minus .gpg$
- execute ":doautocmd BufReadPost " . escape(expand("%:r"), ' *?\"'."'")
- call s:GPGDebug(2, "called autocommand for " . escape(expand("%:r"), ' *?\"'."'"))
+ " Allow the user to define actions for GnuPG buffers
+ silent doautocmd User GnuPG
" refresh screen
redraw!
@@ -432,9 +625,21 @@
function s:GPGEncrypt()
call s:GPGDebug(3, ">>>>>>>> Entering s:GPGEncrypt()")
- " save window view
- let s:GPGWindowView = winsaveview()
- call s:GPGDebug(2, "saved window view " . string(s:GPGWindowView))
+ " FileWriteCmd is only called when a portion of a buffer is being written to
+ " disk. Since Vim always sets the '[,'] marks to the part of a buffer that
+ " is being written, that can be used to determine whether BufWriteCmd or
+ " FileWriteCmd triggered us.
+ if [line("'["), line("']")] == [1, line('$')]
+ let auType = 'BufWrite'
+ else
+ let auType = 'FileWrite'
+ endif
+
+ " file name minus extension
+ let autocmd_filename = fnameescape(expand('<afile>:r'))
+
+ silent exe ':doautocmd '. auType .'Pre '. autocmd_filename
+ call s:GPGDebug(2, 'called '. auType .'Pre autocommand for ' . autocmd_filename)
" store encoding and switch to a safe one
if (&fileencoding != &encoding)
@@ -446,20 +651,18 @@
call s:GPGDebug(2, "encoding and fileencoding are the same (\"" . &encoding . "\"), not switching")
endif
- " switch buffer to binary mode
- set bin
-
" guard for unencrypted files
- if (!exists("b:GPGEncrypted") || b:GPGEncrypted == 0)
+ if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0)
echohl GPGError
- let blackhole = input("Message could not be encrypted! File might be empty! (Press ENTER)")
+ let blackhole = input("Message could not be encrypted! (Press ENTER)")
echohl None
call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEncrypt()")
return
endif
+ let filename = resolve(expand('<afile>'))
" initialize GPGOptions if not happened before
- if (!exists("b:GPGOptions") || len(b:GPGOptions) == 0)
+ if (!exists("b:GPGOptions") || empty(b:GPGOptions))
let b:GPGOptions = []
if (exists("g:GPGPreferSymmetric") && g:GPGPreferSymmetric == 1)
let b:GPGOptions += ["symmetric"]
@@ -467,7 +670,10 @@
else
let b:GPGOptions += ["encrypt"]
endif
- if (exists("g:GPGPreferArmor") && g:GPGPreferArmor == 1)
+ " Fallback to preference by filename if the user didn't indicate
+ " their preference.
+ let preferArmor = get(g:, 'GPGPreferArmor', -1)
+ if (preferArmor >= 0 && preferArmor) || filename =~ '\.asc$'
let b:GPGOptions += ["armor"]
endif
if (exists("g:GPGPreferSign") && g:GPGPreferSign == 1)
@@ -482,11 +688,15 @@
let options = options . " --" . option . " "
endfor
+ if (!exists('b:GPGRecipients'))
+ let b:GPGRecipients = []
+ endif
+
" check here again if all recipients are available in the keyring
- let [ recipients, unknownrecipients ] = s:GPGCheckRecipients(b:GPGRecipients)
+ let recipients = s:GPGCheckRecipients(b:GPGRecipients)
" check if there are unknown recipients and warn
- if (len(unknownrecipients) > 0)
+ if !empty(recipients.unknown)
echohl GPGWarning
echom "Please use GPGEditRecipients to correct!!"
echo
@@ -497,76 +707,49 @@
endif
" built list of recipients
- if (len(recipients) > 0)
- for gpgid in recipients
- let options = options . " -r " . gpgid
- endfor
- else
- if (match(b:GPGOptions, "encrypt") >= 0)
- echohl GPGError
- echom "There are no recipients!!"
- echom "Please use GPGEditRecipients to correct!!"
- echo
- echohl None
- endif
- endif
+ let options .= ' ' . join(map(recipients.valid, '"-r ".v:val'), ' ')
" encrypt the buffer
- let commandline = "'[,']!" . s:GPGCommand . " --quiet --no-encrypt-to " . options . " " . s:stderrredirnull
- call s:GPGDebug(1, "command: " . commandline)
- let &shellredir = s:shellredir
- let &shell = s:shell
- silent execute commandline
- let &shellredir = s:shellredirsave
- let &shell = s:shellsave
- if (v:shell_error) " message could not be encrypted
- " delete content of the buffer to be sure no data is written unencrypted
- " content will be recovered in GPGEncryptPost()
- silent normal! 1GdG
+ let destfile = tempname()
+ let cmd = { 'level': 1, 'ex': "'[,']w !" }
+ let cmd.args = '--quiet --no-encrypt-to ' . options
+ let cmd.redirect = '>' . s:shellescape(destfile, 1)
+ silent call s:GPGExecute(cmd)
+
+ " restore encoding
+ if (s:GPGEncoding != "")
+ let &encoding = s:GPGEncoding
+ call s:GPGDebug(2, "restored encoding \"" . &encoding . "\"")
+ endif
+ if (v:shell_error) " message could not be encrypted
+ " Command failed, so clean up the tempfile
+ call delete(destfile)
echohl GPGError
- let blackhole = input("Message could not be encrypted! File might be empty! (Press ENTER)")
+ let blackhole = input("Message could not be encrypted! (Press ENTER)")
echohl None
call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEncrypt()")
return
endif
- call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEncrypt()")
-endfunction
-
-" Function: s:GPGEncryptPost() {{{2
-"
-" undo changes don by encrypt, after writing
-"
-function s:GPGEncryptPost()
- call s:GPGDebug(3, ">>>>>>>> Entering s:GPGEncryptPost()")
-
- " guard for unencrypted files
- if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0)
- call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEncryptPost()")
+ if rename(destfile, filename)
+ " Rename failed, so clean up the tempfile
+ call delete(destfile)
+ echohl GPGError
+ echom printf("\"%s\" E212: Can't open file for writing", filename)
+ echohl None
return
endif
- " undo encryption of buffer content
- silent u
-
- " switch back from binary mode
- set nobin
-
- " restore encoding
- if (s:GPGEncoding != "")
- let &encoding = s:GPGEncoding
- call s:GPGDebug(2, "restored encoding \"" . &encoding . "\"")
+ if auType == 'BufWrite'
+ setl nomodified
+ let &readonly = filereadable(filename) && filewritable(filename) == 0
endif
- " restore window view
- call winrestview(s:GPGWindowView)
- call s:GPGDebug(2, "restored window view" . string(s:GPGWindowView))
+ silent exe ':doautocmd '. auType .'Post '. autocmd_filename
+ call s:GPGDebug(2, 'called '. auType .'Post autocommand for ' . autocmd_filename)
- " refresh screen
- redraw!
-
- call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEncryptPost()")
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGEncrypt()")
endfunction
" Function: s:GPGViewRecipients() {{{2
@@ -585,25 +768,25 @@
return
endif
- let [ recipients, unknownrecipients ] = s:GPGCheckRecipients(b:GPGRecipients)
+ let recipients = s:GPGCheckRecipients(b:GPGRecipients)
echo 'This file has following recipients (Unknown recipients have a prepended "!"):'
" echo the recipients
- for name in recipients
+ for name in recipients.valid
let name = s:GPGIDToName(name)
echo name
endfor
" echo the unknown recipients
echohl GPGWarning
- for name in unknownrecipients
+ for name in recipients.unknown
let name = "!" . name
echo name
endfor
echohl None
" check if there is any known recipient
- if (len(recipients) == 0)
+ if empty(recipients.valid)
echohl GPGError
echom 'There are no known recipients!'
echohl None
@@ -638,7 +821,7 @@
" check if this buffer exists
if (!bufexists(editbuffername))
" create scratch buffer
- execute 'silent! split ' . escape(editbuffername, ' *?\"'."'")
+ execute 'silent! split ' . fnameescape(editbuffername)
" add a autocommand to regenerate the recipients after a write
autocmd BufHidden,BufUnload,BufWriteCmd <buffer> call s:GPGFinishRecipientsBuffer()
@@ -648,14 +831,14 @@
execute 'silent! ' . bufwinnr(editbuffername) . "wincmd w"
else
" split scratch buffer window
- execute 'silent! sbuffer ' . escape(editbuffername, ' *?\"'."'")
+ execute 'silent! sbuffer ' . fnameescape(editbuffername)
" add a autocommand to regenerate the recipients after a write
autocmd BufHidden,BufUnload,BufWriteCmd <buffer> call s:GPGFinishRecipientsBuffer()
endif
" empty the buffer
- silent normal! 1GdG
+ silent %delete
endif
" Mark the buffer as a scratch buffer
@@ -679,12 +862,12 @@
silent put ='GPG: ----------------------------------------------------------------------'
" get the recipients
- let [ recipients, unknownrecipients ] = s:GPGCheckRecipients(getbufvar(b:GPGCorrespondingTo, "GPGRecipients"))
+ let recipients = s:GPGCheckRecipients(getbufvar(b:GPGCorrespondingTo, "GPGRecipients"))
" if there are no known or unknown recipients, use the default ones
- if (len(recipients) == 0 && len(unknownrecipients) == 0)
+ if (empty(recipients.valid) && empty(recipients.unknown))
if (type(g:GPGDefaultRecipients) == type([]))
- let [ recipients, unknownrecipients ] = s:GPGCheckRecipients(g:GPGDefaultRecipients)
+ let recipients = s:GPGCheckRecipients(g:GPGDefaultRecipients)
else
echohl GPGWarning
echom "g:GPGDefaultRecipients is not a Vim list, please correct this in your vimrc!"
@@ -693,25 +876,30 @@
endif
" put the recipients in the scratch buffer
- for name in recipients
+ for name in recipients.valid
let name = s:GPGIDToName(name)
silent put =name
endfor
" put the unknown recipients in the scratch buffer
- let syntaxPattern = "\\(nonexxistinwordinthisbuffer"
- for name in unknownrecipients
- let name = "!" . name
- let syntaxPattern = syntaxPattern . "\\|" . name
- silent put =name
+ let syntaxPattern = ''
+ if !empty(recipients.unknown)
+ let flaggedNames = map(recipients.unknown, '"!".v:val')
+ call append('$', flaggedNames)
+ let syntaxPattern = '\(' . join(flaggedNames, '\|') . '\)'
+ endif
+
+ for line in g:GPGPossibleRecipients
+ silent put ='GPG: '.line
endfor
- let syntaxPattern = syntaxPattern . "\\)"
" define highlight
if (has("syntax") && exists("g:syntax_on"))
- execute 'syntax match GPGUnknownRecipient "' . syntaxPattern . '"'
highlight clear GPGUnknownRecipient
- highlight link GPGUnknownRecipient GPGHighlightUnknownRecipient
+ if !empty(syntaxPattern)
+ execute 'syntax match GPGUnknownRecipient "' . syntaxPattern . '"'
+ highlight link GPGUnknownRecipient GPGHighlightUnknownRecipient
+ endif
syntax match GPGComment "^GPG:.*$"
execute 'syntax match GPGComment "' . s:GPGMagicString . '.*$"'
@@ -720,10 +908,10 @@
endif
" delete the empty first line
- silent normal! 1Gdd
+ silent 1delete
" jump to the first recipient
- silent normal! G
+ silent $
endif
@@ -755,13 +943,13 @@
" delete the autocommand
autocmd! * <buffer>
-
" get the recipients from the scratch buffer
let recipients = []
let lines = getline(1,"$")
for recipient in lines
- " delete all text after magic string
- let recipient = substitute(recipient, s:GPGMagicString . ".*$", "", "")
+ let matches = matchlist(recipient, '^\(.\{-}\)\%(' . s:GPGMagicString . '(ID:\s\+\(' . s:keyPattern . '\)\s\+.*\)\=$')
+
+ let recipient = matches[2] ? matches[2] : matches[1]
" delete all spaces at beginning and end of the recipient
" also delete a '!' at the beginning of the recipient
@@ -771,9 +959,9 @@
let recipient = substitute(recipient, "^GPG:.*$", "", "")
" only do this if the line is not empty
- if (strlen(recipient) > 0)
+ if !empty(recipient)
let gpgid = s:GPGNameToID(recipient)
- if (strlen(gpgid) > 0)
+ if !empty(gpgid)
if (match(recipients, gpgid) < 0)
let recipients += [gpgid]
endif
@@ -789,20 +977,20 @@
endfor
" write back the new recipient list to the corresponding buffer and mark it
- " as modified. Buffer is now for sure a encrypted buffer.
+ " as modified. Buffer is now for sure an encrypted buffer.
call setbufvar(b:GPGCorrespondingTo, "GPGRecipients", recipients)
call setbufvar(b:GPGCorrespondingTo, "&mod", 1)
call setbufvar(b:GPGCorrespondingTo, "GPGEncrypted", 1)
" check if there is any known recipient
- if (len(recipients) == 0)
+ if empty(recipients)
echohl GPGError
echom 'There are no known recipients!'
echohl None
endif
" reset modified flag
- set nomodified
+ setl nomodified
call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGFinishRecipientsBuffer()")
endfunction
@@ -860,7 +1048,7 @@
" check if this buffer exists
if (!bufexists(editbuffername))
" create scratch buffer
- execute 'silent! split ' . escape(editbuffername, ' *?\"'."'")
+ execute 'silent! split ' . fnameescape(editbuffername)
" add a autocommand to regenerate the options after a write
autocmd BufHidden,BufUnload,BufWriteCmd <buffer> call s:GPGFinishOptionsBuffer()
@@ -870,14 +1058,14 @@
execute 'silent! ' . bufwinnr(editbuffername) . "wincmd w"
else
" split scratch buffer window
- execute 'silent! sbuffer ' . escape(editbuffername, ' *?\"'."'")
+ execute 'silent! sbuffer ' . fnameescape(editbuffername)
" add a autocommand to regenerate the options after a write
autocmd BufHidden,BufUnload,BufWriteCmd <buffer> call s:GPGFinishOptionsBuffer()
endif
" empty the buffer
- silent normal! 1GdG
+ silent %delete
endif
" Mark the buffer as a scratch buffer
@@ -909,10 +1097,10 @@
endfor
" delete the empty first line
- silent normal! 1Gdd
+ silent 1delete
" jump to the first option
- silent normal! G
+ silent $
" define highlight
if (has("syntax") && exists("g:syntax_on"))
@@ -964,7 +1152,7 @@
let option = substitute(option, "^GPG:.*$", "", "")
" only do this if the line is not empty
- if (strlen(option) > 0 && match(options, option) < 0)
+ if (!empty(option) && match(options, option) < 0)
let options += [option]
endif
endfor
@@ -975,7 +1163,7 @@
call setbufvar(b:GPGCorrespondingTo, "&mod", 1)
" reset modified flag
- set nomodified
+ setl nomodified
call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGFinishOptionsBuffer()")
endfunction
@@ -983,24 +1171,23 @@
" Function: s:GPGCheckRecipients(tocheck) {{{2
"
" check if recipients are known
-" Returns: two lists recipients and unknownrecipients
+" Returns: dictionary of recipients, {'valid': [], 'unknown': []}
"
function s:GPGCheckRecipients(tocheck)
call s:GPGDebug(3, ">>>>>>>> Entering s:GPGCheckRecipients()")
- let recipients = []
- let unknownrecipients = []
+ let recipients = {'valid': [], 'unknown': []}
if (type(a:tocheck) == type([]))
for recipient in a:tocheck
let gpgid = s:GPGNameToID(recipient)
- if (strlen(gpgid) > 0)
- if (match(recipients, gpgid) < 0)
- let recipients += [gpgid]
+ if !empty(gpgid)
+ if (match(recipients.valid, gpgid) < 0)
+ call add(recipients.valid, gpgid)
endif
else
- if (match(unknownrecipients, recipient) < 0)
- let unknownrecipients += [recipient]
+ if (match(recipients.unknown, recipient) < 0)
+ call add(recipients.unknown, recipient)
echohl GPGWarning
echom "The recipient \"" . recipient . "\" is not in your public keyring!"
echohl None
@@ -1009,11 +1196,11 @@
endfor
endif
- call s:GPGDebug(2, "recipients are: " . string(recipients))
- call s:GPGDebug(2, "unknown recipients are: " . string(unknownrecipients))
+ call s:GPGDebug(2, "recipients are: " . string(recipients.valid))
+ call s:GPGDebug(2, "unknown recipients are: " . string(recipients.unknown))
call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGCheckRecipients()")
- return [ recipients, unknownrecipients ]
+ return recipients
endfunction
" Function: s:GPGNameToID(name) {{{2
@@ -1025,14 +1212,9 @@
call s:GPGDebug(3, ">>>>>>>> Entering s:GPGNameToID()")
" ask gpg for the id for a name
- let commandline = s:GPGCommand . " --quiet --with-colons --fixed-list-mode --list-keys \"" . a:name . "\""
- call s:GPGDebug(2, "command: ". commandline)
- let &shellredir = s:shellredir
- let &shell = s:shell
- let output = system(commandline)
- let &shellredir = s:shellredirsave
- let &shell = s:shellsave
- call s:GPGDebug(2, "output: ". output)
+ let cmd = { 'level': 2 }
+ let cmd.args = '--quiet --with-colons --fixed-list-mode --list-keys ' . s:shellescape(a:name)
+ let output = s:GPGSystem(cmd)
" when called with "--with-colons" gpg encodes its output _ALWAYS_ as UTF-8,
" so convert it, if necessary
@@ -1045,31 +1227,41 @@
let pubseen = 0
let counter = 0
let gpgids = []
+ let seen_keys = {}
+ let skip_key = 0
+ let has_strftime = exists('*strftime')
let choices = "The name \"" . a:name . "\" is ambiguous. Please select the correct key:\n"
for line in lines
+
let fields = split(line, ":")
- " search for the next uid
- if (pubseen == 1)
- if (fields[0] == "uid")
- let choices = choices . " " . fields[9] . "\n"
- else
- let pubseen = 0
- endif
- endif
" search for the next pub
- if (pubseen == 0)
- if (fields[0] == "pub")
- let identity = fields[4]
- let gpgids += [identity]
- if exists("*strftime")
- let choices = choices . counter . ": ID: 0x" . identity . " created at " . strftime("%c", fields[5]) . "\n"
- else
- let choices = choices . counter . ": ID: 0x" . identity . "\n"
- endif
- let counter = counter+1
- let pubseen = 1
+ if (fields[0] == "pub")
+ " check if this key has already been processed
+ if has_key(seen_keys, fields[4])
+ let skip_key = 1
+ continue
+ endif
+ let skip_key = 0
+ let seen_keys[fields[4]] = 1
+
+ " Ignore keys which are not usable for encryption
+ if fields[11] !~? 'e'
+ continue
+ endif
+
+ let identity = fields[4]
+ let gpgids += [identity]
+ if has_strftime
+ let choices = choices . counter . ": ID: 0x" . identity . " created at " . strftime("%c", fields[5]) . "\n"
+ else
+ let choices = choices . counter . ": ID: 0x" . identity . "\n"
endif
+ let counter = counter+1
+ let pubseen = 1
+ " search for the next uid
+ elseif (!skip_key && fields[0] == "uid")
+ let choices = choices . " " . fields[9] . "\n"
endif
endfor
@@ -1084,7 +1276,7 @@
endwhile
endif
- call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGIDToName()")
+ call s:GPGDebug(3, "<<<<<<<< Leaving s:GPGNameToID()")
return get(gpgids, answer, "")
endfunction
@@ -1099,14 +1291,9 @@
" TODO is the encryption subkey really unique?
" ask gpg for the id for a name
- let commandline = s:GPGCommand . " --quiet --with-colons --fixed-list-mode --list-keys " . a:identity
- call s:GPGDebug(2, "command: ". commandline)
- let &shellredir = s:shellredir
- let &shell = s:shell
- let output = system(commandline)
- let &shellredir = s:shellredirsave
- let &shell = s:shellsave
- call s:GPGDebug(2, "output: ". output)
+ let cmd = { 'level': 2 }
+ let cmd.args = '--quiet --with-colons --fixed-list-mode --list-keys ' . a:identity
+ let output = s:GPGSystem(cmd)
" when called with "--with-colons" gpg encodes its output _ALWAYS_ as UTF-8,
" so convert it, if necessary
@@ -1120,8 +1307,14 @@
let uid = ""
for line in lines
let fields = split(line, ":")
- if (pubseen == 0) " search for the next pub
+
+ if !pubseen " search for the next pub
if (fields[0] == "pub")
+ " Ignore keys which are not usable for encryption
+ if fields[11] !~? 'e'
+ continue
+ endif
+
let pubseen = 1
endif
else " search for the next uid
@@ -1141,6 +1334,93 @@
return uid
endfunction
+" Function: s:GPGPreCmd() {{{2
+"
+" Setup the environment for running the gpg command
+"
+function s:GPGPreCmd()
+ let &shellredir = s:shellredir
+ let &shell = s:shell
+ let &shelltemp = s:shelltemp
+ " Force C locale so GPG output is consistent
+ let s:messages = v:lang
+ language messages C
+endfunction
+
+
+" Function: s:GPGPostCmd() {{{2
+"
+" Restore the user's environment after running the gpg command
+"
+function s:GPGPostCmd()
+ let &shellredir = s:shellredirsave
+ let &shell = s:shellsave
+ let &shelltemp = s:shelltempsave
+ execute 'language messages' s:messages
+ " Workaround a bug in the interaction between console vim and
+ " pinentry-curses by forcing Vim to re-detect and setup its terminal
+ " settings
+ let &term = &term
+ silent doautocmd TermChanged
+endfunction
+
+" Function: s:GPGSystem(dict) {{{2
+"
+" run g:GPGCommand using system(), logging the commandline and output. This
+" uses temp files (regardless of how 'shelltemp' is set) to hold the output of
+" the command, so it must not be used for sensitive commands.
+" Recognized keys are:
+" level - Debug level at which the commandline and output will be logged
+" args - Arguments to be given to g:GPGCommand
+"
+" Returns: command output
+"
+function s:GPGSystem(dict)
+ let commandline = s:GPGCommand
+ if (!empty(g:GPGHomedir))
+ let commandline .= ' --homedir ' . s:shellescape(g:GPGHomedir)
+ endif
+ let commandline .= ' ' . a:dict.args
+ let commandline .= ' ' . s:stderrredirnull
+ call s:GPGDebug(a:dict.level, "command: ". commandline)
+
+ call s:GPGPreCmd()
+ let output = system(commandline)
+ call s:GPGPostCmd()
+
+ call s:GPGDebug(a:dict.level, "rc: ". v:shell_error)
+ call s:GPGDebug(a:dict.level, "output: ". output)
+ return output
+endfunction
+
+" Function: s:GPGExecute(dict) {{{2
+"
+" run g:GPGCommand using :execute, logging the commandline
+" Recognized keys are:
+" level - Debug level at which the commandline will be logged
+" args - Arguments to be given to g:GPGCommand
+" ex - Ex command which will be :executed
+" redirect - Shell redirect to use, if needed
+"
+function s:GPGExecute(dict)
+ let commandline = printf('%s%s', a:dict.ex, s:GPGCommand)
+ if (!empty(g:GPGHomedir))
+ let commandline .= ' --homedir ' . s:shellescape(g:GPGHomedir, 1)
+ endif
+ let commandline .= ' ' . a:dict.args
+ if (has_key(a:dict, 'redirect'))
+ let commandline .= ' ' . a:dict.redirect
+ endif
+ let commandline .= ' ' . s:stderrredirnull
+ call s:GPGDebug(a:dict.level, "command: " . commandline)
+
+ call s:GPGPreCmd()
+ execute commandline
+ call s:GPGPostCmd()
+
+ call s:GPGDebug(a:dict.level, "rc: ". v:shell_error)
+endfunction
+
" Function: s:GPGDebug(level, text) {{{2
"
" output debug message, if this message has high enough importance
@@ -1150,7 +1430,7 @@
if exists("g:GPGDebugLevel") && g:GPGDebugLevel >= a:level
if exists("g:GPGDebugLog")
execute "redir >> " . g:GPGDebugLog
- echom "GnuPG: " . a:text
+ silent echom "GnuPG: " . a:text
redir END
else
echom "GnuPG: " . a:text
1
0
Hello community,
here is the log from the commit of package obs-service-extract_file for openSUSE:Factory checked in at 2016-06-29 15:10:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/obs-service-extract_file (Old)
and /work/SRC/openSUSE:Factory/.obs-service-extract_file.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-extract_file"
Changes:
--------
--- /work/SRC/openSUSE:Factory/obs-service-extract_file/obs-service-extract_file.changes 2016-03-17 16:48:01.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.obs-service-extract_file.new/obs-service-extract_file.changes 2016-06-29 15:10:50.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Jun 16 08:45:31 UTC 2016 - jblunck(a)infradead.org
+
+- Update to version 0.3:
+ * Fix 001_unzip.t to not hardcode pathname
+ * Add build dependencies for make check
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.vGcY6H/_old 2016-06-29 15:10:51.000000000 +0200
+++ /var/tmp/diff_new_pack.vGcY6H/_new 2016-06-29 15:10:51.000000000 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">git@github.com:openSUSE/obs-service-extract_file.git</param>
- <param name="changesrevision">acb33c06fc882cee6aee7bceb34d65123320841e</param></service></servicedata>
\ No newline at end of file
+ <param name="changesrevision">100e10d49c52e072d2e2b4edc5d7f8d81e22ae96</param></service></servicedata>
\ No newline at end of file
++++++ debian.dsc ++++++
--- /var/tmp/diff_new_pack.vGcY6H/_old 2016-06-29 15:10:51.000000000 +0200
+++ /var/tmp/diff_new_pack.vGcY6H/_new 2016-06-29 15:10:51.000000000 +0200
@@ -1,8 +1,9 @@
-Format: 1.0
+Format: 3.0 (native)
Source: obs-service-extract-file
-Version: 0.3
Binary: obs-service-extract-file
-Maintainer: Adrian Schroeter <adrian(a)suse.de>
Architecture: all
-Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 7)
+Version: 0.3
+Maintainer: Adrian Schroeter <adrian(a)suse.de>
+Homepage: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-extract_…
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 8.0.0), tar, zip, unzip
++++++ obs-service-extract_file-0.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-extract_file-0.3/debian/control new/obs-service-extract_file-0.3/debian/control
--- old/obs-service-extract_file-0.3/debian/control 2016-02-18 17:36:23.000000000 +0100
+++ new/obs-service-extract_file-0.3/debian/control 2016-06-16 10:45:31.000000000 +0200
@@ -2,7 +2,7 @@
Section: devel
Priority: extra
Maintainer: Daniel Gollub <dgollub(a)brocade.com>
-Build-Depends: debhelper (>= 8.0.0)
+Build-Depends: debhelper (>= 8.0.0), tar, zip, unzip
Standards-Version: 3.9.3
Homepage: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-extract_…
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-extract_file-0.3/t/001_unzip.t new/obs-service-extract_file-0.3/t/001_unzip.t
--- old/obs-service-extract_file-0.3/t/001_unzip.t 2016-02-18 17:36:23.000000000 +0100
+++ new/obs-service-extract_file-0.3/t/001_unzip.t 2016-06-16 10:45:31.000000000 +0200
@@ -2,9 +2,9 @@
#
#
-use strict;
+use strict;
use warnings;
-use Test::More tests => 3;
+use Test::More tests => 4;
use Cwd;
use Data::Dumper;
@@ -38,16 +38,15 @@
my $cmd = "$FindBin::Bin/../extract_file --archive test.zip --files '--illegal-option' --outdir $tmp_dir";
my @out = `$cmd`;
+like(shift(@out), qr/Extracting from .*test.zip:/);
my $VAR1 = [
- 'Extracting from /home/fschreiner/gh/obs-service-extract_file/t/tmp/test.zip:
-',
' --illegal-option
',
'illegal --file option: --illegal-option
'
];
-is_deeply($VAR1,\@out,"Checking with illegal option");
+is_deeply(\@out,$VAR1,"Checking with illegal option");
clean_dir($tmp_dir);
1
0
Hello community,
here is the log from the commit of package libqt5-qtwebengine for openSUSE:Factory checked in at 2016-06-29 15:10:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebengine (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebengine"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtwebengine/libqt5-qtwebengine.changes 2016-05-19 12:14:17.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new/libqt5-qtwebengine.changes 2016-06-29 15:10:41.000000000 +0200
@@ -1,0 +2,14 @@
+Thu Jun 23 08:10:46 UTC 2016 - lbeltrame(a)kde.org
+
+- Add use-fno-delete-null-pointer-checks-with-gcc-6.diff: fix
+ crashes with GCC 6 (https://codereview.qt-project.org/#/c/161965/)
+
+-------------------------------------------------------------------
+Wed Jun 8 14:15:23 UTC 2016 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.6.1
+ * For more details please see:
+ http://blog.qt.io/blog/2016/06/08/qt-5-6-1-released/
+- Drop obsolete gcc50-fixes.diff
+
+-------------------------------------------------------------------
Old:
----
gcc50-fixes.diff
qtwebengine-opensource-src-5.6.0.tar.xz
New:
----
qtwebengine-opensource-src-5.6.1.tar.xz
use-fno-delete-null-pointer-checks-with-gcc-6.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwebengine.spec ++++++
--- /var/tmp/diff_new_pack.ecCRz4/_old 2016-06-29 15:10:50.000000000 +0200
+++ /var/tmp/diff_new_pack.ecCRz4/_new 2016-06-29 15:10:50.000000000 +0200
@@ -19,22 +19,22 @@
%define qt5_snapshot 0
Name: libqt5-qtwebengine
-Version: 5.6.0
+Version: 5.6.1
Release: 0
Summary: Qt 5 WebEngine Library
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
Group: Development/Libraries/X11
Url: http://qt.digia.com
%define base_name libqt5
-%define real_version 5.6.0
-%define so_version 5.6.0
+%define real_version 5.6.1
+%define so_version 5.6.1
%define tar_version qtwebengine-opensource-src-%{real_version}
Source: %{tar_version}.tar.xz
Source1: baselibs.conf
+# PATCH-FIX-UPSTREAM: use-fno-delete-null-pointer-checks-with-gcc-6.diff - Fix crashes when using GCC6
+Patch0: use-fno-delete-null-pointer-checks-with-gcc-6.diff
# http://www.chromium.org/blink not ported to PowerPC
ExcludeArch: ppc ppc64 ppc64le s390 s390x
-# PATCH-FIX-OPENSUSE gcc50-fixes.diff -- Fix the detection of the Gcc 5.x compiler
-Patch2: gcc50-fixes.diff
BuildRequires: bison
BuildRequires: fdupes
BuildRequires: flac-devel
@@ -50,6 +50,7 @@
BuildRequires: libpng-devel
BuildRequires: libqt5-qtbase-private-headers-devel >= %{version}
BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{version}
+BuildRequires: libqt5-qttools-private-headers-devel >= %{version}
BuildRequires: libqt5-qtwebchannel-private-headers-devel >= %{version}
BuildRequires: libqt5-qtxmlpatterns-private-headers-devel >= %{version}
BuildRequires: pam-devel
@@ -135,8 +136,8 @@
%prep
%setup -q -n qtwebengine-opensource-src-%{real_version}
-%patch2 -p0
sed -i 's|$(STRIP)|strip|g' src/core/core_module.pro
+%patch0 -p1
%package devel
Summary: Qt Development Kit
@@ -243,6 +244,7 @@
%dir %{_libqt5_libexecdir}
%{_libqt5_libexecdir}/QtWebEngineProcess
%{_libqt5_archdatadir}/qml/QtWebEngine/
+%{_libqt5_plugindir}/designer/
%files private-headers-devel
%defattr(-,root,root,755)
@@ -254,7 +256,7 @@
%doc LICENSE.*
%exclude %{_libqt5_includedir}/*/%{so_version}
%{_libqt5_includedir}/*/
-%{_libqt5_libdir}/cmake/Qt5Web*/
+%{_libqt5_libdir}/cmake/Qt5*/
%{_libqt5_libdir}/libQt*Web*.so
%{_libqt5_libdir}/libQt*Web*.prl
%{_libqt5_libdir}/qt5/mkspecs/modules/qt_lib_*.pri
++++++ _constraints ++++++
--- /var/tmp/diff_new_pack.ecCRz4/_old 2016-06-29 15:10:50.000000000 +0200
+++ /var/tmp/diff_new_pack.ecCRz4/_new 2016-06-29 15:10:50.000000000 +0200
@@ -1,7 +1,7 @@
<constraints>
<hardware>
<memory>
- <size unit="G">4</size>
+ <size unit="G">6</size>
</memory>
<processors>4</processors>
</hardware>
++++++ qtwebengine-opensource-src-5.6.0.tar.xz -> qtwebengine-opensource-src-5.6.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/libqt5-qtwebengine/qtwebengine-opensource-src-5.6.0.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new/qtwebengine-opensource-src-5.6.1.tar.xz differ: char 26, line 1
++++++ use-fno-delete-null-pointer-checks-with-gcc-6.diff ++++++
X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtwebengine-chromium.git;a=…
diff --git a/src/3rdparty/chromium/build/common.gypi b/src/3rdparty/chromium/build/common.gypi
index f02d100..fccfc7b 100644
--- a/src/3rdparty/chromium/build/common.gypi
+++ b/src/3rdparty/chromium/build/common.gypi
@@ -4716,6 +4716,26 @@
}],
],
}],
+ ['gcc_version>=60 and clang==0', {
+ 'target_conditions': [
+ ['_toolset=="target"', {
+ 'cflags_cc': [
+ # V8 needs this, see https://bugs.chromium.org/p/v8/issues/detail?id=3782
+ '-fno-delete-null-pointer-checks',
+ ],
+ }],
+ ],
+ }],
+ ['host_gcc_version>=60 and clang==0 and host_clang==0', {
+ 'target_conditions': [
+ ['_toolset=="host"', {
+ 'cflags_cc': [
+ # V8 needs this, see https://bugs.chromium.org/p/v8/issues/detail?id=3782
+ '-fno-delete-null-pointer-checks',
+ ],
+ }],
+ ],
+ }],
],
},
}],
1
0
Hello community,
here is the log from the commit of package chromium-bsu for openSUSE:Factory checked in at 2016-06-29 15:10:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/chromium-bsu (Old)
and /work/SRC/openSUSE:Factory/.chromium-bsu.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chromium-bsu"
Changes:
--------
--- /work/SRC/openSUSE:Factory/chromium-bsu/chromium-bsu.changes 2014-11-28 08:48:20.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.chromium-bsu.new/chromium-bsu.changes 2016-06-29 15:10:40.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Jun 24 18:25:08 UTC 2016 - i(a)marguerite.su
+
+- add patch: chromium-bsu-0.9.15.1-gcc6.patch
+ * fix boo#985196
+ * fix call of overloaded 'abs(float&)' is ambiguous
+
+-------------------------------------------------------------------
New:
----
chromium-bsu-0.9.15.1-gcc6.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ chromium-bsu.spec ++++++
--- /var/tmp/diff_new_pack.jOlt2e/_old 2016-06-29 15:10:41.000000000 +0200
+++ /var/tmp/diff_new_pack.jOlt2e/_new 2016-06-29 15:10:41.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package chromium-bsu
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,20 +23,23 @@
License: ClArtistic and MIT
Group: Amusements/Games/Action/Shoot
Url: http://sourceforge.net/projects/chromium-bsu/
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
# hiscore patch
-Patch0: %{name}-%{version}-src_HiScore.cpp.patch
-%if 0%{?suse_version}
-BuildRequires: fdupes
-BuildRequires: hicolor-icon-theme
-BuildRequires: update-desktop-files
-%endif
+Patch: %{name}-%{version}-src_HiScore.cpp.patch
+#PATCH-FIX-UPSTREAM marguerite(a)opensuse.org - gcc6: call of overloaded 'abs(float&)' is ambiguous
+Patch1: %{name}-%{version}-gcc6.patch
BuildRequires: dejavu-fonts
BuildRequires: gcc-c++
BuildRequires: libGLC-devel
+BuildRequires: pkgconfig
BuildRequires: pkgconfig(SDL_image)
BuildRequires: pkgconfig(freealut)
BuildRequires: pkgconfig(sdl)
+%if 0%{?suse_version}
+BuildRequires: fdupes
+BuildRequires: hicolor-icon-theme
+BuildRequires: update-desktop-files
+%endif
%description
Chromium B.S.U. is a fast paced, arcade-style, top-scrolling space shooter.
@@ -48,14 +51,15 @@
%prep
%setup -q
-%patch0
+%patch
+%patch1 -p1
%build
%configure --docdir=%{_docdir}/%{name}
make %{?_smp_mflags}
%install
-make DESTDIR=%{buildroot} install
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
rm -f %{buildroot}/%{name}-%{version}/data/doc/Makefile*
rm -f %{buildroot}/%{name}-%{version}/data/doc/images/Makefile*
++++++ chromium-bsu-0.9.15.1-gcc6.patch ++++++
Index: b/src/MainSDL_Event.cpp
===================================================================
--- a/src/MainSDL_Event.cpp
+++ b/src/MainSDL_Event.cpp
@@ -19,6 +19,7 @@
#include <cstdlib>
#include <cstdio>
#include <cstring>
+#include <cmath>
#include "Config.h"
@@ -417,14 +418,14 @@ void MainSDL::keyMove()
#else
Uint8 *keystate = SDL_GetKeyState(NULL);
#endif
- if( keystate[SDLK_LEFT] || keystate[SDLK_KP4] ) key_speed_x -= 2.0 + abs(key_speed_x)*0.4;
- if( keystate[SDLK_RIGHT] || keystate[SDLK_KP6] ) key_speed_x += 2.0 + abs(key_speed_x)*0.4;
- if( keystate[SDLK_UP] || keystate[SDLK_KP8] ) key_speed_y -= 2.0 + abs(key_speed_y)*0.4;
- if( keystate[SDLK_DOWN] || keystate[SDLK_KP2] ) key_speed_y += 2.0 + abs(key_speed_y)*0.4;
- if( keystate[SDLK_KP7] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; }
- if( keystate[SDLK_KP9] ){ key_speed_x += 2.0 + abs(key_speed_x)*0.4; key_speed_y -= 2.0 + abs(key_speed_y)*0.4; }
- if( keystate[SDLK_KP3] ){ key_speed_x += 2.0 + abs(key_speed_x)*0.4; key_speed_y += 2.0 + abs(key_speed_y)*0.4; }
- if( keystate[SDLK_KP1] ){ key_speed_x -= 2.0 + abs(key_speed_x)*0.4; key_speed_y += 2.0 + abs(key_speed_y)*0.4; }
+ if( keystate[SDLK_LEFT] || keystate[SDLK_KP4] ) key_speed_x -= 2.0 + std::abs(key_speed_x)*0.4;
+ if( keystate[SDLK_RIGHT] || keystate[SDLK_KP6] ) key_speed_x += 2.0 + std::abs(key_speed_x)*0.4;
+ if( keystate[SDLK_UP] || keystate[SDLK_KP8] ) key_speed_y -= 2.0 + std::abs(key_speed_y)*0.4;
+ if( keystate[SDLK_DOWN] || keystate[SDLK_KP2] ) key_speed_y += 2.0 + std::abs(key_speed_y)*0.4;
+ if( keystate[SDLK_KP7] ){ key_speed_x -= 2.0 + std::abs(key_speed_x)*0.4; key_speed_y -= 2.0 + std::abs(key_speed_y)*0.4; }
+ if( keystate[SDLK_KP9] ){ key_speed_x += 2.0 + std::abs(key_speed_x)*0.4; key_speed_y -= 2.0 + std::abs(key_speed_y)*0.4; }
+ if( keystate[SDLK_KP3] ){ key_speed_x += 2.0 + std::abs(key_speed_x)*0.4; key_speed_y += 2.0 + std::abs(key_speed_y)*0.4; }
+ if( keystate[SDLK_KP1] ){ key_speed_x -= 2.0 + std::abs(key_speed_x)*0.4; key_speed_y += 2.0 + std::abs(key_speed_y)*0.4; }
//float s = (1.0-game->speedAdj)+(game->speedAdj*0.7);
float s = 0.7;
key_speed_x *= s;
1
0