From 0774243ca5434394f00e1adebb44c4a477725868ada92a9b10f4f7af9f062a67 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 29 Jun 2010 16:29:09 +0000 Subject: [PATCH 1/4] - fixed initialization in mlabel.c [bnc#618326] OBS-URL: https://build.opensuse.org/package/show/Base:System/mtools?expand=0&rev=14 --- mtools-4.0.13-initialize.diff | 13 +++++++++++++ mtools.changes | 5 +++++ mtools.spec | 2 ++ ready | 0 4 files changed, 20 insertions(+) create mode 100644 mtools-4.0.13-initialize.diff create mode 100644 ready diff --git a/mtools-4.0.13-initialize.diff b/mtools-4.0.13-initialize.diff new file mode 100644 index 0000000..6ee3810 --- /dev/null +++ b/mtools-4.0.13-initialize.diff @@ -0,0 +1,13 @@ +Index: mtools-4.0.13/mlabel.c +=================================================================== +--- mtools-4.0.13.orig/mlabel.c ++++ mtools-4.0.13/mlabel.c +@@ -35,7 +35,7 @@ void label_name(doscp_t *cp, const char + int have_lower, have_upper; + wchar_t wbuffer[12]; + +- memset(ans, ' ', sizeof(ans)-1); ++ memset(ans, ' ', sizeof(*ans)-1); + ans->sentinel = '\0'; + len = native_to_wchar(filename, wbuffer, 11, 0, 0); + if(len > 11){ diff --git a/mtools.changes b/mtools.changes index 6b3ab45..6727ec7 100644 --- a/mtools.changes +++ b/mtools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 29 18:27:11 CEST 2010 - pgajdos@suse.cz + +- fixed initialization in mlabel.c [bnc#618326] + ------------------------------------------------------------------- Mon Mar 1 16:20:52 CET 2010 - pgajdos@suse.cz diff --git a/mtools.spec b/mtools.spec index dd609d4..d6fc880 100644 --- a/mtools.spec +++ b/mtools.spec @@ -35,6 +35,7 @@ Patch3: %{name}-%{version}-aliasing.diff Patch4: %{name}-%{version}-fat-bits.diff Patch5: %{name}-%{version}-prototypes.diff Patch7: %{name}-%{version}-file-close.diff +Patch8: %{name}-%{version}-initialize.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -97,6 +98,7 @@ Authors: %patch4 %patch5 %patch7 +%patch8 -p1 %build %{suse_update_config -f} diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4 From 80b567b5603a103db12a7f04125db6a3d39df50ec81c91bb7e40258b82a6b216 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 29 Jun 2010 17:12:49 +0000 Subject: [PATCH 2/4] Accepting request 42280 from Base:System checked in (request 42280) OBS-URL: https://build.opensuse.org/request/show/42280 OBS-URL: https://build.opensuse.org/package/show/Base:System/mtools?expand=0&rev=15 --- mtools-4.0.13-initialize.diff | 13 ------------- mtools.changes | 5 ----- mtools.spec | 2 -- ready | 0 4 files changed, 20 deletions(-) delete mode 100644 mtools-4.0.13-initialize.diff delete mode 100644 ready diff --git a/mtools-4.0.13-initialize.diff b/mtools-4.0.13-initialize.diff deleted file mode 100644 index 6ee3810..0000000 --- a/mtools-4.0.13-initialize.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: mtools-4.0.13/mlabel.c -=================================================================== ---- mtools-4.0.13.orig/mlabel.c -+++ mtools-4.0.13/mlabel.c -@@ -35,7 +35,7 @@ void label_name(doscp_t *cp, const char - int have_lower, have_upper; - wchar_t wbuffer[12]; - -- memset(ans, ' ', sizeof(ans)-1); -+ memset(ans, ' ', sizeof(*ans)-1); - ans->sentinel = '\0'; - len = native_to_wchar(filename, wbuffer, 11, 0, 0); - if(len > 11){ diff --git a/mtools.changes b/mtools.changes index 6727ec7..6b3ab45 100644 --- a/mtools.changes +++ b/mtools.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Jun 29 18:27:11 CEST 2010 - pgajdos@suse.cz - -- fixed initialization in mlabel.c [bnc#618326] - ------------------------------------------------------------------- Mon Mar 1 16:20:52 CET 2010 - pgajdos@suse.cz diff --git a/mtools.spec b/mtools.spec index d6fc880..dd609d4 100644 --- a/mtools.spec +++ b/mtools.spec @@ -35,7 +35,6 @@ Patch3: %{name}-%{version}-aliasing.diff Patch4: %{name}-%{version}-fat-bits.diff Patch5: %{name}-%{version}-prototypes.diff Patch7: %{name}-%{version}-file-close.diff -Patch8: %{name}-%{version}-initialize.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -98,7 +97,6 @@ Authors: %patch4 %patch5 %patch7 -%patch8 -p1 %build %{suse_update_config -f} diff --git a/ready b/ready deleted file mode 100644 index 473a0f4..0000000 From 91556894cbc9bef5f8c01bf211b712f7e22f9bf5769dba6f64a7d2bae2ead196 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 16 Sep 2010 10:24:21 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Base:System/mtools?expand=0&rev=16 --- mtools-4.0.13-initialize.diff | 13 +++++++++++++ mtools.changes | 5 +++++ mtools.spec | 6 ++++-- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 mtools-4.0.13-initialize.diff diff --git a/mtools-4.0.13-initialize.diff b/mtools-4.0.13-initialize.diff new file mode 100644 index 0000000..6ee3810 --- /dev/null +++ b/mtools-4.0.13-initialize.diff @@ -0,0 +1,13 @@ +Index: mtools-4.0.13/mlabel.c +=================================================================== +--- mtools-4.0.13.orig/mlabel.c ++++ mtools-4.0.13/mlabel.c +@@ -35,7 +35,7 @@ void label_name(doscp_t *cp, const char + int have_lower, have_upper; + wchar_t wbuffer[12]; + +- memset(ans, ' ', sizeof(ans)-1); ++ memset(ans, ' ', sizeof(*ans)-1); + ans->sentinel = '\0'; + len = native_to_wchar(filename, wbuffer, 11, 0, 0); + if(len > 11){ diff --git a/mtools.changes b/mtools.changes index 6b3ab45..6727ec7 100644 --- a/mtools.changes +++ b/mtools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 29 18:27:11 CEST 2010 - pgajdos@suse.cz + +- fixed initialization in mlabel.c [bnc#618326] + ------------------------------------------------------------------- Mon Mar 1 16:20:52 CET 2010 - pgajdos@suse.cz diff --git a/mtools.spec b/mtools.spec index dd609d4..9e588ce 100644 --- a/mtools.spec +++ b/mtools.spec @@ -21,10 +21,10 @@ Name: mtools BuildRequires: libpng texlive-latex xorg-x11 xorg-x11-devel Version: 4.0.13 -Release: 1 +Release: 2 AutoReqProv: on Group: System/Filesystems -License: GPLv3+ +License: GPLv2+ Url: http://mtools.linux.lu/ Summary: Access Files on an MS-DOS File System Source: %{name}-%{version}.tar.bz2 @@ -35,6 +35,7 @@ Patch3: %{name}-%{version}-aliasing.diff Patch4: %{name}-%{version}-fat-bits.diff Patch5: %{name}-%{version}-prototypes.diff Patch7: %{name}-%{version}-file-close.diff +Patch8: %{name}-%{version}-initialize.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -97,6 +98,7 @@ Authors: %patch4 %patch5 %patch7 +%patch8 -p1 %build %{suse_update_config -f} From 9f34f85fc8786174940182bf2a45c0fc4efb4ff884244edc58dea6d7d10907e7 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 16 Nov 2010 11:00:48 +0000 Subject: [PATCH 4/4] - updated to version 4.0.15: * Added missing -i option to mshortname * New mshortname command * Fix floppyd for disks bigger than 2 Gig * Remove obsolete -z flag * Remove now unsupported AC_USE_SYSTEM_EXTENSIONS * Fixed output formatting of mdir if MTOOLS_DOTTED_DIR is set * Mformat now correctly writes backup boot sector * Fixed signedness of serial number in mlabel * Fixed buffer size problem in mlabel * Make mlabel write backup boot sector if FAT32 * Catch situation where both clear and new label are given to mlabel * Quote filename parameters to scripts * Mformat: Close file descriptor for boot sector * Added lzip support to scripts/uz * Added Tot_sectors option to mformat * Fixed hidden sector handling in mformat * Minfo generates mformat command lines containing new -T option * Mlabel prints error if label too long - removed upstreamed patches: * script.diff * file_close.diff * initialize.diff OBS-URL: https://build.opensuse.org/package/show/Base:System/mtools?expand=0&rev=17 --- mtools-4.0.13-file-close.diff | 12 --------- mtools-4.0.13-initialize.diff | 13 --------- mtools-4.0.13-script.diff | 22 --------------- mtools-4.0.13.tar.bz2 | 3 --- ...iasing.diff => mtools-4.0.15-aliasing.diff | 0 ...toconf.diff => mtools-4.0.15-autoconf.diff | 0 ....0.13-conf.diff => mtools-4.0.15-conf.diff | 0 ...t-bits.diff => mtools-4.0.15-fat-bits.diff | 0 ...ypes.diff => mtools-4.0.15-prototypes.diff | 0 mtools-4.0.15.tar.bz2 | 3 +++ mtools.changes | 27 +++++++++++++++++++ mtools.spec | 8 +----- 12 files changed, 31 insertions(+), 57 deletions(-) delete mode 100644 mtools-4.0.13-file-close.diff delete mode 100644 mtools-4.0.13-initialize.diff delete mode 100644 mtools-4.0.13-script.diff delete mode 100644 mtools-4.0.13.tar.bz2 rename mtools-4.0.13-aliasing.diff => mtools-4.0.15-aliasing.diff (100%) rename mtools-4.0.13-autoconf.diff => mtools-4.0.15-autoconf.diff (100%) rename mtools-4.0.13-conf.diff => mtools-4.0.15-conf.diff (100%) rename mtools-4.0.13-fat-bits.diff => mtools-4.0.15-fat-bits.diff (100%) rename mtools-4.0.13-prototypes.diff => mtools-4.0.15-prototypes.diff (100%) create mode 100644 mtools-4.0.15.tar.bz2 diff --git a/mtools-4.0.13-file-close.diff b/mtools-4.0.13-file-close.diff deleted file mode 100644 index 4bd8959..0000000 --- a/mtools-4.0.13-file-close.diff +++ /dev/null @@ -1,12 +0,0 @@ -Index: mformat.c -=================================================================== ---- mformat.c.orig -+++ mformat.c -@@ -1163,6 +1163,7 @@ void mformat(int argc, char **argv, int - exit(1); - } - keepBoot = 1; -+ close(fd); - } - if(!keepBoot && !(used_dev.use_2m & 0x7f)) { - memset(boot.characters, '\0', Fs.sector_size); diff --git a/mtools-4.0.13-initialize.diff b/mtools-4.0.13-initialize.diff deleted file mode 100644 index 6ee3810..0000000 --- a/mtools-4.0.13-initialize.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: mtools-4.0.13/mlabel.c -=================================================================== ---- mtools-4.0.13.orig/mlabel.c -+++ mtools-4.0.13/mlabel.c -@@ -35,7 +35,7 @@ void label_name(doscp_t *cp, const char - int have_lower, have_upper; - wchar_t wbuffer[12]; - -- memset(ans, ' ', sizeof(ans)-1); -+ memset(ans, ' ', sizeof(*ans)-1); - ans->sentinel = '\0'; - len = native_to_wchar(filename, wbuffer, 11, 0, 0); - if(len > 11){ diff --git a/mtools-4.0.13-script.diff b/mtools-4.0.13-script.diff deleted file mode 100644 index 557f45b..0000000 --- a/mtools-4.0.13-script.diff +++ /dev/null @@ -1,22 +0,0 @@ -Index: scripts/mcomp -=================================================================== ---- scripts/mcomp.orig -+++ scripts/mcomp -@@ -24,5 +24,5 @@ fi - dosfile=$1 - shift - --mcopy $dosfile - | cmp $@ -+mcopy $dosfile - | cmp "$@" - -Index: scripts/mxtar -=================================================================== ---- scripts/mxtar.orig -+++ scripts/mxtar -@@ -21,5 +21,5 @@ dosfile=$2 - shift - shift - --mcopy $dosfile - | tar $taropt - $@ -+mcopy $dosfile - | tar $taropt - "$@" - diff --git a/mtools-4.0.13.tar.bz2 b/mtools-4.0.13.tar.bz2 deleted file mode 100644 index 7948a2d..0000000 --- a/mtools-4.0.13.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f5d7bd44f2e259f7359054d936d8d3039fa6c492c7ca4eaa0c6bc8005a347da -size 382262 diff --git a/mtools-4.0.13-aliasing.diff b/mtools-4.0.15-aliasing.diff similarity index 100% rename from mtools-4.0.13-aliasing.diff rename to mtools-4.0.15-aliasing.diff diff --git a/mtools-4.0.13-autoconf.diff b/mtools-4.0.15-autoconf.diff similarity index 100% rename from mtools-4.0.13-autoconf.diff rename to mtools-4.0.15-autoconf.diff diff --git a/mtools-4.0.13-conf.diff b/mtools-4.0.15-conf.diff similarity index 100% rename from mtools-4.0.13-conf.diff rename to mtools-4.0.15-conf.diff diff --git a/mtools-4.0.13-fat-bits.diff b/mtools-4.0.15-fat-bits.diff similarity index 100% rename from mtools-4.0.13-fat-bits.diff rename to mtools-4.0.15-fat-bits.diff diff --git a/mtools-4.0.13-prototypes.diff b/mtools-4.0.15-prototypes.diff similarity index 100% rename from mtools-4.0.13-prototypes.diff rename to mtools-4.0.15-prototypes.diff diff --git a/mtools-4.0.15.tar.bz2 b/mtools-4.0.15.tar.bz2 new file mode 100644 index 0000000..1baa359 --- /dev/null +++ b/mtools-4.0.15.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:290defca107cc183a17c98d3f7d00db02228b724084a2a818f1dd6ea86973899 +size 386339 diff --git a/mtools.changes b/mtools.changes index 6727ec7..dac9082 100644 --- a/mtools.changes +++ b/mtools.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Tue Nov 16 11:57:57 CET 2010 - pgajdos@suse.cz + +- updated to version 4.0.15: + * Added missing -i option to mshortname + * New mshortname command + * Fix floppyd for disks bigger than 2 Gig + * Remove obsolete -z flag + * Remove now unsupported AC_USE_SYSTEM_EXTENSIONS + * Fixed output formatting of mdir if MTOOLS_DOTTED_DIR is set + * Mformat now correctly writes backup boot sector + * Fixed signedness of serial number in mlabel + * Fixed buffer size problem in mlabel + * Make mlabel write backup boot sector if FAT32 + * Catch situation where both clear and new label are given to mlabel + * Quote filename parameters to scripts + * Mformat: Close file descriptor for boot sector + * Added lzip support to scripts/uz + * Added Tot_sectors option to mformat + * Fixed hidden sector handling in mformat + * Minfo generates mformat command lines containing new -T option + * Mlabel prints error if label too long +- removed upstreamed patches: + * script.diff + * file_close.diff + * initialize.diff + ------------------------------------------------------------------- Tue Jun 29 18:27:11 CEST 2010 - pgajdos@suse.cz diff --git a/mtools.spec b/mtools.spec index 9e588ce..5c7242e 100644 --- a/mtools.spec +++ b/mtools.spec @@ -20,7 +20,7 @@ Name: mtools BuildRequires: libpng texlive-latex xorg-x11 xorg-x11-devel -Version: 4.0.13 +Version: 4.0.15 Release: 2 AutoReqProv: on Group: System/Filesystems @@ -30,12 +30,9 @@ Summary: Access Files on an MS-DOS File System Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-%{version}-conf.diff Patch1: %{name}-%{version}-autoconf.diff -Patch2: %{name}-%{version}-script.diff Patch3: %{name}-%{version}-aliasing.diff Patch4: %{name}-%{version}-fat-bits.diff Patch5: %{name}-%{version}-prototypes.diff -Patch7: %{name}-%{version}-file-close.diff -Patch8: %{name}-%{version}-initialize.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -93,12 +90,9 @@ Authors: %setup -q %patch0 %patch1 -%patch2 %patch3 %patch4 %patch5 -%patch7 -%patch8 -p1 %build %{suse_update_config -f}