Skip to content

Commit

Permalink
Imported Debian patch 5.96-1
Browse files Browse the repository at this point in the history
  • Loading branch information
mstone232 authored and SamB committed Nov 22, 2012
2 parents 2506435 + a845a01 commit 6400110
Show file tree
Hide file tree
Showing 15 changed files with 275 additions and 97 deletions.
Binary file removed coreutils-5.94.tar.bz2
Binary file not shown.
7 changes: 0 additions & 7 deletions coreutils-5.94.tar.bz2.sig

This file was deleted.

Binary file added coreutils-5.96.tar.bz2
Binary file not shown.
22 changes: 22 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
coreutils (5.96-1) unstable; urgency=low

* New upstream version
* Don't override posix version at build time anymore. Upstream has
made this less painful; is this viable for etch?
* Update copyright file (Closes: #356532)

-- Michael Stone <mstone@debian.org> Tue, 23 May 2006 21:08:13 -0400

coreutils (5.94-2) unstable; urgency=low

* Reorder 55_coreutils.selinux.patch to fix builds on hurd
(Closes: #344166)
* [58_getcwd-chroot] fix pwd failure on certain bind mounts
(Closes: #355810)
* [59_dircolors-moreterms] add rxvt-unicode & mlterm to dircolors
(Closes: #270139, #317503)
* Update copyright file (thanks Joost van Baal) (Closes: #356532)
* Extend the diversion hackery (Closes: #361799)

-- Michael Stone <mstone@debian.org> Sat, 15 Apr 2006 21:48:43 -0400

coreutils (5.94-1) unstable; urgency=low

* New upstream version (Closes: #349530, #273781, #332779, #341912)
Expand Down
3 changes: 2 additions & 1 deletion debian/copyright
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
The empty packages fileutils, textutils, and shellutils are created by
Michael Stone <mstone@debian.org> and are in the public domain.
Michael Stone <mstone@debian.org> and are either too trivial to copyright
or are released into the public domain.

187 changes: 172 additions & 15 deletions debian/coreutils.copyright
Original file line number Diff line number Diff line change
@@ -1,33 +1,190 @@
This is the Debian GNU/Linux prepackaged version of the GNU core
This is the Debian GNU/Linux packaged version of the GNU core
utilities.

This package is maintained by Michael Stone <mstone@debian.org> and
built from sources obtained from:
ftp://ftp.gnu.org/gnu/coreutils/coreutils-5.93.tar.bz2
ftp://ftp.gnu.org/gnu/coreutils/coreutils-5.96.tar.bz2

This debian package was first put together by Michael Stone
<mstone@debian.org>, from coreutils 4.5.1.

Changes:
* added Debian GNU/Linux package maintenance system files
* install.c: Added extra options to invocation of strip
* at times, bug fixes awaiting inclusion in the upstream source

GNU coreutils are Copyright (C) 1985-2003 Free Software Foundation, Inc.

Authors
=======

See the file AUTHORS.


Copyright Holders and License
=============================

lib/fts.c
---------

Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License [...]

/*-
* Copyright (c) 1990, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/


lib/fts_.h
----------

Copyright (C) 2004, 2005 Free Software Foundation, Inc.

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
it under the terms of the GNU General Public License [...]

/*
* Copyright (c) 1989, 1993
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.


m4/autobuild.m4
---------------

# Copyright (C) 2004 Simon Josefsson
#
# This file is free software, distributed under the terms of the GNU
# General Public License. As a special exception to the GNU General
# Public License, this file may be distributed as part of a program
# that contains a configuration script generated by Autoconf, under
# the same distribution terms as the rest of that program.
#
# This file can can be used in projects which are not available under
# the GNU General Public License or the GNU Library General Public
# License but which still want to provide support for Autobuild.


src/cut.c
---------

Copyright (C) 1997-2005 Free Software Foundation, Inc.
Copyright (C) 1984 David M. Ihnat

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License [...]


src/dircolors.c
---------------

Copyright (C) 1996-2005 Free Software Foundation, Inc.
Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000 H. Peter Anvin

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License [...]


src/paste.c
-----------

Copyright (C) 1997-2005 Free Software Foundation, Inc.
Copyright (C) 1984 David M. Ihnat

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License [...]


src/shred.c
-----------

Copyright (C) 1999-2005 Free Software Foundation, Inc.
Copyright (C) 1997, 1998, 1999 Colin Plumb.

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License [...]


doc/coreutils.texi (The GNU Coreutils Manual)
---------------------------------------------

Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.

Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1 or
any later version published by the Free Software Foundation; with no
Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
Texts. A copy of the license is included in the section entitled ``GNU
Free Documentation License''.


all other files
---------------

Copyright (C) 1984-2006 Free Software Foundation, Inc.

This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
You should have received a copy of the GNU General Public License
along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

On Debian GNU/Linux systems, the complete text of the GNU General
On Debian systems, the complete text of the GNU General
Public License can be found in `/usr/share/common-licenses/GPL'.
2 changes: 2 additions & 0 deletions debian/coreutils.preinst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ done
# get rid of this for etch+1, I don't think there's a better solution until then
rm -f /usr/bin/md5sum.textutils
rm -f /usr/share/man/man1/md5sum.textutils
rm -f /usr/share/man/man1/md5sum.1.gz
rm -f /usr/share/man/man1/md5sum.textutils.1.gz
dpkg-divert --remove /usr/share/man/man1/md5sum.textutils.1.gz
dpkg-divert --remove /usr/bin/md5sum.textutils

Expand Down
24 changes: 12 additions & 12 deletions debian/patches/54_coreutils-acl.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- /dev/null 2005-10-10 09:36:06.437701000 +0100
+++ coreutils-5.94/m4/posix_acl.m4 2005-10-27 11:44:29.000000000 +0100
+++ coreutils-5.96/m4/posix_acl.m4 2005-10-27 11:44:29.000000000 +0100
@@ -0,0 +1,28 @@
+#serial 1
+
Expand Down Expand Up @@ -30,7 +30,7 @@
+ fi
+])
--- coreutils-5.93/lib/acl.h.acl 2005-05-14 08:58:06.000000000 +0100
+++ coreutils-5.94/lib/acl.h 2005-10-27 11:44:29.000000000 +0100
+++ coreutils-5.96/lib/acl.h 2005-10-27 11:44:29.000000000 +0100
@@ -18,11 +18,16 @@

Written by Paul Eggert. */
Expand All @@ -50,7 +50,7 @@
+int copy_acl (char const *, char const *, mode_t);
+int set_acl (char const *, mode_t);
--- coreutils-5.93/lib/acl.c.acl 2005-09-22 07:47:18.000000000 +0100
+++ coreutils-5.94/lib/acl.c 2005-10-27 11:44:29.000000000 +0100
+++ coreutils-5.96/lib/acl.c 2005-10-27 11:44:29.000000000 +0100
@@ -22,18 +22,30 @@
# include <config.h>
#endif
Expand Down Expand Up @@ -291,7 +291,7 @@
+}
+
--- coreutils-5.93/src/mv.c.acl 2005-07-03 17:55:19.000000000 +0100
+++ coreutils-5.94/src/mv.c 2005-10-27 11:44:29.000000000 +0100
+++ coreutils-5.96/src/mv.c 2005-10-27 11:44:29.000000000 +0100
@@ -135,12 +135,6 @@
x->mode = 0;
x->stdin_tty = isatty (STDIN_FILENO);
Expand All @@ -306,7 +306,7 @@
x->verbose = false;
x->dest_info = NULL;
--- coreutils-5.93/src/ls.c.acl 2005-10-27 11:44:29.000000000 +0100
+++ coreutils-5.94/src/ls.c 2005-10-27 11:44:29.000000000 +0100
+++ coreutils-5.96/src/ls.c 2005-10-27 11:44:29.000000000 +0100
@@ -193,13 +193,13 @@

enum filetype filetype;
Expand Down Expand Up @@ -342,7 +342,7 @@
{
int n = file_has_acl (absolute_name, &f->stat);
--- coreutils-5.93/src/install.c.acl 2005-09-23 21:58:37.000000000 +0100
+++ coreutils-5.94/src/install.c 2005-10-27 11:44:29.000000000 +0100
+++ coreutils-5.96/src/install.c 2005-10-27 11:44:29.000000000 +0100
@@ -153,7 +153,6 @@
x->mode = S_IRUSR | S_IWUSR;
x->stdin_tty = false;
Expand All @@ -352,7 +352,7 @@
x->verbose = false;
x->dest_info = NULL;
--- coreutils-5.93/src/cp.c.acl 2005-09-16 08:51:01.000000000 +0100
+++ coreutils-5.94/src/cp.c 2005-10-27 11:44:29.000000000 +0100
+++ coreutils-5.96/src/cp.c 2005-10-27 11:44:29.000000000 +0100
@@ -56,7 +56,8 @@
need to be fixed after copying. */
struct dir_attr
Expand Down Expand Up @@ -540,7 +540,7 @@
{
if (x.recursive)
--- coreutils-5.93/src/copy.h.acl 2005-07-03 10:45:51.000000000 +0100
+++ coreutils-5.94/src/copy.h 2005-10-27 11:44:29.000000000 +0100
+++ coreutils-5.96/src/copy.h 2005-10-27 11:44:29.000000000 +0100
@@ -165,9 +165,6 @@
Create destination directories as usual. */
bool symbolic_link;
Expand All @@ -552,7 +552,7 @@
with the same or newer modification time. */
bool update;
--- coreutils-5.93/src/copy.c.acl 2005-09-25 06:57:47.000000000 +0100
+++ coreutils-5.94/src/copy.c 2005-10-27 11:57:41.000000000 +0100
+++ coreutils-5.96/src/copy.c 2005-10-27 11:57:41.000000000 +0100
@@ -101,26 +101,6 @@
/* The invocation name of this program. */
extern char *program_name;
Expand Down Expand Up @@ -888,7 +888,7 @@
}
}
--- coreutils-5.93/src/Makefile.am.acl 2005-09-29 11:28:37.000000000 +0100
+++ coreutils-5.94/src/Makefile.am 2005-10-27 11:44:29.000000000 +0100
+++ coreutils-5.96/src/Makefile.am 2005-10-27 11:44:29.000000000 +0100
@@ -50,9 +50,9 @@
LDADD = ../lib/libcoreutils.a $(LIBINTL) ../lib/libcoreutils.a

Expand Down Expand Up @@ -918,7 +918,7 @@
## If necessary, add -lm to resolve use of pow in lib/strtod.c.
sort_LDADD = $(LDADD) $(POW_LIB)
--- coreutils-5.93/configure.ac.acl 2005-10-22 19:12:36.000000000 +0100
+++ coreutils-5.94/configure.ac 2005-10-27 11:44:30.000000000 +0100
+++ coreutils-5.96/configure.ac 2005-10-27 11:44:30.000000000 +0100
@@ -251,6 +251,8 @@
AM_GNU_GETTEXT([external], [need-ngettext])
AM_GNU_GETTEXT_VERSION(0.13.1)
Expand All @@ -929,7 +929,7 @@
Makefile
doc/Makefile
--- coreutils-5.93/config.hin.acl 2005-10-22 19:14:08.000000000 +0100
+++ coreutils-5.94/config.hin 2005-10-27 11:44:30.000000000 +0100
+++ coreutils-5.96/config.hin 2005-10-27 11:44:30.000000000 +0100
@@ -101,6 +101,30 @@
/* Define to 1 if you have the `acl' function. */
#undef HAVE_ACL
Expand Down
Loading

0 comments on commit 6400110

Please sign in to comment.