rpms/util-linux
6
0
Fork 0
Code Issues Pull Requests Releases Activity

2.19-2: fix #682502

Browse Source 
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2011-03-07 10:55:11 +01:00
parent 35ae187053
commit cbffb8f231
6 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -4,3 +4,7 @@
/util-linux-2.19-rc2.tar.bz2 /util-linux-2.19-rc2.tar.bz2
/util-linux-2.19-rc3.tar.bz2 /util-linux-2.19-rc3.tar.bz2
/util-linux-2.19.tar.bz2 /util-linux-2.19.tar.bz2
*~
.*.log
*.rpm
/floppy-0.18.tar.bz2

2
sources
View File

@ -1,2 +1,2 @@
7eeb9a6f7a258174bf0fa80f1370788d floppy-0.16.tar.bz2 a02aac97c74259ca1b24972c89147ca4 floppy-0.18.tar.bz2
590ca71aad0b254e2631d84401f28255 util-linux-2.19.tar.bz2 590ca71aad0b254e2631d84401f28255 util-linux-2.19.tar.bz2

11
util-linux-ng-2.13-floppy-generic.patch → util-linux-2.19-floppy-generic.patch
View File

@ -1,6 +1,7 @@
--- util-linux-2.12p/floppy-0.16/floppyfloppy.c.generic 2001-02-13 01:15:38.000000000 +0100 diff -up util-linux-2.19/floppy-0.18/floppyfloppy.c.kzak util-linux-2.19/floppy-0.18/floppyfloppy.c
+++ util-linux-2.12p/floppy-0.16/floppyfloppy.c 2005-09-30 15:38:08.000000000 +0200 --- util-linux-2.19/floppy-0.18/floppyfloppy.c.kzak 2009-09-24 03:36:33.000000000 +0200
@@ -264,6 +264,33 @@ +++ util-linux-2.19/floppy-0.18/floppyfloppy.c 2011-03-07 10:40:42.000000000 +0100
@@ -271,6 +271,33 @@ static RETSIGTYPE sighandler(int signum)
#endif #endif
} }
@ -34,7 +35,7 @@
static int do_format(const char *dev, int fmtnum, static int do_format(const char *dev, int fmtnum,
int (*fmt_func)(const char *, int), int flags) int (*fmt_func)(const char *, int), int flags)
@@ -275,6 +302,7 @@ @@ -282,6 +309,7 @@ static int do_format(const char *dev, in
struct format_descr curtrack; struct format_descr curtrack;
int pct; int pct;
struct stat stat_buf; struct stat stat_buf;
@ -42,7 +43,7 @@
int i, j; int i, j;
char *devname; char *devname;
@@ -297,23 +325,52 @@ @@ -304,23 +332,52 @@ static int do_format(const char *dev, in
strcat(strcpy(devname, dev), floppy_type[fmtnum].dev); strcat(strcpy(devname, dev), floppy_type[fmtnum].dev);

11
util-linux-2.19-floppy-locale.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up util-linux-2.19/floppy-0.18/superfloppy.c.kzak util-linux-2.19/floppy-0.18/superfloppy.c
--- util-linux-2.19/floppy-0.18/superfloppy.c.kzak 2009-09-23 02:47:26.000000000 +0200
+++ util-linux-2.19/floppy-0.18/superfloppy.c 2011-03-07 10:37:20.000000000 +0100
@@ -13,6 +13,7 @@
#include <popt.h>
#include <locale.h>
#include <libintl.h>
+#include <locale.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>

10
util-linux-ng-2.13-floppy-locale.patch
View File

@ -1,10 +0,0 @@
--- util-linux-ng-2.13-rc3/floppy-0.16/superfloppy.c.kzak 2001-07-14 05:26:16.000000000 +0200
+++ util-linux-ng-2.13-rc3/floppy-0.16/superfloppy.c 2007-08-13 13:14:53.000000000 +0200
@@ -12,6 +12,7 @@
#include <errno.h>
#include <popt.h>
#include <libintl.h>
+#include <locale.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>

15
util-linux.spec
View File

@ -2,10 +2,10 @@
Summary: A collection of basic system utilities Summary: A collection of basic system utilities
Name: util-linux Name: util-linux
Version: 2.19 Version: 2.19
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ and BSD with advertising and Public Domain License: GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ and BSD with advertising and Public Domain
Group: System Environment/Base Group: System Environment/Base
URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux URL: http://kernel.org/~kzak/util-linux/
%define upstream_version %{version} %define upstream_version %{version}
@ -19,7 +19,7 @@ URL: ftp://ftp.kernel.org/pub/linux/utils/util-linux
%define mtab_symlink 1 %define mtab_symlink 1
### Macros ### Macros
%define floppyver 0.16 %define floppyver 0.18
%define cytune_archs %{ix86} alpha %{arm} %define cytune_archs %{ix86} alpha %{arm}
### Dependences ### Dependences
@ -41,7 +41,7 @@ Source4: util-linux-60-raw.rules
Source8: nologin.c Source8: nologin.c
Source9: nologin.8 Source9: nologin.8
Source10: uuidd.init Source10: uuidd.init
Source11: http://dl.sourceforge.net/floppyutil/floppy-%{floppyver}.tar.bz2 Source11: http://downloads.sourceforge.net/floppyutil/floppy-%{floppyver}.tar.bz2
### Obsoletes & Conflicts & Provides ### Obsoletes & Conflicts & Provides
# old versions of e2fsprogs contain fsck, uuidgen # old versions of e2fsprogs contain fsck, uuidgen
@ -64,11 +64,11 @@ Requires: udev
### Floppy patches (Fedora/RHEL specific) ### Floppy patches (Fedora/RHEL specific)
### ###
# add a missing header # add a missing header
Patch0: util-linux-ng-2.13-floppy-locale.patch Patch0: util-linux-2.19-floppy-locale.patch
# add note about ATAPI IDE floppy to fdformat.8 # add note about ATAPI IDE floppy to fdformat.8
Patch1: util-linux-ng-2.13-fdformat-man-ide.patch Patch1: util-linux-ng-2.13-fdformat-man-ide.patch
# 169628 - /usr/bin/floppy doesn't work with /dev/fd0 # 169628 - /usr/bin/floppy doesn't work with /dev/fd0
Patch2: util-linux-ng-2.13-floppy-generic.patch Patch2: util-linux-2.19-floppy-generic.patch
### Fedora/RHEL specific patches -- need to die! ### Fedora/RHEL specific patches -- need to die!
### ###
@ -742,6 +742,9 @@ fi
%changelog %changelog
* Mon Mar 7 2011 Karel Zak <kzak@redhat.com> 2.19-2
- fix #682502 - Broken source URL to floppy tarball, new version available
- upgrade to floppy-0.18
* Thu Feb 10 2011 Karel Zak <kzak@redhat.com> 2.19-1 * Thu Feb 10 2011 Karel Zak <kzak@redhat.com> 2.19-1
- upgrade to the release 2.19 - upgrade to the release 2.19