Skip to content

Commit 61dc747

Browse files
afresh1afresh1
committed
Regen patches
Lots of noise, just changing line numbers and maybe a little context
1 parent 55424fb commit 61dc747

21 files changed

+110
-110
lines changed

‎patches/GOOD/BUT_WHY/utils_h2ph.PL.patch

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- ./t/lib/h2ph.pht.orig Mon Feb 18 01:59:23 2019
2-
+++ ./t/lib/h2ph.pht Tue Dec 6 20:33:29 2022
3-
@@ -90,10 +90,6 @@ unless(defined(&_H2PH_H_)) {
1+
--- ./t/lib/h2ph.pht.orig Tue Apr 16 10:11:38 2024
2+
+++ ./t/lib/h2ph.pht Mon Oct 21 17:04:12 2024
3+
@@ -94,10 +94,6 @@ unless(defined(&_H2PH_H_)) {
44
}
55
eval("sub flim () { 0; }") unless defined(&flim);
66
eval("sub flam () { 1; }") unless defined(&flam);
@@ -11,9 +11,9 @@
1111
eval 'sub multiline () {"multilinestring";}' unless defined(&multiline);
1212
}
1313
1;
14-
--- ./utils/h2ph.PL.orig Mon Dec 28 08:57:44 2020
15-
+++ ./utils/h2ph.PL Tue Dec 6 20:33:29 2022
16-
@@ -576,7 +576,7 @@ sub next_line
14+
--- ./utils/h2ph.PL.orig Tue Apr 16 10:11:38 2024
15+
+++ ./utils/h2ph.PL Mon Oct 21 17:04:12 2024
16+
@@ -572,7 +572,7 @@ sub next_line
1717
$in =~ s/\?\?</{/g; # | ??<| {|
1818
$in =~ s/\?\?>/}/g; # | ??>| }|
1919
}
@@ -22,7 +22,7 @@
2222
# Tru64 disassembler.h evilness: mixed C and Pascal.
2323
while (<IN>) {
2424
last if /^\#endif/;
25-
@@ -584,8 +584,8 @@ sub next_line
25+
@@ -580,8 +580,8 @@ sub next_line
2626
$in = "";
2727
next READ;
2828
}

‎patches/GOOD/Force-lib-in-perl5db.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ feedback and okay afresh1@
1111

