diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2007-03-07 15:20:26 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2007-03-07 15:20:26 +0000 |
| commit | aeb514f96f04a9fb84291873df2f06d2441ab9d8 (patch) | |
| tree | 577ebae47d57dbab0e85c1f223d08f6eac8384e3 /mail/dcc-dccd/files/patch-homedir::Makefile.in | |
| parent | 6e75038caa52d9f343f82926bf03b1c3b204d2a7 (diff) | |
Notes
Diffstat (limited to 'mail/dcc-dccd/files/patch-homedir::Makefile.in')
| -rw-r--r-- | mail/dcc-dccd/files/patch-homedir::Makefile.in | 66 |
1 files changed, 31 insertions, 35 deletions
diff --git a/mail/dcc-dccd/files/patch-homedir::Makefile.in b/mail/dcc-dccd/files/patch-homedir::Makefile.in index 86224591e1e9..e10c4a51f0f8 100644 --- a/mail/dcc-dccd/files/patch-homedir::Makefile.in +++ b/mail/dcc-dccd/files/patch-homedir::Makefile.in @@ -1,37 +1,33 @@ ---- homedir/Makefile.in.orig Thu Sep 8 09:57:07 2005 -+++ homedir/Makefile.in Wed Mar 1 07:39:11 2006 -@@ -51,15 +51,11 @@ - $(HINSTALL) -m 755 -d $(INST_HOMEDIR); fi - if test ! -d $(INST_HOMEDIR)/log; then \ - $(HINSTALL) -m 710 -d $(INST_HOMEDIR)/log; fi -- if test -s $(INST_HOMEDIR)/dcc_conf; then \ -- sh make-dcc_conf -h $(INST_HOMEDIR); \ -- else \ -- $(HINSTALL) -m 644 dcc_conf $(INST_HOMEDIR)/dcc_conf; \ +--- homedir/Makefile.in.orig Sun Feb 11 09:05:45 2007 ++++ homedir/Makefile.in Sun Feb 11 09:07:59 2007 +@@ -57,23 +57,19 @@ + $(HINST) -m 755 -d $(DIR); fi + if test ! -d $(DIR)/log; then\ + $(HINST) -m 710 -d $(DIR)/log; fi +- if test -s $(DIR)/dcc_conf; then\ +- sh make-dcc_conf -h $(DIR);\ +- else\ +- $(HINST) -m 644 dcc_conf $(DIR)/dcc_conf;\ - fi -+ $(HINSTALL) -m 644 dcc_conf $(INST_HOMEDIR)/dcc_conf.dist; \ - for nm in flod grey_flod whitelist grey_whitelist \ - whiteclnt whitecommon; do \ - if test ! -f $(INST_HOMEDIR)/$$nm; then \ -- $(HINSTALL) -m 644 $$nm $(INST_HOMEDIR)/$$nm; fi; \ -+ $(HINSTALL) -m 644 $$nm $(INST_HOMEDIR)/$$nm.dist; fi; \ - done - @if test ! -f $(INST_HOMEDIR)/ids \ - -a ! -f $(INST_HOMEDIR)/map \ -@@ -67,11 +63,11 @@ - PASSWD1=`ps|cksum|tr ' ' 'xy'`; \ - PASSWD2=`ps|cksum|tr ' ' 'yx'`; \ - umask 077; \ -- sed -e "s/secret1/$$PASSWD1/" map.txt >$(INST_HOMEDIR)/map.txt; \ -+ sed -e "s/secret1/$$PASSWD1/" map.txt >$(INST_HOMEDIR)/map.txt.dist; \ - sed -e "s/secret1/$$PASSWD1/" -e "s/secret2/$$PASSWD2/" ids \ -- >$(INST_HOMEDIR)/ids; \ -+ >$(INST_HOMEDIR)/ids.dist; \ - ${DEPTH}/cdcc/cdcc -qh $(INST_HOMEDIR) 'new map; load -' \ -- <$(INST_HOMEDIR)/map.txt >/dev/null; \ -- set +e; chown $(DCC_SUID) $(INST_HOMEDIR)/map.txt \ -- $(INST_HOMEDIR)/map $(INST_HOMEDIR)/ids; \ -+ <$(INST_HOMEDIR)/map.txt.dist >/dev/null; \ -+ set +e; chown $(DCC_SUID) $(INST_HOMEDIR)/map.txt.dist \ -+ $(INST_HOMEDIR)/map $(INST_HOMEDIR)/ids.dist; \ ++ $(INSTALL) -m 644 dcc_conf $(DIR)/dcc_conf.dist; \ + for nm in flod grey_flod whitelist grey_whitelist\ + whiteclnt whitecommon; do\ + if test ! -f $(DIR)/$$nm; then\ +- $(HINST) -m 644 $$nm $(DIR)/$$nm; fi; done ++ $(INSTALL) -m 644 $$nm $(DIR)/$$nm.dist; fi; done + if test ! -f $(DIR)/ids -a ! -f $(DIR)/map -a ! -f $(DIR)/map.txt; then\ + umask 077; PASSWD1=`$(RSTRING)`; PASSWD2=`$(RSTRING)`;\ +- sed -e "s/secret1/$$PASSWD1/" map.txt >$(DIR)/map.txt;\ ++ sed -e "s/secret1/$$PASSWD1/" map.txt >$(DIR)/map.txt.dist;\ + sed -e "s/secret1/$$PASSWD1/" -e "s/secret2/$$PASSWD2/" ids\ +- >$(DIR)/ids;\ +- ${DEPTH}/cdcc/cdcc -qh $(DIR) 'new map; load $(DIR)/map.txt';\ +- set +e; chown $(DCC_SUID) $(DIR)/map.txt\ +- $(DIR)/map $(DIR)/ids;\ ++ >$(DIR)/ids.dist;\ ++ ${DEPTH}/cdcc/cdcc -qh $(DIR) 'new map; load $(DIR)/map.txt.dist';\ ++ set +e; chown $(DCC_SUID) $(DIR)/map.txt.dist\ ++ $(DIR)/map $(DIR)/ids.dist;\ fi + + deinstall: |