1 |
commit: a7381c039443092262fc1be972fe960fd4cf6c96 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 23 13:39:57 2016 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 23 13:39:57 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7381c03 |
7 |
|
8 |
sys-block/nbd: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
sys-block/nbd/Manifest | 1 - |
13 |
.../nbd/files/nbd-3.12.1-readit-and-weep.patch | 16 ------ |
14 |
sys-block/nbd/files/nbd-3.5-gznbd-printf-u64.patch | 59 ---------------------- |
15 |
sys-block/nbd/files/nbd-3.5-gznbd-zlib.patch | 38 -------------- |
16 |
sys-block/nbd/nbd-3.13.ebuild | 29 ----------- |
17 |
5 files changed, 143 deletions(-) |
18 |
|
19 |
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest |
20 |
index d71f296..8a000c8 100644 |
21 |
--- a/sys-block/nbd/Manifest |
22 |
+++ b/sys-block/nbd/Manifest |
23 |
@@ -1,4 +1,3 @@ |
24 |
DIST nbd-3.11.tar.xz 451992 SHA256 14420f74cb16dc609a9302ed1efd653064bed7a8357e9d73daabc33608e3f2a0 SHA512 8d0abf673c7a2a7fbc5a57e0ee1093c86ca205eb664ea08143ff4ce3c8fd94b81a0e89491145159d863d181f70e9ba109487b967097c91fc2399316226bcec0a WHIRLPOOL 23f29b0e82e4672f5edfa223b7b26552ceb7505b6ff43efa151e3357811a2d4f1b599d6b9553a89e07b90b7322a3ac88f256a66d5d7e850758ea5cee4125d849 |
25 |
-DIST nbd-3.13.tar.xz 459756 SHA256 8597cd97a41930dfcbcc6ce7cf910f6b609771718a4f1680713c2f2ba5cc200d SHA512 da1f6c1aab10baf7ef10062481f3a26dfa142f5cfc21fb7abc90f6eb9906df619331dbb36b693c52d4a7a5fe0923f6179b59eea74033cb1278dca99b192cdbff WHIRLPOOL e2d875c31215bc3e1594143b198d8a87abcfe1faf508057db9f766561edd3ca7d35f243330af71938228b61c2fe31250a59ece9f87291d967fdbd0575eec99b9 |
26 |
DIST nbd-3.14.tar.xz 480260 SHA256 4d3d230ecc0a1302dc08d89f2a12d7596a8745f2b10da9bb035bbeb9ede78631 SHA512 f65c8bfb9f35931da6ec41bbcf94a34268fb7166b5df224ce525319bb053aa3ed174d242369cffc57a2e0d685c6a540cd2498f8044cd25c0c5bdeb92e9f099d0 WHIRLPOOL 7aef5b4ef84a2667ef7bdf1415f0a724acbf9aba8a67996cdb7721754b5ec0209814e46736dc362f49ffd7324163a4a979d94fd339a2055e419625100678eea7 |
27 |
DIST nbd-3.15.1.tar.xz 505360 SHA256 ac1108dfdaffe1cf01f5f0f34c738771184bf6ff4a503edefaf10a961f8b8745 SHA512 7ed3cf32c3f5b865b831a62b2dcbd303a173b21a74881d4ad71dd775e284d86193a9b269db23f57489df70c95c325a20fabf03f4d20e6bd56aca3f9cd83e9821 WHIRLPOOL 057bea2e1c0631070c457b2516b7041169bdfb69eee448352ed2f28ed80942f329fa529696b7bdcfee66a293be14845affa24673348de1f1e8962029f28f5f68 |
28 |
|
29 |
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 |
30 |
deleted file mode 100644 |
31 |
index 6e0a31d..00000000 |
32 |
--- a/sys-block/nbd/files/nbd-3.12.1-readit-and-weep.patch |
33 |
+++ /dev/null |
34 |
@@ -1,16 +0,0 @@ |
35 |
---- a/cliserv.c |
36 |
-+++ b/cliserv.c |
37 |
-@@ -81,6 +81,7 @@ |
38 |
- hi = ntohl(hi); |
39 |
- return ((u64) lo) << 32U | hi; |
40 |
- } |
41 |
-+#endif |
42 |
- |
43 |
- /** |
44 |
- * Read data from a file descriptor into a buffer |
45 |
-@@ -103,5 +104,3 @@ |
46 |
- } |
47 |
- } |
48 |
- } |
49 |
-- |
50 |
--#endif |
51 |
|
52 |
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 |
53 |
deleted file mode 100644 |
54 |
index eff90fa..00000000 |
55 |
--- a/sys-block/nbd/files/nbd-3.5-gznbd-printf-u64.patch |
56 |
+++ /dev/null |
57 |
@@ -1,59 +0,0 @@ |
58 |
-From 90024f17b682e20a34f35a6ccb437edc10eb5c3b Mon Sep 17 00:00:00 2001 |
59 |
-From: Mike Frysinger <vapier@g.o> |
60 |
-Date: Mon, 2 Dec 2013 00:22:46 -0500 |
61 |
-Subject: [PATCH 1/2] gznbd: use PRId64 for printing 64bit types |
62 |
- |
63 |
-Gcc complains about printing these 64bit types: |
64 |
- |
65 |
-gznbd.c:199:1: warning: format '%Ld' expects argument of type 'long long int', |
66 |
- but argument 5 has type 'u64' [-Wformat] |
67 |
- |
68 |
-Use the standard defines from inttypes.h to avoid this issue. |
69 |
- |
70 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
71 |
---- |
72 |
- gznbd/gznbd.c | 7 ++++--- |
73 |
- 1 file changed, 4 insertions(+), 3 deletions(-) |
74 |
- |
75 |
-diff --git a/gznbd/gznbd.c b/gznbd/gznbd.c |
76 |
-index 09f3d49..bb41156 100644 |
77 |
---- a/gznbd/gznbd.c |
78 |
-+++ b/gznbd/gznbd.c |
79 |
-@@ -40,6 +40,7 @@ |
80 |
- #include <fcntl.h> |
81 |
- #include <syslog.h> |
82 |
- #include <unistd.h> |
83 |
-+#include <inttypes.h> |
84 |
- |
85 |
- #include <sys/ioctl.h> |
86 |
- #include <sys/types.h> |
87 |
-@@ -95,7 +96,7 @@ int main(int argc, char **argv) |
88 |
- fprintf(stderr,"%s: %s does not appear to be a valid size\n",argv[0],argv[3]); |
89 |
- exit(1); |
90 |
- } |
91 |
-- printf("%s: file=%s, size=%Ld\n",argv[0],argv[2],size); |
92 |
-+ printf("%s: file=%s, size=%"PRId64"\n",argv[0],argv[2],size); |
93 |
- } else { |
94 |
- char buffer[BLOCK]; |
95 |
- int result; |
96 |
-@@ -110,7 +111,7 @@ int main(int argc, char **argv) |
97 |
- } |
98 |
- |
99 |
- if(result==0){ |
100 |
-- printf("size=%Ld\n",size); |
101 |
-+ printf("size=%"PRId64"\n",size); |
102 |
- } else { |
103 |
- printf("failed\n"); |
104 |
- if(result<0){ |
105 |
-@@ -195,7 +196,7 @@ int main(int argc, char **argv) |
106 |
- from=ntohll(request.from); |
107 |
- |
108 |
- #ifdef TRACE |
109 |
--fprintf(stderr,"%s: len=%d, from=%Ld\n",argv[0],len,from); |
110 |
-+fprintf(stderr,"%s: len=%d, from=%"PRId64"\n",argv[0],len,from); |
111 |
- #endif |
112 |
- |
113 |
- if(request.magic!=htonl(NBD_REQUEST_MAGIC)){ |
114 |
--- |
115 |
-1.8.4.3 |
116 |
- |
117 |
|
118 |
diff --git a/sys-block/nbd/files/nbd-3.5-gznbd-zlib.patch b/sys-block/nbd/files/nbd-3.5-gznbd-zlib.patch |
119 |
deleted file mode 100644 |
120 |
index e4609e0..00000000 |
121 |
--- a/sys-block/nbd/files/nbd-3.5-gznbd-zlib.patch |
122 |
+++ /dev/null |
123 |
@@ -1,38 +0,0 @@ |
124 |
-From 172a5a7c5824237537051247f203a39cc39e3aef Mon Sep 17 00:00:00 2001 |
125 |
-From: Mike Frysinger <vapier@g.o> |
126 |
-Date: Mon, 2 Dec 2013 00:24:01 -0500 |
127 |
-Subject: [PATCH 2/2] gznbd: fix warning with newer zlib |
128 |
- |
129 |
-When you build against newer zlib, you get a lot of warnings like so: |
130 |
- |
131 |
-gznbd.c: In function 'main': |
132 |
-gznbd.c:87:5: warning: assignment from incompatible pointer type [enabled by default] |
133 |
-gznbd.c:109:5: warning: passing argument 1 of 'gzread' from incompatible pointer type [enabled by default] |
134 |
-In file included from gznbd.c:37:0: |
135 |
-/usr/include/zlib.h:1313:21: note: expected 'gzFile' but argument is of type 'struct gzFile_s **' |
136 |
-gznbd.c:118:9: warning: passing argument 1 of 'gzerror' from incompatible pointer type [enabled by default] |
137 |
- |
138 |
-This is because the zlib API uses just gzFile everywhere, not a pointer |
139 |
-to a gzFile. |
140 |
- |
141 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
142 |
---- |
143 |
- gznbd/gznbd.c | 2 +- |
144 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
145 |
- |
146 |
-diff --git a/gznbd/gznbd.c b/gznbd/gznbd.c |
147 |
-index bb41156..803c1c1 100644 |
148 |
---- a/gznbd/gznbd.c |
149 |
-+++ b/gznbd/gznbd.c |
150 |
-@@ -68,7 +68,7 @@ int main(int argc, char **argv) |
151 |
- int pr[2]; |
152 |
- int sk; |
153 |
- int nbd; |
154 |
-- gzFile *gz; |
155 |
-+ gzFile gz; |
156 |
- int gzerr; |
157 |
- |
158 |
- char chunk[CHUNK]; |
159 |
--- |
160 |
-1.8.4.3 |
161 |
- |
162 |
|
163 |
diff --git a/sys-block/nbd/nbd-3.13.ebuild b/sys-block/nbd/nbd-3.13.ebuild |
164 |
deleted file mode 100644 |
165 |
index 8a6f5fc..00000000 |
166 |
--- a/sys-block/nbd/nbd-3.13.ebuild |
167 |
+++ /dev/null |
168 |
@@ -1,29 +0,0 @@ |
169 |
-# Copyright 1999-2016 Gentoo Foundation |
170 |
-# Distributed under the terms of the GNU General Public License v2 |
171 |
-# $Id$ |
172 |
- |
173 |
-EAPI=5 |
174 |
- |
175 |
-inherit eutils toolchain-funcs |
176 |
- |
177 |
-DESCRIPTION="Userland client/server for kernel network block device" |
178 |
-HOMEPAGE="http://nbd.sourceforge.net/" |
179 |
-SRC_URI="mirror://sourceforge/nbd/${P}.tar.xz" |
180 |
- |
181 |
-LICENSE="GPL-2" |
182 |
-SLOT="0" |
183 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
184 |
-IUSE="debug zlib" |
185 |
- |
186 |
-RDEPEND=">=dev-libs/glib-2.0 |
187 |
- zlib? ( sys-libs/zlib )" |
188 |
-DEPEND="${RDEPEND} |
189 |
- virtual/pkgconfig" |
190 |
- |
191 |
-src_configure() { |
192 |
- econf \ |
193 |
- --enable-lfs \ |
194 |
- $(use_enable !debug syslog) \ |
195 |
- $(use_enable debug) \ |
196 |
- $(use_enable zlib gznbd) |
197 |
-} |