systemd update to 196, .install clean-up, move tty enable to default packaging

systemd/PKGBUILD

@@ -4,16 +4,17 @@
 # maintainer: abveritas@chakra-project.org
 
 pkgname=systemd
-pkgver=195
-pkgrel=2
+pkgver=196
+pkgrel=1
 arch=('x86_64')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 license=('GPL2' 'LGPL2.1' 'MIT')
 depends=('acl' 'bash' 'glibc' 'glib2' 'kmod' 'hwids' 'util-linux' 'kbd' 'kmod' 'libcap' 'libxslt'
          'linux-api-headers' 'pam' 'xz' 'libgcrypt' 'dbus-core') 
 makedepends=('docbook-xsl' 'gobject-introspection' 'gperf' 'intltool')
-optdepends=('pycairo: systemd-analyze'
-            'dbus-python: systemd-analyze')
+optdepends=('python2-cairo: systemd-analyze'
+            'dbus-python: systemd-analyze'
+            'python2-gobject3: systemd-analyze')
 backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
         etc/dbus-1/system.d/org.freedesktop.hostname1.conf
         etc/dbus-1/system.d/org.freedesktop.login1.conf
@@ -34,22 +35,17 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-hook-udev'
         'initcpio-install-udev'
         'initcpio-install-timestamp'
-        '0001-Reinstate-TIMEOUT-handling.patch'
         'use-split-usr-path.patch'
         '99-default.preset')
-md5sums=('38e8c8144e7e6e5bc3ce32eb4260e680'
+md5sums=('05ebd7f108e420e2b4e4810ea4b3c810'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          'fb37e34ea006c79be1c54cbb0f803414'
          'df69615503ad293c9ddf9d8b7755282d'
-         '5543be25f205f853a21fa5ee68e03f0d'
-         '58f26fd4cdcac88bd3ca690f4d3e3e99'
+         '21572b99173a7cdeaff965e0a5e9182b'
          'a1bf25da736d3719e9720b2e4caea341')
 
 build() {
   cd "$pkgname-$pkgver"
-
-  # still waiting on ipw2x00 to get fixed...
-  patch -p1 -i "$srcdir/0001-Reinstate-TIMEOUT-handling.patch"
   
   patch -p1 -i "$srcdir/use-split-usr-path.patch"
 
@@ -62,8 +58,6 @@ build() {
       --disable-audit \
       --disable-ima \
       --with-distro=other \
-      --with-usb-ids-path=/usr/share/hwdata/usb.ids \
-      --with-pci-ids-path=/usr/share/hwdata/pci.ids \
       --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware
 
   make
@@ -85,15 +79,9 @@ package() {
   done
   rm -rf "$pkgdir/etc/bash_completion.d"
 
-  # don't write units to /etc by default -- we'll enable this on post_install
-  # as a sane default
-  rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service"
-  rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
-
   # Remove rpm dir
   rm -r "$pkgdir/etc/rpm"
 
-  # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work.
   # https://pokersource.info/show_bug.cgi?id=50989
   sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
 
@@ -123,9 +111,6 @@ package() {
   install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
   install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
   install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp"
-
-  # XXX: kill off coredump rule until the journal can recover coredumps
-  rm "$pkgdir/usr/lib/sysctl.d/coredump.conf"
   
   # Chakra specific .preset
   install -Dm644 "$srcdir/99-default.preset" "$pkgdir/usr/lib/systemd/system-preset/99-default.preset"
@@ -134,4 +119,4 @@ package() {
   sed -i -e 's/#SystemMaxUse=/SystemMaxUse=25M/' ${pkgdir}/etc/systemd/journald.conf
 }
 
-# vim: ft=sh syn=sh et
+

systemd/systemd.install

@@ -5,8 +5,7 @@ sd_booted() {
 }
 
 post_install() {
-  # enable getty@tty1 by default, but don't track the file
-  systemctl enable getty@.service
+  udevadm hwdb --update
   
   if sd_booted; then
     systemctl --system daemon-reexec
@@ -15,18 +14,12 @@ post_install() {
 }
 
 post_upgrade() {
+  udevadm hwdb --update
+
   if sd_booted; then
     systemctl --system daemon-reexec
     systemctl restart systemd-logind.service
   fi
 
-  # getty@tty1.service is no longer enabled by default, but we don't want to break
-  # existing setups.
-  if [ "$(vercmp 183 "$2")" -eq 1 ]; then
-    # systemctl seems to be whiny on sysvinit. this will succeed unless something
-    # horrific happens, so just mask the error.
-    systemctl -q enable getty@.service || true
-  fi
 }
 
-# vim:set ts=2 sw=2 et:

systemd/use-split-usr-path.patch

@@ -1,6 +1,6 @@
 --- a/src/core/main.c	2012-09-20 23:02:54.000000000 -0400
 +++ b/src/core/main.c	2012-09-20 23:03:13.000000000 -0400
-@@ -1455,11 +1455,7 @@
+@@ -1487,11 +1487,7 @@ int main(int argc, char *argv[]) {
 
          /* Set up PATH unless it is already set */
          setenv("PATH",