Merge branch 'master' into dlack.

11 files changed, 29 insertions, 11 deletions

diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 260359d..998cd4d 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -172,7 +172,7 @@ SEQ_KDE4BASE="pkglist:${MINLIST},xbase,xapbase,kde4base"
 
 # List of Slackware package series with Plasma5 instead of KDE 4 (full install):
 # - each will become a squashfs module:
-SEQ_PLASMA5="tagfile:a,ap,d,e,f,k,l,n,t,tcl,x,xap,xfce,y pkglist:slackextra,kde4plasma5,plasma5,alien local:slackpkg+"
+SEQ_PLASMA5="tagfile:a,ap,d,e,f,k,l,n,t,tcl,x,xap,xfce,y pkglist:slackextra,kde4plasma5,plasma5,alien,alienrest local:slackpkg+"
 
 # List of Slackware package series with MSB instead of KDE 4 (full install):
 # - each will become a squashfs module:
diff --git a/pkglists/alien.conf b/pkglists/alien.conf
index 4b527b2..a81a7c2 100644
--- a/pkglists/alien.conf
+++ b/pkglists/alien.conf
@@ -2,7 +2,7 @@
 # or empty directory, then the content of 'SL_REPO_URL' will be rsync-ed
 # to the local directory 'SL_REPO'.
 SL_REPO_URL="rsync://slackware.uk/people/alien/sbrepos/${SL_VERSION}/${SL_ARCH}"
-SL_REPO="/mnt/auto/sox/sbrepos/${SL_VERSION}/${SL_ARCH}"
+SL_REPO="/var/cache/liveslak/sbrepos/${SL_VERSION}/${SL_ARCH}"
 
 # Package root directory:
 SL_PKGROOT=${SL_REPO}
diff --git a/pkglists/alien.lst b/pkglists/alien.lst
index ff811d9..5ec8412 100644
--- a/pkglists/alien.lst
+++ b/pkglists/alien.lst
@@ -12,7 +12,7 @@ gnome-mplayer
 gst-plugins-ffmpeg0
 gst-plugins-libav
 icedtea-web
-libdvdcss
+keepassx
 libreoffice
 libreoffice-dict-af
 libreoffice-dict-ar
@@ -58,7 +58,7 @@ libreoffice-dict-vi
 libreoffice-dict-zu
 libreoffice-kde-integration
 libstatgrab
-libtinfo
+#libtinfo
 libtorrent-rasterbar
 lumina
 muparser
diff --git a/pkglists/alienrest.conf b/pkglists/alienrest.conf
new file mode 100644
index 0000000..40c3942
--- /dev/null
+++ b/pkglists/alienrest.conf
@@ -0,0 +1,12 @@
+# If 'SL_REPO_URL' is a rsync:// URL and 'SL_REPO' points to a non-existent
+# or empty directory, then the content of 'SL_REPO_URL' will be rsync-ed
+# to the local directory 'SL_REPO'.
+SL_REPO_URL="rsync://slackware.uk/people/alien/restricted_sbrepos/${SL_VERSION}/${SL_ARCH}"
+SL_REPO="/var/cache/liveslak/restricted_sbrepos/${SL_VERSION}/${SL_ARCH}"
+
+# Package root directory:
+SL_PKGROOT=${SL_REPO}
+
+# Patches root directory:
+SL_PATCHROOT=""
+
diff --git a/pkglists/alienrest.lst b/pkglists/alienrest.lst
new file mode 100644
index 0000000..75b065b
--- /dev/null
+++ b/pkglists/alienrest.lst
@@ -0,0 +1,6 @@
+avidemux
+ffmpeg
+handbrake
+lame
+libdvdcss
+vlc
diff --git a/pkglists/cinnamon.conf b/pkglists/cinnamon.conf
index cca639d..5e78bd3 100644
--- a/pkglists/cinnamon.conf
+++ b/pkglists/cinnamon.conf
@@ -3,9 +3,9 @@
 # to the local directory 'SL_REPO'.
 
 #SL_REPO_URL="rsync://slackware.uk/csb/${SL_VERSION}/${SL_ARCH}"
-#SL_REPO="/mnt/auto/sox/ftp/pub/Linux/Slackware/csb/${SL_VERSION}/${SL_ARCH}"
+#SL_REPO="/var/cache/liveslak/csb/${SL_VERSION}/${SL_ARCH}"
 SL_REPO_URL="rsync://slackware.uk/csb/14.2/${SL_ARCH}"
