From b15557ec3771f27cec23ca08acba257dc2d34e3f0dfed67d2651be675045846e Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 23 Oct 2009 09:26:05 +0000 Subject: [PATCH 1/5] - fixed wrong -h flag [bnc#548449] * help-flag.diff OBS-URL: https://build.opensuse.org/package/show/Base:System/mtools?expand=0&rev=4 --- mtools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mtools.spec b/mtools.spec index 044d043..332ac07 100644 --- a/mtools.spec +++ b/mtools.spec @@ -21,7 +21,7 @@ Name: mtools BuildRequires: libpng texlive-latex xorg-x11 xorg-x11-devel Version: 4.0.10 -Release: 5 +Release: 4 AutoReqProv: on Group: System/Filesystems License: GPL v3 or later From f6343f2794c3bedea136df6451a08c0959c129eede91f594aa98edddcfb3a104 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 23 Oct 2009 20:08:34 +0000 Subject: [PATCH 2/5] checked in OBS-URL: https://build.opensuse.org/package/show/Base:System/mtools?expand=0&rev=5 --- mtools-4.0.10-help-flag.diff | 47 ------------------------------------ mtools.changes | 6 ----- mtools.spec | 2 -- 3 files changed, 55 deletions(-) delete mode 100644 mtools-4.0.10-help-flag.diff diff --git a/mtools-4.0.10-help-flag.diff b/mtools-4.0.10-help-flag.diff deleted file mode 100644 index 9e49a53..0000000 --- a/mtools-4.0.10-help-flag.diff +++ /dev/null @@ -1,47 +0,0 @@ -diff -upr mtools-4.0.10/mattrib.c mtools-4.0.10.new/mattrib.c ---- mtools-4.0.10/mattrib.c 2009-03-03 07:10:13.000000000 +0100 -+++ mtools-4.0.10.new/mattrib.c 2009-10-23 09:07:45.000000000 +0200 -@@ -168,6 +168,7 @@ void mattrib(int argc, char **argv, int - int concise; - int replay; - char *ptr; -+ int wantUsage; - - arg.add = 0; - arg.remove = 0xff; -@@ -176,11 +177,16 @@ void mattrib(int argc, char **argv, int - view = 0; - concise = 0; - replay = 0; -+ -+ wantUsage = 0; - - if(helpFlag(argc, argv)) - usage(0); -- while ((c = getopt(argc, argv, "i:/ahrsAHRSXph")) != EOF) { -+ while ((c = getopt(argc, argv, "i:/ahrsAHRSXp")) != EOF) { - switch (c) { -+ case 'h': -+ wantUsage = 1; -+ /* FALL TROUGH */ - default: - arg.remove &= ~letterToCode(c); - break; -@@ -196,13 +202,15 @@ void mattrib(int argc, char **argv, int - case 'X': - concise = 1; - break; -- case 'h': -- usage(0); - case '?': - usage(1); - } - } - -+ if(optind == argc && wantUsage) { -+ usage(0); -+ } -+ - for(;optind < argc;optind++) { - switch(argv[optind][0]) { - case '+': diff --git a/mtools.changes b/mtools.changes index a40b3e6..1a4ddbd 100644 --- a/mtools.changes +++ b/mtools.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Fri Oct 23 11:25:37 CEST 2009 - pgajdos@suse.cz - -- fixed wrong -h flag [bnc#548449] - * help-flag.diff - ------------------------------------------------------------------- Tue Sep 15 09:54:02 CEST 2009 - pgajdos@suse.cz diff --git a/mtools.spec b/mtools.spec index 332ac07..ef25a39 100644 --- a/mtools.spec +++ b/mtools.spec @@ -36,7 +36,6 @@ Patch4: %{name}-%{version}-fat-bits.diff Patch5: %{name}-%{version}-prototypes.diff Patch6: %{name}-%{version}-overflow.diff Patch7: %{name}-%{version}-file-close.diff -Patch8: %{name}-%{version}-help-flag.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -100,7 +99,6 @@ Authors: %patch5 %patch6 %patch7 -%patch8 -p1 %build %{suse_update_config -f} From 3ed38cd2ba0911cd1f17029ef41a0b30717485753bfc3cef2b70f6b199f0a245 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 24 Nov 2009 14:26:37 +0000 Subject: [PATCH 3/5] - updated to 4.0.12 (see NEWS) - removed upstreamed help-flag.diff and overflow.diff OBS-URL: https://build.opensuse.org/package/show/Base:System/mtools?expand=0&rev=6 --- mtools-4.0.10-file-close.diff | 10 --------- mtools-4.0.10-overflow.diff | 11 ---------- mtools-4.0.10-script.diff | 18 --------------- mtools-4.0.10.tar.bz2 | 3 --- ...iasing.diff => mtools-4.0.12-aliasing.diff | 6 +++-- ...toconf.diff => mtools-4.0.12-autoconf.diff | 10 +++++---- ....0.10-conf.diff => mtools-4.0.12-conf.diff | 0 ...t-bits.diff => mtools-4.0.12-fat-bits.diff | 6 +++-- mtools-4.0.12-file-close.diff | 12 ++++++++++ ...ypes.diff => mtools-4.0.12-prototypes.diff | 22 ++++++++++++------- mtools-4.0.12-script.diff | 22 +++++++++++++++++++ mtools-4.0.12.tar.bz2 | 3 +++ mtools.changes | 12 ++++++++++ mtools.spec | 6 ++--- 14 files changed, 79 insertions(+), 62 deletions(-) delete mode 100644 mtools-4.0.10-file-close.diff delete mode 100644 mtools-4.0.10-overflow.diff delete mode 100644 mtools-4.0.10-script.diff delete mode 100644 mtools-4.0.10.tar.bz2 rename mtools-4.0.10-aliasing.diff => mtools-4.0.12-aliasing.diff (63%) rename mtools-4.0.10-autoconf.diff => mtools-4.0.12-autoconf.diff (88%) rename mtools-4.0.10-conf.diff => mtools-4.0.12-conf.diff (100%) rename mtools-4.0.10-fat-bits.diff => mtools-4.0.12-fat-bits.diff (63%) create mode 100644 mtools-4.0.12-file-close.diff rename mtools-4.0.10-prototypes.diff => mtools-4.0.12-prototypes.diff (62%) create mode 100644 mtools-4.0.12-script.diff create mode 100644 mtools-4.0.12.tar.bz2 diff --git a/mtools-4.0.10-file-close.diff b/mtools-4.0.10-file-close.diff deleted file mode 100644 index 07a7809..0000000 --- a/mtools-4.0.10-file-close.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- mformat.c -+++ mformat.c -@@ -1160,6 +1160,7 @@ - } - read(fd, buf, blocksize); - keepBoot = 1; -+ close(fd); - } - if(!keepBoot && !(used_dev.use_2m & 0x7f)) { - memset((char *)boot, '\0', Fs.sector_size); diff --git a/mtools-4.0.10-overflow.diff b/mtools-4.0.10-overflow.diff deleted file mode 100644 index a2ded9e..0000000 --- a/mtools-4.0.10-overflow.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- mpartition.c -+++ mpartition.c -@@ -514,7 +514,7 @@ void mpartition(int argc, char **argv, i - read(fd, (char *) buf, 512); - } - memset((char *)(partTable+1), 0, 4*sizeof(*partTable)); -- set_dword(((unsigned char*)buf)+510, 0xaa55); -+ set_word(((unsigned char*)buf)+510, 0xaa55); - } - - /* check for boot signature, and place it if needed */ diff --git a/mtools-4.0.10-script.diff b/mtools-4.0.10-script.diff deleted file mode 100644 index 947b2e8..0000000 --- a/mtools-4.0.10-script.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- scripts/mcomp -+++ scripts/mcomp -@@ -3,5 +3,5 @@ - dosfile=$1 - shift - --mcopy $dosfile - | cmp $@ -+mcopy $dosfile - | cmp "$@" - ---- scripts/mxtar -+++ scripts/mxtar -@@ -5,5 +5,5 @@ - shift - shift - --mcopy $dosfile - | tar $taropt - $@ -+mcopy $dosfile - | tar $taropt - "$@" - diff --git a/mtools-4.0.10.tar.bz2 b/mtools-4.0.10.tar.bz2 deleted file mode 100644 index 65b73e1..0000000 --- a/mtools-4.0.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:860fee13acb39365bd28763070e24011ea55f381f96714d2841937525aa02ded -size 381481 diff --git a/mtools-4.0.10-aliasing.diff b/mtools-4.0.12-aliasing.diff similarity index 63% rename from mtools-4.0.10-aliasing.diff rename to mtools-4.0.12-aliasing.diff index 84351f5..343f36d 100644 --- a/mtools-4.0.10-aliasing.diff +++ b/mtools-4.0.12-aliasing.diff @@ -1,6 +1,8 @@ ---- file.c +Index: file.c +=================================================================== +--- file.c.orig +++ file.c -@@ -573,7 +573,7 @@ +@@ -591,7 +591,7 @@ static Stream_t *_internalFileOpen(Strea Pattern.loopDetectRel = 0; Pattern.loopDetectAbs = first; if(!hash_lookup(filehash, (T_HashTableEl) &Pattern, diff --git a/mtools-4.0.10-autoconf.diff b/mtools-4.0.12-autoconf.diff similarity index 88% rename from mtools-4.0.10-autoconf.diff rename to mtools-4.0.12-autoconf.diff index 0b76ad3..40b7c16 100644 --- a/mtools-4.0.10-autoconf.diff +++ b/mtools-4.0.12-autoconf.diff @@ -1,6 +1,8 @@ ---- configure.in +Index: configure.in +=================================================================== +--- configure.in.orig +++ configure.in -@@ -95,10 +95,10 @@ +@@ -110,10 +110,10 @@ dnl dnl AC_MSG_CHECKING(whether llseek declared in unistd.h) AC_CACHE_VAL(mtools_cv_have_llseek_prototype, @@ -13,7 +15,7 @@ AC_MSG_RESULT($mtools_cv_have_llseek_prototype) if test "$mtools_cv_have_llseek_prototype" = yes; then AC_DEFINE([HAVE_LLSEEK_PROTOTYPE],1,[Define when you have an LLSEEK prototype]) -@@ -106,13 +106,13 @@ +@@ -121,13 +121,13 @@ fi AC_MSG_CHECKING(whether lseek64 declared in unistd.h) AC_CACHE_VAL(mtools_cv_have_lseek64_prototype, @@ -29,7 +31,7 @@ AC_MSG_RESULT($mtools_cv_have_lseek64_prototype) if test "$mtools_cv_have_lseek64_prototype" = yes; then AC_DEFINE([HAVE_LSEEK64_PROTOTYPE],1,[Define when you have an LSEEK64 prototype]) -@@ -145,12 +145,12 @@ +@@ -163,12 +163,12 @@ dnl Check for 64-bit off_t dnl AC_DEFUN(SFS_CHECK_OFF_T_64, [AC_CACHE_CHECK(for 64-bit off_t, sfs_cv_off_t_64, diff --git a/mtools-4.0.10-conf.diff b/mtools-4.0.12-conf.diff similarity index 100% rename from mtools-4.0.10-conf.diff rename to mtools-4.0.12-conf.diff diff --git a/mtools-4.0.10-fat-bits.diff b/mtools-4.0.12-fat-bits.diff similarity index 63% rename from mtools-4.0.10-fat-bits.diff rename to mtools-4.0.12-fat-bits.diff index 30d7546..73d6e4a 100644 --- a/mtools-4.0.10-fat-bits.diff +++ b/mtools-4.0.12-fat-bits.diff @@ -1,6 +1,8 @@ ---- fat.c +Index: fat.c +=================================================================== +--- fat.c.orig +++ fat.c -@@ -704,7 +704,7 @@ +@@ -722,7 +722,7 @@ static int old_fat_read(Fs_t *This, unio if(check_media_type(This,boot, tot_sectors)) return -1; diff --git a/mtools-4.0.12-file-close.diff b/mtools-4.0.12-file-close.diff new file mode 100644 index 0000000..4bd8959 --- /dev/null +++ b/mtools-4.0.12-file-close.diff @@ -0,0 +1,12 @@ +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.10-prototypes.diff b/mtools-4.0.12-prototypes.diff similarity index 62% rename from mtools-4.0.10-prototypes.diff rename to mtools-4.0.12-prototypes.diff index 8b85bdd..7ab746e 100644 --- a/mtools-4.0.10-prototypes.diff +++ b/mtools-4.0.12-prototypes.diff @@ -1,6 +1,8 @@ ---- mformat.c +Index: mformat.c +=================================================================== +--- mformat.c.orig +++ mformat.c -@@ -3,6 +3,7 @@ +@@ -19,6 +19,7 @@ */ #define DONT_NEED_WAIT @@ -8,7 +10,7 @@ #include "sysincludes.h" #include "msdos.h" -@@ -31,7 +32,7 @@ +@@ -48,7 +49,7 @@ #define _LINUX_STRING_H_ #define kdev_t int @@ -17,9 +19,11 @@ #undef _LINUX_STRING_H_ #endif ---- mpartition.c +Index: mpartition.c +=================================================================== +--- mpartition.c.orig +++ mpartition.c -@@ -2,6 +2,7 @@ +@@ -17,6 +17,7 @@ * mformat.c */ #define DONT_NEED_WAIT @@ -27,7 +31,7 @@ #include "sysincludes.h" #include "msdos.h" -@@ -20,7 +21,7 @@ +@@ -35,7 +36,7 @@ #define _LINUX_STRING_H_ #define kdev_t int @@ -36,9 +40,11 @@ #undef _LINUX_STRING_H_ #endif ---- sysincludes.h +Index: sysincludes.h +=================================================================== +--- sysincludes.h.orig +++ sysincludes.h -@@ -268,12 +268,16 @@ +@@ -331,12 +331,16 @@ typedef unsigned int uid_t; #endif #ifdef HAVE_NETINET_IN_H diff --git a/mtools-4.0.12-script.diff b/mtools-4.0.12-script.diff new file mode 100644 index 0000000..557f45b --- /dev/null +++ b/mtools-4.0.12-script.diff @@ -0,0 +1,22 @@ +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.12.tar.bz2 b/mtools-4.0.12.tar.bz2 new file mode 100644 index 0000000..aac1a06 --- /dev/null +++ b/mtools-4.0.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53cf808eed9b396070a12c6e53479800a5b9038e9d70c79277e762246ba07a13 +size 382456 diff --git a/mtools.changes b/mtools.changes index 1a4ddbd..428de14 100644 --- a/mtools.changes +++ b/mtools.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Nov 24 15:29:20 CET 2009 - pgajdos@suse.cz + +- updated to 4.0.12 (see NEWS) + - removed upstreamed help-flag.diff and overflow.diff + +------------------------------------------------------------------- +Fri Oct 23 11:25:37 CEST 2009 - pgajdos@suse.cz + +- fixed wrong -h flag [bnc#548449] + * help-flag.diff + ------------------------------------------------------------------- Tue Sep 15 09:54:02 CEST 2009 - pgajdos@suse.cz diff --git a/mtools.spec b/mtools.spec index ef25a39..fb20218 100644 --- a/mtools.spec +++ b/mtools.spec @@ -20,8 +20,8 @@ Name: mtools BuildRequires: libpng texlive-latex xorg-x11 xorg-x11-devel -Version: 4.0.10 -Release: 4 +Version: 4.0.12 +Release: 5 AutoReqProv: on Group: System/Filesystems License: GPL v3 or later @@ -34,7 +34,6 @@ Patch2: %{name}-%{version}-script.diff Patch3: %{name}-%{version}-aliasing.diff Patch4: %{name}-%{version}-fat-bits.diff Patch5: %{name}-%{version}-prototypes.diff -Patch6: %{name}-%{version}-overflow.diff Patch7: %{name}-%{version}-file-close.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -97,7 +96,6 @@ Authors: %patch3 %patch4 %patch5 -%patch6 %patch7 %build From c7fd2ecee76a926ba82354cc3bf469bff07a442a7d1d5ce83e1b75f48e4ed010 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 4 Dec 2009 11:22:17 +0000 Subject: [PATCH 4/5] checked in OBS-URL: https://build.opensuse.org/package/show/Base:System/mtools?expand=0&rev=7 --- ...iasing.diff => mtools-4.0.10-aliasing.diff | 6 +-- ...toconf.diff => mtools-4.0.10-autoconf.diff | 10 ++-- ....0.12-conf.diff => mtools-4.0.10-conf.diff | 0 ...t-bits.diff => mtools-4.0.10-fat-bits.diff | 6 +-- mtools-4.0.10-file-close.diff | 10 ++++ mtools-4.0.10-help-flag.diff | 47 +++++++++++++++++++ mtools-4.0.10-overflow.diff | 11 +++++ ...ypes.diff => mtools-4.0.10-prototypes.diff | 22 ++++----- mtools-4.0.10-script.diff | 18 +++++++ mtools-4.0.10.tar.bz2 | 3 ++ mtools-4.0.12-file-close.diff | 12 ----- mtools-4.0.12-script.diff | 22 --------- mtools-4.0.12.tar.bz2 | 3 -- mtools.changes | 6 --- mtools.spec | 6 ++- 15 files changed, 110 insertions(+), 72 deletions(-) rename mtools-4.0.12-aliasing.diff => mtools-4.0.10-aliasing.diff (63%) rename mtools-4.0.12-autoconf.diff => mtools-4.0.10-autoconf.diff (88%) rename mtools-4.0.12-conf.diff => mtools-4.0.10-conf.diff (100%) rename mtools-4.0.12-fat-bits.diff => mtools-4.0.10-fat-bits.diff (63%) create mode 100644 mtools-4.0.10-file-close.diff create mode 100644 mtools-4.0.10-help-flag.diff create mode 100644 mtools-4.0.10-overflow.diff rename mtools-4.0.12-prototypes.diff => mtools-4.0.10-prototypes.diff (62%) create mode 100644 mtools-4.0.10-script.diff create mode 100644 mtools-4.0.10.tar.bz2 delete mode 100644 mtools-4.0.12-file-close.diff delete mode 100644 mtools-4.0.12-script.diff delete mode 100644 mtools-4.0.12.tar.bz2 diff --git a/mtools-4.0.12-aliasing.diff b/mtools-4.0.10-aliasing.diff similarity index 63% rename from mtools-4.0.12-aliasing.diff rename to mtools-4.0.10-aliasing.diff index 343f36d..84351f5 100644 --- a/mtools-4.0.12-aliasing.diff +++ b/mtools-4.0.10-aliasing.diff @@ -1,8 +1,6 @@ -Index: file.c -=================================================================== ---- file.c.orig +--- file.c +++ file.c -@@ -591,7 +591,7 @@ static Stream_t *_internalFileOpen(Strea +@@ -573,7 +573,7 @@ Pattern.loopDetectRel = 0; Pattern.loopDetectAbs = first; if(!hash_lookup(filehash, (T_HashTableEl) &Pattern, diff --git a/mtools-4.0.12-autoconf.diff b/mtools-4.0.10-autoconf.diff similarity index 88% rename from mtools-4.0.12-autoconf.diff rename to mtools-4.0.10-autoconf.diff index 40b7c16..0b76ad3 100644 --- a/mtools-4.0.12-autoconf.diff +++ b/mtools-4.0.10-autoconf.diff @@ -1,8 +1,6 @@ -Index: configure.in -=================================================================== ---- configure.in.orig +--- configure.in +++ configure.in -@@ -110,10 +110,10 @@ dnl +@@ -95,10 +95,10 @@ dnl AC_MSG_CHECKING(whether llseek declared in unistd.h) AC_CACHE_VAL(mtools_cv_have_llseek_prototype, @@ -15,7 +13,7 @@ Index: configure.in AC_MSG_RESULT($mtools_cv_have_llseek_prototype) if test "$mtools_cv_have_llseek_prototype" = yes; then AC_DEFINE([HAVE_LLSEEK_PROTOTYPE],1,[Define when you have an LLSEEK prototype]) -@@ -121,13 +121,13 @@ fi +@@ -106,13 +106,13 @@ AC_MSG_CHECKING(whether lseek64 declared in unistd.h) AC_CACHE_VAL(mtools_cv_have_lseek64_prototype, @@ -31,7 +29,7 @@ Index: configure.in AC_MSG_RESULT($mtools_cv_have_lseek64_prototype) if test "$mtools_cv_have_lseek64_prototype" = yes; then AC_DEFINE([HAVE_LSEEK64_PROTOTYPE],1,[Define when you have an LSEEK64 prototype]) -@@ -163,12 +163,12 @@ dnl Check for 64-bit off_t +@@ -145,12 +145,12 @@ dnl AC_DEFUN(SFS_CHECK_OFF_T_64, [AC_CACHE_CHECK(for 64-bit off_t, sfs_cv_off_t_64, diff --git a/mtools-4.0.12-conf.diff b/mtools-4.0.10-conf.diff similarity index 100% rename from mtools-4.0.12-conf.diff rename to mtools-4.0.10-conf.diff diff --git a/mtools-4.0.12-fat-bits.diff b/mtools-4.0.10-fat-bits.diff similarity index 63% rename from mtools-4.0.12-fat-bits.diff rename to mtools-4.0.10-fat-bits.diff index 73d6e4a..30d7546 100644 --- a/mtools-4.0.12-fat-bits.diff +++ b/mtools-4.0.10-fat-bits.diff @@ -1,8 +1,6 @@ -Index: fat.c -=================================================================== ---- fat.c.orig +--- fat.c +++ fat.c -@@ -722,7 +722,7 @@ static int old_fat_read(Fs_t *This, unio +@@ -704,7 +704,7 @@ if(check_media_type(This,boot, tot_sectors)) return -1; diff --git a/mtools-4.0.10-file-close.diff b/mtools-4.0.10-file-close.diff new file mode 100644 index 0000000..07a7809 --- /dev/null +++ b/mtools-4.0.10-file-close.diff @@ -0,0 +1,10 @@ +--- mformat.c ++++ mformat.c +@@ -1160,6 +1160,7 @@ + } + read(fd, buf, blocksize); + keepBoot = 1; ++ close(fd); + } + if(!keepBoot && !(used_dev.use_2m & 0x7f)) { + memset((char *)boot, '\0', Fs.sector_size); diff --git a/mtools-4.0.10-help-flag.diff b/mtools-4.0.10-help-flag.diff new file mode 100644 index 0000000..9e49a53 --- /dev/null +++ b/mtools-4.0.10-help-flag.diff @@ -0,0 +1,47 @@ +diff -upr mtools-4.0.10/mattrib.c mtools-4.0.10.new/mattrib.c +--- mtools-4.0.10/mattrib.c 2009-03-03 07:10:13.000000000 +0100 ++++ mtools-4.0.10.new/mattrib.c 2009-10-23 09:07:45.000000000 +0200 +@@ -168,6 +168,7 @@ void mattrib(int argc, char **argv, int + int concise; + int replay; + char *ptr; ++ int wantUsage; + + arg.add = 0; + arg.remove = 0xff; +@@ -176,11 +177,16 @@ void mattrib(int argc, char **argv, int + view = 0; + concise = 0; + replay = 0; ++ ++ wantUsage = 0; + + if(helpFlag(argc, argv)) + usage(0); +- while ((c = getopt(argc, argv, "i:/ahrsAHRSXph")) != EOF) { ++ while ((c = getopt(argc, argv, "i:/ahrsAHRSXp")) != EOF) { + switch (c) { ++ case 'h': ++ wantUsage = 1; ++ /* FALL TROUGH */ + default: + arg.remove &= ~letterToCode(c); + break; +@@ -196,13 +202,15 @@ void mattrib(int argc, char **argv, int + case 'X': + concise = 1; + break; +- case 'h': +- usage(0); + case '?': + usage(1); + } + } + ++ if(optind == argc && wantUsage) { ++ usage(0); ++ } ++ + for(;optind < argc;optind++) { + switch(argv[optind][0]) { + case '+': diff --git a/mtools-4.0.10-overflow.diff b/mtools-4.0.10-overflow.diff new file mode 100644 index 0000000..a2ded9e --- /dev/null +++ b/mtools-4.0.10-overflow.diff @@ -0,0 +1,11 @@ +--- mpartition.c ++++ mpartition.c +@@ -514,7 +514,7 @@ void mpartition(int argc, char **argv, i + read(fd, (char *) buf, 512); + } + memset((char *)(partTable+1), 0, 4*sizeof(*partTable)); +- set_dword(((unsigned char*)buf)+510, 0xaa55); ++ set_word(((unsigned char*)buf)+510, 0xaa55); + } + + /* check for boot signature, and place it if needed */ diff --git a/mtools-4.0.12-prototypes.diff b/mtools-4.0.10-prototypes.diff similarity index 62% rename from mtools-4.0.12-prototypes.diff rename to mtools-4.0.10-prototypes.diff index 7ab746e..8b85bdd 100644 --- a/mtools-4.0.12-prototypes.diff +++ b/mtools-4.0.10-prototypes.diff @@ -1,8 +1,6 @@ -Index: mformat.c -=================================================================== ---- mformat.c.orig +--- mformat.c +++ mformat.c -@@ -19,6 +19,7 @@ +@@ -3,6 +3,7 @@ */ #define DONT_NEED_WAIT @@ -10,7 +8,7 @@ Index: mformat.c #include "sysincludes.h" #include "msdos.h" -@@ -48,7 +49,7 @@ +@@ -31,7 +32,7 @@ #define _LINUX_STRING_H_ #define kdev_t int @@ -19,11 +17,9 @@ Index: mformat.c #undef _LINUX_STRING_H_ #endif -Index: mpartition.c -=================================================================== ---- mpartition.c.orig +--- mpartition.c +++ mpartition.c -@@ -17,6 +17,7 @@ +@@ -2,6 +2,7 @@ * mformat.c */ #define DONT_NEED_WAIT @@ -31,7 +27,7 @@ Index: mpartition.c #include "sysincludes.h" #include "msdos.h" -@@ -35,7 +36,7 @@ +@@ -20,7 +21,7 @@ #define _LINUX_STRING_H_ #define kdev_t int @@ -40,11 +36,9 @@ Index: mpartition.c #undef _LINUX_STRING_H_ #endif -Index: sysincludes.h -=================================================================== ---- sysincludes.h.orig +--- sysincludes.h +++ sysincludes.h -@@ -331,12 +331,16 @@ typedef unsigned int uid_t; +@@ -268,12 +268,16 @@ #endif #ifdef HAVE_NETINET_IN_H diff --git a/mtools-4.0.10-script.diff b/mtools-4.0.10-script.diff new file mode 100644 index 0000000..947b2e8 --- /dev/null +++ b/mtools-4.0.10-script.diff @@ -0,0 +1,18 @@ +--- scripts/mcomp ++++ scripts/mcomp +@@ -3,5 +3,5 @@ + dosfile=$1 + shift + +-mcopy $dosfile - | cmp $@ ++mcopy $dosfile - | cmp "$@" + +--- scripts/mxtar ++++ scripts/mxtar +@@ -5,5 +5,5 @@ + shift + shift + +-mcopy $dosfile - | tar $taropt - $@ ++mcopy $dosfile - | tar $taropt - "$@" + diff --git a/mtools-4.0.10.tar.bz2 b/mtools-4.0.10.tar.bz2 new file mode 100644 index 0000000..65b73e1 --- /dev/null +++ b/mtools-4.0.10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:860fee13acb39365bd28763070e24011ea55f381f96714d2841937525aa02ded +size 381481 diff --git a/mtools-4.0.12-file-close.diff b/mtools-4.0.12-file-close.diff deleted file mode 100644 index 4bd8959..0000000 --- a/mtools-4.0.12-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.12-script.diff b/mtools-4.0.12-script.diff deleted file mode 100644 index 557f45b..0000000 --- a/mtools-4.0.12-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.12.tar.bz2 b/mtools-4.0.12.tar.bz2 deleted file mode 100644 index aac1a06..0000000 --- a/mtools-4.0.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53cf808eed9b396070a12c6e53479800a5b9038e9d70c79277e762246ba07a13 -size 382456 diff --git a/mtools.changes b/mtools.changes index 428de14..a40b3e6 100644 --- a/mtools.changes +++ b/mtools.changes @@ -1,9 +1,3 @@ -------------------------------------------------------------------- -Tue Nov 24 15:29:20 CET 2009 - pgajdos@suse.cz - -- updated to 4.0.12 (see NEWS) - - removed upstreamed help-flag.diff and overflow.diff - ------------------------------------------------------------------- Fri Oct 23 11:25:37 CEST 2009 - pgajdos@suse.cz diff --git a/mtools.spec b/mtools.spec index fb20218..044d043 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.12 +Version: 4.0.10 Release: 5 AutoReqProv: on Group: System/Filesystems @@ -34,7 +34,9 @@ Patch2: %{name}-%{version}-script.diff Patch3: %{name}-%{version}-aliasing.diff Patch4: %{name}-%{version}-fat-bits.diff Patch5: %{name}-%{version}-prototypes.diff +Patch6: %{name}-%{version}-overflow.diff Patch7: %{name}-%{version}-file-close.diff +Patch8: %{name}-%{version}-help-flag.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -96,7 +98,9 @@ Authors: %patch3 %patch4 %patch5 +%patch6 %patch7 +%patch8 -p1 %build %{suse_update_config -f} From b0fd74f6e57420b47540bbbf059811643180f155062818940ffa2ec3314e9ff8 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 4 Dec 2009 11:22:19 +0000 Subject: [PATCH 5/5] Updating link to change in openSUSE:Factory/mtools revision 14.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/mtools?expand=0&rev=734a5509e804856948abc7f195c51412 --- mtools-4.0.10-file-close.diff | 10 ---- mtools-4.0.10-help-flag.diff | 47 ------------------- mtools-4.0.10-overflow.diff | 11 ----- mtools-4.0.10-script.diff | 18 ------- mtools-4.0.10.tar.bz2 | 3 -- ...iasing.diff => mtools-4.0.12-aliasing.diff | 6 ++- ...toconf.diff => mtools-4.0.12-autoconf.diff | 10 ++-- ....0.10-conf.diff => mtools-4.0.12-conf.diff | 0 ...t-bits.diff => mtools-4.0.12-fat-bits.diff | 6 ++- mtools-4.0.12-file-close.diff | 12 +++++ ...ypes.diff => mtools-4.0.12-prototypes.diff | 22 +++++---- mtools-4.0.12-script.diff | 22 +++++++++ mtools-4.0.12.tar.bz2 | 3 ++ mtools.changes | 6 +++ mtools.spec | 16 +++---- 15 files changed, 77 insertions(+), 115 deletions(-) delete mode 100644 mtools-4.0.10-file-close.diff delete mode 100644 mtools-4.0.10-help-flag.diff delete mode 100644 mtools-4.0.10-overflow.diff delete mode 100644 mtools-4.0.10-script.diff delete mode 100644 mtools-4.0.10.tar.bz2 rename mtools-4.0.10-aliasing.diff => mtools-4.0.12-aliasing.diff (63%) rename mtools-4.0.10-autoconf.diff => mtools-4.0.12-autoconf.diff (88%) rename mtools-4.0.10-conf.diff => mtools-4.0.12-conf.diff (100%) rename mtools-4.0.10-fat-bits.diff => mtools-4.0.12-fat-bits.diff (63%) create mode 100644 mtools-4.0.12-file-close.diff rename mtools-4.0.10-prototypes.diff => mtools-4.0.12-prototypes.diff (62%) create mode 100644 mtools-4.0.12-script.diff create mode 100644 mtools-4.0.12.tar.bz2 diff --git a/mtools-4.0.10-file-close.diff b/mtools-4.0.10-file-close.diff deleted file mode 100644 index 07a7809..0000000 --- a/mtools-4.0.10-file-close.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- mformat.c -+++ mformat.c -@@ -1160,6 +1160,7 @@ - } - read(fd, buf, blocksize); - keepBoot = 1; -+ close(fd); - } - if(!keepBoot && !(used_dev.use_2m & 0x7f)) { - memset((char *)boot, '\0', Fs.sector_size); diff --git a/mtools-4.0.10-help-flag.diff b/mtools-4.0.10-help-flag.diff deleted file mode 100644 index 9e49a53..0000000 --- a/mtools-4.0.10-help-flag.diff +++ /dev/null @@ -1,47 +0,0 @@ -diff -upr mtools-4.0.10/mattrib.c mtools-4.0.10.new/mattrib.c ---- mtools-4.0.10/mattrib.c 2009-03-03 07:10:13.000000000 +0100 -+++ mtools-4.0.10.new/mattrib.c 2009-10-23 09:07:45.000000000 +0200 -@@ -168,6 +168,7 @@ void mattrib(int argc, char **argv, int - int concise; - int replay; - char *ptr; -+ int wantUsage; - - arg.add = 0; - arg.remove = 0xff; -@@ -176,11 +177,16 @@ void mattrib(int argc, char **argv, int - view = 0; - concise = 0; - replay = 0; -+ -+ wantUsage = 0; - - if(helpFlag(argc, argv)) - usage(0); -- while ((c = getopt(argc, argv, "i:/ahrsAHRSXph")) != EOF) { -+ while ((c = getopt(argc, argv, "i:/ahrsAHRSXp")) != EOF) { - switch (c) { -+ case 'h': -+ wantUsage = 1; -+ /* FALL TROUGH */ - default: - arg.remove &= ~letterToCode(c); - break; -@@ -196,13 +202,15 @@ void mattrib(int argc, char **argv, int - case 'X': - concise = 1; - break; -- case 'h': -- usage(0); - case '?': - usage(1); - } - } - -+ if(optind == argc && wantUsage) { -+ usage(0); -+ } -+ - for(;optind < argc;optind++) { - switch(argv[optind][0]) { - case '+': diff --git a/mtools-4.0.10-overflow.diff b/mtools-4.0.10-overflow.diff deleted file mode 100644 index a2ded9e..0000000 --- a/mtools-4.0.10-overflow.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- mpartition.c -+++ mpartition.c -@@ -514,7 +514,7 @@ void mpartition(int argc, char **argv, i - read(fd, (char *) buf, 512); - } - memset((char *)(partTable+1), 0, 4*sizeof(*partTable)); -- set_dword(((unsigned char*)buf)+510, 0xaa55); -+ set_word(((unsigned char*)buf)+510, 0xaa55); - } - - /* check for boot signature, and place it if needed */ diff --git a/mtools-4.0.10-script.diff b/mtools-4.0.10-script.diff deleted file mode 100644 index 947b2e8..0000000 --- a/mtools-4.0.10-script.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- scripts/mcomp -+++ scripts/mcomp -@@ -3,5 +3,5 @@ - dosfile=$1 - shift - --mcopy $dosfile - | cmp $@ -+mcopy $dosfile - | cmp "$@" - ---- scripts/mxtar -+++ scripts/mxtar -@@ -5,5 +5,5 @@ - shift - shift - --mcopy $dosfile - | tar $taropt - $@ -+mcopy $dosfile - | tar $taropt - "$@" - diff --git a/mtools-4.0.10.tar.bz2 b/mtools-4.0.10.tar.bz2 deleted file mode 100644 index 65b73e1..0000000 --- a/mtools-4.0.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:860fee13acb39365bd28763070e24011ea55f381f96714d2841937525aa02ded -size 381481 diff --git a/mtools-4.0.10-aliasing.diff b/mtools-4.0.12-aliasing.diff similarity index 63% rename from mtools-4.0.10-aliasing.diff rename to mtools-4.0.12-aliasing.diff index 84351f5..343f36d 100644 --- a/mtools-4.0.10-aliasing.diff +++ b/mtools-4.0.12-aliasing.diff @@ -1,6 +1,8 @@ ---- file.c +Index: file.c +=================================================================== +--- file.c.orig +++ file.c -@@ -573,7 +573,7 @@ +@@ -591,7 +591,7 @@ static Stream_t *_internalFileOpen(Strea Pattern.loopDetectRel = 0; Pattern.loopDetectAbs = first; if(!hash_lookup(filehash, (T_HashTableEl) &Pattern, diff --git a/mtools-4.0.10-autoconf.diff b/mtools-4.0.12-autoconf.diff similarity index 88% rename from mtools-4.0.10-autoconf.diff rename to mtools-4.0.12-autoconf.diff index 0b76ad3..40b7c16 100644 --- a/mtools-4.0.10-autoconf.diff +++ b/mtools-4.0.12-autoconf.diff @@ -1,6 +1,8 @@ ---- configure.in +Index: configure.in +=================================================================== +--- configure.in.orig +++ configure.in -@@ -95,10 +95,10 @@ +@@ -110,10 +110,10 @@ dnl dnl AC_MSG_CHECKING(whether llseek declared in unistd.h) AC_CACHE_VAL(mtools_cv_have_llseek_prototype, @@ -13,7 +15,7 @@ AC_MSG_RESULT($mtools_cv_have_llseek_prototype) if test "$mtools_cv_have_llseek_prototype" = yes; then AC_DEFINE([HAVE_LLSEEK_PROTOTYPE],1,[Define when you have an LLSEEK prototype]) -@@ -106,13 +106,13 @@ +@@ -121,13 +121,13 @@ fi AC_MSG_CHECKING(whether lseek64 declared in unistd.h) AC_CACHE_VAL(mtools_cv_have_lseek64_prototype, @@ -29,7 +31,7 @@ AC_MSG_RESULT($mtools_cv_have_lseek64_prototype) if test "$mtools_cv_have_lseek64_prototype" = yes; then AC_DEFINE([HAVE_LSEEK64_PROTOTYPE],1,[Define when you have an LSEEK64 prototype]) -@@ -145,12 +145,12 @@ +@@ -163,12 +163,12 @@ dnl Check for 64-bit off_t dnl AC_DEFUN(SFS_CHECK_OFF_T_64, [AC_CACHE_CHECK(for 64-bit off_t, sfs_cv_off_t_64, diff --git a/mtools-4.0.10-conf.diff b/mtools-4.0.12-conf.diff similarity index 100% rename from mtools-4.0.10-conf.diff rename to mtools-4.0.12-conf.diff diff --git a/mtools-4.0.10-fat-bits.diff b/mtools-4.0.12-fat-bits.diff similarity index 63% rename from mtools-4.0.10-fat-bits.diff rename to mtools-4.0.12-fat-bits.diff index 30d7546..73d6e4a 100644 --- a/mtools-4.0.10-fat-bits.diff +++ b/mtools-4.0.12-fat-bits.diff @@ -1,6 +1,8 @@ ---- fat.c +Index: fat.c +=================================================================== +--- fat.c.orig +++ fat.c -@@ -704,7 +704,7 @@ +@@ -722,7 +722,7 @@ static int old_fat_read(Fs_t *This, unio if(check_media_type(This,boot, tot_sectors)) return -1; diff --git a/mtools-4.0.12-file-close.diff b/mtools-4.0.12-file-close.diff new file mode 100644 index 0000000..4bd8959 --- /dev/null +++ b/mtools-4.0.12-file-close.diff @@ -0,0 +1,12 @@ +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.10-prototypes.diff b/mtools-4.0.12-prototypes.diff similarity index 62% rename from mtools-4.0.10-prototypes.diff rename to mtools-4.0.12-prototypes.diff index 8b85bdd..7ab746e 100644 --- a/mtools-4.0.10-prototypes.diff +++ b/mtools-4.0.12-prototypes.diff @@ -1,6 +1,8 @@ ---- mformat.c +Index: mformat.c +=================================================================== +--- mformat.c.orig +++ mformat.c -@@ -3,6 +3,7 @@ +@@ -19,6 +19,7 @@ */ #define DONT_NEED_WAIT @@ -8,7 +10,7 @@ #include "sysincludes.h" #include "msdos.h" -@@ -31,7 +32,7 @@ +@@ -48,7 +49,7 @@ #define _LINUX_STRING_H_ #define kdev_t int @@ -17,9 +19,11 @@ #undef _LINUX_STRING_H_ #endif ---- mpartition.c +Index: mpartition.c +=================================================================== +--- mpartition.c.orig +++ mpartition.c -@@ -2,6 +2,7 @@ +@@ -17,6 +17,7 @@ * mformat.c */ #define DONT_NEED_WAIT @@ -27,7 +31,7 @@ #include "sysincludes.h" #include "msdos.h" -@@ -20,7 +21,7 @@ +@@ -35,7 +36,7 @@ #define _LINUX_STRING_H_ #define kdev_t int @@ -36,9 +40,11 @@ #undef _LINUX_STRING_H_ #endif ---- sysincludes.h +Index: sysincludes.h +=================================================================== +--- sysincludes.h.orig +++ sysincludes.h -@@ -268,12 +268,16 @@ +@@ -331,12 +331,16 @@ typedef unsigned int uid_t; #endif #ifdef HAVE_NETINET_IN_H diff --git a/mtools-4.0.12-script.diff b/mtools-4.0.12-script.diff new file mode 100644 index 0000000..557f45b --- /dev/null +++ b/mtools-4.0.12-script.diff @@ -0,0 +1,22 @@ +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.12.tar.bz2 b/mtools-4.0.12.tar.bz2 new file mode 100644 index 0000000..aac1a06 --- /dev/null +++ b/mtools-4.0.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53cf808eed9b396070a12c6e53479800a5b9038e9d70c79277e762246ba07a13 +size 382456 diff --git a/mtools.changes b/mtools.changes index a40b3e6..428de14 100644 --- a/mtools.changes +++ b/mtools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 24 15:29:20 CET 2009 - pgajdos@suse.cz + +- updated to 4.0.12 (see NEWS) + - removed upstreamed help-flag.diff and overflow.diff + ------------------------------------------------------------------- Fri Oct 23 11:25:37 CEST 2009 - pgajdos@suse.cz diff --git a/mtools.spec b/mtools.spec index 044d043..7e716ef 100644 --- a/mtools.spec +++ b/mtools.spec @@ -1,5 +1,5 @@ # -# spec file for package mtools (Version 4.0.10) +# spec file for package mtools (Version 4.0.12) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,11 +20,11 @@ Name: mtools BuildRequires: libpng texlive-latex xorg-x11 xorg-x11-devel -Version: 4.0.10 -Release: 5 +Version: 4.0.12 +Release: 1 AutoReqProv: on Group: System/Filesystems -License: GPL v3 or later +License: GPLv3+ Url: http://mtools.linux.lu/ Summary: Access Files on an MS-DOS File System Source: %{name}-%{version}.tar.bz2 @@ -34,9 +34,7 @@ Patch2: %{name}-%{version}-script.diff Patch3: %{name}-%{version}-aliasing.diff Patch4: %{name}-%{version}-fat-bits.diff Patch5: %{name}-%{version}-prototypes.diff -Patch6: %{name}-%{version}-overflow.diff Patch7: %{name}-%{version}-file-close.diff -Patch8: %{name}-%{version}-help-flag.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,7 +52,7 @@ Authors: David C. Niemi %package floppyd -License: GPL v2 or later +License: GPLv2+ Group: System/Filesystems Summary: floppy daemon for remote access to floppy drive @@ -71,7 +69,7 @@ Authors: David C. Niemi %package doc -License: GPL v3 or later ; GNU Free Documentation License, Version 1.3 (GFDL 1.3) +License: GPLv3+ ; GNU Free Documentation License, Version 1.3 (GFDL 1.3) Group: System/Filesystems Summary: Access Files on an MS-DOS File System Requires: %{name} = %{version} @@ -98,9 +96,7 @@ Authors: %patch3 %patch4 %patch5 -%patch6 %patch7 -%patch8 -p1 %build %{suse_update_config -f}