dac7c0
import rpm-4.11.3-40.el7
Authored and Committed by 
centosrcm
5 years ago
SOURCES/rpm-4.11.3-brp-python-bytecompile-Fix-when-default-python-is-no.patch
file added
+27
SOURCES/rpm-4.11.x-add-g-libs.patch
file added
+86
SOURCES/rpm-4.11.x-disk-space-calculation.patch
file added
+77
SOURCES/rpm-4.11.x-perl.req-6.patch
file added
+81
SOURCES/rpm-4.11.x-remove-perl-provides-from-requires.patch
file added
+104
SOURCES/rpm-4.11.x-setcaps.patch
file added
+28
SOURCES/rpm-4.13.x-bad-owner-group.patch
file added
+53
SPECS/rpm.spec
file modified
+38
-1
SOURCES/rpm-4.11.3-brp-python-bytecompile-Fix-when-default-python-is-no.patch
ADDED
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
--- rpm-4.11.3/scripts/brp-python-bytecompile.old 2014-02-05 14:04:02.000000000 +0100
|
|
2
|
+
+++ rpm-4.11.3/scripts/brp-python-bytecompile 2019-03-25 09:43:06.272804044 +0100
|
|
3
|
+
|
|
4
|
+
exit 0
|
|
5
|
+
fi
|
|
6
|
+
|
|
7
|
+
-# If we don't have a python interpreter, avoid changing anything.
|
|
8
|
+
-default_python=${1:-/usr/bin/python}
|
|
9
|
+
-if [ ! -x "$default_python" ]; then
|
|
10
|
+
- exit 0
|
|
11
|
+
-fi
|
|
12
|
+
-
|
|
13
|
+
# Figure out how deep we need to descend. We could pick an insanely high
|
|
14
|
+
# number and hope it's enough, but somewhere, somebody's sure to run into it.
|
|
15
|
+
depth=`(find "$RPM_BUILD_ROOT" -type f -name "*.py" -print0 ; echo /) | \
|
|
16
|
+
|
|
17
|
+
fi
|
|
18
|
+
done
|
|
19
|
+
|
|
20
|
+
+# If we don't have a python interpreter, avoid changing anything.
|
|
21
|
+
+default_python=${1:-/usr/bin/python}
|
|
22
|
+
+if [ ! -x "$default_python" ]; then
|
|
23
|
+
+ exit 0
|
|
24
|
+
+fi
|
|
25
|
+
|
|
26
|
+
# Handle other locations in the filesystem using the default python
|
|
27
|
+
# implementation:
|
SOURCES/rpm-4.11.x-add-g-libs.patch
ADDED
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
--- rpm-4.11.3/scripts/find-debuginfo.sh.old 2019-01-02 13:14:10.283068553 +0100
|
|
2
|
+
+++ rpm-4.11.3/scripts/find-debuginfo.sh 2019-03-21 09:36:06.196400883 +0100
|
|
3
|
+
|
|
4
|
+
#for inclusion in an rpm spec file.
|
|
5
|
+
#
|
|
6
|
+
# Usage: find-debuginfo.sh [--strict-build-id] [-g] [-r] [-m]
|
|
7
|
+
+# [--g-libs]
|
|
8
|
+
# [-o debugfiles.list]
|
|
9
|
+
# [--run-dwz] [--dwz-low-mem-die-limit N]
|
|
10
|
+
# [--dwz-max-die-limit N]
|
|
11
|
+
|
|
12
|
+
# [builddir]
|
|
13
|
+
#
|
|
14
|
+
# The -g flag says to use strip -g instead of full strip on DSOs or EXEs.
|
|
15
|
+
+# The --g-libs flag says to use strip -g instead of full strip ONLY on DSOs.
|
|
16
|
+
+# Options -g and --g-libs are mutually exclusive.
|
|
17
|
+
# The --strict-build-id flag says to exit with failure status if
|
|
18
|
+
# any ELF binary processed fails to contain a build-id note.
|
|
19
|
+
# The -r flag says to use eu-strip --reloc-debug-sections.
|
|
20
|
+
|
|
21
|
+
# With -g arg, pass it to strip on libraries or executables.
|
|
22
|
+
strip_g=false
|
|
23
|
+
|
|
24
|
+
+# With --g-libs arg, pass it to strip on libraries.
|
|
25
|
+
+strip_glibs=false
|
|
26
|
+
+
|
|
27
|
+
# with -r arg, pass --reloc-debug-sections to eu-strip.
|
|
28
|
+
strip_r=false
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
dwz_max_die_limit=$2
|
|
32
|
+
shift
|
|
33
|
+
;;
|
|
34
|
+
+ --g-libs)
|
|
35
|
+
+ strip_glibs=true
|
|
36
|
+
+ ;;
|
|
37
|
+
-g)
|
|
38
|
+
strip_g=true
|
|
39
|
+
;;
|
|
40
|
+
|
|
41
|
+
shift
|
|
42
|
+
done
|
|
43
|
+
|
|
44
|
+
+if ("$strip_g" = "true") && ("$strip_glibs" = "true"); then
|
|
45
|
+
+ echo >&2 "*** ERROR: -g and --g-libs cannot be used together"
|
|
46
|
+
+ exit 2
|
|
47
|
+
+fi
|
|
48
|
+
+
|
|
49
|
+
i=0
|
|
50
|
+
while ((i < nout)); do
|
|
51
|
+
outs[$i]="$BUILDDIR/${outs[$i]}"
|
|
52
|
+
|
|
53
|
+
application/x-sharedlib*) g=-g ;;
|
|
54
|
+
application/x-executable*) g=-g ;;
|
|
55
|
+
esac
|
|
56
|
+
+ $strip_glibs && case "$(file -bi "$2")" in
|
|
57
|
+
+ application/x-sharedlib*) g=-g ;;
|
|
58
|
+
+ esac
|
|
59
|
+
eu-strip --remove-comment $r $g -f "$1" "$2" || exit
|
|
60
|
+
chmod 444 "$1" || exit
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
chmod u-w "$f"
|
|
64
|
+
fi
|
|
65
|
+
|
|
66
|
+
- $include_minidebug && add_minidebug "${debugfn}" "$f"
|
|
67
|
+
+ # strip -g implies we have full symtab, don't add mini symtab in that case.
|
|
68
|
+
+ # It only makes sense to add a minisymtab for executables and shared
|
|
69
|
+
+ # libraries. Other executable ELF files (like kernel modules) don't need it.
|
|
70
|
+
+ if [ "$include_minidebug" = "true" -a "$strip_g" = "false" ]; then
|
|
71
|
+
+ skip_mini=true
|
|
72
|
+
+ if [ "$strip_glibs" = "false" ]; then
|
|
73
|
+
+ case "$(file -bi "$f")" in
|
|
74
|
+
+ application/x-sharedlib*) skip_mini=false ;;
|
|
75
|
+
+ esac
|
|
76
|
+
+ fi
|
|
77
|
+
+ case "$(file -bi "$f")" in
|
|
78
|
+
+ application/x-sharedlib*) skip_mini=false ;;
|
|
79
|
+
+ application/x-executable*) skip_mini=false ;;
|
|
80
|
+
+ application/x-pie-executable*) skip_mini=false ;;
|
|
81
|
+
+ esac
|
|
82
|
+
+ $skip_mini || add_minidebug "${debugfn}" "$f"
|
|
83
|
+
+ fi
|
|
84
|
+
|
|
85
|
+
echo "./${f#$RPM_BUILD_ROOT}" >> "$ELFBINSFILE"
|
|
86
|
+
|
SOURCES/rpm-4.11.x-disk-space-calculation.patch
ADDED
|
@@ -0,0 +1,77 @@
|
|
|
1
|
+
--- rpm-4.11.3/lib/transaction.c.old 2019-01-02 13:14:10.304068576 +0100
|
|
2
|
+
+++ rpm-4.11.3/lib/transaction.c 2019-02-28 11:03:32.164403544 +0100
|
|
3
|
+
|
|
4
|
+
return rConflicts;
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
+static rpm_loff_t DivideHardlinkSize(int nlink, rpm_loff_t originalSize)
|
|
8
|
+
+{
|
|
9
|
+
+ return (originalSize / nlink) + 1;
|
|
10
|
+
+}
|
|
11
|
+
+
|
|
12
|
+
/**
|
|
13
|
+
* handleInstInstalledFiles.
|
|
14
|
+
* @param ts transaction set
|
|
15
|
+
|
|
16
|
+
{
|
|
17
|
+
rpmfs fs = rpmteGetFileStates(p);
|
|
18
|
+
int isCfgFile = ((rpmfiFFlagsIndex(otherFi, ofx) | rpmfiFFlagsIndex(fi, fx)) & RPMFILE_CONFIG);
|
|
19
|
+
+ rpm_loff_t otherFileSize;
|
|
20
|
+
+ int nlink;
|
|
21
|
+
|
|
22
|
+
if (XFA_SKIPPING(rpmfsGetAction(fs, fx)))
|
|
23
|
+
return;
|
|
24
|
+
|
|
25
|
+
action = rpmfiDecideFateIndex(otherFi, ofx, fi, fx, skipMissing);
|
|
26
|
+
rpmfsSetAction(fs, fx, action);
|
|
27
|
+
}
|
|
28
|
+
- rpmfiSetFReplacedSizeIndex(fi, fx, rpmfiFSizeIndex(otherFi, ofx));
|
|
29
|
+
+
|
|
30
|
+
+ otherFileSize = rpmfiFSizeIndex(otherFi, ofx);
|
|
31
|
+
+
|
|
32
|
+
+ /* Only an appropriate fraction of the file size of a hardlink */
|
|
33
|
+
+ nlink = rpmfiFNlinkIndex(otherFi, ofx);
|
|
34
|
+
+ if (nlink > 1)
|
|
35
|
+
+ otherFileSize = DivideHardlinkSize(nlink, otherFileSize);
|
|
36
|
+
+
|
|
37
|
+
+ rpmfiSetFReplacedSizeIndex(fi, fx, otherFileSize);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
|
|
42
|
+
rpmfileAttrs FFlags;
|
|
43
|
+
struct rpmffi_s * recs;
|
|
44
|
+
int numRecs;
|
|
45
|
+
+ rpm_loff_t fileSize;
|
|
46
|
+
+ int nlink;
|
|
47
|
+
|
|
48
|
+
if (XFA_SKIPPING(rpmfsGetAction(fs, i)))
|
|
49
|
+
continue;
|
|
50
|
+
|
|
51
|
+
break;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
+ fileSize = rpmfiFSizeIndex(fi, i);
|
|
55
|
+
+ nlink = rpmfiFNlinkIndex(fi, i);
|
|
56
|
+
+ /* Only an appropriate fraction of the file sizeof a hardlink */
|
|
57
|
+
+ if (nlink > 1)
|
|
58
|
+
+ fileSize = DivideHardlinkSize(nlink, fileSize);
|
|
59
|
+
+
|
|
60
|
+
/* Update disk space info for a file. */
|
|
61
|
+
rpmtsUpdateDSI(ts, fpEntryDev(fpc, fiFps), fpEntryDir(fpc, fiFps),
|
|
62
|
+
- rpmfiFSizeIndex(fi, i), rpmfiFReplacedSizeIndex(fi, i),
|
|
63
|
+
+ fileSize, rpmfiFReplacedSizeIndex(fi, i),
|
|
64
|
+
fixupSize, rpmfsGetAction(fs, i));
|
|
65
|
+
|
|
66
|
+
}
|
|
67
|
+
--- rpm-4.11.3/lib/rpmfi.h.old 2014-02-05 14:04:02.000000000 +0100
|
|
68
|
+
+++ rpm-4.11.3/lib/rpmfi.h 2019-01-07 09:57:40.407787724 +0100
|
|
69
|
+
|
|
70
|
+
|
|
71
|
+
#define RPMFI_FLAGS_ERASE \
|
|
72
|
+
(RPMFI_NOFILECLASS | RPMFI_NOFILELANGS | \
|
|
73
|
+
- RPMFI_NOFILEMTIMES | RPMFI_NOFILERDEVS | RPMFI_NOFILEINODES | \
|
|
74
|
+
+ RPMFI_NOFILEMTIMES | RPMFI_NOFILERDEVS | \
|
|
75
|
+
RPMFI_NOFILEVERIFYFLAGS)
|
|
76
|
+
|
|
77
|
+
#define RPMFI_FLAGS_INSTALL \
|
SOURCES/rpm-4.11.x-perl.req-6.patch
ADDED
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
--- rpm-4.11.3/scripts/perl.req.old 2019-05-26 15:41:33.316395021 +0200
|
|
2
|
+
+++ rpm-4.11.3/scripts/perl.req 2019-05-26 14:08:38.248028422 +0200
|
|
3
|
+
|
|
4
|
+
|
|
5
|
+
sub compute_global_requires {
|
|
6
|
+
|
|
7
|
+
-# restrict require to all non provided by the file
|
|
8
|
+
- foreach my $moduler (sort keys %require) {
|
|
9
|
+
- if (exists $provide{$moduler} && length($require{$moduler}) == 0) {
|
|
10
|
+
- $require = delete $require{$moduler};
|
|
11
|
+
+# restrict require_removable to all non provided by the file
|
|
12
|
+
+ foreach my $moduler (sort keys %require_removable) {
|
|
13
|
+
+ if (exists $provide{$moduler} && length($require_removable{$moduler}) == 0) {
|
|
14
|
+
+ $require_removable = delete $require_removable{$moduler};
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
# store requires to global_requires
|
|
18
|
+
|
|
19
|
+
$global_require{$module} = $newver;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
+
|
|
23
|
+
+# store requires_removable to global_requires
|
|
24
|
+
+ foreach my $module (sort keys %require_removable) {
|
|
25
|
+
+ my $oldver = $global_require{$module};
|
|
26
|
+
+ my $newver = $require_removable{$module};
|
|
27
|
+
+ if ($oldver) {
|
|
28
|
+
+ $global_require{$module} = $newver
|
|
29
|
+
+ if ($HAVE_VERSION && $newver && version->new($oldver) < $newver);
|
|
30
|
+
+ } else {
|
|
31
|
+
+ $global_require{$module} = $newver;
|
|
32
|
+
+ }
|
|
33
|
+
+ }
|
|
34
|
+
# remove all local requires and provides
|
|
35
|
+
undef %require;
|
|
36
|
+
+ undef %require_removable;
|
|
37
|
+
undef %provide;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
+sub add_require_removable {
|
|
45
|
+
+ my ($module, $newver) = @_;
|
|
46
|
+
+ my $oldver = $require_removable{$module};
|
|
47
|
+
+ if ($oldver) {
|
|
48
|
+
+ $require_removable{$module} = $newver
|
|
49
|
+
+ if ($HAVE_VERSION && $newver && version->new($oldver) < $newver);
|
|
50
|
+
+ }
|
|
51
|
+
+ else {
|
|
52
|
+
+ $require_removable{$module} = $newver;
|
|
53
|
+
+ }
|
|
54
|
+
+}
|
|
55
|
+
+
|
|
56
|
+
sub process_file {
|
|
57
|
+
|
|
58
|
+
my ($file) = @_;
|
|
59
|
+
|
|
60
|
+
|
|
61
|
+
# if the module starts with /, it is an absolute path to a file
|
|
62
|
+
if ($module =~ m(^/)) {
|
|
63
|
+
- print "$module\n";
|
|
64
|
+
next;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
|
|
68
|
+
add_require($_, undef) for split(' ', $1);
|
|
69
|
+
}
|
|
70
|
+
elsif ($version =~ /(["'])([^"']+)\1/) {
|
|
71
|
+
- add_require($2, undef);
|
|
72
|
+
+ # requires like "use base name" can be removed if they are
|
|
73
|
+
+ # provided in the same file
|
|
74
|
+
+ if (($whitespace eq "") && ($statement eq "use") && ($module eq "base")) {
|
|
75
|
+
+ add_require_removable($2, undef);
|
|
76
|
+
+ } else {
|
|
77
|
+
+ add_require($2, undef);
|
|
78
|
+
+ }
|
|
79
|
+
}
|
|
80
|
+
next;
|
|
81
|
+
}
|
SOURCES/rpm-4.11.x-remove-perl-provides-from-requires.patch
ADDED
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
--- rpm-4.11.3/scripts/perl.req.old 2019-01-02 13:14:10.258068525 +0100
|
|
2
|
+
+++ rpm-4.11.3/scripts/perl.req 2019-02-28 11:00:57.200220227 +0100
|
|
3
|
+
|
|
4
|
+
$HAVE_VERSION = 0;
|
|
5
|
+
eval { require version; $HAVE_VERSION = 1; };
|
|
6
|
+
|
|
7
|
+
+use File::Basename;
|
|
8
|
+
+my $dir = dirname($0);
|
|
9
|
+
+$HAVE_PROV = 0;
|
|
10
|
+
+if ( -e "$dir/perl.prov" ) {
|
|
11
|
+
+ $HAVE_PROV = 1;
|
|
12
|
+
+ $prov_script = "$dir/perl.prov";
|
|
13
|
+
+}
|
|
14
|
+
|
|
15
|
+
if ("@ARGV") {
|
|
16
|
+
- foreach (@ARGV) {
|
|
17
|
+
- process_file($_);
|
|
18
|
+
+ foreach my $file (@ARGV) {
|
|
19
|
+
+ process_file($file);
|
|
20
|
+
+ process_file_provides($file);
|
|
21
|
+
+ compute_global_requires();
|
|
22
|
+
}
|
|
23
|
+
} else {
|
|
24
|
+
|
|
25
|
+
# notice we are passed a list of filenames NOT as common in unix the
|
|
26
|
+
# contents of the file.
|
|
27
|
+
|
|
28
|
+
- foreach (<>) {
|
|
29
|
+
- process_file($_);
|
|
30
|
+
+ foreach my $file (<>) {
|
|
31
|
+
+ process_file($file);
|
|
32
|
+
+ process_file_provides($file);
|
|
33
|
+
+ compute_global_requires();
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
foreach $perlver (sort keys %perlreq) {
|
|
39
|
+
print "perl >= $perlver\n";
|
|
40
|
+
}
|
|
41
|
+
-foreach $module (sort keys %require) {
|
|
42
|
+
- if (length($require{$module}) == 0) {
|
|
43
|
+
+
|
|
44
|
+
+foreach my $module (sort keys %global_require) {
|
|
45
|
+
+ if (length($global_require{$module}) == 0) {
|
|
46
|
+
print "perl($module)\n";
|
|
47
|
+
} else {
|
|
48
|
+
|
|
49
|
+
|
|
50
|
+
# operators. Also I will need to change the processing of the
|
|
51
|
+
# $RPM_* variable when I upgrade.
|
|
52
|
+
|
|
53
|
+
- print "perl($module) >= $require{$module}\n";
|
|
54
|
+
+ print "perl($module) >= $global_require{$module}\n";
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
exit 0;
|
|
59
|
+
|
|
60
|
+
-
|
|
61
|
+
+sub compute_global_requires {
|
|
62
|
+
+
|
|
63
|
+
+# restrict require to all non provided by the file
|
|
64
|
+
+ foreach my $moduler (sort keys %require) {
|
|
65
|
+
+ if (exists $provide{$moduler} && length($require{$moduler}) == 0) {
|
|
66
|
+
+ $require = delete $require{$moduler};
|
|
67
|
+
+ }
|
|
68
|
+
+ }
|
|
69
|
+
+# store requires to global_requires
|
|
70
|
+
+ foreach my $module (sort keys %require) {
|
|
71
|
+
+ my $oldver = $global_require{$module};
|
|
72
|
+
+ my $newver = $require{$module};
|
|
73
|
+
+ if ($oldver) {
|
|
74
|
+
+ $global_require{$module} = $newver
|
|
75
|
+
+ if ($HAVE_VERSION && $newver && version->new($oldver) < $newver);
|
|
76
|
+
+ } else {
|
|
77
|
+
+ $global_require{$module} = $newver;
|
|
78
|
+
+ }
|
|
79
|
+
+ }
|
|
80
|
+
+# remove all local requires and provides
|
|
81
|
+
+ undef %require;
|
|
82
|
+
+ undef %provide;
|
|
83
|
+
+}
|
|
84
|
+
|
|
85
|
+
sub add_require {
|
|
86
|
+
my ($module, $newver) = @_;
|
|
87
|
+
|
|
88
|
+
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
91
|
+
+
|
|
92
|
+
+sub process_file_provides {
|
|
93
|
+
+
|
|
94
|
+
+ my ($file) = @_;
|
|
95
|
+
+ chomp $file;
|
|
96
|
+
+
|
|
97
|
+
+ return if (! $HAVE_PROV);
|
|
98
|
+
+
|
|
99
|
+
+ my @result = readpipe( "$prov_script $file" );
|
|
100
|
+
+ foreach my $prov (@result) {
|
|
101
|
+
+ $provide{$1} = undef if $prov =~ /perl\(([_:a-zA-Z0-9]+)\)/;
|
|
102
|
+
+ }
|
|
103
|
+
+
|
|
104
|
+
+}
|
SOURCES/rpm-4.11.x-setcaps.patch
ADDED
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
--- rpm-4.11.3/rpmpopt.in.old 2019-01-02 13:14:10.222068485 +0100
|
|
2
|
+
+++ rpm-4.11.3/rpmpopt.in 2019-01-02 13:36:46.212326391 +0100
|
|
3
|
+
|
|
4
|
+
--pipe "(echo 'ch() { chown -h -- \"$1\" \"$3\";chgrp -h -- \"$2\" \"$3\"; }';grep '^ch '|grep -v \(none\))|sh" \
|
|
5
|
+
--POPTdesc=$"set user/group ownership of files in a package"
|
|
6
|
+
|
|
7
|
+
+
|
|
8
|
+
+rpm alias --setcaps -q --qf \
|
|
9
|
+
+ "[if \[ -f %{FILENAMES:shescape} -a ! -L %{FILENAMES:shescape} \]; then\n\
|
|
10
|
+
+%|FILECAPS?{ if \[ -n %{FILECAPS:shescape} \]; then\n\
|
|
11
|
+
+ setcap %{FILECAPS:shescape} %{FILENAMES:shescape}\n\
|
|
12
|
+
+ el}:{ }|if \[ -n \"\$(getcap %{FILENAMES:shescape})\" \]; then\n\
|
|
13
|
+
+ setcap -r %{FILENAMES:shescape}\n\
|
|
14
|
+
+ fi\n\
|
|
15
|
+
+fi\n]" \
|
|
16
|
+
+ --pipe "sh" \
|
|
17
|
+
+ --POPTdesc=$"set capabilities of files in a package"
|
|
18
|
+
+
|
|
19
|
+
+rpm alias --restore -q --qf \
|
|
20
|
+
+ '[ rpm --setugids %{NAME:shescape}; \
|
|
21
|
+
+ rpm --setperms %{NAME:shescape}; \
|
|
22
|
+
+ rpm --setcaps %{NAME:shescape}; \n]' --pipe "sh" \
|
|
23
|
+
+ --POPTdesc=$"restore file/directory permissions"
|
|
24
|
+
+
|
|
25
|
+
+
|
|
26
|
+
rpm alias --conflicts --qf \
|
|
27
|
+
"[%|VERBOSE?{%{CONFLICTFLAGS:deptype}: }:{}|%{CONFLICTNEVRS}\n]" \
|
|
28
|
+
--POPTdesc=$"list capabilities this package conflicts with"
|
SOURCES/rpm-4.13.x-bad-owner-group.patch
ADDED
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
--- rpm-4.11.3/build/files.c.old 2019-01-02 13:14:10.217068479 +0100
|
|
2
|
+
+++ rpm-4.11.3/build/files.c 2019-03-20 13:18:38.290142740 +0100
|
|
3
|
+
|
|
4
|
+
flp->fl_mode &= S_IFMT;
|
|
5
|
+
flp->fl_mode |= fl.def.ar.ar_fmode;
|
|
6
|
+
}
|
|
7
|
+
+
|
|
8
|
+
if (fl.def.ar.ar_user) {
|
|
9
|
+
flp->uname = fl.def.ar.ar_user;
|
|
10
|
+
} else {
|
|
11
|
+
flp->uname = rpmstrPoolId(fl.pool, rpmugUname(flp->fl_uid), 1);
|
|
12
|
+
}
|
|
13
|
+
+ if (! flp->uname) {
|
|
14
|
+
+ flp->uname = rpmstrPoolId(fl.pool, rpmugUname(getuid()), 1);
|
|
15
|
+
+ }
|
|
16
|
+
+ if (! flp->uname) {
|
|
17
|
+
+ flp->uname = rpmstrPoolId(fl.pool, "root", 1);
|
|
18
|
+
+ }
|
|
19
|
+
+
|
|
20
|
+
if (fl.def.ar.ar_group) {
|
|
21
|
+
flp->gname = fl.def.ar.ar_group;
|
|
22
|
+
} else {
|
|
23
|
+
flp->gname = rpmstrPoolId(fl.pool, rpmugGname(flp->fl_gid), 1);
|
|
24
|
+
}
|
|
25
|
+
- flp->langs = xstrdup("");
|
|
26
|
+
-
|
|
27
|
+
- if (! (flp->uname && flp->gname)) {
|
|
28
|
+
- rpmlog(RPMLOG_ERR, _("Bad owner/group: %s\n"), diskPath);
|
|
29
|
+
- fl.processingFailed = 1;
|
|
30
|
+
+ if (! flp->gname) {
|
|
31
|
+
+ flp->gname = rpmstrPoolId(fl.pool, rpmugGname(getgid()), 1);
|
|
32
|
+
+ }
|
|
33
|
+
+ if (! flp->gname) {
|
|
34
|
+
+ flp->gname = rpmstrPoolId(fl.pool, "root", 1);
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
+ flp->langs = xstrdup("");
|
|
38
|
+
fl.files.used++;
|
|
39
|
+
}
|
|
40
|
+
argvFree(files);
|
|
41
|
+
--- rpm-4.11.3/build/parsePrep.c.old 2013-11-22 11:31:31.000000000 +0100
|
|
42
|
+
+++ rpm-4.11.3/build/parsePrep.c 2019-03-20 13:19:33.705172465 +0100
|
|
43
|
+
|
|
44
|
+
urlfn, strerror(errno));
|
|
45
|
+
return RPMRC_FAIL;
|
|
46
|
+
}
|
|
47
|
+
- if (!rpmugUname(sb.st_uid) || !rpmugGname(sb.st_gid)) {
|
|
48
|
+
- rpmlog(RPMLOG_ERR, _("Bad owner/group: %s\n"), urlfn);
|
|
49
|
+
- return RPMRC_FAIL;
|
|
50
|
+
- }
|
|
51
|
+
|
|
52
|
+
return RPMRC_OK;
|
|
53
|
+
}
|
SPECS/rpm.spec
CHANGED
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
Summary: The RPM package management system
|
|
22
22
|
Name: rpm
|
|
23
23
|
Version: %{rpmver}
|
|
24
|
-
Release: %{?snapver:0.%{snapver}.}
|
|
24
|
+
Release: %{?snapver:0.%{snapver}.}40%{?dist}
|
|
25
25
|
Group: System Environment/Base
|
|
26
26
|
Url: http://www.rpm.org/
|
|
27
27
|
Source0: http://rpm.org/releases/rpm-4.11.x/%{name}-%{srcver}.tar.bz2
|
|
@@ -92,6 +92,11 @@ Patch189: rpm-4.12.x-rpmSign-return-value-correction.patch
|
|
|
92
92
|
Patch190: rpm-4.13.x-fix_find_debuginfo_opts_g.patch
|
|
93
93
|
Patch191: rpm-4.13.x-enable_noghost_option.patch
|
|
94
94
|
Patch192: rpm-4.11.x-provide-audit-events.patch
|
|
95
|
+
Patch193: rpm-4.11.x-setcaps.patch
|
|
96
|
+
Patch194: rpm-4.11.x-disk-space-calculation.patch
|
|
97
|
+
Patch195: rpm-4.11.x-remove-perl-provides-from-requires.patch
|
|
98
|
+
Patch196: rpm-4.13.x-bad-owner-group.patch
|
|
99
|
+
Patch197: rpm-4.11.x-perl.req-6.patch
|
|
95
100
|
|
|
96
101
|
# Filter soname dependencies by name
|
|
97
102
|
Patch200: rpm-4.11.x-filter-soname-deps.patch
|
|
@@ -118,6 +123,7 @@ Patch312: rpm-4.11.x-man-systemd-inhibit.patch
|
|
|
118
123
|
Patch313: rpm-4.11.x-quiet-signing.patch
|
|
119
124
|
Patch314: rpm-4.11.x-export-verifysigs-to-python.patch
|
|
120
125
|
|
|
126
|
+
|
|
121
127
|
# Temporary Patch to provide support for updates
|
|
122
128
|
Patch400: rpm-4.10.90-rpmlib-filesystem-check.patch
|
|
123
129
|
# Disable plugins
|
|
@@ -133,6 +139,13 @@ Patch502: rpm-4.13.x-RPMCALLBACK_ELEM_PROGRESS-available-header.patch
|
|
|
133
139
|
# Backport of reinstall functionality from 4.12
|
|
134
140
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1466650
|
|
135
141
|
Patch503: rpm-4.11.x-reinstall.patch
|
|
142
|
+
Patch504: rpm-4.11.x-add-g-libs.patch
|
|
143
|
+
|
|
144
|
+
# Fix brp-python-bytecompile script to work with Python 3 packages
|
|
145
|
+
# https://bugzilla.redhat.com/show_bug.cgi?id=1691402
|
|
146
|
+
# Fixed upstream:
|
|
147
|
+
# https://github.com/rpm-software-management/rpm/commit/a8e51b3bb05c6acb1d9b2e3d34f859ddda1677be
|
|
148
|
+
Patch505: rpm-4.11.3-brp-python-bytecompile-Fix-when-default-python-is-no.patch
|
|
136
149
|
|
|
137
150
|
# Partially GPL/LGPL dual-licensed and some bits with BSD
|
|
138
151
|
# SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
|
|
@@ -365,6 +378,11 @@ Requires: rpm-libs%{_isa} = %{version}-%{release}
|
|
|
365
378
|
%patch190 -p1 -b .find_debuginfo_opts
|
|
366
379
|
%patch191 -p1 -b .noghost
|
|
367
380
|
%patch192 -p1 -b .audit-events
|
|
381
|
+
%patch193 -p1 -b .setcaps
|
|
382
|
+
%patch194 -p1 -b .diskspace
|
|
383
|
+
%patch195 -p1 -b .perl.req5
|
|
384
|
+
%patch196 -p1 -b .badowner
|
|
385
|
+
%patch197 -p1 -b .perl.req6
|
|
368
386
|
|
|
369
387
|
%patch200 -p1 -b .filter-soname-deps
|
|
370
388
|
%patch201 -p1 -b .dont-filter-ld64
|
|
@@ -396,6 +414,8 @@ Requires: rpm-libs%{_isa} = %{version}-%{release}
|
|
|
396
414
|
%patch501 -p1 -b .elem-progress
|
|
397
415
|
%patch502 -p1 -b .elem-progress-header
|
|
398
416
|
%patch503 -p1 -b .reinstall
|
|
417
|
+
%patch504 -p1 -b .g-libs
|
|
418
|
+
%patch505 -p1 -b .brp-python-bytecompile
|
|
399
419
|
|
|
400
420
|
%if %{with int_bdb}
|
|
401
421
|
ln -s db-%{bdbver} db
|
|
@@ -627,6 +647,23 @@ exit 0
|
|
|
627
647
|
%doc COPYING doc/librpm/html/*
|
|
628
648
|
|
|
629
649
|
%changelog
|
|
650
|
+
* Sun May 26 2019 Pavlina Moravcova Varekova <pmoravco@redhat.com> - 4.11.3-40
|
|
651
|
+
- Remove only special perl dependencies provided in the same file (#1570181)
|
|
652
|
+
|
|
653
|
+
* Thu Mar 21 2019 Tomas Orsava <torsava@redhat.com> - 4.11.3-39
|
|
654
|
+
- Fix brp-python-bytecompile script to work with Python 3 packages (#1691402)
|
|
655
|
+
|
|
656
|
+
* Thu Mar 21 2019 Pavlina Moravcova Varekova <pmoravco@redhat.com> - 4.11.3-38
|
|
657
|
+
- Add flag to use strip -g instead of full strip on DSOs (#1663264)
|
|
658
|
+
|
|
659
|
+
* Wed Mar 20 2019 Pavlina Moravcova Varekova <pmoravco@redhat.com> - 4.11.3-37
|
|
660
|
+
- Use user and group of the rpmbuild process or root for sources (#1572772)
|
|
661
|
+
|
|
662
|
+
* Thu Feb 28 2019 Pavlina Moravcova Varekova <pmoravco@redhat.com> - 4.11.3-36
|
|
663
|
+
- Add popt-based options --setcaps and --restore (#1550745)
|
|
664
|
+
- Improve hardlink handling in disk space calculation (#1491786)
|
|
665
|
+
- Remove perl dependencies that are provided in the same file (#1570181)
|
|
666
|
+
|
|
630
667
|
* Tue Jun 19 2018 Pavlina Moravcova Varekova <pmoravco@redhat.com> - 4.11.3-35
|
|
631
668
|
- Correct "root_dir" output in audit event (#1555326)
|
|
632
669
|
|