lsof shows files like /.sock{dshmem,slock}XXXXXXX being created by sockd, and failing...

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

diff --git a/net-proxy/dante/ChangeLog b/net-proxy/dante/ChangeLog
index 00c53731c8917c3380f5f4cc92155c9551e411b4..3d8fae920b96bfabec80eda81062390b27e5e29f 100644 (file)
--- a/net-proxy/dante/ChangeLog
+++ b/net-proxy/dante/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/dante
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.59 2011/08/04 16:33:12 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/ChangeLog,v 1.60 2011/10/04 20:14:21 robbat2 Exp $
+
+  04 Oct 2011; Robin H. Johnson <robbat2@gentoo.org> files/dante-sockd-init:
+  lsof shows files like /.sock{dshmem,slock}XXXXXXX being created by sockd, and
+  failing when / is read-only. Force them to be created in /var/lock instead.
 
 *dante-1.3.2 (04 Aug 2011)
 

diff --git a/net-proxy/dante/Manifest b/net-proxy/dante/Manifest
index 8073360b33ab3749b30e0cf063bafff89bda2135..f1718270d41dc4e6bc0f4a99e398fe1ad1b4cd40 100644 (file)
--- a/net-proxy/dante/Manifest
+++ b/net-proxy/dante/Manifest
@@ -1,13 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX dante-1.1.19-libpam.patch 2688 RMD160 120d53814c7d9b51cad038ffd08e8794eb50b8dc SHA1 11f4807397c0e8a32ac3c55253f481f66e2344d5 SHA256 e78503cc9ece8347cfe0f11d77e0952bec9e2286dd1bea0916540f489d86ab54
 AUX dante-1.1.19-socksify.patch 811 RMD160 4edaad9e92f2ab689cf10b3decd2aa02d24d1f62 SHA1 d6e7ff6699691de9ee2ff836203e5628146ede06 SHA256 2e39a9cb13ae30eaf4129583dbd28d6df08133564aa679b81b5feb21532822d5
 AUX dante-1.2.3-socksify.patch 993 RMD160 4d9fa2256b15a58cb2b11fb86d044ddf5661095d SHA1 3f434ee41152263b5df9e6d418efc01be2e0e074 SHA256 f71c07df0765c600a9509faa7c6fcc3a2617a98897a234f457925980883d6351
 AUX dante-1.3.0-socksify.patch 987 RMD160 479f3418c600a5ef9d0f327d804490fae7d0ce9d SHA1 c0b55bdaac92b8122c5bd9f8c5daad98b772c566 SHA256 d5482aba9f049c879d646e8831e31ed9af0d69be9eada742323b2be05d66b7a1
 AUX dante-1.3.1-flags.patch 1012 RMD160 ded829fa9a0c3722694a1fa1b6691148a89d3b9e SHA1 d723b49e92d5ece6f6c583d7da68b98cef7372a9 SHA256 731758799fc94be04d141310482800f3948e4b1ca2c1089543d63f94a90a0824
 AUX dante-sockd-conf 463 RMD160 037abbc191675c690c7219ffdec738405d1ea669 SHA1 5fd6b002b33ddec46f6d94550d3c7ea26a26f115 SHA256 b22c8261148fcb96cfd8942baa85633a790826a444920f7d87fc23d2dcf18a74
-AUX dante-sockd-init 1660 RMD160 8fe9aed45d614a691709ead7e72542cfa76417f5 SHA1 1143e90a30d470e3d91146c9ac588d82eaa2e263 SHA256 3297ab1d5a5b1d3324fdac27a626f34ca281aa2664ee9a779aa161dfa41fc2fa
+AUX dante-sockd-init 1812 RMD160 7a551070d7cde15e3caef4150b7a4a7948bdc3a6 SHA1 d37f936e64a5b28d918d927a43844ab4f22918b8 SHA256 5956be225fd9e90c96127721b04ead92c201fd7d674ccfc7373b2b9de12c496f
 AUX sockd.conf 7031 RMD160 3ed9c0523eade831f01f867f8fea1889c2f429b6 SHA1 ef6f69870af7167d8b5c73577c0de5a41501d653 SHA256 3ea0e08ee7e5b018d1df1b83af92fb6051fb44a486e0822e28775d104bfcfee7
 AUX sockd.conf-with-libwrap.patch 870 RMD160 f34216f2542bf51563334e1fcaf87f9f687d6fe8 SHA1 c97d9843ef93184c91a69c78b9c09195c5cff232 SHA256 ba4bb30ad5933b890d1b09c6468708f37abf012de3f8696482d1c46c5c1f2978
 AUX sockd.conf-with-pam.patch 295 RMD160 67950c8d3fca41399540644ea47f549631868795 SHA1 599a82ffc4d52e93658dafc13682c9e8530c8a02 SHA256 e67499de8b976e17a9c7c0556e999e03f4bf06e8e57b78ba6dd41a128de0b719
