From 27bd1a6ab247bf26541971343d8ca66969666702 Mon Sep 17 00:00:00 2001 From: osamaesmailmsft <110202916+osamaesmailmsft@users.noreply.github.com> Date: Wed, 12 Oct 2022 16:00:03 -0700 Subject: [PATCH] Moving PHP from SPECS-EXTENDED to SPECS (#3820) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Only build bond against x86_64 architecture (#1800) (#1801) * fix bond build break for ARM64 on main branch * fix bond build break for ARM64 on main branch * fix bond build break for ARM64 on main branch Co-authored-by: nicolas guibourge Co-authored-by: nicolas guibourge * [main extended] Enable libguestfs (#1970) * Remove libreport support from mdadm * Conditionally pull in perl-Sys-Virt test deps * Fix dependency resolution for ocaml-ctypes * Upgrade to latest ocaml-gettext * Fix ocaml-ounit build * Upgrade ocaml-base to latest * Upgrade ocaml-migrate-parsetree to latest * Upgrade ocaml-stdio to 0.15.0 * Upgrade ocaml-parsexp to 0.15.0 * Upgrade ocaml-ppxlib to 0.24.0 * Upgrade ocaml-sexplib to 0.15.0 * Upgrade ocaml-sexplib0 to 0.15.0 * Upgrade supermin to 5.2.1 * Fixup libguestfs patches and configuration * [main extended] Fix dnf-plugins-core, ocaml-findlib builds (#1950) * [main] Removing in-spec sources verification using `libguestfs.keyring`. (#1971) * kernel: Update Mariner cert in kernel keyring (#1979) * kernel: Update mariner cert in kernel keyring * kernel-hyperv: Update mariner cert in kernel keyring * kernel-headers: Bump to match kernel release number * kernel-signed: Bump to match kernel release Signed-off-by: Chris Co * lttng-consume: disable tests to fix build break (#1980) Signed-off-by: Muhammad Falak R Wani * Revert "Upgrading Parted to v3.4" (#1966) * Revert "Upgrading Parted to v3.4 (#1898)" This reverts commit 24382cfa6efa5cbdbbac777f22041612c57df9c6. * verifying license to unblock upgrade revert pr * Temporary: Add python3-distro to azurevm-packages packagelist (#2016) * Upgrade libmemcached, memcached and promote to core specs (#1981) * kernel-signed: workaround errant .build-id file (#2032) After the upgrade to RPM 4.17, when building on ARM64 only, we are observing an unexpected /usr/lib/debug/.build-id/xx/yyyy.debug file being packaged into the kernel.rpm package. This errant file is causing build errors when repackaging in the kernel-signed build phase. This patch workarounds the build issue by specifically excluding the /usr/lib/debug/.build-id folder when building for ARM64. More investigation underway to identify why this unexpect /usr/lib/debug/.build-id/xx/yyyy.debug file is being included. Signed-off-by: Chris Co * Fix grubby build with newer versions of RPM (#2036) * Update libgit2 to latest upstream version 1.1.0 (#2021) Signed-off-by: Kate Goldenring * Fix build break (signature) for libgit2 * Fix TDNF download of packages during libguestfs build * Replace perl(Locale::TextDomain) BR in libguestfs with actual package * [main] Fixing tooling issues during package candidates resolution. (#2091) * Fix dependency constraints, UUID parsing in libguestfs (#2113) * Bring over libguestfs changes from 2.0 * Fix selinux-policy, file bugs in libguestfs * kernel: Update input aarch64 config file (#2358) ARM64 kernel package builds are failing due to a config diff missing between the expected config and the actual config file. Add missing CONFIG_USBIP_VUDC line Signed-off-by: Chris Co * Revert "[main] Update envoy to v1.21.0 (#2330)" This reverts commit 5c0c47a867c39cd8f53f2680f5460e615d76366b. * toolkit only - use local /run folder in chroot instead of mounted tmpfs (#2435) * toolkit - use local /run folder in chroot instead of mounted tmpfs * address PR comments * address PR comments * address PR comments Co-authored-by: Nicolas Guibourge * [main] iperf3: Update to 3.11 (#2512) * Update iperf3 to 3.11 * toolchain: Remove alsa-lib (#2543) * Fix post-install script args in imageconfig being ignored (#2414) * Upgrade nodejs to 16.14.0 (#2485) * upgrade nodejs to 16.14.0 * upgrade nodejs to 16.14.0 * upgrade nodejs to 16.14.0 * upgrade nodejs Co-authored-by: Nicolas Guibourge * [main] upgrading libarchive to v3.6.0 (#2515) * upgrading libarchive to v3.6.0 * removing patch file * adding missing URL * fixing URL * [2.0] Modify pam to require audit-libs (#2572) * update pam * update manifests * install audit-libs before systemd (#2584) * Revert "install audit-libs before systemd (#2584)" This reverts commit 217097585286b756144d91d46e45f892e58526ba. * Build rubygems with ruby to fix build error in pipeline (#2601) * Add rubygems to build with ruby to fix build error in pipeline * Remove bundler requirement * [main] Adding `--assumeyes` for TDNF calls. (#2641) (#2642) * Fix bad ruby merge issue * Revert "python3: Add python-unversioned-command subpackage (#2637)" This reverts commit b62bb32bef2981406522b8da5b6a992808fb393a. * dnf-plugins-core: Fix bad python path in cmake call (#2658) * dnf-plugins-core: Fix bad python path in cmake call * Update license map * Empty commit to trigger GH checks * Unblock build, exclude SymCrypt from ARM64 * Update python requirement in azurevm packagelist for 2.0 (#2667) * Revert "Unblock build, exclude SymCrypt from ARM64" This reverts commit 9b0a48fc52ffd296bbf5340cc95d2ce3d6d099e4. * Repair toolkit merge issue * fix boringssl license issue (#2775) * revert arm64 exclusion workaround (#2769) * [main] Build break workaround. (#2788) * Revert "fix boringssl license issue (#2775)" This reverts commit 50b3397168fcbfcb270644b64de68d39f15985ab. * Remove boringssl to reconcile with main branch * [main] Fixing installation paths with new version of Ruby. (#2859) * vim: Fix vi provides with reversed EVR (#2872) * cri-o: Replace openSUSE systemd macros with Mariner's (#2874) * toolchain: Rebuild audit with systemd-bootstrap-rpm-macros installed (#2878) * toolchain: Rebuild audit with systemd-bootstrap-rpm-macros installed * audit: Add BR on systemd-bootstrap-rpm-macros * [2.0] Cherry-pick credscan failure caused by unattended installer image config (#2908) * minor fix to build doc (#2907) Co-authored-by: Henry Li * fix image config json (#2906) Co-authored-by: Henry Li Co-authored-by: Henry Li * download msopenjdk-11 from prod folder (#2921) * Cherry Pick build fixes to Extended (#3105) * ARM64 `buildah` and `edk2` blocked packages fix. (#3101) * Adding missing signature for `perl-Module-Install-Repository`. (#3086) Co-authored-by: Pawel Winogrodzki * Python-twisted: upgrade to version 22.4.0 to fix CVE-2022-24801 (#3079) * python-twisted upgrade to 22.4.0 to fix CVE-2022-24801 * python-twisted upgrade to 22.4.0 to fix CVE-2022-24801 * python-twisted upgrade to 22.4.0 to fix CVE-2022-24801 * python-twisted upgrade to 22.4.0 to fix CVE-2022-24801 Co-authored-by: Nicolas Guibourge * upgrading vim to 8.2.4979 for CVE-2022-1619, CVE-2022-1621, CVE-2022-… (#3087) * upgrading vim to 8.2.4979 for CVE-2022-1619, CVE-2022-1621, CVE-2022-1629, CVE-2022-1616, CVE-2022-1733, CVE-2022-1735, CVE-2022-1769, CVE-2022-1620, CVE-2022-1674, CVE-2022-1771, CVE-2022-1785, CVE-2022-1796 * upgrading vim to 8.2.4979 for CVE-2022-1619, CVE-2022-1621, CVE-2022-1629, CVE-2022-1616, CVE-2022-1733, CVE-2022-1735, CVE-2022-1769, CVE-2022-1620, CVE-2022-1674, CVE-2022-1771, CVE-2022-1785, CVE-2022-1796 * upgrading vim to 8.2.4979 for CVE-2022-1619, CVE-2022-1621, CVE-2022-1629, CVE-2022-1616, CVE-2022-1733, CVE-2022-1735, CVE-2022-1769, CVE-2022-1620, CVE-2022-1674, CVE-2022-1771, CVE-2022-1785, CVE-2022-1796 Co-authored-by: Nicolas Guibourge * Updating `vim` to version 8.2.5064. (#3112) * Bump Mariner Release (#3140) * Revert "Add missing e2fsprogs dep to cloud-init (#3141)" This reverts commit 7417d8a04fc716763e40e8e405eb68b60464c57a. Reverting this change temporarily because we are not ready to upgrade cloud-init * Revert "cloud-init: uprev to 22.2 (#3104)" This reverts commit 3bcdc43b8f21082c7fb19a6286ff341bf627cb2c. Reverting this change temporarily because we are not ready to upgrade cloud-init. * Fix build errors caused by ncurses 6.3 upgrade (#3184) * Fix ARM64 Build Break (#3191) * t1lib: Fix SRPM packing (#3192) * Revert "cloud-init: patch for CVE-2022-2084 (#3281)" This reverts commit e3174308e7fa883c3dc52182da13c66355607aea. * Revert "Revert "cloud-init: uprev to 22.2 (#3104)"" This reverts commit ae3a7d80afa0f1694aa7e782b51f97f13abb7bc6. * Revert "Revert "Add missing e2fsprogs dep to cloud-init (#3141)"" This reverts commit 68bd0ec8d78dadc954851ad00c6039bcb608bcaa. * Revert "Revert "cloud-init: patch for CVE-2022-2084 (#3281)"" This reverts commit 0b1ba723bc5cbf6cc5623faccb4057254761a6ae. * Revert "Initial KeysInUse Integration (#3182)" This reverts commit 7de96f680a89ca8a7d3a6bfa4c8f291ea459b2f9. * Updating 'mariner-release' version for July update 2. (#3444) * remove provides from unsigned grub2 (#3461) Co-authored-by: Henry Li * Updating 'mariner-release' for the August release. * Updating licenses after the 'main' merge. * KeysInUse: re-introduce package back to 2.0. (#3531) * Update helm version 3.9.3 (#3586) * Update helm version 3.9.3 * Fix helm version info not displaying correctly * fix cloud-init dependency issue (#3606) * `mariadb`: update to v10.6.9 to fix CVE-2022-32091, CVE-2022-32081 (#3645) * fix npm version in nodejs.spec (#3571) * upgrade vim to 9.0.0232 (#3580) * qemu : fix CVE-2022-35414 (#3597) * qemu : fix CVE-2022-35414 * address PR comment Co-authored-by: Nicolas Guibourge * libxml2 and python-lxml: fix CVE-2022-2309 (#3583) * libxml2 and python-lxml: fix CVE-2022-2309 * libxml2 and python-lxml: fix CVE-2022-2309 * address PR comments Co-authored-by: Nicolas Guibourge * rubygem-yajl-ruby: fix CVE 2022 24795 (#3598) * rubygem-yajl-ruby : fix CVE-2022-24795 * rubygem-yajl-ruby : fix CVE-2022-24795 * back port patch from 1.4.1 * fix spec issue * address PR comments Co-authored-by: Nicolas Guibourge * Update cert-manager to v1.7.3. (#3575) - Update cert-manager to v1.7.3. - Split cert-manager binaries into separate packages. - Remove cert-manager build dependency on Bazel and just build the binaries directly using `go build`. This makes building easier. Also, the latest upstream version of cert-manager does this. - Use the Go "vendor" directory for Go dependencies instead of dumping files in the global Go cache. * Bump supported go versions to 1.17.13, 1.18.5 to fix fifteen CVEs (#3600) Co-authored-by: Pawel Winogrodzki * dpkd: bump version to 21.11.2 to address CVE-2022-2132 (#3631) * dpkd: bump version to 21.11.2 to address CVE-2022-2132 * dpdk: cgmanifest: update entry Signed-off-by: Muhammad Falak R Wani * `vim`: upgrade to 9.0.0325 to fix CVE-2022-2980, CVE-2022-2982, CVE-2022-2923, CVE-2022-2946 (#3643) * `python3`: fix CVE-2015-20107 (#3644) * `python3`: fix CVE-2021-28861 (#3654) * `colord`: fix CVE-2021-42523 (#3675) * `virglrenderer`: fix CVE-2022-0135 (#3674) * libtar: Pull misc Fedora patches, fix CVE-2021-33643, CVE-2021-33644, CVE-2021-33645, CVE-2021-33646 (#3686) * Apply Fedora patches * Apply linter * Use upstream patch * Patch qemu CVE-2021-4158 (#3696) * libtar: Fixup spec formatting, remove .la files, remove explicit provides (#3698) * Fixup libtar spec formatting, .la files, provides * Add comment so we can track CVE fixes * update mariner-release to 2.0-19 (#3723) * fix br in libvirt (#3726) * Added nopatch to libtirpc for CVE-2021-46828 (#3779) Co-authored-by: Nick Samson * update mariner-release to 2.0-21 (#3778) * revert changes for adding sysinit.target dependency (#3777) * Expat fix CVE-2022-40674 (#3799) Co-authored-by: Betty Lakes * bump mariner-release to 2.0-21 * switching branches * Ensure rpm-* ABI compatibility (#3880) * Ensure `python3-rpm` pulls in appropriate libs * Add rpm-build-libs -> rpm-libs dependency too * Declare release `4.18.0-2` with fixes * toolkit.mk: fix 'clean-rpms-snapshot' target. (#3843) * 7.4.14 to 8.1.11; need to delete the old SPECS-EXTENDED folders * php 8.1.11 build now * removed libraries from SPECS-EXTENDED * merged current 2.0; added changelog for php & updated other licenses; need to verify changelog for php & version thing olivia said * update cgmanifest.json * reresolving old mr comments * updated hunspell to fix CVE; added aspell patch to fix CVE; fixed some PHP linting issues * one linting fix * removed commented-out modphp code; updated changelog * debugging url issues * trying 2sec timeout instead of 1sec * echoing to txt log * undoing validate-cg-manifests.sh changes; trying new url * resolving mr comments * updating malaga in cgmanifest * trying source-git's mirror * trying with local tarball * trying with local tarball * using blob storage * Delete bad_registrations.txt * updating tokyocabinet url * changing branches * resolving conflicts with upstream/main * mr comments * updating cgmanifest * actually fixing validate_cg_manifest.sh * Delete php-8.1.11.tar.xz.asc * Delete php-keyring.gpg Signed-off-by: Chris Co Signed-off-by: Muhammad Falak R Wani Signed-off-by: Kate Goldenring Co-authored-by: nicolas guibourge Co-authored-by: nicolas guibourge Co-authored-by: Jon Slobodzian Co-authored-by: Thomas Crain Co-authored-by: Pawel Winogrodzki Co-authored-by: Christopher Co <35273088+christopherco@users.noreply.github.com> Co-authored-by: Muhammad Falak R Wani Co-authored-by: Max Brodeur-Urbas <35381493+MaxBrodeurUrbas@users.noreply.github.com> Co-authored-by: Kate Goldenring Co-authored-by: rlmenge Co-authored-by: Vince Perri <5596945+vinceaperri@users.noreply.github.com> Co-authored-by: Andrew Phelps Co-authored-by: Neha Agarwal <58672330+neha170@users.noreply.github.com> Co-authored-by: Olivia Crain Co-authored-by: Henry Li <69694695+henryli001@users.noreply.github.com> Co-authored-by: Henry Li Co-authored-by: CBL-Mariner Servicing Account Co-authored-by: chalamalasetty <42326515+chalamalasetty@users.noreply.github.com> Co-authored-by: Nan Liu <108544011+liunan-ms@users.noreply.github.com> Co-authored-by: Henry Beberman Co-authored-by: Cameron E Baird Co-authored-by: Chris Gunn Co-authored-by: Daniel McIlvaney Co-authored-by: Nick Samson Co-authored-by: Nick Samson Co-authored-by: Minghe Ren Co-authored-by: Betty <38226164+BettyRain@users.noreply.github.com> Co-authored-by: Betty Lakes Co-authored-by: Andrew Phelps Co-authored-by: Andy Caldwell --- .github/workflows/validate-cg-manifest.sh | 2 +- .../0001-invalid-read-memory-access-624.patch | 25 - .../hunspell-1.7.0-print-format.patch | 24 - .../hunspell/hunspell.signatures.json | 5 - SPECS-EXTENDED/php/php-5.6.3-datetests.patch | 23 - SPECS-EXTENDED/php/php-7.4.14-gd.patch | 56 -- SPECS-EXTENDED/php/php-7.4.14.tar.xz.asc | 16 - SPECS-EXTENDED/php/php-7.4.8-phpinfo.patch | 76 --- SPECS-EXTENDED/php/php-keyring.gpg | 521 -------------- SPECS-EXTENDED/php/php.ztsmodconf | 7 - .../aspell/aspell-0.60.7-fileconflict.patch | 0 .../aspell/aspell-0.60.7-mp.patch | 0 .../aspell/aspell-0.60.7-pspell_conf.patch | 0 SPECS/aspell/aspell-0.60.8-objstack.patch | 96 +++ .../aspell/aspell.signatures.json | 0 {SPECS-EXTENDED => SPECS}/aspell/aspell.spec | 83 ++- SPECS/docbook-dtds/LICENSE.PTR | 32 + .../docbook-dtds/docbook-4.2-euro.patch | 0 .../docbook-dtd30-sgml-1.0.catalog.patch | 0 .../docbook-dtd31-sgml-1.0.catalog.patch | 0 .../docbook-dtd40-sgml-1.0.catalog.patch | 0 .../docbook-dtd41-sgml-1.0.catalog.patch | 0 .../docbook-dtd412-entities.patch | 0 .../docbook-dtd42-sgml-1.0.catalog.patch | 0 .../docbook-dtds/docbook-dtds-ents.patch | 0 .../docbook-dtds/docbook-dtds.signatures.json | 1 + .../docbook-dtds/docbook-dtds.spec | 246 +++---- .../docbook-sgml-systemrewrite.patch | 0 SPECS/docbook-style-dsssl/LICENSE.PTR | 53 ++ .../docbook-style-dsssl.Makefile | 0 .../docbook-style-dsssl.signatures.json | 1 + .../docbook-style-dsssl.spec | 61 +- .../enchant2/enchant2.signatures.json | 0 .../enchant2/enchant2.spec | 11 +- .../enchant2/enchant_aspell.patch | 0 .../freetds/freetds-tds_sysdep_public.h | 0 .../freetds/freetds.signatures.json | 0 .../freetds/freetds.spec | 99 ++- .../hunspell-en/en_GB-singleletters.patch | 0 .../hunspell-en/en_GB.etc.patch | 0 .../hunspell-en/en_GB.two_initial_caps.patch | 0 .../hunspell-en/en_IE.supplemental.patch | 0 .../hunspell-en/en_US-strippedabbrevs.patch | 0 .../hunspell-en/hunspell-en-GB-LICENSE.txt | 0 .../hunspell-en/hunspell-en-SI_and_IEC.patch | 0 .../hunspell-en/hunspell-en-US-LICENSE.txt | 0 ...ell-en-allow-non-typographical.marks.patch | 0 .../hunspell-en/hunspell-en-calender.patch | 0 ...nspell-en-dont-call-git-during-build.patch | 0 .../hunspell-en/hunspell-en-fixbuild.patch | 0 .../hunspell-en/hunspell-en.signatures.json | 0 .../hunspell-en/hunspell-en.spec | 120 ++-- .../hunspell-en/mozilla_words.patch | 0 .../hunspell-en/perl.regex.patch | 0 SPECS/hunspell/hunspell.signatures.json | 5 + .../hunspell/hunspell.spec | 74 +- SPECS/libreswan/libreswan.spec | 7 +- .../libvoikko/libvoikko.signatures.json | 0 .../libvoikko/libvoikko.spec | 33 +- .../make-it-work-with-python-3.patch | 0 .../malaga-suomi-voikko.signatures.json | 0 .../malaga-suomi-voikko.spec | 28 +- .../malaga/disable_gtk2.patch | 0 .../malaga/malaga-aarch64.patch | 0 .../malaga/malaga-malshow-lm.patch | 0 .../malaga/malaga-rename-map_file.patch | 0 .../malaga/malaga.signatures.json | 0 {SPECS-EXTENDED => SPECS}/malaga/malaga.spec | 45 +- .../openjade/config.guess | 0 {SPECS-EXTENDED => SPECS}/openjade/config.sub | 0 .../openjade/openjade-1.3.1-nsl.patch | 0 .../openjade/openjade-1.3.2-gcc46.patch | 0 .../openjade/openjade-deplibs.patch | 0 .../openjade/openjade-getoptperl.patch | 0 .../openjade/openjade-nola.patch | 0 .../openjade/openjade-ppc64.patch | 0 .../openjade/openjade.signatures.json | 0 .../openjade/openjade.spec | 76 +-- .../opensp/opensp-manpage.patch | 0 .../opensp/opensp-multilib.patch | 0 .../opensp/opensp-nodeids.patch | 0 .../opensp/opensp-sigsegv.patch | 0 .../opensp/opensp.signatures.json | 0 {SPECS-EXTENDED => SPECS}/opensp/opensp.spec | 75 +-- {SPECS-EXTENDED => SPECS}/php/10-opcache.ini | 9 +- {SPECS-EXTENDED => SPECS}/php/20-ffi.ini | 0 {SPECS-EXTENDED => SPECS}/php/macros.php | 0 {SPECS-EXTENDED => SPECS}/php/nginx-fpm.conf | 0 {SPECS-EXTENDED => SPECS}/php/nginx-php.conf | 0 .../php/opcache-default.blacklist | 0 .../php/php-7.2.0-includedir.patch | 0 SPECS/php/php-7.4.0-datetests.patch | 98 +++ .../php/php-7.4.0-httpd.patch | 0 .../php/php-7.4.0-ldap_r.patch | 0 .../php/php-7.4.0-phpize.patch | 0 .../php/php-8.0.0-embed.patch | 19 +- .../php/php-8.1.0-libdb.patch | 28 +- SPECS/php/php-8.1.0-parser.patch | 16 + SPECS/php/php-8.1.0-phpinfo.patch | 44 ++ .../php/php-8.1.0-systzdata-v22.patch | 110 ++- .../php/php-fpm-www.conf | 0 {SPECS-EXTENDED => SPECS}/php/php-fpm.conf | 0 .../php/php-fpm.logrotate | 0 {SPECS-EXTENDED => SPECS}/php/php-fpm.service | 0 {SPECS-EXTENDED => SPECS}/php/php-fpm.wants | 0 {SPECS-EXTENDED => SPECS}/php/php.conf | 6 +- {SPECS-EXTENDED => SPECS}/php/php.ini | 478 +++++++------ {SPECS-EXTENDED => SPECS}/php/php.modconf | 9 +- .../php/php.signatures.json | 11 +- {SPECS-EXTENDED => SPECS}/php/php.spec | 633 +++++++++++------- .../tidy/tidy.signatures.json | 0 {SPECS-EXTENDED => SPECS}/tidy/tidy.spec | 55 +- .../tokyocabinet/tokyocabinet-fedora.patch | 0 .../tokyocabinet/tokyocabinet-manhelp.patch | 0 .../tokyocabinet/tokyocabinet.signatures.json | 0 .../tokyocabinet/tokyocabinet.spec | 51 +- cgmanifest.json | 16 +- 117 files changed, 1627 insertions(+), 1857 deletions(-) delete mode 100644 SPECS-EXTENDED/hunspell/0001-invalid-read-memory-access-624.patch delete mode 100644 SPECS-EXTENDED/hunspell/hunspell-1.7.0-print-format.patch delete mode 100644 SPECS-EXTENDED/hunspell/hunspell.signatures.json delete mode 100644 SPECS-EXTENDED/php/php-5.6.3-datetests.patch delete mode 100644 SPECS-EXTENDED/php/php-7.4.14-gd.patch delete mode 100644 SPECS-EXTENDED/php/php-7.4.14.tar.xz.asc delete mode 100644 SPECS-EXTENDED/php/php-7.4.8-phpinfo.patch delete mode 100644 SPECS-EXTENDED/php/php-keyring.gpg delete mode 100644 SPECS-EXTENDED/php/php.ztsmodconf rename {SPECS-EXTENDED => SPECS}/aspell/aspell-0.60.7-fileconflict.patch (100%) rename {SPECS-EXTENDED => SPECS}/aspell/aspell-0.60.7-mp.patch (100%) rename {SPECS-EXTENDED => SPECS}/aspell/aspell-0.60.7-pspell_conf.patch (100%) create mode 100644 SPECS/aspell/aspell-0.60.8-objstack.patch rename {SPECS-EXTENDED => SPECS}/aspell/aspell.signatures.json (100%) rename {SPECS-EXTENDED => SPECS}/aspell/aspell.spec (90%) create mode 100644 SPECS/docbook-dtds/LICENSE.PTR rename {SPECS-EXTENDED => SPECS}/docbook-dtds/docbook-4.2-euro.patch (100%) rename {SPECS-EXTENDED => SPECS}/docbook-dtds/docbook-dtd30-sgml-1.0.catalog.patch (100%) rename {SPECS-EXTENDED => SPECS}/docbook-dtds/docbook-dtd31-sgml-1.0.catalog.patch (100%) rename {SPECS-EXTENDED => SPECS}/docbook-dtds/docbook-dtd40-sgml-1.0.catalog.patch (100%) rename {SPECS-EXTENDED => SPECS}/docbook-dtds/docbook-dtd41-sgml-1.0.catalog.patch (100%) rename {SPECS-EXTENDED => SPECS}/docbook-dtds/docbook-dtd412-entities.patch (100%) rename {SPECS-EXTENDED => SPECS}/docbook-dtds/docbook-dtd42-sgml-1.0.catalog.patch (100%) rename {SPECS-EXTENDED => SPECS}/docbook-dtds/docbook-dtds-ents.patch (100%) rename {SPECS-EXTENDED => SPECS}/docbook-dtds/docbook-dtds.signatures.json (95%) rename {SPECS-EXTENDED => SPECS}/docbook-dtds/docbook-dtds.spec (78%) rename {SPECS-EXTENDED => SPECS}/docbook-dtds/docbook-sgml-systemrewrite.patch (100%) create mode 100644 SPECS/docbook-style-dsssl/LICENSE.PTR rename {SPECS-EXTENDED => SPECS}/docbook-style-dsssl/docbook-style-dsssl.Makefile (100%) rename {SPECS-EXTENDED => SPECS}/docbook-style-dsssl/docbook-style-dsssl.signatures.json (72%) rename {SPECS-EXTENDED => SPECS}/docbook-style-dsssl/docbook-style-dsssl.spec (87%) rename {SPECS-EXTENDED => SPECS}/enchant2/enchant2.signatures.json (100%) rename {SPECS-EXTENDED => SPECS}/enchant2/enchant2.spec (97%) rename {SPECS-EXTENDED => SPECS}/enchant2/enchant_aspell.patch (100%) rename {SPECS-EXTENDED => SPECS}/freetds/freetds-tds_sysdep_public.h (100%) rename {SPECS-EXTENDED => SPECS}/freetds/freetds.signatures.json (100%) rename {SPECS-EXTENDED => SPECS}/freetds/freetds.spec (87%) rename {SPECS-EXTENDED => SPECS}/hunspell-en/en_GB-singleletters.patch (100%) rename {SPECS-EXTENDED => SPECS}/hunspell-en/en_GB.etc.patch (100%) rename {SPECS-EXTENDED => SPECS}/hunspell-en/en_GB.two_initial_caps.patch (100%) rename {SPECS-EXTENDED => SPECS}/hunspell-en/en_IE.supplemental.patch (100%) rename {SPECS-EXTENDED => SPECS}/hunspell-en/en_US-strippedabbrevs.patch (100%) rename {SPECS-EXTENDED => SPECS}/hunspell-en/hunspell-en-GB-LICENSE.txt (100%) rename {SPECS-EXTENDED => SPECS}/hunspell-en/hunspell-en-SI_and_IEC.patch (100%) rename {SPECS-EXTENDED => SPECS}/hunspell-en/hunspell-en-US-LICENSE.txt (100%) rename {SPECS-EXTENDED => SPECS}/hunspell-en/hunspell-en-allow-non-typographical.marks.patch (100%) rename {SPECS-EXTENDED => SPECS}/hunspell-en/hunspell-en-calender.patch (100%) rename {SPECS-EXTENDED => SPECS}/hunspell-en/hunspell-en-dont-call-git-during-build.patch (100%) rename {SPECS-EXTENDED => SPECS}/hunspell-en/hunspell-en-fixbuild.patch (100%) rename {SPECS-EXTENDED => SPECS}/hunspell-en/hunspell-en.signatures.json (100%) rename {SPECS-EXTENDED => SPECS}/hunspell-en/hunspell-en.spec (85%) rename {SPECS-EXTENDED => SPECS}/hunspell-en/mozilla_words.patch (100%) rename {SPECS-EXTENDED => SPECS}/hunspell-en/perl.regex.patch (100%) create mode 100644 SPECS/hunspell/hunspell.signatures.json rename {SPECS-EXTENDED => SPECS}/hunspell/hunspell.spec (91%) rename {SPECS-EXTENDED => SPECS}/libvoikko/libvoikko.signatures.json (100%) rename {SPECS-EXTENDED => SPECS}/libvoikko/libvoikko.spec (96%) rename {SPECS-EXTENDED => SPECS}/malaga-suomi-voikko/make-it-work-with-python-3.patch (100%) rename {SPECS-EXTENDED => SPECS}/malaga-suomi-voikko/malaga-suomi-voikko.signatures.json (100%) rename {SPECS-EXTENDED => SPECS}/malaga-suomi-voikko/malaga-suomi-voikko.spec (96%) rename {SPECS-EXTENDED => SPECS}/malaga/disable_gtk2.patch (100%) rename {SPECS-EXTENDED => SPECS}/malaga/malaga-aarch64.patch (100%) rename {SPECS-EXTENDED => SPECS}/malaga/malaga-malshow-lm.patch (100%) rename SPECS-EXTENDED/malaga/malaga-rename-map_file.diff => SPECS/malaga/malaga-rename-map_file.patch (100%) rename {SPECS-EXTENDED => SPECS}/malaga/malaga.signatures.json (100%) rename {SPECS-EXTENDED => SPECS}/malaga/malaga.spec (91%) rename {SPECS-EXTENDED => SPECS}/openjade/config.guess (100%) rename {SPECS-EXTENDED => SPECS}/openjade/config.sub (100%) rename {SPECS-EXTENDED => SPECS}/openjade/openjade-1.3.1-nsl.patch (100%) rename {SPECS-EXTENDED => SPECS}/openjade/openjade-1.3.2-gcc46.patch (100%) rename {SPECS-EXTENDED => SPECS}/openjade/openjade-deplibs.patch (100%) rename {SPECS-EXTENDED => SPECS}/openjade/openjade-getoptperl.patch (100%) rename {SPECS-EXTENDED => SPECS}/openjade/openjade-nola.patch (100%) rename {SPECS-EXTENDED => SPECS}/openjade/openjade-ppc64.patch (100%) rename {SPECS-EXTENDED => SPECS}/openjade/openjade.signatures.json (100%) rename {SPECS-EXTENDED => SPECS}/openjade/openjade.spec (90%) rename {SPECS-EXTENDED => SPECS}/opensp/opensp-manpage.patch (100%) rename {SPECS-EXTENDED => SPECS}/opensp/opensp-multilib.patch (100%) rename {SPECS-EXTENDED => SPECS}/opensp/opensp-nodeids.patch (100%) rename {SPECS-EXTENDED => SPECS}/opensp/opensp-sigsegv.patch (100%) rename {SPECS-EXTENDED => SPECS}/opensp/opensp.signatures.json (100%) rename {SPECS-EXTENDED => SPECS}/opensp/opensp.spec (85%) rename {SPECS-EXTENDED => SPECS}/php/10-opcache.ini (94%) rename {SPECS-EXTENDED => SPECS}/php/20-ffi.ini (100%) rename {SPECS-EXTENDED => SPECS}/php/macros.php (100%) rename {SPECS-EXTENDED => SPECS}/php/nginx-fpm.conf (100%) rename {SPECS-EXTENDED => SPECS}/php/nginx-php.conf (100%) rename {SPECS-EXTENDED => SPECS}/php/opcache-default.blacklist (100%) rename {SPECS-EXTENDED => SPECS}/php/php-7.2.0-includedir.patch (100%) create mode 100644 SPECS/php/php-7.4.0-datetests.patch rename {SPECS-EXTENDED => SPECS}/php/php-7.4.0-httpd.patch (100%) rename {SPECS-EXTENDED => SPECS}/php/php-7.4.0-ldap_r.patch (100%) rename {SPECS-EXTENDED => SPECS}/php/php-7.4.0-phpize.patch (100%) rename SPECS-EXTENDED/php/php-7.4.0-embed.patch => SPECS/php/php-8.0.0-embed.patch (55%) rename SPECS-EXTENDED/php/php-7.2.0-libdb.patch => SPECS/php/php-8.1.0-libdb.patch (77%) create mode 100644 SPECS/php/php-8.1.0-parser.patch create mode 100644 SPECS/php/php-8.1.0-phpinfo.patch rename SPECS-EXTENDED/php/php-7.3.3-systzdata-v18.patch => SPECS/php/php-8.1.0-systzdata-v22.patch (82%) rename {SPECS-EXTENDED => SPECS}/php/php-fpm-www.conf (100%) rename {SPECS-EXTENDED => SPECS}/php/php-fpm.conf (100%) rename {SPECS-EXTENDED => SPECS}/php/php-fpm.logrotate (100%) rename {SPECS-EXTENDED => SPECS}/php/php-fpm.service (100%) rename {SPECS-EXTENDED => SPECS}/php/php-fpm.wants (100%) rename {SPECS-EXTENDED => SPECS}/php/php.conf (94%) rename {SPECS-EXTENDED => SPECS}/php/php.ini (85%) rename {SPECS-EXTENDED => SPECS}/php/php.modconf (54%) rename {SPECS-EXTENDED => SPECS}/php/php.signatures.json (63%) rename {SPECS-EXTENDED => SPECS}/php/php.spec (89%) rename {SPECS-EXTENDED => SPECS}/tidy/tidy.signatures.json (100%) rename {SPECS-EXTENDED => SPECS}/tidy/tidy.spec (92%) rename {SPECS-EXTENDED => SPECS}/tokyocabinet/tokyocabinet-fedora.patch (100%) rename {SPECS-EXTENDED => SPECS}/tokyocabinet/tokyocabinet-manhelp.patch (100%) rename {SPECS-EXTENDED => SPECS}/tokyocabinet/tokyocabinet.signatures.json (100%) rename {SPECS-EXTENDED => SPECS}/tokyocabinet/tokyocabinet.spec (86%) diff --git a/.github/workflows/validate-cg-manifest.sh b/.github/workflows/validate-cg-manifest.sh index 5c121be33d..63b8912382 100755 --- a/.github/workflows/validate-cg-manifest.sh +++ b/.github/workflows/validate-cg-manifest.sh @@ -154,7 +154,7 @@ do # Parsing output instead of using error codes because 'wget' returns code 8 for FTP, even if the file exists. # Sample HTTP(S) output: Remote file exists. # Sample FTP output: File ‘time-1.9.tar.gz’ exists. - if ! wget --spider --timeout=1 --tries=10 "${manifesturl}" 2>&1 | grep -qP "^(Remote file|File ‘.*’) exists\.$" + if ! wget --spider --timeout=1 --tries=10 "${manifesturl}" 2>&1 | grep -qP "^(Remote file|File ‘.*’) exists.*" then echo "Registration for $name:$version has invalid URL '$manifesturl' (could not download)" >> bad_registrations.txt fi diff --git a/SPECS-EXTENDED/hunspell/0001-invalid-read-memory-access-624.patch b/SPECS-EXTENDED/hunspell/0001-invalid-read-memory-access-624.patch deleted file mode 100644 index 66b55e7555..0000000000 --- a/SPECS-EXTENDED/hunspell/0001-invalid-read-memory-access-624.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ac938e2ecb48ab4dd21298126c7921689d60571b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= -Date: Tue, 12 Nov 2019 20:03:15 +0000 -Subject: [PATCH] invalid read memory access #624 - ---- - src/hunspell/suggestmgr.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hunspell/suggestmgr.cxx b/src/hunspell/suggestmgr.cxx -index dba084e..c23f165 100644 ---- a/src/hunspell/suggestmgr.cxx -+++ b/src/hunspell/suggestmgr.cxx -@@ -2040,7 +2040,7 @@ int SuggestMgr::leftcommonsubstring( - int l2 = su2.size(); - // decapitalize dictionary word - if (complexprefixes) { -- if (su1[l1 - 1] == su2[l2 - 1]) -+ if (l1 && l2 && su1[l1 - 1] == su2[l2 - 1]) - return 1; - } else { - unsigned short idx = su2.empty() ? 0 : (su2[0].h << 8) + su2[0].l; --- -2.23.0 - diff --git a/SPECS-EXTENDED/hunspell/hunspell-1.7.0-print-format.patch b/SPECS-EXTENDED/hunspell/hunspell-1.7.0-print-format.patch deleted file mode 100644 index 649057ff35..0000000000 --- a/SPECS-EXTENDED/hunspell/hunspell-1.7.0-print-format.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urN a/hunspell-1.7.0/src/tools/hunspell.cxx b/hunspell-1.7.0/src/tools/hunspell.cxx ---- a/hunspell-1.7.0/src/tools/hunspell.cxx 2022-06-22 17:41:40.025754800 -0700 -+++ b/hunspell-1.7.0/src/tools/hunspell.cxx 2022-06-27 16:35:13.916216700 -0700 -@@ -581,7 +581,7 @@ - #ifdef HAVE_CURSES_H - char* scanline(char* message) { - char input[INPUTLEN]; -- printw(message); -+ printw("%c",message); - echo(); - getnstr(input, INPUTLEN); - noecho(); -@@ -1180,9 +1180,9 @@ - mvprintw(MAXPREVLINE + 2, 0, "\n"); - for (size_t i = 0; i < wlst.size(); ++i) { - if ((wlst.size() > 10) && (i < 10)) { -- printw(" 0%d: %s\n", i, chenc(wlst[i], io_enc, ui_enc).c_str()); -+ printw(" 0%zu: %s\n", i, chenc(wlst[i], io_enc, ui_enc).c_str()); - } else { -- printw(" %d: %s\n", i, chenc(wlst[i], io_enc, ui_enc).c_str()); -+ printw(" %u: %s\n", i, chenc(wlst[i], io_enc, ui_enc).c_str()); - } - } - diff --git a/SPECS-EXTENDED/hunspell/hunspell.signatures.json b/SPECS-EXTENDED/hunspell/hunspell.signatures.json deleted file mode 100644 index 9e1c88b69e..0000000000 --- a/SPECS-EXTENDED/hunspell/hunspell.signatures.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "Signatures": { - "hunspell-1.7.0.tar.gz": "bb27b86eb910a8285407cf3ca33b62643a02798cf2eef468c0a74f6c3ee6bc8a" - } -} \ No newline at end of file diff --git a/SPECS-EXTENDED/php/php-5.6.3-datetests.patch b/SPECS-EXTENDED/php/php-5.6.3-datetests.patch deleted file mode 100644 index a29bb63638..0000000000 --- a/SPECS-EXTENDED/php/php-5.6.3-datetests.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/ext/date/tests/bug66985.phpt 2014-10-30 07:32:03.297693403 +0100 -+++ b/ext/date/tests/bug66985.phpt 2014-10-30 07:32:45.138877977 +0100 -@@ -3,7 +3,7 @@ - --FILE-- - 3 -- [timezone] => Factory --) --DateTimeZone Object --( - [timezone_type] => 3 - [timezone] => GB-Eire - ) diff --git a/SPECS-EXTENDED/php/php-7.4.14-gd.patch b/SPECS-EXTENDED/php/php-7.4.14-gd.patch deleted file mode 100644 index 7acdaf528c..0000000000 --- a/SPECS-EXTENDED/php/php-7.4.14-gd.patch +++ /dev/null @@ -1,56 +0,0 @@ -From b3646440b1808abf0874b6f89027ce53ec5da03f Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Mon, 13 Sep 2021 14:48:13 +0200 -Subject: [PATCH] Don't rely on libgd unused constants - ---- - ext/gd/gd.c | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/ext/gd/gd.c b/ext/gd/gd.c -index 3480699a..5368c2d4 100644 ---- a/ext/gd/gd.c -+++ b/ext/gd/gd.c -@@ -81,6 +81,11 @@ static int le_gd, le_gd_font; - #define M_PI 3.14159265358979323846 - #endif - -+/* don't used libgd constants, not used, so going to be removed */ -+#define PHP_GD_FLIP_HORIZONTAL 1 -+#define PHP_GD_FLIP_VERTICAL 2 -+#define PHP_GD_FLIP_BOTH 3 -+ - #ifdef HAVE_GD_FREETYPE - static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int, int); - #endif -@@ -1127,9 +1132,9 @@ PHP_MINIT_FUNCTION(gd) - /* GD2 image format types */ - REGISTER_LONG_CONSTANT("IMG_GD2_RAW", GD2_FMT_RAW, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT); -- REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", GD_FLIP_HORINZONTAL, CONST_CS | CONST_PERSISTENT); -- REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", GD_FLIP_VERTICAL, CONST_CS | CONST_PERSISTENT); -- REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", GD_FLIP_BOTH, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", PHP_GD_FLIP_HORIZONTAL, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", PHP_GD_FLIP_VERTICAL, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", PHP_GD_FLIP_BOTH, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMG_EFFECT_REPLACE", gdEffectReplace, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMG_EFFECT_ALPHABLEND", gdEffectAlphaBlend, CONST_CS | CONST_PERSISTENT); - REGISTER_LONG_CONSTANT("IMG_EFFECT_NORMAL", gdEffectNormal, CONST_CS | CONST_PERSISTENT); -@@ -4686,15 +4691,15 @@ PHP_FUNCTION(imageflip) - } - - switch (mode) { -- case GD_FLIP_VERTICAL: -+ case PHP_GD_FLIP_VERTICAL: - gdImageFlipVertical(im); - break; - -- case GD_FLIP_HORINZONTAL: -+ case PHP_GD_FLIP_HORIZONTAL: - gdImageFlipHorizontal(im); - break; - -- case GD_FLIP_BOTH: -+ case PHP_GD_FLIP_BOTH: - gdImageFlipBoth(im); - break; diff --git a/SPECS-EXTENDED/php/php-7.4.14.tar.xz.asc b/SPECS-EXTENDED/php/php-7.4.14.tar.xz.asc deleted file mode 100644 index 414e7bb96f..0000000000 --- a/SPECS-EXTENDED/php/php-7.4.14.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEWlKIB4H3VWCL+BX8kQ3rRvU+oxIFAl/0Q78ACgkQkQ3rRvU+ -oxKR2BAAq2058Q3ZKFKt3H2tB77Q+TZLUMIYdgtem3gZyfh2/UwzKxwUus3/iN68 -ad2txzdP9SimmW2eXkvc+PAOKgacTXenc7pioJVIfnXvE7GHrLQVq/dHBOZ+S3cH -0gOgA9Mu2ZGcPRYeDRIba+JR3t6QnblqxrKAMnCq7nCtYQt+S8ADD/exkLGOm7li -1qf2uLqIpi6cp7SYGJZYWEwoxBso5OUZ1jbCb7O2llxgEqeYIBd+4fY0RVLjtnzx -6sJLFp44pkh3WERaeZr8NAdqa2JGCvX1cj43R+TP8X9VF97RM+34EmhsFcp88wMq -Xcm/GMZWx8LVLyqNNPWKJ4BvzxNY0+lop9M4URASZR0Vowx3shLVOSUfwx6251Xg -riyPdWxkhSl2aqwn+IKfIKEVzinkvH+dzy/ujeVgA24aZkmyAk19Zs7R8jdBKl0F -fsw69PNoXlALobVV1gyr0Mi5/Q24rFialzm5uOFtDHmGt4DNSIVw9Z2x0qny8732 -rnTY4Vo1CtQobNLtoneoiGh5t3+TJDNY3Ip7CD2mJ+B/IULlTv9h4thQKJvvANea -SuqlKpq94hy68mYN0Jl1mBYcRRL5V40Tu+iDP1mSYjEFajEEcRuCl3fClMvERzHa -cAloXVJg72C4WaYUNi6FKsJFwIt1eqvBE28Sb3YYcyDTGeAZoPw= -=IrGd ------END PGP SIGNATURE----- diff --git a/SPECS-EXTENDED/php/php-7.4.8-phpinfo.patch b/SPECS-EXTENDED/php/php-7.4.8-phpinfo.patch deleted file mode 100644 index 9b7175e263..0000000000 --- a/SPECS-EXTENDED/php/php-7.4.8-phpinfo.patch +++ /dev/null @@ -1,76 +0,0 @@ - -Drop "Configure Command" from phpinfo as it doesn't -provide any useful information. -The available extensions are not related to this command. - -diff -up a/ext/standard/info.c.phpinfo v/ext/standard/info.c ---- a/ext/standard/info.c.phpinfo 2015-08-18 23:39:24.000000000 +0200 -+++ b/ext/standard/info.c 2015-08-22 07:56:18.344761928 +0200 -@@ -809,9 +809,6 @@ PHPAPI void php_print_info(int flag) - #ifdef ARCHITECTURE - php_info_print_table_row(2, "Architecture", ARCHITECTURE); - #endif --#ifdef CONFIGURE_COMMAND -- php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND ); --#endif - - if (sapi_module.pretty_name) { - php_info_print_table_row(2, "Server API", sapi_module.pretty_name ); -diff -up a/ext/standard/tests/general_functions/phpinfo.phpt.phpinfo b/ext/standard/tests/general_functions/phpinfo.phpt ---- a/ext/standard/tests/general_functions/phpinfo.phpt.phpinfo 2015-08-18 23:39:22.000000000 +0200 -+++ b/ext/standard/tests/general_functions/phpinfo.phpt 2015-08-22 07:56:18.344761928 +0200 -@@ -20,7 +20,6 @@ PHP Version => %s - - System => %s - Build Date => %s%a --Configure Command => %s - Server API => Command Line Interface - Virtual Directory Support => %s - Configuration File (php.ini) Path => %s - - -Backported from 8.0: - -From ad0d2e438fddc089917e71e5d8909d145db9da8a Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 3 Jul 2020 10:08:09 +0200 -Subject: [PATCH] display info about system used to build and its provider - ---- - configure.ac | 5 +++++ - ext/standard/info.c | 6 ++++++ - 2 files changed, 11 insertions(+) - -diff --git a/configure.ac b/configure.ac -index d9e6329314a3..77f12a55569a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1328,6 +1328,11 @@ PHP_UNAME=${PHP_UNAME:-$UNAME} - AC_DEFINE_UNQUOTED(PHP_UNAME,"$PHP_UNAME",[uname -a output]) - PHP_OS=`uname | xargs` - AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output]) -+PHP_BUILD_SYSTEM=${PHP_BUILD_SYSTEM:-$PHP_UNAME} -+AC_DEFINE_UNQUOTED(PHP_BUILD_SYSTEM,"$PHP_BUILD_SYSTEM",[builder uname output]) -+if test -n "${PHP_BUILD_PROVIDER}"; then -+ AC_DEFINE_UNQUOTED(PHP_BUILD_PROVIDER,"$PHP_BUILD_PROVIDER",[build provider]) -+fi - - PHP_SUBST_OLD(PHP_INSTALLED_SAPIS) - -diff --git a/ext/standard/info.c b/ext/standard/info.c -index 262e95ae2731..f652efd23657 100644 ---- a/ext/standard/info.c -+++ b/ext/standard/info.c -@@ -803,6 +803,12 @@ PHPAPI ZEND_COLD void php_print_info(int flag) - php_info_print_table_start(); - php_info_print_table_row(2, "System", ZSTR_VAL(php_uname)); - php_info_print_table_row(2, "Build Date", __DATE__ " " __TIME__); -+#ifdef PHP_BUILD_SYSTEM -+ php_info_print_table_row(2, "Build System", PHP_BUILD_SYSTEM); -+#endif -+#ifdef PHP_BUILD_PROVIDER -+ php_info_print_table_row(2, "Build Provider", PHP_BUILD_PROVIDER); -+#endif - #ifdef COMPILER - php_info_print_table_row(2, "Compiler", COMPILER); - #endif diff --git a/SPECS-EXTENDED/php/php-keyring.gpg b/SPECS-EXTENDED/php/php-keyring.gpg deleted file mode 100644 index 986f7f40b1..0000000000 --- a/SPECS-EXTENDED/php/php-keyring.gpg +++ /dev/null @@ -1,521 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -=bWxl ------END PGP PUBLIC KEY BLOCK----- diff --git a/SPECS-EXTENDED/php/php.ztsmodconf b/SPECS-EXTENDED/php/php.ztsmodconf deleted file mode 100644 index 38b2cd08ac..0000000000 --- a/SPECS-EXTENDED/php/php.ztsmodconf +++ /dev/null @@ -1,7 +0,0 @@ - - - - # ZTS module is not supported, so FPM is preferred - # LoadModule php7_module modules/libphp7-zts.so - - diff --git a/SPECS-EXTENDED/aspell/aspell-0.60.7-fileconflict.patch b/SPECS/aspell/aspell-0.60.7-fileconflict.patch similarity index 100% rename from SPECS-EXTENDED/aspell/aspell-0.60.7-fileconflict.patch rename to SPECS/aspell/aspell-0.60.7-fileconflict.patch diff --git a/SPECS-EXTENDED/aspell/aspell-0.60.7-mp.patch b/SPECS/aspell/aspell-0.60.7-mp.patch similarity index 100% rename from SPECS-EXTENDED/aspell/aspell-0.60.7-mp.patch rename to SPECS/aspell/aspell-0.60.7-mp.patch diff --git a/SPECS-EXTENDED/aspell/aspell-0.60.7-pspell_conf.patch b/SPECS/aspell/aspell-0.60.7-pspell_conf.patch similarity index 100% rename from SPECS-EXTENDED/aspell/aspell-0.60.7-pspell_conf.patch rename to SPECS/aspell/aspell-0.60.7-pspell_conf.patch diff --git a/SPECS/aspell/aspell-0.60.8-objstack.patch b/SPECS/aspell/aspell-0.60.8-objstack.patch new file mode 100644 index 0000000000..2f15d380ec --- /dev/null +++ b/SPECS/aspell/aspell-0.60.8-objstack.patch @@ -0,0 +1,96 @@ +From 0718b375425aad8e54e1150313b862e4c6fd324a Mon Sep 17 00:00:00 2001 +From: Kevin Atkinson +Date: Sat, 21 Dec 2019 20:32:47 +0000 +Subject: [PATCH] objstack: assert that the alloc size will fit within a chunk + to prevent a buffer overflow + +Bug found using OSS-Fuze. +--- + common/objstack.hpp | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +diff --git a/common/objstack.hpp b/common/objstack.hpp +index 3997bf7..bd97ccd 100644 +--- a/common/objstack.hpp ++++ b/common/objstack.hpp +@@ -5,6 +5,7 @@ + #include "parm_string.hpp" + #include + #include ++#include + + namespace acommon { + +@@ -26,6 +27,12 @@ class ObjStack + byte * temp_end; + void setup_chunk(); + void new_chunk(); ++ bool will_overflow(size_t sz) const { ++ return offsetof(Node,data) + sz > chunk_size; ++ } ++ void check_size(size_t sz) { ++ assert(!will_overflow(sz)); ++ } + + ObjStack(const ObjStack &); + void operator=(const ObjStack &); +@@ -56,7 +63,7 @@ class ObjStack + void * alloc_bottom(size_t size) { + byte * tmp = bottom; + bottom += size; +- if (bottom > top) {new_chunk(); tmp = bottom; bottom += size;} ++ if (bottom > top) {check_size(size); new_chunk(); tmp = bottom; bottom += size;} + return tmp; + } + // This alloc_bottom will insure that the object is aligned based on the +@@ -66,7 +73,7 @@ class ObjStack + align_bottom(align); + byte * tmp = bottom; + bottom += size; +- if (bottom > top) {new_chunk(); goto loop;} ++ if (bottom > top) {check_size(size); new_chunk(); goto loop;} + return tmp; + } + char * dup_bottom(ParmString str) { +@@ -79,7 +86,7 @@ class ObjStack + // always be aligned as such. + void * alloc_top(size_t size) { + top -= size; +- if (top < bottom) {new_chunk(); top -= size;} ++ if (top < bottom) {check_size(size); new_chunk(); top -= size;} + return top; + } + // This alloc_top will insure that the object is aligned based on +@@ -88,7 +95,7 @@ class ObjStack + {loop: + top -= size; + align_top(align); +- if (top < bottom) {new_chunk(); goto loop;} ++ if (top < bottom) {check_size(size); new_chunk(); goto loop;} + return top; + } + char * dup_top(ParmString str) { +@@ -117,6 +124,7 @@ class ObjStack + void * alloc_temp(size_t size) { + temp_end = bottom + size; + if (temp_end > top) { ++ check_size(size); + new_chunk(); + temp_end = bottom + size; + } +@@ -131,6 +139,7 @@ class ObjStack + } else { + size_t s = temp_end - bottom; + byte * p = bottom; ++ check_size(size); + new_chunk(); + memcpy(bottom, p, s); + temp_end = bottom + size; +@@ -150,6 +159,7 @@ class ObjStack + } else { + size_t s = temp_end - bottom; + byte * p = bottom; ++ check_size(size); + new_chunk(); + memcpy(bottom, p, s); + temp_end = bottom + size; diff --git a/SPECS-EXTENDED/aspell/aspell.signatures.json b/SPECS/aspell/aspell.signatures.json similarity index 100% rename from SPECS-EXTENDED/aspell/aspell.signatures.json rename to SPECS/aspell/aspell.signatures.json diff --git a/SPECS-EXTENDED/aspell/aspell.spec b/SPECS/aspell/aspell.spec similarity index 90% rename from SPECS-EXTENDED/aspell/aspell.spec rename to SPECS/aspell/aspell.spec index 47ec592134..2edca8754b 100644 --- a/SPECS-EXTENDED/aspell/aspell.spec +++ b/SPECS/aspell/aspell.spec @@ -1,25 +1,28 @@ -Summary: Spell checker -Name: aspell -Version: 0.60.8 -Release: 5%{?dist} +Summary: Spell checker +Name: aspell +Version: 0.60.8 +Release: 6%{?dist} # LGPLv2+ .. common/gettext.h # LGPLv2 .. modules/speller/default/phonet.hpp, # modules/speller/default/phonet.cpp, # modules/speller/default/affix.cpp # GPLv2+ .. ltmain.sh, misc/po-filter.c # BSD .. myspell/munch.c -License: LGPLv2+ and LGPLv2 and GPLv2+ and BSD +License: LGPLv2+ AND LGPLv2 AND GPLv2+ AND BSD Vendor: Microsoft Corporation Distribution: Mariner -URL: http://aspell.net/ -Source: ftp://ftp.gnu.org/gnu/aspell/aspell-%{version}.tar.gz - -Patch0: aspell-0.60.7-fileconflict.patch -Patch1: aspell-0.60.7-pspell_conf.patch -Patch2: aspell-0.60.7-mp.patch - -BuildRequires: gcc-c++ -BuildRequires: chrpath, gettext, ncurses-devel, pkgconfig, perl-interpreter +URL: http://aspell.net/ +Source: ftp://ftp.gnu.org/gnu/aspell/aspell-%{version}.tar.gz +Patch0: aspell-0.60.7-fileconflict.patch +Patch1: aspell-0.60.7-pspell_conf.patch +Patch2: aspell-0.60.7-mp.patch +Patch3: aspell-0.60.8-objstack.patch +BuildRequires: chrpath +BuildRequires: gcc-c++ +BuildRequires: gettext +BuildRequires: ncurses-devel +BuildRequires: perl-interpreter +BuildRequires: pkg-config %description GNU Aspell is a spell checker designed to eventually replace Ispell. It can @@ -32,9 +35,9 @@ dictionaries and intelligently handling personal dictionaries when more than one Aspell process is open at once. %package devel -Summary: Libraries and header files for Aspell development -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig +Summary: Libraries and header files for Aspell development +Requires: %{name} = %{version}-%{release} +Requires: pkg-config %description devel The aspell-devel package includes libraries @@ -45,6 +48,7 @@ and header files needed for Aspell development. %patch0 -p1 -b .fc %patch1 -p1 -b .mlib %patch2 -p1 -b .ai +%patch3 -p1 -b .obs iconv -f iso-8859-2 -t utf-8 < manual/aspell.info > manual/aspell.info.aux mv manual/aspell.info.aux manual/aspell.info @@ -59,32 +63,33 @@ cp manual/aspell-import.1 examples/aspell-import.1 %install %make_install -mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60 +mkdir -p %{buildroot}%{_libdir}/aspell-0.60 -mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/ispell ${RPM_BUILD_ROOT}%{_bindir} -mv ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/spell ${RPM_BUILD_ROOT}%{_bindir} +mv %{buildroot}%{_libdir}/aspell-0.60/ispell %{buildroot}%{_bindir} +mv %{buildroot}%{_libdir}/aspell-0.60/spell %{buildroot}%{_bindir} -chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//nroff-filter.so -chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//sgml-filter.so -chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//context-filter.so -chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//email-filter.so -chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//tex-filter.so -chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//texinfo-filter.so -chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60//markdown-filter.so -chrpath --delete ${RPM_BUILD_ROOT}%{_bindir}/aspell -chrpath --delete ${RPM_BUILD_ROOT}%{_libdir}/libpspell.so.* +chrpath --delete %{buildroot}%{_libdir}/aspell-0.60//nroff-filter.so +chrpath --delete %{buildroot}%{_libdir}/aspell-0.60//sgml-filter.so +chrpath --delete %{buildroot}%{_libdir}/aspell-0.60//context-filter.so +chrpath --delete %{buildroot}%{_libdir}/aspell-0.60//email-filter.so +chrpath --delete %{buildroot}%{_libdir}/aspell-0.60//tex-filter.so +chrpath --delete %{buildroot}%{_libdir}/aspell-0.60//texinfo-filter.so +chrpath --delete %{buildroot}%{_libdir}/aspell-0.60//markdown-filter.so +chrpath --delete %{buildroot}%{_bindir}/aspell +chrpath --delete %{buildroot}%{_libdir}/libpspell.so.* -rm -f ${RPM_BUILD_ROOT}%{_libdir}/libaspell.la -rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpspell.la -rm -f ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60/*-filter.la -rm -f ${RPM_BUILD_ROOT}%{_bindir}/aspell-import -rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/aspell-import.1 -rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir +rm -f %{buildroot}%{_libdir}/libaspell.la +rm -f %{buildroot}%{_libdir}/libpspell.la +rm -f %{buildroot}%{_libdir}/aspell-0.60/*-filter.la +rm -f %{buildroot}%{_bindir}/aspell-import +rm -f %{buildroot}%{_mandir}/man1/aspell-import.1 +rm -f %{buildroot}%{_infodir}/dir %find_lang %{name} %files -f %{name}.lang -%doc README TODO COPYING examples/aspell-import examples/aspell-import.1 +%license COPYING +%doc README TODO examples/aspell-import examples/aspell-import.1 %dir %{_libdir}/aspell-0.60 %{_bindir}/a* %{_bindir}/ispell @@ -111,6 +116,11 @@ rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir %{_mandir}/man1/pspell-config.1* %changelog +* Fri Oct 07 2022 Osama Esmail - 0.60.8-6 +- Moved from SPECS-EXTENDED to SPECS +- Added patch for CVE-2019-25051 +- License verified + * Mon Nov 01 2021 Muhammad Falak - 0.60.8-5 - Remove epoch @@ -322,7 +332,6 @@ rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir - add BuildRequires: ncurses-devel, gettext - add config script patch (thanks tmraz@redhat.com) - * Mon Mar 7 2005 Ivana Varekova 12:0.50.5-6 - rebuilt diff --git a/SPECS/docbook-dtds/LICENSE.PTR b/SPECS/docbook-dtds/LICENSE.PTR new file mode 100644 index 0000000000..7e7164617e --- /dev/null +++ b/SPECS/docbook-dtds/LICENSE.PTR @@ -0,0 +1,32 @@ +The source for this package does not include a copy of the license text. From the comments in 'docbook.dtd': + +" +Copyright 1992, 1993, 1994, 1995, 1996 HaL Computer Systems, Inc., +O'Reilly & Associates, Inc., ArborText, Inc., and Fujitsu Software +Corporation. + +Permission to use, copy, modify and distribute the DocBook DTD and +its accompanying documentation for any purpose and without fee is +hereby granted in perpetuity, provided that the above copyright +notice and this paragraph appear in all copies. The copyright +holders make no representation about the suitability of the DTD for +any purpose. It is provided "as is" without expressed or implied +warranty. + +If you modify the DocBook DTD in any way, except for declaring and +referencing additional sets of general entities and declaring +additional notations, label your DTD as a variant of DocBook. See +the maintenance documentation for more information. + +Please direct all questions, bug reports, or suggestions for +changes to the davenport@online.ora.com mailing list or to one of +the maintainers: + +o Terry Allen, Fujitsu Software Corporation +3055 Orchard Drive, San Jose, CA 95134 + + +o Eve Maler, ArborText Inc. +105 Lexington St., Burlington, MA 01803 + +" diff --git a/SPECS-EXTENDED/docbook-dtds/docbook-4.2-euro.patch b/SPECS/docbook-dtds/docbook-4.2-euro.patch similarity index 100% rename from SPECS-EXTENDED/docbook-dtds/docbook-4.2-euro.patch rename to SPECS/docbook-dtds/docbook-4.2-euro.patch diff --git a/SPECS-EXTENDED/docbook-dtds/docbook-dtd30-sgml-1.0.catalog.patch b/SPECS/docbook-dtds/docbook-dtd30-sgml-1.0.catalog.patch similarity index 100% rename from SPECS-EXTENDED/docbook-dtds/docbook-dtd30-sgml-1.0.catalog.patch rename to SPECS/docbook-dtds/docbook-dtd30-sgml-1.0.catalog.patch diff --git a/SPECS-EXTENDED/docbook-dtds/docbook-dtd31-sgml-1.0.catalog.patch b/SPECS/docbook-dtds/docbook-dtd31-sgml-1.0.catalog.patch similarity index 100% rename from SPECS-EXTENDED/docbook-dtds/docbook-dtd31-sgml-1.0.catalog.patch rename to SPECS/docbook-dtds/docbook-dtd31-sgml-1.0.catalog.patch diff --git a/SPECS-EXTENDED/docbook-dtds/docbook-dtd40-sgml-1.0.catalog.patch b/SPECS/docbook-dtds/docbook-dtd40-sgml-1.0.catalog.patch similarity index 100% rename from SPECS-EXTENDED/docbook-dtds/docbook-dtd40-sgml-1.0.catalog.patch rename to SPECS/docbook-dtds/docbook-dtd40-sgml-1.0.catalog.patch diff --git a/SPECS-EXTENDED/docbook-dtds/docbook-dtd41-sgml-1.0.catalog.patch b/SPECS/docbook-dtds/docbook-dtd41-sgml-1.0.catalog.patch similarity index 100% rename from SPECS-EXTENDED/docbook-dtds/docbook-dtd41-sgml-1.0.catalog.patch rename to SPECS/docbook-dtds/docbook-dtd41-sgml-1.0.catalog.patch diff --git a/SPECS-EXTENDED/docbook-dtds/docbook-dtd412-entities.patch b/SPECS/docbook-dtds/docbook-dtd412-entities.patch similarity index 100% rename from SPECS-EXTENDED/docbook-dtds/docbook-dtd412-entities.patch rename to SPECS/docbook-dtds/docbook-dtd412-entities.patch diff --git a/SPECS-EXTENDED/docbook-dtds/docbook-dtd42-sgml-1.0.catalog.patch b/SPECS/docbook-dtds/docbook-dtd42-sgml-1.0.catalog.patch similarity index 100% rename from SPECS-EXTENDED/docbook-dtds/docbook-dtd42-sgml-1.0.catalog.patch rename to SPECS/docbook-dtds/docbook-dtd42-sgml-1.0.catalog.patch diff --git a/SPECS-EXTENDED/docbook-dtds/docbook-dtds-ents.patch b/SPECS/docbook-dtds/docbook-dtds-ents.patch similarity index 100% rename from SPECS-EXTENDED/docbook-dtds/docbook-dtds-ents.patch rename to SPECS/docbook-dtds/docbook-dtds-ents.patch diff --git a/SPECS-EXTENDED/docbook-dtds/docbook-dtds.signatures.json b/SPECS/docbook-dtds/docbook-dtds.signatures.json similarity index 95% rename from SPECS-EXTENDED/docbook-dtds/docbook-dtds.signatures.json rename to SPECS/docbook-dtds/docbook-dtds.signatures.json index de2479d1b3..453e402314 100644 --- a/SPECS-EXTENDED/docbook-dtds/docbook-dtds.signatures.json +++ b/SPECS/docbook-dtds/docbook-dtds.signatures.json @@ -1,5 +1,6 @@ { "Signatures": { + "LICENSE.PTR": "8fca2153c27d7ce009a42e67c6c429da1bfcb812c9266cd45a0423654d887249", "docbk30.zip": "ecf71cbe8ddbad7494ff520d5b4edf73a428c0b159178cb0cb619cba685e61c6", "docbk31.zip": "20261d2771b9a052abfa3d8fab1aa62be05791a010281c566f9073bf0e644538", "docbk40.zip": "dfef22f109779e4cfaafa27b6d381d975ac05eaafb5b3d4407d7043e310817bb", diff --git a/SPECS-EXTENDED/docbook-dtds/docbook-dtds.spec b/SPECS/docbook-dtds/docbook-dtds.spec similarity index 78% rename from SPECS-EXTENDED/docbook-dtds/docbook-dtds.spec rename to SPECS/docbook-dtds/docbook-dtds.spec index 8db864934d..837b312b8d 100644 --- a/SPECS-EXTENDED/docbook-dtds/docbook-dtds.spec +++ b/SPECS/docbook-dtds/docbook-dtds.spec @@ -1,88 +1,83 @@ -Vendor: Microsoft Corporation -Distribution: Mariner %global openjadever 1.3.2 %global version_list "{3,4}.{0,1}-sgml 4.1.2-xml 4.{2,3,4,5}-{sgml,xml} 4.{2,3,4,5}-rng 4.{2,3,4,5}-xsd" %global catalog_list "{3,4}.{0,1}-sgml 4.1.2-xml 4.{2,3,4,5}-{sgml,xml}" %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} - -Name: docbook-dtds -Version: 1.0 -Release: 77%{?dist} - -Summary: SGML and XML document type definitions for DocBook - -License: Copyright only -URL: http://www.oasis-open.org/docbook/ - -Obsoletes: docbook-dtd30-sgml < %{version}-%{release} -Obsoletes: docbook-dtd31-sgml < %{version}-%{release} -Obsoletes: docbook-dtd40-sgml < %{version}-%{release} -Obsoletes: docbook-dtd41-sgml < %{version}-%{release} -Obsoletes: docbook-dtd412-xml < %{version}-%{release} -Provides: docbook-dtd-xml = %{version}-%{release} -Provides: docbook-dtd-sgml = %{version}-%{release} -Provides: docbook-dtd30-sgml = %{version}-%{release} -Provides: docbook-dtd31-sgml = %{version}-%{release} -Provides: docbook-dtd40-sgml = %{version}-%{release} -Provides: docbook-dtd41-sgml = %{version}-%{release} -Provides: docbook-dtd412-xml = %{version}-%{release} -Provides: docbook-dtd42-sgml = %{version}-%{release} -Provides: docbook-dtd42-xml = %{version}-%{release} -Provides: docbook-dtd43-sgml = %{version}-%{release} -Provides: docbook-dtd43-xml = %{version}-%{release} -Provides: docbook-dtd44-sgml = %{version}-%{release} -Provides: docbook-dtd44-xml = %{version}-%{release} -Provides: docbook-dtd45-sgml = %{version}-%{release} -Provides: docbook-dtd45-xml = %{version}-%{release} - -Requires(post): /usr/bin/xmlcatalog -Requires(postun): /usr/bin/xmlcatalog +Summary: SGML and XML document type definitions for DocBook +Name: docbook-dtds +Version: 1.0 +Release: 78%{?dist} +License: MIT With Advertising +Vendor: Microsoft Corporation +Distribution: Mariner +URL: https://www.oasis-open.org/docbook/ +Source0: https://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip +Source1: http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip +Source2: http://www.oasis-open.org/docbook/sgml/4.0/docbk40.zip +Source3: http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip +Source4: http://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip +Source5: http://www.oasis-open.org/docbook/sgml/4.2/docbook-4.2.zip +Source6: http://www.oasis-open.org/docbook/xml/4.2/docbook-xml-4.2.zip +Source7: http://www.docbook.org/sgml/4.3/docbook-4.3.zip +Source8: http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip +Source9: http://www.docbook.org/sgml/4.4/docbook-4.4.zip +Source10: http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip +Source11: http://www.docbook.org/sgml/4.5/docbook-4.5.zip +Source12: http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip +Source13: http://www.docbook.org/rng/4.2/docbook-rng-4.2.zip +Source14: http://www.docbook.org/rng/4.3/docbook-rng-4.3.zip +Source15: http://www.docbook.org/rng/4.4/docbook-rng-4.4.zip +#compressed from http://www.docbook.org/rng/4.5/ upstream archive unavailable +Source16: docbook-rng-4.5.zip +Source17: http://www.docbook.org/xsd/4.2/docbook-xsd-4.2.zip +Source18: http://www.docbook.org/xsd/4.3/docbook-xsd-4.3.zip +Source19: http://www.docbook.org/xsd/4.4/docbook-xsd-4.4.zip +#compressed from http://www.docbook.org/xsd/4.5/ upstream archive unavailable +Source20: docbook-xsd-4.5.zip +#license file +Source21: LICENSE.PTR +#fix old catalog files +Patch0: docbook-dtd30-sgml-1.0.catalog.patch +Patch1: docbook-dtd31-sgml-1.0.catalog.patch +Patch2: docbook-dtd40-sgml-1.0.catalog.patch +Patch3: docbook-dtd41-sgml-1.0.catalog.patch +Patch4: docbook-dtd42-sgml-1.0.catalog.patch +#fix euro sign in 4.2 dtds +Patch5: docbook-4.2-euro.patch +#Fix ISO entities in 4.3/4.4/4.5 SGML +Patch6: docbook-dtds-ents.patch +#Use system rewrite for web URL's in sgml catalogs to prevent reading from the network(#478680) +Patch7: docbook-sgml-systemrewrite.patch +#use XML at the end of public identificators of XML 4.1.2 ISO entities +Patch8: docbook-dtd412-entities.patch +BuildRequires: unzip +Requires: sgml-common +Requires: xml-common +Requires(post): %{_bindir}/xmlcatalog Requires(post): /bin/chmod Requires(post): sed +Requires(postun): %{_bindir}/xmlcatalog Requires(postun): sed -Requires: sgml-common -Requires: xml-common - - -BuildArch: noarch -Source0: http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip -Source1: http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip -Source2: http://www.oasis-open.org/docbook/sgml/4.0/docbk40.zip -Source3: http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip -Source4: http://www.oasis-open.org/docbook/xml/4.1.2/docbkx412.zip -Source5: http://www.oasis-open.org/docbook/sgml/4.2/docbook-4.2.zip -Source6: http://www.oasis-open.org/docbook/xml/4.2/docbook-xml-4.2.zip -Source7: http://www.docbook.org/sgml/4.3/docbook-4.3.zip -Source8: http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip -Source9: http://www.docbook.org/sgml/4.4/docbook-4.4.zip -Source10: http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip -Source11: http://www.docbook.org/sgml/4.5/docbook-4.5.zip -Source12: http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip -Source13: http://www.docbook.org/rng/4.2/docbook-rng-4.2.zip -Source14: http://www.docbook.org/rng/4.3/docbook-rng-4.3.zip -Source15: http://www.docbook.org/rng/4.4/docbook-rng-4.4.zip -#compressed from http://www.docbook.org/rng/4.5/ upstream archive unavailable -Source16: docbook-rng-4.5.zip -Source17: http://www.docbook.org/xsd/4.2/docbook-xsd-4.2.zip -Source18: http://www.docbook.org/xsd/4.3/docbook-xsd-4.3.zip -Source19: http://www.docbook.org/xsd/4.4/docbook-xsd-4.4.zip -#compressed from http://www.docbook.org/xsd/4.5/ upstream archive unavailable -Source20: docbook-xsd-4.5.zip -#fix old catalog files -Patch0: docbook-dtd30-sgml-1.0.catalog.patch -Patch1: docbook-dtd31-sgml-1.0.catalog.patch -Patch2: docbook-dtd40-sgml-1.0.catalog.patch -Patch3: docbook-dtd41-sgml-1.0.catalog.patch -Patch4: docbook-dtd42-sgml-1.0.catalog.patch -#fix euro sign in 4.2 dtds -Patch5: docbook-4.2-euro.patch -#Fix ISO entities in 4.3/4.4/4.5 SGML -Patch6: docbook-dtds-ents.patch -#Use system rewrite for web URL's in sgml catalogs to prevent reading from the network(#478680) -Patch7: docbook-sgml-systemrewrite.patch -#use XML at the end of public identificators of XML 4.1.2 ISO entities -Patch8: docbook-dtd412-entities.patch -BuildRequires: unzip +Obsoletes: docbook-dtd30-sgml < %{version}-%{release} +Obsoletes: docbook-dtd31-sgml < %{version}-%{release} +Obsoletes: docbook-dtd40-sgml < %{version}-%{release} +Obsoletes: docbook-dtd41-sgml < %{version}-%{release} +Obsoletes: docbook-dtd412-xml < %{version}-%{release} +Provides: docbook-dtd-xml = %{version}-%{release} +Provides: docbook-dtd-sgml = %{version}-%{release} +Provides: docbook-dtd30-sgml = %{version}-%{release} +Provides: docbook-dtd31-sgml = %{version}-%{release} +Provides: docbook-dtd40-sgml = %{version}-%{release} +Provides: docbook-dtd41-sgml = %{version}-%{release} +Provides: docbook-dtd412-xml = %{version}-%{release} +Provides: docbook-dtd42-sgml = %{version}-%{release} +Provides: docbook-dtd42-xml = %{version}-%{release} +Provides: docbook-dtd43-sgml = %{version}-%{release} +Provides: docbook-dtd43-xml = %{version}-%{release} +Provides: docbook-dtd44-sgml = %{version}-%{release} +Provides: docbook-dtd44-xml = %{version}-%{release} +Provides: docbook-dtd45-sgml = %{version}-%{release} +Provides: docbook-dtd45-xml = %{version}-%{release} +BuildArch: noarch %description The DocBook Document Type Definition (DTD) describes the syntax of @@ -90,32 +85,31 @@ technical documentation texts (articles, books and manual pages). This syntax is XML-compliant and is developed by the OASIS consortium. This package contains SGML and XML versions of the DocBook DTD. - %prep -%setup -c -T +%setup -q -c -T eval mkdir %{version_list} # DocBook V3.0 cd 3.0-sgml unzip %{SOURCE0} -%patch0 -p0 -b docbook.cat +%patch0 -b docbook.cat cd .. # DocBook V3.1 cd 3.1-sgml unzip %{SOURCE1} -%patch1 -p0 -b docbook.cat +%patch1 -b docbook.cat cd .. # DocBook V4.0 cd 4.0-sgml unzip %{SOURCE2} -%patch2 -p0 -b docbook.cat +%patch2 -b docbook.cat cd .. # DocBook V4.1 cd 4.1-sgml unzip %{SOURCE3} -%patch3 -p0 -b docbook.cat +%patch3 -b docbook.cat cd .. # DocBook XML V4.1.2 @@ -126,7 +120,7 @@ cd .. # DocBook V4.2 cd 4.2-sgml unzip %{SOURCE5} -%patch4 -p0 -b docbook.cat +%patch4 -b docbook.cat cd .. # DocBook XML V4.2 @@ -233,13 +227,14 @@ fi %install -rm -rf $RPM_BUILD_ROOT + +cp %{SOURCE21} . # Symlinks -mkdir -p $RPM_BUILD_ROOT/etc/sgml +mkdir -p %{buildroot}%{_sysconfdir}/sgml for fmt in sgml xml; do ln -s $fmt-docbook-4.5.cat \ - $RPM_BUILD_ROOT/etc/sgml/$fmt-docbook.cat + %{buildroot}%{_sysconfdir}/sgml/$fmt-docbook.cat done eval set %{version_list} @@ -248,10 +243,10 @@ do cd $dir fmt=${dir#*-} ver=${dir%%-*} case $fmt in - sgml) DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-dtd-$ver ;; - xml) DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-dtd-$ver ;; - rng) DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-$ver ;; - xsd) DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-$ver ;; + sgml) DESTDIR=%{buildroot}%{_datadir}/sgml/docbook/$fmt-dtd-$ver ;; + xml) DESTDIR=%{buildroot}%{_datadir}/sgml/docbook/$fmt-dtd-$ver ;; + rng) DESTDIR=%{buildroot}%{_datadir}/sgml/docbook/$fmt-$ver ;; + xsd) DESTDIR=%{buildroot}%{_datadir}/sgml/docbook/$fmt-$ver ;; esac case $fmt in sgml) mkdir -p $DESTDIR ; install *.dcl $DESTDIR ;; @@ -267,49 +262,50 @@ for dir do cd $dir fmt=${dir#*-} ver=${dir%%-*} - DESTDIR=$RPM_BUILD_ROOT/usr/share/sgml/docbook/$fmt-dtd-$ver + DESTDIR=%{buildroot}%{_datadir}/sgml/docbook/$fmt-dtd-$ver install *.dtd *.mod $DESTDIR install docbook.cat $DESTDIR/catalog cd .. # File for %%ghost - touch $RPM_BUILD_ROOT/etc/sgml/$fmt-docbook-$ver.cat + touch %{buildroot}%{_sysconfdir}/sgml/$fmt-docbook-$ver.cat done #workaround the missing support for --parents hack in rpm 4.11+ -mkdir -p $RPM_BUILD_ROOT%{_pkgdocdir} +mkdir -p %{buildroot}%{_pkgdocdir} for i in */*.txt */ChangeLog */README do - cp -pr --parents $i $RPM_BUILD_ROOT%{_pkgdocdir} + cp -pr --parents $i %{buildroot}%{_pkgdocdir} done %files +%license LICENSE.PTR #in upstream tarballs there is a lot of files with 0755 permissions #but they don't need to be, 0644 is enough for every file in tarball %{_pkgdocdir} -/usr/share/sgml/docbook/*ml-dtd-* -/usr/share/sgml/docbook/rng-* -/usr/share/sgml/docbook/xsd-* -%config(noreplace) /etc/sgml/*ml-docbook.cat -%ghost %config(noreplace) /etc/sgml/*ml-docbook-*.cat +%{_datadir}/sgml/docbook/*ml-dtd-* +%{_datadir}/sgml/docbook/rng-* +%{_datadir}/sgml/docbook/xsd-* +%config(noreplace) %{_sysconfdir}/sgml/*ml-docbook.cat +%ghost %config(noreplace) %{_sysconfdir}/sgml/*ml-docbook-*.cat %post -catcmd='/usr/bin/xmlcatalog --noout' -xmlcatalog=/usr/share/sgml/docbook/xmlcatalog +catcmd='%{_bindir}/xmlcatalog --noout' +xmlcatalog=%{_datadir}/sgml/docbook/xmlcatalog ## Clean up pre-docbook-dtds mess caused by broken trigger. for v in 3.0 3.1 4.0 4.1 4.2 do - if [ -f /etc/sgml/sgml-docbook-$v.cat ] + if [ -f %{_sysconfdir}/sgml/sgml-docbook-$v.cat ] then - $catcmd --sgml --del /etc/sgml/sgml-docbook-$v.cat \ - /usr/share/sgml/openjade-1.3.1/catalog 2>/dev/null + $catcmd --sgml --del %{_sysconfdir}/sgml/sgml-docbook-$v.cat \ + %{_datadir}/sgml/openjade-1.3.1/catalog 2>/dev/null fi done # The STYLESHEETS/catalog command is for the case in which the style sheets # were installed after another DTD but before this DTD -for STYLESHEETS in /usr/share/sgml/docbook/dsssl-stylesheets-*; do : ; done +for STYLESHEETS in %{_datadir}/sgml/docbook/dsssl-stylesheets-*; do : ; done case $STYLESHEETS in *-"*") STYLESHEETS= ;; esac @@ -317,11 +313,11 @@ eval set %{catalog_list} for dir do fmt=${dir#*-} ver=${dir%%-*} - sgmldir=/usr/share/sgml/docbook/$fmt-dtd-$ver + sgmldir=%{_datadir}/sgml/docbook/$fmt-dtd-$ver ## SGML catalog # Update the centralized catalog corresponding to this version of the DTD - for cat_dir in /usr/share/sgml/sgml-iso-entities-8879.1986 $sgmldir $STYLESHEETS; do - $catcmd --sgml --add /etc/sgml/$fmt-docbook-$ver.cat $cat_dir/catalog + for cat_dir in %{_datadir}/sgml/sgml-iso-entities-8879.1986 $sgmldir $STYLESHEETS; do + $catcmd --sgml --add %{_sysconfdir}/sgml/$fmt-docbook-$ver.cat $cat_dir/catalog done ## XML catalog if [ $fmt = xml -a -w $xmlcatalog ]; then @@ -386,16 +382,16 @@ sed -ni ' s/^ //p } - ' /etc/sgml/catalog + ' %{_sysconfdir}/sgml/catalog # Finally, make sure everything in /etc/sgml is readable! -chmod a+r /etc/sgml/* +chmod a+r %{_sysconfdir}/sgml/* %postun # remove entries only on removal of package if [ "$1" = 0 ]; then - catcmd='/usr/bin/xmlcatalog --noout' - xmlcatalog=/usr/share/sgml/docbook/xmlcatalog + catcmd='%{_bindir}/xmlcatalog --noout' + xmlcatalog=%{_datadir}/sgml/docbook/xmlcatalog entities=" ent/iso-pub.ent ent/iso-grk1.ent @@ -429,11 +425,11 @@ ent/iso-cyr2.ent for dir do fmt=${dir#*-} ver=${dir%%-*} - sgmldir=/usr/share/sgml/docbook/$fmt-dtd-$ver + sgmldir=%{_datadir}/sgml/docbook/$fmt-dtd-$ver ## SGML catalog # Update the centralized catalog corresponding to this version of the DTD - $catcmd --sgml --del /etc/sgml/catalog /etc/sgml/$fmt-docbook-$ver.cat >/dev/null - rm -f /etc/sgml/$fmt-docbook-$ver.cat + $catcmd --sgml --del %{_sysconfdir}/sgml/catalog %{_sysconfdir}/sgml/$fmt-docbook-$ver.cat >/dev/null + rm -f %{_sysconfdir}/sgml/$fmt-docbook-$ver.cat ## XML catalog if [ $fmt = xml -a -w $xmlcatalog ]; then for f in $entities; do @@ -453,7 +449,7 @@ ent/iso-cyr2.ent s/^ //p } - ' /etc/sgml/catalog + ' %{_sysconfdir}/sgml/catalog fi %triggerin -- openjade >= %{openjadever} @@ -461,8 +457,8 @@ eval set %{catalog_list} for dir do fmt=${dir#*-} ver=${dir%%-*} - /usr/bin/xmlcatalog --sgml --noout --add /etc/sgml/$fmt-docbook-$ver.cat \ - /usr/share/sgml/openjade-%{openjadever}/catalog + %{_bindir}/xmlcatalog --sgml --noout --add %{_sysconfdir}/sgml/$fmt-docbook-$ver.cat \ + %{_datadir}/sgml/openjade-%{openjadever}/catalog done %triggerun -- openjade >= %{openjadever} @@ -471,11 +467,15 @@ eval set %{catalog_list} for dir do fmt=${dir#*-} ver=${dir%%-*} - /usr/bin/xmlcatalog --sgml --noout --del /etc/sgml/$fmt-docbook-$ver.cat \ - /usr/share/sgml/openjade-%{openjadever}/catalog + %{_bindir}/xmlcatalog --sgml --noout --del %{_sysconfdir}/sgml/$fmt-docbook-$ver.cat \ + %{_datadir}/sgml/openjade-%{openjadever}/catalog done - %changelog +* Fri Sep 16 2022 Osama Esmail - 1.0-78 +- Moved from SPECS-EXTENDED to SPECS +- License verified +- Updated source URL + * Mon Nov 01 2021 Muhammad Falak - 1.0-77 - Remove epoch diff --git a/SPECS-EXTENDED/docbook-dtds/docbook-sgml-systemrewrite.patch b/SPECS/docbook-dtds/docbook-sgml-systemrewrite.patch similarity index 100% rename from SPECS-EXTENDED/docbook-dtds/docbook-sgml-systemrewrite.patch rename to SPECS/docbook-dtds/docbook-sgml-systemrewrite.patch diff --git a/SPECS/docbook-style-dsssl/LICENSE.PTR b/SPECS/docbook-style-dsssl/LICENSE.PTR new file mode 100644 index 0000000000..4ae9c77d51 --- /dev/null +++ b/SPECS/docbook-style-dsssl/LICENSE.PTR @@ -0,0 +1,53 @@ +The source for this package does not include a copy of the license text. From the comments in 'README': + +" +Copyright +--------- + +Copyright (C) 1997-2001 Norman Walsh + +The original inspiration for these stylesheets came from the +work of Jon Bosak, Anders Berglund, Tony Graham, Terry Allen, +James Clark, and many others. I am indebted to them and to the +community of users on dssslist@mulberrytech.com for making +substantial contributions to this work and for answering my many +questions. + +This software may be distributed under the same terms as Jade: + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the ``Software''), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +Except as contained in this notice, the names of individuals +credited with contribution to this software shall not be used in +advertising or otherwise to promote the sale, use or other +dealings in this Software without prior written authorization +from the individuals in question. + +Any stylesheet derived from this Software that is publically +distributed will be identified with a different name and the +version strings in any derived Software will be changed so that +no possibility of confusion between the derived package and this +Software will exist. + +Warranty +-------- + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER +CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +" \ No newline at end of file diff --git a/SPECS-EXTENDED/docbook-style-dsssl/docbook-style-dsssl.Makefile b/SPECS/docbook-style-dsssl/docbook-style-dsssl.Makefile similarity index 100% rename from SPECS-EXTENDED/docbook-style-dsssl/docbook-style-dsssl.Makefile rename to SPECS/docbook-style-dsssl/docbook-style-dsssl.Makefile diff --git a/SPECS-EXTENDED/docbook-style-dsssl/docbook-style-dsssl.signatures.json b/SPECS/docbook-style-dsssl/docbook-style-dsssl.signatures.json similarity index 72% rename from SPECS-EXTENDED/docbook-style-dsssl/docbook-style-dsssl.signatures.json rename to SPECS/docbook-style-dsssl/docbook-style-dsssl.signatures.json index ac068eaab4..45428669f9 100644 --- a/SPECS-EXTENDED/docbook-style-dsssl/docbook-style-dsssl.signatures.json +++ b/SPECS/docbook-style-dsssl/docbook-style-dsssl.signatures.json @@ -1,5 +1,6 @@ { "Signatures": { + "LICENSE.PTR": "db70d4b9d5666648eff6e57328ab1f7a32646700fde77e9f97c06fa8017d7a17", "docbook-dsssl-1.79.tar.gz": "d5a199024a5fe0862bfaff9e3533817cd8d08bddf3cdfb5bfe6088cbb2cd62b3", "docbook-style-dsssl.Makefile": "563662f6a3a0777f1ac037a0aebcfcdf7e9c8a8d3e042e69a33edffc0bcae1f1" } diff --git a/SPECS-EXTENDED/docbook-style-dsssl/docbook-style-dsssl.spec b/SPECS/docbook-style-dsssl/docbook-style-dsssl.spec similarity index 87% rename from SPECS-EXTENDED/docbook-style-dsssl/docbook-style-dsssl.spec rename to SPECS/docbook-style-dsssl/docbook-style-dsssl.spec index 7c1fbee84b..4687991529 100644 --- a/SPECS-EXTENDED/docbook-style-dsssl/docbook-style-dsssl.spec +++ b/SPECS/docbook-style-dsssl/docbook-style-dsssl.spec @@ -1,25 +1,22 @@ +Summary: Norman Walsh's modular stylesheets for DocBook +Name: docbook-style-dsssl +Version: 1.79 +Release: 31%{?dist} +License: MIT WITH Advertising Vendor: Microsoft Corporation Distribution: Mariner -Name: docbook-style-dsssl -Version: 1.79 -Release: 30%{?dist} - -Summary: Norman Walsh's modular stylesheets for DocBook - -License: DMIT -URL: http://docbook.sourceforge.net/ -BuildRequires: perl-generators - -Requires: docbook-dtds -Requires: openjade -Requires: sgml-common +URL: https://docbook.sourceforge.net/ +Source0: http://prdownloads.sourceforge.net/docbook/docbook-dsssl-%{version}.tar.gz +Source1: %{name}.Makefile +#license file +Source2: LICENSE.PTR +BuildRequires: perl-generators +Requires: docbook-dtds +Requires: openjade +Requires: sgml-common Requires(post): sgml-common Requires(preun): sgml-common - -BuildArch: noarch -Source0: http://prdownloads.sourceforge.net/docbook/docbook-dsssl-%{version}.tar.gz -Source1: %{name}.Makefile - +BuildArch: noarch %description These DSSSL stylesheets allow to convert any DocBook document to another @@ -34,38 +31,42 @@ cp %{SOURCE1} Makefile %build %install -DESTDIR=$RPM_BUILD_ROOT +cp %{SOURCE2} . + +DESTDIR=%{buildroot} make install BINDIR=$DESTDIR/usr/bin DESTDIR=$DESTDIR/usr/share/sgml/docbook/dsssl-stylesheets-%{version} MANDIR=$DESTDIR%{_mandir} cd .. ln -s dsssl-stylesheets-%{version} $DESTDIR/usr/share/sgml/docbook/dsssl-stylesheets %files +%license LICENSE.PTR %doc BUGS README ChangeLog WhatsNew -/usr/bin/collateindex.pl +%{_bindir}/collateindex.pl %{_mandir}/man1/collateindex.pl.1* -/usr/share/sgml/docbook/dsssl-stylesheets-%{version} -/usr/share/sgml/docbook/dsssl-stylesheets - +%{_datadir}/sgml/docbook/dsssl-stylesheets-%{version} +%{_datadir}/sgml/docbook/dsssl-stylesheets %post -for centralized in /etc/sgml/*-docbook-*.cat +for centralized in %{_sysconfdir}/sgml/*-docbook-*.cat do - /usr/bin/install-catalog --add $centralized \ - /usr/share/sgml/docbook/dsssl-stylesheets-%{version}/catalog \ + %{_bindir}/install-catalog --add $centralized \ + %{_datadir}/sgml/docbook/dsssl-stylesheets-%{version}/catalog \ > /dev/null 2>/dev/null done - %preun if [ "$1" = "0" ]; then - for centralized in /etc/sgml/*-docbook-*.cat + for centralized in %{_sysconfdir}/sgml/*-docbook-*.cat do - /usr/bin/install-catalog --remove $centralized /usr/share/sgml/docbook/dsssl-stylesheets-%{version}/catalog > /dev/null 2>/dev/null + %{_bindir}/install-catalog --remove $centralized %{_datadir}/sgml/docbook/dsssl-stylesheets-%{version}/catalog > /dev/null 2>/dev/null done fi exit 0 - %changelog +* Fri Sep 16 2022 Osama Esmail - 1.79-31 +- Moved from SPECS-EXTENDED to SPECS +- License verified + * Fri Oct 15 2021 Pawel Winogrodzki - 1.79-30 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/enchant2/enchant2.signatures.json b/SPECS/enchant2/enchant2.signatures.json similarity index 100% rename from SPECS-EXTENDED/enchant2/enchant2.signatures.json rename to SPECS/enchant2/enchant2.signatures.json diff --git a/SPECS-EXTENDED/enchant2/enchant2.spec b/SPECS/enchant2/enchant2.spec similarity index 97% rename from SPECS-EXTENDED/enchant2/enchant2.spec rename to SPECS/enchant2/enchant2.spec index 3a8be7e139..84f7c28e81 100644 --- a/SPECS-EXTENDED/enchant2/enchant2.spec +++ b/SPECS/enchant2/enchant2.spec @@ -1,7 +1,7 @@ Summary: An Enchanting Spell Checking Library Name: enchant2 Version: 2.2.14 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Vendor: Microsoft Corporation Distribution: Mariner @@ -10,7 +10,6 @@ Source0: https://github.com/AbiWord/enchant/releases/download/v%{version} # Look for aspell using pkg-config, instead of AC_CHECK_LIB which adds -laspell # to the global LIBS and over-links libenchant (#1574893) Patch0: enchant_aspell.patch - BuildRequires: aspell-devel BuildRequires: autoconf BuildRequires: automake @@ -20,7 +19,6 @@ BuildRequires: hunspell-devel BuildRequires: libtool BuildRequires: libvoikko-devel BuildRequires: make - Provides: bundled(gnulib) %description @@ -28,7 +26,6 @@ A library that wraps other spell checking backends. %package aspell Summary: Integration with aspell for libenchant - Requires: enchant2%{?_isa} = %{version}-%{release} %description aspell @@ -36,9 +33,7 @@ Libraries necessary to integrate applications using libenchant with aspell. %package voikko Summary: Integration with voikko for libenchant - Requires: enchant2%{?_isa} = %{version}-%{release} - Supplements: (enchant2 and langpacks-fi) %description voikko @@ -46,7 +41,6 @@ Libraries necessary to integrate applications using libenchant with voikko. %package devel Summary: Development files for %{name} - Requires: enchant2%{?_isa} = %{version}-%{release} Requires: glib2-devel @@ -99,6 +93,9 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_includedir}/enchant-2 %changelog +* Fri Sep 16 2022 Osama Esmail - 2.2.14-4 +- Moved from SPECS-EXTENDED to SPECS + * Mon Apr 18 2022 Pawel Winogrodzki - 2.2.14-3 - License verified. diff --git a/SPECS-EXTENDED/enchant2/enchant_aspell.patch b/SPECS/enchant2/enchant_aspell.patch similarity index 100% rename from SPECS-EXTENDED/enchant2/enchant_aspell.patch rename to SPECS/enchant2/enchant_aspell.patch diff --git a/SPECS-EXTENDED/freetds/freetds-tds_sysdep_public.h b/SPECS/freetds/freetds-tds_sysdep_public.h similarity index 100% rename from SPECS-EXTENDED/freetds/freetds-tds_sysdep_public.h rename to SPECS/freetds/freetds-tds_sysdep_public.h diff --git a/SPECS-EXTENDED/freetds/freetds.signatures.json b/SPECS/freetds/freetds.signatures.json similarity index 100% rename from SPECS-EXTENDED/freetds/freetds.signatures.json rename to SPECS/freetds/freetds.signatures.json diff --git a/SPECS-EXTENDED/freetds/freetds.spec b/SPECS/freetds/freetds.spec similarity index 87% rename from SPECS-EXTENDED/freetds/freetds.spec rename to SPECS/freetds/freetds.spec index f7e5474b30..8bc195603e 100644 --- a/SPECS-EXTENDED/freetds/freetds.spec +++ b/SPECS/freetds/freetds.spec @@ -1,35 +1,33 @@ +%define bits %{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32} +Summary: Implementation of the TDS (Tabular DataStream) protocol +Name: freetds +Version: 1.1.20 +Release: 4%{?dist} +License: LGPLv2+ AND GPLv2+ Vendor: Microsoft Corporation Distribution: Mariner -%define bits %{?__isa_bits:%{__isa_bits}}%{!?__isa_bits:32} +URL: https://www.freetds.org/ +Source0: ftp://ftp.freetds.org/pub/freetds/stable/freetds-%{version}.tar.bz2 +Source1: freetds-tds_sysdep_public.h +BuildRequires: docbook-style-dsssl +BuildRequires: doxygen +BuildRequires: gnutls-devel +BuildRequires: krb5-devel +BuildRequires: libgcrypt-devel +BuildRequires: libtool +BuildRequires: readline-devel +BuildRequires: unixODBC-devel +Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Name: freetds -Summary: Implementation of the TDS (Tabular DataStream) protocol -Version: 1.1.20 -Release: 3%{?dist} -License: LGPLv2+ and GPLv2+ -URL: http://www.freetds.org/ - -Source0: ftp://ftp.freetds.org/pub/freetds/stable/freetds-%{version}.tar.bz2 -Source1: freetds-tds_sysdep_public.h - -BuildRequires: unixODBC-devel, readline-devel, gnutls-devel, krb5-devel -BuildRequires: libgcrypt-devel -BuildRequires: libtool -BuildRequires: doxygen, docbook-style-dsssl - -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - - -%description +%description FreeTDS is a project to document and implement the TDS (Tabular DataStream) protocol. TDS is used by Sybase(TM) and Microsoft(TM) for client to database server communications. FreeTDS includes call level interfaces for DB-Lib, CT-Lib, and ODBC. - %package libs -Summary: Libraries for %{name} -Requires: %{name} = %{version}-%{release} +Summary: Libraries for %{name} +Requires: %{name} = %{version}-%{release} %description libs FreeTDS is a project to document and implement the TDS (Tabular @@ -38,37 +36,34 @@ client to database server communications. FreeTDS includes call level interfaces for DB-Lib, CT-Lib, and ODBC. This package contains the libraries for %{name}. - %package devel -Summary: Header files and development libraries for %{name} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Summary: Header files and development libraries for %{name} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel This package contains the header files and development libraries for %{name}. If you like to develop programs using %{name}, you will need to install %{name}-devel. - %package doc -Summary: Development documentation for %{name} -BuildArch: noarch +Summary: Development documentation for %{name} +BuildArch: noarch %description doc This package contains the development documentation for %{name}. If you like to develop programs using %{name}, you will need to install %{name}-doc. - -%prep +%prep %setup -q # correct perl path -sed -i '1 s,#!.*/perl,#!%{__perl},' samples/*.pl +sed -i '1 s,#!.*/perl,#!perl,' samples/*.pl chmod -x samples/*.sh -%build +%build [ -f configure ] || NOCONFIGURE=yes ./autogen.sh @@ -88,20 +83,19 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_RIE|' libtool -make %{?_smp_mflags} DOCBOOK_DSL="`rpm -ql docbook-style-dsssl | fgrep html/docbook.dsl`" +make %{?_smp_mflags} DOCBOOK_DSL="`rpm -ql docbook-style-dsssl | grep -F html/docbook.dsl`" - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +%install -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la -chmod -x $RPM_BUILD_ROOT%{_sysconfdir}/* +make install DESTDIR=%{buildroot} -mv -f $RPM_BUILD_ROOT%{_includedir}/tds_sysdep_public.h \ - $RPM_BUILD_ROOT%{_includedir}/tds_sysdep_public_%{bits}.h -install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/tds_sysdep_public.h +find %{buildroot} -type f -name "*.la" -delete -print +chmod -x %{buildroot}%{_sysconfdir}/* + +mv -f %{buildroot}%{_includedir}/tds_sysdep_public.h \ + %{buildroot}%{_includedir}/tds_sysdep_public_%{bits}.h +install -p -m 644 %{SOURCE1} %{buildroot}%{_includedir}/tds_sysdep_public.h rm -f samples/Makefile* samples/*.in samples/README @@ -112,41 +106,42 @@ mkdir samples-odbc mv -f samples/*odbc* samples-odbc # deinstall it for our own way... -mv -f $RPM_BUILD_ROOT%{_docdir}/%{name} docdir +mv -f %{buildroot}%{_docdir}/%{name} docdir find docdir -type f -print0 | xargs -0 chmod -x %ldconfig_scriptlets libs -%files +%files %{_bindir}/* -%doc AUTHORS BUGS COPYING NEWS README TODO doc/*.html +%license COPYING +%doc AUTHORS BUGS NEWS README TODO doc/*.html %doc docdir/userguide docdir/images %{_mandir}/man1/* - %files libs -%doc COPYING.LIB +%license COPYING.LIB %{_libdir}/*.so.* %{_libdir}/libtdsodbc.so %doc samples-odbc %config(noreplace) %{_sysconfdir}/*.conf %{_mandir}/man5/* - -%files devel +%files devel %doc samples %{_libdir}/*.so %exclude %{_libdir}/libtdsodbc.so %{_includedir}/* - %files doc %doc docdir/reference - %changelog +* Fri Sep 16 2022 Osama Esmail - 1.1.20-4 +- Moved from SPECS-EXTENDED to SPECS +- License verified + * Fri Oct 15 2021 Pawel Winogrodzki - 1.1.20-3 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/hunspell-en/en_GB-singleletters.patch b/SPECS/hunspell-en/en_GB-singleletters.patch similarity index 100% rename from SPECS-EXTENDED/hunspell-en/en_GB-singleletters.patch rename to SPECS/hunspell-en/en_GB-singleletters.patch diff --git a/SPECS-EXTENDED/hunspell-en/en_GB.etc.patch b/SPECS/hunspell-en/en_GB.etc.patch similarity index 100% rename from SPECS-EXTENDED/hunspell-en/en_GB.etc.patch rename to SPECS/hunspell-en/en_GB.etc.patch diff --git a/SPECS-EXTENDED/hunspell-en/en_GB.two_initial_caps.patch b/SPECS/hunspell-en/en_GB.two_initial_caps.patch similarity index 100% rename from SPECS-EXTENDED/hunspell-en/en_GB.two_initial_caps.patch rename to SPECS/hunspell-en/en_GB.two_initial_caps.patch diff --git a/SPECS-EXTENDED/hunspell-en/en_IE.supplemental.patch b/SPECS/hunspell-en/en_IE.supplemental.patch similarity index 100% rename from SPECS-EXTENDED/hunspell-en/en_IE.supplemental.patch rename to SPECS/hunspell-en/en_IE.supplemental.patch diff --git a/SPECS-EXTENDED/hunspell-en/en_US-strippedabbrevs.patch b/SPECS/hunspell-en/en_US-strippedabbrevs.patch similarity index 100% rename from SPECS-EXTENDED/hunspell-en/en_US-strippedabbrevs.patch rename to SPECS/hunspell-en/en_US-strippedabbrevs.patch diff --git a/SPECS-EXTENDED/hunspell-en/hunspell-en-GB-LICENSE.txt b/SPECS/hunspell-en/hunspell-en-GB-LICENSE.txt similarity index 100% rename from SPECS-EXTENDED/hunspell-en/hunspell-en-GB-LICENSE.txt rename to SPECS/hunspell-en/hunspell-en-GB-LICENSE.txt diff --git a/SPECS-EXTENDED/hunspell-en/hunspell-en-SI_and_IEC.patch b/SPECS/hunspell-en/hunspell-en-SI_and_IEC.patch similarity index 100% rename from SPECS-EXTENDED/hunspell-en/hunspell-en-SI_and_IEC.patch rename to SPECS/hunspell-en/hunspell-en-SI_and_IEC.patch diff --git a/SPECS-EXTENDED/hunspell-en/hunspell-en-US-LICENSE.txt b/SPECS/hunspell-en/hunspell-en-US-LICENSE.txt similarity index 100% rename from SPECS-EXTENDED/hunspell-en/hunspell-en-US-LICENSE.txt rename to SPECS/hunspell-en/hunspell-en-US-LICENSE.txt diff --git a/SPECS-EXTENDED/hunspell-en/hunspell-en-allow-non-typographical.marks.patch b/SPECS/hunspell-en/hunspell-en-allow-non-typographical.marks.patch similarity index 100% rename from SPECS-EXTENDED/hunspell-en/hunspell-en-allow-non-typographical.marks.patch rename to SPECS/hunspell-en/hunspell-en-allow-non-typographical.marks.patch diff --git a/SPECS-EXTENDED/hunspell-en/hunspell-en-calender.patch b/SPECS/hunspell-en/hunspell-en-calender.patch similarity index 100% rename from SPECS-EXTENDED/hunspell-en/hunspell-en-calender.patch rename to SPECS/hunspell-en/hunspell-en-calender.patch diff --git a/SPECS-EXTENDED/hunspell-en/hunspell-en-dont-call-git-during-build.patch b/SPECS/hunspell-en/hunspell-en-dont-call-git-during-build.patch similarity index 100% rename from SPECS-EXTENDED/hunspell-en/hunspell-en-dont-call-git-during-build.patch rename to SPECS/hunspell-en/hunspell-en-dont-call-git-during-build.patch diff --git a/SPECS-EXTENDED/hunspell-en/hunspell-en-fixbuild.patch b/SPECS/hunspell-en/hunspell-en-fixbuild.patch similarity index 100% rename from SPECS-EXTENDED/hunspell-en/hunspell-en-fixbuild.patch rename to SPECS/hunspell-en/hunspell-en-fixbuild.patch diff --git a/SPECS-EXTENDED/hunspell-en/hunspell-en.signatures.json b/SPECS/hunspell-en/hunspell-en.signatures.json similarity index 100% rename from SPECS-EXTENDED/hunspell-en/hunspell-en.signatures.json rename to SPECS/hunspell-en/hunspell-en.signatures.json diff --git a/SPECS-EXTENDED/hunspell-en/hunspell-en.spec b/SPECS/hunspell-en/hunspell-en.spec similarity index 85% rename from SPECS-EXTENDED/hunspell-en/hunspell-en.spec rename to SPECS/hunspell-en/hunspell-en.spec index 7f2694220f..293485687e 100644 --- a/SPECS-EXTENDED/hunspell-en/hunspell-en.spec +++ b/SPECS/hunspell-en/hunspell-en.spec @@ -1,67 +1,71 @@ -Name: hunspell-en -Summary: English hunspell dictionaries %global upstreamid 20140811.1 -Version: 0.%{upstreamid} -Release: 17%{?dist} -Source0: https://github.com/en-wl/wordlist/archive/rel-2014.08.11.1.tar.gz -Source1: http://download.services.openoffice.org/contrib/dictionaries/en_GB.zip -Source2: %{name}-US-LICENSE.txt -Source3: %{name}-GB-LICENSE.txt -#See http://mxr.mozilla.org/mozilla/source/extensions/spellcheck/locales/en-US/hunspell/mozilla_words.diff?raw=1 -Patch0: mozilla_words.patch -Patch1: en_GB-singleletters.patch -Patch2: en_GB.two_initial_caps.patch -#See http://sourceforge.net/tracker/?func=detail&aid=2355344&group_id=10079&atid=1014602 -#filter removes words with "." in them -Patch3: en_US-strippedabbrevs.patch -#See https://sourceforge.net/tracker/?func=detail&aid=2987192&group_id=143754&atid=756397 -#to allow "didn't" instead of suggesting change to typographical apostrophe -Patch4: hunspell-en-allow-non-typographical.marks.patch -#See https://sourceforge.net/tracker/?func=detail&aid=3012183&group_id=10079&atid=1014602 -#See https://bugzilla.redhat.com/show_bug.cgi?id=619577 add SI and IEC prefixes -Patch5: hunspell-en-SI_and_IEC.patch -#See https://sourceforge.net/tracker/?func=detail&aid=3175662&group_id=10079&atid=1014602 obscure Calender hides misspelling of Calendar -Patch6: hunspell-en-calender.patch -#valid English words that are archaic or rare in en-GB but not in en-IE -Patch7: en_IE.supplemental.patch -#call git to get the release hash, but this is a tarball -Patch8: hunspell-en-dont-call-git-during-build.patch -#fix build -Patch9: hunspell-en-fixbuild.patch -#rhbz#1492306 for better or worse treat etc the same in US and GB -Patch10: en_GB.etc.patch -#rhbz#1494968 perl tightened up regex rules -Patch11: perl.regex.patch -URL: http://wordlist.sourceforge.net/ +Summary: English hunspell dictionaries +Name: hunspell-en +Version: 0.%{upstreamid} +Release: 18%{?dist} # README_en_GB.txt has specified just LGPL which mean LGPLv2+ # scowl/speller/aspell/en_affix.dat is BSD # scowl/speller/aspell/en_phonet.dat is LGPLv2 -License: LGPLv2+ and LGPLv2 and BSD +License: LGPLv2+ AND LGPLv2 AND BSD Vendor: Microsoft Corporation Distribution: Mariner -BuildArch: noarch -BuildRequires: aspell, zip, dos2unix, perl-Getopt-Long, gcc-c++ -Requires: hunspell -Requires: hunspell-en-US = %{version}-%{release} -Requires: hunspell-en-GB = %{version}-%{release} -Supplements: (hunspell and langpacks-en) +URL: https://wordlist.sourceforge.net/ +Source0: https://github.com/en-wl/wordlist/archive/rel-2014.08.11.1.tar.gz +Source1: http://download.services.openoffice.org/contrib/dictionaries/en_GB.zip +Source2: %{name}-US-LICENSE.txt +Source3: %{name}-GB-LICENSE.txt +#See http://mxr.mozilla.org/mozilla/source/extensions/spellcheck/locales/en-US/hunspell/mozilla_words.diff?raw=1 +Patch0: mozilla_words.patch +Patch1: en_GB-singleletters.patch +Patch2: en_GB.two_initial_caps.patch +#See http://sourceforge.net/tracker/?func=detail&aid=2355344&group_id=10079&atid=1014602 +#filter removes words with "." in them +Patch3: en_US-strippedabbrevs.patch +#See https://sourceforge.net/tracker/?func=detail&aid=2987192&group_id=143754&atid=756397 +#to allow "didn't" instead of suggesting change to typographical apostrophe +Patch4: hunspell-en-allow-non-typographical.marks.patch +#See https://sourceforge.net/tracker/?func=detail&aid=3012183&group_id=10079&atid=1014602 +#See https://bugzilla.redhat.com/show_bug.cgi?id=619577 add SI and IEC prefixes +Patch5: hunspell-en-SI_and_IEC.patch +#See https://sourceforge.net/tracker/?func=detail&aid=3175662&group_id=10079&atid=1014602 obscure Calender hides misspelling of Calendar +Patch6: hunspell-en-calender.patch +#valid English words that are archaic or rare in en-GB but not in en-IE +Patch7: en_IE.supplemental.patch +#call git to get the release hash, but this is a tarball +Patch8: hunspell-en-dont-call-git-during-build.patch +#fix build +Patch9: hunspell-en-fixbuild.patch +#rhbz#1492306 for better or worse treat etc the same in US and GB +Patch10: en_GB.etc.patch +#rhbz#1494968 perl tightened up regex rules +Patch11: perl.regex.patch +BuildRequires: aspell +BuildRequires: dos2unix +BuildRequires: gcc-c++ +BuildRequires: perl-Getopt-Long +BuildRequires: zip +Requires: hunspell +Requires: hunspell-en-GB = %{version}-%{release} +Requires: hunspell-en-US = %{version}-%{release} +Supplements: (hunspell and langpacks-en) +BuildArch: noarch %description English (US, UK, etc.) hunspell dictionaries %package US -Requires: hunspell -Summary: US English hunspell dictionaries -License: BSD and LGPLv2 +Summary: US English hunspell dictionaries +License: BSD AND LGPLv2 +Requires: hunspell %description US US English hunspell dictionaries %package GB -Requires: hunspell -Supplements: (hunspell and langpacks-en_GB) -Summary: UK English hunspell dictionaries -License: LGPLv2+ +Summary: UK English hunspell dictionaries +License: LGPLv2+ +Requires: hunspell +Supplements: (hunspell and langpacks-en_GB) %description GB UK English hunspell dictionaries @@ -69,12 +73,12 @@ UK English hunspell dictionaries %prep %setup -q -n wordlist-rel-2014.08.11.1 %setup -q -T -D -a 1 -n wordlist-rel-2014.08.11.1 -%patch0 -p0 -b .mozilla +%patch0 -b .mozilla %patch1 -p1 -b .singleletters %patch2 -p1 -b .two_initial_cap -%patch3 -p0 -b .strippedabbrevs -%patch4 -p0 -b .allow-non-typographical -%patch5 -p0 -b .SI_and_IEC +%patch3 -b .strippedabbrevs +%patch4 -b .allow-non-typographical +%patch5 -b .SI_and_IEC %patch6 -p1 -b .calender %patch7 -p1 -b .en_IE %patch8 -p1 -b .nogit @@ -100,12 +104,12 @@ for i in README_en_CA.txt README_en_US.txt; do done %install -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell -cp -p en_??.dic en_??.aff $RPM_BUILD_ROOT/%{_datadir}/myspell +mkdir -p %{buildroot}/%{_datadir}/myspell +cp -p en_??.dic en_??.aff %{buildroot}/%{_datadir}/myspell cd scowl/speller -cp -p en_??.dic en_??.aff $RPM_BUILD_ROOT/%{_datadir}/myspell +cp -p en_??.dic en_??.aff %{buildroot}/%{_datadir}/myspell -pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/ +pushd %{buildroot}/%{_datadir}/myspell/ en_GB_aliases="en_AG en_AU en_BS en_BW en_BZ en_DK en_GH en_HK en_IE en_IN en_JM en_MW en_NA en_NG en_NZ en_SG en_TT en_ZA en_ZM en_ZW" for lang in $en_GB_aliases; do ln -s en_GB.aff $lang.aff @@ -136,6 +140,10 @@ popd %{_datadir}/myspell/en_GB.* %changelog +* Fri Sep 16 2022 Osama Esmail - 0.20140811.1-18 +- Moved from SPECS-EXTENDED to SPECS +- License verified + * Fri Oct 15 2021 Pawel Winogrodzki - 0.20140811.1-17 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/hunspell-en/mozilla_words.patch b/SPECS/hunspell-en/mozilla_words.patch similarity index 100% rename from SPECS-EXTENDED/hunspell-en/mozilla_words.patch rename to SPECS/hunspell-en/mozilla_words.patch diff --git a/SPECS-EXTENDED/hunspell-en/perl.regex.patch b/SPECS/hunspell-en/perl.regex.patch similarity index 100% rename from SPECS-EXTENDED/hunspell-en/perl.regex.patch rename to SPECS/hunspell-en/perl.regex.patch diff --git a/SPECS/hunspell/hunspell.signatures.json b/SPECS/hunspell/hunspell.signatures.json new file mode 100644 index 0000000000..b8b96a5e9e --- /dev/null +++ b/SPECS/hunspell/hunspell.signatures.json @@ -0,0 +1,5 @@ +{ + "Signatures": { + "hunspell-1.7.1.tar.gz": "b2d9c5369c2cc7f321cb5983fda2dbf007dce3d9e17519746840a6f0c4bf7444" + } +} \ No newline at end of file diff --git a/SPECS-EXTENDED/hunspell/hunspell.spec b/SPECS/hunspell/hunspell.spec similarity index 91% rename from SPECS-EXTENDED/hunspell/hunspell.spec rename to SPECS/hunspell/hunspell.spec index 2bdd81c2e7..6bd3d334dc 100644 --- a/SPECS-EXTENDED/hunspell/hunspell.spec +++ b/SPECS/hunspell/hunspell.spec @@ -1,56 +1,55 @@ %define double_profiling_build 1 - -Name: hunspell -Summary: A spell checker and morphological analyzer library -Version: 1.7.0 -Release: 7%{?dist} -Source0: https://github.com/hunspell/hunspell/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -URL: https://github.com/hunspell/hunspell -License: (LGPLv2+ or GPLv2+ or MPLv1.1) and BSD +Summary: A spell checker and morphological analyzer library +Name: hunspell +Version: 1.7.1 +Release: 1%{?dist} +License: LGPLv2+ OR GPLv2+ OR MPLv1.1 Vendor: Microsoft Corporation Distribution: Mariner +URL: https://github.com/hunspell/hunspell +Source0: https://github.com/hunspell/hunspell/releases/download/v%{version}/hunspell-%{version}.tar.gz +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gcc-c++ -BuildRequires: autoconf, automake, libtool, ncurses-devel, gettext -BuildRequires: perl-generators +BuildRequires: gettext +BuildRequires: libtool +BuildRequires: ncurses-devel +BuildRequires: perl-generators +Requires: hunspell-en-US %ifarch %{ix86} x86_64 -BuildRequires: valgrind +BuildRequires: valgrind %endif %if %{double_profiling_build} -BuildRequires: words +BuildRequires: words %endif -Requires: hunspell-en-US - -Patch0: 0001-invalid-read-memory-access-624.patch -Patch1: hunspell-1.7.0-print-format.patch %description -Hunspell is a spell checker and morphological analyzer library and program -designed for languages with rich morphology and complex word compounding or -character encoding. Hunspell interfaces: Ispell-like terminal interface using +Hunspell is a spell checker and morphological analyzer library and program +designed for languages with rich morphology and complex word compounding or +character encoding. Hunspell interfaces: Ispell-like terminal interface using Curses library, Ispell pipe interface, LibreOffice UNO module. %package devel -Requires: hunspell = %{version}-%{release}, pkgconfig -Summary: Files for developing with hunspell +Summary: Files for developing with hunspell +Requires: hunspell = %{version}-%{release} +Requires: pkg-config %description devel Includes and definitions for developing with hunspell %prep %setup -q -%patch0 -p1 -b .CVE-2019-16707 -%patch1 -p2 %build autoreconf -vfi configureflags="--disable-rpath --disable-static --with-ui --with-readline" %define profilegenerate \ - CFLAGS="${RPM_OPT_FLAGS} -fprofile-generate"\ - CXXFLAGS="${RPM_OPT_FLAGS} -fprofile-generate" + CFLAGS="%{optflags} -fprofile-generate"\ + CXXFLAGS="%{optflags} -fprofile-generate" %define profileuse \ - CFLAGS="${RPM_OPT_FLAGS} -fprofile-use"\ - CXXFLAGS="${RPM_OPT_FLAGS} -fprofile-use" + CFLAGS="%{optflags} -fprofile-use"\ + CXXFLAGS="%{optflags} -fprofile-use" %if !%{double_profiling_build} %configure $configureflags @@ -59,14 +58,14 @@ make %{?_smp_mflags} #Generate a word list to use for profiling, take half of it to ensure #that the original word list is then considered to contain correctly #and incorrectly spelled words -head -n $((`cat /usr/share/dict/words | wc -l`/2)) /usr/share/dict/words |\ +head -n $((`cat %{_datadir}/dict/words | wc -l`/2)) %{_datadir}/dict/words |\ sed '/\//d'> words #generate profiling %{profilegenerate} %configure $configureflags make %{?_smp_mflags} ./src/tools/affixcompress words > /dev/null 2>&1 -./src/tools/hunspell -d words -l /usr/share/dict/words > /dev/null +./src/tools/hunspell -d words -l %{_datadir}/dict/words > /dev/null make check make distclean @@ -74,7 +73,6 @@ make distclean %{profileuse} %configure $configureflags make %{?_smp_mflags} %endif -cd po && make %{?_smp_mflags} update-gmo && cd .. %check %ifarch %{ix86} x86_64 @@ -83,17 +81,16 @@ make check %endif %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install -rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a -rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la -mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell +make DESTDIR=%{buildroot} install +rm -f %{buildroot}/%{_libdir}/*.a +find %{buildroot} -type f -name "*.la" -delete -print +mkdir %{buildroot}/%{_datadir}/myspell %find_lang %{name} %ldconfig_scriptlets %files -f %{name}.lang -%license COPYING COPYING.LESSER COPYING.MPL license.hunspell license.myspell +%license COPYING COPYING.LESSER COPYING.MPL license.hunspell license.myspell %doc README AUTHORS THANKS %{_libdir}/*.so.* %{_datadir}/myspell @@ -122,6 +119,11 @@ mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell %{_mandir}/man5/hunspell.5.gz %changelog +* Mon Oct 10 2022 Osama Esmail - 1.7.1-1 +- Moved from SPECS-EXTENDED to SPECS +- Upgraded from 1.7.0 to 1.7.1 to address CVE-2019-16707 +- Removed patches + * Wed Jun 22 2022 Riken Maharjan - 1.7.0-7 - Patch for the print format issue. - License verified diff --git a/SPECS/libreswan/libreswan.spec b/SPECS/libreswan/libreswan.spec index 38e0956dac..2f242e0072 100644 --- a/SPECS/libreswan/libreswan.spec +++ b/SPECS/libreswan/libreswan.spec @@ -26,18 +26,16 @@ Summary: Internet Key Exchange (IKEv1 and IKEv2) implementation for IPsec Name: libreswan Version: 4.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Vendor: Microsoft Corporation Distribution: Mariner Group: System Environment/Libraries Url: https://libreswan.org/ Source0: https://github.com/libreswan/libreswan/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -%if %{with_check} Source3: https://download.libreswan.org/cavs/ikev1_dsa.fax.bz2 Source4: https://download.libreswan.org/cavs/ikev1_psk.fax.bz2 Source5: https://download.libreswan.org/cavs/ikev2.fax.bz2 -%endif BuildRequires: audit-libs-devel BuildRequires: bison @@ -195,6 +193,9 @@ certutil -N -d sql:$tmpdir --empty-password %doc %{_mandir}/*/* %changelog +* Tue Oct 11 2022 Osama Esmail - 4.7-4 +- Removed with_check macro + * Mon Jul 25 2022 Rachel Menge - 4.7-3 - Move from SPECS-EXTENDED to SPECS diff --git a/SPECS-EXTENDED/libvoikko/libvoikko.signatures.json b/SPECS/libvoikko/libvoikko.signatures.json similarity index 100% rename from SPECS-EXTENDED/libvoikko/libvoikko.signatures.json rename to SPECS/libvoikko/libvoikko.signatures.json diff --git a/SPECS-EXTENDED/libvoikko/libvoikko.spec b/SPECS/libvoikko/libvoikko.spec similarity index 96% rename from SPECS-EXTENDED/libvoikko/libvoikko.spec rename to SPECS/libvoikko/libvoikko.spec index a291f8199a..65836fcc4e 100644 --- a/SPECS-EXTENDED/libvoikko/libvoikko.spec +++ b/SPECS/libvoikko/libvoikko.spec @@ -1,17 +1,15 @@ -Vendor: Microsoft Corporation -Distribution: Mariner +Summary: Voikko is a library for spellcheckers and hyphenators Name: libvoikko Version: 4.1.1 -Release: 7%{?dist} -Summary: Voikko is a library for spellcheckers and hyphenators - +Release: 8%{?dist} License: GPLv2+ -URL: http://voikko.puimula.org +Vendor: Microsoft Corporation +Distribution: Mariner +URL: https://voikko.puimula.org # The usual format of stable release URLs Source0: http://www.puimula.org/voikko-sources/%{name}/%{name}-%{version}.tar.gz # The usual format of test release URLs #Source0: http://www.puimula.org/htp/testing/%%{name}-%%{version}rc1.tar.gz - BuildRequires: gcc-c++ BuildRequires: python3-devel # Require the Finnish morphology because Finnish is currently the only language @@ -33,7 +31,7 @@ Hunspell. %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: pkgconfig +Requires: pkg-config %description devel The %{name}-devel package contains libraries and header files for @@ -49,10 +47,10 @@ tools for testing libvoikko. These tools may also be useful for shell scripts. %package -n python3-libvoikko +%{?python_provide:%python_provide python3-libvoikko} Summary: Python interface to %{name} Requires: %{name} = %{version}-%{release} BuildArch: noarch -%{?python_provide:%python_provide python3-libvoikko} %description -n python3-libvoikko Python interface to libvoikko, library of Finnish language tools. @@ -75,19 +73,20 @@ make %{?_smp_mflags} CXXFLAGS="$CXXFLAGS" %install -make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +make install INSTALL="install -p" DESTDIR=%{buildroot} +find %{buildroot} -type f -name "*.la" -delete -print # Remove static archive -find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' +find %{buildroot} -name '*.a' -exec rm -f {} ';' # Install the Python interface -install -d $RPM_BUILD_ROOT%{python3_sitelib} -install -pm 0644 python/libvoikko.py $RPM_BUILD_ROOT%{python3_sitelib}/ +install -d %{buildroot}%{python3_sitelib} +install -pm 0644 python/libvoikko.py %{buildroot}%{python3_sitelib}/ %ldconfig_scriptlets %files -%doc ChangeLog COPYING README +%license COPYING +%doc ChangeLog README %{_libdir}/*.so.* %files -n voikko-tools @@ -108,6 +107,10 @@ install -pm 0644 python/libvoikko.py $RPM_BUILD_ROOT%{python3_sitelib}/ %{python3_sitelib}/__pycache__/* %changelog +* Fri Sep 16 2022 Osama Esmail - 4.1.1-8 +- Moved from SPECS-EXTENDED to SPECS +- License verified + * Fri Oct 15 2021 Pawel Winogrodzki - 4.1.1-7 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/malaga-suomi-voikko/make-it-work-with-python-3.patch b/SPECS/malaga-suomi-voikko/make-it-work-with-python-3.patch similarity index 100% rename from SPECS-EXTENDED/malaga-suomi-voikko/make-it-work-with-python-3.patch rename to SPECS/malaga-suomi-voikko/make-it-work-with-python-3.patch diff --git a/SPECS-EXTENDED/malaga-suomi-voikko/malaga-suomi-voikko.signatures.json b/SPECS/malaga-suomi-voikko/malaga-suomi-voikko.signatures.json similarity index 100% rename from SPECS-EXTENDED/malaga-suomi-voikko/malaga-suomi-voikko.signatures.json rename to SPECS/malaga-suomi-voikko/malaga-suomi-voikko.signatures.json diff --git a/SPECS-EXTENDED/malaga-suomi-voikko/malaga-suomi-voikko.spec b/SPECS/malaga-suomi-voikko/malaga-suomi-voikko.spec similarity index 96% rename from SPECS-EXTENDED/malaga-suomi-voikko/malaga-suomi-voikko.spec rename to SPECS/malaga-suomi-voikko/malaga-suomi-voikko.spec index 79bb67abf2..58e3948752 100644 --- a/SPECS-EXTENDED/malaga-suomi-voikko/malaga-suomi-voikko.spec +++ b/SPECS/malaga-suomi-voikko/malaga-suomi-voikko.spec @@ -1,25 +1,22 @@ -Vendor: Microsoft Corporation -Distribution: Mariner +# debuginfo would be empty +%define debug_package %{nil} +Summary: A description of Finnish morphology written in Malaga (Voikko edition) Name: malaga-suomi-voikko Version: 1.19 -Release: 12%{?dist} -Summary: A description of Finnish morphology written in Malaga (Voikko edition) - +Release: 13%{?dist} License: GPLv2+ -URL: http://voikko.puimula.org +Vendor: Microsoft Corporation +Distribution: Mariner +URL: https://voikko.puimula.org # The usual format of stable release source URLs Source0: http://www.puimula.org/voikko-sources/suomi-malaga/suomi-malaga-%{version}.tar.gz # The usual format of testing release source URLs #Source0: http://www.puimula.org/htp/testing/suomi-malaga-%{version}rc3.tar.gz # Patch source: https://src.fedoraproject.org/rpms/malaga-suomi-voikko/blob/a482a6ed75da65c726598e6dffb44f24c36560e1/f/make-it-work-with-python3.patch Patch0: make-it-work-with-python-3.patch - BuildRequires: malaga >= 7.8 BuildRequires: python3-devel -# debuginfo would be empty -%define debug_package %{nil} - %description A description of Finnish morphology written in Malaga. This package is built to support the Voikko spellchecker/hyphenator, it doesn't support the Sukija @@ -34,19 +31,22 @@ make %{?_smp_mflags} voikko PYTHON="%{python3}" %install -rm -rf $RPM_BUILD_ROOT # Files differ on big-endian and small-endian archs, and they have different # names (*_l vs *_b). This is the reason we use %%{_libdir} instead of # %%{_datadir} and won't noarch the package. -make voikko-install DESTDIR=$RPM_BUILD_ROOT%{_libdir}/voikko +make voikko-install DESTDIR=%{buildroot}%{_libdir}/voikko %files -%doc ChangeLog CONTRIBUTORS COPYING README README.fi +%license COPYING +%doc ChangeLog CONTRIBUTORS README README.fi %{_libdir}/voikko - %changelog +* Fri Sep 16 2022 Osama Esmail - 1.19-13 +- Moved from SPECS-EXTENDED to SPECS +- License verified + * Fri May 28 2021 Thomas Crain - 1.19-12 - Initial CBL-Mariner import from Fedora 32 (license: MIT). - Build with python3 instead of python2 diff --git a/SPECS-EXTENDED/malaga/disable_gtk2.patch b/SPECS/malaga/disable_gtk2.patch similarity index 100% rename from SPECS-EXTENDED/malaga/disable_gtk2.patch rename to SPECS/malaga/disable_gtk2.patch diff --git a/SPECS-EXTENDED/malaga/malaga-aarch64.patch b/SPECS/malaga/malaga-aarch64.patch similarity index 100% rename from SPECS-EXTENDED/malaga/malaga-aarch64.patch rename to SPECS/malaga/malaga-aarch64.patch diff --git a/SPECS-EXTENDED/malaga/malaga-malshow-lm.patch b/SPECS/malaga/malaga-malshow-lm.patch similarity index 100% rename from SPECS-EXTENDED/malaga/malaga-malshow-lm.patch rename to SPECS/malaga/malaga-malshow-lm.patch diff --git a/SPECS-EXTENDED/malaga/malaga-rename-map_file.diff b/SPECS/malaga/malaga-rename-map_file.patch similarity index 100% rename from SPECS-EXTENDED/malaga/malaga-rename-map_file.diff rename to SPECS/malaga/malaga-rename-map_file.patch diff --git a/SPECS-EXTENDED/malaga/malaga.signatures.json b/SPECS/malaga/malaga.signatures.json similarity index 100% rename from SPECS-EXTENDED/malaga/malaga.signatures.json rename to SPECS/malaga/malaga.signatures.json diff --git a/SPECS-EXTENDED/malaga/malaga.spec b/SPECS/malaga/malaga.spec similarity index 91% rename from SPECS-EXTENDED/malaga/malaga.spec rename to SPECS/malaga/malaga.spec index 1baca2cb93..48ac0db7bc 100644 --- a/SPECS-EXTENDED/malaga/malaga.spec +++ b/SPECS/malaga/malaga.spec @@ -1,31 +1,28 @@ +Summary: A programming language for automatic language analysis +Name: malaga +Version: 7.12 +Release: 32%{?dist} +License: GPLv2+ Vendor: Microsoft Corporation Distribution: Mariner -Name: malaga -Version: 7.12 -Release: 31%{?dist} -Summary: A programming language for automatic language analysis - -License: GPLv2+ -URL: http://home.arcor.de/bjoern-beutel/malaga/ -Source0: http://home.arcor.de/bjoern-beutel/malaga/%{name}-%{version}.tgz +URL: https://dynalabs.de/mxp/malaga/ +Source0: https://dynalabs.de/mxp/assets/malaga-7.12.tgz # Fix map_file symbol conflict with samba. Upstream can be considered # inactive but as libvoikko >= 2.2 doesn't use libmalaga anymore, these kind # of problems won't probably come up. The only executables in Fedora which # link to libmalaga currently are the malaga tools. -Patch0: malaga-rename-map_file.diff +Patch0: malaga-rename-map_file.patch # Malshow needs to be linked with -lm as Fedora's ld doesn't do implicit # linking anymore Patch1: malaga-malshow-lm.patch Patch2: malaga-aarch64.patch - # Disable linking with gtk2 Patch3: disable_gtk2.patch - BuildRequires: gcc -BuildRequires: readline-devel BuildRequires: glib-devel +BuildRequires: readline-devel BuildRequires: texinfo -Requires: lib%{name} = %{version}-%{release} +Requires: lib%{name} = %{version}-%{release} %description A software package for the development and application of @@ -52,7 +49,6 @@ Summary: Library files for %{name} %description -n lib%{name} Library files for %{name}. - %prep %setup -q %patch0 -p1 @@ -68,8 +64,8 @@ sed -i.silent -e 's|--silent||' Makefile.in %build %configure --with-readline -cp /usr/bin/install-info /usr/sbin/ -export PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin" +cp %{_bindir}/install-info %{_sbindir}/ +export PATH="%{_prefix}/local/sbin:%{_prefix}/local/bin:/sbin:/bin:%{_prefix}/sbin:%{_prefix}/bin:/root/bin" # Remove rpath, # https://fedoraproject.org/wiki/Packaging/Guidelines#Removing_Rpath sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool @@ -78,14 +74,13 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT INSTALL_INFO=/usr/bin/install-info INSTALL="install -p" -rm -f $RPM_BUILD_ROOT%{_infodir}/dir -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +make install DESTDIR=%{buildroot} INSTALL_INFO=%{_bindir}/install-info INSTALL="install -p" +rm -f %{buildroot}%{_infodir}/dir +find %{buildroot} -type f -name "*.la" -delete -print # Remove static archive -find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' +find %{buildroot} -name '*.a' -exec rm -f {} ';' # Change permission of libmalaga.so* -chmod 0755 $RPM_BUILD_ROOT%{_libdir}/libmalaga.so* +chmod 0755 %{buildroot}%{_libdir}/libmalaga.so* @@ -105,8 +100,12 @@ chmod 0755 $RPM_BUILD_ROOT%{_libdir}/libmalaga.so* %{_libdir}/lib%{name}*.so %{_includedir}/malaga.h - %changelog +* Fri Sep 16 2022 Osama Esmail - 7.12-32 +- Moved from SPECS-EXTENDED to SPECS +- License verified +- Updated source URL + * Fri Apr 30 2021 Pawel Winogrodzki - 7.12-31 - Making binaries paths compatible with CBL-Mariner's paths. diff --git a/SPECS-EXTENDED/openjade/config.guess b/SPECS/openjade/config.guess similarity index 100% rename from SPECS-EXTENDED/openjade/config.guess rename to SPECS/openjade/config.guess diff --git a/SPECS-EXTENDED/openjade/config.sub b/SPECS/openjade/config.sub similarity index 100% rename from SPECS-EXTENDED/openjade/config.sub rename to SPECS/openjade/config.sub diff --git a/SPECS-EXTENDED/openjade/openjade-1.3.1-nsl.patch b/SPECS/openjade/openjade-1.3.1-nsl.patch similarity index 100% rename from SPECS-EXTENDED/openjade/openjade-1.3.1-nsl.patch rename to SPECS/openjade/openjade-1.3.1-nsl.patch diff --git a/SPECS-EXTENDED/openjade/openjade-1.3.2-gcc46.patch b/SPECS/openjade/openjade-1.3.2-gcc46.patch similarity index 100% rename from SPECS-EXTENDED/openjade/openjade-1.3.2-gcc46.patch rename to SPECS/openjade/openjade-1.3.2-gcc46.patch diff --git a/SPECS-EXTENDED/openjade/openjade-deplibs.patch b/SPECS/openjade/openjade-deplibs.patch similarity index 100% rename from SPECS-EXTENDED/openjade/openjade-deplibs.patch rename to SPECS/openjade/openjade-deplibs.patch diff --git a/SPECS-EXTENDED/openjade/openjade-getoptperl.patch b/SPECS/openjade/openjade-getoptperl.patch similarity index 100% rename from SPECS-EXTENDED/openjade/openjade-getoptperl.patch rename to SPECS/openjade/openjade-getoptperl.patch diff --git a/SPECS-EXTENDED/openjade/openjade-nola.patch b/SPECS/openjade/openjade-nola.patch similarity index 100% rename from SPECS-EXTENDED/openjade/openjade-nola.patch rename to SPECS/openjade/openjade-nola.patch diff --git a/SPECS-EXTENDED/openjade/openjade-ppc64.patch b/SPECS/openjade/openjade-ppc64.patch similarity index 100% rename from SPECS-EXTENDED/openjade/openjade-ppc64.patch rename to SPECS/openjade/openjade-ppc64.patch diff --git a/SPECS-EXTENDED/openjade/openjade.signatures.json b/SPECS/openjade/openjade.signatures.json similarity index 100% rename from SPECS-EXTENDED/openjade/openjade.signatures.json rename to SPECS/openjade/openjade.signatures.json diff --git a/SPECS-EXTENDED/openjade/openjade.spec b/SPECS/openjade/openjade.spec similarity index 90% rename from SPECS-EXTENDED/openjade/openjade.spec rename to SPECS/openjade/openjade.spec index d013c94707..eaa7969728 100644 --- a/SPECS-EXTENDED/openjade/openjade.spec +++ b/SPECS/openjade/openjade.spec @@ -1,39 +1,36 @@ -Summary: A DSSSL implementation -Name: openjade -Version: 1.3.2 -Release: 63%{?dist} -Requires: sgml-common +Summary: A DSSSL implementation +Name: openjade +Version: 1.3.2 +Release: 64%{?dist} +License: DMIT Vendor: Microsoft Corporation Distribution: Mariner -URL: http://openjade.sourceforge.net/ -Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz +URL: https://openjade.sourceforge.net/ +Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz #config.sub and config.guess from upstream sources (Mar 25th 2013). #http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD #http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD #I can't get them from autoreconf, because of the very strange openjade structure of config files -Source2:config.guess -Source3:config.sub +Source2: config.guess +Source3: config.sub #fix build on ppc64 -Patch0: openjade-ppc64.patch +Patch0: openjade-ppc64.patch #do not link against -lnsl -Patch1: openjade-1.3.1-nsl.patch +Patch1: openjade-1.3.1-nsl.patch #Fix dependent libs for libogrove (bug #198232). -Patch2: openjade-deplibs.patch +Patch2: openjade-deplibs.patch #do not require OpenSP libosp.la file for build(#485114) -Patch3: openjade-nola.patch +Patch3: openjade-nola.patch #upstream bug tracker fix for build with gcc46 -Patch4: openjade-1.3.2-gcc46.patch +Patch4: openjade-1.3.2-gcc46.patch #use Getopt:Std to prevent build failure -Patch5: openjade-getoptperl.patch -License: DMIT - -#Last jade version is from Red Hat 6.2 -Provides: jade = %{version}-%{release} - +Patch5: openjade-getoptperl.patch BuildRequires: gcc-c++ -BuildRequires: opensp-devel - -BuildRequires: perl-interpreter +BuildRequires: opensp-devel +BuildRequires: perl-interpreter +Requires: sgml-common +#Last jade version is from Red Hat 6.2 +Provides: jade = %{version}-%{release} %description OpenJade is an implementation of the ISO/IEC 10179:1996 standard DSSSL @@ -43,7 +40,6 @@ command-line application and a set of components. The DSSSL engine inputs an SGML or XML document and can output a variety of formats: XML, RTF, TeX, MIF (FrameMaker), SGML, or XML. - %prep %setup -q %patch0 -p1 @@ -57,28 +53,27 @@ XML, RTF, TeX, MIF (FrameMaker), SGML, or XML. %build cp -p %{SOURCE2} %{SOURCE3} config/ # more info: rhbz#1306162 -export CXXFLAGS="%optflags -fno-lifetime-dse" +export CXXFLAGS="%{optflags} -fno-lifetime-dse" %configure --disable-static --datadir=%{_datadir}/sgml/%{name}-%{version} \ --enable-splibdir=%{_libdir} make %install -rm -rf $RPM_BUILD_ROOT -make install install-man DESTDIR=$RPM_BUILD_ROOT +make install install-man DESTDIR=%{buildroot} # oMy, othis ois osilly. -ln -s openjade $RPM_BUILD_ROOT/%{_bindir}/jade -echo ".so man1/openjade.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/jade.1 +ln -s openjade %{buildroot}/%{_bindir}/jade +echo ".so man1/openjade.1" > %{buildroot}/%{_mandir}/man1/jade.1 # install jade/jade $RPM_BUILD_ROOT/%{prefix}/bin/jade -cp dsssl/catalog $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}-%{version}/ -cp dsssl/{dsssl,style-sheet,fot}.dtd $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}-%{version}/ +cp dsssl/catalog %{buildroot}/%{_datadir}/sgml/%{name}-%{version}/ +cp dsssl/{dsssl,style-sheet,fot}.dtd %{buildroot}/%{_datadir}/sgml/%{name}-%{version}/ # add unversioned/versioned catalog and symlink -mkdir -p $RPM_BUILD_ROOT/etc/sgml -cd $RPM_BUILD_ROOT/etc/sgml +mkdir -p %{buildroot}%{_sysconfdir}/sgml +cd %{buildroot}%{_sysconfdir}/sgml touch %{name}-%{version}-%{release}.soc ln -s %{name}-%{version}-%{release}.soc %{name}.soc cd - @@ -87,26 +82,31 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.so $RPM_BUILD_ROOT%{_libdir}/*.la %post %{?ldconfig} -/usr/bin/install-catalog --add /etc/sgml/%{name}-%{version}-%{release}.soc \ +%{_bindir}/install-catalog --add %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.soc \ %{_datadir}/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null || : %preun -/usr/bin/install-catalog --remove /etc/sgml/%{name}-%{version}-%{release}.soc \ +%{_bindir}/install-catalog --remove %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.soc \ %{_datadir}/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null || : %ldconfig_postun %files %doc jadedoc/* dsssl/README.jadetex -%doc README COPYING VERSION -%ghost /etc/sgml/%{name}-%{version}-%{release}.soc -/etc/sgml/%{name}.soc +%license COPYING +%doc README VERSION +%ghost %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.soc +%{_sysconfdir}/sgml/%{name}.soc %{_bindir}/* %{_libdir}/*.so.* %{_mandir}/*/* %{_datadir}/sgml/%{name}-%{version} %changelog +* Fri Sep 16 2022 Osama Esmail - 1.3.2-64 +- Moved from SPECS-EXTENDED to SPECS +- License verified + * Fri Oct 15 2021 Pawel Winogrodzki - 1.3.2-63 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/opensp/opensp-manpage.patch b/SPECS/opensp/opensp-manpage.patch similarity index 100% rename from SPECS-EXTENDED/opensp/opensp-manpage.patch rename to SPECS/opensp/opensp-manpage.patch diff --git a/SPECS-EXTENDED/opensp/opensp-multilib.patch b/SPECS/opensp/opensp-multilib.patch similarity index 100% rename from SPECS-EXTENDED/opensp/opensp-multilib.patch rename to SPECS/opensp/opensp-multilib.patch diff --git a/SPECS-EXTENDED/opensp/opensp-nodeids.patch b/SPECS/opensp/opensp-nodeids.patch similarity index 100% rename from SPECS-EXTENDED/opensp/opensp-nodeids.patch rename to SPECS/opensp/opensp-nodeids.patch diff --git a/SPECS-EXTENDED/opensp/opensp-sigsegv.patch b/SPECS/opensp/opensp-sigsegv.patch similarity index 100% rename from SPECS-EXTENDED/opensp/opensp-sigsegv.patch rename to SPECS/opensp/opensp-sigsegv.patch diff --git a/SPECS-EXTENDED/opensp/opensp.signatures.json b/SPECS/opensp/opensp.signatures.json similarity index 100% rename from SPECS-EXTENDED/opensp/opensp.signatures.json rename to SPECS/opensp/opensp.signatures.json diff --git a/SPECS-EXTENDED/opensp/opensp.spec b/SPECS/opensp/opensp.spec similarity index 85% rename from SPECS-EXTENDED/opensp/opensp.spec rename to SPECS/opensp/opensp.spec index 62fc1bf744..923c099803 100644 --- a/SPECS-EXTENDED/opensp/opensp.spec +++ b/SPECS/opensp/opensp.spec @@ -1,26 +1,19 @@ -%define _module_build 1 - -Summary: SGML and XML parser -Name: opensp -Version: 1.5.2 -Release: 35%{?dist} -Requires: sgml-common >= 0.5 -Provides: bundled(gettext) = 0.14.5 +Summary: SGML and XML parser +Name: opensp +Version: 1.5.2 +Release: 36%{?dist} +License: MIT Vendor: Microsoft Corporation Distribution: Mariner -URL: http://openjade.sourceforge.net/ -Source: http://download.sourceforge.net/openjade/OpenSP-%{version}.tar.gz -Patch0: opensp-multilib.patch -Patch1: opensp-nodeids.patch -Patch2: opensp-sigsegv.patch -Patch3: opensp-manpage.patch -License: MIT - +URL: https://openjade.sourceforge.net/ +Source: http://download.sourceforge.net/openjade/OpenSP-%{version}.tar.gz +Patch0: opensp-multilib.patch +Patch1: opensp-nodeids.patch +Patch2: opensp-sigsegv.patch +Patch3: opensp-manpage.patch BuildRequires: gcc-c++ - -%if ! 0%{?_module_build} -BuildRequires: xmlto, jadetex -%endif +Requires: sgml-common >= 0.5 +Provides: bundled(gettext) = 0.14.5 %description OpenSP is an implementation of the ISO/IEC 8879:1986 standard SGML @@ -29,13 +22,12 @@ Clark's SP implementation of SGML. OpenSP is a command-line application and a set of components, including a generic API. %package devel -Summary: Files for developing applications that use OpenSP -Requires: %{name} = %{version}-%{release} +Summary: Files for developing applications that use OpenSP +Requires: %{name} = %{version}-%{release} %description devel Header files and libtool library for developing applications that use OpenSP. - %prep %setup -q -n OpenSP-%{version} %patch0 -p1 -b .multilib @@ -53,41 +45,32 @@ touch lib/parser_inst.cxx %build %configure \ -%if 0%{?_module_build} --disable-doc-build \ -%endif --disable-dependency-tracking --disable-static --enable-http \ --enable-default-catalog=%{_sysconfdir}/sgml/catalog \ --enable-default-search-path=%{_datadir}/sgml:%{_datadir}/xml make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} # Get rid of libtool libraries -rm $RPM_BUILD_ROOT%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete -print # oMy, othis ois osilly. for file in nsgmls sgmlnorm spam spent sx ; do - ln -s o$file $RPM_BUILD_ROOT%{_bindir}/$file -%if ! 0%{?_module_build} - echo ".so man1/o${file}.1" > $RPM_BUILD_ROOT%{_mandir}/man1/${file}.1 -%endif + ln -s o$file %{buildroot}%{_bindir}/$file done # # Rename sx to sgml2xml. -mv $RPM_BUILD_ROOT%{_bindir}/sx $RPM_BUILD_ROOT%{_bindir}/sgml2xml -%if ! 0%{?_module_build} -mv $RPM_BUILD_ROOT%{_mandir}/man1/{sx,sgml2xml}.1 -%endif +mv %{buildroot}%{_bindir}/sx %{buildroot}%{_bindir}/sgml2xml # # Clean out (installed) redundant copies of the docs and DTDs. -rm -rf $RPM_BUILD_ROOT%{_docdir}/OpenSP -rm -rf $RPM_BUILD_ROOT%{_datadir}/OpenSP +rm -rf %{buildroot}%{_docdir}/OpenSP +rm -rf %{buildroot}%{_datadir}/OpenSP %find_lang sp5 @@ -100,24 +83,21 @@ make check || : # TODO: failures as of 1.5.2 :( %files -f sp5.lang -%if ! 0%{?_module_build} -%doc doc/*.htm -%doc docsrc/releasenotes.html -%endif -%doc AUTHORS BUGS COPYING ChangeLog NEWS README +%license COPYING +%doc AUTHORS BUGS ChangeLog NEWS README %doc pubtext/opensp-implied.dcl %{_bindir}/* %{_libdir}/libosp.so.* -%if ! 0%{?_module_build} -%{_mandir}/man1/*.1* -%endif %files devel %{_includedir}/OpenSP/ %{_libdir}/libosp.so - %changelog +* Fri Sep 16 2022 Osama Esmail - 1.5.2-36 +- Moved from SPECS-EXTENDED to SPECS +- License verified + * Mon Jan 04 2021 Joe Schmitt - 1.5.2-35 - Initial CBL-Mariner import from Fedora 32 (license: MIT). - Enable module build to remove doc dependencies @@ -261,4 +241,3 @@ make check || : # TODO: failures as of 1.5.2 :( * Tue Nov 29 2005 Terje Bless 1.5.2-0.pre1 - New package OpenSP. - diff --git a/SPECS-EXTENDED/php/10-opcache.ini b/SPECS/php/10-opcache.ini similarity index 94% rename from SPECS-EXTENDED/php/10-opcache.ini rename to SPECS/php/10-opcache.ini index 8c5db66515..d188ef0624 100644 --- a/SPECS-EXTENDED/php/10-opcache.ini +++ b/SPECS/php/10-opcache.ini @@ -42,6 +42,11 @@ opcache.enable_cli=1 ; size of the optimized code. ;opcache.save_comments=1 +; If enabled, compilation warnings (including notices and deprecations) will +; be recorded and replayed each time a file is included. Otherwise, compilation +; warnings will only be emitted when the file is first cached. +;opcache.record_warnings=0 + ; Allow file existence override (file_exists, etc.) performance feature. ;opcache.enable_file_override=0 @@ -131,12 +136,12 @@ opcache.huge_code_pages=0 ; Specifies a PHP script that is going to be compiled and executed at server ; start-up. -; http://php.net/opcache.preload +; https://php.net/opcache.preload ;opcache.preload= ; Preloading code as root is not allowed for security reasons. This directive ; facilitates to let the preloading to be run as another user. -; http://php.net/opcache.preload_user +; https://php.net/opcache.preload_user ;opcache.preload_user= ; Prevents caching files that are less than this number of seconds old. It diff --git a/SPECS-EXTENDED/php/20-ffi.ini b/SPECS/php/20-ffi.ini similarity index 100% rename from SPECS-EXTENDED/php/20-ffi.ini rename to SPECS/php/20-ffi.ini diff --git a/SPECS-EXTENDED/php/macros.php b/SPECS/php/macros.php similarity index 100% rename from SPECS-EXTENDED/php/macros.php rename to SPECS/php/macros.php diff --git a/SPECS-EXTENDED/php/nginx-fpm.conf b/SPECS/php/nginx-fpm.conf similarity index 100% rename from SPECS-EXTENDED/php/nginx-fpm.conf rename to SPECS/php/nginx-fpm.conf diff --git a/SPECS-EXTENDED/php/nginx-php.conf b/SPECS/php/nginx-php.conf similarity index 100% rename from SPECS-EXTENDED/php/nginx-php.conf rename to SPECS/php/nginx-php.conf diff --git a/SPECS-EXTENDED/php/opcache-default.blacklist b/SPECS/php/opcache-default.blacklist similarity index 100% rename from SPECS-EXTENDED/php/opcache-default.blacklist rename to SPECS/php/opcache-default.blacklist diff --git a/SPECS-EXTENDED/php/php-7.2.0-includedir.patch b/SPECS/php/php-7.2.0-includedir.patch similarity index 100% rename from SPECS-EXTENDED/php/php-7.2.0-includedir.patch rename to SPECS/php/php-7.2.0-includedir.patch diff --git a/SPECS/php/php-7.4.0-datetests.patch b/SPECS/php/php-7.4.0-datetests.patch new file mode 100644 index 0000000000..8c437e50dd --- /dev/null +++ b/SPECS/php/php-7.4.0-datetests.patch @@ -0,0 +1,98 @@ +diff -up ./ext/date/tests/bug33414-2.phpt.datetests ./ext/date/tests/bug33414-2.phpt +--- ./ext/date/tests/bug33414-2.phpt.datetests 2020-04-09 14:06:11.000000000 +0200 ++++ ./ext/date/tests/bug33414-2.phpt 2020-04-09 14:40:00.809433489 +0200 +@@ -74,10 +74,10 @@ $strtotime_tstamp = strtotime("next Frid + print "result=".date("l Y-m-d H:i:s T I", $strtotime_tstamp)."\n"; + print "wanted=Friday 00:00:00\n\n"; + ?> +---EXPECT-- ++--EXPECTF-- + TZ=Pacific/Rarotonga - wrong day. +-tStamp=Thursday 1970-01-01 17:17:17 -1030 0 +-result=Tuesday 1970-01-06 00:00:00 -1030 0 ++tStamp=Thursday 1970-01-01 17:17:17 %s ++result=Tuesday 1970-01-06 00:00:00 %s + wanted=Tuesday 00:00:00 + + TZ=Atlantic/South_Georgia - wrong day. +@@ -91,13 +91,13 @@ result=Monday 2005-04-04 00:00:00 EDT 1 + wanted=Monday 00:00:00 + + TZ=Pacific/Enderbury - wrong day, off by 2 days. +-tStamp=Thursday 1970-01-01 17:17:17 -12 0 +-result=Monday 1970-01-05 00:00:00 -12 0 ++tStamp=Thursday 1970-01-01 17:17:17 %s ++result=Monday 1970-01-05 00:00:00 %s + wanted=Monday 00:00:00 + + TZ=Pacific/Kiritimati - wrong day, off by 2 days. +-tStamp=Thursday 1970-01-01 17:17:17 -1040 0 +-result=Monday 1970-01-05 00:00:00 -1040 0 ++tStamp=Thursday 1970-01-01 17:17:17 %s ++result=Monday 1970-01-05 00:00:00 %s + wanted=Monday 00:00:00 + + TZ=America/Managua - wrong day. +@@ -106,13 +106,13 @@ result=Tuesday 2005-04-12 00:00:00 CDT 1 + wanted=Tuesday 00:00:00 + + TZ=Pacific/Pitcairn - wrong day. +-tStamp=Thursday 1970-01-01 17:17:17 -0830 0 +-result=Wednesday 1970-01-07 00:00:00 -0830 0 ++tStamp=Thursday 1970-01-01 17:17:17 %s ++result=Wednesday 1970-01-07 00:00:00 %s + wanted=Wednesday 00:00:00 + + TZ=Pacific/Fakaofo - wrong day. +-tStamp=Thursday 1970-01-01 17:17:17 -11 0 +-result=Saturday 1970-01-03 00:00:00 -11 0 ++tStamp=Thursday 1970-01-01 17:17:17 %s ++result=Saturday 1970-01-03 00:00:00 %s + wanted=Saturday 00:00:00 + + TZ=Pacific/Johnston - wrong day. +diff -up ./ext/date/tests/bug66985.phpt.datetests ./ext/date/tests/bug66985.phpt +--- ./ext/date/tests/bug66985.phpt.datetests 2020-04-09 14:06:11.000000000 +0200 ++++ ./ext/date/tests/bug66985.phpt 2020-04-09 14:40:37.099288185 +0200 +@@ -3,7 +3,7 @@ Bug #66985 (Some timezones are no longer + --FILE-- + 3 +- [timezone] => Factory +-) +-DateTimeZone Object +-( + [timezone_type] => 3 + [timezone] => GB-Eire + ) +diff -up ./ext/date/tests/strtotime3-64bit.phpt.datetests ./ext/date/tests/strtotime3-64bit.phpt +--- ./ext/date/tests/strtotime3-64bit.phpt.datetests 2020-04-09 14:06:11.000000000 +0200 ++++ ./ext/date/tests/strtotime3-64bit.phpt 2020-04-09 14:40:00.809433489 +0200 +@@ -44,7 +44,7 @@ foreach ($strs as $str) { + } + + ?> +---EXPECT-- ++--EXPECTF-- + bool(false) + bool(false) + string(31) "Thu, 15 Jun 2006 00:00:00 +0100" +@@ -53,7 +53,7 @@ bool(false) + string(31) "Fri, 16 Jun 2006 23:49:12 +0100" + bool(false) + string(31) "Fri, 16 Jun 2006 02:22:00 +0100" +-string(31) "Sun, 16 Jun 0222 02:22:00 -0036" ++string(31) "Sun, 16 Jun 0222 02:22:00 %s" + string(31) "Fri, 16 Jun 2006 02:22:33 +0100" + bool(false) + string(31) "Tue, 02 Mar 2004 00:00:00 +0000" diff --git a/SPECS-EXTENDED/php/php-7.4.0-httpd.patch b/SPECS/php/php-7.4.0-httpd.patch similarity index 100% rename from SPECS-EXTENDED/php/php-7.4.0-httpd.patch rename to SPECS/php/php-7.4.0-httpd.patch diff --git a/SPECS-EXTENDED/php/php-7.4.0-ldap_r.patch b/SPECS/php/php-7.4.0-ldap_r.patch similarity index 100% rename from SPECS-EXTENDED/php/php-7.4.0-ldap_r.patch rename to SPECS/php/php-7.4.0-ldap_r.patch diff --git a/SPECS-EXTENDED/php/php-7.4.0-phpize.patch b/SPECS/php/php-7.4.0-phpize.patch similarity index 100% rename from SPECS-EXTENDED/php/php-7.4.0-phpize.patch rename to SPECS/php/php-7.4.0-phpize.patch diff --git a/SPECS-EXTENDED/php/php-7.4.0-embed.patch b/SPECS/php/php-8.0.0-embed.patch similarity index 55% rename from SPECS-EXTENDED/php/php-7.4.0-embed.patch rename to SPECS/php/php-8.0.0-embed.patch index 1bfd1daaad..27533ea4e5 100644 --- a/SPECS-EXTENDED/php/php-7.4.0-embed.patch +++ b/SPECS/php/php-8.0.0-embed.patch @@ -1,24 +1,25 @@ ---- php-5.6.3/sapi/embed/config.m4.embed -+++ php-5.6.3/sapi/embed/config.m4 -@@ -11,7 +11,8 @@ if test "$PHP_EMBED" != "no"; then - case "$PHP_EMBED" in +diff -up ./sapi/embed/config.m4.embed ./sapi/embed/config.m4 +--- ./sapi/embed/config.m4.embed 2020-07-07 13:51:05.879764972 +0200 ++++ ./sapi/embed/config.m4 2020-07-07 13:52:50.128412148 +0200 +@@ -12,7 +12,8 @@ if test "$PHP_EMBED" != "no"; then yes|shared) + LIBPHP_CFLAGS="-shared" PHP_EMBED_TYPE=shared - INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(prefix)/lib; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(prefix)/lib" + EXTRA_LDFLAGS="$EXTRA_LDFLAGS -release \$(PHP_MAJOR_VERSION).\$(PHP_MINOR_VERSION)" + INSTALL_IT="\$(mkinstalldirs) \$(INSTALL_ROOT)\$(libdir); \$(LIBTOOL) --mode=install \$(INSTALL) -m 0755 \$(OVERALL_TARGET) \$(INSTALL_ROOT)\$(libdir)" ;; static) - PHP_EMBED_TYPE=static -diff -up php-5.5.30/scripts/php-config.in.old php-5.5.30/scripts/php-config.in ---- php-5.5.30/scripts/php-config.in.old 2015-10-19 15:17:31.944747715 +0200 -+++ php-5.5.30/scripts/php-config.in 2015-10-19 15:17:58.278858083 +0200 + LIBPHP_CFLAGS="-static" +diff -up ./scripts/php-config.in.embed ./scripts/php-config.in +--- ./scripts/php-config.in.embed 2020-07-07 12:54:42.000000000 +0200 ++++ ./scripts/php-config.in 2020-07-07 13:51:05.880764968 +0200 @@ -18,7 +18,7 @@ exe_extension="@EXEEXT@" php_cli_binary=NONE php_cgi_binary=NONE configure_options="@CONFIGURE_OPTIONS@" -php_sapis="@PHP_INSTALLED_SAPIS@" -+php_sapis="apache2handler embed fpm @PHP_INSTALLED_SAPIS@" ++php_sapis="apache2handler litespeed fpm phpdbg @PHP_INSTALLED_SAPIS@" ini_dir="@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@" ini_path="@EXPANDED_PHP_CONFIG_FILE_PATH@" diff --git a/SPECS-EXTENDED/php/php-7.2.0-libdb.patch b/SPECS/php/php-8.1.0-libdb.patch similarity index 77% rename from SPECS-EXTENDED/php/php-7.2.0-libdb.patch rename to SPECS/php/php-8.1.0-libdb.patch index ca36d1a330..7a2a097b80 100644 --- a/SPECS-EXTENDED/php/php-7.2.0-libdb.patch +++ b/SPECS/php/php-8.1.0-libdb.patch @@ -1,7 +1,7 @@ -diff -up php-7.2.0alpha0/ext/dba/config.m4.libdb php-7.2.0alpha0/ext/dba/config.m4 ---- php-7.2.0alpha0/ext/dba/config.m4.libdb 2017-05-29 08:56:06.000000000 +0200 -+++ php-7.2.0alpha0/ext/dba/config.m4 2017-05-29 09:13:52.014823282 +0200 -@@ -346,61 +346,13 @@ if test "$PHP_DB4" != "no"; then +diff -up ./ext/dba/config.m4.libdb ./ext/dba/config.m4 +--- ./ext/dba/config.m4.libdb 2020-04-09 14:06:11.000000000 +0200 ++++ ./ext/dba/config.m4 2020-04-09 14:35:08.208605065 +0200 +@@ -375,61 +375,13 @@ if test "$PHP_DB4" != "no"; then dbdp4="/usr/local/BerkeleyDB.4." dbdp5="/usr/local/BerkeleyDB.5." for i in $PHP_DB4 ${dbdp5}1 ${dbdp5}0 ${dbdp4}8 ${dbdp4}7 ${dbdp4}6 ${dbdp4}5 ${dbdp4}4 ${dbdp4}3 ${dbdp4}2 ${dbdp4}1 ${dbdp}0 /usr/local /usr; do @@ -65,24 +65,24 @@ diff -up php-7.2.0alpha0/ext/dba/config.m4.libdb php-7.2.0alpha0/ext/dba/config. fi PHP_DBA_STD_RESULT(db4,Berkeley DB4) -diff -up php-7.2.0alpha0/ext/dba/dba.c.libdb php-7.2.0alpha0/ext/dba/dba.c ---- php-7.2.0alpha0/ext/dba/dba.c.libdb 2017-05-29 09:16:15.736628202 +0200 -+++ php-7.2.0alpha0/ext/dba/dba.c 2017-05-29 09:16:20.494654746 +0200 -@@ -53,6 +53,10 @@ - #include "php_tcadb.h" +diff -up ./ext/dba/dba.c.libdb ./ext/dba/dba.c +--- ./ext/dba/dba.c.libdb 2020-04-09 14:06:11.000000000 +0200 ++++ ./ext/dba/dba.c 2020-04-09 14:36:30.593275190 +0200 +@@ -50,6 +50,10 @@ #include "php_lmdb.h" + #include "dba_arginfo.h" +#ifdef DB4_INCLUDE_FILE +#include DB4_INCLUDE_FILE +#endif + - /* {{{ arginfo */ - ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2) - ZEND_ARG_INFO(0, path) -@@ -558,6 +562,10 @@ PHP_MINFO_FUNCTION(dba) + PHP_MINIT_FUNCTION(dba); + PHP_MSHUTDOWN_FUNCTION(dba); + PHP_MINFO_FUNCTION(dba); +@@ -452,6 +456,10 @@ PHP_MINFO_FUNCTION(dba) php_info_print_table_start(); - php_info_print_table_row(2, "DBA support", "enabled"); + php_info_print_table_row(2, "DBA support", "enabled"); +#ifdef DB_VERSION_STRING + php_info_print_table_row(2, "libdb header version", DB_VERSION_STRING); + php_info_print_table_row(2, "libdb library version", db_version(NULL, NULL, NULL)); diff --git a/SPECS/php/php-8.1.0-parser.patch b/SPECS/php/php-8.1.0-parser.patch new file mode 100644 index 0000000000..8a28e4d420 --- /dev/null +++ b/SPECS/php/php-8.1.0-parser.patch @@ -0,0 +1,16 @@ +diff -up ./build/gen_stub.php.syslib ./build/gen_stub.php +--- ./build/gen_stub.php.syslib 2020-06-25 08:11:51.782046813 +0200 ++++ ./build/gen_stub.php 2020-06-25 08:13:11.188860368 +0200 +@@ -1075,6 +1075,12 @@ function initPhpParser() { + } + + $isInitialized = true; ++ ++ if (file_exists('/usr/share/php/PhpParser4/autoload.php')) { ++ require_once '/usr/share/php/PhpParser4/autoload.php'; ++ return; ++ } ++ + $version = "4.13.0"; + $phpParserDir = __DIR__ . "/PHP-Parser-$version"; + if (!is_dir($phpParserDir)) { diff --git a/SPECS/php/php-8.1.0-phpinfo.patch b/SPECS/php/php-8.1.0-phpinfo.patch new file mode 100644 index 0000000000..d19b2f4bab --- /dev/null +++ b/SPECS/php/php-8.1.0-phpinfo.patch @@ -0,0 +1,44 @@ + +Drop "Configure Command" from phpinfo as it doesn't +provide any useful information. +The available extensions are not related to this command. + +Replace full GCC name by gcc in php -v output + + +diff -up ./ext/standard/info.c.phpinfo ./ext/standard/info.c +--- ./ext/standard/info.c.phpinfo 2020-07-21 10:49:31.000000000 +0200 ++++ ./ext/standard/info.c 2020-07-21 11:41:56.295633523 +0200 +@@ -805,9 +805,6 @@ PHPAPI ZEND_COLD void php_print_info(int + #ifdef PHP_BUILD_ARCH + php_info_print_table_row(2, "Architecture", PHP_BUILD_ARCH); + #endif +-#ifdef CONFIGURE_COMMAND +- php_info_print_table_row(2, "Configure Command", CONFIGURE_COMMAND ); +-#endif + + if (sapi_module.pretty_name) { + php_info_print_table_row(2, "Server API", sapi_module.pretty_name ); +diff -up ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo ./ext/standard/tests/general_functions/phpinfo.phpt +--- ./ext/standard/tests/general_functions/phpinfo.phpt.phpinfo 2020-07-21 10:49:31.000000000 +0200 ++++ ./ext/standard/tests/general_functions/phpinfo.phpt 2020-07-21 11:41:56.296633522 +0200 +@@ -17,7 +17,6 @@ PHP Version => %s + + System => %s + Build Date => %s%a +-Configure Command => %s + Server API => Command Line Interface + Virtual Directory Support => %s + Configuration File (php.ini) Path => %s +diff -up ./sapi/cli/php_cli.c.phpinfo ./sapi/cli/php_cli.c +--- ./sapi/cli/php_cli.c.phpinfo 2020-07-21 11:43:38.812475300 +0200 ++++ ./sapi/cli/php_cli.c 2020-07-21 11:43:45.783464540 +0200 +@@ -645,7 +645,7 @@ static int do_cli(int argc, char **argv) + "NTS" + #endif + #ifdef PHP_BUILD_COMPILER +- " " PHP_BUILD_COMPILER ++ " gcc" + #endif + #ifdef PHP_BUILD_ARCH + " " PHP_BUILD_ARCH diff --git a/SPECS-EXTENDED/php/php-7.3.3-systzdata-v18.patch b/SPECS/php/php-8.1.0-systzdata-v22.patch similarity index 82% rename from SPECS-EXTENDED/php/php-7.3.3-systzdata-v18.patch rename to SPECS/php/php-8.1.0-systzdata-v22.patch index eac3cc3a1e..d1c8d9096d 100644 --- a/SPECS-EXTENDED/php/php-7.3.3-systzdata-v18.patch +++ b/SPECS/php/php-8.1.0-systzdata-v22.patch @@ -5,6 +5,10 @@ Add support for use of the system timezone database, rather than embedding a copy. Discussed upstream but was not desired. History: +r22: retrieve tzdata version from /usr/share/zoneinfo/tzdata.zi +r21: adapt for timelib 2021.03 (in 8.1.0) +r20: adapt for timelib 2020.03 (in 8.0.10RC1) +r19: adapt for timelib 2020.02 (in 8.0.0beta2) r18: adapt for autotool change in 7.3.3RC1 r17: adapt for timelib 2018.01 (in 7.3.2RC1) r16: adapt for timelib 2017.06 (in 7.2.3RC1) @@ -29,10 +33,11 @@ r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert) r2: add filesystem trawl to set up name alias index r1: initial revision -diff -up php-7.3.3RC1/ext/date/config0.m4.systzdata php-7.3.3RC1/ext/date/config0.m4 ---- php-7.3.3RC1/ext/date/config0.m4.systzdata 2019-02-19 14:57:51.314601701 +0100 -+++ php-7.3.3RC1/ext/date/config0.m4 2019-02-19 14:58:29.050812587 +0100 -@@ -9,6 +9,19 @@ io.h +diff --git a/ext/date/config0.m4 b/ext/date/config0.m4 +index 18b8106bd2..3d1f63c758 100644 +--- a/ext/date/config0.m4 ++++ b/ext/date/config0.m4 +@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h]) dnl Check for strtoll, atoll AC_CHECK_FUNCS(strtoll atoll) @@ -49,13 +54,14 @@ diff -up php-7.3.3RC1/ext/date/config0.m4.systzdata php-7.3.3RC1/ext/date/config + fi +fi + - PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1" - timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c + PHP_DATE_CFLAGS="-Wno-implicit-fallthrough -I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1" + timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c lib/parse_posix.c lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c" -diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/lib/parse_tz.c ---- php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata 2019-02-19 12:18:27.000000000 +0100 -+++ php-7.3.3RC1/ext/date/lib/parse_tz.c 2019-02-19 14:57:20.397428931 +0100 -@@ -25,8 +25,21 @@ +diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c +index e41315efdb..4b6547c0a3 100644 +--- a/ext/date/lib/parse_tz.c ++++ b/ext/date/lib/parse_tz.c +@@ -26,9 +26,22 @@ #include "timelib.h" #include "timelib_private.h" @@ -70,6 +76,7 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li + +#else #define TIMELIB_SUPPORTS_V2DATA + #define TIMELIB_SUPPORT_SLIM_FILE #include "timezonedb.h" +#endif + @@ -77,7 +84,7 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)) # if defined(__LITTLE_ENDIAN__) -@@ -87,6 +100,11 @@ static int read_php_preamble(const unsig +@@ -95,6 +108,11 @@ static int read_php_preamble(const unsigned char **tzf, timelib_tzinfo *tz) { uint32_t version; @@ -89,11 +96,11 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li /* read ID */ version = (*tzf)[3] - '0'; *tzf += 4; -@@ -411,7 +429,429 @@ void timelib_dump_tzinfo(timelib_tzinfo +@@ -577,7 +595,467 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz) } } --static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb) +-static int seek_to_tz_position(const unsigned char **tzf, const char *timezone, const timelib_tzdb *tzdb) +#ifdef HAVE_SYSTEM_TZDATA + +#ifdef HAVE_SYSTEM_TZDATA_PREFIX @@ -319,6 +326,44 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li + return timelib_strcasecmp(alpha->id, beta->id); +} + ++/* Retrieve tzdata version. */ ++static void retrieve_zone_version(timelib_tzdb *db) ++{ ++ static char buf[30]; ++ char path[PATH_MAX]; ++ FILE *fp; ++ ++ strncpy(path, ZONEINFO_PREFIX "/tzdata.zi", sizeof(path)); ++ ++ fp = fopen(path, "r"); ++ if (fp) { ++ if (fgets(buf, sizeof(buf), fp)) { ++ if (!memcmp(buf, "# version ", 10) && ++ isdigit(buf[10]) && ++ isdigit(buf[11]) && ++ isdigit(buf[12]) && ++ isdigit(buf[13]) && ++ islower(buf[14])) { ++ if (buf[14] >= 't') { /* 2022t = 2022.20 */ ++ buf[17] = 0; ++ buf[16] = buf[14] - 't' + '0'; ++ buf[15] = '2'; ++ } else if (buf[14] >= 'j') { /* 2022j = 2022.10 */ ++ buf[17] = 0; ++ buf[16] = buf[14] - 'j' + '0'; ++ buf[15] = '1'; ++ } else { /* 2022a = 2022.1 */ ++ buf[16] = 0; ++ buf[15] = buf[14] - 'a' + '1'; ++ } ++ buf[14] = '.'; ++ db->version = buf+10; ++ } ++ } ++ fclose(fp); ++ } ++} ++ + +/* Create the zone identifier index by trawling the filesystem. */ +static void create_zone_index(timelib_tzdb *db) @@ -516,15 +561,15 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li + +#endif + -+static int inmem_seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb) ++static int inmem_seek_to_tz_position(const unsigned char **tzf, const char *timezone, const timelib_tzdb *tzdb) { int left = 0, right = tzdb->index_size - 1; -@@ -437,9 +877,48 @@ static int seek_to_tz_position(const uns +@@ -603,9 +1081,49 @@ static int seek_to_tz_position(const unsigned char **tzf, const char *timezone, return 0; } -+static int seek_to_tz_position(const unsigned char **tzf, char *timezone, ++static int seek_to_tz_position(const unsigned char **tzf, const char *timezone, + char **map, size_t *maplen, + const timelib_tzdb *tzdb) +{ @@ -557,6 +602,7 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li + tmp->version = "0.system"; + tmp->data = NULL; + create_zone_index(tmp); ++ retrieve_zone_version(tmp); + system_location_table = create_location_table(); + fake_data_segment(tmp, system_location_table); + timezonedb_system = tmp; @@ -569,8 +615,8 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li } const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count) -@@ -451,7 +930,30 @@ const timelib_tzdb_index_entry *timelib_ - int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb) +@@ -617,7 +1135,30 @@ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_ + int timelib_timezone_id_is_valid(const char *timezone, const timelib_tzdb *tzdb) { const unsigned char *tzf; - return (seek_to_tz_position(&tzf, timezone, tzdb)); @@ -601,8 +647,8 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li } static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz) -@@ -493,12 +995,14 @@ static timelib_tzinfo* timelib_tzinfo_ct - timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, int *error_code) +@@ -662,6 +1203,8 @@ static timelib_tzinfo* timelib_tzinfo_ctor(const char *name) + timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *tzdb, int *error_code) { const unsigned char *tzf; + char *memmap = NULL; @@ -610,16 +656,18 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li timelib_tzinfo *tmp; int version; int transitions_result, types_result; - unsigned int type; /* TIMELIB_TZINFO_PHP or TIMELIB_TZINFO_ZONEINFO */ +@@ -669,7 +1212,7 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t + + *error_code = TIMELIB_ERROR_NO_ERROR; - if (seek_to_tz_position(&tzf, timezone, tzdb)) { + if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) { tmp = timelib_tzinfo_ctor(timezone); version = read_preamble(&tzf, tmp, &type); -@@ -537,11 +1041,36 @@ timelib_tzinfo *timelib_parse_tzfile(cha +@@ -712,11 +1255,36 @@ timelib_tzinfo *timelib_parse_tzfile(const char *timezone, const timelib_tzdb *t + return NULL; } - skip_posix_string(&tzf, tmp); +#ifdef HAVE_SYSTEM_TZDATA + if (memmap) { @@ -654,3 +702,19 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata php-7.3.3RC1/ext/date/li } else { *error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE; tmp = NULL; +diff --git a/ext/date/php_date.c b/ext/date/php_date.c +index cf4a11b8a2..cd49abc78d 100644 +--- a/ext/date/php_date.c ++++ b/ext/date/php_date.c +@@ -457,7 +457,11 @@ PHP_MINFO_FUNCTION(date) + php_info_print_table_row(2, "date/time support", "enabled"); + php_info_print_table_row(2, "timelib version", TIMELIB_ASCII_VERSION); + php_info_print_table_row(2, "\"Olson\" Timezone Database Version", tzdb->version); ++#ifdef HAVE_SYSTEM_TZDATA ++ php_info_print_table_row(2, "Timezone Database", "system"); ++#else + php_info_print_table_row(2, "Timezone Database", php_date_global_timezone_db_enabled ? "external" : "internal"); ++#endif + php_info_print_table_row(2, "Default timezone", guess_timezone(tzdb)); + php_info_print_table_end(); + diff --git a/SPECS-EXTENDED/php/php-fpm-www.conf b/SPECS/php/php-fpm-www.conf similarity index 100% rename from SPECS-EXTENDED/php/php-fpm-www.conf rename to SPECS/php/php-fpm-www.conf diff --git a/SPECS-EXTENDED/php/php-fpm.conf b/SPECS/php/php-fpm.conf similarity index 100% rename from SPECS-EXTENDED/php/php-fpm.conf rename to SPECS/php/php-fpm.conf diff --git a/SPECS-EXTENDED/php/php-fpm.logrotate b/SPECS/php/php-fpm.logrotate similarity index 100% rename from SPECS-EXTENDED/php/php-fpm.logrotate rename to SPECS/php/php-fpm.logrotate diff --git a/SPECS-EXTENDED/php/php-fpm.service b/SPECS/php/php-fpm.service similarity index 100% rename from SPECS-EXTENDED/php/php-fpm.service rename to SPECS/php/php-fpm.service diff --git a/SPECS-EXTENDED/php/php-fpm.wants b/SPECS/php/php-fpm.wants similarity index 100% rename from SPECS-EXTENDED/php/php-fpm.wants rename to SPECS/php/php-fpm.wants diff --git a/SPECS-EXTENDED/php/php.conf b/SPECS/php/php.conf similarity index 94% rename from SPECS-EXTENDED/php/php.conf rename to SPECS/php/php.conf index 85858372b4..639652b42f 100644 --- a/SPECS-EXTENDED/php/php.conf +++ b/SPECS/php/php.conf @@ -19,15 +19,13 @@ DirectoryIndex index.php # # Redirect to local php-fpm (no mod_php in default configuration) # - - + # Enable http authorization headers SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 SetHandler "proxy:unix:/run/php-fpm/www.sock|fcgi://localhost" - # @@ -36,7 +34,7 @@ DirectoryIndex index.php # # mod_php options # - + # # Cause the PHP interpreter to handle files with a .php extension. # diff --git a/SPECS-EXTENDED/php/php.ini b/SPECS/php/php.ini similarity index 85% rename from SPECS-EXTENDED/php/php.ini rename to SPECS/php/php.ini index d95f287c22..bf9eb12413 100644 --- a/SPECS-EXTENDED/php/php.ini +++ b/SPECS/php/php.ini @@ -17,7 +17,7 @@ ; 6. The directory from the --with-config-file-path compile time option, or the ; Windows directory (usually C:\windows) ; See the PHP docs for more specific information. -; http://php.net/configuration.file +; https://php.net/configuration.file ; The syntax of the file is extremely simple. Whitespace and lines ; beginning with a semicolon are silently ignored (as you probably guessed). @@ -31,7 +31,7 @@ ; special sections cannot be overridden by user-defined INI files or ; at runtime. Currently, [PATH=] and [HOST=] sections only work under ; CGI/FastCGI. -; http://php.net/ini.sections +; https://php.net/ini.sections ; Directives are specified using the following syntax: ; directive = value @@ -88,6 +88,7 @@ ;;;;;;;;;;;;;;;;;;; ; Quick Reference ; ;;;;;;;;;;;;;;;;;;; + ; The following are all the settings which are different in either the production ; or development versions of the INIs with respect to PHP's default behavior. ; Please see the actual settings later in the document for more details as to why @@ -99,12 +100,12 @@ ; Production Value: Off ; display_startup_errors -; Default Value: Off +; Default Value: On ; Development Value: On ; Production Value: Off ; error_reporting -; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +; Default Value: E_ALL ; Development Value: E_ALL ; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT @@ -153,6 +154,16 @@ ; Development Value: "GPCS" ; Production Value: "GPCS" +; zend.exception_ignore_args +; Default Value: Off +; Development Value: Off +; Production Value: On + +; zend.exception_string_param_max_len +; Default Value: 15 +; Development Value: 15 +; Production Value: 0 + ;;;;;;;;;;;;;;;;;;;; ; php.ini Options ; ;;;;;;;;;;;;;;;;;;;; @@ -170,7 +181,7 @@ ;;;;;;;;;;;;;;;;;;;; ; Enable the PHP scripting language engine under Apache. -; http://php.net/engine +; https://php.net/engine engine = On ; This directive determines whether or not PHP will recognize code between @@ -183,11 +194,11 @@ engine = On ; Default Value: On ; Development Value: Off ; Production Value: Off -; http://php.net/short-open-tag +; https://php.net/short-open-tag short_open_tag = Off ; The number of significant digits displayed in floating point numbers. -; http://php.net/precision +; https://php.net/precision precision = 14 ; Output buffering is a mechanism for controlling how much output data @@ -211,7 +222,7 @@ precision = 14 ; Default Value: Off ; Development Value: 4096 ; Production Value: 4096 -; http://php.net/output-buffering +; https://php.net/output-buffering output_buffering = 4096 ; You can redirect all of the output of your scripts to a function. For @@ -226,7 +237,7 @@ output_buffering = 4096 ; and you cannot use both "ob_gzhandler" and "zlib.output_compression". ; Note: output_handler must be empty if this is set 'On' !!!! ; Instead you must use zlib.output_handler. -; http://php.net/output-handler +; https://php.net/output-handler ;output_handler = ; URL rewriter function rewrites URL on the fly by using @@ -255,16 +266,16 @@ output_buffering = 4096 ; performance, enable output_buffering in addition. ; Note: You need to use zlib.output_handler instead of the standard ; output_handler, or otherwise the output will be corrupted. -; http://php.net/zlib.output-compression +; https://php.net/zlib.output-compression zlib.output_compression = Off -; http://php.net/zlib.output-compression-level +; https://php.net/zlib.output-compression-level ;zlib.output_compression_level = -1 ; You cannot specify additional output handlers if zlib.output_compression ; is activated here. This setting does the same as output_handler but in ; a different order. -; http://php.net/zlib.output-handler +; https://php.net/zlib.output-handler ;zlib.output_handler = ; Implicit flush tells PHP to tell the output layer to flush itself @@ -272,7 +283,7 @@ zlib.output_compression = Off ; PHP function flush() after each and every call to print() or echo() and each ; and every HTML block. Turning this option on has serious performance ; implications and is generally recommended for debugging purposes only. -; http://php.net/implicit-flush +; https://php.net/implicit-flush ; Note: This directive is hardcoded to On for the CLI SAPI implicit_flush = Off @@ -303,22 +314,22 @@ serialize_precision = -1 ; and below. This directive makes most sense if used in a per-directory ; or per-virtualhost web server configuration file. ; Note: disables the realpath cache -; http://php.net/open-basedir +; https://php.net/open-basedir ;open_basedir = -; This directive allows you to disable certain functions for security reasons. +; This directive allows you to disable certain functions. ; It receives a comma-delimited list of function names. -; http://php.net/disable-functions +; https://php.net/disable-functions disable_functions = -; This directive allows you to disable certain classes for security reasons. +; This directive allows you to disable certain classes. ; It receives a comma-delimited list of class names. -; http://php.net/disable-classes +; https://php.net/disable-classes disable_classes = ; Colors for Syntax Highlighting mode. Anything that's acceptable in ; would work. -; http://php.net/syntax-highlighting +; https://php.net/syntax-highlighting ;highlight.string = #DD0000 ;highlight.comment = #FF9900 ;highlight.keyword = #007700 @@ -329,44 +340,54 @@ disable_classes = ; the request. Consider enabling it if executing long requests, which may end up ; being interrupted by the user or a browser timing out. PHP's default behavior ; is to disable this feature. -; http://php.net/ignore-user-abort +; https://php.net/ignore-user-abort ;ignore_user_abort = On ; Determines the size of the realpath cache to be used by PHP. This value should ; be increased on systems where PHP opens many files to reflect the quantity of ; the file operations performed. ; Note: if open_basedir is set, the cache is disabled -; http://php.net/realpath-cache-size +; https://php.net/realpath-cache-size ;realpath_cache_size = 4096k ; Duration of time, in seconds for which to cache realpath information for a given ; file or directory. For systems with rarely changing files, consider increasing this ; value. -; http://php.net/realpath-cache-ttl +; https://php.net/realpath-cache-ttl ;realpath_cache_ttl = 120 ; Enables or disables the circular reference collector. -; http://php.net/zend.enable-gc +; https://php.net/zend.enable-gc zend.enable_gc = On ; If enabled, scripts may be written in encodings that are incompatible with ; the scanner. CP936, Big5, CP949 and Shift_JIS are the examples of such ; encodings. To use this feature, mbstring extension must be enabled. -; Default: Off ;zend.multibyte = Off ; Allows to set the default encoding for the scripts. This value will be used ; unless "declare(encoding=...)" directive appears at the top of the script. ; Only affects if zend.multibyte is set. -; Default: "" ;zend.script_encoding = -; Allows to include or exclude arguments from stack traces generated for exceptions -; Default: Off -; In production, it is recommended to turn this setting on to prohibit the output +; Allows to include or exclude arguments from stack traces generated for exceptions. +; In production, it is recommended to turn this setting on to prohibit the output ; of sensitive information in stack traces +; Default Value: Off +; Development Value: Off +; Production Value: On zend.exception_ignore_args = On +; Allows setting the maximum string length in an argument of a stringified stack trace +; to a value between 0 and 1000000. +; This has no effect when zend.exception_ignore_args is enabled. +; Default Value: 15 +; Development Value: 15 +; Production Value: 0 +; In production, it is recommended to set this to 0 to reduce the output +; of sensitive information in stack traces. +zend.exception_string_param_max_len = 0 + ;;;;;;;;;;;;;;;;; ; Miscellaneous ; ;;;;;;;;;;;;;;;;; @@ -375,7 +396,7 @@ zend.exception_ignore_args = On ; (e.g. by adding its signature to the Web server header). It is no security ; threat in any way, but it makes it possible to determine whether you use PHP ; on your server or not. -; http://php.net/expose-php +; https://php.net/expose-php expose_php = On ;;;;;;;;;;;;;;;;;;; @@ -383,7 +404,7 @@ expose_php = On ;;;;;;;;;;;;;;;;;;; ; Maximum execution time of each script, in seconds -; http://php.net/max-execution-time +; https://php.net/max-execution-time ; Note: This directive is hardcoded to 0 for the CLI SAPI max_execution_time = 30 @@ -394,18 +415,18 @@ max_execution_time = 30 ; Default Value: -1 (Unlimited) ; Development Value: 60 (60 seconds) ; Production Value: 60 (60 seconds) -; http://php.net/max-input-time +; https://php.net/max-input-time max_input_time = 60 ; Maximum input variable nesting level -; http://php.net/max-input-nesting-level +; https://php.net/max-input-nesting-level ;max_input_nesting_level = 64 ; How many GET/POST/COOKIE input variables may be accepted ;max_input_vars = 1000 -; Maximum amount of memory a script may consume (128MB) -; http://php.net/memory-limit +; Maximum amount of memory a script may consume +; https://php.net/memory-limit memory_limit = 128M ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -458,10 +479,10 @@ memory_limit = 128M ; E_ALL & ~E_NOTICE (Show all errors, except for notices) ; E_ALL & ~E_NOTICE & ~E_STRICT (Show all errors, except for notices and coding standards warnings.) ; E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR (Show only errors) -; Default Value: E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED +; Default Value: E_ALL ; Development Value: E_ALL ; Production Value: E_ALL & ~E_DEPRECATED & ~E_STRICT -; http://php.net/error-reporting +; https://php.net/error-reporting error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT ; This directive controls whether or not and where PHP will output errors, @@ -478,18 +499,16 @@ error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT ; Default Value: On ; Development Value: On ; Production Value: Off -; http://php.net/display-errors +; https://php.net/display-errors display_errors = Off ; The display of errors which occur during PHP's startup sequence are handled -; separately from display_errors. PHP's default behavior is to suppress those -; errors from clients. Turning the display of startup errors on can be useful in -; debugging configuration problems. We strongly recommend you -; set this to 'off' for production servers. -; Default Value: Off +; separately from display_errors. We strongly recommend you set this to 'off' +; for production servers to avoid leaking configuration details. +; Default Value: On ; Development Value: On ; Production Value: Off -; http://php.net/display-startup-errors +; https://php.net/display-startup-errors display_startup_errors = Off ; Besides displaying errors, PHP can also log errors to locations such as a @@ -499,46 +518,31 @@ display_startup_errors = Off ; Default Value: Off ; Development Value: On ; Production Value: On -; http://php.net/log-errors +; https://php.net/log-errors log_errors = On -; Set maximum length of log_errors. In error_log information about the source is -; added. The default is 1024 and 0 allows to not apply any maximum length at all. -; http://php.net/log-errors-max-len -log_errors_max_len = 1024 - ; Do not log repeated messages. Repeated errors must occur in same file on same ; line unless ignore_repeated_source is set true. -; http://php.net/ignore-repeated-errors +; https://php.net/ignore-repeated-errors ignore_repeated_errors = Off ; Ignore source of message when ignoring repeated messages. When this setting ; is On you will not log errors with repeated messages from different files or ; source lines. -; http://php.net/ignore-repeated-source +; https://php.net/ignore-repeated-source ignore_repeated_source = Off ; If this parameter is set to Off, then memory leaks will not be shown (on ; stdout or in the log). This is only effective in a debug compile, and if ; error reporting includes E_WARNING in the allowed list -; http://php.net/report-memleaks +; https://php.net/report-memleaks report_memleaks = On -; This setting is on by default. +; This setting is off by default. ;report_zend_debug = 0 -; Store the last error/warning message in $php_errormsg (boolean). Setting this value -; to On can assist in debugging and is appropriate for development servers. It should -; however be disabled on production servers. -; This directive is DEPRECATED. -; Default Value: Off -; Development Value: Off -; Production Value: Off -; http://php.net/track-errors -;track_errors = Off - ; Turn off normal error reporting and emit XML-RPC error XML -; http://php.net/xmlrpc-errors +; https://php.net/xmlrpc-errors ;xmlrpc_errors = 0 ; An XML-RPC faultCode @@ -548,40 +552,40 @@ report_memleaks = On ; error message as HTML for easier reading. This directive controls whether ; the error message is formatted as HTML or not. ; Note: This directive is hardcoded to Off for the CLI SAPI -; http://php.net/html-errors +; https://php.net/html-errors ;html_errors = On ; If html_errors is set to On *and* docref_root is not empty, then PHP ; produces clickable error messages that direct to a page describing the error ; or function causing the error in detail. -; You can download a copy of the PHP manual from http://php.net/docs +; You can download a copy of the PHP manual from https://php.net/docs ; and change docref_root to the base URL of your local copy including the ; leading '/'. You must also specify the file extension being used including ; the dot. PHP's default behavior is to leave these settings empty, in which ; case no links to documentation are generated. ; Note: Never use this feature for production boxes. -; http://php.net/docref-root +; https://php.net/docref-root ; Examples ;docref_root = "/phpmanual/" -; http://php.net/docref-ext +; https://php.net/docref-ext ;docref_ext = .html ; String to output before an error message. PHP's default behavior is to leave ; this setting blank. -; http://php.net/error-prepend-string +; https://php.net/error-prepend-string ; Example: ;error_prepend_string = "" ; String to output after an error message. PHP's default behavior is to leave ; this setting blank. -; http://php.net/error-append-string +; https://php.net/error-append-string ; Example: ;error_append_string = "" ; Log errors to specified file. PHP's default behavior is to leave this value ; empty. -; http://php.net/error-log +; https://php.net/error-log ; Example: ;error_log = php_errors.log ; Log errors to syslog (Event Log on Windows). @@ -604,7 +608,7 @@ report_memleaks = On ; no-ctrl (all characters except control characters) ; all (all characters) ; raw (like "all", but messages are not split at newlines) -; http://php.net/syslog.filter +; https://php.net/syslog.filter ;syslog.filter = ascii ;windows.show_crt_warning @@ -618,14 +622,14 @@ report_memleaks = On ; The separator used in PHP generated URLs to separate arguments. ; PHP's default setting is "&". -; http://php.net/arg-separator.output +; https://php.net/arg-separator.output ; Example: ;arg_separator.output = "&" ; List of separator(s) used by PHP to parse input URLs into variables. ; PHP's default setting is "&". ; NOTE: Every character in this directive is considered as separator! -; http://php.net/arg-separator.input +; https://php.net/arg-separator.input ; Example: ;arg_separator.input = ";&" @@ -639,7 +643,7 @@ report_memleaks = On ; Default Value: "EGPCS" ; Development Value: "GPCS" ; Production Value: "GPCS"; -; http://php.net/variables-order +; https://php.net/variables-order variables_order = "GPCS" ; This directive determines which super global data (G,P & C) should be @@ -652,7 +656,7 @@ variables_order = "GPCS" ; Default Value: None ; Development Value: "GP" ; Production Value: "GP" -; http://php.net/request-order +; https://php.net/request-order request_order = "GP" ; This directive determines whether PHP registers $argv & $argc each time it @@ -667,7 +671,7 @@ request_order = "GP" ; Default Value: On ; Development Value: Off ; Production Value: Off -; http://php.net/register-argc-argv +; https://php.net/register-argc-argv register_argc_argv = Off ; When enabled, the ENV, REQUEST and SERVER variables are created when they're @@ -675,7 +679,7 @@ register_argc_argv = Off ; variables are not used within a script, having this directive on will result ; in a performance gain. The PHP directive register_argc_argv must be disabled ; for this directive to have any effect. -; http://php.net/auto-globals-jit +; https://php.net/auto-globals-jit auto_globals_jit = On ; Whether PHP will read the POST data. @@ -684,48 +688,48 @@ auto_globals_jit = On ; and $_FILES to always be empty; the only way you will be able to read the ; POST data will be through the php://input stream wrapper. This can be useful ; to proxy requests or to process the POST data in a memory efficient fashion. -; http://php.net/enable-post-data-reading +; https://php.net/enable-post-data-reading ;enable_post_data_reading = Off ; Maximum size of POST data that PHP will accept. ; Its value may be 0 to disable the limit. It is ignored if POST data reading ; is disabled through enable_post_data_reading. -; http://php.net/post-max-size +; https://php.net/post-max-size post_max_size = 8M ; Automatically add files before PHP document. -; http://php.net/auto-prepend-file +; https://php.net/auto-prepend-file auto_prepend_file = ; Automatically add files after PHP document. -; http://php.net/auto-append-file +; https://php.net/auto-append-file auto_append_file = ; By default, PHP will output a media type using the Content-Type header. To ; disable this, simply set it to be empty. ; ; PHP's built-in default media type is set to text/html. -; http://php.net/default-mimetype +; https://php.net/default-mimetype default_mimetype = "text/html" ; PHP's default character set is set to UTF-8. -; http://php.net/default-charset +; https://php.net/default-charset default_charset = "UTF-8" ; PHP internal character encoding is set to empty. ; If empty, default_charset is used. -; http://php.net/internal-encoding +; https://php.net/internal-encoding ;internal_encoding = ; PHP input character encoding is set to empty. ; If empty, default_charset is used. -; http://php.net/input-encoding +; https://php.net/input-encoding ;input_encoding = ; PHP output character encoding is set to empty. ; If empty, default_charset is used. ; See also output_buffer. -; http://php.net/output-encoding +; https://php.net/output-encoding ;output_encoding = ;;;;;;;;;;;;;;;;;;;;;;;;; @@ -739,23 +743,23 @@ default_charset = "UTF-8" ;include_path = ".;c:\php\includes" ; ; PHP's default setting for include_path is ".;/path/to/php/pear" -; http://php.net/include-path +; https://php.net/include-path ; The root of the PHP pages, used only if nonempty. ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root ; if you are running php as a CGI under any web server (other than IIS) ; see documentation for security issues. The alternate is to use the ; cgi.force_redirect configuration below -; http://php.net/doc-root +; https://php.net/doc-root doc_root = ; The directory under which PHP opens the script using /~username used only ; if nonempty. -; http://php.net/user-dir +; https://php.net/user-dir user_dir = ; Directory in which the loadable extensions (modules) reside. -; http://php.net/extension-dir +; https://php.net/extension-dir ;extension_dir = "./" ; On windows: ;extension_dir = "ext" @@ -767,14 +771,14 @@ user_dir = ; Whether or not to enable the dl() function. The dl() function does NOT work ; properly in multithreaded servers, such as IIS or Zeus, and is automatically ; disabled on them. -; http://php.net/enable-dl +; https://php.net/enable-dl enable_dl = Off ; cgi.force_redirect is necessary to provide security running PHP as a CGI under ; most web servers. Left undefined, PHP turns this on by default. You can ; turn it off here AT YOUR OWN RISK ; **You CAN safely turn this off for IIS, in fact, you MUST.** -; http://php.net/cgi.force-redirect +; https://php.net/cgi.force-redirect ;cgi.force_redirect = 1 ; if cgi.nph is enabled it will force cgi to always sent Status: 200 with @@ -785,7 +789,7 @@ enable_dl = Off ; (iPlanet) web servers, you MAY need to set an environment variable name that PHP ; will look for to know it is OK to continue execution. Setting this variable MAY ; cause security issues, KNOW WHAT YOU ARE DOING FIRST. -; http://php.net/cgi.redirect-status-env +; https://php.net/cgi.redirect-status-env ;cgi.redirect_status_env = ; cgi.fix_pathinfo provides *real* PATH_INFO/PATH_TRANSLATED support for CGI. PHP's @@ -794,7 +798,7 @@ enable_dl = Off ; this to 1 will cause PHP CGI to fix its paths to conform to the spec. A setting ; of zero causes PHP to behave as before. Default is 1. You should fix your scripts ; to use SCRIPT_FILENAME rather than PATH_TRANSLATED. -; http://php.net/cgi.fix-pathinfo +; https://php.net/cgi.fix-pathinfo ;cgi.fix_pathinfo=1 ; if cgi.discard_path is enabled, the PHP CGI binary can safely be placed outside @@ -806,7 +810,7 @@ enable_dl = Off ; security context that the request runs under. mod_fastcgi under Apache ; does not currently support this feature (03/17/2002) ; Set to 1 if running under IIS. Default is zero. -; http://php.net/fastcgi.impersonate +; https://php.net/fastcgi.impersonate ;fastcgi.impersonate = 1 ; Disable logging through FastCGI connection. PHP's default behavior is to enable @@ -818,14 +822,14 @@ enable_dl = Off ; is supported by Apache. When this option is set to 1, PHP will send ; RFC2616 compliant header. ; Default is zero. -; http://php.net/cgi.rfc2616-headers +; https://php.net/cgi.rfc2616-headers ;cgi.rfc2616_headers = 0 ; cgi.check_shebang_line controls whether CGI PHP checks for line starting with #! ; (shebang) at the top of the running script. This line might be needed if the ; script support running both as stand-alone script and via PHP CGI<. PHP in CGI ; mode skips this line and ignores its content if this directive is turned on. -; http://php.net/cgi.check-shebang-line +; https://php.net/cgi.check-shebang-line ;cgi.check_shebang_line=1 ;;;;;;;;;;;;;;;; @@ -833,16 +837,16 @@ enable_dl = Off ;;;;;;;;;;;;;;;; ; Whether to allow HTTP file uploads. -; http://php.net/file-uploads +; https://php.net/file-uploads file_uploads = On ; Temporary directory for HTTP uploaded files (will use system default if not ; specified). -; http://php.net/upload-tmp-dir +; https://php.net/upload-tmp-dir ;upload_tmp_dir = ; Maximum allowed size for uploaded files. -; http://php.net/upload-max-filesize +; https://php.net/upload-max-filesize upload_max_filesize = 2M ; Maximum number of files that can be uploaded via a single request @@ -853,24 +857,24 @@ max_file_uploads = 20 ;;;;;;;;;;;;;;;;;; ; Whether to allow the treatment of URLs (like http:// or ftp://) as files. -; http://php.net/allow-url-fopen +; https://php.net/allow-url-fopen allow_url_fopen = On -; Whether to allow include/require to open URLs (like http:// or ftp://) as files. -; http://php.net/allow-url-include +; Whether to allow include/require to open URLs (like https:// or ftp://) as files. +; https://php.net/allow-url-include allow_url_include = Off ; Define the anonymous ftp password (your email address). PHP's default setting ; for this is empty. -; http://php.net/from +; https://php.net/from ;from="john@doe.com" ; Define the User-Agent string. PHP's default setting for this is empty. -; http://php.net/user-agent +; https://php.net/user-agent ;user_agent="PHP" ; Default timeout for socket based streams (seconds) -; http://php.net/default-socket-timeout +; https://php.net/default-socket-timeout default_socket_timeout = 60 ; If your scripts have to deal with files from Macintosh systems, @@ -878,7 +882,7 @@ default_socket_timeout = 60 ; unix or win32 systems, setting this flag will cause PHP to ; automatically detect the EOL character in those files so that ; fgets() and file() will work regardless of the source of the file. -; http://php.net/auto-detect-line-endings +; https://php.net/auto-detect-line-endings ;auto_detect_line_endings = Off ;;;;;;;;;;;;;;;;;;;;;; @@ -919,26 +923,26 @@ cli_server.color = On [Date] ; Defines the default timezone used by the date functions -; http://php.net/date.timezone +; https://php.net/date.timezone ;date.timezone = -; http://php.net/date.default-latitude +; https://php.net/date.default-latitude ;date.default_latitude = 31.7667 -; http://php.net/date.default-longitude +; https://php.net/date.default-longitude ;date.default_longitude = 35.2333 -; http://php.net/date.sunrise-zenith -;date.sunrise_zenith = 90.583333 +; https://php.net/date.sunrise-zenith +;date.sunrise_zenith = 90.833333 -; http://php.net/date.sunset-zenith -;date.sunset_zenith = 90.583333 +; https://php.net/date.sunset-zenith +;date.sunset_zenith = 90.833333 [filter] -; http://php.net/filter.default +; https://php.net/filter.default ;filter.default = unsafe_raw -; http://php.net/filter.default-flags +; https://php.net/filter.default-flags ;filter.default_flags = [iconv] @@ -976,7 +980,7 @@ cli_server.color = On [sqlite3] ; Directory pointing to SQLite3 extensions -; http://php.net/sqlite3.extension-dir +; https://php.net/sqlite3.extension-dir ;sqlite3.extension_dir = ; SQLite defensive mode flag (only available from SQLite 3.26+) @@ -990,14 +994,14 @@ cli_server.color = On [Pcre] ; PCRE library backtracking limit. -; http://php.net/pcre.backtrack-limit +; https://php.net/pcre.backtrack-limit ;pcre.backtrack_limit=100000 ; PCRE library recursion limit. ; Please note that if you set this value to a high number you may consume all ; the available process stack and eventually crash PHP (due to reaching the ; stack size limit imposed by the Operating System). -; http://php.net/pcre.recursion-limit +; https://php.net/pcre.recursion-limit ;pcre.recursion_limit=100000 ; Enables or disables JIT compilation of patterns. This requires the PCRE @@ -1006,28 +1010,26 @@ pcre.jit=0 [Pdo] ; Whether to pool ODBC connections. Can be one of "strict", "relaxed" or "off" -; http://php.net/pdo-odbc.connection-pooling +; https://php.net/pdo-odbc.connection-pooling ;pdo_odbc.connection_pooling=strict -;pdo_odbc.db2_instance_name - [Pdo_mysql] ; Default socket name for local MySQL connects. If empty, uses the built-in ; MySQL defaults. pdo_mysql.default_socket= [Phar] -; http://php.net/phar.readonly +; https://php.net/phar.readonly ;phar.readonly = On -; http://php.net/phar.require-hash +; https://php.net/phar.require-hash ;phar.require_hash = On ;phar.cache_list = [mail function] ; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). -; http://php.net/sendmail-path +; https://php.net/sendmail-path sendmail_path = /usr/sbin/sendmail -t -i ; Force the addition of the specified parameters to be passed as extra parameters @@ -1045,13 +1047,13 @@ mail.add_x_header = Off ;mail.log = syslog [ODBC] -; http://php.net/odbc.default-db +; https://php.net/odbc.default-db ;odbc.default_db = Not yet implemented -; http://php.net/odbc.default-user +; https://php.net/odbc.default-user ;odbc.default_user = Not yet implemented -; http://php.net/odbc.default-pw +; https://php.net/odbc.default-pw ;odbc.default_pw = Not yet implemented ; Controls the ODBC cursor model. @@ -1059,68 +1061,72 @@ mail.add_x_header = Off ;odbc.default_cursortype ; Allow or prevent persistent links. -; http://php.net/odbc.allow-persistent +; https://php.net/odbc.allow-persistent odbc.allow_persistent = On ; Check that a connection is still valid before reuse. -; http://php.net/odbc.check-persistent +; https://php.net/odbc.check-persistent odbc.check_persistent = On ; Maximum number of persistent links. -1 means no limit. -; http://php.net/odbc.max-persistent +; https://php.net/odbc.max-persistent odbc.max_persistent = -1 ; Maximum number of links (persistent + non-persistent). -1 means no limit. -; http://php.net/odbc.max-links +; https://php.net/odbc.max-links odbc.max_links = -1 ; Handling of LONG fields. Returns number of bytes to variables. 0 means ; passthru. -; http://php.net/odbc.defaultlrl +; https://php.net/odbc.defaultlrl odbc.defaultlrl = 4096 ; Handling of binary data. 0 means passthru, 1 return as is, 2 convert to char. ; See the documentation on odbc_binmode and odbc_longreadlen for an explanation ; of odbc.defaultlrl and odbc.defaultbinmode -; http://php.net/odbc.defaultbinmode +; https://php.net/odbc.defaultbinmode odbc.defaultbinmode = 1 [MySQLi] ; Maximum number of persistent links. -1 means no limit. -; http://php.net/mysqli.max-persistent +; https://php.net/mysqli.max-persistent mysqli.max_persistent = -1 ; Allow accessing, from PHP's perspective, local files with LOAD DATA statements -; http://php.net/mysqli.allow_local_infile +; https://php.net/mysqli.allow_local_infile ;mysqli.allow_local_infile = On +; It allows the user to specify a folder where files that can be sent via LOAD DATA +; LOCAL can exist. It is ignored if mysqli.allow_local_infile is enabled. +;mysqli.local_infile_directory = + ; Allow or prevent persistent links. -; http://php.net/mysqli.allow-persistent +; https://php.net/mysqli.allow-persistent mysqli.allow_persistent = On ; Maximum number of links. -1 means no limit. -; http://php.net/mysqli.max-links +; https://php.net/mysqli.max-links mysqli.max_links = -1 ; Default port number for mysqli_connect(). If unset, mysqli_connect() will use ; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the ; compile-time value defined MYSQL_PORT (in that order). Win32 will only look ; at MYSQL_PORT. -; http://php.net/mysqli.default-port +; https://php.net/mysqli.default-port mysqli.default_port = 3306 ; Default socket name for local MySQL connects. If empty, uses the built-in ; MySQL defaults. -; http://php.net/mysqli.default-socket +; https://php.net/mysqli.default-socket mysqli.default_socket = ; Default host for mysqli_connect() (doesn't apply in safe mode). -; http://php.net/mysqli.default-host +; https://php.net/mysqli.default-host mysqli.default_host = ; Default user for mysqli_connect() (doesn't apply in safe mode). -; http://php.net/mysqli.default-user +; https://php.net/mysqli.default-user mysqli.default_user = ; Default password for mysqli_connect() (doesn't apply in safe mode). @@ -1128,12 +1134,17 @@ mysqli.default_user = ; *Any* user with PHP access can run 'echo get_cfg_var("mysqli.default_pw") ; and reveal this password! And of course, any users with read access to this ; file will be able to reveal the password as well. -; http://php.net/mysqli.default-pw +; https://php.net/mysqli.default-pw mysqli.default_pw = ; Allow or prevent reconnect mysqli.reconnect = Off +; If this option is enabled, closing a persistent connection will rollback +; any pending transactions of this connection, before it is put back +; into the persistent connection pool. +;mysqli.rollback_on_cached_plink = Off + [mysqlnd] ; Enable / Disable collection of general statistics by mysqlnd which can be ; used to tune and monitor MySQL operations. @@ -1145,7 +1156,7 @@ mysqlnd.collect_memory_statistics = Off ; Records communication from all extensions using mysqlnd to the specified log ; file. -; http://php.net/mysqlnd.debug +; https://php.net/mysqlnd.debug ;mysqlnd.debug = ; Defines which queries will be logged. @@ -1170,44 +1181,44 @@ mysqlnd.collect_memory_statistics = Off [PostgreSQL] ; Allow or prevent persistent links. -; http://php.net/pgsql.allow-persistent +; https://php.net/pgsql.allow-persistent pgsql.allow_persistent = On ; Detect broken persistent links always with pg_pconnect(). ; Auto reset feature requires a little overheads. -; http://php.net/pgsql.auto-reset-persistent +; https://php.net/pgsql.auto-reset-persistent pgsql.auto_reset_persistent = Off ; Maximum number of persistent links. -1 means no limit. -; http://php.net/pgsql.max-persistent +; https://php.net/pgsql.max-persistent pgsql.max_persistent = -1 ; Maximum number of links (persistent+non persistent). -1 means no limit. -; http://php.net/pgsql.max-links +; https://php.net/pgsql.max-links pgsql.max_links = -1 ; Ignore PostgreSQL backends Notice message or not. ; Notice message logging require a little overheads. -; http://php.net/pgsql.ignore-notice +; https://php.net/pgsql.ignore-notice pgsql.ignore_notice = 0 ; Log PostgreSQL backends Notice message or not. ; Unless pgsql.ignore_notice=0, module cannot log notice message. -; http://php.net/pgsql.log-notice +; https://php.net/pgsql.log-notice pgsql.log_notice = 0 [bcmath] ; Number of decimal digits for all bcmath functions. -; http://php.net/bcmath.scale +; https://php.net/bcmath.scale bcmath.scale = 0 [browscap] -; http://php.net/browscap +; https://php.net/browscap ;browscap = extra/browscap.ini [Session] ; Handler used to store/retrieve data. -; http://php.net/session.save-handler +; https://php.net/session.save-handler session.save_handler = files ; Argument passed to save_handler. In the case of files, this is the path @@ -1236,7 +1247,7 @@ session.save_handler = files ; ; where MODE is the octal representation of the mode. Note that this ; does not overwrite the process's umask. -; http://php.net/session.save-path +; https://php.net/session.save-path ; RPM note : session directory must be owned by process owner ; for mod_php, see /etc/httpd/conf.d/php.conf @@ -1253,105 +1264,99 @@ session.save_handler = files session.use_strict_mode = 0 ; Whether to use cookies. -; http://php.net/session.use-cookies +; https://php.net/session.use-cookies session.use_cookies = 1 -; http://php.net/session.cookie-secure +; https://php.net/session.cookie-secure ;session.cookie_secure = ; This option forces PHP to fetch and use a cookie for storing and maintaining ; the session id. We encourage this operation as it's very helpful in combating ; session hijacking when not specifying and managing your own session id. It is ; not the be-all and end-all of session hijacking defense, but it's a good start. -; http://php.net/session.use-only-cookies +; https://php.net/session.use-only-cookies session.use_only_cookies = 1 ; Name of the session (used as cookie name). -; http://php.net/session.name +; https://php.net/session.name session.name = PHPSESSID ; Initialize session on request startup. -; http://php.net/session.auto-start +; https://php.net/session.auto-start session.auto_start = 0 ; Lifetime in seconds of cookie or, if 0, until browser is restarted. -; http://php.net/session.cookie-lifetime +; https://php.net/session.cookie-lifetime session.cookie_lifetime = 0 ; The path for which the cookie is valid. -; http://php.net/session.cookie-path +; https://php.net/session.cookie-path session.cookie_path = / ; The domain for which the cookie is valid. -; http://php.net/session.cookie-domain +; https://php.net/session.cookie-domain session.cookie_domain = ; Whether or not to add the httpOnly flag to the cookie, which makes it ; inaccessible to browser scripting languages such as JavaScript. -; http://php.net/session.cookie-httponly +; https://php.net/session.cookie-httponly session.cookie_httponly = ; Add SameSite attribute to cookie to help mitigate Cross-Site Request Forgery (CSRF/XSRF) -; Current valid values are "Lax" or "Strict" +; Current valid values are "Strict", "Lax" or "None". When using "None", +; make sure to include the quotes, as `none` is interpreted like `false` in ini files. ; https://tools.ietf.org/html/draft-west-first-party-cookies-07 session.cookie_samesite = ; Handler used to serialize data. php is the standard serializer of PHP. -; http://php.net/session.serialize-handler +; https://php.net/session.serialize-handler session.serialize_handler = php -; Defines the probability that the 'garbage collection' process is started -; on every session initialization. The probability is calculated by using -; gc_probability/gc_divisor. Where session.gc_probability is the numerator -; and gc_divisor is the denominator in the equation. Setting this value to 1 -; when the session.gc_divisor value is 100 will give you approximately a 1% chance -; the gc will run on any given request. +; Defines the probability that the 'garbage collection' process is started on every +; session initialization. The probability is calculated by using gc_probability/gc_divisor, +; e.g. 1/100 means there is a 1% chance that the GC process starts on each request. ; Default Value: 1 ; Development Value: 1 ; Production Value: 1 -; http://php.net/session.gc-probability +; https://php.net/session.gc-probability session.gc_probability = 1 ; Defines the probability that the 'garbage collection' process is started on every -; session initialization. The probability is calculated by using the following equation: -; gc_probability/gc_divisor. Where session.gc_probability is the numerator and -; session.gc_divisor is the denominator in the equation. Setting this value to 100 -; when the session.gc_probability value is 1 will give you approximately a 1% chance -; the gc will run on any given request. Increasing this value to 1000 will give you -; a 0.1% chance the gc will run on any given request. For high volume production servers, -; this is a more efficient approach. +; session initialization. The probability is calculated by using gc_probability/gc_divisor, +; e.g. 1/100 means there is a 1% chance that the GC process starts on each request. +; For high volume production servers, using a value of 1000 is a more efficient approach. ; Default Value: 100 ; Development Value: 1000 ; Production Value: 1000 -; http://php.net/session.gc-divisor +; https://php.net/session.gc-divisor session.gc_divisor = 1000 ; After this number of seconds, stored data will be seen as 'garbage' and ; cleaned up by the garbage collection process. -; http://php.net/session.gc-maxlifetime +; https://php.net/session.gc-maxlifetime session.gc_maxlifetime = 1440 ; NOTE: If you are using the subdirectory option for storing session files ; (see session.save_path above), then garbage collection does *not* ; happen automatically. You will need to do your own garbage ; collection through a shell script, cron entry, or some other method. -; For example, the following script would is the equivalent of -; setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): +; For example, the following script is the equivalent of setting +; session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes): ; find /path/to/sessions -cmin +24 -type f | xargs rm ; Check HTTP Referer to invalidate externally stored URLs containing ids. ; HTTP_REFERER has to contain this substring for the session to be ; considered as valid. -; http://php.net/session.referer-check +; https://php.net/session.referer-check session.referer_check = ; Set to {nocache,private,public,} to determine HTTP caching aspects ; or leave this empty to avoid sending anti-caching headers. -; http://php.net/session.cache-limiter +; https://php.net/session.cache-limiter session.cache_limiter = nocache ; Document expires after n minutes. -; http://php.net/session.cache-expire +; https://php.net/session.cache-expire session.cache_expire = 180 ; trans sid support is disabled by default. @@ -1363,13 +1368,13 @@ session.cache_expire = 180 ; in publicly accessible computer. ; - User may access your site with the same session ID ; always using URL stored in browser's history or bookmarks. -; http://php.net/session.use-trans-sid +; https://php.net/session.use-trans-sid session.use_trans_sid = 0 ; Set session ID character length. This value could be between 22 to 256. ; Shorter length than default is supported only for compatibility reason. ; Users should use 32 or more chars. -; http://php.net/session.sid-length +; https://php.net/session.sid-length ; Default Value: 32 ; Development Value: 26 ; Production Value: 26 @@ -1384,7 +1389,7 @@ session.sid_length = 26 ; Default Value: "a=href,area=href,frame=src,form=" ; Development Value: "a=href,area=href,frame=src,form=" ; Production Value: "a=href,area=href,frame=src,form=" -; http://php.net/url-rewriter.tags +; https://php.net/url-rewriter.tags session.trans_sid_tags = "a=href,area=href,frame=src,form=" ; URL rewriter does not rewrite absolute URLs by default. @@ -1409,14 +1414,14 @@ session.trans_sid_tags = "a=href,area=href,frame=src,form=" ; Default Value: 4 ; Development Value: 5 ; Production Value: 5 -; http://php.net/session.hash-bits-per-character +; https://php.net/session.hash-bits-per-character session.sid_bits_per_character = 5 ; Enable upload progress tracking in $_SESSION ; Default Value: On ; Development Value: On ; Production Value: On -; http://php.net/session.upload-progress.enabled +; https://php.net/session.upload-progress.enabled ;session.upload_progress.enabled = On ; Cleanup the progress information as soon as all POST data has been read @@ -1424,14 +1429,14 @@ session.sid_bits_per_character = 5 ; Default Value: On ; Development Value: On ; Production Value: On -; http://php.net/session.upload-progress.cleanup +; https://php.net/session.upload-progress.cleanup ;session.upload_progress.cleanup = On ; A prefix used for the upload progress key in $_SESSION ; Default Value: "upload_progress_" ; Development Value: "upload_progress_" ; Production Value: "upload_progress_" -; http://php.net/session.upload-progress.prefix +; https://php.net/session.upload-progress.prefix ;session.upload_progress.prefix = "upload_progress_" ; The index name (concatenated with the prefix) in $_SESSION @@ -1439,7 +1444,7 @@ session.sid_bits_per_character = 5 ; Default Value: "PHP_SESSION_UPLOAD_PROGRESS" ; Development Value: "PHP_SESSION_UPLOAD_PROGRESS" ; Production Value: "PHP_SESSION_UPLOAD_PROGRESS" -; http://php.net/session.upload-progress.name +; https://php.net/session.upload-progress.name ;session.upload_progress.name = "PHP_SESSION_UPLOAD_PROGRESS" ; How frequently the upload progress should be updated. @@ -1447,18 +1452,18 @@ session.sid_bits_per_character = 5 ; Default Value: "1%" ; Development Value: "1%" ; Production Value: "1%" -; http://php.net/session.upload-progress.freq +; https://php.net/session.upload-progress.freq ;session.upload_progress.freq = "1%" ; The minimum delay between updates, in seconds ; Default Value: 1 ; Development Value: 1 ; Production Value: 1 -; http://php.net/session.upload-progress.min-freq +; https://php.net/session.upload-progress.min-freq ;session.upload_progress.min_freq = "1" ; Only write session data when session data is changed. Enabled by default. -; http://php.net/session.lazy-write +; https://php.net/session.lazy-write ;session.lazy_write = On [Assertion] @@ -1470,38 +1475,33 @@ session.sid_bits_per_character = 5 ; Default Value: 1 ; Development Value: 1 ; Production Value: -1 -; http://php.net/zend.assertions +; https://php.net/zend.assertions zend.assertions = -1 ; Assert(expr); active by default. -; http://php.net/assert.active +; https://php.net/assert.active ;assert.active = On ; Throw an AssertionError on failed assertions -; http://php.net/assert.exception +; https://php.net/assert.exception ;assert.exception = On ; Issue a PHP warning for each failed assertion. (Overridden by assert.exception if active) -; http://php.net/assert.warning +; https://php.net/assert.warning ;assert.warning = On ; Don't bail out by default. -; http://php.net/assert.bail +; https://php.net/assert.bail ;assert.bail = Off ; User-function to be called if an assertion fails. -; http://php.net/assert.callback +; https://php.net/assert.callback ;assert.callback = 0 -; Eval the expression with current error_reporting(). Set to true if you want -; error_reporting(0) around the eval(). -; http://php.net/assert.quiet-eval -;assert.quiet_eval = 0 - [mbstring] ; language for internal character representation. ; This affects mb_send_mail() and mbstring.detect_order. -; http://php.net/mbstring.language +; https://php.net/mbstring.language ;mbstring.language = Japanese ; Use of this INI entry is deprecated, use global internal_encoding instead. @@ -1515,8 +1515,8 @@ zend.assertions = -1 ; http input encoding. ; mbstring.encoding_translation = On is needed to use this setting. ; If empty, default_charset or input_encoding or mbstring.input is used. -; The precedence is: default_charset < input_encoding < mbsting.http_input -; http://php.net/mbstring.http-input +; The precedence is: default_charset < input_encoding < mbstring.http_input +; https://php.net/mbstring.http-input ;mbstring.http_input = ; Use of this INI entry is deprecated, use global output_encoding instead. @@ -1526,7 +1526,7 @@ zend.assertions = -1 ; The precedence is: default_charset < output_encoding < mbstring.http_output ; To use an output encoding conversion, mbstring's output handler must be set ; otherwise output encoding conversion cannot be performed. -; http://php.net/mbstring.http-output +; https://php.net/mbstring.http-output ;mbstring.http_output = ; enable automatic encoding translation according to @@ -1534,54 +1534,40 @@ zend.assertions = -1 ; converted to internal encoding by setting this to On. ; Note: Do _not_ use automatic encoding translation for ; portable libs/applications. -; http://php.net/mbstring.encoding-translation +; https://php.net/mbstring.encoding-translation ;mbstring.encoding_translation = Off ; automatic encoding detection order. ; "auto" detect order is changed according to mbstring.language -; http://php.net/mbstring.detect-order +; https://php.net/mbstring.detect-order ;mbstring.detect_order = auto ; substitute_character used when character cannot be converted ; one from another -; http://php.net/mbstring.substitute-character +; https://php.net/mbstring.substitute-character ;mbstring.substitute_character = none -; overload(replace) single byte functions by mbstring functions. -; mail(), ereg(), etc are overloaded by mb_send_mail(), mb_ereg(), -; etc. Possible values are 0,1,2,4 or combination of them. -; For example, 7 for overload everything. -; 0: No overload -; 1: Overload mail() function -; 2: Overload str*() functions -; 4: Overload ereg*() functions -; http://php.net/mbstring.func-overload -;mbstring.func_overload = 0 - -; enable strict encoding detection. -; Default: Off -;mbstring.strict_detection = On +; Enable strict encoding detection. +;mbstring.strict_detection = Off ; This directive specifies the regex pattern of content types for which mb_output_handler() ; is activated. -; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml) -;mbstring.http_output_conv_mimetype= +; Default: mbstring.http_output_conv_mimetypes=^(text/|application/xhtml\+xml) +;mbstring.http_output_conv_mimetypes= ; This directive specifies maximum stack depth for mbstring regular expressions. It is similar ; to the pcre.recursion_limit for PCRE. -; Default: 100000 ;mbstring.regex_stack_limit=100000 ; This directive specifies maximum retry count for mbstring regular expressions. It is similar ; to the pcre.backtrack_limit for PCRE. -; Default: 1000000 ;mbstring.regex_retry_limit=1000000 [gd] ; Tell the jpeg decode to ignore warnings and try to create ; a gd image. The warning will then be displayed as notices ; disabled by default -; http://php.net/gd.jpeg-ignore-warning +; https://php.net/gd.jpeg-ignore-warning ;gd.jpeg_ignore_warning = 1 [exif] @@ -1590,42 +1576,42 @@ zend.assertions = -1 ; given by corresponding encode setting. When empty mbstring.internal_encoding ; is used. For the decode settings you can distinguish between motorola and ; intel byte order. A decode setting cannot be empty. -; http://php.net/exif.encode-unicode +; https://php.net/exif.encode-unicode ;exif.encode_unicode = ISO-8859-15 -; http://php.net/exif.decode-unicode-motorola +; https://php.net/exif.decode-unicode-motorola ;exif.decode_unicode_motorola = UCS-2BE -; http://php.net/exif.decode-unicode-intel +; https://php.net/exif.decode-unicode-intel ;exif.decode_unicode_intel = UCS-2LE -; http://php.net/exif.encode-jis +; https://php.net/exif.encode-jis ;exif.encode_jis = -; http://php.net/exif.decode-jis-motorola +; https://php.net/exif.decode-jis-motorola ;exif.decode_jis_motorola = JIS -; http://php.net/exif.decode-jis-intel +; https://php.net/exif.decode-jis-intel ;exif.decode_jis_intel = JIS [Tidy] ; The path to a default tidy configuration file to use when using tidy -; http://php.net/tidy.default-config +; https://php.net/tidy.default-config ;tidy.default_config = /usr/local/lib/php/default.tcfg ; Should tidy clean and repair output automatically? ; WARNING: Do not use this option if you are generating non-html content ; such as dynamic images -; http://php.net/tidy.clean-output +; https://php.net/tidy.clean-output tidy.clean_output = Off [soap] ; Enables or disables WSDL caching feature. -; http://php.net/soap.wsdl-cache-enabled +; https://php.net/soap.wsdl-cache-enabled soap.wsdl_cache_enabled=1 ; Sets the directory name where SOAP extension will put cache files. -; http://php.net/soap.wsdl-cache-dir +; https://php.net/soap.wsdl-cache-dir ; RPM note : cache directory must be owned by process owner ; for mod_php, see /etc/httpd/conf.d/php.conf @@ -1634,7 +1620,7 @@ soap.wsdl_cache_dir="/tmp" ; (time to live) Sets the number of second while cached file will be used ; instead of original one. -; http://php.net/soap.wsdl-cache-ttl +; https://php.net/soap.wsdl-cache-ttl soap.wsdl_cache_ttl=86400 ; Sets the size of the cache limit. (Max. number of WSDL files to cache) diff --git a/SPECS-EXTENDED/php/php.modconf b/SPECS/php/php.modconf similarity index 54% rename from SPECS-EXTENDED/php/php.modconf rename to SPECS/php/php.modconf index 3377f720fa..e169f4a60f 100644 --- a/SPECS-EXTENDED/php/php.modconf +++ b/SPECS/php/php.modconf @@ -3,10 +3,11 @@ # easy for developers to write dynamically generated webpages. # -# Cannot load both php5 and php7 modules +# Cannot load both php5, php7 and php modules - - LoadModule php7_module modules/libphp7.so + + + LoadModule php_module modules/libphp.so + - diff --git a/SPECS-EXTENDED/php/php.signatures.json b/SPECS/php/php.signatures.json similarity index 63% rename from SPECS-EXTENDED/php/php.signatures.json rename to SPECS/php/php.signatures.json index 9ed477f454..602691a39a 100644 --- a/SPECS-EXTENDED/php/php.signatures.json +++ b/SPECS/php/php.signatures.json @@ -1,20 +1,19 @@ { "Signatures": { - "10-opcache.ini": "f7dcbff2a62d9deac450dec6ec8323472a91578091c1301535e6436e8deed5dd", + "10-opcache.ini": "6065beb2ace54d6cb5a8cde751330ea358bd23692073c6e3d2c57f7c97bec869", "20-ffi.ini": "f5e968fdd3eca54f3dab2399e243931cf16cd9da034f0364800aefab222271c0", "macros.php": "917104496e8239e1ed1d4812871be772a5fa8b38cf80c4c59ec3e0c36d48310e", "nginx-fpm.conf": "5a222ab2c3fc0145cb67a1c5125471bbf097de304e77c9858e7077a3b4fcad59", "nginx-php.conf": "b3b3f744c4c122302fcb11f39cac78d01cef15ee6f8bd67e98b3438efcf8dc95", "opcache-default.blacklist": "4eef0875e1a0c6a75b8a2bafd4ddc029b83be74dd336a6a99214b0c32808cb38", - "php-7.4.14.tar.xz": "f9f3c37969fcd9006c1dbb1dd76ab53f28c698a1646fa2dde8547c3f45e02886", + "php-8.1.11.tar.xz": "3005198d7303f87ab31bc30695de76e8ad62783f806b6ab9744da59fe41cc5bd", "php-fpm-www.conf": "1cacdd4962c01a0a968933c38db503023940ad9105f021bdab85d6cdc46dcbb8", "php-fpm.conf": "bb261d53b9b42bb163a7637bb373ffa18a20dddf27a3efe6cb5ed1b1cf5981a9", "php-fpm.logrotate": "7d8279bebb9ffabc596a2699150e93d4ce4513245890b9b786d337288b19fa79", "php-fpm.service": "574f50dec5a0edd60e60e44e7cc2d03575bc728bdc0b0cab021ce3c55abc0117", "php-fpm.wants": "846297e91ba02bd0e29b6635eeddcca01a7ad4faf5a8f27113543804331d0328", - "php.conf": "ce2296cc9ee11aed18d9cf869eac9f3ef3ea69cf9d41d4f0553d33b35f8c1d96", - "php.ini": "bd21a7e8e2c42c305941c1e54e603eadc246a32b53ee259b690ee762932b2085", - "php.modconf": "07bf65bfa5c58189e5de72cd8b989499fb993e122351eda5a11cbcbc24b5f23f", - "php.ztsmodconf": "cda5ca35df009a3c7756560f5021db00583654d5ae676ad0545ee4a3b57cb775" + "php.conf": "e2388be032eccf7c0197d597ba72259a095bf8434438a184e6a640edb4b59de2", + "php.ini": "8fd5a4d891c19320c07010fbbbac982c886b422bc8d062acaeae49d70c136fc8", + "php.modconf": "dc7303ea584452d2f742d002a648abe74905025aabf240259c7e8bd01746d278" } } \ No newline at end of file diff --git a/SPECS-EXTENDED/php/php.spec b/SPECS/php/php.spec similarity index 89% rename from SPECS-EXTENDED/php/php.spec rename to SPECS/php/php.spec index 18de25401c..09acd84003 100644 --- a/SPECS-EXTENDED/php/php.spec +++ b/SPECS/php/php.spec @@ -1,31 +1,22 @@ %{!?_httpd_confdir: %{expand: %%global _httpd_confdir %%{_sysconfdir}/httpd/conf.d}} %{!?_httpd_modconfdir: %{expand: %%global _httpd_modconfdir %%{_sysconfdir}/httpd/conf.modules.d}} %{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}} - # Fedora spec file for php # -# License: MIT -# http://opensource.org/licenses/MIT # # Please preserve changelog entries # # API/ABI check - -%global apiver 20190902 -%global zendver 20190902 +%global apiver 20210902 +%global zendver 20210902 %global pdover 20170320 - -# Adds -z now to the linker flags -%global _hardened_build 1 +%define majmin %(echo %{version} | cut -d. -f1-2) # version used for php embedded library soname -%global embed_version 7.4 %global mysql_sock %(mysql_config --socket 2>/dev/null || echo %{_sharedstatedir}/mysql/mysql.sock) - # Regression tests take a long time, you can skip 'em with this #global runselftest 0 %{!?runselftest: %global runselftest 1} - # Use the arch-specific mysql_config binary to avoid mismatch with the # arch detection heuristic used by bindir/mysql_config. %global mysql_config %{_libdir}/mysql/mysql_config @@ -36,22 +27,25 @@ %global with_sodium 1 %global with_pspell 1 %global with_lmdb 1 - +%global with_db4 0 +%global with_tidy 1 +%global with_qdbm 0 Summary: PHP scripting language for creating dynamic web sites Name: php -Version: 7.4.14 -Release: 3%{?dist} +Version: 8.1.11 +Release: 2%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD # main/snprintf.c, main/spprintf.c and main/rfc1867.c are ASL 1.0 # ext/date/lib is MIT # Zend/zend_sort is NCSA -License: PHP AND Zend AND BSD AND MIT AND ASL 1.0 AND NCSA +# Zend/asm is Boost +License: PHP AND Zend AND BSD AND MIT AND ASL 1.0 AND NCSA AND Boost Vendor: Microsoft Corporation Distribution: Mariner URL: https://www.php.net/ -Source0: https://www.php.net/distributions/%{name}-%{version}.tar.xz +Source0: https://www.php.net/distributions/php-%{version}.tar.xz Source1: php.conf Source2: php.ini Source3: macros.php @@ -60,7 +54,6 @@ Source5: php-fpm-www.conf Source6: php-fpm.service Source7: php-fpm.logrotate Source9: php.modconf -Source10: php.ztsmodconf Source12: php-fpm.wants Source13: nginx-fpm.conf Source14: nginx-php.conf @@ -71,25 +64,25 @@ Source53: 20-ffi.ini # Build fixes Patch1: php-7.4.0-httpd.patch Patch5: php-7.2.0-includedir.patch -Patch6: php-7.4.0-embed.patch -Patch8: php-7.2.0-libdb.patch -# Backported from https://github.com/php/php-src/commit/b3646440b1808abf0874b6f89027ce53ec5da03f -Patch9: php-7.4.14-gd.patch +Patch6: php-8.0.0-embed.patch +Patch8: php-8.1.0-libdb.patch # Functional changes -Patch42: php-7.3.3-systzdata-v18.patch +# Use system nikic/php-parser +Patch41: php-8.1.0-parser.patch +# use system tzdata +Patch42: php-8.1.0-systzdata-v22.patch # See http://bugs.php.net/53436 Patch43: php-7.4.0-phpize.patch # Use -lldap_r for OpenLDAP Patch45: php-7.4.0-ldap_r.patch # drop "Configure command" from phpinfo output -# and add build system and provider (from 8.0) -Patch47: php-7.4.8-phpinfo.patch +# and only use gcc (instead of full version) +Patch47: php-8.1.0-phpinfo.patch # Upstream fixes (100+) # Security fixes (200+) # Fixes for tests (300+) # Factory is droped from system tzdata -Patch300: php-5.6.3-datetests.patch - +Patch300: php-7.4.0-datetests.patch # used for tests BuildRequires: /bin/ps BuildRequires: autoconf @@ -105,53 +98,43 @@ BuildRequires: httpd-filesystem BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: libtool-ltdl-devel +BuildRequires: libxcrypt-devel BuildRequires: make # to ensure we are using nginx with filesystem feature (see #1142298) BuildRequires: nginx-filesystem # no pkgconfig to avoid compat-openssl10 -BuildRequires: openssl-devel >= 1.0.1 +BuildRequires: openssl-devel BuildRequires: pam-devel BuildRequires: perl-interpreter BuildRequires: pkg-config BuildRequires: smtpdaemon BuildRequires: systemtap-sdt-devel -BuildRequires: pkgconfig(libcurl) >= 7.15.5 +BuildRequires: tzdata +BuildRequires: pkgconfig(libcurl) >= 7.29.0 BuildRequires: pkgconfig(libedit) BuildRequires: pkgconfig(libpcre2-8) >= 10.30 BuildRequires: pkgconfig(sqlite3) >= 3.7.4 BuildRequires: pkgconfig(zlib) >= 1.2.0.4 - Requires: php-common%{?_isa} = %{version}-%{release} -# To ensure correct /var/lib/php/session ownership: - -Requires(pre): httpd-filesystem +# preserve old behavior +Recommends: httpd # For backwards-compatibility, pull the "php" command - Recommends: php-cli%{?_isa} = %{version}-%{release} # httpd have threaded MPM by default Recommends: php-fpm%{?_isa} = %{version}-%{release} # as "php" is now mostly a meta-package, commonly used extensions -Recommends: php-json%{?_isa} = %{version}-%{release} +# reduce diff with "dnf module install php" Recommends: php-mbstring%{?_isa} = %{version}-%{release} Recommends: php-opcache%{?_isa} = %{version}-%{release} Recommends: php-pdo%{?_isa} = %{version}-%{release} Recommends: php-xml%{?_isa} = %{version}-%{release} - -%if %{with_sodium} -Recommends: php-sodium%{?_isa} = %{version}-%{release} -%endif - -Provides: mod_php = %{version}-%{release} -# php engine for Apache httpd webserver -Provides: php(httpd) - %if %{with_zts} Provides: php-zts = %{version}-%{release} Provides: php-zts%{?_isa} = %{version}-%{release} %endif - -# we don't want -z defs linker flag -%undefine _strict_symbol_defs_build +%if %{with_sodium} +Recommends: php-sodium%{?_isa} = %{version}-%{release} +%endif %description PHP is an HTML-embedded scripting language. PHP attempts to make it @@ -161,16 +144,11 @@ non-commercial database management systems, so writing a database-enabled webpage with PHP is fairly simple. The most common use of PHP coding is probably as a replacement for CGI scripts. -The php package contains the module (often referred to as mod_php) -which adds support for the PHP language to Apache HTTP Server. - %package cli Summary: Command-line interface for PHP # sapi/cli/ps_title.c is PostgreSQL License: PHP AND Zend AND BSD AND MIT AND ASL 1.0 AND NCSA AND PostgreSQL - Requires: php-common%{?_isa} = %{version}-%{release} - Provides: php-cgi = %{version}-%{release} Provides: php-cgi%{?_isa} = %{version}-%{release} Provides: php-pcntl @@ -184,8 +162,7 @@ executing PHP scripts, %{_bindir}/php, and the CGI interface. %package dbg Summary: The interactive PHP debugger -License: PHP AND Zend AND BSD AND MIT AND ASL 1.0 AND NCSA - +License: PHP AND Zend AND BSD AND MIT AND ASL 1.0 AND NCSA AND Boost Requires: php-common%{?_isa} = %{version}-%{release} %description dbg @@ -193,27 +170,22 @@ The php-dbg package contains the interactive PHP debugger. %package fpm Summary: PHP FastCGI Process Manager -License: PHP AND Zend AND BSD AND MIT AND ASL 1.0 AND NCSA - +License: PHP AND Zend AND BSD AND MIT AND ASL 1.0 AND NCSA AND Boost BuildRequires: libacl-devel BuildRequires: systemd-devel - # For php.conf in /etc/httpd/conf.d # and version 2.4.10 for proxy support in SetHandler Requires: httpd-filesystem >= 2.4.10 # for /etc/nginx ownership Requires: nginx-filesystem Requires: php-common%{?_isa} = %{version}-%{release} - Requires(post): systemd Requires(postun): systemd -Requires(pre): %{_sbindir}/useradd # To ensure correct /var/lib/php/session ownership: Requires(pre): httpd-filesystem -Requires(preun): systemd - # php engine for Apache httpd webserver Provides: php(httpd) +%{?systemd_requires} %description fpm PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI @@ -226,7 +198,6 @@ Summary: Common files for PHP # fileinfo is licensed under PHP version 3.0 # regex, libmagic are licensed under BSD License: PHP AND BSD - # ABI/API check - Arch specific Provides: php(api) = %{apiver}-%{__isa_bits} Provides: php(zend-abi) = %{zendver}-%{__isa_bits} @@ -263,6 +234,9 @@ Provides: php-mhash = %{version} Provides: php-mhash%{?_isa} = %{version} Provides: php-iconv Provides: php-iconv%{?_isa} +Obsoletes: php-json < 8 +Provides: php-json = %{version} +Provides: php-json%{?_isa} = %{version} Provides: php-libxml Provides: php-libxml%{?_isa} Provides: php-openssl @@ -292,8 +266,7 @@ package and the php-cli package. %package devel Summary: Files needed for building PHP extensions -License: PHP AND Zend AND BSD AND MIT AND ASL 1.0 AND NCSA - +License: PHP AND Zend AND BSD AND MIT AND ASL 1.0 AND NCSA AND Boost # always needed to build extension Requires: autoconf Requires: automake @@ -301,18 +274,14 @@ Requires: gcc Requires: gcc-c++ # see "php-config --libs" Requires: krb5-devel%{?_isa} -Requires: libedit-devel%{?_isa} Requires: libtool Requires: libxml2-devel%{?_isa} Requires: make -Requires: openssl-devel%{?_isa} >= 1.0.1 +Requires: openssl-devel%{?_isa} Requires: pcre2-devel%{?_isa} Requires: php-cli%{?_isa} = %{version}-%{release} Requires: zlib-devel%{?_isa} - -Obsoletes: php-pecl-json-devel < %{version} -Obsoletes: php-pecl-jsonc-devel < %{version} - +Recommends: php-nikic-php-parser4 >= 4.13.0 %if %{with_zts} Provides: php-zts-devel = %{version}-%{release} Provides: php-zts-devel%{?_isa} = %{version}-%{release} @@ -326,9 +295,7 @@ need to install this package. %package opcache Summary: The Zend OPcache License: PHP - Requires: php-common%{?_isa} = %{version}-%{release} - Provides: php-pecl-zendopcache = %{version} Provides: php-pecl-zendopcache%{?_isa} = %{version} Provides: php-pecl(opcache) = %{version} @@ -346,13 +313,11 @@ bytecode optimization patterns that make code execution faster. Summary: A module for PHP applications that use IMAP # All files licensed under PHP version 3.01 License: PHP - BuildRequires: libc-client-devel -BuildRequires: openssl-devel >= 1.0.1 +BuildRequires: openssl-devel BuildRequires: pkg-config BuildRequires: pkgconfig(krb5) BuildRequires: pkgconfig(krb5-gssapi) - Requires: php-common%{?_isa} = %{version}-%{release} %description imap @@ -365,12 +330,10 @@ messages on mail servers. PHP is an HTML-embedded scripting language. Summary: A module for PHP applications that use LDAP # All files licensed under PHP version 3.01 License: PHP - BuildRequires: openldap-devel -BuildRequires: openssl-devel >= 1.0.1 +BuildRequires: openssl-devel BuildRequires: pkg-config BuildRequires: pkgconfig(libsasl2) - Requires: php-common%{?_isa} = %{version}-%{release} %description ldap @@ -383,9 +346,7 @@ language. Summary: A database access abstraction module for PHP applications # All files licensed under PHP version 3.01 License: PHP - Requires: php-common%{?_isa} = %{version}-%{release} - # ABI/API check - Arch specific Provides: php-pdo-abi = %{pdover}-%{__isa_bits} Provides: php(pdo-abi) = %{pdover}-%{__isa_bits} @@ -404,9 +365,7 @@ databases. Summary: A module for PHP applications that use MySQL databases # All files licensed under PHP version 3.01 License: PHP - Requires: php-pdo%{?_isa} = %{version}-%{release} - Provides: php_database Provides: php-mysqli = %{version}-%{release} Provides: php-mysqli%{?_isa} = %{version}-%{release} @@ -426,13 +385,10 @@ This package use the MySQL Native Driver Summary: A PostgreSQL database module for PHP # All files licensed under PHP version 3.01 License: PHP - BuildRequires: krb5-devel BuildRequires: libpq-devel -BuildRequires: openssl-devel >= 1.0.1 - +BuildRequires: openssl-devel Requires: php-pdo%{?_isa} = %{version}-%{release} - Provides: php_database Provides: php-pdo_pgsql Provides: php-pdo_pgsql%{?_isa} @@ -449,9 +405,7 @@ php package. Summary: Modules for PHP script using system process interfaces # All files licensed under PHP version 3.01 License: PHP - Requires: php-common%{?_isa} = %{version}-%{release} - Provides: php-posix Provides: php-posix%{?_isa} Provides: php-shmop @@ -473,11 +427,8 @@ Summary: A module for PHP applications that use ODBC databases # All files licensed under PHP version 3.01, except # pdo_odbc is licensed under PHP version 3.0 License: PHP - BuildRequires: unixODBC-devel - Requires: php-pdo%{?_isa} = %{version}-%{release} - Provides: php_database Provides: php-pdo_odbc Provides: php-pdo_odbc%{?_isa} @@ -495,10 +446,8 @@ package. Summary: A module for PHP applications that use the SOAP protocol # All files licensed under PHP version 3.01 License: PHP - BuildRequires: pkg-config BuildRequires: pkgconfig(libxml-2.0) - Requires: php-common%{?_isa} = %{version}-%{release} %description soap @@ -510,12 +459,9 @@ support to PHP for using the SOAP web services protocol. Summary: PDO driver for Interbase/Firebird databases # All files licensed under PHP version 3.01 License: PHP - # for fb_config command BuildRequires: firebird-devel - Requires: php-pdo%{?_isa} = %{version}-%{release} - Provides: php_database Provides: php-pdo_firebird Provides: php-pdo_firebird%{?_isa} @@ -529,9 +475,7 @@ Interbase/Firebird databases. Summary: A module for PHP applications that query SNMP-managed devices # All files licensed under PHP version 3.01 License: PHP - BuildRequires: net-snmp-devel - Requires: net-snmp Requires: php-common%{?_isa} = %{version}-%{release} @@ -545,14 +489,11 @@ will need to install this package and the php package. Summary: A module for PHP applications which use XML # All files licensed under PHP version 3.01 License: PHP - BuildRequires: pkg-config BuildRequires: pkgconfig(libexslt) BuildRequires: pkgconfig(libxml-2.0) >= 2.7.6 BuildRequires: pkgconfig(libxslt) >= 1.1 - Requires: php-common%{?_isa} = %{version}-%{release} - Provides: php-dom Provides: php-dom%{?_isa} Provides: php-domxml @@ -571,30 +512,15 @@ The php-xml package contains dynamic shared objects which add support to PHP for manipulating XML documents using the DOM tree, and performing XSL transformations on XML documents. -%package xmlrpc -Summary: A module for PHP applications which use the XML-RPC protocol -# All files licensed under PHP version 3.01, except -# libXMLRPC is licensed under BSD -License: PHP AND BSD - -Requires: php-xml%{?_isa} = %{version}-%{release} - -%description xmlrpc -The php-xmlrpc package contains a dynamic shared object that will add -support for the XML-RPC protocol to PHP. - %package mbstring Summary: A module for PHP applications which need multi-byte string handling # All files licensed under PHP version 3.01, except # libmbfl is licensed under LGPLv2 # ucgendat is licensed under OpenLDAP License: PHP AND LGPLv2 AND OpenLDAP - BuildRequires: pkg-config BuildRequires: pkgconfig(oniguruma) >= 6.8 - Requires: php-common%{?_isa} = %{version}-%{release} - Provides: bundled(libmbfl) = 1.3.2 %description mbstring @@ -605,10 +531,8 @@ support for multi-byte string handling to PHP. Summary: A module for PHP applications for using the gd graphics library # All files licensed under PHP version 3.01 License: PHP - BuildRequires: pkg-config BuildRequires: pkgconfig(gdlib) >= 2.1.1 - Requires: php-common%{?_isa} = %{version}-%{release} %description gd @@ -620,7 +544,6 @@ Summary: A module for PHP applications for using the bcmath library # All files licensed under PHP version 3.01, except # libbcmath is licensed under LGPLv2+ License: PHP AND LGPLv2+ - Requires: php-common%{?_isa} = %{version}-%{release} %description bcmath @@ -631,9 +554,7 @@ support for using the bcmath library to PHP. Summary: A module for PHP applications for using the GNU MP library # All files licensed under PHP version 3.01 License: PHP - BuildRequires: gmp-devel - Requires: php-common%{?_isa} = %{version}-%{release} %description gmp @@ -644,44 +565,42 @@ using the GNU MP library. Summary: A database abstraction layer module for PHP applications # All files licensed under PHP version 3.01 License: PHP - -BuildRequires: libdb-devel BuildRequires: tokyocabinet-devel - +Requires: php-common%{?_isa} = %{version}-%{release} +%if %{with_db4} +BuildRequires: libdb-devel +%endif %if %{with_lmdb} BuildRequires: lmdb-devel %endif - -Requires: php-common%{?_isa} = %{version}-%{release} - +%if %{with_qdbm} +BuildRequires: qdbm-devel +%endif %description dba The php-dba package contains a dynamic shared object that will add support for using the DBA database abstraction layer to PHP. +%if %{with_tidy} %package tidy Summary: Standard PHP module provides tidy library support # All files licensed under PHP version 3.01 License: PHP - BuildRequires: libtidy-devel - Requires: php-common%{?_isa} = %{version}-%{release} %description tidy The php-tidy package contains a dynamic shared object that will add support for using the tidy library to PHP. +%endif %if %{with_freetds} %package pdo-dblib Summary: PDO driver for Microsoft SQL Server and Sybase databases # All files licensed under PHP version 3.01 License: PHP - BuildRequires: freetds-devel - Requires: php-pdo%{?_isa} = %{version}-%{release} - Provides: php-pdo_dblib Provides: php-pdo_dblib%{?_isa} @@ -693,10 +612,8 @@ PHP to Microsoft SQL Server and Sybase databases through the FreeTDS library. %package embedded Summary: PHP library for embedding in applications -License: PHP AND Zend AND BSD AND MIT AND ASL 1.0 AND NCSA - +License: PHP AND Zend AND BSD AND MIT AND ASL 1.0 AND NCSA AND Boost Requires: php-common%{?_isa} = %{version}-%{release} - # doing a real -devel package for just the .so symlink is a bit overkill Provides: php-embedded-devel = %{version}-%{release} Provides: php-embedded-devel%{?_isa} = %{version}-%{release} @@ -710,9 +627,7 @@ into applications to provide PHP scripting language support. Summary: A module for PHP applications for using pspell interfaces # All files licensed under PHP version 3.01 License: PHP - BuildRequires: aspell-devel >= 0.50.0 - Requires: php-common%{?_isa} = %{version}-%{release} %description pspell @@ -724,12 +639,10 @@ support for using the pspell library to PHP. Summary: Internationalization extension for PHP applications # All files licensed under PHP version 3.01 License: PHP - BuildRequires: pkg-config BuildRequires: pkgconfig(icu-i18n) >= 50.1 BuildRequires: pkgconfig(icu-io) >= 50.1 BuildRequires: pkgconfig(icu-uc) >= 50.1 - Requires: php-common%{?_isa} = %{version}-%{release} %description intl @@ -740,47 +653,22 @@ support for using the ICU library to PHP. Summary: Enchant spelling extension for PHP applications # All files licensed under PHP version 3.0 License: PHP - BuildRequires: pkg-config -BuildRequires: pkgconfig(enchant) - +BuildRequires: pkgconfig(enchant-2) Requires: php-common%{?_isa} = %{version}-%{release} %description enchant The php-enchant package contains a dynamic shared object that will add support for using the enchant library to PHP. -%package json -Summary: JavaScript Object Notation extension for PHP -# All files licensed under PHP version 3.0.1 -License: PHP - -Requires: php-common%{?_isa} = %{version}-%{release} - -Obsoletes: php-pecl-json < %{version} -Provides: php-pecl-json = %{version} -Provides: php-pecl(json) = %{version} -Provides: php-pecl(json)%{?_isa} = %{version} -Provides: php-pecl-json%{?_isa} = %{version} - -Obsoletes: php-pecl-jsonc < %{version} - - -%description json -The php-json package provides an extension that will add -support for JavaScript Object Notation (JSON) to PHP. - %if %{with_sodium} %package sodium Summary: Wrapper for the Sodium cryptographic library # All files licensed under PHP version 3.0.1 License: PHP - BuildRequires: pkg-config BuildRequires: pkgconfig(libsodium) >= 1.0.9 - Requires: php-common%{?_isa} = %{version}-%{release} - Obsoletes: php-pecl-libsodium2 < 3 Provides: php-pecl(libsodium) = %{version} Provides: php-pecl(libsodium)%{?_isa} = %{version} @@ -796,10 +684,8 @@ Summary: Foreign Function Interface # All files licensed under PHP version 3.0.1 License: PHP Group: System Environment/Libraries - BuildRequires: pkg-config BuildRequires: pkgconfig(libffi) - Requires: php-common%{?_isa} = %{version}-%{release} %description ffi @@ -817,8 +703,8 @@ in pure PHP. %patch5 -p1 -b .includedir %patch6 -p1 -b .embed %patch8 -p1 -b .libdb -%patch9 -p1 +%patch41 -p1 -b .syslib %patch42 -p1 -b .systzdata %patch43 -p1 -b .headers @@ -835,8 +721,9 @@ in pure PHP. # Prevent %%doc confusion over LICENSE files -cp Zend/LICENSE Zend/ZEND_LICENSE +cp Zend/LICENSE ZEND_LICENSE cp TSRM/LICENSE TSRM_LICENSE +cp Zend/asm/LICENSE BOOST_LICENSE cp sapi/fpm/LICENSE fpm_LICENSE cp ext/mbstring/libmbfl/LICENSE libmbfl_LICENSE cp ext/fileinfo/libmagic/LICENSE libmagic_LICENSE @@ -844,11 +731,11 @@ cp ext/bcmath/libbcmath/LICENSE libbcmath_LICENSE cp ext/date/lib/LICENSE.rst timelib_LICENSE # Multiple builds for multiple SAPIs -mkdir build-cgi build-apache build-embedded \ +mkdir build-cgi build-embedded %if %{with_zts} - build-zts build-ztscli \ + mkdir build-zts build-ztscli %endif - build-fpm + mkdir build-fpm # ----- Manage known as failed test ------- # affected by systzdata patch @@ -867,7 +754,7 @@ rm ext/zlib/tests/004-mb.phpt pver=$(sed -n '/#define PHP_VERSION /{s/.* "//;s/".*$//;p}' main/php_version.h) if test "x${pver}" != "x%{version}"; then : Error: Upstream PHP version is now ${pver}, expecting %{version}. - : Update the version macro and rebuild. + : Update the version macros and rebuild. exit 1 fi @@ -913,13 +800,21 @@ cp %{SOURCE50} %{SOURCE51} %{SOURCE53} . %build +# This package fails to build with LTO due to undefined symbols. LTO +# was disabled in OpenSuSE as well, but with no real explanation why +# beyond the undefined symbols. It really should be investigated further. +# Disable LTO +%define _lto_cflags %{nil} + # Set build date from https://reproducible-builds.org/specs/source-date-epoch/ export SOURCE_DATE_EPOCH=$(date +%s -r NEWS) export PHP_UNAME=$(uname) -export PHP_BUILD_SYSTEM=$(cat %{_sysconfdir}/redhat-release | sed -e 's/ Beta//') +export PHP_BUILD_SYSTEM=$(cat /etc/redhat-release | sed -e 's/ Beta//') %if 0%{?vendor:1} export PHP_BUILD_PROVIDER="%{vendor}" %endif +export PHP_BUILD_COMPILER="$(gcc --version | head -n1)" +export PHP_BUILD_ARCH="%{_arch}" # Force use of system libtool: libtoolize --force --copy @@ -989,7 +884,7 @@ if test $? != 0; then exit 1 fi -make %{?_smp_mflags} +%make_build } # Build /usr/bin/php-cgi with the CGI SAPI, and most shared extensions @@ -1011,10 +906,16 @@ build --libdir=%{_libdir}/php \ --enable-bcmath=shared \ --with-bz2=shared \ --enable-ctype=shared \ - --enable-dba=shared --with-db4=%{_prefix} \ + --enable-dba=shared \ +%if %{with_db4} + --with-db4=%{_prefix} \ +%endif --with-tcadb=%{_prefix} \ %if %{with_lmdb} --with-lmdb=%{_prefix} \ +%endif +%if %{with_qdbm} + --with-qdbm=%{_prefix} \ %endif --enable-exif=shared \ --enable-ftp=shared \ @@ -1022,7 +923,6 @@ build --libdir=%{_libdir}/php \ --with-iconv=shared \ --enable-sockets=shared \ --enable-tokenizer=shared \ - --with-xmlrpc=shared \ --with-ldap=shared --with-ldap-sasl \ --enable-mysqlnd=shared \ --with-mysqli=shared,mysqlnd \ @@ -1048,14 +948,15 @@ build --libdir=%{_libdir}/php \ --with-pdo-dblib=shared,%{_prefix} \ %endif --with-sqlite3=shared \ - --enable-json=shared \ --without-readline \ --with-libedit \ %if %{with_pspell} --with-pspell=shared \ %endif --enable-phar=shared \ +%if %{with_tidy} --with-tidy=shared,%{_prefix} \ +%endif --enable-sysvmsg=shared --enable-sysvshm=shared --enable-sysvsem=shared \ --enable-shmop=shared \ --enable-posix=shared \ @@ -1074,7 +975,7 @@ popd without_shared="--without-gd \ --disable-dom --disable-dba --without-unixODBC \ --disable-opcache \ - --disable-json \ + --disable-phpdbg \ --without-ffi \ --disable-xmlreader --disable-xmlwriter \ --without-sodium \ @@ -1086,16 +987,6 @@ without_shared="--without-gd \ --disable-shmop --disable-sockets --disable-tokenizer \ --disable-sysvmsg --disable-sysvshm --disable-sysvsem" -# Build Apache module, and the CLI SAPI, /usr/bin/php -pushd build-apache -build --with-apxs2=%{_bindir}/apxs \ - --with-apu=%{_bindir}/apu-1-config \ - --libdir=%{_libdir}/php \ - --without-mysqli \ - --disable-pdo \ - ${without_shared} -popd - # Build php-fpm pushd build-fpm build --enable-fpm \ @@ -1122,7 +1013,7 @@ pushd build-ztscli EXTENSION_DIR=%{_libdir}/php-zts/modules build --includedir=%{_includedir}/php-zts \ --libdir=%{_libdir}/php-zts \ - --enable-maintainer-zts \ + --enable-zts \ --program-prefix=zts- \ --disable-cgi \ --with-config-file-scan-dir=%{_sysconfdir}/php-zts.d \ @@ -1140,10 +1031,16 @@ build --includedir=%{_includedir}/php-zts \ --enable-bcmath=shared \ --with-bz2=shared \ --enable-ctype=shared \ - --enable-dba=shared --with-db4=%{_prefix} \ + --enable-dba=shared \ +%if %{with_db4} + --with-db4=%{_prefix} \ +%endif --with-tcadb=%{_prefix} \ %if %{with_lmdb} --with-lmdb=%{_prefix} \ +%endif +%if %{with_qdbm} + --with-qdbm=%{_prefix} \ %endif --with-gettext=shared \ --with-iconv=shared \ @@ -1151,7 +1048,6 @@ build --includedir=%{_includedir}/php-zts \ --enable-tokenizer=shared \ --enable-exif=shared \ --enable-ftp=shared \ - --with-xmlrpc=shared \ --with-ldap=shared --with-ldap-sasl \ --enable-mysqlnd=shared \ --with-mysqli=shared,mysqlnd \ @@ -1178,14 +1074,15 @@ build --includedir=%{_includedir}/php-zts \ --with-pdo-dblib=shared,%{_prefix} \ %endif --with-sqlite3=shared \ - --enable-json=shared \ --without-readline \ --with-libedit \ %if %{with_pspell} --with-pspell=shared \ %endif --enable-phar=shared \ +%if %{with_tidy} --with-tidy=shared,%{_prefix} \ +%endif --enable-sysvmsg=shared --enable-sysvshm=shared --enable-sysvsem=shared \ --enable-shmop=shared \ --enable-posix=shared \ @@ -1201,26 +1098,20 @@ build --includedir=%{_includedir}/php-zts \ --with-enchant=shared popd -# Build a special thread-safe Apache SAPI -pushd build-zts -build --with-apxs2=%{_httpd_apxs} \ - --includedir=%{_includedir}/php-zts \ - --libdir=%{_libdir}/php-zts \ - --enable-maintainer-zts \ - --with-config-file-scan-dir=%{_sysconfdir}/php-zts.d \ - --without-mysqli \ - --disable-pdo \ - ${without_shared} -popd - ### NOTE!!! EXTENSION_DIR was changed for the -zts build, so it must remain ### the last SAPI to be built. %endif %check +: Ensure proper NTS/ZTS build +%{buildroot}%{_bindir}/php -n -v | grep NTS +%if %{with_zts} +%{buildroot}%{_bindir}/zts-php -n -v | grep ZTS +%endif + %if %{runselftest} -cd build-apache +cd build-fpm # Run tests, using the CLI SAPI export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 @@ -1262,6 +1153,9 @@ make -C build-fpm install-fpm \ make -C build-cgi install \ INSTALL_ROOT=%{buildroot} +# Use php-config from embed SAPI to reduce used libs +install -m 755 build-embedded/scripts/php-config %{buildroot}%{_bindir}/php-config + # Install the default configuration file install -m 755 -d %{buildroot}%{_sysconfdir}/ install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/php.ini @@ -1269,21 +1163,6 @@ install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/php.ini # For third-party packaging: install -m 755 -d %{buildroot}%{_datadir}/php/preload -# install the DSO -install -m 755 -d %{buildroot}%{_httpd_moddir} -install -m 755 build-apache/libs/libphp7.so %{buildroot}%{_httpd_moddir} - -%if %{with_zts} -# install the ZTS DSO -install -m 755 build-zts/libs/libphp7.so %{buildroot}%{_httpd_moddir}/libphp7-zts.so -%endif - -# Apache config fragment -# Dual config file with httpd >= 2.4 (fedora >= 18) -install -D -m 644 %{SOURCE9} %{buildroot}%{_httpd_modconfdir}/15-php.conf -%if %{with_zts} -cat %{SOURCE10} >>%{buildroot}%{_httpd_modconfdir}/15-php.conf -%endif install -D -m 644 %{SOURCE1} %{buildroot}%{_httpd_confdir}/php.conf install -m 755 -d %{buildroot}%{_sysconfdir}/php.d @@ -1335,7 +1214,6 @@ for mod in pgsql odbc ldap snmp \ %if %{with_imap} imap \ %endif - json \ mysqlnd mysqli \ mbstring gd dom xsl soap bcmath dba \ simplexml bz2 calendar ctype exif ftp gettext gmp iconv \ @@ -1343,7 +1221,9 @@ for mod in pgsql odbc ldap snmp \ sqlite3 \ enchant phar fileinfo intl \ ffi \ +%if %{with_tidy} tidy \ +%endif %if %{with_pspell} pspell \ %endif @@ -1359,14 +1239,14 @@ for mod in pgsql odbc ldap snmp \ %if %{with_freetds} pdo_dblib \ %endif - xmlrpc xmlreader xmlwriter + xmlreader xmlwriter do case $mod in opcache) # Zend extensions TESTCMD="$TESTCMD --define zend_extension=$mod" ini=10-${mod}.ini;; - pdo_*|mysqli|xmlreader|xmlrpc) + pdo_*|mysqli|xmlreader) # Extensions with dependencies on 20-* TESTCMD="$TESTCMD --define extension=$mod" ini=30-${mod}.ini;; @@ -1460,8 +1340,8 @@ rm -rf %{buildroot}%{_libdir}/php/modules/*.a \ %{buildroot}%{_datadir}/pear \ %{buildroot}%{_bindir}/zts-phar* \ %{buildroot}%{_mandir}/man1/zts-phar* \ - %{buildroot}%{_libdir}/libphp7.a \ - %{buildroot}%{_libdir}/libphp7.la + %{buildroot}%{_libdir}/libphp.a \ + %{buildroot}%{_libdir}/libphp.la # Remove irrelevant docs rm -f README.{Zeus,QNX,CVS-RULES} @@ -1477,20 +1357,9 @@ rm -f README.{Zeus,QNX,CVS-RULES} %transfiletriggerin fpm -- %{_sysconfdir}/php-fpm.d %{_sysconfdir}/php.d systemctl try-restart php-fpm.service >/dev/null 2>&1 || : -%files -%{_httpd_moddir}/libphp7.so -%if %{with_zts} -%{_httpd_moddir}/libphp7-zts.so -%endif -%attr(0770,root,apache) %dir %{_sharedstatedir}/php/session -%attr(0770,root,apache) %dir %{_sharedstatedir}/php/wsdlcache -%attr(0770,root,apache) %dir %{_sharedstatedir}/php/opcache -%config(noreplace) %{_httpd_confdir}/php.conf -%config(noreplace) %{_httpd_modconfdir}/15-php.conf - %files common -f files.common %doc EXTENSIONS NEWS UPGRADING* README.REDIST.BINS *md docs -%license LICENSE TSRM_LICENSE +%license LICENSE TSRM_LICENSE ZEND_LICENSE BOOST_LICENSE %license libmagic_LICENSE %license timelib_LICENSE %doc php.ini-* @@ -1528,7 +1397,7 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %{_mandir}/man1/phpize.1* %files dbg -%doc sapi/phpdbg/{README.md,CREDITS} +%doc sapi/phpdbg/CREDITS %{_bindir}/phpdbg %{_mandir}/man1/phpdbg.1* %if %{with_zts} @@ -1577,8 +1446,8 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %{_rpmmacrodir}/macros.php %files embedded -%{_libdir}/libphp7.so -%{_libdir}/libphp7-%{embed_version}.so +%{_libdir}/libphp.so +%{_libdir}/libphp-%{majmin}.so %files pgsql -f files.pgsql @@ -1593,8 +1462,6 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %files xml -f files.xml -%files xmlrpc -f files.xmlrpc - %files mbstring -f files.mbstring %license libmbfl_LICENSE @@ -1610,8 +1477,10 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %files dba -f files.dba %files pdo -f files.pdo - +%if %{with_tidy} %files tidy -f files.tidy +%endif + %if %{with_freetds} %files pdo-dblib -f files.pdo_dblib %endif @@ -1636,8 +1505,6 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %if %{with_zts} %config(noreplace) %{_sysconfdir}/php-zts.d/opcache-default.blacklist %endif - -%files json -f files.json %if %{with_sodium} %files sodium -f files.sodium %endif @@ -1646,59 +1513,313 @@ systemctl try-restart php-fpm.service >/dev/null 2>&1 || : %dir %{_datadir}/php/preload %changelog -* Thu Jun 02 2022 Pawel Winogrodzki - 7.4.14-3 -- Adding a patch to work with "gd" 2.3.3+. +* Fri Oct 7 2022 Osama Esmail 8.1.11-2 +- Initial CBL-Mariner import from Fedora 36 (license: MIT). +- Replaced conditional flags with global variables +- Replaced/deleted extraneous macros +- Downloaded php-keyring.gpg and php-8.1.11.tar.xz.asc +- Use Mariner's libxcrypt-devel instead of Fedora using system libxcrypt +- Replaced %{_bindir} with /bin, %{_sysconfdir} with /etc, %{_lib} with /lib +- Removed all mod-php support - License verified. -* Thu Feb 11 2021 Henry Li - 7.4.14-2 -- Initial CBL-Mariner import from Fedora 32 (license: MIT). -- Change /usr/bin/ps to /bin/ps -- Add systemd-devel as BuildRequires for fpm package -- Expand macro %{?systemd_requires} -- Set with-libdir=/lib to look at /lib during config -- Set with-apxs2=%{_bindir}/apxs and add --with-apu=%{_bindir}/apu-1-config -- Define _httpd_confdir, _httpd_modconfdir and _httpd_moddir +* Wed Sep 28 2022 Remi Collet - 8.1.11-1 +- Update to 8.1.11 - http://www.php.net/releases/8_1_11.php + +* Thu Sep 8 2022 Remi Collet - 8.1.10-1 +- Update to 8.1.10 - http://www.php.net/releases/8_1_10.php + +* Tue Aug 2 2022 Remi Collet - 8.1.9-1 +- Update to 8.1.9 - http://www.php.net/releases/8_1_9.php + +* Wed Jul 6 2022 Remi Collet - 8.1.8-1 +- Update to 8.1.8 - http://www.php.net/releases/8_1_8.php + +* Wed Jun 8 2022 Remi Collet - 8.1.7-1 +- Update to 8.1.7 - http://www.php.net/releases/8_1_7.php +- add upstream patch to initialize pcre before mbstring + +* Wed May 11 2022 Remi Collet - 8.1.6-1 +- Update to 8.1.6 - http://www.php.net/releases/8_1_6.php + +* Wed Apr 13 2022 Remi Collet - 8.1.5-1 +- Update to 8.1.5 - http://www.php.net/releases/8_1_5.php + +* Wed Mar 16 2022 Remi Collet - 8.1.4-1 +- Update to 8.1.4 - http://www.php.net/releases/8_1_4.php + +* Thu Mar 3 2022 Remi Collet - 8.1.4~RC1-1 +- update to 8.1.4RC1 + +* Wed Feb 23 2022 Remi Collet - 8.1.3-2 +- retrieve tzdata version #2056611 + +* Wed Feb 16 2022 Remi Collet - 8.1.3-1 +- Update to 8.1.3 - http://www.php.net/releases/8_1_3.php + +* Fri Jan 21 2022 Fedora Release Engineering - 8.1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jan 19 2022 Remi Collet - 8.1.2-1 +- Update to 8.1.2 - http://www.php.net/releases/8_1_2.php + +* Sat Jan 08 2022 Miro Hrončok - 8.1.2~RC1-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 + +* Wed Jan 5 2022 Remi Collet - 8.1.2~RC1-1 +- update to 8.1.2RC1 + +* Wed Dec 15 2021 Remi Collet - 8.1.1-1 +- Update to 8.1.1 - http://www.php.net/releases/8_1_1.php + +* Thu Dec 2 2021 Remi Collet - 8.1.1~RC1-1 +- update to 8.1.1RC1 + +* Wed Nov 24 2021 Remi Collet - 8.1.0-1 +- update to 8.1.0 GA + +* Wed Nov 10 2021 Remi Collet - 8.1.0~RC6-1 +- update to 8.1.0RC6 + +* Tue Oct 26 2021 Remi Collet - 8.1.0~RC5-1 +- update to 8.1.0RC5 - https://fedoraproject.org/wiki/Changes/php81 +- bump API version + +* Tue Oct 19 2021 Remi Collet - 8.0.12-2 +- dba: enable qdbm backend + +* Tue Oct 19 2021 Remi Collet - 8.0.12-1 +- Update to 8.0.12 - http://www.php.net/releases/8_0_12.php + +* Mon Oct 18 2021 Remi Collet - 8.0.12~RC1-2 +- build using system libxcrypt + +* Wed Oct 6 2021 Remi Collet - 8.0.12~RC1-1 +- update to 8.0.12RC1 + +* Wed Sep 22 2021 Remi Collet - 8.0.11-1 +- Update to 8.0.11 - http://www.php.net/releases/8_0_11.php + +* Tue Sep 14 2021 Sahana Prasad - 8.0.11~RC1-4 +- Rebuilt with OpenSSL 3.0.0 + +* Mon Sep 13 2021 Remi Collet - 8.0.11~RC1-3 +- more changes for OpenSSL 3 from PHP 8.1 + +* Fri Sep 10 2021 Remi Collet - 8.0.11~RC1-2 +- backport changes for OpenSSL 3 from PHP 8.1 + +* Tue Sep 7 2021 Remi Collet - 8.0.11~RC1-1 +- update to 8.0.11RC1 + +* Thu Aug 26 2021 Remi Collet - 8.0.10-1 +- Update to 8.0.10 - http://www.php.net/releases/8_0_10.php + +* Wed Aug 11 2021 Remi Collet - 8.0.10~RC1-3 +- phar: switch to sha256 signature by default, backported from 8.1 +- phar: implement openssl_256 and openssl_512 for signatures, backported from 8.1 + +* Wed Aug 11 2021 Remi Collet - 8.0.10~RC1-2 +- snmp: add sha256 / sha512 security protocol, backported from 8.1 + +* Tue Aug 10 2021 Remi Collet - 8.0.10~RC1-1 +- update to 8.0.10RC1 +- adapt systzdata patch for timelib 2020.03 (v20) + +* Tue Aug 3 2021 Remi Collet - 8.0.9-2 +- add upstream patch for https://bugs.php.net/81325 segfault in simplexml + +* Thu Jul 29 2021 Remi Collet - 8.0.9-1 +- Update to 8.0.9 - http://www.php.net/releases/8_0_9.php + +* Fri Jul 23 2021 Fedora Release Engineering - 8.0.9~RC1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jul 19 2021 Remi Collet - 8.0.9~RC1-1 +- update to 8.0.9RC1 + +* Tue Jun 29 2021 Remi Collet - 8.0.8-1 +- Update to 8.0.8 - http://www.php.net/releases/8_0_8.php + +* Tue Jun 15 2021 Remi Collet - 8.0.8~RC1-1 +- update to 8.0.8RC1 + +* Wed Jun 2 2021 Remi Collet - 8.0.7-1 +- Update to 8.0.7 - http://www.php.net/releases/8_0_7.php + +* Thu May 27 2021 Remi Collet - 8.0.7~RC1-2 +- fix snmp extension for net-snmp without DES + +* Thu May 20 2021 Remi Collet - 8.0.7~RC1-1 +- update to 8.0.7RC1 + +* Thu May 20 2021 Pete Walter - 8.0.6-4 +- Rebuild for ICU 69 + +* Sat May 8 2021 Remi Collet - 8.0.6-3 +- get rid of inet_addr and gethostbyaddr calls + +* Thu May 6 2021 Remi Collet - 8.0.6-2 +- get rid of inet_ntoa and inet_aton calls + +* Wed May 5 2021 Remi Collet - 8.0.6-1 +- Update to 8.0.6 - http://www.php.net/releases/8_0_6.php + +* Tue Apr 27 2021 Remi Collet - 8.0.5-1 +- Update to 8.0.5 - http://www.php.net/releases/8_0_5.php + +* Tue Apr 13 2021 Remi Collet - 8.0.5~RC1-1 +- update to 8.0.5RC1 + +* Fri Mar 19 2021 Remi Collet - 8.0.4~RC1-2 +- make libdb usage conditional + default: on for Fedora, off for RHEL + +* Tue Mar 16 2021 Remi Collet - 8.0.4~RC1-1 +- update to 8.0.4RC1 + +* Mon Mar 15 2021 Remi Collet - 8.0.3-2 +- clean conditions + +* Thu Mar 4 2021 Remi Collet - 8.0.3-1 +- Update to 8.0.3 - http://www.php.net/releases/8_0_3.php +- see https://fedoraproject.org/wiki/Changes/php80 +- drop xmlrpc extension +- drop json subpackage, extension always there +- enchant: use libenchant-2 instead of libenchant + +* Tue Mar 2 2021 Remi Collet - 7.4.16-1 +- Update to 7.4.16 - http://www.php.net/releases/7_4_16.php + +* Wed Feb 24 2021 Remi Collet - 7.4.15-3 +- drop php-imap, fix #1929640 + +* Mon Feb 08 2021 Pavel Raiskup - 7.4.15-2 +- rebuild for libpq ABI fix rhbz#1908268 + +* Tue Feb 2 2021 Remi Collet - 7.4.15-1 +- Update to 7.4.15 - http://www.php.net/releases/7_4_15.php +- add upstream patch for https://bugs.php.net/80682 + fix opcache doesn't honour pcre.jit option + +* Wed Jan 27 2021 Fedora Release Engineering - 7.4.15~RC2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jan 19 2021 Remi Collet - 7.4.15~RC2-1 +- update to 7.4.15RC2 * Tue Jan 5 2021 Remi Collet - 7.4.14-1 - Update to 7.4.14 - http://www.php.net/releases/7_4_14.php + +* Wed Dec 16 2020 Remi Collet - 7.4.14~RC1-1 +- update to 7.4.14RC1 + +* Tue Dec 1 2020 Remi Collet - 7.4.13-2 - explicitly requires make + https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot * Tue Nov 24 2020 Remi Collet - 7.4.13-1 - Update to 7.4.13 - http://www.php.net/releases/7_4_13.php +* Thu Nov 12 2020 Remi Collet - 7.4.13~RC1-1 +- update to 7.4.13RC1 + * Tue Oct 27 2020 Remi Collet - 7.4.12-1 - Update to 7.4.12 - http://www.php.net/releases/7_4_12.php +* Tue Oct 13 2020 Remi Collet - 7.4.12~RC1-1 +- update to 7.4.12RC1 + * Tue Sep 29 2020 Remi Collet - 7.4.11-1 - Update to 7.4.11 - http://www.php.net/releases/7_4_11.php +* Tue Sep 15 2020 Remi Collet - 7.4.11~RC1-1 +- update to 7.4.11RC1 + +* Thu Sep 03 2020 Josef Řídký - 7.4.10-2 +- Rebuilt for new net-snmp release + * Tue Sep 1 2020 Remi Collet - 7.4.10-1 - Update to 7.4.10 - http://www.php.net/releases/7_4_10.php +* Thu Aug 27 2020 Josef Řídký - 7.4.10~RC1-2 +- Rebuilt for new net-snmp release + +* Tue Aug 18 2020 Remi Collet - 7.4.10~RC1-1 +- update to 7.4.10RC1 + * Mon Aug 10 2020 Remi Collet - 7.4.9-1 - Update to 7.4.9 - http://www.php.net/releases/7_4_9.php +* Tue Jul 28 2020 Fedora Release Engineering - 7.4.9~RC1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 21 2020 Remi Collet - 7.4.9~RC1-1 +- update to 7.4.9RC1 + +* Tue Jul 14 2020 Tom Stellard - 7.4.8-3 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Thu Jul 9 2020 Remi Collet - 7.4.8-2 - Update to 7.4.8 - http://www.php.net/releases/7_4_8.php rebuild from new sources * Tue Jul 7 2020 Remi Collet - 7.4.8-1 - Update to 7.4.8 - http://www.php.net/releases/7_4_8.php + +* Mon Jul 6 2020 Remi Collet - 7.4.8~RC1-3 - display build system and provider in phpinfo (from 8.0) + +* Wed Jul 01 2020 Jeff Law - 7.4.8~RC1-2 +- Disable LTO + +* Tue Jun 23 2020 Remi Collet - 7.4.8~RC1-1 +- update to 7.4.8RC1 - drop patch to fix PHP_UNAME +* Tue Jun 16 2020 Remi Collet - 7.4.7-2 +- disable build of mod_php + https://fedoraproject.org/wiki/Changes/drop_mod_php + * Tue Jun 9 2020 Remi Collet - 7.4.7-1 - Update to 7.4.7 - http://www.php.net/releases/7_4_7.php +* Mon Jun 8 2020 Remi Collet - 7.4.7~RC1-4 +- rewrite conditional using bcond_with and bcond_without + +* Tue May 26 2020 Remi Collet - 7.4.7~RC1-1 +- update to 7.4.7RC1 + +* Wed May 20 2020 Remi Collet - 7.4.6-3 +- use php-config from embed SAPI to reduce used libs + +* Sat May 16 2020 Pete Walter - 7.4.6-2 +- Rebuild for ICU 67 + * Tue May 12 2020 Remi Collet - 7.4.6-1 - Update to 7.4.6 - http://www.php.net/releases/7_4_6.php +* Wed Apr 29 2020 Remi Collet - 7.4.6~RC1-1 +- update to 7.4.6RC1 + +* Tue Apr 21 2020 Remi Collet - 7.4.5-2 +- make mod_php optional (enabled by default for now) +- drop mod_php ZTS build +- run FPM tests + * Tue Apr 14 2020 Remi Collet - 7.4.5-1 - Update to 7.4.5 - http://www.php.net/releases/7_4_5.php +* Tue Mar 31 2020 Remi Collet - 7.4.5~RC1-1 +- update to 7.4.5RC1 + * Tue Mar 17 2020 Remi Collet - 7.4.4-1 - Update to 7.4.4 - http://www.php.net/releases/7_4_4.php +* Tue Mar 3 2020 Remi Collet - 7.4.4~RC1-1 +- update to 7.4.4RC1 + * Tue Feb 18 2020 Remi Collet - 7.4.3-1 - Update to 7.4.3 - http://www.php.net/releases/7_4_3.php diff --git a/SPECS-EXTENDED/tidy/tidy.signatures.json b/SPECS/tidy/tidy.signatures.json similarity index 100% rename from SPECS-EXTENDED/tidy/tidy.signatures.json rename to SPECS/tidy/tidy.signatures.json diff --git a/SPECS-EXTENDED/tidy/tidy.spec b/SPECS/tidy/tidy.spec similarity index 92% rename from SPECS-EXTENDED/tidy/tidy.spec rename to SPECS/tidy/tidy.spec index da37da964c..e2dad472d8 100644 --- a/SPECS-EXTENDED/tidy/tidy.spec +++ b/SPECS/tidy/tidy.spec @@ -2,29 +2,23 @@ %global libname libtidy %global upname tidy-html5 %global tidy_compat_headers 1 - -Name: tidy -Summary: Utility to clean up and pretty print HTML/XHTML/XML -Version: 5.7.28 -Release: 4%{?dist} - -License: W3C +Summary: Utility to clean up and pretty print HTML/XHTML/XML +Name: tidy +Version: 5.7.28 +Release: 5%{?dist} +License: W3C Vendor: Microsoft Corporation Distribution: Mariner -URL: http://www.html-tidy.org/ -Source0: https://github.com/htacg/%{upname}/archive/%{version}.tar.gz#/%{upname}-%{version}.tar.gz - +URL: https://www.html-tidy.org/ +Source0: https://cblmarinerstorage.blob.core.windows.net/sources/core/tidy-html5-%{version}.tar.gz +BuildRequires: cmake +BuildRequires: gcc ## upstream patches - -BuildRequires: gcc-c++ -BuildRequires: cmake -BuildRequires: gcc -BuildRequires: libxslt -BuildRequires: pkgconfig - -Provides: tidy-html5 = %{version}-%{release} - -Requires: %{libname}%{?_isa} = %{version}-%{release} +BuildRequires: gcc-c++ +BuildRequires: libxslt +BuildRequires: pkg-config +Requires: %{libname}%{?_isa} = %{version}-%{release} +Provides: tidy-html5 = %{version}-%{release} %description When editing HTML it's easy to make mistakes. Wouldn't it be nice if @@ -37,19 +31,20 @@ identify where you need to pay further attention on making your pages more accessible to people with disabilities. %package -n %{libname} -Summary: Runtime library for %{name} +Summary: Runtime library for %{name} + %description -n %{libname} %{summary}. %package -n %{libname}-devel -Summary: Development files for %{name} -Obsoletes: tidy-devel < 0.99.0-10 -Provides: tidy-devel = %{version}-%{release} -Requires: %{libname}%{?_isa} = %{version}-%{release} +Summary: Development files for %{name} +Requires: %{libname}%{?_isa} = %{version}-%{release} +Obsoletes: tidy-devel < 0.99.0-10 +Provides: tidy-devel = %{version}-%{release} + %description -n %{libname}-devel %{summary}. - %prep %autosetup -n %{upname}-%{version} -p1 @@ -73,7 +68,7 @@ make install/fast DESTDIR=%{buildroot} -C build/cmake ## unpackaged files # omit static lib -rm -fv $RPM_BUILD_ROOT%{_libdir}/libtidys.a +rm -fv %{buildroot}%{_libdir}/libtidys.a %files @@ -95,8 +90,12 @@ rm -fv $RPM_BUILD_ROOT%{_libdir}/libtidys.a %{_libdir}/libtidy.so %{_libdir}/pkgconfig/tidy.pc - %changelog +* Fri Sep 16 2022 Osama Esmail - 5.7.28-5 +- Moved from SPECS-EXTENDED to SPECS +- License verified +- Updated source URL + * Fri Oct 15 2021 Pawel Winogrodzki - 5.7.28-4 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/SPECS-EXTENDED/tokyocabinet/tokyocabinet-fedora.patch b/SPECS/tokyocabinet/tokyocabinet-fedora.patch similarity index 100% rename from SPECS-EXTENDED/tokyocabinet/tokyocabinet-fedora.patch rename to SPECS/tokyocabinet/tokyocabinet-fedora.patch diff --git a/SPECS-EXTENDED/tokyocabinet/tokyocabinet-manhelp.patch b/SPECS/tokyocabinet/tokyocabinet-manhelp.patch similarity index 100% rename from SPECS-EXTENDED/tokyocabinet/tokyocabinet-manhelp.patch rename to SPECS/tokyocabinet/tokyocabinet-manhelp.patch diff --git a/SPECS-EXTENDED/tokyocabinet/tokyocabinet.signatures.json b/SPECS/tokyocabinet/tokyocabinet.signatures.json similarity index 100% rename from SPECS-EXTENDED/tokyocabinet/tokyocabinet.signatures.json rename to SPECS/tokyocabinet/tokyocabinet.signatures.json diff --git a/SPECS-EXTENDED/tokyocabinet/tokyocabinet.spec b/SPECS/tokyocabinet/tokyocabinet.spec similarity index 86% rename from SPECS-EXTENDED/tokyocabinet/tokyocabinet.spec rename to SPECS/tokyocabinet/tokyocabinet.spec index fe9882d55e..0b0d801492 100644 --- a/SPECS-EXTENDED/tokyocabinet/tokyocabinet.spec +++ b/SPECS/tokyocabinet/tokyocabinet.spec @@ -1,37 +1,41 @@ -Summary: A modern implementation of a DBM -Name: tokyocabinet -Version: 1.4.48 -Release: 16%{?dist} -License: LGPLv2+ +Summary: A modern implementation of a DBM +Name: tokyocabinet +Version: 1.4.48 +Release: 17%{?dist} +License: LGPLv2+ Vendor: Microsoft Corporation Distribution: Mariner -URL: http://fallabs.com/tokyocabinet/ -Source: http://fallabs.com/%{name}/%{name}-%{version}.tar.gz -Patch0: tokyocabinet-fedora.patch -Patch1: tokyocabinet-manhelp.patch -BuildRequires: pkgconfig zlib-devel bzip2-devel autoconf gcc +URL: http://fallabs.com/tokyocabinet/ +Source: https://cblmarinerstorage.blob.core.windows.net/sources/core/tokyocabinet-%{version}.tar.gz +Patch0: tokyocabinet-fedora.patch +Patch1: tokyocabinet-manhelp.patch +BuildRequires: autoconf +BuildRequires: bzip2-devel +BuildRequires: gcc +BuildRequires: pkg-config +BuildRequires: zlib-devel %description -Tokyo Cabinet is a library of routines for managing a database. It is the +Tokyo Cabinet is a library of routines for managing a database. It is the successor of QDBM. Tokyo Cabinet runs very fast. For example, the time required to store 1 million records is 1.5 seconds for a hash database and 2.2 seconds for a B+ tree database. Moreover, the database size is very small and can be up to 8EB. Furthermore, the scalability of Tokyo Cabinet is great. %package devel -Summary: Headers for developing programs that will use %{name} -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig +Summary: Headers for developing programs that will use %{name} +Requires: %{name} = %{version}-%{release} +Requires: pkg-config %description devel This package contains the libraries and header files needed for developing with %{name}. %package devel-doc -Summary: Documentation files for developing programs that will use %{name} -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig -BuildArch: noarch +Summary: Documentation files for developing programs that will use %{name} +Requires: %{name} = %{version}-%{release} +Requires: pkg-config +BuildArch: noarch %description devel-doc This package contains documentation files for the libraries and header files @@ -39,14 +43,14 @@ needed for developing with %{name}. %prep %setup -q -%patch0 -p0 -b .fedora +%patch0 -b .fedora %patch1 -p1 -b .manhelp %build autoconf %configure --enable-off64 CFLAGS="$CFLAGS" make %{?_smp_mflags} - + %install make DESTDIR=%{buildroot} install @@ -59,7 +63,8 @@ make check %ldconfig_scriptlets %files -%doc ChangeLog COPYING README +%license COPYING +%doc ChangeLog README %{_bindir}/tc* %{_libdir}/libtokyocabinet.so.* %{_libexecdir}/tcawmgr.cgi @@ -75,6 +80,10 @@ make check %doc doc/* %changelog +* Fri Sep 16 2022 Osama Esmail - 1.4.48-17 +- Moved from SPECS-EXTENDED to SPECS +- License verified + * Fri Oct 15 2021 Pawel Winogrodzki - 1.4.48-16 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/cgmanifest.json b/cgmanifest.json index 74ef5f2db9..3d17a02efc 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -2439,7 +2439,7 @@ "other": { "name": "docbook-dtds", "version": "1.0", - "downloadUrl": "http://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip" + "downloadUrl": "https://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip" } } }, @@ -4710,8 +4710,8 @@ "type": "other", "other": { "name": "hunspell", - "version": "1.7.0", - "downloadUrl": "https://github.com/hunspell/hunspell/archive/refs/tags/v1.7.0.tar.gz" + "version": "1.7.1", + "downloadUrl": "https://github.com/hunspell/hunspell/releases/download/v1.7.1/hunspell-1.7.1.tar.gz" } } }, @@ -11392,7 +11392,7 @@ "other": { "name": "malaga", "version": "7.12", - "downloadUrl": "http://home.arcor.de/bjoern-beutel/malaga/malaga-7.12.tgz" + "downloadUrl": "https://dynalabs.de/mxp/assets/malaga-7.12.tgz" } } }, @@ -19254,8 +19254,8 @@ "type": "other", "other": { "name": "php", - "version": "7.4.14", - "downloadUrl": "https://www.php.net/distributions/php-7.4.14.tar.xz" + "version": "8.1.11", + "downloadUrl": "https://www.php.net/distributions/php-8.1.11.tar.xz" } } }, @@ -26038,7 +26038,7 @@ "other": { "name": "tidy", "version": "5.7.28", - "downloadUrl": "https://github.com/htacg/tidy-html5/archive/5.7.28.tar.gz" + "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/tidy-html5-5.7.28.tar.gz" } } }, @@ -26148,7 +26148,7 @@ "other": { "name": "tokyocabinet", "version": "1.4.48", - "downloadUrl": "http://fallabs.com/tokyocabinet/tokyocabinet-1.4.48.tar.gz" + "downloadUrl": "https://cblmarinerstorage.blob.core.windows.net/sources/core/tokyocabinet-1.4.48.tar.gz" } } },