[gentoo-commits] gentoo-x86 commit in mail-mta/sendmail/files: libmilter-sharedlib.patch site.config.m4 sendmail

[Alin Nastac (mrness)]

mrness      09/08/22 21:41:23

  Modified:             site.config.m4 sendmail
  Added:                libmilter-sharedlib.patch
  Log:
  Migrate to EAPI 2.
  Quote variables.
  Install libmilter library in both forms, static and dynamic (#245950).
  Add "use dns" to init script (#213656).
  Fix QA pre-stripped binary warnings and honor LDFLAGS (#251946).
  (Portage version: 2.1.6.13/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  mail-mta/sendmail/files/site.config.m4

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/sendmail/files/site.config.m4?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/sendmail/files/site.config.m4?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/sendmail/files/site.config.m4?r1=1.4&r2=1.5

Index: site.config.m4
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-mta/sendmail/files/site.config.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- site.config.m4	29 May 2005 16:17:49 -0000	1.4
+++ site.config.m4	22 Aug 2009 21:41:22 -0000	1.5
@@ -3,7 +3,9 @@
 define(`confENVDEF', `@@confENVDEF@@')
 define(`confLIBS', `@@confLIBS@@')
 define(`confSTDIO_TYPE', `portable')
-define(`confLDOPTS', `-Wl,-z,now -s')
+define(`confLDOPTS', `-Wl,-z,now @@confLDOPTS@@')
+define(`confLDOPTS_SO', `-shared')
+define(`confCCOPTS_SO', `-fPIC')
 define(`confMANOWN', `root')
 define(`confMANGRP', `root')
 define(`confMANMODE', `644')



1.7                  mail-mta/sendmail/files/sendmail

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/sendmail/files/sendmail?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/sendmail/files/sendmail?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/sendmail/files/sendmail?r1=1.6&r2=1.7

Index: sendmail
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-mta/sendmail/files/sendmail,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sendmail	26 Sep 2007 10:46:26 -0000	1.6
+++ sendmail	22 Aug 2009 21:41:22 -0000	1.7
@@ -1,11 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/files/sendmail,v 1.6 2007/09/26 10:46:26 lcars Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/sendmail/files/sendmail,v 1.7 2009/08/22 21:41:22 mrness Exp $
 
 depend() {
 	need net
-	use logger antivirus
+	use dns logger antivirus
 	provide mta
 }
 



1.1                  mail-mta/sendmail/files/libmilter-sharedlib.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/sendmail/files/libmilter-sharedlib.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-mta/sendmail/files/libmilter-sharedlib.patch?rev=1.1&content-type=text/plain

Index: libmilter-sharedlib.patch
===================================================================
diff -Nru sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4 sendmail-8.14.3/devtools/M4/UNIX/milterlibrary.m4
--- sendmail-8.14.3.orig/devtools/M4/UNIX/milterlibrary.m4	1970-01-01 01:00:00.000000000 +0100
+++ sendmail-8.14.3/devtools/M4/UNIX/milterlibrary.m4	2009-08-22 21:51:10.000000000 +0200
@@ -0,0 +1,39 @@
+divert(-1)
+#
+# Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers.
+#	All rights reserved.
+#
+# By using this file, you agree to the terms and conditions set
+# forth in the LICENSE file which can be found at the top level of
+# the sendmail distribution.
+#
+#
+#  Definitions for Makefile construction for sendmail
+#
+divert(0)dnl
+include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/links.m4')dnl
+bldLIST_PUSH_ITEM(`bldC_PRODUCTS', bldCURRENT_PRODUCT)dnl
+bldPUSH_TARGET(bldCURRENT_PRODUCT`.so' bldCURRENT_PRODUCT`.a')dnl
+bldPUSH_INSTALL_TARGET(`install-'bldCURRENT_PRODUCT)dnl
+bldPUSH_CLEAN_TARGET(bldCURRENT_PRODUCT`-clean')dnl
+
+include(confBUILDTOOLSDIR`/M4/'bldM4_TYPE_DIR`/defines.m4')
+divert(bldTARGETS_SECTION)
+bldCURRENT_PRODUCT.so: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'}
+	${CCLINK} ${LDOPTS_SO} -o bldCURRENT_PRODUCT.so -Wl,confSONAME,bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${bldCURRENT_PRODUCT`OBJS'} -lc
+bldCURRENT_PRODUCT.a: ${BEFORE} ${bldCURRENT_PRODUCT`OBJS'}
+	${AR} ${AROPTS} bldCURRENT_PRODUCT.a ${bldCURRENT_PRODUCT`OBJS'}
+	${RANLIB} ${RANLIBOPTS} bldCURRENT_PRODUCT.a
+ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)')
+
+install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a
+ifdef(`bldINSTALLABLE', `	ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ')
+	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${UBINMODE} bldCURRENT_PRODUCT.so ${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so.${MILTER_SOVER}
+	${LN} ${LNOPTS} bldCURRENT_PRODUCT.so.${MILTER_SOVER} ${DESTDIR}${LIBDIR}/bldCURRENT_PRODUCT.so
+	${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}')
+
+bldCURRENT_PRODUCT-clean:
+	rm -f ${OBJS} bldCURRENT_PRODUCT.so bldCURRENT_PRODUCT.a ${MANPAGES}
+
+divert(0)
+COPTS+= confCCOPTS_SO
diff -Nru sendmail-8.14.3.orig/libmilter/Makefile.m4 sendmail-8.14.3/libmilter/Makefile.m4
--- sendmail-8.14.3.orig/libmilter/Makefile.m4	2008-04-08 07:23:44.000000000 +0200
+++ sendmail-8.14.3/libmilter/Makefile.m4	2009-08-22 21:53:35.000000000 +0200
@@ -9,7 +9,7 @@
 SMSRCDIR=ifdef(`confSMSRCDIR', `confSMSRCDIR', `${SRCDIR}/sendmail')
 PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR} ')
 
-bldPRODUCT_START(`library', `libmilter')
+bldPRODUCT_START(`milterlibrary', `libmilter')
 define(`bldINSTALLABLE', `true')
 define(`LIBMILTER_EXTRAS', `errstring.c strl.c')
 APPENDDEF(`confENVDEF', `-DNOT_SENDMAIL -Dsm_snprintf=snprintf')