diff --git a/debian/changelog b/debian/changelog index 203ac577..23634541 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ shadow (1:4.1.1~rc1-1) UNRELEASED; urgency=low Closes: #461670 - Fix infinite loop in usermod when two groups have the same name. Closes: #470745 + - Remove patches applied upstream: + + debian/patches/451_login_PATH * debian/watch: Add a watch file for shadow. -- Nicolas FRANCOIS (Nekral) Sun, 24 Feb 2008 18:33:31 +0100 diff --git a/debian/patches/451_login_PATH b/debian/patches/451_login_PATH deleted file mode 100644 index 9ff9d88e..00000000 --- a/debian/patches/451_login_PATH +++ /dev/null @@ -1,36 +0,0 @@ -Goal: set PATH according to ENV_SUPATH and ENV_PATH (for login), as for - su. -Fixes: #330803 - -Status wrt upstream: - -Index: shadow-4.1.0/libmisc/setupenv.c -=================================================================== ---- shadow-4.1.0.orig/libmisc/setupenv.c -+++ shadow-4.1.0/libmisc/setupenv.c -@@ -186,8 +186,8 @@ - { - #ifndef USE_PAM - char *envf; -- char *cp; - #endif -+ char *cp; - - /* - * Change the current working directory to be the home directory -@@ -242,7 +242,6 @@ - addenv ("USER", info->pw_name); - addenv ("LOGNAME", info->pw_name); - --#ifndef USE_PAM - /* - * Create the PATH environmental variable and export it. - */ -@@ -259,6 +258,7 @@ - /* only value specified without "PATH=" */ - addenv ("PATH", cp); - } -+#ifndef USE_PAM - - /* - * Create the MAIL environmental variable and export it. login.defs