DKIM: fix crash in signing. Bug 3116

[exim.git] / src / scripts / MakeLinks

diff --git a/src/scripts/MakeLinks b/src/scripts/MakeLinks
index 09d18b63cf89a5263e6effa8cb9f5b9ec244010c..d07f81e98ae8ea1f51e90ed55d588d46c8eac36c 100755 (executable)
--- a/src/scripts/MakeLinks
+++ b/src/scripts/MakeLinks
@@ -32,7 +32,7 @@ d="lookups"
 mkdir $d
 cd $d
 # Makefile is generated
-for f in README cdb.c dbmdb.c dnsdb.c dsearch.c ibase.c json.c ldap.h ldap.c \
+for f in README cdb.c dbmdb.c dnsdb.c dsearch.c ibase.c json.c ldap.c \
   lmdb.c lsearch.c mysql.c nis.c nisplus.c oracle.c passwd.c \
   pgsql.c readsock.c redis.c spf.c sqlite.c testdb.c whoson.c \
   lf_functions.h lf_check_file.c lf_quote.c lf_sqlperform.c
@@ -79,7 +79,7 @@ mkdir $d
 cd $d
 # Makefile is generated
 for f in README call_pam.c call_pwcheck.c \
-  call_radius.c check_serv_cond.c cyrus_sasl.c cyrus_sasl.h gsasl.c \
+  check_serv_cond.c cyrus_sasl.c cyrus_sasl.h gsasl.c \
   gsasl.h get_data.c get_no64_data.c heimdal_gssapi.c heimdal_gssapi.h \
   cram_md5.c cram_md5.h plaintext.c plaintext.h \
   pwcheck.c pwcheck.h auth-spa.c auth-spa.h dovecot.c dovecot.h spa.c \
@@ -90,13 +90,26 @@ done
 cd ..
 
 # miscellaneous modules
+# Note that the file in the miscmods/pdkim/ source subdir get linked to the 
+# destination miscmods/ dir
 d="miscmods"
 mkdir $d
 cd $d
 # Makefile is generated
-for f in spf.c spf.h
+for f in dummy.c \
+       arc.c arc_api.h \
+       dkim.c dkim_transport.c dkim.h dkim_api.h \
+       pdkim/crypt_ver.h pdkim/pdkim.c pdkim/pdkim.h \
+       pdkim/pdkim_hash.h pdkim/signing.c pdkim/signing.h \
+       dmarc.c dmarc.h dmarc_api.h \
+       exim_filter.c exim_filter_api.h \
+       pam.c pam_api.h \
+       perl.c perl_api.h \
+       radius.c radius_api.h \
+       sieve_filter.c sieve_filter_api.h \
+       spf.c spf.h spf_api.h
 do
-  ln -s ../../src/$d/$f $f
+  ln -s ../../src/$d/$f `basename $f`
 done
 cd ..
 
@@ -110,17 +123,6 @@ do
 done
 cd ..
 
-# Likewise for the code for the PDKIM library
-d="pdkim"
-mkdir $d
-cd $d
-for f in README Makefile crypt_ver.h pdkim.c \
-  pdkim.h hash.c hash.h signing.c signing.h blob.h
-do
-  ln -s ../../src/$d/$f $f
-done
-cd ..
-
 # The basic source files for Exim and utilities. NB local_scan.h gets linked,
 # but local_scan.c does not, because its location is taken from the build-time
 # configuration. Likewise for the os.c file, which gets build dynamically.
@@ -132,15 +134,14 @@ for f in blob.h dbfunctions.h exim.h functions.h globals.h \
   \
   acl.c buildconfig.c base64.c child.c crypt16.c daemon.c dbfn.c debug.c \
   deliver.c directory.c dns.c dnsbl.c drtables.c dummies.c enq.c exim.c \
-  exim_dbmbuild.c exim_dbutil.c exim_lock.c expand.c filter.c filtertest.c \
+  exim_dbmbuild.c exim_dbutil.c exim_lock.c expand.c filtertest.c \
   globals.c hash.c header.c host.c host_address.c ip.c log.c lss.c match.c md5.c moan.c \
-  parse.c perl.c priv.c proxy.c queue.c rda.c readconf.c receive.c retry.c rewrite.c \
+  parse.c priv.c proxy.c queue.c rda.c readconf.c receive.c retry.c rewrite.c \
   regex_cache.c rfc2047.c route.c search.c setenv.c environment.c \
-  sieve.c smtp_in.c smtp_out.c spool_in.c spool_out.c std-crypto.c store.c \
+  smtp_in.c smtp_out.c spool_in.c spool_out.c std-crypto.c store.c \
   string.c tls.c tlscert-gnu.c tlscert-openssl.c tls-cipher-stdname.c \
   tls-gnu.c tls-openssl.c \
   tod.c transport.c tree.c verify.c version.c xtextencode.c \
-  dkim.c dkim.h dkim_transport.c dmarc.c dmarc.h \
   valgrind.h memcheck.h \
   macro_predef.c macro_predef.h
 do
@@ -154,8 +155,8 @@ do
 done
 
 # EXPERIMENTAL_*
-for f in  arc.c bmi_spam.c bmi_spam.h dcc.c dcc.h dane.c dane-openssl.c \
-  danessl.h imap_utf7.c spf.c spf.h utf8.c xclient.c
+for f in  bmi_spam.c bmi_spam.h dcc.c dcc.h dane.c dane-openssl.c \
+  danessl.h imap_utf7.c utf8.c xclient.c
 do
   ln -s ../src/$f $f
 done