From 79898e92ca985bdc620a00cee15d992f77af9020 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sat, 21 Nov 2020 19:33:52 +0100 Subject: [PATCH] - allow '@' in version / release --- allow-at-in-ver-rel.patch | 11 +++++++++++ rpm.spec | 4 +++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 allow-at-in-ver-rel.patch diff --git a/allow-at-in-ver-rel.patch b/allow-at-in-ver-rel.patch new file mode 100644 index 0000000..66964a6 --- /dev/null +++ b/allow-at-in-ver-rel.patch @@ -0,0 +1,11 @@ +--- rpm-4.16.0/build/rpmbuild_internal.h~ 2020-05-28 12:04:25.000000000 +0200 ++++ rpm-4.16.0/build/rpmbuild_internal.h 2020-11-21 19:32:47.432243301 +0100 +@@ -18,7 +18,7 @@ + #undef HTDATATYPE + + #define WHITELIST_NAME ".-_+%{}" +-#define WHITELIST_VERREL "._+%{}~^" ++#define WHITELIST_VERREL "._+%{}~^@" + #define WHITELIST_EVR WHITELIST_VERREL "-:" + #define LEN_AND_STR(_tag) (sizeof(_tag)-1), (_tag) + diff --git a/rpm.spec b/rpm.spec index e5cd897..2cba870 100644 --- a/rpm.spec +++ b/rpm.spec @@ -26,7 +26,7 @@ Summary(ru.UTF-8): Менеджер пакетов от RPM Summary(uk.UTF-8): Менеджер пакетів від RPM Name: rpm Version: 4.16.0 -Release: 0.7 +Release: 0.8 Epoch: 1 License: GPL v2 / LGPL v2.1 Group: Base @@ -76,6 +76,7 @@ Patch22: ix86-platforms.patch Patch23: shortcircuited-deps.patch Patch24: cpuinfo-deps.patch Patch25: rpmio-read-proc-files.patch +Patch26: allow-at-in-ver-rel.patch URL: https://rpm.org/ BuildRequires: acl-devel BuildRequires: db-devel >= %{db_ver} @@ -567,6 +568,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze %patch23 -p1 %patch24 -p1 %patch25 -p1 +%patch26 -p1 install %{SOURCE15} scripts/perl.prov.in -- 2.43.0