merge with latest dev version

7 files changed, 71 insertions, 0 deletions

diff --git a/core/modules/smbclient/data/etc/tmpfiles.d/ensure-smbconf-exists.conf b/core/modules/smbclient/data/etc/tmpfiles.d/ensure-smbconf-exists.conf
new file mode 100644
index 00000000..f893eb71
--- /dev/null
+++ b/core/modules/smbclient/data/etc/tmpfiles.d/ensure-smbconf-exists.conf
@@ -0,0 +1,4 @@
+# smbspool for some reason insists on reading this file, even if it is empty, otherwise it will bail out
+d	/etc/samba	0755	root	root	-
+f	/etc/samba/smb.conf	0644	root	root	-
+
diff --git a/core/modules/smbclient/module.build b/core/modules/smbclient/module.build
new file mode 100644
index 00000000..ec2c80fe
--- /dev/null
+++ b/core/modules/smbclient/module.build
@@ -0,0 +1,21 @@
+fetch_source() {
+	:
+}
+
+build() {
+	COPYLIST="list_dpkg_output"
+	[ -e "$COPYLIST" ] && rm "$COPYLIST"
+
+	list_packet_files >> "$COPYLIST"
+	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
+
+	mkdir -p "${MODULE_BUILD_DIR}/usr/lib/cups/backend" || perror "Could not create '${MODULE_BUILD_DIR}/usr/lib/cups/backend'"
+	local BIN_LOCATION="$(which smbspool)"
+	if [ ! -z "${BIN_LOCATION}" -a -e "${BIN_LOCATION}" ]; then
+		ln -sf "${BIN_LOCATION}" "${MODULE_BUILD_DIR}/usr/lib/cups/backend/smb"
+	fi
+}
+
+post_copy() {
+	:
+}
diff --git a/core/modules/smbclient/module.conf b/core/modules/smbclient/module.conf
new file mode 100644
index 00000000..460c57b5
--- /dev/null
+++ b/core/modules/smbclient/module.conf
@@ -0,0 +1,10 @@
+REQUIRED_BINARIES="
+	smbspool
+	smbcacls
+	rpcclient
+	smbcquotas
+	smbget
+	smbclient
+	smbtree
+	smbtar
+"
diff --git a/core/modules/smbclient/module.conf.debian b/core/modules/smbclient/module.conf.debian
new file mode 100644
index 00000000..4b33f4bd
--- /dev/null
+++ b/core/modules/smbclient/module.conf.debian
@@ -0,0 +1,9 @@
+REQUIRED_INSTALLED_PACKAGES="
+	smbclient
+"
+REQUIRED_CONTENT_PACKAGES="
+	smbclient
+"
+REQUIRED_FILES="
+	/usr/lib/cups/backend/smb
+"
diff --git a/core/modules/smbclient/module.conf.fedora b/core/modules/smbclient/module.conf.fedora
new file mode 100644
index 00000000..f524d100
--- /dev/null
+++ b/core/modules/smbclient/module.conf.fedora
@@ -0,0 +1,9 @@
+REQUIRED_INSTALLED_PACKAGES="
+	samba-client
+"
+REQUIRED_CONTENT_PACKAGES="
+	samba-client
+"
+REQUIRED_FILES="
+	/usr/lib/cups/backend/smb
+"
diff --git a/core/modules/smbclient/module.conf.opensuse b/core/modules/smbclient/module.conf.opensuse
new file mode 100644
index 00000000..f524d100
--- /dev/null
+++ b/core/modules/smbclient/module.conf.opensuse
@@ -0,0 +1,9 @@
+REQUIRED_INSTALLED_PACKAGES="
+	samba-client
+"
+REQUIRED_CONTENT_PACKAGES="
+	samba-client
+"
+REQUIRED_FILES="
+	/usr/lib/cups/backend/smb
+"
diff --git a/core/modules/smbclient/module.conf.ubuntu b/core/modules/smbclient/module.conf.ubuntu
new file mode 100644
index 00000000..4b33f4bd
--- /dev/null
+++ b/core/modules/smbclient/module.conf.ubuntu
@@ -0,0 +1,9 @@
+REQUIRED_INSTALLED_PACKAGES="
+	smbclient
+"
+REQUIRED_CONTENT_PACKAGES="
+	smbclient
+"
+REQUIRED_FILES="
+	/usr/lib/cups/backend/smb
+"