|
|
| @@ -0,0 +1,633 @@
+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
|
