diff --git a/README.md b/README.md index 8ca89ed1c..dfe095870 100644 --- a/README.md +++ b/README.md @@ -16,16 +16,18 @@ The modifications from the original fedora `.spec` files fall under the license NOTE: While we are not yet out of beta, it is recommended to remove any previous sgug-rse installation before extracting this new one. We don't yet support in-place upgrades using RPMs. +(0) Add your user account to the irix `sys` group - this will allow you to use the sgug `sudo` out of the box with your user password - then you can follow the steps below without additional hoop jumping. + (1) Download the artifacts for the latest version from the github releases tab (assuming they aren't too big). You'll find three main archives - and there might be "update" archives too that need to be extracted: ``` -sgug-rse-selfhoster-0.0.4beta.tar.gz -sgug-rse-srpms-0.0.4beta.tar.gz -sgug-rse-rpms-0.0.4beta.tar.gz +sgug-rse-selfhoster-0.0.5beta.tar.gz +sgug-rse-srpms-0.0.5beta.tar.gz +sgug-rse-rpms-0.0.5beta.tar.gz -sgug-rse-rpms-0.0.4betaupdateNUM.tar.gz +sgug-rse-rpms-0.0.5betaupdateNUM.tar.gz ``` (2) Extract the selfhoster archive under /usr as root (important, sgug-rse _installation_ files are root owned and managed): @@ -33,7 +35,7 @@ sgug-rse-rpms-0.0.4betaupdateNUM.tar.gz ``` su - (enter root password) cd /usr -gunzip -dc /path/to/sgug-rse-selfhoster-0.0.4beta.tar.gz |tar xf - +gunzip -dc /path/to/sgug-rse-selfhoster-0.0.5beta.tar.gz |tar xf - (log out of root) ``` @@ -50,19 +52,19 @@ mkdir -p ~/rpmbuild/RPMS ``` cd ~/rpmbuild -gunzip -dc /path/to/sgug-rse-srpms-0.0.4beta.tar.gz | tar xf - -gunzip -dc /path/to/sgug-rse-rpms-0.0.4beta.tar.gz | tar xf - +gunzip -dc /path/to/sgug-rse-srpms-0.0.5beta.tar.gz | tar xf - +gunzip -dc /path/to/sgug-rse-rpms-0.0.5beta.tar.gz | tar xf - # Optional mkdir ~/rpmupdates cd ~/rpmupdates -gunzip -dc /path/to/sgug-rse-rpms-0.0.4betaupdateNUM.tar.gz | tar xf - +gunzip -dc /path/to/sgug-rse-rpms-0.0.5betaupdateNUM.tar.gz | tar xf - ``` (5) You'll need to clone this repo (sgug-rse) - ``` cd ~ -git clone https://github.com/sgidevnet/sgug-rse.git sgug-rse.git +/usr/sgug/bin/git clone https://github.com/sgidevnet/sgug-rse.git sgug-rse.git ``` Adjust that path as appropriate for where you wish the repo to live. @@ -79,6 +81,8 @@ sudo rpm --reinstall -ivh noarch/*.rpm mips/*.rpm and for any upgrades/updates: +* CARE: You must use the "upgrade" flag for any upgraded packages to void double-installs + ``` cd ~/sgug-rse.git ./sgugshell.sh @@ -86,7 +90,7 @@ cd ~/rpmupdates/RPMS sudo rpm -Uvh noarch/*.rpm mips/*.rpm ``` -(7) Now you can build a package with: +(7) Now you can rebuild one of the out-of-the-box packages with: ``` cd ~/sgug-rse.git @@ -97,13 +101,12 @@ cp -r ~/sgug-rse.git/packages/m4/* ~/rpmbuild/ rpmbuild -ba m4.spec --nocheck ``` -(8) Installing RPMs must be done as root (add `--reinstall` to refresh a package): +(8) Installing RPMs must be done as root (add `--reinstall` to refresh an already installed package): ``` -su - cd ~user/sgug-rse.git ./sgugshell.sh -rpm -ivh ~/rpmbuild/RPMS/mips/m4*.rpm +sudo rpm -ivh ~/rpmbuild/RPMS/mips/m4*.rpm ``` ## Bugs diff --git a/helperscripts/copyback.pl b/helperscripts/copyback.pl index 774f8f949..f973a2bbb 100755 --- a/helperscripts/copyback.pl +++ b/helperscripts/copyback.pl @@ -53,10 +53,12 @@ my $rpmbuildFile = File::HomeDir->my_home."/rpmbuild/$sourceFile"; my $targetFile = "./packages/$packageName/$sourceFile"; - my $cmd = "cp $rpmbuildFile $targetFile"; - print "Command is '$cmd'\n"; + if( -e $rpmbuildFile) { + my $cmd = "cp $rpmbuildFile $targetFile"; + print "Command is '$cmd'\n"; - copy($rpmbuildFile, $targetFile) or die "Copy failed: $!"; + copy($rpmbuildFile, $targetFile) or die "Copy failed: $!"; + } } } diff --git a/packages/chkconfig/SOURCES/chkconfig.sgifixes.patch b/packages/alternatives/SOURCES/alternatives.sgifixes.patch similarity index 100% rename from packages/chkconfig/SOURCES/chkconfig.sgifixes.patch rename to packages/alternatives/SOURCES/alternatives.sgifixes.patch diff --git a/packages/chkconfig/SPECS/chkconfig.spec.origfedora b/packages/alternatives/SPECS/alternatives.spec similarity index 91% rename from packages/chkconfig/SPECS/chkconfig.spec.origfedora rename to packages/alternatives/SPECS/alternatives.spec index 6c5611fea..0986f2cf8 100644 --- a/packages/chkconfig/SPECS/chkconfig.spec.origfedora +++ b/packages/alternatives/SPECS/alternatives.spec @@ -1,91 +1,68 @@ -Summary: A system tool for maintaining the /etc/rc*.d hierarchy -Name: chkconfig +# This package is able to use optimised linker flags. +%global build_ldflags %{sgug_optimised_ldflags} + +Summary: A tool to maintain symbolic links determining default commands +Name: alternatives Version: 1.11 -Release: 5%{?dist} +Release: 8%{?dist} License: GPLv2 URL: https://github.com/fedora-sysv/chkconfig -Source: https://github.com/fedora-sysv/chkconfig/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: newt-devel gettext popt-devel libselinux-devel beakerlib gcc -Conflicts: initscripts <= 5.30-1 +Source: https://github.com/fedora-sysv/chkconfig/archive/chkconfig-%{version}.tar.gz#/chkconfig-%{version}.tar.gz +BuildRequires: libdicl-devel >= 0.1.19 +Requires: libdicl >= 0.1.19 -%description -Chkconfig is a basic system utility. It updates and queries runlevel -information for system services. Chkconfig manipulates the numerous -symbolic links in /etc/rc.d, to relieve system administrators of some -of the drudgery of manually editing the symbolic links. - -%package -n ntsysv -Summary: A tool to set the stop/start of system services in a runlevel -Requires: chkconfig = %{version}-%{release} - -%description -n ntsysv -Ntsysv provides a simple interface for setting which system services -are started or stopped in various runlevels (instead of directly -manipulating the numerous symbolic links in /etc/rc.d). Unless you -specify a runlevel or runlevels on the command line (see the man -page), ntsysv configures the current runlevel (5 if you're using X). - -%package -n alternatives -Summary: A tool to maintain symbolic links determining default commands +Patch0: alternatives.sgifixes.patch -%description -n alternatives +%description alternatives creates, removes, maintains and displays information about the symbolic links comprising the alternatives system. It is possible for several programs fulfilling the same or similar functions to be installed on a single system at the same time. %prep -%setup -q +%setup -q -n chkconfig-%{version} +%patch0 -p1 -b .sgifixes + +# Rewrite some hardcoded paths in the alternatives source +perl -pi -e "s|/etc/alternatives|%{_prefix}/etc/alternatives|g" alternatives.c +perl -pi -e "s|/var/lib/alternatives|%{_prefix}/var/lib/alternatives|g" alternatives.c +perl -pi -e "s|/usr/share/locale|%{_prefix}/share/locale|g" alternatives.c %build -make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %{?_smp_mflags} +export CPPFLAGS="-I%{_includedir}/libdicl-0.1" +export RPM_LD_FLAGS="-ldicl-0.1 -lintl $RPM_LD_FLAGS" +V=1 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %{?_smp_mflags} %check -make check +export CPPFLAGS="-I%{_includedir}/libdicl-0.1" +export LIBS="-ldicl-0.1" +V=1 make check %install +export CPPFLAGS="-I%{_includedir}/libdicl-0.1" +export LIBS="-ldicl-0.1" rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} SBINDIR=%{_sbindir} install +make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} SBINDIR=%{_sbindir} ALTDIR=%{_prefix}/var/lib/alternatives ALTDATADIR=%{_prefix}/etc/alternatives install -mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d -ln -s rc.d/init.d $RPM_BUILD_ROOT/etc/init.d -for n in 0 1 2 3 4 5 6; do - mkdir -p $RPM_BUILD_ROOT/etc/rc.d/rc${n}.d - ln -s rc.d/rc${n}.d $RPM_BUILD_ROOT/etc/rc${n}.d -done -mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d +rm $RPM_BUILD_ROOT%{_mandir}/man8/chkconfig* +rm $RPM_BUILD_ROOT%{_mandir}/man8/ntsysv* -%find_lang %{name} +#find_lang %{name} -%files -f %{name}.lang -%defattr(-,root,root) -%{!?_licensedir:%global license %%doc} +#files -f %{name}.lang +%files %license COPYING -/sbin/chkconfig -/etc/chkconfig.d -/etc/init.d -/etc/rc.d -/etc/rc.d/init.d -/etc/rc[0-6].d -/etc/rc.d/rc[0-6].d -%{_mandir}/*/chkconfig* -%{_prefix}/lib/systemd/systemd-sysv-install - -%files -n ntsysv -%defattr(-,root,root) -%{_sbindir}/ntsysv -%{_mandir}/*/ntsysv.8* - -%files -n alternatives -%license COPYING -%dir /etc/alternatives +%dir %{_prefix}/etc/alternatives %{_sbindir}/update-alternatives %{_sbindir}/alternatives %{_mandir}/*/update-alternatives* %{_mandir}/*/alternatives* -%dir /var/lib/alternatives +%dir %{_prefix}/var/lib/alternatives %changelog +* Fri Apr 10 2020 Daniel Hams - 1.11-8 +- Moved from chkconfig to specific alternatives package + * Wed Jul 24 2019 Fedora Release Engineering - 1.11-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/packages/alternatives/SPECS/readme.txt b/packages/alternatives/SPECS/readme.txt new file mode 100644 index 000000000..9e26ac64e --- /dev/null +++ b/packages/alternatives/SPECS/readme.txt @@ -0,0 +1,2 @@ +This is actually an extract of the alternatives pieces from chkconfig, check +there for the original spec. diff --git a/packages/aterm/SPECS/aterm.spec b/packages/aterm/SPECS/aterm.spec index bf0d9365d..1fc0004a0 100644 --- a/packages/aterm/SPECS/aterm.spec +++ b/packages/aterm/SPECS/aterm.spec @@ -3,7 +3,7 @@ Name: aterm Version: 1.0.1 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Afterstep XVT, VT102 emulator for the X Window system License: GPLv2+ @@ -43,9 +43,6 @@ advantage on a machine serving many X sessions. %patch10 -p1 -b .sgifixes %build -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" %configure --enable-fading --enable-background-image \ --enable-next-scroll --enable-utmp --enable-wtmp \ @@ -70,6 +67,9 @@ make %{?_smp_mflags} %changelog +* Fri Apr 10 2020 Daniel Hams - 1.0.1-30 +- Remove hard coded shell paths + * Wed Jul 24 2019 Fedora Release Engineering - 1.0.1-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/packages/autoconf/SPECS/autoconf.spec b/packages/autoconf/SPECS/autoconf.spec index 3826ac669..e8cc733ff 100644 --- a/packages/autoconf/SPECS/autoconf.spec +++ b/packages/autoconf/SPECS/autoconf.spec @@ -9,7 +9,7 @@ Summary: A GNU tool for automatically configuring source code Name: autoconf Version: 2.69 -Release: 31%{?dist} +Release: 32%{?dist} License: GPLv2+ and GFDL Source0: http://ftpmirror.gnu.org/autoconf/autoconf-%{version}.tar.xz Source1: config.site @@ -78,12 +78,6 @@ their use. # Here's a terminator %prep -export SHELL=%{_bindir}/bash -export CONFIG_SHELL="$SHELL" -export SHELL_PATH="$SHELL" -export PERL_PATH=%{_bindir}/perl -export PERL=%{_bindir}/perl -export M4=%{_bindir}/m4 %autosetup -p1 %build @@ -92,12 +86,6 @@ export EMACS=%{_bindir}/emacs %else export EMACS=%{_bindir}/false %endif -export SHELL=%{_bindir}/bash -export CONFIG_SHELL="$SHELL" -export SHELL_PATH="$SHELL" -export PERL_PATH=%{_bindir}/perl -export PERL=%{_bindir}/perl -export M4=%{_bindir}/m4 %configure \ %{?with_autoconf_enables_emacs:--with-lispdir=%{_emacs_sitelispdir}/autoconf} make %{?_smp_mflags} @@ -112,12 +100,6 @@ make check %{?_smp_mflags} %install -export SHELL=%{_bindir}/bash -export CONFIG_SHELL="$SHELL" -export SHELL_PATH="$SHELL" -export PERL_PATH=%{_bindir}/perl -export PERL=%{_bindir}/perl -export M4=%{_bindir}/m4 make install %{?_smp_mflags} DESTDIR=%{buildroot} mkdir -p %{buildroot}/share install -m 0644 %{SOURCE1} %{buildroot}%{_datadir} @@ -146,6 +128,9 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir} %changelog +* Fri Apr 10 2020 Daniel Hams - 2.69-32 +- Remove hard coded shell paths + * Wed Aug 28 2019 Ondrej Dubaj - 2.69-31 - Port tests to Bash 5 diff --git a/packages/automake/SPECS/automake.spec b/packages/automake/SPECS/automake.spec index 3af32e6df..9ab14476b 100644 --- a/packages/automake/SPECS/automake.spec +++ b/packages/automake/SPECS/automake.spec @@ -17,7 +17,7 @@ Summary: A GNU tool for automatically creating Makefiles Name: automake Version: %{api_version}.1 -Release: 13%{?dist} +Release: 14%{?dist} # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT License: GPLv2+ and GFDL and Public Domain and MIT @@ -101,12 +101,6 @@ Makefiles. %prep -export SHELL=%{_bindir}/bash -export CONFIG_SHELL="$SHELL" -export SHELL_PATH="$SHELL" -export PERL_PATH=%{_bindir}/perl -export PERL=%{_bindir}/perl -export M4=%{_bindir}/m4 %autosetup -p1 %if %{with check} && %{with automake_enables_optional_test} autoreconf -iv @@ -122,12 +116,6 @@ done %build # disable replacing config.guess and config.sub from redhat-rpm-config %global _configure_gnuconfig_hack 0 -export SHELL=%{_bindir}/bash -export CONFIG_SHELL="$SHELL" -export SHELL_PATH="$SHELL" -export PERL_PATH=%{_bindir}/perl -export PERL=%{_bindir}/perl -export M4=%{_bindir}/m4 %configure %make_build cp m4/acdir/README README.aclocal @@ -135,12 +123,6 @@ cp contrib/multilib/README README.multilib %install -export SHELL=%{_bindir}/bash -export CONFIG_SHELL="$SHELL" -export SHELL_PATH="$SHELL" -export PERL_PATH=%{_bindir}/perl -export PERL=%{_bindir}/perl -export M4=%{_bindir}/m4 %make_install @@ -166,6 +148,9 @@ make -k %{?_smp_mflags} check %{?TESTS_FLAGS: TESTS="%{TESTS_FLAGS}"} \ %changelog +* Fri Apr 10 2020 Daniel Hams - 1.16-14 +- Remove hard coded shell paths + * Wed Jul 24 2019 Fedora Release Engineering - 1.16.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/packages/bacula-client/SPECS/bacula-client.spec b/packages/bacula-client/SPECS/bacula-client.spec index 11def85c0..5fbf0a9e1 100644 --- a/packages/bacula-client/SPECS/bacula-client.spec +++ b/packages/bacula-client/SPECS/bacula-client.spec @@ -4,7 +4,7 @@ Summary: Bacula Client Name: bacula-client Version: 9.4.4 -Release: 1%{?dist} +Release: 2%{?dist} License: AGPLv3 with exceptions URL: http://www.bacula.org Source: http://downloads.sourceforge.net/bacula/bacula-%{version}.tar.gz @@ -23,13 +23,10 @@ to find and recover lost or damaged files. %setup -n bacula-%{version} %build -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$CONFIG_SHELL" export LDFLAGS="-lpthread $RPM_LD_FLAGS" -#pushd autoconf +#cd autoconf #aclocal -I bacula-macros/ -I gettext-macros/ -I libtool/ -#popd +#cd .. #autoconf -I autoconf/ -o configure autoconf/configure.in %{configure} --enable-client-only --disable-nls --disable-acl --disable-conio --with-readline=%{_prefix} --with-sqlite3=%{_prefix} --with-openssl=%{_prefix} --with-archivedir=%{_prefix}/tmp --with-working-dir=%{_prefix}/bacula/working --with-subsys-dir=%{_prefix}/var/lock/subsys @@ -57,5 +54,8 @@ rm -rf $RPM_BUILD_ROOT%{_docdir} %{_sysconfdir}/* %changelog +* Fri Apr 10 2020 Daniel Hams - 9.4.4-2 +- Fix bashisms, remove hardcoded shell paths + * Sat Jan 11 2020 Daniel Hams - 9.4.4 - First build diff --git a/packages/bash-completion/SPECS/bash-completion.spec b/packages/bash-completion/SPECS/bash-completion.spec index 245b46d10..2df7c91fe 100644 --- a/packages/bash-completion/SPECS/bash-completion.spec +++ b/packages/bash-completion/SPECS/bash-completion.spec @@ -8,7 +8,7 @@ Name: bash-completion Version: 2.8 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 1 Summary: Programmable completion for Bash @@ -40,17 +40,11 @@ bash-completion is a collection of shell functions that take advantage of the programmable completion feature of bash. %prep -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" %autosetup -p1 %build # Needed for rfkill patch as it modifies Makefile.am # It should be removed while rebasing to bash-completion-2.8 -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" autoreconf -fi -v %configure %make_build @@ -69,9 +63,6 @@ EOF %install -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" %make_install install -Dpm 644 redefine_filedir \ %{buildroot}%{_sysconfdir}/bash_completion.d/redefine_filedir @@ -108,6 +99,9 @@ make -C completions check %changelog +* Fri Apr 10 2020 Daniel Hams - 1:2.8-8 +- Remove hard coded shell paths + * Wed Jul 24 2019 Fedora Release Engineering - 1:2.8-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/packages/bash/SPECS/bash.spec b/packages/bash/SPECS/bash.spec index af824c7b3..f89b885d0 100644 --- a/packages/bash/SPECS/bash.spec +++ b/packages/bash/SPECS/bash.spec @@ -6,7 +6,7 @@ Version: %{baseversion}%{patchleveltag} Name: bash Summary: The GNU Bourne Again shell -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ Url: https://www.gnu.org/software/bash Source0: https://ftp.gnu.org/gnu/bash/bash-%{baseversion}.tar.gz @@ -94,7 +94,7 @@ BuildRequires: autoconf, gettext # Required for bash tests #BuildRequires: glibc-all-langpacks #Requires: filesystem >= 3 -Provides: %{_bindir}/sh +#Provides: %{_bindir}/sh Provides: %{_bindir}/bash # On Irix you'll get all kinds of broken behaviour without ncurses # supporting definitions @@ -162,7 +162,7 @@ sed -i -e 's,bashref\.info,bash.info,' doc/bashref.info mkdir -p %{buildroot}/%{_sysconfdir} # make manpages for bash builtins as per suggestion in DOC/README -pushd doc +cd doc sed -e ' /^\.SH NAME/, /\\- bash built-in commands, see \\fBbash\\fR(1)$/{ /^\.SH NAME/d @@ -184,7 +184,7 @@ for i in `cat man.pages` ; do echo .so man1/builtins.1 > %{buildroot}%{_mandir}/man1/$i.1 chmod 0644 %{buildroot}%{_mandir}/man1/$i.1 done -popd +cd .. # Link bash man page to sh so that man sh works. ln -sf bash.1 %{buildroot}%{_mandir}/man1/sh.1 @@ -194,7 +194,7 @@ rm -f %{buildroot}/%{_mandir}/man1/printf.1 rm -f %{buildroot}/%{_mandir}/man1/true.1 rm -f %{buildroot}/%{_mandir}/man1/false.1 -ln -sf bash %{buildroot}%{_bindir}/sh +#ln -sf bash %{buildroot}%{_bindir}/sh rm -f %{buildroot}%{_infodir}/dir mkdir -p %{buildroot}%{_sysconfdir}/skel # DH @@ -304,7 +304,7 @@ done #files -f %{name}.lang %files %config(noreplace) %{_sysconfdir}/skel/.b* -%{_bindir}/sh +#%%{_bindir}/sh %{_bindir}/bash %{_bindir}/alias %{_bindir}/bg @@ -341,6 +341,9 @@ done %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Apr 10 2020 Daniel Hams - 5.0.7-4 +- Remove hard coded shell paths, bashisms, no longer provide %{_bindir}/sh + * Fri Aug 02 2019 Kamil Dudka - 5.0.7-3 - Sanitize public header file Resolves: #1736676 diff --git a/packages/binutils/SPECS/binutils.spec b/packages/binutils/SPECS/binutils.spec index 1ebcdb793..ddba25e75 100644 --- a/packages/binutils/SPECS/binutils.spec +++ b/packages/binutils/SPECS/binutils.spec @@ -5,7 +5,7 @@ Summary: A GNU collection of binary utilities Name: %{?cross}binutils%{?_with_debug:-debug} Version: 2.23.2 -Release: 24%{?dist} +Release: 25%{?dist} License: GPLv3+ URL: https://sourceware.org/binutils @@ -383,9 +383,6 @@ Conflicts: gcc-c++ < 4.0.0 #---------------------------------------------------------------------------- %prep -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" export LIBTOOL=%{_bindir}/libtool %setup -q -n binutils-%{version} #%patch01 -p1 @@ -465,9 +462,6 @@ touch */configure #---------------------------------------------------------------------------- %build -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" export LIBTOOL=%{_bindir}/libtool echo target is %{binutils_target} @@ -619,9 +613,6 @@ fi #---------------------------------------------------------------------------- %install -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" export LIBTOOL=%{_bindir}/libtool cp gas/libtool ld/ @@ -837,6 +828,9 @@ fi #---------------------------------------------------------------------------- %changelog +* Fri Apr 10 2020 Daniel Hams - 2.23.2-25 +- Remove hard coded shell paths + * Tue Aug 13 2019 Nick Clifton - 2.32-24 - Fix potential integer overflow in readelf. (#1740470) diff --git a/packages/bison/SPECS/bison.spec b/packages/bison/SPECS/bison.spec index dcc273ef8..85a4ac407 100644 --- a/packages/bison/SPECS/bison.spec +++ b/packages/bison/SPECS/bison.spec @@ -4,7 +4,7 @@ Summary: A GNU general-purpose parser generator Name: bison Version: 3.4.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ Source: ftp://ftp.gnu.org/pub/gnu/bison/bison-%{version}.tar.xz @@ -74,9 +74,6 @@ Bison manual section for more information. %setup -q %build -export SHELL=`which bash` -export CONFIG_SHELL=$SHELL -export SHELL_PATH=$SHELL %configure make %{?_smp_mflags} @@ -125,6 +122,9 @@ gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/bison.info* %{_libdir}/liby.a %changelog +* Fri Apr 10 2020 Daniel Hams - 3.4.1-3 +- Remove hard coded shell paths + * Wed Jul 24 2019 Fedora Release Engineering - 3.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/packages/boost/SPECS/boost.spec b/packages/boost/SPECS/boost.spec index eff8af486..fa5edb714 100644 --- a/packages/boost/SPECS/boost.spec +++ b/packages/boost/SPECS/boost.spec @@ -34,7 +34,7 @@ Summary: The free peer-reviewed portable C++ source libraries Version: 1.69.0 %global version_enc 1_69_0 %global version_suffix 169 -Release: 9%{?dist} +Release: 10%{?dist} License: Boost and MIT and Python %global toplev_dirname %{real_name}_%{version_enc} @@ -68,7 +68,7 @@ Requires: %{name}-fiber%{?_isa} = %{version}-%{release} %endif Requires: %{name}-filesystem%{?_isa} = %{version}-%{release} #Requires: %{name}-graph%{?_isa} = %{version}-%{release} -#Requires: %{name}-iostreams%{?_isa} = %{version}-%{release} +Requires: %{name}-iostreams%{?_isa} = %{version}-%{release} #Requires: %{name}-locale%{?_isa} = %{version}-%{release} #Requires: %{name}-log%{?_isa} = %{version}-%{release} Requires: %{name}-math%{?_isa} = %{version}-%{release} @@ -253,13 +253,13 @@ Run-time support for the BGL graph library. BGL interface and graph components are generic, in the same sense as the Standard Template Library (STL). -#%package iostreams -#Summary: Run-time component of boost iostreams library +%package iostreams +Summary: Run-time component of boost iostreams library -#%description iostreams -# -#Run-time support for Boost.Iostreams, a framework for defining streams, -#stream buffers and i/o filters. +%description iostreams + +Run-time support for Boost.Iostreams, a framework for defining streams, +stream buffers and i/o filters. #%package locale #Summary: Run-time component of boost locale library @@ -800,7 +800,7 @@ EOF echo ============================= build serial ================== ./b2 -d+2 -q %{?_smp_mflags} \ --without-mpi --without-graph_parallel --build-dir=serial \ - --without-contract --without-graph --without-iostreams \ + --without-contract --without-graph \ --without-locale --without-log --without-serialization \ --without-stacktrace --without-test --without-timer \ --without-type_erasure --without-wave \ @@ -1016,7 +1016,7 @@ export PATH=/bin${PATH:+:}$PATH echo ============================= install serial ================== ./b2 -d+2 -q %{?_smp_mflags} \ --without-mpi --without-graph_parallel --build-dir=serial \ - --without-contract --without-graph --without-iostreams \ + --without-contract --without-graph \ --without-locale --without-log --without-serialization \ --without-stacktrace --without-test --without-timer \ --without-type_erasure --without-wave \ @@ -1218,9 +1218,9 @@ fi #%license LICENSE_1_0.txt #%{_libdir}/libboost_graph.so.%{sonamever} -#%files iostreams -#%license LICENSE_1_0.txt -#%{_libdir}/libboost_iostreams.so.%{sonamever} +%files iostreams +%license LICENSE_1_0.txt +%{_libdir}/libboost_iostreams.so.%{sonamever} #%files locale #%license LICENSE_1_0.txt @@ -1349,7 +1349,7 @@ fi %endif %{_libdir}/libboost_filesystem.so #%{_libdir}/libboost_graph.so -#%{_libdir}/libboost_iostreams.so +%{_libdir}/libboost_iostreams.so #%{_libdir}/libboost_locale.so #%{_libdir}/libboost_log.so #%{_libdir}/libboost_log_setup.so @@ -1488,6 +1488,9 @@ fi %{_mandir}/man1/bjam.1* %changelog +* Fri Apr 10 2020 Daniel Hams - 1.69.0-10 +- Build + install boost iostreams library + * Wed Jul 24 2019 Fedora Release Engineering - 1.69.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/packages/byacc/SPECS/byacc.spec b/packages/byacc/SPECS/byacc.spec new file mode 100644 index 000000000..390fef9f3 --- /dev/null +++ b/packages/byacc/SPECS/byacc.spec @@ -0,0 +1,288 @@ +# This package is able to use optimised linker flags. +%global build_ldflags %{sgug_optimised_ldflags} + +%define byaccdate 20190617 + +Summary: Berkeley Yacc, a parser generator +Name: byacc +Version: 1.9.%{byaccdate} +Release: 2%{?dist} +License: Public Domain +URL: http://invisible-island.net/byacc/byacc.html +Source: ftp://ftp.invisible-island.net/byacc/byacc-%{byaccdate}.tgz + +BuildRequires: gcc + +%description +This package provides a parser generator utility that reads a grammar +specification from a file and generates an LR(1) parser for it. The +parsers consist of a set of LALR(1) parsing tables and a driver +routine written in the C programming language. It has a public domain +license which includes the generated C. + +If you are going to do development on your system, you will want to install +this package. + +%prep +%setup -q -n byacc-%{byaccdate} + +# Revert default stack size back to 10000 +# https://bugzilla.redhat.com/show_bug.cgi?id=743343 +find . -type f -name \*.c -print0 | + xargs -0 sed -i 's/YYSTACKSIZE 500/YYSTACKSIZE 10000/g' + +%build +%configure --disable-dependency-tracking +%make_build + +%install +%make_install +ln -s yacc %{buildroot}%{_bindir}/byacc +ln -s yacc.1 %{buildroot}%{_mandir}/man1/byacc.1 + +%check +echo ====================TESTING========================= +make check +echo ====================TESTING END===================== + +%files +%doc ACKNOWLEDGEMENTS CHANGES NEW_FEATURES NOTES NO_WARRANTY README +%{_bindir}/yacc +%{_bindir}/byacc +%{_mandir}/man1/yacc.1* +%{_mandir}/man1/byacc.1* + +%changelog +* Fri Apr 10 2020 Daniel Hams - 1.9.20190617-2 +- First release on irix + +* Wed Jul 24 2019 Fedora Release Engineering - 1.9.20190617-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jun 26 2019 Arjun Shankar - 1.9.20190617-1 +- Rebase to 20190617 + +* Thu Jan 31 2019 Fedora Release Engineering - 1.9.20170709-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jul 31 2018 Florian Weimer - 1.9.20170709-6 +- Rebuild with fixed binutils + +* Thu Jul 12 2018 Fedora Release Engineering - 1.9.20170709-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.9.20170709-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 1.9.20170709-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.9.20170709-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jul 12 2017 Patsy Franklin - 1.9.20170709-1 +- Rebase to 20170709 + +* Mon Feb 13 2017 Patsy Franklin - 1.9.20170201-1 +- Rebase to 20170201 + +* Fri Feb 10 2017 Fedora Release Engineering - 1.9.20161202-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Dec 09 2016 Patsy Franklin - 1.9.20161202-1 +- Rebase to 20161202 + +* Mon Aug 01 2016 Patsy Franklin - 1.9.20160606-1 +- Rebase to 20160606 + +* Fri May 20 2016 Patsy Franklin - 1.9.20160324-1 +- Rebase to 20160324 + +* Wed Feb 03 2016 Fedora Release Engineering - 1.9.20150711-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sat Oct 10 2015 Patsy Franklin - 1.9.20150711-1 +- Rebase to 20150711 + +* Wed Jun 17 2015 Fedora Release Engineering - 1.9.20141128-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Mar 02 2015 Patsy Franklin - 1.9.20141128-1 +- Rebase to 20141128 + +* Fri Aug 15 2014 Fedora Release Engineering - 1.9.20130925-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.9.20130925-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Dec 02 2013 Patsy Franklin - 1.9.20130925-2 +- Update sources file. + +* Mon Dec 02 2013 Patsy Franklin - 1.9.20130925-1 +- Rebase to 20130925 + +* Sat Aug 03 2013 Fedora Release Engineering - 1.9.20130304-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Mar 20 2013 Petr Machata - 1.9.20130304-1 +- Rebase to 20130304 + +* Wed Feb 13 2013 Fedora Release Engineering - 1.9.20120115-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 1.9.20120115-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Mar 15 2012 Petr Machata - 1.9.20120115-1 +- Rebase to 20120115 +- Resolves: #782010 + +* Mon Jan 9 2012 Petr Machata - 1.9.20111219-1 +- Rebase to 20111219 + - add "-s" option + - Resolves: #769237 +- Revert default stack size to 10000 + - Related: #743343 + +* Thu Sep 29 2011 Petr Machata - 1.9.20110908-1 +- Rebase to 20110908 + - add "-i" option. + - add error-check in reader.c +- Resolves: #736627 + +* Tue Feb 08 2011 Fedora Release Engineering - 1.9.20101229-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 3 2011 Petr Machata - 1.9.20101229-1 +- Rebase to 20101229 +- Resolves: #665985 + +* Mon Dec 6 2010 Petr Machata - 1.9.20101127-1 +- Rebase to 20101127 +- Resolves: #659010 + +* Wed Nov 10 2010 Petr Machata - 1.9.20100610-1 +- Rebase to 20100610 +- Update the description in accordance with upstream spec template +- Resolves: #643598 + +* Wed Apr 7 2010 Petr Machata - 1.9.20100216-1 +- Rebase to 20100216 +- Drop the buffer overflow patch, upstream implements this +- Resolves: #577016 + +* Fri Jul 24 2009 Fedora Release Engineering - 1.9.20070509-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering - 1.9.20070509-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Jul 14 2008 Petr Machata - 1.9.20070509-4 +- Add a patch that fixes ancient buffer overflow +- Resolves: #454583 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.9.20070509-2 +- Autorebuild for GCC 4.3 + +* Tue Nov 13 2007 Petr Machata - 1.9.20070509-1 +- Update to the 20070509 release. +- Related: #225632 + +* Wed Sep 12 2007 Matthias Saou 1.9.20050813-2 +- Update summary. +- Remove useless doc copying in install section. +- Add NOTES and NO_WARRANTY docs. + +* Fri Feb 2 2007 Petr Machata - 1.9.20050813-1 +- Thomas Dickey's 20050813 version of byacc: + - own build system (linux patch reverted) + - use tmpfile (security patch reverted) +- Tidy up the specfile per rpmlint comments + +* Wed Jul 12 2006 Jesse Keating - 1.9-29.2.2 +- rebuild + +* Fri Feb 10 2006 Jesse Keating - 1.9-29.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.9-29.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Sun Feb 27 2005 Florian La Roche +- Copyright: -> License: + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Dec 05 2002 Elliot Lee 1.9-23 +- Rebuild + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Fri Jan 05 2001 Preston Brown +- security patch for tmpfile creation from Olaf Kirch + +* Fri Sep 29 2000 Bernhard Rosenkraenzer +- Update to the version in FreeBSD CVS - it's actively maintained, unlike + the 1993 4BSD version we used to have + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Wed Jun 28 2000 Bill Nottingham +- fix perms in tarball + +* Mon Jun 19 2000 Bernhard Rosenkraenzer +- FHSify +- handle RPM_OPT_FLAGS + +* Sat May 6 2000 Bill Nottingham +- fix yacc for ia64 + +* Fri Feb 4 2000 Bernhard Rosenkraenzer +- rebuild to compress man pages +- fix up manpage symlink + +* Wed Apr 07 1999 Preston Brown +- man page fixed. + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 10) + +* Thu Dec 17 1998 Cristian Gafton +- build for glibc 2.1 + +* Tue Aug 11 1998 Jeff Johnson +- build root + +* Tue May 05 1998 Prospector System +- translations modified for de, fr, tr + +* Thu Oct 23 1997 Donnie Barnes +- various spec file cleanups + +* Mon Jun 02 1997 Erik Troan +- built against glibc diff --git a/packages/byacc/SPECS/byacc.spec.origfedora b/packages/byacc/SPECS/byacc.spec.origfedora new file mode 100644 index 000000000..6248fef86 --- /dev/null +++ b/packages/byacc/SPECS/byacc.spec.origfedora @@ -0,0 +1,282 @@ +%define byaccdate 20190617 + +Summary: Berkeley Yacc, a parser generator +Name: byacc +Version: 1.9.%{byaccdate} +Release: 2%{?dist} +License: Public Domain +URL: http://invisible-island.net/byacc/byacc.html +Source: ftp://invisible-island.net/byacc/byacc-%{byaccdate}.tgz + +BuildRequires: gcc + +%description +This package provides a parser generator utility that reads a grammar +specification from a file and generates an LR(1) parser for it. The +parsers consist of a set of LALR(1) parsing tables and a driver +routine written in the C programming language. It has a public domain +license which includes the generated C. + +If you are going to do development on your system, you will want to install +this package. + +%prep +%setup -q -n byacc-%{byaccdate} + +# Revert default stack size back to 10000 +# https://bugzilla.redhat.com/show_bug.cgi?id=743343 +find . -type f -name \*.c -print0 | + xargs -0 sed -i 's/YYSTACKSIZE 500/YYSTACKSIZE 10000/g' + +%build +%configure --disable-dependency-tracking +%make_build + +%install +%make_install +ln -s yacc %{buildroot}%{_bindir}/byacc +ln -s yacc.1 %{buildroot}%{_mandir}/man1/byacc.1 + +%check +echo ====================TESTING========================= +make check +echo ====================TESTING END===================== + +%files +%doc ACKNOWLEDGEMENTS CHANGES NEW_FEATURES NOTES NO_WARRANTY README +%{_bindir}/yacc +%{_bindir}/byacc +%{_mandir}/man1/yacc.1* +%{_mandir}/man1/byacc.1* + +%changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.9.20190617-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jun 26 2019 Arjun Shankar - 1.9.20190617-1 +- Rebase to 20190617 + +* Thu Jan 31 2019 Fedora Release Engineering - 1.9.20170709-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jul 31 2018 Florian Weimer - 1.9.20170709-6 +- Rebuild with fixed binutils + +* Thu Jul 12 2018 Fedora Release Engineering - 1.9.20170709-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.9.20170709-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 1.9.20170709-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.9.20170709-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jul 12 2017 Patsy Franklin - 1.9.20170709-1 +- Rebase to 20170709 + +* Mon Feb 13 2017 Patsy Franklin - 1.9.20170201-1 +- Rebase to 20170201 + +* Fri Feb 10 2017 Fedora Release Engineering - 1.9.20161202-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Dec 09 2016 Patsy Franklin - 1.9.20161202-1 +- Rebase to 20161202 + +* Mon Aug 01 2016 Patsy Franklin - 1.9.20160606-1 +- Rebase to 20160606 + +* Fri May 20 2016 Patsy Franklin - 1.9.20160324-1 +- Rebase to 20160324 + +* Wed Feb 03 2016 Fedora Release Engineering - 1.9.20150711-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sat Oct 10 2015 Patsy Franklin - 1.9.20150711-1 +- Rebase to 20150711 + +* Wed Jun 17 2015 Fedora Release Engineering - 1.9.20141128-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Mar 02 2015 Patsy Franklin - 1.9.20141128-1 +- Rebase to 20141128 + +* Fri Aug 15 2014 Fedora Release Engineering - 1.9.20130925-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.9.20130925-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Dec 02 2013 Patsy Franklin - 1.9.20130925-2 +- Update sources file. + +* Mon Dec 02 2013 Patsy Franklin - 1.9.20130925-1 +- Rebase to 20130925 + +* Sat Aug 03 2013 Fedora Release Engineering - 1.9.20130304-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Mar 20 2013 Petr Machata - 1.9.20130304-1 +- Rebase to 20130304 + +* Wed Feb 13 2013 Fedora Release Engineering - 1.9.20120115-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 1.9.20120115-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Mar 15 2012 Petr Machata - 1.9.20120115-1 +- Rebase to 20120115 +- Resolves: #782010 + +* Mon Jan 9 2012 Petr Machata - 1.9.20111219-1 +- Rebase to 20111219 + - add "-s" option + - Resolves: #769237 +- Revert default stack size to 10000 + - Related: #743343 + +* Thu Sep 29 2011 Petr Machata - 1.9.20110908-1 +- Rebase to 20110908 + - add "-i" option. + - add error-check in reader.c +- Resolves: #736627 + +* Tue Feb 08 2011 Fedora Release Engineering - 1.9.20101229-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 3 2011 Petr Machata - 1.9.20101229-1 +- Rebase to 20101229 +- Resolves: #665985 + +* Mon Dec 6 2010 Petr Machata - 1.9.20101127-1 +- Rebase to 20101127 +- Resolves: #659010 + +* Wed Nov 10 2010 Petr Machata - 1.9.20100610-1 +- Rebase to 20100610 +- Update the description in accordance with upstream spec template +- Resolves: #643598 + +* Wed Apr 7 2010 Petr Machata - 1.9.20100216-1 +- Rebase to 20100216 +- Drop the buffer overflow patch, upstream implements this +- Resolves: #577016 + +* Fri Jul 24 2009 Fedora Release Engineering - 1.9.20070509-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering - 1.9.20070509-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Jul 14 2008 Petr Machata - 1.9.20070509-4 +- Add a patch that fixes ancient buffer overflow +- Resolves: #454583 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.9.20070509-2 +- Autorebuild for GCC 4.3 + +* Tue Nov 13 2007 Petr Machata - 1.9.20070509-1 +- Update to the 20070509 release. +- Related: #225632 + +* Wed Sep 12 2007 Matthias Saou 1.9.20050813-2 +- Update summary. +- Remove useless doc copying in install section. +- Add NOTES and NO_WARRANTY docs. + +* Fri Feb 2 2007 Petr Machata - 1.9.20050813-1 +- Thomas Dickey's 20050813 version of byacc: + - own build system (linux patch reverted) + - use tmpfile (security patch reverted) +- Tidy up the specfile per rpmlint comments + +* Wed Jul 12 2006 Jesse Keating - 1.9-29.2.2 +- rebuild + +* Fri Feb 10 2006 Jesse Keating - 1.9-29.2.1 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.9-29.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Sun Feb 27 2005 Florian La Roche +- Copyright: -> License: + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Thu Dec 05 2002 Elliot Lee 1.9-23 +- Rebuild + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Sun Jun 24 2001 Elliot Lee +- Bump release + rebuild. + +* Fri Jan 05 2001 Preston Brown +- security patch for tmpfile creation from Olaf Kirch + +* Fri Sep 29 2000 Bernhard Rosenkraenzer +- Update to the version in FreeBSD CVS - it's actively maintained, unlike + the 1993 4BSD version we used to have + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Wed Jun 28 2000 Bill Nottingham +- fix perms in tarball + +* Mon Jun 19 2000 Bernhard Rosenkraenzer +- FHSify +- handle RPM_OPT_FLAGS + +* Sat May 6 2000 Bill Nottingham +- fix yacc for ia64 + +* Fri Feb 4 2000 Bernhard Rosenkraenzer +- rebuild to compress man pages +- fix up manpage symlink + +* Wed Apr 07 1999 Preston Brown +- man page fixed. + +* Sun Mar 21 1999 Cristian Gafton +- auto rebuild in the new build environment (release 10) + +* Thu Dec 17 1998 Cristian Gafton +- build for glibc 2.1 + +* Tue Aug 11 1998 Jeff Johnson +- build root + +* Tue May 05 1998 Prospector System +- translations modified for de, fr, tr + +* Thu Oct 23 1997 Donnie Barnes +- various spec file cleanups + +* Mon Jun 02 1997 Erik Troan +- built against glibc diff --git a/packages/ca-certificates/SPECS/ca-certificates.spec b/packages/ca-certificates/SPECS/ca-certificates.spec index efb483428..549bd541d 100644 --- a/packages/ca-certificates/SPECS/ca-certificates.spec +++ b/packages/ca-certificates/SPECS/ca-certificates.spec @@ -41,7 +41,7 @@ Name: ca-certificates Version: 2019.2.32 # for Rawhide, please always use release >= 2 # for Fedora release branches, please use release < 2 (1.0, 1.1, ...) -Release: 3%{?dist} +Release: 4%{?dist} License: Public Domain URL: https://fedoraproject.org/wiki/CA-Certificates @@ -93,9 +93,6 @@ This package contains the set of CA certificates chosen by the Mozilla Foundation for use with the Internet PKI. %prep -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" rm -rf %{name} mkdir %{name} mkdir %{name}/certs @@ -104,17 +101,14 @@ mkdir %{name}/certs/legacy-disable mkdir %{name}/java %build -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" -pushd %{name}/certs +cd %{name}/certs pwd # cp %{SOURCE0} . # python3 %{SOURCE4} >c2p.log 2>c2p.err # Manually processed until we have a python rpm tar xf %{SOURCE100} -popd -pushd %{name} +cd ../.. +cd %{name} ( cat <> %{p11_format_bundle} -popd +cd .. #manpage cp %{SOURCE10} %{name}/update-ca-trust.8.txt @@ -192,9 +186,6 @@ cp %{SOURCE9} %{name}/ca-legacy.8.txt %install -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" rm -rf $RPM_BUILD_ROOT mkdir -p -m 755 $RPM_BUILD_ROOT%{pkidir}/tls/certs #mkdir -p -m 755 $RPM_BUILD_ROOT%{pkidir}/java @@ -395,6 +386,9 @@ fi %changelog +* Fri Apr 10 2020 Daniel Hams - 2019.2.32-4 +- Remove hard coded shell paths, bashisms + * Wed Jul 24 2019 Fedora Release Engineering - 2019.2.32-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/packages/chkconfig/SPECS/chkconfig.spec b/packages/chkconfig/SPECS/chkconfig.spec deleted file mode 100644 index 8f0eb393a..000000000 --- a/packages/chkconfig/SPECS/chkconfig.spec +++ /dev/null @@ -1,668 +0,0 @@ -# This package is able to use optimised linker flags. -%global build_ldflags %{sgug_optimised_ldflags} - -Summary: A system tool for maintaining the /etc/rc*.d hierarchy -Name: chkconfig -Version: 1.11 -Release: 6%{?dist} -License: GPLv2 -URL: https://github.com/fedora-sysv/chkconfig -Source: https://github.com/fedora-sysv/chkconfig/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -#BuildRequires: newt-devel gettext popt-devel libselinux-devel beakerlib gcc -Conflicts: initscripts <= 5.30-1 -BuildRequires: libdicl-devel >= 0.1.19 -Requires: libdicl >= 0.1.19 - -Patch0: chkconfig.sgifixes.patch - -%description -Chkconfig is a basic system utility. It updates and queries runlevel -information for system services. Chkconfig manipulates the numerous -symbolic links in /etc/rc.d, to relieve system administrators of some -of the drudgery of manually editing the symbolic links. - -#%%package -n ntsysv -#Summary: A tool to set the stop/start of system services in a runlevel -#Requires: chkconfig = %{version}-%{release} - -#%%description -n ntsysv -#Ntsysv provides a simple interface for setting which system services -#are started or stopped in various runlevels (instead of directly -#manipulating the numerous symbolic links in /etc/rc.d). Unless you -#specify a runlevel or runlevels on the command line (see the man -#page), ntsysv configures the current runlevel (5 if you're using X). - -%package -n alternatives -Summary: A tool to maintain symbolic links determining default commands - -%description -n alternatives -alternatives creates, removes, maintains and displays information about the -symbolic links comprising the alternatives system. It is possible for several -programs fulfilling the same or similar functions to be installed on a single -system at the same time. - -%prep -%setup -q -%patch0 -p1 -b .sgifixes - -# Rewrite some hardcoded paths in the alternatives source -perl -pi -e "s|/etc/alternatives|%{_prefix}/etc/alternatives|g" alternatives.c -perl -pi -e "s|/var/lib/alternatives|%{_prefix}/var/lib/alternatives|g" alternatives.c -perl -pi -e "s|/usr/share/locale|%{_prefix}/share/locale|g" alternatives.c - -%build -export SHELL=%{_bindir}/bash -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" -export CPPFLAGS="-I%{_includedir}/libdicl-0.1" -export RPM_LD_FLAGS="-ldicl-0.1 -lintl $RPM_LD_FLAGS" -V=1 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %{?_smp_mflags} - -%check -export SHELL=%{_bindir}/bash -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" -export CPPFLAGS="-I%{_includedir}/libdicl-0.1" -export LIBS="-ldicl-0.1" -V=1 make check - -%install -export SHELL=%{_bindir}/bash -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" -export CPPFLAGS="-I%{_includedir}/libdicl-0.1" -export LIBS="-ldicl-0.1" -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} SBINDIR=%{_sbindir} ALTDIR=%{_prefix}/var/lib/alternatives ALTDATADIR=%{_prefix}/etc/alternatives install - -rm $RPM_BUILD_ROOT%{_mandir}/man8/ntsysv* - -#mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d -#ln -s rc.d/init.d $RPM_BUILD_ROOT/etc/init.d -#for n in 0 1 2 3 4 5 6; do -# mkdir -p $RPM_BUILD_ROOT/etc/rc.d/rc${n}.d -# ln -s rc.d/rc${n}.d $RPM_BUILD_ROOT/etc/rc${n}.d -#done -#mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d - -#find_lang %{name} - -#files -f %{name}.lang -%files -%defattr(-,root,root) -%{!?_licensedir:%global license %%doc} -%license COPYING -#/sbin/chkconfig -#/etc/chkconfig.d -#/etc/init.d -#/etc/rc.d -#/etc/rc.d/init.d -#/etc/rc[0-6].d -#/etc/rc.d/rc[0-6].d -%{_mandir}/*/chkconfig* -#%%{_prefix}/lib/systemd/systemd-sysv-install - -#%%files -n ntsysv -#%%defattr(-,root,root) -#%%{_sbindir}/ntsysv -#%%{_mandir}/*/ntsysv.8* - -%files -n alternatives -%license COPYING -%dir %{_prefix}/etc/alternatives -%{_sbindir}/update-alternatives -%{_sbindir}/alternatives -%{_mandir}/*/update-alternatives* -%{_mandir}/*/alternatives* -%dir %{_prefix}/var/lib/alternatives - -%changelog -* Thu Feb 20 2020 Daniel Hams - 1.11-6 -- Rebuild due to libdicl upgrade to 0.1.19 - -* Wed Jul 24 2019 Fedora Release Engineering - 1.11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Mar 14 2019 Peter Robinson 1.11-4 -- Split out alternatives into it's own package - -* Thu Jan 31 2019 Fedora Release Engineering - 1.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Oct 08 2018 Lukas Nykryn - 1.11-2 -- add Provides: alternatives - -* Mon Sep 10 2018 Lukas Nykryn - 1.11-1 -- Add tests for --add/remove-slave and use beakerlib -- alternatives: add-slave and remove-slave -- leveldb: don't crash on long names -- alternatives: prettier --list output - -* Fri Apr 21 2017 Lukáš Nykrýn - 1.10-1 -- Introduce --remove-all option -- po: update translations - -* Fri Feb 24 2017 Lukáš Nykrýn - 1.9-1 -- move sources to github - -* Wed Jun 29 2016 Lukáš Nykrýn - 1.8-1 -- alternatives: introduce --keep-missing -- alternatives: allow family in --set and display it in --config -- chkconfig: use isXinetdEnabled instead of isOn -- leveldb: trim leading whitespaces from systemctl -- leveldb: suppress error messages when selinux is turned off -- alternatives: always recreate symlinks when the alternative is updated -- test-alternatives: basic tests for slave links -- chkconfig: resetpriorities should work on all runlevels - -* Tue Nov 24 2015 Lukáš Nykrýn - 1.7-1 -- leveldb: fix segfault when selinux policy is not present -- alternatives: add family option - -* Fri Oct 02 2015 Lukáš Nykrýn - 1.6-1 -- systemd-sysv-install: don't play ping-pong with systemctl -- ntsysv: add description to systemd services -- ntsysv: skip templates -- Makefile: fix typo - -* Mon Jun 01 2015 Lukáš Nykrýn - 1.5-1 -- add systemd-sysv-install alias -- don't create symlinks if they already exist -- fix wrongly behaving LDFLAGS - -* Thu Mar 26 2015 Lukáš Nykrýn - 1.4-1 -- ntsysv: show systemd services and sockets -- fix combination --type xinetd --list service -- leveldb: restore selinux context for xinetd conf files -- alternatives: remove unused variable -- alternatives: warn if the target is not a symlink -- spec: add link to git -- lets simplify version - -* Wed Nov 05 2014 Lukáš Nykrýn - 1.3.63-1 -- alternatives: during install don't call preset on enabled services - -* Tue Aug 12 2014 Lukáš Nykrýn - 1.3.62-1 -- use systemctl preset, not systemctl enable -- fix typo in manpage -- partly support socket activated services - -* Wed Jul 31 2013 Lukáš Nykrýn - 1.3.61-1 -- try to make install_initd work -- fix permission issues with xinetd services - -* Tue Mar 12 2013 Lukáš Nykrýn - 1.3.60-1 -- don't completely override LDFLAGS -- pass along any rpm-configured LD flags -- make sure install_initd/remove_initd provides appropriate help output for those commands (#803818) -- check for overridden services in /etc too (#850899) -- chconfig should own /etc/rc.d (#894328) -- isXinetdEnabled should also ask systemd (#820363) -- alternatives: look for service file also in /etc -- alternatives: add --list option (#622635) -- chkconfig: add hint to call systemctl list-unit-files and list-dependencies (#800334) -- chkconfig: correctly handle unreadable init.d (#913807) -- alternatives: call systemctl enable with --force (#915667) - -* Wed Mar 7 2012 Bill Nottingham 1.3.59-1 -- translation updates -- xinetd may be a systemd service. Make sure we can still reload it (#800490) - -* Fri Feb 10 2012 Bill Nottingham 1.3.58-1 -- fix forwarding to systemctl with systemd >= 41 (#789256) -- assorted regression fixes from 1.3.57 (#782152, etc.) - -* Wed Jan 04 2012 Bill Nottingham 1.3.57-1 -- assorted cleanups to LSB dependency support (#693202 fixed properly, #701573) -- fix kill values for LSB-only scripts (#696305, ) -- don't apply start deps for services that aren't starting anywhere (#750446) - -* Tue Oct 11 2011 Bill Nottingham 1.3.56-1 -- add the systemd warning when no arguments are passed () - -* Wed Aug 31 2011 Bill Nottingham 1.3.55-1 -- update translations (#734631) - -* Tue Jul 19 2011 Bill Nottingham 1.3.54-1 -- alternatives: fix --initscript systemd support (#714830) -- revert forwarding of 'chkconfig --del' to 'systemctl disable' - -* Fri Jul 15 2011 Bill Nottingham 1.3.53-1 -- ntsysv: change the default to configure runlevels 2/3/4/5 (#709254) -- alternatives: check whether the --initscript param is a systemd service, act appropriately (#714830) -- forward chkconfig --del to systemctl disable where necessary - -* Wed Apr 27 2011 Bill Nottingham 1.3.52-1 -- set state before frobbing dependencies (#693202) -- ntsysv: don't list or configure service overridden by systemd (#691224) -- chkconfig: don't show services overridden by systemd in --list (#693504, #693500) -- don't forward to systemd if it's not installed () -- update translations - -* Wed Mar 09 2011 Bill Nottingham 1.3.51-1 -- further fixes to systemctl integration (, ) - -* Wed Feb 16 2011 Bill Nottingham 1.3.50-1 -- forward actions to systemctl when necessary () -- assorted translation updates - -* Tue Nov 9 2010 Bill Nottingham 1.3.49-1 -- fix abort on free of uninitialized data. (#649227) - -* Wed Oct 27 2010 Bill Nottingham 1.3.48-1 -- fix install_initd invocation for services that require $local_fs (#632294) - -* Tue Aug 10 2010 Bill Nottingham 1.3.47-1 -- Fix regression introduced in 1.3.45 (#622799) - -* Wed May 05 2010 Bill Nottingham 1.3.46-1 -- translation updates: hu, kn, ko (#589187) - -* Thu Mar 04 2010 Bill Nottingham 1.3.45-1 -- add support for Should-Start, Should-Stop (#98470, ) -- ntsysv: don't drop initscripts with '.' in the name (#556751) -- translation updates: el, id - -* Tue Sep 29 2009 Bill Nottingham 1.3.44-1 -- alternatives: update symlinks if they exist on installation (#104940) -- alternatives: clarify error messages with more context (#441443) -- alternatives: fix removal of manual links (#525021, ) -- translation updates: ml, mr, pl, ta, uk - -* Mon Sep 14 2009 Bill Nottingham 1.3.43-1 -- ntsysv man page tweak (#516599) -- another minor LSB tweak (#474223) -- translation updates - -* Fri Mar 6 2009 Bill Nottingham 1.3.42-1 -- further LSB fixes (#474223) -- throw errors on various malformed init scripts (#481198) -- man page updates re: LSB (#487979) -- translation updates: mai, gu, pt_BR, ro, ca, pa, sr, fr, hu - -* Tue Jan 20 2009 Bill Nottingham 1.3.41-1 -- restore return code & error on unconfigured services (#480805) - -* Fri Dec 5 2008 Bill Nottingham 1.3.40-1 -- fix some overflows. (#176944) -- add --type parameter to specify either xinetd or sysv services. - (#467863, -- do a permissions check before add/remove/on/off/resetpriorities. (#450254) -- parse Short-Description correctly (#441813, ) - -* Thu Dec 4 2008 Bill Nottingham 1.3.39-1 -- fail if dependencies fail on add/remove in LSB mode (#474223) - -* Wed Oct 29 2008 Bill Nottingham 1.3.38-1 -- Fix runlevel list in man page (#466739) -- translation updates - -* Thu Nov 8 2007 Bill Nottingham 1.3.37-1 -- make no options do --list (#290241, #176184) -- sr@Latn -> sr@latin - -* Tue Sep 25 2007 Bill Nottingham 1.3.36-1 -- buildreq popt-devel, link it dynamically (#279531) -- translation updates: kn, ko, mr, ro - -* Fri Aug 3 2007 Bill Nottingham 1.3.35-1 -- clarify licensing - -* Mon Apr 16 2007 Bill Nottingham 1.3.34-1 -- translation updates: as, bg, bn_IN, bs, ca, de, fr, hi, hu, id, ja, - ka, ml, ms, nb, or, sk, sl -- add resetpriorities to the man page (#197399) - -* Tue Feb 6 2007 Bill Nottingham 1.3.33-1 -- various changes from review - support alternate %%{_sbindir}, fix - summaries, add version to requires, assorted other bits - -* Fri Feb 2 2007 Bill Nottingham 1.3.32-1 -- support overriding various defaults via /etc/chkconfig.d () - -* Thu Feb 1 2007 Bill Nottingham 1.3.31-1 -- fix man page (#220558, ) -- add some more verbiage in alternatives man page (#221089) -- don't print usage message on a nonexstent service (#226804) - -* Fri Dec 1 2006 Bill Nottingham 1.3.30.1-1 -- translation updates: as, ka, lv, ml, te (#216617) - -* Thu Sep 7 2006 Bill Nottingham 1.3.30-1 -- license cleanup - -* Fri Feb 24 2006 Bill Nottingham 1.3.29-1 -- fix accidental enabling of services on --add (#182729) - -* Mon Feb 13 2006 Bill Nottingham 1.3.27-1 -- translation updates - -* Thu Feb 2 2006 Bill Nottingham 1.3.26-1 -- add support for resetting priorities without on/off status (#178864) - -* Wed Nov 30 2005 Bill Nottingham 1.3.25-1 -- return an error if changing services fails (#150235) - -* Fri Nov 18 2005 Bill Nottingham 1.3.24-1 -- when removing alternatives links, check to make sure they're - actually links (#173685) - -* Fri Nov 11 2005 Bill Nottingham 1.3.23-1 -- fix ntsysv (#172996) - -* Wed Nov 9 2005 Bill Nottingham -- fix doSetService call in frobOneDependencies - -* Tue Nov 8 2005 Bill Nottingham -- for LSB scripts, use any chkconfig: priorities as a basis, - instead of 50/50 (#172599) -- fix LSB script dependency setting when no chkconfig: line - is present (#161870, ) -- fix LSB script dependency setting when one of Required-Stop - or Required-Start: is missing (#168457) - -* Fri Oct 7 2005 Bill Nottingham -- fix segfault on directories in /etc/xinetd.d (#166385) -- don't needlessly rewrite xinetd files (#81008) - -* Thu May 5 2005 Bill Nottingham 1.3.20-1 -- fix deletion of orphaned slave links (#131496, ) - -* Fri Apr 29 2005 Bill Nottingham 1.3.19-1 -- build with updated translations - -* Thu Mar 3 2005 Bill Nottingham 1.3.18-1 -- actually return an error code if changing a service info fails - -* Tue Feb 22 2005 Bill Nottingham 1.3.17-1 -- more chkconfig: vs. LSB fixes (#149066) - -* Thu Feb 10 2005 Bill Nottingham 1.3.16-1 -- prefer chkconfig: start/stop priorities in LSB mode unless - Required-Start/Stop are used - -* Mon Feb 7 2005 Bill Nottingham 1.3.15-1 -- print usage when various invalid args are passed (#147393) - -* Wed Feb 2 2005 Bill Nottingham 1.3.14-1 -- resize reasonably with larger screens (#74156) -- don't error out completely on bad symlink (#74324) -- use ngettext (#106176) -- error out on invalid start/stop values (#109858) -- some man page updates -- fix return code of chkconfig for xinetd services (#63123) -- sort chkconfig --list display (#61576, ) - -* Tue Jan 11 2005 Bill Nottingham 1.3.13-1 -- fix LSB comment parsing some more (#144739) - -* Thu Oct 28 2004 Bill Nottingham 1.3.11.2-1 -- fix manpage reference (#137492) - -* Fri Oct 1 2004 Bill Nottingham 1.3.11.1-1 -- rebuild with updated translations - -* Fri Jun 4 2004 Bill Nottingham 1.3.11-1 -- fix LSB comment parsing (#85678) - -* Wed May 29 2004 Bill Nottingham 1.3.10-1 -- mark alternatives help output for translation (#110526) - -* Wed Oct 22 2003 Bill Nottingham 1.3.9-1 -- update translations - -* Mon Jul 28 2003 Bill Nottingham 1.3.8-4 -- rebuild - -* Tue May 13 2003 Dan Walsh 1.3.8-3 -- Update for RHEL - -* Thu May 8 2003 Dan Walsh 1.3.8-2 -- Fix readXinetdServiceInfo to return error on not regular files -- Fix chkconfig to not write messages if readXinetdServiceInfo gets an error - -* Fri Jan 31 2003 Bill Nottingham 1.3.8-1 -- fix some wording in alternatives (#76213) -- actually mark alternatives for translation - -* Thu Dec 12 2002 Elliot Lee 1.3.7-1 -- Link to libpopt in a multilib-safe fashion. - -* Thu Aug 29 2002 Trond Eivind Glomsrød 1.3.6-3 -- bump - -* Thu Aug 15 2002 Bill Nottingham 1.3.6-2 -- rebuild against new newt - -* Mon Aug 12 2002 Bill Nottingham 1.3.6-1 -- make on and off handle runlevel 2 too (#70766) - -* Mon Apr 15 2002 Trond Eivind Glomsrød 1.3.5-3 -- Update translations - -* Mon Apr 15 2002 Trond Eivind Glomsrød 1.3.5-2 -- Update translations - -* Sun Apr 7 2002 Jeremy Katz 1.3.5-1 -- alternatives: handle default with --config properly (#62009) - -* Thu Mar 14 2002 Bill Nottingham 1.3.4-1 -- don't apply the dependency logic to things that already have - start/stop priorities -- fix silly display bug in --config - -* Tue Mar 12 2002 Bill Nottingham 1.3.2-1 -- chkconfig: LSB support - -* Fri Mar 8 2002 Bill Nottingham -- alternatives: handle initscripts too; --initscript command-line option -- chkconfig/ntsysv (and serviceconf, indirectly): services with - *no* links in /etc/rc*.d are no longer displayed with --list, or - available for configuration except via chkconfig command-line options -- alternatives: fix trying to enable disable a null service - -* Tue Mar 5 2002 Bill Nottingham -- alternatives: handle things with different numbers of slave links - -* Mon Mar 4 2002 Bill Nottingham -- minor alternatives tweaks: don't install the same thing multiple times - -* Wed Jan 30 2002 Bill Nottingham -- actually, put the alternatives stuff back in /usr/sbin -- ship /etc/alternatives dir -- random alternatives fixes - -* Sun Jan 27 2002 Erik Troan -- reimplemented update-alternatives as just alternatives - -* Thu Jan 25 2002 Bill Nottingham -- add in update-alternatives stuff (perl ATM) - -* Mon Aug 27 2001 Trond Eivind Glomsrød -- Update translations - -* Tue Jun 12 2001 Bill Nottingham -- don't segfault on files that are exactly the length of a page size - (#44199, ) - -* Sun Mar 4 2001 Bill Nottingham -- don't show xinetd services in ntsysv if xinetd doesn't appear to be - installed (#30565) - -* Wed Feb 14 2001 Preston Brown -- final translation update. - -* Tue Feb 13 2001 Preston Brown -- warn in ntsysv if not running as root. - -* Fri Feb 2 2001 Preston Brown -- use lang finder script - -* Fri Feb 2 2001 Bill Nottingham -- finally fix the bug Nalin keeps complaining about :) - -* Wed Jan 24 2001 Preston Brown -- final i18n update before Beta. - -* Wed Oct 18 2000 Bill Nottingham -- ignore .rpmnew files (#18915) -- fix typo in error message (#17575) - -* Wed Aug 30 2000 Nalin Dahyabhai -- make xinetd config files mode 0644, not 644 - -* Thu Aug 24 2000 Erik Troan -- updated it and es translations - -* Sun Aug 20 2000 Bill Nottingham -- get man pages in proper packages - -* Sun Aug 20 2000 Matt Wilson -- new translations - -* Tue Aug 16 2000 Nalin Dahyabhai -- don't worry about extra whitespace on chkconfig: lines (#16150) - -* Wed Aug 10 2000 Trond Eivind Glomsrød -- i18n merge - -* Wed Jul 26 2000 Matt Wilson -- new translations for de fr it es - -* Tue Jul 25 2000 Bill Nottingham -- change prereqs - -* Sun Jul 23 2000 Bill Nottingham -- fix ntsysv's handling of xinetd/init files with the same name - -* Fri Jul 21 2000 Bill Nottingham -- fix segv when reading malformed files - -* Wed Jul 19 2000 Bill Nottingham -- put links, rc[0-6].d dirs back, those are necessary - -* Tue Jul 18 2000 Bill Nottingham -- add quick hack support for reading descriptions from xinetd files - -* Mon Jul 17 2000 Bernhard Rosenkraenzer -- don't own the /etc/rc[0-6].d symlinks; they're owned by initscripts - -* Sat Jul 15 2000 Matt Wilson -- move back to old file layout - -* Thu Jul 13 2000 Preston Brown -- bump copyright date - -* Tue Jul 11 2000 Bill Nottingham -- no %%pre today. Maybe tomorrow. - -* Thu Jul 6 2000 Bill Nottingham -- put initscripts %%pre here too - -* Mon Jul 3 2000 Bill Nottingham -- oops, if we don't prereq initscripts, we *need* to own /etc/rc[0-6].d - -* Sun Jul 2 2000 Bill Nottingham -- add xinetd support - -* Tue Jun 27 2000 Matt Wilson -- changed Prereq: initscripts >= 5.18 to Conflicts: initscripts < 5.18 -- fixed sumary and description where a global string replace nuked them - -* Mon Jun 26 2000 Matt Wilson -- what Bill said, but actually build this version - -* Thu Jun 15 2000 Bill Nottingham -- don't own /etc/rc.* - -* Fri Feb 11 2000 Bill Nottingham -- typo in man page - -* Wed Feb 02 2000 Cristian Gafton -- fix description - -* Wed Jan 12 2000 Bill Nottingham -- link chkconfig statically against popt - -* Mon Oct 18 1999 Bill Nottingham -- fix querying alternate levels - -* Mon Aug 23 1999 Jeff Johnson -- don't use strchr to skip unwanted files, look at extension instead (#4166). - -* Thu Aug 5 1999 Bill Nottingham -- fix --help, --verson - -* Mon Aug 2 1999 Matt Wilson -- rebuilt ntsysv against newt 0.50 - -* Mon Aug 2 1999 Jeff Johnson -- fix i18n problem in usage message (#4233). -- add --help and --version. - -* Mon Apr 19 1999 Cristian Gafton -- release for Red Hat 6.0 - -* Thu Apr 8 1999 Matt Wilson -- added support for a "hide: true" tag in initscripts that will make - services not appear in ntsysv when run with the "--hide" flag - -* Thu Apr 1 1999 Matt Wilson -- added --hide flag for ntsysv that allows you to hide a service from the - user. - -* Mon Mar 22 1999 Bill Nottingham -- fix glob, once and for all. Really. We mean it. - -* Thu Mar 18 1999 Bill Nottingham -- revert fix for services@levels, it's broken -- change default to only edit the current runlevel - -* Mon Mar 15 1999 Bill Nottingham -- don't remove scripts that don't support chkconfig - -* Tue Mar 09 1999 Erik Troan -- made glob a bit more specific so xinetd and inetd don't cause improper matches - -* Thu Feb 18 1999 Matt Wilson -- removed debugging output when starting ntsysv - -* Thu Feb 18 1999 Preston Brown -- fixed globbing error -- fixed ntsysv running services not at their specified levels. - -* Tue Feb 16 1999 Matt Wilson -- print the value of errno on glob failures. - -* Sun Jan 10 1999 Matt Wilson -- rebuilt for newt 0.40 (ntsysv) - -* Tue Dec 15 1998 Jeff Johnson -- add ru.po. - -* Thu Oct 22 1998 Bill Nottingham -- build for Raw Hide (slang-1.2.2) - -* Wed Oct 14 1998 Cristian Gafton -- translation updates - -* Thu Oct 08 1998 Cristian Gafton -- updated czech translation (and use cs instead of cz) - -* Tue Sep 22 1998 Arnaldo Carvalho de Melo -- added pt_BR translations -- added more translatable strings -- support for i18n init.d scripts description - -* Sun Aug 02 1998 Erik Troan -- built against newt 0.30 -- split ntsysv into a separate package - -* Thu May 07 1998 Erik Troan -- added numerous translations - -* Mon Mar 23 1998 Erik Troan -- added i18n support - -* Sun Mar 22 1998 Erik Troan -- added --back diff --git a/packages/coreutils/SPECS/coreutils.spec b/packages/coreutils/SPECS/coreutils.spec index 0e7448cf5..a4038a190 100644 --- a/packages/coreutils/SPECS/coreutils.spec +++ b/packages/coreutils/SPECS/coreutils.spec @@ -4,7 +4,7 @@ Summary: A set of basic GNU tools commonly used in shell scripts Name: coreutils Version: 8.30 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ Url: https://www.gnu.org/software/coreutils/ Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz @@ -128,9 +128,6 @@ Optional though recommended components, including documentation and translations. %prep -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" %autosetup -N # will be modified by coreutils-8.25-DIR_COLORS.patch @@ -148,9 +145,6 @@ find tests -name '*.sh' -perm 0644 -print -exec chmod 0755 '{}' '+' autoreconf -fiv %build -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fpic" %{expand:%%global optflags %{optflags} -D_GNU_SOURCE=1} #for type in separate single; do @@ -183,9 +177,6 @@ done cp %SOURCE50 . %check -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" #for type in separate single; do for type in separate; do test $type = 'single' && subdirs='SUBDIRS=.' # Only check gnulib once @@ -193,9 +184,6 @@ for type in separate; do done %install -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" #for type in separate single; do for type in separate; do install=install @@ -261,6 +249,9 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/stty.1.gz %license COPYING %changelog +* Fri Apr 10 2020 Daniel Hams - 8.30-5 +- Remove hard coded shell paths + * Wed Jul 24 2019 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/packages/curl/SPECS/curl.spec b/packages/curl/SPECS/curl.spec index 14923b6c4..187ddf668 100644 --- a/packages/curl/SPECS/curl.spec +++ b/packages/curl/SPECS/curl.spec @@ -4,7 +4,7 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl Version: 7.61.0 -Release: 1%{?dist} +Release: 3%{?dist} License: MIT Source: https://curl.haxx.se/download/%{name}-%{version}.tar.gz @@ -142,42 +142,38 @@ The libcurl-devel package includes header files and libraries necessary for developing programs which use the libcurl library. It contains the API documentation of the library, too. -%package -n curl-minimal -Summary: Conservatively configured build of curl for minimal installations -Provides: curl = %{version}-%{release} -Conflicts: curl -RemovePathPostfixes: .minimal +#%package -n curl-minimal +#Summary: Conservatively configured build of curl for minimal installations +#Provides: curl = %{version}-%{release} +#Conflicts: curl +#RemovePathPostfixes: .minimal # using an older version of libcurl could result in CURLE_UNKNOWN_OPTION -Requires: libcurl%{?_isa} >= %{version}-%{release} - -%description -n curl-minimal -This is a replacement of the 'curl' package for minimal installations. It -comes with a limited set of features compared to the 'curl' package. On the -other hand, the package is smaller and requires fewer run-time dependencies to -be installed. - -%package -n libcurl-minimal -Summary: Conservatively configured build of libcurl for minimal installations -Requires: openssl-libs%{?_isa} >= 1:%{openssl_version} -Provides: libcurl = %{version}-%{release} -Provides: libcurl%{?_isa} = %{version}-%{release} -Conflicts: libcurl -RemovePathPostfixes: .minimal +#Requires: libcurl%{?_isa} >= %{version}-%{release} + +#%description -n curl-minimal +#This is a replacement of the 'curl' package for minimal installations. It +#comes with a limited set of features compared to the 'curl' package. On the +#other hand, the package is smaller and requires fewer run-time dependencies to +#be installed. + +#%package -n libcurl-minimal +#Summary: Conservatively configured build of libcurl for minimal installations +#Requires: openssl-libs%{?_isa} >= 1:%{openssl_version} +#Provides: libcurl = %{version}-%{release} +#Provides: libcurl%{?_isa} = %{version}-%{release} +#Conflicts: libcurl +#RemovePathPostfixes: .minimal # needed for RemovePathPostfixes to work with shared libraries -%undefine __brp_ldconfig +#%undefine __brp_ldconfig -%description -n libcurl-minimal -This is a replacement of the 'libcurl' package for minimal installations. It -comes with a limited set of features compared to the 'libcurl' package. On the -other hand, the package is smaller and requires fewer run-time dependencies to -be installed. +#%description -n libcurl-minimal +#This is a replacement of the 'libcurl' package for minimal installations. It +#comes with a limited set of features compared to the 'libcurl' package. On the +#other hand, the package is smaller and requires fewer run-time dependencies to +#be installed. %prep -export SHELL="%{_bindir}/sh" -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" -export PERL="%{_bindir}/perl" %setup -q # upstream patches @@ -218,18 +214,15 @@ echo "582" >> tests/data/DISABLED sed -e 's/^35$/35,52/' -i tests/data/test323 %build -export SHELL="%{_bindir}/sh" -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" -export PERL="%{_bindir}/perl" -mkdir build-{full,minimal} +#mkdir build-{full,minimal} +mkdir build-full export common_configure_opts=" \ - --cache-file=../config.cache \ --disable-static \ --enable-symbol-hiding \ --with-ssl --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt" +# --cache-file=../config.cache \ # # --enable-ipv6 \ # # --enable-threaded-resolver \ # # --with-gssapi \ # @@ -238,18 +231,18 @@ export common_configure_opts=" \ %global _configure ../configure # configure minimal build -( - cd build-minimal - %configure $common_configure_opts \ - --disable-ldap \ - --disable-ldaps \ - --disable-manual \ - --without-brotli \ - --without-libidn2 \ - --without-libmetalink \ - --without-libpsl \ - --without-libssh -) +#( +# cd build-minimal +# %%configure $common_configure_opts \ +# --disable-ldap \ +# --disable-ldaps \ +# --disable-manual \ +# --without-brotli \ +# --without-libidn2 \ +# --without-libmetalink \ +# --without-libpsl \ +# --without-libssh +#) # configure full build ( @@ -278,14 +271,10 @@ export common_configure_opts=" \ # -e 's/^hardcode_libdir_flag_spec=".*"$/hardcode_libdir_flag_spec=""/' \ # -i build-{full,minimal}/libtool -make %{?_smp_mflags} V=1 -C build-minimal +#make %{?_smp_mflags} V=1 -C build-minimal make %{?_smp_mflags} V=1 -C build-full %check -export SHELL="%{_bindir}/sh" -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" -export PERL="%{_bindir}/perl" # we have to override LD_LIBRARY_PATH because we eliminated rpath LD_LIBRARYN32_PATH="$RPM_BUILD_ROOT%{_libdir}:$LD_LIBRARYN32_PATH" @@ -303,21 +292,17 @@ export OPENSSL_CONF= srcdir=../../tests perl -I../../tests ../../tests/runtests.pl -a -p -v '!flaky' %install -export SHELL="%{_bindir}/sh" -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" -export PERL="%{_bindir}/perl" - -# install and rename the library that will be packaged as libcurl-minimal -make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install -C build-minimal/lib -rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.{la,so} -for i in ${RPM_BUILD_ROOT}%{_libdir}/*; do - mv -v $i $i.minimal -done - -# install and rename the executable that will be packaged as curl-minimal -make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install -C build-minimal/src -mv -v ${RPM_BUILD_ROOT}%{_bindir}/curl{,.minimal} + +## install and rename the library that will be packaged as libcurl-minimal +#make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install -C build-minimal/lib +#rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.{la,so} +#for i in ${RPM_BUILD_ROOT}%{_libdir}/*; do +# mv -v $i $i.minimal +#done +# +## install and rename the executable that will be packaged as curl-minimal +#make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install -C build-minimal/src +#mv -v ${RPM_BUILD_ROOT}%{_bindir}/curl{,.minimal} # install libcurl.m4 install -d $RPM_BUILD_ROOT%{_datadir}/aclocal @@ -371,16 +356,19 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la %{_mandir}/man3/* %{_datadir}/aclocal/libcurl.m4 -%files -n curl-minimal -%{_bindir}/curl.minimal -%{_mandir}/man1/curl.1* +#%files -n curl-minimal +#%{_bindir}/curl.minimal +#%{_mandir}/man1/curl.1* -%files -n libcurl-minimal -%license COPYING -%{_libdir}/libcurl.so.4.minimal -%{_libdir}/libcurl.so.4.[0-9].[0-9].minimal +#%files -n libcurl-minimal +#%license COPYING +#%{_libdir}/libcurl.so.4.minimal +#%{_libdir}/libcurl.so.4.[0-9].[0-9].minimal %changelog +* Fri Apr 10 2020 Daniel Hams - 7.61.0-3 +- Disable curl-minimal, libcurl-minimal + * Wed Sep 11 2019 Kamil Dudka - 7.66.0-1 - new upstream release, which fixes the following vulnerabilities CVE-2019-5481 - double free due to subsequent call of realloc() diff --git a/packages/ddd/SPECS/ddd.spec b/packages/ddd/SPECS/ddd.spec index 97c8954ef..0b825d55f 100644 --- a/packages/ddd/SPECS/ddd.spec +++ b/packages/ddd/SPECS/ddd.spec @@ -2,7 +2,7 @@ Summary: GUI for several command-line debuggers Name: ddd Version: 3.3.12 -Release: 33%{?dist} +Release: 34%{?dist} License: GPLv2+ URL: http://www.gnu.org/software/ddd/ #Source0: http://dl.sf.net/ddd/ddd-%{version}.tar.gz @@ -57,9 +57,6 @@ interface with full editing, history and completion capabilities. %patch100 -p1 %build -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" export CPPFLAGS="$CPPFLAGS -D_SGI_SOURCES -D_SGI_REENTRANT_FUNCTIONS -I/usr/Motif-2.1/include -I%{_includedir}" export PATH="/usr/bin/X11:$PATH" export LDFLAGS="-L/usr/Motif-2.1/lib32 -lXm $RPM_LD_FLAGS" @@ -106,6 +103,9 @@ install -D -m 0644 %{SOURCE2} \ %{_mandir}/man1/ddd.1* %changelog +* Fri Apr 10 2020 Daniel Hams - 3.3.12-34 +- Remove hard coded shell paths + * Wed Jul 24 2019 Fedora Release Engineering - 3.3.12-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/packages/diffutils/SPECS/diffutils.spec b/packages/diffutils/SPECS/diffutils.spec index 4472614af..6e27724ca 100644 --- a/packages/diffutils/SPECS/diffutils.spec +++ b/packages/diffutils/SPECS/diffutils.spec @@ -4,7 +4,7 @@ Summary: A GNU collection of diff utilities Name: diffutils Version: 3.6 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.gnu.org/software/diffutils/diffutils.html Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz Patch1: diffutils-cmp-s-empty.patch @@ -30,11 +30,6 @@ to merge two files interactively. Install diffutils if you need to compare text files. %prep -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" -export PERL=%{_bindir}/perl -export PERL_PATH="$PERL" %setup -q # For 'cmp -s', compare file sizes only if both non-zero (bug #563618). %patch1 -p1 -b .cmp-s-empty @@ -47,20 +42,10 @@ export PERL_PATH="$PERL" autoreconf %build -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" -export PERL=%{_bindir}/perl -export PERL_PATH="$PERL" %configure make PR_PROGRAM=%{_bindir}/pr %{_smp_mflags} V=1 %install -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" -export PERL=%{_bindir}/perl -export PERL_PATH="$PERL" %make_install rm -f $RPM_BUILD_ROOT%{_libdir}/charset.alias @@ -81,6 +66,9 @@ make check %{_infodir}/diffutils.info* %changelog +* Fri Apr 10 2020 Daniel Hams - 3.6-4 +- Remove hard coded shell paths + * Wed Jul 24 2019 Fedora Release Engineering - 3.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/packages/distcc/SPECS/distcc.spec b/packages/distcc/SPECS/distcc.spec new file mode 100644 index 000000000..1521592d8 --- /dev/null +++ b/packages/distcc/SPECS/distcc.spec @@ -0,0 +1,302 @@ +%define _hardened_build 1 + +Name: distcc +Version: 3.3.3 +Release: 2%{?dist} +Summary: Distributed C/C++ compilation +License: GPLv2+ +URL: https://github.com/distcc/distcc +Source0: https://github.com/distcc/distcc/archive/v%{version}/%{name}-%{version}.tar.gz +Source1: hosts.sample +#Source2: distccd.service +Patch0: distcc-localhost.patch + +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: libtool +BuildRequires: popt-devel +#BuildRequires: libgnomeui-devel +#BuildRequires: pango-devel +#BuildRequires: python3-devel +#BuildRequires: desktop-file-utils +#BuildRequires: avahi-devel +#BuildRequires: krb5-devel +BuildRequires: binutils-devel + +%description +distcc is a program to distribute compilation of C or C++ code across +several machines on a network. distcc should always generate the same +results as a local compile, is simple to install and use, and is often +two or more times faster than a local compile. + + +#%package gnome +#Summary: Gnome frontend of distcc monitoring tool +#Requires: %{name}%{?_isa} = %{version}-%{release} + +#%description gnome +#This package contains the Gnome frontend of the distcc monitoring tool. + + +#%package server +#Summary: Server for distributed C/C++ compilation +#License: GPLv2+ + +#Requires: %{name}%{?_isa} = %{version}-%{release} +#Requires(post): systemd-units +#Requires(preun): systemd-units +#Requires(postun): systemd-units +#Requires(post): systemd-sysv + +#%description server +#This package contains the compilation server needed to use %{name}. + + +%prep +%setup -q +%patch0 -p0 + +%build +#export PYTHON='/usr/bin/python3' +./autogen.sh +#configure --with-gnome --disable-Werror --with-auth +%configure --without-gnome --disable-Werror --with-auth --disable-pump-mode +make %{?_smp_mflags} + + +%install +make install DESTDIR=$RPM_BUILD_ROOT + +# Move desktop file to right directory +#mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +#mv $RPM_BUILD_ROOT%{_datadir}/%{name}/*.desktop $RPM_BUILD_ROOT%{_datadir}/applications/ +#sed -i 's@Icon=@Icon=%{_datadir}/%{name}/@' $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop + +# Install sample hosts file +install -Dm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/hosts + +# Install sample distccd config file +install -Dm 0644 contrib/redhat/sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/distccd + +# Install distcdd unit file +#mkdir -p $RPM_BUILD_ROOT%{_unitdir} +#install -Dm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/distccd.service + +# Install distcc dirs +mkdir -p $RPM_BUILD_ROOT%{_libdir}/distcc +mkdir -p $RPM_BUILD_ROOT%{_libdir}/gcc-cross +#if [ ! -d $RPM_BUILD_ROOT/usr/lib64 ]; then +# mkdir -p $RPM_BUILD_ROOT/usr/lib64 +#fi +#ln -s /usr/lib/distcc $RPM_BUILD_ROOT/usr/lib64/distcc + +rm -rf $RPM_BUILD_ROOT%{_docdir}/* + +# Setup the masq links in an appropriate directory +mkdir -p $RPM_BUILD_ROOT%{_prefix}/distccmasqbin +cd $RPM_BUILD_ROOT%{_prefix}/distccmasqbin +ln -s ../bin/distcc c++ +ln -s ../bin/distcc cc +ln -s ../bin/distcc cpp +ln -s ../bin/distcc g++ +ln -s ../bin/distcc gcc + +ln -s ../bin/distcc mips-sgi-irix6.5-c++ +ln -s ../bin/distcc mips-sgi-irix6.5-g++ +ln -s ../bin/distcc mips-sgi-irix6.5-gcc + +# Remove the server pieces which aren't verified as working right now. +# If you are looking for the "update symlinks" - you don't need it +# use the directory with masquerading links created above +# (add /usr/sgug/distccmasqbin to your PATH) +rm $RPM_BUILD_ROOT%{_bindir}/distccd +rm $RPM_BUILD_ROOT%{_sysconfdir}/default/distcc +rm $RPM_BUILD_ROOT%{_sysconfdir}/distcc/clients.allow +rm $RPM_BUILD_ROOT%{_sysconfdir}/distcc/commands.allow.sh +rm $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/distccd +rm $RPM_BUILD_ROOT%{_mandir}/man1/distccd* +rm $RPM_BUILD_ROOT%{_sbindir}/update-distcc-symlinks + +#%post server +##[ $1 -lt 2 ] && /sbin/chkconfig --add distccd ||: +#if [ $1 -eq 1 ] ; then +# # Initial installation +# /bin/systemctl daemon-reload >/dev/null 2>&1 || : +#fi +#%{_sbindir}/update-distcc-symlinks + +#%preun server +##[ $1 -eq 0 ] && /sbin/chkconfig --del distccd ||: +#if [ $1 -eq 0 ] ; then +# # Package removal, not upgrade +# /bin/systemctl --no-reload disable distccd.service > /dev/null 2>&1 || : +# /bin/systemctl stop distccd.service > /dev/null 2>&1 || : +#fi + +#%postun server +#/bin/systemctl daemon-reload >/dev/null 2>&1 || : +#if [ $1 -ge 1 ] ; then +# # Package upgrade, not uninstall +# /bin/systemctl try-restart distccd.service >/dev/null 2>&1 || : +#fi + +%files +%doc AUTHORS doc/* NEWS README.pump TODO +%doc COPYING INSTALL README survey.txt +%{_bindir}/distcc +%{_bindir}/distccmon-text +%{_bindir}/lsdistcc +#%{_bindir}/pump +%{_prefix}/distccmasqbin/* +%{_mandir}/man1/distcc.* +%{_mandir}/man1/distccmon* +%{_mandir}/man1/pump* +%{_mandir}/man1/include_server* +%{_mandir}/man1/lsdistcc* +%dir %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/hosts +#%{python3_sitearch}/include_server* + + +#%files gnome +#%{_bindir}/distccmon-gnome +#%{_datadir}/%{name} +#%{_datadir}/applications/*.desktop + + +#%files server +#%doc COPYING README +#%{_bindir}/distccd +##%{_unitdir}/* +#%{_sysconfdir}/default/distcc +#%{_sysconfdir}/distcc/*allow* +#%{_mandir}/man1/distccd* +#%config(noreplace) %{_sysconfdir}/sysconfig/distccd +#%{_sbindir}/update-distcc-symlinks +#%dir %{_libdir}/distcc +##/usr/lib64/distcc +#%dir %{_libdir}/gcc-cross + +%changelog +* Fri Apr 10 2020 Daniel Hams - 3.3.3-2 +- Provide masquerade links avoiding need for python + dont produce server since its not validated. + +* Thu Aug 15 2019 Gwyn Ciesla - 3.3.3-1 +- 3.3.3 + +* Tue Aug 06 2019 Gwyn Ciesla - 3.3.2-1 +- Python 3. + +* Wed Jul 24 2019 Fedora Release Engineering - 3.2rc1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue May 07 2019 Gwyn Ciesla - 3.2rc1-23 +- Honor clients.allow + +* Thu Feb 21 2019 Gwyn Ciesla - 3.2rc1-22 +- Restrict to localhost by default. + +* Thu Jan 31 2019 Fedora Release Engineering - 3.2rc1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 3.2rc1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Mar 13 2018 Iryna Shcherbina - 3.2rc1-19 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Wed Feb 07 2018 Fedora Release Engineering - 3.2rc1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Dec 21 2017 Gwyn Ciesla - 3.2rc1-17 +- Drop --verbose, BZ 1523785. + +* Thu Dec 21 2017 Gwyn Ciesla - 3.2rc1-16 +- Patch for argument bug, BZ 1527368 +- Move required components for pump to client package, BZ 1525851 + +* Wed Aug 02 2017 Fedora Release Engineering - 3.2rc1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.2rc1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.2rc1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jul 19 2016 Fedora Release Engineering - 3.2rc1-12 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Wed Feb 03 2016 Fedora Release Engineering - 3.2rc1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 3.2rc1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Mar 12 2015 Jon Ciesla - 3.2rc1-9 +- Enable authentication support, BZ 1201039. + +* Wed Aug 20 2014 Andy Grover - 3.2rc1-8 +- Add patch distcc-minilzo-2.08.patch, to fix CVE-2014-4607 (BZ 1131791) + +* Sat Aug 16 2014 Fedora Release Engineering - 3.2rc1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 3.2rc1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Aug 08 2013 Jon Ciesla - 3.2rc1-5 +- Fixed unversioned docdir issue, BZ 993722. + +* Sat Aug 03 2013 Fedora Release Engineering - 3.2rc1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu May 16 2013 Jon Ciesla - 3.2rc1-3 +- chmod -x .service, BZ 963912 + +* Wed Feb 13 2013 Fedora Release Engineering - 3.2rc1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Oct 25 2012 Jon Ciesla - 3.2rc1-1 +- Latest upstream, BZ 870200. + +* Wed Jul 18 2012 Fedora Release Engineering - 3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Apr 13 2012 Jon Ciesla - 3.1-6 +- Add hardened build. + +* Tue Jan 31 2012 Jon Ciesla - 3.1-5 +- Migrate to systemd, BZ 770409. + +* Fri Jan 13 2012 Fedora Release Engineering - 3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Nov 10 2011 Jon Ciesla - 3.1-3 +- Rebuild for libpng 1.5. + +* Tue Feb 08 2011 Fedora Release Engineering - 3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Oct 07 2010 Jon Ciesla - 3.1-1 +- New upstream, BZ 641032. + +* Fri Jul 24 2009 Fedora Release Engineering - 2.18.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Feb 24 2009 Fedora Release Engineering - 2.18.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Feb 22 2008 Denis Leroy - 2.18.3-4 +- Added Avahi support patch from Lennart + +* Tue Feb 19 2008 Denis Leroy - 2.18.3-3 +- LSB header for init script + +* Mon Feb 18 2008 Denis Leroy - 2.18.3-2 +- Fixed Source0 URL, fixed init script + +* Mon Feb 4 2008 Denis Leroy - 2.18.3-1 +- First version + diff --git a/packages/distcc/SPECS/distcc.spec.origfedora b/packages/distcc/SPECS/distcc.spec.origfedora new file mode 100644 index 000000000..e3fa528fa --- /dev/null +++ b/packages/distcc/SPECS/distcc.spec.origfedora @@ -0,0 +1,272 @@ +%define _hardened_build 1 + +Name: distcc +Version: 3.3.3 +Release: 1%{?dist} +Summary: Distributed C/C++ compilation +License: GPLv2+ +URL: https://github.com/distcc/distcc +Source0: https://github.com/distcc/distcc/archive/v%{version}/%{name}-%{version}.tar.gz +Source1: hosts.sample +Source2: distccd.service +Patch0: distcc-localhost.patch + +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: libtool +BuildRequires: popt-devel +BuildRequires: libgnomeui-devel +BuildRequires: pango-devel +BuildRequires: python3-devel +BuildRequires: desktop-file-utils +BuildRequires: avahi-devel +BuildRequires: krb5-devel +BuildRequires: binutils-devel + +%description +distcc is a program to distribute compilation of C or C++ code across +several machines on a network. distcc should always generate the same +results as a local compile, is simple to install and use, and is often +two or more times faster than a local compile. + + +%package gnome +Summary: Gnome frontend of distcc monitoring tool +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description gnome +This package contains the Gnome frontend of the distcc monitoring tool. + + +%package server +Summary: Server for distributed C/C++ compilation +License: GPLv2+ + +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires(post): systemd-units +Requires(preun): systemd-units +Requires(postun): systemd-units +Requires(post): systemd-sysv + +%description server +This package contains the compilation server needed to use %{name}. + + +%prep +%setup -q +%patch0 -p0 + +%build +export PYTHON='/usr/bin/python3' +./autogen.sh +%configure --with-gnome --disable-Werror --with-auth +make %{?_smp_mflags} + + +%install +make install DESTDIR=$RPM_BUILD_ROOT + +# Move desktop file to right directory +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +mv $RPM_BUILD_ROOT%{_datadir}/%{name}/*.desktop $RPM_BUILD_ROOT%{_datadir}/applications/ +sed -i 's@Icon=@Icon=%{_datadir}/%{name}/@' $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop + +# Install sample hosts file +install -Dm 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/hosts + +# Install sample distccd config file +install -Dm 0644 contrib/redhat/sysconfig $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/distccd + +# Install distcdd unit file +mkdir -p $RPM_BUILD_ROOT%{_unitdir} +install -Dm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/distccd.service + +# Install distcc dirs +mkdir -p $RPM_BUILD_ROOT/usr/lib/distcc +mkdir -p $RPM_BUILD_ROOT/usr/lib/gcc-cross +if [ ! -d $RPM_BUILD_ROOT/usr/lib64 ]; then + mkdir -p $RPM_BUILD_ROOT/usr/lib64 +fi +ln -s /usr/lib/distcc $RPM_BUILD_ROOT/usr/lib64/distcc + +rm -rf $RPM_BUILD_ROOT%{_docdir}/* + +%post server +#[ $1 -lt 2 ] && /sbin/chkconfig --add distccd ||: +if [ $1 -eq 1 ] ; then + # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : +fi +%{_sbindir}/update-distcc-symlinks + +%preun server +#[ $1 -eq 0 ] && /sbin/chkconfig --del distccd ||: +if [ $1 -eq 0 ] ; then + # Package removal, not upgrade + /bin/systemctl --no-reload disable distccd.service > /dev/null 2>&1 || : + /bin/systemctl stop distccd.service > /dev/null 2>&1 || : +fi + +%postun server +/bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then + # Package upgrade, not uninstall + /bin/systemctl try-restart distccd.service >/dev/null 2>&1 || : +fi + +%files +%doc AUTHORS doc/* NEWS README.pump TODO +%doc COPYING INSTALL README survey.txt +%{_bindir}/distcc +%{_bindir}/distccmon-text +%{_bindir}/lsdistcc +%{_bindir}/pump +%{_mandir}/man1/distcc.* +%{_mandir}/man1/distccmon* +%{_mandir}/man1/pump* +%{_mandir}/man1/include_server* +%{_mandir}/man1/lsdistcc* +%dir %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/hosts +%{python3_sitearch}/include_server* + + +%files gnome +%{_bindir}/distccmon-gnome +%{_datadir}/%{name} +%{_datadir}/applications/*.desktop + + +%files server +%doc COPYING README +%{_bindir}/distccd +%{_unitdir}/* +%{_sysconfdir}/default/distcc +%{_sysconfdir}/distcc/*allow* +%{_mandir}/man1/distccd* +%config(noreplace) %{_sysconfdir}/sysconfig/distccd +%{_sbindir}/update-distcc-symlinks +%dir /usr/lib/distcc +/usr/lib64/distcc +%dir /usr/lib/gcc-cross + +%changelog +* Thu Aug 15 2019 Gwyn Ciesla - 3.3.3-1 +- 3.3.3 + +* Tue Aug 06 2019 Gwyn Ciesla - 3.3.2-1 +- Python 3. + +* Wed Jul 24 2019 Fedora Release Engineering - 3.2rc1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue May 07 2019 Gwyn Ciesla - 3.2rc1-23 +- Honor clients.allow + +* Thu Feb 21 2019 Gwyn Ciesla - 3.2rc1-22 +- Restrict to localhost by default. + +* Thu Jan 31 2019 Fedora Release Engineering - 3.2rc1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 3.2rc1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Mar 13 2018 Iryna Shcherbina - 3.2rc1-19 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Wed Feb 07 2018 Fedora Release Engineering - 3.2rc1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Dec 21 2017 Gwyn Ciesla - 3.2rc1-17 +- Drop --verbose, BZ 1523785. + +* Thu Dec 21 2017 Gwyn Ciesla - 3.2rc1-16 +- Patch for argument bug, BZ 1527368 +- Move required components for pump to client package, BZ 1525851 + +* Wed Aug 02 2017 Fedora Release Engineering - 3.2rc1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.2rc1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.2rc1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Jul 19 2016 Fedora Release Engineering - 3.2rc1-12 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Wed Feb 03 2016 Fedora Release Engineering - 3.2rc1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 3.2rc1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Mar 12 2015 Jon Ciesla - 3.2rc1-9 +- Enable authentication support, BZ 1201039. + +* Wed Aug 20 2014 Andy Grover - 3.2rc1-8 +- Add patch distcc-minilzo-2.08.patch, to fix CVE-2014-4607 (BZ 1131791) + +* Sat Aug 16 2014 Fedora Release Engineering - 3.2rc1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 3.2rc1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Aug 08 2013 Jon Ciesla - 3.2rc1-5 +- Fixed unversioned docdir issue, BZ 993722. + +* Sat Aug 03 2013 Fedora Release Engineering - 3.2rc1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu May 16 2013 Jon Ciesla - 3.2rc1-3 +- chmod -x .service, BZ 963912 + +* Wed Feb 13 2013 Fedora Release Engineering - 3.2rc1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Oct 25 2012 Jon Ciesla - 3.2rc1-1 +- Latest upstream, BZ 870200. + +* Wed Jul 18 2012 Fedora Release Engineering - 3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Apr 13 2012 Jon Ciesla - 3.1-6 +- Add hardened build. + +* Tue Jan 31 2012 Jon Ciesla - 3.1-5 +- Migrate to systemd, BZ 770409. + +* Fri Jan 13 2012 Fedora Release Engineering - 3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Nov 10 2011 Jon Ciesla - 3.1-3 +- Rebuild for libpng 1.5. + +* Tue Feb 08 2011 Fedora Release Engineering - 3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Oct 07 2010 Jon Ciesla - 3.1-1 +- New upstream, BZ 641032. + +* Fri Jul 24 2009 Fedora Release Engineering - 2.18.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Feb 24 2009 Fedora Release Engineering - 2.18.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Fri Feb 22 2008 Denis Leroy - 2.18.3-4 +- Added Avahi support patch from Lennart + +* Tue Feb 19 2008 Denis Leroy - 2.18.3-3 +- LSB header for init script + +* Mon Feb 18 2008 Denis Leroy - 2.18.3-2 +- Fixed Source0 URL, fixed init script + +* Mon Feb 4 2008 Denis Leroy - 2.18.3-1 +- First version + diff --git a/packages/docbook-style-xsl/SPECS/docbook-style-xsl.spec b/packages/docbook-style-xsl/SPECS/docbook-style-xsl.spec index 9c7dbbc3b..619d5d224 100644 --- a/packages/docbook-style-xsl/SPECS/docbook-style-xsl.spec +++ b/packages/docbook-style-xsl/SPECS/docbook-style-xsl.spec @@ -3,7 +3,7 @@ Name: docbook-style-xsl Version: 1.79.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Norman Walsh's XSL stylesheets for DocBook XML @@ -50,15 +50,12 @@ other formats, such as HTML, FO, and XHMTL. They are highly customizable. %prep -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" %setup -c -T -n docbook-xsl-%{version} tar jxf %{SOURCE0} mv docbook-xsl-nons-%{version}/* . -pushd .. +cd .. tar jxf %{SOURCE2} -popd +cd docbook-xsl-%{version} %patch1 -p1 -b .pagesetup %patch2 -p1 -b .marginleft %patch3 -p1 -b .newmethods @@ -84,15 +81,8 @@ done %build -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" - %install -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT make install BINDIR=$DESTDIR%{_bindir} DESTDIR=$DESTDIR%{_datadir}/sgml/docbook/xsl-stylesheets-%{version} @@ -146,6 +136,9 @@ if [ "$1" = 0 ]; then fi %changelog +* Fri Apr 10 2020 Daniel Hams - 1.79.2-11 +- Remove hard coded shell paths/bashisms + * Wed Jul 24 2019 Fedora Release Engineering - 1.79.2-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/packages/elfutils/SPECS/elfutils.spec b/packages/elfutils/SPECS/elfutils.spec index 9394519b0..c35f89a75 100644 --- a/packages/elfutils/SPECS/elfutils.spec +++ b/packages/elfutils/SPECS/elfutils.spec @@ -4,7 +4,7 @@ Name: elfutils Summary: A collection of utilities and DSOs to handle ELF files and DWARF data Version: 0.177 -%global baserelease 2 +%global baserelease 3 URL: http://elfutils.org/ %global source_url ftp://sourceware.org/pub/elfutils/%{version}/ License: GPLv3+ and (GPLv2+ or LGPLv3+) @@ -189,10 +189,6 @@ profiling) of processes. %endif %prep -export SHELL="%{_bindir}/sh" -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" -export PERL="%{_bindir}/perl" %setup -q # Apply patches @@ -215,10 +211,6 @@ find . -name \*.sh ! -perm -0100 -print | xargs chmod +x trap 'cat config.log' EXIT -export SHELL="%{_bindir}/sh" -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" -export PERL="%{_bindir}/perl" export CPPFLAGS="-D_SGI_SOURCE -D_SGI_REENTRANT_FUNCTIONS -I%{_includedir}/libdicl-0.1 $CPPFLAGS" export LDFLAGS="-ldicl-0.1 -lintl -lc -llzma -lpthread -lgen $RPM_LD_FLAGS" %configure --enable-install-elfh CFLAGS="$RPM_OPT_FLAGS -fexceptions -Wno-error" @@ -340,6 +332,9 @@ fi %endif %changelog +* Fri Apr 10 2020 Daniel Hams - 0.177-3 +- Remove hard coded shell paths + * Thu Feb 20 2020 Daniel Hams - 0.177-2 - Rebuild due to libdicl upgrade to 0.1.19 diff --git a/packages/expat/SPECS/expat.spec b/packages/expat/SPECS/expat.spec index 2e54571cb..0210fd572 100644 --- a/packages/expat/SPECS/expat.spec +++ b/packages/expat/SPECS/expat.spec @@ -5,8 +5,8 @@ Summary: An XML parser library Name: expat -Version: %(echo %{unversion} | sed 's/_/./g') -Release: 1%{?dist} +Version: 2.2.8 +Release: 3%{?dist} Source: https://github.com/libexpat/libexpat/archive/R_%{unversion}.tar.gz#/expat-%{version}.tar.gz URL: https://libexpat.github.io/ License: MIT @@ -39,27 +39,21 @@ The expat-static package contains the static version of the expat library. Install it if you need to link statically with expat. %prep -export SHELL="%{_bindir}/sh" -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" %setup -q -n libexpat-R_%{unversion}/expat +# Fix up some hardcoded paths +perl -pi -e "s|/bin/sh|%{_bindir}/bash|g" conftools/get-version.sh + sed -i 's/install-data-hook/do-nothing-please/' lib/Makefile.am rm -f m4/libtool.m4 -./buildconf.sh +bash ./buildconf.sh %build -export SHELL="%{_bindir}/sh" -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" export CFLAGS="$RPM_OPT_FLAGS -fPIC" #export DOCBOOK_TO_MAN="xmlto man --skip-validation" %configure --without-docbook make %{?_smp_mflags} V=1 VERBOSE=1 %install -export SHELL="%{_bindir}/sh" -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" make install DESTDIR=$RPM_BUILD_ROOT V=1 VERBOSE=1 rm %{buildroot}%{_docdir}/%{name}/AUTHORS rm %{buildroot}%{_docdir}/%{name}/Changes @@ -90,6 +84,9 @@ make check %{_libdir}/lib*.a %changelog +* Tue Apr 7 2020 Daniel Hams - 2.2.8-2 +- Fix hardcoded path to /bin/sh breaking autoreconf + * Mon Sep 16 2019 Joe Orton - 2.2.8-1 - update to 2.2.8 (#1752167) diff --git a/packages/fftw/SPECS/fftw.spec b/packages/fftw/SPECS/fftw.spec index bf83a2dee..fa112d731 100644 --- a/packages/fftw/SPECS/fftw.spec +++ b/packages/fftw/SPECS/fftw.spec @@ -19,7 +19,7 @@ Name: fftw Version: 3.3.8 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A Fast Fourier Transform library License: GPLv2+ URL: http://www.fftw.org @@ -302,7 +302,8 @@ prec_flags[3]=--enable-quad-precision %ifarch x86_64 # Enable SSE2 and AVX support for x86_64 -for((i=0;i<2;i++)); do +#for((i=0;i<2;i++)); do +for i in 0 1; do prec_flags[i]+=" --enable-sse2 --enable-avx" done %endif @@ -310,23 +311,27 @@ done # No NEON run time detection, not all ARM SoCs have NEON #%ifarch %{arm} ## Compile support for NEON instructions -#for((i=0;i<2;i++)); do +##for((i=0;i<2;i++)); do +#for i in 0 1; do # prec_flags[i]+=" --enable-neon" #done #%endif #%ifarch ppc ppc64 ## Compile support for Altivec instructions -#for((i=0;i<2;i++)); do - #prec_flags[i]+=" --enable-altivec" +##for((i=0;i<2;i++)); do +#for i in 0 1; do +#prec_flags[i]+=" --enable-altivec" #done #%endif # Loop over precisions %if %{quad} -for((iprec=0;iprec<4;iprec++)) +#for((iprec=0;iprec<4;iprec++)) +for iprec in 0 1 2 3 %else -for((iprec=0;iprec<3;iprec++)) +#for((iprec=0;iprec<3;iprec++)) +for iprec in 0 1 2 %endif do mkdir ${prec_name[iprec]}${ver_name[iver]} @@ -344,7 +349,8 @@ for mpi in %{mpi_list} do module load mpi/${mpi}-%{_arch} # Loop over precisions - no quad precision support with MPI - for((iprec=0;iprec<3;iprec++)) +# for((iprec=0;iprec<3;iprec++)) + for iprec in 0 1 2 do mkdir ${mpi}-${prec_name[iprec]}${ver_name[iver]} cd ${mpi}-${prec_name[iprec]}${ver_name[iver]} @@ -547,6 +553,9 @@ done %endif %changelog +* Fri Apr 10 2020 Daniel Hams - 3.3.8-7 +- Remove hard coded shell paths/bashisms + * Thu Jul 25 2019 Fedora Release Engineering - 3.3.8-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/packages/file/SOURCES/file.sgislowmatchersfix.patch b/packages/file/SOURCES/file.sgislowmatchersfix.patch deleted file mode 100644 index dc9e07d4a..000000000 --- a/packages/file/SOURCES/file.sgislowmatchersfix.patch +++ /dev/null @@ -1,1065 +0,0 @@ -Only in file-5.36-patched: Makefile -Only in file-5.36-patched: config.h -Only in file-5.36-patched: config.log -Only in file-5.36-patched: config.status -Only in file-5.36-patched/doc: Makefile -Only in file-5.36-patched: libtool -Only in file-5.36-patched/magic: Makefile -Only in file-5.36-patched/python: Makefile -Only in file-5.36-patched/src: .deps -Only in file-5.36-patched/src: Makefile -diff -r -u file-5.36/src/ascmagic.c file-5.36-patched/src/ascmagic.c ---- file-5.36/src/ascmagic.c 2019-02-20 02:35:27.000000000 +0000 -+++ file-5.36-patched/src/ascmagic.c 2019-12-29 01:10:14.616716720 +0000 -@@ -80,6 +80,7 @@ - const char *type = NULL; - - bb = *b; -+ //fprintf(stdout,"trim_nuls\n"); - bb.flen = trim_nuls(CAST(const unsigned char *, b->fbuf), b->flen); - /* - * Avoid trimming at an odd byte if the original buffer was evenly -@@ -89,12 +90,16 @@ - bb.flen++; - - /* If file doesn't look like any sort of text, give up. */ -+ //fprintf(stdout,"file_encoding\n"); - if (file_encoding(ms, &bb, &ubuf, &ulen, &code, &code_mime, - &type) == 0) - rv = 0; -- else -- rv = file_ascmagic_with_encoding(ms, &bb, -- ubuf, ulen, code, type, text); -+ else { -+ //fprintf(stdout,"file_ascmagic_with_encoding\n"); -+ rv = file_ascmagic_with_encoding(ms, &bb, -+ ubuf, ulen, code, type, text); -+ //fprintf(stdout,"file_ascmagic_with_encoding done\n"); -+ } - - free(ubuf); - -@@ -106,214 +111,219 @@ - const struct buffer *b, unichar *ubuf, size_t ulen, const char *code, - const char *type, int text) - { -- struct buffer bb; -- const unsigned char *buf = CAST(const unsigned char *, b->fbuf); -- size_t nbytes = b->flen; -- unsigned char *utf8_buf = NULL, *utf8_end; -- size_t mlen, i; -- int rv = -1; -- int mime = ms->flags & MAGIC_MIME; -- -- const char *subtype = NULL; -- const char *subtype_mime = NULL; -- -- int has_escapes = 0; -- int has_backspace = 0; -- int seen_cr = 0; -- -- int n_crlf = 0; -- int n_lf = 0; -- int n_cr = 0; -- int n_nel = 0; -- int executable = 0; -- -- size_t last_line_end = CAST(size_t, -1); -- int has_long_lines = 0; -- -- nbytes = trim_nuls(buf, nbytes); -- -- /* If we have fewer than 2 bytes, give up. */ -- if (nbytes <= 1) { -- rv = 0; -- goto done; -- } -- -- if (ulen > 0 && (ms->flags & MAGIC_NO_CHECK_SOFT) == 0) { -- /* Convert ubuf to UTF-8 and try text soft magic */ -- /* malloc size is a conservative overestimate; could be -- improved, or at least realloced after conversion. */ -- mlen = ulen * 6; -- if ((utf8_buf = CAST(unsigned char *, malloc(mlen))) == NULL) { -- file_oomem(ms, mlen); -- goto done; -- } -- if ((utf8_end = encode_utf8(utf8_buf, mlen, ubuf, ulen)) -- == NULL) -- goto done; -- buffer_init(&bb, b->fd, utf8_buf, -- CAST(size_t, utf8_end - utf8_buf)); -- -- if ((rv = file_softmagic(ms, &bb, NULL, NULL, -- TEXTTEST, text)) == 0) -- rv = -1; -- buffer_fini(&bb); -- if ((ms->flags & (MAGIC_APPLE|MAGIC_EXTENSION))) { -- rv = rv == -1 ? 0 : 1; -- goto done; -- } -+ struct buffer bb; -+ const unsigned char *buf = CAST(const unsigned char *, b->fbuf); -+ size_t nbytes = b->flen; -+ unsigned char *utf8_buf = NULL, *utf8_end; -+ size_t mlen, i; -+ int rv = -1; -+ int mime = ms->flags & MAGIC_MIME; -+ -+ const char *subtype = NULL; -+ const char *subtype_mime = NULL; -+ -+ int has_escapes = 0; -+ int has_backspace = 0; -+ int seen_cr = 0; -+ -+ int n_crlf = 0; -+ int n_lf = 0; -+ int n_cr = 0; -+ int n_nel = 0; -+ int executable = 0; -+ -+ size_t last_line_end = CAST(size_t, -1); -+ int has_long_lines = 0; -+ -+ //fprintf(stdout,"01 trim_nuls\n"); -+ nbytes = trim_nuls(buf, nbytes); -+ -+ /* If we have fewer than 2 bytes, give up. */ -+ if (nbytes <= 1) { -+ rv = 0; -+ goto done; -+ } -+ -+ if (ulen > 0 && (ms->flags & MAGIC_NO_CHECK_SOFT) == 0) { -+ /* Convert ubuf to UTF-8 and try text soft magic */ -+ /* malloc size is a conservative overestimate; could be -+ improved, or at least realloced after conversion. */ -+ mlen = ulen * 6; -+ if ((utf8_buf = CAST(unsigned char *, malloc(mlen))) == NULL) { -+ file_oomem(ms, mlen); -+ goto done; -+ } -+ //fprintf(stdout,"02 encode_utf8\n"); -+ if ((utf8_end = encode_utf8(utf8_buf, mlen, ubuf, ulen)) -+ == NULL) -+ goto done; -+ buffer_init(&bb, b->fd, utf8_buf, -+ CAST(size_t, utf8_end - utf8_buf)); -+ -+ //fprintf(stdout,"03 file_softmagic\n"); -+ if ((rv = file_softmagic(ms, &bb, NULL, NULL, -+ TEXTTEST, text)) == 0) -+ rv = -1; -+ //fprintf(stdout,"03.1 file_softmagic done\n"); -+ buffer_fini(&bb); -+ if ((ms->flags & (MAGIC_APPLE|MAGIC_EXTENSION))) { -+ rv = rv == -1 ? 0 : 1; -+ goto done; -+ } -+ } -+ if ((ms->flags & (MAGIC_APPLE|MAGIC_EXTENSION))) -+ return 0; -+ -+ //fprintf(stdout,"04 other details\n"); -+ /* Now try to discover other details about the file. */ -+ for (i = 0; i < ulen; i++) { -+ if (ubuf[i] == '\n') { -+ if (seen_cr) -+ n_crlf++; -+ else -+ n_lf++; -+ last_line_end = i; -+ } else if (seen_cr) -+ n_cr++; -+ -+ seen_cr = (ubuf[i] == '\r'); -+ if (seen_cr) -+ last_line_end = i; -+ -+ if (ubuf[i] == 0x85) { /* X3.64/ECMA-43 "next line" character */ -+ n_nel++; -+ last_line_end = i; -+ } -+ -+ /* If this line is _longer_ than MAXLINELEN, remember it. */ -+ if (i > last_line_end + MAXLINELEN) -+ has_long_lines = 1; -+ -+ if (ubuf[i] == '\033') -+ has_escapes = 1; -+ if (ubuf[i] == '\b') -+ has_backspace = 1; -+ } -+ -+ /* Beware, if the data has been truncated, the final CR could have -+ been followed by a LF. If we have ms->bytes_max bytes, it indicates -+ that the data might have been truncated, probably even before -+ this function was called. */ -+ if (seen_cr && nbytes < ms->bytes_max) -+ n_cr++; -+ -+ if (strcmp(type, "binary") == 0) { -+ rv = 0; -+ goto done; -+ } -+ if (mime) { -+ if (!file_printedlen(ms) && (mime & MAGIC_MIME_TYPE) != 0) { -+ if (subtype_mime) { -+ if (file_printf(ms, "%s", subtype_mime) == -1) -+ goto done; -+ } else { -+ if (file_printf(ms, "text/plain") == -1) -+ goto done; -+ } -+ } -+ } else { -+ if (file_printedlen(ms)) { -+ switch (file_replace(ms, " text$", ", ")) { -+ case 0: -+ switch (file_replace(ms, " text executable$", -+ ", ")) { -+ case 0: -+ if (file_printf(ms, ", ") == -1) -+ goto done; -+ break; -+ case -1: -+ goto done; -+ default: -+ executable = 1; -+ break; - } -- if ((ms->flags & (MAGIC_APPLE|MAGIC_EXTENSION))) -- return 0; -- -- /* Now try to discover other details about the file. */ -- for (i = 0; i < ulen; i++) { -- if (ubuf[i] == '\n') { -- if (seen_cr) -- n_crlf++; -- else -- n_lf++; -- last_line_end = i; -- } else if (seen_cr) -- n_cr++; -- -- seen_cr = (ubuf[i] == '\r'); -- if (seen_cr) -- last_line_end = i; -- -- if (ubuf[i] == 0x85) { /* X3.64/ECMA-43 "next line" character */ -- n_nel++; -- last_line_end = i; -- } -- -- /* If this line is _longer_ than MAXLINELEN, remember it. */ -- if (i > last_line_end + MAXLINELEN) -- has_long_lines = 1; -- -- if (ubuf[i] == '\033') -- has_escapes = 1; -- if (ubuf[i] == '\b') -- has_backspace = 1; -+ break; -+ case -1: -+ goto done; -+ default: -+ break; -+ } -+ } -+ -+ if (file_printf(ms, "%s", code) == -1) -+ goto done; -+ -+ if (subtype) { -+ if (file_printf(ms, " %s", subtype) == -1) -+ goto done; -+ } -+ -+ if (file_printf(ms, " %s", type) == -1) -+ goto done; -+ -+ if (executable) -+ if (file_printf(ms, " executable") == -1) -+ goto done; -+ -+ if (has_long_lines) -+ if (file_printf(ms, ", with very long lines") == -1) -+ goto done; -+ -+ /* -+ * Only report line terminators if we find one other than LF, -+ * or if we find none at all. -+ */ -+ if ((n_crlf == 0 && n_cr == 0 && n_nel == 0 && n_lf == 0) || -+ (n_crlf != 0 || n_cr != 0 || n_nel != 0)) { -+ if (file_printf(ms, ", with") == -1) -+ goto done; -+ -+ if (n_crlf == 0 && n_cr == 0 && n_nel == 0 && n_lf == 0) { -+ if (file_printf(ms, " no") == -1) -+ goto done; -+ } else { -+ if (n_crlf) { -+ if (file_printf(ms, " CRLF") == -1) -+ goto done; -+ if (n_cr || n_lf || n_nel) -+ if (file_printf(ms, ",") == -1) -+ goto done; - } -- -- /* Beware, if the data has been truncated, the final CR could have -- been followed by a LF. If we have ms->bytes_max bytes, it indicates -- that the data might have been truncated, probably even before -- this function was called. */ -- if (seen_cr && nbytes < ms->bytes_max) -- n_cr++; -- -- if (strcmp(type, "binary") == 0) { -- rv = 0; -- goto done; -+ if (n_cr) { -+ if (file_printf(ms, " CR") == -1) -+ goto done; -+ if (n_lf || n_nel) -+ if (file_printf(ms, ",") == -1) -+ goto done; - } -- if (mime) { -- if (!file_printedlen(ms) && (mime & MAGIC_MIME_TYPE) != 0) { -- if (subtype_mime) { -- if (file_printf(ms, "%s", subtype_mime) == -1) -- goto done; -- } else { -- if (file_printf(ms, "text/plain") == -1) -- goto done; -- } -- } -- } else { -- if (file_printedlen(ms)) { -- switch (file_replace(ms, " text$", ", ")) { -- case 0: -- switch (file_replace(ms, " text executable$", -- ", ")) { -- case 0: -- if (file_printf(ms, ", ") == -1) -- goto done; -- break; -- case -1: -- goto done; -- default: -- executable = 1; -- break; -- } -- break; -- case -1: -- goto done; -- default: -- break; -- } -- } -- -- if (file_printf(ms, "%s", code) == -1) -- goto done; -- -- if (subtype) { -- if (file_printf(ms, " %s", subtype) == -1) -- goto done; -- } -- -- if (file_printf(ms, " %s", type) == -1) -- goto done; -- -- if (executable) -- if (file_printf(ms, " executable") == -1) -- goto done; -- -- if (has_long_lines) -- if (file_printf(ms, ", with very long lines") == -1) -- goto done; -- -- /* -- * Only report line terminators if we find one other than LF, -- * or if we find none at all. -- */ -- if ((n_crlf == 0 && n_cr == 0 && n_nel == 0 && n_lf == 0) || -- (n_crlf != 0 || n_cr != 0 || n_nel != 0)) { -- if (file_printf(ms, ", with") == -1) -- goto done; -- -- if (n_crlf == 0 && n_cr == 0 && n_nel == 0 && n_lf == 0) { -- if (file_printf(ms, " no") == -1) -- goto done; -- } else { -- if (n_crlf) { -- if (file_printf(ms, " CRLF") == -1) -- goto done; -- if (n_cr || n_lf || n_nel) -- if (file_printf(ms, ",") == -1) -- goto done; -- } -- if (n_cr) { -- if (file_printf(ms, " CR") == -1) -- goto done; -- if (n_lf || n_nel) -- if (file_printf(ms, ",") == -1) -- goto done; -- } -- if (n_lf) { -- if (file_printf(ms, " LF") == -1) -- goto done; -- if (n_nel) -- if (file_printf(ms, ",") == -1) -- goto done; -- } -- if (n_nel) -- if (file_printf(ms, " NEL") == -1) -- goto done; -- } -- -- if (file_printf(ms, " line terminators") == -1) -- goto done; -- } -- -- if (has_escapes) -- if (file_printf(ms, ", with escape sequences") == -1) -- goto done; -- if (has_backspace) -- if (file_printf(ms, ", with overstriking") == -1) -- goto done; -+ if (n_lf) { -+ if (file_printf(ms, " LF") == -1) -+ goto done; -+ if (n_nel) -+ if (file_printf(ms, ",") == -1) -+ goto done; - } -- rv = 1; --done: -- free(utf8_buf); -+ if (n_nel) -+ if (file_printf(ms, " NEL") == -1) -+ goto done; -+ } -+ -+ if (file_printf(ms, " line terminators") == -1) -+ goto done; -+ } -+ -+ if (has_escapes) -+ if (file_printf(ms, ", with escape sequences") == -1) -+ goto done; -+ if (has_backspace) -+ if (file_printf(ms, ", with overstriking") == -1) -+ goto done; -+ } -+ rv = 1; -+ done: -+ free(utf8_buf); - -- return rv; -+ return rv; - } - - /* -diff -r -u file-5.36/src/encoding.c file-5.36-patched/src/encoding.c ---- file-5.36/src/encoding.c 2019-02-20 02:35:27.000000000 +0000 -+++ file-5.36-patched/src/encoding.c 2019-12-29 01:05:22.164395000 +0000 -@@ -257,15 +257,21 @@ - - *ulen = 0; - -+ //fprintf(stdout,"Doing %lu bytes\n", nbytes); -+ - for (i = 0; i < nbytes; i++) { - int t = text_chars[buf[i]]; - - if (t != T) - return 0; - -- ubuf[(*ulen)++] = buf[i]; -+ // ubuf[(*ulen)++] = buf[i]; -+ ubuf[(*ulen)] = buf[i]; -+ (*ulen)++; - } - -+ //fprintf(stdout,"Done %lu bytes\n", nbytes); -+ - return 1; - } - -diff -r -u file-5.36/src/softmagic.c file-5.36-patched/src/softmagic.c ---- file-5.36/src/softmagic.c 2019-02-20 02:35:27.000000000 +0000 -+++ file-5.36-patched/src/softmagic.c 2019-12-29 01:30:20.086619400 +0000 -@@ -117,26 +117,33 @@ - file_softmagic(struct magic_set *ms, const struct buffer *b, - uint16_t *indir_count, uint16_t *name_count, int mode, int text) - { -- struct mlist *ml; -- int rv, printed_something = 0, need_separator = 0; -- uint16_t nc, ic; -- -- if (name_count == NULL) { -- nc = 0; -- name_count = &nc; -+ struct mlist *ml; -+ int rv, printed_something = 0, need_separator = 0; -+ uint16_t nc, ic; -+ -+ if (name_count == NULL) { -+ nc = 0; -+ name_count = &nc; -+ } -+ if (indir_count == NULL) { -+ ic = 0; -+ indir_count = ⁣ -+ } -+ -+ int iter=0; -+ for (ml = ms->mlist[0]->next; ml != ms->mlist[0]; ml = ml->next) -+ { -+ //fprintf(stdout,"fsm on iter %d\n",iter); -+ if ((rv = match(ms, ml->magic, ml->nmagic, b, 0, mode, -+ text, 0, indir_count, name_count, -+ &printed_something, &need_separator, NULL, NULL)) != 0) -+ { -+ return rv; - } -- if (indir_count == NULL) { -- ic = 0; -- indir_count = ⁣ -- } -- -- for (ml = ms->mlist[0]->next; ml != ms->mlist[0]; ml = ml->next) -- if ((rv = match(ms, ml->magic, ml->nmagic, b, 0, mode, -- text, 0, indir_count, name_count, -- &printed_something, &need_separator, NULL, NULL)) != 0) -- return rv; -+ iter++; -+ } - -- return 0; -+ return 0; - } - - #define FILE_FMTDEBUG -@@ -192,263 +199,270 @@ - int *printed_something, int *need_separator, int *returnval, - int *found_match) - { -- uint32_t magindex = 0; -- unsigned int cont_level = 0; -- int found_matchv = 0; /* if a match is found it is set to 1*/ -- int returnvalv = 0, e; -- int firstline = 1; /* a flag to print X\n X\n- X */ -- struct buffer bb; -- int print = (ms->flags & MAGIC_NODESC) == 0; -+ uint32_t magindex = 0; -+ unsigned int cont_level = 0; -+ int found_matchv = 0; /* if a match is found it is set to 1*/ -+ int returnvalv = 0, e; -+ int firstline = 1; /* a flag to print X\n X\n- X */ -+ struct buffer bb; -+ int print = (ms->flags & MAGIC_NODESC) == 0; -+ -+ /* -+ * returnval can be 0 if a match is found, but there was no -+ * annotation to be printed. -+ */ -+ if (returnval == NULL) -+ returnval = &returnvalv; -+ if (found_match == NULL) -+ found_match = &found_matchv; -+ -+ if (file_check_mem(ms, cont_level) == -1) -+ return -1; -+ -+ for (magindex = 0; magindex < nmagic; magindex++) { -+ // Slow matchers on irix -+ if( magindex == 9743 || magindex == 9745 || magindex == 12181 || magindex == 12356 ) -+ { -+ continue; -+ } -+ int flush = 0; -+ struct magic *m = &magic[magindex]; -+ //fprintf(stdout,"Checking match %d type %s-%s\n", -+ // magindex, m->desc, m->mimetype); -+ -+ if (m->type != FILE_NAME) -+ if ((IS_STRING(m->type) && -+#define FLT (STRING_BINTEST | STRING_TEXTTEST) -+ ((text && (m->str_flags & FLT) == STRING_BINTEST) || -+ (!text && (m->str_flags & FLT) == STRING_TEXTTEST))) || -+ (m->flag & mode) != mode) { -+ flush: -+ /* Skip sub-tests */ -+ while (magindex < nmagic - 1 && -+ magic[magindex + 1].cont_level != 0) -+ magindex++; -+ cont_level = 0; -+ continue; /* Skip to next top-level test*/ -+ } -+ -+ if (msetoffset(ms, m, &bb, b, offset, cont_level) == -1) -+ goto flush; -+ ms->line = m->lineno; -+ -+ /* if main entry matches, print it... */ -+ switch (mget(ms, m, b, CAST(const unsigned char *, bb.fbuf), -+ bb.flen, offset, cont_level, -+ mode, text, flip, indir_count, name_count, -+ printed_something, need_separator, returnval, found_match)) -+ { -+ case -1: -+ return -1; -+ case 0: -+ flush = m->reln != '!'; -+ break; -+ default: -+ if (m->type == FILE_INDIRECT) { -+ *found_match = 1; -+ *returnval = 1; -+ } - -+ switch (magiccheck(ms, m)) { -+ case -1: -+ return -1; -+ case 0: -+ flush++; -+ break; -+ default: -+ flush = 0; -+ break; -+ } -+ break; -+ } -+ if (flush) { -+ /* -+ * main entry didn't match, -+ * flush its continuations -+ */ -+ goto flush; -+ } -+ -+ if (*m->desc) -+ *found_match = 1; -+ -+ if ((e = handle_annotation(ms, m, firstline)) != 0) -+ { -+ *need_separator = 1; -+ *printed_something = 1; -+ *returnval = 1; -+ return e; -+ } -+ -+ /* -+ * If we are going to print something, we'll need to print -+ * a blank before we print something else. -+ */ -+ if (print && *m->desc) { -+ *need_separator = 1; -+ *printed_something = 1; -+ *returnval = 1; -+ if (print_sep(ms, firstline) == -1) -+ return -1; -+ if (mprint(ms, m) == -1) -+ return -1; -+ } -+ -+ switch (moffset(ms, m, &bb, &ms->c.li[cont_level].off)) { -+ case -1: -+ case 0: -+ goto flush; -+ default: -+ break; -+ } -+ -+ /* and any continuations that match */ -+ if (file_check_mem(ms, ++cont_level) == -1) -+ return -1; -+ -+ while (magindex + 1 < nmagic && -+ magic[magindex + 1].cont_level != 0) { -+ m = &magic[++magindex]; -+ ms->line = m->lineno; /* for messages */ -+ -+ if (cont_level < m->cont_level) -+ continue; -+ if (cont_level > m->cont_level) { - /* -- * returnval can be 0 if a match is found, but there was no -- * annotation to be printed. -+ * We're at the end of the level -+ * "cont_level" continuations. - */ -- if (returnval == NULL) -- returnval = &returnvalv; -- if (found_match == NULL) -- found_match = &found_matchv; -- -- if (file_check_mem(ms, cont_level) == -1) -- return -1; -- -- for (magindex = 0; magindex < nmagic; magindex++) { -- int flush = 0; -- struct magic *m = &magic[magindex]; -- -- if (m->type != FILE_NAME) -- if ((IS_STRING(m->type) && --#define FLT (STRING_BINTEST | STRING_TEXTTEST) -- ((text && (m->str_flags & FLT) == STRING_BINTEST) || -- (!text && (m->str_flags & FLT) == STRING_TEXTTEST))) || -- (m->flag & mode) != mode) { --flush: -- /* Skip sub-tests */ -- while (magindex < nmagic - 1 && -- magic[magindex + 1].cont_level != 0) -- magindex++; -- cont_level = 0; -- continue; /* Skip to next top-level test*/ -- } -- -- if (msetoffset(ms, m, &bb, b, offset, cont_level) == -1) -- goto flush; -- ms->line = m->lineno; -- -- /* if main entry matches, print it... */ -- switch (mget(ms, m, b, CAST(const unsigned char *, bb.fbuf), -- bb.flen, offset, cont_level, -- mode, text, flip, indir_count, name_count, -- printed_something, need_separator, returnval, found_match)) -- { -- case -1: -- return -1; -- case 0: -- flush = m->reln != '!'; -- break; -- default: -- if (m->type == FILE_INDIRECT) { -- *found_match = 1; -- *returnval = 1; -- } -- -- switch (magiccheck(ms, m)) { -- case -1: -- return -1; -- case 0: -- flush++; -- break; -- default: -- flush = 0; -- break; -- } -- break; -- } -- if (flush) { -- /* -- * main entry didn't match, -- * flush its continuations -- */ -- goto flush; -- } -- -- if (*m->desc) -- *found_match = 1; -- -- if ((e = handle_annotation(ms, m, firstline)) != 0) -- { -- *need_separator = 1; -- *printed_something = 1; -- *returnval = 1; -- return e; -- } -- -- /* -- * If we are going to print something, we'll need to print -- * a blank before we print something else. -- */ -- if (print && *m->desc) { -- *need_separator = 1; -- *printed_something = 1; -- *returnval = 1; -- if (print_sep(ms, firstline) == -1) -- return -1; -- if (mprint(ms, m) == -1) -- return -1; -- } -- -- switch (moffset(ms, m, &bb, &ms->c.li[cont_level].off)) { -- case -1: -- case 0: -- goto flush; -- default: -- break; -- } -- -- /* and any continuations that match */ -- if (file_check_mem(ms, ++cont_level) == -1) -- return -1; -- -- while (magindex + 1 < nmagic && -- magic[magindex + 1].cont_level != 0) { -- m = &magic[++magindex]; -- ms->line = m->lineno; /* for messages */ -- -- if (cont_level < m->cont_level) -- continue; -- if (cont_level > m->cont_level) { -- /* -- * We're at the end of the level -- * "cont_level" continuations. -- */ -- cont_level = m->cont_level; -- } -- if (msetoffset(ms, m, &bb, b, offset, cont_level) == -1) -- goto flush; -- if (m->flag & OFFADD) { -- ms->offset += -- ms->c.li[cont_level - 1].off; -- } -+ cont_level = m->cont_level; -+ } -+ if (msetoffset(ms, m, &bb, b, offset, cont_level) == -1) -+ goto flush; -+ if (m->flag & OFFADD) { -+ ms->offset += -+ ms->c.li[cont_level - 1].off; -+ } - - #ifdef ENABLE_CONDITIONALS -- if (m->cond == COND_ELSE || -- m->cond == COND_ELIF) { -- if (ms->c.li[cont_level].last_match == 1) -- continue; -- } -+ if (m->cond == COND_ELSE || -+ m->cond == COND_ELIF) { -+ if (ms->c.li[cont_level].last_match == 1) -+ continue; -+ } - #endif -- switch (mget(ms, m, b, CAST(const unsigned char *, -- bb.fbuf), bb.flen, offset, -- cont_level, mode, text, flip, indir_count, -- name_count, printed_something, need_separator, -- returnval, found_match)) { -- case -1: -- return -1; -- case 0: -- if (m->reln != '!') -- continue; -- flush = 1; -- break; -- default: -- if (m->type == FILE_INDIRECT) { -- *found_match = 1; -- *returnval = 1; -- } -- flush = 0; -- break; -- } -- -- switch (flush ? 1 : magiccheck(ms, m)) { -- case -1: -- return -1; -- case 0: -+ switch (mget(ms, m, b, CAST(const unsigned char *, -+ bb.fbuf), bb.flen, offset, -+ cont_level, mode, text, flip, indir_count, -+ name_count, printed_something, need_separator, -+ returnval, found_match)) { -+ case -1: -+ return -1; -+ case 0: -+ if (m->reln != '!') -+ continue; -+ flush = 1; -+ break; -+ default: -+ if (m->type == FILE_INDIRECT) { -+ *found_match = 1; -+ *returnval = 1; -+ } -+ flush = 0; -+ break; -+ } -+ -+ switch (flush ? 1 : magiccheck(ms, m)) { -+ case -1: -+ return -1; -+ case 0: - #ifdef ENABLE_CONDITIONALS -- ms->c.li[cont_level].last_match = 0; -+ ms->c.li[cont_level].last_match = 0; - #endif -- break; -- default: -+ break; -+ default: - #ifdef ENABLE_CONDITIONALS -- ms->c.li[cont_level].last_match = 1; -+ ms->c.li[cont_level].last_match = 1; - #endif -- if (m->type == FILE_CLEAR) -- ms->c.li[cont_level].got_match = 0; -- else if (ms->c.li[cont_level].got_match) { -- if (m->type == FILE_DEFAULT) -- break; -- } else -- ms->c.li[cont_level].got_match = 1; -- -- if (*m->desc) -- *found_match = 1; -- -- if ((e = handle_annotation(ms, m, firstline)) -- != 0) { -- *need_separator = 1; -- *printed_something = 1; -- *returnval = 1; -- return e; -- } -- if (print && *m->desc) { -- /* -- * This continuation matched. Print -- * its message, with a blank before it -- * if the previous item printed and -- * this item isn't empty. -- */ -- /* -- * If we are going to print something, -- * make sure that we have a separator -- * first. -- */ -- if (!*printed_something) { -- *printed_something = 1; -- if (print_sep(ms, firstline) -- == -1) -- return -1; -- } -- /* space if previous printed */ -- if (*need_separator -- && (m->flag & NOSPACE) == 0) { -- if (file_printf(ms, " ") == -1) -- return -1; -- } -- *returnval = 1; -- *need_separator = 0; -- if (mprint(ms, m) == -1) -- return -1; -- *need_separator = 1; -- } -- -- switch (moffset(ms, m, &bb, -- &ms->c.li[cont_level].off)) { -- case -1: -- case 0: -- flush = 1; -- cont_level--; -- break; -- default: -- break; -- } -- -- /* -- * If we see any continuations -- * at a higher level, -- * process them. -- */ -- if (file_check_mem(ms, ++cont_level) == -1) -- return -1; -- break; -- } -- } -- if (*printed_something) { -- firstline = 0; -- } -- if ((ms->flags & MAGIC_CONTINUE) == 0 && *found_match) { -- return *returnval; /* don't keep searching */ -- } -- cont_level = 0; -+ if (m->type == FILE_CLEAR) -+ ms->c.li[cont_level].got_match = 0; -+ else if (ms->c.li[cont_level].got_match) { -+ if (m->type == FILE_DEFAULT) -+ break; -+ } else -+ ms->c.li[cont_level].got_match = 1; -+ -+ if (*m->desc) -+ *found_match = 1; -+ -+ if ((e = handle_annotation(ms, m, firstline)) -+ != 0) { -+ *need_separator = 1; -+ *printed_something = 1; -+ *returnval = 1; -+ return e; -+ } -+ if (print && *m->desc) { -+ /* -+ * This continuation matched. Print -+ * its message, with a blank before it -+ * if the previous item printed and -+ * this item isn't empty. -+ */ -+ /* -+ * If we are going to print something, -+ * make sure that we have a separator -+ * first. -+ */ -+ if (!*printed_something) { -+ *printed_something = 1; -+ if (print_sep(ms, firstline) -+ == -1) -+ return -1; -+ } -+ /* space if previous printed */ -+ if (*need_separator -+ && (m->flag & NOSPACE) == 0) { -+ if (file_printf(ms, " ") == -1) -+ return -1; -+ } -+ *returnval = 1; -+ *need_separator = 0; -+ if (mprint(ms, m) == -1) -+ return -1; -+ *need_separator = 1; -+ } -+ -+ switch (moffset(ms, m, &bb, -+ &ms->c.li[cont_level].off)) { -+ case -1: -+ case 0: -+ flush = 1; -+ cont_level--; -+ break; -+ default: -+ break; - } -- return *returnval; /* This is hit if -k is set or there is no match */ -+ -+ /* -+ * If we see any continuations -+ * at a higher level, -+ * process them. -+ */ -+ if (file_check_mem(ms, ++cont_level) == -1) -+ return -1; -+ break; -+ } -+ } -+ if (*printed_something) { -+ firstline = 0; -+ } -+ if ((ms->flags & MAGIC_CONTINUE) == 0 && *found_match) { -+ return *returnval; /* don't keep searching */ -+ } -+ cont_level = 0; -+ } -+ return *returnval; /* This is hit if -k is set or there is no match */ - } - - private int -Only in file-5.36-patched: stamp-h1 -Only in file-5.36-patched/tests: .deps -Only in file-5.36-patched/tests: Makefile diff --git a/packages/file/SPECS/file.spec b/packages/file/SPECS/file.spec index 8612d61fd..631f4b242 100644 --- a/packages/file/SPECS/file.spec +++ b/packages/file/SPECS/file.spec @@ -10,7 +10,7 @@ Summary: A utility for determining file types Name: file Version: 5.36 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz @@ -24,13 +24,12 @@ Patch2: file-5.04-volume_key.patch # fix double free on read error (#1685217) Patch14: file-5.37-double-free.patch -# Disable slow matchers on irix -Patch100: file.sgislowmatchersfix.patch - URL: http://www.darwinsys.com/file/ Requires: file-libs = %{version}-%{release} +Requires: libdicl >= 0.1.20 BuildRequires: zlib-devel BuildRequires: autoconf automake libtool +BuildRequires: libdicl-devel >= 0.1.20 %description The file command is used to identify a particular file according to the @@ -92,9 +91,6 @@ file(1) command. %endif %prep -export SHELL=%{_bindir}/bash -export CONFIG_SHELL="$SHELL" -export SHELL_PATH="$SHELL" %autosetup -p1 @@ -107,17 +103,19 @@ rm -rf %{py3dir} cp -a python %{py3dir} %endif +#exit 1 + %build # Fix config.guess to find aarch64 - #925339 autoreconf -fi -export SHELL=%{_bindir}/bash -export CONFIG_SHELL="$SHELL" -export SHELL_PATH="$SHELL" -export CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" +#export CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" +export CPPFLAGS="%{optflags} -D_SGI_SOURCE -D_SGI_REENTRANT_FUNCTIONS -I%{_includedir}/libdicl-0.1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" +export LDFLAGS="-ldicl-0.1 $RPM_LD_FLAGS" export gl_cv_cc_visibility=no -%configure --enable-fsect-man5 --enable-static + +%configure --enable-fsect-man5 --enable-static --disable-libseccomp # remove hardcoded library paths from local libtool #sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool #sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool @@ -133,9 +131,6 @@ CFLAGS="%{optflags}" %{__python3} setup.py build %endif %install -export SHELL=%{_bindir}/bash -export CONFIG_SHELL="$SHELL" -export SHELL_PATH="$SHELL" export CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" mkdir -p ${RPM_BUILD_ROOT}%{_bindir} @@ -217,6 +212,9 @@ cd %{py3dir} %endif %changelog +* Fri Apr 10 2020 Daniel Hams - 5.36-4 +- Remove hard coded shell paths, use libdicl for regexp fixes + * Thu Jul 25 2019 Fedora Release Engineering - 5.37-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/packages/flac/SPECS/flac.spec b/packages/flac/SPECS/flac.spec index f2ff6ff0b..a9eb55a13 100644 --- a/packages/flac/SPECS/flac.spec +++ b/packages/flac/SPECS/flac.spec @@ -11,7 +11,7 @@ Summary: An encoder/decoder for the Free Lossless Audio Codec Name: flac Version: 1.3.2 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD and GPLv2+ and GFDL Source0: https://downloads.xiph.org/releases/flac/flac-%{version}.tar.xz Patch0: flac.sgifixes.patch @@ -79,9 +79,6 @@ This is the input plugin for XMMS to be able to read FLAC files. %patch0 -p1 -b .sgifixes %build -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" # use our libtool to avoid problems with RPATH %{_bindir}/sh ./autogen.sh -V @@ -153,6 +150,9 @@ make check %endif %changelog +* Fri Apr 10 2020 Daniel Hams - 1.3.2-2 +- Remove hard coded shell paths + * Tue Aug 06 2019 Miroslav Lichvar 1.3.3-1 - update to 1.3.3 - include soname in file list diff --git a/packages/fltk/SPECS/fltk.spec b/packages/fltk/SPECS/fltk.spec index f1d0378aa..af3ad0650 100644 --- a/packages/fltk/SPECS/fltk.spec +++ b/packages/fltk/SPECS/fltk.spec @@ -9,7 +9,7 @@ Summary: C++ user interface toolkit Name: fltk Version: 1.3.5 -Release: 2%{?dist} +Release: 3%{?dist} # see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details License: LGPLv2+ with exceptions @@ -82,9 +82,6 @@ Requires: %{name}-devel %prep -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" %if 0%{?snap:1} %autosetup -p1 -n fltk-1.3.x-%{snap} %else @@ -97,9 +94,6 @@ autoconf %build -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" export CFLAGS="-pthread" export CXXFLAGS="-pthread" #export LDFLAGS="-lpthread -lc -lm $RPM_LD_FLAGS" @@ -132,9 +126,6 @@ make %install -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" %make_install #make install-linux -C fluid DESTDIR=$RPM_BUILD_ROOT @@ -198,6 +189,9 @@ rm -rv $RPM_BUILD_ROOT%{_mandir}/cat* %changelog +* Fri Apr 10 2020 Daniel Hams - 1.3.5-3 +- Remove hard coded shell paths + * Thu Jul 25 2019 Fedora Release Engineering - 1.3.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/packages/freetype/SPECS/freetype.spec b/packages/freetype/SPECS/freetype.spec index 0211c11b6..3f009ec47 100644 --- a/packages/freetype/SPECS/freetype.spec +++ b/packages/freetype/SPECS/freetype.spec @@ -6,7 +6,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.10.0 -Release: 3%{?dist} +Release: 4%{?dist} License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement URL: http://www.freetype.org Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.tar.bz2 @@ -83,9 +83,9 @@ FreeType. %patch0 -p1 -b .enable-spr %patch1 -p1 -b .enable-valid -pushd ft2demos-%{version} +cd ft2demos-%{version} %patch2 -p1 -b .more-demos -popd +cd .. %patch3 -p1 -b .libtool #%patch4 -p1 -b .multilib @@ -97,9 +97,6 @@ popd %patch101 -p1 -b .sgidemosfixes %build -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" export CPPFLAGS="-D_SGI_SOURCE -D_SGI_REENTRANT_FUNCTIONS" %configure --disable-static \ --with-zlib=yes \ @@ -113,13 +110,13 @@ make %{?_smp_mflags} %if %{with_xfree86} # Build demos -pushd ft2demos-%{version} +cd ft2demos-%{version} make TOP_DIR=".." %{?_smp_mflags} -popd +cd .. %endif # Convert FTL.txt and example3.cpp to UTF-8 -pushd docs +cd docs iconv -f latin1 -t utf-8 < FTL.TXT > FTL.TXT.tmp && \ touch -r FTL.TXT FTL.TXT.tmp && \ mv FTL.TXT.tmp FTL.TXT @@ -127,7 +124,7 @@ mv FTL.TXT.tmp FTL.TXT iconv -f iso-8859-1 -t utf-8 < "tutorial/example3.cpp" > "tutorial/example3.cpp.utf8" touch -r tutorial/example3.cpp tutorial/example3.cpp.utf8 && \ mv tutorial/example3.cpp.utf8 tutorial/example3.cpp -popd +cd .. %install @@ -210,6 +207,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{_mandir}/man1/* %changelog +* Fri Apr 10 2020 Daniel Hams - 2.10.0.4 +- Remove hard coded shell paths/bashisms + * Thu Jul 25 2019 Fedora Release Engineering - 2.10.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/packages/gcc/SOURCES/gcc.sgifixes.patch b/packages/gcc/SOURCES/gcc.sgifixes.patch index df7118c37..3a36a0327 100644 --- a/packages/gcc/SOURCES/gcc.sgifixes.patch +++ b/packages/gcc/SOURCES/gcc.sgifixes.patch @@ -1733,8 +1733,8 @@ diff -N -r -u -w gcc-9.2.0/gcc/config/mips/iris6.h gcc-9.2.0-patched/gcc/config/ + MARCH_MTUNE_NATIVE_SPECS + +/* IRIX 6.5 has the float and long double forms of math functions. */ -+/* #define TARGET_C99_FUNCTIONS 1 */ -+ ++#undef TARGET_LIBC_HAS_FUNCTION ++#define TARGET_LIBC_HAS_FUNCTION default_libc_has_function +/* MIPS specific debugging info */ +/* #define MIPS_DEBUGGING_INFO 1 */ +#define SGUG_DEBUGGING_INFO 1 @@ -1914,10 +1914,10 @@ diff -N -r -u -w gcc-9.2.0/gcc/config/mips/iris6.h gcc-9.2.0-patched/gcc/config/ + +extern void irix6_c_common_override_options (void); +#define C_COMMON_OVERRIDE_OPTIONS irix6_c_common_override_options() -+ ++/* +#undef SUBTARGET_CC1_SPEC +#define SUBTARGET_CC1_SPEC "%{static: -mno-abicalls}" -+ ++*/ +#undef SUBTARGET_CPP_SPEC +#define SUBTARGET_CPP_SPEC "%{pthread:-D_REENTRANT}" + diff --git a/packages/gcc/SPECS/gcc.spec b/packages/gcc/SPECS/gcc.spec index d90e59964..eb1d3264f 100644 --- a/packages/gcc/SPECS/gcc.spec +++ b/packages/gcc/SPECS/gcc.spec @@ -7,7 +7,7 @@ %global gcc_major 9 # Note, gcc_release must be integer, if you want to add suffixes to # %%{release}, append them after %%{gcc_release} on Release: line. -%global gcc_release 1 +%global gcc_release 3 %global nvptx_tools_gitrev c28050f60193b3b95a18866a96f03334e874e78f %global nvptx_newlib_gitrev aadc8eb0ec43b7cd0dd2dfb484bae63c8b05ef24 %global _unpackaged_files_terminate_build 0 @@ -761,11 +761,6 @@ macros. #to NVidia PTX capable devices if available. %prep -export SHELL=%{_bindir}/bash -export CONFIG_SHELL="$SHELL" -export SHELL_PATH="$SHELL" -export PERL_PATH=%{_bindir}/perl -export PERL=%{_bindir}/perl #setup -q -n gcc-%{version}-%{DATE} -a 1 -a 2 %setup -q -n gcc-%{version}-%{DATE} @@ -798,7 +793,7 @@ export PERL=%{_bindir}/perl %patch2002 -p1 -b .sgifixlibstdcpp01 %patch2003 -p1 -b .sgifixlibstdcpp02 -echo 'sgugver-0.1.9-mips3-ng' > gcc/DEV-PHASE +echo 'sgugver-0.2.0-mips3-ng' > gcc/DEV-PHASE cp -a libstdc++-v3/config/cpu/i{4,3}86/atomicity.h @@ -829,11 +824,6 @@ fi rm -f gcc/testsuite/go.test/test/chan/goroutines.go %build -export SHELL=%{_bindir}/bash -export CONFIG_SHELL="$SHELL" -export SHELL_PATH="$SHELL" -export PERL_PATH=%{_bindir}/perl -export PERL=%{_bindir}/perl # Undo the broken autoconf change in recent Fedora versions export CONFIG_SITE=NONE @@ -1156,11 +1146,6 @@ rm -f rpm.doc/changelogs/gcc/ChangeLog.[1-9] find rpm.doc -name \*ChangeLog\* | xargs bzip2 -9 %install -export SHELL=%{_bindir}/bash -export CONFIG_SHELL="$SHELL" -export SHELL_PATH="$SHELL" -export PERL_PATH=%{_bindir}/perl -export PERL=%{_bindir}/perl rm -rf %{buildroot} @@ -1380,12 +1365,13 @@ fi mkdir -p %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib} mv -f %{buildroot}%{_prefix}/%{_lib}/libstdc++*gdb.py* \ %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}/ -#pushd ../libstdc++-v3/python +#OLDPWD=`pwd` +#cd ../libstdc++-v3/python #for i in `find . -name \*.py`; do # touch -r $i %{buildroot}%{_prefix}/share/gcc-%{gcc_major}/python/$i #done #touch -r hook.in %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}/libstdc++*gdb.py -#popd +#cd $OLDPWD #for f in `find %{buildroot}%{_prefix}/share/gcc-%{gcc_major}/python/ \ # %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/%{_lib}/ -name \*.py`; do # r=${f/$RPM_BUILD_ROOT/} @@ -1399,7 +1385,8 @@ mv -f %{buildroot}%{_prefix}/%{_lib}/libstdc++*gdb.py* \ #/usr/bin/install -c -m 644 objlibgccjit/gcc/doc/libgccjit.info %{buildroot}/%{_infodir}/ #gzip -9 %{buildroot}/%{_infodir}/libgccjit.info -pushd $FULLPATH +OLDPWD=`pwd` +cd $FULLPATH if [ "%{_lib}" = "lib" ]; then %if %{build_objc} ln -sf ../../../libobjc.so.4 libobjc.so @@ -1519,7 +1506,8 @@ rm -rf $FULLPATH/32/ada{include,lib} %endif if [ "$FULLPATH" != "$FULLLPATH" ]; then mv -f $FULLPATH/ada{include,lib} $FULLLPATH/ -pushd $FULLLPATH/adalib +OLDPWD=`pwd` +cd $FULLLPATH/adalib if [ "%{_lib}" = "lib" ]; then ln -sf ../../../../../libgnarl-*.so libgnarl.so ln -sf ../../../../../libgnarl-*.so libgnarl-9.so @@ -1531,9 +1519,10 @@ ln -sf ../../../../../../%{_lib}/libgnarl-*.so libgnarl-9.so ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat.so ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat-9.so fi -popd +cd $OLDPWD else -pushd $FULLPATH/adalib +OLDPWD=`pwd` +cd $FULLPATH/adalib if [ "%{_lib}" = "lib" ]; then ln -sf ../../../../libgnarl-*.so libgnarl.so ln -sf ../../../../libgnarl-*.so libgnarl-9.so @@ -1545,7 +1534,7 @@ ln -sf ../../../../../%{_lib}/libgnarl-*.so libgnarl-9.so ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat.so ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat-9.so fi -popd +cd $OLDPWD fi %endif @@ -1827,7 +1816,7 @@ done # Ensure that any static libraries are _not_ stripped # irix needs the symbols from libgcc.a for example that strip would remove chmod 644 `find %{buildroot}%{_prefix} -name lib\*.a` -popd +cd $OLDPWD #chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgfortran.so.5.* chmod 755 %{buildroot}%{_prefix}/%{_lib}/libgomp.so.1.* #chmod 755 %{buildroot}%{_prefix}/%{_lib}/libcc1.so.0.* @@ -3061,6 +3050,9 @@ rm -rf testlogs-%{_target_platform}-%{version}-%{release} %endif %changelog +* Tue Mar 31 2020 Daniel Hams 9.2.0-3 +- Tweak the default spec so that static linking isn''t no-abicalls + * Tue Aug 27 2019 Jakub Jelinek 9.2.1-1 - update from 9 branch - GCC 9.2 release diff --git a/packages/gdb/SPECS/gdb.spec b/packages/gdb/SPECS/gdb.spec index db4995f63..3bd2e003e 100644 --- a/packages/gdb/SPECS/gdb.spec +++ b/packages/gdb/SPECS/gdb.spec @@ -4,7 +4,7 @@ Summary: The GNU Debugger Name: gdb Version: 7.6.2 -Release: 1%{?dist} +Release: 3%{?dist} License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ and GPLv2+ with exceptions and GPL+ and LGPLv2+ and LGPLv3+ and BSD and Public Domain and GFDL URL: http://ftp.gnu.org/gnu/gdb/ Source: http://ftp.gnu.org/gnu/gdb/gdb-%{version}.tar.gz @@ -22,16 +22,10 @@ Requires: zlib, readline, ncurses The gnu debugger. %prep -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" %setup %patch0 -p1 -b .sgifixups %build -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" %{configure} --enable-werror=no --disable-nls --disable-iconv \ --disable-gprof --with-system-zlib --with-system-readline \ --with-curses=ncurses \ @@ -39,20 +33,14 @@ export CONFIG_SHELL="$SHELL" --libdir=%{_libdir} \ --sysconfdir=%{_sysconfdir} \ --mandir=%{_mandir} \ - --infodir=%{_infodir} - + --infodir=%{_infodir} \ + --with-python=no make %{?_smp_mflags} %check -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" make check %install -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} INSTALL='install -p' rm -rf $RPM_BUILD_ROOT%{_libdir}/charset.alias @@ -84,5 +72,11 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/gdb/syscalls/* %{_infodir}/gdb*.gz %changelog +* Sat Apr 25 2020 Daniel Hams - 7.6.2-3 +- Avoid picking up python + +* Fri Apr 10 2020 Daniel Hams - 7.6.2-2 +- Remove hard coded shell paths + * Thu Jan 16 2020 Daniel Hams - 0.1.0 - First build diff --git a/packages/gettext/SPECS/gettext.spec b/packages/gettext/SPECS/gettext.spec index 51d041c24..b26c2c799 100644 --- a/packages/gettext/SPECS/gettext.spec +++ b/packages/gettext/SPECS/gettext.spec @@ -9,7 +9,7 @@ Summary: GNU libraries and utilities for producing multi-lingual messages Name: gettext Version: %{tarversion} -Release: 2%{?dist} +Release: 3%{?dist} # The following are licensed under LGPLv2+: # - libintl and its headers # - libasprintf and its headers @@ -177,14 +177,11 @@ This package contains libraries used internationalization support. #think about. %prep -export SHELL=%{_bindir}/bash -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" %autosetup -n %{name}-%{tarversion} -S git # This ridiculous dance below is to get a bugfixed libtool.m4 included... # TODO turn this into a patch which will be quicker to apply. -pushd gettext-runtime/libasprintf +cd gettext-runtime/libasprintf libtoolize -f -i aclocal -I ../../m4 -I ../m4 -I gnulib-m4 autoconf @@ -193,9 +190,9 @@ touch config.h.in touch ChangeLog automake --add-missing --copy rm -rf autom4te.cache -popd +cd ../.. -pushd gettext-runtime +cd gettext-runtime libtoolize -f -i aclocal -I m4 -I ../m4 -I gnulib-m4 autoconf @@ -204,9 +201,9 @@ touch config.h.in touch ChangeLog intl/ChangeLog automake --add-missing --copy rm -rf autom4te.cache -popd +cd .. -pushd gettext-tools +cd gettext-tools libtoolize -f -i aclocal -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 autoconf @@ -215,12 +212,12 @@ touch config.h.in touch ChangeLog automake --add-missing --copy rm -rf autom4te.cache -popd +cd .. -#pushd libtextstyle +#cd libtextstyle #libtoolize -f -i #./autogen.sh --skip-gnulib -#popd +#cd .. aclocal -I m4 autoconf @@ -241,9 +238,6 @@ rm -rf autom4te.cache gettext-runtime/autom4te.cache gettext-tools/autom4te.cach %build -export SHELL=%{_bindir}/bash -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" %if %{with java} export JAVAC=gcj %if %{with jar} @@ -281,9 +275,6 @@ export gl_cv_cc_visibility=no %install #export LDFLAGS="$LDFLAGS -L%{_libdir} -lgcc_s -lm" -export SHELL=%{_bindir}/bash -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" #export INTERNAL_LIB_DIR="$PWD/gettext-tools/intl/.libs" #export INTERNAL_GNULIB_DIR="$PWD/gettext-tools/gnulib-lib/.libs" #export LDFLAGS="$LDFLAGS -rpath %{_libdir} -L$INTERNAL_LIB_DIR -L$INTERNAL_GNULIB_DIR" @@ -493,6 +484,9 @@ make check LIBUNISTRING=-lunistring #%{_mandir}/man1/msghack.1* %changelog +* Fri Apr 10 2020 Daniel Hams - 0.19.8-3 +- Remove hard coded shell paths/bashisms + * Tue Aug 20 2019 Daiki Ueno - 0.20.1-2 - Fix misbehavior of msgmerge --for-msgfmt diff --git a/packages/giflib/SPECS/giflib.spec b/packages/giflib/SPECS/giflib.spec index 6876d2654..e2131deb4 100644 --- a/packages/giflib/SPECS/giflib.spec +++ b/packages/giflib/SPECS/giflib.spec @@ -4,7 +4,7 @@ Name: giflib Summary: A library and utilities for processing GIFs Version: 5.2.1 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT URL: http://www.sourceforge.net/projects/%{name}/ @@ -44,6 +44,8 @@ format image files. %build +export CC=gcc +export CXX=g++ %make_build CFLAGS="%{optflags} -fPIC" LDFLAGS="%{__global_ldflags}" @@ -53,13 +55,8 @@ format image files. # Drop static library rm -f %{buildroot}%{_libdir}/libgif.a -# Move man pages into right place -mv $RPM_BUILD_ROOT%{_prefix}/share/man $RPM_BUILD_ROOT%{_mandir}/ - - #ldconfig_scriptlets - %files %doc ChangeLog NEWS README %license COPYING @@ -76,6 +73,9 @@ mv $RPM_BUILD_ROOT%{_prefix}/share/man $RPM_BUILD_ROOT%{_mandir}/ %changelog +* Sat Apr 25 2020 Daniel Hams - 5.2.1-4 +- mandir correction + * Tue Oct 01 2019 Sandro Mani - 5.2.1-3 - Move quantize.c back into libgif.so (#1750122) diff --git a/packages/git/SPECS/git.spec b/packages/git/SPECS/git.spec index ef7db889a..d2b381c19 100644 --- a/packages/git/SPECS/git.spec +++ b/packages/git/SPECS/git.spec @@ -45,7 +45,7 @@ Name: git Version: 2.22.0 -Release: 1%{?rcrev}%{?dist} +Release: 2%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -179,9 +179,6 @@ other SCMs, install the git-all meta-package. # Ensure a blank line follows autosetup, el6 chokes otherwise # https://bugzilla.redhat.com/1310704 -export SHELL=%{_bindir}/bash -export CONFIG_SHELL="$SHELL" -export SHELL_PATH="$SHELL" export PERL_PATH=%{_bindir}/perl export TCLTK_PATH=%{_bindir}/wish export CC=gcc @@ -195,9 +192,6 @@ export CXX=g++ # Improve build reproducibility export TZ=UTC export SOURCE_DATE_EPOCH=$(date -r version +%%s 2>/dev/null) -export SHELL=%{_bindir}/bash -export CONFIG_SHELL="$SHELL" -export SHELL_PATH="$SHELL" export PERL_PATH=%{_bindir}/perl export TCLTK_PATH=%{_bindir}/wish export CC=gcc @@ -208,9 +202,6 @@ export CXX=g++ %install export TZ=UTC export SOURCE_DATE_EPOCH=$(date -r version +%%s 2>/dev/null) -export SHELL=%{_bindir}/bash -export CONFIG_SHELL="$SHELL" -export SHELL_PATH="$SHELL" export PERL_PATH=%{_bindir}/perl export TCLTK_PATH=%{_bindir}/wish export CC=gcc @@ -271,5 +262,8 @@ exit 0 %{_datadir}/locale %changelog +* Fri Apr 10 2020 Daniel Hams - 2.22.0-2 +- Remove hard coded shell paths + * Wed Dec 18 2019 Daniel Hams - 2.22.0-1 - Custom build, fedora too complex diff --git a/packages/grep/SPECS/grep.spec b/packages/grep/SPECS/grep.spec index c64e7f860..ba5a1d724 100644 --- a/packages/grep/SPECS/grep.spec +++ b/packages/grep/SPECS/grep.spec @@ -4,7 +4,7 @@ Summary: Pattern matching utilities Name: grep Version: 3.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/grep/ @@ -21,7 +21,7 @@ Patch1: grep-3.33-help-align.patch Patch10: grep.sgifixes.patch BuildRequires: gcc -#BuildRequires: pcre-devel >= 3.9-10, texinfo, gettext +BuildRequires: pcre-devel >= 3.9-10, texinfo, gettext BuildRequires: texinfo, gettext BuildRequires: autoconf automake # https://fedorahosted.org/fpc/ticket/174 @@ -57,8 +57,10 @@ GNU grep is needed by many scripts, so it shall be installed on every system. %global BUILD_FLAGS %{BUILD_FLAGS} -mlong-double-64 %endif -#%configure --without-included-regex --disable-silent-rules \ +#configure --without-included-regex --disable-silent-rules \ # CPPFLAGS="-I%{_includedir}/pcre" CFLAGS="%{BUILD_FLAGS}" +export gl_cv_func_select_supports0=no +export gl_cv_func_select_detects_ebadf=no %configure --disable-silent-rules \ CPPFLAGS="-I%{_includedir}/pcre" CFLAGS="%{BUILD_FLAGS}" make %{?_smp_mflags} @@ -91,6 +93,9 @@ make check %{_libexecdir}/grepconf.sh %changelog +* Fri Apr 10 2020 Daniel Hams - 3.3-4 +- Remove hard coded shell paths/include pcre dependency + * Thu Jul 25 2019 Fedora Release Engineering - 3.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/packages/groff/SPECS/groff.spec b/packages/groff/SPECS/groff.spec index bf7dc0cdb..ee98bf6e2 100644 --- a/packages/groff/SPECS/groff.spec +++ b/packages/groff/SPECS/groff.spec @@ -3,7 +3,7 @@ Summary: A document formatting system Name: groff Version: 1.22.4 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv3+ and GFDL and BSD and MIT URL: http://www.gnu.org/software/groff/ Source: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz @@ -92,13 +92,6 @@ text processor package. It contains examples, documentation for PIC language and documentation for creating PDF files. %prep -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" -export BASH_PROG=%{_bindir}/bash -export PERL=%{_bindir}/perl -export GREP="%{_bindir}/grep" -export EGREP="%{_bindir}/grep -E" %setup -q #git init #git config user.email groff-owner@fedoraproject.org @@ -115,14 +108,6 @@ for file in NEWS src/devices/grolbp/grolbp.1.man doc/webpage.ms \ done %build -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" -export BASH_PROG=%{_bindir}/bash -export PERL=%{_bindir}/perl -export GREP="%{_bindir}/grep" -export EGREP="%{_bindir}/grep -E" - %configure \ --docdir=%{_pkgdocdir} \ --with-appresdir=%{_datadir}/X11/app-defaults \ @@ -130,13 +115,6 @@ export EGREP="%{_bindir}/grep -E" make %{?_smp_mflags} %install -export SHELL=%{_bindir}/sh -export SHELL_PATH="$SHELL" -export CONFIG_SHELL="$SHELL" -export BASH_PROG=%{_bindir}/bash -export PERL=%{_bindir}/perl -export GREP="%{_bindir}/grep" -export EGREP="%{_bindir}/grep -E" make install DESTDIR=%{buildroot} rm -f ${RPM_BUILD_ROOT}%{_libdir}/charset.alias @@ -168,10 +146,11 @@ chmod 755 %{buildroot}%{_datadir}/groff/%{version}/groffer/version.sh chmod 755 %{buildroot}%{_datadir}/groff/%{version}/font/devlj4/generate/special.awk # remove CreationDate from documentation -#pushd %{buildroot}%{_pkgdocdir} +#OLDPWD=`pwd` +#cd %{buildroot}%{_pkgdocdir} # find -name "*.html" | xargs sed -i "/^