Merge pull request #104 from flatcar-linux/dongsu/update-pkgs-20200917

Update jq, libbsd, rsync, tcpdump, libpcap
This commit is contained in:
Dongsu Park 2020-09-18 10:29:15 +02:00 committed by GitHub
commit 2afd3259e5
52 changed files with 1037 additions and 977 deletions

View File

@ -1,132 +0,0 @@
# ChangeLog for app-misc/jq
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# (auto-generated from git log)
*jq-1.4-r1 (09 Aug 2015)
*jq-1.4 (09 Aug 2015)
09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org>
+files/jq-1.4-dynamic-link.patch, +jq-1.4.ebuild, +jq-1.4-r1.ebuild,
+metadata.xml:
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
the bikeshed
24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
Use https by default
Convert all URLs for sites supporting encrypted connections from http to
https
Signed-off-by: Justin Lecher <jlec@gentoo.org>
24 Aug 2015; Justin Lecher <jlec@gentoo.org> jq-1.4.ebuild,
jq-1.4-r1.ebuild:
Use https by default
Convert all URLs for sites supporting encrypted connections from http to
https
Signed-off-by: Justin Lecher <jlec@gentoo.org>
24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
Revert DOCTYPE SYSTEM https changes in metadata.xml
repoman does not yet accept the https version.
This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
Bug: https://bugs.gentoo.org/552720
22 Dec 2015; Fabian Groffen <grobian@gentoo.org> jq-1.4-r1.ebuild:
marked ~x64-macos
Package-Manager: portage-2.2.20-prefix
*jq-1.5 (09 Jan 2016)
09 Jan 2016; Patrick McLean <chutzpah@gentoo.org>
+files/jq-1.5-dynamic-link.patch,
+files/jq-1.5-remove-automagic-dep-on-oniguruma.patch, +jq-1.5.ebuild,
metadata.xml:
version bump to 1.5
This also fixes bugs 559334 and 566140, and adds a new "oniguruma" USE flag.
Package-Manager: portage-2.2.26
09 Jan 2016; Patrick McLean <chutzpah@gentoo.org> jq-1.4.ebuild,
jq-1.4-r1.ebuild:
Update SRC_URI in 1.4 and 1.4-r1
Gentoo-Bug: 566140
Reported-by: Gaetan <gaetan@nexylan.com>
Package-Manager: portage-2.2.26
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Unify quoting in metadata.xml files for machine processing
Force unified quoting in all metadata.xml files since lxml does not
preserve original use of single and double quotes. Ensuring unified
quoting before the process allows distinguishing the GLEP 67-related
metadata.xml changes from unrelated quoting changes.
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Set appropriate maintainer types in metadata.xml (GLEP 67)
*jq-1.5-r1 (01 Feb 2016)
01 Feb 2016; Patrick McLean <chutzpah@gentoo.org> +jq-1.5-r1.ebuild:
Revision bump, update bison dep to >=3.0 add rdep on oniguruma
Gentoo-Bug: 573058
Package-Manager: portage-2.2.27
01 Feb 2016; Patrick McLean <chutzpah@gentoo.org> -jq-1.5.ebuild:
Drop ebuild for 1.5 since -r1 fixes some depdency issues
Package-Manager: portage-2.2.27
*jq-1.5-r2 (30 Apr 2016)
30 Apr 2016; Tim Harder <radhermit@gentoo.org>
+files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch, +jq-1.5-r2.ebuild:
fix buffer overflow (bug #580606) and other updates
- add upstream metadata
- add arm architecture
- refactor econf args to an array
- move DOCS and PATCHES to their appropriate functions
- replace custom find with prune_libtool_files()
Gentoo-Bug: 580606

View File

@ -1,69 +0,0 @@
# ChangeLog for app-misc/jq
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/jq/ChangeLog,v 1.16 2015/04/07 04:10:41 vapier Exp $
*jq-1.4-r1 (07 Apr 2015)
07 Apr 2015; Mike Frysinger <vapier@gentoo.org>
+files/jq-1.4-dynamic-link.patch, +jq-1.4-r1.ebuild:
Add USE=static-libs and fix linking of jq against the dynamic lib; fixes from
Chromium OS.
11 Dec 2014; Tim Harder <radhermit@gentoo.org> -jq-1.3.ebuild,
-files/jq-1.3-automake-1.14.patch:
Remove old.
11 Dec 2014; Tim Harder <radhermit@gentoo.org> jq-1.4.ebuild:
Stabilize for amd64 and x86.
*jq-1.4 (11 Jul 2014)
11 Jul 2014; Patrick McLean <chutzpah@gentoo.org> +jq-1.4.ebuild:
Version bump (bug #516018).
10 Dec 2013; Tim Harder <radhermit@gentoo.org> -jq-1.2.ebuild,
-files/jq-1.2-makefile.patch:
Remove old.
10 Dec 2013; Tim Harder <radhermit@gentoo.org> jq-1.3.ebuild,
+files/jq-1.3-automake-1.14.patch:
Fix build with automake-1.14 (bug #493804).
04 Jul 2013; Agostino Sarubbo <ago@gentoo.org> jq-1.3.ebuild:
Stable for x86, wrt bug #474936
28 Jun 2013; Agostino Sarubbo <ago@gentoo.org> jq-1.3.ebuild:
Stable for amd64, wrt bug #474936
27 May 2013; Tim Harder <radhermit@gentoo.org> jq-1.3.ebuild:
Don't try to rebuild docs (bug #471370).
*jq-1.3 (23 May 2013)
23 May 2013; Tim Harder <radhermit@gentoo.org> +jq-1.3.ebuild:
Version bump.
01 May 2013; Tim Harder <radhermit@gentoo.org> -jq-1.1.ebuild,
-files/jq-1.1-makefile.patch:
Remove old.
01 May 2013; Agostino Sarubbo <ago@gentoo.org> jq-1.2.ebuild:
Stable for x86, wrt bug #468074
01 May 2013; Agostino Sarubbo <ago@gentoo.org> jq-1.2.ebuild:
Stable for amd64, wrt bug #468074
07 Feb 2013; Ulrich Müller <ulm@gentoo.org> jq-1.1.ebuild, jq-1.2.ebuild:
Move Creative Commons licenses to shorter names.
*jq-1.2 (04 Jan 2013)
04 Jan 2013; Tim Harder <radhermit@gentoo.org> +jq-1.2.ebuild,
+files/jq-1.2-makefile.patch:
Version bump.
*jq-1.1 (23 Oct 2012)
23 Oct 2012; Tim Harder <radhermit@gentoo.org> +jq-1.1.ebuild,
+files/jq-1.1-makefile.patch, +metadata.xml:
Initial import, ebuild by me.

View File

@ -1,13 +1 @@
AUX jq-1.4-dynamic-link.patch 232 SHA256 dbc4f3a9f0e509e805a7a6966a37b53aaa00d0e0f06cc58d0a392b27a79e1a2b SHA512 d4c16d04a74ae9f119d6c513b4f401f90dbe88af0d03b0060ac29a57849c05a139eafc3ebfb7d815212858d8bfec981556874151351c0c56830cd0380679fc4f WHIRLPOOL fa7f215b94fa22010f55259379f069d68f2012d73477325ad2ceebe89b3ff81c19772aa5c248c2ecf3946d9200321deaf7fc43976355a9e4137a25e681527200
AUX jq-1.5-dynamic-link.patch 292 SHA256 c4000f13ea2e0fe85e4d89470af17b7528cb87b2ca921fb990815bf6abcfad6d SHA512 1573ab7bdb9bd28db1ef7cbf834aada998b9651ffc1a9c67941faf23490ac3b145b6af6f1e41212b2c8c990d738b24bc7912a591db386f922c0b829a59e465ee WHIRLPOOL 29f3e6011c4f27d9339a0692685285ecee057aff58ba289146f6e36a31289c3146b1bc760948a1e55bdd5f6283338f2abbd3f5cbdab6e67479c5986c49e0f11a
AUX jq-1.5-heap_buffer_overflow_in_tokenadd.patch 1241 SHA256 5069a8e81ece30279e8d525b4a590f5757dfb3d05f8c0a9bf212f37e75905fcc SHA512 7c0e7268a8715f9354322b81e82971fd6e6810206024fb59f55fdf319c1053fdd17ab4d2a78c8edc9ed1638339671419f4ea92cbb0f8ffbb34e5b521efb35718 WHIRLPOOL 16d961d05c95d17c3d87543fc60b6166b968356b25568a8b1d2a5b2cb43bfed37435342ff7a3b530527222835da88ba6c4ccfbc60e542c22eb93431db0473ebd
AUX jq-1.5-remove-automagic-dep-on-oniguruma.patch 1879 SHA256 d5b55b63332899e9eff705fbb32fb1d790e2c637ff3be2659c47ecf8b17bc6c2 SHA512 3c7efccf85beda5f80c66432f6950b2d885c4587e6ed3cdc66447f60440dc0287da834cc5744ddd7af8ad36677254ebae6969bc498d36e457dfac69ca0da3f6d WHIRLPOOL 903ce507584d94ac49eaaa33c414e9fdca1a7f9ebbf185038ccb232b78ac6c04d7782458b97db0e983037ff4ab63e3e1cdd8d164191b7b22c020930d25baf913
DIST jq-1.4.tar.gz 578317 SHA256 998c41babeb57b4304e65b4eb73094279b3ab1e63801b6b4bddd487ce009b39d SHA512 02e601b713a3249bcfe5373153dff38a63bf504895181ca3f691dbf033b407373a9c5880001bbd1954123cdf89f4fe75e2a5168e7a7cf13b3f7355dc18f92458 WHIRLPOOL 93c85a40d8aaf36d1f846ee9050aebe32a3a135e89a64647688b447af8733d210a4716d4ee62271a7d33f2e498e8aee7b2e88ed5373d0ec07e810215c1d288ab
DIST jq-1.5.tar.gz 739309 SHA256 c4d2bfec6436341113419debf479d833692cc5cdab7eb0326b5a4d4fbe9f493c SHA512 4a0bb069ae875f47731d7d84ae6b82240703dc7a694cfb0aee4c7e9639defe7ba9af575d17dc32bda4426b80c186cc8dcd4505f3a6bcbe16b39e9b13097da238 WHIRLPOOL ca45763fb43ba0bc4a97f1a6d34e3c5af0f25f2548d04646f76ac18e95792445eaa42869ce4a7a736b7d6bc09440225e277df79abacf23ef3c8f1b41170e2907
EBUILD jq-1.4-r1.ebuild 852 SHA256 2cd732ef8eb9e415cfd72665f9e12184f2dcf2972a10154d25190ec44a382b2e SHA512 45a066036354a0ef24a7956537a59c5f4c0139a709228939e2fe966326dba5eb23309a18c2cb52e0edbec4b065de01f588d23ba5980ecea1ad3b45af1d681c15 WHIRLPOOL 670bdb2dfb974ce1882ae1802a5053427a7ce2c5bc09877399ca3991d610887e4cbb27643081e462362defd93c41defa30c78a8be3f597c4c7013f0aee44cd62
EBUILD jq-1.4.ebuild 651 SHA256 43181180141fa4db04987979f289c505b73700e3e168c688ae1176902c1ab066 SHA512 4876194bc95a00060ad7d782ded2706c8e663f326a1189b81cf8f18d9f84921a233b3bf08b8ca1c17aa732a2a54d9358ca783a164050e617fc1a673d51b04184 WHIRLPOOL 239bafe801745cc496347025db5cec6950e73d6340433f93669fce2178a5e15e6a00d7887595b1e07984efb6374230a59af5a16596a78cf2c8effe54dbf5452a
EBUILD jq-1.5-r1.ebuild 1179 SHA256 b06ed59e186353dd2abf5d8b42d25ac412e50cf37b584ee3cdc16b27d8761713 SHA512 bb769a67a11413286d90e6ba36538d9e981b32e339b6af8a3c632cdc2ce5a0808180aeb5accde3e5057f9481b6a79e08e50d1daa679e661ba3e70b0ec71df5fd WHIRLPOOL 9fa21b8b5b09264b6bac82ccecbd34e2216617176f601c946581ae87959e2197b20db34a8acd841496fd775795886ee7f32b06c34457051ad768cb6d21d8d878
EBUILD jq-1.5-r2.ebuild 1303 SHA256 92a68cac012346e195f58da19f26340449b9928f1da8122a294d0942658e5b82 SHA512 326323e3adf59bd9767010bfde22a9ead50e901a805b703e961651f15985dd8e1b1e4362c36540e00327e3cdc8866a1aaf80414f566c5d1e8ded5bf940e53406 WHIRLPOOL 6feba9512f13b6448c5976f3c8ead7ab8eca4d44a18ea45784afccd8f518633e873f3851aa242e5aa8fc0c1549c7e571e66767cdc3e017ed5d7415810b400cd9
MISC ChangeLog 4369 SHA256 deec1974e3dcdfde4bde44455f9de1dafd176cbc46c352de75c3be4ff1812d6a SHA512 1b9a501fddc7ba3400fea9a09eecce8961a7ceb3e8b4eca33f9765f10d0b0f4a1c00643295435c7bb538532ac86add0c64cb8774264ee1e6ca9608553c622eb5 WHIRLPOOL a36a29d921ce4fd2c25fc02a725cd3014e58473b2a7ea2b731fd35c402c2653997146f6937f1c9bece0ee102e7c05813ddabcdde2571a3522f51c869ea7709d0
MISC ChangeLog-2015 2176 SHA256 2e4f02d2f3bd0d54f9eb8e19deebb0bc43a8a7bd523dd65a0391817de5d9afeb SHA512 b407b35544a94c67504a90635083d816147c27791c8ee745e8252dcb0da67950fdf248eb791a25b3275a259ad70ef7a475a8b24d14711cdfb6e943da34493769 WHIRLPOOL ffef34e807b2ad4af67959abd78088316d73db4f520ceb062b0c2cd5c3149bbc31acbf251ab0dfbef2d74305702ad2d995bb92cb12a13c4e0820162c0e298e08
MISC metadata.xml 347 SHA256 9ee404d621988a6d22c3726d75f9af3552a7e1d4675a78911e23b9910fa7696b SHA512 82b1311616fcfd74119bfe3e926bda3ac5f81cbbf5b6e81b277fc49edbf9e007cd625fa79d99dbd8e1ea31edadc5b5ccb80bcac9376730b37c0836c71d689e86 WHIRLPOOL 1ac47bc7ffd1f8c30a71ad364f0a7f4bb6dfd448526a876fba072e8cb6d213d1ec71b82d4a8955fa1f7f43334efceba07810255cc166bfe414b679b1300bda16
DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480

View File

@ -1,12 +0,0 @@
do not statically link libjq since we install it
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,7 +53,6 @@
bin_PROGRAMS = jq
jq_SOURCES = main.c
-jq_LDFLAGS = -static-libtool-libs
jq_LDADD = libjq.la -lm
### Tests (make check)

View File

@ -1,13 +0,0 @@
diff --git a/Makefile.am b/Makefile.am
index c3a771f..274c01e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,7 +84,7 @@ main.c: version.h
bin_PROGRAMS = jq
jq_SOURCES = main.c version.h
-jq_LDFLAGS = -static-libtool-libs
+jq_LDFLAGS =
jq_LDADD = libjq.la -lm
if ENABLE_ALL_STATIC

View File

@ -1,34 +0,0 @@
From 8eb1367ca44e772963e704a700ef72ae2e12babd Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@cryptonector.com>
Date: Sat, 24 Oct 2015 17:24:57 -0500
Subject: [PATCH] Heap buffer overflow in tokenadd() (fix #105)
This was an off-by one: the NUL terminator byte was not allocated on
resize. This was triggered by JSON-encoded numbers longer than 256
bytes.
---
src/jv_parse.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/jv_parse.c b/src/jv_parse.c
index 3102ed4..84245b8 100644
--- a/jv_parse.c
+++ b/jv_parse.c
@@ -383,7 +383,7 @@ static pfunc stream_token(struct jv_parser* p, char ch) {
static void tokenadd(struct jv_parser* p, char c) {
assert(p->tokenpos <= p->tokenlen);
- if (p->tokenpos == p->tokenlen) {
+ if (p->tokenpos >= (p->tokenlen - 1)) {
p->tokenlen = p->tokenlen*2 + 256;
p->tokenbuf = jv_mem_realloc(p->tokenbuf, p->tokenlen);
}
@@ -485,7 +485,7 @@ static pfunc check_literal(struct jv_parser* p) {
TRY(value(p, v));
} else {
// FIXME: better parser
- p->tokenbuf[p->tokenpos] = 0; // FIXME: invalid
+ p->tokenbuf[p->tokenpos] = 0;
char* end = 0;
double d = jvp_strtod(&p->dtoa, p->tokenbuf, &end);
if (end == 0 || *end != 0)

View File

@ -1,58 +0,0 @@
commit 18b4b18b41f5ed396d73449ce8d6ec408d95d6b2
Author: David Tolnay <dtolnay@gmail.com>
Date: Sat Nov 21 10:05:37 2015 -0800
Support --without-oniguruma
diff --git a/configure.ac b/configure.ac
index 9e2c8cf..7f6be34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,27 +52,26 @@ fi
AC_ARG_WITH([oniguruma],
[AS_HELP_STRING([--with-oniguruma=prefix],
[try this for a non-standard install prefix of the oniguruma library])],
- [ONIGURUMAPATHSET=1],
- [ONIGURUMAPATHSET=0])
-
-if test $ONIGURUMAPATHSET = 1; then
- CFLAGS="$CFLAGS -I${with_oniguruma}/include"
- LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib"
-fi
-
-# check for ONIGURUMA library
-HAVE_ONIGURUMA=0
-AC_CHECK_HEADER("oniguruma.h",
- AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; HAVE_ONIGURUMA=1;]))
-
-# handle check results
-if test $HAVE_ONIGURUMA != 1; then
- AC_MSG_NOTICE([Oniguruma was not found.])
- AC_MSG_NOTICE([ Try setting the location using '--with-oniguruma=PREFIX' ])
-else
- AC_DEFINE([HAVE_ONIGURUMA],1,[Define to 1 if Oniguruma is installed])
-fi
-
+ [],
+ [with_oniguruma=yes])
+
+AS_IF([test "x$with_oniguruma" != xno], [
+ AS_IF([test "x$with_oniguruma" != xyes], [
+ CFLAGS="$CFLAGS -I${with_oniguruma}/include"
+ LDFLAGS="$LDFLAGS -L${with_oniguruma}/lib"
+ ])
+ # check for ONIGURUMA library
+ have_oniguruma=0
+ AC_CHECK_HEADER("oniguruma.h",
+ AC_CHECK_LIB([onig],[onig_version],[LIBS="$LIBS -lonig"; have_oniguruma=1;]))
+ # handle check results
+ AS_IF([test $have_oniguruma = 1], [
+ AC_DEFINE([HAVE_ONIGURUMA], 1, [Define to 1 if Oniguruma is installed])
+ ], [
+ AC_MSG_NOTICE([Oniguruma was not found.])
+ AC_MSG_NOTICE([Try setting the location using '--with-oniguruma=PREFIX'])
+ ])
+])
dnl Check for valgrind
AC_CHECK_PROGS(valgrind_cmd, valgrind)

View File

@ -0,0 +1,27 @@
diff --git a/Makefile.am b/Makefile.am
index 6344b4e..86d968e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,7 +47,7 @@ AM_YFLAGS = --warnings=all -d
lib_LTLIBRARIES = libjq.la
libjq_la_SOURCES = ${LIBJQ_SRC}
-libjq_la_LIBADD = -lm
+libjq_la_LIBADD = -lm $(onig_LIBS)
libjq_la_LDFLAGS = $(onig_LDFLAGS) -export-symbols-regex '^j[qv]_' -version-info 1:4:0
if WIN32
diff --git a/configure.ac b/configure.ac
index 280694c..d96026e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,6 +249,9 @@ AS_IF([test "x$with_oniguruma" != xno], [
onig_CFLAGS="-I${with_oniguruma}/include"
onig_LDFLAGS="-L${with_oniguruma}/lib"
])
+ ], [
+ # with_oniguruma == yes
+ PKG_CHECK_MODULES([onig], [oniguruma])
])
AS_IF([test "x$build_oniguruma" = xno], [
# check for ONIGURUMA library, either in /usr or where requested

View File

@ -0,0 +1,17 @@
diff --git a/configure.ac b/configure.ac
index 280694c..7227c9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -280,4 +280,11 @@ AC_SUBST([BUNDLER], ["$bundle_cmd"])
AC_CONFIG_MACRO_DIR([config/m4])
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
-
+AC_ARG_ENABLE([rpathhack],
+ [AC_HELP_STRING([--enable-rpathhack], [patch libtool to remove RPATH])],
+ [
+AC_MSG_RESULT([patching libtool to fix rpath])
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+ ],
+ [])

View File

@ -0,0 +1,22 @@
From a1f1231a73c221155d539a281181ef37f874869d Mon Sep 17 00:00:00 2001
From: William Langford <wlangfor@gmail.com>
Date: Tue, 20 Nov 2018 09:58:25 -0500
Subject: [PATCH] Add missing jv_copy when printing with -ar
---
src/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main.c b/src/main.c
index b154689e..61ae43f9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -168,7 +168,7 @@ static int process(jq_state *jq, jv value, int flags, int dumpopts) {
while (jv_is_valid(result = jq_next(jq))) {
if ((options & RAW_OUTPUT) && jv_get_kind(result) == JV_KIND_STRING) {
if (options & ASCII_OUTPUT) {
- jv_dumpf(result, stdout, JV_PRINT_ASCII);
+ jv_dumpf(jv_copy(result), stdout, JV_PRINT_ASCII);
} else {
fwrite(jv_string_value(result), 1, jv_string_length_bytes(jv_copy(result)), stdout);
}

View File

@ -1,40 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit autotools eutils
DESCRIPTION="A lightweight and flexible command-line JSON processor"
HOMEPAGE="https://stedolan.github.com/jq/"
SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
LICENSE="MIT CC-BY-3.0"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x64-macos"
IUSE="static-libs test"
DEPEND="sys-devel/bison
sys-devel/flex
test? ( dev-util/valgrind )"
DOCS=( AUTHORS README )
src_prepare() {
sed -i '/^dist_doc_DATA/d' Makefile.am || die
epatch "${FILESDIR}"/${PN}-1.4-dynamic-link.patch
eautoreconf
}
src_configure() {
# don't try to rebuild docs
econf \
--disable-docs \
$(use_enable static-libs static)
}
src_install() {
default
use static-libs || find "${ED}" -name libjq.la -delete
}

View File

@ -1,32 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit autotools eutils
DESCRIPTION="A lightweight and flexible command-line JSON processor"
HOMEPAGE="https://stedolan.github.com/jq/"
SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
LICENSE="MIT CC-BY-3.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="test"
DEPEND="sys-devel/bison
sys-devel/flex
test? ( dev-util/valgrind )"
DOCS=( AUTHORS README )
src_prepare() {
sed -i '/^dist_doc_DATA/d' Makefile.am || die
eautoreconf
}
src_configure() {
# don't try to rebuild docs
econf --disable-docs
}

View File

@ -1,53 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
inherit autotools
DESCRIPTION="A lightweight and flexible command-line JSON processor"
HOMEPAGE="https://stedolan.github.com/jq/"
SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
LICENSE="MIT CC-BY-3.0"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~x64-macos"
IUSE="oniguruma static-libs test"
DEPEND=">=sys-devel/bison-3.0
sys-devel/flex
oniguruma? ( dev-libs/oniguruma[static-libs?] )
test? ( dev-util/valgrind )"
RDEPEND="!static-libs? (
oniguruma? ( dev-libs/oniguruma[static-libs?] )
)"
DOCS=( AUTHORS README )
PATCHES=(
"${FILESDIR}"/${PN}-1.5-dynamic-link.patch
"${FILESDIR}"/${P}-remove-automagic-dep-on-oniguruma.patch
)
src_prepare() {
sed -i '/^dist_doc_DATA/d' Makefile.am || die
sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \
configure.ac || die
default
eautoreconf
}
src_configure() {
# don't try to rebuild docs
econf \
--disable-docs \
$(use_enable static-libs static) \
$(use_with oniguruma)
}
src_install() {
default
use static-libs || find "${ED}" -name libjq.la -delete
}

View File

@ -1,60 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
inherit autotools eutils
DESCRIPTION="A lightweight and flexible command-line JSON processor"
HOMEPAGE="https://stedolan.github.com/jq/"
SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
LICENSE="MIT CC-BY-3.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
IUSE="oniguruma static-libs test"
DEPEND="
>=sys-devel/bison-3.0
sys-devel/flex
oniguruma? ( dev-libs/oniguruma[static-libs?] )
test? ( dev-util/valgrind )
"
RDEPEND="
!static-libs? (
oniguruma? ( dev-libs/oniguruma[static-libs?] )
)
"
src_prepare() {
local PATCHES=(
"${FILESDIR}"/${PN}-1.5-dynamic-link.patch
"${FILESDIR}"/${PN}-1.5-remove-automagic-dep-on-oniguruma.patch
"${FILESDIR}"/${PN}-1.5-heap_buffer_overflow_in_tokenadd.patch
)
sed -i '/^dist_doc_DATA/d' Makefile.am || die
sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \
configure.ac || die
default
eautoreconf
}
src_configure() {
local econfargs=(
# don't try to rebuild docs
--disable-docs
$(use_enable static-libs static)
$(use_with oniguruma)
)
econf "${econfargs[@]}"
}
src_install() {
local DOCS=( AUTHORS README )
default
use static-libs || prune_libtool_files
}

View File

@ -0,0 +1,78 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools
DESCRIPTION="A lightweight and flexible command-line JSON processor"
HOMEPAGE="https://stedolan.github.io/jq/"
SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz"
LICENSE="MIT CC-BY-3.0"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
IUSE="oniguruma static-libs"
ONIGURUMA_MINPV='>=dev-libs/oniguruma-6.1.3' # Keep this in sync with bundled modules/oniguruma/
DEPEND="
>=sys-devel/bison-3.0
sys-devel/flex
oniguruma? ( ${ONIGURUMA_MINPV}:=[static-libs?] )
"
RDEPEND="
!static-libs? (
oniguruma? ( ${ONIGURUMA_MINPV}[static-libs?] )
)
"
src_prepare() {
local PATCHES=(
"${FILESDIR}"/jq-1.6-r3-never-bundle-oniguruma.patch
"${FILESDIR}"/jq-1.6-runpath.patch
"${FILESDIR}"/jq-1.6-segfault-fix.patch
)
use oniguruma || { sed -i 's:tests/onigtest::' Makefile.am || die; }
sed -i '/^dist_doc_DATA/d' Makefile.am || die
sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \
configure.ac || die
# jq-1.6-r3-never-bundle-oniguruma makes sure we build with the system oniguruma,
# but the bundled copy of oniguruma still gets eautoreconf'd since it
# exists; save the cycles by nuking it.
sed -i -e '/modules\/oniguruma/d' Makefile.am || die
rm -rf "${S}"/modules/oniguruma || die
default
eautoreconf
}
src_configure() {
local econfargs=(
# don't try to rebuild docs
--disable-docs
--disable-valgrind
--disable-maintainer-mode
--enable-rpathhack
$(use_enable static-libs static)
$(use_with oniguruma oniguruma yes)
)
econf "${econfargs[@]}"
}
src_test() {
if ! emake check; then
if [[ -r test-suite.log ]]; then
eerror "Tests failed, outputting testsuite log"
cat test-suite.log
fi
die "Tests failed"
fi
}
src_install() {
local DOCS=( AUTHORS README.md )
default
use static-libs || { find "${D}" -name '*.la' -delete || die; }
}

View File

@ -1,11 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>radhermit@gentoo.org</email>
<name>Tim Harder</name>
<email>vpayno+gentoo@gmail.com</email>
<name>Victor Payno</name>
</maintainer>
<maintainer type="person">
<email>chutzpah@gentoo.org</email>
<name>Patrick McLean</name>
</maintainer>
<use>
<flag name="oniguruma">Use dev-libs/oniguruma for regular expression support</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:jq_project:jq</remote-id>
<remote-id type="github">stedolan/jq</remote-id>
</upstream>
</pkgmetadata>

View File

@ -1,7 +1 @@
DIST libbsd-0.8.2.tar.xz 344292 SHA256 b2f644cae94a6e2fe109449c20ad79a0f6ee4faec2205b07eefa0020565e250a SHA512 2230d51a30a0c3a8518c7e325036d2b578c8c2b47525c2d0d5f530d28d82227ad48b50341e44521db21f99208fe7c0df7313254c90e3c92da1c8664a8cbb87c5 WHIRLPOOL 4f9b09aaa7c0775cd46bf0aaaba9e9a7f07040262739002bf3966aace3bb4d782f96b176e2c489e7d7cbc0840eecc463a414dee1b5c92414c9a821796d739290
DIST libbsd-0.8.3.tar.xz 356772 SHA256 934b634f4dfd865b6482650b8f522c70ae65c463529de8be907b53c89c3a34a8 SHA512 155b895d6bd62b180718d65a2cda7484946c492d52735a57b51005705dfe4528b6a72e8745acea47b01fe68e3bbbe3c036c5e9998a8d06fc79efe2b96a04767f WHIRLPOOL ab74a85813ea3308e7e4c53b7a46f4b93e4dff4d091964a6347f9960729e8eb4c8a2a0866938de508caf47caf9371f14499fcb0cc4aa30da06f501f4ccad9ef2
EBUILD libbsd-0.8.2.ebuild 1132 SHA256 618e140f483caa72a82bb16deb20b759388391c3864869af4cb9327cee1ce5ae SHA512 d141cfda78fd38481e3a5762b4fb1a5277b5350410f5f2ff6f1d4f56298a6c2380ca0acb1e663844cf74ac1117d3ce6844666e61677c90f3ed183e8945caa496 WHIRLPOOL c1eda192db31912cb8dc044a11838990d55875d6c3839fda82979914e3d4016b6ec12cbe4775be88b5e9f0daf6e17dbca4dd4dbf394f2f471f3d67e29250cdaa
EBUILD libbsd-0.8.3.ebuild 1156 SHA256 eaf618183e644aed3dca0a984fab324221c24f59653e94178e0a5953f4e1a72e SHA512 58344f547ce2e835a9f01c44c31f364f162a1ecfbb54a5b056996e9f4b6abce777d7699b6224a5b0642d4d9b12545d269418129acc7c7b392ff03d9ea3287f40 WHIRLPOOL fbb1e220ee3a1fe14d108a87a921edd58de2b8aeb7a9a87eb598b3f38c7fada2fc45968a266f1f3b05fc54336a933a9ca742933e495958bceebf26c8a3985bcf
MISC ChangeLog 7698 SHA256 ae39c8bfa8f2187cca3990233237765badabd0a138713cc884cdbb35232eb4cc SHA512 2415558c65f54d09e052fd883fb677156dbfdaa12be73ec67b97a3d38713cb92476b72bd1f37e43d84b78d2887ac5ff997f256566130c26f2112093861bb8be7 WHIRLPOOL 805fc806935b6b134a23aa60e88b970391eddc4400c58c0788165caf1678e3ae5bf20fe32a40dd93367577ee1cf750c0ce46fc37c4bcab0cf42108f656841bd6
MISC ChangeLog-2015 5236 SHA256 5e8fd6dffc9bb76f2734a6da36bbf00792171f4167bfdb89419e08709ac4ec7d SHA512 dd4eae1cdfb9ab4eadf5ff529d291baa237612be9ea47794fefc7d86246172ef164c2bb65add1786acf651b89082ce5520aa5a0c1fd09fc70d65fba369d6bc41 WHIRLPOOL eda53a135a82ecfe31e32b9a6d03be9261f0ac14f4a1773494c2d7231de826bbaf7d4061f6827999ad79118c690bfd47d5983c7b9fb80c2a8795bfe061eeabc5
MISC metadata.xml 276 SHA256 6bb81cdb026b199d78fb2a2327320a915a3bd241a9300bb069bd9c998521f613 SHA512 673180ba375ea401c0a8f197d516417b3f9361b11943c71bac88b0d0b1407b0bc657f5763c6fb6e429cc6ee112869a2247083fe56743e9ce918855c0ea929e59 WHIRLPOOL d494386e01171fe51879cf968a6cebca04c22477f3b8a52bfdd17b9ee06afd99c3979396f7abf40bee698d6fbb060e2f37e083cb3ed010c018d84211a2bc7cd0
DIST libbsd-0.10.0.tar.xz 393576 BLAKE2B 66005a511dae7fb799322c813b8ea058ab460e3b9044756d6efad5de741d8f70270496f09803bbce8cd0000ff37e998f18e092037c850826c3c8e3f47ddfdb28 SHA512 b75529785b16c93d31401187f8a58258fbebe565dac071c8311775c913af989f62cd29d5ce2651af3ea6221cffd31cf04826577d3e546ab9ca14340f297777b9

View File

@ -1,16 +1,16 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils multilib-minimal
EAPI=7
inherit multilib-minimal
DESCRIPTION="An library to provide useful functions commonly found on BSD systems"
HOMEPAGE="https://libbsd.freedesktop.org/wiki/"
HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
LICENSE="BSD BSD-2 BSD-4 ISC"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs"
DEPEND=">=sys-kernel/linux-headers-3.17"
@ -30,11 +30,11 @@ pkg_setup() {
multilib_src_configure() {
# The build system will install libbsd-ctor.a despite of USE="-static-libs"
# which is correct, see:
# https://cgit.freedesktop.org/libbsd/commit/?id=c5b959028734ca2281250c85773d9b5e1d259bc8
# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
}
multilib_src_install() {
emake DESTDIR="${D}" install
prune_libtool_files
find "${ED}" -type f -name "*.la" -delete || die
}

View File

@ -1,40 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils multilib-minimal
DESCRIPTION="An library to provide useful functions commonly found on BSD systems"
HOMEPAGE="https://libbsd.freedesktop.org/wiki/"
SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
LICENSE="BSD BSD-2 BSD-4 ISC"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
IUSE="static-libs"
DEPEND=">=sys-kernel/linux-headers-3.17"
RDEPEND=""
pkg_setup() {
local f="${ROOT}/usr/$(get_libdir)/${PN}.a"
local m="You need to remove ${f} by hand or re-emerge sys-libs/glibc first."
if ! has_version ${CATEGORY}/${PN}; then
if [[ -e ${f} ]]; then
eerror "${m}"
die "${m}"
fi
fi
}
multilib_src_configure() {
# The build system will install libbsd-ctor.a despite of USE="-static-libs"
# which is correct, see:
# https://cgit.freedesktop.org/libbsd/commit/?id=c5b959028734ca2281250c85773d9b5e1d259bc8
ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
}
multilib_src_install() {
emake DESTDIR="${D}" install
prune_libtool_files
}

View File

@ -5,4 +5,7 @@
<email>freedesktop-bugs@gentoo.org</email>
<name>Gentoo Freedesktop Project</name>
</maintainer>
<upstream>
<remote-id type="cpe">cpe:/a:libbsd:libbsd</remote-id>
</upstream>
</pkgmetadata>

View File

@ -1,3 +1,2 @@
DIST tcpdump-4.9.0.tar.gz 1260309 SHA256 eae98121cbb1c9adbedd9a777bf2eae9fa1c1c676424a54740311c8abcee5a5e SHA512 e98d73ae706d42e96b4069e196cf17af892eb97935664eebd08779b55b4da858bc1732d714efd16924f862aad0ba5550ceb2213c68414ed48907c46456c9fc82 WHIRLPOOL bd2284919bd3a2af166c6e05254e6fb7fa757b76f269d1a4951fe0ccfb6ad282a50f5670d3f8a38f6bffd1834bc809effd2e8575f9f0dd2fd7eaa4b4fdce5552
DIST tcpdump-4.9.1.tar.gz 1192832 SHA256 4d1a69eab083d5df91effb805024abd4406e8a592e98558ed8722ef160c58119 SHA512 82ff20ece4c197f4b0142e45227310dc513facc9668c1423cb402eb2b62a18909a172c432ee6b20c012c172d47752ef65e2747f9d93d335073ea0ce3c007f5c9 WHIRLPOOL ed59af89e0c67477db3f10bd2d8c2b9b2dc2b3c7e3906abe37b0eba5024084e93afa98b39690c1c3af94cc6a0955023ee01ccfc5547a454dafe952957807295f
DIST tcpdump-4.9.2.tar.gz 2298386 SHA256 798b3536a29832ce0cbb07fafb1ce5097c95e308a6f592d14052e1ef1505fe79 SHA512 e1bc19a5867d6e3628f3941bdf3ec831bf13784f1233ca1bccc46aac1702f47ee9357d7ff0ca62cddf211b3c8884488c21144cabddd92c861e32398cd8f7c44b WHIRLPOOL 6652a5bb83a082bc8df050610ed640f0119fb846f2938a5148be3008506548e73c3c6437a62752eafdd00910c35b2b5decfd21c207719d156fb7dc8ca9e3443a
DIST tcpdump-4.10.0rc1.tar.gz 1823212 BLAKE2B aa274e548163eacb09a98edbaa1127dbb06b6fe2f6eb23ffa968a577081d9d9323c339a885a198ee08d7dced04302cf50301ca575fbe95e082a6ed89e115de05 SHA512 b226ca569eeda7cee45fc7a1e42766f404d55ebca8133da544ecd75f975701532346f0cfdbefd4fc708fca12a8d094790c99a7276bd9b563885ef036a3912493
DIST tcpdump-4.9.3.tar.gz 2333119 BLAKE2B 21e13fc40d98cfac0bbd5513580cf98313df1f8fea24c48f045f70d494aea3e75230b8481049660c109f9179015c3164f3e3b31acc76c0bfb1f2da5039f1834e SHA512 3aec673f78b996a4df884b1240e5d0a26a2ca81ee7aca8a2e6d50255bb53476e008a5ced4409e278a956710d8a4d31d85bbb800c9f1aab92b0b1046b59292a22

View File

@ -0,0 +1,19 @@
--- a/configure.ac
+++ b/configure.ac
@@ -371,7 +371,7 @@
if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
if test -d $ipv6libdir -a -f $ipv6libdir/lib$ipv6lib.a; then
- LIBS="-L$ipv6libdir -l$ipv6lib $LIBS"
+ LIBS="-l$ipv6lib $LIBS"
echo "You have $ipv6lib library, using it"
else
if test "$ipv6trylibc" = "yes"; then
@@ -891,7 +891,6 @@
# at the front of the header and library search path.
#
CFLAGS="-I$withval/include $CFLAGS"
- LIBS="-L$withval/lib $LIBS"
fi
],[
#

View File

@ -10,6 +10,7 @@
<flag name="drop-root">Drop privileges to tcpdump:tcpdump when run as root</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:tcpdump:tcpdump</remote-id>
<remote-id type="github">the-tcpdump-group/tcpdump</remote-id>
</upstream>
</pkgmetadata>

View File

@ -1,45 +1,48 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils flag-o-matic toolchain-funcs user
EAPI=7
inherit autotools user
DESCRIPTION="A Tool for network monitoring and data acquisition"
EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
HOMEPAGE="
http://www.tcpdump.org/
${EGIT_REPO_URI}
https://www.tcpdump.org/
https://github.com/the-tcpdump-group/tcpdump
"
LICENSE="BSD"
SRC_URI="
https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz
"
LICENSE="BSD"
SLOT="0"
IUSE="+drop-root libressl smi ssl samba suid test"
if [[ ${PV} == "9999" ]] ; then
inherit git-r3
KEYWORDS=""
else
#SRC_URI="https://github.com/the-${PN}-group/${PN}/archive/${P}.tar.gz"
SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.gz"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
fi
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="+drop-root libressl +smi +ssl +samba suid test"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( samba )"
RDEPEND="
drop-root? ( sys-libs/libcap-ng )
net-libs/libpcap
drop-root? ( sys-libs/libcap-ng )
smi? ( net-libs/libsmi )
ssl? (
!libressl? ( >=dev-libs/openssl-0.9.6m:0 )
libressl? ( dev-libs/libressl )
!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
libressl? ( dev-libs/libressl:= )
)
"
BDEPEND="
drop-root? ( virtual/pkgconfig )
"
DEPEND="
${RDEPEND}
drop-root? ( virtual/pkgconfig )
test? (
|| ( app-arch/sharutils sys-freebsd/freebsd-ubin )
>=net-libs/libpcap-1.9.1
dev-lang/perl
)
"
PATCHES=(
"${FILESDIR}"/${PN}-9999-libdir.patch
)
S=${WORKDIR}/${PN}-${P/_}
pkg_setup() {
if use drop-root || use suid; then
@ -48,30 +51,24 @@ pkg_setup() {
fi
}
src_prepare() {
default
eautoreconf
}
src_configure() {
# tcpdump needs some optimization. see bug #108391
# but do not replace -Os
filter-flags -O[0-9]
has -O? ${CFLAGS} || append-cflags -O2
filter-flags -finline-functions
if use drop-root; then
append-cppflags -DHAVE_CAP_NG_H
export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
fi
econf \
$(use_enable samba smb) \
$(use_with drop-root cap-ng) \
$(use_with drop-root chroot '') \
$(use_with smi) \
$(use_with ssl crypto "${EPREFIX}/usr") \
$(use_with ssl crypto "${ESYSROOT}/usr") \
$(usex drop-root "--with-user=tcpdump" "")
}
src_test() {
if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
sed -i -e '/^\(espudp1\|eapon1\)/d;' tests/TESTLIST || die
emake check
else
ewarn "If you want to run the test suite, make sure you either"

View File

@ -1,41 +1,43 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit flag-o-matic toolchain-funcs user
EAPI=7
inherit autotools user
DESCRIPTION="A Tool for network monitoring and data acquisition"
HOMEPAGE="
http://www.tcpdump.org/
https://www.tcpdump.org/
https://github.com/the-tcpdump-group/tcpdump
"
SRC_URI="
https://dev.gentoo.org/~jer/${P}.tar.gz
https://www.tcpdump.org/release/${P}.tar.gz
"
# https://github.com/the-${PN}-group/${PN}/archive/${P}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="+drop-root libressl smi ssl samba suid test"
RESTRICT="!test? ( test )"
RDEPEND="
drop-root? ( sys-libs/libcap-ng )
net-libs/libpcap
drop-root? ( sys-libs/libcap-ng )
smi? ( net-libs/libsmi )
ssl? (
!libressl? ( >=dev-libs/openssl-0.9.6m:0 )
libressl? ( dev-libs/libressl )
!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
libressl? ( dev-libs/libressl:= )
)
"
DEPEND="
${RDEPEND}
drop-root? ( virtual/pkgconfig )
test? (
|| ( app-arch/sharutils sys-freebsd/freebsd-ubin )
>=net-libs/libpcap-1.9.1
dev-lang/perl
)
"
PATCHES=(
"${FILESDIR}"/${PN}-9999-libdir.patch
)
pkg_setup() {
if use drop-root || use suid; then
@ -44,23 +46,23 @@ pkg_setup() {
fi
}
src_configure() {
if use drop-root; then
append-cppflags -DHAVE_CAP_NG_H
export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
fi
src_prepare() {
default
eautoreconf
}
src_configure() {
econf \
$(use_enable samba smb) \
$(use_with drop-root cap-ng) \
$(use_with drop-root chroot '') \
$(use_with smi) \
$(use_with ssl crypto "${EPREFIX}/usr") \
$(use_with ssl crypto "${ESYSROOT}/usr") \
$(usex drop-root "--with-user=tcpdump" "")
}
src_test() {
if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
sed -i -e '/^\(espudp1\|eapon1\)/d;' tests/TESTLIST || die
emake check
else
ewarn "If you want to run the test suite, make sure you either"

View File

@ -1,41 +1,42 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=7
inherit flag-o-matic toolchain-funcs user
DESCRIPTION="A Tool for network monitoring and data acquisition"
HOMEPAGE="
http://www.tcpdump.org/
https://www.tcpdump.org/
https://github.com/the-tcpdump-group/tcpdump
"
SRC_URI="
https://github.com/the-${PN}-group/${PN}/archive/${P}.tar.gz
https://www.tcpdump.org/release/${P}.tar.gz
"
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
IUSE="+drop-root libressl smi ssl samba suid test"
RESTRICT="!test? ( test )"
RDEPEND="
drop-root? ( sys-libs/libcap-ng )
net-libs/libpcap
smi? ( net-libs/libsmi )
ssl? (
!libressl? ( >=dev-libs/openssl-0.9.6m:0 )
libressl? ( dev-libs/libressl )
!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
libressl? ( dev-libs/libressl:= )
)
"
DEPEND="
${RDEPEND}
drop-root? ( virtual/pkgconfig )
test? (
|| ( app-arch/sharutils sys-freebsd/freebsd-ubin )
>=net-libs/libpcap-1.9.1
dev-lang/perl
app-arch/sharutils
)
"
S=${WORKDIR}/${PN}-${P}
pkg_setup() {
if use drop-root || use suid; then
@ -54,13 +55,12 @@ src_configure() {
$(use_enable samba smb) \
$(use_with drop-root chroot '') \
$(use_with smi) \
$(use_with ssl crypto "${EPREFIX}/usr") \
$(use_with ssl crypto "${ESYSROOT}/usr") \
$(usex drop-root "--with-user=tcpdump" "")
}
src_test() {
if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
sed -i -e '/^\(espudp1\|eapon1\)/d;' tests/TESTLIST || die
emake check
else
ewarn "If you want to run the test suite, make sure you either"

View File

@ -1,44 +1,45 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils flag-o-matic toolchain-funcs user
EAPI=7
inherit autotools git-r3 user
DESCRIPTION="A Tool for network monitoring and data acquisition"
EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
HOMEPAGE="
http://www.tcpdump.org/
${EGIT_REPO_URI}
https://www.tcpdump.org/
https://github.com/the-tcpdump-group/tcpdump
"
LICENSE="BSD"
EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
SLOT="0"
IUSE="+drop-root libressl smi ssl samba suid test"
if [[ ${PV} == "9999" ]] ; then
inherit git-r3
KEYWORDS=""
else
SRC_URI="https://github.com/the-${PN}-group/${PN}/archive/${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
fi
IUSE="+drop-root libressl +smi +ssl +samba suid test"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( samba )"
RDEPEND="
drop-root? ( sys-libs/libcap-ng )
net-libs/libpcap
drop-root? ( sys-libs/libcap-ng )
smi? ( net-libs/libsmi )
ssl? (
!libressl? ( >=dev-libs/openssl-0.9.6m:0 )
libressl? ( dev-libs/libressl )
!libressl? ( >=dev-libs/openssl-0.9.6m:0= )
libressl? ( dev-libs/libressl:= )
)
"
BDEPEND="
drop-root? ( virtual/pkgconfig )
"
DEPEND="
${RDEPEND}
drop-root? ( virtual/pkgconfig )
test? (
|| ( app-arch/sharutils sys-freebsd/freebsd-ubin )
>=net-libs/libpcap-1.9.1
dev-lang/perl
)
"
PATCHES=(
"${FILESDIR}"/${PN}-9999-libdir.patch
)
pkg_setup() {
if use drop-root || use suid; then
@ -47,30 +48,24 @@ pkg_setup() {
fi
}
src_prepare() {
default
eautoreconf
}
src_configure() {
# tcpdump needs some optimization. see bug #108391
# but do not replace -Os
filter-flags -O[0-9]
has -O? ${CFLAGS} || append-cflags -O2
filter-flags -finline-functions
if use drop-root; then
append-cppflags -DHAVE_CAP_NG_H
export LIBS=$( $(tc-getPKG_CONFIG) --libs libcap-ng )
fi
econf \
$(use_enable samba smb) \
$(use_with drop-root cap-ng) \
$(use_with drop-root chroot '') \
$(use_with smi) \
$(use_with ssl crypto "${EPREFIX}/usr") \
$(use_with ssl crypto "${ESYSROOT}/usr") \
$(usex drop-root "--with-user=tcpdump" "")
}
src_test() {
if [[ ${EUID} -ne 0 ]] || ! use drop-root; then
sed -i -e '/^\(espudp1\|eapon1\)/d;' tests/TESTLIST || die
emake check
else
ewarn "If you want to run the test suite, make sure you either"

View File

@ -1 +1,2 @@
DIST libpcap-1.8.1.tar.gz 753405 BLAKE2B f80fbd6451cf788fc43e5f2240e5ecb267ac98b57bca3fa56dd63576b57d10966bfacde5005d07282352fc2b30d8ef5964cbd126f8f63e565f1bb3dc6f8d9a1c SHA512 7e6a7351bb4213e1c3dd95ef7a460e91f733d933e39ba518ad8ba6d2f86b6e7cfa50ae667c8dc1300ef47bf8693ac8a1f18e068f41175ca5d0147a0b72278882
DIST libpcap-1.10.0-bp.tar.gz 911001 BLAKE2B bbcb1f48c5cbe8bfc46003cbf7c691e0b3a2051e319aa3ec761de045ac11bbacafe1a06b52c4cd332eb85e598a0a1ff5403ae7c3a611cc0cdd2eeab859587487 SHA512 c3d6047192ab1521687d856f2a954a38bfd8d42aedb853559a698ed3c24bfe5698efb6f81c0280b696229165c1088a58471e8d62f071343fcb14b1464f65fe3f
DIST libpcap-1.9.1.tar.gz 849407 BLAKE2B 700d8b3d25c036033c4f9b652cec6a30d4a45aa418c2ec45698018b3d3fe8d0a61f6759f5734e2c7ff9a8f42cce65fbd8b3e1b1efd44776e53674fbc609da59d SHA512 9ab9da20194e0dfb105daa28c8841118118f5a7f68b5e30e31da6c56eec91430c8ee481f1f9d20aec4d33d7ee9e6fb0b5e08a90a8d7e5ace8e6210e29e7eab0f

View File

@ -0,0 +1,14 @@
--- a/configure.ac
+++ b/configure.ac
@@ -2225,10 +2225,7 @@
AC_DEFINE(PCAP_SUPPORT_LINUX_USBMON, 1, [target host supports Linux usbmon for USB sniffing])
MODULE_C_SRC="$MODULE_C_SRC pcap-usb-linux.c"
AC_MSG_RESULT(yes)
- ac_usb_dev_name=`udevinfo -q name -p /sys/class/usb_device/usbmon 2>/dev/null`
- if test $? -ne 0 ; then
- ac_usb_dev_name="usbmon"
- fi
+ ac_usb_dev_name="usbmon"
AC_DEFINE_UNQUOTED(LINUX_USB_MON_DEV, "/dev/$ac_usb_dev_name", [path for device for USB sniffing])
AC_MSG_NOTICE(Device for USB sniffing is /dev/$ac_usb_dev_name)
#

View File

@ -1,35 +0,0 @@
Prefix' Solaris uses GNU ld
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -415,7 +415,7 @@
aix*)
;;
- freebsd*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
+ freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*|osf*)
#
# Platforms where the linker is the GNU linker
# or accepts command-line arguments like
@@ -429,10 +429,10 @@
PIC_OPT=-fpic
case "$host_cpu" in
- sparc64*)
+ sparc64*|sparcv9*)
case "$host_os" in
- freebsd*|openbsd*)
+ freebsd*|solaris*|openbsd*)
PIC_OPT=-fPIC
;;
esac
@@ -497,7 +497,7 @@
V_SHLIB_OPT="-G -bnoentry -bexpall"
;;
- freebsd*|netbsd*|openbsd*|dragonfly*|linux*)
+ freebsd*|solaris*|netbsd*|openbsd*|dragonfly*|linux*)
#
# "cc" is GCC.
#

View File

@ -1,16 +0,0 @@
--- a/configure.ac
+++ b/configure.ac
@@ -291,7 +291,12 @@
dnl XXX This could be done for cross-compiling, but for now it's not.
dnl
if test -z "$with_pcap" && test "$cross_compiling" = yes; then
- AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...)
+ if test -z "$with_pcap" ; then
+ case $host in
+ *-linux*) with_pcap="linux";;
+ *) AC_MSG_ERROR(pcap type not determined when cross-compiling; use --with-pcap=...);;
+ esac
+ fi
fi
AC_ARG_WITH(pcap,
AC_HELP_STRING([--with-pcap=TYPE],[use packet capture TYPE]))

View File

@ -1,15 +0,0 @@
Prefix' Darwin systems are single arch, hijack Darwin7 case which assumes this setup
Check for bluetooth/mgmt.h before use
--- a/configure.ac
+++ b/configure.ac
@@ -1117,7 +1117,7 @@
if test "$enable_universal" != "no"; then
case "$host_os" in
- darwin[0-7].*)
+ darwin**)
#
# Pre-Tiger. Build only for 32-bit PowerPC; no
# need for any special compiler or linker flags.

View File

@ -1,31 +0,0 @@
This patch was taken directly from debian: https://packages.debian.org/source/stretch/libpcap
Disable bits of remote capture support inherited from the WinPCAP merge
which cause applications to FTBFS if they define HAVE_REMOTE (#843384).
--- a/pcap/pcap.h
+++ b/pcap/pcap.h
@@ -506,6 +506,11 @@
#define MODE_STAT 1
#define MODE_MON 2
+#ifdef HAVE_REMOTE
+ /* Includes most of the public stuff that is needed for the remote capture */
+ #include <remote-ext.h>
+#endif /* HAVE_REMOTE */
+
#elif defined(MSDOS)
/*
@@ -526,11 +531,6 @@
#endif /* _WIN32/MSDOS/UN*X */
-#ifdef HAVE_REMOTE
- /* Includes most of the public stuff that is needed for the remote capture */
- #include <remote-ext.h>
-#endif /* HAVE_REMOTE */
-
#ifdef __cplusplus
}
#endif

View File

@ -1,22 +0,0 @@
--- a/configure.ac
+++ b/configure.ac
@@ -453,10 +453,6 @@
incdir=-I/usr/include/libnl3
libnldir=
- if test x$withval != x ; then
- libnldir=-L${withval}/lib/.libs
- incdir=-I${withval}/include
- fi
#
# Try libnl 3.x first.
@@ -471,7 +467,7 @@
AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x])
AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE])
AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api])
- V_INCLS="$V_INCLS ${incdir}"
+ V_INCLS="${incdir} $V_INCLS"
have_any_nl="yes"
],[], ${incdir} ${libnldir} -lnl-genl-3 -lnl-3 )

