Kill consolekit and ncp

19 files changed, 0 insertions, 268 deletions

diff --git a/core/bin/setup_target b/core/bin/setup_target
index 8d606dac..cdaedff4 100755
--- a/core/bin/setup_target
+++ b/core/bin/setup_target
@@ -523,9 +523,6 @@ clean_modules() {
 		shift
 	done
 	cd - &> /dev/null
-
-	# libck-connector cleanup
-	rm -f "$TARGET_DIR/post-patch/ck-connector/libck-connector.so"
 }
 
 clean_module() {
diff --git a/core/modules/consolekit/TODO b/core/modules/consolekit/TODO
deleted file mode 100644
index 6203c18f..00000000
--- a/core/modules/consolekit/TODO
+++ /dev/null
@@ -1 +0,0 @@
-update to new config scheme
diff --git a/core/modules/consolekit/data/etc/systemd/system/basic.target.wants/console-kit-daemon.service b/core/modules/consolekit/data/etc/systemd/system/basic.target.wants/console-kit-daemon.service
deleted file mode 120000
index 2b34a3f6..00000000
--- a/core/modules/consolekit/data/etc/systemd/system/basic.target.wants/console-kit-daemon.service
+++ /dev/null
@@ -1 +0,0 @@
-../console-kit-daemon.service
\ No newline at end of file
diff --git a/core/modules/consolekit/data/etc/systemd/system/console-kit-daemon.service b/core/modules/consolekit/data/etc/systemd/system/console-kit-daemon.service
deleted file mode 100644
index bc2a0de9..00000000
--- a/core/modules/consolekit/data/etc/systemd/system/console-kit-daemon.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=ConsoleKit
-
-[Service]
-Type=dbus
-BusName=org.freedesktop.ConsoleKit
-ExecStart=/usr/sbin/console-kit-daemon --no-daemon
-
diff --git a/core/modules/consolekit/data/usr/share/dbus-1/system-services/org.freedesktop.ConsoleKit.service b/core/modules/consolekit/data/usr/share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
deleted file mode 100644
index cbefc9a4..00000000
--- a/core/modules/consolekit/data/usr/share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.ConsoleKit
-Exec=/usr/sbin/console-kit-daemon --no-daemon
-User=root
-SystemdService=console-kit-daemon.service
-
diff --git a/core/modules/consolekit/module.build b/core/modules/consolekit/module.build
deleted file mode 100644
index 0626aae4..00000000
--- a/core/modules/consolekit/module.build
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-fetch_source() {
-	pinfo "Extracting from running system..."
-}
-
-build() {
-	COPYLIST="list_dpkg_output"
-	[ -e "${COPYLIST}" ] && rm "${COPYLIST}"
-
-	list_packet_files >> "${COPYLIST}"
-	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
-	# Systemd/dbus
-	mkdir -p "$MODULE_BUILD_DIR/usr/share/dbus-1/system-services" "$MODULE_BUILD_DIR/etc/systemd/system"
-	local DAEMON=$(find "$MODULE_BUILD_DIR" -name console-kit-daemon -executable | head -n 1)
-	DAEMON="${DAEMON#$MODULE_BUILD_DIR}"
-	[ -z "$DAEMON" ] && perror "Could not find console-kit-daemon binary"
-	sed "s,%DAEMON%,/$DAEMON,g" "${MODULE_DIR}/templates/consolekit.systemd.service" > "$MODULE_BUILD_DIR/etc/systemd/system/console-kit-daemon.service" || perror "Could not generate systemd service"
-	sed "s,%DAEMON%,/$DAEMON,g" "${MODULE_DIR}/templates/consolekit.dbus.service" > "$MODULE_BUILD_DIR/usr/share/dbus-1/system-services/org.freedesktop.ConsoleKit.service" || perror "Could not generate dbus service"
-}
-
-post_copy() {
-	mkdir -p "${TARGET_BUILD_DIR}/usr/lib/ConsoleKit/run-seat.d"
-	mkdir -p "${TARGET_BUILD_DIR}/etc/ConsoleKit/run-seat.d"
-	mkdir -p "${TARGET_BUILD_DIR}/etc/ConsoleKit/run-session.d"
-	mkdir -p "${TARGET_BUILD_DIR}/var/log/ConsoleKit"
-}
-
diff --git a/core/modules/consolekit/module.conf b/core/modules/consolekit/module.conf
deleted file mode 100644
index d660886f..00000000
--- a/core/modules/consolekit/module.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-REQUIRED_BINARIES="
-	console-kit-daemon
-	ck-history
-	ck-launch-session
-	ck-list-sessions
-"
-REQUIRED_DIRECTORIES="
-	/etc/ConsoleKit
-	/etc/dbus-1
-	/usr/lib/ConsoleKit
-	/usr/share
-"
-REQUIRED_LIBRARIES="
-	pam_ck_connector
-	libck-connector
-"
-
diff --git a/core/modules/consolekit/module.conf.debian b/core/modules/consolekit/module.conf.debian
deleted file mode 100644
index 1fa31891..00000000
--- a/core/modules/consolekit/module.conf.debian
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-REQUIRED_CONTENT_PACKAGES="
-	consolekit
-	libpam-ck-connector
-"
-
-
diff --git a/core/modules/consolekit/module.conf.opensuse b/core/modules/consolekit/module.conf.opensuse
deleted file mode 100644
index af306a15..00000000
--- a/core/modules/consolekit/module.conf.opensuse
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-	ConsoleKit
-	ConsoleKit-x11
-"
-REQUIRED_CONTENT_PACKAGES="
-	ConsoleKit
-	ConsoleKit-x11
-"
diff --git a/core/modules/consolekit/module.conf.ubuntu b/core/modules/consolekit/module.conf.ubuntu
deleted file mode 100644
index 6254257a..00000000
--- a/core/modules/consolekit/module.conf.ubuntu
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-	consolekit
-"
-REQUIRED_CONTENT_PACKAGES="
-	consolekit
-	libpam-ck-connector
-	libck-connector0
-"
-
diff --git a/core/modules/consolekit/templates/consolekit.dbus.service b/core/modules/consolekit/templates/consolekit.dbus.service
deleted file mode 100644
index 5720e4cf..00000000
--- a/core/modules/consolekit/templates/consolekit.dbus.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.ConsoleKit
-Exec=%DAEMON% --no-daemon
-User=root
-SystemdService=console-kit-daemon.service
-
diff --git a/core/modules/consolekit/templates/consolekit.systemd.service b/core/modules/consolekit/templates/consolekit.systemd.service
deleted file mode 100644
index f86158cc..00000000
--- a/core/modules/consolekit/templates/consolekit.systemd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=ConsoleKit (Legacy)
-After=syslog.target
-
-[Service]
-Type=dbus
-BusName=org.freedesktop.ConsoleKit
-ExecStart=%DAEMON% --no-daemon
-
diff --git a/core/modules/ncp/FIXME b/core/modules/ncp/FIXME
deleted file mode 100644
index d5e788aa..00000000
--- a/core/modules/ncp/FIXME
+++ /dev/null
@@ -1,2 +0,0 @@
-This module is broken as of 07.12.16, as the hardcoded urls to the deb packages are dead.
-Why was this pursued instead of using the regular package manager way?
diff --git a/core/modules/ncp/module.build b/core/modules/ncp/module.build
deleted file mode 100644
index d8250512..00000000
--- a/core/modules/ncp/module.build
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-fetch_source() {
-
-	# Distribution switch: Ubuntu 14.04 dropped packages ncpfs and libncp:
-	if [[ "$SYS_DISTRIBUTION" == "ubuntu" && "$SYS_VERSION" == "14.04" ]]; then
-		for file in $REQUIRED_DOWNLOAD_URLS; do
-			local package="$(basename $file)"
-			pinfo "Downloading and installing package $package ..."
-			download_if_empty "$file" "src/$package"
-			dpkg -i "src/$package"	|| perror "Could not install package $package."
-		done
-	fi
-}
-
-build() {
-	local COPYLIST="$MODULE_BUILD_DIR/list_packet_files"
-	# TODO: Hack for SUSE: Ignore file (/var/lib/nfs/state) that does not exist :(
-	list_packet_files | grep -v '/var/lib/nfs/state' | sort -u > "$COPYLIST"
-	tarcopy "$(cat "$COPYLIST")" "${MODULE_BUILD_DIR}"
-
-}
-
-post_copy() {
-	:
-}
diff --git a/core/modules/ncp/module.conf b/core/modules/ncp/module.conf
deleted file mode 100644
index c1a1785f..00000000
--- a/core/modules/ncp/module.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-REQUIRED_BINARIES="
-"
-REQUIRED_LIBRARIES="
-"
-REQUIRED_DIRECTORIES="
-"
-REQUIRED_SYSTEM_FILES="
-"
diff --git a/core/modules/ncp/module.conf.debian b/core/modules/ncp/module.conf.debian
deleted file mode 100644
index 144f019a..00000000
--- a/core/modules/ncp/module.conf.debian
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-	ncpfs
-	libncp
-"
-REQUIRED_CONTENT_PACKAGES="
-	ncpfs
-	libncp
-"
-REQUIRED_BINARIES+="
-	nwmsg
-	ncpmount
-	ncpumount
-	mount.ncp
-	mount.ncpfs
-"
-REQUIRED_DIRECTORIES+="
-	/usr
-"
-
-# For Debian 8: Both packages were dropped from official repos. Do not change the
-# order, as these packages will be installed via dpkg and depend on each other.
-REQUIRED_DOWNLOAD_URLS="
-	ftp.acc.umu.se/mirror/cdimage/snapshot/Debian/pool/main/n/ncpfs/libpam-ncp_2.2.6-9_amd64.deb
-	ftp.acc.umu.se/mirror/cdimage/snapshot/Debian/pool/main/n/ncpfs/libncp_2.2.6-9_amd64.deb
-	ftp.acc.umu.se/mirror/cdimage/snapshot/Debian/pool/main/n/ncpfs/ncpfs_2.2.6-9_amd64.deb
-"
diff --git a/core/modules/ncp/module.conf.ubuntu b/core/modules/ncp/module.conf.ubuntu
deleted file mode 100644
index 57a0f423..00000000
--- a/core/modules/ncp/module.conf.ubuntu
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-	ncpfs
-"
-REQUIRED_CONTENT_PACKAGES="
-	libncp
-	ncpfs
-"
-REQUIRED_BINARIES+="
-	nwmsg
-	ncpmount
-	ncpumount
-	mount.ncp
-	mount.ncpfs
-"
-REQUIRED_DIRECTORIES+="
-	/usr
-"
diff --git a/core/modules/ncp/module.conf.ubuntu.14 b/core/modules/ncp/module.conf.ubuntu.14
deleted file mode 100644
index 4e4add66..00000000
--- a/core/modules/ncp/module.conf.ubuntu.14
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-"
-REQUIRED_CONTENT_PACKAGES="
-	libncp
-	ncpfs
-"
-REQUIRED_BINARIES+="
-	nwmsg
-	ncpmount
-	ncpumount
-	mount.ncp
-	mount.ncpfs
-"
-REQUIRED_DIRECTORIES+="
-	/usr
-"
-
-# For Ubuntu 14.04: Both packages were dropped from official repos. Do not change the
-# order, as these packages will be installed via dpkg and depend on each other.
-REQUIRED_DOWNLOAD_URLS="
-	de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/libncp_2.2.6-9ubuntu1_amd64.deb
-	de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/libpam-ncp_2.2.6-9ubuntu1_amd64.deb
-	de.archive.ubuntu.com/ubuntu/pool/universe/n/ncpfs/ncpfs_2.2.6-9ubuntu1_amd64.deb
-"
diff --git a/core/post-patch/ck-connector/fake-ck-connector.c b/core/post-patch/ck-connector/fake-ck-connector.c
deleted file mode 100644
index 42fa1546..00000000
--- a/core/post-patch/ck-connector/fake-ck-connector.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <dbus/dbus.h>
-#include <sys/types.h>
-
-struct _CkConnector;
-typedef struct _CkConnector CkConnector;
-
-
-struct _CkConnector
-{
-	int             refcount;
-	char           *cookie;
-	dbus_bool_t     session_created;
-	DBusConnection *connection;
-};
-
-void ck_connector_unref (CkConnector *connector)
-{
-	return;
-}
-
-CkConnector * ck_connector_ref (CkConnector *connector)
-{
-	return connector;
-}
-
-CkConnector * ck_connector_new (void)
-{
-	return (CkConnector*)1;
-}
-
-dbus_bool_t ck_connector_open_session (CkConnector *connector, DBusError   *error)
-{
-	return 1;
-}
-
-dbus_bool_t ck_connector_open_session_with_parameters (CkConnector *connector, DBusError *error, const char *first_parameter_name, ...)
-{
-	return 1;
-}
-
-dbus_bool_t ck_connector_open_session_for_user (CkConnector *connector, uid_t user, const char *display_device, const char *x11_display, DBusError  *error)
-{
-	return 1;
-}
-
-const char * ck_connector_get_cookie (CkConnector *connector)
-{
-	return NULL;
-}
-
-dbus_bool_t ck_connector_close_session (CkConnector *connector, DBusError *error)
-{
-	return 1;
-}
-