August 2018 - Arch-excludes - Fedora mailing-lists

Architecture specific change in rpms/golang-github-AudriusButkevicius-kcp-go.git
by githook-noreply＠fedoraproject.org 30 Aug '18

30 Aug '18

The package rpms/golang-github-AudriusButkevicius-kcp-go.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/golang-github-AudriusButkevicius-kc…. Change: -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} Thanks. Full change: ============ commit 29041f1b78a1f0ac876644affbee6c547c782523 Author: Fabio Valentini <decathorpe(a)gmail.com> Date: Thu Aug 30 22:16:04 2018 +0200 update to spec 3.0 diff --git a/.gitignore b/.gitignore index 6844ef3..fe65ffb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /AudriusButkevicius-kcp-go-d17218b.tar.gz /AudriusButkevicius-kcp-go-8ae5f52.tar.gz /AudriusButkevicius-kcp-go-5d7d1a8.tar.gz +/kcp-go-5d7d1a807aa5b7817d03f6edae42d602e98487f7.tar.gz diff --git a/golang-github-AudriusButkevicius-kcp-go.spec b/golang-github-AudriusButkevicius-kcp-go.spec index d271175..3a38789 100644 --- a/golang-github-AudriusButkevicius-kcp-go.spec +++ b/golang-github-AudriusButkevicius-kcp-go.spec @@ -1,59 +1,31 @@ -# Generate devel rpm -%global with_devel 1 -# Build project from bundled dependencies -%global with_bundled 0 -# Build with debug info rpm -%global with_debug 0 -# Run tests in check section -%global with_check 1 -# Generate unit-test rpm -%global with_unit_test 1 - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - -%global provider github -%global provider_tld com -%global project AudriusButkevicius -%global repo kcp-go # https://github.com/AudriusButkevicius/kcp-go -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit 5d7d1a807aa5b7817d03f6edae42d602e98487f7 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20171227 +%global goipath github.com/AudriusButkevicius/kcp-go +%global commit 5d7d1a807aa5b7817d03f6edae42d602e98487f7 +%global date 20171227 +%gometa -Name: golang-%{provider}-%{project}-%{repo} +Name: golang-github-AudriusButkevicius-kcp-go Version: 0 -Release: 0.5.%{commitdate}.git%{shortcommit}%{?dist} +Release: 0.6%{?dist} Summary: Full-featured reliable UDP communication library License: MIT -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{project}-%{repo}-%{shortcommit}.tar.gz + +URL: %{gourl} +Source0: %{gosource} # Upstream ships a test that's broken in fedora build environments. # It exceeds the hard-coded limit of 1024 open files. Patch0: 00-disable-broken-tests.patch -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} - %description %{summary} -%if 0%{?with_devel} %package devel Summary: %{summary} BuildArch: noarch -%if 0%{?with_check} && ! 0%{?with_bundled} BuildRequires: golang(github.com/klauspost/reedsolomon) BuildRequires: golang(github.com/pkg/errors) BuildRequires: golang(github.com/templexxx/xor) @@ -66,129 +38,37 @@ BuildRequires: golang(golang.org/x/crypto/tea) BuildRequires: golang(golang.org/x/crypto/twofish) BuildRequires: golang(golang.org/x/crypto/xtea) BuildRequires: golang(golang.org/x/net/ipv4) -%endif - -Requires: golang(github.com/klauspost/reedsolomon) -Requires: golang(github.com/pkg/errors) -Requires: golang(github.com/templexxx/xor) -Requires: golang(github.com/tjfoc/gmsm/sm4) -Requires: golang(golang.org/x/crypto/blowfish) -Requires: golang(golang.org/x/crypto/cast5) -Requires: golang(golang.org/x/crypto/pbkdf2) -Requires: golang(golang.org/x/crypto/salsa20) -Requires: golang(golang.org/x/crypto/tea) -Requires: golang(golang.org/x/crypto/twofish) -Requires: golang(golang.org/x/crypto/xtea) -Requires: golang(golang.org/x/net/ipv4) - -Provides: golang(%{import_path}) = %{version}-%{release} %description devel %{summary} This package contains library source intended for building other packages which use import path with -%{import_path} prefix. -%endif - - -%if 0%{?with_unit_test} && 0%{?with_devel} -%package unit-test-devel -Summary: Unit tests for %{name} package - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%description unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif +%{goipath} prefix. %prep -%setup -q -n %{repo}-%{commit} +%gosetup -q %patch0 -p1 -%build - - %install -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list - -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . $ -iname "*.go" -or -iname "*.s" $ \! -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ - -# find all *_test.go files and generate unit-test-devel.file-list -for file in $(find . -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif +%goinstall %check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} - -%if ! 0%{?gotest:1} -%global gotest go test -%endif - -%gotest %{import_path} -%endif - - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} +%gochecks -%if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE %doc README.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%doc README.md -%endif %changelog +* Thu Aug 30 2018 Fabio Valentini <decathorpe(a)gmail.com> - 0-0.6.20171227git5d7d1a8 +- Update to use spec 3.0. + * Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.5.20171227.git5d7d1a8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 487a028..611d18e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (AudriusButkevicius-kcp-go-5d7d1a8.tar.gz) = 74aa62e89fd95e040556470d6f725a701bf8f6e2427663b79755533c1b65e06f1dc6b88f563f32566662b78fdcfda449d2645f18c5962ed667e4becb679cbaff +SHA512 (kcp-go-5d7d1a807aa5b7817d03f6edae42d602e98487f7.tar.gz) = 74aa62e89fd95e040556470d6f725a701bf8f6e2427663b79755533c1b65e06f1dc6b88f563f32566662b78fdcfda449d2645f18c5962ed667e4becb679cbaff

1 0

Architecture specific change in rpms/discord-irc.git
by githook-noreply＠fedoraproject.org 30 Aug '18

30 Aug '18