View File

@ -0,0 +1,36 @@
--- a/pcap-config.in
+++ b/pcap-config.in
@@ -59,13 +59,13 @@
#
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
then
- echo "-I$includedir -L$libdir -lpcap $LIBS"
+ echo "-L$libdir -lpcap $LIBS"
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
then
- echo "-I$includedir -L$libdir $LIBS"
+ echo "-L$libdir $LIBS"
elif [ "$show_cflags" = 1 ]
then
- echo "-I$includedir"
+ echo ""
elif [ "$show_libs" = 1 ]
then
echo "-L$libdir -lpcap $LIBS"
@@ -80,13 +80,13 @@
#
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
then
- echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME"
+ echo "-L$libdir $RPATH -l$PACKAGE_NAME"
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
then
- echo "-I$includedir"
+ echo ""
elif [ "$show_cflags" = 1 ]
then
- echo "-I$includedir"
+ echo ""
elif [ "$show_libs" = 1 ]
then
echo "-L$libdir $RPATH -l$PACKAGE_NAME"

View File

@ -0,0 +1,43 @@
--- a/pcap-config.in
+++ b/pcap-config.in
@@ -59,16 +59,16 @@
#
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
then
- echo "-I$includedir -L$libdir -lpcap $LIBS"
+ echo "-lpcap $LIBS"
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
then
- echo "-I$includedir -L$libdir $LIBS"
+ echo "$LIBS"
elif [ "$show_cflags" = 1 ]
then
- echo "-I$includedir"
+ echo ""
elif [ "$show_libs" = 1 ]
then
- echo "-L$libdir -lpcap $LIBS"
+ echo "-lpcap $LIBS"
elif [ "$show_additional_libs" = 1 ]
then
echo "$LIBS"
@@ -80,15 +80,15 @@
#
if [ "$show_cflags" = 1 -a "$show_libs" = 1 ]
then
- echo "-I$includedir -L$libdir $RPATH -l$PACKAGE_NAME"
+ echo " $RPATH -l$PACKAGE_NAME"
elif [ "$show_cflags" = 1 -a "$show_additional_libs" = 1 ]
then
- echo "-I$includedir"
+ echo ""
elif [ "$show_cflags" = 1 ]
then
- echo "-I$includedir"
+ echo ""
elif [ "$show_libs" = 1 ]
then
- echo "-L$libdir $RPATH -l$PACKAGE_NAME"
+ echo "$RPATH -l$PACKAGE_NAME"
fi
fi

