rpms/mmv/devel changelog, NONE, 1.1 copyright, NONE, 1.1 mmv-1.01b-debian.patch, NONE, 1.1 mmv-1.01b-makefile.patch, NONE, 1.1 mmv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Zing Zing Shishak (shishz)
fedora-extras-commits at redhat.com
Fri Sep 30 00:40:22 UTC 2005
Author: shishz
Update of /cvs/extras/rpms/mmv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29362/devel
Modified Files:
.cvsignore sources
Added Files:
changelog copyright mmv-1.01b-debian.patch
mmv-1.01b-makefile.patch mmv.spec
Log Message:
auto-import mmv-1.01b-2 on branch devel from mmv-1.01b-2.src.rpm
--- NEW FILE changelog ---
mmv (1.01b-12.2) unstable; urgency=low
* NMU
* Fix segfault at startup on amd64 (and possibly other architectures)
due to implicit declaration of functions from stdlib.h. (Closes: #322541)
-- Ari Pollak <ari at debian.org> Sat, 13 Aug 2005 01:01:13 -0400
mmv (1.01b-12.1) unstable; urgency=low
* Non-Maintainer Upload (BSP 2005-08-06).
* Fixed FTBFS with gcc 3.4 / 4.0 by applying patch from
Andreas Jochens (Closes: #260574).
-- Uwe Hermann <uwe at debian.org> Sat, 6 Aug 2005 22:07:06 +0200
mmv (1.01b-12) unstable; urgency=low
* LFS support! (not sure if this breaks something :) (Closes: Bug #106822)
* support -- as option terminator (Closes: Bug #52417)
-- Bernd Eckenfels <ecki at debian.org> Tue, 20 Nov 2001 19:03:24 +0100
mmv (1.01b-11) unstable; urgency=medium
* added Build-Depends (Closes: Bug #105025)
* bumped Standards Version from 3.0.1 to 3.6.5
* make strig/-g depending on environemnt variable
* added a comment about quoting 'to' patter (Closes: Bug #106076)
-- Bernd Eckenfels <ecki at debian.org> Sat, 10 Nov 2001 18:28:56 +0100
mmv (1.01b-10.1) unstable; urgency=LOW
* reupload cause it was rejected
-- Bernd Eckenfels <ecki at debian.org> Thu, 3 Aug 2000 02:38:20 +0200
mmv (1.01b-10) unstable; urgency=LOW
* debian/rules clean will now kill *~ files
-- Bernd Eckenfels <ecki at debian.org> Sun, 23 Jul 2000 04:28:46 +0200
mmv (1.01b-9) unstable; urgency=LOW
* closes: #67605 (no special handling for char > 127 anymore)
* clsoes: #60128 (i think it was fixed by hartmut already)
* man page and doc now in /usr/share, new standards version
-- Bernd Eckenfels <ecki at debian.org> Sun, 23 Jul 2000 04:08:19 +0200
mmv (1.01b-8.1) unstable; urgency=LOW
* NMU
* fixed the invalid initializer for glibc-2.1
* closes: #31929
* changed in debian/rules in the clean target:
+ /bin/rm -f into -rm -f
+ make into -make
+ added *~
-- Hartmut Koptein <koptein at debian.org> Fri, 9 Jul 1999 10:24:17 +0200
mmv (1.01b-8) unstable; urgency=LOW
* should compile now with different headers (Bug#26955).
-- Bernd Eckenfels <ecki at debian.org> Sun, 1 Nov 1998 05:36:36 +0100
mmv (1.01b-7) frozen unstable; urgency=LOW
* Remove debian/files with make clean (Bug#21526).
-- Michael Meskes <meskes at debian.org> Wed, 22 Apr 1998 16:19:30 +0200
mmv (1.01b-6) frozen unstable; urgency=LOW
* Make lintian happy.
-- Michael Meskes <meskes at debian.org> Fri, 17 Apr 1998 14:36:19 +0200
mmv (1.01b-5) unstable; urgency=LOW
* Added new copyright notice and moved package back into main.
My thanks go to Joost for getting into touch with the upstream author.
-- Michael Meskes <meskes at debian.org> Thu, 5 Mar 1998 10:42:42 +0100
mmv (1.01b-4) unstable; urgency=LOW
* Updated standard
* Added man page links.
-- Michael Meskes <meskes at debian.org> Fri, 27 Feb 1998 15:33:54 +0100
mmv (1.01b-3) unstable; urgency=LOW
* Moved package to non-free. Sorry, I cannot reach the upstream author to
clarify the problems with his copyright. (#14908).
* Do not comress copyright file. (#14460)
-- Michael Meskes <meskes at debian.org> Fri, 19 Dec 1997 10:47:37 +0100
mmv (1.01b-2) unstable; urgency=LOW
* Put copyright file into /usr/doc/mmv/copyright (#10623)
* Removed -m486 option in Makefile (#10780).
* Corrected man page permission (#4913).
* Compiled against libc6.
-- Michael Meskes <meskes at debian.org> Tue, 5 Aug 1997 13:11:36 +0200
mmv (1.01b-1) unstable; urgency=LOW
* Initial release
-- Michael Meskes <meskes at debian.org> Tue, 15 Oct 1996 13:02:46 +0200
--- NEW FILE copyright ---
This is the Debian GNU/Linux prepackaged version of mmv.
This package was put together by Michael Meskes <meskes at debian.org>,
from sources obtained from USENET.
It is now maintained by Bernd Eckenfels <ecki at debian.org> with some
enhancements (NLS Char Support, glibc compiles) from Bernd and kind
contributions from Hartmut Koptein <koptein at et-inf.fho-emden.de>.
Copyright (c) 1989 Vladimir Lanin
Mmv is freeware. That means that the entire package of software and
documentation is copyrighted, and may not be distributed with any
modifications or for any charge (without the author's explicit written
permission). Other than that, it may be used and distributed freely.
Vladimir Lanin
330 Wadsworth Ave, Apt 6F
New York, NY 10040
lanin at csd2.nyu.edu
...!cmcl2!csd2!lanin
However, Vladimir told me:
Michael,
This message is to serve as an announcement that I am changing the
copyright of mmv to GPL.
If this message is in any way insufficient to do so, please tell me what
I have to do. Please keep in mind that I do not have in hand either the
full GPL text or the source code of the last mmv release (oops).
If there is any other way that I can help out, please tell me.
Thanks,
Vladimir Lanin
vlad at brm.com
Thanks to Joost for getting into touch with him.
mmv-1.01b-debian.patch:
--- NEW FILE mmv-1.01b-debian.patch ---
--- mmv-1.01b.orig/mmv.c 1993-10-25 06:29:39.000000000 -0400
+++ mmv-1.01b/mmv.c 2005-08-23 20:25:08.000000000 -0400
@@ -62,7 +62,8 @@
%s [-m|x%s|c|o|a|z] [-h] [-d|p] [-g|t] [-v|n] [from to]\n\
\n\
Use #N in the ``to'' pattern to get the string matched\n\
-by the N'th ``from'' pattern wildcard.\n";
+by the N'th ``from'' pattern wildcard.\n\
+Use -- as the end of options.\n";
#define OTHEROPT (_osmajor < 3 ? "" : "|r")
@@ -75,7 +76,9 @@
string matched by the N'th ``from'' pattern wildcard.\n\
\n\
A ``from'' pattern containing wildcards should be quoted when given\n\
-on the command line.\n";
+on the command line. Also you may need to quote ``to'' pattern.\n\
+\n\
+Use -- as the end of options.\n";
#ifdef IS_SYSV
#define OTHEROPT ""
@@ -85,6 +88,7 @@
#endif
+#include <unistd.h>
#include <stdio.h>
#include <ctype.h>
@@ -120,14 +124,11 @@
#else
/* for various flavors of UN*X */
+#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/file.h>
-extern char *getenv();
-extern long lseek();
-extern char *malloc();
-
#ifdef HAS_DIRENT
#include <dirent.h>
typedef struct dirent DIRENTRY;
@@ -390,7 +391,7 @@
static int snap(/* REP *first, REP *p */);
static void showdone(/* REP *fin */);
static void breakout(/* */);
-static int breakrep(/* */);
+static void breakrep(int);
static void breakstat(/* */);
static void quit(/* */);
static int copymove(/* REP *p */);
@@ -436,7 +437,7 @@
static SLICER slicer[2] = {{NULL, NULL, 0}, {NULL, NULL, 0}};
static int badreps = 0, paterr = 0, direrr, failed = 0, gotsig = 0, repbad;
-static FILE *outfile = stdout;
+static FILE *outfile;
static char IDF[] = "$$mmvdid.";
static char TEMP[] = "$$mmvtmp.";
@@ -497,6 +498,8 @@
{
char *frompat, *topat;
+ outfile = stdout;
+
init();
procargs(argc, argv, &frompat, &topat);
domatch(frompat, topat);
@@ -575,6 +578,11 @@
for (argc--, argv++; argc > 0 && **argv == '-'; argc--, argv++)
for (p = *argv + 1; *p != '\0'; p++) {
c = mylower(*p);
+ if (c == '-') {
+ argc--;
+ argv++;
+ goto endargs;
+ }
if (c == 'v' && !noex)
verbose = 1;
else if (c == 'n' && !verbose)
@@ -618,6 +626,7 @@
}
}
+endargs:
if (op == DFLT)
if (strcmp(cmdname, MOVENAME) == 0)
op = XMOVE;
@@ -999,20 +1008,16 @@
printf(TRAILESC, from, to, ESC);
return(-1);
}
+#ifdef IS_MSDOS
default:
if (
-#ifdef IS_MSDOS
c <= ' ' || c >= 127 ||
strchr(":/\\*?[]=+;,\"|<>", c) != NULL
-#else
- c & 0x80
-#endif
) {
printf("%s -> %s : illegal character '%c' (0x%02X).\n",
from, to, c, c);
return(-1);
}
-#ifdef IS_MSDOS
if (isupper(c))
*p = c + ('a' - 'A');
#endif
@@ -2578,10 +2583,10 @@
}
-static int breakrep()
+static void breakrep(int signum)
{
gotsig = 1;
- return(1);
+ return;
}
@@ -2624,7 +2629,7 @@
static int copy(ff, len)
FILEINFO *ff;
- long len;
+ off_t len;
{
char buf[BUFSIZE], c;
int f, t, k, mode, perm;
@@ -2672,7 +2677,7 @@
return(-1);
}
if (op & APPEND)
- lseek(t, 0L, 2);
+ lseek(t, (off_t)0, SEEK_END);
#ifdef IS_MSDOS
if (op & ZAPPEND && filelength(t) != 0) {
if (lseek(t, -1L, 1) == -1L || read(t, &c, 1) != 1) {
@@ -2684,10 +2689,10 @@
lseek(t, -1L, 1);
}
#endif
- if ((op & APPEND) && len != -1L) {
+ if ((op & APPEND) && len != (off_t)-1) {
while (
len != 0 &&
- (k = read(f, buf, len > BUFSIZE ? BUFSIZE : (unsigned)len)) > 0 &&
+ (k = read(f, buf, (len > BUFSIZE) ? BUFSIZE : (size_t)len)) > 0 &&
write(t, buf, k) == k
)
len -= k;
--- mmv-1.01b.orig/mmv.1 1990-09-11 15:59:24.000000000 -0400
+++ mmv-1.01b/mmv.1 2005-08-23 20:29:59.000000000 -0400
@@ -2,7 +2,7 @@
.\" To print the MS-DOS version, use option -rO2.
.\" Under System V, take out the '.\" ' from the next line.
.\" .nr O 1
-.TH MMV 1 "November 20, 1989 (v1.0)"
+.TH MMV 1 "November 20, 2001 (v1.0lfs)"
.ie !'\nO'2' \{\
.SH NAME
mmv \- move/copy/append/link multiple files by wildcard patterns
@@ -28,6 +28,7 @@
[\fB-d\fP|\fBp\fP]
[\fB-g\fP|\fBt\fP]
[\fB-v\fP|\fBn\fP]
+[\fB--\fP]
[\fBfrom to\fP]
.if '\nO'2' \{\
.br
@@ -56,7 +57,8 @@
and gives the user the choice of either
proceeding by avoiding the offending parts
or aborting.
-
+.I mmv does support large files (LFS) but it does *NOT* support
+sparse files (i.e. it explodes them).
.ce
The Task Options
.PP
@@ -332,8 +334,9 @@
.IR mmv ,
it is usually necessary to enclose the command-line
.I from
-pattern
-in quotes.
+and
+.I to
+patterns in quotes.
\}
.ce
mmv-1.01b-makefile.patch:
--- NEW FILE mmv-1.01b-makefile.patch ---
--- mmv-1.01b.orig/Makefile 1994-11-04 19:24:55.000000000 -0500
+++ mmv-1.01b/Makefile 2005-08-23 21:52:47.000000000 -0400
@@ -1,16 +1,16 @@
# Possible defines in CONF:
# IS_MSDOS IS_SYSV IS_V7 IS_BSD HAS_DIRENT HAS_RENAME MV_DIR
-CC =gcc -traditional
+CC =gcc
LD =$(CC)
CONF =-DIS_SYSV -DHAS_DIRENT -DHAS_RENAME
-CFLAGS =-O2 -m486 $(CONF)
-LDFLAGS =-s -N
+CFLAGS =-O2 $(CONF)
+LDFLAGS =$(LDCONF)
#IBIN =$(LOCAL)$(ARCH)/bin
#IMAN =$(LOCAL)$(ANY)/man
IBIN=$(DESTDIR)/usr/bin/
-IMAN=$(DESTDIR)/usr/man/
+IMAN=$(DESTDIR)/usr/share/man/
mmv: mmv.o
@@ -20,5 +20,5 @@
install: $(DEST)$(IBIN)/mmv
install: $(DEST)$(IMAN)/man1/mmv.1
-$(DEST)$(IBIN)/mmv: mmv; cp $? $@
-$(DEST)$(IMAN)/man1/mmv.1: mmv.1; cp $? $@
+$(DEST)$(IBIN)/mmv: mmv; install -D -p $? $@
+$(DEST)$(IMAN)/man1/mmv.1: mmv.1; install -D -p $? $@
--- NEW FILE mmv.spec ---
Name: mmv
Version: 1.01b
Release: 2
Summary: Move/copy/append/link multiple files
Group: Applications/File
License: GPL
URL: http://packages.qa.debian.org/m/mmv.html
Source0: http://ftp.debian.org/debian/pool/main/m/mmv/mmv_1.01b.orig.tar.gz
Source1: copyright
Source2: changelog
Patch0: mmv-1.01b-debian.patch
Patch1: mmv-1.01b-makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
This is mmv, a program to move/copy/append/link multiple files
according to a set of wildcard patterns. This multiple action is
performed safely, i.e. without any unexpected deletion of files due to
collisions of target names with existing filenames or with other
target names. Furthermore, before doing anything, mmv attempts to
detect any errors that would result from the entire set of actions
specified and gives the user the choice of either aborting before
beginning, or proceeding by avoiding the offending parts.
%prep
%setup -q -n mmv-1.01b.orig
%patch0 -p1
%patch1 -p1
cp -p %{SOURCE1} .
cp -p %{SOURCE2} .
%build
make CONF="$RPM_OPT_FLAGS -fpie" LDCONF="-pie" %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mcp
ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mad
ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mln
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc ANNOUNCE ARTICLE READ.ME copyright changelog
%{_bindir}/mmv
%{_bindir}/mcp
%{_bindir}/mad
%{_bindir}/mln
%{_mandir}/man1/*
%changelog
* Wed Sep 28 2005 Zing <shishz at hotpop.com> - 1.01b-2
- QA from Aurelien Bompard
- don't change source name
- symlink mcp/mad/mln
* Tue Aug 23 2005 Zing <shishz at hotpop.com> - 1.01b-1
- initial RPM release
- pull from debian mmv_1.01b-12.2
- build executable as a PIE
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mmv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Sep 2005 00:39:46 -0000 1.1
+++ .cvsignore 30 Sep 2005 00:40:20 -0000 1.2
@@ -0,0 +1 @@
+mmv_1.01b.orig.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mmv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Sep 2005 00:39:46 -0000 1.1
+++ sources 30 Sep 2005 00:40:20 -0000 1.2
@@ -0,0 +1 @@
+1b2135ab2f17bdfa9e08debbb3c46ad8 mmv_1.01b.orig.tar.gz
More information about the fedora-extras-commits
mailing list