|
[-]
[+]
|
Changed |
vpopmail.spec
|
|
|
|
[-]
[+]
|
Deleted |
supervise-smtp-auth.diff
^
|
| @@ -1,18 +0,0 @@
---- supervise/qmail-smtpd/run.orig 2008-04-30 21:22:53.000000000 +0200
-+++ supervise/qmail-smtpd/run 2008-04-30 21:28:44.000000000 +0200
-@@ -33,4 +33,5 @@
- # start SMTP service
- exec /usr/sbin/softlimit -m 16000000 \
- /usr/bin/tcpserver -v -R -l "$ME" -x $TCP_DIR/tcp.smtp.cdb -c "$MAXSMTPD" \
-- -u "$QMAILDUID" -g "$NOFILESGID" 0 smtp $QMAIL/bin/qmail-smtpd 2>&1
-+ -u "$QMAILDUID" -g "$NOFILESGID" 0 smtp $QMAIL/bin/qmail-smtpd \
-+ /var/vpopmail/bin/vchkpw /bin/true 2>&1
---- supervise/qmail-msa/run.orig 2008-05-01 16:28:58.000000000 +0200
-+++ supervise/qmail-msa/run 2008-05-01 16:29:30.000000000 +0200
-@@ -33,4 +33,5 @@
- # start SMTP service
- exec /usr/sbin/softlimit -m 16000000 \
- /usr/bin/tcpserver -v -R -l "$ME" -x $TCP_DIR/tcp.msa.cdb -c "$MAXSMTPD" \
-- -u "$QMAILDUID" -g "$NOFILESGID" 0 submission $QMAIL/bin/qmail-smtpd 2>&1
-+ -u "$QMAILDUID" -g "$NOFILESGID" 0 submission $QMAIL/bin/qmail-smtpd \
-+ /var/vpopmail/bin/vchkpw /bin/true 2>&1
|
|
[-]
[+]
|
Deleted |
vpopmail-5.4.26-skel4.patch
^
|
| @@ -1,633 +0,0 @@
-diff -ruN vpopmail-5.4.26-factory/Makefile.am vpopmail-5.4.26-patched/Makefile.am
---- vpopmail-5.4.26-factory/Makefile.am 2007-11-03 21:05:20.000000000 -0400
-+++ vpopmail-5.4.26-patched/Makefile.am 2008-02-12 17:35:33.000000000 -0500
-@@ -7,9 +7,9 @@
-
- EXTRA_DIST=README.* cdb/* vcdb.c vldap.c vmysql.c voracle.pc vpgsql.c vsybase.c
-
--noinst_HEADERS=md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h
-+noinst_HEADERS=md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h copydir.h
-
--COMMONSOURCES=vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c
-+COMMONSOURCES=vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c copydir.c
-
- CONFIG_CLEAN_FILES=vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load
-
-diff -ruN vpopmail-5.4.26-factory/Makefile.in vpopmail-5.4.26-patched/Makefile.in
---- vpopmail-5.4.26-factory/Makefile.in 2007-11-15 04:41:22.000000000 -0500
-+++ vpopmail-5.4.26-patched/Makefile.in 2008-02-12 17:35:33.000000000 -0500
-@@ -71,7 +71,8 @@
- libvpopmail_a-vpalias.$(OBJEXT) libvpopmail_a-seek.$(OBJEXT) \
- libvpopmail_a-vlimits.$(OBJEXT) \
- libvpopmail_a-maildirquota.$(OBJEXT) \
-- libvpopmail_a-vutil.$(OBJEXT) libvpopmail_a-vlistlib.$(OBJEXT)
-+ libvpopmail_a-vutil.$(OBJEXT) libvpopmail_a-vlistlib.$(OBJEXT) \
-+ libvpopmail_a-copydir.$(OBJEXT)
- am_libvpopmail_a_OBJECTS = $(am__objects_1)
- libvpopmail_a_OBJECTS = $(am_libvpopmail_a_OBJECTS)
- am__installdirs = "$(DESTDIR)$(vpopmailbindir)"
-@@ -309,8 +310,8 @@
- vpopuser = @vpopuser@
- SUBDIRS = cdb
- EXTRA_DIST = README.* cdb/* vcdb.c vldap.c vmysql.c voracle.pc vpgsql.c vsybase.c
--noinst_HEADERS = md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h
--COMMONSOURCES = vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c
-+noinst_HEADERS = md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h copydir.h
-+COMMONSOURCES = vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c copydir.c
- CONFIG_CLEAN_FILES = vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load
- MYSQLCONF = $(DESTDIR)@vpopmaildir@/etc/vpopmail.mysql
- VLIMITS = $(DESTDIR)@vpopmaildir@/etc/vlimits.default
-@@ -609,6 +610,12 @@
- libvpopmail_a-vlistlib.obj: vlistlib.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-vlistlib.obj `if test -f 'vlistlib.c'; then $(CYGPATH_W) 'vlistlib.c'; else $(CYGPATH_W) '$(srcdir)/vlistlib.c'; fi`
-
-+libvpopmail_a-copydir.o: copydir.c
-+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-copydir.o `test -f 'copydir.c' || echo '$(srcdir)/'`copydir.c
-+
-+libvpopmail_a-copydir.obj: copydir.c
-+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-copydir.obj `if test -f 'copydir.c'; then $(CYGPATH_W) 'copydir.c'; else $(CYGPATH_W) '$(srcdir)/copydir.c'; fi`
-+
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-diff -ruN vpopmail-5.4.26-factory/README.skel vpopmail-5.4.26-patched/README.skel
---- vpopmail-5.4.26-factory/README.skel 1969-12-31 19:00:00.000000000 -0500
-+++ vpopmail-5.4.26-patched/README.skel 2008-02-12 17:35:33.000000000 -0500
-@@ -0,0 +1,19 @@
-+README for the --enable-skeleton configure option
-+John Simpson <jms1@jms1.net> 2007-09-19
-+-----------------------------------------------------------
-+
-+When you use the --enable-skeleton option on your ./configure command
-+line, vpopmail will use ~vpopmail/skel as a template for creating new
-+mailboxes, much like how most *nix systems use the "/etc/skel" directory
-+as a template for new user accounts' home directories.
-+
-+Any files and/or directories within ~vpopmail/skel will be copied to the
-+new mailbox, with their structure and permissions preserved, and the
-+ownership of all new files and directories set to the uid/gid which owns
-+the mailbox (normally the vpopmail user, but it may be different if the
-+domain is controlled by a different system userid.)
-+
-+If the ~vpopmail/skel directory does not exist, or does not contain the
-+standard Maildir structure, it will be created regardless. This way the
-+required Maildir directory structure will exist regardless of what you
-+may be doing with the ~vpopmail/skel directory.
-diff -ruN vpopmail-5.4.26-factory/config.h.in vpopmail-5.4.26-patched/config.h.in
---- vpopmail-5.4.26-factory/config.h.in 2007-11-15 04:42:32.000000000 -0500
-+++ vpopmail-5.4.26-patched/config.h.in 2008-02-12 17:35:33.000000000 -0500
-@@ -214,6 +214,9 @@
- #undef ONCHANGE_SCRIPT
-
- /* "" */
-+#undef SKELETON
-+
-+/* "" */
- #undef OPEN_SMTP_CUR_FILE
-
- /* "" */
-diff -ruN vpopmail-5.4.26-factory/configure vpopmail-5.4.26-patched/configure
---- vpopmail-5.4.26-factory/configure 2007-11-15 04:41:27.000000000 -0500
-+++ vpopmail-5.4.26-patched/configure 2008-02-12 17:35:33.000000000 -0500
-@@ -1324,6 +1324,7 @@
- --enable-qmail-ext Enable qmail email address extension support.
- --enable-ip-alias-domains Enable mapping of default domain via reverse ip lookup table.
- --enable-onchange-script Enable onchange script. See README.onchange for more info.
-+ --enable-skeleton Enable skeleton directory. See README.skel for more info.
- --enable-spamassassin Enable spamassassin. See README.spamassassin for more info.
- --enable-spamc-prog=PATH Full path to spamc program /usr/{local/}bin/spamc.
- --enable-maildrop Enable maildrop. See README.maildrop for more info.
-@@ -7068,6 +7069,35 @@
-
- #----------------------------------------------------------------------
-
-+echo "$as_me:$LINENO: checking whether skeleton directory is enabled" >&5
-+echo $ECHO_N "checking whether skeleton directory is enabled... $ECHO_C" >&6
-+# Check whether --enable-skeleton or --disable-skeleton was given.
-+if test "${enable_skeleton+set}" = set; then
-+ enableval="$enable_skeleton"
-+ ENABLE_SKELETON=$enableval
-+else
-+
-+ ENABLE_SKELETON=0
-+
-+
-+fi;
-+
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ ENABLE_SKELETON=1
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SKELETON $ENABLE_SKEL
-+_ACEOF
-+
-+ ;;
-+ *)
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ ;;
-+esac
-
- #----------------------------------------------------------------------
-
-@@ -9799,6 +9829,16 @@
- esac
-
-
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ echo "skeleton directory = ON --enable-skeleton"
-+ ;;
-+ *)
-+ echo "skeleton directory = OFF --disable-skeleton (default)"
-+ ;;
-+esac
-+
-+
- #case $ENABLE_DOMAIN_QUOTAS in
- # 1*|y*|Y*)
- # echo " domain quotas = ON --enable-domainquotas"
-diff -ruN vpopmail-5.4.26-factory/configure.in vpopmail-5.4.26-patched/configure.in
---- vpopmail-5.4.26-factory/configure.in 2007-10-19 03:32:26.000000000 -0400
-+++ vpopmail-5.4.26-patched/configure.in 2008-02-12 17:35:33.000000000 -0500
-@@ -851,6 +851,25 @@
-
- #----------------------------------------------------------------------
-
-+AC_MSG_CHECKING(whether skeleton directory is enabled)
-+AC_ARG_ENABLE(skeleton,
-+ [ --enable-skeleton Enable skeleton directory. See README.skel for more info.],
-+ ENABLE_SKELETON=$enableval,
-+ [
-+ ENABLE_SKELETON=0
-+ ]
-+)
-+
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ AC_MSG_RESULT(yes)
-+ ENABLE_SKELETON=1
-+ AC_DEFINE_UNQUOTED(SKELETON,$ENABLE_SKEL,"")
-+ ;;
-+ *)
-+ AC_MSG_RESULT(no)
-+ ;;
-+esac
-
- #----------------------------------------------------------------------
-
-@@ -1666,6 +1685,16 @@
- esac
-
-
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ echo "skeleton directory = ON --enable-skeleton"
-+ ;;
-+ *)
-+ echo "skeleton directory = OFF --disable-skeleton (default)"
-+ ;;
-+esac
-+
-+
- #case $ENABLE_DOMAIN_QUOTAS in
- # 1*|y*|Y*)
- # echo " domain quotas = ON --enable-domainquotas"
-diff -ruN vpopmail-5.4.26-factory/copydir.c vpopmail-5.4.26-patched/copydir.c
|
|
[-]
[+]
|
Deleted |
vpopmail-5.4.26-skel4_copydir.patch
^
|
| @@ -1,11 +0,0 @@
---- copydir.c.orig 2008-10-19 17:29:17.000000000 +0200
-+++ copydir.c 2008-10-19 17:31:50.000000000 +0200
-@@ -102,7 +102,7 @@
- return -1 ;
- }
-
-- ofd = open ( dst , O_WRONLY | O_CREAT | O_TRUNC ) ;
-+ ofd = open ( dst , O_WRONLY | O_CREAT | O_TRUNC , 0600 ) ;
- if ( -1 == ofd )
- {
- fprintf ( stderr , "copyfile(): open(%s) for write: %s\n" ,
|
|
[-]
[+]
|
Deleted |
vpopmail-5.4.27-makefile-am.patch
^
|
| @@ -1,14 +0,0 @@
---- vpopmail-5.4.27/Makefile.am.orig 2009-01-15 16:31:23.000000000 +0100
-+++ vpopmail-5.4.27/Makefile.am 2009-01-16 23:34:03.000000000 +0100
-@@ -7,9 +7,9 @@
-
- EXTRA_DIST=README.* cdb/* vcdb.c vldap.c vmysql.c voracle.pc vpgsql.c vsybase.c
-
--noinst_HEADERS=md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h
-+noinst_HEADERS=md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h copydir.h
-
--COMMONSOURCES=vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c backfill.c
-+COMMONSOURCES=vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c backfill.c copydir.c
-
- CONFIG_CLEAN_FILES=vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load
-
|
|
[-]
[+]
|
Deleted |
vpopmail-5.4.27-makefile.diff
^
|
| @@ -1,65 +0,0 @@
---- Makefile.in.orig 2008-04-28 22:13:53.000000000 +0200
-+++ Makefile.in 2008-04-28 22:17:26.000000000 +0200
-@@ -228,7 +228,7 @@
- GREP = @GREP@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--INSTALL_PROGRAM = ${INSTALL} -o @vpopuser@ -m 711 -g @vpopgroup@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = ${INSTALL_PROGRAM} -s
- LDFLAGS = @LDFLAGS@
-@@ -1001,13 +1001,13 @@
- install-exec-am:
- for d in bin doc etc include lib ; do \
- if test ! -d $(DESTDIR)@vpopmaildir@/$$d; then \
-- $(INSTALL) -d -g @vpopgroup@ -m 0755 -o @vpopuser@ \
-+ $(INSTALL) -d \
- $(DESTDIR)@vpopmaildir@/$$d ; \
- fi ; \
- done
-
- install-data-local:
-- $(INSTALL) -d -g @vpopgroup@ -m 0700 -o @vpopuser@ \
-+ $(INSTALL) -d \
- $(DESTDIR)@vpopmaildir@/@domains_dir@
-
- echo "-I@vpopmaildir@/include" > \
-@@ -1016,7 +1016,7 @@
- $(DESTDIR)@vpopmaildir@/etc/lib_deps
-
- if test ! -r $(VLIMITS); then \
-- $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
-+ $(INSTALL) \
- vlimits.default $(VLIMITS); \
- fi
- if test "@USE_MYSQL@" = "1"; then \
-@@ -1044,23 +1044,23 @@
- chmod 0640 $(MYSQLCONF) ; \
- fi
-
-- $(INSTALL) -o root -m 0644 \
-+ $(INSTALL) \
- libvpopmail.a $(DESTDIR)@vpopmaildir@/lib/libvpopmail.a
-
-- $(INSTALL) -o root -m 0444 \
-+ $(INSTALL) \
- config.h $(DESTDIR)@vpopmaildir@/include/vpopmail_config.h
-
- for include in vpopmail.h config.h vauth.h vlimits.h ; do \
-- $(INSTALL) -o root -m 0444 $$include \
-+ $(INSTALL) $$include \
- $(DESTDIR)@vpopmaildir@/include/ ; \
- done
-
- $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/man_html
- $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/doc_html
-- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
-+ $(INSTALL) \
- doc/man_html/*.* $(DESTDIR)@vpopmaildir@/doc/man_html/
-
-- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
-+ $(INSTALL) \
- doc/doc_html/*.* $(DESTDIR)@vpopmaildir@/doc/doc_html/
-
- fix-priv:
|
|
[-]
[+]
|
Deleted |
vpopmail-5.4.27-skel4.patch
^
|
| @@ -1,615 +0,0 @@
---- vpopmail-5.4.27/Makefile.in.orig 2009-02-18 20:12:52.000000000 +0100
-+++ vpopmail-5.4.27/Makefile.in 2009-02-18 20:14:35.000000000 +0100
-@@ -79,6 +79,7 @@
- libvpopmail_a-vlimits.$(OBJEXT) \
- libvpopmail_a-maildirquota.$(OBJEXT) \
- libvpopmail_a-vutil.$(OBJEXT) libvpopmail_a-vlistlib.$(OBJEXT) \
-+ libvpopmail_a-copydir.$(OBJEXT) \
- libvpopmail_a-backfill.$(OBJEXT)
- am_libvpopmail_a_OBJECTS = $(am__objects_1)
- libvpopmail_a_OBJECTS = $(am_libvpopmail_a_OBJECTS)
-@@ -305,8 +306,8 @@
- vpopuser = @vpopuser@
- SUBDIRS = cdb
- EXTRA_DIST = README.* cdb/* vcdb.c vldap.c vmysql.c voracle.pc vpgsql.c vsybase.c
--noinst_HEADERS = md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h
--COMMONSOURCES = vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c backfill.c
-+noinst_HEADERS = md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h copydir.h
-+COMMONSOURCES = vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c backfill.c copydir.c
- CONFIG_CLEAN_FILES = vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load
- MYSQLCONF = $(DESTDIR)@vpopmaildir@/etc/vpopmail.mysql
- VLIMITS = $(DESTDIR)@vpopmaildir@/etc/vlimits.default
-@@ -609,6 +610,12 @@
- libvpopmail_a-vlistlib.obj: vlistlib.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-vlistlib.obj `if test -f 'vlistlib.c'; then $(CYGPATH_W) 'vlistlib.c'; else $(CYGPATH_W) '$(srcdir)/vlistlib.c'; fi`
-
-+libvpopmail_a-copydir.o: copydir.c
-+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-copydir.o `test -f 'copydir.c' || echo '$(srcdir)/'`copydir.c
-+
-+libvpopmail_a-copydir.obj: copydir.c
-+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-copydir.obj `if test -f 'copydir.c'; then $(CYGPATH_W) 'copydir.c'; else $(CYGPATH_W) '$(srcdir)/copydir.c'; fi`
-+
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-diff -ruN vpopmail-5.4.26-factory/README.skel vpopmail-5.4.26-patched/README.skel
---- vpopmail-5.4.26-factory/README.skel 1969-12-31 19:00:00.000000000 -0500
-+++ vpopmail-5.4.26-patched/README.skel 2008-02-12 17:35:33.000000000 -0500
-@@ -0,0 +1,19 @@
-+README for the --enable-skeleton configure option
-+John Simpson <jms1@jms1.net> 2007-09-19
-+-----------------------------------------------------------
-+
-+When you use the --enable-skeleton option on your ./configure command
-+line, vpopmail will use ~vpopmail/skel as a template for creating new
-+mailboxes, much like how most *nix systems use the "/etc/skel" directory
-+as a template for new user accounts' home directories.
-+
-+Any files and/or directories within ~vpopmail/skel will be copied to the
-+new mailbox, with their structure and permissions preserved, and the
-+ownership of all new files and directories set to the uid/gid which owns
-+the mailbox (normally the vpopmail user, but it may be different if the
-+domain is controlled by a different system userid.)
-+
-+If the ~vpopmail/skel directory does not exist, or does not contain the
-+standard Maildir structure, it will be created regardless. This way the
-+required Maildir directory structure will exist regardless of what you
-+may be doing with the ~vpopmail/skel directory.
-diff -ruN vpopmail-5.4.26-factory/config.h.in vpopmail-5.4.26-patched/config.h.in
---- vpopmail-5.4.26-factory/config.h.in 2007-11-15 04:42:32.000000000 -0500
-+++ vpopmail-5.4.26-patched/config.h.in 2008-02-12 17:35:33.000000000 -0500
-@@ -214,6 +214,9 @@
- #undef ONCHANGE_SCRIPT
-
- /* "" */
-+#undef SKELETON
-+
-+/* "" */
- #undef OPEN_SMTP_CUR_FILE
-
- /* "" */
-diff -ruN vpopmail-5.4.26-factory/configure vpopmail-5.4.26-patched/configure
---- vpopmail-5.4.26-factory/configure 2007-11-15 04:41:27.000000000 -0500
-+++ vpopmail-5.4.26-patched/configure 2008-02-12 17:35:33.000000000 -0500
-@@ -1324,6 +1324,7 @@
- --enable-qmail-ext Enable qmail email address extension support.
- --enable-ip-alias-domains Enable mapping of default domain via reverse ip lookup table.
- --enable-onchange-script Enable onchange script. See README.onchange for more info.
-+ --enable-skeleton Enable skeleton directory. See README.skel for more info.
- --enable-spamassassin Enable spamassassin. See README.spamassassin for more info.
- --enable-spamc-prog=PATH Full path to spamc program /usr/{local/}bin/spamc.
- --enable-maildrop Enable maildrop. See README.maildrop for more info.
-@@ -7068,6 +7069,35 @@
-
- #----------------------------------------------------------------------
-
-+echo "$as_me:$LINENO: checking whether skeleton directory is enabled" >&5
-+echo $ECHO_N "checking whether skeleton directory is enabled... $ECHO_C" >&6
-+# Check whether --enable-skeleton or --disable-skeleton was given.
-+if test "${enable_skeleton+set}" = set; then
-+ enableval="$enable_skeleton"
-+ ENABLE_SKELETON=$enableval
-+else
-+
-+ ENABLE_SKELETON=0
-+
-+
-+fi;
-+
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ ENABLE_SKELETON=1
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SKELETON $ENABLE_SKEL
-+_ACEOF
-+
-+ ;;
-+ *)
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ ;;
-+esac
-
- #----------------------------------------------------------------------
-
-@@ -9799,6 +9829,16 @@
- esac
-
-
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ echo "skeleton directory = ON --enable-skeleton"
-+ ;;
-+ *)
-+ echo "skeleton directory = OFF --disable-skeleton (default)"
-+ ;;
-+esac
-+
-+
- #case $ENABLE_DOMAIN_QUOTAS in
- # 1*|y*|Y*)
- # echo " domain quotas = ON --enable-domainquotas"
-diff -ruN vpopmail-5.4.26-factory/configure.in vpopmail-5.4.26-patched/configure.in
---- vpopmail-5.4.26-factory/configure.in 2007-10-19 03:32:26.000000000 -0400
-+++ vpopmail-5.4.26-patched/configure.in 2008-02-12 17:35:33.000000000 -0500
-@@ -851,6 +851,25 @@
-
- #----------------------------------------------------------------------
-
-+AC_MSG_CHECKING(whether skeleton directory is enabled)
-+AC_ARG_ENABLE(skeleton,
-+ [ --enable-skeleton Enable skeleton directory. See README.skel for more info.],
-+ ENABLE_SKELETON=$enableval,
-+ [
-+ ENABLE_SKELETON=0
-+ ]
-+)
-+
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ AC_MSG_RESULT(yes)
-+ ENABLE_SKELETON=1
-+ AC_DEFINE_UNQUOTED(SKELETON,$ENABLE_SKEL,"")
-+ ;;
-+ *)
-+ AC_MSG_RESULT(no)
-+ ;;
-+esac
-
- #----------------------------------------------------------------------
-
-@@ -1666,6 +1685,16 @@
- esac
-
-
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ echo "skeleton directory = ON --enable-skeleton"
-+ ;;
-+ *)
-+ echo "skeleton directory = OFF --disable-skeleton (default)"
-+ ;;
-+esac
-+
-+
- #case $ENABLE_DOMAIN_QUOTAS in
- # 1*|y*|Y*)
- # echo " domain quotas = ON --enable-domainquotas"
-diff -ruN vpopmail-5.4.26-factory/copydir.c vpopmail-5.4.26-patched/copydir.c
---- vpopmail-5.4.26-factory/copydir.c 1969-12-31 19:00:00.000000000 -0500
-+++ vpopmail-5.4.26-patched/copydir.c 2008-02-12 17:35:33.000000000 -0500
-@@ -0,0 +1,309 @@
-+/* copydir.c
-+ * John Simpson <jms1@jms1.net> 2007-09-18
-+ *
-+ * 2007-12-28 jms1 - using S_ISLNK() macro. i don't really remember why,
-+ * but i do remember that when i first wrote this code years ago, i
-+ * avoided using this particular macro for some reason. thanks to rance
-+ * hall for pointing out the problem.
-+ *
-+ ****************************************************************************
-+ *
-+ * Copyright (C) 2001,2007 John Simpson.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
|
|
[-]
[+]
|
Deleted |
vpopmail-5.4.27-skel4.patch.bak
^
|
| @@ -1,618 +0,0 @@
-diff -ruN vpopmail-5.4.26-factory/Makefile.in vpopmail-5.4.26-patched/Makefile.in
---- vpopmail-5.4.26-factory/Makefile.in 2007-11-15 04:41:22.000000000 -0500
-+++ vpopmail-5.4.26-patched/Makefile.in 2008-02-12 17:35:33.000000000 -0500
-@@ -71,7 +71,8 @@
- libvpopmail_a-vpalias.$(OBJEXT) libvpopmail_a-seek.$(OBJEXT) \
- libvpopmail_a-vlimits.$(OBJEXT) \
- libvpopmail_a-maildirquota.$(OBJEXT) \
-- libvpopmail_a-vutil.$(OBJEXT) libvpopmail_a-vlistlib.$(OBJEXT)
-+ libvpopmail_a-vutil.$(OBJEXT) libvpopmail_a-vlistlib.$(OBJEXT) \
-+ libvpopmail_a-copydir.$(OBJEXT)
- am_libvpopmail_a_OBJECTS = $(am__objects_1)
- libvpopmail_a_OBJECTS = $(am_libvpopmail_a_OBJECTS)
- am__installdirs = "$(DESTDIR)$(vpopmailbindir)"
-@@ -309,8 +310,8 @@
- vpopuser = @vpopuser@
- SUBDIRS = cdb
- EXTRA_DIST = README.* cdb/* vcdb.c vldap.c vmysql.c voracle.pc vpgsql.c vsybase.c
--noinst_HEADERS = md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h
--COMMONSOURCES = vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c
-+noinst_HEADERS = md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h copydir.h
-+COMMONSOURCES = vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c copydir.c
- CONFIG_CLEAN_FILES = vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load
- MYSQLCONF = $(DESTDIR)@vpopmaildir@/etc/vpopmail.mysql
- VLIMITS = $(DESTDIR)@vpopmaildir@/etc/vlimits.default
-@@ -609,6 +610,12 @@
- libvpopmail_a-vlistlib.obj: vlistlib.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-vlistlib.obj `if test -f 'vlistlib.c'; then $(CYGPATH_W) 'vlistlib.c'; else $(CYGPATH_W) '$(srcdir)/vlistlib.c'; fi`
-
-+libvpopmail_a-copydir.o: copydir.c
-+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-copydir.o `test -f 'copydir.c' || echo '$(srcdir)/'`copydir.c
-+
-+libvpopmail_a-copydir.obj: copydir.c
-+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-copydir.obj `if test -f 'copydir.c'; then $(CYGPATH_W) 'copydir.c'; else $(CYGPATH_W) '$(srcdir)/copydir.c'; fi`
-+
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-diff -ruN vpopmail-5.4.26-factory/README.skel vpopmail-5.4.26-patched/README.skel
---- vpopmail-5.4.26-factory/README.skel 1969-12-31 19:00:00.000000000 -0500
-+++ vpopmail-5.4.26-patched/README.skel 2008-02-12 17:35:33.000000000 -0500
-@@ -0,0 +1,19 @@
-+README for the --enable-skeleton configure option
-+John Simpson <jms1@jms1.net> 2007-09-19
-+-----------------------------------------------------------
-+
-+When you use the --enable-skeleton option on your ./configure command
-+line, vpopmail will use ~vpopmail/skel as a template for creating new
-+mailboxes, much like how most *nix systems use the "/etc/skel" directory
-+as a template for new user accounts' home directories.
-+
-+Any files and/or directories within ~vpopmail/skel will be copied to the
-+new mailbox, with their structure and permissions preserved, and the
-+ownership of all new files and directories set to the uid/gid which owns
-+the mailbox (normally the vpopmail user, but it may be different if the
-+domain is controlled by a different system userid.)
-+
-+If the ~vpopmail/skel directory does not exist, or does not contain the
-+standard Maildir structure, it will be created regardless. This way the
-+required Maildir directory structure will exist regardless of what you
-+may be doing with the ~vpopmail/skel directory.
-diff -ruN vpopmail-5.4.26-factory/config.h.in vpopmail-5.4.26-patched/config.h.in
---- vpopmail-5.4.26-factory/config.h.in 2007-11-15 04:42:32.000000000 -0500
-+++ vpopmail-5.4.26-patched/config.h.in 2008-02-12 17:35:33.000000000 -0500
-@@ -214,6 +214,9 @@
- #undef ONCHANGE_SCRIPT
-
- /* "" */
-+#undef SKELETON
-+
-+/* "" */
- #undef OPEN_SMTP_CUR_FILE
-
- /* "" */
-diff -ruN vpopmail-5.4.26-factory/configure vpopmail-5.4.26-patched/configure
---- vpopmail-5.4.26-factory/configure 2007-11-15 04:41:27.000000000 -0500
-+++ vpopmail-5.4.26-patched/configure 2008-02-12 17:35:33.000000000 -0500
-@@ -1324,6 +1324,7 @@
- --enable-qmail-ext Enable qmail email address extension support.
- --enable-ip-alias-domains Enable mapping of default domain via reverse ip lookup table.
- --enable-onchange-script Enable onchange script. See README.onchange for more info.
-+ --enable-skeleton Enable skeleton directory. See README.skel for more info.
- --enable-spamassassin Enable spamassassin. See README.spamassassin for more info.
- --enable-spamc-prog=PATH Full path to spamc program /usr/{local/}bin/spamc.
- --enable-maildrop Enable maildrop. See README.maildrop for more info.
-@@ -7068,6 +7069,35 @@
-
- #----------------------------------------------------------------------
-
-+echo "$as_me:$LINENO: checking whether skeleton directory is enabled" >&5
-+echo $ECHO_N "checking whether skeleton directory is enabled... $ECHO_C" >&6
-+# Check whether --enable-skeleton or --disable-skeleton was given.
-+if test "${enable_skeleton+set}" = set; then
-+ enableval="$enable_skeleton"
-+ ENABLE_SKELETON=$enableval
-+else
-+
-+ ENABLE_SKELETON=0
-+
-+
-+fi;
-+
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ ENABLE_SKELETON=1
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SKELETON $ENABLE_SKEL
-+_ACEOF
-+
-+ ;;
-+ *)
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ ;;
-+esac
-
- #----------------------------------------------------------------------
-
-@@ -9799,6 +9829,16 @@
- esac
-
-
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ echo "skeleton directory = ON --enable-skeleton"
-+ ;;
-+ *)
-+ echo "skeleton directory = OFF --disable-skeleton (default)"
-+ ;;
-+esac
-+
-+
- #case $ENABLE_DOMAIN_QUOTAS in
- # 1*|y*|Y*)
- # echo " domain quotas = ON --enable-domainquotas"
-diff -ruN vpopmail-5.4.26-factory/configure.in vpopmail-5.4.26-patched/configure.in
---- vpopmail-5.4.26-factory/configure.in 2007-10-19 03:32:26.000000000 -0400
-+++ vpopmail-5.4.26-patched/configure.in 2008-02-12 17:35:33.000000000 -0500
-@@ -851,6 +851,25 @@
-
- #----------------------------------------------------------------------
-
-+AC_MSG_CHECKING(whether skeleton directory is enabled)
-+AC_ARG_ENABLE(skeleton,
-+ [ --enable-skeleton Enable skeleton directory. See README.skel for more info.],
-+ ENABLE_SKELETON=$enableval,
-+ [
-+ ENABLE_SKELETON=0
-+ ]
-+)
-+
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ AC_MSG_RESULT(yes)
-+ ENABLE_SKELETON=1
-+ AC_DEFINE_UNQUOTED(SKELETON,$ENABLE_SKEL,"")
-+ ;;
-+ *)
-+ AC_MSG_RESULT(no)
-+ ;;
-+esac
-
- #----------------------------------------------------------------------
-
-@@ -1666,6 +1685,16 @@
- esac
-
-
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ echo "skeleton directory = ON --enable-skeleton"
-+ ;;
-+ *)
-+ echo "skeleton directory = OFF --disable-skeleton (default)"
-+ ;;
-+esac
-+
-+
- #case $ENABLE_DOMAIN_QUOTAS in
- # 1*|y*|Y*)
- # echo " domain quotas = ON --enable-domainquotas"
-diff -ruN vpopmail-5.4.26-factory/copydir.c vpopmail-5.4.26-patched/copydir.c
---- vpopmail-5.4.26-factory/copydir.c 1969-12-31 19:00:00.000000000 -0500
-+++ vpopmail-5.4.26-patched/copydir.c 2008-02-12 17:35:33.000000000 -0500
-@@ -0,0 +1,309 @@
-+/* copydir.c
-+ * John Simpson <jms1@jms1.net> 2007-09-18
-+ *
-+ * 2007-12-28 jms1 - using S_ISLNK() macro. i don't really remember why,
-+ * but i do remember that when i first wrote this code years ago, i
-+ * avoided using this particular macro for some reason. thanks to rance
-+ * hall for pointing out the problem.
-+ *
-+ ****************************************************************************
-+ *
-+ * Copyright (C) 2001,2007 John Simpson.
-+ *
|
|
[-]
[+]
|
Deleted |
vpopmail-5.4.27-skel4.patch.tmp
^
|
| @@ -1,594 +0,0 @@
-@@ -609,6 +610,12 @@
- libvpopmail_a-vlistlib.obj: vlistlib.c
- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-vlistlib.obj `if test -f 'vlistlib.c'; then $(CYGPATH_W) 'vlistlib.c'; else $(CYGPATH_W) '$(srcdir)/vlistlib.c'; fi`
-
-+libvpopmail_a-copydir.o: copydir.c
-+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-copydir.o `test -f 'copydir.c' || echo '$(srcdir)/'`copydir.c
-+
-+libvpopmail_a-copydir.obj: copydir.c
-+ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvpopmail_a_CFLAGS) $(CFLAGS) -c -o libvpopmail_a-copydir.obj `if test -f 'copydir.c'; then $(CYGPATH_W) 'copydir.c'; else $(CYGPATH_W) '$(srcdir)/copydir.c'; fi`
-+
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
- # To change the values of `make' variables: instead of editing Makefiles,
-diff -ruN vpopmail-5.4.26-factory/README.skel vpopmail-5.4.26-patched/README.skel
---- vpopmail-5.4.26-factory/README.skel 1969-12-31 19:00:00.000000000 -0500
-+++ vpopmail-5.4.26-patched/README.skel 2008-02-12 17:35:33.000000000 -0500
-@@ -0,0 +1,19 @@
-+README for the --enable-skeleton configure option
-+John Simpson <jms1@jms1.net> 2007-09-19
-+-----------------------------------------------------------
-+
-+When you use the --enable-skeleton option on your ./configure command
-+line, vpopmail will use ~vpopmail/skel as a template for creating new
-+mailboxes, much like how most *nix systems use the "/etc/skel" directory
-+as a template for new user accounts' home directories.
-+
-+Any files and/or directories within ~vpopmail/skel will be copied to the
-+new mailbox, with their structure and permissions preserved, and the
-+ownership of all new files and directories set to the uid/gid which owns
-+the mailbox (normally the vpopmail user, but it may be different if the
-+domain is controlled by a different system userid.)
-+
-+If the ~vpopmail/skel directory does not exist, or does not contain the
-+standard Maildir structure, it will be created regardless. This way the
-+required Maildir directory structure will exist regardless of what you
-+may be doing with the ~vpopmail/skel directory.
-diff -ruN vpopmail-5.4.26-factory/config.h.in vpopmail-5.4.26-patched/config.h.in
---- vpopmail-5.4.26-factory/config.h.in 2007-11-15 04:42:32.000000000 -0500
-+++ vpopmail-5.4.26-patched/config.h.in 2008-02-12 17:35:33.000000000 -0500
-@@ -214,6 +214,9 @@
- #undef ONCHANGE_SCRIPT
-
- /* "" */
-+#undef SKELETON
-+
-+/* "" */
- #undef OPEN_SMTP_CUR_FILE
-
- /* "" */
-diff -ruN vpopmail-5.4.26-factory/configure vpopmail-5.4.26-patched/configure
---- vpopmail-5.4.26-factory/configure 2007-11-15 04:41:27.000000000 -0500
-+++ vpopmail-5.4.26-patched/configure 2008-02-12 17:35:33.000000000 -0500
-@@ -1324,6 +1324,7 @@
- --enable-qmail-ext Enable qmail email address extension support.
- --enable-ip-alias-domains Enable mapping of default domain via reverse ip lookup table.
- --enable-onchange-script Enable onchange script. See README.onchange for more info.
-+ --enable-skeleton Enable skeleton directory. See README.skel for more info.
- --enable-spamassassin Enable spamassassin. See README.spamassassin for more info.
- --enable-spamc-prog=PATH Full path to spamc program /usr/{local/}bin/spamc.
- --enable-maildrop Enable maildrop. See README.maildrop for more info.
-@@ -7068,6 +7069,35 @@
-
- #----------------------------------------------------------------------
-
-+echo "$as_me:$LINENO: checking whether skeleton directory is enabled" >&5
-+echo $ECHO_N "checking whether skeleton directory is enabled... $ECHO_C" >&6
-+# Check whether --enable-skeleton or --disable-skeleton was given.
-+if test "${enable_skeleton+set}" = set; then
-+ enableval="$enable_skeleton"
-+ ENABLE_SKELETON=$enableval
-+else
-+
-+ ENABLE_SKELETON=0
-+
-+
-+fi;
-+
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ ENABLE_SKELETON=1
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SKELETON $ENABLE_SKEL
-+_ACEOF
-+
-+ ;;
-+ *)
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ ;;
-+esac
-
- #----------------------------------------------------------------------
-
-@@ -9799,6 +9829,16 @@
- esac
-
-
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ echo "skeleton directory = ON --enable-skeleton"
-+ ;;
-+ *)
-+ echo "skeleton directory = OFF --disable-skeleton (default)"
-+ ;;
-+esac
-+
-+
- #case $ENABLE_DOMAIN_QUOTAS in
- # 1*|y*|Y*)
- # echo " domain quotas = ON --enable-domainquotas"
-diff -ruN vpopmail-5.4.26-factory/configure.in vpopmail-5.4.26-patched/configure.in
---- vpopmail-5.4.26-factory/configure.in 2007-10-19 03:32:26.000000000 -0400
-+++ vpopmail-5.4.26-patched/configure.in 2008-02-12 17:35:33.000000000 -0500
-@@ -851,6 +851,25 @@
-
- #----------------------------------------------------------------------
-
-+AC_MSG_CHECKING(whether skeleton directory is enabled)
-+AC_ARG_ENABLE(skeleton,
-+ [ --enable-skeleton Enable skeleton directory. See README.skel for more info.],
-+ ENABLE_SKELETON=$enableval,
-+ [
-+ ENABLE_SKELETON=0
-+ ]
-+)
-+
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ AC_MSG_RESULT(yes)
-+ ENABLE_SKELETON=1
-+ AC_DEFINE_UNQUOTED(SKELETON,$ENABLE_SKEL,"")
-+ ;;
-+ *)
-+ AC_MSG_RESULT(no)
-+ ;;
-+esac
-
- #----------------------------------------------------------------------
-
-@@ -1666,6 +1685,16 @@
- esac
-
-
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ echo "skeleton directory = ON --enable-skeleton"
-+ ;;
-+ *)
-+ echo "skeleton directory = OFF --disable-skeleton (default)"
-+ ;;
-+esac
-+
-+
- #case $ENABLE_DOMAIN_QUOTAS in
- # 1*|y*|Y*)
- # echo " domain quotas = ON --enable-domainquotas"
-diff -ruN vpopmail-5.4.26-factory/copydir.c vpopmail-5.4.26-patched/copydir.c
---- vpopmail-5.4.26-factory/copydir.c 1969-12-31 19:00:00.000000000 -0500
-+++ vpopmail-5.4.26-patched/copydir.c 2008-02-12 17:35:33.000000000 -0500
-@@ -0,0 +1,309 @@
-+/* copydir.c
-+ * John Simpson <jms1@jms1.net> 2007-09-18
-+ *
-+ * 2007-12-28 jms1 - using S_ISLNK() macro. i don't really remember why,
-+ * but i do remember that when i first wrote this code years ago, i
-+ * avoided using this particular macro for some reason. thanks to rance
-+ * hall for pointing out the problem.
-+ *
-+ ****************************************************************************
-+ *
-+ * Copyright (C) 2001,2007 John Simpson.
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-+ */
-+
-+#include <dirent.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <limits.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
|
|
[-]
[+]
|
Deleted |
vpopmail-5.4.27-skel4_copydir.patch
^
|
| @@ -1,11 +0,0 @@
---- copydir.c.orig 2008-10-19 17:29:17.000000000 +0200
-+++ copydir.c 2008-10-19 17:31:50.000000000 +0200
-@@ -102,7 +102,7 @@
- return -1 ;
- }
-
-- ofd = open ( dst , O_WRONLY | O_CREAT | O_TRUNC ) ;
-+ ofd = open ( dst , O_WRONLY | O_CREAT | O_TRUNC , 0600 ) ;
- if ( -1 == ofd )
- {
- fprintf ( stderr , "copyfile(): open(%s) for write: %s\n" ,
|
|
[-]
[+]
|
Deleted |
vpopmail-5.4.28-makefile-am.patch
^
|
| @@ -1,14 +0,0 @@
---- vpopmail-5.4.28/Makefile.am.orig 2009-03-10 22:14:55.000000000 +0100
-+++ vpopmail-5.4.28/Makefile.am 2009-03-13 21:32:41.000000000 +0100
-@@ -7,9 +7,9 @@
-
- EXTRA_DIST=README.* cdb/* vcdb.c vldap.c vmysql.c voracle.pc vpgsql.c vsybase.c
-
--noinst_HEADERS=md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h
-+noinst_HEADERS=md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h copydir.h
-
--COMMONSOURCES=vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c backfill.c client.c conf.c ippp.c
-+COMMONSOURCES=vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c backfill.c client.c conf.c ippp.c copydir.c
-
- CONFIG_CLEAN_FILES=vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load
-
|
|
[-]
[+]
|
Deleted |
vpopmail-5.4.28-makefile.diff
^
|
| @@ -1,65 +0,0 @@
---- Makefile.in.orig 2009-09-25 22:06:54.000000000 +0200
-+++ Makefile.in 2009-09-26 12:10:27.000000000 +0200
-@@ -243,7 +243,7 @@
- EXEEXT = @EXEEXT@
- GREP = @GREP@
- INSTALL_DATA = @INSTALL_DATA@
--INSTALL_PROGRAM = ${INSTALL} -o @vpopuser@ -m 711 -g @vpopgroup@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = ${INSTALL_PROGRAM} -s
- LDFLAGS = @LDFLAGS@
-@@ -1043,13 +1043,13 @@
- install-exec-am:
- for d in bin doc etc include lib ; do \
- if test ! -d $(DESTDIR)@vpopmaildir@/$$d; then \
-- $(INSTALL) -d -g @vpopgroup@ -m 0755 -o @vpopuser@ \
-+ $(INSTALL) -d \
- $(DESTDIR)@vpopmaildir@/$$d ; \
- fi ; \
- done
-
- install-data-local:
-- $(INSTALL) -d -g @vpopgroup@ -m 0700 -o @vpopuser@ \
-+ $(INSTALL) -d \
- $(DESTDIR)@vpopmaildir@/@domains_dir@
-
- echo "-I@vpopmaildir@/include" > \
-@@ -1058,7 +1058,7 @@
- $(DESTDIR)@vpopmaildir@/etc/lib_deps
-
- if test ! -r $(VLIMITS); then \
-- $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
-+ $(INSTALL) \
- vlimits.default $(VLIMITS); \
- fi
- if test "@USE_MYSQL@" = "1"; then \
-@@ -1086,23 +1086,23 @@
- chmod 0640 $(MYSQLCONF) ; \
- fi
-
-- $(INSTALL) -o root -m 0644 \
-+ $(INSTALL) \
- libvpopmail.a $(DESTDIR)@vpopmaildir@/lib/libvpopmail.a
-
-- $(INSTALL) -o root -m 0444 \
-+ $(INSTALL) \
- config.h $(DESTDIR)@vpopmaildir@/include/vpopmail_config.h
-
- for include in vpopmail.h config.h vauth.h vlimits.h ; do \
-- $(INSTALL) -o root -m 0444 $$include \
-+ $(INSTALL) $$include \
- $(DESTDIR)@vpopmaildir@/include/ ; \
- done
-
- $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/man_html
- $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/doc_html
-- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
-+ $(INSTALL) \
- doc/man_html/*.* $(DESTDIR)@vpopmaildir@/doc/man_html/
-
-- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
-+ $(INSTALL) \
- doc/doc_html/*.* $(DESTDIR)@vpopmaildir@/doc/doc_html/
-
- fix-priv:
|
|
[-]
[+]
|
Deleted |
vpopmail-5.4.28-skel4.patch
^
|
| @@ -1,240 +0,0 @@
---- vpopmail-5.4.28/config.h.in.orig 2009-03-10 22:14:55.000000000 +0100
-+++ vpopmail-5.4.28/config.h.in 2009-03-13 21:33:56.000000000 +0100
-@@ -217,6 +217,9 @@
- #undef ONCHANGE_SCRIPT
-
- /* "" */
-+#undef SKELETON
-+
-+/* "" */
- #undef OPEN_SMTP_CUR_FILE
-
- /* "" */
---- vpopmail-5.4.28/configure.orig 2009-03-10 22:14:55.000000000 +0100
-+++ vpopmail-5.4.28/configure 2009-03-14 11:55:25.000000000 +0100
-@@ -1324,6 +1324,7 @@
- --enable-qmail-ext Enable qmail email address extension support.
- --enable-ip-alias-domains Enable mapping of default domain via reverse ip lookup table.
- --enable-onchange-script Enable onchange script. See README.onchange for more info.
-+ --enable-skeleton Enable skeleton directory. See README.skel for more info.
- --enable-spamassassin Enable spamassassin. See README.spamassassin for more info.
- --enable-spamc-prog=PATH Full path to spamc program /usr/{local/}bin/spamc.
- --enable-maildrop Enable maildrop. See README.maildrop for more info.
-@@ -7069,6 +7070,35 @@
-
- #----------------------------------------------------------------------
-
-+echo "$as_me:$LINENO: checking whether skeleton directory is enabled" >&5
-+echo $ECHO_N "checking whether skeleton directory is enabled... $ECHO_C" >&6
-+# Check whether --enable-skeleton or --disable-skeleton was given.
-+if test "${enable_skeleton+set}" = set; then
-+ enableval="$enable_skeleton"
-+ ENABLE_SKELETON=$enableval
-+else
-+
-+ ENABLE_SKELETON=0
-+
-+
-+fi;
-+
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ ENABLE_SKELETON=1
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SKELETON $ENABLE_SKEL
-+_ACEOF
-+
-+ ;;
-+ *)
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ ;;
-+esac
-
- #----------------------------------------------------------------------
-
-@@ -9821,6 +9851,16 @@
- esac
-
-
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ echo "skeleton directory = ON --enable-skeleton"
-+ ;;
-+ *)
-+ echo "skeleton directory = OFF --disable-skeleton (default)"
-+ ;;
-+esac
-+
-+
- case $AUTH_MODULE in
- cd*|Cd*|CD*)
- echo " auth module = cdb --enable-auth-module=cdb (default)"
---- vpopmail-5.4.28/configure.in.orig 2009-03-10 22:14:55.000000000 +0100
-+++ vpopmail-5.4.28/configure.in 2009-03-14 11:56:58.000000000 +0100
-@@ -851,6 +851,25 @@
-
- #----------------------------------------------------------------------
-
-+AC_MSG_CHECKING(whether skeleton directory is enabled)
-+AC_ARG_ENABLE(skeleton,
-+ [ --enable-skeleton Enable skeleton directory. See README.skel for more info.],
-+ ENABLE_SKELETON=$enableval,
-+ [
-+ ENABLE_SKELETON=0
-+ ]
-+)
-+
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ AC_MSG_RESULT(yes)
-+ ENABLE_SKELETON=1
-+ AC_DEFINE_UNQUOTED(SKELETON,$ENABLE_SKEL,"")
-+ ;;
-+ *)
-+ AC_MSG_RESULT(no)
-+ ;;
-+esac
-
- #----------------------------------------------------------------------
-
-@@ -1682,6 +1701,16 @@
- esac
-
-
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ echo "skeleton directory = ON --enable-skeleton"
-+ ;;
-+ *)
-+ echo "skeleton directory = OFF --disable-skeleton (default)"
-+ ;;
-+esac
-+
-+
- case $AUTH_MODULE in
- cd*|Cd*|CD*)
- echo " auth module = cdb --enable-auth-module=cdb (default)"
---- vpopmail-5.4.28/vpopmail.c.orig 2009-03-10 22:14:55.000000000 +0100
-+++ vpopmail-5.4.28/vpopmail.c 2009-03-13 21:34:03.000000000 +0100
-@@ -59,6 +59,10 @@
- static char relay_tempfile[MAX_BUFF];
- #endif
-
-+#ifdef SKELETON
-+#include "copydir.h"
-+#endif
-+
- int verrori = 0;
-
- extern int cdb_seek();
-@@ -1345,7 +1349,8 @@
- while((mydirent=readdir(mydir))!=NULL){
- if ( strncmp(mydirent->d_name,".", 2)!=0 &&
- strncmp(mydirent->d_name,"..", 3)!=0 ) {
-- stat( mydirent->d_name, &statbuf);
-+ lstat( mydirent->d_name, &statbuf);
-+ if ( S_ISLNK(statbuf.st_mode) ) continue;
- if ( S_ISDIR(statbuf.st_mode) ) {
- r_chown( mydirent->d_name, owner, group);
- } else {
-@@ -2400,8 +2405,24 @@
- return(NULL);
- }
-
-+#ifdef SKELETON
-+ /* copy the skeleton into place */
-+ struct stat s;
-+ if ( stat ( VPOPMAILDIR "/skel" , &s ) ) {
-+ if ( ENOENT != errno )
-+ fprintf(stderr,"make_user_dir: stat(%s): %s\n",
-+ VPOPMAILDIR "/skel" , strerror(errno) );
-+ } else {
-+ if ( S_ISDIR ( s.st_mode ) )
-+ copydir ( VPOPMAILDIR "/skel" , "." , uid , gid ) ;
-+ else
-+ fprintf(stderr,"make_user_dir: %s is not a directory\n",
-+ VPOPMAILDIR "/skel" );
-+ }
-+#endif
-+
- for (i = 0; i < (int)(sizeof(dirnames)/sizeof(dirnames[0])); i++) {
-- if (mkdir(dirnames[i],VPOPMAIL_DIR_MODE) == -1){
-+ if ((mkdir(dirnames[i],VPOPMAIL_DIR_MODE) == -1) && (EEXIST != errno)){
- fprintf(stderr, "make_user_dir: failed on %s\n", dirnames[i]);
- /* back out of changes made above */
- chdir("..");
-@@ -3108,12 +3129,32 @@
- /* we should now be able to cd into the user's dir */
- if ( chdir(dir) != 0 ) { chdir(calling_dir); return(-1); }
-
-+#ifdef SKELETON
-+ /* copy the skeleton into place */
-+ struct stat s;
-+ if ( stat ( VPOPMAILDIR "/skel" , &s ) ) {
-+ if ( ENOENT != errno )
-+ fprintf(stderr,"make_user_dir: stat(%s): %s\n",
-+ VPOPMAILDIR "/skel" , strerror(errno) );
-+ } else {
-+ if ( S_ISDIR ( s.st_mode ) )
-+ copydir ( VPOPMAILDIR "/skel" , "." , uid , gid ) ;
-+ else
-+ fprintf(stderr,"make_user_dir: %s is not a directory\n",
-+ VPOPMAILDIR "/skel" );
-+ }
-+#endif
-+
- /* now create the Maildir */
-- if (mkdir("Maildir",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
-+ if ((mkdir("Maildir",VPOPMAIL_DIR_MODE) == -1) && (EEXIST != errno)) {
-+ chdir(calling_dir); return(-1); }
- if (chdir("Maildir") == -1) { chdir(calling_dir); return(-1); }
-- if (mkdir("cur",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
-- if (mkdir("new",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
-- if (mkdir("tmp",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
-+ if ((mkdir("cur",VPOPMAIL_DIR_MODE) == -1) && (EEXIST != errno)) {
-+ chdir(calling_dir); return(-1); }
|
|
[-]
[+]
|
Deleted |
vpopmail-5.4.29-makefile-am.patch
^
|
| @@ -1,71 +0,0 @@
---- vpopmail-5.4.29/Makefile.am.orig 2009-12-04 21:53:40.000000000 +0100
-+++ vpopmail-5.4.29/Makefile.am 2009-12-04 22:00:24.000000000 +0100
-@@ -13,7 +13,7 @@
-
- CONFIG_CLEAN_FILES=vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load
-
--INSTALL_PROGRAM= ${INSTALL} -o @vpopuser@ -m 711 -g @vpopgroup@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_PROGRAM= ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_STRIP_PROGRAM=${INSTALL_PROGRAM} -s
-
- MYSQLCONF=$(DESTDIR)@vpopmaildir@/etc/vpopmail.mysql
-@@ -134,13 +134,13 @@
- install-exec-am:
- for d in bin doc etc include lib ; do \
- if test ! -d $(DESTDIR)@vpopmaildir@/$$d; then \
-- $(INSTALL) -d -g @vpopgroup@ -m 0755 -o @vpopuser@ \
-+ $(INSTALL) -d \
- $(DESTDIR)@vpopmaildir@/$$d ; \
- fi ; \
- done
-
- install-data-local:
-- $(INSTALL) -d -g @vpopgroup@ -m 0700 -o @vpopuser@ \
-+ $(INSTALL) -d \
- $(DESTDIR)@vpopmaildir@/@domains_dir@
-
- echo "-I@vpopmaildir@/include" > \
-@@ -149,12 +149,12 @@
- $(DESTDIR)@vpopmaildir@/etc/lib_deps
-
- if test ! -r $(VUSAGECCONF); then \
-- $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
-+ $(INSTALL) \
- vusagec.conf $(VUSAGECCONF); \
- fi
-
- if test ! -r $(VLIMITS); then \
-- $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
-+ $(INSTALL) \
- vlimits.default $(VLIMITS); \
- fi
-
-@@ -183,23 +183,23 @@
- chmod 0640 $(MYSQLCONF) ; \
- fi
-
-- $(INSTALL) -o root -m 0644 \
-+ $(INSTALL) \
- libvpopmail.a $(DESTDIR)@vpopmaildir@/lib/libvpopmail.a
-
-- $(INSTALL) -o root -m 0444 \
-+ $(INSTALL) \
- config.h $(DESTDIR)@vpopmaildir@/include/vpopmail_config.h
-
- for include in vpopmail.h config.h vauth.h vlimits.h storage.h client.h conf.h ippp.h ; do \
-- $(INSTALL) -o root -m 0444 $$include \
-+ $(INSTALL) $$include \
- $(DESTDIR)@vpopmaildir@/include/ ; \
- done
-
- $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/man_html
- $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/doc_html
-- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
-+ $(INSTALL) \
- doc/man_html/*.* $(DESTDIR)@vpopmaildir@/doc/man_html/
-
-- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
-+ $(INSTALL) \
- doc/doc_html/*.* $(DESTDIR)@vpopmaildir@/doc/doc_html/
-
- fix-priv:
|
|
[-]
[+]
|
Deleted |
vpopmail-5.4.29-makefile.diff
^
|
| @@ -1,65 +0,0 @@
---- Makefile.in.orig 2009-12-04 21:39:47.000000000 +0100
-+++ Makefile.in 2009-12-04 21:41:57.000000000 +0100
-@@ -242,7 +242,7 @@
- GREP = @GREP@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--INSTALL_PROGRAM = ${INSTALL} -o @vpopuser@ -m 711 -g @vpopgroup@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = ${INSTALL_PROGRAM} -s
- LDFLAGS = @LDFLAGS@
-@@ -1070,13 +1070,13 @@
- install-exec-am:
- for d in bin doc etc include lib ; do \
- if test ! -d $(DESTDIR)@vpopmaildir@/$$d; then \
-- $(INSTALL) -d -g @vpopgroup@ -m 0755 -o @vpopuser@ \
-+ $(INSTALL) -d \
- $(DESTDIR)@vpopmaildir@/$$d ; \
- fi ; \
- done
-
- install-data-local:
-- $(INSTALL) -d -g @vpopgroup@ -m 0700 -o @vpopuser@ \
-+ $(INSTALL) -d \
- $(DESTDIR)@vpopmaildir@/@domains_dir@
-
- echo "-I@vpopmaildir@/include" > \
-@@ -1090,7 +1090,7 @@
- fi
-
- if test ! -r $(VLIMITS); then \
-- $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
-+ $(INSTALL) \
- vlimits.default $(VLIMITS); \
- fi
-
-@@ -1119,23 +1119,23 @@
- chmod 0640 $(MYSQLCONF) ; \
- fi
-
-- $(INSTALL) -o root -m 0644 \
-+ $(INSTALL) \
- libvpopmail.a $(DESTDIR)@vpopmaildir@/lib/libvpopmail.a
-
-- $(INSTALL) -o root -m 0444 \
-+ $(INSTALL) \
- config.h $(DESTDIR)@vpopmaildir@/include/vpopmail_config.h
-
- for include in vpopmail.h config.h vauth.h vlimits.h storage.h client.h conf.h ippp.h ; do \
-- $(INSTALL) -o root -m 0444 $$include \
-+ $(INSTALL) $$include \
- $(DESTDIR)@vpopmaildir@/include/ ; \
- done
-
- $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/man_html
- $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/doc_html
-- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
-+ $(INSTALL) \
- doc/man_html/*.* $(DESTDIR)@vpopmaildir@/doc/man_html/
-
-- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
-+ $(INSTALL) \
- doc/doc_html/*.* $(DESTDIR)@vpopmaildir@/doc/doc_html/
-
- fix-priv:
|
|
[-]
[+]
|
Deleted |
vpopmail-5.4.29-skel4.patch
^
|
| @@ -1,240 +0,0 @@
---- vpopmail-5.4.28/config.h.in.orig 2009-03-10 22:14:55.000000000 +0100
-+++ vpopmail-5.4.28/config.h.in 2009-03-13 21:33:56.000000000 +0100
-@@ -217,6 +217,9 @@
- #undef ONCHANGE_SCRIPT
-
- /* "" */
-+#undef SKELETON
-+
-+/* "" */
- #undef OPEN_SMTP_CUR_FILE
-
- /* "" */
---- vpopmail-5.4.28/configure.orig 2009-03-10 22:14:55.000000000 +0100
-+++ vpopmail-5.4.28/configure 2009-03-14 11:55:25.000000000 +0100
-@@ -1324,6 +1324,7 @@
- --enable-qmail-ext Enable qmail email address extension support.
- --enable-ip-alias-domains Enable mapping of default domain via reverse ip lookup table.
- --enable-onchange-script Enable onchange script. See README.onchange for more info.
-+ --enable-skeleton Enable skeleton directory. See README.skel for more info.
- --enable-spamassassin Enable spamassassin. See README.spamassassin for more info.
- --enable-spamc-prog=PATH Full path to spamc program /usr/{local/}bin/spamc.
- --enable-maildrop Enable maildrop. See README.maildrop for more info.
-@@ -7069,6 +7070,35 @@
-
- #----------------------------------------------------------------------
-
-+echo "$as_me:$LINENO: checking whether skeleton directory is enabled" >&5
-+echo $ECHO_N "checking whether skeleton directory is enabled... $ECHO_C" >&6
-+# Check whether --enable-skeleton or --disable-skeleton was given.
-+if test "${enable_skeleton+set}" = set; then
-+ enableval="$enable_skeleton"
-+ ENABLE_SKELETON=$enableval
-+else
-+
-+ ENABLE_SKELETON=0
-+
-+
-+fi;
-+
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+ ENABLE_SKELETON=1
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SKELETON $ENABLE_SKEL
-+_ACEOF
-+
-+ ;;
-+ *)
-+ echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+ ;;
-+esac
-
- #----------------------------------------------------------------------
-
-@@ -9821,6 +9851,16 @@
- esac
-
-
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ echo "skeleton directory = ON --enable-skeleton"
-+ ;;
-+ *)
-+ echo "skeleton directory = OFF --disable-skeleton (default)"
-+ ;;
-+esac
-+
-+
- case $AUTH_MODULE in
- cd*|Cd*|CD*)
- echo " auth module = cdb --enable-auth-module=cdb (default)"
---- vpopmail-5.4.28/configure.in.orig 2009-03-10 22:14:55.000000000 +0100
-+++ vpopmail-5.4.28/configure.in 2009-03-14 11:56:58.000000000 +0100
-@@ -851,6 +851,25 @@
-
- #----------------------------------------------------------------------
-
-+AC_MSG_CHECKING(whether skeleton directory is enabled)
-+AC_ARG_ENABLE(skeleton,
-+ [ --enable-skeleton Enable skeleton directory. See README.skel for more info.],
-+ ENABLE_SKELETON=$enableval,
-+ [
-+ ENABLE_SKELETON=0
-+ ]
-+)
-+
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ AC_MSG_RESULT(yes)
-+ ENABLE_SKELETON=1
-+ AC_DEFINE_UNQUOTED(SKELETON,$ENABLE_SKEL,"")
-+ ;;
-+ *)
-+ AC_MSG_RESULT(no)
-+ ;;
-+esac
-
- #----------------------------------------------------------------------
-
-@@ -1682,6 +1701,16 @@
- esac
-
-
-+case $ENABLE_SKELETON in
-+ 1*|y*|Y*)
-+ echo "skeleton directory = ON --enable-skeleton"
-+ ;;
-+ *)
-+ echo "skeleton directory = OFF --disable-skeleton (default)"
-+ ;;
-+esac
-+
-+
- case $AUTH_MODULE in
- cd*|Cd*|CD*)
- echo " auth module = cdb --enable-auth-module=cdb (default)"
---- vpopmail-5.4.28/vpopmail.c.orig 2009-03-10 22:14:55.000000000 +0100
-+++ vpopmail-5.4.28/vpopmail.c 2009-03-13 21:34:03.000000000 +0100
-@@ -59,6 +59,10 @@
- static char relay_tempfile[MAX_BUFF];
- #endif
-
-+#ifdef SKELETON
-+#include "copydir.h"
-+#endif
-+
- int verrori = 0;
-
- extern int cdb_seek();
-@@ -1345,7 +1349,8 @@
- while((mydirent=readdir(mydir))!=NULL){
- if ( strncmp(mydirent->d_name,".", 2)!=0 &&
- strncmp(mydirent->d_name,"..", 3)!=0 ) {
-- stat( mydirent->d_name, &statbuf);
-+ lstat( mydirent->d_name, &statbuf);
-+ if ( S_ISLNK(statbuf.st_mode) ) continue;
- if ( S_ISDIR(statbuf.st_mode) ) {
- r_chown( mydirent->d_name, owner, group);
- } else {
-@@ -2400,8 +2405,24 @@
- return(NULL);
- }
-
-+#ifdef SKELETON
-+ /* copy the skeleton into place */
-+ struct stat s;
-+ if ( stat ( VPOPMAILDIR "/skel" , &s ) ) {
-+ if ( ENOENT != errno )
-+ fprintf(stderr,"make_user_dir: stat(%s): %s\n",
-+ VPOPMAILDIR "/skel" , strerror(errno) );
-+ } else {
-+ if ( S_ISDIR ( s.st_mode ) )
-+ copydir ( VPOPMAILDIR "/skel" , "." , uid , gid ) ;
-+ else
-+ fprintf(stderr,"make_user_dir: %s is not a directory\n",
-+ VPOPMAILDIR "/skel" );
-+ }
-+#endif
-+
- for (i = 0; i < (int)(sizeof(dirnames)/sizeof(dirnames[0])); i++) {
-- if (mkdir(dirnames[i],VPOPMAIL_DIR_MODE) == -1){
-+ if ((mkdir(dirnames[i],VPOPMAIL_DIR_MODE) == -1) && (EEXIST != errno)){
- fprintf(stderr, "make_user_dir: failed on %s\n", dirnames[i]);
- /* back out of changes made above */
- chdir("..");
-@@ -3108,12 +3129,32 @@
- /* we should now be able to cd into the user's dir */
- if ( chdir(dir) != 0 ) { chdir(calling_dir); return(-1); }
-
-+#ifdef SKELETON
-+ /* copy the skeleton into place */
-+ struct stat s;
-+ if ( stat ( VPOPMAILDIR "/skel" , &s ) ) {
-+ if ( ENOENT != errno )
-+ fprintf(stderr,"make_user_dir: stat(%s): %s\n",
-+ VPOPMAILDIR "/skel" , strerror(errno) );
-+ } else {
-+ if ( S_ISDIR ( s.st_mode ) )
-+ copydir ( VPOPMAILDIR "/skel" , "." , uid , gid ) ;
-+ else
-+ fprintf(stderr,"make_user_dir: %s is not a directory\n",
-+ VPOPMAILDIR "/skel" );
-+ }
-+#endif
-+
- /* now create the Maildir */
-- if (mkdir("Maildir",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
-+ if ((mkdir("Maildir",VPOPMAIL_DIR_MODE) == -1) && (EEXIST != errno)) {
-+ chdir(calling_dir); return(-1); }
- if (chdir("Maildir") == -1) { chdir(calling_dir); return(-1); }
-- if (mkdir("cur",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
-- if (mkdir("new",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
-- if (mkdir("tmp",VPOPMAIL_DIR_MODE) == -1) { chdir(calling_dir); return(-1); }
-+ if ((mkdir("cur",VPOPMAIL_DIR_MODE) == -1) && (EEXIST != errno)) {
-+ chdir(calling_dir); return(-1); }
|
|
[-]
[+]
|
Deleted |
vpopmail-5.4.30-makefile-am.patch
^
|
| @@ -1,71 +0,0 @@
---- vpopmail-5.4.29/Makefile.am.orig 2009-12-04 21:53:40.000000000 +0100
-+++ vpopmail-5.4.29/Makefile.am 2009-12-04 22:00:24.000000000 +0100
-@@ -13,7 +13,7 @@
-
- CONFIG_CLEAN_FILES=vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load
-
--INSTALL_PROGRAM= ${INSTALL} -o @vpopuser@ -m 711 -g @vpopgroup@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_PROGRAM= ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_STRIP_PROGRAM=${INSTALL_PROGRAM} -s
-
- MYSQLCONF=$(DESTDIR)@vpopmaildir@/etc/vpopmail.mysql
-@@ -134,13 +134,13 @@
- install-exec-am:
- for d in bin doc etc include lib ; do \
- if test ! -d $(DESTDIR)@vpopmaildir@/$$d; then \
-- $(INSTALL) -d -g @vpopgroup@ -m 0755 -o @vpopuser@ \
-+ $(INSTALL) -d \
- $(DESTDIR)@vpopmaildir@/$$d ; \
- fi ; \
- done
-
- install-data-local:
-- $(INSTALL) -d -g @vpopgroup@ -m 0700 -o @vpopuser@ \
-+ $(INSTALL) -d \
- $(DESTDIR)@vpopmaildir@/@domains_dir@
-
- echo "-I@vpopmaildir@/include" > \
-@@ -149,12 +149,12 @@
- $(DESTDIR)@vpopmaildir@/etc/lib_deps
-
- if test ! -r $(VUSAGECCONF); then \
-- $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
-+ $(INSTALL) \
- vusagec.conf $(VUSAGECCONF); \
- fi
-
- if test ! -r $(VLIMITS); then \
-- $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
-+ $(INSTALL) \
- vlimits.default $(VLIMITS); \
- fi
-
-@@ -183,23 +183,23 @@
- chmod 0640 $(MYSQLCONF) ; \
- fi
-
-- $(INSTALL) -o root -m 0644 \
-+ $(INSTALL) \
- libvpopmail.a $(DESTDIR)@vpopmaildir@/lib/libvpopmail.a
-
-- $(INSTALL) -o root -m 0444 \
-+ $(INSTALL) \
- config.h $(DESTDIR)@vpopmaildir@/include/vpopmail_config.h
-
- for include in vpopmail.h config.h vauth.h vlimits.h storage.h client.h conf.h ippp.h ; do \
-- $(INSTALL) -o root -m 0444 $$include \
-+ $(INSTALL) $$include \
- $(DESTDIR)@vpopmaildir@/include/ ; \
- done
-
- $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/man_html
- $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/doc_html
-- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
-+ $(INSTALL) \
- doc/man_html/*.* $(DESTDIR)@vpopmaildir@/doc/man_html/
-
-- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
-+ $(INSTALL) \
- doc/doc_html/*.* $(DESTDIR)@vpopmaildir@/doc/doc_html/
-
- fix-priv:
|
|
[-]
[+]
|
Deleted |
vpopmail-5.4.32-makefile-am.patch
^
|
| @@ -1,71 +0,0 @@
---- vpopmail-5.4.29/Makefile.am.orig 2009-12-04 21:53:40.000000000 +0100
-+++ vpopmail-5.4.29/Makefile.am 2009-12-04 22:00:24.000000000 +0100
-@@ -13,7 +13,7 @@
-
- CONFIG_CLEAN_FILES=vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load
-
--INSTALL_PROGRAM= ${INSTALL} -o @vpopuser@ -m 711 -g @vpopgroup@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_PROGRAM= ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_STRIP_PROGRAM=${INSTALL_PROGRAM} -s
-
- MYSQLCONF=$(DESTDIR)@vpopmaildir@/etc/vpopmail.mysql
-@@ -134,13 +134,13 @@
- install-exec-am:
- for d in bin doc etc include lib ; do \
- if test ! -d $(DESTDIR)@vpopmaildir@/$$d; then \
-- $(INSTALL) -d -g @vpopgroup@ -m 0755 -o @vpopuser@ \
-+ $(INSTALL) -d \
- $(DESTDIR)@vpopmaildir@/$$d ; \
- fi ; \
- done
-
- install-data-local:
-- $(INSTALL) -d -g @vpopgroup@ -m 0700 -o @vpopuser@ \
-+ $(INSTALL) -d \
- $(DESTDIR)@vpopmaildir@/@domains_dir@
-
- echo "-I@vpopmaildir@/include" > \
-@@ -149,12 +149,12 @@
- $(DESTDIR)@vpopmaildir@/etc/lib_deps
-
- if test ! -r $(VUSAGECCONF); then \
-- $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
-+ $(INSTALL) \
- vusagec.conf $(VUSAGECCONF); \
- fi
-
- if test ! -r $(VLIMITS); then \
-- $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
-+ $(INSTALL) \
- vlimits.default $(VLIMITS); \
- fi
-
-@@ -183,23 +183,23 @@
- chmod 0640 $(MYSQLCONF) ; \
- fi
-
-- $(INSTALL) -o root -m 0644 \
-+ $(INSTALL) \
- libvpopmail.a $(DESTDIR)@vpopmaildir@/lib/libvpopmail.a
-
-- $(INSTALL) -o root -m 0444 \
-+ $(INSTALL) \
- config.h $(DESTDIR)@vpopmaildir@/include/vpopmail_config.h
-
- for include in vpopmail.h config.h vauth.h vlimits.h storage.h client.h conf.h ippp.h ; do \
-- $(INSTALL) -o root -m 0444 $$include \
-+ $(INSTALL) $$include \
- $(DESTDIR)@vpopmaildir@/include/ ; \
- done
-
- $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/man_html
- $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/doc_html
-- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
-+ $(INSTALL) \
- doc/man_html/*.* $(DESTDIR)@vpopmaildir@/doc/man_html/
-
-- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
-+ $(INSTALL) \
- doc/doc_html/*.* $(DESTDIR)@vpopmaildir@/doc/doc_html/
-
- fix-priv:
|
|
[-]
[+]
|
Added |
vpopmail-5.4.33-makefile-am.patch
^
|
| @@ -0,0 +1,71 @@
+--- vpopmail-5.4.29/Makefile.am.orig 2009-12-04 21:53:40.000000000 +0100
++++ vpopmail-5.4.29/Makefile.am 2009-12-04 22:00:24.000000000 +0100
+@@ -13,7 +13,7 @@
+
+ CONFIG_CLEAN_FILES=vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load
+
+-INSTALL_PROGRAM= ${INSTALL} -o @vpopuser@ -m 711 -g @vpopgroup@ $(AM_INSTALL_PROGRAM_FLAGS)
++INSTALL_PROGRAM= ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS)
+ INSTALL_STRIP_PROGRAM=${INSTALL_PROGRAM} -s
+
+ MYSQLCONF=$(DESTDIR)@vpopmaildir@/etc/vpopmail.mysql
+@@ -134,13 +134,13 @@
+ install-exec-am:
+ for d in bin doc etc include lib ; do \
+ if test ! -d $(DESTDIR)@vpopmaildir@/$$d; then \
+- $(INSTALL) -d -g @vpopgroup@ -m 0755 -o @vpopuser@ \
++ $(INSTALL) -d \
+ $(DESTDIR)@vpopmaildir@/$$d ; \
+ fi ; \
+ done
+
+ install-data-local:
+- $(INSTALL) -d -g @vpopgroup@ -m 0700 -o @vpopuser@ \
++ $(INSTALL) -d \
+ $(DESTDIR)@vpopmaildir@/@domains_dir@
+
+ echo "-I@vpopmaildir@/include" > \
+@@ -149,12 +149,12 @@
+ $(DESTDIR)@vpopmaildir@/etc/lib_deps
+
+ if test ! -r $(VUSAGECCONF); then \
+- $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
++ $(INSTALL) \
+ vusagec.conf $(VUSAGECCONF); \
+ fi
+
+ if test ! -r $(VLIMITS); then \
+- $(INSTALL) -o @vpopuser@ -m 0644 -g @vpopgroup@ \
++ $(INSTALL) \
+ vlimits.default $(VLIMITS); \
+ fi
+
+@@ -183,23 +183,23 @@
+ chmod 0640 $(MYSQLCONF) ; \
+ fi
+
+- $(INSTALL) -o root -m 0644 \
++ $(INSTALL) \
+ libvpopmail.a $(DESTDIR)@vpopmaildir@/lib/libvpopmail.a
+
+- $(INSTALL) -o root -m 0444 \
++ $(INSTALL) \
+ config.h $(DESTDIR)@vpopmaildir@/include/vpopmail_config.h
+
+ for include in vpopmail.h config.h vauth.h vlimits.h storage.h client.h conf.h ippp.h ; do \
+- $(INSTALL) -o root -m 0444 $$include \
++ $(INSTALL) $$include \
+ $(DESTDIR)@vpopmaildir@/include/ ; \
+ done
+
+ $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/man_html
+ $(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/doc_html
+- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
++ $(INSTALL) \
+ doc/man_html/*.* $(DESTDIR)@vpopmaildir@/doc/man_html/
+
+- $(INSTALL) -o @vpopuser@ -m 0444 -g @vpopgroup@ \
++ $(INSTALL) \
+ doc/doc_html/*.* $(DESTDIR)@vpopmaildir@/doc/doc_html/
+
+ fix-priv:
|
|
[-]
[+]
|
Deleted |
new
^
|
| @@ -1,21 +0,0 @@
---- vpopmail-5.4.27/Makefile.in.orig 2009-02-18 20:12:52.000000000 +0100
-+++ vpopmail-5.4.27/Makefile.in 2009-02-18 20:14:35.000000000 +0100
-@@ -79,6 +79,7 @@
- libvpopmail_a-vlimits.$(OBJEXT) \
- libvpopmail_a-maildirquota.$(OBJEXT) \
- libvpopmail_a-vutil.$(OBJEXT) libvpopmail_a-vlistlib.$(OBJEXT) \
-+ libvpopmail_a-copydir.$(OBJEXT) \
- libvpopmail_a-backfill.$(OBJEXT)
- am_libvpopmail_a_OBJECTS = $(am__objects_1)
- libvpopmail_a_OBJECTS = $(am_libvpopmail_a_OBJECTS)
-@@ -305,8 +306,8 @@
- vpopuser = @vpopuser@
- SUBDIRS = cdb
- EXTRA_DIST = README.* cdb/* vcdb.c vldap.c vmysql.c voracle.pc vpgsql.c vsybase.c
--noinst_HEADERS = md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h
--COMMONSOURCES = vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c backfill.c
-+noinst_HEADERS = md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h copydir.h
-+COMMONSOURCES = vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c backfill.c copydir.c
- CONFIG_CLEAN_FILES = vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load
- MYSQLCONF = $(DESTDIR)@vpopmaildir@/etc/vpopmail.mysql
- VLIMITS = $(DESTDIR)@vpopmaildir@/etc/vlimits.default
|
|
|
Deleted |
vpopmail-5.4.27.tar.bz2
^
|
|
|
Deleted |
vpopmail-5.4.27.tar.gz_devel
^
|
|
|
Deleted |
vpopmail-5.4.28.tar.bz2
^
|
|
|
Deleted |
vpopmail-5.4.28.tar.bz2.old
^
|
|
|
Deleted |
vpopmail-5.4.29.tar.bz2
^
|
|
|
Deleted |
vpopmail-5.4.30.tar.bz2
^
|
|
|
Deleted |
vpopmail-5.4.32.tar.bz2
^
|
|
|
Changed |
vpopmail-5.4.33.tar.bz2
^
|
