backported git and xrootd from devel IBs in to production 10.2.X IB

git-2.12.0-runtime.patch → git-2.16.2-runtime.patch

@@ -1,29 +1,22 @@
 diff --git a/exec_cmd.c b/exec_cmd.c
-index fb94aeb..7dc84b0 100644
+index ce192a2..2414b2b 100644
 --- a/exec_cmd.c
 +++ b/exec_cmd.c
-@@ -5,12 +5,12 @@
- #define MAX_ARGS	32
-
+@@ -7,19 +7,21 @@
  static const char *argv_exec_path;
+
+ #ifdef RUNTIME_PREFIX
 -static const char *argv0_path;
 +static const char *argv0_path = NULL;
 
- char *system_path(const char *path)
+ static const char *system_prefix(void)
  {
- #ifdef RUNTIME_PREFIX
 -	static const char *prefix;
 +	static const char *prefix = NULL;
- #else
- 	static const char *prefix = PREFIX;
- #endif
-@@ -20,13 +20,12 @@ char *system_path(const char *path)
- 		return xstrdup(path);
 
- #ifdef RUNTIME_PREFIX
--	assert(argv0_path);
--	assert(is_absolute_path(argv0_path));
--
+ 	assert(argv0_path);
+ 	assert(is_absolute_path(argv0_path));
+
 -	if (!prefix &&
 -	    !(prefix = strip_path_suffix(argv0_path, GIT_EXEC_PATH)) &&
 -	    !(prefix = strip_path_suffix(argv0_path, BINDIR)) &&

git.spec

@@ -1,4 +1,4 @@
-### RPM external git 2.13.0
+### RPM external git 2.16.2
 ## INITENV +PATH PATH %{i}/bin
 ## INITENV +PATH PATH %{i}/libexec/git-core
 ## INITENV SET GIT_TEMPLATE_DIR %{i}/share/git-core/templates
@@ -10,8 +10,8 @@
 %define isLinux %(case $(uname -s) in (Linux) echo 1 ;; (*) echo 0 ;; esac)
 
 Source0: https://github.com/git/git/archive/v%{realversion}.tar.gz
-Source1: https://raw.github.com/bagder/curl/curl-7_53_1/lib/mk-ca-bundle.pl
-Patch1: git-2.12.0-runtime
+Source1: https://raw.github.com/bagder/curl/curl-7_59_0/lib/mk-ca-bundle.pl
+Patch1: git-2.16.2-runtime
 
 Requires: curl expat openssl zlib pcre
 BuildRequires: autotools
@@ -36,6 +36,7 @@ Provides: perl(Time::HiRes)
 
 %build
 export LDFLAGS="-L${OPENSSL_ROOT}/lib"
+export NO_LIBPCRE1_JIT=1
 make %{makeprocesses} configure
 ./configure prefix=%{i} \
    --with-curl=${CURL_ROOT} \
@@ -64,6 +65,7 @@ chmod +x ./mk-ca-bundle.pl
 popd
 
 %install
+export NO_LIBPCRE1_JIT=1
 make %{makeprocesses} \
   V=1 \
   NO_CROSS_DIRECTORY_HARDLINK=1 \

xrootd.spec

@@ -1,7 +1,7 @@
-### RPM external xrootd 4.6.1
+### RPM external xrootd 4.8.1
 ## INITENV +PATH LD_LIBRARY_PATH %i/lib64
-%define tag 406ec963de0c7d402ba766e6954ddda7f76c8449
-%define branch cms/v4.6.1
+%define tag 6ef81d9e2250176712b4feb49f8496185f494ac5
+%define branch cms/v%{realversion}
 %define github_user cms-externals
 Source: git+https://github.com/%github_user/xrootd.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz