diff -Naru bincimap-1.3.3.org/Makefile.in bincimap-1.3.3/Makefile.in
--- bincimap-1.3.3.org/Makefile.in 2004-11-09 20:18:55.000000000 +0000
+++ bincimap-1.3.3/Makefile.in 2004-11-19 09:54:41.000000000 +0000
@@ -397,28 +397,28 @@
@$(BINC_INSTALL_CONF) $(srcdir)/conf/bincimap-localconfig $(DESTDIR)$(sysconfdir) 755
@echo
@echo "* Run files"
- @$(BINC_INSTALL_CONF) $(srcdir)/conf/xinetd-bincimap $(DESTDIR)$(sysconfdir)
- @$(BINC_INSTALL_CONF) $(srcdir)/conf/xinetd-bincimaps $(DESTDIR)$(sysconfdir)
+ @$(BINC_INSTALL_CONF) $(srcdir)/conf/xinetd-bincimap $(DESTDIR)/etc/xinetd.d
+ @$(BINC_INSTALL_CONF) $(srcdir)/conf/xinetd-bincimaps $(DESTDIR)/etc/xinetd.d
@echo
@echo "* Service/run files"
- @$(BINC_INSTALL_CONF) $(srcdir)/service/plain/run $(DESTDIR)$(datadir)/service/bincimap 755
- @$(BINC_INSTALL_CONF) $(srcdir)/service/plain/log/run $(DESTDIR)$(datadir)/service/bincimap/log 755
- @$(BINC_INSTALL_CONF) $(srcdir)/service/ssl/log/run $(DESTDIR)$(datadir)/service/bincimaps/log 755
- @$(BINC_INSTALL_CONF) $(srcdir)/service/ssl/run $(DESTDIR)$(datadir)/service/bincimaps 755
+ @$(BINC_INSTALL_CONF) $(srcdir)/service/plain/run $(DESTDIR)$(sysconfdir)/service/bincimap 755
+ @$(BINC_INSTALL_CONF) $(srcdir)/service/plain/log/run $(DESTDIR)$(sysconfdir)/service/bincimap/log 755
+ @$(BINC_INSTALL_CONF) $(srcdir)/service/ssl/log/run $(DESTDIR)$(sysconfdir)/service/bincimaps/log 755
+ @$(BINC_INSTALL_CONF) $(srcdir)/service/ssl/run $(DESTDIR)$(sysconfdir)/service/bincimaps 755
@echo
@echo "* Documentation"
@$(BINC_INSTALL_DOC) $(srcdir)/man/bincimap.1 $(DESTDIR)$(mandir)/man1
- @$(BINC_INSTALL_DOC) $(srcdir)/ChangeLog $(DESTDIR)$(datadir)/doc/bincimap
- @$(BINC_INSTALL_DOC) $(srcdir)/AUTHORS $(DESTDIR)$(datadir)/doc/bincimap
- @$(BINC_INSTALL_DOC) $(srcdir)/COPYING $(DESTDIR)$(datadir)/doc/bincimap
- @$(BINC_INSTALL_DOC) $(srcdir)/COPYING.OpenSSL $(DESTDIR)$(datadir)/doc/bincimap
- @$(BINC_INSTALL_DOC) $(srcdir)/README $(DESTDIR)$(datadir)/doc/bincimap
- @$(BINC_INSTALL_DOC) $(srcdir)/TODO $(DESTDIR)$(datadir)/doc/bincimap
- @$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-faq.html $(DESTDIR)$(datadir)/doc/bincimap
- @$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-goals.html $(DESTDIR)$(datadir)/doc/bincimap
- @$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-imapdir.html $(DESTDIR)$(datadir)/doc/bincimap
- @$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-tech.html $(DESTDIR)$(datadir)/doc/bincimap
- @$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-faq.html $(DESTDIR)$(datadir)/doc/bincimap
+ @$(BINC_INSTALL_DOC) $(srcdir)/ChangeLog $(DESTDIR)$(datadir)
+ @$(BINC_INSTALL_DOC) $(srcdir)/AUTHORS $(DESTDIR)$(datadir)
+ @$(BINC_INSTALL_DOC) $(srcdir)/COPYING $(DESTDIR)$(datadir)
+ @$(BINC_INSTALL_DOC) $(srcdir)/COPYING.OpenSSL $(DESTDIR)$(datadir)
+ @$(BINC_INSTALL_DOC) $(srcdir)/README $(DESTDIR)$(datadir)
+ @$(BINC_INSTALL_DOC) $(srcdir)/TODO $(DESTDIR)$(datadir)
+ @$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-faq.html $(DESTDIR)$(datadir)
+ @$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-goals.html $(DESTDIR)$(datadir)
+ @$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-imapdir.html $(DESTDIR)$(datadir)
+ @$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-tech.html $(DESTDIR)$(datadir)
+ @$(BINC_INSTALL_DOC) $(srcdir)/doc/bincimap-faq.html $(DESTDIR)$(datadir)
@echo
@echo "* Binaries"
@$(BINC_INSTALL_BIN) src/bincimapd $(DESTDIR)$(bindir)
diff -Naru bincimap-1.3.3.org/conf/xinetd-bincimap bincimap-1.3.3/conf/xinetd-bincimap
--- bincimap-1.3.3.org/conf/xinetd-bincimap 2004-11-09 20:08:05.000000000 +0000
+++ bincimap-1.3.3/conf/xinetd-bincimap 2004-11-19 09:51:30.000000000 +0000
@@ -13,14 +13,14 @@
# description: Binc IMAP
service imap
{
- disable = no
+ disable = yes
flags = REUSE
socket_type = stream
wait = no
user = root
group = root
instances = UNLIMITED
- server = /usr/local/etc/bincimap-config
- server_args = /usr/local/bin/bincimap-up -- /bin/checkpassword /usr/local/etc/bincimap-localconfig /usr/local/bin/bincimapd Maildir
+ server = /etc/bincimap/bincimap-config
+ server_args = /usr/bin/bincimap-up -- /bin/checkpassword /etc/bincimap/bincimap-localconfig /usr/bin/bincimapd Maildir
log_type = SYSLOG daemon info
}
diff -Naru bincimap-1.3.3.org/conf/xinetd-bincimap.in bincimap-1.3.3/conf/xinetd-bincimap.in
--- bincimap-1.3.3.org/conf/xinetd-bincimap.in 2004-05-24 10:17:16.000000000 +0100
+++ bincimap-1.3.3/conf/xinetd-bincimap.in 2004-11-29 01:35:09.020518914 +0000
@@ -13,7 +13,7 @@
# description: Binc IMAP
service imap
{
- disable = no
+ disable = yes
flags = REUSE
socket_type = stream
wait = no
diff -Naru bincimap-1.3.3.org/conf/xinetd-bincimaps bincimap-1.3.3/conf/xinetd-bincimaps
--- bincimap-1.3.3.org/conf/xinetd-bincimaps 2004-11-09 20:08:05.000000000 +0000
+++ bincimap-1.3.3/conf/xinetd-bincimaps 2004-11-19 09:50:53.000000000 +0000
@@ -13,14 +13,14 @@
# description: Binc IMAP, SSL
service imaps
{
- disable = no
+ disable = yes
flags = REUSE
socket_type = stream
wait = no
user = root
group = root
instances = UNLIMITED
- server = /usr/local/etc/bincimap-config
- server_args = /usr/local/bin/bincimap-up --enable-ssl -- /bin/checkpassword /usr/local/etc/bincimap-localconfig /usr/local/bin/bincimapd Maildir
+ server = /etc/bincimap/bincimap-config
+ server_args = /usr/bin/bincimap-up --enable-ssl -- /bin/checkpassword /etc/bincimap/bincimap-localconfig /usr/bin/bincimapd Maildir
log_type = SYSLOG daemon info
}
diff -Naru bincimap-1.3.3.org/conf/xinetd-bincimaps.in bincimap-1.3.3/conf/xinetd-bincimaps.in
--- bincimap-1.3.3.org/conf/xinetd-bincimaps.in 2004-05-24 10:17:16.000000000 +0100
+++ bincimap-1.3.3/conf/xinetd-bincimaps.in 2004-11-29 01:35:20.008893378 +0000
@@ -13,7 +13,7 @@
# description: Binc IMAP, SSL
service imaps
{
- disable = no
+ disable = yes
flags = REUSE
socket_type = stream
wait = no
diff -Naru bincimap-1.3.3.org/service/plain/log/run.in bincimap-1.3.3/service/plain/log/run.in
--- bincimap-1.3.3.org/service/plain/log/run.in 2004-06-17 21:37:33.000000000 +0100
+++ bincimap-1.3.3/service/plain/log/run.in 2004-11-16 14:52:51.000000000 +0000
@@ -14,5 +14,5 @@
exec 2>&1
-exec multilog t n5 s1048576 @localstatedir@/log/bincimap
+exec multilog t n5 s1048576 /var/log/bincimap
diff -Naru bincimap-1.3.3.org/service/ssl/log/run.in bincimap-1.3.3/service/ssl/log/run.in
--- bincimap-1.3.3.org/service/ssl/log/run.in 2004-06-17 21:37:33.000000000 +0100
+++ bincimap-1.3.3/service/ssl/log/run.in 2004-11-16 14:52:58.000000000 +0000
@@ -14,5 +14,5 @@
exec 2>&1
-exec multilog t n5 s1048576 @localstatedir@/log/bincimap-ssl
+exec multilog t n5 s1048576 /var/log/bincimap-ssl