diff options
Diffstat (limited to 'sys-apps')
42 files changed, 0 insertions, 7276 deletions
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest deleted file mode 100644 index 307aa969..00000000 --- a/sys-apps/openrc/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -DIST openrc-0.10.5.tar.bz2 171742 SHA256 27677142a7aa47a1c7e863fd4bce0d092aca7870012812e4f7a690a14f1e242c -DIST openrc-0.11.8.tar.bz2 174860 SHA256 e1f7c5ed98a63178c20f3d023a7d35fe416e8e7db2f0cf78ff346a6d2f7949a9 SHA512 aaea9f1e1d08c367beb6d35bcc1d258eb9d7b71a659c05088f9027b0558aae068b2ad7c221cf8ff8b8950f5a4a5c187ee7b986ce2d475a9e3cccda74d040f780 WHIRLPOOL 69217f13dd05e9a443d906281ada167d6892615eb5db7c372ba535a3d4a21ac3111fad9d54ef06650c3b488b848180bbfe5257dbc83f62f5ecf60724dec2900c -DIST openrc-0.12.4.tar.bz2 131914 SHA256 c4edda2fff4b613f50b9cc265bb457a9ab0170fbc1fe7c26eccd4a5d63b2625c SHA512 14e188e382dfe02037d3e4211fa3265152d5ec92ca491b1e86154c0615583ddfc0a2592ca849ab453068dd60000886e57e7da024036fa58d7474acdbb6b92208 WHIRLPOOL 7bdc2c310ee6e87a439574f377a3c1541a118b4122d098d727f6d4464e9f645e5a4d40bedfc82f401b53e640e78494f74fac94f9b6813eb202cc18d1c5391280 -DIST openrc-0.13.11.tar.bz2 150680 SHA256 30edffa8b39d5e68129ddd9e8cd8dfde8ca8cfafc8b470124d7323a32a4a443c SHA512 1dd9d86f5f2f13e196d2724b978c0aaabf7a73c487bf2f8f759d82c856faa754b612d5252dacedb042ba308ff7e9a745dea88b78654a693c39f5d720f0f92ada WHIRLPOOL 2849260c60811e88467b2d0916afa37bc4c7a6e2159abf70a2f5bad2cf97586b801993f45ed86145dfecbc93166298c6302a78602bbfe1957d2f159a3cde11dc -DIST openrc-0.8.2.tar.bz2 161165 SHA256 5d603869f78692947b60528f12b3107372a9e4a469621be7bc47d3829c16f8a1 -DIST openrc-0.8.3.tar.bz2 162474 SHA256 38ce2538bffe38c00055aadb85597f6f517b3e9f760dc1ed4a27ddf28cb9f4b4 -DIST openrc-0.9.8.1.tar.bz2 166841 SHA256 ba83fd5409a4a1626f35adfd06e61675585f5ae29e14dadab958016e24d2a995 -DIST openrc-0.9.9.3.tar.bz2 169462 SHA256 75487579982eddee9bbc7c3f6515ef8924eefd35c4829361e2b4c4c69bd047ab diff --git a/sys-apps/openrc/Reasons b/sys-apps/openrc/Reasons deleted file mode 100644 index 52f2f92a..00000000 --- a/sys-apps/openrc/Reasons +++ /dev/null @@ -1,5 +0,0 @@ -# Fabio Erculiani <lxnay@sabayonlinux.org> -- rebrand boot string -- disable deprecated addons warnings -- do not let /etc/conf.d/keymaps to be overwritten, provide .example files -- fix Gentoo bug #299633 diff --git a/sys-apps/openrc/files/0001-Filter-the-systemd-cgroup-from-the-current-process.patch b/sys-apps/openrc/files/0001-Filter-the-systemd-cgroup-from-the-current-process.patch deleted file mode 100644 index ec925cc1..00000000 --- a/sys-apps/openrc/files/0001-Filter-the-systemd-cgroup-from-the-current-process.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9f2ef0dabec9d7644f3f13e6d9e2037396493c6d Mon Sep 17 00:00:00 2001 -From: Fabio Erculiani <lxnay@sabayon.org> -Date: Sat, 22 Jun 2013 11:05:11 +0200 -Subject: [PATCH] Filter the systemd cgroup from the current process - -logind relies on the name=systemd:/ cgroup path to determine the -session name and seat through pam_systemd. The problem arises when -the user log into a tty or via ssh and restart a service: the -name=systemd cgroup is not cleared and it gets inherited by all -the child processes spawned by the service. ---- - sh/runscript.sh.in | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in -index 58e8eac..ba8eeb4 100644 ---- a/sh/runscript.sh.in -+++ b/sh/runscript.sh.in -@@ -249,6 +249,12 @@ while [ -n "$1" ]; do - cd / - continue - fi -+ if [ "$1" = start ] && [ -d /sys/fs/cgroup/systemd ]; then -+ # reset the systemd cgroup so that it won't be -+ # propagated to children. This makes logind work, -+ # which otherwise gets confused. -+ echo $$ > /sys/fs/cgroup/systemd/tasks -+ fi - # See if we have the required function and run it - for _cmd in describe start stop status ${extra_commands:-$opts} \ - $extra_started_commands $extra_stopped_commands --- -1.8.2.1 - diff --git a/sys-apps/openrc/files/0001-efivarfs-Support-EFI-variable-access-in-3.10-kernels.patch b/sys-apps/openrc/files/0001-efivarfs-Support-EFI-variable-access-in-3.10-kernels.patch deleted file mode 100644 index 7e1140d6..00000000 --- a/sys-apps/openrc/files/0001-efivarfs-Support-EFI-variable-access-in-3.10-kernels.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 29f0f55c0e7debef879674ed288c1d3af0f84772 Mon Sep 17 00:00:00 2001 -From: "Robin H. Johnson" <robbat2@gentoo.org> -Date: Mon, 24 Jun 2013 19:31:58 +0000 -Subject: [PATCH] efivarfs: Support EFI variable access in 3.10 kernels. - -In the 3.10 kernel, EFI variables are now provided by a dedicated -filesystem that needs to be mounted. - -Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> ---- - init.d/sysfs.in | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/init.d/sysfs.in b/init.d/sysfs.in -index 114a653..7658cb5 100644 ---- a/init.d/sysfs.in -+++ b/init.d/sysfs.in -@@ -81,6 +81,20 @@ mount_misc() - eend $? - fi - fi -+ -+ # setup up kernel support for efivarfs -+ # slightly complicated, as if it's build as a module but NOT yet loaded, -+ # it will NOT appear in /proc/filesystems yet -+ if [ -d /sys/firmware/efi/efivars ] \ -+ && ! mountinfo -q /sys/firmware/efi/efivars; then -+ modprobe -q efivarfs -+ if grep -qs efivarfs /proc/filesystems; then -+ ebegin "Mounting efivarfs filesystem" -+ mount -n -t efivarfs -o ${sysfs_opts} \ -+ efivarfs /sys/firmware/efi/efivars -+ eend $? -+ fi -+ fi - } - - mount_cgroups() --- -1.8.2.1 - diff --git a/sys-apps/openrc/files/openrc-0.5.3-disable_warns_until_migrated.patch b/sys-apps/openrc/files/openrc-0.5.3-disable_warns_until_migrated.patch deleted file mode 100644 index eb4ed168..00000000 --- a/sys-apps/openrc/files/openrc-0.5.3-disable_warns_until_migrated.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nurp openrc-0.5.3.orig/sh/rc-functions.sh.in openrc-0.5.3/sh/rc-functions.sh.in ---- openrc-0.5.3.orig/sh/rc-functions.sh.in 2009-12-02 20:08:02.000000000 +0100 -+++ openrc-0.5.3/sh/rc-functions.sh.in 2009-12-26 05:42:17.000000000 +0100 -@@ -18,10 +18,10 @@ _addon_warn() - import_addon() - { - if [ -e /@LIB@/rc/addons/"$1".sh ]; then -- _addon_warn -+ # _addon_warn - . /@LIB@/rc/addons/"$1".sh - elif [ -e /@LIB@/rcscripts/addons/"$1".sh ]; then -- _addon_warn -+ # _addon_warn - . /@LIB@/rcscripts/addons/"$1".sh - else - return 1 diff --git a/sys-apps/openrc/files/openrc-0.6.1-fix-clockskew-error-handling.patch b/sys-apps/openrc/files/openrc-0.6.1-fix-clockskew-error-handling.patch deleted file mode 100644 index 2b666767..00000000 --- a/sys-apps/openrc/files/openrc-0.6.1-fix-clockskew-error-handling.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur openrc-0.6.1.a/init.d/savecache.in openrc-0.6.1.b/init.d/savecache.in ---- openrc-0.6.1.a/init.d/savecache.in 2010-03-22 15:02:12.000000000 -0500 -+++ openrc-0.6.1.b/init.d/savecache.in 2010-07-13 13:56:47.000000000 -0500 -@@ -10,7 +10,7 @@ - ewarn "WARNING: clock skew detected!" - if ! yesno "savecache_skewed"; then - eerror "Not saving deptree cache" -- return 1 -+ return 0 - fi - fi - ebegin "Saving dependency cache" diff --git a/sys-apps/openrc/files/openrc-0.6.1-network-syntax.patch b/sys-apps/openrc/files/openrc-0.6.1-network-syntax.patch deleted file mode 100644 index 534a8899..00000000 --- a/sys-apps/openrc/files/openrc-0.6.1-network-syntax.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://bugs.gentoo.org/310805 - -patch by Lars Wendler - ---- openrc-0.6.1/init.d/network.in -+++ openrc-0.6.1/init.d/network.in -@@ -74,6 +74,7 @@ - esac - done - [ $? = 2 ] -+ ;; - *) - local inet= address= rest= - LC_ALL=C ifconfig -a | while read inet address rest; do diff --git a/sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch b/sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch deleted file mode 100644 index 14ecd5f8..00000000 --- a/sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c427d3c1fec89f6a9281dccdc123bad73af80804 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Tue, 28 Jun 2011 00:02:11 -0400 -Subject: [PATCH] net: ccwgroup: smooth up/down process - -We need to bring the link up ourselves after we've properly configured -the device. The common code tries to bring the link up itself, but it -does so before things are configured, and so it ends up failing. - -When shutting down, we need to wait for the kernel to finish destroying -the interface. Otherwise, when doing a restart, openrc is quick enough -to tell the kernel to destroy things, but then start trying to bring it -back up before the kernel has finished. - -X-Gentoo-Bug: 367467 -X-Gentoo-Bug-URL: http://bugs.gentoo.org/367467 -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - net/ccwgroup.sh | 14 ++++++++++++-- - 1 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/net/ccwgroup.sh b/net/ccwgroup.sh -index 248b159..60cd25f 100644 ---- a/net/ccwgroup.sh -+++ b/net/ccwgroup.sh -@@ -58,6 +58,11 @@ ccwgroup_pre_start() - echo "${val}" > /sys/devices/${ccw_type}/${first}/${var} - done - eend $? -+ -+ # Now that we've properly configured the device, we can run -+ # bring the interface up. Common code tried to do this already, -+ # but it failed because we didn't setup sysfs yet. -+ _up - } - - ccwgroup_pre_stop() -@@ -88,9 +93,14 @@ ccwgroup_post_stop() - local device="$(service_get_value ccwgroup_device)" - [ -z "${device}" ] && return 0 - local ccw_type="$(service_get_value ccwgroup_type)" -+ local path="/sys/devices/${ccw_type}/${device}" - - einfo "Disabling ccwgroup/${ccw_type} on ${IFACE}" -- echo "0" >/sys/devices/${ccw_type}/"${device}"/online -- echo "1" >/sys/devices/${ccw_type}/"${device}"/ungroup -+ if echo "0" >"${path}"/online && -+ echo "1" >"${path}"/ungroup ; then -+ # The device doesn't disappear right away which breaks -+ # restart, or a quick start up, so wait around. -+ while [ -e "${path}" ] ; do :; done -+ fi - eend $? - } --- -1.7.5.3 - diff --git a/sys-apps/openrc/files/openrc-0.8.3-deprecation_warning.patch b/sys-apps/openrc/files/openrc-0.8.3-deprecation_warning.patch deleted file mode 100644 index 1aa7315b..00000000 --- a/sys-apps/openrc/files/openrc-0.8.3-deprecation_warning.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 24ba7955634dd571a4c34dd712dc8a592eea4d73 Mon Sep 17 00:00:00 2001 -From: Joe Harvell <jharvell@dogpad.net> -Date: Mon, 27 Jun 2011 23:20:47 +0200 -Subject: [PATCH] Only print the deprecation warning for --chuid/-c when using it - -The deprecation warning has been printed when using the replecement functions as -well, bug 373243. ---- - src/rc/start-stop-daemon.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c -index b5c2b6e..3017701 100644 ---- a/src/rc/start-stop-daemon.c -+++ b/src/rc/start-stop-daemon.c -@@ -788,12 +788,11 @@ start_stop_daemon(int argc, char **argv) - background = true; - break; - -- case 'u': /* --user <username>|<uid> */ - case 'c': /* --chuid <username>|<uid> */ -- { - /* DEPRECATED */ - ewarn("WARNING: -c/--chuid is deprecated and will be removed in the future, please use -u/--user instead"); -- -+ case 'u': /* --user <username>|<uid> */ -+ { - p = optarg; - tmp = strsep(&p, ":"); - changeuser = xstrdup(tmp); --- -1.7.3.4 - diff --git a/sys-apps/openrc/files/openrc-0.9.9.3-do-not-print-error-if-tmplog-cannot-be-read.patch b/sys-apps/openrc/files/openrc-0.9.9.3-do-not-print-error-if-tmplog-cannot-be-read.patch deleted file mode 100644 index b520b34c..00000000 --- a/sys-apps/openrc/files/openrc-0.9.9.3-do-not-print-error-if-tmplog-cannot-be-read.patch +++ /dev/null @@ -1,25 +0,0 @@ -During boot, if /lib64/rc/init.d/ is a tmpfs mount -and rc.log can be either unavailable or no longer -available at some point in the future. -This patch makes rc-logger deal with ENOENT if -rc.log cannot be opened for reading. ---- openrc-0.9.9.3.orig/src/rc/rc-logger.c -+++ openrc-0.9.9.3/src/rc/rc-logger.c -@@ -268,7 +268,7 @@ rc_logger_open(const char *level) - break; - } - } -- } else { -+ } else if (errno != ENOENT) { - log_error = 1; - eerror("Error: fopen(%s) failed: %s", TMPLOG, strerror(errno)); - } -@@ -280,7 +280,7 @@ rc_logger_open(const char *level) - * logfile or its basedir may be read-only during sysinit and - * shutdown so skip the error in this case - */ -- if (errno != EROFS && ((strcmp(level, RC_LEVEL_SHUTDOWN) != 0) && (strcmp(level, RC_LEVEL_SYSINIT) != 0))) { -+ if (errno != EROFS && errno != ENOENT && ((strcmp(level, RC_LEVEL_SHUTDOWN) != 0) && (strcmp(level, RC_LEVEL_SYSINIT) != 0))) { - log_error = 1; - eerror("Error: fopen(%s) failed: %s", logfile, strerror(errno)); - } diff --git a/sys-apps/openrc/files/openrc-9999-pause.patch b/sys-apps/openrc/files/openrc-9999-pause.patch deleted file mode 100644 index bf2c94f8..00000000 --- a/sys-apps/openrc/files/openrc-9999-pause.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e82772a6b6d4374e81b7e19a593ffdef16753418 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 21 Dec 2009 09:02:35 -0500 -Subject: [PATCH] restore init.d pause option - ---- - src/rc/runscript.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/src/rc/runscript.c b/src/rc/runscript.c -index 5939dae..7147902 100644 ---- a/src/rc/runscript.c -+++ b/src/rc/runscript.c -@@ -1316,6 +1316,12 @@ runscript(int argc, char **argv) - prefix = NULL; - retval = svc_exec("status", NULL); - } else { -+ if (strcmp(optarg, "pause") == 0) { -+ ewarn("WARNING: 'pause' is deprecated; please use '--nodeps stop'"); -+ deps = false; -+ optarg = "stop"; -+ } -+ - if (strcmp(optarg, "conditionalrestart") == 0 || - strcmp(optarg, "condrestart") == 0) - { --- -1.6.6.rc3 - diff --git a/sys-apps/openrc/files/openrc-enable-interactive-2.patch b/sys-apps/openrc/files/openrc-enable-interactive-2.patch deleted file mode 100644 index cd56586d..00000000 --- a/sys-apps/openrc/files/openrc-enable-interactive-2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openrc-0.9.8.1.orig//etc/rc.conf.in -+++ openrc-0.9.8.1/etc/rc.conf.in -@@ -3,7 +3,7 @@ - # Set rc_interactive to "YES" and you'll be able to press the I key during - # boot so you can choose to start specific services. Set to "NO" to disable - # this feature. --#rc_interactive="YES" -+rc_interactive="YES" - - # If we need to drop to a shell, you can specify it here. - # If not specified we use $SHELL, otherwise the one specified in /etc/passwd, diff --git a/sys-apps/openrc/files/openrc-enable-interactive.patch b/sys-apps/openrc/files/openrc-enable-interactive.patch deleted file mode 100644 index 783c3567..00000000 --- a/sys-apps/openrc/files/openrc-enable-interactive.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openrc-0.6.8.orig/etc/rc.conf.in -+++ openrc-0.6.8/etc/rc.conf.in -@@ -13,7 +13,7 @@ - # boot so you can choose to start specific services. Set to "NO" to disable - # this feature. This feature is automatically disabled if rc_parallel is - # set to YES. --#rc_interactive="YES" -+rc_interactive="YES" - - # If we need to drop to a shell, you can specify it here. - # If not specified we use $SHELL, otherwise the one specified in /etc/passwd, diff --git a/sys-apps/openrc/files/openrc-kogaion-config-2.patch b/sys-apps/openrc/files/openrc-kogaion-config-2.patch deleted file mode 100644 index 7e392460..00000000 --- a/sys-apps/openrc/files/openrc-kogaion-config-2.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Nurp openrc-0.9.9.3.orig/conf.d/hwclock openrc-0.9.9.3/conf.d/hwclock ---- openrc-0.9.9.3.orig/conf.d/hwclock 2012-03-11 21:04:51.000000000 +0100 -+++ openrc-0.9.9.3/conf.d/hwclock 2012-04-19 18:50:12.000000000 +0200 -@@ -2,7 +2,7 @@ - # Greenwich Mean Time). If that clock is set to the local time, then - # set CLOCK to "local". Note that if you dual boot with Windows, then - # you should set it to "local". --clock="UTC" -+clock="local" - - # If you want the hwclock script to set the system time (software clock) - # to match the current hardware clock during bootup, leave this -diff -Nurp openrc-0.9.9.3.orig/etc/rc.conf.in openrc-0.9.9.3/etc/rc.conf.in ---- openrc-0.9.9.3.orig/etc/rc.conf.in 2012-03-11 21:04:51.000000000 +0100 -+++ openrc-0.9.9.3/etc/rc.conf.in 2012-04-19 18:49:46.000000000 +0200 -@@ -39,13 +39,13 @@ - # This allows net.wlan and any service not matching net.* to be plugged. - # Example - rc_hotplug="*" - # This allows all services to be hotplugged --#rc_hotplug="*" -+rc_hotplug="!net.*" - - # rc_logger launches a logging daemon to log the entire rc process to - # /var/log/rc.log - # NOTE: Linux systems require the devfs service to be started before - # logging can take place and as such cannot log the sysinit runlevel. --#rc_logger="YES" -+rc_logger="YES" - - # Through rc_log_path you can specify a custom log file. - # The default value is: /var/log/rc.log diff --git a/sys-apps/openrc/files/openrc-kogaion-config.patch b/sys-apps/openrc/files/openrc-kogaion-config.patch deleted file mode 100644 index 440171f9..00000000 --- a/sys-apps/openrc/files/openrc-kogaion-config.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- openrc-0.5.3.orig/conf.d/hwclock -+++ openrc-0.5.3/conf.d/hwclock -@@ -2,12 +2,12 @@ - # Greenwich Mean Time). If that clock is set to the local time, then - # set CLOCK to "local". Note that if you dual boot with Windows, then - # you should set it to "local". --clock="UTC" -+clock="local" - - # If you want to set the Hardware Clock to the current System Time - # (software clock) during shutdown, then say "YES" here. - # You normally don't need to do this if you run a ntp daemon. --clock_systohc="NO" -+clock_systohc="YES" - - # If you wish to pass any other arguments to hwclock during bootup, - # you may do so here. Alpha users may wish to use --arc or --srm here. ---- openrc-0.5.3.orig/etc/rc.conf.in -+++ openrc-0.5.3/etc/rc.conf.in -@@ -38,13 +38,13 @@ - # This allows net.wlan and any service not matching net.* to be plugged. - # Example - rc_hotplug="*" - # This allows all services to be hotplugged --#rc_hotplug="*" -+rc_hotplug="!net.*" - - # rc_logger launches a logging daemon to log the entire rc process to - # /var/log/rc.log - # NOTE: Linux systems require the devfs service to be started before - # logging can take place and as such cannot log the sysinit runlevel. --#rc_logger="YES" -+rc_logger="YES" - - # By default we filter the environment for our running scripts. To allow other - # variables through, add them here. Use a * to allow all variables through. diff --git a/sys-apps/openrc/files/openrc-netmount-fix.patch b/sys-apps/openrc/files/openrc-netmount-fix.patch deleted file mode 100644 index 8e6b3686..00000000 --- a/sys-apps/openrc/files/openrc-netmount-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openrc-0.5.3.orig/init.d/netmount.in -+++ openrc-0.5.3/init.d/netmount.in -@@ -80,7 +80,7 @@ stop() - fs="$fs${fs:+,}$x" - done - if [ -n "$fs" ]; then -- umount -at $fs || eerror "Failed to simply unmount filesystems" -+ umount -at $fs || umount -atl $fs || eerror "Failed to simply unmount filesystems" - fi - - eindent diff --git a/sys-apps/openrc/files/openrc-protect-rcsvcdir-for-symlink.patch b/sys-apps/openrc/files/openrc-protect-rcsvcdir-for-symlink.patch deleted file mode 100644 index a202aeac..00000000 --- a/sys-apps/openrc/files/openrc-protect-rcsvcdir-for-symlink.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -Naur a/openrc-0.6.0/init.d/localmount.in b/openrc-0.6.0/init.d/localmount.in ---- a/openrc-0.6.0/init.d/localmount.in 2009-12-21 09:30:17.000000000 -0600 -+++ b/openrc-0.6.0/init.d/localmount.in 2010-03-09 10:53:53.000000000 -0600 -@@ -32,6 +32,11 @@ - # We never unmount / or /dev or $RC_SVCDIR - local x= no_umounts_r="/|/dev|/dev/.*|${RC_SVCDIR}" - no_umounts_r="${no_umounts_r}|/bin|/sbin|/lib|/libexec" -+ -+ # In case $RC_SVCDIR tries to unmount due to lib64 -+ # symlink configuration, we cd to it to lock it -+ cd "$RC_SVCDIR" -+ - # RC_NO_UMOUNTS is an env var that can be set by plugins - OIFS=$IFS SIFS=${IFS-y} - IFS=$IFS: -diff -Naur a/openrc-0.6.0/init.d/mount-ro.in b/openrc-0.6.0/init.d/mount-ro.in ---- a/openrc-0.6.0/init.d/mount-ro.in 2009-12-21 09:30:17.000000000 -0600 -+++ b/openrc-0.6.0/init.d/mount-ro.in 2010-03-09 10:56:25.000000000 -0600 -@@ -16,6 +16,11 @@ - sync; sync - - ebegin "Remounting remaining filesystems read-only" -+ -+ # cd to $RC_SVCDIR it to lock it in case of incorrect -+ # assumptions about lib64 symlink configuration. -+ cd "$RC_SVCDIR" -+ - # We need the do_unmount function - . "$RC_LIBEXECDIR"/sh/rc-mount.sh - eindent diff --git a/sys-apps/openrc/files/openrc.logrotate b/sys-apps/openrc/files/openrc.logrotate deleted file mode 100644 index a168f236..00000000 --- a/sys-apps/openrc/files/openrc.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/rc.log { - compress - rotate 4 - weekly - missingok - notifempty -} diff --git a/sys-apps/openrc/files/start-stop-daemon.pam b/sys-apps/openrc/files/start-stop-daemon.pam deleted file mode 100644 index 2127f6a7..00000000 --- a/sys-apps/openrc/files/start-stop-daemon.pam +++ /dev/null @@ -1,2 +0,0 @@ -account required pam_permit.so -session include system-services diff --git a/sys-apps/openrc/metadata.xml b/sys-apps/openrc/metadata.xml deleted file mode 100644 index 2b127ba5..00000000 --- a/sys-apps/openrc/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>openrc</herd> -</pkgmetadata> diff --git a/sys-apps/openrc/openrc-0.10.5.ebuild b/sys-apps/openrc/openrc-0.10.5.ebuild deleted file mode 100644 index 7a6a67a4..00000000 --- a/sys-apps/openrc/openrc-0.10.5.ebuild +++ /dev/null @@ -1,471 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.10.5.ebuild,v 1.1 2012/07/04 14:36:33 williamh Exp $ - -EAPI=4 - -EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git" -[[ ${PV} == "9999" ]] && SCM_ECLASS="git-2" -inherit eutils flag-o-matic multilib pam toolchain-funcs ${SCM_ECLASS} -unset SCM_ECLASS - -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" -HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/" -if [[ ${PV} != "9999" ]] ; then - SRC_URI="mirror://gentoo/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="debug elibc_glibc ncurses pam selinux static-libs unicode kernel_linux kernel_FreeBSD" - -RDEPEND="virtual/init - kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) - elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) - pam? ( sys-auth/pambase ) - >=sys-apps/baselayout-2.1-r1 - kernel_linux? ( - sys-process/psmisc - ) - !<sys-fs/udev-133" -DEPEND="${RDEPEND} - virtual/os-headers" - -make_args() { - unset LIBDIR #266688 - - MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc" - - local brand="Unknown" - if use kernel_linux ; then - MAKE_ARGS="${MAKE_ARGS} OS=Linux" - brand="Linux" - elif use kernel_FreeBSD ; then - MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" - brand="FreeBSD" - fi - if use selinux; then - MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes" - fi - export BRANDING="Rogento ${brand}" - if ! use static-libs; then - MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no" - fi -} - -pkg_setup() { - export DEBUG=$(usev debug) - export MKPAM=$(usev pam) - export MKTERMCAP=$(usev ncurses) -} - -src_prepare() { - sed -i 's:0444:0644:' mk/sys.mk || die - sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342 - - if [[ ${PV} == "9999" ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die - fi - - # Allow user patches to be applied without modifying the ebuild - epatch_user - - # Kogaion custom config - epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" - epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch - epatch "${FILESDIR}/${PN}-netmount-fix.patch" - epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" - - # Kogaion bug fixes - epatch "${FILESDIR}/${PN}-0.9.9.3-do-not-print-error-if-tmplog-cannot-be-read.patch" -} - -src_compile() { - make_args - - tc-export CC AR RANLIB - emake ${MAKE_ARGS} -} - -# set_config <file> <option name> <yes value> <no value> test -# a value of "#" will just comment out the option -set_config() { - local file="${D}/$1" var=$2 val com - eval "${@:5}" && val=$3 || val=$4 - [[ ${val} == "#" ]] && com="#" && val='\2' - sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}" -} - -set_config_yes_no() { - set_config "$1" "$2" YES NO "${@:3}" -} - -src_install() { - make_args - emake ${MAKE_ARGS} DESTDIR="${D}" install - - # move the shared libs back to /usr so ldscript can install - # more of a minimal set of files - # disabled for now due to #270646 - #mv "${D}"/$(get_libdir)/lib{einfo,rc}* "${D}"/usr/$(get_libdir)/ || die - #gen_usr_ldscript -a einfo rc - gen_usr_ldscript libeinfo.so - gen_usr_ldscript librc.so - - if ! use kernel_linux; then - keepdir /$(get_libdir)/rc/init.d - fi - keepdir /$(get_libdir)/rc/tmp - - # Backup our default runlevels - dodir /usr/share/"${PN}" - cp -PR "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die - rm -rf "${D}"/etc/runlevels - - # Install the default net configuration - doconfd conf.d/net - - # Setup unicode defaults for silly unicode users - set_config_yes_no /etc/rc.conf unicode use unicode - - # Cater to the norm - set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')' - - # On HPPA, do not run consolefont by default (bug #222889) - if use hppa; then - rm -f "${D}"/usr/share/openrc/runlevels/boot/consolefont - fi - - # Support for logfile rotation - insinto /etc/logrotate.d - newins "${FILESDIR}"/openrc.logrotate openrc - - # Kogaion customization, do not bug user with annoying updates (for now) - mv "${D}"/etc/conf.d/keymaps "${D}"/etc/conf.d/keymaps.example || \ - die "cannot move keymaps" - mv "${D}"/etc/conf.d/hwclock "${D}"/etc/conf.d/hwclock.example || \ - die "cannot move hwclock" - - # install the gentoo pam.d file - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon -} - -add_boot_init() { - local initd=$1 - local runlevel=${2:-boot} - # if the initscript is not going to be installed and is not - # currently installed, return - [[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \ - || return - [[ -e ${ROOT}/etc/runlevels/${runlevel}/${initd} ]] && return - - # if runlevels dont exist just yet, then create it but still flag - # to pkg_postinst that it needs real setup #277323 - if [[ ! -d ${ROOT}/etc/runlevels/${runlevel} ]] ; then - mkdir -p "${ROOT}"/etc/runlevels/${runlevel} - touch "${ROOT}"/etc/runlevels/.add_boot_init.created - fi - - elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" - ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/${runlevel}/${initd} -} -add_boot_init_mit_config() { - local config=$1 initd=$2 - if [[ -e ${ROOT}${config} ]] ; then - if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then - add_boot_init ${initd} - fi - fi -} - -pkg_preinst() { - local conf_file - # Kogaion customization, still protect conf files from being removed - # as no longer owned by package - for conf_file in "${ROOT}/etc/conf.d/keymaps" "${ROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}" ]; then - cp -p "${conf_file}" "${conf_file}.ebuild_preserved" # don't die - fi - done - - local f LIBDIR=$(get_libdir) - - # default net script is just comments, so no point in biting people - # in the ass by accident. we save in preinst so that the package - # manager doesnt go throwing etc-update crap at us -- postinst is - # too late to prevent that. this behavior also lets us keep the - # file in the CONTENTS for binary packages. - [[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${D}"/etc/conf.d/ - - # avoid default thrashing in conf.d files when possible #295406 - if [[ -e ${ROOT}/etc/conf.d/hostname ]] ; then - ( - unset hostname HOSTNAME - source "${ROOT}"/etc/conf.d/hostname - : ${hostname:=${HOSTNAME}} - [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" - ) - fi - - # upgrade timezone file ... do it before moving clock - if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then - ( - unset TIMEZONE - source "${ROOT}"/etc/conf.d/clock - [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone - ) - fi - - # /etc/conf.d/clock moved to /etc/conf.d/hwclock - local clock - use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" - if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then - mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock} - fi - if [[ -e ${ROOT}/etc/init.d/clock ]] ; then - rm -f "${ROOT}"/etc/init.d/clock - fi - if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then - rm -f "${ROOT}"/etc/runlevels/boot/clock - ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock} - fi - if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then - rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock - ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock} - fi - - # /etc/conf.d/rc is no longer used for configuration - if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then - elog "/etc/conf.d/rc is no longer used for configuration." - elog "Please migrate your settings to /etc/rc.conf as applicable" - elog "and delete /etc/conf.d/rc" - fi - - # force net init.d scripts into symlinks - for f in "${ROOT}"/etc/init.d/net.* ; do - [[ -e ${f} ]] || continue # catch net.* not matching anything - [[ ${f} == */net.lo ]] && continue # real file now - [[ ${f} == *.openrc.bak ]] && continue - if [[ ! -L ${f} ]] ; then - elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." - elog "You should delete '${f##*/}.openrc.bak' if you don't need it." - mv "${f}" "${f}.openrc.bak" - ln -snf net.lo "${f}" - fi - done - - # termencoding was added in 0.2.1 and needed in boot - has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding - - # swapfiles was added in 0.9.9 and needed in boot (february 2012) - has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles - - # set default interactive shell to sulogin if it exists - set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin - - has_version sys-apps/openrc || migrate_from_baselayout_1 - has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script -} - -# >=openrc-0.4.0 no longer loads the udev addon -migrate_udev_init_script() { - # make sure udev is in sysinit if it was enabled before - local enable_udev=false - local rc_devices=$( - [[ -f /etc/rc.conf ]] && source /etc/rc.conf - [[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc - echo "${rc_devices:-${RC_DEVICES:-auto}}" - ) - case ${rc_devices} in - udev|auto) - enable_udev=true - ;; - esac - - if $enable_udev; then - add_boot_init udev sysinit - add_boot_init udev-postmount default - fi -} - -migrate_from_baselayout_1() { - # baselayout boot init scripts have been split out - for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do - # baselayout-1 is always "old" net, so ignore "new" net - [[ ${f} == "network" ]] && continue - - add_boot_init ${f} - done - - # Try to auto-add some addons when possible - add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt - add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt - add_boot_init_mit_config /etc/mdadm.conf mdraid - add_boot_init_mit_config /etc/evms.conf evms - [[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper - [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm - elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" - elog "init.d scripts. If you use such a thing, make sure you have the" - elog "required init.d scripts added to your boot runlevel." - - # Upgrade our state for baselayout-1 users - if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then - ( - [[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc - svcdir=${svcdir:-/var/lib/init.d} - if [[ ! -d ${ROOT}${svcdir}/started ]] ; then - ewarn "No state found, and no state exists" - elog "You should reboot this host" - else - mkdir -p "${ROOT}${LIBDIR}/rc/init.d" - einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d" - mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d - rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \ - "${ROOT}${LIBDIR}"/rc/init.d/console - umount "${ROOT}${svcdir}" 2>/dev/null - rm -rf "${ROOT}${svcdir}" - fi - ) - fi - - # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition - if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then - elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" - rm -f "${ROOT}"/etc/modules.autoload.d/.keep* - rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null - if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then - local f v - for f in "${ROOT}"/etc/modules.autoload.d/* ; do - v=${f##*/} - v=${v#kernel-} - v=${v//[^[:alnum:]]/_} - gawk -v v="${v}" -v f="${f##*/}" ' - BEGIN { print "\n### START: Auto-converted from " f "\n" } - { - if ($0 ~ /^[^#]/) { - print "modules_" v "=\"${modules_" v "} " $1 "\"" - gsub(/[^[:alnum:]]/, "_", $1) - printf "module_" $1 "_args_" v "=\"" - for (i = 2; i <= NF; ++i) { - if (i > 2) - printf " " - printf $i - } - print "\"\n" - } else - print - } - END { print "\n### END: Auto-converted from " f "\n" } - ' "${f}" >> "${D}"/etc/conf.d/modules - done - rm -f "${f}" - rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null - fi - fi -} - -pkg_postinst() { - local conf_file - # Kogaion customization, do not bug user with tedious, useless config file updates - for conf_file in "${ROOT}/etc/conf.d/keymaps" "${ROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}.ebuild_preserved" ]; then - cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die - elif [ ! -e "${conf_file}" ]; then - cp -p "${conf_file}.example" "${conf_file}" # don't die - fi - chown root:root "${conf_file}" # don't die - done - - local LIBDIR=$(get_libdir) - - # Remove old baselayout links - rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin} - rm -f "${ROOT}"/etc/init.d/{depscan,runscript}.sh - - # Make our runlevels if they don't exist - if [[ ! -e ${ROOT}/etc/runlevels ]] || [[ -e ${ROOT}/etc/runlevels/.add_boot_init.created ]] ; then - einfo "Copying across default runlevels" - cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc - rm -f "${ROOT}"/etc/runlevels/.add_boot_init.created - else - if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then - mkdir -p "${ROOT}"/etc/runlevels/sysinit - cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* \ - "${ROOT}"/etc/runlevels/sysinit - fi - if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then - mkdir -p "${ROOT}"/etc/runlevels/shutdown - cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* \ - "${ROOT}"/etc/runlevels/shutdown - fi - fi - - # /etc/conf.d/net.example is no longer valid - local NET_EXAMPLE="${ROOT}/etc/conf.d/net.example" - local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210' - if [[ -e "${NET_EXAMPLE}" ]] ; then - if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then - rm -f "${NET_EXAMPLE}" - elog "${NET_EXAMPLE} has been removed." - else - sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}" - elog "${NET_EXAMPLE} should be removed." - fi - elog "The new file is ${ROOT}/usr/share/doc/${PF}/net.example" - fi - - # /etc/conf.d/wireless.example is no longer valid - local WIRELESS_EXAMPLE="${ROOT}/etc/conf.d/wireless.example" - local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3' - if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then - if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then - rm -f "${WIRELESS_EXAMPLE}" - elog "${WIRELESS_EXAMPLE} is deprecated and has been removed." - else - sed -i '1i# This file is obsolete.\n' "${WIRELESS_EXAMPLE}" - elog "${WIRELESS_EXAMPLE} is deprecated and should be removed." - fi - elog "If you are using the old style network scripts," - elog "Configure wireless settings in ${ROOT}/etc/conf.d/net" - elog "after reviewing ${ROOT}/usr/share/doc/${PF}/net.example" - fi - - if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then - ewarn "/etc/modules.autoload.d is no longer used. Please convert" - ewarn "your files to /etc/conf.d/modules and delete the directory." - fi - - if use hppa; then - elog "Setting the console font does not work on all HPPA consoles." - elog "You can still enable it by running:" - elog "# rc-update add consolefont boot" - fi - - # Handle the conf.d/local.{start,stop} -> local.d transition - if path_exists -o "${ROOT}"etc/conf.d/local.{start,stop} ; then - elog "Moving your ${ROOT}etc/conf.d/local.{start,stop}" - elog "files to ${ROOT}etc/local.d" - mv "${ROOT}"etc/conf.d/local.start "${ROOT}"etc/local.d/baselayout1.start - mv "${ROOT}"etc/conf.d/local.stop "${ROOT}"etc/local.d/baselayout1.stop - chmod +x "${ROOT}"etc/local.d/*{start,stop} - fi - - if use kernel_linux && [[ "${ROOT}" = "/" ]]; then - if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then - ewarn "The dependency data could not be migrated to /run/openrc." - ewarn "This means you need to reboot your system." - fi - fi - - # update the dependency tree after touching all files #224171 - [[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u - - elog "You should now update all files in /etc, using etc-update" - elog "or equivalent before restarting any services or this host." - elog - elog "Please read the migration guide available at:" - elog "http://www.gentoo.org/doc/en/openrc-migration.xml" -} diff --git a/sys-apps/openrc/openrc-0.11.8.ebuild b/sys-apps/openrc/openrc-0.11.8.ebuild deleted file mode 100644 index 6284e791..00000000 --- a/sys-apps/openrc/openrc-0.11.8.ebuild +++ /dev/null @@ -1,512 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.11.8.ebuild,v 1.7 2013/01/02 19:20:39 armin76 Exp $ - -EAPI=4 - -inherit eutils flag-o-matic multilib pam toolchain-funcs - -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" -HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git" - inherit git-2 -else - SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="debug elibc_glibc ncurses pam newnet prefix selinux static-libs unicode - kernel_linux kernel_FreeBSD" - -RDEPEND="virtual/init - kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) - elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) - pam? ( sys-auth/pambase ) - >=sys-apps/baselayout-2.1-r1 - kernel_linux? ( - sys-process/psmisc - ) - !<sys-fs/udev-init-scripts-17 - !<sys-fs/udev-133" -DEPEND="${RDEPEND} - virtual/os-headers" - -src_prepare() { - sed -i 's:0444:0644:' mk/sys.mk || die - sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342 - - if [[ ${PV} == "9999" ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die - fi - - # Allow user patches to be applied without modifying the ebuild - epatch_user - - # Kogaion custom config - epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" - epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch - epatch "${FILESDIR}/${PN}-netmount-fix.patch" - epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" - - # Kogaion bug fixes - epatch "${FILESDIR}/${PN}-0.9.9.3-do-not-print-error-if-tmplog-cannot-be-read.patch" -} - -src_compile() { - unset LIBDIR #266688 - - MAKE_ARGS="${MAKE_ARGS} - LIBNAME=$(get_libdir) - LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc" - - local brand="Unknown" - if use kernel_linux ; then - MAKE_ARGS="${MAKE_ARGS} OS=Linux" - brand="Linux" - elif use kernel_FreeBSD ; then - MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" - brand="FreeBSD" - fi - if use selinux; then - MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes" - fi - export BRANDING="Kogaion ${brand}" - if ! use static-libs; then - MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no" - fi - use newnet || MAKE_ARGS="${MAKE_ARGS} MKNET=oldnet" - use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" - export DEBUG=$(usev debug) - export MKPAM=$(usev pam) - export MKTERMCAP=$(usev ncurses) - - tc-export CC AR RANLIB - emake ${MAKE_ARGS} -} - -# set_config <file> <option name> <yes value> <no value> test -# a value of "#" will just comment out the option -set_config() { - local file="${ED}/$1" var=$2 val com - eval "${@:5}" && val=$3 || val=$4 - [[ ${val} == "#" ]] && com="#" && val='\2' - sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}" -} - -set_config_yes_no() { - set_config "$1" "$2" YES NO "${@:3}" -} - -src_install() { - emake ${MAKE_ARGS} DESTDIR="${D}" install - - # move the shared libs back to /usr so ldscript can install - # more of a minimal set of files - # disabled for now due to #270646 - #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die - #gen_usr_ldscript -a einfo rc - gen_usr_ldscript libeinfo.so - gen_usr_ldscript librc.so - - if ! use kernel_linux; then - keepdir /$(get_libdir)/rc/init.d - fi - keepdir /$(get_libdir)/rc/tmp - - # Backup our default runlevels - dodir /usr/share/"${PN}" - cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die - rm -rf "${ED}"/etc/runlevels - - # Install the default net configuration - doconfd conf.d/net - - # Setup unicode defaults for silly unicode users - set_config_yes_no /etc/rc.conf unicode use unicode - - # Cater to the norm - set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')' - - # On HPPA, do not run consolefont by default (bug #222889) - if use hppa; then - rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont - fi - - # Support for logfile rotation - insinto /etc/logrotate.d - newins "${FILESDIR}"/openrc.logrotate openrc - - # Kogaion customization, do not bug user with annoying updates (for now) - mv "${ED}"/etc/conf.d/keymaps "${ED}"/etc/conf.d/keymaps.example || \ - die "cannot move keymaps" - mv "${ED}"/etc/conf.d/hwclock "${ED}"/etc/conf.d/hwclock.example || \ - die "cannot move hwclock" - - # install the gentoo pam.d file - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon -} - -add_boot_init() { - local initd=$1 - local runlevel=${2:-boot} - # if the initscript is not going to be installed and is not - # currently installed, return - [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \ - || return - [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return - - # if runlevels dont exist just yet, then create it but still flag - # to pkg_postinst that it needs real setup #277323 - if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then - mkdir -p "${EROOT}"etc/runlevels/${runlevel} - touch "${EROOT}"etc/runlevels/.add_boot_init.created - fi - - elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" - ln -snf "${EROOT}"etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd} -} -add_boot_init_mit_config() { - local config=$1 initd=$2 - if [[ -e ${EROOT}${config} ]] ; then - if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then - add_boot_init ${initd} - fi - fi -} - -pkg_preinst() { - local conf_file - # Kogaion customization, still protect conf files from being removed - # as no longer owned by package - for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}" ]; then - cp -p "${conf_file}" "${conf_file}.ebuild_preserved" # don't die - fi - done - - local f LIBDIR=$(get_libdir) - - # default net script is just comments, so no point in biting people - # in the ass by accident. we save in preinst so that the package - # manager doesnt go throwing etc-update crap at us -- postinst is - # too late to prevent that. this behavior also lets us keep the - # file in the CONTENTS for binary packages. - [[ -e "${EROOT}"etc/conf.d/net ]] && \ - cp -d "${EROOT}"etc/conf.d/net "${ED}"/etc/conf.d/ - - # avoid default thrashing in conf.d files when possible #295406 - if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then - ( - unset hostname HOSTNAME - source "${EROOT}"etc/conf.d/hostname - : ${hostname:=${HOSTNAME}} - [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" - ) - fi - - # upgrade timezone file ... do it before moving clock - if [[ -e ${EROOT}etc/conf.d/clock && ! -e ${EROOT}/etc/timezone ]] ; then - ( - unset TIMEZONE - source "${EROOT}"etc/conf.d/clock - [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${EROOT}"etc/timezone - ) - fi - - # /etc/conf.d/clock moved to /etc/conf.d/hwclock - local clock - use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" - if [[ -e "${EROOT}"etc/conf.d/clock ]] ; then - mv "${EROOT}"etc/conf.d/clock "${EROOT}"etc/conf.d/${clock} - fi - if [[ -e "${EROOT}"etc/init.d/clock ]] ; then - rm -f "${EROOT}"etc/init.d/clock - fi - if [[ -L "${EROOT}"etc/runlevels/boot/clock ]] ; then - rm -f "${EROOT}"etc/runlevels/boot/clock - ln -snf /etc/init.d/${clock} "${EROOT}"etc/runlevels/boot/${clock} - fi - if [[ -L "${EROOT}"${LIBDIR}/rc/init.d/started/clock ]] ; then - rm -f "${EROOT}"${LIBDIR}/rc/init.d/started/clock - ln -snf /etc/init.d/${clok} "${EROOT}"${LIBDIR}/rc/init.d/started/${clock} - fi - - # /etc/conf.d/rc is no longer used for configuration - if [[ -e "${EROOT}"etc/conf.d/rc ]] ; then - elog "/etc/conf.d/rc is no longer used for configuration." - elog "Please migrate your settings to /etc/rc.conf as applicable" - elog "and delete /etc/conf.d/rc" - fi - - # force net init.d scripts into symlinks - for f in "${EROOT}"etc/init.d/net.* ; do - [[ -e ${f} ]] || continue # catch net.* not matching anything - [[ ${f} == */net.lo ]] && continue # real file now - [[ ${f} == *.openrc.bak ]] && continue - if [[ ! -L ${f} ]] ; then - elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." - elog "You should delete '${f##*/}.openrc.bak' if you don't need it." - mv "${f}" "${f}.openrc.bak" - ln -snf net.lo "${f}" - fi - done - - # termencoding was added in 0.2.1 and needed in boot - has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding - - # swapfiles was added in 0.9.9 and needed in boot (february 2012) - has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles - - if ! has_version ">=sys-apps/openrc-0.11"; then - add_boot_init sysfs sysinit - fi - - # set default interactive shell to sulogin if it exists - set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin - - has_version sys-apps/openrc || migrate_from_baselayout_1 - has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script - if ! has_version ">=sys-apps/openrc-0.11.3" ; then - migrate_udev_mount_script - add_boot_init tmpfiles.setup boot - fi -} - -# >=openrc-0.4.0 no longer loads the udev addon -migrate_udev_init_script() { - # make sure udev is in sysinit if it was enabled before - local enable_udev=false - local rc_devices=$( - [[ -f /etc/rc.conf ]] && source /etc/rc.conf - [[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc - echo "${rc_devices:-${RC_DEVICES:-auto}}" - ) - case ${rc_devices} in - udev|auto) - enable_udev=true - ;; - esac - - if $enable_udev; then - add_boot_init udev sysinit - add_boot_init udev-postmount default - fi -} - -# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev. -migrate_udev_mount_script() { - if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \ - ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then - add_boot_init udev-mount sysinit - fi - return 0 -} - -migrate_from_baselayout_1() { - # baselayout boot init scripts have been split out - for f in $(cd "${ED}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do - # baselayout-1 is always "old" net, so ignore "new" net - [[ ${f} == "network" ]] && continue - - add_boot_init ${f} - done - - # Try to auto-add some addons when possible - add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt - add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt - add_boot_init_mit_config /etc/mdadm.conf mdraid - add_boot_init_mit_config /etc/evms.conf evms - [[ -e "${EROOT}"sbin/dmsetup ]] && add_boot_init device-mapper - [[ -e "${EROOT}"sbin/vgscan ]] && add_boot_init lvm - elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" - elog "init.d scripts. If you use such a thing, make sure you have the" - elog "required init.d scripts added to your boot runlevel." - - # Upgrade our state for baselayout-1 users - if [[ ! -e "${EROOT}"${LIBDIR}/rc/init.d/started ]] ; then - ( - [[ -e "${EROOT}"etc/conf.d/rc ]] && source "${EROOT}"/etc/conf.d/rc - svcdir=${svcdir:-/var/lib/init.d} - if [[ ! -d "${EROOT}"${svcdir}/started ]] ; then - ewarn "No state found, and no state exists" - elog "You should reboot this host" - else - mkdir -p "${EROOT}"${LIBDIR}/rc/init.d - einfo "Moving state from ${EROOT}${svcdir} to ${EROOT}${LIBDIR}/rc/init.d" - mv "${EROOT}${svcdir}"/* "${EROOT}${LIBDIR}"/rc/init.d - rm -rf "${EROOT}${LIBDIR}"/rc/init.d/daemons \ - "${EROOT}${LIBDIR}"/rc/init.d/console - umount "${EROOT}${svcdir}" 2>/dev/null - rm -rf "${EROOT}${svcdir}" - fi - ) - fi - - # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition - if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then - elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" - rm -f "${EROOT}"etc/modules.autoload.d/.keep* - rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null - if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then - local f v - for f in "${EROOT}"etc/modules.autoload.d/* ; do - v=${f##*/} - v=${v#kernel-} - v=${v//[^[:alnum:]]/_} - gawk -v v="${v}" -v f="${f##*/}" ' - BEGIN { print "\n### START: Auto-converted from " f "\n" } - { - if ($0 ~ /^[^#]/) { - print "modules_" v "=\"${modules_" v "} " $1 "\"" - gsub(/[^[:alnum:]]/, "_", $1) - printf "module_" $1 "_args_" v "=\"" - for (i = 2; i <= NF; ++i) { - if (i > 2) - printf " " - printf $i - } - print "\"\n" - } else - print - } - END { print "\n### END: Auto-converted from " f "\n" } - ' "${f}" >> "${ED}"/etc/conf.d/modules - done - rm -f "${f}" - rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null - fi - fi -} - -pkg_postinst() { - local conf_file - # Kogaion customization, do not bug user with tedious, useless config file updates - for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}.ebuild_preserved" ]; then - cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die - elif [ ! -e "${conf_file}" ]; then - cp -p "${conf_file}.example" "${conf_file}" # don't die - fi - chown root:root "${conf_file}" # don't die - done - local LIBDIR=$(get_libdir) - - # Remove old baselayout links - rm -f "${EROOT}"etc/runlevels/boot/{check{fs,root},rmnologin} - rm -f "${EROOT}"etc/init.d/{depscan,runscript}.sh - - # Make our runlevels if they don't exist - if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then - einfo "Copying across default runlevels" - cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc - rm -f "${EROOT}"etc/runlevels/.add_boot_init.created - else - if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then - mkdir -p "${EROOT}"etc/runlevels/sysinit - cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \ - "${EROOT}"etc/runlevels/sysinit - fi - if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then - mkdir -p "${EROOT}"etc/runlevels/shutdown - cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \ - "${EROOT}"etc/runlevels/shutdown - fi - fi - - # /etc/conf.d/net.example is no longer valid - local NET_EXAMPLE="${EROOT}etc/conf.d/net.example" - local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210' - if [[ -e "${NET_EXAMPLE}" ]] ; then - if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then - rm -f "${NET_EXAMPLE}" - elog "${NET_EXAMPLE} has been removed." - else - sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}" - elog "${NET_EXAMPLE} should be removed." - fi - elog "The new file is ${EROOT}usr/share/doc/${PF}/net.example" - fi - - # /etc/conf.d/wireless.example is no longer valid - local WIRELESS_EXAMPLE="${EROOT}etc/conf.d/wireless.example" - local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3' - if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then - if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then - rm -f "${WIRELESS_EXAMPLE}" - elog "${WIRELESS_EXAMPLE} is deprecated and has been removed." - else - sed -i '1i# This file is obsolete.\n' "${WIRELESS_EXAMPLE}" - elog "${WIRELESS_EXAMPLE} is deprecated and should be removed." - fi - elog "If you are using the old style network scripts," - elog "Configure wireless settings in ${EROOT}etc/conf.d/net" - elog "after reviewing ${EROOT}usr/share/doc/${PF}/net.example" - fi - - if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then - ewarn "/etc/modules.autoload.d is no longer used. Please convert" - ewarn "your files to /etc/conf.d/modules and delete the directory." - fi - - if use hppa; then - elog "Setting the console font does not work on all HPPA consoles." - elog "You can still enable it by running:" - elog "# rc-update add consolefont boot" - fi - - # Handle the conf.d/local.{start,stop} -> local.d transition - if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then - elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}" - elog "files to ${EROOT}etc/local.d" - mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start - mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop - chmod +x "${EROOT}"etc/local.d/*{start,stop} - fi - - if use kernel_linux && [[ "${EROOT}" = "/" ]]; then - /$(get_libdir)/rc/sh/migrate-to-run.sh - fi - - # update the dependency tree after touching all files #224171 - [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u - - if use newnet; then - local netscript=network - else - local netscript=net.lo - fi - - if [ ! -e "${EROOT}"etc/runlevels/boot/${netscript} ]; then - ewarn "Please add the $netscript script to your boot runlevel" - ewarn "as soon as possible. Not doing so could leave you with a system" - ewarn "without networking." - fi - - ewarn "In this version of OpenRC, the loopback interface no longer" - ewarn "satisfies the net virtual." - ewarn "If you have services now which do not start because of this," - ewarn "They can be fixed by adding rc_need=\"!net\"" - ewarn "to the ${EROOT}etc/conf.d/<servicename> file." - ewarn "You should also file a bug against the service asking that" - ewarn "need net be dropped from the dependencies." - ewarn "The bug you file should block the following tracker:" - ewarn "https://bugs.gentoo.org/show_bug.cgi?id=439092" - - ewarn "This version of OpenRC doesn't enable nfs mounts automatically any" - ewarn "longer. In order to mount nfs file systems, you must use the" - ewarn "nfsmount service from the nfs-utils package." - ewarn "See bug https://bugs.gentoo.org/show_bug.cgi?id=427996 for" - ewarn "more information on this." - - elog "You should now update all files in /etc, using etc-update" - elog "or equivalent before restarting any services or this host." - elog - elog "Please read the migration guide available at:" - elog "http://www.gentoo.org/doc/en/openrc-migration.xml" -} diff --git a/sys-apps/openrc/openrc-0.12.4.ebuild b/sys-apps/openrc/openrc-0.12.4.ebuild deleted file mode 100644 index 551e6461..00000000 --- a/sys-apps/openrc/openrc-0.12.4.ebuild +++ /dev/null @@ -1,356 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit eutils flag-o-matic multilib pam toolchain-funcs - -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" -HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="git://github.com/OpenRC/${PN}.git" - inherit git-2 -else - SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs - tools unicode kernel_linux kernel_FreeBSD" - -COMMON_DEPEND=">=sys-apps/baselayout-2.1-r1 - kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) - elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) - pam? ( sys-auth/pambase ) - tools? ( dev-lang/perl ) - kernel_linux? ( - sys-process/psmisc - ) - selinux? ( sec-policy/selinux-openrc ) - !<sys-fs/udev-init-scripts-17 - !<sys-fs/udev-133" -DEPEND="${COMMON_DEPEND} - virtual/os-headers - ncurses? ( virtual/pkgconfig )" -RDEPEND="${COMMON_DEPEND} - !prefix? ( - kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) ) - kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) - )" - -PDEPEND="netifrc? ( net-misc/netifrc )" - -src_prepare() { - sed -i 's:0444:0644:' mk/sys.mk || die - - if [[ ${PV} == "9999" ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die - fi - - # Allow user patches to be applied without modifying the ebuild - epatch_user - - # Argent custom config - epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" - epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch - epatch "${FILESDIR}/${PN}-netmount-fix.patch" - epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" - - # Argent bug fixes - epatch "${FILESDIR}/${PN}-0.9.9.3-do-not-print-error-if-tmplog-cannot-be-read.patch" - - # Linux 3.10 and EFI - epatch "${FILESDIR}/0001-efivarfs-Support-EFI-variable-access-in-3.10-kernels.patch" -} - -src_compile() { - unset LIBDIR #266688 - - MAKE_ARGS="${MAKE_ARGS} - LIBNAME=$(get_libdir) - LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc - MKSELINUX=$(usex selinux) - MKSTATICLIBS=$(usex static-libs) - MKTOOLS=$(usex tools)" - - local brand="Unknown" - if use kernel_linux ; then - MAKE_ARGS="${MAKE_ARGS} OS=Linux" - brand="Linux" - elif use kernel_FreeBSD ; then - MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" - brand="FreeBSD" - fi - export BRANDING="Argent ${brand}" - use newnet || MAKE_ARGS="${MAKE_ARGS} MKNET=oldnet" - use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" - export DEBUG=$(usev debug) - export MKPAM=$(usev pam) - export MKTERMCAP=$(usev ncurses) - - tc-export CC AR RANLIB - emake ${MAKE_ARGS} -} - -# set_config <file> <option name> <yes value> <no value> test -# a value of "#" will just comment out the option -set_config() { - local file="${ED}/$1" var=$2 val com - eval "${@:5}" && val=$3 || val=$4 - [[ ${val} == "#" ]] && com="#" && val='\2' - sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}" -} - -set_config_yes_no() { - set_config "$1" "$2" YES NO "${@:3}" -} - -src_install() { - emake ${MAKE_ARGS} DESTDIR="${D}" install - - # move the shared libs back to /usr so ldscript can install - # more of a minimal set of files - # disabled for now due to #270646 - #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die - #gen_usr_ldscript -a einfo rc - gen_usr_ldscript libeinfo.so - gen_usr_ldscript librc.so - - if ! use kernel_linux; then - keepdir /$(get_libdir)/rc/init.d - fi - keepdir /$(get_libdir)/rc/tmp - - # Backup our default runlevels - dodir /usr/share/"${PN}" - cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die - rm -rf "${ED}"/etc/runlevels - - # Setup unicode defaults for silly unicode users - set_config_yes_no /etc/rc.conf unicode use unicode - - # Cater to the norm - set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')' - - # On HPPA, do not run consolefont by default (bug #222889) - if use hppa; then - rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont - fi - - # Support for logfile rotation - insinto /etc/logrotate.d - newins "${FILESDIR}"/openrc.logrotate openrc - - # Argent customization, do not bug user with annoying updates (for now) - mv "${ED}"/etc/conf.d/keymaps "${ED}"/etc/conf.d/keymaps.example || \ - die "cannot move keymaps" - mv "${ED}"/etc/conf.d/hwclock "${ED}"/etc/conf.d/hwclock.example || \ - die "cannot move hwclock" - - # install the gentoo pam.d file - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon - - # install documentation - dodoc README.busybox - if use newnet; then - dodoc README.newnet - fi -} - -add_boot_init() { - local initd=$1 - local runlevel=${2:-boot} - # if the initscript is not going to be installed and is not - # currently installed, return - [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \ - || return - [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return - - # if runlevels dont exist just yet, then create it but still flag - # to pkg_postinst that it needs real setup #277323 - if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then - mkdir -p "${EROOT}"etc/runlevels/${runlevel} - touch "${EROOT}"etc/runlevels/.add_boot_init.created - fi - - elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" - ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd} -} -add_boot_init_mit_config() { - local config=$1 initd=$2 - if [[ -e ${EROOT}${config} ]] ; then - if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then - add_boot_init ${initd} - fi - fi -} - -pkg_preinst() { - local conf_file - # Argent customization, still protect conf files from being removed - # as no longer owned by package - for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}" ]; then - cp -p "${conf_file}" "${conf_file}.ebuild_preserved" # don't die - fi - done - - local f LIBDIR=$(get_libdir) - - # avoid default thrashing in conf.d files when possible #295406 - if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then - ( - unset hostname HOSTNAME - source "${EROOT}"etc/conf.d/hostname - : ${hostname:=${HOSTNAME}} - [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" - ) - fi - - # set default interactive shell to sulogin if it exists - set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin - - # termencoding was added in 0.2.1 and needed in boot - has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding - - # swapfiles was added in 0.9.9 and needed in boot (february 2012) - has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles - - if ! has_version ">=sys-apps/openrc-0.11"; then - add_boot_init sysfs sysinit - fi - - if ! has_version ">=sys-apps/openrc-0.11.3" ; then - migrate_udev_mount_script - add_boot_init tmpfiles.setup boot - fi - - # these were added in 0.12. - if ! has_version ">=sys-apps/openrc-0.12"; then - add_boot_init loopback - add_boot_init tmpfiles.dev sysinit - - # ensure existing /etc/conf.d/net is not removed - # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier - # this needs to stay in openrc ebuilds for a long time. :( - # Added in 0.12. - if [[ -f "${EROOT}"etc/conf.d/net ]]; then - einfo "Modifying conf.d/net to keep it from being removed" - cat <<-EOF >>"${EROOT}"etc/conf.d/net - -# The network scripts are now part of net-misc/netifrc -# In order to avoid sys-apps/${P} from removing this file, this comment was -# added; you can safely remove this comment. Please see -# /usr/share/doc/netifrc*/README* for more information. -EOF - fi - fi -} - -# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev. -migrate_udev_mount_script() { - if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \ - ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then - add_boot_init udev-mount sysinit - fi - return 0 -} - -pkg_postinst() { - local conf_file - # Argent customization, do not bug user with tedious, useless config file updates - for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}.ebuild_preserved" ]; then - cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die - elif [ ! -e "${conf_file}" ]; then - cp -p "${conf_file}.example" "${conf_file}" # don't die - fi - chown root:root "${conf_file}" # don't die - done - - local LIBDIR=$(get_libdir) - - # Make our runlevels if they don't exist - if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then - einfo "Copying across default runlevels" - cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc - rm -f "${EROOT}"etc/runlevels/.add_boot_init.created - else - if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then - mkdir -p "${EROOT}"etc/runlevels/sysinit - cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \ - "${EROOT}"etc/runlevels/sysinit - fi - if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then - mkdir -p "${EROOT}"etc/runlevels/shutdown - cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \ - "${EROOT}"etc/runlevels/shutdown - fi - fi - - if use hppa; then - elog "Setting the console font does not work on all HPPA consoles." - elog "You can still enable it by running:" - elog "# rc-update add consolefont boot" - fi - - # Handle the conf.d/local.{start,stop} -> local.d transition - if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then - elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}" - elog "files to ${EROOT}etc/local.d" - mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start - mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop - chmod +x "${EROOT}"etc/local.d/*{start,stop} - fi - - if use kernel_linux && [[ "${EROOT}" = "/" ]]; then - if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then - ewarn "The dependency data could not be migrated to /run/openrc." - ewarn "This means you need to reboot your system." - fi - fi - - # update the dependency tree after touching all files #224171 - [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u - - if ! use newnet && ! use netifrc; then - ewarn "You have emerged OpenRc without network support. This" - ewarn "means you need to SET UP a network manager such as" - ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd," - ewarn "net-misc/NetworkManager, or net-misc/badvpn." - ewarn "Or, you have the option of emerging openrc with the newnet" - ewarn "use flag and configuring /etc/conf.d/network and" - ewarn "/etc/conf.d/staticroute if you only use static interfaces." - fi - - if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then - ewarn "Please add the network service to your boot runlevel" - ewarn "as soon as possible. Not doing so could leave you with a system" - ewarn "without networking." - fi - - ewarn "In this version of OpenRC, the loopback interface no longer" - ewarn "satisfies the net virtual." - ewarn "If you have services now which do not start because of this," - ewarn "They can be fixed by adding rc_need=\"!net\"" - ewarn "to the ${EROOT}etc/conf.d/<servicename> file." - ewarn "You should also file a bug against the service asking that" - ewarn "need net be dropped from the dependencies." - ewarn "The bug you file should block the following tracker:" - ewarn "https://bugs.gentoo.org/show_bug.cgi?id=439092" - - ewarn "This version of OpenRC doesn't enable nfs mounts automatically any" - ewarn "longer. In order to mount nfs file systems, you must use the" - ewarn "nfsmount service from the nfs-utils package." - ewarn "See bug https://bugs.gentoo.org/show_bug.cgi?id=427996 for" - ewarn "more information on this." - - elog "You should now update all files in /etc, using etc-update" - elog "or equivalent before restarting any services or this host." -} diff --git a/sys-apps/openrc/openrc-0.12_pre1-r1.ebuild b/sys-apps/openrc/openrc-0.12_pre1-r1.ebuild deleted file mode 100644 index 62fff71d..00000000 --- a/sys-apps/openrc/openrc-0.12_pre1-r1.ebuild +++ /dev/null @@ -1,518 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit eutils flag-o-matic multilib pam toolchain-funcs - -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" -HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/" - -if [[ ${PV} == "0.12_pre1" ]]; then - EGIT_REPO_URI="git://github.com/OpenRC/openrc.git" - EGIT_COMMIT="9f14fd7ae10d8ae724045a57a2eb25c1d4290a3b" - inherit git-2 - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -else - SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="debug elibc_glibc ncurses pam newnet prefix selinux static-libs unicode - kernel_linux kernel_FreeBSD" - -RDEPEND="virtual/init - kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) - elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) - pam? ( sys-auth/pambase ) - >=sys-apps/baselayout-2.1-r1 - kernel_linux? ( - sys-process/psmisc - ) - !<sys-fs/udev-init-scripts-17 - !<sys-fs/udev-133" -DEPEND="${RDEPEND} - virtual/os-headers" - -src_prepare() { - sed -i 's:0444:0644:' mk/sys.mk || die - sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342 - - if [[ ${PV} == "0.12_pre1" ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die - fi - - # Allow user patches to be applied without modifying the ebuild - epatch_user - - # Argent custom config - epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" - epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch - epatch "${FILESDIR}/${PN}-netmount-fix.patch" - epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" - - # Sabayon bug fixes - epatch "${FILESDIR}/${PN}-0.9.9.3-do-not-print-error-if-tmplog-cannot-be-read.patch" - - # Fix pam_systemd + logind support - epatch "${FILESDIR}/0001-Filter-the-systemd-cgroup-from-the-current-process.patch" -} - -src_compile() { - unset LIBDIR #266688 - - MAKE_ARGS="${MAKE_ARGS} - LIBNAME=$(get_libdir) - LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc" - - local brand="Unknown" - if use kernel_linux ; then - MAKE_ARGS="${MAKE_ARGS} OS=Linux" - brand="Linux" - elif use kernel_FreeBSD ; then - MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" - brand="FreeBSD" - fi - if use selinux; then - MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes" - fi - export BRANDING="Argent ${brand}" - if ! use static-libs; then - MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no" - fi - use newnet || MAKE_ARGS="${MAKE_ARGS} MKNET=oldnet" - use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" - export DEBUG=$(usev debug) - export MKPAM=$(usev pam) - export MKTERMCAP=$(usev ncurses) - - tc-export CC AR RANLIB - emake ${MAKE_ARGS} -} - -# set_config <file> <option name> <yes value> <no value> test -# a value of "#" will just comment out the option -set_config() { - local file="${ED}/$1" var=$2 val com - eval "${@:5}" && val=$3 || val=$4 - [[ ${val} == "#" ]] && com="#" && val='\2' - sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}" -} - -set_config_yes_no() { - set_config "$1" "$2" YES NO "${@:3}" -} - -src_install() { - emake ${MAKE_ARGS} DESTDIR="${D}" install - - # move the shared libs back to /usr so ldscript can install - # more of a minimal set of files - # disabled for now due to #270646 - #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die - #gen_usr_ldscript -a einfo rc - gen_usr_ldscript libeinfo.so - gen_usr_ldscript librc.so - - if ! use kernel_linux; then - keepdir /$(get_libdir)/rc/init.d - fi - keepdir /$(get_libdir)/rc/tmp - - # Backup our default runlevels - dodir /usr/share/"${PN}" - cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die - rm -rf "${ED}"/etc/runlevels - - # Install the default net configuration - doconfd conf.d/net - - # Setup unicode defaults for silly unicode users - set_config_yes_no /etc/rc.conf unicode use unicode - - # Cater to the norm - set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')' - - # On HPPA, do not run consolefont by default (bug #222889) - if use hppa; then - rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont - fi - - # Support for logfile rotation - insinto /etc/logrotate.d - newins "${FILESDIR}"/openrc.logrotate openrc - - # Argent customization, do not bug user with annoying updates (for now) - mv "${ED}"/etc/conf.d/keymaps "${ED}"/etc/conf.d/keymaps.example || \ - die "cannot move keymaps" - mv "${ED}"/etc/conf.d/hwclock "${ED}"/etc/conf.d/hwclock.example || \ - die "cannot move hwclock" - - # install the gentoo pam.d file - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon -} - -add_boot_init() { - local initd=$1 - local runlevel=${2:-boot} - # if the initscript is not going to be installed and is not - # currently installed, return - [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \ - || return - [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return - - # if runlevels dont exist just yet, then create it but still flag - # to pkg_postinst that it needs real setup #277323 - if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then - mkdir -p "${EROOT}"etc/runlevels/${runlevel} - touch "${EROOT}"etc/runlevels/.add_boot_init.created - fi - - elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" - ln -snf "${EROOT}"etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd} -} -add_boot_init_mit_config() { - local config=$1 initd=$2 - if [[ -e ${EROOT}${config} ]] ; then - if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then - add_boot_init ${initd} - fi - fi -} - -pkg_preinst() { - local conf_file - # Argent customization, still protect conf files from being removed - # as no longer owned by package - for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}" ]; then - cp -p "${conf_file}" "${conf_file}.ebuild_preserved" # don't die - fi - done - - local f LIBDIR=$(get_libdir) - - # default net script is just comments, so no point in biting people - # in the ass by accident. we save in preinst so that the package - # manager doesnt go throwing etc-update crap at us -- postinst is - # too late to prevent that. this behavior also lets us keep the - # file in the CONTENTS for binary packages. - # Argent, use cp -d as per Gentoo bug #462674 - [[ -e "${EROOT}"etc/conf.d/net ]] && \ - cp -d "${EROOT}"etc/conf.d/net "${ED}"/etc/conf.d/ - - # avoid default thrashing in conf.d files when possible #295406 - if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then - ( - unset hostname HOSTNAME - source "${EROOT}"etc/conf.d/hostname - : ${hostname:=${HOSTNAME}} - [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" - ) - fi - - # upgrade timezone file ... do it before moving clock - if [[ -e ${EROOT}etc/conf.d/clock && ! -e ${EROOT}/etc/timezone ]] ; then - ( - unset TIMEZONE - source "${EROOT}"etc/conf.d/clock - [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${EROOT}"etc/timezone - ) - fi - - # /etc/conf.d/clock moved to /etc/conf.d/hwclock - local clock - use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" - if [[ -e "${EROOT}"etc/conf.d/clock ]] ; then - mv "${EROOT}"etc/conf.d/clock "${EROOT}"etc/conf.d/${clock} - fi - if [[ -e "${EROOT}"etc/init.d/clock ]] ; then - rm -f "${EROOT}"etc/init.d/clock - fi - if [[ -L "${EROOT}"etc/runlevels/boot/clock ]] ; then - rm -f "${EROOT}"etc/runlevels/boot/clock - ln -snf /etc/init.d/${clock} "${EROOT}"etc/runlevels/boot/${clock} - fi - if [[ -L "${EROOT}"${LIBDIR}/rc/init.d/started/clock ]] ; then - rm -f "${EROOT}"${LIBDIR}/rc/init.d/started/clock - ln -snf /etc/init.d/${clok} "${EROOT}"${LIBDIR}/rc/init.d/started/${clock} - fi - - # /etc/conf.d/rc is no longer used for configuration - if [[ -e "${EROOT}"etc/conf.d/rc ]] ; then - elog "/etc/conf.d/rc is no longer used for configuration." - elog "Please migrate your settings to /etc/rc.conf as applicable" - elog "and delete /etc/conf.d/rc" - fi - - # force net init.d scripts into symlinks - for f in "${EROOT}"etc/init.d/net.* ; do - [[ -e ${f} ]] || continue # catch net.* not matching anything - [[ ${f} == */net.lo ]] && continue # real file now - [[ ${f} == *.openrc.bak ]] && continue - if [[ ! -L ${f} ]] ; then - elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." - elog "You should delete '${f##*/}.openrc.bak' if you don't need it." - mv "${f}" "${f}.openrc.bak" - ln -snf net.lo "${f}" - fi - done - - # termencoding was added in 0.2.1 and needed in boot - has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding - - # swapfiles was added in 0.9.9 and needed in boot (february 2012) - has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles - - if ! has_version ">=sys-apps/openrc-0.11"; then - add_boot_init sysfs sysinit - fi - - # set default interactive shell to sulogin if it exists - set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin - - has_version sys-apps/openrc || migrate_from_baselayout_1 - has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script - if ! has_version ">=sys-apps/openrc-0.11.3" ; then - migrate_udev_mount_script - add_boot_init tmpfiles.setup boot - fi -} - -# >=openrc-0.4.0 no longer loads the udev addon -migrate_udev_init_script() { - # make sure udev is in sysinit if it was enabled before - local enable_udev=false - local rc_devices=$( - [[ -f /etc/rc.conf ]] && source /etc/rc.conf - [[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc - echo "${rc_devices:-${RC_DEVICES:-auto}}" - ) - case ${rc_devices} in - udev|auto) - enable_udev=true - ;; - esac - - if $enable_udev; then - add_boot_init udev sysinit - add_boot_init udev-postmount default - fi -} - -# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev. -migrate_udev_mount_script() { - if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \ - ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then - add_boot_init udev-mount sysinit - fi - return 0 -} - -migrate_from_baselayout_1() { - # baselayout boot init scripts have been split out - for f in $(cd "${ED}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do - # baselayout-1 is always "old" net, so ignore "new" net - [[ ${f} == "network" ]] && continue - - add_boot_init ${f} - done - - # Try to auto-add some addons when possible - add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt - add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt - add_boot_init_mit_config /etc/mdadm.conf mdraid - add_boot_init_mit_config /etc/evms.conf evms - [[ -e "${EROOT}"sbin/dmsetup ]] && add_boot_init device-mapper - [[ -e "${EROOT}"sbin/vgscan ]] && add_boot_init lvm - elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" - elog "init.d scripts. If you use such a thing, make sure you have the" - elog "required init.d scripts added to your boot runlevel." - - # Upgrade our state for baselayout-1 users - if [[ ! -e "${EROOT}"${LIBDIR}/rc/init.d/started ]] ; then - ( - [[ -e "${EROOT}"etc/conf.d/rc ]] && source "${EROOT}"/etc/conf.d/rc - svcdir=${svcdir:-/var/lib/init.d} - if [[ ! -d "${EROOT}"${svcdir}/started ]] ; then - ewarn "No state found, and no state exists" - elog "You should reboot this host" - else - mkdir -p "${EROOT}"${LIBDIR}/rc/init.d - einfo "Moving state from ${EROOT}${svcdir} to ${EROOT}${LIBDIR}/rc/init.d" - mv "${EROOT}${svcdir}"/* "${EROOT}${LIBDIR}"/rc/init.d - rm -rf "${EROOT}${LIBDIR}"/rc/init.d/daemons \ - "${EROOT}${LIBDIR}"/rc/init.d/console - umount "${EROOT}${svcdir}" 2>/dev/null - rm -rf "${EROOT}${svcdir}" - fi - ) - fi - - # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition - if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then - elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" - rm -f "${EROOT}"etc/modules.autoload.d/.keep* - rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null - if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then - local f v - for f in "${EROOT}"etc/modules.autoload.d/* ; do - v=${f##*/} - v=${v#kernel-} - v=${v//[^[:alnum:]]/_} - gawk -v v="${v}" -v f="${f##*/}" ' - BEGIN { print "\n### START: Auto-converted from " f "\n" } - { - if ($0 ~ /^[^#]/) { - print "modules_" v "=\"${modules_" v "} " $1 "\"" - gsub(/[^[:alnum:]]/, "_", $1) - printf "module_" $1 "_args_" v "=\"" - for (i = 2; i <= NF; ++i) { - if (i > 2) - printf " " - printf $i - } - print "\"\n" - } else - print - } - END { print "\n### END: Auto-converted from " f "\n" } - ' "${f}" >> "${ED}"/etc/conf.d/modules - done - rm -f "${f}" - rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null - fi - fi -} - -pkg_postinst() { - local conf_file - # Argent customization, do not bug user with tedious, useless config file updates - for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}.ebuild_preserved" ]; then - cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die - elif [ ! -e "${conf_file}" ]; then - cp -p "${conf_file}.example" "${conf_file}" # don't die - fi - chown root:root "${conf_file}" # don't die - done - local LIBDIR=$(get_libdir) - - # Remove old baselayout links - rm -f "${EROOT}"etc/runlevels/boot/{check{fs,root},rmnologin} - rm -f "${EROOT}"etc/init.d/{depscan,runscript}.sh - - # Make our runlevels if they don't exist - if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then - einfo "Copying across default runlevels" - cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc - rm -f "${EROOT}"etc/runlevels/.add_boot_init.created - else - if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then - mkdir -p "${EROOT}"etc/runlevels/sysinit - cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \ - "${EROOT}"etc/runlevels/sysinit - fi - if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then - mkdir -p "${EROOT}"etc/runlevels/shutdown - cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \ - "${EROOT}"etc/runlevels/shutdown - fi - fi - - # /etc/conf.d/net.example is no longer valid - local NET_EXAMPLE="${EROOT}etc/conf.d/net.example" - local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210' - if [[ -e "${NET_EXAMPLE}" ]] ; then - if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then - rm -f "${NET_EXAMPLE}" - elog "${NET_EXAMPLE} has been removed." - else - sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}" - elog "${NET_EXAMPLE} should be removed." - fi - elog "The new file is ${EROOT}usr/share/doc/${PF}/net.example" - fi - - # /etc/conf.d/wireless.example is no longer valid - local WIRELESS_EXAMPLE="${EROOT}etc/conf.d/wireless.example" - local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3' - if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then - if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then - rm -f "${WIRELESS_EXAMPLE}" - elog "${WIRELESS_EXAMPLE} is deprecated and has been removed." - else - sed -i '1i# This file is obsolete.\n' "${WIRELESS_EXAMPLE}" - elog "${WIRELESS_EXAMPLE} is deprecated and should be removed." - fi - elog "If you are using the old style network scripts," - elog "Configure wireless settings in ${EROOT}etc/conf.d/net" - elog "after reviewing ${EROOT}usr/share/doc/${PF}/net.example" - fi - - if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then - ewarn "/etc/modules.autoload.d is no longer used. Please convert" - ewarn "your files to /etc/conf.d/modules and delete the directory." - fi - - if use hppa; then - elog "Setting the console font does not work on all HPPA consoles." - elog "You can still enable it by running:" - elog "# rc-update add consolefont boot" - fi - - # Handle the conf.d/local.{start,stop} -> local.d transition - if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then - elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}" - elog "files to ${EROOT}etc/local.d" - mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start - mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop - chmod +x "${EROOT}"etc/local.d/*{start,stop} - fi - - if use kernel_linux && [[ "${EROOT}" = "/" ]]; then - /$(get_libdir)/rc/sh/migrate-to-run.sh - fi - - # update the dependency tree after touching all files #224171 - [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u - - if use newnet; then - local netscript=network - else - local netscript=net.lo - fi - - if [ ! -e "${EROOT}"etc/runlevels/boot/${netscript} ]; then - ewarn "Please add the $netscript script to your boot runlevel" - ewarn "as soon as possible. Not doing so could leave you with a system" - ewarn "without networking." - fi - - ewarn "In this version of OpenRC, the loopback interface no longer" - ewarn "satisfies the net virtual." - ewarn "If you have services now which do not start because of this," - ewarn "They can be fixed by adding rc_need=\"!net\"" - ewarn "to the ${EROOT}etc/conf.d/<servicename> file." - ewarn "You should also file a bug against the service asking that" - ewarn "need net be dropped from the dependencies." - ewarn "The bug you file should block the following tracker:" - ewarn "https://bugs.gentoo.org/show_bug.cgi?id=439092" - - ewarn "This version of OpenRC doesn't enable nfs mounts automatically any" - ewarn "longer. In order to mount nfs file systems, you must use the" - ewarn "nfsmount service from the nfs-utils package." - ewarn "See bug https://bugs.gentoo.org/show_bug.cgi?id=427996 for" - ewarn "more information on this." - - elog "You should now update all files in /etc, using etc-update" - elog "or equivalent before restarting any services or this host." - elog - elog "Please read the migration guide available at:" - elog "http://www.gentoo.org/doc/en/openrc-migration.xml" -} diff --git a/sys-apps/openrc/openrc-0.12_pre1-r2.ebuild b/sys-apps/openrc/openrc-0.12_pre1-r2.ebuild deleted file mode 100644 index 90a059d6..00000000 --- a/sys-apps/openrc/openrc-0.12_pre1-r2.ebuild +++ /dev/null @@ -1,520 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit eutils flag-o-matic multilib pam toolchain-funcs - -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" -HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/" - -if [[ ${PV} == "0.12_pre1" ]]; then - EGIT_REPO_URI="git://github.com/OpenRC/openrc.git" - EGIT_COMMIT="9f14fd7ae10d8ae724045a57a2eb25c1d4290a3b" - inherit git-2 - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -else - SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="debug elibc_glibc ncurses pam newnet prefix selinux static-libs unicode - kernel_linux kernel_FreeBSD" - -RDEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) - elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) - pam? ( sys-auth/pambase ) - >=sys-apps/baselayout-2.1-r1 - kernel_linux? ( - sys-process/psmisc - ) - !<sys-fs/udev-init-scripts-17 - !<sys-fs/udev-133" -DEPEND="${RDEPEND} - virtual/os-headers" - -src_prepare() { - sed -i 's:0444:0644:' mk/sys.mk || die - sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342 - - if [[ ${PV} == "0.12_pre1" ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die - fi - - # Allow user patches to be applied without modifying the ebuild - epatch_user - - # Argent custom config - epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" - epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch - epatch "${FILESDIR}/${PN}-netmount-fix.patch" - epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" - - # Sabayon bug fixes - epatch "${FILESDIR}/${PN}-0.9.9.3-do-not-print-error-if-tmplog-cannot-be-read.patch" - - # Fix pam_systemd + logind support - epatch "${FILESDIR}/0001-Filter-the-systemd-cgroup-from-the-current-process.patch" - - # Linux 3.10 and EFI - epatch "${FILESDIR}/0001-efivarfs-Support-EFI-variable-access-in-3.10-kernels.patch" -} - -src_compile() { - unset LIBDIR #266688 - - MAKE_ARGS="${MAKE_ARGS} - LIBNAME=$(get_libdir) - LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc" - - local brand="Unknown" - if use kernel_linux ; then - MAKE_ARGS="${MAKE_ARGS} OS=Linux" - brand="Linux" - elif use kernel_FreeBSD ; then - MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" - brand="FreeBSD" - fi - if use selinux; then - MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes" - fi - export BRANDING="Argent ${brand}" - if ! use static-libs; then - MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no" - fi - use newnet || MAKE_ARGS="${MAKE_ARGS} MKNET=oldnet" - use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" - export DEBUG=$(usev debug) - export MKPAM=$(usev pam) - export MKTERMCAP=$(usev ncurses) - - tc-export CC AR RANLIB - emake ${MAKE_ARGS} -} - -# set_config <file> <option name> <yes value> <no value> test -# a value of "#" will just comment out the option -set_config() { - local file="${ED}/$1" var=$2 val com - eval "${@:5}" && val=$3 || val=$4 - [[ ${val} == "#" ]] && com="#" && val='\2' - sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}" -} - -set_config_yes_no() { - set_config "$1" "$2" YES NO "${@:3}" -} - -src_install() { - emake ${MAKE_ARGS} DESTDIR="${D}" install - - # move the shared libs back to /usr so ldscript can install - # more of a minimal set of files - # disabled for now due to #270646 - #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die - #gen_usr_ldscript -a einfo rc - gen_usr_ldscript libeinfo.so - gen_usr_ldscript librc.so - - if ! use kernel_linux; then - keepdir /$(get_libdir)/rc/init.d - fi - keepdir /$(get_libdir)/rc/tmp - - # Backup our default runlevels - dodir /usr/share/"${PN}" - cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die - rm -rf "${ED}"/etc/runlevels - - # Install the default net configuration - doconfd conf.d/net - - # Setup unicode defaults for silly unicode users - set_config_yes_no /etc/rc.conf unicode use unicode - - # Cater to the norm - set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')' - - # On HPPA, do not run consolefont by default (bug #222889) - if use hppa; then - rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont - fi - - # Support for logfile rotation - insinto /etc/logrotate.d - newins "${FILESDIR}"/openrc.logrotate openrc - - # Argent customization, do not bug user with annoying updates (for now) - mv "${ED}"/etc/conf.d/keymaps "${ED}"/etc/conf.d/keymaps.example || \ - die "cannot move keymaps" - mv "${ED}"/etc/conf.d/hwclock "${ED}"/etc/conf.d/hwclock.example || \ - die "cannot move hwclock" - - # install the gentoo pam.d file - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon -} - -add_boot_init() { - local initd=$1 - local runlevel=${2:-boot} - # if the initscript is not going to be installed and is not - # currently installed, return - [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \ - || return - [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return - - # if runlevels dont exist just yet, then create it but still flag - # to pkg_postinst that it needs real setup #277323 - if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then - mkdir -p "${EROOT}"etc/runlevels/${runlevel} - touch "${EROOT}"etc/runlevels/.add_boot_init.created - fi - - elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" - ln -snf "${EROOT}"etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd} -} -add_boot_init_mit_config() { - local config=$1 initd=$2 - if [[ -e ${EROOT}${config} ]] ; then - if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then - add_boot_init ${initd} - fi - fi -} - -pkg_preinst() { - local conf_file - # Argent customization, still protect conf files from being removed - # as no longer owned by package - for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}" ]; then - cp -p "${conf_file}" "${conf_file}.ebuild_preserved" # don't die - fi - done - - local f LIBDIR=$(get_libdir) - - # default net script is just comments, so no point in biting people - # in the ass by accident. we save in preinst so that the package - # manager doesnt go throwing etc-update crap at us -- postinst is - # too late to prevent that. this behavior also lets us keep the - # file in the CONTENTS for binary packages. - # Sabayon, use cp -d as per Gentoo bug #462674 - [[ -e "${EROOT}"etc/conf.d/net ]] && \ - cp -d "${EROOT}"etc/conf.d/net "${ED}"/etc/conf.d/ - - # avoid default thrashing in conf.d files when possible #295406 - if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then - ( - unset hostname HOSTNAME - source "${EROOT}"etc/conf.d/hostname - : ${hostname:=${HOSTNAME}} - [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" - ) - fi - - # upgrade timezone file ... do it before moving clock - if [[ -e ${EROOT}etc/conf.d/clock && ! -e ${EROOT}/etc/timezone ]] ; then - ( - unset TIMEZONE - source "${EROOT}"etc/conf.d/clock - [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${EROOT}"etc/timezone - ) - fi - - # /etc/conf.d/clock moved to /etc/conf.d/hwclock - local clock - use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" - if [[ -e "${EROOT}"etc/conf.d/clock ]] ; then - mv "${EROOT}"etc/conf.d/clock "${EROOT}"etc/conf.d/${clock} - fi - if [[ -e "${EROOT}"etc/init.d/clock ]] ; then - rm -f "${EROOT}"etc/init.d/clock - fi - if [[ -L "${EROOT}"etc/runlevels/boot/clock ]] ; then - rm -f "${EROOT}"etc/runlevels/boot/clock - ln -snf /etc/init.d/${clock} "${EROOT}"etc/runlevels/boot/${clock} - fi - if [[ -L "${EROOT}"${LIBDIR}/rc/init.d/started/clock ]] ; then - rm -f "${EROOT}"${LIBDIR}/rc/init.d/started/clock - ln -snf /etc/init.d/${clok} "${EROOT}"${LIBDIR}/rc/init.d/started/${clock} - fi - - # /etc/conf.d/rc is no longer used for configuration - if [[ -e "${EROOT}"etc/conf.d/rc ]] ; then - elog "/etc/conf.d/rc is no longer used for configuration." - elog "Please migrate your settings to /etc/rc.conf as applicable" - elog "and delete /etc/conf.d/rc" - fi - - # force net init.d scripts into symlinks - for f in "${EROOT}"etc/init.d/net.* ; do - [[ -e ${f} ]] || continue # catch net.* not matching anything - [[ ${f} == */net.lo ]] && continue # real file now - [[ ${f} == *.openrc.bak ]] && continue - if [[ ! -L ${f} ]] ; then - elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." - elog "You should delete '${f##*/}.openrc.bak' if you don't need it." - mv "${f}" "${f}.openrc.bak" - ln -snf net.lo "${f}" - fi - done - - # termencoding was added in 0.2.1 and needed in boot - has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding - - # swapfiles was added in 0.9.9 and needed in boot (february 2012) - has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles - - if ! has_version ">=sys-apps/openrc-0.11"; then - add_boot_init sysfs sysinit - fi - - # set default interactive shell to sulogin if it exists - set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin - - has_version sys-apps/openrc || migrate_from_baselayout_1 - has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script - if ! has_version ">=sys-apps/openrc-0.11.3" ; then - migrate_udev_mount_script - add_boot_init tmpfiles.setup boot - fi -} - -# >=openrc-0.4.0 no longer loads the udev addon -migrate_udev_init_script() { - # make sure udev is in sysinit if it was enabled before - local enable_udev=false - local rc_devices=$( - [[ -f /etc/rc.conf ]] && source /etc/rc.conf - [[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc - echo "${rc_devices:-${RC_DEVICES:-auto}}" - ) - case ${rc_devices} in - udev|auto) - enable_udev=true - ;; - esac - - if $enable_udev; then - add_boot_init udev sysinit - add_boot_init udev-postmount default - fi -} - -# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev. -migrate_udev_mount_script() { - if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \ - ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then - add_boot_init udev-mount sysinit - fi - return 0 -} - -migrate_from_baselayout_1() { - # baselayout boot init scripts have been split out - for f in $(cd "${ED}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do - # baselayout-1 is always "old" net, so ignore "new" net - [[ ${f} == "network" ]] && continue - - add_boot_init ${f} - done - - # Try to auto-add some addons when possible - add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt - add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt - add_boot_init_mit_config /etc/mdadm.conf mdraid - add_boot_init_mit_config /etc/evms.conf evms - [[ -e "${EROOT}"sbin/dmsetup ]] && add_boot_init device-mapper - [[ -e "${EROOT}"sbin/vgscan ]] && add_boot_init lvm - elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" - elog "init.d scripts. If you use such a thing, make sure you have the" - elog "required init.d scripts added to your boot runlevel." - - # Upgrade our state for baselayout-1 users - if [[ ! -e "${EROOT}"${LIBDIR}/rc/init.d/started ]] ; then - ( - [[ -e "${EROOT}"etc/conf.d/rc ]] && source "${EROOT}"/etc/conf.d/rc - svcdir=${svcdir:-/var/lib/init.d} - if [[ ! -d "${EROOT}"${svcdir}/started ]] ; then - ewarn "No state found, and no state exists" - elog "You should reboot this host" - else - mkdir -p "${EROOT}"${LIBDIR}/rc/init.d - einfo "Moving state from ${EROOT}${svcdir} to ${EROOT}${LIBDIR}/rc/init.d" - mv "${EROOT}${svcdir}"/* "${EROOT}${LIBDIR}"/rc/init.d - rm -rf "${EROOT}${LIBDIR}"/rc/init.d/daemons \ - "${EROOT}${LIBDIR}"/rc/init.d/console - umount "${EROOT}${svcdir}" 2>/dev/null - rm -rf "${EROOT}${svcdir}" - fi - ) - fi - - # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition - if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then - elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" - rm -f "${EROOT}"etc/modules.autoload.d/.keep* - rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null - if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then - local f v - for f in "${EROOT}"etc/modules.autoload.d/* ; do - v=${f##*/} - v=${v#kernel-} - v=${v//[^[:alnum:]]/_} - gawk -v v="${v}" -v f="${f##*/}" ' - BEGIN { print "\n### START: Auto-converted from " f "\n" } - { - if ($0 ~ /^[^#]/) { - print "modules_" v "=\"${modules_" v "} " $1 "\"" - gsub(/[^[:alnum:]]/, "_", $1) - printf "module_" $1 "_args_" v "=\"" - for (i = 2; i <= NF; ++i) { - if (i > 2) - printf " " - printf $i - } - print "\"\n" - } else - print - } - END { print "\n### END: Auto-converted from " f "\n" } - ' "${f}" >> "${ED}"/etc/conf.d/modules - done - rm -f "${f}" - rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null - fi - fi -} - -pkg_postinst() { - local conf_file - # Argent customization, do not bug user with tedious, useless config file updates - for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}.ebuild_preserved" ]; then - cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die - elif [ ! -e "${conf_file}" ]; then - cp -p "${conf_file}.example" "${conf_file}" # don't die - fi - chown root:root "${conf_file}" # don't die - done - local LIBDIR=$(get_libdir) - - # Remove old baselayout links - rm -f "${EROOT}"etc/runlevels/boot/{check{fs,root},rmnologin} - rm -f "${EROOT}"etc/init.d/{depscan,runscript}.sh - - # Make our runlevels if they don't exist - if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then - einfo "Copying across default runlevels" - cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc - rm -f "${EROOT}"etc/runlevels/.add_boot_init.created - else - if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then - mkdir -p "${EROOT}"etc/runlevels/sysinit - cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \ - "${EROOT}"etc/runlevels/sysinit - fi - if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then - mkdir -p "${EROOT}"etc/runlevels/shutdown - cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \ - "${EROOT}"etc/runlevels/shutdown - fi - fi - - # /etc/conf.d/net.example is no longer valid - local NET_EXAMPLE="${EROOT}etc/conf.d/net.example" - local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210' - if [[ -e "${NET_EXAMPLE}" ]] ; then - if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then - rm -f "${NET_EXAMPLE}" - elog "${NET_EXAMPLE} has been removed." - else - sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}" - elog "${NET_EXAMPLE} should be removed." - fi - elog "The new file is ${EROOT}usr/share/doc/${PF}/net.example" - fi - - # /etc/conf.d/wireless.example is no longer valid - local WIRELESS_EXAMPLE="${EROOT}etc/conf.d/wireless.example" - local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3' - if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then - if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then - rm -f "${WIRELESS_EXAMPLE}" - elog "${WIRELESS_EXAMPLE} is deprecated and has been removed." - else - sed -i '1i# This file is obsolete.\n' "${WIRELESS_EXAMPLE}" - elog "${WIRELESS_EXAMPLE} is deprecated and should be removed." - fi - elog "If you are using the old style network scripts," - elog "Configure wireless settings in ${EROOT}etc/conf.d/net" - elog "after reviewing ${EROOT}usr/share/doc/${PF}/net.example" - fi - - if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then - ewarn "/etc/modules.autoload.d is no longer used. Please convert" - ewarn "your files to /etc/conf.d/modules and delete the directory." - fi - - if use hppa; then - elog "Setting the console font does not work on all HPPA consoles." - elog "You can still enable it by running:" - elog "# rc-update add consolefont boot" - fi - - # Handle the conf.d/local.{start,stop} -> local.d transition - if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then - elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}" - elog "files to ${EROOT}etc/local.d" - mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start - mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop - chmod +x "${EROOT}"etc/local.d/*{start,stop} - fi - - if use kernel_linux && [[ "${EROOT}" = "/" ]]; then - /$(get_libdir)/rc/sh/migrate-to-run.sh - fi - - # update the dependency tree after touching all files #224171 - [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u - - if use newnet; then - local netscript=network - else - local netscript=net.lo - fi - - if [ ! -e "${EROOT}"etc/runlevels/boot/${netscript} ]; then - ewarn "Please add the $netscript script to your boot runlevel" - ewarn "as soon as possible. Not doing so could leave you with a system" - ewarn "without networking." - fi - - ewarn "In this version of OpenRC, the loopback interface no longer" - ewarn "satisfies the net virtual." - ewarn "If you have services now which do not start because of this," - ewarn "They can be fixed by adding rc_need=\"!net\"" - ewarn "to the ${EROOT}etc/conf.d/<servicename> file." - ewarn "You should also file a bug against the service asking that" - ewarn "need net be dropped from the dependencies." - ewarn "The bug you file should block the following tracker:" - ewarn "https://bugs.gentoo.org/show_bug.cgi?id=439092" - - ewarn "This version of OpenRC doesn't enable nfs mounts automatically any" - ewarn "longer. In order to mount nfs file systems, you must use the" - ewarn "nfsmount service from the nfs-utils package." - ewarn "See bug https://bugs.gentoo.org/show_bug.cgi?id=427996 for" - ewarn "more information on this." - - elog "You should now update all files in /etc, using etc-update" - elog "or equivalent before restarting any services or this host." - elog - elog "Please read the migration guide available at:" - elog "http://www.gentoo.org/doc/en/openrc-migration.xml" -} diff --git a/sys-apps/openrc/openrc-0.12_pre1.ebuild b/sys-apps/openrc/openrc-0.12_pre1.ebuild deleted file mode 100644 index eb803e30..00000000 --- a/sys-apps/openrc/openrc-0.12_pre1.ebuild +++ /dev/null @@ -1,515 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=4 - -inherit eutils flag-o-matic multilib pam toolchain-funcs - -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" -HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/" - -if [[ ${PV} == "0.12_pre1" ]]; then - EGIT_REPO_URI="git://github.com/OpenRC/openrc.git" - EGIT_COMMIT="9f14fd7ae10d8ae724045a57a2eb25c1d4290a3b" - inherit git-2 - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -else - SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="debug elibc_glibc ncurses pam newnet prefix selinux static-libs unicode - kernel_linux kernel_FreeBSD" - -RDEPEND="virtual/init - kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) - elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) - pam? ( sys-auth/pambase ) - >=sys-apps/baselayout-2.1-r1 - kernel_linux? ( - sys-process/psmisc - ) - !<sys-fs/udev-init-scripts-17 - !<sys-fs/udev-133" -DEPEND="${RDEPEND} - virtual/os-headers" - -src_prepare() { - sed -i 's:0444:0644:' mk/sys.mk || die - sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342 - - if [[ ${PV} == "0.12_pre1" ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die - fi - - # Allow user patches to be applied without modifying the ebuild - epatch_user - - # Argent custom config - epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" - epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch - epatch "${FILESDIR}/${PN}-netmount-fix.patch" - epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" - - # Argent bug fixes - epatch "${FILESDIR}/${PN}-0.9.9.3-do-not-print-error-if-tmplog-cannot-be-read.patch" -} - -src_compile() { - unset LIBDIR #266688 - - MAKE_ARGS="${MAKE_ARGS} - LIBNAME=$(get_libdir) - LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc" - - local brand="Unknown" - if use kernel_linux ; then - MAKE_ARGS="${MAKE_ARGS} OS=Linux" - brand="Linux" - elif use kernel_FreeBSD ; then - MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" - brand="FreeBSD" - fi - if use selinux; then - MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes" - fi - export BRANDING="Argent ${brand}" - if ! use static-libs; then - MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no" - fi - use newnet || MAKE_ARGS="${MAKE_ARGS} MKNET=oldnet" - use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" - export DEBUG=$(usev debug) - export MKPAM=$(usev pam) - export MKTERMCAP=$(usev ncurses) - - tc-export CC AR RANLIB - emake ${MAKE_ARGS} -} - -# set_config <file> <option name> <yes value> <no value> test -# a value of "#" will just comment out the option -set_config() { - local file="${ED}/$1" var=$2 val com - eval "${@:5}" && val=$3 || val=$4 - [[ ${val} == "#" ]] && com="#" && val='\2' - sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}" -} - -set_config_yes_no() { - set_config "$1" "$2" YES NO "${@:3}" -} - -src_install() { - emake ${MAKE_ARGS} DESTDIR="${D}" install - - # move the shared libs back to /usr so ldscript can install - # more of a minimal set of files - # disabled for now due to #270646 - #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die - #gen_usr_ldscript -a einfo rc - gen_usr_ldscript libeinfo.so - gen_usr_ldscript librc.so - - if ! use kernel_linux; then - keepdir /$(get_libdir)/rc/init.d - fi - keepdir /$(get_libdir)/rc/tmp - - # Backup our default runlevels - dodir /usr/share/"${PN}" - cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die - rm -rf "${ED}"/etc/runlevels - - # Install the default net configuration - doconfd conf.d/net - - # Setup unicode defaults for silly unicode users - set_config_yes_no /etc/rc.conf unicode use unicode - - # Cater to the norm - set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')' - - # On HPPA, do not run consolefont by default (bug #222889) - if use hppa; then - rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont - fi - - # Support for logfile rotation - insinto /etc/logrotate.d - newins "${FILESDIR}"/openrc.logrotate openrc - - # Argent customization, do not bug user with annoying updates (for now) - mv "${ED}"/etc/conf.d/keymaps "${ED}"/etc/conf.d/keymaps.example || \ - die "cannot move keymaps" - mv "${ED}"/etc/conf.d/hwclock "${ED}"/etc/conf.d/hwclock.example || \ - die "cannot move hwclock" - - # install the gentoo pam.d file - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon -} - -add_boot_init() { - local initd=$1 - local runlevel=${2:-boot} - # if the initscript is not going to be installed and is not - # currently installed, return - [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \ - || return - [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return - - # if runlevels dont exist just yet, then create it but still flag - # to pkg_postinst that it needs real setup #277323 - if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then - mkdir -p "${EROOT}"etc/runlevels/${runlevel} - touch "${EROOT}"etc/runlevels/.add_boot_init.created - fi - - elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" - ln -snf "${EROOT}"etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd} -} -add_boot_init_mit_config() { - local config=$1 initd=$2 - if [[ -e ${EROOT}${config} ]] ; then - if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then - add_boot_init ${initd} - fi - fi -} - -pkg_preinst() { - local conf_file - # Kogaion customization, still protect conf files from being removed - # as no longer owned by package - for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}" ]; then - cp -p "${conf_file}" "${conf_file}.ebuild_preserved" # don't die - fi - done - - local f LIBDIR=$(get_libdir) - - # default net script is just comments, so no point in biting people - # in the ass by accident. we save in preinst so that the package - # manager doesnt go throwing etc-update crap at us -- postinst is - # too late to prevent that. this behavior also lets us keep the - # file in the CONTENTS for binary packages. - # Argent, use cp -d as per Gentoo bug #462674 - [[ -e "${EROOT}"etc/conf.d/net ]] && \ - cp -d "${EROOT}"etc/conf.d/net "${ED}"/etc/conf.d/ - - # avoid default thrashing in conf.d files when possible #295406 - if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then - ( - unset hostname HOSTNAME - source "${EROOT}"etc/conf.d/hostname - : ${hostname:=${HOSTNAME}} - [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" - ) - fi - - # upgrade timezone file ... do it before moving clock - if [[ -e ${EROOT}etc/conf.d/clock && ! -e ${EROOT}/etc/timezone ]] ; then - ( - unset TIMEZONE - source "${EROOT}"etc/conf.d/clock - [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${EROOT}"etc/timezone - ) - fi - - # /etc/conf.d/clock moved to /etc/conf.d/hwclock - local clock - use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" - if [[ -e "${EROOT}"etc/conf.d/clock ]] ; then - mv "${EROOT}"etc/conf.d/clock "${EROOT}"etc/conf.d/${clock} - fi - if [[ -e "${EROOT}"etc/init.d/clock ]] ; then - rm -f "${EROOT}"etc/init.d/clock - fi - if [[ -L "${EROOT}"etc/runlevels/boot/clock ]] ; then - rm -f "${EROOT}"etc/runlevels/boot/clock - ln -snf /etc/init.d/${clock} "${EROOT}"etc/runlevels/boot/${clock} - fi - if [[ -L "${EROOT}"${LIBDIR}/rc/init.d/started/clock ]] ; then - rm -f "${EROOT}"${LIBDIR}/rc/init.d/started/clock - ln -snf /etc/init.d/${clok} "${EROOT}"${LIBDIR}/rc/init.d/started/${clock} - fi - - # /etc/conf.d/rc is no longer used for configuration - if [[ -e "${EROOT}"etc/conf.d/rc ]] ; then - elog "/etc/conf.d/rc is no longer used for configuration." - elog "Please migrate your settings to /etc/rc.conf as applicable" - elog "and delete /etc/conf.d/rc" - fi - - # force net init.d scripts into symlinks - for f in "${EROOT}"etc/init.d/net.* ; do - [[ -e ${f} ]] || continue # catch net.* not matching anything - [[ ${f} == */net.lo ]] && continue # real file now - [[ ${f} == *.openrc.bak ]] && continue - if [[ ! -L ${f} ]] ; then - elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." - elog "You should delete '${f##*/}.openrc.bak' if you don't need it." - mv "${f}" "${f}.openrc.bak" - ln -snf net.lo "${f}" - fi - done - - # termencoding was added in 0.2.1 and needed in boot - has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding - - # swapfiles was added in 0.9.9 and needed in boot (february 2012) - has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles - - if ! has_version ">=sys-apps/openrc-0.11"; then - add_boot_init sysfs sysinit - fi - - # set default interactive shell to sulogin if it exists - set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin - - has_version sys-apps/openrc || migrate_from_baselayout_1 - has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script - if ! has_version ">=sys-apps/openrc-0.11.3" ; then - migrate_udev_mount_script - add_boot_init tmpfiles.setup boot - fi -} - -# >=openrc-0.4.0 no longer loads the udev addon -migrate_udev_init_script() { - # make sure udev is in sysinit if it was enabled before - local enable_udev=false - local rc_devices=$( - [[ -f /etc/rc.conf ]] && source /etc/rc.conf - [[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc - echo "${rc_devices:-${RC_DEVICES:-auto}}" - ) - case ${rc_devices} in - udev|auto) - enable_udev=true - ;; - esac - - if $enable_udev; then - add_boot_init udev sysinit - add_boot_init udev-postmount default - fi -} - -# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev. -migrate_udev_mount_script() { - if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \ - ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then - add_boot_init udev-mount sysinit - fi - return 0 -} - -migrate_from_baselayout_1() { - # baselayout boot init scripts have been split out - for f in $(cd "${ED}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do - # baselayout-1 is always "old" net, so ignore "new" net - [[ ${f} == "network" ]] && continue - - add_boot_init ${f} - done - - # Try to auto-add some addons when possible - add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt - add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt - add_boot_init_mit_config /etc/mdadm.conf mdraid - add_boot_init_mit_config /etc/evms.conf evms - [[ -e "${EROOT}"sbin/dmsetup ]] && add_boot_init device-mapper - [[ -e "${EROOT}"sbin/vgscan ]] && add_boot_init lvm - elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" - elog "init.d scripts. If you use such a thing, make sure you have the" - elog "required init.d scripts added to your boot runlevel." - - # Upgrade our state for baselayout-1 users - if [[ ! -e "${EROOT}"${LIBDIR}/rc/init.d/started ]] ; then - ( - [[ -e "${EROOT}"etc/conf.d/rc ]] && source "${EROOT}"/etc/conf.d/rc - svcdir=${svcdir:-/var/lib/init.d} - if [[ ! -d "${EROOT}"${svcdir}/started ]] ; then - ewarn "No state found, and no state exists" - elog "You should reboot this host" - else - mkdir -p "${EROOT}"${LIBDIR}/rc/init.d - einfo "Moving state from ${EROOT}${svcdir} to ${EROOT}${LIBDIR}/rc/init.d" - mv "${EROOT}${svcdir}"/* "${EROOT}${LIBDIR}"/rc/init.d - rm -rf "${EROOT}${LIBDIR}"/rc/init.d/daemons \ - "${EROOT}${LIBDIR}"/rc/init.d/console - umount "${EROOT}${svcdir}" 2>/dev/null - rm -rf "${EROOT}${svcdir}" - fi - ) - fi - - # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition - if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then - elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" - rm -f "${EROOT}"etc/modules.autoload.d/.keep* - rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null - if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then - local f v - for f in "${EROOT}"etc/modules.autoload.d/* ; do - v=${f##*/} - v=${v#kernel-} - v=${v//[^[:alnum:]]/_} - gawk -v v="${v}" -v f="${f##*/}" ' - BEGIN { print "\n### START: Auto-converted from " f "\n" } - { - if ($0 ~ /^[^#]/) { - print "modules_" v "=\"${modules_" v "} " $1 "\"" - gsub(/[^[:alnum:]]/, "_", $1) - printf "module_" $1 "_args_" v "=\"" - for (i = 2; i <= NF; ++i) { - if (i > 2) - printf " " - printf $i - } - print "\"\n" - } else - print - } - END { print "\n### END: Auto-converted from " f "\n" } - ' "${f}" >> "${ED}"/etc/conf.d/modules - done - rm -f "${f}" - rmdir "${EROOT}"etc/modules.autoload.d 2>/dev/null - fi - fi -} - -pkg_postinst() { - local conf_file - # Argent customization, do not bug user with tedious, useless config file updates - for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}.ebuild_preserved" ]; then - cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die - elif [ ! -e "${conf_file}" ]; then - cp -p "${conf_file}.example" "${conf_file}" # don't die - fi - chown root:root "${conf_file}" # don't die - done - local LIBDIR=$(get_libdir) - - # Remove old baselayout links - rm -f "${EROOT}"etc/runlevels/boot/{check{fs,root},rmnologin} - rm -f "${EROOT}"etc/init.d/{depscan,runscript}.sh - - # Make our runlevels if they don't exist - if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then - einfo "Copying across default runlevels" - cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc - rm -f "${EROOT}"etc/runlevels/.add_boot_init.created - else - if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then - mkdir -p "${EROOT}"etc/runlevels/sysinit - cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \ - "${EROOT}"etc/runlevels/sysinit - fi - if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then - mkdir -p "${EROOT}"etc/runlevels/shutdown - cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \ - "${EROOT}"etc/runlevels/shutdown - fi - fi - - # /etc/conf.d/net.example is no longer valid - local NET_EXAMPLE="${EROOT}etc/conf.d/net.example" - local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210' - if [[ -e "${NET_EXAMPLE}" ]] ; then - if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then - rm -f "${NET_EXAMPLE}" - elog "${NET_EXAMPLE} has been removed." - else - sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}" - elog "${NET_EXAMPLE} should be removed." - fi - elog "The new file is ${EROOT}usr/share/doc/${PF}/net.example" - fi - - # /etc/conf.d/wireless.example is no longer valid - local WIRELESS_EXAMPLE="${EROOT}etc/conf.d/wireless.example" - local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3' - if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then - if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then - rm -f "${WIRELESS_EXAMPLE}" - elog "${WIRELESS_EXAMPLE} is deprecated and has been removed." - else - sed -i '1i# This file is obsolete.\n' "${WIRELESS_EXAMPLE}" - elog "${WIRELESS_EXAMPLE} is deprecated and should be removed." - fi - elog "If you are using the old style network scripts," - elog "Configure wireless settings in ${EROOT}etc/conf.d/net" - elog "after reviewing ${EROOT}usr/share/doc/${PF}/net.example" - fi - - if [[ -d "${EROOT}"etc/modules.autoload.d ]] ; then - ewarn "/etc/modules.autoload.d is no longer used. Please convert" - ewarn "your files to /etc/conf.d/modules and delete the directory." - fi - - if use hppa; then - elog "Setting the console font does not work on all HPPA consoles." - elog "You can still enable it by running:" - elog "# rc-update add consolefont boot" - fi - - # Handle the conf.d/local.{start,stop} -> local.d transition - if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then - elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}" - elog "files to ${EROOT}etc/local.d" - mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start - mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop - chmod +x "${EROOT}"etc/local.d/*{start,stop} - fi - - if use kernel_linux && [[ "${EROOT}" = "/" ]]; then - /$(get_libdir)/rc/sh/migrate-to-run.sh - fi - - # update the dependency tree after touching all files #224171 - [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u - - if use newnet; then - local netscript=network - else - local netscript=net.lo - fi - - if [ ! -e "${EROOT}"etc/runlevels/boot/${netscript} ]; then - ewarn "Please add the $netscript script to your boot runlevel" - ewarn "as soon as possible. Not doing so could leave you with a system" - ewarn "without networking." - fi - - ewarn "In this version of OpenRC, the loopback interface no longer" - ewarn "satisfies the net virtual." - ewarn "If you have services now which do not start because of this," - ewarn "They can be fixed by adding rc_need=\"!net\"" - ewarn "to the ${EROOT}etc/conf.d/<servicename> file." - ewarn "You should also file a bug against the service asking that" - ewarn "need net be dropped from the dependencies." - ewarn "The bug you file should block the following tracker:" - ewarn "https://bugs.gentoo.org/show_bug.cgi?id=439092" - - ewarn "This version of OpenRC doesn't enable nfs mounts automatically any" - ewarn "longer. In order to mount nfs file systems, you must use the" - ewarn "nfsmount service from the nfs-utils package." - ewarn "See bug https://bugs.gentoo.org/show_bug.cgi?id=427996 for" - ewarn "more information on this." - - elog "You should now update all files in /etc, using etc-update" - elog "or equivalent before restarting any services or this host." - elog - elog "Please read the migration guide available at:" - elog "http://www.gentoo.org/doc/en/openrc-migration.xml" -} diff --git a/sys-apps/openrc/openrc-0.13.11.ebuild b/sys-apps/openrc/openrc-0.13.11.ebuild deleted file mode 100644 index 551e6461..00000000 --- a/sys-apps/openrc/openrc-0.13.11.ebuild +++ /dev/null @@ -1,356 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit eutils flag-o-matic multilib pam toolchain-funcs - -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" -HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/" - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="git://github.com/OpenRC/${PN}.git" - inherit git-2 -else - SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs - tools unicode kernel_linux kernel_FreeBSD" - -COMMON_DEPEND=">=sys-apps/baselayout-2.1-r1 - kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) - elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) - pam? ( sys-auth/pambase ) - tools? ( dev-lang/perl ) - kernel_linux? ( - sys-process/psmisc - ) - selinux? ( sec-policy/selinux-openrc ) - !<sys-fs/udev-init-scripts-17 - !<sys-fs/udev-133" -DEPEND="${COMMON_DEPEND} - virtual/os-headers - ncurses? ( virtual/pkgconfig )" -RDEPEND="${COMMON_DEPEND} - !prefix? ( - kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) ) - kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) - )" - -PDEPEND="netifrc? ( net-misc/netifrc )" - -src_prepare() { - sed -i 's:0444:0644:' mk/sys.mk || die - - if [[ ${PV} == "9999" ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die - fi - - # Allow user patches to be applied without modifying the ebuild - epatch_user - - # Argent custom config - epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" - epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch - epatch "${FILESDIR}/${PN}-netmount-fix.patch" - epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" - - # Argent bug fixes - epatch "${FILESDIR}/${PN}-0.9.9.3-do-not-print-error-if-tmplog-cannot-be-read.patch" - - # Linux 3.10 and EFI - epatch "${FILESDIR}/0001-efivarfs-Support-EFI-variable-access-in-3.10-kernels.patch" -} - -src_compile() { - unset LIBDIR #266688 - - MAKE_ARGS="${MAKE_ARGS} - LIBNAME=$(get_libdir) - LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc - MKSELINUX=$(usex selinux) - MKSTATICLIBS=$(usex static-libs) - MKTOOLS=$(usex tools)" - - local brand="Unknown" - if use kernel_linux ; then - MAKE_ARGS="${MAKE_ARGS} OS=Linux" - brand="Linux" - elif use kernel_FreeBSD ; then - MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" - brand="FreeBSD" - fi - export BRANDING="Argent ${brand}" - use newnet || MAKE_ARGS="${MAKE_ARGS} MKNET=oldnet" - use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}" - export DEBUG=$(usev debug) - export MKPAM=$(usev pam) - export MKTERMCAP=$(usev ncurses) - - tc-export CC AR RANLIB - emake ${MAKE_ARGS} -} - -# set_config <file> <option name> <yes value> <no value> test -# a value of "#" will just comment out the option -set_config() { - local file="${ED}/$1" var=$2 val com - eval "${@:5}" && val=$3 || val=$4 - [[ ${val} == "#" ]] && com="#" && val='\2' - sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}" -} - -set_config_yes_no() { - set_config "$1" "$2" YES NO "${@:3}" -} - -src_install() { - emake ${MAKE_ARGS} DESTDIR="${D}" install - - # move the shared libs back to /usr so ldscript can install - # more of a minimal set of files - # disabled for now due to #270646 - #mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die - #gen_usr_ldscript -a einfo rc - gen_usr_ldscript libeinfo.so - gen_usr_ldscript librc.so - - if ! use kernel_linux; then - keepdir /$(get_libdir)/rc/init.d - fi - keepdir /$(get_libdir)/rc/tmp - - # Backup our default runlevels - dodir /usr/share/"${PN}" - cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die - rm -rf "${ED}"/etc/runlevels - - # Setup unicode defaults for silly unicode users - set_config_yes_no /etc/rc.conf unicode use unicode - - # Cater to the norm - set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')' - - # On HPPA, do not run consolefont by default (bug #222889) - if use hppa; then - rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont - fi - - # Support for logfile rotation - insinto /etc/logrotate.d - newins "${FILESDIR}"/openrc.logrotate openrc - - # Argent customization, do not bug user with annoying updates (for now) - mv "${ED}"/etc/conf.d/keymaps "${ED}"/etc/conf.d/keymaps.example || \ - die "cannot move keymaps" - mv "${ED}"/etc/conf.d/hwclock "${ED}"/etc/conf.d/hwclock.example || \ - die "cannot move hwclock" - - # install the gentoo pam.d file - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon - - # install documentation - dodoc README.busybox - if use newnet; then - dodoc README.newnet - fi -} - -add_boot_init() { - local initd=$1 - local runlevel=${2:-boot} - # if the initscript is not going to be installed and is not - # currently installed, return - [[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \ - || return - [[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return - - # if runlevels dont exist just yet, then create it but still flag - # to pkg_postinst that it needs real setup #277323 - if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then - mkdir -p "${EROOT}"etc/runlevels/${runlevel} - touch "${EROOT}"etc/runlevels/.add_boot_init.created - fi - - elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" - ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd} -} -add_boot_init_mit_config() { - local config=$1 initd=$2 - if [[ -e ${EROOT}${config} ]] ; then - if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then - add_boot_init ${initd} - fi - fi -} - -pkg_preinst() { - local conf_file - # Argent customization, still protect conf files from being removed - # as no longer owned by package - for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}" ]; then - cp -p "${conf_file}" "${conf_file}.ebuild_preserved" # don't die - fi - done - - local f LIBDIR=$(get_libdir) - - # avoid default thrashing in conf.d files when possible #295406 - if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then - ( - unset hostname HOSTNAME - source "${EROOT}"etc/conf.d/hostname - : ${hostname:=${HOSTNAME}} - [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" - ) - fi - - # set default interactive shell to sulogin if it exists - set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin - - # termencoding was added in 0.2.1 and needed in boot - has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding - - # swapfiles was added in 0.9.9 and needed in boot (february 2012) - has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles - - if ! has_version ">=sys-apps/openrc-0.11"; then - add_boot_init sysfs sysinit - fi - - if ! has_version ">=sys-apps/openrc-0.11.3" ; then - migrate_udev_mount_script - add_boot_init tmpfiles.setup boot - fi - - # these were added in 0.12. - if ! has_version ">=sys-apps/openrc-0.12"; then - add_boot_init loopback - add_boot_init tmpfiles.dev sysinit - - # ensure existing /etc/conf.d/net is not removed - # undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier - # this needs to stay in openrc ebuilds for a long time. :( - # Added in 0.12. - if [[ -f "${EROOT}"etc/conf.d/net ]]; then - einfo "Modifying conf.d/net to keep it from being removed" - cat <<-EOF >>"${EROOT}"etc/conf.d/net - -# The network scripts are now part of net-misc/netifrc -# In order to avoid sys-apps/${P} from removing this file, this comment was -# added; you can safely remove this comment. Please see -# /usr/share/doc/netifrc*/README* for more information. -EOF - fi - fi -} - -# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev. -migrate_udev_mount_script() { - if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \ - ! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then - add_boot_init udev-mount sysinit - fi - return 0 -} - -pkg_postinst() { - local conf_file - # Argent customization, do not bug user with tedious, useless config file updates - for conf_file in "${EROOT}/etc/conf.d/keymaps" "${EROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}.ebuild_preserved" ]; then - cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die - elif [ ! -e "${conf_file}" ]; then - cp -p "${conf_file}.example" "${conf_file}" # don't die - fi - chown root:root "${conf_file}" # don't die - done - - local LIBDIR=$(get_libdir) - - # Make our runlevels if they don't exist - if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then - einfo "Copying across default runlevels" - cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc - rm -f "${EROOT}"etc/runlevels/.add_boot_init.created - else - if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then - mkdir -p "${EROOT}"etc/runlevels/sysinit - cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \ - "${EROOT}"etc/runlevels/sysinit - fi - if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then - mkdir -p "${EROOT}"etc/runlevels/shutdown - cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \ - "${EROOT}"etc/runlevels/shutdown - fi - fi - - if use hppa; then - elog "Setting the console font does not work on all HPPA consoles." - elog "You can still enable it by running:" - elog "# rc-update add consolefont boot" - fi - - # Handle the conf.d/local.{start,stop} -> local.d transition - if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then - elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}" - elog "files to ${EROOT}etc/local.d" - mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start - mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop - chmod +x "${EROOT}"etc/local.d/*{start,stop} - fi - - if use kernel_linux && [[ "${EROOT}" = "/" ]]; then - if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then - ewarn "The dependency data could not be migrated to /run/openrc." - ewarn "This means you need to reboot your system." - fi - fi - - # update the dependency tree after touching all files #224171 - [[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u - - if ! use newnet && ! use netifrc; then - ewarn "You have emerged OpenRc without network support. This" - ewarn "means you need to SET UP a network manager such as" - ewarn " net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd," - ewarn "net-misc/NetworkManager, or net-misc/badvpn." - ewarn "Or, you have the option of emerging openrc with the newnet" - ewarn "use flag and configuring /etc/conf.d/network and" - ewarn "/etc/conf.d/staticroute if you only use static interfaces." - fi - - if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then - ewarn "Please add the network service to your boot runlevel" - ewarn "as soon as possible. Not doing so could leave you with a system" - ewarn "without networking." - fi - - ewarn "In this version of OpenRC, the loopback interface no longer" - ewarn "satisfies the net virtual." - ewarn "If you have services now which do not start because of this," - ewarn "They can be fixed by adding rc_need=\"!net\"" - ewarn "to the ${EROOT}etc/conf.d/<servicename> file." - ewarn "You should also file a bug against the service asking that" - ewarn "need net be dropped from the dependencies." - ewarn "The bug you file should block the following tracker:" - ewarn "https://bugs.gentoo.org/show_bug.cgi?id=439092" - - ewarn "This version of OpenRC doesn't enable nfs mounts automatically any" - ewarn "longer. In order to mount nfs file systems, you must use the" - ewarn "nfsmount service from the nfs-utils package." - ewarn "See bug https://bugs.gentoo.org/show_bug.cgi?id=427996 for" - ewarn "more information on this." - - elog "You should now update all files in /etc, using etc-update" - elog "or equivalent before restarting any services or this host." -} diff --git a/sys-apps/openrc/openrc-0.8.2-r1.ebuild b/sys-apps/openrc/openrc-0.8.2-r1.ebuild deleted file mode 100644 index 87abd7c3..00000000 --- a/sys-apps/openrc/openrc-0.8.2-r1.ebuild +++ /dev/null @@ -1,458 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.8.2-r1.ebuild,v 1.6 2011/05/13 19:06:47 armin76 Exp $ - -EAPI="1" - -inherit eutils flag-o-matic multilib toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/openrc.git" - inherit git - KEYWORDS="" -else - SRC_URI="mirror://gentoo/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -fi - -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" -HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/" - -LICENSE="BSD-2" -SLOT="0" -IUSE="debug elibc_glibc ncurses pam selinux unicode kernel_linux kernel_FreeBSD" - -RDEPEND="virtual/init - kernel_FreeBSD? ( sys-process/fuser-bsd ) - elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) - pam? ( virtual/pam ) - >=sys-apps/baselayout-2.0.0 - kernel_linux? ( !<sys-apps/module-init-tools-3.2.2-r2 ) - !<sys-fs/udev-133 - !<sys-apps/sysvinit-2.86-r11" -DEPEND="${RDEPEND} - virtual/os-headers" - -make_args() { - unset LIBDIR #266688 - - MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc" - MAKE_ARGS="${MAKE_ARGS} MKOLDNET=yes" - - local brand="Unknown" - if use kernel_linux ; then - MAKE_ARGS="${MAKE_ARGS} OS=Linux" - brand="Linux" - elif use kernel_FreeBSD ; then - MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" - brand="FreeBSD" - fi - if use selinux; then - MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes" - fi - export BRANDING="Kogaion ${brand}" -} - -pkg_setup() { - export DEBUG=$(usev debug) - export MKPAM=$(usev pam) - export MKTERMCAP=$(usev ncurses) -} - -src_unpack() { - if [[ ${PV} == "9999" ]] ; then - git_src_unpack - else - unpack ${A} - fi - cd "${S}" - sed -i 's:0444:0644:' mk/sys.mk - sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile #241342 - - # Allow user patches to be applied without modifying the ebuild - epatch_user - - # Kogaion custom config - epatch "${FILESDIR}/${PN}-kogaion-config.patch" - epatch "${FILESDIR}/${PN}-enable-interactive.patch" - epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch - epatch "${FILESDIR}/${PN}-netmount-fix.patch" - epatch "${FILESDIR}/${PN}-protect-rcsvcdir-for-symlink.patch" - epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" -} - -src_compile() { - make_args - - if [[ ${PV} == "9999" ]] ; then - local ver="git-$(echo ${EGIT_VERSION} | cut -c1-8)" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk - fi - - tc-export CC AR RANLIB - emake ${MAKE_ARGS} || die "emake ${MAKE_ARGS} failed" -} - -# set_config <file> <option name> <yes value> <no value> test -# a value of "#" will just comment out the option -set_config() { - local file="${D}/$1" var=$2 val com - eval "${@:5}" && val=$3 || val=$4 - [[ ${val} == "#" ]] && com="#" && val='\2' - sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}" -} -set_config_yes_no() { - set_config "$1" "$2" YES NO "${@:3}" -} - -src_install() { - make_args - emake ${MAKE_ARGS} DESTDIR="${D}" install || die - - # install the readme for the new network scripts - dodoc README.newnet - - # move the shared libs back to /usr so ldscript can install - # more of a minimal set of files - # disabled for now due to #270646 - #mv "${D}"/$(get_libdir)/lib{einfo,rc}* "${D}"/usr/$(get_libdir)/ || die - #gen_usr_ldscript -a einfo rc - gen_usr_ldscript libeinfo.so - gen_usr_ldscript librc.so - - keepdir /$(get_libdir)/rc/{init.d,tmp} - - # Backup our default runlevels - dodir /usr/share/"${PN}" - cp -PR "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die - rm -rf "${D}"/etc/runlevels - - # Stick with "old" net as the default for now - doconfd conf.d/net || die - pushd "${D}"/usr/share/${PN}/runlevels/boot > /dev/null - rm -f network staticroute - ln -s /etc/init.d/net.lo net.lo - popd > /dev/null - - # Setup unicode defaults for silly unicode users - set_config_yes_no /etc/rc.conf unicode use unicode - - # Cater to the norm - set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')' - - # On HPPA, do not run consolefont by default (bug #222889) - if use hppa; then - rm -f "${D}"/usr/share/openrc/runlevels/boot/consolefont - fi - - # Support for logfile rotation - insinto /etc/logrotate.d - newins "${FILESDIR}"/openrc.logrotate openrc - - # Move /etc/conf.d/keymaps to .example - mv "${D}"/etc/conf.d/keymaps "${D}"/etc/conf.d/keymaps.example || \ - die "cannot move keymaps" - -} - -add_boot_init() { - local initd=$1 - local runlevel=${2:-boot} - # if the initscript is not going to be installed and is not - # currently installed, return - [[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \ - || return - [[ -e ${ROOT}/etc/runlevels/${runlevel}/${initd} ]] && return - - # if runlevels dont exist just yet, then create it but still flag - # to pkg_postinst that it needs real setup #277323 - if [[ ! -d ${ROOT}/etc/runlevels/${runlevel} ]] ; then - mkdir -p "${ROOT}"/etc/runlevels/${runlevel} - touch "${ROOT}"/etc/runlevels/.add_boot_init.created - fi - - elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" - ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/${runlevel}/${initd} -} -add_boot_init_mit_config() { - local config=$1 initd=$2 - if [[ -e ${ROOT}${config} ]] ; then - if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then - add_boot_init ${initd} - fi - fi -} - -CONFD_KEYMAPS="${ROOT}/etc/conf.d/keymaps" -pkg_preinst() { - # backup user /etc/conf.d/keymaps - if [ -f "${CONFD_KEYMAPS}" ]; then - cp -p "${CONFD_KEYMAPS}" "${CONFD_KEYMAPS}.portage_openrc_bck" - fi - local f LIBDIR=$(get_libdir) - - # default net script is just comments, so no point in biting people - # in the ass by accident. we save in preinst so that the package - # manager doesnt go throwing etc-update crap at us -- postinst is - # too late to prevent that. this behavior also lets us keep the - # file in the CONTENTS for binary packages. - [[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${D}"/etc/conf.d/ - - # avoid default thrashing in conf.d files when possible #295406 - if [[ -e ${ROOT}/etc/conf.d/hostname ]] ; then - ( - unset hostname HOSTNAME - source "${ROOT}"/etc/conf.d/hostname - : ${hostname:=${HOSTNAME}} - [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" - ) - fi - - # upgrade timezone file ... do it before moving clock - if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then - ( - unset TIMEZONE - source "${ROOT}"/etc/conf.d/clock - [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone - ) - fi - - # /etc/conf.d/clock moved to /etc/conf.d/hwclock - local clock - use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" - if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then - mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock} - fi - if [[ -e ${ROOT}/etc/init.d/clock ]] ; then - rm -f "${ROOT}"/etc/init.d/clock - fi - if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then - rm -f "${ROOT}"/etc/runlevels/boot/clock - ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock} - fi - if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then - rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock - ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock} - fi - - # /etc/conf.d/rc is no longer used for configuration - if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then - elog "/etc/conf.d/rc is no longer used for configuration." - elog "Please migrate your settings to /etc/rc.conf as applicable" - elog "and delete /etc/conf.d/rc" - fi - - # force net init.d scripts into symlinks - for f in "${ROOT}"/etc/init.d/net.* ; do - [[ -e ${f} ]] || continue # catch net.* not matching anything - [[ ${f} == */net.lo ]] && continue # real file now - [[ ${f} == *.openrc.bak ]] && continue - if [[ ! -L ${f} ]] ; then - elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." - elog "You should delete '${f##*/}.openrc.bak' if you don't need it." - mv "${f}" "${f}.openrc.bak" - ln -snf net.lo "${f}" - fi - done - - # termencoding was added in 0.2.1 and needed in boot - has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding - - # set default interactive shell to sulogin if it exists - set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin - - has_version sys-apps/openrc || migrate_from_baselayout_1 - has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script -} - -# >=openrc-0.4.0 no longer loads the udev addon -migrate_udev_init_script() { - # make sure udev is in sysinit if it was enabled before - local enable_udev=false - local rc_devices=$( - [[ -f /etc/rc.conf ]] && source /etc/rc.conf - [[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc - echo "${rc_devices:-${RC_DEVICES:-auto}}" - ) - case ${rc_devices} in - udev|auto) - enable_udev=true - ;; - esac - - if $enable_udev; then - add_boot_init udev sysinit - add_boot_init udev-postmount default - fi -} - -migrate_from_baselayout_1() { - # baselayout boot init scripts have been split out - for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do - # baselayout-1 is always "old" net, so ignore "new" net - [[ ${f} == "network" ]] && continue - - add_boot_init ${f} - done - - # Try to auto-add some addons when possible - add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt - add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt - add_boot_init_mit_config /etc/mdadm.conf mdraid - add_boot_init_mit_config /etc/evms.conf evms - [[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper - [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm - elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" - elog "init.d scripts. If you use such a thing, make sure you have the" - elog "required init.d scripts added to your boot runlevel." - - # Upgrade out state for baselayout-1 users - if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then - ( - [[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc - svcdir=${svcdir:-/var/lib/init.d} - if [[ ! -d ${ROOT}${svcdir}/started ]] ; then - ewarn "No state found, and no state exists" - elog "You should reboot this host" - else - mkdir -p "${ROOT}${LIBDIR}/rc/init.d" - einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d" - mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d - rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \ - "${ROOT}${LIBDIR}"/rc/init.d/console - umount "${ROOT}${svcdir}" 2>/dev/null - rm -rf "${ROOT}${svcdir}" - fi - ) - fi - - # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition - if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then - elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" - rm -f "${ROOT}"/etc/modules.autoload.d/.keep* - rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null - if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then - local f v - for f in "${ROOT}"/etc/modules.autoload.d/* ; do - v=${f##*/} - v=${v#kernel-} - v=${v//[^[:alnum:]]/_} - gawk -v v="${v}" -v f="${f##*/}" ' - BEGIN { print "\n### START: Auto-converted from " f "\n" } - { - if ($0 ~ /^[^#]/) { - print "modules_" v "=\"${modules_" v "} " $1 "\"" - gsub(/[^[:alnum:]]/, "_", $1) - printf "module_" $1 "_args_" v "=\"" - for (i = 2; i <= NF; ++i) { - if (i > 2) - printf " " - printf $i - } - print "\"\n" - } else - print - } - END { print "\n### END: Auto-converted from " f "\n" } - ' "${f}" >> "${D}"/etc/conf.d/modules - done - rm -f "${f}" - rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null - fi - fi -} - -pkg_postinst() { - # Copy config file over - if [ -f "${CONFD_KEYMAPS}.portage_openrc_bck" ]; then - cp ${CONFD_KEYMAPS}.portage_openrc_bck ${CONFD_KEYMAPS} -p - else - if [ -f "${CONFD_KEYMAPS}.example" ] && [ ! -f "${CONFD_KEYMAPS}" ]; then - cp ${CONFD_KEYMAPS}.example ${CONFD_KEYMAPS} -p - fi - fi - - local LIBDIR=$(get_libdir) - - # Remove old baselayout links - rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin} - rm -f "${ROOT}"/etc/init.d/{depscan,runscript}.sh - - # Make our runlevels if they don't exist - if [[ ! -e ${ROOT}/etc/runlevels ]] || [[ -e ${ROOT}/etc/runlevels/.add_boot_init.created ]] ; then - einfo "Copying across default runlevels" - cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc - rm -f "${ROOT}"/etc/runlevels/.add_boot_init.created - else - if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then - mkdir -p "${ROOT}"/etc/runlevels/sysinit - cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* \ - "${ROOT}"/etc/runlevels/sysinit - fi - if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then - mkdir -p "${ROOT}"/etc/runlevels/shutdown - cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* \ - "${ROOT}"/etc/runlevels/shutdown - fi - fi - - # /etc/conf.d/net.example is no longer valid - local NET_EXAMPLE="${ROOT}/etc/conf.d/net.example" - local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210' - if [[ -e "${NET_EXAMPLE}" ]] ; then - if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then - rm -f "${NET_EXAMPLE}" - elog "${NET_EXAMPLE} has been removed." - else - sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}" - elog "${NET_EXAMPLE} should be removed." - fi - elog "The new file is ${ROOT}/usr/share/doc/${PF}/net.example" - fi - - # /etc/conf.d/wireless.example is no longer valid - local WIRELESS_EXAMPLE="${ROOT}/etc/conf.d/wireless.example" - local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3' - if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then - if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then - rm -f "${WIRELESS_EXAMPLE}" - elog "${WIRELESS_EXAMPLE} is deprecated and has been removed." - else - sed -i '1i# This file is obsolete.\n' "${WIRELESS_EXAMPLE}" - elog "${WIRELESS_EXAMPLE} is deprecated and should be removed." - fi - elog "If you are using the old style network scripts," - elog "Configure wireless settings in ${ROOT}/etc/conf.d/net" - elog "after reviewing ${ROOT}/usr/share/doc/${PF}/net.example" - fi - - if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then - ewarn "/etc/modules.autoload.d is no longer used. Please convert" - ewarn "your files to /etc/conf.d/modules and delete the directory." - fi - - if use hppa; then - elog "Setting the console font does not work on all HPPA consoles." - elog "You can still enable it by running:" - elog "# rc-update add consolefont boot" - fi - - # Handle the conf.d/local.{start,stop} -> local.d transition - if path_exists -o "${ROOT}"etc/conf.d/local.{start,stop} ; then - elog "Moving your ${ROOT}etc/conf.d/local.{start,stop}" - elog "files to ${ROOT}etc/local.d" - mv "${ROOT}"etc/conf.d/local.start "${ROOT}"etc/local.d/baselayout1.start - mv "${ROOT}"etc/conf.d/local.stop "${ROOT}"etc/local.d/baselayout1.stop - chmod +x "${ROOT}"etc/local.d/*{start,stop} - fi - - # update the dependency tree after touching all files #224171 - [[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u - - elog "You should now update all files in /etc, using etc-update" - elog "or equivalent before restarting any services or this host." - elog - elog "Please read the migration guide available at:" - elog "http://www.gentoo.org/doc/en/openrc-migration.xml" -} diff --git a/sys-apps/openrc/openrc-0.8.3-r1.ebuild b/sys-apps/openrc/openrc-0.8.3-r1.ebuild deleted file mode 100644 index 9962aee9..00000000 --- a/sys-apps/openrc/openrc-0.8.3-r1.ebuild +++ /dev/null @@ -1,459 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.8.3-r1.ebuild,v 1.5 2011/07/02 17:53:31 armin76 Exp $ - -EAPI=4 - -EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git" -[[ ${PV} == "9999" ]] && SCM_ECLASS="git-2" -inherit eutils flag-o-matic multilib toolchain-funcs ${SCM_ECLASS} -unset SCM_ECLASS - -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" -HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/" -if [[ ${PV} != "9999" ]] ; then - SRC_URI="mirror://gentoo/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="debug elibc_glibc ncurses pam selinux unicode kernel_linux kernel_FreeBSD" - -RDEPEND="virtual/init - kernel_FreeBSD? ( sys-process/fuser-bsd ) - elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) - pam? ( virtual/pam ) - >=sys-apps/baselayout-2.0.0 - kernel_linux? ( !<sys-apps/module-init-tools-3.2.2-r2 ) - !<sys-fs/udev-133 - !<sys-apps/sysvinit-2.86-r11" -DEPEND="${RDEPEND} - virtual/os-headers" - -make_args() { - unset LIBDIR #266688 - - MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc" - MAKE_ARGS="${MAKE_ARGS} MKOLDNET=yes" - - local brand="Unknown" - if use kernel_linux ; then - MAKE_ARGS="${MAKE_ARGS} OS=Linux" - brand="Linux" - elif use kernel_FreeBSD ; then - MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" - brand="FreeBSD" - fi - if use selinux; then - MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes" - fi - export BRANDING="Kogaion ${brand}" -} - -pkg_setup() { - export DEBUG=$(usev debug) - export MKPAM=$(usev pam) - export MKTERMCAP=$(usev ncurses) -} - -src_prepare() { - sed -i 's:0444:0644:' mk/sys.mk || die - sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342 - - if [[ ${PV} == "9999" ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die - fi - - epatch "${FILESDIR}"/${P}-deprecation_warning.patch - epatch "${FILESDIR}"/${P}-ccwgroup.patch #367467 - - # Allow user patches to be applied without modifying the ebuild - epatch_user - - # Kogaion custom config - epatch "${FILESDIR}/${PN}-kogaion-config.patch" - epatch "${FILESDIR}/${PN}-enable-interactive.patch" - epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch - epatch "${FILESDIR}/${PN}-netmount-fix.patch" - epatch "${FILESDIR}/${PN}-protect-rcsvcdir-for-symlink.patch" - epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" -} - -src_compile() { - make_args - - tc-export CC AR RANLIB - emake ${MAKE_ARGS} -} - -# set_config <file> <option name> <yes value> <no value> test -# a value of "#" will just comment out the option -set_config() { - local file="${D}/$1" var=$2 val com - eval "${@:5}" && val=$3 || val=$4 - [[ ${val} == "#" ]] && com="#" && val='\2' - sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}" -} - -set_config_yes_no() { - set_config "$1" "$2" YES NO "${@:3}" -} - -src_install() { - make_args - emake ${MAKE_ARGS} DESTDIR="${D}" install - - # install the readme for the new network scripts - dodoc README.newnet - - # move the shared libs back to /usr so ldscript can install - # more of a minimal set of files - # disabled for now due to #270646 - #mv "${D}"/$(get_libdir)/lib{einfo,rc}* "${D}"/usr/$(get_libdir)/ || die - #gen_usr_ldscript -a einfo rc - gen_usr_ldscript libeinfo.so - gen_usr_ldscript librc.so - - keepdir /$(get_libdir)/rc/{init.d,tmp} - - # Backup our default runlevels - dodir /usr/share/"${PN}" - cp -PR "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die - rm -rf "${D}"/etc/runlevels - - # Stick with "old" net as the default for now - doconfd conf.d/net || die - pushd "${D}"/usr/share/${PN}/runlevels/boot > /dev/null - rm -f network staticroute - ln -s /etc/init.d/net.lo net.lo - popd > /dev/null - - # Setup unicode defaults for silly unicode users - set_config_yes_no /etc/rc.conf unicode use unicode - - # Cater to the norm - set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')' - - # On HPPA, do not run consolefont by default (bug #222889) - if use hppa; then - rm -f "${D}"/usr/share/openrc/runlevels/boot/consolefont - fi - - # Support for logfile rotation - insinto /etc/logrotate.d - newins "${FILESDIR}"/openrc.logrotate openrc - - # Kogaion customization, do not bug user with annoying updates (for now) - mv "${D}"/etc/conf.d/keymaps "${D}"/etc/conf.d/keymaps.example || \ - die "cannot move keymaps" - mv "${D}"/etc/conf.d/hwclock "${D}"/etc/conf.d/hwclock.example || \ - die "cannot move hwclock" -} - -add_boot_init() { - local initd=$1 - local runlevel=${2:-boot} - # if the initscript is not going to be installed and is not - # currently installed, return - [[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \ - || return - [[ -e ${ROOT}/etc/runlevels/${runlevel}/${initd} ]] && return - - # if runlevels dont exist just yet, then create it but still flag - # to pkg_postinst that it needs real setup #277323 - if [[ ! -d ${ROOT}/etc/runlevels/${runlevel} ]] ; then - mkdir -p "${ROOT}"/etc/runlevels/${runlevel} - touch "${ROOT}"/etc/runlevels/.add_boot_init.created - fi - - elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" - ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/${runlevel}/${initd} -} -add_boot_init_mit_config() { - local config=$1 initd=$2 - if [[ -e ${ROOT}${config} ]] ; then - if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then - add_boot_init ${initd} - fi - fi -} - -pkg_preinst() { - # Kogaion customization, still protect conf files from being removed - # as no longer owned by package - for conf_file in "${ROOT}/etc/conf.d/keymaps" "${ROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}" ]; then - cp -p "${conf_file}" "${conf_file}.ebuild_preserved" # don't die - fi - done - - local f LIBDIR=$(get_libdir) - - # default net script is just comments, so no point in biting people - # in the ass by accident. we save in preinst so that the package - # manager doesnt go throwing etc-update crap at us -- postinst is - # too late to prevent that. this behavior also lets us keep the - # file in the CONTENTS for binary packages. - [[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${D}"/etc/conf.d/ - - # avoid default thrashing in conf.d files when possible #295406 - if [[ -e ${ROOT}/etc/conf.d/hostname ]] ; then - ( - unset hostname HOSTNAME - source "${ROOT}"/etc/conf.d/hostname - : ${hostname:=${HOSTNAME}} - [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" - ) - fi - - # upgrade timezone file ... do it before moving clock - if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then - ( - unset TIMEZONE - source "${ROOT}"/etc/conf.d/clock - [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone - ) - fi - - # /etc/conf.d/clock moved to /etc/conf.d/hwclock - local clock - use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" - if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then - mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock} - fi - if [[ -e ${ROOT}/etc/init.d/clock ]] ; then - rm -f "${ROOT}"/etc/init.d/clock - fi - if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then - rm -f "${ROOT}"/etc/runlevels/boot/clock - ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock} - fi - if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then - rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock - ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock} - fi - - # /etc/conf.d/rc is no longer used for configuration - if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then - elog "/etc/conf.d/rc is no longer used for configuration." - elog "Please migrate your settings to /etc/rc.conf as applicable" - elog "and delete /etc/conf.d/rc" - fi - - # force net init.d scripts into symlinks - for f in "${ROOT}"/etc/init.d/net.* ; do - [[ -e ${f} ]] || continue # catch net.* not matching anything - [[ ${f} == */net.lo ]] && continue # real file now - [[ ${f} == *.openrc.bak ]] && continue - if [[ ! -L ${f} ]] ; then - elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." - elog "You should delete '${f##*/}.openrc.bak' if you don't need it." - mv "${f}" "${f}.openrc.bak" - ln -snf net.lo "${f}" - fi - done - - # termencoding was added in 0.2.1 and needed in boot - has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding - - # set default interactive shell to sulogin if it exists - set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin - - has_version sys-apps/openrc || migrate_from_baselayout_1 - has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script -} - -# >=openrc-0.4.0 no longer loads the udev addon -migrate_udev_init_script() { - # make sure udev is in sysinit if it was enabled before - local enable_udev=false - local rc_devices=$( - [[ -f /etc/rc.conf ]] && source /etc/rc.conf - [[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc - echo "${rc_devices:-${RC_DEVICES:-auto}}" - ) - case ${rc_devices} in - udev|auto) - enable_udev=true - ;; - esac - - if $enable_udev; then - add_boot_init udev sysinit - add_boot_init udev-postmount default - fi -} - -migrate_from_baselayout_1() { - # baselayout boot init scripts have been split out - for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do - # baselayout-1 is always "old" net, so ignore "new" net - [[ ${f} == "network" ]] && continue - - add_boot_init ${f} - done - - # Try to auto-add some addons when possible - add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt - add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt - add_boot_init_mit_config /etc/mdadm.conf mdraid - add_boot_init_mit_config /etc/evms.conf evms - [[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper - [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm - elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" - elog "init.d scripts. If you use such a thing, make sure you have the" - elog "required init.d scripts added to your boot runlevel." - - # Upgrade our state for baselayout-1 users - if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then - ( - [[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc - svcdir=${svcdir:-/var/lib/init.d} - if [[ ! -d ${ROOT}${svcdir}/started ]] ; then - ewarn "No state found, and no state exists" - elog "You should reboot this host" - else - mkdir -p "${ROOT}${LIBDIR}/rc/init.d" - einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d" - mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d - rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \ - "${ROOT}${LIBDIR}"/rc/init.d/console - umount "${ROOT}${svcdir}" 2>/dev/null - rm -rf "${ROOT}${svcdir}" - fi - ) - fi - - # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition - if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then - elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" - rm -f "${ROOT}"/etc/modules.autoload.d/.keep* - rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null - if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then - local f v - for f in "${ROOT}"/etc/modules.autoload.d/* ; do - v=${f##*/} - v=${v#kernel-} - v=${v//[^[:alnum:]]/_} - gawk -v v="${v}" -v f="${f##*/}" ' - BEGIN { print "\n### START: Auto-converted from " f "\n" } - { - if ($0 ~ /^[^#]/) { - print "modules_" v "=\"${modules_" v "} " $1 "\"" - gsub(/[^[:alnum:]]/, "_", $1) - printf "module_" $1 "_args_" v "=\"" - for (i = 2; i <= NF; ++i) { - if (i > 2) - printf " " - printf $i - } - print "\"\n" - } else - print - } - END { print "\n### END: Auto-converted from " f "\n" } - ' "${f}" >> "${D}"/etc/conf.d/modules - done - rm -f "${f}" - rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null - fi - fi -} - -pkg_postinst() { - # Kogaion customization, do not bug user with tedious, useless config file updates - for conf_file in "${ROOT}/etc/conf.d/keymaps" "${ROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}.ebuild_preserved" ]; then - cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die - elif [ ! -e "${conf_file}" ]; then - cp -p "${conf_file}.example" "${conf_file}" # don't die - fi - chown root:root "${conf_file}" # don't die - done - - local LIBDIR=$(get_libdir) - - # Remove old baselayout links - rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin} - rm -f "${ROOT}"/etc/init.d/{depscan,runscript}.sh - - # Make our runlevels if they don't exist - if [[ ! -e ${ROOT}/etc/runlevels ]] || [[ -e ${ROOT}/etc/runlevels/.add_boot_init.created ]] ; then - einfo "Copying across default runlevels" - cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc - rm -f "${ROOT}"/etc/runlevels/.add_boot_init.created - else - if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then - mkdir -p "${ROOT}"/etc/runlevels/sysinit - cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* \ - "${ROOT}"/etc/runlevels/sysinit - fi - if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then - mkdir -p "${ROOT}"/etc/runlevels/shutdown - cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* \ - "${ROOT}"/etc/runlevels/shutdown - fi - fi - - # /etc/conf.d/net.example is no longer valid - local NET_EXAMPLE="${ROOT}/etc/conf.d/net.example" - local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210' - if [[ -e "${NET_EXAMPLE}" ]] ; then - if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then - rm -f "${NET_EXAMPLE}" - elog "${NET_EXAMPLE} has been removed." - else - sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}" - elog "${NET_EXAMPLE} should be removed." - fi - elog "The new file is ${ROOT}/usr/share/doc/${PF}/net.example" - fi - - # /etc/conf.d/wireless.example is no longer valid - local WIRELESS_EXAMPLE="${ROOT}/etc/conf.d/wireless.example" - local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3' - if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then - if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then - rm -f "${WIRELESS_EXAMPLE}" - elog "${WIRELESS_EXAMPLE} is deprecated and has been removed." - else - sed -i '1i# This file is obsolete.\n' "${WIRELESS_EXAMPLE}" - elog "${WIRELESS_EXAMPLE} is deprecated and should be removed." - fi - elog "If you are using the old style network scripts," - elog "Configure wireless settings in ${ROOT}/etc/conf.d/net" - elog "after reviewing ${ROOT}/usr/share/doc/${PF}/net.example" - fi - - if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then - ewarn "/etc/modules.autoload.d is no longer used. Please convert" - ewarn "your files to /etc/conf.d/modules and delete the directory." - fi - - if use hppa; then - elog "Setting the console font does not work on all HPPA consoles." - elog "You can still enable it by running:" - elog "# rc-update add consolefont boot" - fi - - # Handle the conf.d/local.{start,stop} -> local.d transition - if path_exists -o "${ROOT}"etc/conf.d/local.{start,stop} ; then - elog "Moving your ${ROOT}etc/conf.d/local.{start,stop}" - elog "files to ${ROOT}etc/local.d" - mv "${ROOT}"etc/conf.d/local.start "${ROOT}"etc/local.d/baselayout1.start - mv "${ROOT}"etc/conf.d/local.stop "${ROOT}"etc/local.d/baselayout1.stop - chmod +x "${ROOT}"etc/local.d/*{start,stop} - fi - - # update the dependency tree after touching all files #224171 - [[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u - - elog "You should now update all files in /etc, using etc-update" - elog "or equivalent before restarting any services or this host." - elog - elog "Please read the migration guide available at:" - elog "http://www.gentoo.org/doc/en/openrc-migration.xml" -} diff --git a/sys-apps/openrc/openrc-0.9.8.1.ebuild b/sys-apps/openrc/openrc-0.9.8.1.ebuild deleted file mode 100644 index 2873edbf..00000000 --- a/sys-apps/openrc/openrc-0.9.8.1.ebuild +++ /dev/null @@ -1,457 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.9.8.1.ebuild,v 1.1 2012/01/14 20:27:59 williamh Exp $ - -EAPI=4 - -EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git" -[[ ${PV} == "9999" ]] && SCM_ECLASS="git-2" -inherit eutils flag-o-matic multilib pam toolchain-funcs ${SCM_ECLASS} -unset SCM_ECLASS - -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" -HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/" -if [[ ${PV} != "9999" ]] ; then - SRC_URI="mirror://gentoo/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="debug elibc_glibc ncurses pam selinux static-libs unicode kernel_linux kernel_FreeBSD" - -RDEPEND="virtual/init - kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) - elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) - pam? ( sys-auth/pambase ) - >=sys-apps/baselayout-2.0.0 - kernel_linux? ( - !<sys-apps/module-init-tools-3.2.2-r2 - sys-process/psmisc - ) - !<sys-fs/udev-133 - !<sys-apps/sysvinit-2.86-r11" -DEPEND="${RDEPEND} - virtual/os-headers" - -make_args() { - unset LIBDIR #266688 - - MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc" - - local brand="Unknown" - if use kernel_linux ; then - MAKE_ARGS="${MAKE_ARGS} OS=Linux" - brand="Linux" - elif use kernel_FreeBSD ; then - MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" - brand="FreeBSD" - fi - if use selinux; then - MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes" - fi - export BRANDING="Kogaion ${brand}" - if ! use static-libs; then - MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no" - fi -} - -pkg_setup() { - export DEBUG=$(usev debug) - export MKPAM=$(usev pam) - export MKTERMCAP=$(usev ncurses) -} - -src_prepare() { - sed -i 's:0444:0644:' mk/sys.mk || die - sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342 - - if [[ ${PV} == "9999" ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die - fi - - # Allow user patches to be applied without modifying the ebuild - epatch_user - - # Kogaion custom config - epatch "${FILESDIR}/${PN}-kogaion-config.patch" - epatch "${FILESDIR}/${PN}-enable-interactive-2.patch" - epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch - epatch "${FILESDIR}/${PN}-netmount-fix.patch" - # epatch "${FILESDIR}/${PN}-protect-rcsvcdir-for-symlink.patch" - epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" -} - -src_compile() { - make_args - - tc-export CC AR RANLIB - emake ${MAKE_ARGS} -} - -# set_config <file> <option name> <yes value> <no value> test -# a value of "#" will just comment out the option -set_config() { - local file="${D}/$1" var=$2 val com - eval "${@:5}" && val=$3 || val=$4 - [[ ${val} == "#" ]] && com="#" && val='\2' - sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}" -} - -set_config_yes_no() { - set_config "$1" "$2" YES NO "${@:3}" -} - -src_install() { - make_args - emake ${MAKE_ARGS} DESTDIR="${D}" install - - # move the shared libs back to /usr so ldscript can install - # more of a minimal set of files - # disabled for now due to #270646 - #mv "${D}"/$(get_libdir)/lib{einfo,rc}* "${D}"/usr/$(get_libdir)/ || die - #gen_usr_ldscript -a einfo rc - gen_usr_ldscript libeinfo.so - gen_usr_ldscript librc.so - - keepdir /$(get_libdir)/rc/{init.d,tmp} - - # Backup our default runlevels - dodir /usr/share/"${PN}" - cp -PR "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die - rm -rf "${D}"/etc/runlevels - - # Install the default net configuration - doconfd conf.d/net - - # Setup unicode defaults for silly unicode users - set_config_yes_no /etc/rc.conf unicode use unicode - - # Cater to the norm - set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')' - - # On HPPA, do not run consolefont by default (bug #222889) - if use hppa; then - rm -f "${D}"/usr/share/openrc/runlevels/boot/consolefont - fi - - # Support for logfile rotation - insinto /etc/logrotate.d - newins "${FILESDIR}"/openrc.logrotate openrc - - # Kogaion customization, do not bug user with annoying updates (for now) - mv "${D}"/etc/conf.d/keymaps "${D}"/etc/conf.d/keymaps.example || \ - die "cannot move keymaps" - mv "${D}"/etc/conf.d/hwclock "${D}"/etc/conf.d/hwclock.example || \ - die "cannot move hwclock" - - # install the gentoo pam.d file - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon -} - -add_boot_init() { - local initd=$1 - local runlevel=${2:-boot} - # if the initscript is not going to be installed and is not - # currently installed, return - [[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \ - || return - [[ -e ${ROOT}/etc/runlevels/${runlevel}/${initd} ]] && return - - # if runlevels dont exist just yet, then create it but still flag - # to pkg_postinst that it needs real setup #277323 - if [[ ! -d ${ROOT}/etc/runlevels/${runlevel} ]] ; then - mkdir -p "${ROOT}"/etc/runlevels/${runlevel} - touch "${ROOT}"/etc/runlevels/.add_boot_init.created - fi - - elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" - ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/${runlevel}/${initd} -} -add_boot_init_mit_config() { - local config=$1 initd=$2 - if [[ -e ${ROOT}${config} ]] ; then - if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then - add_boot_init ${initd} - fi - fi -} - -pkg_preinst() { - # Kogaion customization, still protect conf files from being removed - # as no longer owned by package - for conf_file in "${ROOT}/etc/conf.d/keymaps" "${ROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}" ]; then - cp -p "${conf_file}" "${conf_file}.ebuild_preserved" # don't die - fi - done - - local f LIBDIR=$(get_libdir) - - # default net script is just comments, so no point in biting people - # in the ass by accident. we save in preinst so that the package - # manager doesnt go throwing etc-update crap at us -- postinst is - # too late to prevent that. this behavior also lets us keep the - # file in the CONTENTS for binary packages. - [[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${D}"/etc/conf.d/ - - # avoid default thrashing in conf.d files when possible #295406 - if [[ -e ${ROOT}/etc/conf.d/hostname ]] ; then - ( - unset hostname HOSTNAME - source "${ROOT}"/etc/conf.d/hostname - : ${hostname:=${HOSTNAME}} - [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" - ) - fi - - # upgrade timezone file ... do it before moving clock - if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then - ( - unset TIMEZONE - source "${ROOT}"/etc/conf.d/clock - [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone - ) - fi - - # /etc/conf.d/clock moved to /etc/conf.d/hwclock - local clock - use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" - if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then - mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock} - fi - if [[ -e ${ROOT}/etc/init.d/clock ]] ; then - rm -f "${ROOT}"/etc/init.d/clock - fi - if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then - rm -f "${ROOT}"/etc/runlevels/boot/clock - ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock} - fi - if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then - rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock - ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock} - fi - - # /etc/conf.d/rc is no longer used for configuration - if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then - elog "/etc/conf.d/rc is no longer used for configuration." - elog "Please migrate your settings to /etc/rc.conf as applicable" - elog "and delete /etc/conf.d/rc" - fi - - # force net init.d scripts into symlinks - for f in "${ROOT}"/etc/init.d/net.* ; do - [[ -e ${f} ]] || continue # catch net.* not matching anything - [[ ${f} == */net.lo ]] && continue # real file now - [[ ${f} == *.openrc.bak ]] && continue - if [[ ! -L ${f} ]] ; then - elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." - elog "You should delete '${f##*/}.openrc.bak' if you don't need it." - mv "${f}" "${f}.openrc.bak" - ln -snf net.lo "${f}" - fi - done - - # termencoding was added in 0.2.1 and needed in boot - has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding - - # set default interactive shell to sulogin if it exists - set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin - - has_version sys-apps/openrc || migrate_from_baselayout_1 - has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script -} - -# >=openrc-0.4.0 no longer loads the udev addon -migrate_udev_init_script() { - # make sure udev is in sysinit if it was enabled before - local enable_udev=false - local rc_devices=$( - [[ -f /etc/rc.conf ]] && source /etc/rc.conf - [[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc - echo "${rc_devices:-${RC_DEVICES:-auto}}" - ) - case ${rc_devices} in - udev|auto) - enable_udev=true - ;; - esac - - if $enable_udev; then - add_boot_init udev sysinit - add_boot_init udev-postmount default - fi -} - -migrate_from_baselayout_1() { - # baselayout boot init scripts have been split out - for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do - # baselayout-1 is always "old" net, so ignore "new" net - [[ ${f} == "network" ]] && continue - - add_boot_init ${f} - done - - # Try to auto-add some addons when possible - add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt - add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt - add_boot_init_mit_config /etc/mdadm.conf mdraid - add_boot_init_mit_config /etc/evms.conf evms - [[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper - [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm - elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" - elog "init.d scripts. If you use such a thing, make sure you have the" - elog "required init.d scripts added to your boot runlevel." - - # Upgrade our state for baselayout-1 users - if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then - ( - [[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc - svcdir=${svcdir:-/var/lib/init.d} - if [[ ! -d ${ROOT}${svcdir}/started ]] ; then - ewarn "No state found, and no state exists" - elog "You should reboot this host" - else - mkdir -p "${ROOT}${LIBDIR}/rc/init.d" - einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d" - mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d - rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \ - "${ROOT}${LIBDIR}"/rc/init.d/console - umount "${ROOT}${svcdir}" 2>/dev/null - rm -rf "${ROOT}${svcdir}" - fi - ) - fi - - # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition - if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then - elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" - rm -f "${ROOT}"/etc/modules.autoload.d/.keep* - rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null - if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then - local f v - for f in "${ROOT}"/etc/modules.autoload.d/* ; do - v=${f##*/} - v=${v#kernel-} - v=${v//[^[:alnum:]]/_} - gawk -v v="${v}" -v f="${f##*/}" ' - BEGIN { print "\n### START: Auto-converted from " f "\n" } - { - if ($0 ~ /^[^#]/) { - print "modules_" v "=\"${modules_" v "} " $1 "\"" - gsub(/[^[:alnum:]]/, "_", $1) - printf "module_" $1 "_args_" v "=\"" - for (i = 2; i <= NF; ++i) { - if (i > 2) - printf " " - printf $i - } - print "\"\n" - } else - print - } - END { print "\n### END: Auto-converted from " f "\n" } - ' "${f}" >> "${D}"/etc/conf.d/modules - done - rm -f "${f}" - rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null - fi - fi -} - -pkg_postinst() { - local LIBDIR=$(get_libdir) - - # Kogaion customization, do not bug user with tedious, useless config file updates - for conf_file in "${ROOT}/etc/conf.d/keymaps" "${ROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}.ebuild_preserved" ]; then - cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die - elif [ ! -e "${conf_file}" ]; then - cp -p "${conf_file}.example" "${conf_file}" # don't die - fi - chown root:root "${conf_file}" # don't die - done - - # Remove old baselayout links - rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin} - rm -f "${ROOT}"/etc/init.d/{depscan,runscript}.sh - - # Make our runlevels if they don't exist - if [[ ! -e ${ROOT}/etc/runlevels ]] || [[ -e ${ROOT}/etc/runlevels/.add_boot_init.created ]] ; then - einfo "Copying across default runlevels" - cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc - rm -f "${ROOT}"/etc/runlevels/.add_boot_init.created - else - if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then - mkdir -p "${ROOT}"/etc/runlevels/sysinit - cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* \ - "${ROOT}"/etc/runlevels/sysinit - fi - if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then - mkdir -p "${ROOT}"/etc/runlevels/shutdown - cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* \ - "${ROOT}"/etc/runlevels/shutdown - fi - fi - - # /etc/conf.d/net.example is no longer valid - local NET_EXAMPLE="${ROOT}/etc/conf.d/net.example" - local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210' - if [[ -e "${NET_EXAMPLE}" ]] ; then - if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then - rm -f "${NET_EXAMPLE}" - elog "${NET_EXAMPLE} has been removed." - else - sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}" - elog "${NET_EXAMPLE} should be removed." - fi - elog "The new file is ${ROOT}/usr/share/doc/${PF}/net.example" - fi - - # /etc/conf.d/wireless.example is no longer valid - local WIRELESS_EXAMPLE="${ROOT}/etc/conf.d/wireless.example" - local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3' - if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then - if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then - rm -f "${WIRELESS_EXAMPLE}" - elog "${WIRELESS_EXAMPLE} is deprecated and has been removed." - else - sed -i '1i# This file is obsolete.\n' "${WIRELESS_EXAMPLE}" - elog "${WIRELESS_EXAMPLE} is deprecated and should be removed." - fi - elog "If you are using the old style network scripts," - elog "Configure wireless settings in ${ROOT}/etc/conf.d/net" - elog "after reviewing ${ROOT}/usr/share/doc/${PF}/net.example" - fi - - if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then - ewarn "/etc/modules.autoload.d is no longer used. Please convert" - ewarn "your files to /etc/conf.d/modules and delete the directory." - fi - - if use hppa; then - elog "Setting the console font does not work on all HPPA consoles." - elog "You can still enable it by running:" - elog "# rc-update add consolefont boot" - fi - - # Handle the conf.d/local.{start,stop} -> local.d transition - if path_exists -o "${ROOT}"etc/conf.d/local.{start,stop} ; then - elog "Moving your ${ROOT}etc/conf.d/local.{start,stop}" - elog "files to ${ROOT}etc/local.d" - mv "${ROOT}"etc/conf.d/local.start "${ROOT}"etc/local.d/baselayout1.start - mv "${ROOT}"etc/conf.d/local.stop "${ROOT}"etc/local.d/baselayout1.stop - chmod +x "${ROOT}"etc/local.d/*{start,stop} - fi - - # update the dependency tree after touching all files #224171 - [[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u - - elog "You should now update all files in /etc, using etc-update" - elog "or equivalent before restarting any services or this host." - elog - elog "Please read the migration guide available at:" - elog "http://www.gentoo.org/doc/en/openrc-migration.xml" -} diff --git a/sys-apps/openrc/openrc-0.9.9.3.ebuild b/sys-apps/openrc/openrc-0.9.9.3.ebuild deleted file mode 100644 index ddbb9494..00000000 --- a/sys-apps/openrc/openrc-0.9.9.3.ebuild +++ /dev/null @@ -1,461 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.9.9.3.ebuild,v 1.1 2012/03/11 20:14:37 robbat2 Exp $ - -EAPI=4 - -EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git" -[[ ${PV} == "9999" ]] && SCM_ECLASS="git-2" -inherit eutils flag-o-matic multilib pam toolchain-funcs ${SCM_ECLASS} -unset SCM_ECLASS - -DESCRIPTION="OpenRC manages the services, startup and shutdown of a host" -HOMEPAGE="http://www.gentoo.org/proj/en/base/openrc/" -if [[ ${PV} != "9999" ]] ; then - SRC_URI="mirror://gentoo/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" -fi - -LICENSE="BSD-2" -SLOT="0" -IUSE="debug elibc_glibc ncurses pam selinux static-libs unicode kernel_linux kernel_FreeBSD" - -RDEPEND="virtual/init - kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) - elibc_glibc? ( >=sys-libs/glibc-2.5 ) - ncurses? ( sys-libs/ncurses ) - pam? ( sys-auth/pambase ) - >=sys-apps/baselayout-2.0.0 - kernel_linux? ( - sys-process/psmisc - ) - !<sys-fs/udev-133" -DEPEND="${RDEPEND} - virtual/os-headers" - -make_args() { - unset LIBDIR #266688 - - MAKE_ARGS="${MAKE_ARGS} LIBNAME=$(get_libdir) LIBEXECDIR=/$(get_libdir)/rc" - - local brand="Unknown" - if use kernel_linux ; then - MAKE_ARGS="${MAKE_ARGS} OS=Linux" - brand="Linux" - elif use kernel_FreeBSD ; then - MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD" - brand="FreeBSD" - fi - if use selinux; then - MAKE_ARGS="${MAKE_ARGS} MKSELINUX=yes" - fi - export BRANDING="Kogaion ${brand}" - if ! use static-libs; then - MAKE_ARGS="${MAKE_ARGS} MKSTATICLIBS=no" - fi -} - -pkg_setup() { - export DEBUG=$(usev debug) - export MKPAM=$(usev pam) - export MKTERMCAP=$(usev ncurses) -} - -src_prepare() { - sed -i 's:0444:0644:' mk/sys.mk || die - sed -i "/^DIR/s:/openrc:/${PF}:" doc/Makefile || die #241342 - - if [[ ${PV} == "9999" ]] ; then - local ver="git-${EGIT_VERSION:0:6}" - sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/git.mk || die - fi - - # Allow user patches to be applied without modifying the ebuild - epatch_user - - # Kogaion custom config - epatch "${FILESDIR}/${PN}-kogaion-config-2.patch" - epatch "${FILESDIR}"/${PN}-0.5.3-disable_warns_until_migrated.patch - epatch "${FILESDIR}/${PN}-netmount-fix.patch" - epatch "${FILESDIR}/${PN}-0.6.1-fix-clockskew-error-handling.patch" - - # Kogaion bug fixes - epatch "${FILESDIR}/${PN}-0.9.9.3-do-not-print-error-if-tmplog-cannot-be-read.patch" -} - -src_compile() { - make_args - - tc-export CC AR RANLIB - emake ${MAKE_ARGS} -} - -# set_config <file> <option name> <yes value> <no value> test -# a value of "#" will just comment out the option -set_config() { - local file="${D}/$1" var=$2 val com - eval "${@:5}" && val=$3 || val=$4 - [[ ${val} == "#" ]] && com="#" && val='\2' - sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}" -} - -set_config_yes_no() { - set_config "$1" "$2" YES NO "${@:3}" -} - -src_install() { - make_args - emake ${MAKE_ARGS} DESTDIR="${D}" install - - # move the shared libs back to /usr so ldscript can install - # more of a minimal set of files - # disabled for now due to #270646 - #mv "${D}"/$(get_libdir)/lib{einfo,rc}* "${D}"/usr/$(get_libdir)/ || die - #gen_usr_ldscript -a einfo rc - gen_usr_ldscript libeinfo.so - gen_usr_ldscript librc.so - - keepdir /$(get_libdir)/rc/{init.d,tmp} - - # Backup our default runlevels - dodir /usr/share/"${PN}" - cp -PR "${D}"/etc/runlevels "${D}"/usr/share/${PN} || die - rm -rf "${D}"/etc/runlevels - - # Install the default net configuration - doconfd conf.d/net - - # Setup unicode defaults for silly unicode users - set_config_yes_no /etc/rc.conf unicode use unicode - - # Cater to the norm - set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')' - - # On HPPA, do not run consolefont by default (bug #222889) - if use hppa; then - rm -f "${D}"/usr/share/openrc/runlevels/boot/consolefont - fi - - # Support for logfile rotation - insinto /etc/logrotate.d - newins "${FILESDIR}"/openrc.logrotate openrc - - # Kogaion customization, do not bug user with annoying updates (for now) - mv "${D}"/etc/conf.d/keymaps "${D}"/etc/conf.d/keymaps.example || \ - die "cannot move keymaps" - mv "${D}"/etc/conf.d/hwclock "${D}"/etc/conf.d/hwclock.example || \ - die "cannot move hwclock" - - # install the gentoo pam.d file - newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon -} - -add_boot_init() { - local initd=$1 - local runlevel=${2:-boot} - # if the initscript is not going to be installed and is not - # currently installed, return - [[ -e ${D}/etc/init.d/${initd} || -e ${ROOT}/etc/init.d/${initd} ]] \ - || return - [[ -e ${ROOT}/etc/runlevels/${runlevel}/${initd} ]] && return - - # if runlevels dont exist just yet, then create it but still flag - # to pkg_postinst that it needs real setup #277323 - if [[ ! -d ${ROOT}/etc/runlevels/${runlevel} ]] ; then - mkdir -p "${ROOT}"/etc/runlevels/${runlevel} - touch "${ROOT}"/etc/runlevels/.add_boot_init.created - fi - - elog "Auto-adding '${initd}' service to your ${runlevel} runlevel" - ln -snf /etc/init.d/${initd} "${ROOT}"/etc/runlevels/${runlevel}/${initd} -} -add_boot_init_mit_config() { - local config=$1 initd=$2 - if [[ -e ${ROOT}${config} ]] ; then - if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${ROOT}"/${config}) ]] ; then - add_boot_init ${initd} - fi - fi -} - -pkg_preinst() { - local conf_file - # Kogaion customization, still protect conf files from being removed - # as no longer owned by package - for conf_file in "${ROOT}/etc/conf.d/keymaps" "${ROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}" ]; then - cp -p "${conf_file}" "${conf_file}.ebuild_preserved" # don't die - fi - done - - local f LIBDIR=$(get_libdir) - - # default net script is just comments, so no point in biting people - # in the ass by accident. we save in preinst so that the package - # manager doesnt go throwing etc-update crap at us -- postinst is - # too late to prevent that. this behavior also lets us keep the - # file in the CONTENTS for binary packages. - [[ -e ${ROOT}/etc/conf.d/net ]] && cp "${ROOT}"/etc/conf.d/net "${D}"/etc/conf.d/ - - # avoid default thrashing in conf.d files when possible #295406 - if [[ -e ${ROOT}/etc/conf.d/hostname ]] ; then - ( - unset hostname HOSTNAME - source "${ROOT}"/etc/conf.d/hostname - : ${hostname:=${HOSTNAME}} - [[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}" - ) - fi - - # upgrade timezone file ... do it before moving clock - if [[ -e ${ROOT}/etc/conf.d/clock && ! -e ${ROOT}/etc/timezone ]] ; then - ( - unset TIMEZONE - source "${ROOT}"/etc/conf.d/clock - [[ -n ${TIMEZONE} ]] && echo "${TIMEZONE}" > "${ROOT}"/etc/timezone - ) - fi - - # /etc/conf.d/clock moved to /etc/conf.d/hwclock - local clock - use kernel_FreeBSD && clock="adjkerntz" || clock="hwclock" - if [[ -e ${ROOT}/etc/conf.d/clock ]] ; then - mv "${ROOT}"/etc/conf.d/clock "${ROOT}"/etc/conf.d/${clock} - fi - if [[ -e ${ROOT}/etc/init.d/clock ]] ; then - rm -f "${ROOT}"/etc/init.d/clock - fi - if [[ -L ${ROOT}/etc/runlevels/boot/clock ]] ; then - rm -f "${ROOT}"/etc/runlevels/boot/clock - ln -snf /etc/init.d/${clock} "${ROOT}"/etc/runlevels/boot/${clock} - fi - if [[ -L ${ROOT}${LIBDIR}/rc/init.d/started/clock ]] ; then - rm -f "${ROOT}${LIBDIR}"/rc/init.d/started/clock - ln -snf /etc/init.d/${clock} "${ROOT}${LIBDIR}"/rc/init.d/started/${clock} - fi - - # /etc/conf.d/rc is no longer used for configuration - if [[ -e ${ROOT}/etc/conf.d/rc ]] ; then - elog "/etc/conf.d/rc is no longer used for configuration." - elog "Please migrate your settings to /etc/rc.conf as applicable" - elog "and delete /etc/conf.d/rc" - fi - - # force net init.d scripts into symlinks - for f in "${ROOT}"/etc/init.d/net.* ; do - [[ -e ${f} ]] || continue # catch net.* not matching anything - [[ ${f} == */net.lo ]] && continue # real file now - [[ ${f} == *.openrc.bak ]] && continue - if [[ ! -L ${f} ]] ; then - elog "Moved net service '${f##*/}' to '${f##*/}.openrc.bak' to force a symlink." - elog "You should delete '${f##*/}.openrc.bak' if you don't need it." - mv "${f}" "${f}.openrc.bak" - ln -snf net.lo "${f}" - fi - done - - # termencoding was added in 0.2.1 and needed in boot - has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding - - # swapfiles was added in 0.9.9 and needed in boot (february 2012) - has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles - - # set default interactive shell to sulogin if it exists - set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin - - has_version sys-apps/openrc || migrate_from_baselayout_1 - has_version ">=sys-apps/openrc-0.4.0" || migrate_udev_init_script -} - -# >=openrc-0.4.0 no longer loads the udev addon -migrate_udev_init_script() { - # make sure udev is in sysinit if it was enabled before - local enable_udev=false - local rc_devices=$( - [[ -f /etc/rc.conf ]] && source /etc/rc.conf - [[ -f /etc/conf.d/rc ]] && source /etc/conf.d/rc - echo "${rc_devices:-${RC_DEVICES:-auto}}" - ) - case ${rc_devices} in - udev|auto) - enable_udev=true - ;; - esac - - if $enable_udev; then - add_boot_init udev sysinit - add_boot_init udev-postmount default - fi -} - -migrate_from_baselayout_1() { - # baselayout boot init scripts have been split out - for f in $(cd "${D}"/usr/share/${PN}/runlevels/boot || exit; echo *) ; do - # baselayout-1 is always "old" net, so ignore "new" net - [[ ${f} == "network" ]] && continue - - add_boot_init ${f} - done - - # Try to auto-add some addons when possible - add_boot_init_mit_config /etc/conf.d/cryptfs dmcrypt - add_boot_init_mit_config /etc/conf.d/dmcrypt dmcrypt - add_boot_init_mit_config /etc/mdadm.conf mdraid - add_boot_init_mit_config /etc/evms.conf evms - [[ -e ${ROOT}/sbin/dmsetup ]] && add_boot_init device-mapper - [[ -e ${ROOT}/sbin/vgscan ]] && add_boot_init lvm - elog "Add on services (such as RAID/dmcrypt/LVM/etc...) are now stand alone" - elog "init.d scripts. If you use such a thing, make sure you have the" - elog "required init.d scripts added to your boot runlevel." - - # Upgrade our state for baselayout-1 users - if [[ ! -e ${ROOT}${LIBDIR}/rc/init.d/started ]] ; then - ( - [[ -e ${ROOT}/etc/conf.d/rc ]] && source "${ROOT}"/etc/conf.d/rc - svcdir=${svcdir:-/var/lib/init.d} - if [[ ! -d ${ROOT}${svcdir}/started ]] ; then - ewarn "No state found, and no state exists" - elog "You should reboot this host" - else - mkdir -p "${ROOT}${LIBDIR}/rc/init.d" - einfo "Moving state from ${ROOT}${svcdir} to ${ROOT}${LIBDIR}/rc/init.d" - mv "${ROOT}${svcdir}"/* "${ROOT}${LIBDIR}"/rc/init.d - rm -rf "${ROOT}${LIBDIR}"/rc/init.d/daemons \ - "${ROOT}${LIBDIR}"/rc/init.d/console - umount "${ROOT}${svcdir}" 2>/dev/null - rm -rf "${ROOT}${svcdir}" - fi - ) - fi - - # Handle the /etc/modules.autoload.d -> /etc/conf.d/modules transition - if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then - elog "Converting your /etc/modules.autoload.d/ files to /etc/conf.d/modules" - rm -f "${ROOT}"/etc/modules.autoload.d/.keep* - rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null - if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then - local f v - for f in "${ROOT}"/etc/modules.autoload.d/* ; do - v=${f##*/} - v=${v#kernel-} - v=${v//[^[:alnum:]]/_} - gawk -v v="${v}" -v f="${f##*/}" ' - BEGIN { print "\n### START: Auto-converted from " f "\n" } - { - if ($0 ~ /^[^#]/) { - print "modules_" v "=\"${modules_" v "} " $1 "\"" - gsub(/[^[:alnum:]]/, "_", $1) - printf "module_" $1 "_args_" v "=\"" - for (i = 2; i <= NF; ++i) { - if (i > 2) - printf " " - printf $i - } - print "\"\n" - } else - print - } - END { print "\n### END: Auto-converted from " f "\n" } - ' "${f}" >> "${D}"/etc/conf.d/modules - done - rm -f "${f}" - rmdir "${ROOT}"/etc/modules.autoload.d 2>/dev/null - fi - fi -} - -pkg_postinst() { - local conf_file - # Kogaion customization, do not bug user with tedious, useless config file updates - for conf_file in "${ROOT}/etc/conf.d/keymaps" "${ROOT}/etc/conf.d/hwclock"; do - if [ -e "${conf_file}.ebuild_preserved" ]; then - cp -p "${conf_file}.ebuild_preserved" "${conf_file}" # don't die - elif [ ! -e "${conf_file}" ]; then - cp -p "${conf_file}.example" "${conf_file}" # don't die - fi - chown root:root "${conf_file}" # don't die - done - - local LIBDIR=$(get_libdir) - - # Remove old baselayout links - rm -f "${ROOT}"/etc/runlevels/boot/{check{fs,root},rmnologin} - rm -f "${ROOT}"/etc/init.d/{depscan,runscript}.sh - - # Make our runlevels if they don't exist - if [[ ! -e ${ROOT}/etc/runlevels ]] || [[ -e ${ROOT}/etc/runlevels/.add_boot_init.created ]] ; then - einfo "Copying across default runlevels" - cp -RPp "${ROOT}"/usr/share/${PN}/runlevels "${ROOT}"/etc - rm -f "${ROOT}"/etc/runlevels/.add_boot_init.created - else - if [[ ! -e ${ROOT}/etc/runlevels/sysinit/devfs ]] ; then - mkdir -p "${ROOT}"/etc/runlevels/sysinit - cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/sysinit/* \ - "${ROOT}"/etc/runlevels/sysinit - fi - if [[ ! -e ${ROOT}/etc/runlevels/shutdown/mount-ro ]] ; then - mkdir -p "${ROOT}"/etc/runlevels/shutdown - cp -RPp "${ROOT}"/usr/share/${PN}/runlevels/shutdown/* \ - "${ROOT}"/etc/runlevels/shutdown - fi - fi - - # /etc/conf.d/net.example is no longer valid - local NET_EXAMPLE="${ROOT}/etc/conf.d/net.example" - local NET_MD5='8ebebfa07441d39eb54feae0ee4c8210' - if [[ -e "${NET_EXAMPLE}" ]] ; then - if [[ $(md5sum "${NET_EXAMPLE}") == ${NET_MD5}* ]]; then - rm -f "${NET_EXAMPLE}" - elog "${NET_EXAMPLE} has been removed." - else - sed -i '1i# This file is obsolete.\n' "${NET_EXAMPLE}" - elog "${NET_EXAMPLE} should be removed." - fi - elog "The new file is ${ROOT}/usr/share/doc/${PF}/net.example" - fi - - # /etc/conf.d/wireless.example is no longer valid - local WIRELESS_EXAMPLE="${ROOT}/etc/conf.d/wireless.example" - local WIRELESS_MD5='d1fad7da940bf263c76af4d2082124a3' - if [[ -e "${WIRELESS_EXAMPLE}" ]] ; then - if [[ $(md5sum "${WIRELESS_EXAMPLE}") == ${WIRELESS_MD5}* ]]; then - rm -f "${WIRELESS_EXAMPLE}" - elog "${WIRELESS_EXAMPLE} is deprecated and has been removed." - else - sed -i '1i# This file is obsolete.\n' "${WIRELESS_EXAMPLE}" - elog "${WIRELESS_EXAMPLE} is deprecated and should be removed." - fi - elog "If you are using the old style network scripts," - elog "Configure wireless settings in ${ROOT}/etc/conf.d/net" - elog "after reviewing ${ROOT}/usr/share/doc/${PF}/net.example" - fi - - if [[ -d ${ROOT}/etc/modules.autoload.d ]] ; then - ewarn "/etc/modules.autoload.d is no longer used. Please convert" - ewarn "your files to /etc/conf.d/modules and delete the directory." - fi - - if use hppa; then - elog "Setting the console font does not work on all HPPA consoles." - elog "You can still enable it by running:" - elog "# rc-update add consolefont boot" - fi - - # Handle the conf.d/local.{start,stop} -> local.d transition - if path_exists -o "${ROOT}"etc/conf.d/local.{start,stop} ; then - elog "Moving your ${ROOT}etc/conf.d/local.{start,stop}" - elog "files to ${ROOT}etc/local.d" - mv "${ROOT}"etc/conf.d/local.start "${ROOT}"etc/local.d/baselayout1.start - mv "${ROOT}"etc/conf.d/local.stop "${ROOT}"etc/local.d/baselayout1.stop - chmod +x "${ROOT}"etc/local.d/*{start,stop} - fi - - # update the dependency tree after touching all files #224171 - [[ "${ROOT}" = "/" ]] && "${ROOT}/${LIBDIR}"/rc/bin/rc-depend -u - - elog "You should now update all files in /etc, using etc-update" - elog "or equivalent before restarting any services or this host." - elog - elog "Please read the migration guide available at:" - elog "http://www.gentoo.org/doc/en/openrc-migration.xml" -} diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest deleted file mode 100644 index 30f6ac0c..00000000 --- a/sys-apps/systemd/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST systemd-208-r1.tar.xz 2382904 SHA256 aa64fa864466fd5727005c55d61c092828b94b4f857272c0b503695022146390 SHA512 c21989b747f5e73ba2311919e1ae558132e4ab2e0d8715c25f51e5e90069e147a52e04280c736ecca6b675af7d79def576171a9b08aaeda45fcd52bcdca011cb WHIRLPOOL e86fdbf96c75c4c94c9507900a5696ff811f5439e0cb45bdc765dc42c62a855c9d2e7d3414df7ec7e18013d937c9148e42c861d0e28e8b4c2fabebd234fbee03 -DIST systemd-215.tar.xz 2888652 SHA256 ce76a3c05e7d4adc806a3446a5510c0c9b76a33f19adc32754b69a0945124505 SHA512 58de0bf7c43c309c2f8e4b7af16b46608a4ea39cbb280496fe5d43d76ea25545484f4ef62efce18be487c69134e4a038d8787f2c262484f92f7fc6feb3ae2f11 WHIRLPOOL 07389822b9f09cd91f360f3cbdcd0b5bf46ba1750dd1a4ad44fd2813436ef40b447b954d33582ffe83aebde618ecbeac4d2f3231d8afbf3975caf84f52b1053a -DIST systemd-216.tar.xz 3612960 SHA256 945d3db7d840d6ffe98aa68394428e13317161ae79905397faab6671619728f3 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2 WHIRLPOOL 505e09b55209a4f9d8cec077970571b2e1298e8db02946a6c79df139dece9d1a08e46c86ef6c8053274abfd46c9a5ea09157f5bc9dc1f7461322c596e84ef494 -DIST systemd-gentoo-patchset-208_p19.tar.bz2 7351 SHA256 3fce1d7ff628b0f49d4bf45eb7beb7d3b4a45c219464be47e4b04e5e16ace335 SHA512 d2ee48a46a8dc097f41d23c58c2c8f40841b42ce175d633ba0090543164c353449a911c5f314b1d1aa7937e51b97cc2608aa4590f0ff56140b42108b0e76a2e8 WHIRLPOOL 934fd88ee12ed72709e0b7aabe01f9e21417480156049af80eaa5413d50726aa49abc03e756bdeff45a4f82decaafa1f76539f16b2319e3c42a0a593f2096417 diff --git a/sys-apps/systemd/files/215-0001-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch b/sys-apps/systemd/files/215-0001-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch deleted file mode 100644 index b29c10de..00000000 --- a/sys-apps/systemd/files/215-0001-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 28f6bb18cdea297164763db94e2366ca4857c9c7 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering <lennart@poettering.net> -Date: Fri, 11 Jul 2014 15:56:16 +0200 -Subject: [PATCH 1/2] always check for __BYTE_ORDER == __BIG_ENDIAN when - checking for endianess - -Let's always stick to glibc's way to determine byte order, and not mix -autoconf-specific checks with gcc checks. ---- - src/shared/architecture.h | 12 ++++++------ - src/shared/gpt.h | 4 ++-- - src/shared/time-dst.c | 6 +++--- - 3 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/src/shared/architecture.h b/src/shared/architecture.h -index 4821d5d..58e97e5 100644 ---- a/src/shared/architecture.h -+++ b/src/shared/architecture.h -@@ -80,7 +80,7 @@ Architecture uname_architecture(void); - # define native_architecture() ARCHITECTURE_X86 - # define LIB_ARCH_TUPLE "i386-linux-gnu" - #elif defined(__powerpc64__) --# if defined(WORDS_BIGENDIAN) -+# if __BYTE_ORDER == __BIG_ENDIAN - # define native_architecture() ARCHITECTURE_PPC64 - # define LIB_ARCH_TUPLE "ppc64-linux-gnu" - # else -@@ -88,7 +88,7 @@ Architecture uname_architecture(void); - # error "Missing LIB_ARCH_TUPLE for PPC64LE" - # endif - #elif defined(__powerpc__) --# if defined(WORDS_BIGENDIAN) -+# if __BYTE_ORDER == __BIG_ENDIAN - # define native_architecture() ARCHITECTURE_PPC - # define LIB_ARCH_TUPLE "powerpc-linux-gnu" - # else -@@ -117,7 +117,7 @@ Architecture uname_architecture(void); - # define native_architecture() ARCHITECTURE_SPARC - # define LIB_ARCH_TUPLE "sparc-linux-gnu" - #elif defined(__mips64__) --# if defined(WORDS_BIGENDIAN) -+# if __BYTE_ORDER == __BIG_ENDIAN - # define native_architecture() ARCHITECTURE_MIPS64 - # error "Missing LIB_ARCH_TUPLE for MIPS64" - # else -@@ -125,7 +125,7 @@ Architecture uname_architecture(void); - # error "Missing LIB_ARCH_TUPLE for MIPS64_LE" - # endif - #elif defined(__mips__) --# if defined(WORDS_BIGENDIAN) -+# if __BYTE_ORDER == __BIG_ENDIAN - # define native_architecture() ARCHITECTURE_MIPS - # define LIB_ARCH_TUPLE "mips-linux-gnu" - # else -@@ -136,7 +136,7 @@ Architecture uname_architecture(void); - # define native_architecture() ARCHITECTURE_ALPHA - # define LIB_ARCH_TUPLE "alpha-linux-gnu" - #elif defined(__aarch64__) --# if defined(WORDS_BIGENDIAN) -+# if __BYTE_ORDER == __BIG_ENDIAN - # define native_architecture() ARCHITECTURE_ARM64_BE - # define LIB_ARCH_TUPLE "aarch64_be-linux-gnu" - # else -@@ -144,7 +144,7 @@ Architecture uname_architecture(void); - # define LIB_ARCH_TUPLE "aarch64-linux-gnu" - # endif - #elif defined(__arm__) --# if defined(WORDS_BIGENDIAN) -+# if __BYTE_ORDER == __BIG_ENDIAN - # define native_architecture() ARCHITECTURE_ARM_BE - # if defined(__ARM_EABI__) - # if defined(__ARM_PCS_VFP) -diff --git a/src/shared/gpt.h b/src/shared/gpt.h -index 64090e0..278940b 100644 ---- a/src/shared/gpt.h -+++ b/src/shared/gpt.h -@@ -42,10 +42,10 @@ - # define GPT_ROOT_NATIVE GPT_ROOT_X86 - #endif - --#if defined(__aarch64__) && !defined(WORDS_BIGENDIAN) -+#if defined(__aarch64__) && (__BYTE_ORDER != __BIG_ENDIAN) - # define GPT_ROOT_NATIVE GPT_ROOT_ARM_64 - # define GPT_ROOT_SECONDARY GPT_ROOT_ARM --#elif defined(__arm__) && !defined(WORDS_BIGENDIAN) -+#elif defined(__arm__) && (__BYTE_ORDER != __BIG_ENDIAN) - # define GPT_ROOT_NATIVE GPT_ROOT_ARM - #endif - -diff --git a/src/shared/time-dst.c b/src/shared/time-dst.c -index ceca2fa..6195b11 100644 ---- a/src/shared/time-dst.c -+++ b/src/shared/time-dst.c -@@ -207,8 +207,8 @@ read_again: - if (type_idxs[i] >= num_types) - return -EINVAL; - -- if (BYTE_ORDER == BIG_ENDIAN ? sizeof(time_t) == 8 && trans_width == 4 -- : sizeof(time_t) == 4 || trans_width == 4) { -+ if (__BYTE_ORDER == __BIG_ENDIAN ? sizeof(time_t) == 8 && trans_width == 4 -+ : sizeof(time_t) == 4 || trans_width == 4) { - /* Decode the transition times, stored as 4-byte integers in - network (big-endian) byte order. We work from the end of - the array so as not to clobber the next element to be -@@ -216,7 +216,7 @@ read_again: - i = num_transitions; - while (i-- > 0) - transitions[i] = decode((char *)transitions + i * 4); -- } else if (BYTE_ORDER != BIG_ENDIAN && sizeof(time_t) == 8) { -+ } else if (__BYTE_ORDER != __BIG_ENDIAN && sizeof(time_t) == 8) { - /* Decode the transition times, stored as 8-byte integers in - network (big-endian) byte order. */ - for (i = 0; i < num_transitions; ++i) --- -1.8.5.5 - diff --git a/sys-apps/systemd/files/215-0002-endian-explicitly-include-endian.h-wherever-we-want-.patch b/sys-apps/systemd/files/215-0002-endian-explicitly-include-endian.h-wherever-we-want-.patch deleted file mode 100644 index 71acac1b..00000000 --- a/sys-apps/systemd/files/215-0002-endian-explicitly-include-endian.h-wherever-we-want-.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2281422746c00d2803911f2b4699eee6bc87ee04 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering <lennart@poettering.net> -Date: Fri, 11 Jul 2014 16:13:13 +0200 -Subject: [PATCH 2/2] endian: explicitly include endian.h wherever we want to - use __BYTE_ORDER - ---- - src/libsystemd/sd-bus/bus-protocol.h | 1 + - src/shared/architecture.h | 2 ++ - src/shared/gpt.h | 2 ++ - 3 files changed, 5 insertions(+) - -diff --git a/src/libsystemd/sd-bus/bus-protocol.h b/src/libsystemd/sd-bus/bus-protocol.h -index 5046d17..4f46468 100644 ---- a/src/libsystemd/sd-bus/bus-protocol.h -+++ b/src/libsystemd/sd-bus/bus-protocol.h -@@ -21,6 +21,7 @@ - along with systemd; If not, see <http://www.gnu.org/licenses/>. - ***/ - -+#include <endian.h> - - /* Endianness */ - -diff --git a/src/shared/architecture.h b/src/shared/architecture.h -index 58e97e5..38780d1 100644 ---- a/src/shared/architecture.h -+++ b/src/shared/architecture.h -@@ -21,6 +21,8 @@ - along with systemd; If not, see <http://www.gnu.org/licenses/>. - ***/ - -+#include <endian.h> -+ - #include "util.h" - - /* A cleaned up architecture definition. We don't want to get lost in -diff --git a/src/shared/gpt.h b/src/shared/gpt.h -index 278940b..ef3444f 100644 ---- a/src/shared/gpt.h -+++ b/src/shared/gpt.h -@@ -19,6 +19,8 @@ - along with systemd; If not, see <http://www.gnu.org/licenses/>. - ***/ - -+#include <endian.h> -+ - #include "sd-id128.h" - - /* We only support root disk discovery for x86, x86-64 and ARM for --- -1.8.5.5 - diff --git a/sys-apps/systemd/files/215-0003-udev-exclude-MD-from-block-device-ownership-event-lo.patch b/sys-apps/systemd/files/215-0003-udev-exclude-MD-from-block-device-ownership-event-lo.patch deleted file mode 100644 index c730242c..00000000 --- a/sys-apps/systemd/files/215-0003-udev-exclude-MD-from-block-device-ownership-event-lo.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 9d17a215fb30cb3e49db516a39c9bec2159004a7 Mon Sep 17 00:00:00 2001 -From: Kay Sievers <kay@vrfy.org> -Date: Thu, 24 Jul 2014 23:37:35 +0200 -Subject: [PATCH 3/3] udev: exclude MD from block device ownership event - locking - -MD instantiates devices at open(). This is incomptible with the -locking logic, as the "change" event emitted when stopping a -device will bring it back. ---- - src/udev/udevd.c | 23 +++++++---------------- - 1 file changed, 7 insertions(+), 16 deletions(-) - -diff --git a/src/udev/udevd.c b/src/udev/udevd.c -index a45d324..db935d6 100644 ---- a/src/udev/udevd.c -+++ b/src/udev/udevd.c -@@ -285,26 +285,17 @@ static void worker_new(struct event *event) - udev_event->exec_delay = exec_delay; - - /* -- * Take a "read lock" on the device node; this establishes -+ * Take a shared lock on the device node; this establishes - * a concept of device "ownership" to serialize device -- * access. External processes holding a "write lock" will -+ * access. External processes holding an exclusive lock will - * cause udev to skip the event handling; in the case udev -- * acquired the lock, the external process will block until -+ * acquired the lock, the external process can block until - * udev has finished its event handling. - */ -- -- /* -- * <kabi_> since we make check - device seems unused - we try -- * ioctl to deactivate - and device is found to be opened -- * <kay> sure, you try to take a write lock -- * <kay> if you get it udev is out -- * <kay> if you can't get it, udev is busy -- * <kabi_> we cannot deactivate openned device (as it is in-use) -- * <kay> maybe we should just exclude dm from that thing entirely -- * <kabi_> IMHO this sounds like a good plan for this moment -- */ -- if (streq_ptr("block", udev_device_get_subsystem(dev)) && -- !startswith(udev_device_get_sysname(dev), "dm-")) { -+ if (!streq_ptr(udev_device_get_action(dev), "remove") && -+ streq_ptr("block", udev_device_get_subsystem(dev)) && -+ !startswith(udev_device_get_sysname(dev), "dm-") && -+ !startswith(udev_device_get_sysname(dev), "md")) { - struct udev_device *d = dev; - - if (streq_ptr("partition", udev_device_get_devtype(d))) --- -1.8.5.5 - diff --git a/sys-apps/systemd/files/216-lz4-build.patch b/sys-apps/systemd/files/216-lz4-build.patch deleted file mode 100644 index 65fe45cb..00000000 --- a/sys-apps/systemd/files/216-lz4-build.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 10893a5cfa7d792ba171282c2ec46b85ed6aae0c -Author: Gustavo Sverzut Barbieri <gustavo.barbieri@intel.com> -Date: Thu Sep 25 18:08:02 2014 -0300 - - journal: build fix when LZ4 is enabled but XZ is not - -diff --git a/src/journal/journal-file.h b/src/journal/journal-file.h -index da2ef3b..6b4bf0d 100644 ---- a/src/journal/journal-file.h -+++ b/src/journal/journal-file.h -@@ -78,7 +78,7 @@ typedef struct JournalFile { - - Hashmap *chain_cache; - --#ifdef HAVE_XZ -+#if defined(HAVE_XZ) || defined(HAVE_LZ4) - void *compress_buffer; - size_t compress_buffer_size; - #endif diff --git a/sys-apps/systemd/files/216-tmpfiles-setup-dev.patch b/sys-apps/systemd/files/216-tmpfiles-setup-dev.patch deleted file mode 100644 index 1fa4a3e7..00000000 --- a/sys-apps/systemd/files/216-tmpfiles-setup-dev.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 8c94052ee543c3598a3c7b0c46688150aa2c6168 Mon Sep 17 00:00:00 2001 -From: Tom Gundersen <teg@jklm.no> -Date: Mon, 27 Oct 2014 17:15:42 +0100 -Subject: units: tmpfiles-setup-dev - allow unsafe file creation to happen in - /dev at boot - -This will allow us to mark static device nodes with '!' to indicate that they should only be created at early boot. - -diff --git a/units/systemd-tmpfiles-setup-dev.service.in b/units/systemd-tmpfiles-setup-dev.service.in -index f3833fd..0123a03 100644 ---- a/units/systemd-tmpfiles-setup-dev.service.in -+++ b/units/systemd-tmpfiles-setup-dev.service.in -@@ -17,4 +17,4 @@ ConditionCapability=CAP_SYS_MODULE - [Service] - Type=oneshot - RemainAfterExit=yes --ExecStart=@rootbindir@/systemd-tmpfiles --prefix=/dev --create -+ExecStart=@rootbindir@/systemd-tmpfiles --prefix=/dev --create --boot --- -cgit v0.10.2 - diff --git a/sys-apps/systemd/files/blacklist-146 b/sys-apps/systemd/files/blacklist-146 deleted file mode 100644 index 3e063a35..00000000 --- a/sys-apps/systemd/files/blacklist-146 +++ /dev/null @@ -1,48 +0,0 @@ -# This file lists modules which will not be loaded by udev, -# not at coldplugging and not on hotplug events. - -# Add your own entries to this file -# in the format "blacklist <name of module>" - -# Some examples: -# evbug is a debug tool and should be loaded explicitly -blacklist evbug - -# Autoloading eth1394 most of the time re-orders your network -# interfaces, and with buggy kernel 2.6.21, udev persistent-net -# is not able to rename these devices, so you get eth?_rename devices -# plus an exceeded 30sec boot timeout -blacklist eth1394 - -# You probably want this to not get the console beep loud on every tab :) -#blacklist pcspkr - -# these drivers are very simple, the HID drivers are usually preferred -#blacklist usbmouse -#blacklist usbkbd - -# Sometimes loading a framebuffer driver at boot gets the console black -#install pci:v*d*sv*sd*bc03sc*i* /bin/true - -# hplip and cups 1.4+ use raw USB devices, so it requires usblp not be loaded -blacklist usblp - -## make broadcom-sta happy -## <2012-12-08. -#blacklist ssb -#blacklist bcma -#blacklist brcmsmac -#blacklist b43 - -# make b43 happy (ditch broadcom-sta) -# 2012-12-08. Testing needed. -blacklist wl - -# keep nvidia-drivers working, sorry nouveau -blacklist nouveau - -# Known to cause kernel OOPS at boot -blacklist ite_cir - -# Prevents kernel message: Driver 'pcspkr' is already registered, aborting... -blacklist snd-pcsp diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml deleted file mode 100644 index 04f7dcb3..00000000 --- a/sys-apps/systemd/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer> - <email>systemd@gentoo.org</email> - <name>Gentoo systemd team</name> - </maintainer> - <use> - <!-- XXX: describe those two better --> - <flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag> - <flag name='cryptsetup'>Use libcryptsetup</flag> - <flag name='efi'>Enable EFI support (installs bootctl)</flag> - <flag name='gcrypt'>Enable sealing of journal files using gcrypt</flag> - <flag name="gudev">enable libudev gobject interface</flag> - <flag name='http'>Enable embedded HTTP server in journald</flag> - <flag name='kmod'>Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag> - <flag name='qrcode'>Enable qrcode output support in journal</flag> - <flag name='vanilla'>Disable Gentoo-specific behavior and compatibility quirks</flag> - </use> -</pkgmetadata> diff --git a/sys-apps/systemd/systemd-208-r3.ebuild b/sys-apps/systemd/systemd-208-r3.ebuild deleted file mode 100644 index 6a9efc61..00000000 --- a/sys-apps/systemd/systemd-208-r3.ebuild +++ /dev/null @@ -1,394 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -AUTOTOOLS_PRUNE_LIBTOOL_FILES=all -PYTHON_COMPAT=( python{2_7,3_2,3_3} ) -inherit autotools-utils bash-completion-r1 fcaps linux-info multilib \ - multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \ - user - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" -SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz -> ${P}-r1.tar.xz - http://dev.gentoo.org/~mgorny/dist/${PN}-gentoo-patchset-${PV}_p19.tar.bz2" - -LICENSE="GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0/1" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="acl audit cryptsetup doc +firmware-loader gcrypt gudev http introspection - +kmod lzma pam policykit python qrcode selinux tcpd test - vanilla xattr" - -MINKV="3.0" - -COMMON_DEPEND=">=sys-apps/dbus-1.6.8-r1 - >=sys-apps/util-linux-2.20 - sys-libs/libcap - acl? ( sys-apps/acl ) - audit? ( >=sys-process/audit-2 ) - cryptsetup? ( >=sys-fs/cryptsetup-1.6 ) - gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0 ) - gudev? ( >=dev-libs/glib-2[${MULTILIB_USEDEP}] ) - http? ( net-libs/libmicrohttpd ) - introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) - kmod? ( >=sys-apps/kmod-14-r1 ) - lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] ) - pam? ( virtual/pam ) - python? ( ${PYTHON_DEPS} ) - qrcode? ( media-gfx/qrencode ) - selinux? ( sys-libs/libselinux ) - tcpd? ( sys-apps/tcp-wrappers ) - xattr? ( sys-apps/attr ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" - -# baselayout-2.2 has /run -RDEPEND="${COMMON_DEPEND} - !app-admin/eselect-init - >=sys-apps/baselayout-2.2 - || ( - >=sys-apps/util-linux-2.22 - <sys-apps/sysvinit-2.88-r4 - ) - !sys-auth/nss-myhostname - !<sys-libs/glibc-2.10 - !sys-fs/udev" - -PDEPEND=">=sys-apps/hwids-20130717-r1[udev] - >=sys-fs/udev-init-scripts-25 - policykit? ( sys-auth/polkit ) - !vanilla? ( sys-apps/gentoo-systemd-integration )" - -# Newer linux-headers needed by ia64, bug #480218 -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - dev-util/gperf - >=dev-util/intltool-0.50 - >=sys-devel/binutils-2.23.1 - >=sys-devel/gcc-4.6 - >=sys-kernel/linux-headers-${MINKV} - ia64? ( >=sys-kernel/linux-headers-3.9 ) - virtual/pkgconfig - doc? ( >=dev-util/gtk-doc-1.18 )" - -pkg_pretend() { - local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID - ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~PROC_FS - ~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD - ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 - ~!GRKERNSEC_PROC" - - use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" - use pam && CONFIG_CHECK+=" ~AUDITSYSCALL" - use xattr && CONFIG_CHECK+=" ~TMPFS_XATTR" - kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" - use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER" - - if linux_config_exists; then - local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) - if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then - ewarn "It's recommended to set an empty value to the following kernel config option:" - ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" - fi - fi - - if [[ ${MERGE_TYPE} != binary ]]; then - if [[ $(gcc-major-version) -lt 4 - || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]] - then - eerror "systemd requires at least gcc 4.6 to build. Please switch the active" - eerror "gcc version using gcc-config." - die "systemd requires at least gcc 4.6" - fi - fi - - if [[ ${MERGE_TYPE} != buildonly ]]; then - if kernel_is -lt ${MINKV//./ }; then - ewarn "Kernel version at least ${MINKV} required" - fi - - if ! use firmware-loader && kernel_is -lt 3 8; then - ewarn "You seem to be using kernel older than 3.8. Those kernel versions" - ewarn "require systemd with USE=firmware-loader to support loading" - ewarn "firmware. Missing this flag may cause some hardware not to work." - fi - - check_extra_config - fi -} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - local PATCHES=( - "${WORKDIR}"/${PN}-gentoo-patchset*/*.patch - ) - - # Bug 463376 - sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die - - autotools-utils_src_prepare -} - -multilib_src_configure() { - local myeconfargs=( - --localstatedir=/var - --with-pamlibdir=$(getpam_mod_dir) - # avoid bash-completion dep - --with-bashcompletiondir="$(get_bashcompdir)" - # make sure we get /bin:/sbin in $PATH - --enable-split-usr - # disable sysv compatibility - --with-sysvinit-path= - --with-sysvrcnd-path= - # no deps - --enable-efi - --enable-ima - # optional components/dependencies - $(use_enable acl) - $(use_enable audit) - $(use_enable cryptsetup libcryptsetup) - $(use_enable doc gtk-doc) - $(use_enable gcrypt) - $(use_enable gudev) - $(use_enable http microhttpd) - $(use_enable introspection) - $(use_enable kmod) - $(use_enable lzma xz) - $(use_enable pam) - $(use_enable policykit polkit) - $(use_enable python python-devel) - $(use python && echo PYTHON_CONFIG=/usr/bin/python-config-${EPYTHON#python}) - $(use_enable qrcode qrencode) - $(use_enable selinux) - $(use_enable tcpd tcpwrap) - $(use_enable test tests) - $(use_enable xattr) - - # not supported (avoid automagic deps in the future) - --disable-chkconfig - - # hardcode a few paths to spare some deps - QUOTAON=/usr/sbin/quotaon - QUOTACHECK=/usr/sbin/quotacheck - ) - - # Keep using the one where the rules were installed. - MY_UDEVDIR=$(get_udevdir) - - if use firmware-loader; then - myeconfargs+=( - --with-firmware-path="/lib/firmware/updates:/lib/firmware" - ) - fi - - if ! multilib_is_native_abi; then - myeconfargs+=( - ac_cv_search_cap_init= - ac_cv_header_sys_capability_h=yes - DBUS_CFLAGS=' ' - DBUS_LIBS=' ' - - --disable-acl - --disable-audit - --disable-gcrypt - --disable-gtk-doc - --disable-introspection - --disable-kmod - --disable-libcryptsetup - --disable-microhttpd - --disable-pam - --disable-polkit - --disable-qrencode - --disable-selinux - --disable-tcpwrap - --disable-tests - --disable-xattr - --disable-xz - --disable-python-devel - ) - fi - - # Work around bug 463846. - tc-export CC - - autotools-utils_src_configure -} - -multilib_src_compile() { - local mymakeopts=( - udevlibexecdir="${MY_UDEVDIR}" - ) - - if multilib_is_native_abi; then - emake "${mymakeopts[@]}" - else - # prerequisites for gudev - use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h} - - echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \ - emake "${mymakeopts[@]}" -f Makefile -f - gentoo - fi -} - -multilib_src_test() { - multilib_is_native_abi || continue - - default -} - -multilib_src_install() { - local mymakeopts=( - # automake fails with parallel libtool relinking - # https://bugs.gentoo.org/show_bug.cgi?id=491398 - -j1 - - udevlibexecdir="${MY_UDEVDIR}" - dist_udevhwdb_DATA= - DESTDIR="${D}" - ) - - if multilib_is_native_abi; then - emake "${mymakeopts[@]}" install - else - mymakeopts+=( - install-libLTLIBRARIES - install-pkgconfiglibDATA - install-includeHEADERS - # safe to call unconditionally, 'installs' empty list - install-libgudev_includeHEADERS - install-pkgincludeHEADERS - ) - - emake "${mymakeopts[@]}" - fi -} - -multilib_src_install_all() { - prune_libtool_files --modules - einstalldocs - - # we just keep sysvinit tools, so no need for the mans - rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ - || die - rm "${D}"/usr/share/man/man1/init.1 || die - - # Disable storing coredumps in journald, bug #433457 - mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die - - # Preserve empty dirs in /etc & /var, bug #437008 - keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \ - /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd - - # Symlink /etc/sysctl.conf for easy migration. - dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf - - # Offer a default blacklist that should cover the most - # common use cases. - insinto /etc/modprobe.d - newins "${FILESDIR}"/blacklist-146 blacklist.conf -} - -migrate_locale() { - local envd_locale_def="${EROOT%/}/etc/env.d/02locale" - local envd_locale=( "${EROOT%/}"/etc/env.d/??locale ) - local locale_conf="${EROOT%/}/etc/locale.conf" - - if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then - # if locale.conf does not exist... - if [[ -e ${envd_locale} ]]; then - # ...either copy env.d/??locale if there's one - ebegin "Moving ${envd_locale} to ${locale_conf}" - mv "${envd_locale}" "${locale_conf}" - eend ${?} || FAIL=1 - else - # ...or create a dummy default - ebegin "Creating ${locale_conf}" - cat > "${locale_conf}" <<-EOF - # This file has been created by the sys-apps/systemd ebuild. - # See locale.conf(5) and localectl(1). - - # LANG=${LANG} - EOF - eend ${?} || FAIL=1 - fi - fi - - if [[ ! -L ${envd_locale} ]]; then - # now, if env.d/??locale is not a symlink (to locale.conf)... - if [[ -e ${envd_locale} ]]; then - # ...warn the user that he has duplicate locale settings - ewarn - ewarn "To ensure consistent behavior, you should replace ${envd_locale}" - ewarn "with a symlink to ${locale_conf}. Please migrate your settings" - ewarn "and create the symlink with the following command:" - ewarn "ln -s -n -f ../locale.conf ${envd_locale}" - ewarn - else - # ...or just create the symlink if there's nothing here - ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" - ln -n -s ../locale.conf "${envd_locale_def}" - eend ${?} || FAIL=1 - fi - fi -} - -pkg_postinst() { - enewgroup systemd-journal - if use http; then - enewgroup systemd-journal-gateway - enewuser systemd-journal-gateway -1 -1 -1 systemd-journal-gateway - fi - systemd_update_catalog - - # Keep this here in case the database format changes so it gets updated - # when required. Despite that this file is owned by sys-apps/hwids. - if has_version "sys-apps/hwids[udev]"; then - udevadm hwdb --update --root="${ROOT%/}" - fi - - udev_reload || FAIL=1 - - # Bug 468876 - fcaps cap_dac_override,cap_sys_ptrace=ep usr/bin/systemd-detect-virt - - # Bug 465468, make sure locales are respect, and ensure consistency - # between OpenRC & systemd - migrate_locale - - if [[ ${FAIL} ]]; then - eerror "One of the postinst commands failed. Please check the postinst output" - eerror "for errors. You may need to clean up your system and/or try installing" - eerror "systemd again." - eerror - fi - - if [[ ! -L "${ROOT}"/etc/mtab ]]; then - ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts." - ewarn "Not having it is not supported by upstream and will cause tools like 'df'" - ewarn "and 'mount' to not work properly. Please run:" - ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" - ewarn - fi - - if ! has_version sys-apps/systemd-ui; then - elog "To get additional features, a number of optional runtime dependencies may" - elog "be installed:" - elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent" - fi -} - -pkg_prerm() { - # If removing systemd completely, remove the catalog database. - if [[ ! ${REPLACED_BY_VERSION} ]]; then - rm -f -v "${EROOT}"/var/lib/systemd/catalog/database - fi -} diff --git a/sys-apps/systemd/systemd-215-r3.ebuild b/sys-apps/systemd/systemd-215-r3.ebuild deleted file mode 100644 index a1f1efe6..00000000 --- a/sys-apps/systemd/systemd-215-r3.ebuild +++ /dev/null @@ -1,521 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -AUTOTOOLS_PRUNE_LIBTOOL_FILES=all -PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} ) -inherit autotools-utils bash-completion-r1 linux-info multilib \ - multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \ - user - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" -SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz" - -LICENSE="GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0/2" -KEYWORDS="alpha amd64 arm ~ia64 ppc ~ppc64 ~sparc x86" -IUSE="acl audit cryptsetup doc elfutils +firmware-loader gcrypt gudev http - introspection kdbus +kmod lzma pam policykit python qrcode +seccomp selinux - ssl test vanilla" - -MINKV="3.8" - -COMMON_DEPEND=">=sys-apps/util-linux-2.20:0= - sys-libs/libcap:0= - acl? ( sys-apps/acl:0= ) - audit? ( >=sys-process/audit-2:0= ) - cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) - elfutils? ( >=dev-libs/elfutils-0.158:0= ) - gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) - gudev? ( >=dev-libs/glib-2.34.3:2=[${MULTILIB_USEDEP}] ) - http? ( - >=net-libs/libmicrohttpd-0.9.33:0= - ssl? ( >=net-libs/gnutls-3.1.4:0= ) - ) - introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) - kmod? ( >=sys-apps/kmod-15:0= ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) - pam? ( virtual/pam:= ) - python? ( ${PYTHON_DEPS} ) - qrcode? ( media-gfx/qrencode:0= ) - seccomp? ( sys-libs/libseccomp:0= ) - selinux? ( sys-libs/libselinux:0= ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" - -# baselayout-2.2 has /run -RDEPEND="${COMMON_DEPEND} - !app-admin/eselect-init - >=sys-apps/baselayout-2.2 - || ( - >=sys-apps/util-linux-2.22 - <sys-apps/sysvinit-2.88-r4 - ) - !sys-auth/nss-myhostname - !<sys-libs/glibc-2.14 - !sys-fs/udev" - -# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) -PDEPEND=">=sys-apps/dbus-1.6.8-r1:0[systemd] - >=sys-apps/hwids-20130717-r1[udev] - >=sys-fs/udev-init-scripts-25 - policykit? ( sys-auth/polkit ) - !vanilla? ( sys-apps/gentoo-systemd-integration )" - -# Newer linux-headers needed by ia64, bug #480218 -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils:0 - dev-util/gperf - >=dev-util/intltool-0.50 - >=sys-apps/coreutils-8.16 - >=sys-devel/binutils-2.23.1 - >=sys-devel/gcc-4.6 - >=sys-kernel/linux-headers-${MINKV} - ia64? ( >=sys-kernel/linux-headers-3.9 ) - virtual/pkgconfig - doc? ( >=dev-util/gtk-doc-1.18 ) - python? ( dev-python/lxml[${PYTHON_USEDEP}] ) - test? ( >=sys-apps/dbus-1.6.8-r1:0 )" - -src_prepare() { - local PATCHES=( - "${FILESDIR}/${PV}-0001-always-check-for-__BYTE_ORDER-__BIG_ENDIAN-when-chec.patch" - "${FILESDIR}/${PV}-0002-endian-explicitly-include-endian.h-wherever-we-want-.patch" - "${FILESDIR}/${PV}-0003-udev-exclude-MD-from-block-device-ownership-event-lo.patch" - ) - - # Bug 463376 - sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die - - # http://thread.gmane.org/gmane.comp.sysutils.systemd.devel/20815 - touch src/core/org.freedesktop.systemd1.policy.in.in || die - - # http://thread.gmane.org/gmane.comp.sysutils.systemd.devel/21074 - touch units/emergency.service.in || die - - autotools-utils_src_prepare -} - -pkg_pretend() { - local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID - ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS - ~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD ~TMPFS_XATTR - ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 - ~!GRKERNSEC_PROC" - - use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" - kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" - use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER" - - if linux_config_exists; then - local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) - if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then - ewarn "It's recommended to set an empty value to the following kernel config option:" - ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" - fi - fi - - if [[ ${MERGE_TYPE} != binary ]]; then - if [[ $(gcc-major-version) -lt 4 - || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]] - then - eerror "systemd requires at least gcc 4.6 to build. Please switch the active" - eerror "gcc version using gcc-config." - die "systemd requires at least gcc 4.6" - fi - fi - - if [[ ${MERGE_TYPE} != buildonly ]]; then - if kernel_is -lt ${MINKV//./ }; then - ewarn "Kernel version at least ${MINKV} required" - fi - - if ! use firmware-loader && kernel_is -lt 3 8; then - ewarn "You seem to be using kernel older than 3.8. Those kernel versions" - ewarn "require systemd with USE=firmware-loader to support loading" - ewarn "firmware. Missing this flag may cause some hardware not to work." - fi - - check_extra_config - fi -} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - # Keep using the one where the rules were installed. - MY_UDEVDIR=$(get_udevdir) - # Fix systems broken by bug #509454. - [[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev - - multilib-minimal_src_configure -} - -multilib_native_enable() { - if multilib_is_native_abi; then - echo "--enable-${1}" - else - echo "--disable-${1}" - fi -} - -multilib_src_configure() { - local myeconfargs=( - # disable -flto since it is an optimization flag - # and makes distcc less effective - cc_cv_CFLAGS__flto=no - - # Workaround for bug 516346 - --enable-dependency-tracking - - --disable-maintainer-mode - --localstatedir=/var - --with-pamlibdir=$(getpam_mod_dir) - # avoid bash-completion dep - --with-bashcompletiondir="$(get_bashcompdir)" - # make sure we get /bin:/sbin in $PATH - --enable-split-usr - # disable sysv compatibility - --with-sysvinit-path= - --with-sysvrcnd-path= - # no deps - --enable-efi - --enable-ima - - # Optional components/dependencies - $(multilib_native_use_enable acl) - $(multilib_native_use_enable audit) - $(multilib_native_use_enable cryptsetup libcryptsetup) - $(multilib_native_use_enable doc gtk-doc) - $(multilib_native_use_enable elfutils) - $(use_enable gcrypt) - $(use_enable gudev) - $(multilib_native_use_enable http microhttpd) - $(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls) - $(multilib_native_use_enable introspection) - $(use_enable kdbus) - $(multilib_native_use_enable kmod) - $(use_enable lzma xz) - $(multilib_native_use_enable pam) - $(multilib_native_use_enable policykit polkit) - $(multilib_native_use_with python) - $(multilib_native_use_enable python python-devel) - $(multilib_native_use_enable qrcode qrencode) - $(multilib_native_use_enable seccomp) - $(multilib_native_use_enable selinux) - $(multilib_native_use_enable test tests) - $(multilib_native_use_enable test dbus) - - # Disable optional binaries for non-native abis - $(multilib_native_enable backlight) - $(multilib_native_enable binfmt) - $(multilib_native_enable bootchart) - $(multilib_native_enable coredump) - $(multilib_native_enable hostnamed) - $(multilib_native_enable localed) - $(multilib_native_enable logind) - $(multilib_native_enable machined) - $(multilib_native_enable networkd) - $(multilib_native_enable quotacheck) - $(multilib_native_enable randomseed) - $(multilib_native_enable readahead) - $(multilib_native_enable resolved) - $(multilib_native_enable rfkill) - $(multilib_native_enable sysusers) - $(multilib_native_enable timedated) - $(multilib_native_enable timesyncd) - $(multilib_native_enable tmpfiles) - $(multilib_native_enable vconsole) - - # not supported (avoid automagic deps in the future) - --disable-apparmor - --disable-chkconfig - - # hardcode a few paths to spare some deps - QUOTAON=/usr/sbin/quotaon - QUOTACHECK=/usr/sbin/quotacheck - - # dbus paths - --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" - --with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services" - --with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services" - --with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces" - - --with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" - ) - - if use firmware-loader; then - myeconfargs+=( - --with-firmware-path="/lib/firmware/updates:/lib/firmware" - ) - fi - - # Added for testing; this is UNSUPPORTED by the Gentoo systemd team! - if [[ -n ${ROOTPREFIX+set} ]]; then - myeconfargs+=( - --with-rootprefix="${ROOTPREFIX}" - --with-rootlibdir="${ROOTPREFIX}/$(get_libdir)" - ) - fi - - if ! multilib_is_native_abi; then - myeconfargs+=( - ac_cv_search_cap_init= - ac_cv_header_sys_capability_h=yes - ) - fi - - # Work around bug 463846. - tc-export CC - - autotools-utils_src_configure -} - -multilib_src_compile() { - local mymakeopts=( - udevlibexecdir="${MY_UDEVDIR}" - ) - - if multilib_is_native_abi; then - emake "${mymakeopts[@]}" - else - # prerequisites for gudev - use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h} - - echo 'gentoo: $(BUILT_SOURCES)' | \ - emake "${mymakeopts[@]}" -f Makefile -f - gentoo - echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \ - emake "${mymakeopts[@]}" -f Makefile -f - gentoo - fi -} - -multilib_src_test() { - multilib_is_native_abi || continue - - default -} - -multilib_src_install() { - local mymakeopts=( - # automake fails with parallel libtool relinking - # https://bugs.gentoo.org/show_bug.cgi?id=491398 - -j1 - - udevlibexecdir="${MY_UDEVDIR}" - dist_udevhwdb_DATA= - DESTDIR="${D}" - ) - - if multilib_is_native_abi; then - emake "${mymakeopts[@]}" install - else - mymakeopts+=( - install-libLTLIBRARIES - install-pkgconfiglibDATA - install-includeHEADERS - # safe to call unconditionally, 'installs' empty list - install-libgudev_includeHEADERS - install-pkgincludeHEADERS - ) - - emake "${mymakeopts[@]}" - fi - - # install compat pkg-config files - local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc ) - emake "${mymakeopts[@]}" install-pkgconfiglibDATA \ - pkgconfiglib_DATA="${pcfiles[*]}" - - # Create symlinks for old libs - dosym libsystemd.so "/usr/$(get_libdir)/libsystemd-daemon.so" - dosym libsystemd.so "/usr/$(get_libdir)/libsystemd-id128.so" - dosym libsystemd.so "/usr/$(get_libdir)/libsystemd-journal.so" - dosym libsystemd.so "/usr/$(get_libdir)/libsystemd-login.so" - - # Kogaion: create systemd-run symlink in /bin. lvm2 lvmetad has a - # udev rule that expects systemd-run to be in /bin. And lvmetad is - # used by Anaconda. - dosym "../usr/bin/systemd-run" "/bin/systemd-run" -} - -multilib_src_install_all() { - prune_libtool_files --modules - einstalldocs - - # we just keep sysvinit tools, so no need for the mans - rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ - || die - rm "${D}"/usr/share/man/man1/init.1 || die - - # Disable storing coredumps in journald, bug #433457 - mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die - - # Preserve empty dirs in /etc & /var, bug #437008 - keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \ - /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd - - # Symlink /etc/sysctl.conf for easy migration. - dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf - - # If we install these symlinks, there is no way for the sysadmin to remove them - # permanently. - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service - rm -rf "${D}"/etc/systemd/system/network-online.target.wants - - # Offer a default blacklist that should cover the most - # common use cases. - insinto /etc/modprobe.d - newins "${FILESDIR}"/blacklist-146 blacklist.conf -} - -migrate_locale() { - local envd_locale_def="${EROOT%/}/etc/env.d/02locale" - local envd_locale=( "${EROOT%/}"/etc/env.d/??locale ) - local locale_conf="${EROOT%/}/etc/locale.conf" - - if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then - # If locale.conf does not exist... - if [[ -e ${envd_locale} ]]; then - # ...either copy env.d/??locale if there's one - ebegin "Moving ${envd_locale} to ${locale_conf}" - mv "${envd_locale}" "${locale_conf}" - eend ${?} || FAIL=1 - else - # ...or create a dummy default - ebegin "Creating ${locale_conf}" - cat > "${locale_conf}" <<-EOF - # This file has been created by the sys-apps/systemd ebuild. - # See locale.conf(5) and localectl(1). - - # LANG=${LANG} - EOF - eend ${?} || FAIL=1 - fi - fi - - if [[ ! -L ${envd_locale} ]]; then - # now, if env.d/??locale is not a symlink (to locale.conf)... - if [[ -e ${envd_locale} ]]; then - # ...warn the user that he has duplicate locale settings - ewarn - ewarn "To ensure consistent behavior, you should replace ${envd_locale}" - ewarn "with a symlink to ${locale_conf}. Please migrate your settings" - ewarn "and create the symlink with the following command:" - ewarn "ln -s -n -f ../locale.conf ${envd_locale}" - ewarn - else - # ...or just create the symlink if there's nothing here - ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" - ln -n -s ../locale.conf "${envd_locale_def}" - eend ${?} || FAIL=1 - fi - fi -} - -migrate_net_name_slot() { - # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, - # do the same for 80-net-setup-link.rules to keep the old behavior - local net_move=no - local net_name_slot_sym=no - local net_rules_path="${EROOT%/}"/etc/udev/rules.d - local net_name_slot="${net_rules_path}"/80-net-name-slot.rules - local net_setup_link="${net_rules_path}"/80-net-setup-link.rules - if [[ -e ${net_setup_link} ]]; then - net_move=no - elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then - net_move=yes - elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then - net_move=yes - net_name_slot_sym=yes - fi - if [[ ${net_move} == yes ]]; then - ebegin "Copying ${net_name_slot} to ${net_setup_link}" - - if [[ ${net_name_slot_sym} == yes ]]; then - ln -nfs /dev/null "${net_setup_link}" - else - cp "${net_name_slot}" "${net_setup_link}" - fi - eend $? || FAIL=1 - fi -} - -pkg_postinst() { - newusergroup() { - enewgroup "$1" - enewuser "$1" -1 -1 -1 "$1" - } - - enewgroup input - enewgroup systemd-journal - newusergroup systemd-bus-proxy - newusergroup systemd-network - newusergroup systemd-resolve - newusergroup systemd-timesync - use http && newusergroup systemd-journal-gateway - - systemd_update_catalog - - # Keep this here in case the database format changes so it gets updated - # when required. Despite that this file is owned by sys-apps/hwids. - if has_version "sys-apps/hwids[udev]"; then - udevadm hwdb --update --root="${ROOT%/}" - fi - - udev_reload || FAIL=1 - - # Bug 465468, make sure locales are respect, and ensure consistency - # between OpenRC & systemd - migrate_locale - - # Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules - migrate_net_name_slot - - if [[ ${FAIL} ]]; then - eerror "One of the postinst commands failed. Please check the postinst output" - eerror "for errors. You may need to clean up your system and/or try installing" - eerror "systemd again." - eerror - fi - - if [[ ! -L "${ROOT}"/etc/mtab ]]; then - ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts." - ewarn "Not having it is not supported by upstream and will cause tools like 'df'" - ewarn "and 'mount' to not work properly. Please run:" - ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" - ewarn - fi - - if [[ $(readlink "${ROOT}"/etc/resolv.conf) == */run/systemd/network/resolv.conf ]]; then - ewarn "resolv.conf is now generated by systemd-resolved. To use it, enable" - ewarn "systemd-resolved.service, and create a symlink from /etc/resolv.conf" - ewarn "to /run/systemd/resolve/resolv.conf" - ewarn - fi - - if ! has_version sys-apps/systemd-ui; then - elog "To get additional features, a number of optional runtime dependencies may" - elog "be installed:" - elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent" - fi - - if has_version sys-apps/openrc && - ! has_version sys-fs/udev-init-scripts; then - elog "If you plan to boot using OpenRC and udev or eudev, you" - elog "need to install the udev-init-scripts package." - fi -} - -pkg_prerm() { - # If removing systemd completely, remove the catalog database. - if [[ ! ${REPLACED_BY_VERSION} ]]; then - rm -f -v "${EROOT}"/var/lib/systemd/catalog/database - fi -} diff --git a/sys-apps/systemd/systemd-216-r3.ebuild b/sys-apps/systemd/systemd-216-r3.ebuild deleted file mode 100644 index 143febdc..00000000 --- a/sys-apps/systemd/systemd-216-r3.ebuild +++ /dev/null @@ -1,526 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-216-r3.ebuild,v 1.9 2015/04/27 12:35:00 ago Exp $ - -EAPI=5 - -AUTOTOOLS_PRUNE_LIBTOOL_FILES=all -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) -inherit autotools-utils bash-completion-r1 linux-info multilib \ - multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \ - user - -DESCRIPTION="System and service manager for Linux" -HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd" -SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz" - -LICENSE="GPL-2 LGPL-2.1 MIT public-domain" -SLOT="0/2" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86" -IUSE="acl apparmor audit cryptsetup curl doc elfutils +firmware-loader gcrypt gudev http - idn introspection kdbus +kmod lz4 lzma pam policykit python qrcode +seccomp - selinux ssl sysv-utils test vanilla" - -MINKV="3.8" - -COMMON_DEPEND=">=sys-apps/util-linux-2.20:0= - sys-libs/libcap:0= - !<sys-libs/glibc-2.16 - acl? ( sys-apps/acl:0= ) - apparmor? ( sys-libs/libapparmor:0= ) - audit? ( >=sys-process/audit-2:0= ) - cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) - curl? ( net-misc/curl:0= ) - elfutils? ( >=dev-libs/elfutils-0.158:0= ) - gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] ) - gudev? ( >=dev-libs/glib-2.34.3:2=[${MULTILIB_USEDEP}] ) - http? ( - >=net-libs/libmicrohttpd-0.9.33:0= - ssl? ( >=net-libs/gnutls-3.1.4:0= ) - ) - idn? ( net-dns/libidn:0= ) - introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) - kmod? ( >=sys-apps/kmod-15:0= ) - lz4? ( >=app-arch/lz4-0_p119:0=[${MULTILIB_USEDEP}] ) - lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] ) - pam? ( virtual/pam:= ) - python? ( ${PYTHON_DEPS} ) - qrcode? ( media-gfx/qrencode:0= ) - seccomp? ( sys-libs/libseccomp:0= ) - selinux? ( sys-libs/libselinux:0= ) - sysv-utils? ( - !sys-apps/systemd-sysv-utils - !sys-apps/sysvinit - >=sys-apps/util-linux-2.24.1-r2 ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" - -# baselayout-2.2 has /run -RDEPEND="${COMMON_DEPEND} - !app-admin/eselect-init - >=sys-apps/baselayout-2.2 - || ( - >=sys-apps/util-linux-2.22 - <sys-apps/sysvinit-2.88-r4 - ) - !sys-auth/nss-myhostname - !sys-fs/udev" - -# sys-apps/dbus: the daemon only (+ build-time lib dep for tests) -PDEPEND=">=sys-apps/dbus-1.6.8-r1:0[systemd] - >=sys-apps/hwids-20130717-r1[udev] - >=sys-fs/udev-init-scripts-25 - policykit? ( sys-auth/polkit ) - !vanilla? ( sys-apps/gentoo-systemd-integration )" - -# Newer linux-headers needed by ia64, bug #480218 -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils:0 - dev-util/gperf - >=dev-util/intltool-0.50 - >=sys-apps/coreutils-8.16 - >=sys-devel/binutils-2.23.1 - >=sys-devel/gcc-4.6 - >=sys-kernel/linux-headers-${MINKV} - ia64? ( >=sys-kernel/linux-headers-3.9 ) - virtual/pkgconfig - doc? ( >=dev-util/gtk-doc-1.18 ) - python? ( dev-python/lxml[${PYTHON_USEDEP}] ) - test? ( >=sys-apps/dbus-1.6.8-r1:0 )" - -PATCHES=( - "${FILESDIR}/216-lz4-build.patch" - "${FILESDIR}/216-tmpfiles-setup-dev.patch" -) - -src_prepare() { - # Bug 463376 - sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die - - autotools-utils_src_prepare -} - -pkg_pretend() { - local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS ~DEVTMPFS ~DMIID - ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS - ~SECCOMP ~SIGNALFD ~SYSFS ~TIMERFD ~TMPFS_XATTR - ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 - ~!GRKERNSEC_PROC" - - use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" - kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG" - use firmware-loader || CONFIG_CHECK+=" ~!FW_LOADER_USER_HELPER" - - if linux_config_exists; then - local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) - if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then - ewarn "It's recommended to set an empty value to the following kernel config option:" - ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" - fi - fi - - if [[ ${MERGE_TYPE} != binary ]]; then - if [[ $(gcc-major-version) -lt 4 - || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]] - then - eerror "systemd requires at least gcc 4.6 to build. Please switch the active" - eerror "gcc version using gcc-config." - die "systemd requires at least gcc 4.6" - fi - fi - - if [[ ${MERGE_TYPE} != buildonly ]]; then - if kernel_is -lt ${MINKV//./ }; then - ewarn "Kernel version at least ${MINKV} required" - fi - - if ! use firmware-loader && kernel_is -lt 3 8; then - ewarn "You seem to be using kernel older than 3.8. Those kernel versions" - ewarn "require systemd with USE=firmware-loader to support loading" - ewarn "firmware. Missing this flag may cause some hardware not to work." - fi - - check_extra_config - fi -} - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - # Keep using the one where the rules were installed. - MY_UDEVDIR=$(get_udevdir) - # Fix systems broken by bug #509454. - [[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev - - multilib-minimal_src_configure -} - -multilib_native_enable() { - if multilib_is_native_abi; then - echo "--enable-${1}" - else - echo "--disable-${1}" - fi -} - -multilib_src_configure() { - local myeconfargs=( - # disable -flto since it is an optimization flag - # and makes distcc less effective - cc_cv_CFLAGS__flto=no - - # Workaround for bug 516346 - --enable-dependency-tracking - - --disable-maintainer-mode - --localstatedir=/var - --with-pamlibdir=$(getpam_mod_dir) - # avoid bash-completion dep - --with-bashcompletiondir="$(get_bashcompdir)" - # make sure we get /bin:/sbin in $PATH - --enable-split-usr - # For testing. - --with-rootprefix="${ROOTPREFIX-/usr}" - --with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)" - # disable sysv compatibility - --with-sysvinit-path= - --with-sysvrcnd-path= - # no deps - --enable-efi - --enable-ima - - # Optional components/dependencies - $(multilib_native_use_enable acl) - $(multilib_native_use_enable apparmor) - $(multilib_native_use_enable audit) - $(multilib_native_use_enable cryptsetup libcryptsetup) - $(multilib_native_use_enable curl libcurl) - $(multilib_native_use_enable doc gtk-doc) - $(multilib_native_use_enable elfutils) - $(use_enable gcrypt) - $(use_enable gudev) - $(multilib_native_use_enable http microhttpd) - $(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls) - $(multilib_native_use_enable idn libidn) - $(multilib_native_use_enable introspection) - $(use_enable kdbus) - $(multilib_native_use_enable kmod) - $(use_enable lz4) - $(use_enable lzma xz) - $(multilib_native_use_enable pam) - $(multilib_native_use_enable policykit polkit) - $(multilib_native_use_with python) - $(multilib_native_use_enable python python-devel) - $(multilib_native_use_enable qrcode qrencode) - $(multilib_native_use_enable seccomp) - $(multilib_native_use_enable selinux) - $(multilib_native_use_enable test tests) - $(multilib_native_use_enable test dbus) - - # Disable optional binaries for non-native abis - $(multilib_native_enable backlight) - $(multilib_native_enable binfmt) - $(multilib_native_enable bootchart) - $(multilib_native_enable coredump) - $(multilib_native_enable firstboot) - $(multilib_native_enable hostnamed) - $(multilib_native_enable localed) - $(multilib_native_enable logind) - $(multilib_native_enable machined) - $(multilib_native_enable networkd) - $(multilib_native_enable quotacheck) - $(multilib_native_enable randomseed) - $(multilib_native_enable readahead) - $(multilib_native_enable resolved) - $(multilib_native_enable rfkill) - $(multilib_native_enable sysusers) - $(multilib_native_enable timedated) - $(multilib_native_enable timesyncd) - $(multilib_native_enable tmpfiles) - $(multilib_native_enable vconsole) - - # not supported (avoid automagic deps in the future) - --disable-chkconfig - - # hardcode a few paths to spare some deps - QUOTAON=/usr/sbin/quotaon - QUOTACHECK=/usr/sbin/quotacheck - - # dbus paths - --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d" - --with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services" - --with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services" - --with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces" - - --with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org" - ) - - if use firmware-loader; then - myeconfargs+=( - --with-firmware-path="/lib/firmware/updates:/lib/firmware" - ) - fi - - if ! multilib_is_native_abi; then - myeconfargs+=( - ac_cv_search_cap_init= - ac_cv_header_sys_capability_h=yes - ) - fi - - # Work around bug 463846. - tc-export CC - - autotools-utils_src_configure -} - -multilib_src_compile() { - local mymakeopts=( - udevlibexecdir="${MY_UDEVDIR}" - ) - - if multilib_is_native_abi; then - emake "${mymakeopts[@]}" - else - # prerequisites for gudev - use gudev && emake src/gudev/gudev{enumtypes,marshal}.{c,h} - - echo 'gentoo: $(BUILT_SOURCES)' | \ - emake "${mymakeopts[@]}" -f Makefile -f - gentoo - echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \ - emake "${mymakeopts[@]}" -f Makefile -f - gentoo - fi -} - -multilib_src_test() { - multilib_is_native_abi || continue - - default -} - -multilib_src_install() { - local mymakeopts=( - # automake fails with parallel libtool relinking - # https://bugs.gentoo.org/show_bug.cgi?id=491398 - -j1 - - udevlibexecdir="${MY_UDEVDIR}" - dist_udevhwdb_DATA= - DESTDIR="${D}" - ) - - if multilib_is_native_abi; then - emake "${mymakeopts[@]}" install - else - mymakeopts+=( - install-libLTLIBRARIES - install-pkgconfiglibDATA - install-includeHEADERS - # safe to call unconditionally, 'installs' empty list - install-libgudev_includeHEADERS - install-pkgincludeHEADERS - ) - - emake "${mymakeopts[@]}" - fi - - # install compat pkg-config files - local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc ) - emake "${mymakeopts[@]}" install-pkgconfiglibDATA \ - pkgconfiglib_DATA="${pcfiles[*]}" - - # Kogaion: create systemd-run symlink in /bin. lvm2 lvmetad has a - # udev rule that expects systemd-run to be in /bin. And lvmetad is - # used by Anaconda. - dosym "../usr/bin/systemd-run" "/bin/systemd-run" -} - -multilib_src_install_all() { - prune_libtool_files --modules - einstalldocs - - if use sysv-utils; then - for app in halt poweroff reboot runlevel shutdown telinit; do - dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app} - done - dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init - else - # we just keep sysvinit tools, so no need for the mans - rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \ - || die - rm "${D}"/usr/share/man/man1/init.1 || die - fi - - # Disable storing coredumps in journald, bug #433457 - mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die - - # Preserve empty dirs in /etc & /var, bug #437008 - keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \ - /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \ - /var/log/journal/remote - - # Symlink /etc/sysctl.conf for easy migration. - dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf - - # If we install these symlinks, there is no way for the sysadmin to remove them - # permanently. - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service - rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service - rm -rf "${D}"/etc/systemd/system/network-online.target.wants - - # Offer a default blacklist that should cover the most - # common use cases. - insinto /etc/modprobe.d - newins "${FILESDIR}"/blacklist-146 blacklist.conf -} - -migrate_locale() { - local envd_locale_def="${EROOT%/}/etc/env.d/02locale" - local envd_locale=( "${EROOT%/}"/etc/env.d/??locale ) - local locale_conf="${EROOT%/}/etc/locale.conf" - - if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then - # If locale.conf does not exist... - if [[ -e ${envd_locale} ]]; then - # ...either copy env.d/??locale if there's one - ebegin "Moving ${envd_locale} to ${locale_conf}" - mv "${envd_locale}" "${locale_conf}" - eend ${?} || FAIL=1 - else - # ...or create a dummy default - ebegin "Creating ${locale_conf}" - cat > "${locale_conf}" <<-EOF - # This file has been created by the sys-apps/systemd ebuild. - # See locale.conf(5) and localectl(1). - - # LANG=${LANG} - EOF - eend ${?} || FAIL=1 - fi - fi - - if [[ ! -L ${envd_locale} ]]; then - # now, if env.d/??locale is not a symlink (to locale.conf)... - if [[ -e ${envd_locale} ]]; then - # ...warn the user that he has duplicate locale settings - ewarn - ewarn "To ensure consistent behavior, you should replace ${envd_locale}" - ewarn "with a symlink to ${locale_conf}. Please migrate your settings" - ewarn "and create the symlink with the following command:" - ewarn "ln -s -n -f ../locale.conf ${envd_locale}" - ewarn - else - # ...or just create the symlink if there's nothing here - ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink" - ln -n -s ../locale.conf "${envd_locale_def}" - eend ${?} || FAIL=1 - fi - fi -} - -migrate_net_name_slot() { - # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, - # do the same for 80-net-setup-link.rules to keep the old behavior - local net_move=no - local net_name_slot_sym=no - local net_rules_path="${EROOT%/}"/etc/udev/rules.d - local net_name_slot="${net_rules_path}"/80-net-name-slot.rules - local net_setup_link="${net_rules_path}"/80-net-setup-link.rules - if [[ -e ${net_setup_link} ]]; then - net_move=no - elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then - net_move=yes - elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then - net_move=yes - net_name_slot_sym=yes - fi - if [[ ${net_move} == yes ]]; then - ebegin "Copying ${net_name_slot} to ${net_setup_link}" - - if [[ ${net_name_slot_sym} == yes ]]; then - ln -nfs /dev/null "${net_setup_link}" - else - cp "${net_name_slot}" "${net_setup_link}" - fi - eend $? || FAIL=1 - fi -} - -pkg_postinst() { - newusergroup() { - enewgroup "$1" - enewuser "$1" -1 -1 -1 "$1" - } - - enewgroup input - enewgroup systemd-journal - newusergroup systemd-bus-proxy - newusergroup systemd-journal-gateway - newusergroup systemd-journal-remote - newusergroup systemd-journal-upload - newusergroup systemd-network - newusergroup systemd-resolve - newusergroup systemd-timesync - use http && newusergroup systemd-journal-gateway - - systemd_update_catalog - - # Keep this here in case the database format changes so it gets updated - # when required. Despite that this file is owned by sys-apps/hwids. - if has_version "sys-apps/hwids[udev]"; then - udevadm hwdb --update --root="${ROOT%/}" - fi - - udev_reload || FAIL=1 - - # Bug 465468, make sure locales are respect, and ensure consistency - # between OpenRC & systemd - migrate_locale - - # Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules - migrate_net_name_slot - - if [[ ${FAIL} ]]; then - eerror "One of the postinst commands failed. Please check the postinst output" - eerror "for errors. You may need to clean up your system and/or try installing" - eerror "systemd again." - eerror - fi - - if [[ ! -L "${ROOT}"/etc/mtab ]]; then - ewarn "Upstream mandates the /etc/mtab file should be a symlink to /proc/mounts." - ewarn "Not having it is not supported by upstream and will cause tools like 'df'" - ewarn "and 'mount' to not work properly. Please run:" - ewarn " # ln -sf '${ROOT}proc/self/mounts' '${ROOT}etc/mtab'" - ewarn - fi - - if [[ $(readlink "${ROOT}"/etc/resolv.conf) == */run/systemd/network/resolv.conf ]]; then - ewarn "resolv.conf is now generated by systemd-resolved. To use it, enable" - ewarn "systemd-resolved.service, and create a symlink from /etc/resolv.conf" - ewarn "to /run/systemd/resolve/resolv.conf" - ewarn - fi - - if ! has_version sys-apps/systemd-ui; then - elog "To get additional features, a number of optional runtime dependencies may" - elog "be installed:" - elog "- sys-apps/systemd-ui: for GTK+ systemadm UI and gnome-ask-password-agent" - fi - - if has_version sys-apps/openrc && - ! has_version sys-fs/udev-init-scripts; then - elog "If you plan to boot using OpenRC and udev or eudev, you" - elog "need to install the udev-init-scripts package." - fi -} - -pkg_prerm() { - # If removing systemd completely, remove the catalog database. - if [[ ! ${REPLACED_BY_VERSION} ]]; then - rm -f -v "${EROOT}"/var/lib/systemd/catalog/database - fi -} |