View File

@ -1,22 +0,0 @@
From 0dd90a6bdbce4dca14106859eee63ef643a106e2 Mon Sep 17 00:00:00 2001
From: Alfredo Alvarez Fernandez <alfredoalvarezernandez@gmail.com>
Date: Tue, 21 Feb 2017 11:41:43 +0100
Subject: [PATCH] Makefile.in: Fix missing dependency
---
Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in
index 7044f0438..f5d443aed 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -465,7 +465,7 @@ grammar.h: grammar.c
$(MAKE) $(MAKEFLAGS) grammar.c; \
fi
-grammar.o: grammar.c
+grammar.o: grammar.c scanner.h
$(CC) $(FULL_CFLAGS) -c grammar.c
gencode.o: $(srcdir)/gencode.c grammar.h scanner.h

View File

@ -1,13 +1,12 @@
Prefix' Darwin systems are single arch, hijack Darwin7 case which assumes this setup
Check for bluetooth/mgmt.h before use
--- a/configure.ac
+++ b/configure.ac
@@ -1271,7 +1267,7 @@
@@ -1860,7 +1860,7 @@
if test "$enable_universal" != "no"; then
case "$host_os" in
- darwin[0-7].*)
- darwin[[0-7]].*)
+ darwin**)
#
# Pre-Tiger. Build only for 32-bit PowerPC; no