The package rpms/discord-irc.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/discord-irc.git/commit/?id=dae4bc3b…. Change: +ExclusiveArch: %{nodejs_arches} noarch Thanks. Full change: ============ commit dae4bc3b515b56b0f91ebd4a019d9104d60f7e80 Author: Ben Rosser <rosser.bjr(a)gmail.com> Date: Thu Aug 30 16:05:45 2018 -0400 Initial import (rhbz#1622694). diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8e2dc5a --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/discord-irc-2.6.1.tgz +*.rpm diff --git a/config.json b/config.json new file mode 100644 index 0000000..bbcaf2b --- /dev/null +++ b/config.json @@ -0,0 +1,54 @@ +[ + // Bot 1 (minimal configuration): + { + "nickname": "test2", + "server": "irc.testbot.org", + "discordToken": "botwantsin123", + "channelMapping": { + "#other-discord": "#new-irc-channel" + } + }, + + // Bot 2 (advanced options): + { + "nickname": "test", + "server": "irc.bottest.org", + "discordToken": "botwantsin123", + "autoSendCommands": [ // Commands that will be sent on connect + ["PRIVMSG", "NickServ", "IDENTIFY password"], + ["MODE", "test", "+x"], + ["AUTH", "test", "password"] + ], + "channelMapping": { // Maps each Discord-channel to an IRC-channel, used to direct messages to the correct place + "#discord": "#irc channel-password", // Add channel keys after the channel name + "1234567890": "#channel" // Use a discord channel ID instead of its name (so you can rename it or to disambiguate) + }, + "ircOptions": { // Optional node-irc options + "floodProtection": false, // On by default + "floodProtectionDelay": 1000 // 500 by default + }, + "format": { // Optional custom formatting options + // Patterns, represented by {$patternName}, are replaced when sending messages + "commandPrelude": "Command sent by {$nickname}", // Message sent before a command + "ircText": "<{$displayUsername}> {$text}", // When sending a message to IRC + "urlAttachment": "<{$displayUsername}> {$attachmentURL}", // When sending a Discord attachment to IRC + "discord": "**<{$author}>** {$withMentions}" // When sending a message to Discord + // Other patterns that can be used: + // {$discordChannel} (e.g. #general) + // {$ircChannel} (e.g. #irc) + }, + "ircNickColor": false, // Gives usernames a color in IRC for better readability (on by default) + // Makes the bot hide the username prefix for messages that start + // with one of these characters (commands): + "commandCharacters": ["!", "."], + "ircStatusNotices": true, // Enables notifications in Discord when people join/part in the relevant IRC channel + "ignoreUsers": { + "irc": ["irc_nick1", "irc_nick2"], // Ignore specified IRC nicks and do not send their messages to Discord. + "discord": ["discord_nick1", "discord_nick2"] // Ignore specified Discord nicks and do not send their messages to IRC. + }, + // List of webhooks per channel + "webhooks": { + "#discord": "https://discordapp.com/api/webhooks/id/token" + } + } +] diff --git a/discord-irc b/discord-irc new file mode 100755 index 0000000..9a9348e --- /dev/null +++ b/discord-irc @@ -0,0 +1,3 @@ +#!/bin/bash + +cd /usr/lib/node_modules/discord-irc/ && node dist/index.js "$@" diff --git a/discord-irc.service b/discord-irc.service new file mode 100644 index 0000000..6c02c53 --- /dev/null +++ b/discord-irc.service @@ -0,0 +1,12 @@ +[Unit] +Description=Discord-IRC Bridge +After=network.target + +[Service] +ExecStart = /usr/bin/discord-irc -c /etc/discord-irc/config.json +Restart = on-failure + +[Install] +WantedBy=multi-user.target +After=network-online.target +Wants=network-online.target diff --git a/discord-irc.spec b/discord-irc.spec new file mode 100644 index 0000000..a1bf47a --- /dev/null +++ b/discord-irc.spec @@ -0,0 +1,112 @@ +%global npmname discord-irc + +Name: %{npmname} +Version: 2.6.1 +Release: 2%{?dist} +Summary: Connects Discord and IRC channels by sending messages back and forth + +License: MIT +URL: https://www.npmjs.com/package/%{npmname} + +Source0: https://registry.npmjs.org/%{npmname}/-/%{npmname}-%{version}.tgz + +# Script to run discord-irc. +Source1: discord-irc + +# Default config file, taken from upstream README. +Source2: config.json + +# Systemd service file. +Source3: discord-irc.service + +BuildRequires: nodejs-packaging + +BuildRequires: nodejs-check-env +BuildRequires: nodejs-commander +BuildRequires: nodejs-discord-js +BuildRequires: nodejs-irc-colors +BuildRequires: nodejs-irc-formatting +BuildRequires: nodejs-irc-upd +BuildRequires: nodejs-lodash +BuildRequires: nodejs-simple-markdown +BuildRequires: nodejs-strip-json-comments +BuildRequires: nodejs-winston + +%{?systemd_requires} +BuildRequires: systemd + +BuildArch: noarch +ExclusiveArch: %{nodejs_arches} noarch + +%description +Connects Discord and IRC channels by sending messages back and forth. + +%prep +%autosetup -n package + +# There is no point even pretending any of these packages will ever +# be the right versions. +%nodejs_fixdep check-env +%nodejs_fixdep commander +%nodejs_fixdep discord.js +%nodejs_fixdep irc-colors +%nodejs_fixdep irc-formatting +%nodejs_fixdep irc-upd +%nodejs_fixdep lodash +%nodejs_fixdep simple-markdown +%nodejs_fixdep strip-json-comments +%nodejs_fixdep winston + +%build +# Nothing to build, this is a noarch package + +%install +mkdir -p %{buildroot}%{nodejs_sitelib}/%{npmname} +cp -a dist %{buildroot}%{nodejs_sitelib}/%{npmname}/ +cp -a package.json %{buildroot}%{nodejs_sitelib}/%{npmname}/ + +%nodejs_symlink_deps + +# We need to land a script in /usr/bin to do something. +mkdir -p %{buildroot}%{_bindir} +cp -p %SOURCE1 %{buildroot}%{_bindir} + +# We should install template configuration file. +mkdir -p %{buildroot}%{_sysconfdir}/discord-irc +cp -p %SOURCE2 %{buildroot}%{_sysconfdir}/discord-irc/ + +# We need to install a systemd service file too. +mkdir -p %{buildroot}%{_unitdir} +cp -p %SOURCE3 %{buildroot}%{_unitdir} + +# Remove the shbang after installation from cli.js +sed '/env node/d' -i %{buildroot}%{nodejs_sitelib}/%{npmname}/dist/cli.js + +%check +%nodejs_symlink_deps --check + +%post +%systemd_post discord-irc.service + +%preun +%systemd_preun discord-irc.service + +%postun +%systemd_postun_with_restart discord-irc.service + +%files +%{_bindir}/discord-irc +%{_unitdir}/discord-irc.service +%{nodejs_sitelib}/%{npmname}/ +%config(noreplace) %{_sysconfdir}/discord-irc +%doc README.md CHANGELOG.md +%license LICENSE + +%changelog +* Wed Aug 29 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 2.6.1-2 +- Add missing systemd scriplets. +- Own the entire /etc/discord-irc/ directory as config(noreplace). +- Strip shbang from dist/cli.js in the module install directory. + +* Thu Aug 16 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 2.6.1-1 +- Initial package. diff --git a/sources b/sources new file mode 100644 index 0000000..6dd2c8e --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (discord-irc-2.6.1.tgz) = e6c441ec68297baaa7d3d35aadf6215f083a8d53d8a6b155d60f7ed785bd49372bf08135125173f9d2aa39b5930d869566dd5dc14d88ef65e671c1b4f948408c

1 0

Architecture specific change in rpms/golang-github-AudriusButkevicius-go-nat-pmp.git
by githook-noreply＠fedoraproject.org 30 Aug '18

30 Aug '18

The package rpms/golang-github-AudriusButkevicius-go-nat-pmp.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/golang-github-AudriusButkevicius-go…. Change: -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} Thanks. Full change: ============ commit de75e864c9ad324d0cdae814ec43273a905d6ed8 Author: Fabio Valentini <decathorpe(a)gmail.com> Date: Thu Aug 30 22:04:27 2018 +0200 update to spec 3.0 diff --git a/.gitignore b/.gitignore index 0be1daa..ecbb1c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /go-nat-pmp-452c976.tar.gz +/go-nat-pmp-452c97607362b2ab5a7839b8d1704f0396b640ca.tar.gz diff --git a/golang-github-AudriusButkevicius-go-nat-pmp.spec b/golang-github-AudriusButkevicius-go-nat-pmp.spec index 9791902..f364f2e 100644 --- a/golang-github-AudriusButkevicius-go-nat-pmp.spec +++ b/golang-github-AudriusButkevicius-go-nat-pmp.spec @@ -1,167 +1,56 @@ -# Generate devel rpm -%global with_devel 1 -# Build project from bundled dependencies -%global with_bundled 0 -# Build with debug info rpm -%global with_debug 0 -# Run tests in check section -%global with_check 1 -# Generate unit-test rpm -%global with_unit_test 0 - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - - -%global provider github -%global provider_tld com -%global project AudriusButkevicius -%global repo go-nat-pmp # https://github.com/AudriusButkevicius/go-nat-pmp -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit 452c97607362b2ab5a7839b8d1704f0396b640ca -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global goipath github.com/AudriusButkevicius/go-nat-pmp +%global commit 452c97607362b2ab5a7839b8d1704f0396b640ca +%global date 20160522 -Name: golang-%{provider}-%{project}-%{repo} +%gometa + +Name: golang-github-AudriusButkevicius-go-nat-pmp Version: 0 -Release: 0.5.git%{shortcommit}%{?dist} +Release: 0.6%{?dist} Summary: Go language client for the NAT-PMP protocol License: ASL 2.0 -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz - -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +URL: %{gourl} +Source0: %{gosource} %description %{summary} -%if 0%{?with_devel} %package devel Summary: %{summary} BuildArch: noarch -Provides: golang(%{import_path}) = %{version}-%{release} %description devel %{summary} This package contains library source intended for building other packages which use import path with -%{import_path} prefix. -%endif - - -%if 0%{?with_unit_test} && 0%{?with_devel} -%package unit-test-devel -Summary: Unit tests for %{name} package -%if 0%{?with_check} -#Here comes all BuildRequires: PACKAGE the unit tests -#in %%check section need for running -%endif - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%description unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif +%{goipath} prefix. %prep -%setup -q -n %{repo}-%{commit} - - -%build +%gosetup -q %install -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . $ -iname "*.go" -or -iname "*.s" $ \! -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -# find all *_test.go files and generate unit-test-devel.file-list -for file in $(find . -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif +%goinstall %check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%if ! 0%{?with_bundled} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%else -# No dependency directories so far +%gochecks -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%endif -%if ! 0%{?gotest:1} -%global gotest go test -%endif - -%endif - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - - -%if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE %doc README.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif - - -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%doc README.md -%endif %changelog +* Thu Aug 30 2018 Fabio Valentini <decathorpe(a)gmail.com> - 0-0.6.20160522git452c976 +- Update to use spec 3.0. + * Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0-0.5.git452c976 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 2b4d7de..2ceb69d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (go-nat-pmp-452c976.tar.gz) = c907f22b887808cf16f1ec2d4789465d2370a70c2e1b9ad2bb2170499713eea78b65f3ea2b5baad656e846f779d71b1b61e89b19ee5288b1584294bfe06a9743 +SHA512 (go-nat-pmp-452c97607362b2ab5a7839b8d1704f0396b640ca.tar.gz) = c907f22b887808cf16f1ec2d4789465d2370a70c2e1b9ad2bb2170499713eea78b65f3ea2b5baad656e846f779d71b1b61e89b19ee5288b1584294bfe06a9743

1 0

Architecture specific change in rpms/golang-github-AudriusButkevicius-cli.git
by githook-noreply＠fedoraproject.org 30 Aug '18

30 Aug '18

The package rpms/golang-github-AudriusButkevicius-cli.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/golang-github-AudriusButkevicius-cl…. Change: -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} Thanks. Full change: ============ commit 965def9936a33b15d49c6dc65447a4b3599c1f1c Author: Fabio Valentini <decathorpe(a)gmail.com> Date: Thu Aug 30 21:54:26 2018 +0200 update to spec 3.0 diff --git a/.gitignore b/.gitignore index e1ef87f..52c4304 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /AudriusButkevicius-cli-7f561c7.tar.gz +/cli-7f561c78b5a4aad858d9fd550c92b5da6d55efbb.tar.gz diff --git a/golang-github-AudriusButkevicius-cli.spec b/golang-github-AudriusButkevicius-cli.spec index 8bb3b4c..701bf0e 100644 --- a/golang-github-AudriusButkevicius-cli.spec +++ b/golang-github-AudriusButkevicius-cli.spec @@ -1,168 +1,61 @@ -# Generate devel rpm -%global with_devel 1 -# Build project from bundled dependencies -%global with_bundled 0 -# Build with debug info rpm -%global with_debug 0 -# Run tests in check section -%global with_check 1 -# Generate unit-test rpm -%global with_unit_test 1 - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - -%global provider github -%global provider_tld com -%global project AudriusButkevicius -%global repo cli # https://github.com/AudriusButkevicius/cli -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit 7f561c78b5a4aad858d9fd550c92b5da6d55efbb -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commitdate 20140727 +%global goipath github.com/AudriusButkevicius/cli +%global commit 7f561c78b5a4aad858d9fd550c92b5da6d55efbb +%global date 20140727 +%gometa -Name: golang-%{provider}-%{project}-%{repo} +Name: golang-github-AudriusButkevicius-cli Version: 1.0.0 -Release: 6.%{commitdate}.git%{shortcommit}%{?dist} +Release: 7%{?dist} Summary: Small library for building CLI apps in Go License: MIT -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/AudriusButkevicius-%{repo}-%{shortcommit}.tar.gz + +URL: %{gourl} +Source0: %{gosource} # Upstream pull request to fix failing compilation of tests # https://github.com/AudriusButkevicius/cli/pull/1 Patch0: 00-fix-go-111-unused-errors.patch -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} - %description %{summary} -%if 0%{?with_devel} %package devel Summary: %{summary} BuildArch: noarch -Provides: golang(%{import_path}) = %{version}-%{release} - %description devel %{summary} This package contains library source intended for building other packages which use import path with -%{import_path} prefix. -%endif - - -%if 0%{?with_unit_test} && 0%{?with_devel} -%package unit-test-devel -Summary: Unit tests for %{name} package - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - - -%description unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif +%{goipath} prefix. %prep -%setup -q -n %{repo}-%{commit} +%gosetup -q %patch0 -p1 -%build - - %install -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list - -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . $ -iname "*.go" -or -iname "*.s" $ \! -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ - -# find all *_test.go files and generate unit-test-devel.file-list -for file in $(find . -iname "*_test.go") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif +%goinstall %check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} - -%if ! 0%{?gotest:1} -%global gotest go test -%endif - -%gotest %{import_path} -%endif - - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} +%gochecks -%if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE %doc README.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif - - -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%doc README.md -%endif %changelog +* Thu Aug 30 2018 Fabio Valentini <decathorpe(a)gmail.com> - 1.0.0-7.20140727git7f561c7 +- Update to use spec 3.0. + * Wed Jul 25 2018 Fabio Valentini <decathorpe(a)gmail.com> - 1.0.0-6.20140727.git7f561c7 - Include patch to fix building tests with go 1.11. diff --git a/sources b/sources index 6ebe159..ce15a9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (AudriusButkevicius-cli-7f561c7.tar.gz) = 668d6cb997ed3cf7e5570a39307d57b30208c74b4c89dd83856a37d4f9a32121603e0900e0476ba315b964f8e7bddc096f52e2642a28da9af173ca48fa73368d +SHA512 (cli-7f561c78b5a4aad858d9fd550c92b5da6d55efbb.tar.gz) = 668d6cb997ed3cf7e5570a39307d57b30208c74b4c89dd83856a37d4f9a32121603e0900e0476ba315b964f8e7bddc096f52e2642a28da9af173ca48fa73368d

