Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=677764a95b43d4314b6a2bc3bc6b0567f5839b98
commit 677764a95b43d4314b6a2bc3bc6b0567f5839b98 Author: Miklos Vajna <[email protected]> Date: Wed Jan 15 21:53:02 2014 +0100 systemd-208-1-x86_64 - 204 -> 208 diff --git a/source/base/systemd/FrugalBuild b/source/base/systemd/FrugalBuild index 31ed733..f7c3012 100644 --- a/source/base/systemd/FrugalBuild +++ b/source/base/systemd/FrugalBuild @@ -5,12 +5,12 @@ USE_CRYPTSETUP=${USE_CRYPTSETUP:-"n"} USE_SYSV_COMPAT=${USE_SYSV_COMPAT:-"y"} pkgname=systemd -pkgver=204 -pkgrel=3 +pkgver=208 +pkgrel=1 pkgdesc="A System and Service Manager" url="http://www.freedesktop.org/wiki/Software/systemd"; rodepends=('scriptlet-core') -depends=('dbus>=1.6.8-3' 'kmod>=7' 'pam' 'libcap' 'sysvinit-initscripts' 'sysvinit-tools' 'pciutils' 'usbutils' 'libgcrypt' 'libblkid') +depends=('dbus>=1.6.8-3' 'kmod>=16' 'pam' 'libcap' 'sysvinit-initscripts' 'sysvinit-tools' 'pciutils' 'usbutils' 'libgcrypt' 'libblkid') makedepends=('docbook-xsl>=1.73.0-2' 'docbook-xml' 'intltool' 'gperf' 'gtk-doc' 'gobject-introspection') options=('scriptlet') up2date="Flasttar http://www.freedesktop.org/software/$pkgname"; @@ -26,8 +26,8 @@ source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz \ vconsole.conf \ xorg-set-resolution.c \ xorg-set-resolution.service) -sha1sums=('37b45766a44a95a6b6a7cdf4b587c151375b2053' \ - '85f1fb6f9bc3296b3ef64a6459fbb094e543207a' \ +sha1sums=('e1a4e213d5d1e3498bca851347f2f07fdb9b4e1f' \ + '0c19e1f5c4e528a4017d39812badacce5429e1b8' \ '8ee24b6906739855a48aded896a0f12154815343' \ 'abaa5c83d5adf2c5be188ce0de488bfa2b5a4505' \ '439e2be7278ecedb4a4f090241bb484a7a25a9c3' \ diff --git a/source/base/systemd/frugalware.patch b/source/base/systemd/frugalware.patch index c2be5ca..032d049 100644 --- a/source/base/systemd/frugalware.patch +++ b/source/base/systemd/frugalware.patch @@ -1,7 +1,8 @@ -diff -ur a/src/locale/localectl.c b/src/locale/localectl.c ---- a/src/locale/localectl.c 2013-01-07 15:50:49.073315546 -0600 -+++ b/src/locale/localectl.c 2013-03-14 19:33:08.138800391 -0500 -@@ -548,6 +548,7 @@ +diff --git a/src/locale/localectl.c b/src/locale/localectl.c +index 8259c0a..02f9039 100644 +--- a/src/locale/localectl.c ++++ b/src/locale/localectl.c +@@ -542,6 +542,7 @@ static int list_vconsole_keymaps(DBusConnection *bus, char **args, unsigned n) { nftw("/usr/share/kbd/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS); nftw("/usr/lib/kbd/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS); nftw("/lib/kbd/keymaps/", nftw_cb, 20, FTW_MOUNT|FTW_PHYS); @@ -9,9 +10,10 @@ diff -ur a/src/locale/localectl.c b/src/locale/localectl.c l = set_get_strv(keymaps); if (!l) { -diff -ur a/src/login/logind.conf b/src/login/logind.conf ---- a/src/login/logind.conf 2012-12-23 17:29:39.965278291 -0600 -+++ b/src/login/logind.conf 2013-03-14 19:33:31.778799521 -0500 +diff --git a/src/login/logind.conf b/src/login/logind.conf +index c0abf01..ab7aa64 100644 +--- a/src/login/logind.conf ++++ b/src/login/logind.conf @@ -8,7 +8,7 @@ # See logind.conf(5) for details @@ -21,55 +23,46 @@ diff -ur a/src/login/logind.conf b/src/login/logind.conf #ReserveVT=6 #KillUserProcesses=no #KillOnlyUsers= -diff -ur a/units/[email protected] b/units/[email protected] ---- a/units/[email protected] 2013-01-07 15:50:49.083315575 -0600 -+++ b/units/[email protected] 2013-03-14 19:33:08.142800391 -0500 -@@ -27,7 +27,7 @@ +diff --git a/units/[email protected] b/units/[email protected] +index 253da85..51142f3 100644 +--- a/units/[email protected] ++++ b/units/[email protected] +@@ -27,7 +27,7 @@ ConditionPathExists=/dev/tty0 [Service] # the VT is cleared by TTYVTDisallocate --ExecStart=-/sbin/agetty --noclear %I 38400 linux -+ExecStart=-/sbin/frugalwaregetty --noclear %I 38400 linux +-ExecStart=-/sbin/agetty --noclear %I ++ExecStart=-/sbin/frugalwaregetty --noclear %I Type=idle Restart=always RestartSec=0 -@@ -41,7 +41,7 @@ +@@ -42,7 +42,7 @@ SendSIGHUP=yes # Unset locale for the console getty since the console has problems # displaying some internationalized messages. -Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION= +#Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION= - # Some login implementations ignore SIGTERM, so we send SIGHUP - # instead, to ensure that login terminates cleanly. -diff -ur a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in ---- a/units/systemd-update-utmp-runlevel.service.in 2012-06-25 15:05:25.772518023 -0500 -+++ b/units/systemd-update-utmp-runlevel.service.in 2013-03-14 19:33:08.146800391 -0500 -@@ -10,7 +10,7 @@ - Documentation=man:systemd-update-utmp-runlevel.service(8) man:utmp(5) + [Install] + WantedBy=getty.target +diff --git a/units/systemd-update-utmp.service.in b/units/systemd-update-utmp.service.in +index e7c20a5..07714cc 100644 +--- a/units/systemd-update-utmp.service.in ++++ b/units/systemd-update-utmp.service.in +@@ -11,7 +11,7 @@ Documentation=man:systemd-update-utmp.service(8) man:utmp(5) DefaultDependencies=no RequiresMountsFor=/var/log/wtmp --After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service -+After=systemd-remount-fs.service systemd-tmpfiles-setup.service - After=runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target - Before=final.target - -diff -ur a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in ---- a/units/systemd-update-utmp-shutdown.service.in 2012-06-25 15:05:25.759517987 -0500 -+++ b/units/systemd-update-utmp-shutdown.service.in 2013-03-14 19:33:08.150800390 -0500 -@@ -10,7 +10,7 @@ - Documentation=man:systemd-update-utmp-runlevel.service(8) man:utmp(5) - DefaultDependencies=no - RequiresMountsFor=/var/log/wtmp --After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service -+After=systemd-remount-fs.service systemd-tmpfiles-setup.service - After=systemd-update-utmp-runlevel.service - Before=final.target + Conflicts=shutdown.target +-After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service ++After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service systemd-tmpfiles-setup.service + Before=sysinit.target shutdown.target -diff -ur a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in ---- a/units/systemd-vconsole-setup.service.in 2012-06-25 04:46:14.862077173 -0500 -+++ b/units/systemd-vconsole-setup.service.in 2013-03-14 19:33:08.151800390 -0500 -@@ -10,7 +10,8 @@ + [Service] +diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in +index 18faa63..8bacce7 100644 +--- a/units/systemd-vconsole-setup.service.in ++++ b/units/systemd-vconsole-setup.service.in +@@ -10,7 +10,8 @@ Description=Setup Virtual Console Documentation=man:systemd-vconsole-setup.service(8) man:vconsole.conf(5) DefaultDependencies=no Conflicts=shutdown.target _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
