From 2a75c7283706bfc5f37d1d2636d19274c645c270 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Tue, 9 Aug 2011 18:20:23 +0200 Subject: util-linux: remove obsolete patches Signed-off-by: Michael Olbrich --- ...place-mkostmps-with-more-portable-mkstemp.patch | 63 ---------------------- .../0006-partx-lsblk-fix-gettext-calls.patch | 40 -------------- 2 files changed, 103 deletions(-) delete mode 100644 patches/util-linux-2.19.1/0005-libmount-replace-mkostmps-with-more-portable-mkstemp.patch delete mode 100644 patches/util-linux-2.19.1/0006-partx-lsblk-fix-gettext-calls.patch diff --git a/patches/util-linux-2.19.1/0005-libmount-replace-mkostmps-with-more-portable-mkstemp.patch b/patches/util-linux-2.19.1/0005-libmount-replace-mkostmps-with-more-portable-mkstemp.patch deleted file mode 100644 index 7f350bc3a..000000000 --- a/patches/util-linux-2.19.1/0005-libmount-replace-mkostmps-with-more-portable-mkstemp.patch +++ /dev/null @@ -1,63 +0,0 @@ -From: Karel Zak -Date: Fri, 11 Feb 2011 10:18:00 +0100 -Subject: [PATCH] libmount: replace mkostmps() with more portable mkstemp() - -Reported-by: Peter Breitenlohner -Signed-off-by: Karel Zak ---- - shlibs/mount/src/mountP.h | 2 +- - shlibs/mount/src/tab_update.c | 2 +- - shlibs/mount/src/utils.c | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/shlibs/mount/src/mountP.h b/shlibs/mount/src/mountP.h -index aeceb7f..71314a5 100644 ---- a/shlibs/mount/src/mountP.h -+++ b/shlibs/mount/src/mountP.h -@@ -118,7 +118,7 @@ extern int mnt_in_group(gid_t gid); - - extern char *mnt_get_mountpoint(const char *path); - extern char *mnt_get_fs_root(const char *path, const char *mountpoint); --extern int mnt_open_uniq_filename(const char *filename, char **name, int flags); -+extern int mnt_open_uniq_filename(const char *filename, char **name); - extern int mnt_has_regular_utab(const char **utab, int *writable); - extern const char *mnt_get_utab_path(void); - -diff --git a/shlibs/mount/src/tab_update.c b/shlibs/mount/src/tab_update.c -index a0f99f1..6b7b4be 100644 ---- a/shlibs/mount/src/tab_update.c -+++ b/shlibs/mount/src/tab_update.c -@@ -561,7 +561,7 @@ static int update_table(struct libmnt_update *upd, struct libmnt_table *tb) - - DBG(UPDATE, mnt_debug_h(upd, "%s: updating", upd->filename)); - -- fd = mnt_open_uniq_filename(upd->filename, &uq, O_WRONLY); -+ fd = mnt_open_uniq_filename(upd->filename, &uq); - if (fd < 0) - return fd; /* error */ - -diff --git a/shlibs/mount/src/utils.c b/shlibs/mount/src/utils.c -index cb0ed1c..b02b6fe 100644 ---- a/shlibs/mount/src/utils.c -+++ b/shlibs/mount/src/utils.c -@@ -642,7 +642,7 @@ const char *mnt_get_utab_path(void) - - /* returns file descriptor or -errno, @name returns uniques filename - */ --int mnt_open_uniq_filename(const char *filename, char **name, int flags) -+int mnt_open_uniq_filename(const char *filename, char **name) - { - int rc, fd; - char *n; -@@ -656,7 +656,7 @@ int mnt_open_uniq_filename(const char *filename, char **name, int flags) - if (rc <= 0) - return -errno; - -- fd = mkostemp(n, flags | O_EXCL); -+ fd = mkstemp(n); - if (fd >= 0 && name) - *name = n; - else --- -1.7.0.4 - diff --git a/patches/util-linux-2.19.1/0006-partx-lsblk-fix-gettext-calls.patch b/patches/util-linux-2.19.1/0006-partx-lsblk-fix-gettext-calls.patch deleted file mode 100644 index ca16c3a5c..000000000 --- a/patches/util-linux-2.19.1/0006-partx-lsblk-fix-gettext-calls.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Karel Zak -Date: Fri, 11 Feb 2011 09:06:27 +0100 -Subject: [PATCH] partx, lsblk: fix gettext calls - -Reported-by: Peter Breitenlohner -Signed-off-by: Karel Zak ---- - misc-utils/lsblk.c | 2 +- - partx/partx.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c -index 44358fd..b07bfb4 100644 ---- a/misc-utils/lsblk.c -+++ b/misc-utils/lsblk.c -@@ -871,7 +871,7 @@ static void __attribute__((__noreturn__)) help(FILE *out) - fprintf(out, _("\nAvailable columns:\n")); - - for (i = 0; i < __NCOLUMNS; i++) -- fprintf(out, " %10s %s\n", infos[i].name, gettext(infos[i].help)); -+ fprintf(out, " %10s %s\n", infos[i].name, _(infos[i].help)); - - fprintf(out, _("\nFor more information see lsblk(8).\n")); - -diff --git a/partx/partx.c b/partx/partx.c -index efb627f..a65586f 100644 ---- a/partx/partx.c -+++ b/partx/partx.c -@@ -615,7 +615,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out) - fprintf(out, _("\nAvailable columns (for --show):\n")); - - for (i = 0; i < __NCOLUMNS; i++) -- fprintf(out, " %10s %s\n", infos[i].name, gettext(infos[i].help)); -+ fprintf(out, " %10s %s\n", infos[i].name, _(infos[i].help)); - - fprintf(out, _("\nFor more information see partx(8).\n")); - --- -1.7.0.4 - -- cgit v1.2.3