1 0

Architecture specific change in rpms/llvm.git
by githook-noreply＠fedoraproject.org 30 Aug '18

30 Aug '18

The package rpms/llvm.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/llvm.git/commit/?id=165caa696e4bb06…. Change: +%ifarch %{gold_arches} Thanks. Full change: ============ commit 165caa696e4bb066cfad2523e14d846a85fe7d57 Author: Tom Stellard <tstellar(a)redhat.com> Date: Wed Aug 29 03:35:53 2018 +0000 Build the gold plugin on all supported architectures rhbz#1623305 diff --git a/llvm.spec b/llvm.spec index 9c24d27..0cd4698 100644 --- a/llvm.spec +++ b/llvm.spec @@ -1,6 +1,7 @@ #global debug_package %%{nil} # Components enabled if supported by target architecture: -%ifarch %ix86 x86_64 +%define gold_arches %{ix86} x86_64 %{arm} aarch64 %{power64} s390x +%ifarch %{gold_arches} %bcond_without gold %else %bcond_with gold @@ -50,7 +51,7 @@ Name: %{pkg_name} Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 0.8.rc%{rc_ver}%{?dist} +Release: 0.9.rc%{rc_ver}%{?dist} Summary: The Low Level Virtual Machine License: NCSA @@ -410,6 +411,9 @@ fi %endif %changelog +* Thu Aug 30 2018 Tom Stellard <tstellar(a)redhat.com> - 7.0.0-0.9.rc2 +- Build the gold plugin on all supported architectures + * Wed Aug 29 2018 Kevin Fenzi <kevin(a)scrye.com> - 7.0.0-0.8.rc2 - Re-enable debuginfo to avoid 25x size increase.

1 0

Architecture specific change in rpms/glibc.git
by githook-noreply＠fedoraproject.org 30 Aug '18

30 Aug '18

