* xauth: added patch by Claudio Leonel

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7672 33e552b5-05e3-0310-8538-816dae2090ed

5 files changed, 155 insertions, 0 deletions

diff --git a/CREDITS b/CREDITS
index 259c6dd78..d50de96a6 100644
--- a/CREDITS
+++ b/CREDITS
@@ -75,6 +75,10 @@ N: Roland Hostettler
 E: r.hostettler@gmx.ch
 D: Developer
 
+N: Claudio Leonel
+E: cls@elaxys.com.br
+D: Developer
+
 N: Ladislav Michl
 E: ladis@linux-mips.org
 D: Maintainer
diff --git a/ChangeLog b/ChangeLog
index c7f7f7155..90c32b9d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-31 Robert Schwebel <r.schwebel@pengutronix.de>
+
+	* xauth: added patch by Claudio Leonel
+
 2007-12-29 Robert Schwebel <r.schwebel@pengutronix.de>
 
 	* net-snmp: refactored menu entries to use positive logic
diff --git a/rules/xorg-app-xauth.in b/rules/xorg-app-xauth.in
new file mode 100644
index 000000000..250517f30
--- /dev/null
+++ b/rules/xorg-app-xauth.in
@@ -0,0 +1,13 @@
+config XORG_APP_XAUTH
+	bool
+	depends on XORG_APP
+	select XORG_LIB_XAU
+	select XORG_LIB_XEXT
+	select XORG_LIB_XMU
+	select XORG_LIB_X11
+	select XORG_LIB_XDMCP
+	prompt "xorg xauth"
+	help
+	  The xauth program is used to edit and display the authorization
+	  information used in connecting to the X server.
+
diff --git a/rules/xorg-app-xauth.make b/rules/xorg-app-xauth.make
new file mode 100644
index 000000000..4c0bc2290
--- /dev/null
+++ b/rules/xorg-app-xauth.make
@@ -0,0 +1,132 @@
+# -*-makefile-*-
+# $Id: template 6001 2006-08-12 10:15:00Z mkl $
+#
+# Copyright (C) 2007 by cls@elaxys.com.br
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_XORG_APP_XAUTH) += xorg-app-xauth
+
+#
+# Paths and names
+#
+XORG_APP_XAUTH_VERSION	:= 1.0.2
+XORG_APP_XAUTH		:= xauth-$(XORG_APP_XAUTH_VERSION)
+XORG_APP_XAUTH_SUFFIX	:= tar.bz2
+XORG_APP_XAUTH_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_XAUTH).$(XORG_APP_XAUTH_SUFFIX)
+XORG_APP_XAUTH_SOURCE	:= $(SRCDIR)/$(XORG_APP_XAUTH).$(XORG_APP_XAUTH_SUFFIX)
+XORG_APP_XAUTH_DIR	:= $(BUILDDIR)/$(XORG_APP_XAUTH)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+xorg-app-xauth_get: $(STATEDIR)/xorg-app-xauth.get
+
+$(STATEDIR)/xorg-app-xauth.get: $(xorg-app-xauth_get_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+$(XORG_APP_XAUTH_SOURCE):
+	@$(call targetinfo, $@)
+	@$(call get, XORG_APP_XAUTH)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+xorg-app-xauth_extract: $(STATEDIR)/xorg-app-xauth.extract
+
+$(STATEDIR)/xorg-app-xauth.extract: $(xorg-app-xauth_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(XORG_APP_XAUTH_DIR))
+	@$(call extract, XORG_APP_XAUTH)
+	@$(call patchin, XORG_APP_XAUTH)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+xorg-app-xauth_prepare: $(STATEDIR)/xorg-app-xauth.prepare
+
+XORG_APP_XAUTH_PATH	:= PATH=$(CROSS_PATH)
+XORG_APP_XAUTH_ENV 	:= $(CROSS_ENV)
+
+#
+# autoconf
+#
+XORG_APP_XAUTH_AUTOCONF := $(CROSS_AUTOCONF_USR) \
+	--disable-dependency-tracking \
+	--datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR)
+
+$(STATEDIR)/xorg-app-xauth.prepare: $(xorg-app-xauth_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(XORG_APP_XAUTH_DIR)/config.cache)
+	cd $(XORG_APP_XAUTH_DIR) && \
+		$(XORG_APP_XAUTH_PATH) $(XORG_APP_XAUTH_ENV) \
+		./configure $(XORG_APP_XAUTH_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+xorg-app-xauth_compile: $(STATEDIR)/xorg-app-xauth.compile
+
+$(STATEDIR)/xorg-app-xauth.compile: $(xorg-app-xauth_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(XORG_APP_XAUTH_DIR) && $(XORG_APP_XAUTH_PATH) $(MAKE)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+xorg-app-xauth_install: $(STATEDIR)/xorg-app-xauth.install
+
+$(STATEDIR)/xorg-app-xauth.install: $(xorg-app-xauth_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call install, XORG_APP_XAUTH)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+xorg-app-xauth_targetinstall: $(STATEDIR)/xorg-app-xauth.targetinstall
+
+$(STATEDIR)/xorg-app-xauth.targetinstall: $(xorg-app-xauth_targetinstall_deps_default)
+	@$(call targetinfo, $@)
+
+	@$(call install_init, xorg-app-xauth)
+	@$(call install_fixup,xorg-app-xauth,PACKAGE,xorg-app-xauth)
+	@$(call install_fixup,xorg-app-xauth,PRIORITY,optional)
+	@$(call install_fixup,xorg-app-xauth,VERSION,$(XORG_APP_XAUTH_VERSION))
+	@$(call install_fixup,xorg-app-xauth,SECTION,base)
+	@$(call install_fixup,xorg-app-xauth,AUTHOR,"Claudio Leonel <cls\@elaxys.com.br>")
+	@$(call install_fixup,xorg-app-xauth,DEPENDS,)
+	@$(call install_fixup,xorg-app-xauth,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-app-xauth, 0, 0, 0755, $(XORG_APP_XAUTH_DIR)/xauth, /usr/bin/xauth)
+
+	@$(call install_finish,xorg-app-xauth)
+
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+xorg-app-xauth_clean:
+	rm -rf $(STATEDIR)/xorg-app-xauth.*
+	rm -rf $(IMAGEDIR)/xorg-app-xauth_*
+	rm -rf $(XORG_APP_XAUTH_DIR)
+
+# vim: syntax=make
diff --git a/rules/xorg-app.in b/rules/xorg-app.in
index 6ead08c54..b2cb8079d 100644
--- a/rules/xorg-app.in
+++ b/rules/xorg-app.in
@@ -16,3 +16,5 @@ source "rules/xorg-app-xkbcomp.in"
 source "rules/xorg-app-setxkbmap.in"
 source "rules/xorg-app-xset.in"
 source "rules/xorg-app-xrdb.in"
+source "rules/xorg-app-xauth.in"
+