-SL_REPO="/mnt/auto/sox/ftp/pub/Linux/Slackware/csb/14.2/${SL_ARCH}"
+SL_REPO="/var/cache/liveslak/csb/14.2/${SL_ARCH}"
 
 # Package root directory:
 SL_PKGROOT=${SL_REPO}
diff --git a/pkglists/lxqt.conf b/pkglists/lxqt.conf
index 4b527b2..a81a7c2 100644
--- a/pkglists/lxqt.conf
+++ b/pkglists/lxqt.conf
@@ -2,7 +2,7 @@
 # or empty directory, then the content of 'SL_REPO_URL' will be rsync-ed
 # to the local directory 'SL_REPO'.
 SL_REPO_URL="rsync://slackware.uk/people/alien/sbrepos/${SL_VERSION}/${SL_ARCH}"
-SL_REPO="/mnt/auto/sox/sbrepos/${SL_VERSION}/${SL_ARCH}"
+SL_REPO="/var/cache/liveslak/sbrepos/${SL_VERSION}/${SL_ARCH}"
 
 # Package root directory:
 SL_PKGROOT=${SL_REPO}
diff --git a/pkglists/lxqtdeps.conf b/pkglists/lxqtdeps.conf
index 2db46bd..94a0566 100644
--- a/pkglists/lxqtdeps.conf
+++ b/pkglists/lxqtdeps.conf
@@ -2,7 +2,7 @@
 # or empty directory, then the content of 'SL_REPO_URL' will be rsync-ed
 # to the local directory 'SL_REPO'.
 SL_REPO_URL="rsync://slackware.uk/people/alien-kde/${SL_VERSION}/latest/${SL_ARCH}"
-SL_REPO="/mnt/auto/sox/data/slackware/ktown/${SL_VERSION}/latest/${SL_ARCH}"
+SL_REPO="/var/cache/liveslak/ktown/${SL_VERSION}/latest/${SL_ARCH}"
 
 # Package root directory:
 SL_PKGROOT=${SL_REPO}
diff --git a/pkglists/mate.conf b/pkglists/mate.conf
index 1d293c1..a7fb6ce 100644
--- a/pkglists/mate.conf
+++ b/pkglists/mate.conf
@@ -3,7 +3,7 @@
 # to the local directory 'SL_REPO'.
 
 SL_REPO_URL="rsync://slackware.uk/msb/${SL_VERSION}/latest/${SL_ARCH}/"
-SL_REPO="/mnt/auto/sox/ftp/pub/Linux/Slackware/msb/${SL_VERSION}/latest/${SL_ARCH}"
+SL_REPO="/car/cache/liveslak/msb/${SL_VERSION}/latest/${SL_ARCH}"
 
 # Package root directory:
 SL_PKGROOT=${SL_REPO}
diff --git a/pkglists/multilib.conf b/pkglists/multilib.conf
index 1f8d5e6..f9ef635 100644
--- a/pkglists/multilib.conf
+++ b/pkglists/multilib.conf
@@ -2,7 +2,7 @@
 # or empty directory, then the content of 'SL_REPO_URL' will be rsync-ed
 # to the local directory 'SL_REPO'.
 SL_REPO_URL="rsync://slackware.uk/people/alien/multilib/${SL_VERSION}"
-SL_REPO="/mnt/auto/sox/www/sox/slackware/multilib/${SL_VERSION}"
+SL_REPO="/var/cache/liveslak/multilib/${SL_VERSION}"
 
 # Package root directory:
 SL_PKGROOT=${SL_REPO}
diff --git a/pkglists/plasma5.conf b/pkglists/plasma5.conf
index 457ce0b..1ab1a31 100644
--- a/pkglists/plasma5.conf
+++ b/pkglists/plasma5.conf
@@ -5,7 +5,7 @@
 VARIANT=latest
 
 SL_REPO_URL="rsync://slackware.uk/people/alien-kde/${SL_VERSION}/${VARIANT}/${SL_ARCH}"
-SL_REPO="/mnt/auto/sox/data/slackware/ktown/${SL_VERSION}/${VARIANT}/${SL_ARCH}"
+SL_REPO="/var/cache/liveslak/ktown/${SL_VERSION}/${VARIANT}/${SL_ARCH}"
 
 # Package root directory:
 SL_PKGROOT=${SL_REPO}