Compare commits
10 Commits
a6c608b16c
...
a7fe76222c
Author | SHA1 | Date | |
---|---|---|---|
a7fe76222c | |||
de02738bfa | |||
3d5fccd20c | |||
7a4ba99463 | |||
b04e607750 | |||
13a8f6d8a8 | |||
35d58b6d8f | |||
e1473ebd4b | |||
895a907441 | |||
6c35befa96 |
159
base/catdoc/catdoc.spec
Normal file
159
base/catdoc/catdoc.spec
Normal file
@ -0,0 +1,159 @@
|
||||
Name: catdoc
|
||||
Version: 0.95
|
||||
Release: 19%{?dist}
|
||||
Summary: A program which converts Microsoft office files to plain text
|
||||
License: GPL-1.0-or-later
|
||||
URL: http://www.wagner.pp.ru/~vitus/software/catdoc/
|
||||
Source0: http://ftp.wagner.pp.ru/pub/catdoc/%{name}-%{version}.tar.gz
|
||||
Patch0: makefilefix.patch
|
||||
BuildRequires: gcc
|
||||
BuildRequires: tk
|
||||
BuildRequires: make
|
||||
Requires: tk
|
||||
|
||||
%description
|
||||
catdoc is program which reads one or more Microsoft word files
|
||||
and outputs text, contained insinde them to standard output.
|
||||
Therefore it does same work for.doc files, as unix cat
|
||||
command for plain ASCII files.
|
||||
It is now accompanied by xls2csv - program which converts
|
||||
Excel spreadsheet into comma-separated value file,
|
||||
and catppt - utility to extract textual information
|
||||
from Powerpoint files
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -P0 -p1 -b .makefilefix
|
||||
|
||||
%build
|
||||
%configure
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%license COPYING
|
||||
%{_bindir}/catdoc
|
||||
%{_bindir}/catppt
|
||||
%{_bindir}/wordview
|
||||
%{_bindir}/xls2csv
|
||||
%{_mandir}/man1/catdoc.1.*
|
||||
%{_mandir}/man1/catppt.1.*
|
||||
%{_mandir}/man1/wordview.1.*
|
||||
%{_mandir}/man1/xls2csv.1.*
|
||||
%{_datadir}/catdoc
|
||||
%doc README NEWS
|
||||
|
||||
%changelog
|
||||
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Mon Jun 17 2024 Miroslav Suchý <msuchy@redhat.com> - 0.95-18
|
||||
- convert license to SPDX
|
||||
|
||||
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.95-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Tue Jun 20 2017 Tom Callaway <spot@fedoraproject.org> - 0.95-1
|
||||
- update to 0.95, resolves licensing issue (bz1295166)
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.94.2-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.94.2-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 0.94.2-16
|
||||
- Fix build for https://fedoraproject.org/wiki/Changes/Harden_All_Packages
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.94.2-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.94.2-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.94.2-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.94.2-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.94.2-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Fri Nov 02 2012 Adel Gadllah <adel.gadllah@gmail.com> - 0.94.2-10
|
||||
- Fix buffer overflow vulnerability; RH#872390 / RH#872391
|
||||
|
||||
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.94.2-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.94.2-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.94.2-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.94.2-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.94.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Fri Feb 08 2008 Adel Gadllah <adel.gadllah@gmail.com> 0.94.2-4
|
||||
- Rebuild for gcc-4.3
|
||||
|
||||
* Sun Nov 11 2007 Adel Gadllah <adel.gadllah@gmail.com> 0.94.2-3
|
||||
- Preserve timestamps
|
||||
|
||||
* Sun Nov 03 2007 Adel Gadllah <adel.gadllah@gmail.com> 0.94.2-2
|
||||
- Require and BuildRequire tk
|
||||
- Fix changelog date
|
||||
|
||||
* Thu Oct 20 2007 Adel Gadllah <adel.gadllah@gmail.com> 0.94.2-1
|
||||
- Initial build
|
70
base/catdoc/makefilefix.patch
Normal file
70
base/catdoc/makefilefix.patch
Normal file
@ -0,0 +1,70 @@
|
||||
diff -up catdoc-0.95/charsets/Makefile.in.makefilefix catdoc-0.95/charsets/Makefile.in
|
||||
--- catdoc-0.95/charsets/Makefile.in.makefilefix 2016-04-26 11:13:38.000000000 -0400
|
||||
+++ catdoc-0.95/charsets/Makefile.in 2017-06-20 14:17:55.494732868 -0400
|
||||
@@ -30,15 +30,15 @@ all: @charsetcheck@
|
||||
clean:
|
||||
install: install-dirs install-spc install-charsets
|
||||
install-spc: tex.spc ascii.spc tex.rpl ascii.rpl
|
||||
- $(INSTALL) -m 644 ascii.spc $(installroot)$(LIB_DIR)/ascii$(SPEC_EXT)
|
||||
- $(INSTALL) -m 644 tex.spc $(installroot)$(LIB_DIR)/tex$(SPEC_EXT)
|
||||
- $(INSTALL) -m 644 ascii.rpl $(installroot)$(LIB_DIR)/ascii$(REPL_EXT)
|
||||
- $(INSTALL) -m 644 tex.rpl $(installroot)$(LIB_DIR)/tex$(REPL_EXT)
|
||||
+ $(INSTALL) -p -m 644 ascii.spc $(DESTDIR)$(installroot)$(LIB_DIR)/ascii$(SPEC_EXT)
|
||||
+ $(INSTALL) -p -m 644 tex.spc $(DESTDIR)$(installroot)$(LIB_DIR)/tex$(SPEC_EXT)
|
||||
+ $(INSTALL) -p -m 644 ascii.rpl $(DESTDIR)$(installroot)$(LIB_DIR)/ascii$(REPL_EXT)
|
||||
+ $(INSTALL) -p -m 644 tex.rpl $(DESTDIR)$(installroot)$(LIB_DIR)/tex$(REPL_EXT)
|
||||
install-charsets:
|
||||
for i in *.txt; do\
|
||||
- $(INSTALL) -m 0644 $$i $(installroot)$(LIB_DIR);\
|
||||
+ $(INSTALL) -p -m 0644 $$i $(DESTDIR)$(installroot)$(LIB_DIR);\
|
||||
done
|
||||
install-dirs:
|
||||
- ../mkinstalldirs $(installroot)$(LIB_DIR)
|
||||
+ ../mkinstalldirs $(DESTDIR)$(installroot)$(LIB_DIR)
|
||||
distclean:
|
||||
rm Makefile
|
||||
diff -up catdoc-0.95/doc/Makefile.in.makefilefix catdoc-0.95/doc/Makefile.in
|
||||
--- catdoc-0.95/doc/Makefile.in.makefilefix 2017-06-20 14:17:55.494732868 -0400
|
||||
+++ catdoc-0.95/doc/Makefile.in 2017-06-20 14:20:00.266641962 -0400
|
||||
@@ -30,13 +30,13 @@ clean:
|
||||
wordview.txt wordview.ps build
|
||||
install: @installtargets@
|
||||
install-catdoc: catdoc.1 xls2csv.1 catppt.1
|
||||
- ../mkinstalldirs $(installroot)$(mandir)
|
||||
- $(INSTALL) -m 644 catdoc.1 $(installroot)$(mandir)/man1/catdoc.1
|
||||
- $(INSTALL) -m 644 xls2csv.1 $(installroot)$(mandir)/man1/xls2csv.1
|
||||
- $(INSTALL) -m 644 catppt.1 $(installroot)$(mandir)/man1/catppt.1
|
||||
+ ../mkinstalldirs $(DESTDIR)$(installroot)$(mandir)/man1/
|
||||
+ $(INSTALL) -m 644 catdoc.1 $(DESTDIR)$(installroot)$(mandir)/man1/catdoc.1
|
||||
+ $(INSTALL) -m 644 xls2csv.1 $(DESTDIR)$(installroot)$(mandir)/man1/xls2csv.1
|
||||
+ $(INSTALL) -m 644 catppt.1 $(DESTDIR)$(installroot)$(mandir)/man1/catppt.1
|
||||
install-wordview:
|
||||
- ../mkinstalldirs $(installroot)$(mandir)
|
||||
- $(INSTALL) -m 644 wordview.1 $(installroot)$(mandir)/man1/wordview.1
|
||||
+ ../mkinstalldirs $(DESTDIR)$(installroot)$(mandir)
|
||||
+ $(INSTALL) -m 644 wordview.1 $(DESTDIR)$(installroot)$(mandir)/man1/wordview.1
|
||||
distclean: clean
|
||||
$(RM) Makefile catdoc.1 xls2csv.1 catppt.1 wordview.1
|
||||
|
||||
diff -up catdoc-0.95/src/Makefile.in.makefilefix catdoc-0.95/src/Makefile.in
|
||||
--- catdoc-0.95/src/Makefile.in.makefilefix 2016-04-26 11:13:38.000000000 -0400
|
||||
+++ catdoc-0.95/src/Makefile.in 2017-06-20 14:17:55.494732868 -0400
|
||||
@@ -84,13 +84,13 @@ catppt: $(OBJPPT)
|
||||
|
||||
install: @installtargets@
|
||||
install-catdoc:catdoc xls2csv catppt
|
||||
- ../mkinstalldirs $(installroot)$(bindir)
|
||||
- $(INSTALL) -m 755 catdoc $(installroot)$(bindir)/catdoc
|
||||
- $(INSTALL) -m 755 xls2csv $(installroot)$(bindir)/xls2csv
|
||||
- $(INSTALL) -m 755 catppt $(installroot)$(bindir)/catppt
|
||||
+ ../mkinstalldirs $(DESTDIR)$(installroot)$(bindir)
|
||||
+ $(INSTALL) -p -m 755 catdoc $(DESTDIR)$(installroot)$(bindir)/catdoc
|
||||
+ $(INSTALL) -p -m 755 xls2csv $(DESTDIR)$(installroot)$(bindir)/xls2csv
|
||||
+ $(INSTALL) -p -m 755 catppt $(DESTDIR)$(installroot)$(bindir)/catppt
|
||||
install-wordview: wordview
|
||||
../mkinstalldirs $(installroot)$(bindir)
|
||||
- $(INSTALL) -m 755 wordview $(installroot)$(bindir)/wordview
|
||||
+ $(INSTALL) -p -m 755 wordview $(DESTDIR)$(installroot)$(bindir)/wordview
|
||||
wordview: wordview.tcl
|
||||
echo "#! $(WISH)" >wordview
|
||||
echo set charset_lib "\"$(CHARSETPATH)\"">>wordview
|
@ -14,8 +14,8 @@
|
||||
Name: qbittorrent
|
||||
Summary: A Bittorrent Client
|
||||
Epoch: 1
|
||||
Version: 4.6.6
|
||||
Release: 2%{?dist}
|
||||
Version: 4.6.7
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
URL: https://www.qbittorrent.org
|
||||
|
||||
@ -143,6 +143,9 @@ desktop-file-install \
|
||||
%{_mandir}/man1/qbittorrent-nox.1*
|
||||
|
||||
%changelog
|
||||
* Tue Sep 17 2024 Raven <raven@sysadmins.ws> - 1:4.6.7-1
|
||||
- Update to 4.6.7
|
||||
|
||||
* Fri Sep 13 2024 Raven <raven@sysadmins.ws> - 1:4.6.6-2
|
||||
- rebuilt for OpenSSL
|
||||
|
||||
|
@ -26,7 +26,7 @@ Conflicts: rspamd-asan
|
||||
|
||||
Provides: rspamd
|
||||
Version: 3.9.1
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Rapid spam filtering system
|
||||
Group: System Environment/Daemons
|
||||
License: Apache-2.0
|
||||
@ -312,6 +312,9 @@ fi
|
||||
%dir %{_localstatedir}/log/rspamd
|
||||
|
||||
%changelog
|
||||
* Fri Sep 13 2024 Raven <raven@sysadmins.ws> - 3.9.1-2
|
||||
- rebuilt for new OpenSSL
|
||||
|
||||
* Tue Feb 27 2024 Raven <raven@sysadmins.ws> - 3.8.4-1
|
||||
- update to 3.8.4
|
||||
|
||||
|
@ -1,288 +0,0 @@
|
||||
diff --git a/src/crypto/internal/backend/nobackend.go b/src/crypto/internal/backend/nobackend.go
|
||||
index 5f258a2..5dbbc42 100644
|
||||
--- a/src/crypto/internal/backend/nobackend.go
|
||||
+++ b/src/crypto/internal/backend/nobackend.go
|
||||
@@ -2,8 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
-//go:build !linux || !cgo || android || cmd_go_bootstrap || msan || no_openssl
|
||||
-// +build !linux !cgo android cmd_go_bootstrap msan no_openssl
|
||||
+//go:build !linux || !cgo || android || cmd_go_bootstrap || msan || no_openssl || static
|
||||
+// +build !linux !cgo android cmd_go_bootstrap msan no_openssl static
|
||||
|
||||
package backend
|
||||
|
||||
diff --git a/src/crypto/internal/boring/goboringcrypto.h b/src/crypto/internal/boring/goboringcrypto.h
|
||||
index d6d99b1..f2fe332 100644
|
||||
--- a/src/crypto/internal/boring/goboringcrypto.h
|
||||
+++ b/src/crypto/internal/boring/goboringcrypto.h
|
||||
@@ -1,4 +1,5 @@
|
||||
// Copyright 2017 The Go Authors. All rights reserved.
|
||||
+// +build !static
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
diff --git a/src/crypto/internal/boring/syso/syso.go b/src/crypto/internal/boring/syso/syso.go
|
||||
index b338754..db5ea1e 100644
|
||||
--- a/src/crypto/internal/boring/syso/syso.go
|
||||
+++ b/src/crypto/internal/boring/syso/syso.go
|
||||
@@ -2,7 +2,7 @@
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
-//go:build boringcrypto
|
||||
+//go:build boringcrypto && !static
|
||||
|
||||
// This package only exists with GOEXPERIMENT=boringcrypto.
|
||||
// It provides the actual syso file.
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/aes.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/aes.go
|
||||
index 079fc3c..e826d0b 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/aes.go
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/aes.go
|
||||
@@ -2,8 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
||||
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
||||
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
||||
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
||||
|
||||
package openssl
|
||||
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/ecdh.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/ecdh.go
|
||||
index 0b61e79..94d0c98 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/ecdh.go
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/ecdh.go
|
||||
@@ -2,8 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
||||
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
||||
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
||||
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
||||
|
||||
package openssl
|
||||
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/ecdsa.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/ecdsa.go
|
||||
index afec529..d822152 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/ecdsa.go
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/ecdsa.go
|
||||
@@ -2,8 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
||||
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
||||
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
||||
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
||||
|
||||
package openssl
|
||||
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/goopenssl.h b/src/vendor/github.com/golang-fips/openssl-fips/openssl/goopenssl.h
|
||||
index 6d6a562..17cc314 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/goopenssl.h
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/goopenssl.h
|
||||
@@ -1,4 +1,5 @@
|
||||
// Copyright 2017 The Go Authors. All rights reserved.
|
||||
+// +build !static
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
// +build linux
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/hkdf.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/hkdf.go
|
||||
index ae40b93..17bc075 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/hkdf.go
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/hkdf.go
|
||||
@@ -2,8 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
||||
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
||||
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
||||
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
||||
|
||||
package openssl
|
||||
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/hmac.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/hmac.go
|
||||
index 6f00177..f466b18 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/hmac.go
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/hmac.go
|
||||
@@ -2,8 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
||||
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
||||
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
||||
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
||||
|
||||
package openssl
|
||||
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/notboring.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/notboring.go
|
||||
index 7c0b5d6..262af07 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/notboring.go
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/notboring.go
|
||||
@@ -2,8 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
-//go:build !linux || !cgo || android || cmd_go_bootstrap || msan || no_openssl
|
||||
-// +build !linux !cgo android cmd_go_bootstrap msan no_openssl
|
||||
+//go:build !linux || !cgo || android || cmd_go_bootstrap || msan || no_openssl || static
|
||||
+// +build !linux !cgo android cmd_go_bootstrap msan no_openssl static
|
||||
|
||||
package openssl
|
||||
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl.go
|
||||
index d49194d..ff15054 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl.go
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl.go
|
||||
@@ -2,8 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
||||
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
||||
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
||||
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
||||
|
||||
package openssl
|
||||
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_ecdsa_signature.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_ecdsa_signature.c
|
||||
index 2349db1..57fbb04 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_ecdsa_signature.c
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_ecdsa_signature.c
|
||||
@@ -1,4 +1,5 @@
|
||||
// +build linux
|
||||
+// +build !static
|
||||
// +build !android
|
||||
// +build !no_openssl
|
||||
// +build !cmd_go_bootstrap
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_evp.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_evp.c
|
||||
index 4379019..5034c46 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_evp.c
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_evp.c
|
||||
@@ -1,4 +1,5 @@
|
||||
// +build linux
|
||||
+// +build !static
|
||||
// +build !android
|
||||
// +build !no_openssl
|
||||
// +build !cmd_go_bootstrap
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_lock_setup.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_lock_setup.c
|
||||
index 49d40a7..3b3dbf8 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_lock_setup.c
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_lock_setup.c
|
||||
@@ -1,4 +1,5 @@
|
||||
// +build linux
|
||||
+// +build !static
|
||||
// +build !android
|
||||
// +build !no_openssl
|
||||
// +build !cmd_go_bootstrap
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_aead_gcm.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_aead_gcm.c
|
||||
index 7eb645e..1c3225a 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_aead_gcm.c
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_aead_gcm.c
|
||||
@@ -1,4 +1,5 @@
|
||||
// This file contains a port of the BoringSSL AEAD interface.
|
||||
+// +build !static
|
||||
// +build linux
|
||||
// +build !android
|
||||
// +build !no_openssl
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_ctr128.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_ctr128.c
|
||||
index df4ebe3..876393b 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_ctr128.c
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_ctr128.c
|
||||
@@ -1,4 +1,5 @@
|
||||
// +build linux
|
||||
+// +build !static
|
||||
// +build !android
|
||||
// +build !no_openssl
|
||||
// +build !cmd_go_bootstrap
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_evp_md5_sha1.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_evp_md5_sha1.c
|
||||
index 2eedd5b..04510d3 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_evp_md5_sha1.c
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_evp_md5_sha1.c
|
||||
@@ -1,4 +1,5 @@
|
||||
// This file contains a backport of the EVP_md5_sha1 method.
|
||||
+// +build !static
|
||||
// +build linux
|
||||
// +build !android
|
||||
// +build !no_openssl
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_hmac.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_hmac.c
|
||||
index 362d9e5..bebafef 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_hmac.c
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_hmac.c
|
||||
@@ -1,4 +1,5 @@
|
||||
// This file contains HMAC portability wrappers.
|
||||
+// +build !static
|
||||
// +build linux
|
||||
// +build !android
|
||||
// +build !no_openssl
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_rsa.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_rsa.c
|
||||
index 2824147..8bc1d85 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_rsa.c
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_port_rsa.c
|
||||
@@ -1,4 +1,5 @@
|
||||
// This file contains RSA portability wrappers.
|
||||
+// +build !static
|
||||
// +build linux
|
||||
// +build !android
|
||||
// +build !no_openssl
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_stub_rand.c b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_stub_rand.c
|
||||
index 22bd865..b7aa26b 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_stub_rand.c
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/openssl_stub_rand.c
|
||||
@@ -1,4 +1,5 @@
|
||||
// +build linux
|
||||
+// +build !static
|
||||
// +build !android
|
||||
// +build !no_openssl
|
||||
// +build !cmd_go_bootstrap
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/rand.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/rand.go
|
||||
index b3668b8..dcdae70 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/rand.go
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/rand.go
|
||||
@@ -2,8 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
||||
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
||||
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
||||
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
||||
|
||||
package openssl
|
||||
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/rsa.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/rsa.go
|
||||
index 915c840..8623d9d 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/rsa.go
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/rsa.go
|
||||
@@ -2,8 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
||||
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
||||
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
||||
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
||||
|
||||
package openssl
|
||||
|
||||
diff --git a/src/vendor/github.com/golang-fips/openssl-fips/openssl/sha.go b/src/vendor/github.com/golang-fips/openssl-fips/openssl/sha.go
|
||||
index 0b55ced..57309c0 100644
|
||||
--- a/src/vendor/github.com/golang-fips/openssl-fips/openssl/sha.go
|
||||
+++ b/src/vendor/github.com/golang-fips/openssl-fips/openssl/sha.go
|
||||
@@ -2,8 +2,8 @@
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
-//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl
|
||||
-// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl
|
||||
+//go:build linux && !android && !cmd_go_bootstrap && !msan && !no_openssl && !static
|
||||
+// +build linux,!android,!cmd_go_bootstrap,!msan,!no_openssl,!static
|
||||
|
||||
package openssl
|
||||
|
@ -1,13 +0,0 @@
|
||||
diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
|
||||
index 36a20e8b2a..8c2dd1b44b 100644
|
||||
--- a/src/cmd/dist/test.go
|
||||
+++ b/src/cmd/dist/test.go
|
||||
@@ -1125,7 +1125,7 @@ func (t *tester) registerCgoTests(heading string) {
|
||||
} else {
|
||||
panic("unknown linkmode with static build: " + linkmode)
|
||||
}
|
||||
- gt.tags = append(gt.tags, "static")
|
||||
+ gt.tags = append(gt.tags, "static", "no_openssl")
|
||||
}
|
||||
gt.ldflags = strings.Join(ldflags, " ")
|
||||
|
@ -92,14 +92,14 @@
|
||||
%global gohostarch s390x
|
||||
%endif
|
||||
|
||||
%global go_api 1.21
|
||||
%global go_version 1.21.3
|
||||
%global go_api 1.22
|
||||
%global go_version 1.22.3
|
||||
%global version %{go_version}
|
||||
%global pkg_release 1
|
||||
|
||||
Name: golang
|
||||
Version: %{version}
|
||||
Release: 5%{?dist}
|
||||
Release: 1%{?dist}
|
||||
Summary: The Go Programming Language
|
||||
# source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
|
||||
License: BSD and Public Domain
|
||||
@ -128,14 +128,14 @@ BuildRequires: hostname
|
||||
BuildRequires: net-tools
|
||||
%endif
|
||||
# For OpenSSL FIPS
|
||||
BuildRequires: pkgconfig(openssl) >= 3.0
|
||||
BuildRequires: openssl-devel
|
||||
# for tests
|
||||
BuildRequires: pcre-devel, glibc-static, perl
|
||||
|
||||
Provides: go = %{version}-%{release}
|
||||
Requires: %{name}-bin = %{version}-%{release}
|
||||
Requires: %{name}-src = %{version}-%{release}
|
||||
Requires: pkgconfig(openssl) >= 3.0
|
||||
Requires: openssl-devel
|
||||
Requires: diffutils
|
||||
|
||||
# Proposed patch by jcajka https://golang.org/cl/86541
|
||||
@ -143,10 +143,8 @@ Patch221: fix_TestScript_list_std.patch
|
||||
|
||||
Patch1939923: skip_test_rhbz1939923.patch
|
||||
|
||||
# Disables libc static linking tests which
|
||||
# are incompatible with dlopen in golang-fips
|
||||
Patch2: disable_static_tests_part1.patch
|
||||
Patch3: disable_static_tests_part2.patch
|
||||
Patch4: modify_go.env.patch
|
||||
Patch6: skip_TestCrashDumpsAllThreads.patch
|
||||
|
||||
# Having documentation separate was broken
|
||||
Obsoletes: %{name}-docs < 1.1-4
|
||||
@ -240,7 +238,7 @@ Requires: %{name} = %{version}-%{release}
|
||||
%package -n go-toolset
|
||||
Summary: Package that installs go-toolset
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
%ifarch x86_64
|
||||
%ifarch x86_64 aarch64 ppc64le
|
||||
Requires: delve
|
||||
%endif
|
||||
|
||||
@ -253,9 +251,12 @@ This is the main package for go-toolset.
|
||||
pushd ..
|
||||
tar -xf %{SOURCE1}
|
||||
popd
|
||||
patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/000-initial-setup.patch
|
||||
patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/001-initial-openssl-for-fips.patch
|
||||
patch -p1 < ../go-go%{version}-%{pkg_release}-openssl-fips/patches/002-strict-fips-runtime-detection.patch
|
||||
patch_dir="../go-go%{version}-%{pkg_release}-openssl-fips/patches"
|
||||
# Add --no-backup-if-mismatch option to avoid creating .orig temp files
|
||||
for p in "$patch_dir"/*.patch; do
|
||||
echo "Applying $p"
|
||||
patch --no-backup-if-mismatch -p1 < $p
|
||||
done
|
||||
|
||||
# Configure crypto tests
|
||||
pushd ../go-go%{version}-%{pkg_release}-openssl-fips
|
||||
@ -265,6 +266,8 @@ popd
|
||||
|
||||
%autopatch -p1
|
||||
|
||||
sed -i '1s/$/ (%{?rhel:Red Hat} %{version}-%{release})/' VERSION
|
||||
|
||||
cp %{SOURCE2} ./src/runtime/
|
||||
|
||||
%build
|
||||
@ -289,11 +292,7 @@ export GOHOSTARCH=%{gohostarch}
|
||||
|
||||
pushd src
|
||||
# use our gcc options for this build, but store gcc as default for compiler
|
||||
%if 0%{?rhel} <= 8
|
||||
export CFLAGS="-I%{_includedir}/openssl3 $RPM_OPT_FLAGS"
|
||||
%else
|
||||
export CFLAGS="$RPM_OPT_FLAGS"
|
||||
%endif
|
||||
export LDFLAGS="$RPM_LD_FLAGS"
|
||||
export CC="gcc"
|
||||
export CC_FOR_TARGET="gcc"
|
||||
@ -532,6 +531,41 @@ cd ..
|
||||
%files -n go-toolset
|
||||
|
||||
%changelog
|
||||
* Wed May 22 2024 Alejandro Sáez <asm@redhat.com> - 1.22.3-1
|
||||
- Rebase to 1.22.3
|
||||
- Removes re-enable-cgo.patch
|
||||
- Resolves: RHEL-35634
|
||||
- Resolves: RHEL-35883
|
||||
- Resolves: RHEL-10068
|
||||
- Resolves: RHEL-34924
|
||||
|
||||
* Thu Apr 18 2024 Derek Parker <deparker@redhat.com> - 1.22.2-1
|
||||
- Rebase to 1.22.2
|
||||
- Resolves: RHEL-28941
|
||||
|
||||
* Tue Apr 09 2024 Alejandro Sáez <asm@redhat.com> - 1.22.1-2
|
||||
- Set the AMD64 baseline to v2
|
||||
|
||||
* Tue Mar 19 2024 Alejandro Sáez <asm@redhat.com> - 1.22.1-1
|
||||
- Rebase to Go 1.22.1
|
||||
- Re-enable CGO
|
||||
- Resolves: RHEL-29527
|
||||
- Resolves: RHEL-28175
|
||||
|
||||
* Fri Feb 09 2024 Alejandro Sáez <asm@redhat.com> - 1.21.7-1
|
||||
- Rebase to Go 1.21.7
|
||||
- Set GOTOOLCHAIN to local
|
||||
- Resolves: RHEL-24334
|
||||
- Resolves: RHEL-18364
|
||||
- Resolves: RHEL-18365
|
||||
|
||||
* Thu Nov 30 2023 Alejandro Sáez <asm@redhat.com> - 1.21.4-2
|
||||
- Add release information
|
||||
|
||||
* Tue Nov 14 2023 Alejandro Sáez <asm@redhat.com> - 1.21.4-1
|
||||
- Rebase to Go 1.21.4
|
||||
- Resolves: RHEL-11871
|
||||
|
||||
* Wed Nov 08 2023 David Benoit <dbenoit@redhat.com> - 1.21.3-5
|
||||
- Don't change GOPROXY/GOSUMDB
|
||||
- Related: RHEL-12624
|
||||
|
27
extras/golang/modify_go.env.patch
Normal file
27
extras/golang/modify_go.env.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From d6e201910aa29262851c9274a4cd3645022d3539 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
|
||||
Date: Tue, 9 Apr 2024 10:05:46 +0200
|
||||
Subject: [PATCH] Modify environment variables defaults
|
||||
|
||||
- Set GOTOOLCHAIN to local
|
||||
- Set GOAMD64 to v2
|
||||
---
|
||||
go.env | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/go.env b/go.env
|
||||
index 6ff2b921d4..aadcda023b 100644
|
||||
--- a/go.env
|
||||
+++ b/go.env
|
||||
@@ -9,4 +9,7 @@ GOSUMDB=sum.golang.org
|
||||
|
||||
# Automatically download newer toolchains as directed by go.mod files.
|
||||
# See https://go.dev/doc/toolchain for details.
|
||||
-GOTOOLCHAIN=auto
|
||||
+GOTOOLCHAIN=local
|
||||
+
|
||||
+# The AMD64 baseline for RHEL9 is v2.
|
||||
+GOAMD64=v2
|
||||
--
|
||||
2.44.0
|
||||
|
27
extras/golang/skip_TestCrashDumpsAllThreads.patch
Normal file
27
extras/golang/skip_TestCrashDumpsAllThreads.patch
Normal file
@ -0,0 +1,27 @@
|
||||
From fdcaf4e6876cfd910c3da672564be4a6e829047c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= <asm@redhat.com>
|
||||
Date: Wed, 27 Mar 2024 17:15:48 +0100
|
||||
Subject: [PATCH] Skip TestCrashDumpsAllThreads
|
||||
|
||||
---
|
||||
src/runtime/crash_unix_test.go | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/runtime/crash_unix_test.go b/src/runtime/crash_unix_test.go
|
||||
index 123a462423..a0034d6455 100644
|
||||
--- a/src/runtime/crash_unix_test.go
|
||||
+++ b/src/runtime/crash_unix_test.go
|
||||
@@ -74,6 +74,10 @@ func TestCrashDumpsAllThreads(t *testing.T) {
|
||||
t.Skip("skipping; SIGQUIT is blocked, see golang.org/issue/19196")
|
||||
}
|
||||
|
||||
+ if runtime.GOOS == "linux" && runtime.GOARCH == "s390x" {
|
||||
+ t.Skip("skipping; frequent TestCrashDumpsAllThreads failures on linux/s390x, see golang.org/issue/64650")
|
||||
+ }
|
||||
+
|
||||
testenv.MustHaveGoBuild(t)
|
||||
|
||||
if strings.Contains(os.Getenv("GOFLAGS"), "mayMoreStackPreempt") {
|
||||
--
|
||||
2.44.0
|
||||
|
196
extras/wayland-protocols/wayland-protocols.spec
Normal file
196
extras/wayland-protocols/wayland-protocols.spec
Normal file
@ -0,0 +1,196 @@
|
||||
Name: wayland-protocols
|
||||
Version: 1.32
|
||||
Release: 2%{?dist}
|
||||
Summary: Wayland protocols that adds functionality not available in the core protocol
|
||||
|
||||
License: MIT
|
||||
URL: https://wayland.freedesktop.org/
|
||||
Source0: https://gitlab.freedesktop.org/wayland/%{name}/-/releases/%{version}/downloads/%{name}-%{version}.tar.xz
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: meson
|
||||
BuildRequires: wayland-devel
|
||||
|
||||
%description
|
||||
wayland-protocols contains Wayland protocols that adds functionality not
|
||||
available in the Wayland core protocol. Such protocols either adds
|
||||
completely new functionality, or extends the functionality of some other
|
||||
protocol either in Wayland core, or some other protocol in
|
||||
wayland-protocols.
|
||||
|
||||
%package devel
|
||||
Summary: Wayland protocols that adds functionality not available in the core protocol
|
||||
|
||||
%description devel
|
||||
wayland-protocols contains Wayland protocols that adds functionality not
|
||||
available in the Wayland core protocol. Such protocols either adds
|
||||
completely new functionality, or extends the functionality of some other
|
||||
protocol either in Wayland core, or some other protocol in
|
||||
wayland-protocols.
|
||||
|
||||
%prep
|
||||
%autosetup
|
||||
|
||||
%build
|
||||
%meson
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
%files devel
|
||||
%license COPYING
|
||||
%doc README.md
|
||||
%{_datadir}/pkgconfig/%{name}.pc
|
||||
%{_datadir}/%{name}/
|
||||
|
||||
%changelog
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.32-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Mon Jul 03 2023 Kalev Lember <klember@redhat.com> - 1.32-1
|
||||
- Update to 1.32 (rhbz#2219369)
|
||||
|
||||
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.31-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Tue Nov 29 2022 Kalev Lember <klember@redhat.com> - 1.31-1
|
||||
- Update to 1.31
|
||||
|
||||
* Mon Nov 21 2022 Kalev Lember <klember@redhat.com> - 1.30-1
|
||||
- Update to 1.30
|
||||
|
||||
* Tue Nov 15 2022 Kalev Lember <klember@redhat.com> - 1.29-1
|
||||
- Update to 1.29
|
||||
|
||||
* Sat Nov 05 2022 Kalev Lember <klember@redhat.com> - 1.28-1
|
||||
- Update to 1.28
|
||||
|
||||
* Wed Oct 12 2022 Neal Gompa <ngompa@fedoraproject.org> - 1.27-1
|
||||
- Update to 1.27
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Fri Jul 8 2022 Olivier Fourdan <ofourdan@redhat.com> - 1.26-1
|
||||
- Update to 1.26
|
||||
|
||||
* Sat Feb 19 2022 Neal Gompa <ngompa@fedoraproject.org> - 1.25-1
|
||||
- Update to 1.25
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.24-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Sat Nov 27 2021 Neal Gompa <ngompa@fedoraproject.org> - 1.24-1
|
||||
- Update to 1.24
|
||||
|
||||
* Mon Sep 20 2021 Neal Gompa <ngompa@fedoraproject.org> - 1.23-1
|
||||
- Update to 1.23
|
||||
|
||||
* Mon Sep 20 2021 Neal Gompa <ngompa@fedoraproject.org> - 1.22-1
|
||||
- Update to 1.22
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.21-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue May 04 2021 Kalev Lember <klember@redhat.com> - 1.21-1
|
||||
- Update to 1.21
|
||||
- Switch to meson build system
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.20-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.20-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Sat Feb 29 2020 Jonas Ådahl <jadahl@redhat.com> - 1.20-1
|
||||
- Update to 1.20
|
||||
|
||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.18-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Mon Jul 29 2019 Olivier Fourdan <ofourdan@redhat.com> - 1.18-1
|
||||
- Update to 1.18
|
||||
|
||||
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.17-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Wed Nov 21 2018 Kalev Lember <klember@redhat.com> - 1.17-1
|
||||
- Update to 1.17
|
||||
|
||||
* Tue Jul 31 2018 Kalev Lember <klember@redhat.com> - 1.16-1
|
||||
- Update to 1.16
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.15-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Thu Jul 05 2018 Adam Jackson <ajax@redhat.com> - 1.15-1
|
||||
- Update to 1.15
|
||||
|
||||
* Tue May 08 2018 Kalev Lember <klember@redhat.com> - 1.14-1
|
||||
- Update to 1.14
|
||||
|
||||
* Thu Feb 15 2018 Kalev Lember <klember@redhat.com> - 1.13-1
|
||||
- Update to 1.13
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.12-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Dec 07 2017 Kalev Lember <klember@redhat.com> - 1.12-1
|
||||
- Update to 1.12
|
||||
|
||||
* Wed Nov 15 2017 Kalev Lember <klember@redhat.com> - 1.11-1
|
||||
- Update to 1.11
|
||||
|
||||
* Mon Jul 31 2017 Kalev Lember <klember@redhat.com> - 1.10-1
|
||||
- Update to 1.10
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Jul 19 2017 Kalev Lember <klember@redhat.com> - 1.9-1
|
||||
- Update to 1.9
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Tue Aug 16 2016 Kalev Lember <klember@redhat.com> - 1.7-1
|
||||
- Update to 1.7
|
||||
|
||||
* Fri Aug 12 2016 Kalev Lember <klember@redhat.com> - 1.6-1
|
||||
- Update to 1.6
|
||||
|
||||
* Tue Jul 26 2016 Kalev Lember <klember@redhat.com> - 1.5-1
|
||||
- Update to 1.5
|
||||
|
||||
* Tue May 24 2016 Kalev Lember <klember@redhat.com> - 1.4-1
|
||||
- Update to 1.4
|
||||
|
||||
* Mon Apr 11 2016 Kalev Lember <klember@redhat.com> - 1.3-1
|
||||
- Update to 1.3
|
||||
|
||||
* Mon Mar 07 2016 Kalev Lember <klember@redhat.com> - 1.2-1
|
||||
- Update to 1.2
|
||||
|
||||
* Thu Feb 18 2016 Kalev Lember <klember@redhat.com> - 1.1-1
|
||||
- Update to 1.1
|
||||
|
||||
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Sat Dec 05 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 1.0-2
|
||||
- Fix description
|
||||
|
||||
* Thu Nov 26 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 1.0-1
|
||||
- Update to released 1.0
|
||||
- Move XMLs to devel pkg
|
||||
- Drop non-interesting part of description
|
||||
|
||||
* Sun Nov 22 2015 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.1.0-0.gitf828a43
|
||||
- Initial package
|
@ -10,7 +10,9 @@ URL: https://github.com/openresty/lua-resty-core
|
||||
Source: https://github.com/openresty/lua-resty-core/archive/refs/tags/v%{version}.tar.gz
|
||||
BuildArch: noarch
|
||||
BuildRequires: lua-filesystem
|
||||
%if 0%{?rhel} >= 7
|
||||
Requires: lua(abi) == %{lua_ver}
|
||||
%endif
|
||||
Requires: lua-resty-lrucache nginx-cp >= 1.24.0
|
||||
|
||||
Summary: New FFI-based API for lua-nginx-module
|
||||
|
@ -51,7 +51,7 @@
|
||||
Name: nginx%{_suffix}
|
||||
Epoch: 1
|
||||
Version: 1.26.2
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
|
||||
Summary: A high performance web server and reverse proxy server
|
||||
Group: System Environment/Daemons
|
||||
@ -720,6 +720,9 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Sep 18 2024 Raven <raven@sysadmins.ws> - 1.26.2-2
|
||||
- rebuild (OpenSSL)
|
||||
|
||||
* Thu Aug 15 2024 Raven <raven@sysadmins.ws> - 1.26.2-1
|
||||
- new stable version
|
||||
|
||||
|
@ -113,8 +113,8 @@ ExclusiveArch: armv7hnl
|
||||
|
||||
Summary: Digital VCR and streaming server
|
||||
Name: compat-ffmpeg5%{?flavor}
|
||||
Version: 5.1.4
|
||||
Release: 2%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
|
||||
Version: 5.1.6
|
||||
Release: 1%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
|
||||
License: %{ffmpeg_license}
|
||||
URL: http://ffmpeg.org/
|
||||
%if 0%{?date}
|
||||
@ -509,6 +509,9 @@ rm -rf %buildroot%{_mandir}/man*
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Sep 9 2024 Raven <raven@sysadmins.ws> - 5.1.6-1
|
||||
- Update to 5.1.6 release
|
||||
|
||||
* Wed Mar 6 2024 Raven <raven@sysadmins.ws> - 5.1.4-2
|
||||
- fix for chromium
|
||||
- add openh264 support
|
||||
|
@ -127,8 +127,8 @@ ExclusiveArch: armv7hnl
|
||||
|
||||
Summary: Digital VCR and streaming server
|
||||
Name: compat-ffmpeg%{?flavor}
|
||||
Version: 6.1.1
|
||||
Release: 3%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
|
||||
Version: 6.1.2
|
||||
Release: 1%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
|
||||
License: %{ffmpeg_license}
|
||||
URL: https://ffmpeg.org/
|
||||
%if 0%{?date}
|
||||
@ -157,7 +157,7 @@ Patch8: ffmpeg-codec-choice.patch
|
||||
%{!?_with_openh264:Patch9: ffmpeg-dlopen-openh264.patch}
|
||||
|
||||
# Fix build with Vulkan headers >= 1.3.280.0
|
||||
Patch10: ffmpeg-vulkan.patch
|
||||
#Patch10: ffmpeg-vulkan.patch
|
||||
# Backport fix for CVE-2023-49528
|
||||
Patch11: ffmpeg-CVE-2023-49528.patch
|
||||
|
||||
@ -579,6 +579,9 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Sep 9 2024 Raven <raven@sysadmins.ws> - 6.1.2-1
|
||||
- Update to 6.1.1 release
|
||||
|
||||
* Tue May 28 2024 Raven <raven@sysadmins.ws> - 6.1.1-3
|
||||
- build as a compat-* package due to the upcoming
|
||||
ffmpeg 7
|
||||
|
@ -125,7 +125,7 @@ ExclusiveArch: armv7hnl
|
||||
Summary: Digital VCR and streaming server
|
||||
Name: ffmpeg%{?flavor}
|
||||
Version: 7.0.2
|
||||
Release: 1%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
|
||||
Release: 2%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
|
||||
License: %{ffmpeg_license}
|
||||
URL: https://ffmpeg.org/
|
||||
%if 0%{?date}
|
||||
@ -563,6 +563,9 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.*
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Sep 9 2024 Raven <raven@sysadmins.ws> - 7.0.2-2
|
||||
- rebuilt
|
||||
|
||||
* Mon Aug 5 2024 Raven <raven@sysadmins.ws> - 7.0.2-1
|
||||
- Update to 7.0.2 release
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
Name: qmmp-plugin-pack
|
||||
Version: 2.1.1
|
||||
Release: 2%{?dist}
|
||||
Release: 5%{?dist}
|
||||
Summary: A set of extra plugins for Qmmp
|
||||
|
||||
License: GPLv2+
|
||||
@ -59,6 +59,15 @@ Plugin pack is a set of extra plugins for Qmmp.
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jun 27 2024 Raven <raven@sysadmins.ws> - 2.1.1-5
|
||||
- Rebuild for qt6
|
||||
|
||||
* Wed May 29 2024 Raven <raven@sysadmins.ws> - 2.1.1-4
|
||||
- Rebuild for qt6
|
||||
|
||||
* Mon May 20 2024 Raven <raven@sysadmins.ws> - 2.1.1-3
|
||||
- Rebuild for qt6
|
||||
|
||||
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
%bcond_without qt6
|
||||
|
||||
Name: strawberry
|
||||
Version: 1.1.2
|
||||
Version: 1.1.3
|
||||
Release: 1%{?dist}
|
||||
Summary: Audio player and music collection organizer
|
||||
|
||||
@ -162,6 +162,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/org.strawberry
|
||||
%{_mandir}/man1/strawberry-tagreader.1.*
|
||||
|
||||
%changelog
|
||||
* Mon Sep 23 2024 Raven <raven@sysadmins.ws> - 1.1.3-1
|
||||
- Release 1.1.3
|
||||
|
||||
* Fri Sep 13 2024 Raven <raven@sysadmins.ws> - 1.1.2-1
|
||||
- Release 1.1.2
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user