Merge pull request #241 from flatcar-linux/krnowak/update-cryptsetup-deps

Update cryptsetup deps
This commit is contained in:
Krzesimir Nowak 2021-11-04 12:11:53 +01:00 committed by GitHub
commit 7355bc0229
36 changed files with 289 additions and 1408 deletions

View File

@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@ -11,7 +11,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}
LICENSE="|| ( Apache-2.0 CC0-1.0 )"
SLOT="0/1"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="static-libs"
S="${WORKDIR}/phc-winner-${P}"

View File

@ -1,11 +1,11 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<maintainer type="person" proxied="yes">
<email>simon-bgo@slevermann.de</email>
<name>Simon Levermann</name>
</maintainer>
<maintainer type="project">
<maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
@ -13,7 +13,6 @@
<email>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
<longdescription>Argon2 is a password hashing tool and library that won the Password Hashing Competition (PHC)</longdescription>
<slots>
<subslots>Reflect ABI of libargon2.so.</subslots>
</slots>

View File

@ -1,3 +1,2 @@
DIST gmp-4.3.2.tar.bz2 1897483 BLAKE2B 0efecd60c7a585f94ec8cbee77541d409c8e3bdeabaca09f7971560fb0fd504ae8e405256913acbef1434146868885c98068ff59efec92c92fdb73b853cf9396 SHA512 2e0b0fd23e6f10742a5517981e5171c6e88b0a93c83da701b296f5c0861d72c19782daab589a7eac3f9032152a0fc7eff7f5362db8fccc4859564a9aa82329cf
DIST gmp-6.1.2.tar.xz 1946336 BLAKE2B 2a864e80799471037a71c10d871f9782c37fe3a0a1734872e90f14a874ecd6551099d67b2ebd07f82a43b0522249a6b46e79952db11a278f87ca8013198f7604 SHA512 9f098281c0593b76ee174b722936952671fab1dae353ce3ed436a31fe2bc9d542eca752353f6645b7077c1f395ab4fdd355c58e08e2a801368f1375690eee2c6
DIST gmp-man-6.1.2.pdf 825720 BLAKE2B b96340da5f534353b140b361fc1ff74757168024e8039d97a0ed1f14d874ff5fbc50abae2ff3505adc51d72e4acf2882ae6ca6405ae37b594f7b248e1ca05247 SHA512 85de10b2c03f7381881c3e95aa7fc53d8e018115028496ffbb5a79ab4967106c69ed7e97a5e434e6bb39752498aade8c2caa7cf77a8942b7ffd9150368a0d9c3
DIST gmp-6.2.1.tar.xz 2027316 BLAKE2B c0d85f175392a50cfa01bc6b0a312b235946ad8b4f6f84f6dabd33d7a6f2cc75c9b0e1e33057be07750bfa0145b7c4cf3b6188a5be6ca9d7271ec2276c84ebcb SHA512 c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84
DIST gmp-man-6.2.1.pdf 827583 BLAKE2B 9aa25457a3c488e37cc7d54d825253ab749a3780919570579b319cf607001de50b212ca387b70213abcc5ab428b4525bdb9cd8ae932798a2d7928da98ce3f353 SHA512 f2d9d02e97975355ef490e921fedc94fb7687c3661eec8fa2e94a1622b6e59b17b3879eb3ec1f2df8edac100f727175144d107f4c49c602b773c43bc9e91dbcb

View File

@ -1,20 +0,0 @@
fixed executable stack
http://bugs.gentoo.org/115038
--- gmp-4.1.4/configure
+++ gmp-4.1.4/configure
@@ -21689,6 +21689,13 @@
fi
echo "')" >> $gmp_configm4
echo "define(\`__CONFIG_M4_INCLUDED__')" >> $gmp_configm4
+# Gentoo hack
+case $host_os in
+ *linux*)
+ echo '.section .note.GNU-stack,"",%progbits' >> $gmp_configm4
+ echo '.previous' >> $gmp_configm4
+ ;;
+esac
# Create Makefiles
# FIXME: Upcoming version of autoconf/automake may not like broken lines.

View File

@ -1,68 +0,0 @@
stolen from SuSE
--- configure.in
+++ configure.in
@@ -1050,6 +1050,9 @@
;;
+ s390x-*-*)
+ path="s390x" ;;
+
# IBM s/370 and similar
[s3[6-9]0*-*-*])
gcc_cflags="-O2 $fomit_frame_pointer"
--- configure
+++ configure
@@ -1050,6 +1050,9 @@
;;
+ s390x-*-*)
+ path="s390x" ;;
+
# IBM s/370 and similar
s3[6-9]0*-*-*)
gcc_cflags="-O2 $fomit_frame_pointer"
--- mpn/s390/gmp-mparam.h
+++ mpn/s390/gmp-mparam.h
@@ -20,7 +20,8 @@
MA 02110-1301, USA. */
-/* BITS_PER_MP_LIMB etc generated by configure */
+#define BITS_PER_MP_LIMB 32
+#define BYTES_PER_MP_LIMB 4
/* Generated by tuneup.c, 2001-12-03, gcc 2.95 */
--- mpn/s390x/gmp-mparam.h
+++ mpn/s390x/gmp-mparam.h
@@ -0,0 +1,27 @@
+/* gmp-mparam.h -- Compiler/machine parameter header file.
+
+Copyright (C) 1991, 1993, 1994, 1995 Free Software Foundation, Inc.
+
+This file is part of the GNU MP Library.
+
+The GNU MP Library is free software; you can redistribute it and/or modify
+it under the terms of the GNU Library General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at your
+option) any later version.
+
+The GNU MP Library is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
+License for more details.
+
+You should have received a copy of the GNU Library General Public License
+along with the GNU MP Library; see the file COPYING.LIB. If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+MA 02111-1307, USA. */
+
+#define BITS_PER_MP_LIMB 64
+#define BYTES_PER_MP_LIMB 8
+#define BITS_PER_LONGINT 64
+#define BITS_PER_INT 32
+#define BITS_PER_SHORTINT 16
+#define BITS_PER_CHAR 8

View File

@ -0,0 +1,20 @@
configure.ac decides whether udiv_w_sdiv.c fallback is needed
based on $CHOST value (without $CFLAGS). longlong.h relies
on compiler macros (relies on $CFLAGS implicitly).
That leads to use of undefined macros. The workaround makes
udiv_w_sdiv.c a no-on for -mzarch.
https://bugs.gentoo.org/761310
--- a/mpn/generic/udiv_w_sdiv.c
+++ b/mpn/generic/udiv_w_sdiv.c
@@ -1,3 +1,4 @@
+#if !defined(__zarch__)
/* mpn_udiv_w_sdiv -- implement udiv_qrnnd on machines with only signed
division.
@@ -139,3 +140,4 @@ mpn_udiv_w_sdiv (mp_limb_t *rp, mp_limb_t a1, mp_limb_t a0, mp_limb_t d)
*rp = r;
return q;
}
+#endif

View File

@ -1,66 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# this ebuild is only for the libgmp.so.3 ABI SONAME
EAPI="5"
inherit eutils libtool toolchain-funcs multilib-minimal
DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
HOMEPAGE="https://gmplib.org/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
LICENSE="LGPL-3"
SLOT="3"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
IUSE=""
DEPEND="sys-devel/m4"
RDEPEND=""
src_prepare() {
epatch "${FILESDIR}"/${PN}-4.1.4-noexecstack.patch
epatch "${FILESDIR}"/${PN}-4.2.1-s390.diff
# note: we cannot run autotools here as gcc depends on this package
elibtoolize
# GMP uses the "ABI" env var during configure as does Gentoo (econf).
# So, to avoid patching the source constantly, wrap things up.
mv configure configure.wrapped || die
cat <<-\EOF > configure
#!/bin/sh
exec env ABI="${GMPABI}" "$0.wrapped" "$@"
EOF
chmod a+rx configure
}
multilib_src_configure() {
# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
# https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
if [[ ${CHOST} == hppa2.0-* ]] ; then
GMPABI="1.0"
fi
# ABI mappings (needs all architectures supported)
case ${ABI} in
32|x86) GMPABI=32;;
64|amd64|n64) GMPABI=64;;
[onx]32) GMPABI=${ABI};;
esac
export GMPABI
tc-export CC
ECONF_SOURCE="${S}" econf \
--localstatedir=/var/state/gmp \
--disable-mpfr \
--disable-mpbsd \
--disable-static \
--disable-cxx
}
multilib_src_install() {
emake DESTDIR="${D}" install-libLTLIBRARIES
rm "${D}"/usr/*/libgmp.{la,so} || die
}

