libsm: Changes to 'debian-unstable'
.gitignore | 7 ++
ChangeLog | 69 ++++++++++++++++++++++++
Makefile.am | 6 --
README | 30 ++++++++++
configure.ac | 27 +++++----
debian/README.source | 73 ++++++++++++++++++++++++++
debian/changelog | 12 ++++
debian/control | 21 +++++--
debian/rules | 2
debian/xsfbs/repack.sh | 32 +++++++++++
debian/xsfbs/xsfbs.sh | 78 ----------------------------
src/.gitignore | 6 --
src/Makefile.am | 3 -
src/SMlibint.h | 37 ++++++++-----
src/globals.h | 49 -----------------
src/sm_client.c | 136 +++++++++++++++----------------------------------
src/sm_error.c | 40 ++------------
src/sm_genid.c | 28 ++++++++--
src/sm_manager.c | 75 +++++----------------------
src/sm_misc.c | 61 ++++-----------------
src/sm_process.c | 24 +-------
21 files changed, 388 insertions(+), 428 deletions(-)
New commits:
commit 4cf46d9730c6023f411e7e81686b7e1d6f9b729b
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 25 18:00:03 2009 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 7ef4ed8..9b4c881 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libsm (2:1.1.1-1) UNRELEASED; urgency=low
+libsm (2:1.1.1-1) unstable; urgency=low
* New upstream release.
* Move libsm6-dbg to 'debug' section.
@@ -8,7 +8,7 @@ libsm (2:1.1.1-1) UNRELEASED; urgency=low
* Add README.source from xsfbs, bump Standards-Version to 3.8.3.
* Look for space-separated DEB_BUILD_OPTIONS.
- -- Julien Cristau <jcristau@debian.org> Tue, 25 Aug 2009 17:28:55 +0200
+ -- Julien Cristau <jcristau@debian.org> Tue, 25 Aug 2009 17:58:18 +0200
libsm (2:1.1.0-2) unstable; urgency=low
commit 5db0afdbaf524aa1e119a0b93ef51bfc7c18f4f4
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 25 17:58:07 2009 +0200
Look for space-separated DEB_BUILD_OPTIONS.
diff --git a/debian/changelog b/debian/changelog
index 953b653..7ef4ed8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libsm (2:1.1.1-1) UNRELEASED; urgency=low
* Bump libice-dev build-dep to 2:1.0.5.
* Bump xutils-dev build-dep to 1:7.4+4 for new util-macros.
* Add README.source from xsfbs, bump Standards-Version to 3.8.3.
+ * Look for space-separated DEB_BUILD_OPTIONS.
-- Julien Cristau <jcristau@debian.org> Tue, 25 Aug 2009 17:28:55 +0200
diff --git a/debian/rules b/debian/rules
index ec84aee..b3ee222 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ PACKAGE = libsm6
include debian/xsfbs/xsfbs.mk
CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
CFLAGS += -O2
commit 328bc076cdad922147cecd8d86dbd0aeef292dbe
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 25 17:39:05 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 145aa06..953b653 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libsm (2:1.1.1-1) UNRELEASED; urgency=low
* Drop x11-common (pre-)dependencies, this isn't needed anymore.
* Bump libice-dev build-dep to 2:1.0.5.
* Bump xutils-dev build-dep to 1:7.4+4 for new util-macros.
+ * Add README.source from xsfbs, bump Standards-Version to 3.8.3.
-- Julien Cristau <jcristau@debian.org> Tue, 25 Aug 2009 17:28:55 +0200
diff --git a/debian/control b/debian/control
index 84aec34..2419ed2 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends:
libtool,
xutils-dev (>= 1:7.4+4),
quilt
-Standards-Version: 3.7.3
+Standards-Version: 3.8.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libsm
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libsm.git
commit 91fc107f9b1a1cbd768badd26f7d12ca6da2d578
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 25 17:36:51 2009 +0200
Bump xutils-dev build-dep to 1:7.4+4 for new util-macros.
diff --git a/debian/changelog b/debian/changelog
index ed8a54b..145aa06 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ libsm (2:1.1.1-1) UNRELEASED; urgency=low
* Move libsm6-dbg to 'debug' section.
* Drop x11-common (pre-)dependencies, this isn't needed anymore.
* Bump libice-dev build-dep to 2:1.0.5.
+ * Bump xutils-dev build-dep to 1:7.4+4 for new util-macros.
-- Julien Cristau <jcristau@debian.org> Tue, 25 Aug 2009 17:28:55 +0200
diff --git a/debian/control b/debian/control
index 057ef2b..84aec34 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
uuid-dev,
automake,
libtool,
- xutils-dev,
+ xutils-dev (>= 1:7.4+4),
quilt
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libsm
commit 4503e2be407a193137a99ba1c7908055e003efd9
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 25 17:34:47 2009 +0200
Bump libice-dev build-dep to 2:1.0.5.
See upstream commit 7fc343e70202279fd3daa3adf789ca35b0ec8891
diff --git a/debian/changelog b/debian/changelog
index b694135..ed8a54b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libsm (2:1.1.1-1) UNRELEASED; urgency=low
* New upstream release.
* Move libsm6-dbg to 'debug' section.
* Drop x11-common (pre-)dependencies, this isn't needed anymore.
+ * Bump libice-dev build-dep to 2:1.0.5.
-- Julien Cristau <jcristau@debian.org> Tue, 25 Aug 2009 17:28:55 +0200
diff --git a/debian/control b/debian/control
index 25595fe..057ef2b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
pkg-config,
x11proto-core-dev (>= 6.8.99.15+cvs.20050722),
xtrans-dev,
- libice-dev (>= 1:1.0.0),
+ libice-dev (>= 2:1.0.5),
uuid-dev,
automake,
libtool,
commit e0df3fed0484d403b198ce9af82722cadbdd7738
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 25 17:34:10 2009 +0200
debian/control: wrap the Build-Depends field
diff --git a/debian/control b/debian/control
index 08564be..25595fe 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,17 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, x11proto-core-dev (>= 6.8.99.15+cvs.20050722), xtrans-dev, libice-dev (>= 1:1.0.0), uuid-dev, automake, libtool, xutils-dev, quilt
+Build-Depends:
+ debhelper (>= 5.0.0),
+ pkg-config,
+ x11proto-core-dev (>= 6.8.99.15+cvs.20050722),
+ xtrans-dev,
+ libice-dev (>= 1:1.0.0),
+ uuid-dev,
+ automake,
+ libtool,
+ xutils-dev,
+ quilt
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libsm
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libsm.git
commit 7c2d7565cc1b639b9e05c735953a19806ae57c1e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 25 17:32:18 2009 +0200
Drop x11-common (pre-)dependencies, this isn't needed anymore.
diff --git a/debian/changelog b/debian/changelog
index 2fb4b77..b694135 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libsm (2:1.1.1-1) UNRELEASED; urgency=low
* New upstream release.
* Move libsm6-dbg to 'debug' section.
+ * Drop x11-common (pre-)dependencies, this isn't needed anymore.
-- Julien Cristau <jcristau@debian.org> Tue, 25 Aug 2009 17:28:55 +0200
diff --git a/debian/control b/debian/control
index d1a9f3d..08564be 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libsm.git
Package: libsm6
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: X11 Session Management library
This package provides the main interface to the X11 Session Management
library, which allows for applications to both manage sessions, and make use
@@ -29,7 +29,7 @@ Package: libsm6-dbg
Section: debug
Architecture: any
Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libsm6 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsm6 (= ${binary:Version})
Description: X11 Session Management library (debug package)
This package provides the main interface to the X11 Session Management
library, which allows for applications to both manage sessions, and make use
@@ -50,7 +50,6 @@ Package: libsm-dev
Section: libdevel
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libsm6 (= ${binary:Version}), x11proto-core-dev, libice-dev (>= 1:1.0.0-1)
-Pre-Depends: x11-common (>= 1:7.0.0)
Description: X11 Session Management library (development headers)
This package provides the main interface to the X11 Session Management
library, which allows for applications to both manage sessions, and make use
commit a6049cd08d201de8697509ae189be9340b10f673
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 25 17:31:04 2009 +0200
Move libsm6-dbg to 'debug' section.
diff --git a/debian/changelog b/debian/changelog
index d801a54..2fb4b77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libsm (2:1.1.1-1) UNRELEASED; urgency=low
* New upstream release.
+ * Move libsm6-dbg to 'debug' section.
-- Julien Cristau <jcristau@debian.org> Tue, 25 Aug 2009 17:28:55 +0200
diff --git a/debian/control b/debian/control
index 9b832ed..d1a9f3d 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Description: X11 Session Management library
git://anongit.freedesktop.org/git/xorg/lib/libSM
Package: libsm6-dbg
-Section: libdevel
+Section: debug
Architecture: any
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libsm6 (= ${binary:Version})
commit c8360bd4842d1e922fd80e89059f4d512e6ab796
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Aug 25 17:29:42 2009 +0200
Update changelogs
diff --git a/ChangeLog b/ChangeLog
index 6628063..a294c24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,72 @@
+commit 82bbf42a2ba0401a8346505b1292ddb7b58f4507
+Author: Rémi Cardona <remi@gentoo.org>
+Date: Fri Aug 7 14:19:50 2009 +0200
+
+ libSM 1.1.1, update libtool version
+
+commit 45720a2e266748ac15bc0544b56e035383695588
+Author: Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>
+Date: Sat May 16 01:01:39 2009 +0200
+
+ Use FreeBSD uuid functions when available.
+
+ If the system provide the uuid_create function assume building on FreeBSD
+ or another OS with a compatible uuid interface. If that's the case, ignore
+ libuuid and just use the system functions without extra deps.
+
+commit 0389dbec3b738fa7e1dbef2b5317124b95bdfb20
+Author: Julien Cristau <jcristau@debian.org>
+Date: Mon Feb 16 01:27:24 2009 +0100
+
+ Typo fix
+
+ This makes us really error out if we want libuuid but can't find it.
+
+commit b75eae83221465bd0da4d21d0bab5af379dc31c1
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Mon Feb 2 20:34:30 2009 -0800
+
+ Add README with pointers to mailing list, bugzilla & git repos
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 896aeb5dd128fc8e489106fa7aaa5cee1e589106
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Wed Jan 28 18:48:47 2009 -0200
+
+ Janitor: ansification, make distcheck, compiler warnings.
+
+commit 1dcf5502137efe36d01b30169d4387438ad47be0
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Sat Nov 29 04:55:58 2008 -0200
+
+ avoid gcc warnings for libSM
+
+ Patch from http://bugs.freedesktop.org/show_bug.cgi?id=17968 adapted
+ to current sources.
+ This corrects a potential (hypothetical) segmentation fault.
+
+commit 8bed01275a7c7caf8f777e4074a5ee1ba1c2b3e7
+Author: Caolan McNamara <caolanm@redhat.com>
+Date: Fri Oct 17 17:21:49 2008 -0400
+
+ Bug #17644: Fix valgrind warning in _SmcProcessMessage
+
+commit 8ce4f47adb343aed069862a05b5e315173b17823
+Author: Julien Cristau <jcristau@debian.org>
+Date: Fri Jul 18 16:35:57 2008 +0200
+
+ If we don't have libuuid, build without it instead of failing
+
+ Only error out if configure was given --with-libuuid but we
+ don't find it.
+
+commit e3166eecfe7a04f0f622bd93e8a6a1faa672a029
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Jul 2 14:24:24 2008 -0400
+
+ Avoid memcpy(foo, NULL, n), that's just nonsense.
+
commit 27ebe517cabaf038fa65edff0140317f9438adec
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 2 14:00:54 2008 -0400
diff --git a/debian/changelog b/debian/changelog
index e4f6f13..d801a54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libsm (2:1.1.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Tue, 25 Aug 2009 17:28:55 +0200
+
libsm (2:1.1.0-2) unstable; urgency=low
* Upload to unstable.
commit 82bbf42a2ba0401a8346505b1292ddb7b58f4507
Author: Rémi Cardona <remi@gentoo.org>
Date: Fri Aug 7 14:19:50 2009 +0200
libSM 1.1.1, update libtool version
diff --git a/configure.ac b/configure.ac
index cf36193..2d1f09a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libSM],
- 1.1.0,
+ 1.1.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libSM)
diff --git a/src/Makefile.am b/src/Makefile.am
index 188ac4d..41d074b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,7 @@ if WITH_LIBUUID
AM_CFLAGS += $(LIBUUID_CFLAGS) -DHAVE_LIBUUID
endif
-libSM_la_LDFLAGS = -version-number 6:0:0 -no-undefined
+libSM_la_LDFLAGS = -version-number 6:0:1 -no-undefined
libSM_la_LIBADD = $(SM_LIBS) $(XTRANS_LIBS)
commit 45720a2e266748ac15bc0544b56e035383695588
Author: Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>
Date: Sat May 16 01:01:39 2009 +0200
Use FreeBSD uuid functions when available.
If the system provide the uuid_create function assume building on FreeBSD
or another OS with a compatible uuid interface. If that's the case, ignore
libuuid and just use the system functions without extra deps.
diff --git a/configure.ac b/configure.ac
index 9730b70..cf36193 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,12 +42,15 @@ XTRANS_CONNECTION_FLAGS
AC_ARG_WITH(libuuid, AC_HELP_STRING([--with-libuuid], [Build with libuuid support for client IDs]))
-if test x"$with_libuuid" != xno; then
- PKG_CHECK_MODULES(LIBUUID, uuid, [HAVE_LIBUUID=yes], [HAVE_LIBUUID=no])
-fi
-if test x"$with_libuuid" = xyes && test x"$HAVE_LIBUUID" = xno; then
- AC_MSG_ERROR([requested libuuid support but uuid.pc not found])
-fi
+AC_CHECK_FUNCS([uuid_create], [], [
+ if test x"$with_libuuid" != xno && test x"$have_system_uuid" != xyes; then
+ PKG_CHECK_MODULES(LIBUUID, uuid, [HAVE_LIBUUID=yes], [HAVE_LIBUUID=no])
+ fi
+ if test x"$with_libuuid" = xyes && test x"$HAVE_LIBUUID" = xno; then
+ AC_MSG_ERROR([requested libuuid support but uuid.pc not found])
+ fi
+])
+
AM_CONDITIONAL(WITH_LIBUUID, test x"$HAVE_LIBUUID" = xyes)
XORG_RELEASE_VERSION
diff --git a/src/sm_genid.c b/src/sm_genid.c
index 391a10e..f6adda3 100644
--- a/src/sm_genid.c
+++ b/src/sm_genid.c
@@ -76,7 +76,9 @@ in this Software without prior written authorization from The Open Group.
#define TCPCONN
#endif
-#if defined(HAVE_LIBUUID)
+#if defined(HAVE_UUID_CREATE)
+#include <uuid.h>
+#elif defined(HAVE_LIBUUID)
#include <uuid/uuid.h>
#endif
@@ -84,7 +86,26 @@ in this Software without prior written authorization from The Open Group.
char *
SmsGenerateClientID(SmsConn smsConn)
{
-#if defined(HAVE_LIBUUID)
+#if defined(HAVE_UUID_CREATE)
+ char *id;
+ char **temp;
+ uuid_t uuid;
+ uint32_t status;
+
+ uuid_create(&uuid, &status);
+
+ uuid_to_string(&uuid, &temp, &status);
+
+ if ((id = malloc (strlen (temp) + 2)) != NULL)
+ {
+ id[1] = '2';
+ strcpy (id+1, temp);
+ }
+
+ free(temp);
+
+ return id;
+#elif defined(HAVE_LIBUUID)
char *id;
char temp[256];
uuid_t uuid;
commit 8f72294ada477f003888b6776883c1dd98289f3f
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jun 3 03:37:37 2009 +0200
Kill custom readlink function
This was needed for very, very old versions of debianutils.
Closes: #498890
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 197eb74..781826f 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,16 +303,6 @@ EOF
fi
}
-# we require a readlink command or shell function
-if ! which readlink > /dev/null 2>&1; then
- message "The readlink command was not found. Please install version" \
- "1.13.1 or later of the debianutils package."
- readlink () {
- # returns what symlink in $1 actually points to
- perl -e '$l = shift; exit 1 unless -l $l; $r = readlink $l; exit 1 unless $r; print "$r\n"' "$1"
- }
-fi
-
check_symlink () {
# syntax: check_symlink symlink
#
commit 7deebf983f53c505bc25171ab77fdc408f250a6e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue May 26 15:58:19 2009 +0200
xsfbs: don't run dpkg --print-installation-architecture
This is deprecated in new dpkg, and had no users anyway.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 8840ff9..197eb74 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -57,8 +57,6 @@ EOF
exit $SHELL_LIB_USAGE_ERROR
fi
-ARCHITECTURE="$(dpkg --print-installation-architecture)"
-
if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
RECONFIGURE="true"
else
commit 4178d948cd66a938222d0d7c6353ee8d60229e40
Author: David Nusinow <dnusinow@debian.org>
Date: Mon May 25 20:08:50 2009 -0400
Add README.source
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..34ab4bf
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,73 @@
+------------------------------------------------------
+Quick Guide To Patching This Package For The Impatient
+------------------------------------------------------
+
+1. Make sure you have quilt installed
+2. Unpack the package as usual with "dpkg-source -x"
+3. Run the "patch" target in debian/rules
+4. Create a new patch with "quilt new" (see quilt(1))
+5. Edit all the files you want to include in the patch with "quilt edit"
+ (see quilt(1)).
+6. Write the patch with "quilt refresh" (see quilt(1))
+7. Run the "clean" target in debian/rules
+
+Alternatively, instead of using quilt directly, you can drop the patch in to
+debian/patches and add the name of the patch to debian/patches/series.
+
+------------------------------------
+Guide To The X Strike Force Packages
+------------------------------------
+
+The X Strike Force team maintains X packages in git repositories on
+git.debian.org in the pkg-xorg subdirectory. Most upstream packages
+are actually maintained in git repositories as well, so they often
+just need to be pulled into git.debian.org in a "upstream-*" branch.
+Otherwise, the upstream sources are manually installed in the Debian
+git repository.
+
+The .orig.tar.gz upstream source file could be generated this
+"upstream-*" branch in the Debian git repository but it is actually
+copied from upstream tarballs directly.
+
+Due to X.org being highly modular, packaging all X.org applications
+as their own independent packages would have created too many Debian
+packages. For this reason, some X.org applications have been grouped
+into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
+x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
+Most packages, including the X.org server itself and all libraries
+and drivers are, however maintained independently.
+
+The Debian packaging is added by creating the "debian-*" git branch
+which contains the aforementioned "upstream-*" branch plus the debian/
+repository files.
+When a patch has to be applied to the Debian package, two solutions
+are involved:
+* If the patch is available in one of the upstream branches, it
+ may be git'cherry-picked into the Debian repository. In this
+ case, it appears directly in the .diff.gz.
+* Otherwise, the patch is added to debian/patches/ which is managed
+ with quilt as documented in /usr/share/doc/quilt/README.source.
+
+quilt is actually invoked by the Debian X packaging through a larger
+set of scripts called XSFBS. XSFBS brings some other X specific
+features such as managing dependencies and conflicts due to the video
+and input driver ABIs.
+XSFBS itself is maintained in a separate repository at
+ git://git.debian.org/pkg-xorg/xsfbs.git
+and it is pulled inside the other Debian X repositories when needed.
+
+The XSFBS patching system requires a build dependency on quilt. Also
+a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
+so that the XSFBS patching occurs before the actual build. So the
+very first target of the build (likely the one running autoreconf)
+should depend on $(STAMP_DIR)/patch. It should also not depend on
+anything so that parallel builds are correctly supported (nothing
+should probably run while patching is being done). And finally, the
+clean target should depend on the xsfclean target so that patches
+are unapplied on clean.
+
+When the upstream sources contain some DFSG-nonfree files, they are
+listed in text files in debian/prune/ in the "debian-*" branch of
+the Debian repository. XSFBS' scripts then take care of removing
+these listed files during the build so as to generate a modified
+DFSG-free .orig.tar.gz tarball.
commit fa6396d6bf68b9a0154089146287245f9ad60a1e
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Feb 25 21:31:03 2009 +0100
xsfbs: repack.sh needs to be executable
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
old mode 100644
new mode 100755
commit 2ed171f9f390de4e97141c0016d3ba615e8c943e
Author: Julien Cristau <jcristau@debian.org>
Date: Tue Feb 17 17:20:42 2009 +0100
xsfbs.sh: kill {,de}register_x_lib_dir_with_ld_so
libx11's postinst was the only post-sarge user, and it's gone now.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 72efa95..8840ff9 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -719,72 +719,6 @@ run () {
fi
}
-register_x_lib_dir_with_ld_so () {
- # syntax: register_x_lib_dir_with_ld_so
- #
- # Configure the dynamic loader ld.so to search /usr/X11R6/lib for shared
- # libraries.
- #
- # Call this function from the postinst script of a package that places a
- # shared library in /usr/X11R6/lib, before invoking ldconfig.
-
- local dir ldsoconf
-
- dir="/usr/X11R6/lib"
- ldsoconf="/etc/ld.so.conf"
-
- # is the line not already present?
- if ! fgrep -qsx "$dir" "$ldsoconf"; then
- observe "adding $dir directory to $ldsoconf"
- echo "$dir" >> "$ldsoconf"
- fi
-}
-
-deregister_x_lib_dir_with_ld_so () {
- # syntax: deregister_x_lib_dir_with_ld_so
- #
- # Configure dynamic loader ld.so to not search /usr/X11R6/lib for shared
- # libraries, if and only if no shared libaries remain there.
- #
- # Call this function from the postrm script of a package that places a shared
- # library in /usr/X11R6/lib, in the event "$1" is "remove", and before
- # invoking ldconfig.
-
- local dir ldsoconf fgrep_status cmp_status
-
- dir="/usr/X11R6/lib"
- ldsoconf="/etc/ld.so.conf"
-
- # is the line present?
- if fgrep -qsx "$dir" "$ldsoconf"; then
- # are there any shared objects in the directory?
- if [ "$(echo "$dir"/lib*.so.*.*)" = "$dir/lib*.so.*.*" ]; then
- # glob expansion produced nothing, so no shared libraries are present
- observe "removing $dir directory from $ldsoconf"
- # rewrite the file (very carefully)
- set +e
- fgrep -svx "$dir" "$ldsoconf" > "$ldsoconf.dpkg-tmp"
- fgrep_status=$?
- set -e
- case $fgrep_status in
- 0|1) ;; # we don't actually care if any lines matched or not
- *) die "error reading \"$ldsoconf\"; fgrep exited with status" \
- "$fgrep_status" ;;
- esac
- set +e
- cmp -s "$ldsoconf.dpkg-tmp" "$ldsoconf"
- cmp_status=$?
- set -e
- case $cmp_status in
- 0) rm "$ldsoconf.dpkg-tmp" ;; # files are identical
- 1) mv "$ldsoconf.dpkg-tmp" "$ldsoconf" ;; # files differ
- *) die "error comparing \"$ldsoconf.dpkg-tmp\" to \"$ldsoconf\";" \
- "cmp exited with status $cmp_status" ;;
- esac
- fi
- fi
-}
-
make_symlink_sane () {
# syntax: make_symlink_sane symlink target
#
commit 0389dbec3b738fa7e1dbef2b5317124b95bdfb20
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Feb 16 01:27:24 2009 +0100
Typo fix
This makes us really error out if we want libuuid but can't find it.
diff --git a/configure.ac b/configure.ac
index 1d67f62..9730b70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ AC_ARG_WITH(libuuid, AC_HELP_STRING([--with-libuuid], [Build with libuuid suppor
if test x"$with_libuuid" != xno; then
PKG_CHECK_MODULES(LIBUUID, uuid, [HAVE_LIBUUID=yes], [HAVE_LIBUUID=no])
fi
-if test x"$with_libuuid" = xyes && test HAVE_LIBUUID = no; then
+if test x"$with_libuuid" = xyes && test x"$HAVE_LIBUUID" = xno; then
AC_MSG_ERROR([requested libuuid support but uuid.pc not found])
fi
AM_CONDITIONAL(WITH_LIBUUID, test x"$HAVE_LIBUUID" = xyes)
commit b75eae83221465bd0da4d21d0bab5af379dc31c1
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 2 20:34:30 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/README b/README
index e69de29..2094328 100644
--- a/README
+++ b/README
@@ -0,0 +1,30 @@
+libSM - X Session Management Library
+
+Documentation for this API can be found in the SMlib document in the
+doc/xorg-docs module of the X distribution, also available online at:
+
+ http://xorg.freedesktop.org/releases/X11R7.0/doc/PDF/SMlib.pdf
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/lib/libSM
+
+ http://cgit.freedesktop.org/xorg/lib/libSM
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
commit 84b7d5bf7a57cab80ba3696ce95028c2f67ba76d
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Feb 1 01:31:31 2009 +0100
xsfbs: add a repack script for uscan
This will automatically prune upstream tarballs
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
new file mode 100644
index 0000000..5935cc9
--- /dev/null
+++ b/debian/xsfbs/repack.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -e
+
+if ! [ -d debian/prune ]; then
+ exit 0
+fi
+
+if [ "x$1" != x--upstream-version ]; then
+ exit 1
+fi
+
+version="$2"
+filename="$3"
+
+if [ -z "$version" ] || ! [ -f "$filename" ]; then
+ exit 1
+fi
+
+dir="$(pwd)"
+tempdir="$(mktemp -d)"
+
+cd "$tempdir"
+tar xf "$dir/$filename"
+cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done
+
+tar czf "$dir/$filename" *
+cd "$dir"
+rm -rf "$tempdir"
+echo "Done pruning upstream tarball"
+
+exit 0
commit 896aeb5dd128fc8e489106fa7aaa5cee1e589106
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Wed Jan 28 18:48:47 2009 -0200
Janitor: ansification, make distcheck, compiler warnings.
diff --git a/.gitignore b/.gitignore
index 7cfac9c..e8d3c11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.deps
+.libs
aclocal.m4
autom4te.cache
config.guess
@@ -20,3 +22,8 @@ sm.pc
stamp-h1
*.o
*~
+*.lo
+*.la
+libSM-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index aa2fb39..55febc4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,14 +3,12 @@ SUBDIRS=src
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = sm.pc
-EXTRA_DIST=sm.pc.in
-
-EXTRA_DIST += ChangeLog
+EXTRA_DIST = sm.pc.in ChangeLog
MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index faf8c4d..1d67f62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,14 +12,19 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
AM_CONFIG_HEADER([config.h])
# Checks for programs.
AC_PROG_LIBTOOL
AC_PROG_CC
+XORG_CWARNFLAGS
# Checks for pkg-config packages
PKG_CHECK_MODULES(SM, ice xproto)
+SM_CFLAGS="$CWARNFLAGS $SM_CFLAGS"
AC_SUBST(SM_CFLAGS)
AC_SUBST(SM_LIBS)
@@ -45,14 +50,8 @@ if test x"$with_libuuid" = xyes && test HAVE_LIBUUID = no; then
fi
AM_CONDITIONAL(WITH_LIBUUID, test x"$HAVE_LIBUUID" = xyes)
-if test "x$GCC" = "xyes"; then
- GCC_WARNINGS="-Wall -Wpointer-arith -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations \
- -Wnested-externs -fno-strict-aliasing"
- CFLAGS="$GCC_WARNINGS $CFLAGS"
-fi
-
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
src/Makefile
diff --git a/src/.gitignore b/src/.gitignore
deleted file mode 100644
index 1c0eccc..0000000
--- a/src/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-libSM.la
-*.lo
-Makefile
-Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index dbfef37..188ac4d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,6 @@ endif
libSM_la_SOURCES = \
SMlibint.h \
- globals.h \
sm_auth.c \
sm_client.c \
sm_error.c \
diff --git a/src/SMlibint.h b/src/SMlibint.h
index 387f0bd..350b970 100644
--- a/src/SMlibint.h
+++ b/src/SMlibint.h
@@ -488,6 +488,24 @@ struct _SmsConn {
/*
* Extern declarations
*/
+extern void
+_SmcProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
+ unsigned long length, Bool swap,
+ IceReplyWaitInfo *replyWait, Bool *replyReadyRet);
+
+extern void
+_SmsProcessMessage(IceConn iceConn, IcePointer clientData, int opcode,
+ unsigned long length, Bool swap);
+
+extern void
+_SmcDefaultErrorHandler(SmcConn smcConn, Bool swap, int offendingMinorOpcode,
+ unsigned long offendingSequence, int errorClass,
+ int severity, SmPointer values);
+
+extern void
+_SmsDefaultErrorHandler(SmsConn smsConn, Bool swap, int offendingMinorOpcode,
+ unsigned long offendingSequence, int errorClass,
+ int severity, SmPointer values);
extern int _SmcOpcode;
extern int _SmsOpcode;
diff --git a/src/globals.h b/src/globals.h
deleted file mode 100644
index 40b0ffc..0000000
--- a/src/globals.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* $Xorg: globals.h,v 1.4 2001/02/09 02:03:30 xorgcvs Exp $ */
-
-/*
-
-Copyright 1993, 1998 The Open Group
Reply to: