scm-commits June 2016

scm-commits@lists.fedoraproject.org

1 participants
40396 discussions

dcallagh pushed to python-unidiff (f23). "initial version"
by notifications＠fedoraproject.org 01 Jul '16

01 Jul '16

From 7a113e951e5254b1d04faf4a6a4e1b47e9fa4215 Mon Sep 17 00:00:00 2001 From: Dan Callaghan <dcallagh(a)redhat.com> Date: Fri, 17 Jun 2016 13:49:49 +1000 Subject: initial version --- .gitignore | 1 + ...on-t-install-tests-as-a-top-level-package.patch | 25 ++++++++ ...tools-console_scripts-for-usr-bin-unidiff.patch | 63 +++++++++++++++++++++ python-unidiff.spec | 66 ++++++++++++++++++++++ sources | 1 + 5 files changed, 156 insertions(+) create mode 100644 0001-don-t-install-tests-as-a-top-level-package.patch create mode 100644 0002-use-setuptools-console_scripts-for-usr-bin-unidiff.patch create mode 100644 python-unidiff.spec diff --git a/.gitignore b/.gitignore index e69de29..87cff53 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/unidiff-0.5.2.tar.gz diff --git a/0001-don-t-install-tests-as-a-top-level-package.patch b/0001-don-t-install-tests-as-a-top-level-package.patch new file mode 100644 index 0000000..63c8ee9 --- /dev/null +++ b/0001-don-t-install-tests-as-a-top-level-package.patch @@ -0,0 +1,25 @@ +From 8837cc03067f1729848483dc2e3ca50d2c17ebd2 Mon Sep 17 00:00:00 2001 +From: Dan Callaghan <dcallagh(a)redhat.com> +Date: Thu, 16 Jun 2016 16:27:10 +1000 +Subject: [PATCH 1/2] don't install tests as a top-level package + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 06aa068..54ca7b4 100644 +--- a/setup.py ++++ b/setup.py +@@ -16,7 +16,7 @@ + author_email='mbordese(a)gmail.com', + url='http://github.com/matiasb/python-unidiff', + license='MIT', +- packages=find_packages(), ++ packages=find_packages(exclude=['tests']), + scripts=['bin/unidiff'], + classifiers=[ + 'Intended Audience :: Developers', +-- +2.4.11 + diff --git a/0002-use-setuptools-console_scripts-for-usr-bin-unidiff.patch b/0002-use-setuptools-console_scripts-for-usr-bin-unidiff.patch new file mode 100644 index 0000000..c9b213a --- /dev/null +++ b/0002-use-setuptools-console_scripts-for-usr-bin-unidiff.patch @@ -0,0 +1,63 @@ +From 039b96217bcc92ea20268a9466caa42a9a8ce9c9 Mon Sep 17 00:00:00 2001 +From: Dan Callaghan <dcallagh(a)redhat.com> +Date: Thu, 16 Jun 2016 16:30:40 +1000 +Subject: [PATCH 2/2] use setuptools console_scripts for /usr/bin/unidiff + +--- + setup.py | 6 +++++- + bin/unidiff => unidiff/cli.py | 7 ++++--- + 2 files changed, 9 insertions(+), 4 deletions(-) + rename bin/unidiff => unidiff/cli.py (98%) + mode change 100755 => 100644 + +diff --git a/setup.py b/setup.py +index 54ca7b4..1359493 100644 +--- a/setup.py ++++ b/setup.py +@@ -17,7 +17,11 @@ + url='http://github.com/matiasb/python-unidiff', + license='MIT', + packages=find_packages(exclude=['tests']), +- scripts=['bin/unidiff'], ++ entry_points={ ++ 'console_scripts': [ ++ 'unidiff = unidiff.cli:main', ++ ], ++ }, + classifiers=[ + 'Intended Audience :: Developers', + 'Development Status :: 4 - Beta', +diff --git a/bin/unidiff b/unidiff/cli.py +old mode 100755 +new mode 100644 +similarity index 98% +rename from bin/unidiff +rename to unidiff/cli.py +index 084df6f..b879ee5 +--- a/bin/unidiff ++++ b/unidiff/cli.py +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + + from __future__ import print_function, unicode_literals + +@@ -30,8 +29,7 @@ def get_parser(): + help='if not specified, read diff data from stdin') + return parser + +- +-if __name__ == '__main__': ++def main(): + parser = get_parser() + args = parser.parse_args() + +@@ -66,3 +64,6 @@ def get_parser(): + len(patch.modified_files), len(patch.added_files), + len(patch.removed_files))) + print('Total: %d addition(s), %d deletion(s)' % (additions, deletions)) ++ ++if __name__ == '__main__': ++ main() +-- +2.4.11 + diff --git a/python-unidiff.spec b/python-unidiff.spec new file mode 100644 index 0000000..58298fb --- /dev/null +++ b/python-unidiff.spec @@ -0,0 +1,66 @@ +%global modname unidiff + +Name: python-%{modname} +Version: 0.5.2 +Release: 1%{?dist} +Summary: Python library to parse and interact with unified diffs (patches) +License: MIT +URL: http://github.com/matiasb/python-unidiff +Source0: http://pypi.python.org/packages/source/u/%{modname}/%{modname}-%{version}.t… +BuildArch: noarch +BuildRequires: python2-devel +BuildRequires: python2-nose +BuildRequires: python3-devel +BuildRequires: python3-nose +Patch1: 0001-don-t-install-tests-as-a-top-level-package.patch +Patch2: 0002-use-setuptools-console_scripts-for-usr-bin-unidiff.patch + +%description +%{name} is a %{summary}. + +%package -n python2-%{modname} +Summary: %{summary} + +%description -n python2-%{modname} +%{name} is a %{summary}. + +%package -n python3-%{modname} +Summary: %{summary} + +%description -n python3-%{modname} +%{name} is a %{summary}. + +%prep +%setup -q -n %{modname}-%{version} +%patch1 -p1 +%patch2 -p1 +rm -r unidiff.egg-info + +%build +%py2_build +%py3_build + +%install +%py2_install +%py3_install + +%check +# Tests fail due to missing samples directory: +# https://github.com/matiasb/python-unidiff/pull/23 +#%%{__python2} setup.py test +#%%{__python3} setup.py test + +%files -n python2-%{modname} +%doc README.md LICENSE +%{python2_sitelib}/%{modname} +%{python2_sitelib}/%{modname}*.egg-info + +%files -n python3-%{modname} +%doc README.md LICENSE +%{_bindir}/%{modname} +%{python3_sitelib}/%{modname} +%{python3_sitelib}/%{modname}*.egg-info + +%changelog +* Fri Jun 17 2016 Dan Callaghan <dcallagh(a)redhat.com> - 0.5.2-1 +- initial version diff --git a/sources b/sources index e69de29..7c303e1 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +20dd70ba5a35bc95bf869322d6852227 unidiff-0.5.2.tar.gz -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/python-unidiff.git/commit/?h=f23&id=7a11…

1 0

pstodulk uploaded gzip-1.8.tar.xz for gzip
by notifications＠fedoraproject.org 01 Jul '16

01 Jul '16

f7caabb65cddc1a4165b398009bd05b9 gzip-1.8.tar.xz http://pkgs.fedoraproject.org/lookaside/pkgs/gzip/gzip-1.8.tar.xz/md5/f7caa…

1 0

whot pushed to xorg-x11-server (f23). "Fix segfault caused by forced indicator update (#1335439)"
by notifications＠fedoraproject.org 01 Jul '16

01 Jul '16

From 80b50198d64d60dff3b6bb22d9e015cf76758784 Mon Sep 17 00:00:00 2001 From: Peter Hutterer <peter.hutterer(a)who-t.net> Date: Tue, 28 Jun 2016 11:52:39 +1000 Subject: Fix segfault caused by forced indicator update (#1335439) --- ...ause-to-the-xkb-indicator-update-after-a-.patch | 44 ++++++++++++++++++++++ xorg-x11-server.spec | 6 ++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 0001-xkb-add-a-cause-to-the-xkb-indicator-update-after-a-.patch diff --git a/0001-xkb-add-a-cause-to-the-xkb-indicator-update-after-a-.patch b/0001-xkb-add-a-cause-to-the-xkb-indicator-update-after-a-.patch new file mode 100644 index 0000000..252fd11 --- /dev/null +++ b/0001-xkb-add-a-cause-to-the-xkb-indicator-update-after-a-.patch @@ -0,0 +1,44 @@ +From ed4f5ebde487bda2b8bda4cb4a1455f41a7c2933 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue, 28 Jun 2016 11:42:41 +1000 +Subject: [PATCH xserver] xkb: add a cause to the xkb indicator update after a + keymap change + +Regression introduce by ac164e58870d which calls +XkbUpdateAllDeviceIndicators() with two NULL arguments. A few layers down into +the stack and we triggered a NULL-pointer dereference. In theory a NULL cause +is acceptable since we don't actually change modifier state here. Instead of +updating all places to check for NULL just set the cause to the client +request and go to the pub. + +https://bugs.freedesktop.org/show_bug.cgi?id=96384 + +Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> +--- + xkb/xkb.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/xkb/xkb.c b/xkb/xkb.c +index 3a6ad65..678f823 100644 +--- a/xkb/xkb.c ++++ b/xkb/xkb.c +@@ -5706,6 +5706,7 @@ ProcXkbGetKbdByName(ClientPtr client) + xkbGetGeometryReply grep = { 0 }; + XkbComponentNamesRec names = { 0 }; + XkbDescPtr xkb, new; ++ XkbEventCauseRec cause; + unsigned char *str; + char mapFile[PATH_MAX]; + unsigned len; +@@ -6016,7 +6017,8 @@ ProcXkbGetKbdByName(ClientPtr client) + new = NULL; + } + XkbFreeComponentNames(&names, FALSE); +- XkbUpdateAllDeviceIndicators(NULL, NULL); ++ XkbSetCauseXkbReq(&cause, X_kbGetKbdByName, client); ++ XkbUpdateAllDeviceIndicators(NULL, &cause); + + return Success; + } +-- +2.7.4 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 64a1fdb..27d4fc2 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -45,7 +45,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.18.3 -Release: 2%{?gitdate:.%{gitdate}}%{dist} +Release: 3%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -102,6 +102,7 @@ Patch10003: 0002-present-Fix-presentation-of-flips-out-of-order.patch # Bug 1047151 - Numlock LED incorrect after keyboard map switch Patch10004: 0001-xkb-after-changing-the-keymap-force-an-indicator-upd.patch +Patch10005: 0001-xkb-add-a-cause-to-the-xkb-indicator-update-after-a-.patch %global moduledir %{_libdir}/xorg/modules %global drimoduledir %{_libdir}/dri @@ -640,6 +641,9 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %changelog +* Tue Jun 28 2016 Peter Hutterer <peter.hutterer(a)redhat.com> 1.18.3-5 +- Fix segfault caused by forced indicator update (#1335439) + * Thu May 05 2016 Peter Hutterer <peter.hutterer(a)redhat.com> 1.18.3-2 - Fix NumLock indicator light turning off after (#1047151) -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/xorg-x11-server.git/commit/?h=f23&id=80b…

1 0

cfu pushed to jss (f24). "Resolves: rhbz #1221295 (..more)"
by notifications＠fedoraproject.org 01 Jul '16

01 Jul '16

From a4f88c44c09a19743f43699e1e7c970f4b370492 Mon Sep 17 00:00:00 2001 From: Christina Fu <cfu(a)redhat.com> Date: Thu, 30 Jun 2016 15:56:54 -0700 Subject: Resolves: rhbz #1221295 * Bugzilla Bug #1221295 - jss fails to decode EncryptedKey >> EnvelopedData (cfu for roysjosh(a)gmail.com) --- jss-crmf-envelopedData.patch | 33 +++++++++++++++++++++++++++++++++ jss.spec | 8 +++++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 jss-crmf-envelopedData.patch diff --git a/jss-crmf-envelopedData.patch b/jss-crmf-envelopedData.patch new file mode 100644 index 0000000..13c21d7 --- /dev/null +++ b/jss-crmf-envelopedData.patch @@ -0,0 +1,33 @@ +diff -up jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkix/crmf/EncryptedKey.java.roysjosh jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkix/crmf/EncryptedKey.java +--- jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkix/crmf/EncryptedKey.java.roysjosh 2016-06-24 14:51:48.929122053 -0700 ++++ jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkix/crmf/EncryptedKey.java 2016-06-24 14:52:29.487027005 -0700 +@@ -127,7 +127,8 @@ public class EncryptedKey implements ASN + } else { + Assert._assert(type == ENVELOPED_DATA); + Assert._assert(envelopedData != null); +- envelopedData.encode(implicitTag, ostream); ++ EXPLICIT explicit = new EXPLICIT( new Tag(0), envelopedData ); ++ explicit.encode(tag, ostream); + } + } + +@@ -147,7 +148,9 @@ public class EncryptedKey implements ASN + choicet = new CHOICE.Template(); + + choicet.addElement( EncryptedValue.getTemplate() ); +- choicet.addElement( new Tag(0), ANY.getTemplate() ); ++ choicet.addElement( new EXPLICIT.Template( ++ new Tag(0), ++ ANY.getTemplate() )); + } + + public boolean tagMatch(Tag tag) { +@@ -164,7 +167,7 @@ public class EncryptedKey implements ASN + return new EncryptedKey( (EncryptedValue) choice.getValue() ); + } else { + Assert._assert( choice.getTag().equals(new Tag(0)) ); +- return new EncryptedKey( (ANY) choice.getValue() ); ++ return new EncryptedKey( (ANY) ((EXPLICIT) choice.getValue()).getContent() ); + } + + } catch(InvalidBERException e) { diff --git a/jss.spec b/jss.spec index b44a83f..cc15c1c 100644 --- a/jss.spec +++ b/jss.spec @@ -1,6 +1,6 @@ Name: jss Version: 4.2.6 -Release: 40%{?dist} +Release: 41%{?dist} Summary: Java Security Services (JSS) Group: System Environment/Libraries @@ -52,6 +52,7 @@ Patch27: jss-Fixed-build-failures.patch Patch28: jss-VerifyCertificate-enhancement.patch Patch29: jss-lunasaUnwrap.patch Patch30: jss-symkey-enhancements.patch +Patch31: jss-crmf-envelopedData.patch %description @@ -99,6 +100,7 @@ This package contains the API documentation for JSS. %patch28 -p1 %patch29 -p1 %patch30 -p1 +%patch31 -p1 %build [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java @@ -203,6 +205,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jun 24 2016 Christina Fu <cfu(a)redhat.com> - 4.2.6-41 +- Bugzilla 1221295 jss fails to decode EncryptedKey >> EnvelopedData + (cfu for roysjosh(a)gmail.com) + * Thu May 19 2016 Christina Fu <cfu(a)redhat.com> - 4.2.6-40 - Bugzilla 1074208 - pass up exact JSS certificate validation errors from NSS (edewata) -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/jss.git/commit/?h=f24&id=a4f88c44c09a197…

1 0

dcallagh uploaded unidiff-0.5.2.tar.gz for python-unidiff
by notifications＠fedoraproject.org 01 Jul '16

01 Jul '16

20dd70ba5a35bc95bf869322d6852227 unidiff-0.5.2.tar.gz http://pkgs.fedoraproject.org/lookaside/pkgs/python-unidiff/unidiff-0.5.2.t…

1 0

dcallagh pushed to python-unidiff (master). "initial version"
by notifications＠fedoraproject.org 01 Jul '16

01 Jul '16

1 0

dcallagh pushed to python-unidiff (master). "use %license and %python_provide, wrap %description"
by notifications＠fedoraproject.org 01 Jul '16

01 Jul '16

From 80c310b85e1e6df82340883ed892e504ff680004 Mon Sep 17 00:00:00 2001 From: Dan Callaghan <dcallagh(a)redhat.com> Date: Wed, 29 Jun 2016 12:09:02 +1000 Subject: use %license and %python_provide, wrap %description --- python-unidiff.spec | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/python-unidiff.spec b/python-unidiff.spec index 58298fb..63d56a8 100644 --- a/python-unidiff.spec +++ b/python-unidiff.spec @@ -2,7 +2,7 @@ Name: python-%{modname} Version: 0.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python library to parse and interact with unified diffs (patches) License: MIT URL: http://github.com/matiasb/python-unidiff @@ -16,19 +16,24 @@ Patch1: 0001-don-t-install-tests-as-a-top-level-package.patch Patch2: 0002-use-setuptools-console_scripts-for-usr-bin-unidiff.patch %description -%{name} is a %{summary}. +python-unidiff is a Python library to parse and interact with unified diffs +(patches). %package -n python2-%{modname} +%{?python_provide:%python_provide python2-%{modname}} Summary: %{summary} %description -n python2-%{modname} -%{name} is a %{summary}. +python-unidiff is a Python library to parse and interact with unified diffs +(patches). %package -n python3-%{modname} +%{?python_provide:%python_provide python3-%{modname}} Summary: %{summary} %description -n python3-%{modname} -%{name} is a %{summary}. +python-unidiff is a Python library to parse and interact with unified diffs +(patches). %prep %setup -q -n %{modname}-%{version} @@ -51,16 +56,21 @@ rm -r unidiff.egg-info #%%{__python3} setup.py test %files -n python2-%{modname} -%doc README.md LICENSE +%license LICENSE +%doc README.md %{python2_sitelib}/%{modname} %{python2_sitelib}/%{modname}*.egg-info %files -n python3-%{modname} -%doc README.md LICENSE +%license LICENSE +%doc README.md %{_bindir}/%{modname} %{python3_sitelib}/%{modname} %{python3_sitelib}/%{modname}*.egg-info %changelog +* Wed Jun 29 2016 Dan Callaghan <dcallagh(a)redhat.com> - 0.5.2-2 +- use %%license and %%python_provide, wrap %%description + * Fri Jun 17 2016 Dan Callaghan <dcallagh(a)redhat.com> - 0.5.2-1 - initial version -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/python-unidiff.git/commit/?h=master&id=8…

1 0

heffer pushed to openttd (f22). "1.6.1: Commit sources file (..more)"
by notifications＠fedoraproject.org 01 Jul '16

01 Jul '16

From f42039b3f44809c31bd252b0a5feadb0e3c19f5e Mon Sep 17 00:00:00 2001 From: Felix Kaechele <heffer(a)fedoraproject.org> Date: Thu, 30 Jun 2016 15:14:37 -0700 Subject: 1.6.1: Commit sources file Signed-off-by: Felix Kaechele <heffer(a)fedoraproject.org> --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e522205..1511d3f 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ openttd-1.0.3-source.tar.bz2 /openttd-1.5.2-source.tar.xz /openttd-1.5.3-source.tar.xz /openttd-1.6.0-source.tar.xz +/openttd-1.6.1-source.tar.xz diff --git a/sources b/sources index b6ac92d..c03d22d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fa712ce66d059260c510c4d0adbd68b6 openttd-1.6.0-source.tar.xz +420c0488d2b085a1879ae2325e558310 openttd-1.6.1-source.tar.xz -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/openttd.git/commit/?h=f22&id=f42039b3f44…

1 0

heffer pushed to openttd (f22). "update to 1.6.1 (..more)"
by notifications＠fedoraproject.org 01 Jul '16

01 Jul '16

From 5bec2560486f4d23f5f5e919b74b6e8ff9209719 Mon Sep 17 00:00:00 2001 From: Felix Kaechele <heffer(a)fedoraproject.org> Date: Thu, 30 Jun 2016 15:08:18 -0700 Subject: update to 1.6.1 - drop GCC 6 patch --- openttd-1.5.3-gcc6.patch | 11 ----------- openttd.spec | 8 +++++--- 2 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 openttd-1.5.3-gcc6.patch diff --git a/openttd-1.5.3-gcc6.patch b/openttd-1.5.3-gcc6.patch deleted file mode 100644 index 65d9991..0000000 --- a/openttd-1.5.3-gcc6.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openttd-1.5.3/src/safeguards.h.orig 2016-02-02 16:21:10.378533175 +0000 -+++ openttd-1.5.3/src/safeguards.h 2016-02-02 16:21:15.269555568 +0000 -@@ -21,6 +21,8 @@ - #ifndef SAFEGUARDS_H - #define SAFEGUARDS_H - -+#include <stdlib.h> -+ - /* Use MallocT instead. */ - #define malloc SAFEGUARD_DO_NOT_USE_THIS_METHOD - diff --git a/openttd.spec b/openttd.spec index b63fb44..ee70291 100644 --- a/openttd.spec +++ b/openttd.spec @@ -2,7 +2,7 @@ #%%global prever RC1 Name: openttd -Version: 1.6.0 +Version: 1.6.1 Release: 1%{?prever}%{?dist} Summary: Transport system simulation game @@ -10,7 +10,6 @@ Group: Amusements/Games License: GPLv2 URL: http://www.openttd.org Source0: http://binaries.openttd.org/releases/%{version}%{?prever:-%{prever}}/%{name… -Patch0: openttd-1.5.3-gcc6.patch BuildRequires: desktop-file-utils, SDL-devel, libpng-devel, unzip, zlib-devel BuildRequires: fontconfig-devel, libtimidity-devel, libicu-devel, lzo-devel @@ -37,7 +36,6 @@ the AI. %prep %setup -q -n %{name}-%{version}%{?prever:-%{prever}} -%patch0 -p1 %build @@ -147,6 +145,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Thu Jun 30 2016 Felix Kaechele <heffer(a)fedoraproject.org> - 1.6.1-1 +- update to 1.6.1 +- drop GCC 6 patch + * Mon May 23 2016 Felix Kaechele <heffer(a)fedoraproject.org> - 1.6.0-1 - update to 1.6.0 -- cgit v0.12 http://pkgs.fedoraproject.org/cgit/openttd.git/commit/?h=f22&id=5bec2560486…

1 0

heffer pushed to openttd (f23). "1.6.1: Commit sources file (..more)"
by notifications＠fedoraproject.org 01 Jul '16

01 Jul '16

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits June 2016