From aabe1373113ff9c97bece69918bcd98679ba7b0bea040095b2daef42d9b2c7ac Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Wed, 6 Dec 2017 14:57:28 +0000 Subject: [PATCH 1/2] Accepting request 548200 from home:bmwiedemann:branches:devel:languages:perl Add perl-reproducible.patch to make build reproducible (boo#1047218) might be possible to upstream in generalized form (e.g. BSD date does not have -d but -r) OBS-URL: https://build.opensuse.org/request/show/548200 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=154 --- perl-reproducible.patch | 24 ++++++++++++++++++++++++ perl.changes | 5 +++++ perl.spec | 3 +++ 3 files changed, 32 insertions(+) create mode 100644 perl-reproducible.patch diff --git a/perl-reproducible.patch b/perl-reproducible.patch new file mode 100644 index 0000000..ff238b5 --- /dev/null +++ b/perl-reproducible.patch @@ -0,0 +1,24 @@ +PATCH-FIX-OPENSUSE +Author: Bernhard M. Wiedemann +Date: 2017-12-04 + +replace hostname, username, time with fixed values + +Index: perl-5.26.1/Configure +=================================================================== +--- perl-5.26.1.orig/Configure ++++ perl-5.26.1/Configure +@@ -9234,6 +9234,13 @@ esac + set $myhostname + myhostname=$1 + ++if test -n "$SOURCE_DATE_EPOCH" ; then ++ cf_time="`LC_ALL=C LANGUAGE=C $date -u -d@$SOURCE_DATE_EPOCH`" ++ cf_by="reproducible" ++ myhostname="reproducible" ++ myuname="reproducible" ++fi ++ + : verify guess + if $test "$myhostname" ; then + dflt=y diff --git a/perl.changes b/perl.changes index 126b032..777f3ee 100644 --- a/perl.changes +++ b/perl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 4 17:50:10 UTC 2017 - bwiedemann@suse.com + +- Add perl-reproducible.patch to make build reproducible (boo#1047218) + ------------------------------------------------------------------- Sat Sep 23 10:40:59 UTC 2017 - coolo@suse.com diff --git a/perl.spec b/perl.spec index 4477505..6c4f743 100644 --- a/perl.spec +++ b/perl.spec @@ -41,6 +41,8 @@ Patch7: perl-5.22.0_wrong_rpm_provides.diff Patch8: skip_time_hires.patch Patch9: perl-incfix.diff Patch11: perl-5.18.2-overflow.diff +# PATCH-FIX-OPENSUSE +Patch12: perl-reproducible.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: perl-base = %version #PreReq: %fillup_prereq @@ -182,6 +184,7 @@ cp -p %{S:3} . %endif %patch9 %patch11 +%patch12 -p1 %build cp -a lib savelib From 94af8537de3f141944e16ad43dea09b4e61a00470937ab540d7d26f757ad66f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Fri, 8 Dec 2017 15:39:03 +0000 Subject: [PATCH 2/2] Accepting request 544887 from home:RBrownSUSE:branches:devel:languages:perl Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544887 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=155 --- perl.changes | 6 ++++++ perl.spec | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/perl.changes b/perl.changes index 777f3ee..7625e80 100644 --- a/perl.changes +++ b/perl.changes @@ -3,6 +3,12 @@ Mon Dec 4 17:50:10 UTC 2017 - bwiedemann@suse.com - Add perl-reproducible.patch to make build reproducible (boo#1047218) +------------------------------------------------------------------- +Thu Nov 23 13:43:59 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Sat Sep 23 10:40:59 UTC 2017 - coolo@suse.com diff --git a/perl.spec b/perl.spec index 6c4f743..c4c7daa 100644 --- a/perl.spec +++ b/perl.spec @@ -17,6 +17,11 @@ # icecream 0 +#Compat macro for new _fillupdir macro introduced in Nov 2017 +%if ! %{defined _fillupdir} + %define _fillupdir /var/adm/fillup-templates +%endif + Name: perl Summary: The Perl interpreter License: Artistic-1.0 or GPL-2.0+ @@ -245,10 +250,10 @@ install -m 444 saveConfig.pm $cpa/Config.pm install -m 444 saveConfig_heavy.pl $cpa/Config_heavy.pl #install -d $RPM_BUILD_ROOT/var/adm/SuSEconfig/bin #install -d $RPM_BUILD_ROOT/sbin/conf.d -#install -d $RPM_BUILD_ROOT/var/adm/fillup-templates +#install -d $RPM_BUILD_ROOT%{_fillupdir} #install -m 755 SuSE/perllocal.SuSE $RPM_BUILD_ROOT/usr/lib/perl5 #install -m 755 SuSE/SuSEconfig.perl $RPM_BUILD_ROOT/sbin/conf.d -#install -m 755 SuSE/sysconfig.suseconfig-perl $RPM_BUILD_ROOT/var/adm/fillup-templates +#install -m 755 SuSE/sysconfig.suseconfig-perl $RPM_BUILD_ROOT%{_fillupdir} # install macros.perl file install -D -m 644 %{S:2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.perl pushd /usr/include @@ -415,7 +420,7 @@ EOF /usr/lib/perl5/* %config %{_sysconfdir}/rpm/macros.perl #/sbin/conf.d/SuSEconfig.perl -#/var/adm/fillup-templates/sysconfig.suseconfig-perl +#%{_fillupdir}/sysconfig.suseconfig-perl #%ghost /usr/lib/perl*/*/*/perllocal.pod #%ghost %doc /usr/share/man/man3/perllocal.3pm.gz