[Lunar-commits] <moonbase-core> Merge branch 'master' of github.com:lunar-linux/moonbase-core

[Stefan Wold]

commit b70b292c3bdc467cd4d41ee3cbfd699911b57d08
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Tue, 01 Jan 2013 13:10:19 -0800
URL: https://github.com/lunar-linux/moonbase-core/commit/b70b292c3bdc467cd4d41ee3cbfd699911b57d08

Merge branch 'master' of github.com:lunar-linux/moonbase-core
---
  libs/gettext/DETAILS                 | +3/-3     
  security/Linux-PAM/BUILD             | +0/-3     
  security/Linux-PAM/DETAILS           | +5/-8     
  security/Linux-PAM/pam.d/system-auth | +1/-0     
  system/systemd/BUILD                 | +3/-6     
  system/systemd/CONFIGURE             | +0/-1     
  system/systemd/DEPENDS               | +1/-1     
  system/systemd/DETAILS               | +1/-1     
  8 files changed

--- a/libs/gettext/DETAILS
+++ b/libs/gettext/DETAILS
@@ -1,12 +1,12 @@
           MODULE=gettext
-         VERSION=0.18.1.1
+         VERSION=0.18.2
           SOURCE=$MODULE-$VERSION.tar.gz
    SOURCE_URL[0]=$GNU_URL/$MODULE
    SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$MODULE
-      SOURCE_VFY=sha1:5009deb02f67fc3c59c8ce6b82408d1d35d4e38f
+      SOURCE_VFY=sha1:47685e20abf9df6e5fede9efd04442943a96818b
         WEB_SITE=http://www.gnu.org/software/gettext
          ENTERED=20010922
-         UPDATED=20100607
+         UPDATED=20121229
            PSAFE="no"
            SHORT="The GNU internationalisation library"
 
--- a/security/Linux-PAM/BUILD
+++ b/security/Linux-PAM/BUILD
@@ -1,8 +1,5 @@
 (
 
-# patch to compile with glibc-2.16.0.
-  patch_it $SOURCE_CACHE/$SOURCE3 1  &&
-
   export SGML2LATEX=no
   export SGML2TXT=no
   export SGML2HTML=no
--- a/security/Linux-PAM/DETAILS
+++ b/security/Linux-PAM/DETAILS
@@ -1,20 +1,17 @@
           MODULE=Linux-PAM
-         VERSION=1.1.5
-        PVERSION=2.4
+         VERSION=1.1.6
+        PVERSION=2.5
        RHVERSION=0.99.10-1
           SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=$MODULE-patches-$PVERSION.tar.bz2
-         SOURCE3=$MODULE-$VERSION+glibc-2.16.patch.bz2
       SOURCE_URL=https://fedorahosted.org/releases/l/i/linux-pam
      SOURCE2_URL=$PATCH_URL
-     SOURCE3_URL=$PATCH_URL
-      SOURCE_VFY=sha256:65def4df04254dc4c5156859d36c34ad6d7afbcf3adbf2780530ebc4dbf2a116
-     SOURCE2_VFY=sha256:6db8ff00621959a683b9b6932267a243263f1dcc1927df5941cb18d6edecf0a9
-     SOURCE3_VFY=sha256:d095179f9b7128cc6502d1b0ac2a947321239ce27f5e7889b78b9de669d17333
+      SOURCE_VFY=sha256:bab887d6280f47fc3963df3b95735a27a16f0f663636163ddf3acab5f1149fc2
+     SOURCE2_VFY=sha256:050e9b1d656be6fdb488ac6d68b10cc57436392624ddc53bfac3ed6fdb6b32b9
         WEB_SITE=https://fedorahosted.org/linux-pam
       MAINTAINER=ratler at lunar-linux.org
          ENTERED=20010922
-         UPDATED=20120715
+         UPDATED=20130101
            SHORT="Pluggable Authentication Modules"
 PSAFE=no
 
--- a/security/Linux-PAM/pam.d/system-auth
+++ b/security/Linux-PAM/pam.d/system-auth
@@ -11,5 +11,6 @@ password    required      pam_deny.so
 
 session     optional      pam_keyinit.so revoke
 session     required      pam_limits.so
+-session    optional      pam_systemd.so
 session     [success=1 default=ignore] pam_succeed_if.so service in crond quiet use_uid
 session     required      pam_unix.so
--- a/system/systemd/BUILD
+++ b/system/systemd/BUILD
@@ -2,15 +2,9 @@
 
   OPTS+=" --with-distro=other \
           --libexecdir=/usr/lib \
-          --with-usb-ids-path=/usr/share/usb.ids \
-          --with-pci-ids-path=/usr/share/pci.ids \
           --enable-split-usr \
           --disable-tcpwrap"
 
-  if module_installed Linux-PAM; then
-    OPTS+=" --with-pamlibdir=/lib/security"
-  fi
-
   # a not existing hostname is set to lunar.
   [ -f /etc/hostname ] || install -m 0644 -o root -g root $SCRIPT_DIRECTORY/files/hostname /etc/hostname &&
 
@@ -25,6 +19,9 @@
   # the case in lunar, so we switch it to root.
   sedit "s:0775 root lock:0775 root root:" tmpfiles.d/legacy.conf &&
 
+  # loadkeys and setfont are in /usr/bin
+  sedit 's:"/bin/loadkeys:"/usr/bin/loadkeys:;s:"/bin/setfont:"/usr/bin/setfont:' Makefile.am Makefile.in &&
+
   default_config &&
   make &&
   prepare_install &&
--- a/system/systemd/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-mquery IM_AN_IDIOT "Are you stupid and want a life of misery and disaster? (Enable SysV compatibility?)" n "--with-sysvinit-path=/etc/init.d --with-sysvrcd-path=/etc" "--with-sysvinit-path= --with-sysvrcd-path="
--- a/system/systemd/DEPENDS
+++ b/system/systemd/DEPENDS
@@ -1,6 +1,5 @@
 depends docbook-xsl
 depends kmod
-depends Linux-PAM
 depends dbus
 depends libcap
 depends usbutils
@@ -9,3 +8,4 @@ depends intltool
 depends gperf
 
 optional_depends "cryptsetup" "--enable-libcryptsetup" "--disable-libcryptsetup" "for Device-mapper crypto encryption"
+optional_depends "Linux-PAM" "--with-pamlibdir=/lib/security" "--disable-pam"
--- a/system/systemd/DETAILS
+++ b/system/systemd/DETAILS
@@ -5,7 +5,7 @@
       SOURCE_VFY=sha1:65f6844c2d2a5e6b7ed1f77bb9f457b04774c74f
         WEB_SITE=http://www.freedesktop.org/wiki/Software/systemd
          ENTERED=20100919
-         UPDATED=20121121
+         UPDATED=20121231
            SHORT="A system and program management daemon"
 
 cat << EOF