From c92d0cd2b34d17bce6d5bb4e3a4fc00af4193c99 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 24 Nov 2022 13:10:40 +0000 Subject: gentoo auto-resync : 24:11:2022 - 13:10:39 --- net-misc/Manifest.gz | Bin 55271 -> 55279 bytes net-misc/connman/Manifest | 2 +- net-misc/connman/connman-1.42_pre20221103.ebuild | 2 +- net-misc/ntp/Manifest | 2 + .../files/ntp-4.2.8_p15-configure-clang16.patch | 582 +++++++++++++++++++++ net-misc/ntp/ntp-4.2.8_p15-r2.ebuild | 144 +++++ 6 files changed, 730 insertions(+), 2 deletions(-) create mode 100644 net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch create mode 100644 net-misc/ntp/ntp-4.2.8_p15-r2.ebuild (limited to 'net-misc') diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz index dea10d3b58c6..24d4848bb681 100644 Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ diff --git a/net-misc/connman/Manifest b/net-misc/connman/Manifest index c5ef2681b167..a243581e5b6f 100644 --- a/net-misc/connman/Manifest +++ b/net-misc/connman/Manifest @@ -4,6 +4,6 @@ AUX libresolv-musl-fix.patch 1554 BLAKE2B 496cae4e748089c6f2fe46850a4940660bcaff DIST connman-82ce08135a14ef4ab5b5b60f1e426a26b9fc72fc.tar.gz 742300 BLAKE2B 90d6332ce6ee29ee313b6e83cb4c77982bfff02bf358cf066df7a77cfacfaaeb6b06315f7452a86b33a7351adb7883a608020010834604f94ae4671d72e268b4 SHA512 35c95b9544ee204bf57df3ff4258f3454a3d34e4fff2fe19d74df2fead8956c919fe5ecde7554b22c32504a32b15adb5c0d858457acdf21f4d2df766d4a0de4b DIST connman-cb05780d86c39cfb5e6d9ac2b288bf3244a95d57.tar.gz 738675 BLAKE2B d2c8ee587bdf045e4438a5c4c48475a5ba8ae390032dbdee44ed884273d741e290fcaeb5cee1025a7dec1f7f7034cf01d3e074d08004024dc541bff1b729627c SHA512 3d49f7fad6044c080a5805cc35dbecbdf916d66a2ace0246631936fbf46d80fcfff960df79a8471069caa00975dd74f5fcc17812811ce9c93919e2947ef23f6d EBUILD connman-1.42_pre20220828-r1.ebuild 3055 BLAKE2B b37e514b1103788c30d3c6f686e757904ee48fb390f880d1986318f8a467b2177f5a6da8376f1a8d5f37b80e65e52a300272e46adb802be420980f880aeeaf41 SHA512 af0941568a533addeeaa394af1779798784eeb0ef9adc9b3f08b3577ffd1cb61cf1e1fb26bd9060b895746a54c8290fbe4e892ec4bdd8a61094af6a1de580dda -EBUILD connman-1.42_pre20221103.ebuild 3061 BLAKE2B 09580b73c8aeec5b61cead28f0c629cec41fe2b3b2cd4040eb54d2b0c8ffa35faaf381a867382bf3cdd956e0767e2fe853f9318f8d47cef1a7bdd4c027541b2c SHA512 ae945ec61172f93b4a5422621f77578a53eb2018f0550bb05f3db9753b7e2cfb17bb898d144cd7290b78cba69a9e34db803173d2bf28ef962ebbf3bec158d28d +EBUILD connman-1.42_pre20221103.ebuild 3068 BLAKE2B 91b591121d2df29e9012177c336ee377912851089e4cead969e8a62eee0402f67a3efedb98bc3332dd145233831afcb54cb9da28f8290453480310e5669dc0b7 SHA512 9ebd36afd21d524f9f0996a2e47c527d8cd6928c39993d1ebfa178bf91f583bf34d94e66d547b0b5a89aabd152e4fcb72defc2b1eb755702710f9d4f0e023428 EBUILD connman-9999.ebuild 2768 BLAKE2B 941f992ea03c199415c7c453a58335bc14f5d1bea965a676c364052a4dacaa3b95f28e7b8258f8069d2d4551142a0cd96c4eb748900778612372f79085141446 SHA512 b0e4d9b12c0a509899304e021b36a24ccae6e60334a50561224065b7ab022b14c31336cb4032cbaec05f8fd49db4fdc1c13775cccd434eef2cabc24203b8b495 MISC metadata.xml 1314 BLAKE2B 8ac27df91b77d2da814c0f35368359f2c55c9cf9c9b8db56748ca9a6128f59514dbcba5c966777a1dda27ed37ccdc6e7e37b57724f7bac83e383c3f8e5b427ce SHA512 98dcfc78d0d4a7abab5282efc2cd10419ab067d6f52f9743f7b72dc446f6e0cc0c5a63266ffa3b9cdb4df3935fc5e7f96faa143bf796ccd90e709c26e7a652b7 diff --git a/net-misc/connman/connman-1.42_pre20221103.ebuild b/net-misc/connman/connman-1.42_pre20221103.ebuild index 5d2e2518c721..cbdaaa4a6078 100644 --- a/net-misc/connman/connman-1.42_pre20221103.ebuild +++ b/net-misc/connman/connman-1.42_pre20221103.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://git.kernel.org/pub/scm/network/connman/connman.git" else SRC_URI="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${COMMIT}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" fi DESCRIPTION="Provides a daemon for managing internet connections" diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest index 8f1ecb1c87d1..6e666f36ba41 100644 --- a/net-misc/ntp/Manifest +++ b/net-misc/ntp/Manifest @@ -4,6 +4,7 @@ AUX man-pages/ntp.xsl 5831 BLAKE2B 6234a07c8cecb63742ed6f068dab774e12a0d44dfd8f1 AUX ntp-4.2.8-ipc-caps.patch 471 BLAKE2B 307a23be635e0a78f12882c26580caaebc5a38d463b3b1c686bbdc71a225bdb97ad03703513b112b9509958c687f046df3153baab1d26d019a988c94ede796a8 SHA512 549a92021ebceb1a3ea8d6599e9aa31983b0db96a2ab88959e422a0f9b7a9a4e811b943de1ac4d04e3303309b43391610beec0d1a354eb320dc795576afdd81f AUX ntp-4.2.8-sntp-test-pthreads.patch 325 BLAKE2B eb4d7c8b6723d0f5d17670d8ca2e9cc5df801b24dee7d5f30c73eb8ffb5a6ebfa6651b8ae37da35cb1f97171eaebef5e71afa49e2c996a40a3b1ffee6d34f5ab SHA512 d4eef7c2bdcd1db9bdb6923d78b106519efe927134a0133bd18c07195214c64535d47a0265647f2c55ff08f9ede192c2fa05a8a52bf2c1e1532d3bee9f0de8a4 AUX ntp-4.2.8_p14-add_cap_ipc_lock.patch 474 BLAKE2B 5045ea1d6b07de0bd3ea46e0dc63a424f01f34241414f192cd73cb09ff080864ca1b94600d0f494772b06df87db1e7adc32c5bfc3c88c57efb2b04fd2cafee41 SHA512 8a852794095c650ce75707d2fb5ded1e575b7d2167d5c0ef79c1007a3bb45f6b21f8a5bd4deb0e966b7ed9b8941e5c7746eef73b1f0f6e5fd4f7d8e32a6b007f +AUX ntp-4.2.8_p15-configure-clang16.patch 17561 BLAKE2B 987b6cd58dadb56500a65f56f906cf86342a52182d7cb38c4281323020f9d8a68ae61d85246a992693fd4d8b291a14dc5b7ca3385027fc08ca8736ae7c8915c3 SHA512 d4e8c6a980e51550216b11bc3e53517ba55be9ae1df888816dac522a003061bc98f5affa48ae3dd013bbdb46079b087540ccd2a67b275914b6e2992ff5ac805f AUX ntp-4.2.8_p15-gcc10.patch 2019 BLAKE2B df64e28c70d7aa1cf2513b594dc5f79f0be862c6dd0ba3e3e75e6bce394eeaff2bd994e65ad4435d212bd1b2c406e49e587c72a6c8f9fc1f63fa166dac717844 SHA512 15f2756c1ac370f4896ffc1d8bd340bb7c09869c47a78edc66da855855c9dca0adeef0e03d262ace9c7ae408c2bcb080d6e01e4fc32783518fb8db28b08200b7 AUX ntp-4.2.8_p15-glibc-2.34.patch 928 BLAKE2B 993f2c6ab2b4e6242811d553e0021911bbae37ba5febbbf9914bef5481c3b1472c273fc04a6d6f1e420bed2b4eb3193bc4a9532faa6b23e9f2a2802b1664e187 SHA512 474f50f92b105cbd3e9b3700418114ea65c3998e28ddb7a11d45602a7865bdcad07ee251176bf2e4012e3a15792a4334ee85aca198cbb98c757fc12cdd09747d AUX ntp-client.confd 776 BLAKE2B 7c65232560d4443f21bea7e5e0e8183f8397e092b6c489faa18188b9df9f8678244cd816e6d8d6e12b8d89a2b33873b9d0a2173957217879320db20744b3876c SHA512 2d6b9d96c55787cf4556332054a61399368dcf37cf76a14aaba3f8e2e4fdd47ce25808f9babda2ca1f2a6e7387c043e023251ba2b99786426c875bd7cb6592a6 @@ -22,5 +23,6 @@ AUX sntp.service.conf 119 BLAKE2B ee94067e5aef213a15d211e36362f2b4e8e66dfc739be6 DIST ntp-4.2.8p15-manpages.tar.xz 25700 BLAKE2B 6a225bc19dcebee31cb8e0d621963863d567a882655b57be8b65a16f9d3dd138787c7c6b9ff08853306f2e9b11d65cb76e3215cc5b2262a91c411d437974fc18 SHA512 21721550864b4e7e91bf20ca894109253439b737799dfc803e1496b3454199f34646f40e0156c08a39d5914e5a92f35908cec0245e1e2627c75c0e64939ba028 DIST ntp-4.2.8p15.tar.gz 7015970 BLAKE2B 5697d6623d79686f9ca9ad907172bf942383067d1e9817117d20db042e9f7410644f236f1a0d77ab6bf6ec468476e12ea65b494a28f0dd8674bf08fc8875cfef SHA512 f5ad765e45fc302263dd40e94c287698fd235b94f3684e49f1d5d09d7d8bdd6b8c0fb96ecdabffea3d233e1e79b3c9687b76dc204ba76bad3f554682f4a97794 EBUILD ntp-4.2.8_p15-r1.ebuild 4451 BLAKE2B fcedb2061bf179e64a63673b171bb96c927c53898888f77474771dc146b88a1e32afe5c7a04ddae951d923cb4f15bbd1221b0371489d511f4bbc8a430e096aee SHA512 abf7491c5ed83b9c85ad56d1fb289b074dda2f3707bf6b5b6fb4b8b33b7b889a0c82b985d7ad297c58ce36b69cd7fa30f4aeb2ca70a272b931d681da4f1628c0 +EBUILD ntp-4.2.8_p15-r2.ebuild 4512 BLAKE2B c4a34f6772a262e9d8b339d28e5724a7ed1e6ed99d18d10b52369eae3d473a731dee01ebe63fd6a21e9bc60bbd59cc0a7e3948f9315f8741b197b8fa5ecc268d SHA512 1f2f22571ff97214b6197626821f372a120548db7590bdb6f87ff9006a0c3cfdbc616a7c29951b169e9c2e8fceba8ac9996303449c5d3fc5382c5982700e96a9 EBUILD ntp-4.2.8_p15.ebuild 4442 BLAKE2B f6cfbc92981ced0abad90d0d20366949e4c41580236c0fe92b05dd0f79092ac136087bc95fd56a223d2dc6ff0d3ec81c244b380a5747bbc52ae8a43166f40e2a SHA512 0718ee4bea75e8f2d6378a0a882757adc75e49d67d62c265d2ff6414af73f7f0ee37b61205e0306aaa9f3bee5aaedaa3430ee34f4158dde3cd13e3339b08a6a9 MISC metadata.xml 1023 BLAKE2B 58da2b7578162aa1650d5a0bba7f3384a36dcfcdb4c52003b2aa3fd2ee89a1d01239a4e462b874dfa96b0913597cf0384f78d4da79148ca1e52e8aca29b583c3 SHA512 510fbd0761a097d214225640c0a60da8c77b06af41cb77748cd73c7c04add5e4651dd07f0eef9f083343570a6fe5f0bdcf84b38b5b65df815abd8bbaea048791 diff --git a/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch b/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch new file mode 100644 index 000000000000..959050784bf6 --- /dev/null +++ b/net-misc/ntp/files/ntp-4.2.8_p15-configure-clang16.patch @@ -0,0 +1,582 @@ +Sync with OpenLDAP. Uses Arsen's patch from https://bugs.gentoo.org/871288. + +https://bugs.gentoo.org/871372 +--- a/sntp/m4/openldap.m4 ++++ b/sntp/m4/openldap.m4 +@@ -1,16 +1,16 @@ + dnl OpenLDAP Autoconf Macros +-dnl $OpenLDAP: pkg/ldap/build/openldap.m4,v 1.157.2.10 2010/04/13 20:22:21 kurt Exp $ ++dnl $OpenLDAP$ + dnl This work is part of OpenLDAP Software . + dnl +-dnl Copyright 1998-2010 The OpenLDAP Foundation. ++dnl Copyright 1998-2022 The OpenLDAP Foundation. + dnl All rights reserved. + dnl + dnl Redistribution and use in source and binary forms, with or without + dnl modification, are permitted only as authorized by the OpenLDAP + dnl Public License. + dnl +-dnl A copy of this license is available in the file LICENSE-OPENLDAP in +-dnl this directory of the distribution or, alternatively, at ++dnl A copy of this license is available in the file LICENSE in the ++dnl top-level directory of the distribution or, alternatively, at + dnl . + dnl + dnl -------------------------------------------------------------------- +@@ -170,7 +170,7 @@ exit (0); } + ]])],[],[ol_cv_header_stdc=no],[:]) + fi]) + if test $ol_cv_header_stdc = yes; then +- AC_DEFINE([STDC_HEADERS], [1], [is standard C provided?]) ++ AC_DEFINE(STDC_HEADERS) + fi + ac_cv_header_stdc=disable + ]) +@@ -243,312 +243,39 @@ OL_RESOLVER_TRY(ol_cv_resolver_none) + OL_RESOLVER_TRY(ol_cv_resolver_resolv,[-lresolv]) + OL_RESOLVER_TRY(ol_cv_resolver_bind,[-lbind]) + ]) +-dnl +-dnl ==================================================================== +-dnl International Components for Unicode (ICU) +-AC_DEFUN([OL_ICU], +-[ol_icu=no +-AC_CHECK_HEADERS( unicode/utypes.h ) +-if test $ac_cv_header_unicode_utypes_h = yes ; then +- dnl OL_ICULIBS="-licui18n -licuuc -licudata" +- OL_ICULIBS="-licuuc -licudata" +- +- AC_CACHE_CHECK([for ICU libraries], [ol_cv_lib_icu], [ +- ol_LIBS="$LIBS" +- LIBS="$OL_ICULIBS $LIBS" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +-#include +-]], [[ +-(void) u_errorName(0); +-]])],[ol_cv_lib_icu=yes],[ol_cv_lib_icu=no]) +- LIBS="$ol_LIBS" +-]) +- +- if test $ol_cv_lib_icu != no ; then +- ol_icu="$OL_ICULIBS" +- AC_DEFINE([HAVE_ICU], [1], [define if you actually have ICU]) +- fi +-fi +-]) +-dnl +-dnl ==================================================================== +-dnl Berkeley DB macros +-dnl +-dnl -------------------------------------------------------------------- +-dnl Try to link +-AC_DEFUN([OL_BERKELEY_DB_TRY], +-[if test $ol_cv_lib_db = no ; then +- AC_CACHE_CHECK([for Berkeley DB link (]ifelse($2,,default,$2)[)],[$1], +-[ +- ol_DB_LIB=ifelse($2,,,$2) +- ol_LIBS=$LIBS +- LIBS="$ol_DB_LIB $LTHREAD_LIBS $LIBS" +- +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[ +-#ifdef HAVE_DB_185_H +-# include +-#else +-# include +-#endif +- +-#ifndef DB_VERSION_MAJOR +-# define DB_VERSION_MAJOR 1 +-#endif +- +-#ifndef NULL +-#define NULL ((void*)0) +-#endif +-]], [[ +-#if DB_VERSION_MAJOR > 2 +- db_env_create( NULL, 0 ); +-#elif DB_VERSION_MAJOR > 1 +- db_appexit( NULL ); +-#else +- (void) dbopen( NULL, 0, 0, 0, NULL); +-#endif +-]])],[$1=yes],[$1=no]) +- +- LIBS="$ol_LIBS" +-]) +- +- if test $$1 = yes ; then +- ol_cv_lib_db=ifelse($2,,yes,$2) +- fi +-fi +-]) +-dnl +-dnl -------------------------------------------------------------------- +-dnl Get major and minor version from +-AC_DEFUN([OL_BDB_HEADER_VERSION], +-[AC_CACHE_CHECK([for Berkeley DB major version in db.h], [ol_cv_bdb_major],[ +- AC_LANG_CONFTEST([ +-#include +-#ifndef DB_VERSION_MAJOR +-# define DB_VERSION_MAJOR 1 +-#endif +-__db_version DB_VERSION_MAJOR +-]) +- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none +- ol_cv_bdb_major=${3} +-]) +-case $ol_cv_bdb_major in [[1-9]]*) : ;; *) +- AC_MSG_ERROR([Unknown Berkeley DB major version in db.h]) ;; +-esac +- +-dnl Determine minor version +-AC_CACHE_CHECK([for Berkeley DB minor version in db.h], [ol_cv_bdb_minor],[ +- AC_LANG_CONFTEST([ +-#include +-#ifndef DB_VERSION_MINOR +-# define DB_VERSION_MINOR 0 +-#endif +-__db_version DB_VERSION_MINOR +-]) +- set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none +- ol_cv_bdb_minor=${3} +-]) +-case $ol_cv_bdb_minor in [[0-9]]*) : ;; *) +- AC_MSG_ERROR([Unknown Berkeley DB minor version in db.h]) ;; +-esac +-]) +-dnl +-dnl -------------------------------------------------------------------- +-dnl Try to locate appropriate library +-AC_DEFUN([OL_BERKELEY_DB_LINK], +-[ol_cv_lib_db=no +- +-if test $ol_cv_bdb_major = 4 ; then +- OL_BERKELEY_DB_TRY(ol_cv_db_db_4_dot_m,[-ldb-4.$ol_cv_bdb_minor]) +- OL_BERKELEY_DB_TRY(ol_cv_db_db4m,[-ldb4$ol_cv_bdb_minor]) +- OL_BERKELEY_DB_TRY(ol_cv_db_db_4m,[-ldb-4$ol_cv_bdb_minor]) +- OL_BERKELEY_DB_TRY(ol_cv_db_db_4_m,[-ldb-4-$ol_cv_bdb_minor]) +- OL_BERKELEY_DB_TRY(ol_cv_db_db_4,[-ldb-4]) +- OL_BERKELEY_DB_TRY(ol_cv_db_db4,[-ldb4]) +- OL_BERKELEY_DB_TRY(ol_cv_db_db,[-ldb]) +-fi +-OL_BERKELEY_DB_TRY(ol_cv_db_none) +-]) +-dnl +-dnl -------------------------------------------------------------------- +-dnl Check if Berkeley DB version +-AC_DEFUN([OL_BERKELEY_DB_VERSION], +-[AC_CACHE_CHECK([for Berkeley DB library and header version match], [ol_cv_berkeley_db_version], [ +- ol_LIBS="$LIBS" +- LIBS="$LTHREAD_LIBS $LIBS" +- if test $ol_cv_lib_db != yes ; then +- LIBS="$ol_cv_lib_db $LIBS" +- fi +- +- AC_RUN_IFELSE([AC_LANG_SOURCE([[ +-#ifdef HAVE_DB_185_H +- choke me; +-#else +-#include +-#endif +-#ifndef DB_VERSION_MAJOR +-# define DB_VERSION_MAJOR 1 +-#endif +-#ifndef NULL +-#define NULL ((void *)0) +-#endif +-main() +-{ +-#if DB_VERSION_MAJOR > 1 +- char *version; +- int major, minor, patch; +- +- version = db_version( &major, &minor, &patch ); +- +- if( major != DB_VERSION_MAJOR || +- minor != DB_VERSION_MINOR || +- patch != DB_VERSION_PATCH ) +- { +- printf("Berkeley DB version mismatch\n" +- "\theader: %s\n\tlibrary: %s\n", +- DB_VERSION_STRING, version); +- return 1; +- } +-#endif + +- return 0; +-}]])],[ol_cv_berkeley_db_version=yes],[ol_cv_berkeley_db_version=no],[ol_cv_berkeley_db_version=cross]) +- +- LIBS="$ol_LIBS" +-]) +- +- if test $ol_cv_berkeley_db_version = no ; then +- AC_MSG_ERROR([Berkeley DB version mismatch]) +- fi +-])dnl +-dnl + dnl -------------------------------------------------------------------- +-dnl Check if Berkeley DB supports DB_THREAD +-AC_DEFUN([OL_BERKELEY_DB_THREAD], +-[AC_CACHE_CHECK([for Berkeley DB thread support], [ol_cv_berkeley_db_thread], [ +- ol_LIBS="$LIBS" +- LIBS="$LTHREAD_LIBS $LIBS" +- if test $ol_cv_lib_db != yes ; then +- LIBS="$ol_cv_lib_db $LIBS" +- fi +- +- AC_RUN_IFELSE([AC_LANG_SOURCE([[ +-#ifdef HAVE_DB_185_H +- choke me; +-#else +-#include +-#endif +-#ifndef NULL +-#define NULL ((void *)0) +-#endif +-main() +-{ +- int rc; +- u_int32_t flags = DB_CREATE | +-#ifdef DB_PRIVATE +- DB_PRIVATE | +-#endif +- DB_THREAD; +- +-#if DB_VERSION_MAJOR > 2 +- DB_ENV *env = NULL; +- +- rc = db_env_create( &env, 0 ); +- +- flags |= DB_INIT_MPOOL; +-#ifdef DB_MPOOL_PRIVATE +- flags |= DB_MPOOL_PRIVATE; +-#endif +- +- if( rc ) { +- printf("BerkeleyDB: %s\n", db_strerror(rc) ); +- return rc; +- } +- +-#if (DB_VERSION_MAJOR > 3) || (DB_VERSION_MINOR >= 1) +- rc = (env->open)( env, NULL, flags, 0 ); +-#else +- rc = (env->open)( env, NULL, NULL, flags, 0 ); +-#endif +- +- if ( rc == 0 ) { +- rc = env->close( env, 0 ); +- } +- +- if( rc ) { +- printf("BerkeleyDB: %s\n", db_strerror(rc) ); +- return rc; +- } +- +-#else +- DB_ENV env; +- memset( &env, '\0', sizeof(env) ); ++dnl Check for version compatility with back-mdb ++AC_DEFUN([OL_MDB_COMPAT], ++[AC_CACHE_CHECK([if LMDB version supported by MDB backends], [ol_cv_mdb_compat],[ ++ AC_EGREP_CPP(__mdb_version_compat,[ ++#include + +- rc = db_appinit( NULL, NULL, &env, flags ); +- +- if( rc == 0 ) { +- db_appexit( &env ); +- } +- +- unlink("__db_mpool.share"); +- unlink("__db_lock.share"); ++/* require 0.9.18 or later */ ++#if MDB_VERSION_FULL >= 0x000000090012 ++ __mdb_version_compat + #endif +- +- return rc; +-}]])],[ol_cv_berkeley_db_thread=yes],[ol_cv_berkeley_db_thread=no],[ol_cv_berkeley_db_thread=cross]) +- +- LIBS="$ol_LIBS" ++ ], [ol_cv_mdb_compat=yes], [ol_cv_mdb_compat=no])]) + ]) + +- if test $ol_cv_berkeley_db_thread != no ; then +- AC_DEFINE([HAVE_BERKELEY_DB_THREAD], [1], +- [define if Berkeley DB has DB_THREAD support]) +- fi +-])dnl + dnl + dnl -------------------------------------------------------------------- +-dnl Find any DB +-AC_DEFUN([OL_BERKELEY_DB], +-[ol_cv_berkeley_db=no +-AC_CHECK_HEADERS(db.h) +-if test $ac_cv_header_db_h = yes; then +- OL_BDB_HEADER_VERSION +- OL_BDB_COMPAT +- +- if test $ol_cv_bdb_compat != yes ; then +- AC_MSG_ERROR([BerkeleyDB version incompatible with BDB/HDB backends]) ++dnl Find any MDB ++AC_DEFUN([OL_MDB], ++[ol_cv_mdb=no ++AC_CHECK_HEADERS(lmdb.h) ++if test $ac_cv_header_lmdb_h = yes; then ++ OL_MDB_COMPAT ++ ++ if test $ol_cv_mdb_compat != yes ; then ++ AC_MSG_ERROR([LMDB version incompatible with MDB backends]) + fi + +- OL_BERKELEY_DB_LINK +- if test "$ol_cv_lib_db" != no ; then +- ol_cv_berkeley_db=yes +- OL_BERKELEY_DB_VERSION +- OL_BERKELEY_DB_THREAD +- fi ++ ol_cv_lib_mdb=-llmdb ++ ol_cv_mdb=yes + fi + ]) +-dnl -------------------------------------------------------------------- +-dnl Check for version compatility with back-bdb +-AC_DEFUN([OL_BDB_COMPAT], +-[AC_CACHE_CHECK([if Berkeley DB version supported by BDB/HDB backends], [ol_cv_bdb_compat],[ +- AC_EGREP_CPP(__db_version_compat,[ +-#include +- +- /* this check could be improved */ +-#ifndef DB_VERSION_MAJOR +-# define DB_VERSION_MAJOR 1 +-#endif +-#ifndef DB_VERSION_MINOR +-# define DB_VERSION_MINOR 0 +-#endif + +-#define DB_VERSION_MM ((DB_VERSION_MAJOR<<8)|DB_VERSION_MINOR) +- +-/* require 4.4 or later */ +-#if DB_VERSION_MM >= 0x0404 +- __db_version_compat +-#endif +- ], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])]) +-]) + + dnl + dnl ==================================================================== +@@ -664,12 +391,10 @@ AC_DEFUN([OL_PTHREAD_TEST_FUNCTION],[[ + return 0; + ]]) + +-AC_DEFUN([OL_PTHREAD_TEST_PROGRAM], [ +-AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES ++AC_DEFUN([OL_PTHREAD_TEST_PROGRAM], ++[AC_LANG_SOURCE([OL_PTHREAD_TEST_INCLUDES + +-int main(argc, argv) +- int argc; +- char **argv; ++int main(int argc, char **argv) + { + OL_PTHREAD_TEST_FUNCTION + } +@@ -706,7 +431,7 @@ dnl Check GNU Pth pthread Header + dnl + dnl defines ol_cv_header linux_threads to 'yes' or 'no' + dnl 'no' implies pthreads.h is not LinuxThreads or pthreads.h +-dnl doesn't exists. Existance of pthread.h should separately ++dnl doesn't exist. Existence of pthread.h should separately + dnl checked. + dnl + AC_DEFUN([OL_HEADER_GNU_PTH_PTHREAD_H], [ +@@ -728,7 +453,7 @@ AC_DEFUN([OL_NT_THREADS], [ + AC_CHECK_FUNC(_beginthread) + + if test $ac_cv_func__beginthread = yes ; then +- AC_DEFINE([HAVE_NT_THREADS], [1], [if you have NT Threads]) ++ AC_DEFINE(HAVE_NT_THREADS,1,[if you have NT Threads]) + ol_cv_nt_threads=yes + fi + ]) +@@ -737,7 +462,7 @@ dnl Check LinuxThreads Header + dnl + dnl defines ol_cv_header linux_threads to 'yes' or 'no' + dnl 'no' implies pthreads.h is not LinuxThreads or pthreads.h +-dnl doesn't exists. Existance of pthread.h should separately ++dnl doesn't exist. Existence of pthread.h should separately + dnl checked. + dnl + AC_DEFUN([OL_HEADER_LINUX_THREADS], [ +@@ -749,7 +474,7 @@ AC_DEFUN([OL_HEADER_LINUX_THREADS], [ + [ol_cv_header_linux_threads=no]) + ]) + if test $ol_cv_header_linux_threads = yes; then +- AC_DEFINE([HAVE_LINUX_THREADS], [1], [if you have LinuxThreads]) ++ AC_DEFINE(HAVE_LINUX_THREADS,1,[if you have LinuxThreads]) + fi + ])dnl + dnl -------------------------------------------------------------------- +@@ -791,7 +516,7 @@ AC_CACHE_CHECK([for compatible POSIX regex],ol_cv_c_posix_regex,[ + #include + #include + static char *pattern, *string; +-main() ++int main(void) + { + int rc; + regex_t re; +@@ -818,7 +543,7 @@ AC_DEFUN([OL_C_UPPER_LOWER], + [AC_CACHE_CHECK([if toupper() requires islower()],ol_cv_c_upper_lower,[ + AC_RUN_IFELSE([AC_LANG_SOURCE([[ + #include +-main() ++int main(void) + { + if ('C' == toupper('C')) + exit(0); +@@ -826,7 +551,7 @@ main() + exit(1); + }]])],[ol_cv_c_upper_lower=no],[ol_cv_c_upper_lower=yes],[ol_cv_c_upper_lower=safe])]) + if test $ol_cv_c_upper_lower != no ; then +- AC_DEFINE([C_UPPER_LOWER], [1], [define if toupper() requires islower()]) ++ AC_DEFINE(C_UPPER_LOWER,1, [define if toupper() requires islower()]) + fi + ]) + dnl +@@ -837,29 +562,32 @@ dnl Check for declaration of sys_errlist in one of stdio.h and errno.h. + dnl Declaration of sys_errlist on BSD4.4 interferes with our declaration. + dnl Reported by Keith Bostic. + AC_DEFUN([OL_SYS_ERRLIST], +-[AC_CACHE_CHECK([declaration of sys_errlist],ol_cv_dcl_sys_errlist,[ +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++[AC_CACHE_CHECK([existence of sys_errlist],ol_cv_have_sys_errlist,[ ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[char *c = (char *) *sys_errlist]])],[ol_cv_have_sys_errlist=yes],[ol_cv_have_sys_errlist=no])]) ++if test $ol_cv_have_sys_errlist = yes ; then ++ AC_DEFINE(HAVE_SYS_ERRLIST,1, ++ [define if you actually have sys_errlist in your libs]) ++ AC_CACHE_CHECK([declaration of sys_errlist],ol_cv_dcl_sys_errlist,[ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include + #include + #ifdef _WIN32 + #include +-#endif ]], [[char *c = (char *) *sys_errlist]])],[ol_cv_dcl_sys_errlist=yes +- ol_cv_have_sys_errlist=yes],[ol_cv_dcl_sys_errlist=no])]) ++#endif ]], [[char *c = (char *) *sys_errlist]])],[ol_cv_dcl_sys_errlist=yes], ++ [ol_cv_dcl_sys_errlist=no])]) + # +-# It's possible (for near-UNIX clones) that sys_errlist doesn't exist +-if test $ol_cv_dcl_sys_errlist = no ; then +- AC_DEFINE([DECL_SYS_ERRLIST], [1], +- [define if sys_errlist is not declared in stdio.h or errno.h]) +- +- AC_CACHE_CHECK([existence of sys_errlist],ol_cv_have_sys_errlist,[ +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[char *c = (char *) *sys_errlist]])],[ol_cv_have_sys_errlist=yes],[ol_cv_have_sys_errlist=no])]) +-fi +-if test $ol_cv_have_sys_errlist = yes ; then +- AC_DEFINE([HAVE_SYS_ERRLIST], [1], +- [define if you actually have sys_errlist in your libs]) ++ # It's possible (for near-UNIX clones) that sys_errlist doesn't exist ++ if test $ol_cv_dcl_sys_errlist = no ; then ++ AC_DEFINE(DECL_SYS_ERRLIST,1, ++ [define if sys_errlist is not declared in stdio.h or errno.h]) ++ fi + fi + ])dnl ++dnl ++dnl ==================================================================== ++dnl glibc supplies a non-standard strerror_r if _GNU_SOURCE is defined. ++dnl It's actually preferable to the POSIX version, if available. + AC_DEFUN([OL_NONPOSIX_STRERROR_R], + [AC_CACHE_CHECK([non-posix strerror_r],ol_cv_nonposix_strerror_r,[ + AC_EGREP_CPP(strerror_r,[#include ], +@@ -873,24 +601,23 @@ AC_DEFUN([OL_NONPOSIX_STRERROR_R], + ]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror_r=no]) + else + AC_RUN_IFELSE([AC_LANG_SOURCE([[ +- main() { ++ int main(void) { + char buf[100]; + buf[0] = 0; + strerror_r( 1, buf, sizeof buf ); + exit( buf[0] == 0 ); + } +- ]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror=no],[ol_cv_nonposix_strerror=no]) ++ ]])],[ol_cv_nonposix_strerror_r=yes],[ol_cv_nonposix_strerror_r=no],[ol_cv_nonposix_strerror_r=no]) + fi + ]) + if test $ol_cv_nonposix_strerror_r = yes ; then +- AC_DEFINE([HAVE_NONPOSIX_STRERROR_R], [1], ++ AC_DEFINE(HAVE_NONPOSIX_STRERROR_R,1, + [define if strerror_r returns char* instead of int]) + fi + ])dnl + dnl + AC_DEFUN([OL_STRERROR], +-[OL_SYS_ERRLIST dnl TEMPORARY +-AC_CHECK_FUNCS(strerror strerror_r) ++[AC_CHECK_FUNCS(strerror strerror_r) + ol_cv_func_strerror_r=no + if test "${ac_cv_func_strerror_r}" = yes ; then + OL_NONPOSIX_STRERROR_R +@@ -910,7 +637,7 @@ AC_DEFUN([OL_C_VOLATILE], + if test $ol_cv_c_volatile = yes; then + : + else +- AC_DEFINE([volatile], [], [define as empty if volatile is not supported]) ++ AC_DEFINE(volatile,,[define as empty if volatile is not supported]) + fi + ])dnl + dnl +@@ -918,7 +645,7 @@ dnl ==================================================================== + dnl Look for fetch(3) + AC_DEFUN([OL_LIB_FETCH], + [ol_LIBS=$LIBS +-LIBS="-lfetch -lcom_err $LIBS" ++LIBS="-lfetch $LIBS" + AC_CACHE_CHECK([fetch(3) library],ol_cv_lib_fetch,[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #ifdef HAVE_SYS_PARAM_H +@@ -928,8 +655,8 @@ AC_CACHE_CHECK([fetch(3) library],ol_cv_lib_fetch,[ + #include ]], [[struct url *u = fetchParseURL("file:///"); ]])],[ol_cv_lib_fetch=yes],[ol_cv_lib_fetch=no])]) + LIBS=$ol_LIBS + if test $ol_cv_lib_fetch != no ; then +- ol_link_fetch="-lfetch -lcom_err" +- AC_DEFINE([HAVE_FETCH], [1], ++ ol_link_fetch="-lfetch" ++ AC_DEFINE(HAVE_FETCH,1, + [define if you actually have FreeBSD fetch(3)]) + fi + ])dnl +@@ -1094,7 +821,7 @@ AC_DEFUN([OL_FUNC_GETHOSTBYADDR_R_NARGS], + ])dnl + dnl + dnl -------------------------------------------------------------------- +-dnl Check for Cyrus SASL version compatility ++dnl Check for Cyrus SASL version compatibility + AC_DEFUN([OL_SASL_COMPAT], + [AC_CACHE_CHECK([Cyrus SASL library version], [ol_cv_sasl_compat],[ + AC_EGREP_CPP(__sasl_compat,[ +@@ -1113,19 +840,3 @@ AC_DEFUN([OL_SASL_COMPAT], + #endif + ], [ol_cv_sasl_compat=yes], [ol_cv_sasl_compat=no])]) + ]) +-dnl ==================================================================== +-dnl check for SSL compatibility +-AC_DEFUN([OL_SSL_COMPAT], +-[AC_CACHE_CHECK([OpenSSL library version (CRL checking capability)], +- [ol_cv_ssl_crl_compat],[ +- AC_EGREP_CPP(__ssl_compat,[ +-#ifdef HAVE_OPENSSL_SSL_H +-#include +-#endif +- +-/* Require 0.9.7d+ */ +-#if OPENSSL_VERSION_NUMBER >= 0x0090704fL +- char *__ssl_compat = "0.9.7d"; +-#endif +- ], [ol_cv_ssl_crl_compat=yes], [ol_cv_ssl_crl_compat=no])]) +-]) diff --git a/net-misc/ntp/ntp-4.2.8_p15-r2.ebuild b/net-misc/ntp/ntp-4.2.8_p15-r2.ebuild new file mode 100644 index 000000000000..5bfcc0767728 --- /dev/null +++ b/net-misc/ntp/ntp-4.2.8_p15-r2.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic systemd + +MY_P=${P/_p/p} +DESCRIPTION="Network Time Protocol suite/programs" +HOMEPAGE="http://www.ntp.org/" +SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz + https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz" + +LICENSE="HPND BSD ISC" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="caps debug ipv6 openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf" + +COMMON_DEPEND="readline? ( >=sys-libs/readline-4.1:0= ) + >=dev-libs/libevent-2.0.9:=[threads?] + kernel_linux? ( caps? ( sys-libs/libcap ) ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) + snmp? ( net-analyzer/net-snmp ) + ssl? ( + dev-libs/openssl:0= + ) + parse-clocks? ( net-misc/pps-tools )" +BDEPEND="virtual/pkgconfig + acct-group/ntp + acct-user/ntp" +DEPEND="${COMMON_DEPEND}" +RDEPEND="${COMMON_DEPEND} + acct-group/ntp + acct-user/ntp + selinux? ( sec-policy/selinux-ntp ) + vim-syntax? ( app-vim/ntp-syntax ) + !net-misc/ntpsec + !openntpd? ( !net-misc/openntpd ) +" +PDEPEND="openntpd? ( net-misc/openntpd )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966 + "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922 + "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530 + "${FILESDIR}"/${PN}-4.2.8_p15-gcc10.patch #759409 + "${FILESDIR}"/${PN}-4.2.8_p15-glibc-2.34.patch + "${FILESDIR}"/${PN}-4.2.8_p15-configure-clang16.patch +) + +src_prepare() { + default + append-cppflags -D_GNU_SOURCE #264109 + # Make sure every build uses the same install layout. #539092 + find sntp/loc/ -type f '!' -name legacy -delete || die + eautoreconf #622754 + # Disable pointless checks. + touch .checkChangeLog .gcc-warning FRC.html html/.datecheck +} + +src_configure() { + # avoid libmd5/libelf + export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no + export ac_cv_lib_elf_nlist=no + # blah, no real configure options #176333 + export ac_cv_header_dns_sd_h=$(usex zeroconf) + export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h} + local myeconfargs=( + --with-lineeditlibs=readline,edit,editline + --with-yielding-select + --disable-local-libevent + # Increase the default memlimit from 32MiB to 128MiB. #533232 + --with-memlock=256 + $(use_enable caps linuxcaps) + $(use_enable parse-clocks) + $(use_enable ipv6) + $(use_enable debug debugging) + $(use_with readline lineeditlibs readline) + $(use_enable samba ntp-signd) + $(use_with snmp ntpsnmpd) + $(use_with ssl crypto) + $(use_enable threads thread-support) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + # move ntpd/ntpdate to sbin #66671 + dodir /usr/sbin + mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin" + + dodoc INSTALL WHERE-TO-START + doman "${WORKDIR}"/man/*.[58] + + insinto /etc + doins "${FILESDIR}"/ntp.conf + use ipv6 || sed -i '/^restrict .*::1/d' "${ED}"/etc/ntp.conf #524726 + newinitd "${FILESDIR}"/ntpd.rc-r2 ntpd + newconfd "${FILESDIR}"/ntpd.confd ntpd + newinitd "${FILESDIR}"/ntp-client.rc ntp-client + newconfd "${FILESDIR}"/ntp-client.confd ntp-client + newinitd "${FILESDIR}"/sntp.rc sntp + newconfd "${FILESDIR}"/sntp.confd sntp + if ! use caps ; then + sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die + fi + sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die + + keepdir /var/lib/ntp + use prefix || fowners ntp:ntp /var/lib/ntp + + if use openntpd ; then + cd "${ED}" || die + rm usr/sbin/ntpd || die + rm -r var/lib || die + rm etc/{conf,init}.d/ntpd || die + rm usr/share/man/*/ntpd.8 || die + else + systemd_newunit "${FILESDIR}"/ntpd.service-r2 ntpd.service + if use caps ; then + sed -i '/ExecStart/ s|$| -u ntp:ntp|' \ + "${D}$(systemd_get_systemunitdir)"/ntpd.service \ + || die + fi + systemd_enable_ntpunit 60-ntpd ntpd.service + fi + + systemd_newunit "${FILESDIR}"/ntpdate.service-r2 ntpdate.service + systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf + systemd_newunit "${FILESDIR}"/sntp.service-r3 sntp.service + systemd_install_serviced "${FILESDIR}"/sntp.service.conf +} + +pkg_postinst() { + if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then + eerror "The notrust option was found in your /etc/ntp.conf!" + ewarn "If your ntpd starts sending out weird responses," + ewarn "then make sure you have keys properly setup and see" + ewarn "https://bugs.gentoo.org/41827" + fi +} -- cgit v1.2.3