From 8ea22e35dfa5460b6a0002d4902d8363c04b516d Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Mon, 4 Apr 2011 13:46:22 +0200 Subject: [PATCH] sfdisk: Added sfdisk 3.07 - sfdisk ripped out from util-linux --- .../sfdisk.001.include_sys_syscalls_h.patch | 31 +++++++++++++++ .../sfdisk/sfdisk.005.no-llseek-fix.patch | 39 +++++++++++++++++++ .../sfdisk/sfdisk.010.index-rindex-fix.patch | 39 +++++++++++++++++++ filesystem/sfdisk/sfdisk.conf | 17 ++++++++ filesystem/sfdisk/sfdisk.desc | 30 ++++++++++++++ 5 files changed, 156 insertions(+) create mode 100644 filesystem/sfdisk/sfdisk.001.include_sys_syscalls_h.patch create mode 100644 filesystem/sfdisk/sfdisk.005.no-llseek-fix.patch create mode 100644 filesystem/sfdisk/sfdisk.010.index-rindex-fix.patch create mode 100644 filesystem/sfdisk/sfdisk.conf create mode 100644 filesystem/sfdisk/sfdisk.desc diff --git a/filesystem/sfdisk/sfdisk.001.include_sys_syscalls_h.patch b/filesystem/sfdisk/sfdisk.001.include_sys_syscalls_h.patch new file mode 100644 index 000000000..926328a1f --- /dev/null +++ b/filesystem/sfdisk/sfdisk.001.include_sys_syscalls_h.patch @@ -0,0 +1,31 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../sfdisk/sfdisk.001.include_sys_syscalls_h.patch +# Copyright (C) 2011 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Imported from buildroot +http://git.uclibc.org/buildroot/tree/package/sfdisk + +--- sfdisk/sfdisk.c.oorig 2006-10-09 16:24:06.000000000 +0200 ++++ sfdisk/sfdisk.c 2006-10-09 16:24:20.000000000 +0200 +@@ -47,6 +47,9 @@ + #include + #include + #ifdef __linux__ ++#define _LIBC ++#include ++#undef _LIBC + #include /* _syscall */ + #endif + #include "nls.h" diff --git a/filesystem/sfdisk/sfdisk.005.no-llseek-fix.patch b/filesystem/sfdisk/sfdisk.005.no-llseek-fix.patch new file mode 100644 index 000000000..5bf0b786f --- /dev/null +++ b/filesystem/sfdisk/sfdisk.005.no-llseek-fix.patch @@ -0,0 +1,39 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../sfdisk/sfdisk.005.no-llseek-fix.patch +# Copyright (C) 2011 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Imported from buildroot +http://git.uclibc.org/buildroot/tree/package/sfdisk + +--- sfdisk_vanilla/sfdisk.c 2004-01-13 13:03:11.000000000 +0000 ++++ sfdisk_llseek-fix/sfdisk.c 2008-04-17 08:42:35.000000000 +0000 +@@ -134,9 +137,17 @@ + * Note: we use 512-byte sectors here, irrespective of the hardware ss. + */ + #if defined(__linux__) && !defined (__alpha__) && !defined (__ia64__) && !defined (__x86_64__) && !defined (__s390x__) ++#if defined(_llseek) + static + _syscall5(int, _llseek, unsigned int, fd, ulong, hi, ulong, lo, + loff_t *, res, unsigned int, wh); ++#else ++static int _llseek (unsigned int fd, unsigned long oh, ++ unsigned long ol, long long *result, ++ unsigned int origin) { ++ return syscall (__NR__llseek, fd, oh, ol, result, origin); ++#endif ++} + #endif + + static int diff --git a/filesystem/sfdisk/sfdisk.010.index-rindex-fix.patch b/filesystem/sfdisk/sfdisk.010.index-rindex-fix.patch new file mode 100644 index 000000000..349be01c9 --- /dev/null +++ b/filesystem/sfdisk/sfdisk.010.index-rindex-fix.patch @@ -0,0 +1,39 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../sfdisk/sfdisk.010.index-rindex-fix.patch +# Copyright (C) 2011 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + +Imported from buildroot +http://git.uclibc.org/buildroot/tree/package/sfdisk + +--- sfdisk_llseek-fix/sfdisk.c 2008-04-17 08:42:35.000000000 +0000 ++++ sfdisk_index-rindex-fix/sfdisk.c 2008-04-17 09:50:17.000000000 +0000 +@@ -58,6 +58,17 @@ + + #define SIZE(a) (sizeof(a)/sizeof(a[0])) + ++/* ++ * Why these wouldn't be defined in string.h, I don't know, there is a block ++ * testing for BSD, and no other mention of these functions ... NK ++ */ ++#if !defined(index) ++# define index(s,c) strchr((s), (c)) ++#endif ++#if !defined(rindex) ++# define rindex(s,c) strrchr((s), (c)) ++#endif ++ + /* + * Table of contents: + * A. About seeking diff --git a/filesystem/sfdisk/sfdisk.conf b/filesystem/sfdisk/sfdisk.conf new file mode 100644 index 000000000..9accecab7 --- /dev/null +++ b/filesystem/sfdisk/sfdisk.conf @@ -0,0 +1,17 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../sfdisk/sfdisk.conf +# Copyright (C) 2011 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. A copy of the +# GNU General Public License can be found in the file COPYING. +# --- SDE-COPYRIGHT-NOTE-END --- + +makeinstopt= + +hook_add postmake 5 'cp -vf sfdisk "$root$sbindir"' diff --git a/filesystem/sfdisk/sfdisk.desc b/filesystem/sfdisk/sfdisk.desc new file mode 100644 index 000000000..3c8d3b94e --- /dev/null +++ b/filesystem/sfdisk/sfdisk.desc @@ -0,0 +1,30 @@ +[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] +[COPY] Filename: package/.../sfdisk/sfdisk.desc +[COPY] Copyright (C) 2011 The OpenSDE Project +[COPY] +[COPY] More information can be found in the files COPYING and README. +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; version 2 of the License. A copy of the +[COPY] GNU General Public License can be found in the file COPYING. +[COPY] --- SDE-COPYRIGHT-NOTE-END --- + +[I] sfdisk ripped out from util-linux + +[T] sfdisk ripped out from util-linux by Erik Andersen for embedded usage. + +[A] Andries E. Brouwer +[A] Erik Andersen +[M] Alejandro Mery + +[C] extra/tool + +[L] GPL +[S] Stable +[V] 3.07 +[P] O -?---5---9 800.000 + +[D] 4082996365 sfdisk-3.07.tar.bz2 !http://www.uclibc.org/sfdisk.tar.bz2