@@ -23,16 +20,5 @@ EBUILD dante-1.3.0.ebuild 1976 RMD160 e2630d324dfc0318f77b7e5100732992de372c3d S
 EBUILD dante-1.3.1-r1.ebuild 2062 RMD160 a637de275facb5d6b8ed2ecf68dcd4a9a43af104 SHA1 3cdd49dbb0d5cca5540203caaf804d79a4d05eb1 SHA256 5d1ee717efc2641a73d3f68fa7c3007273429c0c2e5bb9df07bfa32fe9bfdb7c
 EBUILD dante-1.3.1.ebuild 1983 RMD160 4a9eae975b2ae8ac4d4e2aa6b18882e129d113bb SHA1 99db084777cd552e710ba655162ce89f3155388c SHA256 2e8a5eaec3d13a96009e43d3c84b742461442ff7880c057c666701efb506850d
 EBUILD dante-1.3.2.ebuild 2065 RMD160 6c690126d3f7475cc2a606a4269b18c74189b340 SHA1 31f8f88109698c8afa12dfe16156a2788676de64 SHA256 629c822f45008e3669aaa02b23d93965ba3fae29cac35b85780940e1b8152065
-MISC ChangeLog 15320 RMD160 41f6946ab6c1dd569a5ef939c012edb4ec2def1b SHA1 63d6d70109af163f60e8e7b6ac5b193df978be66 SHA256 ccc064faa3ac00c65fc25dccdc181ed2c9940a23fab0584e408d63c0e449df47
+MISC ChangeLog 15554 RMD160 fae0a16a518b02ffc45cd21835aa5992350cc342 SHA1 c0a21851ce48d67d8f2b4b438185df248627ec07 SHA256 aafcaa0413b1a42bcaea96173d626a68ce9f71c366944bb12353c584c432a819
 MISC metadata.xml 246 RMD160 bf022485cb8a0289c3151fc974670fd86687d6be SHA1 c68b5b8a31dc103b0e7e8503671910b8bbe419d8 SHA256 7302ea59a7112d51c6936fa5aa83204412d7391441c729a54de3651b81c35add
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCgAGBQJOOsnRAAoJEEqz6FtPBkyj2o8H/jZ3p0G8Q+Zoo+IPE1kfM6rU
-QWgqoOxaE1sqfqa1UQouBJW+LA3BRfA89GLC9YI2r2E0wT7u6Mh030DxbMHgo5yI
-56rzZGO/alK4NmzltvyiWbabolYm7oOXGh0/yUpm85MUbXn0lkPtcG/mpR8PHgCs
-vRyfq2T9b4QHFF0g/UdjAjNlOkv/gTvlxjBGB9SFgEiqy+pWoBIKxK2N4o6UhYas
-xz5X9v9mu3oAlm8UX/6KDdxFT5ZIDUOfOVJJHW2BVv1vaLd4AR43dNGbWodiDHRF
-nwyix1lXh1ztyJmg9U7A4VJY2sEUw2UmTKLrz7Rrc3Gt+B3z753ae1rbNTvF2s4=
-=wmG+
------END PGP SIGNATURE-----

diff --git a/net-proxy/dante/files/dante-sockd-init b/net-proxy/dante/files/dante-sockd-init
index 66d02bd6fb2c91fb2b7692a3bc5a3fb997b156ad..5147044c6910b4afa67178bdc7bf1615c857f9e8 100644 (file)
--- a/net-proxy/dante/files/dante-sockd-init
+++ b/net-proxy/dante/files/dante-sockd-init
@@ -1,13 +1,14 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/files/dante-sockd-init,v 1.6 2009/03/05 19:31:13 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/dante/files/dante-sockd-init,v 1.7 2011/10/04 20:14:21 robbat2 Exp $
 
 SOCKD_OPT="-D"
 [ "${SOCKD_FORKDEPTH:-1}" -gt 1 ] && SOCKD_OPT="${SOCKD_OPT} -N ${SOCKD_FORKDEPTH}"
 [ "${SOCKD_DEBUG:-0}" -eq 1 ] && SOCKD_OPT="${SOCKD_OPT} -d"
 [ "${SOCKD_DISABLE_KEEPALIVE:-0}" -eq 1 ] && SOCKD_OPT="${SOCKD_OPT} -n"
 PIDFILE=/var/run/sockd.pid
+SOCKDIR=/var/lock/dante-sockd/
 
 depend() {
        need net
@@ -35,6 +36,8 @@ checkconfig() {
        DAEMON_UID=`sed -e '/^[ \t]*user[.]notprivileged[ \t]*:/{s/.*:[ \t]*//;q};d' /etc/socks/sockd.conf`
        if [ -n "$DAEMON_UID" ]; then
                touch $PIDFILE && chown $DAEMON_UID $PIDFILE 
+               mkdir $SOCKDIR && chown $DAEMON_UID $SOCKDIR
+               [ ! -f $SOCKDIR/.keep ] && touch $SOCKDIR/.keep 
        fi
 
        return 0
@@ -43,7 +46,7 @@ checkconfig() {
 start() {
        checkconfig || return 1
        ebegin "Starting dante sockd"
-       start-stop-daemon --start --quiet --pidfile $PIDFILE \
+       start-stop-daemon --start --quiet --pidfile $PIDFILE --env TMPDIR=$SOCKDIR \
                --make-pidfile --exec /usr/sbin/sockd -- ${SOCKD_OPT} >/dev/null 2>&1
        eend $? "Failed to start sockd"
 }