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

[Dennis Veatch]

commit 60dfd46e09d5e6b4d2a74be76dcf9b83a964b8cc
Author: Dennis Veatch <stumbles at lunar-linux.org>
Date: Thu, 02 Aug 2012 06:03:00 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/60dfd46e09d5e6b4d2a74be76dcf9b83a964b8cc

Merge branch 'master' of github.com:/lunar-linux/moonbase-other
---
  crypto/heimdal/DETAILS                                       +2/-2     
  crypto/heimdal/systemd.d/heimdal-kadmind.service             +1/-0     
  crypto/heimdal/systemd.d/heimdal-kadmind.socket              +1/-1     
  crypto/heimdal/systemd.d/heimdal-kadmind at .service            +1/-0     
  4 files changed, 0 insertions (+), 0 deletions (-)

--- a/crypto/heimdal/DETAILS
+++ b/crypto/heimdal/DETAILS
@@ -5,7 +5,7 @@
          SOURCE3=$MODULE-1.3.1-k-prefixes.patch
          SOURCE4=$MODULE-1.5.1-suid_fix.patch
          SOURCE5=$MODULE-1.5.2-perl5.16-getopts-fix.patch
-         SOURCE6=$MODULE-1.5.2-ignore-setpgid-eperm.patch
+         SOURCE6=$MODULE-1.5.2-no-setpgid-under-systemd.patch
       SOURCE_URL=http://www.h5l.org/dist/src
      SOURCE2_URL=$PATCH_URL
      SOURCE3_URL=$PATCH_URL
@@ -17,7 +17,7 @@
      SOURCE3_VFY=sha1:1a15fbee5de1027babcd151ce23fb5fbeea1c763
      SOURCE4_VFY=sha256:71f697b2e2f7f20b0489e4636a835e72d779c2dc3046fdd4fe8925585248490c
      SOURCE5_VFY=sha256:91b77b2d3277ae4a5da0b354ec96d97e942bd63d2fff42250baf445360ab440b
-     SOURCE6_VFY=sha256:a72b3b65ac6770c5ee3f833a6f5a695df463bcde396239816305df0aae84b109
+     SOURCE6_VFY=sha256:6527c8a252ed101139b613875e0956aa62db97c54f7d0b806f3bf8cf958b8083
         WEB_SITE=http://www.h5l.org/
       MAINTAINER=ratler at lunar-linux.org
          ENTERED=20041026
--- a/crypto/heimdal/systemd.d/heimdal-kadmind.service
+++ b/crypto/heimdal/systemd.d/heimdal-kadmind.service
@@ -3,6 +3,7 @@ Description=Heimdal Admin Server Daemon
 After=syslog.target network.target
 
 [Service]
+Environment=HEIMDAL_SYSTEMD=1
 ExecStart=/usr/sbin/kadmind
 Restart=on-failure
 
--- a/crypto/heimdal/systemd.d/heimdal-kadmind.socket
+++ b/crypto/heimdal/systemd.d/heimdal-kadmind.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=Heimdal Admin Server - no daemon version
-Conflicts=heimdal-kadmind.servicew
+Conflicts=heimdal-kadmind.service
 
 [Socket]
 ListenStream=749
--- a/crypto/heimdal/systemd.d/heimdal-kadmind at .service
+++ b/crypto/heimdal/systemd.d/heimdal-kadmind at .service
@@ -3,6 +3,7 @@ Description=Heimdal Admin Server - no daemon version
 After=syslog.target
 
 [Service]
+Environment=HEIMDAL_SYSTEMD=1
 ExecStart=/usr/sbin/kadmind
 StandardInput=socket