salimma pushed to fizz (f33). "Update to 2020.11.23.00 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-12-01 01:10:18 UTC
From 4ca0ef779e7e9105d6b2f30cde0362614069098c Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Nov 23 2020 18:56:11 +0000
Subject: Update to 2020.11.23.00
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
---
diff --git a/.gitignore b/.gitignore
index 2492889..5b1cfcf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/fizz-2020.11.16.00.tar.gz
+/fizz-2020.11.23.00.tar.gz
diff --git a/fizz-fix-typestest-32bit.patch b/fizz-fix-typestest-32bit.patch
deleted file mode 100644
index 79af7e0..0000000
--- a/fizz-fix-typestest-32bit.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 775ae08b0cc7df96c96ff21c2ae06d6d60d9d92b Mon Sep 17 00:00:00 2001
-From: Michel Alexandre Salim <michel(a)michel-slm.name>
-Date: Mon, 16 Nov 2020 16:22:50 -0800
-Subject: [PATCH] TypesTest: disable Write24BitsBufferOverflow test on 32-bit
- archs
-
-This test fails:
-```
-F1116 16:18:08.078014 67 IOBuf.h:678] Check failed: amount <= tailroom() (4294967295 vs. 4)
-*** Check failure stack trace: ***
-*** Aborted at 1605572288 (Unix time, try 'date -d @1605572288') ***
-*** Signal 6 (SIGABRT) (0x43) received by PID 67 (pthread TID 0xf4e43b80) (linux TID 67) (maybe from PID 67, UID 0) (code: -6), stack trace: ***
-(error retrieving stack trace)
-```
----
- fizz/record/test/TypesTest.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/fizz/record/test/TypesTest.cpp b/fizz/record/test/TypesTest.cpp
-index 0b7011b..10eaa5a 100644
---- a/fizz/record/test/TypesTest.cpp
-+++ b/fizz/record/test/TypesTest.cpp
-@@ -6,6 +6,8 @@
- * LICENSE file in the root directory of this source tree.
- */
-
-+#include <cstdint>
-+
- #include <folly/portability/GMock.h>
- #include <folly/portability/GTest.h>
-
-@@ -52,6 +54,8 @@ TEST(TestTypes, Write24BitsBuffer) {
- EXPECT_EQ(buf->length() + 3, out->computeChainDataLength());
- }
-
-+#if INTPTR_MAX == INT64_MAX
-+// this test fails on 32-bit architectures
- TEST(TestTypes, Write24BitsBufferOverflow) {
- auto buf = IOBuf::create(std::numeric_limits<uint32_t>::max());
- buf->append(std::numeric_limits<uint32_t>::max());
-@@ -61,6 +65,7 @@ TEST(TestTypes, Write24BitsBufferOverflow) {
- EXPECT_THROW(
- detail::writeBuf<detail::bits24>(buf, appender), std::runtime_error);
- }
-+#endif
-
- TEST(TestTypes, WriteBuf) {
- auto buf = IOBuf::create(20);
---
-2.28.0
-
diff --git a/fizz.spec b/fizz.spec
index 0644f17..2f9ed78 100644
--- a/fizz.spec
+++ b/fizz.spec
@@ -11,15 +11,13 @@
%global _static_builddir static_build
Name: fizz
-Version: 2020.11.16.00
-Release: 2%{?dist}
+Version: 2020.11.23.00
+Release: 1%{?dist}
Summary: A C++14 implementation of the TLS-1.3 standard
License: BSD
URL: https://github.com/facebookincubator/fizz
Source0: %{url}/archive/v%{version}/fizz-%{version}.tar.gz
-# Fix test failures on 32-bit architectures
-Patch0: %{name}-fix-typestest-32bit.patch
# Folly is known not to work on big-endian CPUs
# https://bugzilla.redhat.com/show_bug.cgi?id=1892152
@@ -126,6 +124,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%changelog
+* Mon Nov 23 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 2020.11.23.00-1
+- Update to 2020.11.23.00
+
* Mon Nov 16 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 2020.11.16.00-2
- Fix tests on 32-bit architectures
diff --git a/sources b/sources
index 2b8d5c2..8b27c3e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fizz-2020.11.16.00.tar.gz) = 9c46c0258a2d98c6edfdd4dbd680b985e7a3bb8d5c30c7c307f24486c757516cf9cbfd7a93994e7ee6952a7777c7dc96976ffdf31687fe76157cba8e71d3ffff
+SHA512 (fizz-2020.11.23.00.tar.gz) = 8432c0f1faaea1f1b84230a998ce2b7e5512f8cf88586b8eda137671d45de927aa8db3251d5b10a109e84ed5785a327f8939fc1c23f5a635e5fcb9e3f42681e4
https://src.fedoraproject.org/rpms/fizz/c/4ca0ef779e7e9105d6b2f30cde03626...
3Â years, 5Â months
salimma pushed to fizz (f33). "Update to 2020.11.30.00 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-12-01 01:10:18 UTC
From e4c6ea5e86f3f7be4d72e53781fb930b102f57f0 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Nov 30 2020 18:47:12 +0000
Subject: Update to 2020.11.30.00
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
---
diff --git a/.gitignore b/.gitignore
index 5b1cfcf..87c084d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/fizz-2020.11.16.00.tar.gz
-/fizz-2020.11.23.00.tar.gz
+/fizz-2020.11.30.00.tar.gz
diff --git a/fizz.spec b/fizz.spec
index 2f9ed78..897c1f2 100644
--- a/fizz.spec
+++ b/fizz.spec
@@ -11,7 +11,7 @@
%global _static_builddir static_build
Name: fizz
-Version: 2020.11.23.00
+Version: 2020.11.30.00
Release: 1%{?dist}
Summary: A C++14 implementation of the TLS-1.3 standard
@@ -124,6 +124,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%changelog
+* Mon Nov 30 10:42:44 PST 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 2020.11.30.00-1
+- Update to 2020.11.30.00
+
* Mon Nov 23 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 2020.11.23.00-1
- Update to 2020.11.23.00
diff --git a/sources b/sources
index 8b27c3e..36b2626 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fizz-2020.11.23.00.tar.gz) = 8432c0f1faaea1f1b84230a998ce2b7e5512f8cf88586b8eda137671d45de927aa8db3251d5b10a109e84ed5785a327f8939fc1c23f5a635e5fcb9e3f42681e4
+SHA512 (fizz-2020.11.30.00.tar.gz) = 27f1dfa992024c9aa2e16a8a340650f766840ca1ac48bda63187d8672680b73777d615e06cb5f044e877d4a07550c66aaac26d6759ad6ce4e9f3e3bcc45bd4d0
https://src.fedoraproject.org/rpms/fizz/c/e4c6ea5e86f3f7be4d72e53781fb930...
3Â years, 5Â months
bbonev1 pushed to bmon (master). "use a saner name for the patch;
apply it in the spec"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-12-01 01:02:59 UTC
From 8b0782f3c46359603415e5289357018b64b54770 Mon Sep 17 00:00:00 2001
From: Boian Bonev <bbonev(a)ipacct.com>
Date: Dec 01 2020 01:02:48 +0000
Subject: use a saner name for the patch; apply it in the spec
---
diff --git a/bmon-4.0-buffer_size.patch b/bmon-4.0-buffer_size.patch
new file mode 100644
index 0000000..969fd1d
--- /dev/null
+++ b/bmon-4.0-buffer_size.patch
@@ -0,0 +1,11 @@
+--- bmon-4.0/src/in_netlink.c.orig 2020-12-01 02:34:34.218612445 +0200
++++ bmon-4.0/src/in_netlink.c 2020-12-01 02:34:36.935549069 +0200
+@@ -550,7 +550,7 @@ static void find_qdiscs(int, uint32_t, s
+ static struct element *handle_tc_obj(struct rtnl_tc *tc, const char *prefix,
+ const struct rdata *rdata)
+ {
+- char buf[IFNAME_MAX], name[IFNAME_MAX];
++ char buf[IFNAME_MAX], name[IFNAME_MAX + 6];
+ uint32_t id = rtnl_tc_get_handle(tc);
+ struct element *e;
+
diff --git a/bmon.spec b/bmon.spec
index 1448e12..0e065b8 100644
--- a/bmon.spec
+++ b/bmon.spec
@@ -7,7 +7,7 @@ License: BSD and GPLv2
URL: http://github.com/tgraf/bmon
Source0: https://github.com/tgraf/bmon/releases/download/v%{version}/bmon-%{versio...
-Patch1: bmon_buffer-size.patch
+Patch1: bmon-4.0-buffer_size.patch
BuildRequires: gcc
BuildRequires: libconfuse-devel
@@ -22,7 +22,7 @@ features various output methods including an interactive curses user
interface and a programmable text output for scripting.
%prep
-%setup -q
+%autosetup -p1
%build
%configure
diff --git a/bmon_buffer-size.patch b/bmon_buffer-size.patch
deleted file mode 100644
index 969fd1d..0000000
--- a/bmon_buffer-size.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bmon-4.0/src/in_netlink.c.orig 2020-12-01 02:34:34.218612445 +0200
-+++ bmon-4.0/src/in_netlink.c 2020-12-01 02:34:36.935549069 +0200
-@@ -550,7 +550,7 @@ static void find_qdiscs(int, uint32_t, s
- static struct element *handle_tc_obj(struct rtnl_tc *tc, const char *prefix,
- const struct rdata *rdata)
- {
-- char buf[IFNAME_MAX], name[IFNAME_MAX];
-+ char buf[IFNAME_MAX], name[IFNAME_MAX + 6];
- uint32_t id = rtnl_tc_get_handle(tc);
- struct element *e;
-
https://src.fedoraproject.org/rpms/bmon/c/8b0782f3c46359603415e5289357018...
3Â years, 5Â months
dcavalca pushed to golang-github-facebook-ent (f32). "Update to 0.5.1
(#1902511)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-12-01 00:53:50 UTC
From 1f7aed61fa4d8b6b451a91d62cd9f38f0353dafe Mon Sep 17 00:00:00 2001
From: Davide Cavalca <dcavalca(a)fedoraproject.org>
Date: Dec 01 2020 00:08:08 +0000
Subject: Update to 0.5.1 (#1902511)
---
diff --git a/.gitignore b/.gitignore
index a890347..1f90320 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/ent-0.5.0.tar.gz
+/ent-0.5.1.tar.gz
diff --git a/golang-github-facebook-ent.spec b/golang-github-facebook-ent.spec
index 6dc49b1..e748aba 100644
--- a/golang-github-facebook-ent.spec
+++ b/golang-github-facebook-ent.spec
@@ -3,7 +3,7 @@
# https://github.com/facebook/ent
%global goipath github.com/facebook/ent
-Version: 0.5.0
+Version: 0.5.1
%gometa
@@ -15,7 +15,7 @@ build and maintain applications with large data-models.}
%global godocs CODE_OF_CONDUCT.md CONTRIBUTING.md README.md
Name: %{goname}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: An entity framework for Go
# Upstream license specification: Apache-2.0
@@ -103,6 +103,9 @@ rm dialect/gremlin/encoding/graphson/native_test.go \
%gopkgfiles
%changelog
+* Mon Nov 30 2020 Davide Cavalca <dcavalca(a)fedoraproject.org> - 0.5.1-1
+- New upstream release
+
* Mon Nov 16 2020 Davide Cavalca <dcavalca(a)fedoraproject.org> - 0.5.0-2
- Fix docs permissions and remove spurious gitignore
diff --git a/sources b/sources
index 2b7b722..41d9a9a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ent-0.5.0.tar.gz) = be76876040523b5c67fd67d08ddd474cc8d67f9e3d18d2f589817d8951bc93adc99fe6a6972215bba53a8cbad5079dd7f51953d3778210997fa0a24ed0064f0e
+SHA512 (ent-0.5.1.tar.gz) = 471bed6cf7eb1413d8134d8bc1710e7588106c6b87be110cc74e38cbd12b6d6af60cbbbc14e845db51c868387117f0ec66a864693da6ddae538bf9e611cd7b03
https://src.fedoraproject.org/rpms/golang-github-facebook-ent/c/1f7aed61f...
3Â years, 5Â months
pstodulk pushed to git-remote-hg (f32). "Apply url encoding for
additional refname sanitizing (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-12-01 00:53:20 UTC
From 78e98f534b1d0ba3674aa34a5bd07ae857f66cce Mon Sep 17 00:00:00 2001
From: Petr Stodulka <pstodulk(a)redhat.com>
Date: Dec 01 2020 00:52:19 +0000
Subject: Apply url encoding for additional refname sanitizing
Resolves: #1893525
---
diff --git a/0001-Apply-url-encoding-for-additional-refname-sanitizing.patch b/0001-Apply-url-encoding-for-additional-refname-sanitizing.patch
new file mode 100644
index 0000000..4c5f5c9
--- /dev/null
+++ b/0001-Apply-url-encoding-for-additional-refname-sanitizing.patch
@@ -0,0 +1,65 @@
+From 05d230688462ada50ab275a4c8e674688426694f Mon Sep 17 00:00:00 2001
+From: Mark Nauwelaerts <mnauw(a)users.sourceforge.net>
+Date: Mon, 1 Jun 2020 16:22:01 +0200
+Subject: [PATCH] Apply url encoding for additional refname sanitizing
+
+Fixes mnauw/git-remote-hg#33
+
+@pstodulk note: Backported for v1.0.0
+---
+ README.asciidoc | 8 +++++---
+ git-remote-hg | 10 ++++++++--
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/README.asciidoc b/README.asciidoc
+index d0cdbe2..5015e7e 100644
+--- a/README.asciidoc
++++ b/README.asciidoc
+@@ -247,9 +247,11 @@ to fully complete the conversion (prior to subsequent pushing).
+ Some Mercurial names (of branches, bookmarks, tags) may not be a valid git
+ refname. See e.g. `man git-check-ref-format` for a rather involved set of rules.
+ Moreover, while a slash `/` is allowed, it is not supported to have both a `parent`
+-and `parent/child` branch (though only the latter is allowed). So, pending some
+-"nice" bidirectional encoding (not even e.g. URL encoding is safe actually), it is more
+-likely that only a few instances (out of a whole Mercurial repo) are
++and `parent/child` branch (though only the latter is allowed). Even though
++it is not quite (bidirectionally) safe, a (percentage) URL encoding
++(with some additional twist) is performed to obtain sane git refnames, at least
++so for most cases. If some nasty cases still slip through, then likely only
++a few instances (out of a whole Mercurial repo) are
+ problematic. This could be handled by a single-branch clone and/or configuring
+ a suitable refspec. However, it might be more convenient to simply filter out a
+ few unimportant pesky cases, which can be done by configuring a regural
+diff --git a/git-remote-hg b/git-remote-hg
+index 2c07917..cb8582d 100755
+--- a/git-remote-hg
++++ b/git-remote-hg
+@@ -29,6 +29,9 @@ import urlparse
+ import hashlib
+ import time as ptime
+
++urlquote = urllib.quote
++urlunquote = urllib.unquote
++
+ #
+ # If you want to see Mercurial revisions as Git commit notes:
+ # git config core.notesRef refs/notes/hg
+@@ -86,10 +89,13 @@ def hgbin(n):
+ return node.bin(n)
+
+ def hgref(ref):
+- return ref.replace('___', ' ')
++ return urlunquote(ref.replace('___', '%20').replace('%5F%5F%5F', '___'))
+
+ def gitref(ref):
+- return ref.replace(' ', '___')
++ # standard url percentage encoding with a (legacy) twist:
++ # ' ' -> '___'
++ # '___' also percentage encoded
++ return urlquote(ref).replace('___', '%5F%5F%5F').replace('%20', '___')
+
+ def check_version(*check):
+ if not hg_version:
+--
+2.26.2
+
diff --git a/git-remote-hg.spec b/git-remote-hg.spec
index 47be216..323123a 100644
--- a/git-remote-hg.spec
+++ b/git-remote-hg.spec
@@ -11,6 +11,7 @@ Source0: https://github.com/mnauw/%{name}/archive/v%{version}.tar.gz#/%{n
# https://github.com/felipec/git-remote-hg/pull/28
# Makes it work with Mercurial 3.2
# The second commit (to the tests) isn't needed against 0.2
+Patch01: 0001-Apply-url-encoding-for-additional-refname-sanitizing.patch
BuildRequires: asciidoc >= 8.4.1
BuildRequires: python2-devel
@@ -26,7 +27,7 @@ repositories as if they were Git ones.
%prep
%setup -q
-#%patch01 -p1
+%patch01 -p1
sed -i -e "1 s|^#!.*|#!%{__python2}|" git-remote-hg
sed -i -e 's|\tinstall|\tinstall -p|' Makefile
@@ -48,8 +49,9 @@ make install-doc
%{_mandir}/man1/*
%changelog
-* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+* Tue Dec 01 2020 Petr Stodulka <pstodulk(a)redhat.com> - 1.0.0-6
+- Apply url encoding for additional refname sanitizing
+- Resolves: #1893525
* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
https://src.fedoraproject.org/rpms/git-remote-hg/c/78e98f534b1d0ba3674aa3...
3Â years, 5Â months
pstodulk pushed to git-remote-hg (f33). "Apply url encoding for
additional refname sanitizing (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-12-01 00:43:38 UTC
From e5a8c2419ba5932d1012b4186468eabce6189bbc Mon Sep 17 00:00:00 2001
From: Petr Stodulka <pstodulk(a)redhat.com>
Date: Dec 01 2020 00:37:19 +0000
Subject: Apply url encoding for additional refname sanitizing
Resolves: #1893525
---
diff --git a/0001-Apply-url-encoding-for-additional-refname-sanitizing.patch b/0001-Apply-url-encoding-for-additional-refname-sanitizing.patch
new file mode 100644
index 0000000..4c5f5c9
--- /dev/null
+++ b/0001-Apply-url-encoding-for-additional-refname-sanitizing.patch
@@ -0,0 +1,65 @@
+From 05d230688462ada50ab275a4c8e674688426694f Mon Sep 17 00:00:00 2001
+From: Mark Nauwelaerts <mnauw(a)users.sourceforge.net>
+Date: Mon, 1 Jun 2020 16:22:01 +0200
+Subject: [PATCH] Apply url encoding for additional refname sanitizing
+
+Fixes mnauw/git-remote-hg#33
+
+@pstodulk note: Backported for v1.0.0
+---
+ README.asciidoc | 8 +++++---
+ git-remote-hg | 10 ++++++++--
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/README.asciidoc b/README.asciidoc
+index d0cdbe2..5015e7e 100644
+--- a/README.asciidoc
++++ b/README.asciidoc
+@@ -247,9 +247,11 @@ to fully complete the conversion (prior to subsequent pushing).
+ Some Mercurial names (of branches, bookmarks, tags) may not be a valid git
+ refname. See e.g. `man git-check-ref-format` for a rather involved set of rules.
+ Moreover, while a slash `/` is allowed, it is not supported to have both a `parent`
+-and `parent/child` branch (though only the latter is allowed). So, pending some
+-"nice" bidirectional encoding (not even e.g. URL encoding is safe actually), it is more
+-likely that only a few instances (out of a whole Mercurial repo) are
++and `parent/child` branch (though only the latter is allowed). Even though
++it is not quite (bidirectionally) safe, a (percentage) URL encoding
++(with some additional twist) is performed to obtain sane git refnames, at least
++so for most cases. If some nasty cases still slip through, then likely only
++a few instances (out of a whole Mercurial repo) are
+ problematic. This could be handled by a single-branch clone and/or configuring
+ a suitable refspec. However, it might be more convenient to simply filter out a
+ few unimportant pesky cases, which can be done by configuring a regural
+diff --git a/git-remote-hg b/git-remote-hg
+index 2c07917..cb8582d 100755
+--- a/git-remote-hg
++++ b/git-remote-hg
+@@ -29,6 +29,9 @@ import urlparse
+ import hashlib
+ import time as ptime
+
++urlquote = urllib.quote
++urlunquote = urllib.unquote
++
+ #
+ # If you want to see Mercurial revisions as Git commit notes:
+ # git config core.notesRef refs/notes/hg
+@@ -86,10 +89,13 @@ def hgbin(n):
+ return node.bin(n)
+
+ def hgref(ref):
+- return ref.replace('___', ' ')
++ return urlunquote(ref.replace('___', '%20').replace('%5F%5F%5F', '___'))
+
+ def gitref(ref):
+- return ref.replace(' ', '___')
++ # standard url percentage encoding with a (legacy) twist:
++ # ' ' -> '___'
++ # '___' also percentage encoded
++ return urlquote(ref).replace('___', '%5F%5F%5F').replace('%20', '___')
+
+ def check_version(*check):
+ if not hg_version:
+--
+2.26.2
+
diff --git a/git-remote-hg.spec b/git-remote-hg.spec
index 47be216..4730173 100644
--- a/git-remote-hg.spec
+++ b/git-remote-hg.spec
@@ -1,7 +1,7 @@
%global debug_package %{nil}
Name: git-remote-hg
Version: 1.0.0
-Release: 6%{?dist}
+Release: 7%{?dist}
BuildArch: noarch
Summary: Mercurial wrapper for git
License: GPLv2+
@@ -11,6 +11,7 @@ Source0: https://github.com/mnauw/%{name}/archive/v%{version}.tar.gz#/%{n
# https://github.com/felipec/git-remote-hg/pull/28
# Makes it work with Mercurial 3.2
# The second commit (to the tests) isn't needed against 0.2
+Patch01: 0001-Apply-url-encoding-for-additional-refname-sanitizing.patch
BuildRequires: asciidoc >= 8.4.1
BuildRequires: python2-devel
@@ -26,7 +27,7 @@ repositories as if they were Git ones.
%prep
%setup -q
-#%patch01 -p1
+%patch01 -p1
sed -i -e "1 s|^#!.*|#!%{__python2}|" git-remote-hg
sed -i -e 's|\tinstall|\tinstall -p|' Makefile
@@ -48,6 +49,10 @@ make install-doc
%{_mandir}/man1/*
%changelog
+* Tue Dec 01 2020 Petr Stodulka <pstodulk(a)redhat.com> - 1.0.0-7
+- Apply url encoding for additional refname sanitizing
+- Resolves: #1893525
+
* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
https://src.fedoraproject.org/rpms/git-remote-hg/c/e5a8c2419ba5932d1012b4...
3Â years, 5Â months
bbonev1 pushed to bmon (master). "- Add a trivial patch for possible
snprintf string truncation"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-12-01 00:38:47 UTC
From 68b33716b061f063b477a5b8ef7687a7c8bc80c9 Mon Sep 17 00:00:00 2001
From: Boian Bonev <bbonev(a)ipacct.com>
Date: Dec 01 2020 00:38:17 +0000
Subject: - Add a trivial patch for possible snprintf string truncation
---
diff --git a/bmon.spec b/bmon.spec
index 8805203..1448e12 100644
--- a/bmon.spec
+++ b/bmon.spec
@@ -7,6 +7,8 @@ License: BSD and GPLv2
URL: http://github.com/tgraf/bmon
Source0: https://github.com/tgraf/bmon/releases/download/v%{version}/bmon-%{versio...
+Patch1: bmon_buffer-size.patch
+
BuildRequires: gcc
BuildRequires: libconfuse-devel
BuildRequires: libnl3-devel
@@ -37,6 +39,7 @@ make install DESTDIR=%{buildroot} INSTALL="install -p"
%changelog
* Tue Dec 01 2020 Boian Bonev <bbonev(a)ipacct.com> - 4.0-1
- Update to 4.0 release
+- Add a trivial patch for possible snprintf string truncation
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.7-15
- Second attempt - Rebuilt for
diff --git a/bmon_buffer-size.patch b/bmon_buffer-size.patch
new file mode 100644
index 0000000..969fd1d
--- /dev/null
+++ b/bmon_buffer-size.patch
@@ -0,0 +1,11 @@
+--- bmon-4.0/src/in_netlink.c.orig 2020-12-01 02:34:34.218612445 +0200
++++ bmon-4.0/src/in_netlink.c 2020-12-01 02:34:36.935549069 +0200
+@@ -550,7 +550,7 @@ static void find_qdiscs(int, uint32_t, s
+ static struct element *handle_tc_obj(struct rtnl_tc *tc, const char *prefix,
+ const struct rdata *rdata)
+ {
+- char buf[IFNAME_MAX], name[IFNAME_MAX];
++ char buf[IFNAME_MAX], name[IFNAME_MAX + 6];
+ uint32_t id = rtnl_tc_get_handle(tc);
+ struct element *e;
+
https://src.fedoraproject.org/rpms/bmon/c/68b33716b061f063b477a5b8ef7687a...
3Â years, 5Â months
pstodulk pushed to git-remote-hg (master). "Apply url encoding for
additional refname sanitizing (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-12-01 00:37:59 UTC
From e5a8c2419ba5932d1012b4186468eabce6189bbc Mon Sep 17 00:00:00 2001
From: Petr Stodulka <pstodulk(a)redhat.com>
Date: Dec 01 2020 00:37:19 +0000
Subject: Apply url encoding for additional refname sanitizing
Resolves: #1893525
---
diff --git a/0001-Apply-url-encoding-for-additional-refname-sanitizing.patch b/0001-Apply-url-encoding-for-additional-refname-sanitizing.patch
new file mode 100644
index 0000000..4c5f5c9
--- /dev/null
+++ b/0001-Apply-url-encoding-for-additional-refname-sanitizing.patch
@@ -0,0 +1,65 @@
+From 05d230688462ada50ab275a4c8e674688426694f Mon Sep 17 00:00:00 2001
+From: Mark Nauwelaerts <mnauw(a)users.sourceforge.net>
+Date: Mon, 1 Jun 2020 16:22:01 +0200
+Subject: [PATCH] Apply url encoding for additional refname sanitizing
+
+Fixes mnauw/git-remote-hg#33
+
+@pstodulk note: Backported for v1.0.0
+---
+ README.asciidoc | 8 +++++---
+ git-remote-hg | 10 ++++++++--
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/README.asciidoc b/README.asciidoc
+index d0cdbe2..5015e7e 100644
+--- a/README.asciidoc
++++ b/README.asciidoc
+@@ -247,9 +247,11 @@ to fully complete the conversion (prior to subsequent pushing).
+ Some Mercurial names (of branches, bookmarks, tags) may not be a valid git
+ refname. See e.g. `man git-check-ref-format` for a rather involved set of rules.
+ Moreover, while a slash `/` is allowed, it is not supported to have both a `parent`
+-and `parent/child` branch (though only the latter is allowed). So, pending some
+-"nice" bidirectional encoding (not even e.g. URL encoding is safe actually), it is more
+-likely that only a few instances (out of a whole Mercurial repo) are
++and `parent/child` branch (though only the latter is allowed). Even though
++it is not quite (bidirectionally) safe, a (percentage) URL encoding
++(with some additional twist) is performed to obtain sane git refnames, at least
++so for most cases. If some nasty cases still slip through, then likely only
++a few instances (out of a whole Mercurial repo) are
+ problematic. This could be handled by a single-branch clone and/or configuring
+ a suitable refspec. However, it might be more convenient to simply filter out a
+ few unimportant pesky cases, which can be done by configuring a regural
+diff --git a/git-remote-hg b/git-remote-hg
+index 2c07917..cb8582d 100755
+--- a/git-remote-hg
++++ b/git-remote-hg
+@@ -29,6 +29,9 @@ import urlparse
+ import hashlib
+ import time as ptime
+
++urlquote = urllib.quote
++urlunquote = urllib.unquote
++
+ #
+ # If you want to see Mercurial revisions as Git commit notes:
+ # git config core.notesRef refs/notes/hg
+@@ -86,10 +89,13 @@ def hgbin(n):
+ return node.bin(n)
+
+ def hgref(ref):
+- return ref.replace('___', ' ')
++ return urlunquote(ref.replace('___', '%20').replace('%5F%5F%5F', '___'))
+
+ def gitref(ref):
+- return ref.replace(' ', '___')
++ # standard url percentage encoding with a (legacy) twist:
++ # ' ' -> '___'
++ # '___' also percentage encoded
++ return urlquote(ref).replace('___', '%5F%5F%5F').replace('%20', '___')
+
+ def check_version(*check):
+ if not hg_version:
+--
+2.26.2
+
diff --git a/git-remote-hg.spec b/git-remote-hg.spec
index 47be216..4730173 100644
--- a/git-remote-hg.spec
+++ b/git-remote-hg.spec
@@ -1,7 +1,7 @@
%global debug_package %{nil}
Name: git-remote-hg
Version: 1.0.0
-Release: 6%{?dist}
+Release: 7%{?dist}
BuildArch: noarch
Summary: Mercurial wrapper for git
License: GPLv2+
@@ -11,6 +11,7 @@ Source0: https://github.com/mnauw/%{name}/archive/v%{version}.tar.gz#/%{n
# https://github.com/felipec/git-remote-hg/pull/28
# Makes it work with Mercurial 3.2
# The second commit (to the tests) isn't needed against 0.2
+Patch01: 0001-Apply-url-encoding-for-additional-refname-sanitizing.patch
BuildRequires: asciidoc >= 8.4.1
BuildRequires: python2-devel
@@ -26,7 +27,7 @@ repositories as if they were Git ones.
%prep
%setup -q
-#%patch01 -p1
+%patch01 -p1
sed -i -e "1 s|^#!.*|#!%{__python2}|" git-remote-hg
sed -i -e 's|\tinstall|\tinstall -p|' Makefile
@@ -48,6 +49,10 @@ make install-doc
%{_mandir}/man1/*
%changelog
+* Tue Dec 01 2020 Petr Stodulka <pstodulk(a)redhat.com> - 1.0.0-7
+- Apply url encoding for additional refname sanitizing
+- Resolves: #1893525
+
* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
https://src.fedoraproject.org/rpms/git-remote-hg/c/e5a8c2419ba5932d1012b4...
3Â years, 5Â months
salimma pushed to folly (f33). "Update to 2020.11.23.00 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2020-12-01 00:36:21 UTC
From 1ade5cad0ebe673cd6f58cf15418fd197e7b20b6 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma(a)fedoraproject.org>
Date: Nov 23 2020 18:53:08 +0000
Subject: Update to 2020.11.23.00
Signed-off-by: Michel Alexandre Salim <salimma(a)fedoraproject.org>
---
diff --git a/.gitignore b/.gitignore
index 8285225..9642d1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/folly-2020.11.16.00.tar.gz
+/folly-2020.11.23.00.tar.gz
diff --git a/folly.spec b/folly.spec
index bdebe74..418f0aa 100644
--- a/folly.spec
+++ b/folly.spec
@@ -6,7 +6,7 @@
%global _static_builddir static_build
Name: folly
-Version: 2020.11.16.00
+Version: 2020.11.23.00
Release: 1%{?dist}
Summary: An open-source C++ library developed and used at Facebook
@@ -234,6 +234,9 @@ popd
%changelog
+* Mon Nov 23 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 2020.11.23.00-1
+- Update to 2020.11.23.00
+
* Mon Nov 16 2020 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 2020.11.16.00-1
- Update to 2020.11.16.00
- Allow tests to be compiled
diff --git a/sources b/sources
index 42388ce..d38f911 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (folly-2020.11.16.00.tar.gz) = e4b50c50bf1af53f6a7aa307a5eaf452dc913f57e1a56db31237c80c5d90e340e6dcb5baff8bc1cd2f398e40a4aeb8f8c8750af577f5835ab48d89cb7e3df31c
+SHA512 (folly-2020.11.23.00.tar.gz) = 2942e618b9dcc6f53008b02bba1fdbc7428d5fb34bb73f8eee41449944d9c9f9618debd2aa1b84ade883dbacd47bc3cdff797804aed1759a83b855eb0c2212f0
https://src.fedoraproject.org/rpms/folly/c/1ade5cad0ebe673cd6f58cf15418fd...
3Â years, 5Â months