View File

@ -1,111 +0,0 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
inherit flag-o-matic eutils libtool multilib-minimal
MY_PV=${PV/_p*}
MY_PV=${MY_PV/_/-}
MY_P=${PN}-${MY_PV}
PLEVEL=${PV/*p}
DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
HOMEPAGE="https://gmplib.org/"
SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
mirror://gnu/${PN}/${MY_P}.tar.xz
doc? ( https://gmplib.org/${PN}-man-${MY_PV}.pdf )"
LICENSE="|| ( LGPL-3+ GPL-2+ )"
# The subslot reflects the C & C++ SONAMEs.
SLOT="0/10.4"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asm doc cxx static-libs"
DEPEND="sys-devel/m4
app-arch/xz-utils"
RDEPEND=""
S=${WORKDIR}/${MY_P%a}
DOCS=( AUTHORS ChangeLog NEWS README doc/configuration doc/isa_abi_headache )
HTML_DOCS=( doc )
MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h )
src_prepare() {
[[ -d ${FILESDIR}/${PV} ]] && EPATCH_SUFFIX="diff" EPATCH_FORCE="yes" epatch "${FILESDIR}"/${PV}
# note: we cannot run autotools here as gcc depends on this package
elibtoolize
epatch "${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch
# https://bugs.gentoo.org/536894
if [[ ${CHOST} == *-darwin* ]] ; then
epatch "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch
fi
# GMP uses the "ABI" env var during configure as does Gentoo (econf).
# So, to avoid patching the source constantly, wrap things up.
mv configure configure.wrapped || die
cat <<-\EOF > configure
#!/usr/bin/env sh
exec env ABI="${GMPABI}" "$0.wrapped" "$@"
EOF
# Patches to original configure might have lost the +x bit.
chmod a+rx configure{,.wrapped}
epatch_user
}
multilib_src_configure() {
# Because of our 32-bit userland, 1.0 is the only HPPA ABI that works
# https://gmplib.org/manual/ABI-and-ISA.html#ABI-and-ISA (bug #344613)
if [[ ${CHOST} == hppa2.0-* ]] ; then
GMPABI="1.0"
fi
# ABI mappings (needs all architectures supported)
case ${ABI} in
32|x86) GMPABI=32;;
64|amd64|n64) GMPABI=64;;
[onx]32) GMPABI=${ABI};;
esac
export GMPABI
#367719
if [[ ${CHOST} == *-mint* ]]; then
filter-flags -O?
fi
tc-export CC
ECONF_SOURCE="${S}" econf \
--localstatedir="${EPREFIX}"/var/state/gmp \
--enable-shared \
$(use_enable asm assembly) \
$(use_enable cxx) \
$(use_enable static-libs static)
}
multilib_src_compile() {
emake
}
multilib_src_test() {
emake check
}
multilib_src_install() {
emake DESTDIR="${D}" install
# should be a standalone lib
rm -f "${ED}"/usr/$(get_libdir)/libgmp.la
# this requires libgmp
local la="${ED}/usr/$(get_libdir)/libgmpxx.la"
use static-libs \
&& sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
|| rm -f "${la}"
}
multilib_src_install_all() {
einstalldocs
use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${ED}"/usr/share/doc/${PF}/
}

View File

@ -1,29 +1,30 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=7
inherit flag-o-matic eutils libtool multilib-minimal
inherit flag-o-matic libtool multilib-minimal toolchain-funcs
MY_PV=${PV/_p*}
MY_PV=${MY_PV/_/-}
MANUAL_PV=${MY_PV}
MANUAL_PV=6.2.1
MY_P=${PN}-${MY_PV}
PLEVEL=${PV/*p}
DESCRIPTION="Library for arbitrary-precision arithmetic on different type of numbers"
HOMEPAGE="https://gmplib.org/"
SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
mirror://gnu/${PN}/${MY_P}.tar.xz
doc? ( https://gmplib.org/${PN}-man-${MY_PV}.pdf )"
doc? ( https://gmplib.org/${PN}-man-${MANUAL_PV}.pdf )"
LICENSE="|| ( LGPL-3+ GPL-2+ )"
# The subslot reflects the C & C++ SONAMEs.
SLOT="0/10.4"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asm doc cxx static-libs"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asm doc +cxx pic static-libs"
DEPEND="sys-devel/m4
BDEPEND="sys-devel/m4
app-arch/xz-utils"
RDEPEND=""
S=${WORKDIR}/${MY_P%a}
@ -33,15 +34,16 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/gmp.h )
PATCHES=(
"${FILESDIR}"/${PN}-6.1.0-noexecstack-detect.patch
"${FILESDIR}"/${PN}-6.2.1-no-zarch.patch
)
src_prepare() {
default
# note: we cannot run autotools here as gcc depends on this package
# We cannot run autotools here as gcc depends on this package
elibtoolize
# https://bugs.gentoo.org/536894
# bug #536894
if [[ ${CHOST} == *-darwin* ]] ; then
eapply "${FILESDIR}"/${PN}-6.1.2-gcc-apple-4.0.1.patch
fi
@ -53,6 +55,7 @@ src_prepare() {
#!/usr/bin/env sh
exec env ABI="${GMPABI}" "$0.wrapped" "$@"
EOF
# Patches to original configure might have lost the +x bit.
chmod a+rx configure{,.wrapped} || die
}
@ -72,41 +75,39 @@ multilib_src_configure() {
esac
export GMPABI
#367719
# bug #367719
if [[ ${CHOST} == *-mint* ]]; then
filter-flags -O?
fi
tc-export CC
# --with-pic forces static libraries to be built as PIC
# and without TEXTRELs. musl does not support TEXTRELs: bug #707332
ECONF_SOURCE="${S}" econf \
CC_FOR_BUILD="$(tc-getBUILD_CC)" \
--localstatedir="${EPREFIX}"/var/state/gmp \
--enable-shared \
$(use_enable asm assembly) \
$(use_enable cxx) \
$(use pic && echo --with-pic) \
$(use_enable static-libs static)
}
multilib_src_compile() {
emake
}
multilib_src_test() {
emake check
}
multilib_src_install() {
emake DESTDIR="${D}" install
# should be a standalone lib
# Should be a standalone lib
rm -f "${ED}"/usr/$(get_libdir)/libgmp.la
# this requires libgmp
# This requires libgmp
local la="${ED}/usr/$(get_libdir)/libgmpxx.la"
use static-libs \
&& sed -i 's:/[^ ]*/libgmp.la:-lgmp:' "${la}" \
|| rm -f "${la}"
if ! use static-libs ; then
rm -f "${la}"
fi
}
multilib_src_install_all() {
einstalldocs
use doc && cp "${DISTDIR}"/gmp-man-${MY_PV}.pdf "${ED}"/usr/share/doc/${PF}/
use doc && cp "${DISTDIR}"/gmp-man-${MANUAL_PV}.pdf "${ED}"/usr/share/doc/${PF}/
}

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>toolchain@gentoo.org</email>
@ -7,5 +7,9 @@
</maintainer>
<use>
<flag name="asm">Enable use of hand optimized assembly routines (faster execution)</flag>
<flag name="pic">Force static libraries to be built as PIC to avoid TEXTRELs.</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:gmplib:gmp</remote-id>
</upstream>
</pkgmetadata>

View File

@ -1,2 +1 @@
DIST json-c-0.14.tar.gz 321677 BLAKE2B 39325988dd58dad589fc0f036c17b2337c81cf7aab8ecb2232f8d59fef9d38df28e096f8d22320e0003799d477debddc4926eaa7a170954263c6b303c1fa056e SHA512 75537c61d0632a01f94d2394d7a4387ef1eca0b68aa56c495d3d96dd29b38ed20eb0cc3f6e5e24dc6660c8939669f8954005d9c3ba20437f3fcc9f9dd896b00d
DIST json-c-0.15.tar.gz 361488 BLAKE2B ae34f6dd45ebee55e6413ecb234e48fa5ae1c17e6fa12462aaaa04e8801457060e176abe90d76d04ad0ee9b903ff467bc3b8ed5816792da175aad8862b9d168e SHA512 dc01298bcc78f0f31a34f5fcfe45c0feebfd88518e97fb4f96f1a652f71ccdd303415a4c7bf5b573bdcbcca80428281f0dfccefc6545ea3a7f18dbb819332f34

View File

