mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-24 23:21:17 +02:00
Merge pull request #2214 from flatcar/krnowak/rest-automation
Put rest of the packages in portage-stable under automation
This commit is contained in:
commit
6e9797482d
19
.github/workflows/portage-stable-packages-list
vendored
19
.github/workflows/portage-stable-packages-list
vendored
@ -479,13 +479,18 @@ media-libs/libpng
|
||||
|
||||
net-analyzer/openbsd-netcat
|
||||
net-analyzer/netperf
|
||||
net-analyzer/tcpdump
|
||||
net-analyzer/traceroute
|
||||
|
||||
net-dialup/lrzsz
|
||||
net-dialup/minicom
|
||||
|
||||
net-dns/bind-tools
|
||||
net-dns/c-ares
|
||||
net-dns/dnsmasq
|
||||
net-dns/libidn2
|
||||
|
||||
net-firewall/conntrack-tools
|
||||
net-firewall/ipset
|
||||
|
||||
net-fs/cifs-utils
|
||||
@ -596,9 +601,7 @@ sys-block/parted
|
||||
sys-block/thin-provisioning-tools
|
||||
|
||||
sys-boot/efibootmgr
|
||||
# Updating to 3.0.17 breaks building of sys-boot/shim.
|
||||
#
|
||||
# sys-boot/gnu-efi
|
||||
sys-boot/gnu-efi
|
||||
sys-boot/mokutil
|
||||
|
||||
sys-devel/bc
|
||||
@ -673,14 +676,19 @@ sys-process/tini
|
||||
virtual/acl
|
||||
virtual/dev-manager
|
||||
virtual/editor
|
||||
virtual/krb5
|
||||
virtual/libc
|
||||
virtual/libcrypt
|
||||
virtual/libelf
|
||||
virtual/libiconv
|
||||
virtual/libintl
|
||||
virtual/libudev
|
||||
virtual/libusb
|
||||
virtual/man
|
||||
virtual/openssh
|
||||
virtual/os-headers
|
||||
virtual/package-manager
|
||||
virtual/pager
|
||||
virtual/perl-Carp
|
||||
virtual/perl-Data-Dumper
|
||||
virtual/perl-Encode
|
||||
@ -692,11 +700,16 @@ virtual/perl-Getopt-Long
|
||||
virtual/perl-IO
|
||||
virtual/perl-Unicode-Collate
|
||||
virtual/pkgconfig
|
||||
virtual/resolvconf
|
||||
virtual/rust
|
||||
virtual/service-manager
|
||||
virtual/ssh
|
||||
virtual/tmpfiles
|
||||
virtual/udev
|
||||
|
||||
x11-base/xorg-proto
|
||||
|
||||
x11-libs/pixman
|
||||
|
||||
x11-misc/makedepend
|
||||
x11-misc/shared-mime-info
|
||||
|
3
changelog/updates/2024-08-08-rest-automation.md
Normal file
3
changelog/updates/2024-08-08-rest-automation.md
Normal file
@ -0,0 +1,3 @@
|
||||
- conntrack-tools ([1.4.8](https://lwn.net/Articles/945927/))
|
||||
- dev: minicom ([2.9](https://salsa.debian.org/minicom-team/minicom/-/releases/2.9))
|
||||
- tcpdump ([4.99.4](https://github.com/the-tcpdump-group/tcpdump/blob/tcpdump-4.99.4/CHANGES))
|
@ -1,15 +0,0 @@
|
||||
diff -r -u lrzsz-0.12.20/configure.in lrzsz-0.12.20-patched/configure.in
|
||||
--- lrzsz-0.12.20/configure.in 2024-01-09 10:51:43.460543006 -0000
|
||||
+++ lrzsz-0.12.20-patched/configure.in 2024-01-09 10:57:32.001193035 -0000
|
||||
@@ -263,6 +263,11 @@
|
||||
AC_SUBST(LDFLAGS)
|
||||
AC_SUBST(LIBS)
|
||||
|
||||
+# a workaround for not AC_SUBSTed USE_INCLUDED_LIBINTL when disable-nls is passed
|
||||
+if test "x${USE_NLS}" = xno ; then
|
||||
+ USE_INCLUDED_LIBINTL=no
|
||||
+ AC_SUBST(USE_INCLUDED_LIBINTL)
|
||||
+fi
|
||||
|
||||
AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME", [LOCALEDIR])
|
||||
AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
|
@ -1,3 +0,0 @@
|
||||
This patch should be upstreamed to Gentoo to fix build issues when nls
|
||||
USE flag is masked (nls is used for internationalization). I think it
|
||||
happens only when our SDK also has nls USE flag disabled.
|
@ -83,7 +83,7 @@ dev-util/catalyst ~amd64 ~arm64
|
||||
=net-analyzer/netperf-2.7.0_p20210121 ~amd64 ~arm64
|
||||
|
||||
# Keep versions on both arches in sync.
|
||||
=net-firewall/conntrack-tools-1.4.6-r1 ~arm64
|
||||
=net-firewall/conntrack-tools-1.4.8 ~arm64
|
||||
|
||||
# Required for addressing CVE-2023-0361, CVE-2023-5981, CVE-2024-0567,
|
||||
# CVE-2024-0553, CVE-2024-28834 and CVE-2024-28835.
|
||||
|
@ -6,3 +6,7 @@ sys-apps/systemd sysv-utils vanilla
|
||||
|
||||
# dbus without systemd conflicts with systemd
|
||||
sys-apps/dbus systemd
|
||||
|
||||
# use systemd as udev implementation
|
||||
virtual/libudev systemd
|
||||
virtual/udev systemd
|
||||
|
@ -1,2 +1,2 @@
|
||||
DIST tcpdump-4.99.1-upstream.tar.gz 2014324 BLAKE2B 0a10fe68afdfe80d3e7e661352fcaf1c47702df27fbed959f52fb0ec81543a1d4ce6b0de16a8b081de48dd43e09a13f5e1f0fb11d7590f92cbff29dc511bea12 SHA512 53d31355e1a6ef5a65bb3bf72454169fc80adf973a327a5768840e6ccf0550fbeb3c8a41f959635076d871df0619680321910a3a97879607f481cdaa8b7ceda7
|
||||
DIST tcpdump-4.99.1-upstream.tar.gz.sig 442 BLAKE2B 9a80b1796ef777bd06d0b8953fe1ff446431d0ff1dffcd58e29a0b771f6734f70f3f0da7c36a1eaa1b6e57719d79c601872a84b7734208a7e8951cad9aca86ee SHA512 b438643701efbbb5579d9d51ed48756a47dd644e0acb10b0edff6d04f3ae4cea6528b40820a656407b73f983b2a634e0165a6c8c0fca3b557394a14e2f2384ab
|
||||
DIST tcpdump-4.99.4.tar.gz 1903612 BLAKE2B f100e10774574ef04a770bc30d4e2d06fd0f1f16a7b2c88848be6e8290cc4838666ff378d9f78fdc418f4ffab9716a11214edc3588c292cb5ff39636cd7cfd2d SHA512 cb51e19574707d07c0de90dd4c301955897f2c9f2a69beb7162c08f59189f55625346d1602c8d66ab2b4c626ea4b0df1f08ed8734d2d7f536d0a7840c2d6d8df
|
||||
DIST tcpdump-4.99.4.tar.gz.sig 442 BLAKE2B 2ee35036d86f643b378591c0eb93d8a0f08cb2f0e3638bde25515d550b40fef1bf0eb6c876d4d6512fa795041b0703954ca884c646c4af8771b4bc4049e7609a SHA512 bec395f0f595a37121bc144bac133f3fb31c6c1007cdadf061e4437d6fe2406c0cb0d5b68b5c63e03b932c783bfb58f0af0b7e8a58bb81beb9de6a0d681620e8
|
||||
|
22
sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/files/tcpdump-4.99.4-lfs.patch
vendored
Normal file
22
sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/files/tcpdump-4.99.4-lfs.patch
vendored
Normal file
@ -0,0 +1,22 @@
|
||||
https://github.com/the-tcpdump-group/tcpdump/pull/1068
|
||||
|
||||
From 54278acb038f0d16ed75cdddb35fd2813a7cdcef Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Thu, 27 Jul 2023 08:31:53 +0100
|
||||
Subject: [PATCH] configure.ac: use AC_SYS_LARGEFILE
|
||||
|
||||
This enables 64-bit off_t where it's opt-in (e.g. glibc) on 32-bit platforms.
|
||||
|
||||
Bug: https://bugs.gentoo.org/911176
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -30,7 +30,7 @@ if test "$ac_cv_prog_cc_c99" = "no"; then
|
||||
fi
|
||||
AC_LBL_C_INIT(V_CCOPT, V_INCLS)
|
||||
AC_LBL_C_INLINE
|
||||
-
|
||||
+AC_SYS_LARGEFILE
|
||||
AC_CHECK_HEADERS(fcntl.h rpc/rpc.h rpc/rpcent.h net/if.h)
|
||||
|
||||
case "$host_os" in
|
22
sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/files/tcpdump-9999-lfs.patch
vendored
Normal file
22
sdk_container/src/third_party/portage-stable/net-analyzer/tcpdump/files/tcpdump-9999-lfs.patch
vendored
Normal file
@ -0,0 +1,22 @@
|
||||
https://github.com/the-tcpdump-group/tcpdump/pull/1068
|
||||
|
||||
From 54278acb038f0d16ed75cdddb35fd2813a7cdcef Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Thu, 27 Jul 2023 08:31:53 +0100
|
||||
Subject: [PATCH] configure.ac: use AC_SYS_LARGEFILE
|
||||
|
||||
This enables 64-bit off_t where it's opt-in (e.g. glibc) on 32-bit platforms.
|
||||
|
||||
Bug: https://bugs.gentoo.org/911176
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -30,7 +30,7 @@ if test "$ac_cv_prog_cc_c99" = "no"; then
|
||||
fi
|
||||
AC_LBL_C_INIT(V_CCOPT, V_INCLS)
|
||||
AC_C_INLINE
|
||||
-
|
||||
+AC_SYS_LARGEFILE
|
||||
AC_CHECK_HEADERS(fcntl.h rpc/rpc.h rpc/rpcent.h net/if.h)
|
||||
|
||||
case "$host_os" in
|
@ -1,10 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>zlogene@gentoo.org</email>
|
||||
<name>Mikle Kolyada</name>
|
||||
</maintainer>
|
||||
<maintainer type="person">
|
||||
<email>sam@gentoo.org</email>
|
||||
<name>Sam James</name>
|
||||
|
@ -1,7 +1,7 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
inherit autotools
|
||||
|
||||
@ -13,13 +13,11 @@ if [[ ${PV} == *9999* ]] ; then
|
||||
|
||||
EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
|
||||
else
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
|
||||
inherit verify-sig
|
||||
|
||||
# Note: drop -upstream on bump, this is just because we switched to the official
|
||||
# distfiles for verify-sig
|
||||
SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
|
||||
SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
|
||||
SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
|
||||
SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
|
||||
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
|
||||
fi
|
||||
@ -28,10 +26,7 @@ LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE="+drop-root +smi +ssl +samba suid test"
|
||||
REQUIRED_USE="test? ( samba )"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
# Assorted failures: bug #768498
|
||||
#RESTRICT="test"
|
||||
|
||||
RDEPEND="
|
||||
>=net-libs/libpcap-1.10.1
|
||||
@ -42,7 +37,7 @@ RDEPEND="
|
||||
)
|
||||
smi? ( net-libs/libsmi )
|
||||
ssl? (
|
||||
>=dev-libs/openssl-0.9.6m:0=
|
||||
>=dev-libs/openssl-0.9.6m:=
|
||||
)
|
||||
suid? (
|
||||
acct-group/pcap
|
||||
@ -63,6 +58,7 @@ fi
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-9999-libdir.patch
|
||||
"${FILESDIR}"/${PN}-4.99.4-lfs.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
@ -1,7 +1,7 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
inherit autotools
|
||||
|
||||
@ -13,22 +13,20 @@ if [[ ${PV} == *9999* ]] ; then
|
||||
|
||||
EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
|
||||
else
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/tcpdump.asc
|
||||
inherit verify-sig
|
||||
|
||||
SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
|
||||
SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig )"
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
fi
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE="+drop-root +smi +ssl +samba suid test"
|
||||
REQUIRED_USE="test? ( samba )"
|
||||
|
||||
# Assorted failures: bug #768498
|
||||
RESTRICT="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
>=net-libs/libpcap-1.10.1
|
||||
@ -39,7 +37,7 @@ RDEPEND="
|
||||
)
|
||||
smi? ( net-libs/libsmi )
|
||||
ssl? (
|
||||
>=dev-libs/openssl-0.9.6m:0=
|
||||
>=dev-libs/openssl-0.9.6m:=
|
||||
)
|
||||
suid? (
|
||||
acct-group/pcap
|
||||
@ -60,6 +58,7 @@ fi
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-9999-libdir.patch
|
||||
"${FILESDIR}"/${PN}-9999-lfs.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
|
@ -1 +1,2 @@
|
||||
DIST lrzsz-0.12.20.tar.gz 280938 BLAKE2B 86511ab112da849f5894f18c045f2c8a9dd4c4e97426c1d98c5b91aade6c39e26f4a7e5674e057c9596a240dfd3ef32053fcdc8ee58b33654cf15eec64779b1e SHA512 9bce64036f1f1c65f5910f19802aecaf3dc5ffeab0feeca10fa8d2fe1b83e212391cce23056d22fd0eda52df89e12ede68eb5d22ffcf22f935910d2af7399f12
|
||||
DIST lrzsz-m4-0.12.20.tar.bz2 23959 BLAKE2B 933e43f80a40478baef77d69f81fcb04947f2d0afb87f777b0c000ea4223408bf3e55d687cf625ab4835fb30e274f7058ff09ee3b51ad90e09723cd3053ee038 SHA512 c8818381f2e5271bc2dd7d469c0a33a6b22d42d3159b41f168223473a8b03322f3ff91a49ce398e3ef5abe7b355d92b83b1429d0c6d450d19985a60e2e1190d4
|
||||
|
27
sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/files/lrzsz-0.12.20-c99.patch
vendored
Normal file
27
sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/files/lrzsz-0.12.20-c99.patch
vendored
Normal file
@ -0,0 +1,27 @@
|
||||
https://src.fedoraproject.org/rpms/lrzsz/blob/c23247c9c7604aec31d49ed1b238622835f575e2/f/lrzsz-socklen.patch
|
||||
|
||||
Use socklen_t as the length of the socket address (which is a bit of
|
||||
an anachronism, considering the rest of the sources). The previous
|
||||
code des not work on 64-bit big-endian architectures.
|
||||
|
||||
--- a/src/tcp.c
|
||||
+++ b/src/tcp.c
|
||||
@@ -56,7 +56,7 @@ tcp_server (char *buf)
|
||||
struct sockaddr_in s;
|
||||
struct sockaddr_in t;
|
||||
int on=1;
|
||||
- size_t len;
|
||||
+ socklen_t len;
|
||||
|
||||
if ((sock = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0) {
|
||||
error(1,errno,"socket");
|
||||
@@ -91,7 +91,7 @@ tcp_accept (int d)
|
||||
{
|
||||
int so;
|
||||
struct sockaddr_in s;
|
||||
- size_t namelen;
|
||||
+ socklen_t namelen;
|
||||
int num=0;
|
||||
|
||||
namelen = sizeof(s);
|
||||
|
@ -0,0 +1,13 @@
|
||||
https://bugs.gentoo.org/898970
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -186,7 +186,8 @@ AC_CACHE_VAL(lrzsz_cv_sys_ftime_ok,
|
||||
#include <sys/types.h>
|
||||
#include <sys/timeb.h>
|
||||
#include <stdio.h>
|
||||
-main ()
|
||||
+#include <stdlib.h>
|
||||
+int main (void)
|
||||
{
|
||||
struct timeb s, slast;
|
||||
int c = 0;
|
@ -0,0 +1,25 @@
|
||||
This package does not contain the m4 macros from gettext, so if gettext is not
|
||||
installed the macros are lost when running eautoreconf.
|
||||
|
||||
Embed the required m4 files and add the directory to configure.ac.
|
||||
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -5,6 +5,7 @@
|
||||
noinst_SCRIPTS=systype
|
||||
PR=@PACKAGE@-@VERSION@
|
||||
CLEAN_FILES=fastcheck.done
|
||||
+AC_CONFIG_MACRO_DIR=-I m4
|
||||
|
||||
dist-hook:
|
||||
mkdir $(distdir)/debian
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -3,6 +3,7 @@
|
||||
AC_INIT(src/crctab.c)
|
||||
AM_INIT_AUTOMAKE(lrzsz, 0.12.20)
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
+AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
|
||||
dnl AC_C_CROSS is in AC_PROG_CC since 2.12
|
@ -0,0 +1,23 @@
|
||||
https://src.fedoraproject.org/rpms/lrzsz/blob/rawhide/f/lrzsz-0.12.20.patch
|
||||
https://bugs.gentoo.org/797247
|
||||
|
||||
diff -urN lrzsz-0.12.20/src/zm.c lrzsz-0.12.20.new/src/zm.c
|
||||
--- lrzsz-0.12.20/src/zm.c Tue Dec 29 09:48:38 1998
|
||||
+++ lrzsz-0.12.20.new/src/zm.c Tue Oct 8 12:46:58 2002
|
||||
@@ -431,10 +431,12 @@
|
||||
VPRINTF(3,("zsdata: %lu %s", (unsigned long) length,
|
||||
Zendnames[(frameend-ZCRCE)&3]));
|
||||
crc = 0;
|
||||
- do {
|
||||
- zsendline(*buf); crc = updcrc((0377 & *buf), crc);
|
||||
- buf++;
|
||||
- } while (--length>0);
|
||||
+
|
||||
+ for( ; length; length--) {
|
||||
+ zsendline(*buf); crc = updcrc((0377 & *buf), crc);
|
||||
+ buf++;
|
||||
+ }
|
||||
+
|
||||
xsendline(ZDLE); xsendline(frameend);
|
||||
crc = updcrc(frameend, crc);
|
||||
|
@ -0,0 +1,48 @@
|
||||
gettext 0.22 removed BUILD_INCLUDED_LIBINTL and USE_INCLUDED_LIBINTL is 'no'
|
||||
|
||||
INSTOBJEXT was deprecated and removed, replace with .mo
|
||||
|
||||
Bug: https://bugs.gentoo.org/908861
|
||||
|
||||
--- a/intl/Makefile.in
|
||||
+++ b/intl/Makefile.in
|
||||
@@ -81,7 +81,7 @@
|
||||
|
||||
INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib
|
||||
|
||||
-all: all-@USE_INCLUDED_LIBINTL@
|
||||
+all: all-no
|
||||
|
||||
all-yes: libintl.$la intlh.inst
|
||||
all-no:
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -98,7 +98,7 @@
|
||||
AM_PROG_AR
|
||||
AC_ISC_POSIX
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
-AM_GNU_GETTEXT
|
||||
+AM_GNU_GETTEXT([use-libtool])
|
||||
AC_C_CONST
|
||||
AC_C_INLINE
|
||||
|
||||
@@ -264,6 +264,8 @@
|
||||
AC_SUBST(LDFLAGS)
|
||||
AC_SUBST(LIBS)
|
||||
|
||||
+INTLLIBS="$LIBINTL"
|
||||
+AC_SUBST(INTLLIBS)
|
||||
|
||||
AC_DEFINE_UNQUOTED(LOCALEDIR,"$prefix/$DATADIRNAME", [LOCALEDIR])
|
||||
AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
|
||||
--- a/po/Makefile.in.in
|
||||
+++ b/po/Makefile.in.in
|
||||
@@ -53,7 +53,7 @@
|
||||
|
||||
CATALOGS = de.gmo
|
||||
CATOBJEXT = @CATOBJEXT@
|
||||
-INSTOBJEXT = @INSTOBJEXT@
|
||||
+INSTOBJEXT = .mo
|
||||
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
|
@ -1,13 +1,16 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
inherit autotools flag-o-matic toolchain-funcs
|
||||
inherit autotools toolchain-funcs
|
||||
|
||||
DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols"
|
||||
HOMEPAGE="https://www.ohse.de/uwe/software/lrzsz.html"
|
||||
SRC_URI="https://www.ohse.de/uwe/releases/${P}.tar.gz"
|
||||
SRC_URI="
|
||||
https://www.ohse.de/uwe/releases/${P}.tar.gz
|
||||
https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-m4-${PV}.tar.bz2
|
||||
"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
@ -15,6 +18,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc
|
||||
IUSE="nls"
|
||||
|
||||
DEPEND="nls? ( virtual/libintl )"
|
||||
BDEPEND="nls? ( sys-devel/gettext )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-autotools.patch
|
||||
@ -23,6 +27,10 @@ PATCHES=(
|
||||
"${FILESDIR}"/${P}-automake-1.13.patch
|
||||
"${FILESDIR}"/${P}-gettext-0.20.patch
|
||||
"${FILESDIR}"/${P}-AR.patch
|
||||
"${FILESDIR}"/${P}-configure-clang16.patch
|
||||
"${FILESDIR}"/${P}-gettext-0.22.patch
|
||||
"${FILESDIR}"/${P}-disable-nls.patch
|
||||
"${FILESDIR}"/${P}-c99.patch
|
||||
)
|
||||
|
||||
DOCS=( AUTHORS COMPATABILITY ChangeLog NEWS \
|
||||
@ -30,26 +38,29 @@ DOCS=( AUTHORS COMPATABILITY ChangeLog NEWS \
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# automake is unhappy if this is missing
|
||||
>> config.rpath || die
|
||||
# This is too old. Remove it so automake puts in a newer copy.
|
||||
rm -f missing || die
|
||||
rm missing || die
|
||||
# Autoheader does not like seeing this file.
|
||||
rm -f acconfig.h || die
|
||||
rm acconfig.h || die
|
||||
# embed default m4 files in case gettext is not installed
|
||||
mv "${WORKDIR}"/m4 . || die
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC
|
||||
append-flags -Wstrict-prototypes
|
||||
|
||||
econf $(use_enable nls)
|
||||
}
|
||||
|
||||
src_test() {
|
||||
#Don't use check target.
|
||||
#See bug #120748 before changing this function.
|
||||
make vcheck || die "tests failed"
|
||||
# Don't use check target.
|
||||
# See bug #120748 before changing this function.
|
||||
emake vcheck
|
||||
}
|
||||
|
||||
src_install() {
|
76
sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/lrzsz-0.12.20-r9.ebuild
vendored
Normal file
76
sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/lrzsz-0.12.20-r9.ebuild
vendored
Normal file
@ -0,0 +1,76 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools toolchain-funcs
|
||||
|
||||
DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols"
|
||||
HOMEPAGE="https://www.ohse.de/uwe/software/lrzsz.html"
|
||||
SRC_URI="
|
||||
https://www.ohse.de/uwe/releases/${P}.tar.gz
|
||||
https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-m4-${PV}.tar.bz2
|
||||
"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="nls"
|
||||
|
||||
DEPEND="nls? ( virtual/libintl )"
|
||||
BDEPEND="nls? ( sys-devel/gettext )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-autotools.patch
|
||||
"${FILESDIR}"/${PN}-implicit-decl.patch
|
||||
"${FILESDIR}"/${P}-automake-1.12.patch
|
||||
"${FILESDIR}"/${P}-automake-1.13.patch
|
||||
"${FILESDIR}"/${P}-gettext-0.20.patch
|
||||
"${FILESDIR}"/${P}-AR.patch
|
||||
"${FILESDIR}"/${P}-configure-clang16.patch
|
||||
"${FILESDIR}"/${P}-gettext-0.22.patch
|
||||
"${FILESDIR}"/${P}-disable-nls.patch
|
||||
"${FILESDIR}"/${P}-c99.patch
|
||||
"${FILESDIR}"/${P}-fix-integer-overflow.patch
|
||||
)
|
||||
|
||||
DOCS=( AUTHORS COMPATABILITY ChangeLog NEWS \
|
||||
README{,.cvs,.gettext,.isdn4linux,.tests} THANKS TODO )
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# automake is unhappy if this is missing
|
||||
>> config.rpath || die
|
||||
# This is too old. Remove it so automake puts in a newer copy.
|
||||
rm missing || die
|
||||
# Autoheader does not like seeing this file.
|
||||
rm acconfig.h || die
|
||||
# embed default m4 files in case gettext is not installed
|
||||
mv "${WORKDIR}"/m4 . || die
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC
|
||||
|
||||
econf $(use_enable nls)
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Don't use check target.
|
||||
# See bug #120748 before changing this function.
|
||||
emake vcheck
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
local x
|
||||
for x in {r,s}{b,x,z} ; do
|
||||
dosym l${x} /usr/bin/${x}
|
||||
dosym l${x:0:1}z.1 /usr/share/man/man1/${x}.1
|
||||
[ "${x:1:1}" = "z" ] || dosym l${x:0:1}z.1 /usr/share/man/man1/l${x}.1
|
||||
done
|
||||
}
|
@ -5,4 +5,7 @@
|
||||
<email>embedded@gentoo.org</email>
|
||||
<name>Embedded Gentoo</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:lrzsz_project:lrzsz</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
@ -1,2 +1,3 @@
|
||||
DIST minicom-2.7.1.tar.gz 863544 BLAKE2B 473dbf9695e16fdf23581b831d1b76f32a5b9f47cf82c6430386646a4ad04a58d61bea08ba032d0c4f779fd19d90d12270df317b719bad6cba63d921c197c87c SHA512 eb9679ac3a3d3585ea06c54407567898e50b981378656e7f8a241071c91054ff0928cc9023d2c79d1936588cdffa9426f4962b556e8daa1783add0c5ac59b5af
|
||||
DIST minicom-2.8.tar.gz 948015 BLAKE2B 007a2975a996e2dd2390b1cf20e1a70c4bb1b57d224211d30e8d83a9d02a45c147df34bf409961a20ad3746cb6b5551c1e0702a05bb0a0a3f7f042d251b553be SHA512 5ced0ff79cec11464154561130ddc6a38865170d4e4d80185ada540ba173fe89e35703b6d7fd0cf86caef6e020fcad1d7b1fdb4d4f55e3ddb906aea6a4b81b36
|
||||
DIST minicom-2.9.tar.gz 1044053 BLAKE2B 4c17f235d770ff9b4719c0ce9d3dfdb01603986d08cec245b1bfba5addbea597032bb06fc73c585886e035915dec990f37e9690b58d0a80a3e6faf8675485f96 SHA512 3bd41fa3b93b086c7b0fc851e9f46f241b13a037a4a325fc5e0ca6a4db7e9389443e8965891aa938a9c31ff848d50fd0cb88b98690a06737b5f3aca2520a60e2
|
||||
DIST minicom-m4-2.8.tar.bz2 26016 BLAKE2B 0cff0bc3ca134b417fdabb5e2994afebaf89224b95c0b3843ec57e815f43778c8eab1f8df6098d756616a0c494812d9fabc4292eaeaa9c09afb62821ce852438 SHA512 d09e141b1b83f215dc11dcd33d0cd62000c46384ea86084edfb07b04a4d30c0d9e2dce49e5e8e78f3f70fb646737f1e55a9c1158906312575ca2f02db6283994
|
||||
|
@ -1,55 +0,0 @@
|
||||
diff -ru minicom-2.3.orig/extras/scriptdemo minicom-2.3/extras/scriptdemo
|
||||
--- minicom-2.3.orig/extras/scriptdemo 2003-03-30 21:55:39.000000000 +0300
|
||||
+++ minicom-2.3/extras/scriptdemo 2008-04-20 05:27:19.000000000 +0300
|
||||
@@ -1,5 +1,5 @@
|
||||
# A little demonstration of the possibilities of "runscript".
|
||||
-# This script can be executed by typing: "runscript scriptdemo".
|
||||
+# This script can be executed by typing: "/usr/bin/runscript scriptdemo".
|
||||
#
|
||||
# Adjust the stty's below to your system: BSD-like or SysV-like.
|
||||
# Linux ofcourse accepts both :-)
|
||||
diff -ru minicom-2.3.orig/man/minicom.1 minicom-2.3/man/minicom.1
|
||||
--- minicom-2.3.orig/man/minicom.1 2008-02-24 12:22:43.000000000 +0200
|
||||
+++ minicom-2.3/man/minicom.1 2008-04-20 05:27:19.000000000 +0300
|
||||
@@ -418,7 +418,7 @@
|
||||
.TP 0.5i
|
||||
.B D - Script program
|
||||
Which program to use as the script interpreter. Defaults to the
|
||||
-program "runscript", but if you want to use something else (eg,
|
||||
+program "/usr/bin/runscript", but if you want to use something else (eg,
|
||||
/bin/sh or "expect") it is possible. Stdin and stdout are connected
|
||||
to the modem, stderr to the screen.
|
||||
.RS 0.5i
|
||||
diff -ru minicom-2.3.orig/man/runscript.1 minicom-2.3/man/runscript.1
|
||||
--- minicom-2.3.orig/man/runscript.1 2007-11-13 23:35:06.000000000 +0200
|
||||
+++ minicom-2.3/man/runscript.1 2008-04-20 05:27:19.000000000 +0300
|
||||
@@ -5,7 +5,7 @@
|
||||
.\" for conditions under which this file may be redistributed.
|
||||
.TH RUNSCRIPT 1 "$Date: 2008/04/20 02:39:28 $" "User's Manual"
|
||||
.SH NAME
|
||||
-runscript \- script interpreter for minicom
|
||||
+/usr/bin/runscript \- script interpreter for minicom
|
||||
.SH SYNOPSIS
|
||||
.B runscript
|
||||
.RI "scriptname [logfile [homedir]]"
|
||||
diff -ru minicom-2.3.orig/src/rwconf.c minicom-2.3/src/rwconf.c
|
||||
--- minicom-2.3.orig/src/rwconf.c 2007-10-10 23:18:20.000000000 +0300
|
||||
+++ minicom-2.3/src/rwconf.c 2008-04-20 05:27:19.000000000 +0300
|
||||
@@ -118,7 +118,7 @@
|
||||
{ N_("No"), 0, "kermreal" },
|
||||
{ "3", 0, "colusage" },
|
||||
/* The script program */
|
||||
- { "runscript", 0, "scriptprog" },
|
||||
+ { "/usr/bin/runscript", 0, "scriptprog" },
|
||||
/* Modem parameters */
|
||||
{ "~^M~AT S7=45 S0=0 L1 V1 X4 &c1 E1 Q0^M", 0, "minit" },
|
||||
{ "^M~ATZ^M~", 0, "mreset" },
|
||||
@@ -246,7 +246,7 @@
|
||||
int matched;
|
||||
|
||||
if (conftype == CONFIG_GLOBAL)
|
||||
- strcpy(P_SCRIPTPROG, "runscript");
|
||||
+ strcpy(P_SCRIPTPROG, "/usr/bin/runscript");
|
||||
|
||||
line = malloc(line_size);
|
||||
if (!line) {
|
@ -1,14 +0,0 @@
|
||||
--- minicom-2.7.orig/configure.in 2013-12-31 07:14:09.000000000 -0800
|
||||
+++ minicom-2.7/configure.in 2017-03-05 11:25:01.379020326 -0800
|
||||
@@ -217,7 +217,10 @@
|
||||
|
||||
if test "x$UUCPLOCK" != x
|
||||
then
|
||||
- if test -d $UUCPLOCK
|
||||
+ dnl If a lock directory was manually specified, do not test it actually
|
||||
+ dnl exists, as that might not be true during a chroot build, and the
|
||||
+ dnl packager is responsible for making sure it exists at runtime.
|
||||
+ if true
|
||||
then
|
||||
AC_MSG_RESULT($UUCPLOCK)
|
||||
AC_DEFINE_UNQUOTED(UUCPLOCK, "$UUCPLOCK", [Lock directory])
|
@ -1,31 +0,0 @@
|
||||
https://bugs.gentoo.org/705836
|
||||
--- a/src/minicom.h
|
||||
+++ b/src/minicom.h
|
||||
@@ -109,13 +109,13 @@ EXTERN char *dial_tty; /* tty to use. */
|
||||
|
||||
EXTERN char *dial_name; /* System we're conneced to */
|
||||
EXTERN char *dial_number; /* Number we've dialed. */
|
||||
-EXTERN char *dial_user; /* Our username there */
|
||||
-EXTERN char *dial_pass; /* Our password */
|
||||
+extern char *dial_user; /* Our username there */
|
||||
+extern char *dial_pass; /* Our password */
|
||||
|
||||
#ifdef USE_SOCKET
|
||||
-EXTERN int portfd_is_socket; /* File descriptor is a unix socket */
|
||||
-EXTERN int portfd_is_connected; /* 1 if the socket is connected */
|
||||
-EXTERN struct sockaddr_un portfd_sock_addr; /* the unix socket address */
|
||||
+extern int portfd_is_socket; /* File descriptor is a unix socket */
|
||||
+extern int portfd_is_connected; /* 1 if the socket is connected */
|
||||
+extern struct sockaddr_un portfd_sock_addr; /* the unix socket address */
|
||||
#define portfd_connected ((portfd_is_socket && !portfd_is_connected) \
|
||||
? -1 : portfd)
|
||||
#else
|
||||
@@ -141,7 +141,7 @@ EXTERN int sbcolor; /* Status Bar Background Color */
|
||||
EXTERN int st_attr; /* Status Bar attributes. */
|
||||
|
||||
/* jl 04.09.97 conversion tables */
|
||||
-EXTERN unsigned char vt_outmap[256], vt_inmap[256];
|
||||
+extern unsigned char vt_outmap[256], vt_inmap[256];
|
||||
|
||||
/* MARK updated 02/17/95 - history buffer */
|
||||
EXTERN int num_hist_lines; /* History buffer size */
|
@ -1,24 +0,0 @@
|
||||
--- a/src/dial.c
|
||||
+++ b/src/dial.c
|
||||
@@ -39,11 +39,9 @@
|
||||
#include "intl.h"
|
||||
|
||||
#ifdef VC_MUSIC
|
||||
-# if defined(__GLIBC__)
|
||||
# include <sys/ioctl.h>
|
||||
# include <sys/kd.h>
|
||||
# include <sys/time.h>
|
||||
-# endif
|
||||
#endif
|
||||
|
||||
enum { CURRENT_VERSION = 6 };
|
||||
--- a/src/getsdir.h
|
||||
+++ b/src/getsdir.h
|
||||
@@ -22,6 +22,7 @@
|
||||
* and licensing conditions. See the source, Luke.
|
||||
*/
|
||||
|
||||
+#include <sys/param.h>
|
||||
#include <dirent.h>
|
||||
|
||||
typedef struct dirEntry { /* structure of data item */
|
@ -0,0 +1,30 @@
|
||||
https://bugs.gentoo.org/912680
|
||||
https://salsa.debian.org/minicom-team/minicom/-/commit/4ed314c504bc95d8ccef81d7c68684d5ac31e9db.patch
|
||||
|
||||
From 4ed314c504bc95d8ccef81d7c68684d5ac31e9db Mon Sep 17 00:00:00 2001
|
||||
From: Adam Lackorzynski <adam@l4re.org>
|
||||
Date: Sat, 19 Aug 2023 12:52:02 +0200
|
||||
Subject: [PATCH] configure.ac: Enable large file support
|
||||
|
||||
Add AC_SYS_LARGEFILE to enable large file support in a portable way.
|
||||
Thanks the ChromeOS team and Raul Rangel for hinting at this.
|
||||
---
|
||||
configure.ac | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7b3f0df..6424a3f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -16,6 +16,8 @@ dnl Checks for programs.
|
||||
AC_PROG_CC
|
||||
AM_PROG_AR
|
||||
|
||||
+AC_SYS_LARGEFILE
|
||||
+
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
@ -0,0 +1,13 @@
|
||||
Use REQUIRE so eautopoint --force will upgrade gettext to 0.22 if available.
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -131,7 +131,7 @@ ALL_LINGUAS="cs da de es fr fi hu id ja ka ko nb pl pt_BR ro ru rw sr sv vi zh_C
|
||||
|
||||
dnl Checks for programs.
|
||||
AM_GNU_GETTEXT([external])
|
||||
-AM_GNU_GETTEXT_VERSION([0.21])
|
||||
+AM_GNU_GETTEXT_REQUIRE_VERSION([0.21])
|
||||
|
||||
dnl This is a hacky workaround as the m4 scripts for iconv seem to set
|
||||
dnl LIBICONV to '-liconv' despite that this lib is not available if iconv
|
@ -1,56 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
inherit autotools
|
||||
|
||||
DESCRIPTION="Serial Communication Program"
|
||||
HOMEPAGE="https://salsa.debian.org/minicom-team/minicom"
|
||||
SRC_URI="https://alioth-archive.debian.org/releases/minicom/Source/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="nls"
|
||||
|
||||
COMMON_DEPEND="sys-libs/ncurses:="
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
nls? ( sys-devel/gettext )"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
net-dialup/lrzsz"
|
||||
|
||||
DOCS="AUTHORS ChangeLog NEWS README doc/minicom.FAQ"
|
||||
S="${WORKDIR}/${PN}-2.7" # 2.7.1 specific
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.3-gentoo-runscript.patch
|
||||
"${FILESDIR}"/${PN}-2.7-lockdir.patch
|
||||
"${FILESDIR}"/${PN}-2.7.1-gcc-10.patch
|
||||
"${FILESDIR}"/${PN}-2.7.1-musl.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
mv "${S}"/configure.{in,ac}
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Lockdir must exist if not manually specified.
|
||||
# /var/lock is created by openrc.
|
||||
LOCKDIR=/var/lock
|
||||
econf \
|
||||
--sysconfdir="${EPREFIX}"/etc/${PN} \
|
||||
--enable-lock-dir="${LOCKDIR}" \
|
||||
$(use_enable nls)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
insinto /etc/minicom
|
||||
doins "${FILESDIR}"/minirc.dfl
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
[[ -s ${EROOT}/etc/minicom/minirc.dfl ]] && rm -f "${ED}"/etc/minicom/minirc.dfl
|
||||
}
|
@ -1,7 +1,7 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
inherit autotools
|
||||
|
||||
@ -40,6 +40,9 @@ src_configure() {
|
||||
# Lockdir must exist if not manually specified.
|
||||
# '/var/lock' is created by OpenRC.
|
||||
local myeconfargs=(
|
||||
# See bug #788142
|
||||
--sysconfdir="${EPREFIX}"/etc/${PN}
|
||||
|
||||
--disable-rpath
|
||||
--enable-lock-dir="/var/lock"
|
||||
$(use_enable nls)
|
||||
@ -51,10 +54,7 @@ src_configure() {
|
||||
src_install() {
|
||||
default
|
||||
|
||||
# Needs to match --sysconfdir above
|
||||
insinto /etc/minicom
|
||||
doins "${FILESDIR}"/minirc.dfl
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
[[ -s "${EROOT}"/etc/minicom/minirc.dfl ]] && rm -f "${ED}"/etc/minicom/minirc.dfl
|
||||
}
|
69
sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8-r4.ebuild
vendored
Normal file
69
sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8-r4.ebuild
vendored
Normal file
@ -0,0 +1,69 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools
|
||||
|
||||
DESCRIPTION="Serial Communication Program"
|
||||
HOMEPAGE="https://salsa.debian.org/minicom-team/minicom"
|
||||
SRC_URI="
|
||||
https://salsa.debian.org/${PN}-team/${PN}/-/archive/${PV}/${P}.tar.gz
|
||||
https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-m4-${PV}.tar.bz2
|
||||
"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="nls"
|
||||
|
||||
DEPEND="sys-libs/ncurses:="
|
||||
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
net-dialup/lrzsz
|
||||
"
|
||||
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
nls? ( sys-devel/gettext )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.8-gentoo-runscript.patch
|
||||
"${FILESDIR}"/${PN}-2.8-lockdir.patch
|
||||
"${FILESDIR}"/${PN}-2.8-enable-large-file.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# 912459
|
||||
# Embed the needed m4 macros if gettext is not installed
|
||||
mv "${WORKDIR}"/m4 . || die
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Lockdir must exist if not manually specified.
|
||||
# '/var/lock' is created by OpenRC.
|
||||
local myeconfargs=(
|
||||
# See bug #788142
|
||||
--sysconfdir="${EPREFIX}"/etc/${PN}
|
||||
|
||||
--disable-rpath
|
||||
--enable-lock-dir="/var/lock"
|
||||
$(use_enable nls)
|
||||
)
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
# Needs to match --sysconfdir above
|
||||
insinto /etc/minicom
|
||||
doins "${FILESDIR}"/minirc.dfl
|
||||
}
|
61
sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.9.ebuild
vendored
Normal file
61
sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.9.ebuild
vendored
Normal file
@ -0,0 +1,61 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools
|
||||
|
||||
DESCRIPTION="Serial Communication Program"
|
||||
HOMEPAGE="https://salsa.debian.org/minicom-team/minicom"
|
||||
SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="nls"
|
||||
|
||||
DEPEND="sys-libs/ncurses:="
|
||||
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
net-dialup/lrzsz
|
||||
"
|
||||
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
nls? ( sys-devel/gettext )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.8-gentoo-runscript.patch
|
||||
"${FILESDIR}"/${PN}-2.8-lockdir.patch
|
||||
"${FILESDIR}"/${PN}-2.9-update-gettext.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Lockdir must exist if not manually specified.
|
||||
# '/var/lock' is created by OpenRC.
|
||||
local myeconfargs=(
|
||||
# See bug #788142
|
||||
--sysconfdir="${EPREFIX}"/etc/${PN}
|
||||
|
||||
--disable-rpath
|
||||
--enable-lock-dir="/var/lock"
|
||||
$(use_enable nls)
|
||||
)
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
# Needs to match --sysconfdir above
|
||||
insinto /etc/minicom
|
||||
doins "${FILESDIR}"/minirc.dfl
|
||||
}
|
@ -1,2 +1,4 @@
|
||||
DIST conntrack-tools-1.4.5.tar.bz2 479562 BLAKE2B 229531d1c6c237e539df5b83525dca5ce0b009a76a2a5f873282eabc73cc00095c15c686bc68f9364e81efc846bfa8eac8b08f7fd476199d10d0c25190ca2456 SHA512 480fe2cc4420bc8477a2ba67b3d052bcb39c6b3ec000cff27fc12db70b42ec94fa3b5fe12ee35d439e88d9a631a33cd12ae470b69dde6d371d4e53af62a2eed1
|
||||
DIST conntrack-tools-1.4.6.tar.bz2 499806 BLAKE2B 7c1ee1c5fc2b6f9d33c6cf850eca80978b8763317b1a76892cefb776130564f15fbd4e4554fdb08dbba93d9f16b7e4624a1b4dd5a631f747f5fcc0a5b01b8d5e SHA512 a48260308a12b11b584fcf4658ec2c4c1adb2801c9cf9a73fc259e5c30d2fbe401aca21e931972413f03e415f98fbf9bd678d2126faa6c6d5748e8a652e58f1a
|
||||
DIST conntrack-tools-1.4.7.tar.bz2 539688 BLAKE2B 42a3cacf8a32a5b8b688a9fd68f66024c591e9814ef3cc349456691094bab0fae15bb1c00befa178b0f8e845bf6fc00715cbf9db55cd7bf2d155c2dfd55f9b1a SHA512 3d37a6b8cd13fd3c149ab80009d686d2184920ba2d0d5c1b57abed6e92e0dd92cba868bfe22f1a155479fe5ab2e291b8bb8a7e72123a73788032202ac142653b
|
||||
DIST conntrack-tools-1.4.7.tar.bz2.sig 566 BLAKE2B c513cd59d9aeb76bb33bb8c4e0d25c46b6303a9d3f3e359e20248e2d8dd2822777056e217c12da9005ee075036ea05a74dd1ed9f22a44b7d4745ff6917bda15b SHA512 5a2bcc6da792544029ddf0d3a4caf019b215907e66d491e5d98a4f1189fc9c03ec8aad5ad22166799c5f0c81273284cb757e9368c9d9d3049bc49da47c037e05
|
||||
DIST conntrack-tools-1.4.8.tar.xz 452980 BLAKE2B 2f8a7d7facf4890a8ca7dec54d5faa1383ad5e449a0599707578567e9c8ed6fd63ca308538afc34e99121e39e80c1ce686c8dda89247abdf4699bb420b52c4fb SHA512 95d8f6f068c1342ad7e767537e722272a4f5bd8b46b952713ade053a1043aa9ababbe5ce658ede9c77b6de5221b97ad8833777caffd69b67dd70a99f2b45afdf
|
||||
DIST conntrack-tools-1.4.8.tar.xz.sig 566 BLAKE2B 65c2ee185b099281603bca179038bd9ab6e28756f9fa12a53a8bcb75ed561097c9e4672c45fcecc366b86b65e1753073808090e264671d3a3d8dd18ed6f4d680 SHA512 8cd229d2e980ab1788e90fc8f53827fe1e4b21801cad6cddf6a9ff537501c40c52242cc964005b2889ad0a4548c772304db8696d4644611ecf9f091aca5c14ee
|
||||
|
@ -1,44 +1,53 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
inherit autotools linux-info
|
||||
EAPI=8
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc
|
||||
inherit autotools linux-info systemd verify-sig
|
||||
|
||||
DESCRIPTION="Connection tracking userspace tools"
|
||||
HOMEPAGE="http://conntrack-tools.netfilter.org"
|
||||
SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
|
||||
HOMEPAGE="https://conntrack-tools.netfilter.org"
|
||||
SRC_URI="https://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2
|
||||
verify-sig? ( https://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2.sig )"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ~arm64 ~hppa x86"
|
||||
IUSE="doc +cthelper +cttimeout +libtirpc"
|
||||
KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~riscv x86"
|
||||
IUSE="doc +cthelper +cttimeout systemd"
|
||||
|
||||
RDEPEND="
|
||||
>=net-libs/libmnl-1.0.3
|
||||
>=net-libs/libnetfilter_conntrack-1.0.7
|
||||
>=net-libs/libnetfilter_conntrack-1.0.9
|
||||
>=net-libs/libnetfilter_queue-1.0.2
|
||||
>=net-libs/libnfnetlink-1.0.1
|
||||
net-libs/libtirpc
|
||||
cthelper? (
|
||||
>=net-libs/libnetfilter_cthelper-1.0.0
|
||||
)
|
||||
cttimeout? (
|
||||
>=net-libs/libnetfilter_cttimeout-1.0.0
|
||||
)
|
||||
>=net-libs/libnetfilter_queue-1.0.2
|
||||
>=net-libs/libnfnetlink-1.0.1
|
||||
!libtirpc? ( sys-libs/glibc[rpc(-)] )
|
||||
libtirpc? ( net-libs/libtirpc )
|
||||
systemd? (
|
||||
>=sys-apps/systemd-227
|
||||
)
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
app-alternatives/yacc
|
||||
app-alternatives/lex
|
||||
virtual/pkgconfig
|
||||
doc? (
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
app-text/xmlto
|
||||
)
|
||||
virtual/pkgconfig
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
verify-sig? ( sec-keys/openpgp-keys-netfilter )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.4.5-rpc.patch
|
||||
"${FILESDIR}"/${PN}-1.4.5-0001-Makefile.am-don-t-suppress-various-warnings.patch
|
||||
"${FILESDIR}"/${PN}-1.4.5-0002-Fix-Wstrict-prototypes.patch
|
||||
"${FILESDIR}"/${PN}-1.4.5-0003-Fix-Wimplicit-function-declaration.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
@ -48,7 +57,7 @@ pkg_setup() {
|
||||
die "${PN} requires at least 2.6.18 kernel version"
|
||||
fi
|
||||
|
||||
#netfilter core team has changed some option names with kernel 2.6.20
|
||||
# netfilter core team has changed some option names with kernel 2.6.20
|
||||
if kernel_is lt 2 6 20 ; then
|
||||
CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
|
||||
else
|
||||
@ -72,6 +81,7 @@ src_prepare() {
|
||||
# bug #474858
|
||||
sed -i -e 's:/var/lock:/run/lock:' doc/stats/conntrackd.conf || die
|
||||
|
||||
# Drop once Clang 16 patches merged (implicit func decl, etc)
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
@ -79,23 +89,26 @@ src_configure() {
|
||||
econf \
|
||||
$(use_enable cthelper) \
|
||||
$(use_enable cttimeout) \
|
||||
$(use_with libtirpc)
|
||||
$(use_enable systemd)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
|
||||
use doc && emake -C doc/manual
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
newinitd "${FILESDIR}/conntrackd.initd-r3" conntrackd
|
||||
newconfd "${FILESDIR}/conntrackd.confd-r2" conntrackd
|
||||
newinitd "${FILESDIR}"/conntrackd.initd-r3 conntrackd
|
||||
newconfd "${FILESDIR}"/conntrackd.confd-r2 conntrackd
|
||||
|
||||
insinto /etc/conntrackd
|
||||
doins doc/stats/conntrackd.conf
|
||||
|
||||
systemd_dounit "${FILESDIR}"/conntrackd.service
|
||||
|
||||
dodoc -r doc/sync doc/stats AUTHORS TODO
|
||||
use doc && dodoc doc/manual/${PN}.html
|
||||
}
|
@ -1,13 +1,17 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
inherit linux-info systemd
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/netfilter.org.asc
|
||||
inherit linux-info systemd verify-sig
|
||||
|
||||
DESCRIPTION="Connection tracking userspace tools"
|
||||
HOMEPAGE="http://conntrack-tools.netfilter.org"
|
||||
SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
|
||||
HOMEPAGE="https://conntrack-tools.netfilter.org"
|
||||
SRC_URI="
|
||||
https://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.xz
|
||||
verify-sig? ( https://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.xz.sig )
|
||||
"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
@ -16,7 +20,7 @@ IUSE="doc +cthelper +cttimeout systemd"
|
||||
|
||||
RDEPEND="
|
||||
>=net-libs/libmnl-1.0.3
|
||||
>=net-libs/libnetfilter_conntrack-1.0.8
|
||||
>=net-libs/libnetfilter_conntrack-1.0.9
|
||||
>=net-libs/libnetfilter_queue-1.0.2
|
||||
>=net-libs/libnfnetlink-1.0.1
|
||||
net-libs/libtirpc
|
||||
@ -32,13 +36,14 @@ RDEPEND="
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
app-alternatives/yacc
|
||||
app-alternatives/lex
|
||||
virtual/pkgconfig
|
||||
doc? (
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
app-text/xmlto
|
||||
)
|
||||
verify-sig? ( sec-keys/openpgp-keys-netfilter )
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
@ -48,7 +53,7 @@ pkg_setup() {
|
||||
die "${PN} requires at least 2.6.18 kernel version"
|
||||
fi
|
||||
|
||||
#netfilter core team has changed some option names with kernel 2.6.20
|
||||
# netfilter core team has changed some option names with kernel 2.6.20
|
||||
if kernel_is lt 2 6 20 ; then
|
||||
CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
|
||||
else
|
||||
@ -67,10 +72,10 @@ pkg_setup() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# bug #474858
|
||||
sed -i -e 's:/var/lock:/run/lock:' doc/stats/conntrackd.conf || die
|
||||
|
||||
default
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
@ -82,19 +87,20 @@ src_configure() {
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
|
||||
use doc && emake -C doc/manual
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
newinitd "${FILESDIR}/conntrackd.initd-r3" conntrackd
|
||||
newconfd "${FILESDIR}/conntrackd.confd-r2" conntrackd
|
||||
newinitd "${FILESDIR}"/conntrackd.initd-r3 conntrackd
|
||||
newconfd "${FILESDIR}"/conntrackd.confd-r2 conntrackd
|
||||
|
||||
insinto /etc/conntrackd
|
||||
doins doc/stats/conntrackd.conf
|
||||
|
||||
systemd_dounit "${FILESDIR}/conntrackd.service"
|
||||
systemd_dounit "${FILESDIR}"/conntrackd.service
|
||||
|
||||
dodoc -r doc/sync doc/stats AUTHORS TODO
|
||||
use doc && dodoc doc/manual/${PN}.html
|
@ -0,0 +1,28 @@
|
||||
https://bugzilla.netfilter.org/show_bug.cgi?id=1637
|
||||
|
||||
From a450f6374dc1b0296578599adf77f9ac025fab85 Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Thu, 24 Nov 2022 07:51:23 +0000
|
||||
Subject: [PATCH 1/3] Makefile.am: don't suppress various warnings
|
||||
|
||||
These will become fatal with Clang 16 and GCC 14 anyway, but let's
|
||||
address the real problem (followup commit).
|
||||
|
||||
We do have to keep one wrt yyerror() & const char* though, but
|
||||
the issue is contained to the code Bison generates.
|
||||
|
||||
Bug: https://bugzilla.netfilter.org/show_bug.cgi?id=1637
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -60,8 +60,8 @@ if HAVE_SYSTEMD
|
||||
conntrackd_SOURCES += systemd.c
|
||||
endif
|
||||
|
||||
-# yacc and lex generate dirty code
|
||||
-read_config_yy.o read_config_lex.o: AM_CFLAGS += -Wno-missing-prototypes -Wno-missing-declarations -Wno-implicit-function-declaration -Wno-nested-externs -Wno-undef -Wno-redundant-decls -Wno-sign-compare
|
||||
+# yacc and lex generate dirty code (issue is in yyerror() wrt const char* vs. char*)
|
||||
+read_config_yy.o read_config_lex.o: AM_CFLAGS += -Wno-incompatible-pointer-types -Wno-discarded-qualifiers
|
||||
|
||||
conntrackd_LDADD = ${LIBMNL_LIBS} ${LIBNETFILTER_CONNTRACK_LIBS} \
|
||||
${libdl_LIBS} ${LIBNFNETLINK_LIBS}
|
@ -0,0 +1,19 @@
|
||||
https://bugzilla.netfilter.org/show_bug.cgi?id=1637
|
||||
|
||||
From 11965f7020fbadcc9784daf598687841e96ef3fe Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Thu, 24 Nov 2022 07:52:01 +0000
|
||||
Subject: [PATCH 2/3] Fix -Wstrict-prototypes
|
||||
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
--- a/src/network.c
|
||||
+++ b/src/network.c
|
||||
@@ -113,7 +113,7 @@ void nethdr_track_update_seq(uint32_t seq)
|
||||
STATE_SYNC(last_seq_recv) = seq;
|
||||
}
|
||||
|
||||
-int nethdr_track_is_seq_set()
|
||||
+int nethdr_track_is_seq_set(void)
|
||||
{
|
||||
return local_seq_set;
|
||||
}
|
@ -0,0 +1,56 @@
|
||||
https://bugzilla.netfilter.org/show_bug.cgi?id=1637
|
||||
|
||||
From a6df37777fc47c2473a13501c17eb3cbbf922ec1 Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Thu, 24 Nov 2022 07:57:37 +0000
|
||||
Subject: [PATCH 3/3] Fix -Wimplicit-function-declaration
|
||||
|
||||
Bug: https://bugzilla.netfilter.org/show_bug.cgi?id=1637
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
--- a/src/read_config_lex.l
|
||||
+++ b/src/read_config_lex.l
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
+#include "log.h"
|
||||
#include "conntrackd.h"
|
||||
#include "read_config_yy.h"
|
||||
%}
|
||||
@@ -174,7 +175,7 @@ notrack [N|n][O|o][T|t][R|r][A|a][C|c][K|k]
|
||||
%%
|
||||
|
||||
int
|
||||
-yywrap()
|
||||
+yywrap(void)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
--- a/src/read_config_yy.y
|
||||
+++ b/src/read_config_yy.y
|
||||
@@ -31,14 +31,25 @@
|
||||
#include "cidr.h"
|
||||
#include "helper.h"
|
||||
#include "stack.h"
|
||||
+#include "log.h"
|
||||
+
|
||||
+#include <sys/socket.h>
|
||||
+#include <netinet/in.h>
|
||||
+#include <arpa/inet.h>
|
||||
+
|
||||
#include <sched.h>
|
||||
#include <dlfcn.h>
|
||||
+
|
||||
#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
|
||||
#include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
|
||||
|
||||
extern char *yytext;
|
||||
extern int yylineno;
|
||||
|
||||
+int yylex (void);
|
||||
+int yyerror (char *msg);
|
||||
+void yyrestart (FILE *input_file);
|
||||
+
|
||||
struct ct_conf conf;
|
||||
|
||||
static void __kernel_filter_start(void);
|
@ -1,41 +0,0 @@
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -50,6 +50,25 @@
|
||||
AS_HELP_STRING([--enable-systemd], [Build systemd support]),
|
||||
[enable_systemd="$enableval"], [enable_systemd="no"])
|
||||
|
||||
+AC_ARG_WITH([libtirpc],
|
||||
+ AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
|
||||
+ [], [ with_libtirpc=no ])
|
||||
+
|
||||
+AS_IF([test "x$with_libtirpc" != xno],
|
||||
+ [PKG_CHECK_MODULES([TIRPC],
|
||||
+ [libtirpc],
|
||||
+ [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
|
||||
+ [AC_MSG_ERROR([libtirpc requested, but library not found.])]
|
||||
+ )],
|
||||
+ [AC_CHECK_HEADER(rpc/rpc.h,
|
||||
+ [RPC_CFLAGS=""; RPC_LIBS="";],
|
||||
+ [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
|
||||
+ )]
|
||||
+)
|
||||
+
|
||||
+AC_SUBST(RPC_CFLAGS)
|
||||
+AC_SUBST(RPC_LIBS)
|
||||
+
|
||||
PKG_CHECK_MODULES([LIBNFNETLINK], [libnfnetlink >= 1.0.1])
|
||||
PKG_CHECK_MODULES([LIBMNL], [libmnl >= 1.0.3])
|
||||
PKG_CHECK_MODULES([LIBNETFILTER_CONNTRACK], [libnetfilter_conntrack >= 1.0.7])
|
||||
--- a/src/helpers/Makefile.am
|
||||
+++ b/src/helpers/Makefile.am
|
||||
@@ -30,8 +30,8 @@
|
||||
ct_helper_mdns_la_CFLAGS = $(HELPER_CFLAGS)
|
||||
|
||||
ct_helper_rpc_la_SOURCES = rpc.c
|
||||
-ct_helper_rpc_la_LDFLAGS = $(HELPER_LDFLAGS)
|
||||
-ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS)
|
||||
+ct_helper_rpc_la_LDFLAGS = $(HELPER_LDFLAGS) $(RPC_LIBS)
|
||||
+ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS) $(RPC_CFLAGS)
|
||||
|
||||
ct_helper_tftp_la_SOURCES = tftp.c
|
||||
ct_helper_tftp_la_LDFLAGS = $(HELPER_LDFLAGS)
|
@ -16,7 +16,6 @@ interface conntrack.
|
||||
<remote-id type="cpe">cpe:/a:netfilter:conntrack-tools</remote-id>
|
||||
</upstream>
|
||||
<use>
|
||||
<flag name="libtirpc">Use <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
|
||||
<flag name="cthelper">Use <pkg>net-libs/libnetfilter_cthelper</pkg> for userspace conntrack helper support</flag>
|
||||
<flag name="cttimeout">Use <pkg>net-libs/libnetfilter_cttimeout</pkg> for conntrack timeout support</flag>
|
||||
</use>
|
||||
|
@ -1,2 +1,3 @@
|
||||
DIST gnu-efi-3.0.15.tar.bz2 159399 BLAKE2B 0df93d8cacfa1e6d4b7731e32287d4386da9375c5e5c5847df8a29c99d70f5c24b14abc5e44ab9d0a39a6ec96682eb2b5e84d81a5a142d44a50a522a4ae0e3c2 SHA512 64d408b6d115bdc6eebae12fbd6cd907ed5f847f54e506c1e8f8ea5de38a95cf6fac66ab1009bd1d0bd2d54ad45ad598d29bcc303926a5899bf5cc25448cbb2f
|
||||
DIST gnu-efi-3.0.17.tar.bz2 165568 BLAKE2B 27f8171b411a6a8a138d44d91c7e4e4291aa399562825d51a398913572119482ffeb303d7508ae13eacd2cd10b8f5098405ab16eb56243587efe93235f661285 SHA512 0893ca234272584f889b1ae1c75341a9ceee60acfd32765daa5d704191ba00450536a287b949304c6d055d1bf125cc29e24fc41df8e5230e0da4f9d944876512
|
||||
DIST gnu-efi-3.0.18.tar.bz2 167567 BLAKE2B e080fa4c57a281452a6473304871304d1b5c30d42ee728b4c0c084258ed2f6f2099c068ec5841cee81ecf664dd658dee3b94d68324ebaa498cb49cec4f7f7df9 SHA512 39f9fa14b880441a94a04400ff8850efdd9474929e5501dfd05af06e7747b4d0f7cb742ac811c7026cf52d00508efb73018be4d61d63a1211de0cd931cbc473d
|
||||
|
26
sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/files/gnu-efi-3.0.18-clang.patch
vendored
Normal file
26
sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/files/gnu-efi-3.0.18-clang.patch
vendored
Normal file
@ -0,0 +1,26 @@
|
||||
https://bugs.gentoo.org/930538
|
||||
https://github.com/ncroxon/gnu-efi/issues/4
|
||||
https://github.com/ncroxon/gnu-efi/pull/5
|
||||
https://github.com/ncroxon/gnu-efi/commit/a0111e0df165d49cf34fc4f5fae46fc0921a756d
|
||||
|
||||
From a0111e0df165d49cf34fc4f5fae46fc0921a756d Mon Sep 17 00:00:00 2001
|
||||
From: Callum Farmer <gmbr3@opensuse.org>
|
||||
Date: Wed, 24 Apr 2024 12:04:48 +0100
|
||||
Subject: [PATCH] Disable RELRO
|
||||
|
||||
No point having PT_GNU_RELRO as ELF data won't exist when merging into PE32+ file
|
||||
|
||||
Unbreaks lld usage which complains about linker script
|
||||
Fixes ncroxon/gnu-efi#4
|
||||
--- a/Make.defaults
|
||||
+++ b/Make.defaults
|
||||
@@ -199,7 +199,7 @@ endif
|
||||
ARFLAGS := rDv
|
||||
ASFLAGS += $(ARCH3264)
|
||||
LDFLAGS += -nostdlib --warn-common --no-undefined --fatal-warnings \
|
||||
- --build-id=sha1 -z nocombreloc
|
||||
+ --build-id=sha1 -z nocombreloc -z norelro
|
||||
|
||||
ifneq ($(ARCH),arm)
|
||||
export LIBGCC=$(shell $(CC) $(CFLAGS) $(ARCH3264) -print-libgcc-file-name)
|
||||
|
@ -0,0 +1,14 @@
|
||||
https://bugs.gentoo.org/888829
|
||||
|
||||
--- a/apps/Makefile
|
||||
+++ b/apps/Makefile
|
||||
@@ -41,9 +41,7 @@
|
||||
|
||||
include $(SRCDIR)/../Make.defaults
|
||||
|
||||
-LINUX_HEADERS = /usr/src/sys/build
|
||||
APPSDIR = $(LIBDIR)/gnuefi/apps
|
||||
-CPPFLAGS += -D__KERNEL__ -I$(LINUX_HEADERS)/include
|
||||
CRTOBJS = $(TOPDIR)/$(ARCH)/gnuefi/crt0-efi-$(ARCH).o
|
||||
|
||||
LDSCRIPT = $(TOPDIR)/gnuefi/elf_$(ARCH)_efi.lds
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2004-2023 Gentoo Authors
|
||||
# Copyright 2004-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@ -7,7 +7,7 @@ inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="Library for build EFI Applications"
|
||||
HOMEPAGE="https://sourceforge.net/projects/gnu-efi/"
|
||||
SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
|
||||
SRC_URI="https://downloads.sourceforge.net/gnu-efi/${P}.tar.bz2"
|
||||
|
||||
# inc/, lib/ dirs (README.efilib)
|
||||
# - BSD-2
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 2004-2023 Gentoo Authors
|
||||
# Copyright 2004-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@ -7,7 +7,7 @@ inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="Library for build EFI Applications"
|
||||
HOMEPAGE="https://sourceforge.net/projects/gnu-efi/"
|
||||
SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
|
||||
SRC_URI="https://downloads.sourceforge.net/gnu-efi/${P}.tar.bz2"
|
||||
|
||||
# inc/, lib/ dirs (README.efilib)
|
||||
# - BSD-2
|
||||
@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/gnu-efi/${P}.tar.bz2"
|
||||
# - GPL-2+ : setjmp_ia32.S
|
||||
LICENSE="GPL-2+ BSD BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~riscv ~x86"
|
||||
KEYWORDS="-* amd64 arm arm64 ~ia64 ~riscv x86"
|
||||
IUSE="abi_x86_32 abi_x86_64 custom-cflags"
|
||||
REQUIRED_USE="
|
||||
amd64? ( || ( abi_x86_32 abi_x86_64 ) )
|
||||
|
89
sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.18-r2.ebuild
vendored
Normal file
89
sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.18-r2.ebuild
vendored
Normal file
@ -0,0 +1,89 @@
|
||||
# Copyright 2004-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="Library for build EFI Applications"
|
||||
HOMEPAGE="https://sourceforge.net/projects/gnu-efi/"
|
||||
SRC_URI="https://downloads.sourceforge.net/gnu-efi/${P}.tar.bz2"
|
||||
|
||||
# inc/, lib/ dirs (README.efilib)
|
||||
# - BSD-2
|
||||
# gnuefi dir:
|
||||
# - BSD (3-cluase): crt0-efi-ia32.S
|
||||
# - GPL-2+ : setjmp_ia32.S
|
||||
LICENSE="GPL-2+ BSD BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* amd64 arm arm64 ~ia64 ~riscv x86"
|
||||
IUSE="abi_x86_32 abi_x86_64 custom-cflags"
|
||||
REQUIRED_USE="
|
||||
amd64? ( || ( abi_x86_32 abi_x86_64 ) )
|
||||
x86? ( || ( abi_x86_32 abi_x86_64 ) )
|
||||
"
|
||||
|
||||
# These objects get run early boot (i.e. not inside of Linux),
|
||||
# so doing these QA checks on them doesn't make sense.
|
||||
QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
|
||||
RESTRICT="strip"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-clang.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i -e "s/-Werror//" Make.defaults || die
|
||||
}
|
||||
|
||||
efimake() {
|
||||
local arch=
|
||||
case ${CHOST} in
|
||||
arm*) arch=arm ;;
|
||||
aarch64*) arch=aarch64 ;;
|
||||
ia64*) arch=ia64 ;;
|
||||
i?86*) arch=ia32 ;;
|
||||
riscv64*) arch=riscv64;;
|
||||
x86_64*) arch=x86_64 ;;
|
||||
*) die "Unknown CHOST" ;;
|
||||
esac
|
||||
|
||||
local args=(
|
||||
ARCH="${arch}"
|
||||
HOSTCC="${BUILD_CC}"
|
||||
CC="${CC}"
|
||||
AS="${AS}"
|
||||
LD="${LD}"
|
||||
AR="${AR}"
|
||||
OBJCOPY="${OBJCOPY}"
|
||||
PREFIX="${EPREFIX}/usr"
|
||||
LIBDIR='$(PREFIX)'/$(get_libdir)
|
||||
)
|
||||
emake -j1 "${args[@]}" "$@"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export BUILD_CC AR AS CC LD OBJCOPY
|
||||
|
||||
if ! use custom-cflags; then
|
||||
unset CFLAGS CPPFLAGS LDFLAGS
|
||||
fi
|
||||
|
||||
if use amd64 || use x86; then
|
||||
use abi_x86_32 && CHOST=i686 ABI=x86 efimake
|
||||
use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake
|
||||
else
|
||||
efimake
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use amd64 || use x86; then
|
||||
use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
|
||||
use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake INSTALLROOT="${D}" install
|
||||
else
|
||||
efimake INSTALLROOT="${D}" install
|
||||
fi
|
||||
einstalldocs
|
||||
}
|
111
sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.18-r3.ebuild
vendored
Normal file
111
sdk_container/src/third_party/portage-stable/sys-boot/gnu-efi/gnu-efi-3.0.18-r3.ebuild
vendored
Normal file
@ -0,0 +1,111 @@
|
||||
# Copyright 2004-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="Library for build EFI Applications"
|
||||
HOMEPAGE="https://sourceforge.net/projects/gnu-efi/"
|
||||
SRC_URI="https://downloads.sourceforge.net/gnu-efi/${P}.tar.bz2"
|
||||
|
||||
# inc/, lib/ dirs (README.efilib)
|
||||
# - BSD-2
|
||||
# gnuefi dir:
|
||||
# - BSD (3-cluase): crt0-efi-ia32.S
|
||||
# - GPL-2+ : setjmp_ia32.S
|
||||
LICENSE="GPL-2+ BSD BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* ~amd64 ~arm ~arm64 ~ia64 ~riscv ~x86"
|
||||
IUSE="abi_x86_32 abi_x86_64 custom-cflags"
|
||||
REQUIRED_USE="
|
||||
amd64? ( || ( abi_x86_32 abi_x86_64 ) )
|
||||
x86? ( || ( abi_x86_32 abi_x86_64 ) )
|
||||
"
|
||||
|
||||
# for ld.bfd and objcopy
|
||||
BDEPEND="sys-devel/binutils"
|
||||
|
||||
# These objects get run early boot (i.e. not inside of Linux),
|
||||
# so doing these QA checks on them doesn't make sense.
|
||||
QA_EXECSTACK="usr/*/lib*efi.a:* usr/*/crt*.o"
|
||||
RESTRICT="strip"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-clang.patch
|
||||
"${FILESDIR}"/${PN}-3.0.18-remove-linux-headers.patch
|
||||
)
|
||||
|
||||
check_and_set_objcopy() {
|
||||
if [[ ${MERGE_TYPE} != "binary" ]]; then
|
||||
# bug #931792
|
||||
# llvm-objcopy does not support EFI target, try to use binutils objcopy or fail
|
||||
tc-export OBJCOPY
|
||||
OBJCOPY="${OBJCOPY/llvm-/}"
|
||||
LANG=C LC_ALL=C "${OBJCOPY}" --help | grep -q '\<pei-' || die "${OBJCOPY} (objcopy) does not support EFI target"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
check_and_set_objcopy
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
check_and_set_objcopy
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
sed -i -e "s/-Werror//" Make.defaults || die
|
||||
}
|
||||
|
||||
efimake() {
|
||||
local arch=
|
||||
case ${CHOST} in
|
||||
arm*) arch=arm ;;
|
||||
aarch64*) arch=aarch64 ;;
|
||||
ia64*) arch=ia64 ;;
|
||||
i?86*) arch=ia32 ;;
|
||||
riscv64*) arch=riscv64;;
|
||||
x86_64*) arch=x86_64 ;;
|
||||
*) die "Unknown CHOST" ;;
|
||||
esac
|
||||
|
||||
local args=(
|
||||
ARCH="${arch}"
|
||||
HOSTCC="${BUILD_CC}"
|
||||
CC="${CC}"
|
||||
AS="${AS}"
|
||||
LD="${LD}"
|
||||
AR="${AR}"
|
||||
OBJCOPY="${OBJCOPY}"
|
||||
PREFIX="${EPREFIX}/usr"
|
||||
LIBDIR='$(PREFIX)'/$(get_libdir)
|
||||
)
|
||||
emake -j1 "${args[@]}" "$@"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
tc-export BUILD_CC AR AS CC LD OBJCOPY
|
||||
|
||||
if ! use custom-cflags; then
|
||||
unset CFLAGS CPPFLAGS LDFLAGS
|
||||
fi
|
||||
|
||||
if use amd64 || use x86; then
|
||||
use abi_x86_32 && CHOST=i686 ABI=x86 efimake
|
||||
use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake
|
||||
else
|
||||
efimake
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use amd64 || use x86; then
|
||||
use abi_x86_32 && CHOST=i686 ABI=x86 efimake INSTALLROOT="${D}" install
|
||||
use abi_x86_64 && CHOST=x86_64 ABI=amd64 efimake INSTALLROOT="${D}" install
|
||||
else
|
||||
efimake INSTALLROOT="${D}" install
|
||||
fi
|
||||
einstalldocs
|
||||
}
|
@ -2,10 +2,11 @@
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>floppym@gentoo.org</email>
|
||||
<name>Mike Gilbert</name>
|
||||
<email>ceamac@gentoo.org</email>
|
||||
<name>Viorel Munteanu</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="sourceforge">gnu-efi</remote-id>
|
||||
<remote-id type="github">ncroxon/gnu-efi</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
@ -8,7 +8,7 @@ inherit multilib-build
|
||||
DESCRIPTION="Virtual for Kerberos V implementation"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
|
||||
RDEPEND="
|
||||
|| (
|
||||
|
@ -1,15 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit multilib-build
|
||||
|
||||
DESCRIPTION="Virtual for the GNU conversion library"
|
||||
|
||||
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 ~x86-winnt"
|
||||
|
||||
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
|
||||
# that and gcc
|
||||
RDEPEND="!elibc_glibc? ( !elibc_musl? ( >=dev-libs/libiconv-1.14-r1[${MULTILIB_USEDEP}] ) )"
|
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
@ -8,7 +8,7 @@ inherit multilib-build
|
||||
DESCRIPTION="Virtual for the GNU conversion library"
|
||||
|
||||
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 ~x86-winnt"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
|
||||
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
|
||||
# that and gcc
|
||||
|
@ -1,13 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="Virtual for the GNU conversion library"
|
||||
|
||||
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 ~x86-winnt"
|
||||
|
||||
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
|
||||
# that and gcc
|
||||
RDEPEND="!elibc_glibc? ( !elibc_musl? ( dev-libs/libiconv ) )"
|
@ -1,14 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit multilib-build
|
||||
|
||||
DESCRIPTION="Virtual for the GNU Internationalization Library"
|
||||
|
||||
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 ~x86-winnt"
|
||||
|
||||
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between that and gcc.
|
||||
RDEPEND="!elibc_glibc? ( !elibc_musl? ( >=sys-devel/gettext-0.18.3.2[${MULTILIB_USEDEP}] ) )"
|
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
@ -8,7 +8,7 @@ inherit multilib-build
|
||||
DESCRIPTION="Virtual for the GNU Internationalization Library"
|
||||
|
||||
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 ~x86-winnt"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
|
||||
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between that and gcc.
|
||||
RDEPEND="!elibc_glibc? ( !elibc_musl? ( dev-libs/libintl[${MULTILIB_USEDEP}] ) )"
|
||||
|
@ -1,12 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="Virtual for the GNU Internationalization Library"
|
||||
|
||||
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 ~x86-winnt"
|
||||
|
||||
# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between that and gcc.
|
||||
RDEPEND="!elibc_glibc? ( !elibc_musl? ( sys-devel/gettext ) )"
|
@ -1,20 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit multilib-build
|
||||
|
||||
DESCRIPTION="Virtual for libudev providers"
|
||||
|
||||
SLOT="0/1"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
IUSE="systemd"
|
||||
|
||||
RDEPEND="
|
||||
!systemd? ( || (
|
||||
>=sys-fs/udev-232:0/0[${MULTILIB_USEDEP}]
|
||||
>=sys-fs/eudev-3.2.9:0/0[${MULTILIB_USEDEP}]
|
||||
) )
|
||||
systemd? ( >=sys-apps/systemd-232:0/2[${MULTILIB_USEDEP}] )
|
||||
"
|
17
sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-251-r2.ebuild
vendored
Normal file
17
sdk_container/src/third_party/portage-stable/virtual/libudev/libudev-251-r2.ebuild
vendored
Normal file
@ -0,0 +1,17 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit multilib-build
|
||||
|
||||
DESCRIPTION="Virtual for libudev providers"
|
||||
|
||||
SLOT="0/1"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
IUSE="systemd"
|
||||
|
||||
RDEPEND="
|
||||
!systemd? ( >=sys-apps/systemd-utils-251[udev,${MULTILIB_USEDEP}] )
|
||||
systemd? ( >=sys-apps/systemd-251:0/2[${MULTILIB_USEDEP}] )
|
||||
"
|
@ -1,9 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>eudev@gentoo.org</email>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>systemd@gentoo.org</email>
|
||||
</maintainer>
|
||||
|
14
sdk_container/src/third_party/portage-stable/virtual/pager/pager-0-r1.ebuild
vendored
Normal file
14
sdk_container/src/third_party/portage-stable/virtual/pager/pager-0-r1.ebuild
vendored
Normal file
@ -0,0 +1,14 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="Virtual for command-line pagers"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
|
||||
RDEPEND="|| ( sys-apps/less
|
||||
sys-apps/most
|
||||
sys-apps/util-linux[ncurses]
|
||||
app-text/lv
|
||||
app-editors/vim[vim-pager] )"
|
@ -1,14 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DESCRIPTION="Virtual for command-line pagers"
|
||||
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"
|
||||
|
||||
RDEPEND="|| ( sys-apps/less
|
||||
sys-apps/most
|
||||
sys-apps/util-linux[ncurses]
|
||||
app-text/lv
|
||||
app-editors/vim[vim-pager] )"
|
@ -1,11 +1,11 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="Virtual to select between different resolvconf providers"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
|
||||
RDEPEND="
|
||||
|| (
|
||||
|
@ -1,9 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>eudev@gentoo.org</email>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>systemd@gentoo.org</email>
|
||||
</maintainer>
|
||||
|
@ -1,16 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="Virtual to select between different udev daemon providers"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
|
||||
RDEPEND="
|
||||
|| (
|
||||
>=sys-fs/udev-217
|
||||
>=sys-fs/eudev-2.1.1
|
||||
>=sys-apps/systemd-217
|
||||
)
|
||||
"
|
14
sdk_container/src/third_party/portage-stable/virtual/udev/udev-217-r7.ebuild
vendored
Normal file
14
sdk_container/src/third_party/portage-stable/virtual/udev/udev-217-r7.ebuild
vendored
Normal file
@ -0,0 +1,14 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DESCRIPTION="Virtual to select between different udev daemon providers"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
|
||||
IUSE="systemd"
|
||||
|
||||
RDEPEND="
|
||||
systemd? ( >=sys-apps/systemd-217 )
|
||||
!systemd? ( sys-apps/systemd-utils[udev] )
|
||||
"
|
@ -1 +1 @@
|
||||
DIST makedepend-1.0.6.tar.bz2 147616 BLAKE2B 6e9538e435d602ab3bcfb35a5398d6f11a23e4c9fa19bb2e3f651967d3fb1945557af2a5d84fae3e46112aae9ec411894cf8605e4856a46b120b660ff4b95ea4 SHA512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42
|
||||
DIST makedepend-1.0.9.tar.xz 145080 BLAKE2B 7f8b2c0a3992a7c87a37f152eb5df1e6a881c0523f4cc4e69fd0ec3aa9aee37b6a0b32c548ad246151c938596b6d4a6c32d956aa9be1ed6c81978d313644f9a3 SHA512 68d289656314dc9f12c792d0e394cfbc95404a0d01155dbcb38313d451b506da48a3d44183f568a2cbb2b1d1da9e26703a0d92f2bb658f72fc968eeb03bf2fe8
|
||||
|
@ -1,13 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit xorg-3
|
||||
|
||||
DESCRIPTION="create dependencies in makefiles"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="${RDEPEND}
|
||||
x11-base/xorg-proto"
|
10
sdk_container/src/third_party/portage-stable/x11-misc/makedepend/makedepend-1.0.9.ebuild
vendored
Normal file
10
sdk_container/src/third_party/portage-stable/x11-misc/makedepend/makedepend-1.0.9.ebuild
vendored
Normal file
@ -0,0 +1,10 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
XORG_TARBALL_SUFFIX="xz"
|
||||
inherit xorg-3
|
||||
|
||||
DESCRIPTION="create dependencies in makefiles"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
|
@ -1,8 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>x11@gentoo.org</email>
|
||||
<name>X11</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>x11@gentoo.org</email>
|
||||
<name>X11</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="freedesktop-gitlab">xorg/util/makedepend</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
@ -1 +1,5 @@
|
||||
DIST shared-mime-info-2.1.tar.xz 5202496 BLAKE2B e8dfc7efe78feb5a38c8115a2b332f46c3dac2f89dffad0834fa7b77560b3ef528e779ab9e42822288f85d8c434fd590859db682f3f99494aa6a4387c985e912 SHA512 87e308281e83c4cf889594f7c2e8dcb4d0d0d3910124c3816fdb886ba7d6113b2581711adcb17032b47f9b8d8b7001fab58daa52b7da7c0ef87915e341d6f1b0
|
||||
DIST shared-mime-info-2.2.tar.gz 7064139 BLAKE2B 5e791893a60d64a8a1d421c1fabb5e214c6e34ae975d232a9d695b998e8e9aafb6449e858fd845feb120e170bf7c77f70c1fc23e3d4cf8e7c49c6e92418cab96 SHA512 490d96daf4214ab6ac537761b67f3ff4716b95d7ea3fedd2e2ab7b0b02d946acad49790a25efcb5e949551dc4c39ba08911e59f06b198b61dcb1bc44799a2b2e
|
||||
DIST shared-mime-info-2.3.tar.bz2 6643480 BLAKE2B 2a3adc0568d1be5a17e5a1533f3c4620c6f9d97069ad9e0a0b26ac241c7b14f7d3b9200534df7e1c2295a561d5e049ce8edf8a1e96d2f4e2040508545172a351 SHA512 f1959933e93373ee6939b289d0c3c35d527ce6803865558e4a8bcb5a0183df2fc1148bbf58bfe9a97342e7125f2e0e39ac5dd3bae998510396d9b6c96a330762
|
||||
DIST shared-mime-info-2.4.tar.bz2 7096347 BLAKE2B 25ff086e4962f5ab0cb2b7155df02be4af7af63dd0267500b2b12b802680bbae04b9ed252ef5a004d0175f6b48956c5e4b9738af9ab5d2fa76a7a0b6eac067ad SHA512 712f414e80919bf2a0f5083ced44c54a350948a526850466a6e9f35365dcfd97fad8bcdbb29945de2715a8f9b70a108e931c8500209a4d6e3dddf97af02771cb
|
||||
DIST xdgmime-179296748e92bd91bf531656632a1056307fb7b7.tar.bz2 28123 BLAKE2B ea107dba0819027e4a0a486db00e76f50a4e32e8e84f366b81490e213456e2c7e1c4a92cc4f92173dd6f94f257455bdcb77e3eb7d0ce8fb699c948d2d5b01f0d SHA512 efccff2672efb3ff0e44e83cfbaf6e2b926146e4a9d6132b14e2d7a88d602af340b3948793306ce5f720ac8b09e5d37d3b356a0cc269e8240b382558c9a3cf10
|
||||
DIST xdgmime-92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7.tar.gz 32703 BLAKE2B 865ff57c566b60fb2bd6cb37e259800ee72fb4b9f2d135db46e9a40206946677a7b50bfb8f13d9ce1493bac972e8a5230d7caa833733f3a8d8631e844a648436 SHA512 90abe20483d5ae2131d18740fffbc57c94470be99e9ea1b04e13bffaf3dda4aa9145cb92bb4defe0a655c0bdbd630aaa325e7a9095b9599faebb751699b9cdd8
|
||||
|
@ -1,82 +0,0 @@
|
||||
From 5a406b06792e26a83c7346b3c2443c0bd8d4cdb2 Mon Sep 17 00:00:00 2001
|
||||
From: Eli Schwartz <eschwartz@archlinux.org>
|
||||
Date: Mon, 8 Nov 2021 18:22:47 -0500
|
||||
Subject: [PATCH] migrate from custom itstool to builtin msgfmt for creating
|
||||
translated XML
|
||||
|
||||
gettext upstream has supported this for a very long time (since 0.19.7
|
||||
via commit b3c2a5a242c36fbbaa0c5b17f975d6c638598a23, released in 2015),
|
||||
and itstool is (mostly) a legacy of the time before gettext had proper
|
||||
support for these sorts of use cases.
|
||||
|
||||
This is similar to the state of intltool, which is described at
|
||||
https://wiki.gnome.org/MigratingFromIntltoolToGettext
|
||||
|
||||
During the port from autotools to meson, the legacy use of itstool was
|
||||
faithfully translated to meson in the only way possible: by jumping
|
||||
through hoops to run ninja inside ninja in order to generate the .mo
|
||||
files for itstool, because meson's i18n module used a flawed design and
|
||||
there was no "real" target to create those files, only a .PHONY
|
||||
run_target which other rules cannot depend on.
|
||||
|
||||
Although meson 0.60.0 added support for real targets for the built .mo
|
||||
files, this changed the rules for output filenames, breaking the script.
|
||||
|
||||
But msgfmt does not care, and anyways comes with builtin meson functions
|
||||
for convenient use with XML files. So let's take this opportunity to
|
||||
drop legacy dependencies and use the modern, builtin tooling, which
|
||||
fixes this bug as a side effect.
|
||||
|
||||
Fixes #170
|
||||
---
|
||||
.gitlab-ci.yml | 2 --
|
||||
README.md | 2 +-
|
||||
data/freedesktop_generate.sh | 12 ------------
|
||||
data/meson.build | 16 +++++-----------
|
||||
meson.build | 1 -
|
||||
5 files changed, 6 insertions(+), 27 deletions(-)
|
||||
delete mode 100755 data/freedesktop_generate.sh
|
||||
|
||||
diff --git a/data/meson.build b/data/meson.build
|
||||
index 24361c9..09ed7a9 100644
|
||||
--- a/data/meson.build
|
||||
+++ b/data/meson.build
|
||||
@@ -1,18 +1,12 @@
|
||||
|
||||
install_man('update-mime-database.1')
|
||||
|
||||
-freedesktop_org_xml = custom_target('freedesktop.org.xml',
|
||||
- input : files(
|
||||
- 'freedesktop.org.xml.in',
|
||||
- 'its/shared-mime-info.its',
|
||||
- 'its/shared-mime-info.loc',
|
||||
- ),
|
||||
+freedesktop_org_xml = i18n.merge_file(
|
||||
+ input: 'freedesktop.org.xml.in',
|
||||
output: 'freedesktop.org.xml',
|
||||
- command: [
|
||||
- find_program('freedesktop_generate.sh'),
|
||||
- meson.source_root(),
|
||||
- meson.build_root()
|
||||
- ],
|
||||
+ data_dirs: '.',
|
||||
+ po_dir: '../po',
|
||||
+ type: 'xml',
|
||||
install: true,
|
||||
install_dir: get_option('datadir') / 'mime' / 'packages',
|
||||
)
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 0d08c8a..60f17ae 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -20,7 +20,6 @@
|
||||
###############################################################################
|
||||
# Find tools
|
||||
|
||||
-itstool = find_program('itstool')
|
||||
xmllint = find_program('xmllint')
|
||||
xmlto = find_program('xmlto')
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
@ -0,0 +1,38 @@
|
||||
https://bugs.gentoo.org/915859
|
||||
https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/12a3a6b1141c704fc594379af1808bb9008d588c
|
||||
|
||||
From 12a3a6b1141c704fc594379af1808bb9008d588c Mon Sep 17 00:00:00 2001
|
||||
From: Tobias Mayer <tobim@fastmail.fm>
|
||||
Date: Sun, 8 Oct 2023 00:11:49 +0200
|
||||
Subject: [PATCH] Fix string literal concatenation
|
||||
|
||||
Clang is not able to disambiguate between multiple string literatals
|
||||
and C++11 user defined literals. Spaces help.
|
||||
---
|
||||
src/update-mime-database.cpp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp
|
||||
index 733ba063..29d82a9d 100644
|
||||
--- a/src/update-mime-database.cpp
|
||||
+++ b/src/update-mime-database.cpp
|
||||
@@ -2158,7 +2158,7 @@ static void check_in_path_xdg_data(const char *mime_path)
|
||||
|
||||
env = getenv("XDG_DATA_DIRS");
|
||||
if (!env)
|
||||
- env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/";
|
||||
+ env = "/usr/local/share/" PATH_SEPARATOR "/usr/share/";
|
||||
dirs = g_strsplit(env, PATH_SEPARATOR, 0);
|
||||
g_return_if_fail(dirs != NULL);
|
||||
for (n = 0; dirs[n]; n++)
|
||||
@@ -2170,7 +2170,7 @@ static void check_in_path_xdg_data(const char *mime_path)
|
||||
dirs[n] = g_build_filename(g_get_home_dir(), ".local",
|
||||
"share", NULL);
|
||||
n++;
|
||||
-
|
||||
+
|
||||
for (i = 0; i < n; i++)
|
||||
{
|
||||
if (stat(dirs[i], &dir_info) == 0 &&
|
||||
--
|
||||
GitLab
|
@ -0,0 +1,55 @@
|
||||
https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/7499ac1a85b2487b94e315e6b55c34bcf220295f
|
||||
|
||||
From 7499ac1a85b2487b94e315e6b55c34bcf220295f Mon Sep 17 00:00:00 2001
|
||||
From: Tobias Mayer <tobim@fastmail.fm>
|
||||
Date: Sat, 7 Oct 2023 23:45:47 +0200
|
||||
Subject: [PATCH] Fix false positive fdatasync detection on darwin
|
||||
|
||||
The `has_function` feature in meson uses different detection methods
|
||||
depending on the contents of the `prefix` kwarg [1]:
|
||||
|
||||
* if it contains `#include` directives it will copy the prefix into
|
||||
the test code and check if it compiles
|
||||
* if it doesn't contain an include or isn't specified, `has_function`
|
||||
will forward declare the function and test for it's existence by
|
||||
trying to link it to the default libraries
|
||||
|
||||
The latter approach wrongly succeeds for `fdatasync` on darwin because
|
||||
the linker binds the function to a system call of the same name. Note
|
||||
that this result really is wrong because that system call has not
|
||||
the expected semantics of `fdatasync`.
|
||||
|
||||
By adding an include for `unistd.h` we can get meson to use the
|
||||
first approach and the detection fails.
|
||||
|
||||
Note that this has gone unnoticed so far because only recent versions
|
||||
of clang (the default compiler on darwin) started to treat implicit
|
||||
function declarations as an error.
|
||||
|
||||
[1] https://github.com/mesonbuild/meson/blob/583d2815d1a130227f0f4db47e4ab2e80ebb6a61/mesonbuild/compilers/mixins/clike.py#L839-L846
|
||||
|
||||
Fixes #211
|
||||
---
|
||||
meson.build | 7 +------
|
||||
1 file changed, 1 insertion(+), 6 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 1780c443..7998a51b 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -49,12 +49,7 @@ endif
|
||||
###############################################################################
|
||||
# Dependencies
|
||||
|
||||
-check_functions = [
|
||||
- 'fdatasync',
|
||||
-]
|
||||
-foreach function : check_functions
|
||||
- config.set('HAVE_'+function.to_upper(), cc.has_function(function))
|
||||
-endforeach
|
||||
+config.set('HAVE_FDATASYNC', cc.has_function('fdatasync', prefix: '#include <unistd.h>'))
|
||||
|
||||
|
||||
if get_option('build-translations')
|
||||
--
|
||||
GitLab
|
@ -0,0 +1,282 @@
|
||||
https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/157c16b09f54741aefbc4be6a3507455f0378389
|
||||
|
||||
From 157c16b09f54741aefbc4be6a3507455f0378389 Mon Sep 17 00:00:00 2001
|
||||
From: Biswapriyo Nath <nathbappai@gmail.com>
|
||||
Date: Sun, 8 Oct 2023 13:26:43 +0000
|
||||
Subject: [PATCH] Fix missing sentinel warning with clang
|
||||
|
||||
This fixes the compiler warnings similar as following.
|
||||
|
||||
../src/update-mime-database.cpp:393:50: warning: missing sentinel in function call [-Wsentinel]
|
||||
393 | g_strconcat(namespaceURI, " ", localName, NULL),
|
||||
| ^
|
||||
| , nullptr
|
||||
---
|
||||
src/update-mime-database.cpp | 58 ++++++++++++++++++------------------
|
||||
1 file changed, 29 insertions(+), 29 deletions(-)
|
||||
|
||||
diff --git a/src/update-mime-database.cpp b/src/update-mime-database.cpp
|
||||
index 29d82a9d..7838a0eb 100644
|
||||
--- a/src/update-mime-database.cpp
|
||||
+++ b/src/update-mime-database.cpp
|
||||
@@ -390,7 +390,7 @@ static void add_namespace(Type *type, const char *namespaceURI,
|
||||
}
|
||||
|
||||
g_hash_table_insert(namespace_hash,
|
||||
- g_strconcat(namespaceURI, " ", localName, NULL),
|
||||
+ g_strconcat(namespaceURI, " ", localName, nullptr),
|
||||
type);
|
||||
}
|
||||
|
||||
@@ -1023,7 +1023,7 @@ static void write_out_type(gpointer key, gpointer value, gpointer data)
|
||||
char *lower;
|
||||
|
||||
lower = g_ascii_strdown(type->media, -1);
|
||||
- media = g_strconcat(mime_dir, "/", lower, NULL);
|
||||
+ media = g_strconcat(mime_dir, "/", lower, nullptr);
|
||||
g_free(lower);
|
||||
#ifdef _WIN32
|
||||
fs::create_directory(media);
|
||||
@@ -1032,7 +1032,7 @@ static void write_out_type(gpointer key, gpointer value, gpointer data)
|
||||
#endif
|
||||
|
||||
lower = g_ascii_strdown(type->subtype, -1);
|
||||
- filename = g_strconcat(media, "/", lower, ".xml.new", NULL);
|
||||
+ filename = g_strconcat(media, "/", lower, ".xml.new", nullptr);
|
||||
g_free(lower);
|
||||
g_free(media);
|
||||
media = NULL;
|
||||
@@ -1622,7 +1622,7 @@ static Magic *magic_new(xmlNode *node, Type *type, GError **error)
|
||||
magic_free(magic);
|
||||
magic = NULL;
|
||||
(*error)->message = g_strconcat(
|
||||
- _("Error in <match> element: "), old, NULL);
|
||||
+ _("Error in <match> element: "), old, nullptr);
|
||||
g_free(old);
|
||||
} else if (magic->matches == NULL) {
|
||||
magic_free(magic);
|
||||
@@ -1843,7 +1843,7 @@ static TreeMagic *tree_magic_new(xmlNode *node, Type *type, GError **error)
|
||||
tree_magic_free(magic);
|
||||
magic = NULL;
|
||||
(*error)->message = g_strconcat(
|
||||
- _("Error in <treematch> element: "), old, NULL);
|
||||
+ _("Error in <treematch> element: "), old, nullptr);
|
||||
g_free(old);
|
||||
}
|
||||
}
|
||||
@@ -1960,7 +1960,7 @@ static void delete_old_types(const gchar *mime_dir)
|
||||
|
||||
for (i = 0; i < G_N_ELEMENTS(media_types); i++)
|
||||
{
|
||||
- const fs::path media_dir = g_strconcat(mime_dir, "/", media_types[i], NULL);
|
||||
+ const fs::path media_dir = g_strconcat(mime_dir, "/", media_types[i], nullptr);
|
||||
|
||||
if (!fs::is_directory(fs::status(media_dir)))
|
||||
continue;
|
||||
@@ -1973,13 +1973,13 @@ static void delete_old_types(const gchar *mime_dir)
|
||||
continue;
|
||||
|
||||
char *type_name = g_strconcat(media_types[i], "/",
|
||||
- dir_entry.path().filename().string().c_str(), NULL);
|
||||
+ dir_entry.path().filename().string().c_str(), nullptr);
|
||||
type_name[strlen(type_name) - 4] = '\0';
|
||||
if (!g_hash_table_lookup(types, type_name))
|
||||
{
|
||||
char *path;
|
||||
path = g_strconcat(mime_dir, "/",
|
||||
- type_name, ".xml", NULL);
|
||||
+ type_name, ".xml", nullptr);
|
||||
#if 0
|
||||
g_warning("Removing old info for type %s",
|
||||
path);
|
||||
@@ -2002,7 +2002,7 @@ static void add_ns(gpointer key, gpointer value, gpointer data)
|
||||
Type *type = (Type *) value;
|
||||
|
||||
g_ptr_array_add(lines, g_strconcat(ns, " ", type->media,
|
||||
- "/", type->subtype, "\n", NULL));
|
||||
+ "/", type->subtype, "\n", nullptr));
|
||||
}
|
||||
|
||||
/* Write all the collected namespace rules to 'XMLnamespaces' */
|
||||
@@ -2038,7 +2038,7 @@ static void write_subclass(gpointer key, gpointer value, gpointer data)
|
||||
|
||||
for (l = list; l; l = l->next)
|
||||
{
|
||||
- line = g_strconcat (static_cast<const gchar *>(key), " ", l->data, "\n", NULL);
|
||||
+ line = g_strconcat (static_cast<const gchar *>(key), " ", l->data, "\n", nullptr);
|
||||
fwrite(line, 1, strlen(line), stream);
|
||||
g_free (line);
|
||||
}
|
||||
@@ -2061,7 +2061,7 @@ static void add_alias(gpointer key, gpointer value, gpointer data)
|
||||
|
||||
g_ptr_array_add(lines, g_strconcat(alias, " ", type->media,
|
||||
"/", type->subtype, "\n",
|
||||
- NULL));
|
||||
+ nullptr));
|
||||
}
|
||||
|
||||
/* Write all the collected aliases */
|
||||
@@ -2092,7 +2092,7 @@ static void add_type(gpointer key, gpointer value, gpointer data)
|
||||
{
|
||||
GPtrArray *lines = (GPtrArray *) data;
|
||||
|
||||
- g_ptr_array_add(lines, g_strconcat((char *)key, "\n", NULL));
|
||||
+ g_ptr_array_add(lines, g_strconcat((char *)key, "\n", nullptr));
|
||||
}
|
||||
|
||||
/* Write all the collected types */
|
||||
@@ -2127,7 +2127,7 @@ static void write_one_icon(gpointer key, gpointer value, gpointer data)
|
||||
FILE *stream = (FILE *)data;
|
||||
char *line;
|
||||
|
||||
- line = g_strconcat (mimetype, ":", iconname, "\n", NULL);
|
||||
+ line = g_strconcat (mimetype, ":", iconname, "\n", nullptr);
|
||||
fwrite(line, 1, strlen(line), stream);
|
||||
g_free (line);
|
||||
}
|
||||
@@ -2168,7 +2168,7 @@ static void check_in_path_xdg_data(const char *mime_path)
|
||||
dirs[n] = g_strdup(env);
|
||||
else
|
||||
dirs[n] = g_build_filename(g_get_home_dir(), ".local",
|
||||
- "share", NULL);
|
||||
+ "share", nullptr);
|
||||
n++;
|
||||
|
||||
for (i = 0; i < n; i++)
|
||||
@@ -3588,7 +3588,7 @@ newest_mtime(const char *packagedir)
|
||||
while ((name = g_dir_read_name(dir))) {
|
||||
char *path;
|
||||
|
||||
- path = g_build_filename(packagedir, name, NULL);
|
||||
+ path = g_build_filename(packagedir, name, nullptr);
|
||||
retval = g_stat(path, &statbuf);
|
||||
g_free(path);
|
||||
if (retval < 0)
|
||||
@@ -3609,7 +3609,7 @@ is_cache_up_to_date (const char *mimedir, const char *packagedir)
|
||||
char *mimeversion;
|
||||
int retval;
|
||||
|
||||
- mimeversion = g_build_filename(mimedir, "/version", NULL);
|
||||
+ mimeversion = g_build_filename(mimedir, "/version", nullptr);
|
||||
retval = g_stat(mimeversion, &version_stat);
|
||||
g_free(mimeversion);
|
||||
if (retval < 0)
|
||||
@@ -3694,7 +3694,7 @@ int main(int argc, char **argv)
|
||||
}
|
||||
}
|
||||
|
||||
- package_dir = g_strconcat(mime_dir, "/packages", NULL);
|
||||
+ package_dir = g_strconcat(mime_dir, "/packages", nullptr);
|
||||
|
||||
if (!fs::exists(mime_dir) && !fs::is_directory(fs::status(mime_dir)))
|
||||
{
|
||||
@@ -3747,7 +3747,7 @@ int main(int argc, char **argv)
|
||||
|
||||
g_hash_table_foreach(globs_hash, collect_glob2, &glob_list);
|
||||
glob_list = g_list_sort(glob_list, (GCompareFunc)compare_glob_by_weight);
|
||||
- globs_path = g_strconcat(mime_dir, "/globs.new", NULL);
|
||||
+ globs_path = g_strconcat(mime_dir, "/globs.new", nullptr);
|
||||
globs = fopen_gerror(globs_path, error);
|
||||
if (!globs)
|
||||
goto out;
|
||||
@@ -3761,7 +3761,7 @@ int main(int argc, char **argv)
|
||||
goto out;
|
||||
g_free(globs_path);
|
||||
|
||||
- globs_path = g_strconcat(mime_dir, "/globs2.new", NULL);
|
||||
+ globs_path = g_strconcat(mime_dir, "/globs2.new", nullptr);
|
||||
globs = fopen_gerror(globs_path, error);
|
||||
if (!globs)
|
||||
goto out;
|
||||
@@ -3782,7 +3782,7 @@ int main(int argc, char **argv)
|
||||
FILE *stream;
|
||||
char *magic_path;
|
||||
int i;
|
||||
- magic_path = g_strconcat(mime_dir, "/magic.new", NULL);
|
||||
+ magic_path = g_strconcat(mime_dir, "/magic.new", nullptr);
|
||||
stream = fopen_gerror(magic_path, error);
|
||||
if (!stream)
|
||||
goto out;
|
||||
@@ -3807,7 +3807,7 @@ int main(int argc, char **argv)
|
||||
FILE *stream;
|
||||
char *ns_path;
|
||||
|
||||
- ns_path = g_strconcat(mime_dir, "/XMLnamespaces.new", NULL);
|
||||
+ ns_path = g_strconcat(mime_dir, "/XMLnamespaces.new", nullptr);
|
||||
stream = fopen_gerror(ns_path, error);
|
||||
if (!stream)
|
||||
goto out;
|
||||
@@ -3823,7 +3823,7 @@ int main(int argc, char **argv)
|
||||
FILE *stream;
|
||||
char *path;
|
||||
|
||||
- path = g_strconcat(mime_dir, "/subclasses.new", NULL);
|
||||
+ path = g_strconcat(mime_dir, "/subclasses.new", nullptr);
|
||||
stream = fopen_gerror(path, error);
|
||||
if (!stream)
|
||||
goto out;
|
||||
@@ -3839,7 +3839,7 @@ int main(int argc, char **argv)
|
||||
FILE *stream;
|
||||
char *path;
|
||||
|
||||
- path = g_strconcat(mime_dir, "/aliases.new", NULL);
|
||||
+ path = g_strconcat(mime_dir, "/aliases.new", nullptr);
|
||||
stream = fopen_gerror(path, error);
|
||||
if (!stream)
|
||||
goto out;
|
||||
@@ -3855,7 +3855,7 @@ int main(int argc, char **argv)
|
||||
FILE *stream;
|
||||
char *path;
|
||||
|
||||
- path = g_strconcat(mime_dir, "/types.new", NULL);
|
||||
+ path = g_strconcat(mime_dir, "/types.new", nullptr);
|
||||
stream = fopen_gerror(path, error);
|
||||
if (!stream)
|
||||
goto out;
|
||||
@@ -3871,7 +3871,7 @@ int main(int argc, char **argv)
|
||||
FILE *stream;
|
||||
char *icon_path;
|
||||
|
||||
- icon_path = g_strconcat(mime_dir, "/generic-icons.new", NULL);
|
||||
+ icon_path = g_strconcat(mime_dir, "/generic-icons.new", nullptr);
|
||||
stream = fopen_gerror(icon_path, error);
|
||||
if (!stream)
|
||||
goto out;
|
||||
@@ -3887,7 +3887,7 @@ int main(int argc, char **argv)
|
||||
FILE *stream;
|
||||
char *icon_path;
|
||||
|
||||
- icon_path = g_strconcat(mime_dir, "/icons.new", NULL);
|
||||
+ icon_path = g_strconcat(mime_dir, "/icons.new", nullptr);
|
||||
stream = fopen_gerror(icon_path, error);
|
||||
if (!stream)
|
||||
goto out;
|
||||
@@ -3903,7 +3903,7 @@ int main(int argc, char **argv)
|
||||
FILE *stream;
|
||||
char *path;
|
||||
int i;
|
||||
- path = g_strconcat(mime_dir, "/treemagic.new", NULL);
|
||||
+ path = g_strconcat(mime_dir, "/treemagic.new", nullptr);
|
||||
stream = fopen_gerror(path, error);
|
||||
if (!stream)
|
||||
goto out;
|
||||
@@ -3928,7 +3928,7 @@ int main(int argc, char **argv)
|
||||
FILE *stream;
|
||||
char *path;
|
||||
|
||||
- path = g_strconcat(mime_dir, "/mime.cache.new", NULL);
|
||||
+ path = g_strconcat(mime_dir, "/mime.cache.new", nullptr);
|
||||
stream = fopen_gerror(path, error);
|
||||
if (!stream)
|
||||
goto out;
|
||||
@@ -3944,7 +3944,7 @@ int main(int argc, char **argv)
|
||||
FILE *stream;
|
||||
char *path;
|
||||
|
||||
- path = g_strconcat(mime_dir, "/version.new", NULL);
|
||||
+ path = g_strconcat(mime_dir, "/version.new", nullptr);
|
||||
stream = fopen_gerror(path, error);
|
||||
if (!stream)
|
||||
goto out;
|
||||
--
|
||||
GitLab
|
@ -0,0 +1,20 @@
|
||||
https://bugs.gentoo.org/917561
|
||||
https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/219
|
||||
https://gitlab.freedesktop.org/xdg/shared-mime-info/-/commit/c918fe77e255150938e83a6aec259f153d303573
|
||||
|
||||
From c918fe77e255150938e83a6aec259f153d303573 Mon Sep 17 00:00:00 2001
|
||||
From: David Faure <faure@kde.org>
|
||||
Date: Sun, 19 Nov 2023 11:18:11 +0100
|
||||
Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17
|
||||
|
||||
Fixes #219
|
||||
--- a/src/test-subclassing.c
|
||||
+++ b/src/test-subclassing.c
|
||||
@@ -1,4 +1,5 @@
|
||||
#include <libxml/tree.h>
|
||||
+#include <libxml/parser.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
--
|
||||
GitLab
|
@ -4,4 +4,7 @@
|
||||
<maintainer type="project">
|
||||
<email>freedesktop-bugs@gentoo.org</email>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="freedesktop-gitlab">xdg/shared-mime-info</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
@ -1,51 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
HASH=0ee50652091363ab0d17e335e5e74fbe # don't forget to update on version bumps
|
||||
inherit meson xdg-utils
|
||||
|
||||
DESCRIPTION="The Shared MIME-info Database specification"
|
||||
HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info"
|
||||
SRC_URI="https://gitlab.freedesktop.org/xdg/${PN}/uploads/${HASH}/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
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"
|
||||
|
||||
# requires installed xdgmime binary
|
||||
RESTRICT="test"
|
||||
|
||||
BDEPEND="
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
app-text/xmlto
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
"
|
||||
RDEPEND="
|
||||
dev-libs/glib:2
|
||||
dev-libs/libxml2
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
DOCS=( HACKING.md NEWS README.md )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/shared-mime-info-2.1-itstool.patch"
|
||||
)
|
||||
|
||||
src_install() {
|
||||
meson_src_install
|
||||
|
||||
# in prefix, install an env.d entry such that prefix patch is used/added
|
||||
if use prefix; then
|
||||
echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die
|
||||
doenvd "${T}"/50mimeinfo
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
|
||||
xdg_mimeinfo_database_update
|
||||
}
|
@ -0,0 +1,93 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit meson toolchain-funcs xdg-utils
|
||||
|
||||
# Keep an eye on https://gitlab.freedesktop.org/xdg/xdgmime/-/merge_requests/25!
|
||||
# xdgmime is used for tests but doesn't make releases nowadays; do what
|
||||
# Fedora does and use a snapshot so we can run the test suite.
|
||||
MY_XDGMIME_COMMIT="92f6a09fda2b23c2ab95cede8eb0612ca96bd0f7"
|
||||
DESCRIPTION="The Shared MIME-info Database specification"
|
||||
HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info"
|
||||
SRC_URI="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${PV}/${P}.tar.gz"
|
||||
SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDGMIME_COMMIT}/xdgmime-${MY_XDGMIME_COMMIT}.tar.gz )"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
app-text/xmlto
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
"
|
||||
RDEPEND="
|
||||
dev-libs/glib:2
|
||||
dev-libs/libxml2
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
DOCS=( HACKING.md NEWS README.md )
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if use test ; then
|
||||
# Drop empty dir (it's a submodule in upstream git repo)
|
||||
rm -r "${S}"/xdgmime || die
|
||||
# Lead Meson to our snapshot
|
||||
ln -s "${WORKDIR}"/xdgmime-${MY_XDGMIME_COMMIT} xdgmime || die
|
||||
# Don't break parallel make
|
||||
sed -i -e 's:make:$(MAKE):' xdgmime/Makefile || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# We have to trick Meson into thinking it's there now so that
|
||||
# we can run meson then emake to build xdgmime later, rather than
|
||||
# building before running meson which would mean doing something
|
||||
# unexpected in src_configure.
|
||||
if use test ; then
|
||||
# Paths from https://gitlab.freedesktop.org/xdg/shared-mime-info/-/blob/master/meson.build#L29
|
||||
touch xdgmime/src/{print,test}-mime{,-data} || die
|
||||
chmod +x xdgmime/src/{print,test}-mime{,-data} || die
|
||||
fi
|
||||
|
||||
local emesonargs=(
|
||||
-Dbuild-tools=true
|
||||
-Dupdate-mimedb=false
|
||||
)
|
||||
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
if use test ; then
|
||||
tc-export CC
|
||||
|
||||
# xdgmime only has a homebrew Makefile
|
||||
emake -C xdgmime
|
||||
fi
|
||||
|
||||
meson_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
meson_src_install
|
||||
|
||||
# in prefix, install an env.d entry such that prefix patch is used/added
|
||||
if use prefix; then
|
||||
echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die
|
||||
doenvd "${T}"/50mimeinfo
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
|
||||
xdg_mimeinfo_database_update
|
||||
}
|
@ -0,0 +1,100 @@
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit meson xdg-utils
|
||||
|
||||
# xdgmime is used for tests but doesn't make releases nowadays; do what
|
||||
# Fedora does and use a snapshot so we can run the test suite.
|
||||
MY_XDGMIME_COMMIT="179296748e92bd91bf531656632a1056307fb7b7"
|
||||
DESCRIPTION="The Shared MIME-info Database specification"
|
||||
HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info"
|
||||
SRC_URI="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${PV}/${P}.tar.bz2"
|
||||
SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDGMIME_COMMIT}/xdgmime-${MY_XDGMIME_COMMIT}.tar.bz2 )"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
app-text/xmlto
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
"
|
||||
RDEPEND="
|
||||
dev-libs/glib:2
|
||||
dev-libs/libxml2
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
DOCS=( HACKING.md NEWS README.md )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-clang-string-literal.patch
|
||||
"${FILESDIR}"/${P}-fsync-detection.patch
|
||||
"${FILESDIR}"/${P}-wformat.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if use test ; then
|
||||
# Drop empty dir (it's a submodule in upstream git repo)
|
||||
rm -r "${S}"/xdgmime || die
|
||||
# Lead Meson to our snapshot
|
||||
mkdir "${WORKDIR}"/xdgmime_build || die
|
||||
ln -s "${WORKDIR}"/xdgmime_build xdgmime || die
|
||||
# Don't break parallel make
|
||||
#sed -i -e 's:make:$(MAKE):' xdgmime/Makefile || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# We have to trick Meson into thinking it's there now so that
|
||||
# we can run meson then emake to build xdgmime later, rather than
|
||||
# building before running meson which would mean doing something
|
||||
# unexpected in src_configure.
|
||||
if use test ; then
|
||||
# Paths from https://gitlab.freedesktop.org/xdg/shared-mime-info/-/blob/master/meson.build#L29
|
||||
mkdir xdgmime/src || die
|
||||
touch xdgmime/src/{print,test}-mime{,-data} || die
|
||||
chmod +x xdgmime/src/{print,test}-mime{,-data} || die
|
||||
|
||||
BUILD_DIR="${WORKDIR}"/xdgmime_build EMESON_SOURCE="${WORKDIR}"/xdgmime-${MY_XDGMIME_COMMIT} meson_src_configure
|
||||
fi
|
||||
|
||||
local emesonargs=(
|
||||
-Dbuild-tools=true
|
||||
-Dupdate-mimedb=false
|
||||
$(meson_use test build-tests)
|
||||
)
|
||||
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
if use test ; then
|
||||
meson_src_compile -C "${WORKDIR}"/xdgmime_build
|
||||
fi
|
||||
|
||||
meson_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
meson_src_install
|
||||
|
||||
# in prefix, install an env.d entry such that prefix patch is used/added
|
||||
if use prefix; then
|
||||
echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die
|
||||
doenvd "${T}"/50mimeinfo
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
|
||||
xdg_mimeinfo_database_update
|
||||
}
|
@ -0,0 +1,98 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit meson xdg-utils
|
||||
|
||||
# xdgmime is used for tests but doesn't make releases nowadays; do what
|
||||
# Fedora does and use a snapshot so we can run the test suite.
|
||||
MY_XDGMIME_COMMIT="179296748e92bd91bf531656632a1056307fb7b7"
|
||||
DESCRIPTION="The Shared MIME-info Database specification"
|
||||
HOMEPAGE="https://gitlab.freedesktop.org/xdg/shared-mime-info"
|
||||
SRC_URI="https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/${PV}/${P}.tar.bz2"
|
||||
SRC_URI+=" test? ( https://gitlab.freedesktop.org/xdg/xdgmime/-/archive/${MY_XDGMIME_COMMIT}/xdgmime-${MY_XDGMIME_COMMIT}.tar.bz2 )"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||
IUSE="test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
BDEPEND="
|
||||
app-text/docbook-xml-dtd:4.1.2
|
||||
app-text/xmlto
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
"
|
||||
RDEPEND="
|
||||
dev-libs/glib:2
|
||||
dev-libs/libxml2
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
DOCS=( HACKING.md NEWS README.md )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-libxml2.12.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if use test ; then
|
||||
# Drop empty dir (it's a submodule in upstream git repo)
|
||||
rm -r "${S}"/xdgmime || die
|
||||
# Lead Meson to our snapshot
|
||||
mkdir "${WORKDIR}"/xdgmime_build || die
|
||||
ln -s "${WORKDIR}"/xdgmime_build xdgmime || die
|
||||
# Don't break parallel make
|
||||
#sed -i -e 's:make:$(MAKE):' xdgmime/Makefile || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# We have to trick Meson into thinking it's there now so that
|
||||
# we can run meson then emake to build xdgmime later, rather than
|
||||
# building before running meson which would mean doing something
|
||||
# unexpected in src_configure.
|
||||
if use test ; then
|
||||
# Paths from https://gitlab.freedesktop.org/xdg/shared-mime-info/-/blob/master/meson.build#L29
|
||||
mkdir xdgmime/src || die
|
||||
touch xdgmime/src/{print,test}-mime{,-data} || die
|
||||
chmod +x xdgmime/src/{print,test}-mime{,-data} || die
|
||||
|
||||
BUILD_DIR="${WORKDIR}"/xdgmime_build EMESON_SOURCE="${WORKDIR}"/xdgmime-${MY_XDGMIME_COMMIT} meson_src_configure
|
||||
fi
|
||||
|
||||
local emesonargs=(
|
||||
-Dbuild-tools=true
|
||||
-Dupdate-mimedb=false
|
||||
$(meson_use test build-tests)
|
||||
)
|
||||
|
||||
meson_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
if use test ; then
|
||||
meson_src_compile -C "${WORKDIR}"/xdgmime_build
|
||||
fi
|
||||
|
||||
meson_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
meson_src_install
|
||||
|
||||
# in prefix, install an env.d entry such that prefix patch is used/added
|
||||
if use prefix; then
|
||||
echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo || die
|
||||
doenvd "${T}"/50mimeinfo
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
|
||||
xdg_mimeinfo_database_update
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user