New version
Resolves: rhbz#968400 - Dropped fix-label patch (upstreamed)
This commit is contained in:
parent
2e93a9222a
commit
eb6aa58bdc
@ -1,23 +0,0 @@
|
||||
diff -up dosfstools-3.0.16/src/dosfslabel.c.orig dosfstools-3.0.16/src/dosfslabel.c
|
||||
--- dosfstools-3.0.16/src/dosfslabel.c.orig 2013-03-01 08:58:26.000000000 +0100
|
||||
+++ dosfstools-3.0.16/src/dosfslabel.c 2013-05-02 15:15:24.209671197 +0200
|
||||
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
|
||||
int i;
|
||||
|
||||
char *device = NULL;
|
||||
- char *label = NULL;
|
||||
+ char label[12] = {0};
|
||||
|
||||
loff_t offset;
|
||||
DIR_ENT de;
|
||||
@@ -109,8 +109,8 @@ int main(int argc, char *argv[])
|
||||
|
||||
device = argv[1];
|
||||
if (argc == 3) {
|
||||
- label = argv[2];
|
||||
- if (strlen(label) > 11) {
|
||||
+ strncpy(label, argv[2], 11);
|
||||
+ if (strlen(argv[2]) > 11) {
|
||||
fprintf(stderr,
|
||||
"dosfslabel: labels can be no longer than 11 characters\n");
|
||||
exit(1);
|
||||
@ -1,13 +1,12 @@
|
||||
Name: dosfstools
|
||||
Summary: Utilities for making and checking MS-DOS FAT filesystems on Linux
|
||||
Version: 3.0.16
|
||||
Release: 3%{?dist}
|
||||
Version: 3.0.17
|
||||
Release: 1%{?dist}
|
||||
License: GPLv3+
|
||||
Group: Applications/System
|
||||
Source0: http://www.daniel-baumann.ch/software/dosfstools/%{name}-%{version}.tar.xz
|
||||
URL: http://www.daniel-baumann.ch/software/dosfstools/
|
||||
# Sent upstream
|
||||
Patch0: dosfstools-3.0.16-fix-label.patch
|
||||
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
%description
|
||||
@ -17,7 +16,6 @@ drives or on floppies.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .fix-label
|
||||
|
||||
%build
|
||||
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fno-strict-aliasing"
|
||||
@ -36,6 +34,11 @@ rm -rf %{buildroot}
|
||||
%{_mandir}/man8/*
|
||||
|
||||
%changelog
|
||||
* Tue Jun 4 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.17-1
|
||||
- New version
|
||||
Resolves: rhbz#968400
|
||||
- Dropped fix-label patch (upstreamed)
|
||||
|
||||
* Thu May 2 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 3.0.16-3
|
||||
- Fixed dosfslabel (by fix-label patch)
|
||||
Resolves: rhbz#948055
|
||||
|
||||
Loading…
Reference in New Issue
Block a user