@ -1,56 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba692ff..fc2edff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,6 +65,7 @@ include(GNUInstallDirs)
include(CMakePackageConfigHelpers)
option(BUILD_SHARED_LIBS "Default to building shared libraries" ON)
+option(BUILD_STATIC_LIBS "Default to building static libraries" OFF)
# Generate a release merge and test it to verify the correctness of republishing the package.
ADD_CUSTOM_TARGET(distcheck
@@ -383,7 +384,7 @@ add_library(${PROJECT_NAME}
set_target_properties(${PROJECT_NAME} PROPERTIES
VERSION 5.0.0
SOVERSION 5)
-
+list(APPEND CMAKE_TARGETS ${PROJECT_NAME})
# If json-c is used as subroject it set to target correct interface -I flags and allow
# to build external target without extra include_directories(...)
target_include_directories(${PROJECT_NAME}
@@ -392,7 +393,33 @@ target_include_directories(${PROJECT_NAME}
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
)
-install(TARGETS ${PROJECT_NAME}
+# Allow to build static and shared libraries at the same time
+if (BUILD_STATIC_LIBS)
+ set(STATIC_LIB ${PROJECT_NAME}-static)
+ add_library(${STATIC_LIB} STATIC
+ ${JSON_C_SOURCES}
+ ${JSON_C_HEADERS}
+ )
+
+ # rename the static library
+ set_target_properties(${STATIC_LIB} PROPERTIES
+ OUTPUT_NAME ${PROJECT_NAME}
+ )
+ list(APPEND CMAKE_TARGETS ${STATIC_LIB})
+endif ()
+
+# Always create new install dirs with 0755 permissions, regardless of umask
+set(CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS
+ OWNER_READ
+ OWNER_WRITE
+ OWNER_EXECUTE
+ GROUP_READ
+ GROUP_EXECUTE
+ WORLD_READ
+ WORLD_EXECUTE
+ )
+
+install(TARGETS ${CMAKE_TARGETS}
EXPORT ${PROJECT_NAME}-targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

File diff suppressed because one or more lines are too long

View File

@ -1,155 +0,0 @@
From 099016b7e8d70a6d5dd814e788bba08d33d48426 Mon Sep 17 00:00:00 2001
From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Mon, 4 May 2020 19:41:16 +0200
Subject: [PATCH 1/3] Protect array_list_del_idx against size_t overflow.
If the assignment of stop overflows due to idx and count being
larger than SIZE_T_MAX in sum, out of boundary access could happen.
It takes invalid usage of this function for this to happen, but
I decided to add this check so array_list_del_idx is as safe against
bad usage as the other arraylist functions.
---
arraylist.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arraylist.c b/arraylist.c
index 12ad8af6d3..e5524aca75 100644
--- a/arraylist.c
+++ b/arraylist.c
@@ -136,6 +136,9 @@ int array_list_del_idx(struct array_list *arr, size_t idx, size_t count)
{
size_t i, stop;
+ /* Avoid overflow in calculation with large indices. */
+ if (idx > SIZE_T_MAX - count)
+ return -1;
stop = idx + count;
if (idx >= arr->length || stop > arr->length)
return -1;
From 77d935b7ae7871a1940cd827e850e6063044ec45 Mon Sep 17 00:00:00 2001
From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Mon, 4 May 2020 19:46:45 +0200
Subject: [PATCH 2/3] Prevent division by zero in linkhash.
If a linkhash with a size of zero is created, then modulo operations
are prone to division by zero operations.
Purely protective measure against bad usage.
---
linkhash.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/linkhash.c b/linkhash.c
index 7ea58c0abf..f05cc38030 100644
--- a/linkhash.c
+++ b/linkhash.c
@@ -12,6 +12,7 @@
#include "config.h"
+#include <assert.h>
#include <limits.h>
#include <stdarg.h>
#include <stddef.h>
@@ -499,6 +500,8 @@ struct lh_table *lh_table_new(int size, lh_entry_free_fn *free_fn, lh_hash_fn *h
int i;
struct lh_table *t;
+ /* Allocate space for elements to avoid divisions by zero. */
+ assert(size > 0);
t = (struct lh_table *)calloc(1, sizeof(struct lh_table));
if (!t)
return NULL;
From d07b91014986900a3a75f306d302e13e005e9d67 Mon Sep 17 00:00:00 2001
From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Mon, 4 May 2020 19:47:25 +0200
Subject: [PATCH 3/3] Fix integer overflows.
The data structures linkhash and printbuf are limited to 2 GB in size
due to a signed integer being used to track their current size.
If too much data is added, then size variable can overflow, which is
an undefined behaviour in C programming language.
Assuming that a signed int overflow just leads to a negative value,
like it happens on many sytems (Linux i686/amd64 with gcc), then
printbuf is vulnerable to an out of boundary write on 64 bit systems.
---
linkhash.c | 7 +++++--
printbuf.c | 19 ++++++++++++++++---
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/linkhash.c b/linkhash.c
index f05cc38030..51e90b13a2 100644
--- a/linkhash.c
+++ b/linkhash.c
@@ -580,9 +580,12 @@ int lh_table_insert_w_hash(struct lh_table *t, const void *k, const void *v, con
{
unsigned long n;
- if (t->count >= t->size * LH_LOAD_FACTOR)
- if (lh_table_resize(t, t->size * 2) != 0)
+ if (t->count >= t->size * LH_LOAD_FACTOR) {
+ /* Avoid signed integer overflow with large tables. */
+ int new_size = INT_MAX / 2 < t->size ? t->size * 2 : INT_MAX;
+ if (t->size == INT_MAX || lh_table_resize(t, new_size) != 0)
return -1;
+ }
n = h % t->size;
diff --git a/printbuf.c b/printbuf.c
index 976c12dde5..00822fac4f 100644
--- a/printbuf.c
+++ b/printbuf.c
@@ -15,6 +15,7 @@
#include "config.h"
+#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -65,10 +66,16 @@ static int printbuf_extend(struct printbuf *p, int min_size)
if (p->size >= min_size)
return 0;
-
- new_size = p->size * 2;
- if (new_size < min_size + 8)
+ /* Prevent signed integer overflows with large buffers. */
+ if (min_size > INT_MAX - 8)
+ return -1;
+ if (p->size > INT_MAX / 2)
new_size = min_size + 8;
+ else {
+ new_size = p->size * 2;
+ if (new_size < min_size + 8)
+ new_size = min_size + 8;
+ }
#ifdef PRINTBUF_DEBUG
MC_DEBUG("printbuf_memappend: realloc "
"bpos=%d min_size=%d old_size=%d new_size=%d\n",
@@ -83,6 +90,9 @@ static int printbuf_extend(struct printbuf *p, int min_size)
int printbuf_memappend(struct printbuf *p, const char *buf, int size)
{
+ /* Prevent signed integer overflows with large buffers. */
+ if (size > INT_MAX - p->bpos - 1)
+ return -1;
if (p->size <= p->bpos + size + 1)
{
if (printbuf_extend(p, p->bpos + size + 1) < 0)
@@ -100,6 +110,9 @@ int printbuf_memset(struct printbuf *pb, int offset, int charvalue, int len)
if (offset == -1)
offset = pb->bpos;
+ /* Prevent signed integer overflows with large buffers. */
+ if (len > INT_MAX - offset)
+ return -1;
size_needed = offset + len;
if (pb->size < size_needed)
{

View File

@ -1,55 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
CMAKE_ECLASS=cmake
inherit cmake-multilib
DESCRIPTION="A JSON implementation in C"
HOMEPAGE="https://github.com/json-c/json-c/wiki"
SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/5"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="cpu_flags_x86_rdrand doc static-libs threads"
PATCHES=(
"${FILESDIR}/${PN}-0.14-cmake-static-libs.patch"
"${FILESDIR}/${P}-security-fix.patch"
"${FILESDIR}/${PN}-0.14-object-limitation.patch"
)
MULTILIB_WRAPPED_HEADERS=(
/usr/include/json-c/config.h
)
src_prepare() {
cmake_src_prepare
}
multilib_src_configure() {
local mycmakeargs=(
-DBUILD_DOCUMENTATION=$(multilib_native_usex doc)
-DBUILD_STATIC_LIBS=$(usex static-libs)
-DDISABLE_WERROR=ON
-DENABLE_RDRAND=$(usex cpu_flags_x86_rdrand)
-DENABLE_THREADING=$(usex threads)
)
cmake_src_configure
}
multilib_src_compile() {
cmake_src_compile
}
multilib_src_test() {
multilib_is_native_abi && cmake_src_test
}
multilib_src_install_all() {
use doc && HTML_DOCS=( "${S}"/doc/html/. )
einstalldocs
}

View File

@ -1,4 +1,4 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@ -12,7 +12,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/5"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="cpu_flags_x86_rdrand doc static-libs threads"
BDEPEND="doc? ( >=app-doc/doxygen-1.8.13 )"

View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>jakov.smolic@sartura.hr</email>
<name>Jakov Smolic</name>
<email>jsmolic@gentoo.org</email>
<name>Jakov Smolić</name>
</maintainer>
<maintainer type="person">
<maintainer type="person" proxied="yes">
<email>luka.perkov@sartura.hr</email>
<name>Luka Perkov</name>
</maintainer>
<maintainer type="project">
<maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>

View File

@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1 MIT"
SLOT="0/20" # subslot = soname major version
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc o-flag-munging static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]"

View File

@ -1,2 +1,4 @@
DIST libgpg-error-1.36.tar.bz2 920542 BLAKE2B 81684f6e47192c50cfa408977d53dc3812befca28733b531d51dffa0a6799a47366a50f64755557a7b3111a179ac4aba9e6a527418461cdbcccea80ae6bed4fa SHA512 6e5f853f77dc04f0091d94b224cab8e669042450f271b78d0ea0219658d059c9cab1ab0eaa020a4227f451520b417fc340b85971a6f5e144fa69be57e15df346
DIST libgpg-error-1.37.tar.bz2 937282 BLAKE2B 70666749aa0156652405ee15e4307f29bdf748f06728da5c672c0208053e0d3a041aaef882b263dd828e2aa7dd8a2f77334447af2c499f81f7602150d84f593f SHA512 fa12977237fcc872e944cda39ca43ee7d2cc9c52e243ede6077f4a31ae135e322dc848b4b55cffdc4ec53f27601ba30ddb368b090a94cd00d9345a55b323f179
DIST gen-lock-obj-1.38.sh 2643 BLAKE2B 5040b027a95f10bac4a0ba463c8bb8387514ca9136e019fc647183456593df27473eb79af1d79e803984dd2b93166c286809b376968584cc320679de95fcfbba SHA512 d60999a08f70f5bcf1b66099c5d7b5f715dbd881bd0d75dbdde3a8932e9b064166f0524a45ae88b5b182c620aee526e14095ffdee68403b5d3b087b4dc4c0c2c
DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de
DIST libgpg-error-1.41.tar.bz2 967117 BLAKE2B 9dc95bc09f55915d904e0f956ecf9281615028b8b8d876dbc786b752068fefea56adfb5dd5db65bad656ab664d567e56541e44a584c7f8672c30537ed05c4db0 SHA512 578d1d8090b9f6e6cbe59d9aeebec7df81aae492f75ec343f8df530950d30866fa0a7903ca050bf7bf721413f7b2708abe34f7467e2b208cc1447ffc9bd5b9a5
DIST libgpg-error-1.42.tar.bz2 973996 BLAKE2B eb3381ec7106cfe5dca333391f473e97b03df83f247d3067e9f933ed7206f826e59d2b74b8c28d41e785ffe1c2980b680470064eb2fa2ff1ee3d8fa8be5b81a8 SHA512 f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4

View File

@ -1,158 +0,0 @@
From 7865041c77f4f7005282f10f9b6666b19072fbdf Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Mon, 15 Apr 2019 15:10:44 +0900
Subject: [PATCH] awk: Prepare for Gawk 5.0.
* src/Makefile.am: Use pkg_namespace (instead of namespace).
* src/mkerrnos.awk: Likewise.
* lang/cl/mkerrcodes.awk: Don't escape # in regexp.
* src/mkerrcodes.awk, src/mkerrcodes1.awk, src/mkerrcodes2.awk: Ditto.
--
In Gawk 5.0, regexp routines are replaced by Gnulib implementation,
which only allows escaping specific characters.
GnuPG-bug-id: 4459
Reported-by: Marius Schamschula
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
lang/cl/mkerrcodes.awk | 2 +-
src/Makefile.am | 2 +-
src/mkerrcodes.awk | 2 +-
src/mkerrcodes1.awk | 2 +-
src/mkerrcodes2.awk | 2 +-
src/mkerrnos.awk | 2 +-
src/mkstrtable.awk | 10 +++++-----
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lang/cl/mkerrcodes.awk b/lang/cl/mkerrcodes.awk
index ae29043..9a1fc18 100644
--- a/lang/cl/mkerrcodes.awk
+++ b/lang/cl/mkerrcodes.awk
@@ -122,7 +122,7 @@ header {
}
!header {
- sub (/\#.+/, "");
+ sub (/#.+/, "");
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
if (/^$/)
diff --git a/src/Makefile.am b/src/Makefile.am
index ce1b882..f2590cb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -293,7 +293,7 @@ code-from-errno.h: mkerrcodes$(EXEEXT_FOR_BUILD) Makefile
errnos-sym.h: Makefile mkstrtable.awk errnos.in
$(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=2 -v nogettext=1 \
- -v prefix=GPG_ERR_ -v namespace=errnos_ \
+ -v prefix=GPG_ERR_ -v pkg_namespace=errnos_ \
$(srcdir)/errnos.in >$@
diff --git a/src/mkerrcodes.awk b/src/mkerrcodes.awk
index 46d436c..e9c857c 100644
--- a/src/mkerrcodes.awk
+++ b/src/mkerrcodes.awk
@@ -85,7 +85,7 @@ header {
}
!header {
- sub (/\#.+/, "");
+ sub (/#.+/, "");
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
if (/^$/)
diff --git a/src/mkerrcodes1.awk b/src/mkerrcodes1.awk
index a771a73..4578e29 100644
--- a/src/mkerrcodes1.awk
+++ b/src/mkerrcodes1.awk
@@ -81,7 +81,7 @@ header {
}
!header {
- sub (/\#.+/, "");
+ sub (/#.+/, "");
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
if (/^$/)
diff --git a/src/mkerrcodes2.awk b/src/mkerrcodes2.awk
index ea58503..188f7a4 100644
--- a/src/mkerrcodes2.awk
+++ b/src/mkerrcodes2.awk
@@ -91,7 +91,7 @@ header {
}
!header {
- sub (/\#.+/, "");
+ sub (/#.+/, "");
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
if (/^$/)
diff --git a/src/mkerrnos.awk b/src/mkerrnos.awk
index f79df66..15b1aad 100644
--- a/src/mkerrnos.awk
+++ b/src/mkerrnos.awk
@@ -83,7 +83,7 @@ header {
}
!header {
- sub (/\#.+/, "");
+ sub (/#.+/, "");
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
if (/^$/)
diff --git a/src/mkstrtable.awk b/src/mkstrtable.awk
index c9de9c1..285e45f 100644
--- a/src/mkstrtable.awk
+++ b/src/mkstrtable.awk
@@ -77,7 +77,7 @@
#
# The variable prefix can be used to prepend a string to each message.
#
-# The variable namespace can be used to prepend a string to each
+# The variable pkg_namespace can be used to prepend a string to each
# variable and macro name.
BEGIN {
@@ -102,7 +102,7 @@ header {
print "/* The purpose of this complex string table is to produce";
print " optimal code with a minimum of relocations. */";
print "";
- print "static const char " namespace "msgstr[] = ";
+ print "static const char " pkg_namespace "msgstr[] = ";
header = 0;
}
else
@@ -110,7 +110,7 @@ header {
}
!header {
- sub (/\#.+/, "");
+ sub (/#.+/, "");
sub (/[ ]+$/, ""); # Strip trailing space and tab characters.
if (/^$/)
@@ -150,7 +150,7 @@ END {
else
print " gettext_noop (\"" last_msgstr "\");";
print "";
- print "static const int " namespace "msgidx[] =";
+ print "static const int " pkg_namespace "msgidx[] =";
print " {";
for (i = 0; i < coded_msgs; i++)
print " " pos[i] ",";
@@ -158,7 +158,7 @@ END {
print " };";
print "";
print "static GPG_ERR_INLINE int";
- print namespace "msgidxof (int code)";
+ print pkg_namespace "msgidxof (int code)";
print "{";
print " return (0 ? 0";
--
2.21.0

View File

@ -0,0 +1,40 @@
From: David Michael <fedora.dm0@gmail.com>
Date: Mon, 1 Jun 2020 14:24:53 +0000 (-0400)
Subject: build: Fix cross-compiling into a separate build dir.
X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commitdiff_plain;h=013720333c6ec1d38791689bc49ba039d98e16b3
build: Fix cross-compiling into a separate build dir.
* configure.ac: Create the src directory before writing into it.
* src/Makefile.am (EXTRA_DIST): Add gen-lock-obj.sh.
--
Signed-off-by: David Michael <fedora.dm0@gmail.com>
---
diff --git a/configure.ac b/configure.ac
index 6bd634b..1dd6489 100644
--- a/configure.ac
+++ b/configure.ac
@@ -598,6 +598,7 @@ if test x$cross_compiling = xyes; then
case $host in
*-*-linux*)
lock_obj_h_generated=yes
+ mkdir src
LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \
CC=$CC OBJDUMP=$host_alias-objdump \
ac_ext=$ac_ext ac_objext=$ac_objext \
diff --git a/src/Makefile.am b/src/Makefile.am
index 7e36d69..b2bffd2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -102,7 +102,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
gpg-error.vers gpg-error.def.in \
versioninfo.rc.in gpg-error.w32-manifest.in \
gpg-error-config-test.sh gpg-error.pc.in \
- $(lock_obj_pub)
+ gen-lock-obj.sh $(lock_obj_pub)
BUILT_SOURCES = $(srcdir)/err-sources.h $(srcdir)/err-codes.h \
code-to-errno.h code-from-errno.h \

View File

@ -0,0 +1,32 @@
From 33593864cd54143db594c4237bba41e14179061c Mon Sep 17 00:00:00 2001
From: David Michael <fedora.dm0@gmail.com>
Date: Fri, 26 Mar 2021 16:06:50 +0900
Subject: [PATCH] build: Fix generation of lock-obj-pub.native.h for cross
build.
* src/gen-lock-obj.sh: Capture echo output with quotes.
--
Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374
Signed-off-by: David Michael <fedora.dm0@gmail.com>
---
src/gen-lock-obj.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh
index a710f0c..258eec6 100755
--- a/src/gen-lock-obj.sh
+++ b/src/gen-lock-obj.sh
@@ -38,7 +38,7 @@
# AWK=gawk ./gen-lock-obj.sh
#
-if test -n `echo -n`; then
+if test -n "`echo -n`"; then
ECHO_C='\c'
ECHO_N=''
else
--
2.11.0

View File

@ -0,0 +1,68 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools multilib-minimal toolchain-funcs prefix
DESCRIPTION="Contains error handling functions used by GnuPG software"
HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob_plain;f=src/gen-lock-obj.sh;hb=libgpg-error-1.38 -> gen-lock-obj-1.38.sh"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="common-lisp nls static-libs"
RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}"
BDEPEND="nls? ( sys-devel/gettext )"
MULTILIB_CHOST_TOOLS=(
/usr/bin/gpg-error-config
)
MULTILIB_WRAPPED_HEADERS=(
/usr/include/gpg-error.h
/usr/include/gpgrt.h
)
PATCHES=(
"${FILESDIR}/${PN}-1.37-remove_broken_check.patch"
"${FILESDIR}/${P}-cross_compile.patch" #726520
)
src_unpack() {
[[ ${PV} == 1.38 ]] || die "Please remove gen-lock-obj.sh from SRC_URI and drop src_unpack"
unpack ${P}.tar.bz2
cp "${DISTDIR}"/gen-lock-obj-1.38.sh "${S}"/src/gen-lock-obj.sh || die
chmod +x "${S}"/src/gen-lock-obj.sh || die
}
src_prepare() {
default
# only necessary for as long as we run eautoreconf, configure.ac
# uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
# not a pure /bin/sh script, so it fails on some hosts
hprefixify -w 1 autogen.sh
eautoreconf
}
multilib_src_configure() {
local myeconfargs=(
$(multilib_is_native_abi || echo --disable-languages)
$(use_enable common-lisp languages)
$(use_enable nls)
# required for sys-power/suspend[crypt], bug 751568
$(use_enable static-libs static)
--enable-threads
CC_FOR_BUILD="$(tc-getBUILD_CC)"
$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
)
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
multilib_src_install_all() {
einstalldocs
find "${ED}" -type f -name '*.la' -delete || die
}

View File

@ -1,17 +1,17 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools libtool multilib-minimal toolchain-funcs prefix
inherit autotools multilib-minimal toolchain-funcs prefix
DESCRIPTION="Contains error handling functions used by GnuPG software"
HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="common-lisp nls static-libs"
RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
@ -26,10 +26,18 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/gpgrt.h
)
PATCHES=( "${FILESDIR}/${PN}-1.36-gawk5-support.patch" )
PATCHES=(
"${FILESDIR}/${PN}-1.37-remove_broken_check.patch"
)
src_prepare() {
default
if use prefix ; then
# don't hardcode /usr/xpg4/bin/sh as shell on Solaris
sed -i -e 's/solaris\*/disabled/' configure.ac || die
fi
# only necessary for as long as we run eautoreconf, configure.ac
# uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
# not a pure /bin/sh script, so it fails on some hosts
@ -42,6 +50,7 @@ multilib_src_configure() {
$(multilib_is_native_abi || echo --disable-languages)
$(use_enable common-lisp languages)
$(use_enable nls)
# required for sys-power/suspend[crypt], bug 751568
$(use_enable static-libs static)
--enable-threads
CC_FOR_BUILD="$(tc-getBUILD_CC)"

View File

@ -1,17 +1,17 @@
# Copyright 1999-2020 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools libtool multilib-minimal toolchain-funcs prefix
inherit autotools multilib-minimal toolchain-funcs prefix
DESCRIPTION="Contains error handling functions used by GnuPG software"
HOMEPAGE="http://www.gnupg.org/related_software/libgpg-error"
HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="common-lisp nls static-libs"
RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
@ -26,10 +26,19 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/gpgrt.h
)
PATCHES=( "${FILESDIR}/${PN}-1.37-remove_broken_check.patch" )
PATCHES=(
"${FILESDIR}/${PN}-1.37-remove_broken_check.patch"
"${FILESDIR}/${P}-cross_compile.patch"
)
src_prepare() {
default
if use prefix ; then
# don't hardcode /usr/xpg4/bin/sh as shell on Solaris
sed -i -e 's/solaris\*/disabled/' configure.ac || die
fi
# only necessary for as long as we run eautoreconf, configure.ac
# uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
# not a pure /bin/sh script, so it fails on some hosts
@ -42,6 +51,7 @@ multilib_src_configure() {
$(multilib_is_native_abi || echo --disable-languages)
$(use_enable common-lisp languages)
$(use_enable nls)
# required for sys-power/suspend[crypt], bug 751568
$(use_enable static-libs static)
--enable-threads
CC_FOR_BUILD="$(tc-getBUILD_CC)"

View File

@ -1,14 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<name>Lars Wendler</name>
<email>polynomial-c@gentoo.org</email>
</maintainer>
<maintainer type="person">
<email>k_f@gentoo.org</email>
<name>Kristian Fiskerstrand</name>
</maintainer>
<use>
<flag name="common-lisp">Install common-lisp files</flag>
</use>

View File

@ -1,2 +1 @@
DIST nettle-3.7.2.tar.gz 2382309 BLAKE2B 0195f973afd76d33805de4621cd340a041144b24a20ccab03a58749dba82ea12b063f779aeeeb3f063be5e1bb74dec4c8c8f72b3dd01aff033e908a9f534ad01 SHA512 5f6edcc24ff620885b24394b31e55b494418c35dd63e6ece222ddabc58e793c44a82155051cc5759896ed5f014a8efd547f0aef6736a131e41651c5cab7c7211
DIST nettle-3.7.3.tar.gz 2383985 BLAKE2B 8d8efbbff98fc1f3eff3296681d3d72346e78392f356aebfe80138ae6ae1ebf3695bd7f74b906beef0cf3625ba6d84bdb43c0f6707f54f4d98870d50c90ac9a3 SHA512 9901eba305421adff6d551ac7f478dff3f68a339d444c776724ab0b977fe6be792b1d2950c8705acbe76bd924fd6d898a65eded546777884be3b436d0e052437

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<name>Gentoo Base System</name>

View File

@ -1,67 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools multilib-build multilib-minimal toolchain-funcs
DESCRIPTION="Low-level cryptographic library"
HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="|| ( LGPL-3 LGPL-2.1 )"
SLOT="0/8-6" # subslot = libnettle - libhogweed soname version
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+asm doc +gmp static-libs test cpu_flags_x86_aes cpu_flags_arm_neon cpu_flags_x86_sha"
RESTRICT="!test? ( test )"
DEPEND="gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,${MULTILIB_USEDEP}] )"
RDEPEND="${DEPEND}"
BDEPEND="doc? ( sys-apps/texinfo )"
MULTILIB_WRAPPED_HEADERS=(
/usr/include/nettle/version.h
)
DOCS=()
HTML_DOCS=()
pkg_setup() {
use doc && DOCS+=(
nettle.pdf
)
use doc && HTML_DOCS+=(
nettle.html
)
}
src_prepare() {
default
# I do not see in config.sub reference to sunldsolaris.
# if someone complains readd
# -e 's/solaris\*)/sunldsolaris*)/' \
sed -e '/CFLAGS=/s: -ggdb3::' \
-i configure.ac || die
eautoreconf
}
multilib_src_configure() {
local myeconfargs=(
CC_FOR_BUILD="$(tc-getBUILD_CC)"
$(tc-is-static-only && echo --disable-shared)
$(use_enable cpu_flags_x86_aes x86-aesni)
$(use_enable cpu_flags_x86_sha x86-sha-ni)
$(use_enable asm assembler)
$(use_enable doc documentation)
$(use_enable gmp public-key)
$(use_enable cpu_flags_arm_neon arm-neon)
$(use_enable static-libs static)
--disable-fat
# --disable-openssl bug #427526
--disable-openssl
--libdir="${EPREFIX}"/usr/$(get_libdir)
)
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}

View File

@ -1,402 +0,0 @@
# ChangeLog for dev-libs/popt
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/popt/ChangeLog,v 1.111 2015/03/13 19:55:13 zlogene Exp $
13 Mar 2015; Mikle Kolyada <zlogene@gentoo.org> popt-1.16-r2.ebuild:
ppc/ppc64 stable wrt bug #525984
21 Feb 2015; Agostino Sarubbo <ago@gentoo.org> popt-1.16-r2.ebuild:
Stable for ppc, wrt bug #525972
16 Jan 2015; Raúl Porcel <armin76@gentoo.org> popt-1.16-r2.ebuild:
alpha/ia64/sparc stable wrt #525984
02 Nov 2014; Mike Frysinger <vapier@gentoo.org> popt-1.16-r2.ebuild:
Mark arm64/m68k/s390/sh stable.
25 Oct 2014; Markus Meier <maekke@gentoo.org> popt-1.16-r2.ebuild:
arm stable, bug #525984
23 Oct 2014; Pacho Ramos <pacho@gentoo.org> popt-1.16-r2.ebuild:
amd64/x86 stable, bug #525984
21 Oct 2014; Jeroen Roovers <jer@gentoo.org> popt-1.16-r2.ebuild:
Stable for HPPA (bug #525984).
18 Jun 2014; Michał Górny <mgorny@gentoo.org> popt-1.16-r2.ebuild:
Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
#513718.
*popt-1.16-r2 (12 Jun 2014)
12 Jun 2014; Michał Górny <mgorny@gentoo.org> +popt-1.16-r2.ebuild:
Enable multilib support, needed for samba-4.
18 Jan 2014; Mike Frysinger <vapier@gentoo.org> popt-1.16-r1.ebuild:
Add arm64 love.
19 Feb 2013; Zac Medico <zmedico@gentoo.org> popt-1.16-r1.ebuild:
Add ~arm-linux and ~x86-linux keywords.
26 Apr 2012; Alexis Ballier <aballier@gentoo.org> popt-1.16-r1.ebuild:
keyword ~amd64-fbsd
01 May 2011; Kacper Kowalik <xarthisius@gentoo.org> popt-1.16-r1.ebuild:
ppc64 stable wrt #361409
23 Apr 2011; Raúl Porcel <armin76@gentoo.org> popt-1.16-r1.ebuild:
alpha/ia64/m68k/s390/sh/sparc/x86 stable wrt #361409
14 Apr 2011; Brent Baude <ranger@gentoo.org> popt-1.16-r1.ebuild:
stable ppc, bug 361409
12 Apr 2011; Markus Meier <maekke@gentoo.org> popt-1.16-r1.ebuild:
arm stable, bug #361409
05 Apr 2011; Jeroen Roovers <jer@gentoo.org> popt-1.16-r1.ebuild:
Stable for HPPA (bug #361409).
02 Apr 2011; Christoph Mende <angelos@gentoo.org> popt-1.16-r1.ebuild:
Stable on amd64 wrt bug #361409
17 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> popt-1.16-r1.ebuild:
USE="static-libs" and stop installing unrequired libtool archive.
*popt-1.16-r1 (24 Dec 2010)
24 Dec 2010; Matt Turner <mattst88@gentoo.org> +popt-1.16-r1.ebuild,
+files/fix-popt-pkgconfig-libdir.patch:
Fix pkgconfigdir definition, bug 349558
03 Oct 2010; Raúl Porcel <armin76@gentoo.org> popt-1.16.ebuild:
ia64/m68k/s390/sh/sparc stable wrt #324619
25 Jul 2010; Tobias Klausmann <klausman@gentoo.org> popt-1.16.ebuild:
Stable on alpha, bug #324619
23 Jul 2010; Markus Meier <maekke@gentoo.org> popt-1.16.ebuild:
arm stable, bug #324619
03 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> popt-1.16.ebuild:
ppc64 stable wrt #324619
27 Jun 2010; <nixnut@gentoo.org> popt-1.16.ebuild:
ppc stable #324619
24 Jun 2010; Pacho Ramos <pacho@gentoo.org> popt-1.16.ebuild:
stable amd64, bug 324619
24 Jun 2010; Jeroen Roovers <jer@gentoo.org> popt-1.16.ebuild:
Stable for HPPA (bug #324619).
23 Jun 2010; Christian Faulhammer <fauli@gentoo.org> popt-1.16.ebuild:
stable x86, bug 324619
06 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> popt-1.16.ebuild:
Fix testsuite.
*popt-1.16 (10 May 2010)
10 May 2010; Samuli Suominen <ssuominen@gentoo.org> +popt-1.16.ebuild:
Version bump.
25 Jan 2010; Raúl Porcel <armin76@gentoo.org> popt-1.15.ebuild:
arm/ia64/m68k/s390/sh stable wrt #296420
06 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> popt-1.14.ebuild,
popt-1.15.ebuild:
License "popt" is a duplicate of "MIT" wrt #299854, thanks to Ulrich
Müller for reporting.
01 Jan 2010; Tobias Klausmann <klausman@gentoo.org> popt-1.15.ebuild:
Stable on alpha, bug #296420
11 Dec 2009; Brent Baude <ranger@gentoo.org> popt-1.15.ebuild:
Marking popt-1.15 ppc64 for bug 296420
10 Dec 2009; Tiago Cunha <tcunha@gentoo.org> popt-1.15.ebuild:
stable sparc, bug 296420
10 Dec 2009; Christian Faulhammer <fauli@gentoo.org> popt-1.15.ebuild:
stable x86, bug 296420
10 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> popt-1.15.ebuild:
amd64 stable wrt #296420
10 Dec 2009; Jeroen Roovers <jer@gentoo.org> popt-1.15.ebuild:
Stable for HPPA PPC (bug #296420).
04 Nov 2009; Raúl Porcel <armin76@gentoo.org> popt-1.14.ebuild:
ia64/m68k/s390/sh stable wrt #286199
16 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> metadata.xml:
Change from maintainer-needed to base-system (net-misc/rsync is
base-system).
16 Oct 2009; Jeroen Roovers <jer@gentoo.org> popt-1.14.ebuild:
Stable for HPPA (bug #286199).
03 Oct 2009; Tiago Cunha <tcunha@gentoo.org> popt-1.14.ebuild:
stable sparc, bug 286199
03 Oct 2009; Tobias Klausmann <klausman@gentoo.org> popt-1.14.ebuild:
Stable on alpha, bug #286199
27 Sep 2009; nixnut <nixnut@gentoo.org> popt-1.14.ebuild:
ppc stable #286199
27 Sep 2009; Brent Baude <ranger@gentoo.org> popt-1.14.ebuild:
Marking popt-1.14 ppc64 for bug 286199
27 Sep 2009; Markus Meier <maekke@gentoo.org> popt-1.14.ebuild:
amd64/arm/x86 stable, bug #286199
*popt-1.15 (24 Sep 2009)
24 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> +popt-1.15.ebuild,
+files/popt-1.15-check.patch:
Version bump wrt #270444, thanks to Conrad Kostecki for reporting.
29 Jul 2009; Samuli Suominen <ssuominen@gentoo.org> popt-1.14.ebuild:
Don't remove .la files so this can be unmasked.
23 Mar 2009; Justin Bronder <jsbronder@gentoo.org> popt-1.10.7.ebuild,
popt-1.12.ebuild, popt-1.13.ebuild, popt-1.14.ebuild:
Fix LICENSE, verified against all tarballs.
*popt-1.14 (18 Apr 2008)
18 Apr 2008; Diego Pettenò <flameeyes@gentoo.org> +popt-1.14.ebuild:
Version bump, and while at it drop the libtool .la file. Bugs about _this
version_ can come my way for now.
*popt-1.13 (07 Jan 2008)
07 Jan 2008; Ryan Hill <dirtyepic@gentoo.org> +popt-1.13.ebuild:
Version bump. Fixes redefinition errors in headers when building packages
like xulrunner with GCC 4.3.
*popt-1.12 (09 Dec 2007)
09 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+files/popt-1.12-scrub-lame-gettext.patch, +popt-1.12.ebuild:
Version bump #199160 by Sandro Bonazzola.
11 Jun 2007; Raúl Porcel <armin76@gentoo.org> popt-1.10.7.ebuild:
alpha stable wrt #161177
14 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
add <herd>no-herd</herd>
12 May 2007; Joshua Kinard <kumba@gentoo.org> popt-1.10.7.ebuild:
Stable on mips.
05 Mar 2007; Sandro Bonazzola <sanchan@gentoo.org> ChangeLog:
Removing myself from metadata.xml as I'm stepping back.
20 Jan 2007; Jeroen Roovers <jer@gentoo.org> popt-1.10.7.ebuild:
Stable for HPPA (bug #161177).
15 Jan 2007; Mike Frysinger <vapier@gentoo.org>
+files/popt-1.10.7-scrub-lame-gettext.patch, popt-1.10.7.ebuild:
Remove pointless gettext check #161988 by Christian Heim.
13 Jan 2007; Mike Frysinger <vapier@gentoo.org> popt-1.10.7.ebuild:
Cleanup patches and drop requirement for autotools.
13 Jan 2007; nixnut <nixnut@gentoo.org> popt-1.10.4-r3.ebuild,
popt-1.10.7.ebuild:
Stable on ppc wrt bug 161177
11 Jan 2007; Markus Rothe <corsair@gentoo.org> popt-1.10.7.ebuild:
Stable on ppc64; bug #161177
11 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> popt-1.10.7.ebuild:
Stable on sparc
10 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org> popt-1.10.4-r3.ebuild,
popt-1.10.7.ebuild:
Stable on amd64/x86 wrt bug #161177.
10 Jan 2007; Gustavo Zacarias <gustavoz@gentoo.org> popt-1.10.4-r3.ebuild:
Stable on sparc wrt #161177
09 Jan 2007; Sandro Bonazzola <sanchan@gentoo.org> popt-1.7-r1.ebuild,
-popt-1.10.4-r1.ebuild, -popt-1.10.4-r2.ebuild:
Removed obsolete 1.10.4 ebuilds, updating 1.7-r1 ebuild for autotools eclass
changes. Fix again bug #148187.
*popt-1.10.7 (06 Dec 2006)
06 Dec 2006; Sandro Bonazzola <sanchan@gentoo.org> +popt-1.10.7.ebuild:
Version bump (bug #121862) thanks to Timothy Redaelli <drizzt@gentoo.org>.
08 Nov 2006; Timothy Redaelli <drizzt@gentoo.org> popt-1.10.4-r3.ebuild:
Keyworded ~ppc, wrt bug 121862.
07 Nov 2006; Sandro Bonazzola <sanchan@gentoo.org> popt-1.10.4-r3.ebuild:
Readding dropped keywords.
*popt-1.10.4-r3 (07 Nov 2006)
07 Nov 2006; Sandro Bonazzola <sanchan@gentoo.org>
+files/popt-1.10.4-regression.patch, metadata.xml, +popt-1.10.4-r3.ebuild:
Version bump, including a fix for a regression found by wormo@gentoo.org and
fixed with a patch provided by drizzt@gentoo.org, last fix needed for bug
#121862.
05 Nov 2006; Bryan Østergaard <kloeri@gentoo.org> popt-1.10.4-r2.ebuild:
Add ~alpha keyword.
03 Nov 2006; Jason Wever <weeve@gentoo.org> popt-1.10.4-r2.ebuild:
Added ~sparc keyword wrt bug #121862.
02 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> popt-1.10.4-r2.ebuild:
Add versioned dependencies over autoconf/automake.
24 Oct 2006; Fabian Groffen <grobian@gentoo.org> popt-1.7-r1.ebuild,
popt-1.10.4-r1.ebuild, popt-1.10.4-r2.ebuild:
Dropped ppc-macos keyword, see you in prefix.
*popt-1.10.4-r2 (21 Oct 2006)
21 Oct 2006; Sandro Bonazzola <sanchan@gentoo.org>
files/popt-1.10.4-nls.patch, popt-1.10.4-r1.ebuild,
+popt-1.10.4-r2.ebuild:
Removed nls patch from 1.10.4-r1 now DEPENDing on gettext. Added 1.10.4-r2
masked for testing, nls patch updated discarding any gettext reference.
17 Oct 2006; Roy Marples <uberlord@gentoo.org> popt-1.10.4-r1.ebuild:
Added ~sparc-fbsd keyword.
12 Oct 2006; Sandro Bonazzola <sanchan@gentoo.org>
files/popt-1.10.4-lib64.patch:
lib64 patch updated with the one provided by Roy Marples fixing bug #150984.
The patch solves both multilib behaviour and lib6464 previously fixed.
09 Oct 2006; Sandro Bonazzola <sanchan@gentoo.org>
+files/popt-1.10.4-nls.patch, popt-1.10.4-r1.ebuild:
Fix bug #150543. Patch provided by opensolaris.org, ported from popt-1.7 and
adapted for gentoo. Original patch available here:
http://cvs.opensolaris.org/source/xref/jds/Solaris/patches/popt-01-xgettext.diff
01 Oct 2006; Guy Martin <gmsoft@gentoo.org> popt-1.10.4-r1.ebuild:
Stable on hppa.
21 Sep 2006; Fabian Groffen <grobian@gentoo.org> popt-1.10.4-r1.ebuild:
Remove ppc-macos hack, upstream does this already. Marked ~ppc-macos
19 Sep 2006; <antarus@gentoo.org> popt-1.7-r1.ebuild:
Adding dep on automake to popt to fix stage1 ebuilds
13 Sep 2006; Aron Griffis <agriffis@gentoo.org> popt-1.10.4-r1.ebuild:
Mark 1.10.4-r1 ~ia64. #121862
12 Sep 2006; Markus Rothe <corsair@gentoo.org> popt-1.10.4-r1.ebuild:
Added ~ppc64; bug #121862
12 Sep 2006; Joshua Jackson <tsunam@gentoo.org> popt-1.10.4-r1.ebuild:
adding ~x86 as requested
11 Sep 2006; Sandro Bonazzola <sanchan@gentoo.org>
files/popt-1.10.4-lib64.patch, popt-1.10.4-r1.ebuild:
Fixing configure.ac patch using ${EGREP} instead of grep, fixing autoreconf
issues. Thanks to SpanKY <vapier@gentoo.org> for reporting and solving the
issue. Fix bug #147133
10 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> popt-1.10.4-r1.ebuild:
Add ~x86-fbsd keyword as per bug #121862.
*popt-1.10.4-r1 (10 Sep 2006)
10 Sep 2006; Sandro Bonazzola <sanchan@gentoo.org>
+files/popt-1.10.4-lib64.patch, -popt-1.10.4.ebuild,
+popt-1.10.4-r1.ebuild:
ebuild bump fixing bug #146988, bug #147066, bug #147044. Many thanks to
Patrick McLean for the patches and Diego Pettenò for the package masking.
*popt-1.10.4 (09 Sep 2006)
09 Sep 2006; Sandro Bonazzola <sanchan@gentoo.org> metadata.xml,
+popt-1.10.4.ebuild:
Version bump, intially only for ~amd64. Partially resolve bug# 121862.
Taking over maintainership of the package.
07 Sep 2006; Steve Dibb <beandog@gentoo.org> +metadata.xml:
Add metadata
30 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> popt-1.7-r1.ebuild:
Add ~x86-fbsd keyword.
25 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+files/popt-1.7-nls.patch, popt-1.7-r1.ebuild:
Add patch to link to libintl when not using GLIBC; depend on virtual/libintl
when using nls.
10 May 2005; Mike Frysinger <vapier@gentoo.org>
+files/popt-1.7-missing-tests.patch, popt-1.7-r1.ebuild:
Add a patch by Ryan Hill to remove incomplete tests #71610.
26 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> popt-1.7-r1.ebuild:
update source in src_unpack; use emake; tidy
15 Jun 2004; <solar@gentoo.org> popt-1.7-r1.ebuild,
files/popt-1.7-uclibc.patch:
added uclibc patch for configure target
*popt-1.7-r1 (20 Mar 2003)
27 Mar 2003; Seemant Kulleen <seemant@gentoo.org> popt-1.7-r1.ebuild:
ok, this one actually does disable nls and also has a mips fix
27 Mar 2003; Seemant Kulleen <seemant@gentoo.org> popt-1.7-r1.ebuild:
gettext is no longer a REQUIRED dependency, though it's a quirky way of
disabling it -- tsk tsk @ the upstream authors
20 Mar 2003; Graham Forest <vladimir@gentoo.org> popt-1.7-r1.ebuild:
Removed usage of pic USE flag
21 Feb 2003; Zach Welch <zwelch@gentoo.org> :
Added arm to keywords.
11 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
Added hppa to keywords.
06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
*popt-1.7 (19 Nov 2002)
09 Mar 2003; Aron Griffis <agriffis@gentoo.org> popt-1.7.ebuild:
Mark stable on alpha
6 Feb 2003; Luca Barbato <lu_zero@gentoo.org> :
added elibtoolize
19 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
Version bump/added pic support
*popt-1.6.3 (03 Mar 2002)
18 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
Added mips to keywords
03 Oct 2002; Brad Cowan <bcowan@gentoo.org> popt-1.6.3.ebuild :
fixed nls compile problems per bug #8731
01 Aug 2002; Mark Guertin <gerk@gentoo.org> libxml2-2.4.23.ebuild :
Added ppc to keywords
29 May 2002; Spider <spider@gentoo.org> popt-1.6.3.ebuild popt-1.5.ebuild :
fix bogus DESCRIPTION
*popt-1.5 (01 Feb 2002)
01 Aug 2002; Mark Guertin <gerk@gentoo.org> libxml2-2.4.23.ebuild :
Added ppc to keywords
01 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
Added initial ChangeLog which should be updated whenever the package is
updated in any way. This changelog is targetted to users. This means that the
comments should well explained and written in clean English. The details about
writing correct changelogs are explained in the skel.ChangeLog file which you
can find in the root directory of the portage repository.

View File

@ -1,6 +1 @@
AUX fix-popt-pkgconfig-libdir.patch 519 SHA256 c73def3602304ff38f383981621ba294497d69bf8ae54da5c6172d459ddadc08 SHA512 8862cb25283f38d734aa1abaa4d29d1f018718be77d03a4f0533b6b8b2518581abf277eefd3b3d56d5f9ab9e00b544e816e83fca6863e86a66dacae0f9abbfd0 WHIRLPOOL fb19c8cf6bb957e5008bc887cab0461b61ebc6e6d8a6e616e653a5c7543fe4b8f018e321167d9036e33b99884dce05975260d64a8a9f4638cfa3165dfe723395
DIST popt-1.16.tar.gz 702769 SHA256 e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8 SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694 WHIRLPOOL 0f6ffe7dcab6dcca718f0c79a30d620d0cc2583d2c1018e4eb2357d7594df6b282c68a9e9b14f5c00731ef3abb0a39c98c3f8fa5a7331137702aea34682c7b4c
EBUILD popt-1.16-r1.ebuild 902 SHA256 c64dda83df93ae16cf07e99210f635383583b01132086fb7ac092a155fb734d6 SHA512 87c152a6b4131f46fc4aaa2006dba052133334ae9628d385cf9eebda16f74f6354bb466ae702ceb823cbbedc958ab1da07a2d2e77b0f47c14f1c7b3b04cbe9d6 WHIRLPOOL d9c332079b5192f4523c637dc91fe7c6663a0a8a6325ac92b4734fb12f9492bb33546e49770bc574ee5c233b90fa9e5767999dfec2b66bcf2bbd5a3be5f3ef99
EBUILD popt-1.16-r2.ebuild 927 SHA256 3900a79a9084636442b913d89abb7041711440adde25aa5ee9056ae7ead5c52c SHA512 1a419283c7d3dc8c4472f047f409903999acd7500c3e4fbe511bcbafe53ed6f8eee395bd8e8f0377aee7a4b2664026a0d934c39ed25c67a675c1ef4c1de9be9a WHIRLPOOL d533922f3a1fb546a81a13fb05b5a43af4b79cf29808750b4d27478154a13885ffec2aa674c7e6f05ea24e89de361156a28dd2a6158e2c2725d1dbb55bbb6882
MISC ChangeLog 14481 SHA256 cb1de3670b7513de4f342dfb976db18ef6a7bd02d82caadff9a5269b63880bcb SHA512 bcf55cc938b0fa88f8c87d85cae0952633e8735135a1a91f976c178d57992aa0978b928703152b66be1624795deb4f3ab83f8ebf682e7dbc39049539a85efce6 WHIRLPOOL 75c6012b586ed439d37eea3ad8aa0ac52a12810f49caa7cd4063d3a2c6b41c54d493e247ebbafbcfb604ef2ebd55589a0586768797fe8ceaccdd563e72772475
MISC metadata.xml 166 SHA256 a33d3505ea834e19cd196ef8af9d438f1e476abb2aca27b0ea9f1219e93b8b26 SHA512 9a924987983984221311fc13539b270e032c8a18bfb2e863480dd4be10d36f3ec22d6824cc443c4dcbd34a6a0abce33ba70eeb90766122e072d442216af4f8dc WHIRLPOOL c28ad7db1ab0447a86899c0b1e504795754cc1ac75250e1b81ddb3ea1ea318abdeca1712695d18f8a12ff8b72e73b4cefef35adc05eb15a448aff88e7bd4b330
DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5

View File

@ -1,12 +0,0 @@
diff -u popt-1.16.orig/Makefile.in popt-1.16/Makefile.in
--- popt-1.16.orig/Makefile.in 2010-05-04 16:55:59.000000000 -0400
+++ popt-1.16/Makefile.in 2010-12-23 22:45:42.843131000 -0500
@@ -370,7 +370,7 @@
libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@ \
$(am__append_1)
-pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = popt.pc
man_MANS = popt.3
BUILT_SOURCES = popt.pc # popt.lcd

View File

@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>base-system</herd>
<maintainer type="project">
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
<upstream>
<remote-id type="cpe">cpe:/a:popt_project:popt</remote-id>
</upstream>
</pkgmetadata>

View File

@ -1,37 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=3
inherit eutils
DESCRIPTION="Parse Options - Command line parser"
HOMEPAGE="http://rpm5.org/"
SRC_URI="http://rpm5.org/files/popt/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="nls static-libs"
RDEPEND="nls? ( virtual/libintl )"
DEPEND="nls? ( sys-devel/gettext )"
src_prepare() {
epatch "${FILESDIR}"/fix-popt-pkgconfig-libdir.patch #349558
sed -i -e 's:lt-test1:test1:' testit.sh || die
}
src_configure() {
econf \
--disable-dependency-tracking \
$(use_enable static-libs static) \
$(use_enable nls)
}
src_install() {
emake DESTDIR="${D}" install || die
dodoc CHANGES README || die
find "${ED}" -name '*.la' -exec rm -f {} +
}

View File

@ -1,36 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils multilib-minimal
DESCRIPTION="Parse Options - Command line parser"
HOMEPAGE="http://rpm5.org/"
SRC_URI="http://rpm5.org/files/popt/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="nls static-libs"
RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
DEPEND="nls? ( sys-devel/gettext )"
src_prepare() {
epatch "${FILESDIR}"/fix-popt-pkgconfig-libdir.patch #349558
sed -i -e 's:lt-test1:test1:' testit.sh || die
}
multilib_src_configure() {
ECONF_SOURCE=${S} \
econf \
--disable-dependency-tracking \
$(use_enable static-libs static) \
$(use_enable nls)
}
multilib_src_install_all() {
dodoc CHANGES README
prune_libtool_files --all
}

View File

@ -0,0 +1,38 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit multilib-minimal libtool
DESCRIPTION="Parse Options - Command line parser"
HOMEPAGE="https://github.com/rpm-software-management/popt"
SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls static-libs"
RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}"
BDEPEND="nls? ( sys-devel/gettext )"
src_prepare() {
default
sed -i -e 's:lt-test1:test1:' tests/testit.sh || die
elibtoolize
}
multilib_src_configure() {
local myeconfargs=(
$(use_enable static-libs static)
$(use_enable nls)
)
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
multilib_src_install_all() {
dodoc CHANGES README
find "${ED}" -type f -name "*.la" -delete || die
}