Merge branch 'f23' into f22
This commit is contained in:
commit
fa77fbbeeb
|
@ -27,3 +27,4 @@
|
||||||
/go1.5.2.src.tar.gz
|
/go1.5.2.src.tar.gz
|
||||||
/Mark.Twain-Tom.Sawyer.txt.bz2
|
/Mark.Twain-Tom.Sawyer.txt.bz2
|
||||||
/go1.5.3.src.tar.gz
|
/go1.5.3.src.tar.gz
|
||||||
|
/go1.5.4.src.tar.gz
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
# there are ELF files in src which are testdata and shouldn't be modified
|
|
||||||
-b /usr/lib/golang/src
|
|
||||||
-b /usr/lib64/golang/src
|
|
18
golang.spec
18
golang.spec
|
@ -85,10 +85,10 @@
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%global go_api 1.5
|
%global go_api 1.5
|
||||||
%global go_version 1.5.3
|
%global go_version 1.5.4
|
||||||
|
|
||||||
Name: golang
|
Name: golang
|
||||||
Version: 1.5.3
|
Version: 1.5.4
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: The Go Programming Language
|
Summary: The Go Programming Language
|
||||||
# source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
|
# source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
|
||||||
|
@ -159,7 +159,6 @@ Obsoletes: emacs-%{name} < 1.4
|
||||||
ExclusiveArch: %{golang_arches}
|
ExclusiveArch: %{golang_arches}
|
||||||
|
|
||||||
Source100: golang-gdbinit
|
Source100: golang-gdbinit
|
||||||
Source101: golang-prelink.conf
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
%{summary}.
|
%{summary}.
|
||||||
|
@ -397,11 +396,6 @@ ln -sf /etc/alternatives/gofmt $RPM_BUILD_ROOT%{_bindir}/gofmt
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d
|
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d
|
||||||
cp -av %{SOURCE100} $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d/golang.gdb
|
cp -av %{SOURCE100} $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d/golang.gdb
|
||||||
|
|
||||||
# prelink blacklist
|
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d
|
|
||||||
cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
|
|
||||||
|
|
||||||
|
|
||||||
%check
|
%check
|
||||||
export GOROOT=$(pwd -P)
|
export GOROOT=$(pwd -P)
|
||||||
export PATH="$GOROOT"/bin:"$PATH"
|
export PATH="$GOROOT"/bin:"$PATH"
|
||||||
|
@ -465,9 +459,6 @@ fi
|
||||||
# gdbinit (for gdb debugging)
|
# gdbinit (for gdb debugging)
|
||||||
%{_sysconfdir}/gdbinit.d
|
%{_sysconfdir}/gdbinit.d
|
||||||
|
|
||||||
# prelink blacklist
|
|
||||||
%{_sysconfdir}/prelink.conf.d
|
|
||||||
|
|
||||||
%files -f go-src.list src
|
%files -f go-src.list src
|
||||||
|
|
||||||
%files -f go-docs.list docs
|
%files -f go-docs.list docs
|
||||||
|
@ -485,6 +476,11 @@ fi
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Apr 13 2016 Jakub Čajka <jcajka@redhat.com> - 1.5.4-1
|
||||||
|
- rebase to 1.5.4
|
||||||
|
- resolves bz1324344 - CVE-2016-3959
|
||||||
|
- resolves bz1324951 - prelink is gone, /etc/prelink.conf.d/* is no longer used
|
||||||
|
|
||||||
* Thu Jan 14 2016 Jakub Čajka <jcajka@redhat.com> - 1.5.3-1
|
* Thu Jan 14 2016 Jakub Čajka <jcajka@redhat.com> - 1.5.3-1
|
||||||
- rebase to 1.5.3
|
- rebase to 1.5.3
|
||||||
- resolves bz1293451, CVE-2015-8618
|
- resolves bz1293451, CVE-2015-8618
|
||||||
|
|
Loading…
Reference in New Issue