From 434fbe89e81a1fe06d92676be72ab7f862cc3f53 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 19 Mar 2023 00:32:54 +0000 Subject: gentoo auto-resync : 19:03:2023 - 00:32:54 --- net-libs/netwib/Manifest | 5 +- .../netwib/files/netwib-5.39.0-C99-decls.patch | 19 +++++ net-libs/netwib/files/netwib-5.39.0-config.patch | 35 +++++++++ .../netwib/files/netwib-5.39.0-sched_yield.patch | 85 ++++++++++++++++++++++ net-libs/netwib/netwib-5.39.0-r1.ebuild | 56 ++++++++++++++ net-libs/netwib/netwib-5.39.0.ebuild | 61 ---------------- 6 files changed, 199 insertions(+), 62 deletions(-) create mode 100644 net-libs/netwib/files/netwib-5.39.0-C99-decls.patch create mode 100644 net-libs/netwib/files/netwib-5.39.0-config.patch create mode 100644 net-libs/netwib/files/netwib-5.39.0-sched_yield.patch create mode 100644 net-libs/netwib/netwib-5.39.0-r1.ebuild delete mode 100644 net-libs/netwib/netwib-5.39.0.ebuild (limited to 'net-libs/netwib') diff --git a/net-libs/netwib/Manifest b/net-libs/netwib/Manifest index d8bfdc3ace90..e1f3627310a5 100644 --- a/net-libs/netwib/Manifest +++ b/net-libs/netwib/Manifest @@ -1,4 +1,7 @@ +AUX netwib-5.39.0-C99-decls.patch 386 BLAKE2B 45af77507fcd87887a495dbf9a2d852d82894e9175f123b9bbbfc72e32b93fc98c60f89f8e729ffe1db45230d40929df8543d93c0c4fe57b5d4895b341e6eeea SHA512 68599dc95c2e3f07fa7e26d39e34d6b9a4386289b9a75e95a533938491f7e63d0264efda79259620c9d5d999366c0295c5c08a7aa48d193606a0822b60e64776 +AUX netwib-5.39.0-config.patch 1144 BLAKE2B 3f3a8b57b9184ef73a66f0855b5684684197b489a567919f318d4ae8d0b2cc3f134aebaf8e8fbf08e19b2966867a7524deda3c49631c4f6670744ea639c9e9f6 SHA512 68c3a3ca18fa5c36af01c28aabb3907f963cb4432aeb88be33d5dad83f93405794fddc7ea8c5d311382c5cb1486e6ae7d73f1b0e8e90517576e333eb5ee6693d +AUX netwib-5.39.0-sched_yield.patch 3419 BLAKE2B ebc631b9ebb8c3949226df4bc26db5ebd3200bc3e43cac2433afff6bae1d22c5051fc6b97f339a6eae523b271df2ffd7902ae97d0fe26aa1f4b58aaaf0b11d57 SHA512 0f49bd8eb43dbebaa8e75fb6d224a4b590562bf509f948a749b6bd09f54559256efb7079e2dd3fbf6f119cb147cb734610219cbbcf302b61b2054b5de9e05399 DIST netwib-5.39.0-doc_html.tgz 139572 BLAKE2B 4680ab22206fee6f09dec4bbd9d352bdc8e30db2cd7080278586eec81ee9bf940aa98ab2d9180a9f202a10578064cea966968616ec4f33e51be5380194fdfbce SHA512 0920642854f71b4c20a8b0844d152aa1107b7cfe927524391626bac97185024261e0efbcb681b978fa612d04cb71a804c7ae604d2040c87d27d118c004940345 DIST netwib-5.39.0-src.tgz 641757 BLAKE2B c5c17f971888b292e78d65e2b437c58e53040951a727f1d37b556f9ed9b28a67d9d2756d69754459ee531cedd48d3ec24e92c2118b69ee50bee99fa7f791a210 SHA512 eeb3c51c48ed22762fa0e4215dfd239fb97fc0b34f28382d77ad863ed1f2f4a1f26195517fcd26c4b1a96195c895bd7b7ed121af975b5dc49b1bc378b11ef234 -EBUILD netwib-5.39.0.ebuild 1320 BLAKE2B 1b15ee5d5a0cb90d84a2c0a050b367573d57a9dfff0c4215521840d1ded07f06b85a943888602b66ce9f7c85ace48a431a4bc63b3488540b41ba2d4161ff075b SHA512 b44c1bace73b498c8c57a13f5900e4694c93789a1221b9770ee51cc6df506a8b9df8ac6bfc53410ecc50aa8ab37ac0026b9eb022fcf70e6b076362d7e4ac7fc0 +EBUILD netwib-5.39.0-r1.ebuild 1164 BLAKE2B 875848dac9e14f4574b76d556dc0d8e5f01c2a89cc50df2a34d27a521f653eae3783e6766d2f5780e0157681333e8c44cabb894a4e0f9561af47c09314cab8c2 SHA512 c9d63e44d18dedae9d4e06efa8ec239312b6bd69d1d737acea3226fe48559172d6136636a81bc9cfe07a3477303b86428b3f23686469a2c01d81f3880d00261e MISC metadata.xml 356 BLAKE2B 5268876897034598b81a4a02394cdd1168965e90faa9bdf4c8df085b8be545db72f005e97fcc897a58474fcb5bfa5384d630ffadd02476a9eb11ef5f0557bbf6 SHA512 c590d7b7442f468010c30212b216519951e51204dcebcb539da49e0a5f2ade0d932cc4db9fe27adc1e295396712fd31fe5de74f0f2208fd8ba3998d96c03f039 diff --git a/net-libs/netwib/files/netwib-5.39.0-C99-decls.patch b/net-libs/netwib/files/netwib-5.39.0-C99-decls.patch new file mode 100644 index 000000000000..4509b3703160 --- /dev/null +++ b/net-libs/netwib/files/netwib-5.39.0-C99-decls.patch @@ -0,0 +1,19 @@ +--- a/genemake ++++ b/genemake +@@ -1279,6 +1279,7 @@ + + #--- + cat > `checkcompilfile` < + int ether_hostton(char *para1, char *para2); + int main(void) + { char p1[10], p2[10]; +@@ -1668,7 +1669,7 @@ + #include + #include + int main(void) +- { getgrgid_r(NULL, NULL, NULL, 0, NULL); ++ { getgrgid_r(0, NULL, NULL, 0, NULL); + return(0); + } + EOF diff --git a/net-libs/netwib/files/netwib-5.39.0-config.patch b/net-libs/netwib/files/netwib-5.39.0-config.patch new file mode 100644 index 000000000000..922c9d0dd887 --- /dev/null +++ b/net-libs/netwib/files/netwib-5.39.0-config.patch @@ -0,0 +1,35 @@ +--- a/config.dat ++++ b/config.dat +@@ -7,11 +7,11 @@ + + ########################################################################## + ### directories where netwib will be installed +-NETWIBDEF_INSTPREFIX=/usr/local ++NETWIBDEF_INSTPREFIX="${EPREFIX}/usr" + NETWIBDEF_INSTINCLUDE=${NETWIBDEF_INSTPREFIX}/include + NETWIBDEF_INSTLIB=${NETWIBDEF_INSTPREFIX}/lib + NETWIBDEF_INSTBIN=${NETWIBDEF_INSTPREFIX}/bin +-NETWIBDEF_INSTMAN=${NETWIBDEF_INSTPREFIX}/man ++NETWIBDEF_INSTMAN=${NETWIBDEF_INSTPREFIX}/share/man + NETWIBDEF_INSTMAN3=${NETWIBDEF_INSTMAN}/man3 + + ### installation destination directory +@@ -19,14 +19,14 @@ + + ########################################################################## + ### programs +-NETWIBDEF_PROGCC=gcc +-NETWIBDEF_PROGAR=ar +-NETWIBDEF_PROGRANLIB=ranlib ++NETWIBDEF_PROGCC="${CC}" ++NETWIBDEF_PROGAR="${AR}" ++NETWIBDEF_PROGRANLIB="${RANLIB}" + NETWIBDEF_PROGGREP=grep + + ########################################################################## + ### compiler options +-NETWIBDEF_PROGCC_OPT="-Wall -O2" ++NETWIBDEF_PROGCC_OPT="${CFLAGS:-} ${CPPFLAGS:-}" + NETWIBDEF_PROGCC_INC="" + NETWIBDEF_PROGCC_LIB="" + NETWIBDEF_PROGCC_OPTPIC="" diff --git a/net-libs/netwib/files/netwib-5.39.0-sched_yield.patch b/net-libs/netwib/files/netwib-5.39.0-sched_yield.patch new file mode 100644 index 000000000000..06bb248bc949 --- /dev/null +++ b/net-libs/netwib/files/netwib-5.39.0-sched_yield.patch @@ -0,0 +1,85 @@ +--- a/genemake ++++ b/genemake +@@ -1598,21 +1598,6 @@ + fi + + #--- +-NETWIBDEF_HAVEFUNC_PTHREAD_YIELD=0 +-if [ $NETWIBDEF_HAVEINCL_PTHREAD = 1 ] ; then +- cat > `checkcompilfile` < +- int main(void) +- { pthread_yield(); +- return(0); +- } +-EOF +- checkcompilstd "pthread_yield" "" "" "" +- NETWIBDEF_HAVEFUNC_PTHREAD_YIELD=`checkcompilyes` +- checkceclean +-fi +- +-#--- + NETWIBDEF_HAVEFUNC_SCHED_YIELD=0 + if [ $NETWIBDEF_HAVEINCL_SCHED = 1 ] ; then + cat > `checkcompilfile` <> $deffile + echo "#define NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDRDLOCK $NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDRDLOCK" >> $deffile + echo "#define NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDWRLOCK $NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDWRLOCK" >> $deffile +-echo "#define NETWIBDEF_HAVEFUNC_PTHREAD_YIELD $NETWIBDEF_HAVEFUNC_PTHREAD_YIELD" >> $deffile + echo "#define NETWIBDEF_HAVEFUNC_SCHED_YIELD $NETWIBDEF_HAVEFUNC_SCHED_YIELD" >> $deffile + echo "#define NETWIBDEF_HAVEFUNC_GETPWNAM_R $NETWIBDEF_HAVEFUNC_GETPWNAM_R" >> $deffile + echo "#define NETWIBDEF_HAVEFUNC_GETGRNAM_R $NETWIBDEF_HAVEFUNC_GETGRNAM_R" >> $deffile +@@ -2205,7 +2189,6 @@ + HAVEFUNC_PTHREAD_MUTEX_TIMEDLOCK) echo $NETWIBDEF_HAVEFUNC_PTHREAD_MUTEX_TIMEDLOCK ;; + HAVEFUNC_PTHREAD_RWLOCK_TIMEDRDLOCK) echo $NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDRDLOCK ;; + HAVEFUNC_PTHREAD_RWLOCK_TIMEDWRLOCK) echo $NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDWRLOCK ;; +- HAVEFUNC_PTHREAD_YIELD) echo $NETWIBDEF_HAVEFUNC_PTHREAD_YIELD ;; + HAVEFUNC_SCHED_YIELD) echo $NETWIBDEF_HAVEFUNC_SCHED_YIELD ;; + HAVEFUNC_GETPWNAM_R) echo $NETWIBDEF_HAVEFUNC_GETPWNAM_R ;; + HAVEFUNC_GETGRNAM_R) echo $NETWIBDEF_HAVEFUNC_GETGRNAM_R ;; +--- a/netwib/def_windows.h ++++ b/netwib/def_windows.h +@@ -100,7 +100,6 @@ + #define NETWIBDEF_HAVEFUNC_PTHREAD_MUTEX_TIMEDLOCK 0 + #define NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDRDLOCK 0 + #define NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDWRLOCK 0 +-#define NETWIBDEF_HAVEFUNC_PTHREAD_YIELD 0 + #define NETWIBDEF_HAVEFUNC_SCHED_YIELD 0 + #define NETWIBDEF_HAVEFUNC_GETPWNAM_R 0 + #define NETWIBDEF_HAVEFUNC_GETGRNAM_R 0 +--- a/netwib/inc/missing.h ++++ b/netwib/inc/missing.h +@@ -3,7 +3,6 @@ + #if 0 + /* Some systems have the function in their library, but + prototypes are missing. Those one can be used instead. */ +- int pthread_yield(void); + int getpagesize(void); + int usleep(unsigned int useconds); + int getpwnam_r(const char *name, +--- a/netwib/sys/internal.c ++++ b/netwib/sys/internal.c +@@ -221,8 +221,6 @@ + NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDRDLOCK); + netwib_co_i("NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDWRLOCK", + NETWIBDEF_HAVEFUNC_PTHREAD_RWLOCK_TIMEDWRLOCK); +- netwib_co_i("NETWIBDEF_HAVEFUNC_PTHREAD_YIELD", +- NETWIBDEF_HAVEFUNC_PTHREAD_YIELD); + netwib_co_i("NETWIBDEF_HAVEFUNC_SCHED_YIELD", + NETWIBDEF_HAVEFUNC_SCHED_YIELD); + netwib_co_i("NETWIBDEF_HAVEFUNC_GETPWNAM_R", +--- a/netwib/sys/priv/pause.c ++++ b/netwib/sys/priv/pause.c +@@ -6,10 +6,7 @@ + { + + #if defined NETWIBDEF_SYSNAME_Unix +- #if NETWIBDEF_HAVEFUNC_PTHREAD_YIELD == 1 +- pthread_yield(); +- return(NETWIB_ERR_OK); +- #elif NETWIBDEF_HAVEFUNC_SCHED_YIELD == 1 ++ #if NETWIBDEF_HAVEFUNC_SCHED_YIELD == 1 + sched_yield(); + return(NETWIB_ERR_OK); + #endif diff --git a/net-libs/netwib/netwib-5.39.0-r1.ebuild b/net-libs/netwib/netwib-5.39.0-r1.ebuild new file mode 100644 index 000000000000..21a268557647 --- /dev/null +++ b/net-libs/netwib/netwib-5.39.0-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# NOTE: netwib, netwox and netwag go together, bump all or bump none + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Library of Ethernet, IP, UDP, TCP, ICMP, ARP and RARP protocols" +HOMEPAGE=" + http://www.laurentconstantin.com/en/netw/netwib/ + http://ntwib.sourceforge.net/ +" +SRC_URI=" + mirror://sourceforge/ntwib/${P}-src.tgz + doc? ( mirror://sourceforge/ntwib/${P}-doc_html.tgz )" +S="${WORKDIR}/${P}-src/src" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc x86" +IUSE="doc" + +DEPEND=" + net-libs/libnet:1.1 + net-libs/libpcap" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-C99-decls.patch + "${FILESDIR}"/${P}-config.patch + "${FILESDIR}"/${P}-sched_yield.patch +) + +src_configure() { + tc-export AR CC RANLIB + sed -e "s:/lib:/$(get_libdir):" \ + -i config.dat || die + + sh genemake || die +} + +src_install() { + default + + dodoc \ + ../README.TXT \ + ../doc/{changelog.txt,credits.txt,integration.txt} \ + ../doc/{problemreport.txt,problemusageunix.txt,todo.txt} + + if use doc; then + docinto html + dodoc -r "${WORKDIR}"/${P}-doc_html/{index.html,${PN}} + fi +} diff --git a/net-libs/netwib/netwib-5.39.0.ebuild b/net-libs/netwib/netwib-5.39.0.ebuild deleted file mode 100644 index c73eb6097f01..000000000000 --- a/net-libs/netwib/netwib-5.39.0.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# NOTE: netwib, netwox and netwag go together, bump all or bump none - -EAPI=8 - -inherit toolchain-funcs - -DESCRIPTION="Library of Ethernet, IP, UDP, TCP, ICMP, ARP and RARP protocols" -HOMEPAGE=" - http://www.laurentconstantin.com/en/netw/netwib/ - http://ntwib.sourceforge.net/ -" -SRC_URI="mirror://sourceforge/ntwib/${P}-src.tgz - doc? ( mirror://sourceforge/ntwib/${P}-doc_html.tgz )" -S="${WORKDIR}/${P}-src/src" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc x86" -IUSE="doc" - -DEPEND=" - net-libs/libnet:1.1 - net-libs/libpcap -" -RDEPEND="${DEPEND}" - -src_prepare() { - default - - sed -i \ - -e 's:/man$:/share/man:g' \ - -e "s:/lib:/$(get_libdir):" \ - -e "s:/usr/local:/usr:" \ - -e "s:=ar:=$(tc-getAR):" \ - -e "s:=ranlib:=$(tc-getRANLIB):" \ - -e "s:=gcc:=$(tc-getCC):" \ - -e "s:-O2:${CFLAGS}:" \ - config.dat || die -} - -src_configure() { - sh genemake || die -} - -src_install() { - default - dodoc ../README.TXT - if use doc; then - mkdir "${ED}"/usr/share/doc/${PF}/html || die - mv "${WORKDIR}"/${P}-doc_html/{index.html,${PN}} \ - "${ED}"/usr/share/doc/${PF}/html || die - fi - - cd "${S}"/.. || die - dodoc \ - doc/{changelog.txt,credits.txt,integration.txt} \ - doc/{problemreport.txt,problemusageunix.txt,todo.txt} -} -- cgit v1.2.3