Merge pull request #1 from import/rpm:rosa2016.1

Backports

.abf.yml

@@ -1,3 +1,4 @@
 sources:
-  "cpu-os-macros.tar.gz": 99c5fa561dd0d897bfa8cd97f2aa60781bc578d4
   RPMBDB-0.1.tar.xz: d56f37fff7f7f8b036b4ce3b06c1ab205687596b
+  cpu-os-macros.tar.gz: 99c5fa561dd0d897bfa8cd97f2aa60781bc578d4
+  rpm5-e38555e09747f92be5d09eade4802605561d9585.tar.gz: a5ddbe2a944ecd1dec7bca07d3077cc731bbabfb

autosetup.macros

@@ -60,7 +60,7 @@ end}
 %{lua:\
 local options = rpm.expand("%{!-v:-q} %{-p:-p%{-p*}} ")\
 for i, p in ipairs(patches) do\
-    print(rpm.expand("%apply_patch -m %{basename:"..p.."}  "..options..p.."\\n"))\
+    print(rpm.expand("%apply_patch -m %{basename:"..p.."}  "..options..p.."\\n\\n"))\
 end}
 
 # One macro to (optionally) do it all.

rpm.spec

@@ -1,4 +1,4 @@
-%define commit e2dedc4888e0cc3a8f800085bf3f0bf954fd5f45
+%define commit e38555e09747f92be5d09eade4802605561d9585
 %define short_commit %(echo %{commit} | head -c 4)
 # When updating, change commit hash above to the commit in
 # https://abf.io/soft/rpm5 that you want to build from
@@ -65,7 +65,7 @@ Summary:	The RPM package management system
 Name:		rpm
 Epoch:		1
 Version:	%{libver}.%{minorver}
-Release:	100.git%{short_commit}
+Release:	115.git%{short_commit}
 License:	LGPLv2.1+
 Group:		System/Configuration/Packaging
 Url:		http://rpm5.org/
@@ -90,6 +90,7 @@ BuildRequires:	automake >= 1.8
 BuildRequires:	elfutils-devel
 BuildRequires:	sed >= 4.0.3
 BuildRequires:	beecrypt-devel >= 4.2.1-8
+BuildRequires:	pkgconfig(libgcrypt)
 BuildRequires:	ed
 BuildRequires:	gettext-devel
 BuildRequires:	byacc
@@ -185,6 +186,7 @@ Requires:	update-alternatives
 Requires:	%{bdb}_recover
 Suggests:	%{bdb}-utils
 Requires:	%{librpmname} = %{EVRD}
+Requires(pre):	%{librpmname} = %{EVRD}
 Conflicts:	rpm-build < 1:5.3.10-0.20110422.3
 Requires(pre):	coreutils
 %rename		rpmconstant
@@ -274,6 +276,12 @@ about the package like its version, a description, etc.
 
 #----------------------------------------------------------------------------
 
+%define libgcrypt_maj %(readlink %{_libdir}/libgcrypt.so | \
+	awk -F '\\.so\\.' '{print $NF}' | cut -d'.' -f1 || \
+	echo 0)
+%define libgcrypt_ver %(%{_bindir}/libgcrypt-config --version || echo 0)
+%define libgcrypt_libname %mklibname gcrypt %{libgcrypt_maj}
+
 %package -n %{librpmname}
 Summary:	Libraries used by rpm
 Group:		System/Libraries
@@ -283,6 +291,12 @@ Conflicts:	librpm < 5.3
 Conflicts:	%{_lib}db5.1 < 5.1.25
 Conflicts:	%{_lib}elfutils1 < 0.152
 Conflicts:	%{_lib}beecrypt7 < 4.2.1
+# RPM 5 previously did not use libgcrypt, but, due to urpmi bug
+# https://bugzilla.rosalinux.ru/show_bug.cgi?id=6849,
+# libgcrypt is not pulled before RPM when updating old systems,
+# this was reported to lead to corruption of RPM DB,
+# so we have to manually force urpmi to install libgcrypt before RPM.
+Requires(pre):	%{libgcrypt_libname} >= %{libgcrypt_ver}
 
 %description -n %{librpmname}
 RPM is a powerful command line driven package management system capable of
@@ -667,6 +681,7 @@ tar -zxf %{SOURCE3} -C cpu-os-macros
 		--with-path-magic=%{_datadir}/misc/magic.mgc \
 		--with-beecrypt=external \
 		--with-usecrypto=beecrypt \
+		--with-gcrypt=external \
 		--with-keyutils=external \
 		--with-neon=external \
 		--with-acl \