Architecture specific change in rpms/bettercap.git
by githook-noreply＠fedoraproject.org
The package rpms/bettercap.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/bettercap.git/commit/?id=ac637a20....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit ac637a20d1f910825dbe392647e28088b8582648
Author: Germano Massullo <germano.massullo(a)gmail.com>
Date: Tue Sep 1 00:41:31 2020 +0200
Tried to replace ExcludeArch: s390 with ExcludeArch: s390x
diff --git a/bettercap.spec b/bettercap.spec
index 99d68f6..e6cbb26 100644
--- a/bettercap.spec
+++ b/bettercap.spec
@@ -19,7 +19,7 @@ MITM attacks.}
%global godocs ISSUE_TEMPLATE.md changelog.sh README.md
Name: bettercap
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Tool for 802.11, BLE and Ethernet reconnaissance and MITM attacks
License: GPLv3
@@ -28,7 +28,7 @@ Source0: %{gosource}
# Building is falling on s390x at the moment because of "
# following noarch package built differently on different architectures"
-ExcludeArch: s390
+ExcludeArch: s390x
BuildRequires: golang(github.com/adrianmo/go-nmea)
BuildRequires: golang(github.com/antchfx/jsonquery)
@@ -90,6 +90,9 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
%gopkgfiles
%changelog
+* Mon Aug 31 2020 Germano Massullo <germano.massullo(a)gmail.com> - 2.28-4
+- Tried to replace ExcludeArch: s390 with ExcludeArch: s390x
+
* Tue Aug 18 2020 Fabian Affolter <mail(a)fabian-affolter.ch> - 2.28-3
- Add feedback from build system
3 years, 7 months
- 1
- 0
Architecture specific change in rpms/moose.git
by githook-noreply＠fedoraproject.org
The package rpms/moose.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/moose.git/commit/?id=3690f664ddcd....
Change:
+%ifarch armv7hl
Thanks.
Full change:
============
commit 1f1b72f9407c8f80c2a9327d8b73ed8ece99c2a3
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Mon Aug 31 17:47:24 2020 +0100
undefine cmake macro for f<33
diff --git a/moose.spec b/moose.spec
index 2995c25..c89a433 100644
--- a/moose.spec
+++ b/moose.spec
@@ -1,10 +1,14 @@
+# for F < 33
+# If it isn't defined, undefine doesn't do anything, so no conditional required
+%undefine __cmake_in_source_build
+
#global commit 0e12e41b52deb8ea746bc760cddd6e100ca5cfd8
#global shortcommit %%(c=%{commit}; echo ${c:0:7})
Name: moose
Version: 3.1.5
%global codename chamcham
-Release: 3%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
+Release: 4%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
Summary: Multiscale Neuroscience and Systems Biology Simulator
License: GPLv3
URL: http://moose.ncbs.res.in/
@@ -144,6 +148,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -c \
%doc README.md
%changelog
+* Mon Aug 31 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.1.5-4
+- Undefine cmake macro for F < 33
+
* Sat Aug 29 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.1.5-3
- Update patch
commit 6de1186f34c0eb1c506c71dce45e6d814b6d57e5
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Mon Aug 31 17:26:59 2020 +0100
Add new upstream patch
diff --git a/665c532745987fb1c7a8fc2a9a57bffa330480b4.patch b/665c532745987fb1c7a8fc2a9a57bffa330480b4.patch
new file mode 100644
index 0000000..660b90f
--- /dev/null
+++ b/665c532745987fb1c7a8fc2a9a57bffa330480b4.patch
@@ -0,0 +1,36 @@
+From 665c532745987fb1c7a8fc2a9a57bffa330480b4 Mon Sep 17 00:00:00 2001
+From: Dilawar <dilawars(a)ncbs.res.in>
+Date: Sat, 29 Aug 2020 06:44:37 +0000
+Subject: [PATCH] A better fix to #419
+
+dict `locals_` is not Py_XINCREF anywhere that is why Py_XDECREF caused segfault.
+While `globals_` does not have this issue. In the previous fix https://github.com/BhallaLab/moose-core/pull/420/commits/c570f7c057f9c0ca...,
+I removed the `Py_XINCREF(globals_)` line as well which would cause memory leak.
+---
+ pymoose/PyRun.cpp | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/pymoose/PyRun.cpp b/pymoose/PyRun.cpp
+index 765226c453..d7d6a7974a 100644
+--- a/pymoose/PyRun.cpp
++++ b/pymoose/PyRun.cpp
+@@ -188,6 +188,7 @@ PyRun::PyRun():mode_(0), initstr_(""), runstr_(""),
+ cerr << "Could not initialize locals dict" << endl;
+ return;
+ }
++
+ PyObject * value = PyFloat_FromDouble(0.0);
+ if (!value && PyErr_Occurred()){
+ PyErr_Print();
+@@ -200,11 +201,7 @@ PyRun::PyRun():mode_(0), initstr_(""), runstr_(""),
+
+ PyRun::~PyRun()
+ {
+-#if 0
+- // Fixes to BhallaLab/moose-core#420
+ Py_XDECREF(globals_);
+- Py_XDECREF(locals_);
+-#endif
+ }
+
+ void PyRun::setRunString(string statement)
diff --git a/moose.spec b/moose.spec
index 346eed0..2995c25 100644
--- a/moose.spec
+++ b/moose.spec
@@ -4,7 +4,7 @@
Name: moose
Version: 3.1.5
%global codename chamcham
-Release: 2%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
+Release: 3%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
Summary: Multiscale Neuroscience and Systems Biology Simulator
License: GPLv3
URL: http://moose.ncbs.res.in/
@@ -17,8 +17,9 @@ Source0: https://github.com/BhallaLab/moose-core/archive/v%{version}.tar.
# Fix segfault on py3.9
# https://github.com/BhallaLab/moose-core/pull/420
Patch0: c570f7c057f9c0ca7360c82a8932bcb0df222da9.patch
+Patch1: 665c532745987fb1c7a8fc2a9a57bffa330480b4.patch
# ppc defines a different suffix which breaks the build
-Patch1: 0001-Use-.so-suffix-for-all-arches.patch
+Patch2: 0001-Use-.so-suffix-for-all-arches.patch
ExcludeArch: s390x
@@ -143,6 +144,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -c \
%doc README.md
%changelog
+* Sat Aug 29 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.1.5-3
+- Update patch
+
* Thu Aug 27 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.1.5-2
- Add patch to fix ppc build
- Disable lto on arm
commit 3690f664ddcd851b95f788db8a06c426e8352a2a
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Thu Aug 27 11:16:43 2020 +0100
Fix builds on arm and ppc
diff --git a/0001-Use-.so-suffix-for-all-arches.patch b/0001-Use-.so-suffix-for-all-arches.patch
new file mode 100644
index 0000000..ebaa985
--- /dev/null
+++ b/0001-Use-.so-suffix-for-all-arches.patch
@@ -0,0 +1,33 @@
+From bf5527190a3309176282a49f2fc302bfa551866a Mon Sep 17 00:00:00 2001
+From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur(a)gmail.com>
+Date: Thu, 27 Aug 2020 10:43:54 +0100
+Subject: [PATCH] Use .so suffix for all arches
+
+---
+ python/setup.cmake.py | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/python/setup.cmake.py b/python/setup.cmake.py
+index 17665e2cf..39637491c 100644
+--- a/python/setup.cmake.py
++++ b/python/setup.cmake.py
+@@ -30,16 +30,7 @@ with open(os.path.join(script_dir, 'VERSION'), 'r') as f:
+ version = f.read()
+ print('Got %s from VERSION file' % version)
+
+-# importlib is available only for python3. Since we build wheels, prefer .so
+-# extension. This way a wheel built by any python3.x will work with any python3.
+ suffix = '.so'
+-try:
+- import importlib.machinery
+- suffix = importlib.machinery.EXTENSION_SUFFIXES[-1]
+-except Exception as e:
+- print('[WARN] Failed to determine importlib suffix')
+- suffix = '.so'
+-assert (suffix)
+ print('[INFO] Suffix for python SO: %s' % suffix)
+
+ setup(
+--
+2.26.2
+
diff --git a/moose.spec b/moose.spec
index d3fb92a..346eed0 100644
--- a/moose.spec
+++ b/moose.spec
@@ -4,7 +4,7 @@
Name: moose
Version: 3.1.5
%global codename chamcham
-Release: 1%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
+Release: 2%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
Summary: Multiscale Neuroscience and Systems Biology Simulator
License: GPLv3
URL: http://moose.ncbs.res.in/
@@ -17,6 +17,8 @@ Source0: https://github.com/BhallaLab/moose-core/archive/v%{version}.tar.
# Fix segfault on py3.9
# https://github.com/BhallaLab/moose-core/pull/420
Patch0: c570f7c057f9c0ca7360c82a8932bcb0df222da9.patch
+# ppc defines a different suffix which breaks the build
+Patch1: 0001-Use-.so-suffix-for-all-arches.patch
ExcludeArch: s390x
@@ -76,6 +78,12 @@ sed -i 's/-O3//' CMakeLists.txt
%global py_setup setup.cmake.py
%build
+# On armv7 we get a failure with LTO.
+# Disable LTO for armv7
+%ifarch armv7hl
+%define _lto_cflags %{nil}
+%endif
+
cmake_opts=(
-DBUILD_SHARED_LIBS:BOOL=OFF
-DCMAKE_SKIP_RPATH:BOOL=ON
@@ -135,6 +143,10 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -c \
%doc README.md
%changelog
+* Thu Aug 27 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.1.5-2
+- Add patch to fix ppc build
+- Disable lto on arm
+
* Wed Aug 26 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.1.5-1
- Update to 3.1.5
- Use new cmake macros
commit 197248d69dcd2c60f4027536dc18b25820062eeb
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Thu Aug 27 09:57:56 2020 +0100
Update to 3.1.5
Also fixes bug with python 3.9
diff --git a/.gitignore b/.gitignore
index e8c81dd..68ab750 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/moose-0e12e41.tar.gz
/moose-3.1.3.tar.gz
/moose-core-3.1.4.tar.gz
+/moose-core-3.1.5.tar.gz
diff --git a/0001-Avoid-open-coded-strdup-that-cause-compilation-failu.patch b/0001-Avoid-open-coded-strdup-that-cause-compilation-failu.patch
deleted file mode 100644
index 0315707..0000000
--- a/0001-Avoid-open-coded-strdup-that-cause-compilation-failu.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From d30711511cc8ee21c49700c6593a8a18e3164126 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek(a)in.waw.pl>
-Date: Tue, 14 Aug 2018 14:58:00 +0200
-Subject: [PATCH] Avoid open-coded strdup that cause compilation failure with
- new gcc
-
-/builddir/build/BUILD/moose-3.1.3/moose-core/pymoose/moosemodule.cpp:2724:32: error: invalid conversion from 'const char*' to 'char*' [-fpermissive]
- strncpy(vec[currIndex].name,
----
- moose-core/pymoose/moosemodule.cpp | 13 ++++---------
- 1 file changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/moose-core/pymoose/moosemodule.cpp b/moose-core/pymoose/moosemodule.cpp
-index 62a9ea2eb8..7d002abe8e 100644
---- a/pymoose/moosemodule.cpp
-+++ b/pymoose/moosemodule.cpp
-@@ -2720,17 +2720,12 @@ int defineDestFinfos(const Cinfo * cinfo)
- PyGetSetDef destFieldGetSet;
- vec.push_back(destFieldGetSet);
-
-- vec[currIndex].name = (char*)calloc(name.size() + 1, sizeof(char));
-- strncpy(vec[currIndex].name,
-- const_cast<char*>(name.c_str()),
-- name.size());
--
-+ vec[currIndex].name = strdup(name.c_str());
- vec[currIndex].doc = (char*) "Destination field";
- vec[currIndex].get = (getter)moose_ObjId_get_destField_attr;
-- PyObject * args = PyTuple_New(1);
-- if (args == NULL)
-- {
-- cerr << "moosemodule.cpp: defineDestFinfos: Failed to allocate tuple" << endl;
-+ PyObject *args = PyTuple_New(1);
-+ if (!args || !vec[currIndex].name) {
-+ cerr << "moosemodule.cpp: defineDestFinfos: allocation failed\n";
- return 0;
- }
- PyTuple_SetItem(args, 0, PyString_FromString(name.c_str()));
diff --git a/0002-Avoid-open-coded-strdup-that-causes-a-warning.patch b/0002-Avoid-open-coded-strdup-that-causes-a-warning.patch
deleted file mode 100644
index 007292b..0000000
--- a/0002-Avoid-open-coded-strdup-that-causes-a-warning.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 7bff444a2b06a4a2ef5eb05f9206d0672f73053a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek(a)in.waw.pl>
-Date: Tue, 14 Aug 2018 15:57:54 +0200
-Subject: [PATCH] Avoid open-coded strdup that causes a warning
-
-/home/zbyszek/python/moose/moose-core/pymoose/mfield.cpp: In function 'int moose_Field_init(_Field*, PyObject*, PyObject*)':
-/home/zbyszek/python/moose/moose-core/pymoose/mfield.cpp:122:12: warning: 'char* strncpy(char*, const char*, size_t)' output truncated before terminating nul copying as many bytes from a string as its length [-Wstringop-truncation]
- strncpy(name, fieldName, size);
- ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~
-/home/zbyszek/python/moose/moose-core/pymoose/mfield.cpp:120:25: note: length computed here
- size_t size = strlen(fieldName);
- ~~~~~~^~~~~~~~~~~
-
-Add error handling while at it.
----
- moose-core/pymoose/mfield.cpp | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/moose-core/pymoose/mfield.cpp b/moose-core/pymoose/mfield.cpp
-index dd452890f2..e16837c741 100644
---- a/pymoose/mfield.cpp
-+++ b/pymoose/mfield.cpp
-@@ -116,11 +116,12 @@ int moose_Field_init(_Field * self, PyObject * args, PyObject * kwargs)
- }
- self->owner = ((_ObjId*)owner);
- Py_INCREF(self->owner);
-- ObjId tmp = ((_ObjId*)owner)->oid_;
-- size_t size = strlen(fieldName);
-- char * name = (char*)calloc(size+1, sizeof(char));
-- strncpy(name, fieldName, size);
-- self->name = name;
-+ self->name = strdup(fieldName);
-+ if (!self->name) {
-+ PyErr_NoMemory();
-+ return -1;
-+ }
-+
- // In earlier version I tried to deallocate the existing
- // self->name if it is not NULL. But it turns out that it
- // causes a SIGABRT. In any case it should not be an issue as
diff --git a/0003-Use-sys.executable-to-execute-test.-It-breaks-on-pyt.patch b/0003-Use-sys.executable-to-execute-test.-It-breaks-on-pyt.patch
deleted file mode 100644
index 36fd1d6..0000000
--- a/0003-Use-sys.executable-to-execute-test.-It-breaks-on-pyt.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 46b7e96a9bd8070b12738dd6a710974c5593e334 Mon Sep 17 00:00:00 2001
-From: Dilawar Singh <dilawars(a)ncbs.res.in>
-Date: Tue, 27 Mar 2018 10:45:48 +0530
-Subject: [PATCH] Use sys.executable to execute test. It breaks on python3.
-
----
- python/moose/moose_test.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/python/moose/moose_test.py b/python/moose/moose_test.py
-index e5f908bcfd..d295f53b8d 100644
---- a/python/moose/moose_test.py
-+++ b/python/moose/moose_test.py
-@@ -86,6 +86,9 @@ class Command(object):
- self.process.terminate()
- thread.join()
-
-+ if self.process.stderr is not None:
-+ _logger.warn( '%s' % self.process.stderr.read() )
-+
- return self.process.returncode
-
- def init_test_dir( ):
-@@ -115,7 +118,7 @@ def run_test( index, testfile, timeout, **kwargs):
- """
- global test_status_
- global total_
-- pyExec = os.environ.get( 'PYTHON_EXECUTABLE', '/usr/bin/python' )
-+ pyExec = os.environ.get( 'PYTHON_EXECUTABLE', sys.executable )
- cmd = Command( [ pyExec, testfile ] )
-
- ti = time.time( )
diff --git a/0004-Do-not-try-to-access-position-1-in-string.patch b/0004-Do-not-try-to-access-position-1-in-string.patch
deleted file mode 100644
index e8d9049..0000000
--- a/0004-Do-not-try-to-access-position-1-in-string.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From dc8dd21a4786a7e1e25c8a58fd2a6a3e330b6a6d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek(a)in.waw.pl>
-Date: Tue, 14 Aug 2018 17:59:09 +0200
-Subject: [PATCH] Do not try to access position -1 in string
-
-This ain't python ;(
----
- utility/strutil.cpp | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/utility/strutil.cpp b/utility/strutil.cpp
-index 643e3baf99..da2819d13f 100644
---- a/utility/strutil.cpp
-+++ b/utility/strutil.cpp
-@@ -72,20 +72,16 @@ std::string fix(const std::string userPath, const string& delimiters)
- string trimmedPath = trim(userPath, delimiters);
-
- string fixedPath;
-+ char prev = 0;
-
- // In this loop, we check if there are more than one '/' together. If yes,
- // then accept only first one and reject other.
- for(unsigned int i = 0; i < trimmedPath.size(); ++i)
- {
- const char c = trimmedPath[i];
-- if('/' == c)
-- {
-- if('/' != fixedPath[fixedPath.size()-1])
-- fixedPath.push_back(c);
-- }
-- else
-+ if(c != '/' || c != prev)
- fixedPath.push_back(c);
--
-+ prev = c;
- }
- return fixedPath;
- }
diff --git a/137e348313436782f8cf5eccc8e707ebbdc07170.patch b/137e348313436782f8cf5eccc8e707ebbdc07170.patch
deleted file mode 100644
index fea6e04..0000000
--- a/137e348313436782f8cf5eccc8e707ebbdc07170.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 137e348313436782f8cf5eccc8e707ebbdc07170 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek(a)in.waw.pl>
-Date: Fri, 27 Sep 2019 10:53:23 +0200
-Subject: [PATCH] neuroml: do not use "is" with strings
-
-This works, but only because of an implementation detail: short
-strings are interned as part of module code. But the rules are complicated
-and we should not rely on this.
-
-See http://guilload.com/python-string-interning/ for a nice writeup.
-
-Python3.8 now warns about this.
----
- python/moose/neuroml/MorphML.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/python/moose/neuroml/MorphML.py b/python/moose/neuroml/MorphML.py
-index 57b983cf83..42f774db33 100644
---- a/python/moose/neuroml/MorphML.py
-+++ b/python/moose/neuroml/MorphML.py
-@@ -585,7 +585,7 @@ def set_compartment_param(self, compartment, name, value, mechanismname):
- compartment.refractoryPeriod = value # compartment is a moose.LIF instance (intfire)
- elif name == 'g_refrac':
- _logger.info("SORRY, current moose.LIF doesn't support g_refrac.")
-- elif mechanismname is 'synapse': # synapse being added to the compartment
-+ elif mechanismname == 'synapse': # synapse being added to the compartment
- ## these are potential locations, we do not actually make synapses,
- ## unless the user has explicitly asked for it
- if self.createPotentialSynapses:
-@@ -595,7 +595,7 @@ def set_compartment_param(self, compartment, name, value, mechanismname):
- ## I assume below that compartment name has _segid at its end
- segid = compartment.name.split('_')[-1] # get segment id from compartment name
- self.segDict[segid][5].append(value)
-- elif mechanismname is 'spikegen': # spikegen being added to the compartment
-+ elif mechanismname == 'spikegen': # spikegen being added to the compartment
- ## these are potential locations, we do not actually make the spikegens.
- ## spikegens for different synapses can have different thresholds,
- ## hence include synapse_type in its name
diff --git a/c570f7c057f9c0ca7360c82a8932bcb0df222da9.patch b/c570f7c057f9c0ca7360c82a8932bcb0df222da9.patch
new file mode 100644
index 0000000..bb5bf38
--- /dev/null
+++ b/c570f7c057f9c0ca7360c82a8932bcb0df222da9.patch
@@ -0,0 +1,25 @@
+From c570f7c057f9c0ca7360c82a8932bcb0df222da9 Mon Sep 17 00:00:00 2001
+From: Dilawar Singh <dilawars(a)ncbs.res.in>
+Date: Wed, 26 Aug 2020 22:14:38 +0000
+Subject: [PATCH] Fixes to BhallaLab/moose-core#419
+
+---
+ pymoose/PyRun.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/pymoose/PyRun.cpp b/pymoose/PyRun.cpp
+index 73d88c0cf8..765226c453 100644
+--- a/pymoose/PyRun.cpp
++++ b/pymoose/PyRun.cpp
+@@ -200,8 +200,11 @@ PyRun::PyRun():mode_(0), initstr_(""), runstr_(""),
+
+ PyRun::~PyRun()
+ {
++#if 0
++ // Fixes to BhallaLab/moose-core#420
+ Py_XDECREF(globals_);
+ Py_XDECREF(locals_);
++#endif
+ }
+
+ void PyRun::setRunString(string statement)
diff --git a/moose.spec b/moose.spec
index 5fe740f..d3fb92a 100644
--- a/moose.spec
+++ b/moose.spec
@@ -1,11 +1,10 @@
-%global __cmake_in_source_build 1
#global commit 0e12e41b52deb8ea746bc760cddd6e100ca5cfd8
#global shortcommit %%(c=%{commit}; echo ${c:0:7})
Name: moose
-Version: 3.1.4
+Version: 3.1.5
%global codename chamcham
-Release: 15%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
+Release: 1%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
Summary: Multiscale Neuroscience and Systems Biology Simulator
License: GPLv3
URL: http://moose.ncbs.res.in/
@@ -15,18 +14,14 @@ Source0: https://github.com/BhallaLab/moose-core/archive/%{commit}.tar.gz
Source0: https://github.com/BhallaLab/moose-core/archive/v%{version}.tar.gz#/moose...
%endif
-# https://github.com/BhallaLab/moose-core/pull/282
-Patch0001: 0001-Avoid-open-coded-strdup-that-cause-compilation-failu.patch
-Patch0002: 0002-Avoid-open-coded-strdup-that-causes-a-warning.patch
-Patch0003: 0003-Use-sys.executable-to-execute-test.-It-breaks-on-pyt.patch
-Patch0004: 0004-Do-not-try-to-access-position-1-in-string.patch
-
-# https://github.com/BhallaLab/moose-core/pull/375
-Patch0005: https://github.com/BhallaLab/moose-core/pull/375/commits/137e348313436782...
+# Fix segfault on py3.9
+# https://github.com/BhallaLab/moose-core/pull/420
+Patch0: c570f7c057f9c0ca7360c82a8932bcb0df222da9.patch
ExcludeArch: s390x
BuildRequires: gcc-c++
+BuildRequires: git-core
BuildRequires: make
BuildRequires: cmake
BuildRequires: rsync
@@ -73,7 +68,10 @@ Requires: python3-lxml
This package contains the %{summary}.
%prep
-%autosetup -p1 -n moose-core-%{version}
+%autosetup -n moose-core-%{version} -S git
+
+# Remove O3 flag set in CMakeLists
+sed -i 's/-O3//' CMakeLists.txt
%global py_setup setup.cmake.py
@@ -91,20 +89,19 @@ cmake_opts=(
-DPYTHON_EXECUTABLE=%{__python3}
)
-mkdir -p build
-pushd build
CXXFLAGS="%optflags" \
-%cmake .. "${cmake_opts[@]}"
-%make_build VERBOSE=1
-cd python
+%cmake "${cmake_opts[@]}"
+%cmake_build
+
+pushd %{__cmake_builddir}/python
%py3_build
popd
%install
-install -vD build/moose.bin %{buildroot}%{_bindir}/moose
-install -vDt %{buildroot}%{_libdir}/ build/libmoose.so
+install -vD %{__cmake_builddir}/moose.bin %{buildroot}%{_bindir}/moose
+install -vDt %{buildroot}%{_libdir}/ %{__cmake_builddir}/libmoose.so
-pushd build/python
+pushd %{__cmake_builddir}/python
%py3_install \--install-lib=%{python3_sitearch}
# this is necessary for the dependency generator to work
chmod +x %{buildroot}%{python3_sitearch}/moose/_moose*.so
@@ -113,9 +110,10 @@ popd
%check
checksec --file=%{buildroot}%{_bindir}/moose
-pushd build
+pushd %{__cmake_builddir}
# test_streamer fails randomly when quitting moose every once in a while.
-ctest --output-on-failure -V -E test_streamer
+ctest --output-on-failure -V -E 'test_streamer'
+# ctest --output-on-failure -V -E 'test_streamer|test_pyrun'
popd
PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -c \
@@ -137,6 +135,11 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -c \
%doc README.md
%changelog
+* Wed Aug 26 2020 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 3.1.5-1
+- Update to 3.1.5
+- Use new cmake macros
+- Include patch to fix on Py3.9
+
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.4-15
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index b3f32b6..d55b231 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (moose-core-3.1.4.tar.gz) = 7b98d8bbc89e3ddf26753cf307b5b5ed32946055452c7cec02d7fef3294bb0d70e94f2e31b9631acb44e31cae9873cbdce190339328993966c3453674caa86d0
+SHA512 (moose-core-3.1.5.tar.gz) = 49036145438a81839b52b4342265faaa9bae187ac5770c5db40d63af7fe8c3abb79eb152527d2474d8636da05476d1ad620f49a23a656798c171e989a50537f2
commit 77c3e6dac1ed09235378120dff3c35f577c32443
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Aug 1 04:33:59 2020 +0000
- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/moose.spec b/moose.spec
index 6f9f579..5fe740f 100644
--- a/moose.spec
+++ b/moose.spec
@@ -5,7 +5,7 @@
Name: moose
Version: 3.1.4
%global codename chamcham
-Release: 14%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
+Release: 15%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
Summary: Multiscale Neuroscience and Systems Biology Simulator
License: GPLv3
URL: http://moose.ncbs.res.in/
@@ -137,6 +137,10 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -c \
%doc README.md
%changelog
+* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.4-15
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.4-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 1b0092cff1f819bf70824d4b91ac8b27a8bceaa7
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jul 28 08:25:11 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/moose.spec b/moose.spec
index 21f6ce2..6f9f579 100644
--- a/moose.spec
+++ b/moose.spec
@@ -5,7 +5,7 @@
Name: moose
Version: 3.1.4
%global codename chamcham
-Release: 13%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
+Release: 14%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
Summary: Multiscale Neuroscience and Systems Biology Simulator
License: GPLv3
URL: http://moose.ncbs.res.in/
@@ -137,6 +137,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -c \
%doc README.md
%changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.4-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Fri Jul 24 2020 Jeff Law <law(a)redhat.com> - 3.1.4-13
- Use __cmake_in_source_build
commit deebe0f7633abcdb7b468f8399086f858ac9faef
Author: Jeff Law <law(a)redhat.com>
Date: Fri Jul 24 09:43:46 2020 -0600
Use __cmake_in_source_build
diff --git a/moose.spec b/moose.spec
index b8232b9..21f6ce2 100644
--- a/moose.spec
+++ b/moose.spec
@@ -1,10 +1,11 @@
+%global __cmake_in_source_build 1
#global commit 0e12e41b52deb8ea746bc760cddd6e100ca5cfd8
#global shortcommit %%(c=%{commit}; echo ${c:0:7})
Name: moose
Version: 3.1.4
%global codename chamcham
-Release: 12%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
+Release: 13%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
Summary: Multiscale Neuroscience and Systems Biology Simulator
License: GPLv3
URL: http://moose.ncbs.res.in/
@@ -136,6 +137,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -c \
%doc README.md
%changelog
+* Fri Jul 24 2020 Jeff Law <law(a)redhat.com> - 3.1.4-13
+- Use __cmake_in_source_build
+
* Thu Jun 25 2020 Orion Poplawski <orion(a)cora.nwra.com> - 3.1.4-12
- Rebuild for hdf5 1.10.6
commit 816408cce4fad877276f78eca5e56991f0c3a004
Author: Orion Poplawski <orion(a)nwra.com>
Date: Thu Jun 25 14:24:21 2020 -0600
Rebuild for hdf5 1.10.6
diff --git a/moose.spec b/moose.spec
index 443ec9a..b8232b9 100644
--- a/moose.spec
+++ b/moose.spec
@@ -4,7 +4,7 @@
Name: moose
Version: 3.1.4
%global codename chamcham
-Release: 11%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
+Release: 12%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
Summary: Multiscale Neuroscience and Systems Biology Simulator
License: GPLv3
URL: http://moose.ncbs.res.in/
@@ -136,6 +136,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -c \
%doc README.md
%changelog
+* Thu Jun 25 2020 Orion Poplawski <orion(a)cora.nwra.com> - 3.1.4-12
+- Rebuild for hdf5 1.10.6
+
* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 3.1.4-11
- Rebuilt for Python 3.9
commit 955524aafca30162ee086666324ed7e6d23d9007
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Tue May 26 02:53:27 2020 +0200
Rebuilt for Python 3.9
diff --git a/moose.spec b/moose.spec
index 883a2ae..443ec9a 100644
--- a/moose.spec
+++ b/moose.spec
@@ -4,7 +4,7 @@
Name: moose
Version: 3.1.4
%global codename chamcham
-Release: 10%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
+Release: 11%{?dist}%{?prerelease:.%{prerelease}}%{?commit:.git%{shortcommit}}
Summary: Multiscale Neuroscience and Systems Biology Simulator
License: GPLv3
URL: http://moose.ncbs.res.in/
@@ -136,6 +136,9 @@ PYTHONPATH=%{buildroot}%{python3_sitearch} %{__python3} -c \
%doc README.md
%changelog
+* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 3.1.4-11
+- Rebuilt for Python 3.9
+
* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.4-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
3 years, 7 months
- 1
- 0
Architecture specific change in rpms/coq.git
by githook-noreply＠fedoraproject.org
The package rpms/coq.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/coq.git/commit/?id=0e164ec5d36796....
Change:
-%ifarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit 0e164ec5d3679677f62c9ad3dd30470d6dc3fb65
Author: Jerry James <loganjerry(a)gmail.com>
Date: Mon Aug 31 08:50:18 2020 -0600
Version 8.12.0.
- Build with dune.
- Add coqide-server subpackage.
- Unbundle fonts from the documentation.
diff --git a/0001-Sphinx-3-support.patch b/0001-Sphinx-3-support.patch
index adb2625..aba5c89 100644
--- a/0001-Sphinx-3-support.patch
+++ b/0001-Sphinx-3-support.patch
@@ -1,33 +1,6 @@
--- a/doc/tools/coqrst/coqdomain.py
+++ b/doc/tools/coqrst/coqdomain.py
-@@ -21,6 +21,7 @@ from itertools import chain
- from collections import defaultdict
-
- from docutils import nodes, utils
-+from docutils.nodes import math_block
- from docutils.transforms import Transform
- from docutils.parsers.rst import Directive, directives
- from docutils.parsers.rst.roles import code_role #, set_classes
-@@ -34,7 +35,6 @@ from sphinx.util.logging import getLogge
- from sphinx.directives import ObjectDescription
- from sphinx.domains import Domain, ObjType, Index
- from sphinx.domains.std import token_xrefs
--from sphinx.ext import mathbase
-
- from . import coqdoc
- from .repl import ansicolors
-@@ -74,8 +74,8 @@ def make_target(objtype, targetid):
- return "coq:{}.{}".format(objtype, targetid)
-
- def make_math_node(latex, docname, nowrap):
-- node = mathbase.displaymath()
-- node['latex'] = latex
-+ node = math_block()
-+ node['text'] = latex
- node['label'] = None # Otherwise equations are numbered
- node['nowrap'] = nowrap
- node['docname'] = docname
-@@ -1249,11 +1249,11 @@ def setup(app):
+@@ -1418,11 +1418,11 @@ def setup(app):
app.connect('doctree-resolved', CoqtopBlocksTransform.merge_consecutive_coqtop_blocks)
# Add extra styles
diff --git a/coq.spec b/coq.spec
index a922966..4e9e94a 100644
--- a/coq.spec
+++ b/coq.spec
@@ -2,7 +2,6 @@
%global camlsuffix opt
%else
%global camlsuffix byte
-%global debug_package %{nil}
%endif
# .coqide-gtk2rc produces an rpmlint warning due to its name,
@@ -12,8 +11,8 @@
%global _python_bytecompile_extra 0
Name: coq
-Version: 8.11.2
-Release: 5%{?dist}
+Version: 8.12.0
+Release: 1%{?dist}
Summary: Proof management system
License: LGPLv2
@@ -27,17 +26,22 @@ Source3: coqide.appdata.xml
Patch0: 0001-Sphinx-3-support.patch
BuildRequires: ocaml >= 4.08.0
+BuildRequires: ocaml-dune
BuildRequires: ocaml-findlib
BuildRequires: ocaml-lablgtk3-devel >= 3.0
BuildRequires: ocaml-lablgtk3-sourceview3-devel >= 3.0
BuildRequires: ocaml-num-devel
+BuildRequires: ocaml-ocamldoc
+BuildRequires: ocaml-ounit-devel
BuildRequires: csdp-tools
BuildRequires: desktop-file-utils
BuildRequires: libicns-utils
+BuildRequires: rsync
BuildRequires: time
# For documentation
BuildRequires: antlr4
+BuildRequires: fontconfig
BuildRequires: hevea
BuildRequires: latexmk
BuildRequires: python3-devel
@@ -79,9 +83,6 @@ Requires: texlive-base
Recommends: emacs-proofgeneral
-# Exclude 3 private ocaml interfaces that we don't Provide
-%global __requires_exclude ocaml\\\((Configwin_types|Interface|Richpp)\\\)
-
# These can be removed when Fedora 30 reaches EOL
Obsoletes: %{name}-emacs < 8.9.0-1
Provides: %{name}-emacs = %{version}-%{release}
@@ -93,15 +94,26 @@ together with an environment for semi-interactive development of
machine-checked proofs.}
%description %_desc
- Typical applications include the certification
-of properties of programming languages (e.g. the CompCert compiler
-certification project, or the Bedrock verified low-level programming
-library), the formalization of mathematics (e.g. the full formalization
-of the Feit-Thompson theorem or homotopy type theory) and teaching.
+
+Typical applications include the certification of properties of
+programming languages (e.g. the CompCert compiler certification project,
+or the Bedrock verified low-level programming library), the formalization
+of mathematics (e.g. the full formalization of the Feit-Thompson theorem
+or homotopy type theory) and teaching.
+
+%package coqide-server
+Summary: The coqidetop language server
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description coqide-server %_desc
+
+This package provides the coqidetop language server, an implementation of
+Coq's XML protocol which allows clients, such as CoqIDE, to interact with
+Coq in a structured way.
%package coqide
Summary: Coqide IDE for Coq proof management system
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-coqide-server%{?_isa} = %{version}-%{release}
Requires: hicolor-icon-theme
Requires: xdg-utils
@@ -114,6 +126,10 @@ development of interactive proofs.
Summary: Documentation for Coq proof management system
License: Open Publication and LGPLv2+
BuildArch: noarch
+Requires: fontawesome-fonts-web
+Requires: font(fontawesome)
+Requires: font(lato)
+Requires: font(robotoslab)
%description doc %_desc
@@ -133,20 +149,16 @@ fixtimestamp() {
rm -f $1.orig
}
-# Fix a Makefile rule that causes installation to fail
-sed -ri '/FULLCONFIGDIR/s/OLDROOT|COQINSTALLPREFIX/&2/g' Makefile.install
-
-# Use Fedora compiler and linker flags. Fix broken CAML_LD_LIBRARY_PATH.
+# Use Fedora compiler and linker flags
sed -e 's|-Wall.*-O2|%{optflags} -Wno-unused|' \
-e "s|-lunix|& -ccopt '$RPM_LD_FLAGS'|" \
- -e "s|'%s/kernel/byterun'|%s/kernel/byterun|" \
-i configure.ml
# Make sure debuginfo is generated
sed -i 's,-shared,& -g,g' tools/CoqMakefile.in Makefile.build
# Do not invoke env
-for f in dev/tools/update-compat.py doc/tools/coqrst/notations/fontsupport.py;
+for f in doc/tools/coqrst/notations/fontsupport.py;
do
sed -i.orig 's,/usr/bin/env python2,%{python3},' $f
fixtimestamp $f
@@ -156,7 +168,13 @@ for f in $(grep -Frl '%{_bindir}/env'); do
fixtimestamp $f
done
-%build
+# Update the oUnit name
+sed -i 's/oUnit/ounit2/' test-suite/Makefile
+
+# Work around a bad path
+sed -i.orig "s,-q,& --coqlib_path $PWD/_build/default," doc/stdlib/dune
+
+# Change dune's configure invocation
%ifarch %{ocaml_native_compiler}
%global opt_option -native-compiler yes -natdynlink yes -coqide opt
%else
@@ -164,50 +182,80 @@ done
%endif
%global coqdocdir %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/coq-%{version}}
-%global coqdatadir %{_libdir}/coq
-
-./configure -prefix %{_prefix} \
- -libdir %{coqdatadir} \
- -bindir %{_bindir} \
- -mandir %{_mandir} \
- -docdir %{coqdocdir} \
- -configdir %{_sysconfdir}/xdg/%{name} \
- -coqdocdir %{_texmf_main}/tex/latex \
- %{opt_option} \
- -browser "xdg-open %s" \
- -with-doc yes
+sed -i 's,-native-compiler no,-prefix %{_prefix} -libdir %{_libdir}/ocaml/coq -docdir %{coqdocdir} -configdir %{_sysconfdir}/xdg/%{name} -coqdocdir %{_texmf_main}/tex/latex/misc %{opt_option} -browser "xdg-open %s" -with-doc yes,' config/dune
+
+%build
# Regenerate ANTLR files
cd doc/tools/coqrst/notations
antlr4 -Dlanguage=Python3 -visitor -no-listener TacticNotations.g
cd -
-export LD_LIBRARY_PATH=%{_libdir}/ocaml/stublibs
-export CAML_LD_LIBRARY_PATH=$PWD/kernel/byterun:${CAML_LD_LIBRARY_PATH}
-export SPHINXWARNERROR=0
+export SPHINXWARNOPT="-w$PWD/sphinx-warn.log"
+dune build %{?_smp_mflags}
+
+# Relink the stublib with RPM_LD_FLAGS
+cd _build/default/kernel/byterun
+ocamlmklib -g -ldopt "$RPM_LD_FLAGS" -o byterun_stubs $(ar t libbyterun_stubs.a)
+cd -
-# Gross hack to work around intermittent build failures. See
-# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
-# for details. Revert to a single make invocation once the problem is
-# identified and fixed.
-make world VERBOSE=1 || make world VERBOSE=1 || make world VERBOSE=1
+# Undo the bad path workaround now that we're done
+mv doc/stdlib/dune.orig doc/stdlib/dune
%install
-make COQINSTALLPREFIX="%{buildroot}%{_prefix}" OLDROOT="%{_prefix}" \
- COQINSTALLPREFIX2="%{buildroot}%{_sysconfdir}" OLDROOT2="%{_sysconfdir}" \
- install
+# Installing with dune fails due to https://github.com/ocaml/dune/issues/1868.
+# We fake dune out by telling it not to install documentation, install, then
+# put the original file back.
+cp -p _build/default/coq-doc.install _build/default/coq-doc.install.orig
+chmod u+w _build/default/coq-doc.install
+sed -ri '/(html|pdf)/d' _build/default/coq-doc.install
+dune install --destdir=%{buildroot}
+mv _build/default/coq-doc.install.orig _build/default/coq-doc.install
# Fix permissions
-if [ -e %{buildroot}%{coqdatadir}/kernel/byterun/dllcoqrun.so ]; then
- chmod a+x %{buildroot}%{coqdatadir}/kernel/byterun/dllcoqrun.so
-fi
+%ifarch %{ocaml_native_compiler}
+find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+
+%endif
+chmod a+x %{buildroot}%{_libdir}/ocaml/coq/tools/make*.py
+
+# Install the LaTeX style file
+mkdir -p %{buildroot}%{_texmf_main}/tex/latex/misc
+cp -p tools/coqdoc/coqdoc.sty %{buildroot}%{_texmf_main}/tex/latex/misc
+
+# Make a directory for site-wide configuration files
+mkdir -p %{buildroot}%{_sysconfdir}/xdg/coq
-# Use hardlinks rather than copying binaries
+# We install the documentation with the doc macro
+rm -fr %{buildroot}%{_prefix}/doc
+
+# Prepare the documentation for installation
+cp -Lpr _build/install/default/doc/coq-doc/html html
+find html -name .buildinfo -o -name .doctrees -exec rm -fr {} \+
+
+# Do not bundle fonts into the documentation
+cd html/refman/_static/fonts
+for suffix in eot svg ttf woff woff2; do
+ rm fontawesome-webfont.$suffix
+ ln -s %{_datadir}/fonts/fontawesome/fontawesome-webfont.$suffix .
+done
+rm {Lato,RobotoSlab}/*.ttf
+ln -s $(fc-match -f "%%{file}" "lato:bold") Lato/lato-bold.ttf
+ln -s $(fc-match -f "%%{file}" "lato:bold:italic") Lato/lato-bolditalic.ttf
+ln -s $(fc-match -f "%%{file}" "lato:italic") Lato/lato-italic.ttf
+ln -s $(fc-match -f "%%{file}" "lato") Lato/lato-regular.ttf
+ln -s $(fc-match -f "%%{file}" "robotoslab:bold") RobotoSlab/roboto-slab-v7-bold.ttf
+ln -s $(fc-match -f "%%{file}" "robotoslab") RobotoSlab/roboto-slab-v7-regular.ttf
+cd -
+
+# Use links rather than copying binaries
%ifarch %{ocaml_native_compiler}
-for fil in coqtop coqidetop; do
+for fil in coqtop; do
rm -f %{buildroot}%{_bindir}/$fil
- ln %{buildroot}%{_bindir}/$fil.opt %{buildroot}%{_bindir}/$fil
+ ln %{buildroot}%{_bindir}/$fil.%{camlsuffix} %{buildroot}%{_bindir}/$fil
done
+rm %{buildroot}%{_libdir}/ocaml/coq/user-contrib/Ltac2/ltac2_plugin.cmxs
+ln -s ../../plugins/ltac2/ltac2_plugin.cmxs \
+ %{buildroot}%{_libdir}/ocaml/coq/user-contrib/Ltac2
%endif
# Install desktop icons
@@ -231,57 +279,38 @@ install -pm 644 %{SOURCE3} %{buildroot}%{_datadir}/appdata
mkdir -p %{buildroot}%{_datadir}/mime/packages
cp -p %{SOURCE2} %{buildroot}%{_datadir}/mime/packages
-# Install main Coq .v files
-for f in `find plugins theories -name '*.v' -type f`; do
-mkdir -p %{buildroot}%{coqdatadir}/`dirname $f` && cp -p $f %{buildroot}%{coqdatadir}/`dirname $f`
-done
-
-# Install Ltac2 files missed by the makefiles
-cp -a user-contrib/Ltac2/.coq-native \
- %{buildroot}%{coqdatadir}/user-contrib/Ltac2
-
-# Install tutorial code
-%global tutorialcodedir %{coqdatadir}/RecTutorial
-if [ ! -d %{buildroot}%{tutorialcodedir} ]; then
- mkdir -p %{buildroot}%{tutorialcodedir}
-fi
-cp -p test-suite/success/RecTutorial.v %{buildroot}%{tutorialcodedir}
-
-# Install documentation not installed by install-doc in Makefile
-for f in dev/doc/changes.md CREDITS README.md;
-do cp -p $f %{buildroot}%{coqdocdir};
+# Install the language bindings
+mkdir -p %{buildroot}%{_datadir}/gtksourceview-3.0/language-specs
+for fil in coq.lang coq-ssreflect.lang; do
+ ln -s ../../coq/$fil %{buildroot}%{_datadir}/gtksourceview-3.0/language-specs
done
-# We don't need both PostScript and PDF documentation
-rm -fr %{buildroot}%{coqdocdir}/ps
-
-# We don't need a hidden Sphinx marker
-rm -f %{buildroot}%{coqdocdir}/sphinx/html/.buildinfo
+# Install the style file
+mkdir -p %{buildroot}%{_datadir}/gtksourceview-3.0/styles
+ln -s ../../coq/coq_style.xml %{buildroot}%{_datadir}/gtksourceview-3.0/styles
# Byte compile the tools
-%py_byte_compile %{python3} %{buildroot}%{coqdatadir}/tools
+%py_byte_compile %{python3} %{buildroot}%{_libdir}/ocaml/coq/tools
%files
-# DON'T use the doc macro here or else it wipes out all the other documentation installed!
+%doc CREDITS README.md dev/doc/changes.md
%license LICENSE
-%{coqdatadir}/
-%{_datadir}/%{name}/
-%{_bindir}/coqc
-%{_bindir}/coqchk
+%{_libdir}/ocaml/coq/
+%{_libdir}/ocaml/stublibs/dllbyterun_stubs.so
+%{_bindir}/coqc*
%{_bindir}/coqdep
%{_bindir}/coqdoc
-%{_bindir}/coqidetop
-%{_bindir}/coqidetop.%{camlsuffix}
%{_bindir}/coq_makefile
%{_bindir}/coqpp
%{_bindir}/coqproofworker.%{camlsuffix}
%{_bindir}/coqqueryworker.%{camlsuffix}
%{_bindir}/coqtacticworker.%{camlsuffix}
%{_bindir}/coq-tex
-%{_bindir}/coqtop
-%{_bindir}/coqtop.%{camlsuffix}
+%{_bindir}/coqtop*
%{_bindir}/coqwc
%{_bindir}/coqworkmgr
+%{_bindir}/csdpcert
+%{_bindir}/ocamllibdep
%{_bindir}/votour
%{_mandir}/man1/coqc.1*
%{_mandir}/man1/coqchk.1*
@@ -293,44 +322,44 @@ rm -f %{buildroot}%{coqdocdir}/sphinx/html/.buildinfo
%{_mandir}/man1/coqtop.byte.1*
%{_mandir}/man1/coqtop.opt.1*
%{_mandir}/man1/coqwc.1*
-%exclude %{coqdatadir}/ide/
-%ifarch %{ocaml_native_compiler}
-%exclude %{coqdatadir}/*/*.cmxa
-%exclude %{coqdatadir}/*/*.a
-%endif
-%{_texmf_main}/tex/latex/coqdoc.sty
-# A few documentation files here should stay in the main package (and
-# are excluded from doc), but the bulk of the documentation is in the
-# doc subpackage
-%dir %{coqdocdir}
-%{coqdocdir}/changes.md
-%{coqdocdir}/CREDITS
-%{coqdocdir}/README.md
+%{_texmf_main}/tex/latex/misc/
+# This should really go in the doc subpackage, but because it is installed in
+# an arch-specific path, it cannot be part of a noarch package.
+%{_libdir}/ocaml/coq-doc/
+
+%files coqide-server
+%{_bindir}/coqidetop*
+%{_bindir}/fake_ide
+%{_libdir}/ocaml/coqide-server/
%files coqide
%doc ide/FAQ
%{_bindir}/coqide
+%{_datadir}/%{name}/
%{_datadir}/icons/hicolor/16x16/apps/coq.png
%{_datadir}/icons/hicolor/32x32/apps/coq.png
%{_datadir}/icons/hicolor/256x256/apps/coq.png
%{_datadir}/icons/hicolor/512x512/apps/coq.png
%{_mandir}/man1/coqide.1*
-%{coqdatadir}/ide/
-%exclude %{coqdatadir}/ide/ide.cmxa
-%exclude %{coqdatadir}/ide/ide.a
+%{_libdir}/ocaml/coqide/
%{_datadir}/appdata/coqide.appdata.xml
%{_datadir}/applications/coqide.desktop
+%{_datadir}/gtksourceview-3.0/language-specs/coq*.lang
+%{_datadir}/gtksourceview-3.0/styles/coq_style.xml
%{_datadir}/mime/packages/coq.xml
%{_sysconfdir}/xdg/coq/
%files doc
+%doc doc/README.md html
%license doc/LICENSE
-%{coqdocdir}/*
-%exclude %{coqdocdir}/changes.md
-%exclude %{coqdocdir}/CREDITS
-%exclude %{coqdocdir}/README.md
%changelog
+* Mon Aug 31 2020 Jerry James <loganjerry(a)gmail.com> - 8.12.0-1
+- Version 8.12.0
+- Build with dune
+- Add coqide-server subpackage
+- Unbundle fonts from the documentation
+
* Fri Aug 21 2020 Richard W.M. Jones <rjones(a)redhat.com> - 8.11.2-5
- OCaml 4.11.0 rebuild
diff --git a/sources b/sources
index eeadba7..649943c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (coq-8.11.2.tar.gz) = f8ab307b8e39ffda5f6984e187c1f8de1cb6dec5c322726dbbe535ee611683cfeeb9cee3e11ad83f5e44e843fc51e7e2d50b4ea69ab42fde38aaf3d0cf2dea3c
+SHA512 (coq-8.12.0.tar.gz) = 8a64624c578ce0ab781fb3b1f162bd8b095735ad891fdad2fb7c40849afbdc7c1360187c6b62a5ef2982566f4c6c78029240c611ae769943a5250af300eb1240
3 years, 7 months
- 1
- 0
Architecture specific change in rpms/xrdp.git
by githook-noreply＠fedoraproject.org
The package rpms/xrdp.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/xrdp.git/commit/?id=9851eb23a1de4...
https://src.fedoraproject.org/cgit/rpms/xrdp.git/commit/?id=7e774ca02223b....
Change:
+ExcludeArch: s390x
-ExcludeArch: ppc64le s390x
Thanks.
Full change:
============
commit 9851eb23a1de4accd6113e680c8df7a73b9e6dda
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 22:36:47 2020 +1000
Exclude s390x arch for now, builds are failing strangely.
diff --git a/xrdp-0.9.14-vnc-rc.patch b/xrdp-0.9.14-vnc-rc.patch
deleted file mode 100644
index ea95d3b..0000000
--- a/xrdp-0.9.14-vnc-rc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN xrdp-0.9.14-v/vnc/vnc.c xrdp-0.9.14/vnc/vnc.c
---- xrdp-0.9.14-v/vnc/vnc.c 2020-08-26 12:32:22.000000000 +1000
-+++ xrdp-0.9.14/vnc/vnc.c 2020-08-31 22:17:02.664465069 +1000
-@@ -1423,7 +1423,7 @@
- {
- int error;
- struct vnc_screen_layout layout = {0};
-- int response_code;
-+ int response_code = -1;
-
- error = find_matching_extended_rect(v,
- rect_is_reply_to_us,
diff --git a/xrdp.spec b/xrdp.spec
index bf3b084..51f086a 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -34,7 +34,8 @@ Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch8: xrdp-0.9.14-fuse-pointer.patch
Patch9: xrdp-0.9.14-arch.patch
-Patch10: xrdp-0.9.14-vnc-rc.patch
+
+ExcludeArch: s390x
BuildRequires: gcc
BuildRequires: libX11-devel
@@ -284,6 +285,7 @@ fi
- Bump up to 0.9.14
- Add a set of patches to deal with new GCC warnings/errors
- Do not emit warning on failed architecture detection
+- Exclude s390x arch for now
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.9.13.1-3
- Second attempt - Rebuilt for
commit 7c2fbc794f0aff2870a441d05be0de51ddc5c75b
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 22:17:49 2020 +1000
Add patch for uninitialised return code (supposedly - only s390x).
diff --git a/xrdp-0.9.14-vnc-rc.patch b/xrdp-0.9.14-vnc-rc.patch
new file mode 100644
index 0000000..ea95d3b
--- /dev/null
+++ b/xrdp-0.9.14-vnc-rc.patch
@@ -0,0 +1,12 @@
+diff -ruN xrdp-0.9.14-v/vnc/vnc.c xrdp-0.9.14/vnc/vnc.c
+--- xrdp-0.9.14-v/vnc/vnc.c 2020-08-26 12:32:22.000000000 +1000
++++ xrdp-0.9.14/vnc/vnc.c 2020-08-31 22:17:02.664465069 +1000
+@@ -1423,7 +1423,7 @@
+ {
+ int error;
+ struct vnc_screen_layout layout = {0};
+- int response_code;
++ int response_code = -1;
+
+ error = find_matching_extended_rect(v,
+ rect_is_reply_to_us,
diff --git a/xrdp.spec b/xrdp.spec
index 4f2cd6e..bf3b084 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -34,6 +34,7 @@ Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch8: xrdp-0.9.14-fuse-pointer.patch
Patch9: xrdp-0.9.14-arch.patch
+Patch10: xrdp-0.9.14-vnc-rc.patch
BuildRequires: gcc
BuildRequires: libX11-devel
commit 7e774ca02223b853a6ecf002496f922fe3fe0f9c
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 22:06:13 2020 +1000
Add patch to disable CPP warning when arch is not detected.
diff --git a/xrdp-0.9.14-arch.patch b/xrdp-0.9.14-arch.patch
new file mode 100644
index 0000000..c5ea0ca
--- /dev/null
+++ b/xrdp-0.9.14-arch.patch
@@ -0,0 +1,12 @@
+diff -ruN xrdp-0.9.14-v/common/arch.h xrdp-0.9.14/common/arch.h
+--- xrdp-0.9.14-v/common/arch.h 2020-06-26 21:13:58.000000000 +1000
++++ xrdp-0.9.14/common/arch.h 2020-08-31 22:03:28.387464109 +1000
+@@ -86,8 +86,6 @@
+ defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \
+ defined(__i386__) || defined(__aarch64__)
+ #define NO_NEED_ALIGN
+-#else
+-#warning unknown arch
+ #endif
+ #endif
+
diff --git a/xrdp.spec b/xrdp.spec
index 5a29349..4f2cd6e 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -13,7 +13,7 @@ Summary: Open source remote desktop protocol (RDP) server
Name: xrdp
Epoch: 1
Version: 0.9.14
-Release: 1%{?dist}
+Release: 2%{?dist}
License: ASL 2.0 and GPLv2+ and MIT
URL: http://www.xrdp.org/
Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%...
@@ -33,10 +33,7 @@ Patch5: xrdp-0.9.6-script-interpreter.patch
Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch8: xrdp-0.9.14-fuse-pointer.patch
-
-%if 0%{?fedora} >= 34
-ExcludeArch: ppc64le s390x
-%endif
+Patch9: xrdp-0.9.14-arch.patch
BuildRequires: gcc
BuildRequires: libX11-devel
@@ -282,8 +279,10 @@ fi
%{_datadir}/selinux/*/%{name}.pp
%changelog
-* Mon Aug 31 2020 Bojan Smojver <bojan(a)rexurive.com> - 1:0.9.14-1
+* Mon Aug 31 2020 Bojan Smojver <bojan(a)rexurive.com> - 1:0.9.14-2
- Bump up to 0.9.14
+- Add a set of patches to deal with new GCC warnings/errors
+- Do not emit warning on failed architecture detection
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.9.13.1-3
- Second attempt - Rebuilt for
3 years, 7 months
- 1
- 0
Architecture specific change in rpms/xrdp.git
by githook-noreply＠fedoraproject.org
The package rpms/xrdp.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/xrdp.git/commit/?id=9851eb23a1de4...
https://src.fedoraproject.org/cgit/rpms/xrdp.git/commit/?id=7e774ca02223b....
Change:
+ExcludeArch: s390x
-ExcludeArch: ppc64le s390x
Thanks.
Full change:
============
commit 9851eb23a1de4accd6113e680c8df7a73b9e6dda
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 22:36:47 2020 +1000
Exclude s390x arch for now, builds are failing strangely.
diff --git a/xrdp-0.9.14-vnc-rc.patch b/xrdp-0.9.14-vnc-rc.patch
deleted file mode 100644
index ea95d3b..0000000
--- a/xrdp-0.9.14-vnc-rc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN xrdp-0.9.14-v/vnc/vnc.c xrdp-0.9.14/vnc/vnc.c
---- xrdp-0.9.14-v/vnc/vnc.c 2020-08-26 12:32:22.000000000 +1000
-+++ xrdp-0.9.14/vnc/vnc.c 2020-08-31 22:17:02.664465069 +1000
-@@ -1423,7 +1423,7 @@
- {
- int error;
- struct vnc_screen_layout layout = {0};
-- int response_code;
-+ int response_code = -1;
-
- error = find_matching_extended_rect(v,
- rect_is_reply_to_us,
diff --git a/xrdp.spec b/xrdp.spec
index bf3b084..51f086a 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -34,7 +34,8 @@ Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch8: xrdp-0.9.14-fuse-pointer.patch
Patch9: xrdp-0.9.14-arch.patch
-Patch10: xrdp-0.9.14-vnc-rc.patch
+
+ExcludeArch: s390x
BuildRequires: gcc
BuildRequires: libX11-devel
@@ -284,6 +285,7 @@ fi
- Bump up to 0.9.14
- Add a set of patches to deal with new GCC warnings/errors
- Do not emit warning on failed architecture detection
+- Exclude s390x arch for now
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.9.13.1-3
- Second attempt - Rebuilt for
commit 7c2fbc794f0aff2870a441d05be0de51ddc5c75b
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 22:17:49 2020 +1000
Add patch for uninitialised return code (supposedly - only s390x).
diff --git a/xrdp-0.9.14-vnc-rc.patch b/xrdp-0.9.14-vnc-rc.patch
new file mode 100644
index 0000000..ea95d3b
--- /dev/null
+++ b/xrdp-0.9.14-vnc-rc.patch
@@ -0,0 +1,12 @@
+diff -ruN xrdp-0.9.14-v/vnc/vnc.c xrdp-0.9.14/vnc/vnc.c
+--- xrdp-0.9.14-v/vnc/vnc.c 2020-08-26 12:32:22.000000000 +1000
++++ xrdp-0.9.14/vnc/vnc.c 2020-08-31 22:17:02.664465069 +1000
+@@ -1423,7 +1423,7 @@
+ {
+ int error;
+ struct vnc_screen_layout layout = {0};
+- int response_code;
++ int response_code = -1;
+
+ error = find_matching_extended_rect(v,
+ rect_is_reply_to_us,
diff --git a/xrdp.spec b/xrdp.spec
index 4f2cd6e..bf3b084 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -34,6 +34,7 @@ Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch8: xrdp-0.9.14-fuse-pointer.patch
Patch9: xrdp-0.9.14-arch.patch
+Patch10: xrdp-0.9.14-vnc-rc.patch
BuildRequires: gcc
BuildRequires: libX11-devel
commit 7e774ca02223b853a6ecf002496f922fe3fe0f9c
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 22:06:13 2020 +1000
Add patch to disable CPP warning when arch is not detected.
diff --git a/xrdp-0.9.14-arch.patch b/xrdp-0.9.14-arch.patch
new file mode 100644
index 0000000..c5ea0ca
--- /dev/null
+++ b/xrdp-0.9.14-arch.patch
@@ -0,0 +1,12 @@
+diff -ruN xrdp-0.9.14-v/common/arch.h xrdp-0.9.14/common/arch.h
+--- xrdp-0.9.14-v/common/arch.h 2020-06-26 21:13:58.000000000 +1000
++++ xrdp-0.9.14/common/arch.h 2020-08-31 22:03:28.387464109 +1000
+@@ -86,8 +86,6 @@
+ defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \
+ defined(__i386__) || defined(__aarch64__)
+ #define NO_NEED_ALIGN
+-#else
+-#warning unknown arch
+ #endif
+ #endif
+
diff --git a/xrdp.spec b/xrdp.spec
index 5a29349..4f2cd6e 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -13,7 +13,7 @@ Summary: Open source remote desktop protocol (RDP) server
Name: xrdp
Epoch: 1
Version: 0.9.14
-Release: 1%{?dist}
+Release: 2%{?dist}
License: ASL 2.0 and GPLv2+ and MIT
URL: http://www.xrdp.org/
Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%...
@@ -33,10 +33,7 @@ Patch5: xrdp-0.9.6-script-interpreter.patch
Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch8: xrdp-0.9.14-fuse-pointer.patch
-
-%if 0%{?fedora} >= 34
-ExcludeArch: ppc64le s390x
-%endif
+Patch9: xrdp-0.9.14-arch.patch
BuildRequires: gcc
BuildRequires: libX11-devel
@@ -282,8 +279,10 @@ fi
%{_datadir}/selinux/*/%{name}.pp
%changelog
-* Mon Aug 31 2020 Bojan Smojver <bojan(a)rexurive.com> - 1:0.9.14-1
+* Mon Aug 31 2020 Bojan Smojver <bojan(a)rexurive.com> - 1:0.9.14-2
- Bump up to 0.9.14
+- Add a set of patches to deal with new GCC warnings/errors
+- Do not emit warning on failed architecture detection
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.9.13.1-3
- Second attempt - Rebuilt for
3 years, 7 months
- 1
- 0
Architecture specific change in rpms/xrdp.git
by githook-noreply＠fedoraproject.org
The package rpms/xrdp.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/xrdp.git/commit/?id=9851eb23a1de4...
https://src.fedoraproject.org/cgit/rpms/xrdp.git/commit/?id=7e774ca02223b....
Change:
+ExcludeArch: s390x
-ExcludeArch: ppc64le s390x
Thanks.
Full change:
============
commit 9851eb23a1de4accd6113e680c8df7a73b9e6dda
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 22:36:47 2020 +1000
Exclude s390x arch for now, builds are failing strangely.
diff --git a/xrdp-0.9.14-vnc-rc.patch b/xrdp-0.9.14-vnc-rc.patch
deleted file mode 100644
index ea95d3b..0000000
--- a/xrdp-0.9.14-vnc-rc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN xrdp-0.9.14-v/vnc/vnc.c xrdp-0.9.14/vnc/vnc.c
---- xrdp-0.9.14-v/vnc/vnc.c 2020-08-26 12:32:22.000000000 +1000
-+++ xrdp-0.9.14/vnc/vnc.c 2020-08-31 22:17:02.664465069 +1000
-@@ -1423,7 +1423,7 @@
- {
- int error;
- struct vnc_screen_layout layout = {0};
-- int response_code;
-+ int response_code = -1;
-
- error = find_matching_extended_rect(v,
- rect_is_reply_to_us,
diff --git a/xrdp.spec b/xrdp.spec
index bf3b084..51f086a 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -34,7 +34,8 @@ Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch8: xrdp-0.9.14-fuse-pointer.patch
Patch9: xrdp-0.9.14-arch.patch
-Patch10: xrdp-0.9.14-vnc-rc.patch
+
+ExcludeArch: s390x
BuildRequires: gcc
BuildRequires: libX11-devel
@@ -284,6 +285,7 @@ fi
- Bump up to 0.9.14
- Add a set of patches to deal with new GCC warnings/errors
- Do not emit warning on failed architecture detection
+- Exclude s390x arch for now
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.9.13.1-3
- Second attempt - Rebuilt for
commit 7c2fbc794f0aff2870a441d05be0de51ddc5c75b
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 22:17:49 2020 +1000
Add patch for uninitialised return code (supposedly - only s390x).
diff --git a/xrdp-0.9.14-vnc-rc.patch b/xrdp-0.9.14-vnc-rc.patch
new file mode 100644
index 0000000..ea95d3b
--- /dev/null
+++ b/xrdp-0.9.14-vnc-rc.patch
@@ -0,0 +1,12 @@
+diff -ruN xrdp-0.9.14-v/vnc/vnc.c xrdp-0.9.14/vnc/vnc.c
+--- xrdp-0.9.14-v/vnc/vnc.c 2020-08-26 12:32:22.000000000 +1000
++++ xrdp-0.9.14/vnc/vnc.c 2020-08-31 22:17:02.664465069 +1000
+@@ -1423,7 +1423,7 @@
+ {
+ int error;
+ struct vnc_screen_layout layout = {0};
+- int response_code;
++ int response_code = -1;
+
+ error = find_matching_extended_rect(v,
+ rect_is_reply_to_us,
diff --git a/xrdp.spec b/xrdp.spec
index 4f2cd6e..bf3b084 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -34,6 +34,7 @@ Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch8: xrdp-0.9.14-fuse-pointer.patch
Patch9: xrdp-0.9.14-arch.patch
+Patch10: xrdp-0.9.14-vnc-rc.patch
BuildRequires: gcc
BuildRequires: libX11-devel
commit 7e774ca02223b853a6ecf002496f922fe3fe0f9c
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 22:06:13 2020 +1000
Add patch to disable CPP warning when arch is not detected.
diff --git a/xrdp-0.9.14-arch.patch b/xrdp-0.9.14-arch.patch
new file mode 100644
index 0000000..c5ea0ca
--- /dev/null
+++ b/xrdp-0.9.14-arch.patch
@@ -0,0 +1,12 @@
+diff -ruN xrdp-0.9.14-v/common/arch.h xrdp-0.9.14/common/arch.h
+--- xrdp-0.9.14-v/common/arch.h 2020-06-26 21:13:58.000000000 +1000
++++ xrdp-0.9.14/common/arch.h 2020-08-31 22:03:28.387464109 +1000
+@@ -86,8 +86,6 @@
+ defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \
+ defined(__i386__) || defined(__aarch64__)
+ #define NO_NEED_ALIGN
+-#else
+-#warning unknown arch
+ #endif
+ #endif
+
diff --git a/xrdp.spec b/xrdp.spec
index 5a29349..4f2cd6e 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -13,7 +13,7 @@ Summary: Open source remote desktop protocol (RDP) server
Name: xrdp
Epoch: 1
Version: 0.9.14
-Release: 1%{?dist}
+Release: 2%{?dist}
License: ASL 2.0 and GPLv2+ and MIT
URL: http://www.xrdp.org/
Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%...
@@ -33,10 +33,7 @@ Patch5: xrdp-0.9.6-script-interpreter.patch
Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch8: xrdp-0.9.14-fuse-pointer.patch
-
-%if 0%{?fedora} >= 34
-ExcludeArch: ppc64le s390x
-%endif
+Patch9: xrdp-0.9.14-arch.patch
BuildRequires: gcc
BuildRequires: libX11-devel
@@ -282,8 +279,10 @@ fi
%{_datadir}/selinux/*/%{name}.pp
%changelog
-* Mon Aug 31 2020 Bojan Smojver <bojan(a)rexurive.com> - 1:0.9.14-1
+* Mon Aug 31 2020 Bojan Smojver <bojan(a)rexurive.com> - 1:0.9.14-2
- Bump up to 0.9.14
+- Add a set of patches to deal with new GCC warnings/errors
+- Do not emit warning on failed architecture detection
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.9.13.1-3
- Second attempt - Rebuilt for
3 years, 7 months
- 1
- 0
Architecture specific change in rpms/xrdp.git
by githook-noreply＠fedoraproject.org
The package rpms/xrdp.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/xrdp.git/commit/?id=9851eb23a1de4....
Change:
+ExcludeArch: s390x
Thanks.
Full change:
============
commit 9851eb23a1de4accd6113e680c8df7a73b9e6dda
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 22:36:47 2020 +1000
Exclude s390x arch for now, builds are failing strangely.
diff --git a/xrdp-0.9.14-vnc-rc.patch b/xrdp-0.9.14-vnc-rc.patch
deleted file mode 100644
index ea95d3b..0000000
--- a/xrdp-0.9.14-vnc-rc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN xrdp-0.9.14-v/vnc/vnc.c xrdp-0.9.14/vnc/vnc.c
---- xrdp-0.9.14-v/vnc/vnc.c 2020-08-26 12:32:22.000000000 +1000
-+++ xrdp-0.9.14/vnc/vnc.c 2020-08-31 22:17:02.664465069 +1000
-@@ -1423,7 +1423,7 @@
- {
- int error;
- struct vnc_screen_layout layout = {0};
-- int response_code;
-+ int response_code = -1;
-
- error = find_matching_extended_rect(v,
- rect_is_reply_to_us,
diff --git a/xrdp.spec b/xrdp.spec
index bf3b084..51f086a 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -34,7 +34,8 @@ Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch8: xrdp-0.9.14-fuse-pointer.patch
Patch9: xrdp-0.9.14-arch.patch
-Patch10: xrdp-0.9.14-vnc-rc.patch
+
+ExcludeArch: s390x
BuildRequires: gcc
BuildRequires: libX11-devel
@@ -284,6 +285,7 @@ fi
- Bump up to 0.9.14
- Add a set of patches to deal with new GCC warnings/errors
- Do not emit warning on failed architecture detection
+- Exclude s390x arch for now
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.9.13.1-3
- Second attempt - Rebuilt for
3 years, 7 months
- 1
- 0
Architecture specific change in rpms/xrdp.git
by githook-noreply＠fedoraproject.org
The package rpms/xrdp.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/xrdp.git/commit/?id=7e774ca02223b....
Change:
-ExcludeArch: ppc64le s390x
Thanks.
Full change:
============
commit 7e774ca02223b853a6ecf002496f922fe3fe0f9c
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 22:06:13 2020 +1000
Add patch to disable CPP warning when arch is not detected.
diff --git a/xrdp-0.9.14-arch.patch b/xrdp-0.9.14-arch.patch
new file mode 100644
index 0000000..c5ea0ca
--- /dev/null
+++ b/xrdp-0.9.14-arch.patch
@@ -0,0 +1,12 @@
+diff -ruN xrdp-0.9.14-v/common/arch.h xrdp-0.9.14/common/arch.h
+--- xrdp-0.9.14-v/common/arch.h 2020-06-26 21:13:58.000000000 +1000
++++ xrdp-0.9.14/common/arch.h 2020-08-31 22:03:28.387464109 +1000
+@@ -86,8 +86,6 @@
+ defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \
+ defined(__i386__) || defined(__aarch64__)
+ #define NO_NEED_ALIGN
+-#else
+-#warning unknown arch
+ #endif
+ #endif
+
diff --git a/xrdp.spec b/xrdp.spec
index 5a29349..4f2cd6e 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -13,7 +13,7 @@ Summary: Open source remote desktop protocol (RDP) server
Name: xrdp
Epoch: 1
Version: 0.9.14
-Release: 1%{?dist}
+Release: 2%{?dist}
License: ASL 2.0 and GPLv2+ and MIT
URL: http://www.xrdp.org/
Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%...
@@ -33,10 +33,7 @@ Patch5: xrdp-0.9.6-script-interpreter.patch
Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch8: xrdp-0.9.14-fuse-pointer.patch
-
-%if 0%{?fedora} >= 34
-ExcludeArch: ppc64le s390x
-%endif
+Patch9: xrdp-0.9.14-arch.patch
BuildRequires: gcc
BuildRequires: libX11-devel
@@ -282,8 +279,10 @@ fi
%{_datadir}/selinux/*/%{name}.pp
%changelog
-* Mon Aug 31 2020 Bojan Smojver <bojan(a)rexurive.com> - 1:0.9.14-1
+* Mon Aug 31 2020 Bojan Smojver <bojan(a)rexurive.com> - 1:0.9.14-2
- Bump up to 0.9.14
+- Add a set of patches to deal with new GCC warnings/errors
+- Do not emit warning on failed architecture detection
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.9.13.1-3
- Second attempt - Rebuilt for
3 years, 7 months
- 1
- 0
Architecture specific change in rpms/xrdp.git
by githook-noreply＠fedoraproject.org
The package rpms/xrdp.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/xrdp.git/commit/?id=24c536a7243c1....
Change:
+ExcludeArch: ppc64le s390x
Thanks.
Full change:
============
commit 9f02eae37082d577ff0d440b511c478a2cbd17c5
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 21:54:13 2020 +1000
Only exclude s390x and ppc64le on Fedora 34 and above.
diff --git a/xrdp.spec b/xrdp.spec
index aa05ad5..5a29349 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -34,7 +34,9 @@ Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch8: xrdp-0.9.14-fuse-pointer.patch
+%if 0%{?fedora} >= 34
ExcludeArch: ppc64le s390x
+%endif
BuildRequires: gcc
BuildRequires: libX11-devel
commit 24c536a7243c1b73c36d311bb7a3bf5effd9099e
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 21:28:01 2020 +1000
Exclude ppc64le and s390x for now.
diff --git a/xrdp-0.9.14-arch.patch b/xrdp-0.9.14-arch.patch
deleted file mode 100644
index b2597c9..0000000
--- a/xrdp-0.9.14-arch.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN xrdp-0.9.14-v/common/arch.h xrdp-0.9.14/common/arch.h
---- xrdp-0.9.14-v/common/arch.h 2020-06-26 21:13:58.000000000 +1000
-+++ xrdp-0.9.14/common/arch.h 2020-08-31 20:50:39.860660903 +1000
-@@ -80,7 +80,8 @@
- defined(__AIX__) || defined(__mips__) || \
- defined(__ia64__) || defined(__arm__) || \
- (defined(__PPC__) && defined(__BIG_ENDIAN__)) || \
-- (defined(__ppc__) && defined(__BIG_ENDIAN__))
-+ (defined(__ppc__) && defined(__BIG_ENDIAN__)) || \
-+ defined(__ppc64__) || defined(__s390__)
- #define NEED_ALIGN
- #elif defined(__x86__) || defined(__x86_64__) || \
- defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \
diff --git a/xrdp.spec b/xrdp.spec
index 37b7589..aa05ad5 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -33,7 +33,8 @@ Patch5: xrdp-0.9.6-script-interpreter.patch
Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch8: xrdp-0.9.14-fuse-pointer.patch
-Patch9: xrdp-0.9.14-arch.patch
+
+ExcludeArch: ppc64le s390x
BuildRequires: gcc
BuildRequires: libX11-devel
commit 7a6ace4d323953bc947c3a592ff54abbede8d2b2
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 21:20:36 2020 +1000
Try slightly different arch macros.
diff --git a/xrdp-0.9.14-arch.patch b/xrdp-0.9.14-arch.patch
index cee81dc..b2597c9 100644
--- a/xrdp-0.9.14-arch.patch
+++ b/xrdp-0.9.14-arch.patch
@@ -7,7 +7,7 @@ diff -ruN xrdp-0.9.14-v/common/arch.h xrdp-0.9.14/common/arch.h
(defined(__PPC__) && defined(__BIG_ENDIAN__)) || \
- (defined(__ppc__) && defined(__BIG_ENDIAN__))
+ (defined(__ppc__) && defined(__BIG_ENDIAN__)) || \
-+ defined(__ppc64le__) || defined(__s390x__)
++ defined(__ppc64__) || defined(__s390__)
#define NEED_ALIGN
#elif defined(__x86__) || defined(__x86_64__) || \
defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \
commit aad790d02dcfae7790a51314b4353d04e09e89e9
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 20:57:54 2020 +1000
Fix missing bracket in arch patch.
diff --git a/xrdp-0.9.14-arch.patch b/xrdp-0.9.14-arch.patch
index af229b3..cee81dc 100644
--- a/xrdp-0.9.14-arch.patch
+++ b/xrdp-0.9.14-arch.patch
@@ -7,7 +7,7 @@ diff -ruN xrdp-0.9.14-v/common/arch.h xrdp-0.9.14/common/arch.h
(defined(__PPC__) && defined(__BIG_ENDIAN__)) || \
- (defined(__ppc__) && defined(__BIG_ENDIAN__))
+ (defined(__ppc__) && defined(__BIG_ENDIAN__)) || \
-+ defined(__ppc64le__ || defined(__s390x__)
++ defined(__ppc64le__) || defined(__s390x__)
#define NEED_ALIGN
#elif defined(__x86__) || defined(__x86_64__) || \
defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \
commit 751c5c3ced83c02f6cea7b4063a0df2b00578237
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 20:51:45 2020 +1000
Add ppc64le and s390x arch, as needing alignment (hopefully true).
diff --git a/xrdp-0.9.14-arch.patch b/xrdp-0.9.14-arch.patch
new file mode 100644
index 0000000..af229b3
--- /dev/null
+++ b/xrdp-0.9.14-arch.patch
@@ -0,0 +1,13 @@
+diff -ruN xrdp-0.9.14-v/common/arch.h xrdp-0.9.14/common/arch.h
+--- xrdp-0.9.14-v/common/arch.h 2020-06-26 21:13:58.000000000 +1000
++++ xrdp-0.9.14/common/arch.h 2020-08-31 20:50:39.860660903 +1000
+@@ -80,7 +80,8 @@
+ defined(__AIX__) || defined(__mips__) || \
+ defined(__ia64__) || defined(__arm__) || \
+ (defined(__PPC__) && defined(__BIG_ENDIAN__)) || \
+- (defined(__ppc__) && defined(__BIG_ENDIAN__))
++ (defined(__ppc__) && defined(__BIG_ENDIAN__)) || \
++ defined(__ppc64le__ || defined(__s390x__)
+ #define NEED_ALIGN
+ #elif defined(__x86__) || defined(__x86_64__) || \
+ defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \
diff --git a/xrdp.spec b/xrdp.spec
index 5462579..37b7589 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -33,6 +33,7 @@ Patch5: xrdp-0.9.6-script-interpreter.patch
Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch8: xrdp-0.9.14-fuse-pointer.patch
+Patch9: xrdp-0.9.14-arch.patch
BuildRequires: gcc
BuildRequires: libX11-devel
commit 717065fa31cfc63e054ceab0651880d987ec8a1c
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 20:26:23 2020 +1000
Fix patch numbering.
diff --git a/xrdp.spec b/xrdp.spec
index aea5530..5462579 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -32,7 +32,7 @@ Patch4: xrdp-0.9.10-scripts-libexec.patch
Patch5: xrdp-0.9.6-script-interpreter.patch
Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
-Patch7: xrdp-0.9.14-fuse-pointer.patch
+Patch8: xrdp-0.9.14-fuse-pointer.patch
BuildRequires: gcc
BuildRequires: libX11-devel
commit 7f91e143e3f3b90bc5409870cf1b2592826ad495
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 20:25:25 2020 +1000
Try to fix fuse pointer warnings.
diff --git a/xrdp-0.9.14-fuse-pointer.patch b/xrdp-0.9.14-fuse-pointer.patch
new file mode 100644
index 0000000..6e42d7a
--- /dev/null
+++ b/xrdp-0.9.14-fuse-pointer.patch
@@ -0,0 +1,39 @@
+diff -ruN xrdp-0.9.14-v/sesman/chansrv/chansrv_fuse.c xrdp-0.9.14/sesman/chansrv/chansrv_fuse.c
+--- xrdp-0.9.14-v/sesman/chansrv/chansrv_fuse.c 2020-06-26 21:13:58.000000000 +1000
++++ xrdp-0.9.14/sesman/chansrv/chansrv_fuse.c 2020-08-31 20:24:21.516983364 +1000
+@@ -1607,7 +1607,7 @@
+ log_error("inode %ld is not valid", ino);
+ fuse_reply_err(req, ENOENT);
+ }
+- else if ((dh = (struct xfs_dir_handle *) fi->fh) == NULL)
++ else if ((dh = (struct xfs_dir_handle *) (unsigned long)fi->fh) == NULL)
+ {
+ /* something seriously wrong somewhere! */
+ fuse_reply_buf(req, 0, 0);
+@@ -2095,7 +2095,7 @@
+
+ log_debug("want_bytes %zd bytes at off %lld", size, (long long) off);
+
+- if ((fh = (XFUSE_HANDLE *)fi->fh) == NULL)
++ if ((fh = (XFUSE_HANDLE *) (unsigned long)fi->fh) == NULL)
+ {
+ fuse_reply_err(req, EINVAL);
+ }
+@@ -2168,7 +2168,7 @@
+ log_debug("write %zd bytes at off %lld to inode=%ld",
+ size, (long long) off, ino);
+
+- if ((fh = (XFUSE_HANDLE *)fi->fh) == NULL)
++ if ((fh = (XFUSE_HANDLE *) (unsigned long)fi->fh) == NULL)
+ {
+ log_error("file handle fi->fh is NULL");
+ fuse_reply_err(req, EINVAL);
+@@ -2436,7 +2436,7 @@
+ static void xfuse_cb_releasedir(fuse_req_t req, fuse_ino_t ino,
+ struct fuse_file_info *fi)
+ {
+- struct xfs_dir_handle *dh = (struct xfs_dir_handle *) fi->fh;
++ struct xfs_dir_handle *dh = (struct xfs_dir_handle *) (unsigned long)fi->fh;
+ xfs_closedir(g_xfs, dh);
+ fuse_reply_err(req, 0);
+ }
diff --git a/xrdp.spec b/xrdp.spec
index a1ef5b9..aea5530 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -32,6 +32,7 @@ Patch4: xrdp-0.9.10-scripts-libexec.patch
Patch5: xrdp-0.9.6-script-interpreter.patch
Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
+Patch7: xrdp-0.9.14-fuse-pointer.patch
BuildRequires: gcc
BuildRequires: libX11-devel
commit eb5d092c15977f4a8831b73f4320ee9db1e37e28
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 19:56:40 2020 +1000
Add patch for mismatch of xfree_to_evdev declarations.
diff --git a/xrdp-0.9.14-xfree86-evdev.patch b/xrdp-0.9.14-xfree86-evdev.patch
new file mode 100644
index 0000000..6d2f0d8
--- /dev/null
+++ b/xrdp-0.9.14-xfree86-evdev.patch
@@ -0,0 +1,12 @@
+diff -ruN xrdp-0.9.14-v/genkeymap/genkeymap.c xrdp-0.9.14/genkeymap/genkeymap.c
+--- xrdp-0.9.14-v/genkeymap/genkeymap.c 2020-08-26 12:32:21.000000000 +1000
++++ xrdp-0.9.14/genkeymap/genkeymap.c 2020-08-31 19:55:04.773214339 +1000
+@@ -44,7 +44,7 @@
+ #include <X11/XKBlib.h>
+ #include <locale.h>
+
+-extern int xfree86_to_evdev[137-8];
++extern int xfree86_to_evdev[137-8+1];
+
+ int main(int argc, char **argv)
+ {
diff --git a/xrdp.spec b/xrdp.spec
index 95b1339..a1ef5b9 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -31,6 +31,7 @@ Patch3: xrdp-0.9.2-setpriv.patch
Patch4: xrdp-0.9.10-scripts-libexec.patch
Patch5: xrdp-0.9.6-script-interpreter.patch
Patch6: xrdp-0.9.14-log-snprintf.patch
+Patch7: xrdp-0.9.14-xfree86-evdev.patch
BuildRequires: gcc
BuildRequires: libX11-devel
commit b9f38139973e6a32f6c8caae7628428303dd37f0
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 19:47:59 2020 +1000
Adjust snprintf() log patch to use absolute values only.
diff --git a/xrdp-0.9.14-log-snprintf.patch b/xrdp-0.9.14-log-snprintf.patch
index 5b57019..41c5548 100644
--- a/xrdp-0.9.14-log-snprintf.patch
+++ b/xrdp-0.9.14-log-snprintf.patch
@@ -1,7 +1,7 @@
diff -ruN xrdp-0.9.14-v/common/log.c xrdp-0.9.14/common/log.c
--- xrdp-0.9.14-v/common/log.c 2020-08-26 12:32:21.000000000 +1000
-+++ xrdp-0.9.14/common/log.c 2020-08-31 19:23:06.347581743 +1000
-@@ -555,9 +555,10 @@
++++ xrdp-0.9.14/common/log.c 2020-08-31 19:47:18.283542606 +1000
+@@ -555,9 +555,11 @@
now_t = time(&now_t);
now = localtime(&now_t);
@@ -9,9 +9,10 @@ diff -ruN xrdp-0.9.14-v/common/log.c xrdp-0.9.14/common/log.c
- now->tm_mon + 1, now->tm_mday, now->tm_hour, now->tm_min,
- now->tm_sec);
+ snprintf(buff, 21, "[%.4d%.2d%.2d-%.2d:%.2d:%.2d] ",
-+ (now->tm_year + 1900) % 10000,
-+ (now->tm_mon + 1) % 100, now->tm_mday % 100, now->tm_hour % 100,
-+ now->tm_min % 100, now->tm_sec % 100);
++ abs((now->tm_year + 1900) % 10000),
++ abs((now->tm_mon + 1) % 100), abs(now->tm_mday % 100),
++ abs(now->tm_hour % 100), abs(now->tm_min % 100),
++ abs(now->tm_sec % 100));
internal_log_lvl2str(lvl, buff + 20);
commit 6c60f795c67ea67eeea7bee57da4fa218ed95792
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 19:24:54 2020 +1000
Add patch for snprintf() truncation in logging.
diff --git a/xrdp-0.9.14-log-snprintf.patch b/xrdp-0.9.14-log-snprintf.patch
new file mode 100644
index 0000000..5b57019
--- /dev/null
+++ b/xrdp-0.9.14-log-snprintf.patch
@@ -0,0 +1,17 @@
+diff -ruN xrdp-0.9.14-v/common/log.c xrdp-0.9.14/common/log.c
+--- xrdp-0.9.14-v/common/log.c 2020-08-26 12:32:21.000000000 +1000
++++ xrdp-0.9.14/common/log.c 2020-08-31 19:23:06.347581743 +1000
+@@ -555,9 +555,10 @@
+ now_t = time(&now_t);
+ now = localtime(&now_t);
+
+- snprintf(buff, 21, "[%.4d%.2d%.2d-%.2d:%.2d:%.2d] ", now->tm_year + 1900,
+- now->tm_mon + 1, now->tm_mday, now->tm_hour, now->tm_min,
+- now->tm_sec);
++ snprintf(buff, 21, "[%.4d%.2d%.2d-%.2d:%.2d:%.2d] ",
++ (now->tm_year + 1900) % 10000,
++ (now->tm_mon + 1) % 100, now->tm_mday % 100, now->tm_hour % 100,
++ now->tm_min % 100, now->tm_sec % 100);
+
+ internal_log_lvl2str(lvl, buff + 20);
+
diff --git a/xrdp.spec b/xrdp.spec
index e0d2f95..95b1339 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -30,6 +30,7 @@ Patch2: xrdp-0.9.4-service.patch
Patch3: xrdp-0.9.2-setpriv.patch
Patch4: xrdp-0.9.10-scripts-libexec.patch
Patch5: xrdp-0.9.6-script-interpreter.patch
+Patch6: xrdp-0.9.14-log-snprintf.patch
BuildRequires: gcc
BuildRequires: libX11-devel
commit 0698533d4023215d6ac1463cc6c597f51bcb4806
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 18:00:45 2020 +1000
Adjust patch version for xrdp.ini.
diff --git a/xrdp.spec b/xrdp.spec
index 6d18a49..e0d2f95 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -25,7 +25,7 @@ Source5: README.Fedora
Source6: xrdp.te
Source7: xrdp-polkit-1.rules
Patch0: xrdp-0.9.9-sesman.patch
-Patch1: xrdp-0.9.11-xrdp-ini.patch
+Patch1: xrdp-0.9.14-xrdp-ini.patch
Patch2: xrdp-0.9.4-service.patch
Patch3: xrdp-0.9.2-setpriv.patch
Patch4: xrdp-0.9.10-scripts-libexec.patch
commit 8dcc5c2dc5c47c86675d221c660aeac3da112c0f
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 18:00:01 2020 +1000
Clean up xrdp.ini patch.
diff --git a/xrdp-0.9.11-xrdp-ini.patch b/xrdp-0.9.14-xrdp-ini.patch
similarity index 81%
rename from xrdp-0.9.11-xrdp-ini.patch
rename to xrdp-0.9.14-xrdp-ini.patch
index 469f4d1..f592102 100644
--- a/xrdp-0.9.11-xrdp-ini.patch
+++ b/xrdp-0.9.14-xrdp-ini.patch
@@ -1,6 +1,6 @@
-diff -ruN xrdp-0.9.11-v/xrdp/xrdp.ini xrdp-0.9.11/xrdp/xrdp.ini
---- xrdp-0.9.11-v/xrdp/xrdp.ini 2019-08-20 01:41:37.000000000 +1000
-+++ xrdp-0.9.11/xrdp/xrdp.ini 2019-09-15 21:30:19.352135681 +1000
+diff -ruN xrdp-0.9.14-v/xrdp/xrdp.ini xrdp-0.9.14/xrdp/xrdp.ini
+--- xrdp-0.9.14-v/xrdp/xrdp.ini 2020-08-31 16:33:40.000000000 +1000
++++ xrdp-0.9.14/xrdp/xrdp.ini 2020-08-31 17:57:37.560243121 +1000
@@ -178,14 +178,14 @@
; Some session types such as Xorg, X11rdp and Xvnc start a display server.
; Startup command-line parameters for the display server are configured
@@ -24,9 +24,9 @@ diff -ruN xrdp-0.9.11-v/xrdp/xrdp.ini xrdp-0.9.11/xrdp/xrdp.ini
[Xvnc]
name=Xvnc
-@@ -197,25 +197,25 @@
- #xserverbpp=24
- #delay_ms=2000
+@@ -201,25 +201,25 @@
+ #disabled_encodings_mask=0
+
-[vnc-any]
-name=vnc-any
commit 19eec6ad1049929ccc3360fc1a9e6e05a044179f
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 17:53:43 2020 +1000
Bump up to 0.9.14.
diff --git a/.gitignore b/.gitignore
index d6074db..f5f8d8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ xrdp-cvs-03-17-2010.tar.gz
/xrdp-0.9.12.tar.gz
/xrdp-0.9.13.tar.gz
/xrdp-0.9.13.1.tar.gz
+/xrdp-0.9.14.tar.gz
diff --git a/sources b/sources
index 2dbd3c3..92eda94 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xrdp-0.9.13.1.tar.gz) = 36350aaf4bf4b49907cb31fd15c375a50a0d13d4b66aa14982c9d4da64212395391ff7e169def853337ef97960a109d6d7c85d510834fac44de12caed3632a26
+SHA512 (xrdp-0.9.14.tar.gz) = 5c0a8f8b25e8482ac871e227227c030521df5af2bb7ab0f5000888a02969aae8c275e7b9b1b1d42cb83ffd86e6dc1f9eef1b254bf3984f9a1eb48623bfb0a2ef
diff --git a/xrdp.spec b/xrdp.spec
index 1836e77..6d18a49 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -12,8 +12,8 @@
Summary: Open source remote desktop protocol (RDP) server
Name: xrdp
Epoch: 1
-Version: 0.9.13.1
-Release: 3%{?dist}
+Version: 0.9.14
+Release: 1%{?dist}
License: ASL 2.0 and GPLv2+ and MIT
URL: http://www.xrdp.org/
Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%...
@@ -275,6 +275,9 @@ fi
%{_datadir}/selinux/*/%{name}.pp
%changelog
+* Mon Aug 31 2020 Bojan Smojver <bojan(a)rexurive.com> - 1:0.9.14-1
+- Bump up to 0.9.14
+
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.9.13.1-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 9c711329715ab816cc449f119e49b1508fda1f0e
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Aug 1 09:48:22 2020 +0000
- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/xrdp.spec b/xrdp.spec
index a804f13..1836e77 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -13,7 +13,7 @@ Summary: Open source remote desktop protocol (RDP) server
Name: xrdp
Epoch: 1
Version: 0.9.13.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: ASL 2.0 and GPLv2+ and MIT
URL: http://www.xrdp.org/
Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%...
@@ -275,6 +275,10 @@ fi
%{_datadir}/selinux/*/%{name}.pp
%changelog
+* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.9.13.1-3
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.9.13.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 83bc43642cc17c02cf517feba71fa37623166fea
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 29 15:04:00 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/xrdp.spec b/xrdp.spec
index 4a9311c..a804f13 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -13,7 +13,7 @@ Summary: Open source remote desktop protocol (RDP) server
Name: xrdp
Epoch: 1
Version: 0.9.13.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: ASL 2.0 and GPLv2+ and MIT
URL: http://www.xrdp.org/
Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%...
@@ -275,6 +275,9 @@ fi
%{_datadir}/selinux/*/%{name}.pp
%changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.9.13.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Tue Jun 30 2020 Bojan Smojver <bojan(a)rexurive.com> - 1:0.9.13.1-1
- Bump up to 0.9.13.1
- CVE-2022-4044
3 years, 7 months
- 1
- 0
Architecture specific change in rpms/xrdp.git
by githook-noreply＠fedoraproject.org
The package rpms/xrdp.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/xrdp.git/commit/?id=24c536a7243c1....
Change:
+ExcludeArch: ppc64le s390x
Thanks.
Full change:
============
commit 9f02eae37082d577ff0d440b511c478a2cbd17c5
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 21:54:13 2020 +1000
Only exclude s390x and ppc64le on Fedora 34 and above.
diff --git a/xrdp.spec b/xrdp.spec
index aa05ad5..5a29349 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -34,7 +34,9 @@ Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch8: xrdp-0.9.14-fuse-pointer.patch
+%if 0%{?fedora} >= 34
ExcludeArch: ppc64le s390x
+%endif
BuildRequires: gcc
BuildRequires: libX11-devel
commit 24c536a7243c1b73c36d311bb7a3bf5effd9099e
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 21:28:01 2020 +1000
Exclude ppc64le and s390x for now.
diff --git a/xrdp-0.9.14-arch.patch b/xrdp-0.9.14-arch.patch
deleted file mode 100644
index b2597c9..0000000
--- a/xrdp-0.9.14-arch.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ruN xrdp-0.9.14-v/common/arch.h xrdp-0.9.14/common/arch.h
---- xrdp-0.9.14-v/common/arch.h 2020-06-26 21:13:58.000000000 +1000
-+++ xrdp-0.9.14/common/arch.h 2020-08-31 20:50:39.860660903 +1000
-@@ -80,7 +80,8 @@
- defined(__AIX__) || defined(__mips__) || \
- defined(__ia64__) || defined(__arm__) || \
- (defined(__PPC__) && defined(__BIG_ENDIAN__)) || \
-- (defined(__ppc__) && defined(__BIG_ENDIAN__))
-+ (defined(__ppc__) && defined(__BIG_ENDIAN__)) || \
-+ defined(__ppc64__) || defined(__s390__)
- #define NEED_ALIGN
- #elif defined(__x86__) || defined(__x86_64__) || \
- defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \
diff --git a/xrdp.spec b/xrdp.spec
index 37b7589..aa05ad5 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -33,7 +33,8 @@ Patch5: xrdp-0.9.6-script-interpreter.patch
Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch8: xrdp-0.9.14-fuse-pointer.patch
-Patch9: xrdp-0.9.14-arch.patch
+
+ExcludeArch: ppc64le s390x
BuildRequires: gcc
BuildRequires: libX11-devel
commit 7a6ace4d323953bc947c3a592ff54abbede8d2b2
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 21:20:36 2020 +1000
Try slightly different arch macros.
diff --git a/xrdp-0.9.14-arch.patch b/xrdp-0.9.14-arch.patch
index cee81dc..b2597c9 100644
--- a/xrdp-0.9.14-arch.patch
+++ b/xrdp-0.9.14-arch.patch
@@ -7,7 +7,7 @@ diff -ruN xrdp-0.9.14-v/common/arch.h xrdp-0.9.14/common/arch.h
(defined(__PPC__) && defined(__BIG_ENDIAN__)) || \
- (defined(__ppc__) && defined(__BIG_ENDIAN__))
+ (defined(__ppc__) && defined(__BIG_ENDIAN__)) || \
-+ defined(__ppc64le__) || defined(__s390x__)
++ defined(__ppc64__) || defined(__s390__)
#define NEED_ALIGN
#elif defined(__x86__) || defined(__x86_64__) || \
defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \
commit aad790d02dcfae7790a51314b4353d04e09e89e9
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 20:57:54 2020 +1000
Fix missing bracket in arch patch.
diff --git a/xrdp-0.9.14-arch.patch b/xrdp-0.9.14-arch.patch
index af229b3..cee81dc 100644
--- a/xrdp-0.9.14-arch.patch
+++ b/xrdp-0.9.14-arch.patch
@@ -7,7 +7,7 @@ diff -ruN xrdp-0.9.14-v/common/arch.h xrdp-0.9.14/common/arch.h
(defined(__PPC__) && defined(__BIG_ENDIAN__)) || \
- (defined(__ppc__) && defined(__BIG_ENDIAN__))
+ (defined(__ppc__) && defined(__BIG_ENDIAN__)) || \
-+ defined(__ppc64le__ || defined(__s390x__)
++ defined(__ppc64le__) || defined(__s390x__)
#define NEED_ALIGN
#elif defined(__x86__) || defined(__x86_64__) || \
defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \
commit 751c5c3ced83c02f6cea7b4063a0df2b00578237
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 20:51:45 2020 +1000
Add ppc64le and s390x arch, as needing alignment (hopefully true).
diff --git a/xrdp-0.9.14-arch.patch b/xrdp-0.9.14-arch.patch
new file mode 100644
index 0000000..af229b3
--- /dev/null
+++ b/xrdp-0.9.14-arch.patch
@@ -0,0 +1,13 @@
+diff -ruN xrdp-0.9.14-v/common/arch.h xrdp-0.9.14/common/arch.h
+--- xrdp-0.9.14-v/common/arch.h 2020-06-26 21:13:58.000000000 +1000
++++ xrdp-0.9.14/common/arch.h 2020-08-31 20:50:39.860660903 +1000
+@@ -80,7 +80,8 @@
+ defined(__AIX__) || defined(__mips__) || \
+ defined(__ia64__) || defined(__arm__) || \
+ (defined(__PPC__) && defined(__BIG_ENDIAN__)) || \
+- (defined(__ppc__) && defined(__BIG_ENDIAN__))
++ (defined(__ppc__) && defined(__BIG_ENDIAN__)) || \
++ defined(__ppc64le__ || defined(__s390x__)
+ #define NEED_ALIGN
+ #elif defined(__x86__) || defined(__x86_64__) || \
+ defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \
diff --git a/xrdp.spec b/xrdp.spec
index 5462579..37b7589 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -33,6 +33,7 @@ Patch5: xrdp-0.9.6-script-interpreter.patch
Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
Patch8: xrdp-0.9.14-fuse-pointer.patch
+Patch9: xrdp-0.9.14-arch.patch
BuildRequires: gcc
BuildRequires: libX11-devel
commit 717065fa31cfc63e054ceab0651880d987ec8a1c
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 20:26:23 2020 +1000
Fix patch numbering.
diff --git a/xrdp.spec b/xrdp.spec
index aea5530..5462579 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -32,7 +32,7 @@ Patch4: xrdp-0.9.10-scripts-libexec.patch
Patch5: xrdp-0.9.6-script-interpreter.patch
Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
-Patch7: xrdp-0.9.14-fuse-pointer.patch
+Patch8: xrdp-0.9.14-fuse-pointer.patch
BuildRequires: gcc
BuildRequires: libX11-devel
commit 7f91e143e3f3b90bc5409870cf1b2592826ad495
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 20:25:25 2020 +1000
Try to fix fuse pointer warnings.
diff --git a/xrdp-0.9.14-fuse-pointer.patch b/xrdp-0.9.14-fuse-pointer.patch
new file mode 100644
index 0000000..6e42d7a
--- /dev/null
+++ b/xrdp-0.9.14-fuse-pointer.patch
@@ -0,0 +1,39 @@
+diff -ruN xrdp-0.9.14-v/sesman/chansrv/chansrv_fuse.c xrdp-0.9.14/sesman/chansrv/chansrv_fuse.c
+--- xrdp-0.9.14-v/sesman/chansrv/chansrv_fuse.c 2020-06-26 21:13:58.000000000 +1000
++++ xrdp-0.9.14/sesman/chansrv/chansrv_fuse.c 2020-08-31 20:24:21.516983364 +1000
+@@ -1607,7 +1607,7 @@
+ log_error("inode %ld is not valid", ino);
+ fuse_reply_err(req, ENOENT);
+ }
+- else if ((dh = (struct xfs_dir_handle *) fi->fh) == NULL)
++ else if ((dh = (struct xfs_dir_handle *) (unsigned long)fi->fh) == NULL)
+ {
+ /* something seriously wrong somewhere! */
+ fuse_reply_buf(req, 0, 0);
+@@ -2095,7 +2095,7 @@
+
+ log_debug("want_bytes %zd bytes at off %lld", size, (long long) off);
+
+- if ((fh = (XFUSE_HANDLE *)fi->fh) == NULL)
++ if ((fh = (XFUSE_HANDLE *) (unsigned long)fi->fh) == NULL)
+ {
+ fuse_reply_err(req, EINVAL);
+ }
+@@ -2168,7 +2168,7 @@
+ log_debug("write %zd bytes at off %lld to inode=%ld",
+ size, (long long) off, ino);
+
+- if ((fh = (XFUSE_HANDLE *)fi->fh) == NULL)
++ if ((fh = (XFUSE_HANDLE *) (unsigned long)fi->fh) == NULL)
+ {
+ log_error("file handle fi->fh is NULL");
+ fuse_reply_err(req, EINVAL);
+@@ -2436,7 +2436,7 @@
+ static void xfuse_cb_releasedir(fuse_req_t req, fuse_ino_t ino,
+ struct fuse_file_info *fi)
+ {
+- struct xfs_dir_handle *dh = (struct xfs_dir_handle *) fi->fh;
++ struct xfs_dir_handle *dh = (struct xfs_dir_handle *) (unsigned long)fi->fh;
+ xfs_closedir(g_xfs, dh);
+ fuse_reply_err(req, 0);
+ }
diff --git a/xrdp.spec b/xrdp.spec
index a1ef5b9..aea5530 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -32,6 +32,7 @@ Patch4: xrdp-0.9.10-scripts-libexec.patch
Patch5: xrdp-0.9.6-script-interpreter.patch
Patch6: xrdp-0.9.14-log-snprintf.patch
Patch7: xrdp-0.9.14-xfree86-evdev.patch
+Patch7: xrdp-0.9.14-fuse-pointer.patch
BuildRequires: gcc
BuildRequires: libX11-devel
commit eb5d092c15977f4a8831b73f4320ee9db1e37e28
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 19:56:40 2020 +1000
Add patch for mismatch of xfree_to_evdev declarations.
diff --git a/xrdp-0.9.14-xfree86-evdev.patch b/xrdp-0.9.14-xfree86-evdev.patch
new file mode 100644
index 0000000..6d2f0d8
--- /dev/null
+++ b/xrdp-0.9.14-xfree86-evdev.patch
@@ -0,0 +1,12 @@
+diff -ruN xrdp-0.9.14-v/genkeymap/genkeymap.c xrdp-0.9.14/genkeymap/genkeymap.c
+--- xrdp-0.9.14-v/genkeymap/genkeymap.c 2020-08-26 12:32:21.000000000 +1000
++++ xrdp-0.9.14/genkeymap/genkeymap.c 2020-08-31 19:55:04.773214339 +1000
+@@ -44,7 +44,7 @@
+ #include <X11/XKBlib.h>
+ #include <locale.h>
+
+-extern int xfree86_to_evdev[137-8];
++extern int xfree86_to_evdev[137-8+1];
+
+ int main(int argc, char **argv)
+ {
diff --git a/xrdp.spec b/xrdp.spec
index 95b1339..a1ef5b9 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -31,6 +31,7 @@ Patch3: xrdp-0.9.2-setpriv.patch
Patch4: xrdp-0.9.10-scripts-libexec.patch
Patch5: xrdp-0.9.6-script-interpreter.patch
Patch6: xrdp-0.9.14-log-snprintf.patch
+Patch7: xrdp-0.9.14-xfree86-evdev.patch
BuildRequires: gcc
BuildRequires: libX11-devel
commit b9f38139973e6a32f6c8caae7628428303dd37f0
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 19:47:59 2020 +1000
Adjust snprintf() log patch to use absolute values only.
diff --git a/xrdp-0.9.14-log-snprintf.patch b/xrdp-0.9.14-log-snprintf.patch
index 5b57019..41c5548 100644
--- a/xrdp-0.9.14-log-snprintf.patch
+++ b/xrdp-0.9.14-log-snprintf.patch
@@ -1,7 +1,7 @@
diff -ruN xrdp-0.9.14-v/common/log.c xrdp-0.9.14/common/log.c
--- xrdp-0.9.14-v/common/log.c 2020-08-26 12:32:21.000000000 +1000
-+++ xrdp-0.9.14/common/log.c 2020-08-31 19:23:06.347581743 +1000
-@@ -555,9 +555,10 @@
++++ xrdp-0.9.14/common/log.c 2020-08-31 19:47:18.283542606 +1000
+@@ -555,9 +555,11 @@
now_t = time(&now_t);
now = localtime(&now_t);
@@ -9,9 +9,10 @@ diff -ruN xrdp-0.9.14-v/common/log.c xrdp-0.9.14/common/log.c
- now->tm_mon + 1, now->tm_mday, now->tm_hour, now->tm_min,
- now->tm_sec);
+ snprintf(buff, 21, "[%.4d%.2d%.2d-%.2d:%.2d:%.2d] ",
-+ (now->tm_year + 1900) % 10000,
-+ (now->tm_mon + 1) % 100, now->tm_mday % 100, now->tm_hour % 100,
-+ now->tm_min % 100, now->tm_sec % 100);
++ abs((now->tm_year + 1900) % 10000),
++ abs((now->tm_mon + 1) % 100), abs(now->tm_mday % 100),
++ abs(now->tm_hour % 100), abs(now->tm_min % 100),
++ abs(now->tm_sec % 100));
internal_log_lvl2str(lvl, buff + 20);
commit 6c60f795c67ea67eeea7bee57da4fa218ed95792
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 19:24:54 2020 +1000
Add patch for snprintf() truncation in logging.
diff --git a/xrdp-0.9.14-log-snprintf.patch b/xrdp-0.9.14-log-snprintf.patch
new file mode 100644
index 0000000..5b57019
--- /dev/null
+++ b/xrdp-0.9.14-log-snprintf.patch
@@ -0,0 +1,17 @@
+diff -ruN xrdp-0.9.14-v/common/log.c xrdp-0.9.14/common/log.c
+--- xrdp-0.9.14-v/common/log.c 2020-08-26 12:32:21.000000000 +1000
++++ xrdp-0.9.14/common/log.c 2020-08-31 19:23:06.347581743 +1000
+@@ -555,9 +555,10 @@
+ now_t = time(&now_t);
+ now = localtime(&now_t);
+
+- snprintf(buff, 21, "[%.4d%.2d%.2d-%.2d:%.2d:%.2d] ", now->tm_year + 1900,
+- now->tm_mon + 1, now->tm_mday, now->tm_hour, now->tm_min,
+- now->tm_sec);
++ snprintf(buff, 21, "[%.4d%.2d%.2d-%.2d:%.2d:%.2d] ",
++ (now->tm_year + 1900) % 10000,
++ (now->tm_mon + 1) % 100, now->tm_mday % 100, now->tm_hour % 100,
++ now->tm_min % 100, now->tm_sec % 100);
+
+ internal_log_lvl2str(lvl, buff + 20);
+
diff --git a/xrdp.spec b/xrdp.spec
index e0d2f95..95b1339 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -30,6 +30,7 @@ Patch2: xrdp-0.9.4-service.patch
Patch3: xrdp-0.9.2-setpriv.patch
Patch4: xrdp-0.9.10-scripts-libexec.patch
Patch5: xrdp-0.9.6-script-interpreter.patch
+Patch6: xrdp-0.9.14-log-snprintf.patch
BuildRequires: gcc
BuildRequires: libX11-devel
commit 0698533d4023215d6ac1463cc6c597f51bcb4806
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 18:00:45 2020 +1000
Adjust patch version for xrdp.ini.
diff --git a/xrdp.spec b/xrdp.spec
index 6d18a49..e0d2f95 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -25,7 +25,7 @@ Source5: README.Fedora
Source6: xrdp.te
Source7: xrdp-polkit-1.rules
Patch0: xrdp-0.9.9-sesman.patch
-Patch1: xrdp-0.9.11-xrdp-ini.patch
+Patch1: xrdp-0.9.14-xrdp-ini.patch
Patch2: xrdp-0.9.4-service.patch
Patch3: xrdp-0.9.2-setpriv.patch
Patch4: xrdp-0.9.10-scripts-libexec.patch
commit 8dcc5c2dc5c47c86675d221c660aeac3da112c0f
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 18:00:01 2020 +1000
Clean up xrdp.ini patch.
diff --git a/xrdp-0.9.11-xrdp-ini.patch b/xrdp-0.9.14-xrdp-ini.patch
similarity index 81%
rename from xrdp-0.9.11-xrdp-ini.patch
rename to xrdp-0.9.14-xrdp-ini.patch
index 469f4d1..f592102 100644
--- a/xrdp-0.9.11-xrdp-ini.patch
+++ b/xrdp-0.9.14-xrdp-ini.patch
@@ -1,6 +1,6 @@
-diff -ruN xrdp-0.9.11-v/xrdp/xrdp.ini xrdp-0.9.11/xrdp/xrdp.ini
---- xrdp-0.9.11-v/xrdp/xrdp.ini 2019-08-20 01:41:37.000000000 +1000
-+++ xrdp-0.9.11/xrdp/xrdp.ini 2019-09-15 21:30:19.352135681 +1000
+diff -ruN xrdp-0.9.14-v/xrdp/xrdp.ini xrdp-0.9.14/xrdp/xrdp.ini
+--- xrdp-0.9.14-v/xrdp/xrdp.ini 2020-08-31 16:33:40.000000000 +1000
++++ xrdp-0.9.14/xrdp/xrdp.ini 2020-08-31 17:57:37.560243121 +1000
@@ -178,14 +178,14 @@
; Some session types such as Xorg, X11rdp and Xvnc start a display server.
; Startup command-line parameters for the display server are configured
@@ -24,9 +24,9 @@ diff -ruN xrdp-0.9.11-v/xrdp/xrdp.ini xrdp-0.9.11/xrdp/xrdp.ini
[Xvnc]
name=Xvnc
-@@ -197,25 +197,25 @@
- #xserverbpp=24
- #delay_ms=2000
+@@ -201,25 +201,25 @@
+ #disabled_encodings_mask=0
+
-[vnc-any]
-name=vnc-any
commit 19eec6ad1049929ccc3360fc1a9e6e05a044179f
Author: Bojan Smojver <bojan(a)rexursive.com>
Date: Mon Aug 31 17:53:43 2020 +1000
Bump up to 0.9.14.
diff --git a/.gitignore b/.gitignore
index d6074db..f5f8d8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ xrdp-cvs-03-17-2010.tar.gz
/xrdp-0.9.12.tar.gz
/xrdp-0.9.13.tar.gz
/xrdp-0.9.13.1.tar.gz
+/xrdp-0.9.14.tar.gz
diff --git a/sources b/sources
index 2dbd3c3..92eda94 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xrdp-0.9.13.1.tar.gz) = 36350aaf4bf4b49907cb31fd15c375a50a0d13d4b66aa14982c9d4da64212395391ff7e169def853337ef97960a109d6d7c85d510834fac44de12caed3632a26
+SHA512 (xrdp-0.9.14.tar.gz) = 5c0a8f8b25e8482ac871e227227c030521df5af2bb7ab0f5000888a02969aae8c275e7b9b1b1d42cb83ffd86e6dc1f9eef1b254bf3984f9a1eb48623bfb0a2ef
diff --git a/xrdp.spec b/xrdp.spec
index 1836e77..6d18a49 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -12,8 +12,8 @@
Summary: Open source remote desktop protocol (RDP) server
Name: xrdp
Epoch: 1
-Version: 0.9.13.1
-Release: 3%{?dist}
+Version: 0.9.14
+Release: 1%{?dist}
License: ASL 2.0 and GPLv2+ and MIT
URL: http://www.xrdp.org/
Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%...
@@ -275,6 +275,9 @@ fi
%{_datadir}/selinux/*/%{name}.pp
%changelog
+* Mon Aug 31 2020 Bojan Smojver <bojan(a)rexurive.com> - 1:0.9.14-1
+- Bump up to 0.9.14
+
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.9.13.1-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 9c711329715ab816cc449f119e49b1508fda1f0e
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Sat Aug 1 09:48:22 2020 +0000
- Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/xrdp.spec b/xrdp.spec
index a804f13..1836e77 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -13,7 +13,7 @@ Summary: Open source remote desktop protocol (RDP) server
Name: xrdp
Epoch: 1
Version: 0.9.13.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: ASL 2.0 and GPLv2+ and MIT
URL: http://www.xrdp.org/
Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%...
@@ -275,6 +275,10 @@ fi
%{_datadir}/selinux/*/%{name}.pp
%changelog
+* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.9.13.1-3
+- Second attempt - Rebuilt for
+ https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.9.13.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
commit 83bc43642cc17c02cf517feba71fa37623166fea
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 29 15:04:00 2020 +0000
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/xrdp.spec b/xrdp.spec
index 4a9311c..a804f13 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -13,7 +13,7 @@ Summary: Open source remote desktop protocol (RDP) server
Name: xrdp
Epoch: 1
Version: 0.9.13.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: ASL 2.0 and GPLv2+ and MIT
URL: http://www.xrdp.org/
Source0: https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%...
@@ -275,6 +275,9 @@ fi
%{_datadir}/selinux/*/%{name}.pp
%changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1:0.9.13.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
* Tue Jun 30 2020 Bojan Smojver <bojan(a)rexurive.com> - 1:0.9.13.1-1
- Bump up to 0.9.13.1
- CVE-2022-4044
3 years, 7 months
- 1
- 0