Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Andraž Levstik (e2ff58f44b41841414c44ae79663dbe2f6d2c2c7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Andraž Levstik (e2ff58f44b41841414c44ae79663dbe2f6d2c2c7)
  • Date: Wed, 11 Aug 2010 13:45:42 -0500

GIT changes to master grimoire by Andraž Levstik
<ruskie+2054d253 AT codemages.net>:

mail/alpine/DETAILS | 59 ------
mail/alpine/HISTORY | 8
mail/alpine/PREPARE | 10 -
mail/alpine/PRE_BUILD | 20 --
mail/alpine/maildir.patch.diff | 227 ------------------------
mail/alpine/outgoing.patch.diff | 11 -
mail/alpine/rules.patch.diff | 372
----------------------------------------
7 files changed, 8 insertions(+), 699 deletions(-)

New commits:
commit 421447ab01077bd5e6c18c48c3aac630f21931dc
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

alpine: removed chappa patches, creates a legally questionable binary

diff --git a/mail/alpine/DETAILS b/mail/alpine/DETAILS
index 3e896b5..5fd76f3 100755
--- a/mail/alpine/DETAILS
+++ b/mail/alpine/DETAILS
@@ -8,65 +8,6 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
SOURCE2_URL[0]=${SOURCEFORGE_URL}/re-alpine/${SOURCE2}
SOURCE_GPG=re-alpine.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature
-if [[ $ALPINE_CHAPPA == y ]]; then
- SOURCE3=unverified.patch.gz
- SOURCE4=streamlock.patch.gz
- SOURCE5=unixnullbug.patch.gz
- SOURCE6=status.patch.gz
- SOURCE7=circtab.patch.gz
- SOURCE8=reply.patch.gz
- SOURCE9=fromheader.patch.gz
- SOURCE10=colortext.patch.gz
- SOURCE11=searchheader.patch.gz
- SOURCE12=delpassword.patch.gz
- SOURCE13=preservefields.patch.gz
- SOURCE14=base64errors.patch.gz
- SOURCE15=streaminfo.patch.gz
- SOURCE16=colorfolder.patch.gz
- SOURCE17=tokencolor.patch.gz
- SOURCE18=rules.patch.gz
- SOURCE19=outgoing.patch.gz
- SOURCE20=fillpara.patch.gz
- SOURCE21=maildir.patch.gz
-
SOURCE3_HASH=sha512:9849b96dc72d420856cebcacb8c08693cc56350bb92adfd32d3838a4b19edd1f517509f3a8653c7cf294ae213967a89f1ffb1bcc8c6beb86f716c475fbb28183
-
SOURCE4_HASH=sha512:9c8a69aae20cb045a29d1c0a05d24b479aa0f7df40dbe41f812052f869d1b1d8490f2517b8d33ca007733a30c4c15c05ae9fd39d1941373baa3a888b9bf2134c
-
SOURCE5_HASH=sha512:e7194c137f648eb71271109d156ce0cb034fc6728c3aa0a1e9d498fa5af547d67f6beb3fe49a320b831e37cc53870c3c00a32887c731def13cd803d313aba1a4
-
SOURCE6_HASH=sha512:cdba9d4faaa00a2de0d29a57ee9de22b953b100781b305a563b10c503838da1b5a0bb3387ae28145a6620cd5b5846a26dc2236debfae10fc2ff9952c8d25ae13
-
SOURCE7_HASH=sha512:751ad62d3e8ebd4671b186fe111e3a1934d6068e611ec6071d7123c1dade8bd20ae8918a15307c130fc8a02a063dff58b865e9d153bba0877c205e8d89c3492b
-
SOURCE8_HASH=sha512:62f1ea73b71dfa1c3ac9f760a3c247d4d7eb09b8b955aa198fc0886c709e17e3988556c5bad2ce9389832bb61698826a61170a75862af3d6bbc958bcf93927c5
-
SOURCE9_HASH=sha512:b6472c6e5189721fd3cc9520edf21b79e91924191329eda560d94f17560cec3cb951c28a9c446b332426c83842f943fec3c443e6646962e51bea89aeef5e4eb0
-
SOURCE10_HASH=sha512:a720bd443498e793cc0acca8994d678f99e225a59a927a2219986317cfe1673245fa00d115608b704685af222c2da6f9668158de69ccc2173c9626d2c1c17b6c
-
SOURCE11_HASH=sha512:bbd3cc488d94400efcaf731bfbacca2953900257c72866259bf6f58cfdb1a0bd73aaedacf95c51a4da5e168eb77b10b974960c082cff8249088bba5ea2ff0a7d
-
SOURCE12_HASH=sha512:62070aa55a2233a8780bfb80227b5635c71e4a1e878e34b0cd384da88193a5638ee5532bd6fbc717f6b5cec610c39a452b4d92f7966f0118d656dc9c9e2960a3
-
SOURCE13_HASH=sha512:4b6728a30661746c09b4c6f00a84a570157c50bc041cca8b301e9add05a78ce16bc49dc0ee291532904ed2ac41f5147d952f50a5fee2df5f15538b3c5672d2d3
-
SOURCE14_HASH=sha512:adc25e5a90006ddbb4db0b13de9dc4f7eaf48f78a6924695d75b0ea2cc848097c9314bac5c06140315a7d2e7a7fe2b226d74abb012e473c133f8e80d85395751
-
SOURCE15_HASH=sha512:2ff2de0a9aca339ef84cd1027dacaf5e300f0da8782df20d23a0aca9bd96c9b7dbc072b559e8a8110c170557fe86f958111368ac4b4042ccdc976011221ad077
-
SOURCE16_HASH=sha512:0613f76a6a5ad5a6f199b1560bf25f26157b445aaff89b8ece2253fded47b38adb663000a8fc40bba446dc566ad1f29c689e21ab2940ddac40f9b44222836826
-
SOURCE17_HASH=sha512:ee9a85cb4da85f7af6c3212ad5de438c07d7b085eb29ec7d014460858b06cfadca12702cd12b040aa4fca818a2567b826aaef92e022680a1200019e4c1cf77a8
-
SOURCE18_HASH=sha512:2e6c0fe92fb99551187a27d957cfa4f612874b8773998becf3c9e3baefc7f7f8017075000ca824987ebaa19473aeb294e545138f019a6c0e4443aae875d0a499
-
SOURCE19_HASH=sha512:e3eadd21e35337e5f0c152119f95339f6a3d0a076eb9e01aa76c86d2268a332eebd918122eeee9c823e532ad123a6f3d4712bae287cb37e2e1283f77c94291e5
-
SOURCE20_HASH=sha512:3da3451e58391dd2ee082952e2d0e461a2111b85bda532586b3ccddc540af6164195eccc71d53ae2212ba50e1a78279aa53a679ea1e94c3cddbf025ef37c83ca
-
SOURCE21_HASH=sha512:7b3bbb80c7e236c373ca90a580052e1316fc668e5055339d3beb471222e4e8f59c41777ff548af01dc8b08dbf251b7a80d5eeea8fce54586ef790ee7403f2914
-
SOURCE3_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/unverified.patch.gz
-
SOURCE4_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/streamlock.patch.gz
-
SOURCE5_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/unixnullbug.patch.gz
-
SOURCE6_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/status.patch.gz
-
SOURCE7_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/circtab.patch.gz
-
SOURCE8_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/reply.patch.gz
-
SOURCE9_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/fromheader.patch.gz
-
SOURCE10_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/colortext.patch.gz
-
SOURCE11_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/searchheader.patch.gz
-
SOURCE12_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/delpassword.patch.gz
-
SOURCE13_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/preservefields.patch.gz
-
SOURCE14_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/base64errors.patch.gz
-
SOURCE15_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/streaminfo.patch.gz
-
SOURCE16_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/colorfolder.patch.gz
-
SOURCE17_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/tokencolor.patch.gz
-
SOURCE18_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/rules.patch.gz
-
SOURCE19_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/outgoing.patch.gz
-
SOURCE20_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/fillpara.patch.gz
-
SOURCE21_URL[0]=http://staff.washington.edu/chappa/alpine/patches/alpine-2.00/maildir.patch.gz
-fi
if [[ $ALPINE_TOPAL == y ]]; then
VERSION3=72
SOURCE22=topal-package-$VERSION3.tgz
diff --git a/mail/alpine/HISTORY b/mail/alpine/HISTORY
index a11c4bc..60508dc 100644
--- a/mail/alpine/HISTORY
+++ b/mail/alpine/HISTORY
@@ -1,3 +1,11 @@
+2010-08-11 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * maildir.patch.diff: no longer needed
+ * outgoing.patch.diff: no longer needed
+ * rules.patch.diff: no longer needed
+ * DETAILS: removed chappa patches, creates a legally questionable
binary
+ * PREPARE: removed chappa patches, creates a legally questionable
binary
+ * PRE_BUILD: removed chappa patches, creates a legally questionable
binary
+
2010-03-31 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* DETAILS: topal update to 72, fixes bug 15633
* PRE_BUILD: fix to build a native mime-tool
diff --git a/mail/alpine/PREPARE b/mail/alpine/PREPARE
index 85443a6..90ac48b 100755
--- a/mail/alpine/PREPARE
+++ b/mail/alpine/PREPARE
@@ -1,11 +1 @@
-message "To learn more about chappa patches see:"
-message "http://staff.washington.edu/chappa/alpine/";
-message "The ones included with this spell are:"
-message "unverified.patch streamlock.patch unixnullbug.patch"
-message "status.patch circtab.patch reply.patch fromheader.patch"
-message "colortext.patch searchheader.patch delpassword.patch"
-message "preservefields.patch base64errors.patch streaminfo.patch"
-message "colorfolder.patch tokencolor.patch rules.patch outgoing.patch"
-message "fillpara.patch maildir.patch"
-config_query ALPINE_CHAPPA "Do you want the chappa patches for alpine?" n
config_query ALPINE_TOPAL "Do you want the Topal GnuPG/Alpine glue?" n
diff --git a/mail/alpine/PRE_BUILD b/mail/alpine/PRE_BUILD
index f32158c..a2fc08c 100755
--- a/mail/alpine/PRE_BUILD
+++ b/mail/alpine/PRE_BUILD
@@ -1,25 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-if [[ $ALPINE_CHAPPA == y ]]; then
-local patchno &&
-local tmpsource &&
-for patchno in $(seq 3 21) ; do
-tmpsource="SOURCE${patchno}" &&
-verify_file $patchno &&
-cp -f $SOURCE_CACHE/${!tmpsource} . &&
-gunzip -f ${!tmpsource} &&
-if [[ ${!tmpsource} == outgoing.patch.gz ]]; then
-patch -p0 < $SPELL_DIRECTORY/outgoing.patch.diff
-fi &&
-if [[ ${!tmpsource} == rules.patch.gz ]]; then
-patch -p0 < $SPELL_DIRECTORY/rules.patch.diff
-fi &&
-if [[ ${!tmpsource} == maildir.patch.gz ]]; then
-patch -p0 < $SPELL_DIRECTORY/maildir.patch.diff
-fi &&
-patch -p1 < ${!tmpsource/.gz}
-done
-fi &&
if [[ $ALPINE_TOPAL == y ]]; then
unpack_file 22 &&
patch -p1 < topal-$VERSION3/$SPELL-2.00.patch-1 &&
diff --git a/mail/alpine/maildir.patch.diff b/mail/alpine/maildir.patch.diff
deleted file mode 100644
index a5536fa..0000000
--- a/mail/alpine/maildir.patch.diff
+++ /dev/null
@@ -1,227 +0,0 @@
---- maildir.patch 2009-08-31 20:01:27.000000000 +0200
-+++ ../maildir.patch 2009-02-24 06:48:08.000000000 +0100
-@@ -1,6 +1,6 @@
- diff -rc alpine-2.00/alpine/alpine.c alpine-2.00.maildir/alpine/alpine.c
- *** alpine-2.00/alpine/alpine.c 2008-06-03 15:31:05.000000000 -0700
----- alpine-2.00.maildir/alpine/alpine.c 2009-08-31 10:59:41.000000000
-0700
-+--- alpine-2.00.maildir/alpine/alpine.c 2008-08-26 20:56:05.000000000
-0700
- ***************
- *** 553,558 ****
- --- 553,563 ----
-@@ -17,7 +17,7 @@
- if(!SVAR_NNTPRANGE(pine_state, rvl, tmp_20k_buf, SIZEOF_20KBUF))
- diff -rc alpine-2.00/alpine/confscroll.c
alpine-2.00.maildir/alpine/confscroll.c
- *** alpine-2.00/alpine/confscroll.c 2008-08-21 15:14:45.000000000 -0700
----- alpine-2.00.maildir/alpine/confscroll.c 2009-08-31 10:59:41.000000000
-0700
-+--- alpine-2.00.maildir/alpine/confscroll.c 2008-08-26 20:56:05.000000000
-0700
- ***************
- *** 5489,5494 ****
- --- 5489,5500 ----
-@@ -35,7 +35,7 @@
- cur_rule_value(var, TRUE, FALSE);
- diff -rc alpine-2.00/imap/src/c-client/mail.c
alpine-2.00.maildir/imap/src/c-client/mail.c
- *** alpine-2.00/imap/src/c-client/mail.c 2008-06-04 11:39:54.000000000
-0700
----- alpine-2.00.maildir/imap/src/c-client/mail.c 2009-08-31
10:59:41.000000000 -0700
-+--- alpine-2.00.maildir/imap/src/c-client/mail.c 2008-08-26
20:56:05.000000000 -0700
- ***************
- *** 991,997 ****
- MAILSTREAM *ts;
-@@ -82,7 +82,7 @@
- sprintf (tmp,"Can't create mailbox %.80s: indeterminate
format",mailbox);
- diff -rc alpine-2.00/imap/src/c-client/mail.h
alpine-2.00.maildir/imap/src/c-client/mail.h
- *** alpine-2.00/imap/src/c-client/mail.h 2008-08-08 10:34:22.000000000
-0700
----- alpine-2.00.maildir/imap/src/c-client/mail.h 2009-08-31
10:59:41.000000000 -0700
-+--- alpine-2.00.maildir/imap/src/c-client/mail.h 2008-08-26
20:56:05.000000000 -0700
- ***************
- *** 353,358 ****
- --- 353,362 ----
-@@ -98,7 +98,7 @@
-
- diff -rc alpine-2.00/imap/src/osdep/unix/dummy.c
alpine-2.00.maildir/imap/src/osdep/unix/dummy.c
- *** alpine-2.00/imap/src/osdep/unix/dummy.c 2008-06-04 11:18:34.000000000
-0700
----- alpine-2.00.maildir/imap/src/osdep/unix/dummy.c 2009-08-31
10:59:42.000000000 -0700
-+--- alpine-2.00.maildir/imap/src/osdep/unix/dummy.c 2008-08-26
20:56:05.000000000 -0700
- ***************
- *** 106,116 ****
- * Accepts: mailbox name
-@@ -169,16 +169,16 @@
- if (!dummy_file (oldname,old) || !(s = dummy_file (mbx,newname)) ||
- stat (oldname,&sbuf) || ((s = strrchr (s,'/')) && !s[1] &&
- diff -rc alpine-2.00/imap/src/osdep/unix/maildir.c
alpine-2.00.maildir/imap/src/osdep/unix/maildir.c
--*** alpine-2.00/imap/src/osdep/unix/maildir.c 2009-08-31 11:01:22.000000000
-0700
----- alpine-2.00.maildir/imap/src/osdep/unix/maildir.c 2009-08-31
11:01:17.000000000 -0700
-+*** alpine-2.00/imap/src/osdep/unix/maildir.c 2008-08-26 20:56:05.000000000
-0700
-+--- alpine-2.00.maildir/imap/src/osdep/unix/maildir.c 2008-08-26
20:56:05.000000000 -0700
- ***************
- *** 0 ****
----- 1,2579 ----
-+--- 1,2583 ----
- + /*
- + * Maildir driver for Alpine 2.00
- + *
- + * Written by Eduardo Chappa <chappa AT washington.edu>
--+ * Last Update: August 31, 2009
-++ * Last Update: May 16, 2008
- + *
- + */
- +
-@@ -1221,25 +1221,29 @@
- + return NULL;
- + }
- +
--+ if (flags & FT_INTERNAL){
--+ if(elt->private.msg.header.text.size > LOCAL->buflen){
-++ if ((flags & FT_INTERNAL) &&
-++ (elt->private.msg.header.text.size > LOCAL->buflen)){
- + fs_give ((void **) &LOCAL->buf);
- + LOCAL->buf = (char *) fs_get ((LOCAL->buflen =
- + elt->private.msg.header.text.size) + 1);
--+ }
--+ read (LOCAL->fd, (void *)LOCAL->buf,
elt->private.msg.header.text.size);
--+ LOCAL->buf[*length = elt->private.msg.header.text.size] = '\0';
- + }
--+ else{
-++ else
- + s = (char *) fs_get(elt->private.msg.header.text.size+1);
--+ read (LOCAL->fd, (void *)s, elt->private.msg.header.text.size);
--+ s[elt->private.msg.header.text.size] = '\0';
--+ *length = strcrlfcpy (&LOCAL->buf,&LOCAL->buflen,s,
--+ elt->private.msg.header.text.size);
--+ fs_give ((void **) &s);
-++ if (LOCAL->fd >= 0){
-++ read (LOCAL->fd, ((flags & FT_INTERNAL) ? (void *)LOCAL->buf : (void
*)s),
-++ elt->private.msg.header.text.size);
-++ if (flags & FT_INTERNAL)
-++ LOCAL->buf[*length = elt->private.msg.header.text.size] = '\0';
-++ else{
-++ s[*length = elt->private.msg.header.text.size] = '\0';
-++ *length = strcrlfcpy (&LOCAL->buf,&LOCAL->buflen,s,
-++ elt->private.msg.header.text.size);
-++ fs_give ((void **) &s);
-++ }
- + }
- + elt->private.msg.text.offset = elt->private.msg.header.text.size;
- + elt->private.msg.text.text.size = MDSIZE(elt) -
elt->private.msg.text.offset;
-++ if(s) fs_give((void **)&s);
- + close(LOCAL->fd); LOCAL->fd = -1;
- + return LOCAL->buf;
- + }
-@@ -2568,6 +2572,7 @@
- + || !strncmp(d->d_name, MDUIDTEMP, strlen(MDUIDTEMP)))
- + break;
- + }
-++ closedir(dir);
- + rv = d ? !strncmp(d->d_name, tmp, strlen(tmp)) : 1;
- + createtemp = d ? 0 : 1;
- + if (d && rv == 0){ /* is there a temp file that is not ours? */
-@@ -2581,7 +2586,6 @@
- + unlink(tmp);
- + }
- + }
--+ closedir(dir);
- + if(createtemp){
- + FILE *fp;
- + sprintf(tmp,"%s/%s.%d.%lu", LOCAL->dir, MDUIDTEMP, getpid(), time(0));
-@@ -2754,8 +2758,8 @@
- + }
- + }
- diff -rc alpine-2.00/imap/src/osdep/unix/maildir.h
alpine-2.00.maildir/imap/src/osdep/unix/maildir.h
--*** alpine-2.00/imap/src/osdep/unix/maildir.h 2009-08-31 11:01:22.000000000
-0700
----- alpine-2.00.maildir/imap/src/osdep/unix/maildir.h 2009-08-31
10:59:42.000000000 -0700
-+*** alpine-2.00/imap/src/osdep/unix/maildir.h 2008-08-26 20:56:05.000000000
-0700
-+--- alpine-2.00.maildir/imap/src/osdep/unix/maildir.h 2008-08-26
20:56:05.000000000 -0700
- ***************
- *** 0 ****
- --- 1,225 ----
-@@ -2986,7 +2990,7 @@
- +
- diff -rc alpine-2.00/imap/src/osdep/unix/Makefile
alpine-2.00.maildir/imap/src/osdep/unix/Makefile
- *** alpine-2.00/imap/src/osdep/unix/Makefile 2008-06-04 11:18:34.000000000
-0700
----- alpine-2.00.maildir/imap/src/osdep/unix/Makefile 2009-08-31
10:59:42.000000000 -0700
-+--- alpine-2.00.maildir/imap/src/osdep/unix/Makefile 2008-08-26
20:56:05.000000000 -0700
- ***************
- *** 144,150 ****
- # However, mh needs to be before any sysinbox formats (such as mmdf or
unix)
-@@ -3057,7 +3061,7 @@
-
- diff -rc alpine-2.00/imap/src/osdep/unix/os_cyg.h
alpine-2.00.maildir/imap/src/osdep/unix/os_cyg.h
- *** alpine-2.00/imap/src/osdep/unix/os_cyg.h 2008-06-04 11:18:34.000000000
-0700
----- alpine-2.00.maildir/imap/src/osdep/unix/os_cyg.h 2009-08-31
10:59:42.000000000 -0700
-+--- alpine-2.00.maildir/imap/src/osdep/unix/os_cyg.h 2008-08-26
20:56:05.000000000 -0700
- ***************
- *** 47,52 ****
- --- 47,53 ----
-@@ -3070,7 +3074,7 @@
-
- diff -rc alpine-2.00/pith/conf.c alpine-2.00.maildir/pith/conf.c
- *** alpine-2.00/pith/conf.c 2008-08-22 17:07:05.000000000 -0700
----- alpine-2.00.maildir/pith/conf.c 2009-08-31 10:59:42.000000000 -0700
-+--- alpine-2.00.maildir/pith/conf.c 2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 427,432 ****
- --- 427,435 ----
-@@ -3154,7 +3158,7 @@
- #if defined(DOS) || defined(OS2)
- diff -rc alpine-2.00/pith/conf.h alpine-2.00.maildir/pith/conf.h
- *** alpine-2.00/pith/conf.h 2008-08-19 17:27:11.000000000 -0700
----- alpine-2.00.maildir/pith/conf.h 2009-08-31 10:59:42.000000000 -0700
-+--- alpine-2.00.maildir/pith/conf.h 2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 249,254 ****
- --- 249,258 ----
-@@ -3170,7 +3174,7 @@
- #define VAR_REMOTE_ABOOK_METADATA
vars[V_REMOTE_ABOOK_METADATA].current_val.p
- diff -rc alpine-2.00/pith/conftype.h alpine-2.00.maildir/pith/conftype.h
- *** alpine-2.00/pith/conftype.h 2008-08-19 17:27:11.000000000 -0700
----- alpine-2.00.maildir/pith/conftype.h 2009-08-31 10:59:42.000000000
-0700
-+--- alpine-2.00.maildir/pith/conftype.h 2008-08-26 20:56:05.000000000
-0700
- ***************
- *** 114,119 ****
- --- 114,122 ----
-@@ -3197,7 +3201,7 @@
- F_VERBOSE_POST,
- diff -rc alpine-2.00/pith/init.c alpine-2.00.maildir/pith/init.c
- *** alpine-2.00/pith/init.c 2007-08-16 15:25:10.000000000 -0700
----- alpine-2.00.maildir/pith/init.c 2009-08-31 10:59:42.000000000 -0700
-+--- alpine-2.00.maildir/pith/init.c 2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 407,412 ****
- --- 407,415 ----
-@@ -3212,7 +3216,7 @@
- #endif
- diff -rc alpine-2.00/pith/pattern.c alpine-2.00.maildir/pith/pattern.c
- *** alpine-2.00/pith/pattern.c 2008-07-14 11:01:54.000000000 -0700
----- alpine-2.00.maildir/pith/pattern.c 2009-08-31 10:59:42.000000000
-0700
-+--- alpine-2.00.maildir/pith/pattern.c 2008-08-26 20:56:05.000000000
-0700
- ***************
- *** 5482,5487 ****
- --- 5482,5495 ----
-@@ -3282,7 +3286,7 @@
-
- diff -rc alpine-2.00/pith/pine.hlp alpine-2.00.maildir/pith/pine.hlp
- *** alpine-2.00/pith/pine.hlp 2008-08-22 17:07:05.000000000 -0700
----- alpine-2.00.maildir/pith/pine.hlp 2009-08-31 10:59:42.000000000 -0700
-+--- alpine-2.00.maildir/pith/pine.hlp 2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 21253,21258 ****
- --- 21253,21354 ----
-@@ -3442,7 +3446,7 @@
- <HEAD>
- diff -rc alpine-2.00/pith/send.c alpine-2.00.maildir/pith/send.c
- *** alpine-2.00/pith/send.c 2008-08-06 11:25:58.000000000 -0700
----- alpine-2.00.maildir/pith/send.c 2009-08-31 10:59:42.000000000 -0700
-+--- alpine-2.00.maildir/pith/send.c 2008-08-26 20:56:05.000000000 -0700
- ***************
- *** 256,261 ****
- --- 256,268 ----
-@@ -3460,8 +3464,8 @@
- /*
- * The mbox is relative to the home directory.
- diff -rc alpine-2.00/README.maildir alpine-2.00.maildir/README.maildir
--*** alpine-2.00/README.maildir 2009-08-31 11:01:22.000000000 -0700
----- alpine-2.00.maildir/README.maildir 2009-08-31 10:59:42.000000000
-0700
-+*** alpine-2.00/README.maildir 2008-08-26 20:56:05.000000000 -0700
-+--- alpine-2.00.maildir/README.maildir 2008-08-26 20:56:05.000000000
-0700
- ***************
- *** 0 ****
- --- 1,153 ----
diff --git a/mail/alpine/outgoing.patch.diff b/mail/alpine/outgoing.patch.diff
deleted file mode 100644
index 43fbc81..0000000
--- a/mail/alpine/outgoing.patch.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- outgoing.patch 2008-08-27 05:56:19.000000000 +0200
-+++ ../outgoing.patch 2009-08-04 08:49:24.000000000 +0200
-@@ -533,7 +533,7 @@
- if(!(nonempty_patterns(rflags, &pstate) &&
- first_pattern(&pstate))){
- + if (!ps->send_immediately)
-- q_status_message(SM_ORDER, 0, 3,
-+ q_status_message(SM_ORDER, 3, 3,
- _("No roles available. Use Setup/Rules to add
roles."));
- + else{
- + printf(_("No roles available. Use Setup/Rules to add roles."));
diff --git a/mail/alpine/rules.patch.diff b/mail/alpine/rules.patch.diff
deleted file mode 100644
index 70c0586..0000000
--- a/mail/alpine/rules.patch.diff
+++ /dev/null
@@ -1,372 +0,0 @@
---- rules.patch 2008-10-05 06:27:55.000000000 +0200
-+++ ../rules.patch 2009-08-04 09:36:55.000000000 +0200
-@@ -458,223 +458,167 @@
- }
-
- return(ret);
--diff -rc alpine-2.00/alpine/reply.c alpine-2.00.rules/alpine/reply.c
--*** alpine-2.00/alpine/reply.c 2008-06-03 08:54:15.000000000 -0700
----- alpine-2.00.rules/alpine/reply.c 2008-10-04 21:26:31.000000000 -0700
--***************
--*** 61,67 ****
-- #include "../pith/tempfile.h"
-- #include "../pith/busy.h"
-- #include "../pith/ablookup.h"
--!
--
-- /*
-- * Internal Prototypes
----- 61,68 ----
-- #include "../pith/tempfile.h"
-- #include "../pith/busy.h"
-- #include "../pith/ablookup.h"
--! #include "../pith/copyaddr.h"
--! #include "../pith/rules.h"
--
-- /*
-- * Internal Prototypes
--***************
--*** 108,118 ****
-- long msgno, j, totalm, rflags, *seq = NULL;
-- int i, include_text = 0, times = -1, warned = 0, rv = 0,
-- flags = RSF_QUERY_REPLY_ALL, reply_raw_body = 0;
--! int rolemsg = 0, copytomsg = 0;
-- gf_io_t pc;
-- PAT_STATE dummy;
-- REDRAFT_POS_S *redraft_pos = NULL;
-- ACTION_S *role = NULL, *nrole;
-- #if defined(DOS) && !defined(_WINDOWS)
-- char *reserve;
-- #endif
----- 109,120 ----
-- long msgno, j, totalm, rflags, *seq = NULL;
-- int i, include_text = 0, times = -1, warned = 0, rv = 0,
-- flags = RSF_QUERY_REPLY_ALL, reply_raw_body = 0;
--! int rolemsg = 0, copytomsg = 0, do_role_early = 0;
-- gf_io_t pc;
-- PAT_STATE dummy;
-- REDRAFT_POS_S *redraft_pos = NULL;
-- ACTION_S *role = NULL, *nrole;
--+ RULE_RESULT *rule;
-- #if defined(DOS) && !defined(_WINDOWS)
-- char *reserve;
-- #endif
--***************
--*** 138,143 ****
----- 140,208 ----
-- && F_ON(F_ENABLE_FULL_HDR_AND_TEXT, ps_global))
-- reply_raw_body = 1;
--
-+--- re-alpine-2.01/alpine/reply.c.orig 2009-08-04 09:18:46.000000000
+0200
-++++ re-alpine-2.01/alpine/reply.c 2009-08-04 09:35:27.000000000 +0200
-+@@ -61,6 +61,8 @@
-+ #include "../pith/tempfile.h"
-+ #include "../pith/busy.h"
-+ #include "../pith/ablookup.h"
-++#include "../pith/copyaddr.h"
-++#include "../pith/rules.h"
-+
-+
-+ /*
-+@@ -107,12 +109,13 @@
-+ char *tmpfix = NULL, *prefix = NULL, *fcc = NULL, *errmsg = NULL;
-+ long msgno, j, totalm, rflags, *seq = NULL;
-+ int i, include_text = 0, times = -1, warned = 0, rv = 0,
-+- flags = RSF_QUERY_REPLY_ALL, reply_raw_body = 0;
-+- int rolemsg = 0, copytomsg = 0;
-++ flags = RSF_QUERY_REPLY_ALL, reply_raw_body = 0;
-++ int rolemsg = 0, copytomsg = 0, do_role_early = 0;
-+ gf_io_t pc;
-+ PAT_STATE dummy;
-+ REDRAFT_POS_S *redraft_pos = NULL;
-+ ACTION_S *role = NULL, *nrole;
-++ RULE_RESULT *rule;
-+ #if defined(DOS) && !defined(_WINDOWS)
-+ char *reserve;
-+ #endif
-+@@ -138,7 +141,71 @@
-+ && F_ON(F_ENABLE_FULL_HDR_AND_TEXT, ps_global))
-+ reply_raw_body = 1;
-+
-+- /*
- + /* Setup possible role */
- + if(role_arg)
- + role = copy_action(role_arg);
- +
- + if(!role && F_ON(F_ENABLE_EDIT_REPLY_INDENT, pine_state)){
--+ for(msgno = mn_first_cur(pine_state->msgmap);
--+ msgno > 0L; msgno = mn_next_cur(pine_state->msgmap)){
-++ for(msgno = mn_first_cur(pine_state->msgmap);
-++ msgno > 0L; msgno = mn_next_cur(pine_state->msgmap)){
- +
--+ env = pine_mail_fetchstructure(pine_state->mail_stream,
--+ mn_m2raw(pine_state->msgmap,
msgno),
--+ NULL);
--+ if(!env) {
--+ q_status_message1(SM_ORDER,3,4,
--+ _("Error fetching message %s. Can't reply to
it."),
--+ long2string(msgno));
--+ goto done_early;
--+ }
-++ env = pine_mail_fetchstructure(pine_state->mail_stream,
-++ mn_m2raw(pine_state->msgmap, msgno),
-++ NULL);
-++ if(!env) {
-++ q_status_message1(SM_ORDER,3,4,
-++ _("Error fetching message %s. Can't reply to it."),
-++ long2string(msgno));
-++ goto done_early;
-++ }
- +
--+ if(rule = get_result_rule(V_REPLY_INDENT_RULES, FOR_COMPOSE ,
env)){
--+ RULELIST *list = get_rulelist_from_code(V_REPLY_INDENT_RULES,
-++ if(rule = get_result_rule(V_REPLY_INDENT_RULES, FOR_COMPOSE , env))
{
-++ RULELIST *list = get_rulelist_from_code(V_REPLY_INDENT_RULES,
- + ps_global->rule_list);
--+ RULE_S *prule = get_rule(list, rule->number);
--+ if(condition_contains_token(prule->condition, ROLE_TOKEN))
--+ do_role_early++;
--+ if(rule->result)
--+ fs_give((void **)&rule->result);
--+ fs_give((void **)&rule);
--+ }
--+ }
-++ RULE_S *prule = get_rule(list, rule->number);
-++ if(condition_contains_token(prule->condition, ROLE_TOKEN))
-++ do_role_early++;
-++ if(rule->result)
-++ fs_give((void **)&rule->result);
-++ fs_give((void **)&rule);
-++ }
-++ }
- + }
- +
- + if(do_role_early){
--+ rflags = ROLE_REPLY;
--+ if(nonempty_patterns(rflags, &dummy)){
--+ /* setup default role */
--+ nrole = NULL;
--+ j = mn_first_cur(pine_state->msgmap);
--+ do {
--+ role = nrole;
--+ nrole = set_role_from_msg(pine_state, rflags,
--+ mn_m2raw(pine_state->msgmap, j),
--+ NULL);
--+ } while(nrole && (!role || nrole == role)
--+ && (j=mn_next_cur(pine_state->msgmap)) > 0L);
--+
--+ if(!role || nrole == role)
--+ role = nrole;
--+ else
--+ role = NULL;
--+
--+ if(confirm_role(rflags, &role))
--+ role = combine_inherited_role(role);
--+ else{ /* cancel reply */
--+ role = NULL;
--+ cmd_cancelled("Reply");
--+ goto done_early;
--+ }
--+ }
-++ rflags = ROLE_REPLY;
-++ if(nonempty_patterns(rflags, &dummy)){
-++ /* setup default role */
-++ nrole = NULL;
-++ j = mn_first_cur(pine_state->msgmap);
-++ do {
-++ role = nrole;
-++ nrole = set_role_from_msg(pine_state, rflags,
-++ mn_m2raw(pine_state->msgmap, j),
-++ NULL);
-++ } while(nrole && (!role || nrole == role)
-++ && (j=mn_next_cur(pine_state->msgmap)) > 0L);
-++
-++ if(!role || nrole == role)
-++ role = nrole;
-++ else
-++ role = NULL;
-++
-++ if(confirm_role(rflags, &role))
-++ role = combine_inherited_role(role);
-++ else{ /* cancel reply */
-++ role = NULL;
-++ cmd_cancelled("Reply");
-++ goto done_early;
-++ }
-++ }
- + }
- +
- + if (role)
--+ ps_global->role = cpystr(role->nick); /* remember the role */
--+
-- /*
-- * We may have to loop through first to figure out what default
-- * reply-indent-string to offer...
--***************
--*** 285,292 ****
-- outgoing->subject = cpystr("Re: several messages");
-- }
-- }
--! else
--! outgoing->subject = reply_subject(env->subject, NULL, 0);
-- }
--
-- /* fill reply header */
----- 350,367 ----
-- outgoing->subject = cpystr("Re: several messages");
-- }
-- }
--! else{
--! RULE_RESULT *rule;
--! rule = get_result_rule(V_RESUB_RULES,FOR_RESUB|FOR_TRIM , env);
--! if (rule){
--! outgoing->subject = reply_subject(rule->result, NULL, 0);
--! if (rule->result)
--! fs_give((void **)&rule->result);
--! fs_give((void **)&rule);
--! }
--! else
--! outgoing->subject = reply_subject(env->subject, NULL, 0);
--! }
-- }
--
-- /* fill reply header */
--***************
--*** 305,315 ****
-- if(sp_expunge_count(pine_state->mail_stream)) /* cur msg expunged */
-- goto done_early;
--
--! /* Setup possible role */
--! if(role_arg)
--! role = copy_action(role_arg);
--!
--! if(!role){
-- rflags = ROLE_REPLY;
-- if(nonempty_patterns(rflags, &dummy)){
-- /* setup default role */
----- 380,386 ----
-- if(sp_expunge_count(pine_state->mail_stream)) /* cur msg expunged */
-- goto done_early;
--
--! if(!do_role_early){
-- rflags = ROLE_REPLY;
-- if(nonempty_patterns(rflags, &dummy)){
-- /* setup default role */
--***************
--*** 720,725 ****
----- 791,799 ----
-- if(prefix)
-- fs_give((void **)&prefix);
--
--+ if (ps_global->role)
--+ fs_give((void **)&ps_global->role);
--+
-- if(fcc)
-- fs_give((void **) &fcc);
--
--***************
--*** 1440,1448 ****
-- }
-- }
--
--! if(role)
-- q_status_message1(SM_ORDER, 3, 4,
-- _("Forwarding using role \"%s\""), role->nick);
--
-- if(role && role->template){
-- char *filtered;
----- 1514,1527 ----
-- }
-- }
--
--! if (ps_global->role)
--! fs_give((void **)&ps_global->role);
--!
--! if(role){
-- q_status_message1(SM_ORDER, 3, 4,
-- _("Forwarding using role \"%s\""), role->nick);
--+ ps_global->role = cpystr(role->nick);
-++ ps_global->role = cpystr(role->nick); /* remember the role */
-++
-++
-++ /*
-+ * We may have to loop through first to figure out what default
-+ * reply-indent-string to offer...
-+ */
-+@@ -285,8 +352,18 @@
-+ outgoing->subject = cpystr("Re: several messages");
-+ }
-+ }
-+- else
-+- outgoing->subject = reply_subject(env->subject, NULL, 0);
-++ else{
-++ RULE_RESULT *rule;
-++ rule = get_result_rule(V_RESUB_RULES,FOR_RESUB|FOR_TRIM , env);
-++ if (rule){
-++ outgoing->subject = reply_subject(rule->result, NULL, 0);
-++ if (rule->result)
-++ fs_give((void **)&rule->result);
-++ fs_give((void **)&rule);
- + }
--
-- if(role && role->template){
-- char *filtered;
--***************
--*** 1674,1679 ****
----- 1753,1759 ----
-- #if defined(DOS) && !defined(_WINDOWS)
-- free((void *)reserve);
-- #endif
--+ outgoing->sparep = env && env->from ? copyaddr(env->from) : NULL;
-- pine_send(outgoing, &body, "FORWARD MESSAGE",
-- role, NULL, &reply, redraft_pos,
-- NULL, NULL, 0);
-++ else
-++ outgoing->subject = reply_subject(env->subject, NULL, 0);
-++ }
-+ }
-+
-+ /* fill reply header */
-+@@ -305,13 +382,7 @@
-+ if(sp_expunge_count(pine_state->mail_stream)) /* cur msg expunged */
-+ goto done_early;
-+
-+- /* Setup possible role */
-+- if (ps_global->reply.role_chosen)
-+- role = ps_global->reply.role_chosen;
-+- else if(role_arg)
-+- role = copy_action(role_arg);
-+-
-+- if(!role){
-++ if(!do_role_early){
-+ rflags = ROLE_REPLY;
-+ if(!ps_global->reply.role_chosen && nonempty_patterns(rflags,
&dummy)){
-+ /* setup default role */
-+@@ -1583,9 +1654,15 @@
-+ }
-+ }
-+
-+- if(role)
-++ if (ps_global->role)
-++ fs_give((void **)&ps_global->role);
-++
-++ if(role){
-+ q_status_message1(SM_ORDER, 3, 4,
-+ _("Forwarding using role \"%s\""), role->nick);
-++ ps_global->role = cpystr(role->nick);
-++ }
-++
-+
-+ if(role && role->template){
-+ char *filtered;
-+@@ -1817,6 +1894,7 @@
-+ #if defined(DOS) && !defined(_WINDOWS)
-+ free((void *)reserve);
-+ #endif
-++ outgoing->sparep = env && env->from ? copyaddr(env->from) : NULL;
-+ pine_send(outgoing, &body, "FORWARD MESSAGE",
-+ role, NULL, &reply, redraft_pos,
-+ NULL, NULL, 0);
- diff -rc alpine-2.00/alpine/roleconf.c alpine-2.00.rules/alpine/roleconf.c
- *** alpine-2.00/alpine/roleconf.c 2008-02-27 17:04:46.000000000 -0800
- --- alpine-2.00.rules/alpine/roleconf.c 2008-10-04 21:26:31.000000000
-0700



  • [SM-Commit] GIT changes to master grimoire by Andraž Levstik (e2ff58f44b41841414c44ae79663dbe2f6d2c2c7), Andraž Levstik, 08/11/2010

Archive powered by MHonArc 2.6.24.

Top of Page