diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2016-12-23 14:39:57 +0100 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2016-12-23 14:39:57 +0100 |
commit | a7381c039443092262fc1be972fe960fd4cf6c96 (patch) | |
tree | ac90830c9c15957aca912e493fc4c627e9cd2f9c /sys-block/nbd | |
parent | 37df5cb14d830f6fd814677291d8e36653df7363 (diff) | |
download | gentoo-a7381c039443092262fc1be972fe960fd4cf6c96.tar.gz gentoo-a7381c039443092262fc1be972fe960fd4cf6c96.tar.xz |
sys-block/nbd: Removed old.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'sys-block/nbd')
-rw-r--r-- | sys-block/nbd/Manifest | 1 | ||||
-rw-r--r-- | sys-block/nbd/files/nbd-3.12.1-readit-and-weep.patch | 16 | ||||
-rw-r--r-- | sys-block/nbd/files/nbd-3.5-gznbd-printf-u64.patch | 59 | ||||
-rw-r--r-- | sys-block/nbd/files/nbd-3.5-gznbd-zlib.patch | 38 | ||||
-rw-r--r-- | sys-block/nbd/nbd-3.13.ebuild | 29 |
5 files changed, 0 insertions, 143 deletions
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest index d71f2967e4e..8a000c84098 100644 --- a/sys-block/nbd/Manifest +++ b/sys-block/nbd/Manifest @@ -1,4 +1,3 @@ DIST nbd-3.11.tar.xz 451992 SHA256 14420f74cb16dc609a9302ed1efd653064bed7a8357e9d73daabc33608e3f2a0 SHA512 8d0abf673c7a2a7fbc5a57e0ee1093c86ca205eb664ea08143ff4ce3c8fd94b81a0e89491145159d863d181f70e9ba109487b967097c91fc2399316226bcec0a WHIRLPOOL 23f29b0e82e4672f5edfa223b7b26552ceb7505b6ff43efa151e3357811a2d4f1b599d6b9553a89e07b90b7322a3ac88f256a66d5d7e850758ea5cee4125d849 -DIST nbd-3.13.tar.xz 459756 SHA256 8597cd97a41930dfcbcc6ce7cf910f6b609771718a4f1680713c2f2ba5cc200d SHA512 da1f6c1aab10baf7ef10062481f3a26dfa142f5cfc21fb7abc90f6eb9906df619331dbb36b693c52d4a7a5fe0923f6179b59eea74033cb1278dca99b192cdbff WHIRLPOOL e2d875c31215bc3e1594143b198d8a87abcfe1faf508057db9f766561edd3ca7d35f243330af71938228b61c2fe31250a59ece9f87291d967fdbd0575eec99b9 DIST nbd-3.14.tar.xz 480260 SHA256 4d3d230ecc0a1302dc08d89f2a12d7596a8745f2b10da9bb035bbeb9ede78631 SHA512 f65c8bfb9f35931da6ec41bbcf94a34268fb7166b5df224ce525319bb053aa3ed174d242369cffc57a2e0d685c6a540cd2498f8044cd25c0c5bdeb92e9f099d0 WHIRLPOOL 7aef5b4ef84a2667ef7bdf1415f0a724acbf9aba8a67996cdb7721754b5ec0209814e46736dc362f49ffd7324163a4a979d94fd339a2055e419625100678eea7 DIST nbd-3.15.1.tar.xz 505360 SHA256 ac1108dfdaffe1cf01f5f0f34c738771184bf6ff4a503edefaf10a961f8b8745 SHA512 7ed3cf32c3f5b865b831a62b2dcbd303a173b21a74881d4ad71dd775e284d86193a9b269db23f57489df70c95c325a20fabf03f4d20e6bd56aca3f9cd83e9821 WHIRLPOOL 057bea2e1c0631070c457b2516b7041169bdfb69eee448352ed2f28ed80942f329fa529696b7bdcfee66a293be14845affa24673348de1f1e8962029f28f5f68 diff --git a/sys-block/nbd/files/nbd-3.12.1-readit-and-weep.patch b/sys-block/nbd/files/nbd-3.12.1-readit-and-weep.patch deleted file mode 100644 index 6e0a31d6b4e..00000000000 --- a/sys-block/nbd/files/nbd-3.12.1-readit-and-weep.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/cliserv.c -+++ b/cliserv.c -@@ -81,6 +81,7 @@ - hi = ntohl(hi); - return ((u64) lo) << 32U | hi; - } -+#endif - - /** - * Read data from a file descriptor into a buffer -@@ -103,5 +104,3 @@ - } - } - } -- --#endif diff --git a/sys-block/nbd/files/nbd-3.5-gznbd-printf-u64.patch b/sys-block/nbd/files/nbd-3.5-gznbd-printf-u64.patch deleted file mode 100644 index eff90faa196..00000000000 --- a/sys-block/nbd/files/nbd-3.5-gznbd-printf-u64.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 90024f17b682e20a34f35a6ccb437edc10eb5c3b Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 2 Dec 2013 00:22:46 -0500 -Subject: [PATCH 1/2] gznbd: use PRId64 for printing 64bit types - -Gcc complains about printing these 64bit types: - -gznbd.c:199:1: warning: format '%Ld' expects argument of type 'long long int', - but argument 5 has type 'u64' [-Wformat] - -Use the standard defines from inttypes.h to avoid this issue. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - gznbd/gznbd.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/gznbd/gznbd.c b/gznbd/gznbd.c -index 09f3d49..bb41156 100644 ---- a/gznbd/gznbd.c -+++ b/gznbd/gznbd.c -@@ -40,6 +40,7 @@ - #include <fcntl.h> - #include <syslog.h> - #include <unistd.h> -+#include <inttypes.h> - - #include <sys/ioctl.h> - #include <sys/types.h> -@@ -95,7 +96,7 @@ int main(int argc, char **argv) - fprintf(stderr,"%s: %s does not appear to be a valid size\n",argv[0],argv[3]); - exit(1); - } -- printf("%s: file=%s, size=%Ld\n",argv[0],argv[2],size); -+ printf("%s: file=%s, size=%"PRId64"\n",argv[0],argv[2],size); - } else { - char buffer[BLOCK]; - int result; -@@ -110,7 +111,7 @@ int main(int argc, char **argv) - } - - if(result==0){ -- printf("size=%Ld\n",size); -+ printf("size=%"PRId64"\n",size); - } else { - printf("failed\n"); - if(result<0){ -@@ -195,7 +196,7 @@ int main(int argc, char **argv) - from=ntohll(request.from); - - #ifdef TRACE --fprintf(stderr,"%s: len=%d, from=%Ld\n",argv[0],len,from); -+fprintf(stderr,"%s: len=%d, from=%"PRId64"\n",argv[0],len,from); - #endif - - if(request.magic!=htonl(NBD_REQUEST_MAGIC)){ --- -1.8.4.3 - diff --git a/sys-block/nbd/files/nbd-3.5-gznbd-zlib.patch b/sys-block/nbd/files/nbd-3.5-gznbd-zlib.patch deleted file mode 100644 index e4609e03ab7..00000000000 --- a/sys-block/nbd/files/nbd-3.5-gznbd-zlib.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 172a5a7c5824237537051247f203a39cc39e3aef Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 2 Dec 2013 00:24:01 -0500 -Subject: [PATCH 2/2] gznbd: fix warning with newer zlib - -When you build against newer zlib, you get a lot of warnings like so: - -gznbd.c: In function 'main': -gznbd.c:87:5: warning: assignment from incompatible pointer type [enabled by default] -gznbd.c:109:5: warning: passing argument 1 of 'gzread' from incompatible pointer type [enabled by default] -In file included from gznbd.c:37:0: -/usr/include/zlib.h:1313:21: note: expected 'gzFile' but argument is of type 'struct gzFile_s **' -gznbd.c:118:9: warning: passing argument 1 of 'gzerror' from incompatible pointer type [enabled by default] - -This is because the zlib API uses just gzFile everywhere, not a pointer -to a gzFile. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - gznbd/gznbd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gznbd/gznbd.c b/gznbd/gznbd.c -index bb41156..803c1c1 100644 ---- a/gznbd/gznbd.c -+++ b/gznbd/gznbd.c -@@ -68,7 +68,7 @@ int main(int argc, char **argv) - int pr[2]; - int sk; - int nbd; -- gzFile *gz; -+ gzFile gz; - int gzerr; - - char chunk[CHUNK]; --- -1.8.4.3 - diff --git a/sys-block/nbd/nbd-3.13.ebuild b/sys-block/nbd/nbd-3.13.ebuild deleted file mode 100644 index 8a6f5fc0c1f..00000000000 --- a/sys-block/nbd/nbd-3.13.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils toolchain-funcs - -DESCRIPTION="Userland client/server for kernel network block device" -HOMEPAGE="http://nbd.sourceforge.net/" -SRC_URI="mirror://sourceforge/nbd/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug zlib" - -RDEPEND=">=dev-libs/glib-2.0 - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_configure() { - econf \ - --enable-lfs \ - $(use_enable !debug syslog) \ - $(use_enable debug) \ - $(use_enable zlib gznbd) -} |