diff options
| author | flz <flz@FreeBSD.org> | 2007-09-14 03:45:08 +0800 |
|---|---|---|
| committer | flz <flz@FreeBSD.org> | 2007-09-14 03:45:08 +0800 |
| commit | e834c080fbcd49b7691f9cc56e1bac850897da63 (patch) | |
| tree | 2d6de9d0a7f1a29f6b03a566b76ab749b25a90d4 /x11/xinit | |
| parent | ebe82e20eae947e28cd10cdab731cd3e11debc36 (diff) | |
| download | freebsd-ports-graphics-e834c080fbcd49b7691f9cc56e1bac850897da63.tar.gz freebsd-ports-graphics-e834c080fbcd49b7691f9cc56e1bac850897da63.tar.zst freebsd-ports-graphics-e834c080fbcd49b7691f9cc56e1bac850897da63.zip | |
- Update X.org ports to 7.3.
- Mark XFree86-4 as DEPRECATED with EXPIRATION_DATE set to 2007-12-25.
I hope that nobody will be bored enough on Christmas to remove them on
that day.
Tested by: vehemens, Rene Ladan, Beech Rintoul, sarek on x11@
Diffstat (limited to 'x11/xinit')
| -rw-r--r-- | x11/xinit/Makefile | 3 | ||||
| -rw-r--r-- | x11/xinit/distinfo | 6 | ||||
| -rw-r--r-- | x11/xinit/files/patch-startx.cpp | 48 |
3 files changed, 4 insertions, 53 deletions
diff --git a/x11/xinit/Makefile b/x11/xinit/Makefile index 43fcab66602..7a439b5696d 100644 --- a/x11/xinit/Makefile +++ b/x11/xinit/Makefile @@ -6,8 +6,7 @@ # PORTNAME= xinit -PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTVERSION= 1.0.5 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org diff --git a/x11/xinit/distinfo b/x11/xinit/distinfo index 9e3b90b2508..721c02feb16 100644 --- a/x11/xinit/distinfo +++ b/x11/xinit/distinfo @@ -1,3 +1,3 @@ -MD5 (xorg/app/xinit-1.0.4.tar.bz2) = 9df52a504dc04313a6650fae364ae04a -SHA256 (xorg/app/xinit-1.0.4.tar.bz2) = 1e7056db4441ccb0dff0f77503e3fd49a370aecdecf95ce6066116ca8244bf52 -SIZE (xorg/app/xinit-1.0.4.tar.bz2) = 106555 +MD5 (xorg/app/xinit-1.0.5.tar.bz2) = 9a2aad51042141a0e6ad066015397595 +SHA256 (xorg/app/xinit-1.0.5.tar.bz2) = 95d55283f32d241c8e6750b7998408da43e910d2b918c80089a3012684f1c62d +SIZE (xorg/app/xinit-1.0.5.tar.bz2) = 106673 diff --git a/x11/xinit/files/patch-startx.cpp b/x11/xinit/files/patch-startx.cpp deleted file mode 100644 index 8da9ac250d8..00000000000 --- a/x11/xinit/files/patch-startx.cpp +++ /dev/null @@ -1,48 +0,0 @@ -commit fc6cc81be41af58ffd996994e1325dd072a9ab34 -Author: Eric Anholt <eric@anholt.net> -Date: Fri Jul 13 15:34:43 2007 -0700 - - Use /dev/random to generate the cookie if mcookie is unavailable. - - Setting XAUTHORITY without having actually generated a cookie and created - .Xauthority led to issues if somebody like ssh later came around and made the - .Xauthority file for their own setup. So, simply make it so that we never - fail to create one. - -diff --git a/startx.cpp b/startx.cpp -index eba83b8..f4e24fd 100644 ---- startx.cpp -+++ startx.cpp -@@ -170,7 +170,6 @@ fi - - removelist= - --#if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE) - XCOMM set up default Xauth info for this machine - case `uname` in - Linux*) -@@ -186,7 +185,15 @@ Linux*) - esac - - authdisplay=${display:-:0} -+#if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE) - mcookie=`MK_COOKIE` -+#else -+mcookie=`dd if=/dev/random bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"` -+if x"$mcookie" = x; then -+ echo "Couldn't create cookie" -+ exit 1 -+fi -+#endif - dummy=0 - - XCOMM create a file with auth information for the server. ':0' is a dummy. -@@ -215,8 +222,6 @@ EOF - fi - done - --#endif -- - #if defined(__SCO__) || defined(__UNIXWARE__) - if [ "$REMOTE_SERVER" = "TRUE" ]; then - exec SHELL_CMD ${client} |