* [gentoo-commits] repo/gentoo:master commit in: dev-libs/bglibs/, dev-libs/bglibs/files/
@ 2019-07-07 15:29 Andreas K. Hüttel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas K. Hüttel @ 2019-07-07 15:29 UTC (permalink / raw
To: gentoo-commits
commit: 534dd7655fe788fa899dfc223aea278e1dd06a30
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 7 15:29:09 2019 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jul 7 15:29:09 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=534dd765
dev-libs/bglibs: Remove old
Bug: https://bugs.gentoo.org/688158
Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
dev-libs/bglibs/Manifest | 1 -
dev-libs/bglibs/bglibs-1.106-r1.ebuild | 76 -------------------
dev-libs/bglibs/bglibs-1.106-r2.ebuild | 86 ----------------------
.../bglibs/files/bglibs-1.106-parallel-fix.patch | 61 ---------------
4 files changed, 224 deletions(-)
diff --git a/dev-libs/bglibs/Manifest b/dev-libs/bglibs/Manifest
index 1b27b563890..f179c0ff6d8 100644
--- a/dev-libs/bglibs/Manifest
+++ b/dev-libs/bglibs/Manifest
@@ -1,2 +1 @@
-DIST bglibs-1.106.tar.gz 481564 BLAKE2B 838bd29753b254efc90c8c2c2e4d4920de2e931f823d32393184156f76967ec1995f1e79d2879169dd509cddd298b2389a4ca0109b81245fc617575f3ccf7405 SHA512 c1ae4bb9978b09ffe01231738d1f249c2040a51c2a0bbc4b04389a7085a3885cca6483f1bfe65deca213d991273bb3b7b925ebde8b6e2cd9182d8a57cb9a49d8
DIST bglibs-2.04.tar.gz 713673 BLAKE2B 9e1353b3221ef6a8cfb256ec8616d1e208777b20ecade3e6ae17faca6b42222e18aa601a948e6201139378bf6f8131a2b7a053d77b198176776d42a1af611186 SHA512 094268cad7d4bacf65c0dd3d42fde2e6bac34da0fd6193b1c8202c018e752b3ef80a86c38e687467fb3a4e97130126fe74ee4a86063e4b25ee291de573984a6f
diff --git a/dev-libs/bglibs/bglibs-1.106-r1.ebuild b/dev-libs/bglibs/bglibs-1.106-r1.ebuild
deleted file mode 100644
index 3964c00ce92..00000000000
--- a/dev-libs/bglibs/bglibs-1.106-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit toolchain-funcs eutils multilib
-
-DESCRIPTION="Bruce Guenters Libraries Collection"
-HOMEPAGE="http://untroubled.org/bglibs/"
-SRC_URI="http://untroubled.org/bglibs/archive/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 ~sparc x86"
-IUSE=""
-DEPEND=""
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.106-parallel-fix.patch
- # disable tests as we want them manually
- sed -i \
- -e '/^all:/s|selftests||' \
- "${S}"/Makefile
- sed -i \
- -e '/selftests/d' \
- "${S}"/TARGETS
- #sed -i \
- # -e 's,^libraries:,LIBS = ,g' \
- # -e '/^LIBS =/alibs-static: $(filter %.a,$(LIBS))' \
- # -e '/^LIBS =/alibs-shared: $(filter %.la,$(LIBS))' \
- # -e '/^LIBS =/alibraries: libs-static libs-shared' \
- # "${S}"/Makefile
-}
-
-src_compile() {
- echo "${D}/usr/bin" > conf-bin
- echo "${D}/usr/$(get_libdir)/bglibs" > conf-lib
- echo "${D}/usr/include/bglibs" > conf-include
- echo "${D}/usr/share/man" > conf-man
- echo "$(tc-getCC) ${CFLAGS}" > conf-cc
- echo "$(tc-getCC) ${LDFLAGS}" > conf-ld
- emake || die
-}
-
-src_test() {
- einfo "Running selftests"
- emake selftests
-}
-
-src_install () {
- einstall || die "install failed"
-
- #make backwards compatible symlinks
- dosym /usr/$(get_libdir)/bglibs /usr/$(get_libdir)/bglibs/lib
- [ "$(get_libdir)" != "lib" ] && dosym /usr/$(get_libdir)/bglibs /usr/$(get_libdir)/bglibs/$(get_libdir)
- dosym /usr/include/bglibs /usr/$(get_libdir)/bglibs/include
-
- #install .so in LDPATH
- mv "${D}"/usr/$(get_libdir)/bglibs/libbg.so.1.1.1 "${D}"/usr/$(get_libdir)/
- mv "${D}"/usr/$(get_libdir)/bglibs/libbg-sysdeps.so.1.1.1 "${D}"/usr/$(get_libdir)/
- dosym libbg.so.1.1.1 /usr/$(get_libdir)/libbg.so.1
- dosym libbg.so.1.1.1 /usr/$(get_libdir)/libbg.so
- dosym libbg-sysdeps.so.1.1.1 /usr/$(get_libdir)/libbg-sysdeps.so.1
- dosym libbg-sysdeps.so.1.1.1 /usr/$(get_libdir)/libbg-sysdeps.so
-
- dosym ../libbg.so.1.1.1 /usr/$(get_libdir)/bglibs/libbg.so.1.1.1
- dosym ../libbg-sysdeps.so.1.1.1 /usr/$(get_libdir)/bglibs/libbg-sysdeps.so.1.1.1
-
- rm "${D}"/usr/$(get_libdir)/bglibs/libbg.la
- rm "${D}"/usr/$(get_libdir)/bglibs/libbg-sysdeps.la
-
- dodoc ANNOUNCEMENT NEWS README ChangeLog TODO VERSION
- dohtml doc/html/*
- docinto latex
- dodoc doc/latex/*
-}
diff --git a/dev-libs/bglibs/bglibs-1.106-r2.ebuild b/dev-libs/bglibs/bglibs-1.106-r2.ebuild
deleted file mode 100644
index 6ef63dbc235..00000000000
--- a/dev-libs/bglibs/bglibs-1.106-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Bruce Guenters Libraries Collection"
-HOMEPAGE="https://untroubled.org/bglibs/
- https://github.com/bruceg/bglibs"
-SRC_URI="https://untroubled.org/bglibs/archive/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-BDEPEND="
- sys-devel/libtool
- doc? (
- app-doc/doxygen
- dev-tex/xcolor
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- virtual/latex-base
- )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.106-parallel-fix.patch )
-
-src_prepare() {
- default
- # disable tests as we want them manually
- sed -i -e '/^all:/s|selftests||' Makefile || die
- sed -i -e '/selftests/d' TARGETS || die
-}
-
-src_configure() {
- echo "${ED}/usr/bin" > conf-bin || die
- echo "${ED}/usr/$(get_libdir)/bglibs" > conf-lib || die
- echo "${ED}/usr/include/bglibs" > conf-include || die
- echo "${ED}/usr/share/man" > conf-man || die
- echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
- echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-}
-
-src_compile() {
- default
- if use doc; then
- emake -C doc/latex pdf
- fi
-}
-
-src_test() {
- einfo "Running selftests"
- emake selftests
-}
-
-src_install () {
- default
-
- #make backwards compatible symlinks
- dosym ../../$(get_libdir)/bglibs /usr/$(get_libdir)/bglibs/lib
- [[ "$(get_libdir)" != "lib" ]] && dosym ../../$(get_libdir)/bglibs /usr/$(get_libdir)/bglibs/$(get_libdir)
- dosym ../../include/bglibs /usr/$(get_libdir)/bglibs/include
-
- #install .so in LDPATH
- mv "${ED}"/usr/$(get_libdir)/bglibs/libbg.so.1.1.1 "${ED}"/usr/$(get_libdir)/ || die
- mv "${ED}"/usr/$(get_libdir)/bglibs/libbg-sysdeps.so.1.1.1 "${ED}"/usr/$(get_libdir)/ || die
- dosym libbg.so.1.1.1 /usr/$(get_libdir)/libbg.so.1
- dosym libbg.so.1.1.1 /usr/$(get_libdir)/libbg.so
- dosym libbg-sysdeps.so.1.1.1 /usr/$(get_libdir)/libbg-sysdeps.so.1
- dosym libbg-sysdeps.so.1.1.1 /usr/$(get_libdir)/libbg-sysdeps.so
-
- dosym ../libbg.so.1.1.1 /usr/$(get_libdir)/bglibs/libbg.so.1.1.1
- dosym ../libbg-sysdeps.so.1.1.1 /usr/$(get_libdir)/bglibs/libbg-sysdeps.so.1.1.1
-
- rm "${ED}"/usr/$(get_libdir)/bglibs/libbg.la || die
- rm "${ED}"/usr/$(get_libdir)/bglibs/libbg-sysdeps.la || die
-
- dodoc ANNOUNCEMENT NEWS README ChangeLog TODO VERSION
- dodoc -r doc/html/
- if use doc; then
- dodoc doc/latex/refman.pdf
- fi
-}
diff --git a/dev-libs/bglibs/files/bglibs-1.106-parallel-fix.patch b/dev-libs/bglibs/files/bglibs-1.106-parallel-fix.patch
deleted file mode 100644
index 30c13e8c75f..00000000000
--- a/dev-libs/bglibs/files/bglibs-1.106-parallel-fix.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Forward port to 1.106 by Thilo Bangert <bangert@gentoo.org>
-Fixes for parallel compile.
-
-- Redirection straight to an output target that is later used for dependancies
- is not safe. The output file must be come into existence atomically.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Naur bglibs-1.106.orig/Makefile bglibs-1.106/Makefile
---- bglibs-1.106.orig/Makefile 2009-11-20 11:52:29.000000000 +0100
-+++ bglibs-1.106/Makefile 2009-11-20 11:56:01.000000000 +0100
-@@ -152,37 +152,43 @@
- ./compile crc-gentab.c
-
- crc/crc16_arc_table.c: crc-gentab
-- ./crc-gentab crc16_arc 16 0x8005 reflected >$@
-+ ./crc-gentab crc16_arc 16 0x8005 reflected >$@.tmp
-+ mv $@.tmp $@
-
- crc/crc16_arc_table.lo crc/crc16_arc_table.o: ltcompile crc/crc16_arc_table.c
- ./ltcompile crc/crc16_arc_table.c
-
- crc/crc16_ccitt_table.c: crc-gentab
-- ./crc-gentab crc16_ccitt 16 0x1021 normal >$@
-+ ./crc-gentab crc16_ccitt 16 0x1021 normal >$@.tmp
-+ mv $@.tmp $@
-
- crc/crc16_ccitt_table.lo crc/crc16_ccitt_table.o: ltcompile crc/crc16_ccitt_table.c
- ./ltcompile crc/crc16_ccitt_table.c
-
- crc/crc16_xmodem_table.c: crc-gentab
-- ./crc-gentab crc16_xmodem 16 0x8408 reflected >$@
-+ ./crc-gentab crc16_xmodem 16 0x8408 reflected >$@.tmp
-+ mv $@.tmp $@
-
- crc/crc16_xmodem_table.lo crc/crc16_xmodem_table.o: ltcompile crc/crc16_xmodem_table.c
- ./ltcompile crc/crc16_xmodem_table.c
-
- crc/crc32_table.c: crc-gentab
-- ./crc-gentab crc32 32 0x04C11DB7 reflected >$@
-+ ./crc-gentab crc32 32 0x04C11DB7 reflected >$@.tmp
-+ mv $@.tmp $@
-
- crc/crc32_table.lo crc/crc32_table.o: ltcompile crc/crc32_table.c
- ./ltcompile crc/crc32_table.c
-
- crc/crc32c_table.c: crc-gentab
-- ./crc-gentab crc32c 32 0x1EDC6F41 reflected >$@
-+ ./crc-gentab crc32c 32 0x1EDC6F41 reflected >$@.tmp
-+ mv $@.tmp $@
-
- crc/crc32c_table.lo crc/crc32c_table.o: ltcompile crc/crc32c_table.c
- ./ltcompile crc/crc32c_table.c
-
- crc/crc64_table.c: crc-gentab
-- ./crc-gentab crc64 64 0x42F0E1EBA9EA3693 normal >$@
-+ ./crc-gentab crc64 64 0x42F0E1EBA9EA3693 normal >$@.tmp
-+ mv $@.tmp $@
-
- crc/crc64_table.lo crc/crc64_table.o: ltcompile crc/crc64_table.c
- ./ltcompile crc/crc64_table.c
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/bglibs/, dev-libs/bglibs/files/
@ 2020-04-05 7:18 Joonas Niilola
0 siblings, 0 replies; 2+ messages in thread
From: Joonas Niilola @ 2020-04-05 7:18 UTC (permalink / raw
To: gentoo-commits
commit: 1b96cea8f4a077237e5dbe479ac375bad9d777e4
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sat Apr 4 16:25:38 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Apr 5 07:17:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b96cea8
dev-libs/bglibs: properly align buffers on stack
Closes: https://bugs.gentoo.org/700190
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/15226
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-libs/bglibs/bglibs-2.04-r2.ebuild | 75 ++++++++++++++++++++++
.../bglibs/files/bglibs-2.04-stack-buffers.patch | 47 ++++++++++++++
2 files changed, 122 insertions(+)
diff --git a/dev-libs/bglibs/bglibs-2.04-r2.ebuild b/dev-libs/bglibs/bglibs-2.04-r2.ebuild
new file mode 100644
index 00000000000..01bff0a74aa
--- /dev/null
+++ b/dev-libs/bglibs/bglibs-2.04-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Bruce Guenter's Libraries Collection"
+HOMEPAGE="https://untroubled.org/bglibs/"
+SRC_URI="https://untroubled.org/bglibs/archive/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="sys-devel/libtool
+ doc? (
+ app-doc/doxygen
+ dev-texlive/texlive-latexrecommended
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ virtual/latex-base
+ )
+"
+
+PATCHES=( "${FILESDIR}"/bglibs-2.04-stack-buffers.patch )
+
+src_prepare() {
+ default
+ # disable tests as we want them manually
+ sed -i '/^all:/s|selftests||' Makefile || die
+ sed -i '/selftests/d' TARGETS || die
+}
+
+src_configure() {
+ echo "${ED}/usr/bin" > conf-bin || die
+ echo "${ED}/usr/$(get_libdir)/bglibs" > conf-lib || die
+ echo "${ED}/usr/include" > conf-include || die
+ echo "${ED}/usr/share/man" > conf-man || die
+ echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+ echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+}
+
+src_compile() {
+ default
+ if use doc; then
+ emake -C doc/latex pdf
+ fi
+}
+
+src_test() {
+ einfo "Running selftests"
+ emake selftests
+}
+
+src_install() {
+ default
+
+ # Install .so into LDPATH
+ mv "${ED}"/usr/$(get_libdir)/bglibs/libbg.so.2.0.0 "${ED}"/usr/$(get_libdir)/ || die
+ dosym libbg.so.2.0.0 /usr/$(get_libdir)/libbg.so.2
+ dosym libbg.so.2.0.0 /usr/$(get_libdir)/libbg.so
+ dosym ../libbg.so.2.0.0 /usr/$(get_libdir)/bglibs/libbg.so.2.0.0
+
+ rm "${ED}"/usr/$(get_libdir)/bglibs/libbg.la || die
+
+ dodoc ANNOUNCEMENT NEWS README ChangeLog TODO VERSION
+ dodoc -r doc/html/
+ if use doc; then
+ dodoc doc/latex/refman.pdf
+ fi
+}
diff --git a/dev-libs/bglibs/files/bglibs-2.04-stack-buffers.patch b/dev-libs/bglibs/files/bglibs-2.04-stack-buffers.patch
new file mode 100644
index 00000000000..6c6fb1133d4
--- /dev/null
+++ b/dev-libs/bglibs/files/bglibs-2.04-stack-buffers.patch
@@ -0,0 +1,47 @@
+From 25252211283e05c692c8baf3e8a7c70224821762 Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer <eike@sf-mail.de>
+Date: Fri, 15 Nov 2019 19:40:22 +0100
+Subject: [PATCH] properly align the HMAC state buffers on the stack
+
+They need to have the same alignment as the contained data type, i.e. up to
+uint64. Otherwise usage of SHA HMACs causes bus errors on sparc.
+---
+ crypto/hmac.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/hmac.c b/crypto/hmac.c
+index abff0df..f4e48c0 100644
+--- a/crypto/hmac.c
++++ b/crypto/hmac.c
+@@ -34,7 +34,8 @@ void hmac_prepare(const struct hmac_control_block* hcb,
+ void* midstate,
+ const str* secret)
+ {
+- unsigned char state[hcb->state_size];
++ uint64 statebuf[(hcb->state_size + 7) / sizeof(uint64)];
++ unsigned char *state = (unsigned char *)statebuf;
+ unsigned char block[hcb->block_size];
+ unsigned i;
+
+@@ -80,8 +81,9 @@ void hmac_finish(const struct hmac_control_block* hcb,
+ const str* nonce,
+ void* output)
+ {
+- unsigned char state[hcb->state_size];
+-
++ uint64 statebuf[(hcb->state_size + 7) / sizeof(uint64)];
++ unsigned char *state = (unsigned char *)statebuf;
++
+ /* Generate H1 = H(K XOR ipad, nonce) */
+ hcb->inject(state, midstate);
+ hcb->update(state, (const unsigned char*)nonce->s, nonce->len);
+@@ -106,7 +108,8 @@ void hmac(const struct hmac_control_block* hcb,
+ const str* nonce,
+ void* output)
+ {
+- unsigned char midstate[hcb->state_size*2];
++ uint64 statebuf[(hcb->state_size * 2 + 7) / sizeof(uint64)];
++ unsigned char *midstate = (unsigned char *)statebuf;
+
+ hmac_prepare(hcb, midstate, secret);
+ hmac_finish(hcb, midstate, nonce, output);
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-05 7:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-04-05 7:18 [gentoo-commits] repo/gentoo:master commit in: dev-libs/bglibs/, dev-libs/bglibs/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2019-07-07 15:29 Andreas K. Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox