diff options
| author | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2000-12-12 22:38:58 +0000 |
|---|---|---|
| committer | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2000-12-12 22:38:58 +0000 |
| commit | 9fa59ff1568139cac368f510cf6b120ebda254ff (patch) | |
| tree | ba8b20e15dd1cadde07a6dfe3383262f477e7ac2 /x11 | |
| parent | Remove extra directories on pkg_delete. (diff) | |
Fix typos in one of the XFree86 header files which corrupted the return
from getpwuid, causing the GetRootDirName function to segfault during
initialization of the screen database.
PR: ports/23500
Submitted by: Brian McDonald <brianmcd@columbus.rr.com>
Notes
Notes:
svn path=/head/; revision=35935
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/XFree86/Makefile | 2 | ||||
| -rw-r--r-- | x11/XFree86/files/patch-t | 30 |
2 files changed, 31 insertions, 1 deletions
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile index fdb24e2b51e9..47c12168e5c3 100644 --- a/x11/XFree86/Makefile +++ b/x11/XFree86/Makefile @@ -7,7 +7,7 @@ PORTNAME= XFree86 PORTVERSION= 3.3.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE} MASTER_SITE_SUBDIR= ${PORTVERSION} diff --git a/x11/XFree86/files/patch-t b/x11/XFree86/files/patch-t new file mode 100644 index 000000000000..7762b9ab23b0 --- /dev/null +++ b/x11/XFree86/files/patch-t @@ -0,0 +1,30 @@ +--- include/Xos_r.h.orig Tue Dec 12 00:07:42 2000 ++++ include/Xos_r.h Tue Dec 12 00:09:15 2000 +@@ -248,7 +248,7 @@ + ((p).len = strlen((p).pwp->pw_passwd)), \ + strcpy((p).pws.pw_passwd,(p).pwp->pw_passwd), \ + \ +- ((p).pws.pw_class = (p).pws.pw_class + (p).len + 1), \ ++ ((p).pws.pw_class = (p).pws.pw_passwd + (p).len + 1), \ + ((p).len = strlen((p).pwp->pw_class)), \ + strcpy((p).pws.pw_class, (p).pwp->pw_class), \ + \ +@@ -256,7 +256,7 @@ + ((p).len = strlen((p).pwp->pw_gecos)), \ + strcpy((p).pws.pw_gecos, (p).pwp->pw_gecos), \ + \ +- ((p).pws.pw_dir = (p).pws.pw_class + (p).len + 1), \ ++ ((p).pws.pw_dir = (p).pws.pw_gecos + (p).len + 1), \ + ((p).len = strlen((p).pwp->pw_dir)), \ + strcpy((p).pws.pw_dir, (p).pwp->pw_dir), \ + \ +@@ -289,7 +289,7 @@ + ((p).len = strlen((p).pwp->pw_gecos)), \ + strcpy((p).pws.pw_gecos, (p).pwp->pw_gecos), \ + \ +- ((p).pws.pw_dir = (p).pws.pw_comment + (p).len + 1), \ ++ ((p).pws.pw_dir = (p).pws.pw_gecos + (p).len + 1), \ + ((p).len = strlen((p).pwp->pw_dir)), \ + strcpy((p).pws.pw_dir, (p).pwp->pw_dir), \ + \ + |