uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions

View file

@ -0,0 +1,75 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, boost, zlib, botan2, libidn
, lua, pcre, sqlite, perl, pkg-config, expect, less
, bzip2, gmp, openssl
, autoreconfHook, texinfo
, fetchpatch
}:
let
version = "1.1-unstable-2021-05-01";
perlVersion = lib.getVersion perl;
in
assert perlVersion != "";
stdenv.mkDerivation rec {
pname = "monotone";
inherit version;
# src = fetchurl {
# url = "http://monotone.ca/downloads/${version}/monotone-${version}.tar.bz2";
# sha256 = "124cwgi2q86hagslbk5idxbs9j896rfjzryhr6z63r6l485gcp7r";
# };
# My mirror of upstream Monotone repository
# Could fetchmtn, but circular dependency; snapshot requested
# https://lists.nongnu.org/archive/html/monotone-devel/2021-05/msg00000.html
src = fetchFromGitHub {
owner = "7c6f434c";
repo = "monotone-mirror";
rev = "b30b0e1c16def043d2dad57d1467d5bfdecdb070";
hash = "sha256:1hfy8vaap3184cd7h3qhz0da7c992idkc6q2nz9frhma45c5vgmd";
};
patches = [
./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch
./monotone-1.1-adapt-to-botan2.patch
(fetchpatch {
name = "rm-clang-float128-hack.patch";
url = "https://github.com/7c6f434c/monotone-mirror/commit/5f01a3a9326a8dbdae7fc911b208b7c319e5f456.patch";
revert = true;
sha256 = "0fzjdv49dx5lzvqhkvk50lkccagwx8h0bfha4a0k6l4qh36f9j7c";
})
];
postPatch = ''
sed -e 's@/usr/bin/less@${less}/bin/less@' -i src/unix/terminal.cc
'';
CXXFLAGS=" --std=c++11 ";
nativeBuildInputs = [ pkg-config autoreconfHook texinfo ];
buildInputs = [ boost zlib botan2 libidn lua pcre sqlite expect
openssl gmp bzip2 perl ];
postInstall = ''
mkdir -p $out/share/${pname}-${version}
cp -rv contrib/ $out/share/${pname}-${version}/contrib
mkdir -p $out/${perl.libPrefix}/${perlVersion}
cp -v contrib/Monotone.pm $out/${perl.libPrefix}/${perlVersion}
patchShebangs "$out/share/monotone"
patchShebangs "$out/share/${pname}-${version}"
find "$out"/share/{doc/monotone,${pname}-${version}}/contrib/ -type f | xargs sed -e 's@! */usr/bin/@!/usr/bin/env @; s@! */bin/bash@!/usr/bin/env bash@' -i
'';
#doCheck = true; # some tests fail (and they take VERY long)
meta = with lib; {
description = "A free distributed version control system";
maintainers = [ maintainers.raskin ];
platforms = platforms.unix;
license = licenses.gpl2Plus;
};
}

View file

@ -0,0 +1,66 @@
From 70f209ad582121750d54e3692b1e62c7f36af6f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Mon, 7 May 2018 14:09:06 +0200
Subject: [PATCH] Adapt to changes in pcre-8.42
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
pcre-8.42 replaced internal real_pcre with real_pcre8_or_16. This
broke monotone that decided not to use the public "pcre" type.
This patch adapts monotone to the pcre >= 8.42.
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
src/pcrewrap.cc | 4 ++--
src/pcrewrap.hh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/pcrewrap.cc b/src/pcrewrap.cc
index 8c0c9d1..30bafff 100644
--- a/src/pcrewrap.cc
+++ b/src/pcrewrap.cc
@@ -74,7 +74,7 @@ get_capturecount(void const * bd)
namespace pcre
{
typedef map<char const *,
- pair<struct real_pcre const *, struct pcre_extra const *> >
+ pair<struct real_pcre8_or_16 const *, struct pcre_extra const *> >
regex_cache;
class regex_cache_manager
@@ -86,7 +86,7 @@ public:
}
void store(char const * pattern,
- pair<struct real_pcre const *, struct pcre_extra const *>
+ pair<struct real_pcre8_or_16 const *, struct pcre_extra const *>
data)
{
cache[pattern] = data;
diff --git a/src/pcrewrap.hh b/src/pcrewrap.hh
index 3359cdd..5008e88 100644
--- a/src/pcrewrap.hh
+++ b/src/pcrewrap.hh
@@ -18,7 +18,7 @@
// definitions and so we don't actually expose it here. Unfortunately, this
// means we have to hope this pair of forward declarations will not change...
-struct real_pcre;
+struct real_pcre8_or_16;
struct pcre_extra;
namespace pcre
@@ -61,7 +61,7 @@ namespace pcre
regex & operator=(regex const &);
// data
- struct real_pcre const * basedat;
+ struct real_pcre8_or_16 const * basedat;
struct pcre_extra const * extradat;
// used by constructors
--
2.14.3

View file

@ -0,0 +1,15 @@
Botan2 has switched the parameter order in encryption descriptions
--- monotone-upstream/src/botan_glue.hh 2021-08-17 19:06:32.736753732 +0200
+++ monotone-patched/src/botan_glue.hh 2021-08-17 19:07:44.437750535 +0200
@@ -45,7 +45,9 @@
// In Botan revision d8021f3e (back when it still used monotone) the name
// of SHA-1 changed to SHA-160.
const static char * PBE_PKCS5_KEY_FORMAT =
-#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,11,0)
+#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(2,0,0)
+ "PBE-PKCS5v20(TripleDES/CBC,SHA-160)";
+#elif BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,11,0)
"PBE-PKCS5v20(SHA-160,TripleDES/CBC)";
#else
"PBE-PKCS5v20(SHA-1,TripleDES/CBC)";