diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-block/nbd/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
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
Diffstat (limited to 'sys-block/nbd/files')
-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 |
2 files changed, 97 insertions, 0 deletions
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 new file mode 100644 index 000000000000..eff90faa1962 --- /dev/null +++ b/sys-block/nbd/files/nbd-3.5-gznbd-printf-u64.patch @@ -0,0 +1,59 @@ +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 new file mode 100644 index 000000000000..e4609e03ab7a --- /dev/null +++ b/sys-block/nbd/files/nbd-3.5-gznbd-zlib.patch @@ -0,0 +1,38 @@ +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 + |