[gentoo-commits] gentoo-x86 commit in mail-filter/dkim-milter/files: dkim-filter.init dkim-milter-2.4.3-gentoo.patch digest-dkim-milter-2.4.3 dkim-milter-2.3.2-diffheaders.patch digest-dkim-milter-2.3.2 dkim-milter-2.3.2-gentoo.patch digest-dkim-milter-2.4.1

[Alin Nastac (mrness)]

mrness      08/01/24 11:39:16

  Modified:             dkim-filter.init
  Added:                dkim-milter-2.4.3-gentoo.patch
                        digest-dkim-milter-2.4.3
  Removed:              dkim-milter-2.3.2-diffheaders.patch
                        digest-dkim-milter-2.3.2
                        dkim-milter-2.3.2-gentoo.patch
                        digest-dkim-milter-2.4.1
  Log:
  Version bump. Remove stalled Unix socket before starting the service (#205097).
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.4                  mail-filter/dkim-milter/files/dkim-filter.init

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-filter.init?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-filter.init?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-filter.init?r1=1.3&r2=1.4

Index: dkim-filter.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/files/dkim-filter.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dkim-filter.init	10 Oct 2007 16:01:44 -0000	1.3
+++ dkim-filter.init	24 Jan 2008 11:39:15 -0000	1.4
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/files/dkim-filter.init,v 1.3 2007/10/10 16:01:44 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/files/dkim-filter.init,v 1.4 2008/01/24 11:39:15 mrness Exp $
 
 CONFFILE=/etc/mail/dkim-filter/${SVCNAME}.conf
 PIDFILE=/var/run/dkim-filter/${SVCNAME}.pid
@@ -31,12 +31,16 @@
 
 start() {
 	check_cfg || return 1
-	local SOCKFILE=$(sed -nr -e 's/^[[:space:]]*Socket[[:space:]]+((local)|(unix))://p' "${CONFFILE}")
+	
+	# Remove stalled Unix socket if no other process is using it
+	local UNIX_SOCKET=$(sed -ne 's/^[[:space:]]*Socket[[:space:]]\+\(unix\|local\)://p' "${CONFFILE}")
+	if [ -S "${UNIX_SOCKET}" ] && ! fuser -s "${UNIX_SOCKET}"; then
+		rm "${UNIX_SOCKET}"
+	fi
 
 	ebegin "Starting DKIM filter"
 	start-stop-daemon --start --pidfile "${PIDFILE}" \
-		--exec /usr/bin/dkim-filter -- -x "${CONFFILE}" -P "${PIDFILE}" && \
-		[ -z "${SOCKFILE}" ] || chmod a+rwx "${SOCKFILE}"
+		--exec /usr/bin/dkim-filter -- -x "${CONFFILE}" -P "${PIDFILE}"
 	eend $?
 }
 



1.1                  mail-filter/dkim-milter/files/dkim-milter-2.4.3-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-milter-2.4.3-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/dkim-milter-2.4.3-gentoo.patch?rev=1.1&content-type=text/plain

Index: dkim-milter-2.4.3-gentoo.patch
===================================================================
diff -Nru dkim-milter-2.4.3.orig/devtools/Site/site.config.m4 dkim-milter-2.4.3/devtools/Site/site.config.m4
--- dkim-milter-2.4.3.orig/devtools/Site/site.config.m4	2008-01-24 13:07:10.000000000 +0200
+++ dkim-milter-2.4.3/devtools/Site/site.config.m4	2008-01-24 13:08:08.000000000 +0200
@@ -11,7 +11,10 @@
 dnl If you are encountering coredumps and want to be able to analyze them
 dnl using something like "gdb", enable this next line by deleting the "dnl"
 dnl at the front of it.
-dnl define(`confOPTIMIZE', `-g')
+define(`confOPTIMIZE', `@@CFLAGS@@')
+define(`confENVDEF', `@@ENVDEF@@')
+dnl man build is broken
+define(`confNO_MAN_BUILD',`')
 
 dnl Shared library for libdkim
 dnl
@@ -40,7 +43,7 @@
 dnl
 dnl If you want to use the asynchronous resolver library, enable this
 dnl next line by deleting the "dnl" at the front of it.
-dnl define(`bld_USE_ARLIB', `true')
+define(`bld_USE_ARLIB', `true')
 dnl 
 dnl libar normally uses res_init() or res_ninit() to load the contents
 dnl of resolv.conf for its use.  If neither of these work on your system
@@ -65,7 +68,7 @@
 dnl it has seen, rather than relying on the DNS server to provide caching,
 dnl enable this next line by deleting the "dnl" at the front of it.  Also
 dnl see the section below called "BerkeleyDB".
-dnl APPENDDEF(`confENVDEF', `-DQUERY_CACHE ')
+APPENDDEF(`confENVDEF', `-DQUERY_CACHE ')
 
 dnl BerkeleyDB -- Berkeley DB ("Sleepycat") database
 dnl 
@@ -78,7 +81,7 @@
 dnl by deleting "dnl" from the front of them:
 dnl APPENDDEF(`confINCDIRS', `-I/usr/local/BerkeleyDB/include ')
 dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/BerkeleyDB/lib ')
-dnl APPENDDEF(`confLIBS', `-ldb ')
+APPENDDEF(`confLIBS', `-ldb ')
 
 dnl OpenSSL -- cryptography library
 dnl
@@ -114,7 +117,7 @@
 dnl APPENDDEF(`confENVDEF', `-D_FFR_REQUIRED_HEADERS ')
 dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECT_CANONICALIZATION ')
 dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECTOR_HEADER ')
-dnl APPENDDEF(`confENVDEF', `-D_FFR_STATS ')
+APPENDDEF(`confENVDEF', `-D_FFR_STATS ')
 dnl APPENDDEF(`confENVDEF', `-D_FFR_VBR ')
 dnl APPENDDEF(`confENVDEF', `-D_FFR_ZTAGS ')
 
diff -Nru dkim-milter-2.4.3.orig/dkim-filter/dkim-filter.conf.sample dkim-milter-2.4.3/dkim-filter/dkim-filter.conf.sample
--- dkim-milter-2.4.3.orig/dkim-filter/dkim-filter.conf.sample	2007-12-14 09:22:19.000000000 +0200
+++ dkim-milter-2.4.3/dkim-filter/dkim-filter.conf.sample	2008-01-24 13:07:51.000000000 +0200
@@ -20,13 +20,6 @@
 
 # AutoRestart		No
 
-##  Background { yes | no }
-##  	default "yes"
-##
-##  Indicate whether or not the filter should run in the background.
-
-# Background		Yes
-
 ##  BodyLengths { yes | no }
 ##  	default "no"
 ##
@@ -74,7 +67,7 @@
 ##  Specify for which domain(s) signing should be done.  No default; must
 ##  be specified for signing.
 
-Domain			example.com
+Domain			my-domain.com
 
 ##  ExternalIgnoreList filename
 ##
@@ -89,7 +82,7 @@
 ##  Specifies the path to the private key to use when signing.  Ignored if
 ##  Keylist is set.  No default; must be specified for signing.
 
-KeyFile			/var/db/dkim/example.private
+KeyFile			/etc/mail/dkim-filter/my-selector-name.private
 
 ##  KeyList filename
 ##
@@ -106,7 +99,7 @@
 ##  as the beginning of a comment.  See dkim-filter.conf(5) for more
 ##  information.
 
-# KeyList		/var/db/dkim/keylist
+# KeyList		/etc/mail/dkim-filter/keylist
 
 ##  InternalHosts filename
 ##
@@ -114,7 +107,7 @@
 ##  hosts from which mail should be signed rather than verified.
 ##  Automatically contains 127.0.0.1.  See man page for file format.
 
-# InternalHosts		filename
+# InternalHosts		/etc/mail/dkim-filter/internalhosts
 
 ##  MacroList macro[=value][,...]
 ##
@@ -198,22 +191,6 @@
 
 # PeerList		filename
 
-##  PidFile filename
-## 
-##  Name of the file where the filter should write its pid before beginning
-##  normal operations.
-
-# PidFile		filename
-
-##  POPDBFile filename
-##
-##  Names a database which should be checked for "POP before SMTP" records
-##  as a form of authentication of users who may be sending mail through
-##  the MTA for signing.  Requires special compilation of the filter.
-##  See dkim-filter.conf(5) for more information.
-
-# POPDBFile		filename
-
 ##  Quarantine { yes | no }
 ##  	default "no"
 ##
@@ -288,7 +265,7 @@
 ##  inet:port			to listen on all interfaces
 ##  local:/path/to/socket	to listen on a UNIX domain socket
 
-Socket			inet:port@localhost
+Socket			local:/var/run/dkim-filter/dkim-filter.sock
 
 ##  SubDomains { yes | no }
 ##  	default "no"
@@ -318,7 +295,7 @@
 ##  The system has its own default which will be used (usually 022).
 ##  See the umask(2) man page for more information.
 
-# UMask			022
+UMask			002
 
 ##  Userid userid
 ##  	default (none)
@@ -326,7 +303,7 @@
 ##  Change to user "userid" before starting normal operation?  May include
 ##  a group ID as well, separated from the userid by a colon.
 
-# UserID		userid
+UserID		milter
 
 ##  UseSSPDeny { yes | no }
 ##  	default "no"
@@ -344,3 +321,10 @@
 ##  messages it has processed.
 
 # X-Header		No
+
+##  Statistics filename
+##
+##  Names a file to which useful statistics will be saved.
+##  See man dkim-stats page
+
+Statistics		/var/run/dkim-filter/dkim-filter.stats



1.1                  mail-filter/dkim-milter/files/digest-dkim-milter-2.4.3

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/digest-dkim-milter-2.4.3?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dkim-milter/files/digest-dkim-milter-2.4.3?rev=1.1&content-type=text/plain

Index: digest-dkim-milter-2.4.3
===================================================================
MD5 b2206bc0dfb2f584c47fe99a4479e428 dkim-milter-2.4.3.tar.gz 616459
RMD160 fc8416eb84c8b4a71a2987b5fc5030f91032996e dkim-milter-2.4.3.tar.gz 616459
SHA256 3168856fc7760c08abfe37e1291c102293cd8b53b26974f2646693e369eca87b dkim-milter-2.4.3.tar.gz 616459



-- 
gentoo-commits@l.g.o mailing list