ChangeLog | 70 ++ configure.ac | 5 debian/README.source | 26 debian/changelog | 18 debian/compat | 2 debian/control | 7 debian/patches/01-revert-switch-to-xtasprintf.diff | 71 -- debian/patches/series | 2 debian/rules | 129 ---- debian/xsfbs/repack.sh | 32 - debian/xsfbs/xsfbs.mk | 276 --------- debian/xsfbs/xsfbs.sh | 622 --------------------- man/XtAddActions.man | 2 man/XtAddCallback.man | 2 man/XtAddEventHandler.man | 4 man/XtAddInput.man | 2 man/XtAppAddActions.man | 2 man/XtAppAddConverter.man | 4 man/XtAppAddInput.man | 2 man/XtAppAddSignal.man | 2 man/XtAppAddTimeOut.man | 2 man/XtAppAddWorkProc.man | 2 man/XtAppCreateShell.man | 2 man/XtAppError.man | 4 man/XtAppErrorMsg.man | 4 man/XtAppGetErrorDatabase.man | 4 man/XtAppGetSelectionTimeout.man | 2 man/XtAppInitialize.man | 2 man/XtBuildEventMask.man | 2 man/XtCallAcceptFocus.man | 2 man/XtCallCallbacks.man | 2 man/XtClass.man | 4 man/XtConfigureWidget.man | 4 man/XtConvert.man | 8 man/XtConvertAndStore.man | 2 man/XtCreateApplicationContext.man | 2 man/XtCreateApplicationShell.man | 2 man/XtCreatePopupShell.man | 6 man/XtCreateWidget.man | 4 man/XtDisplayInitialize.man | 4 man/XtError.man | 2 man/XtErrorMsg.man | 2 man/XtGetApplicationNameAndClass.man | 2 man/XtGetErrorDatabase.man | 4 man/XtGetKeyboardFocusWidget.man | 6 man/XtGetResourceList.man | 4 man/XtGetSelectionParameters.man | 2 man/XtGetSelectionTimeout.man | 2 man/XtGetSelectionValue.man | 4 man/XtInitialize.man | 2 man/XtInsertEventTypeHandler.man | 2 man/XtMakeGeometryRequest.man | 4 man/XtManageChildren.man | 4 man/XtMapWidget.man | 2 man/XtNextEvent.man | 4 man/XtOffset.man | 4 man/XtOpenApplication.man | 2 man/XtOwnSelection.man | 4 man/XtParseTranslationTable.man | 8 man/XtPopdown.man | 4 man/XtPopup.man | 4 man/XtQueryGeometry.man | 4 man/XtRealizeWidget.man | 2 man/XtSetArg.man | 2 man/XtSetKeyboardFocus.man | 2 man/XtSetSelectionParameters.man | 2 man/XtStringConversionWarning.man | 6 src/Alloc.c | 2 src/Converters.c | 2 util/Makefile.am | 2 70 files changed, 214 insertions(+), 1226 deletions(-)
New commits: commit 03d39b140e95e85f64f913f07cec7903c4664bf6 Author: Cyril Brulebois <k...@debian.org> Date: Thu Mar 10 13:39:05 2011 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index db521c0..735e0f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxt (1:1.1.1-1) UNRELEASED; urgency=low +libxt (1:1.1.1-1) unstable; urgency=low * New upstream release: - Fix manpage suffixes (Closes: #512130). @@ -14,7 +14,7 @@ libxt (1:1.1.1-1) UNRELEASED; urgency=low being passed. Typo introduced in 1:1.0.6-1. * Bump Standards-Version to 3.9.1 (no changes needed). - -- Cyril Brulebois <k...@debian.org> Wed, 09 Mar 2011 02:33:13 +0100 + -- Cyril Brulebois <k...@debian.org> Thu, 10 Mar 2011 13:39:02 +0100 libxt (1:1.1.0-2) unstable; urgency=low commit 27659ba8bdc6d70f29e6a338ccba4273966747e1 Author: Cyril Brulebois <k...@debian.org> Date: Thu Mar 10 13:38:54 2011 +0100 Drop patch accordingly: 01-revert-switch-to-xtasprintf.diff diff --git a/debian/changelog b/debian/changelog index b6f3edb..db521c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ libxt (1:1.1.1-1) UNRELEASED; urgency=low * New upstream release: - Fix manpage suffixes (Closes: #512130). - Real fix for #617208. + * Drop patch accordingly: + - 01-revert-switch-to-xtasprintf.diff * Switch to dh: - Use debhelper 8. - Use dh-autoreconf. diff --git a/debian/patches/01-revert-switch-to-xtasprintf.diff b/debian/patches/01-revert-switch-to-xtasprintf.diff deleted file mode 100644 index f26674c..0000000 --- a/debian/patches/01-revert-switch-to-xtasprintf.diff +++ /dev/null @@ -1,71 +0,0 @@ -From b36d47b6b3538dc386fd82f8a204b47e3255dc99 Mon Sep 17 00:00:00 2001 -From: Cyril Brulebois <k...@debian.org> -Date: Mon, 7 Mar 2011 20:54:00 +0100 -Subject: [PATCH] Revert "Convert ALLOCATE_LOCAL + sprintf to XtAsprintf" - -This reverts commit 84e512a94295387bd0625ce619fc8bd381395c71. - -This causes xdm to fail when started from init, revert until a proper -fix is found. - -Debian bug #617208 (http://bugs.debian.org/617208). - -Signed-off-by: Cyril Brulebois <k...@debian.org> ---- - src/Initialize.c | 25 +++++++++++++++---------- - 1 files changed, 15 insertions(+), 10 deletions(-) - -diff --git a/src/Initialize.c b/src/Initialize.c -index e9543da..2e70e39 100644 ---- a/src/Initialize.c -+++ b/src/Initialize.c -@@ -380,7 +380,7 @@ static void CombineAppUserDefaults( - XrmDatabase *pdb) - { - char* filename; -- char* path = NULL; -+ char* path; - Boolean deallocate = False; - - if (!(path = getenv("XUSERFILESEARCHPATH"))) { -@@ -389,14 +389,20 @@ static void CombineAppUserDefaults( - char homedir[PATH_MAX]; - GetRootDirName(homedir, PATH_MAX); - if (!(old_path = getenv("XAPPLRESDIR"))) { -- XtAsprintf(&path, -- "%s/%%L/%%N%%C:%s/%%l/%%N%%C:%s/%%N%%C:%s/%%L/%%N:%s/%%l/%%N:%s/%%N", -- homedir, homedir, homedir, homedir, homedir, homedir); -+ char *path_default = "%s/%%L/%%N%%C:%s/%%l/%%N%%C:%s/%%N%%C:%s/%%L/%%N:%s/%%l/%%N:%s/%%N"; -+ if (!(path = -+ ALLOCATE_LOCAL(6*strlen(homedir) + strlen(path_default)))) -+ _XtAllocError(NULL); -+ sprintf( path, path_default, -+ homedir, homedir, homedir, homedir, homedir, homedir ); - } else { -- XtAsprintf(&path, -- "%s/%%L/%%N%%C:%s/%%l/%%N%%C:%s/%%N%%C:%s/%%N%%C:%s/%%L/%%N:%s/%%l/%%N:%s/%%N:%s/%%N", -- old_path, old_path, old_path, homedir, -- old_path, old_path, old_path, homedir); -+ char *path_default = "%s/%%L/%%N%%C:%s/%%l/%%N%%C:%s/%%N%%C:%s/%%N%%C:%s/%%L/%%N:%s/%%l/%%N:%s/%%N:%s/%%N"; -+ if (!(path = -+ ALLOCATE_LOCAL( 6*strlen(old_path) + 2*strlen(homedir) -+ + strlen(path_default)))) -+ _XtAllocError(NULL); -+ sprintf(path, path_default, old_path, old_path, old_path, homedir, -+ old_path, old_path, old_path, homedir ); - } - deallocate = True; - #endif -@@ -408,8 +414,7 @@ static void CombineAppUserDefaults( - XtFree(filename); - } - -- if (deallocate) -- XtFree(path); -+ if (deallocate) DEALLOCATE_LOCAL(path); - } - - static void CombineUserDefaults( --- -1.7.4.1 - diff --git a/debian/patches/series b/debian/patches/series index be49393..fdffa2a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -01-revert-switch-to-xtasprintf.diff +# placeholder commit 5a0be3c668e70ebd70a9f532823991f4dd07e182 Author: Cyril Brulebois <k...@debian.org> Date: Thu Mar 10 13:37:54 2011 +0100 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index dd53fef..79c4134 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,73 @@ +commit c16d3cc264c45601f0e59bdd29e438c7c9679721 +Author: Julien Cristau <jcris...@debian.org> +Date: Thu Mar 10 10:19:59 2011 +0100 + + Bump to 1.1.1 + + Signed-off-by: Julien Cristau <jcris...@debian.org> + +commit fe2cf6e2b70e57624aad71f510ff8c6addaae196 +Author: Cyril Brulebois <k...@debian.org> +Date: Tue Mar 8 16:09:49 2011 +0100 + + XtAsprintf: Fix memory corruption. + + Don't write the null terminator to a random place, this can trigger some + segfault in XtOpenDisplay() and other annoyances. + + Debian Bug #617208 <http://bugs.debian.org/617208> + + Signed-off-by: Cyril Brulebois <k...@debian.org> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit f6c791b5f318d8805db4cb6c74b1bc2e91d6c15c +Author: Gaetan Nadon <mems...@videotron.ca> +Date: Sun Mar 6 13:43:46 2011 -0500 + + man: replace hard coded section number 3Xt with __libmansuffix__ #35050 + + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512130 + + The Xt manpages are installed in section 3 (and not 3Xt as upstream + would have it). But, internal cross-references (in particular, in the + SEE ALSO part) are left alone, and keep pointing at Foo(3Xt). The + result is that they can't be automatically followed from manpage + sanitizers such as dwww or emacs. + + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Signed-off-by: Gaetan Nadon <mems...@videotron.ca> + +commit 9ccf14fddedc11bd17b3ae30612c6f70f4cd7e14 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Mar 4 16:31:59 2011 -0800 + + Don't need to use target-specific CFLAGS for makestrs + + It's the only thing built in that directory, so we can use AM_CFLAGS + and drop the requirement for AM_PROG_CC_C_O in configure.ac + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Gaetan Nadon <mems...@videotron.ca> + Tested-by: Gaetan Nadon <mems...@videotron.ca> + +commit 16d9941f3aa38dde115cbff639e131761c1b36d0 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Fri Mar 4 15:43:43 2011 -0800 + + Incorrect cast in XtCvtIntToPixmap could cause bus error on 64-bit machines + + Originally fixed by Leo Binchy for Sun Bug 4163152 to resolve bus error + on VSW5 (XTS) testing on 64-bit SPARC test run on Solaris 7. + ( Testcase: XtCvtIntToPixmap, Purpose: 1) + + Since we're converting from Int to Pixmap, need to access the argument + passed in as an int, not a Pixmap, which is consistent with the other + IntToXXX converters in this file. + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Reviewed-by: Matt Turner <matts...@gmail.com> + commit 994443524ade46bad03eea0acbd1410d561c591d Author: Jeremy Huddleston <jerem...@apple.com> Date: Fri Mar 4 16:30:58 2011 -0800 diff --git a/debian/changelog b/debian/changelog index 171c473..b6f3edb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,8 @@ -libxt (1:1.1.0-3) UNRELEASED; urgency=low +libxt (1:1.1.1-1) UNRELEASED; urgency=low + * New upstream release: + - Fix manpage suffixes (Closes: #512130). + - Real fix for #617208. * Switch to dh: - Use debhelper 8. - Use dh-autoreconf. commit c16d3cc264c45601f0e59bdd29e438c7c9679721 Author: Julien Cristau <jcris...@debian.org> Date: Thu Mar 10 10:19:59 2011 +0100 Bump to 1.1.1 Signed-off-by: Julien Cristau <jcris...@debian.org> diff --git a/configure.ac b/configure.ac index 8945729..96f0ccb 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libXt], [1.1.0], +AC_INIT([libXt], [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXt]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) commit fe2cf6e2b70e57624aad71f510ff8c6addaae196 Author: Cyril Brulebois <k...@debian.org> Date: Tue Mar 8 16:09:49 2011 +0100 XtAsprintf: Fix memory corruption. Don't write the null terminator to a random place, this can trigger some segfault in XtOpenDisplay() and other annoyances. Debian Bug #617208 <http://bugs.debian.org/617208> Signed-off-by: Cyril Brulebois <k...@debian.org> Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> diff --git a/src/Alloc.c b/src/Alloc.c index 67413ab..be643a8 100644 --- a/src/Alloc.c +++ b/src/Alloc.c @@ -147,7 +147,7 @@ Cardinal XtAsprintf( if (len < sizeof(buf)) { strncpy(*new_string, buf, len); - new_string[len] = '\0'; + (*new_string)[len] = '\0'; } else { commit 4cc0e2385d65470c5c56de432d8ae7202f4682e0 Author: Cyril Brulebois <k...@debian.org> Date: Wed Mar 9 02:59:04 2011 +0100 Bump Standards-Version to 3.9.1 (no changes needed). diff --git a/debian/changelog b/debian/changelog index 4b72a75..171c473 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ libxt (1:1.1.0-3) UNRELEASED; urgency=low * As a side-effect of looking at what really matters, fix the missing backslash when calling configure, preventing CFLAGS and LDFLAGS from being passed. Typo introduced in 1:1.0.6-1. + * Bump Standards-Version to 3.9.1 (no changes needed). -- Cyril Brulebois <k...@debian.org> Wed, 09 Mar 2011 02:33:13 +0100 diff --git a/debian/control b/debian/control index 5de1481..cad4101 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: pkg-config, xutils-dev (>= 1:7.5~1), quilt -Standards-Version: 3.8.3 +Standards-Version: 3.9.1 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxt Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxt.git commit f92589782e9cd49241dc097a92fea32167b8f175 Author: Cyril Brulebois <k...@debian.org> Date: Wed Mar 9 02:53:27 2011 +0100 Remove xsfbs accordingly. diff --git a/debian/README.source b/debian/README.source index 34ab4bf..4ecd5e6 100644 --- a/debian/README.source +++ b/debian/README.source @@ -25,7 +25,7 @@ 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 +The .orig.tar.gz upstream source file could be generated using this "upstream-*" branch in the Debian git repository but it is actually copied from upstream tarballs directly. @@ -47,27 +47,3 @@ are involved: 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. diff --git a/debian/changelog b/debian/changelog index 53131dd..4b72a75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libxt (1:1.1.0-3) UNRELEASED; urgency=low * Switch to dh: - Use debhelper 8. - Use dh-autoreconf. + * Remove xsfbs accordingly. * As a side-effect of looking at what really matters, fix the missing backslash when calling configure, preventing CFLAGS and LDFLAGS from being passed. Typo introduced in 1:1.0.6-1. diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh deleted file mode 100755 index 5935cc9..0000000 --- a/debian/xsfbs/repack.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/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 diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk deleted file mode 100755 index 5e16b10..0000000 --- a/debian/xsfbs/xsfbs.mk +++ /dev/null @@ -1,276 +0,0 @@ -#!/usr/bin/make -f - -# Debian X Strike Force Build System (XSFBS): Make portion - -# Copyright 1996 Stephen Early -# Copyright 1997 Mark Eichin -# Copyright 1998-2005, 2007 Branden Robinson -# Copyright 2005 David Nusinow -# -# Licensed under the GNU General Public License, version 2. See the file -# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>. - -# Originally by Stephen Early <sde1...@debian.org> -# Modified by Mark W. Eichin <eic...@kitten.gen.ma.us> -# Modified by Adam Heath <doo...@debian.org> -# Modified by Branden Robinson <bran...@debian.org> -# Modified by Fabio Massimo Di Nitto <fabbi...@fabbione.net> -# Modified by David Nusinow <dnusi...@debian.org> -# Acknowledgements to Manoj Srivastava. - -# Pass $(DH_OPTIONS) into the environment for debhelper's benefit. -export DH_OPTIONS - -# force quilt to not use ~/.quiltrc and to use debian/patches -QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null - -# Set up parameters for the upstream build environment. - -# Determine (source) package name from Debian changelog. -SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \ - | grep '^Source:' | awk '{print $$2}') - -# Determine package version from Debian changelog. -SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \ - | grep '^Version:' | awk '{print $$2}') - -# Determine upstream version number. -UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//') - -# Determine the source version without the epoch for make-orig-tar-gz -NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://') - -# Figure out who's building this package. -BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}}) - -# Find out if this is an official build; an official build has nothing but -# digits, dots, and/or the codename of a release in the Debian part of the -# version number. Anything else indicates an unofficial build. -OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi) - -# Set up parameters for the Debian build environment. - -# Determine our architecture. -BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) -# Work around some old-time dpkg braindamage. -BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH)) -# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy. -ifdef DEB_HOST_ARCH - ARCH:=$(DEB_HOST_ARCH) -else - # dpkg-cross sets the ARCH environment variable; if set, use it. - ifdef ARCH - ARCH:=$(ARCH) - else - ARCH:=$(BUILD_ARCH) - endif -endif - -# $(STAMP_DIR) houses stamp files for complex targets. -STAMP_DIR:=stampdir - -# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place -# their files. -DEBTREEDIR:=$(CURDIR)/debian/tmp - -# All "important" targets have four lines: -# 1) A target name that is invoked by a package-building tool or the user. -# This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart. -# 2) A line delcaring 1) as a phony target (".PHONY:"). -# 3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may -# depend on other targets. -# 4) A line declaring 3) as a member of the $(stampdir_targets) variable; the -# "$(STAMP_DIR)/" prefix is omitted. -# -# This indirection is needed so that the "stamp" files that signify when a rule -# is done can be located in a separate "stampdir". Recall that make has no way -# to know when a goal has been met for a phony target (like "build" or -# "install"). -# -# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@" -# so that the target will not be run again. Removing the file will make Make -# run the target over. - -# All phony targets should be declared as dependencies of .PHONY, even if they -# do not have "($STAMP_DIR)/"-prefixed counterparts. - -# Define a harmless default rule to keep things from going nuts by accident. -.PHONY: default -default: - -# Set up the $(STAMP_DIR) directory. -.PHONY: stampdir -stampdir_targets+=stampdir -stampdir: $(STAMP_DIR)/stampdir -$(STAMP_DIR)/stampdir: - mkdir $(STAMP_DIR) - >$@ - -# Set up the package build directory as quilt expects to find it. -.PHONY: prepare -stampdir_targets+=prepare -prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts - >$@ - -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir - mkdir -p $(STAMP_DIR)/log - -# Apply all patches to the upstream source. -.PHONY: patch -stampdir_targets+=patch -patch: $(STAMP_DIR)/patch -$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare - if ! [ `which quilt` ]; then \ - echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ - exit 1; \ - fi; \ - if $(QUILT) next >/dev/null 2>&1; then \ - echo -n "Applying patches..."; \ - if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ - cat $(STAMP_DIR)/log/patch; \ - echo "successful."; \ - else \ - cat $(STAMP_DIR)/log/patch; \ - echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ - exit 1; \ - fi; \ - else \ - echo "No patches to apply"; \ - fi; \ - >$@ - -# Revert all patches to the upstream source. -.PHONY: unpatch -unpatch: $(STAMP_DIR)/log - rm -f $(STAMP_DIR)/patch - @echo -n "Unapplying patches..."; \ - if $(QUILT) applied >/dev/null 2>/dev/null; then \ - if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ - cat $(STAMP_DIR)/log/unpatch; \ - echo "successful."; \ - else \ - cat $(STAMP_DIR)/log/unpatch; \ - echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ - exit 1; \ - fi; \ - else \ - echo "nothing to do."; \ - fi - -# Clean the generated maintainer scripts. -.PHONY: cleanscripts -cleanscripts: - rm -f $(STAMP_DIR)/genscripts - rm -f debian/*.config \ - debian/*.postinst \ - debian/*.postrm \ - debian/*.preinst \ - debian/*.prerm - -# Clean the package build tree. -.PHONY: xsfclean -xsfclean: cleanscripts unpatch - dh_testdir - rm -rf .pc - rm -rf $(STAMP_DIR) - dh_clean - -# Remove files from the upstream source tree that we don't need, or which have -# licensing problems. It must be run before creating the .orig.tar.gz. -# -# Note: This rule is for Debian package maintainers' convenience, and is not -# needed for conventional build scenarios. -.PHONY: prune-upstream-tree -prune-upstream-tree: - # Ensure we're in the correct directory. - dh_testdir - grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf - -# Verify that there are no offsets or fuzz in the patches we apply. -# -# Note: This rule is for Debian package maintainers' convenience, and is not -# needed for conventional build scenarios. -.PHONY: patch-audit -patch-audit: prepare unpatch - @echo -n "Auditing patches..."; \ - >$(STAMP_DIR)/log/patch; \ - FUZZY=; \ - while [ -n "$$($(QUILT) next)" ]; do \ - RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\ - case "$$RESULT" in \ - succeeded) \ - echo "fuzzy patch: $$($(QUILT) top)" \ - | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \ - FUZZY=yes; \ - ;; \ - FAILED) \ - echo "broken patch: $$($(QUILT) next)" \ - | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \ - exit 1; \ - ;; \ - esac; \ - done; \ - if [ -n "$$FUZZY" ]; then \ - echo "there were fuzzy patches; please fix."; \ - exit 1; \ - else \ - echo "done."; \ - fi - -# Generate the maintainer scripts. -.PHONY: genscripts -stampdir_targets+=genscripts -genscripts: $(STAMP_DIR)/genscripts -$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir - for FILE in debian/*.config.in \ - debian/*.postinst.in \ - debian/*.postrm.in \ - debian/*.preinst.in \ - debian/*.prerm.in; do \ - if [ -e "$$FILE" ]; then \ - MAINTSCRIPT=$$(echo $$FILE | sed 's/.in$$//'); \ - sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' <$$FILE \ - | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >$$MAINTSCRIPT.tmp; \ - cat debian/xsfbs/xsfbs.sh >>$$MAINTSCRIPT.tmp; \ - sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' <$$FILE \ - | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \ - sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \ - -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \ - <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \ - rm $$MAINTSCRIPT.tmp; \ - fi; \ - done - # Validate syntax of generated shell scripts. - #sh debian/scripts/validate-posix-sh debian/*.config \ - # debian/*.postinst \ - # debian/*.postrm \ - # debian/*.preinst \ - # debian/*.prerm - >$@ - -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) -VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) -INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) -ifeq ($(PACKAGE),) -PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) -endif - -.PHONY: serverabi -serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed - @exit 1 -else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars - echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars - echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars -endif - -# vim:set noet ai sts=8 sw=8 tw=0: diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh deleted file mode 100644 index 813fd8d..0000000 --- a/debian/xsfbs/xsfbs.sh +++ /dev/null @@ -1,622 +0,0 @@ -# This is the X Strike Force shell library for X Window System package -# maintainer scripts. It serves to define shell functions commonly used by -# such packages, and performs some error checking necessary for proper operation -# of those functions. By itself, it does not "do" much; the maintainer scripts -# invoke the functions defined here to accomplish package installation and -# removal tasks. - -# If you are reading this within a Debian package maintainer script (e.g., -# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can -# skip past this library by scanning forward in this file to the string -# "GOBSTOPPER". - -SOURCE_VERSION=@SOURCE_VERSION@ -OFFICIAL_BUILD=@OFFICIAL_BUILD@ - -# Use special abnormal exit codes so that problems with this library are more -# easily tracked down. -SHELL_LIB_INTERNAL_ERROR=86 -SHELL_LIB_THROWN_ERROR=74 -SHELL_LIB_USAGE_ERROR=99 - -# old -> new variable names -if [ -z "$DEBUG_XORG_PACKAGE" ] && [ -n "$DEBUG_XFREE86_PACKAGE" ]; then - DEBUG_XORG_PACKAGE="$DEBUG_XFREE86_PACKAGE" -fi -if [ -z "$DEBUG_XORG_DEBCONF" ] && [ -n "$DEBUG_XFREE86_DEBCONF" ]; then - DEBUG_XORG_DEBCONF="$DEBUG_XFREE86_DEBCONF" -fi - -# initial sanity checks -if [ -z "$THIS_PACKAGE" ]; then - cat >&2 <<EOF -Error: package maintainer script attempted to use shell library without -definining \$THIS_PACKAGE shell variable. Please report the package name, -version, and the text of this error message to the Debian Bug Tracking System. -Visit <http://www.debian.org/Bugs/Reporting> on the World Wide Web for -instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the -"doc-debian" package, or install the "reportbug" package and use the command of -the same name to file a report against version $SOURCE_VERSION of this package. -EOF - exit $SHELL_LIB_USAGE_ERROR -fi - -if [ -z "$THIS_SCRIPT" ]; then - cat >&2 <<EOF -Error: package maintainer script attempted to use shell library without -definining \$THIS_SCRIPT shell variable. Please report the package name, -version, and the text of this error message to the Debian Bug Tracking System. -Visit <http://www.debian.org/Bugs/Reporting> on the World Wide Web for -instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the -"doc-debian" package, or install the "reportbug" package and use the command of -the same name to file a report against version $SOURCE_VERSION of the -"$THIS_PACKAGE" package. -EOF - exit $SHELL_LIB_USAGE_ERROR -fi - -if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then - RECONFIGURE="true" -else - RECONFIGURE= -fi - -if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then - FIRSTINST="yes" -fi - -if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then - UPGRADE="yes" -fi - -trap "message;\ - message \"Received signal. Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\ - message;\ - exit 1" HUP INT QUIT TERM - -reject_nondigits () { - # syntax: reject_nondigits [ operand ... ] - # - # scan operands (typically shell variables whose values cannot be trusted) for - # characters other than decimal digits and barf if any are found - while [ -n "$1" ]; do - # does the operand contain anything but digits? - if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then - # can't use die(), because it wraps message() which wraps this function - echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \ - "possibly malicious garbage \"$1\"" >&2 - exit $SHELL_LIB_THROWN_ERROR - fi - shift - done -} - -reject_unlikely_path_chars () { - # syntax: reject_unlikely_path_chars [ operand ... ] - # - # scan operands (typically shell variables whose values cannot be trusted) for - # characters unlikely to be seen in a path and which the shell might - # interpret and barf if any are found - while [ -n "$1" ]; do - # does the operand contain any funny characters? - if expr "$1" : '.*[!$&()*;<>?|].*' > /dev/null 2>&1; then - # can't use die(), because I want to avoid forward references - echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_unlikely_path_chars()" \ - "encountered possibly malicious garbage \"$1\"" >&2 - exit $SHELL_LIB_THROWN_ERROR - fi - shift - done -} - -# Query the terminal to establish a default number of columns to use for -# displaying messages to the user. This is used only as a fallback in the -# event the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while -# the script is running, and this cannot, only being calculated once.) -DEFCOLUMNS=$(stty size 2> /dev/null | awk '{print $2}') || true -if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" > /dev/null 2>&1; then - DEFCOLUMNS=80 -fi - -message () { - # pretty-print messages of arbitrary length - reject_nondigits "$COLUMNS" - echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2 -} - -observe () { - # syntax: observe message ... - # - # issue observational message suitable for logging someday when support for - # it exists in dpkg - if [ -n "$DEBUG_XORG_PACKAGE" ]; then - message "$THIS_PACKAGE $THIS_SCRIPT note: $*" - fi -} - -warn () { - # syntax: warn message ... - # - # issue warning message suitable for logging someday when support for - # it exists in dpkg; also send to standard error - message "$THIS_PACKAGE $THIS_SCRIPT warning: $*" -} - -die () { - # syntax: die message ... - # - # exit script with error message - message "$THIS_PACKAGE $THIS_SCRIPT error: $*" - exit $SHELL_LIB_THROWN_ERROR -} - -internal_error () { - # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message - message "internal error: $*" - if [ -n "$OFFICIAL_BUILD" ]; then - message "Please report a bug in the $THIS_SCRIPT script of the" \ - "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ - "Tracking System. Include all messages above that mention the" \ - "$THIS_PACKAGE package. Visit " \ - "<http://www.debian.org/Bugs/Reporting> on the World Wide Web for" \ - "instructions, read the file" \ - "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ - "package, or install the reportbug package and use the command of" \ - "the same name to file a report." - fi - exit $SHELL_LIB_INTERNAL_ERROR -} - -usage_error () { - message "usage error: $*" - message "Please report a bug in the $THIS_SCRIPT script of the" \ - "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \ - "Tracking System. Include all messages above that mention the" \ - "$THIS_PACKAGE package. Visit " \ - "<http://www.debian.org/Bugs/Reporting> on the World Wide Web for" \ - "instructions, read the file" \ - "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \ - "package, or install the reportbug package and use the command of" \ - "the same name to file a report." - exit $SHELL_LIB_USAGE_ERROR -} - -font_update () { - # run $UPDATECMDS in $FONTDIRS - - local dir cmd shortcmd x_font_dir_prefix - - x_font_dir_prefix="/usr/share/fonts/X11" - - if [ -z "$UPDATECMDS" ]; then - usage_error "font_update() called but \$UPDATECMDS not set" - fi - if [ -z "$FONTDIRS" ]; then - usage_error "font_update() called but \$FONTDIRS not set" - fi - - reject_unlikely_path_chars "$UPDATECMDS" - reject_unlikely_path_chars "$FONTDIRS" - - for dir in $FONTDIRS; do - if [ -d "$x_font_dir_prefix/$dir" ]; then - for cmd in $UPDATECMDS; do - if which "$cmd" > /dev/null 2>&1; then - shortcmd=${cmd##*/} - observe "running $shortcmd in $dir font directory" - cmd_opts= - if [ "$shortcmd" = "update-fonts-alias" ]; then - cmd_opts=--x11r7-layout - fi - if [ "$shortcmd" = "update-fonts-dir" ]; then - cmd_opts=--x11r7-layout - fi - if [ "$shortcmd" = "update-fonts-scale" ]; then - cmd_opts=--x11r7-layout - fi - $cmd $cmd_opts $dir || warn "$cmd $cmd_opts $dir" \ - "failed; font directory data may not" \ - "be up to date" - else - warn "$cmd not found; not updating corresponding $dir font" \ - "directory data" - fi - done - else - warn "$dir is not a directory; not updating font directory data" - fi - done -} - -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1pxffa-0008aa...@alioth.debian.org