* [gentoo-commits] repo/gentoo:master commit in: sys-block/mbuffer/, sys-block/mbuffer/files/
@ 2017-10-10 18:27 Thomas Deutschmann
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Deutschmann @ 2017-10-10 18:27 UTC (permalink / raw
To: gentoo-commits
commit: 93a507b9f4d2aafaeab51480446a68167eb4456e
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 18:27:14 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 18:27:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a507b9
sys-block/mbuffer: Bump to v20170921
Fixes: https://bugs.gentoo.org/624012
Package-Manager: Portage-2.3.10, Repoman-2.3.3
sys-block/mbuffer/Manifest | 1 +
...mbuffer-20170921-resolv-multi-order-issue.patch | 23 +++++++++
.../files/mbuffer-20170921-sysconfdir.patch | 28 +++++++++++
sys-block/mbuffer/mbuffer-20170921.ebuild | 55 ++++++++++++++++++++++
4 files changed, 107 insertions(+)
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 9046e5bf264..43514873c13 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1,3 +1,4 @@
DIST mbuffer-20150412.tgz 122935 SHA256 0c78dcb194d1f0316c51f277ea09ec20efd175bbd45f0a3f81bf1202c33301e4 SHA512 cef64f1229872e2207e678aa77dc95e0c24f54e4a88a57a0e797d10b07a16d1f5fa96c8cfa3876ff65dd97c114eff87b683917fa1d39cdb4f08c864325e4223c WHIRLPOOL cdd82ef4d036438b36c4ecc0058e3757116e5f01897eee89870e08e73323dc135accf4d69fc57cac87082a2a78bfb1841af62bced56f93388870bc1c3b8590cd
DIST mbuffer-20160228.tgz 123108 SHA256 f7769f729e9b26a22a5d91922a740a0d1df6004dbe2b7a1febb0d7e4c3ef9e62 SHA512 0706b8dd137f5f5b01885bcca4bf799cbd14b25895402f0c73f874d78fc160c7fae8c5a229c40efce9ba96288972a8e5846443ef5cd4d1ff02af92f703e33a2e WHIRLPOOL d1b356e5b7a8313f9fc1ef01392ee44969fedf2f3c33c8848b763d8cf5bd92ddfde8ddc881ef33b9dad849dfee51582c89c72869eb0d603b13a7ad3719d748a3
DIST mbuffer-20170515.tgz 125736 SHA256 154fa0836777b21032b2e4f738fb0aa4dea218551b7cade93cf1b7245aca5e4f SHA512 991cb33b09e48f1177b7a05e5ab2c189aa2cb0f03e220d7e46996b3a3e3ba1e3f3ad4a68b8750ed73dc765c5874029715bba1d2f5a80a9601cd0a39e1f9fd447 WHIRLPOOL 015bc2a57b529d54bf5e4092c30585373003a3159fc66a528ae1ad9208134d1ba9c8e3cb44afa4ef246ea4babf96e6aed8b7166a350b4a2a7f82f91b74a85e52
+DIST mbuffer-20170921.tgz 136192 SHA256 8c38ec7cb7f63e1cd4100c6f8a15a2c335ad080760157fc44e88e3465cc47027 SHA512 f4b897e7649893cb02f9b3b806e956acf60692cd549f9cfe6cf164c703f369f0af251bfdabfbcdd76dacf5a4c3871ed7b98fbd6b5fcb97d184b7c317082bfaee WHIRLPOOL b789e0f5ac522edbb373cd3de377c78952b2d9bcc1a09a6731971695694134e36c8909f0c1aeb5ffbe9d44f5a2209c2c8b21592209d0b750b97ac4546fd90bed
diff --git a/sys-block/mbuffer/files/mbuffer-20170921-resolv-multi-order-issue.patch b/sys-block/mbuffer/files/mbuffer-20170921-resolv-multi-order-issue.patch
new file mode 100644
index 00000000000..f8771145aa6
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20170921-resolv-multi-order-issue.patch
@@ -0,0 +1,23 @@
+work around "multi off" in /etc/host.conf and "::1 localhost"
+*not* being the *first* "localhost" entry in /etc/hosts
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -86,7 +86,7 @@ test2: test.md5
+ ./mbuffer -q -I :8000 -o $@.tar -o - | openssl md5 > $@.md5 & \
+ sleep 1; \
+ rm -f $@.tar; \
+- ./mbuffer -i test.tar -o /dev/null -O localhost:8000 -H; \
++ ./mbuffer -i test.tar -o /dev/null -4 -O 127.0.0.1:8000 -H; \
+ wait
+ sync
+ diff $@.md5 test.md5
+@@ -101,7 +101,7 @@ test3: test.md5
+ ./mbuffer -q -6 -I :8000 | openssl md5 > $@.md5 & \
+ sleep 1; \
+ rm -f $@.tar; \
+- ./mbuffer -i test.tar -o /dev/null -6 -O ip6-localhost:8000 -o $@.tar -H; \
++ ./mbuffer -i test.tar -o /dev/null -6 -O ::1:8000 -o $@.tar -H; \
+ wait
+ sync
+ diff $@.md5 test.md5
diff --git a/sys-block/mbuffer/files/mbuffer-20170921-sysconfdir.patch b/sys-block/mbuffer/files/mbuffer-20170921-sysconfdir.patch
new file mode 100644
index 00000000000..1b9031aa58b
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20170921-sysconfdir.patch
@@ -0,0 +1,28 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -10,6 +10,7 @@ CP = @CP@
+ VPATH = @srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
++sysconfdir = @sysconfdir@
+ datarootdir = @datarootdir@
+ bindir = @bindir@
+ mandir = @mandir@/man1
+@@ -40,13 +41,13 @@ distclean: clean
+ -$(RM) $(TARGET) config.h config.log \
+ config.status Makefile mbuffer.1 core
+
+-$(DESTDIR)$(prefix)/etc:
++$(DESTDIR)$(sysconfdir):
+ -$(INSTALL) -d -m 755 $@
+
+-$(DESTDIR)$(prefix)/etc/mbuffer.rc:
+- $(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(etcdir)
++$(DESTDIR)$(sysconfdir)/mbuffer.rc:
++ $(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(sysconfdir)/
+
+-install: $(TARGET) $(DESTDIR)$(etcdir) $(DESTDIR)$(etcdir)/mbuffer.rc
++install: $(TARGET) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/mbuffer.rc
+ -$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
+ $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(bindir)/
+ -$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)
diff --git a/sys-block/mbuffer/mbuffer-20170921.ebuild b/sys-block/mbuffer/mbuffer-20170921.ebuild
new file mode 100644
index 00000000000..3baf4645d8f
--- /dev/null
+++ b/sys-block/mbuffer/mbuffer-20170921.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
+HOMEPAGE="http://www.maier-komor.de/mbuffer.html"
+SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug ssl"
+
+DEPEND="ssl? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-20170921-resolv-multi-order-issue.patch"
+ "${FILESDIR}/${PN}-20170921-sysconfdir.patch"
+)
+
+src_prepare() {
+ ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
+
+ # Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
+ # using same port and src_install may have problems (with /etc folder)
+ export MAKEOPTS=-j1
+
+ default
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable ssl md5)
+ $(use_enable debug)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
+ ewarn "Some tests may fail with FEATURES=usersandbox or"
+ ewarn "FEATURES=network-sandbox; Skipping tests because"
+ ewarn "test suite would hang forever in such environments!"
+ return 0;
+ fi
+}
+
+pkg_postinst() {
+ if ! has_version "app-arch/mt-st"; then
+ elog ""
+ elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/mbuffer/, sys-block/mbuffer/files/
@ 2017-11-07 10:57 Thomas Deutschmann
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Deutschmann @ 2017-11-07 10:57 UTC (permalink / raw
To: gentoo-commits
commit: 81f9b755901654bdf1313619127996d99c844e05
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 7 10:53:09 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Nov 7 10:56:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81f9b755
sys-block/mbuffer: Bump to v20171011
- Test suite re-enabled which was accidentally disabled all the times
via commit 93a507b9f4d2aafaeab51480446a68167eb4456e.
Package-Manager: Portage-2.3.13, Repoman-2.3.4
sys-block/mbuffer/Manifest | 1 +
...mbuffer-20171011-resolv-multi-order-issue.patch | 14 ++++++
.../files/mbuffer-20171011-sysconfdir.patch | 28 +++++++++++
sys-block/mbuffer/mbuffer-20171011.ebuild | 58 ++++++++++++++++++++++
4 files changed, 101 insertions(+)
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 43514873c13..1931516e91a 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -2,3 +2,4 @@ DIST mbuffer-20150412.tgz 122935 SHA256 0c78dcb194d1f0316c51f277ea09ec20efd175bb
DIST mbuffer-20160228.tgz 123108 SHA256 f7769f729e9b26a22a5d91922a740a0d1df6004dbe2b7a1febb0d7e4c3ef9e62 SHA512 0706b8dd137f5f5b01885bcca4bf799cbd14b25895402f0c73f874d78fc160c7fae8c5a229c40efce9ba96288972a8e5846443ef5cd4d1ff02af92f703e33a2e WHIRLPOOL d1b356e5b7a8313f9fc1ef01392ee44969fedf2f3c33c8848b763d8cf5bd92ddfde8ddc881ef33b9dad849dfee51582c89c72869eb0d603b13a7ad3719d748a3
DIST mbuffer-20170515.tgz 125736 SHA256 154fa0836777b21032b2e4f738fb0aa4dea218551b7cade93cf1b7245aca5e4f SHA512 991cb33b09e48f1177b7a05e5ab2c189aa2cb0f03e220d7e46996b3a3e3ba1e3f3ad4a68b8750ed73dc765c5874029715bba1d2f5a80a9601cd0a39e1f9fd447 WHIRLPOOL 015bc2a57b529d54bf5e4092c30585373003a3159fc66a528ae1ad9208134d1ba9c8e3cb44afa4ef246ea4babf96e6aed8b7166a350b4a2a7f82f91b74a85e52
DIST mbuffer-20170921.tgz 136192 SHA256 8c38ec7cb7f63e1cd4100c6f8a15a2c335ad080760157fc44e88e3465cc47027 SHA512 f4b897e7649893cb02f9b3b806e956acf60692cd549f9cfe6cf164c703f369f0af251bfdabfbcdd76dacf5a4c3871ed7b98fbd6b5fcb97d184b7c317082bfaee WHIRLPOOL b789e0f5ac522edbb373cd3de377c78952b2d9bcc1a09a6731971695694134e36c8909f0c1aeb5ffbe9d44f5a2209c2c8b21592209d0b750b97ac4546fd90bed
+DIST mbuffer-20171011.tgz 136630 SHA256 eb2f979708bb5ba42a6c1f12c7502dff3b05df8e49b5686c308eda96cad0d1fc SHA512 398d7545388a94b4f8961193192cd5e1139b84f31c7699c2b7f66b84a40488a2e70c88a2a70578bd95375e11efc87978a5f6fec805dbbc5f1fea460b3a9c68c4 WHIRLPOOL 8a2357e2c133450749ca93c96488560f6f5e234acaba9c395da948658e2e796e8fe92a83932c5a6aab522b6efd4cd3511f822a65d950404887d8bd3a0bdf03ab
diff --git a/sys-block/mbuffer/files/mbuffer-20171011-resolv-multi-order-issue.patch b/sys-block/mbuffer/files/mbuffer-20171011-resolv-multi-order-issue.patch
new file mode 100644
index 00000000000..4702ca0c1a1
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20171011-resolv-multi-order-issue.patch
@@ -0,0 +1,14 @@
+work around "multi off" in /etc/host.conf and "::1 localhost"
+*not* being the *first* "localhost" entry in /etc/hosts
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -86,7 +86,7 @@ test2: test.md5
+ ./mbuffer --pid -q -4 -I :7001 -o $@.tar -o - | openssl md5 > $@.md5 & \
+ sleep 1; \
+ rm -f $@.tar; \
+- ./mbuffer --pid -i test.tar -o /dev/null -4 -O localhost:7001 -H; \
++ ./mbuffer --pid -i test.tar -o /dev/null -4 -O 127.0.0.1:7001 -H; \
+ wait
+ sync
+ diff $@.md5 test.md5
diff --git a/sys-block/mbuffer/files/mbuffer-20171011-sysconfdir.patch b/sys-block/mbuffer/files/mbuffer-20171011-sysconfdir.patch
new file mode 100644
index 00000000000..ced09536693
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20171011-sysconfdir.patch
@@ -0,0 +1,28 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -10,6 +10,7 @@ CP = @CP@
+ VPATH = @srcdir@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
++sysconfdir = @sysconfdir@
+ datarootdir = @datarootdir@
+ bindir = @bindir@
+ mandir = @mandir@/man1
+@@ -40,13 +41,13 @@ distclean: clean
+ -$(RM) $(TARGET) config.h config.log \
+ config.status Makefile mbuffer.1 core
+
+-$(DESTDIR)$(etcdir):
++$(DESTDIR)$(sysconfdir):
+ -$(INSTALL) -d -m 755 $@
+
+-$(DESTDIR)$(etcdir)/mbuffer.rc:
+- $(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(etcdir)
++$(DESTDIR)$(sysconfdir)/mbuffer.rc:
++ $(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(sysconfdir)/
+
+-install: $(TARGET) $(DESTDIR)$(etcdir) $(DESTDIR)$(etcdir)/mbuffer.rc
++install: $(TARGET) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/mbuffer.rc
+ -$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
+ $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(bindir)/
+ -$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)
diff --git a/sys-block/mbuffer/mbuffer-20171011.ebuild b/sys-block/mbuffer/mbuffer-20171011.ebuild
new file mode 100644
index 00000000000..b7d5ef07646
--- /dev/null
+++ b/sys-block/mbuffer/mbuffer-20171011.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
+HOMEPAGE="http://www.maier-komor.de/mbuffer.html"
+SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug ssl test"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+ test? ( dev-libs/openssl:0 )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-20171011-resolv-multi-order-issue.patch"
+ "${FILESDIR}/${PN}-20171011-sysconfdir.patch"
+)
+
+src_prepare() {
+ ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
+
+ # Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
+ # using same port and src_install may have problems (with /etc folder)
+ export MAKEOPTS=-j1
+
+ default
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable ssl md5)
+ $(use_enable debug)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
+ ewarn "Some tests may fail with FEATURES=usersandbox or"
+ ewarn "FEATURES=network-sandbox; Skipping tests because"
+ ewarn "test suite would hang forever in such environments!"
+ return 0;
+ fi
+
+ default
+}
+
+pkg_postinst() {
+ if ! has_version "app-arch/mt-st"; then
+ elog ""
+ elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/mbuffer/, sys-block/mbuffer/files/
@ 2018-03-27 9:31 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2018-03-27 9:31 UTC (permalink / raw
To: gentoo-commits
commit: f4888a3f35f11cb212fadd66e35368cb447b3dc4
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 27 09:31:06 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar 27 09:31:06 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4888a3f
sys-block/mbuffer: Removed old.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
sys-block/mbuffer/Manifest | 3 --
.../files/mbuffer-20170515-sysconfdir.patch | 28 -----------
...mbuffer-20170921-resolv-multi-order-issue.patch | 23 ---------
.../files/mbuffer-20170921-sysconfdir.patch | 28 -----------
sys-block/mbuffer/mbuffer-20160228.ebuild | 31 ------------
sys-block/mbuffer/mbuffer-20170515.ebuild | 36 --------------
sys-block/mbuffer/mbuffer-20170921.ebuild | 57 ----------------------
7 files changed, 206 deletions(-)
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 655a930f5a7..a66a11ce042 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1,6 +1,3 @@
DIST mbuffer-20150412.tgz 122935 BLAKE2B c57708861a9fc049fd4f3aa9c1229798a82e866a503e9ab78b1581fca7d60d0fd5cf2d80e8a8bcbb7fc6b000c9a38fb0bfd0d5184cd6bc2b7dca486bd87fb2b1 SHA512 cef64f1229872e2207e678aa77dc95e0c24f54e4a88a57a0e797d10b07a16d1f5fa96c8cfa3876ff65dd97c114eff87b683917fa1d39cdb4f08c864325e4223c
-DIST mbuffer-20160228.tgz 123108 BLAKE2B a19997f66a9a9247775bda94e0254938f286c0dff7b9f64a9fc08dedbbe10dcae0a0920af66d2f882c80761faaba0daa1e8bf5ae19ae29a2a56267fdf9773259 SHA512 0706b8dd137f5f5b01885bcca4bf799cbd14b25895402f0c73f874d78fc160c7fae8c5a229c40efce9ba96288972a8e5846443ef5cd4d1ff02af92f703e33a2e
-DIST mbuffer-20170515.tgz 125736 BLAKE2B 5524b1e63637180661d432dcf124b5579f17d4da3ff0bedba41d1a94d147df9478e209eaa3fd409092a0f82c37bee10910791b8b6344ab509211cc7fc2f03a8a SHA512 991cb33b09e48f1177b7a05e5ab2c189aa2cb0f03e220d7e46996b3a3e3ba1e3f3ad4a68b8750ed73dc765c5874029715bba1d2f5a80a9601cd0a39e1f9fd447
-DIST mbuffer-20170921.tgz 136192 BLAKE2B 2ec9858aae970340cf5b9d2f305039d351df6efbe51ee3a28d1de407da508a82fceb7c41f1dc89c1a58d7b26430151e8103023a1574cdad84bee1f7b78770402 SHA512 f4b897e7649893cb02f9b3b806e956acf60692cd549f9cfe6cf164c703f369f0af251bfdabfbcdd76dacf5a4c3871ed7b98fbd6b5fcb97d184b7c317082bfaee
DIST mbuffer-20171011.tgz 136630 BLAKE2B ba69435684b8c844701a51c5a77d0f5ecbf8bef3ca9b9739a63309524b14d0cbbeba422cee1c5d69f1029a42c18d089cea0bcc46dbeba7f51767df3a815f7de7 SHA512 398d7545388a94b4f8961193192cd5e1139b84f31c7699c2b7f66b84a40488a2e70c88a2a70578bd95375e11efc87978a5f6fec805dbbc5f1fea460b3a9c68c4
DIST mbuffer-20180318.tgz 137259 BLAKE2B bec1f6acc68c3c9cf617dd7a752644628d088541c20816737ea1533eb0e9c92b76ef2dd037912501c29056994443e3ad66b1e7f4456e0f40687b32e4c6a12cf1 SHA512 ac71876aa0bea3acce8ea00c3848783b752991a0e60ebc4245277fd435c2c9e08c79cc5f47c996e590e711ca1bd652ded075c24ca820efe845f578b106c43594
diff --git a/sys-block/mbuffer/files/mbuffer-20170515-sysconfdir.patch b/sys-block/mbuffer/files/mbuffer-20170515-sysconfdir.patch
deleted file mode 100644
index f6a49a10e02..00000000000
--- a/sys-block/mbuffer/files/mbuffer-20170515-sysconfdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- mbuffer-20170515/Makefile.in
-+++ mbuffer-20170515/Makefile.in
-@@ -10,6 +10,7 @@
- VPATH = @srcdir@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-+sysconfdir = @sysconfdir@
- datarootdir = @datarootdir@
- bindir = @bindir@
- mandir = @mandir@/man1
-@@ -39,13 +40,13 @@
- -$(RM) $(TARGET) config.h config.log \
- config.status Makefile mbuffer.1 core
-
--$(DESTDIR)$(prefix)/etc:
-+$(DESTDIR)$(sysconfdir):
- -$(INSTALL) -d -m 755 $@
-
--$(DESTDIR)$(prefix)/etc/mbuffer.rc:
-- $(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(prefix)/etc/
-+$(DESTDIR)$(sysconfdir)/mbuffer.rc:
-+ $(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(sysconfdir)/
-
--install: $(TARGET) $(DESTDIR)$(prefix)/etc $(DESTDIR)$(prefix)/etc/mbuffer.rc
-+install: $(TARGET) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/mbuffer.rc
- -$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
- $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(bindir)/
- -$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)
diff --git a/sys-block/mbuffer/files/mbuffer-20170921-resolv-multi-order-issue.patch b/sys-block/mbuffer/files/mbuffer-20170921-resolv-multi-order-issue.patch
deleted file mode 100644
index f8771145aa6..00000000000
--- a/sys-block/mbuffer/files/mbuffer-20170921-resolv-multi-order-issue.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-work around "multi off" in /etc/host.conf and "::1 localhost"
-*not* being the *first* "localhost" entry in /etc/hosts
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -86,7 +86,7 @@ test2: test.md5
- ./mbuffer -q -I :8000 -o $@.tar -o - | openssl md5 > $@.md5 & \
- sleep 1; \
- rm -f $@.tar; \
-- ./mbuffer -i test.tar -o /dev/null -O localhost:8000 -H; \
-+ ./mbuffer -i test.tar -o /dev/null -4 -O 127.0.0.1:8000 -H; \
- wait
- sync
- diff $@.md5 test.md5
-@@ -101,7 +101,7 @@ test3: test.md5
- ./mbuffer -q -6 -I :8000 | openssl md5 > $@.md5 & \
- sleep 1; \
- rm -f $@.tar; \
-- ./mbuffer -i test.tar -o /dev/null -6 -O ip6-localhost:8000 -o $@.tar -H; \
-+ ./mbuffer -i test.tar -o /dev/null -6 -O ::1:8000 -o $@.tar -H; \
- wait
- sync
- diff $@.md5 test.md5
diff --git a/sys-block/mbuffer/files/mbuffer-20170921-sysconfdir.patch b/sys-block/mbuffer/files/mbuffer-20170921-sysconfdir.patch
deleted file mode 100644
index 1b9031aa58b..00000000000
--- a/sys-block/mbuffer/files/mbuffer-20170921-sysconfdir.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -10,6 +10,7 @@ CP = @CP@
- VPATH = @srcdir@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-+sysconfdir = @sysconfdir@
- datarootdir = @datarootdir@
- bindir = @bindir@
- mandir = @mandir@/man1
-@@ -40,13 +41,13 @@ distclean: clean
- -$(RM) $(TARGET) config.h config.log \
- config.status Makefile mbuffer.1 core
-
--$(DESTDIR)$(prefix)/etc:
-+$(DESTDIR)$(sysconfdir):
- -$(INSTALL) -d -m 755 $@
-
--$(DESTDIR)$(prefix)/etc/mbuffer.rc:
-- $(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(etcdir)
-+$(DESTDIR)$(sysconfdir)/mbuffer.rc:
-+ $(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(sysconfdir)/
-
--install: $(TARGET) $(DESTDIR)$(etcdir) $(DESTDIR)$(etcdir)/mbuffer.rc
-+install: $(TARGET) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/mbuffer.rc
- -$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
- $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(bindir)/
- -$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)
diff --git a/sys-block/mbuffer/mbuffer-20160228.ebuild b/sys-block/mbuffer/mbuffer-20160228.ebuild
deleted file mode 100644
index 0d9d87bd565..00000000000
--- a/sys-block/mbuffer/mbuffer-20160228.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="http://www.maier-komor.de/mbuffer.html"
-SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug ssl"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
- # work around "multi off" in /etc/host.conf and "::1 localhost"
- # *not* being the *first* "localhost" entry in /etc/hosts
- epatch "${FILESDIR}/${PN}-20121111-resolv-multi-order-issue.patch"
-}
-
-src_configure() {
- econf \
- $(use_enable ssl md5) \
- $(use_enable debug)
-}
diff --git a/sys-block/mbuffer/mbuffer-20170515.ebuild b/sys-block/mbuffer/mbuffer-20170515.ebuild
deleted file mode 100644
index 0ea6b6c8904..00000000000
--- a/sys-block/mbuffer/mbuffer-20170515.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="http://www.maier-komor.de/mbuffer.html"
-SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug ssl"
-
-DEPEND="ssl? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-20121111-resolv-multi-order-issue.patch"
- "${FILESDIR}/${PN}-20170515-sysconfdir.patch"
-)
-
-src_prepare() {
- ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
- # work around "multi off" in /etc/host.conf and "::1 localhost"
- # *not* being the *first* "localhost" entry in /etc/hosts
- default
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable ssl md5)
- $(use_enable debug)
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/sys-block/mbuffer/mbuffer-20170921.ebuild b/sys-block/mbuffer/mbuffer-20170921.ebuild
deleted file mode 100644
index 2870b2b5053..00000000000
--- a/sys-block/mbuffer/mbuffer-20170921.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="http://www.maier-komor.de/mbuffer.html"
-SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug ssl"
-
-DEPEND="ssl? ( dev-libs/openssl:0= )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-20170921-resolv-multi-order-issue.patch"
- "${FILESDIR}/${PN}-20170921-sysconfdir.patch"
-)
-
-src_prepare() {
- ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
-
- # Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
- # using same port and src_install may have problems (with /etc folder)
- export MAKEOPTS=-j1
-
- default
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable ssl md5)
- $(use_enable debug)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
- ewarn "Some tests may fail with FEATURES=usersandbox or"
- ewarn "FEATURES=network-sandbox; Skipping tests because"
- ewarn "test suite would hang forever in such environments!"
- return 0;
- fi
-
- default
-}
-
-pkg_postinst() {
- if ! has_version "app-arch/mt-st"; then
- elog ""
- elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/mbuffer/, sys-block/mbuffer/files/
@ 2020-10-02 12:12 Thomas Deutschmann
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Deutschmann @ 2020-10-02 12:12 UTC (permalink / raw
To: gentoo-commits
commit: 07fe74a8c4da9fc216fac36b026af848a03482d7
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 2 12:10:58 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Fri Oct 2 12:12:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07fe74a8
sys-block/mbuffer: bump to v20200929
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
sys-block/mbuffer/Manifest | 1 +
.../files/mbuffer-20200929-find-OBJDUMP.patch | 11 ++++
sys-block/mbuffer/mbuffer-20200929.ebuild | 70 ++++++++++++++++++++++
3 files changed, 82 insertions(+)
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index fac0086ff7f..9eede0cede4 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1 +1,2 @@
DIST mbuffer-20200505.tgz 146020 BLAKE2B b85742f710405e29775c7d25e9c1be733fd94d7157018017b7c8fb5b5cdeab7fa8819b024d297d96af960a73a8982fdeaefe50627c605f797df4d75b0c15435f SHA512 8a1e5721869fd705d02486cf93467bfe0a59b58789826ca337c18a023e9fbb18c1651211bfebdea4cdd45772ad23d0715bb3892bed04ce66f5fbe72406cde9f7
+DIST mbuffer-20200929.tgz 147855 BLAKE2B abbcb4b29013ed24b4135a8b7576a0e728c3b5f1987558f0582711b1b00333caea8b55a02c4506ac179a4dae04977ee64572df09a210bf34bd71fd336be7e418 SHA512 332106205ea8743c9cf47529106c04ac15801a02b116d8e0c0fd3baadad51331c9f4ba1c8fa125edb42940cf401048a45ba23e2dac0e5189671bcf0ecee36996
diff --git a/sys-block/mbuffer/files/mbuffer-20200929-find-OBJDUMP.patch b/sys-block/mbuffer/files/mbuffer-20200929-find-OBJDUMP.patch
new file mode 100644
index 00000000000..891084b6ca7
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20200929-find-OBJDUMP.patch
@@ -0,0 +1,11 @@
+--- a/configure.in
++++ b/configure.in
+@@ -113,7 +113,7 @@ AC_PATH_PROG(AWK,awk)
+ AC_SYS_LARGEFILE
+ AC_STRUCT_ST_BLKSIZE
+
+-AC_CHECK_TARGET_TOOLS(OBJDUMP,gobjdump objdump)
++AC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
+
+ AC_HEADER_ASSERT
+ AC_CHECK_LIB(pthread, pthread_mutex_init)
diff --git a/sys-block/mbuffer/mbuffer-20200929.ebuild b/sys-block/mbuffer/mbuffer-20200929.ebuild
new file mode 100644
index 00000000000..a0fc6c22696
--- /dev/null
+++ b/sys-block/mbuffer/mbuffer-20200929.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
+HOMEPAGE="https://www.maier-komor.de/mbuffer.html"
+SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="debug libressl ssl test"
+
+REQUIRED_USE="test? ( ssl )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-20180410-sysconfdir.patch"
+ "${FILESDIR}/${PN}-20200929-find-OBJDUMP.patch"
+)
+
+src_prepare() {
+ ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
+
+ default
+
+ mv configure.in configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable ssl md5)
+ $(use_enable debug)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
+ ewarn "Some tests may fail with FEATURES=usersandbox or"
+ ewarn "FEATURES=network-sandbox; Skipping tests because"
+ ewarn "test suite would hang forever in such environments!"
+ return 0;
+ fi
+
+ # Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
+ # using same port and src_install may have problems (with /etc folder)
+ local -x MAKEOPTS=-j1
+
+ default
+}
+
+pkg_postinst() {
+ if ! has_version "app-arch/mt-st"; then
+ elog ""
+ elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/mbuffer/, sys-block/mbuffer/files/
@ 2021-05-14 22:14 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2021-05-14 22:14 UTC (permalink / raw
To: gentoo-commits
commit: 7c76fd2277a5d9635bcae4c39f0490ba6aea1fef
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 22:13:16 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri May 14 22:13:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c76fd22
sys-block/mbuffer: drop 20200505, 20210209
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-block/mbuffer/Manifest | 2 -
.../files/mbuffer-20200505-find-OBJDUMP.patch | 11 ----
sys-block/mbuffer/mbuffer-20200505.ebuild | 69 ----------------------
sys-block/mbuffer/mbuffer-20210209.ebuild | 69 ----------------------
4 files changed, 151 deletions(-)
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 3838573278c..1a3f9f9793a 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1,4 +1,2 @@
-DIST mbuffer-20200505.tgz 146020 BLAKE2B b85742f710405e29775c7d25e9c1be733fd94d7157018017b7c8fb5b5cdeab7fa8819b024d297d96af960a73a8982fdeaefe50627c605f797df4d75b0c15435f SHA512 8a1e5721869fd705d02486cf93467bfe0a59b58789826ca337c18a023e9fbb18c1651211bfebdea4cdd45772ad23d0715bb3892bed04ce66f5fbe72406cde9f7
DIST mbuffer-20200929.tgz 147855 BLAKE2B abbcb4b29013ed24b4135a8b7576a0e728c3b5f1987558f0582711b1b00333caea8b55a02c4506ac179a4dae04977ee64572df09a210bf34bd71fd336be7e418 SHA512 332106205ea8743c9cf47529106c04ac15801a02b116d8e0c0fd3baadad51331c9f4ba1c8fa125edb42940cf401048a45ba23e2dac0e5189671bcf0ecee36996
-DIST mbuffer-20210209.tgz 147894 BLAKE2B ff6b1da468d34b1fef66178200f68998da0ef4042424845157afbd59e53dbef9e3d003ec9c1a663b28c0e3291d515841bb0a29dabf72a4dd781f6dde2b69b17d SHA512 82a3fd769c6935164db41dbc2e189fef27068c5d4604be923f42f6a9ba3dc3668e6918ba838a0015e9b5becde8b42c9268aa679e3aadb770c517873790f842d1
DIST mbuffer-20210328.tgz 148009 BLAKE2B b369fdae908cfa239e70d092f512f1613215f1a38e5f2dba9403edeb5579fe14a099f0b9950572c1e294c7d5938bd5a363a1cc3239b4553ecd24c6b805fbfe27 SHA512 69f7cac7fe49a86944092d642c6138455ba95da8e6d00abd41b37d126a9f03c3252e69795c5fb5bf8e56d0ce1461bde6b51f48c5eb7073ee49ee4e6df83d834d
diff --git a/sys-block/mbuffer/files/mbuffer-20200505-find-OBJDUMP.patch b/sys-block/mbuffer/files/mbuffer-20200505-find-OBJDUMP.patch
deleted file mode 100644
index 93fe6265e2a..00000000000
--- a/sys-block/mbuffer/files/mbuffer-20200505-find-OBJDUMP.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -109,7 +109,7 @@ AC_PATH_PROG(CP,cp)
- AC_PATH_PROG(MT,mt,AC_MSG_WARN(could not find the program mt - you might need this if you want autoloader support))
- AC_PATH_PROGS(TAR,[gtar tar])
- AC_PATH_PROG(AWK,awk)
--AC_PATH_PROGS(OBJDUMP,objdump gobjdump)
-+AC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump])
- AC_SYS_LARGEFILE
- AC_STRUCT_ST_BLKSIZE
-
diff --git a/sys-block/mbuffer/mbuffer-20200505.ebuild b/sys-block/mbuffer/mbuffer-20200505.ebuild
deleted file mode 100644
index 0d0ef3285db..00000000000
--- a/sys-block/mbuffer/mbuffer-20200505.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="https://www.maier-komor.de/mbuffer.html"
-SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc x86"
-IUSE="debug ssl test"
-
-REQUIRED_USE="test? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? (
- dev-libs/openssl:0=
- )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-20180410-sysconfdir.patch"
- "${FILESDIR}/${PN}-20200505-find-OBJDUMP.patch"
-)
-
-src_prepare() {
- ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
-
- # Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
- # using same port and src_install may have problems (with /etc folder)
- export MAKEOPTS=-j1
-
- default
-
- mv configure.in configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable ssl md5)
- $(use_enable debug)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
- ewarn "Some tests may fail with FEATURES=usersandbox or"
- ewarn "FEATURES=network-sandbox; Skipping tests because"
- ewarn "test suite would hang forever in such environments!"
- return 0;
- fi
-
- default
-}
-
-pkg_postinst() {
- if ! has_version "app-arch/mt-st"; then
- elog ""
- elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
- fi
-}
diff --git a/sys-block/mbuffer/mbuffer-20210209.ebuild b/sys-block/mbuffer/mbuffer-20210209.ebuild
deleted file mode 100644
index b5df3c74c1a..00000000000
--- a/sys-block/mbuffer/mbuffer-20210209.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="https://www.maier-komor.de/mbuffer.html"
-SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="debug ssl test"
-
-REQUIRED_USE="test? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? (
- dev-libs/openssl:0=
- )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-20180410-sysconfdir.patch"
- "${FILESDIR}/${PN}-20200929-find-OBJDUMP.patch"
-)
-
-src_prepare() {
- ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
-
- default
-
- mv configure.in configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable ssl md5)
- $(use_enable debug)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
- ewarn "Some tests may fail with FEATURES=usersandbox or"
- ewarn "FEATURES=network-sandbox; Skipping tests because"
- ewarn "test suite would hang forever in such environments!"
- return 0;
- fi
-
- # Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
- # using same port and src_install may have problems (with /etc folder)
- local -x MAKEOPTS=-j1
-
- default
-}
-
-pkg_postinst() {
- if ! has_version "app-arch/mt-st"; then
- elog ""
- elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/mbuffer/, sys-block/mbuffer/files/
@ 2023-12-15 20:54 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2023-12-15 20:54 UTC (permalink / raw
To: gentoo-commits
commit: 7bd179de31802be8768df5466c9de58594a4abef
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 20:53:15 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 20:53:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bd179de
sys-block/mbuffer: avoid calling which
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../mbuffer/files/mbuffer-20230301-which.patch | 23 ++++++++
sys-block/mbuffer/mbuffer-20230301-r1.ebuild | 69 ++++++++++++++++++++++
2 files changed, 92 insertions(+)
diff --git a/sys-block/mbuffer/files/mbuffer-20230301-which.patch b/sys-block/mbuffer/files/mbuffer-20230301-which.patch
new file mode 100644
index 000000000000..89054d646faf
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20230301-which.patch
@@ -0,0 +1,23 @@
+--- a/mkversion.sh
++++ b/mkversion.sh
+@@ -21,9 +21,9 @@
+
+ VERSION_H=${1:-version.h}
+ NEWFILE=`mktemp -t version.h.XXXXXXXXXX`
+-SED=`which gsed 2> /dev/null`
++SED=`command -v gsed 2> /dev/null`
+ if [ $? != 0 ]; then
+- SED=`which sed`
++ SED=`command -v sed`
+ fi
+
+ vinfo=0
+@@ -51,7 +51,7 @@ if [ -f .hg_archival.txt ]; then
+ rm $NEWFILE
+ fi
+ elif [ -d .hg ]; then
+- HG=${HG:-`which hg`}
++ HG=${HG:-`command -v hg`}
+ if [ "$?" == "0" ]; then
+ # Check if we have modified, removed, added or deleted files.
+ if [ `$HG st -mard | wc -l` != "0" ]; then
diff --git a/sys-block/mbuffer/mbuffer-20230301-r1.ebuild b/sys-block/mbuffer/mbuffer-20230301-r1.ebuild
new file mode 100644
index 000000000000..e44e9ed2ac55
--- /dev/null
+++ b/sys-block/mbuffer/mbuffer-20230301-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
+HOMEPAGE="https://www.maier-komor.de/mbuffer.html"
+SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug ssl test"
+REQUIRED_USE="test? ( ssl )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ ssl? (
+ dev-libs/openssl
+ )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-20180410-sysconfdir.patch"
+ "${FILESDIR}/${PN}-20200929-find-OBJDUMP.patch"
+ "${FILESDIR}/${PN}-20230301-which.patch"
+)
+
+src_prepare() {
+ default
+
+ ln -s "${DISTDIR}"/${P}.tgz test.tar # bug #258881
+
+ mv configure.in configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable ssl md5)
+ $(use_enable debug)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_test() {
+ if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
+ ewarn "Some tests may fail with FEATURES=usersandbox or"
+ ewarn "FEATURES=network-sandbox; Skipping tests because"
+ ewarn "test suite would hang forever in such environments!"
+ return 0;
+ fi
+
+ # Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
+ # using same port and src_install may have problems (with /etc folder)
+ local -x MAKEOPTS=-j1
+
+ default
+}
+
+pkg_postinst() {
+ if ! has_version "app-arch/mt-st"; then
+ elog ""
+ elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
+ fi
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-block/mbuffer/, sys-block/mbuffer/files/
@ 2024-07-15 1:57 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2024-07-15 1:57 UTC (permalink / raw
To: gentoo-commits
commit: f150d275f6c43793432d2c500e08e59cb1d299c8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 01:51:47 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 01:51:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f150d275
sys-block/mbuffer: drop 20220418, 20230301, 20230301-r1, 20231216
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-block/mbuffer/Manifest | 3 -
.../mbuffer/files/mbuffer-20230301-which.patch | 24 --------
sys-block/mbuffer/mbuffer-20220418.ebuild | 69 ----------------------
sys-block/mbuffer/mbuffer-20230301-r1.ebuild | 69 ----------------------
sys-block/mbuffer/mbuffer-20230301.ebuild | 68 ---------------------
sys-block/mbuffer/mbuffer-20231216.ebuild | 69 ----------------------
6 files changed, 302 deletions(-)
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 51ede79dad33..ea70de0ad676 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1,4 +1 @@
-DIST mbuffer-20220418.tgz 149535 BLAKE2B 8c7eacae791bef8ac6cd2ce57e6a5fbda7c7c233c37ccc504ad6584385df4b4df49aaf67f2d2dc7a3ee9f7e1431ba511847646a4c92616c1a4af5ac094e029e9 SHA512 aad7f764c82e3bdd4ee3fc5ac8174e716fd44cdb0418f1994d3f506d2e58264a13e15596bc8e78e9e8bb2d181875294448085bab122a2a31356d4336bb8b54a4
-DIST mbuffer-20230301.tgz 151060 BLAKE2B 45794ac6920c159fe96fccafadbaffe353e4866d8336cfe83601044b53f2289171d3fd9016cb34cf955880e7dfd2c49fe0cc99ffb3e80b7ac6ef1f6bd4cf312a SHA512 efed6e9cbd4fbb255c5f71514badd38e4fb254bf0c0f8a902636c18295f6fb640a4076d015444d1ab5e17edb3a12ecc2b3da2038f1ac1a57c44b76203bf7d66e
-DIST mbuffer-20231216.tgz 151119 BLAKE2B d077ecc77f9d772a11a11f83df1f0f5ad91b06b8845d2ab1b075649ab2efdba3d9cfa4c7053142d6b8fb3b31d63b02052d810b4e5f817d33fa6e79c858ae834b SHA512 24cd600127a1b06ed13600b050b45d2563beacaf97b3b78c6d70bf735b084209a048ae732aceb18561c0d01c72afef383d3245820991fa3410a5193e7eb493fe
DIST mbuffer-20240107.tgz 151573 BLAKE2B 9fb8d1ead6424e676f6ec0dd591cdd48b53a5b1b4a980e23101ae1e52a0f2a0d07048208f8ae6c45aee66f963b7ed9720b47b16b04495bcba97489a87d8c8d8f SHA512 14773c1193ed5e4a0dfda4ef6bd6ccb0cf104f8c4ae1d22747e52e8247aeb1db64656700f9cf317b13140fb649db889831233f0b8fef0a8463d28713b5882977
diff --git a/sys-block/mbuffer/files/mbuffer-20230301-which.patch b/sys-block/mbuffer/files/mbuffer-20230301-which.patch
deleted file mode 100644
index 94396d4f0bd0..000000000000
--- a/sys-block/mbuffer/files/mbuffer-20230301-which.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Sent upstream by email on 2023-12-16.
---- a/mkversion.sh
-+++ b/mkversion.sh
-@@ -21,9 +21,9 @@
-
- VERSION_H=${1:-version.h}
- NEWFILE=`mktemp -t version.h.XXXXXXXXXX`
--SED=`which gsed 2> /dev/null`
-+SED=`command -v gsed 2> /dev/null`
- if [ $? != 0 ]; then
-- SED=`which sed`
-+ SED=`command -v sed`
- fi
-
- vinfo=0
-@@ -51,7 +51,7 @@ if [ -f .hg_archival.txt ]; then
- rm $NEWFILE
- fi
- elif [ -d .hg ]; then
-- HG=${HG:-`which hg`}
-+ HG=${HG:-`command -v hg`}
- if [ "$?" == "0" ]; then
- # Check if we have modified, removed, added or deleted files.
- if [ `$HG st -mard | wc -l` != "0" ]; then
diff --git a/sys-block/mbuffer/mbuffer-20220418.ebuild b/sys-block/mbuffer/mbuffer-20220418.ebuild
deleted file mode 100644
index 765cb07386ad..000000000000
--- a/sys-block/mbuffer/mbuffer-20220418.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="https://www.maier-komor.de/mbuffer.html"
-SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~riscv x86"
-IUSE="debug ssl test"
-
-REQUIRED_USE="test? ( ssl )"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="ssl? (
- dev-libs/openssl:0=
- )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-20180410-sysconfdir.patch"
- "${FILESDIR}/${PN}-20200929-find-OBJDUMP.patch"
-)
-
-src_prepare() {
- ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
-
- default
-
- mv configure.in configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable ssl md5)
- $(use_enable debug)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
- ewarn "Some tests may fail with FEATURES=usersandbox or"
- ewarn "FEATURES=network-sandbox; Skipping tests because"
- ewarn "test suite would hang forever in such environments!"
- return 0;
- fi
-
- # Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
- # using same port and src_install may have problems (with /etc folder)
- local -x MAKEOPTS=-j1
-
- default
-}
-
-pkg_postinst() {
- if ! has_version "app-arch/mt-st"; then
- elog ""
- elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
- fi
-}
diff --git a/sys-block/mbuffer/mbuffer-20230301-r1.ebuild b/sys-block/mbuffer/mbuffer-20230301-r1.ebuild
deleted file mode 100644
index 711276f54b8f..000000000000
--- a/sys-block/mbuffer/mbuffer-20230301-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="https://www.maier-komor.de/mbuffer.html"
-SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="debug ssl test"
-REQUIRED_USE="test? ( ssl )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- ssl? (
- dev-libs/openssl
- )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-20180410-sysconfdir.patch"
- "${FILESDIR}/${PN}-20200929-find-OBJDUMP.patch"
- "${FILESDIR}/${PN}-20230301-which.patch"
-)
-
-src_prepare() {
- default
-
- ln -s "${DISTDIR}"/${P}.tgz test.tar # bug #258881
-
- mv configure.in configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable ssl md5)
- $(use_enable debug)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
- ewarn "Some tests may fail with FEATURES=usersandbox or"
- ewarn "FEATURES=network-sandbox; Skipping tests because"
- ewarn "test suite would hang forever in such environments!"
- return 0;
- fi
-
- # Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
- # using same port and src_install may have problems (with /etc folder)
- local -x MAKEOPTS=-j1
-
- default
-}
-
-pkg_postinst() {
- if ! has_version "app-arch/mt-st"; then
- elog ""
- elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
- fi
-}
diff --git a/sys-block/mbuffer/mbuffer-20230301.ebuild b/sys-block/mbuffer/mbuffer-20230301.ebuild
deleted file mode 100644
index aeec636f67cd..000000000000
--- a/sys-block/mbuffer/mbuffer-20230301.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="https://www.maier-komor.de/mbuffer.html"
-SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="debug ssl test"
-REQUIRED_USE="test? ( ssl )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- ssl? (
- dev-libs/openssl
- )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-20180410-sysconfdir.patch"
- "${FILESDIR}/${PN}-20200929-find-OBJDUMP.patch"
-)
-
-src_prepare() {
- default
-
- ln -s "${DISTDIR}"/${P}.tgz test.tar # bug #258881
-
- mv configure.in configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable ssl md5)
- $(use_enable debug)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
- ewarn "Some tests may fail with FEATURES=usersandbox or"
- ewarn "FEATURES=network-sandbox; Skipping tests because"
- ewarn "test suite would hang forever in such environments!"
- return 0;
- fi
-
- # Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
- # using same port and src_install may have problems (with /etc folder)
- local -x MAKEOPTS=-j1
-
- default
-}
-
-pkg_postinst() {
- if ! has_version "app-arch/mt-st"; then
- elog ""
- elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
- fi
-}
diff --git a/sys-block/mbuffer/mbuffer-20231216.ebuild b/sys-block/mbuffer/mbuffer-20231216.ebuild
deleted file mode 100644
index 6d8e6e093eed..000000000000
--- a/sys-block/mbuffer/mbuffer-20231216.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
-HOMEPAGE="https://www.maier-komor.de/mbuffer.html"
-SRC_URI="https://www.maier-komor.de/software/mbuffer/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="debug ssl test"
-REQUIRED_USE="test? ( ssl )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- ssl? (
- dev-libs/openssl
- )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-20180410-sysconfdir.patch"
- "${FILESDIR}/${PN}-20200929-find-OBJDUMP.patch"
- "${FILESDIR}/${PN}-20231216-autoconf-warning.patch"
-)
-
-src_prepare() {
- default
-
- ln -s "${DISTDIR}"/${P}.tgz test.tar # bug #258881
-
- mv configure.in configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable ssl md5)
- $(use_enable debug)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
- ewarn "Some tests may fail with FEATURES=usersandbox or"
- ewarn "FEATURES=network-sandbox; Skipping tests because"
- ewarn "test suite would hang forever in such environments!"
- return 0;
- fi
-
- # Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
- # using same port and src_install may have problems (with /etc folder)
- local -x MAKEOPTS=-j1
-
- default
-}
-
-pkg_postinst() {
- if ! has_version "app-arch/mt-st"; then
- elog ""
- elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
- fi
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-07-15 1:58 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-15 1:57 [gentoo-commits] repo/gentoo:master commit in: sys-block/mbuffer/, sys-block/mbuffer/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-12-15 20:54 Sam James
2021-05-14 22:14 David Seifert
2020-10-02 12:12 Thomas Deutschmann
2018-03-27 9:31 Lars Wendler
2017-11-07 10:57 Thomas Deutschmann
2017-10-10 18:27 Thomas Deutschmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox