Hello community,
here is the log from the commit of package xorg-x11 for openSUSE:Factory
checked in at Fri Jun 5 22:51:49 CEST 2009.
--------
--- xorg-x11/xorg-x11.changes 2009-05-18 15:43:24.000000000 +0200
+++ xorg-x11/xorg-x11.changes 2009-06-05 13:11:09.000000000 +0200
@@ -1,0 +2,13 @@
+Fri Jun 5 12:58:51 CEST 2009 - eich@suse.de
+
+- Add patches taken from Moblin:
+ * xauth:
+ . move structure declaration to correct place:
+ fix build for non C99 compilers.
+ . Change xauth_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+ . Replace rsh by ssh the extract/merge example. Rsh is no more.
+ * xconsole
+ . remove inclusion of sys/stropts.h
+ * xinit: set stdin to /dev/null.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
C89-fix.patch
Change-xauth_CFLAGS-to-AM_CFLAGS-to-make-automake-1.patch
Replace-rsh-by-ssh-the-extract-merge-example.-Rsh-is.patch
xconsole-no-stropts.patch
xinit-client-session.patch
xset-spurious-xprint.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11.spec ++++++
--- /var/tmp/diff_new_pack.Y24523/_old 2009-06-05 22:50:03.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24523/_new 2009-06-05 22:50:03.000000000 +0200
@@ -26,7 +26,7 @@
%endif
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 21
+Release: 22
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Utilities
@@ -162,6 +162,12 @@
Patch46: xfd.diff
Patch47: xfs-no_config_file.diff
Patch48: mkfontscale-skip_symlinks.diff
+Patch50: C89-fix.patch
+Patch51: Change-xauth_CFLAGS-to-AM_CFLAGS-to-make-automake-1.patch
+Patch52: Replace-rsh-by-ssh-the-extract-merge-example.-Rsh-is.patch
+Patch53: xconsole-no-stropts.patch
+Patch54: xinit-client-session.patch
+Patch55: xset-spurious-xprint.patch
%description
This package contains the X.Org core and sample applications.
@@ -274,10 +280,22 @@
popd
pushd xauth-*
%patch24
+%patch50 -p1
+%patch51 -p1
+%patch52 -p1
popd
pushd xfd-*
%patch46
popd
+pushd xconsole-*
+%patch53 -p1
+popd
+pushd xinit-*
+%patch54 -p1
+popd
+pushd xset-*
+%patch55 -p1
+popd
patch -d scripts-* -p0 -s < %PATCH19
patch -d xvidtune-* -p0 -s < %PATCH21
patch -d xfs-* -p0 -s < %PATCH47
@@ -536,6 +554,16 @@
%{_mandir}/man1/xauth.1*
%changelog
+* Fri Jun 05 2009 eich@suse.de
+- Add patches taken from Moblin:
+ * xauth:
+ . move structure declaration to correct place:
+ fix build for non C99 compilers.
+ . Change xauth_CFLAGS to AM_CFLAGS to make automake-1.10 happier
+ . Replace rsh by ssh the extract/merge example. Rsh is no more.
+ * xconsole
+ . remove inclusion of sys/stropts.h
+ * xinit: set stdin to /dev/null.
* Mon May 18 2009 sndirsch@suse.de
- /etc/init.d/xdm, /etc/X11/xdm/keytable4hal
* moved restart of hald (if required) from keytable4hal to xdm
++++++ C89-fix.patch ++++++
From 3cc17297124ea5c9917e6eacc0ab7ae021e8a386 Mon Sep 17 00:00:00 2001
From: Jens Granseuer
Date: Sun, 9 Mar 2008 20:06:49 +0100
Subject: C89 fix
65a0917d4661e370b50beed8f06f5577bfeea59f broke the build with non-C99
aware compilers.
---
gethost.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
Index: xauth-1.0.3/gethost.c
===================================================================
--- xauth-1.0.3.orig/gethost.c
+++ xauth-1.0.3/gethost.c
@@ -296,6 +296,8 @@ struct addrlist *get_address_info (
hints.ai_protocol = 0;
if (getaddrinfo(host,NULL,&hints,&firstai) !=0) return NULL;
for (ai = firstai; ai != NULL; ai = ai->ai_next) {
+ struct addrlist *duplicate;
+
if (ai->ai_family == AF_INET) {
struct sockaddr_in *sin = (struct sockaddr_in *)ai->ai_addr;
src = &(sin->sin_addr);
@@ -308,7 +310,6 @@ struct addrlist *get_address_info (
family = FamilyInternet6;
}
- struct addrlist *duplicate;
for(duplicate = retval; duplicate != NULL; duplicate = duplicate->next) {
if(duplicate->family == family && duplicate->len == len &&
memcmp(duplicate->address, src, len) == 0) {
++++++ Change-xauth_CFLAGS-to-AM_CFLAGS-to-make-automake-1.patch ++++++
From 85459f9fee2ad4d5954e8f549df9a269cf3bff76 Mon Sep 17 00:00:00 2001
From: Julien Cristau
Date: Fri, 7 Mar 2008 18:20:15 +0100
Subject: Change xauth_CFLAGS to AM_CFLAGS to make automake-1.10 happier
Makefile.am:27: compiling `gethost.c' with per-target flags requires `AM_PROG_CC_C_O' in `configure.ac'
---
Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Index: xauth-1.0.3/Makefile.am
===================================================================
--- xauth-1.0.3.orig/Makefile.am
+++ xauth-1.0.3/Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = xauth
-xauth_CFLAGS = $(XAUTH_CFLAGS)
+AM_CFLAGS = $(XAUTH_CFLAGS)
xauth_LDADD = $(XAUTH_LIBS)
xauth_SOURCES = \
++++++ lbxproxy.diff ++++++
--- /var/tmp/diff_new_pack.Y24523/_old 2009-06-05 22:50:03.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24523/_new 2009-06-05 22:50:03.000000000 +0200
@@ -1,5 +1,7 @@
---- Makefile.am.orig 2006-07-04 05:27:29.000000000 +0200
-+++ Makefile.am 2006-07-04 05:28:00.000000000 +0200
+Index: Makefile.am
+===================================================================
+--- Makefile.am.orig
++++ Makefile.am
@@ -22,7 +22,7 @@
bin_PROGRAMS = lbxproxy
@@ -9,7 +11,7 @@
-D_BSD_SOURCE -DLBXPROXY_t -DTRANS_SERVER
lbxproxy_LDADD = $(LBXPROXY_LIBS)
-@@ -81,7 +81,7 @@
+@@ -81,7 +81,7 @@ lbxproxy_SOURCES = \
appman_PRE = \
lbxproxy.man
++++++ mkfontscale-skip_symlinks.diff ++++++
--- /var/tmp/diff_new_pack.Y24523/_old 2009-06-05 22:50:03.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24523/_new 2009-06-05 22:50:03.000000000 +0200
@@ -1,5 +1,7 @@
---- mkfontscale-1.0.6/mkfontscale.c.orig 2008-08-22 03:35:00.000000000 +0200
-+++ mkfontscale-1.0.6/mkfontscale.c 2009-04-23 11:26:08.000000000 +0200
+Index: mkfontscale-1.0.6/mkfontscale.c
+===================================================================
+--- mkfontscale-1.0.6.orig/mkfontscale.c
++++ mkfontscale-1.0.6/mkfontscale.c
@@ -27,6 +27,7 @@
#include
++++++ proxymngr.diff ++++++
--- /var/tmp/diff_new_pack.Y24523/_old 2009-06-05 22:50:03.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24523/_new 2009-06-05 22:50:03.000000000 +0200
@@ -1,5 +1,7 @@
---- Makefile.am.orig 2006-07-03 21:49:11.000000000 +0200
-+++ Makefile.am 2006-07-03 21:50:11.000000000 +0200
+Index: Makefile.am
+===================================================================
+--- Makefile.am.orig
++++ Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = proxymngr
++++++ ps_suse.diff ++++++
--- /var/tmp/diff_new_pack.Y24523/_old 2009-06-05 22:50:03.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24523/_new 2009-06-05 22:50:03.000000000 +0200
@@ -1,5 +1,7 @@
---- twm-X11R7.0-1.0.1.orig/src/system.twmrc 2006-08-19 11:02:18.000000000 +0200
-+++ twm-1.0.4/src/system.twmrc 2006-08-19 11:02:35.000000000 +0200
+Index: twm-1.0.4/src/system.twmrc
+===================================================================
+--- twm-1.0.4/src/system.twmrc.orig
++++ twm-1.0.4/src/system.twmrc
@@ -15,11 +15,11 @@
NoGrabServer
RestartPreviousState
@@ -17,24 +19,11 @@
#ClientBorderWidth
Color
---- xinit-X11R7.1-1.0.2.orig/xinitrc.cpp 2006-08-19 11:02:26.000000000 +0200
-+++ xinit-1.1.1/xinitrc.cpp 2006-08-19 11:02:35.000000000 +0200
-@@ -68,8 +68,10 @@
-
- #endif
-
--TWM &
-+if [ -x /usr/X11R6/bin/fvwm -o -x /usr/bin/fvwm]; then
-+ exec fvwm
-+fi
- XCLOCK -geometry 50x50-1+1 &
- XTERM -geometry 80x50+494+51 &
- XTERM -geometry 80x20+494-0 &
--exec XTERM -geometry 80x66+0+0 -name login
-+exec TWM
---- xinit-X11R7.1-1.0.2.orig/startx.cpp 2006-08-19 11:02:26.000000000 +0200
-+++ xinit-1.1.1/startx.cpp 2006-08-19 11:14:43.000000000 +0200
-@@ -62,10 +62,115 @@
+Index: xinit-1.1.1/startx.cpp
+===================================================================
+--- xinit-1.1.1/startx.cpp.orig
++++ xinit-1.1.1/startx.cpp
+@@ -72,10 +72,115 @@ userclientrc=$HOME/.xinitrc
sysclientrc=XINITDIR/xinitrc
#endif
@@ -144,20 +133,36 @@
userserverrc=$HOME/.xserverrc
sysserverrc=XINITDIR/xserverrc
defaultclient=XTERM
--defaultserver=XSERVER
+XCOMM set X Server accordingly (Xorg/Xgl)
-+defaultserver=XSERVER
+ defaultserver=XSERVER
+test -n "$DISPLAYMANAGER_XSERVER" && defaultserver=/usr/bin/$DISPLAYMANAGER_XSERVER
defaultclientargs=""
defaultserverargs=""
- clientargs=""
-@@ -224,6 +328,9 @@
- XINIT $client $clientargs -- $server $display $serverargs
+ defaultdisplay=":0"
+@@ -312,6 +417,9 @@ else
+ XINIT "$client" $clientargs -- "$server" $display $serverargs
fi
#else
+XCOMM handle TCP port 6000
+test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \
+ serverargs="$serverargs -nolisten tcp"
-
+
#ifdef __APPLE__
eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs
+Index: xinit-1.1.1/xinitrc.cpp
+===================================================================
+--- xinit-1.1.1/xinitrc.cpp.orig
++++ xinit-1.1.1/xinitrc.cpp
+@@ -96,8 +96,10 @@ fi
+
+ #endif
+
+-TWM &
++if [ -x /usr/X11R6/bin/fvwm -o -x /usr/bin/fvwm]; then
++ exec fvwm
++fi
+ XCLOCK -geometry 50x50-1+1 &
+ XTERM -geometry 80x50+494+51 &
+ XTERM -geometry 80x20+494-0 &
+-exec XTERM -geometry 80x66+0+0 -name login
++exec TWM
++++++ p_twm_sig11.diff ++++++
--- /var/tmp/diff_new_pack.Y24523/_old 2009-06-05 22:50:03.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24523/_new 2009-06-05 22:50:03.000000000 +0200
@@ -1,11 +1,8 @@
-Index: programs/twm/add_window.c
+Index: twm-1.0.4/src/add_window.c
===================================================================
-RCS file: /work/cvsdir/cvs/xc/programs/twm/add_window.c,v
-retrieving revision 1.1.1.10
-diff -u -r1.1.1.10 add_window.c
---- programs/twm/add_window.c 27 Apr 2005 15:56:32 -0000 1.1.1.10
-+++ programs/twm/add_window.c 1 Mar 2006 10:59:44 -0000
-@@ -1538,10 +1538,11 @@
+--- twm-1.0.4/src.orig/add_window.c
++++ twm-1.0.4/src/add_window.c
+@@ -1538,10 +1538,11 @@ FetchWmColormapWindows (TwmWindow *tmp)
cwins = (ColormapWindow **) malloc(sizeof(ColormapWindow *));
if (XFindContext(dpy, tmp->w, ColormapContext, (caddr_t *)&cwins[0]) ==
++++++ p_xauth.diff ++++++
--- /var/tmp/diff_new_pack.Y24523/_old 2009-06-05 22:50:03.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24523/_new 2009-06-05 22:50:03.000000000 +0200
@@ -1,26 +1,8 @@
-Index: lib/X11/ConnDis.c
+Index: xauth-1.0.3/gethost.c
===================================================================
-RCS file: /home/eich/cvs/xc/lib/X11/ConnDis.c,v
-retrieving revision 1.1.1.13
-diff -w -u -r1.1.1.13 ConnDis.c
-Index: programs/xdm/auth.c
-===================================================================
-RCS file: /home/eich/cvs/xc/programs/xdm/auth.c,v
-retrieving revision 1.1.1.11
-diff -w -u -r1.1.1.11 auth.c
-Index: programs/xinit/startx.cpp
-===================================================================
-RCS file: /home/eich/cvs/xc/programs/xinit/startx.cpp,v
-retrieving revision 1.1.1.13
-diff -w -u -r1.1.1.13 startx.cpp
-Index: programs/xauth/gethost.c
-===================================================================
-RCS file: /home/eich/cvs/xc/programs/xauth/gethost.c,v
-retrieving revision 1.1.1.7
-diff -w -u -r1.1.1.7 gethost.c
---- programs/xauth/gethost.c 8 Sep 2003 09:32:24 -0000 1.1.1.7
-+++ xauth-1.0.3/gethost.c 26 Jul 2005 14:48:29 -0000
-@@ -249,7 +249,8 @@
+--- xauth-1.0.3/gethost.c.orig
++++ xauth-1.0.3/gethost.c
+@@ -244,7 +244,8 @@ struct addrlist *get_address_info (
int family,
char *fulldpyname,
int prefix,
@@ -30,7 +12,7 @@
{
struct addrlist *retval = NULL;
int len = 0;
-@@ -279,7 +280,7 @@
+@@ -274,7 +275,7 @@ struct addrlist *get_address_info (
if (prefix == 0 && (strncmp (fulldpyname, "unix:", 5) == 0 ||
fulldpyname[0] == ':')) {
@@ -39,14 +21,11 @@
len = 0;
} else {
src = buf;
-Index: programs/xauth/parsedpy.c
+Index: xauth-1.0.3/parsedpy.c
===================================================================
-RCS file: /home/eich/cvs/xc/programs/xauth/parsedpy.c,v
-retrieving revision 1.1.1.6
-diff -w -u -r1.1.1.6 parsedpy.c
---- programs/xauth/parsedpy.c 8 Sep 2003 09:32:24 -0000 1.1.1.6
-+++ xauth-1.0.3/parsedpy.c 26 Jul 2005 14:48:29 -0000
-@@ -69,20 +69,24 @@
+--- xauth-1.0.3/parsedpy.c.orig
++++ xauth-1.0.3/parsedpy.c
+@@ -74,20 +74,24 @@ copystring (char *src, int len)
char *
@@ -74,7 +53,7 @@
copystring (buf, strlen (buf)) : NULL);
}
#endif
-@@ -92,6 +96,7 @@
+@@ -97,6 +101,7 @@ copyhostname (void)
*/
Bool
parse_displayname (char *displayname,
@@ -82,7 +61,7 @@
int *familyp, /* return */
char **hostp, /* return */
int *dpynump, /* return */
-@@ -133,7 +138,7 @@
+@@ -138,7 +143,7 @@ parse_displayname (char *displayname,
host = copystring ("0", 1);
family = FamilyDECnet;
} else {
@@ -91,14 +70,11 @@
family = FamilyInternet;
}
#endif
-Index: programs/xauth/process.c
+Index: xauth-1.0.3/process.c
===================================================================
-RCS file: /home/eich/cvs/xc/programs/xauth/process.c,v
-retrieving revision 1.1.1.17
-diff -w -u -r1.1.1.17 process.c
---- programs/xauth/process.c 6 Jul 2004 15:11:16 -0000 1.1.1.17
-+++ xauth-1.0.3/process.c 26 Jul 2005 14:48:29 -0000
-@@ -462,7 +462,7 @@
+--- xauth-1.0.3/process.c.orig
++++ xauth-1.0.3/process.c
+@@ -466,7 +466,7 @@ read_auth_entries(FILE *fp, Bool numeric
}
static Bool
@@ -107,8 +83,8 @@
{
int family;
char *host = NULL, *rest = NULL;
-@@ -482,11 +482,13 @@
- prelen = (cp - displayname);
+@@ -489,11 +489,13 @@ get_displayname_auth(char *displayname,
+ displayname = strrchr(displayname, '/') + 1;
if (!parse_displayname (displayname + ((prelen > 0) ? prelen + 1 : 0),
+ localhostname,
@@ -122,7 +98,7 @@
if (addrlist_head) {
char buf[40]; /* want to hold largest display num */
unsigned short dpylen;
-@@ -1221,13 +1223,19 @@
+@@ -1223,13 +1225,19 @@ iterdpy (char *inputfilename, int lineno
Xauth *tmp_auth;
AuthList *proto_head, *proto;
AuthList *l, *next;
@@ -143,7 +119,7 @@
prefix (inputfilename, lineno);
baddisplayname (displayname, argv[0]);
errors++;
-@@ -1566,7 +1574,7 @@
+@@ -1568,7 +1576,7 @@ do_add(char *inputfilename, int lineno,
}
}
@@ -152,14 +128,11 @@
prefix (inputfilename, lineno);
baddisplayname (dpyname, argv[0]);
free (key);
-Index: programs/xauth/xauth.h
+Index: xauth-1.0.3/xauth.h
===================================================================
-RCS file: /home/eich/cvs/xc/programs/xauth/xauth.h,v
-retrieving revision 1.1.1.6
-diff -w -u -r1.1.1.6 xauth.h
---- programs/xauth/xauth.h 8 Sep 2003 09:32:24 -0000 1.1.1.6
-+++ xauth-1.0.3/xauth.h 26 Jul 2005 14:48:29 -0000
-@@ -51,10 +51,10 @@
+--- xauth-1.0.3/xauth.h.orig
++++ xauth-1.0.3/xauth.h
+@@ -51,10 +51,10 @@ struct addrlist {
};
extern char *get_hostname ( Xauth *auth );
@@ -173,9 +146,11 @@
extern int auth_initialize ( char *authfilename );
extern int auth_finalize ( void );
extern int process_command ( char *inputfilename, int lineno, int argc, char **argv );
---- programs/xdm/auth.c.orig 2005-11-09 10:41:27.000000000 +0100
-+++ xdm-1.1.8/auth.c 2005-11-11 11:33:00.000000000 +0100
-@@ -680,7 +680,7 @@
+Index: xdm-1.1.8/auth.c
+===================================================================
+--- xdm-1.1.8/auth.c.orig
++++ xdm-1.1.8/auth.c
+@@ -680,7 +680,7 @@ writeAddr (
}
static void
@@ -184,7 +159,7 @@
{
char displayname[100];
int len = _XGetHostname (displayname, sizeof(displayname));
-@@ -716,6 +716,9 @@
+@@ -716,6 +716,9 @@ DefineLocal (FILE *file, Xauth *auth)
#endif
writeAddr (FamilyLocal, len, displayname, file, auth);
@@ -194,7 +169,7 @@
}
#ifdef HAS_GETIFADDRS
-@@ -1148,7 +1151,7 @@
+@@ -1148,7 +1151,7 @@ setAuthNumber (Xauth *auth, char *name)
}
static void
@@ -203,7 +178,7 @@
{
int fd;
-@@ -1175,13 +1178,13 @@
+@@ -1175,13 +1178,13 @@ writeLocalAuth (FILE *file, Xauth *auth,
DefineSelf (fd, file, auth);
close (fd);
#endif
@@ -219,7 +194,7 @@
{
int family = FamilyLocal;
char *addr;
-@@ -1200,7 +1203,7 @@
+@@ -1200,7 +1203,7 @@ writeRemoteAuth (FILE *file, Xauth *auth
}
else
{
@@ -228,7 +203,7 @@
}
}
-@@ -1224,6 +1227,7 @@
+@@ -1224,6 +1227,7 @@ SetUserAuthorization (struct display *d,
#ifdef HAS_MKSTEMP
int fd;
#endif
@@ -236,7 +211,7 @@
Debug ("SetUserAuthorization\n");
auths = d->authorizations;
-@@ -1316,10 +1320,10 @@
+@@ -1316,10 +1320,10 @@ SetUserAuthorization (struct display *d,
{
magicCookie = i;
if (d->displayType.location == Local)
@@ -249,7 +224,7 @@
#endif
break;
}
-@@ -1337,10 +1341,10 @@
+@@ -1337,10 +1341,10 @@ SetUserAuthorization (struct display *d,
!strncmp (auths[i]->name, "MIT-KERBEROS-5", 14))
auths[i]->data_length = 0;
if (d->displayType.location == Local)
@@ -262,7 +237,7 @@
#endif
auths[i]->data_length = data_len;
}
-@@ -1379,6 +1383,12 @@
+@@ -1379,6 +1383,12 @@ SetUserAuthorization (struct display *d,
verify->systemEnviron = setEnv (verify->systemEnviron,
"XAUTHORITY", envname);
}
@@ -275,7 +250,7 @@
XauUnlockAuth (name);
if (envname)
chown (envname, verify->uid, verify->gid);
-@@ -1417,10 +1427,10 @@
+@@ -1417,10 +1427,10 @@ RemoveUserAuthorization (struct display
for (i = 0; i < d->authNum; i++)
{
if (d->displayType.location == Local)
@@ -288,13 +263,15 @@
#endif
}
doWrite = 1;
---- programs/xinit/startx.cpp.orig 2005-11-11 11:16:53.000000000 +0100
-+++ xinit-1.1.1/startx.cpp 2005-11-11 11:35:19.000000000 +0100
-@@ -328,6 +328,7 @@
- . /etc/sysconfig/displaymanager
+Index: xinit-1.1.1/startx.cpp
+===================================================================
+--- xinit-1.1.1/startx.cpp.orig
++++ xinit-1.1.1/startx.cpp
+@@ -420,6 +420,7 @@ fi
+ XCOMM handle TCP port 6000
test "$DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN" != "yes" && \
serverargs="$serverargs -nolisten tcp"
+export XAUTHLOCALHOSTNAME=`hostname`
-
+
#ifdef __APPLE__
- eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs
+ eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs
++++++ p_xrdb.diff ++++++
--- /var/tmp/diff_new_pack.Y24523/_old 2009-06-05 22:50:04.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24523/_new 2009-06-05 22:50:04.000000000 +0200
@@ -1,6 +1,8 @@
---- programs/xrdb/xrdb.c.orig 2005-11-30 11:35:57.000000000 +0100
-+++ programs/xrdb/xrdb.c 2006-02-08 10:52:38.636213051 +0100
-@@ -514,6 +514,8 @@
+Index: xorg-x11-7.4/xrdb-1.0.5/xrdb.c
+===================================================================
+--- xorg-x11-7.4/xrdb-1.0.5.orig/xrdb.c
++++ xorg-x11-7.4/xrdb-1.0.5/xrdb.c
+@@ -504,6 +504,8 @@ DoDisplayDefines(Display *display, Strin
int n;
XmuGetHostname(client, MAXHOSTNAMELEN);
++++++ Replace-rsh-by-ssh-the-extract-merge-example.-Rsh-is.patch ++++++
From 64d1fe69362bb0edcd5736ee6988d9bd394ea5c0 Mon Sep 17 00:00:00 2001
From: Matthieu Herrb
Date: Tue, 17 Jun 2008 23:31:58 +0200
Subject: Replace rsh by ssh the extract/merge example. Rsh is no more.
---
xauth.man | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Index: xauth-1.0.3/xauth.man
===================================================================
--- xauth-1.0.3.orig/xauth.man
+++ xauth-1.0.3/xauth.man
@@ -204,7 +204,7 @@ current display, copy it to another mach
user's authority file on the remote machine:
.sp
.nf
- % xauth extract \- $DISPLAY | rsh otherhost xauth merge \-
+ % xauth extract \- $DISPLAY | ssh otherhost xauth merge \-
.fi
.PP
.sp
++++++ rstart.diff ++++++
--- /var/tmp/diff_new_pack.Y24523/_old 2009-06-05 22:50:04.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24523/_new 2009-06-05 22:50:04.000000000 +0200
@@ -1,5 +1,7 @@
---- Makefile.am.orig 2006-07-03 21:42:44.000000000 +0200
-+++ Makefile.am 2006-07-03 21:42:49.000000000 +0200
+Index: Makefile.am
+===================================================================
+--- Makefile.am.orig
++++ Makefile.am
@@ -21,12 +21,12 @@
# rstartd server
@@ -15,7 +17,7 @@
rstartd_real_LDADD = $(RSTART_LIBS)
-@@ -50,7 +50,7 @@
+@@ -50,7 +50,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][
# config data
@@ -24,7 +26,7 @@
config_DATA = config
config: config.cpp
-@@ -99,7 +99,7 @@
+@@ -99,7 +99,7 @@ CLEANFILES = rstart rstartd config $(app
# FIXME: Someone who cares about rstart may want to look into sanitizing
# the stuff below.
++++++ scripts.diff ++++++
--- /var/tmp/diff_new_pack.Y24523/_old 2009-06-05 22:50:04.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24523/_new 2009-06-05 22:50:04.000000000 +0200
@@ -1,6 +1,7 @@
-diff -u -r ../scripts-X11R7.0-1.0.1.orig/Makefile.am ./Makefile.am
---- ../scripts-X11R7.0-1.0.1.orig/Makefile.am 2006-10-09 17:03:44.000000000 +0200
-+++ ./Makefile.am 2006-10-09 17:04:31.000000000 +0200
+Index: Makefile.am
+===================================================================
+--- Makefile.am.orig
++++ Makefile.am
@@ -21,15 +21,6 @@
dist_bin_SCRIPTS = fontname.sh fontprop.sh xon
@@ -17,7 +18,7 @@
appman_PRE = \
xon.man
-@@ -38,8 +29,8 @@
+@@ -38,8 +29,8 @@ appmandir = $(APP_MAN_DIR)
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
++++++ x11perf.diff ++++++
--- /var/tmp/diff_new_pack.Y24523/_old 2009-06-05 22:50:04.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24523/_new 2009-06-05 22:50:04.000000000 +0200
@@ -1,6 +1,8 @@
---- Makefile.am.orig 2006-07-03 21:46:56.000000000 +0200
-+++ Makefile.am 2006-07-03 21:47:17.000000000 +0200
-@@ -23,7 +23,7 @@
+Index: Makefile.am
+===================================================================
+--- Makefile.am.orig
++++ Makefile.am
+@@ -23,7 +23,7 @@ bin_PROGRAMS = x11perf
bin_SCRIPTS = x11perfcomp
++++++ xauth-1.0.2.diff ++++++
--- /var/tmp/diff_new_pack.Y24523/_old 2009-06-05 22:50:04.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24523/_new 2009-06-05 22:50:04.000000000 +0200
@@ -1,6 +1,8 @@
---- process.c
-+++ process.c
-@@ -1285,8 +1285,11 @@
+Index: process.c
+===================================================================
+--- process.c.orig
++++ process.c
+@@ -1296,8 +1296,11 @@ remove_entry(char *inputfilename, int li
/*
* unlink the auth we were asked to
*/
++++++ xconsole-no-stropts.patch ++++++
Index: xconsole-1.0.3/xconsole.c
===================================================================
--- xconsole-1.0.3.orig/xconsole.c
+++ xconsole-1.0.3/xconsole.c
@@ -182,7 +182,6 @@ static XrmOptionDescRec options[] = {
# endif
# if defined (SVR4) || defined (USE_PTS)
# include
-# include /* for I_PUSH */
# ifdef sun
# include
# endif
++++++ xfd.diff ++++++
--- /var/tmp/diff_new_pack.Y24523/_old 2009-06-05 22:50:05.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24523/_new 2009-06-05 22:50:05.000000000 +0200
@@ -1,5 +1,7 @@
---- grid.c.~1~ 2008-05-28 13:09:53.000000000 +0200
-+++ grid.c 2008-05-28 13:09:56.000000000 +0200
+Index: grid.c
+===================================================================
+--- grid.c.orig
++++ grid.c
@@ -544,7 +544,6 @@ XmuCvtStringToXftFont(Display *dpy,
if (!font)
{
++++++ xfs-no_config_file.diff ++++++
--- /var/tmp/diff_new_pack.Y24523/_old 2009-06-05 22:50:05.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24523/_new 2009-06-05 22:50:05.000000000 +0200
@@ -1,6 +1,7 @@
-diff -u -p -r ../xfs-1.0.8.orig//os/osglue.c ./os/osglue.c
---- ../xfs-1.0.8.orig//os/osglue.c 2008-10-25 11:34:19.082055835 +0200
-+++ ./os/osglue.c 2008-10-25 11:50:19.296627251 +0200
+Index: os/osglue.c
+===================================================================
+--- os/osglue.c.orig
++++ os/osglue.c
@@ -367,12 +367,20 @@ CloneMyself(void)
}
++++++ xinit-client-session.patch ++++++
Index: xinit-1.1.1/xinit.c
===================================================================
--- xinit-1.1.1.orig/xinit.c
+++ xinit-1.1.1/xinit.c
@@ -761,11 +761,21 @@ startClient(char *client[])
{
setWindowPath();
if ((clientpid = vfork()) == 0) {
+ int fd;
if (setuid(getuid()) == -1) {
Error("cannot change uid: %s\n", strerror(errno));
_exit(ERR_EXIT);
}
- setpgid(0, getpid());
+ fd = open ("/dev/null", O_RDONLY);
+
+ if (fd < 0) {
+ Error("cannot open /dev/null: %s\n", strerror(errno));
+ _exit(ERR_EXIT);
+ }
+ close (STDIN_FILENO);
+ dup2 (fd, STDIN_FILENO);
+ close (fd);
+ setsid();
environ = newenviron;
#ifdef __UNIXOS2__
#undef environ
++++++ xinit.diff ++++++
--- /var/tmp/diff_new_pack.Y24523/_old 2009-06-05 22:50:05.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24523/_new 2009-06-05 22:50:05.000000000 +0200
@@ -1,5 +1,7 @@
---- Makefile.am.orig 2006-07-03 22:05:13.000000000 +0200
-+++ Makefile.am 2006-07-03 22:06:19.000000000 +0200
+Index: Makefile.am
+===================================================================
+--- Makefile.am.orig
++++ Makefile.am
@@ -19,7 +19,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
++++++ xrx.diff ++++++
--- /var/tmp/diff_new_pack.Y24523/_old 2009-06-05 22:50:06.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24523/_new 2009-06-05 22:50:06.000000000 +0200
@@ -1,17 +1,8 @@
---- helper/GetUrl.c.orig 2006-07-20 04:33:59.000000000 +0200
-+++ helper/GetUrl.c 2006-07-20 04:37:16.000000000 +0200
-@@ -126,7 +126,7 @@
- * too many times).
- */
- for(retry = HTTP_CONNECTION_RETRIES; retry >= 0; retry--) {
-- if ((trans_conn = _HttpTransOpenCOTSClient(address)) == NULL)
-+ if ((trans_conn = (XtransConnInfo) _HttpTransOpenCOTSClient(address)) == NULL)
- break;
-
- if ((connect_stat = _HttpTransConnect(trans_conn, address)) < 0) {
---- configure.ac.orig 2008-06-26 10:24:03.000000000 +0000
-+++ configure.ac 2008-06-26 10:24:18.000000000 +0000
-@@ -60,7 +60,7 @@
+Index: configure.ac
+===================================================================
+--- configure.ac.orig
++++ configure.ac
+@@ -60,7 +60,7 @@ if test "x$PLUGIN_CFLAGS" = x ; then
[PLUGIN_CFLAGS=${FIREFOX_PLUGIN_CFLAGS}], [AC_MSG_RESULT([no])])
if test "x$PLUGIN_CFLAGS" = x ; then
@@ -20,3 +11,16 @@
fi
fi
fi
+Index: helper/GetUrl.c
+===================================================================
+--- helper/GetUrl.c.orig
++++ helper/GetUrl.c
+@@ -127,7 +127,7 @@ OpenConnection(char *hostname, int port)
+ * too many times).
+ */
+ for(retry = HTTP_CONNECTION_RETRIES; retry >= 0; retry--) {
+- if ((trans_conn = _HttpTransOpenCOTSClient(address)) == NULL)
++ if ((trans_conn = (XtransConnInfo) _HttpTransOpenCOTSClient(address)) == NULL)
+ break;
+
+ if ((connect_stat = _HttpTransConnect(trans_conn, address)) < 0) {
++++++ xset-spurious-xprint.patch ++++++
Index: xset-1.0.4/configure.ac
===================================================================
--- xset-1.0.4.orig/configure.ac
+++ xset-1.0.4/configure.ac
@@ -65,14 +65,8 @@ PKG_CHECK_MODULES(SET_FONTCACHE, xfontca
AC_CHECK_HEADERS([X11/extensions/fontcache.h X11/extensions/fontcacheP.h],,,[#include ])
CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-PKG_CHECK_MODULES(SET_XPRINT, xp,
- [SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SET_XPRINT_CFLAGS $SET_X11_CFLAGS"
- AC_CHECK_HEADERS([X11/extensions/Print.h],,,[#include ])
- CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
-
-XSET_CFLAGS="$XSET_CFLAGS $SET_XEXT_CFLAGS $SET_XKB_CFLAGS $SET_XF86MISC_CFLAGS $SET_FONTCACHE_CFLAGS $SET_XPRINT_CFLAGS"
-XSET_LIBS="$XSET_LIBS $SET_XEXT_LIBS $SET_XKB_LIBS $SET_XF86MISC_LIBS $SET_FONTCACHE_LIBS $SET_XPRINT_LIBS"
+XSET_CFLAGS="$XSET_CFLAGS $SET_XEXT_CFLAGS $SET_XKB_CFLAGS $SET_XF86MISC_CFLAGS $SET_FONTCACHE_CFLAGS"
+XSET_LIBS="$XSET_LIBS $SET_XEXT_LIBS $SET_XKB_LIBS $SET_XF86MISC_LIBS $SET_FONTCACHE_LIBS"
AC_SUBST(XSET_CFLAGS)
AC_SUBST(XSET_LIBS)
++++++ xsm.diff ++++++
--- /var/tmp/diff_new_pack.Y24523/_old 2009-06-05 22:50:06.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24523/_new 2009-06-05 22:50:06.000000000 +0200
@@ -1,5 +1,7 @@
---- Makefile.am.orig 2006-07-03 22:07:58.000000000 +0200
-+++ Makefile.am 2006-07-03 22:08:19.000000000 +0200
+Index: Makefile.am
+===================================================================
+--- Makefile.am.orig
++++ Makefile.am
@@ -21,7 +21,7 @@
bin_PROGRAMS = xsm
++++++ xvidtune.diff ++++++
--- /var/tmp/diff_new_pack.Y24523/_old 2009-06-05 22:50:06.000000000 +0200
+++ /var/tmp/diff_new_pack.Y24523/_new 2009-06-05 22:50:06.000000000 +0200
@@ -1,22 +1,26 @@
---- Makefile.in.orig 2006-12-14 12:14:11.000000000 +0000
-+++ Makefile.in 2006-12-14 12:14:48.000000000 +0000
-@@ -701,7 +701,7 @@
- sed $(MAN_SUBSTS) < $< > $@
+Index: Makefile.am
+===================================================================
+--- Makefile.am.orig
++++ Makefile.am
+@@ -65,7 +65,7 @@ appdefaultdir = @appdefaultdir@
+ appdefault_DATA = Xvidtune
Xvidtune: Xvidtune.cpp
- $(RAWCPP) $(srcdir)/Xvidtune.cpp | \
+ /lib/cpp $(srcdir)/Xvidtune.cpp | \
sed -e 's/^\#.*$$//g' -e 's|__VENDOR__|$(VENDOR_NAME)|' > $@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---- Makefile.am.orig 2006-12-14 12:14:16.000000000 +0000
-+++ Makefile.am 2006-12-14 12:14:34.000000000 +0000
-@@ -65,7 +65,7 @@
- appdefault_DATA = Xvidtune
+
+ EXTRA_DIST = Xvidtune.cpp $(appman_PRE)
+Index: Makefile.in
+===================================================================
+--- Makefile.in.orig
++++ Makefile.in
+@@ -663,7 +663,7 @@ uninstall-am: uninstall-appdefaultDATA u
+ sed $(MAN_SUBSTS) < $< > $@
Xvidtune: Xvidtune.cpp
- $(RAWCPP) $(srcdir)/Xvidtune.cpp | \
+ /lib/cpp $(srcdir)/Xvidtune.cpp | \
sed -e 's/^\#.*$$//g' -e 's|__VENDOR__|$(VENDOR_NAME)|' > $@
-
- EXTRA_DIST = Xvidtune.cpp $(appman_PRE)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org