diff options
| -rw-r--r-- | debian/Makefile | 14 | ||||
| -rw-r--r-- | debian/build/debian/changelog | 2 | ||||
| -rw-r--r-- | debian/build/debian/control.m4 | 2 | ||||
| -rw-r--r-- | debian/build/site.config.m4 | 14 | ||||
| -rw-r--r-- | debian/cf/Makefile | 14 | ||||
| -rw-r--r-- | debian/cf/debian/autoconf.m4 | 2 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/configure | 55 | ||||
| -rw-r--r-- | debian/configure.ac | 20 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/examples/Makefile | 14 | ||||
| -rw-r--r-- | debian/local/Makefile | 14 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.4/hard-code-lockf.patch | 54 | ||||
| -rw-r--r-- | debian/patches/8.14/8.14.4/series | 1 | ||||
| -rw-r--r-- | debian/sensible_mda/Makefile | 14 |
15 files changed, 113 insertions, 117 deletions
diff --git a/debian/Makefile b/debian/Makefile index 484ba83..4e5133d 100644 --- a/debian/Makefile +++ b/debian/Makefile @@ -293,7 +293,7 @@ psdir = ${docdir} sbindir = /usr/sbin sharedstatedir = /usr/com sm_auth_lib = 2 -sm_badepends = , libdb4.8-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev +sm_badepends = , libdb-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev sm_build_arch = amd64 sm_custom = sm_custom_s = @@ -303,7 +303,7 @@ sm_depends = sm_dist_name = Debian sm_dist_vers = squeeze/sid sm_editmap_envdef = -sm_editmap_libs = -ldb-4.8 -lldap -llber +sm_editmap_libs = -ldb -lldap -llber sm_enable_auth = yes sm_enable_bind = no sm_enable_hesiod = no @@ -343,24 +343,24 @@ sm_mail_local_libs = -lldap -llber -llockfile sm_mailstats_envdef = sm_mailstats_libs = -lldap -llber sm_makemap_envdef = -sm_makemap_libs = -ldb-4.8 -lldap -llber +sm_makemap_libs = -ldb -lldap -llber sm_mapdef = -DSOCKETMAP -DMAP_REGEX -DNEWDB -DNIS -DNISPLUS -DLDAPMAP -sm_newdb_lib = -ldb-4.8 +sm_newdb_lib = -ldb sm_praliases_envdef = -sm_praliases_libs = -ldb-4.8 -lldap -llber +sm_praliases_libs = -ldb -lldap -llber sm_recommends = sm_revision = -2 sm_rmail_envdef = sm_rmail_libs = -lldap -llber sm_sendmail_envdef = -D_PATH_SENDMAILPID=\"/var/run/sendmail/mta/sendmail.pid\" -DIP_SRCROUTE=1 -DLDAP_REFERRALS -D_FFR_LDAP_URI -D_FFR_LDAP_SETVERSION -DLDAP_DEPRECATED -DTCPWRAPPERS -DSASL -I/usr/include/sasl -DSTARTTLS -D_FFR_QUEUE_SCHED_DBG -D_FFR_SKIP_DOMAINS -D_FFR_GROUPREADABLEAUTHINFOFILE -D_FFR_DAEMON_NETUNIX -D_FFR_NO_PIPE -D_FFR_SHM_STATUS -D_FFR_RHS -D_FFR_MAIL_MACRO -D_FFR_QUEUEDELAY=1 -D_FFR_BADRCPT_SHUTDOWN -D_FFR_RESET_MACRO_GLOBALS -D_FFR_TLS_1 -D_FFR_DEAL_WITH_ERROR_SSL -sm_sendmail_libs = -ldb-4.8 -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypto -lssl +sm_sendmail_libs = -ldb -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypto -lssl sm_smrsh_envdef = -DCMDDIR=\"/etc/mail/smrsh\" -DPATH=\"/usr/bin:/bin\" sm_smrsh_libs = -lldap -llber sm_suggests = , sasl2-bin, libsasl2-modules, openssl sm_time = 22:21:32 sm_utc = +0000 sm_vacation_envdef = -sm_vacation_libs = -ldb-4.8 -lldap -llber +sm_vacation_libs = -ldb -lldap -llber sm_version = 8.14.4 sm_version_beta = sm_version_major = 8.14 diff --git a/debian/build/debian/changelog b/debian/build/debian/changelog index 41a1021..25487a8 100644 --- a/debian/build/debian/changelog +++ b/debian/build/debian/changelog @@ -8,7 +8,7 @@ sendmail (8.14.4-1) unstable; urgency=high * Long past due - * Re-enable libdb-dev, db4.8 working again + * Re-enable libdb-dev, db working again * New upstream + Null checking in certificate CN (CVE-2009-4565) diff --git a/debian/build/debian/control.m4 b/debian/build/debian/control.m4 index 846e89e..87a6b57 100644 --- a/debian/build/debian/control.m4 +++ b/debian/build/debian/control.m4 @@ -25,7 +25,7 @@ Maintainer: Richard A Nelson (Rick) <cowboy@debian.org> Standards-Version: 3.8.3 ]]dnl # Sigh... build daemons ignore B-D-I, so replicate in B-D :( [[Build-Depends-Indep: groff, bsdmainutils -Build-Depends: make (>> 3.79.1-14), m4, cdbs, quilt, patchutils, dh-buildinfo, debhelper (>= 5), linux-libc-dev (>= 2.6.21-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], groff, bsdmainutils , libdb4.8-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev +Build-Depends: make (>> 3.79.1-14), m4, cdbs, quilt, patchutils, dh-buildinfo, debhelper (>= 5), linux-libc-dev (>= 2.6.21-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], groff, bsdmainutils , libdb-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev Build-Conflicts: libbind-dev, bind-dev, fakeroot (<< 0.4.5) Homepage: http://www.sendmail.org]]dnl dnl # diff --git a/debian/build/site.config.m4 b/debian/build/site.config.m4 index 34f424e..1f8c5a3 100644 --- a/debian/build/site.config.m4 +++ b/debian/build/site.config.m4 @@ -21,7 +21,7 @@ #------------------------------------------------------------------ #REGEX: yes #NDBM: no -#NEWDB: yes -ldb-4.8 +#NEWDB: yes -ldb #NIS: yes #NISPLUS: yes #LDAP: yes -lldap -llber @@ -42,7 +42,7 @@ # Packages and build dependancies (Debian packages) #------------------------------------------------------------------ #Sendmail: sendmail -#Build-Depends: , libdb4.8-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev +#Build-Depends: , libdb-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev #Depends: #Recommends: #Suggests: , sasl2-bin, libsasl2-modules, openssl @@ -98,7 +98,7 @@ APPENDDEF(`confLIBS', `') # # editmap APPENDDEF(`conf_editmap_ENVDEF', `') -APPENDDEF(`conf_editmap_LIBS', ` -ldb-4.8 -lldap -llber') +APPENDDEF(`conf_editmap_LIBS', ` -ldb -lldap -llber') # # libmilter APPENDDEF(`conf_libmilter_ENVDEF', `-fPIC -DSM_CONF_POLL=1 -D_FFR_MULTILINE -D_FFR_SMFI_PROGRESS') @@ -128,11 +128,11 @@ APPENDDEF(`conf_mailstats_LIBS', ` -lldap -llber') # # makemap APPENDDEF(`conf_makemap_ENVDEF', `') -APPENDDEF(`conf_makemap_LIBS', ` -ldb-4.8 -lldap -llber') +APPENDDEF(`conf_makemap_LIBS', ` -ldb -lldap -llber') # # praliases APPENDDEF(`conf_praliases_ENVDEF', `') -APPENDDEF(`conf_praliases_LIBS', ` -ldb-4.8 -lldap -llber') +APPENDDEF(`conf_praliases_LIBS', ` -ldb -lldap -llber') # # rmail APPENDDEF(`conf_rmail_ENVDEF', `') @@ -140,7 +140,7 @@ APPENDDEF(`conf_rmail_LIBS', ` -lldap -llber') # # sendmail APPENDDEF(`conf_sendmail_ENVDEF', ` -D_PATH_SENDMAILPID=\"/var/run/sendmail/mta/sendmail.pid\" -DIP_SRCROUTE=1 -DLDAP_REFERRALS -D_FFR_LDAP_URI -D_FFR_LDAP_SETVERSION -DLDAP_DEPRECATED -DTCPWRAPPERS -DSASL -I/usr/include/sasl -DSTARTTLS -D_FFR_QUEUE_SCHED_DBG -D_FFR_SKIP_DOMAINS -D_FFR_GROUPREADABLEAUTHINFOFILE -D_FFR_DAEMON_NETUNIX -D_FFR_NO_PIPE -D_FFR_SHM_STATUS -D_FFR_RHS -D_FFR_MAIL_MACRO -D_FFR_QUEUEDELAY=1 -D_FFR_BADRCPT_SHUTDOWN -D_FFR_RESET_MACRO_GLOBALS -D_FFR_TLS_1 -D_FFR_DEAL_WITH_ERROR_SSL') -APPENDDEF(`conf_sendmail_LIBS', ` -ldb-4.8 -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypto -lssl') +APPENDDEF(`conf_sendmail_LIBS', ` -ldb -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypto -lssl') # # smrsh APPENDDEF(`conf_smrsh_ENVDEF', ` -DCMDDIR=\"/etc/mail/smrsh\" -DPATH=\"/usr/bin:/bin\"') @@ -148,7 +148,7 @@ APPENDDEF(`conf_smrsh_LIBS', ` -lldap -llber') # # vacation APPENDDEF(`conf_vacation_ENVDEF', `') -APPENDDEF(`conf_vacation_LIBS', ` -ldb-4.8 -lldap -llber') +APPENDDEF(`conf_vacation_LIBS', ` -ldb -lldap -llber') # #------------------------------------------------------------------ # Build-time selection not handled by autoconf above diff --git a/debian/cf/Makefile b/debian/cf/Makefile index afb013b..8c2a10b 100644 --- a/debian/cf/Makefile +++ b/debian/cf/Makefile @@ -155,7 +155,7 @@ psdir = ${docdir} sbindir = /usr/sbin sharedstatedir = /usr/com sm_auth_lib = 2 -sm_badepends = , libdb4.8-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev +sm_badepends = , libdb-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev sm_build_arch = amd64 sm_custom = sm_custom_s = @@ -165,7 +165,7 @@ sm_depends = sm_dist_name = Debian sm_dist_vers = squeeze/sid sm_editmap_envdef = -sm_editmap_libs = -ldb-4.8 -lldap -llber +sm_editmap_libs = -ldb -lldap -llber sm_enable_auth = yes sm_enable_bind = no sm_enable_hesiod = no @@ -205,24 +205,24 @@ sm_mail_local_libs = -lldap -llber -llockfile sm_mailstats_envdef = sm_mailstats_libs = -lldap -llber sm_makemap_envdef = -sm_makemap_libs = -ldb-4.8 -lldap -llber +sm_makemap_libs = -ldb -lldap -llber sm_mapdef = -DSOCKETMAP -DMAP_REGEX -DNEWDB -DNIS -DNISPLUS -DLDAPMAP -sm_newdb_lib = -ldb-4.8 +sm_newdb_lib = -ldb sm_praliases_envdef = -sm_praliases_libs = -ldb-4.8 -lldap -llber +sm_praliases_libs = -ldb -lldap -llber sm_recommends = sm_revision = -2 sm_rmail_envdef = sm_rmail_libs = -lldap -llber sm_sendmail_envdef = -D_PATH_SENDMAILPID=\"/var/run/sendmail/mta/sendmail.pid\" -DIP_SRCROUTE=1 -DLDAP_REFERRALS -D_FFR_LDAP_URI -D_FFR_LDAP_SETVERSION -DLDAP_DEPRECATED -DTCPWRAPPERS -DSASL -I/usr/include/sasl -DSTARTTLS -D_FFR_QUEUE_SCHED_DBG -D_FFR_SKIP_DOMAINS -D_FFR_GROUPREADABLEAUTHINFOFILE -D_FFR_DAEMON_NETUNIX -D_FFR_NO_PIPE -D_FFR_SHM_STATUS -D_FFR_RHS -D_FFR_MAIL_MACRO -D_FFR_QUEUEDELAY=1 -D_FFR_BADRCPT_SHUTDOWN -D_FFR_RESET_MACRO_GLOBALS -D_FFR_TLS_1 -D_FFR_DEAL_WITH_ERROR_SSL -sm_sendmail_libs = -ldb-4.8 -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypto -lssl +sm_sendmail_libs = -ldb -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypto -lssl sm_smrsh_envdef = -DCMDDIR=\"/etc/mail/smrsh\" -DPATH=\"/usr/bin:/bin\" sm_smrsh_libs = -lldap -llber sm_suggests = , sasl2-bin, libsasl2-modules, openssl sm_time = 22:21:32 sm_utc = +0000 sm_vacation_envdef = -sm_vacation_libs = -ldb-4.8 -lldap -llber +sm_vacation_libs = -ldb -lldap -llber sm_version = 8.14.4 sm_version_beta = sm_version_major = 8.14 diff --git a/debian/cf/debian/autoconf.m4 b/debian/cf/debian/autoconf.m4 index e75004d..8f8d208 100644 --- a/debian/cf/debian/autoconf.m4 +++ b/debian/cf/debian/autoconf.m4 @@ -38,7 +38,7 @@ define(`sm_version_math', `527876')dnl define(`sm_enable_regex', `yes')dnl define(`sm_enable_ndbm', `no')dnl define(`sm_enable_newdb', `yes')dnl -define(`sm_newdb_lib', `-ldb-4.8')dnl +define(`sm_newdb_lib', `-ldb')dnl define(`sm_enable_nis', `yes')dnl define(`sm_enable_nisplus', `yes')dnl define(`sm_enable_ldap', `yes')dnl diff --git a/debian/changelog b/debian/changelog index 41a1021..34f7e46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +sendmail (8.14.4-2.1) unstable; urgency=low + + * Non-maintainer upload + * Depend and use generic -ldb to allow binNMUs (Closes: #621447) + * Hard code fcntl style locking to mail.local (Closes: #513298) + + -- Ondřej Surý <ondrej@debian.org> Wed, 09 May 2012 10:30:18 +0200 + sendmail (8.14.4-2) unstable; urgency=high * Actually get the DHCP config files installed :( Closes: #602252 diff --git a/debian/configure b/debian/configure index ccfbeba..e98b87a 100644 --- a/debian/configure +++ b/debian/configure @@ -5423,13 +5423,13 @@ $as_echo "$as_me: WARNING: NEWDB version unknown, omitting support!" >&2;} if test $sm_have_newdb != no; then sm_old_libs="$LIBS"; if test $sm_newdb_lib = db4; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_create in -ldb-4.8" >&5 -$as_echo_n "checking for db_create in -ldb-4.8... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_create in -ldb" >&5 +$as_echo_n "checking for db_create in -ldb... " >&6; } if test "${ac_cv_lib_db_4_8_db_create+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-ldb-4.8 $LIBS" +LIBS="-ldb $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -5460,7 +5460,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_db_4_8_db_create" >&5 $as_echo "$ac_cv_lib_db_4_8_db_create" >&6; } if test "x$ac_cv_lib_db_4_8_db_create" = x""yes; then : - sm_newdb_lib='db-4.8' + sm_newdb_lib='db' else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for db_create in -ldb-4.7" >&5 @@ -6057,53 +6057,6 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : - : -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbopen in -ldb" >&5 -$as_echo_n "checking for dbopen in -ldb... " >&6; } -if test "${ac_cv_lib_db_dbopen+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldb $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char dbopen (); -int -main () -{ -return dbopen (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_db_dbopen=yes -else - ac_cv_lib_db_dbopen=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_db_dbopen" >&5 -$as_echo "$ac_cv_lib_db_dbopen" >&6; } -if test "x$ac_cv_lib_db_dbopen" = x""yes; then : - sm_newdb_lib='db' -else - sm_have_newdb=no -fi - -fi fi; LIBS="$sm_old_libs"; diff --git a/debian/configure.ac b/debian/configure.ac index 91e8d49..0e3a4d3 100644 --- a/debian/configure.ac +++ b/debian/configure.ac @@ -929,22 +929,8 @@ if test $sm_enable_newdb != no; then if test $sm_have_newdb != no; then sm_old_libs="$LIBS"; if test $sm_newdb_lib = db4; then - AC_CHECK_LIB(db-4.8, db_create, [sm_newdb_lib='db-4.8'], [ - AC_CHECK_LIB(db-4.7, db_create, [sm_newdb_lib='db-4.7'], [ - AC_CHECK_LIB(db-4.6, db_create, [sm_newdb_lib='db-4.6'], [ - AC_CHECK_LIB(db-4.5, db_create, [sm_newdb_lib='db-4.5'], [ - AC_CHECK_LIB(db-4.4, db_create, [sm_newdb_lib='db-4.4'], [ - AC_CHECK_LIB(db-4.3, db_create, [sm_newdb_lib='db-4.3'], [ - AC_CHECK_LIB(db-4.2, db_create_4002, [sm_newdb_lib='db-4.2'], [ AC_CHECK_LIB(db, db_create, [sm_newdb_lib='db'], [ sm_have_newdb=no])dnl - ])dnl - ])dnl - ])dnl - ])dnl - ])dnl - ])dnl - ])dnl elif test $sm_newdb_lib = db3; then AC_CHECK_LIB($sm_newdb_lib, db_create, [:], [ AC_CHECK_LIB(db, db_create, @@ -961,12 +947,6 @@ if test $sm_enable_newdb != no; then [sm_newdb_lib='db'], [sm_have_newdb=no])dnl ])dnl fi; - if test $sm_newdb_lib = db; then - AC_CHECK_LIB($sm_newdb_lib, dbopen, [:], [ - AC_CHECK_LIB(db, dbopen, - [sm_newdb_lib='db'], [sm_have_newdb=no])dnl - ])dnl - fi; LIBS="$sm_old_libs"; if test $sm_have_newdb != yes; then diff --git a/debian/control b/debian/control index a508d45..590cfa0 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Section: mail Maintainer: Richard A Nelson (Rick) <cowboy@debian.org> Standards-Version: 3.8.3 Build-Depends-Indep: groff, bsdmainutils -Build-Depends: make (>> 3.79.1-14), m4, cdbs, quilt, patchutils, dh-buildinfo, debhelper (>= 5), linux-libc-dev (>= 2.6.21-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], groff, bsdmainutils , libdb4.8-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev +Build-Depends: make (>> 3.79.1-14), m4, cdbs, quilt, patchutils, dh-buildinfo, debhelper (>= 5), linux-libc-dev (>= 2.6.21-3) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], groff, bsdmainutils , libdb-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev Build-Conflicts: libbind-dev, bind-dev, fakeroot (<< 0.4.5) Homepage: http://www.sendmail.org diff --git a/debian/examples/Makefile b/debian/examples/Makefile index 2a47027..caf39fe 100644 --- a/debian/examples/Makefile +++ b/debian/examples/Makefile @@ -187,7 +187,7 @@ psdir = ${docdir} sbindir = /usr/sbin sharedstatedir = /usr/com sm_auth_lib = 2 -sm_badepends = , libdb4.8-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev +sm_badepends = , libdb-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev sm_build_arch = amd64 sm_custom = sm_custom_s = @@ -197,7 +197,7 @@ sm_depends = sm_dist_name = Debian sm_dist_vers = squeeze/sid sm_editmap_envdef = -sm_editmap_libs = -ldb-4.8 -lldap -llber +sm_editmap_libs = -ldb -lldap -llber sm_enable_auth = yes sm_enable_bind = no sm_enable_hesiod = no @@ -237,24 +237,24 @@ sm_mail_local_libs = -lldap -llber -llockfile sm_mailstats_envdef = sm_mailstats_libs = -lldap -llber sm_makemap_envdef = -sm_makemap_libs = -ldb-4.8 -lldap -llber +sm_makemap_libs = -ldb -lldap -llber sm_mapdef = -DSOCKETMAP -DMAP_REGEX -DNEWDB -DNIS -DNISPLUS -DLDAPMAP -sm_newdb_lib = -ldb-4.8 +sm_newdb_lib = -ldb sm_praliases_envdef = -sm_praliases_libs = -ldb-4.8 -lldap -llber +sm_praliases_libs = -ldb -lldap -llber sm_recommends = sm_revision = -2 sm_rmail_envdef = sm_rmail_libs = -lldap -llber sm_sendmail_envdef = -D_PATH_SENDMAILPID=\"/var/run/sendmail/mta/sendmail.pid\" -DIP_SRCROUTE=1 -DLDAP_REFERRALS -D_FFR_LDAP_URI -D_FFR_LDAP_SETVERSION -DLDAP_DEPRECATED -DTCPWRAPPERS -DSASL -I/usr/include/sasl -DSTARTTLS -D_FFR_QUEUE_SCHED_DBG -D_FFR_SKIP_DOMAINS -D_FFR_GROUPREADABLEAUTHINFOFILE -D_FFR_DAEMON_NETUNIX -D_FFR_NO_PIPE -D_FFR_SHM_STATUS -D_FFR_RHS -D_FFR_MAIL_MACRO -D_FFR_QUEUEDELAY=1 -D_FFR_BADRCPT_SHUTDOWN -D_FFR_RESET_MACRO_GLOBALS -D_FFR_TLS_1 -D_FFR_DEAL_WITH_ERROR_SSL -sm_sendmail_libs = -ldb-4.8 -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypto -lssl +sm_sendmail_libs = -ldb -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypto -lssl sm_smrsh_envdef = -DCMDDIR=\"/etc/mail/smrsh\" -DPATH=\"/usr/bin:/bin\" sm_smrsh_libs = -lldap -llber sm_suggests = , sasl2-bin, libsasl2-modules, openssl sm_time = 22:21:32 sm_utc = +0000 sm_vacation_envdef = -sm_vacation_libs = -ldb-4.8 -lldap -llber +sm_vacation_libs = -ldb -lldap -llber sm_version = 8.14.4 sm_version_beta = sm_version_major = 8.14 diff --git a/debian/local/Makefile b/debian/local/Makefile index 2cab4ca..7e780be 100644 --- a/debian/local/Makefile +++ b/debian/local/Makefile @@ -200,7 +200,7 @@ psdir = ${docdir} sbindir = /usr/sbin sharedstatedir = /usr/com sm_auth_lib = 2 -sm_badepends = , libdb4.8-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev +sm_badepends = , libdb-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev sm_build_arch = amd64 sm_custom = sm_custom_s = @@ -210,7 +210,7 @@ sm_depends = sm_dist_name = Debian sm_dist_vers = squeeze/sid sm_editmap_envdef = -sm_editmap_libs = -ldb-4.8 -lldap -llber +sm_editmap_libs = -ldb -lldap -llber sm_enable_auth = yes sm_enable_bind = no sm_enable_hesiod = no @@ -250,24 +250,24 @@ sm_mail_local_libs = -lldap -llber -llockfile sm_mailstats_envdef = sm_mailstats_libs = -lldap -llber sm_makemap_envdef = -sm_makemap_libs = -ldb-4.8 -lldap -llber +sm_makemap_libs = -ldb -lldap -llber sm_mapdef = -DSOCKETMAP -DMAP_REGEX -DNEWDB -DNIS -DNISPLUS -DLDAPMAP -sm_newdb_lib = -ldb-4.8 +sm_newdb_lib = -ldb sm_praliases_envdef = -sm_praliases_libs = -ldb-4.8 -lldap -llber +sm_praliases_libs = -ldb -lldap -llber sm_recommends = sm_revision = -2 sm_rmail_envdef = sm_rmail_libs = -lldap -llber sm_sendmail_envdef = -D_PATH_SENDMAILPID=\"/var/run/sendmail/mta/sendmail.pid\" -DIP_SRCROUTE=1 -DLDAP_REFERRALS -D_FFR_LDAP_URI -D_FFR_LDAP_SETVERSION -DLDAP_DEPRECATED -DTCPWRAPPERS -DSASL -I/usr/include/sasl -DSTARTTLS -D_FFR_QUEUE_SCHED_DBG -D_FFR_SKIP_DOMAINS -D_FFR_GROUPREADABLEAUTHINFOFILE -D_FFR_DAEMON_NETUNIX -D_FFR_NO_PIPE -D_FFR_SHM_STATUS -D_FFR_RHS -D_FFR_MAIL_MACRO -D_FFR_QUEUEDELAY=1 -D_FFR_BADRCPT_SHUTDOWN -D_FFR_RESET_MACRO_GLOBALS -D_FFR_TLS_1 -D_FFR_DEAL_WITH_ERROR_SSL -sm_sendmail_libs = -ldb-4.8 -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypto -lssl +sm_sendmail_libs = -ldb -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypto -lssl sm_smrsh_envdef = -DCMDDIR=\"/etc/mail/smrsh\" -DPATH=\"/usr/bin:/bin\" sm_smrsh_libs = -lldap -llber sm_suggests = , sasl2-bin, libsasl2-modules, openssl sm_time = 22:21:32 sm_utc = +0000 sm_vacation_envdef = -sm_vacation_libs = -ldb-4.8 -lldap -llber +sm_vacation_libs = -ldb -lldap -llber sm_version = 8.14.4 sm_version_beta = sm_version_major = 8.14 diff --git a/debian/patches/8.14/8.14.4/hard-code-lockf.patch b/debian/patches/8.14/8.14.4/hard-code-lockf.patch new file mode 100644 index 0000000..e0cf213 --- /dev/null +++ b/debian/patches/8.14/8.14.4/hard-code-lockf.patch @@ -0,0 +1,54 @@ +diff -urNap sendmail-8.14.4.orig/mail.local/mail.local.c sendmail-8.14.4/mail.local/mail.local.c +--- sendmail-8.14.4.orig/mail.local/mail.local.c 2008-02-19 08:13:30.000000000 +0100 ++++ sendmail-8.14.4/mail.local/mail.local.c 2012-05-09 10:27:45.201528350 +0200 +@@ -100,22 +100,6 @@ SM_IDSTR(id, "@(#)$Id: mail.local.c,v 8. + #define REALLOC(ptr, size) (((ptr) == NULL) ? malloc(size) : realloc(ptr, size)) + + /* +-** If you don't have flock, you could try using lockf instead. +-*/ +- +-#ifdef LDA_USE_LOCKF +-# define flock(a, b) lockf(a, b, 0) +-# ifdef LOCK_EX +-# undef LOCK_EX +-# endif /* LOCK_EX */ +-# define LOCK_EX F_LOCK +-#endif /* LDA_USE_LOCKF */ +- +-#ifndef LOCK_EX +-# include <sys/file.h> +-#endif /* ! LOCK_EX */ +- +-/* + ** If you don't have setreuid, and you have saved uids, and you have + ** a seteuid() call that doesn't try to emulate using setuid(), then + ** you can try defining LDA_USE_SETEUID. +@@ -1095,9 +1079,6 @@ deliver(fd, name) + ** can't unlink it. Historically, binmail set the owner/group at + ** each mail delivery. We no longer do this, assuming that if the + ** ownership or permissions were changed there was a reason. +- ** +- ** XXX +- ** open(2) should support flock'ing the file. + */ + + tryagain: +@@ -1265,7 +1246,7 @@ tryagain: + #endif /* 0 */ + + /* Wait until we can get a lock on the file. */ +- if (flock(mbfd, LOCK_EX) < 0) ++ if (lockf(mbfd, F_LOCK, 0) < 0) + { + mailerr("450 4.2.0", "%s: %s", path, sm_errstring(errno)); + goto err1; +@@ -1378,7 +1359,7 @@ err0: (void) setreuid(0, 0); + mbfd = open(path, O_WRONLY, 0); + if (mbfd < 0 || + cursize == 0 +- || flock(mbfd, LOCK_EX) < 0 || ++ || lockf(mbfd, F_LOCK, 0) < 0 || + fstat(mbfd, &sb) < 0 || + sb.st_size != cursize || + sb.st_nlink != 1 || diff --git a/debian/patches/8.14/8.14.4/series b/debian/patches/8.14/8.14.4/series index 6dd2ac5..4f20b74 100644 --- a/debian/patches/8.14/8.14.4/series +++ b/debian/patches/8.14/8.14.4/series @@ -8,3 +8,4 @@ mailer_cyrus mailer_fax maxseq rmail.odi +hard-code-lockf.patch diff --git a/debian/sensible_mda/Makefile b/debian/sensible_mda/Makefile index a368c88..9c4900b 100644 --- a/debian/sensible_mda/Makefile +++ b/debian/sensible_mda/Makefile @@ -197,7 +197,7 @@ psdir = ${docdir} sbindir = /usr/sbin sharedstatedir = /usr/com sm_auth_lib = 2 -sm_badepends = , libdb4.8-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev +sm_badepends = , libdb-dev, libldap2-dev, libwrap0-dev, liblockfile-dev, libsasl2-dev, libssl-dev sm_build_arch = amd64 sm_custom = sm_custom_s = @@ -207,7 +207,7 @@ sm_depends = sm_dist_name = Debian sm_dist_vers = squeeze/sid sm_editmap_envdef = -sm_editmap_libs = -ldb-4.8 -lldap -llber +sm_editmap_libs = -ldb -lldap -llber sm_enable_auth = yes sm_enable_bind = no sm_enable_hesiod = no @@ -247,24 +247,24 @@ sm_mail_local_libs = -lldap -llber -llockfile sm_mailstats_envdef = sm_mailstats_libs = -lldap -llber sm_makemap_envdef = -sm_makemap_libs = -ldb-4.8 -lldap -llber +sm_makemap_libs = -ldb -lldap -llber sm_mapdef = -DSOCKETMAP -DMAP_REGEX -DNEWDB -DNIS -DNISPLUS -DLDAPMAP -sm_newdb_lib = -ldb-4.8 +sm_newdb_lib = -ldb sm_praliases_envdef = -sm_praliases_libs = -ldb-4.8 -lldap -llber +sm_praliases_libs = -ldb -lldap -llber sm_recommends = sm_revision = -2 sm_rmail_envdef = sm_rmail_libs = -lldap -llber sm_sendmail_envdef = -D_PATH_SENDMAILPID=\"/var/run/sendmail/mta/sendmail.pid\" -DIP_SRCROUTE=1 -DLDAP_REFERRALS -D_FFR_LDAP_URI -D_FFR_LDAP_SETVERSION -DLDAP_DEPRECATED -DTCPWRAPPERS -DSASL -I/usr/include/sasl -DSTARTTLS -D_FFR_QUEUE_SCHED_DBG -D_FFR_SKIP_DOMAINS -D_FFR_GROUPREADABLEAUTHINFOFILE -D_FFR_DAEMON_NETUNIX -D_FFR_NO_PIPE -D_FFR_SHM_STATUS -D_FFR_RHS -D_FFR_MAIL_MACRO -D_FFR_QUEUEDELAY=1 -D_FFR_BADRCPT_SHUTDOWN -D_FFR_RESET_MACRO_GLOBALS -D_FFR_TLS_1 -D_FFR_DEAL_WITH_ERROR_SSL -sm_sendmail_libs = -ldb-4.8 -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypto -lssl +sm_sendmail_libs = -ldb -lnsl -lldap -llber -lresolv -lwrap -lsasl2 -lcrypto -lssl sm_smrsh_envdef = -DCMDDIR=\"/etc/mail/smrsh\" -DPATH=\"/usr/bin:/bin\" sm_smrsh_libs = -lldap -llber sm_suggests = , sasl2-bin, libsasl2-modules, openssl sm_time = 22:21:32 sm_utc = +0000 sm_vacation_envdef = -sm_vacation_libs = -ldb-4.8 -lldap -llber +sm_vacation_libs = -ldb -lldap -llber sm_version = 8.14.4 sm_version_beta = sm_version_major = 8.14 |