Pullup ticket #3590 - requested by spz mail/majordomo: fix compatibility with "lang/perl5" Revisions pulled up: - mail/majordomo/Makefile 1.44 - mail/majordomo/distinfo 1.16 - mail/majordomo/patches/patch-ad 1.3 - mail/majordomo/patches/patch-ai 1.5 - mail/majordomo/patches/patch-aj 1.3 - mail/majordomo/patches/patch-an 1.3 --- Module Name: pkgsrc Committed By: spz Date: Fri Oct 28 06:16:12 UTC 2011 Modified Files: pkgsrc/mail/majordomo: Makefile distinfo pkgsrc/mail/majordomo/patches: patch-ad patch-ai patch-aj patch-an Log Message: perl 5.14 adjustment: drop using ctime.pl just for a list of monthsdiff -r1.43 -r1.43.2.1 pkgsrc/mail/majordomo/Makefile
(tron)
@@ -1,156 +1,156 @@ | @@ -1,156 +1,156 @@ | |||
1 | # $NetBSD: Makefile,v 1.43 2011/08/27 15:47:42 schnoebe Exp $ | 1 | # $NetBSD: Makefile,v 1.43.2.1 2011/11/02 22:55:24 tron Exp $ | |
2 | 2 | |||
3 | DISTNAME= majordomo-1.94.5 | 3 | DISTNAME= majordomo-1.94.5 | |
4 | PKGREVISION= 13 | 4 | PKGREVISION= 14 | |
5 | CATEGORIES= mail | 5 | CATEGORIES= mail | |
6 | MASTER_SITES= ftp://ftp.sgi.com/other/majordomo/1.94.5/ \ | 6 | MASTER_SITES= ftp://ftp.sgi.com/other/majordomo/1.94.5/ \ | |
7 | ftp://ftp-europe.sgi.com/other/majordomo/1.94.5/ | 7 | ftp://ftp-europe.sgi.com/other/majordomo/1.94.5/ | |
8 | EXTRACT_SUFX= .tgz | 8 | EXTRACT_SUFX= .tgz | |
9 | 9 | |||
10 | MAINTAINER= spz@NetBSD.org | 10 | MAINTAINER= spz@NetBSD.org | |
11 | HOMEPAGE= http://www.greatcircle.com/majordomo/ | 11 | HOMEPAGE= http://www.greatcircle.com/majordomo/ | |
12 | COMMENT= The Majordomo mailing list manager | 12 | COMMENT= The Majordomo mailing list manager | |
13 | 13 | |||
14 | LICENSE= majordomo-license | 14 | LICENSE= majordomo-license | |
15 | 15 | |||
16 | PKG_DESTDIR_SUPPORT= destdir | 16 | PKG_DESTDIR_SUPPORT= destdir | |
17 | MAKE_JOBS_SAFE= NO | 17 | MAKE_JOBS_SAFE= NO | |
18 | 18 | |||
19 | RESTRICTED= No distribution of modified binary packages to the general public | 19 | RESTRICTED= No distribution of modified binary packages to the general public | |
20 | NO_BIN_ON_FTP= ${RESTRICTED} | 20 | NO_BIN_ON_FTP= ${RESTRICTED} | |
21 | NO_BIN_ON_CDROM= ${RESTRICTED} | 21 | NO_BIN_ON_CDROM= ${RESTRICTED} | |
22 | 22 | |||
23 | CONFLICTS+= bounce-[0-9]* | 23 | CONFLICTS+= bounce-[0-9]* | |
24 | 24 | |||
25 | USE_TOOLS+= perl:run | 25 | USE_TOOLS+= perl:run | |
26 | 26 | |||
27 | BUILD_TARGET= wrapper | 27 | BUILD_TARGET= wrapper | |
28 | INSTALL_TARGET= install install-wrapper | 28 | INSTALL_TARGET= install install-wrapper | |
29 | MAKE_FILE= Makefile.netbsd | 29 | MAKE_FILE= Makefile.netbsd | |
30 | 30 | |||
31 | .include "../../mk/bsd.prefs.mk" | 31 | .include "../../mk/bsd.prefs.mk" | |
32 | 32 | |||
33 | PKG_SYSCONFSUBDIR= majordomo | 33 | PKG_SYSCONFSUBDIR= majordomo | |
34 | CONF_FILES+= ${EXAMPLEDIR}/aliases.majordomo ${PKG_SYSCONFDIR}/aliases | 34 | CONF_FILES+= ${EXAMPLEDIR}/aliases.majordomo ${PKG_SYSCONFDIR}/aliases | |
35 | CONF_FILES+= ${EXAMPLEDIR}/majordomo.cf ${MAJORDOMO_CF} | 35 | CONF_FILES+= ${EXAMPLEDIR}/majordomo.cf ${MAJORDOMO_CF} | |
36 | 36 | |||
37 | MAJORDOMO_HOMEDIR?= ${VARBASE}/majordomo | 37 | MAJORDOMO_HOMEDIR?= ${VARBASE}/majordomo | |
38 | MAJORDOMO_TMPDIR?= ${VARBASE}/majordomo/tmp | 38 | MAJORDOMO_TMPDIR?= ${VARBASE}/majordomo/tmp | |
39 | MAJORDOMO_CF?= ${PKG_SYSCONFDIR}/majordomo.cf | 39 | MAJORDOMO_CF?= ${PKG_SYSCONFDIR}/majordomo.cf | |
40 | MAJORDOMO_USER?= majordom | 40 | MAJORDOMO_USER?= majordom | |
41 | MAJORDOMO_GROUP?= majordom | 41 | MAJORDOMO_GROUP?= majordom | |
42 | 42 | |||
43 | PKG_GECOS.${MAJORDOMO_USER}= Majordomo Mailinglist Manager | 43 | PKG_GECOS.${MAJORDOMO_USER}= Majordomo Mailinglist Manager | |
44 | PKG_HOME.${MAJORDOMO_USER}= ${MAJORDOMO_HOMEDIR} | 44 | PKG_HOME.${MAJORDOMO_USER}= ${MAJORDOMO_HOMEDIR} | |
45 | 45 | |||
46 | PKG_GROUPS_VARS+= MAJORDOMO_GROUP | 46 | PKG_GROUPS_VARS+= MAJORDOMO_GROUP | |
47 | PKG_USERS_VARS+= MAJORDOMO_USER | 47 | PKG_USERS_VARS+= MAJORDOMO_USER | |
48 | 48 | |||
49 | MESSAGE_SUBST+= HOME=${MAJORDOMO_HOMEDIR} \ | 49 | MESSAGE_SUBST+= HOME=${MAJORDOMO_HOMEDIR} \ | |
50 | MAJORDOMO_CF=${MAJORDOMO_CF} \ | 50 | MAJORDOMO_CF=${MAJORDOMO_CF} \ | |
51 | MAJORDOMO_USER=${MAJORDOMO_USER} \ | 51 | MAJORDOMO_USER=${MAJORDOMO_USER} \ | |
52 | MAJORDOMO_GROUP=${MAJORDOMO_GROUP} | 52 | MAJORDOMO_GROUP=${MAJORDOMO_GROUP} | |
53 | 53 | |||
54 | DOCDIR= ${PREFIX}/share/doc/majordomo | 54 | DOCDIR= ${PREFIX}/share/doc/majordomo | |
55 | DOCFILES= Changelog FUTURE INSTALL LICENSE NEWLIST README | 55 | DOCFILES= Changelog FUTURE INSTALL LICENSE NEWLIST README | |
56 | DOCDOCFILES= FAQ README.sequencer list-owner-info \ | 56 | DOCDOCFILES= FAQ README.sequencer list-owner-info \ | |
57 | majordomo-faq.html majordomo.lisa6.ps majordomo.ora | 57 | majordomo-faq.html majordomo.lisa6.ps majordomo.ora | |
58 | 58 | |||
59 | EXAMPLEDIR= ${PREFIX}/share/examples/majordomo | 59 | EXAMPLEDIR= ${PREFIX}/share/examples/majordomo | |
60 | EXDIRS= archives archives/example-l digests \ | 60 | EXDIRS= archives archives/example-l digests \ | |
61 | digests/example-l-digest lists | 61 | digests/example-l-digest lists | |
62 | EXFILES= example-l.passwd example-l.info | 62 | EXFILES= example-l.passwd example-l.info | |
63 | EXLISTS= example-l example-l-digest | 63 | EXLISTS= example-l example-l-digest | |
64 | 64 | |||
65 | BUILD_DEFS+= MAJORDOMO_TMPDIR | 65 | BUILD_DEFS+= MAJORDOMO_TMPDIR | |
66 | BUILD_DEFS+= MAJORDOMO_HOMEDIR | 66 | BUILD_DEFS+= MAJORDOMO_HOMEDIR | |
67 | BUILD_DEFS+= MAJORDOMO_CF | 67 | BUILD_DEFS+= MAJORDOMO_CF | |
68 | BUILD_DEFS+= VARBASE | 68 | BUILD_DEFS+= VARBASE | |
69 | 69 | |||
70 | USERGROUP_PHASE= configure | 70 | USERGROUP_PHASE= configure | |
71 | PKG_GROUPS= ${MAJORDOMO_GROUP} | 71 | PKG_GROUPS= ${MAJORDOMO_GROUP} | |
72 | PKG_USERS= ${MAJORDOMO_USER}:${MAJORDOMO_GROUP} | 72 | PKG_USERS= ${MAJORDOMO_USER}:${MAJORDOMO_GROUP} | |
73 | OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR} \ | 73 | OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR} \ | |
74 | ${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0755 | 74 | ${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0755 | |
75 | OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR}/archives \ | 75 | OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR}/archives \ | |
76 | ${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0755 | 76 | ${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0755 | |
77 | OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR}/digests \ | 77 | OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR}/digests \ | |
78 | ${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0755 | 78 | ${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0755 | |
79 | OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR}/lists \ | 79 | OWN_DIRS_PERMS+= ${MAJORDOMO_HOMEDIR}/lists \ | |
80 | ${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0755 | 80 | ${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0755 | |
81 | OWN_DIRS_PERMS+= ${MAJORDOMO_TMPDIR} \ | 81 | OWN_DIRS_PERMS+= ${MAJORDOMO_TMPDIR} \ | |
82 | ${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0755 | 82 | ${MAJORDOMO_USER} ${MAJORDOMO_GROUP} 0755 | |
83 | 83 | |||
84 | CONFIGURE_SED= -e "s|@PREFIX@|${PREFIX}|g" \ | 84 | CONFIGURE_SED= -e "s|@PREFIX@|${PREFIX}|g" \ | |
85 | -e "s|@PERL@|${PERL5}|g" \ | 85 | -e "s|@PERL@|${PERL5}|g" \ | |
86 | -e "s|@HOME@|${MAJORDOMO_HOMEDIR}|g" \ | 86 | -e "s|@HOME@|${MAJORDOMO_HOMEDIR}|g" \ | |
87 | -e "s|@MAJORDOMO_CF@|${MAJORDOMO_CF}|g" \ | 87 | -e "s|@MAJORDOMO_CF@|${MAJORDOMO_CF}|g" \ | |
88 | -e "s|@MAJORDOMO_USER@|${MAJORDOMO_USER}|g" \ | 88 | -e "s|@MAJORDOMO_USER@|${MAJORDOMO_USER}|g" \ | |
89 | -e "s|@MAJORDOMO_GROUP@|${MAJORDOMO_GROUP}|g" \ | 89 | -e "s|@MAJORDOMO_GROUP@|${MAJORDOMO_GROUP}|g" \ | |
90 | -e "s|@TMPDIR@|${MAJORDOMO_TMPDIR}|g" | 90 | -e "s|@TMPDIR@|${MAJORDOMO_TMPDIR}|g" | |
91 | 91 | |||
92 | MESSAGE_SED= -e 's|$${PREFIX}|${PREFIX}|g' \ | 92 | MESSAGE_SED= -e 's|$${PREFIX}|${PREFIX}|g' \ | |
93 | -e 's|$${HOME}|${HOME}|g' \ | 93 | -e 's|$${HOME}|${HOME}|g' \ | |
94 | -e 's|$${MAJORDOMO_CF}|${MAJORDOMO_CF}|g' \ | 94 | -e 's|$${MAJORDOMO_CF}|${MAJORDOMO_CF}|g' \ | |
95 | -e 's|$${MAJORDOMO_USER}|${MAJORDOMO_USER}|g' \ | 95 | -e 's|$${MAJORDOMO_USER}|${MAJORDOMO_USER}|g' \ | |
96 | -e 's|$${MAJORDOMO_GROUP}|${MAJORDOMO_GROUP}|g' | 96 | -e 's|$${MAJORDOMO_GROUP}|${MAJORDOMO_GROUP}|g' | |
97 | 97 | |||
98 | MAKE_DIRS+= ${PKG_SYSCONFDIR} | 98 | MAKE_DIRS+= ${PKG_SYSCONFDIR} | |
99 | 99 | |||
100 | INSTALLATION_DIRS+= ${PREFIX}/bin | 100 | INSTALLATION_DIRS+= ${PREFIX}/bin | |
101 | INSTALLATION_DIRS+= ${PREFIX}/libexec/majordomo | 101 | INSTALLATION_DIRS+= ${PREFIX}/libexec/majordomo | |
102 | INSTALLATION_DIRS+= ${PKGMANDIR}/man1 | 102 | INSTALLATION_DIRS+= ${PKGMANDIR}/man1 | |
103 | INSTALLATION_DIRS+= ${PKGMANDIR}/man8 | 103 | INSTALLATION_DIRS+= ${PKGMANDIR}/man8 | |
104 | 104 | |||
105 | do-configure: | 105 | do-configure: | |
106 | ${SED} ${CONFIGURE_SED} ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.netbsd | 106 | ${SED} ${CONFIGURE_SED} ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.netbsd | |
107 | 107 | |||
108 | post-build: | 108 | post-build: | |
109 | ${SED} ${CONFIGURE_SED} ${WRKSRC}/sample.cf > ${WRKSRC}/majordomo.cf | 109 | ${SED} ${CONFIGURE_SED} ${WRKSRC}/sample.cf > ${WRKSRC}/majordomo.cf | |
110 | ${SED} ${CONFIGURE_SED} ${FILESDIR}/aliases.majordomo \ | 110 | ${SED} ${CONFIGURE_SED} ${FILESDIR}/aliases.majordomo \ | |
111 | > ${WRKSRC}/aliases.majordomo | 111 | > ${WRKSRC}/aliases.majordomo | |
112 | ${SED} -e 's|$${PREFIX}|${PREFIX}|g' \ | 112 | ${SED} -e 's|$${PREFIX}|${PREFIX}|g' \ | |
113 | -e 's|$${HOME}|${HOME}|g' \ | 113 | -e 's|$${HOME}|${HOME}|g' \ | |
114 | -e 's|$${MAJORDOMO_CF}|${MAJORDOMO_CF}|g' \ | 114 | -e 's|$${MAJORDOMO_CF}|${MAJORDOMO_CF}|g' \ | |
115 | -e 's|$${MAJORDOMO_USER}|${MAJORDOMO_USER}|g' \ | 115 | -e 's|$${MAJORDOMO_USER}|${MAJORDOMO_USER}|g' \ | |
116 | -e 's|$${MAJORDOMO_GROUP}|${MAJORDOMO_GROUP}|g' \ | 116 | -e 's|$${MAJORDOMO_GROUP}|${MAJORDOMO_GROUP}|g' \ | |
117 | ${PKGDIR}/MESSAGE > ${WRKSRC}/post-install-notes | 117 | ${PKGDIR}/MESSAGE > ${WRKSRC}/post-install-notes | |
118 | 118 | |||
119 | post-install: | 119 | post-install: | |
120 | ${LN} -sf archive2.pl ${DESTDIR}${PREFIX}/libexec/majordomo/archive | 120 | ${LN} -sf archive2.pl ${DESTDIR}${PREFIX}/libexec/majordomo/archive | |
121 | ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} | 121 | ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR} | |
122 | .for file in ${DOCFILES} | 122 | .for file in ${DOCFILES} | |
123 | ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${DOCDIR}/${file} | 123 | ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${DOCDIR}/${file} | |
124 | .endfor | 124 | .endfor | |
125 | .for file in ${DOCDOCFILES} | 125 | .for file in ${DOCDOCFILES} | |
126 | ${INSTALL_DATA} ${WRKSRC}/Doc/${file} ${DESTDIR}${DOCDIR}/${file} | 126 | ${INSTALL_DATA} ${WRKSRC}/Doc/${file} ${DESTDIR}${DOCDIR}/${file} | |
127 | .endfor | 127 | .endfor | |
128 | ${INSTALL_DATA} ${WRKSRC}/post-install-notes ${DESTDIR}${DOCDIR}/post-install-notes | 128 | ${INSTALL_DATA} ${WRKSRC}/post-install-notes ${DESTDIR}${DOCDIR}/post-install-notes | |
129 | ${INSTALL} -d -m 755 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${DESTDIR}${EXAMPLEDIR} | 129 | ${INSTALL} -d -m 755 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${DESTDIR}${EXAMPLEDIR} | |
130 | .for dir in ${EXDIRS} | 130 | .for dir in ${EXDIRS} | |
131 | ${INSTALL} -d -m 755 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${DESTDIR}${EXAMPLEDIR}/${dir} | 131 | ${INSTALL} -d -m 755 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${DESTDIR}${EXAMPLEDIR}/${dir} | |
132 | .endfor | 132 | .endfor | |
133 | ${INSTALL_DATA} ${WRKSRC}/aliases.majordomo \ | 133 | ${INSTALL_DATA} ${WRKSRC}/aliases.majordomo \ | |
134 | ${DESTDIR}${EXAMPLEDIR}/aliases.majordomo | 134 | ${DESTDIR}${EXAMPLEDIR}/aliases.majordomo | |
135 | ${INSTALL} -m 644 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \ | 135 | ${INSTALL} -m 644 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \ | |
136 | ${FILESDIR}/keep_me ${DESTDIR}${EXAMPLEDIR}/archives/example-l/.keep_me | 136 | ${FILESDIR}/keep_me ${DESTDIR}${EXAMPLEDIR}/archives/example-l/.keep_me | |
137 | ${INSTALL} -m 644 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \ | 137 | ${INSTALL} -m 644 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \ | |
138 | ${FILESDIR}/keep_me ${DESTDIR}${EXAMPLEDIR}/digests/example-l-digest/.keep_me | 138 | ${FILESDIR}/keep_me ${DESTDIR}${EXAMPLEDIR}/digests/example-l-digest/.keep_me | |
139 | .for file in ${EXFILES} | 139 | .for file in ${EXFILES} | |
140 | ${INSTALL} -m 644 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \ | 140 | ${INSTALL} -m 644 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \ | |
141 | ${FILESDIR}/${file} ${DESTDIR}${EXAMPLEDIR}/lists/${file} | 141 | ${FILESDIR}/${file} ${DESTDIR}${EXAMPLEDIR}/lists/${file} | |
142 | .endfor | 142 | .endfor | |
143 | .for file in ${EXLISTS} | 143 | .for file in ${EXLISTS} | |
144 | ${INSTALL} -m 644 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \ | 144 | ${INSTALL} -m 644 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} \ | |
145 | /dev/null ${DESTDIR}${EXAMPLEDIR}/lists/${file} | 145 | /dev/null ${DESTDIR}${EXAMPLEDIR}/lists/${file} | |
146 | .endfor | 146 | .endfor | |
147 | ${LN} -sf example-l.info ${DESTDIR}${EXAMPLEDIR}/lists/example-l-digest.info | 147 | ${LN} -sf example-l.info ${DESTDIR}${EXAMPLEDIR}/lists/example-l-digest.info | |
148 | ${LN} -sf example-l.passwd ${DESTDIR}${EXAMPLEDIR}/lists/example-l-digest.passwd | 148 | ${LN} -sf example-l.passwd ${DESTDIR}${EXAMPLEDIR}/lists/example-l-digest.passwd | |
149 | ${INSTALL_DATA} ${WRKSRC}/majordomo.cf \ | 149 | ${INSTALL_DATA} ${WRKSRC}/majordomo.cf \ | |
150 | ${DESTDIR}${EXAMPLEDIR}/majordomo.cf | 150 | ${DESTDIR}${EXAMPLEDIR}/majordomo.cf | |
151 | 151 | |||
152 | # verify installation; requires interaction | 152 | # verify installation; requires interaction | |
153 | test: install | 153 | test: install | |
154 | ${DESTDIR}${PREFIX}/libexec/majordomo/wrapper config-test | 154 | ${DESTDIR}${PREFIX}/libexec/majordomo/wrapper config-test | |
155 | 155 | |||
156 | .include "../../mk/bsd.pkg.mk" | 156 | .include "../../mk/bsd.pkg.mk" |
@@ -1,19 +1,19 @@ | @@ -1,19 +1,19 @@ | |||
1 | $NetBSD: distinfo,v 1.15 2011/08/27 15:47:43 schnoebe Exp $ | 1 | $NetBSD: distinfo,v 1.15.2.1 2011/11/02 22:55:24 tron Exp $ | |
2 | 2 | |||
3 | SHA1 (majordomo-1.94.5.tgz) = 44b18c7b9133f2cd992f6e718551d613d9d45c00 | 3 | SHA1 (majordomo-1.94.5.tgz) = 44b18c7b9133f2cd992f6e718551d613d9d45c00 | |
4 | RMD160 (majordomo-1.94.5.tgz) = 7f6b48fb5cc5b23948133658b055588d0d6608c4 | 4 | RMD160 (majordomo-1.94.5.tgz) = 7f6b48fb5cc5b23948133658b055588d0d6608c4 | |
5 | Size (majordomo-1.94.5.tgz) = 312244 bytes | 5 | Size (majordomo-1.94.5.tgz) = 312244 bytes | |
6 | SHA1 (patch-aa) = 2be639e71d75780f82d2d6364431d7d40d97ba94 | 6 | SHA1 (patch-aa) = 2be639e71d75780f82d2d6364431d7d40d97ba94 | |
7 | SHA1 (patch-ab) = 58aec7d2ad3625caf8bdcd9b41792a2075605fa5 | 7 | SHA1 (patch-ab) = 58aec7d2ad3625caf8bdcd9b41792a2075605fa5 | |
8 | SHA1 (patch-ac) = 3f8973808314927f167392d640aefc67cd504a70 | 8 | SHA1 (patch-ac) = 3f8973808314927f167392d640aefc67cd504a70 | |
9 | SHA1 (patch-ad) = 0e31ae0be84246e0691dfdc8aa86301eadd5cf79 | 9 | SHA1 (patch-ad) = 418f7fc79217871e608ca0ab2f71d477804fc7fb | |
10 | SHA1 (patch-ae) = 99285559c0fe86084fedbaad5a482062187b404d | 10 | SHA1 (patch-ae) = 99285559c0fe86084fedbaad5a482062187b404d | |
11 | SHA1 (patch-af) = 1626b7580f3d4f00b3b8c0ed567bad7da84a30b2 | 11 | SHA1 (patch-af) = 1626b7580f3d4f00b3b8c0ed567bad7da84a30b2 | |
12 | SHA1 (patch-ag) = 759a32dacb26221d83de97b463b2131b0f52a914 | 12 | SHA1 (patch-ag) = 759a32dacb26221d83de97b463b2131b0f52a914 | |
13 | SHA1 (patch-ah) = ac08fa5d2fa321afe7fdf72783f8f2c887073bcd | 13 | SHA1 (patch-ah) = ac08fa5d2fa321afe7fdf72783f8f2c887073bcd | |
14 | SHA1 (patch-ai) = 883a72515d793ea8376e1bb54063dd4d53b4f630 | 14 | SHA1 (patch-ai) = b890754ba3b0b1311f82745ecc8949b127fe0ee2 | |
15 | SHA1 (patch-aj) = 2185ba182561ca3e003fa0879e696092c3b237fd | 15 | SHA1 (patch-aj) = e423f61f6b493ae6ae30dda8b0de3ffa10caeefe | |
16 | SHA1 (patch-ak) = b33b0fc9e013642cc842c6d7ee70f590281764ae | 16 | SHA1 (patch-ak) = b33b0fc9e013642cc842c6d7ee70f590281764ae | |
17 | SHA1 (patch-al) = 776088c5916b1b0516e8abaecd69870ba57f4a76 | 17 | SHA1 (patch-al) = 776088c5916b1b0516e8abaecd69870ba57f4a76 | |
18 | SHA1 (patch-am) = 74e46f28cb152e152594d949b0116f1370dd1ae3 | 18 | SHA1 (patch-am) = 74e46f28cb152e152594d949b0116f1370dd1ae3 | |
19 | SHA1 (patch-an) = db4b9c47bd6efb1fb883cb0c505bd1d0d6f2d83e | 19 | SHA1 (patch-an) = 2e9a38d7d9eb46f472cec555349f19cad0a5036b |
@@ -1,32 +1,42 @@ | @@ -1,32 +1,42 @@ | |||
1 | $NetBSD: patch-ad,v 1.2 2011/01/29 19:39:14 spz Exp $ | 1 | $NetBSD: patch-ad,v 1.2.6.1 2011/11/02 22:55:24 tron Exp $ | |
2 | 2 | |||
3 | avoid the wrapper + -C trap | 3 | avoid the wrapper + -C trap | |
4 | 4 | |||
5 | --- config-test.orig 1997-08-27 15:17:13.000000000 +0000 | 5 | --- config-test.orig 1997-08-27 15:17:13.000000000 +0000 | |
6 | +++ config-test | 6 | +++ config-test | |
7 | @@ -117,7 +117,7 @@ wellokay | 7 | @@ -7,8 +7,7 @@ | |
8 | # execute this by cd to your majordomo dir, then 'wrapper config-test' | |||
9 | # | |||
10 | ||||
11 | -@requires = ( "ctime.pl", | |||
12 | - "majordomo_version.pl", | |||
13 | +@requires = ( "majordomo_version.pl", | |||
14 | "majordomo.pl", | |||
15 | "shlock.pl", | |||
16 | "config_parse.pl", | |||
17 | @@ -117,7 +116,7 @@ wellokay | |||
8 | print "\n\tNon obvious things that cause headaches:\n\n"; | 18 | print "\n\tNon obvious things that cause headaches:\n\n"; | |
9 | &header(''); | 19 | &header(''); | |
10 | 20 | |||
11 | -$cf = $ARGV[0] || $ENV{'MAJORDOMO_CF'}; | 21 | -$cf = $ARGV[0] || $ENV{'MAJORDOMO_CF'}; | |
12 | +$cf = $ENV{'MAJORDOMO_CF'}; | 22 | +$cf = $ENV{'MAJORDOMO_CF'}; | |
13 | 23 | |||
14 | if (eval "require '$cf'") { | 24 | if (eval "require '$cf'") { | |
15 | &good("'require'd $cf okay."); | 25 | &good("'require'd $cf okay."); | |
16 | @@ -125,6 +125,7 @@ if (eval "require '$cf'") { | 26 | @@ -125,6 +124,7 @@ if (eval "require '$cf'") { | |
17 | &bad("something's wrong with $cf: $@"); | 27 | &bad("something's wrong with $cf: $@"); | |
18 | } | 28 | } | |
19 | 29 | |||
20 | +unshift(@INC, $bindir); | 30 | +unshift(@INC, $bindir); | |
21 | foreach (@requires) { | 31 | foreach (@requires) { | |
22 | if (require $_) { | 32 | if (require $_) { | |
23 | &good("found $_ okay."); | 33 | &good("found $_ okay."); | |
24 | @@ -286,7 +287,7 @@ print "Checking to see if there are new | 34 | @@ -286,7 +286,7 @@ print "Checking to see if there are new | |
25 | print "your majordomo.cf file..."; | 35 | print "your majordomo.cf file..."; | |
26 | 36 | |||
27 | open($cf, $cf) || &bad("Couldn't open $cf for reading, $!"); | 37 | open($cf, $cf) || &bad("Couldn't open $cf for reading, $!"); | |
28 | -open(S, 'sample.cf') || &bad("Couldn't open sample.cf for reading, $!"); | 38 | -open(S, 'sample.cf') || &bad("Couldn't open sample.cf for reading, $!"); | |
29 | +open(S, "$bindir/sample.cf") || &bad("Couldn't open $bindir/sample.cf for reading, $!"); | 39 | +open(S, "$bindir/sample.cf") || &bad("Couldn't open $bindir/sample.cf for reading, $!"); | |
30 | 40 | |||
31 | while (<S>) { | 41 | while (<S>) { | |
32 | next unless /^\s*(\$\w+(('|::)\w+)*)/; | 42 | next unless /^\s*(\$\w+(('|::)\w+)*)/; |
@@ -1,64 +1,66 @@ | @@ -1,64 +1,66 @@ | |||
1 | $NetBSD: patch-ai,v 1.4 2011/08/27 15:47:43 schnoebe Exp $ | 1 | $NetBSD: patch-ai,v 1.4.2.1 2011/11/02 22:55:24 tron Exp $ | |
2 | 2 | |||
3 | Quite messages from perl 5.14.1, this is very old code. | 3 | Quite messages from perl 5.14.1, this is very old code. | |
4 | 4 | |||
5 | --- resend.orig 2000-01-07 15:32:39.000000000 +0000 | 5 | --- resend.orig 2000-01-07 15:32:39.000000000 +0000 | |
6 | +++ resend | 6 | +++ resend | |
7 | @@ -71,15 +71,15 @@ if ($ARGV[0] =~ /^\@/) { | 7 | @@ -71,15 +71,15 @@ if ($ARGV[0] =~ /^\@/) { | |
8 | # getopts.pl was place where it's supposed to be. This changes previous | 8 | # getopts.pl was place where it's supposed to be. This changes previous | |
9 | # behavior which allowed getopts.pl to be in the same place as | 9 | # behavior which allowed getopts.pl to be in the same place as | |
10 | # majordomo.cf. | 10 | # majordomo.cf. | |
11 | -require "getopts.pl"; | 11 | -require "getopts.pl"; | |
12 | -&Getopts("C:c:Aa:df:h:I:l:M:p:Rr:s") || die("resend: Getopts() failed: $!"); | 12 | -&Getopts("C:c:Aa:df:h:I:l:M:p:Rr:s") || die("resend: Getopts() failed: $!"); | |
13 | +use Getopt::Std; | 13 | +use Getopt::Std; | |
14 | +getopts("C:c:Aa:df:h:I:l:M:p:Rr:s") || die("resend: Getopts() failed: $!"); | 14 | +getopts("C:c:Aa:df:h:I:l:M:p:Rr:s") || die("resend: Getopts() failed: $!"); | |
15 | 15 | |||
16 | if (! defined($opt_l)) { | 16 | if (! defined($opt_l)) { | |
17 | die("resend: must specify '-l list'"); | 17 | die("resend: must specify '-l list'"); | |
18 | } | 18 | } | |
19 | 19 | |||
20 | -# Read and execute the .cf file | 20 | -# Read and execute the .cf file | |
21 | -$cf = $opt_C || $opt_c || $ENV{"MAJORDOMO_CF"} || "/etc/majordomo.cf"; | 21 | -$cf = $opt_C || $opt_c || $ENV{"MAJORDOMO_CF"} || "/etc/majordomo.cf"; | |
22 | +# Read and execute the .cf file. For security reasons, let the environment win | 22 | +# Read and execute the .cf file. For security reasons, let the environment win | |
23 | +$cf = $ENV{"MAJORDOMO_CF"} || $opt_C || $opt_c || "/etc/majordomo.cf"; | 23 | +$cf = $ENV{"MAJORDOMO_CF"} || $opt_C || $opt_c || "/etc/majordomo.cf"; | |
24 | 24 | |||
25 | # Despite not having a place to send the remains of the body, | 25 | # Despite not having a place to send the remains of the body, | |
26 | # it would be nice to send a message to root or postmaster, at least... | 26 | # it would be nice to send a message to root or postmaster, at least... | |
27 | @@ -92,6 +92,7 @@ require "$cf"; | 27 | @@ -92,8 +92,8 @@ require "$cf"; | |
28 | 28 | |||
29 | chdir($homedir) || die("Can't chdir(\"$homedir\"): $!"); | 29 | chdir($homedir) || die("Can't chdir(\"$homedir\"): $!"); | |
30 | 30 | |||
31 | +unshift(@INC, $bindir); | 31 | +unshift(@INC, $bindir); | |
32 | unshift(@INC, $homedir); | 32 | unshift(@INC, $homedir); | |
33 | require "ctime.pl"; # For logging purposes | 33 | -require "ctime.pl"; # For logging purposes | |
34 | require "majordomo.pl"; | 34 | require "majordomo.pl"; | |
35 | @@ -316,7 +317,7 @@ $is_admin_header .= "\$taboo = \"\";\n}; | 35 | require "majordomo_version.pl"; | |
36 | require "config_parse.pl"; | |||
37 | @@ -316,7 +316,7 @@ $is_admin_header .= "\$taboo = \"\";\n}; | |||
36 | if (! defined($admin_body)) { | 38 | if (! defined($admin_body)) { | |
37 | &bitch("resend: \$admin_body not defined in $cf !!\n" . | 39 | &bitch("resend: \$admin_body not defined in $cf !!\n" . | |
38 | "Majordomo will only catch \"subscribe\" and \"unsubscribe\" in\n" . | 40 | "Majordomo will only catch \"subscribe\" and \"unsubscribe\" in\n" . | |
39 | - "the body.\nLook at $homedir/sample.cf for a good definition."); | 41 | - "the body.\nLook at $homedir/sample.cf for a good definition."); | |
40 | + "the body.\nLook at $bindir/sample.cf for a good definition."); | 42 | + "the body.\nLook at $bindir/sample.cf for a good definition."); | |
41 | @admin_body = ('/^subject:\s*subscribe\b/i' , | 43 | @admin_body = ('/^subject:\s*subscribe\b/i' , | |
42 | '/^subject:\s*unsubscribe\b/i'); | 44 | '/^subject:\s*unsubscribe\b/i'); | |
43 | } else { | 45 | } else { | |
44 | @@ -747,12 +748,20 @@ sub parse_header { | 46 | @@ -747,12 +747,20 @@ sub parse_header { | |
45 | 47 | |||
46 | # add new header fields | 48 | # add new header fields | |
47 | print OUT "Sender: $sender\n"; | 49 | print OUT "Sender: $sender\n"; | |
48 | + print OUT "List-Id: ".$opt_l.".".$whereami."\n"; | 50 | + print OUT "List-Id: ".$opt_l.".".$whereami."\n"; | |
49 | + | 51 | + | |
50 | if (defined($opt_p)) { | 52 | if (defined($opt_p)) { | |
51 | print OUT "Precedence: $opt_p\n"; | 53 | print OUT "Precedence: $opt_p\n"; | |
52 | } | 54 | } | |
53 | 55 | |||
54 | if (defined($opt_r)) { | 56 | if (defined($opt_r)) { | |
55 | print OUT "Reply-To: ", &config'substitute_values($opt_r), "\n"; #'; | 57 | print OUT "Reply-To: ", &config'substitute_values($opt_r), "\n"; #'; | |
56 | + if (defined $reply_to) { | 58 | + if (defined $reply_to) { | |
57 | + print OUT "Mail-Reply-To: $reply_to\n"; #'; | 59 | + print OUT "Mail-Reply-To: $reply_to\n"; #'; | |
58 | + } else { | 60 | + } else { | |
59 | + print OUT "Mail-Reply-To: $from\n"; #'; | 61 | + print OUT "Mail-Reply-To: $from\n"; #'; | |
60 | + } | 62 | + } | |
61 | + print OUT "Mail-Followup-To: ", &config'substitute_values($opt_r), "\n"; #'; | 63 | + print OUT "Mail-Followup-To: ", &config'substitute_values($opt_r), "\n"; #'; | |
62 | } | 64 | } | |
63 | 65 | |||
64 | # print out per-list additonal headers | 66 | # print out per-list additonal headers |
@@ -1,86 +1,100 @@ | @@ -1,86 +1,100 @@ | |||
1 | $NetBSD: patch-aj,v 1.2 2010/10/29 21:51:22 spz Exp $ | 1 | $NetBSD: patch-aj,v 1.2.8.1 2011/11/02 22:55:24 tron Exp $ | |
2 | 2 | |||
3 | --- ./sample.cf.orig Wed Aug 27 09:00:31 1997 | 3 | --- sample.cf.orig 1997-08-27 15:00:31.000000000 +0000 | |
4 | +++ ./sample.cf Tue Jun 8 10:55:13 1999 | 4 | +++ sample.cf | |
5 | @@ -7,5 +7,5 @@ | 5 | @@ -6,7 +6,7 @@ | |
6 | ||||
6 | # $whereami -- What machine am I running on? | 7 | # $whereami -- What machine am I running on? | |
7 | # | 8 | # | |
8 | -$whereami = "example.com"; | 9 | -$whereami = "example.com"; | |
9 | +$whereami = "@HOSTNAME@"; | 10 | +$whereami = "@HOSTNAME@"; | |
10 | 11 | |||
11 | # $whoami -- Who do users send requests to me as? | 12 | # $whoami -- Who do users send requests to me as? | |
12 | @@ -17,5 +17,5 @@ | 13 | # | |
14 | @@ -16,13 +16,22 @@ $whoami = "Majordomo\@$whereami"; | |||
15 | # | |||
13 | $whoami_owner = "Majordomo-Owner\@$whereami"; | 16 | $whoami_owner = "Majordomo-Owner\@$whereami"; | |
14 | 17 | |||
15 | -# $homedir -- Where can I find my extra .pl files, like majordomo.pl? | 18 | -# $homedir -- Where can I find my extra .pl files, like majordomo.pl? | |
16 | +# $homedir -- Where can I find my lists? | 19 | +# $homedir -- Where can I find my lists? | |
17 | # the environment variable HOME is set by the wrapper | 20 | # the environment variable HOME is set by the wrapper | |
18 | # | 21 | # | |
19 | @@ -23,5 +23,14 @@ | 22 | if ( defined $ENV{"HOME"}) { | |
20 | $homedir = $ENV{"HOME"}; | 23 | $homedir = $ENV{"HOME"}; | |
21 | } else { | 24 | } else { | |
22 | - $homedir = "/usr/test/majordomo"; | 25 | - $homedir = "/usr/test/majordomo"; | |
23 | + $homedir = "@HOME@"; | 26 | + $homedir = "@HOME@"; | |
24 | +} | 27 | +} | |
25 | + | 28 | + | |
26 | +# $bindir -- Where can I find my extra .pl files, like majordomo.pl? | 29 | +# $bindir -- Where can I find my extra .pl files, like majordomo.pl? | |
27 | +# the environment variable BIN is set by the wrapper | 30 | +# the environment variable BIN is set by the wrapper | |
28 | +# | 31 | +# | |
29 | +if ( defined $ENV{"BIN"}) { | 32 | +if ( defined $ENV{"BIN"}) { | |
30 | + $bindir = $ENV{"BIN"}; | 33 | + $bindir = $ENV{"BIN"}; | |
31 | +} else { | 34 | +} else { | |
32 | + $bindir = "@PREFIX@/libexec/majordomo"; | 35 | + $bindir = "@PREFIX@/libexec/majordomo"; | |
33 | } | 36 | } | |
34 | 37 | |||
35 | @@ -33,8 +42,8 @@ | 38 | # $listdir -- Where are the mailing lists? | |
39 | @@ -32,10 +41,10 @@ $listdir = "$homedir/lists"; | |||
40 | # $digest_work_dir -- the parent directory for digest's queue area | |||
36 | # Each list must have a subdirectory under this directory in order for | 41 | # Each list must have a subdirectory under this directory in order for | |
37 | # digest to work. E.G. The bblisa list would use: | 42 | # digest to work. E.G. The bblisa list would use: | |
38 | -# /usr/local/mail/digest/bblisa | 43 | -# /usr/local/mail/digest/bblisa | |
39 | +# @HOME@/digests/bblisa | 44 | +# @HOME@/digests/bblisa | |
40 | # as its directory. | 45 | # as its directory. | |
41 | # | 46 | # | |
42 | -$digest_work_dir = "/usr/local/mail/digest"; | 47 | -$digest_work_dir = "/usr/local/mail/digest"; | |
43 | +$digest_work_dir = "$homedir/digests"; | 48 | +$digest_work_dir = "$homedir/digests"; | |
44 | 49 | |||
45 | # $log -- Where do I write my log? | 50 | # $log -- Where do I write my log? | |
46 | @@ -46,6 +55,6 @@ | 51 | # | |
52 | @@ -45,8 +54,8 @@ $log = "$homedir/Log"; | |||
53 | # usually /usr/lib/sendmail, but some newer BSD systems | |||
47 | # seem to prefer /usr/sbin/sendmail | 54 | # seem to prefer /usr/sbin/sendmail | |
48 | # | 55 | # | |
49 | -$sendmail_command = "/usr/lib/sendmail"; | 56 | -$sendmail_command = "/usr/lib/sendmail"; | |
50 | -# $sendmail_command = "/usr/sbin/sendmail"; | 57 | -# $sendmail_command = "/usr/sbin/sendmail"; | |
51 | +# $sendmail_command = "/usr/lib/sendmail"; | 58 | +# $sendmail_command = "/usr/lib/sendmail"; | |
52 | +$sendmail_command = "/usr/sbin/sendmail"; | 59 | +$sendmail_command = "/usr/sbin/sendmail"; | |
53 | 60 | |||
54 | # $mailer -- What program and args do I use to send mail to the list? | 61 | # $mailer -- What program and args do I use to send mail to the list? | |
55 | @@ -69,5 +78,5 @@ | 62 | # $bounce_mailer -- What is used to send mail anywhere else? | |
63 | @@ -68,7 +77,7 @@ $bounce_mailer = "$sendmail_command -oi | |||
64 | # | |||
56 | # To use TLB and use no outgoing alias: | 65 | # To use TLB and use no outgoing alias: | |
57 | # if ($main'program_name eq 'mj_resend' && $opt_l eq 'test-list') { | 66 | # if ($main'program_name eq 'mj_resend' && $opt_l eq 'test-list') { | |
58 | -# $mailer = "/usr/local/majordomo/tlb /usr/local/lists/${opt_l}.tlb"; | 67 | -# $mailer = "/usr/local/majordomo/tlb /usr/local/lists/${opt_l}.tlb"; | |
59 | +# $mailer = "@HOME@/tlb @HOME@/lists/${opt_l}.tlb"; | 68 | +# $mailer = "@HOME@/tlb @HOME@/lists/${opt_l}.tlb"; | |
60 | # } | 69 | # } | |
61 | # | 70 | # | |
62 | @@ -128,6 +137,6 @@ | 71 | # To use a different Sendmail queue for this list's mail: | |
72 | @@ -127,15 +136,15 @@ $no_true_x400 = 0; | |||
73 | # Majordomo will look for "get" and "index" files related to $list in | |||
63 | # directory "$filedir/$list$filedir_suffix", so set $filedir and | 74 | # directory "$filedir/$list$filedir_suffix", so set $filedir and | |
64 | # $filedir_suffix appropriately. For instance, to look in | 75 | # $filedir_suffix appropriately. For instance, to look in | |
65 | -# /usr/local/mail/files/$list, use: | 76 | -# /usr/local/mail/files/$list, use: | |
66 | -# $filedir = "/usr/local/mail/files"; | 77 | -# $filedir = "/usr/local/mail/files"; | |
67 | +# @HOME@/mail/files/$list, use: | 78 | +# @HOME@/mail/files/$list, use: | |
68 | +# $filedir = "@HOME@/mail/files"; | 79 | +# $filedir = "@HOME@/mail/files"; | |
69 | # $filedir_suffix = ""; # empty string | 80 | # $filedir_suffix = ""; # empty string | |
70 | # or to look in $listdir/$list.archive, use: | 81 | # or to look in $listdir/$list.archive, use: | |
71 | @@ -135,6 +144,6 @@ | 82 | # $filedir = "$listdir"; | |
72 | # $filedir_suffix = ".archive"; | 83 | # $filedir_suffix = ".archive"; | |
73 | 84 | |||
74 | -$filedir = "$listdir"; | 85 | -$filedir = "$listdir"; | |
75 | -$filedir_suffix = ".archive"; | 86 | -$filedir_suffix = ".archive"; | |
76 | +$filedir = "@HOME@/archives"; | 87 | +$filedir = "@HOME@/archives"; | |
77 | +$filedir_suffix = ""; | 88 | +$filedir_suffix = ""; | |
78 | 89 | |||
79 | # What command should I use to process an "index" request? | 90 | # What command should I use to process an "index" request? | |
80 | @@ -191,5 +200,5 @@ | 91 | # | |
92 | @@ -190,7 +199,7 @@ die "Perl version $] too old\n" if ($] < | |||
93 | # majordomo has r/w permission to. | |||
81 | # Uses the environment variable TMPDIR, since that's pretty common | 94 | # Uses the environment variable TMPDIR, since that's pretty common | |
82 | # | 95 | # | |
83 | -$TMPDIR = $ENV{'TMPDIR'} || "/usr/tmp"; | 96 | -$TMPDIR = $ENV{'TMPDIR'} || "/usr/tmp"; | |
84 | +$TMPDIR = $ENV{'TMPDIR'} || "@TMPDIR@"; | 97 | +$TMPDIR = $ENV{'TMPDIR'} || "@TMPDIR@"; | |
85 | 98 | |||
86 | # Tune how long set_lock tries to obtain a lock before giving up. Each | 99 | # Tune how long set_lock tries to obtain a lock before giving up. Each | |
100 | # attempt waits 1 to 10 seconds before trying again and waittime is |
@@ -1,51 +1,69 @@ | @@ -1,51 +1,69 @@ | |||
1 | $NetBSD: patch-an,v 1.2 2010/10/30 23:48:36 spz Exp $ | 1 | $NetBSD: patch-an,v 1.2.8.1 2011/11/02 22:55:24 tron Exp $ | |
2 | 2 | |||
3 | bring up to perl 5.12 standard (this is old code) | 3 | bring up to perl 5.12 standard (this is old code) | |
4 | 4 | |||
5 | --- majordomo.pl.orig 2000-01-07 12:32:04.000000000 +0000 | 5 | --- majordomo.pl.orig 2000-01-07 12:32:04.000000000 +0000 | |
6 | +++ majordomo.pl | 6 | +++ majordomo.pl | |
7 | @@ -44,7 +44,7 @@ $DEBUG = $main'DEBUG; | 7 | @@ -44,7 +44,7 @@ $DEBUG = $main'DEBUG; | |
8 | 8 | |||
9 | sub main'ParseMailHeader ## Public | 9 | sub main'ParseMailHeader ## Public | |
10 | { | 10 | { | |
11 | - local($save1, $save2) = ($*, $/); | 11 | - local($save1, $save2) = ($*, $/); | |
12 | + local($save) = ($/); | 12 | + local($save) = ($/); | |
13 | local($FH, *array) = @_; | 13 | local($FH, *array) = @_; | |
14 | local ($keyw, $val); | 14 | local ($keyw, $val); | |
15 | 15 | |||
16 | @@ -54,7 +54,7 @@ sub main'ParseMailHeader ## Public | 16 | @@ -54,7 +54,7 @@ sub main'ParseMailHeader ## Public | |
17 | local($package) = caller; | 17 | local($package) = caller; | |
18 | $FH =~ s/^[^':]+$/$package'$&/; | 18 | $FH =~ s/^[^':]+$/$package'$&/; | |
19 | 19 | |||
20 | - ($*, $/) = (1, ''); | 20 | - ($*, $/) = (1, ''); | |
21 | + $/ = ''; | 21 | + $/ = ''; | |
22 | $array = $_ = <$FH>; | 22 | $array = $_ = <$FH>; | |
23 | s/\n\s+/ /g; | 23 | s/\n\s+/ /g; | |
24 | 24 | |||
25 | @@ -69,7 +69,7 @@ sub main'ParseMailHeader ## Public | 25 | @@ -69,7 +69,7 @@ sub main'ParseMailHeader ## Public | |
26 | $array{$keyw} = $val; | 26 | $array{$keyw} = $val; | |
27 | } | 27 | } | |
28 | } | 28 | } | |
29 | - ($*, $/) = ($save1, $save2); | 29 | - ($*, $/) = ($save1, $save2); | |
30 | + $/ = $save; | 30 | + $/ = $save; | |
31 | } | 31 | } | |
32 | 32 | |||
33 | 33 | |||
34 | @@ -95,14 +95,14 @@ sub main'ParseAddrs { | 34 | @@ -95,14 +95,14 @@ sub main'ParseAddrs { | |
35 | local($_) = shift; | 35 | local($_) = shift; | |
36 | 1 while s/\([^\(\)]*\)//g; # strip comments | 36 | 1 while s/\([^\(\)]*\)//g; # strip comments | |
37 | 1 while s/"[^"]*"\s//g; # strip comments" | 37 | 1 while s/"[^"]*"\s//g; # strip comments" | |
38 | - split(/,/); # split into parts | 38 | - split(/,/); # split into parts | |
39 | - foreach (@_) { | 39 | - foreach (@_) { | |
40 | + my @parts = split(/,/); # split into parts | 40 | + my @parts = split(/,/); # split into parts | |
41 | + foreach (@parts) { | 41 | + foreach (@parts) { | |
42 | 1 while s/.*<(.*)>.*/$1/; | 42 | 1 while s/.*<(.*)>.*/$1/; | |
43 | s/^\s+//; | 43 | s/^\s+//; | |
44 | s/\s+$//; | 44 | s/\s+$//; | |
45 | } | 45 | } | |
46 | 46 | |||
47 | - @_; | 47 | - @_; | |
48 | + @parts; | 48 | + @parts; | |
49 | } | 49 | } | |
50 | 50 | |||
51 | # Check to see if a list is valid. If it is, return the validated list | 51 | # Check to see if a list is valid. If it is, return the validated list | |
52 | @@ -341,6 +341,8 @@ sub main'set_log { | |||
53 | # Log a message to the log | |||
54 | sub main'log { | |||
55 | ||||
56 | + my @month=qw( Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ); | |||
57 | + | |||
58 | print STDERR "$0: main'log()\n" if $DEBUG; | |||
59 | ||||
60 | local($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime; | |||
61 | @@ -351,7 +353,7 @@ sub main'log { | |||
62 | if (&main'lopen(LOG, ">>", $log_file)) { #'; | |||
63 | # if the log is open, write to the log | |||
64 | printf LOG "%s %02d %02d:%02d:%02d %s %s[%d] {%s} ", | |||
65 | - $ctime'MoY[$mon], $mday, $hour, $min, $sec, | |||
66 | + $month[$mon], $mday, $hour, $min, $sec, | |||
67 | $log_host, $log_program, $$, $log_session; | |||
68 | print LOG join(" ", @_), "\n"; | |||
69 | &main'lclose(LOG); |