[Pkg-shadow-commits] r2893 - in debian/trunk/debian: . patches

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-05-10 14:09:16 +0000 (Sun, 10 May 2009)
New Revision: 2893

Removed:
   debian/trunk/debian/patches/403_fix_PATH-MAX_hurd
Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/patches/series
Log:
     - Remove patches applied upstream:
        + debian/patches/403_fix_PATH-MAX_hurd


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2009-05-10 13:49:03 UTC (rev 2892)
+++ debian/trunk/debian/changelog	2009-05-10 14:09:16 UTC (rev 2893)
@@ -10,6 +10,8 @@
      - passwd: Report password properties changes if the password is not
        actually changed. Closes: #525967
      - Fixed lastlog. 4.1.3 only reported empty logs. Closes: #524873 
+     - Remove patches applied upstream:
+        + debian/patches/403_fix_PATH-MAX_hurd
      - Updated patches:
         + debian/patches/008_login_log_failure_in_FTMP
         + debian/patches/401_cppw_src.dpatch
@@ -26,7 +28,7 @@
     Closes: #525153
   * debian/login.pam: Updated support for SELinux. Closes: #527106
 
- -- Christian Perrier <bubulle at debian.org>  Sat, 09 May 2009 23:28:08 +0200
+ -- Christian Perrier <bubulle at debian.org>  Sun, 10 May 2009 16:07:16 +0200
 
 shadow (1:4.1.3.1-1) unstable; urgency=low
 

Deleted: debian/trunk/debian/patches/403_fix_PATH-MAX_hurd
===================================================================
--- debian/trunk/debian/patches/403_fix_PATH-MAX_hurd	2009-05-10 13:49:03 UTC (rev 2892)
+++ debian/trunk/debian/patches/403_fix_PATH-MAX_hurd	2009-05-10 14:09:16 UTC (rev 2893)
@@ -1,46 +0,0 @@
-Goal: Fix FTBFS on Hurd because PATH-MAX is undefined
-
-Fix: #372155
-
-Author: Michael Banck  <mbanck at debian.org>
-
-Status wrt upstream: should be forwarded
-
-Index: shadow-4.1.0/lib/commonio.c
-===================================================================
---- shadow-4.1.0.orig/lib/commonio.c
-+++ shadow-4.1.0/lib/commonio.c
-@@ -50,17 +50,31 @@
- int lrename (const char *old, const char *new)
- {
- 
-+#ifdef PATH_MAX
- 	char resolved_path[PATH_MAX];
-+#endif
-+	char *r;
- 	int res;
- 
- #if defined(S_ISLNK)
- 	struct stat sb;
- 	if (lstat (new, &sb) == 0 && S_ISLNK (sb.st_mode)) {
--		if (realpath (new, resolved_path) == NULL) {
-+#ifndef PATH_MAX
-+		r = realpath (new, NULL);
-+#else
-+		r = realpath (new, resolved_path);
-+#endif
-+		if (r == NULL) {
-+#ifndef PATH_MAX
-+			free (r);
-+#endif
- 			perror ("realpath in lrename()");
- 		} else {
--			new = resolved_path;
-+			new = r;
- 		}
-+#ifndef PATH_MAX
-+	free (r);
-+#endif
- 	}
- #endif
- 	res = rename (old, new);

Modified: debian/trunk/debian/patches/series
===================================================================
--- debian/trunk/debian/patches/series	2009-05-10 13:49:03 UTC (rev 2892)
+++ debian/trunk/debian/patches/series	2009-05-10 14:09:16 UTC (rev 2893)
@@ -16,7 +16,6 @@
 523_su_arguments_are_concatenated
 523_su_arguments_are_no_more_concatenated_by_default
 483_su_fakelogin_wrong_arg0
-403_fix_PATH-MAX_hurd
 508_nologin_in_usr_sbin
 505_useradd_recommend_adduser
 402_cppw_selinux