Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=openjava.git;a=commitdiff;h=15caab949e5f73d0b4a3343a8107a934faeb60e0
commit 15caab949e5f73d0b4a3343a8107a934faeb60e0 Author: James Buren <[email protected]> Date: Sun Aug 19 22:04:45 2012 -0500 systemd-188-1-x86_64 * initial version bump * merge udev depends from original udev pkg * add our special files from original udev pkg * still some compatibility work to do diff --git a/source/base/systemd/65-permissions.rules b/source/base/systemd/65-permissions.rules new file mode 100644 index 0000000..eae7580 --- /dev/null +++ b/source/base/systemd/65-permissions.rules @@ -0,0 +1,13 @@ +# permissions for CD devices +ENV{ID_CDROM}=="?*", GROUP="cdrom", MODE="660" + +# sound devices (sound=alsa, snd=oss) +SUBSYSTEM=="sound|snd", GROUP="audio" + +# allow camera group to write (and not just read) usb devices, #3539 +SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", MODE="664" + + +# permissions for IDE CD devices +SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", GROUP="cdrom" + diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index eb7fef0..2e75b6f 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -5,57 +5,48 @@ USE_CRYPTSETUP=${USE_CRYPTSETUP:-"n"} USE_SYSV_COMPAT=${USE_SYSV_COMPAT:-"y"} pkgname=systemd -pkgver=44 -pkgrel=2 +pkgver=188 +pkgrel=1 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd"; -depends=('dbus' 'kmod>=7' 'udev>=182' 'pam' 'coreutils' 'libcap' 'sysvinit-initscripts' 'sysvinit-tools' 'xfsprogs-acl') -makedepends=('vala' 'docbook-xsl>=1.73.0-2' 'docbook-xml' 'intltool' 'gperf') +depends=('dbus' 'kmod>=7' 'pam' 'coreutils' 'libcap' 'sysvinit-initscripts' 'sysvinit-tools' 'xfsprogs-acl' 'pciutils' 'usbutils') +makedepends=('vala' 'docbook-xsl>=1.73.0-2' 'docbook-xml' 'intltool' 'gperf' 'gobject-introspection' 'gtk-doc') options=('scriptlet' 'force') up2date="Flasttar http://www.freedesktop.org/software/$pkgname"; source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz \ - console.conf \ - systemd-44-fix-PAGESIZE-arm.patch) -sha1sums=('851869f1d991343995a9ca1243616c8bf4edfdad' \ + console.conf 65-permissions.rules blacklist) +sha1sums=('1874a67d699ccb605ff23e8d8512eefb10a63882' \ 'abaa5c83d5adf2c5be188ce0de488bfa2b5a4505' \ - '22cbf5552451f4d20a198541238fd2cf910b70c5') + '439e2be7278ecedb4a4f090241bb484a7a25a9c3' \ + '4657cbad76a3d5c8aade4dba166b3f8704c7b07f') if Fuse $USE_CRYPTSETUP; then depends=("${depends[@]}" 'cryptsetup-luks') fi -rodepends=("${depends[@]}" 'systemd-sysvinit') +rodepends=("${depends[@]}" 'systemd-sysvinit') groups=('base') archs=('i686' 'x86_64' 'arm') #TODO : Remove backup, source rc for SysVinit when all rc scripts used systemd -backup=(etc/{vconsole.conf,systemd/system.conf,machine-id,machine-info,locale.conf}) +backup=(etc/{vconsole.conf,systemd/{system.conf,user.conf,logind.conf,journald.conf},machine-id,machine-info,locale.conf,sysconfig/blacklist}) -subpkgs=('systemd-gtk') -subdescs=('Graphical frontend for systemd') +subpkgs=('systemd-sysvinit') +subdescs=('systemd System V init tools') subrodepends=("$pkgname=$pkgver") -subdepends=('dbus-glib gtk+2 polkit libnotify>0.7') -subgroups=('xapps-extra') +subreplaces=('sysvinit' ) +subgroups=('base') subarchs=('i686 x86_64 arm') -subprovides=('') -subreplaces=('gservice') -subconflicts=('') +subprovides=('sysvinit') +subconflicts=('sysvinit') suboptions=('force') -subpkgs=("${subpkgs[@]}" 'systemd-sysvinit' 'systemd-plymouth') -subdescs=("${subdescs[@]}" 'systemd System V init tools' 'Plymouth integration for systemd') -subrodepends=("${subrodepends[@]}" "$pkgname=$pkgver" "$pkgname=$pkgver") -subdepends=("${subdepends[@]}" '' '') -subreplaces=("${subreplaces[@]}" 'sysvinit' '') -subgroups=("${subgroups[@]}" 'base' 'xapps') -subarchs=("${subarchs[@]}" 'i686 x86_64 arm' 'i686 x86_64 arm') -subprovides=("${subprovides[@]}" 'sysvinit' '') -subconflicts=("${subconflicts[@]}" 'sysvinit' '') -suboptions=("${suboptions[@]}" 'force' 'force') - Fconfopts="$Fconfopts --disable-selinux --with-distro=frugalware --with-pamlibdir=/lib/security \ --with-rootprefix= --with-dbussystemservicedir=/usr/share/dbus-1/system-services \ - --with-dbusinterfacedir=/usr/share/dbus-1/interfaces" + --with-dbusinterfacedir=/usr/share/dbus-1/interfaces --enable-gtk-doc --enable-introspection \ + --disable-audit --disable-ima --with-usb-ids-path=/usr/share/hwdata/usb.ids \ + --with-pci-ids-path=/usr/share/hwdata/pci.ids \ + --with-firmware-path=/lib/firmware" if ! Fuse $USE_SYSV_COMPAT; then Fconfopts="$Fconfopts --with-sysvinit-path= --with-sysvrcd-path=" fi @@ -64,14 +55,8 @@ build() { #build systemd Fsed 'agetty' 'frugalwaregetty' units/[email protected] - # fix name of local.service - Fsed 'rc-local.service' 'local.service' units/plymouth-quit-wait.service \ - units/plymouth-quit.service - # disable status lines when splash is enabled, not when the - # kernel is quiet - Fsed '"quiet"' '"splash"' src/main.c # we don't have auditd - Fsed 'auditd.service ' '' units/systemd-update-utmp-{runlevel,shutdown}.service.in + #Fsed 'auditd.service ' '' units/systemd-update-utmp-{runlevel,shutdown}.service.in Fpatchall Fautoreconf Fmake --disable-tcpwrap @@ -96,15 +81,12 @@ build() Frm etc/systemd/system/*.target.wants - # This is to ease upgrading. Can be removed after 1.7. - Fln /lib/systemd/systemd /bin/systemd - # support for this is disabled in the kernel Frm /lib/systemd/system/dev-hugepages.mount Frm /lib/systemd/system/sysinit.target.wants/dev-hugepages.mount # compatibility: have 11 tty instead of 6 - Fsed "#NAutoVTs=6" "NAutoVTs=11" $Fdestdir/etc/systemd/systemd-logind.conf + Fsed "#NAutoVTs=6" "NAutoVTs=11" $Fdestdir/etc/systemd/logind.conf # /etc/sysconfig/desktop compatibility Fln ../display-manager.service /lib/systemd/system/graphical.target.wants/display-manager.service @@ -119,16 +101,13 @@ build() Fmkdir lib/systemd/system/dbus.target.wants Fmkdir lib/systemd/system/syslog.target.wants - #split gtk fronted - # TODO : Added .desktop for start fronted - Fsplit systemd-gtk usr/share/polkit-1/actions/org.freedesktop.systemd1.policy - Fsplit systemd-gtk usr/share/man/man1/systemadm.* + touch $Fdestdir/etc/{machine-id,machine-info,locale.conf} - Fsplit systemd-plymouth lib/systemd/system/plymouth-*.service - Fsplit systemd-plymouth lib/systemd/system/*.wants/plymouth-*.service - Fsplit systemd-plymouth lib/systemd/system/systemd-ask-password-plymouth.* + Ffile /etc/sysconfig/blacklist - touch $Fdestdir/etc/{machine-id,machine-info,locale.conf} + Fmkdir /etc/modprobe.d + + Fln /etc/sysconfig/blacklist /etc/modprobe.d/blacklist.conf Frm /etc/bash_completion.d } diff --git a/source/base/systemd/blacklist b/source/base/systemd/blacklist new file mode 100644 index 0000000..11ecf22 --- /dev/null +++ b/source/base/systemd/blacklist @@ -0,0 +1,10 @@ +# +# Listing a module here prevents the hotplug scripts from loading it. +# Usually that'd be so that some other driver will bind it instead, +# no matter which driver happens to get probed first. Sometimes user +# mode tools can also control driver binding. +# +# Syntax: see modprobe.conf(5), basically: +# +# blacklist foo +# blacklist bar diff --git a/source/base/systemd/systemd-44-fix-PAGESIZE-arm.patch b/source/base/systemd/systemd-44-fix-PAGESIZE-arm.patch deleted file mode 100644 index b5c984e..0000000 --- a/source/base/systemd/systemd-44-fix-PAGESIZE-arm.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Naur systemd-44/src/journal/journald.c systemd-44new/src/journal/journald.c ---- systemd-44/src/journal/journald.c 2012-03-15 19:46:57.000000000 +0100 -+++ systemd-44new/src/journal/journald.c 2012-05-22 21:35:26.366509225 +0200 -@@ -29,7 +29,6 @@ - #include <sys/ioctl.h> - #include <linux/sockios.h> - #include <sys/statvfs.h> --#include <sys/user.h> - - #include <systemd/sd-journal.h> - #include <systemd/sd-login.h> -@@ -2141,10 +2140,20 @@ - size_t label_len = 0; - union { - struct cmsghdr cmsghdr; -+ -+ /* We use NAME_MAX space for the -+ * SELinux label here. The kernel -+ * currently enforces no limit, but -+ * according to suggestions from the -+ * SELinux people this will change and -+ * it will probably be identical to -+ * NAME_MAX. For now we use that, but -+ * this should be updated one day when -+ * the final limit is known.*/ - uint8_t buf[CMSG_SPACE(sizeof(struct ucred)) + - CMSG_SPACE(sizeof(struct timeval)) + -- CMSG_SPACE(sizeof(int)) + -- CMSG_SPACE(PAGE_SIZE)]; /* selinux label */ -+ CMSG_SPACE(sizeof(int)) + /* fd */ -+ CMSG_SPACE(NAME_MAX)]; /* selinux label */ - } control; - ssize_t n; - int v; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
