From f9129c417ff4165ca21f89f46fbadb048fee6545 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Mon, 24 Jun 2013 14:19:26 +0200
Subject: Inserted detection of pango-querymodules-64 in case of 64bit OS

---
 remote/modules/openbox/openbox.build | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'remote/modules')

diff --git a/remote/modules/openbox/openbox.build b/remote/modules/openbox/openbox.build
index 51c6beec..f3ce1448 100644
--- a/remote/modules/openbox/openbox.build
+++ b/remote/modules/openbox/openbox.build
@@ -16,5 +16,15 @@ build() {
 
 post_copy() {
 	[ ! -d "$TARGET_BUILD_DIR/etc/pango" ] && mkdir -p "$TARGET_BUILD_DIR/etc/pango"
-	pango-querymodules > "$TARGET_BUILD_DIR/etc/pango/pango.modules"
+
+	# little Workaround, as under e.g. 64bit Suse the binary is called
+	# pango-querymodules-64, not pango-querymodules.
+	which pango-querymodules 2>/dev/null 1>&2
+	ERR=$?
+	if [[ "$ERR" -ne 0 ]]; then
+		PANGO_QUERYMODULES_ARCH=pango-querymodules-64
+	else
+		PANGO_QUERYMODULES_ARCH=pango-querymodules
+	fi
+	$PANGO_QUERYMODULES_ARCH > "$TARGET_BUILD_DIR/etc/pango/pango.modules"
 }
-- 
cgit v1.2.3-55-g7522


From b6422953a5bfee73860a1f698df3ee72bd062ea7 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Mon, 24 Jun 2013 18:22:03 +0200
Subject: Some glibc-libs (libnss_compat, libbnss_db, libnss_dns, libnss_files,
 libnss_nis) pushed for openSuse64bit

---
 remote/modules/pam/pam.conf.zypper | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'remote/modules')

diff --git a/remote/modules/pam/pam.conf.zypper b/remote/modules/pam/pam.conf.zypper
index 48dc1d52..403cd59f 100644
--- a/remote/modules/pam/pam.conf.zypper
+++ b/remote/modules/pam/pam.conf.zypper
@@ -7,6 +7,7 @@ REQUIRED_INSTALLED_PACKAGES="
 	libopenssl-devel
 	openldap2-client
 	nfsidmap
+	glibc
 "
 REQUIRED_CONTENT_PACKAGES="
 	pam_ldap
@@ -17,12 +18,25 @@ REQUIRED_CONTENT_PACKAGES="
 	nss-mdns
 	openldap2-client
 	nfsidmap
+	glibc
 "
 REQUIRED_BINARIES="
 	sslconnect
 	ldapsearch
 	mkhomedir_helper
 "
+REQUIRED_LIBRARIES="
+        nsswitch
+        static
+        umich_ldap
+        libnfsidmap
+	libnss_compat
+	libnss_db
+	libnss_dns
+	libnss_files
+	libnss_nis
+"
+
 REQUIRED_DIRECTORIES="
 	/$LIB64
 	/usr/$LIB64
-- 
cgit v1.2.3-55-g7522


From e6266493283223db1f4eb0263e38c2273689d21a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 24 Jun 2013 18:46:45 +0200
Subject: [pam] Remove required files which cannot be found

---
 remote/modules/pam/pam.conf | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'remote/modules')

diff --git a/remote/modules/pam/pam.conf b/remote/modules/pam/pam.conf
index e5bd35c6..a3399190 100644
--- a/remote/modules/pam/pam.conf
+++ b/remote/modules/pam/pam.conf
@@ -30,12 +30,6 @@ REQUIRED_BINARIES="
 	rpc.gssd
 	rpc.idmapd
 	sslconnect
-	mount.crypt
-	umount.crypt 
-	mount.crypt_LUKS
-	umount.crypt_LUKS
-	mount.crypto_LUKS
-	umount.crypto_LUKS
 	ldapsearch
 "
 REQUIRED_LIBRARIES="
-- 
cgit v1.2.3-55-g7522


From 987b5417fea181f2fe02cdc198850fe36076c919 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Tue, 25 Jun 2013 14:20:18 +0200
Subject: Better detection of pango-querymodules/pango-querymodules-64 in case
 of 64bit OS

---
 remote/modules/openbox/openbox.build | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'remote/modules')

diff --git a/remote/modules/openbox/openbox.build b/remote/modules/openbox/openbox.build
index f3ce1448..0cd6aaad 100644
--- a/remote/modules/openbox/openbox.build
+++ b/remote/modules/openbox/openbox.build
@@ -21,10 +21,16 @@ post_copy() {
 	# pango-querymodules-64, not pango-querymodules.
 	which pango-querymodules 2>/dev/null 1>&2
 	ERR=$?
-	if [[ "$ERR" -ne 0 ]]; then
-		PANGO_QUERYMODULES_ARCH=pango-querymodules-64
-	else
+	if [[ "$ERR" -eq 0 ]]; then
 		PANGO_QUERYMODULES_ARCH=pango-querymodules
+	else
+		which pango-querymodules-64 2>/dev/null 1>&2
+		ERR=$?
+		if [[ "$ERR" -eq 0 ]]; then
+			PANGO_QUERYMODULES_ARCH=pango-querymodules-64
+		else
+			perror "Could not find either pango-querymodules or pango-querymodules-64!"
+		fi
 	fi
 	$PANGO_QUERYMODULES_ARCH > "$TARGET_BUILD_DIR/etc/pango/pango.modules"
 }
-- 
cgit v1.2.3-55-g7522


From 63324b11b7df4d47f8de0322f891344635905952 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Wed, 26 Jun 2013 16:52:44 +0200
Subject: Library paths changed to reflect openSuse 64bit ($LIB64)

---
 remote/modules/xorg/xorg.conf.zypper | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'remote/modules')

diff --git a/remote/modules/xorg/xorg.conf.zypper b/remote/modules/xorg/xorg.conf.zypper
index 9f7d69e7..4041f4bd 100644
--- a/remote/modules/xorg/xorg.conf.zypper
+++ b/remote/modules/xorg/xorg.conf.zypper
@@ -1,3 +1,4 @@
+# xkbutils, xkbprint, setxkbmap, xkbevd for 64-bit openSuse
 REQUIRED_CONTENT_PACKAGES="
 			xorg-x11
 			xorg-x11-server
@@ -27,6 +28,10 @@ REQUIRED_CONTENT_PACKAGES="
 			libxcb-glx0
 			kdm-branding-openSUSE
 			Mesa
+			xkbutils
+			xkbprint
+			setxkbmap
+			xkbevd
 "
 REQUIRED_LIBRARIES="
 	libI810XvMC
@@ -50,7 +55,7 @@ REQUIRED_BINARIES="	Xorg
 			vmmouse_detect"
 REQUIRED_DIRECTORIES="
 	/usr/lib/udev
-	/usr/lib/xorg
+	/usr/$LIB64/xorg
 	/usr/bin
 	/usr/share/X11
 	/usr/share/fonts
-- 
cgit v1.2.3-55-g7522