Architecture specific change in rpms/rust-syntect.git
by githook-noreply@fedoraproject.org
The package rpms/rust-syntect.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/rust-syntect.git/commit/?id=33a72....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 33a724059039606a8f18050ec0e838ff3bad41c3
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Sep 3 20:07:34 2018 +0200
initial import
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3140c89
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/syntect-2.1.0.crate
diff --git a/0001-Upgrade-plist-to-0.3-and-take-advantage-of-serde-int.patch b/0001-Upgrade-plist-to-0.3-and-take-advantage-of-serde-int.patch
new file mode 100644
index 0000000..19e2b23
--- /dev/null
+++ b/0001-Upgrade-plist-to-0.3-and-take-advantage-of-serde-int.patch
@@ -0,0 +1,52 @@
+From f4aa3a1421d4213f8611af8bc243f2dcdf86146f Mon Sep 17 00:00:00 2001
+From: Robin Stocker <rstocker(a)atlassian.com>
+Date: Thu, 28 Jun 2018 12:50:41 +1000
+Subject: [PATCH] Upgrade plist to 0.3 and take advantage of serde integration
+
+---
+ src/highlighting/settings.rs | 24 ++++--------------------
+ 1 file changed, 4 insertions(+), 20 deletions(-)
+
+diff --git a/src/highlighting/settings.rs b/src/highlighting/settings.rs
+index d0e7be7..da64fcf 100644
+--- a/src/highlighting/settings.rs
++++ b/src/highlighting/settings.rs
+@@ -2,8 +2,8 @@
+ /// released under the MIT license by @defuz
+
+ use std::io::{Read, Seek};
+-use plist::{Plist, Error as PlistError};
+-use serde_json::Number;
++use plist::{Error as PlistError};
++use plist::serde::deserialize;
+
+ pub use serde_json::Value as Settings;
+ pub use serde_json::Value::Array as SettingsArray;
+@@ -33,22 +33,6 @@ impl From<PlistError> for SettingsError {
+ }
+
+ pub fn read_plist<R: Read + Seek>(reader: R) -> Result<Settings, SettingsError> {
+- let plist = Plist::read(reader)?;
+- Ok(to_json(plist))
+-}
+-
+-fn to_json(plist: Plist) -> Settings {
+- match plist {
+- Plist::Array(elements) =>
+- SettingsArray(elements.into_iter().map(to_json).collect()),
+- Plist::Dictionary(entries) =>
+- SettingsObject(entries.into_iter().map(|(k, v)| (k, to_json(v))).collect()),
+- Plist::Boolean(value) => Settings::Bool(value),
+- Plist::Data(bytes) => Settings::Array(bytes.into_iter().map(|b| b.into()).collect()),
+- Plist::Date(value) => Settings::String(value.to_string()),
+- Plist::Real(value) =>
+- Settings::Number(Number::from_f64(value).expect("Error converting plist real value to JSON number")),
+- Plist::Integer(value) => Settings::Number(value.into()),
+- Plist::String(s) => Settings::String(s),
+- }
++ let settings = deserialize(reader)?;
++ Ok(settings)
+ }
+--
+2.19.0.rc1
+
diff --git a/rust-syntect.spec b/rust-syntect.spec
new file mode 100644
index 0000000..b1b0882
--- /dev/null
+++ b/rust-syntect.spec
@@ -0,0 +1,87 @@
+# Generated by rust2rpm
+# criterion is not packaged yet
+%bcond_with check
+%global debug_package %{nil}
+
+%global crate syntect
+
+Name: rust-%{crate}
+Version: 2.1.0
+Release: 1%{?dist}
+Summary: Library for high quality syntax highlighting and code intelligence
+
+License: MIT
+URL: https://crates.io/crates/syntect
+Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{...
+# Initial patched metadata
+# * Bump onig to 4.1, https://github.com/trishume/syntect/commit/6172cf925cbe87aa8984cb43629068...
+# * Bump regex-syntax to 0.6 and regex to 1.0, https://github.com/trishume/syntect/commit/5bd64c04aa236bfb0c03da9c101aa2...
+# * Bump plist to 0.3, https://github.com/trishume/syntect/commit/f4aa3a1421d4213f8611af8bc243f2...
+Patch0: syntect-fix-metadata.diff
+# Make it work with new plist
+Patch0001: 0001-Upgrade-plist-to-0.3-and-take-advantage-of-serde-int.patch
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: rust-packaging
+# [dependencies]
+BuildRequires: (crate(bincode) >= 1.0.0 with crate(bincode) < 2.0.0)
+BuildRequires: (crate(bitflags) >= 1.0.0 with crate(bitflags) < 2.0.0)
+BuildRequires: (crate(flate2) >= 1.0.0 with crate(flate2) < 2.0.0)
+BuildRequires: (crate(fnv) >= 1.0.0 with crate(fnv) < 2.0.0)
+BuildRequires: (crate(lazy_static) >= 1.0.0 with crate(lazy_static) < 2.0.0)
+BuildRequires: (crate(onig) >= 4.1.0 with crate(onig) < 5.0.0)
+BuildRequires: (crate(plist) >= 0.3.0 with crate(plist) < 0.4.0)
+BuildRequires: (crate(regex-syntax) >= 0.6.0 with crate(regex-syntax) < 0.7.0)
+BuildRequires: ((crate(serde) >= 1.0.0 with crate(serde) < 2.0.0) with crate(serde/rc))
+BuildRequires: (crate(serde_derive) >= 1.0.0 with crate(serde_derive) < 2.0.0)
+BuildRequires: (crate(serde_json) >= 1.0.0 with crate(serde_json) < 2.0.0)
+BuildRequires: (crate(walkdir) >= 2.0.0 with crate(walkdir) < 3.0.0)
+BuildRequires: (crate(yaml-rust) >= 0.4.0 with crate(yaml-rust) < 0.5.0)
+%if %{with check}
+# [dev-dependencies]
+BuildRequires: (crate(criterion) >= 0.2.0 with crate(criterion) < 0.3.0)
+BuildRequires: (crate(getopts) >= 0.2.0 with crate(getopts) < 0.3.0)
+BuildRequires: (crate(pretty_assertions) >= 0.5.0 with crate(pretty_assertions) < 0.6.0)
+BuildRequires: (crate(rayon) >= 1.0.0 with crate(rayon) < 2.0.0)
+BuildRequires: (crate(regex) >= 1.0.0 with crate(regex) < 2.0.0)
+%endif
+
+%description
+%{summary}.
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel
+library for high quality syntax highlighting and code intelligence using
+Sublime Text's grammars.
+
+This package contains library source intended for building other packages
+which use %{crate} from crates.io.
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%files devel
+%license LICENSE.txt
+%doc Readme.md DESIGN.md
+%{cargo_registry}/%{crate}-%{version}/
+%exclude %{cargo_registry}/%{crate}-%{version}/{codecov.yaml,Makefile,scripts}
+
+%changelog
+* Mon Sep 03 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 2.1.0-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..36f7000
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (syntect-2.1.0.crate) = e672de4ba1016d3fdc0977c77dbd3ac3d43bbe3e51e492305f7e8b886d67c1fe8ba872850f8caacee5d35405454c32e931a224984450bc55dfc1f5414cd8f214
diff --git a/syntect-fix-metadata.diff b/syntect-fix-metadata.diff
new file mode 100644
index 0000000..539dd50
--- /dev/null
+++ b/syntect-fix-metadata.diff
@@ -0,0 +1,29 @@
+--- syntect-2.1.0/Cargo.toml 1970-01-01T01:00:00+01:00
++++ syntect-2.1.0/Cargo.toml 2018-09-03T08:43:04.539047+02:00
+@@ -54,14 +54,14 @@
+ version = "1.0"
+
+ [dependencies.onig]
+-version = "3.2.1"
++version = "4.1"
+ optional = true
+
+ [dependencies.plist]
+-version = "0.2"
++version = "0.3"
+
+ [dependencies.regex-syntax]
+-version = "0.4"
++version = "0.6"
+ optional = true
+
+ [dependencies.serde]
+@@ -93,7 +93,7 @@
+ version = "1.0.0"
+
+ [dev-dependencies.regex]
+-version = "0.2"
++version = "1.0"
+
+ [features]
+ assets = []
5 years, 6 months
Architecture specific change in rpms/rust-plist.git
by githook-noreply@fedoraproject.org
The package rpms/rust-plist.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/rust-plist.git/commit/?id=bc22331....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit bc223315cb0465b9145ada1642484edf28e1fe9b
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Sep 3 20:06:54 2018 +0200
initial import
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1d8625a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/plist-0.3.0.crate
diff --git a/0001-Update-xml-rs-to-0.8.0-reimplement-plist-prologue.patch b/0001-Update-xml-rs-to-0.8.0-reimplement-plist-prologue.patch
new file mode 100644
index 0000000..a3a0559
--- /dev/null
+++ b/0001-Update-xml-rs-to-0.8.0-reimplement-plist-prologue.patch
@@ -0,0 +1,76 @@
+From 45ab6d492c1a031485962e17d2af932d8af069d8 Mon Sep 17 00:00:00 2001
+From: Kevin Ballard <kevin(a)sb.org>
+Date: Wed, 16 May 2018 14:28:31 -0700
+Subject: [PATCH] Update xml-rs to 0.8.0, reimplement plist prologue
+
+xml-rs 0.8.0 has an `inner_mut()` method we can use instead of turning
+off character escaping.
+---
+ src/xml/writer.rs | 17 ++++++-----------
+ 1 file changed, 6 insertions(+), 11 deletions(-)
+
+diff --git a/src/xml/writer.rs b/src/xml/writer.rs
+index e168128..4facfd2 100644
+--- a/src/xml/writer.rs
++++ b/src/xml/writer.rs
+@@ -1,7 +1,6 @@
+ use base64;
+ use std::borrow::Cow;
+ use std::io::Write;
+-use xml_rs::escape::escape_str_pcdata;
+ use xml_rs::name::Name;
+ use xml_rs::namespace::Namespace;
+ use xml_rs::writer::events::XmlEvent as WriteXmlEvent;
+@@ -38,7 +37,7 @@ pub struct EventWriter<W: Write> {
+
+ impl<W: Write> EventWriter<W> {
+ pub fn new(writer: W) -> EventWriter<W> {
+- let mut config = EmitterConfig::new()
++ let config = EmitterConfig::new()
+ .line_separator("\n")
+ .indent_string("\t")
+ .perform_indent(true)
+@@ -47,7 +46,6 @@ impl<W: Write> EventWriter<W> {
+ .cdata_to_characters(true)
+ .keep_element_names_stack(false)
+ .autopad_comments(true);
+- config.perform_escaping = false;
+
+ EventWriter {
+ xml_writer: XmlEventWriter::new_with_config(writer, config),
+@@ -80,19 +78,16 @@ impl<W: Write> EventWriter<W> {
+ }
+
+ fn write_value(&mut self, value: &str) -> Result<()> {
+- self.xml_writer
+- .write(WriteXmlEvent::Characters(&escape_str_pcdata(value)))?;
++ self.xml_writer.write(WriteXmlEvent::Characters(value))?;
+ Ok(())
+ }
+
+ fn maybe_end_plist(&mut self) -> Result<()> {
+ // If there are no more open tags then write the </plist> element
+ if self.stack.len() == 1 {
+- // We didn't tell the xml_writer about the <plist> tag so it thinks we're already at
+- // the root. As such, it's not going to prettify our output, so we need to include
+- // the newline ourselves.
+- self.xml_writer.write(WriteXmlEvent::Characters("\n"))?;
+- self.end_element("plist")?;
++ // We didn't tell the xml_writer about the <plist> tag so we'll skip telling it
++ // about the </plist> tag as well.
++ self.xml_writer.inner_mut().write(b"\n</plist>")?;
+ if let Some(Element::Root) = self.stack.pop() {
+ } else {
+ return Err(Error::InvalidData);
+@@ -134,7 +129,7 @@ impl<W: Write> PlistEventWriter for EventWriter<W> {
+ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+ <plist version="1.0">
+ "#;
+- self.xml_writer.write(WriteXmlEvent::Characters(prologue))?;
++ self.xml_writer.inner_mut().write(prologue.as_bytes())?;
+
+ self.stack.push(Element::Root);
+ }
+--
+2.19.0.rc1
+
diff --git a/plist-fix-metadata.diff b/plist-fix-metadata.diff
new file mode 100644
index 0000000..c08da30
--- /dev/null
+++ b/plist-fix-metadata.diff
@@ -0,0 +1,11 @@
+--- plist-0.3.0/Cargo.toml 1970-01-01T01:00:00+01:00
++++ plist-0.3.0/Cargo.toml 2018-09-03T08:59:02.257027+02:00
+@@ -34,7 +34,7 @@
+ optional = true
+
+ [dependencies.xml-rs]
+-version = "0.7.0"
++version = "0.8.0"
+ [dev-dependencies.serde_derive]
+ version = "1.0.2"
+
diff --git a/rust-plist.spec b/rust-plist.spec
new file mode 100644
index 0000000..39424f5
--- /dev/null
+++ b/rust-plist.spec
@@ -0,0 +1,70 @@
+# Generated by rust2rpm
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate plist
+
+Name: rust-%{crate}
+Version: 0.3.0
+Release: 1%{?dist}
+Summary: Rusty plist parser
+
+License: MIT
+URL: https://crates.io/crates/plist
+Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{...
+# Initial patched metadata
+# * Bump xml-rs to 0.8.0, https://github.com/ebarnard/rust-plist/commit/45ab6d492c1a031485962e17d2a...
+Patch0: plist-fix-metadata.diff
+# Make it work with new xml-rs
+Patch0001: 0001-Update-xml-rs-to-0.8.0-reimplement-plist-prologue.patch
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: rust-packaging
+# [dependencies]
+BuildRequires: (crate(base64) >= 0.9.0 with crate(base64) < 0.10.0)
+BuildRequires: (crate(byteorder) >= 1.1.0 with crate(byteorder) < 2.0.0)
+BuildRequires: (crate(humantime) >= 1.1.1 with crate(humantime) < 2.0.0)
+BuildRequires: (crate(serde) >= 1.0.2 with crate(serde) < 2.0.0)
+BuildRequires: (crate(xml-rs) >= 0.8.0 with crate(xml-rs) < 0.9.0)
+%if %{with check}
+# [dev-dependencies]
+BuildRequires: (crate(serde_derive) >= 1.0.2 with crate(serde_derive) < 2.0.0)
+%endif
+
+%description
+%{summary}.
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel
+A rusty plist parser. Supports Serde serialization.
+
+This package contains library source intended for building other packages
+which use %{crate} from crates.io.
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%files devel
+%license LICENCE
+%doc README.md
+%{cargo_registry}/%{crate}-%{version}/
+
+%changelog
+* Mon Sep 03 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.3.0-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..88ee6b3
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (plist-0.3.0.crate) = 8171689f24ad9c8579722d3a6269a80c955f11bb5fbae25050e07f518da339d91091b91cb0c6c41a6980402513f466d4e1e0e56abf6b9d09e68e95dbfc2175e6
5 years, 6 months
Architecture specific change in rpms/rust-xml-rs.git
by githook-noreply@fedoraproject.org
The package rpms/rust-xml-rs.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/rust-xml-rs.git/commit/?id=42806f....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 42806f70f9a3f5d7894a691da5aecac83b035b94
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Sep 3 20:06:33 2018 +0200
initial import
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ae1d0e0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/xml-rs-0.8.0.crate
diff --git a/rust-xml-rs.spec b/rust-xml-rs.spec
new file mode 100644
index 0000000..1d2dfa3
--- /dev/null
+++ b/rust-xml-rs.spec
@@ -0,0 +1,57 @@
+# Generated by rust2rpm
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate xml-rs
+
+Name: rust-%{crate}
+Version: 0.8.0
+Release: 1%{?dist}
+Summary: XML library in pure Rust
+
+License: MIT
+URL: https://crates.io/crates/xml-rs
+Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{...
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: rust-packaging
+
+%description
+%{summary}.
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel
+An XML library in pure Rust.
+
+This package contains library source intended for building other packages
+which use %{crate} from crates.io.
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+# https://github.com/netvl/xml-rs/issues/171
+%cargo_test || :
+%endif
+
+%files devel
+%license LICENSE
+%doc Readme.md design.md Changelog.md
+%{cargo_registry}/%{crate}-%{version}/
+%exclude %{_bindir}/xml-analyze
+
+%changelog
+* Fri Aug 31 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.8.0-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..a9e7282
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (xml-rs-0.8.0.crate) = 94f0bc729d58564d63b4708518313e3dc7fe7c6ff9ac94019df1507d7ce7bd6428f2bc16fb116a9d676415a94812ce1e54e30b469a2a9b5fe29dc82486c536cd
5 years, 6 months
Architecture specific change in rpms/rust-onig.git
by githook-noreply@fedoraproject.org
The package rpms/rust-onig.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/rust-onig.git/commit/?id=558f7c6b....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 558f7c6b1dcd51430aed9a1d07e833b5e86d0a3d
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Sep 3 20:06:11 2018 +0200
initial import
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9a91038
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/onig-4.1.0.crate
diff --git a/rust-onig.spec b/rust-onig.spec
new file mode 100644
index 0000000..01b27b7
--- /dev/null
+++ b/rust-onig.spec
@@ -0,0 +1,62 @@
+# Generated by rust2rpm
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate onig
+
+Name: rust-%{crate}
+Version: 4.1.0
+Release: 1%{?dist}
+Summary: Set of rust bindings for the oniguruma regular expression library
+
+License: MIT
+URL: https://crates.io/crates/onig
+Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{...
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: rust-packaging
+# [dependencies]
+BuildRequires: (crate(bitflags) >= 1.0.0 with crate(bitflags) < 2.0.0)
+BuildRequires: (crate(lazy_static) >= 1.0.0 with crate(lazy_static) < 2.0.0)
+BuildRequires: (crate(libc) >= 0.2.0 with crate(libc) < 0.3.0)
+BuildRequires: (crate(onig_sys) >= 68.2.0 with crate(onig_sys) < 69.0.0)
+
+%description
+%{summary}.
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel
+Rust-Onig is a set of rust bindings for the
+oniguruma regular expression library.
+
+This package contains library source intended for building other packages
+which use %{crate} from crates.io.
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%files devel
+%license LICENSE.md
+%doc onig_README README.md
+%{cargo_registry}/%{crate}-%{version}/
+%exclude %{cargo_registry}/%{crate}-%{version}/{appveyor.yml,appveyor_rust_install.ps1,Vagrantfile}
+
+%changelog
+* Mon Sep 03 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 4.1.0-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..43de79c
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (onig-4.1.0.crate) = 61946caa9f2bb8c72a163a11331e4e4c6d0150db6ab02cf51beb0508c29d2b4fd2d9a6f3628a0cd8a61ab62cada0fbcf6c6d9bf6247392c4d7fd2294b8e87bd7
5 years, 6 months
Architecture specific change in rpms/rust-onig_sys.git
by githook-noreply@fedoraproject.org
The package rpms/rust-onig_sys.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/rust-onig_sys.git/commit/?id=8acb....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 8acbd43e36ef9a8901ad16723c88b6b6f7785de9
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Sep 3 20:05:52 2018 +0200
initial import
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..de5f10c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/onig_sys-68.2.0.crate
diff --git a/rust-onig_sys-use-system-onig.diff b/rust-onig_sys-use-system-onig.diff
new file mode 100644
index 0000000..60e6fa8
--- /dev/null
+++ b/rust-onig_sys-use-system-onig.diff
@@ -0,0 +1,12 @@
+diff -uNr onig_sys-68.2.0.orig/build.rs onig_sys-68.2.0/build.rs
+--- onig_sys-68.2.0.orig/build.rs 2018-07-29 18:29:19.000000000 +0200
++++ onig_sys-68.2.0/build.rs 2018-09-03 08:36:08.969948474 +0200
+@@ -139,7 +139,7 @@
+
+ pub fn main() {
+ let link_type = link_type_override();
+- let require_pkg_config = env_var_bool("RUSTONIG_SYSTEM_LIBONIG").unwrap_or(false);
++ let require_pkg_config = env_var_bool("RUSTONIG_SYSTEM_LIBONIG").unwrap_or(true);
+
+ if require_pkg_config || link_type == Some(LinkType::Dynamic) {
+ let mut conf = Config::new();
diff --git a/rust-onig_sys.spec b/rust-onig_sys.spec
new file mode 100644
index 0000000..4410a3e
--- /dev/null
+++ b/rust-onig_sys.spec
@@ -0,0 +1,74 @@
+# Generated by rust2rpm
+%bcond_without check
+%global debug_package %{nil}
+
+%global onig_min 6.8.0
+
+%global crate onig_sys
+
+Name: rust-%{crate}
+Version: 68.2.0
+Release: 1%{?dist}
+Summary: Raw rust bindings to the oniguruma library
+
+# https://github.com/rust-onig/rust-onig/issues/89
+License: MIT
+URL: https://crates.io/crates/onig_sys
+Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{...
+# Use system onig by default
+Patch0: rust-onig_sys-use-system-onig.diff
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: rust-packaging
+# [dependencies]
+BuildRequires: (crate(libc) >= 0.2.0 with crate(libc) < 0.3.0)
+# [build-dependencies]
+BuildRequires: (crate(cc) >= 1.0.18 with crate(cc) < 2.0.0)
+BuildRequires: (crate(pkg-config) >= 0.3.0 with crate(pkg-config) < 0.4.0)
+BuildRequires: pkgconfig(oniguruma) >= %{onig_min}
+
+%description
+%{summary}.
+
+%package devel
+Summary: %{summary}
+Requires: pkgconfig(oniguruma) >= %{onig_min}
+BuildArch: noarch
+
+%description devel
+The Onig Sys crate contains raw rust bindings to the
+oniguruma library. This
+crate exposes a set of unsafe functions which
+can then be used by other crates
+to create safe wrappers around
+Oniguruma.
+
+You probably don't want to link to
+this crate directly.
+
+This package contains library source intended for building other packages
+which use %{crate} from crates.io.
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+rm -vrf oniguruma/
+%cargo_prep
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%files devel
+%{cargo_registry}/%{crate}-%{version}/
+
+%changelog
+* Mon Sep 03 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 68.2.0-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..afc0fb6
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (onig_sys-68.2.0.crate) = e652daf34d3e4f9dc4a5e0295f200a69679032ffc49a7d70851ccfc42c38fd710ee300fded12e4e5c7fe2df3b9191651c404762bad21dd12a7de58bd9de6ed21
5 years, 6 months
Architecture specific change in rpms/rust-parking_lot_core.git
by githook-noreply@fedoraproject.org
The package rpms/rust-parking_lot_core.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/rust-parking_lot_core.git/commit/....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 3004dbf2661419cd7d863ef3677990930eac2b45
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Sep 3 20:05:29 2018 +0200
initial import
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c976e51
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/parking_lot_core-0.3.0.crate
diff --git a/parking_lot_core-fix-metadata.diff b/parking_lot_core-fix-metadata.diff
new file mode 100644
index 0000000..604077f
--- /dev/null
+++ b/parking_lot_core-fix-metadata.diff
@@ -0,0 +1,32 @@
+--- parking_lot_core-0.3.0/Cargo.toml 1970-01-01T01:00:00+01:00
++++ parking_lot_core-0.3.0/Cargo.toml 2018-09-03T09:27:50.290538+02:00
+@@ -19,29 +19,11 @@
+ categories = ["concurrency"]
+ license = "Apache-2.0/MIT"
+ repository = "https://github.com/Amanieu/parking_lot"
+-[dependencies.backtrace]
+-version = "0.3.2"
+-optional = true
+-
+-[dependencies.petgraph]
+-version = "0.4.5"
+-optional = true
+-
+ [dependencies.rand]
+ version = "0.5"
+
+ [dependencies.smallvec]
+ version = "0.6"
+
+-[dependencies.thread-id]
+-version = "3.2.0"
+-optional = true
+-
+-[features]
+-deadlock_detection = ["petgraph", "thread-id", "backtrace"]
+-nightly = []
+ [target."cfg(unix)".dependencies.libc]
+ version = "0.2.27"
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3"
+-features = ["winnt", "ntstatus", "minwindef", "winerror", "winbase", "errhandlingapi", "handleapi"]
diff --git a/rust-parking_lot_core.spec b/rust-parking_lot_core.spec
new file mode 100644
index 0000000..8aeb2f5
--- /dev/null
+++ b/rust-parking_lot_core.spec
@@ -0,0 +1,64 @@
+# Generated by rust2rpm
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate parking_lot_core
+
+Name: rust-%{crate}
+Version: 0.3.0
+Release: 1%{?dist}
+Summary: Advanced API for creating custom synchronization primitives
+
+# Upstream license specification: Apache-2.0/MIT
+# https://github.com/Amanieu/parking_lot/issues/92
+License: ASL 2.0 or MIT
+URL: https://crates.io/crates/parking_lot_core
+Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{...
+# Initial patched metadata
+# * No Windows
+# * No nightly
+# * No optional features
+Patch0: parking_lot_core-fix-metadata.diff
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: rust-packaging
+# [dependencies]
+BuildRequires: (crate(libc) >= 0.2.27 with crate(libc) < 0.3.0)
+BuildRequires: (crate(rand) >= 0.5.0 with crate(rand) < 0.6.0)
+BuildRequires: (crate(smallvec) >= 0.6.0 with crate(smallvec) < 0.7.0)
+
+%description
+%{summary}.
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel
+An advanced API for creating custom synchronization primitives.
+
+This package contains library source intended for building other packages
+which use %{crate} from crates.io.
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+%cargo_test
+%endif
+
+%files devel
+%{cargo_registry}/%{crate}-%{version}/
+
+%changelog
+* Mon Sep 03 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.3.0-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..aaf8004
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (parking_lot_core-0.3.0.crate) = da3d05da132c3abf2735695d9322e8353ba88c2d9c5d69008f0d90bae570fae521fecff4998980fedadc3dd250a6a6142d2bd0a996c13e8f7d3111ad70319b26
5 years, 6 months
Architecture specific change in rpms/rust-lock_api.git
by githook-noreply@fedoraproject.org
The package rpms/rust-lock_api.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/rust-lock_api.git/commit/?id=9226....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 92261e3edda049ad255e8dbda3eccb68e58cb8c5
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Sep 3 20:05:02 2018 +0200
initial import
Signed-off-by: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8bcc430
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/lock_api-0.1.3.crate
diff --git a/rust-lock_api.spec b/rust-lock_api.spec
new file mode 100644
index 0000000..efaa3b4
--- /dev/null
+++ b/rust-lock_api.spec
@@ -0,0 +1,60 @@
+# Generated by rust2rpm
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate lock_api
+
+Name: rust-%{crate}
+Version: 0.1.3
+Release: 1%{?dist}
+Summary: Wrappers to create fully-featured Mutex and RwLock types. Compatible with no_std.
+
+# Upstream license specification: Apache-2.0/MIT
+# https://github.com/Amanieu/parking_lot/issues/92
+License: ASL 2.0 or MIT
+URL: https://crates.io/crates/lock_api
+Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{...
+
+ExclusiveArch: %{rust_arches}
+
+BuildRequires: rust-packaging
+# [dependencies]
+BuildRequires: (crate(owning_ref) >= 0.3.0 with crate(owning_ref) < 0.4.0)
+BuildRequires: (crate(scopeguard) >= 0.3.0 with crate(scopeguard) < 0.4.0)
+
+%description
+%{summary}.
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description devel
+Wrappers to create fully-featured Mutex and RwLock types. Compatible with
+no_std.
+
+This package contains library source intended for building other packages
+which use %{crate} from crates.io.
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+# https://github.com/Amanieu/parking_lot/issues/91
+%cargo_test || :
+%endif
+
+%files devel
+%{cargo_registry}/%{crate}-%{version}/
+
+%changelog
+* Mon Sep 03 2018 Igor Gnatenko <ignatenkobrain(a)fedoraproject.org> - 0.1.3-1
+- Initial package
diff --git a/sources b/sources
new file mode 100644
index 0000000..847e3b7
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (lock_api-0.1.3.crate) = 5c088cdc3a5321ac9e9f488acca11c554be5d91b2de0e48171d2ecba15d7e5960ee0a8ed82fef15377ddf17646ca350d9749b2579d5ec74cdb66ffd327e61c5f
5 years, 6 months
Architecture specific change in rpms/java-11-openjdk.git
by githook-noreply@fedoraproject.org
The package rpms/java-11-openjdk.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/java-11-openjdk.git/commit/?id=7b....
Change:
-%ifarch %{jit_arches}
Thanks.
Full change:
============
commit 7bc68ae1bb910c9fde973f440cf7bafed10f0377
Author: Jiri Vanek <jvanek(a)redhat.com>
Date: Mon Sep 3 16:31:14 2018 +0200
jfr/*jfc files listed for all arches, lib/classlist do not exists s390, ifarch-ed via jit_arches out
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index e61f71d..9974e76 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -499,7 +499,9 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/rmiregistry
%{_jvmdir}/%{sdkdir -- %{?1}}/bin/unpack200
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib
+%ifarch %{jit_arches}
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/classlist
+%endif
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jexec
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jrt-fs.jar
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/modules
@@ -546,12 +548,9 @@ exit 0
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libunpack.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libverify.so
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/libzip.so
-# Zero does not have JFR
-%ifarch %{jit_arches}
%dir %{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/default.jfc
%{_jvmdir}/%{sdkdir -- %{?1}}/lib/jfr/profile.jfc
-%endif
%{_mandir}/man1/java-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/jjs-%{uniquesuffix -- %{?1}}.1*
%{_mandir}/man1/keytool-%{uniquesuffix -- %{?1}}.1*
@@ -835,7 +834,7 @@ Provides: java-%{javaver}-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver}
-Release: 1%{?dist}
+Release: 2%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -1724,6 +1723,10 @@ require "copy_jdk_configs.lua"
%changelog
+* Thu Sep 4 2018 Jiri Vanek <jvanek(a)redhat.com> - 1:11.0.ea.28-2
+- jfr/*jfc files listed for all arches
+- lib/classlist do not exists s390, ifarch-ed via jit_arches out
+
* Fri Aug 31 2018 Severin Gehwolf <sgehwolf(a)redhat.com> - 1:11.0.ea.28-1
- Update to latest upstream build jdk11+28, the first release
candidate.
5 years, 6 months
Architecture specific change in rpms/nss.git
by githook-noreply@fedoraproject.org
The package rpms/nss.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/nss.git/commit/?id=f002359684418b....
Change:
-%ifarch %{multilib_arches}
Thanks.
Full change:
============
commit f002359684418bc4aef613619ba12978b10d4688
Author: Daiki Ueno <dueno(a)redhat.com>
Date: Mon Sep 3 14:49:57 2018 +0200
Update to NSS 3.39
diff --git a/.gitignore b/.gitignore
index c7566e0..edaba7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ TestUser51.cert
/nss-3.36.1.tar.gz
/nss-3.37.3.tar.gz
/nss-3.38.0.tar.gz
+/nss-3.39.tar.gz
diff --git a/nss-3.14.0.0-disble-ocsp-test.patch b/nss-3.14.0.0-disble-ocsp-test.patch
deleted file mode 100644
index 3347ee9..0000000
--- a/nss-3.14.0.0-disble-ocsp-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up nss/tests/chains/scenarios/scenarios.noocsptest nss/tests/chains/scenarios/scenarios
---- nss/tests/chains/scenarios/scenarios.noocsptest 2013-06-27 10:58:08.000000000 -0700
-+++ nss/tests/chains/scenarios/scenarios 2013-07-02 16:13:27.075038930 -0700
-@@ -50,7 +50,6 @@ bridgewithpolicyextensionandmapping.cfg
- realcerts.cfg
- dsa.cfg
- revoc.cfg
--ocsp.cfg
- crldp.cfg
- trustanchors.cfg
- nameconstraints.cfg
diff --git a/nss-check-policy-file.patch b/nss-check-policy-file.patch
deleted file mode 100644
index 1898173..0000000
--- a/nss-check-policy-file.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -up nss/lib/pk11wrap/pk11pars.c.check_policy_file nss/lib/pk11wrap/pk11pars.c
---- nss/lib/pk11wrap/pk11pars.c.check_policy_file 2017-01-06 13:21:47.002952050 +0100
-+++ nss/lib/pk11wrap/pk11pars.c 2017-01-06 13:28:18.972536334 +0100
-@@ -109,6 +109,7 @@ secmod_NewModule(void)
- *other flags are set */
- #define SECMOD_FLAG_MODULE_DB_SKIP_FIRST 0x02
- #define SECMOD_FLAG_MODULE_DB_DEFAULT_MODDB 0x04
-+#define SECMOD_FLAG_MODULE_DB_POLICY_ONLY 0x08
-
- /* private flags for internal (field in SECMODModule). */
- /* The meaing of these flags is as follows:
-@@ -704,6 +705,9 @@ SECMOD_CreateModuleEx(const char *librar
- if (NSSUTIL_ArgHasFlag("flags", "defaultModDB", nssc)) {
- flags |= SECMOD_FLAG_MODULE_DB_DEFAULT_MODDB;
- }
-+ if (NSSUTIL_ArgHasFlag("flags", "policyOnly", nssc)) {
-+ flags |= SECMOD_FLAG_MODULE_DB_POLICY_ONLY;
-+ }
- /* additional moduleDB flags could be added here in the future */
- mod->isModuleDB = (PRBool)flags;
- }
-@@ -744,6 +748,14 @@ SECMOD_GetDefaultModDBFlag(SECMODModule
- }
-
- PRBool
-+secmod_PolicyOnly(SECMODModule *mod)
-+{
-+ char flags = (char) mod->isModuleDB;
-+
-+ return (flags & SECMOD_FLAG_MODULE_DB_POLICY_ONLY) ? PR_TRUE : PR_FALSE;
-+}
-+
-+PRBool
- secmod_IsInternalKeySlot(SECMODModule *mod)
- {
- char flags = (char)mod->internal;
-@@ -1661,6 +1673,12 @@ SECMOD_LoadModule(char *modulespec, SECM
- if (!module) {
- goto loser;
- }
-+
-+ /* a policy only stanza doesn't actually get 'loaded'. policy has already
-+ * been parsed as a side effect of the CreateModuleEx call */
-+ if (secmod_PolicyOnly(module)) {
-+ return module;
-+ }
- if (parent) {
- module->parent = SECMOD_ReferenceModule(parent);
- if (module->internal && secmod_IsInternalKeySlot(parent)) {
diff --git a/nss-p11-kit.config b/nss-p11-kit.config
new file mode 100644
index 0000000..0ebf073
--- /dev/null
+++ b/nss-p11-kit.config
@@ -0,0 +1,4 @@
+name=p11-kit-proxy
+library=p11-kit-proxy.so
+
+
diff --git a/nss.spec b/nss.spec
index 61a1012..689a640 100644
--- a/nss.spec
+++ b/nss.spec
@@ -1,24 +1,21 @@
-%global nspr_version 4.19.0
-%global nss_util_version 3.38.0
-%global nss_softokn_version 3.38.0
+%global nspr_version 4.20.0
+%global nss_util_version 3.39.0
+%global nss_softokn_version 3.39.0
+%global nss_version 3.39.0
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
%global allTools "certutil cmsutil crlutil derdump modutil pk12util signtool signver ssltap vfychain vfyserv"
-# solution taken from icedtea-web.spec
-%define multilib_arches %{power64} sparc64 x86_64 mips64 mips64el
-%ifarch %{multilib_arches}
-%define alt_ckbi libnssckbi.so.%{_arch}
-%else
-%define alt_ckbi libnssckbi.so
-%endif
-
-# Define if using a source archive like "nss-version.with.ckbi.version".
-# To "disable", add "#" to start of line, AND a space after "%".
-#% define nss_ckbi_suffix .with.ckbi.1.93
+# The upstream omits the trailing ".0", while we need it for
+# consistency with the pkg-config version:
+# https://bugzilla.redhat.com/show_bug.cgi?id=1578106
+%{lua:
+rpm.define(string.format("nss_archive_version %s",
+ string.gsub(rpm.expand("%nss_version"), "(.*)%.0$", "%1")))
+}
Summary: Network Security Services
Name: nss
-Version: 3.38.0
+Version: %{nss_version}
# for Rawhide, please always use release >= 2
# for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
Release: 1.0%{?dist}
@@ -30,9 +27,7 @@ Requires: nss-util >= %{nss_util_version}
# TODO: revert to same version as nss once we are done with the merge
Requires: nss-softokn%{_isa} >= %{nss_softokn_version}
Requires: nss-system-init
-Requires(post): %{_sbindir}/update-alternatives
-Requires(postun): %{_sbindir}/update-alternatives
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: p11-kit-trust
BuildRequires: nspr-devel >= %{nspr_version}
# TODO: revert to same version as nss once we are done with the merge
# Using '>=' but on RHEL the requires should be '='
@@ -65,13 +60,7 @@ Conflicts: seamonkey < 2.46-2
# https://bugzilla.redhat.com/show_bug.cgi?id=1414987
# Conflicts: icecat < 45.5.1-5
-%if %{defined nss_ckbi_suffix}
-%define full_nss_version %{version}%{nss_ckbi_suffix}
-%else
-%define full_nss_version %{version}
-%endif
-
-Source0: %{name}-%{full_nss_version}.tar.gz
+Source0: %{name}-%{nss_archive_version}.tar.gz
Source1: nss.pc.in
Source2: nss-config.in
Source3: blank-cert8.db
@@ -94,8 +83,6 @@ Patch2: add-relro-linker-option.patch
Patch3: renegotiate-transitional.patch
# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=617723
Patch16: nss-539183.patch
-# TODO: Remove this patch when the ocsp test are fixed
-Patch40: nss-3.14.0.0-disble-ocsp-test.patch
# Fedora / RHEL-only patch, the templates directory was originally introduced to support mod_revocator
Patch47: utilwrap-include-templates.patch
# TODO remove when we switch to building nss without softoken
@@ -114,9 +101,6 @@ Patch49: nss-skip-bltest-and-fipstest.patch
Patch50: iquote.patch
# Local patch for TLS_ECDHE_{ECDSA|RSA}_WITH_3DES_EDE_CBC_SHA ciphers
Patch58: rhbz1185708-enable-ecc-3des-ciphers-by-default.patch
-# Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1279520
-Patch59: nss-check-policy-file.patch
-Patch60: nss-load-policy-file.patch
Patch62: nss-skip-util-gtest.patch
Patch63: nss-sql-default.patch
@@ -188,20 +172,16 @@ low level services.
%prep
-%setup -q
-%setup -q -T -D -n %{name}-%{version}
+%setup -q -n %{name}-%{nss_archive_version}
%patch2 -p0 -b .relro
%patch3 -p0 -b .transitional
%patch16 -p0 -b .539183
-%patch40 -p0 -b .noocsptest
%patch47 -p0 -b .templates
%patch49 -p0 -b .skipthem
%patch50 -p0 -b .iquote
%patch58 -p0 -b .1185708_3des
pushd nss
-%patch59 -p1 -b .check_policy_file
-%patch60 -p1 -b .load_policy_file
%patch62 -p1 -b .skip_util_gtest
%patch63 -p1 -R -b .sql-default
popd
@@ -235,9 +215,6 @@ popd
%build
-NSS_NO_PKCS11_BYPASS=1
-export NSS_NO_PKCS11_BYPASS
-
FREEBL_NO_DEPEND=1
export FREEBL_NO_DEPEND
@@ -255,6 +232,9 @@ export BUILD_OPT=1
XCFLAGS=$RPM_OPT_FLAGS
export XCFLAGS
+LDFLAGS=$RPM_LD_FLAGS
+export LDFLAGS
+
PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
@@ -541,9 +521,6 @@ echo "test suite completed"
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man5
-touch $RPM_BUILD_ROOT%{_libdir}/libnssckbi.so
-%{__install} -p -m 755 dist/*.OBJ/lib/libnssckbi.so $RPM_BUILD_ROOT/%{_libdir}/nss/libnssckbi.so
-
# Copy the binary libraries we want
for file in libnss3.so libnsssysinit.so libsmime3.so libssl3.so
do
@@ -568,7 +545,7 @@ do
done
# Copy the binaries we want
-for file in certutil cmsutil crlutil modutil pk12util signver ssltap
+for file in certutil cmsutil crlutil modutil nss-policy-check pk12util signver ssltap
do
%{__install} -p -m 755 dist/*.OBJ/bin/$file $RPM_BUILD_ROOT/%{_bindir}
done
@@ -623,8 +600,8 @@ for f in cert8.db cert9.db key3.db key4.db secmod.db; do
install -c -m 644 ${f}.5 $RPM_BUILD_ROOT%{_mandir}/man5/${f}.5
done
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
+# Copy the crypto-policies configuration file
+%{__install} -p -m 644 %{SOURCE28} $RPM_BUILD_ROOT/%{_sysconfdir}/crypto-policies/local.d
%triggerpostun -n nss-sysinit -- nss-sysinit < 3.12.8-3
# Reverse unwanted disabling of sysinit by faulty preun sysinit scriplet
@@ -632,33 +609,9 @@ done
/usr/bin/setup-nsssysinit.sh on
%post
-# If we upgrade, and the shared filename is a regular file, then we must
-# remove it, before we can install the alternatives symbolic link.
-if [ $1 -gt 1 ] ; then
- # when upgrading or downgrading
- if ! test -L %{_libdir}/libnssckbi.so; then
- rm -f %{_libdir}/libnssckbi.so
- fi
-fi
-# Install the symbolic link
-# FYI: Certain other packages use alternatives --set to enforce that the first
-# installed package is preferred. We don't do that. Highest priority wins.
-%{_sbindir}/update-alternatives --install %{_libdir}/libnssckbi.so \
- %{alt_ckbi} %{_libdir}/nss/libnssckbi.so 10
/sbin/ldconfig
%postun
-if [ $1 -eq 0 ] ; then
- # package removal
- %{_sbindir}/update-alternatives --remove %{alt_ckbi} %{_libdir}/nss/libnssckbi.so
-else
- # upgrade or downgrade
- # If the new installed package uses a regular file (not a symblic link),
- # then cleanup the alternatives link.
- if ! test -L %{_libdir}/libnssckbi.so; then
- %{_sbindir}/update-alternatives --remove %{alt_ckbi} %{_libdir}/nss/libnssckbi.so
- fi
-fi
/sbin/ldconfig
@@ -669,8 +622,6 @@ fi
%{_libdir}/libnss3.so
%{_libdir}/libssl3.so
%{_libdir}/libsmime3.so
-%ghost %{_libdir}/libnssckbi.so
-%{_libdir}/nss/libnssckbi.so
%dir %{_sysconfdir}/pki/nssdb
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/cert8.db
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/key3.db
@@ -699,6 +650,7 @@ fi
%{_bindir}/cmsutil
%{_bindir}/crlutil
%{_bindir}/modutil
+%{_bindir}/nss-policy-check
%{_bindir}/pk12util
%{_bindir}/signver
%{_bindir}/ssltap
@@ -811,6 +763,10 @@ fi
%changelog
+* Mon Sep 3 2018 Daiki Ueno <dueno(a)redhat.com> - 3.39.0-1.0
+- Update to NSS 3.39
+- Use the upstream tarball as it is (rhbz#1578106)
+
* Tue Jul 3 2018 Daiki Ueno <dueno(a)redhat.com> - 3.38.0-1.0
- Update to NSS 3.38
diff --git a/sources b/sources
index 8c91f7f..bc02822 100644
--- a/sources
+++ b/sources
@@ -3,4 +3,4 @@ SHA512 (blank-cert9.db) = 2f8eab4c0612210ee47db8a3a80c1b58a0b43849551af78c7da403
SHA512 (blank-key3.db) = 01f7314e9fc8a7c9aa997652624cfcde213d18a6b3bb31840c1a60bbd662e56b5bc3221d13874abb42ce78163b225a6dfce2e1326cf6dd29366ad9c28ba5a71c
SHA512 (blank-key4.db) = 8fedae93af7163da23fe9492ea8e785a44c291604fa98e58438448efb69c85d3253fc22b926d5c3209c62e58a86038fd4d78a1c4c068bc00600a7f3e5382ebe7
SHA512 (blank-secmod.db) = 06a2dbd861839ef6315093459328b500d3832333a34b30e6fac4a2503af337f014a4d319f0f93322409e719142904ce8bc08252ae9a4f37f30d4c3312e900310
-SHA512 (nss-3.38.0.tar.gz) = eb63f1c44adbbd97dc766e8545c72303f3cb18f1bfb2af67c33cdb1a1a9a1cc432a64afbafabd7a5bb3f08cb36db74ed81e5cfa1fc4bd35ae76e183f3205afed
+SHA512 (nss-3.39.tar.gz) = 16358c2d8660ca301410b1d39b2eae64fe2ebbbfab797872410e5fcc67f802ef48f4e362edeecb0591626c77013537019094a6a5dfc8d24487b6b6e54564da8f
diff --git a/tests/NSS-tools-should-not-use-SHA1-by-default-when/Makefile b/tests/NSS-tools-should-not-use-SHA1-by-default-when/Makefile
new file mode 100644
index 0000000..ea65d87
--- /dev/null
+++ b/tests/NSS-tools-should-not-use-SHA1-by-default-when/Makefile
@@ -0,0 +1,64 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+# Makefile of /CoreOS/nss/Regression/NSS-tools-should-not-use-SHA1-by-default-when
+# Description: NSS tools should not use SHA1 by default when
+# Author: Hubert Kario <hkario(a)redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+# Copyright (c) 2016 Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing
+# to use, modify, copy, or redistribute it subject to the terms
+# and conditions of the GNU General Public License version 2.
+#
+# This program is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/nss/Regression/NSS-tools-should-not-use-SHA1-by-default-when
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+ ./runtest.sh
+
+build: $(BUILT_FILES)
+ test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+ rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+ @echo "Owner: Hubert Kario <hkario(a)redhat.com>" > $(METADATA)
+ @echo "Name: $(TEST)" >> $(METADATA)
+ @echo "TestVersion: $(TESTVERSION)" >> $(METADATA)
+ @echo "Path: $(TEST_DIR)" >> $(METADATA)
+ @echo "Description: NSS tools should not use SHA1 by default when" >> $(METADATA)
+ @echo "Type: Regression" >> $(METADATA)
+ @echo "TestTime: 10m" >> $(METADATA)
+ @echo "RunFor: nss openssl" >> $(METADATA)
+ @echo "Requires: nss nss-tools openssl" >> $(METADATA)
+ @echo "Priority: Normal" >> $(METADATA)
+ @echo "License: GPLv2" >> $(METADATA)
+ @echo "Confidential: no" >> $(METADATA)
+ @echo "Destructive: no" >> $(METADATA)
+ @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
+
+ rhts-lint $(METADATA)
diff --git a/tests/NSS-tools-should-not-use-SHA1-by-default-when/PURPOSE b/tests/NSS-tools-should-not-use-SHA1-by-default-when/PURPOSE
new file mode 100644
index 0000000..7caf493
--- /dev/null
+++ b/tests/NSS-tools-should-not-use-SHA1-by-default-when/PURPOSE
@@ -0,0 +1,4 @@
+PURPOSE of NSS-tools-should-not-use-SHA1-by-default-when
+Description: NSS tools should not use SHA1 by default when
+Author: Hubert Kario <hkario(a)redhat.com>
+Summary: NSS tools should not use SHA1 by default when generating digital signatures/certificates
diff --git a/tests/NSS-tools-should-not-use-SHA1-by-default-when/runtest.sh b/tests/NSS-tools-should-not-use-SHA1-by-default-when/runtest.sh
new file mode 100755
index 0000000..8290d92
--- /dev/null
+++ b/tests/NSS-tools-should-not-use-SHA1-by-default-when/runtest.sh
@@ -0,0 +1,125 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+# runtest.sh of NSS-tools-should-not-use-SHA1-by-default-when
+# Description: NSS tools should not use SHA1 by default when
+# Author: Hubert Kario <hkario(a)redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+# Copyright (c) 2016 Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing
+# to use, modify, copy, or redistribute it subject to the terms
+# and conditions of the GNU General Public License version 2.
+#
+# This program is distributed in the hope that it will be
+# useful, but WITHOUT ANY WARRANTY; without even the implied
+# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+# PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with this program; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="nss"
+PACKAGES="nss openssl"
+DBDIR="nssdb"
+
+rlJournalStart
+ rlPhaseStartSetup
+ rlAssertRpm --all
+ rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
+ rlRun "pushd $TmpDir"
+ rlRun "mkdir nssdb"
+ rlRun "certutil -N -d $DBDIR --empty-password"
+ rlLogInfo "Create a JAR file"
+ rlRun "mkdir java-dir"
+ rlRun "pushd java-dir"
+ rlRun "mkdir META-INF mypackage"
+ rlRun "echo 'Main-Class: mypackage/MyMainFile' > META-INF/MANIFEST.MF"
+ rlRun "echo 'Those are not the droids you are looking for' > mypackage/MyMainFile.class"
+ #rlRun "jar -cfe package.jar mypackage/MyMainFile mypackage/MyMainFile.class"
+ rlRun "popd"
+ #rlRun "mv java-dir/package.jar ."
+ rlPhaseEnd
+
+ rlPhaseStartTest "Self signing certificates"
+ rlRun "dd if=/dev/urandom of=noise bs=1 count=32 >/dev/null"
+ rlRun "certutil -d $DBDIR -S -n 'CA' -t 'cTC,cTC,cTC' -s 'CN=CA' -x -z noise"
+ rlRun -s "certutil -d $DBDIR -L -n 'CA' -a | openssl x509 -noout -text"
+ rlAssertGrep "Signature Algorithm: sha256WithRSAEncryption" "$rlRun_LOG"
+ rlAssertNotGrep "Signature Algorithm: sha1WithRSAEncryption" $rlRun_LOG
+ rlPhaseEnd
+
+ rlPhaseStartTest "Signing certificates"
+ rlRun "dd if=/dev/urandom of=noise bs=1 count=32 >/dev/null"
+ rlRun "certutil -d $DBDIR -S -n 'server' -t 'u,u,u' -s 'CN=server.example.com' -c 'CA' -z noise --nsCertType sslClient,sslServer,objectSigning,smime"
+ rlRun -s "certutil -d $DBDIR -L -n 'server' -a | openssl x509 -noout -text"
+ rlAssertGrep "Signature Algorithm: sha256WithRSAEncryption" "$rlRun_LOG"
+ rlAssertNotGrep "Signature Algorithm: sha1WithRSAEncryption" $rlRun_LOG
+ rlPhaseEnd
+
+ rlPhaseStartTest "Certificate request"
+ rlRun "dd if=/dev/urandom of=noise bs=1 count=32 >/dev/null"
+ rlRun "mkdir srv2db"
+ rlRun "certutil -d srv2db -N --empty-password"
+ rlRun "certutil -d srv2db -R -s CN=www.example.com -o srv2.req -a -z noise"
+ rlRun -s "openssl req -noout -text -in srv2.req"
+ rlAssertGrep "Signature Algorithm: sha256WithRSAEncryption" "$rlRun_LOG"
+ rlAssertNotGrep "Signature Algorithm: sha1WithRSAEncryption" $rlRun_LOG
+ rlRun "certutil -d $DBDIR -C -c 'CA' -i srv2.req -a -o srv2.crt"
+ rlRun -s "openssl x509 -in srv2.crt -noout -text"
+ rlAssertGrep "Signature Algorithm: sha256WithRSAEncryption" "$rlRun_LOG"
+ rlAssertNotGrep "Signature Algorithm: sha1WithRSAEncryption" $rlRun_LOG
+ rlRun "rm -rf srv2db"
+ rlPhaseEnd
+
+ rlPhaseStartTest "Certificate request with SHA1"
+ rlRun "dd if=/dev/urandom of=noise bs=1 count=32 >/dev/null"
+ rlRun "mkdir srv2db"
+ rlRun "certutil -d srv2db -N --empty-password"
+ rlRun "certutil -d srv2db -R -s CN=www.example.com -o srv2.req -a -z noise -Z SHA1"
+ rlRun -s "openssl req -noout -text -in srv2.req"
+ rlAssertGrep "Signature Algorithm: sha1WithRSAEncryption" "$rlRun_LOG"
+ rlRun "certutil -d $DBDIR -C -c 'CA' -i srv2.req -a -o srv2.crt"
+ rlRun -s "openssl x509 -in srv2.crt -noout -text"
+ rlAssertGrep "Signature Algorithm: sha256WithRSAEncryption" "$rlRun_LOG"
+ rlAssertNotGrep "Signature Algorithm: sha1WithRSAEncryption" $rlRun_LOG
+ rlRun "rm -rf srv2db"
+ rlPhaseEnd
+
+ rlPhaseStartTest "Signing CMS messages"
+ rlRun "echo 'This is a document' > document.txt"
+ rlRun "cmsutil -S -d $DBDIR -N 'server' -i document.txt -o document.cms"
+ rlRun -s "openssl cms -in document.cms -inform der -noout -cmsout -print"
+ rlAssertGrep "algorithm: sha256" $rlRun_LOG
+ rlAssertNotGrep "algorithm: sha1" $rlRun_LOG
+ rlPhaseEnd
+
+ rlPhaseStartTest "CRL signing"
+ rlRun "echo $(date --utc +update=%Y%m%d%H%M%SZ) > script"
+ rlRun "echo $(date -d 'next week' --utc +nextupdate=%Y%m%d%H%M%SZ) >> script"
+ rlRun "echo addext crlNumber 0 1245 >>script"
+ rlRun "echo addcert 12 $(date -d 'yesterday' --utc +%Y%m%d%H%M%SZ) >>script"
+ rlRun "echo addext reasonCode 0 0 >>script"
+ rlRun "cat script"
+ rlRun "crlutil -G -c script -d $DBDIR -n CA -o ca.crl"
+ rlRun -s "openssl crl -in ca.crl -inform der -noout -text"
+ rlAssertGrep "Signature Algorithm: sha256WithRSAEncryption" $rlRun_LOG
+ rlAssertNotGrep "Signature Algorithm: sha1WithRSAEncryption" $rlRun_LOG
+ rlPhaseEnd
+
+ rlPhaseStartCleanup
+ rlRun "popd"
+ rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+ rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
diff --git a/tests/tests.yml b/tests/tests.yml
new file mode 100644
index 0000000..df64aa2
--- /dev/null
+++ b/tests/tests.yml
@@ -0,0 +1,12 @@
+---
+# This first play always runs on the local staging system
+- hosts: localhost
+ roles:
+ - role: standard-test-beakerlib
+ tags:
+ - classic
+ tests:
+ - NSS-tools-should-not-use-SHA1-by-default-when
+ required_packages:
+ - nss-tools
+ - nss
5 years, 6 months
Architecture specific change in rpms/webkitgtk4.git
by githook-noreply@fedoraproject.org
The package rpms/webkitgtk4.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/webkitgtk4.git/commit/?id=e05240f....
Change:
-%ifarch ppc %{power64} s390 %{s390x}
Thanks.
Full change:
============
commit e05240fe335652ec56f856fd85f85e02e5f484ed
Author: Tomas Popela <tpopela(a)redhat.com>
Date: Mon Sep 3 14:23:57 2018 +0200
Package jsc-glib bindings and fix the patch application
diff --git a/webkitgtk4.spec b/webkitgtk4.spec
index 6904a15..78cc9b0 100644
--- a/webkitgtk4.spec
+++ b/webkitgtk4.spec
@@ -154,9 +154,7 @@ Support for the GTK+ 2 based NPAPI plugins (such as Adobe Flash) for %{name}.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%ifarch ppc %{power64} s390 %{s390x}
%patch3 -p1
-%endif
%patch4 -R -p1 -b .woff2_1.0.2
%patch5 -R -p1 -b .typos
%patch6 -p1 -b .remove_woff2
@@ -296,6 +294,7 @@ make %{?_smp_mflags} -C %{_target_platform}
%files doc
%dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/jsc-glib-4.0/
%{_datadir}/gtk-doc/html/webkit2gtk-4.0/
%{_datadir}/gtk-doc/html/webkitdomgtk-4.0/
5 years, 6 months