From 8cd330b97a90a8ef55054dd4078428494155a6b0 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sun, 10 May 2009 14:09:16 +0000 Subject: [PATCH] - Remove patches applied upstream: + debian/patches/403_fix_PATH-MAX_hurd --- debian/changelog | 4 ++- debian/patches/403_fix_PATH-MAX_hurd | 46 ---------------------------- debian/patches/series | 1 - 3 files changed, 3 insertions(+), 48 deletions(-) delete mode 100644 debian/patches/403_fix_PATH-MAX_hurd diff --git a/debian/changelog b/debian/changelog index 3e6491c6..2c078231 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ shadow (1:4.1.3.1-1) UNRELEASED; urgency=low - 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 @@ shadow (1:4.1.3.1-1) UNRELEASED; urgency=low Closes: #525153 * debian/login.pam: Updated support for SELinux. Closes: #527106 - -- Christian Perrier Sat, 09 May 2009 23:28:08 +0200 + -- Christian Perrier Sun, 10 May 2009 16:07:16 +0200 shadow (1:4.1.3.1-1) unstable; urgency=low diff --git a/debian/patches/403_fix_PATH-MAX_hurd b/debian/patches/403_fix_PATH-MAX_hurd deleted file mode 100644 index 91c92ddc..00000000 --- a/debian/patches/403_fix_PATH-MAX_hurd +++ /dev/null @@ -1,46 +0,0 @@ -Goal: Fix FTBFS on Hurd because PATH-MAX is undefined - -Fix: #372155 - -Author: Michael Banck - -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); diff --git a/debian/patches/series b/debian/patches/series index 05fd4d52..38f70e85 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -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