Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	BUGS
	package/autoconf/Makefile

1 files changed, 0 insertions, 35 deletions

diff --git a/package/util-linux-ng/patches/patch-fdisk_sfdisk_c b/package/util-linux-ng/patches/patch-fdisk_sfdisk_c
deleted file mode 100644
index a4778b60c..000000000
--- a/package/util-linux-ng/patches/patch-fdisk_sfdisk_c
+++ /dev/null
@@ -1,35 +0,0 @@
---- util-linux-ng-2.15.orig/fdisk/sfdisk.c	2009-05-05 21:16:46.000000000 +0200
-+++ util-linux-ng-2.15/fdisk/sfdisk.c	2009-06-22 22:41:09.000000000 +0200
-@@ -1725,12 +1725,12 @@ read_stdin(char **fields, char *line, in
- 	eof = 1;
- 	return RD_EOF;
-     }
--    if (!(lp = index(lp, '\n')))
-+    if (!(lp = strchr(lp, '\n')))
-       fatal(_("long or incomplete input line - quitting\n"));
-     *lp = 0;
- 
-     /* remove comments, if any */
--    if ((lp = index(line+2, '#')) != 0)
-+    if ((lp = strchr(line+2, '#')) != 0)
-       *lp = 0;
- 
-     /* recognize a few commands - to be expanded */
-@@ -1740,7 +1740,7 @@ read_stdin(char **fields, char *line, in
-     }
- 
-     /* dump style? - then bad input is fatal */
--    if ((ip = index(line+2, ':')) != 0) {
-+    if ((ip = strchr(line+2, ':')) != 0) {
- 	struct dumpfld *d;
- 
-       nxtfld:
-@@ -2503,7 +2503,7 @@ main(int argc, char **argv) {
- 
-     if (argc < 1)
-       fatal(_("no command?\n"));
--    if ((progn = rindex(argv[0], '/')) == NULL)
-+    if ((progn = strrchr(argv[0], '/')) == NULL)
-       progn = argv[0];
-     else
-       progn++;