added some optional proprietary packages/ repositories and hooks

27 files changed, 157 insertions, 32 deletions

diff --git a/config/chroot_local-hooks/00-sources.list b/config/chroot_local-hooks/00-sources.list
index 8f8f2b8..49eaf04 100755
--- a/config/chroot_local-hooks/00-sources.list
+++ b/config/chroot_local-hooks/00-sources.list
@@ -1,5 +1,5 @@
 #!/bin/sh
-[ -f /root/build.conf ] && . /root/build.conf
+for file in /root/config/*; do [ -r $file ] && . $file; done
 
 sed -i -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" /etc/apt/sources.list
 
diff --git a/config/chroot_local-hooks/05-ndis b/config/chroot_local-hooks/05-ndis
index 7b89a97..94b5534 100755
--- a/config/chroot_local-hooks/05-ndis
+++ b/config/chroot_local-hooks/05-ndis
@@ -1,6 +1,6 @@
 #!/bin/sh
 [ -x /usr/sbin/ndiswrapper ] || exit 0
-[ -f /root/build.conf ] && . /root/build.conf
+for file in /root/config/*; do [ -r $file ] && . $file; done
 if [ "$LB_ARCHITECTURE" = "amd64" ]; then
 wget -qO- http://kanotix.com/files/fix/ndiswrapper/ndiswrapper64-fwlan64.tar.gz|tar zxC /etc
 else
diff --git a/config/chroot_local-hooks/XX_debpool b/config/chroot_local-hooks/XX_debpool
index cecdb95..f231f54 100755
--- a/config/chroot_local-hooks/XX_debpool
+++ b/config/chroot_local-hooks/XX_debpool
@@ -1,7 +1,7 @@
 #!/bin/bash
 [ ! -e /live/packages ] && exit 0
 
-[ -f /root/build.conf ] && . /root/build.conf
+for file in /root/config/*; do [ -r $file ] && . $file; done
 [ -z "$LB_ARCHITECTURE" ] && LB_ARCHITECTURE=amd64
 [ -z "$LB_DISTRIBUTION" ] && LB_DISTRIBUTION=wheezy
 
diff --git a/config/chroot_local-hooks/ZZ_cleanup_build.conf b/config/chroot_local-hooks/ZZ_cleanup_build.conf
deleted file mode 100755
index 80e90ab..0000000
--- a/config/chroot_local-hooks/ZZ_cleanup_build.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-rm -f /root/build.conf
-
diff --git a/config/chroot_local-hooks/acrobat b/config/chroot_local-hooks/acrobat
new file mode 100755
index 0000000..7415a5e
--- /dev/null
+++ b/config/chroot_local-hooks/acrobat
@@ -0,0 +1,9 @@
+#!/bin/bash
+for file in /root/config/*; do [ -r $file ] && . $file; done
+echo "$LB_PACKAGE_LISTS" | grep -qw acrobat || exit 0
+TMP=$(mktemp -d /tmp/acrobat.XXXXXX)
+wget -P $TMP http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.2/deu/AdbeRdr9.4.2-1_i386linux_deu.deb
+#wget -P $TMP http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.2/enu/AdbeRdr9.4.2-1_i386linux_enu.deb
+http://ardownload.adobe.com/pub/adobe/reader/unix/9.x/9.4.2/enu/AdbeRdr9.4.2-1_i386linux_enu.deb
+dpkg --force-architecture -i $TMP/*.deb
+rm -rf $TMP
diff --git a/config/chroot_local-hooks/chrome b/config/chroot_local-hooks/chrome
new file mode 100755
index 0000000..dc44494
--- /dev/null
+++ b/config/chroot_local-hooks/chrome
@@ -0,0 +1,10 @@
+#!/bin/bash
+[ -x /usr/bin/google-chrome ] || exit 0
+mkdir -p /etc/skel/.config/google-chrome/Default
+cat <<"EOF" >/etc/skel/.config/google-chrome/Default/Preferences
+{
+   "browser": {
+      "custom_chrome_frame": true
+   }
+}
+EOF
diff --git a/config/chroot_local-hooks/spotify b/config/chroot_local-hooks/spotify
new file mode 100755
index 0000000..ad4de6e
--- /dev/null
+++ b/config/chroot_local-hooks/spotify
@@ -0,0 +1,11 @@
+#!/bin/bash
+for file in /root/config/*; do [ -r $file ] && . $file; done
+echo "$LB_PACKAGE_LISTS" | grep -qw spotify || exit 0
+TMP=$(mktemp -d /tmp/spotify.XXXXXX)
+# install libssl0.9.8 from squeeze
+wget -qkO $TMP/index http://snapshot.debian.org/package/openssl098/0.9.8o-7/
+grep -oe 'http[^"]*libssl0.9.8_[^"]*_'"$LB_ARCHITECTURE.deb" $TMP/index | head -n1 | wget -i- -P $TMP
+dpkg -i $TMP/*.deb
+apt-get update
+DEBIAN_FRONTEND=noninteractive apt-get -f -y install spotify-client
+rm -rf $TMP
diff --git a/config/chroot_local-hooks/teamviewer b/config/chroot_local-hooks/teamviewer
new file mode 100755
index 0000000..c6ce343
--- /dev/null
+++ b/config/chroot_local-hooks/teamviewer
@@ -0,0 +1,24 @@
+#!/bin/bash
+for file in /root/config/*; do [ -r $file ] && . $file; done
+echo "$LB_PACKAGE_LISTS" | grep -qw teamviewer || exit 0
+TMP=$(mktemp -d /tmp/teamviewer.XXXXXX)
+if [ "$LB_ARCHITECTURE" = "amd64" ]; then
+wget -NP $TMP "http://www.teamviewer.com/download/teamviewer_linux_x64.deb"
+else
+wget -NP $TMP "http://www.teamviewer.com/download/teamviewer_linux.deb"
+fi
+dpkg -i $TMP/*.deb
+apt-get update
+DEBIAN_FRONTEND=noninteractive apt-get -f -y install
+rm -rf $TMP
+/etc/init.d/teamviewerd stop || :
+killall teamviewerd || :
+while sleep 1; do pidof teamviewerd >/dev/null || break; done
+cat <<"EOF" >/opt/teamviewer8/config/global.conf
+TeamViewer Global Settings
+# It is not recommended to edit this file manually
+
+
+[int32] EulaAccepted = 1
+[int32] EulaAcceptedRevision = 5
+EOF
diff --git a/config/chroot_local-hooks/virtualbox b/config/chroot_local-hooks/virtualbox
new file mode 100755
index 0000000..d468526
--- /dev/null
+++ b/config/chroot_local-hooks/virtualbox
@@ -0,0 +1,4 @@
+#!/bin/bash
+[ -x /etc/init.d/vboxdrv ] || exit 0
+export KERN_DIR="$(ls -d /usr/src/linux-headers-* | head -n1)"
+/etc/init.d/vboxdrv setup 
diff --git a/config/lists/acrobat b/config/lists/acrobat
new file mode 100644
index 0000000..0d8ed06
--- /dev/null
+++ b/config/lists/acrobat
@@ -0,0 +1 @@
+# dummy list that is only used to enable a chroot-hook
diff --git a/config/lists/dropbox b/config/lists/dropbox
new file mode 100644
index 0000000..c9fe58e
--- /dev/null
+++ b/config/lists/dropbox
@@ -0,0 +1 @@
+dropbox
diff --git a/config/lists/hangouts b/config/lists/hangouts
new file mode 100644
index 0000000..d8f506e
--- /dev/null
+++ b/config/lists/hangouts
@@ -0,0 +1 @@
+google-talkplugin
diff --git a/config/lists/kanotix-kde-base b/config/lists/kanotix-kde-base
index db29fc3..d89bd53 100644
--- a/config/lists/kanotix-kde-base
+++ b/config/lists/kanotix-kde-base
@@ -28,15 +28,6 @@ gstreamer0.10-pulseaudio
 phonon-backend-gstreamer
 #endif
 
-# skype
-pidgin-skype
-#if DISTRIBUTION squeeze
-#include <squeeze-skype>
-#endif
-#if DISTRIBUTION wheezy
-#include <wheezy-skype>
-#endif
-
 # other hardware
 modemmanager
 
diff --git a/config/lists/kanotix-kde-master b/config/lists/kanotix-kde-master
index e89262a..92e2309 100644
--- a/config/lists/kanotix-kde-master
+++ b/config/lists/kanotix-kde-master
@@ -23,6 +23,9 @@ gwenview
 openvpn
 network-manager-openvpn
 
+# skype
+#include <skype>
+
 # kde
 khelpcenter4
 
diff --git a/config/lists/kanotix-lxde-master b/config/lists/kanotix-lxde-master
index 2cc616f..9f633de 100644
--- a/config/lists/kanotix-lxde-master
+++ b/config/lists/kanotix-lxde-master
@@ -42,12 +42,7 @@ ncdu
 xzdec
 
 # skype
-#if DISTRIBUTION squeeze
-#include <squeeze-skype>
-#endif
-#if DISTRIBUTION wheezy
-#include <wheezy-skype>
-#endif
+#include <skype>
 
 # games
 mahjongg
diff --git a/config/lists/wheezy-skype b/config/lists/skype
index 08913ca..bf254a4 100644
--- a/config/lists/wheezy-skype
+++ b/config/lists/skype
@@ -1,5 +1,7 @@
 # skype for wheezy (multiarch)
 
+pidgin-skype
+
 #if ARCHITECTURE i386
 skype
 #endif
diff --git a/config/lists/spotify b/config/lists/spotify
new file mode 100644
index 0000000..0d8ed06
--- /dev/null
+++ b/config/lists/spotify
@@ -0,0 +1 @@
+# dummy list that is only used to enable a chroot-hook
diff --git a/config/lists/squeeze-skype b/config/lists/squeeze-skype
deleted file mode 100644
index b6b92bb..0000000
--- a/config/lists/squeeze-skype
+++ /dev/null
@@ -1,11 +0,0 @@
-# skype for squeeze
-skype
-
-#if ARCHITECTURE i386
-libv4l-0
-#endif
-
-#if ARCHITECTURE amd64
-lib32v4l-0
-#endif
-
diff --git a/config/lists/teamviewer b/config/lists/teamviewer
new file mode 100644
index 0000000..0d8ed06
--- /dev/null
+++ b/config/lists/teamviewer
@@ -0,0 +1 @@
+# dummy list that is only used to enable a chroot-hook
diff --git a/config/lists/virtualbox b/config/lists/virtualbox
new file mode 100644
index 0000000..4d9adfb
--- /dev/null
+++ b/config/lists/virtualbox
@@ -0,0 +1 @@
+virtualbox-4.2
diff --git a/config/lists/xbmc b/config/lists/xbmc
new file mode 100644
index 0000000..9ddd246
--- /dev/null
+++ b/config/lists/xbmc
@@ -0,0 +1 @@
+xbmc
diff --git a/config/repositories/dropbox b/config/repositories/dropbox
new file mode 100644
index 0000000..c17f8d1
--- /dev/null
+++ b/config/repositories/dropbox
@@ -0,0 +1,2 @@
+# Dropbox
+deb http://linux.dropbox.com/debian wheezy main
diff --git a/config/repositories/dropbox.gpg b/config/repositories/dropbox.gpg
new file mode 100644
index 0000000..fb634f4
--- /dev/null
+++ b/config/repositories/dropbox.gpg
@@ -0,0 +1,27 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+mQENBEt0ibEBCACv4hZRPqwtpU6z8+BB5YZU1a3yjEvg2W68+a6hEwxtCa2U++4d
+zQ+7EqaUq5ybQnwtbDdpFpsOi9x31J+PCpufPUfIG694/0rlEpmzl2GWzY8NqfdB
+FGGm/SPSSwvKbeNcFMRLu5neo7W9kwvfMbGjHmvUbzBUVpCVKD0OEEf1q/Ii0Qce
+kx9CMoLvWq7ZwNHEbNnij7ecnvwNlE2MxNsOSJj+hwZGK+tM19kuYGSKw4b5mR8I
+yThlgiSLIfpSBh1n2KX+TDdk9GR+57TYvlRu6nTPu98P05IlrrCP+KF0hYZYOaMv
+Qs9Rmc09tc/eoQlN0kkaBWw9Rv/dvLVc0aUXABEBAAG0MURyb3Bib3ggQXV0b21h
+dGljIFNpZ25pbmcgS2V5IDxsaW51eEBkcm9wYm94LmNvbT6IXgQQEQgABgUCS+lk
+lQAKCRD8kg8z/8ZzxODyAP49juQqN9TnciJEOFQAy+9W5AFl6DA272Ffn4MXxtnI
+WgEAltr4KGWLsyGnjuDtMAuj1tYXM5/swJY3kozxCSEjVamJARwEEAECAAYFAk6l
+vwUACgkQwF8Jr9F5j5dtlgf/RN9SiK4z8Ae8Mbmp+LB8ruYLdYV2K1d1deOqeKFQ
+JYTNQPgpREx/5JDvb+0lGPvym8d56mfs1SzfXEQT2ldFGoQJJX0x2r2L4g9iSBi6
+zijXFFktuVKXt2laqlQWM09SmKobiAWmG2ZtatfvTw2aHq5rdMDc2C1HiqPxD5rM
+CCqWmLk0SHuMiqo9HHqGYgoTHV1Pt8QbAjnzI4gBEZJZxyvwgCoelwTx/6fX5I2k
+eiCRrFKw2pmP04bbX/3HOk7YdqSR5mjUDbh/58DcyHKtwnq7rT+ucHlbvF9F7xa2
+mACv4JfcQbaDTrwLdSwmW3NB7x8cubLAi2pvTKhaW9sMtIkBNgQTAQIAIAUCS3SJ
+sQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEPyRizNQRJEuL/MH/AyxwRrX
+mtL7SYimw5GScPuRrArDJ1r4sd21lzSEP/vdAYUg1HY/bdROiX9HifIAUS5g2wXQ
+LggAPrLikvj15nvYiS0+uvgfbtD15eE1l8mEPsG9AwHHvkvQXmBJDC4LsZ1g2XBK
+UIPQACFBuLvRUHDN4iAhMGQxBwkiEu+WVij8AoPsa/2G7LhEtoihJ6h+n7ZDTNQc
+0+X/vPKY6q77k7F7WW24lP+R3/yFT43lY3ElNJo4rSwXX/BYUzqtZ3pdBQ/TdXI2
+iwB69fm0Gj76IPVZjb+UVVQmS8C+B7ZYWTdzq0DBlP+0rGykXLgz+01sMp7K+vrz
+lconD16LoZw4YcM=
+=U3vA
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/config/repositories/hangouts b/config/repositories/hangouts
new file mode 100644
index 0000000..c75a146
--- /dev/null
+++ b/config/repositories/hangouts
@@ -0,0 +1,2 @@
+# Google Talkplugin
+deb http://dl.google.com/linux/talkplugin/deb/ stable main
diff --git a/config/repositories/hangouts.gpg b/config/repositories/hangouts.gpg
new file mode 100644
index 0000000..d304031
--- /dev/null
+++ b/config/repositories/hangouts.gpg
@@ -0,0 +1,31 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+mQGiBEXwb0YRBADQva2NLpYXxgjNkbuP0LnPoEXruGmvi3XMIxjEUFuGNCP4Rj/a
+kv2E5VixBP1vcQFDRJ+p1puh8NU0XERlhpyZrVMzzS/RdWdyXf7E5S8oqNXsoD1z
+fvmI+i9b2EhHAA19Kgw7ifV8vMa4tkwslEmcTiwiw8lyUl28Wh4Et8SxzwCggDcA
+feGqtn3PP5YAdD0km4S4XeMEAJjlrqPoPv2Gf//tfznY2UyS9PUqFCPLHgFLe80u
+QhI2U5jt6jUKN4fHauvR6z3seSAsh1YyzyZCKxJFEKXCCqnrFSoh4WSJsbFNc4PN
+b0V0SqiTCkWADZyLT5wll8sWuQ5ylTf3z1ENoHf+G3um3/wk/+xmEHvj9HCTBEXP
+78X0A/0Tqlhc2RBnEf+AqxWvM8sk8LzJI/XGjwBvKfXe+l3rnSR2kEAvGzj5Sg0X
+4XmfTg4Jl8BNjWyvm2Wmjfet41LPmYJKsux3g0b8yzQxeOA4pQKKAU3Z4+rgzGmf
+HdwCG5MNT2A5XxD/eDd+L4fRx0HbFkIQoAi1J3YWQSiTk15fw7RMR29vZ2xlLCBJ
+bmMuIExpbnV4IFBhY2thZ2UgU2lnbmluZyBLZXkgPGxpbnV4LXBhY2thZ2VzLWtl
+eW1hc3RlckBnb29nbGUuY29tPohjBBMRAgAjAhsDBgsJCAcDAgQVAggDBBYCAwEC
+HgECF4AFAkYVdn8CGQEACgkQoECDD3+sWZHKSgCfdq3HtNYJLv+XZleb6HN4zOcF
+AJEAniSFbuv8V5FSHxeRimHx25671az+uQINBEXwb0sQCACuA8HT2nr+FM5y/kzI
+A51ZcC46KFtIDgjQJ31Q3OrkYP8LbxOpKMRIzvOZrsjOlFmDVqitiVc7qj3lYp6U
+rgNVaFv6Qu4bo2/ctjNHDDBdv6nufmusJUWq/9TwieepM/cwnXd+HMxu1XBKRVk9
+XyAZ9SvfcW4EtxVgysI+XlptKFa5JCqFM3qJllVohMmr7lMwO8+sxTWTXqxsptJo
+pZeKz+UBEEqPyw7CUIVYGC9ENEtIMFvAvPqnhj1GS96REMpry+5s9WKuLEaclWpd
+K3krttbDlY1NaeQUCRvBYZ8iAG9YSLHUHMTuI2oea07Rh4dtIAqPwAX8xn36JAYG
+2vgLAAMFB/wKqaycjWAZwIe98Yt0qHsdkpmIbarD9fGiA6kfkK/UxjL/k7tmS4Vm
+CljrrDZkPSQ/19mpdRcGXtb0NI9+nyM5trweTvtPw+HPkDiJlTaiCcx+izg79Fj9
+KcofuNb3lPdXZb9tzf5oDnmm/B+4vkeTuEZJ//IFty8cmvCpzvY+DAz1Vo9rA+Zn
+cpWY1n6z6oSS9AsyT/IFlWWBZZ17SpMHu+h4Bxy62+AbPHKGSujEGQhWq8ZRoJAT
+G0KSObnmZ7FwFWu1e9XFoUCt0bSjiJWTIyaObMrWu/LvJ3e9I87HseSJStfw6fki
+5og9qFEkMrIrBCp3QGuQWBq/rTdMuwNFiEkEGBECAAkFAkXwb0sCGwwACgkQoECD
+D3+sWZF/WACfeNAu1/1hwZtUo1bR+MWiCjpvHtwAnA1R3IHqFLQ2X3xJ40XPuAyY
+/FJG
+=Quqp
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/config/repositories/spotify b/config/repositories/spotify
new file mode 100644
index 0000000..1f48bcd
--- /dev/null
+++ b/config/repositories/spotify
@@ -0,0 +1,2 @@
+# Spotify
+deb http://repository.spotify.com stable non-free
diff --git a/config/repositories/spotify.gpg b/config/repositories/spotify.gpg
new file mode 100644
index 0000000..141c93d
--- /dev/null
+++ b/config/repositories/spotify.gpg
@@ -0,0 +1,19 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.10 (GNU/Linux)
+
+mQENBE/oRU4BCAChZc9J1BVgfwFUuD607/6pQcRSt5AlSEyY9zIrHG1CnEg5JZB7
++JDv4MibMSg+aM+VDsA7pyNx3wozJvv6+eWoz2tVau9GxGv3tJmu5qsJc6+lTnEX
+LC7Mnd8YoxEo8Exg6lrLK53HpD2YlQIDnV5d4qlYZZ5KO4C25c8Ou5TaOo0jO8eD
++TnsQizWWEcCi9xqLUzB287R1GThh1YAcFL8UZ1S4J4ptZskfvjhB77TJf2A1a7y
+BNnuWD2nw5Bd0MZDl/JBbj/7w960u4iErdU0arQrZY4scpQaz15XIcgtyvOWBoZ0
+ySwu26NYtQOUXXkNZ1QZQ6WcVCZEctT8MXwxABEBAAG0PlNwb3RpZnkgUHVibGlj
+IFJlcG9zaXRvcnkgU2lnbmluZyBLZXkgPG9wZXJhdGlvbnNAc3BvdGlmeS5jb20+
+iQE8BBMBAgAmBQJP6EVOAhsDBQkFo5qABgsJCAcDAgQVAggDBBYCAwECHgECF4AA
+CgkQCCzO35RVj1k0tQf/by3EXd/PiQbyCHDeI4THXSJRknoy99xAhyQzszm8OEPm
+vkZwIkfaKfX8AtCkFWXo7HkLp9jTnh5yLf4vHxC2wTvrTV55PmzlDlkU+ypAtn8c
+Wfr3jP+LodXodNXtIDuvsffWk66HYZyRZQL0dhiojR6g66nC/L6CFv772t/fhfkv
++V0mKsYQppzR2V9kSMs0NReaSUUHHkT8JDuPttvDVJREhG67SLt7+Jz+moveJf4J
+bhdb+lC2OnxVLKe4KwNCsSwZPfjG5sHL2x6UVQOXhELknFbno2+qJd/Ux24GTnBb
+T46ERSuS8ElLPgOo61NYoY8QO4UusGWBD5ciFJws/g==
+=HvND
+-----END PGP PUBLIC KEY BLOCK-----