The package rpms/glibc.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/glibc.git/commit/?id=d0155879911885…. Change: -%ifarch %{ix86} Thanks. Full change: ============ commit d015587991188551d6396be7cc1415e66ede36e7 Author: Florian Weimer <fweimer(a)redhat.com> Date: Thu Aug 30 13:25:51 2018 +0200 Revert glibc_make_flags setting which is not needed in Fedora 28 (#1600034) diff --git a/glibc-ldflags.patch b/glibc-ldflags.patch deleted file mode 100644 index 16c0b87..0000000 --- a/glibc-ldflags.patch +++ /dev/null @@ -1,32 +0,0 @@ -This patch is similar to glibc-asflags.patch and is needed to change -the ld.so linker flags. It is needed to work around this valgrind -bug: https://bugzilla.redhat.com/show_bug.cgi?id=1600034 - -diff --git a/Makeconfig b/Makeconfig -index 92e76d6200bbcd5b..376181c8ff06dea7 100644 ---- a/Makeconfig -+++ b/Makeconfig -@@ -363,12 +363,12 @@ endif - ifeq (yesyes,$(build-shared)$(have-z-combreloc)) - combreloc-LDFLAGS = -Wl,-z,combreloc - LDFLAGS.so += $(combreloc-LDFLAGS) --LDFLAGS-rtld += $(combreloc-LDFLAGS) -+override LDFLAGS-rtld += $(combreloc-LDFLAGS) - endif - - relro-LDFLAGS = -Wl,-z,relro - LDFLAGS.so += $(relro-LDFLAGS) --LDFLAGS-rtld += $(relro-LDFLAGS) -+override LDFLAGS-rtld += $(relro-LDFLAGS) - - ifeq (yes,$(have-hash-style)) - # For the time being we unconditionally use 'both'. At some time we -@@ -376,7 +376,7 @@ ifeq (yes,$(have-hash-style)) - # with --hash-style=gnu only. - hashstyle-LDFLAGS = -Wl,--hash-style=both - LDFLAGS.so += $(hashstyle-LDFLAGS) --LDFLAGS-rtld += $(hashstyle-LDFLAGS) -+override LDFLAGS-rtld += $(hashstyle-LDFLAGS) - endif - - ifeq (yes,$(enable-static-pie)) diff --git a/glibc.spec b/glibc.spec index a390dca..b92a905 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ %define glibcsrcdir glibc-2.27-78-g2b47bb9cba %define glibcversion 2.27 -%define glibcrelease 32%{?dist} +%define glibcrelease 33%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -275,7 +275,6 @@ Patch2060: glibc-with-nonshared-cflags.patch Patch2061: glibc-asflags.patch Patch2062: glibc-extra-stackprot-1.patch Patch2063: glibc-extra-stackprot-2.patch -Patch2064: glibc-ldflags.patch ############################################################################## # End of glibc patches. @@ -836,7 +835,6 @@ microbenchmark tests on the system. %patch2061 -p1 %patch2062 -p1 %patch2063 -p1 -%patch2064 -p1 %patch0060 -p1 ############################################################################## @@ -948,25 +946,8 @@ rpm_append_flag () { rpm_inherit_flags \ "-Wp,-D_FORTIFY_SOURCE=2" \ -# Special flag to enable annobin annotations for statically linked -# assembler code. Needs to be passed to make; not preserved by -# configure. -%define glibc_make_flags_as ASFLAGS="-g -Wa,--generate-missing-build-notes=yes" -%if 0%{?rhel} > 0 -%define glibc_make_flags %{glibc_make_flags_as} %{glibc_make_flags_ld} -%else +# Special flags which need to be passed to make. Currently none. %define glibc_make_flags %{nil} -%endif - -# valgrind reports false positives if ld.so is linked with -# -z # separate-code (the downstream default) on i686, so -# we work around that here. See -# <https://bugzilla.redhat.com/show_bug.cgi?id=1600034>. -%ifarch %{ix86} -%define glibc_make_flags_ld LDFLAGS-rtld="-Wl,-z,noseparate-code" -%else -%define glibc_make_flags_ld %{nil} -%endif ############################################################################## # %%build - Generic options. @@ -2092,6 +2073,9 @@ fi %endif %changelog +* Thu Aug 30 2018 Florian Weimer <fweimer(a)redhat.com> - 2.27-33 +- Revert glibc_make_flags setting which is not needed in Fedora 28 (#1600034) + * Wed Aug 29 2018 Florian Weimer <fweimer(a)redhat.com> - 2.27-32 - Auto-sync with upstream branch release/2.27/master, commit 2b47bb9cba048e778a7d832f284feccb14a40483:

1 0

Architecture specific change in rpms/gd.git
by githook-noreply＠fedoraproject.org 30 Aug '18

30 Aug '18

The package rpms/gd.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/gd.git/commit/?id=644cfe31581439c98…. Change: +%ifarch %{ix86} Thanks. Full change: ============ commit 644cfe31581439c988c085bfe7a89d0743a2bde5 Author: Marek Skalick <mskalick(a)redhat.com> Date: Thu Aug 30 13:24:35 2018 +0200 gdimagegrayscale/basic test is till failing on F27 and F28 diff --git a/gd.spec b/gd.spec index 6b8e2f6..cacb48a 100644 --- a/gd.spec +++ b/gd.spec @@ -9,7 +9,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.2.5 -Release: 5%{?prever}%{?short}%{?dist} +Release: 6%{?prever}%{?short}%{?dist} Group: System Environment/Libraries License: MIT URL: http://libgd.github.io/ @@ -135,6 +135,13 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libgd.a %check +%ifarch %{ix86} +# See https://github.com/libgd/libgd/issues/359 +XFAIL_TESTS="gdimagegrayscale/basic $XFAIL_TESTS" +%endif + +export XFAIL_TESTS + : Upstream test suite make check @@ -164,6 +171,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Thu Aug 30 2018 mskalick(a)redhat.com - 2.2.5-6 +- gdimagegrayscale/basic test is till failing on F27 and F28 + * Thu Aug 30 2018 mskalick(a)redhat.com - 2.2.5-5 - Check return value in gdImageBmpPtr to avoid double free (CVE-2018-1000222) - Don't mark gdimagegrayscale/basic test as failing

1 0

Architecture specific change in rpms/gd.git
by githook-noreply＠fedoraproject.org 30 Aug '18

30 Aug '18

The package rpms/gd.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/gd.git/commit/?id=db74b09ab2e9f042a… https://src.fedoraproject.org/cgit/rpms/gd.git/commit/?id=644cfe31581439c98…. Change: -%ifarch %{ix86} +%ifarch %{ix86} Thanks. Full change: ============ commit 644cfe31581439c988c085bfe7a89d0743a2bde5 Author: Marek Skalick <mskalick(a)redhat.com> Date: Thu Aug 30 13:24:35 2018 +0200 gdimagegrayscale/basic test is till failing on F27 and F28 diff --git a/gd.spec b/gd.spec index 6b8e2f6..cacb48a 100644 --- a/gd.spec +++ b/gd.spec @@ -9,7 +9,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.2.5 -Release: 5%{?prever}%{?short}%{?dist} +Release: 6%{?prever}%{?short}%{?dist} Group: System Environment/Libraries License: MIT URL: http://libgd.github.io/ @@ -135,6 +135,13 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libgd.a %check +%ifarch %{ix86} +# See https://github.com/libgd/libgd/issues/359 +XFAIL_TESTS="gdimagegrayscale/basic $XFAIL_TESTS" +%endif + +export XFAIL_TESTS + : Upstream test suite make check @@ -164,6 +171,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Thu Aug 30 2018 mskalick(a)redhat.com - 2.2.5-6 +- gdimagegrayscale/basic test is till failing on F27 and F28 + * Thu Aug 30 2018 mskalick(a)redhat.com - 2.2.5-5 - Check return value in gdImageBmpPtr to avoid double free (CVE-2018-1000222) - Don't mark gdimagegrayscale/basic test as failing commit db74b09ab2e9f042ac21090d30dcd2ba7ac89a7f Author: Marek Skalick <mskalick(a)redhat.com> Date: Thu Aug 30 11:03:19 2018 +0200 Check return value in gdImageBmpPtr to avoid double free (CVE-2018-1000222) Don't mark gdimagegrayscale/basic test as failing. diff --git a/gd-2.2.5-gdImageBmpPtr-double-free.patch b/gd-2.2.5-gdImageBmpPtr-double-free.patch new file mode 100644 index 0000000..80f9712 --- /dev/null +++ b/gd-2.2.5-gdImageBmpPtr-double-free.patch @@ -0,0 +1,73 @@ +From ac16bdf2d41724b5a65255d4c28fb0ec46bc42f5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier(a)gentoo.org> +Date: Sat, 14 Jul 2018 13:54:08 -0400 +Subject: [PATCH] bmp: check return value in gdImageBmpPtr + +Closes #447. +--- + src/gd_bmp.c | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +diff --git a/src/gd_bmp.c b/src/gd_bmp.c +index bde0b9d3..78f40d9a 100644 +--- a/src/gd_bmp.c ++++ b/src/gd_bmp.c +@@ -47,6 +47,8 @@ static int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp + static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp_hdr_t *header); + static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info); + ++static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression); ++ + #define BMP_DEBUG(s) + + static int gdBMPPutWord(gdIOCtx *out, int w) +@@ -87,8 +89,10 @@ BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageBmpCtx(im, out, compression); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageBmpCtx(im, out, compression)) ++ rv = gdDPExtractData(out, size); ++ else ++ rv = NULL; + out->gd_free(out); + return rv; + } +@@ -141,6 +145,11 @@ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression) + compression - whether to apply RLE or not. + */ + BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) ++{ ++ _gdImageBmpCtx(im, out, compression); ++} ++ ++static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + { + int bitmap_size = 0, info_size, total_size, padding; + int i, row, xpos, pixel; +@@ -148,6 +157,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + unsigned char *uncompressed_row = NULL, *uncompressed_row_start = NULL; + FILE *tmpfile_for_compression = NULL; + gdIOCtxPtr out_original = NULL; ++ int ret = 1; + + /* No compression if its true colour or we don't support seek */ + if (im->trueColor) { +@@ -325,6 +335,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + out_original = NULL; + } + ++ ret = 0; + cleanup: + if (tmpfile_for_compression) { + #ifdef _WIN32 +@@ -338,7 +349,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + if (out_original) { + out_original->gd_free(out_original); + } +- return; ++ return ret; + } + + static int compress_row(unsigned char *row, int length) diff --git a/gd.spec b/gd.spec index f9d13e0..6b8e2f6 100644 --- a/gd.spec +++ b/gd.spec @@ -9,7 +9,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.2.5 -Release: 4%{?prever}%{?short}%{?dist} +Release: 5%{?prever}%{?short}%{?dist} Group: System Environment/Libraries License: MIT URL: http://libgd.github.io/ @@ -24,6 +24,8 @@ Source0: https://github.com/libgd/libgd/releases/download/gd-%{version}/li Patch1: gd-2.1.0-multilib.patch # CVE-2018-5711 - https://github.com/libgd/libgd/commit/a11f47475e6443b7f32d21f2271f28f417e2a… Patch2: gd-2.2.5-upstream.patch +# CVE-2018-1000222 - https://github.com/libgd/libgd/commit/ac16bdf2d41724b5a65255d4c28fb0ec46bc4… +Patch3: gd-2.2.5-gdImageBmpPtr-double-free.patch BuildRequires: freetype-devel BuildRequires: fontconfig-devel @@ -88,6 +90,7 @@ files for gd, a graphics library for creating PNG and JPEG graphics. %setup -q -n libgd-%{version}%{?prever:-%{prever}} %patch1 -p1 -b .mlib %patch2 -p1 -b .upstream +%patch3 -p1 -b .gdImageBmpPtr-free : $(perl config/getver.pl) @@ -132,13 +135,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libgd.a %check -%ifarch %{ix86} -# See https://github.com/libgd/libgd/issues/359 -XFAIL_TESTS="gdimagegrayscale/basic $XFAIL_TESTS" -%endif - -export XFAIL_TESTS - : Upstream test suite make check @@ -168,6 +164,10 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Thu Aug 30 2018 mskalick(a)redhat.com - 2.2.5-5 +- Check return value in gdImageBmpPtr to avoid double free (CVE-2018-1000222) +- Don't mark gdimagegrayscale/basic test as failing + * Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild commit 239e837e28266ddbaff69cf3a0db16179625914a Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Fri Jul 13 01:12:18 2018 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/gd.spec b/gd.spec index d15072e..f9d13e0 100644 --- a/gd.spec +++ b/gd.spec @@ -9,7 +9,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.2.5 -Release: 3%{?prever}%{?short}%{?dist} +Release: 4%{?prever}%{?short}%{?dist} Group: System Environment/Libraries License: MIT URL: http://libgd.github.io/ @@ -168,6 +168,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Mar 26 2018 Marek Skalick <mskalick(a)redhat.com> - 2.2.5-3 - Fix CVE-2018-5711 - Potential infinite loop in gdImageCreateFromGifCtx

1 0

Architecture specific change in rpms/gd.git
by githook-noreply＠fedoraproject.org 30 Aug '18

30 Aug '18

The package rpms/gd.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/gd.git/commit/?id=db74b09ab2e9f042a…. Change: -%ifarch %{ix86} Thanks. Full change: ============ commit db74b09ab2e9f042ac21090d30dcd2ba7ac89a7f Author: Marek Skalick <mskalick(a)redhat.com> Date: Thu Aug 30 11:03:19 2018 +0200 Check return value in gdImageBmpPtr to avoid double free (CVE-2018-1000222) Don't mark gdimagegrayscale/basic test as failing. diff --git a/gd-2.2.5-gdImageBmpPtr-double-free.patch b/gd-2.2.5-gdImageBmpPtr-double-free.patch new file mode 100644 index 0000000..80f9712 --- /dev/null +++ b/gd-2.2.5-gdImageBmpPtr-double-free.patch @@ -0,0 +1,73 @@ +From ac16bdf2d41724b5a65255d4c28fb0ec46bc42f5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier(a)gentoo.org> +Date: Sat, 14 Jul 2018 13:54:08 -0400 +Subject: [PATCH] bmp: check return value in gdImageBmpPtr + +Closes #447. +--- + src/gd_bmp.c | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +diff --git a/src/gd_bmp.c b/src/gd_bmp.c +index bde0b9d3..78f40d9a 100644 +--- a/src/gd_bmp.c ++++ b/src/gd_bmp.c +@@ -47,6 +47,8 @@ static int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp + static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp_hdr_t *header); + static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info); + ++static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression); ++ + #define BMP_DEBUG(s) + + static int gdBMPPutWord(gdIOCtx *out, int w) +@@ -87,8 +89,10 @@ BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageBmpCtx(im, out, compression); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageBmpCtx(im, out, compression)) ++ rv = gdDPExtractData(out, size); ++ else ++ rv = NULL; + out->gd_free(out); + return rv; + } +@@ -141,6 +145,11 @@ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression) + compression - whether to apply RLE or not. + */ + BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) ++{ ++ _gdImageBmpCtx(im, out, compression); ++} ++ ++static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + { + int bitmap_size = 0, info_size, total_size, padding; + int i, row, xpos, pixel; +@@ -148,6 +157,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + unsigned char *uncompressed_row = NULL, *uncompressed_row_start = NULL; + FILE *tmpfile_for_compression = NULL; + gdIOCtxPtr out_original = NULL; ++ int ret = 1; + + /* No compression if its true colour or we don't support seek */ + if (im->trueColor) { +@@ -325,6 +335,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + out_original = NULL; + } + ++ ret = 0; + cleanup: + if (tmpfile_for_compression) { + #ifdef _WIN32 +@@ -338,7 +349,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + if (out_original) { + out_original->gd_free(out_original); + } +- return; ++ return ret; + } + + static int compress_row(unsigned char *row, int length) diff --git a/gd.spec b/gd.spec index f9d13e0..6b8e2f6 100644 --- a/gd.spec +++ b/gd.spec @@ -9,7 +9,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.2.5 -Release: 4%{?prever}%{?short}%{?dist} +Release: 5%{?prever}%{?short}%{?dist} Group: System Environment/Libraries License: MIT URL: http://libgd.github.io/ @@ -24,6 +24,8 @@ Source0: https://github.com/libgd/libgd/releases/download/gd-%{version}/li Patch1: gd-2.1.0-multilib.patch # CVE-2018-5711 - https://github.com/libgd/libgd/commit/a11f47475e6443b7f32d21f2271f28f417e2a… Patch2: gd-2.2.5-upstream.patch +# CVE-2018-1000222 - https://github.com/libgd/libgd/commit/ac16bdf2d41724b5a65255d4c28fb0ec46bc4… +Patch3: gd-2.2.5-gdImageBmpPtr-double-free.patch BuildRequires: freetype-devel BuildRequires: fontconfig-devel @@ -88,6 +90,7 @@ files for gd, a graphics library for creating PNG and JPEG graphics. %setup -q -n libgd-%{version}%{?prever:-%{prever}} %patch1 -p1 -b .mlib %patch2 -p1 -b .upstream +%patch3 -p1 -b .gdImageBmpPtr-free : $(perl config/getver.pl) @@ -132,13 +135,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libgd.a %check -%ifarch %{ix86} -# See https://github.com/libgd/libgd/issues/359 -XFAIL_TESTS="gdimagegrayscale/basic $XFAIL_TESTS" -%endif - -export XFAIL_TESTS - : Upstream test suite make check @@ -168,6 +164,10 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Thu Aug 30 2018 mskalick(a)redhat.com - 2.2.5-5 +- Check return value in gdImageBmpPtr to avoid double free (CVE-2018-1000222) +- Don't mark gdimagegrayscale/basic test as failing + * Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild commit 239e837e28266ddbaff69cf3a0db16179625914a Author: Fedora Release Engineering <releng(a)fedoraproject.org> Date: Fri Jul 13 01:12:18 2018 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org> diff --git a/gd.spec b/gd.spec index d15072e..f9d13e0 100644 --- a/gd.spec +++ b/gd.spec @@ -9,7 +9,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.2.5 -Release: 3%{?prever}%{?short}%{?dist} +Release: 4%{?prever}%{?short}%{?dist} Group: System Environment/Libraries License: MIT URL: http://libgd.github.io/ @@ -168,6 +168,9 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Mar 26 2018 Marek Skalick <mskalick(a)redhat.com> - 2.2.5-3 - Fix CVE-2018-5711 - Potential infinite loop in gdImageCreateFromGifCtx

1 0

Architecture specific change in rpms/gd.git
by githook-noreply＠fedoraproject.org 30 Aug '18

30 Aug '18

The package rpms/gd.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/gd.git/commit/?id=db74b09ab2e9f042a…. Change: -%ifarch %{ix86} Thanks. Full change: ============ commit db74b09ab2e9f042ac21090d30dcd2ba7ac89a7f Author: Marek Skalick <mskalick(a)redhat.com> Date: Thu Aug 30 11:03:19 2018 +0200 Check return value in gdImageBmpPtr to avoid double free (CVE-2018-1000222) Don't mark gdimagegrayscale/basic test as failing. diff --git a/gd-2.2.5-gdImageBmpPtr-double-free.patch b/gd-2.2.5-gdImageBmpPtr-double-free.patch new file mode 100644 index 0000000..80f9712 --- /dev/null +++ b/gd-2.2.5-gdImageBmpPtr-double-free.patch @@ -0,0 +1,73 @@ +From ac16bdf2d41724b5a65255d4c28fb0ec46bc42f5 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vapier(a)gentoo.org> +Date: Sat, 14 Jul 2018 13:54:08 -0400 +Subject: [PATCH] bmp: check return value in gdImageBmpPtr + +Closes #447. +--- + src/gd_bmp.c | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +diff --git a/src/gd_bmp.c b/src/gd_bmp.c +index bde0b9d3..78f40d9a 100644 +--- a/src/gd_bmp.c ++++ b/src/gd_bmp.c +@@ -47,6 +47,8 @@ static int bmp_read_4bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp + static int bmp_read_8bit(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info, bmp_hdr_t *header); + static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info); + ++static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression); ++ + #define BMP_DEBUG(s) + + static int gdBMPPutWord(gdIOCtx *out, int w) +@@ -87,8 +89,10 @@ BGD_DECLARE(void *) gdImageBmpPtr(gdImagePtr im, int *size, int compression) + void *rv; + gdIOCtx *out = gdNewDynamicCtx(2048, NULL); + if (out == NULL) return NULL; +- gdImageBmpCtx(im, out, compression); +- rv = gdDPExtractData(out, size); ++ if (!_gdImageBmpCtx(im, out, compression)) ++ rv = gdDPExtractData(out, size); ++ else ++ rv = NULL; + out->gd_free(out); + return rv; + } +@@ -141,6 +145,11 @@ BGD_DECLARE(void) gdImageBmp(gdImagePtr im, FILE *outFile, int compression) + compression - whether to apply RLE or not. + */ + BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) ++{ ++ _gdImageBmpCtx(im, out, compression); ++} ++ ++static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + { + int bitmap_size = 0, info_size, total_size, padding; + int i, row, xpos, pixel; +@@ -148,6 +157,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + unsigned char *uncompressed_row = NULL, *uncompressed_row_start = NULL; + FILE *tmpfile_for_compression = NULL; + gdIOCtxPtr out_original = NULL; ++ int ret = 1; + + /* No compression if its true colour or we don't support seek */ + if (im->trueColor) { +@@ -325,6 +335,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + out_original = NULL; + } + ++ ret = 0; + cleanup: + if (tmpfile_for_compression) { + #ifdef _WIN32 +@@ -338,7 +349,7 @@ BGD_DECLARE(void) gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression) + if (out_original) { + out_original->gd_free(out_original); + } +- return; ++ return ret; + } + + static int compress_row(unsigned char *row, int length) diff --git a/gd.spec b/gd.spec index f9d13e0..6b8e2f6 100644 --- a/gd.spec +++ b/gd.spec @@ -9,7 +9,7 @@ Summary: A graphics library for quick creation of PNG or JPEG images Name: gd Version: 2.2.5 -Release: 4%{?prever}%{?short}%{?dist} +Release: 5%{?prever}%{?short}%{?dist} Group: System Environment/Libraries License: MIT URL: http://libgd.github.io/ @@ -24,6 +24,8 @@ Source0: https://github.com/libgd/libgd/releases/download/gd-%{version}/li Patch1: gd-2.1.0-multilib.patch # CVE-2018-5711 - https://github.com/libgd/libgd/commit/a11f47475e6443b7f32d21f2271f28f417e2a… Patch2: gd-2.2.5-upstream.patch +# CVE-2018-1000222 - https://github.com/libgd/libgd/commit/ac16bdf2d41724b5a65255d4c28fb0ec46bc4… +Patch3: gd-2.2.5-gdImageBmpPtr-double-free.patch BuildRequires: freetype-devel BuildRequires: fontconfig-devel @@ -88,6 +90,7 @@ files for gd, a graphics library for creating PNG and JPEG graphics. %setup -q -n libgd-%{version}%{?prever:-%{prever}} %patch1 -p1 -b .mlib %patch2 -p1 -b .upstream +%patch3 -p1 -b .gdImageBmpPtr-free : $(perl config/getver.pl) @@ -132,13 +135,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/libgd.a %check -%ifarch %{ix86} -# See https://github.com/libgd/libgd/issues/359 -XFAIL_TESTS="gdimagegrayscale/basic $XFAIL_TESTS" -%endif - -export XFAIL_TESTS - : Upstream test suite make check @@ -168,6 +164,10 @@ grep %{version} $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gdlib.pc %changelog +* Thu Aug 30 2018 mskalick(a)redhat.com - 2.2.5-5 +- Check return value in gdImageBmpPtr to avoid double free (CVE-2018-1000222) +- Don't mark gdimagegrayscale/basic test as failing + * Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Arch-excludes August 2018