[Pkg-shadow-commits] r328 - trunk/debian/patches

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2005-06-29 22:07:11 +0000 (Wed, 29 Jun 2005)
New Revision: 328

Added:
   trunk/debian/patches/438_su_GNU_origin
Removed:
   trunk/debian/patches/008_su_GNU_origin
Modified:
   trunk/debian/patches/series
Log:
This patch gives credit to sh-util's su licenced under GPL.
The amount of code from sh-util should be checked but is probably negligible
(fair use). However, the credit is still a good practice.


Deleted: trunk/debian/patches/008_su_GNU_origin
===================================================================
--- trunk/debian/patches/008_su_GNU_origin	2005-06-29 21:42:48 UTC (rev 327)
+++ trunk/debian/patches/008_su_GNU_origin	2005-06-29 22:07:11 UTC (rev 328)
@@ -1,35 +0,0 @@
-Goal: Be up front on the origin of our su.
-Fixes: #244297
-
-Status wrt upstream: It must be forwarded upstream.
-                     Upstream also uses some bits from the GNU shellutils.
-
-Index: shadow-4.0.3/src/su.c
-===================================================================
---- shadow-4.0.3.orig/src/su.c	2005-05-23 00:34:54.617167000 +0200
-+++ shadow-4.0.3/src/su.c	2005-05-23 00:36:04.067167000 +0200
-@@ -26,6 +26,24 @@
-  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-  * SUCH DAMAGE.
-  */
-+/* Some parts substantially derived from an ancestor of: */
-+/* su for GNU.  Run a shell with substitute user and group IDs.
-+   Copyright (C) 1992-2003 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.
-+
-+   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.
-+
-+   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.  */
-+
- 
- #include <config.h>
- 

Copied: trunk/debian/patches/438_su_GNU_origin (from rev 310, trunk/debian/patches/008_su_GNU_origin)

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-06-29 21:42:48 UTC (rev 327)
+++ trunk/debian/patches/series	2005-06-29 22:07:11 UTC (rev 328)
@@ -44,7 +44,7 @@
 359_usermod_warn_old_home_not_removed
 358_userdel_remove_group_from_gshadow
 360_newgrp_preserve_env
-008_su_GNU_origin
+438_su_GNU_origin
 100_LINGUAS.dpatch
 100_shadow.pot
 101_cs.dpatch