testing/rpm
SHA256
3
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

osc copypac from project:Base:System package:rpm revision:533

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=535
This commit is contained in:
Michael Schröder 2020-03-24 20:44:25 +00:00 committed by Git OBS Bridge
parent 62612c4e57
commit 0943bab7a8
4 changed files with 116 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rpm.changes
View File

@ -3,20 +3,6 @@ Mon Mar 23 16:11:34 UTC 2020 - Sergio Lindo Mansilla <slindomansilla@suse.com>
- Add macro for supported ARM 64bit processors - Add macro for supported ARM 64bit processors
-------------------------------------------------------------------
Fri Mar 13 08:26:58 UTC 2020 - Fabian Vogt <fvogt@suse.com>
- Replace rpmsort with rewrite using Lua (boo#1164553)
-------------------------------------------------------------------
Wed Feb 26 09:08:19 UTC 2020 - Fabian Vogt <fvogt@suse.com>
- Split out perl and python dep generators from rpm-build to avoid
pulling in perl and python in all RPM builds
- Port rpmconfigcheck to pure shell
- Refactor %files list of main package to not require %excludes
as those might lead to missing files in the package
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 17 11:27:17 CET 2020 - mls@suse.de Fri Jan 17 11:27:17 CET 2020 - mls@suse.de

84
rpm.spec
View File

@ -194,6 +194,7 @@ Requires: grep
Requires: gzip Requires: gzip
Requires: make Requires: make
Requires: patch Requires: patch
Requires: perl-base
Requires: sed Requires: sed
Requires: systemd-rpm-macros Requires: systemd-rpm-macros
Requires: tar Requires: tar
@ -203,9 +204,8 @@ Requires: xz
# drop candidates # drop candidates
Requires: cpio Requires: cpio
Requires: file Requires: file
# Mandatory generators # for pythondistdeps generator
Requires: (%{name}-build-perl if perl-base) Requires: python3-base
Requires: (%{name}-build-python if python3-base)
# The point of the split # The point of the split
Conflicts: rpm < 4.15.0 Conflicts: rpm < 4.15.0
@ -213,22 +213,6 @@ Conflicts: rpm < 4.15.0
If you want to build a rpm, you need this package. It provides rpmbuild If you want to build a rpm, you need this package. It provides rpmbuild
and requires some packages that are usually required. and requires some packages that are usually required.
%package build-python
Summary: RPM dependency generator for Python
Group: Development/Languages/Python
Requires: python3-base
%description build-python
Provides and requires generator for .py files and modules.
%package build-perl
Summary: RPM dependency generator for Perl
Group: Development/Languages/Perl
Requires: perl-base
%description build-perl
Provides and requires generator for .pl files and modules.
%prep %prep
%setup -q -n rpm-%{version} %setup -q -n rpm-%{version}
rm -rf sqlite rm -rf sqlite
@ -428,29 +412,24 @@ fi
%doc RPM-HOWTO %doc RPM-HOWTO
/etc/rpm /etc/rpm
/bin/rpm /bin/rpm
%{_bindir}/gendiff /usr/bin/*
%{_bindir}/rpm %exclude /usr/bin/rpmbuild
%{_bindir}/rpm2cpio %exclude %{_libdir}/librpmbuild.so.*
%{_bindir}/rpmdb %exclude /usr/lib/rpm/elfdeps
%{_bindir}/rpmgraph %exclude /usr/lib/rpm/rpmdeps
%{_bindir}/rpmkeys %exclude /usr/lib/rpm/debugedit
%{_bindir}/rpmqpack %exclude /usr/lib/rpm/sepdebugcrcfix
%{_bindir}/rpmquery %exclude /usr/bin/rpmspec
%{_bindir}/rpmsign %exclude /usr/lib/rpm/*.prov
%{_bindir}/rpmverify %exclude /usr/lib/rpm/*.req
%exclude /usr/lib/rpm/brp-*
%exclude /usr/lib/rpm/check-*
%exclude /usr/lib/rpm/*find*
%exclude /usr/lib/rpm/fileattrs/pythondist.attr
%exclude /usr/lib/rpm/pythondistdeps.py
/usr/sbin/rpmconfigcheck /usr/sbin/rpmconfigcheck
/usr/lib/systemd/system/rpmconfigcheck.service /usr/lib/systemd/system/rpmconfigcheck.service
%dir /usr/lib/rpm /usr/lib/rpm
/usr/lib/rpm/macros
/usr/lib/rpm/macros.d/
/usr/lib/rpm/platform/
/usr/lib/rpm/rpm.supp
/usr/lib/rpm/rpmdb_*
/usr/lib/rpm/rpmpopt-*
/usr/lib/rpm/rpmrc
/usr/lib/rpm/rpmsort
/usr/lib/rpm/suse
/usr/lib/rpm/tgpg
%{_libdir}/rpm-plugins %{_libdir}/rpm-plugins
%{_libdir}/librpm.so.* %{_libdir}/librpm.so.*
%{_libdir}/librpmio.so.* %{_libdir}/librpmio.so.*
@ -475,40 +454,19 @@ fi
%files build %files build
%defattr(-,root,root) %defattr(-,root,root)
/usr/bin/rpmbuild /usr/bin/rpmbuild
/usr/lib/rpm/libtooldeps.sh
/usr/lib/rpm/pkgconfigdeps.sh
/usr/lib/rpm/pythondeps.sh
/usr/lib/rpm/elfdeps /usr/lib/rpm/elfdeps
/usr/lib/rpm/rpmdeps /usr/lib/rpm/rpmdeps
/usr/lib/rpm/debugedit /usr/lib/rpm/debugedit
/usr/lib/rpm/sepdebugcrcfix /usr/lib/rpm/sepdebugcrcfix
/usr/bin/rpmspec /usr/bin/rpmspec
/usr/lib/rpm/*.prov
/usr/lib/rpm/*.req
/usr/lib/rpm/brp-* /usr/lib/rpm/brp-*
/usr/lib/rpm/check-* /usr/lib/rpm/check-*
/usr/lib/rpm/*find* /usr/lib/rpm/*find*
/usr/lib/rpm/fileattrs/
%exclude /usr/lib/rpm/fileattrs/pythondist.attr
%exclude /usr/lib/rpm/fileattrs/perl*.attr
/usr/lib/rpm/*.prov
%exclude /usr/lib/rpm/perl.prov
/usr/lib/rpm/*.req
%exclude /usr/lib/rpm/perl.req
%ifarch aarch64 ppc64le riscv64
/usr/lib/rpm/config.guess
/usr/lib/rpm/config.sub
%endif
%files build-python
%defattr(-,root,root)
/usr/lib/rpm/fileattrs/pythondist.attr /usr/lib/rpm/fileattrs/pythondist.attr
/usr/lib/rpm/pythondistdeps.py /usr/lib/rpm/pythondistdeps.py
%files build-perl
%defattr(-,root,root)
/usr/lib/rpm/fileattrs/perl*.attr
/usr/lib/rpm/perl.prov
/usr/lib/rpm/perl.req
%files devel %files devel
%defattr(644,root,root,755) %defattr(644,root,root,755)
/usr/include/rpm /usr/include/rpm

6
rpmconfigcheck
View File

@ -13,11 +13,7 @@ if test -s $packages -a \( ! -e $configcheckfile -o -s $configcheckfile -o ! $pa
echo "Searching for unresolved configuration files" echo "Searching for unresolved configuration files"
if test ! -e $configcheckfile -o ! $packages -ot $configcheckfile ; then if test ! -e $configcheckfile -o ! $packages -ot $configcheckfile ; then
test -e $configcheckfile && mv -f $configcheckfile $configcheckfile.old test -e $configcheckfile && mv -f $configcheckfile $configcheckfile.old
rpm -qalc | sort | while read line; do rpm -qalc | sort | perl -lne '-e "$_.rpmnew" and print "$_.rpmnew"; -e "$_.rpmorig" and print "$_.rpmorig"; -e "$_.rpmsave" and print "$_.rpmsave"' > $configcheckfile
for suffix in new orig save; do
[[ -e "${line}.rpm${suffix}" ]] && echo "${line}.rpm${suffix}"
done
done > $configcheckfile
else else
mv -f $configcheckfile $configcheckfile.old mv -f $configcheckfile $configcheckfile.old
while read l; do while read l; do

156
rpmsort
View File

@ -1,76 +1,102 @@
#!/bin/sh #! /usr/bin/perl -w
# rpmsort implemented mostly in Lua
# Copyright (c) 2020 SUSE LLC
# SPDX-License-Identifier: GPL-2.0-or-later
# Author: fvogt@suse.de
# Enhanced by: mwilck@suse.com
rpmsort() { # This program is free software; you can redistribute it and/or
direction=$1 # modify it under the terms of the GNU General Public License
script=' # as published by the Free Software Foundation; either version 2
function parse(ver) # of the License, or (at your option) any later version.
local epoch, version, release = 0, ver, 0 #
_, eend, e = ver:find("^(%d+):") # This program is distributed in the hope that it will be useful,
if eend then # but WITHOUT ANY WARRANTY; without even the implied warranty of
ver = ver:sub(eend + 1) # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
version = ver # GNU General Public License for more details.
epoch = e #
end # You should have received a copy of the GNU General Public License
_, _, v, r = ver:find("(.+)%-(.+)$") # along with this program; if not, write to the Free Software
if v then # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
version = v # USA.
release = r
end
return epoch, version, release
end
function pkgvercmp(a, b) use Getopt::Long qw(:config gnu_getopt);
local ae, av, ar = parse(a)
local be, bv, br = parse(b)
local ecmp = rpm.vercmp(ae, be) sub do_rpm_cmp_versions {
if ecmp ~= 0 then return ecmp end my ($evr1, $evr2) = @_;
local vcmp = rpm.vercmp(av, bv) sub _rpm_cmp {
if vcmp ~= 0 then return vcmp end my ($s1, $s2) = @_;
return rpm.vercmp(ar, br) return defined $s1 <=> defined $s2
end unless defined $s1 && defined $s2;
vers = {} my ($r, $x1, $x2);
for line in io.stdin:lines() do do {
table.insert(vers, line) $s1 =~ s/^[^a-zA-Z0-9]+//;
end $s2 =~ s/^[^a-zA-Z0-9]+//;
table.sort(vers, function(a, b) return pkgvercmp(a, b) == '"$direction"' end) if ($s1 =~ /^\d/ || $s2 =~ /^\d/) {
print(table.concat(vers, "\n")) $s1 =~ s/^(0*(\d*))//; $x1 = $2;
' return -1 if $1 eq '';
$s2 =~ s/^(0*(\d*))//; $x2 = $2;
rpm --eval "%{lua: ${script}}" return 1 if $1 eq '';
$r = length $x1 <=> length $x2 || $x1 cmp $x2;
} else {
$s1 =~ s/^([a-zA-Z]*)//; $x1 = $1;
$s2 =~ s/^([a-zA-Z]*)//; $x2 = $1;
return 0
if $x1 eq '' && $x2 eq '';
$r = $x1 cmp $x2;
}
} until $r;
return $r;
} }
usage() { my ($e1, $v1, $r1) = $evr1 =~ /^(?:(\d*):)?(.*?)(?:-([^-]*))?$/;
cat >&2 <<EOF my ($e2, $v2, $r2) = $evr2 =~ /^(?:(\d*):)?(.*?)(?:-([^-]*))?$/;
$0 - sort input according to rpm version sorting conventions my $r = _rpm_cmp($e1 || 0, $e2 || 0);
$r = _rpm_cmp($v1, $v2)
Expects rpm package versions separated by newlines as input and outputs unless $r;
them sorted according to rpm version sorting conventions, with old versions $r = _rpm_cmp($r1, $r2)
at the top. unless $r;
return $r;
Options:
-r|--reverse sort backwards
-h|--help print this help
EOF
exit 0
} }
DIRECTION=-1 my $reorder = sub { return @_ };
while [ $# -gt 0 ]; do my $key = 0;
case $1 in my $test = 0;
-r|--reverse) DIRECTION=1;;
-h|--help) usage;;
*) echo "$0: invalid parameter $1 ignored" >&2;;
esac
shift
done
rpmsort "$DIRECTION" sub rpm_cmp_versions {
my ($evr1, $evr2) = @_;
chomp($evr1, $evr2);
my $res1 = do_rpm_cmp_versions($evr1, $evr2);
if ($test) {
open(my $fd, '-|', 'zypper', '--terse', 'versioncmp',
$evr1, $evr2) or die "zypper: $!\n";
my $res2 = <$fd>;
close($fd) or die "zypper: $!\n";
chomp $res2;
if ($res1 != $res2) {
my @operators = qw(< == >);
my $op1 = $operators[$res1 + 1];
my $op2 = $operators[$res2 + 1];
print STDERR "BUG: $evr1 $op1 $evr2 vs. zypper: $evr1 $op2 $evr2\n";
}
}
return $res1;
}
GetOptions ("r|reverse" => sub { $reorder = sub { return reverse @_ } },
"k|key=i" => \$key,
"test" => \$test)
or do {
print STDERR "Usage $0 [-r, --reverse] [-k N, --key=N] [--test]\n";
exit 1;
};
if ($key == 0) {
# Sort by entire lines
map { print } &$reorder(sort { rpm_cmp_versions($a, $b) } <>);
} else {
# Sort by field $key
my @data = map { [(split)[$key-1], $_] } <>;
map { print } &$reorder(map { $_->[1] }
sort { rpm_cmp_versions($a->[0], $b->[0]) } @data);
}