1212
diff --git lib/perl5db.pl lib/perl5db.pl
1313
index 69a9bb6e643c..b4025116be43 100644
14-
--- ./lib/perl5db.pl.orig Tue Nov 28 03:57:28 2023
15-
+++ ./lib/perl5db.pl Sat Dec 23 21:33:05 2023
14+
--- ./lib/perl5db.pl.orig Tue Apr 16 10:11:38 2024
15+
+++ ./lib/perl5db.pl Mon Oct 21 18:52:33 2024
1616
@@ -1799,6 +1799,17 @@ our (
1717
@old_watch,
1818
);
@@ -43,7 +43,7 @@ index 69a9bb6e643c..b4025116be43 100644
4343
my $Err = $@;
4444
_db_warn(
4545
$Err =~ /locate/
46-
@@ -6829,13 +6843,15 @@ the appropriate attributes. We then
46+
@@ -6823,13 +6837,15 @@ the appropriate attributes. We then
4747

4848
use vars qw($ornaments);
4949
use vars qw($rl_attribs);
@@ -61,7 +61,7 @@ index 69a9bb6e643c..b4025116be43 100644
6161

6262
# If noTTY is set, but we have a TTY name, go ahead and hook up to it.
6363
if ($notty) {
64-
@@ -7010,7 +7026,9 @@ qq[3>&1 xterm -title "Daughter Perl debugger $pids $na
64+
@@ -7004,7 +7020,9 @@ qq[3>&1 xterm -title "Daughter Perl debugger $pids $na
6565

6666
# We need $term defined or we can not switch to the newly created xterm
6767
if ($tty ne '' && !defined $term) {
@@ -72,7 +72,7 @@ index 69a9bb6e643c..b4025116be43 100644
7272
if ( !$rl ) {
7373
$term = Term::ReadLine::Stub->new( 'perldb', $IN, $OUT );
7474
}
75-
@@ -8843,7 +8861,7 @@ sub CvGV_name_or_bust {
75+
@@ -8837,7 +8855,7 @@ sub CvGV_name_or_bust {
7676
return if $skipCvGV; # Backdoor to avoid problems if XS broken...
7777
return unless ref $in;
7878
$in = \&$in; # Hard reference...

‎patches/GOOD/Make_perl_build_reproducible.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ Index: perl.c
1212
RCS file: /home/cvs/src/gnu/usr.bin/perl/perl.c,v
1313
retrieving revision 1.25
1414
diff -u -p -u -r1.25 perl.c
15-
--- ./perl.c.orig Tue Nov 28 03:57:28 2023
16-
+++ ./perl.c Sat Dec 23 23:20:11 2023
17-
@@ -2108,6 +2108,8 @@ S_Internals_V(pTHX_ CV *cv)
15+
--- ./perl.c.orig Tue Apr 16 10:11:42 2024
16+
+++ ./perl.c Mon Oct 21 20:41:25 2024
17+
@@ -2102,6 +2102,8 @@ S_Internals_V(pTHX_ CV *cv)
1818
# endif
1919
#endif
2020

‎patches/GOOD/UPSTREAM/c3eae84e6d565de469e2141329751fc840bcd25e.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ help and ok afresh1@
1919

2020
diff --git utf8.h utf8.h
2121
index 01bf447a6149..97bccd086255 100644
22-
--- ./utf8.h.orig Tue Nov 28 03:57:28 2023
23-
+++ ./utf8.h Sun Dec 24 11:52:20 2023
24-
@@ -408,7 +408,12 @@ C<cp> is Unicode if above 255; otherwise is platform-n
22+
--- ./utf8.h.orig Tue Apr 16 10:11:38 2024
23+
+++ ./utf8.h Tue Oct 22 07:34:43 2024
24+
@@ -409,7 +409,12 @@ C<cp> is Unicode if above 255; otherwise is platform-n
2525

2626
=cut
2727
*/

‎patches/GOOD/UPSTREAM/check_for_no-delete-null-pointer-checks_support.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- ./Configure.orig Tue Nov 28 03:57:27 2023
2-
+++ ./Configure Sun Dec 24 13:39:50 2023
3-
@@ -5452,6 +5452,25 @@ default|recommended)
1+
--- ./Configure.orig Thu Apr 25 11:28:27 2024
2+
+++ ./Configure Tue Oct 22 09:23:40 2024
3+
@@ -5461,6 +5461,25 @@ default|recommended)
44
eval $checkccflag
55
;;
66
esac

‎patches/GOOD/UPSTREAM/do_not_look_in_CVS_for_modules.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- ./Configure.orig Tue Nov 28 03:57:27 2023
2-
+++ ./Configure Sun Dec 24 19:03:01 2023
3-
@@ -24100,6 +24100,7 @@ xs_extensions=''
1+
--- ./Configure.orig Thu Apr 25 11:28:27 2024
2+
+++ ./Configure Tue Oct 22 14:50:21 2024
3+
@@ -24340,6 +24340,7 @@ xs_extensions=''
44
find_extensions='
55
for xxx in *; do
66
case "$xxx" in

‎patches/GOOD/UPSTREAM/ignore_other_scm.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- ./Configure.orig Tue Nov 28 03:57:27 2023
2-
+++ ./Configure Sun Dec 24 20:50:27 2023
3-
@@ -24329,6 +24329,8 @@ esac
1+
--- ./Configure.orig Thu Apr 25 11:28:27 2024
2+
+++ ./Configure Tue Oct 22 16:38:48 2024
3+
@@ -24569,6 +24569,8 @@ esac
44
nonxs_ext=''
55
for xxx in $nonxs_extensions ; do
66
case "$xxx" in

‎patches/GOOD/UPSTREAM/no_ext_B_hints_openbsd_pl.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- ./MANIFEST.orig Mon Jan 1 21:49:24 2024
2-
+++ ./MANIFEST Mon Jan 1 21:49:31 2024
3-
@@ -4490,7 +4490,6 @@ ext/B/B/Showlex.pm Compiler Showlex backend
1+
--- ./MANIFEST.orig Thu May 30 22:40:38 2024
2+
+++ ./MANIFEST Tue Oct 22 22:03:47 2024
3+
@@ -4720,7 +4720,6 @@ ext/B/B/Showlex.pm Compiler Showlex backend
44
ext/B/B/Terse.pm Compiler Terse backend
55
ext/B/B/Xref.pm Compiler Xref backend
66
ext/B/hints/darwin.pl Hints for named architecture

‎patches/GOOD/dont_overwrite_or_cleanup_our_static_files.patch

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ./Makefile.SH.orig Tue Jan 2 16:44:59 2024
2-
+++ ./Makefile.SH Tue Jan 2 16:45:02 2024
1+
--- ./Makefile.SH.orig Fri Nov 1 10:45:46 2024
2+
+++ ./Makefile.SH Fri Nov 1 10:45:49 2024
33
@@ -497,7 +497,7 @@ shextract=`SH_to_target $SH`
44
## In the following dollars and backticks do not need the extra backslash.
55
$spitshell >>$Makefile <<!GROK!THIS!
@@ -9,7 +9,7 @@
99

1010
# Files to be built with variable substitution before miniperl
1111
# is available.
12-
@@ -682,16 +682,17 @@ $(MANIFEST_SRT): MANIFEST $(PERL_EXE)
12+
@@ -687,16 +687,17 @@ $(MANIFEST_SRT): MANIFEST $(PERL_EXE)
1313

1414
.PHONY: all utilities
1515

@@ -34,44 +34,44 @@
3434
!NO!SUBS!
3535

3636
# Making utilities requires Cwd. If we have dynamic
37-
@@ -1372,7 +1373,7 @@ _mopup:
37+
@@ -1368,7 +1369,7 @@ _mopup:
3838
-rm -f *perl.xok
3939
-rm -f cygwin.c libperl*.def libperl*.dll cygperl*.dll *.exe.stackdump
40-
-rm -f $(PERL_EXE) $(MINIPERL_EXE) $(LIBPERL) libperl.* microperl
40+
-rm -f $(PERL_EXE) $(MINIPERL_EXE) $(LIBPERL) libperl.*
4141
- -rm -f config.arch config.over $(DTRACE_H)
4242
+ -rm -f $(DTRACE_H)
4343

4444
_cleaner1:
4545
-cd os2; rm -f Makefile
46-
--- ./MANIFEST.orig Tue Jan 2 16:44:59 2024
47-
+++ ./MANIFEST Tue Jan 2 16:45:05 2024
48-
@@ -15,6 +15,7 @@ Changes Describe how to peruse changes between rel
46+
--- ./MANIFEST.orig Fri Nov 1 10:45:46 2024
47+
+++ ./MANIFEST Fri Nov 1 10:45:53 2024
48+
@@ -14,6 +14,7 @@ Changes Describe how to peruse changes between rel
4949
charclass_invlists.h Compiled-in inversion lists
5050
class.c Internals of the `use feature 'class'` object system
5151
CODE_OF_CONDUCT.md Information on where to find the Standards of Conduct
5252
+config.over Site-specific overrides for Configure defaults
5353
config_h.SH Produces config.h
5454
configpm Produces lib/Config.pm
5555
Configure Portability tool
56-
@@ -38,6 +39,7 @@ fakesdio.h stdio in terms of PerlIO
56+
@@ -37,6 +38,7 @@ fakesdio.h stdio in terms of PerlIO
5757
feature.h Feature header
5858
form.h Public declarations for formats
5959
generate_uudmap.c Generate uudmap.h, the uuencode decoding map
6060
+git_version.h Pre-generated git_version.h for OpenBSD
6161
globals.c File to declare global symbols (for shared library)
6262
globvar.sym Global variables that need hiding when embedded
6363
gv.c Glob value code
64-
@@ -5102,6 +5104,7 @@ lib/Class/Struct.t See if Class::Struct works
64+
@@ -5353,6 +5355,7 @@ lib/Class/Struct.t See if Class::Struct works
6565
lib/Config.t See if Config works
6666
lib/Config/Extensions.pm Convenient hash lookup for built extensions
6767
lib/Config/Extensions.t See if Config::Extensions works
6868
+lib/Config_git.pl Pre-generated Config_git.pl for OpenBSD
6969
lib/CORE.pod document the CORE namespace
7070
lib/DB.pm Debugger API (draft)
7171
lib/DB.t See if DB works
72-
--- ./Porting/Maintainers.pl.orig Tue Nov 28 03:57:27 2023
73-
+++ ./Porting/Maintainers.pl Tue Jan 2 16:45:02 2024
74-
@@ -1485,6 +1485,9 @@ use File::Glob qw(:case);
72+
--- ./Porting/Maintainers.pl.orig Sun Apr 28 05:07:47 2024
73+
+++ ./Porting/Maintainers.pl Fri Nov 1 10:45:49 2024
74+
@@ -1517,6 +1517,9 @@ our %Modules = (
7575
lib/vmsish.{pm,t}
7676
],
7777
},
@@ -80,4 +80,4 @@
8080
+ },
8181
);
8282

83-
83+
our %DistName;

‎patches/GOOD/fix_permissions_for_noperm_build.patch

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ./installperl.orig Mon Jan 29 17:46:13 2024
2-
+++ ./installperl Mon Jan 29 17:46:52 2024
1+
--- ./installperl.orig Sun Nov 17 13:05:40 2024
2+
+++ ./installperl Sun Nov 17 13:06:38 2024
33
@@ -72,7 +72,7 @@ $opts{destdir} = '';
44
my $usage = 0;
55
if (!GetOptions(\%opts, 'notify|n', 'strip|s', 'silent|S',
@@ -71,8 +71,8 @@
7171
$cmd .= " $from $to";
7272
$xto =~ s/^\Q$opts{destdir}\E// if $opts{destdir};
7373
print $opts{verbose} ? " install $from $xto\n" : " $xto\n" unless $opts{silent};
74-
--- ./install_lib.pl.orig Mon Jan 29 17:46:13 2024
75-
+++ ./install_lib.pl Mon Jan 29 17:46:25 2024
74+
--- ./install_lib.pl.orig Sun Nov 17 13:05:40 2024
75+
+++ ./install_lib.pl Sun Nov 17 13:05:48 2024
7676
@@ -6,7 +6,7 @@
7777
use strict;
7878
use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_Cygwin $Is_Darwin $Is_AmigaOS
@@ -119,8 +119,8 @@
119119
}
120120

121121
sub unixtoamiga
122-
--- ./cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.orig Mon Jan 29 17:46:13 2024
123-
+++ ./cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm Mon Jan 29 17:46:25 2024
122+
--- ./cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.orig Sun Nov 17 13:05:40 2024
123+
+++ ./cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm Sun Nov 17 13:05:48 2024
124124
@@ -2229,7 +2229,8 @@ Called by init_main. Initializes PERL_*
125125
sub init_PERM {
126126
my($self) = shift;
@@ -131,8 +131,8 @@
131131
$self->{PERM_RW} = 644 unless defined $self->{PERM_RW};
132132
$self->{PERM_RWX} = 755 unless defined $self->{PERM_RWX};
133133

134-
--- ./cpan/Sys-Syslog/Makefile.PL.orig Mon Jan 29 17:46:13 2024
135-
+++ ./cpan/Sys-Syslog/Makefile.PL Mon Jan 29 17:46:25 2024
134+
--- ./cpan/Sys-Syslog/Makefile.PL.orig Sun Nov 17 13:05:40 2024
135+
+++ ./cpan/Sys-Syslog/Makefile.PL Sun Nov 17 13:05:48 2024
136136
@@ -14,7 +14,7 @@ if ($] < 5.008) {
137137
}
138138

@@ -142,8 +142,8 @@
142142

143143
# virtual paths given to EU::MM
144144
my %virtual_path = ( 'Syslog.pm' => '$(INST_LIBDIR)/Syslog.pm' );
145-
--- ./cpan/ExtUtils-Install/lib/ExtUtils/Install.pm.orig Mon Jan 29 17:46:13 2024
146-
+++ ./cpan/ExtUtils-Install/lib/ExtUtils/Install.pm Mon Jan 29 17:46:25 2024
145+
--- ./cpan/ExtUtils-Install/lib/ExtUtils/Install.pm.orig Sun Nov 17 13:05:40 2024
146+
+++ ./cpan/ExtUtils-Install/lib/ExtUtils/Install.pm Sun Nov 17 13:05:48 2024
147147
@@ -104,6 +104,7 @@ $INSTALL_QUIET = 1
148148
$ENV{MAKEFLAGS} =~ /\b(s|silent|quiet)\b/);
149149

0 commit comments

Comments
 (0)