View File

@ -1,53 +1,52 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools multilib-minimal ltprune
EAPI=7
inherit autotools multilib-minimal
DESCRIPTION="A system-independent library for user-level network packet capture"
HOMEPAGE="
http://www.tcpdump.org/
https://www.tcpdump.org/
https://github.com/the-tcpdump-group/libpcap
"
SRC_URI="
https://github.com/the-tcpdump-group/${PN}/archive/${P}.tar.gz
https://github.com/the-tcpdump-group/${PN}/archive/${P/_pre/-bp}.tar.gz
"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="bluetooth dbus netlink static-libs usb"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
RDEPEND="
bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
rdma? ( sys-cluster/rdma-core )
usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
"
DEPEND="
${RDEPEND}
"
BDEPEND="
sys-devel/flex
virtual/yacc
dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
dbus? ( virtual/pkgconfig )
"
S=${WORKDIR}/${PN}-${P}
S=${WORKDIR}/${PN}-${P/_pre/-bp}
PATCHES=(
"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
"${FILESDIR}"/${PN}-1.8.1-cross-compile.patch
"${FILESDIR}"/${PN}-1.8.1-darwin.patch
"${FILESDIR}"/${PN}-1.8.1-libnl.patch
"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
"${FILESDIR}"/${PN}-1.8.1-disable-remote.patch
"${FILESDIR}"/${PN}-9999-parallel.patch
"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
"${FILESDIR}"/${PN}-1.10.0-usbmon.patch
)
src_prepare() {
default
eapply_user
if ! [[ -f VERSION ]]; then
echo ${PV} > VERSION || die
fi
eautoreconf
}
@ -56,8 +55,11 @@ multilib_src_configure() {
ECONF_SOURCE="${S}" \
econf \
$(use_enable bluetooth) \
$(use_enable usb) \
$(use_enable dbus) \
$(use_enable rdma) \
$(use_enable remote) \
$(use_enable usb) \
$(use_enable yydebug) \
$(use_with netlink libnl) \
--enable-ipv6
}
@ -67,13 +69,14 @@ multilib_src_compile() {
}
multilib_src_install_all() {
dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
# remove static libraries (--disable-static does not work)
if ! use static-libs; then
find "${ED}" -name '*.a' -exec rm {} + || die
fi
prune_libtool_files
find "${ED}" -name '*.la' -delete || die
# We need this to build pppd on G/FBSD systems
if [[ "${USERLAND}" == "BSD" ]]; then

View File

@ -1,44 +1,44 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools multilib-minimal ltprune
EAPI=7
inherit autotools multilib-minimal
DESCRIPTION="A system-independent library for user-level network packet capture"
HOMEPAGE="
http://www.tcpdump.org/
https://www.tcpdump.org/
https://github.com/the-tcpdump-group/libpcap
"
SRC_URI="
https://github.com/the-tcpdump-group/${PN}/archive/${P}.tar.gz
https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz
"
LICENSE="BSD"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="bluetooth dbus netlink static-libs usb"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
RDEPEND="
bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
rdma? ( sys-cluster/rdma-core )
usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
"
DEPEND="
${RDEPEND}
"
BDEPEND="
sys-devel/flex
virtual/yacc
dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
dbus? ( virtual/pkgconfig )
"
S=${WORKDIR}/${PN}-${P}
S=${WORKDIR}/${PN}-${P/_}
PATCHES=(
"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
"${FILESDIR}"/${PN}-1.8.1-cross-compile.patch
"${FILESDIR}"/${PN}-1.8.1-darwin.patch
"${FILESDIR}"/${PN}-1.8.1-libnl.patch
"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
"${FILESDIR}"/${PN}-9999-parallel.patch
"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
)
src_prepare() {
@ -53,8 +53,11 @@ multilib_src_configure() {
ECONF_SOURCE="${S}" \
econf \
$(use_enable bluetooth) \
$(use_enable usb) \
$(use_enable dbus) \
$(use_enable rdma) \
$(use_enable remote) \
$(use_enable usb) \
$(use_enable yydebug) \
$(use_with netlink libnl) \
--enable-ipv6
}
@ -64,17 +67,18 @@ multilib_src_compile() {
}
multilib_src_install_all() {
dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
# remove static libraries (--disable-static does not work)
if ! use static-libs; then
find "${ED}" -name '*.a' -exec rm {} + || die
fi
prune_libtool_files
find "${ED}" -name '*.la' -delete || die
# We need this to build pppd on G/FBSD systems
if [[ "${USERLAND}" == "BSD" ]]; then
insinto /usr/include
doins pcap-int.h
doins pcap-int.h portability.h
fi
}

View File

@ -1,4 +1,4 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -6,16 +6,16 @@ inherit autotools multilib-minimal ltprune
DESCRIPTION="A system-independent library for user-level network packet capture"
HOMEPAGE="
http://www.tcpdump.org/
https://www.tcpdump.org/
https://github.com/the-tcpdump-group/libpcap
"
SRC_URI="
https://github.com/the-tcpdump-group/${PN}/archive/${P}.tar.gz
https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz
"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="bluetooth dbus netlink static-libs usb"
RDEPEND="
@ -27,18 +27,14 @@ DEPEND="
${RDEPEND}
sys-devel/flex
virtual/yacc
dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
dbus? ( virtual/pkgconfig )
"
S=${WORKDIR}/${PN}-${P}
S=${WORKDIR}/${PN}-${P/_}
PATCHES=(
"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
"${FILESDIR}"/${PN}-1.8.1-cross-compile.patch
"${FILESDIR}"/${PN}-1.8.1-darwin.patch
"${FILESDIR}"/${PN}-1.8.1-libnl.patch
"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
"${FILESDIR}"/${PN}-9999-parallel.patch
"${FILESDIR}"/${PN}-1.9.0-pcap-config-includedir.patch
)
src_prepare() {
@ -53,9 +49,10 @@ multilib_src_configure() {
ECONF_SOURCE="${S}" \
econf \
$(use_enable bluetooth) \
$(use_enable usb) \
$(use_enable dbus) \
$(use_enable usb) \
$(use_with netlink libnl) \
--disable-rdma \
--enable-ipv6
}
@ -64,7 +61,7 @@ multilib_src_compile() {
}
multilib_src_install_all() {
dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
# remove static libraries (--disable-static does not work)
if ! use static-libs; then

View File

@ -1,36 +1,40 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools git-r3 multilib-minimal ltprune
EAPI=7
inherit autotools git-r3 multilib-minimal
DESCRIPTION="A system-independent library for user-level network packet capture"
EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
HOMEPAGE="
http://www.tcpdump.org/
${EGIT_REPO_URI}
https://www.tcpdump.org/
https://github.com/the-tcpdump-group/libpcap
"
LICENSE="BSD"
SLOT="0"
IUSE="bluetooth dbus netlink static-libs usb"
IUSE="bluetooth dbus netlink rdma -remote static-libs usb -yydebug"
KEYWORDS=""
RDEPEND="
bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
rdma? ( sys-cluster/rdma-core )
usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
"
DEPEND="
${RDEPEND}
"
BDEPEND="
sys-devel/flex
virtual/yacc
dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
dbus? ( virtual/pkgconfig )
"
PATCHES=(
"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
"${FILESDIR}"/${PN}-1.10.0-usbmon.patch
"${FILESDIR}"/${PN}-9999-prefix-darwin.patch
)
@ -45,8 +49,12 @@ multilib_src_configure() {
econf \
$(use_enable bluetooth) \
$(use_enable dbus) \
$(use_enable rdma) \
$(use_enable remote) \
$(use_enable usb) \
$(use_with netlink libnl)
$(use_enable yydebug) \
$(use_with netlink libnl) \
--enable-ipv6
}
multilib_src_compile() {
@ -60,7 +68,8 @@ multilib_src_install_all() {
if ! use static-libs; then
find "${ED}" -name '*.a' -exec rm {} + || die
fi
prune_libtool_files
find "${ED}" -name '*.la' -delete || die
# We need this to build pppd on G/FBSD systems
if [[ "${USERLAND}" == "BSD" ]]; then

View File

@ -7,8 +7,12 @@
</maintainer>
<use>
<flag name="netlink">Use <pkg>dev-libs/libnl</pkg> to put wireless interfaces in monitor mode.</flag>
<flag name="rdma">Enable RDMA capture support using <pkg>sys-cluster/rdma-core</pkg></flag>
<flag name="remote">Enable remote packet capture which may expose libpcap-based applications to attacks by malicious remote capture servers!</flag>
<flag name="yydebug">Enable parser debugging code</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:tcpdump:libpcap</remote-id>
<remote-id type="github">the-tcpdump-group/libpcap</remote-id>
</upstream>
</pkgmetadata>

View File

@ -1 +1,2 @@
DIST rsync-3.1.3.tar.gz 905908 BLAKE2B 616a1f3239327a28b881310f5f249c90b8bcdb05091279cd62f9cb4e35a8428c7cdd9b89e711ba124601a738f0deb9bfbebafba7fd88b72866476138a9f8c75a SHA512 8385f4c0ea37e7a1da3cf45794154f5bc4d1c49bc625ba3b5f85adaf3eafe6d71c15bdcb1410bde731e5d4c19aff3331606637462fa27a68dc3e13192dd78f99
DIST rsync-3.2.2.tar.gz 1057001 BLAKE2B 177a3145303ab7ed296b9233160ca4907c6b284160f4d0d15aeefd7e28009c1ea29fb3632ab57c008f0aad2f6774185cba86d2d0d68f30737fef217bd9fff402 SHA512 78107cf423e9259a7f7e9bf5527a956b648107aba72ea88b4267ae6334539342501d3c060efbc87235563b0253a12c382c4bb1f73335e68a62ff53aa905f9169
DIST rsync-3.2.3.tar.gz 1069784 BLAKE2B 085adb55d0d7e3d063fa198912fd09df67b63800a65baff5315ccb7dfc0e9d703eef30a7f2e72e3b271162c280abd9809b3f736704752c1663eed65ad8e0ac25 SHA512 48b68491f3ef644dbbbfcaec5ab90a1028593e02d50367ce161fd9d3d0bd0a3628bc57c5e5dec4be3a1d213f784f879b8a8fcdfd789ba0f99837cba16e1ae70e

View File

@ -0,0 +1,77 @@
From 5dcb49c7ddec765d4a24b4f801ffc7212c085db1 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayne@opencoder.net>
Date: Tue, 7 Jul 2020 11:40:27 -0700
Subject: [PATCH] Allow --bwlimit=0 again.
---
options.c | 12 ++++++------
testsuite/hands.test | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/options.c b/options.c
index 5a372ae7..0b7b9f33 100644
--- a/options.c
+++ b/options.c
@@ -1253,7 +1253,7 @@ static int count_args(const char **argv)
/* If the size_arg is an invalid string or the value is < min_value, an error
* is put into err_buf & the return is -1. Note that this parser does NOT
* support negative numbers, so a min_value < 0 doesn't make any sense. */
-static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name, ssize_t min_value)
+static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name, ssize_t min_value, BOOL allow_0)
{
int reps, mult;
const char *arg, *err = "invalid";
@@ -1299,7 +1299,7 @@ static ssize_t parse_size_arg(char *size_arg, char def_suf, const char *opt_name
size += atoi(arg), arg += 2;
if (*arg)
goto failure;
- if (size < min_value) {
+ if (size < min_value && (!allow_0 || size != 0)) {
err = size < 0 ? "too big" : "too small";
goto failure;
}
@@ -1683,19 +1683,19 @@ int parse_arguments(int *argc_p, const char ***argv_p)
break;
case OPT_MAX_SIZE:
- if ((max_size = parse_size_arg(max_size_arg, 'b', "max-size", 0)) < 0)
+ if ((max_size = parse_size_arg(max_size_arg, 'b', "max-size", 0, True)) < 0)
return 0;
max_size_arg = num_to_byte_string(max_size);
break;
case OPT_MIN_SIZE:
- if ((min_size = parse_size_arg(min_size_arg, 'b', "min-size", 0)) < 0)
+ if ((min_size = parse_size_arg(min_size_arg, 'b', "min-size", 0, True)) < 0)
return 0;
min_size_arg = num_to_byte_string(min_size);
break;
case OPT_BWLIMIT: {
- ssize_t size = parse_size_arg(bwlimit_arg, 'K', "bwlimit", 512);
+ ssize_t size = parse_size_arg(bwlimit_arg, 'K', "bwlimit", 512, True);
if (size < 0)
return 0;
bwlimit_arg = num_to_byte_string(size);
@@ -1889,7 +1889,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
max_alloc_arg = NULL;
}
if (max_alloc_arg) {
- ssize_t size = parse_size_arg(max_alloc_arg, 'B', "max-alloc", 1024*1024);
+ ssize_t size = parse_size_arg(max_alloc_arg, 'B', "max-alloc", 1024*1024, False);
if (size < 0)
return 0;
max_alloc = size;
diff --git a/testsuite/hands.test b/testsuite/hands.test
index 46928d4e..8e265b7c 100644
--- a/testsuite/hands.test
+++ b/testsuite/hands.test
@@ -16,7 +16,7 @@ DEBUG_OPTS="--debug=all0,deltasum0"
runtest "basic operation" 'checkit "$RSYNC -av \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
ln "$fromdir/filelist" "$fromdir/dir"
-runtest "hard links" 'checkit "$RSYNC -avH $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
+runtest "hard links" 'checkit "$RSYNC -avH --bwlimit=0 $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'
rm "$todir/text"
runtest "one file" 'checkit "$RSYNC -avH $DEBUG_OPTS \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir"'

View File

@ -0,0 +1,31 @@
From bb1365dd7736b264738f50b683a0f81a2ed11aba Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayne@opencoder.net>
Date: Fri, 10 Jul 2020 09:47:16 -0700
Subject: [PATCH] Fix see_token zstd case.
---
token.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/token.c b/token.c
index cad6b641..61be8dd9 100644
--- a/token.c
+++ b/token.c
@@ -1093,13 +1093,13 @@ void see_token(char *data, int32 toklen)
break;
case CPRES_ZLIBX:
break;
-#ifdef SUPPORT_LZ4
- case CPRES_LZ4:
- /*see_uncompressed_token(data, toklen);*/
+#ifdef SUPPORT_ZSTD
+ case CPRES_ZSTD:
break;
#endif
#ifdef SUPPORT_LZ4
- case CPRES_ZSTD:
+ case CPRES_LZ4:
+ /*see_uncompressed_token(data, toklen);*/
break;
#endif
default:

View File

@ -10,6 +10,6 @@ read only = yes
# Simple example for enabling your own local rsync server
#[gentoo-portage]
# path = @GENTOO_PORTAGE_EPREFIX@/usr/portage
# comment = Gentoo Portage tree
# path = @GENTOO_PORTAGE_EPREFIX@/var/db/repos/gentoo
# comment = Gentoo ebuild repository
# exclude = /distfiles /packages

View File

@ -10,5 +10,7 @@
</upstream>
<use>
<flag name="stunnel">Provide helper scripts for using rsync via &gt;=net-misc/stunnel-4</flag>
<flag name="system-zlib">Use system zlib instead of bundled one. This is incompatible with older rsync releases!</flag>
<flag name="xxhash">Enable <pkg>dev-libs/xxhash</pkg> support for hashing</flag>
</use>
</pkgmetadata>

View File

@ -1,91 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit flag-o-matic prefix systemd
DESCRIPTION="File transfer program to keep remote files into sync"
HOMEPAGE="https://rsync.samba.org/"
SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
[[ ${PV} = *_pre* ]] || \
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="acl examples iconv ipv6 static stunnel xattr"
LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
>=dev-libs/popt-1.5[static-libs(+)]"
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
iconv? ( virtual/libiconv )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
S="${WORKDIR}/${P/_/}"
src_configure() {
use static && append-ldflags -static
local myeconfargs=(
--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
--without-included-popt
$(use_enable acl acl-support)
$(use_enable iconv)
$(use_enable ipv6)
$(use_enable xattr xattr-support)
)
econf "${myeconfargs[@]}"
touch proto.h-tstamp #421625
}
src_install() {
emake DESTDIR="${D}" install
newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
dodoc NEWS OLDNEWS README TODO tech_report.tex
insinto /etc
newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
insinto /etc/logrotate.d
newins "${FILESDIR}"/rsyncd.logrotate rsyncd
insinto /etc/xinetd.d
newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
# Install stunnel helpers
if use stunnel ; then
emake DESTDIR="${D}" install-ssl-client
emake DESTDIR="${D}" install-ssl-daemon
fi
# Install the useful contrib scripts
if use examples ; then
exeinto /usr/share/rsync
doexe support/*
rm -f "${ED%/}"/usr/share/rsync/{Makefile*,*.c}
fi
eprefixify "${ED%/}"/etc/{,xinetd.d}/rsyncd*
systemd_dounit "${FILESDIR}/rsyncd.service"
}
pkg_postinst() {
if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
ewarn "You have disabled chroot support in your rsyncd.conf. This"
ewarn "is a security risk which you should fix. Please check your"
ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
fi
if use stunnel ; then
einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
einfo
einfo "You maybe have to update the certificates configured in"
einfo "${EROOT}/etc/stunnel/rsync.conf"
fi
}

View File

@ -0,0 +1,158 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic prefix systemd
DESCRIPTION="File transfer program to keep remote files into sync"
HOMEPAGE="https://rsync.samba.org/"
if [[ "${PV}" == *9999 ]] ; then
PYTHON_COMPAT=( python3_{6,7} )
inherit autotools git-r3 python-any-r1
EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
else
if [[ "${PV}" == *_pre* ]] ; then
SRC_DIR="src-previews"
else
SRC_DIR="src"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
S="${WORKDIR}/${P/_/}"
fi
LICENSE="GPL-3"
SLOT="0"
IUSE_CPU_FLAGS_X86=" sse2"
IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
lz4? ( app-arch/lz4[static-libs(+)] )
ssl? (
!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
libressl? ( dev-libs/libressl:0=[static-libs(+)] )
)
system-zlib? ( sys-libs/zlib[static-libs(+)] )
xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
xxhash? ( dev-libs/xxhash[static-libs(+)] )
zstd? ( app-arch/zstd[static-libs(+)] )
>=dev-libs/popt-1.5[static-libs(+)]"
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
iconv? ( virtual/libiconv )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
if [[ "${PV}" == *9999 ]] ; then
BDEPEND="${PYTHON_DEPS}
$(python_gen_any_dep '
dev-python/commonmark[${PYTHON_USEDEP}]
')"
fi
PATCHES=(
"${FILESDIR}/${P}-allow_bwlimit_0.patch" #731306
"${FILESDIR}/${P}-zstd_see_token.patch" #733084
)
# Only required for live ebuild
python_check_deps() {
has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
}
src_prepare() {
default
if [[ "${PV}" == *9999 ]] ; then
eaclocal -I m4
eautoconf -o configure.sh
eautoheader && touch config.h.in
fi
}
src_configure() {
use static && append-ldflags -static
local myeconfargs=(
--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
--without-included-popt
$(use_enable acl acl-support)
$(use_enable iconv)
$(use_enable ipv6)
$(use_enable lz4)
$(use_enable ssl openssl)
$(use_with !system-zlib included-zlib)
$(use_enable xattr xattr-support)
$(use_enable xxhash)
$(use_enable zstd)
)
if use elibc_glibc && [[ "${ARCH}" == "amd64" ]] ; then
# SIMD is only available for x86_64 right now
# and only on glibc (#728868)
myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) )
else
myeconfargs+=( --disable-simd )
fi
econf "${myeconfargs[@]}"
[[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625
}
src_install() {
emake DESTDIR="${D}" install
newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
dodoc NEWS.md README.md TODO tech_report.tex
insinto /etc
newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
insinto /etc/logrotate.d
newins "${FILESDIR}"/rsyncd.logrotate rsyncd
insinto /etc/xinetd.d
newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
# Install stunnel helpers
if use stunnel ; then
emake DESTDIR="${D}" install-ssl-daemon
fi
# Install the useful contrib scripts
if use examples ; then
exeinto /usr/share/rsync
doexe support/*
rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
fi
eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
systemd_dounit "${FILESDIR}/rsyncd.service"
}
pkg_postinst() {
if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
ewarn "You have disabled chroot support in your rsyncd.conf. This"
ewarn "is a security risk which you should fix. Please check your"
ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
fi
if use stunnel ; then
einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
einfo
einfo "You maybe have to update the certificates configured in"
einfo "${EROOT}/etc/stunnel/rsync.conf"
fi
if use system-zlib ; then
ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
ewarn "using the --compress option."
ewarn
ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
ewarn "and the --compress option, add --new-compress (-zz)."
ewarn
ewarn "For syncing the portage tree, add:"
ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
fi
}

View File

@ -0,0 +1,153 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic prefix systemd
DESCRIPTION="File transfer program to keep remote files into sync"
HOMEPAGE="https://rsync.samba.org/"
if [[ "${PV}" == *9999 ]] ; then
PYTHON_COMPAT=( python3_{6,7} )
inherit autotools git-r3 python-any-r1
EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
else
if [[ "${PV}" == *_pre* ]] ; then
SRC_DIR="src-previews"
else
SRC_DIR="src"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
S="${WORKDIR}/${P/_/}"
fi
LICENSE="GPL-3"
SLOT="0"
IUSE_CPU_FLAGS_X86=" sse2"
IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
lz4? ( app-arch/lz4[static-libs(+)] )
ssl? (
!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
libressl? ( dev-libs/libressl:0=[static-libs(+)] )
)
system-zlib? ( sys-libs/zlib[static-libs(+)] )
xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
xxhash? ( dev-libs/xxhash[static-libs(+)] )
zstd? ( app-arch/zstd[static-libs(+)] )
>=dev-libs/popt-1.5[static-libs(+)]"
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
iconv? ( virtual/libiconv )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
if [[ "${PV}" == *9999 ]] ; then
BDEPEND="${PYTHON_DEPS}
$(python_gen_any_dep '
dev-python/commonmark[${PYTHON_USEDEP}]
')"
fi
# Only required for live ebuild
python_check_deps() {
has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
}
src_prepare() {
default
if [[ "${PV}" == *9999 ]] ; then
eaclocal -I m4
eautoconf -o configure.sh
eautoheader && touch config.h.in
fi
}
src_configure() {
use static && append-ldflags -static
local myeconfargs=(
--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
--without-included-popt
$(use_enable acl acl-support)
$(use_enable iconv)
$(use_enable ipv6)
$(use_enable lz4)
$(use_enable ssl openssl)
$(use_with !system-zlib included-zlib)
$(use_enable xattr xattr-support)
$(use_enable xxhash)
$(use_enable zstd)
)
if use elibc_glibc && [[ "${ARCH}" == "amd64" ]] ; then
# SIMD is only available for x86_64 right now
# and only on glibc (#728868)
myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) )
else
myeconfargs+=( --disable-simd )
fi
econf "${myeconfargs[@]}"
[[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625
}
src_install() {
emake DESTDIR="${D}" install
newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
dodoc NEWS.md README.md TODO tech_report.tex
insinto /etc
newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
insinto /etc/logrotate.d
newins "${FILESDIR}"/rsyncd.logrotate rsyncd
insinto /etc/xinetd.d
newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
# Install stunnel helpers
if use stunnel ; then
emake DESTDIR="${D}" install-ssl-daemon
fi
# Install the useful contrib scripts
if use examples ; then
exeinto /usr/share/rsync
doexe support/*
rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
fi
eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
systemd_dounit "${FILESDIR}/rsyncd.service"
}
pkg_postinst() {
if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
ewarn "You have disabled chroot support in your rsyncd.conf. This"
ewarn "is a security risk which you should fix. Please check your"
ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
fi
if use stunnel ; then
einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
einfo
einfo "You maybe have to update the certificates configured in"
einfo "${EROOT}/etc/stunnel/rsync.conf"
fi
if use system-zlib ; then
ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
ewarn "using the --compress option."
ewarn
ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
ewarn "and the --compress option, add --new-compress (-zz)."
ewarn
ewarn "For syncing the portage tree, add:"
ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
fi
}

View File

@ -0,0 +1,153 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic prefix systemd
DESCRIPTION="File transfer program to keep remote files into sync"
HOMEPAGE="https://rsync.samba.org/"
if [[ "${PV}" == *9999 ]] ; then
PYTHON_COMPAT=( python3_{6,7} )
inherit autotools git-r3 python-any-r1
EGIT_REPO_URI="https://github.com/WayneD/rsync.git"
else
if [[ "${PV}" == *_pre* ]] ; then
SRC_DIR="src-previews"
else
SRC_DIR="src"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
S="${WORKDIR}/${P/_/}"
fi
LICENSE="GPL-3"
SLOT="0"
IUSE_CPU_FLAGS_X86=" sse2"
IUSE="acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd"
IUSE+=" ${IUSE_CPU_FLAGS_X86// / cpu_flags_x86_}"
LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
lz4? ( app-arch/lz4[static-libs(+)] )
ssl? (
!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
libressl? ( dev-libs/libressl:0=[static-libs(+)] )
)
system-zlib? ( sys-libs/zlib[static-libs(+)] )
xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
xxhash? ( dev-libs/xxhash[static-libs(+)] )
zstd? ( app-arch/zstd[static-libs(+)] )
>=dev-libs/popt-1.5[static-libs(+)]"
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
iconv? ( virtual/libiconv )"
DEPEND="${RDEPEND}
static? ( ${LIB_DEPEND} )"
if [[ "${PV}" == *9999 ]] ; then
BDEPEND="${PYTHON_DEPS}
$(python_gen_any_dep '
dev-python/commonmark[${PYTHON_USEDEP}]
')"
fi
# Only required for live ebuild
python_check_deps() {
has_version "dev-python/commonmark[${PYTHON_USEDEP}]"
}
src_prepare() {
default
if [[ "${PV}" == *9999 ]] ; then
eaclocal -I m4
eautoconf -o configure.sh
eautoheader && touch config.h.in
fi
}
src_configure() {
use static && append-ldflags -static
local myeconfargs=(
--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
--without-included-popt
$(use_enable acl acl-support)
$(use_enable iconv)
$(use_enable ipv6)
$(use_enable lz4)
$(use_enable ssl openssl)
$(use_with !system-zlib included-zlib)
$(use_enable xattr xattr-support)
$(use_enable xxhash)
$(use_enable zstd)
)
if use elibc_glibc && [[ "${ARCH}" == "amd64" ]] ; then
# SIMD is only available for x86_64 right now
# and only on glibc (#728868)
myeconfargs+=( $(use_enable cpu_flags_x86_sse2 simd) )
else
myeconfargs+=( --disable-simd )
fi
econf "${myeconfargs[@]}"
[[ "${PV}" == *9999 ]] || touch proto.h-tstamp #421625
}
src_install() {
emake DESTDIR="${D}" install
newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
dodoc NEWS.md README.md TODO tech_report.tex
insinto /etc
newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
insinto /etc/logrotate.d
newins "${FILESDIR}"/rsyncd.logrotate rsyncd
insinto /etc/xinetd.d
newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
# Install stunnel helpers
if use stunnel ; then
emake DESTDIR="${D}" install-ssl-daemon
fi
# Install the useful contrib scripts
if use examples ; then
exeinto /usr/share/rsync
doexe support/*
rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
fi
eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
systemd_dounit "${FILESDIR}/rsyncd.service"
}
pkg_postinst() {
if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
ewarn "You have disabled chroot support in your rsyncd.conf. This"
ewarn "is a security risk which you should fix. Please check your"
ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
fi
if use stunnel ; then
einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
einfo
einfo "You maybe have to update the certificates configured in"
einfo "${EROOT}/etc/stunnel/rsync.conf"
fi
if use system-zlib ; then
ewarn "Using system-zlib is incompatible with <rsync-3.1.1 when"
ewarn "using the --compress option."
ewarn
ewarn "When syncing with >=rsync-3.1.1 built with bundled zlib,"
ewarn "and the --compress option, add --new-compress (-zz)."
ewarn
ewarn "For syncing the portage tree, add:"
ewarn "PORTAGE_RSYNC_EXTRA_OPTS=\"--new-compress\" to make.conf"
fi
}