1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
|
#!/bin/sh -e
## 03_debian_base.dpatch by Robert Luberda <robert@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Base Debian changes: FHS + s/spop3d/solid-pop3d/
if [ $# -lt 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
case "$1" in
-patch) patch $patch_opts -p1 < $0;;
-unpatch) patch $patch_opts -p1 -R < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1;;
esac
exit 0
@DPATCH@
diff -urNad solid-pop3d/doc/config.example /tmp/dpep.6SKKZb/solid-pop3d/doc/config.example
--- solid-pop3d/doc/config.example 2005-03-13 11:18:01.000000000 +0100
+++ /tmp/dpep.6SKKZb/solid-pop3d/doc/config.example 2005-06-05 15:29:25.000000000 +0200
@@ -1,7 +1,6 @@
/* This example is very stupid. Don't use it as a base for your own
configuration file */
<Global>
- AllowRootLogin yes
MailDropName Maildir
MailDropType maildir
UserBullFile .spop3d-blurp /* It's just an example */
@@ -10,7 +9,7 @@
<VirtualHost 192.168.1.1>
UnreadExpire never
APOPServerName jakis.tam.host.w.pl
- MailDropName "/var/spool/mail/%s" /* It is a comment */
+ MailDropName "/var/mail/%s" /* It is a comment */
MailDropType mailbox
AutoLogoutTime 5s
UserOverride yes
diff -urNad solid-pop3d/man/pop_auth.1 /tmp/dpep.6SKKZb/solid-pop3d/man/pop_auth.1
--- solid-pop3d/man/pop_auth.1 2005-03-13 11:18:01.000000000 +0100
+++ /tmp/dpep.6SKKZb/solid-pop3d/man/pop_auth.1 2005-06-05 15:29:25.000000000 +0200
@@ -38,7 +38,7 @@
No options are recognized.
.SH FILES
.IP "~/.spop3d"
-User configuration file. APOP secret is writed here.
+User configuration file. APOP secret is written here.
.SH SEE ALSO
.PP
.BR spop3d (8),
diff -urNad solid-pop3d/man/spop3d.8 /tmp/dpep.6SKKZb/solid-pop3d/man/spop3d.8
--- solid-pop3d/man/spop3d.8 2005-03-13 11:18:01.000000000 +0100
+++ /tmp/dpep.6SKKZb/solid-pop3d/man/spop3d.8 2005-06-05 15:29:25.000000000 +0200
@@ -119,9 +119,9 @@
User configuration file.
.IP "~/.spop3d-bull"
This file is used by bulletin code to determine last bulletin received by user.
-.IP ${localstatedir}/bulletins"
+.IP "${localstatedir}/bulletins"
Bulletins directory.
-.IP ${sysconfdir}/spop3d.conf"
+.IP "${sysconfdir}/spop3d.conf"
Global configuration file.
.SH SEE ALSO
.PP
diff -urNad solid-pop3d/man/spop3d.conf.5 /tmp/dpep.6SKKZb/solid-pop3d/man/spop3d.conf.5
--- solid-pop3d/man/spop3d.conf.5 2005-03-13 11:18:01.000000000 +0100
+++ /tmp/dpep.6SKKZb/solid-pop3d/man/spop3d.conf.5 2005-06-05 15:29:41.000000000 +0200
@@ -96,6 +96,9 @@
.TP
.B AllowRootLogin boolean
Allow root login. It's disabled by default and shouldn't be changed.
+.br
+.I Debian Note:
+This option is not available in the Debian package.
.TP
.B UserOverride boolean
Allow users specify their maildrops (path and type) and APOP secrets.
@@ -157,7 +160,8 @@
.TP
.B BulletinDirectory string
Specify path to bulletin directory.
-Default value is ${localstatedir}/bulletins (/usr/local/var/bulletins).
+Default value is ${localstatedir}/bulletins.
+.\"(/usr/local/var/bulletins).
.TP
.B LogPriority string
Set logging facility and priority. Default value is local0.notice.
@@ -165,7 +169,7 @@
Known priorities: emerg, alert, crit, err, warning, notice, info, debug.
facility or facility.priority combination are recognized.
.TP
-.B AddBuletins boolean
+.B AddBulletins boolean
Server checks for new bulletins in BulletinDirectory if enabled.
Option is enabled by default.
.TP
@@ -191,7 +195,6 @@
.nf
<Global>
LogPriority daemon.info
- AllowRootLogin yes
MailDropName Maildir
MailDropType maildir
UserBullFile .spop3d-blurp /* It's just an example */
diff -urNad solid-pop3d/src/const.h /tmp/dpep.6SKKZb/solid-pop3d/src/const.h
--- solid-pop3d/src/const.h 2005-03-13 11:18:01.000000000 +0100
+++ /tmp/dpep.6SKKZb/solid-pop3d/src/const.h 2005-06-05 15:29:25.000000000 +0200
@@ -29,14 +29,14 @@
#define AUTH_STATE 0
#define TRANSACTION_STATE 1
-#define SERVICE_NAME "spop3d"
+#define SERVICE_NAME "solid-pop3d"
#define MAXMSGNR 10000
#define SERVER_GREETING "Solid POP3 server ready"
#define DEFAUTOLOGOUTTIME 60
#define DEFWCCOUNT 5
#ifdef MDMAILBOX
-#define DEFMAILDROPNAME "/var/spool/mail/%s"
+#define DEFMAILDROPNAME "/var/mail/%s"
#else
#define DEFMAILDROPNAME "Maildir"
#endif
@@ -58,7 +58,7 @@
#define MIN_DELAY 50
#define POP3_PORT 110
-#define POP_IDENT "spop3d"
+#define POP_IDENT "solid-pop3d"
#define POP_PRIORITY LOG_NOTICE
#define POP_FACILITY LOG_LOCAL0
#endif /* const.h */
|
