openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- 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
November 2016
- 1 participants
- 1494 discussions
Hello community,
here is the log from the commit of package breeze-gtk for openSUSE:Factory checked in at 2016-11-25 12:06:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/breeze-gtk (Old)
and /work/SRC/openSUSE:Factory/.breeze-gtk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "breeze-gtk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/breeze-gtk/breeze-gtk.changes 2016-11-…
[View More]04 20:52:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.breeze-gtk.new/breeze-gtk.changes 2016-11-25 12:06:18.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Nov 23 10:59:30 UTC 2016 - fabian(a)ritter-vogt.de
+
+- Update to 5.8.4
+ * New bugfix release
+ * For more details please see:
+ https://www.kde.org/announcements/plasma-5.8.4.php
+
+-------------------------------------------------------------------
Old:
----
breeze-gtk-5.8.3.tar.xz
New:
----
breeze-gtk-5.8.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ breeze-gtk.spec ++++++
--- /var/tmp/diff_new_pack.tj4uni/_old 2016-11-25 12:06:19.000000000 +0100
+++ /var/tmp/diff_new_pack.tj4uni/_new 2016-11-25 12:06:19.000000000 +0100
@@ -18,7 +18,7 @@
%define _name breeze
Name: breeze-gtk
-Version: 5.8.3
+Version: 5.8.4
Release: 0
Summary: GTK+ theme matching KDE's Breeze
License: LGPL-2.1
++++++ breeze-gtk-5.8.3.tar.xz -> breeze-gtk-5.8.4.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/breeze-gtk-5.8.3/CMakeLists.txt new/breeze-gtk-5.8.4/CMakeLists.txt
--- old/breeze-gtk-5.8.3/CMakeLists.txt 2016-11-01 12:55:16.000000000 +0100
+++ new/breeze-gtk-5.8.4/CMakeLists.txt 2016-11-22 11:03:03.000000000 +0100
@@ -1,5 +1,5 @@
project(breeze-gtk)
-set(PROJECT_VERSION "5.8.3")
+set(PROJECT_VERSION "5.8.4")
set(PROJECT_VERSION_MAJOR 5)
cmake_minimum_required(VERSION 2.8.12)
[View Less]
1
0
Hello community,
here is the log from the commit of package breeze for openSUSE:Factory checked in at 2016-11-25 12:06:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/breeze (Old)
and /work/SRC/openSUSE:Factory/.breeze.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "breeze"
Changes:
--------
--- /work/SRC/openSUSE:Factory/breeze/breeze.changes 2016-11-04 20:52:41.000000000 +…
[View More]0100
+++ /work/SRC/openSUSE:Factory/.breeze.new/breeze.changes 2016-11-25 12:06:07.000000000 +0100
@@ -2 +2 @@
-Tue Nov 1 10:36:40 UTC 2016 - fabian(a)ritter-vogt.de
+Wed Nov 23 10:59:30 UTC 2016 - fabian(a)ritter-vogt.de
@@ -4 +4 @@
-- Update to 5.8.3
+- Update to 5.8.4
@@ -7 +7 @@
- https://www.kde.org/announcements/plasma-5.8.3.php
+ https://www.kde.org/announcements/plasma-5.8.4.php
@@ -10 +10 @@
-Sun Oct 23 18:02:27 UTC 2016 - wbauer(a)tmo.at
+Wed Nov 9 13:42:39 UTC 2016 - fabian(a)ritter-vogt.de
@@ -12,2 +12,9 @@
-- Update add-support-for-Q3ListView-to-the-KDE4-style.patch to fix
- some graphical glitches (boo#1005902)
+- Introduce new _plasma5_bugfix global for more fine-tuned dependencies
+
+-------------------------------------------------------------------
+Tue Nov 1 10:36:40 UTC 2016 - fabian(a)ritter-vogt.de
+
+- Update to 5.8.3
+ * New bugfix release
+ * For more details please see:
+ https://www.kde.org/announcements/plasma-5.8.3.php
--- /work/SRC/openSUSE:Factory/breeze/breeze4-style.changes 2016-11-04 20:52:41.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.breeze.new/breeze4-style.changes 2016-11-25 12:06:07.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Nov 23 10:59:30 UTC 2016 - fabian(a)ritter-vogt.de
+
+- Update to 5.8.4
+ * New bugfix release
+ * For more details please see:
+ https://www.kde.org/announcements/plasma-5.8.4.php
+
+-------------------------------------------------------------------
@@ -7,0 +16,6 @@
+
+-------------------------------------------------------------------
+Sun Oct 23 18:02:27 UTC 2016 - wbauer(a)tmo.at
+
+- Update add-support-for-Q3ListView-to-the-KDE4-style.patch to fix
+ some graphical glitches (boo#1005902)
Old:
----
breeze-5.8.3.tar.xz
New:
----
breeze-5.8.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ breeze.spec ++++++
--- /var/tmp/diff_new_pack.uuoZaf/_old 2016-11-25 12:06:10.000000000 +0100
+++ /var/tmp/diff_new_pack.uuoZaf/_new 2016-11-25 12:06:10.000000000 +0100
@@ -18,9 +18,12 @@
%bcond_without lang
Name: breeze
-Version: 5.8.3
+Version: 5.8.4
Release: 0
-%{!?_plasma5_version: %global _plasma5_version %{version}}
+# Full Plasma 5 version (e.g. 5.8.4)
+%{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
+# Lasted ABI-stable Plasma (e.g. 5.8 in KF5, but 5.8.90 in KUF)
+%{!?_plasma5_version: %global _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
BuildRequires: cmake >= 2.8.12
BuildRequires: extra-cmake-modules >= 0.0.13
BuildRequires: fdupes
++++++ breeze4-style.spec ++++++
--- /var/tmp/diff_new_pack.uuoZaf/_old 2016-11-25 12:06:10.000000000 +0100
+++ /var/tmp/diff_new_pack.uuoZaf/_new 2016-11-25 12:06:10.000000000 +0100
@@ -17,7 +17,7 @@
Name: breeze4-style
-Version: 5.8.3
+Version: 5.8.4
Release: 0
BuildRequires: automoc4
BuildRequires: cmake >= 2.8.12
++++++ breeze-5.8.3.tar.xz -> breeze-5.8.4.tar.xz ++++++
/work/SRC/openSUSE:Factory/breeze/breeze-5.8.3.tar.xz /work/SRC/openSUSE:Factory/.breeze.new/breeze-5.8.4.tar.xz differ: char 26, line 1
[View Less]
1
0
Hello community,
here is the log from the commit of package bluedevil5 for openSUSE:Factory checked in at 2016-11-25 12:05:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bluedevil5 (Old)
and /work/SRC/openSUSE:Factory/.bluedevil5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bluedevil5"
Changes:
--------
--- /work/SRC/openSUSE:Factory/bluedevil5/bluedevil5.changes 2016-11-…
[View More]04 20:51:34.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.bluedevil5.new/bluedevil5.changes 2016-11-25 12:05:56.000000000 +0100
@@ -1,0 +2,13 @@
+Wed Nov 23 10:59:30 UTC 2016 - fabian(a)ritter-vogt.de
+
+- Update to 5.8.4
+ * New bugfix release
+ * For more details please see:
+ https://www.kde.org/announcements/plasma-5.8.4.php
+
+-------------------------------------------------------------------
+Fri Nov 4 02:54:19 UTC 2016 - kamikazow(a)opensuse.org
+
+- Correct terminology
+
+-------------------------------------------------------------------
Old:
----
bluedevil-5.8.3.tar.xz
New:
----
bluedevil-5.8.4.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bluedevil5.spec ++++++
--- /var/tmp/diff_new_pack.1yARoC/_old 2016-11-25 12:05:57.000000000 +0100
+++ /var/tmp/diff_new_pack.1yARoC/_new 2016-11-25 12:05:57.000000000 +0100
@@ -19,9 +19,9 @@
%bcond_without lang
Name: bluedevil5
-Version: 5.8.3
+Version: 5.8.4
Release: 0
-Summary: Bluetooth Manager for KDE
+Summary: Bluetooth Manager for KDE Plasma
License: GPL-2.0+
Group: Hardware/Other
Url: http://www.kde.org/
@@ -60,7 +60,7 @@
Requires(postun): shared-mime-info
%description
-Bluetooth daemon for KDE, handling connections.
+Bluetooth daemon for KDE Plasma, handling connections.
%lang_package
%prep
++++++ bluedevil-5.8.3.tar.xz -> bluedevil-5.8.4.tar.xz ++++++
++++ 37048 lines of diff (skipped)
[View Less]
1
0
Hello community,
here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2016-11-25 12:05:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2 (Old)
and /work/SRC/openSUSE:Factory/.yast2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2016-11-23 13:35:22.000000000 +0100
+++…
[View More] /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2016-11-25 12:05:12.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov 23 15:23:24 UTC 2016 - igonzalezsosa(a)suse.com
+
+- Fix replacement of workflow modules (bsc#1011869)
+- 3.2.6
+
+-------------------------------------------------------------------
Old:
----
yast2-3.2.5.tar.bz2
New:
----
yast2-3.2.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.OL9Qbi/_old 2016-11-25 12:05:13.000000000 +0100
+++ /var/tmp/diff_new_pack.OL9Qbi/_new 2016-11-25 12:05:13.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2
-Version: 3.2.5
+Version: 3.2.6
Release: 0
Summary: YaST2 - Main Package
License: GPL-2.0
++++++ yast2-3.2.5.tar.bz2 -> yast2-3.2.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.2.5/library/control/src/modules/WorkflowManager.rb new/yast2-3.2.6/library/control/src/modules/WorkflowManager.rb
--- old/yast2-3.2.5/library/control/src/modules/WorkflowManager.rb 2016-11-21 09:22:01.000000000 +0100
+++ new/yast2-3.2.6/library/control/src/modules/WorkflowManager.rb 2016-11-23 17:54:27.000000000 +0100
@@ -39,6 +39,8 @@
module Yast
class WorkflowManagerClass < Module
+ include Yast::Logger
+
def main
Yast.import "UI"
Yast.import "Pkg"
@@ -748,7 +750,7 @@
found = false
modules = Builtins.maplist(Ops.get_list(workflow, "modules", [])) do |m|
- next if Ops.get_string(m, "name", "") != old
+ next [m] if Ops.get_string(m, "name", "") != old
new_list = Builtins.maplist(new) do |n|
Ops.set(n, "textdomain", domain)
@@ -762,15 +764,8 @@
deep_copy(new_list)
end
- if !found
- Builtins.y2internal(
- "Insert/Replace/Remove workflow module %1 not found",
- old
- )
- end
-
+ log.warn("Insert/Replace/Remove workflow module '#{old}' not found") if !found
Ops.set(workflow, "modules", Builtins.flatten(modules))
-
deep_copy(workflow)
end
@@ -783,6 +778,7 @@
def MergeWorkflow(base, addon, _prod_name, domain)
base = deep_copy(base)
addon = deep_copy(addon)
+
# Merging - removing steps, settings
removes = Ops.get_list(addon, "remove_modules", [])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.2.5/library/control/test/Makefile.am new/yast2-3.2.6/library/control/test/Makefile.am
--- old/yast2-3.2.5/library/control/test/Makefile.am 2016-11-21 09:22:01.000000000 +0100
+++ new/yast2-3.2.6/library/control/test/Makefile.am 2016-11-23 17:54:27.000000000 +0100
@@ -1,6 +1,7 @@
TESTS = \
InstExtensionImage_test.rb \
- ProductFeatures_test.rb
+ ProductFeatures_test.rb \
+ workflow_manager_test.rb
TEST_EXTENSIONS = .rb
RB_LOG_COMPILER = rspec
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.2.5/library/control/test/workflow_manager_test.rb new/yast2-3.2.6/library/control/test/workflow_manager_test.rb
--- old/yast2-3.2.5/library/control/test/workflow_manager_test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-3.2.6/library/control/test/workflow_manager_test.rb 2016-11-23 17:54:27.000000000 +0100
@@ -0,0 +1,58 @@
+#!/usr/bin/env rspec
+
+require_relative "test_helper"
+
+Yast.import "WorkflowManager"
+
+describe Yast::WorkflowManager do
+ subject { Yast::WorkflowManager }
+
+ describe "#ReplaceWorkflowModule" do
+ let(:workflow) do
+ {
+ "defaults" => { "archs" => "all" },
+ "stage" => "continue",
+ "mode" => "autoinstallation",
+ "modules" => [
+ { "label" => "Perform Installation", "name" => "autopost" },
+ { "label" => "System Configuration", "name" => "autoconfigure" }
+ ]
+ }
+ end
+ let(:old) { "autoconfigure" }
+ let(:new) { { "label" => "Custom Module", "name" => "custom" } }
+ let(:domain) { "some-domain" }
+ let(:keep) { true }
+
+ context "when keep is set to true" do
+ it "inserts the new modules before the old one" do
+ replaced = subject.ReplaceWorkflowModule(workflow, old, [new], domain, keep)
+ expect(replaced["modules"]).to include(new.merge("textdomain" => domain))
+
+ modules = replaced["modules"].map { |m| m["name"] }
+ expect(modules).to eq(["autopost", "custom", "autoconfigure"])
+ end
+ end
+
+ context "when keep is set to false" do
+ let(:keep) { false }
+ it "replaces the old one with the new modules" do
+ replaced = subject.ReplaceWorkflowModule(workflow, old, [new], domain, keep)
+ expect(replaced["modules"]).to include(new.merge("textdomain" => domain))
+
+ modules = replaced["modules"].map { |m| m["name"] }
+ expect(modules).to eq(["autopost", "custom"])
+ end
+ end
+
+ context "when the old module is not found" do
+ let(:old) { "proposal" }
+
+ it "does not modify the workflow and logs the error" do
+ expect(subject.log).to receive(:warn).with(/workflow module 'proposal' not found/)
+ replaced = subject.ReplaceWorkflowModule(workflow, old, [new], domain, keep)
+ expect(replaced).to eq(workflow)
+ end
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.2.5/package/yast2.changes new/yast2-3.2.6/package/yast2.changes
--- old/yast2-3.2.5/package/yast2.changes 2016-11-21 09:22:02.000000000 +0100
+++ new/yast2-3.2.6/package/yast2.changes 2016-11-23 17:54:28.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Nov 23 15:23:24 UTC 2016 - igonzalezsosa(a)suse.com
+
+- Fix replacement of workflow modules (bsc#1011869)
+- 3.2.6
+
+-------------------------------------------------------------------
Fri Nov 18 16:33:56 UTC 2016 - lslezak(a)suse.cz
- Remove the restart file when starting YaST to avoid possible
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.2.5/package/yast2.spec new/yast2-3.2.6/package/yast2.spec
--- old/yast2-3.2.5/package/yast2.spec 2016-11-21 09:22:02.000000000 +0100
+++ new/yast2-3.2.6/package/yast2.spec 2016-11-23 17:54:28.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2
-Version: 3.2.5
+Version: 3.2.6
Release: 0
Summary: YaST2 - Main Package
License: GPL-2.0
[View Less]
1
0
Hello community,
here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2016-11-25 12:04:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-country (Old)
and /work/SRC/openSUSE:Factory/.yast2-country.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-country/yast2-…
[View More]country.changes 2016-11-23 13:36:12.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2016-11-25 12:05:00.000000000 +0100
@@ -1,0 +2,9 @@
+Wed Nov 23 13:41:41 CET 2016 - schubi(a)suse.de
+
+- Language has not been set. Taking language from zypp.
+ But libzypp can also returns languages which we do not support
+ (e.g. default "en"). So we are checking and changing it to
+ default if needed (without showing an error (bnc#1009508))
+- 3.2.2
+
+-------------------------------------------------------------------
Old:
----
yast2-country-3.2.1.tar.bz2
New:
----
yast2-country-3.2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.PUnG1p/_old 2016-11-25 12:05:01.000000000 +0100
+++ /var/tmp/diff_new_pack.PUnG1p/_new 2016-11-25 12:05:01.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-country
-Version: 3.2.1
+Version: 3.2.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-country-3.2.1.tar.bz2 -> yast2-country-3.2.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.2.1/language/src/modules/Language.rb new/yast2-country-3.2.2/language/src/modules/Language.rb
--- old/yast2-country-3.2.1/language/src/modules/Language.rb 2016-11-21 17:48:22.000000000 +0100
+++ new/yast2-country-3.2.2/language/src/modules/Language.rb 2016-11-23 16:02:52.000000000 +0100
@@ -68,7 +68,7 @@
@language_on_entry = DEFAULT_FALLBACK_LANGUAGE
# language preselected in /etc/install.inf
- @preselected = "en_US"
+ @preselected = DEFAULT_FALLBACK_LANGUAGE
# user readable description of language
@name = "English (US)"
@@ -244,7 +244,7 @@
# Return English translation of given language (Fate 301789)
def EnglishName(code, backup)
if Ops.get_string(@english_names, code, "") == ""
- if @language == "en_US"
+ if @language == DEFAULT_FALLBACK_LANGUAGE
Ops.set(@english_names, code, backup)
else
Builtins.y2warning("nothing in english_names...")
@@ -255,11 +255,11 @@
# Fill the map with English names of languages
def FillEnglishNames(lang)
- return if lang == "en_US" # will be filled in on first start
+ return if lang == DEFAULT_FALLBACK_LANGUAGE # will be filled in on first start
if @use_utf8
- WFM.SetLanguage("en_US", "UTF-8")
+ WFM.SetLanguage(DEFAULT_FALLBACK_LANGUAGE, "UTF-8")
else
- WFM.SetLanguage("en_US")
+ WFM.SetLanguage(DEFAULT_FALLBACK_LANGUAGE)
end
Builtins.foreach(GetLanguagesMap(true)) do |code, info|
Ops.set(@english_names, code, Ops.get_string(info, 4, ""))
@@ -394,9 +394,10 @@
# Checks whether given language is supported by the installer
# and changes it to the default language en_US if it isn't.
#
- # @param [String] reference to the new language
+ # @param language [String] reference to the new language
+ # @param error_report [Boolean] showing an error popup
# @return [String] new (corrected) language
- def correct_language(language)
+ def correct_language(language, error_report: true)
# No correction needed, this is already a correct language definition
return language if valid_language?(language)
@@ -410,7 +411,7 @@
:directory => @languages_directory,
:fallback => DEFAULT_FALLBACK_LANGUAGE
}
- )
+ ) if error_report
return DEFAULT_FALLBACK_LANGUAGE
end
@@ -609,15 +610,19 @@
Builtins.y2milestone("install_inf Locale %1", @preselected)
if @preselected != nil && @preselected != ""
lang = @preselected
- @linuxrc_language_set = true if lang != "en_US"
+ @linuxrc_language_set = true if lang != DEFAULT_FALLBACK_LANGUAGE
else
- @preselected = "en_US"
+ @preselected = DEFAULT_FALLBACK_LANGUAGE
end
- lang = "" if lang == nil
+ lang ||= ""
Builtins.y2milestone("lang after checking /etc/install.inf: %1", lang)
if lang == ""
- lang = Pkg.GetTextLocale
+ # As language has not been set we are trying to ask libzypp.
+ # But libzypp can also returns languages which we do not support
+ # (e.g. default "en"). So we are checking and changing it to default
+ # if needed (without showing an error (bnc#1009508))
+ lang = correct_language(Pkg.GetTextLocale, error_report: false)
Builtins.y2milestone("setting lang to default language: %1", lang)
end
# Ignore any previous settings and take language from control file.
@@ -802,7 +807,7 @@
Builtins.foreach(Pkg.GetAdditionalLocales) do |additional|
# add the language for both kind of values ("cs" vs. "pt_PT")
if !Builtins.contains(langs, additional)
- additional = "en_US" if additional == "en"
+ additional = DEFAULT_FALLBACK_LANGUAGE if additional == "en"
additional = "pt_PT" if additional == "pt"
if Builtins.haskey(@languages_map, additional)
missing = Builtins.add(missing, additional)
@@ -1375,7 +1380,7 @@
)
)
end
- WfmSetGivenLanguage("en_US")
+ WfmSetGivenLanguage(DEFAULT_FALLBACK_LANGUAGE)
return true
end
false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.2.1/language/test/Language_test.rb new/yast2-country-3.2.2/language/test/Language_test.rb
--- old/yast2-country-3.2.1/language/test/Language_test.rb 2016-11-21 17:48:22.000000000 +0100
+++ new/yast2-country-3.2.2/language/test/Language_test.rb 2016-11-23 16:02:52.000000000 +0100
@@ -89,6 +89,14 @@
language = subject.correct_language("unknown_language")
expect(language).to eq(Yast::LanguageClass::DEFAULT_FALLBACK_LANGUAGE)
end
+
+ it "returns the default fallback language without reporting an error if it is disabled " do
+ allow(subject).to receive(:valid_language?).with("unknown_language").and_return(false)
+ expect(Yast::Report).to_not receive(:Error)
+
+ language = subject.correct_language("unknown_language", error_report: false)
+ expect(language).to eq(Yast::LanguageClass::DEFAULT_FALLBACK_LANGUAGE)
+ end
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.2.1/package/yast2-country.changes new/yast2-country-3.2.2/package/yast2-country.changes
--- old/yast2-country-3.2.1/package/yast2-country.changes 2016-11-21 17:48:22.000000000 +0100
+++ new/yast2-country-3.2.2/package/yast2-country.changes 2016-11-23 16:02:52.000000000 +0100
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Wed Nov 23 13:41:41 CET 2016 - schubi(a)suse.de
+
+- Language has not been set. Taking language from zypp.
+ But libzypp can also returns languages which we do not support
+ (e.g. default "en"). So we are checking and changing it to
+ default if needed (without showing an error (bnc#1009508))
+- 3.2.2
+
+-------------------------------------------------------------------
Mon Nov 21 15:50:47 UTC 2016 - igonzalezsosa(a)suse.com
- Set keyboard layout properly on installation system (bsc#1010938)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.2.1/package/yast2-country.spec new/yast2-country-3.2.2/package/yast2-country.spec
--- old/yast2-country-3.2.1/package/yast2-country.spec 2016-11-21 17:48:22.000000000 +0100
+++ new/yast2-country-3.2.2/package/yast2-country.spec 2016-11-23 16:02:52.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-country
-Version: 3.2.1
+Version: 3.2.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
[View Less]
1
0
Hello community,
here is the log from the commit of package gfxboot for openSUSE:Factory checked in at 2016-11-25 12:04:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gfxboot (Old)
and /work/SRC/openSUSE:Factory/.gfxboot.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gfxboot"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gfxboot/gfxboot.changes 2016-11-08 18:24:56.…
[View More]000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gfxboot.new/gfxboot.changes 2016-11-25 12:04:55.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Nov 23 14:27:20 UTC 2016 - snwint(a)suse.com
+
+- merge pr gh#openSUSE/gfxboot#22
+- update git2log script
+- adjust keymap names to be consistent again (bsc#1009914)
+- 4.5.20
+
+-------------------------------------------------------------------
Old:
----
gfxboot-4.5.19.tar.xz
New:
----
gfxboot-4.5.20.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gfxboot.spec ++++++
--- /var/tmp/diff_new_pack.z0FwrC/_old 2016-11-25 12:04:57.000000000 +0100
+++ /var/tmp/diff_new_pack.z0FwrC/_new 2016-11-25 12:04:57.000000000 +0100
@@ -17,7 +17,7 @@
Name: gfxboot
-Version: 4.5.19
+Version: 4.5.20
Release: 0
Summary: Graphical Boot Logo for GRUB, LILO and SYSLINUX
License: GPL-2.0+
++++++ KDE.tar.xz ++++++
++++++ SLED.tar.xz ++++++
++++++ SLES.tar.xz ++++++
++++++ examples.tar.xz ++++++
++++++ gfxboot-4.5.19.tar.xz -> gfxboot-4.5.20.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.19/VERSION new/gfxboot-4.5.20/VERSION
--- old/gfxboot-4.5.19/VERSION 2016-11-07 13:15:19.000000000 +0100
+++ new/gfxboot-4.5.20/VERSION 2016-11-23 15:23:06.000000000 +0100
@@ -1 +1 @@
-4.5.19
+4.5.20
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.19/changelog new/gfxboot-4.5.20/changelog
--- old/gfxboot-4.5.19/changelog 2016-11-07 13:15:19.000000000 +0100
+++ new/gfxboot-4.5.20/changelog 2016-11-23 15:23:06.000000000 +0100
@@ -1,14 +1,24 @@
+2016-11-23: 4.5.20
+ - merge pr gh#openSUSE/gfxboot#22
+ - update git2log script
+ - adjust keymap names to be consistent again (bsc #1009914)
+
2016-10-19: 4.5.19
+ - merge pr gh#openSUSE/gfxboot#20
- Update ca.po
2016-10-19: 4.5.18
+ - merge pr gh#openSUSE/gfxboot#18
+ - merge pr gh#openSUSE/gfxboot#16
- Update ca.po
- Update lt.po
2016-10-17: 4.5.17
+ - merge pr gh#openSUSE/gfxboot#15
- fix bug calculating video and xvideo options (bsc #780621)
2016-10-14: 4.5.16
+ - merge pr gh#openSUSE/gfxboot#14
- implement enhanced menu layout engine
- rework video mode menu
- adjust to new menu engine
@@ -23,19 +33,24 @@
- updated sound samples
2016-09-13: 4.5.15
+ - merge pr gh#openSUSE/gfxboot#11
- Adapted to the new keymaps used by linuxrc and YaST
2016-08-08: 4.5.14
+ - merge pr gh#openSUSE/gfxboot#10
- fix boot-label redrawing after language change (bsc #988392)
2016-06-13: 4.5.13
+ - merge pr gh#openSUSE/gfxboot#8
- updated translations
- make 'systemboot' and 'more' menu entries translatable
2015-12-04: 4.5.12
+ - merge pr gh#openSUSE/gfxboot#4
- fix booting from submenu (bsc #957893)
2015-11-12: 4.5.11
+ - merge pr gh#openSUSE/gfxboot#3
- documented submenu syntax
- show submenu indicator in RTL layout
- on leaving a submenu, restore cursor position
@@ -48,6 +63,7 @@
- implement LEAP boot splash
2015-09-28: 4.5.8
+ - merge pr gh#openSUSE/gfxboot#2
- Add a basic README.md
2014-10-14: 4.5.7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gfxboot-4.5.19/git2log new/gfxboot-4.5.20/git2log
--- old/gfxboot-4.5.19/git2log 2016-11-07 13:15:19.000000000 +0100
+++ new/gfxboot-4.5.20/git2log 2016-11-23 15:23:06.000000000 +0100
@@ -1,5 +1,17 @@
#! /usr/bin/perl
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+#
+# This script is maintained at https://github.com/openSUSE/ssob
+#
+# If you're in another project, this is just a copy.
+# You may update it to the latest version from time to time...
+#
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+
+use strict;
+
use Getopt::Long;
use Data::Dumper;
@@ -8,27 +20,44 @@
$Data::Dumper::Indent = 1;
sub usage;
+sub get_branch_tags;
+sub get_branch;
+sub get_parent_branch;
+sub get_version;
usage 0 if !@ARGV;
-@deps = qw ( .git/HEAD .git/refs/heads .git/refs/tags );
+my @deps = qw ( .git/HEAD .git/refs/heads .git/refs/tags );
+
+my $branch;
+my $current_version;
+my $github_project;
+my @tags;
+my @all_tags;
+
+my $opt_log;
+my $opt_version;
+my $opt_branch;
+my $opt_update;
+my $opt_file;
GetOptions(
'help' => sub { usage 0 },
'version' => \$opt_version,
+ 'branch' => \$opt_branch,
'update' => \$opt_update,
'log|changelog' => \$opt_log,
) || usage 1;
-usage 1 if @ARGV > 1 || !($opt_log || $opt_version);
+usage 1 if @ARGV > 1 || !($opt_log || $opt_version || $opt_branch);
$opt_file = @ARGV ? shift : '-';
die "no git repo\n" unless -d ".git";
if($opt_update && $opt_file ne '-' && -f($opt_file)) {
- $ok = 1;
+ my $ok = 1;
- $t = (stat $opt_file)[9];
+ my $t = (stat $opt_file)[9];
for (@deps) {
$ok = 0 if (stat)[9] > $t;
@@ -37,57 +66,55 @@
exit 0 if $ok;
}
-for (`git branch`) {
- if(/^\*\s+(\S+)/) {
- $branch = $1;
- last;
- }
+if(`git config remote.origin.url` =~ m#github.com[:/]+(\S+/\S+)#) {
+ $github_project = $1;
}
-$branch = "master" if $branch eq '(no';
+@all_tags = `git tag`;
+chomp @all_tags;
+$branch = get_branch;
die "no branch?\n" unless $branch;
-# print STDERR "writing log for branch $branch\n";
-
-@tags = `git tag`;
+@tags = get_branch_tags;
+die "no tags at all?\n" unless @tags;
-chomp @tags;
+if($branch ne 'master') {
+ if(!grep { /^$branch\-/ } @tags) {
+ $branch = get_parent_branch;
+ die "sorry, can't determine branch\n" unless $branch;
-for (@tags) {
- if(/^\d/) {
- s/(\d+)/sprintf "%04d", $1/eg;
- push @ntags, $_;
- }
- elsif(s/^$branch\-//) {
- s/(\d+)/sprintf "%04d", $1/eg;
- push @ntags, "$branch-$_";
+ @tags = get_branch_tags;
+ die "no tags at all?\n" unless @tags;
}
}
+else {
+ @tags = get_branch_tags;
+ die "no tags at all?\n" unless @tags;
+}
-@tags = sort @ntags;
-
-die "no tags at all?\n" unless @tags;
-
-$current_version = $tags[-1];
-$current_version =~ s/(\d+)/$1 + 0/eg;
+if($opt_branch) {
+ open my $f, ">$opt_file";
+ print $f "$branch\n";
+ close $f;
-if(`git log --pretty=medium --date=iso '$current_version..HEAD'`) {
- $current_version =~ s/(\d+)$/$1 + 1/e;
+ exit 0;
}
-$current_version =~ s/^$branch\-//;
+$current_version = get_version;
if($opt_version) {
- open F, ">$opt_file";
- print F "$current_version\n";
- close F;
+ open my $f, ">$opt_file";
+ print $f "$current_version\n";
+ close $f;
exit 0;
}
if($branch ne 'master') {
- for ($i = 0; $i < @tags; $i++) {
+ my ($i1, $i2, $bi);
+
+ for (my $i = 0; $i < @tags; $i++) {
if($tags[$i] =~ /^$branch\-(\S+)/) {
$i2 = $i;
$bi = $1;
@@ -99,7 +126,7 @@
warn "no tags in this branch yet\n" unless $bi;
- for ($i = 0; $i < $i2; $i++) {
+ for (my $i = 0; $i < $i2; $i++) {
if($tags[$i] ge $bi) {
if($tags[$i] eq $bi) {
$i1 = $i;
@@ -122,31 +149,32 @@
open F, ">$opt_file";
-for ($i = @tags - 1; $i > 0; $i--) {
- $date = undef;
- @t = `git log --pretty=medium --date=iso '$tags[$i-1]..$tags[$i]'`;
+for (my $i = @tags - 1; $i > 0; $i--) {
+ my ($date, @t2);
+
+ my @t = `git log --pretty=medium --date=iso '$tags[$i-1]..$tags[$i]'`;
# print "\n--- $tags[$i-1]..$tags[$i] ---\n", @t, "---\n";
- undef @t2;
- $merge = 0;
+ my $merge = 0;
for (@t) {
$merge = 1 if /^Merge: /;
$merge = 0 if /^commit /;
push @t2, $_ if !$merge;
+ if(/^ Merge pull request #(\d+) from /) {
+ push @t2, "merge pr gh#$github_project#$1\n" if $github_project;
+ }
}
@t = @t2;
undef @t2;
- $detail = 0;
+ my $detail = 0;
for (@t) {
$detail = 1 if /^ $/;
+ $detail = 2 if /^ Conflicts:$/;
$detail = 0 if /^commit /;
- if($detail && /^ [^\-\s]/) {
- # push @t2, "# $_";
- }
- else {
- push @t2, $_;
+ if(!$detail) {
+ push @t2, $_ if $detail < 2;
}
}
@t = @t2;
@@ -160,10 +188,21 @@
last;
}
}
+
+ # handle white space in every first line once and for all
+ my $empty = 1;
+ for (@t) {
+ $empty = 1, $_ = "", next if $_ =~ /^\s*$/;
+ next if !$empty;
+ s/^\s*//;
+ $empty = 0;
+ }
+
@t = grep { !/^(commit|Author:|Date:|Merge:|\s*$)|created.*tag/ } @t;
if(@t) {
# rewrite a bit to have it look more consistent
- map { s/(fate|bnc)#/$1 #/g } @t;
+ map { s/(fate|bnc|bsc)#/$1 #/g } @t;
+ map { s/(fate|bnc|bsc)\s*(\d{4})/$1 #$2/g } @t;
map { s/\(#/(bnc #/g } @t;
map { s/bug\s*#/bnc #/g } @t;
map { s/feat(\.|ure)?\s*#?(\d+)/fate #$2/g } @t;
@@ -175,9 +214,9 @@
map { s/^/\t/ } @t;
map { s/\\'/'/ } @t;
-# print "\n--- $tags[$i-1]..$tags[$i] ---\n", join("\n", @t);
+ # print "\n--- $tags[$i-1]..$tags[$i] ---\n", join("\n", @t);
- $t = $tags[$i];
+ my $t = $tags[$i];
$t = "${branch}-$t" if $branch ne 'master' && $t eq "HEAD";
$t =~ s/HEAD/$current_version/;
print F "$date:\t$t\n";
@@ -187,6 +226,8 @@
close F;
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
sub usage
{
my $err = shift;
@@ -196,6 +237,7 @@
Create changelog and project version from git repo.
--changelog Write changelog to FILE.
--version Write version number to FILE.
+ --branch Write current branch to FILE.
--update Write changelog or version only if FILE is outdated.
--help Print this help text.
usage
@@ -203,3 +245,72 @@
exit $err;
}
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+sub get_branch_tags
+{
+ my @ntags;
+
+ for (@all_tags) {
+ if(/^\d/) {
+ s/(\d+)/sprintf "%04d", $1/eg;
+ push @ntags, $_;
+ }
+ elsif(s/^$branch\-//) {
+ s/(\d+)/sprintf "%04d", $1/eg;
+ push @ntags, "$branch-$_";
+ }
+ }
+
+ return sort @ntags;
+}
+
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+sub get_branch
+{
+ my $b;
+
+ for (`git branch`) {
+ if(/^\*\s+(\S+)/) {
+ $b = $1;
+ last;
+ }
+ }
+
+ $b = "master" if $b eq '(no';
+
+ return $b;
+}
+
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+sub get_parent_branch
+{
+ my $p;
+
+ for (`git log -g --pretty=oneline`) {
+ $p = $1 if /checkout: moving from (\S+) to $branch/;
+ }
+
+ # print "parent = $p\n";
+
+ return $p || "master";
+}
+
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+sub get_version
+{
+ my $v = $tags[-1];
+ $v =~ s/(\d+)/$1 + 0/eg;
+
+ if(`git log --pretty=medium --date=iso '$v..HEAD'`) {
+ $v =~ s/(\d+)$/$1 + 1/e;
+ }
+
+ $v =~ s/^$branch\-//;
+
+ return $v;
+}
+
++++++ openSUSE.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/themes/openSUSE/src/dia_lang.inc new/themes/openSUSE/src/dia_lang.inc
--- old/themes/openSUSE/src/dia_lang.inc 2016-11-07 13:15:19.000000000 +0100
+++ new/themes/openSUSE/src/dia_lang.inc 2016-11-23 15:23:06.000000000 +0100
@@ -27,59 +27,59 @@
[ "bn_BD" "us" false "\u09ac\u09be\u0982\u09b2\u09be" ] % Bengali
[ "bs_BA" "us" false "Bosanski" ] % Bosnian
[ "ca_ES" "es" false "Català" ] % Catalan
- [ "cs_CZ" "cz-us-qwertz" false "Čeština" ] % Czech
+ [ "cs_CZ" "cz" false "Čeština" ] % Czech
[ "cy_GB" "us" false "Cymraeg" ] % Welsh
[ "da_DK" "dk" false "Dansk" ] % Danish
- [ "de_DE" "de-latin1-nodeadkeys" false "Deutsch" ] % German
+ [ "de_DE" "de-nodeadkeys" false "Deutsch" ] % German
[ "el_GR" "gr" false "Ελληνικά" ] % Greek
[ "en_GB" "uk" false "English (UK)" ] % English
[ "en_US" "us" false "English (US)" ] % English
[ "es_ES" "es" false "Español" ] % Spanish
[ "et_EE" "et" false "Eesti" ] % Estonian
[ "fa_IR" "us" true "\ufbfd\ufeb4\u0631\ufe8e\ufed3" ] % Farsi
- [ "fi_FI" "fi-latin1" false "Suomi" ] % Finnish
- [ "fr_FR" "fr-latin1" false "Français" ] % French
+ [ "fi_FI" "fi" false "Suomi" ] % Finnish
+ [ "fr_FR" "fr" false "Français" ] % French
[ "gl_ES" "es" false "Galego" ] % Galician
[ "ka_GE" "us" false "ქართული" ] % Kartuli
[ "gu_IN" "us" false "\u0a97\u0ac1\u0a9c\u0ab0\u0abe\u0aa4\u0ac0" ] % Gujarati
[ "he_IL" "us" false "תירבע" ] % Hebrew
% [ "hi_IN" "us" false "\u0939\u093f\u0928\u094d\u0926\u0940" ] % Hindi
[ "hi_IN" "us" false "\u0939\u093f\u0902\u0926\u0940" ] % Hindi
- [ "hr_HR" "croat" false "Hrvatski" ] % Croatian
+ [ "hr_HR" "hr" false "Hrvatski" ] % Croatian
[ "hu_HU" "hu" false "Magyar" ] % Hungarian
[ "id_ID" "us" false "Bahasa Indonesia" ] % Indonesian
[ "it_IT" "it" false "Italiano" ] % Italian
- [ "ja_JP" "jp106" false "日本語" ] % Japanese
+ [ "ja_JP" "jp" false "日本語" ] % Japanese
[ "jv_ID" "us" false "Basa Jawa" ] % Javanese
% [ "km_KH" "khmer" false "\u1781\u17d2\u1798\u17c2\u179a" ] % Khmer
[ "km_KH" "khmer" false "Khmer" ] % Khmer
- [ "ko_KR" "korean" false "한글" ] % Korean
+ [ "ko_KR" "kr" false "한글" ] % Korean
[ "ky_KG" "us" false "Кыргызча" ] % Kirghiz
[ "lo_LA" "us" false "\u0e9e\u0eb2\u0eaa\u0eb2\u0ea5\u0eb2\u0ea7" ] % Lao
- [ "lt_LT" "lt.baltic" false "Lietuvių" ] % Lithuanian
+ [ "lt_LT" "lt" false "Lietuvių" ] % Lithuanian
[ "mk_MK" "us" false "Македонски" ] % Macedonian
[ "mr_IN" "us" false "\u092e\u0930\u093e\u0920\u0940" ] % Marathi
- [ "nb_NO" "no-latin1" false "Norsk" ] % Norwegian
+ [ "nb_NO" "no" false "Norsk" ] % Norwegian
[ "nl_NL" "us" false "Nederlands" ] % Dutch
- [ "nn_NO" "no-latin1" false "Nynorsk" ] % Nynorsk
+ [ "nn_NO" "no" false "Nynorsk" ] % Nynorsk
[ "pa_IN" "us" false "\u0a2a\u0a70\u0a1c\u0a3e\u0a2c\u0a40" ] % Punjabi
- [ "pl_PL" "Pl02" false "Polski" ] % Polish
- [ "pt_BR" "br-abnt2" false "Português (Brasil)" ] % Portuguese (Brazilian)
- [ "pt_PT" "pt-latin1" false "Português" ] % Portuguese
+ [ "pl_PL" "pl" false "Polski" ] % Polish
+ [ "pt_BR" "br" false "Português (Brasil)" ] % Portuguese (Brazilian)
+ [ "pt_PT" "pt" false "Português" ] % Portuguese
[ "ro_RO" "us" false "Română" ] % Romanian
[ "ru_RU" "ruwin_alt-UTF-8" false "Русский" ] % Russian
[ "si_LK" "us" false "\u0dc3\u0dd2\u0d82\u0dc4\u0dbd" ] % Sinhala
- [ "sk_SK" "sk-qwertz" false "Slovenčina" ] % Slovak
- [ "sl_SI" "slovene" false "Slovenščina" ] % Slovenian
+ [ "sk_SK" "sk" false "Slovenčina" ] % Slovak
+ [ "sl_SI" "si" false "Slovenščina" ] % Slovenian
[ "sr_RS" "sr-cy" false "Srpski" ] % Serbian
- [ "sv_SE" "sv-latin1" false "Svenska" ] % Swedish
+ [ "sv_SE" "se" false "Svenska" ] % Swedish
[ "ta_IN" "us" false "\u0ba4\u0bae\u0bbf\u0bb4\u0bcd" ] % Tamil
- [ "tg_TJ" "tj" false "тоҷикӣ" ] % Tadjik
+ [ "tg_TJ" "tj_alt-UTF8" false "тоҷикӣ" ] % Tadjik
[ "th_TH" "us" false "\u0e20\u0e32\u0e29\u0e32\u0e44\u0e17\u0e22" ] % Thai
- [ "tr_TR" "trq" false "Türkçe" ] % Turkish
- [ "uk_UA" "ua" false "Українська" ] % Ukrainian
+ [ "tr_TR" "tr" false "Türkçe" ] % Turkish
+ [ "uk_UA" "ua-urf" false "Українська" ] % Ukrainian
[ "vi_VN" "us" false "Tiếng Việt" ] % Vietnamese
- [ "wa_BE" "be-latin1" false "Walon" ] % Walloon
+ [ "wa_BE" "be" false "Walon" ] % Walloon
[ "xh_ZA" "us" false "isiXhosa" ] % Xhosa
[ "zh_CN" "us" false "简体中文" ] % Simplified Chinese
[ "zh_TW" "us" false "繁體中文 (台灣)" ] % Traditional Chinese
++++++ upstream.tar.xz ++++++
[View Less]
1
0
Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2016-11-25 12:04:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-network (Old)
and /work/SRC/openSUSE:Factory/.yast2-network.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-network/yast2-…
[View More]network.changes 2016-11-03 12:55:15.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-network.new/yast2-network.changes 2016-11-25 12:04:43.000000000 +0100
@@ -1,0 +2,14 @@
+Tue Nov 22 12:30:06 UTC 2016 - igonzalezsosa(a)suse.com
+
+- Do not crash when removing an entry from the /etc/hosts file
+ (bsc#1010994)
+- 3.2.11
+
+-------------------------------------------------------------------
+Tue Nov 22 11:34:08 UTC 2016 - jreidinger(a)suse.com
+
+- do not crash when on command line is passed non-number id
+ (bsc#1003908)
+- 3.2.10
+
+-------------------------------------------------------------------
Old:
----
yast2-network-3.2.9.tar.bz2
New:
----
yast2-network-3.2.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.vSuwdp/_old 2016-11-25 12:04:45.000000000 +0100
+++ /var/tmp/diff_new_pack.vSuwdp/_new 2016-11-25 12:04:45.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.2.9
+Version: 3.2.11
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-network-3.2.9.tar.bz2 -> yast2-network-3.2.11.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.2.9/package/yast2-network.changes new/yast2-network-3.2.11/package/yast2-network.changes
--- old/yast2-network-3.2.9/package/yast2-network.changes 2016-11-01 13:07:50.000000000 +0100
+++ new/yast2-network-3.2.11/package/yast2-network.changes 2016-11-22 14:08:16.000000000 +0100
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Tue Nov 22 12:30:06 UTC 2016 - igonzalezsosa(a)suse.com
+
+- Do not crash when removing an entry from the /etc/hosts file
+ (bsc#1010994)
+- 3.2.11
+
+-------------------------------------------------------------------
+Tue Nov 22 11:34:08 UTC 2016 - jreidinger(a)suse.com
+
+- do not crash when on command line is passed non-number id
+ (bsc#1003908)
+- 3.2.10
+
+-------------------------------------------------------------------
Thu Oct 27 11:55:10 UTC 2016 - jreidinger(a)suse.com
- Make network summary consistent with other summaries
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.2.9/package/yast2-network.spec new/yast2-network-3.2.11/package/yast2-network.spec
--- old/yast2-network-3.2.9/package/yast2-network.spec 2016-11-01 13:07:50.000000000 +0100
+++ new/yast2-network-3.2.11/package/yast2-network.spec 2016-11-22 14:08:16.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 3.2.9
+Version: 3.2.11
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.2.9/src/include/network/lan/cmdline.rb new/yast2-network-3.2.11/src/include/network/lan/cmdline.rb
--- old/yast2-network-3.2.9/src/include/network/lan/cmdline.rb 2016-11-01 13:07:50.000000000 +0100
+++ new/yast2-network-3.2.11/src/include/network/lan/cmdline.rb 2016-11-22 14:08:16.000000000 +0100
@@ -83,21 +83,21 @@
end
def validateId(options, config)
- options = deep_copy(options)
- config = deep_copy(config)
- if Ops.get(options, "id").nil?
+ if !options["id"]
Report.Error(_("Use \"id\" option to determine device."))
return false
end
- if Ops.greater_than(
- Builtins.tointeger(Ops.get(options, "id", "0")),
- Ops.subtract(Builtins.size(config), 1)
- )
+ begin
+ id = Integer(options["id"])
+ rescue ArgumentError
+ Report.Error(_("Invalid value '%s' for \"id\" option.") % options["id"])
+ return false
+ end
+
+ if id >= config.size
Report.Error(
- _(
- "Value of \"id\" is out of range. Use \"list\" option to check max. value of \"id\"."
- )
+ _("Value of \"id\" is out of range. Use \"list\" option to check max. value of \"id\".")
)
return false
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.2.9/src/lib/cfa/hosts.rb new/yast2-network-3.2.11/src/lib/cfa/hosts.rb
--- old/yast2-network-3.2.9/src/lib/cfa/hosts.rb 2016-11-01 13:07:50.000000000 +0100
+++ new/yast2-network-3.2.11/src/lib/cfa/hosts.rb 2016-11-22 14:08:16.000000000 +0100
@@ -138,7 +138,7 @@
if entry["canonical"] == hostname
aliases = aliases_for(entry)
if aliases.empty?
- delete_host(entry["ipaddr"])
+ delete_by_ip(entry["ipaddr"])
else
entry["canonical"] = aliases.first
entry.delete("alias")
@@ -154,7 +154,7 @@
entry.delete("alias")
entry.delete("alias[]")
aliases_col = entry.collection("alias")
- aliases[1..-1].each do |a|
+ reduced_aliases.each do |a|
aliases_col.add(a)
end
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.2.9/test/cfa/hosts_test.rb new/yast2-network-3.2.11/test/cfa/hosts_test.rb
--- old/yast2-network-3.2.9/test/cfa/hosts_test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-network-3.2.11/test/cfa/hosts_test.rb 2016-11-22 14:08:16.000000000 +0100
@@ -0,0 +1,125 @@
+#!/usr/bin/env rspec
+
+require_relative "../test_helper"
+require "cfa/hosts"
+require "cfa/memory_file"
+
+describe CFA::Hosts do
+ subject(:hosts) { CFA::Hosts.new(file_handler: File) }
+ let(:file_path) { File.join(SCRStub::DATA_PATH, "hosts") }
+
+ before { stub_const("CFA::Hosts::PATH", file_path) }
+
+ describe "#hosts" do
+ it "returns an empty hash when data isn't loaded" do
+ expect(hosts.hosts).to eq({})
+ end
+
+ it "returns hosts in the /etc/hosts" do
+ hosts.load
+ all_hosts = hosts.hosts
+ expect(all_hosts.size).to eq(11)
+ expect(all_hosts["10.100.128.72"]).to eq(["pepa.labs.suse.cz pepa pepa2"])
+ expect(all_hosts["10.100.128.1"]).to eq(["gw.labs.suse.cz", "gw1.labs.suse.cz gw1"])
+ end
+ end
+
+ describe "#host" do
+ before { hosts.load }
+ let(:ip) { "10.100.128.72" }
+
+ it "returns the hostnames for a given IP" do
+ expect(hosts.host(ip)).to eq(["pepa.labs.suse.cz pepa pepa2"])
+ end
+
+ context "if a given IP is not defined" do
+ let(:ip) { "10.10.10.10" }
+
+ it "returns an empty array" do
+ expect(hosts.host(ip)).to eq([])
+ end
+ end
+ end
+
+ describe "#delete_by_ip" do
+ before { hosts.load }
+ let(:ip) { "127.0.0.2" }
+
+ it "returns the host names for a given IP" do
+ expect { hosts.delete_by_ip(ip) }.to change { hosts.host(ip) }
+ .from(["localhost"]).to([])
+ end
+
+ context "if a given IP is not defined" do
+ let(:ip) { "10.10.10.10" }
+
+ it "returns an empty array" do
+ expect { hosts.delete_by_ip(ip) }.to_not change { hosts.hosts }
+ end
+ end
+ end
+
+ describe "#set_entry" do
+ before { hosts.load }
+
+ it "updates the entry" do
+ hosts.set_entry("127.0.0.1", "localhost.localdomain", ["mylocalhost"])
+ expect(hosts.host("127.0.0.1")).to eq(["localhost.localdomain mylocalhost"])
+ end
+
+ context "if the entry does not exist" do
+ it "adds the entry" do
+ expect(hosts).to receive(:add_entry).with("10.10.10.10", "new-host", ["new-host.localdomain"])
+ hosts.set_entry("10.10.10.10", "new-host", ["new-host.localdomain"])
+ end
+ end
+ end
+
+ describe "#add_entry" do
+ it "adds the entry" do
+ hosts.set_entry("10.10.10.10", "new-host.localdomain", ["new-host newhost"])
+ expect(hosts.host("10.10.10.10")).to eq(["new-host.localdomain new-host newhost"])
+ end
+ end
+
+ describe "#delete_hostname" do
+ before { hosts.load }
+
+ context "if the entry only has a canonical name" do
+ it "removes the entry" do
+ hosts.delete_hostname("gw.labs.suse.cz")
+ expect(hosts.host("10.100.128.1")).to eq([])
+ end
+ end
+
+ context "if the entry has some alias" do
+ it "sets the first alias as the hostname" do
+ hosts.delete_hostname("pepa.labs.suse.cz")
+ expect(hosts.host("10.100.128.72")).to eq(["pepa pepa2"])
+ end
+ end
+
+ context "given an alias" do
+ it "removes the alias" do
+ hosts.delete_hostname("pepa")
+ expect(hosts.host("10.100.128.72")).to eq(["pepa.labs.suse.cz pepa2"])
+ end
+ end
+ end
+
+ describe "#include_ip?" do
+ before { hosts.load }
+
+ context "when the IP is defined" do
+ it "returns true" do
+ expect(hosts.include_ip?("127.0.0.1")).to eq(true)
+ end
+ end
+
+ context "when the IP is defined" do
+ it "returns false" do
+ expect(hosts.include_ip?("10.10.10.10")).to eq(false)
+ end
+ end
+ end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.2.9/test/data/hosts new/yast2-network-3.2.11/test/data/hosts
--- old/yast2-network-3.2.9/test/data/hosts 2016-11-01 13:07:50.000000000 +0100
+++ new/yast2-network-3.2.11/test/data/hosts 2016-11-22 14:08:16.000000000 +0100
@@ -23,3 +23,5 @@
ff02::3 ipv6-allhosts
10.100.128.72 pepa.labs.suse.cz pepa pepa2
10.254.128.1 pepa1.labs.suse.cz pepa1
+10.100.128.1 gw.labs.suse.cz
+10.100.128.1 gw1.labs.suse.cz gw1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.2.9/test/lan_cmdline_test.rb new/yast2-network-3.2.11/test/lan_cmdline_test.rb
--- old/yast2-network-3.2.9/test/lan_cmdline_test.rb 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-network-3.2.11/test/lan_cmdline_test.rb 2016-11-22 14:08:16.000000000 +0100
@@ -0,0 +1,42 @@
+#!/usr/bin/env rspec
+
+require_relative "test_helper"
+
+Yast.import "Report"
+
+class NetworkLanCmdlineIncludeClass < Yast::Module
+ def initialize
+ Yast.include self, "network/lan/cmdline.rb"
+ end
+end
+
+describe "Yast::NetworkLanCmdlineInclude" do
+ subject { NetworkLanCmdlineIncludeClass.new }
+
+ describe "#validateId" do
+ it "reports error and returns false if options missing \"id\"" do
+ expect(Yast::Report).to receive(:Error)
+
+ expect(subject.validateId({}, [])).to eq false
+ end
+
+ it "reports error and returns false if options \"id\" is not number" do
+ expect(Yast::Report).to receive(:Error)
+
+ expect(subject.validateId({ "id" => "zzz" }, [])).to eq false
+ end
+
+ it "reports error and returns false if options \"id\" do not fit config size" do
+ expect(Yast::Report).to receive(:Error)
+
+ expect(subject.validateId({ "id" => "5" }, [])).to eq false
+ end
+
+ it "returns true otherwise" do
+ expect(Yast::Report).to_not receive(:Error)
+
+ expect(subject.validateId({ "id" => "0" }, ["0" => { "id" => "0" }])).to eq true
+ end
+
+ end
+end
[View Less]
1
0
Hello community,
here is the log from the commit of package aspell-en for openSUSE:Factory checked in at 2016-11-25 12:04:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aspell-en (Old)
and /work/SRC/openSUSE:Factory/.aspell-en.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aspell-en"
Changes:
--------
--- /work/SRC/openSUSE:Factory/aspell-en/aspell-en.changes 2015-05-15 09:…
[View More]54:46.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.aspell-en.new/aspell-en.changes 2016-11-25 12:04:09.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Nov 21 15:52:08 UTC 2016 - pgajdos(a)suse.com
+
+- updated to 2016.11.20:
+ * various new words (see SCOWL-README for other changes)
+
+-------------------------------------------------------------------
Old:
----
aspell6-en-2015.04.24-0.tar.bz2
New:
----
aspell6-en-2016.11.20-0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aspell-en.spec ++++++
--- /var/tmp/diff_new_pack.Y7umyt/_old 2016-11-25 12:04:11.000000000 +0100
+++ /var/tmp/diff_new_pack.Y7umyt/_new 2016-11-25 12:04:11.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package aspell-en
#
-# 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
@@ -20,7 +20,7 @@
%define aspell_data_dir %(aspell dump config data-dir)
Name: aspell-en
-Version: 2015.04.24
+Version: 2016.11.20
Release: 0
Summary: English Dictionaries for ASpell
License: MIT and BSD-3-Clause
++++++ aspell6-en-2015.04.24-0.tar.bz2 -> aspell6-en-2016.11.20-0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell6-en-2015.04.24-0/Copyright new/aspell6-en-2016.11.20-0/Copyright
--- old/aspell6-en-2015.04.24-0/Copyright 2015-04-24 05:21:35.000000000 +0200
+++ new/aspell6-en-2016.11.20-0/Copyright 2016-11-21 03:49:13.000000000 +0100
@@ -1,13 +1,13 @@
-This English word list is comes directly from SCOWL 2015.04.24 (up to level 60,
+This English word list is comes directly from SCOWL 2016.11.20 (up to level 60,
using the speller/make-aspell-dict script, http://wordlist.sourceforge.net/)
and is thus under the same copyright of SCOWL. The affix file (only
included in the aspell6 package) is based on the Ispell one which is
under the same copyright of Ispell. Part of SCOWL is also based on
Ispell thus the Ispell copyright is included with the SCOWL copyright.
-The collective work is Copyright 2000-2015 by Kevin Atkinson as well
+The collective work is Copyright 2000-2016 by Kevin Atkinson as well
as any of the copyrights mentioned below:
- Copyright 2000-2015 by Kevin Atkinson
+ Copyright 2000-2016 by Kevin Atkinson
Permission to use, copy, modify, distribute and sell these word
lists, the associated scripts, the output created from the scripts,
@@ -195,11 +195,30 @@
Accent information was taken from UKACD.
-My VARCON package was used to create the American, British, and
-Canadian word list.
+The VarCon package was used to create the American, British, Canadian,
+and Australian word list. It is under the following copyright:
-Since the original word lists used in the VARCON package came
-from the Ispell distribution they are under the Ispell copyright:
+ Copyright 2000-2016 by Kevin Atkinson
+
+ Permission to use, copy, modify, distribute and sell this array, the
+ associated software, and its documentation for any purpose is hereby
+ granted without fee, provided that the above copyright notice appears
+ in all copies and that both that copyright notice and this permission
+ notice appear in supporting documentation. Kevin Atkinson makes no
+ representations about the suitability of this array for any
+ purpose. It is provided "as is" without express or implied warranty.
+
+ Copyright 2016 by Benjamin Titze
+
+ Permission to use, copy, modify, distribute and sell this array, the
+ associated software, and its documentation for any purpose is hereby
+ granted without fee, provided that the above copyright notice appears
+ in all copies and that both that copyright notice and this permission
+ notice appear in supporting documentation. Benjamin Titze makes no
+ representations about the suitability of this array for any
+ purpose. It is provided "as is" without express or implied warranty.
+
+ Since the original words lists come from the Ispell distribution:
Copyright 1993, Geoff Kuenning, Granada Hills, CA
All rights reserved.
@@ -222,15 +241,14 @@
products derived from this software without specific prior
written permission.
- THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING AND CONTRIBUTORS ``AS
- IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GEOFF
- KUENNING OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
+ THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL GEOFF KUENNING OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell6-en-2015.04.24-0/Makefile.pre new/aspell6-en-2016.11.20-0/Makefile.pre
--- old/aspell6-en-2015.04.24-0/Makefile.pre 2015-04-24 05:21:49.000000000 +0200
+++ new/aspell6-en-2016.11.20-0/Makefile.pre 2016-11-21 03:49:31.000000000 +0100
@@ -1,14 +1,14 @@
# Generated with Aspell Dicts "proc" script version 0.60.4
lang = en
-version = 2015.04.24-0
+version = 2016.11.20-0
-cwl_files = en-common.cwl en-variant_0.cwl en-variant_1.cwl en-variant_2.cwl en-w_accents-only.cwl en-wo_accents-only.cwl en_CA-variant_0.cwl en_CA-variant_1.cwl en_CA-w_accents-only.cwl en_CA-wo_accents-only.cwl en_GB-ise-w_accents-only.cwl en_GB-ise-wo_accents-only.cwl en_GB-ize-w_accents-only.cwl en_GB-ize-wo_accents-only.cwl en_GB-variant_0.cwl en_GB-variant_1.cwl en_US-w_accents-only.cwl en_US-wo_accents-only.cwl
+cwl_files = en-common.cwl en-variant_0.cwl en-variant_1.cwl en-variant_2.cwl en-w_accents-only.cwl en-wo_accents-only.cwl en_AU-variant_0.cwl en_AU-variant_1.cwl en_AU-w_accents-only.cwl en_AU-wo_accents-only.cwl en_CA-variant_0.cwl en_CA-variant_1.cwl en_CA-w_accents-only.cwl en_CA-wo_accents-only.cwl en_GB-ise-w_accents-only.cwl en_GB-ise-wo_accents-only.cwl en_GB-ize-w_accents-only.cwl en_GB-ize-wo_accents-only.cwl en_GB-variant_0.cwl en_GB-variant_1.cwl en_US-w_accents-only.cwl en_US-wo_accents-only.cwl
data_files = en.dat en_phonet.dat en_affix.dat
doc_files = README README.iso Copyright
extra_files = configure info Makefile.pre
-multi_files = american.alias american-variant_0.alias american-variant_1.alias american-w_accents.alias american-wo_accents.alias british.alias british-ise.alias british-ise-w_accents.alias british-ise-wo_accents.alias british-ize.alias british-ize-w_accents.alias british-ize-wo_accents.alias british-variant_0.alias british-variant_1.alias british-w_accents.alias british-wo_accents.alias canadian.alias canadian-variant_0.alias canadian-variant_1.alias canadian-w_accents.alias canadian-wo_accents.alias en.multi en-variant_0.multi en-variant_1.multi en-variant_2.multi en-w_accents.multi en-wo_accents.multi en_CA.multi en_CA-variant_0.multi en_CA-variant_1.multi en_CA-w_accents.multi en_CA-wo_accents.multi en_GB.multi en_GB-ise.multi en_GB-ise-w_accents.multi en_GB-ise-wo_accents.multi en_GB-ize.multi en_GB-ize-w_accents.multi en_GB-ize-wo_accents.multi en_GB-variant_0.multi en_GB-variant_1.multi en_GB-w_accents.multi en_GB-wo_accents.multi en_US.multi en_US-variant_0.multi en_US-variant_1.multi en_US-w_accents.multi en_US-wo_accents.multi english.alias english-variant_0.alias english-variant_1.alias english-variant_2.alias english-w_accents.alias english-wo_accents.alias
-rws_files = en-common.rws en-variant_0.rws en-variant_1.rws en-variant_2.rws en-w_accents-only.rws en-wo_accents-only.rws en_CA-variant_0.rws en_CA-variant_1.rws en_CA-w_accents-only.rws en_CA-wo_accents-only.rws en_GB-ise-w_accents-only.rws en_GB-ise-wo_accents-only.rws en_GB-ize-w_accents-only.rws en_GB-ize-wo_accents-only.rws en_GB-variant_0.rws en_GB-variant_1.rws en_US-w_accents-only.rws en_US-wo_accents-only.rws
+multi_files = american.alias american-variant_0.alias american-variant_1.alias american-w_accents.alias american-wo_accents.alias australian.alias australian-variant_0.alias australian-variant_1.alias australian-w_accents.alias australian-wo_accents.alias british.alias british-ise.alias british-ise-w_accents.alias british-ise-wo_accents.alias british-ize.alias british-ize-w_accents.alias british-ize-wo_accents.alias british-variant_0.alias british-variant_1.alias british-w_accents.alias british-wo_accents.alias canadian.alias canadian-variant_0.alias canadian-variant_1.alias canadian-w_accents.alias canadian-wo_accents.alias en.multi en-variant_0.multi en-variant_1.multi en-variant_2.multi en-w_accents.multi en-wo_accents.multi en_AU.multi en_AU-variant_0.multi en_AU-variant_1.multi en_AU-w_accents.multi en_AU-wo_accents.multi en_CA.multi en_CA-variant_0.multi en_CA-variant_1.multi en_CA-w_accents.multi en_CA-wo_accents.multi en_GB.multi en_GB-ise.multi en_GB-ise-w_accents.multi en_GB-ise-wo_accents.multi en_GB-ize.multi en_GB-ize-w_accents.multi en_GB-ize-wo_accents.multi en_GB-variant_0.multi en_GB-variant_1.multi en_GB-w_accents.multi en_GB-wo_accents.multi en_US.multi en_US-variant_0.multi en_US-variant_1.multi en_US-w_accents.multi en_US-wo_accents.multi english.alias english-variant_0.alias english-variant_1.alias english-variant_2.alias english-w_accents.alias english-wo_accents.alias
+rws_files = en-common.rws en-variant_0.rws en-variant_1.rws en-variant_2.rws en-w_accents-only.rws en-wo_accents-only.rws en_AU-variant_0.rws en_AU-variant_1.rws en_AU-w_accents-only.rws en_AU-wo_accents-only.rws en_CA-variant_0.rws en_CA-variant_1.rws en_CA-w_accents-only.rws en_CA-wo_accents-only.rws en_GB-ise-w_accents-only.rws en_GB-ise-wo_accents-only.rws en_GB-ize-w_accents-only.rws en_GB-ize-wo_accents-only.rws en_GB-variant_0.rws en_GB-variant_1.rws en_US-w_accents-only.rws en_US-wo_accents-only.rws
distdir=aspell6-${lang}-${version}
@@ -70,6 +70,14 @@
en-wo_accents-only.rws: en-wo_accents-only.cwl
+en_AU-variant_0.rws: en_AU-variant_0.cwl
+
+en_AU-variant_1.rws: en_AU-variant_1.cwl
+
+en_AU-w_accents-only.rws: en_AU-w_accents-only.cwl
+
+en_AU-wo_accents-only.rws: en_AU-wo_accents-only.cwl
+
en_CA-variant_0.rws: en_CA-variant_0.cwl
en_CA-variant_1.rws: en_CA-variant_1.cwl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell6-en-2015.04.24-0/README new/aspell6-en-2016.11.20-0/README
--- old/aspell6-en-2015.04.24-0/README 2015-04-24 05:21:49.000000000 +0200
+++ new/aspell6-en-2016.11.20-0/README 2016-11-21 03:49:31.000000000 +0100
@@ -1,11 +1,11 @@
GNU Aspell 0.60 English Dictionary Package
-Version 2015.04.24-0
-2015-04-23
+Version 2016.11.20-0
+2016-11-20
Original Word List By:
Kevin Atkinson <kevina at gnu org>
Copyright Terms: Copyrighted (see the file Copyright for the exact terms)
Wordlist URL: http://wordlist.aspell.net/
-Source Version: 2015.04.24
+Source Version: 2016.11.20
This word list is considered both complete and accurate.
This is the English dictionary for Aspell. It requires Aspell
@@ -52,6 +52,10 @@
en-variant_2 (english-variant_2)
en-w_accents (english-w_accents)
en-wo_accents (en english english-wo_accents)
+ en_AU-variant_0 (australian-variant_0)
+ en_AU-variant_1 (australian-variant_1)
+ en_AU-w_accents (australian-w_accents)
+ en_AU-wo_accents (australian australian-wo_accents en_AU)
en_CA-variant_0 (canadian-variant_0)
en_CA-variant_1 (canadian-variant_1)
en_CA-w_accents (canadian-w_accents)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell6-en-2015.04.24-0/README.iso new/aspell6-en-2016.11.20-0/README.iso
--- old/aspell6-en-2015.04.24-0/README.iso 2015-04-24 05:21:49.000000000 +0200
+++ new/aspell6-en-2016.11.20-0/README.iso 2016-11-21 03:49:31.000000000 +0100
@@ -1,11 +1,11 @@
GNU Aspell 0.60 English Dictionary Package
-Version 2015.04.24-0
-2015-04-23
+Version 2016.11.20-0
+2016-11-20
Original Word List By:
Kevin Atkinson <kevina at gnu org>
Copyright Terms: Copyrighted (see the file Copyright for the exact terms)
Wordlist URL: http://wordlist.aspell.net/
-Source Version: 2015.04.24
+Source Version: 2016.11.20
This word list is considered both complete and accurate.
This is the English dictionary for Aspell. It requires Aspell
@@ -52,6 +52,10 @@
en-variant_2 (english-variant_2)
en-w_accents (english-w_accents)
en-wo_accents (en english english-wo_accents)
+ en_AU-variant_0 (australian-variant_0)
+ en_AU-variant_1 (australian-variant_1)
+ en_AU-w_accents (australian-w_accents)
+ en_AU-wo_accents (australian australian-wo_accents en_AU)
en_CA-variant_0 (canadian-variant_0)
en_CA-variant_1 (canadian-variant_1)
en_CA-w_accents (canadian-w_accents)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell6-en-2015.04.24-0/australian-variant_0.alias new/aspell6-en-2016.11.20-0/australian-variant_0.alias
--- old/aspell6-en-2015.04.24-0/australian-variant_0.alias 1970-01-01 01:00:00.000000000 +0100
+++ new/aspell6-en-2016.11.20-0/australian-variant_0.alias 2016-11-21 03:49:31.000000000 +0100
@@ -0,0 +1,2 @@
+# Generated with Aspell Dicts "proc" script version 0.60.4
+add en_AU-variant_0.multi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell6-en-2015.04.24-0/australian-variant_1.alias new/aspell6-en-2016.11.20-0/australian-variant_1.alias
--- old/aspell6-en-2015.04.24-0/australian-variant_1.alias 1970-01-01 01:00:00.000000000 +0100
+++ new/aspell6-en-2016.11.20-0/australian-variant_1.alias 2016-11-21 03:49:31.000000000 +0100
@@ -0,0 +1,2 @@
+# Generated with Aspell Dicts "proc" script version 0.60.4
+add en_AU-variant_1.multi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell6-en-2015.04.24-0/australian-w_accents.alias new/aspell6-en-2016.11.20-0/australian-w_accents.alias
--- old/aspell6-en-2015.04.24-0/australian-w_accents.alias 1970-01-01 01:00:00.000000000 +0100
+++ new/aspell6-en-2016.11.20-0/australian-w_accents.alias 2016-11-21 03:49:31.000000000 +0100
@@ -0,0 +1,2 @@
+# Generated with Aspell Dicts "proc" script version 0.60.4
+add en_AU-w_accents.multi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell6-en-2015.04.24-0/australian-wo_accents.alias new/aspell6-en-2016.11.20-0/australian-wo_accents.alias
--- old/aspell6-en-2015.04.24-0/australian-wo_accents.alias 1970-01-01 01:00:00.000000000 +0100
+++ new/aspell6-en-2016.11.20-0/australian-wo_accents.alias 2016-11-21 03:49:31.000000000 +0100
@@ -0,0 +1,2 @@
+# Generated with Aspell Dicts "proc" script version 0.60.4
+add en_AU-wo_accents.multi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell6-en-2015.04.24-0/australian.alias new/aspell6-en-2016.11.20-0/australian.alias
--- old/aspell6-en-2015.04.24-0/australian.alias 1970-01-01 01:00:00.000000000 +0100
+++ new/aspell6-en-2016.11.20-0/australian.alias 2016-11-21 03:49:31.000000000 +0100
@@ -0,0 +1,2 @@
+# Generated with Aspell Dicts "proc" script version 0.60.4
+add en_AU.multi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell6-en-2015.04.24-0/doc/SCOWL-README new/aspell6-en-2016.11.20-0/doc/SCOWL-README
--- old/aspell6-en-2015.04.24-0/doc/SCOWL-README 2015-04-24 05:21:26.000000000 +0200
+++ new/aspell6-en-2016.11.20-0/doc/SCOWL-README 2016-11-21 03:49:03.000000000 +0100
@@ -1,6 +1,6 @@
Spell Checking Oriented Word Lists (SCOWL)
-Version 2015.04.24
-Thu Apr 23 23:17:46 2015 -0400 [aef9f96]
+Version 2016.11.20
+Sun Nov 20 21:47:07 2016 -0500 [896117f]
by Kevin Atkinson (kevina(a)gnu.org)
The SCOWL is a collection of word lists split up in various sizes, and
@@ -27,10 +27,11 @@
naming convention:
<spelling category>-<sub-category>.<size>
Where the spelling category is one of
- english, american, british, british_z, canadian,
+ english, american, british, british_z, canadian, australian
variant_1, variant_2, variant_3,
- british_variant_1, british_variant_2,
+ british_variant_1, british_variant_2,
canadian_variant_1, canadian_variant_2,
+ australian_variant_1, australian_variant_2
Sub-category is one of
abbreviations, contractions, proper-names, upper, words
And size is one of
@@ -54,21 +55,22 @@
When manually combining the words lists the "english" spelling
category should be used as well as one of "american", "british",
-"british_z" (british with ize spelling), or "canadian". Great care
-has been taken so that only one spelling for any particular word
-is included in the main list (with some minor exceptions). When two
-variants were considered equal I randomly picked one for inclusion in
-the main word list. Unfortunately this means that my choice in how to
-spell a word may not match your choice. If this is the case you can
-try including one of the "variant_1" spelling categories which
+"british_z" (british with ize spelling), "canadian" or "australian".
+Great care has been taken so that only one spelling for any particular
+word is included in the main list (with some minor exceptions). When
+two variants were considered equal I randomly picked one for inclusion
+in the main word list. Unfortunately this means that my choice in how
+to spell a word may not match your choice. If this is the case you
+can try including one of the "variant_1" spelling categories which
includes most variants which are considered almost equal. The
"variant_1" spelling category corresponds mostly to American variants,
-while the "british_variant_1" and "canadian_variant_1" are for British
-and Canadian variants, respectively. The "variant_2" spelling
-categories include variants which are also generally considered
-acceptable, and "variant_3" contains variants which are seldom used
-and may not even be considered correct. There is no
-"british_variant_3" or "canadian_variant_3" spelling category since
+while the "british_variant_1", "canadian_variant_1" and
+"australian_variant_1" are for British, Canadian and Australian
+variants, respectively. The "variant_2" spelling categories include
+variants which are also generally considered acceptable, and
+"variant_3" contains variants which are seldom used and may not even
+be considered correct. There is no "british_variant_3",
+"canadian_variant_3" or "australian_variant_3" spelling category since
the distinction would be almost meaningless.
The "abbreviation" category includes abbreviations and acronyms which
@@ -81,92 +83,136 @@
To give you an idea of what the words in the various sizes look like
here is a sample of 25 random words found only in that size:
-10: advanced analysis buried collecting demands expecting hears held hell
- hitting insist intelligent interests knocks length level locations
- maintaining personal practice scientific shown tried unhappy wanting
-
-20: anomalies attraction breeze cam chemist diner echoed faces feminists
- forgiving fossil geography happiest hearts misdirecting muck numbering
- obstructs personality pity prosecutes retrieved slowed starving unwilling
-35: altos antiquities bemuses boarders buffaloes catfish catfishes
- convalescents deceptive dispensers ditty entreating falsifying geneticist
- hangings hurdling lackluster mailman obsolescent petitioning preconceive
- quacks stratified succors yelling
-
-40: ameliorate assuredly bimbo capitulation contrition download dykes elated
- embattled excisions exhibitionist gabbiest groupies masturbated
- outbidding pinging ponytails preregistration purveyed regroups rekindled
- reshuffling sorrowfully tatter tracers
-
-50: adducing colossus deescalates divination dotcoms dwarfish endued epoxying
- essayist ethnologists firetrap howdahs illegalities individualizing knave
- malleability moralized muskrat novelette operetta squishes tanager
- unseemliness untitled vexatious
-
-55: backcombing bedhead concussed contextualization defibrillators
- dockworkers gaffer griffons integrally jackbooted lours megawatt
- orangeness overwinter payouts recessionary rockeries sadomasochism skibob
- splendors subvention tailbacks taramasalata velodromes xeroxed
-
-60: bestrewing centralizers cheviot chicness chine diffusive escargot exurban
- humphs hydrolyzes illuminatingly injurer nonspecializing pantywaists
- pourings preachment prudentially reinspected rerecords savable scrotal
- striae toastmistress untraveled unwarrantable
-
-70: abuttal advertences anamorphism aphorizes archduchy bdellium bodgie
- boschvark convecting demineralization firedrake ingroup isoniazid
- muchness pertinaciousness prepuberty protoactinium recanter subcommission
- suboxide tincting unlinked unpatented unrounded vasculature
-
-80: addedly analcimic anthropotomy chibols contline corncracker disgavelled
- escapadoes feh floatabilities hollooed humorsome karyotyped laicity
- minacity mulleys neovitalists oscillographic preassurances registrarship
- resumptively sclaffer underleased wheeples xenomania
-
-95: anacrogynae apprend barminesses boomage fulmarus hieracium hucho mamaloi
- noncontributable nonlabelling oliverian politicness portsider
- psammosarcoma reaked reflexogenous roodebok scintil severalize sinzer
- uniced unsensibility wardage wolveboon zwanziger
+10: accords arrangements aware bothering cheaper collects constraints cursor
+ distributing due expecting going mainly organized park pulling recover
+ session short society sorted staying stock virtually wherever
+
+20: aloud assorted attributes completeness contradicted depress dreaming
+ enjoyed enlightenment factories floors judged leaflets mucked paradise
+ platform poison privileges psychologist shareholder spontaneous stun
+ undergone verbose wrecker
+
+35: burdening candy centipedes crackers depiction discontinuity ditty flakes
+ harvested lances masking milestone mockery nurtures perusing prance
+ prospers reconstruction sinewy thousandths toothpaste twanged underwrites
+ visualizing wordiest
+
+40: airless attunes cannabises dealership downsize dysfunctions eradication
+ expectantly formaldehyde gaggle gorgeously immortalizes indifferently
+ megalomania miscalculation pimps reenactment retreading sparingly tracer
+ troubleshooters untimelier whippings woebegone yarmulke
+
+50: antidepressant archbishoprics betroths birdied botnet caseloads croup
+ dotingly effectuating engorging extensiveness flatcars folios largeness
+ meretricious misconstructions octogenarians overachieving peewees
+ pestilent remonstrances spoor tenuously vapidness workdays
+
+55: anglophone astrologically bedheads blabber boneshaker choirmaster
+ chummily doberman fuggy fusspot handbrake mammy neckbands nymphet
+ pillowslip referable sleepover slingbacks southeastwards speechwriters
+ teatimes tripwires trolleybuses verrucas workmate
+
+60: annelid ataxia banally cachepots contraindicate ebullition insistingly
+ meatless nonactives nonparticipant nonpublic notability notarial
+ novelizations oriel populousness portière reassignments reattaching
+ restitch sandbagger serviceability swankiness viticulturist volatilizes
+
+70: acinaciform cladistics clarabella cymas deerfly elegized endogamic
+ flexibilities foamflower hematoblast herbalism inconsequence
+ intromissions margent metaprotein mitigator ontogenic pounder prinking
+ prolegomenon roilier statism stor streambeds vermination
+
+80: bivouacks caramelizations curtnesses delusory depilators dielytra
+ endozoon engilds gelatis idealess incurvated jelutong mase metacentricity
+ minettes nonhousing possibilist raspatories seghols sobersidednesses
+ spirated stagnations transmembrane unexchangeable unintelligibleness
+
+95: astigmatometer bundh clodlike epoptes flarier gnathonism hidradenitis
+ hydroformylation hyporchemata kfrsch noncrenated nondeceivable
+ philodestructiveness pickietar pomeshchik preflagellate procivism
+ rhinoceroid snackle snubbable stratography transpirability
+ viscometrically witchering zZt
And here is a count on the number of words in each spelling category
(american + english spelling category):
Size Words Names Running Total %
- 10 4,427 13 4,440 0.7
- 20 8,122 0 12,562 1.9
- 35 37,258 222 50,042 7.6
- 40 6,846 491 57,379 8.7
- 50 25,124 18,213 100,716 15.3
- 55 6,509 0 107,225 16.3
- 60 13,851 743 121,819 18.5
- 70 35,660 7,935 165,414 25.2
- 80 144,358 33,373 343,145 52.2
- 95 227,736 86,651 657,532 100.0
+ 10 4,426 13 4,439 0.7
+ 20 8,124 0 12,563 1.9
+ 35 37,258 222 50,043 7.6
+ 40 6,853 491 57,387 8.7
+ 50 25,224 18,219 100,830 15.3
+ 55 6,489 0 107,319 16.3
+ 60 14,135 774 122,228 18.6
+ 70 35,510 7,912 165,650 25.2
+ 80 144,283 33,370 343,303 52.2
+ 95 227,676 86,649 657,628 100.0
(The "Words" column does not include the name count.)
Size 35 is the recommended small size, 50 the medium and 70 the large.
-For spell checking I recommend using 60. Sizes 70 and below contain
-words found in most dictionaries while the 80 size contains all the
-strange and unusual words people like to use in word games such as
-Scrabble (TM). While a lot of the words in the 80 size are not
-used very often, they are all generally considered valid words in the
-English language. The 95 contains just about every English word in
-existence and then some. Many of the words at the 95 level will
-probably not be considered valid English words by most people. I use
-the 60 size for the English dictionary for Aspell, and I don't
-recommend anyone use levels above 70 for spell checking. Levels above
-70 contain rarely used words which can hide misspellings of similar
-more commonly used words. For example the word "ort" can hide a
-common typo of "or". No one should need to use a size larger than 80,
-the 95 size is labeled insane for a reason.
+Sizes 70 and below contain words found in most dictionaries while the
+80 size contains all the strange and unusual words people like to use
+in word games such as Scrabble (TM). While a lot of the words in the
+80 size are not used very often, they are all generally considered
+valid words in the English language. The 95 contains just about every
+English word in existence and then some. Many of the words at the 95
+level will probably not be considered valid English words by most
+people.
+
+For spell checking I recommend using size 60. This size is the
+largest size that I am fairly confident does not contain any
+misspellings or invalid words. In addition an effort is made to
+exclude valid yet problematic words (such as "calender") from the 60
+size that are likely to be a misspelling of a more common word. The
+70 size is reasonable for those wanting a larger list and don't mind a
+few errors. The 80 or larger sizes are not reasonable for spell
+checking.
Accents are present on certain words such as café in iso8859-1 format.
CHANGES:
+From Version 2016.06.26 to 2016.11.20
+
+ New Australian spelling category thanks to the work of Benjamin
+ Titze (btitze(a)protonmail.ch)
+
+ Various new words.
+
+From Version 2016.01.19 to 2016.06.26
+
+ Various new words.
+
+ Updated to Version 6.0.2 of 12dicts
+
+ Other minor changes.
+
+From Version 2015.08.24 to 2016.01.19
+
+ Various new words.
+
+ Clarified README to indicate why the 60 size is the preferred size
+ for spell checking.
+
+ Remove some very uncommon possessive forms.
+
+ Change "SET UTF8" to "SET UTF-8" in hunspell affix file.
+
+From Version 2015.05.18 to 2015.08.24 (Aug 24, 2015)
+
+ Various new words.
+
+From Version 2015.04.24 to 2015.05.18 (May 18, 2015)
+
+ Added some new words found to have a high frequency in the COCA
+ corpus. (http://corpus.byu.edu/coca/)
+
+ Fix en spelling suggestions for 'alot' and 'exersize' in hunspell
+ dictionary (upstreamed from the changes made in Firefox).
+
From Version 2015.02.15 to 2015.04.24 (April 24, 2015)
Added some new words.
@@ -182,7 +228,7 @@
Various other new words.
Clean up the special-hacker category by removing some words that
- didn't exist is the Google Book's Corpus (1980 - 2008) and
+ didn't exist in the Google Book's Corpus (1980 - 2008) and
originated from the "Unofficial Jargon File Word Lists".
From Version 2014.11.17 to 2015.01.28 (January 28, 2015)
@@ -296,11 +342,6 @@
Moved rarely used inflections of a word into higher number lists.
-From 7.1
-
- Shifted the variant levels so that level 0 is now 1, level 1 now 2,
- and level 2 now 3.
-
Added other inflections of a words based on the following criteria
If the word is in the base form: only include that word.
If the word is in a plural form: include the base word and the plural
@@ -357,10 +398,10 @@
COPYRIGHT, SOURCES, and CREDITS:
-The collective work is Copyright 2000-2015 by Kevin Atkinson as well
+The collective work is Copyright 2000-2016 by Kevin Atkinson as well
as any of the copyrights mentioned below:
- Copyright 2000-2015 by Kevin Atkinson
+ Copyright 2000-2016 by Kevin Atkinson
Permission to use, copy, modify, distribute and sell these word
lists, the associated scripts, the output created from the scripts,
@@ -548,11 +589,30 @@
Accent information was taken from UKACD.
-My VARCON package was used to create the American, British, and
-Canadian word list.
+The VarCon package was used to create the American, British, Canadian,
+and Australian word list. It is under the following copyright:
+
+ Copyright 2000-2016 by Kevin Atkinson
+
+ Permission to use, copy, modify, distribute and sell this array, the
+ associated software, and its documentation for any purpose is hereby
+ granted without fee, provided that the above copyright notice appears
+ in all copies and that both that copyright notice and this permission
+ notice appear in supporting documentation. Kevin Atkinson makes no
+ representations about the suitability of this array for any
+ purpose. It is provided "as is" without express or implied warranty.
+
+ Copyright 2016 by Benjamin Titze
+
+ Permission to use, copy, modify, distribute and sell this array, the
+ associated software, and its documentation for any purpose is hereby
+ granted without fee, provided that the above copyright notice appears
+ in all copies and that both that copyright notice and this permission
+ notice appear in supporting documentation. Benjamin Titze makes no
+ representations about the suitability of this array for any
+ purpose. It is provided "as is" without express or implied warranty.
-Since the original word lists used in the VARCON package came
-from the Ispell distribution they are under the Ispell copyright:
+ Since the original words lists come from the Ispell distribution:
Copyright 1993, Geoff Kuenning, Granada Hills, CA
All rights reserved.
@@ -575,18 +635,17 @@
products derived from this software without specific prior
written permission.
- THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING AND CONTRIBUTORS ``AS
- IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GEOFF
- KUENNING OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
+ THIS SOFTWARE IS PROVIDED BY GEOFF KUENNING AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL GEOFF KUENNING OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
The variant word lists were created from a list of variants found in
@@ -609,7 +668,7 @@
least 2 GB, often 4 GB or more) this should not really be a problem.
In addition, there is a very nice frequency analyze of the BNC corpus
-done by Adam Kilgarriff. Unlike Brain's word lists the BNC lists
+done by Adam Kilgarriff. Unlike Brian's word lists the BNC lists
include part of speech information. I plan on somehow using these
lists as Adam Kilgarriff has given me the OK to use it in SCOWL.
These lists will greatly reduce the problem of inflected forms of a
Files old/aspell6-en-2015.04.24-0/en-common.cwl and new/aspell6-en-2016.11.20-0/en-common.cwl differ
Files old/aspell6-en-2015.04.24-0/en-variant_0.cwl and new/aspell6-en-2016.11.20-0/en-variant_0.cwl differ
Files old/aspell6-en-2015.04.24-0/en-variant_1.cwl and new/aspell6-en-2016.11.20-0/en-variant_1.cwl differ
Files old/aspell6-en-2015.04.24-0/en-variant_2.cwl and new/aspell6-en-2016.11.20-0/en-variant_2.cwl differ
Files old/aspell6-en-2015.04.24-0/en-w_accents-only.cwl and new/aspell6-en-2016.11.20-0/en-w_accents-only.cwl differ
Files old/aspell6-en-2015.04.24-0/en-wo_accents-only.cwl and new/aspell6-en-2016.11.20-0/en-wo_accents-only.cwl differ
Files old/aspell6-en-2015.04.24-0/en_AU-variant_0.cwl and new/aspell6-en-2016.11.20-0/en_AU-variant_0.cwl differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell6-en-2015.04.24-0/en_AU-variant_0.multi new/aspell6-en-2016.11.20-0/en_AU-variant_0.multi
--- old/aspell6-en-2015.04.24-0/en_AU-variant_0.multi 1970-01-01 01:00:00.000000000 +0100
+++ new/aspell6-en-2016.11.20-0/en_AU-variant_0.multi 2016-11-21 03:49:31.000000000 +0100
@@ -0,0 +1,2 @@
+# Generated with Aspell Dicts "proc" script version 0.60.4
+add en_AU-variant_0.rws
Files old/aspell6-en-2015.04.24-0/en_AU-variant_1.cwl and new/aspell6-en-2016.11.20-0/en_AU-variant_1.cwl differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell6-en-2015.04.24-0/en_AU-variant_1.multi new/aspell6-en-2016.11.20-0/en_AU-variant_1.multi
--- old/aspell6-en-2015.04.24-0/en_AU-variant_1.multi 1970-01-01 01:00:00.000000000 +0100
+++ new/aspell6-en-2016.11.20-0/en_AU-variant_1.multi 2016-11-21 03:49:31.000000000 +0100
@@ -0,0 +1,2 @@
+# Generated with Aspell Dicts "proc" script version 0.60.4
+add en_AU-variant_1.rws
Files old/aspell6-en-2015.04.24-0/en_AU-w_accents-only.cwl and new/aspell6-en-2016.11.20-0/en_AU-w_accents-only.cwl differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell6-en-2015.04.24-0/en_AU-w_accents.multi new/aspell6-en-2016.11.20-0/en_AU-w_accents.multi
--- old/aspell6-en-2015.04.24-0/en_AU-w_accents.multi 1970-01-01 01:00:00.000000000 +0100
+++ new/aspell6-en-2016.11.20-0/en_AU-w_accents.multi 2016-11-21 03:49:31.000000000 +0100
@@ -0,0 +1,3 @@
+# Generated with Aspell Dicts "proc" script version 0.60.4
+add en-common.rws
+add en_AU-w_accents-only.rws
Files old/aspell6-en-2015.04.24-0/en_AU-wo_accents-only.cwl and new/aspell6-en-2016.11.20-0/en_AU-wo_accents-only.cwl differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell6-en-2015.04.24-0/en_AU-wo_accents.multi new/aspell6-en-2016.11.20-0/en_AU-wo_accents.multi
--- old/aspell6-en-2015.04.24-0/en_AU-wo_accents.multi 1970-01-01 01:00:00.000000000 +0100
+++ new/aspell6-en-2016.11.20-0/en_AU-wo_accents.multi 2016-11-21 03:49:31.000000000 +0100
@@ -0,0 +1,3 @@
+# Generated with Aspell Dicts "proc" script version 0.60.4
+add en-common.rws
+add en_AU-wo_accents-only.rws
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell6-en-2015.04.24-0/en_AU.multi new/aspell6-en-2016.11.20-0/en_AU.multi
--- old/aspell6-en-2015.04.24-0/en_AU.multi 1970-01-01 01:00:00.000000000 +0100
+++ new/aspell6-en-2016.11.20-0/en_AU.multi 2016-11-21 03:49:31.000000000 +0100
@@ -0,0 +1,2 @@
+# Generated with Aspell Dicts "proc" script version 0.60.4
+add en_AU-wo_accents.multi
Files old/aspell6-en-2015.04.24-0/en_CA-variant_0.cwl and new/aspell6-en-2016.11.20-0/en_CA-variant_0.cwl differ
Files old/aspell6-en-2015.04.24-0/en_CA-variant_1.cwl and new/aspell6-en-2016.11.20-0/en_CA-variant_1.cwl differ
Files old/aspell6-en-2015.04.24-0/en_CA-w_accents-only.cwl and new/aspell6-en-2016.11.20-0/en_CA-w_accents-only.cwl differ
Files old/aspell6-en-2015.04.24-0/en_CA-wo_accents-only.cwl and new/aspell6-en-2016.11.20-0/en_CA-wo_accents-only.cwl differ
Files old/aspell6-en-2015.04.24-0/en_GB-ise-w_accents-only.cwl and new/aspell6-en-2016.11.20-0/en_GB-ise-w_accents-only.cwl differ
Files old/aspell6-en-2015.04.24-0/en_GB-ise-wo_accents-only.cwl and new/aspell6-en-2016.11.20-0/en_GB-ise-wo_accents-only.cwl differ
Files old/aspell6-en-2015.04.24-0/en_GB-ize-w_accents-only.cwl and new/aspell6-en-2016.11.20-0/en_GB-ize-w_accents-only.cwl differ
Files old/aspell6-en-2015.04.24-0/en_GB-ize-wo_accents-only.cwl and new/aspell6-en-2016.11.20-0/en_GB-ize-wo_accents-only.cwl differ
Files old/aspell6-en-2015.04.24-0/en_GB-variant_0.cwl and new/aspell6-en-2016.11.20-0/en_GB-variant_0.cwl differ
Files old/aspell6-en-2015.04.24-0/en_GB-variant_1.cwl and new/aspell6-en-2016.11.20-0/en_GB-variant_1.cwl differ
Files old/aspell6-en-2015.04.24-0/en_US-w_accents-only.cwl and new/aspell6-en-2016.11.20-0/en_US-w_accents-only.cwl differ
Files old/aspell6-en-2015.04.24-0/en_US-wo_accents-only.cwl and new/aspell6-en-2016.11.20-0/en_US-wo_accents-only.cwl differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aspell6-en-2015.04.24-0/info new/aspell6-en-2016.11.20-0/info
--- old/aspell6-en-2015.04.24-0/info 2015-04-24 05:21:35.000000000 +0200
+++ new/aspell6-en-2016.11.20-0/info 2016-11-21 03:49:13.000000000 +0100
@@ -7,8 +7,8 @@
email kevina at gnu org
copyright Copyrighted
mode aspell6
-version 2015.04.24-0
-source-version 2015.04.24
+version 2016.11.20-0
+source-version 2016.11.20
complete true
accurate true
url http://wordlist.aspell.net/
@@ -19,6 +19,7 @@
alias en_US american
alias en_GB british
alias en_CA canadian
+alias en_AU australian
alias en english
dict:
@@ -64,6 +65,16 @@
add en_GB-ize-w_accents-only
dict:
+ name en_AU-wo_accents
+ alias en_AU:awli
+ add en-common
+ add en_AU-wo_accents-only
+dict:
+ name en_AU-w_accents
+ add en-common
+ add en_AU-w_accents-only
+
+dict:
name en-wo_accents
alias en:awli
add en-common
@@ -98,3 +109,10 @@
dict:
name en_CA-variant_1
add en_CA-variant_1
+
+dict:
+ name en_AU-variant_0
+ add en_AU-variant_0
+dict:
+ name en_AU-variant_1
+ add en_AU-variant_1
[View Less]
1
0
Hello community,
here is the log from the commit of package fltk for openSUSE:Factory checked in at 2016-11-25 12:03:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fltk (Old)
and /work/SRC/openSUSE:Factory/.fltk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fltk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/fltk/fltk.changes 2015-01-30 06:11:22.000000000 +0100
+++ /…
[View More]work/SRC/openSUSE:Factory/.fltk.new/fltk.changes 2016-11-25 12:03:59.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Nov 21 15:29:09 UTC 2016 - pgajdos(a)suse.com
+
+- updated to 1.3.4: see CHANGES
+- remove fltk-1.3.3-do-not-use-internal-ABI.patch (upstreamed)
+
+-------------------------------------------------------------------
Old:
----
fltk-1.3.3-do-not-use-internal-ABI.patch
fltk-1.3.3-source.tar.gz
New:
----
fltk-1.3.4-source.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fltk.spec ++++++
--- /var/tmp/diff_new_pack.9mtxi2/_old 2016-11-25 12:04:01.000000000 +0100
+++ /var/tmp/diff_new_pack.9mtxi2/_new 2016-11-25 12:04:01.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package fltk
#
-# Copyright (c) 2015 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
@@ -18,7 +18,7 @@
Name: fltk
# Migrating Code from FLTK 1.1 to 1.3: http://www.fltk.org/doc-1.3/migration_1_3.html
-Version: 1.3.3
+Version: 1.3.4
Release: 0
Summary: Free C++ GUI Toolkit for the X Window System, OpenGL, and WIN32
License: LGPL-2.1+
@@ -30,8 +30,6 @@
Patch0: fltk-1.3.2-do_not_add_unneeded_extra_dependencies.patch
# PATCH-FIX-OPENSUSE fltk-1.3.2-verbose_build.patch reddwarf(a)opensuse.org -- Make the build verbose so the post build checks can verify the CFLAGS
Patch2: fltk-1.3.2-verbose_build.patch
-# PATCH-FIX-UPSTREAM fltk-1.3.3-do-not-use-internal-ABI.patch dimstar(a)opensuse.org -- Do not use internal functions
-Patch3: fltk-1.3.3-do-not-use-internal-ABI.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: doxygen
BuildRequires: gcc-c++
@@ -104,7 +102,6 @@
%setup -q
%patch0
%patch2
-%patch3 -p0
%build
%configure \
++++++ fltk-1.3.3-source.tar.gz -> fltk-1.3.4-source.tar.gz ++++++
++++ 143106 lines of diff (skipped)
[View Less]
1
0
Hello community,
here is the log from the commit of package xterm for openSUSE:Factory checked in at 2016-11-25 12:03:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xterm (Old)
and /work/SRC/openSUSE:Factory/.xterm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xterm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xterm/xterm.changes 2016-10-14 03:38:40.000000000 +0200
+++…
[View More] /work/SRC/openSUSE:Factory/.xterm.new/xterm.changes 2016-11-25 12:03:48.000000000 +0100
@@ -1,0 +2,22 @@
+Mon Nov 21 14:54:30 UTC 2016 - pcerny(a)suse.com
+
+- Patch #327 - 2016/10/07
+ * add a check in the function which handles end-of-line
+ wrapping to ensure that C1 controls are allocated one column
+ when allowC1Printable is set (Debian #738794).
+ * use consistent error-checking after strtol calls, fixes a
+ case where a query with OSC 6 did not ensure there was a
+ valid color number (report by Alex Smith).
+ * add -baudrate option, for testing ncurses.
+ * always generate the CASE_xxx symbols in VTparse.h and
+ Tekparse.h, as part of a change to improve debug-logging.
+ This makes the build always depend upon awk.
+ * modify allowC1Printable to disallow codes 160-254 as being
+ equivalent to codes 32-126 when parsing escape sequences
+ (Debian #839220).
+ * amend fix from patch #326 for TrueType fonts to exclude the
+ hidden character used for double-width cells (report by Grady
+ Martin).
+ * fix a typo in ctlseqs.ms
+
+-------------------------------------------------------------------
Old:
----
xterm-326.tgz
xterm-326.tgz.asc
New:
----
xterm-327.tgz
xterm-327.tgz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xterm.spec ++++++
--- /var/tmp/diff_new_pack.w4v5hO/_old 2016-11-25 12:03:49.000000000 +0100
+++ /var/tmp/diff_new_pack.w4v5hO/_new 2016-11-25 12:03:49.000000000 +0100
@@ -19,7 +19,7 @@
%define vttest_version 20140305
%define splitbin 0%{?suse_version} >= 1300
Name: xterm
-Version: 326
+Version: 327
Release: 0
Summary: The basic X terminal program
License: MIT
++++++ xterm-326.tgz -> xterm-327.tgz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/Imakefile new/xterm-327/Imakefile
--- old/xterm-326/Imakefile 2016-01-28 02:56:53.000000000 +0100
+++ new/xterm-327/Imakefile 2016-10-06 02:56:32.000000000 +0200
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.112 2016/01/28 01:56:53 Jens.Schweikhardt Exp $
+XCOMM $XTermId: Imakefile,v 1.113 2016/10/06 00:56:32 tom Exp $
XCOMM
XCOMM Attention xterm porters
XCOMM
@@ -244,11 +244,21 @@
AllTarget($(PROGRAMS))
+VTPARSE_H = VTparse.h VTparse.hin
+TEKPARSE_H = Tekparse.h Tekparse.hin
+
+.SUFFIXES : .def .hin
+.def.hin :
+ awk '/^CASE_/{printf "#define %s %d\n", $$1, n++}' < $< >$@
+
SpecialCObjectRule(main,$(_NOOP_),$(MAIN_DEFINES))
SpecialCObjectRule(menu,$(_NOOP_),$(MISC_DEFINES))
-SpecialCObjectRule(misc,$(_NOOP_),$(MISC_DEFINES))
-SpecialCObjectRule(charproc,$(_NOOP_),$(MISC_DEFINES))
+SpecialCObjectRule(misc,$(VTPARSE_H),$(MISC_DEFINES))
+SpecialCObjectRule(VTPrsTbl,$(VTPARSE_H),$(MISC_DEFINES))
+SpecialCObjectRule(charproc,$(VTPARSE_H),$(MISC_DEFINES))
SpecialCObjectRule(data,$(_NOOP_),$(MISC_DEFINES))
+SpecialCObjectRule(TekPrsTbl,$(TEKPARSE_H),$(MISC_DEFINES))
+SpecialCObjectRule(TekProc,$(TEKPARSE_H),$(MISC_DEFINES))
#if InstallXtermSetUID
SetUIDProgramTarget(xterm,$(OBJS1),$(DEPLIBS1),$(XRFLIBS) XkbClientLibs XawClientLibs,$(TERMCAPLIB) $(PTYLIB))
@@ -319,4 +329,8 @@
InstallAppDefaultsLong(XTerm-col,XTerm-color)
InstallManPage(xterm,$(MANDIR))
InstallManPage(resize,$(MANDIR))
+
+cleandir::
+ $(RM) *parse.hin
+
DependTarget()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/MANIFEST new/xterm-327/MANIFEST
--- old/xterm-326/MANIFEST 2016-07-18 04:21:41.000000000 +0200
+++ new/xterm-327/MANIFEST 2016-10-03 01:18:09.000000000 +0200
@@ -1,4 +1,4 @@
-MANIFEST for xterm-326, version xterm-326
+MANIFEST for xterm-327, version xterm-327
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/Makefile.in new/xterm-327/Makefile.in
--- old/xterm-326/Makefile.in 2016-05-15 18:45:53.000000000 +0200
+++ new/xterm-327/Makefile.in 2016-10-06 02:28:15.000000000 +0200
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.235 2016/05/15 16:45:53 tom Exp $
+## $XTermId: Makefile.in,v 1.238 2016/10/06 00:28:15 tom Exp $
# -----------------------------------------------------------------------------
# this file is part of xterm
#
@@ -125,7 +125,7 @@
all : $(PROGRAMS)
################################################################################
-.SUFFIXES : .i .def .hin .$(manext) .ms .man .txt @MAN2HTML_NOTE@ .html @GROFF_NOTE@ .ps .pdf
+.SUFFIXES : .i .def .cin .hin .$(manext) .ms .man .txt @MAN2HTML_NOTE@ .html @GROFF_NOTE@ .ps .pdf
.c$o :
@RULE_CC@
@@ -135,8 +135,11 @@
@RULE_CC@
@ECHO_CC@$(CPP) -C $(CPPFLAGS) $*.c >$@
+.def.cin :
+ $(AWK) '/^CASE_/{printf "{ %d, \"%s\" },\n", n++, $$1; }' < $< >$@
+
.def.hin :
- grep '^CASE_' $< | $(AWK) '{printf "#define %s %d\n", $$1, n++}' >$@
+ $(AWK) '/^CASE_/{printf "#define %s %d\n", $$1, n++}' < $< >$@
.man.$(manext) :
$(SHELL) ./minstall "$(INSTALL_DATA)" $< $@ $(appsdir) $(CLASS) $* $* $(pixmapdir)
@@ -169,6 +172,10 @@
@GROFF_NOTE@.ps.pdf :
@GROFF_NOTE@ ps2pdf $*.ps
################################################################################
+
+VTPARSE_H = VTparse.h VTparse.hin
+TEKPARSE_H = Tekparse.h Tekparse.hin
+
main$o : main.h
misc$o : version.h
@@ -189,10 +196,19 @@
-$(RM) $@
perl $(srcdir)/88colres.pl > $@
-charproc$o : main.h @CHARPROC_DEPS@
+charproc$o : $(VTPARSE_H) main.h @CHARPROC_DEPS@
+graphics_regis$o : $(VTPARSE_H)
+graphics_sixel$o : $(VTPARSE_H)
+misc$o : $(VTPARSE_H)
+VTPrsTbl$o : $(VTPARSE_H)
+
+TekPrsTbl$o : $(TEKPARSE_H)
+Tekproc$o : $(TEKPARSE_H)
misc$o : builtin_icons.h
+trace$o : VTparse.cin Tekparse.cin
+
# do this to quiet gcc -Wcast-qual warnings
builtin_icons.h :
@echo "#if OPT_BUILTIN_XPMS" >$@
@@ -500,7 +516,7 @@
-$(RM) *$o *.[is] XtermLog.* .pure core *~ *.bak *.BAK *.out *.tmp
clean : mostlyclean
- -$(RM) $(PROGRAMS) builtin_icons.h
+ -$(RM) $(PROGRAMS) builtin_icons.h *.cin *parse.hin
distclean :: clean
-$(RM) Makefile config.status config.cache config.log xtermcfg.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/NEWS new/xterm-327/NEWS
--- old/xterm-326/NEWS 1970-01-01 01:00:00.000000000 +0100
+++ new/xterm-327/NEWS 2016-10-08 02:44:44.000000000 +0200
@@ -0,0 +1,22 @@
+The NEWS file was generated from xterm.log.html, which serves as the changelog
+for xterm.
+--------------------------------------------------------------------------------
+ Patch #327 - 2016/10/07
+
+ * add a check in the function which handles end-of-line wrapping to
+ ensure that C1 controls are allocated one column when
+ allowC1Printable is set (Debian #738794).
+ * use consistent error-checking after strtol calls, fixes a case
+ where a query with OSC 6 did not ensure there was a valid color
+ number (report by Alex Smith).
+ * add -baudrate option, for testing ncurses.
+ * always generate the CASE_xxx symbols in VTparse.h and Tekparse.h,
+ as part of a change to improve debug-logging. This makes the build
+ always depend upon awk.
+ * modify allowC1Printable to disallow codes 160-254 as being
+ equivalent to codes 32-126 when parsing escape sequences (Debian
+ #839220).
+ * amend fix from patch #326 for TrueType fonts to exclude the hidden
+ character used for double-width cells (report by Grady Martin).
+ * fix a typo in ctlseqs.ms
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/Tekparse.h new/xterm-327/Tekparse.h
--- old/xterm-326/Tekparse.h 2006-02-13 02:14:57.000000000 +0100
+++ new/xterm-327/Tekparse.h 2016-10-06 02:32:30.000000000 +0200
@@ -1,31 +1,34 @@
-/* $XTermId: Tekparse.h,v 1.7 2006/02/13 01:14:57 tom Exp $ */
+/* $XTermId: Tekparse.h,v 1.8 2016/10/06 00:32:30 tom Exp $ */
/*
- * Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
+ * Copyright 1998-2006,2016 by Thomas E. Dickey
*
* All Rights Reserved
*
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of Digital Equipment
- * Corporation not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- *
- *
- * DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the
+ * sale, use or other dealings in this Software without prior written
+ * authorization.
*/
-/* $XFree86: xc/programs/xterm/Tekparse.h,v 1.6 2006/02/13 01:14:57 dickey Exp $ */
-
-
-/* @(#)Tekparse.h X10/6.6 11/7/86 */
#ifndef included_Tekparse_h
#define included_Tekparse_h 1
@@ -47,51 +50,6 @@
extern Const int Tpttable[];
extern Const int Tspttable[];
-/*
- * The following list of definitions is generated from Tekparse.def using the
- * following command line:
- *
- * egrep -v '^CASE_' Tekparse.def | \
- * awk 'BEGIN {n = 0;} {printf "#define %s %d\n", $1, n; n++}'
- *
- * You you need to change something, change Tekparse.def and regenerate the
- * definitions. This would have been automatic, but since this doesn't change
- * very often, it isn't worth the makefile hassle.
- */
-
-#define CASE_REPORT 0
-#define CASE_VT_MODE 1
-#define CASE_SPT_STATE 2
-#define CASE_GIN 3
-#define CASE_BEL 4
-#define CASE_BS 5
-#define CASE_PT_STATE 6
-#define CASE_PLT_STATE 7
-#define CASE_TAB 8
-#define CASE_IPL_STATE 9
-#define CASE_ALP_STATE 10
-#define CASE_UP 11
-#define CASE_COPY 12
-#define CASE_PAGE 13
-#define CASE_BES_STATE 14
-#define CASE_BYP_STATE 15
-#define CASE_IGNORE 16
-#define CASE_ASCII 17
-#define CASE_APL 18
-#define CASE_CHAR_SIZE 19
-#define CASE_BEAM_VEC 20
-#define CASE_CURSTATE 21
-#define CASE_PENUP 22
-#define CASE_PENDOWN 23
-#define CASE_IPL_POINT 24
-#define CASE_PLT_VEC 25
-#define CASE_PT_POINT 26
-#define CASE_SPT_POINT 27
-#define CASE_CR 28
-#define CASE_ESC_STATE 29
-#define CASE_LF 30
-#define CASE_SP 31
-#define CASE_PRINT 32
-#define CASE_OSC 33
+#include <Tekparse.hin>
#endif /* included_Tekparse_h */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/VTparse.h new/xterm-327/VTparse.h
--- old/xterm-326/VTparse.h 2015-02-16 01:10:39.000000000 +0100
+++ new/xterm-327/VTparse.h 2016-10-06 02:37:11.000000000 +0200
@@ -1,7 +1,7 @@
-/* $XTermId: VTparse.h,v 1.65 2015/02/16 00:10:39 tom Exp $ */
+/* $XTermId: VTparse.h,v 1.66 2016/10/06 00:37:11 tom Exp $ */
/*
- * Copyright 2002-2014,2015 by Thomas E. Dickey
+ * Copyright 1996-2015,2016 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -28,28 +28,6 @@
* holders shall not be used in advertising or otherwise to promote the
* sale, use or other dealings in this Software without prior written
* authorization.
- *
- *
- * Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
- *
- * All Rights Reserved
- *
- * Permission to use, copy, modify, and distribute this software and its
- * documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in
- * supporting documentation, and that the name of Digital Equipment
- * Corporation not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- *
- *
- * DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
*/
#ifndef included_VTparse_h
@@ -106,178 +84,6 @@
extern Const PARSE_T scs_pct_table[];
#endif
-/*
- * The following list of definitions is generated from VTparse.def using the
- * following command line:
- *
- * grep '^CASE_' VTparse.def | awk '{printf "#define %s %d\n", $1, n++}'
- *
- * If you need to change something, change VTparse.def and regenerate the
- * definitions. This would have been automatic, but since this doesn't change
- * very often, it isn't worth the makefile hassle.
- */
-
-#define CASE_GROUND_STATE 0
-#define CASE_IGNORE 1
-#define CASE_BELL 2
-#define CASE_BS 3
-#define CASE_CR 4
-#define CASE_ESC 5
-#define CASE_VMOT 6
-#define CASE_TAB 7
-#define CASE_SI 8
-#define CASE_SO 9
-#define CASE_SCR_STATE 10
-#define CASE_SCS0_STATE 11
-#define CASE_SCS1_STATE 12
-#define CASE_SCS2_STATE 13
-#define CASE_SCS3_STATE 14
-#define CASE_ESC_IGNORE 15
-#define CASE_ESC_DIGIT 16
-#define CASE_ESC_SEMI 17
-#define CASE_DEC_STATE 18
-#define CASE_ICH 19
-#define CASE_CUU 20
-#define CASE_CUD 21
-#define CASE_CUF 22
-#define CASE_CUB 23
-#define CASE_CUP 24
-#define CASE_ED 25
-#define CASE_EL 26
-#define CASE_IL 27
-#define CASE_DL 28
-#define CASE_DCH 29
-#define CASE_DA1 30
-#define CASE_TRACK_MOUSE 31
-#define CASE_TBC 32
-#define CASE_SET 33
-#define CASE_RST 34
-#define CASE_SGR 35
-#define CASE_CPR 36
-#define CASE_DECSTBM 37
-#define CASE_DECREQTPARM 38
-#define CASE_DECSET 39
-#define CASE_DECRST 40
-#define CASE_DECALN 41
-#define CASE_GSETS 42
-#define CASE_DECSC 43
-#define CASE_DECRC 44
-#define CASE_DECKPAM 45
-#define CASE_DECKPNM 46
-#define CASE_IND 47
-#define CASE_NEL 48
-#define CASE_HTS 49
-#define CASE_RI 50
-#define CASE_SS2 51
-#define CASE_SS3 52
-#define CASE_CSI_STATE 53
-#define CASE_OSC 54
-#define CASE_RIS 55
-#define CASE_LS2 56
-#define CASE_LS3 57
-#define CASE_LS3R 58
-#define CASE_LS2R 59
-#define CASE_LS1R 60
-#define CASE_PRINT 61
-#define CASE_XTERM_SAVE 62
-#define CASE_XTERM_RESTORE 63
-#define CASE_XTERM_TITLE 64
-#define CASE_DECID 65
-#define CASE_HP_MEM_LOCK 66
-#define CASE_HP_MEM_UNLOCK 67
-#define CASE_HP_BUGGY_LL 68
-#define CASE_HPA 69
-#define CASE_VPA 70
-#define CASE_XTERM_WINOPS 71
-#define CASE_ECH 72
-#define CASE_CHT 73
-#define CASE_CPL 74
-#define CASE_CNL 75
-#define CASE_CBT 76
-#define CASE_SU 77
-#define CASE_SD 78
-#define CASE_S7C1T 79
-#define CASE_S8C1T 80
-#define CASE_ESC_SP_STATE 81
-#define CASE_ENQ 82
-#define CASE_DECSCL 83
-#define CASE_DECSCA 84
-#define CASE_DECSED 85
-#define CASE_DECSEL 86
-#define CASE_DCS 87
-#define CASE_PM 88
-#define CASE_SOS 89
-#define CASE_ST 90
-#define CASE_APC 91
-#define CASE_EPA 92
-#define CASE_SPA 93
-#define CASE_CSI_QUOTE_STATE 94
-#define CASE_DSR 95
-#define CASE_ANSI_LEVEL_1 96
-#define CASE_ANSI_LEVEL_2 97
-#define CASE_ANSI_LEVEL_3 98
-#define CASE_MC 99
-#define CASE_DEC2_STATE 100
-#define CASE_DA2 101
-#define CASE_DEC3_STATE 102
-#define CASE_DECRPTUI 103
-#define CASE_VT52_CUP 104
-#define CASE_REP 105
-#define CASE_CSI_EX_STATE 106
-#define CASE_DECSTR 107
-#define CASE_DECDHL 108
-#define CASE_DECSWL 109
-#define CASE_DECDWL 110
-#define CASE_DEC_MC 111
-#define CASE_ESC_PERCENT 112
-#define CASE_UTF8 113
-#define CASE_CSI_TICK_STATE 114
-#define CASE_DECELR 115
-#define CASE_DECRQLP 116
-#define CASE_DECEFR 117
-#define CASE_DECSLE 118
-#define CASE_CSI_IGNORE 119
-#define CASE_VT52_IGNORE 120
-#define CASE_VT52_FINISH 121
-#define CASE_CSI_DOLLAR_STATE 122
-#define CASE_DECCRA 123
-#define CASE_DECERA 124
-#define CASE_DECFRA 125
-#define CASE_DECSERA 126
-#define CASE_DECSACE 127
-#define CASE_DECCARA 128
-#define CASE_DECRARA 129
-#define CASE_CSI_STAR_STATE 130
-#define CASE_SET_MOD_FKEYS 131
-#define CASE_SET_MOD_FKEYS0 132
-#define CASE_HIDE_POINTER 133
-#define CASE_SCS1A_STATE 134
-#define CASE_SCS2A_STATE 135
-#define CASE_SCS3A_STATE 136
-#define CASE_CSI_SPACE_STATE 137
-#define CASE_DECSCUSR 138
-#define CASE_SM_TITLE 139
-#define CASE_RM_TITLE 140
-#define CASE_DECSMBV 141
-#define CASE_DECSWBV 142
-#define CASE_DECLL 143
-#define CASE_DECRQM 144
-#define CASE_RQM 145
-#define CASE_CSI_DEC_DOLLAR_STATE 146
-#define CASE_SL 147
-#define CASE_SR 148
-#define CASE_DECDC 149
-#define CASE_DECIC 150
-#define CASE_DECBI 151
-#define CASE_DECFI 152
-#define CASE_DECRQCRA 153
-#define CASE_HPR 154
-#define CASE_VPR 155
-#define CASE_ANSI_SC 156
-#define CASE_ANSI_RC 157
-#define CASE_ESC_COLON 158
-#define CASE_SCS_PERCENT 159
-#define CASE_GSETS_PERCENT 160
-#define CASE_GRAPHICS_ATTRIBUTES 161
+#include <VTparse.hin>
#endif /* included_VTparse_h */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/charproc.c new/xterm-327/charproc.c
--- old/xterm-326/charproc.c 2016-09-23 22:13:11.000000000 +0200
+++ new/xterm-327/charproc.c 2016-10-07 23:14:54.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1422 2016/09/23 20:13:11 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1426 2016/10/07 21:14:54 tom Exp $ */
/*
* Copyright 1999-2015,2016 by Thomas E. Dickey
@@ -2110,10 +2110,13 @@
* provided that they are not intermixed with an escape sequence.
*/
if (screen->c1_printable
- && (c >= 128 && c < 160)) {
+ && (c >= 128 && c < 256)) {
sp->nextstate = (sp->parsestate == esc_table
? CASE_ESC_IGNORE
: sp->parsestate[E2A(160)]);
+ TRACE(("allowC1Printable %04X %s ->%s\n",
+ c, which_table(sp->parsestate),
+ visibleVTparse(sp->nextstate)));
}
#endif
@@ -2216,8 +2219,8 @@
}
DumpParams();
- TRACE(("parse %04X -> %d %s (used=%lu)\n",
- c, sp->nextstate,
+ TRACE(("parse %04X -> %s %s (used=%lu)\n",
+ c, visibleVTparse(sp->nextstate),
which_table(sp->parsestate),
(unsigned long) sp->string_used));
@@ -4992,6 +4995,10 @@
if (!screen->utf8_mode
|| (screen->vt100_graphics && charset == '0')) {
last_chomp = 1;
+ } else if (screen->c1_printable &&
+ buf[chars_chomped + offset] >= 0x80 &&
+ buf[chars_chomped + offset] <= 0xa0) {
+ last_chomp = 1;
} else {
last_chomp = my_wcwidth((wchar_t) buf[chars_chomped + offset]);
}
@@ -7554,7 +7561,7 @@
char *temp;
value = (int) strtol(next, &temp, 0);
- if (!IsEmpty(temp)) {
+ if (!FullS2L(next, temp)) {
xtermWarning("Expected a number: %s\n", next);
} else {
for (n = 0; n < limit; ++n) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/ctlseqs.ms new/xterm-327/ctlseqs.ms
--- old/xterm-326/ctlseqs.ms 2016-09-08 11:16:28.000000000 +0200
+++ new/xterm-327/ctlseqs.ms 2016-10-03 01:19:00.000000000 +0200
@@ -1,6 +1,6 @@
.\"#! troff -ms $1 -*- Nroff -*-
.\" "Xterm Control Sequences" document
-.\" $XTermId: ctlseqs.ms,v 1.331 2016/09/08 09:16:28 tom Exp $
+.\" $XTermId: ctlseqs.ms,v 1.333 2016/10/02 23:19:00 tom Exp $
.\"
.\"
.\" Copyright 1996-2015,2016 by Thomas E. Dickey
@@ -70,7 +70,7 @@
.ds XT XTerm
.ds xt xterm
.ds LF Patch #326
-.ds RF 2016/09/08
+.ds RF 2016/10/02
.\"
.if n .pl 9999v \" no page breaks in nroff
.ND
@@ -679,7 +679,7 @@
.Ed
.
.St
-.Ss Application Program-Control functions
+.Ss Application Program-Command functions
.IP \\*(AP\\*(Pt\\*s\\*(ST
None. \fIxterm\fP implements no \*(AP functions; \*(Pt is ignored.
\*(Pt need not be printable characters.
@@ -1633,7 +1633,7 @@
.Ed
.
.St
-.Ss Operating System Controls
+.Ss Operating System Commands
.
.IP \\*(Os\\*(Ps\\*s\\*;\\*(Pt\\*s\\*(ST
.IP \\*(Os\\*(Ps\\*s\\*;\\*(Pt\\*s\\*(Be
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/ctlseqs.txt new/xterm-327/ctlseqs.txt
--- old/xterm-326/ctlseqs.txt 2016-09-08 11:16:31.000000000 +0200
+++ new/xterm-327/ctlseqs.txt 2016-10-03 01:19:00.000000000 +0200
@@ -21,7 +21,7 @@
Thomas Dickey
XFree86 Project (1996-2006)
invisible-island.net (2006-2016)
- updated for XTerm Patch #326 (2016/09/08)
+ updated for XTerm Patch #326 (2016/10/02)
@@ -241,7 +241,7 @@
ESC } Invoke the G2 Character Set as GR (LS2R).
ESC ~ Invoke the G1 Character Set as GR (LS1R).
-Application Program-Control functions
+Application Program-Command functions
APC Pt ST None. xterm implements no APC functions; Pt is ignored. Pt
need not be printable characters.
@@ -1037,7 +1037,7 @@
CSI Pm ' ~
Delete Ps Column(s) (default = 1) (DECDC), VT420 and up.
-Operating System Controls
+Operating System Commands
OSC Ps ; Pt ST
OSC Ps ; Pt BEL
Set Text Parameters. For colors and font, if Pt is a "?", the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/main.c new/xterm-327/main.c
--- old/xterm-326/main.c 2016-06-01 11:13:46.000000000 +0200
+++ new/xterm-327/main.c 2016-10-07 02:40:34.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.781 2016/06/01 09:13:46 tom Exp $ */
+/* $XTermId: main.c,v 1.784 2016/10/07 00:40:34 tom Exp $ */
/*
* Copyright 2002-2015,2016 by Thomas E. Dickey
@@ -445,7 +445,8 @@
#ifndef VMS
static void reapchild(int /* n */ );
-static int spawnXTerm(XtermWidget /* xw */ );
+static int spawnXTerm(XtermWidget /* xw */
+ ,unsigned /* line_speed */ );
static void remove_termcap_entry(char *, const char *);
#ifdef USE_PTY_SEARCH
static int pty_search(int * /* pty */ );
@@ -1115,6 +1116,7 @@
/* options that we process ourselves */
{"-help", NULL, XrmoptionSkipNArgs, (XPointer) NULL},
{"-version", NULL, XrmoptionSkipNArgs, (XPointer) NULL},
+{"-baudrate", NULL, XrmoptionSkipArg, (XPointer) NULL},
{"-class", NULL, XrmoptionSkipArg, (XPointer) NULL},
{"-e", NULL, XrmoptionSkipLine, (XPointer) NULL},
{"-into", NULL, XrmoptionSkipArg, (XPointer) NULL},
@@ -1159,6 +1161,7 @@
#endif
{ "-iconic", "start iconic" },
{ "-name string", "client instance, icon, and title strings" },
+{ "-baudrate rate", "set line-speed (default 38400)" },
{ "-class string", "class string (XTerm)" },
{ "-title string", "title string" },
{ "-xrm resourcestring", "additional resource specifications" },
@@ -1357,9 +1360,10 @@
}
++string;
} else if (termcap && (*string == '\\')) {
+ char *s = (string + 1);
char *d;
- int temp = (int) strtol(string + 1, &d, 8);
- if (temp > 0 && d != string) {
+ int temp = (int) strtol(s, &d, 8);
+ if (PartS2L(s, d) && temp > 0) {
value = temp;
string = d;
}
@@ -1971,6 +1975,124 @@
}
#endif
+static unsigned
+lookup_baudrate(const char *value)
+{
+ struct speed {
+ unsigned given_speed; /* values for 'ospeed' */
+ unsigned actual_speed; /* the actual speed */
+ };
+
+#define DATA(number) { B##number, number }
+
+ static struct speed const speeds[] =
+ {
+ DATA(0),
+ DATA(50),
+ DATA(75),
+ DATA(110),
+ DATA(134),
+ DATA(150),
+ DATA(200),
+ DATA(300),
+ DATA(600),
+ DATA(1200),
+ DATA(1800),
+ DATA(2400),
+ DATA(4800),
+ DATA(9600),
+#ifdef B19200
+ DATA(19200),
+#elif defined(EXTA)
+ {EXTA, 19200},
+#endif
+#ifdef B28800
+ DATA(28800),
+#endif
+#ifdef B38400
+ DATA(38400),
+#elif defined(EXTB)
+ {EXTB, 38400},
+#endif
+#ifdef B57600
+ DATA(57600),
+#endif
+#ifdef B76800
+ DATA(76800),
+#endif
+#ifdef B115200
+ DATA(115200),
+#endif
+#ifdef B153600
+ DATA(153600),
+#endif
+#ifdef B230400
+ DATA(230400),
+#endif
+#ifdef B307200
+ DATA(307200),
+#endif
+#ifdef B460800
+ DATA(460800),
+#endif
+#ifdef B500000
+ DATA(500000),
+#endif
+#ifdef B576000
+ DATA(576000),
+#endif
+#ifdef B921600
+ DATA(921600),
+#endif
+#ifdef B1000000
+ DATA(1000000),
+#endif
+#ifdef B1152000
+ DATA(1152000),
+#endif
+#ifdef B1500000
+ DATA(1500000),
+#endif
+#ifdef B2000000
+ DATA(2000000),
+#endif
+#ifdef B2500000
+ DATA(2500000),
+#endif
+#ifdef B3000000
+ DATA(3000000),
+#endif
+#ifdef B3500000
+ DATA(3500000),
+#endif
+#ifdef B4000000
+ DATA(4000000),
+#endif
+ };
+#undef DATA
+ unsigned result = 0;
+ long check;
+ char *next;
+ if (x_toupper(*value) == 'B')
+ value++;
+ if (isdigit(CharOf(*value))) {
+ check = strtol(value, &next, 10);
+ if (FullS2L(value, next) && (check > 0)) {
+ Cardinal n;
+ for (n = 0; n < XtNumber(speeds); ++n) {
+ if (speeds[n].actual_speed == (unsigned) check) {
+ result = speeds[n].given_speed;
+ break;
+ }
+ }
+ }
+ }
+ if (result == 0) {
+ fprintf(stderr, "unsupported value for baudrate: %s\n", value);
+ }
+ return result;
+}
+
int
main(int argc, char *argv[]ENVP_ARG)
{
@@ -1989,6 +2111,7 @@
TScreen *screen;
int mode;
char *my_class = x_strdup(DEFCLASS);
+ unsigned line_speed = VAL_LINE_SPEED;
Window winToEmbedInto = None;
ProgramName = argv[0];
@@ -2070,6 +2193,11 @@
} else if (!strcmp(option_ptr->option, "-help")) {
Help();
quit = True;
+ } else if (!strcmp(option_ptr->option, "-baudrate")) {
+ if ((line_speed = lookup_baudrate(option_value)) == 0) {
+ Help();
+ quit = True;
+ }
} else if (!strcmp(option_ptr->option, "-class")) {
free(my_class);
if ((my_class = x_strdup(option_value)) == 0) {
@@ -2079,6 +2207,10 @@
} else if (!strcmp(option_ptr->option, "-into")) {
char *endPtr;
winToEmbedInto = (Window) strtol(option_value, &endPtr, 0);
+ if (!FullS2L(option_value, endPtr)) {
+ Help();
+ quit = True;
+ }
}
}
if (quit)
@@ -2126,7 +2258,7 @@
}
}
#if defined(macII) || defined(ATT) || defined(CRAY) /* { */
- d_tio.c_cflag = VAL_LINE_SPEED | CS8 | CREAD | PARENB | HUPCL;
+ d_tio.c_cflag = line_speed | CS8 | CREAD | PARENB | HUPCL;
d_tio.c_lflag = ISIG | ICANON | ECHO | ECHOE | ECHOK;
#ifdef ECHOKE
d_tio.c_lflag |= ECHOKE | IEXTEN;
@@ -2153,12 +2285,12 @@
#ifdef BAUD_0 /* { */
d_tio.c_cflag = CS8 | CREAD | PARENB | HUPCL;
#else /* }{ !BAUD_0 */
- d_tio.c_cflag = VAL_LINE_SPEED | CS8 | CREAD | PARENB | HUPCL;
+ d_tio.c_cflag = line_speed | CS8 | CREAD | PARENB | HUPCL;
#endif /* } !BAUD_0 */
#else /* USE_POSIX_TERMIOS */
d_tio.c_cflag = CS8 | CREAD | PARENB | HUPCL;
- cfsetispeed(&d_tio, VAL_LINE_SPEED);
- cfsetospeed(&d_tio, VAL_LINE_SPEED);
+ cfsetispeed(&d_tio, line_speed);
+ cfsetospeed(&d_tio, line_speed);
#endif
d_tio.c_lflag = ISIG | ICANON | ECHO | ECHOE | ECHOK;
#ifdef ECHOKE
@@ -2349,6 +2481,11 @@
debug = True;
continue;
#endif /* DEBUG */
+ case 'b':
+ if (strcmp(argv[0], "-baudrate"))
+ Syntax(*argv);
+ argc--, argv++;
+ continue;
case 'c':
if (strcmp(argv[0], "-class"))
Syntax(*argv);
@@ -2506,7 +2643,7 @@
}
});
- spawnXTerm(term);
+ spawnXTerm(term, line_speed);
#ifndef VMS
/* Child process is out there, let's catch its termination */
@@ -3304,7 +3441,7 @@
* If slave, the pty named in passedPty is already open for use
*/
static int
-spawnXTerm(XtermWidget xw)
+spawnXTerm(XtermWidget xw, unsigned line_speed)
{
TScreen *screen = TScreenOf(xw);
Cardinal nn;
@@ -4009,13 +4146,13 @@
#ifdef BAUD_0
/* baud rate is 0 (don't care) */
#elif defined(HAVE_TERMIO_C_ISPEED)
- tio.c_ispeed = tio.c_ospeed = VAL_LINE_SPEED;
+ tio.c_ispeed = tio.c_ospeed = line_speed;
#else /* !BAUD_0 */
- tio.c_cflag |= VAL_LINE_SPEED;
+ tio.c_cflag |= line_speed;
#endif /* !BAUD_0 */
#else /* USE_POSIX_TERMIOS */
- cfsetispeed(&tio, VAL_LINE_SPEED);
- cfsetospeed(&tio, VAL_LINE_SPEED);
+ cfsetispeed(&tio, line_speed);
+ cfsetospeed(&tio, line_speed);
#ifdef __MVS__
/* turn off bits that can't be set from the slave side */
tio.c_cflag &= ~(PACKET | PKT3270 | PTU3270 | PKTXTND);
@@ -4096,8 +4233,8 @@
sg.sg_flags &= ~(ALLDELAY | XTABS | CBREAK | RAW);
sg.sg_flags |= ECHO | CRMOD;
/* make sure speed is set on pty so that editors work right */
- sg.sg_ispeed = VAL_LINE_SPEED;
- sg.sg_ospeed = VAL_LINE_SPEED;
+ sg.sg_ispeed = line_speed;
+ sg.sg_ospeed = line_speed;
/* reset t_brkc to default value */
tc.t_brkc = -1;
#ifdef LPASS8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/misc.c new/xterm-327/misc.c
--- old/xterm-326/misc.c 2016-09-09 01:39:58.000000000 +0200
+++ new/xterm-327/misc.c 2016-10-07 02:41:14.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: misc.c,v 1.742 2016/09/08 23:39:58 Joe.Peterson Exp $ */
+/* $XTermId: misc.c,v 1.743 2016/10/07 00:41:14 tom Exp $ */
/*
* Copyright 1999-2015,2016 by Thomas E. Dickey
@@ -2766,7 +2766,7 @@
char *next;
color = (int) (strtol) (buf, &next, 10);
- if ((next == buf) || (color < 0))
+ if (!PartS2L(buf, next) || (color < 0))
break; /* no number at all */
if (next != 0) {
if (strchr(";", *next) == 0)
@@ -3666,7 +3666,7 @@
++buf;
} else {
which = strtol(buf, &next, 10);
- if (next == 0)
+ if (!PartS2L(buf, next) || (which < 0))
break;
buf = next;
if (*buf == ';')
@@ -3676,7 +3676,7 @@
++buf;
} else {
value = strtol(buf, &next, 10);
- if (next == 0)
+ if (!PartS2L(buf, next) || (which < 0))
break;
buf = next;
if (*buf == ';')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/package/debian/changelog new/xterm-327/package/debian/changelog
--- old/xterm-326/package/debian/changelog 2016-07-18 04:21:41.000000000 +0200
+++ new/xterm-327/package/debian/changelog 2016-10-03 01:18:09.000000000 +0200
@@ -1,3 +1,9 @@
+xterm-dev (327) unstable; urgency=low
+
+ * maintenance updates
+
+ -- Thomas E. Dickey <dickey(a)invisible-island.net> Sun, 02 Oct 2016 19:18:09 -0400
+
xterm-dev (326) unstable; urgency=low
* maintenance updates
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/package/freebsd/Makefile new/xterm-327/package/freebsd/Makefile
--- old/xterm-326/package/freebsd/Makefile 2016-07-18 04:21:41.000000000 +0200
+++ new/xterm-327/package/freebsd/Makefile 2016-10-03 01:18:09.000000000 +0200
@@ -5,7 +5,7 @@
# and "make makesum".
PORTNAME= xterm
-PORTVERSION= 326
+PORTVERSION= 327
CATEGORIES= x11
MASTER_SITES= ftp://invisible-island.net/xterm/ \
CRITICAL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/package/xterm.spec new/xterm-327/package/xterm.spec
--- old/xterm-326/package/xterm.spec 2016-07-18 04:21:41.000000000 +0200
+++ new/xterm-327/package/xterm.spec 2016-10-03 01:18:09.000000000 +0200
@@ -1,11 +1,11 @@
-# $XTermId: xterm.spec,v 1.92 2016/07/18 02:21:41 tom Exp $
+# $XTermId: xterm.spec,v 1.93 2016/10/02 23:18:09 tom Exp $
Summary: X terminal emulator (development version)
%global my_middle xterm
%global my_suffix -dev
%global fullname %{my_middle}%{my_suffix}
%global my_class XTermDev
Name: %{fullname}
-Version: 326
+Version: 327
Release: 1
License: X11
Group: User Interface/X
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/ptyx.h new/xterm-327/ptyx.h
--- old/xterm-326/ptyx.h 2016-05-29 22:32:48.000000000 +0200
+++ new/xterm-327/ptyx.h 2016-10-07 02:38:57.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: ptyx.h,v 1.829 2016/05/29 20:32:48 tom Exp $ */
+/* $XTermId: ptyx.h,v 1.830 2016/10/07 00:38:57 tom Exp $ */
/*
* Copyright 1999-2015,2016 by Thomas E. Dickey
@@ -324,6 +324,13 @@
#define IsEmpty(s) ((s) == 0 || *(s) == '\0')
#define IsSpace(c) ((c) == ' ' || (c) == '\t' || (c) == '\r' || (c) == '\n')
+/*
+ * Check strtol result, using "FullS2L" when no more data is expected, and
+ * "PartS2L" when more data may follow in the string.
+ */
+#define FullS2L(s,d) (PartS2L(s,d) && (*(d) == '\0'))
+#define PartS2L(s,d) (isdigit(CharOf(*(s))) && (d) != (s) && (d) != 0)
+
#define CASETYPE(name) case name: result = #name; break
#define CharOf(n) ((Char)(n))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/trace.c new/xterm-327/trace.c
--- old/xterm-326/trace.c 2016-05-31 02:48:42.000000000 +0200
+++ new/xterm-327/trace.c 2016-10-05 11:16:01.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: trace.c,v 1.165 2016/05/31 00:48:42 tom Exp $ */
+/* $XTermId: trace.c,v 1.166 2016/10/05 09:16:01 tom Exp $ */
/*
* Copyright 1997-2015,2016 by Thomas E. Dickey
@@ -444,6 +444,46 @@
return result;
}
+const char *
+visibleTekparse(int code)
+{
+ static const struct {
+ int code;
+ const char *name;
+ } table[] = {
+#include "Tekparse.cin"
+ };
+ const char *result = "?";
+ Cardinal n;
+ for (n = 0; n < XtNumber(table); ++n) {
+ if (table[n].code == code) {
+ result = table[n].name;
+ break;
+ }
+ }
+ return result;
+}
+
+const char *
+visibleVTparse(int code)
+{
+ static const struct {
+ int code;
+ const char *name;
+ } table[] = {
+#include "VTparse.cin"
+ };
+ const char *result = "?";
+ Cardinal n;
+ for (n = 0; n < XtNumber(table); ++n) {
+ if (table[n].code == code) {
+ result = table[n].name;
+ break;
+ }
+ }
+ return result;
+}
+
const char *
visibleXError(int code)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/trace.h new/xterm-327/trace.h
--- old/xterm-326/trace.h 2016-05-13 22:46:40.000000000 +0200
+++ new/xterm-327/trace.h 2016-10-05 10:56:36.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: trace.h,v 1.77 2016/05/13 20:46:40 tom Exp $ */
+/* $XTermId: trace.h,v 1.78 2016/10/05 08:56:36 tom Exp $ */
/*
* Copyright 1997-2015,2016 by Thomas E. Dickey
@@ -64,6 +64,8 @@
extern const char * visibleNotifyMode (int /* code */);
extern const char * visibleScsCode(int /* chrset */);
extern const char * visibleSelectionTarget(Display * /* d */, Atom /* a */);
+extern const char * visibleTekparse (int);
+extern const char * visibleVTparse (int);
extern const char * visibleXError (int /* code */);
extern void TraceArgv(const char * /* tag */, char ** /* argv */);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/util.c new/xterm-327/util.c
--- old/xterm-326/util.c 2016-09-24 15:39:04.000000000 +0200
+++ new/xterm-327/util.c 2016-10-07 02:41:38.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: util.c,v 1.691 2016/09/24 13:39:04 tom Exp $ */
+/* $XTermId: util.c,v 1.693 2016/10/07 00:41:38 tom Exp $ */
/*
* Copyright 1999-2015,2016 by Thomas E. Dickey
@@ -3571,7 +3571,7 @@
filler = needed - 1;
ch = part;
replace = True;
- } else {
+ } else if (ch != HIDDEN_CHAR) {
SetMissing();
}
}
@@ -4847,7 +4847,7 @@
|| (x_strcasecmp(value, "no") == 0)
|| (x_strcasecmp(value, "off") == 0)) {
result = False;
- } else if ((check = strtol(value, &next, 0)) >= 0 && *next == '\0') {
+ } else if ((check = strtol(value, &next, 0)) >= 0 && FullS2L(value, next)) {
if (check >= (long) (limit + 2)) /* 2 is past False=0, True=1 */
check = True;
result = (int) check;
@@ -4951,7 +4951,7 @@
str++;
} else {
long s = strtol(str, &end, 0);
- if (end > str && (int) s >= 0) {
+ if (FullS2L(str, end) && ((int) s >= 0)) {
screen = (int) s;
str = end;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/version.h new/xterm-327/version.h
--- old/xterm-326/version.h 2016-09-25 23:28:55.000000000 +0200
+++ new/xterm-327/version.h 2016-10-08 02:45:01.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.429 2016/09/25 21:28:55 tom Exp $ */
+/* $XTermId: version.h,v 1.431 2016/10/08 00:45:01 tom Exp $ */
/*
* Copyright 1998-2015,2016 by Thomas E. Dickey
@@ -38,8 +38,8 @@
* version of X to which this version of xterm has been built. The resulting
* number in parentheses is my patch number (Thomas E. Dickey).
*/
-#define XTERM_PATCH 326
-#define XTERM_DATE 2016-09-25
+#define XTERM_PATCH 327
+#define XTERM_DATE 2016-10-07
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/xterm.log.html new/xterm-327/xterm.log.html
--- old/xterm-326/xterm.log.html 2016-09-25 23:31:02.000000000 +0200
+++ new/xterm-327/xterm.log.html 2016-10-08 02:44:44.000000000 +0200
@@ -30,7 +30,7 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
*****************************************************************************
- $XTermId: xterm.log.html,v 1.1684 2016/09/25 21:31:02 tom Exp $
+ $XTermId: xterm.log.html,v 1.1693 2016/10/08 00:44:44 tom Exp $
-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
@@ -72,6 +72,8 @@
CHANGELOG</a>).</p>
<ul>
+ <li><a href="#xterm_327">Patch #327 - 2016/10/07</a></li>
+
<li><a href="#xterm_326">Patch #326 - 2016/09/25</a></li>
<li><a href="#xterm_325">Patch #325 - 2016/06/05</a></li>
@@ -937,6 +939,38 @@
<li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li>
</ul>
+ <h1><a name="xterm_327" id="xterm_327">Patch #327 -
+ 2016/10/07</a></h1>
+
+ <ul>
+ <li>add a check in the function which handles end-of-line
+ wrapping to ensure that C1 controls are allocated one column
+ when <code>allowC1Printable</code> is set (Debian
+ #738794).</li>
+
+ <li>use consistent error-checking after <code>strtol</code>
+ calls, fixes a case where a query with OSC 6 did not ensure
+ there was a valid color number (report by Alex Smith).</li>
+
+ <li>add <code>-baudrate</code> option, for testing
+ ncurses.</li>
+
+ <li>always generate the <code>CASE_<em>xxx</em></code> symbols
+ in <code>VTparse.h</code> and <code>Tekparse.h</code>, as part
+ of a change to improve debug-logging. This makes the build
+ always depend upon <code>awk</code>.</li>
+
+ <li>modify <code>allowC1Printable</code> to disallow codes
+ 160-254 as being equivalent to codes 32-126 when parsing escape
+ sequences (Debian #839220).</li>
+
+ <li>amend fix from <a href="#xterm_326">patch #326</a> for
+ TrueType fonts to exclude the hidden character used for
+ double-width cells (report by Grady Martin).</li>
+
+ <li>fix a typo in <code>ctlseqs.ms</code></li>
+ </ul>
+
<h1><a name="xterm_326" id="xterm_326">Patch #326 -
2016/09/25</a></h1>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-326/xterm.man new/xterm-327/xterm.man
--- old/xterm-326/xterm.man 2016-09-25 19:25:26.000000000 +0200
+++ new/xterm-327/xterm.man 2016-10-07 00:57:58.000000000 +0200
@@ -1,5 +1,5 @@
'\" t
-.\" $XTermId: xterm.man,v 1.689 2016/09/25 17:25:26 tom Exp $
+.\" $XTermId: xterm.man,v 1.690 2016/10/06 22:57:58 tom Exp $
.\"
.\" Copyright 1996-2015,2016 by Thomas E. Dickey
.\"
@@ -459,6 +459,12 @@
The
default is \*(``2\*(''.
.TP 8
+.BI \-baudrate " number"
+Set the line-speed, used to test the behavior of applications that
+use the line-speed when optimizing their output to the screen.
+The
+default is \*(``38400\*(''.
+.TP 8
.B +bc
turn off text cursor blinking.
This overrides the \fBcursorBlink\fR resource.
[View Less]
1
0