Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Thu Dec 2 17:14:41 CET 2010.
--------
--- xorg-x11/xorg-x11.changes 2010-11-27 03:41:30.000000000 +0100
+++ xorg-x11/xorg-x11.changes 2010-12-02 10:53:22.000000000 +0100
@@ -1,0 +2,9 @@
+Thu Dec 2 09:29:24 UTC 2010 - lnussel@suse.de
+
+- print warning if xinit fails and Xorg has no setuid bit
+ (bnc#632737)
+- refresh patches to apply without dirty hacks
+- make quilt setup work
+- really fix bnc#470983
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.15HvQ6/_old 2010-12-02 17:13:42.000000000 +0100
+++ /var/tmp/diff_new_pack.15HvQ6/_new 2010-12-02 17:13:42.000000000 +0100
@@ -23,7 +23,7 @@
BuildRequires: bison
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 35
+Release: 36
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -235,7 +235,9 @@
%prep
%setup -T -c %{name}
for i in $RPM_SOURCE_DIR/*-*.tar.bz2; do tar xjf $i; done
-tar xjCf $RPM_BUILD_DIR $RPM_SOURCE_DIR/desktopfiles.tar.bz2
+pushd $RPM_BUILD_DIR
+tar -xjf %{SOURCE205}
+popd
pushd lbxproxy-*
%patch2
popd
@@ -250,6 +252,9 @@
popd
pushd xinit-*
%patch7
+%patch54 -p1
+%patch66 -p1
+%patch67 -p1
popd
pushd xsm-*
%patch8
@@ -259,25 +264,32 @@
popd
pushd xauth-*
%patch24
+%patch63 -p1
popd
pushd xfd-*
%patch46
popd
-pushd xinit-*
-%patch54 -p1
+pushd scripts-*
+%patch19 -p0
+popd
+pushd xfs-*
+%patch47 -p0
+popd
+pushd mkfontscale-*
+%patch48 -p1
+popd
+pushd xdm-*
+%patch56 -p1
+%patch65 -p1
+popd
+pushd twm-*
+%patch61 -p1
+%patch62 -p1
+popd
+pushd xrdb-*
+%patch68 -p2
+%patch69 -p0
popd
-patch -d scripts-* -p0 -s < %PATCH19
-patch -d xfs-* -p0 -s < %PATCH47
-patch -d mkfontscale-* -p1 -s < %PATCH48
-patch -d xdm-* -p1 -s < %PATCH56
-patch -d twm-* -p1 -s < %PATCH61
-patch -d twm-* -p1 -s < %PATCH62
-patch -d xauth-* -p1 -s < %PATCH63
-patch -d xdm-* -p1 -s < %PATCH65
-patch -d xinit-* -p1 -s < %PATCH66
-patch -d xinit-* -p1 -s < %PATCH67
-patch -d xrdb-* -p2 -s < %PATCH68
-patch -d xrdb-* -p0 -s < %PATCH69
%build
@@ -378,7 +390,7 @@
xrefresh-*)
%suse_update_desktop_file -i -u Xrefresh Utility DesktopUtility
;;
- rstartd-*)
+ rstart-*)
# for FHS/FSSTND compliance (bnc #470983)
mv $RPM_BUILD_ROOT/etc/X11/rstart/rstartd.real $RPM_BUILD_ROOT/usr/bin/
sed -i 's+/etc/X11/rstart/rstartd.real+/usr/bin/rstartd.real+' \
++++++ xauth-tolerant-hostname-changes.diff ++++++
--- /var/tmp/diff_new_pack.15HvQ6/_old 2010-12-02 17:13:42.000000000 +0100
+++ /var/tmp/diff_new_pack.15HvQ6/_new 2010-12-02 17:13:42.000000000 +0100
@@ -1,5 +1,7 @@
---- xauth-1.0.3/gethost.c.orig
-+++ xauth-1.0.4/gethost.c
+Index: xauth-1.0.5/gethost.c
+===================================================================
+--- xauth-1.0.5.orig/gethost.c
++++ xauth-1.0.5/gethost.c
@@ -244,7 +244,8 @@ struct addrlist *get_address_info (
int family,
char *fulldpyname,
@@ -19,8 +21,10 @@
len = 0;
} else {
src = buf;
---- xauth-1.0.3/parsedpy.c.orig
-+++ xauth-1.0.4/parsedpy.c
+Index: xauth-1.0.5/parsedpy.c
+===================================================================
+--- xauth-1.0.5.orig/parsedpy.c
++++ xauth-1.0.5/parsedpy.c
@@ -74,20 +74,24 @@ copystring (char *src, int len)
@@ -57,7 +61,7 @@
int *familyp, /* return */
char **hostp, /* return */
int *dpynump, /* return */
-@@ -138,7 +143,7 @@ parse_displayname (char *displayname,
+@@ -138,7 +143,7 @@ parse_displayname (char *displayname,
host = copystring ("0", 1);
family = FamilyDECnet;
} else {
@@ -66,8 +70,10 @@
family = FamilyInternet;
}
#endif
---- xauth-1.0.3/process.c.orig
-+++ xauth-1.0.4/process.c
+Index: xauth-1.0.5/process.c
+===================================================================
+--- xauth-1.0.5.orig/process.c
++++ xauth-1.0.5/process.c
@@ -466,7 +466,7 @@ read_auth_entries(FILE *fp, Bool numeric
}
@@ -77,9 +83,9 @@
{
int family;
char *host = NULL, *rest = NULL;
-@@ -489,11 +489,13 @@ get_displayname_auth(char *displayname,
- displayname = strrchr(displayname, '/') + 1;
-
+@@ -486,11 +486,13 @@ get_displayname_auth(char *displayname,
+ prelen = (cp - displayname);
+
if (!parse_displayname (displayname + ((prelen > 0) ? prelen + 1 : 0),
+ localhostname,
&family, &host, &dpynum, &scrnum, &rest)) {
@@ -92,7 +98,7 @@
if (addrlist_head) {
char buf[40]; /* want to hold largest display num */
unsigned short dpylen;
-@@ -1223,13 +1225,19 @@ iterdpy (char *inputfilename, int lineno
+@@ -1220,13 +1222,19 @@ iterdpy (char *inputfilename, int lineno
Xauth *tmp_auth;
AuthList *proto_head, *proto;
AuthList *l, *next;
@@ -113,7 +119,7 @@
prefix (inputfilename, lineno);
baddisplayname (displayname, argv[0]);
errors++;
-@@ -1568,7 +1576,7 @@ do_add(char *inputfilename, int lineno,
+@@ -1569,7 +1577,7 @@ do_add(char *inputfilename, int lineno,
}
}
@@ -122,8 +128,10 @@
prefix (inputfilename, lineno);
baddisplayname (dpyname, argv[0]);
free (key);
---- xauth-1.0.3/xauth.h.orig
-+++ xauth-1.0.4/xauth.h
+Index: xauth-1.0.5/xauth.h
+===================================================================
+--- xauth-1.0.5.orig/xauth.h
++++ xauth-1.0.5/xauth.h
@@ -51,10 +51,10 @@ struct addrlist {
};
++++++ xdm-consolekit.diff ++++++
--- /var/tmp/diff_new_pack.15HvQ6/_old 2010-12-02 17:13:42.000000000 +0100
+++ /var/tmp/diff_new_pack.15HvQ6/_new 2010-12-02 17:13:42.000000000 +0100
@@ -6,9 +6,11 @@
xdm.man.cpp | 6 +++
5 files changed, 135 insertions(+), 1 deletion(-)
---- a/configure.ac
-+++ b/configure.ac
-@@ -362,6 +362,20 @@
+Index: xdm-1.1.10/configure.ac
+===================================================================
+--- xdm-1.1.10.orig/configure.ac
++++ xdm-1.1.10/configure.ac
+@@ -434,6 +434,20 @@ fi
AM_CONDITIONAL(DYNAMIC_GREETER, test x$DYNAMIC_GREETER = xyes)
@@ -29,10 +31,12 @@
#
# XDM
#
---- a/session.c
-+++ b/session.c
-@@ -66,6 +66,11 @@
- #endif
+Index: xdm-1.1.10/session.c
+===================================================================
+--- xdm-1.1.10.orig/session.c
++++ xdm-1.1.10/session.c
+@@ -67,6 +67,11 @@ extern int key_setnet(struct key_netstar
+ # endif
#endif /* USE_PAM */
+#ifdef USE_CONSOLEKIT
@@ -41,9 +45,9 @@
+#endif
+
#ifdef __SCO__
- #include
+ # include
#endif
-@@ -472,6 +477,97 @@
+@@ -514,6 +519,97 @@ UnsecureDisplay (struct display *d, Disp
}
}
@@ -141,7 +145,7 @@
void
SessionExit (struct display *d, int status, int removeAuth)
{
-@@ -486,6 +580,8 @@
+@@ -528,6 +624,8 @@ SessionExit (struct display *d, int stat
}
#endif
@@ -150,7 +154,7 @@
/* make sure the server gets reset after the session is over */
if (d->serverPid >= 2 && d->resetSignal)
kill (d->serverPid, d->resetSignal);
-@@ -568,6 +664,10 @@
+@@ -610,6 +708,10 @@ StartClient (
#ifdef USE_PAM
if (pamh) pam_open_session(pamh, 0);
#endif
@@ -161,9 +165,11 @@
switch (pid = fork ()) {
case 0:
CleanUpChild ();
---- a/dm.h
-+++ b/dm.h
-@@ -325,6 +325,9 @@
+Index: xdm-1.1.10/dm.h
+===================================================================
+--- xdm-1.1.10.orig/dm.h
++++ xdm-1.1.10/dm.h
+@@ -323,6 +323,9 @@ extern char *randomFile;
extern char *prngdSocket;
extern int prngdPort;
# endif
@@ -173,9 +179,11 @@
extern char *greeterLib;
extern char *willing;
---- a/resource.c
-+++ b/resource.c
-@@ -68,6 +68,9 @@
+Index: xdm-1.1.10/resource.c
+===================================================================
+--- xdm-1.1.10.orig/resource.c
++++ xdm-1.1.10/resource.c
+@@ -65,6 +65,9 @@ char *randomDevice;
char *prngdSocket;
int prngdPort;
#endif
@@ -185,7 +193,7 @@
char *greeterLib;
char *willing;
-@@ -258,6 +261,10 @@
+@@ -196,6 +199,10 @@ struct dmResources {
"false"} ,
{ "willing", "Willing", DM_STRING, &willing,
""} ,
@@ -195,8 +203,8 @@
+#endif
};
- # define NUM_DM_RESOURCES (sizeof DmResources / sizeof DmResources[0])
-@@ -440,7 +447,11 @@
+ #define NUM_DM_RESOURCES (sizeof DmResources / sizeof DmResources[0])
+@@ -378,7 +385,11 @@ XrmOptionDescRec optionTable [] = {
{"-debug", "*debugLevel", XrmoptionSepArg, (caddr_t) NULL },
{"-xrm", NULL, XrmoptionResArg, (caddr_t) NULL },
{"-daemon", ".daemonMode", XrmoptionNoArg, "true" },
@@ -209,9 +217,11 @@
};
static int originalArgc;
---- a/xdm.man.cpp
-+++ b/xdm.man.cpp
-@@ -51,6 +51,8 @@
+Index: xdm-1.1.10/xdm.man.cpp
+===================================================================
+--- xdm-1.1.10.orig/xdm.man.cpp
++++ xdm-1.1.10/xdm.man.cpp
+@@ -48,6 +48,8 @@ xdm \- X Display Manager with support fo
] [
.B \-session
.I session_program
@@ -220,7 +230,7 @@
]
.SH DESCRIPTION
.I Xdm
-@@ -218,6 +220,10 @@
+@@ -215,6 +217,10 @@ indicates the program to run as the sess
.IP "\fB\-xrm\fP \fIresource_specification\fP"
Allows an arbitrary resource to be specified, as in most
X Toolkit applications.
++++++ xdm-tolerant-hostname-changes.diff ++++++
--- /var/tmp/diff_new_pack.15HvQ6/_old 2010-12-02 17:13:42.000000000 +0100
+++ /var/tmp/diff_new_pack.15HvQ6/_new 2010-12-02 17:13:42.000000000 +0100
@@ -1,6 +1,8 @@
---- xdm-1.1.9/auth.c.orig
-+++ xdm-1.1.9/auth.c
-@@ -680,7 +680,7 @@ writeAddr (
+Index: xdm-1.1.10/auth.c
+===================================================================
+--- xdm-1.1.10.orig/auth.c
++++ xdm-1.1.10/auth.c
+@@ -769,7 +769,7 @@ writeAddr (
}
static void
@@ -9,7 +11,7 @@
{
char displayname[100];
int len = _XGetHostname (displayname, sizeof(displayname));
-@@ -716,6 +716,9 @@ DefineLocal (FILE *file, Xauth *auth)
+@@ -805,6 +805,9 @@ DefineLocal (FILE *file, Xauth *auth)
#endif
writeAddr (FamilyLocal, len, displayname, file, auth);
@@ -19,7 +21,7 @@
}
#ifdef HAS_GETIFADDRS
-@@ -1148,7 +1151,7 @@ setAuthNumber (Xauth *auth, char *name)
+@@ -1238,7 +1241,7 @@ setAuthNumber (Xauth *auth, char *name)
}
static void
@@ -28,7 +30,7 @@
{
int fd;
-@@ -1175,13 +1178,13 @@ writeLocalAuth (FILE *file, Xauth *auth,
+@@ -1265,13 +1268,13 @@ writeLocalAuth (FILE *file, Xauth *auth,
DefineSelf (fd, file, auth);
close (fd);
#endif
@@ -44,7 +46,7 @@
{
int family = FamilyLocal;
char *addr;
-@@ -1200,7 +1203,7 @@ writeRemoteAuth (FILE *file, Xauth *auth
+@@ -1290,7 +1293,7 @@ writeRemoteAuth (FILE *file, Xauth *auth
}
else
{
@@ -53,7 +55,7 @@
}
}
-@@ -1224,6 +1227,7 @@ SetUserAuthorization (struct display *d,
+@@ -1314,6 +1317,7 @@ SetUserAuthorization (struct display *d,
#ifdef HAS_MKSTEMP
int fd;
#endif
@@ -61,7 +63,7 @@
Debug ("SetUserAuthorization\n");
auths = d->authorizations;
-@@ -1316,10 +1320,10 @@ SetUserAuthorization (struct display *d,
+@@ -1406,10 +1410,10 @@ SetUserAuthorization (struct display *d,
{
magicCookie = i;
if (d->displayType.location == Local)
@@ -74,7 +76,7 @@
#endif
break;
}
-@@ -1337,10 +1341,10 @@ SetUserAuthorization (struct display *d,
+@@ -1427,10 +1431,10 @@ SetUserAuthorization (struct display *d,
!strncmp (auths[i]->name, "MIT-KERBEROS-5", 14))
auths[i]->data_length = 0;
if (d->displayType.location == Local)
@@ -87,7 +89,7 @@
#endif
auths[i]->data_length = data_len;
}
-@@ -1379,6 +1383,12 @@ SetUserAuthorization (struct display *d,
+@@ -1475,6 +1479,12 @@ SetUserAuthorization (struct display *d,
verify->systemEnviron = setEnv (verify->systemEnviron,
"XAUTHORITY", envname);
}
@@ -100,7 +102,7 @@
XauUnlockAuth (name);
if (envname)
chown (envname, verify->uid, verify->gid);
-@@ -1417,10 +1427,10 @@ RemoveUserAuthorization (struct display
+@@ -1513,10 +1523,10 @@ RemoveUserAuthorization (struct display
for (i = 0; i < d->authNum; i++)
{
if (d->displayType.location == Local)
++++++ xinit-suse.diff ++++++
--- /var/tmp/diff_new_pack.15HvQ6/_old 2010-12-02 17:13:42.000000000 +0100
+++ /var/tmp/diff_new_pack.15HvQ6/_new 2010-12-02 17:13:42.000000000 +0100
@@ -1,6 +1,8 @@
---- xinit-1.1.1/startx.cpp.orig
-+++ xinit-1.1.1/startx.cpp
-@@ -72,10 +72,115 @@ userclientrc=$HOME/.xinitrc
+Index: xinit-1.3.0/startx.cpp
+===================================================================
+--- xinit-1.3.0.orig/startx.cpp
++++ xinit-1.3.0/startx.cpp
+@@ -70,10 +70,115 @@ userclientrc=$HOME/.xinitrc
sysclientrc=XINITDIR/xinitrc
#endif
@@ -116,7 +118,7 @@
defaultclientargs=""
defaultserverargs=""
defaultdisplay=":0"
-@@ -312,6 +417,9 @@ else
+@@ -314,6 +419,9 @@ else
XINIT "$client" $clientargs -- "$server" $display $serverargs
fi
#else
@@ -124,13 +126,28 @@
+test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \
+ serverargs="$serverargs -nolisten tcp"
- #ifdef __APPLE__
+ #if defined(__APPLE__) || defined(__CYGWIN__)
eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs
---- xinit-1.1.1/xinitrc.cpp.orig
-+++ xinit-1.1.1/xinitrc.cpp
-@@ -96,8 +96,10 @@ fi
-
+@@ -324,6 +432,12 @@ XINIT "$client" $clientargs -- "$server"
#endif
+ retval=$?
+
++if [ "$retval" != 0 -a ! -u "/usr/bin/Xorg" ]; then
++ echo "-------------------------------------------------------------------------------------------"
++ echo "xinit failed. /usr/bin/Xorg is not setuid, maybe that's the reason?"
++ echo "If so either use a display manager (strongly recommended) or adjust /etc/permissions.local"
++fi
++
+ if [ x"$enable_xauth" = x1 ] ; then
+ if [ x"$removelist" != x ]; then
+ XAUTH remove $removelist
+Index: xinit-1.3.0/xinitrc.cpp
+===================================================================
+--- xinit-1.3.0.orig/xinitrc.cpp
++++ xinit-1.3.0/xinitrc.cpp
+@@ -91,8 +91,10 @@ if [ -d XINITDIR/xinitrc.d ] ; then
+ unset f
+ fi
-TWM &
+if [ -x /usr/X11R6/bin/fvwm -o -x /usr/bin/fvwm]; then
++++++ xinit-tolerant-hostname-changes.diff ++++++
--- /var/tmp/diff_new_pack.15HvQ6/_old 2010-12-02 17:13:42.000000000 +0100
+++ /var/tmp/diff_new_pack.15HvQ6/_new 2010-12-02 17:13:42.000000000 +0100
@@ -1,10 +1,12 @@
---- xinit-1.1.1/startx.cpp.orig
-+++ xinit-1.1.1/startx.cpp
-@@ -420,6 +420,7 @@ fi
+Index: xinit-1.3.0/startx.cpp
+===================================================================
+--- xinit-1.3.0.orig/startx.cpp
++++ xinit-1.3.0/startx.cpp
+@@ -422,6 +422,7 @@ fi
XCOMM handle TCP port 6000
test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \
serverargs="$serverargs -nolisten tcp"
+export XAUTHLOCALHOSTNAME=`hostname`
- #ifdef __APPLE__
+ #if defined(__APPLE__) || defined(__CYGWIN__)
eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org