From 7306e40da405ade4d9473a388a3dc20da3e8bc13 Mon Sep 17 00:00:00 2001 From: adamw Date: Tue, 29 Jul 2014 17:12:47 +0000 Subject: Rename all patches that contain '::' as a path separator, and use '__' instead. --- x11/wdm/files/patch-configs::wdm-config.in | 25 --------------- x11/wdm/files/patch-configs__wdm-config.in | 25 +++++++++++++++ x11/wdm/files/patch-src::wdm::session.c | 50 ------------------------------ x11/wdm/files/patch-src__wdm__session.c | 50 ++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+), 75 deletions(-) delete mode 100644 x11/wdm/files/patch-configs::wdm-config.in create mode 100644 x11/wdm/files/patch-configs__wdm-config.in delete mode 100644 x11/wdm/files/patch-src::wdm::session.c create mode 100644 x11/wdm/files/patch-src__wdm__session.c (limited to 'x11/wdm') diff --git a/x11/wdm/files/patch-configs::wdm-config.in b/x11/wdm/files/patch-configs::wdm-config.in deleted file mode 100644 index b42e5a5bddde..000000000000 --- a/x11/wdm/files/patch-configs::wdm-config.in +++ /dev/null @@ -1,25 +0,0 @@ ---- configs/wdm-config.in.orig Sun Jun 1 17:00:09 2003 -+++ configs/wdm-config.in Sun Jun 1 22:45:23 2003 -@@ -3,7 +3,7 @@ - ! wdm configuration file input (sed in Makefile) - ! - DisplayManager.errorLogFile: @LOGDIR@/xdm-errors.log --DisplayManager.pidFile: @RUNDIR@/xdm-pid -+DisplayManager.pidFile: @RUNDIR@/xdm.pid - DisplayManager.keyFile: @DMDIR@/xdm-keys - DisplayManager.servers: @DMDIR@/Xservers - DisplayManager.accessFile: @DMDIR@/Xaccess -@@ -25,11 +25,11 @@ - ! display screen background--if not set or set to none, then the - ! background is not set by wdm. - ! DisplayManager*wdmBg: none --DisplayManager*wdmBg: solid:RoyalBlue -+! DisplayManager*wdmBg: solid:RoyalBlue - ! DisplayManager*wdmBg: dgradient:RoyalBlue,FireBrick,Black - ! DisplayManager*wdmBg: hgradient:RoyalBlue,FireBrick,Black - ! DisplayManager*wdmBg: vgradient:RoyalBlue,FireBrick,Black --! DisplayManager*wdmBg: pixmap:@GFXDIR@/Stars.jpg -+DisplayManager*wdmBg: pixmap:@GFXDIR@/daemon1-HQ-1280x960.jpg - ! - ! optional pixmap for logo - @PIXMAPCOMMENT@DisplayManager*wdmLogo: @GFXDIR@/@PIXMAPFILE@ diff --git a/x11/wdm/files/patch-configs__wdm-config.in b/x11/wdm/files/patch-configs__wdm-config.in new file mode 100644 index 000000000000..b42e5a5bddde --- /dev/null +++ b/x11/wdm/files/patch-configs__wdm-config.in @@ -0,0 +1,25 @@ +--- configs/wdm-config.in.orig Sun Jun 1 17:00:09 2003 ++++ configs/wdm-config.in Sun Jun 1 22:45:23 2003 +@@ -3,7 +3,7 @@ + ! wdm configuration file input (sed in Makefile) + ! + DisplayManager.errorLogFile: @LOGDIR@/xdm-errors.log +-DisplayManager.pidFile: @RUNDIR@/xdm-pid ++DisplayManager.pidFile: @RUNDIR@/xdm.pid + DisplayManager.keyFile: @DMDIR@/xdm-keys + DisplayManager.servers: @DMDIR@/Xservers + DisplayManager.accessFile: @DMDIR@/Xaccess +@@ -25,11 +25,11 @@ + ! display screen background--if not set or set to none, then the + ! background is not set by wdm. + ! DisplayManager*wdmBg: none +-DisplayManager*wdmBg: solid:RoyalBlue ++! DisplayManager*wdmBg: solid:RoyalBlue + ! DisplayManager*wdmBg: dgradient:RoyalBlue,FireBrick,Black + ! DisplayManager*wdmBg: hgradient:RoyalBlue,FireBrick,Black + ! DisplayManager*wdmBg: vgradient:RoyalBlue,FireBrick,Black +-! DisplayManager*wdmBg: pixmap:@GFXDIR@/Stars.jpg ++DisplayManager*wdmBg: pixmap:@GFXDIR@/daemon1-HQ-1280x960.jpg + ! + ! optional pixmap for logo + @PIXMAPCOMMENT@DisplayManager*wdmLogo: @GFXDIR@/@PIXMAPFILE@ diff --git a/x11/wdm/files/patch-src::wdm::session.c b/x11/wdm/files/patch-src::wdm::session.c deleted file mode 100644 index 035205602185..000000000000 --- a/x11/wdm/files/patch-src::wdm::session.c +++ /dev/null @@ -1,50 +0,0 @@ ---- src/wdm/session.c.orig Sat Mar 26 22:57:04 2005 -+++ src/wdm/session.c Sun Mar 27 09:22:42 2005 -@@ -533,6 +533,7 @@ - int pid; - #ifdef HAS_SETUSERCONTEXT - struct passwd* pwd; -+ extern char **environ; - #endif - #ifdef USE_PAM - pam_handle_t *pamh = thepamh(); -@@ -562,6 +563,7 @@ - /* Do system-dependent login setup here */ - - #ifndef AIXV3 -+#ifndef HAS_SETUSERCONTEXT - if (setgid(verify->gid) < 0) - { - WDMError("setgid %d (user \"%s\") failed, errno=%d\n", -@@ -609,6 +611,31 @@ - verify->uid, name, errno); - return (0); - } -+#else /* HAS_SETUSERCONTEXT */ -+ /* -+ * Set the user's credentials: uid, gid, groups, -+ * environment variables, resource limits, and umask. -+ */ -+ /* destroy user environment before calling setusercontext */ -+ environ = verify->userEnviron; -+ pwd = getpwnam(name); -+ if (pwd) -+ { -+ if (setusercontext(NULL, pwd, pwd->pw_uid, LOGIN_SETALL) < 0) -+ { -+ WDMError("setusercontext for \"%s\" failed, errno=%d\n", name, -+ errno); -+ return (0); -+ } -+ verify->userEnviron = environ; -+ endpwent(); -+ } -+ else -+ { -+ WDMError("getpwnam for \"%s\" failed, errno=%d\n", name, errno); -+ return (0); -+ } -+#endif /* HAS_SETUSERCONTEXT */ - #else /* AIXV3 */ - /* - * Set the user's credentials: uid, gid, groups, diff --git a/x11/wdm/files/patch-src__wdm__session.c b/x11/wdm/files/patch-src__wdm__session.c new file mode 100644 index 000000000000..035205602185 --- /dev/null +++ b/x11/wdm/files/patch-src__wdm__session.c @@ -0,0 +1,50 @@ +--- src/wdm/session.c.orig Sat Mar 26 22:57:04 2005 ++++ src/wdm/session.c Sun Mar 27 09:22:42 2005 +@@ -533,6 +533,7 @@ + int pid; + #ifdef HAS_SETUSERCONTEXT + struct passwd* pwd; ++ extern char **environ; + #endif + #ifdef USE_PAM + pam_handle_t *pamh = thepamh(); +@@ -562,6 +563,7 @@ + /* Do system-dependent login setup here */ + + #ifndef AIXV3 ++#ifndef HAS_SETUSERCONTEXT + if (setgid(verify->gid) < 0) + { + WDMError("setgid %d (user \"%s\") failed, errno=%d\n", +@@ -609,6 +611,31 @@ + verify->uid, name, errno); + return (0); + } ++#else /* HAS_SETUSERCONTEXT */ ++ /* ++ * Set the user's credentials: uid, gid, groups, ++ * environment variables, resource limits, and umask. ++ */ ++ /* destroy user environment before calling setusercontext */ ++ environ = verify->userEnviron; ++ pwd = getpwnam(name); ++ if (pwd) ++ { ++ if (setusercontext(NULL, pwd, pwd->pw_uid, LOGIN_SETALL) < 0) ++ { ++ WDMError("setusercontext for \"%s\" failed, errno=%d\n", name, ++ errno); ++ return (0); ++ } ++ verify->userEnviron = environ; ++ endpwent(); ++ } ++ else ++ { ++ WDMError("getpwnam for \"%s\" failed, errno=%d\n", name, errno); ++ return (0); ++ } ++#endif /* HAS_SETUSERCONTEXT */ + #else /* AIXV3 */ + /* + * Set the user's credentials: uid, gid, groups, -- cgit