[zerotier-one] Downgrade to 1.8.9
by Leigh Scott
commit 6d8952beb0b33124485c1cdc504800a1fad85cb5
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Jun 13 10:09:37 2022 +0100
Downgrade to 1.8.9
.gitignore | 11 ++---------
sources | 4 ++--
zerotier-one.spec | 8 ++++----
3 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4f9d640..40584d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,2 @@
-/zerotier-one-1.6.5.tar.gz
-/zerotier-one-1.6.6.tar.gz
-/zerotier-one-1.8.1.tar.gz
-/zerotier-one-1.8.2.tar.gz
-/zerotier-one-1.8.3.tar.gz
-/zerotier-one-1.8.4.tar.gz
-/zerotier-one-1.8.5.tar.gz
-/zerotier-one-1.8.10.tar.gz
-/vendor.tar.xz
+/zerotier-one-*.tar.gz
+/vendor-*.tar.xz
diff --git a/sources b/sources
index aa3d514..ebc4663 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (zerotier-one-1.8.10.tar.gz) = 56311f95681050f998bb67112efee78e66821850d9544ab57b0284ef032f5b098455dee80acbffa8e71c48b6bc9eaaf20e935e087f096f533dd0305cf0338cfe
-SHA512 (vendor.tar.xz) = d05d96bada236e10c85ff44eaf48c6dfe4f9a89c794e8c5a7cd37144f76a8884d1206330e0710b62485e05e5d44684d22a56f41b16c1fb1a86fff3ceb360a5c2
+SHA512 (vendor-1.8.9.tar.xz) = b324376bc1cb340e38840725398f11b0b7c2b3efe4620c31340e64ecc25fae713f2638826ef1563830a053bbd12a7a11186599250a190d9ba05ce664753ac7ff
+SHA512 (zerotier-one-1.8.9.tar.gz) = 6afc415dff28fbab72acd47fdf65246fe063b0ac5a3d8f67b818e3eda33196dfac24a40cb971c61b36a84c24e704584040b2b6cafc47b5200152e646015fb75f
diff --git a/zerotier-one.spec b/zerotier-one.spec
index b251f09..e3c34a3 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -1,5 +1,5 @@
Name: zerotier-one
-Version: 1.8.10
+Version: 1.8.9
Release: 1%{?dist}
Summary: Smart Ethernet Switch for Earth
@@ -36,7 +36,7 @@ License: BSL and Boost and ASL and ASL 2.0 and MIT
URL: https://zerotier.com
Source0: https://github.com/zerotier/ZeroTierOne/archive/%{version}/%{name}-%{vers...
# make with command: 'cd zeroidc && cargo vendor' and tar.xz vendor directory
-Source1: vendor.tar.xz
+Source1: vendor-%{version}.tar.xz
# for use vendor directory for build
Patch0: zerotier-use-vendor-archive.patch
@@ -120,8 +120,8 @@ install -Dpm0644 debian/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
%changelog
-* Sun Jun 12 2022 Leigh Scott <leigh123linux(a)gmail.com> - 1.8.10-1
-- chore(update): 1.8.10
+* Mon Jun 13 2022 Leigh Scott <leigh123linux(a)gmail.com> - 1.8.9-1
+- chore(update): 1.8.9
* Fri Mar 04 2022 Artem Polishchuk <ego.cordatus(a)gmail.com> - 1.8.5-1
- chore(update): 1.8.5
2 years, 5 months
[zerotier-one] clean up
by Leigh Scott
commit 901d9f20a2f68e13aa30b9695f607fdddc533bdc
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jun 12 22:59:19 2022 +0100
clean up
zerotier-one.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/zerotier-one.spec b/zerotier-one.spec
index ed42363..b251f09 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -35,13 +35,13 @@ Summary: Smart Ethernet Switch for Earth
License: BSL and Boost and ASL and ASL 2.0 and MIT
URL: https://zerotier.com
Source0: https://github.com/zerotier/ZeroTierOne/archive/%{version}/%{name}-%{vers...
-# make with command: 'cd zeroidc && cargo vendor' and tar.gz vendor directory
+# make with command: 'cd zeroidc && cargo vendor' and tar.xz vendor directory
Source1: vendor.tar.xz
# for use vendor directory for build
Patch0: zerotier-use-vendor-archive.patch
-BuildRequires: cargo
+BuildRequires: cargo
BuildRequires: gcc-c++
BuildRequires: go-md2man
BuildRequires: http-parser-devel
2 years, 5 months
[zerotier-one] chore(update): 1.8.10
by Leigh Scott
commit f0f43d629bfd9a2a446aff557c507219f190aefe
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jun 12 22:24:50 2022 +0100
chore(update): 1.8.10
.gitignore | 2 ++
sources | 3 ++-
zerotier-one.spec | 17 +++++++++++++++--
zerotier-use-vendor-archive.patch | 13 +++++++++++++
4 files changed, 32 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 667da7a..4f9d640 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
/zerotier-one-1.8.3.tar.gz
/zerotier-one-1.8.4.tar.gz
/zerotier-one-1.8.5.tar.gz
+/zerotier-one-1.8.10.tar.gz
+/vendor.tar.xz
diff --git a/sources b/sources
index 302458f..aa3d514 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (zerotier-one-1.8.5.tar.gz) = 2ac69d50cbf6d04d3eae223ec2e5c6c48218a132623f9070a6608866c174f0be14364817d90f30280ee22bca9b173d7f6e4a78457c1f00b0ab79c394b474b9d5
+SHA512 (zerotier-one-1.8.10.tar.gz) = 56311f95681050f998bb67112efee78e66821850d9544ab57b0284ef032f5b098455dee80acbffa8e71c48b6bc9eaaf20e935e087f096f533dd0305cf0338cfe
+SHA512 (vendor.tar.xz) = d05d96bada236e10c85ff44eaf48c6dfe4f9a89c794e8c5a7cd37144f76a8884d1206330e0710b62485e05e5d44684d22a56f41b16c1fb1a86fff3ceb360a5c2
diff --git a/zerotier-one.spec b/zerotier-one.spec
index 329c6c3..ed42363 100644
--- a/zerotier-one.spec
+++ b/zerotier-one.spec
@@ -1,5 +1,5 @@
Name: zerotier-one
-Version: 1.8.5
+Version: 1.8.10
Release: 1%{?dist}
Summary: Smart Ethernet Switch for Earth
@@ -35,12 +35,19 @@ Summary: Smart Ethernet Switch for Earth
License: BSL and Boost and ASL and ASL 2.0 and MIT
URL: https://zerotier.com
Source0: https://github.com/zerotier/ZeroTierOne/archive/%{version}/%{name}-%{vers...
+# make with command: 'cd zeroidc && cargo vendor' and tar.gz vendor directory
+Source1: vendor.tar.xz
+# for use vendor directory for build
+Patch0: zerotier-use-vendor-archive.patch
+
+BuildRequires: cargo
BuildRequires: gcc-c++
BuildRequires: go-md2man
BuildRequires: http-parser-devel
BuildRequires: json-devel
BuildRequires: libnatpmp-devel
+BuildRequires: openssl-devel
BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(liblz4)
@@ -72,12 +79,15 @@ the original Google BeyondCorp paper and the Jericho Forum with its notion of
%prep
-%autosetup -n ZeroTierOne-%{version}
+%autosetup -p 1 -n ZeroTierOne-%{version}
## Unbundling (maybe for future, depends on upstream)
# rm -rf ext/http-parser
# rm -rf ext/json
+pushd zeroidc
+tar -xf %{SOURCE1}
+popd
%build
%set_build_flags
@@ -110,6 +120,9 @@ install -Dpm0644 debian/%{name}.service %{buildroot}%{_unitdir}/%{name}.service
%changelog
+* Sun Jun 12 2022 Leigh Scott <leigh123linux(a)gmail.com> - 1.8.10-1
+- chore(update): 1.8.10
+
* Fri Mar 04 2022 Artem Polishchuk <ego.cordatus(a)gmail.com> - 1.8.5-1
- chore(update): 1.8.5
diff --git a/zerotier-use-vendor-archive.patch b/zerotier-use-vendor-archive.patch
new file mode 100644
index 0000000..98acbbd
--- /dev/null
+++ b/zerotier-use-vendor-archive.patch
@@ -0,0 +1,13 @@
+diff -ruN a/zeroidc/.cargo/config.toml b/zeroidc/.cargo/config.toml
+--- a/zeroidc/.cargo/config.toml 2022-05-11 02:45:12.000000000 +0900
++++ b/zeroidc/.cargo/config.toml 2022-05-16 08:28:37.836443191 +0900
+@@ -9,3 +9,9 @@
+
+ [target.i686-pc-windows-msvc]
+ rustflags = ["-C", "target-feature=+crt-static"]
++
++[source.crates-io]
++replace-with = "vendored-sources"
++
++[source.vendored-sources]
++directory = "vendor"
2 years, 5 months
[ffmpeg] unbootstrap
by Sérgio M. Basto
commit 8bb15652fa06ec52ea472cac712aedfa3dbf8ec6
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jun 12 22:24:17 2022 +0100
unbootstrap
ffmpeg.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 791cc87..f0ab845 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -20,7 +20,7 @@
%global _without_lensfun 1
%ifnarch i686
%global _with_bs2b 1
-#global _with_chromaprint 1
+%global _with_chromaprint 1
%global _with_ilbc 1
%global _with_rav1e 1
%global _with_rtmp 1
@@ -135,7 +135,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 5.0.1
-Release: 6%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 7%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -512,6 +512,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Sun Jun 12 2022 Sérgio Basto <sergio(a)serjux.com> - 5.0.1-7
+- unbootstrap
+
* Sun Jun 12 2022 Sérgio Basto <sergio(a)serjux.com> - 5.0.1-6
- Mass rebuild for x264-0.164
- Bootstrap build without chromaprint
2 years, 5 months
[zoneminder] Mass rebuild for x264-0.164
by Sérgio M. Basto
commit e297041bf562730975d450489f51bd4aa6f0bcb3
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jun 12 21:05:21 2022 +0100
Mass rebuild for x264-0.164
zoneminder.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/zoneminder.spec b/zoneminder.spec
index a15fad6..584cf0a 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -37,7 +37,7 @@
Name: zoneminder
Version: 1.36.19
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A camera monitoring and analysis tool
Group: System Environment/Daemons
# jQuery is under the MIT license: https://jquery.org/license/
@@ -429,6 +429,9 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
%dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
%changelog
+* Sun Jun 12 2022 Sérgio Basto <sergio(a)serjux.com> - 1.36.19-2
+- Mass rebuild for x264-0.164
+
* Fri Jun 10 2022 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.36.19-1
- 1.36.19 release
2 years, 5 months
[xpra-codecs-freeworld] Mass rebuild for x264-0.164
by Sérgio M. Basto
commit b6dc4e51bc0879b81df5c8a6a17f8fdf2627195a
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Jun 12 21:04:42 2022 +0100
Mass rebuild for x264-0.164
xpra-codecs-freeworld.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 2e026a8..85a4309 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -31,7 +31,7 @@
Name: xpra-codecs-freeworld
Version: 4.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
URL: https://www.xpra.org/
@@ -169,6 +169,9 @@ find %{buildroot}%{python3_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Sun Jun 12 2022 Sérgio Basto <sergio(a)serjux.com> - 4.3.2-3
+- Mass rebuild for x264-0.164
+
* Sun Feb 20 2022 Sérgio Basto <sergio(a)serjux.com> - 4.3.2-2
- Sync with Fedora counter part and fix epel 8 build
2 years, 5 months