pool/debhelper
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 1111502 from system:packagemanager

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1111502
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/debhelper?expand=0&rev=16
This commit is contained in:
Ana Guerrero 2023-09-15 20:05:30 +00:00 committed by Git OBS Bridge
commit fea4c82efe
3 changed files with 76 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
debhelper-fix-perl-version-requirement.patch Normal file
View File

@ -0,0 +1,65 @@
diff --git lib/Debian/Debhelper/Dh_Lib.pm lib/Debian/Debhelper/Dh_Lib.pm
index 7cf59e0..1656c9b 100644
--- lib/Debian/Debhelper/Dh_Lib.pm
+++ lib/Debian/Debhelper/Dh_Lib.pm
@@ -2088,6 +2088,8 @@ sub _parse_debian_control {
# - Takes an optional keyword; if passed, this will return true if the keyword is listed in R^3 (Rules-Requires-Root)
# - If the optional keyword is omitted or not present in R^3 and R^3 is not 'binary-targets', then returns false
# - Returns true otherwise (i.e. keyword is in R^3 or R^3 is 'binary-targets')
+{
+my %rrr;
sub should_use_root {
my ($keyword) = @_;
my $rrr_env = $ENV{'DEB_RULES_REQUIRES_ROOT'} // 'binary-targets';
@@ -2097,10 +2099,11 @@ sub should_use_root {
return 1 if $rrr_env eq 'binary-targets';
return 0 if not defined($keyword);
- state %rrr = map { $_ => 1 } split(' ', $rrr_env);
+ %rrr = map { $_ => 1 } split(' ', $rrr_env) if not %rrr;
return 1 if exists($rrr{$keyword});
return 0;
}
+}
# Returns the "gain root command" as a list suitable for passing as a part of the command to "doit()"
sub gain_root_cmd {
@@ -2219,12 +2222,16 @@ sub is_udeb {
return package_type($package) eq 'udeb';
}
-
+{
+my %packages_to_process;
sub process_pkg {
my ($package) = @_;
- state %packages_to_process = map { $_ => 1 } @{$dh{DOPACKAGES}};
+ if (not %packages_to_process) {
+ %packages_to_process = map { $_ => 1 } @{$dh{DOPACKAGES}};
+ }
return $packages_to_process{$package} // 0;
}
+}
# Only useful for dh(1)
sub bd_dh_sequences {
@@ -3075,12 +3082,15 @@ sub perl_cross_incdir {
return $incdir;
}
+{
+my %known_packages;
sub is_known_package {
my ($package) = @_;
- state %known_packages = map { $_ => 1 } getpackages();
+ %known_packages = map { $_ => 1 } getpackages() if not %known_packages;
return 1 if exists($known_packages{$package});
return 0
}
+}
sub assert_opt_is_known_package {
my ($package, $method) = @_;
--
2.35.3

6
debhelper.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Sep 8 08:07:46 UTC 2023 - Jan Baier <jbaier@suse.com>
- fix initialization of state variables problem (bsc#1215078)
added debhelper-fix-perl-version-requirement.patch
-------------------------------------------------------------------
Mon Sep 4 11:45:19 UTC 2023 - Jan Baier <jbaier@suse.com>

5
debhelper.spec
View File

@ -28,6 +28,8 @@ Source0: https://salsa.debian.org/debian/debhelper/-/archive/debian/%{ver
Patch0: debhelper-no-localized-manpages.patch
# PATCH-FIX-UPSTREAM remove --utf8 since we only build En manpages.
Patch1: debhelper-pod2man-no-utf8.patch
# PATCH-FIX-UPSTREAM debhelper-fix-perl-version-requirement.patch https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1001403
Patch2: debhelper-fix-perl-version-requirement.patch
Requires: dh-autoreconf >= 17
Requires: dpkg >= 1.18
Requires: strip-nondeterminism
@ -52,6 +54,9 @@ as part of their build process.
%if 0%{?suse_version} && 0%{?suse_version} < 1130
%patch1 -p1
%endif
%if 0%{?sle_version} == 150500
%patch2 -p0
%endif
%build
%make_build VERSION='%{version}'